diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
new file mode 100644
index 0000000000..f4ff1e90d3
--- /dev/null
+++ b/.github/workflows/linter.yml
@@ -0,0 +1,32 @@
+---
+name: Lint Code Base
+
+defaults:
+  run:
+    shell: bash
+
+on:
+  push:
+    branches-ignore: [main, develop]
+  pull_request:
+
+jobs:
+  perltidy:
+    name: Run perltidy on Perl Files
+    runs-on: ubuntu-22.04
+    container:
+      image: perl:5.34
+    steps:
+      - uses: actions/checkout@v3
+      - name: perl -V
+        run: perl -V
+      - name: Install dependencies
+        run: cpanm -n Perl::Tidy@20220613
+      - name: perltidy --version
+        run: perltidy --version
+      - name: Run perltidy
+        shell: bash
+        run: |
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          shopt -s extglob globstar nullglob
+          perltidy --pro=./.perltidyrc -b -bext='/' ./**/*.p[lm] ./**/*.t && git diff --exit-code
diff --git a/.gitignore b/.gitignore
index 3d5239531f..f02c53bd36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1,28 @@
 .env
-docker-compose.yml
-tmp
 *~
-!tmp/README
-!htdocs/tmp/README
+*.swp
 *.save
-htdocs/tmp/*
+*.bak
 tmp/*
 logs/*
-!logs/README
-conf/*.conf
-conf/*-config
+
+conf/*
+!conf/*.dist*
+!conf/*.config
+
+node_modules
+
+htdocs/tmp/*
 htdocs/site_info.txt
 htdocs/DATA/*
-node_modules
-node_modules/*
-math4-overrides.css
-math4-overrides.js
+htdocs/themes/*/math4-overrides.css
+htdocs/themes/*/math4-overrides.js
 htdocs/static-assets.json
+htdocs/index.html
 htdocs/**/*.min.js
 htdocs/**/*.min.css
 htdocs/themes/*/images/*
-!htdocs/themes/*/images/maa_logo.png
+!htdocs/themes/*/images/maa_logo.svg
 !htdocs/themes/*/images/webwork_logo.svg
 !htdocs/themes/math4/images/webwork_square.svg
 htdocs/themes/*/*.css
@@ -30,5 +31,16 @@ htdocs/themes/*
 !htdocs/themes/math4-red
 !htdocs/themes/math4-green
 !htdocs/themes/math4-yellow
+!htdocs/themes/layouts
+
 DATA/*
-*.swp
+!DATA/uploads
+DATA/uploads/*
+!*README*
+
+docker-compose.yml
+docker-config/ssl/*
+!docker-config/ssl/Readme
+
+.vscode
+.vim
diff --git a/.perltidyrc b/.perltidyrc
index 8314b7c173..4620751c6f 100644
--- a/.perltidyrc
+++ b/.perltidyrc
@@ -20,3 +20,4 @@
 -nlop   # No logical padding (this causes mixed tabs and spaces)
 -wn     # Weld nested containers
 -xci    # Extended continuation indentation
+-vxl='q' # No vertical alignment of qw quotes
diff --git a/Dockerfile b/Dockerfile
index 10c2f4c0d9..3ffa60d49c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,43 +1,9 @@
-# Optional things to change/configure below:
-#
-# 1. Which branch of webwork2/ and pg/ to install.
-#
-# 2. Installing the OPL in the Docker image itself.
-#    (almost 850MB: 290+MB for the main OPL, 90+MB for Pending, 460+MB for Contrib)
-#
-#    By default this is NOT done, and it will instead be installed in
-#    a named Docker storage volume when the container is first started.
-#
-#    Note: For typical use, we recommend that the OPL be either mounted from
-#    a local directory on the source or from a separate named data volume.
-#    That approach precludes needing to download the OPL for each update to
-#    the Docker image, and allows it to be easily upgraded using git in its
-#    persistent location.
-#
-# 3. Some things should be handled by setting environment variables which
-#    take effect at container startup. They can usually be set in
-#    docker-compose.yml.
-#
-#        SSL=1
-#          will turn on SSL at startup
-#        ADD_LOCALES="locale1,locale2,locale3"
-#          will build these locales at startup
-#        PAPERSIZE=a4
-#          will set the system papersize to A4
-#        SYSTEM_TIMEZONE=zone/city
-#          will set the system timezone to zone/city
-#          Make sure to use a valid setting.
-#          "/usr/bin/timedatectl list-timezones" on Ubuntu will find valid values
-#        ADD_APT_PACKAGES="package1 package2 package3"
-#          will have these additional Ubuntu packages installed at startup.
-
 # ==================================================================
-# Phase 1 - download some Git repos for later use:
-# as suggested by Nelson Moller in https://gist.github.com/nmoller/81bd8e149e6aa2a7cf051e0bf248b2e2
+# Phase 1 - Download webwork and pg git repositories.
 
 FROM alpine/git AS base
 
-# build args specifying the branches for webwork2 and pg used to build the image
+# Build args specifying the branches for webwork2 and pg used to build the image.
 ARG WEBWORK2_GIT_URL
 ARG WEBWORK2_BRANCH
 ARG PG_GIT_URL
@@ -62,27 +28,18 @@ RUN echo Cloning branch $PG_BRANCH branch from $PG_GIT_URL \
 # ==================================================================
 # Phase 2 - set ENV variables
 
-# we need to change FROM before setting the ENV variables
+# We need to change FROM before setting the ENV variables.
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ENV WEBWORK_URL=/webwork2 \
-	WEBWORK_ROOT_URL=http://localhost \
+	WEBWORK_ROOT_URL=http://localhost::8080 \
 	WEBWORK_SMTP_SERVER=localhost \
 	WEBWORK_SMTP_SENDER=webwork@example.com \
 	WEBWORK_TIMEZONE=America/New_York \
-	APACHE_RUN_USER=www-data \
-	APACHE_RUN_GROUP=www-data \
-	# temporary state file location. This might be changed to /run in Wheezy+1 \
-	APACHE_PID_FILE=/var/run/apache2/apache2.pid \
-	APACHE_RUN_DIR=/var/run/apache2 \
-	APACHE_LOCK_DIR=/var/lock/apache2 \
-	# Only /var/log/apache2 is handled by /etc/logrotate.d/apache2.
-	APACHE_LOG_DIR=/var/log/apache2 \
 	APP_ROOT=/opt/webwork \
 	DEBIAN_FRONTEND=noninteractive \
-	DEBCONF_NONINTERACTIVE_SEEN=true \
-	DEV=0
+	DEBCONF_NONINTERACTIVE_SEEN=true
 
 ARG ADDITIONAL_BASE_IMAGE_PACKAGES
 
@@ -93,130 +50,146 @@ ENV WEBWORK_ROOT=$APP_ROOT/webwork2 \
 	PATH=$PATH:$APP_ROOT/webwork2/bin
 
 # ==================================================================
-# Phase 3 - Ubuntu 20.04 base image + required packages
+# Phase 3 - Install required packages
 
 # Do NOT include "apt-get -y upgrade"
 # see: https://docs.docker.com/develop/develop-images/dockerfile_best-practices/
 
 RUN apt-get update \
 	&& apt-get install -y --no-install-recommends --no-install-suggests \
-	apache2 \
+	apt-utils \
+	ca-certificates \
+	cpanminus \
+	culmus \
 	curl \
+	debconf-utils \
 	dvipng \
 	dvisvgm \
+	fonts-linuxlibertine \
 	gcc \
-	libapache2-request-perl \
+	git \
+	imagemagick \
+	iputils-ping \
+	jq \
 	libarchive-zip-perl \
-	libcgi-pm-perl \
-	libcrypt-ssleay-perl \
+	libarray-utils-perl \
+	libc6-dev \
+	libcapture-tiny-perl \
+	libclass-tiny-antlers-perl \
+	libclass-tiny-perl \
+	libcpanel-json-xs-perl \
+	libcrypt-jwt-perl \
+	libcryptx-perl \
+	libdata-dump-perl \
+	libdata-structure-util-perl \
 	libdatetime-perl \
 	libdbd-mysql-perl \
-	libdbd-mariadb-perl \
+	libdevel-checklib-perl \
 	libemail-address-xs-perl \
+	libemail-date-format-perl \
+	libemail-sender-perl \
+	libemail-stuffer-perl \
 	libexception-class-perl \
+	libextutils-config-perl \
+	libextutils-helpers-perl \
+	libextutils-installpaths-perl \
 	libextutils-xsbuilder-perl \
 	libfile-find-rule-perl-perl \
+	libfile-sharedir-install-perl \
+	libfuture-asyncawait-perl \
 	libgd-perl \
 	libhtml-scrubber-perl \
+	libhtml-template-perl \
+	libhttp-async-perl \
+	libiterator-perl \
+	libiterator-util-perl \
+	libjson-maybexs-perl \
 	libjson-perl \
+	libjson-xs-perl \
 	liblocale-maketext-lexicon-perl \
 	libmail-sender-perl \
+	libmail-sender-perl \
+	libmariadb-dev \
+	libmath-random-secure-perl \
 	libmime-tools-perl \
+	libminion-backend-sqlite-perl \
+	libminion-perl \
+	libmodule-build-perl \
+	libmodule-pluggable-perl \
+	libmojolicious-perl \
+	libmojolicious-plugin-renderfile-perl \
+	libnet-https-nb-perl \
 	libnet-ip-perl \
 	libnet-ldap-perl \
 	libnet-oauth-perl \
 	libossp-uuid-perl \
 	libpadwalker-perl \
 	libpath-class-perl \
+	libpath-tiny-perl \
+	libpandoc-wrapper-perl \
 	libphp-serialization-perl \
-	libxml-simple-perl \
-	libnet-https-nb-perl \
-	libhttp-async-perl \
+	libpod-wsdl-perl \
 	libsoap-lite-perl \
+	libsql-abstract-classic-perl \
 	libsql-abstract-perl \
 	libstring-shellquote-perl \
+	libsub-uplevel-perl \
+	libsvg-perl \
 	libtemplate-perl \
+	libtest-deep-perl \
+	libtest-exception-perl \
+	libtest-fatal-perl \
+	libtest-mockobject-perl \
+	libtest-pod-perl \
+	libtest-requires-perl \
+	libtest-warn-perl \
+	libtest-xml-perl \
 	libtext-csv-perl \
+	libthrowable-perl \
 	libtimedate-perl \
+	libuniversal-can-perl \
+	libuniversal-isa-perl \
 	libuuid-tiny-perl \
-	libxml-parser-perl \
-	libxml-writer-perl \
-	libxmlrpc-lite-perl \
-	libapache2-reload-perl \
-	cpanminus \
 	libxml-parser-easytree-perl \
-	libiterator-perl \
-	libiterator-util-perl \
-	libpod-wsdl-perl \
-	libtest-xml-perl \
-	libmodule-build-perl \
+	libxml-parser-perl \
 	libxml-semanticdiff-perl \
+	libxml-simple-perl \
+	libxml-writer-perl \
 	libxml-xpath-perl \
-	libpath-tiny-perl \
-	libarray-utils-perl \
-	libhtml-template-perl \
-	libtest-pod-perl \
-	libemail-sender-perl \
-	libmail-sender-perl \
-	libmodule-pluggable-perl \
-	libemail-date-format-perl \
-	libcapture-tiny-perl \
-	libthrowable-perl \
-	libdata-dump-perl \
-	libfile-sharedir-install-perl \
-	libclass-tiny-perl \
-	libtest-requires-perl \
-	libtest-mockobject-perl \
-	libtest-warn-perl \
-	libsub-uplevel-perl \
-	libtest-exception-perl \
-	libuniversal-can-perl \
-	libuniversal-isa-perl \
-	libtest-fatal-perl \
-	libjson-xs-perl \
-	libjson-maybexs-perl \
-	libcpanel-json-xs-perl \
 	libyaml-libyaml-perl \
-	libemail-stuffer-perl \
+	lmodern \
+	locales \
 	make \
+	mariadb-client \
 	netpbm \
 	patch \
 	pdf2svg \
 	preview-latex-style \
+	ssl-cert \
+	sudo \
 	texlive \
+	texlive-lang-arabic \
+	texlive-lang-other \
 	texlive-latex-extra \
+	texlive-latex-recommended \
 	texlive-plain-generic \
 	texlive-xetex \
-	texlive-latex-recommended \
-	texlive-lang-other \
-	texlive-lang-arabic \
-	libc6-dev \
-	git \
-	mysql-client \
 	tzdata \
-	apt-utils \
-	locales \
-	debconf-utils \
-	ssl-cert \
-	ca-certificates \
-	culmus \
-	fonts-linuxlibertine \
-	lmodern \
-	zip \
-	iputils-ping \
-	imagemagick \
-	jq $ADDITIONAL_BASE_IMAGE_PACKAGES \
+	zip $ADDITIONAL_BASE_IMAGE_PACKAGES \
 	&& curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \
 	&& apt-get install -y --no-install-recommends --no-install-suggests nodejs \
 	&& apt-get clean \
 	&& rm -fr /var/lib/apt/lists/* /tmp/*
 
-# Developers may want to add additional packages inside the image
-# such as: telnet vim mc file
+# ==================================================================
+# Phase 4 - Install additional Perl modules from CPAN that are not packaged for Ubuntu or are outdated in Ubuntu.
+
+RUN cpanm install Statistics::R::IO DBD::MariaDB Mojo::SQLite@3.002 Perl::Tidy@20220613 \
+	&& rm -fr ./cpanm /root/.cpanm /tmp/*
 
 # ==================================================================
-# Phase 4 - Install webwork2 and pg which were downloaded to /opt/base/ in phase 1
-#   Option: Install the OPL in the image also (about 850 MB)
+# Phase 5 - Install webwork2 and pg which were downloaded to /opt/base/ in phase 1
+# Option: Install the OPL in the image also (about 850 MB)
 
 RUN mkdir -p $APP_ROOT/courses $APP_ROOT/libraries $APP_ROOT/libraries/webwork-open-problem-library $APP_ROOT/webwork2 /www/www/html
 
@@ -224,113 +197,53 @@ COPY --from=base /opt/base/webwork2 $APP_ROOT/webwork2
 COPY --from=base /opt/base/pg $APP_ROOT/pg
 
 # Optional - include OPL (also need to uncomment above to clone from GitHub when needed):
-# ??? could/should this include the main OPL = /opt/base/webwork-open-problem-library/OpenProblemLibrary and not Contrib and Pending ???
 #COPY --from=base /opt/base/webwork-open-problem-library $APP_ROOT/libraries/webwork-open-problem-library
 
 # ==================================================================
-
-# Phase 5 - some configuration work
+# Phase 6 - System configuration
 
 # 1. Setup PATH.
-# 2. Compiles color.c in the copy INSIDE the image, will also be done in docker-entrypoint.sh for externally mounted locations.
-# 3. Some chown/chmod for material INSIDE the image.
-# 4. Build some standard locales.
+# 2. Create the webwork2 PID directory and the /etc/ssl/local directory in case it is needed.
+# 3. Perform initial permissions setup for material INSIDE the image.
+# 4. Build standard locales.
 # 5. Set the default system timezone to be UTC.
 # 6. Install third party javascript files.
+# 7. Apply patches
+
+# Patch files that are applied below
+COPY docker-config/imagemagick-allow-pdf-read.patch /tmp
 
 RUN echo "PATH=$PATH:$APP_ROOT/webwork2/bin" >> /root/.bashrc \
-	&& cd $APP_ROOT/pg/lib/chromatic && gcc color.c -o color  \
+	&& mkdir /run/webwork2 /etc/ssl/local \
 	&& cd $APP_ROOT/webwork2/ \
-		&& chown www-data DATA ../courses logs tmp $APP_ROOT/pg/lib/chromatic \
-		&& chmod -R u+w DATA ../courses logs tmp $APP_ROOT/pg/lib/chromatic   \
+		&& chown www-data DATA ../courses logs tmp /etc/ssl/local /run/webwork2 \
+		&& chmod -R u+w DATA ../courses logs tmp /run/webwork2 /etc/ssl/local \
 	&& echo "en_US ISO-8859-1\nen_US.UTF-8 UTF-8" > /etc/locale.gen \
 		&& /usr/sbin/locale-gen \
 		&& echo "locales locales/default_environment_locale select en_US.UTF-8\ndebconf debconf/frontend select Noninteractive" > /tmp/preseed.txt \
 		&& debconf-set-selections /tmp/preseed.txt \
 	&& rm /etc/localtime /etc/timezone && echo "Etc/UTC" > /etc/timezone \
-		&&   dpkg-reconfigure -f noninteractive tzdata \
+		&& dpkg-reconfigure -f noninteractive tzdata \
 	&& cd $WEBWORK_ROOT/htdocs \
 		&& npm install \
 	&& cd $PG_ROOT/htdocs \
-		&& npm install
-
-# These lines were moved into docker-entrypoint.sh so the bind mount of courses will be available
-#RUN cd $APP_ROOT/webwork2/courses.dist \
-#    && cp *.lst $APP_ROOT/courses/ \
-#    && cp -R modelCourse $APP_ROOT/courses/
-
-# ==================================================================
-# Phase 6 - install additional Perl modules from CPAN (not packaged for Ubuntu or outdated in Ubuntu)
-
-RUN cpanm install Statistics::R::IO \
-	&& rm -fr ./cpanm /root/.cpanm /tmp/*
-
-# ==================================================================
-# Phase 7 - setup apache
-
-# Note we always create the /etc/ssl/local directory in case it will be needed, as
-# the SSL config can also be done via a modified docker-entrypoint.sh script.
-
-# Always provide the dummy default-ssl.conf file:
-COPY docker-config/ssl/default-ssl.conf /etc/apache2/sites-available/default-ssl.conf
-
-# Patch files that are applied below
-COPY docker-config/xmlrpc-lite-utf8-fix.patch /tmp
-COPY docker-config/imagemagick-allow-pdf-read.patch /tmp
-
-# However SSL will only be enabled at container startup via docker-entrypoint.sh.
-
-RUN cd $APP_ROOT/webwork2/conf \
-	&& cp webwork.apache2.4-config.dist webwork.apache2.4-config \
-	&& cp $APP_ROOT/webwork2/conf/webwork.apache2.4-config /etc/apache2/conf-enabled/webwork.conf \
-	&& a2dismod mpm_event \
-	&& a2enmod mpm_prefork rewrite \
-	&& sed -i -e 's/Timeout 300/Timeout 1200/' /etc/apache2/apache2.conf \
-	&& sed -i -e 's/MaxRequestWorkers     150/MaxRequestWorkers     20/' \
-		-e 's/MaxConnectionsPerChild   0/MaxConnectionsPerChild   100/' \
-		/etc/apache2/mods-available/mpm_prefork.conf \
-	&& cp $APP_ROOT/webwork2/htdocs/favicon.ico /var/www/html \
-	&& mkdir -p $APACHE_RUN_DIR $APACHE_LOCK_DIR $APACHE_LOG_DIR \
-	&& mkdir /etc/ssl/local  \
-	&& sed -i -e 's/^<Perl>$/\
-	PerlPassEnv WEBWORK_URL\n\
-	PerlPassEnv WEBWORK_ROOT_URL\n\
-	PerlPassEnv WEBWORK_DB_DRIVER\n\
-	PerlPassEnv WEBWORK_DB_NAME\n\
-	PerlPassEnv WEBWORK_DB_HOST\n\
-	PerlPassEnv WEBWORK_DB_PORT\n\
-	PerlPassEnv WEBWORK_DB_USER\n\
-	PerlPassEnv WEBWORK_DB_PASSWORD\n\
-	PerlPassEnv WEBWORK_SMTP_SERVER\n\
-	PerlPassEnv WEBWORK_SMTP_SENDER\n\
-	PerlPassEnv WEBWORK_TIMEZONE\n\
-	\n<Perl>/' /etc/apache2/conf-enabled/webwork.conf \
-	&& patch -p1 -d / < /tmp/xmlrpc-lite-utf8-fix.patch \
-	&& rm /tmp/xmlrpc-lite-utf8-fix.patch \
+		&& npm install \
 	&& patch -p1 -d / < /tmp/imagemagick-allow-pdf-read.patch \
 	&& rm /tmp/imagemagick-allow-pdf-read.patch
 
-EXPOSE 80
-WORKDIR $APP_ROOT
-
-# Enabling SSL is NOT done here.
-# Instead it is done by docker-entrypoint.sh at container startup when SSL=1
-#     is set in the environment, for example by docker-compose.yml.
-#RUN a2enmod ssl && a2ensite default-ssl
-#EXPOSE 443
-
 # ==================================================================
-# Phase 8 - prepare docker-entrypoint.sh
+# Phase 7 - Final setup and prepare docker-entrypoint.sh
 # Done near the end, so that an update to docker-entrypoint.sh can be
 # done without rebuilding the earlier layers of the Docker image.
 
+EXPOSE 8080
+WORKDIR $WEBWORK_ROOT
+
 COPY docker-config/docker-entrypoint.sh /usr/local/bin/
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 
-# ==================================================================
 # Add enviroment variables to control some things during container startup
-
 ENV SSL=0 \
 	PAPERSIZE=letter \
 	SYSTEM_TIMEZONE=UTC \
@@ -339,4 +252,4 @@ ENV SSL=0 \
 
 # ================================================
 
-CMD ["apache2", "-DFOREGROUND"]
+CMD ["sudo", "-E", "-u", "www-data", "hypnotoad", "-f", "bin/webwork2"]
diff --git a/DockerfileStage1 b/DockerfileStage1
index 59ad13f9b7..dcedc14daf 100644
--- a/DockerfileStage1
+++ b/DockerfileStage1
@@ -1,12 +1,10 @@
 # This is the Stage 1 Dockerfile, which builds a base OS image (webwork-base)
 # on top of which the WeBWorK parts will be installed by the Stage 2 Dockerfile.
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 # ==================================================================
-# Phase 1 - set base OS image install stage ENV variables
-#
-# We only need install time ENV variables, not those needed by the WeBWorK system
+# Phase 1 - Set base OS image install stage ENV variables
 
 ARG ADDITIONAL_BASE_IMAGE_PACKAGES
 
@@ -14,131 +12,141 @@ ENV DEBIAN_FRONTEND=noninteractive \
 	DEBCONF_NONINTERACTIVE_SEEN=true
 
 # ==================================================================
-# Phase 2 - Ubuntu 20.04 base image + required packages
+# Phase 2 - Install required packages
 
 # Do NOT include "apt-get -y upgrade"
 # see: https://docs.docker.com/develop/develop-images/dockerfile_best-practices/
 
 RUN apt-get update \
 	&& apt-get install -y --no-install-recommends --no-install-suggests \
-	apache2 \
+	apt-utils \
+	ca-certificates \
+	cpanminus \
+	culmus \
 	curl \
+	debconf-utils \
 	dvipng \
 	dvisvgm \
+	fonts-linuxlibertine \
 	gcc \
-	libapache2-request-perl \
+	git \
+	imagemagick \
+	iputils-ping \
+	jq \
 	libarchive-zip-perl \
-	libcgi-pm-perl \
-	libcrypt-ssleay-perl \
+	libarray-utils-perl \
+	libc6-dev \
+	libcapture-tiny-perl \
+	libclass-tiny-antlers-perl \
+	libclass-tiny-perl \
+	libcpanel-json-xs-perl \
+	libcrypt-jwt-perl \
+	libcryptx-perl \
+	libdata-dump-perl \
+	libdata-structure-util-perl \
 	libdatetime-perl \
 	libdbd-mysql-perl \
-	libdbd-mariadb-perl \
+	libdevel-checklib-perl \
 	libemail-address-xs-perl \
+	libemail-date-format-perl \
+	libemail-sender-perl \
+	libemail-stuffer-perl \
 	libexception-class-perl \
+	libextutils-config-perl \
+	libextutils-helpers-perl \
+	libextutils-installpaths-perl \
 	libextutils-xsbuilder-perl \
 	libfile-find-rule-perl-perl \
+	libfile-sharedir-install-perl \
+	libfuture-asyncawait-perl \
 	libgd-perl \
 	libhtml-scrubber-perl \
+	libhtml-template-perl \
+	libhttp-async-perl \
+	libiterator-perl \
+	libiterator-util-perl \
+	libjson-maybexs-perl \
 	libjson-perl \
+	libjson-xs-perl \
 	liblocale-maketext-lexicon-perl \
 	libmail-sender-perl \
+	libmail-sender-perl \
+	libmariadb-dev \
+	libmath-random-secure-perl \
 	libmime-tools-perl \
+	libminion-backend-sqlite-perl \
+	libminion-perl \
+	libmodule-build-perl \
+	libmodule-pluggable-perl \
+	libmojolicious-perl \
+	libmojolicious-plugin-renderfile-perl \
+	libnet-https-nb-perl \
 	libnet-ip-perl \
 	libnet-ldap-perl \
 	libnet-oauth-perl \
 	libossp-uuid-perl \
 	libpadwalker-perl \
+	libpandoc-wrapper-perl \
 	libpath-class-perl \
+	libpath-tiny-perl \
 	libphp-serialization-perl \
-	libxml-simple-perl \
-	libnet-https-nb-perl \
-	libhttp-async-perl \
+	libpod-wsdl-perl \
 	libsoap-lite-perl \
+	libsql-abstract-classic-perl \
 	libsql-abstract-perl \
 	libstring-shellquote-perl \
+	libsub-uplevel-perl \
+	libsvg-perl \
 	libtemplate-perl \
+	libtest-deep-perl \
+	libtest-exception-perl \
+	libtest-fatal-perl \
+	libtest-mockobject-perl \
+	libtest-pod-perl \
+	libtest-requires-perl \
+	libtest-warn-perl \
+	libtest-xml-perl \
 	libtext-csv-perl \
+	libthrowable-perl \
 	libtimedate-perl \
+	libuniversal-can-perl \
+	libuniversal-isa-perl \
 	libuuid-tiny-perl \
-	libxml-parser-perl \
-	libxml-writer-perl \
-	libxmlrpc-lite-perl \
-	libapache2-reload-perl \
-	cpanminus \
 	libxml-parser-easytree-perl \
-	libiterator-perl \
-	libiterator-util-perl \
-	libpod-wsdl-perl \
-	libtest-xml-perl \
-	libmodule-build-perl \
+	libxml-parser-perl \
 	libxml-semanticdiff-perl \
+	libxml-simple-perl \
+	libxml-writer-perl \
 	libxml-xpath-perl \
-	libpath-tiny-perl \
-	libarray-utils-perl \
-	libhtml-template-perl \
-	libtest-pod-perl \
-	libemail-sender-perl \
-	libmail-sender-perl \
-	libmodule-pluggable-perl \
-	libemail-date-format-perl \
-	libcapture-tiny-perl \
-	libthrowable-perl \
-	libdata-dump-perl \
-	libfile-sharedir-install-perl \
-	libclass-tiny-perl \
-	libtest-requires-perl \
-	libtest-mockobject-perl \
-	libtest-warn-perl \
-	libsub-uplevel-perl \
-	libtest-exception-perl \
-	libuniversal-can-perl \
-	libuniversal-isa-perl \
-	libtest-fatal-perl \
-	libjson-xs-perl \
-	libjson-maybexs-perl \
-	libcpanel-json-xs-perl \
 	libyaml-libyaml-perl \
-	libemail-stuffer-perl \
+	lmodern \
+	locales \
 	make \
+	mariadb-client \
 	netpbm \
 	patch \
 	pdf2svg \
 	preview-latex-style \
+	ssl-cert \
+	sudo \
 	texlive \
+	texlive-lang-arabic \
+	texlive-lang-other \
 	texlive-latex-extra \
+	texlive-latex-recommended \
 	texlive-plain-generic \
 	texlive-xetex \
-	texlive-latex-recommended \
-	texlive-lang-other \
-	texlive-lang-arabic \
-	libc6-dev \
-	git \
-	mysql-client \
 	tzdata \
-	apt-utils \
-	locales \
-	debconf-utils \
-	ssl-cert \
-	ca-certificates \
-	culmus \
-	fonts-linuxlibertine \
-	lmodern \
-	zip \
-	iputils-ping \
-	imagemagick \
-	jq $ADDITIONAL_BASE_IMAGE_PACKAGES \
+	zip $ADDITIONAL_BASE_IMAGE_PACKAGES \
 	&& curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \
 	&& apt-get install -y --no-install-recommends --no-install-suggests nodejs \
 	&& apt-get clean \
 	&& rm -fr /var/lib/apt/lists/* /tmp/*
 
-# Developers may want to add additional packages inside the image
-# such as: telnet vim mc file
-
 # ==================================================================
-# Phase 3 - install additional Perl modules from CPAN (not packaged for Ubuntu or outdated in Ubuntu)
+# Phase 3 - Install additional Perl modules from CPAN that are not packaged for Ubuntu or are outdated in Ubuntu.
 
-RUN cpanm install Statistics::R::IO \
+RUN cpanm install -n Statistics::R::IO DBD::MariaDB Mojo::SQLite@3.002 Perl::Tidy@20220613 \
 	&& rm -fr ./cpanm /root/.cpanm /tmp/*
 
 # ==================================================================
diff --git a/DockerfileStage2 b/DockerfileStage2
index f5d01ac8c7..f14bf34b5b 100644
--- a/DockerfileStage2
+++ b/DockerfileStage2
@@ -1,48 +1,12 @@
 # This is the Stage 2 Dockerfile, which handles the WeBWorK part, building
 # on top of the base OS image (webwork-base) created by the Stage 1 Dockerfile.
-#
-# ==================================================================
-#
-# Optional things to change/configure below:
-#
-# 1. Which branch of webwork2/ and pg/ to install.
-#
-# 2. Installing the OPL in the Docker image itself.
-#    (almost 850MB: 290+MB for the main OPL, 90+MB for Pending, 460+MB for Contrib)
-#
-#    By default this is NOT done, and it will instead be installed in
-#    a named Docker storage volume when the container is first started.
-#
-#    Note: For typical use, we recommend that the OPL be either mounted from
-#    a local directory on the source or from a separate named data volume.
-#    That approach precludes needing to download the OPL for each update to
-#    the Docker image, and allows it to be easily upgraded using git in its
-#    persistent location.
-#
-# 3. Some things should be handled by setting environment variables which
-#    take effect at container startup. They can usually be set in
-#    docker-compose.yml.
-#
-#        SSL=1
-#          will turn on SSL at startup
-#        ADD_LOCALES="locale1,locale2,locale3"
-#          will build these locales at startup
-#        PAPERSIZE=a4
-#          will set the system papersize to A4
-#        SYSTEM_TIMEZONE=zone/city
-#          will set the system timezone to zone/city
-#          Make sure to use a valid setting.
-#          "/usr/bin/timedatectl list-timezones" on Ubuntu will find valid values
-#        ADD_APT_PACKAGES="package1 package2 package3"
-#          will have these additional Ubuntu packages installed at startup.
 
 # ==================================================================
-# Phase 1 - download some Git repos for later use:
-# as suggested by Nelson Moller in https://gist.github.com/nmoller/81bd8e149e6aa2a7cf051e0bf248b2e2
+# Phase 1 - Download webwork and pg git repositories.
 
 FROM alpine/git AS base
 
-# build args specifying the branches for webwork2 and pg used to build the image
+# Build args specifying the branches for webwork2 and pg used to build the image.
 ARG WEBWORK2_GIT_URL
 ARG WEBWORK2_BRANCH
 ARG PG_GIT_URL
@@ -65,29 +29,20 @@ RUN echo Cloning branch $PG_BRANCH branch from $PG_GIT_URL \
 #  && rm -rf  webwork-open-problem-library/.git
 
 # ==================================================================
-# Phase 2 - set ENV variables
+# Phase 2 - Set ENV variables
 
-# we need to change FROM before setting the ENV variables
+# We need to change FROM before setting the ENV variables.
 
-FROM webwork-base:forWW217
+FROM webwork-base:forWW218
 
 ENV WEBWORK_URL=/webwork2 \
-	WEBWORK_ROOT_URL=http://localhost \
+	WEBWORK_ROOT_URL=http://localhost::8080 \
 	WEBWORK_SMTP_SERVER=localhost \
 	WEBWORK_SMTP_SENDER=webwork@example.com \
 	WEBWORK_TIMEZONE=America/New_York \
-	APACHE_RUN_USER=www-data \
-	APACHE_RUN_GROUP=www-data \
-	# temporary state file location. This might be changed to /run in Wheezy+1 \
-	APACHE_PID_FILE=/var/run/apache2/apache2.pid \
-	APACHE_RUN_DIR=/var/run/apache2 \
-	APACHE_LOCK_DIR=/var/lock/apache2 \
-	# Only /var/log/apache2 is handled by /etc/logrotate.d/apache2.
-	APACHE_LOG_DIR=/var/log/apache2 \
 	APP_ROOT=/opt/webwork \
 	DEBIAN_FRONTEND=noninteractive \
-	DEBCONF_NONINTERACTIVE_SEEN=true \
-	DEV=0
+	DEBCONF_NONINTERACTIVE_SEEN=true
 
 # Environment variables which depend on a prior environment variable must be set
 # in an ENV call after the dependencies were defined.
@@ -97,7 +52,7 @@ ENV WEBWORK_ROOT=$APP_ROOT/webwork2 \
 
 # ==================================================================
 # Phase 3 - Install webwork2 and pg which were downloaded to /opt/base/ in phase 1
-#   Option: Install the OPL in the image also (about 850 MB)
+# Option: Install the OPL in the image also (about 850 MB)
 
 RUN mkdir -p $APP_ROOT/courses $APP_ROOT/libraries $APP_ROOT/libraries/webwork-open-problem-library $APP_ROOT/webwork2 /www/www/html
 
@@ -105,24 +60,27 @@ COPY --from=base /opt/base/webwork2 $APP_ROOT/webwork2
 COPY --from=base /opt/base/pg $APP_ROOT/pg
 
 # Optional - include OPL (also need to uncomment above to clone from GitHub when needed):
-# ??? could/should this include the main OPL = /opt/base/webwork-open-problem-library/OpenProblemLibrary and not Contrib and Pending ???
 #COPY --from=base /opt/base/webwork-open-problem-library $APP_ROOT/libraries/webwork-open-problem-library
 
 # ==================================================================
-# Phase 4 - some configuration work
+# Phase 4 - System configuration
 
 # 1. Setup PATH.
-# 2. Compiles color.c in the copy INSIDE the image, will also be done in docker-entrypoint.sh for externally mounted locations.
-# 3. Some chown/chmod for material INSIDE the image.
-# 4. Build some standard locales.
+# 2. Create the webwork2 PID directory and the /etc/ssl/local directory in case it is needed.
+# 3. Perform initial permissions setup for material INSIDE the image.
+# 4. Build standard locales.
 # 5. Set the default system timezone to be UTC.
 # 6. Install third party javascript files.
+# 7. Apply patches
+
+# Patch files that are applied below
+COPY docker-config/imagemagick-allow-pdf-read.patch /tmp
 
 RUN echo "PATH=$PATH:$APP_ROOT/webwork2/bin" >> /root/.bashrc \
-	&& cd $APP_ROOT/pg/lib/chromatic && gcc color.c -o color  \
+	&& mkdir /run/webwork2 /etc/ssl/local \
 	&& cd $APP_ROOT/webwork2/ \
-		&& chown www-data DATA ../courses logs tmp $APP_ROOT/pg/lib/chromatic \
-		&& chmod -R u+w DATA ../courses logs tmp $APP_ROOT/pg/lib/chromatic   \
+		&& chown www-data DATA ../courses logs tmp /etc/ssl/local /run/webwork2 \
+		&& chmod -R u+w DATA ../courses logs tmp /run/webwork2 /etc/ssl/local \
 	&& echo "en_US ISO-8859-1\nen_US.UTF-8 UTF-8" > /etc/locale.gen \
 		&& /usr/sbin/locale-gen \
 		&& echo "locales locales/default_environment_locale select en_US.UTF-8\ndebconf debconf/frontend select Noninteractive" > /tmp/preseed.txt \
@@ -132,79 +90,23 @@ RUN echo "PATH=$PATH:$APP_ROOT/webwork2/bin" >> /root/.bashrc \
 	&& cd $WEBWORK_ROOT/htdocs \
 		&& npm install \
 	&& cd $PG_ROOT/htdocs \
-		&& npm install
-
-# These lines were moved into docker-entrypoint.sh so the bind mount of courses will be available
-#RUN cd $APP_ROOT/webwork2/courses.dist \
-#    && cp *.lst $APP_ROOT/courses/ \
-#    && cp -R modelCourse $APP_ROOT/courses/
-
-# ==================================================================
-# Phase 5 - setup apache
-
-# Note we always create the /etc/ssl/local directory in case it will be needed, as
-# the SSL config can also be done via a modified docker-entrypoint.sh script.
-
-# Always provide the dummy default-ssl.conf file:
-COPY docker-config/ssl/default-ssl.conf /etc/apache2/sites-available/default-ssl.conf
-
-# Patch files that are applied below
-COPY docker-config/xmlrpc-lite-utf8-fix.patch /tmp
-COPY docker-config/imagemagick-allow-pdf-read.patch /tmp
-
-# However SSL will only be enabled at container startup via docker-entrypoint.sh.
-
-RUN cd $APP_ROOT/webwork2/conf \
-	&& cp webwork.apache2.4-config.dist webwork.apache2.4-config \
-	&& cp $APP_ROOT/webwork2/conf/webwork.apache2.4-config /etc/apache2/conf-enabled/webwork.conf \
-	&& a2dismod mpm_event \
-	&& a2enmod mpm_prefork rewrite \
-	&& sed -i -e 's/Timeout 300/Timeout 1200/' /etc/apache2/apache2.conf \
-	&& sed -i -e 's/MaxRequestWorkers     150/MaxRequestWorkers     20/' \
-		-e 's/MaxConnectionsPerChild   0/MaxConnectionsPerChild   100/' \
-		/etc/apache2/mods-available/mpm_prefork.conf \
-	&& cp $APP_ROOT/webwork2/htdocs/favicon.ico /var/www/html \
-	&& mkdir -p $APACHE_RUN_DIR $APACHE_LOCK_DIR $APACHE_LOG_DIR \
-	&& mkdir /etc/ssl/local  \
-	&& sed -i -e 's/^<Perl>$/\
-	PerlPassEnv WEBWORK_URL\n\
-	PerlPassEnv WEBWORK_ROOT_URL\n\
-	PerlPassEnv WEBWORK_DB_DRIVER\n\
-	PerlPassEnv WEBWORK_DB_NAME\n\
-	PerlPassEnv WEBWORK_DB_HOST\n\
-	PerlPassEnv WEBWORK_DB_PORT\n\
-	PerlPassEnv WEBWORK_DB_USER\n\
-	PerlPassEnv WEBWORK_DB_PASSWORD\n\
-	PerlPassEnv WEBWORK_SMTP_SERVER\n\
-	PerlPassEnv WEBWORK_SMTP_SENDER\n\
-	PerlPassEnv WEBWORK_TIMEZONE\n\
-	\n<Perl>/' /etc/apache2/conf-enabled/webwork.conf \
-	&& patch -p1 -d / < /tmp/xmlrpc-lite-utf8-fix.patch \
-	&& rm /tmp/xmlrpc-lite-utf8-fix.patch \
+		&& npm install \
 	&& patch -p1 -d / < /tmp/imagemagick-allow-pdf-read.patch \
 	&& rm /tmp/imagemagick-allow-pdf-read.patch
 
-EXPOSE 80
-WORKDIR $APP_ROOT
-
-# Enabling SSL is NOT done here.
-# Instead it is done by docker-entrypoint.sh at container startup when SSL=1
-#     is set in the environment, for example by docker-compose.yml.
-#RUN a2enmod ssl && a2ensite default-ssl
-#EXPOSE 443
-
 # ==================================================================
-# Phase 6 - prepare docker-entrypoint.sh
+# Phase 5 - Final setup and prepare docker-entrypoint.sh
 # Done near the end, so that an update to docker-entrypoint.sh can be
 # done without rebuilding the earlier layers of the Docker image.
 
+EXPOSE 8080
+WORKDIR $WEBWORK_ROOT
+
 COPY docker-config/docker-entrypoint.sh /usr/local/bin/
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 
-# ==================================================================
 # Add enviroment variables to control some things during container startup
-
 ENV SSL=0 \
 	PAPERSIZE=letter \
 	SYSTEM_TIMEZONE=UTC \
@@ -213,4 +115,4 @@ ENV SSL=0 \
 
 # ================================================
 
-CMD ["apache2", "-DFOREGROUND"]
+CMD ["sudo", "-E", "-u", "www-data", "hypnotoad", "-f", "bin/webwork2"]
diff --git a/LICENSE b/LICENSE
index 13eb7cf504..4b31d3c4ce 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2,7 +2,7 @@
                          Online Homework Delivery System
                                    Version 2.*
 
-                    Copyright 2000-2022, The WeBWorK Project
+                    Copyright 2000-2023, The WeBWorK Project
 
                               All rights reserved.
 
diff --git a/README b/README
deleted file mode 100644
index 38019e05bf..0000000000
--- a/README
+++ /dev/null
@@ -1,11 +0,0 @@
-                                        WeBWorK
-                         Online Homework Delivery System
-                                   Version 2.*
-                        Branch:  github.com/openwebwork
-
-	          http://webwork.maa.org/wiki/Release_notes_for_WeBWorK_2.17
-                    Copyright 2000-2022, The WeBWorK Project
-
-                             http://webwork.maa.org
-                              All rights reserved.
-
diff --git a/README.md b/README.md
index 34af2dd202..d5f10fbd23 100644
--- a/README.md
+++ b/README.md
@@ -3,58 +3,34 @@
                                    Version 2.*
                         Branch:  github.com/openwebwork
 
-             https://webwork.maa.org/wiki/Release_notes_for_WeBWorK_2.17
-                    Copyright 2000-2022, The WeBWorK Project
+             https://webwork.maa.org/wiki/Release_notes_for_WeBWorK_2.18
+                    Copyright 2000-2023, The WeBWorK Project
                              https://openwebwork.org/
-                             http://webwork.maa.org
                               All rights reserved.
 
 # Welcome to WeBWorK
 
-WeBWorK is an open-source online homework system for math and sciences courses. WeBWorK is supported by the MAA and the NSF and comes with an Open Problem Library (OPL) of over 30,000 homework problems. Problems in the OPL target most lower division undergraduate math courses and some advanced courses. Supported courses include college algebra, discrete mathematics, probability and statistics, single and multivariable calculus, differential equations, linear algebra and complex analysis.  Find out more at the main WeBWorK [webpage](http://webwork.maa.org).
+WeBWorK is an open-source online homework system for math and sciences courses. WeBWorK is supported by the MAA and the NSF and comes with an Open Problem Library (OPL) of over 30,000 homework problems. Problems in the OPL target most lower division undergraduate math courses, some advanced courses and some other STEM subjects. Supported courses include college algebra, discrete mathematics, probability and statistics, single and multivariable calculus, differential equations, linear algebra and complex analysis.  Find out more at the main WeBWorK [webpage](https://openwebwork.org).
 
 ## Information for Users
 
 New users interested in getting started with their own WeBWorK server, or instructors looking to learn more about how to use WeBWorK in their classes, should take a look at one of the following resources:
+
 *  The [WeBWorK project home page](https://openwebwork.org/) - General information and resources including announcements of events and important project news
-*  [WeBWorK wiki](http://webwork.maa.org/wiki/Main_Page) - The main WeBWorK wiki
-*  [Instructors](http://webwork.maa.org/wiki/Instructors) - Information for Instructors
-*  [Problem Authors](http://webwork.maa.org/wiki/Authors) - Information for Problem Authors
-*  [WW_Install](http://github.com/aubreyja/ww_install) - Information for using the WW_install script
-*  [Forum](http://webwork.maa.org/moodle/mod/forum/index.php?id=3) - The WeBWorK Forum
+*  [WeBWorK wiki](https://webwork.maa.org/wiki/Main_Page) - The main WeBWorK wiki
+*  [Installing WeBWorK](https://webwork.maa.org/wiki/Manual_Installation_Guides) - Installing WeBWorK
+*  [Instructors](https://webwork.maa.org/wiki/Instructors) - Information for Instructors
+*  [Problem Authors](https://webwork.maa.org/wiki/Authors) - Information for Problem Authors
+*  [Forum](http://webwork.maa.org/moodle/mod/forum/index.php?id=3) - The WeBWorK Forum for getting help from the community
 *  [Frequently Asked Questions](https://github.com/openwebwork/webwork2/wiki/Frequently-Asked-Questions) - A list of frequently asked questions.
 
-## Information for downloading
+## Information for Downloading
 
-* The current version is WeBWorK-2.17 and its companion PG-2.17
+* The current version is WeBWorK-2.18 and its companion PG-2.18
 
 * Installation manuals can be found at https://webwork.maa.org/wiki/Category:Installation_Manuals
 
-* If you would prefer to download a previous release, say WeBWorK 2.14, then run the following commands:
-
-```
-cd /opt/webwork/webwork2
-git checkout -b WeBWorK2.14+ WeBWorK2.14+
-```
-* If you want to pull the PG-2.14 branch of pg then run:
-
-```
-cd /opt/webwork/pg
-git checkout -b PG-2.14+ PG-2.14+
-```
-* If you also need an earlier branch of MathJax then run:
-
-```
-cd /opt/webwork/MathJax
-git checkout legacy-v2
-```
-
-* A tab to the upper right lists the releases that are available.
-
 ## Information For Developers
 
-People interested in developing new features for WeBWorK should take a look at the following resources.  People interested in developing new problems for WeBWorK should visit [Problem Authors](http://webwork.maa.org/wiki/Authors).
-*  [First Time Setup](https://github.com/openwebwork/webwork2/wiki/First-Time-Setup) - Setting up your clone of this github repo for the first time.
-*  [Coding and Workflow](https://github.com/openwebwork/webwork2/wiki/Coding-and-Workflow) -  Our suggested workflow processes.  Following this will make it much easier to get code accepted into the repo.
-*  [Creating Pull Requests](https://github.com/openwebwork/webwork2/wiki/Creating-Pull-Requests) - Instructions on how to submit a pull request.
-*  [More Information](https://github.com/openwebwork/webwork2/wiki/) - Our Github wiki has additional information for developers, including information about WeBWorK3.
+* People interested in developing new features for WeBWorK can start at https://webwork.maa.org/wiki/Category:Developers, or start a [discussion on GitHub](https://github.com/openwebwork/webwork2/discussions) to engage with the current developers.
+* People interested in developing new problems for WeBWorK should visit [Problem Authors](http://webwork.maa.org/wiki/Authors).
diff --git a/README.md.bak b/README.md.bak
deleted file mode 100644
index d5acabaf93..0000000000
--- a/README.md.bak
+++ /dev/null
@@ -1,43 +0,0 @@
-This is a rough draft of our developer instructions, so parts of it are likely missing or wrong. Any corrections/additions are welcome
-
-We're trying to follow [git flow](http://nvie.com/posts/a-successful-git-branching-model/) so it would be a good idea for developers to read up on it 
-and [install](https://github.com/nvie/gitflow/wiki/Installation) the commandline tools.  
-We're working on getting our own, more specific, documentation up about our desired development flow.
-
-Here are the basics to get you set up developing.
-
-First create an account/login to github.  Head to the https://github.com/openwebwork/webwork2 and click **fork**.
-
-Once that's done, clone your newly forked repo to your local computer and add openwebwork as an upstream.
-
-```
-git remote add upstream git://github.com/openwebwork/webwork2.git
-```
-
-I'd also recomend making sure the develop branch is pulled down from openwebwork and ready to push up to your github repo.
-
-```
-git checkout -b develop upstream/develop
-git branch --set-upstream develop origin/develop
-```
-
-This will let you keep your version up to date with the official one.
-
-The rest of these instructions will assume your using the [git flow commandline](https://github.com/nvie/gitflow/wiki/Command-Line-Arguments).. if you're not, there are equivilant commands in pure git.
-
-First get your local repo ready for git flow
-
-```
-git flow init
-```
-
-Here are the basics for working on a new feature
-
-```
-git flow feature start <name>
-```
-
-then make your changes, and when ready push everything up to your github for people to see `git push origin`.
-
-When your feature is stable (or close) you can issue a pull requst on github from your feature branch to the openwebwork/webwork2 develop branch.
-Including a comment stating what the feature is and any more information would be great.
diff --git a/README_js_organization b/README_js_organization
deleted file mode 100644
index c7190202ca..0000000000
--- a/README_js_organization
+++ /dev/null
@@ -1,11 +0,0 @@
-This is the README file for the WeBWorK htdocs/js folder. 
-
-Please follow these guidelines for putting javascript in your webwork pages. 
-
-
-app:    This directory contain the "new" finished apps for WeBWork. 
-  	     Each app should have its own directory.
-
-vendor:  This is the directory for all 3rd party javascript files. 
-         If it is a single file, then it should just go in the vendor directory
-         All bundles should go in a directory (i.e. Jquery and plugins.)
diff --git a/VERSION b/VERSION
index 53be6dc71a..ac85d97229 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-$WW_VERSION = '2.17';
-$WW_COPYRIGHT_YEARS = '1996-2022';
+$WW_VERSION = '2.18';
+$WW_COPYRIGHT_YEARS = '1996-2023';
 
 1;
diff --git a/assets/hardcopyThemes/README.md b/assets/hardcopyThemes/README.md
new file mode 100644
index 0000000000..6ee6ca1d35
--- /dev/null
+++ b/assets/hardcopyThemes/README.md
@@ -0,0 +1,101 @@
+# Hardcopy Themes
+
+A hardcopy theme is an XML file with root `<theme>`.  The `<theme>` element has an attirubute `label` that is used to
+define a label for the theme, for example, `label="Empty"`.  It has children:
+
+* `<description>`
+* `<preamble>`
+* `<presetheader>`
+* `<postsetheader>`
+* `<problemheader>`
+* `<problemfooter>`
+* `<problemdivider>`
+* `<setfooter>`
+* `<setdivider>`
+* `<userdivider>`
+* `<postamble>`
+
+The `<description>` element contains a simple text description of the theme.  All other elements contain text snippets
+that will be inserted into a `.tex` file.
+
+The `<preamble>` and `<postamble>` wrap the file.  Note that `webwork2` will write `\batchmode` to the `.tex` file even
+before `<preamble>` is written.  The `<preamble>` must include `\usepackage{webwork2}` to load `webwork2.sty` for many
+things to work.
+
+Next `webwork2` will loop through users (often just one) and loop through problem sets (often just one) and write TeX
+for all combinations.  `<userdivider>` and `<setdivider>` are snippets of TeX that are inserted when transitioning to a
+new user or a new set.  Typically these should just start a new page and reset page numbering.
+
+When an individual user-set is being processed, first the `<presetheader>` snippet will be used.  Then the PG header
+file will be processed.  Then the `<postsetheader>` snippet will be used.  At the end of the set `webwork2` attempts to
+make the last page display a copyright claim.  Then the `<setfooter>` snippet is used.
+
+Each problem is wrapped in `<problemheader>` and `<problemfooter>`, and `<problemdivider>` is used between adjacent
+problems.
+
+## Packages
+
+A theme preamble can load packages, but as soon as it loads `webwork2`, it is already loading `path`, `listings`,
+`hyperref`, and `ifthen`.  So you can use tools from these packages without loading them in your theme.
+
+Also `webwork2` loads `pg.sty` from the `pg` distribution.  This loads `amsmath`, `amsfonts`, `amssymb`, `booktabs`,
+`tabularx`, `colortbl`, `caption`, `xcolor`, `multicol`, `mhchem`, and `graphicx`.  So again you can use tools from
+these packages without loading them in your theme.
+
+## Macros
+
+The following macros are provided by the `webwork2` package. They may be empty, but `webwork2` should populate them
+with appropriate values as the `.tex` file is built. So you can use these when building your theme.
+
+* `\webworkCourseName`
+* `\webworkCourseTitle`
+* `\webworkCourseURL`
+* `\webworkUserId` (the user's username)
+* `\webworkStudentId` (the user's Student ID)
+* `\webworkFirstName`
+* `\webworkLastName`
+* `\webworkEmailAddress`
+* `\webworkSection`
+* `\webworkRecitation`
+* `\webworkSetId` (the actual name of the set which may have underscores)
+* `\webworkPrettySetId` (a version where underscores have been converted to spaces)
+* `\webworkDescription`
+* `\webworkOpenDate`
+* `\webworkReducedScoringDate`
+* `\webworkDueDate`
+* `\webworkAnswerDate`
+* `\webworkProblemNumber` (the number of the problem in the set)
+* `\webworkProblemId` (may differ from the problem number for a versioned test with randomized order)
+* `\webworkProblemWeight`
+* `\webworkLeftHeader` (a multiline expression with the set name and due date(s))
+* `\webworkCenterHeader` (empty by default)
+* `\webworkRightHeader` (a multiline expression with the user's name, ID, section, and recitation)
+* `\webworkLeftFooter` (a hyperlink to the course with text the course title)
+* `\webworkCenterFooter` (empty by default)
+* `\webworkRightFooter` (localized "Page" followed by the page number)
+
+Words and phrases might be localized automatically by `webwork2` in the future, but a theme can override these.
+
+* `\webworkLocalizeAssignment`
+* `\webworkLocalizeSet`
+* `\webworkLocalizeProblem`
+* `\webworkLocalizeUsername`
+* `\webworkLocalizeFullCreditBy`
+* `\webworkLocalizeCloses`
+* `\webworkLocalizeSection`
+* `\webworkLocalizeRecitation`
+* `\webworkLocalizePage`
+* `\webworkLocalizePoint`
+
+## Config
+
+Theme files belong in `webwork2/assets/hardcopyThemes` or in a course's `templates/hardcopyThemes` folder.  Both of
+these paths can be configured in `localOverrides.conf`, following the initialization in `defaults.config`. If a theme
+in `templates/hardcopyThemes` has the same filename as a theme in `webwork2/assets/hardcopyThemes`, the one from
+`templates/hardcopyThemes` will be used.
+
+A course will "see" all the theme files in these locations and make them available to be enabled in Course Config.
+Only the enabled themes will be offered for use when producing a hardcopy.
+
+In addition to enabling themes in Course Config, you can also set the default hardcopy theme for regular hardcopy
+production, and separately set a default hardcopy theme for use by the PG Editor.
diff --git a/assets/hardcopyThemes/basic.xml b/assets/hardcopyThemes/basic.xml
new file mode 100644
index 0000000000..46b8b8f7ab
--- /dev/null
+++ b/assets/hardcopyThemes/basic.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<theme label="Basic">
+
+<description>
+This theme produces hardcopies with minimal page headers displaying the set
+title and useername, and minimal problem numbering.
+</description>
+
+<preamble>
+\documentclass{article}
+\usepackage{webwork2}
+\usepackage[text={6in,9in},centering]{geometry}
+\usepackage{fancyhdr}
+\renewcommand{\webworkLeftHeader}{%
+\ifthenelse{\equal{\webworkPrettySetId}{}}{}{\ifthenelse{\thepage=1}{\large\scshape\webworkLocalizeSet: \webworkPrettySetId}{}}%
+}
+\renewcommand{\webworkRightHeader}{%
+\ifthenelse{\equal{\webworkUserId}{}}{}{\ifthenelse{\thepage=1}{\bfseries\webworkLocalizeUsername: \webworkUserId}{}}%
+}
+\parindent=0pt
+\pagestyle{fancy}
+\begin{document}
+</preamble>
+
+<presetheader>
+\renewcommand{\headrulewidth}{0pt}
+\fancyhead[L]{\webworkLeftHeader}
+\fancyhead[C]{\webworkCenterHeader}
+\fancyhead[R]{\webworkRightHeader}
+\fancyfoot[L]{\webworkLeftFooter}
+\fancyfoot[C]{\webworkCenterFooter}
+\fancyfoot[R]{\webworkRightFooter}
+</presetheader>
+
+<postsetheader>
+\bigskip
+</postsetheader>
+
+<problemheader>
+{\bfseries\webworkLocalizeProblem~\ifthenelse{\equal{\webworkProblemNumber}{}}{\#}{\webworkProblemNumber}}
+\nobreak
+\smallskip
+</problemheader>
+
+<problemfooter></problemfooter>
+
+<problemdivider>
+\vspace{2pc+6pc-1pc}
+\goodbreak
+</problemdivider>
+
+<setfooter>
+</setfooter>
+
+<setdivider>
+\newpage
+\setcounter{page}{1}
+</setdivider>
+
+<userdivider>
+\newpage
+\setcounter{page}{1}
+</userdivider>
+
+<postamble>
+\end{document}
+</postamble>
+
+</theme>
diff --git a/assets/hardcopyThemes/basicTwoCol.xml b/assets/hardcopyThemes/basicTwoCol.xml
new file mode 100644
index 0000000000..ccb11b0dc9
--- /dev/null
+++ b/assets/hardcopyThemes/basicTwoCol.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<theme label="Basic&#x2014;Two Column">
+
+<description>
+This theme produces hardcopies with minimal page headers displaying the set
+title and useername, and minimal problem numbering. With two columns.
+</description>
+
+<preamble>
+\documentclass{article}
+\usepackage{webwork2}
+\usepackage[text={6in,9in},centering]{geometry}
+\setlength{\columnsep}{.25in}
+\setlength{\columnseprule}{.4pt}
+\usepackage{fancyhdr}
+\renewcommand{\webworkLeftHeader}{%
+\ifthenelse{\equal{\webworkPrettySetId}{}}{}{\ifthenelse{\thepage=1}{\large\scshape\webworkLocalizeSet: \webworkPrettySetId}{}}%
+}
+\renewcommand{\webworkRightHeader}{%
+\ifthenelse{\equal{\webworkUserId}{}}{}{\ifthenelse{\thepage=1}{\bfseries\webworkLocalizeUsername: \webworkUserId}{}}%
+}
+\parindent=0pt
+\pagestyle{fancy}
+\begin{document}
+</preamble>
+
+<presetheader>
+\renewcommand{\headrulewidth}{0pt}
+\fancyhead[L]{\webworkLeftHeader}
+\fancyhead[C]{\webworkCenterHeader}
+\fancyhead[R]{\webworkRightHeader}
+\fancyfoot[L]{\webworkLeftFooter}
+\fancyfoot[C]{\webworkCenterFooter}
+\fancyfoot[R]{\webworkRightFooter}
+</presetheader>
+
+<postsetheader>
+\bigskip
+\begin{multicols*}{2}
+</postsetheader>
+
+<problemheader>
+{\bfseries\webworkLocalizeProblem~\ifthenelse{\equal{\webworkProblemNumber}{}}{\#}{\webworkProblemNumber}}
+\nobreak
+\smallskip
+</problemheader>
+
+<problemfooter></problemfooter>
+
+<problemdivider>
+\vspace{2pc+6pc-1pc}
+\goodbreak
+</problemdivider>
+
+<setfooter>
+\end{multicols*}
+</setfooter>
+
+<setdivider>
+\newpage
+\setcounter{page}{1}
+</setdivider>
+
+<userdivider>
+\newpage
+\setcounter{page}{1}
+</userdivider>
+
+<postamble>
+\end{document}
+</postamble>
+
+</theme>
diff --git a/assets/hardcopyThemes/boxed.xml b/assets/hardcopyThemes/boxed.xml
new file mode 100644
index 0000000000..0ffccad8ff
--- /dev/null
+++ b/assets/hardcopyThemes/boxed.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<theme label="Boxed">
+
+<description>
+This theme uses the tcolorbox package to put each exercisee in a box.
+</description>
+
+<preamble>
+\documentclass[11pt]{article}
+\usepackage{webwork2}
+\usepackage[text={7in,9in},centering]{geometry}
+\usepackage{tcolorbox}
+\tcbuselibrary{breakable, skins}
+\newtcolorbox{webworkexercise}[2]{
+	breakable,
+	enhanced jigsaw,
+	title={
+	        {\bfseries\webworkLocalizeProblem~\ifthenelse{\equal{#1}{}}{\#}{#1}}\hfill
+		(\ifthenelse{\equal{#2}{}}{\#}{#2}~\webworkLocalizePoint)
+	}
+}
+\usepackage{fancyhdr}
+\parindent=0pt
+\setlength{\parskip}{1pc}
+\pagestyle{fancy}
+\begin{document}
+</preamble>
+
+<presetheader>
+\renewcommand{\headrulewidth}{0pt}
+\fancyhead[L]{\webworkLeftHeader}
+\fancyhead[C]{\webworkCenterHeader}
+\fancyhead[R]{\webworkRightHeader}
+\fancyfoot[L]{\webworkLeftFooter}
+\fancyfoot[C]{\webworkCenterFooter}
+\fancyfoot[R]{\webworkRightFooter}
+</presetheader>
+
+<postsetheader>
+\medskip
+</postsetheader>
+
+<problemheader>%
+\begin{webworkexercise}{\webworkProblemNumber}{\webworkProblemWeight}%
+</problemheader>
+
+<problemfooter>%
+\end{webworkexercise}%
+</problemfooter>
+
+<problemdivider>
+\smallskip
+\goodbreak
+</problemdivider>
+
+<setfooter></setfooter>
+
+<setdivider>
+\newpage%
+\setcounter{page}{1}%
+</setdivider>
+
+<userdivider>
+\newpage%
+\setcounter{page}{1}%
+</userdivider>
+
+<postamble>
+\end{document}
+</postamble>
+
+</theme>
diff --git a/assets/hardcopyThemes/boxedRows.xml b/assets/hardcopyThemes/boxedRows.xml
new file mode 100644
index 0000000000..f48d6ab712
--- /dev/null
+++ b/assets/hardcopyThemes/boxedRows.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<theme label="Boxed&#x2014;Rows">
+
+<description>
+This theme uses the tcolorbox package to put each exercisee in a box.
+Exercises progress row-major instead of the usual column-major, in two columns.
+Exerecises in this theme will not break across pages, so this theme is better
+suited for sets with short exercises.
+</description>
+
+<preamble>
+\documentclass[10pt]{article}
+\usepackage{webwork2}
+\usepackage[text={7.5in,9in},centering]{geometry}
+\usepackage{tcolorbox}
+\tcbuselibrary{raster}
+\newtcolorbox{webworkexercise}[2]{
+        title={
+                {\bfseries\webworkLocalizeProblem~\ifthenelse{\equal{#1}{}}{\#}{#1}}\hfill
+                (\ifthenelse{\equal{#2}{}}{\#}{#2}~\webworkLocalizePoint)
+        },
+}
+
+\usepackage{fancyhdr}
+\parindent=0pt
+\setlength{\parskip}{1pc}
+\pagestyle{fancy}
+\begin{document}
+</preamble>
+
+<presetheader>
+\renewcommand{\headrulewidth}{0pt}
+\fancyhead[L]{\webworkLeftHeader}
+\fancyhead[C]{\webworkCenterHeader}
+\fancyhead[R]{\webworkRightHeader}
+\fancyfoot[L]{\webworkLeftFooter}
+\fancyfoot[C]{\webworkCenterFooter}
+\fancyfoot[R]{\webworkRightFooter}
+</presetheader>
+
+<presetheader>
+\bigskip
+\begin{tcbraster}[raster columns=2, raster valign=top]
+</presetheader>
+
+<problemheader>\begin{webworkexercise}{\webworkProblemNumber}{\webworkProblemWeight}%</problemheader>
+
+<problemfooter>\end{webworkexercise}</problemfooter>
+
+<problemdivider></problemdivider>
+
+<setfooter>\end{tcbraster}</setfooter>
+
+<setdivider>
+\newpage%
+\setcounter{page}{1}%
+</setdivider>
+
+<userdivider>
+\newpage%
+\setcounter{page}{1}%
+</userdivider>
+
+<postamble>
+\end{document}
+</postamble>
+
+</theme>
diff --git a/assets/hardcopyThemes/boxedTwoCol.xml b/assets/hardcopyThemes/boxedTwoCol.xml
new file mode 100644
index 0000000000..03a776a693
--- /dev/null
+++ b/assets/hardcopyThemes/boxedTwoCol.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<theme label="Boxed&#x2014;Two Column">
+
+<description>
+This theme uses the tcolorbox package to put each exercisee in a box.
+With two columns.
+</description>
+
+<preamble>
+\documentclass[10pt]{article}
+\usepackage{webwork2}
+\usepackage[text={7in,9in},centering]{geometry}
+\usepackage{tcolorbox}
+\tcbuselibrary{breakable, skins}
+\newtcolorbox{webworkexercise}[2]{
+	breakable,
+	enhanced jigsaw,
+	title={
+                {\bfseries\webworkLocalizeProblem~\ifthenelse{\equal{#1}{}}{\#}{#1}}\hfill
+                (\ifthenelse{\equal{#2}{}}{\#}{#2}~\webworkLocalizePoint)
+	}
+}
+\setlength{\columnsep}{.2in}
+\usepackage{fancyhdr}
+\parindent=0pt
+\setlength{\parskip}{1pc}
+\pagestyle{fancy}
+\begin{document}
+</preamble>
+
+<presetheader>
+\renewcommand{\headrulewidth}{0pt}
+\fancyhead[L]{\webworkLeftHeader}
+\fancyhead[C]{\webworkCenterHeader}
+\fancyhead[R]{\webworkRightHeader}
+\fancyfoot[L]{\webworkLeftFooter}
+\fancyfoot[C]{\webworkCenterFooter}
+\fancyfoot[R]{\webworkRightFooter}
+</presetheader>
+
+<postsetheader>
+\medskip
+\begin{multicols*}{2}
+</postsetheader>
+
+<problemheader>%
+\begin{webworkexercise}{\webworkProblemNumber}{\webworkProblemWeight}%
+</problemheader>
+
+<problemfooter>%
+\end{webworkexercise}%
+</problemfooter>
+
+<problemdivider>
+\smallskip
+\goodbreak
+</problemdivider>
+
+<setfooter>
+\end{multicols*}
+</setfooter>
+
+<setdivider>
+\newpage%
+\setcounter{page}{1}%
+</setdivider>
+
+<userdivider>
+\newpage%
+\setcounter{page}{1}%
+</userdivider>
+
+<postamble>
+\end{document}
+</postamble>
+
+</theme>
diff --git a/assets/hardcopyThemes/classic.xml b/assets/hardcopyThemes/classic.xml
new file mode 100644
index 0000000000..dd67f8c37e
--- /dev/null
+++ b/assets/hardcopyThemes/classic.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<theme label="Classic">
+
+<description>
+This theme produces hardcopies styled as hardcopies were prior to version 2.18.
+</description>
+
+<preamble>
+\documentclass[11pt]{amsart}
+\usepackage{webwork2}
+\usepackage{pslatex}
+\usepackage{fullpage}
+\parindent=0pt
+\begin{document}
+</preamble>
+
+<presetheader>
+\noindent {\large \bfseries \webworkFirstName\ \webworkLastName}
+\hfill
+{\large \bfseries \webworkCourseName}
+\par
+\ifx\webworkSetId\empty\else\noindent{\large \bfseries {\webworkLocalizeAssignment\ \webworkSetId\ due \webworkDueDate}}\fi
+</presetheader>
+
+<postsetheader>
+\medskip\hrule\nobreak\smallskip
+</postsetheader>
+
+<problemheader>
+{\bfseries\webworkLocalizeProblem~\ifthenelse{\equal{\webworkProblemNumber}{}}{\#}{\webworkProblemNumber}.}
+{\bfseries\footnotesize(\ifthenelse{\equal{\webworkProblemWeight}{}}{\#}{\webworkProblemWeight}~\webworkLocalizePoint)}
+\nobreak
+\smallskip
+</problemheader>
+
+<problemfooter></problemfooter>
+
+<problemdivider>
+\vfill
+\goodbreak
+\hrule
+\nobreak
+\smallskip
+</problemdivider>
+
+<setfooter>
+\nobreak\noindent {\tiny Generated by \copyright WeBWorK, https://openwebwork.org, The~WeBWorK~Project}
+</setfooter>
+
+<setdivider>
+\newpage%
+\setcounter{page}{1}%
+</setdivider>
+
+<userdivider>
+\newpage%
+\setcounter{page}{1}%
+</userdivider>
+
+<postamble>
+
+\vfill
+\end{document}
+</postamble>
+
+</theme>
diff --git a/assets/hardcopyThemes/classicTwoCol.xml b/assets/hardcopyThemes/classicTwoCol.xml
new file mode 100644
index 0000000000..c733bbafad
--- /dev/null
+++ b/assets/hardcopyThemes/classicTwoCol.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<theme label="Classic&#x2014;Two Column">
+
+<description>
+This theme produces hardcopies styled as hardcopies were prior to version 2.18.
+</description>
+
+<preamble>
+\documentclass[11pt]{amsart}
+\usepackage{webwork2}
+\usepackage{pslatex}
+\usepackage{fullpage}
+\setlength{\columnsep}{.25in}
+\setlength{\columnseprule}{.4pt}
+\parindent=0pt
+\begin{document}
+</preamble>
+
+<presetheader>
+\noindent {\large \bfseries \webworkFirstName\ \webworkLastName}
+\hfill
+{\large \bfseries \webworkCourseName}
+\par
+\ifx\webworkSetId\empty\else\noindent{\large \bfseries {\webworkLocalizeAssignment\ \webworkSetId\ due \webworkDueDate}}\fi
+</presetheader>
+
+<postsetheader>
+\medskip\hrule\nobreak\smallskip
+\begin{multicols}{2}\raggedcolumns
+</postsetheader>
+
+<problemheader>
+{\bfseries\webworkLocalizeProblem~\ifthenelse{\equal{\webworkProblemNumber}{}}{\#}{\webworkProblemNumber}.}
+{\bfseries\footnotesize(\ifthenelse{\equal{\webworkProblemWeight}{}}{\#}{\webworkProblemWeight}~\webworkLocalizePoint)}
+\nobreak
+\smallskip
+</problemheader>
+
+<problemfooter></problemfooter>
+
+<problemdivider>
+\vfill
+\goodbreak
+\hrule
+\nobreak
+\smallskip
+</problemdivider>
+
+<setfooter>
+\end{multicols}\nobreak\noindent {\tiny Generated by \copyright WeBWorK, https://openwebwork.org, The~WeBWorK~Project}
+</setfooter>
+
+<setdivider>
+\newpage%
+\setcounter{page}{1}%
+</setdivider>
+
+<userdivider>
+\newpage%
+\setcounter{page}{1}%
+</userdivider>
+
+<postamble>
+
+\vfill
+\end{document}
+</postamble>
+
+</theme>
diff --git a/assets/hardcopyThemes/empty.xml b/assets/hardcopyThemes/empty.xml
new file mode 100644
index 0000000000..0803c17bec
--- /dev/null
+++ b/assets/hardcopyThemes/empty.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<theme label="Empty">
+
+<description>
+This theme is meant for rendering problems with no metadata or styling beyond
+the LaTeX defaults for the article class. Each problem gets its own page,
+including the PG header.
+</description>
+
+<preamble>
+\documentclass{article}
+\usepackage{webwork2}
+\pagestyle{empty}
+\parindent=0pt
+\begin{document}
+</preamble>
+
+<presetheader></presetheader>
+
+<postsetheader></postsetheader>
+
+<problemheader>
+\newpage
+</problemheader>
+
+<problemfooter></problemfooter>
+
+<problemdivider></problemdivider>
+
+<setfooter></setfooter>
+
+<setdivider>
+\newpage
+</setdivider>
+
+<userdivider>
+\newpage
+</userdivider>
+
+<postamble>
+\end{document}
+</postamble>
+
+</theme>
diff --git a/assets/hardcopyThemes/hebrew.xml b/assets/hardcopyThemes/hebrew.xml
new file mode 100644
index 0000000000..ff51e64932
--- /dev/null
+++ b/assets/hardcopyThemes/hebrew.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<theme label="Hebrew">
+
+<description>
+This theme is like "One Column" but with the necessary components to include
+Hebrew script. This theme should only be used if xelatex is the latex engine.
+</description>
+
+<preamble>
+\documentclass[11pt]{exam}
+\usepackage{webwork2}
+\usepackage[text={7.5in,9in},centering]{geometry}
+
+% bidi needs to be loaded AFTER caption, xcolor, and geometry.
+\usepackage{bidi}
+
+\setdefaultlanguage{hebrew}
+\setotherlanguage{english}
+\setmainfont{Frank Ruehl CLM}
+\setmonofont{Miriam Mono CLM}
+\setsansfont{Simple CLM}
+
+% When using default English
+% Use \begin{hebrew} block of text \end{hebrew} for paragraphs.
+%
+% When using default Hebrew
+% Use \begin{hebrew} block of text \end{hebrew} for paragraphs.
+
+% This removes the margin for questions from the exam class.
+\renewcommand{\questionshook}{\leftmargin=0pt\labelwidth=-\labelsep}
+\makeatletter
+\qformat{{\bfseries \webworkLocalizeProblem~\thequestiontitle.} \if@placepoints{\bfseries\footnotesize(\thepoints)}\fi \hfill}
+\makeatother
+\parindent=0pt
+\pagestyle{headandfoot}
+\begin{document}
+</preamble>
+
+<presetheader>
+\def\webworkLocalizeProblem{שאלה}
+% This needs a Hebrew localizations for
+\def\webworkLocalizeAssignment{Assignment}
+\def\webworkLocalizeFullCreditBy{full credit by}
+\def\webworkLocalizeCloses{closes}
+\def\webworkLocalizeSection{Section}
+\def\webworkLocalizeRecitation{Recitation}
+\def\webworkLocalizePage{Page}
+\firstpageheader{\webworkLeftHeader}{\webworkCenterHeader}{\webworkRightHeader}
+\runningheader{}{}{}
+\footer{\webworkLeftFooter}{\webworkCenterFooter}{\webworkRightFooter}
+</presetheader>
+
+<postsetheader>
+\smallskip
+\hrule
+\begin{questions}
+</postsetheader>
+
+<problemheader>
+\ifthenelse{\equal{\webworkProblemNumber}{}}{\question}{\titledquestion{\webworkProblemNumber}[\webworkProblemWeight]}
+</problemheader>
+
+<problemfooter></problemfooter>
+
+<problemdivider>
+\vfill
+\goodbreak
+\hrule
+\nobreak
+\smallskip
+</problemdivider>
+
+<setfooter>
+\end{questions}
+</setfooter>
+
+<setdivider>
+\newpage%
+\setcounter{page}{1}%
+</setdivider>
+
+<userdivider>
+\newpage%
+\setcounter{page}{1}%
+</userdivider>
+
+<postamble>
+\end{document}
+</postamble>
+
+</theme>
diff --git a/assets/hardcopyThemes/hebrewTwoCol.xml b/assets/hardcopyThemes/hebrewTwoCol.xml
new file mode 100644
index 0000000000..abcd6a5a3a
--- /dev/null
+++ b/assets/hardcopyThemes/hebrewTwoCol.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<theme label="Hebrew&#x2014;Two Column">
+
+<description>
+This theme is like "Two Column" but with the necessary components to include
+Hebrew script. This theme should only be used if xelatex is the latex engine.
+</description>
+
+
+<preamble>
+\documentclass[11pt]{exam}
+\usepackage{webwork2}
+\usepackage[text={7.5in,9in},centering]{geometry}
+\setlength{\columnsep}{.25in}
+\setlength{\columnseprule}{.4pt}
+
+% bidi needs to be loaded AFTER caption, xcolor, and geometry.
+\usepackage{bidi}
+
+\setdefaultlanguage{hebrew}
+\setotherlanguage{english}
+\setmainfont{Frank Ruehl CLM}
+\setmonofont{Miriam Mono CLM}
+\setsansfont{Simple CLM}
+
+% When using default English
+% Use \begin{hebrew} block of text \end{hebrew} for paragraphs.
+%
+% When using default Hebrew
+% Use \begin{hebrew} block of text \end{hebrew} for paragraphs.
+
+% This removes the margin for questions from the exam class.
+\renewcommand{\questionshook}{\leftmargin=0pt\labelwidth=-\labelsep}
+\makeatletter
+\qformat{{\bfseries \webworkLocalizeProblem~\thequestiontitle.} \if@placepoints{\bfseries\footnotesize(\thepoints)}\fi \hfill}
+\makeatother
+\parindent=0pt
+\pagestyle{headandfoot}
+\begin{document}
+</preamble>
+
+<presetheader>
+\def\webworkLocalizeProblem{שאלה}
+% This needs a Hebrew localizations for
+\def\webworkLocalizeAssignment{Assignment}
+\def\webworkLocalizeFullCreditBy{full credit by}
+\def\webworkLocalizeCloses{closes}
+\def\webworkLocalizeSection{Section}
+\def\webworkLocalizeRecitation{Recitation}
+\def\webworkLocalizePage{Page}
+\firstpageheader{\webworkLeftHeader}{\webworkCenterHeader}{\webworkRightHeader}
+\runningheader{}{}{}
+\footer{\webworkLeftFooter}{\webworkCenterFooter}{\webworkRightFooter}
+</presetheader>
+
+<postsetheader>
+\smallskip
+\hrule
+\begin{multicols*}{2}
+\begin{questions}
+</postsetheader>
+
+<problemheader>
+\ifthenelse{\equal{\webworkProblemId}{}\OR\equal{\webworkProblemId}{1}}{}{\hrule}
+\nobreak
+\smallskip
+\ifthenelse{\equal{\webworkProblemId}{}}{\question}{\titledquestion{\webworkProblemId}[\webworkProblemWeight]}
+</problemheader>
+
+<problemfooter></problemfooter>
+
+<problemdivider>
+\vfill
+\goodbreak
+\hrule
+\nobreak
+\smallskip
+</problemdivider>
+
+<setfooter>
+\end{questions}
+\end{multicols*}
+</setfooter>
+
+<setdivider>
+\newpage%
+\setcounter{page}{1}%
+</setdivider>
+
+<userdivider>
+\newpage%
+\setcounter{page}{1}%
+</userdivider>
+
+<postamble>
+\end{document}
+</postamble>
+
+</theme>
diff --git a/assets/hardcopyThemes/oneColumn.xml b/assets/hardcopyThemes/oneColumn.xml
new file mode 100644
index 0000000000..c78ce2bbfb
--- /dev/null
+++ b/assets/hardcopyThemes/oneColumn.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<theme label="One Column">
+
+<description>
+This theme uses the LaTeX exam class to manage page headers and footers, and
+question enumeration.
+</description>
+
+<preamble>
+\documentclass[11pt]{exam}
+\usepackage{webwork2}
+\usepackage[text={6.5in,9in},centering]{geometry}
+\extraheadheight[2pc]{0pt}
+% This removes the margin for questions from the exam class.
+\renewcommand{\questionshook}{\leftmargin=0pt\labelwidth=-\labelsep}
+\makeatletter
+\qformat{{\bfseries \webworkLocalizeProblem~\thequestiontitle.} \if@placepoints{\bfseries\footnotesize(\thepoints)}\fi \hfill}
+\makeatother
+\parindent=0pt
+\pagestyle{headandfoot}
+\begin{document}
+</preamble>
+
+<presetheader>
+\firstpageheader{\webworkLeftHeader}{\webworkCenterHeader}{\webworkRightHeader}
+\runningheader{}{}{}
+\footer{\webworkLeftFooter}{\webworkCenterFooter}{\webworkRightFooter}
+</presetheader>
+
+<postsetheader>
+\smallskip
+\hrule
+\begin{questions}
+</postsetheader>
+
+<problemheader>
+\titledquestion{\ifx\webworkProblemNumber\empty\#\else\webworkProblemNumber\fi}[\ifx\webworkProblemWeight\empty\#\else\webworkProblemWeight\fi]
+</problemheader>
+
+<problemfooter></problemfooter>
+
+<problemdivider>
+\vfill
+\goodbreak
+\hrule
+\nobreak
+\smallskip
+</problemdivider>
+
+<setfooter>
+\end{questions}
+</setfooter>
+
+<setdivider>
+\newpage%
+\setcounter{page}{1}%
+</setdivider>
+
+<userdivider>
+\newpage%
+\setcounter{page}{1}%
+</userdivider>
+
+<postamble>
+\end{document}
+</postamble>
+
+</theme>
diff --git a/assets/hardcopyThemes/twoColumn.xml b/assets/hardcopyThemes/twoColumn.xml
new file mode 100644
index 0000000000..990141aacc
--- /dev/null
+++ b/assets/hardcopyThemes/twoColumn.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<theme label="Two Column">
+
+<description>
+This theme uses the LaTeX exam class to manage page headers and footers, and
+question enumeration. With two columns.
+</description>
+
+<preamble>
+\documentclass[10pt]{exam}
+\usepackage{webwork2}
+\usepackage[text={7in,9in},centering]{geometry}
+\setlength{\columnsep}{.25in}
+\setlength{\columnseprule}{.4pt}
+\extraheadheight[2pc]{0pt}
+% This removes the margin for questions from the exam class.
+\renewcommand{\questionshook}{\leftmargin=0pt\labelwidth=-\labelsep}
+\makeatletter
+\qformat{{\bfseries \webworkLocalizeProblem~\thequestiontitle.} \if@placepoints{\bfseries\footnotesize(\thepoints)}\fi \hfill}
+\makeatother
+\parindent=0pt
+\pagestyle{headandfoot}
+\begin{document}
+</preamble>
+
+<presetheader>
+\firstpageheader{\webworkLeftHeader}{\webworkCenterHeader}{\webworkRightHeader}
+\runningheader{}{}{}
+\footer{\webworkLeftFooter}{\webworkCenterFooter}{\webworkRightFooter}
+</presetheader>
+
+<postsetheader>
+\smallskip
+\hrule
+\begin{multicols*}{2}
+\begin{questions}
+</postsetheader>
+
+<problemheader>
+\titledquestion{\ifx\webworkProblemNumber\empty\#\else\webworkProblemNumber\fi}[\ifx\webworkProblemWeight\empty\#\else\webworkProblemWeight\fi]
+</problemheader>
+
+<problemfooter></problemfooter>
+
+<problemdivider>
+\vfill
+\goodbreak
+\hrule
+\nobreak
+\smallskip
+</problemdivider>
+
+<setfooter>
+\end{questions}
+\end{multicols*}
+</setfooter>
+
+<setdivider>
+\newpage%
+\setcounter{page}{1}%
+</setdivider>
+
+<userdivider>
+\newpage%
+\setcounter{page}{1}%
+</userdivider>
+
+<postamble>
+\end{document}
+</postamble>
+
+</theme>
diff --git a/conf/snippets/blankProblem.pg b/assets/pg/blankProblem.pg
similarity index 95%
rename from conf/snippets/blankProblem.pg
rename to assets/pg/blankProblem.pg
index 205f7b7f56..474fbcc3c4 100644
--- a/conf/snippets/blankProblem.pg
+++ b/assets/pg/blankProblem.pg
@@ -11,7 +11,6 @@ loadMacros("PG.pl",
 
 ## Do NOT show partial correct answers
 $showPartialCorrectAnswers = 0;
-TEXT(beginproblem());
 
 BEGIN_TEXT
 
diff --git a/conf/snippets/blankProblem2.pg b/assets/pg/blankProblem2.pg
similarity index 91%
rename from conf/snippets/blankProblem2.pg
rename to assets/pg/blankProblem2.pg
index 04958fd784..2194340b65 100644
--- a/conf/snippets/blankProblem2.pg
+++ b/assets/pg/blankProblem2.pg
@@ -23,9 +23,6 @@ loadMacros(
    "PGcourse.pl",      # Customization file for the course
 );
 
-# Print problem number and point value (weight) for the problem
-TEXT(beginproblem());
-
 # Show which answers are correct and which ones are incorrect
 $showPartialCorrectAnswers = 1;
 
diff --git a/assets/pg/defaultSetHeader.pg b/assets/pg/defaultSetHeader.pg
new file mode 100644
index 0000000000..e971a1d78d
--- /dev/null
+++ b/assets/pg/defaultSetHeader.pg
@@ -0,0 +1,76 @@
+# defaultSetHeader.pg
+# This header file can be used for both the screen and hardcopy output
+
+DOCUMENT();
+
+loadMacros(
+	"PGstandard.pl",
+	"PGML.pl",
+	"PGcourse.pl",
+);
+
+# Content to print only in LaTeX PDF hardcopy output
+# Use PGML markup
+
+$TeX = <<'TEX';
+This PDF is available for convenience. Assignments must be submitted
+within *WeBWorK* for credit.
+TEX
+
+# Content to print only in HTML output
+# Use PGML markup
+
+$HTML = <<"HTML";
+This assignment will close on *$formattedDueDate*.
+HTML
+
+# The first line of PGML below prints the items from above.
+# Other content will appear in all output forms.
+
+BEGIN_PGML
+[@ MODES(TeX => $TeX, HTML => $HTML) @]**
+[% You can replace this comment with information that
+   would appear in both screen and hardcopy set headers. %]
+END_PGML
+
+# The hardcopy theme defines headers and footers. If you would like to customize
+# those without changing the theme, they can be overriddden here by following the
+# documentation for the LaTeX exam class. However the footer on the last page
+# displays a copyright claim that cannot be overridden here.
+# http://mirrors.ctan.org/macros/latex/contrib/exam/examdoc.pdf
+# Note the following is tex code, not PGML markup
+# Available environment macros are:
+# \webworkFirstName,  \webworkLastName,           \webworkUserId,    \webworkStudentId, \webworkEmailAddress,
+# \webworkOpenDate,   \webworkReducedScoringDate, \webworkDueDate,   \webworkAnswerDate,
+# \webworkSetId,      \webworkPrettySetId,        \webworkDescription,
+# \webworkCourseName, \webworkCourseTitle,        \webworkCourseURL
+# \webworkSection,    \webworkRecitation,
+
+#TEXT(MODES(TeX => EV3(<<'EOT'),HTML=>""));
+#
+#\pagestyle{headandfoot}
+#\firstpageheader%
+#{{\large\bfseries Assignment \href{\webworkCourseURL/\webworkSetId}{\webworkPrettySetId{}}\\}\ifx\webworkReducedScoringDate\empty\else{full credit by \webworkReducedScoringDate, }\fi closes \webworkDueDate\\\href{\webworkCourseURL}{\scshape\webworkCourseTitle}}%
+#{}%
+#{{\large\bfseries\webworkFirstName{} \webworkLastName{} (\webworkUserId)\\}%
+#\ifx\webworkSection\empty{\ \\}\else{Section: \webworkSection\\}\fi%
+#\ifx\webworkRecitation\empty{\ }\else{Recitation: \webworkRecitation}\fi%
+#}%
+#\runningheader{}{}{}
+#\footer{}{}{Page \thepage}
+#
+#EOT
+
+# The following must be processed separately because of its use of the @-symbol
+# Uncomment the lines below to modify the formatting of problem numbers and points
+
+#TEXT(MODES(TeX => EV3P({processVariables => 0}, <<'EOT'), HTML => ''));
+#
+#%\pointpoints{pt.}{pts.}
+#%\makeatletter
+#%\qformat{{\bf Problem \thequestiontitle.} \dotfill \if@placepoints{\bf\footnotesize(\thepoints)}\fi}
+#%\makeatother
+#
+#EOT
+
+ENDDOCUMENT();
diff --git a/assets/pg/newProblem.pg b/assets/pg/newProblem.pg
new file mode 100644
index 0000000000..75289789ee
--- /dev/null
+++ b/assets/pg/newProblem.pg
@@ -0,0 +1,39 @@
+## DESCRIPTION
+## Give a value for pi
+## ENDDESCRIPTION
+
+## KEYWORDS('template', 'pi')
+
+## DBsubject('Algebra')
+## DBchapter('Fundamentals')
+## DBsection('Real Numbers')
+## Date('')
+## Author('')
+## Institution('')
+
+DOCUMENT();
+
+loadMacros(
+    "PGstandard.pl",    # Standard macros for PG language
+    "PGML.pl",          # PGML markup and Math Objects
+    "PGcourse.pl",      # Customization file for the course
+);
+
+# Uncomment the following if you don't want to show which
+# answers are correct and which are incorrect
+#$showPartialCorrectAnswers = 0;
+
+$pi = Real("pi");
+
+BEGIN_PGML
+Enter a value for [`\pi`].
+
+[_]{$pi}{5}
+END_PGML
+
+BEGIN_PGML_SOLUTION
+You could type [|pi|]* or [|3.14|]*, or [|22/7|]*,
+among other options.
+END_PGML_SOLUTION
+
+ENDDOCUMENT();
diff --git a/assets/tex/webwork2.sty b/assets/tex/webwork2.sty
new file mode 100644
index 0000000000..18a8899bb2
--- /dev/null
+++ b/assets/tex/webwork2.sty
@@ -0,0 +1,109 @@
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{webwork2}[2023/06/26 version 2.18]
+
+% packages that are used by webwork2 itself, probably by Hardcopy.pm
+\usepackage{path}
+\discretionaries |~!@$%^&*()_+`-=#{"}[]:;'<>,.?\/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789|
+\usepackage{listings}
+\lstset{basicstyle=\ttfamily,breaklines=true,aboveskip=0pt,belowskip=0pt}
+\usepackage{pg}
+
+% support for languages and fonts when XeLaTeX in use
+% note pg.sty loads iftex package
+\ifXeTeX
+  \usepackage{fontspec}
+  \usepackage{xunicode}
+  \usepackage{polyglossia}
+  \setdefaultlanguage{english}
+  % WeBWorK used Control+_ = ^_ for verbatim... so we change its charcode
+  \catcode`\_=12
+\fi
+
+% used in convenience macros below
+\usepackage{hyperref}
+\usepackage{ifthen}
+
+% These macros may be overridden with WeBWorK environment variables
+\def\webworkCourseName{}
+\def\webworkCourseTitle{}
+\def\webworkCourseURL{}
+\def\webworkUserId{}
+\def\webworkStudentId{}
+\def\webworkFirstName{}
+\def\webworkLastName{}
+\def\webworkEmailAddress{}
+\def\webworkSection{}
+\def\webworkRecitation{}
+\def\webworkSetId{}
+\def\webworkDescription{}
+\def\webworkOpenDate{}
+\def\webworkReducedScoringDate{}
+\def\webworkDueDate{}
+\def\webworkAnswerDate{}
+\def\webworkPrettySetId{}
+\def\webworkProblemId{}
+\def\webworkProblemNumber{}
+\def\webworkProblemWeight{}
+
+% These words/phrases may be overridden for localization
+\def\webworkLocalizeAssignment{Assignment}
+\def\webworkLocalizeSet{Set}
+\def\webworkLocalizeProblem{Problem}
+\def\webworkLocalizeUsername{Username}
+\def\webworkLocalizeFullCreditBy{full credit by}
+\def\webworkLocalizeCloses{closes}
+\def\webworkLocalizeSection{Section}
+\def\webworkLocalizeRecitation{Recitation}
+\def\webworkLocalizePage{Page}
+\def\webworkLocalizePoint{point}
+
+% These can be used in a header or footer and their content can be overrided.
+\newcommand{\webworkLeftHeader}
+{%
+\ifthenelse{\thepage=1}{%
+\ifx\webworkSetId\empty\else{%
+{\large\bfseries \href{\webworkCourseURL/\webworkSetId}{\webworkPrettySetId}\\}%
+\small\ifx\webworkReducedScoringDate\empty\else{\webworkLocalizeFullCreditBy~\webworkReducedScoringDate, }\fi\webworkLocalizeCloses~\webworkDueDate}\fi%
+}{}%
+}
+
+\newcommand{\webworkCenterHeader}{}
+
+\newcommand{\webworkRightHeader}
+{%
+\ifthenelse{\thepage=1}{%
+\sffamily\ifx\webworkUserId\empty\else{%
+\webworkFirstName{} \webworkLastName{} (\webworkUserId)\\}\fi%
+\small\ifx\webworkSection\empty\else{\webworkLocalizeSection:~\webworkSection}\fi%
+\ifx\webworkRecitation\empty\else{\ifx\webworkSection\empty\else{, }\fi\webworkLocalizeRecitation:~\webworkRecitation}\fi%
+}{}%
+}
+
+\newcommand{\webworkLeftFooter}{\ifx\webworkCourseTitle\empty\else{\href{\webworkCourseURL}{\scshape\webworkCourseTitle}}\fi}
+
+\newcommand{\webworkCenterFooter}{}
+
+\newcommand{\webworkRightFooter}{\webworkLocalizePage~\thepage}
+
+
+% These macros declare copyright in the footer of the last page.
+\newcommand{\webworkSetCopyrightFooter}{%
+\@ifpackageloaded{fancyhdr}%
+{%
+\fancyfoot[L]{\raisebox{-0.325cm}{\includegraphics[width=3cm]{webwork_logo.png}}}%
+\fancyfoot[C]{\small\sffamily Generated by WeBWorK, \copyright~The~WeBWorK~Project.}%
+\fancyfoot[R]{\url{openwebwork.org}}%
+\pagestyle{fancy}%
+\@ifpackageloaded{tcolorbox}{}{\clearpage}%
+}%
+{}%
+\@ifclassloaded{exam}%
+{%
+\footer%
+{\raisebox{-0.325cm}{\includegraphics[width=3cm]{webwork_logo.png}}}%
+{\small\sffamily Generated by WeBWorK, \copyright~The~WeBWorK~Project.}%
+{\url{openwebwork.org}}%
+\clearpage
+}%
+{}%
+}
diff --git a/assets/tex/webwork_logo.png b/assets/tex/webwork_logo.png
new file mode 100644
index 0000000000..4790e1c4d6
Binary files /dev/null and b/assets/tex/webwork_logo.png differ
diff --git a/bin/Helper.pm b/bin/Helper.pm
index 42ea0a38db..6411065f07 100644
--- a/bin/Helper.pm
+++ b/bin/Helper.pm
@@ -7,11 +7,11 @@ use base 'Exporter';
 our @EXPORT_OK = 'runScript';
 
 sub runScript {
-    my $script_path = shift;
-    unless ( do $script_path ) {
-        warn "Execution of $script_path failed:\n";
-        die $@ if $@;
-    }
+	my $script_path = shift;
+	unless (do $script_path) {
+		warn "Execution of $script_path failed:\n";
+		die $@ if $@;
+	}
 }
 
 1;
diff --git a/bin/OPL-update b/bin/OPL-update
index 2cc22468fc..cd8cf60666 100755
--- a/bin/OPL-update
+++ b/bin/OPL-update
@@ -9,32 +9,26 @@
 
 # In order for this script to work:
 #   1) The OPL downloaded to your machine (the .pg files)
-#   2) The environment variable WEBWORK_ROOT needs to be
-#      correctly defined (as with other scripts here).
-#   3) Configuration for the OPL in site.conf needs to be
+#   2) Configuration for the OPL in site.conf needs to be
 #      done (basically just setting the path to the OPL files).
 
 use strict;
 use warnings;
 
 BEGIN {
-        die "WEBWORK_ROOT not found in environment.\n"
-                unless exists $ENV{WEBWORK_ROOT};
-	# Unused variable, but define it to avoid an error message.
-	$WeBWorK::Constants::WEBWORK_DIRECTORY = '';
-	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
-	$ENV{PG_ROOT} //= "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $ENV{PG_ROOT});
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
+
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
 
 # Get database connection
 use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$ENV{PG_ROOT}/lib";
 use lib "$ENV{WEBWORK_ROOT}/bin";
 use WeBWorK::CourseEnvironment;
 use Helper 'runScript';
 
-my $ce = new WeBWorK::CourseEnvironment({webwork_dir=>$ENV{WEBWORK_ROOT}});
+my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT} });
 
 print "\nDownloading the latest OPL release.\n";
 runScript("$ENV{WEBWORK_ROOT}/bin/download-OPL-metadata-release.pl");
diff --git a/bin/OPL-update-legacy b/bin/OPL-update-legacy
index 210098b95d..ceda374cb3 100755
--- a/bin/OPL-update-legacy
+++ b/bin/OPL-update-legacy
@@ -9,9 +9,7 @@
 
 # In order for this script to work:
 #   1) The OPL downloaded to your machine (the .pg files)
-#   2) The environment variable WEBWORK_ROOT needs to be
-#      correctly defined (as with other scripts here).
-#   3) Configuration for the OPL in site.conf needs to be
+#   2) Configuration for the OPL in site.conf needs to be
 #      done (basically just setting the path to the OPL files).
 
 #use strict;
@@ -24,13 +22,6 @@ use DBI;
  #(maximum varchar length is 255 for mysql version < 5.0.3.
  #You can increase path length to  4096 for mysql > 5.0.3)
 
-BEGIN {
-        die "WEBWORK_ROOT not found in environment.\n"
-                unless exists $ENV{WEBWORK_ROOT};
-	# Unused variable, but define it to avoid an error message.
-	$WeBWorK::Constants::WEBWORK_DIRECTORY = '';
-}
-
 # Taxonomy global variables
 # Make a hash of hashes of hashes to record what is legal
 # Also create list for json file
@@ -75,22 +66,21 @@ my %NPLtables = (
  pgfile_problem => 'NPL-pgfile-problem',
 );
 
-my $pg_dir;
 BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
+
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
 
 # Get database connection
 use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$pg_dir/lib";
 use lib "$ENV{WEBWORK_ROOT}/bin";
 use WeBWorK::CourseEnvironment;
 use WeBWorK::Utils::Tags;
 use OPLUtils qw/build_library_directory_tree build_library_subject_tree build_library_textbook_tree writeJSONtoFile/;
 
-my $ce = new WeBWorK::CourseEnvironment({webwork_dir=>$ENV{WEBWORK_ROOT}});
+my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT} });
 
 # decide whether the mysql installation can handle
 # utf8mb4 and that should be used for the OPL
@@ -715,7 +705,7 @@ sub pgfiles {
 			my $lang    = $tags->{Language} || 'en';
 			my $mathobj = $tags->{MO}       || 0;
 			my $static  = $tags->{Static}   || 0;
-	
+
 			my @pgfile_ids = ();
 
 			for my $DBsection_id (@DBsection_ids) {
diff --git a/bin/OPLUtils.pm b/bin/OPLUtils.pm
index e824487351..6d041abe5e 100644
--- a/bin/OPLUtils.pm
+++ b/bin/OPLUtils.pm
@@ -1,5 +1,4 @@
 
-
 package OPLUtils;
 use base qw(Exporter);
 
@@ -20,96 +19,91 @@ use File::Basename;
 use open qw/:std :utf8/;
 use JSON;
 
-our @EXPORT    = ();
-our @EXPORT_OK = qw(build_library_directory_tree build_library_subject_tree build_library_textbook_tree writeJSONtoFile);
+our @EXPORT = ();
+our @EXPORT_OK =
+	qw(build_library_directory_tree build_library_subject_tree build_library_textbook_tree writeJSONtoFile);
 
 ### Data for creating the database tables
 
-
 my %OPLtables = (
- dbsubject => 'OPL_DBsubject',
- dbchapter => 'OPL_DBchapter',
- dbsection => 'OPL_DBsection',
- author => 'OPL_author',
- path => 'OPL_path',
- pgfile => 'OPL_pgfile',
- keyword => 'OPL_keyword',
- pgfile_keyword => 'OPL_pgfile_keyword',
- textbook => 'OPL_textbook',
- chapter => 'OPL_chapter',
- section => 'OPL_section',
- problem => 'OPL_problem',
- morelt => 'OPL_morelt',
- pgfile_problem => 'OPL_pgfile_problem',
+	dbsubject      => 'OPL_DBsubject',
+	dbchapter      => 'OPL_DBchapter',
+	dbsection      => 'OPL_DBsection',
+	author         => 'OPL_author',
+	path           => 'OPL_path',
+	pgfile         => 'OPL_pgfile',
+	keyword        => 'OPL_keyword',
+	pgfile_keyword => 'OPL_pgfile_keyword',
+	textbook       => 'OPL_textbook',
+	chapter        => 'OPL_chapter',
+	section        => 'OPL_section',
+	problem        => 'OPL_problem',
+	morelt         => 'OPL_morelt',
+	pgfile_problem => 'OPL_pgfile_problem',
 );
 
-
 my %NPLtables = (
- dbsubject => 'NPL-DBsubject',
- dbchapter => 'NPL-DBchapter',
- dbsection => 'NPL-DBsection',
- author => 'NPL-author',
- path => 'NPL-path',
- pgfile => 'NPL-pgfile',
- keyword => 'NPL-keyword',
- pgfile_keyword => 'NPL-pgfile-keyword',
- textbook => 'NPL-textbook',
- chapter => 'NPL-chapter',
- section => 'NPL-section',
- problem => 'NPL-problem',
- morelt => 'NPL-morelt',
- pgfile_problem => 'NPL-pgfile-problem',
+	dbsubject      => 'NPL-DBsubject',
+	dbchapter      => 'NPL-DBchapter',
+	dbsection      => 'NPL-DBsection',
+	author         => 'NPL-author',
+	path           => 'NPL-path',
+	pgfile         => 'NPL-pgfile',
+	keyword        => 'NPL-keyword',
+	pgfile_keyword => 'NPL-pgfile-keyword',
+	textbook       => 'NPL-textbook',
+	chapter        => 'NPL-chapter',
+	section        => 'NPL-section',
+	problem        => 'NPL-problem',
+	morelt         => 'NPL-morelt',
+	pgfile_problem => 'NPL-pgfile-problem',
 );
 
-
-
-
-
 sub build_library_directory_tree {
-	my ($ce,$verbose) = @_;
+	my ($ce, $verbose) = @_;
 
 	print "Creating the Directory Tree\n" if $verbose;
 	my $libraryRoot = $ce->{problemLibrary}->{root};
 	$libraryRoot =~ s|/+$||;
 
 	my @dirArray = ();
-	push(@dirArray,buildTree($libraryRoot));
+	push(@dirArray, buildTree($libraryRoot));
 
 	my $webwork_htdocs = $ce->{webworkDirs}{htdocs};
-	my $file = "$webwork_htdocs/DATA/library-directory-tree.json";
+	my $file           = "$webwork_htdocs/DATA/library-directory-tree.json";
 
-	writeJSONtoFile(\@dirArray,$file);
+	writeJSONtoFile(\@dirArray, $file);
 
 	print "Wrote Library Directory Tree to $file\n" if $verbose;
 }
 
 sub buildTree {
 	my $absoluteDir = shift;
-	my $branch = {};
-	my ($name,$dir) = fileparse($absoluteDir);
+	my $branch      = {};
+	my ($name, $dir) = fileparse($absoluteDir);
 	$branch->{name} = $name;
 	my @dirs = File::Find::Rule->maxdepth(1)->relative(1)->directory->in($absoluteDir);
-	if (scalar(@dirs)==0){
+	if (scalar(@dirs) == 0) {
 		return undef;
 	}
 
 	my @branches = ();
 
-	for my $dir (@dirs){
+	for my $dir (@dirs) {
 		my $theBranch = buildTree($absoluteDir . "/" . $dir);
 		if ($theBranch) {
 			my @files = File::Find::Rule->file()->name("*.pg")->in($absoluteDir . "/" . $dir);
 			$theBranch->{num_files} = scalar(@files);
-			push(@branches,$theBranch)
+			push(@branches, $theBranch);
 		} else {
 			$b = {};
 			$b->{name} = $dir;
 
 			my @files = File::Find::Rule->file()->name("*.pg")->in($absoluteDir . "/" . $dir);
 
-			if (scalar(@files)>0){
+			if (scalar(@files) > 0) {
 				$b->{num_files} = scalar(@files);
-				push(@branches,$b);
+				push(@branches, $b);
 			}
 		}
 	}
@@ -121,64 +115,64 @@ sub buildTree {
 	return $branch;
 }
 
-
 sub build_library_subject_tree {
-	my ($ce,$dbh,$verbose) = @_;
+	my ($ce, $dbh, $verbose) = @_;
 
 	my $libraryRoot = $ce->{problemLibrary}->{root};
 	$libraryRoot =~ s|/+$||;
 	my $libraryVersion = $ce->{problemLibrary}->{version};
 
-	my %tables = ($libraryVersion eq '2.5')? %OPLtables : %NPLtables;
+	my %tables = ($libraryVersion eq '2.5') ? %OPLtables : %NPLtables;
 
 	# query the database for all of the subject names
-	my $cmd = qq/select name from $tables{dbsubject};/;
-	my @subject_names = map { $_->[0]} $dbh->selectall_array($cmd);
+	my $cmd           = qq/select name from $tables{dbsubject};/;
+	my @subject_names = map { $_->[0] } $dbh->selectall_array($cmd);
 
-	my $tree;  # the library subject tree will be stored as arrays of objects.
+	my $tree;    # the library subject tree will be stored as arrays of objects.
 
 	print "Building the subject-tree.  There are " . scalar(@subject_names) . " subjects\n" if $verbose;
 
-	my @subject_tree;  # array to store the individual library tree for each subject
+	my @subject_tree;    # array to store the individual library tree for each subject
 
 	my $selectClause = "";
 
-	for my $subj_name (@subject_names){
+	for my $subj_name (@subject_names) {
 
 		my $subj = $subj_name;
-		$subj =~ s/'/\'/g; # escape any single quotes;
+		$subj =~ s/'/\'/g;    # escape any single quotes;
 
-    print "subject: $subj_name is being processed.\n" if $verbose;
+		print "subject: $subj_name is being processed.\n" if $verbose;
 
-	  my $cmd = qq/SELECT ch.name from $tables{dbchapter} AS ch
+		my $cmd = qq/SELECT ch.name from $tables{dbchapter} AS ch
 			JOIN $tables{dbsubject} AS subj ON ch.DBsubject_id=subj.DBsubject_id
 			WHERE subj.name='$subj';/;
 
 		my @chapter_names = map { $_->[0] } $dbh->selectall_array($cmd);
 
-		my @chapter_tree; # array to store the individual library tree for each chapter
+		my @chapter_tree;     # array to store the individual library tree for each chapter
 
-		for my  $ch_name (@chapter_names){
+		for my $ch_name (@chapter_names) {
 
 			my $ch = $ch_name;
-			$ch =~ s/'/\'/g; # escape any single quotes;
+			$ch =~ s/'/\'/g;    # escape any single quotes;
 
-			my $results = $dbh->selectall_arrayref("SELECT sect.name from `$tables{dbsubject}` AS subj "
-					."JOIN `$tables{dbchapter}` AS ch ON subj.DBsubject_id = ch.DBsubject_id "
-					."JOIN `$tables{dbsection}` AS sect ON sect.DBchapter_id = ch.DBchapter_id "
-					."WHERE subj.name='$subj' AND ch.name='$ch';");
+			my $results =
+				$dbh->selectall_arrayref("SELECT sect.name from `$tables{dbsubject}` AS subj "
+					. "JOIN `$tables{dbchapter}` AS ch ON subj.DBsubject_id = ch.DBsubject_id "
+					. "JOIN `$tables{dbsection}` AS sect ON sect.DBchapter_id = ch.DBchapter_id "
+					. "WHERE subj.name='$subj' AND ch.name='$ch';");
 
-			my @section_names = map { $_->[0]} @{$results};
+			my @section_names = map { $_->[0] } @{$results};
 
 			my @subfields = ();
 
-			for my $sect_name (@section_names){
-				my $section_tree = {name => $sect_name};
+			for my $sect_name (@section_names) {
+				my $section_tree = { name => $sect_name };
 
 				## Determine the number of files that falls into each
 
 				my $sect = $sect_name;
-				$sect =~ s/'/\\'/g; # escape any single quotes
+				$sect =~ s/'/\\'/g;    # escape any single quotes
 
 				my $cmd = qq/SELECT COUNT(*) from $tables{dbsection} AS sect
 					JOIN $tables{dbchapter} AS ch ON sect.DBchapter_id = ch.DBchapter_id
@@ -187,12 +181,12 @@ sub build_library_subject_tree {
 					where subj.name = '$subj' AND ch.name='$ch' AND sect.name='$sect';/;
 
 				$section_tree->{num_files} = $dbh->selectrow_array($cmd);
-				my $clone = { %{ $section_tree } };  # need to clone it before pushing into the @subfield array.
+				my $clone = { %{$section_tree} };    # need to clone it before pushing into the @subfield array.
 
-				push(@subfields,$clone);
+				push(@subfields, $clone);
 			}
 
-			my $chapter_tree = {name => $ch_name, subfields => \@subfields};
+			my $chapter_tree = { name => $ch_name, subfields => \@subfields };
 
 			## determine the number of files in each chapter
 
@@ -205,11 +199,11 @@ sub build_library_subject_tree {
 
 			$chapter_tree->{num_files} = $dbh->selectrow_array($cmd);
 
-			my $clone = { %{ $chapter_tree } };  # need to clone it before pushing into the @chapter_tree array.
-			push(@chapter_tree,$clone);
+			my $clone = { %{$chapter_tree} };    # need to clone it before pushing into the @chapter_tree array.
+			push(@chapter_tree, $clone);
 		}
 
-		my $subject_tree = {name => $subj_name, subfields => \@chapter_tree};
+		my $subject_tree = { name => $subj_name, subfields => \@chapter_tree };
 
 		## find the number of files on the subject level
 
@@ -222,127 +216,154 @@ sub build_library_subject_tree {
 
 		$subject_tree->{num_files} = $dbh->selectrow_array($cmd);
 
-		my $clone = { % {$subject_tree}};
-		push (@subject_tree, $clone);
+		my $clone = { %{$subject_tree} };
+		push(@subject_tree, $clone);
 	}
 	my $webwork_htdocs = $ce->{webworkDirs}{htdocs};
-	my $file = "$webwork_htdocs/DATA/library-subject-tree.json";
+	my $file           = "$webwork_htdocs/DATA/library-subject-tree.json";
 
-	writeJSONtoFile(\@subject_tree,$file);
+	writeJSONtoFile(\@subject_tree, $file);
 
 	print "Wrote Library Subject Tree to $file\n" if $verbose;
 }
 
 sub build_library_textbook_tree {
 
-	my ($ce,$dbh,$verbose) = @_;
+	my ($ce, $dbh, $verbose) = @_;
 
 	my $libraryRoot = $ce->{problemLibrary}->{root};
 	$libraryRoot =~ s|/+$||;
 	my $libraryVersion = $ce->{problemLibrary}->{version};
 
-	my %tables = ($libraryVersion eq '2.5')? %OPLtables : %NPLtables;
+	my %tables = ($libraryVersion eq '2.5') ? %OPLtables : %NPLtables;
 
-	my $selectClause = "SELECT pg.pgfile_id from $tables{path} as path "
-		."LEFT JOIN $tables{pgfile} AS pg ON pg.path_id=path.path_id "
-		."LEFT JOIN $tables{pgfile_problem} AS pgprob ON pgprob.pgfile_id=pg.pgfile_id "
-		."LEFT JOIN $tables{problem} AS prob ON prob.problem_id=pgprob.problem_id "
-		."LEFT JOIN $tables{section} AS sect ON sect.section_id=prob.section_id "
-		."LEFT JOIN $tables{chapter} AS ch ON ch.chapter_id=sect.chapter_id "
-		."LEFT JOIN $tables{textbook} AS text ON text.textbook_id=ch.textbook_id ";
+	my $selectClause =
+		"SELECT pg.pgfile_id from $tables{path} as path "
+		. "LEFT JOIN $tables{pgfile} AS pg ON pg.path_id=path.path_id "
+		. "LEFT JOIN $tables{pgfile_problem} AS pgprob ON pgprob.pgfile_id=pg.pgfile_id "
+		. "LEFT JOIN $tables{problem} AS prob ON prob.problem_id=pgprob.problem_id "
+		. "LEFT JOIN $tables{section} AS sect ON sect.section_id=prob.section_id "
+		. "LEFT JOIN $tables{chapter} AS ch ON ch.chapter_id=sect.chapter_id "
+		. "LEFT JOIN $tables{textbook} AS text ON text.textbook_id=ch.textbook_id ";
 
 	my $results = $dbh->selectall_arrayref("select * from `$tables{textbook}` ORDER BY title;");
 
-	my @textbooks=map { {textbook_id=>$_->[0],title=>$_->[1],edition=>$_->[2],
-			author=>$_->[3],publisher=>$_->[4],isbn=>$_->[5],pubdate=>$_->[6]}} @{$results};
+	my @textbooks = map { {
+		textbook_id => $_->[0],
+		title       => $_->[1],
+		edition     => $_->[2],
+		author      => $_->[3],
+		publisher   => $_->[4],
+		isbn        => $_->[5],
+		pubdate     => $_->[6]
+	} } @{$results};
 
 	my @output = ();
 
-	my $i =0; ## index to alert user the length of the build
+	my $i = 0;    ## index to alert user the length of the build
 
-	print "Building the Textbook Library Tree\n" if $verbose;
-	print "There are ". $#textbooks ." textbooks to process.\n" if $verbose;
+	print "Building the Textbook Library Tree\n"                  if $verbose;
+	print "There are " . $#textbooks . " textbooks to process.\n" if $verbose;
 
-	for my $textbook (@textbooks){
+	for my $textbook (@textbooks) {
 		$i++;
-		printf("%4d",$i) if $verbose;
-		print("\n") if ($i % 10==0 && $verbose);
+		printf("%4d", $i) if $verbose;
+		print("\n")       if ($i % 10 == 0 && $verbose);
 
-		my $results = $dbh->selectall_arrayref("select ch.chapter_id,ch.name,ch.number "
-			. " from `$tables{chapter}` AS ch JOIN `$tables{textbook}` AS text ON ch.textbook_id=text.textbook_id "
-			. " WHERE text.textbook_id='" . $textbook->{textbook_id} . "' ORDER BY ch.number;");
+		my $results =
+			$dbh->selectall_arrayref("select ch.chapter_id,ch.name,ch.number "
+				. " from `$tables{chapter}` AS ch JOIN `$tables{textbook}` AS text ON ch.textbook_id=text.textbook_id "
+				. " WHERE text.textbook_id='"
+				. $textbook->{textbook_id}
+				. "' ORDER BY ch.number;");
 
-		my @chapters=map { {chapter_id=>$_->[0],name=>$_->[1],number=>$_->[2]}} @{$results};
+		my @chapters = map { { chapter_id => $_->[0], name => $_->[1], number => $_->[2] } } @{$results};
 
 		my @chs = ();
 
-		for my $chapter (@chapters){
-
-			my $results = $dbh->selectall_arrayref("select sect.section_id,sect.name,sect.number "
-				. "FROM `$tables{chapter}` AS ch "
-				. "LEFT JOIN `$tables{textbook}` AS text ON ch.textbook_id=text.textbook_id "
-				. "LEFT JOIN `$tables{section}` AS sect ON sect.chapter_id = ch.chapter_id "
-				. "WHERE text.textbook_id='" .$textbook->{textbook_id}. "' AND "
-				. "ch.chapter_id='".$chapter->{chapter_id}."' ORDER BY sect.number;");
-
-
-			my @sections = map { {section_id=>$_->[0],name=>$_->[1],number=>$_->[2]}} @{$results};
-
-			for my $section (@sections){
-
-		   		my $whereClause ="WHERE sect.section_id='". $section->{section_id}
-		   			."' AND ch.chapter_id='". $chapter->{chapter_id}."' AND "
-		   				."text.textbook_id='".$textbook->{textbook_id}."'";
-
-				my $sth = $dbh->prepare($selectClause.$whereClause);
+		for my $chapter (@chapters) {
+
+			my $results =
+				$dbh->selectall_arrayref("select sect.section_id,sect.name,sect.number "
+					. "FROM `$tables{chapter}` AS ch "
+					. "LEFT JOIN `$tables{textbook}` AS text ON ch.textbook_id=text.textbook_id "
+					. "LEFT JOIN `$tables{section}` AS sect ON sect.chapter_id = ch.chapter_id "
+					. "WHERE text.textbook_id='"
+					. $textbook->{textbook_id}
+					. "' AND "
+					. "ch.chapter_id='"
+					. $chapter->{chapter_id}
+					. "' ORDER BY sect.number;");
+
+			my @sections = map { { section_id => $_->[0], name => $_->[1], number => $_->[2] } } @{$results};
+
+			for my $section (@sections) {
+
+				my $whereClause =
+					"WHERE sect.section_id='"
+					. $section->{section_id}
+					. "' AND ch.chapter_id='"
+					. $chapter->{chapter_id}
+					. "' AND "
+					. "text.textbook_id='"
+					. $textbook->{textbook_id} . "'";
+
+				my $sth = $dbh->prepare($selectClause . $whereClause);
 				$sth->execute;
-				$section->{num_probs}=scalar @{$sth->fetchall_arrayref()};
+				$section->{num_probs} = scalar @{ $sth->fetchall_arrayref() };
 			}
-			my $whereClause ="WHERE ch.chapter_id='". $chapter->{chapter_id}."' AND "
-				."text.textbook_id='".$textbook->{textbook_id}."'";
-
-			my $sth = $dbh->prepare($selectClause.$whereClause);
+			my $whereClause =
+				"WHERE ch.chapter_id='"
+				. $chapter->{chapter_id}
+				. "' AND "
+				. "text.textbook_id='"
+				. $textbook->{textbook_id} . "'";
+
+			my $sth = $dbh->prepare($selectClause . $whereClause);
 			$sth->execute;
-			$chapter->{num_probs}=scalar @{$sth->fetchall_arrayref()};
+			$chapter->{num_probs} = scalar @{ $sth->fetchall_arrayref() };
 
-			$chapter->{sections}=\@sections;
+			$chapter->{sections} = \@sections;
 
-			my @sects = map {{
-				name=>$_->{name},
-				section_id => $_->{section_id},
-				num_files=>$_->{num_probs}
-			}} @sections;
+			my @sects =
+				map { { name => $_->{name}, section_id => $_->{section_id}, num_files => $_->{num_probs} } } @sections;
 
-			push(@chs,{
-				name=>$chapter->{name},
-				chapter_id => $chapter->{chapter_id},
-				num_files=>$chapter->{num_probs},
-				subfields=>\@sects
-			});
+			push(
+				@chs,
+				{
+					name       => $chapter->{name},
+					chapter_id => $chapter->{chapter_id},
+					num_files  => $chapter->{num_probs},
+					subfields  => \@sects
+				}
+			);
 
 		}
-		my $whereClause ="WHERE text.textbook_id='".$textbook->{textbook_id}."'";
+		my $whereClause = "WHERE text.textbook_id='" . $textbook->{textbook_id} . "'";
 
-		my $sth = $dbh->prepare($selectClause.$whereClause);
+		my $sth = $dbh->prepare($selectClause . $whereClause);
 		$sth->execute;
-		$textbook->{num_probs}=scalar @{$sth->fetchall_arrayref()};
+		$textbook->{num_probs} = scalar @{ $sth->fetchall_arrayref() };
 
-		$textbook->{chapters}=\@chapters;
+		$textbook->{chapters} = \@chapters;
 
-		push(@output,{
-			name=>$textbook->{title}. " - " . $textbook->{author},
-			textbook_id => $textbook->{textbook_id},
-			subfields=>\@chs,
-			num_files=>$sth->rows
-		});
+		push(
+			@output,
+			{
+				name        => $textbook->{title} . " - " . $textbook->{author},
+				textbook_id => $textbook->{textbook_id},
+				subfields   => \@chs,
+				num_files   => $sth->rows
+			}
+		);
 	}
 
 	print "\n";
 
 	my $webwork_htdocs = $ce->{webworkDirs}{htdocs};
-	my $file = "$webwork_htdocs/DATA/textbook-tree.json";
+	my $file           = "$webwork_htdocs/DATA/textbook-tree.json";
 
-	writeJSONtoFile(\@output,$file);
+	writeJSONtoFile(\@output, $file);
 
 	print "\n\nWrote Library Textbook Tree to $file\n" if $verbose;
 
@@ -350,7 +371,7 @@ sub build_library_textbook_tree {
 
 # this takes a hash created in the other subroutines and write the result to a file
 sub writeJSONtoFile {
-	my ($data,$filename) = @_;
+	my ($data, $filename) = @_;
 
 	my $json = JSON->new->utf8->encode($data);
 	open my $fh, ">", $filename or die "Cannot open $filename";
diff --git a/bin/OPL_releases/Makefile b/bin/OPL_releases/Makefile
deleted file mode 100644
index 96760024b7..0000000000
--- a/bin/OPL_releases/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-RELEASE_FILENAME=webwork-open-problem-library-METADATA.tar.gz
-GITHUB_USERNAME=openwebwork
-GITHUB_REPO=webwork-open-problem-library
-JSON_FILENAME=latest_release.json
-RELEASE_TAG=latest_release.tag
-
-${JSON_FILENAME}:
-	@echo "Download a JSON containing information on the latest release"
-	curl -s https://api.github.com/repos/${GITHUB_USERNAME}/${GITHUB_REPO}/releases/latest > ${JSON_FILENAME}
-
-${RELEASE_TAG}: ${JSON_FILENAME}
-	jq -r '.tag_name' ${JSON_FILENAME} > ${RELEASE_TAG}
-
-${RELEASE_FILENAME}: ${JSON_FILENAME}
-	curl -L `jq -r '[.assets | .[] | select(.name == "${RELEASE_FILENAME}" ) | .browser_download_url][0]' ${JSON_FILENAME}` -o ${RELEASE_FILENAME}
-
-extract: ${RELEASE_FILENAME}
-	tar xfz ${RELEASE_FILENAME}
-
-clean:
-	rm -f ${RELEASE_FILENAME} ${RELEASE_TAG} ${JSON_FILENAME}
diff --git a/bin/OPL_releases/release.sh b/bin/OPL_releases/release.sh
deleted file mode 100755
index 24aca8b197..0000000000
--- a/bin/OPL_releases/release.sh
+++ /dev/null
@@ -1,369 +0,0 @@
-#!/bin/bash
-#
-# Shell script to make releases of webwork problem libraries, heavily inspired
-# by https://github.com/gap-system/ReleaseTools/blob/master/release
-
-set -e
-
-######################################################################
-#
-# Usage information
-#
-help() {
-cat <<EOF
-Usage: $0 [OPTIONS]
-
-A tool for making releases of webwork problem libraries on GitHub.
-
-Run this from within a git clone of your webwork problem library repository, checked out
-at the revision you want to release.
-
-Actions
-  -h,  --help                      display this help text and exit
-  -f, --force                      if a release with the same name already exists: overwrite it
-
-Paths
-  --librarydir <path>              directory containing the library [Default: current directory]
-  --tmpdir <path>                  to a temporary directory [Default: tmp subdirectory of current directory]
-  --libraryname <name>             library name
-
-Custom settings
-  -t,  --tag <tag>                 git tag for the release
-  -r,  --repository <repository>   set GitHub repository (as USERNAME/REPONAME)
-  --token <oauth>                  GitHub access token
-
-Notes:
-* To learn how to create a GitHub access token, please consult
-  https://help.github.com/articles/creating-an-access-token-for-command-line-use/
-EOF
-    exit 0
-}
-
-######################################################################
-#
-# Various little helper functions
-
-
-# print notices in green
-notice() {
-    printf '\033[32m%s\033[0m\n' "$*"
-}
-
-# print warnings in yellow
-warning() {
-    printf '\033[33mWARNING: %s\033[0m\n' "$*"
-}
-
-# print error in red and exit
-error() {
-    printf '\033[31mERROR: %s\033[0m\n' "$*"
-    exit 1
-}
-
-# check for uncommitted changes
-verify_git_clean() {
-    git update-index --refresh
-    git diff-index --quiet HEAD -- ||
-        error "uncommitted changes detected"
-}
-
-# helper function for parsing GitHub's JSON output. Right now,
-# we only extra the value of a single key at a time. This means
-# we may end up parsing the same JSON data two times, but that
-# doesn't really matter as it is tiny.
-json_get_key() {
-    echo "$response" | python -c 'import json,sys;obj=json.load(sys.stdin);print(obj.get("'"$1"'",""))'
-}
-
-# On Mac OS X, tar stores extended attributes in ._FOO files inside archives.
-# Setting COPYFILE_DISABLE prevents that. See <http://superuser.com/a/260264>
-export COPYFILE_DISABLE=1
-
-
-######################################################################
-#
-# Command line processing
-#
-CONTENT="METADATA"
-LIBRARY_DIR="$PWD"
-TMP_DIR="$PWD/tmp"
-
-FORCE=no
-while [ x"$1" != x ]; do
-  option="$1" ; shift
-  case "$option" in
-    -h | --help ) help ;;
-
-    --librarydir ) LIBRARY_DIR="$1"; shift ;;
-    --libraryname ) LIBRARY_NAME="$1"; shift ;;
-    --tmpdir ) TMP_DIR="$1"; shift ;;
-
-    -t | --tag ) TAG="$1"; shift ;;
-    -r | --repository ) REPO="$1"; shift ;;
-    --token ) TOKEN="$1"; shift ;;
-
-    -f | --force ) FORCE=yes ;;
-    --no-force ) FORCE=no ;;
-
-    -- ) break ;;
-    * ) error "unknown option '$option'" ;;
-  esac
-done
-
-
-######################################################################
-#
-# Some initial sanity checks
-#
-
-command -v curl >/dev/null 2>&1 ||
-    error "the 'curl' command was not found, please install it"
-
-command -v git >/dev/null 2>&1 ||
-    error "the 'git' command was not found, please install it"
-
-command -v python >/dev/null 2>&1 ||
-    error "the 'python' command was not found, please install it"
-
-cd $LIBRARY_DIR
-#verify_git_clean
-
-
-######################################################################
-#
-# Determine the basename for the package archives
-#
-#
-
-notice "Library path: " $LIBRARY_DIR
-
-notice "Updating OPL tables"
-OPL-update
-
-notice "Dumping OPL tables"
-dump-OPL-tables.pl
-
-######################################################################
-#
-# Fetch GitHub oauth token, used to authenticate the following commands.
-# See https://help.github.com/articles/git-automation-with-oauth-tokens/
-#
-if [ "x$TOKEN" = x ] ; then
-    TOKEN=$(git config --get github.token || echo)
-fi
-if [ "x$TOKEN" = x ] && [ -r ~/.github_shell_token ] ; then
-    TOKEN=$(cat ~/.github_shell_token)
-fi
-if [ "x$TOKEN" = x ] ; then
-    error "could not determine GitHub access token"
-fi
-
-
-######################################################################
-#
-# Determine GitHub repository and username, and the current branch
-#
-if [ x"$REPO" = "x" ] ; then
-    error "could not guess GitHub repository"
-fi
-notice "Using GitHub repository $REPO"
-
-GITHUB_USER=$(dirname "$REPO")
-notice "Using GitHub username $GITHUB_USER"
-
-
-######################################################################
-#
-# Derive API urls
-#
-API_URL=https://api.github.com/repos/$REPO/releases
-UPLOAD_URL=https://uploads.github.com/repos/$REPO/releases
-
-
-######################################################################
-#
-# Determine the tag, and validate it
-#
-#verify_git_clean
-
-cd $LIBRARY_DIR
-
-if git show-ref -q "$TAG" ; then
-    notice "Using git tag $TAG"
-else
-    notice "Creating git tag $TAG"
-    git tag "$TAG"
-fi;
-
-HEAD_REF=$(git rev-parse --verify HEAD)
-TAG_REF=$(git rev-parse --verify "$TAG^{}")
-
-if [ "x$TAG_REF" != "x$HEAD_REF" ] ; then
-    error "tag $TAG is not the HEAD commit -- did you tag the right commit?"
-fi
-
-
-echo ""
-
-
-######################################################################
-#
-# Get fresh (unmodified) copies of the files, and generate some stuff
-#
-
-# Clean any remains of previous export attempts
-mkdir -p "$TMP_DIR"
-rm -rf "${TMP_DIR:?}/$LIBRARY_NAME"*
-
-# Set umask to ensure the file permissions in the release
-# archives are sane.
-umask 0022
-
-notice "Preparing content"
-mkdir "$TMP_DIR/$LIBRARY_NAME"
-cp -r $LIBRARY_DIR/TABLE-DUMP "$TMP_DIR/$LIBRARY_NAME/TABLE-DUMP"
-cp -r $LIBRARY_DIR/JSON-SAVED "$TMP_DIR/$LIBRARY_NAME/JSON-SAVED"
-
-#notice "Removing unnecessary files"
-#rm -f .git* .hg* .cvs*
-#rm -f .appveyor.yml .codecov.yml .travis.yml
-
-
-######################################################################
-#
-# Push commits to GitHub
-#
-
-cd "$LIBRARY_DIR"
-
-# construct GitHub URL for pusing
-REMOTE="https://$GITHUB_USER:$TOKEN@github.com/$REPO"
-
-# Make sure the branch is on the server
-notice "Pushing your branch to GitHub"
-notice "Remote: $REMOTE"
-
-# Make sure the tag is on the server
-notice "Pushing your tag to GitHub"
-if [ "x$FORCE" = xyes ] ; then
-    git push --force "$REMOTE" "$TAG"
-else
-    git push "$REMOTE" "$TAG"
-fi
-
-######################################################################
-#
-# Create the GitHub release
-#
-
-# check if release already exists
-response=$(curl -s -S -X GET "$API_URL/tags/$TAG?access_token=$TOKEN")
-MESSAGE=$(json_get_key message)
-RELEASE_ID=$(json_get_key id)
-
-if [ "$MESSAGE" = "Not Found" ] ; then
-    MESSAGE=  # release does not yet exist -> that's how we like it
-elif [ x"$RELEASE_ID" != x ] ; then
-    # release already exists -> error out or delete it
-    if [ "x$FORCE" = xyes ] ; then
-        notice "Deleting existing release $TAG from GitHub"
-        response=$(curl --fail -s -S -X DELETE "$API_URL/$RELEASE_ID?access_token=$TOKEN")
-        MESSAGE=
-    else
-        error "release $TAG already exists on GitHub, aborting (use --force to override this)"
-    fi
-fi
-
-if [ x"$MESSAGE" != x ] ; then
-    error "accessing GitHub failed: $MESSAGE"
-fi
-
-# Create the release by sending suitable JSON
-DATA=$(cat <<EOF
-{
-  "tag_name": "$TAG",
-  "name": "$TAG",
-  "body": "Release for $LIBRARY_NAME",
-  "draft": false,
-  "prerelease": false
-}
-EOF
-)
-
-notice "Creating new release $TAG on GitHub"
-response=$(curl -s -S -H "Content-Type: application/json" \
- -X POST --data "$DATA" "$API_URL?access_token=$TOKEN")
-
-MESSAGE=$(json_get_key message)
-if [ x"$MESSAGE" != x ] ; then
-    error "creating release on GitHub failed: $MESSAGE"
-fi
-RELEASE_ID=$(json_get_key id)
-if [ x"$RELEASE_ID" = x ] ; then
-    error "creating release on GitHub failed: no release id"
-fi
-
-
-######################################################################
-#
-# Test whether ARCHIVE_FORMATS contains at least one valid format
-#
-
-FOUND_VALID_FORMAT=0
-VALID_ARCHIVE_FORMATS='.tar.gz .tar.bz2 .zip'
-for VALID_FORMAT in $VALID_ARCHIVE_FORMATS
-do
-	if [[ $ARCHIVE_FORMATS =~ $VALID_FORMAT ]]
-	then
-		FOUND_VALID_FORMAT=1;
-	fi;
-done;
-if [[ $FOUND_VALID_FORMAT == "0" ]]
-then
-	warning "No valid archive format specified." ;
-	exit 1;
-fi;
-
-######################################################################
-#
-# Create and upload all requested archive files (as per ARCHIVE_FORMATS)
-#
-cd "$TMP_DIR"
-echo ""
-for EXT in $ARCHIVE_FORMATS ; do
-    ARCHIVENAME=$LIBRARY_NAME-$CONTENT$EXT
-    FULLNAME="$TMP_DIR/$ARCHIVENAME"
-    notice "Creating $ARCHIVENAME ..."
-    case $EXT in
-    .tar.gz)
-        tar cf - "$LIBRARY_NAME" | gzip -9c > "$ARCHIVENAME"
-        MIMETYPE="application/x-gzip"
-        ;;
-    .tar.bz2)
-        tar cf - "$LIBRARY_NAME" | bzip2 -9c > "$ARCHIVENAME"
-        MIMETYPE="application/x-bzip2"
-        ;;
-    .zip)
-        zip -r9 --quiet "$ARCHIVENAME" "$LIBRARY_NAME"
-        MIMETYPE="application/zip"
-        ;;
-    *)
-        warning "unsupported archive format $EXT"
-        continue
-        ;;
-    esac
-    if [ ! -f "$FULLNAME" ] ; then
-        error "failed creating $FULLNAME"
-    fi
-    notice "Uploading $ARCHIVENAME with mime type $MIMETYPE"
-    response=$(curl --fail --progress-bar -o "$TMP_DIR/upload.log" \
-        -X POST "$UPLOAD_URL/$RELEASE_ID/assets?name=$ARCHIVENAME" \
-        -H "Accept: application/vnd.github.v3+json" \
-        -H "Authorization: token $TOKEN" \
-        -H "Content-Type: $MIMETYPE" \
-        --data-binary @"$FULLNAME")
-done
-
-
-
-exit 0
diff --git a/bin/addcourse b/bin/addcourse
index f6cbb6a204..1fb7398b1b 100755
--- a/bin/addcourse
+++ b/bin/addcourse
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -63,70 +63,43 @@ The name of the course to create.
 
 use strict;
 use warnings;
-use Getopt::Long;
 
-my $webwork_dir;
-my $pg_dir;
+use Getopt::Long;
 
 BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n"
-		unless exists $ENV{WEBWORK_ROOT};
-	$webwork_dir = $ENV{WEBWORK_ROOT};
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
 
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
 
 # link to WeBWorK and pg code libraries
-use lib "$webwork_dir/lib";
-use lib "$pg_dir/lib";
+use lib "$ENV{WEBWORK_ROOT}/lib";
 
 use WeBWorK::CourseEnvironment;
 
 # Grab course environment (by reading webwork2/conf/defaults.config)
-my $ce = new WeBWorK::CourseEnvironment({ webwork_dir => $webwork_dir });
+my $ce = WeBWorK::CourseEnvironment->new;
 
 use WeBWorK::DB;
 use WeBWorK::File::Classlist;
-use WeBWorK::Utils qw(runtime_use readFile cryptPassword);
-use WeBWorK::Utils::CourseManagement qw(addCourse deleteCourse listCourses);
-
-sub usage {
-	print STDERR "usage: $0 [options] COURSEID\n";
-	print STDERR "Options:\n";
-	print STDERR "  [--db-layout=LAYOUT]\n";
-	print STDERR "  [--users=FILE [--professors=USERID[,USERID]...] ]\n";
-	exit;
-}
+use WeBWorK::Utils qw(runtime_use cryptPassword);
+use WeBWorK::Utils::CourseManagement qw(addCourse);
 
 sub usage_error {
-	print STDERR "$0: @_\n";
-	usage();
+	warn "@_\n";
+	warn "usage: $0 [options] COURSEID\n";
+	warn "Options:\n";
+	warn "  [--db-layout=LAYOUT]\n";
+	warn "  [--users=FILE [--professors=USERID[,USERID]...] ]\n";
+	exit;
 }
 
-my $dbLayout       = "";
-my $sql_host       = "";
-my $sql_port       = "";
-my $sql_user       = "";
-my $sql_pass       = "";
-my $sql_db         = "";
-my $sql_wwhost     = "";
-my $globalUserID   = "";
-my $users          = "";
-my @professors     = ();
-my $templates_from = "";
-
-##### get command-line options #####
+my ($dbLayout, $users, $templates_from) = ('', '', '');
+my @professors;
 
 GetOptions(
 	"db-layout=s"      => \$dbLayout,
-	"sql-host=s"       => \$sql_host,
-	"sql-port=s"       => \$sql_port,
-	"sql-user=s"       => \$sql_user,
-	"sql-pass=s"       => \$sql_pass,
-	"sql-db=s"         => \$sql_db,
-	"sql-wwhost=s"     => \$sql_wwhost,
-	"global-user=s"    => \$globalUserID,
 	"users=s"          => \$users,
 	"professors=s"     => \@professors,
 	"templates-from=s" => \$templates_from,
@@ -134,110 +107,76 @@ GetOptions(
 my %professors = map { $_ => 1 } map { split /,/ } @professors;
 my $courseID   = shift;
 
-##### perform sanity checks #####
-
-usage_error("must specify COURSEID.") unless $courseID;
+usage_error('The COURSEID must be provided.') unless $courseID;
 
-# bring up a minimal course environment
-$ce = WeBWorK::CourseEnvironment->new({
-	webwork_dir => $ENV{WEBWORK_ROOT},
-	courseName  => $courseID
-});
+$ce = WeBWorK::CourseEnvironment->new({ courseName => $courseID });
 
-# Do not attempt to create a course whose name is too long.
-if (length($courseID) > $ce->{maxCourseIdLength}) {
-	die "Aborting addcourse: Course ID cannot exceed " . $ce->{maxCourseIdLength} . " characters.";
-}
+die "Aborting addcourse: Course ID cannot exceed $ce->{maxCourseIdLength} characters."
+	if length($courseID) > $ce->{maxCourseIdLength};
 
 if ($dbLayout) {
 	die "Database layout $dbLayout does not exist in the course environment.",
 		" (It must be defined in defaults.config.)\n"
-		unless exists $ce->{dbLayouts}->{$dbLayout};
+		unless exists $ce->{dbLayouts}{$dbLayout};
 } else {
-	# use default value
 	$dbLayout = $ce->{dbLayoutName};
 }
 
-usage_error("can't specify --professors without also specifying --users.")
-	if @professors and not $users;
-
-##### set up parameters to pass to addCourse() #####
-
-my %courseOptions = (dbLayoutName => $dbLayout);
-
-# this is kinda left over from when we had 'gdbm' and 'sql' database layouts
-# below this line, we would grab values from getopt and put them in this hash
-# but for now the hash can remain empty
-my %dbOptions;
+usage_error("Can't specify --professors without also specifying --users.")
+	if @professors && !$users;
 
 my @users;
 if ($users) {
-	# this is a hack to create records without bringing up a DB object
-	#my $db = WeBWorK::DB->new($ce->{dbLayouts}->{$dbLayout});
-	my $userClass       = $ce->{dbLayouts}->{$dbLayout}->{user}->{record};
-	my $passwordClass   = $ce->{dbLayouts}->{$dbLayout}->{password}->{record};
-	my $permissionClass = $ce->{dbLayouts}->{$dbLayout}->{permission}->{record};
+	# This is a hack to create records without bringing up a DB object
+	my $userClass       = $ce->{dbLayouts}{$dbLayout}{user}{record};
+	my $passwordClass   = $ce->{dbLayouts}{$dbLayout}{password}{record};
+	my $permissionClass = $ce->{dbLayouts}{$dbLayout}{permission}{record};
 
 	runtime_use($userClass);
 	runtime_use($passwordClass);
 	runtime_use($permissionClass);
 
-	# Default status is enrolled -- fetch abbreviation for enrolled
-	my $default_status_abbrev = $ce->{statuses}->{Enrolled}->{abbrevs}->[0];
-
-	# default permission level
-	my $default_permission_level = $ce->{default_permission_level};
-
 	my @classlist = parse_classlist($users);
-	foreach my $record (@classlist) {
+	for my $record (@classlist) {
 		my %record  = %$record;
 		my $user_id = $record{user_id};
 
-		# set default status is status field is "empty"
-		$record{status} = $default_status_abbrev
-			unless defined $record{status} and $record{status} ne "";
+		# Set the default status if the status field is not set.
+		$record{status} = $ce->{statuses}{Enrolled}{abbrevs}[0] unless $record{status};
 
-		# set password from student ID if password field is "empty"
-		if (not defined $record{password} or $record{password} eq "") {
-			if (defined $record{student_id} and $record{student_id} ne "") {
-				# crypt the student ID and use that
+		# Set the password if the password field is empty.
+		if (!defined $record{password} || $record{password} !~ /\S/) {
+			if (defined $record{student_id} && $record{student_id} !~ /\S/) {
+				# Use the student ID if it is non-empty.
 				$record{password} = cryptPassword($record{student_id});
 			} else {
-				# an empty password field in the database disables password login
-				$record{password} = "";
+				# An empty password field in the database disables password login.
+				$record{password} = '';
 			}
 		}
 
-		# set permission
-		if (not defined $record{status} and $record{status} ne "") {
-			if (exists $professors{$user_id}) {
-				$record{permission} = $ce->{userRoles}{professor};
-			} else {
-				$record{permission} = $default_permission_level;
-			}
-		}
-
-		my $User            = $userClass->new(%record);
-		my $PermissionLevel = $permissionClass->new(user_id => $user_id, permission => $record{permission});
-		my $Password        = $passwordClass->new(user_id => $user_id, password => $record{password});
-
-		if (exists $record{permission}) {
-			$PermissionLevel->permission($record{permission});
-			delete $professors{$user_id};
-		} elsif (exists $professors{$user_id}) {
-			$PermissionLevel->permission(10);
-			delete $professors{$user_id};
+		# Set permission
+		if (!$record{status} && defined $professors{$user_id}) {
+			$record{permission} = $ce->{userRoles}{professor};
 		}
 
-		if (exists $record{password}) {
-			$Password->password($record{password});
-		}
-
-		push @users, [ $User, $Password, $PermissionLevel ];
+		delete $professors{$user_id};
+
+		push @users,
+			[
+				$userClass->new(%record),
+				$passwordClass->new(user_id => $user_id, password => $record{password}),
+				$permissionClass->new(
+					user_id    => $user_id,
+					permission => defined $professors{$user_id}
+					? $ce->{userRoles}{professor}
+					: ($record{permission} // $ce->{default_permission_level})
+				)
+			];
 	}
 
 	if (my @ids = keys %professors) {
-		print STDERR "warning: @ids not in imported user list.\n";
+		warn "Warning: The following users were not in the imported list:\n" . join("\n", @ids) . "\n";
 	}
 }
 
@@ -246,29 +185,16 @@ if ($templates_from ne "") {
 	$optional_arguments{templatesFrom} = $templates_from;
 }
 
-##### call addCourse(), handle errors #####
-
 eval {
 	addCourse(
 		courseID      => $courseID,
 		ce            => $ce,
-		courseOptions => \%courseOptions,
-		dbOptions     => \%dbOptions,
+		courseOptions => { dbLayoutName => $dbLayout },
 		users         => \@users,
 		%optional_arguments,
 	);
 };
 
-if ($@) {
-	my $error = $@;
-	print STDERR "$error\n";
-	exit;
-} else {
-	print "Successfully added '$courseID' course.\n";
-}
+die "$@\n" if $@;
 
-=head1 AUTHOR
-
-Written by Sam Hathaway, hathaway at users.sourceforge.net.
-
-=cut
+print qq{Successfully added "$courseID" course.\n};
diff --git a/bin/change_user_id b/bin/change_user_id
index a6337f1702..793fef2ef2 100755
--- a/bin/change_user_id
+++ b/bin/change_user_id
@@ -19,15 +19,15 @@ use warnings;
 use File::Copy;
 use File::Basename;
 
-my $pg_dir;
 BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
+
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
 
 use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$pg_dir/lib";
+
 use WeBWorK::CourseEnvironment;
 use WeBWorK::DB;
 use WeBWorK::Utils qw(runtime_use readFile);
@@ -45,7 +45,7 @@ my $new_user_id = shift;
 
 my $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
-	courseName => $courseID
+	courseName  => $courseID
 });
 
 my $db = new WeBWorK::DB($ce->{dbLayout});
diff --git a/bin/check_database_charsets.pl b/bin/check_database_charsets.pl
index c6e0f8eeef..c46feb1475 100755
--- a/bin/check_database_charsets.pl
+++ b/bin/check_database_charsets.pl
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 
-my $host = $ENV{WEBWORK_DB_HOST};
-my $port = $ENV{WEBWORK_DB_PORT};
-my $database_name = $ENV{WEBWORK_DB_NAME};
-my $database_user = $ENV{WEBWORK_DB_USER};
+my $host              = $ENV{WEBWORK_DB_HOST};
+my $port              = $ENV{WEBWORK_DB_PORT};
+my $database_name     = $ENV{WEBWORK_DB_NAME};
+my $database_user     = $ENV{WEBWORK_DB_USER};
 my $database_password = $ENV{WEBWORK_DB_PASSWORD};
 
-
-print `mysql -u $database_user -p$database_password $database_name -h $host  -e "SHOW VARIABLES WHERE Variable_name LIKE \'character\_set\_%\' OR Variable_name LIKE \'collation%\' or Variable_name LIKE \'init_connect\'  "`;
\ No newline at end of file
+print
+	`mysql -u $database_user -p$database_password $database_name -h $host  -e "SHOW VARIABLES WHERE Variable_name LIKE \'character\_set\_%\' OR Variable_name LIKE \'collation%\' or Variable_name LIKE \'init_connect\'  "`;
diff --git a/bin/check_latex b/bin/check_latex
index d803822ec4..447eae10b9 100755
--- a/bin/check_latex
+++ b/bin/check_latex
@@ -1,21 +1,75 @@
-#!/bin/bash
+#!/usr/bin/env perl
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
 
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
+=head1 NAME
 
-TEMP_DIR=$(mktemp -d -t check_latex_XXXXXXXX)
+check_latex - Test the LaTeX installation to see that it contains the necessary
+packages for webwork2 hardcopy generation.
 
-cd $TEMP_DIR
+=cut
 
-TEXINPUTS=$SCRIPT_DIR:$SCRIPT_DIR/../conf/snippets/hardcopyThemes/common: \
-	pdflatex -interaction nonstopmode check_latex.tex > check_latex.nfo 2>&1
+use strict;
+use warnings;
+use feature 'say';
 
-if [ $? == 0 ]
-then
-	echo "Compilation Success!"
-	rm -r $TEMP_DIR
-else
-	cat check_latex.nfo
-	echo
-	echo "Compilation Failure: Examine the latex output above to see what went wrong."
-	echo "You may also examine $PWD/check_latex.log and $PWD/check_latex.aux."
-fi
+BEGIN {
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
+
+	$WEBWORK_ROOT = curfile->dirname->dirname;
+}
+
+use File::Temp qw(tempdir);
+use File::Path qw(rmtree);
+use String::ShellQuote;
+
+use lib "$ENV{WEBWORK_ROOT}/lib";
+
+use WeBWorK::CourseEnvironment;
+
+my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT} });
+
+my $temp_dir = eval { tempdir('check_latex_XXXXXXXX') };
+
+die $@ if $@;
+
+my $pdflatex_cmd =
+	"cd $temp_dir && "
+	. "TEXINPUTS=$ENV{WEBWORK_ROOT}/bin:"
+	. shell_quote($ce->{webworkDirs}{assetsTex}) . ':'
+	. shell_quote("$ce->{pg}{directories}{assetsTex}") . ': '
+	. $ce->{externalPrograms}{pdflatex}
+	. ' -interaction nonstopmode check_latex_article.tex > check_latex.nfo 2>&1 &&'
+	. "TEXINPUTS=$ENV{WEBWORK_ROOT}/bin:"
+	. shell_quote($ce->{webworkDirs}{assetsTex}) . ':'
+	. shell_quote("$ce->{pg}{directories}{assetsTex}") . ': '
+	. $ce->{externalPrograms}{pdflatex}
+	. ' -interaction nonstopmode check_latex_exam.tex >> check_latex.nfo 2>&1';
+
+if ((system $pdflatex_cmd) >> 8) {
+	if (open(my $fh, '<', "$temp_dir/check_latex.nfo")) {
+		local $/;
+		my $nfo = <$fh>;
+		close($fh);
+
+		say $nfo;
+	}
+	say 'Compilation Failure: Examine the latex output above to see what went wrong.';
+	say "You may also examine $temp_dir/check_latex.log and $temp_dir/check_latex.aux.";
+} else {
+	say 'Compilation Success!';
+	rmtree $temp_dir;
+}
diff --git a/bin/check_latex.tex b/bin/check_latex_article.tex
similarity index 72%
rename from bin/check_latex.tex
rename to bin/check_latex_article.tex
index 7334f6e496..56c1ae8270 100644
--- a/bin/check_latex.tex
+++ b/bin/check_latex_article.tex
@@ -1,6 +1,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % WeBWorK Online Homework Delivery System
-% Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+% Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 %
 % This program is free software; you can redistribute it and/or modify it under
 % the terms of either: (a) the GNU General Public License as published by the
@@ -13,30 +13,24 @@
 % Artistic License for more details.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\documentclass[10pt]{amsart}
+\documentclass[10pt]{article}
 
-\input{packages.tex}
+\usepackage{webwork2}
 
-\usepackage[active,textmath,displaymath]{preview}  % needed for dvipng
-\usepackage{geometry} % needed for ``two column'' hardcopy format
-\usepackage{fullpage} % needed for ``single column'' hardcopy format
+% theme dependencies
+\usepackage[text={7.5in,9in},centering]{geometry}
+\usepackage{fancyhdr}
+\usepackage{multicol}
+\usepackage{tcolorbox}
 
-\pagestyle{plain}
-\textheight 9in
-\oddsidemargin = -0.42in
-\evensidemargin = -0.42in
-\textwidth= 7.28in
-\columnsep = .25in
-\columnseprule = .4pt
+\usepackage[active,textmath,displaymath]{preview}  % needed for dvipng
 
-\input{CAPA.tex}
+\setlength{\columnsep}{.25in}
+\setlength{\columnseprule}{.4pt}
 
 \begin{document}
 \voffset=-0.8in
-\newpage
-\setcounter{page}{1}
 \begin{multicols}{2}
-\columnwidth=\linewidth
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
diff --git a/bin/check_latex_exam.tex b/bin/check_latex_exam.tex
new file mode 100644
index 0000000000..0a2cec7231
--- /dev/null
+++ b/bin/check_latex_exam.tex
@@ -0,0 +1,47 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% WeBWorK Online Homework Delivery System
+% Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%
+% This program is free software; you can redistribute it and/or modify it under
+% the terms of either: (a) the GNU General Public License as published by the
+% Free Software Foundation; either version 2, or (at your option) any later
+% version, or (b) the "Artistic License" which comes with this package.
+%
+% This program is distributed in the hope that it will be useful, but WITHOUT
+% ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+% FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+% Artistic License for more details.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\documentclass[10pt]{exam}
+
+\usepackage{webwork2}
+
+% theme dependencies
+\usepackage[text={7.5in,9in},centering]{geometry}
+\usepackage{multicol}
+\ifXeTeX
+  \usepackage{bidi}
+\fi
+
+\usepackage[active,textmath,displaymath]{preview}  % needed for dvipng
+
+\setlength{\columnsep}{.25in}
+\setlength{\columnseprule}{.4pt}
+
+\renewcommand{\questionshook}{\leftmargin=0pt\labelwidth=-\labelsep}
+
+\begin{document}
+\voffset=-0.8in
+\begin{multicols}{2}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+Testing the LaTeX set up for WeBWorK.
+%{\includegraphics[width = 3.5 in]{prob03av8.pdf}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\end{multicols}
+\vfill
+\end{document}
diff --git a/bin/check_modules.pl b/bin/check_modules.pl
index 86b91136e2..e27900f784 100755
--- a/bin/check_modules.pl
+++ b/bin/check_modules.pl
@@ -3,7 +3,7 @@
 
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -53,6 +53,7 @@ =head1 DESCRIPTION
 	git
 	gzip
 	latex
+	pandoc
 	pdf2svg
 	pdflatex
 	dvipng
@@ -63,22 +64,17 @@ =head1 DESCRIPTION
 	pngtopnm
 );
 
-my @apache2ModulesList = qw(
-	Apache2::Request
-	Apache2::ServerRec
-	Apache2::ServerUtil
-);
-
 my @modulesList = qw(
 	Archive::Zip
 	Array::Utils
 	Benchmark
 	Carp
-	CGI
-	CGI::Cookie
 	Class::Accessor
+	Crypt::JWT
+	Crypt::PK::RSA
 	Data::Dump
 	Data::Dumper
+	Data::Structure::Util
 	Data::UUID
 	Date::Format
 	Date::Parse
@@ -101,11 +97,11 @@ =head1 DESCRIPTION
 	File::Spec
 	File::stat
 	File::Temp
+	Future::AsyncAwait
 	GD
 	Getopt::Long
 	Getopt::Std
 	HTML::Entities
-	HTML::Scrubber
 	HTML::Tagset
 	HTML::Template
 	HTTP::Async
@@ -119,6 +115,12 @@ =head1 DESCRIPTION
 	Locale::Maketext::Simple
 	LWP::Protocol::https
 	MIME::Base64
+	Math::Random::Secure
+	Minion
+	Minion::Backend::SQLite
+	Mojolicious
+	Mojolicious::Plugin::NotYAMLConfig
+	Mojolicious::Plugin::RenderFile
 	Net::IP
 	Net::LDAPS
 	Net::OAuth
@@ -126,8 +128,12 @@ =head1 DESCRIPTION
 	Net::SSLeay
 	Opcode
 	PadWalker
+	Pandoc
 	Path::Class
+	Perl::Tidy
 	PHP::Serialization
+	Pod::Simple::Search
+	Pod::Simple::XHTML
 	Pod::Usage
 	Pod::WSDL
 	Safe
@@ -136,6 +142,7 @@ =head1 DESCRIPTION
 	Socket
 	Statistics::R::IO
 	String::ShellQuote
+	SVG
 	Template
 	Text::CSV
 	Text::Wrap
@@ -145,18 +152,20 @@ =head1 DESCRIPTION
 	Types::Serialiser
 	URI::Escape
 	UUID::Tiny
+	XML::LibXML
 	XML::Parser
 	XML::Parser::EasyTree
-	XML::Simple
 	XML::Writer
-	XMLRPC::Lite
 	YAML::XS
 );
 
 my %moduleVersion = (
+	'Future::AsyncAwait'   => 0.52,
+	'IO::Socket::SSL'      => 2.007,
 	'LWP::Protocol::https' => 6.06,
+	'Mojolicious'          => 9.22,
 	'Net::SSLeay'          => 1.46,
-	'IO::Socket::SSL'      => 2.007
+	'Perl::Tidy'           => 20220613
 );
 
 my ($test_programs, $test_modules, $show_help);
@@ -170,8 +179,6 @@ =head1 DESCRIPTION
 );
 pod2usage(2) if $show_help;
 
-push @modulesList, @apache2ModulesList;
-
 my @PATH = split(/:/, $ENV{PATH});
 
 if ($test_all or $test_programs) {
diff --git a/bin/convert-functions.pl b/bin/convert-functions.pl
index f2ad857525..7bb33d5b1e 100755
--- a/bin/convert-functions.pl
+++ b/bin/convert-functions.pl
@@ -37,102 +37,110 @@
 #
 
 %function = (
-  std_num_cmp             => ['num_cmp',[undef,'relTol','format','zeroLevel','zeroLevelTol']],
-  std_num_cmp_abs         => ['num_cmp',[undef,'tol','format'],{tolType=>'absolute'}],
-  std_num_cmp_list        => ['num_cmp',['relTol','format','@']],
-  std_num_cmp_abs_list    => ['num_cmp',['tol','format','@'],{tolType=>'absolute'}],
+	std_num_cmp          => [ 'num_cmp', [ undef, 'relTol', 'format', 'zeroLevel', 'zeroLevelTol' ] ],
+	std_num_cmp_abs      => [ 'num_cmp', [ undef, 'tol', 'format' ], { tolType => 'absolute' } ],
+	std_num_cmp_list     => [ 'num_cmp', [ 'relTol', 'format', '@' ] ],
+	std_num_cmp_abs_list => [ 'num_cmp', [ 'tol', 'format', '@' ], { tolType => 'absolute' } ],
 
-  arith_num_cmp           => ['num_cmp',[undef,'relTol','format','zeroLevel','zeroLevelTol'],{mode=>'arith'}],
-  arith_num_cmp_abs       => ['num_cmp',[undef,'tol','format'],{mode=>'arith',tolType=>'absolute'}],
-  arith_num_cmp_list      => ['num_cmp',['relTol','format','@'],{mode=>'arith'}],
-  arith_num_cmp_abs_list  => ['num_cmp',['tol','format','@'],{mode=>'arith',tolType=>'absolute'}],
+	arith_num_cmp => [ 'num_cmp', [ undef, 'relTol', 'format', 'zeroLevel', 'zeroLevelTol' ], { mode => 'arith' } ],
+	arith_num_cmp_abs  => [ 'num_cmp', [ undef,    'tol',    'format' ], { mode => 'arith', tolType => 'absolute' } ],
+	arith_num_cmp_list => [ 'num_cmp', [ 'relTol', 'format', '@' ],      { mode => 'arith' } ],
+	arith_num_cmp_abs_list => [ 'num_cmp', [ 'tol', 'format', '@' ], { mode => 'arith', tolType => 'absolute' } ],
 
-  strict_num_cmp          => ['num_cmp',[undef,'relTol','format','zeroLevel','zeroLevelTol'],{mode=>'strict'}],
-  strict_num_cmp_abs      => ['num_cmp',[undef,'tol','format'],{mode=>'strict',tolType=>'absolute'}],
-  strict_num_cmp_list     => ['num_cmp',['relTol','format','@'],{mode=>'strict'}],
-  strict_num_cmp_abs_list => ['num_cmp',['tol','format','@'],{mode=>'strict',tolType=>'absolute'}],
+	strict_num_cmp =>
+		[ 'num_cmp', [ undef, 'relTol', 'format', 'zeroLevel', 'zeroLevelTol' ], { mode => 'strict' } ],
+	strict_num_cmp_abs  => [ 'num_cmp', [ undef,    'tol',    'format' ], { mode => 'strict', tolType => 'absolute' } ],
+	strict_num_cmp_list => [ 'num_cmp', [ 'relTol', 'format', '@' ],      { mode => 'strict' } ],
+	strict_num_cmp_abs_list => [ 'num_cmp', [ 'tol', 'format', '@' ], { mode => 'strict', tolType => 'absolute' } ],
 
-  frac_num_cmp            => ['num_cmp',[undef,'relTol','format','zeroLevel','zeroLevelTol'],{mode=>'frac'}],
-  frac_num_cmp_abs        => ['num_cmp',[undef,'tol','format'],{mode=>'frac',tolType=>'absolute'}],
-  frac_num_cmp_list       => ['num_cmp',['relTol','format','@'],{mode=>'frac'}],
-  frac_num_cmp_abs_list   => ['num_cmp',['tol','format','@'],{mode=>'frac',tolType=>'absolute'}],
+	frac_num_cmp => [ 'num_cmp', [ undef, 'relTol', 'format', 'zeroLevel', 'zeroLevelTol' ], { mode => 'frac' } ],
+	frac_num_cmp_abs      => [ 'num_cmp', [ undef,    'tol',    'format' ], { mode => 'frac', tolType => 'absolute' } ],
+	frac_num_cmp_list     => [ 'num_cmp', [ 'relTol', 'format', '@' ],      { mode => 'frac' } ],
+	frac_num_cmp_abs_list => [ 'num_cmp', [ 'tol',    'format', '@' ],      { mode => 'frac', tolType => 'absolute' } ],
 
-  std_num_str_cmp         =>
-    ['num_cmp',[undef,'strings','relTol','format','zeroLevel','zeroLevelTol']],
+	std_num_str_cmp => [ 'num_cmp', [ undef, 'strings', 'relTol', 'format', 'zeroLevel', 'zeroLevelTol' ] ],
 
-  function_cmp  =>
-    ['fun_cmp',[undef,'vars','limits[0]','limits[1]','relTol','numPoints','zeroLevel','zeroLevelTol']],
+	function_cmp =>
+		[ 'fun_cmp', [ undef, 'vars', 'limits[0]', 'limits[1]', 'relTol', 'numPoints', 'zeroLevel', 'zeroLevelTol' ] ],
 
-  function_cmp_up_to_constant =>
-    ['fun_cmp',[undef,'vars','limits[0]','limits[1]','relTol','numPoints','maxConstantOfIntegration',
-      'zeroLevel','zeroLevelTol'],{mode=>'antider'}],
+	function_cmp_up_to_constant => [
+		'fun_cmp',
+		[
+			undef,    'vars',      'limits[0]',                'limits[1]',
+			'relTol', 'numPoints', 'maxConstantOfIntegration', 'zeroLevel',
+			'zeroLevelTol'
+		],
+		{ mode => 'antider' }
+	],
 
-  function_cmp_abs =>
-    [fun_cmp,[undef,'vars','limits[0]','limits[1]','tol','numPoints'],{tolType=>'absolute'}],
+	function_cmp_abs =>
+		[ fun_cmp, [ undef, 'vars', 'limits[0]', 'limits[1]', 'tol', 'numPoints' ], { tolType => 'absolute' } ],
 
-  function_cmp_up_to_constant_abs =>
-    [fun_cmp,[undef,'vars','limits[0]','limits[1]','tol','numPoints','maxConstantOfIntegration'],
-     {mode=>'antider',tolType=>'absolute'}],
+	function_cmp_up_to_constant_abs => [
+		fun_cmp,
+		[ undef, 'vars', 'limits[0]', 'limits[1]', 'tol', 'numPoints', 'maxConstantOfIntegration' ],
+		{ mode => 'antider', tolType => 'absolute' }
+	],
+
+	multivar_function_cmp => [ 'fun_cmp', [ undef, 'vars' ] ],
+
+	std_str_cmp         => [ 'str_cmp', [] ],
+	std_str_cmp_list    => [ 'str_cmp', ['@'] ],
+	std_cs_str_cmp      => [ 'str_cmp', [],    { filters => [ 'trim_whitespace', 'compress_whitespace' ] } ],
+	std_cs_str_cmp_list => [ 'str_cmp', ['@'], { filters => [ 'trim_whitespace', 'compress_whitespace' ] } ],
+	strict_str_cmp      => [ 'str_cmp', [],    { filters => ['trim_whitespace'] } ],
+	strict_str_cmp_list => [ 'str_cmp', ['@'], { filters => ['trim_whitespace'] } ],
+	unordered_str_cmp   => [ 'str_cmp', [],    { filters => [ 'remove_whitespace', 'ignore_order', 'ignore_case' ] } ],
+	unordered_str_cmp_list =>
+		[ 'str_cmp', ['@'], { filters => [ 'remove_whitespace', 'ignore_order', 'ignore_case' ] } ],
+	unordered_cs_str_cmp      => [ 'str_cmp', [],    { filters => [ 'remove_whitespace', 'ignore_order' ] } ],
+	unordered_cs_str_cmp_list => [ 'str_cmp', ['@'], { filters => [ 'remove_whitespace', 'ignore_order' ] } ],
+	ordered_str_cmp           => [ 'str_cmp', [],    { filters => [ 'remove_whitespace', 'ignore_case' ] } ],
+	ordered_str_cmp_list      => [ 'str_cmp', ['@'], { filters => [ 'remove_whitespace', 'ignore_case' ] } ],
+	ordered_cs_str_cmp        => [ 'str_cmp', [],    { filters => ['remove_whitespace'] } ],
+	ordered_cs_str_cmp_list   => [ 'str_cmp', ['@'], { filters => ['remove_whitespace'] } ],
 
-  multivar_function_cmp => ['fun_cmp',[undef,'vars']],
-  
-  std_str_cmp               => ['str_cmp',[]],
-  std_str_cmp_list          => ['str_cmp',['@']],
-  std_cs_str_cmp            => ['str_cmp',[],{filters=>['trim_whitespace','compress_whitespace']}],
-  std_cs_str_cmp_list       => ['str_cmp',['@'],{filters=>['trim_whitespace','compress_whitespace']}],
-  strict_str_cmp            => ['str_cmp',[],{filters=>['trim_whitespace']}],
-  strict_str_cmp_list       => ['str_cmp',['@'],{filters=>['trim_whitespace']}],
-  unordered_str_cmp         => ['str_cmp',[],{filters=>['remove_whitespace','ignore_order','ignore_case']}],
-  unordered_str_cmp_list    => ['str_cmp',['@'],{filters=>['remove_whitespace','ignore_order','ignore_case']}],
-  unordered_cs_str_cmp      => ['str_cmp',[],{filters=>['remove_whitespace','ignore_order']}],
-  unordered_cs_str_cmp_list => ['str_cmp',['@'],{filters=>['remove_whitespace','ignore_order']}],
-  ordered_str_cmp           => ['str_cmp',[],{filters=>['remove_whitespace','ignore_case']}],
-  ordered_str_cmp_list      => ['str_cmp',['@'],{filters=>['remove_whitespace','ignore_case']}],
-  ordered_cs_str_cmp        => ['str_cmp',[],{filters=>['remove_whitespace']}],
-  ordered_cs_str_cmp_list   => ['str_cmp',['@'],{filters=>['remove_whitespace']}],
-  
 );
 
 #numerical_compare_with_units() needs to be handled by hand -- but there are very few uses.
 
-$default{limits} = ['$funcLLimitDefault','$funcULimitDefault'];
+$default{limits} = [ '$funcLLimitDefault', '$funcULimitDefault' ];
 
 #
-#  Make a patter from all the names (we sort be length of the names, to 
+#  Make a patter from all the names (we sort be length of the names, to
 #  make sure prefixes appear later in the list).
 #
-$pattern = join("|",sort byName keys(%function));
+$pattern = join("|", sort byName keys(%function));
 
 sub byName {
-  return $a <=> $b if length($a) == length($b);
-  return length($b) <=> length($a);
+	return $a <=> $b if length($a) == length($b);
+	return length($b) <=> length($a);
 }
 
 #
 #  Remove leading and trailing spaces
 #
 sub trim {
-  my $s = shift;
-  $s =~ s/(^\s+|\s+$)//g;
-  return $s;
+	my $s = shift;
+	$s =~ s/(^\s+|\s+$)//g;
+	return $s;
 }
 
 #
 #  Remove leading comment lines
 #
 sub trimComments {
-  my $s = shift;
-  $s =~ s/^(\s*#.*?(\n|$))*//;
-	    return $s;
+	my $s = shift;
+	$s =~ s/^(\s*#.*?(\n|$))*//;
+	return $s;
 }
 
-
 #
 #  Command-line options and internal state parameters
 #
-$testing = 0;  # true if not writing output files
-$quiet = 0;    # true if not printing changed function calls
-$changed = 0;  # true if we have changes a function in the current file
+$testing = 0;    # true if not writing output files
+$quiet   = 0;    # true if not printing changed function calls
+$changed = 0;    # true if we have changes a function in the current file
 
 #
 #  Read the contents of a file, and search through it for the functions
@@ -140,39 +148,43 @@ sub trimComments {
 #  direct parameter lists.
 #
 sub Process {
-  my @lines;
-  if ($file eq "-") {
-    @lines = <>;
-    open(PGFILE,">&STDOUT");  # redirect this to STDOUT
-  } elsif ($file eq "--test" || $file eq "-t") {
-    $testing = 1; return;
-  } elsif ($file eq "--quiet" || $file eq "-q") {
-    $quiet = 1; return;
-  } else {
-    print stderr "\n" if $changed;
-    print stderr "Converting: $file\n";
-    open(PGFILE,$file) || warn "Can't read '$file': $!";
-    @lines = <PGFILE>; close(PGFILE);
-    open(PGFILE,$testing? ">/dev/null": ">$file");
-  }
-  $changed = 0;
+	my @lines;
+	if ($file eq "-") {
+		@lines = <>;
+		open(PGFILE, ">&STDOUT");    # redirect this to STDOUT
+	} elsif ($file eq "--test" || $file eq "-t") {
+		$testing = 1;
+		return;
+	} elsif ($file eq "--quiet" || $file eq "-q") {
+		$quiet = 1;
+		return;
+	} else {
+		print stderr "\n" if $changed;
+		print stderr "Converting: $file\n";
+		open(PGFILE, $file) || warn "Can't read '$file': $!";
+		@lines = <PGFILE>;
+		close(PGFILE);
+		open(PGFILE, $testing ? ">/dev/null" : ">$file");
+	}
+	$changed = 0;
 
-  my $file = join("",@lines);
-  $file =~ s/\&beginproblem(\(\))?/beginproblem()/gm;  # remove unneeded ampersands
-  $file =~ s/\&ANS\(/ANS\(/gm;  # remove unneeded ampersands
-  $file =~ s/ANS\( */ANS\(/gm;  # remove unneeded spaces
-  my @parts = split(/($pattern)/o,$file);
-#
-#  Because of the parentheses around the pattern above, split returns the pattern
-#  as well as the stuff it separates.  So @parts contains stuff, first function,
-#  args and more stuff, next function, etc.
-#
-  print PGFILE shift(@parts);
-  while (my $f = shift(@parts)) {
-    my ($args,$rest) = GetArgs(shift(@parts));
-    unless ($args) {print $f,$rest; next};  # skip it if doesn't look like an actual call
-    print PGFILE HandleFunction($f,$function{$f},$args),$rest;
-  }
+	my $file = join("", @lines);
+	$file =~ s/\&beginproblem(\(\))?/beginproblem()/gm;    # remove unneeded ampersands
+	$file =~ s/\&ANS\(/ANS\(/gm;                           # remove unneeded ampersands
+	$file =~ s/ANS\( */ANS\(/gm;                           # remove unneeded spaces
+	my @parts = split(/($pattern)/o, $file);
+	#
+	#  Because of the parentheses around the pattern above, split returns the pattern
+	#  as well as the stuff it separates.  So @parts contains stuff, first function,
+	#  args and more stuff, next function, etc.
+	#
+	print PGFILE shift(@parts);
+	while (my $f = shift(@parts)) {
+		my ($args, $rest) = GetArgs(shift(@parts));
+		unless ($args) { print $f, $rest; next }
+		;    # skip it if doesn't look like an actual call
+		print PGFILE HandleFunction($f, $function{$f}, $args), $rest;
+	}
 }
 
 #
@@ -183,51 +195,56 @@ sub Process {
 #  Return the modified function call with the new name and hash
 #
 sub HandleFunction {
-  my $original = shift; my $f = shift; my $args = shift;
-  my @names = @{$f->[1]}; my @args = @{$args};
-  my ($name,$value);
-  #
-  #  Get the fixed options needed for this function
-  #
-  my %options = %{$f->[2] || {}};
-  foreach my $id (keys(%options)) {
-    if (ref($options{$id}) eq 'ARRAY') {
-      $options{$id} = '["'.join('","',@{$options{$id}}).'"]';
-    } else {
-      $options{$id} = '"'.$options{$id}.'"';
-    }
-  }
-  #
-  #  Process the list of arguments supplied by the user
-  #    (treating special cases properly)
-  #
-  my @options = (); my @params = ();
-  while (my ($name,$value) = (shift(@names),shift(@args))) {
-    last unless defined $value;
-    unless ($name) {push(@params,$value); next}
-    if ($name eq '@') {push(@params,'['.join(',',$value,@args).']'); @args = (); last}
-    if ($name =~ s/\[(\d+)\]$//) {
-      $options{$name} = $default{$name} unless defined $options{$name};
-      $options{$name}[$1] = $value; next;
-    }
-    $options{$name} = $value unless $value eq '""' || $value eq "''";
-  }
-  #
-  #  Add the hash values to the new argument list
-  #
-  while (($name,$value) = each %options) {
-    $value = '['.join(',',@{$options{$name}}).']' if ref($value) eq 'ARRAY';
-    push(@options,"$name=>$value");
-  }
-  #
-  #  Create the new function and display it
-  #
-  my $F = $f->[0].'('.join(', ',@params,@options,@args).')';
-  unless ($quiet) {
-    print stderr "   $original(",join(',',@{$args}),") -> $F\n";
-    $changed = 1;
-  }
-  return $F;
+	my $original = shift;
+	my $f        = shift;
+	my $args     = shift;
+	my @names    = @{ $f->[1] };
+	my @args     = @{$args};
+	my ($name, $value);
+	#
+	#  Get the fixed options needed for this function
+	#
+	my %options = %{ $f->[2] || {} };
+	foreach my $id (keys(%options)) {
+		if (ref($options{$id}) eq 'ARRAY') {
+			$options{$id} = '["' . join('","', @{ $options{$id} }) . '"]';
+		} else {
+			$options{$id} = '"' . $options{$id} . '"';
+		}
+	}
+	#
+	#  Process the list of arguments supplied by the user
+	#    (treating special cases properly)
+	#
+	my @options = ();
+	my @params  = ();
+	while (my ($name, $value) = (shift(@names), shift(@args))) {
+		last unless defined $value;
+		unless ($name) { push(@params, $value); next }
+		if     ($name eq '@') { push(@params, '[' . join(',', $value, @args) . ']'); @args = (); last }
+		if     ($name =~ s/\[(\d+)\]$//) {
+			$options{$name} = $default{$name} unless defined $options{$name};
+			$options{$name}[$1] = $value;
+			next;
+		}
+		$options{$name} = $value unless $value eq '""' || $value eq "''";
+	}
+	#
+	#  Add the hash values to the new argument list
+	#
+	while (($name, $value) = each %options) {
+		$value = '[' . join(',', @{ $options{$name} }) . ']' if ref($value) eq 'ARRAY';
+		push(@options, "$name=>$value");
+	}
+	#
+	#  Create the new function and display it
+	#
+	my $F = $f->[0] . '(' . join(', ', @params, @options, @args) . ')';
+	unless ($quiet) {
+		print stderr "   $original(", join(',', @{$args}), ") -> $F\n";
+		$changed = 1;
+	}
+	return $F;
 }
 
 #
@@ -236,27 +253,32 @@ sub HandleFunction {
 #  nested within a multi-line function call.
 #
 sub GetArgs {
-  my $text = shift;
-  my @args = (); my $parenCount = 0; my $arg = "";
-  return (undef,$text) unless $text =~ s/^\s*\(//; # remove leading spaces and opening paren
-  $text = trimComments($text);
-  while ($text =~ s/^((?:"(?:\\.|[^\"])*"|'(?:\\.|[^\'])*'|\\.|[^\\])*?)([(){}\[\],\n])//) {
-    if ($2 eq '(' || $2 eq '[' || $2 eq '{') {$parenCount++; $arg .= $1.$2; next}
-    if ($2 eq ')' && $parenCount == 0) {$arg .= $1; push(@args,trim($arg)); last}
-    if ($2 eq ')' || $2 eq ']' || $2 eq '}') {$parenCount--; $arg .= $1.$2; next}
-    if ($2 eq "\n") {$arg .= $1; $text = trimComments($text); next}
-    if ($parenCount == 0) {
-      push(@args,trim($arg.$1)); $arg = "";
-      $text = trimComments($text);
-    } else {$arg .= $1.$2}
-  }
-  $text =~ s/^ +//; # remove unneeded leading spaces
-  return(\@args,$text);
+	my $text       = shift;
+	my @args       = ();
+	my $parenCount = 0;
+	my $arg        = "";
+	return (undef, $text) unless $text =~ s/^\s*\(//;    # remove leading spaces and opening paren
+	$text = trimComments($text);
+	while ($text =~ s/^((?:"(?:\\.|[^\"])*"|'(?:\\.|[^\'])*'|\\.|[^\\])*?)([(){}\[\],\n])//) {
+		if ($2 eq '(' || $2 eq '[' || $2 eq '{') { $parenCount++; $arg .= $1 . $2; next }
+		if ($2 eq ')' && $parenCount == 0)       { $arg .= $1; push(@args, trim($arg)); last }
+		if ($2 eq ')' || $2 eq ']' || $2 eq '}') { $parenCount--; $arg .= $1 . $2; next }
+		if ($2 eq "\n")                          { $arg .= $1; $text = trimComments($text); next }
+		if ($parenCount == 0) {
+			push(@args, trim($arg . $1));
+			$arg  = "";
+			$text = trimComments($text);
+		} else {
+			$arg .= $1 . $2;
+		}
+	}
+	$text =~ s/^ +//;    # remove unneeded leading spaces
+	return (\@args, $text);
 }
 
 #
 #  Process each file
 #
-push(@ARGV,"-") if (scalar(@ARGV) == 0);
-foreach $file (@ARGV) {print Process($file)}
+push(@ARGV, "-") if (scalar(@ARGV) == 0);
+foreach $file (@ARGV) { print Process($file) }
 print stderr "\n";
diff --git a/bin/crypt_passwords_in_classlist.pl b/bin/crypt_passwords_in_classlist.pl
index cb459868f3..10a6d71cde 100755
--- a/bin/crypt_passwords_in_classlist.pl
+++ b/bin/crypt_passwords_in_classlist.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 use open IO => ':encoding(UTF-8)';
 
@@ -10,8 +10,8 @@ ($)
 	my ($clearPassword) = @_;
 	#Use an SHA512 salt with 16 digits
 	my $salt = '$6$';
-	for (my $i=0; $i<16; $i++) {
-		$salt .= ('.','/','0'..'9','A'..'Z','a'..'z')[rand 64];
+	for (my $i = 0; $i < 16; $i++) {
+		$salt .= ('.', '/', '0' .. '9', 'A' .. 'Z', 'a' .. 'z')[ rand 64 ];
 	}
 
 	my $cryptPassword = crypt(trim_spaces($clearPassword), $salt);
@@ -21,33 +21,34 @@ ($)
 ## Utility function to trim whitespace off the start and end of its input
 sub trim_spaces {
 	my $in = shift;
-	return '' unless $in;  # skip blank spaces
+	return '' unless $in;    # skip blank spaces
 	$in =~ s/^\s*|\s*$//g;
-	return($in);
+	return ($in);
 }
 
 # ==================================================================
 my $inputfile = shift;
-my $outfile = "crypted_" . $inputfile;
+my $outfile   = "crypted_" . $inputfile;
 
-if ( -e $inputfile && -r $inputfile ) {
-	my $fh; my $outfh;
-	open( my $fh, "<", $inputfile ) or die "cannot open $inputfile";
-	open( my $outfh, ">", $outfile ) or die "cannot open $outfile";
+if (-e $inputfile && -r $inputfile) {
+	my $fh;
+	my $outfh;
+	open(my $fh,    "<", $inputfile) or die "cannot open $inputfile";
+	open(my $outfh, ">", $outfile)   or die "cannot open $outfile";
 	my $line;
 	my @fields;
-	while ( $line = <$fh> ) {
-		if ( $line =~ /^#/ ) {
+	while ($line = <$fh>) {
+		if ($line =~ /^#/) {
 			# Do not process comment lines
 			print $outfh $line;
 		} else {
-			@fields = split( ",", $line );
-			$fields[9] = cryptPassword( $fields[9] );
-			print $outfh join(",",@fields);
+			@fields = split(",", $line);
+			$fields[9] = cryptPassword($fields[9]);
+			print $outfh join(",", @fields);
 		}
 	}
 	close $outfh or die "cannot close $outfile";
-	close $fh or die "cannot close $inputfile";
+	close $fh    or die "cannot close $inputfile";
 	print "Output is in the file $outfile\n";
 } else {
 	print "Usage: crypt_passwords_in_classlist.pl filename";
diff --git a/bin/delcourse b/bin/delcourse
index 5cdc33bb43..128e283bd8 100755
--- a/bin/delcourse
+++ b/bin/delcourse
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -20,7 +20,7 @@ delcourse - delete a course
 
 =head1 SYNOPSIS
 
- delcourse [options] COURSEID
+ delcourse COURSEID
 
 =head1 DESCRIPTION
 
@@ -32,151 +32,36 @@ Delete a course, including its database and course directory.
 
 =item I<COURSEID>
 
-The name of the course to delete.
-
-=back
-
-If the course's database layout is sql, the following options are valid:
-
-=over
-
-=item B<--sql-host>=I<HOST>
-
-Specifies the hostname of the SQL server on the course database resides. If not
-specified, the default for your RDBMS will be used.
-
-=item B<--sql-port>=I<PORT>
-
-Specifies the port of the SQL server on the course database resides. If not
-specified, the default for your RDBMS will be used.
-
-=item B<--sql-user>=I<USER>
-
-Specifies the username to use when connecting to the SQL server to delete the
-course database. This user must have CREATE, DELETE, FILE, INSERT, SELECT, and
-UPDATE privileges, WITH GRANT OPTION.
-
-=item B<--sql-pass>=I<PASS>
-
-Specifies the password to use when connecting to the SQL server.
-
-=item B<--sql-db>=I<DBNAME>
-
-Specifies the name of the database to delete. (This is usually
-"webwork_COURSENAME", but can be overridden by changing the database layout in
-F<localOverrides.conf>.)
+The name of the course to delete.  This is required.
 
 =back
 
 =cut
 
-BEGIN {
-	# hide arguments (there could be passwords there!)
-	$0 = "$0";
-}
-
 use strict;
 use warnings;
-use Getopt::Long;
 
 BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n"
-		unless exists $ENV{WEBWORK_ROOT};
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
 
-	die "PG_ROOT not found in environment.\n"
-		unless exists $ENV{PG_ROOT};
-
-	# This prevents some spurious warning.
-	$main::VERSION = "2.4";
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
 
 use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$ENV{PG_ROOT}/lib";
 
 use WeBWorK::CourseEnvironment;
-use WeBWorK::DB;
-use WeBWorK::Utils qw(runtime_use readFile);
-use WeBWorK::Utils::CourseManagement qw(addCourse deleteCourse listCourses);
-
-sub usage {
-	print STDERR "usage: $0 [options] COURSEID\n";
-	print STDERR "Options:\n";
-	print STDERR "  for \"sql\" database layout:\n";
-	print STDERR "    [--sql-host=HOST] [--sql-port=port]\n";
-	print STDERR "    --sql-user=USER --sql-pass=PASS\n";
-	print STDERR "    --sql-db=DBNAME\n";
-	exit;
-}
+use WeBWorK::Utils::CourseManagement qw(deleteCourse);
 
-sub usage_error {
-	print STDERR "$0: @_\n";
-	usage();
-}
-
-my $sql_host = "";
-my $sql_port = "";
-my $sql_user = "";
-my $sql_pass = "";
-my $sql_db = "";
-
-##### get command-line options #####
-
-GetOptions(
-	"sql-host=s" => \$sql_host,
-	"sql-port=s" => \$sql_port,
-	"sql-user=s" => \$sql_user,
-	"sql-pass=s" => \$sql_pass,
-	"sql-db=s" => \$sql_db,
-);
 my $courseID = shift;
 
-##### perform sanity checks #####
-
-usage_error("must specify COURSEID.") unless $courseID;
+die "The COURSEID must be provided.\nUsage: $0 courseID\n" unless $courseID;
 
-# bring up a minimal course environment
 my $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
-	courseName => $courseID,
+	courseName  => $courseID,
 });
 
-my $dbLayout = $ce->{dbLayoutName};
+eval { deleteCourse(courseID => $courseID, ce => $ce); };
 
-if ($dbLayout eq "sql") {
-	usage_error("must specify --sql-user.")   unless $sql_user;
-	usage_error("must specify --sql-pass.")   unless $sql_pass;
-	usage_error("must specify --sql-db.")     unless $sql_db;
-}
-
-##### set up parameters to pass to deleteCourse() #####
-
-my %dbOptions;
-if ($dbLayout eq "sql") {
-	$dbOptions{host}     = $sql_host if $sql_host ne "";
-	$dbOptions{port}     = $sql_port if $sql_port ne "";
-	$dbOptions{username} = $sql_user;
-	$dbOptions{password} = $sql_pass;
-	$dbOptions{database} = $sql_db;
-}
-
-##### call deleteCourse(), handle errors #####
-
-eval {
-	deleteCourse(
-		courseID      => $courseID,
-		ce            => $ce,
-		dbOptions     => \%dbOptions,
-	);
-};
-
-if ($@) {
-	my $error = $@;
-	print STDERR "$error\n";
-	exit;
-}
-
-=head1 AUTHOR
-
-Written by Sam Hathaway, hathaway at users.sourceforge.net.
-
-=cut
+die "$@\n" if $@;
diff --git a/bin/dev_scripts/PODParser.pm b/bin/dev_scripts/PODParser.pm
deleted file mode 100644
index 5585618e9e..0000000000
--- a/bin/dev_scripts/PODParser.pm
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/perl
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-use strict;
-use warnings;
-
-use Pod::Simple::XHTML;
-
-package PODParser;
-our @ISA = qw(Pod::Simple::XHTML);
-
-use File::Find;
-
-sub new {
-	my $invocant = shift;
-	my $class = ref $invocant || $invocant;
-	my $self = $class->SUPER::new(@_);
-	$self->perldoc_url_prefix("https://metacpan.org/pod/");
-	$self->index(1);
-	$self->backlink(1);
-	return bless $self, $class;
-}
-
-# Attempt to resolve links to local files.  If a local file is not found, then
-# let Pod::Simple::XHTML resolve to a cpan link.
-sub resolve_pod_page_link {
-	my ($self, $to, $section) = @_;
-
-	# This ignores $to if $section is set.  It would probably be better
-	# to check for "$to/$section" if both are set.
-	$self->{pod_search} = $section // $to;
-	find({ wanted => $self->pod_wanted }, $self->{source_root});
-	undef $self->{pod_search};
-
-	if ($self->{pod_found}) {
-		my $pod_url = $self->{pod_found} =~ s/^$self->{source_root}/$self->{base_url}/r;
-		undef $self->{pod_found};
-		print "Resolved local pod link $to" . ($section ? "/$section" : "") . " to $pod_url\n" if $self->{verbose} > 2;
-		return $self->encode_entities($pod_url);
-	}
-
-	print "Using cpan pod link for $to" . ($section ? "/$section" : "") . "\n" if $self->{verbose} > 2;
-	return $self->SUPER::resolve_pod_page_link($to, $section);
-}
-
-# This takes the first file found that matches.
-sub pod_wanted {
-	my $self = shift;
-	return sub {
-		my $filename = $_;
-		my $path = $File::Find::name;
-		my $dir = $File::Find::dir;
-
-		$File::Find::prune = 1, return if ($self->{pod_found});
-
-		if (-d $path && $filename =~ /^(\.git|\.github|t|htdocs)$/) {
-			$File::Find::prune = 1;
-			return;
-		}
-
-		if ($filename eq $self->{pod_search}) {
-			$self->{pod_found} = $path =~ s/\.(pm|pl)$/.html/r;
-			$File::Find::prune = 1;
-			return;
-		}
-	};
-}
-
-# Don't output anything for a malformed =head[1-4] with no header text.
-# This is done in pg/lib/Matrix.pm, for example.
-sub _end_head {
-	my $self = shift;
-	if ($self->{scratch}) {
-		return $self->SUPER::_end_head(@_);
-	}
-	delete $self->{in_head};
-	return "";
-}
-
-1;
diff --git a/bin/dev_scripts/PODtoHTML.pm b/bin/dev_scripts/PODtoHTML.pm
index e8c41674b5..a867b81cd3 100644
--- a/bin/dev_scripts/PODtoHTML.pm
+++ b/bin/dev_scripts/PODtoHTML.pm
@@ -1,7 +1,6 @@
-#!/usr/bin/perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,87 +13,69 @@
 # Artistic License for more details.
 ################################################################################
 
+package PODtoHTML;
+
 use strict;
 use warnings;
+use utf8;
 
-package PODtoHTML;
-
-use File::Find qw(find);
+use Pod::Simple::Search;
+use Mojo::Template;
+use Mojo::DOM;
+use Mojo::Collection qw(c);
 use File::Path qw(make_path);
+use File::Basename qw(dirname);
 use IO::File;
-use Pod::Find qw(contains_pod);
 use POSIX qw(strftime);
-use PODParser;
+
+use WeBWorK::Utils::PODParser;
 
 our @sections = (
-	'/'     => "(root)",
-	bin     => "Scripts",
-	conf    => "Config Files",
-	doc     => "Documentation",
-	lib     => "Libraries",
-	macros  => "Macros",
-	clients => "Clients"
+	bin    => 'Scripts',
+	conf   => 'Config Files',
+	doc    => 'Documentation',
+	lib    => 'Libraries',
+	macros => 'Macros'
 );
 
 sub new {
 	my ($invocant, %o) = @_;
 	my $class = ref $invocant || $invocant;
 
-	my @section_list = ref($o{sections}) eq 'ARRAY' ? @{$o{sections}} : @sections;
-	my $section_hash = {@section_list};
-	my $section_order = [ map { $section_list[2 * $_] } 0 .. $#section_list / 2 ];
+	my @section_list  = ref($o{sections}) eq 'ARRAY' ? @{ $o{sections} } : @sections;
+	my $section_hash  = {@section_list};
+	my $section_order = [ map { $section_list[ 2 * $_ ] } 0 .. $#section_list / 2 ];
 	delete $o{sections};
 
 	my $self = {
 		%o,
-		idx => {},
-		section_hash => $section_hash,
+		idx           => {},
+		section_hash  => $section_hash,
 		section_order => $section_order,
 	};
 	return bless $self, $class;
 }
 
 sub convert_pods {
-	my $self = shift;
+	my $self        = shift;
 	my $source_root = $self->{source_root};
-	my $dest_root = $self->{dest_root};
-
-	find({ wanted => $self->gen_pod_wanted, no_chdir => 1 }, $source_root);
-	$self->write_index("$dest_root/index.html");
-}
+	my $dest_root   = $self->{dest_root};
 
-sub gen_pod_wanted {
-	my $self = shift;
-	return sub {
-		my $path = $File::Find::name;
-		my $dir = $File::Find::dir;
-		my ($name) = $path =~ m|^$dir(?:/(.*))?$|;
-		$name = '' unless defined $name;
-
-		if ($name =~ /^\./) {
-			$File::Find::prune = 1;
-			return;
-		}
-		unless (-f $path or -d $path) {
-			$File::Find::prune = 1;
-			return;
-		}
-		if (-d _ and $name =~ /^(\.git|\.github|t|htdocs)$/) {
-			$File::Find::prune = 1;
-			return;
-		}
+	my $regex = join('|', map {"^$_"} @{ $self->{section_order} });
 
-		return if -d _;
-		return unless contains_pod($path);
+	my ($name2path, $path2name) = Pod::Simple::Search->new->inc(0)->limit_re(qr!$regex!)->survey($self->{source_root});
+	for (keys %$path2name) {
+		print "Processing file: $_\n" if $self->{verbose} > 1;
+		$self->process_pod($_, $name2path);
+	}
 
-		print "Processing file: $path\n" if $self->{verbose} > 1;
+	$self->write_index("$dest_root/index.html");
 
-		$self->process_pod($path);
-	};
+	return;
 }
 
 sub process_pod {
-	my ($self, $pod_path) = @_;
+	my ($self, $pod_path, $pod_files) = @_;
 
 	my $pod_name;
 
@@ -110,7 +91,7 @@ sub process_pod {
 		}
 	}
 
-	$pod_name = (defined $subdir_rest ? "$subdir_rest/" : "") . $filename;
+	$pod_name = (defined $subdir_rest ? "$subdir_rest/" : '') . $filename;
 	if ($filename =~ /\.pl$/) {
 		$filename =~ s/\.pl$/.html/;
 	} elsif ($filename =~ /\.pod$/) {
@@ -121,127 +102,94 @@ sub process_pod {
 		$pod_name =~ s|/+|::|g;
 		$filename =~ s/\.pm$/.html/;
 	} elsif ($filename !~ /\.html$/) {
-		$filename .= ".html";
+		$filename .= '.html';
 	}
 
 	$pod_name =~ s/^(\/|::)//;
 
-	my $html_dir = $self->{dest_root} . (defined $subdir ? "/$subdir" : "");
-	my $html_path = "$html_dir/$filename";
+	my $html_dir      = $self->{dest_root} . (defined $subdir ? "/$subdir" : '');
+	my $html_path     = "$html_dir/$filename";
 	my $html_rel_path = defined $subdir ? "$subdir/$filename" : $filename;
 
 	$self->update_index($subdir, $html_rel_path, $pod_name);
 	make_path($html_dir);
 	my $html = $self->do_pod2html(
-		pod_path => $pod_path,
-		pod_name => $pod_name
+		pod_path  => $pod_path,
+		pod_name  => $pod_name,
+		pod_files => $pod_files
 	);
-	my $fh = new IO::File($html_path, '>')
+	my $fh = IO::File->new($html_path, '>:encoding(UTF-8)')
 		or die "Failed to open file '$html_path' for writing: $!\n";
 	print $fh $html;
+
+	return;
 }
 
 sub update_index {
 	my ($self, $subdir, $html_rel_path, $pod_name) = @_;
+
 	$subdir =~ s|/.*$||;
-	my $idx = $self->{idx};
+	my $idx      = $self->{idx};
 	my $sections = $self->{section_hash};
 	if (exists $sections->{$subdir}) {
-		push @{$idx->{$subdir}}, [ $html_rel_path, $pod_name ];
+		push @{ $idx->{$subdir} }, [ $html_rel_path, $pod_name ];
 	} else {
 		warn "no section for subdir '$subdir'\n";
 	}
+
+	return;
 }
 
 sub write_index {
 	my ($self, $out_path) = @_;
-	my $idx = $self->{idx};
-	my $sections = $self->{section_hash};
-	my $section_order = $self->{section_order};
-	my $source_root = $self->{source_root};
-	$source_root =~ s|^.*/||;
-
-	my $title = "Index for $source_root";
-	my $content_start = "<ul>";
-	my $content = "";
-
-	for my $section (@$section_order) {
-		next unless defined $idx->{$section};
-		my $section_name = $sections->{$section};
-		$content_start .= qq{<li><a href="#$section">$section_name</a></li>};
-		my @files = sort @{$idx->{$section}};
-		$content .= qq{<a name="$section"></a>};
-		$content .= qq{<h2><a href="#_podtop_">$section_name</a></h2><ul>};
-		for my $file (sort { $a->[1] cmp $b->[1] } @files) {
-			my ($path, $name) = @$file;
-			$content .= qq{<li><a href="$path">$name</a></li>};
-		}
-		$content .= "</ul>";
-	}
-
-	$content_start .= "</ul>";
-	my $date = strftime "%a %b %e %H:%M:%S %Z %Y", localtime;
 
-	my $fh = new IO::File($out_path, '>') or die "Failed to open index '$out_path' for writing: $!\n";
-	print $fh (
-		get_header($title),
-		$content_start,
-		$content,
-		"<p>Generated $date</p>",
-		get_footer()
+	my $fh = IO::File->new($out_path, '>:encoding(UTF-8)') or die "Failed to open index '$out_path' for writing: $!\n";
+	print $fh Mojo::Template->new(vars => 1)->render_file(
+		"$self->{template_dir}/category-index.mt",
+		{
+			title         => 'POD for ' . ($self->{source_root} =~ s|^.*/||r),
+			base_url      => $self->{dest_url},
+			pod_index     => $self->{idx},
+			sections      => $self->{section_hash},
+			section_order => $self->{section_order},
+			date          => strftime('%a %b %e %H:%M:%S %Z %Y', localtime)
+		}
 	);
+
+	return;
 }
 
 sub do_pod2html {
-	my $self = shift;
-	my %o = @_;
-	my $psx = new PODParser;
-	$psx->{source_root} = $self->{source_root};
-	$psx->{verbose} = $self->{verbose};
-	$psx->{base_url} = ($self->{dest_url} // "") . "/" . (($self->{source_root} // "") =~ s|^.*/||r);
+	my ($self, %o) = @_;
+
+	my $psx = WeBWorK::Utils::PODParser->new($o{pod_files});
+	$psx->{source_root}     = $self->{source_root};
+	$psx->{verbose}         = $self->{verbose};
+	$psx->{assert_html_ext} = 1;
+	$psx->{base_url}        = ($self->{dest_url} // '') . '/' . (($self->{source_root} // '') =~ s|^.*/||r);
 	$psx->output_string(\my $html);
-	$psx->html_header(get_header($o{pod_name}));
-	$psx->html_footer(get_footer());
+	$psx->html_header('');
+	$psx->html_footer('');
 	$psx->parse_file($o{pod_path});
-	return $html;
-}
 
-sub get_header {
-	my $title = shift;
-	return <<EOF
-<!DOCTYPE html>
-<html lang="en" dir="ltr">
-<head>
-<meta charset='UTF-8'>
-<link rel="icon" href="/favicon.ico">
-<title>$title</title>
-</head>
-<body>
-<h1>$title</h1>
-<div style="margin-left:20px">Jump to: <a href="#column-one">Site Navigation</a></div>
-<hr>
-<div id="_podtop_">
-EOF
-}
+	my $dom        = Mojo::DOM->new($html);
+	my $podIndexUL = $dom->at('ul[id="index"]');
+	my $podIndex   = $podIndexUL ? $podIndexUL->find('ul[id="index"] > li') : c();
+	for (@$podIndex) {
+		$_->attr({ class => 'nav-item' });
+		$_->at('a')->attr({ class => 'nav-link p-0' });
+		for (@{ $_->find('ul') }) {
+			$_->attr({ class => 'nav flex-column w-100' });
+		}
+		for (@{ $_->find('li') }) {
+			$_->attr({ class => 'nav-item' });
+			$_->at('a')->attr({ class => 'nav-link p-0' });
+		}
+	}
+	my $podHTML = $podIndexUL ? $podIndexUL->remove : $html;
 
-sub get_footer {
-	return <<'EOF';
-</div>
-<hr>
-<div id="column-one">
-<h5>Site Navigation</h5>
-<div>
-<ul>
-<li><a href="/pod">WeBWorK POD Home</a></li>
-<li><a href="http://webwork.maa.org/wiki/WeBWorK_Main_Page">WeBWorK Wiki</a></li>
-</ul>
-</div>
-</div>
-</body>
-</html>
-EOF
+	return Mojo::Template->new(vars => 1)->render_file("$self->{template_dir}/pod.mt",
+		{ title => $o{pod_name}, base_url => dirname($psx->{base_url}), index => $podIndex, content => $podHTML });
 }
 
 1;
-
-
diff --git a/bin/dev_scripts/generate-ww-pg-pod.pl b/bin/dev_scripts/generate-ww-pg-pod.pl
index 73b398e87c..dca0f6e2fd 100755
--- a/bin/dev_scripts/generate-ww-pg-pod.pl
+++ b/bin/dev_scripts/generate-ww-pg-pod.pl
@@ -1,7 +1,7 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -19,13 +19,10 @@ =head1 NAME
 generate-ww-pg-pod.pl - Convert WeBWorK and PG POD into HTML form.
 
 =head1 SYNOPSIS
- 
+
 generate-ww-pg-pod.pl [options]
- 
+
  Options:
-   -w|--webwork-root     Directory containing a git clone of webwork2.
-                         If this option is not set, then the environment
-                         variable $WEBWORK_ROOT will be used if it is set.
    -p|--pg-root          Directory containing  a git clone of pg.
                          If this option is not set, then the environment
                          variable $PG_ROOT will be used if it is set.
@@ -35,95 +32,96 @@ =head1 SYNOPSIS
    -v|--verbose          Increase the verbosity of the output.
                          (Use multiple times for more verbosity.)
 
-Note that at least one of the options --webwork-root or --pg-root must be provided
-(or there is nothing to do!).
+Note that --pg-root must be provided or the PG_ROOT environment variable set
+if the POD for pg is desired.
 
 =head1 DESCRIPTION
- 
+
 Convert WeBWorK and PG POD into HTML form.
- 
+
 =cut
 
 use strict;
 use warnings;
+
 use Getopt::Long qw(:config bundling);
 use Pod::Usage;
 
-my ($webwork_root, $pg_root, $output_dir, $base_url);
+my ($pg_root, $output_dir, $base_url);
 my $verbose = 0;
 GetOptions(
-	'w|webwork-root=s' => \$webwork_root,
-	'p|pg-root=s'      => \$pg_root,
-	'o|output-dir=s'   => \$output_dir,
-	'b|base-url=s'     => \$base_url,
-	'v|verbose+'       => \$verbose
+	'p|pg-root=s'    => \$pg_root,
+	'o|output-dir=s' => \$output_dir,
+	'b|base-url=s'   => \$base_url,
+	'v|verbose+'     => \$verbose
 );
 
-$webwork_root = $ENV{WEBWORK_ROOT} if !$webwork_root;
 $pg_root = $ENV{PG_ROOT} if !$pg_root;
 
-pod2usage(2) unless (($webwork_root || $pg_root) && $output_dir);
+pod2usage(2) unless $output_dir;
 
 $base_url = "/" if !$base_url;
 
+use Mojo::Template;
 use IO::File;
+use File::Copy;
 use File::Path qw(make_path remove_tree);
 use File::Basename qw(dirname);
+use Cwd qw(abs_path);
 
+use lib dirname(dirname(dirname(__FILE__))) . '/lib';
 use lib dirname(__FILE__);
+
 use PODtoHTML;
 
+my $webwork_root = abs_path(dirname(dirname(dirname(__FILE__))));
+
 for my $dir ($webwork_root, $pg_root) {
 	next unless $dir && -d $dir;
 	print "Reading: $dir\n" if $verbose;
 	process_dir($dir);
 }
 
-my $index_fh = new IO::File("$output_dir/index.html", '>')
+my $index_fh = IO::File->new("$output_dir/index.html", '>')
 	or die "failed to open '$output_dir/index.html' for writing: $!\n";
 write_index($index_fh);
 
+make_path("$output_dir/assets");
+copy("$webwork_root/htdocs/js/PODViewer/podviewer.css", "$output_dir/assets/podviewer.css");
+print "copying $webwork_root/htdocs/js/PODViewer/podviewer.css to $output_dir/assets/podviewer.css\n" if $verbose;
+copy("$webwork_root/htdocs/js/PODViewer/podviewer.js", "$output_dir/assets/podviewer.js");
+print "copying $webwork_root/htdocs/js/PODViewer/podviewer.css to $output_dir/assets/podviewer.js\n" if $verbose;
+
 sub process_dir {
 	my $source_dir = shift;
 	return unless $source_dir =~ /\/webwork2$/ || $source_dir =~ /\/pg$/;
 
 	my $dest_dir = $source_dir;
 	$dest_dir =~ s/^$webwork_root/$output_dir\/webwork2/ if ($source_dir =~ /\/webwork2$/);
-	$dest_dir =~ s/^$pg_root/$output_dir\/pg/ if ($source_dir =~ /\/pg$/);
+	$dest_dir =~ s/^$pg_root/$output_dir\/pg/            if ($source_dir =~ /\/pg$/);
 
 	remove_tree($dest_dir);
 	make_path($dest_dir);
 
-	my $htmldocs = new PODtoHTML(
-		source_root => $source_dir,
-		dest_root => $dest_dir,
-		dest_url => $base_url,
-		verbose => $verbose
+	my $htmldocs = PODtoHTML->new(
+		source_root  => $source_dir,
+		dest_root    => $dest_dir,
+		template_dir => "$webwork_root/bin/dev_scripts/pod-templates",
+		dest_url     => $base_url,
+		verbose      => $verbose
 	);
 	$htmldocs->convert_pods;
+
+	return;
 }
 
 sub write_index {
 	my $fh = shift;
-	print $fh <<EOF;
-<!DOCTYPE html>
-<html lang="en" dir="ltr">
-<head>
-<meta charset='UTF-8'>
-<link rel="shortcut icon" href="/favicon.ico">
-<title>WeBWorK/PG POD</title>
-</head>
-<body>
-<h1>WeBWorK/PG POD</h1>
-<h2>(Plain Old Documentation)</h2>
-<div>
-<ul>
-EOF
-
-	print $fh q{<li><a href="pg">PG</a></li>} if $pg_root;
-	print $fh q{<li><a href="webwork2">WeBWorK</a></li>} if $webwork_root;
-
-	print $fh "</ul></div></body></html>";
+
+	print $fh Mojo::Template->new(vars => 1)->render_file("$webwork_root/bin/dev_scripts/pod-templates/main-index.mt",
+		{ base_url => $base_url, webwork_root => $webwork_root, pg_root => $pg_root });
+
+	return;
 }
 
 1;
diff --git a/bin/dev_scripts/pod-templates/category-index.mt b/bin/dev_scripts/pod-templates/category-index.mt
new file mode 100644
index 0000000000..78c9bb3724
--- /dev/null
+++ b/bin/dev_scripts/pod-templates/category-index.mt
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html lang="en" dir="ltr">
+%
+<head>
+	<meta charset='UTF-8'>
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title><%= $title %></title>
+	<link rel="shortcut icon" href="/favicon.ico">
+	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet">
+	<link href="<%= $base_url %>/assets/podviewer.css" rel="stylesheet">
+	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" defer></script>
+	<script src="<%= $base_url %>/assets/podviewer.js" defer></script>
+</head>
+%
+<body>
+	<div class="pod-header navbar navbar-dark bg-primary px-3 position-fixed border-bottom border-dark">
+		<div class="container-fluid d-flex flex-column d-md-block">
+			<h1 class="navbar-brand fw-bold fs-5 me-auto me-md-0 mb-2 mb-md-0"><%= $title %></h1>
+			<button class="navbar-toggler d-md-none me-auto" type="button" data-bs-toggle="offcanvas"
+				data-bs-target="#sidebar" aria-controls="sidebar" aria-label="Toggle Sidebar">
+				<span class="navbar-toggler-icon"></span>
+			</button>
+		</div>
+	</div>
+	%
+	% my ($index, $content) = ('', '');
+	% for my $section (@$section_order) {
+		% next unless defined $pod_index->{$section};
+		% my $new_index = begin
+			<a href="#<%= $section %>" class="nav-link"><%= $sections->{$section} %></a>
+		% end
+		% $index .= $new_index->();
+		% my $new_content = begin
+			<h2><a href="#_podtop_" id="<%= $section %>"><%= $sections->{$section} %></a></h2>
+			<div class="list-group mb-2">
+				% for my $file (sort { $a->[1] cmp $b->[1] } @{ $pod_index->{$section} }) {
+					<a href="<%= $file->[0] %>" class="list-group-item list-group-item-action"><%= $file->[1] %></a>
+				% }
+			</div>
+		% end
+		% $content .= $new_content->();
+	% }
+	%
+	<aside class="offcanvas-md offcanvas-start border-end border-dark position-fixed" tabindex="-1"
+		id="sidebar" aria-labelledby="sidebar-label">
+		<div class="offcanvas-header">
+			<h2 class="offcanvas-title" id="sidebar-label">Index</h2>
+			<button type="button" class="btn-close" data-bs-dismiss="offcanvas" data-bs-target="#sidebar"
+			   	aria-label="Close">
+			</button>
+		</div>
+		<div class="offcanvas-body p-md-3 w-100">
+			<nav class="nav flex-column w-100">
+				<a href="<%= $base_url %>" class="nav-link">WeBWorK POD Home</a>
+				<a href="http://webwork.maa.org/wiki/WeBWorK_Main_Page" class="nav-link">WeBWorK Wiki</a>
+				<hr>
+				<%= $index =%>
+			</nav>
+		</div>
+	</aside>
+	<div class="pod-page-container d-flex">
+		<div class="container-fluid p-3 h-100" id="_podtop_">
+			<%= $content =%>
+			<p class="mt-3">Generated <%= $date %></p>
+		</div>
+	</div>
+</body>
+%
+</html>
diff --git a/bin/dev_scripts/pod-templates/main-index.mt b/bin/dev_scripts/pod-templates/main-index.mt
new file mode 100644
index 0000000000..d9bfe39e8d
--- /dev/null
+++ b/bin/dev_scripts/pod-templates/main-index.mt
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html lang="en" dir="ltr">
+%
+<head>
+	<meta charset='UTF-8'>
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<link rel="shortcut icon" href="/favicon.ico">
+	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet">
+	<link href="<%= $base_url %>/assets/podviewer.css" rel="stylesheet">
+	<title>WeBWorK/PG POD</title>
+</head>
+%
+<body>
+	<div class="main-index-header navbar navbar-dark bg-primary px-3 position-fixed border-bottom border-dark">
+		<div class="container-fluid">
+			<h1 class="navbar-brand fw-bold fs-5 m-0">WeBWorK/PG POD</h1>
+		</div>
+	</div>
+	<div class="main-index-container mx-3">
+		<div class="pt-3">
+			<h2 class="fw-bold fs-6">(Plain Old Documentation)</h2>
+			<nav class="nav flex-column list-group">
+				% if ($pg_root) {
+					<a class="nav-link list-group-item list-group-item-action d-inline-block w-100" href="pg">
+						PG
+					</a>
+				% }
+				% if ($webwork_root) {
+					<a class="nav-link list-group-item list-group-item-action d-inline-block w-100" href="webwork2">
+						Webwork2
+					</a>
+				% }
+			</nav>
+		</div>
+	</div>
+</body>
+%
+</html>
diff --git a/bin/dev_scripts/pod-templates/pod.mt b/bin/dev_scripts/pod-templates/pod.mt
new file mode 100644
index 0000000000..0ea8e6c5b4
--- /dev/null
+++ b/bin/dev_scripts/pod-templates/pod.mt
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html lang="en" dir="ltr">
+%
+<head>
+	<meta charset='UTF-8'>
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title><%= $title %></title>
+	<link rel="shortcut icon" href="/favicon.ico">
+	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet">
+	<link href="<%= $base_url %>/assets/podviewer.css" rel="stylesheet">
+	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" defer></script>
+	<script src="<%= $base_url %>/assets/podviewer.js" defer></script>
+</head>
+%
+<body>
+	<div class="pod-header navbar navbar-dark bg-primary px-3 position-fixed border-bottom border-dark">
+		<div class="container-fluid d-flex flex-column d-md-block">
+			<h1 class="navbar-brand fw-bold fs-5 me-auto me-md-0 mb-2 mb-md-0"><%= $title %></h1>
+			<button class="navbar-toggler d-md-none me-auto" type="button" data-bs-toggle="offcanvas"
+				data-bs-target="#sidebar" aria-controls="sidebar" aria-label="Toggle Sidebar">
+				<span class="navbar-toggler-icon"></span>
+			</button>
+		</div>
+	</div>
+	<aside class="offcanvas-md offcanvas-start border-end border-dark position-fixed" tabindex="-1"
+		id="sidebar" aria-labelledby="sidebar-label">
+		<div class="offcanvas-header">
+			<h2 class="offcanvas-title" id="sidebar-label">Index</h2>
+			<button type="button" class="btn-close" data-bs-dismiss="offcanvas" data-bs-target="#sidebar"
+			   	aria-label="Close">
+			</button>
+		</div>
+		<div class="offcanvas-body p-md-3 w-100">
+			<nav>
+				<ul class="nav flex-column w-100">
+					<li class="nav-item">
+						<a href="<%= $base_url %>" class="nav-link p-0">WeBWorK POD Home</a>
+					</li>
+					<li class="nav-item">
+						<a href="http://webwork.maa.org/wiki/WeBWorK_Main_Page" class="nav-link p-0">WeBWorK Wiki</a>
+					</li>
+					<li><hr></li>
+					<%= $index->join('') =%>
+				</ul>
+			</nav>
+		</div>
+	</aside>
+	<div class="pod-page-container d-flex">
+		<div class="container-fluid p-3 h-100" id="_podtop_">
+			<%= $content =%>
+		</div>
+	</div>
+</body>
+%
+</html>
diff --git a/bin/dev_scripts/run-perltidy.pl b/bin/dev_scripts/run-perltidy.pl
new file mode 100755
index 0000000000..f6df90cae2
--- /dev/null
+++ b/bin/dev_scripts/run-perltidy.pl
@@ -0,0 +1,123 @@
+#!/usr/bin/env perl
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+=head1 NAME
+
+run-perltidy.pl -- Run perltidy on webwork2 source files.
+
+=head1 SYNOPSIS
+
+    run-perltidy.pl [options] file1 file2 ...
+
+=head1 DESCRIPTION
+
+Run perltidy on webwork2 source files.
+
+=head1 OPTIONS
+
+For this script to work the the .perltidyrc file in the webwork2 root directory
+must be readable.  Note that the webwork2 root directory is automatically
+detected.
+
+This script accepts all of the options that are accepted by perltidy.  See the
+perltidy documentation for details.
+
+However, the C<-pro> option is not allowed.  This script will use the
+.perltidyrc file in the PG root directory for this option instead.
+
+In addition the default value of C<-bext> for this script is C<'/'>, which means
+that backup files will be created with the C<.bak> extension, and will be
+deleted if there are no errors.  Note that this behavior may be changed by
+passing a different value for the C<-bext> option.
+
+Note that the C<-v> flag makes this script verbose, and does not output the
+perltidy version as it would usually do for perltidy.
+
+Finally, if no files are passed on the command line, then perltidy will be
+executed on all files with the extensions C<.pl>, C<.pm>, or C<.t> in the
+webwork2 root directory.  If files are passed on the command line, then perltidy
+will only be executed on the listed files.
+
+=cut
+
+use strict;
+use warnings;
+use feature 'say';
+
+use Perl::Tidy;
+use File::Find qw(find);
+use Mojo::File qw(curfile);
+
+my $webwork_root = curfile->dirname->dirname->dirname;
+
+die "Version 20220613 or newer of perltidy is required for this script.\n"
+	. "The installed version is $Perl::Tidy::VERSION.\n"
+	unless $Perl::Tidy::VERSION >= 20220613;
+die "The .perltidyrc file in the webwork root directory is not readable.\n"
+	unless -r "$webwork_root/.perltidyrc";
+
+my $verbose = 0;
+my (@args, @files);
+for (@ARGV) {
+	if    ($_ eq '-v') { $verbose = 1 }
+	elsif ($_ =~ /^-/) { push(@args, $_) }
+	else               { push(@files, $_) }
+}
+
+# Validate options that were passed.
+my %options;
+my $err = Perl::Tidy::perltidy(argv => \@args, dump_options => \%options);
+exit $err                                               if $err;
+die "The -pro option is not suppored by this script.\n" if defined $options{profile};
+
+unshift(@args, '-bext=/') unless defined $options{'backup-file-extension'};
+
+if (@files) {
+	for (@files) {
+		push(@args, $_);
+		say "Tidying file: $_" if $verbose;
+		Perl::Tidy::perltidy(argv => \@args, perltidyrc => "$webwork_root/.perltidyrc");
+		pop(@args);
+	}
+} else {
+	find(
+		{
+			wanted => sub {
+				my $path   = $File::Find::name;
+				my $dir    = $File::Find::dir;
+				my ($name) = $path =~ m|^$dir(?:/(.*))?$|;
+				$name = '' unless defined $name;
+
+				if (-d $path && $name =~ /^(\.git|\.github|htdocs|\.vscode)$/) {
+					$File::Find::prune = 1;
+					return;
+				}
+
+				return unless $path =~ /\.p[lm]$/ || $path =~ /\.t$/;
+
+				say "Tidying file: $path" if $verbose;
+
+				push(@args, $path);
+				Perl::Tidy::perltidy(argv => \@args, perltidyrc => "$webwork_root/.perltidyrc");
+				pop(@args);
+			},
+			no_chdir => 1
+		},
+		$webwork_root
+	);
+}
+
+1;
diff --git a/bin/dev_scripts/update-localization-files b/bin/dev_scripts/update-localization-files
index c9507346fe..37c62152ee 100755
--- a/bin/dev_scripts/update-localization-files
+++ b/bin/dev_scripts/update-localization-files
@@ -55,7 +55,8 @@ cd $LOCDIR
 
 echo "Updating $WEBWORK_ROOT/webwork2.pot"
 
-xgettext.pl -o webwork2.pot -D $WEBWORK_ROOT/lib -D $PG_ROOT/lib -D $PG_ROOT/macros $WEBWORK_ROOT/conf/defaults.config $WEBWORK_ROOT/conf/LTIConfigValues.config
+xgettext.pl -o webwork2.pot -D $WEBWORK_ROOT/lib -D $PG_ROOT/lib -D $PG_ROOT/macros -D $WEBWORK_ROOT/templates \
+	$WEBWORK_ROOT/conf/defaults.config $WEBWORK_ROOT/conf/LTIConfigValues.config
 
 if $UPDATE_PO; then
 	find $LOCDIR -name '*.po' -exec bash -c "echo \"Updating {}\"; msgmerge -qUN {} webwork2.pot" \;
diff --git a/bin/dev_scripts/webwork2-morbo b/bin/dev_scripts/webwork2-morbo
new file mode 100755
index 0000000000..f951d94c35
--- /dev/null
+++ b/bin/dev_scripts/webwork2-morbo
@@ -0,0 +1,97 @@
+#!/usr/bin/env perl
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+=encoding utf8
+
+=head1 NAME
+
+webwork2-morbo - Webwork2 Morbo HTTP and WebSocket development server
+
+=head1 SYNOPSIS
+
+    Usage: webwork2-morbo [OPTIONS] [APPLICATION]
+
+        webwork2-morbo
+        webwork2-morbo -m production -l https://*:443 -l http://[::]:3000
+        webwork2-morbo -l 'https://*:443?cert=./server.crt&key=./server.key'
+        webwork2-morbo -w /usr/local/lib -w public -w conf/webwork2.mojolicious.yml
+
+    Options:
+        -b, --backend <name>           Morbo backend to use for reloading, defaults
+                                       to "Poll"
+        -h, --help                     Show this message
+        -l, --listen <location>        One or more locations you want to listen on,
+                                       defaults to the value of MOJO_LISTEN or
+                                       "http://*:3000"
+        -m, --mode <name>              Operating mode for your application,
+                                       defaults to the value of
+                                       MOJO_MODE/PLACK_ENV or "development"
+        -v, --verbose                  Print details about what files changed to
+                                       STDOUT
+        -w, --watch <directory/file>   One or more directories and files to watch
+                                       for changes in addition to the bin/webwork2
+                                       script as well as the webwork2/lib, webwork2/conf,
+                                       webwork2/htdocs/js, pg/lib, and pg/htdocs
+                                       directories.
+
+=head1 DESCRIPTION
+
+Start L<webwork2> with the L<Mojo::Server::Morbo> web server.
+
+=cut
+
+use Mojo::Base -strict;
+use Mojo::Server::Morbo;
+use Mojo::Util qw(extract_usage getopt);
+use Mojo::File qw(curfile);
+use YAML::XS qw(LoadFile);
+
+getopt
+	'b|backend=s' => \$ENV{MOJO_MORBO_BACKEND},
+	'h|help'      => \my $help,
+	'l|listen=s'  => \my @listen,
+	'm|mode=s'    => \$ENV{MOJO_MODE},
+	'v|verbose'   => \my $verbose,
+	'w|watch=s'   => \my @watch;
+
+die extract_usage if $help;
+
+my $webwork_root = curfile->dirname->dirname->dirname->to_string;
+
+# Load the configuration file to obtain the PG root directory.
+my $config_file = "$webwork_root/conf/webwork2.mojolicious.yml";
+$config_file = "$webwork_root/conf/webwork2.mojolicious.dist.yml" unless -e $config_file;
+my $config = LoadFile($config_file);
+
+# Add directories to the watch list that might change frequently while developing for webwork2 and that need the server
+# to be reloaded for those changes to take effect.
+
+# The webwork2 lib directory is not detected for some reason, so it must be added.
+# Note: Don't watch all of the webwork htdocs directory.  If the htdocs/tmp directory is watched, then any time a file
+# is written in htdocs/tmp by a request the server will reload.  This would cause that request to fail.
+# Also watch the webwork/conf directory.
+push(@watch,
+	"$webwork_root/lib",           "$webwork_root/templates", "$webwork_root/htdocs/js",
+	"$webwork_root/htdocs/themes", "$webwork_root/conf");
+
+# Add the pg lib and pg htdocs directory if they are readable.
+push(@watch, "$config->{pg_dir}/lib")    if -r "$config->{pg_dir}/lib";
+push(@watch, "$config->{pg_dir}/htdocs") if -r "$config->{pg_dir}/htdocs";
+
+my $morbo = Mojo::Server::Morbo->new(silent => !$verbose);
+$morbo->daemon->listen(\@listen) if @listen;
+$morbo->backend->watch(\@watch)  if @watch;
+$morbo->run("$webwork_root/bin/webwork2");
diff --git a/bin/download-OPL-metadata-release.pl b/bin/download-OPL-metadata-release.pl
index 227da0f688..fbd10e98bc 100755
--- a/bin/download-OPL-metadata-release.pl
+++ b/bin/download-OPL-metadata-release.pl
@@ -9,31 +9,34 @@
 use File::Fetch;
 use File::Copy;
 use File::Path;
+use Mojo::File;
 use JSON;
 
-my $pg_dir;
-
 BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n"
-		unless exists $ENV{WEBWORK_ROOT};
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
+
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
 
 use lib "$ENV{WEBWORK_ROOT}/lib";
 use lib "$ENV{WEBWORK_ROOT}/bin";
-use lib "$pg_dir/lib";
 
 use WeBWorK::CourseEnvironment;
 use Helper 'runScript';
 
-my $ce = new WeBWorK::CourseEnvironment({ webwork_dir => $ENV{WEBWORK_ROOT} });
+my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT} });
+
+# Make sure the webwork temporary directory exists and is writable before proceeding.
+die "The WeBWorK temporary directory $ce->{webworkDirs}{tmp} does not exist or is not writable."
+	if (!-d $ce->{webworkDirs}{tmp} || !-w $ce->{webworkDirs}{tmp});
 
-my $rawData;
 my $releaseDataFF =
 	File::Fetch->new(uri => 'https://api.github.com/repos/openwebwork/webwork-open-problem-library/releases/latest');
-my $file        = $releaseDataFF->fetch(to => \$rawData) or die $releaseDataFF->error;
-my $releaseData = JSON->new->utf8->decode($rawData);
+my $file        = $releaseDataFF->fetch(to => $ce->{webworkDirs}{tmp}) or die $releaseDataFF->error;
+my $path        = Mojo::File->new($file);
+my $releaseData = JSON->new->utf8->decode($path->slurp);
+$path->remove;
 
 my $releaseTag = $releaseData->{tag_name};
 say "Found OPL METADATA release $releaseTag.";
@@ -45,10 +48,6 @@ BEGIN
 
 die 'Unable to determine download url for OPL metadata release.' if !$downloadURL;
 
-# Make sure the webwork temporary directory exists and is writable before proceeding.
-die "The WeBWorK temporary directory $ce->{webworkDirs}{tmp} does not exist or is not writable."
-	if (!-d $ce->{webworkDirs}{tmp} || !-w $ce->{webworkDirs}{tmp});
-
 # Download and extract the OPL metadata release.
 my $releaseDownloadFF = File::Fetch->new(uri => $downloadURL);
 my $releaseFile       = $releaseDownloadFF->fetch(to => $ce->{webworkDirs}{tmp}) or die $releaseDownloadFF->error;
diff --git a/bin/dump-OPL-tables.pl b/bin/dump-OPL-tables.pl
index a98570cf98..6f5ab8b2f4 100755
--- a/bin/dump-OPL-tables.pl
+++ b/bin/dump-OPL-tables.pl
@@ -1,8 +1,8 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -20,15 +20,15 @@
 
 # Get the necessary packages, including adding webwork to our path.
 
-my $pg_dir;
 BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
+
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
 
 use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$pg_dir/lib";
+
 use WeBWorK::CourseEnvironment;
 
 use String::ShellQuote;
@@ -36,20 +36,17 @@ BEGIN
 
 # get course environment and configured OPL path
 
-my $ce = new WeBWorK::CourseEnvironment({
-	webwork_dir => $ENV{WEBWORK_ROOT},
-	});
+my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT} });
 
 my $configured_OPL_path = $ce->{problemLibrary}{root};
 
-
 # Drop the "OpenProblemLibrary" from the end of the path
 
 $configured_OPL_path =~ s+OpenProblemLibrary++;
 
 # Check that it exists
 
-if ( -d "$configured_OPL_path" ) {
+if (-d "$configured_OPL_path") {
 	print "OPL path seems to be $configured_OPL_path\n";
 } else {
 	print "OPL path seems to be misconfigured as $configured_OPL_path which does not exist.\n";
@@ -59,7 +56,7 @@ BEGIN
 # Set TABLE-DUMP path and make directory if necessary
 
 my $prepared_OPL_tables_dir = "${configured_OPL_path}/TABLE-DUMP";
-if ( ! -d "$prepared_OPL_tables_dir" ) {
+if (!-d "$prepared_OPL_tables_dir") {
 	`mkdir -p $prepared_OPL_tables_dir`;
 }
 
@@ -76,16 +73,16 @@ BEGIN
 my $dbpass = $ce->{database_password};
 
 $dbuser = shell_quote($dbuser);
-$db = shell_quote($db);
+$db     = shell_quote($db);
 
-$ENV{'MYSQL_PWD'}=$dbpass;
+$ENV{'MYSQL_PWD'} = $dbpass;
 
 # decide whether the mysql installation can handle
 # utf8mb4 and that should be used for the OPL
 
-my $ENABLE_UTF8MB4 = $ce->{ENABLE_UTF8MB4}?1:0;
+my $ENABLE_UTF8MB4 = $ce->{ENABLE_UTF8MB4} ? 1 : 0;
 
-my $character_set =  ($ENABLE_UTF8MB4)? "utf8mb4":"utf8";
+my $character_set = ($ENABLE_UTF8MB4) ? "utf8mb4" : "utf8";
 
 # Get mysqldump_command
 
@@ -93,7 +90,8 @@ BEGIN
 
 # The tables to dump are:
 
-my $OPL_tables_to_dump = "OPL_DBsubject OPL_DBchapter OPL_DBsection OPL_author OPL_path OPL_pgfile OPL_keyword OPL_pgfile_keyword OPL_textbook OPL_chapter OPL_section OPL_problem OPL_morelt OPL_pgfile_problem";
+my $OPL_tables_to_dump =
+	"OPL_DBsubject OPL_DBchapter OPL_DBsection OPL_author OPL_path OPL_pgfile OPL_keyword OPL_pgfile_keyword OPL_textbook OPL_chapter OPL_section OPL_problem OPL_morelt OPL_pgfile_problem";
 
 # Tables NOT dumped:
 # OPL_problem_user - is created by bin/update-OPL-statistics and need not be archived
@@ -106,10 +104,10 @@ BEGIN
 # see: https://serverfault.com/questions/912162/mysqldump-throws-unknown-table-column-statistics-in-information-schema-1109
 #      https://github.com/drush-ops/drush/issues/4410
 
-my $column_statistics_off = "";
+my $column_statistics_off      = "";
 my $test_for_column_statistics = `$mysqldump_command --help | grep 'column-statistics'`;
-if ( $test_for_column_statistics ) {
-  $column_statistics_off = " --column-statistics=0 ";
+if ($test_for_column_statistics) {
+	$column_statistics_off = " --column-statistics=0 ";
 }
 
 `$mysqldump_command --host=$host --port=$port --user=$dbuser --default-character-set=$character_set $column_statistics_off $db $OPL_tables_to_dump  > $prepared_OPL_tables_file`;
diff --git a/bin/dump_past_answers b/bin/dump_past_answers
index ac23ad3662..d41394bc1d 100755
--- a/bin/dump_past_answers
+++ b/bin/dump_past_answers
@@ -1,8 +1,8 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -60,27 +60,16 @@
 
 use strict;
 
-my $pg_dir;
-
 BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
+
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
 
 use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$pg_dir/lib";
-use WeBWorK::CourseEnvironment;
-
-BEGIN {
-	my $ce = new WeBWorK::CourseEnvironment({
-		webwork_dir => $ENV{WEBWORK_ROOT},
-	});
 
-	my $pg_dir = $ce->{pg_dir};
-	eval "use lib '$pg_dir/lib'";
-	die $@ if $@;
-}
+use WeBWorK::CourseEnvironment;
 
 use WeBWorK::DB;
 use WeBWorK::Utils::CourseIntegrityCheck;
@@ -88,7 +77,6 @@ use WeBWorK::Utils::CourseManagement qw/listCourses/;
 use WeBWorK::Utils::Tags;
 use WeBWorK::PG;
 
-use mod_perl2;
 use Text::CSV;
 use Digest::SHA qw(sha256_hex);
 use Net::Domain;
@@ -111,21 +99,22 @@ my $SALTFILE;
 my $saltfilename = $ENV{WEBWORK_ROOT} . '/.dump_past_answers_salt';
 
 if (-e $saltfilename) {
-	open($SALTFILE, "<$saltfilename") || die("Couldn't open salt file.");
+	open($SALTFILE, '<', $saltfilename) || die("Couldn't open salt file.");
 	$salt = <$SALTFILE>;
+	close $SALTFILE;
 } else {
 	$salt = '';
 	for (my $i = 0; $i < 32; $i++) {
 		$salt .= ('.', '/', '0' .. '9', 'A' .. 'Z', 'a' .. 'z')[ rand 64 ];
 	}
 
-	open($SALTFILE, ">$saltfilename") || die("Couldn't open salt file.");
+	open($SALTFILE, '>', $saltfilename) || die("Couldn't open salt file.");
 	print $SALTFILE $salt;
 	close $SALTFILE;
 }
 
 my $OUT;
-open($OUT, ">$output_file") || die("Couldn't open file $output_file");
+open($OUT, '>', $output_file) || die("Couldn't open file $output_file");
 
 print "Dumping answer data to $output_file\n";
 
@@ -136,7 +125,7 @@ my $csv               = new Text::CSV->new({ binary => 1 })
 	or die "Cannot use CSV: " . Text::CSV->error_diag();
 $csv->eol("\n");
 
-my $ce = new WeBWorK::CourseEnvironment({
+my $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
 });
 
@@ -150,7 +139,7 @@ my @row;
 foreach my $courseID (@courses) {
 	next if $courseID eq 'admin' || $courseID eq 'modelCourse';
 
-	$ce = new WeBWorK::CourseEnvironment({
+	$ce = WeBWorK::CourseEnvironment->new({
 		webwork_dir => $ENV{WEBWORK_ROOT},
 		courseName  => $courseID,
 	});
diff --git a/bin/generate-OPL-set-def-lists.pl b/bin/generate-OPL-set-def-lists.pl
index 685753463e..dbfaac2b4b 100755
--- a/bin/generate-OPL-set-def-lists.pl
+++ b/bin/generate-OPL-set-def-lists.pl
@@ -8,11 +8,6 @@ =head1 SYNOPSIS
 
 generate-OPL-set-def-list
 
-The environment variable $WEBWORK_ROOT must be set with the location of
-webwork2, and either the environment variable $PG_ROOT must be set with the
-location of pg, or pg must be located in the parent directory of the webwork2
-location.
-
 =head1 DESCRIPTION
 
 This script will find all set definition files in the OpenProblemLibrary and
@@ -20,35 +15,33 @@ =head1 DESCRIPTION
 files $WEBWORK_ROOT/htdocs/DATA/library-set-defs.json and
 $WEBWORK_ROOT/htdocs/DATA/contrib-set-defs.json.
 
+Note that the webwork2 root directory is automatically detected.
+
 =cut
 
 use strict;
 use warnings;
 
-use Pod::Usage;
 use File::Find;
 
-my $pg_root;
-
 BEGIN {
-	pod2usage(2) unless exists $ENV{WEBWORK_ROOT};
-	$pg_root = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	pod2usage(2) unless (-e $pg_root);
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
+
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
 
 use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$pg_root/lib";
 use lib "$ENV{WEBWORK_ROOT}/bin";
 
 use OPLUtils qw/writeJSONtoFile/;
 use WeBWorK::CourseEnvironment;
 
-my $ce = new WeBWorK::CourseEnvironment({ webwork_dir => $ENV{WEBWORK_ROOT} });
+my $ce          = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT} });
 my $libraryRoot = $ce->{problemLibrary}{root};
 my $contribRoot = $ce->{contribLibrary}{root};
 
 print "Using WeBWorK root: $ENV{WEBWORK_ROOT}\n";
-print "Using PG root: $pg_root\n";
 print "Using library root: $libraryRoot\n";
 print "Using contrib root: $contribRoot\n";
 
diff --git a/bin/importClassList.pl b/bin/importClassList.pl
index 9a48776c80..a428e34f59 100755
--- a/bin/importClassList.pl
+++ b/bin/importClassList.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,22 +14,16 @@
 # Artistic License for more details.
 ################################################################################
 
-my $webwork_dir;
-my $pg_dir;
-
 BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n"
-	  unless exists $ENV{WEBWORK_ROOT};
-	$webwork_dir = $ENV{WEBWORK_ROOT};
-	print "importClassList.pl:  WeBWorK root directory set to $webwork_dir\n";
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
 
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
 
 # link to WeBWorK and pg code libraries
-use lib "$webwork_dir/lib";
-use lib "$pg_dir/lib";
+use lib "$ENV{WEBWORK_ROOT}/lib";
+
 use WeBWorK::CourseEnvironment;
 
 use WeBWorK::DB qw(check_user_id);
@@ -41,26 +35,26 @@ BEGIN
 use strict;
 use warnings;
 
-if((scalar(@ARGV) != 2)) {
-  print "\nSyntax is: importClassList.pl course_id path_to_classlist_file.lst\n\n";
-  exit();
+if ((scalar(@ARGV) != 2)) {
+	print "\nSyntax is: importClassList.pl course_id path_to_classlist_file.lst\n\n";
+	exit();
 }
 
 my $courseID = shift;
 
 my $fileName = shift;
-die "Not able to read from file $fileName : does it exist? is it readable?" unless ( -r "$fileName" );
+die "Not able to read from file $fileName : does it exist? is it readable?" unless (-r "$fileName");
 
 my $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
-	courseName => $courseID
+	courseName  => $courseID
 });
 
 my $db = new WeBWorK::DB($ce->{dbLayout});
 
-my $createNew = 1;            # Always set to true, so add new users
-my $replaceExisting = "none"; # Always set to "none" so no existing accounts are changed
-my @replaceList =();          # Empty list
+my $createNew       = 1;         # Always set to true, so add new users
+my $replaceExisting = "none";    # Always set to "none" so no existing accounts are changed
+my @replaceList     = ();        # Empty list
 my (@replaced, @added, @skipped);
 
 # This was copied with MINOR changes from lib/WeBWorK/ContentGenerator/Instructor/UserList.pm
@@ -92,12 +86,12 @@ sub importUsersFromCSV {
 	my $default_status_abbrev = $ce->{statuses}->{Enrolled}->{abbrevs}->[0];
 
 	foreach my $record (@classlist) {
-		my %record = %$record;
+		my %record  = %$record;
 		my $user_id = $record{user_id};
 
 		print "Saw user_id = $user_id\n";
 
-		unless (WeBWorK::DB::check_user_id($user_id) ) {  # try to catch lines with bad characters
+		unless (WeBWorK::DB::check_user_id($user_id)) {    # try to catch lines with bad characters
 			push @skipped, $user_id;
 			next;
 		}
@@ -131,9 +125,9 @@ sub importUsersFromCSV {
 		$record{permission} = $default_permission_level
 			unless defined $record{permission} and $record{permission} ne "";
 
-		my $User = $db->newUser(%record);
+		my $User            = $db->newUser(%record);
 		my $PermissionLevel = $db->newPermissionLevel(user_id => $user_id, permission => $record{permission});
-		my $Password = $db->newPassword(user_id => $user_id, password => $record{password});
+		my $Password        = $db->newPassword(user_id => $user_id, password => $record{password});
 
 		# DBFIXME use REPLACE
 		if (exists $allUserIDs{$user_id}) {
@@ -149,10 +143,9 @@ sub importUsersFromCSV {
 		}
 	}
 
-
-	print( "Added:\n\t",    join("\n\t", @added),    "\n\n" );
-	print( "Skipped:\n\t",  join("\n\t", @skipped),  "\n\n" );
-	print( "Replaced:\n\t", join("\n\t", @replaced), "\n\n" );
+	print("Added:\n\t",    join("\n\t", @added),    "\n\n");
+	print("Skipped:\n\t",  join("\n\t", @skipped),  "\n\n");
+	print("Replaced:\n\t", join("\n\t", @replaced), "\n\n");
 
 }
 
diff --git a/bin/integrity_check.pl b/bin/integrity_check.pl
deleted file mode 100644
index b61f201527..0000000000
--- a/bin/integrity_check.pl
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env perl
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-use strict;
-use warnings;
-use Getopt::Std;
-use Data::Dumper;
-
-my $pg_dir;
-BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
-}
-
-use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$pg_dir/lib";
-use WeBWorK::CourseEnvironment;
-use WeBWorK::Utils::CourseIntegrityCheck;
-use WeBWorK;
-
-our ($opt_v);
-getopts("v");
-
-if ($opt_v) {
-	$WeBWorK::Debug::Enabled = 1;
-} else {
-	$WeBWorK::Debug::Enabled = 0;
-}
-
-
-my $courseName = "tmp_course";
-
-my $ce = new WeBWorK::CourseEnvironment(
-               {webwork_dir=>$ENV{WEBWORK_ROOT},
-                courseName=> $courseName
-               });
-
-
-print "ce ready $ce";
-
-my $CIchecker = new WeBWorK::Utils::CourseIntegrityCheck($ce);
-
-my $return = $CIchecker->checkCourseDirectories();
-
-print "result $return";
-1;
\ No newline at end of file
diff --git a/bin/load-OPL-global-statistics.pl b/bin/load-OPL-global-statistics.pl
index cb8692c0eb..8a6e1a6616 100755
--- a/bin/load-OPL-global-statistics.pl
+++ b/bin/load-OPL-global-statistics.pl
@@ -1,8 +1,8 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -15,20 +15,18 @@
 # Artistic License for more details.
 ################################################################################
 
-# This script loads the OPL global statistics, which is often done by bin/update-OPL-statistics but may need to be done outside of that setting.
+# This script loads the OPL global statistics, which is often done by bin/update-OPL-statistics but may need to be done
+# outside of that setting.
 use strict;
 
-# Get the necessary packages, including adding webwork to our path.
-
-my $pg_dir;
 BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
+
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
 
 use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$pg_dir/lib";
 
 use WeBWorK::CourseEnvironment;
 
@@ -37,46 +35,46 @@ BEGIN
 
 # get course environment and configured OPL path
 
-my $ce = new WeBWorK::CourseEnvironment({
+my $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
-	});
+});
 
 my $dbh = DBI->connect(
-        $ce->{problemLibrary_db}->{dbsource},
-        $ce->{problemLibrary_db}->{user},
-        $ce->{problemLibrary_db}->{passwd},
-        {
+	$ce->{problemLibrary_db}->{dbsource},
+	$ce->{problemLibrary_db}->{user},
+	$ce->{problemLibrary_db}->{passwd},
+	{
 		AutoCommit => 0,
-                PrintError => 0,
-                RaiseError => 1,
-        },
+		PrintError => 0,
+		RaiseError => 1,
+	},
 );
 
 # check to see if the global statistics file exists and if it does, upload it.
 
-my $global_sql_file = $ce->{problemLibrary}{root}.'/OPL_global_statistics.sql';
+my $global_sql_file = $ce->{problemLibrary}{root} . '/OPL_global_statistics.sql';
 
 if (-e $global_sql_file) {
 
-  my $db     = $ce->{database_name};
-  my $host   = $ce->{database_host};
-  my $port   = $ce->{database_port};
-  my $dbuser = $ce->{database_username};
-  my $dbpass = $ce->{database_password};
+	my $db     = $ce->{database_name};
+	my $host   = $ce->{database_host};
+	my $port   = $ce->{database_port};
+	my $dbuser = $ce->{database_username};
+	my $dbpass = $ce->{database_password};
 
-  $dbh->do(<<EOS);
+	$dbh->do(<<EOS);
 DROP TABLE IF EXISTS OPL_global_statistics;
 EOS
-  $dbh->commit();
+	$dbh->commit();
 
-  $dbuser = shell_quote($dbuser);
-  $db = shell_quote($db);
+	$dbuser = shell_quote($dbuser);
+	$db     = shell_quote($db);
 
-  $ENV{'MYSQL_PWD'}=$dbpass;
+	$ENV{'MYSQL_PWD'} = $dbpass;
 
-  my $mysql_command = $ce->{externalPrograms}->{mysql};
+	my $mysql_command = $ce->{externalPrograms}->{mysql};
 
-  `$mysql_command --host=$host --port=$port --user=$dbuser $db < $global_sql_file`;
+	`$mysql_command --host=$host --port=$port --user=$dbuser $db < $global_sql_file`;
 
 }
 
diff --git a/bin/newpassword b/bin/newpassword
index 915f93ff4d..290fac18d1 100755
--- a/bin/newpassword
+++ b/bin/newpassword
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -46,23 +46,18 @@ The new password.
 
 =cut
 
-BEGIN {
-	# hide arguments (there could be passwords there!)
-	$0 = "$0";
-}
-
 use strict;
 use warnings;
 
-my $pg_dir;
 BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
+
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
 
 use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$pg_dir/lib";
+
 use WeBWorK::CourseEnvironment;
 use WeBWorK::DB;
 use WeBWorK::Utils qw(runtime_use readFile cryptPassword);
diff --git a/bin/old_scripts/timing b/bin/old_scripts/timing
index 4b5a20ec29..1f9ca6fdb1 100755
--- a/bin/old_scripts/timing
+++ b/bin/old_scripts/timing
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
diff --git a/bin/old_scripts/ww-update-config b/bin/old_scripts/ww-update-config
index d1d82f9646..9bb414417c 100755
--- a/bin/old_scripts/ww-update-config
+++ b/bin/old_scripts/ww-update-config
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
@@ -7,7 +7,7 @@ my $cvs_header_line = '\$' . 'CVSHeader';
 
 foreach my $arg (@ARGV) {
 	my ($conf_file, $dist_file);
-	
+
 	if ($arg =~ /^(.*)\.dist$/) {
 		$conf_file = $1;
 		$dist_file = $arg;
@@ -15,17 +15,17 @@ foreach my $arg (@ARGV) {
 		$conf_file = $arg;
 		$dist_file = "$arg.dist";
 	}
-	
+
 	my $conf_version = cvs_version($conf_file)
 		or die "couldn't find CVS version in $conf_file\n";
 	my $dist_version = cvs_version($dist_file)
 		or die "couldn't find CVS version in $dist_file\n";
-	
+
 	if ($conf_version eq $dist_version) {
 		print "$conf_file is up-to-date at version $conf_version.\n";
 		next;
 	}
-	
+
 	#print "conf_version=$conf_version dist_version=$dist_version\n";
 	system "cvs diff -r '$conf_version' -r '$dist_version' '$dist_file'"
 		. "| patch '$conf_file'";
diff --git a/bin/old_scripts/wwaddindexing b/bin/old_scripts/wwaddindexing
index 77972fe613..1ac7fda6a7 100755
--- a/bin/old_scripts/wwaddindexing
+++ b/bin/old_scripts/wwaddindexing
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
diff --git a/bin/old_scripts/wwdb_addgw b/bin/old_scripts/wwdb_addgw
index e123b75985..915cb9f75e 100755
--- a/bin/old_scripts/wwdb_addgw
+++ b/bin/old_scripts/wwdb_addgw
@@ -1,7 +1,7 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl -w
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -13,7 +13,7 @@
 # FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
 # Artistic License for more details.
 ################################################################################
-# 
+#
 # wwdb_addgw
 #   update webwork database tables to add fields for the gateway module
 #
@@ -29,15 +29,15 @@ wwdb_addgw - convert SQL databases for WeBWorK 2 to add gateway fields.
 
 =head1 DESCRIPTION
 
-Adds fields to the set and set_user tables in the WeBWorK mysql databases 
-that are required for the gateway module.  The script prompts for which 
-courses to modify.  Adding gateway database fields to existing courses 
+Adds fields to the set and set_user tables in the WeBWorK mysql databases
+that are required for the gateway module.  The script prompts for which
+courses to modify.  Adding gateway database fields to existing courses
 should have no effect on those courses, even if they are running under a
 non-gateway aware version of the WeBWorK system.
 
 If C<-h> is provided, the script hides the mysql admin password.
 
-C<sql> or C<sql_single> gives the default WeBWorK database format.  If 
+C<sql> or C<sql_single> gives the default WeBWorK database format.  If
 omitted, the script assumes sql_single and prompts to be sure.
 
 =cut
@@ -86,7 +86,7 @@ my ( $admin, $adminpw );
 
 # connect to database, if we're in sql_single mode; this lets us easily
 # get a list of courses to work with.  in sql mode, it's harder b/c I can't
-# get DBI->data_sources('mysql') to work on my system, so we prompt for 
+# get DBI->data_sources('mysql') to work on my system, so we prompt for
 # those separately.  if we're in sql single mode, $dbh is a place holder,
 # because we have to do the database connects in the subroutines to connect
 # to each different database
@@ -102,7 +102,7 @@ my @courses = getCourses( $dbtype, $dbh );
 # now $course{coursename} = format (sql or sql_single)
 
 # do update
-my ( $doneRef, $skipRef ) = updateCourses( $dbtype, $dbh, \@courses, 
+my ( $doneRef, $skipRef ) = updateCourses( $dbtype, $dbh, \@courses,
 					   $admin, $adminpw );
 $dbh->disconnect() if ( $dbh );
 
@@ -113,10 +113,10 @@ confirmUpdate( $dbtype, $doneRef, $skipRef );
 #-------------------------------------------------------------------------------
 # subroutines
 
-sub printHdr { 
+sub printHdr {
     print <<eoh;
 ---------------------------------------------------------------------------
-wwdb_addgw: update WeBWorK SQL databases to include fields required for a 
+wwdb_addgw: update WeBWorK SQL databases to include fields required for a
             Gateway aware WeBWorK installation.
 
 set default WeBWorK database type to $dbtype.
@@ -201,7 +201,7 @@ sub getCourses {
 	%nummap = orderedList( %courses );
 	print "Current list of courses to update:\n";
 	printclist( sort keys( %courses ) );
-	print "Enter #, d# or [cr] > ";  
+	print "Enter #, d# or [cr] > ";
         chomp( $resp = <STDIN> );
     }
 
@@ -266,7 +266,7 @@ sub updateCourses {
 	    $dbh = DBI->connect("$source:webwork_$crs", $admin, $adminpw) or
 		die( $DBI::errstr );
 
-    # now get a list of columns from the set table to check to see if 
+    # now get a list of columns from the set table to check to see if
     # we need an update
 	    my $cmd = "show columns from set_not_a_keyword";
 	    my $st = $dbh->prepare( $cmd ) or die( $dbh->errstr() );
@@ -308,14 +308,14 @@ sub updateCourses {
 
 	    foreach my $f ( keys %addFields ) {
 	    print "$cmd1 $f $addFields{$f}\n";
-		my $st = $dbh->prepare( "$cmd1 $f $addFields{$f}" ) or 
+		my $st = $dbh->prepare( "$cmd1 $f $addFields{$f}" ) or
                     die( $dbh->errstr() );
 		$st->execute() or die( $st->errstr() );
 	    }
 
 	    foreach my $f ( keys %addFields ) {
 	    print "$cmd2 $f $addFields{$f}\n";
-		my $st = $dbh->prepare( "$cmd2 $f $addFields{$f}" ) or 
+		my $st = $dbh->prepare( "$cmd2 $f $addFields{$f}" ) or
 		    die( $dbh->errstr() );
 		$st->execute() or die( $st->errstr() );
 	    }
@@ -347,9 +347,9 @@ sub confirmUpdate {
 
     my $crsList= (@$doneRef) ? join(', ', @$doneRef) : '';
     my $skpList= (@$skipRef) ? join(', ', @$skipRef) : '';
-    my $crsString = ( $crsList ) ? 
+    my $crsString = ( $crsList ) ?
 	$s1 . hangIndent( $l1, 75, $l1, "$crsList.") . "\n" : '';
-    my $skpString = ( $skpList ) ? 
+    my $skpString = ( $skpList ) ?
 	$s2 . hangIndent( $l1, 75, $l2, "$skpList." ) : '';
 
     print <<eot;
diff --git a/bin/old_scripts/wwdb_check b/bin/old_scripts/wwdb_check
index 8f4408605f..48dd1df8a2 100755
--- a/bin/old_scripts/wwdb_check
+++ b/bin/old_scripts/wwdb_check
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
diff --git a/bin/old_scripts/wwdb_init b/bin/old_scripts/wwdb_init
index b13e59a3d2..1966046fe4 100755
--- a/bin/old_scripts/wwdb_init
+++ b/bin/old_scripts/wwdb_init
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
diff --git a/bin/old_scripts/wwdb_upgrade b/bin/old_scripts/wwdb_upgrade
index c25d4eaec2..66a9b62780 100755
--- a/bin/old_scripts/wwdb_upgrade
+++ b/bin/old_scripts/wwdb_upgrade
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
diff --git a/bin/pg-append-textbook-tags b/bin/pg-append-textbook-tags
deleted file mode 100755
index 40f2a38d72..0000000000
--- a/bin/pg-append-textbook-tags
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/usr/bin/env perl
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-#
-# Contributed by W.H. Freeman; Bedford, Freeman, and Worth Publishing Group.
-################################################################################
-
-use strict;
-use warnings;
-
-use IO::File;
-use Data::Dumper;# $Data::Dumper::Indent = 0;
-use Getopt::Long;
-
-my $pg_dir;
-BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
-}
-
-use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$pg_dir/lib";
-use WeBWorK::NPL qw/read_tags format_tags/;
-
-sub main {
-	my ($new_tags, @files) = @_;
-	$new_tags = { textbooks=>[$new_tags] };
-	foreach my $file (@files) {
-		add_tags_to_file($new_tags, $file);
-	}
-}
-
-sub add_tags_to_file {
-	my ($new_tags, $file) = @_;
-
-	my $pgfile = new IO::File($file, '+<encoding("UTF-8")') or do {
-		warn "Failed to open file $file for editing: $!\n";
-		warn "New tags will not be written to this file.\n";
-		return;
-	};
-
-	my $old_tags = {};
-	read_tags($pgfile, $old_tags, 1); # 1==extra_editing_info
-	my $pos = $old_tags->{_pos};
-	my $rest = $old_tags->{_rest};
-	my $maxtextbook = $old_tags->{_maxtextbook};
-	print "pos=$pos maxtextbook=$maxtextbook\n";
-
-	my @tagstrings = format_tags($new_tags, $maxtextbook+1);
-
-	seek $pgfile, $pos, 0;
-	foreach my $string (@tagstrings) {
-		$string =~ s/^/## /gm;
-		print $pgfile "$string\n";
-	}
-	print $pgfile $rest;
-}
-
-my %o;
-GetOptions(\%o,
-	"title=s",
-	"edition=s",
-	"author=s",
-	"chapter=s",
-	"section=s",
-	"problem=s",
-);
-main(\%o, @ARGV);
-
-__END__
-
-=head1 NAME
-
-pg-append-text-tags -- Add textbook tags to a PG file.
-
-=head1 SYNOPSIS
-
-	pg-append-text-tags file1.pg file2.pg --author=Rogawski \
-	--title='Calculus: Early Transcendentals' --edition=1 \
-	--chapter=3 --section=1 --problem=11,13
-
-=head1 DESCRIPTION
-
-This script appends metadata tags for a new textbook to one or more PG files.
-Tags are given as switches on the command line:
-
-	--title=STRING
-	--edition=STRING
-	--author=STRING
-	--chapter=STRING
-	--section=STRING
-	--problem=STRING
-
-More than one problem can be specified for B<--problem> by passing a
-comma-separated list.
-
-=head1 LIMITATIONS
-
-Only adds tags for a new textbook, can't rewrite existing tags, can't remove
-tags.
-
-At some point I will write Tie::PGFile, which will allow direct editing of tags
-just by modifying a hash, and that will fix all of these problems. :)
-
-=cut
diff --git a/bin/pg-find-tags b/bin/pg-find-tags
deleted file mode 100755
index beebb8a73a..0000000000
--- a/bin/pg-find-tags
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/usr/bin/env perl
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-#
-# Contributed by W.H. Freeman; Bedford, Freeman, and Worth Publishing Group.
-################################################################################
-
-use strict;
-use warnings;
-
-use Data::Dumper;# $Data::Dumper::Indent = 0;
-use File::Find;
-use Getopt::Long;
-use IO::Handle;
-
-my $pg_dir;
-BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
-}
-
-use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$pg_dir/lib";
-use WeBWorK::NPL qw/gen_find_tags/;
-
-sub main {
-	my ($pattern, @paths) = @_;
-	my $oldfh = select(STDERR); $|=1; select(STDOUT); $|=1; select($oldfh);
-	my $wanted = gen_find_tags($pattern, \&report);
-	find({ wanted=>$wanted, no_chdir=>1, }, @paths);
-}
-
-sub report {
-	my ($name, $tags) = @_;
-	print "$name\n";
-}
-
-my %o;
-GetOptions(\%o,
-	"DESCRIPTION=s",
-	"KEYWORDS=s",
-	"DBsubject=s",
-	"DBchapter=s",
-	"DBsection=s",
-	"Date=s",
-	"Institution=s",
-	"Author=s",
-	"title=s",
-	"edition=s",
-	"author=s",
-	"chapter=s",
-	"section=s",
-	"problem=s",
-);
-main(\%o, @ARGV);
-
-__END__
-
-=head1 NAME
-
-pg-find-tags - Search for PG files that contain the specified metadata tags.
-
-=head1 SYNOPSIS
-
-	pg-find-tags ~/MyLibrary /ww/OtherLibrary --author=Rogawski --edition=1
-
-=head1 DESCRIPTION
-
-Recusively searches the paths given for PG files containing all of the specified
-tags. Output is the path to each matching file. Legal tags are as follows:
-
-B<Global fields:>
-
-	--DESCRIPTION=STRING
-	--KEYWORDS=STRING
-	--DBsubject=STRING
-	--DBchapter=STRING
-	--DBsection=STRING
-	--Date=STRING
-	--Institution=STRING
-	--Author=STRING
-
-B<Text-specific fields:>
-
-	--title=STRING
-	--edition=STRING
-	--author=STRING
-	--chapter=STRING
-	--section=STRING
-	--problem=STRING
-
-If multiple text-specific fields are given, then all must match for a single
-textbook.
-
-=head1 LIMITATIONS
-
-Doesn't support full boolean searches, and it probably should. Can only match on
-full strings, so you can't match on a single keyword, for example.
-
-=cut
diff --git a/bin/pg-pull b/bin/pg-pull
deleted file mode 100755
index 67ecad01dd..0000000000
--- a/bin/pg-pull
+++ /dev/null
@@ -1,286 +0,0 @@
-#!/usr/bin/env perl
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-#
-# Contributed by W.H. Freeman; Bedford, Freeman, and Worth Publishing Group.
-################################################################################
-
-# Assemble a new problem library consisting of the specified PG files and any required
-# auxiliary files (i.e. images).
-#
-# Auxiliary files must be specified in the (unofficial) UsesAuxiliaryFiles(...) tag.
-# It is assumed that auxiliary files don't depend on further auxiliary files.
-# This will be true <100% of the time.
-#
-# Also, right now this script always uses the FIRST textbook entry in generating
-# the new file's path and name. Eventually, a --match-text switch will make the
-# script useful for files with multiple text tags.
-
-use strict;
-use warnings;
-
-use Data::Dumper;
-use File::Path;
-use File::Spec;
-use File::Copy;
-use Getopt::Long;
-use IO::File;
-
-my $pg_dir;
-BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
-}
-
-use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$pg_dir/lib";
-use WeBWorK::NPL qw/read_textbooks read_tags/;
-
-my %o;
-my %textbooks;
-my %seen_paths;
-
-sub main {
-	my (@files) = @_;
-	my $oldfh = select(STDERR); $|=1; select(STDOUT); $|=1; select($oldfh);
-
-	if (defined $o{help}) {
-		print usage();
-		exit;
-	}
-
-	my $dest_lib = $o{'dest-lib'};
-	# using the last argument as dest-lib is too confusing
-	#$dest_lib = pop @files unless defined $dest_lib;
-	die "dest-lib not specified.\n" . usage() unless defined $dest_lib;
-
-	die "no files specified (perhaps you meant to use --stdin?)\n" . usage()
-		unless @files or $o{stdin};
-
-	if ($o{'orig-paths'} and not defined $o{'src-lib'}) {
-		die "--src-lib must be specified with --orig-paths.\n", usage();
-	}
-
-	if (defined $o{'src-lib'} and not $o{'orig-paths'}) {
-		warn "ignoring --src-lib since --orig-paths was not specified.\n";
-	}
-
-	if ($o{'orig-paths'}) {
-		if (defined $o{textbooks}) {
-			warn "ignoring --textbooks since --orig-paths was specified.\n";
-		}
-	} else {
-		if (defined $o{textbooks}) {
-			get_texts($o{textbooks});
-		} else {
-			warn "No Textbooks file specified -- directories will not be named.\n";
-		}
-	}
-
-	my $getfile;
-	if ($o{stdin}) {
-		$getfile = sub { if (defined ($_=<STDIN>)) { chomp; $_ } else { () } };
-	} else {
-		my $i = 0;
-		$getfile = sub { defined $files[$i] ? $files[$i++] : () };
-	}
-
-	while (defined (my $file = &$getfile)) {
-		#print "file=$file\n";
-		process_file($file);
-	}
-}
-
-sub get_texts {
-	my $textbooks = shift;
-	my @textbooks;
-
-	open my $fh, '<', $textbooks or die "$textbooks: $!\n";
-	read_textbooks($fh, \@textbooks);
-	close $fh;
-
-	foreach my $textbook (@textbooks) {
-		$textbooks{$textbook->{'_author'}}{$textbook->{'_title'}}{$textbook->{'_edition'}} = $textbook;
-	}
-}
-
-sub process_file {
-	my $file = shift;
-
-	# ignoring volume here because we don't care about w32
-	(undef, my ($dir, $name)) = File::Spec->splitpath($file);
-	#print "  dir=$dir\n";
-	#print "  name=$name\n";
-
-	my %tags;
-	read_tags($file, \%tags);
-	#print Dumper(\%tags);
-
-	my ($target_dir_rel, $target_name);
-	if ($o{'orig-paths'}) {
-		$target_dir_rel = File::Spec->abs2rel($dir, $o{'src-lib'});
-		$target_name = $name;
-	} else {
-		($target_dir_rel, $target_name) = tags_to_path(\%tags, '.pg', $file);
-	}
-
-	if ($o{'check-names'} and $name ne $target_name) {
-		warn "$file: name will be changed to $target_name\n";
-	}
-
-	my $target_dir = File::Spec->catdir($o{'dest-lib'}, $target_dir_rel);
-
-	my @files = ($target_name);
-	push @files, @{$tags{UsesAuxiliaryFiles}} if defined $tags{UsesAuxiliaryFiles};
-
-	#print "mkpath $target_dir\n" if $o{pretend} or $o{verbose};
-	mkpath($target_dir) unless $o{pretend};
-
-	foreach my $curr (@files) {
-		my $src = File::Spec->catpath(undef, $dir, $curr);
-		my $dest = File::Spec->catpath(undef, $target_dir, $curr);
-		print "copy $src $dest\n" if $o{pretend} or $o{verbose};
-		copy($src, $dest) unless $o{pretend};
-	}
-}
-
-sub tags_to_path {
-	my ($tags, $ext, $file) = @_;
-
-	# FIXME here is where we'd put in textbook matching
-	my $text = $tags->{textbooks}[0];
-	unless (defined $text) {
-		warn "$file: no textbook tags\n";
-		return;
-	}
-	my %text = %$text;
-
-	if (not defined $text{author}
-			or not defined $text{title}
-			or not defined $text{edition}
-			or not defined $text{chapter}
-			or not defined $text{section}
-			or not defined $text{problem}
-			or @{$text{problem}} == 0) {
-		warn "$file: incomplete textbook tags\n";
-		return;
-	}
-
-	my $chapter_name = $text{chapter};
-	my $chapsec_name = "$text{chapter}.$text{section}";
-
-	if (defined $o{textbooks}) {
-		my $text_names = $textbooks{$text{author}}{$text{title}}{$text{edition}};
-		if (defined $text_names) {
-			my %text_names = %$text_names;
-
-			if (defined $text_names{$text{chapter}}) {
-				$chapter_name .= sissy_filename(" $text_names{$text{chapter}}")
-			} else {
-				warn "$file: no chapter name for $text{chapter}";
-			}
-
-			if (defined $text_names{"$text{chapter}.$text{section}"}) {
-				$chapsec_name .= sissy_filename(" $text_names{qq|$text{chapter}.$text{section}|}");
-			} else {
-				warn "$file: no section name for $text{chapter}.$text{section}";
-			}
-		} else {
-			warn "$file: can't find text $text{author}/$text{title}/$text{edition} in Textbooks file -- directories will be unnamed\n";
-		}
-	}
-
-	my $ex_name = "$text{chapter}.$text{section}.$text{problem}[0]";
-	$ex_name .= '+' if @{$text{problem}} > 1;
-
-	#print "  chapter_name=$chapter_name\n";
-	#print "  chapsec_name=$chapsec_name\n";
-	#print "  ex_name=$ex_name\n";
-
-	# make sure path hasn't been seen before
-	my $dir = File::Spec->catdir($chapter_name, $chapsec_name);
-	my $partA = $ex_name;
-	$partA .= $o{suffix} if defined $o{suffix};
-	my $partB = $ext;
-	my $uniq = unique_name($dir, $partA, $partB);
-
-	#print "  partA=$partA\n";
-	#print "  uniq=$uniq\n";
-	#print "  partB=$partB\n";
-
-	return $dir, "$partA$uniq$partB";
-}
-
-sub unique_name {
-	my ($dir, $partA, $partB) = @_;
-	my $whole = File::Spec->catpath(undef, $dir, "$partA$partB");
-	my $uniq = '';
-	if (exists $seen_paths{$whole}) {
-		my $i = 2;
-		do {
-			$uniq = "~$i";
-			$whole = File::Spec->catpath(undef, $dir, "$partA$uniq$partB");
-		} while (exists $seen_paths{$whole});
-	}
-	$seen_paths{$whole} = ();
-	return $uniq;
-}
-
-#sub find_macro_file {
-#	my ($name, $ref_by) = @_;
-#	my (undef,$ref_by_dir,undef) = File::Spec->splitpath($ref_by);
-#	my $ref_by_dir_rel = File::Spec->abs2rel($ref_by_dir, $o{'src-lib'});
-#	my @dirs = File::Spec->splitdir($ref_by_dir_rel);
-#	while (1) {
-#		my $dir = File::Spec->catdir(@dirs);
-#		my $file = File::Spec->catfile(${'src-lib'}, $dir, $name);
-#		return $file if -f $file;
-#		pop @dirs;
-#	}
-#}
-
-sub sissy_filename {
-	my $string = shift;
-	$string =~ s/:/-/g;
-	$string =~ s/[<>\"\/\/|?*]/_/g;
-	$string =~ s/\s+/_/g;
-	return $string;
-}
-
-sub usage {
-	return "USAGE:\n"
-		. "$0 [OPTIONS] --dest-lib=PATH [--textbooks=PATH] [--suffix=STRING] files...\n"
-		. "$0 [OPTIONS] --dest-lib=PATH --orig-paths --src-lib=PATH files...\n"
-		. "Options:\n"
-		. "\t--stdin\n"
-		. "\t--pretend\n"
-		. "\t--verbose\n"
-		. "\t--check-names\n"
-		;
-}
-
-GetOptions(\%o,
-	'textbooks=s',
-	'dest-lib=s',
-	'orig-paths',
-	'src-lib=s',
-	'stdin',
-	'suffix=s',
-	'pretend',
-	'verbose',
-	'check-names',
-	'help',
-);
-main(@ARGV);
diff --git a/bin/readURClassList.pl b/bin/readURClassList.pl
deleted file mode 100755
index 565b321a1a..0000000000
--- a/bin/readURClassList.pl
+++ /dev/null
@@ -1,249 +0,0 @@
-#!/usr/bin/env perl
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-## readURClassList
-##
-## This is a specific routine for reading class lists which come from the registrar's
-## office at the Univ of Rochester and producing a classlist file usable by WeBWorK
-
-## It can be used as a sample script for creating similar scripts for othert schools.
-
-## IT IS ASSUMED THAT THE REGISTRAR'S LIST IS DELIMITED WITH SEMICOLONS (;)
-
-## Takes three parameters.
-
-## First, the full file name of the Registrar's class list file with the header
-##	material stripped off.  The format for this file is
-## 46246;26661017;   ;EASTON, KEVIN LAWRENCE        ;01;09;OPT;BS ;400 ;  ;keaston@mail.rochester.edu
-## 46246;26611026;   ;ECKEL, GRETCHEN ANNA          ;01;09;BIO;BA ;400 ;  ;geckel@mail.rochester.edu
-## 46246;26672985;   ;FLYER, JOHANNA GABRIELLE      ;01;09;UNC;BA ;400 ;  ;jflyer@mail.rochester.edu
-## 46246;23932114;   ;GALVAN, NESTOR YAMIL          ;01;08;ECE;BS ;400 ;  ;ngalvan@mail.rochester.edu
-## 46246;26603063;   ;GARCIA, HENRY ALEXANDER       ;01;09;BBC;BS ;400 ;  ;hgarcia@mail.rochester.edu
-
-## Second, the full file name of the output WeBWorK classlist file
-
-## Third, the name of the section, e.g. Pizer or "Pizer MWF" or "" (blank).
-##   For example classlist files from multiple sections can be concatonated into
-##   one large classlist file for a whole multisection course
-##
-## NOTE:  Be very careful.  The registrar's file may get corrupted by e-mail.
-
-
-require 5.000;
-
-
-$0 =~ s|.*/||;
-if (@ARGV != 3)  {
-	print "\n usage: $0 registrar's-list outputfile  sectionName\n
-     e.g. readURClassList.pl  ClassRoster.txt mth140A.lst 'Pizer MWF9'\n\n" ;
-	exit(0);
-}
-
-my ($infile, $outfile, $section) = @ARGV;
-
-open(REGLIST, "$infile") || die "can't open $infile: $!\n";
-open(OURLIST, ">$outfile")
-    || die "can't write $outfile: $!\n";
-
-while (<REGLIST>) {
-    chomp;
-    next unless($_=~/\w/);	        ## skip blank lines
-    s/;$/; /;				## make last field non empty
-    my @regArray=split(/;/);		## get fields from registrar's file
-
-    foreach (@regArray) {		## clean 'em up!
-	($_) = m/^\s*(.*?)\s*$/;        ## (remove leading and trailing spaces)
-    }
-
-  ## extract the relevant fields
-
-   my($crn, $id, $grade, $name, $school, $gradyear,
-      $major, $degree, $hours, $status, $login )
-     = @regArray;
-
-	## Hack.  The login comes as a complete email address.  Remove the @ and following sysbols.
-
-	$login =~ s/@.*//;
-
-
-  ## massage the data a bit
-
-    my($lname, $fname) = ($name =~ /^(.*),\s*(.*)$/);
-    if ($login =~/\w/) {$email = "$login".'@mail.rochester.edu';}
-    else
-		{
-		$email= " ";
-		$login = $id;
-	}
-	$status = 'C' unless (defined $status and $status =~/\w/);
-  ## dump it in our classArray format
-  ## our format is: $id, $lname, $fname, $status, 'comment ', $dept, $course, $section,
-  ## $hours, $crn, $year, $semester, $school, $gradyear, $major, $degree, $email, $login
-
-  ## At the U of R 'comment' is blank
-  ## At present only $id, $lname, $fname, $status, $email, $section, $recitation and $login are used by WeBWorK
-
-    my @classArray=($id, $lname, $fname, $status, ' ', $section, ' ',$email, $login);
-
-  ## and print that sucker!
-
-    print OURLIST join(',', @classArray) , "\n";
-}
-  close(OURLIST);
-
-  ## arrange the columns nicely
-
-   &columnPrint("$outfile","$outfile");
-   
-   
-   
-sub columnPrint {
-
-# Takes two parameters.  The first is the filename of the
-# delimited input file.  The second is the name of the
-# output file (these names may be the same).  The permissions
-# and group of the output file will be the same as the
-# input file
-
-# Takes any delimited (with \$DELIM delimiters) file and adds
-# extra space if necessary to the fields so that all columns line up.
-# The widest field in any column will contain exactly 2 spaces at the
-# end of the (non space characters 0f the) field. For example
-# ",a very long field entry  ," at one extreme and  ",  ," at the other
-#
-    my($inFileName,$outFileName)=@_;
-    my($line);
-
-    my ($permission, $gid) = (stat($inFileName))[2,5];
-    $permission =  ($permission & 0777);    ##get rid of file type stuff
-
-    open(INFILE,"$inFileName") or wwerror("$0","can't open $inFileName for reading");
-    my @inFile=<INFILE>;
-    close(INFILE);
-
-    &createFile($outFileName, $permission, $gid);
-
-    my @outFile = &columnArrayArrange(@inFile);
-
-    open(OUTFILE,">$outFileName")   or wwerror("$0","can't open $outFileName for writing");
-    foreach $line (@outFile) {print OUTFILE $line;}
-    close(OUTFILE);
-}
-   
-sub columnArrayArrange  {
-
-## takes as a parameter a delimited array
-## (such as you would get by reading in a delimited file)
-## where each element is a line from a delimited file.
-
-# Outputs an array which adds
-# extra space if necessary to the fields so that all columns line up.
-# The widest field in any column will contain exactly 1 spaces at the
-# end of the (non space characters of the) field. For example
-# ",a very long field entry ," at one extreme and  ", ," at the other
-
-    my @inFile=@_;
-    my($i,$tempFileName,$datString,$line);
-    my @outFile =();
-    my(@fieldLength,@datArray);
-    $i=1;
-
-    @fieldLength=&getFieldLengths(\@inFile);
-    foreach $line (@inFile)   {    ## read through file array and get field lengths
-        unless ($line =~ /\S/)  {next;}    ## skip blank lines
-        chomp $line;
-        @datArray=&getRecord($line);
-        for ($i=0; $i <=$#datArray; $i++) {
-            $datArray[$i].=(" " x ($fieldLength[$i]+1-length("$datArray[$i]")));
-        }
-        $datString=join(',',@datArray);
-        push @outFile , "$datString\n";
-    }
-    @outFile;
-}
-
-sub createFile {
-    my ($fileName, $permission, $numgid) = @_;
-
-    open(TEMPCREATEFILE, ">$fileName") ||
-      warn " Can't open $fileName";
-    my @stat = stat TEMPCREATEFILE;
-    close(TEMPCREATEFILE);
-
-    ## if the owner of the file is running this script (e.g. when the file is first created)
-    ## set the permissions and group correctly
-    if ($< == $stat[4]) {
-        my $tmp = chmod($permission,$fileName) or
-          warn "Can't do chmod($permission, $fileName)";
-        chown(-1,$numgid,$fileName)  or
-          warn "Can't do chown($numgid, $fileName)";
-    }
-}
-
-sub getFieldLengths {
-
-    ## takes as a parameter the  reference to a delimited array
-    ## (such as you would get by reading in a delimited file)
-    ## where each element is a line from a delimited file.
-    ## returns an array which holds
-    ## the maximum field lengths in the file.
-
-    my ($datFileArray_ref)=@_;
-    my($i);
-    my(@datArray,@fieldLength,@datFileArray, $line);
-    @fieldLength=();
-    @datFileArray=@$datFileArray_ref;
-
-    foreach $line (@datFileArray)   {    ## read through file and get field lengths
-        unless ($line =~ /\S/)  {next;}  ## skip blank lines
-        chomp $line;
-        @datArray=&getRecord($line);
-        for ($i=0; $i <=$#datArray; $i++) {
-            $fieldLength[$i] = 0 unless defined $fieldLength[$i];
-            $fieldLength[$i]=&max(length("$datArray[$i]"),$fieldLength[$i]);
-        }
-    }
-    return (@fieldLength);
-}
-
-
-
-sub getRecord
-
-        #       Takes a delimited line as a parameter and returns an
-        #       array.  Note that all white space is removed.  If the
-        #       last field is empty, the last element of the returned
-        #       array is also empty (unlike what the perl split command
-        #       would return).  E.G. @lineArray=&getRecord(\$delimitedLine).
-        {
-    my $DELIM = ',';
-        my($line) = $_[0];
-        my(@lineArray);
-        $line.='A';                                     # add 'A' to end of line so that
-                                                        # last field is never empty
-        @lineArray = split(/\s*${DELIM}\s*/,$line);
-        $lineArray[$#lineArray] =~s/\s*A$//;            # remove spaces and the 'A' from last element
-        $lineArray[0] =~s/^\s*//;                       # remove white space from first element
-        @lineArray;
-        }
-sub max  {  ## find the max element of array
-    my $out = $_[0];
-    my $num;
-    foreach $num (@_) {
-        if ((defined $num) and ($num > $out)) {$out = $num;}
-    }
-    $out;
-}
diff --git a/bin/remove_stale_images b/bin/remove_stale_images
index 23f0be8aba..214e5b0a08 100755
--- a/bin/remove_stale_images
+++ b/bin/remove_stale_images
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -68,15 +68,15 @@ use Pod::Usage;
 use File::Find;
 use DBI;
 
-my $pg_dir;
 BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
+
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
 
 use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$pg_dir/lib";
+
 use WeBWorK::CourseEnvironment;
 use WeBWorK::Utils qw(runtime_use readFile);
 
diff --git a/bin/restore-OPL-tables.pl b/bin/restore-OPL-tables.pl
index da568af414..969e24f142 100755
--- a/bin/restore-OPL-tables.pl
+++ b/bin/restore-OPL-tables.pl
@@ -1,8 +1,8 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -20,15 +20,14 @@
 
 # Get the necessary packages, including adding webwork to our path.
 
-my $pg_dir;
 BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
+
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
 
 use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$pg_dir/lib";
 
 use WeBWorK::CourseEnvironment;
 
@@ -37,20 +36,17 @@ BEGIN
 
 # get course environment and configured OPL path
 
-my $ce = new WeBWorK::CourseEnvironment({
-	webwork_dir => $ENV{WEBWORK_ROOT},
-	});
+my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT} });
 
 my $configured_OPL_path = $ce->{problemLibrary}{root};
 
-
 # Drop the "OpenProblemLibrary" from the end of the path
 
 $configured_OPL_path =~ s+OpenProblemLibrary++;
 
 # Check that it exists
 
-if ( -d "$configured_OPL_path" ) {
+if (-d "$configured_OPL_path") {
 	print "OPL path seems to be $configured_OPL_path\n";
 } else {
 	print "OPL path seems to be misconfigured as $configured_OPL_path which does not exist.\n";
@@ -60,7 +56,7 @@ BEGIN
 # Set TABLE-DUMP path and make directory if necessary
 
 my $prepared_OPL_tables_dir = "${configured_OPL_path}/TABLE-DUMP";
-if ( ! -d "$prepared_OPL_tables_dir" ) {
+if (!-d "$prepared_OPL_tables_dir") {
 	`mkdir -p $prepared_OPL_tables_dir`;
 }
 
@@ -77,23 +73,23 @@ BEGIN
 my $dbpass = $ce->{database_password};
 
 $dbuser = shell_quote($dbuser);
-$db = shell_quote($db);
+$db     = shell_quote($db);
 
-$ENV{'MYSQL_PWD'}=$dbpass;
+$ENV{'MYSQL_PWD'} = $dbpass;
 
 # decide whether the mysql installation can handle
 # utf8mb4 and that should be used for the OPL
 
-my $ENABLE_UTF8MB4 = $ce->{ENABLE_UTF8MB4}?1:0;
+my $ENABLE_UTF8MB4 = $ce->{ENABLE_UTF8MB4} ? 1 : 0;
 
-my $character_set =  ($ENABLE_UTF8MB4)? "utf8mb4":"utf8";
+my $character_set = ($ENABLE_UTF8MB4) ? "utf8mb4" : "utf8";
 
 my $mysql_command = $ce->{externalPrograms}->{mysql};
 
 # check to see if the prepared_OPL_tables_file exists and if it does load it in
 
 if (-e $prepared_OPL_tables_file) {
-  `$mysql_command --host=$host --port=$port --user=$dbuser --default-character-set=$character_set $db < $prepared_OPL_tables_file`;
+	`$mysql_command --host=$host --port=$port --user=$dbuser --default-character-set=$character_set $db < $prepared_OPL_tables_file`;
 }
 
 1;
diff --git a/bin/setfilepermissions b/bin/setfilepermissions
index 3d989d81fb..b50b40b85a 100755
--- a/bin/setfilepermissions
+++ b/bin/setfilepermissions
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -31,17 +31,17 @@ Set the file permissions for webwork
 use strict;
 use warnings;
 
-my $pg_dir;
 BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
+
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
 
 use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$pg_dir/lib";
+
 use WeBWorK::CourseEnvironment;
-my $ce = new WeBWorK::CourseEnvironment({webwork_dir=>$ENV{WEBWORK_ROOT}});
+my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT} });
 
 # who is really running this script (even if sudo'ed)
 # We set relevant directories so that script runner owns them
@@ -49,45 +49,32 @@ my $ce = new WeBWorK::CourseEnvironment({webwork_dir=>$ENV{WEBWORK_ROOT}});
 my $me = `logname`;
 chomp($me);
 
-#my $serverid =  $ce->{server_userID};
-my $servergroup =  $ce->{server_groupID};
-
-if ( ! $me ) {
-	# In a bash shell in a Docker container running webwork, the login name is usually not available.
-	if ( `/usr/bin/grep -c www-data /etc/passwd`) {
-		warn "No login name available, using www-data as the user name for the chown calls.";
-		$me = "www-data";
-	} elsif ( `/usr/bin/grep -c apache /etc/passwd`) {
-		warn "No login name available, using apache as the user name for the chown calls.";
-		$me = "apache";
-	} else {
-		die "Aborting: No login name available, and cannot fall back to www-data or apache for the chown calls.";
-	}
+my $servergroup = $ce->{server_groupID};
+
+if (!$me) {
+	die 'Aborting: No login name available.';
 }
-if ( ! $servergroup ) {
+
+if (!$servergroup) {
 	die "Aborting: server_groupID not set - so cannot do the chgrp calls. Check your conf/site.conf file.";
 }
 
 my $wwroot = $ENV{WEBWORK_ROOT};
 
 # Course directories
-system("chown -R $me ".$ce->{webwork_courses_dir});
-system("chgrp -R $servergroup ".$ce->{webwork_courses_dir});
-system("chmod -R g+w ".$ce->{webwork_courses_dir});
-system("chmod g+s ".$ce->{webwork_courses_dir});
+system("chown -R $me " . $ce->{webwork_courses_dir});
+system("chgrp -R $servergroup " . $ce->{webwork_courses_dir});
+system("chmod -R g+w " . $ce->{webwork_courses_dir});
+system("chmod g+s " . $ce->{webwork_courses_dir});
 
 # Other special directories under webwork2
-for my $dir ( 'DATA', 'htdocs_temp', 'logs', 'tmp' ) {
-  system("chown -R $me $ce->{webworkDirs}{$dir}");
+for my $dir ('DATA', 'htdocs_temp', 'logs', 'tmp') {
+	system("chown -R $me $ce->{webworkDirs}{$dir}");
 	system("chgrp -R $servergroup $ce->{webworkDirs}{$dir}");
 	system("chmod -R g+w $ce->{webworkDirs}{$dir}");
 	system("chmod g+s $ce->{webworkDirs}{$dir}");
 }
 
-# A special directory under pg (so the server can compile the chromatic program)
-system("chgrp $servergroup ".$ce->{pg_dir}."/lib/chromatic");
-system("chmod g+w ".$ce->{pg_dir}."/lib/chromatic");
-
 # The server should not be able to write to the OPL (for most sites)
 
 my $libroot = $ce->{problemLibrary}->{root};
diff --git a/bin/test_library_build.pl b/bin/test_library_build.pl
index 4f3dd14528..7952b810dd 100755
--- a/bin/test_library_build.pl
+++ b/bin/test_library_build.pl
@@ -1,33 +1,30 @@
 #!/usr/bin/env perl
 
-
-my $pg_dir;
 BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
 
-	# Unused variable, but define it to avoid an error message.
-	$WeBWorK::Constants::WEBWORK_DIRECTORY = '';
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
 
 # Get database connection
 
 use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$pg_dir/lib";
+use lib "$ENV{WEBWORK_ROOT}/bin";
+
 use WeBWorK::CourseEnvironment;
 use OPLUtils qw/build_library_directory_tree build_library_subject_tree build_library_textbook_tree/;
 use DBI;
 
-my $ce = new WeBWorK::CourseEnvironment({webwork_dir=>$ENV{WEBWORK_ROOT}});
+my $ce  = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT} });
 my $dbh = DBI->connect(
-        $ce->{database_dsn},
-        $ce->{database_username},
-        $ce->{database_password},
-        {
-                PrintError => 0,
-                RaiseError => 1,
-        },
+	$ce->{database_dsn},
+	$ce->{database_username},
+	$ce->{database_password},
+	{
+		PrintError => 0,
+		RaiseError => 1,
+	},
 );
 
 # auto flush printing
@@ -36,7 +33,7 @@ BEGIN
 select($old_fh);
 
 build_library_directory_tree($ce);
-build_library_subject_tree($ce,$dbh);
-build_library_textbook_tree($ce,$dbh);
+build_library_subject_tree($ce, $dbh);
+build_library_textbook_tree($ce, $dbh);
 
-$dbh->disconnect;
\ No newline at end of file
+$dbh->disconnect;
diff --git a/bin/timing_log_check.pl b/bin/timing_log_check.pl
index 2340876ec9..3f99a949ad 100755
--- a/bin/timing_log_check.pl
+++ b/bin/timing_log_check.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # This script reads the timing log and outputs timing information including
 # the number and per cent of accesses taking various amount of time.
@@ -6,103 +6,93 @@
 # If you have a large timing log, it can tale awhile for the script to complete processing.
 
 # To run the script, cd to the WeBWorK logs directory (usually /opt/webwork/webwork2/logs)
-# and enter the command: timing_log_check.pl 
+# and enter the command: timing_log_check.pl
 
 # Note that this assumes perl is locates in /usr/bin/perl (check with the command "which perl")
 # and /opt/webwork/webwork2/bin/ is in your path.
 
-  open(PGFILE,'timing.log') || warn "Can't read timing.log: $!";
-  my @lines = <PGFILE>; close(PGFILE);
+open(PGFILE, 'timing.log') || warn "Can't read timing.log: $!";
+my @lines = <PGFILE>;
+close(PGFILE);
 
-  my $under0point1sec = 0;
-  my $under0point2sec = 0;
-  my $under0point5sec = 0;
-  my $under1sec = 0;
-  my $under2sec = 0;
-  my $under3sec = 0;
-  my $under4sec = 0;  
-  my $under5sec = 0;
-  my $under10sec = 0;
-  my $over10sec = 0;
-  my $nonvalid = 0;
-  my $line;
-  my $count = 0;
-  my $time = 0;
-  
-  foreach $line (@lines) {
-  	$count++;
-  	$line =~ /runTime = (\d+\.\d+) sec/;
-  	$time = $1;
-  	if ($time < 0.1){
-  		$under0point1sec++;
-  	}
-  	elsif ($time < 0.2){
-  		$under0point2sec++;
-  	}
-  	elsif ($time < 0.5){
-  		$under0point5sec++;
-  	}
-  	elsif ($time < 1.0){
-  		$under1sec++;
-  	}
-  	elsif ($time < 2.0){
-  		$under2sec++;
-  	}  	
-  	elsif ($time < 3.0){
-  		$under3sec++;
-  	}  	
-  	elsif ($time < 4.0){
-  		$under4sec++;
-  	}  	
-  	elsif ($time < 5.0){
-  		$under5sec++;
-  	}  	
-  	elsif ($time < 10.0){
-  		$under10sec++;
-  	}   	
-  	elsif ($time >= 10.0){
-  		$over10sec++;
-  	}  	
-  	else {
-      $nonvalid++;
-    }  
-  }
-  my $percent_under0point1sec = 0;
-  my $percent_under0point2sec = 0;
-  my $percent_under0point5sec = 0;
-  my $percent_under1sec = 0;
-  my $percent_under2sec = 0;
-  my $percent_under3sec = 0;
-  my $percent_under4sec = 0;  
-  my $percent_under5sec = 0;
-  my $percent_under10sec = 0;
-  my $percent_over10sec = 0;
-  my $percent_nonvalid = 0;  
-  
-  $percent_under0point1sec = (int($under0point1sec/$count*1000 +.5))/10;
-  $percent_under0point2sec = (int($under0point2sec/$count*1000 +.5))/10;
-  $percent_under0point5sec = (int($under0point5sec/$count*1000 +.5))/10;
-  $percent_under1sec = (int($under1sec/$count*1000 +.5))/10;
-  $percent_under2sec = (int($under2sec/$count*1000 +.5))/10;      
-  $percent_under3sec = (int($under3sec/$count*1000 +.5))/10;     
-  $percent_under4sec = (int($under4sec/$count*1000 +.5))/10;
-  $percent_under5sec = (int($under5sec/$count*1000 +.5))/10;
-  $percent_under10sec = (int($under10sec/$count*1000 +.5))/10;
-  $percent_over10sec = (int($over10sec/$count*1000 +.5))/10;
-  $percent_nonvalid = (int($nonvalid/$count*1000 +.5))/10;
+my $under0point1sec = 0;
+my $under0point2sec = 0;
+my $under0point5sec = 0;
+my $under1sec       = 0;
+my $under2sec       = 0;
+my $under3sec       = 0;
+my $under4sec       = 0;
+my $under5sec       = 0;
+my $under10sec      = 0;
+my $over10sec       = 0;
+my $nonvalid        = 0;
+my $line;
+my $count = 0;
+my $time  = 0;
 
-  
-  print "count = $count\n";
-  print "under 0.1 seconds = $under0point1sec: ${percent_under0point1sec}%\n";   	
-  print "between 0.1 and 0.2 seconds = $under0point2sec: ${percent_under0point2sec}%\n"; 
-  print "between 0.2 and 0.5 seconds = $under0point5sec: ${percent_under0point5sec}%\n";
-  print "between 0.5 and 1.0 seconds = $under1sec: ${percent_under1sec}%\n"; 
-  print "between 1.0 and 2.0 seconds = $under2sec: ${percent_under2sec}%\n";
-  print "between 2.0 and 3.0 seconds = $under3sec: ${percent_under3sec}%\n";
-  print "between 3.0 and 4.0 seconds = $under4sec: ${percent_under4sec}%\n";
-  print "between 4.0 and 5.0 seconds = $under5sec: ${percent_under5sec}%\n";
-  print "between 5.0 and 10.0 seconds = $under10sec: ${percent_under10sec}%\n";
-  print "over 10.0 seconds = $over10sec: ${percent_over10sec}%\n";
-  print "non valid response = $nonvalid: ${percent_nonvalid}%\n";
+foreach $line (@lines) {
+	$count++;
+	$line =~ /runTime = (\d+\.\d+) sec/;
+	$time = $1;
+	if ($time < 0.1) {
+		$under0point1sec++;
+	} elsif ($time < 0.2) {
+		$under0point2sec++;
+	} elsif ($time < 0.5) {
+		$under0point5sec++;
+	} elsif ($time < 1.0) {
+		$under1sec++;
+	} elsif ($time < 2.0) {
+		$under2sec++;
+	} elsif ($time < 3.0) {
+		$under3sec++;
+	} elsif ($time < 4.0) {
+		$under4sec++;
+	} elsif ($time < 5.0) {
+		$under5sec++;
+	} elsif ($time < 10.0) {
+		$under10sec++;
+	} elsif ($time >= 10.0) {
+		$over10sec++;
+	} else {
+		$nonvalid++;
+	}
+}
+my $percent_under0point1sec = 0;
+my $percent_under0point2sec = 0;
+my $percent_under0point5sec = 0;
+my $percent_under1sec       = 0;
+my $percent_under2sec       = 0;
+my $percent_under3sec       = 0;
+my $percent_under4sec       = 0;
+my $percent_under5sec       = 0;
+my $percent_under10sec      = 0;
+my $percent_over10sec       = 0;
+my $percent_nonvalid        = 0;
 
-exit(0);
\ No newline at end of file
+$percent_under0point1sec = (int($under0point1sec / $count * 1000 + .5)) / 10;
+$percent_under0point2sec = (int($under0point2sec / $count * 1000 + .5)) / 10;
+$percent_under0point5sec = (int($under0point5sec / $count * 1000 + .5)) / 10;
+$percent_under1sec       = (int($under1sec / $count * 1000 + .5)) / 10;
+$percent_under2sec       = (int($under2sec / $count * 1000 + .5)) / 10;
+$percent_under3sec       = (int($under3sec / $count * 1000 + .5)) / 10;
+$percent_under4sec       = (int($under4sec / $count * 1000 + .5)) / 10;
+$percent_under5sec       = (int($under5sec / $count * 1000 + .5)) / 10;
+$percent_under10sec      = (int($under10sec / $count * 1000 + .5)) / 10;
+$percent_over10sec       = (int($over10sec / $count * 1000 + .5)) / 10;
+$percent_nonvalid        = (int($nonvalid / $count * 1000 + .5)) / 10;
+
+print "count = $count\n";
+print "under 0.1 seconds = $under0point1sec: ${percent_under0point1sec}%\n";
+print "between 0.1 and 0.2 seconds = $under0point2sec: ${percent_under0point2sec}%\n";
+print "between 0.2 and 0.5 seconds = $under0point5sec: ${percent_under0point5sec}%\n";
+print "between 0.5 and 1.0 seconds = $under1sec: ${percent_under1sec}%\n";
+print "between 1.0 and 2.0 seconds = $under2sec: ${percent_under2sec}%\n";
+print "between 2.0 and 3.0 seconds = $under3sec: ${percent_under3sec}%\n";
+print "between 3.0 and 4.0 seconds = $under4sec: ${percent_under4sec}%\n";
+print "between 4.0 and 5.0 seconds = $under5sec: ${percent_under5sec}%\n";
+print "between 5.0 and 10.0 seconds = $under10sec: ${percent_under10sec}%\n";
+print "over 10.0 seconds = $over10sec: ${percent_over10sec}%\n";
+print "non valid response = $nonvalid: ${percent_nonvalid}%\n";
+
+exit(0);
diff --git a/bin/update-OPL-statistics.pl b/bin/update-OPL-statistics.pl
index aa43bf98d4..dc768d9a83 100755
--- a/bin/update-OPL-statistics.pl
+++ b/bin/update-OPL-statistics.pl
@@ -1,8 +1,8 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -17,16 +17,15 @@
 
 use strict;
 
-# Get the necessary packages, including adding
-# webwork and pg library to our path.
-my $pg_dir;
 BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
+
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
+
 use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$pg_dir/lib";
+
 use WeBWorK::CourseEnvironment;
 use String::ShellQuote;
 
@@ -37,15 +36,12 @@ BEGIN
 my $time = time();
 
 # get course environment and open up database
-my $ce = new WeBWorK::CourseEnvironment({
-    webwork_dir => $ENV{WEBWORK_ROOT},
-	});
+my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT} });
 
 # decide whether the mysql installation can handle
 # utf8mb4 and that should be used for the OPL
 
-my $ENABLE_UTF8MB4 = $ce->{ENABLE_UTF8MB4}?1:0;
-
+my $ENABLE_UTF8MB4 = $ce->{ENABLE_UTF8MB4} ? 1 : 0;
 
 my $dbh = DBI->connect(
 	$ce->{problemLibrary_db}->{dbsource},
@@ -63,7 +59,7 @@ BEGIN
 
 # create tables.  We always redo the statistics table.
 
-my $character_set =  ($ENABLE_UTF8MB4)? "utf8mb4":"utf8";
+my $character_set = ($ENABLE_UTF8MB4) ? "utf8mb4" : "utf8";
 
 $dbh->do(<<EOS);
 CREATE TABLE IF NOT EXISTS `OPL_problem_user` (
@@ -104,25 +100,25 @@ BEGIN
 # for each course get the data from the user problem table into the
 # opl user problem table.
 
-print "Importing statistics for ".scalar(@courses)." courses.\n";
+print "Importing statistics for " . scalar(@courses) . " courses.\n";
 
 my $counter = 0;
 
 foreach my $courseID (@courses) {
-    $counter++;
-    print sprintf("%*d",4,$counter);
-    if ($counter % 10 == 0) {
-	print "\n";
-    }
-
-    next if $courseID eq 'admin' || $courseID eq 'modelCourse';
-
-    # we extract the identifying information of the problem,
-    # the status, attempted flag, number of attempts.
-    # and the source_file
-    # we strip of the local in front of the source file
-    # (assuming that these are mostly the same as their library counterparts
-    $dbh->do(<<EOS);
+	$counter++;
+	print sprintf("%*d", 4, $counter);
+	if ($counter % 10 == 0) {
+		print "\n";
+	}
+
+	next if $courseID eq 'admin' || $courseID eq 'modelCourse';
+
+	# we extract the identifying information of the problem,
+	# the status, attempted flag, number of attempts.
+	# and the source_file
+	# we strip of the local in front of the source file
+	# (assuming that these are mostly the same as their library counterparts
+	$dbh->do(<<EOS);
 INSERT IGNORE INTO OPL_problem_user
   (course_id,
   user_id,
@@ -184,7 +180,7 @@ BEGIN
 $dbh->commit();
 
 # We no longer automatically load the global statistics data here.
-print( "You may want to run load-OPL-global-statistics.pl to update the global statistics data.\n",
+print("You may want to run load-OPL-global-statistics.pl to update the global statistics data.\n",
 	"If this is being run by OPL-update, that will be done automatically.\n");
 
 1;
diff --git a/bin/updateOPLextras.pl b/bin/updateOPLextras.pl
index d0d2543f8f..93d74cc976 100755
--- a/bin/updateOPLextras.pl
+++ b/bin/updateOPLextras.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 =head1 NAME
 
@@ -50,14 +50,14 @@ =head1 DESCRIPTION
 use DBI;
 use Getopt::Long;
 use Pod::Usage;
-Getopt::Long::Configure ("bundling");
+Getopt::Long::Configure("bundling");
 
 my ($textbooks, $directories, $subjects, $verbose, $all);
-GetOptions (
-  't|textbooks'   => \$textbooks,
-  'd|directories' => \$directories,
-  's|subjects'    => \$subjects,
-  'a|all'         => \$all,
+GetOptions(
+	't|textbooks'   => \$textbooks,
+	'd|directories' => \$directories,
+	's|subjects'    => \$subjects,
+	'a|all'         => \$all,
 	'v|verbose'     => \$verbose
 );
 pod2usage(2) unless ($textbooks || $directories || $subjects || $all);
@@ -69,35 +69,35 @@ =head1 DESCRIPTION
 #
 ####
 
-my $pg_dir;
 BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
+
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
 
 use lib "$ENV{WEBWORK_ROOT}/bin";
 use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$pg_dir/lib";
+
 use WeBWorK::CourseEnvironment;
 use OPLUtils qw/build_library_directory_tree build_library_subject_tree build_library_textbook_tree/;
 
-my $ce = new WeBWorK::CourseEnvironment({webwork_dir=>$ENV{WEBWORK_ROOT}});
+my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT} });
 
 # decide whether the mysql installation can handle
 # utf8mb4 and that should be used for the OPL
 
-my $ENABLE_UTF8MB4 = ($ce->{ENABLE_UTF8MB4})?1:0;
-print  "using utf8mb4 \n\n" if $ENABLE_UTF8MB4;
+my $ENABLE_UTF8MB4 = ($ce->{ENABLE_UTF8MB4}) ? 1 : 0;
+print "using utf8mb4 \n\n" if $ENABLE_UTF8MB4;
 
 # The DBD::MariaDB driver should not get the
 #    mysql_enable_utf8mb4 or mysql_enable_utf8 settings,
 # but DBD::mysql should.
 my %utf8_parameters = ();
 
-if ( $ce->{database_driver} =~ /^mysql$/i ) {
+if ($ce->{database_driver} =~ /^mysql$/i) {
 	# Only needed for older DBI:mysql driver
-	if ( $ENABLE_UTF8MB4 ) {
+	if ($ENABLE_UTF8MB4) {
 		$utf8_parameters{mysql_enable_utf8mb4} = 1;
 	} else {
 		$utf8_parameters{mysql_enable_utf8} = 1;
@@ -115,8 +115,8 @@ BEGIN
 	},
 );
 
-build_library_textbook_tree($ce,$dbh,$verbose) if ($all || $textbooks);
-build_library_directory_tree($ce,$verbose) if ($all || $directories);
-build_library_subject_tree($ce,$dbh,$verbose) if ($all || $subjects);
+build_library_textbook_tree($ce, $dbh, $verbose) if ($all || $textbooks);
+build_library_directory_tree($ce, $verbose)      if ($all || $directories);
+build_library_subject_tree($ce, $dbh, $verbose)  if ($all || $subjects);
 
 1;
diff --git a/bin/upgrade-database-to-utf8mb4.pl b/bin/upgrade-database-to-utf8mb4.pl
index c5a2b89b8d..a79eb98a06 100755
--- a/bin/upgrade-database-to-utf8mb4.pl
+++ b/bin/upgrade-database-to-utf8mb4.pl
@@ -1,7 +1,7 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -125,8 +125,10 @@ =head1 OPTIONS
 use warnings;
 
 BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n" unless $ENV{WEBWORK_ROOT};
-	die "PG_ROOT not found in environment.\n" unless $ENV{PG_ROOT};
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
+
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
 
 use Getopt::Long qw(:config bundling);
@@ -134,8 +136,7 @@ BEGIN
 use DBI;
 use String::ShellQuote;
 
-my (@courses, $all, $second_pass, $upgrade_non_native, $no_backup, $dump_file,
-	$verbose, $show_help);
+my (@courses, $all, $second_pass, $upgrade_non_native, $no_backup, $dump_file, $verbose, $show_help);
 GetOptions(
 	'c|course-id=s@'       => \@courses,
 	'a|all'                => \$all,
@@ -149,13 +150,13 @@ BEGIN
 pod2usage(-verbose => $show_help ? 2 : 0) if $show_help || !(@courses || $all || $upgrade_non_native);
 
 use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$ENV{PG_ROOT}/lib";
+
 use WeBWorK::CourseEnvironment;
 use WeBWorK::DB;
 use WeBWorK::Utils::CourseManagement qw{listCourses};
 
 # Load a minimal course environment.
-my $ce = new WeBWorK::CourseEnvironment({ webwork_dir => $ENV{WEBWORK_ROOT} });
+my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT} });
 
 # Get DB connection settings.
 my $dbname = $ce->{database_name};
@@ -177,7 +178,7 @@ BEGIN
 		$replace = <>;
 		chomp($replace);
 		print "Overwriting '$dump_file' with new database dump.\n" if $replace eq 'Y';
-		print "Not creating new database dump.\n" if $replace ne 'Y';
+		print "Not creating new database dump.\n"                  if $replace ne 'Y';
 
 		if ($replace ne 'Y') {
 			my $proceed = 'n';
@@ -191,8 +192,9 @@ BEGIN
 	if ($replace eq 'Y') {
 		print "Backing up database to '$dump_file'.\n" if $verbose;
 		`$ce->{externalPrograms}{mysqldump} --host=$host --port=$port --user=$dbuser $dbname > $dump_file`;
-		die("There was an error creating a database backup.\n" .
-			"Please make a manual backup if needed before proceeding.") if $?;
+		die("There was an error creating a database backup.\n"
+				. "Please make a manual backup if needed before proceeding.")
+			if $?;
 	}
 }
 
@@ -210,45 +212,47 @@ BEGIN
 	},
 );
 
-my $db = new WeBWorK::DB($ce->{dbLayouts}{$ce->{dbLayoutName}});
+my $db          = new WeBWorK::DB($ce->{dbLayouts}{ $ce->{dbLayoutName} });
 my @table_types = sort(grep { !$db->{$_}{params}{non_native} } keys %$db);
 
 sub checkAndUpdateTableColumnTypes {
-	my $table = shift;
+	my $table      = shift;
 	my $table_type = shift;
-	my $pass = shift // 1;
+	my $pass       = shift // 1;
 
 	print "\tChecking '$table' (pass $pass)\n" if $verbose;
 	my $schema_field_data = $db->{$table_type}{record}->FIELD_DATA;
 	for my $field (keys %$schema_field_data) {
 		my $field_name = $db->{$table_type}{params}{fieldOverride}{$field} || $field;
-		my @name_type = @{$dbh->selectall_arrayref("SELECT COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS " .
-			"WHERE TABLE_SCHEMA='$dbname' AND TABLE_NAME='$table' AND COLUMN_NAME='$field_name';")};
-
-		print("\t\tThe '$field_name' column is missing from '$table'.\n" .
-			"\t\tYou should upgrade the course via course administration to fix this.\n" .
-			"\t\tYou may need to run this script again after doing that.\n"),
-		next if !exists($name_type[0][0]);
+		my @name_type  = @{
+			$dbh->selectall_arrayref(
+				"SELECT COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS "
+					. "WHERE TABLE_SCHEMA='$dbname' AND TABLE_NAME='$table' AND COLUMN_NAME='$field_name';"
+			)
+		};
+
+		print("\t\tThe '$field_name' column is missing from '$table'.\n"
+				. "\t\tYou should upgrade the course via course administration to fix this.\n"
+				. "\t\tYou may need to run this script again after doing that.\n"), next
+			if !exists($name_type[0][0]);
 
 		my $data_type = $name_type[0][0];
-		next if !$data_type;
+		next                       if !$data_type;
 		$data_type =~ s/\(\d*\)$// if $data_type =~ /^(big|small)?int\(\d*\)$/;
 		$data_type = lc($data_type);
 		my $schema_data_type = lc($schema_field_data->{$field}{type} =~ s/ .*$//r);
 		if ($data_type ne $schema_data_type) {
 			print "\t\tUpdating data type for column '$field_name' in table '$table'\n" if $verbose;
-			print "\t\t\t$data_type -> $schema_data_type\n" if $verbose;
-			eval {
-				$dbh->do("ALTER TABLE `$table` MODIFY $field_name $schema_field_data->{$field}{type};");
-			};
+			print "\t\t\t$data_type -> $schema_data_type\n"                             if $verbose;
+			eval { $dbh->do("ALTER TABLE `$table` MODIFY $field_name $schema_field_data->{$field}{type};"); };
 			my $indent = $verbose ? "\t\t" : "";
-			die("${indent}Failed to modify '$field_name' in '$table' from '$data_type' to '$schema_data_type.\n" .
-				"${indent}It is recommended that you restore a database backup.  Make note of the\n" .
-				"${indent}error output below as it may help in diagnosing the problem.  Note that\n" .
-				"${indent}the most common reason for this error is the existence of a data value\n" .
-				"${indent}in a column that does not fit into the smaller size data type that was\n" .
-				"${indent}needed for the utf8mb4 change.\n$@")
-			if $@;
+			die("${indent}Failed to modify '$field_name' in '$table' from '$data_type' to '$schema_data_type.\n"
+					. "${indent}It is recommended that you restore a database backup.  Make note of the\n"
+					. "${indent}error output below as it may help in diagnosing the problem.  Note that\n"
+					. "${indent}the most common reason for this error is the existence of a data value\n"
+					. "${indent}in a column that does not fit into the smaller size data type that was\n"
+					. "${indent}needed for the utf8mb4 change.\n$@")
+				if $@;
 		}
 	}
 	return 0;
@@ -258,19 +262,22 @@ sub checkAndChangeTableCharacterSet {
 	my $table = shift;
 
 	print "\tChecking character set for '$table'\n" if $verbose;
-	my @table_data = @{$dbh->selectall_arrayref("SELECT CCSA.character_set_name FROM information_schema.TABLES T, " .
-		"information_schema.COLLATION_CHARACTER_SET_APPLICABILITY CCSA " .
-		"WHERE CCSA.collation_name = T.table_collation AND T.table_schema = '$dbname' AND T.table_name = '$table'")};
+	my @table_data = @{
+		$dbh->selectall_arrayref(
+			"SELECT CCSA.character_set_name FROM information_schema.TABLES T, "
+				. "information_schema.COLLATION_CHARACTER_SET_APPLICABILITY CCSA "
+				. "WHERE CCSA.collation_name = T.table_collation AND T.table_schema = '$dbname' AND T.table_name = '$table'"
+		)
+	};
 	for (@table_data) {
 		if ($_->[0] ne 'utf8mb4') {
 			print "\t\tConverting '$table' character set to utf8mb4\n" if $verbose;
-			eval {
-				$dbh->do("ALTER TABLE `$table` CONVERT TO CHARACTER SET utf8mb4;");
-			};
+			eval { $dbh->do("ALTER TABLE `$table` CONVERT TO CHARACTER SET utf8mb4;"); };
 			my $indent = $verbose ? "\t\t" : "";
-			die("${indent}Failed to alter charset of '$table' to utf8mb4:\n" .
-				"${indent}It is recommended that you restore a database backup.  Make note of the\n" .
-				"${indent}error output below as it may help in diagnosing the problem.\n$@") if $@;
+			die("${indent}Failed to alter charset of '$table' to utf8mb4:\n"
+					. "${indent}It is recommended that you restore a database backup.  Make note of the\n"
+					. "${indent}error output below as it may help in diagnosing the problem.\n$@")
+				if $@;
 		}
 	}
 	return 0;
@@ -280,15 +287,20 @@ sub checkAndChangeTableCharacterSet {
 
 for my $course (@courses) {
 	print("The course '$course' does not exist on the server\n"), next
-   	if !grep($course eq $_, @server_courses);
+		if !grep($course eq $_, @server_courses);
 
 	print "Checking tables for '$course'\n" if $verbose;
 	for my $table_type (@table_types) {
 		my $table = "${course}_$table_type";
-		next unless @{$dbh->selectall_arrayref("SELECT * FROM INFORMATION_SCHEMA.TABLES " .
-			"WHERE TABLE_SCHEMA = '$dbname' AND TABLE_NAME='$table';")};
+		next
+			unless @{
+				$dbh->selectall_arrayref(
+					"SELECT * FROM INFORMATION_SCHEMA.TABLES "
+					. "WHERE TABLE_SCHEMA = '$dbname' AND TABLE_NAME='$table';"
+				)
+			};
 
-	   	checkAndUpdateTableColumnTypes($table, $table_type);
+		checkAndUpdateTableColumnTypes($table, $table_type);
 		checkAndChangeTableCharacterSet($table);
 		checkAndUpdateTableColumnTypes($table, $table_type, 2) if ($second_pass);
 	}
@@ -300,8 +312,13 @@ sub checkAndChangeTableCharacterSet {
 	my @native_tables = grep { $db->{$_}{params}{non_native} } keys %$db;
 	for my $native_table (@native_tables) {
 		# Skip the fake tables
-		next unless @{$dbh->selectall_arrayref("SELECT * FROM INFORMATION_SCHEMA.TABLES " .
-			"WHERE TABLE_SCHEMA = '$dbname' AND TABLE_NAME='$native_table';")};
+		next
+			unless @{
+				$dbh->selectall_arrayref(
+					"SELECT * FROM INFORMATION_SCHEMA.TABLES "
+					. "WHERE TABLE_SCHEMA = '$dbname' AND TABLE_NAME='$native_table';"
+				)
+			};
 
 		checkAndUpdateTableColumnTypes($native_table, $native_table);
 		checkAndChangeTableCharacterSet($native_table);
diff --git a/bin/upgrade_admin_db.pl b/bin/upgrade_admin_db.pl
index dc160f6e00..57a3ebfe24 100755
--- a/bin/upgrade_admin_db.pl
+++ b/bin/upgrade_admin_db.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,16 +14,15 @@
 # Artistic License for more details.
 ################################################################################
 
-my $pg_dir;
 BEGIN {
-	die('You need to set the WEBWORK_ROOT environment variable.\n')
-		unless ($ENV{WEBWORK_ROOT});
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
+
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
 
 use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$pg_dir/lib";
+
 use WeBWorK::CourseEnvironment;
 
 use WeBWorK::DB;
@@ -34,7 +33,7 @@ BEGIN
 ##########################
 my $upgrade_courseID = 'admin';
 
-my $ce = new WeBWorK::CourseEnvironment({
+my $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
 	courseName  => $upgrade_courseID,
 });
@@ -43,25 +42,33 @@ BEGIN
 # Create integrity checker
 #############################################################################
 
-my $update_error_msg = '';
+my @update_report;
 my $CIchecker = new WeBWorK::Utils::CourseIntegrityCheck(ce => $ce);
 
 #############################################################################
 # Add missing tables and missing fields to existing tables
 #############################################################################
 
-my ($tables_ok,$dbStatus) = $CIchecker->checkCourseTables($upgrade_courseID);
-my @schema_table_names = keys %$dbStatus;  # update tables missing from database;
-my @tables_to_create = grep {$dbStatus->{$_}->[0] == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A()} @schema_table_names;
-my @tables_to_alter  = grep {$dbStatus->{$_}->[0] == WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B()} @schema_table_names;
-$update_error_msg = $CIchecker->updateCourseTables($upgrade_courseID, [@tables_to_create]);
-foreach my $table_name (@tables_to_alter) {	#warn "do_upgrade_course: adding new fields to table $table_name in course $upgrade_courseID";
-    $update_error_msg .= $CIchecker->updateTableFields($upgrade_courseID, $table_name);
+my ($tables_ok, $dbStatus) = $CIchecker->checkCourseTables($upgrade_courseID);
+my @schema_table_names = keys %$dbStatus;    # update tables missing from database;
+my @tables_to_create =
+	grep { $dbStatus->{$_}->[0] == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A() } @schema_table_names;
+my @tables_to_alter =
+	grep { $dbStatus->{$_}->[0] == WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B() } @schema_table_names;
+push(@update_report, $CIchecker->updateCourseTables($upgrade_courseID, [@tables_to_create]));
+foreach my $table_name (@tables_to_alter)
+{    #warn "do_upgrade_course: adding new fields to table $table_name in course $upgrade_courseID";
+	push(@update_report, $CIchecker->updateTableFields($upgrade_courseID, $table_name));
 }
 
-if ($update_error_msg) {
-    $update_error_msg =~ s/<br \/>/\n/g;
-    print $update_error_msg."\n";
+if (@update_report) {
+	for (@update_report) {
+		if ($_->[1]) {
+			print "$_->[0]\n";
+		} else {
+			print STDERR "$_->[0]\n";
+		}
+	}
 } else {
-    print "Admin Course Up to Date\n";
+	print "Admin Course Up to Date\n";
 }
diff --git a/bin/upload-OPL-statistics.pl b/bin/upload-OPL-statistics.pl
index 8aeefd89bd..a90a807b09 100755
--- a/bin/upload-OPL-statistics.pl
+++ b/bin/upload-OPL-statistics.pl
@@ -1,8 +1,8 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -17,23 +17,21 @@
 
 # This script dumps the local OPL statistics table and uploads it.
 
-my $pg_dir;
 BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
+
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
+
 use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$pg_dir/lib";
 
 use WeBWorK::CourseEnvironment;
 
 use Net::Domain qw/domainname/;
 use String::ShellQuote;
 
-my $ce = new WeBWorK::CourseEnvironment({
-	webwork_dir => $ENV{WEBWORK_ROOT},
-	});
+my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT} });
 
 # Get DB connection settings
 
@@ -43,16 +41,16 @@ BEGIN
 my $dbuser = $ce->{database_username};
 my $dbpass = $ce->{database_password};
 
-my $domainname = domainname() || 'unknown';
-my $time = time();
+my $domainname  = domainname() || 'unknown';
+my $time        = time();
 my $output_file = "$domainname-$time-opl.sql";
- 
+
 my $done;
 my $desc;
 my $input;
 my $answered;
 do {
-  print <<'END_REQUEST';
+	print <<'END_REQUEST';
 WeBWorK and the Open Problem Library (OPL) are provided freely under an
 open-source license. We ask that you share your OPL usage statistics for
 the benefit of all who use WeBWorK. The following information will be shared
@@ -65,105 +63,105 @@ BEGIN
   * the average number of attempts made per user on the problem
   * the average completion percentage for each user who attempted the problem
 
-Share OPL usage statistics with the WeBWorK community [Y/N]: 
+Share OPL usage statistics with the WeBWorK community [Y/N]:
 END_REQUEST
-  $input = <STDIN>;
-  chomp $input;
+	$input = <STDIN>;
+	chomp $input;
 
-  if ( $input =~ m/y/i ) {
-    $answered = 1;
-  }
-  elsif ( $input =~ m/n/i ) {
-    exit;
-  }
-} while ( !$answered );
+	if ($input =~ m/y/i) {
+		$answered = 1;
+	} elsif ($input =~ m/n/i) {
+		exit;
+	}
+} while (!$answered);
 
 do {
-  print "\nWe would appreciate it if you could provide \nsome basic information to help us \nkeep track of the data we receive.\n\n";
+	print
+		"\nWe would appreciate it if you could provide \nsome basic information to help us \nkeep track of the data we receive.\n\n";
 
-  $desc  = "File:\n$output_file\n";
+	$desc = "File:\n$output_file\n";
 
-  print "What university is this data for?\n";
+	print "What university is this data for?\n";
 
-  $desc .=  "University:\n";
-  $input = <STDIN>;
-  $desc .=  $input;
+	$desc .= "University:\n";
+	$input = <STDIN>;
+	$desc .= $input;
 
-  print "What department is this data for?\n";
+	print "What department is this data for?\n";
 
-  $desc .=  "Department:\n";
-  $input = <STDIN>;
-  $desc .=  $input;
+	$desc .= "Department:\n";
+	$input = <STDIN>;
+	$desc .= $input;
 
-  print "What is your name?\n";
+	print "What is your name?\n";
 
-  $desc .=  "Name:\n";
-  $input = <STDIN>;
-  $desc .=  $input;
+	$desc .= "Name:\n";
+	$input = <STDIN>;
+	$desc .= $input;
 
-  print "What is your email address?\n";
+	print "What is your email address?\n";
 
-  $desc .=  "Email:\n";
-  $input = <STDIN>;
-  $desc .=  $input;
+	$desc .= "Email:\n";
+	$input = <STDIN>;
+	$desc .= $input;
 
-  print "Have you uploaded data from this server before?\n";
+	print "Have you uploaded data from this server before?\n";
 
-  $desc .=  "Uploaded Previously:\n";
-  $input = <STDIN>;
-  $desc .=  $input;
+	$desc .= "Uploaded Previously:\n";
+	$input = <STDIN>;
+	$desc .= $input;
 
-  print "Approximately what years does this data span?\n";
+	print "Approximately what years does this data span?\n";
 
-  $desc .=  "Years:\n";
-  $input = <STDIN>;
-  $desc .=  $input;
+	$desc .= "Years:\n";
+	$input = <STDIN>;
+	$desc .= $input;
 
-  print "Approximately how many classes are included?\n";
+	print "Approximately how many classes are included?\n";
 
-  $desc .=  "Number of Classes:\n";
-  $input = <STDIN>;
-  $desc .=  $input;
+	$desc .= "Number of Classes:\n";
+	$input = <STDIN>;
+	$desc .= $input;
 
-  print "Additional Comments?\n";
+	print "Additional Comments?\n";
 
-  $desc .=  "Additional Comments:\n";
-  $input = <STDIN>;
-  $desc .=  $input;
+	$desc .= "Additional Comments:\n";
+	$input = <STDIN>;
+	$desc .= $input;
 
-  print "The data you just entered is below:\n\n";
+	print "The data you just entered is below:\n\n";
 
-  print $desc."\n";
+	print $desc. "\n";
 
-  do {
-    print "Please choose one of the following:\n";
-    print "1. Upload Data\n";
-    print "2. Reenter above information.\n";
-    print "3. Cancel.\n";
-    print "[1/2/3]? ";
+	do {
+		print "Please choose one of the following:\n";
+		print "1. Upload Data\n";
+		print "2. Reenter above information.\n";
+		print "3. Cancel.\n";
+		print "[1/2/3]? ";
 
-    $input = <STDIN>;
-    chomp $input;
+		$input = <STDIN>;
+		chomp $input;
 
-    if ($input eq '3') {
-      exit;
-    } elsif ($input eq '2') {
-      $done = 0;
-      $answered = 1;
-    } elsif ($input eq '1') {
-      $done = 1;
-      $answered = 1;
-    } else {
-      $answered = 0;
-    }
-  } while (!$answered);
+		if ($input eq '3') {
+			exit;
+		} elsif ($input eq '2') {
+			$done     = 0;
+			$answered = 1;
+		} elsif ($input eq '1') {
+			$done     = 1;
+			$answered = 1;
+		} else {
+			$answered = 0;
+		}
+	} while (!$answered);
 
 } while (!$done);
 
 my $desc_file = "$domainname-$time-desc.txt";
 
 open(my $fh, ">", $desc_file)
-  or die "Couldn't open file for saving description.";
+	or die "Couldn't open file for saving description.";
 
 print $fh $desc;
 
@@ -182,11 +180,10 @@ BEGIN
 # see: https://serverfault.com/questions/912162/mysqldump-throws-unknown-table-column-statistics-in-information-schema-1109
 #      https://github.com/drush-ops/drush/issues/4410
 
-my $column_statistics_off = "";
-my $test_for_column_statistics =
-  `$mysqldump_command --help | grep 'column-statistics'`;
+my $column_statistics_off      = "";
+my $test_for_column_statistics = `$mysqldump_command --help | grep 'column-statistics'`;
 if ($test_for_column_statistics) {
-    $column_statistics_off = " --column-statistics=0 ";
+	$column_statistics_off = " --column-statistics=0 ";
 }
 
 `$mysqldump_command --host=$host --port=$port --user=$dbuser $column_statistics_off $db OPL_local_statistics > $output_file`;
diff --git a/lib/WeBWorK/CGI.pm b/bin/webwork2
old mode 100644
new mode 100755
similarity index 50%
rename from lib/WeBWorK/CGI.pm
rename to bin/webwork2
index 0231404e8a..ed3d264ac4
--- a/lib/WeBWorK/CGI.pm
+++ b/bin/webwork2
@@ -1,6 +1,7 @@
+#!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -13,24 +14,31 @@
 # Artistic License for more details.
 ################################################################################
 
-package WeBWorK::CGI;
-
 use strict;
 use warnings;
 
-# from http://search.cpan.org/src/LDS/CGI.pm-3.20/cgi_docs.html#subclassing
-use vars qw/@ISA $VERSION/;
-require CGI;
-@ISA = 'CGI';
-$VERSION = "0.1";
+BEGIN {
+	use Mojo::File qw(curfile);
+	use YAML::XS qw(LoadFile);
+	use Env qw(WEBWORK_ROOT PG_ROOT);
+
+	$WEBWORK_ROOT = curfile->dirname->dirname->to_string;
+
+	# Load the configuration file to obtain the PG root directory.
+	my $config_file = "$WEBWORK_ROOT/conf/webwork2.mojolicious.yml";
+	$config_file = "$WEBWORK_ROOT/conf/webwork2.mojolicious.dist.yml" unless -e $config_file;
+	my $config = LoadFile($config_file);
 
-$CGI::DefaultClass = __PACKAGE__;
-$WeBWorK::CGI::AutoloadClass = 'CGI';
+	$PG_ROOT = $config->{pg_dir};
 
-sub new {
-	my $self = shift->SUPER::new(@_);
-	$self->delete_all;
-	return $self;
+	$WeBWorK::SeedCE{webwork_dir} = $ENV{WEBWORK_ROOT};
+	$WeBWorK::SeedCE{pg_dir}      = $ENV{PG_ROOT};
 }
 
-1;
+use Mojolicious::Commands;
+
+use lib "$WEBWORK_ROOT/lib";
+use lib "$PG_ROOT/lib";
+
+# Start command line interface for application
+Mojolicious::Commands->start_app('Mojolicious::WeBWorK');
diff --git a/bin/ww_purge_old_nonces b/bin/ww_purge_old_nonces
index 9ac0b0bc6e..88e5ceb345 100755
--- a/bin/ww_purge_old_nonces
+++ b/bin/ww_purge_old_nonces
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -44,15 +44,15 @@ Course for which old nonces should be deleted.
 use strict;
 use warnings;
 
-my $pg_dir;
 BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
+
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
 
 use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$pg_dir/lib";
+
 use WeBWorK::CourseEnvironment;
 use WeBWorK::DB;
 
@@ -69,7 +69,7 @@ usage() unless $course ;
 
 my $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
-	courseName => $course,
+	courseName  => $course,
 });
 
 my $db = WeBWorK::DB->new($ce->{dbLayout});
diff --git a/bin/wwdb b/bin/wwdb
index e5e5c82d32..7857464502 100755
--- a/bin/wwdb
+++ b/bin/wwdb
@@ -1,7 +1,7 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -61,14 +61,15 @@ use strict;
 use warnings;
 use Getopt::Std;
 
-my $pg_dir;
 BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
+
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
+
 use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$pg_dir/lib";
+
 use WeBWorK::CourseEnvironment;
 use WeBWorK::DB;
 use WeBWorK::Utils::DBImportExport qw/listTables dbExport dbImport/;
@@ -88,7 +89,7 @@ usage() unless $course and $command and $file;
 
 my $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
-	courseName => $course,
+	courseName  => $course,
 });
 
 my $db = WeBWorK::DB->new($ce->{dbLayout});
diff --git a/bin/wwsh b/bin/wwsh
index bcea2a1d01..1fc5477fa9 100755
--- a/bin/wwsh
+++ b/bin/wwsh
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -23,19 +23,18 @@ wwsh - command-line interface to the WeBWorK libraries.
 use strict;
 use warnings;
 
-
-my $pg_dir;
 BEGIN {
-	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
-	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
-	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
+	use Mojo::File qw(curfile);
+	use Env qw(WEBWORK_ROOT);
+
+	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
 
 our $ce;
 our $db;
 
 use lib "$ENV{WEBWORK_ROOT}/lib";
-use lib "$pg_dir/lib";
+
 use WeBWorK::CourseEnvironment;
 use WeBWorK::DB;
 use Data::Dumper;
@@ -51,7 +50,7 @@ die 'You must pass scriptFile in as a path to the file' unless -e $scriptFile;
 
 $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
-	courseName => $courseID,
+	courseName  => $courseID,
 });
 
 
diff --git a/clients/README b/clients/README
deleted file mode 100644
index 9c490b7bdc..0000000000
--- a/clients/README
+++ /dev/null
@@ -1,73 +0,0 @@
-2010.05.11
-
-At this point renderProblem.pl is the most up to date and works with BBedit to 
-to send a local file to an xmlserver (mod_xmlrpc) to be rendered.  In addition the returned'
-file's question form action url is pointed to the same server with the path ending in xml2html.
-This allows one to enter answers and test whether they work.  
-
-There were changes to webwork2/lib/WebworkWebservice.pm to make it work with Apache2.  
-There were also changes to webwork2/lib/WeBWorK/URLpath.pm  and a new 
-module webwork2/lib/WeBWorK/ContentGenerator/xmlViaHTTP.pm
-
-The webwork_xmplrp_client and webwork_soap_client.pl have not been updated, but may still work.
-
-to do:
-    •add facilities for inspecting libraries via xmlrpc and html2xml links
-    •figure out how to automate the configuration of these xmlrpc files
-         Apache2::ServerUtil should do this??  but I can't figure out how.
-    •I suspect that auxiliary html files and applets don't work yet.
-    
-    I'm pretty sure that there is no security checking to insure that only appropriate 
-    people have access to the xmlrpc webservice.
-##############################################################################################
-
-
-These test clients will process these two commands:
-
-./webwork_xmlrpc_client.pl renderProblem  input.txt >foo.txt
-./webwork_xmlrpc_client.pl listLibraries
-or
-
-./webwork_soap_client.pl renderProblem  input.txt >foo.txt
-./webwork_soap_client.pl listLibraries
-
-
-You may need to adjust some hardwired parameters in the scripts so that
-you are pointed at the correct servers. :-)
-
-The scripts hello_world_xmlrpc.pl and hello_world_soap.pl  take no arguments
-and can be used to test the connection with the chosen servers.
-
-The scripts renderProblem.pl and renderProblem_rawoutput.pl are versions of the 
-xmlrpc_xmlrp_client which can be used as filters.  The were designed to be used with
-bbedit (Mac editor) to send a PG problem file of to a webservice to be rendered.
-
-The renderProblem_rawoutput version decodes the xml response and prints it as perl structures
-through "less".
-
-The renderProblem.pl pipes the HTML part of the response through safari (other browsers could
-be used) for viewing. This is usually what is wanted for testing.  Currently the error recovery
-is minimal, so error messages sent from the server may totally confuse the client (which
-will probably report a bad result type). The resulting web page is live and pointed
-to a responder at webhost.math.rochester.edu.  When that server is working you can
-actually submit an answer and have it evaluated.  It's a very old, tired PC running 
-Frontier as a server, so be patient with it. :-)
-
-
-checkProblem.pl will take a problem source, send it to the webserver for checking
-and record the result in a log file.  It is very similar to renderProblem.pl.
-
-check_problems_in_dir.sh will apply checkProblem.pl to all .pg problems found
-underneath the current directory in which the command is executed.  I've used
-it to check  all the problems in a directory for warning errors.  There are more
-subtle checks that could be made, such as checking to see that correct
-answers work. 
-
-Typically one downloads a problem library from the SVN 
-and then uses check_problems_in_dir.sh to walk through it.  By modifying
-checkProblems and webwork_xmlrpc_inc.pl one could have the HTML version
-of each problem dumped to a text file, or by changing the DISPLAYMODE to 
-"tex" instead of image one could dump the TeX version of each file.
-
-
--- Mike Gage 1/1/2007
diff --git a/clients/hello_world_apps/hello_world_soap_client.pl b/clients/hello_world_apps/hello_world_soap_client.pl
deleted file mode 100755
index 3b669c673b..0000000000
--- a/clients/hello_world_apps/hello_world_soap_client.pl
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/perl -w
-
-
-use SOAP::Lite;
-my $soap = SOAP::Lite
-#-> uri('http://math.webwork.rochester.edu/WebworkXMLRPC')
-#-> proxy('https://math.webwork.rochester.edu/mod_soap/WebworkWebservice');
--> uri('http://localhost/WebworkXMLRPC')
--> proxy('http://localhost/mod_soap/WebworkWebservice');
-
-#-> uri('https://devel.webwork.rochester.edu:8002/WebworkXMLRPC')
-#-> proxy('https://devel.webwork.rochester.edu:8002/mod_soap/WebworkWebservice');
-
-
-my $result = $soap->hi();
-
-unless ($result->fault) {
-	print $result->result();
-} else {
-	print join ', ',
-  	$result->faultcode,
-  	$result->faultstring;
-}
-
-
diff --git a/clients/hello_world_apps/hello_world_xmlrpc_client.pl b/clients/hello_world_apps/hello_world_xmlrpc_client.pl
deleted file mode 100755
index 200f34dbd8..0000000000
--- a/clients/hello_world_apps/hello_world_xmlrpc_client.pl
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/perl -w
-
-#
-use XMLRPC::Lite;
-  my $soap = XMLRPC::Lite
-   # -> proxy('https://math.webwork.rochester.edu/mod_xmlrpc/');
-   #-> proxy('https://devel.webwork.rochester.edu:8002/mod_xmlrpc/');
-    -> proxy('http://localhost/mod_xmlrpc/');
-  
-	
-  my $result = $soap->call("WebworkXMLRPC.hi");
-  
-
-  unless ($result->fault) {
-    print $result->result(),"\n";
-  } else {
-    print join ', ',
-      $result->faultcode,
-      $result->faultstring;
-  }
diff --git a/clients/hello_world_apps/webwork_soap_client.pl b/clients/hello_world_apps/webwork_soap_client.pl
deleted file mode 100755
index 3ed075c12d..0000000000
--- a/clients/hello_world_apps/webwork_soap_client.pl
+++ /dev/null
@@ -1,275 +0,0 @@
-#!/usr/bin/perl -w
-
-use SOAP::Lite;
-	
-#  configuration section
-use constant  HOSTURL  =>  'localhost'; 
-use constant  HOSTPORT =>  80;
-use constant  TRANSPORT_METHOD => 'SOAP::Lite';
-use constant  REQUEST_CLASS =>'WebworkXMLRPC';  # WebworkXMLRPC is used for soap also!!
-use constant  REQUEST_URI   =>'mod_soap';
-
-my @COMMANDS = qw( listLibraries    renderProblem  ); #listLib  readFile tex2pdf
-
-# $pg{displayModes} = [
-# 	"plainText",     # display raw TeX for math expressions
-# 	"images",        # display math expressions as images generated by dvipng
-# 	"jsMath",        # render TeX math expressions on the client side using jsMath
-# ];
-use constant DISPLAYMODE   => 'images';
-
-# end configuration section
-use MIME::Base64 qw( encode_base64 decode_base64);
-
-
-print STDERR "inputs are ", join (" | ", @ARGV), "\n";
-our $source;
-
-if (@ARGV) {
-    my $command = $ARGV[0];
-    
-    warn "executing WebworkXMLRPC.$command";
-    $source = (defined $ARGV[1]) ? `cat $ARGV[1]` : '' ;
-	xmlrpcCall($command);
-
-
-} else {
-
-	print STDERR "Useage: ./webwork_soap_client.pl command   inputs\n";
-	print STDERR "For example: ./webwork_soap_client renderProblem   input.txt\n";
-	print STDERR "For example: ./webwork_soap_client listLibraries   \n";
-	print STDERR "Commands are: ", join(" ", @COMMANDS), "\n";
-	
-}
-
-
-
-sub xmlrpcCall {
-	my $command = shift;
-	$command   = 'listLibraries' unless $command;
-
-	  my $requestResult = TRANSPORT_METHOD
-	        ->uri('http://'.HOSTURL.':'.HOSTPORT.'/'.REQUEST_CLASS)
-			-> proxy('http://'.HOSTURL.':'.HOSTPORT.'/'.REQUEST_URI);
-		
-	  my $test = [3,4,5,6];     
-	  my $input = setInputTable();
-	  print "displayMode=",$input->{envir}->{displayMode},"\n";
-	  local( $result);
-	  # use eval to catch errors
-	  eval { $result = $requestResult->call("$command",$input) };
-	  print STDERR "There were a lot of errors\n" if $@;
-	  print "Errors: \n $@\n End Errors\n" if $@;
-	
-	  print "result is|", ref($result),"|";
-	
-	  unless (ref($result) and $result->fault) {
-	  
-	  	if (ref($result->result())=~/HASH/ and defined($result->result()->{text}) ) {
-	  		$result->result()->{text} = decode_base64($result->result()->{text});
-	  	}
-		print  pretty_print_rh($result->result()),"\n";  #$result->result()
-	  } else {
-		print 'oops ', join ', ',
-		  $result->faultcode,
-		  $result->faultstring;
-	  }
-}
-  
-sub source {
-	encode_base64($source);
-}
-sub pretty_print_rh { 
-    shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
-	my $rh = shift;
-	my $indent = shift || 0;
-	my $out = "";
-	my $type = ref($rh);
-
-	if (defined($type) and $type) {
-		$out .= " type = $type; ";
-	} elsif (! defined($rh )) {
-		$out .= " type = UNDEFINED; ";
-	}
-	return $out." " unless defined($rh);
-	
-	if ( ref($rh) =~/HASH/ or "$rh" =~/HASH/ ) {
-	    $out .= "{\n";
-	    $indent++;
- 		foreach my $key (sort keys %{$rh})  {
- 			$out .= "  "x$indent."$key => " . pretty_print_rh( $rh->{$key}, $indent ) . "\n";
- 		}
- 		$indent--;
- 		$out .= "\n"."  "x$indent."}\n";
-
- 	} elsif (ref($rh)  =~  /ARRAY/ or "$rh" =~/ARRAY/) {
- 	    $out .= " ( ";
- 		foreach my $elem ( @{$rh} )  {
- 		 	$out .= pretty_print_rh($elem, $indent);
- 		
- 		}
- 		$out .=  " ) \n";
-	} elsif ( ref($rh) =~ /SCALAR/ ) {
-		$out .= "scalar reference ". ${$rh};
-	} elsif ( ref($rh) =~/Base64/ ) {
-		$out .= "base64 reference " .$$rh;
-	} else {
-		$out .=  $rh;
-	}
-	
-	return $out." ";
-}
-
-sub setInputTable_for_listLib {
-	$out = {
-		#password    =>  'geometry',
-		pw          =>   'geometry',
-		set         =>   'set0',
-		library_name =>  'rochesterLibrary',
-		command      =>  'all',
-	};
-
-	$out;
-}
-sub setInputTable {
-	$out = {
-		#password    =>  'geometry',
-		pw          =>   'geometry',
-		set         =>   'set0',
-		library_name =>  'rochesterLibrary',
-		command      =>  'all',
-		answer_form_submitted   => 1,
-		course                  => 'daemon_course',
-		extra_packages_to_load  => [qw( AlgParserWithImplicitExpand Expr
-		                                ExprWithImplicitExpand AnswerEvaluator
-		                                AnswerEvaluatorMaker 
-		)],
-		mode                    => 'HTML_dpng',
-		modules_to_evaluate     => [ qw( 
-Exporter
-
-DynaLoader
-
-								
-GD
-WWPlot
-Fun
-Circle
-Label
-
-								
-PGrandom
-Units
-Hermite
-
-List
-
-								
-Match
-Multiple
-Select
-
-								
-AlgParser
-
-AnswerHash
-
-								
-Fraction
-VectorField
-
-								
-Complex1
-Complex
-
-								
-MatrixReal1 Matrix
-
-								
-Distributions
-
-Regression
-
-		)], 
-		envir                   => environment(),
-		problem_state           => {
-		
-			num_of_correct_ans  => 2,
-			num_of_incorrect_ans => 4,
-			recorded_score       => 1.0,
-		},
-		source                   => source(),  #base64 encoded
-		
-		
-		
-	};
-
-	$out;
-}
-
-sub environment {
-	my $envir = {
-		answerDate  => '4014438528',
-		CAPA_Graphics_URL=>'http://webwork-db.math.rochester.edu/capa_graphics/',
-		CAPA_GraphicsDirectory =>'/ww/webwork/CAPA/CAPA_Graphics/',
-		CAPA_MCTools=>'/ww/webwork/CAPA/CAPA_MCTools/',
-		CAPA_Tools=>'/ww/webwork/CAPA/CAPA_Tools/',
-		cgiDirectory=>'Not defined',
-		cgiURL => 'Not defined',
-		classDirectory=> 'Not defined',
-		courseName=>'Not defined',
-		courseScriptsDirectory=>'/ww/webwork/system/courseScripts/',
-		displayMode=>DISPLAYMODE,
-		dueDate=> '4014438528',
-		externalGif2EpsPath=>'not defined',
-		externalPng2EpsPath=>'not defined',
-		fileName=>'set0/prob1a.pg',
-		formattedAnswerDate=>'6/19/00',
-		formattedDueDate=>'6/19/00',
-		formattedOpenDate=>'6/19/00',
-		functAbsTolDefault=> 0.0000001,
-		functLLimitDefault=>0,
-		functMaxConstantOfIntegration=> 1000000000000.0,
-		functNumOfPoints=> 5,
-		functRelPercentTolDefault=> 0.000001,
-		functULimitDefault=>1,
-		functVarDefault=> 'x',
-		functZeroLevelDefault=> 0.000001,
-		functZeroLevelTolDefault=>0.000001,
-		htmlDirectory =>'/ww/webwork/courses/gage_course/html/',
-		htmlURL =>'http://webwork-db.math.rochester.edu/gage_course/',
-		inputs_ref => {
-				 AnSwEr1 => '',
-				 AnSwEr2 => '',
-				 AnSwEr3 => '',
-		},
-		macroDirectory=>'/ww/webwork/courses/gage_course/templates/macros/',
-		numAbsTolDefault=>0.0000001,
-		numFormatDefault=>'%0.13g',
-		numOfAttempts=> 0,
-		numRelPercentTolDefault => 0.0001,
-		numZeroLevelDefault =>0.000001,
-		numZeroLevelTolDefault =>0.000001,
-		openDate=> '3014438528',
-		PRINT_FILE_NAMES_FOR => [ 'gage'],
-		probFileName => 'set0/prob1a.pg',
-		problemSeed  => 1234,
-		problemValue =>1,
-		probNum => 13,
-		psvn => 54321,
-		psvn=> 54321,
-		questionNumber => 1,
-		scriptDirectory => 'Not defined',
-		sectionName => 'Gage',
-		sectionNumber => 1,
-		sessionKey=> 'Not defined',
-		setNumber =>'MAAtutorial',
-		studentLogin =>'gage',
-		studentName => 'Mike Gage',
-		tempDirectory => '/ww/htdocs/tmp/gage_course/',
-		templateDirectory=>'/ww/webwork/courses/gage_course/templates/',
-		tempURL=>'http://webwork-db.math.rochester.edu/tmp/gage_course/',
-		webworkDocsURL => 'http://webwork.math.rochester.edu/webwork_gage_system_html',
-	};
-	$envir;
-};
diff --git a/clients/hello_world_apps/webwork_xmlrpc_client.pl b/clients/hello_world_apps/webwork_xmlrpc_client.pl
deleted file mode 100755
index 1d838471ff..0000000000
--- a/clients/hello_world_apps/webwork_xmlrpc_client.pl
+++ /dev/null
@@ -1,469 +0,0 @@
-#!/usr/bin/perl -w
-
-=pod
-
-This script will take a command and an input 
-file.
-
-It will list available libraries, list the contents of libraries
-or render the input file.
-
-All of this is done by contacting the webservice.
-
-
-
-=cut
-
-use feature ":5.10";
-use lib "/opt/webwork/webwork2/lib";
-use WebworkClient;
-use XMLRPC::Lite;
-use MIME::Base64 qw( encode_base64 decode_base64);
-
-#  configuration section
-use constant  PROTOCOL         =>  'http';   # or 'http';
-use constant  HOSTURL          =>  'localhost'; 
-use constant  HOSTPORT         =>  '80';  # or 80
-use constant  TRANSPORT_METHOD =>  'XMLRPC::Lite';
-use constant  REQUEST_CLASS    =>  'WebworkXMLRPC';  # WebworkXMLRPC is used for soap also!!
-use constant  REQUEST_URI      =>  'mod_xmlrpc';
-use constant  TEMPOUTPUTFILE   =>  '/Users/gage/Desktop/renderProblemOutput.html';
-
-our	$SITE_URL      =  'http://localhost:80';
-our	$FORM_ACTION_URL  =  'http://localhost:80/webwork2/html2xml';
-our	$XML_PASSWORD     =  'xmlwebwork';
-our	$XML_COURSE       =  'gage_course';
-
-our $UNIT_TESTS_ON             = 0;
-
-####################################################
-# get credentials
-####################################################
-
-my $credential_path;
-my @path_list = ('.ww_credentials', '/Users/gage/.ww_credentials', '/Users/gage/ww_session_credentials');
-foreach my $path (@path_list) {
-	if (-r "$path" ) {
-		$credential_path = $path;
-		last;
-	}
-}
-unless ( $credential_path ) {
-	die <<EOF;
-Can't find path for credentials. Looked in @path_list.
-Place a credential file containing the following information at one of the locations above.
-%credentials = (
-        userID          => "my login name for the webwork course",
-        course_password        => "my course_password ",
-        courseID        => "the name of the webwork course",
-);
-1;
----------------------------------------------------------
-EOF
-}
-
-eval{require $credential_path};
-if ($@  or not defined %credentials) {
-
-print STDERR <<EOF;
-
-The credentials file should contain this:
-%credentials = (
-        userID          => "my login name for the webwork course",
-        course_password        => "my course_password ",
-        courseID        => "the name of the webwork course",
-);
-1;
----------------------------------------------------------
-EOF
-die;
-}
-
-
-#print "credentials: ", join(" | ", %credentials), "\n";
-
-my @COMMANDS = qw( listLibraries    renderProblem   listLib  readFile tex2pdf );
-
-use constant DISPLAYMODE   => 'images';
-
-
-# end configuration section
-
-our $courseID = $credentials{courseID};
-
-print STDERR "inputs are ", join (" | ", @ARGV), "\n";
-our $source;
-
-############################################
-# Build client
-############################################
-our $xmlrpc_client = new WebworkClient (
-	site_url               => $SITE_URL,
-	form_action_url        => $FORM_ACTION_URL,
-	displayMode            => DISPLAYMODE(),
-
-	site_password          =>  $credentials{site_password},
-	courseID               =>  $credentials{courseID},
-	userID                 =>  $credentials{userID},
-	session_key            =>  $credentials{session_key},
-);
-
-# prepare additional input values
-
-
-
-if (@ARGV) {
-    my $command = $ARGV[0];
-    my $result;
-    print  "executing WebworkXMLRPC.$command \n\n-----------------------\n\n";
-    given($command) {
-    	when ('renderProblem') { 
-			if ( defined $ARGV[1])  {
-				if (-r $ARGV[1] ) {
-					 $source = `cat $ARGV[1]`;
-					 $xmlrpc_client->encodeSource($source);
-					 my $input = { 
-							userID      			=> $credentials{userID}||'',
-							session_key	 			=> $credentials{session_key}||'',
-							courseID   				=> $credentials{courseID}||'',
-							courseName   			=> $credentials{courseID}||'',
-							course_password     	=> $credentials{course_password}||'',	
-							site_password   		=> $credentials{site_password}||'',
-					 };
-					 #print STDERR "input is ", %$input,"\n";
-					 $result = $xmlrpc_client->xmlrpcCall($command, $input);
-					 print "\n\n Result of renderProblem \n\n";
-					 print pretty_print_rh($result);
-				} else {
-					print STDERR  "Can't read source file $ARGV[1]\n";
-				}
-			  } else {
-				  print STDERR "Useage: ./webwork_xmlrpc_client.pl command   <file_name>\n";
-			  }
-    	} when ('listLibraries') {
-			 my $input = { 
-					userID      	=> $credentials{userID}||'',
-					session_key	 	=> $credentials{session_key}||'',
-					courseID   	=> $credentials{courseID}||'',
-					course_password     	=> $credentials{course_password}||'',	
-					site_password   => $credentials{site_password}||'',
-			 };
-			# print STDERR "ww_xmlrpc_client: input for listLibraries command is ", %$input,"\n";
-			eval {
-				$result = $xmlrpc_client->xmlrpcCall($command, $input);
-			};
-			if (defined($result) ) {
-				my @lib_array = @ { $result->{ra_out} };
-				print STDOUT "ww_xmlrpc_client: The  libraries available in course $courseID are:\n\t ", join("\n\t ", @lib_array ), "\n";
-			} else {
-				print STDOUT "ww_xmlrpc_client: No libraries available for course $courseID\n";
-			}
-    	} when ('listLib')       {
-			 $result = listLib( @ARGV );
-			 my $command = $ARGV[1];
-			 print "listLib returned\n";
-			 print pretty_print_rh($result);
-			 print "\n";
-    							 	
-    	} when ('listSets')      {
-	 		$input = {		site_password    =>   'xmluser',
-							course_password    	 =>  $credentials{course_password},
-        					userID        	 =>   $credentials{userID},
-        					courseID    	 =>   $credentials{courseID},
-        			 };
-	  		my $result   =   $xmlrpc_client->xmlrpcCall($command, $input);
-	  		print pretty_print_rh($result);
-	  	} when ('readFile') {
-	  		print STDERR "Command $command not yet implemented\n"
-    	} when ('tex2pdf') {
-    		print STDERR "Command $command not yet implemented\n"
-    	} default {
-    		print STDERR "Command '$command' not recognized. Commands ",@COMMANDS;    	
-    	}
-    }
-
-
-	} else {
-
-	print STDERR "Useage: ./webwork_xmlrpc_client.pl command   [file_name]\n";
-	print STDERR "For example: ./webwork_xmlrpc_client.pl renderProblem   <source file: e.g.  input.txt, bad_input.txt \n";
-	print STDERR "For example: ./webwork_xmlrpc_client.pl  listLibraries   \n";
-	print STDERR "For example: ./webwork_xmlrpc_client.pl listLib all \n";
-	print STDERR "For example: ./webwork_xmlrpc_client.pl listLib setsOnly \n";
-	print STDERR "For example: ./webwork_xmlrpc_client.pl listLib listSet <setID: e.g. set0> \n";
-	print STDERR "Commands are: ", join(" ", @COMMANDS), "\n";
-	
-}
-
-
-
-
-sub source {
-	return "" unless $source;
-	return encode_base64($source);
-}
-sub listLib {
-	my @ARGS = @_;
-	#print "args for listLib are ", join(" ", @ARGS), "\n";
-	my $result;
-	given($ARGS[1]) { 
-		when ("all") { 
-			$input = {					site_password    	 =>   'xmluser',
-										course_password    	 =>   $credentials{course_password},
-        								userID        	 	 =>   $credentials{userID},
-        								courseID    	 	 =>   $credentials{courseID},
-        								command     	 	 =>   'all',
-        						};
-        	$result = $xmlrpc_client->xmlrpcCall("listLib", $input);
-        } 
-        when ('dirOnly') { 
-            my %options = @ARGS[2..$#ARGS];
-            my $path = $options{-path} || '';
-            my $maxdepth = defined($options{-depth}) ? $options{-depth}: 10000;
-        	$input = {					site_password    =>   'xmluser',
-										course_password    	 =>   $credentials{course_password},
-        								userID        	 =>   $credentials{userID},
-        								courseID    	 =>   $credentials{courseID},
-        								command     	 =>   'dirOnly',
-        								dirPath          =>   $path,
-        								maxdepth         =>   $maxdepth,
-        						};
-        	$result = $xmlrpc_client->xmlrpcCall("listLib", $input);
-        } 
-        when('files') { 
-			if ($ARGS[2]  ) { 
-				my %options = @ARGS[2..$#ARGS];
-            	my $path    = $options{-path} || ''; 
-				$input = {		site_password    		=>   'xmluser',
-								course_password    	 	=>   $credentials{course_password},
-								userID        	 		=>   $credentials{userID},
-								courseID    	 		=>   $credentials{courseID},
-								command     	 		=>   'files',
-								dirPath          		=>   $path,
-							};
-				$result = $xmlrpc_client->xmlrpcCall("listLib", $input);
-			} else {
-				print STDERR "Usage:  webwork_xmlrpc_client listLib files  <path to directory >\n";
-				$result = "";							
-       		}
-       	} 
-       	default {print "The possible arguments for listLib are:".  
-		                "\n\t all -- print all paths". 
-		                "\n\t dirOnly [options]-- print only directories below Library/path".
-		                "\n\t\t options:  -depth depth  -path directoryPath".
-		                "\n\t\t\t depth counts the number of slashes in the relative path".
-		                "\n\t files <path_to_directory> -- print .pg files in the given directory \n".
-		                "\n\t\t options:    -path directoryPath";
-		          $result = "";
-		}
-	}
-	return $result;
-}
-sub pretty_print_rh { 
-    shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
-	my $rh = shift;
-	my $indent = shift || 0;
-	my $out = "";
-	my $type = ref($rh);
-
-	if (defined($type) and $type) {
-		$out .= " type = $type; ";
-	} elsif (! defined($rh )) {
-		$out .= " type = UNDEFINED; ";
-	}
-	return $out." " unless defined($rh);
-	
-	if ( ref($rh) =~/HASH/ or "$rh" =~/HASH/ ) {
-	    $out .= "{\n";
-	    $indent++;
- 		foreach my $key (sort keys %{$rh})  {
- 			$out .= "  "x$indent."$key => " . pretty_print_rh( $rh->{$key}, $indent ) . "\n";
- 		}
- 		$indent--;
- 		$out .= "\n"."  "x$indent."}\n";
-
- 	} elsif (ref($rh)  =~  /ARRAY/ or "$rh" =~/ARRAY/) {
- 	    $out .= " ( ";
- 		foreach my $elem ( @{$rh} )  {
- 		 	$out .= pretty_print_rh($elem, $indent);
- 		
- 		}
- 		$out .=  " ) \n";
-	} elsif ( ref($rh) =~ /SCALAR/ ) {
-		$out .= "scalar reference ". ${$rh};
-	} elsif ( ref($rh) =~/Base64/ ) {
-		$out .= "base64 reference " .$$rh;
-	} else {
-		$out .=  $rh;
-	}
-	
-	return $out." ";
-}
-
-sub pretty_print_json { 
-    shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
-	my $rh = shift;
-	my $indent = shift || 0;
-	my $out = "";
-	my $type = ref($rh);
-
-	if (defined($type) and $type) {
-		$out .= " type = $type; ";
-	} elsif (! defined($rh )) {
-		$out .= " type = UNDEFINED; ";
-	}
-	return $out." " unless defined($rh);
-	
-	if ( ref($rh) =~/HASH/ or "$rh" =~/HASH/ ) {
-	    $out .= "{\n";
-	    $indent++;
- 		foreach my $key (sort keys %{$rh})  {
- 			$out .= "  "x$indent."$key => " . pretty_print_json( $rh->{$key}, $indent ) . "\n";
- 		}
- 		$indent--;
- 		$out .= "\n"."  "x$indent."}\n";
-
- 	} elsif (ref($rh)  =~  /ARRAY/ or "$rh" =~/ARRAY/) {
- 	    $out .= " ( ";
- 		foreach my $elem ( @{$rh} )  {
- 		 	$out .= pretty_print_json($elem, $indent);
- 		
- 		}
- 		$out .=  " ) \n";
-	} elsif ( ref($rh) =~ /SCALAR/ ) {
-		$out .= "scalar reference ". ${$rh};
-	} elsif ( ref($rh) =~/Base64/ ) {
-		$out .= "base64 reference " .$$rh;
-	} else {
-		my $jsonString = $rh;
-		$jsonString =~ s/(\\|\/)/\./g;
-		$out .=  "Library.".$jsonString.";";
-	}
-	
-	return $out." ";
-}
-
-
-sub standard_input {
-	$out = {
-		site_password           		=>   'xmluser',
-		course_password      			=>   $credentials{course_password},
-		userID          				=>   $credentials{userID},
-		set               				=>   'set0',
-		library_name 					=>  'Library',
-		command      					=>  'all',
-		answer_form_submitted   		=> 1,
-		courseID                 		=> $credentials{courseID},,
-		extra_packages_to_load  		=> [qw( AlgParserWithImplicitExpand Expr
-		                                ExprWithImplicitExpand AnswerEvaluator
-		                                AnswerEvaluatorMaker 
-		)],
-		mode                    		=> DISPLAYMODE(),
-		modules_to_evaluate     		=> [ qw( 
-Exporter
-DynaLoader								
-GD
-WWPlot
-Fun
-Circle
-Label								
-PGrandom
-Units
-Hermite
-List								
-Match
-Multiple
-Select							
-AlgParser
-AnswerHash							
-Fraction
-VectorField							
-Complex1
-Complex							
-MatrixReal1 Matrix							
-Distributions
-Regression
-
-		)], 
-		envir                   => environment(),
-		problem_state           => {
-		
-			num_of_correct_ans  => 2,
-			num_of_incorrect_ans => 4,
-			recorded_score       => 1.0,
-		},
-		source                   => source(),  #base64 encoded
-		
-		
-		
-	};
-
-	$out;
-}
-
-sub environment {
-	my $envir = {
-		answerDate  => '4014438528',
-		CAPA_Graphics_URL=>'http://webwork-db.math.rochester.edu/capa_graphics/',
-		CAPA_GraphicsDirectory =>'/ww/webwork/CAPA/CAPA_Graphics/',
-		CAPA_MCTools=>'/ww/webwork/CAPA/CAPA_MCTools/',
-		CAPA_Tools=>'/ww/webwork/CAPA/CAPA_Tools/',
-		cgiDirectory=>'Not defined',
-		cgiURL => 'Not defined',
-		classDirectory=> 'Not defined',
-		courseName=>'Not defined',
-		courseScriptsDirectory=>'/ww/webwork/system/courseScripts/',
-		displayMode=>DISPLAYMODE,
-		dueDate=> '4014438528',
-		externalGif2EpsPath=>'not defined',
-		externalPng2EpsPath=>'not defined',
-		fileName=>'set0/prob1a.pg',
-		formattedAnswerDate=>'6/19/00',
-		formattedDueDate=>'6/19/00',
-		formattedOpenDate=>'6/19/00',
-		functAbsTolDefault=> 0.0000001,
-		functLLimitDefault=>0,
-		functMaxConstantOfIntegration=> 1000000000000.0,
-		functNumOfPoints=> 5,
-		functRelPercentTolDefault=> 0.000001,
-		functULimitDefault=>1,
-		functVarDefault=> 'x',
-		functZeroLevelDefault=> 0.000001,
-		functZeroLevelTolDefault=>0.000001,
-		htmlDirectory =>'/ww/webwork/courses/gage_course/html/',
-		htmlURL =>'http://webwork-db.math.rochester.edu/gage_course/',
-		inputs_ref => {
-				 AnSwEr1 => '',
-				 AnSwEr2 => '',
-				 AnSwEr3 => '',
-		},
-		macroDirectory=>'/ww/webwork/courses/gage_course/templates/macros/',
-		numAbsTolDefault=>0.0000001,
-		numFormatDefault=>'%0.13g',
-		numOfAttempts=> 0,
-		numRelPercentTolDefault => 0.0001,
-		numZeroLevelDefault =>0.000001,
-		numZeroLevelTolDefault =>0.000001,
-		openDate=> '3014438528',
-		PRINT_FILE_NAMES_FOR => [ 'gage'],
-		probFileName => 'set0/prob1a.pg',
-		problemSeed  => 1234,
-		problemValue =>1,
-		probNum => 13,
-		psvn => 54321,
-		psvn=> 54321,
-		questionNumber => 1,
-		scriptDirectory => 'Not defined',
-		sectionName => 'Gage',
-		sectionNumber => 1,
-		sessionKey=> 'Not defined',
-		setNumber =>'MAAtutorial',
-		studentLogin =>'gage',
-		studentName => 'Mike Gage',
-		tempDirectory => '/ww/htdocs/tmp/gage_course/',
-		templateDirectory=>'/ww/webwork/courses/gage_course/templates/',
-		tempURL=>'http://webwork-db.math.rochester.edu/tmp/gage_course/',
-		webworkDocsURL => 'http://webwork.math.rochester.edu/webwork_gage_system_html',
-	};
-	$envir;
-};
diff --git a/clients/pr b/clients/pr
deleted file mode 100755
index 20036afe17..0000000000
--- a/clients/pr
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# inside the docker container
-# this can be called from vim with :w ! ./pr
-
-# it sends the contents of the buffer to /var/www/html/xmlrpc_out.html aka localhost:8080/xmlrpc_output.html
-
-./sendXMLRPC.pl -h - >/var/www/html/xmlrpc_out.html
-
-# process STDIN with sendXMLRPC.p and send it to /var/www/html/xmlrpc_out.html  
-# where it can be read at localhost:8080/xmlrpc_out.html
-
-
-# Not sure how to get rid of the ./
-
-# This can also be called from the command line with   cat t/input.pg |./pr
diff --git a/clients/sendXMLRPC.pl b/clients/sendXMLRPC.pl
deleted file mode 100755
index 5e6e141f20..0000000000
--- a/clients/sendXMLRPC.pl
+++ /dev/null
@@ -1,1544 +0,0 @@
-#!/usr/bin/perl -w
-
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-=head1 NAME
-
-webwork2/clients/sendXMLRPC.pl
-
-=head1 DESCRIPTION
-
-
-This module provides functions for rendering html from files outside the normal
-context of providing a webwork homework set user  an existing problem set.
-
-It can be used to create a live version of a single problem, one that is not
-part of any set, and can facilitate editing these problems outside of the 
-context of WeBWorK2. 
-
-This script will take a list of files or directories
-and send it to a WeBWorK daemon webservice
-to have it rendered.  For directories each .pg file under that 
-directory is rendered. 
-
-The results can be displayed in a browser (use -b or -B switches) as was
-done with renderProblem.pl, on the command line (Use -h or -H switches) as
-was done with renderProblem_rawoutput.pl or summary information about whether the 
-problem was correctly rendered can be sent to a log file (use -c or C switches).
-
-The capital letter switches, -B, -H, and -C render the question twice.  The first
-time returns an answer hash which contains the correct answers. The question is
-then resubmitted to the renderer with the correct answers filled in and displayed.  
-
-IMPORTANT: Create a valid credentials file (a sample file ww_credentials.dist is provided).
-	(See below.)
-	Locations where this file can be located:
-		"$ENV{HOME}/.ww_credentials"
-		"$ENV{HOME}/ww_session_credentials"
-		'ww_credentials'
-		'ww_credentials.dist'
-	The file sets the remove server and the local display/edit commands.
-
-IMPORTANT: Remember to configure:
-	1. the local output file (near the top of this script)
-	2. the display commands (in the ww_credentials file)
-	3. the remote server to contact (in the ww_credentials file)
-   Things will NOT work until the configuration is done.
-
-This script is similar to standalonePGproblemRenderer.pl. It does not require a local WeBWorK site
-on the same computer but does require an internet connection to a remote WeBWorK site.
-
-=cut
-
-=head1    SYNOPSIS
-
-	sendXMLRPC -vcCbB input.pg 
-
-=head1   DETAILS
-
-=head2 credentials file
-    
-    These locations are searched, in order,  for the credentials file.
-    ("$ENV{HOME}/.ww_credentials", "$ENV{HOME}/ww_session_credentials", 'ww_credentials', 'ww_credentials.dist')
-    
-    Place a credential file containing the following information at one of the locations above 
-    or create a file with this information and specify it with the --credentials option.
-
-  # Cut here - top =============================================
-
-  # The sample settings below should be customized for your server and local system
-
-  %credentials = (
-    # Set the URLs of the remote site and the site password
-
-	# Test settings for the demo.webwork.rochester.edu site
-        site_url        => 'https://demo.webwork.rochester.edu',
-	form_action_url => 'https://demo.webwork.rochester.edu/webwork2/html2xml',
-        site_password   => 'xmlrpc',
-
-	# Settings for use with a local webwork system (ex. via Docker)
-	# site_url        => 'http://localhost:80',
-	# form_action_url => 'http://localhost:80/webwork2/html2xml',
-	# site_password   => 'xmlrpc',
-	# forcePortNumber => '80',   # A port number to be forced, when needed.
-
-    # Set the identification credential used by the "daemon_course" on the remote site
-        courseID        => "daemon_course",
-        userID          => "daemon",
-        course_password => "daemon",
-    # Set the display mode to use
-        ww_display_mode   => "MathJax",
-    # Set the path to the LOCAL log file (make sure to create an empty file)
-	# when commented out - no file is needed
-	# path_to_log_file =>"",
-    # Set the display commands which work on the machine on which you are
-    # running sendXMLRPC.pl
-	# Sample settings for Mac:
-
-        # html_display_command   => "open -a 'Google Chrome' ", # A web browser
-	# html_display_command   => "open -a Firefox ",
-	# tex_display_command    => "open -a 'TeXShop'",	# Editor or TeX editor
-	# pdf_display_command    => "open -a 'Preview'",	# PDF viewer
-	# hash_display_command   => "cat ", 			# to diplay file to STDOUT
-
-	# ==============================
-
-	# Sample settings for Linux:
-
-	# html_display_command => "firefox", 			# A web browser
-	# html_display_command => "google-chrome",
-	# tex_display_command  => "vim",				# Editor or TeX editor
-	# tex_display_command  => "emacs",
-	# pdf_display_command  => "xpdf",				# PDF viewer
-	# pdf_display_command  => "evince",
-	# pdf_display_command  => "acroread",			# PDF viewer
-	# hash_display_command => "cat ",			# to diplay file to STDOUT
-  );
-
-  # Cut here - bottom =============================================
-    
-
-=cut
-
-=head2 Options
-
-=over 4
-
-=item  -a  
-
-	Displays the answer hashes returned by the question on the command line.
-
-=item  -A  
-
-	Same as -a but renders the question with the correct answers submitted.
-
-=item  -b  
-
-	Display the rendered question in a browser (specified by the DISPLAY_HTML_COMMAND variable).
-
-=item  -B  
-
-	Same as -b but renders the question with the correct answers submitted. 
-	The evaluation of the answer submitted is displayed as well as the correct
-	answer. 
-
-=item  -h  
-
-	Prints to STDOUT the entire object returned by 
-    the webwork_client xmlrpc request.
-    This includes the answer information displayed by -a and -A and much more.
-
-=item  -H  
-
-	Same as -h but renders the question with the correct answers submitted
-
-=item	-c 
-
-	"check" -- Record success or failure of rendering the question to a log file. 
-
-=item	-C 
-
-	Same as -c but the question is rendered with the correct answers submitted. 
-    This succeeds only if the correct answers, as determined from the answer hash, all succeed.
-
-=item	-f formatName
-
-	Specify the format used by the browser in displaying the question. 
-         Choices for s are
-         standard
-         sticky
-         debug 
-         simple
-         
-=item -l lang
-
-	Set a language for the HTML rendering to use. Should use a value which would be valid for a course.
-
-=item	-v 
-
-	Verbose output. Used mostly for debugging. 
-    In particular it displays explicitly the correct answers 
-    which are (will be)  submitted to the question.
-    
-=item   -e
-
-	Open the source file in an editor. 
-	
-=item   --tex
-
-	Process question in TeX mode and output to the command line
-
-=item   --pdf 
-
-	Process question in TeX mode, convert to PDF and display.
-	
-=item   --json
-
-	Process question in JSON mode and save to file
-=item   
-
-	The single letter options can be "bundled" e.g.  -vcCbB
-	
-=item  --list   pg_list
-
-	Read and process a list of .pg files contained in the file C<pg_list>.  C<pg_list>
-	consists of a sequence of lines each of which contains the full path to a pg
-	file that should be processed. (For example this might be the output from an
-	earlier run of sendXMLRPC using the -c flag. )
-
-=item	--pg 
-
-	Triggers the printing of the all of the variables available to the PG question. 
-    The table appears within the question content. Use in conjunction with -b or -B.
-
-=item	--anshash 
-
-	Prints the answer hash for each answer in the PG_debug output which appears below
-    the question content. Use in conjunction with -b or -B. 
-    Similar to -a or -A but the output appears in the browser and 
-    not on the command line. 
-
-=item	--ansgrp  	
-
-	Prints the PGanswergroup for each answer evaluator. The information appears in 
-    the PG_debug output which follows the question content.  Use in conjunction with -b or -B.
-    This contains more information than printing the answer hash. (perhaps too much). 
-
-=item   --resource
-
-	Prints the resources used by the question. The information appears in 
-    the PG_debug output which follows the question content.  Use in conjunction with -b or -B.
-
-=item	--credentials=s
-
- 	Specifies a file s where the  credential information can be found.
-
-=item	--help
-
-       Prints help information. 
-       
-=item  --log 
-
-       Sets path to log file
-
-=item  --seed=s     
-                 
-       Sets problemSeed to the number contained in string s
-
-=item  --psvn=s
-
-       Sets psvn to the number contained in string s
-
-
-
-=back
-=cut
-
-use strict;
-use warnings;
-
-
-#######################################################
-# Find the webwork2 root directory
-#######################################################
-BEGIN {
-	use File::Basename;
-	$main::dirname = dirname(__FILE__);
-}
-
-use lib "$main::dirname";
-print "home directory ".$main::dirname."\n";
-#use lib "."; # is this needed?
-
-# some files such as FormatRenderedProblem.pm may need to be in the same directory
-
-
-BEGIN {
-        die "WEBWORK_ROOT not found in environment. \n
-             WEBWORK_ROOT can be defined in your .cshrc or .bashrc file\n
-             It should be set to the webwork2 directory (e.g. /opt/webwork/webwork2)"
-                unless exists $ENV{WEBWORK_ROOT};
-	# Unused variable, but define it twice to avoid an error message.
-	$WeBWorK::Constants::WEBWORK_DIRECTORY = $ENV{WEBWORK_ROOT};
-	$WeBWorK::Constants::PG_DIRECTORY      = "$ENV{WEBWORK_ROOT}/../pg/";
-	unless (-r $WeBWorK::Constants::WEBWORK_DIRECTORY ) {
-		die "Cannot read webwork root directory at $WeBWorK::Constants::WEBWORK_DIRECTORY";
-	}
-	unless (-r $WeBWorK::Constants::PG_DIRECTORY ) {
-		die "Cannot read webwork pg directory at $WeBWorK::Constants::PG_DIRECTORY";
-	}
-
-}
-use lib "$WeBWorK::Constants::WEBWORK_DIRECTORY/lib";
-
-
-use Carp;
-use LWP::Protocol::https;
-use Time::HiRes qw/time/;
-use MIME::Base64 qw( encode_base64 decode_base64);
-use Getopt::Long qw[:config no_ignore_case bundling];
-use File::Find;
-use FileHandle;
-use File::Path;
-use File::Temp qw/tempdir/;
-use String::ShellQuote;
-use Cwd 'abs_path';
-use WebworkClient;
-use FormatRenderedProblem;
-#use Proc::ProcessTable; # use in standalonePGproblemRenderer
-
-use 5.10.0;
-$Carp::Verbose = 1;
-
-
-### verbose output when UNIT_TESTS_ON =1;
-our $UNIT_TESTS_ON = 0;
-
-############################################################
-# Read command line options
-############################################################
-
-my $display_ans_output1 = '';
-my $display_hash_output1 = '';
-my $display_html_output1 = '';
-my $record_ok1 = '';  # subroutine needs to be constructed
-my $display_ans_output2 = '';
-my $display_hash_output2 = '';
-my $display_html_output2 = '';
-my $record_ok2 = '';
-my $verbose = '';
-my $credentials_path;
-my $format = 'standard';
-my $lang = 'en';
-my $edit_source_file = '';
-my $display_tex_output='';
-my $display_pdf_output='';
-my $display_json_output='';
-my $print_answer_hash;
-my $print_answer_group;
-my $print_pg_hash;
-my $print_resource_hash;
-my $print_help_message;
-my $read_list_from_this_file;
-my $path_to_log_file;
-my $problemSeed;
-my $psvn;
-
-our %credentials;
-our @path_list;
-my $credentials_string;
-
-
-GetOptions(
-	'a' 		=> \$display_ans_output1,
-	'A' 		=> \$display_ans_output2,
-	'b' 		=> \$display_html_output1,
-	'B' 		=> \$display_html_output2,
-	'h' 		=> \$display_hash_output1,
-	'H' 		=> \$display_hash_output2,
-	'c' 		=> \$record_ok1, # record_problem_ok1 needs to be written
-	'C' 		=> \$record_ok2,
-	'v' 		=> \$verbose,
-	'e' 		=> \$edit_source_file,
-	'tex' 		=> \$display_tex_output,
-	'pdf' 		=> \$display_pdf_output,
-	'json'		=> \$display_json_output,
-	'list=s' 	=>\$read_list_from_this_file,   # read file containing list of full file paths
-	'pg' 		=> \$print_pg_hash,
-	'anshash' 	=> \$print_answer_hash,
-	'ansgrp'  	=> \$print_answer_group,
-	'resource'      => \$print_resource_hash,
-	'f=s' 		=> \$format,
-	'l=s'		=> \$lang,
-	'credentials=s' => \$credentials_path,
-	'help'          => \$print_help_message,
-	'log=s'         => \$path_to_log_file,
-	'seed=s'        => \$problemSeed,   
-	'psvn=s'	=> \$psvn,
-);
-
-print_help_message() if $print_help_message;
-
-############################################################
-# End Read command line options
-############################################################
-
-
-################################################################################
-
-# Move up the reading of credential files to here in order to get
-# WEBWORK_URL defined before it is needed. (For Docker installs when
-# called from outside Docker, it may not be in the environment variables.)
-
-
-
-####################################################
-# get credentials
-####################################################
-
-# credentials are needed
-# credentials file location -- search for one of these files 
-
-
-@path_list = ("$ENV{HOME}/.ww_credentials", "$ENV{HOME}/ww_session_credentials", 'ww_credentials', 'ww_credentials.dist');
-
-$credentials_string = <<EOF;
-
-The credentials file should contain something like this:
-
-  %credentials = (
-    # Set the URLs of the remote site and the site password
-
-	# Test settings for the demo.webwork.rochester.edu site
-        site_url        => 'https://demo.webwork.rochester.edu',
-	form_action_url => 'https://demo.webwork.rochester.edu/webwork2/html2xml',
-        site_password   => 'xmlrpc',
-
-	# Settings for use with a local webwork system (ex. via Docker)
-	# site_url        => 'http://localhost:80',
-	# form_action_url => 'http://localhost:80/webwork2/html2xml',
-	# site_password   => 'xmlrpc',
-	# forcePortNumber => '80',   # A port number to be forced, when needed.
-
-
-    # Set the identification credential used by the "daemon_course" on the remote site
-        courseID        => "daemon_course",
-        userID          => "daemon",
-        course_password => "daemon",
-    # Set the display mode to use
-        ww_display_mode   => "MathJax",
-    # Set the path to the LOCAL log file (make sure to create an empty file)
-	# when commented out - no file is needed
-	# path_to_log_file =>"",
-    # Set the display commands which work on the machine on which you are
-    # running sendXMLRPC.pl
-	# Sample settings for Mac:
-
-
-  # html_display_command   => "open -a 'Google Chrome' ", # A web browser
-
-	# html_display_command   => "open -a Firefox ",
-	# tex_display_command    => "open -a 'TeXShop'",	# Editor or TeX editor
-	# pdf_display_command    => "open -a 'Preview'",	# PDF viewer
-	# hash_display_command   => "cat ", 			# to diplay file to STDOUT
-
-	# ==============================
-
-	# Sample settings for Linux:
-
-	# html_display_command => "firefox", 			# A web browser
-	# html_display_command => "google-chrome",
-	# tex_display_command  => "vim",				# Editor or TeX editor
-	# tex_display_command  => "emacs",
-	# pdf_display_command  => "xpdf",				# PDF viewer
-	# pdf_display_command  => "evince",
-	# pdf_display_command  => "acroread",			# PDF viewer
-	# hash_display_command => "cat ",			# to diplay file to STDOUT
-  );
-  
-EOF
-if (defined $credentials_path and (-r $credentials_path) ) {
-# we're all set
-} elsif(defined $credentials_path) { #can't find credentials
-	die  "Can't find credentials file $credentials_path searching\n";
-}
-
-
-if (defined $credentials_path and (-r $credentials_path) ) {
-		# we're all set
-} elsif(defined $credentials_path) { #can't find credentials
-		die "Can't find credentials file $credentials_path searching\n";
-}
-
-# if credentials_path not set explicitly go look for a credentials file.
-unless (defined $credentials_path) {
-	foreach my $path ( @path_list) { 
-		print "looking for credentials file: $path. -- ".((-r $path)?'found!':'(not found)')."\n" if $verbose;
-		next unless defined $path;
-		if (-r $path ) {
-			$credentials_path = $path;
-			last;
-		}
-	}
-}
-
-# verify that a credentials file has been found
-
-if  ( $credentials_path ) {
-	print STDERR "Credentials taken from file $credentials_path\n" if $verbose;
-} else {  #failed to find credentials file
-	die <<EOF;
-Can not find path for credentials. Looked in @path_list.
-$credentials_string
----------------------------------------------------------
-EOF
-}
-
-eval{require $credentials_path};
-if ($@  or not  %credentials) {
-	print STDERR $credentials_string;
-	die;
-}
-
-foreach my $key (sort qw(site_url webwork_url form_action_url site_password userID courseID course_password )) {
-	print STDERR "$key is missing from ".
-
-	"\%credentials at $credentials_path\n" unless $credentials{$key};
-}
-
-# When used in the docker environment ENV{WEBWORK_URL} needs to be set
-# since that environment variable is called in site.conf
-
-
-
-$ENV{WEBWORK_URL}=$ENV{WEBWORK_URL}//$credentials{webwork_url};
-
-if ($verbose) {
-	foreach (sort keys %credentials){print STDERR "$_ =>$credentials{$_} \n";}
-}
-
-
-
-################################################################################
-
-
-use lib "$WeBWorK::Constants::WEBWORK_DIRECTORY/lib";
-use lib "$WeBWorK::Constants::PG_DIRECTORY/lib";
-
-use WebworkClient;
-use FormatRenderedProblem;
-#use Proc::ProcessTable; # use in standalonePGproblemRenderer
-
-use 5.10.0;
-$Carp::Verbose = 1;
-
-#############################################
-# CONFIGURE
-#
-# Configure displays for local operating system
-# This section will differ from on operating system to another
-# The default code is for the macOS and  applications commonly available on macOS.
-#############################################
-
-
-#Default display commands.
-use constant  HTML_DISPLAY_COMMAND  => "open -a 'Google Chrome' "; # (MacOS command)
-use constant  HASH_DISPLAY_COMMAND => "";   # display tempoutputfile to STDOUT
-
-### Path to a temporary file for storing the output of sendXMLRPC.pl
- use constant  TEMPOUTPUTDIR   => "$ENV{WEBWORK_ROOT}/DATA/";
- die "You must make the directory ".TEMPOUTPUTDIR().
-     " writeable " unless -w TEMPOUTPUTDIR();
- use constant TEMPOUTPUTFILE  => TEMPOUTPUTDIR()."temporary_output.html";
- 
-### Default path to a temporary file for storing the output
-### of sendXMLRPC.pl
-use constant LOG_FILE => "$ENV{WEBWORK_ROOT}/DATA/xmlrpc_results.log";
-
-### Command for editing the pg source file in the browswer
-use constant EDIT_COMMAND =>"bbedit";   # for Mac BBedit editor (used as `EDIT_COMMAND() . " $file_path")
-
-### Command for editing and viewing the tex output of the pg question.
-use constant TEX_DISPLAY_COMMAND =>"open -a 'TeXShop'";
-
-### Command for editing and viewing the tex output of the pg question.
-use constant PDF_DISPLAY_COMMAND =>"open -a 'Preview'";
-
-### set display mode
-use constant DISPLAYMODE   => 'MathJax';
-use constant PROBLEMSEED   => '987654321';
-
-############################################################
-# End configure displays for local operating system
-############################################################
-
-
-#allow credentials to overrride the default displayMode 
-#and the browser display
-our $HTML_DISPLAY_COMMAND = $credentials{html_display_command}//HTML_DISPLAY_COMMAND();
-our $HASH_DISPLAY_COMMAND = $credentials{hash_display_command}//HASH_DISPLAY_COMMAND();
-our $DISPLAYMODE          = $credentials{ww_display_mode}//DISPLAYMODE();
-our $TEX_DISPLAY_COMMAND  = $credentials{tex_display_command}//TEX_DISPLAY_COMMAND();
-our $PDF_DISPLAY_COMMAND  = $credentials{pdf_display_command}//PDF_DISPLAY_COMMAND();
-
-##################################################
-#  END gathering credentials for client
-##################################################
-
-##################################################
-# create course environment and create log files
-##################################################
-
-# course environment is provided by caller and credentials for sendXMLRPC
-
-$path_to_log_file         = $path_to_log_file //$credentials{path_to_log_file}//LOG_FILE();  #set log file path.
-
-eval { # attempt to create log file
-	local(*FH);
-	open(FH, '>>:encoding(UTF-8)',$path_to_log_file) or die "Can't open file $path_to_log_file for writing";
-	close(FH);	
-};
-
-die "You must first create an output file at $path_to_log_file
-     with permissions 777 " unless -w $path_to_log_file;
-
-##################################################
-#  set default inputs for the problem
-##################################################
-
-############################################
-# Build  client defaults
-############################################
- 
-my $default_input = { 
-		userID          => $credentials{userID}//'',
-		session_key     => $credentials{session_key}//'',
-		courseID        => $credentials{courseID}//'',
-		courseName      => $credentials{courseID}//'',
-		course_password => $credentials{course_password}//'',
-};
-
-my $default_form_data = { 
-		displayMode     => $DISPLAYMODE,
-		outputformat    => $format//'standard',
-		problemSeed     => $problemSeed//PROBLEMSEED(),
-		psvn            => $psvn//'23456',
-		forcePortNumber => $credentials{forcePortNumber}//'',
-		language        => $lang//'en',
-};
-
-##################################################
-#  end build client
-##################################################
-
-##################################################
-#  MAIN SECTION gather and process problem template files
-##################################################
-my $cg_start = time; # this is Time::HiRes's time, which gives floating point values
-
-our @files_and_directories = @ARGV;
-# print "files ", join("|", @files_and_directories), "\n";
-if ($read_list_from_this_file) { 
-    # read a datafile containing list of files to be processed
-	my $FH = FileHandle->new(" < $read_list_from_this_file");
-	while (<$FH>) {
-		my $item = $_;
-		chomp($item);
-		my $file_path = abs_path($item);
-		unless (defined $file_path and -f $file_path) {
-			warn "skipping $item\n" unless defined $file_path;
-			warn "skipping $file_path\n" if defined $file_path;
-			next;
-		}
-		next if $file_path =~ /^\s*#/;   # comment lines
-		next unless $file_path =~ /\.pg$/;
-		next if $file_path =~ /\-text\.pg$/;
-		next if $file_path =~ /header/i;
-		process_pg_file($file_path);
-	}
-	FileHandle::close($FH);
-
-} else { 
-	foreach my $item (@files_and_directories) {
-		if (-d $item) {  # if the item is a directory traverse the tree
-			my $dir = abs_path($item);
-			find(\&wanted, ($dir));
-		} elsif ($item eq "-") {
-			process_pg_file($item);              # process STDIN
-		} elsif (-f $item) { # if the item is a file process it.
-			my $file_path = abs_path($item);
-			next unless $file_path =~ /\.pg$/;   # only process pg files
-			next if $file_path =~ /\-text\.pg$/; # don't process auxiliary include files
-			next if $file_path =~ /header/i;     # don't process header files
-			process_pg_file($file_path);
-		} else {
-			print "$item cannot be found or read\n";
-		}
-	}
-}
-sub wanted {
-	return '' unless $File::Find::name =~ /\.pg$/;
-	return '' if $File::Find::name =~ /\-text\.pg$/;
-	return '' if $File::Find::name =~ /header/i;
-	eval{
-		process_pg_file($File::Find::name) if -f $File::Find::name;
-	};
-	warn "Error in processing $File::Find::name: $@" if $@;
-}
-
-
-
-##########################################################
-#  Subroutines
-##########################################################
-
-#######################################################################
-# Process the pg file
-#######################################################################
-
-sub process_pg_file {
-	my $file_path = shift;
-	my $NO_ERRORS = "";
-	my $ALL_CORRECT = "";
-	my $form_data1 = { %$default_form_data,
-
-					  };
-
-	if ($display_tex_output or $display_pdf_output) {
-		my $form_data2 = {
-			%$form_data1,
-			displayMode  =>'tex',
-			outputformat => 'tex',
-		};
-		print "process tex files\n" if $UNIT_TESTS_ON;
-		my ($error_flag, $formatter, $error_string) = 
-	    	process_problem($file_path, $default_input, $form_data2);
-	    	
-	    # create tex file for both and tex and pdf output
-	    my $tex_file_name = create_tex_output($file_path, $formatter);
-	    # display tex file if --tex option is set 
-	    if ($display_tex_output) {	    
-	    	system($TEX_DISPLAY_COMMAND." ".TEMPOUTPUTDIR().$tex_file_name);
-	    } elsif($display_pdf_output) { # process tex file to create pdf file and display if --pdf option
-	    	my $pdf_path = create_pdf_output($tex_file_name); 
-	    	system($PDF_DISPLAY_COMMAND." ".$pdf_path);	    
-	    }
-	}
-	if ($display_json_output) {
-		my $form_data2 = {
-			%$form_data1,
-			outputformat => 'json',
-			displayMode  =>'MathJax',
-		};
-		print "Creating json\n" if $UNIT_TESTS_ON;
-		my ($error_flag, $formatter, $error_string) =
-		process_problem($file_path, $default_input, $form_data2);
-		my $json_file_name = create_json_output($file_path, $formatter);
-		print( "Created JSON data in file ", TEMPOUTPUTDIR(), $json_file_name, "\n");
-		exit;
-	}
-	my ($error_flag, $formatter, $error_string) = 
-	    process_problem($file_path, $default_input, $form_data1);
-	# extract and display result
-		#print "display $file_path\n";
-		edit_source_file($file_path) if $edit_source_file;
-		display_html_output($file_path, $formatter) if $display_html_output1;
-		display_hash_output($file_path, $formatter) if $display_hash_output1;
-		display_ans_output($file_path, $formatter) if $display_ans_output1;
-		$NO_ERRORS = record_problem_ok1($error_flag, $formatter, $file_path) if $record_ok1;      
-		
-		unless ($display_html_output2 or $display_hash_output2 or $display_ans_output2 or $record_ok2) {
-			print "DONE -- $NO_ERRORS -- \n"if $verbose;
-			return;
-		}
-	#################################################################
-	# Extract correct answers
-	#################################################################
-
-	my %correct_answers = (); 
-	my $some_correct_answers_not_specified = 0;
-	foreach my $ans_id (keys %{$formatter->return_object->{answers}} ) {
-		my $ans_obj = $formatter->return_object->{answers}->{$ans_id};
-		# the answergrps are in PG_ANSWERS_HASH
-		my $answergroup = $formatter->return_object->{PG_ANSWERS_HASH}->{$ans_id};
-		my @response_order = @{$answergroup->{response}->{response_order}};
-		#print scalar(@response_order), " first response $response_order[0] $ans_id\n";
-		$ans_obj->{type} = $ans_obj->{type}//'';  #make sure it's defined.
-		if ($ans_obj->{type} eq 'MultiAnswer') { 
-		    # singleResponse multianswer type
-		    # an outrageous hack
-			print "handling MultiAnswer singleResponse type\n" if $verbose;
-			my $ans_str1 = $ans_obj->{correct_ans};
-			my @ans_array1 = split(/\s*;\s*/, $ans_str1);
-			$correct_answers{$ans_id} = shift @ans_array1;
-			my $num_extra_elements = scalar(@ans_array1);
-			foreach my $i (1..$num_extra_elements) { # pick up the remaining blanks
-				my $response_id = "MuLtIaNsWeR_${ans_id}_${i}"; #MuLtIaNsWeR_AnSwEr0003_1
-				$correct_answers{$response_id} = shift @ans_array1;
-				#print "\t\t $response_id => $correct_answers{$response_id}\n";
-			}
-		} elsif ($ans_obj->{type} =~ /checkbox/i) { #type is probably checkbox_cmp 
-			my $ans_str = $ans_obj->{correct_ans};  #an unseparated answer string
-			$ans_str =~ s/^\s*//;
-			$ans_str =~ s/\s*$//;     #trim white space off ends (probably unnecessary)
-			my @temp = split("",$ans_str); #split into array of characters
-			my $new_ans_str = join("\0", @temp);   # join them in "packed" form separated with nulls
-			$correct_answers{$ans_id}=$new_ans_str;
-		} elsif (1==@response_order and $ans_id eq $response_order[0] ) { 
-		    # only one response -- not MultiAnswer singleResponse
-		    # most answers are of this type
-		    # should we use correct answer or correct value?  -- this seems to vary
-		    #warn "just one answer blank for this answer evaluator";
-			$correct_answers{$ans_id}=($ans_obj->{correct_ans})//($ans_obj->{correct_value});
-		} else { # more than one response 
-			if ($ans_obj->{type} =~ /Matrix/) {  
-			    #FIXME -- another outrageous hackkkk but it works
-				#print "responding to matrix answer with several ans_blanks\n";
-				#print "responses", join(" ", %{$answergroup->{response}->{responses}}),"\n";
-				#print "correct answer ", $ans_obj->{correct_value}, "\n";
-                my $ans_str = ($ans_obj->{correct_value})//($ans_obj->{correct_ans}); #(correct_ans can have html formatting -- not good)				$ans_str =~ s/\[//g;
-				$ans_str =~ s/\]//g;
-				my @ans_array = split(/\s*,\s*/, $ans_str);
-				foreach my $response_id (@response_order) {
-					$correct_answers{$response_id} = shift @ans_array;
-				}
-			} else {
-				warn "responding to an answer evaluator of type |".$ans_obj->{type}. 
-				  "|  with ".scalar(@response_order)." ans_blanks: ", 
-				   join(" ",@response_order),"\n" if $UNIT_TESTS_ON;
-				$correct_answers{$ans_id}=($ans_obj->{correct_ans})//($ans_obj->{correct_value})//'';
-			}
-		}
-		#FIXME  hack to get rid of html protection of < and > for vectors
-		$correct_answers{$ans_id}=~s/&gt;/>/g;
-		$correct_answers{$ans_id}=~s/&lt;/</g;
-		$correct_answers{$ans_id}=~ s|<br\s*/>||g;  # some answers have breaks in them for clarity
-		if ($correct_answers{$ans_id} eq "No correct answer specified" ) {
-			warn "this question has an answer blank with no correct answer specified";
-			$some_correct_answers_not_specified ++;
-		}
-
-	} #end loop collecting correct answers. 
-	# adjust input and reinitialize form_data
-	my $form_data2 = { %$default_form_data,
-				   answersSubmitted => 1,
-				   WWsubmit         => 1, # grade answers
-				   WWcorrectAns          => 1, # show correct answers
-				   %correct_answers
-				};
-
-	my $pg_start = time; # this is Time::HiRes's time, which gives floating point values
-
-	($error_flag, $formatter, $error_string)=();
-	($error_flag, $formatter, $error_string) = 
-			process_problem($file_path, $default_input, $form_data2);
-	my $pg_stop = time;
-	my $pg_duration = $pg_stop-$pg_start;
-
-	display_html_output($file_path, $formatter) if $display_html_output2;
-	display_hash_output($file_path, $formatter) if $display_hash_output2;
-	display_ans_output($file_path, $formatter) if $display_ans_output2;
-	$ALL_CORRECT = record_problem_ok2($error_flag, $formatter, $file_path, $some_correct_answers_not_specified, $pg_duration) if $record_ok2;      
-	#print "display the correct answers here";
-	display_inputs(%correct_answers) if $verbose;  # choice of correct answers submitted 
-	# should this information on what answers are being submitted have an option switch?
-
-	print "DONE -- $NO_ERRORS -- $ALL_CORRECT\n"if $verbose;
-}
-
-#######################################################################
-# Auxiliary subroutines
-#######################################################################
-
-sub process_problem {
-	my $file_path = shift;
-	my $input    = shift;
-	my $form_data  = shift;
-	# %credentials is global
-
-	### get source and correct file_path name so that it is relative to templates directory
-
-	my ($adj_file_path, $source) = get_source($file_path);
-	#print "find file at $adj_file_path ", length($source), "\n";
-
-
-	### build client
-	my $xmlrpc_client = new WebworkClient (
-		site_url               => $credentials{site_url},
-		form_action_url        => $credentials{form_action_url},
-		site_password          => $credentials{site_password}//'',
-		courseID               => $credentials{courseID},
-		userID                 => $credentials{userID},
-		session_key            => $credentials{session_key}//'',
-		sourceFilePath         => $adj_file_path,
-	);
-	
-	### update client
-	$xmlrpc_client->encodeSource($source);
-	$xmlrpc_client->form_data( $form_data	);
-	
-	### update inputs
-	my $problemSeed = $form_data->{problemSeed};
-	die "problem seed not defined in sendXMLRPC::process_problem" unless $problemSeed;
-
-	
-    my $local_psvn = $form_data->{psvn}//34567;
-	my $updated_input = {%$input, 
-					  envir => $xmlrpc_client->environment(
-							   fileName       => $adj_file_path,
-							   sourceFilePath => $adj_file_path,
-							   psvn           => $local_psvn,
-							   problemSeed    => $problemSeed,),
-	};
-
-	$form_data->{showAnsGroupInfo} 		= $print_answer_group;
-	$form_data->{showAnsHashInfo}       = $print_answer_hash;
-	$form_data->{showPGInfo}	        = $print_pg_hash;
-	$form_data->{showResourceInfo}	    = $print_resource_hash;
-	
-
-
-	##################################################
-	# Process the pg file
-	##################################################
-	### store the time before we invoke the content generator
-	my $cg_start = time; # this is Time::HiRes's time, which gives floating point values
-
-	############################################
-	# Call server via xmlrpc_client to render problem
-	############################################
-	
-	our($return_object, $error_flag, $error_string);
-	$error_flag=0; $error_string=''; 
-	
-	
-	
-	
-	   
-	$return_object = $xmlrpc_client->xmlrpcCall('renderProblem', $updated_input);
-	
-	#######################################################################
-	# Handle errors
-	#######################################################################
-	
-	unless ( $xmlrpc_client->fault  )    {
-		print "\n\n Result of renderProblem \n\n" if $UNIT_TESTS_ON;
-		print pretty_print_rh($return_object) if $UNIT_TESTS_ON;
-	    if (not defined $return_object) {  #FIXME make sure this is the right error message if site is unavailable
-	    	$error_string = "0\t Could not connect to rendering site ". $xmlrpc_client->{url}."\n";
-	    } elsif (defined($return_object->{flags}->{error_flag}) and $return_object->{flags}->{error_flag} ) {
-			$error_string = "0\t $file_path has errors\n";
-		} elsif (defined($return_object->{errors}) and $return_object->{errors} ){
-			$error_string = "0\t $file_path has syntax errors\n";
-		}
-		$error_flag=1 if $return_object->{errors};
-	} else {
-		$error_flag=1;
-		$error_string = $xmlrpc_client->return_object;  # error report		
-	}	
-	
-##################################################
-# Create FormatRenderedProblems object	-- not needed for sendXMLRPC
-##################################################
-
-	##################################################
-	# log elapsed time
-	##################################################
-	my $scriptName = 'sendXMLRPC';
-	my $cg_end = time;
-	my $cg_duration = $cg_end - $cg_start;
-	WebworkClient::writeRenderLogEntry("", 
-	"{script:$scriptName; file:$file_path; ". 
-	sprintf("duration: %.3f sec;", $cg_duration).
-	" site_url: $credentials{site_url}; }",'');
-	
-	#######################################################################
-	# End processing of the pg file
-	#######################################################################
-	my $formatter = $xmlrpc_client; ## for compatibility with standalonePGproblemRenderer
-	return $error_flag, $formatter, $error_string;
-}
-
-
-
-sub create_pdf_output {
-	my $tex_file_name = shift;
-	my @errors=();   
-	print "pdf mode\n" if $UNIT_TESTS_ON;
-	my $pdf_file_name = $tex_file_name;
-	$pdf_file_name =~ s/\.\w+$/\.pdf/;    # replace extension with pdf
-	
-	##########################################
-	# create working directory
-	##########################################
-	
-	# create a randomly-named working directory in the TEMPOUTPUTDIR() directory
-	my $working_dir_path = eval { tempdir("work.XXXXXXXX", DIR => TEMPOUTPUTDIR()) };
-	if ($@) {
-		push @errors, "Couldn't create temporary working directory: $@";
-	}
-	# make sure the directory can be read by other daemons e.g. lighttpd
-	chmod 0755, $working_dir_path;
-
-	# do some error checking
-	unless (-e $working_dir_path) {
-		push @errors, "Temporary directory ".$working_dir_path
-			." does not exist, but creation didn't fail. This shouldn't happen.";
-	}
-	unless (-w $working_dir_path) {
-		push @errors, "Temporary directory ".$working_dir_path
-			." is not writeable.";
-
-	}
-	
-	# catch errors if directory is not made (should be global, outside subroutine)
-	if (@errors) {
-		print "There were errors in creating the working directory for processing tex to pdf. \n".
-	      join("\n", @errors);
-	    delete_temp_dir($working_dir_path);
-	    return 0; # FAIL if no working directory
-	}
-	
-	
-	########################################
-	# try to mv the tex file into the working directory
-	########################################
-
-	my $src_path = TEMPOUTPUTDIR().$tex_file_name;
-	my $dest_path = "$working_dir_path/$tex_file_name";
-	my $mv_cmd = "2>&1 mv ". shell_quote("$src_path", "$dest_path");
-	my $mv_out = readpipe $mv_cmd;
-	if ($?) {
-		push @errors, "Failed to rename $src_path  to "
-			."$dest_path in directory \n"
-			."$mv_out";
-		print join("\n",@errors);
-	}
-
-	##########################################
-	# process tex file to pdf  (if working directory was created)
-	##########################################
-	@errors =();  # reset errors
-	
-	my $tex_file_path = $dest_path;
-	my $pdf_path = "$working_dir_path/$pdf_file_name";
-	print "pdflatex $tex_file_path\n" if $UNIT_TESTS_ON;
-	
-	# call pdflatex - we don't want to chdir in the mod_perl process, as
-	# that might step on the feet of other things (esp. in Apache 2.0)
-	my $pdflatex_cmd = "cd " . shell_quote($working_dir_path) . " && "
-		. "pdflatex"
-		. " $tex_file_name >pdflatex.stdout 2>pdflatex.stderr hardcopy";
-	if (my $rawexit = system $pdflatex_cmd) {
-		my $exit = $rawexit >> 8;
-		my $signal = $rawexit & 127;
-		my $core = $rawexit & 128;
-		push @errors, "Failed to convert TeX to PDF with command $pdflatex_cmd))"
-			." (exit=$exit signal=$signal core=$core).";
-		
-		# read hardcopy.log and report first error
-		my $hardcopy_log = "$working_dir_path/$tex_file_name";
-		$hardcopy_log =~ s/\.tex$/\.log/;   # replace extension
-		if (-e $hardcopy_log) {
-			if (open my $LOG, "<", $hardcopy_log) {
-				my $line;
-				while ($line = <$LOG>) {
-					last if $line =~ /^!\s+/;
-				}
-				my $first_error = $line;
-				while ($line = <$LOG>) {
-					last if $line =~ /^!\s+/;
-					$first_error .= $line;
-				}
-				close $LOG;
-				if (defined $first_error) {
-					push @errors, "First error in TeX log is: $first_error";
-				} else {
-					push @errors, "No errors encoundered in TeX log.";
-				}
-			} else {
-				push @errors, "Could not read TeX log: $!";
-			}
-		} else {
-			push @errors, "No TeX log was found.";
-		}
-	}
-	
-	########################################
-	# try to rename the pdf file
-	########################################
-
-	my $src_path1 = $pdf_path;
-	my $final_pdf_path = TEMPOUTPUTDIR().$pdf_file_name;
-	my $mv_cmd1 = "2>&1 mv ". shell_quote("$src_path1", "$final_pdf_path");
-	my $mv_out1 = readpipe $mv_cmd1;
-	if ($?) {
-		push @errors, "Failed to rename $src_path  to "
-			."$final_pdf_path in directory \n"
-			."$mv_out1";
-	}
-	
-
-	##################################################	
-	# remove the temp directory if there are no errors
-	##################################################
-	if (@errors) {
-		print "Errors in converting the tex file to pdf: ".join("\n", @errors);
-		return 0;
-	}
-	
-	unless (@errors or $UNIT_TESTS_ON) {
-		delete_temp_dir($working_dir_path);
-	} 
-	
- 
-	
-	
-	# return path to pdf file
-	print "pdflatex to $final_pdf_path DONE\n" if $UNIT_TESTS_ON;
-	# this is doable but will require changing directories
-	# look at the solution done using hardcopy
-	return $final_pdf_path;}
-
-# helper function to remove temp dirs
-sub delete_temp_dir {
-	my ($temp_dir_path) = @_;
-	
-	my $rm_cmd = "2>&1 rm -rf " . shell_quote($temp_dir_path);  #can use perl command for this??
-	my $rm_out = readpipe $rm_cmd;
-	if ($?) {
-		print "Failed to remove temporary directory '".$temp_dir_path."':\n$rm_out\n";
-		return 0;
-	} else {
-		return 1;
-	}
-}
-
-
-sub create_tex_output {
-	my $file_path = shift;
-	my $formatter = shift;
-	my $output_text = $formatter->formatRenderedProblem;
-	$file_path =~s|/$||;   # remove final /
-	$file_path =~ m|/?([^/]+)$|;
-	my $file_name = $1;
-	$file_name =~ s/\.\w+$/\.tex/;    # replace extension with tex
-	my $output_file = TEMPOUTPUTDIR().$file_name;
-	local(*FH);
-	open(FH, '>:encoding(UTF-8)', $output_file) or die "Can't open file $output_file for writing";
-	print FH $output_text;
-	close(FH);
-	print "tex result sent to $output_file\n" if $UNIT_TESTS_ON;
-#	sleep 5;   #wait 5 seconds
-#	unlink($output_file);
-	return $file_name;
-}
-
-sub create_json_output {
-	my $file_path = shift;
-	my $formatter = shift;
-	my $output_text = $formatter->formatRenderedProblem;
-	$file_path =~s|/$||;   # remove final /
-	$file_path =~ m|/?([^/]+)$|;
-	my $file_name = $1;
-	$file_name =~ s/\.\w+$/\.json/;    # replace extension with json
-	my $output_file = TEMPOUTPUTDIR().$file_name;
-	local(*FH);
-	open(FH, '>:encoding(UTF-8)', $output_file) or die "Can't open file $output_file for writing";
-	print FH $output_text;
-	close(FH);
-	print "json result sent to $output_file\n" if $UNIT_TESTS_ON;
-#	sleep 5;   #wait 5 seconds
-#	unlink($output_file);
-	return $file_name;
-}
-
-sub	display_html_output {  #display the problem in a browser
-	my $file_path = shift;
-	my $formatter = shift;
-	my $output_text = $formatter->formatRenderedProblem;
-	$file_path =~s|/$||;   # remove final /
-	$file_path =~ m|/?([^/]+)$|;
-	my $file_name = $1;
-	$file_name =~ s/\.\w+$/\.html/;    # replace extension with html
-	my $output_file = TEMPOUTPUTDIR().$file_name;
-	local(*FH);
-	open(FH, '>:encoding(UTF-8)', $output_file) or die "Can't open file $output_file for writing";
-	print FH $output_text;
-	close(FH);
-
-	system($HTML_DISPLAY_COMMAND." ".$output_file);
-	sleep 5;   #wait 1 seconds
-	unlink($output_file);
-}
-
-sub display_hash_output {   # print the entire hash output to the command line
-	my $file_path = shift;
-	my $formatter = shift;
-	my $output_text = $formatter->formatRenderedProblem;
-	$file_path =~s|/$||;   # remove final /
-	$file_path =~ m|/?([^/]+)$|;
-	my $file_name = $1;
-	$file_name =~ s/\.\w+$/\.txt/;    # replace extension with html
-	my $output_file = TEMPOUTPUTDIR().$file_name;
-	my $output_text2 = pretty_print_rh($output_text);
-	print STDOUT $output_text2;
-
-# 	local(*FH);
-# 	open(FH, '>', $output_file) or die "Can't open file $output_file writing";
-# 	print FH $output_text2;
-# 	close(FH);
-# 
-# 	system($HASH_DISPLAY_COMMAND().$output_file."; rm $output_file;");
-	#sleep 1; #wait 1 seconds
-	#unlink($output_file);
-}
-
-sub display_ans_output {  # print the collection of answer hashes to the command line
-	my $file_path = shift;
-	my $formatter = shift;
-	my $return_object = $formatter->return_object;	
-	$file_path =~s|/$||;   # remove final /
-	$file_path =~ m|/?([^/]+)$|;
-	my $file_name = $1;
-	$file_name =~ s/\.\w+$/\.txt/;    # replace extension with html
-	my $output_file = TEMPOUTPUTDIR().$file_name;
-	my $output_text = pretty_print_rh($return_object->{answers});
-	print STDOUT $output_text;
-# 	local(*FH);
-# 	open(FH, '>', $output_file) or die "Can't open file $output_file writing";
-# 	print FH $output_text;
-# 	close(FH);
-# 
-# 	system($HASH_DISPLAY_COMMAND().$output_file."; rm $output_file;");
-# 	sleep 1; #wait 1 seconds
-# 	unlink($output_file);
-}
-
-
-sub record_problem_ok1 {
-	my $error_flag = shift//'';
-	my $formatter = shift;  # for formatting
-	my $file_path = shift;
-	my $return_string = '';
-	my $return_object = $formatter->return_object;
-	if (defined($return_object->{flags}->{DEBUG_messages}) ) {
-		my @debug_messages = @{$return_object->{flags}->{DEBUG_messages}};
-		$return_string .= (pop @debug_messages ) ||'' ; #avoid error if array was empty
-		if (@debug_messages) {
-			$return_string .= join(" ", @debug_messages);
-		} else {
-					$return_string = "";
-		}
-	}
-	if (defined($return_object->{errors}) ) {
-		$return_string= $return_object->{errors};
-	}
-	if (defined($return_object->{flags}->{WARNING_messages}) ) {
-		my @warning_messages = @{$return_object->{flags}->{WARNING_messages}};
-		$return_string .= (pop @warning_messages)||''; #avoid error if array was empty
-			$@=undef;
-		if (@warning_messages) {
-			$return_string .= join(" ", @warning_messages);
-		} else {
-			$return_string = "";
-		}
-	}
-	my $SHORT_RETURN_STRING = ($return_string)?"has errors":"ok";
-	unless ($return_string) {
-		$return_string = "1\t $file_path is ok\n";
-	} else {
-		$return_string = "0\t $file_path has errors\n";
-	}
-	 
-	local(*FH);
-	open(FH, '>>:encoding(UTF-8)',$path_to_log_file) or die "Can't open file $path_to_log_file for writing";
-	print FH $return_string;
-	close(FH);
-	return $SHORT_RETURN_STRING;
-}
-sub record_problem_ok2 {
-	my $error_flag = shift//'';
-	my $formatter = shift;
-	my $file_path = shift;
-	my $some_correct_answers_not_specified = shift;
-	my $pg_duration = shift;  #processing time
-	my $return_object = $formatter->return_object;
-	my %scores = ();
-	my $ALL_CORRECT= 0;
-	my $all_correct = ($error_flag)?0:1;
-		foreach my $ans (keys %{$return_object->{answers}} ) {
-			$scores{$ans} = 
-			      $return_object->{answers}->{$ans}->{score};
-			$all_correct =$all_correct && $scores{$ans};
-		}
-	$all_correct = ".5" if $some_correct_answers_not_specified;
-	$ALL_CORRECT = ($all_correct == 1)?'All answers are correct':'Some answers are incorrect';
-	local(*FH);
-	open(FH, '>>:encoding(UTF-8)',$path_to_log_file) or die "Can't open file $path_to_log_file for writing";
-	print FH "$all_correct $file_path\n"; #  do we need this? compile_errors=$error_flag\n";
-	close(FH);
-	return $ALL_CORRECT;
-}
-
-###########################################
-# standalonePGproblemRenderer  -- not needed for sendXMLRPC
-###########################################
-
-
-
-##################################################
-# utilities
-##################################################
-
-sub display_inputs {
-	my %correct_answers = @_;
-	foreach my $key (sort keys %correct_answers) {
-		print "$key => $correct_answers{$key}\n";
-	}
-}
-sub edit_source_file {
-	my $file_path = shift;
-	system(EDIT_COMMAND()." $file_path");
-}
-
-
-##################################################
-# Get problem template source and adjust file_path name
-##################################################
-
-sub get_source {
-	my $file_path = shift;
-	my $source;	
-	die "Unable to read file $file_path \n" unless $file_path eq '-' or -r $file_path;
-	eval {  #File::Slurp would be faster (see perl monks)
-		 local $/=undef;
-		if ($file_path eq '-') {
-			$source = <STDIN>;
-		} else {
-			# To support proper behavior with UTF-8 files, we need to open them with "<:encoding(UTF-8)"
-			# as otherwise, the first HTML file will render properly, but when "Preview" "Submit answer"
-			# or "Show correct answer" is used it will make problems, as in process_problem() the
-			# encodeSource() method is called on a data which is still UTF-8 encoded, and leads to double
-			# encoding and gibberish.
-			# NEW:
-			open(FH, "<:encoding(UTF-8)" ,$file_path) or die "Couldn't open file $file_path: $!";
-			# OLD:
-			#open(FH, "<" ,$file_path) or die "Couldn't open file $file_path: $!";
-			$source   = <FH>; #slurp  input
-			close FH;
-		}
-	};
-	die "Something is wrong with the contents of $file_path\n" if $@;
-	### adjust file_path so that it is relative to the rendering course directory
-	#$file_path =~ s|/opt/webwork/libraries/NationalProblemLibrary|Library|;
-	$file_path =~ s|^.*?/webwork-open-problem-library/OpenProblemLibrary|Library|;
-	print "file_path changed to $file_path\n" if $UNIT_TESTS_ON;
-	print $source  if  $UNIT_TESTS_ON;  
-	return $file_path, $source;
-}
-
-
-##################################################
-# utilities
-##################################################
-
-sub pretty_print_rh { 
-    shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
-	my $rh = shift;
-	my $indent = shift || 0;
-	my $out = "";
-	my $type = ref($rh);
-
-	if (defined($type) and $type) {
-		$out .= " type = $type; ";
-	} elsif (! defined($rh )) {
-		$out .= " type = UNDEFINED; ";
-	}
-	return $out." " unless defined($rh);
-	
-	if ( ref($rh) =~/HASH/  ) {
-	    $out .= "{\n";
-	    $indent++;
- 		foreach my $key (sort keys %{$rh})  {
- 			$out .= "  "x$indent."$key => " . pretty_print_rh( $rh->{$key}, $indent ) . "\n";
- 		}
- 		$indent--;
- 		$out .= "\n"."  "x$indent."}\n";
-
- 	} elsif (ref($rh)  =~  /ARRAY/ or "$rh" =~/ARRAY/) {
- 	    $out .= " ( ";
- 		foreach my $elem ( @{$rh} )  {
- 		 	$out .= pretty_print_rh($elem, $indent);
- 		
- 		}
- 		$out .=  " ) \n";
-	} elsif ( ref($rh) =~ /SCALAR/ ) {
-		$out .= "scalar reference ". ${$rh};
-	} elsif ( ref($rh) =~/Base64/ ) {
-		$out .= "base64 reference " .$$rh;
-	} else {
-		$out .=  $rh;
-	}
-	
-	return $out." ";
-}
-
-############################################
-# Help message
-############################################
-
-sub print_help_message {
-print <<'EOT';
-NAME
-    webwork2/clients/sendXMLRPC.pl
-
-DESCRIPTION
-    This script will take a list of files or directories and send it to a
-    WeBWorK daemon webservice to have it rendered. For directories each .pg
-    file under that directory is rendered.
-
-    The results can be displayed in a browser (use -b or -B switches) as was
-    done with renderProblem.pl, on the command line (Use -h or -H switches)
-    as was done with renderProblem_rawoutput.pl or summary information about
-    whether the problem was correctly rendered can be sent to a log file
-    (use -c or C switches).
-
-    The capital letter switches, -B, -H, and -C render the question twice.
-    The first time returns an answer hash which contains the correct
-    answers. The question is then resubmitted to the renderer with the
-    correct answers filled in and displayed.
-
-    IMPORTANT: Remember to configure the local output file and display
-    command near the top of this script. !!!!!!!!
-
-    IMPORTANT: Create a valid credentials file.
-
-SYNOPSIS
-            sendXMLRPC -vcCbB input.pg
-
-DETAILS
-  credentials file
-        These locations are searched, in order,  for the credentials file.
-        ("$ENV{HOME}/.ww_credentials", "$ENV{HOME}/ww_session_credentials", 'ww_credentials', 'ww_credentials.dist');
-
-        Place a credential file containing the following information at one of the locations above 
-        or create a file with this information and specify it with the --credentials option.
-    
-            %credentials = (
-                  userID                 => "my login name for the webwork course",
-                  course_password        => "my password ",
-                  courseID               => "the name of the webwork course",
-                  SITE_URL               => "url of rendering site",
-                  XML_PASSWORD           => "site password", # preliminary access to site
-                  form_action_url        => 'http://localhost:80/webwork2/html2xml' #action url for form
-            );
-
-  Options
-    -a
-                Displays the answer hashes returned by the question on the command line.
-
-    -A
-                Same as -a but renders the question with the correct answers submitted.
-
-    -b
-                Display the rendered question in a browser (specified by the DISPLAY_HTML_COMMAND variable).
-
-    -B
-                Same as -b but renders the question with the correct answers submitted.
-
-    -h
-                Prints to STDOUT the entire object returned by 
-                   the webwork_client xmlrpc request.
-                   This includes the answer information displayed by -a and -A and much more.
-
-    -H
-                Same as -h but renders the question with the correct answers submitted
-
-    -c
-                "check" -- Record success or failure of rendering the question to a log file.
-
-    -C
-                Same as -c but the question is rendered with the correct answers submitted. 
-                 This succeeds only if the correct answers, as determined from the answer hash, all succeed.
-
-    f=s
-                Specify the format used by the browser in displaying the question. 
-                 Choices for s are
-                 standard
-                 sticky
-                 debug 
-                 simple
-
-    -v
-                 Verbose output. Used mostly for debugging. 
-                 In particular it displays explicitly the correct answers which are (will be)  
-                 submitted to the question and it specifies which credential file is used.
-
-    -e
-
-                 Open the source file in an editor. 
-                 The single letter options can be "bundled" e.g.  -vcCbB
-    --tex    
-                 Process question in TeX mode and output to the command line
-    --pdf          
-                 Process question in TeX mode, then by pdflatex and output 
-                 to the command line
- 
-    --list       pg_list
-                 Read and process a list of .pg files contained in the file C<pg_list>.  C<pg_list>
-                 consists of a sequence of lines each of which contains the full path to a pg
-                 file that should be processed. (For example this might be the output from an
-                 earlier run of sendXMLRPC using the -c flag. )
-
-    --pg
-                Triggers the printing of the all of the variables available to the PG question. 
-                The table appears within the question content. Use in conjunction with -b or -B.
-    --anshash
-                Prints the answer hash for each answer in the PG_debug output which appears below
-                the question content. Use in conjunction with -b or -B. 
-                Similar to -a or -A but the output appears in the browser and 
-                not on the command line.
-
-    --ansgrp
-                Prints the PGanswergroup for each answer evaluator. The information appears in 
-                the PG_debug output which follows the question content.  Use in conjunction with -b or -B.
-                This contains more information than printing the answer hash. (perhaps too much).
-
-    --resource
-
-                 Prints the resources used by the question. The information appears in 
-                 the PG_debug output which follows the question content.  Use in conjunction with -b or -B.
-
-
-    --credentials=s
-    
-                 Specifies a file s where the  credential information can be found.
-
-    --help
-                 Prints help information. 
-
-    --log 
-                 Sets path to log file
-    
-    --seed=s     
-                 Sets problemSeed to the number contained in string s
-
-
-EOT
-}
-
-1;
diff --git a/clients/sendxmlrpc_bbedit.pl b/clients/sendxmlrpc_bbedit.pl
deleted file mode 100755
index c01d24ff84..0000000000
--- a/clients/sendxmlrpc_bbedit.pl
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/perl -w
-die "BB_DOC_PATH is not present.  You must first save the document\n" unless defined $ENV{BB_DOC_PATH};
-$command = "/Volumes/WW_test/opt/local/bin/perl /Volumes/WW_test/opt/webwork/webwork2/clients/sendXMLRPC.pl -bB $ENV{BB_DOC_PATH}";
-system($command);
\ No newline at end of file
diff --git a/clients/t/TestWW.html b/clients/t/TestWW.html
deleted file mode 100644
index 393a04a816..0000000000
--- a/clients/t/TestWW.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="utf-8" />
-	<title>Embed WW in HTML page</title>
-	<meta name="generator" content="BBEdit 11.0" />
-	<link href="https://demo.webwork.rochester.edu/webwork2_files/css/knowlstyle.css" rel="stylesheet" type="text/css" />
-	<link href="https://demo.webwork.rochester.edu/webwork2_files/js/apps/MathView/mathview.css" rel="stylesheet" />
-
-	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-	<script>
-	$(document).ready(function(){
-		$( ".clickme" ).click(function() {
-		  $( this).next().slideToggle( "slow", function() {
-			// Animation complete.
-		  });
-		});
-
-	   // jQuery methods go here...
-	});
-	</script>
-	<style>
-		.clickme {background-color: #ccccFF ;}
-		iframe {
-			margin-left: 20px;
-			padding-left: 10px;
-		}
-	</style>
-</head>
-<body>
-<h1>Example of embedding WeBWorK problems in HTML pages. </h1>
-<h2>Problem 1</h2>
-<p>
-This problem will help you to understand averages. 
-</p>
-<div class="clickme">
-  Click here to show problem1
-</div>
-<div class="wwproblem" style="display: none;">
-<hr>
-<iframe  width="800" height="600" 
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=Library/LoyolaChicago/Precalc/Chap1Sec2/Q03.pg
-	&problemSeed=123567
-	&displayMode=MathJax
-	&courseID=daemon_course
-	&userID=daemon
-	&course_password=daemon
-	&outputformat=simple">
-</iframe>
-<hr>
-</div>
-
-<h2>Problem 2</h2>
-<p>
-This problem gives you practice finding tangents to curves in the plane.
-</p>
-
-<div class="clickme">
-  Click here to show problem 2
-</div>
-<div class="wwproblem" style="display: none;">
-<hr>
-<iframe  width="800" height="600" 
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=Library/Utah/Calculus_I/set5_The_Derivative/1210s5p17/1210s5p17.pg
-	&problemSeed=123567
-	&displayMode=MathJax
-	&courseID=daemon_course
-	&userID=daemon
-	&course_password=daemon
-	&outputformat=simple">
-</iframe>
-<hr>
-</div>
-
-<h2>Problem 3</h2>
-<p>
-This is for debugging and shows all the details of the hash returned by PG.
-</p>
-
-<div class="clickme">
-  Click here to show problem 3
-</div>
-<div class="wwproblem" style="display: none;">
-<hr>
-<iframe  width="800" height="600" 
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=Library/Utah/Calculus_I/set5_The_Derivative/1210s5p17/1210s5p17.pg
-	&problemSeed=123567890
-	&displayMode=MathJax
-	&courseID=daemon_course
-	&userID=daemon	
-	&course_password=daemon
-	&outputformat=debug">
-</iframe>
-<hr>
-</div>
-
-<h2>Problem 4</h2>
-<p>
-This contains embedded PG code in base64 format.
-</p>
-<div class="clickme">
-  Click here to show problem 4 
-</div>
-<div class="wwproblem" style="display: none;">
-<hr>
-<iframe  width="800" height="600" 
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?
-	&answersSubmitted=0
-	&problemSeed=123567890
-	&displayMode=MathJax
-	&courseID=daemon_course
-	&userID=daemon	
-	&course_password=daemon
-	&outputformat=simple
-	&problemSource=
-	IyBERVNDUklQVElPTgojIFByb2JsZW0gZnJvbSBDYWxjdWx1cywgc2luZ2xlIHZhcmlhYmxlLCBI%0AdWdoZXMtSGFsbGV0dCBldCBhbC4sIDR0aCBlZC4KIyBXZUJXb3JLIHByb2JsZW0gd3JpdHRlbiBi%0AeSBHYXZpbiBMYVJvc2UsIDxnbGFyb3NlQHVtaWNoLmVkdT4KIyBFTkRERVNDUklQVElPTgoKIyMg%0AVGFnZ2VkIGJ5IGdsciAwMi8wOC8wOQoKIyMgREJzdWJqZWN0KENhbGN1bHVzIC0gc2luZ2xlIHZh%0AcmlhYmxlKQojIyBEQmNoYXB0ZXIoSW50ZWdyYWxzKQojIyBEQnNlY3Rpb24oUmllbWFubiBzdW1z%0AKQojIyBJbnN0aXR1dGlvbihVbml2ZXJzaXR5IG9mIE1pY2hpZ2FuLCBGb3J0IExld2lzIENvbGxl%0AZ2UpCiMjIEF1dGhvcihHYXZpbiBMYVJvc2UsIFBhdWwgUGVhcnNvbikKIyMgTUxUKHRhYmxlcykK%0AIyMgTGV2ZWwoMikKIyMgTU8oMSkKIyMgVGl0bGVUZXh0MSgnQ2FsY3VsdXMnKQojIyBBdXRob3JU%0AZXh0MSgnSHVnaGVzLUhhbGxldHQnKQojIyBFZGl0aW9uVGV4dDEoJzQnKQojIyBTZWN0aW9uMSgn%0ANS4yJykKIyMgUHJvYmxlbTEoJzcnKQojIyBUaXRsZVRleHQyKCdDYWxjdWx1cycpCiMjIEF1dGhv%0AclRleHQyKCdIdWdoZXMtSGFsbGV0dCcpCiMjIEVkaXRpb25UZXh0MignNScpCiMjIFNlY3Rpb24y%0AKCc1LjInKQojIyBQcm9ibGVtMignOCcpCiMjIEtFWVdPUkRTKCdjYWxjdWx1cycsICdpbnRlZ3Jh%0AbCcsICdkZWZpbml0ZSBpbnRlZ3JhbCcsICdhcmVhJykKCiMjIFRleHRib29rIHRhZ3MKIyMgSEhD%0AaGFwdGVyMSgnS2V5IENvbmNlcHQ6IFRoZSBEZWZpbml0ZSBJbnRlZ3JhbCcpCiMjIEhIQ2hhcHRl%0AcjIoJ0tleSBDb25jZXB0OiBUaGUgRGVmaW5pdGUgSW50ZWdyYWwnKQoKRE9DVU1FTlQoKTsKbG9h%0AZE1hY3JvcygKIlBHc3RhbmRhcmQucGwiLAojIlBHYmFzaWNtYWNyb3MucGwiLAojIlBHY2hvaWNl%0AbWFjcm9zLnBsIiwKIyJQR2Fuc3dlcm1hY3Jvcy5wbCIsCiMiUEdhdXhpbGlhcnlGdW5jdGlvbnMu%0AcGwiLAojIlBHYXN1LnBsIiwgICAgICAgICAgICAgICAjIGdldCBwY19ldmFsdWF0b3IKIk1hdGhP%0AYmplY3RzLnBsIiwKKTsKIApDb250ZXh0KCJOdW1lcmljIik7CgpURVhUKGJlZ2lucHJvYmxlbSgp%0AKTsKJHNob3dQYXJ0aWFsQ29ycmVjdEFuc3dlcnMgPSAxOwoKIyBnZW5lcmF0ZSBhIHRhYmxlIG9m%0AIGRhdGEgZm9yIGYoeCkKQGZkYXRhID0gKCk7CiRmZGF0YVs1XSA9IHJhbmRvbSgxLDEwLDEpOwok%0AZHkgPSByYW5kb20oMTYsMjgsMSk7CmZvciAoIG15ICRpPTQ7ICRpPj0wOyAkaS0tICkgewogICAg%0AJGZkYXRhWyRpXSA9ICRmZGF0YVskaSsxXSArICRkeTsKICAgICRkeSA9IGludCgkZHkvMik7Cn0K%0ACiMgd2UgcHV0IHRoZXNlIGFzIHRoZSBkYXRhIGZvciB4IHZhbHVlcyB3aXRoCiRkeCA9IHJhbmRv%0AbSgyLDQsMSk7CkB4ZGF0YSA9ICggMCwgJGR4LCAyKiRkeCwgMyokZHgsIDQqJGR4LCA1KiRkeCAp%0AOwoKIyB0aGVuIHBvc3NpYmxlIGVzdGltYXRlcyBmb3IgdGhlIGludGVncmFsIGFyZQokbGhzID0g%0AJGR4KigkZmRhdGFbMF0gKyAkZmRhdGFbMV0gKyAkZmRhdGFbMl0gKyAkZmRhdGFbM10gKyAkZmRh%0AdGFbNF0pOwokcmhzID0gJGR4KigkZmRhdGFbMV0gKyAkZmRhdGFbMl0gKyAkZmRhdGFbM10gKyAk%0AZmRhdGFbNF0gKyAkZmRhdGFbNV0pOwokYXZnID0gKCRsaHMgKyAkcmhzKS8yOwoKQ29udGV4dCgp%0ALT50ZXhTdHJpbmdzOwpCRUdJTl9URVhUCgpDb25zaWRlciB0aGUgZm9sbG93aW5nIHRhYmxlOgok%0AUEFSCiRCQ0VOVEVSClx7IGJlZ2ludGFibGUoNykgXH0KXHsgcm93KCAiXCh4XCkiLCBAeGRhdGEg%0AKSBcfQpceyByb3coICJcKGYoeClcKSIsIEBmZGF0YSApIFx9Clx7IGVuZHRhYmxlKCkgXH0KJEVD%0ARU5URVIKJFBBUgooYSkgVXNlIHRoaXMgZGF0YSBhbmQgYSBsZWZ0LWVuZHBvaW50IFJpZW1hbm4g%0Ac3VtIHRvIGVzdGltYXRlIHRoZSBpbnRlZ3JhbDoKJEJSClwoIFxpbnRfMF57JHhkYXRhWzVdfSBm%0AKHgpIFwsIGR4IFxhcHByb3ggXCkgXHsgYW5zX3J1bGUoNDUpIFx9CiRQQVIKKGIpIFVzZSB0aGlz%0AIGRhdGEgYW5kIGEgcmlnaHQtZW5kcG9pbnQgUmllbWFubiBzdW0gdG8gZXN0aW1hdGUgdGhlIGlu%0AdGVncmFsOgokQlIKXCggXGludF8wXnskeGRhdGFbNV19IGYoeCkgXCwgZHggXGFwcHJveCBcKSBc%0AeyBhbnNfcnVsZSg0NSkgXH0KJFBBUgooYykgRmluZCB0aGUgYXZlcmFnZSBvZiB0aGUgbGVmdC0g%0AYW5kIHJpZ2h0LWVuZHBvaW50IFJpZW1hbm4gc3VtcyB0byBlc3RpbWF0ZSB0aGUgaW50ZWdyYWw6%0ACiRCUgpcKCBcaW50XzBeeyR4ZGF0YVs1XX0gZih4KSBcLCBkeCBcYXBwcm94IFwpIFx7IGFuc19y%0AdWxlKDQ1KSBcfQoKCkVORF9URVhUCkNvbnRleHQoKS0%2Bbm9ybWFsU3RyaW5nczsKCkFOUyggQ29t%0AcHV0ZSgiJGxocyIpLT5jbXAodG9sVHlwZT0%2BJ2Fic29sdXRlJyx0b2xlcmFuY2U9PjAuMDEpICk7%0ACkFOUyggQ29tcHV0ZSgiJHJocyIpLT5jbXAodG9sVHlwZT0%2BJ2Fic29sdXRlJyx0b2xlcmFuY2U9%0APjAuMDEpICk7CkFOUyggQ29tcHV0ZSgiJGF2ZyIpLT5jbXAodG9sVHlwZT0%2BJ2Fic29sdXRlJyx0%0Ab2xlcmFuY2U9PjAuMDEpICk7CgojQU5TKHBjX2V2YWx1YXRvciggWyBudW1fY21wKCRsaHMpLCAx%0ALCAnJyBdLAojCQkgICBbIG51bV9jbXAoJHJocyksIDEsICcnIF0sCiMJCSAgIFsgbnVtX2NtcCgk%0AYXZnKSwgMSwgJycgXSApICk7CgoKCkNvbnRleHQoKS0%2BdGV4U3RyaW5nczsKU09MVVRJT04oRVYz%0AKDw8J0VORF9TT0xVVElPTicpKTsKJFBBUiBTT0xVVElPTiAkUEFSCgpXZSBjYW4gZXN0aW1hdGUg%0AdGhlIGludGVncmFsIHdpdGggYSBsZWZ0IG9yIHJpZ2h0IFJpZW1hbm4gc3VtLCBvciB3aXRoIHRo%0AZQphdmVyYWdlIG9mIHRoZSB0d28uICBUaGUgbGVmdCBSaWVtYW5uIHN1bSBpcyAKXFsKXGludF8w%0AXnskeGRhdGFbNV19IGYoeCkgZHggXGFwcHJveAogICgkZHgpKCRmZGF0YVswXSArICRmZGF0YVsx%0AXSArICRmZGF0YVsyXSArICRmZGF0YVszXSArICRmZGF0YVs0XSkgPSAKICAkbGhzLgpcXQpUaGUg%0AcmlnaHQgUmllbWFubiBzdW0gaXMgClxbClxpbnRfMF57JHhkYXRhWzVdfSBmKHgpIGR4IFxhcHBy%0Ab3gKICAoJGR4KSgkZmRhdGFbMV0gKyAkZmRhdGFbMl0gKyAkZmRhdGFbM10gKyAkZmRhdGFbNF0g%0AKyAkZmRhdGFbNV0pID0gCiAgJHJocy4KXF0KVGh1cyB0aGUgYXZlcmFnZSBvZiB0aGUgdHdvIGlz%0AIFwoIFxmcmFjMTIgKCRsaHMgKyAkcmhzKSA9ICRhdmcgXCkuCgpFTkRfU09MVVRJT04KQ29udGV4%0AdCgpLT5ub3JtYWxTdHJpbmdzOwoKCkNPTU1FTlQoJ01hdGhPYmplY3QgdmVyc2lvbicpOwpFTkRE%0AT0NVTUVOVCgpOwoK%0A
-" base64="1" uri="1">
-	
-<hr>
-</div>
-</body>
-</html>
diff --git a/clients/t/bad_input.pg b/clients/t/bad_input.pg
deleted file mode 100644
index bf7d8d8d1e..0000000000
--- a/clients/t/bad_input.pg
+++ /dev/null
@@ -1,108 +0,0 @@
-##DESCRIPTION
-##  A very simple first problem
-##ENDDESCRIPTION
-##KEYWORDS('algebra')
-DOCUMENT();        # This should be the first executable line in the problem.
-loadMacros(
-"PG.pl",
-"PGbasicmacros.pl",
-"PGchoicemacros.pl",
-"PGanswermacros.pl",
-"PGauxiliaryFunctions.pl"
-);
-
-TEXT(&beginproblem);
-$showPartialCorrectAnswers = 1;
-$a = random(-10,-1,1);
-$b = random(1,11,1);
-$c = random(1,11,1);
-$d = random(1,11,1);
-
-
-=123;
-
-#warn "foobar";
-
-#DEBUG_MESSAGE("this is a debuggin message.");
-
-#WARN_MESSAGE("this is a warning message.");
-
-BEGIN_TEXT
-$PAR
-displayMode  is $displayMode $BR
-$PAR
-This problem demonstrates how you enter numerical answers into WeBWorK. $PAR
-Evaluate the expression \(3($a )($b -$c -2($d ))\):
-
- \{ ans_rule(10) \}
-
-$BR
-END_TEXT
-$ans = 3*($a)*($b-$c-2*($d));
-
-&ANS(strict_num_cmp($ans));
-
-BEGIN_TEXT
-
-In the case above you need to enter a number, since we're testing whether you can multiply
-out these numbers. (You can use a calculator if you want.) 
-$PAR
-For most problems, you will be able to get WeBWorK to
-do some of the work for you.  For example
-$BR
-Calculate ($a) * ($b): \{ ans_rule()\}
-$BR
-END_TEXT
-$ans = $a*$b;
-
-&ANS(std_num_cmp($ans));
-
-BEGIN_TEXT
-The asterisk is what most computers use to denote multiplication and you can use this with WeBWorK. 
-But WeBWorK will also allow use to use  a space to denote multiplication.
-You can either \($a * $b\) or \{$a*$b\} or even \($a \ $b\).  All will work. Try them.  
-$PAR
-Now try calculating the sine of 45 degrees ( that's sine of pi over 4 in radians
-and numerically sin(pi/4) equals \{1/sqrt(2)\} or, more precisely,  \(1/\sqrt{2} \) ).  
-You can enter this as  sin(pi/4) , as 
-sin(3.1415926/4), as 1/sqrt(2), as 2**(-.5), etc. This is because WeBWorK knows about 
-functions like sin  and sqrt (square root). (Note: exponents
-can be indicated by either a "caret" or **). Try it.$BR  \( \sin(\pi/4) = \) \{ ans_rule(20) \}$PAR
- Here's the 
-\{
-htmlLink(qq!http://webwork.math.rochester.edu/webwork_system_html/docs/docs/pglanguage/availablefunctions.html!,"list 
-of the functions") \}
- which WeBWorK understands.   WeBWorK ALWAYS uses radian mode for trig functions. 
- $PAR
-END_TEXT
-
-&ANS( std_num_cmp(sin(3.1415926/4)) );
-BEGIN_TEXT
-You can also use juxtaposition to denote multiplication. E.g. enter \( 2\sin(3\pi/2) \).
-You can enter this as 2*sin(3*pi/2) or more simply as 2sin(3pi/2).  Try it: $BR 
-\{ ans_rule(20) \}$PAR
-
-END_TEXT
-
-$pi = 4*atan(1);
-&ANS( std_num_cmp(2*sin(3*$pi/2)) );
-
-BEGIN_TEXT
-Sometimes you need to use ( )'s to make your meaning clear. E.g. 1/2+3 is 3.5, but  1/(2+3) is .2 Why?
-Try entering both and use the ${LQ}Preview${RQ} button below to see the difference.  In addition to
-( )'s, you can also use [ ]'s and $LB ${RB}'s.  $BR
-\{ ans_rule(20) \}$PAR
-END_TEXT
-
-&ANS( std_num_cmp(.2));
-
-BEGIN_TEXT
-You can always try to enter answers and let WeBWorK do the calculating. 
-WeBWorK will tell you if the problem requires a strict numerical answer. 
-The way we use WeBWorK in this class there is no penalty for getting an answer wrong.  What counts
-is that you get the answer right eventually (before the due date).  For complicated answers,
-you should use the ${LQ}Preview${RQ} button to check for syntax errors and also to check that the answer
-you enter is really what you think it is.
-END_TEXT
-
-ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/clients/t/input.pg b/clients/t/input.pg
deleted file mode 100644
index e4e514e712..0000000000
--- a/clients/t/input.pg
+++ /dev/null
@@ -1,100 +0,0 @@
-##DESCRIPTION
-##  A very simple first problem
-##ENDDESCRIPTION
-##KEYWORDS('algebra')
-DOCUMENT();        # This should be the first executable line in the problem.
-loadMacros(
-"PG.pl",
-"PGbasicmacros.pl",
-"PGchoicemacros.pl",
-"PGanswermacros.pl",
-"PGinfo.pl",
-"PGauxiliaryFunctions.pl"
-);
-
-TEXT(beginproblem());
-$showPartialCorrectAnswers = 1;
-$a = random(-10,-1,1);
-$b = random(1,11,1);
-$c = random(1,11,1);
-$d = random(1,11,1);
-
-BEGIN_TEXT
-$PAR
-displayMode  is $displayMode  problem seed is $problemSeed $BR
-$PAR
-This problem demonstrates how you enter numerical answers into WeBWorK. $PAR
-Evaluate the expression \(3($a )($b -$c -2($d ))\):
-
- \{ ans_rule(10) \}
-
-$BR
-END_TEXT
-$ans = 3*($a)*($b-$c-2*($d));
-
-&ANS(strict_num_cmp($ans));
-
-BEGIN_TEXT
-
-In the case above you need to enter a number, since we're testing whether you can multiply
-out these numbers. (You can use a calculator if you want.) 
-$PAR
-For most problems, you will be able to get WeBWorK to
-do some of the work for you.  For example
-$BR
-Calculate ($a) * ($b): \{ ans_rule()\}
-$BR
-END_TEXT
-$ans = $a*$b;
-
-&ANS(std_num_cmp($ans));
-
-BEGIN_TEXT
-The asterisk is what most computers use to denote multiplication and you can use this with WeBWorK. 
-But WeBWorK will also allow use to use  a space to denote multiplication.
-You can either \($a * $b\) or \{$a*$b\} or even \($a \ $b\).  All will work. Try them.  
-$PAR
-Now try calculating the sine of 45 degrees ( that's sine of pi over 4 in radians
-and numerically sin(pi/4) equals \{1/sqrt(2)\} or, more precisely,  \(1/\sqrt{2} \) ).  
-You can enter this as  sin(pi/4) , as 
-sin(3.1415926/4), as 1/sqrt(2), as 2**(-.5), etc. This is because WeBWorK knows about 
-functions like sin  and sqrt (square root). (Note: exponents
-can be indicated by either a "caret" or **). Try it.$BR  \( \sin(\pi/4) = \) \{ ans_rule(20) \}$PAR
- Here's the 
-\{
-htmlLink(qq!http://webwork.math.rochester.edu/webwork_system_html/docs/docs/pglanguage/availablefunctions.html!,"list 
-of the functions") \}
- which WeBWorK understands.   WeBWorK ALWAYS uses radian mode for trig functions. 
- $PAR
-END_TEXT
-
-&ANS( std_num_cmp(sin(3.1415926/4)) );
-BEGIN_TEXT
-You can also use juxtaposition to denote multiplication. E.g. enter \( 2\sin(3\pi/2) \).
-You can enter this as 2*sin(3*pi/2) or more simply as 2sin(3pi/2).  Try it: $BR 
-\{ ans_rule(20) \}$PAR
-
-END_TEXT
-
-$pi = 4*atan(1);
-&ANS( std_num_cmp(2*sin(3*$pi/2)) );
-
-BEGIN_TEXT
-Sometimes you need to use ( )'s to make your meaning clear. E.g. 1/2+3 is 3.5, but  1/(2+3) is .2 Why?
-Try entering both and use the ${LQ}Preview${RQ} button below to see the difference.  In addition to
-( )'s, you can also use [ ]'s and $LB ${RB}'s.  $BR
-\{ ans_rule(20) \}$PAR
-END_TEXT
-
-&ANS( std_num_cmp(.2));
-
-BEGIN_TEXT
-You can always try to enter answers and let WeBWorK do the calculating. 
-WeBWorK will tell you if the problem requires a strict numerical answer. 
-The way we use WeBWorK in this class there is no penalty for getting an answer wrong.  What counts
-is that you get the answer right eventually (before the due date).  For complicated answers,
-you should use the ${LQ}Preview${RQ} button to check for syntax errors and also to check that the answer
-you enter is really what you think it is.
-END_TEXT
-
-ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/clients/t/labels.pg b/clients/t/labels.pg
deleted file mode 100644
index 31048715f7..0000000000
--- a/clients/t/labels.pg
+++ /dev/null
@@ -1,29 +0,0 @@
-##DESCRIPTION
-##  A very simple first problem
-##ENDDESCRIPTION
-##KEYWORDS('algebra')
-DOCUMENT();        # This should be the first executable line in the problem.
-loadMacros(
-"PGstandard.pl",
-"MathObjects.pl",
-"PGmatrixmacros.pl",
-);
-Context("Vector");
-
-TEXT(beginproblem());
-
-$showPartialCorrectAnswers = 1;
-$a = random(-10,-1,1);
-$b = random(1,11,1);
-$c = random(1,11,1);
-$d = random(1,11,1);
-$two = Real("2");
-BEGIN_TEXT
-$PAR
-Enter 1 \{ANS(num_cmp(1)),  ans_rule(30)\}$BR
-Enter 2 \{ANS($two->cmp), ans_rule(30)  \}$BR
-Enter \(x^2-1\) \{ANS(Compute("x^2-1")->cmp); ans_rule(30)\}$BR
-Enter \(x^2-1\) \{ANS(Compute("x^2-1")->cmp); ans_box(2,30)\}$BR
-Enter \(< 4, 6, 7>\)\{ANS(Compute("<4,6,7>")->cmp), ans_rule( 30)\} $BR
-END_TEXT
-ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/clients/t/matrixtest4.pg b/clients/t/matrixtest4.pg
deleted file mode 100644
index 225987c7fa..0000000000
--- a/clients/t/matrixtest4.pg
+++ /dev/null
@@ -1,53 +0,0 @@
-DOCUMENT(); 
- 
-loadMacros(
-"PGstandard.pl",
-"MathObjects.pl",
-"parserMultiAnswer.pl",
-"MatrixCheckers.pl",
-"PGmatrixmacros.pl",
-"PGinfo.pl",
-"PGcourse.pl",
-);
-
-Context("Matrix");
-
-TEXT(beginproblem());
-TEXT($BEGIN_ONE_COLUMN);
-$showPartialCorrectAnswers = 1;
-
-
-BEGIN_TEXT
-MathObject matrices
-$PAR
-\{display_matrix([[1,4,7],[3,1,7]]) \}
-
-END_TEXT
-
-$M = Matrix(" [[4,5,6],[3,2,1]]" );
-$M2 = Matrix("[[1,2],[3,4]]");
-$M3 = Matrix("[[3,1],[4,1]]");
-$input = $inputs_ref->{AnSwEr0001}//'[0]';
-$N = Matrix($input);
-$N2 = Matrix($inputs_ref->{mymatrix}//'[0]');
-Context()->texStrings;
-BEGIN_TEXT
-Enter a matrix here [[4,5,6],[3,2,1]] \{ANS($M->cmp), ans_box( 4,80) \} $BR
-and the entered matrix is 
-\[$N\]
-$BR
-Enter a matrix here [[1,2],[3,4]] \{NAMED_ANS_BOX('mymatrix', 4,80) \} $BR
-\[$N2\]
-$BR
-Enter a final matrix [[3,1],[4,1]] here $PAR
-\{ANS($M3->cmp),$M3->ans_array(3) \} $PAR
-END_TEXT
-Context()->normalStrings;
-
-
-LABELED_ANS('mymatrix', $M2->cmp);
-
-
-#listVariables();
-
-ENDDOCUMENT();
\ No newline at end of file
diff --git a/clients/t/show-psvn.pg b/clients/t/show-psvn.pg
deleted file mode 100644
index 495f54bc81..0000000000
--- a/clients/t/show-psvn.pg
+++ /dev/null
@@ -1,19 +0,0 @@
-##DESCRIPTION
-##  A very simple first problem
-##ENDDESCRIPTION
-##KEYWORDS('algebra')
-DOCUMENT();        # This should be the first executable line in the problem.
-loadMacros(
-"PG.pl",
-"PGbasicmacros.pl",
-);
-
-TEXT(beginproblem());
-
-BEGIN_TEXT
-$PAR
-PSVN is $psvn
-$PAR
-END_TEXT
-
-ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/clients/t/test-utf8-hebrew.pg b/clients/t/test-utf8-hebrew.pg
deleted file mode 100644
index b932d046f0..0000000000
--- a/clients/t/test-utf8-hebrew.pg
+++ /dev/null
@@ -1,37 +0,0 @@
-DOCUMENT();        # This should be the first executable line in the problem.
-
-loadMacros(
-  "PGstandard.pl",
-  "MathObjects.pl",
-);
-
-SET_PROBLEM_TEXTDIRECTION("rtl");
-SET_PROBLEM_LANGUAGE("he-IL");
-
-TEXT(beginproblem());
-
-Context("Numeric");
-
-$a = random(1,9,1);
-$b = random(1,9,1);
-
-$ans1 = Real("10*$a + $b");
-
-Context()->texStrings;
-BEGIN_TEXT
-
-חשב את \( f(x) = 10 x + $b \) עבור הערך \( x = $a \).
-$PAR
-
-$BCENTER
-\{ openSpan( { "dir" => "ltr" } ) \}
-\( f($a) = \) \{ $ans1->ans_rule(2) \}
-\{ closeSpan() \}
-$ECENTER
-
-END_TEXT
-Context()->normalStrings;
-
-ANS( $ans1->cmp() );
-
-ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/clients/t/test1.pg b/clients/t/test1.pg
deleted file mode 100644
index b61ef32560..0000000000
--- a/clients/t/test1.pg
+++ /dev/null
@@ -1,40 +0,0 @@
-DOCUMENT();      
-loadMacros(
-  "PGstandard.pl",     # Standard macros for PG language
-  "MathObjects.pl",
-  "contextAlternateIntervals.pl",
-  "contextInequalitySetBuilder.pl"
-);
-Context("InequalitySetBuilder");
-Context("InequalitySetBuilder");
-context::AlternateIntervals->Enable;
-Context()->flags->set(enterIntervals=>"either",
-displayIntervals=>"alternate");
-$S1 = Compute("{ x : 1 < x <= 4 }");
-$S2 = SetBuilder("]1,4[");     # force interval to be set in set-builder notation
-$S3 = Interval("[1,4[");
-$S4 = Compute("{ x : x < -2 or x > 2 }");  # forms the Union (-inf,-2) U (2,inf)
-$S5 = Compute("{ x : x > 2 and x <= 4 }"); # forms the Interval (2,4]
-$S6 = Compute("{ x : x = 1 }");            # forms the Set {1}
-$S7 = Compute("{ x : x != 1 }");           # forms the Union (-inf,1) U (1,inf)
-Context()->texStrings;
-BEGIN_TEXT
-\{createFile('/tmp/his','thing')\}
-\($S1\) \{$S1->ans_rule\} $BR
-\($S2\) \{$S2->ans_rule\} $BR
-\($S3\) \{$S3->ans_rule\} $BR
-\($S4\) \{$S4->ans_rule\} $BR
-\($S5\) \{$S5->ans_rule\} $BR
-\($S6\) \{$S6->ans_rule\} $BR
-\($S7\) \{$S7->ans_rule\} $BR
-END_TEXT
-Context()->normalStrings;
-ANS($S1->cmp());
-ANS($S2->cmp());
-ANS($S3->cmp());
-ANS($S4->cmp());
-ANS($S5->cmp());
-ANS($S6->cmp());
-ANS($S7->cmp());
-ENDDOCUMENT();        
-
diff --git a/clients/t/testMultAnswer.pg b/clients/t/testMultAnswer.pg
deleted file mode 100644
index b8bffb494a..0000000000
--- a/clients/t/testMultAnswer.pg
+++ /dev/null
@@ -1,117 +0,0 @@
-##DESCRIPTION
-##  Algebra problem: true or false for inequality 
-##ENDDESCRIPTION
-
-##KEYWORDS('algebra', 'inequality', 'fraction')
-
-## DBsubject('Algebra')
-## DBchapter('Fundamentals')
-## DBsection('Real Numbers')
-## Date('6/3/2002')
-## Author('')
-## Institution('')
-## TitleText1('Precalculus')
-## EditionText1('3')
-## AuthorText1('Stewart, Redlin, Watson')
-## Section1('1.1')
-## Problem1('22')
-
-########################################################################
-
-DOCUMENT();      
-
-loadMacros(
-   "PGstandard.pl",     # Standard macros for PG language
-   "MathObjects.pl",
-   "parserMultiAnswer.pl",
-   #"source.pl",        # allows code to be displayed on certain sites.
-   #"PGcourse.pl",      # Customization file for the course
-);
-
-# Print problem number and point value (weight) for the problem
-TEXT(beginproblem());
-
-# Show which answers are correct and which ones are incorrect
-$showPartialCorrectAnswers = 1;
-
-##############################################################
-#
-#  Setup
-#
-#
-Context("Numeric");
-
-$fac1 = Formula("(1 - x)");
-$fac2 = Formula("(1 + x)");
-
-$multians = MultiAnswer($fac1, $fac2)->with(
-  singleResult => 0,
-  checker => sub {
-      my ( $correct, $student, $self ) = @_;
-      my ( $f1stu, $f2stu ) = @{$student};
-      my ( $f1, $f2 ) = @{$correct};
-      if ( ($f1 == $f1stu && $f2 == $f2stu) ||
-           ($f1 == $f2stu && $f2 == $f1stu) ) {
-          return [1,1];
-      } else {
-          if ($f1 == $f1stu || $f2 == $f1stu) {
-              return [1,0];
-          } elsif ($f1 == $f2stu || $f2 == $f2stu) {
-              return [0,1];
-          } else {
-              return [0,0];
-          }
-      }
-  }
-);
-
-$multians2 = MultiAnswer($fac1, $fac2)->with(
-  singleResult => 1,
-  checker => sub {
-      my ( $correct, $student, $self ) = @_;
-      my ( $f1stu, $f2stu ) = @{$student};
-      my ( $f1, $f2 ) = @{$correct};
-      if ( ($f1 == $f1stu && $f2 == $f2stu) ||
-           ($f1 == $f2stu && $f2 == $f1stu) ) {
-          return 1;
-      } else {
-         return 0
-      }
-  }
-);
-##############################################################
-#
-#  Text
-#
-#
-
-Context()->texStrings;
-BEGIN_TEXT
-
-Multi-Answer test with singleResult=>0 $BR
-
-Factor: \(1-x^2 = \big( \)
-\{$multians->ans_rule(10)\}
-\( \big) \big( \) 
-\{$multians->ans_rule(10)\}
-\( \big) \)
-$PAR
-Multi-Answer test with singleResult=>1 $BR
-
-Factor: \(1-x^2 = \big( \)
-\{$multians2->ans_rule(10)\}
-\( \big) \big( \) 
-\{$multians2->ans_rule(10)\}
-\( \big) \)
-END_TEXT
-Context()->normalStrings;
-
-##############################################################
-#
-#  Answers
-#
-#
-
-ANS( $multians->cmp(), $multians2->cmp() ); 
-
-ENDDOCUMENT();
\ No newline at end of file
diff --git a/clients/t/test_embedded_problems.html b/clients/t/test_embedded_problems.html
deleted file mode 100644
index 9b28eedc11..0000000000
--- a/clients/t/test_embedded_problems.html
+++ /dev/null
@@ -1,327 +0,0 @@
-<!DOCTYPE html>  
-<html lang="en">
-<head>
-  <meta charset="utf-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-  <title>mth162_overview</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <style id="mkstylesheet">
-body{-webkit-font-smoothing:antialiased;font-family:"Helvetica Neue",Helvetica,Arial,Verdana,sans-serif;margin:30px 0 0;padding:0;background:#fff}#wrapper{padding:20px}li{font-size:110%}li li{font-size:100%}li p{font-size:100%;margin:.5em 0}h1{color:#000}h2{color:#111}h3{color:#111;margin:0}h4{color:#111}h5{color:#111}h6{font-size:1em;line-height:1.5em;margin:1.5em 0}body,p,td,div{color:#111;font-family:"Helvetica Neue",Helvetica,Arial,Verdana,sans-serif;word-wrap:break-word}a{color:#0d6ea1;text-decoration:none;-webkit-transition:color 0.2s ease-in-out;-moz-transition:color 0.2s ease-in-out;-o-transition:color 0.2s ease-in-out;-ms-transition:color 0.2s ease-in-out;transition:color 0.2s ease-in-out}a:hover{color:#3593d9}body{font-size:15px;line-height:21px;margin:0 auto}h1{font-size:37px;line-height:42px;margin-top:42px;margin-bottom:21px}h2{font-size:27px;line-height:42px;margin-top:42px;margin-bottom:21px}h3{font-size:20px;line-height:21px;margin-top:21px;margin-bottom:21px}h4{font-size:20px;line-height:21px;margin-top:21px;margin-bottom:21px}p,ul,ol,pre,table,blockquote{margin-top:21px;margin-bottom:21px}hr{border:1px solid;margin:-1px 0}ul ul,ol ol,ul ol,ol ul{margin-top:0;margin-bottom:0}b,strong,em,small,code{line-height:1}.footnote{color:#0d6ea1;font-size:.8em;vertical-align:super}abbr,acronym{border-bottom:1px dotted #aaa}#wrapper img{max-width:100%;height:auto}dd{font-size:1em;margin-bottom:1em}li>p:first-child{margin:0}ul,ol{padding-left:1.5em}ul ul,ul ol{margin-bottom:.4em}caption,col,colgroup,table,tbody,td,tfoot,th,thead,tr{border-spacing:0}table{border:1px solid rgba(0,0,0,0.25);border-collapse:collapse;display:table;empty-cells:hide;margin:-1px 0 1.3125em;padding:0;table-layout:fixed}caption{display:table-caption;font-weight:700}col{display:table-column}colgroup{display:table-column-group}tbody{display:table-row-group}tfoot{display:table-footer-group}thead{display:table-header-group}td,th{display:table-cell}tr{display:table-row}table th,table td{font-size:1.1em;line-height:1.3;padding:.5em 1em 0}table thead{background:rgba(0,0,0,0.15);border:1px solid rgba(0,0,0,0.15);border-bottom:1px solid rgba(0,0,0,0.2)}table tbody{background:rgba(0,0,0,0.05)}table tfoot{background:rgba(0,0,0,0.15);border:1px solid rgba(0,0,0,0.15);border-top:1px solid rgba(0,0,0,0.2)}figure{display:inline-block;overflow:hidden;position:relative;margin:1em 0 2em}figcaption{font-style:italic;text-align:center;background:white;color:#666}.poetry pre{display:block;font-family:Georgia,Garamond,serif !important;font-size:110% !important;font-style:italic;line-height:1.6em;margin-left:1em}.poetry pre code{font-family:Georgia,Garamond,serif !important;word-break:break-all;word-break:break-word;-webkit-hyphens:auto;-moz-hyphens:auto;hyphens:auto;white-space:pre-wrap}blockquote p{font-size:110%;font-style:italic;line-height:1.6em}sup,sub,a.footnote{font-size:1.4ex;height:0;line-height:1;position:relative;vertical-align:super}sub{vertical-align:sub;top:-1px}p,h5{font-size:1.1429em;line-height:1.3125em;margin:1.3125em 0}dt,th{font-weight:700}table tr:nth-child(odd),table th:nth-child(odd),table td:nth-child(odd){background:rgba(255,255,255,0.06)}table tr:nth-child(even),table td:nth-child(even){background:rgba(200,200,200,0.25)}@media print{img,table,figure{page-break-inside:avoid}#wrapper{background:#fff;color:#303030;padding:10px;position:relative;text-indent:0}}@media screen{.inverted{background:#252a2a}.inverted #wrapper{background:#252a2a;color:#eee}.inverted hr{border-color:#333f40 !important}.inverted p,.inverted td,.inverted li,.inverted h1,.inverted h2,.inverted h3,.inverted h4,.inverted h5,.inverted h6,.inverted th,.inverted .math,.inverted caption,.inverted dt,.inverted dd{color:#eee}.inverted pre{background:#ccc;color:#111}.inverted table{background:none}.inverted table tr:nth-child(odd),.inverted table td:nth-child(odd){background:none}.inverted a{color:#acd1d5}::selection{background:rgba(157,193,200,0.5)}h1::selection{background-color:rgba(45,156,208,0.3)}h2::selection{background-color:rgba(90,182,224,0.3)}h3::selection,h4::selection,h5::selection,h6::selection,li::selection,ol::selection{background-color:rgba(133,201,232,0.3)}code::selection{background-color:rgba(0,0,0,0.7);color:#eee}code span::selection{background-color:rgba(0,0,0,0.7) !important;color:#eee !important}a::selection{background-color:rgba(255,230,102,0.2)}.inverted a::selection{background-color:rgba(255,230,102,0.6)}td::selection,th::selection,caption::selection{background-color:rgba(180,237,95,0.5)}}
-#mkreplaced-toc{list-style-position:inside;padding:0;margin:0 0 0 1rem;list-style-type:none}#mkreplaced-toc li::before{content:''}#mkreplaced-toc li{font-size:1.5rem;line-height:1.5;font-weight:normal}#mkreplaced-toc li ul{font-size:1.3rem;font-weight:300;padding:.5rem 0;margin:0 0 0 1rem}#mkreplaced-toc li.missing{list-style-type:none !important}#mkreplaced-toc.max-1 ul,#mkreplaced-toc.max1 ul{display:none}#mkreplaced-toc.max-2 ul ul,#mkreplaced-toc.max2 ul ul{display:none}#mkreplaced-toc.max-3 ul ul ul,#mkreplaced-toc.max3 ul ul ul{display:none}#mkreplaced-toc.max-4 ul ul ul ul,#mkreplaced-toc.max4 ul ul ul ul{display:none}#mkreplaced-toc.max-5 ul ul ul ul ul,#mkreplaced-toc.max5 ul ul ul ul ul{display:none}.rtl{direction:rtl;text-align:right}@media print{body{background:white;line-height:1.4}html,body,#wrapper{max-width:100%;width:100%;-webkit-text-size-adjust:none;-webkit-perspective:none !important;box-sizing:border-box;width:auto;border:0;margin:0;padding:0;float:none;-moz-box-shadow:none !important;-webkit-box-shadow:none !important;box-shadow:none !important}h1,h2,h3,h4,h5,h6{page-break-after:avoid}p,h2,h3{orphans:3;widows:3}section{page-break-before:avoid}#generated-toc,#firstdiff,#toc-title,#mkdocumentprogress,#mkincludechart,#mkprogressbar1,#mkprogressbar2,.mkscrollmeter,#alllinks,.popup{display:none !important}.suppressprintlinks a{color:inherit !important;text-decoration:none !important;border-bottom:none !important;cursor:default !important}.hrefafterlinktext #wrapper a:link:after,.hrefafterlinktext #wrapper a:visited:after{content:" (" attr(href) ") ";font-size:90%;opacity:0.9}.nocodebreak pre{page-break-inside:avoid}img,table,figure{page-break-inside:avoid}.breakfootnotes .footnotes{page-break-before:always}.breakfootnotes .footnotes hr{display:none}#mktoctitle{display:block}#print-title{display:block;border-bottom:solid 1px #666}#wrapper pre{white-space:pre;white-space:pre-wrap;word-wrap:break-word}#wrapper #generated-toc-clone,#wrapper #mkreplaced-toc{display:block}}
-#wrapper #generated-toc-clone, #wrapper #mkreplaced-toc, #wrapper #generated-toc-clone ul, #wrapper #mkreplaced-toc ul {
-    list-style-position: inside;
-}
-#wrapper #generated-toc-clone li.missing, #wrapper #mkreplaced-toc li.missing {
-    list-style-type: none!important;
-}
-#wrapper #generated-toc-clone, #wrapper #mkreplaced-toc {
-    list-style-type: upper-roman;
-}
-#wrapper #generated-toc-clone>li>ul, #wrapper #mkreplaced-toc>li>ul  {
-    list-style-type: decimal;
-}
-#wrapper #generated-toc-clone>li>ul>li>ul, #wrapper #mkreplaced-toc>li>ul>li>ul {
-    list-style-type: decimal-leading-zero;
-}
-#wrapper #generated-toc-clone>li>ul>li>ul>li>ul, #wrapper #mkreplaced-toc>li>ul>li>ul>li>ul {
-    list-style-type: lower-greek;
-}
-#wrapper #generated-toc-clone>li>ul>li>ul>li>ul>li>ul, #wrapper #mkreplaced-toc>li>ul>li>ul>li>ul>li>ul {
-    list-style-type: disc;
-}
-#wrapper #generated-toc-clone>li>ul>li>ul>li>ul>li>ul>li>ul, #wrapper #mkreplaced-toc>li>ul>li>ul>li>ul>li>ul>li>ul {
-    list-style-type: square;
-}
-#wrapper #generated-toc-clone,#wrapper #mkreplaced-toc{list-style-position:outside!important;margin-left:2rem;}
-</style>
-
-<style id="mkprintstyles">@media print{#wrapper #generated-toc-clone,#generated-toc{display:none!important;}
-html,body,#wrapper{font-size:10pt!important;}
-}
-</style>
-
-
-</head>
-<body class="normal">
-  <div id="wrapper">
-      <h1 id="math162secondsemestercalculus">Math 162, Second semester Calculus</h1>
-
-<p>Here are some remarks on the topics we will cover this semester with examples<br/>
-of the kinds of homework questions we&#8217;ll ask you to work on in each homework set.</p>
-
-<h2 id="review:0.fundamentaltheoremofcalculusintegrationbysubstitutionindefiniteintegration">Review: 0. Fundamental theorem of Calculus, Integration by Substitution, Indefinite integration</h2>
-<p>
-Be patient while the entire page of problems loads for the first time. 
-</p>
-<p>
-Additional information about WeBWorK can be found at <a href="https://webwork.maa.org/wiki">https://webwork.maa.org/wiki</a> and <a href="https://webwork.maa.org/planet">https://webwork.maa.org/planet</a>
-</p>
-
-<p><iframe  width="800" height="600"  
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?  
-    &answersSubmitted=0&  
-    &sourceFilePath=Library/FortLewis/Calc1/06-01-Antiderivatives-graphically/AF1/AF1.pg&  
-    &problemSeed=123567&  
-    &courseID=daemon_course&  
-    &userID=daemon&  
-    &course_password=daemon&  
-    &showSummary=1&  
-    &displayMode=MathJax&  
-    &problemUUID=102&  
-    &language=en&  
-    &outputformat=sticky"><br/>
-</iframe></p>
-
-<p>Play with the Geogebra applet above to get a feeling for the relationship between <span class="math">\(f\)</span>, the height<br/>
-of the upper boundary of the region at <span class="math">\(x\)</span>, and <span class="math">\(F\)</span>, the area of the region to the left of <span class="math">\(x\)</span>.</p>
-
-<p><span class="math">\(f\)</span> is the derivative of <span class="math">\(F\)</span> and <span class="math">\(F\)</span> is an anti-derivative of <span class="math">\(f\)</span>. A visual image of this<br/>
-relationship is useful. (Why did I write <strong>an</strong> antiderivative?)</p>
-
-<p><iframe  width="800" height="400"  
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?  
-    &answersSubmitted=0&  
-    &sourceFilePath=Library/Union/setIntFTC/sc5_4_13.pg&  
-    &problemSeed=123567&  
-    &courseID=daemon_course&  
-    &userID=daemon&  
-    &course_password=daemon&  
-    &showSummary=1&  
-    &displayMode=MathJax&  
-    &problemUUID=102&  
-    &language=en&  
-    &outputformat=sticky"><br/>
-</iframe></p>
-
-<p><iframe  width="800" height="400"  
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?  
-    &answersSubmitted=0&  
-    &sourceFilePath=Library/ma122DB/set12/s5_4_14.pg&  
-    &problemSeed=123567&  
-    &courseID=daemon_course&  
-    &userID=daemon&  
-    &course_password=daemon&  
-    &showSummary=1&  
-    &displayMode=MathJax&  
-    &problemUUID=102&  
-    &language=en&  
-    &outputformat=sticky"><br/>
-</iframe></p>
-
-<h2 id="1.topics:areasbetweencurves">1. <strong>Topics</strong>: , Areas Between Curves</h2>
-
-<p><iframe  width="800" height="600"  
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?  
-    &answersSubmitted=0&  
-    &sourceFilePath=Library/Rochester/setIntegrals19Area/ns6_1_1.pg&  
-    &problemSeed=123567&  
-    &courseID=daemon_course&  
-    &userID=daemon&  
-    &course_password=daemon&  
-    &showSummary=1&  
-    &displayMode=MathJax&  
-    &problemUUID=102&  
-    &language=en&  
-    &outputformat=sticky"><br/>
-</iframe></p>
-
-<p>The example above is simple once you draw the picture! We&#8217;ll see how<br/>
-this can be reduced to integrating <span class="math">\(f(x)-g(x)\)</span>. To make this visually<br/>
-obvious imagine that the region is composed of vertical tooth picks and<br/>
-then slide them so their butts all rest on the <span class="math">\(x\)</span>-axis. The tooth picks<br/>
-haven&#8217;t changed length or thickness so the area hasn&#8217;t changed either.<br/>
-(look up <a href="https://en.wikipedia.org/wiki/Bonaventura_Cavalieri">Cavalieri</a> and his principle !)</p>
-
-<h2 id="2.topics:volumeswork">2. <strong>Topics</strong>: Volumes, Work</h2>
-
-<p><iframe  width="800" height="600"  
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?  
-    &answersSubmitted=0&  
-    &sourceFilePath=Library/Rochester/setIntegrals20Volume/osu_in_20_2/osu_in_20_2.pg&  
-    &problemSeed=123567&  
-    &courseID=daemon_course&  
-    &userID=daemon&  
-    &course_password=daemon&  
-    &showSummary=1&  
-    &displayMode=MathJax&  
-    &problemUUID=102&  
-    &language=en&  
-    &outputformat=sticky"><br/>
-</iframe></p>
-
-<p>Visualizing and describing the region whose area or volume you want to find is often the hardest part of the problem. You&#8217;ll get lots of practice visualizing as with the example above and the one below.</p>
-
-<p><iframe  width="800" height="600"  
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?  
-    &answersSubmitted=0&  
-    &sourceFilePath=Library/UMN/calculusStewartCCC/s_6_3_6.pg&  
-    &problemSeed=123567&  
-    &courseID=daemon_course&  
-    &userID=daemon&  
-    &course_password=daemon&  
-    &showSummary=1&  
-    &displayMode=MathJax&  
-    &problemUUID=102&  
-    &language=en&  
-    &outputformat=sticky"><br/>
-</iframe></p>
-
-<p>This problem is harder (at first). You first have to visualize the region, then understand the volume of each of the thin vertical cylinders it&#8217;s made up of, (cylinders are what you get if you rotate vertical toothpicks around the <span class="math">\(y\)</span> axis), and then add these<br/>
-volumes together (the Riemann sum).</p>
-
-<p>The Riemann integral is simply the &#8216;one and only&#8217; value (mathematicians say &#8216;unique&#8217; value) you get when the toothpicks are thin enough. BUT the integral has the enormous advantage that you can calculate it using anti-derivatives instead of doing lots and lots of addition of volumes.</p>
-
-<h2 id="3.topics:integrationbypartstrigintegrals">3. <strong>Topics</strong>: Integration by Parts, Trig Integrals</h2>
-
-<p>In some ways this section is more technical &#8211; a bunch of challenges, like solving cross-word puzzles &#8211; some people find this really fun.<br/>
-As an analyst and a geometer I can tell you that integration by parts also has REALLY important theoretical uses as well.<br/>
-I can&#8217;t explain the theoretical importance to you yet however, maybe next semester if we get to Stoke&#8217;s theorem in multivariable calculus. :-)</p>
-
-<h2 id="4.topics:trigsubstitutionpartialfractions">4. <strong>Topics</strong>: Trig Substitution, Partial Fractions</h2>
-
-<p>More technical challenges. For me, when I took calculus, these challenges were one of the most fun parts of the course. </p>
-
-<p>But I have admit, particularly now-a-days, that Mathematica or Maple or Sage (or you guys) can solve these faster than I can. </p>
-
-<p>These challenges do illustrate one larger concept however. These antidifferentiation techniques are the simplest example of <strong>Inverse Problems</strong>. We can differentiate most functions <span class="math">\(F\)</span> mechanically &#8211;it&#8217;s much harder to do the reverse &#8211; to guess the function <span class="math">\(F\)</span> given the function <span class="math">\(f\)</span> (and then check your guess by differentiating <span class="math">\(F\)</span>). And yes guessing (then checking) plays a <strong>big</strong> role in Inverse Problems.</p>
-
-<p>&#8220;Integration techniques&#8221; are just advanced, efficient methods of guessing of anti-derivatives. (And usually it is worth your while to validate your answer by differentiating.</p>
-
-<p>Another inverse problem is solving differential equations, and inverse problems just get more and more interesting from there. </p>
-
-<p>Given the shape of a drum one can calculate what it will sound like relatively easily. If you hear a drum can you predict its shape from the sound alone? Well?? What do you think?</p>
-
-<h2 id="5topics:improperintegralsarclength">5 <strong>Topics</strong>: Improper Integrals, Arc Length</h2>
-
-<p>These two topics don&#8217;t fit together that well. We&#8217;ll talk about about improper integrals more later. The arc length problem is simply calculating the length of a rope when it is not straight. You do it by approximating by straight lines and then adding everything up of course. Here is an example.</p>
-
-<h2 id="6.topics:surfaceareacurvesdefinedbyparametricequations">6. <strong>Topics</strong>: Surface Area, Curves defined by parametric equations</h2>
-
-<h2 id="7.topics:calculusofparametriccurves">7. <strong>Topics</strong>: Calculus of parametric curves</h2>
-
-<p>This is the beginning of a topic which is really important to physicists and engineers &#8211; how to describe things that don&#8217;t go in straight lines. It&#8217;s also important for video game designers (oh yes and mathematicians like them as well.) Here is a sample problem &#8211; don&#8217;t try to calculate the area yet just see why the formula makes sense. (You can try visualizing as the sum of two vectors that change with time.)</p>
-
-<p><iframe  width="800" height="400"  
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?  
-    &answersSubmitted=0&  
-    &sourceFilePath=Library/UCSB/Stewart5_10_2/Stewart5_10_2_74/Stewart5_10_2_74.pg&  
-    &problemSeed=123567&  
-    &courseID=daemon_course&  
-    &userID=daemon&  
-    &course_password=daemon&  
-    &showSummary=1&  
-    &displayMode=MathJax&  
-    &problemUUID=102&  
-    &language=en&  
-    &outputformat=sticky"><br/>
-</iframe></p>
-
-<h2 id="8.topics:polarcoordinates:areasandlengthssequences">8. <strong>Topics</strong>: Polar coordinates: Areas and lengths, Sequences</h2>
-
-<p>Physicists and differential geometers have a magic weapon. They choose the right coordinate system to describe the problem. If you get the coordinate system right the problem becomes much simpler. Here is an example.<br/>
-<iframe  width="800" height="400"  
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?  
-    &answersSubmitted=0&  
-    &sourceFilePath=Library/WHFreeman/Rogawski_Calculus_Early_Transcendentals_Second_Edition/11_Parametric_Equations_Polar_Coordinates_and_Conic_Sections/11.4_Area_and_Arc_Length_in_Polar_Coordinates/11.4.9.pg&  
-    &problemSeed=123567&  
-    &courseID=daemon_course&  
-    &userID=daemon&  
-    &course_password=daemon&  
-    &showSummary=1&  
-    &displayMode=MathJax&  
-    &problemUUID=102&  
-    &language=en&  
-    &outputformat=sticky"><br/>
-</iframe> </p>
-
-<h2 id="9topics:seriesintegraltest">9 <strong>Topics</strong>: Series, Integral test</h2>
-
-<p>Now we get to series. A topic that most students think is impossible at first and then up wondering what they thought was so hard about it. The hidden trick here &#8211; which is not immediately apparent from the cookbook methods &#8211; is the art of approximation &#8211; finding inequalities that give you useful information.<br/>
-This is not widely taught in high schools but its a very creative and interesting skill to acquire &#8211; usually through lots of practice. The squeeze principle which you used in the first semester to find limits is an example of this type of thinking. Here is an example of a series question.</p>
-
-<p>Below is an example (one from the power series chapter) where you can glimpse it&#8217;s importance. A power series defines a function which is just a <strong>really</strong> long polynomial. If the first 10 decimal points of <span class="math">\(f\)</span><br/>
-are completely determined by say the first 20 terms of the series then in that case you might as well just deal with the polynomial, which you understand concretely (and computers can calculate with). &#8220;Functions are just long polynomials.&#8221; This isn&#8217;t strictly true but it&#8217;s 90% true and thinking this way gets you started in the right direction. </p>
-
-<p>To get started solving the problem below just plug in some values. You can use the convention that <span class="math">\(0^0=1\)</span> &#8211;it&#8217;s defined that way because it makes these sigma summation formulas easy to write.</p>
-
-<p>Don&#8217;t be worried by the sigma notation &#8211; get someone to show you how to write it out in long string &#8230; or look it up on the web.<br/>
-<iframe  width="800" height="400"  
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?  
-    &answersSubmitted=0&  
-    &sourceFilePath=Library/ma123DB/set12/s11_9_10.pg&  
-    &problemSeed=123567&  
-    &courseID=daemon_course&  
-    &userID=daemon&  
-    &course_password=daemon&  
-    &showSummary=1&  
-    &displayMode=MathJax&  
-    &problemUUID=102&  
-    &language=en&  
-    &outputformat=sticky"><br/>
-</iframe> </p>
-
-<h2 id="10topics:comparisontestsalternatingseries">10 <strong>Topics</strong>: Comparison tests, Alternating series</h2>
-
-<p>Positive series (where each term is positive) have two choices. Each term is like a derivative (the speed) and the sum is how far you have traveled. Since the speed is positive either you travel all the way to infinity along the <span class="math">\(x\)</span> axis or you travel up to some finite bound (Think <span class="math">\(1/2 + 1/4 +1/8 +...\)</span> can you ever get beyond <span class="math">\(1\)</span> when each term is slowing down that fast? Once you realize this, the trick is to find a known series that goes only a finite distance but is larger than your series (which proves your series converges) or find a known series that is smaller and travels off to infinity, pushing your series ahead of it. Everything else is just details of finding one or the other of these known series.</p>
-
-<h2 id="11topics:ratioandroottestsabsoluteconvergence">11 <strong>Topics</strong>: Ratio and Root tests, Absolute convergence</h2>
-
-<p>These are the details &#8211; we&#8217;ll talk about them when the time comes. </p>
-
-<h2 id="12topics:powerseries">12 <strong>Topics</strong>: Power series</h2>
-
-<p>More details &#8211; specialized for power series &#8220;really long polynomials&#8221;. </p>
-
-<h2 id="13topics:representationoffunctionsaspowerseriestaylorseries">13 <strong>Topics</strong>: Representation of functions as power series, Taylor series</h2>
-
-<p>As I said above there is a sense in which every reasonable function is just a long polynomials. Talyor series come at the end of this course but they are the foundation of most applications and a lot of theory. Just ask anyone taking MTH280 (numerical analysis) or MTH285(applied mathematics) or MTH282 (Complex analysis). They model reality, they solve differential equations. Of course there are a few functions which are much weirder and don&#8217;t behave much like long polynomials and mathematicians (and some physicists) get excited about understanding those if for no other reason that they are a challenge to figure out. </p>
-
-<h2 id="topics:applicationofpowerseries"><strong>Topics</strong>: Application of power series</h2>
-
-<p>Power series are very useful. Here is an example.<br/>
-<iframe  width="800" height="400"  
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?  
-    &answersSubmitted=0&  
-    &sourceFilePath=Library/Union/setSeriesTaylor/ur_sr_9_6.pg&  
-    &problemSeed=123567&  
-    &courseID=daemon_course&  
-    &userID=daemon&  
-    &course_password=daemon&  
-    &showSummary=1&  
-    &displayMode=MathJax&  
-    &problemUUID=102&  
-    &language=en&  
-    &outputformat=sticky"><br/>
-</iframe></p>
-
-<h2 id="forthejmmpresentation">For the JMM presentation</h2>
-
-<p>Here is the magic code for embedding these problems.</p>
-<pre><code class="(null)">&amp;lt; iframe  width=&quot;800&quot; height=&quot;400&quot; 
-src=&quot;https://demo.webwork.rochester.edu/webwork2/html2xml?
-	&amp;answersSubmitted=0&amp;
-	&amp;sourceFilePath=Library/Union/setSeriesTaylor/ur_sr_9_6.pg&amp;
-	&amp;problemSeed=123567&amp;
-	&amp;courseID=daemon_course&amp;
-	&amp;userID=daemon&amp;
-	&amp;course_password=daemon&amp;
-	&amp;showSummary=1&amp;
-	&amp;displayMode=MathJax&amp;
-	&amp;problemUUID=102&amp;
-	&amp;language=en&amp;
-	&amp;outputformat=sticky&quot;&gt;
-&amp;lt; /iframe&gt;</code></pre>
-<div style="display:none"><br/>
-<!--This seemingly unnecessary div markup is the only thing keeping this script working after Markdown conversion. Trust me.--><br/>
- <script type="text/x-mathjax-config">  
-  MathJax.Hub.Config({
-    
-  });  
-</script><br/>
-<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script><br/>
-</div>
-<script>(function(factory){if(typeof define==="function"&&define.amd){define("bidi_helpers",[],factory)}else{window.bidi_helpers=factory()}})(function(){var module={};module.Dir={RTL:-1,UNKNOWN:0,LTR:1};module.Format={LRE:"\u202A",RLE:"\u202B",PDF:"\u202C",LRM:"\u200E",RLM:"\u200F"};module.ltrChars_="A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02B8\u0300-\u0590\u0800-\u1FFF\u2C00-\uFB1C\uFE00-\uFE6F\uFEFD-\uFFFF";module.rtlChars_="\u0591-\u07FF\uFB1D-\uFDFF\uFE70-\uFEFC";module.ltrDirCheckRe_=new RegExp("^[^"+module.rtlChars_+"]*["+module.ltrChars_+"]");module.ltrCharReg_=new RegExp("["+module.ltrChars_+"]");module.hasAnyLtr=function(text){return module.ltrCharReg_.test(text)};module.rtlDirCheckRe_=new RegExp("^[^"+module.ltrChars_+"]*["+module.rtlChars_+"]");module.rtlRe=module.rtlDirCheckRe_;module.isRtlText=function(text){return module.rtlDirCheckRe_.test(text)};module.isLtrText=function(text){return module.ltrDirCheckRe_.test(text)};module.isRequiredLtrRe_=/^http:\/\/.*/;module.hasNumeralsRe_=/\d/;module.estimateDirection=function(text,detectionThreshold){var rtlCount=0;var totalCount=0;var hasWeaklyLtr=false;var tokens=text.split(/\s+/);for(var i=0;i<tokens.length;i++){var token=tokens[i];if(module.isRtlText(token)){rtlCount++;totalCount++}else{if(module.isRequiredLtrRe_.test(token)){hasWeaklyLtr=true}else{if(module.hasAnyLtr(token)){totalCount++}else{if(module.hasNumeralsRe_.test(token)){hasWeaklyLtr=true}}}}}return totalCount==0?(hasWeaklyLtr?module.Dir.LTR:module.Dir.UNKNOWN):(rtlCount/totalCount>detectionThreshold?module.Dir.RTL:module.Dir.LTR)};return module});(function(factory){if(typeof define==="function"&&define.amd){define("bidiweb",["bidi_helpers"],factory)}else{window.bidiweb=factory(bidi_helpers)}})(function(bidi_helpers){var module={};var IProcessor={makeRtl:function(element){},makeLtr:function(element){}};var css_processor=function(classes){return{makeRtl:function(element){element.classList.add(classes.rtl)},makeLtr:function(element){element.classList.add(classes.ltr)}}};var style_processor=function(falign){return{makeRtl:function(element){element.style.direction="rtl";if(falign){element.style.textAlign="right"}},makeLtr:function(element){element.style.direction="ltr";if(falign){element.style.textAlign="left"}}}};module.processors={css:css_processor,style:style_processor};var nodeListMock=function(node){var list=[node];list.item=function(i){return list[i]};return list};module.process=function(query,processor){var elements;if(query instanceof NodeList){elements=query}else{if(query instanceof Node){elements=nodeListMock(query)}else{elements=document.querySelectorAll(query)}}module.process_elements(elements,processor);return elements};module.process_elements=function(elements,processor){for(var index=0;index<elements.length;index++){var element=elements.item(index);var text=element.textContent||element.value||element.placeholder||"";var dir=bidi_helpers.estimateDirection(text,0.4);if(dir==bidi_helpers.Dir.RTL){processor.makeRtl(element)}else{if(dir==bidi_helpers.Dir.LTR){processor.makeLtr(element)}}}};module.process_css=function(query,classes){var proc=module.processors.css(classes);return module.process(query,proc)};module.process_style=function(query,falign){var proc=module.processors.style(falign);return module.process(query,proc)};module.style=function(query){return module.process_style(query,true)};module.css=function(query){return module.process_css(query,{rtl:"rtl",ltr:"ltr"})};module.htmlToElement=function(html){var container=document.createElement("div");container.innerHTML=html;return container};module.html_css=function(html){var container=module.htmlToElement(html);var nodes=container.querySelectorAll("*");module.css(nodes);return container.innerHTML};module.html_style=function(html){var container=module.htmlToElement(html);var nodes=container.querySelectorAll("*");module.style(nodes);return container.innerHTML};return module});</script>
-<!-- ##END MARKED WRAPPER## -->
-    </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/clients/t/test_formats_WWproblems.html b/clients/t/test_formats_WWproblems.html
deleted file mode 100644
index 1f37c23dbf..0000000000
--- a/clients/t/test_formats_WWproblems.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="utf-8" />
-	<title>test formats for embedded problems</title>
-	<meta name="generator" content="BBEdit 12.6" />
-</head>
-<body>
-
-<p>Format: sticky </p>
-<p><iframe  width="800" height="400"  
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?  
-    &answersSubmitted=0&  
-    &sourceFilePath=Library/ma122DB/set12/s5_4_14.pg&  
-    &problemSeed=123567&  
-    &courseID=daemon_course&  
-    &userID=daemon&  
-    &course_password=daemon&  
-    &showSummary=1&  
-    &displayMode=MathJax&  
-    &problemUUID=102&  
-    &language=en&  
-    &outputformat=sticky"><br/>
-</iframe></p>
-<p>Format: standard (has error section -- but there should be no errors) </p>
-<p><iframe  width="800" height="400"  
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?  
-    &answersSubmitted=0&  
-    &sourceFilePath=Library/ma122DB/set12/s5_4_14.pg&  
-    &problemSeed=123567&  
-    &courseID=daemon_course&  
-    &userID=daemon&  
-    &course_password=daemon&  
-    &showSummary=1&  
-    &displayMode=MathJax&  
-    &problemUUID=102&  
-    &language=en&  
-    &outputformat=standard"><br/>
-    </iframe></p>
-    
-<p>Format: simple </p>
-<p><iframe  width="800" height="400"  
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?  
-    &answersSubmitted=0&  
-    &sourceFilePath=Library/ma122DB/set12/s5_4_14.pg&  
-    &problemSeed=123567&  
-    &courseID=daemon_course&  
-    &userID=daemon&  
-    &course_password=daemon&  
-    &showSummary=1&  
-    &displayMode=MathJax&  
-    &problemUUID=102&  
-    &language=en&  
-    &outputformat=simple"><br/>
-</iframe></p>
-
-<p>Format: body_text </p>
-<p><iframe  width="800" height="400"  
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?  
-    &answersSubmitted=0&  
-    &sourceFilePath=Library/ma122DB/set12/s5_4_14.pg&  
-    &problemSeed=123567&  
-    &courseID=daemon_course&  
-    &userID=daemon&  
-    &course_password=daemon&  
-    &showSummary=1&  
-    &displayMode=MathJax&  
-    &problemUUID=102&  
-    &language=en&  
-    &outputformat=body_text"><br/>
-</iframe></p>
-
-<p>Format: PTX </p>
-<p><iframe  width="800" height="400"  
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?  
-    &answersSubmitted=0&  
-    &sourceFilePath=Library/ma122DB/set12/s5_4_14.pg&  
-    &problemSeed=123567&  
-    &courseID=daemon_course&  
-    &userID=daemon&  
-    &course_password=daemon&  
-    &showSummary=1&  
-    &displayMode=MathJax&  
-    &problemUUID=102&  
-    &language=en&  
-    &outputformat=ptx"><br/>
-</iframe></p>
-
-<p>Format: JSON </p>
-<p><iframe  width="800" height="400"  
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?  
-    &answersSubmitted=0&  
-    &sourceFilePath=Library/ma122DB/set12/s5_4_14.pg&  
-    &problemSeed=123567&  
-    &courseID=daemon_course&  
-    &userID=daemon&  
-    &course_password=daemon&  
-    &showSummary=1&  
-    &displayMode=MathJax&  
-    &problemUUID=102&  
-    &language=en&  
-    &outputformat=json"><br/>
-</iframe></p>
-
-</body>
-</html>
diff --git a/clients/t/test_simpleFormat_WWproblem.html b/clients/t/test_simpleFormat_WWproblem.html
deleted file mode 100644
index 079cd45992..0000000000
--- a/clients/t/test_simpleFormat_WWproblem.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="utf-8" />
-	<title>Embed WW in HTML page</title>
-	<meta name="generator" content="BBEdit 11.0" />
-	<link href="https://demo.webwork.rochester.edu/webwork2_files/css/knowlstyle.css" rel="stylesheet" type="text/css" />
-	<link href="https://demo.webwork.rochester.edu/webwork2_files/js/apps/MathView/mathview.css" rel="stylesheet" />
-
-	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-	<script>
-	$(document).ready(function(){
-		$( ".clickme" ).click(function() {
-		  $( this).next().slideToggle( "slow", function() {
-			// Animation complete.
-		  });
-		});
-
-	   // jQuery methods go here...
-	});
-	</script>
-	<style>
-		.clickme {background-color: #ccccFF ;}
-		iframe {
-			margin-left: 20px;
-			padding-left: 10px;
-		}
-	</style>
-</head>
-<body>
-
-<h2>Problem 1-- xmlrpc version of a simple template</h2>
-<p>
-Problem is rendered at daemon_course -- no student information is retained. 
-</p>
-<hr>
-<iframe  width="1000" height="400" 
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=Library/Utah/Quantitative_Analysis/set4_Derivatives/pr_15.pg
-	&problemSeed=123567
-	&courseID=daemon_course
-	&userID=daemon
-	&course_password=daemon
-	&displayMode=MathJax
-	&showSummary=1
-	&language=en
-	&outputformat=simple">
-</iframe>
-<!--
-	&sourceFilePath=Library/Utah/Calculus_I/set5_The_Derivative/1210s5p17/1210s5p17.pg
--->
-<hr>
-<h2>Problem 2 -- webwork2 version of a simple template</h2>
-<p>
-Direct access using RESTful url.  Sign in is necessary and score is recorded. 
-</p>
-<hr>
-<iframe  width="1000" height="400" 
-src="https://demo.webwork.rochester.edu/webwork2/gage_course/test6/3/?&templateName=simple">
-</iframe>
-<hr>
-</body>
-</html>
diff --git a/clients/t/test_toggled_embedded_WWproblems.html b/clients/t/test_toggled_embedded_WWproblems.html
deleted file mode 100644
index 2587e2726f..0000000000
--- a/clients/t/test_toggled_embedded_WWproblems.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="utf-8" />
-	<title>Embedded WeBWorK Problems</title>
-	<meta name="generator" content="BBEdit 11.1" />
-	<link href="https://demo.webwork.rochester.edu/webwork2_files/css/knowlstyle.css" rel="stylesheet" type="text/css" />
-	<link href="https://demo.webwork.rochester.edu/webwork2_files/js/apps/MathView/mathview.css" rel="stylesheet" />
-
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-	<script>
-	$(document).ready(function(){
-		$( ".clickme" ).click(function() {
-		  $( this).next().slideToggle( "slow", function() {
-			// Animation complete.
-		  });
-		});
-
-	   // jQuery methods go here...
-	});
-	</script>
-	<style>
-		.clickme {background-color: #ccccFF ;}
-		iframe {
-			margin-left: 20px;
-			padding-left: 10px;
-		}
-	</style>
-</head>
-<body>
-
-<iframe  width="600" height="600" 
-src="http://127.0.0.1/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=Library/Rochester/setAlgebra01RealNumbers/lhp1_31-34_mo.pg
-	&problemSeed=123567890
-	&displayMode=MathJax
-	&courseID=daemon_course
-	&userID=daemon	
-	&course_password=daemon
-	&outputformat=sticky">
-</iframe>
-
-<h1>Embedded WeBWorK Problems</h1>
-<p>
-Problem 1 -- interval notation
-</p>
-
-<div class="clickme">
-  Click here to toggle problem display
-</div>
-<div class="wwproblem" style="display: none;">
-<hr>
-<iframe  width="600" height="600" 
-src="http://localhost/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=Library/Rochester/setAlgebra01RealNumbers/lhp1_31-34_mo.pg
-	&problemSeed=123567890
-	&displayMode=MathJax
-	&courseID=daemon_course
-	&userID=daemon	
-	&course_password=daemon
-	&outputformat=sticky">
-</iframe>
-<hr></div>
-<p>
-Problem 2 -- integration.  Contains a Geogebra applet
-</p>
-
-<div class="clickme">
-  Click here to toggle problem display
-</div>
-<div class="wwproblem" style="display: none;">
-<hr>
-<iframe  width="800" height="600" 
-src="http://localhost/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=Library/FortLewis/Calc1/06-01-Antiderivatives-graphically/AF2/AF2.pg
-	&problemSeed=123567890
-	&displayMode=MathJax
-	&courseID=daemon_course
-	&userID=daemon	
-	&course_password=daemon
-	&outputformat=sticky">
-</iframe>
-<hr></div>
-
-<p>
-Problem 3 -- the pg code for this problem is embedded in the html text using base64 encoding
-</p>
-
-<div class="clickme">
- Click here to toggle problem display
-</div>
-<div class="wwproblem" style="display: none;">
-<hr>
-<iframe  width="800" height="600" 
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?
-	&answersSubmitted=0
-	&problemSeed=123567890
-	&displayMode=MathJax
-	&courseID=daemon_course
-	&userID=daemon	
-	&course_password=daemon
-	&outputformat=sticky
-	&problemSource=IyBERVNDUklQVElPTgojIFByb2JsZW0gZnJvbSBDYWxjdWx1cywgc2luZ2xlIHZhcmlhYmxlLCBI%0AdWdoZXMtSGFsbGV0dCBldCBhbC4sIDR0aCBlZC4KIyBXZUJXb3JLIHByb2JsZW0gd3JpdHRlbiBi%0AeSBHYXZpbiBMYVJvc2UsIDxnbGFyb3NlQHVtaWNoLmVkdT4KIyBFTkRERVNDUklQVElPTgoKIyMg%0AVGFnZ2VkIGJ5IGdsciAwMi8wOC8wOQoKIyMgREJzdWJqZWN0KENhbGN1bHVzIC0gc2luZ2xlIHZh%0AcmlhYmxlKQojIyBEQmNoYXB0ZXIoSW50ZWdyYWxzKQojIyBEQnNlY3Rpb24oUmllbWFubiBzdW1z%0AKQojIyBJbnN0aXR1dGlvbihVbml2ZXJzaXR5IG9mIE1pY2hpZ2FuLCBGb3J0IExld2lzIENvbGxl%0AZ2UpCiMjIEF1dGhvcihHYXZpbiBMYVJvc2UsIFBhdWwgUGVhcnNvbikKIyMgTUxUKHRhYmxlcykK%0AIyMgTGV2ZWwoMikKIyMgTU8oMSkKIyMgVGl0bGVUZXh0MSgnQ2FsY3VsdXMnKQojIyBBdXRob3JU%0AZXh0MSgnSHVnaGVzLUhhbGxldHQnKQojIyBFZGl0aW9uVGV4dDEoJzQnKQojIyBTZWN0aW9uMSgn%0ANS4yJykKIyMgUHJvYmxlbTEoJzcnKQojIyBUaXRsZVRleHQyKCdDYWxjdWx1cycpCiMjIEF1dGhv%0AclRleHQyKCdIdWdoZXMtSGFsbGV0dCcpCiMjIEVkaXRpb25UZXh0MignNScpCiMjIFNlY3Rpb24y%0AKCc1LjInKQojIyBQcm9ibGVtMignOCcpCiMjIEtFWVdPUkRTKCdjYWxjdWx1cycsICdpbnRlZ3Jh%0AbCcsICdkZWZpbml0ZSBpbnRlZ3JhbCcsICdhcmVhJykKCiMjIFRleHRib29rIHRhZ3MKIyMgSEhD%0AaGFwdGVyMSgnS2V5IENvbmNlcHQ6IFRoZSBEZWZpbml0ZSBJbnRlZ3JhbCcpCiMjIEhIQ2hhcHRl%0AcjIoJ0tleSBDb25jZXB0OiBUaGUgRGVmaW5pdGUgSW50ZWdyYWwnKQoKRE9DVU1FTlQoKTsKbG9h%0AZE1hY3JvcygKIlBHc3RhbmRhcmQucGwiLAojIlBHYmFzaWNtYWNyb3MucGwiLAojIlBHY2hvaWNl%0AbWFjcm9zLnBsIiwKIyJQR2Fuc3dlcm1hY3Jvcy5wbCIsCiMiUEdhdXhpbGlhcnlGdW5jdGlvbnMu%0AcGwiLAojIlBHYXN1LnBsIiwgICAgICAgICAgICAgICAjIGdldCBwY19ldmFsdWF0b3IKIk1hdGhP%0AYmplY3RzLnBsIiwKKTsKIApDb250ZXh0KCJOdW1lcmljIik7CgpURVhUKGJlZ2lucHJvYmxlbSgp%0AKTsKJHNob3dQYXJ0aWFsQ29ycmVjdEFuc3dlcnMgPSAxOwoKIyBnZW5lcmF0ZSBhIHRhYmxlIG9m%0AIGRhdGEgZm9yIGYoeCkKQGZkYXRhID0gKCk7CiRmZGF0YVs1XSA9IHJhbmRvbSgxLDEwLDEpOwok%0AZHkgPSByYW5kb20oMTYsMjgsMSk7CmZvciAoIG15ICRpPTQ7ICRpPj0wOyAkaS0tICkgewogICAg%0AJGZkYXRhWyRpXSA9ICRmZGF0YVskaSsxXSArICRkeTsKICAgICRkeSA9IGludCgkZHkvMik7Cn0K%0ACiMgd2UgcHV0IHRoZXNlIGFzIHRoZSBkYXRhIGZvciB4IHZhbHVlcyB3aXRoCiRkeCA9IHJhbmRv%0AbSgyLDQsMSk7CkB4ZGF0YSA9ICggMCwgJGR4LCAyKiRkeCwgMyokZHgsIDQqJGR4LCA1KiRkeCAp%0AOwoKIyB0aGVuIHBvc3NpYmxlIGVzdGltYXRlcyBmb3IgdGhlIGludGVncmFsIGFyZQokbGhzID0g%0AJGR4KigkZmRhdGFbMF0gKyAkZmRhdGFbMV0gKyAkZmRhdGFbMl0gKyAkZmRhdGFbM10gKyAkZmRh%0AdGFbNF0pOwokcmhzID0gJGR4KigkZmRhdGFbMV0gKyAkZmRhdGFbMl0gKyAkZmRhdGFbM10gKyAk%0AZmRhdGFbNF0gKyAkZmRhdGFbNV0pOwokYXZnID0gKCRsaHMgKyAkcmhzKS8yOwoKQ29udGV4dCgp%0ALT50ZXhTdHJpbmdzOwpCRUdJTl9URVhUCgpDb25zaWRlciB0aGUgZm9sbG93aW5nIHRhYmxlOgok%0AUEFSCiRCQ0VOVEVSClx7IGJlZ2ludGFibGUoNykgXH0KXHsgcm93KCAiXCh4XCkiLCBAeGRhdGEg%0AKSBcfQpceyByb3coICJcKGYoeClcKSIsIEBmZGF0YSApIFx9Clx7IGVuZHRhYmxlKCkgXH0KJEVD%0ARU5URVIKJFBBUgooYSkgVXNlIHRoaXMgZGF0YSBhbmQgYSBsZWZ0LWVuZHBvaW50IFJpZW1hbm4g%0Ac3VtIHRvIGVzdGltYXRlIHRoZSBpbnRlZ3JhbDoKJEJSClwoIFxpbnRfMF57JHhkYXRhWzVdfSBm%0AKHgpIFwsIGR4IFxhcHByb3ggXCkgXHsgYW5zX3J1bGUoNDUpIFx9CiRQQVIKKGIpIFVzZSB0aGlz%0AIGRhdGEgYW5kIGEgcmlnaHQtZW5kcG9pbnQgUmllbWFubiBzdW0gdG8gZXN0aW1hdGUgdGhlIGlu%0AdGVncmFsOgokQlIKXCggXGludF8wXnskeGRhdGFbNV19IGYoeCkgXCwgZHggXGFwcHJveCBcKSBc%0AeyBhbnNfcnVsZSg0NSkgXH0KJFBBUgooYykgRmluZCB0aGUgYXZlcmFnZSBvZiB0aGUgbGVmdC0g%0AYW5kIHJpZ2h0LWVuZHBvaW50IFJpZW1hbm4gc3VtcyB0byBlc3RpbWF0ZSB0aGUgaW50ZWdyYWw6%0ACiRCUgpcKCBcaW50XzBeeyR4ZGF0YVs1XX0gZih4KSBcLCBkeCBcYXBwcm94IFwpIFx7IGFuc19y%0AdWxlKDQ1KSBcfQoKCkVORF9URVhUCkNvbnRleHQoKS0%2Bbm9ybWFsU3RyaW5nczsKCkFOUyggQ29t%0AcHV0ZSgiJGxocyIpLT5jbXAodG9sVHlwZT0%2BJ2Fic29sdXRlJyx0b2xlcmFuY2U9PjAuMDEpICk7%0ACkFOUyggQ29tcHV0ZSgiJHJocyIpLT5jbXAodG9sVHlwZT0%2BJ2Fic29sdXRlJyx0b2xlcmFuY2U9%0APjAuMDEpICk7CkFOUyggQ29tcHV0ZSgiJGF2ZyIpLT5jbXAodG9sVHlwZT0%2BJ2Fic29sdXRlJyx0%0Ab2xlcmFuY2U9PjAuMDEpICk7CgojQU5TKHBjX2V2YWx1YXRvciggWyBudW1fY21wKCRsaHMpLCAx%0ALCAnJyBdLAojCQkgICBbIG51bV9jbXAoJHJocyksIDEsICcnIF0sCiMJCSAgIFsgbnVtX2NtcCgk%0AYXZnKSwgMSwgJycgXSApICk7CgoKCkNvbnRleHQoKS0%2BdGV4U3RyaW5nczsKU09MVVRJT04oRVYz%0AKDw8J0VORF9TT0xVVElPTicpKTsKJFBBUiBTT0xVVElPTiAkUEFSCgpXZSBjYW4gZXN0aW1hdGUg%0AdGhlIGludGVncmFsIHdpdGggYSBsZWZ0IG9yIHJpZ2h0IFJpZW1hbm4gc3VtLCBvciB3aXRoIHRo%0AZQphdmVyYWdlIG9mIHRoZSB0d28uICBUaGUgbGVmdCBSaWVtYW5uIHN1bSBpcyAKXFsKXGludF8w%0AXnskeGRhdGFbNV19IGYoeCkgZHggXGFwcHJveAogICgkZHgpKCRmZGF0YVswXSArICRmZGF0YVsx%0AXSArICRmZGF0YVsyXSArICRmZGF0YVszXSArICRmZGF0YVs0XSkgPSAKICAkbGhzLgpcXQpUaGUg%0AcmlnaHQgUmllbWFubiBzdW0gaXMgClxbClxpbnRfMF57JHhkYXRhWzVdfSBmKHgpIGR4IFxhcHBy%0Ab3gKICAoJGR4KSgkZmRhdGFbMV0gKyAkZmRhdGFbMl0gKyAkZmRhdGFbM10gKyAkZmRhdGFbNF0g%0AKyAkZmRhdGFbNV0pID0gCiAgJHJocy4KXF0KVGh1cyB0aGUgYXZlcmFnZSBvZiB0aGUgdHdvIGlz%0AIFwoIFxmcmFjMTIgKCRsaHMgKyAkcmhzKSA9ICRhdmcgXCkuCgpFTkRfU09MVVRJT04KQ29udGV4%0AdCgpLT5ub3JtYWxTdHJpbmdzOwoKCkNPTU1FTlQoJ01hdGhPYmplY3QgdmVyc2lvbicpOwpFTkRE%0AT0NVTUVOVCgpOwoK%0A" base64="1" uri="1">
-</iframe>
-<hr></div>
-
-<p>
-Problem 4 -- PG lab.  Enter PG code to test out here.  
-</p>
-
-<div class="clickme">
-  Click here to toggle problem display
-</div>
-<div class="wwproblem" style="display: none;">
-<hr>
-<iframe  width="800" height="600" 
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=MathObjectsLabs2/lab-problem.pg
-	&problemSeed=123567890
-	&displayMode=MathJax
-	&courseID=wikiExamples
-	&userID=daemon	
-	&course_password=daemon
-	&outputformat=sticky">
-</iframe>
-<hr></div>
-
-
-
-<p>
-Problem 5 -- debug  -- This problem is useful for debugging and shows all the details of the hash returned by PG.
-</p>
-
-<div class="clickme">
-  Click here to toggle problem display
-</div>
-<div class="wwproblem" style="display: none;">
-<hr>
-<iframe  width="800" height="600" 
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=Library/Rochester/setAlgebra01RealNumbers/lhp1_31-34_mo.pg
-	&problemSeed=123567890
-	&displayMode=MathJax
-	&courseID=daemon_course
-	&userID=daemon	
-	&course_password=daemon
-	&outputformat=debug">
-</iframe>
-<hr></div>
-
-<p>
-Problem 6 -- A logic problem contributed from Montana State University.  There 
-is a link "contribLibrary" in the daemon course to the "Contrib" library.  See
-<a href="http://github.com/openwebwork/webwork-open-problem-library">http://github.com/openwebwork/webwork-open-problem-library</a> 
-to see which problems are available in the OpenProblemLibrary and in Contrib.  You can
-also use the library browser to find the problems available in the OPL.
-
-</p>
-
-<div class="clickme">
-  Click here to toggle problem display
-</div>
-<div class="wwproblem" style="display: none;">
-<hr>
-<iframe  width="800" height="600" 
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=contribLibrary/MontanaState/Misc.Logic/1.5A21.pg
-	&problemSeed=123567890
-	&displayMode=MathJax
-	&courseID=daemon_course
-	&userID=daemon	
-	&course_password=daemon
-	&outputformat=simple">
-</iframe>
-<hr></div>
-<hr>
-<div class="clickme">
-  Click here to toggle problem display: (PGinfo example)
-</div>
-<div class="wwproblem" style="display: none;">
-<hr>
-<iframe  width="800" height="600" 
-src="http://demo.webwork.rochester.edu/webwork2/html2xml?
-	&answersSubmitted=0&
-	&sourceFilePath=settesting/pgInfo.pg&
-	&problemSeed=123567890&
-	&problemUUID=5555&
-	&displayMode=MathJax&
-	&courseID=daemon_course&
-	&userID=daemon&
-	&course_password=daemon&
-	&outputformat=simple">
-</iframe>
-</body>
-</html>
-
diff --git a/clients/t/test_two_embedded_images_localhost.html b/clients/t/test_two_embedded_images_localhost.html
deleted file mode 100644
index 80f21d3c33..0000000000
--- a/clients/t/test_two_embedded_images_localhost.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="utf-8" />
-	<title>Embed WW in HTML page</title>
-	<meta name="generator" content="BBEdit 11.0" />
-	<link href="https://demo.webwork.rochester.edu/webwork2_files/css/knowlstyle.css" rel="stylesheet" type="text/css" />
-	<link href="https://demo.webwork.rochester.edu/webwork2_files/js/apps/MathView/mathview.css" rel="stylesheet" />
-
-	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-	<script>
-	$(document).ready(function(){
-		$( ".clickme" ).click(function() {
-		  $( this).next().slideToggle( "slow", function() {
-			// Animation complete.
-		  });
-		});
-
-	   // jQuery methods go here...
-	});
-	</script>
-	<style>
-		.clickme {background-color: #ccccFF ;}
-		iframe {
-			margin-left: 20px;
-			padding-left: 10px;
-		}
-	</style>
-</head>
-<body>
-
-
-<h2>Problem 1</h2>
-<p>
-This problem gives you practice finding tangents to curves in the plane.
-It has problemSeed = 226 and problemIdentifierPrefix=321
-</p>
-
-
-
-<hr>
-<iframe  width="800" height="600" 
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=setDemo/limits.pg
-	&problemSeed=226
-	&displayMode=MathJax
-	&courseID=daemon_course
-	&userID=daemon
-	&problemUUID=321
-	&course_password=daemon
-	&outputformat=standard">
-</iframe>
-<hr>
-
-<h2>Problem 2</h2>
-<p>
-This problem has a different problem seed but the same path and prefix as the first problem.
-It has problemSeed = 225 and problemIdentifierPrefix=321
-</p>
-<p>
-By loading the graphs into separate tabs you can see that the two
-graphs have different urls. This allows separation of 
-graphs, auxiliary html, and geogebra applets which might have the same 
-name and are loaded from problems with the same name but are supposed to be
-two different exercises. (Usually the fact that the problems have different
-seeds is enough to separate them but just in case you can set 
-different problemUUID/problemIdentifierPrefix values. problemUUID is the preferred
-key name -- problemIdentifierPrefix also works for compatibility. )
-
-</p>
-
-
-<hr>
-<iframe  width="800" height="600" 
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=setDemo/limits.pg
-	&problemSeed=225
-	&displayMode=MathJax
-	&courseID=daemon_course
-	&userID=daemon
-	&problemUUID=231
-	&course_password=daemon
-	&outputformat=standard">
-</iframe>
-<hr>
-
-
-<h2>Problem 3</h2>
-<p>
-This has problemSeed = 225 and problemIdentifierPrefix=321
-</p>
-<iframe  width="800" height="600" 
-src="http://localhost/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=setDemo/limits.pg
-	&problemSeed=225
-	&displayMode=MathJax
-	&courseID=daemon_course
-	&userID=daemon
-	&problemIdentifierPrefix=321
-	&course_password=daemon
-	&outputformat=standard">
-</iframe>
-<hr>
-
-<h2>Problem 4</h2>
-<p>
-This has problemSeed = 225 and problemIdentifierPrefix=322
-</p>
-<iframe  width="800" height="600" 
-src="http://localhost/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=setDemo/limits.pg
-	&problemSeed=225
-	&displayMode=MathJax
-	&courseID=daemon_course
-	&userID=daemon
-	&problemIdentifierPrefix=322
-	&course_password=daemon
-	&outputformat=standard">
-</iframe>
-<hr>
-</body>
-</html>
diff --git a/clients/t/test_two_images_localhost_base64.html b/clients/t/test_two_images_localhost_base64.html
deleted file mode 100644
index f7b0c4d4fa..0000000000
--- a/clients/t/test_two_images_localhost_base64.html
+++ /dev/null
@@ -1,187 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="utf-8" />
-	<title>Embed WW in HTML page</title>
-	<meta name="generator" content="BBEdit 11.0" />
-	<link href="https://demo.webwork.rochester.edu/webwork2_files/css/knowlstyle.css" rel="stylesheet" type="text/css" />
-	<link href="https://demo.webwork.rochester.edu/webwork2_files/js/apps/MathView/mathview.css" rel="stylesheet" />
-
-	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-	<script>
-	$(document).ready(function(){
-		$( ".clickme" ).click(function() {
-		  $( this).next().slideToggle( "slow", function() {
-			// Animation complete.
-		  });
-		});
-
-	   // jQuery methods go here...
-	});
-	</script>
-	<style>
-		.clickme {background-color: #ccccFF ;}
-		iframe {
-			margin-left: 20px;
-			padding-left: 10px;
-		}
-	</style>
-</head>
-<body>
-
-<h2> Base64 problem 1</h2>
-
-<iframe width="800" height="600"  src="https://demo.webwork.rochester.edu/webwork2/html2xml?
-&answersSubmitted=0&amp;
-problemSource=IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCiMjIyBHZW5lcmF0ZWQgZnJvbSBNYXRoQm9vayBYTUwgc291cmNlIAojIyMgICAgb24gMjAxNy0wMy0xMVQyMDo1NDowNy0wODowMCAgICAKIyMjICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiMjIyAgIGh0dHA6Ly9tYXRoYm9vay5wdWdldHNvdW5kLmVkdSAgIAojIyMgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCiMjIERCc3ViamVjdCgpCiMjIERCY2hhcHRlcigpCiMjIERCc2VjdGlvbigpCiMjIExldmVsKCkKIyMgS0VZV09SRFMoKQojIyBUaXRsZVRleHQxKE9SQ0NBKQojIyBFZGl0aW9uVGV4dDEoKQojIyBBdXRob3JUZXh0MShBbm4gQ2FyeSwgQWxleCBKb3JkYW4sIENhcmwgWWFvLCBSYWxmIFlvdXR6KQojIyBTZWN0aW9uMShub3QgcmVwb3J0ZWQpCiMjIFByb2JsZW0xKDEuMS4xMSkKIyMgQXV0aG9yKCkKIyMgSW5zdGl0dXRpb24oKQojIyBMYW5ndWFnZShlbi1VUykKCkRPQ1VNRU5UKCk7CgojIyMjIyMjIyMjIyMjIyMjIyMjIwojIExvYWQgTWFjcm9zCiMjIyMjIyMjIyMjIyMjIyMjIyMjCmxvYWRNYWNyb3MoCiAgIlBHc3RhbmRhcmQucGwiLAogICJNYXRoT2JqZWN0cy5wbCIsCiAgIlBHTUwucGwiLAogICJuaWNlVGFibGVzLnBsIiwKICAiQW5zd2VyRm9ybWF0SGVscC5wbCIsCiAgIlBHZ3JhcGhtYWNyb3MucGwiLAogICJjb250ZXh0SW5lcXVhbGl0eVNldEJ1aWxkZXIucGwiLAogICJQR2NvdXJzZS5wbCIsCik7CiRyZWZyZXNoQ2FjaGVkSW1hZ2VzPSAxO3N1YiBQRiB7UEdNTDo6Rm9ybWF0KEBfKX07CgojIyMjIyMjIyMjIyMjIyMjIyMjIwojIEhlYWRlcgojIyMjIyMjIyMjIyMjIyMjIyMjIwpDT01NRU5UKCdBdXRob3JlZCBpbiBNYXRoQm9vayBYTUwnKTsKVEVYVChiZWdpbnByb2JsZW0oKSk7CgojIyMjIyMjIyMjIyMjIyMjIyMjIwojIFBHIFNldHVwCiMjIyMjIyMjIyMjIyMjIyMjIyMjCkBhPSgxLC0zLENvbXB1dGUoIi1pbmYiKSk7CkBiPSgyLENvbXB1dGUoImluZiIpLDEpOwpAdGlja3MgPSAoKTsKZm9yIG15ICRqICgtNS4uNSkge3B1c2goQHRpY2tzLCRqKTt9Owpmb3IgbXkkaSgwLDEsMil7CiRubFskaV09aW5pdF9ncmFwaCgtNiwtNTAsNiw1MCxzaXplPT5bNDAwLDUwXSk7CiRubFskaV0tPm1vdmVUbygwLDApOwokbmxbJGldLT5hcnJvd1RvKDUuNSwwLCdibGFjaycsMSk7CiRubFskaV0tPm1vdmVUbygwLDApOwokbmxbJGldLT5hcnJvd1RvKC01LjUsMCwnYmxhY2snLDEpOwpmb3IgbXkkaihAdGlja3MpeyRubFskaV0tPmxiKG5ldyBMYWJlbCgkaiwtMTAsJGosJ2JsYWNrJywnY2VudGVyJywndG9wJykpO307CiRubFskaV0tPmhfdGlja3MoMCwiYmxhY2siLEB0aWNrcyk7Cn07CgokbmxbMF0tPm1vdmVUbygkYVswXSwwKTsKJG5sWzBdLT5saW5lVG8oJGJbMF0sMCwnYmx1ZScsNSk7CiRubFswXS0%2Bc3RhbXBzKCBvcGVuX2NpcmNsZSgkYVswXSwwLCdibHVlJykpOwokbmxbMF0tPnN0YW1wcyggb3Blbl9jaXJjbGUoJGJbMF0sMCwnYmx1ZScpKTsKCiRubFsxXS0%2BbW92ZVRvKCRhWzFdLDApOwokbmxbMV0tPmxpbmVUbyg1LjI1LDAsJ2JsdWUnLDUpOwokbmxbMV0tPm1vdmVUbygkYVsxXSwwKTsKJG5sWzFdLT5hcnJvd1RvKDUuNSwwLCdibHVlJywzKTsKJG5sWzFdLT5zdGFtcHMoIGNsb3NlZF9jaXJjbGUoJGFbMV0sMCwnYmx1ZScpKTsKCiRubFsyXS0%2BbW92ZVRvKCRiWzJdLDApOwokbmxbMl0tPmxpbmVUbygtNS4yNSwwLCdibHVlJyw1KTsKJG5sWzJdLT5tb3ZlVG8oJGJbMl0sMCk7CiRubFsyXS0%2BYXJyb3dUbygtNS41LDAsJ2JsdWUnLDMpOwokbmxbMl0tPnN0YW1wcyhvcGVuX2NpcmNsZSgkYlsyXSwwLCdibHVlJykpOwoKSW5lcXVhbGl0eVNldEJ1aWxkZXI6OlVzZVZlcnRpY2FsU3VjaFRoYXQoKTsKQ29udGV4dCgiSW5lcXVhbGl0eVNldEJ1aWxkZXItT25seSIpOwokc2JbMF0gPSBDb21wdXRlKCJ7IHggfCB4PiRhWzBdIGFuZCB4PCRiWzBdfSIpOwokc2JbMV0gPSBDb21wdXRlKCJ7IHggfCB4Pj0kYVsxXX0iKTsKJHNiWzJdID0gQ29tcHV0ZSgieyB4IHwgeDwkYlsyXX0iKTsKCkNvbnRleHQoIkludGVydmFsIik7CkNvbnRleHQoKS0%2BZmxhZ3MtPnNldCgiZm9ybWF0U3R1ZGVudEFuc3dlciI9PidwYXJzZWQnKTsKJGluWzBdID0gQ29tcHV0ZSgiKCRhWzBdLCRiWzBdKSIpOwokaW5bMV0gPSBDb21wdXRlKCJbJGFbMV0saW5mKSIpOwokaW5bMl0gPSBDb21wdXRlKCIoLWluZiwkYlsyXSkiKTsKCiMjIyMjIyMjIyMjIyMjIyMjIyMjCiMgQm9keQojIyMjIyMjIyMjIyMjIyMjIyMjIwpCRUdJTl9QR01MCkZvciBlYWNoIGludGVydmFsIGV4cHJlc3NlZCBpbiB0aGVzZSBudW1iZXIgbGluZXMsIGdpdmUgdGhlIGludGVydmFsIG5vdGF0aW9uIGFuZCBzZXQtYnVpbGRlciBub3RhdGlvbi4gWW91IG1heSBuZWVkIHRvIHR5cGUgdGhlIGZvbGxvd2luZyBzeW1ib2xzLCBhbmQgaGVyZSBpcyBob3cgeW91IGRvIHNvOgoKW0BEYXRhVGFibGUoCiAgWwogICAgW1tQRignU3ltYm9sJyksCiAgICAgIG1pZHJ1bGUgPT4gJzEnLAogICAgICByb3djc3MgID0%2BICdib3JkZXItYm90dG9tOiAycHggc29saWQ7ICcsXSwKICAgICBbUEYoJ0tleWJvYXJkIEVxdWl2YWxlbnQnKSxdLAogICAgXSwKICAgIFtbUEYoJ1tgXGluZnR5YF0nKSxdLAogICAgIFBGKCdbfElORnxdKiBvciBbfGluZmluaXR5fF0qJyksCiAgICBdLAogICAgW1tQRignW2BcZ2VxYF0nKSxdLAogICAgIFBGKCdbfD49fF0qJyksCiAgICBdLAogICAgW1tQRignW2BcbGVxYF0nKSxdLAogICAgIFBGKCdbfDw9fF0qJyksCiAgICBdLAogICAgW1tQRignW2BcbmVxYF0nKSxdLAogICAgIFBGKCdbfCE9fF0qJyksCiAgICBdLAogIF0sCiAgYWxpZ24gPT4gJ2NjJywKKTtAXSoKCjEuICBbQCBpbWFnZShpbnNlcnRHcmFwaCgkbmxbMF0pLCB3aWR0aD0%2BNDAwLCBoZWlnaHQ9PjUwLCB0ZXhfc2l6ZT0%2BODAwKUBdKiAKCiAgICBJbiBzZXQtYnVpbGRlciBub3RhdGlvbjogW19fXXskc2JbMF19e3dpZHRoID0%2BIDMwfQoKICAgIEluIGludGVydmFsIG5vdGF0aW9uOiBbX19deyRpblswXX17d2lkdGggPT4gMzB9CgoKMS4gIFtAIGltYWdlKGluc2VydEdyYXBoKCRubFsxXSksIHdpZHRoPT40MDAsIGhlaWdodD0%2BNTAsIHRleF9zaXplPT44MDApQF0qIAoKICAgIEluIHNldC1idWlsZGVyIG5vdGF0aW9uOiBbX19deyRzYlsxXX17d2lkdGggPT4gMzB9CgogICAgSW4gaW50ZXJ2YWwgbm90YXRpb246IFtfX117JGluWzFdfXt3aWR0aCA9PiAzMH0KCgoxLiAgW0AgaW1hZ2UoaW5zZXJ0R3JhcGgoJG5sWzJdKSwgd2lkdGg9PjQwMCwgaGVpZ2h0PT41MCwgdGV4X3NpemU9PjgwMClAXSogCgogICAgSW4gc2V0LWJ1aWxkZXIgbm90YXRpb246IFtfX117JHNiWzJdfXt3aWR0aCA9PiAzMH0KCiAgICBJbiBpbnRlcnZhbCBub3RhdGlvbjogW19fXXskaW5bMl19e3dpZHRoID0%2BIDMwfSAgIAoKCgpFTkRfUEdNTAoKIyMjIyMjIyMjIyMjIyMjIyMjIyMKIyBFbmQgUHJvYmxlbQojIyMjIyMjIyMjIyMjIyMjIyMjIwpFTkRET0NVTUVOVCgpOwo=&
-&problemSeed=222&
-&displayMode=MathJax&
-&courseID=daemon_course&
-&userID=daemon&
-&course_password=daemon&
-&outputformat=simple" 
-base64="1" uri="1">
-</iframe>
-<h2> Path problem 1: Version served from daemon_course (PreTeXt_examples) </h2>
-
-<iframe  width="800" height="600" 
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=setPreTeXt_examples/Problem1_1_1_11.pg
-	&problemSeed=222
-	&displayMode=MathJax
-	&courseID=daemon_course
-	&userID=daemon
-	&problemIdentifierPrefix=321
-	&course_password=daemon
-	&outputformat=simple">
-</iframe>
-
-
-<h2> Base64 problem 1b</h2>
-
-<iframe width="800" height="600"  src="https://demo.webwork.rochester.edu/webwork2/html2xml?
-&answersSubmitted=0&amp;
-problemSource=IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCiMjIyBHZW5lcmF0ZWQgZnJvbSBNYXRoQm9vayBYTUwgc291cmNlIAojIyMgICAgb24gMjAxNy0wMy0xMVQyMDo1NDowNy0wODowMCAgICAKIyMjICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiMjIyAgIGh0dHA6Ly9tYXRoYm9vay5wdWdldHNvdW5kLmVkdSAgIAojIyMgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCiMjIERCc3ViamVjdCgpCiMjIERCY2hhcHRlcigpCiMjIERCc2VjdGlvbigpCiMjIExldmVsKCkKIyMgS0VZV09SRFMoKQojIyBUaXRsZVRleHQxKE9SQ0NBKQojIyBFZGl0aW9uVGV4dDEoKQojIyBBdXRob3JUZXh0MShBbm4gQ2FyeSwgQWxleCBKb3JkYW4sIENhcmwgWWFvLCBSYWxmIFlvdXR6KQojIyBTZWN0aW9uMShub3QgcmVwb3J0ZWQpCiMjIFByb2JsZW0xKDEuMS4xMSkKIyMgQXV0aG9yKCkKIyMgSW5zdGl0dXRpb24oKQojIyBMYW5ndWFnZShlbi1VUykKCkRPQ1VNRU5UKCk7CgojIyMjIyMjIyMjIyMjIyMjIyMjIwojIExvYWQgTWFjcm9zCiMjIyMjIyMjIyMjIyMjIyMjIyMjCmxvYWRNYWNyb3MoCiAgIlBHc3RhbmRhcmQucGwiLAogICJNYXRoT2JqZWN0cy5wbCIsCiAgIlBHTUwucGwiLAogICJuaWNlVGFibGVzLnBsIiwKICAiQW5zd2VyRm9ybWF0SGVscC5wbCIsCiAgIlBHZ3JhcGhtYWNyb3MucGwiLAogICJjb250ZXh0SW5lcXVhbGl0eVNldEJ1aWxkZXIucGwiLAogICJQR2NvdXJzZS5wbCIsCik7CiRyZWZyZXNoQ2FjaGVkSW1hZ2VzPSAxO3N1YiBQRiB7UEdNTDo6Rm9ybWF0KEBfKX07CgojIyMjIyMjIyMjIyMjIyMjIyMjIwojIEhlYWRlcgojIyMjIyMjIyMjIyMjIyMjIyMjIwpDT01NRU5UKCdBdXRob3JlZCBpbiBNYXRoQm9vayBYTUwnKTsKVEVYVChiZWdpbnByb2JsZW0oKSk7CgojIyMjIyMjIyMjIyMjIyMjIyMjIwojIFBHIFNldHVwCiMjIyMjIyMjIyMjIyMjIyMjIyMjCkBhPSgxLC0zLENvbXB1dGUoIi1pbmYiKSk7CkBiPSgyLENvbXB1dGUoImluZiIpLDEpOwpAdGlja3MgPSAoKTsKZm9yIG15ICRqICgtNS4uNSkge3B1c2goQHRpY2tzLCRqKTt9Owpmb3IgbXkkaSgwLDEsMil7CiRubFskaV09aW5pdF9ncmFwaCgtNiwtNTAsNiw1MCxzaXplPT5bNDAwLDUwXSk7CiRubFskaV0tPm1vdmVUbygwLDApOwokbmxbJGldLT5hcnJvd1RvKDUuNSwwLCdibGFjaycsMSk7CiRubFskaV0tPm1vdmVUbygwLDApOwokbmxbJGldLT5hcnJvd1RvKC01LjUsMCwnYmxhY2snLDEpOwpmb3IgbXkkaihAdGlja3MpeyRubFskaV0tPmxiKG5ldyBMYWJlbCgkaiwtMTAsJGosJ2JsYWNrJywnY2VudGVyJywndG9wJykpO307CiRubFskaV0tPmhfdGlja3MoMCwiYmxhY2siLEB0aWNrcyk7Cn07CgokbmxbMF0tPm1vdmVUbygkYVswXSwwKTsKJG5sWzBdLT5saW5lVG8oJGJbMF0sMCwnYmx1ZScsNSk7CiRubFswXS0%2Bc3RhbXBzKCBvcGVuX2NpcmNsZSgkYVswXSwwLCdibHVlJykpOwokbmxbMF0tPnN0YW1wcyggb3Blbl9jaXJjbGUoJGJbMF0sMCwnYmx1ZScpKTsKCiRubFsxXS0%2BbW92ZVRvKCRhWzFdLDApOwokbmxbMV0tPmxpbmVUbyg1LjI1LDAsJ2JsdWUnLDUpOwokbmxbMV0tPm1vdmVUbygkYVsxXSwwKTsKJG5sWzFdLT5hcnJvd1RvKDUuNSwwLCdibHVlJywzKTsKJG5sWzFdLT5zdGFtcHMoIGNsb3NlZF9jaXJjbGUoJGFbMV0sMCwnYmx1ZScpKTsKCiRubFsyXS0%2BbW92ZVRvKCRiWzJdLDApOwokbmxbMl0tPmxpbmVUbygtNS4yNSwwLCdibHVlJyw1KTsKJG5sWzJdLT5tb3ZlVG8oJGJbMl0sMCk7CiRubFsyXS0%2BYXJyb3dUbygtNS41LDAsJ2JsdWUnLDMpOwokbmxbMl0tPnN0YW1wcyhvcGVuX2NpcmNsZSgkYlsyXSwwLCdibHVlJykpOwoKSW5lcXVhbGl0eVNldEJ1aWxkZXI6OlVzZVZlcnRpY2FsU3VjaFRoYXQoKTsKQ29udGV4dCgiSW5lcXVhbGl0eVNldEJ1aWxkZXItT25seSIpOwokc2JbMF0gPSBDb21wdXRlKCJ7IHggfCB4PiRhWzBdIGFuZCB4PCRiWzBdfSIpOwokc2JbMV0gPSBDb21wdXRlKCJ7IHggfCB4Pj0kYVsxXX0iKTsKJHNiWzJdID0gQ29tcHV0ZSgieyB4IHwgeDwkYlsyXX0iKTsKCkNvbnRleHQoIkludGVydmFsIik7CkNvbnRleHQoKS0%2BZmxhZ3MtPnNldCgiZm9ybWF0U3R1ZGVudEFuc3dlciI9PidwYXJzZWQnKTsKJGluWzBdID0gQ29tcHV0ZSgiKCRhWzBdLCRiWzBdKSIpOwokaW5bMV0gPSBDb21wdXRlKCJbJGFbMV0saW5mKSIpOwokaW5bMl0gPSBDb21wdXRlKCIoLWluZiwkYlsyXSkiKTsKCiMjIyMjIyMjIyMjIyMjIyMjIyMjCiMgQm9keQojIyMjIyMjIyMjIyMjIyMjIyMjIwpCRUdJTl9QR01MCkZvciBlYWNoIGludGVydmFsIGV4cHJlc3NlZCBpbiB0aGVzZSBudW1iZXIgbGluZXMsIGdpdmUgdGhlIGludGVydmFsIG5vdGF0aW9uIGFuZCBzZXQtYnVpbGRlciBub3RhdGlvbi4gWW91IG1heSBuZWVkIHRvIHR5cGUgdGhlIGZvbGxvd2luZyBzeW1ib2xzLCBhbmQgaGVyZSBpcyBob3cgeW91IGRvIHNvOgoKW0BEYXRhVGFibGUoCiAgWwogICAgW1tQRignU3ltYm9sJyksCiAgICAgIG1pZHJ1bGUgPT4gJzEnLAogICAgICByb3djc3MgID0%2BICdib3JkZXItYm90dG9tOiAycHggc29saWQ7ICcsXSwKICAgICBbUEYoJ0tleWJvYXJkIEVxdWl2YWxlbnQnKSxdLAogICAgXSwKICAgIFtbUEYoJ1tgXGluZnR5YF0nKSxdLAogICAgIFBGKCdbfElORnxdKiBvciBbfGluZmluaXR5fF0qJyksCiAgICBdLAogICAgW1tQRignW2BcZ2VxYF0nKSxdLAogICAgIFBGKCdbfD49fF0qJyksCiAgICBdLAogICAgW1tQRignW2BcbGVxYF0nKSxdLAogICAgIFBGKCdbfDw9fF0qJyksCiAgICBdLAogICAgW1tQRignW2BcbmVxYF0nKSxdLAogICAgIFBGKCdbfCE9fF0qJyksCiAgICBdLAogIF0sCiAgYWxpZ24gPT4gJ2NjJywKKTtAXSoKCjEuICBbQCBpbWFnZShpbnNlcnRHcmFwaCgkbmxbMF0pLCB3aWR0aD0%2BNDAwLCBoZWlnaHQ9PjUwLCB0ZXhfc2l6ZT0%2BODAwKUBdKiAKCiAgICBJbiBzZXQtYnVpbGRlciBub3RhdGlvbjogW19fXXskc2JbMF19e3dpZHRoID0%2BIDMwfQoKICAgIEluIGludGVydmFsIG5vdGF0aW9uOiBbX19deyRpblswXX17d2lkdGggPT4gMzB9CgoKMS4gIFtAIGltYWdlKGluc2VydEdyYXBoKCRubFsxXSksIHdpZHRoPT40MDAsIGhlaWdodD0%2BNTAsIHRleF9zaXplPT44MDApQF0qIAoKICAgIEluIHNldC1idWlsZGVyIG5vdGF0aW9uOiBbX19deyRzYlsxXX17d2lkdGggPT4gMzB9CgogICAgSW4gaW50ZXJ2YWwgbm90YXRpb246IFtfX117JGluWzFdfXt3aWR0aCA9PiAzMH0KCgoxLiAgW0AgaW1hZ2UoaW5zZXJ0R3JhcGgoJG5sWzJdKSwgd2lkdGg9PjQwMCwgaGVpZ2h0PT41MCwgdGV4X3NpemU9PjgwMClAXSogCgogICAgSW4gc2V0LWJ1aWxkZXIgbm90YXRpb246IFtfX117JHNiWzJdfXt3aWR0aCA9PiAzMH0KCiAgICBJbiBpbnRlcnZhbCBub3RhdGlvbjogW19fXXskaW5bMl19e3dpZHRoID0%2BIDMwfSAgIAoKCgpFTkRfUEdNTAoKIyMjIyMjIyMjIyMjIyMjIyMjIyMKIyBFbmQgUHJvYmxlbQojIyMjIyMjIyMjIyMjIyMjIyMjIwpFTkRET0NVTUVOVCgpOwo=&
-&problemSeed=236&
-&displayMode=MathJax&
-&courseID=daemon_course&
-&userID=daemon&
-&course_password=daemon&
-&outputformat=simple" 
-base64="1" uri="1">
-</iframe>
-<h2> Path problem 1b: Version served from daemon_course (PreTeXt_examples) </h2>
-
-<iframe  width="800" height="600" 
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=setPreTeXt_examples/Problem1_1_1_11.pg
-	&problemSeed=236
-	&displayMode=MathJax
-	&courseID=daemon_course
-	&userID=daemon
-	&problemIdentifierPrefix=321
-	&course_password=daemon
-	&outputformat=simple">
-</iframe>
-
-<hr noshade>
-<hr noshade/>
-
-<h2> Base64 problem 2</h2>
-<iframe width="800" height="600"  src="https://demo.webwork.rochester.edu/webwork2/html2xml?&amp;answersSubmitted=0&amp;problemSource=IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCiMjIyBHZW5lcmF0ZWQgZnJvbSBNYXRoQm9vayBYTUwgc291cmNlIAojIyMgICAgb24gMjAxNy0wMy0xMVQyMDo1NDowNy0wODowMCAgICAKIyMjICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiMjIyAgIGh0dHA6Ly9tYXRoYm9vay5wdWdldHNvdW5kLmVkdSAgIAojIyMgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCiMjIERCc3ViamVjdCgpCiMjIERCY2hhcHRlcigpCiMjIERCc2VjdGlvbigpCiMjIExldmVsKCkKIyMgS0VZV09SRFMoKQojIyBUaXRsZVRleHQxKE9SQ0NBKQojIyBFZGl0aW9uVGV4dDEoKQojIyBBdXRob3JUZXh0MShBbm4gQ2FyeSwgQWxleCBKb3JkYW4sIENhcmwgWWFvLCBSYWxmIFlvdXR6KQojIyBTZWN0aW9uMShub3QgcmVwb3J0ZWQpCiMjIFByb2JsZW0xKDEuMS4xNCkKIyMgQXV0aG9yKCkKIyMgSW5zdGl0dXRpb24oKQojIyBMYW5ndWFnZShlbi1VUykKCkRPQ1VNRU5UKCk7CgojIyMjIyMjIyMjIyMjIyMjIyMjIwojIExvYWQgTWFjcm9zCiMjIyMjIyMjIyMjIyMjIyMjIyMjCmxvYWRNYWNyb3MoCiAgIlBHc3RhbmRhcmQucGwiLAogICJNYXRoT2JqZWN0cy5wbCIsCiAgIlBHTUwucGwiLAogICJuaWNlVGFibGVzLnBsIiwKICAiQW5zd2VyRm9ybWF0SGVscC5wbCIsCiAgIlBHZ3JhcGhtYWNyb3MucGwiLAogICJjb250ZXh0SW5lcXVhbGl0eVNldEJ1aWxkZXIucGwiLAogICJQR2NvdXJzZS5wbCIsCik7CiRyZWZyZXNoQ2FjaGVkSW1hZ2VzPSAxO3N1YiBQRiB7UEdNTDo6Rm9ybWF0KEBfKX07CgojIyMjIyMjIyMjIyMjIyMjIyMjIwojIEhlYWRlcgojIyMjIyMjIyMjIyMjIyMjIyMjIwpDT01NRU5UKCdBdXRob3JlZCBpbiBNYXRoQm9vayBYTUwnKTsKVEVYVChiZWdpbnByb2JsZW0oKSk7CgojIyMjIyMjIyMjIyMjIyMjIyMjIwojIFBHIFNldHVwCiMjIyMjIyMjIyMjIyMjIyMjIyMjCkBhPSgtNCxDb21wdXRlKCItaW5mIiksQ29tcHV0ZSgiLWluZiIpKTsKQGI9KDAsMiwxKTsKQGM9KDMsMi41LDEpOwpAZD0oMy41LENvbXB1dGUoImluZiIpLENvbXB1dGUoImluZiIpKTsKQHRpY2tzID0gKCk7CmZvciBteSAkaiAoLTUuLjUpIHtwdXNoKEB0aWNrcywkaik7fTsKZm9yIG15JGkoMCwxLDIpewokbmxbJGldPWluaXRfZ3JhcGgoLTYsLTUwLDYsNTAsc2l6ZT0%2BWzQwMCw1MF0pOwokbmxbJGldLT5tb3ZlVG8oMCwwKTsKJG5sWyRpXS0%2BYXJyb3dUbyg1LjUsMCwnYmxhY2snLDEpOwokbmxbJGldLT5tb3ZlVG8oMCwwKTsKJG5sWyRpXS0%2BYXJyb3dUbygtNS41LDAsJ2JsYWNrJywxKTsKZm9yIG15JGooQHRpY2tzKXskbmxbJGldLT5sYihuZXcgTGFiZWwoJGosLTEwLCRqLCdibGFjaycsJ2NlbnRlcicsJ3RvcCcpKTt9OwokbmxbJGldLT5oX3RpY2tzKDAsImJsYWNrIixAdGlja3MpOwp9OwoKJG5sWzBdLT5tb3ZlVG8oJGFbMF0sMCk7CiRubFswXS0%2BbGluZVRvKCRiWzBdLDAsJ2JsdWUnLDUpOwokbmxbMF0tPm1vdmVUbygkY1swXSwwKTsKJG5sWzBdLT5saW5lVG8oJGRbMF0sMCwnYmx1ZScsNSk7CiRubFswXS0%2Bc3RhbXBzKCBvcGVuX2NpcmNsZSgkYVswXSwwLCdibHVlJykpOwokbmxbMF0tPnN0YW1wcyggY2xvc2VkX2NpcmNsZSgkYlswXSwwLCdibHVlJykpOwokbmxbMF0tPnN0YW1wcyggY2xvc2VkX2NpcmNsZSgkY1swXSwwLCdibHVlJykpOwokbmxbMF0tPnN0YW1wcyggY2xvc2VkX2NpcmNsZSgkZFswXSwwLCdibHVlJykpOwoKJG5sWzFdLT5tb3ZlVG8oJGJbMV0sMCk7CiRubFsxXS0%2BbGluZVRvKC01LjI1LDAsJ2JsdWUnLDUpOwokbmxbMV0tPm1vdmVUbygkYlsxXSwwKTsKJG5sWzFdLT5hcnJvd1RvKC01LjUsMCwnYmx1ZScsMyk7CiRubFsxXS0%2BbW92ZVRvKCRjWzFdLDApOwokbmxbMV0tPmxpbmVUbyg1LjI1LDAsJ2JsdWUnLDUpOwokbmxbMV0tPm1vdmVUbygkY1sxXSwwKTsKJG5sWzFdLT5hcnJvd1RvKDUuNSwwLCdibHVlJywzKTsKJG5sWzFdLT5zdGFtcHMoIGNsb3NlZF9jaXJjbGUoJGJbMV0sMCwnYmx1ZScpKTsKJG5sWzFdLT5zdGFtcHMoIGNsb3NlZF9jaXJjbGUoJGNbMV0sMCwnYmx1ZScpKTsKCiRubFsyXS0%2BbW92ZVRvKCRiWzJdLDApOwokbmxbMl0tPmxpbmVUbygtNS4yNSwwLCdibHVlJyw1KTsKJG5sWzJdLT5tb3ZlVG8oJGJbMl0sMCk7CiRubFsyXS0%2BYXJyb3dUbygtNS41LDAsJ2JsdWUnLDMpOwokbmxbMl0tPm1vdmVUbygkY1syXSwwKTsKJG5sWzJdLT5saW5lVG8oNS4yNSwwLCdibHVlJyw1KTsKJG5sWzJdLT5tb3ZlVG8oJGNbMl0sMCk7CiRubFsyXS0%2BYXJyb3dUbyg1LjUsMCwnYmx1ZScsMyk7CiRubFsyXS0%2Bc3RhbXBzKG9wZW5fY2lyY2xlKCRiWzJdLDAsJ2JsdWUnKSk7CiRubFsyXS0%2Bc3RhbXBzKG9wZW5fY2lyY2xlKCRjWzJdLDAsJ2JsdWUnKSk7CgpJbmVxdWFsaXR5U2V0QnVpbGRlcjo6VXNlVmVydGljYWxTdWNoVGhhdCgpOwpDb250ZXh0KCJJbmVxdWFsaXR5U2V0QnVpbGRlci1Pbmx5Iik7CiRzYlswXSA9IENvbXB1dGUoInsgeCB8ICRhWzBdPHg8PSRiWzBdIG9yICRjWzBdPD14PD0kZFswXX0iKTsKJHNiWzFdID0gQ29tcHV0ZSgieyB4IHwgeDw9JGJbMV0gb3IgeD49JGNbMV19Iik7CiRzYlsyXSA9IENvbXB1dGUoInsgeCB8IHghPSRiWzJdfSIpOwoKQ29udGV4dCgiSW50ZXJ2YWwiKTsKQ29udGV4dCgpLT5mbGFncy0%2Bc2V0KCJmb3JtYXRTdHVkZW50QW5zd2VyIj0%2BJ3BhcnNlZCcpOwokaW5bMF0gPSBDb21wdXRlKCIoJGFbMF0sJGJbMF1dVVskY1swXSwkZFswXV0iKTsKJGluWzFdID0gQ29tcHV0ZSgiKCRhWzFdLCRiWzFdXVVbJGNbMV0sJGRbMV0pIik7CiRpblsyXSA9IENvbXB1dGUoIigkYVsyXSwkYlsyXSlVKCRjWzJdLCRkWzJdKSIpOwoKIyMjIyMjIyMjIyMjIyMjIyMjIyMKIyBCb2R5CiMjIyMjIyMjIyMjIyMjIyMjIyMjCkJFR0lOX1BHTUwKRm9yIGVhY2ggaW50ZXJ2YWwgZXhwcmVzc2VkIGluIHRoZXNlIG51bWJlciBsaW5lcywgZ2l2ZSB0aGUgaW50ZXJ2YWwgbm90YXRpb24gYW5kIHNldC1idWlsZGVyIG5vdGF0aW9uLiBZb3UgbWF5IG5lZWQgdG8gdHlwZSB0aGUgZm9sbG93aW5nIHN5bWJvbHMsIGFuZCBoZXJlIGlzIGhvdyB5b3UgZG8gc286CgpbQERhdGFUYWJsZSgKICBbCiAgICBbW1BGKCdTeW1ib2wnKSwKICAgICAgbWlkcnVsZSA9PiAnMScsCiAgICAgIHJvd2NzcyAgPT4gJ2JvcmRlci1ib3R0b206IDJweCBzb2xpZDsgJyxdLAogICAgIFtQRignS2V5Ym9hcmQgRXF1aXZhbGVudCcpLF0sCiAgICBdLAogICAgW1tQRignW2BcaW5mdHlgXScpLF0sCiAgICAgUEYoJ1t8SU5GfF0qIG9yIFt8aW5maW5pdHl8XSonKSwKICAgIF0sCiAgICBbW1BGKCdbYFxnZXFgXScpLF0sCiAgICAgUEYoJ1t8Pj18XSonKSwKICAgIF0sCiAgICBbW1BGKCdbYFxsZXFgXScpLF0sCiAgICAgUEYoJ1t8PD18XSonKSwKICAgIF0sCiAgICBbW1BGKCdbYFxuZXFgXScpLF0sCiAgICAgUEYoJ1t8IT18XSonKSwKICAgIF0sCiAgICBbW1BGKCdbYFxjdXBgXScpLF0sCiAgICAgUEYoJ2NhcGl0YWwgbGV0dGVyIFt8VXxdKicpLAogICAgXSwKICBdLAogIGFsaWduID0%2BICdjYycsCik7QF0qCgoxLiAgW0AgaW1hZ2UoaW5zZXJ0R3JhcGgoJG5sWzBdKSwgd2lkdGg9PjQwMCwgaGVpZ2h0PT41MCwgdGV4X3NpemU9PjgwMClAXSogCgogICAgSW4gc2V0LWJ1aWxkZXIgbm90YXRpb246IFtfX117JHNiWzBdfXt3aWR0aCA9PiAyMH0KCiAgICBJbiBpbnRlcnZhbCBub3RhdGlvbjogW19fXXskaW5bMF19e3dpZHRoID0%2BIDIwfQoKCjEuICBbQCBpbWFnZShpbnNlcnRHcmFwaCgkbmxbMV0pLCB3aWR0aD0%2BNDAwLCBoZWlnaHQ9PjUwLCB0ZXhfc2l6ZT0%2BODAwKUBdKiAKCiAgICBJbiBzZXQtYnVpbGRlciBub3RhdGlvbjogW19fXXskc2JbMV19e3dpZHRoID0%2BIDIwfQoKICAgIEluIGludGVydmFsIG5vdGF0aW9uOiBbX19deyRpblsxXX17d2lkdGggPT4gMjB9CgoKMS4gIFtAIGltYWdlKGluc2VydEdyYXBoKCRubFsyXSksIHdpZHRoPT40MDAsIGhlaWdodD0%2BNTAsIHRleF9zaXplPT44MDApQF0qIAoKICAgIEluIHNldC1idWlsZGVyIG5vdGF0aW9uOiBbX19deyRzYlsyXX17d2lkdGggPT4gMjB9CgogICAgSW4gaW50ZXJ2YWwgbm90YXRpb246IFtfX117JGluWzJdfXt3aWR0aCA9PiAyMH0gICAKCgoKRU5EX1BHTUwKCiMjIyMjIyMjIyMjIyMjIyMjIyMjCiMgRW5kIFByb2JsZW0KIyMjIyMjIyMjIyMjIyMjIyMjIyMKRU5ERE9DVU1FTlQoKTsK&
-&problemSeed=1&
-&displayMode=MathJax&
-&courseID=daemon_course&
-&userID=daemon&
-&course_password=daemon&
-&outputformat=simple" 
-base64="1"
-uri="1">
-</iframe>
-
-
-<h2>Problem 1 </h2>
-<p>
-This problem gives you practice finding tangents to curves in the plane.
-It has problemSeed = 226 and problemIdentifierPrefix=321
-</p>
-
-
-
-<hr>
-<iframe  width="800" height="600" 
-src="http://localhost/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=setDemo/limits.pg
-	&problemSeed=226
-	&displayMode=MathJax
-	&courseID=daemon_course
-	&userID=daemon
-	&problemIdentifierPrefix=321
-	&course_password=daemon
-	&outputformat=standard">
-</iframe>
-<hr noshade>
-
-<h2>Problem 2</h2>
-<p>
-This problem has a different problem seed but the same path and prefix as the first problem.
-It has problemSeed = 225 and problemIdentifierPrefix=321
-</p>
-
-
-<hr>
-<iframe  width="800" height="600" 
-src="http://localhost/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=setDemo/limits.pg
-	&problemSeed=225
-	&displayMode=MathJax
-	&courseID=daemon_course
-	&userID=daemon
-	&problemIdentifierPrefix=321
-	&course_password=daemon
-	&outputformat=standard">
-</iframe>
-<hr>
-
-
-<h2>Problem 3</h2>
-<p>
-This has problemSeed = 225 and problemIdentifierPrefix=321
-</p>
-<iframe  width="800" height="600" 
-src="http://localhost/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=setDemo/limits.pg
-	&problemSeed=225
-	&displayMode=MathJax
-	&courseID=daemon_course
-	&userID=daemon
-	&problemIdentifierPrefix=321
-	&course_password=daemon
-	&outputformat=standard">
-</iframe>
-<hr>
-
-<h2>Problem 4</h2>
-<p>
-This has problemSeed = 225 and problemIdentifierPrefix=322
-</p>
-<iframe  width="800" height="600" 
-src="http://localhost/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=setDemo/limits.pg
-	&problemSeed=225
-	&displayMode=MathJax
-	&courseID=daemon_course
-	&userID=daemon
-	&problemIdentifierPrefix=322
-	&course_password=daemon
-	&outputformat=standard">
-</iframe>
-<hr>
-</body>
-</html>
diff --git a/clients/uribase64_encode.pl b/clients/uribase64_encode.pl
deleted file mode 100755
index 00f242c05b..0000000000
--- a/clients/uribase64_encode.pl
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/perl -w
-
-use MIME::Base64 qw( encode_base64 decode_base64);
-use URI::Escape qw(uri_escape uri_unescape);
-local($/);
-print uri_escape encode_base64 <STDIN>;
-print "\n\n";
diff --git a/clients/ww_credentials.dist b/clients/ww_credentials.dist
deleted file mode 100644
index c14194c268..0000000000
--- a/clients/ww_credentials.dist
+++ /dev/null
@@ -1,69 +0,0 @@
-# Search path for credentials
-# our @path_list = ("$ENV{HOME}/.ww_credentials", "$ENV{HOME}/ww_session_credentials", 'ww_credentials', 'ww_credentials.dist');
-
-# Place a credential file containing the following information at one of the locations above.
-
-# %credentials = (
-#         userID          => "daemon",
-#         course_password => "daemon",
-#         courseID        => "daemon_course",
-#         site_url        => 'http://localhost:80',
-#         site_password   => 'xmlrpc',
-#         form_action_url => 'http://localhost:80/webwork2/html2xml',
-#         ww_display_mode   => "MathJax",
-#         html_display_command => "open -a 'Google Chrome' ", # "open -a Safari ", "lynx "
-# #       path_to_log_file =>"",
-# );
-
-# The sample settings below should be customized for your server and local system
-
-%credentials = (
-    # Set the URLs of the remote site and the site password
-
-	# Test settings for the demo.webwork.rochester.edu site
-        site_url        => 'https://demo.webwork.rochester.edu',
-        webwork_url     => '/webwork2',
-	form_action_url => 'https://demo.webwork.rochester.edu/webwork2/html2xml',
-        site_password   => 'xmlrpc',
-
-	# Settings for use with a local webwork system (ex. via Docker)
-	# site_url        => 'http://localhost:80',
-	# webwork_url     => '/webwork2',
-	# form_action_url => 'http://localhost:80/webwork2/html2xml',
-	# site_password   => 'xmlrpc',
-
-    # Set the identification credential used by the "daemon_course" on the remote site
-        courseID        => "daemon_course",
-        userID          => "daemon",
-        course_password => "daemon",
-    # Set the display mode to use
-        ww_display_mode   => "MathJax", 
-        # ('images' mode will usually cause errors unless the mysql daemon is running in the site containing sendXMLRPC)
-        # the script WebworkClient.pm attempts to create images for equations in the attempts table 
-        # on the machine where sendXMLRPC.pl is located. 
-    # Set the path to the LOCAL log file (make sure to create an empty file)
-	# when commented out - no file is needed
-	# path_to_log_file =>"",
-    # Set the display commands which work on the machine on which you are
-    # running sendXMLRPC.pl
-	# Sample settings for Mac:
-
-        # html_display_command   => "open -a 'Google Chrome' ", # A web browser
-	# html_display_command   => "open -a Firefox ",
-	# tex_display_command    => "open -a 'TeXShop'",	# Editor or TeX editor
-	# pdf_display_command    => "open -a 'Preview'",	# PDF viewer
-	# hash_display_command   => "cat ", 			# to diplay file to STDOUT
-
-	# ==============================
-
-	# Sample settings for Linux:
-
-	# html_display_command => "firefox", 			# A web browser
-	# html_display_command => "google-chrome",
-	# tex_display_command  => "vim",				# Editor or TeX editor
-	# tex_display_command  => "emacs",
-	# pdf_display_command  => "xpdf",				# PDF viewer
-	# pdf_display_command  => "evince",
-	# pdf_display_command  => "acroread",			# PDF viewer
-	# hash_display_command => "cat ",			# to diplay file to STDOUT
-);
diff --git a/conf/LTIConfigValues.config b/conf/LTIConfigValues.config
index c5c6326b9e..7edc62163f 100644
--- a/conf/LTIConfigValues.config
+++ b/conf/LTIConfigValues.config
@@ -1,7 +1,7 @@
 #!perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -21,8 +21,8 @@
 # YOU SHOULD NOT NEED TO EDIT THIS FILE!!
 
 $LTIConfigValues = {
-	LMS_name => {
-		var  => 'LMS_name',
+	'LTI{v1p1}{LMS_name}' => {
+		var  => 'LTI{v1p1}{LMS_name}',
 		doc  => x('The name of the LMS'),
 		doc2 => x(
 			'The name of the LMS. This is used in messages to users that direct them to go back to '
@@ -30,8 +30,8 @@ $LTIConfigValues = {
 		),
 		type => 'text'
 	},
-	LMS_url => {
-		var  => 'LMS_url',
+	'LTI{v1p1}{LMS_url}' => {
+		var  => 'LTI{v1p1}{LMS_url}',
 		doc  => x('A URL for the LMS'),
 		doc2 => x(
 			'An address that can be used to log in to the LMS. This is used in messages to users '
@@ -60,9 +60,7 @@ $LTIConfigValues = {
 				. 'future due dates as zero.</dd> <dt>homework</dt><dd>Sends back a score for each problem set '
 				. '(including for each quiz). To use this, the external links from the LMS must be problem set '
 				. 'specific. For example, <code>webwork.myschool.edu/webwork2/course-name/problem_set_name</code>. '
-				. 'If the problem set name has space characters, they should be underscores in these addresses. If '
-				. 'the problem set is a quiz, it must have this format: '
-				. '<code>webwork.myschool.edu/webwork2/course-name/quiz_mode/problem_set_name</code>. '
+				. 'If the problem set name has space characters, they should be underscores in these addresses. '
 				. 'Also, to initialize the communication between WeBWorK and the LMS, the user must follow each of '
 				. 'these external learning tools at least one time. Since there must be a separate external tool link '
 				. 'for each problem set, this option requires more maintenance of the LMS course.</dd></dl>'
@@ -95,9 +93,14 @@ $LTIConfigValues = {
 	},
 };
 
-if (@LTIConfigVariables) {
+$LTIConfigValues->{'LTI{v1p3}{LMS_name}'} =
+	{ %{ $LTIConfigValues->{'LTI{v1p1}{LMS_name}'} }, var => 'LTI{v1p3}{LMS_name}' };
+$LTIConfigValues->{'LTI{v1p3}{LMS_url}'} =
+	{ %{ $LTIConfigValues->{'LTI{v1p1}{LMS_url}'} }, var => 'LTI{v1p3}{LMS_url}' };
+
+if (@LTIConfigVariables && !(grep { $_->[0] eq 'LTI' } @$ConfigValues)) {
 	push(@$ConfigValues,
 		[ x('LTI'), map { $LTIConfigValues->{$_} } grep { defined $LTIConfigValues->{$_} } @LTIConfigVariables ]);
 }
 
-1;    #final line of the file to reassure perl that it was read properly.
+1;    # final line of the file to reassure perl that it was read properly.
diff --git a/conf/README b/conf/README
deleted file mode 100644
index 2ecd96c25c..0000000000
--- a/conf/README
+++ /dev/null
@@ -1,23 +0,0 @@
-Use the site.conf and localOverrides.conf files to make modifications.
-
-site.conf contains global variables which are required for basic configuration.
-defaults.config contains initial settings for many customizable options in WeBWorK.  Do not edit defaults.config!  It will be overridden next time you upgrade.
-
-The localOverrides.conf file is read after the defaults.config file is processed and will overwrite configurations in defaults.config.  Use this file to make changes to the settings in defaults.config, as it will be left alone when you upgrade.
-
-This new  configuration system should greatly simplify the process of
-updating webwork2 since it is less likely
-that one will need to modify the config files when upgrading.  Default configurations or permissions for
-new features will be defined in defaults.config and will allow automatic upgrades.  You can override these at any point from localOverrides.conf.
-
-FIRST TIME RECONFIGURATION
-
-COPY site.conf.dist to site.conf.
-COPY localOverrides.conf.dist to localOverrides.conf.
-
-MODIFY site.conf using the data from your global.conf file for the entries contained within site.conf.
-In particular you will need to fill in the server name, the
-password for the database and any modifications you have made as to the
-locations of various directories.
-
-UPDATE localOverrides.conf to reflect any local customizations that you had made to global.conf.
diff --git a/conf/README.md b/conf/README.md
new file mode 100644
index 0000000000..4ef53a321d
--- /dev/null
+++ b/conf/README.md
@@ -0,0 +1,210 @@
+# Configuration of webwork2
+
+Do not directly modify any of the files in the initial git clone of webwork2. If a filename contains `.dist` then the
+file is intended to be copied to a file by the same name without `.dist` and the copy modified as needed. Specific
+instructions are given below. If a filename **does** contain `.dist` then it should **not** be modified. If changes
+are made to `.dist` files, then the modifications will be lost or cause conflict when webwork2 is upgraded.
+
+## Configuration files for webwork2
+
+Basic webwork2 configuration files.
+
+- `site.conf.dist` should be copied to `site.conf`, and contains global variables required for basic server
+  configuration. This file is read first in the initialization sequence.
+- `defaults.config` contains initial settings for many customizable options in WeBWorK. This file is read second in the
+  initialization sequence. **This file should not be changed**
+- `localOverrides.conf.dist` should be copied to `localOverrides.conf`. `localOverrides.conf` will be read after the
+  `defaults.config` file is processed and will overwrite configurations in `defaults.config`. Use this file to make
+  changes to the settings in `defaults.config`.
+- `database.conf.dist` contains database configuration parameters. It is included by `defaults.config`. This file
+  should not be copied or modified unless you really know what you are doing.
+
+Configuration extension files.
+
+- `authen_LTI.conf.dist` should be copied to `authen_LTI.conf` if you want to allow LTI authentication into webwork2
+  from an LMS.
+- `LTIConfigVariables.config` includes some additional variables used by `authen_LTI.conf` and is included by that file.
+- `authen_CAS.conf.dist` should be copied to `authen_CAS.conf` to configure CAS authentication.
+- `authen_ldap.conf.dist` should be copied to `authen_ldap.conf` to configure LDAP authentication.
+
+Server configuration files.
+
+- `webwork2.mojolicious.dist.yml` contains the webwork2 Mojolicious app configuration settings. Copy this file to
+  `webwork2.mojolicious.yml` if you need to change those settings. You usually will need to do this.
+- `webwork2.dist.service` is a systemd configuration file for linux systems that serves the webwork2 app via the
+  Mojolicious hypnotoad server. If you need to change it, then copy it to `webwork2.service`.
+- `webwork2-job-queue.dist.service` is a systemd configuration file for linux systems that runs the webwork2 job queue
+  via Minion. If you need to change it, then copy it to `webwork2-job-queue.service`.
+- `webwork2.apache2.4.dist.conf` is only used if you proxy hypnotoad via apache2. Copy this to `webwork2.apache2.4.conf`
+  if any changes need to be made.
+- `webwork2.nginx.dist.conf` is only used if you proxy hypnotoad via nginx. Copy this to `webwork2.nginx.conf` if any
+  changes need to be made.
+
+## Initial configururation of webwork2
+
+- Copy `site.conf.dist` to `site.conf` and `localOverrides.conf.dist` to `localOverrides.conf`, and adjust the variables
+  in `site.conf` as needed. In particular you will need to set `$server_root_url` to the server name, and set
+  `$database_password` to the password for the database.
+- Adjust the variables in `localOverrides.conf` to customize your server for your needs.
+- Copy any of the other `.dist` files and adjust the variables in them as needed. Note that those files will need to be
+  included by the `localOverrides.conf` file.
+
+## Configuration of webwork2 when upgrading
+
+Examine the differences between your copies of the `.dist` files and the corresponding `.dist` files, and adjust your
+copies as needed for changes to the variables that have been made. It is helpful to view a side-by-side `diff` of your
+copy to the corresponding `.dist` file for this.
+
+## Running webwork2 for development
+
+There are two important settings that you may need to change in `site.conf`
+
+- make sure that `$server_root_url` is set to `http://localhost:3000`.
+- make sure that `$pg_dir` is set to the top of your pg directory.
+
+After any other changes in the initial configuration of webwork2 you are ready to run webwork2 for development.
+To do so from the webwork2 directory execute the following
+
+```bash
+./bin/dev_scripts/webwork2-morbo
+```
+
+Note that if you have permissions set for standard production use, then you may need to run this script as the server
+user. You can do this on Ubuntu/Debian systems or MacOS with
+
+```bash
+sudo -u www-data ./bin/dev_scripts/webwork2-morbo
+```
+
+Use the server user on your system instead of "www-data" if it is different.
+
+You can now open your browser to `http://localhost:3000/webwork2`.
+
+For development and testing of the webwork2 job queue additionally execute the following.
+
+```bash
+./bin/webwork2 minion worker
+```
+
+Note that this needs to be run by the same user as the webwork2 app. Both need to have read and write access to the
+SQLite database file that is used for the job queue.
+
+Additionally note that the Minion worker does not hot reload. You must manually restart the worker to reload with
+changes to the task modules.
+
+## Direct deployment of webwork2 for production via hypnotoad
+
+This is the simplest way to deploy webwork2 for production. Note that you should only use this if your server is
+dedicated to only serving webwork2. In addition this may not work in some other cases. For instance, it may not work
+with Shibboleth authentication.
+
+First set up the webwork2 Mojolicious app:
+
+- Copy `webwork2.mojolicious.dist.yml` to `webwork2.mojolicious.yml`.
+- Change `server_user` and `server_group` to the appropriate values for your system.  On Ubuntu appropriate values are
+  `www-data` for both.
+- To run the server without SSL certificates change `listen` in the `hypnotoad` section at the end of the file to
+  `- http://*:80`. This is not recommended for production use.
+- To use SSL certificates change `listen` in the `hypnotoad` section to
+  `- https://*:443?cert=/path/to/fullchain.pem&key=/path/to/privkey.pem`.
+- Change `proxy: 1` to `proxy: 0` or comment out that line.
+- You may also want to adjust the other settings in the file. The `server_root_url_redirect` setting may be useful.
+- Instead of using that setting, you can also copy `htdocs/index.dist.html` to `htdocs/index.html` and that will be the
+  server front page.
+- Install the Perl module `Mojolicious::Plugin::SetUserGroup`.
+
+The Mojolicious hypnotoad server will be started by the root user and the user and group will be switched to what is set
+for `server_user` and `server_group` after the app starts.  It is not advisable to run the Mojolicious hypnotoad server
+as a user that can directly login to the server.  On Ubuntu systems you can use the `www-data` user that is already
+available. If a user is needed you can create the user `webwork`, for example, with `sudo useradd -M webwork`.  Make
+sure that the user has read access to the SSL certificates given in the configuration above if using certificates.
+Usually the user and group will be the same.
+
+Then set up the systemd service:
+
+- Copy `webwork2.dist.service` to `webwork2.service`.
+- Comment out the `User`, `Group`, and `Environment` settings in the copy.
+- To enable and start the service, execute
+
+```bash
+sudo systemctl enable /opt/webwork/webwork2/conf/webwork2.service
+sudo systemctl start webwork2
+```
+
+You should now be able to open your browser to `http://yoursite.edu/webwork2` or `https://yoursite.edu/webwork2`.
+
+## Deployment of webwork2 via hypnotoad proxied by apache2
+
+This is a more versatile deployment approach. It allows you to use urls not consumed by webwork2 for other purposes.
+
+First install and configure apache2. This is not covered in this document.
+
+Then set up the webwork2 Mojolicious app:
+
+- Copy `webwork2.mojolicious.dist.yml` to `webwork2.mojolicious.yml` if you want to modify settings in that file.
+- Copy `webwork2.apache2.4.dist.conf` to `webwork2.apache2.4.conf`.
+- Change the `X-Forwarded-Proto` to `http` if you do not have SSL certificates.
+- Execute the following from the `/opt/webwork/webwork` directory to enable the webwork2 apache configuration:
+
+```bash
+sudo ln -s $PWD/conf/webwork2.apache2.4.conf /etc/conf-enabled/webwork2.conf
+sudo a2enmod proxy proxy_http
+sudo systemctl restart apache2
+```
+
+Now set up the systemd service:
+
+- Copy `webwork2.dist.service` to `webwork2.service`.
+- Execute the following to enable and start the service:
+
+```bash
+sudo systemctl enable /opt/webwork/webwork2/conf/webwork2.service
+sudo systemctl start webwork2
+```
+
+## Deployment of webwork2 via hypnotoad proxied by nginx
+
+This is a more versatile deployment approach. It allows you to use urls not consumed by webwork2 for other purposes.
+
+First install and configure nginx. This is not covered in this document.
+
+Then set up the webwork2 Mojolicious app:
+
+- Copy `webwork2.mojolicious.dist.yml` to `webwork2.mojolicious.yml` if you want to modify settings in that file.
+- Copy `webwork2.nginx.dist.conf` to `webwork2.nginx.conf` if you want to modify any settings. This will setup
+  a reverse proxy for all webwork2 paths to proxy to the hypnotoad server. Usually this file will not need to be
+  modified. You could even use the `.dist` file directly in most cases.
+- Edit your nginx server configuration file (this may be in `/etc/nginx/conf.d` or `/etc/nginx/sites-available`) and add
+  the line `include /opt/webwork/webwork2/conf/webwork2.nginx.conf;` to the end of the `server` section in that file.
+- Execute the following from the `/opt/webwork/webwork2` directory to enable the webwork2 nginx configuration:
+
+```bash
+sudo systemctl restart nginx
+```
+
+Now set up the systemd service:
+
+- Copy `webwork2.dist.service` to `webwork2.service`.
+- Execute the following to enable and start the service:
+
+```bash
+sudo systemctl enable /opt/webwork/webwork2/conf/webwork2.service
+sudo systemctl start webwork2
+```
+
+### Deployment of the webwork2 job queue for all server arrangments
+
+Some long running processes are not directly run by the webwork2 Mojolicious app. Particularly mass grade updates via
+LTI and sending of instructor emails. Instead these tasks are executed via the webwork2 Minion job queue.
+
+Set up the job queue:
+
+- Copy `webwork2-job-queue.dist.service` to `webwork2-job-queue.service`.
+
+Then execute the following to start the job queue:
+
+```bash
+sudo systemctl enable /opt/webwork/webwork2/conf/webwork2-job-queue.service
+sudo systemctl start webwork2-job-queue
+
+```
diff --git a/conf/authen_LTI.conf.dist b/conf/authen_LTI.conf.dist
index ee86efe570..091bdc4e89 100644
--- a/conf/authen_LTI.conf.dist
+++ b/conf/authen_LTI.conf.dist
@@ -1,382 +1,164 @@
 #!perl
 
-#############################################################################
-# authen_LTI.conf
+################################################################################################
 # Configuration for using LTI authentication.
 # To enable this file, uncomment the appropriate lines in localOverrides.conf
-#############################################################################
+# The settings in this file apply to both LTI 1.1 and LTI 1.3 authentication.
+# The settings specific to the LTI 1.1 authenticatio are in authen_LTI_1_1.conf.
+# The settings specific to the LTI 1.3 authenticatio are in authen_LTI_1_3.conf.
+################################################################################################
 
-# This is a string that is used to name the LMS for end users,
-# for example in a message telling users to sign in through their LMS.
-$LMS_name = 'e.g., Blackboard, Canvas, Moodle, etc.';
-#$LMS_name = 'Desire2Learn';
-
-# This is a URL that should take users to a place they can log in to their LMS.
-# It will use the text from $LMS_name, but use $LMS_url as the href.
-# If $LMS_url is empty or undefined, the text from $LMS_name is used with no link.
-$LMS_url = '';
-#$LMS_url = 'https://myschool.edu/lms/';
-
-# Set debug_lti_parameters  to 1 to have LTI calling parameters printed to HTML page for
-# debugging.  This is useful when setting things up for the first time because
-# different LMS systems have different parameters
-$debug_lti_parameters = 1;
+# Set debug_lti_parameters to 1 to have LTI calling parameters printed to HTML page for
+# debugging.  This is useful when setting things up for the first time because different LMS
+# systems have different parameters
+$debug_lti_parameters = 0;
 
 # To get more information on passing grades back to the LMS enmass set debug_lti_grade_passback
 # to one.  And set the LTIMassUpdateInterval to 60 (seconds).
 $debug_lti_grade_passback = 0;
 
-# This will print into the apache log the success or failure of updating each user/set.
-# If the set has "no lis_source_did" then that set hasn't been assigned, or the user is an instructor
-# and not a student.
+# This will print into the webwork2 app log the success or failure of updating each user/set.
 
 # Setting both debug_lti_parameters and debug_lti_grade_passback will cause the full request and
-# response between the LMS and WW to be printed into apache error log file for each
-# user/set  update of the grade.
+# response between the LMS and WW to be printed into webwork2 app log file for each user/set
+# update of the grade.
 
 # The switches above can be set in course.conf to enable debugging for just one course.
 
-# If you want even more information enable the debug facility for SubmitGrade.pm in
-# the WeBWorK::Constants file.
-# This will print extensive debug messages for all courses.
+# If you want even more information enable the debug facility in the webwork2.mojolicious.yml
+# file.  This will print extensive debugging messages for all courses.
+
+# Note that for LTI 1.3 not all debug message will make it back to the HTML page due to the
+# nature of how LTI 1.3 authentication works with automatic form submissions and redirects.
 
-#############################################################################
+################################################################################################
 # Authentication settings
-#############################################################################
+################################################################################################
 
-# This first section enables LTI authentication.
-# Failover to Basic_TheLastOption is necessary to authenticate with
-# cookie keys.
+# This section enables LTI authentication.  If a course uses LTI 1.1 (see $LTIVersion below),
+# then the LTIAdvanced module will be used.  If a course uses LTI 1.3 (see $LTIVersion below),
+# the LTIAdvantage will be used.  If you know a site will not use one or the other, it can be
+# commented out. Failover to Basic_TheLastOption is necessary to authenticate with cookie keys.
 $authen{user_module} = [
-	{ "*" => "WeBWorK::Authen::LTIAdvanced", },           #preferred authorization method
-	{ "*" => "WeBWorK::Authen::Basic_TheLastOption", }    #fallback authorization method
+	{ '*' => 'WeBWorK::Authen::LTIAdvantage' },          # first try LTI 1.3
+	{ '*' => 'WeBWorK::Authen::LTIAdvanced' },           # next try LTI 1.1
+	{ '*' => 'WeBWorK::Authen::Basic_TheLastOption' }    # fallback authorization method
 ];
 
-# If the preferred module is an external authentication
-# module but the sequence includes an internal authentication
-# system, e.g., Basic_TheLastOption, then $external_auth (below)
-# must be set to 1 (or true). If the value is 1,
-# then, if the authentication sequence reaches
-# Basic_TheLastOption, then WeBWorK::Login
-# will display a screen directing the user
-# back to an external authentication system.
-# This prevents you from attempting to login in to WeBWorK directly.
-$external_auth = 0;
-
-# NOTE:  If external authentication is disabled
-# then you should probably also prevent students
-# from changing their passwords (because they can't use them).
-# To do this uncomment the following
-#$permissionLevels{change_password} = "ta";
-
-################################################################################
-# LTI preferred and fallback source of WW user_id
-################################################################################
-
-# You MUST set what LTI field is used to set the WeBWorK user_id.
-#
-# The lis_person_sourcedid (or one of its variants) is formally an OPTIONAL field
-#    https://www.imsglobal.org/specs/ltiv1p1/implementation-guide
-# but is relatively consistently available.
-# However, some LMS systems, Blackboard in particular, do not send lis_person_sourcedid.
-#
-# The email address lis_person_contact_email_primary is often a more understandable
-# value but may not exist.
-#
-# The LTI standard recommends providing a "user_id" value, which needs to be a unique
-# identifier for each student in the LMS. The value is not expected to be people
-# friendly by may be available when neither of the others are.
-#
-# You need to make sure to use a setting such that
-#    (1) usernames are unique and
-#    (2) the setting is as compatible as possible with the practices
-#        of the institutions that are being served in a site.
-#
-# If each course is only being used be students from a single institution
-# and the value  lis_person_sourcedid is unique across that population
-# and matches the logon username at that institution, then lis_person_sourcedid
-# is probably the better choice.
-#
-# On the other hand, if a site is serving a population from several institutions
-# or if the lis_person_sourcedid is not necessarily unique across the population,
-# then lis_person_contact_email_primary is the better choice.
-#
-# NOTE: As of WeBWorK 2.16 some setting MUST be made.
-#
-#       If no setting is made, all LTI logins will fail and an error will be reported.
-#
-#       See the comment further down on how to get WeBWorK 2.16 to behave similarly to
-#       the prior behavior.
-
-# NOTE: Even if a course management system sends one of the common misspellings of
-# "lis_person_sourcedid", i.e.,
-# lis_person_sourced_id, lis_person_source_id, and lis_person_sourceid,
-# one must nevertheless use the correct spelling "lis_person_sourcedid" here.
-$preferred_source_of_username = "lis_person_contact_email_primary";
-#$preferred_source_of_username = "lis_person_sourcedid";
-
-# You can use any parameter the LMS will provide for the
-# $preferred_source_of_username, ex:
-#$preferred_source_of_username = "user_id";
-
-# You can also optionally provide a $fallback_source_of_username
-# which will only be used if WW is unable to determine a user_id
-# using $preferred_source_of_username.
-
-# Warning: This can be dangerous, e.g. if the fallback were used
-# for some student, and then on a later connection by that student
-# the LMS provided a value for the $preferred_source_of_username
-# field, then the student will get a new WeBWorK account and lose
-# access to their prior account and the prior scores will not be
-# associated with their account any longer. Thus, this feature
-# should be used carefully!
-$fallback_source_of_username = '';
-#$fallback_source_of_username = "lis_person_sourcedid";
-
-# Stripping the domain when creating user_id from an email address:
-# If you set either $preferred_source_of_username or $fallback_source_of_username
-# to lis_person_contact_email_primary, and the email is being used as the WeBWorK
-# user_id, then if the following setting is enabled, then WeBWorK will strip off
-# the domain portion of the email (after the '@') and just use the username.
-$strip_address_from_email = 0;
-
-# This feature should not be used if emails could collide after the domain is removed.
-
-# To get WeBWorK 2.16 to handle LTI authentication using an approach
-# roughly the same as was used until WeBWorK 2.15, you can set one of the 2 pairs of
-# settings:
-#
-# Option 1: Primary choice is lis_person_contact_email_primary, fallback to lis_person_sourcedid:
-#$preferred_source_of_username = "lis_person_contact_email_primary";
-#$fallback_source_of_username = "lis_person_sourcedid";
-#
-# Option 2: Primary choice is lis_person_sourcedid, fallback to lis_person_contact_email_primary:
-#$preferred_source_of_username = "lis_person_sourcedid";
-#$fallback_source_of_username = "lis_person_contact_email_primary";
-
-# Depending on the username source, capitalization may vary between students,
-# such as when using an email address to get the username. Turning this option
-# on will make all usernames lowercase. Default is 0 (off).
-#$lti_lowercase_username = 1;
-
-################################################################################
-# LTI Preferred source of Student Id
-################################################################################
-
-# If preferred_source_of_student_id is not set, WeBWorK will set student_id
-# to be an empty string. You should use debug_lti_parameters in order to determine
-# the value to use for your LMS.
-
-# For example, in D2L, student_id is stored in OrgDefinedId and
-# the corresponding LTI parameter is called ext_d2l_orgdefinedid.
-$preferred_source_of_student_id = "";
-#$preferred_source_of_student_id = "ext_d2l_orgdefinedid";
-
-################################################################################
-# LTI Basic Authentication Parameters
-################################################################################
-
-# This "shared secret" is entered in the LMS request form and needs to be
-# match the entry here.  This is used to validate all requests between the
-# LMS and WeBWorK
-
-# You should choose your own secret word for security and should treat it
-# like a password.
-$LTIBasicConsumerSecret = "";    #This must be set
-
-# The purpose of the LTI nonces is to prevent man-in-the-middle attacks.
-# The NonceLifeTime (in seconds) must be short enough to prevent
-# at least casual man-in-the-middle attacks but
-# long enough to accommodate normal server and networking delays
-# (and perhaps non-synchronization of server time clocks).
-$NonceLifeTime = 60;    # in seconds
-
-# WeBWorK will automatically create users when logging in via the LMS for the
-# first time.  If the following flag is enabled then it will also keep the
-# user demographic data up to date with the LMS.  If a users information change
-# in the LMS then it will change in WeBWorK. However, any changes to the
-# student data via WeBWorK will be overwritten the next time the student
-# logs in.
+# Include configurations.  You must uncomment at least one of the following. You may uncomment
+# both if the site may be using both LTI 1.1 and 1.3 in different courses. After uncommenting
+# the LTI_1_x line, you must copy the file authen_LTI_1_x.conf.dist to authen_LTI_1_x.conf and
+# then edit that file to fill in the settings for LTI_1_x.
+#include('conf/authen_LTI_1_1.conf');
+#include('conf/authen_LTI_1_3.conf');
+
+# This is the default LTI version that will be used for the site.  This must be 'v1p1' for LTI
+# 1.1 authentication, 'v1p3' for LTI 1.3 authentication, or '' to disable LTI authentication.
+# A course may override this setting to use the other version of LTI authentication or to
+# disable LTI authentication for the course.
+$LTIVersion = 'v1p1';
+
+# WeBWorK will automatically create users when logging in via the LMS for the first time as long
+# as the permission level is less than or equal to the permission level of this setting.  For
+# security reasons accounts with high permissions should not be auto created via LTI requests.
+# Set this variable to 'professor' if you want professor accounts to be created automatically.
+$LTIAccountCreationCutoff = 'ta';
+
+# If the following flag is enabled then the user demographic data will be kept up to date with
+# the data from the LMS.  If a user's information changes in the LMS then it will change in
+# WeBWorK. This means that any changes to the student data via WeBWorK will be overwritten the
+# next time the student logs in.
 $LMSManageUserData = 1;
 
-# NOTE:  If mange user data is enabled  then you should probably also
-# prevent students from changing their email because the changes
-# will be overwritten.  To do this ucomment the following
-#$permissionLevels{change_email} = "ta";
-
-# This allows you to override the URL that Oauth will use to validate the
-# authentication.  This is important if you have some sort of setup (e.g. load
-# distributing) where the path in the LMS does not match the path that ends up
-# in the webwork page
-$LTIBasicToThisSiteURL = "";
-
-################################################################################
-# Authorization system   LTI:  LMS Grade Passback
-################################################################################
-
-# WeBWorK can automatically report grades back to your LMS.  However the
-# system is reasonably restrictive.  When you create an LTI link in your
-# LMS you can choose to have that LTI link have a grade associated to it.
-# WeBWorK can report back a single percentage as the "grade" for that link.
-# There are two modes under which this can occur.
-
-# Single Course Grade Mode:  $LTIGradeMode = "course";
-#
-# In this mode you create a single Link/Assignment which points to your
-# WeBWorK Course address.  E.G. In Blackboard
-# Name: WeBWorK
-# URL: https://webwork.university.edu/webwork2/CourseName
-# Check Yes:  This link is to a Tool Provider
-# Enable Evaluation: Yes
-# Points Possible: 100
-#   Students will receive a LMS grade associated to the Link/Assignment
-# which is determined by their percentage total homework grade in WeBWorK.
-# This total homework grade is the same as the grade that is reported on the
-# grades page.  You can change the weight of sets by altering the weight of
-# the problems in the set.
-
-# Individual Homework Grade Mode:  $LTIGradeMode = "homework";
-#
-# In this mode you create a single Link/Assignment for *every* homework set in
-# the course.  The address should be the address of that set in the Course.
-# E.G. in Blackboard
-# Name: Set Name
-# URL: https://webwork.university.edu/webwork2/CourseName/SetName
-# Check Yes:  This link is to a Tool Provider
-# Enable Evaluation: Yes
-# Points Possible: 100
-#   Students will receive a grade for each Link/Assignment which is determined
-# by their percentage homework grade on the Set which the Link/Assignment
-# points to.  Students need to use the Link/Assignment in the LMS at least once
-# to enable grade passback.  In particular when working in this mode it is
-# recommended that you only allow students to log in via the LMS.
+# If the preferred module is an external authentication module but the sequence includes an
+# internal authentication system, e.g., Basic_TheLastOption, then $external_auth (below) must be
+# set to 1 (or true). If the value is 1, then, if the authentication sequence reaches
+# Basic_TheLastOption, then WeBWorK::Login will display a screen directing the user back to an
+# external authentication system.  This prevents you from attempting to login in to WeBWorK
+# directly.
+$external_auth = 0;
 
-# Note: For both of these modes only the grades are passed back.  In
-# particular nothing else about the Link/Assignment in the LMS and the
-# homework set in WeBWorK is synchronized.  In particular the total number of
-# points/problems, the due dates, the open dates are not kept in sync
-# automatically.
+# NOTE:  If external authentication is disabled then you should probably also prevent students
+# from changing their passwords (because they can't use them).  To do this uncomment the
+# following.
+#$permissionLevels{change_password} = 'ta';
+
+################################################################################################
+# Authorization system LTI:  LMS Grade Passback
+################################################################################################
+
+# WeBWorK can automatically report grades back to your LMS.  However the system is reasonably
+# restrictive.  When you create an LTI link in your LMS you can choose to have that LTI link
+# have a grade associated to it.  WeBWorK can report back a single percentage as the "grade" for
+# that link.  There are two modes under which this can occur.
+
+# Single Course Grade Mode:  $LTIGradeMode = 'course';
+# In this mode you create a single Link/Assignment which points to your WeBWorK Course address.
+# Students will receive a LMS grade associated to the Link/Assignment which is determined by
+# their percentage total homework grade in WeBWorK.  This total homework grade is the same as
+# the grade that is reported on the grades page.  You can change the weight of sets by altering
+# the weight of the problems in the set.
+
+# Individual Homework Grade Mode:  $LTIGradeMode = 'homework';
+# In this mode you create a single Link/Assignment for *every* homework set in the course.  The
+# address should be the address of that set in the Course.  Students will receive a grade for
+# each Link/Assignment which is determined by their percentage homework grade on the Set which
+# the Link/Assignment points to.  Students need to use the Link/Assignment in the LMS at least
+# once to enable grade passback.  In particular when working in this mode it is recommended that
+# you only allow students to log in via the LMS.
+
+# Note: For both of these modes only the grades are passed back.  In particular nothing else
+# about the Link/Assignment in the LMS and the homework set in WeBWorK is synchronized.  In
+# particular the total number of points/problems, the due dates, the open dates are not kept in
+# sync automatically (yet).
+
+# Site Administrator Note for LTI 1.3:  This uses OAuth2 RSA private/public keys.  These keys
+# are automatically generated the first time that they are needed.  It is recommended that new
+# keys are generated on a regular basis.  At this point, key rotation is not automatic for
+# webwork2.  Howevever, it is simple.  Delete the files $webwork2_dir/DATA/lti_private_key.json
+# and $webwork2_dir/DATA/lti_public_key.json.  New keys will then be automatically generated the
+# next time they are needed.  Probably a good rule of thumb (for now) is to do this at the
+# beginning of every term.
 
 $LTIGradeMode = '';
-#$LTIGradeMode = "course";
-#$LTIGradeMode = "homework";
+#$LTIGradeMode = 'course';
+#$LTIGradeMode = 'homework';
 
-# When set this variable sends grades back to the LMS every time a user
-# submits an answer.  This keeps students grades up to date but can be
-# a drain on the server.
+# When set this variable sends grades back to the LMS every time a user submits an answer.  This
+# keeps students grades up to date but can be a drain on the server.
 $LTIGradeOnSubmit = 1;
 
-# Should WW try to check the current LMS grade before sending a grade update.
-# This is intended to reduce LMS records when no real grade change occurred.
-# It requires a 2 round process, first querying the current grade from the LMS
-# and then when needed making the grade submission.
-$lti_check_prior = 0;    # default is off - old setting - always update with no check
+# If CheckPrior is set to 1 then the current LMS grade will be checked first, and if the grade
+# has not changed then the grade will not be updated.  This is intended to reduce changes to LMS
+# records when no real grade change occurred.  It requires a 2 round process, first querying the
+# current grade from the LMS and then when needed making the grade submission.
+$LTICheckPrior = 0;
 
-# The system periodically updates student grades on the LMS.  This
-# variable controls how often that happens.  Set to -1 to disable.
+# The system periodically updates student grades on the LMS.  This variable controls how often
+# that happens.  Set to -1 to disable.
 $LTIMassUpdateInterval = 86400;    #in seconds
 
-################################################################################
-# Authorization system   LTI:  LMS Roles Mapped to WeBWorK Roles
-################################################################################
-
-# You may need to customize this hash to take into account the roles
-# that are used in your LMS.  Set the debug_lti_parameters flag to see
-# what roles are being reported to WeBWorK by your LMS
-%LMSrolesToWeBWorKroles = (
-	"librarian"               => "guest",
-	"observer"                => "guest",
-	"visitor"                 => "guest",
-	"Guest"                   => "guest",
-	"Designer"                => "professor",
-	"instructor"              => "professor",
-	"Instructor"              => "professor",
-	"Faculty"                 => "professor",
-	"Teacher"                 => "professor",
-	"Student"                 => "student",
-	"Learner"                 => "student",
-	"student"                 => "student",
-	"AI/TA"                   => "ta",
-	"TA"                      => "ta",
-	"Teaching Assistant"      => "ta",
-	"Teaching Assistant (TA)" => "ta",
-	"Non-editing teacher"     => "ta",
-	"Grader"                  => "ta",
-);
-
-# For security reasons accounts with high permissions should not be auto
-# created via LTI requests.  Set this variable to "professor" if you want
-# professor accounts to be created automatically
-$LTIAccountCreationCutoff = "ta";
-
-################################################################################
-# Local routine to modify users
-################################################################################
-
-# When users are added to the system WeBWorK will do its best to fill out
-# user information.  However, institutions can add code to the following
-# routine to set fields not normally set by WeBWorK.  E.G.  The student ID
-# field.
-
-#$LTI_modify_user = sub {
-#  # The self object from LTIAdvanced.pm
-#  my $self = shift;
-#  # The user object to be modified
-#  my $user = shift;
-#
-#  # Parse context_id for additional information.  E.G.
-#  my @course_id=split /-/, $self -> {"context_id"};
-#  $user->{"section"} = $course_id[4];
-#};
-
-################################################################################
-# Local routine to modify user sets
-################################################################################
-
-# When users are added to the system they are also assigned all visible sets
-# This routine can be used to modify the sets before they are assigned.  E.G.
-# extend due dates based off the number of problems students have to do
-
-#$LTI_modify_user_set = sub {
-#  # The self object from LTIAdvanced.pm
-#  my $self = shift;
-#  my $globalSet = shift;
-#  # The userSet object to be modified
-#  my $userSet = shift;
-
-#  my $numberOfSetsAssigned = $self->{numberOfSetsAssigned};
-#  my $daysPerSetMakeup = 2;
-#  my $reasonableNumberOfDays = $numberOfSetsAssigned*$daysPerSetMakeup +1;
-#  if ($reasonableNumberOfDays < 2) {$reasonableNumberOfDays = 2;}
-#  my $niceDueTime = $globalSet->due_date + $reasonableNumberOfDays*86400;
-#  my $niceAnswerTime = $niceDueTime + 600;
-
-#  $userSet->due_date($niceDueTime);
-#  $userSet->answer_date($niceAnswerTime);
-#};
-
-################################################################################
+################################################################################################
 # Add an 'LTI' tab to the Course Configuration page
-################################################################################
-
-# Uncomment any of the variables listed in the @LTIConfigVariables array below
-# if you would like the Course Configuration page to have an LTI tab, granting
-# the course instructor easy access to some of the LTI settings. You may leave
-# some of the variables commented out if you would like to omit them from the
-# options in this tab.  If all variables are left commented out, then the tab
-# will not be shown.  Note that the default values for the variables that will
-# be shown in the LTI tab are the values that are set above.  Further note that
-# only the variables listed in LTIConfigValues.config may be added to the LTI
-# config tab.
+################################################################################################
+
+# Uncomment any of the variables listed in the @LTIConfigVariables array below if you would like
+# the Course Configuration page to have an LTI tab, granting the course instructor easy access
+# to some of the LTI settings. You may leave some of the variables commented out if you would
+# like to omit them from the options in this tab.  If all variables are left commented out, then
+# the tab will not be shown.  Note that the default values for the variables that will be shown
+# in the LTI tab are the values that are set above.  Further note that only the variables listed
+# in LTIConfigValues.config may be added to the LTI config tab.  In addition, only the variables
+# that pertain to the active LTI version will be shown in the tab.
 @LTIConfigVariables = (
-	#'LMS_name',
-	#'LMS_url',
+	#'LTI{v1p1}{LMS_name}',
+	#'LTI{v1p3}{LMS_name}',
+	#'LTI{v1p1}{LMS_url}',
+	#'LTI{v1p3}{LMS_url}',
 	#'external_auth',
 	#'LTIGradeMode',
 	#'LMSManageUserData',
 	#'debug_lti_parameters'
 );
 
-include('conf/LTIConfigValues.config');
-
-1;    #final line of the file to reassure perl that it was read properly.
+1;    # final line of the file to reassure perl that it was read properly.
diff --git a/conf/authen_LTI_1_1.conf.dist b/conf/authen_LTI_1_1.conf.dist
new file mode 100644
index 0000000000..2353b66a28
--- /dev/null
+++ b/conf/authen_LTI_1_1.conf.dist
@@ -0,0 +1,218 @@
+#!perl
+
+################################################################################################
+# Configuration for using LTI 1.1 authentication.
+# To enable this file, uncomment the appropriate lines in authen_LTI.conf
+################################################################################################
+
+# This is a string that is used to name the LMS for end users, for example in a message telling
+# users to sign in through their LMS.
+$LTI{v1p1}{LMS_name} = 'e.g., Blackboard, Canvas, Moodle, etc.';
+#$LTI{v1p1}{LMS_name} = 'Desire2Learn';
+
+# This is a URL that should take users to a place they can log in to their LMS.  It will use the
+# text from LMS_name, but use LMS_url as the href.  If LMS_url is empty or undefined, the
+# text from LMS_name is used with no link.
+$LTI{v1p1}{LMS_url} = '';
+#$LTI{v1p1}{LMS_url} = 'https://myschool.edu/lms/';
+
+################################################################################################
+# LTI 1.1 preferred and fallback source of WW user_id
+################################################################################################
+
+# You MUST set what LTI field is used to set the WeBWorK user_id.
+#
+# The lis_person_sourcedid (or one of its variants) is formally an OPTIONAL field
+#    https://www.imsglobal.org/specs/ltiv1p1/implementation-guide
+# but is relatively consistently available.
+# However, some LMS systems, Blackboard in particular, do not send lis_person_sourcedid.
+#
+# The email address lis_person_contact_email_primary is often a more understandable value but
+# may not exist.
+#
+# The LTI standard recommends providing a "user_id" value, which needs to be a unique identifier
+# for each student in the LMS. The value is not expected to be people friendly by may be
+# available when neither of the others are.
+#
+# You need to make sure to use a setting such that
+#    (1) usernames are unique and
+#    (2) the setting is as compatible as possible with the practices of the institutions that
+#        are being served in a site.
+#
+# If each course is only being used by students from a single institution and the value
+# lis_person_sourcedid is unique across that population and matches the logon username at that
+# institution, then lis_person_sourcedid is probably the better choice.
+#
+# On the other hand, if a site is serving a population from several institutions or if the
+# lis_person_sourcedid is not necessarily unique across the population, then
+# lis_person_contact_email_primary is the better choice.
+#
+# NOTE: As of WeBWorK 2.16 some setting MUST be made.
+#
+#       If no setting is made, all LTI logins will fail and an error will be reported.
+#
+#       See the comment further down on how to get WeBWorK 2.16 to behave similarly to
+#       the prior behavior.
+
+# NOTE: Even if a course management system sends one of the common misspellings of
+# "lis_person_sourcedid", i.e.,
+# lis_person_sourced_id, lis_person_source_id, and lis_person_sourceid,
+# one must nevertheless use the correct spelling "lis_person_sourcedid" here.
+$LTI{v1p1}{preferred_source_of_username} = 'lis_person_contact_email_primary';
+#$LTI{v1p1}{preferred_source_of_username} = 'lis_person_sourcedid';
+
+# You can use any parameter the LMS will provide for the preferred_source_of_username, ex:
+#$LTI{v1p1}{preferred_source_of_username} = 'user_id';
+
+# You can also optionally provide a fallback_source_of_username which will only be used if WW is
+# unable to determine a user_id using preferred_source_of_username.
+
+# Warning: This can be dangerous, e.g. if the fallback were used for some student, and then on a
+# later connection by that student the LMS provided a value for the preferred_source_of_username
+# field, then the student will get a new WeBWorK account and lose access to their prior account
+# and the prior scores will not be associated with their account any longer. Thus, this feature
+# should be used carefully!
+$LTI{v1p1}{fallback_source_of_username} = '';
+#$LTI{v1p1}{fallback_source_of_username} = 'lis_person_sourcedid';
+
+# Stripping the domain when creating user_id from an email address:
+# If you set either preferred_source_of_username or fallback_source_of_username to
+# lis_person_contact_email_primary, and the email is being used as the WeBWorK user_id, then if
+# the following setting is enabled, then WeBWorK will strip off the domain portion of the email
+# (after the '@') and just use the username.
+$LTI{v1p1}{strip_domain_from_email} = 0;
+
+# This feature should not be used if emails could collide after the domain is removed.
+
+# To get WeBWorK 2.16 to handle LTI authentication using an approach roughly the same as was
+# used until WeBWorK 2.15, you can set one of the 2 pairs of settings:
+#
+# Option 1: Primary choice is lis_person_contact_email_primary, fallback to lis_person_sourcedid:
+#$LTI{v1p1}{preferred_source_of_username} = 'lis_person_contact_email_primary';
+#$LTI{v1p1}{fallback_source_of_username} = 'lis_person_sourcedid';
+#
+# Option 2: Primary choice is lis_person_sourcedid, fallback to lis_person_contact_email_primary:
+#$LTI{v1p1}{preferred_source_of_username} = 'lis_person_sourcedid';
+#$LTI{v1p1}{fallback_source_of_username} = 'lis_person_contact_email_primary';
+
+# Depending on the username source, capitalization may vary between students, such as when using
+# an email address to get the username. Turning this option on will make all usernames
+# lowercase. Default is 0 (off).
+$LTI{v1p1}{lowercase_username} = 0;
+
+################################################################################################
+# LTI 1.1 Preferred source of Student Id
+################################################################################################
+
+# If preferred_source_of_student_id is not set, WeBWorK will set student_id to be an empty
+# string. You should use debug_lti_parameters in order to determine the value to use for your
+# LMS.
+
+# For example, in D2L, student_id is stored in OrgDefinedId and the corresponding LTI parameter
+# is called ext_d2l_orgdefinedid.
+$LTI{v1p1}{preferred_source_of_student_id} = '';
+#$LTI{v1p1}{preferred_source_of_student_id} = 'ext_d2l_orgdefinedid';
+
+################################################################################################
+# LTI 1.1 Basic Authentication Parameters
+################################################################################################
+
+# This "shared secret" is entered in the LMS request form and needs to be match the entry here.
+# This is used to validate all requests between the LMS and WeBWorK.
+
+# You should choose your own secret word for security and should treat it like a password.
+$LTI{v1p1}{BasicConsumerSecret} = '';
+
+# The purpose of the LTI nonces is to prevent man-in-the-middle attacks.  The NonceLifeTime (in
+# seconds) must be short enough to prevent at least casual man-in-the-middle attacks but long
+# enough to accommodate normal server and networking delays (and perhaps non-synchronization of
+# server time clocks).
+$LTI{v1p1}{NonceLifeTime} = 60;    # in seconds
+
+# This allows you to override the URL that Oauth will use to validate the authentication.  This
+# is important if you have some sort of setup (e.g. load distributing) where the path in the LMS
+# does not match the path that ends up in the webwork page.
+$LTI{v1p1}{OverrideSiteURL} = '';
+
+# This is like $LTI{v1p1}{OverrideSiteURL}, except that you only declare the protocol and domain
+# to replace and leave the rest of a URL alone. If somehow both are set in the config chain,
+# $LTI{v1p1}{OverrideSiteURL} is used, without being modified by the below.
+$LTI{v1p1}{OverrideSiteProtocolDomain} = '';
+#$LTI{v1p1}{OverrideSiteProtocolDomain} = 'https://vmwebwork42.myschool.edu';
+
+################################################################################################
+# LTI 1.1 LMS Roles Mapped to WeBWorK Roles
+################################################################################################
+
+# You may need to customize this hash to take into account the roles that are used in your LMS.
+# Set the debug_lti_parameters flag to see what roles are being reported to WeBWorK by your LMS.
+$LTI{v1p1}{LMSrolesToWeBWorKroles} = {
+	'librarian'               => 'guest',
+	'observer'                => 'guest',
+	'visitor'                 => 'guest',
+	'Guest'                   => 'guest',
+	'Designer'                => 'professor',
+	'instructor'              => 'professor',
+	'Instructor'              => 'professor',
+	'Faculty'                 => 'professor',
+	'Teacher'                 => 'professor',
+	'Student'                 => 'student',
+	'Learner'                 => 'student',
+	'student'                 => 'student',
+	'AI/TA'                   => 'ta',
+	'TA'                      => 'ta',
+	'Teaching Assistant'      => 'ta',
+	'Teaching Assistant (TA)' => 'ta',
+	'Non-editing teacher'     => 'ta',
+	'Grader'                  => 'ta',
+};
+
+################################################################################################
+# Local routine to modify users
+################################################################################################
+
+# When users are added to the system WeBWorK will do its best to fill out user information.
+# However, institutions can add code to the following routine to set fields not normally set by
+# WeBWorK.  E.G.  The student ID field.
+
+#$LTI{v1p1}{modify_user} = sub {
+#  # The self object from LTIAdvanced.pm
+#  my $self = shift;
+#  # The user object to be modified
+#  my $user = shift;
+#
+#  # Parse context_id for additional information.  E.G.
+#  my @course_id = split /-/, $self->{context_id};
+#  $user->{section} = $course_id[4];
+#};
+
+################################################################################################
+# Local routine to modify user sets
+################################################################################################
+
+# When users are added to the system they are also assigned all visible sets This routine can be
+# used to modify the sets before they are assigned.  E.G.  extend due dates based off the number
+# of problems students have to do
+
+#$LTI{v1p1}{modify_user_set} = sub {
+#  # The self object from LTIAdvanced.pm
+#  my $self      = shift;
+#  my $globalSet = shift;
+#  # The userSet object to be modified
+#  my $userSet = shift;
+#
+#  my $numberOfSetsAssigned   = $self->{numberOfSetsAssigned};
+#  my $daysPerSetMakeup       = 2;
+#  my $reasonableNumberOfDays = $numberOfSetsAssigned*$daysPerSetMakeup + 1;
+#  if ($reasonableNumberOfDays < 2) { $reasonableNumberOfDays = 2; }
+#  my $niceDueTime    = $globalSet->due_date + $reasonableNumberOfDays * 86400;
+#  my $niceAnswerTime = $niceDueTime + 600;
+#
+#  $userSet->due_date($niceDueTime);
+#  $userSet->answer_date($niceAnswerTime);
+#};
+
+# Do not change this.
+$LTI{v1p1}{grader} = 'WeBWorK::Authen::LTIAdvanced::SubmitGrade';
+
+1;    # final line of the file to reassure perl that it was read properly.
diff --git a/conf/authen_LTI_1_3.conf.dist b/conf/authen_LTI_1_3.conf.dist
new file mode 100644
index 0000000000..7d5a668b9c
--- /dev/null
+++ b/conf/authen_LTI_1_3.conf.dist
@@ -0,0 +1,191 @@
+#!perl
+
+################################################################################################
+# Configuration for using LTI 1.3 authentication.
+# To enable this file, uncomment the appropriate lines in authen_LTI.conf
+################################################################################################
+
+# This is a string that is used to name the LMS for end users, for example in a message telling
+# users to sign in through their LMS.
+$LTI{v1p3}{LMS_name} = 'e.g., Blackboard, Canvas, Moodle, etc.';
+#$LTI{v1p3}{LMS_name} = 'Desire2Learn';
+
+# This is a URL that should take users to a place they can log in to their LMS.  It will use the
+# text from LMS_name, but use LMS_url as the href.  If LMS_url is empty or undefined, the
+# text from LMS_name is used with no link.
+$LTI{v1p3}{LMS_url} = '';
+#$LTI{v1p3}{LMS_url} = 'https://myschool.edu/lms/';
+
+################################################################################################
+# LTI 1.3 preferred and fallback source of WW user_id
+################################################################################################
+
+# You MUST set what LTI claim sent in the JWT is used to set the WeBWorK user_id.
+
+# Note that the decoded JWT is a JSON object that is converted to a nested perl hash.  To use
+# elements of a nested hash separate the keys with #.  For example, if the decoded JWT contains:
+
+# "https://purl.imsglobal.org/spec/lti/claim/ext" => { "user_username" => "studentID" },
+
+# Then use 'https://purl.imsglobal.org/spec/lti/claim/ext#user_username' in the settings below.
+
+# The https://purl.imsglobal.org/spec/lti/claim/lis#person_sourcedid is formally an OPTIONAL
+# claim.  See https://www.imsglobal.org/spec/lti/v1p3.  Some LMS systems may not send this value
+# and some may set it to the empty string.
+
+# The email address in the 'email' key of the JWT is often a more understandable value.  This
+# may not exist, but that is unlikely.
+
+# The LTI standard requires providing a 'sub' value, which needs to be a unique identifier for
+# each student in the LMS. The value is not expected to be people friendly but will be
+# available.  Note that this is the only required user claim in the JWT.
+
+# You need to make sure to use a setting such that
+#    (1) usernames are unique and
+#    (2) the setting is as compatible as possible with the practices of the institutions that
+#        are being served in a site.
+
+# If a value is available and is unique for the students in the course and matches the logon
+# username at that institution, then that is probably the better choice.
+
+# On the other hand, if a site is serving a population from several institutions or if the
+# lis#person_sourcedid is not necessarily unique across the population, then email is the better
+# choice.
+
+$LTI{v1p3}{preferred_source_of_username} = 'email';
+
+# You can use any parameter the LMS will provide for the preferred_source_of_username, ex:
+#$LTI{v1p3}{preferred_source_of_username} = 'https://purl.imsglobal.org/spec/lti/claim/ext#user_username';
+
+# You can also optionally provide a fallback_source_of_username which will only be used if
+# a user_id can not be determined using preferred_source_of_username.
+
+# Warning: This can be dangerous. For example, if the fallback were used for some student, and
+# then on a later connection by that student the LMS provided a value for the
+# preferred_source_of_username variable, then the student will get a new WeBWorK account and
+# lose access to their prior account.  The prior scores will not be associated with their
+# account any longer.  Thus, this feature should be used carefully!
+$LTI{v1p3}{fallback_source_of_username} = '';
+#$LTI{v1p3}{fallback_source_of_username} = https://purl.imsglobal.org/spec/lti/claim/lis#person_sourcedid;
+
+# Strip the domain when creating user_id from an email address.  If you set either
+# preferred_source_of_username or fallback_source_of_username to 'email', and the following
+# setting is enabled, then WeBWorK will strip off the domain portion of the email (after the
+# '@') and just use the username in the case that the email is used.  This feature should not be
+# used if emails could collide after the domain is removed.
+$LTI{v1p3}{strip_domain_from_email} = 0;
+
+# Depending on the username source, capitalization may vary between students, such as when using
+# an email address to get the username. Turning this option on will make all usernames
+# lowercase.
+$LTI{v1p3}{lowercase_username} = 0;
+
+################################################################################################
+# LTI 1.3 Preferred source of Student Id
+################################################################################################
+
+# If preferred_source_of_student_id is not set, WeBWorK will set the student_id to be an empty
+# string. You should use debug_lti_parameters in order to determine the value to use for your
+# LMS.  There may be no claim value that provides this.
+$LTI{v1p3}{preferred_source_of_student_id} = '';
+
+################################################################################################
+# LTI 1.3 Basic Authentication Parameters
+################################################################################################
+
+# The following values are provided by the LMS with the external tool.  They are used to
+# validate requests, and all of them must be set.
+$LTI{v1p3}{PlatformID}      = '';
+$LTI{v1p3}{ClientID}        = '';
+$LTI{v1p3}{DeploymentID}    = '';
+$LTI{v1p3}{PublicKeysetURL} = '';
+$LTI{v1p3}{AccessTokenURL}  = '';
+$LTI{v1p3}{AuthReqURL}      = '';
+
+# In the process of LTI 1.3 authentication a request is sent to the LMS in response to its
+# request.  State and nonce values are sent with this request, and those values must be verified
+# in the next response from the LMS.  These values are saved in the database so that they will
+# be available on that next request.  The StateKeyLifetime is how long in seconds these will be
+# stored before deletion.  This must be long enough to accommodate normal server and networking
+# delays.  Note that if authentication is successful this will be deleted before this lifetime
+# expires in any case.  This is only to ensure that keys from failed authentication attempts
+# don't pile up in the database.
+$LTI{v1p3}{StateKeyLifetime} = 60;    # in seconds
+
+################################################################################################
+# LTI 1.3 LMS Roles Mapped to WeBWorK Roles
+################################################################################################
+
+# You may need to customize this hash to take into account the roles that are used in your LMS.
+# Set the debug_lti_parameters flag to see what roles are being reported to WeBWorK by your LMS.
+$LTI{v1p3}{LMSrolesToWeBWorKroles} = {
+	'librarian'               => 'guest',
+	'observer'                => 'guest',
+	'visitor'                 => 'guest',
+	'Guest'                   => 'guest',
+	'Administrator'           => 'professor',
+	'Designer'                => 'professor',
+	'instructor'              => 'professor',
+	'Instructor'              => 'professor',
+	'Faculty'                 => 'professor',
+	'Teacher'                 => 'professor',
+	'Student'                 => 'student',
+	'Learner'                 => 'student',
+	'student'                 => 'student',
+	'AI/TA'                   => 'ta',
+	'TA'                      => 'ta',
+	'Teaching Assistant'      => 'ta',
+	'Teaching Assistant (TA)' => 'ta',
+	'Non-editing teacher'     => 'ta',
+	'Grader'                  => 'ta',
+};
+
+################################################################################################
+# Local routine to modify users
+################################################################################################
+
+# When users are added to the system WeBWorK will do its best to fill out user information.
+# However, institutions can add code to the following routine to set fields not normally set by
+# WeBWorK.  E.G.  The student ID field.
+
+#$LTI{v1p3}{modify_user} = sub {
+#  # The self object from LTIAdvantange.pm
+#  my $self = shift;
+#  # The user object to be modified
+#  my $user = shift;
+#
+#  # Parse context_id for additional information.  E.G.
+#  my @course_id = split /-/, $self->{context_id};
+#  $user->{section} = $course_id[4];
+#};
+
+################################################################################################
+# Local routine to modify user sets
+################################################################################################
+
+# When users are added to the system they are also assigned all visible sets This routine can be
+# used to modify the sets before they are assigned.  E.g. extend due dates based off the number
+# of problems students have to do.
+
+#$LTI{v1p3}{modify_user_set} = sub {
+#  # The self object from LTIAdvantange.pm
+#  my $self      = shift;
+#  my $globalSet = shift;
+#  # The userSet object to be modified
+#  my $userSet = shift;
+#
+#  my $numberOfSetsAssigned   = $self->{numberOfSetsAssigned};
+#  my $daysPerSetMakeup       = 2;
+#  my $reasonableNumberOfDays = $numberOfSetsAssigned * $daysPerSetMakeup + 1;
+#  if ($reasonableNumberOfDays < 2) { $reasonableNumberOfDays = 2; }
+#  my $niceDueTime    = $globalSet->due_date + $reasonableNumberOfDays * 86400;
+#  my $niceAnswerTime = $niceDueTime + 600;
+#
+#  $userSet->due_date($niceDueTime);
+#  $userSet->answer_date($niceAnswerTime);
+#};
+
+# Do not change this.
+$LTI{v1p3}{grader} = 'WeBWorK::Authen::LTIAdvantage::SubmitGrade';
+
+1;    # final line of the file to reassure perl that it was read properly.
diff --git a/conf/database.conf.dist b/conf/database.conf.dist
index 2e63139694..139120e3b9 100644
--- a/conf/database.conf.dist
+++ b/conf/database.conf.dist
@@ -1,7 +1,7 @@
 #!perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -373,7 +373,6 @@ $dbLayouts{sql_single} = {
 			tableOverride => "${courseName}_global_user_achievement"
 		},
 	},
-
 };
 
 # include ("conf/database.conf");  # uncomment to provide local overrides
diff --git a/conf/defaults.config b/conf/defaults.config
index f2b18f4922..97475af20d 100644
--- a/conf/defaults.config
+++ b/conf/defaults.config
@@ -1,7 +1,7 @@
 #!perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -42,26 +42,16 @@ include("VERSION");  # get WW version
 # Mail Settings
 ################################################################################
 
-# AllowedRecipients defines addresses that the PG system is allowed to send mail
-# to. this prevents subtle PG exploits. This should be set in course.conf to the
-# addresses of professors of each course. Sending mail from the PG system (i.e.
-# questionaires, essay questions) will fail if this is not set somewhere (either
-# here or in course.conf).
-$mail{allowedRecipients}     = [
-	#'prof1@yourserver.yourdomain.edu',
-	#'prof2@yourserver.yourdomain.edu',
-];
-
 # By default, feedback is sent to all users who have permission to
-# receive_feedback. If this list is non-empty, feedback is also sent to the
-# addresses specified here.
+# receive_feedback in a course. If this list is non-empty, feedback is also sent
+# to the addresses specified here.
 #
 # * If you want to disable feedback altogether, leave this empty and set
-#   submit_feedback => $nobody in %permissionLevels below. This will cause the
+#   $permissionLevels{submit_feedback} = 'nobody'. This will cause the
 #   feedback button to go away as well.
 #
 # * If you want to send email ONLY to addresses in this list, set
-#   receive_feedback => $nobody in %permissionLevels below.
+#   $permissionLevels{receive_feedback} = 'nobody'.
 #
 # It's often useful to set this in the course.conf to change the behavior of
 # feedback for a specific course.
@@ -70,7 +60,7 @@ $mail{allowedRecipients}     = [
 #   'Joe User <joe.user@example.com>'
 # The advantage of this form is that the resulting email will include the name
 # of the recipient in the "To" field of the email.
-#
+
 $mail{feedbackRecipients}    = [
 	#'prof1@yourserver.yourdomain.edu',
 	#'prof2@yourserver.yourdomain.edu',
@@ -99,11 +89,10 @@ $mail{feedbackVerbosity}     = 1;
 # The default is yes
 $blockStudentIDinFeedback = 0;
 
-# Defines the size of the Mail Merge editor window
+# Defines the initial height of the Mail Merge editor window
 # FIXME: should this be here? it's UI, not mail
 # FIXME: replace this with the auto-size method that TWiki uses
 $mail{editor_window_rows}    = 15;
-$mail{editor_window_columns} = 100;
 
 ##################################################################################
 # Customizing the action of the "Email your instructor" button
@@ -136,25 +125,6 @@ $courseURLs{feedbackURL} = "";
 #$courseURLs{feedbackFormURL} = "http://www.mathnerds.com/MathNerds/mmn/SDS/askQuestion.aspx";  #"http://www.tipjar.com/cgi-bin/test";
 $courseURLs{feedbackFormURL} = "";
 
-################################################################################
-# Repository Information
-################################################################################
-# This is where you put your remote and branch for your WeBWorK, PG and OPL
-# github repositories.
-
-# Note:  This process uses git ls-remote which can be very slow on some
-# systems.  If your course list page in the admin course is very slow
-# consider disabling this option.
-
-$enableGitUpgradeNotifier = 0;
-
-$gitWeBWorKRemoteName = "origin";
-$gitWeBWorKBranchName = "main";
-$gitPGRemoteName = "origin";
-$gitPGBranchName = "main";
-$gitLibraryRemoteName = "origin";
-$gitLibraryBranchName = "main";
-
 ################################################################################
 # Theme
 ################################################################################
@@ -163,38 +133,10 @@ $defaultTheme = "math4";
 $defaultThemeTemplate = "system";
 
 # The institution logo should be an image file in the theme's images folder
-$institutionLogo = 'maa_logo.png';
+$institutionLogo = 'maa_logo.svg';
 $institutionURL  = 'http://www.maa.org';
 $institutionName = 'MAA (Mathematical Association of America)';
 
-################################################################################
-# Hardcopy Theme
-################################################################################
-
-# Available Hardcopy themes (located in snippets)
-# (their "internal" name and their pretty name for end users)
-$hardcopyThemeNames = {
-	oneColumn => 'One Column',
-	twoColumn => 'Two Columns',
-	#XeLaTeX-oneColumn => 'English - one Column',
-	#XeLaTeX-twoColumn => 'English - two Columns',
-	#XeLaTeX-Hebrew-oneColumn => 'Hebrew/English - one Column',
-	#XeLaTeX-Hebrew-twoColumn => 'Hebrew/English - two Columns',
-};
-
-# This is needed to enforce an order that the options are presented when making a hardcopy
-$hardcopyThemes = [
-	'oneColumn',
-	'twoColumn',
-	#'XeLaTeX-oneColumn',
-	#'XeLaTeX-twoColumn',
-	#'XeLaTeX-Hebrew-oneColumn',
-	#'XeLaTeX-Hebrew-twoColumn',
-];
-
-# Default Hardcopy theme
-$hardcopyTheme = "twoColumn";
-
 ################################################################################
 # Achievements
 ################################################################################
@@ -217,6 +159,11 @@ $editor{textTitle} = '';
 $editor{textEdition} = '';
 $editor{textAuthor} = '';
 
+################################################################################
+# Enter key behavior
+################################################################################
+$pg{options}{enterKey} = 'preview';
+
 ################################################################################
 # showMeAnother
 ################################################################################
@@ -237,6 +184,13 @@ $pg{options}{showMeAnother}=[
 "SMAshowHints",
 ];
 
+################################################################################
+# showHintsAfter
+################################################################################
+# Number of attempts after which hints will be shown to a student.
+# Set to -1 to disable hints.
+$pg{options}{showHintsAfter} = 2;
+
 ###############################################################################
 # periodicRandomization
 ################################################################################
@@ -249,6 +203,17 @@ $pg{options}{periodicRandomizationPeriod} = 5;
 # and before a new version is requested.
 $pg{options}{showCorrectOnRandomize} = 0;
 
+################################################################################
+# Single Problem Grader
+################################################################################
+# When using the single problem grader, should the problem score be entered in as
+#   Percent - Percent value
+#   Point   - Point value
+#   Both    - Show inputs for both percent and point values.
+# Note, the problem score is always saved as a percent, so point values will be
+# rounded to the nearest whole percent.
+$problemGraderScore = 'Percent';
+
 ################################################################################
 # Waive Explanations
 ################################################################################
@@ -285,9 +250,15 @@ $webworkDirs{uploadCache}   = "$webworkDirs{DATA}/uploads";
 # Location of utility programs.
 $webworkDirs{bin}           = "$webworkDirs{root}/bin";
 
-# Location of configuration files, templates, snippets, etc.
+# Location of configuration files.
 $webworkDirs{conf}          = "$webworkDirs{root}/conf";
 
+# Location of assets (tex, pg, themes)
+$webworkDirs{assets}        = "$webworkDirs{root}/assets";
+
+# Location of the distribution hardcopy themes.
+$webworkDirs{hardcopyThemes} = "$webworkDirs{assets}/hardcopyThemes";
+
 # Location of course directories.
 $webworkDirs{courses}       = "$webwork_courses_dir" || "$webworkDirs{root}/courses";
 
@@ -303,9 +274,8 @@ $webworkDirs{tmp}           = "$webworkDirs{root}/tmp";
 #    $webworkDirs{valid_symlinks} = ["$webworkDirs{courses}/modelCourse/templates","/ww2/common/sets"];
 $webworkDirs{valid_symlinks}   = [];
 
-# Location of the common tex input files packages.tex, CAPA.tex, and PGML.tex
-# used for hardcopy generation.
-$webworkDirs{texinputs_common} = "$webworkDirs{root}/conf/snippets/hardcopyThemes/common";
+# Location of the webwork2.sty and its dependencies used for hardcopy generation.
+$webworkDirs{assetsTex}        = "$webworkDirs{assets}/tex";
 
 ################################################################################
 ##### The following locations are web-accessible.
@@ -328,10 +298,6 @@ $webworkURLs{htdocs_temp}   = "$webworkURLs{htdocs}/tmp";
 $webworkDirs{equationCache} = "$webworkDirs{htdocs_temp}/equations";
 $webworkURLs{equationCache} = "$webworkURLs{htdocs_temp}/equations";
 
-# Contains context-sensitive help files.
-$webworkDirs{local_help}    = "$webworkDirs{htdocs}/helpFiles";
-$webworkURLs{local_help}    = "$webworkURLs{htdocs}/helpFiles";
-
 # Location of theme templates.
 $webworkDirs{themes}     = "$webworkDirs{htdocs}/themes";
 
@@ -356,10 +322,8 @@ $webworkSecListManagers = 'ww-security-announce+managers@googlegroups.com';
 $webworkURLs{WikiMain}      = "https://webwork.maa.org/wiki/";
 $webworkURLs{SiteMap}       = "https://webwork.maa.org/wiki/WeBWorK_Sites";
 
-#URL for help buttons on the PGProblemEditor pages:
-$webworkURLs{problemTechniquesHelpURL}='https://webwork.maa.org/wiki/Category:Problem_Techniques';
+# URL for help buttons on the PGProblemEditor pages:
 $webworkURLs{MathObjectsHelpURL}      ='https://webwork.maa.org/wiki/Category:MathObjects';
-$webworkURLs{PODHelpURL}              ='https://webwork.maa.org/pod/';
 $webworkURLs{PGLabHelpURL}            ='https://demo.webwork.rochester.edu/webwork2/wikiExamples/MathObjectsLabs2/2?login_practice_user=true';
 $webworkURLs{PGMLHelpURL}             ='https://demo.webwork.rochester.edu/webwork2/cervone_course/PGML/1?login_practice_user=true';
 $webworkURLs{AuthorHelpURL}           ='https://webwork.maa.org/wiki/Category:Authors';
@@ -403,6 +367,9 @@ $courseDirs{scoring}     = "$courseDirs{root}/scoring";
 # Location of PG templates and set definition files.
 $courseDirs{templates}   = "$courseDirs{root}/templates";
 
+# Location of hardcopy theme files.
+$courseDirs{hardcopyThemes} = "$courseDirs{templates}/hardcopyThemes";
+
 # Location of course achievement files.
 $courseDirs{achievements}   = "$courseDirs{templates}/achievements";
 $courseDirs{achievements_html} = "$courseDirs{html}/achievements"; #contains badge icons
@@ -435,37 +402,48 @@ $webworkFiles{environment}                      = "$webworkDirs{conf}/defaults.c
 $webworkFiles{equationCacheDB}                  = ""; # "$webworkDirs{DATA}/equationcache";
 
 ################################################################################
-# Hardcopy snippets are used in constructing a TeX file for hardcopy output.
-# They should contain TeX code unless otherwise noted.
-################################################################################
-
-# The setHeader precedes each set in hardcopy output. It is a PG file.
-# This is the default file which is used if a specific files is not selected
-$webworkFiles{hardcopySnippets}{setHeader}     = "$webworkDirs{conf}/snippets/ASimpleCombinedHeaderFile.pg";
-
-################################################################################
-# In general the following files are determined by which hardcopy theme you
-# are using however you can set these variables to override the theme settings.
-# Note:  These overrides are perminant across all themes.
+# Hardcopy Theme
 ################################################################################
 
-# The preamble is the first thing in the TeX file.
-#$webworkFiles{hardcopySnippets}{preamble}       = "$webworkDirs{conf}/snippets/hardcopyPreamble.tex";
+# Hardcopy themes are .xml files.  See assets/hardcopThemes/README.md for details
+# about their structure.  The site themes are files in $webworkDirs{hardcopyThemes}.
+# $hardcopyThemes identifies which site themes are enabled.
+$hardcopyThemes = [
+	'basic.xml',
+	'basicTwoCol.xml',
+	'boxed.xml',
+	'boxedRows.xml',
+	'boxedTwoCol.xml',
+	'classic.xml',
+	'classicTwoCol.xml',
+	'empty.xml',
+	#'hebrew.xml',
+	#'hebrewTwoCol.xml',
+	'oneColumn.xml',
+	'twoColumn.xml',
+];
 
-# The problem divider goes between problems.
-#$webworkFiles{hardcopySnippets}{problemDivider} = "$webworkDirs{conf}/snippets/hardcopyProblemDivider.tex";
+# A course may have additional themes in $courseDirs{hardcopyThemes}.  All such
+# "course" hardcopy themes are effectively enabled and offered for use when
+# selecting a hardcopy theme.  You can move such files or rename them to not
+# have a .xml extension if you don't want them to be offered for use.
 
-# The set footer goes after each set. Is is a PG file.
-#$webworkFiles{hardcopySnippets}{setFooter}      = "$webworkDirs{conf}/snippets/hardcopySetFooter.pg";
+# If a course hardcopy theme has the same name as a site hardcopy theme, the
+# course hardcopy theme is the one that is used.
 
-# The set divider goes between sets (in multiset output).
-#$webworkFiles{hardcopySnippets}{setDivider}     = "$webworkDirs{conf}/snippets/hardcopySetDivider.tex";
+# Default hardcopy themes (should either be an enabled site theme or a theme in
+# the course hardcopyThemes folder
+$hardcopyTheme = 'twoColumn.xml';
+$hardcopyThemePGEditor = 'empty.xml';
 
-# The user divider does between users (in multiuser output).
-#$webworkFiles{hardcopySnippets}{userDivider}    = "$webworkDirs{conf}/snippets/hardcopyUserDivider.tex";
+################################################################################
+# Hardcopy snippets are used in constructing a TeX file for hardcopy output.
+# They should contain TeX code unless otherwise noted.
+################################################################################
 
-# The postamble is the last thing in the TeX file.
-#$webworkFiles{hardcopySnippets}{postamble}      = "$webworkDirs{conf}/snippets/hardcopyPostamble.tex";
+# The setHeader precedes each set in hardcopy output. It is a PG file.
+# This is the default file which is used if a specific files is not selected
+$webworkFiles{hardcopySnippets}{setHeader}     = "$webworkDirs{assets}/pg/defaultSetHeader.pg";
 
 ################################################################################
 ##### Screen snippets are used when displaying problem sets on the screen.
@@ -473,12 +451,12 @@ $webworkFiles{hardcopySnippets}{setHeader}     = "$webworkDirs{conf}/snippets/AS
 
 # The set header is displayed on the problem set page. It is a PG file.
 # This is the default file which is used if a specific files is not selected
-$webworkFiles{screenSnippets}{setHeader}         = "$webworkDirs{conf}/snippets/ASimpleCombinedHeaderFile.pg";
+$webworkFiles{screenSnippets}{setHeader}         = "$webworkDirs{assets}/pg/defaultSetHeader.pg";
 
 # A PG template for creation of new problems.
-$webworkFiles{screenSnippets}{blankProblem}    = "$webworkDirs{conf}/snippets/blankProblem2.pg"; # screenSetHeader.pg"
+$webworkFiles{screenSnippets}{blankProblem}    = "$webworkDirs{assets}/pg/newProblem.pg";
 
-# A site info  "message of the day" file
+# A site info "message of the day" file
 $webworkFiles{site_info}                       = "$webworkDirs{htdocs}/site_info.txt";
 
 ################################################################################
@@ -560,6 +538,10 @@ $default_status = "Enrolled";
 		abbrevs => [qw/ A a audit /],
 		behaviors => [qw/ allow_course_access include_in_assignment include_in_stats include_in_email /],
 	},
+	Observer => {
+		abbrevs => [qw/ O o observer /],
+		behaviors => [qw/ allow_course_access include_in_assignment /],
+	},
 	Drop => {
 		abbrevs => [qw/ D d drop withdraw /],
 		behaviors => [qw/  /],
@@ -716,11 +698,9 @@ $authen{user_module} = {
 };
 
 # Select the authentication module to use for proctor logins.
-#
 # A string or a hash is accepted, as above.
-#
 $authen{proctor_module} = "WeBWorK::Authen::Proctor";
-$authen{xmlrpc_module}  = "WeBWorK::Authen::XMLRPC";
+
 ################################################################################
 # Authorization system (Make local overrides in localOverrides.conf )
 ################################################################################
@@ -744,9 +724,12 @@ $authen{xmlrpc_module}  = "WeBWorK::Authen::XMLRPC";
 );
 
 # this hash maps operations to the roles that are allowed to perform those
-# operations. the role listed and any role with a higher permission level (in
-# the %userRoles hash) will be allowed to perform the operation. If the role
-# is undefined, no users will be allowed to perform the operation.
+# operations. If a single role is listed, the role listed and any role with
+# a higher permission level (in the %userRoles hash) will be allowed to perform
+# the operation. If the role is undefined, no users will be allowed to perform
+# the operation. The receive_feedback permission level can be also be an array
+# reference containing a list of roles. If that is the case, only those exact
+# roles are allowed to reeceive feedback emails.
 #
 %permissionLevels = (
 	login                          => "guest",
@@ -772,7 +755,7 @@ $authen{xmlrpc_module}  = "WeBWorK::Authen::XMLRPC";
 	access_instructor_tools        => "ta",
 	score_sets                     => "professor",
 	send_mail                      => "professor",
-	receive_feedback               => "ta",
+	receive_feedback               => ['ta', 'professor', 'admin'],
 
 	create_and_delete_problem_sets => "professor",
 	assign_problem_sets            => "professor",
@@ -784,13 +767,11 @@ $authen{xmlrpc_module}  = "WeBWorK::Authen::XMLRPC";
 	modify_problem_template_files  => "professor",
 	manage_course_files            => "professor",
 	edit_achievements              => "professor",
-	create_and_delete_courses      => "professor",
-	fix_course_databases           => "professor",
+	create_and_delete_courses      => "admin",
 	modify_tags                    => "admin",
 	edit_restricted_files          => "admin",
 
 	##### Behavior of the interactive problem processor #####
-	show_resource_info                              => "admin",
 	show_correct_answers_before_answer_date         => "ta",
 	show_solutions_before_answer_date               => "ta",
 	avoid_recording_answers                         =>  "nobody", # record the grade/status/state of everyone's entries.
@@ -798,19 +779,19 @@ $authen{xmlrpc_module}  = "WeBWorK::Authen::XMLRPC";
 	                                                              # for students but not TA's or professors;
 	                                                              # TA's and above could avoid having their answers recorded.
 
-        # controls if old answers can be shown
+	# controls if old answers can be shown
 	can_show_old_answers                            => "student",
 	check_answers_before_open_date                  => "ta",
 	check_answers_after_open_date_with_attempts     => "guest",
 	check_answers_after_open_date_without_attempts  => "guest",
 	check_answers_after_due_date                    => "guest",
 	check_answers_after_answer_date                 => "guest",
-        can_check_and_submit_answers                    => "ta",
-        can_use_show_me_another_early                   => "ta",
+	can_check_and_submit_answers                    => "ta",
+	can_use_show_me_another_early                   => "ta",
 	create_new_set_version_when_acting_as_student   => undef,
 	print_path_to_problem                           => "professor", # see "Special" PG environment variables
-	always_show_hint                                => "professor", # see "Special" PG environment variables
-	always_show_solution                            => "professor",  # see "Special" PG environment variables
+	always_show_hint                                => "professor",
+	always_show_solution                            => "professor",
 	record_set_version_answers_when_acting_as_student => undef,
 	record_answers_when_acting_as_student           => undef,
 	# "record_answers_when_acting_as_student" takes precedence
@@ -829,12 +810,15 @@ $authen{xmlrpc_module}  = "WeBWorK::Authen::XMLRPC";
 	                                                # to avoid contaminating the data with TA and instructor activities.
 	                                                # The professor setting means that  professor's answers are not logged or
 	                                                # saved in the past answer database.
+
+	# PG debugging
+	show_resource_info                              => "admin",
 	view_problem_debugging_info                     => "ta",
-	show_pg_info_checkbox                           => "admin",
-	show_answer_hash_info_checkbox                  => "admin",
-	show_answer_group_info_checkbox                 => "admin",
-	##### Behavior of the Hardcopy Processor #####
+	show_pg_info                                    => "admin",
+	show_answer_hash_info                           => "admin",
+	show_answer_group_info                          => "admin",
 
+	##### Behavior of the Hardcopy Processor #####
 	download_hardcopy_multiuser  => "ta",
 	download_hardcopy_multiset   => "ta",
 	download_hardcopy_view_errors =>"professor",
@@ -886,7 +870,7 @@ $gatewayGracePeriod = 120;
 ## of up to 30 days.  However, if one uses cookies for session management,
 ## then one cannot also use Login cookies.  So session management using
 ## cookies is more appropriate when external authentication systems
-## are used, e.g., LDAP, LTIBasic, etc.
+## are used, e.g., LDAP, LTIAdvanced, etc.
 ##
 
 ## The following ability to update the cookie timestamp instead of the timestamp in the database
@@ -939,46 +923,50 @@ $caliper{enabled} = 0;
 # The following variables can be set to control cookie behavior.
 
 # Set the value of the samesite attribute of the WeBWorK cookie:
-#    See: https://blog.chromium.org/2019/10/developers-get-ready-for-new.html
-#         https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite
-#         https://tools.ietf.org/html/draft-west-cookie-incrementalism-00
-
+# See: https://blog.chromium.org/2019/10/developers-get-ready-for-new.html
+#      https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite
+#      https://tools.ietf.org/html/draft-west-cookie-incrementalism-00
 
 # Notes about the $CookieSameSite options:
-#   The "None" setting should only be used with HTTPS and when $CookieSecure = 1; is set below. The "None" setting is also less secure and can allow certain types of cross-site attacks.
-#   The "Strict" setting can break the links in the system generated feedback emails when read in a web mail client.
-#   Due to those factors, the "Lax" setting is probably the optimal choice for typical WeBWorK servers.
+# The "None" setting should only be used with HTTPS and when $CookieSecure = 1; is set below. The "None" setting is
+# also less secure and can allow certain types of cross-site attacks.
+# The "Strict" setting can break the links in the system generated feedback emails when read in a web mail client.
+# Due to those factors, the "Lax" setting is probably the optimal choice for typical WeBWorK servers.
 
 $CookieSameSite = "Lax";
 
 # Set the value of the secure cookie attribute:
-$CookieSecure = 0; # Default is 0 here, as 1 will not work without https
-
-# At present the CookieLifeTime setting only effect how long the
-# browser is to supposed to retain the cookie.
-#     https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie
-$CookieLifeTime = "+7d";
+# Default is 0 here, as 1 will not work without https
+$CookieSecure = 0;
 
-# NOTE: In general the cookie lifespan settings use the CGI.pm relative time settings.
-# Search for "30 seconds from now" at https://metacpan.org/pod/CGI to see the various options.
-# A WW option is to set it to "session", in which case the Cookie will expire when the
-# browser session ends (a "session cookie").
+# The CookieLifeTime setting determines how long the browser should retain the cookie.
+# See https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie
+# The CookieLifeTime value should be numeric and in seconds, or should be set to "session", in which case
+# the Cookie will expire when the browser session ends (a "session cookie").
+# The default value is 7 days.
+$CookieLifeTime = 604800;
 
 ################################################################################
 # PG subsystem options
 ################################################################################
 
-# List of enabled display modes. Comment out any modes you don't wish to make
-# available for use.
+# List of enabled screen display modes. Comment out any modes you don't wish to
+# make available for use.
 # The first uncommented option is the default for instructors rendering problems
 # in the homework sets editor.
 $pg{displayModes} = [
-	"MathJax", # render TeX math expressions on the client side using MathJax
-	           # we strongly recommend people install and use MathJax, and it is required if you want to use mathview
-	"images", # display math expressions as images generated by dvipng
-#	"plainText", # display raw TeX for math expressions
+	"MathJax",    # render TeX math expressions on the client side using
+	              # MathJax; we strongly recommend people install and use
+	              # MathJax, and it is required if you want to use MathView
+	"images",     # display math expressions as images generated by dvipng
+#	"plainText",  # display raw TeX for math expressions
 ];
 
+# List of additional display modes for the PG editor only.
+$pg{additionalPGEditorDisplayModes} = [
+	"tex",    # display tex code for a rendered problem
+	"PTX",    # display static PreTeXt XML for a rendered problem
+];
 
 ##########################################################################################
 #### Default settings for homework editor pages
@@ -1001,14 +989,6 @@ $options{setDefSearchDepth} = 4;
 $options{useOPLdefFiles} = 1;
 $options{useContribDefFiles} = 1;
 
-
-##########################################################################################
-#### Default settings for the problem grader page
-##########################################################################################
-
-# gap betweens cores in score dropdown - e.g. 5 gives 5, 10, 15, 20
-$options{problemGraderScoreDelta} = 5;
-
 ##########################################################################################
 #### Default settings for the problem editor pages
 ##########################################################################################
@@ -1017,14 +997,6 @@ $options{problemGraderScoreDelta} = 5;
 # just a textarea
 $options{PGCodeMirror} = 1;
 
-# This sets if mathview is available on the PG editor for use as a minimal latex equation editor
-$options{PGMathView} = 0;
-# This sets if WirisEditor is available on the PG editor for use as a minimal latex equation editor
-$options{PGWirisEditor}= 0;
-# This sets if MathQuill is available on the PG editor for use as a minimal latex equation editor
-$options{PGMathQuill}= 0;
-
-
 ###########################################################################################
 #### Default settings for the PG translator
 #### This section controls the display of equations, HINTS, answers, SOLUTIONS,
@@ -1041,28 +1013,18 @@ $pg{options}{grader}             = "avg_problem_grader";
 # Fill in answer blanks with the student's last answer by default?
 $pg{options}{showOldAnswers}     = 1;
 
-# Default for showing the MathView preview system.  To completely disable MathView you need to change the PG special environment variable.
+# Note for the useMathQuill and useMathView options, the one that is actually used is ultimately
+# determined by the entryAssist PG special environment variable.  Furthermore the user may disable the chosen method and
+# fall back to a basic html input in the user settings if the user has the change_pg_display_settings permission.
+
+# Default for showing the MathView preview system.
 $pg{options}{useMathView}        = 1;
 # This is the operations file to use for mathview,  each contains a different locale.
 $pg{options}{mathViewLocale}     = "mv_locale_us.js";
 
-# Default for showing the WirisEditor preview system.  To completely disable WirisEditor you need to change the PG special environment variable.
-$pg{options}{useWirisEditor}     = 1;
-
-
-# Default for showing the MathQuill preview system.  To completely disable MathQuill you need to change the PG special environment variable.
+# Default for showing the MathQuill preview system.
 $pg{options}{useMathQuill}     = 1;
 
-# Show correct answers (when allowed) by default?
-$pg{options}{showCorrectAnswers} = 0;  # this is a backup value use when nothing else has been set. I can think of no case where it should anything but zero.
-
-# Customize hints and solutions
-# Show hints (when allowed) by default?
-$pg{options}{showHints}          = 0;  # this is a backup value use when nothing else has been set. I can think of no case where it should anything but zero.
-
-
-# Show solutions (when allowed) by default?
-$pg{options}{showSolutions}         = 0;  # this is a backup value use when nothing else has been set. I can think of no case where it should anything but zero.
 $pg{options}{showAnsGroupInfo}      = 0;
 $pg{options}{showAnsHashInfo}       = 0;
 $pg{options}{showPGInfo}            = 0;
@@ -1074,37 +1036,14 @@ $pg{options}{showPGInfo}            = 0;
 # and always_show_solution to "nobody" (by default this is "professor")
 # This is done in the %permissions section above.
 
-# If always_show_hint is set to "nobody" then hints are shown, even to professors, only after
-# a certain number of submissions have occurred.  This number is set in each problem with
-# the variable $main::showHints
-
-
-# Use knowls for hints
-$pg{options}{use_knowls_for_hints}          = 1;
-
-# Use knowls for solutions
-$pg{options}{use_knowls_for_solutions}      = 1;
-
-# The buttons below are active only if knowls are being used. If set to 1 then the hints (and solutions)
-# checkboxes are shown and when these are checked and the problem resubmitted THEN the knowls outline
-# appears.  I can't immediately think of a useful case where these should be set to 1.  If knowls are not being
-# used then these checkboxes are ALWAYS shown when a hint or solution is available and the value
-# of these two options is ignored.
-
-# Show solution checkbox
-$pg{options}{show_solution_checkbox} = 0;
-
-# Show hint checkbox
-$pg{options}{show_hint_checkbox}     = 0;
-
 # Display the "Entered" column which automatically shows the evaluated student answer, e.g. 1 if student input is sin(pi/2).
 # If this is set to 0, e.g. to save space in the response area, the student can still see their evaluated answer by hovering
 # the mouse pointer over the typeset version of their answer
 $pg{options}{showEvaluatedAnswers}      = 1;
 
-# Catch translation warnings internally by default? (We no longer need to do
-# this, since there is a global warnings handler. So this should be off.)
-$pg{options}{catchWarnings}      = 0;
+# Catch translation warnings internally.  This must be done since the translator is now run in a subprocess and do not
+# propogate to the main process.  So this really should never be set to 0.
+$pg{options}{catchWarnings}      = 1;
 
 # decorations for correct input blanks -- apparently you can't define and name attribute collections in a .css file
 $pg{options}{correct_answer} = "{border-width:2;border-style:solid;border-color:#8F8}"; #matches resultsWithOutError class in math2.css
@@ -1112,35 +1051,16 @@ $pg{options}{correct_answer} = "{border-width:2;border-style:solid;border-color:
 # decorations for incorrect input blanks
 $pg{options}{incorrect_answer} = "{border-width:2;border-style:solid;border-color:#F55}"; #matches resultsWithError class in math2.css
 
-##### Currently-selected renderer
-
-# Only the local renderer is supported in this version.
-$pg{renderer} = "WeBWorK::PG::Local";
-
-# The remote renderer connects to an XML-RPC PG rendering server.
-#$pg{renderer} = "WeBWorK::PG::Remote";
-
-##### Renderer-dependent options
-
-# The remote renderer has one option:
-$pg{renderers}{"WeBWorK::PG::Remote"} = {
-	# The "proxy" server to connect to for remote rendering.
-	proxy => "http://localhost:21000/RenderD",
-};
-
 ##### Settings for various display modes
 
 # "images" mode has several settings:
 $pg{displayModeOptions}{images} = {
-	# Determines the method used to align images in output. Can be
-	# "baseline", "absmiddle", or "mysql".
-	dvipng_align => 'mysql',
-
-	# If mysql is chosen, this information indicates which database contains the
-	# 'depths' table. Since 2.3.0, the depths table is kept in the main webwork
-	# database. (If you are upgrading from an earlier version of webwork, and
-	# used the mysql method in the past, you should move your existing 'depths'
-	# table to the main database.)
+	# Determines the method used to align images in output. Can be any valid value for the css vertical-align rule such
+	# as 'baseline' or 'middle'.
+	dvipng_align => 'baseline',
+
+	# If dbsource is set to a nonempty value, then this database connection information will be used to store dvipng
+	# depths.  It is assumed that the 'depths' table exists in the database.
 	dvipng_depth_db => {
 		dbsource => $database_dsn,
 		user     => $database_username,
@@ -1150,10 +1070,12 @@ $pg{displayModeOptions}{images} = {
 
 ##### Directories used by PG
 
-# The root of the PG directory tree (from pg_root in Apache config).
-$pg{directories}{root}   = "$pg_dir";
-$pg{directories}{lib}    = "$pg{directories}{root}/lib";
-$pg{directories}{macros} = "$pg{directories}{root}/macros";
+# The root of the PG directory tree (from pg_dir set in conf/webwork2.mojolicious.yml).
+$pg{directories}{root}      = "$pg_dir";
+$pg{directories}{lib}       = "$pg{directories}{root}/lib";
+$pg{directories}{macros}    = "$pg{directories}{root}/macros";
+$pg{directories}{assets}    = "$pg{directories}{root}/assets";
+$pg{directories}{assetsTex} = "$pg{directories}{assets}/tex";
 
 #
 #  The macro file search path.  Each directory in this list is searched
@@ -1163,89 +1085,49 @@ $pg{directories}{macrosPath} = [
    ".",                     # search the problem file's directory
    $courseDirs{macros},
    $pg{directories}{macros},
-   "$courseDirs{templates}/Library/macros/Alfred",
-   "$courseDirs{templates}/Library/macros/BrockPhysics",
-   "$courseDirs{templates}/Library/macros/CollegeOfIdaho",
-   "$courseDirs{templates}/Library/macros/Dartmouth",
-   "$courseDirs{templates}/Library/macros/FortLewis",
-   "$courseDirs{templates}/Library/macros/Hope",
-   "$courseDirs{templates}/Library/macros/LaTech",
-   "$courseDirs{templates}/Library/macros/MC",
-   "$courseDirs{templates}/Library/macros/Michigan",
-   "$courseDirs{templates}/Library/macros/Mizzou",
-   "$courseDirs{templates}/Library/macros/NAU",
-   "$courseDirs{templates}/Library/macros/PCC",
-   "$courseDirs{templates}/Library/macros/TCNJ",
-   "$courseDirs{templates}/Library/macros/UBC",
-   "$courseDirs{templates}/Library/macros/UMass-Amherst",
-   "$courseDirs{templates}/Library/macros/UW-Stout",
-   "$courseDirs{templates}/Library/macros/UniSiegen",
-   "$courseDirs{templates}/Library/macros/Union",
-   "$courseDirs{templates}/Library/macros/WHFreeman",
-   "$courseDirs{templates}/Library/macros/Wiley",
+   "$pg{directories}{macros}/answers",
+   "$pg{directories}{macros}/capa",
+   "$pg{directories}{macros}/contexts",
+   "$pg{directories}{macros}/core",
+   "$pg{directories}{macros}/graph",
+   "$pg{directories}{macros}/math",
+   "$pg{directories}{macros}/misc",
+   "$pg{directories}{macros}/parsers",
+   "$pg{directories}{macros}/ui",
+   "$pg{directories}{macros}/deprecated",
 ];
 
-# The applet search path. If a full URL is given, it is used unmodified. If an
-# absolute path is given, the URL of the local server is prepended to it.
-#
-# For example, if an item is "/math/applets",
-# and the local server is  "https://math.yourschool.edu",
-# then the URL "https://math.yourschool.edu/math/applets" will be used.
-#
+# Directories to search for auxiliary html files.
+$pg{directories}{htmlPath} = [
+	".",
+	$courseDirs{html},
+	$webworkDirs{htdocs},
+];
 
-$pg{directories}{appletPath} = [    # paths to search for applets (requires full url)
-	"$webworkURLs{htdocs}/applets",
-	"$webworkURLs{htdocs}/applets/geogebra_stable",
-	"$courseURLs{html}/applets",
-	"$webworkURLs{htdocs}/applets/Xgraph",
-	"$webworkURLs{htdocs}/applets/PointGraph",
-	"$webworkURLs{htdocs}/applets/Xgraph",
-	"$webworkURLs{htdocs}/applets/liveJar",
-	"$webworkURLs{htdocs}/applets/Image_and_Cursor_All",
+# Directories to search for image files.
+$pg{directories}{imagesPath} = [
+	".",
+	"$courseDirs{html}/images",
+	"$webworkDirs{htdocs}/images",
 ];
 
+# Contains context-sensitive pg help files.
+$pg{URLs}{localHelpURL} = "$pg_htdocs_url/helpFiles";
 
-$pg{directories}{htmlPath} = [    # paths to search for auxiliary html files (requires full url)
-    ".",
-	"$courseURLs{html}",
-	"$webworkURLs{htdocs}",
-];
-$pg{directories}{imagesPath} = [    # paths to search for image files (requires full url)
-    ".",
-	"$courseURLs{html}/images",
-	"$webworkURLs{htdocs}/images",
-];
-$pg{directories}{pdfPath} = [    # paths to search for pdf files (requires full url)
-    ".",
-	"$courseURLs{html}/pdf",
-	"$webworkURLs{htdocs}/pdf",
-];
 ##### "Special" PG environment variables. (Stuff that doesn't fit in anywhere else.)
 
 # Users for whom to print the file name of the PG file being processed.
 $pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} = [ "professor", ];
-   # ie file paths are printed for 'gage'
+
+# File names are also printed for anyone with this permission or higher
 $pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_PERMISSION_LEVEL} =
-        $userRoles{ $permissionLevels{print_path_to_problem} };
-   # (file paths are also printed for anyone with this permission or higher)
-$pg{specialPGEnvironmentVars}{ALWAYS_SHOW_HINT_PERMISSION_LEVEL} =
-        $userRoles{ $permissionLevels{always_show_hint} };
-   # (hints are automatically shown to anyone with this permission or higher)
-$pg{specialPGEnvironmentVars}{ALWAYS_SHOW_SOLUTION_PERMISSION_LEVEL} =
-        $userRoles{ $permissionLevels{always_show_solution} };
-   # (solutions are automatically shown to anyone with this permission or higher)
-$pg{specialPGEnvironmentVars}{VIEW_PROBLEM_DEBUGGING_INFO} =
-        $userRoles{ $permissionLevels{view_problem_debugging_info} };
- # (variable whether to show the debugging info from a problem to a student)
-
-$pg{specialPGEnvironmentVars}{use_knowls_for_hints}     = $pg{options}{use_knowls_for_hints};
-$pg{specialPGEnvironmentVars}{use_knowls_for_solutions} = $pg{options}{use_knowls_for_solutions};
+	$userRoles{ $permissionLevels{print_path_to_problem} };
 
 # whether to use javascript for rendering Live3D graphs
 $pg{specialPGEnvironmentVars}{use_javascript_for_live3d} = 1;
 
 # Binary that the PGtikz.pl and PGlateximage.pl macros will use to create svg images.
-# This should be either 'pdf2svg' or 'dvipdfm'.
+# This should be either 'pdf2svg' or 'dvisvgm'.
 $pg{specialPGEnvironmentVars}{latexImageSVGMethod} = "pdf2svg";
 
 # When ImageMagick is used for image conversions, this sets the default options.
@@ -1373,7 +1255,7 @@ ${pg}{modules} = [
 	[qw(Parser::Legacy)],
 	[qw(Statistics)],
 	[qw(Chromatic)],      # for Northern Arizona graph problems
-	[qw(Applet GeogebraWebApplet)],
+	[qw(Applet MIME::Base64)],
 	[qw(PGcore PGalias PGresource PGloadfiles PGanswergroup PGresponsegroup Tie::IxHash)],
 	[qw(Locale::Maketext)],
 	[qw(WeBWorK::Localize)],
@@ -1417,6 +1299,13 @@ $problemDefaults{counts_parent_grade} = 0;
 # Setting this to a positive value will override the course-wide setting
 $problemDefaults{prPeriod} = -1;
 
+# The default number of attempts after which to show hints for newly created problems.
+# It is suggested to use the value of -2, which means that the course-wide setting would be used
+# Setting this to -2 defaults to the use of course-wide settings (suggested)
+# Setting this to -1 disables hints in problems.
+# Setting this to 0 or more will show hints after that number of attempts.
+$problemDefaults{showHintsAfter} = -2;
+
 ##### Answer evaluatior defaults
 
 $pg{ansEvalDefaults} = {
@@ -1460,18 +1349,16 @@ $pgRoot         = $pg{directories}{root};
 ################################################################################
 # Webservices
 ################################################################################
+# The following options only apply to actions performed via requests to $webwork_url/instructor_rpc.
 $webservices = {
-	enableCourseActions => 0, # enable createCourse, addUser, dropUser
-	enableCourseActionsLog => 0 ,# enable logging of course actions
-	                             # will log when courses are created and
-	                             # when students are added or dropped
-	courseActionsLogfile => "$webworkDirs{logs}/courseactions.log",
-	# enable this to assign all visible homework sets to new students
-	# added by webservices
-	courseActionsAssignHomework => 0,
+	# Enable createCourse, addUser, dropUser, deleteUser, editUser, and changeUserPassword
+	enableCourseActions => 0,
+	# Enable logging of course actions via webservices.  Will log when courses are created and when students are added,
+	# dropped, deleted, edited, or have password changed.
+	enableCourseActionsLog => 0,
+	courseActionsLogfile   => "$webworkDirs{logs}/courseactions.log",
 };
 
-
 ###############################################################################
 # Math entry assistance
 ###############################################################################
@@ -1496,19 +1383,29 @@ $pg{answersOpenAfterDueDate} = 2880;
 ###############################################################################
 $pg{options}{enableProgressBar} = 1;
 
+################################################################################
+# Site wide overrides are entered into the file localOverrides.conf
+################################################################################
+# This is loaded before the $ConfigValues definition, so that the if values of
+# $hardcopyThemes are overridden in localOverrides.conf, then those values are
+# used and shown in the course configuration.
+include("conf/localOverrides.conf");
+
 ################################################################################
 # WeBWorK::ContentGenerator::Instructor::Config
 ################################################################################
 
 # Configuration data
 # It is organized by section.  The allowable types are
-#  'text' for a text string (no quote marks allowed),
+#  'text' for a text string (no quotes allowed),
 #  'number' for a number,
 #  'list' for a list of text strings,
 #  'permission' for a permission value,
-#  'boolean' for variables which really hold 0/1 values as flags.
-#  'checkboxlist' for variables which really hold a list of values which
-#      can be independently picked yes/no as checkboxes
+#  'boolean' for variables which really hold 0/1 values as flags,
+#  'timezone' for a time zone,
+#  'time' for a time,
+#  'checkboxlist' for variables that hold a list of values which can be independently picked yes/no as checkboxes,
+#  'popuplist' for variables that hold a list of values to be selected from.
 
 # Localization Info:  The doc strings in this portion are reproduced in
 # lib/WeBWorK/Localize.pm solely so that xgettext.pl will
@@ -1536,8 +1433,8 @@ $ConfigValues = [
 			var  => 'defaultTheme',
 			doc  => x('Theme (refresh page after saving changes to reveal new theme.)'),
 			doc2 => x(
-				'There is one main theme to choose from: math4. It has two variants, math4-green and math4-red. '
-					. 'The theme specifies a unified look and feel for the WeBWorK course web pages.'
+				'There is one main theme to choose from: math4. It has three variants: math4-green, math4-red, and '
+					. 'math4-yellow. The theme specifies a unified look and feel for the WeBWorK course web pages.'
 			),
 			values  => [qw(math4 math4-green math4-red)],
 			type    => 'popuplist',
@@ -1554,24 +1451,24 @@ $ConfigValues = [
 			var  => 'perProblemLangAndDirSettingMode',
 			doc  => x('Mode in which the LANG and DIR settings for a single problem are determined.'),
 			doc2 => x(
-				'Mode in which the LANG and DIR settings for a single problem are determined.<p>The system will set '
-					. 'the LANGuage attribute to either a value determined from the problem, a course-wide default, '
-					. 'or the system default, depending on the mode selected. The tag will only be added to '
-					. 'the DIV enclosing the problem if it is different than the value which should be set in the '
-					. 'main HTML tag set for the entire course based on the course language.<p>There are two options '
-					. 'for the DIRection attribute: "ltr" for left-to-write sripts, and "rtl" for right-to-left '
-					. 'scripts like Arabic and Hebrew.<p>The DIRection attribute is needed to trigger proper display '
-					. 'of the question text when the problem text-direction is different than that used by the current '
-					. 'language of the course. For example, English problems from the library browser would display '
-					. 'improperly in RTL mode for a Hebrew course, unless the problen Direction is set to LTR.'
-					. '<p>The feature to set a problem language and direction was only added in 2018 to the PG '
-					. 'language, so most problems will not declare their language, and the system needs to fall '
-					. 'back to determining the language and direction in a different manner. The OPL itself is all '
-					. 'English, so the system wide fallback is to en-US in LTR mode.<p>Since the defaults fall back '
+				'<p>Mode in which the LANG and DIR settings for a single problem are determined.</p><p>The system will '
+					. 'set the LANGuage attribute to either a value determined from the problem, a course-wide '
+					. 'default, or the system default, depending on the mode selected. The tag will only be added to '
+					. 'the DIV enclosing the problem if it is different than the value which should be set in the main '
+					. 'HTML tag set for the entire course based on the course language.</p><p>There are two options '
+					. 'for the DIRection attribute: "ltr" for left-to-write scripts, and "rtl" for right-to-left '
+					. 'scripts like Arabic and Hebrew.</p><p>The DIRection attribute is needed to trigger proper '
+					. 'display of the question text when the problem text-direction is different than that used by the '
+					. 'current language of the course. For example, English problems from the library browser would '
+					. 'display improperly in RTL mode for a Hebrew course, unless the problen Direction is set to LTR.'
+					. '</p><p>The feature to set a problem language and direction was only added in 2018 to the PG '
+					. 'language, so most problems will not declare their language, and the system needs to fall back '
+					. 'to determining the language and direction in a different manner. The OPL itself is all English, '
+					. 'so the system wide fallback is to en-US in LTR mode.</p><p>Since the defaults fall back '
 					. 'to the LTR direction, most sites should be fine with the "auto::" mode, but may want to select '
 					. 'the one which matches their course language. The mode "force::ltr" would also be an option for '
-					. 'a course which runs into trouble with the "auto" modes.<p>Modes:<br><ul><li>"none" prevents any '
-					. 'additional LANG and/or DIR tag being added. The browser will use the main setting which was '
+					. 'a course which runs into trouble with the "auto" modes.</p><p>Modes:</p><ul><li>"none" prevents '
+					. 'any additional LANG and/or DIR tag being added. The browser will use the main setting which was '
 					. 'applied to the entire HTML page. This is likely to cause trouble when a problem of the other '
 					. 'direction is displayed.</li><li>"auto::" allows the system to make the settings based on the '
 					. 'language and direction reported by the problem (a new feature, so not set in almost all '
@@ -1600,8 +1497,8 @@ $ConfigValues = [
 			var  => 'sessionKeyTimeout',
 			doc  => x('Inactivity time before a user is required to login again'),
 			doc2 => x(
-				'Length of time, in seconds, a user has to be inactive before he is required to login again.<p>'
-					. 'This value should be entered as a number, so as 3600 instead of 60*60 for one hour'
+				'Length of time, in seconds, a user has to be inactive before he is required to login again. '
+					. 'This value should be entered as a number, so as 3600 instead of 60*60 for one hour.'
 			),
 			type => 'number'
 		},
@@ -1609,28 +1506,45 @@ $ConfigValues = [
 			var  => 'siteDefaults{timezone}',
 			doc  => x('Timezone for the course'),
 			doc2 => x(
-				'Some servers handle courses taking place in different timezones.  If this course is not showing '
+				'<p>Some servers handle courses taking place in different timezones.  If this course is not showing '
 					. 'the correct timezone, enter the correct value here.  The format consists of unix times, such '
-					. 'as "America/New_York","America/Chicago", "America/Denver", "America/Phoenix" or '
-					. '"America/Los_Angeles". Complete list: '
+					. 'as "America/New_York", "America/Chicago", "America/Denver", "America/Phoenix" or '
+					. '"America/Los_Angeles".</p>Complete list: '
 					. '<a href="http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones">TimeZoneFiles</a>'
 			),
 			type    => 'timezone',
 			hashVar => '{siteDefaults}->{timezone}'
 		},
 		{
-			var  => 'hardcopyTheme',
-			doc  => x('Hardcopy Theme'),
+			var => 'hardcopyThemes',
+			doc => x('Enabled Site Hardcopy Themes'),
 			doc2 => x(
-				'There are currently two hardcopy themes to choose from: One Column and Two Columns.  The Two '
-					. 'Columns theme is the traditional hardcopy format.  The One Column theme uses the full page '
-					. 'width for each column'
+				'Choose which of the site PDF hardcopy themes are available.  In addition to the themes selected here, '
+					. 'all themes in the course hardcopyThemes folder will be available.  Your selection must be saved '
+					. 'and then the page must be reloaded before the new list of enabled themes will be reflected '
+					. 'in the selections that follows.'
 			),
-			values  => $hardcopyThemes,
-			labels  => $hardcopyThemeNames,
+			values  => [qw(empty.xml)],
+			type   => 'checkboxlist',
+			min    => 1,
+			hashVar => '{hardcopyThemes}'
+		},
+		{
+			var     => 'hardcopyTheme',
+			doc     => x('Hardcopy Theme'),
+			doc2    => x('Choose a layout/styling theme for PDF hardcopy production.'),
+			values  => [qw(empty.xml)],
 			type    => 'popuplist',
 			hashVar => '{hardcopyTheme}'
 		},
+		{
+			var     => 'hardcopyThemePGEditor',
+			doc     => x('Hardcopy Theme for Problem Editor'),
+			doc2    => x('Choose a layout/styling theme for PDF hardcopy production from the Prooblem Editor.'),
+			values  => [qw(empty.xml)],
+			type    => 'popuplist',
+			hashVar => '{hardcopyThemePGEditor}'
+		},
 		{
 			var  => 'showCourseHomeworkTotals',
 			doc  => x('Show Total Homework Grade on Grades Page'),
@@ -1833,7 +1747,7 @@ $ConfigValues = [
 					. 'needs to be enabled at the same time</li><li><b>SMAshowHints</b>: show hints <i>for the new '
 					. 'problem</i> (assuming they exist)</li></ul>Note: there is very little point enabling the '
 					. 'button unless you check at least one of these options - the students would simply see a new '
-					. 'version that they can not attempt or learn from.</p>'
+					. 'version that they can not attempt or learn from.'
 			),
 			min    => 0,
 			values => [ "SMAcheckAnswers", "SMAshowSolutions", "SMAshowCorrect", "SMAshowHints" ],
@@ -1979,10 +1893,10 @@ $ConfigValues = [
 				'<p>When viewing a problem, users may choose different methods of rendering formulas via an options '
 					. 'box in the left panel. Here, you can adjust what display modes are listed.</p><p>Some display '
 					. 'modes require other software to be installed on the server. Be sure to check that all display '
-					. 'modes selected here work from your server.</p><p>The display modes are <ul><li>plainText: '
+					. 'modes selected here work from your server.</p><p>The display modes are</p><ul><li>plainText: '
 					. 'shows the raw LaTeX strings for formulas.</li><li>images: produces images using the external '
 					. 'programs LaTeX and dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place '
-					. 'render mathematics.</li></ul></p></p>You must use at least one display mode. If you select only '
+					. 'render mathematics.</li></ul><p>You must use at least one display mode. If you select only '
 					. 'one, then the options box will not give a choice of modes (since there will only be one active).'
 					. '</p>'
 			),
@@ -2005,11 +1919,10 @@ $ConfigValues = [
 			doc2 => x(
 				'<p>MathQuill renders students answers in real-time as they type on the keyboard.</p><p>MathView '
 					. 'allows students to choose from a variety of common math structures (such as fractions and '
-					. 'square roots) as they attempt to input their answers.</p><p>WIRIS provides a separate workspace '
-					. 'for students to construct their response in a WYSIWYG environment.</p>'
+					. 'square roots) as they attempt to input their answers.</p>'
 			),
 			min    => 1,
-			values => [qw(None MathQuill MathView WIRIS)],
+			values => [qw(None MathQuill MathView)],
 			type   => 'popuplist'
 		},
 		{
@@ -2088,6 +2001,43 @@ $ConfigValues = [
 			),
 			type => 'boolean'
 		},
+		{
+			var  => 'pg{options}{showHintsAfter}',
+			doc  => x('Default number of attempts before hints are shown in a problem (-1 => hide hints)'),
+			doc2 => x(
+				'This is the default number of attempts a student must make before hints will be shown to the student. '
+					. 'Set this to -1 to hide hints.  Note that this can be overridden with a per problem setting.'
+			),
+			type => 'number'
+		},
+		{
+			var  => 'problemGraderScore',
+			doc  => x('Method to enter problem scores in the single problem manual grader'),
+			doc2 => x(
+				'This configures if the single problem manual grader has inputs to enter problem scores as a percent, '
+					. 'a point value, or both. Note, the problem score is always saved as a percent, so when '
+					. 'using a point value, the problem score will be rounded to the nearest whole percent.'
+			),
+			values => [qw(Percent Point Both)],
+			type   => 'popuplist'
+		},
+		{
+			var => 'pg{options}{enterKey}',
+			doc => x('Enter Key Behavior'),
+			doc2 => x(
+				'If this is set to "preview", hitting the enter key on a homework problem page activates the "Preview '
+					. 'My Answers" button.  If this is set to "submit", then the enter key activates the "Submit '
+					. 'Answers" button instead.  Or if that button is not present, it will activate the "Check '
+					. 'Answers" button.  Or if that button is also not present, it will activate the "Preview My '
+					. 'Answers" button.  A third option is "conservative". In this case, the enter key behaves like '
+					. '"preview" when the "Submit" button is available and there are only finitely many attempts '
+					. 'allowed.  Otherise the enter key behaves like "submit".  Note that this is only affects '
+					. 'homework problem pages, not test/quiz pages, and not instructor pages like the PG Editor '
+					. 'and the Library Browser.'
+			),
+			type => 'popuplist',
+			values => ['preview', 'submit', 'conservative']
+		}
 	],
 	[
 		x('E-Mail'),
@@ -2109,9 +2059,9 @@ $ConfigValues = [
 			doc  => x('E-mail verbosity level'),
 			doc2 => x(
 				'The e-mail verbosity level controls how much information is automatically added to feedback e-mails.  '
-					. 'Levels are<ol><li value="Simple"> Simple: send only the feedback comment and context link</li>'
-					. '<li value="Standard"> Standard: as in Simple, plus user, set, problem, and PG data</li>'
-					. '<li value="Debug"> Debug: as in Standard, plus the problem environment (debugging data)</li>'
+					. 'Levels are<ol><li> Simple: send only the feedback comment and context link</li>'
+					. '<li> Standard: as in Simple, plus user, set, problem, and PG data</li>'
+					. '<li> Debug: as in Standard, plus the problem environment (debugging data)</li>'
 					. '</ol>'
 			),
 			labels => {
@@ -2123,26 +2073,14 @@ $ConfigValues = [
 			type   => 'popuplist'
 
 		},
-		{
-			var  => 'mail{allowedRecipients}',
-			doc  => x('E-mail addresses which can receive e-mail from a pg problem'),
-			doc2 => x(
-				'List of e-mail addresses to which e-mail can be sent by a problem. Professors need to be added to '
-					. 'this list if questionaires are used, or other WeBWorK problems which send e-mail as part of '
-					. 'their answer mechanism.'
-			),
-			type => 'list'
-		},
 		{
 			var  => 'permissionLevels{receive_feedback}',
 			doc  => x('E-mail feedback from students automatically sent to this permission level and higher'),
 			doc2 => x(
-				'Users with this permssion level or greater will automatically be sent feedback from students '
-					. '(generated when they use the "Contact instructor" button on any problem page).  In addition '
-					. 'the feedback message will be sent to addresses listed below.  To send ONLY to addresses listed '
-					. 'below set permission level to "nobody".'
+				'Users with these permission levels will automatically be sent feedback emails from students when they '
+					. 'use the "Contact instructor" button on any problem page.'
 			),
-			type => 'permission'
+			type => 'permission_checkboxlist',
 		},
 		{
 			var  => 'mail{feedbackRecipients}',
@@ -2167,9 +2105,6 @@ $ConfigValues = [
 	],
 ];
 
-################################################################################
-# Site wide overrides are entered into the file localOverrides.conf
-################################################################################
-include("conf/localOverrides.conf");
+include('conf/LTIConfigValues.config');
 
 1; #final line of the file to reassure perl that it was read properly.
diff --git a/conf/localOverrides.conf.dist b/conf/localOverrides.conf.dist
index 90ad254dd2..1f014b67b4 100644
--- a/conf/localOverrides.conf.dist
+++ b/conf/localOverrides.conf.dist
@@ -1,7 +1,7 @@
 #!perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -38,11 +38,21 @@
 # Additional mail settings in defaults.config can be overridden here
 ################################################################################
 
-# This setting is only used if you need to send email from within a PG problem
-# (e.g. surveys, essay questions).  It is not necessary for using the email
-# tools in WeBWorK.  You can set email addresses here for users who need to
-# receive email from problems in all courses, or in course.conf for professors
-# who will receive email from problems in a single course.
+# By default, feedback is sent to all users who have permission to
+# receive_feedback in a course. If this list is non-empty, feedback is also sent
+# to the addresses specified here.
+#
+# * If you want to disable feedback altogether, leave this empty and set
+#   $permissionLevels{submit_feedback} = 'nobody'. This will cause the
+#   feedback button to go away as well.
+#
+# * If you want to send email ONLY to addresses in this list, set
+#   $permissionLevels{receive_feedback} = 'nobody'.
+#
+# Items in this list may be bare addresses, or RFC822 mailboxes, like:
+#   'Joe User <joe.user@example.com>'
+# The advantage of this form is that the resulting email will include the name
+# of the recipient in the "To" field of the email.
 
 $mail{feedbackRecipients}    = [
 	#'prof1@yourserver.yourdomain.edu',
@@ -60,29 +70,6 @@ $mail{feedbackRecipients}    = [
 # Use this to customize the text of the feedback button.
 #$feedback_button_name = "Email Instructor";
 
-
-
-################################################################################
-# Repository Information
-###############################################################################
-# This is where you put your custom remote and branch for your WeBWorK, PG and OPL
-# github repositories.
-# To disable checking for a particular repository, set the remote and branch
-# variables to be empty strings.
-
-# Note:  This process uses git ls-remote which can be very slow on some
-# systems, so it is disabled by default.  Enabling this may make the course
-# list page in the admin course very slow.
-
-#$enableGitUpgradeNotifier = 1;
-
-#$gitWeBWorKRemoteName = "origin";
-#$gitWeBWorKBranchName = "main";
-#$gitPGRemoteName = "origin";
-#$gitPGBranchName = "main";
-#$gitLibraryRemoteName = "origin";
-#$gitLibraryBranchName = "main";
-
 ################################################################################
 # Theme
 ################################################################################
@@ -118,16 +105,16 @@ $mail{feedbackRecipients}    = [
 # Uncomment one of these to use a file from within the course templates directory
 # rather than a centrally-stored file shared by all courses.
 
-#$webworkFiles{hardcopySnippets}{setHeader} = "$courseDirs{templates}/ASimpleCombinedHeaderFile.pg";
-#$webworkFiles{hardcopySnippets}{setHeader} = "$courseDirs{templates}/ASimpleHardCopyHeaderFile.pg";
+#$webworkFiles{hardcopySnippets}{setHeader} = "$courseDirs{templates}/defaultSetHeader.pg";
+#$webworkFiles{hardcopySnippets}{setHeader} = "$courseDirs{templates}/myHardcopyHeaderFile.pg";
 
 # The set header is displayed on the problem set page. It is a PG file.
 # One of these default files which is used if a specific files is not selected
 # Uncomment one of these to use a file from within the course templates directory
 # rather than a centrally-stored file shared by all courses.
 
-#$webworkFiles{screenSnippets}{setHeader} = "$courseDirs{templates}/ASimpleCombinedHeaderFile.pg";
-#$webworkFiles{screenSnippets}{setHeader} = "$courseDirs{templates}/ASimpleScreenHeaderFile.pg";
+#$webworkFiles{screenSnippets}{setHeader} = "$courseDirs{templates}/defaultSetHeader.pg";
+#$webworkFiles{screenSnippets}{setHeader} = "$courseDirs{templates}/myScreenHeaderFile.pg";
 
 ################################################################################
 # Settings for the admin course
@@ -238,8 +225,6 @@ $mail{feedbackRecipients}    = [
 
 # This sets if mathview is available on the PG editor for use as a minimal latex equation editor
 #$options{PGMathView} = 1;
-# This sets if WirisEditor is available on the PG editor for use as a minimal latex equation editor
-#$options{PGWirisEditor}= 1;
 # This sets if MathQuill is available on the PG editor for use as a minimal latex equation editor
 #$options{PGMathQuill}= 1;
 
@@ -279,22 +264,6 @@ $mail{feedbackRecipients}    = [
 # new location even before the local directory of the problem, so your new location will take
 # precedence over all other locations.
 
-################################################################################
-# Adding to the applet search path.
-################################################################################
-
-# If a full URL is given, it is used unmodified. If an
-# absolute path is given, the URL of the local server is prepended to it.
-#
-# For example, if an item is "/math/applets",
-# and the local server is  "https://math.yourschool.edu",
-# then the URL "https://math.yourschool.edu/math/applets" will be used.
-#
-# If your new applets location is a subdirectory of the webwork htdocs directory, you may
-# use notation such as "$webworkURLs{htdocs}/newsubdir"
-
-#$pg{directories}{appletPath} = [ @{$pg{directories}{appletPath}} , "new/url" ];
-
 ################################################################################
 # Problem creation defaults
 ################################################################################
@@ -325,6 +294,25 @@ $mail{feedbackRecipients}    = [
 # Setting this to a positive value will override the course-wide setting
 #$problemDefaults{prPeriod} = -1;
 
+# The default number of attempts after which to show hints for newly created problems.
+# It is suggested to use the value of -2, which means that the course-wide setting would be used
+# Setting this to -2 defaults to the use of course-wide settings (suggested)
+# Setting this to -1 disables hints in problems.
+# Setting this to 0 or more will show hints after that number of attempts.
+#$problemDefaults{showHintsAfter} = 2;
+
+################################################################################
+# Enter key behavior
+################################################################################
+# If this is set to "preview", hitting the enter key on a problem page activates
+# the "Preview My Answers" button. If this is set to "submit", then the enter
+# key activates the "Submit Answers" button instead. Or if that button is not
+# present, it will activate the "Check Answers" button. Or if that button is
+# also not present, it will just activate the "Preview My Answers" button.
+# A third option is "conservative". In this case, the enter key behaves like "preview"
+# when the "Submit" button is available and there are only finitely many
+# attempts allowed. Otherise the enter key behaves like "submit".
+#$pg{options}{enterKey} = 'conservative';
 
 ################################################################################
 # Periodic re-randomization
@@ -368,7 +356,6 @@ $mail{feedbackRecipients}    = [
 
 #$pg{specialPGEnvironmentVars}{entryAssist} = 'MathQuill';
 #$pg{specialPGEnvironmentVars}{entryAssist} = 'MathView';
-#$pg{specialPGEnvironmentVars}{entryAssist} = 'WIRIS';
 
 ################################################################################
 # Directory for temporary files
@@ -382,15 +369,17 @@ $mail{feedbackRecipients}    = [
 # that is not backed up and is the recommended set up for most installations.
 # See http://webwork.maa.org/wiki/Store_WeBWorK%27s_temporary_files_in_a_separate_directory_or_partition
 # for more information.   Note that the wwtmp directory (or partition) should be
-# created under Apache's main server document root which is usually /var/www. If this
-# is in a different location on your system, edit the lines below accordingly.
+# created under Apache's main server document root which is usually
+# /var/www/html. If this is in a different location on your system, edit the
+# lines below accordingly.  Note that you will also need to ensure server user
+# has read and write permission for the directory.
 # To implement, uncomment the following 6 lines:
-#$webworkDirs{htdocs_temp}  =  '/var/www/wwtmp';
+#$webworkDirs{htdocs_temp}   = '/var/www/html/wwtmp';
 #$webworkURLs{htdocs_temp}   = '/wwtmp';
 #$webworkDirs{equationCache} = "$webworkDirs{htdocs_temp}/equations";
 #$webworkURLs{equationCache} = "$webworkURLs{htdocs_temp}/equations";
-#$courseDirs{html_temp}  =  "/var/www/wwtmp/$courseName";
-#$courseURLs{html_temp}   = "/wwtmp/$courseName";
+#$courseDirs{html_temp}      = "/var/www/html/wwtmp/$courseName";
+#$courseURLs{html_temp}      = "/wwtmp/$courseName";
 
 #####################
 # Additional PG modules
@@ -454,34 +443,11 @@ $mail{feedbackRecipients}    = [
 # Uncomment the following line to enable authentication via IMS LTI.
 # You will have to copy the file authen_LTI.conf.dist to authen_LTI.conf,
 # and then edit that file to fill in the settings for your installation.
+# You will also need to copy and edit authen_LTI_1_1.conf.dist to
+# authen_LTI_1_1.conf, or authen_LTI_1_3.conf.dist to authen_LTI_1_3.conf
+# depending on which is enabled in authen_LTI.conf (both can be enabled).
 
 #include("conf/authen_LTI.conf");
-# default settings
-#$debug_lti_parameters = 0;
-#$debug_lti_grade_passback = 0;
-
-# Set debug_lti_parameters  to 1 to have LTI calling parameters printed to HTML page for
-# debugging.  This is useful when setting things up for the first time because
-# different LMS systems have different parameters
-
-# To get more information on passing grades back to the LMS enmass set debug_lti_grade_passback
-# to one.  And set the LTIMassUpdateInterval to 60 (seconds).
-
-# This will print into the apache log the success or failure of updating each user/set.
-# If the set has "no lis_source_did" then that set hasn't been assigned, or the user is an instructor
-# and not a student.
-
-# Setting both debug_lti_parameters and debug_lti_grade_passback will cause the full request and
-# response between the LMS and WW to be printed into apache error log file for each
-# user/set  update of the grade.
-
-# The switches above can be set in course.conf to enable debugging for just one course.
-
-# If you want even more information enable the debug facility for SubmitGrade.pm in
-# the WeBWorK::Constants file.
-# This will print extensive debug messages for all courses.
-
-
 
 ################################################################################
 # LDAP Authentication
@@ -506,6 +472,11 @@ $mail{feedbackRecipients}    = [
 
 #$session_management_via = "key";
 
+## This is the length of time (in seconds) after which a user's session becomes
+## invalid if they have no activity. The default is 30 minutes (60*30 seconds).
+
+#$sessionKeyTimeout = 60*60*2;
+
 ################################################################################
 # Cookie control settings
 ################################################################################
@@ -513,33 +484,32 @@ $mail{feedbackRecipients}    = [
 # The following variables can be set to control cookie behavior.
 
 # Set the value of the samesite attribute of the WeBWorK cookie:
-#    See: https://blog.chromium.org/2019/10/developers-get-ready-for-new.html
-#         https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite
-#         https://tools.ietf.org/html/draft-west-cookie-incrementalism-00
+# See: https://blog.chromium.org/2019/10/developers-get-ready-for-new.html
+#      https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite
+#      https://tools.ietf.org/html/draft-west-cookie-incrementalism-00
 
 # Notes about the $CookieSameSite options:
-#   The "None" setting should only be used with HTTPS and when $CookieSecure = 1; is set below. The "None" setting is also less secure and can allow certain types of cross-site attacks.
-#   The "Strict" setting can break the links in the system generated feedback emails when read in a web mail client.
-#   Due to those factors, the "Lax" setting is probably the optimal choice for typical WeBWorK servers.
+# The "None" setting should only be used with HTTPS and when $CookieSecure = 1; is set below. The "None" setting is
+# also less secure and can allow certain types of cross-site attacks.
+# The "Strict" setting can break the links in the system generated feedback emails when read in a web mail client.
+# Due to those factors, the "Lax" setting is probably the optimal choice for typical WeBWorK servers.
 
 #$CookieSameSite = "None";
 #$CookieSameSite = "Strict";
 #$CookieSameSite = "Lax";
 
 # Set the value of the secure cookie attribute:
+# Default is 0 here, as 1 will not work without https
 #$CookieSecure = 1;
 
-# At present the CookieLifeTime setting only effect how long the
-# browser is to supposed to retain the cookie.
-#     https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie
-#$CookieLifeTime = "+7d";
+# The CookieLifeTime setting determines how long the browser should retain the cookie.
+# See https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie
+# The CookieLifeTime value should be numeric and in seconds, or should be set to "session", in which case
+# the Cookie will expire when the browser session ends (a "session cookie").
+# The default value is 7 days.
+#$CookieLifeTime = 604800;
 #$CookieLifeTime = "session";
 
-# NOTE: In general the cookie lifespan settings use the CGI.pm relative time settings.
-# Search for "30 seconds from now" at https://metacpan.org/pod/CGI to see the various options.
-# A WW option is to set it to "session", in which case the Cookie will expire when the
-# browser session ends (a "session cookie").
-
 ################################################################################
 # Searching for set.def files to import
 ################################################################################
@@ -555,59 +525,48 @@ $mail{feedbackRecipients}    = [
 ################################################################################
 
 #$permissionLevels{show_resource_info}               = "admin";
-#$permissionLevels{show_pg_info_checkbox}            = "admin";
-#$permissionLevels{show_answer_hash_info_checkbox}   = "admin";
-#$permissionLevels{show_answer_group_info_checkbox}  = "admin";
+#$permissionLevels{show_pg_info}                     = "admin";
+#$permissionLevels{show_answer_hash_info}            = "admin";
+#$permissionLevels{show_answer_group_info}           = "admin";
 #$permissionLevels{modify_tags}                      = "admin";
 
+################################################################################
+# Hardcopy Theme
 ################################################################################
 
-# Available Hardcopy themes (located in snippets) - adds four XeLaTeX themes
-# using polyglossia for multilingual support and fontspec.
-# The "oneColumn" and "twoColumn" options require pdflatex be installed on the server
-# For using any of the XeLaTeX options, xelatex must be installed on the server
-# (on Ubuntu this is in the texlive-xetex package).
-# Note: restrict options to only pdflatex options, or only xelatex options,
-# and not both types.
-# Set $externalPrograms{pdflatex} to use either pdflatex or xelatex,
-# depending on which flavor of themes you are enabling.
-# Using --no-shell-escape is important for security reasons.
-#$externalPrograms{pdflatex} ="/usr/bin/xelatex --no-shell-escape";
-
-# Available Hardcopy themes (located in snippets)
-# (their "internal" name and their pretty name for end users)
-#$hardcopyThemeNames = {
-	#oneColumn => 'One Column',
-	#twoColumn => 'Two Columns',
-	#XeLaTeX-oneColumn => 'English - one Column',
-	#XeLaTeX-twoColumn => 'English - two Columns',
-	#XeLaTeX-Hebrew-oneColumn => 'Hebrew/English - one Column',
-	#XeLaTeX-Hebrew-twoColumn => 'Hebrew/English - two Columns',
-#};
-
-# This is needed to enforce an order that the options are presented when making a hardcopy
+# Hardcopy themes are .xml files.  See assets/hardcopThemes/README.md for details
+# about their structure.  The site themes are files in $webworkDirs{hardcopyThemes}.
+# $hardcopyThemes identifies which site themes are enabled.
 #$hardcopyThemes = [
-	#'oneColumn',
-	#'twoColumn',
-	#'XeLaTeX-oneColumn',
-	#'XeLaTeX-twoColumn',
-	#'XeLaTeX-Hebrew-oneColumn',
-	#'XeLaTeX-Hebrew-twoColumn',
+#	'empty.xml',
+#	'basic.xml',
+#	'basicTwoCol.xml',
+#	'classic.xml',
+#	'classicTwoCol.xml',
+#	'oneColumn.xml',
+#	'twoColumn.xml',
+#	'boxed.xml',
+#	'boxedTwoCol.xml',
+#	'boxedRows.xml',
+#	'hebrew.xml',
+#	'hebrewTwoCol.xml',
 #];
 
+# The Hebrew themes need to use xelatex. Uncomment the following for xelatex
+#$externalPrograms{pdflatex} ="/usr/bin/xelatex --no-shell-escape";
 
-# Change default Hardcopy theme
-# Be sure to choose one that is enabled!
-#$hardcopyTheme = "XeLaTeX-twoColumn";
-
-# Location of the common tex input files packages.tex, CAPA.tex, and PGML.tex
-# used for hardcopy generation.  Uncomment the following line and adjust the
-# path as needed to customize the TeX input files used for all themes in
-# hardcopy generation.  This location must contain the three files named above.
-#$webworkDirs{texinputs_common} = "$webworkDirs{root}/conf/snippets/hardcopyThemes/common";
+# A course may have additional themes in $courseDirs{hardcopyThemes}.  All such
+# "course" hardcopy themes are effectively enabled and offered for use when
+# selecting a hardcopy theme.  You can move such files or rename them to not
+# have a .xml extension if you don't want them to be offered for use.
 
-################################################################################
+# If a course hardcopy theme has the same name as a site hardcopy theme, the
+# course hardcopy theme is the one that is used.
 
+# Default hardcopy themes (should either be an enabled site theme or a theme in
+# the course hardcopyThemes folder
+#$hardcopyTheme = 'twoColumn.xml';
+#$hardcopyThemePGEditor = 'empty.xml';
 
 ################################################################################
 # Webwork Caliper
diff --git a/conf/site.conf.dist b/conf/site.conf.dist
index a39fb2b4ee..4a00f93e23 100644
--- a/conf/site.conf.dist
+++ b/conf/site.conf.dist
@@ -1,7 +1,7 @@
 #!perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -18,14 +18,14 @@
 # requests. Values may be overwritten by the course.conf for a specific course.
 # All package variables set in this file are added to the course environment.
 # If you wish to set a variable here but omit it from the course environment,
-# use the "my" keyword. The $webwork_dir variable is set in the WeBWorK Apache
-# configuration file (webwork.apache-config) and is available for use here. In
-# addition, the $courseName variable holds the name of the current course.
+# use the "my" keyword. The $webwork_dir variable is set by the webwork2
+# Mojolicious app and is available for use here. In addition, the $courseName
+# variable holds the name of the current course.
 
 # This file is used to set up the basic paths and URLs specific to your
 # installation of WeBWorK, with the exception of the $webwork_dir variable which
-# is set in the WeBWorK Apache configuration file (webwork.apache2-config).
-# Any customization of global WeBWorK settings should be done in localOverrides.conf.
+# is set by the webwork2 Mojolicious app.  Any customization of global WeBWorK
+# settings should be done in localOverrides.conf.
 
 ################################################################################
 # site.conf  -- this file
@@ -45,31 +45,17 @@
 # URL of WeBWorK handler. If WeBWorK is to be on the web server root, use "". Note
 # that using "" may not work so we suggest sticking with "/webwork2".
 $webwork_url       = '/webwork2';
-$server_root_url   = '';   # e.g.  'https://webwork.yourschool.edu' or 'http://localhost'
-                           # Note, if running a secure (ssl) server, you probably need 'https://...'
 
-# The following two variables must match the user ID and group ID respectively
-# under which apache is running.
-# In the apache configuration file (often called httpd.conf) you will find
-# User www-data or apache  --- this is the $server_userID
-# Group www-data or apache   --- this is the $server_groupID
+# The server protocol and domain name, e.g., 'https://webwork.yourschool.edu' or 'http://localhost'
+# Note, if running a secure (ssl) server, you probably need 'https://...'.
+# Also note that if you use a non-standard port, then that should also be included,
+# e.g., 'http://localhost:8080'.
+$server_root_url   = '';
 
-# uncomment (or change) the following depending on your OS
-
-# $server_userID     = 'www-data'; # standard for ubuntu
-# $server_userID     = 'apache'; # standard for RHEL/CentOS
-
-
-# $server_groupID    = 'www-data'; # standard for ubuntu
-# $server_groupID    = 'apache'; # standard for RHEL/CentOS
-
-
-#  Uncomment out the following line to set your apache version number manually.
-#  WeBWorK will automatically get the apache version directly from the server
-#  banner.  If you remove the version from the server banner you will have to
-#  set it directly here
-
-#$server_apache_version = ''; # e.g. '2.22.1'
+# This should be set to the group ID under which the webwork2 Mojolicious app is running.
+# Note that this is only used by the setfilepermissions script.
+#$server_groupID = 'www-data'; # standard for ubuntu if Mojolicious is proxied by apache2
+#$server_groupID = 'apache'; # standard for RHEL/CentOS if Mojolicious is proxied by apache2
 
 # The following variable is the address that will be listed in server error
 # messages that come from WeBWorK:
@@ -77,15 +63,11 @@ $server_root_url   = '';   # e.g.  'https://webwork.yourschool.edu' or 'http://l
 #	 For help, please send mail to this site's webmaster
 # 	(mail link to <webwork_server_admin_email>), including all of the following
 #	 information as well as what what you were doing when the error occurred... etc..."
-# Make sure that your webwork.apacheX-config file is up to date with the distributed version
-# and that the line $ENV{WEBWORK_SERVER_ADMIN} = $ce->{webwork_server_admin_email};
-# is present in the file.
 # If $webwork_server_admin_email is not defined then the
 # ServerAdmin address defined in httpd.conf is used.
 # Be sure to use single quotes for the address or the @ sign will be interpreted as an array.
+$webwork_server_admin_email = '';
 
-
-$webwork_server_admin_email ='';
 # password strings (or any other string allowing special characters) should be specified inside single quotes
 # otherwise a string such as "someone@nowhere" will interpolate the contents of the array @nowhere -- which is probably
 # empty, but still not what you want.  Similar things happen with % and $
@@ -141,10 +123,8 @@ $externalPrograms{pnmtopng} = "$netpbm_prefix/pnmtopng";
 $externalPrograms{pngtopnm} = "$netpbm_prefix/pngtopnm";
 
 ####################################################
-# url checker
+# curl
 ####################################################
-# set timeout time (-t 40 sec) to be less than timeout for problem (usually 60 seconds)
-$externalPrograms{checkurl}     = "/usr/bin/lwp-request -d -t 40 -mHEAD "; # or "/usr/local/bin/w3c -head "
 $externalPrograms{curl}  = "/usr/bin/curl";
 
 ####################################################
@@ -257,13 +237,13 @@ $database_password ='passwordRW';
 # server.  You may use the defaults unless you have things in different places.
 #################################################################################
 
-# Root directory of PG.
-$pg_dir              = "/opt/webwork/pg";
-
 # URL and path to htdocs directory.
 $webwork_htdocs_url  = "/webwork2_files";
 $webwork_htdocs_dir  = "$webwork_dir/htdocs";
 
+# URL for the pg htdocs directory.
+$pg_htdocs_url = "/pg_files";
+
 # URL and path to courses directory.
 $webwork_courses_url = "/webwork2_course_files";
 $webwork_courses_dir = "/opt/webwork/courses"; # a typical place to put course directories
@@ -338,6 +318,26 @@ $mail{tls_allowed} = 0;
 
 $mail{maxAttachmentSize} = 10;
 
+################################################################################
+# Minion job queue options
+################################################################################
+
+# This is the Minion backend that will be used by the job queue.
+# The corresponding perl package for this backend must be installed.
+# Some availabled backends are:
+# Minion::Backend::Pg (use 'Pg' below)
+# Minion::Backend::mysql (use 'mysql' below)
+# Minion::Backend::SQLite (use 'SQLite' below)
+# The simplest to use is the SQLite backend as it requires no additional setup.
+$job_queue{backend} = 'SQLite';
+
+# Database dsn for the Minion job queue. Some examples of settings for the
+# respective backends follow. The postgres and mysql examples will need to be
+# modified to work. The default sqlite setting will work as is.
+#$job_queue{database_dsn} = "postgresql://dbuser@/webwork2_job_queue";
+#$job_queue{database_dsn} = "mysql://dbuser:dbpasswd@localhost/webwork2_job_queue";
+$job_queue{database_dsn} = "sqlite:$webwork_dir/DATA/webwork2_job_queue.db";
+
 ################################################################################
 # Problem library options
 ################################################################################
@@ -397,4 +397,11 @@ $siteDefaults{locale}="";
 # unavailable_after (example: "index, unavailable_after: 23-Jul-2007 18:00:00 EST")
 $options{metaRobotsContent}='noindex, nofollow';
 
+################################################################################
+# Third Party Assets CDN/Local
+################################################################################
+# Set to 1 to serve third party assets files from a CDN.  Otherwise these
+# asset files are served from the local node_modules directories.
+$options{thirdPartyAssetsUseCDN} = 0;
+
 1; #final line of the file to reassure perl that it was read properly.
diff --git a/conf/snippets/ASimpleCombinedHeaderFile.pg b/conf/snippets/ASimpleCombinedHeaderFile.pg
deleted file mode 100644
index 3adc41e842..0000000000
--- a/conf/snippets/ASimpleCombinedHeaderFile.pg
+++ /dev/null
@@ -1,90 +0,0 @@
-# ASimpleCombinedHeaderFile.pg
-# This header file can be used for both the screen and hardcopy output
-
-
-DOCUMENT();
-
-loadMacros(
-	"PG.pl",
-	"PGbasicmacros.pl",
-	#"source.pl", #uncommenting this will display "show source" button if that is permitted
-	"PGcourse.pl",
-	"PGML.pl"
-);
-
-TEXT($BEGIN_ONE_COLUMN);
-
-####################################################
-#
-# The item below printed out only when a hardcopy is made.
-#
-####################################################
-
-
-
-TEXT(MODES(TeX =>EV3(<<'EOT'),HTML=>""));
-
-\noindent {\large \bf $studentName}
-\hfill
-{\large \bf {\{protect_underbar($courseName)\}}}
-% Uncomment the line below if this course has sections. Note that this is a comment in TeX mode since this is only processed by LaTeX
-%   {\large \bf { Section: \{protect_underbar($sectionName)\} } }
-\par
-\noindent{\large \bf {Assignment \{protect_underbar($setNumber)\}  due $formatedDueDate}}
-%\par\noindent
-% Uncomment and edit the line below if this course has a web page. Note that this is a comment in TeX mode.
-%See the course web page for information http://yoururl/yourcourse
-
-EOT
-
-####################################################
-#
-# End of hardcopy only output.
-#
-####################################################
-
-
-####################################################
-#
-# The items below are printed out only when set is displayed on screen
-#
-####################################################
-TEXT(MODES(TeX =>"",HTML=>EV3(<<'EOT')));
-
-$BBOLD WeBWorK  Assignment \{ protect_underbar($setNumber) \}  is due :  $formattedDueDate. $EBOLD
-$PAR
-Here's the list of
-\{ htmlLink(qq!http://webwork.maa.org/wiki/Available_Functions!,"functions and symbols") \}
- which WeBWorK understands.
-$BR
-EOT
-
-####################################################
-# Uncomment and edit the lines below if this course has a web page. Note that this is comment in Perl mode.
-# IMPORTANT: Make sure the EOT at the bottom is at the beginning of a line with no spaces preceding it.
-#TEXT(MODES(TeX =>"",HTML=>EV3(<<'EOT')));
-#See the course web page for information \{ htmlLink(qq!http://yoururl/yourcourse!,"your course name") \}
-#EOT
-####################################################
-
-####################################################
-#
-# End of screen only output.
-#
-####################################################
-
-####################################################
-#
-# Anything between the BEGIN_TEXT AND END_TEXT lines
-# will be printed in both screen and hardcopy output
-#
-####################################################
-
-BEGIN_PGML
-
-END_PGML
-
-
-TEXT($END_ONE_COLUMN);
-
-ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/conf/snippets/hardcopyPostamble.tex b/conf/snippets/hardcopyPostamble.tex
deleted file mode 120000
index 771dc2cf0b..0000000000
--- a/conf/snippets/hardcopyPostamble.tex
+++ /dev/null
@@ -1 +0,0 @@
-hardcopyThemes/twoColumn/./hardcopyPostamble.tex
\ No newline at end of file
diff --git a/conf/snippets/hardcopyPreamble.tex b/conf/snippets/hardcopyPreamble.tex
deleted file mode 120000
index 1da24c668e..0000000000
--- a/conf/snippets/hardcopyPreamble.tex
+++ /dev/null
@@ -1 +0,0 @@
-hardcopyThemes/twoColumn/./hardcopyPreamble.tex
\ No newline at end of file
diff --git a/conf/snippets/hardcopyProblemDivider.tex b/conf/snippets/hardcopyProblemDivider.tex
deleted file mode 120000
index 4bf7c28873..0000000000
--- a/conf/snippets/hardcopyProblemDivider.tex
+++ /dev/null
@@ -1 +0,0 @@
-hardcopyThemes/twoColumn/./hardcopyProblemDivider.tex
\ No newline at end of file
diff --git a/conf/snippets/hardcopySetDivider.tex b/conf/snippets/hardcopySetDivider.tex
deleted file mode 120000
index 37f12b35fb..0000000000
--- a/conf/snippets/hardcopySetDivider.tex
+++ /dev/null
@@ -1 +0,0 @@
-hardcopyThemes/twoColumn/./hardcopySetDivider.tex
\ No newline at end of file
diff --git a/conf/snippets/hardcopySetFooter.pg b/conf/snippets/hardcopySetFooter.pg
deleted file mode 120000
index 2e03481a11..0000000000
--- a/conf/snippets/hardcopySetFooter.pg
+++ /dev/null
@@ -1 +0,0 @@
-hardcopyThemes/twoColumn/./hardcopySetFooter.pg
\ No newline at end of file
diff --git a/conf/snippets/hardcopySetHeader.pg b/conf/snippets/hardcopySetHeader.pg
deleted file mode 120000
index 9434062862..0000000000
--- a/conf/snippets/hardcopySetHeader.pg
+++ /dev/null
@@ -1 +0,0 @@
-hardcopyThemes/twoColumn/./hardcopySetHeader.pg
\ No newline at end of file
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-oneColumn/hardcopyPostamble.tex b/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-oneColumn/hardcopyPostamble.tex
deleted file mode 100644
index 8e831736a7..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-oneColumn/hardcopyPostamble.tex
+++ /dev/null
@@ -1,3 +0,0 @@
-
-\vfill
-\end{document}
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-oneColumn/hardcopyPreamble.tex b/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-oneColumn/hardcopyPreamble.tex
deleted file mode 100644
index 1b06bf0078..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-oneColumn/hardcopyPreamble.tex
+++ /dev/null
@@ -1,41 +0,0 @@
-\batchmode
-\documentclass[11pt]{amsart}
-\input{packages.tex}
-
-% For XeLaTeX + polyglossia - using Hebrew and the Culmus fonts
-\usepackage{fontspec}
-\usepackage{xunicode}
-
-% Load the polyglossia package to support multiple languages.
-% see https://ctan.org/pkg/polyglossia
-\usepackage{polyglossia}
-
-% bidi needs to be loaded AFTER caption,xcolor
-\usepackage{bidi}
-
-\setdefaultlanguage{hebrew}
-\setotherlanguage{english}
-\setmainfont{Frank Ruehl CLM}
-\setmonofont{Miriam Mono CLM}
-\setsansfont{Simple CLM}
-
-% When using default English
-% Use \begin{hebrew} block of text \end{hebrew} for paragraphs.
-%
-% When using default Hebrew
-% Use \begin{hebrew} block of text \end{hebrew} for paragraphs.
-
-% WeBWorK used Control+_ = ^_ for verbatim... so we change its charcode
-\catcode`\=12
-
-\usepackage{fullpage}
-
-% This is used to signal PG that we are not using multicols
-\newcommand{\nocolumns}{}
-
-\input{CAPA.tex}
-\input{PGML.tex}
-
-\begin{document}
-\newpage
-\setcounter{page}{1}
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-oneColumn/hardcopyProblemDivider.tex b/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-oneColumn/hardcopyProblemDivider.tex
deleted file mode 100644
index 12a723ba3f..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-oneColumn/hardcopyProblemDivider.tex
+++ /dev/null
@@ -1,6 +0,0 @@
-
-\vfill
-\goodbreak
-\hrule
-\nobreak
-\smallskip
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-oneColumn/hardcopySetDivider.tex b/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-oneColumn/hardcopySetDivider.tex
deleted file mode 100644
index a66b59253a..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-oneColumn/hardcopySetDivider.tex
+++ /dev/null
@@ -1,4 +0,0 @@
-
-\newpage%
-\setcounter{page}{1}% 
-
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-oneColumn/hardcopySetFooter.pg b/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-oneColumn/hardcopySetFooter.pg
deleted file mode 100644
index cb6b9be060..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-oneColumn/hardcopySetFooter.pg
+++ /dev/null
@@ -1,26 +0,0 @@
-# 
-# hardcopySetFooter.pg - generic hardcopy set footer file
-# 
-
-DOCUMENT();
-loadMacros(
-	"PG.pl",
-	"PGbasicmacros.pl"
-);
-
-BEGIN_TEXT
-$BR
-
-\newfontfamily\libertine{Linux Libertine O}
-
-\begin{english}
-\noindent {\tiny Generated by WeBWorK {\libertine \copyright}}
-\end{english}
-
-\begin{hebrew}
-\noindent{\tiny נוצר על ידי \textenglish{WeBWorK} {\libertine \copyright}}
-\end{hebrew}
-
-END_TEXT
-
-ENDDOCUMENT();
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-oneColumn/hardcopySetHeader.pg b/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-oneColumn/hardcopySetHeader.pg
deleted file mode 100644
index 7a357d2d13..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-oneColumn/hardcopySetHeader.pg
+++ /dev/null
@@ -1,71 +0,0 @@
-DOCUMENT();
-
-loadMacros(
-	"PG.pl",
-	"PGbasicmacros.pl",
-);
-
-TEXT($BEGIN_ONE_COLUMN);
-
-TEXT(MODES(TeX =>EV3(<<'EOT'),HTML=>"",Latex2HTML=>""));
-\noindent {\large \bf $studentName}
-\hfill
-\noindent {\large \bf MTH 161  $sectionNumber   Fall 2003}
-\par
-
-EOT
-
-BEGIN_TEXT
-
-$BBOLD WeBWorK  assignment number  $setNumber  is due :  $formattedDueDate. $EBOLD
-
-$PAR
-The 
-(* home page *)
-\{ 
-#htmlLink(qq!http://www.math.rochester.edu/courses/161/home/!,"home
-page") 
-\} 
-for the course contains the syllabus, grading policy and other
-information.  
-$PAR
-END_TEXT
-
-##################
-# EDIT BELOW HERE
-##################
-BEGIN_TEXT
-$HR
-$PAR
-This file is /conf/snippets/hardcopySetHeader.pg   you can use it as 
-a model for creating files which introduce each problem set.
-$PAR
-$HR
-END_TEXT
-##################
-# EDIT ABOVE HERE
-##################
-BEGIN_TEXT
-The primary purpose of WeBWorK is to let you know that you are getting the correct answer or to alert
-you if you are making some kind of mistake. Usually you can attempt a problem as many times as you want before
-the due date.  However, if you are having trouble figuring out your error, you should
-consult the book, or ask a fellow student, one of the TA's or
-your professor for help.  Don't spend a lot of time guessing -- it's not very efficient or effective.
-$PAR
-Give 4 or 5  significant digits for (floating point) numerical answers.
-For most problems when entering numerical answers, you can if you wish
-enter elementary expressions such as \( 2\wedge3 \) instead of 8, \( sin(3*pi/2) \)instead
-of -1, \( e\wedge (ln(2)) \) instead of 2,
-\( (2+tan(3))*(4-sin(5))\wedge6-7/8 \) instead of 27620.3413, etc.
- Here's the 
-\{ htmlLink(qq!http://webwork.math.rochester.edu/docs/docs/pglanguage/availableFunctions.html!,"list of the functions") \}
- which WeBWorK understands.
-$PAR
-You can use the Feedback button on each problem
-page to send e-mail to the professors. 
-
-
-$END_ONE_COLUMN
-END_TEXT
-
-ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-oneColumn/hardcopyUserDivider.tex b/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-oneColumn/hardcopyUserDivider.tex
deleted file mode 100644
index 25cb763f38..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-oneColumn/hardcopyUserDivider.tex
+++ /dev/null
@@ -1,3 +0,0 @@
-
-\newpage%
-\setcounter{page}{1}% 
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-twoColumn/hardcopyPostamble.tex b/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-twoColumn/hardcopyPostamble.tex
deleted file mode 100644
index 8e46f0cdb3..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-twoColumn/hardcopyPostamble.tex
+++ /dev/null
@@ -1,4 +0,0 @@
-
-\end{multicols}
-\vfill
-\end{document}
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-twoColumn/hardcopyPreamble.tex b/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-twoColumn/hardcopyPreamble.tex
deleted file mode 100644
index 9f0e7c252a..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-twoColumn/hardcopyPreamble.tex
+++ /dev/null
@@ -1,42 +0,0 @@
-\batchmode
-\documentclass[10pt]{amsart}
-\input{packages.tex}
-
-% For XeLaTeX + polyglossia - using Hebrew and the Culmus fonts
-\usepackage{fontspec}
-\usepackage{xunicode}
-
-% Load the polyglossia package to support multiple languages.
-% see https://ctan.org/pkg/polyglossia
-\usepackage{polyglossia}
-
-% bidi needs to be loaded AFTER caption,xcolor
-\usepackage{bidi}
-
-\setdefaultlanguage{hebrew}
-\setotherlanguage{english}
-\setmainfont{Frank Ruehl CLM}
-\setmonofont{Miriam Mono CLM}
-\setsansfont{Simple CLM}
-
-% When using default English
-% Use \begin{hebrew} block of text \end{hebrew} for paragraphs.
-%
-% When using default Hebrew
-% Use \begin{hebrew} block of text \end{hebrew} for paragraphs.
-
-% WeBWorK used Control+_ = ^_ for verbatim... so we change its charcode
-\catcode`\=12
-
-\usepackage[text={7.5in,9in},centering]{geometry}
-\columnsep = .25in
-\columnseprule = .4pt
-
-\input{CAPA.tex}
-\input{PGML.tex}
-
-\begin{document}
-\voffset=-0.8in
-\newpage
-\setcounter{page}{1}
-\begin{multicols}{2}
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-twoColumn/hardcopyProblemDivider.tex b/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-twoColumn/hardcopyProblemDivider.tex
deleted file mode 100644
index 12a723ba3f..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-twoColumn/hardcopyProblemDivider.tex
+++ /dev/null
@@ -1,6 +0,0 @@
-
-\vfill
-\goodbreak
-\hrule
-\nobreak
-\smallskip
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-twoColumn/hardcopySetDivider.tex b/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-twoColumn/hardcopySetDivider.tex
deleted file mode 100644
index 2832139795..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-twoColumn/hardcopySetDivider.tex
+++ /dev/null
@@ -1,8 +0,0 @@
-
-\end{multicols}   % close off the columns from the set above
-
-\newpage%
-\setcounter{page}{1}% 
-\begin{multicols}{2}
-\columnwidth=\linewidth % reopen the columns for the following set
-
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-twoColumn/hardcopySetFooter.pg b/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-twoColumn/hardcopySetFooter.pg
deleted file mode 100644
index 28597e4dd1..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-twoColumn/hardcopySetFooter.pg
+++ /dev/null
@@ -1,27 +0,0 @@
-# 
-# hardcopySetFooter.pg - generic hardcopy set footer file
-# 
-
-DOCUMENT();
-loadMacros(
-	"PG.pl",
-	"PGbasicmacros.pl"
-);
-
-BEGIN_TEXT
-$BEGIN_ONE_COLUMN
-
-\newfontfamily\libertine{Linux Libertine O}
-
-\begin{english}
-\noindent {\tiny Generated by WeBWorK {\libertine \copyright}}
-\end{english}
-
-\begin{hebrew}
-\noindent{\tiny נוצר על ידי \textenglish{WeBWorK} {\libertine \copyright}}
-\end{hebrew}
-
-$END_ONE_COLUMN
-END_TEXT
-
-ENDDOCUMENT();
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-twoColumn/hardcopySetHeader.pg b/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-twoColumn/hardcopySetHeader.pg
deleted file mode 100644
index 7a357d2d13..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-twoColumn/hardcopySetHeader.pg
+++ /dev/null
@@ -1,71 +0,0 @@
-DOCUMENT();
-
-loadMacros(
-	"PG.pl",
-	"PGbasicmacros.pl",
-);
-
-TEXT($BEGIN_ONE_COLUMN);
-
-TEXT(MODES(TeX =>EV3(<<'EOT'),HTML=>"",Latex2HTML=>""));
-\noindent {\large \bf $studentName}
-\hfill
-\noindent {\large \bf MTH 161  $sectionNumber   Fall 2003}
-\par
-
-EOT
-
-BEGIN_TEXT
-
-$BBOLD WeBWorK  assignment number  $setNumber  is due :  $formattedDueDate. $EBOLD
-
-$PAR
-The 
-(* home page *)
-\{ 
-#htmlLink(qq!http://www.math.rochester.edu/courses/161/home/!,"home
-page") 
-\} 
-for the course contains the syllabus, grading policy and other
-information.  
-$PAR
-END_TEXT
-
-##################
-# EDIT BELOW HERE
-##################
-BEGIN_TEXT
-$HR
-$PAR
-This file is /conf/snippets/hardcopySetHeader.pg   you can use it as 
-a model for creating files which introduce each problem set.
-$PAR
-$HR
-END_TEXT
-##################
-# EDIT ABOVE HERE
-##################
-BEGIN_TEXT
-The primary purpose of WeBWorK is to let you know that you are getting the correct answer or to alert
-you if you are making some kind of mistake. Usually you can attempt a problem as many times as you want before
-the due date.  However, if you are having trouble figuring out your error, you should
-consult the book, or ask a fellow student, one of the TA's or
-your professor for help.  Don't spend a lot of time guessing -- it's not very efficient or effective.
-$PAR
-Give 4 or 5  significant digits for (floating point) numerical answers.
-For most problems when entering numerical answers, you can if you wish
-enter elementary expressions such as \( 2\wedge3 \) instead of 8, \( sin(3*pi/2) \)instead
-of -1, \( e\wedge (ln(2)) \) instead of 2,
-\( (2+tan(3))*(4-sin(5))\wedge6-7/8 \) instead of 27620.3413, etc.
- Here's the 
-\{ htmlLink(qq!http://webwork.math.rochester.edu/docs/docs/pglanguage/availableFunctions.html!,"list of the functions") \}
- which WeBWorK understands.
-$PAR
-You can use the Feedback button on each problem
-page to send e-mail to the professors. 
-
-
-$END_ONE_COLUMN
-END_TEXT
-
-ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-twoColumn/hardcopyUserDivider.tex b/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-twoColumn/hardcopyUserDivider.tex
deleted file mode 100644
index a23eb585dc..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-Hebrew-twoColumn/hardcopyUserDivider.tex
+++ /dev/null
@@ -1,7 +0,0 @@
-
-\end{multicols}   % close off the columns from the set above
-
-\newpage%
-\setcounter{page}{1}% 
-\begin{multicols}{2}
-\columnwidth=\linewidth % reopen the columns for the following set
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-oneColumn/hardcopyPostamble.tex b/conf/snippets/hardcopyThemes/XeLaTeX-oneColumn/hardcopyPostamble.tex
deleted file mode 100644
index 8e831736a7..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-oneColumn/hardcopyPostamble.tex
+++ /dev/null
@@ -1,3 +0,0 @@
-
-\vfill
-\end{document}
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-oneColumn/hardcopyPreamble.tex b/conf/snippets/hardcopyThemes/XeLaTeX-oneColumn/hardcopyPreamble.tex
deleted file mode 100644
index 270df3cc33..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-oneColumn/hardcopyPreamble.tex
+++ /dev/null
@@ -1,43 +0,0 @@
-\batchmode
-\documentclass[11pt]{amsart}
-\input{packages.tex}
-
-% For XeLaTeX + polyglossia
-\usepackage{fontspec}
-\usepackage{xunicode}
-
-% Load the polyglossia package to support multiple languages.
-% see https://ctan.org/pkg/polyglossia
-\usepackage{polyglossia}
-\setdefaultlanguage{english}
-% Can add additional languages
-%\setotherlanguage{supported_language}
-
-% Can add additional languages
-%\setotherlanguage{supported_language}
-
-% Can set TTF/OTF fonts, ex with
-%\setmainfont{main font name}
-%\setmonofont{mono font name}
-%\setsansfont{sans font name}
-
-% If needed - can load the bidi package to support RTL and LTR languages
-% using automatic direction changes (where it works) for Unicode UTF-8 
-% encoded text.
-% The bidi package needs to be loaded AFTER caption, xcolor.
-%\usepackage{bidi}
-
-% WeBWorK used Control+_ = ^_ for verbatim... so we change its charcode
-\catcode`\=12
-
-\usepackage{fullpage}
-
-% This is used to signal PG that we are not using multicols
-\newcommand{\nocolumns}{}
-
-\input{CAPA.tex}
-\input{PGML.tex}
-
-\begin{document}
-\newpage
-\setcounter{page}{1}
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-oneColumn/hardcopyProblemDivider.tex b/conf/snippets/hardcopyThemes/XeLaTeX-oneColumn/hardcopyProblemDivider.tex
deleted file mode 100644
index 12a723ba3f..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-oneColumn/hardcopyProblemDivider.tex
+++ /dev/null
@@ -1,6 +0,0 @@
-
-\vfill
-\goodbreak
-\hrule
-\nobreak
-\smallskip
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-oneColumn/hardcopySetDivider.tex b/conf/snippets/hardcopyThemes/XeLaTeX-oneColumn/hardcopySetDivider.tex
deleted file mode 100644
index a66b59253a..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-oneColumn/hardcopySetDivider.tex
+++ /dev/null
@@ -1,4 +0,0 @@
-
-\newpage%
-\setcounter{page}{1}% 
-
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-oneColumn/hardcopySetFooter.pg b/conf/snippets/hardcopyThemes/XeLaTeX-oneColumn/hardcopySetFooter.pg
deleted file mode 100644
index df36143d36..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-oneColumn/hardcopySetFooter.pg
+++ /dev/null
@@ -1,20 +0,0 @@
-# 
-# hardcopySetFooter.pg - generic hardcopy set footer file
-# 
-
-DOCUMENT();
-loadMacros(
-	"PG.pl",
-	"PGbasicmacros.pl"
-);
-
-BEGIN_TEXT
-$BR
-
-\begin{english}
-\noindent {\tiny Generated by WeBWorK \copyright}
-\end{english}
-
-END_TEXT
-
-ENDDOCUMENT();
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-oneColumn/hardcopySetHeader.pg b/conf/snippets/hardcopyThemes/XeLaTeX-oneColumn/hardcopySetHeader.pg
deleted file mode 100644
index 7a357d2d13..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-oneColumn/hardcopySetHeader.pg
+++ /dev/null
@@ -1,71 +0,0 @@
-DOCUMENT();
-
-loadMacros(
-	"PG.pl",
-	"PGbasicmacros.pl",
-);
-
-TEXT($BEGIN_ONE_COLUMN);
-
-TEXT(MODES(TeX =>EV3(<<'EOT'),HTML=>"",Latex2HTML=>""));
-\noindent {\large \bf $studentName}
-\hfill
-\noindent {\large \bf MTH 161  $sectionNumber   Fall 2003}
-\par
-
-EOT
-
-BEGIN_TEXT
-
-$BBOLD WeBWorK  assignment number  $setNumber  is due :  $formattedDueDate. $EBOLD
-
-$PAR
-The 
-(* home page *)
-\{ 
-#htmlLink(qq!http://www.math.rochester.edu/courses/161/home/!,"home
-page") 
-\} 
-for the course contains the syllabus, grading policy and other
-information.  
-$PAR
-END_TEXT
-
-##################
-# EDIT BELOW HERE
-##################
-BEGIN_TEXT
-$HR
-$PAR
-This file is /conf/snippets/hardcopySetHeader.pg   you can use it as 
-a model for creating files which introduce each problem set.
-$PAR
-$HR
-END_TEXT
-##################
-# EDIT ABOVE HERE
-##################
-BEGIN_TEXT
-The primary purpose of WeBWorK is to let you know that you are getting the correct answer or to alert
-you if you are making some kind of mistake. Usually you can attempt a problem as many times as you want before
-the due date.  However, if you are having trouble figuring out your error, you should
-consult the book, or ask a fellow student, one of the TA's or
-your professor for help.  Don't spend a lot of time guessing -- it's not very efficient or effective.
-$PAR
-Give 4 or 5  significant digits for (floating point) numerical answers.
-For most problems when entering numerical answers, you can if you wish
-enter elementary expressions such as \( 2\wedge3 \) instead of 8, \( sin(3*pi/2) \)instead
-of -1, \( e\wedge (ln(2)) \) instead of 2,
-\( (2+tan(3))*(4-sin(5))\wedge6-7/8 \) instead of 27620.3413, etc.
- Here's the 
-\{ htmlLink(qq!http://webwork.math.rochester.edu/docs/docs/pglanguage/availableFunctions.html!,"list of the functions") \}
- which WeBWorK understands.
-$PAR
-You can use the Feedback button on each problem
-page to send e-mail to the professors. 
-
-
-$END_ONE_COLUMN
-END_TEXT
-
-ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-oneColumn/hardcopyUserDivider.tex b/conf/snippets/hardcopyThemes/XeLaTeX-oneColumn/hardcopyUserDivider.tex
deleted file mode 100644
index 25cb763f38..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-oneColumn/hardcopyUserDivider.tex
+++ /dev/null
@@ -1,3 +0,0 @@
-
-\newpage%
-\setcounter{page}{1}% 
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-twoColumn/hardcopyPostamble.tex b/conf/snippets/hardcopyThemes/XeLaTeX-twoColumn/hardcopyPostamble.tex
deleted file mode 100644
index 8e46f0cdb3..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-twoColumn/hardcopyPostamble.tex
+++ /dev/null
@@ -1,4 +0,0 @@
-
-\end{multicols}
-\vfill
-\end{document}
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-twoColumn/hardcopyPreamble.tex b/conf/snippets/hardcopyThemes/XeLaTeX-twoColumn/hardcopyPreamble.tex
deleted file mode 100644
index 8e0d61f39c..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-twoColumn/hardcopyPreamble.tex
+++ /dev/null
@@ -1,44 +0,0 @@
-\batchmode
-\documentclass[10pt]{amsart}
-\input{packages.tex}
-
-% For XeLaTeX + polyglossia
-\usepackage{fontspec}
-\usepackage{xunicode}
-
-% Load the polyglossia package to support multiple languages.
-% see https://ctan.org/pkg/polyglossia
-\usepackage{polyglossia}
-\setdefaultlanguage{english}
-% Can add additional languages
-%\setotherlanguage{supported_language}
-
-% Can add additional languages
-%\setotherlanguage{supported_language}
-
-% Can set TTF/OTF fonts, ex with
-%\setmainfont{main font name}
-%\setmonofont{mono font name}
-%\setsansfont{sans font name}
-
-% If needed - can load the bidi package to support RTL and LTR languages
-% using automatic direction changes (where it works) for Unicode UTF-8 
-% encoded text.
-% The bidi package needs to be loaded AFTER caption, xcolor.
-%\usepackage{bidi}
-
-% WeBWorK used Control+_ = ^_ for verbatim... so we change its charcode
-\catcode`\=12
-
-\usepackage[text={7.5in,9in},centering]{geometry}
-\columnsep = .25in
-\columnseprule = .4pt
-
-\input{CAPA.tex}
-\input{PGML.tex}
-
-\begin{document}
-\newpage
-\setcounter{page}{1}
-\begin{multicols}{2}
-\columnwidth=\linewidth
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-twoColumn/hardcopyProblemDivider.tex b/conf/snippets/hardcopyThemes/XeLaTeX-twoColumn/hardcopyProblemDivider.tex
deleted file mode 100644
index 12a723ba3f..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-twoColumn/hardcopyProblemDivider.tex
+++ /dev/null
@@ -1,6 +0,0 @@
-
-\vfill
-\goodbreak
-\hrule
-\nobreak
-\smallskip
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-twoColumn/hardcopySetDivider.tex b/conf/snippets/hardcopyThemes/XeLaTeX-twoColumn/hardcopySetDivider.tex
deleted file mode 100644
index 2832139795..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-twoColumn/hardcopySetDivider.tex
+++ /dev/null
@@ -1,8 +0,0 @@
-
-\end{multicols}   % close off the columns from the set above
-
-\newpage%
-\setcounter{page}{1}% 
-\begin{multicols}{2}
-\columnwidth=\linewidth % reopen the columns for the following set
-
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-twoColumn/hardcopySetFooter.pg b/conf/snippets/hardcopyThemes/XeLaTeX-twoColumn/hardcopySetFooter.pg
deleted file mode 100644
index b3cfb96c4f..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-twoColumn/hardcopySetFooter.pg
+++ /dev/null
@@ -1,19 +0,0 @@
-# 
-# hardcopySetFooter.pg - generic hardcopy set footer file
-# 
-
-DOCUMENT();
-loadMacros(
-	"PG.pl",
-	"PGbasicmacros.pl"
-);
-
-BEGIN_TEXT
-$BEGIN_ONE_COLUMN
-
-\noindent {\tiny Generated by \copyright WeBWorK, http://webwork.maa.org, Mathematical Association of America}
-
-$END_ONE_COLUMN
-END_TEXT
-
-ENDDOCUMENT();
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-twoColumn/hardcopySetHeader.pg b/conf/snippets/hardcopyThemes/XeLaTeX-twoColumn/hardcopySetHeader.pg
deleted file mode 100644
index 7a357d2d13..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-twoColumn/hardcopySetHeader.pg
+++ /dev/null
@@ -1,71 +0,0 @@
-DOCUMENT();
-
-loadMacros(
-	"PG.pl",
-	"PGbasicmacros.pl",
-);
-
-TEXT($BEGIN_ONE_COLUMN);
-
-TEXT(MODES(TeX =>EV3(<<'EOT'),HTML=>"",Latex2HTML=>""));
-\noindent {\large \bf $studentName}
-\hfill
-\noindent {\large \bf MTH 161  $sectionNumber   Fall 2003}
-\par
-
-EOT
-
-BEGIN_TEXT
-
-$BBOLD WeBWorK  assignment number  $setNumber  is due :  $formattedDueDate. $EBOLD
-
-$PAR
-The 
-(* home page *)
-\{ 
-#htmlLink(qq!http://www.math.rochester.edu/courses/161/home/!,"home
-page") 
-\} 
-for the course contains the syllabus, grading policy and other
-information.  
-$PAR
-END_TEXT
-
-##################
-# EDIT BELOW HERE
-##################
-BEGIN_TEXT
-$HR
-$PAR
-This file is /conf/snippets/hardcopySetHeader.pg   you can use it as 
-a model for creating files which introduce each problem set.
-$PAR
-$HR
-END_TEXT
-##################
-# EDIT ABOVE HERE
-##################
-BEGIN_TEXT
-The primary purpose of WeBWorK is to let you know that you are getting the correct answer or to alert
-you if you are making some kind of mistake. Usually you can attempt a problem as many times as you want before
-the due date.  However, if you are having trouble figuring out your error, you should
-consult the book, or ask a fellow student, one of the TA's or
-your professor for help.  Don't spend a lot of time guessing -- it's not very efficient or effective.
-$PAR
-Give 4 or 5  significant digits for (floating point) numerical answers.
-For most problems when entering numerical answers, you can if you wish
-enter elementary expressions such as \( 2\wedge3 \) instead of 8, \( sin(3*pi/2) \)instead
-of -1, \( e\wedge (ln(2)) \) instead of 2,
-\( (2+tan(3))*(4-sin(5))\wedge6-7/8 \) instead of 27620.3413, etc.
- Here's the 
-\{ htmlLink(qq!http://webwork.math.rochester.edu/docs/docs/pglanguage/availableFunctions.html!,"list of the functions") \}
- which WeBWorK understands.
-$PAR
-You can use the Feedback button on each problem
-page to send e-mail to the professors. 
-
-
-$END_ONE_COLUMN
-END_TEXT
-
-ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/conf/snippets/hardcopyThemes/XeLaTeX-twoColumn/hardcopyUserDivider.tex b/conf/snippets/hardcopyThemes/XeLaTeX-twoColumn/hardcopyUserDivider.tex
deleted file mode 100644
index a23eb585dc..0000000000
--- a/conf/snippets/hardcopyThemes/XeLaTeX-twoColumn/hardcopyUserDivider.tex
+++ /dev/null
@@ -1,7 +0,0 @@
-
-\end{multicols}   % close off the columns from the set above
-
-\newpage%
-\setcounter{page}{1}% 
-\begin{multicols}{2}
-\columnwidth=\linewidth % reopen the columns for the following set
diff --git a/conf/snippets/hardcopyThemes/common/CAPA.tex b/conf/snippets/hardcopyThemes/common/CAPA.tex
deleted file mode 100644
index 11d7d32fac..0000000000
--- a/conf/snippets/hardcopyThemes/common/CAPA.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-% capa tex macros
-
-\newcommand{\capa}{{\sl C\kern-.10em\raise-.00ex\hbox{\rm A}\kern-.22em%
-{\sl P}\kern-.14em\kern-.01em{\rm A}}}
-  
-\newenvironment{choicelist}
-{\begin{list}{}
-	{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}
-	\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}
-	\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}
-	\setlength{\abovedisplayskip}{0.05in}
-	\setlength{\abovedisplayshortskip}{-0.04in}
-	\setlength{\belowdisplayshortskip}{0.04in}}
-	}
-{\end{list}}
diff --git a/conf/snippets/hardcopyThemes/common/PGML.tex b/conf/snippets/hardcopyThemes/common/PGML.tex
deleted file mode 100644
index 797ee4df1c..0000000000
--- a/conf/snippets/hardcopyThemes/common/PGML.tex
+++ /dev/null
@@ -1,71 +0,0 @@
-% definitions for PGML
-
-\newcount\pgmlCount
-\newdimen\pgmlPercent
-\newdimen\pgmlPixels
-
-\pgmlPixels=.5pt
-\pgmlPercent=.01\hsize
-
-{\catcode`\^^M=\active%
-  \gdef\pgmlSetup{%
-    \parskip=0pt%
-    \def\par{\ifmmode\else\endgraf\fi\ignorespaces}%
-    \catcode`\^^M=\active%
-    \def^^M{\ifmmode\else\space\fi\ignorespaces}}
-  \global\let^^M\par}%
-
-\def\pgmlIndent{\par\advance\leftskip by 2em \advance\pgmlPercent by .02em \pgmlCount=0}%
-\def\pgmlbulletItem{\par\indent\llap{$\bullet$ }\ignorespaces}%
-\def\pgmldiscItem{\par\indent\llap{$\bullet$ }\ignorespaces}%
-\def\pgmlcircleItem{\par\indent\llap{$\circ$ }\ignorespaces}%
-\def\pgmlsquareItem{\par\indent\llap{\vrule height 1ex width .75ex depth -.25ex\ }\ignorespaces}%
-\def\pgmlnumericItem{\par\indent\advance\pgmlCount by 1 \llap{\the\pgmlCount. }\ignorespaces}%
-\def\pgmlalphaItem{\par\indent{\advance\pgmlCount by `\a \llap{\char\pgmlCount. }}\advance\pgmlCount by 1\ignorespaces}%
-\def\pgmlAlphaItem{\par\indent{\advance\pgmlCount by `\A \llap{\char\pgmlCount. }}\advance\pgmlCount by 1\ignorespaces}%
-\def\pgmlromanItem{\par\indent\advance\pgmlCount by 1 \llap{\romannumeral\pgmlCount. }\ignorespaces}%
-\def\pgmlRomanItem{\par\indent\advance\pgmlCount by 1 \llap{\uppercase\expandafter{\romannumeral\pgmlCount}. }\ignorespaces}%
-
-\def\pgmlCenter{%
-  \par \parfillskip=0pt
-  \advance\leftskip by 0pt plus .5\hsize
-  \advance\rightskip by 0pt plus .5\hsize
-  \def\pgmlBreak{\break}%
-}%
-\def\pgmlRight{%
-  \par \parfillskip=0pt
-  \advance\leftskip by 0pt plus \hsize
-  \def\pgmlBreak{\break}%
-}%
-
-\def\pgmlBreak{\\}%
-
-\def\pgmlHeading#1{%
-  \par\bfseries
-  \ifcase#1 \or\huge \or\LARGE \or\large \or\normalsize \or\footnotesize \or\scriptsize \fi
-}%
-
-\def\pgmlRule#1#2{%
-  \par\noindent
-  \hbox{%
-    \strut%
-    \dimen1=\ht\strutbox%
-    \advance\dimen1 by -#2%
-    \divide\dimen1 by 2%
-    \advance\dimen2 by -\dp\strutbox%
-    \raise\dimen1\hbox{\vrule width #1 height #2 depth 0pt}%
-  }%
-  \par
-}%
-
-\def\pgmlIC#1{\futurelet\pgmlNext\pgmlCheckIC}%
-\def\pgmlCheckIC{\ifx\pgmlNext\pgmlSpace \/\fi}%
-{\def\getSpace#1{\global\let\pgmlSpace= }\getSpace{} }%
-
-{\catcode`\ =12\global\let\pgmlSpaceChar= }%
-{\catcode`\^^M=\active%
-    \gdef\pgmlPreformatted{\par\small\ttfamily\hsize=10\hsize\obeyspaces\catcode`\^^M=\active\let^^M=\pgmlNL\pgmlNL}}%
-\def\pgmlNL{\par\bgroup\catcode`\ =12\pgmlTestSpace}%
-\def\pgmlTestSpace{\futurelet\next\pgmlTestChar}%
-\def\pgmlTestChar{\ifx\next\pgmlSpaceChar\ \pgmlTestNext\fi\egroup}%
-\def\pgmlTestNext\fi\egroup#1{\fi\pgmlTestSpace}%
diff --git a/conf/snippets/hardcopyThemes/common/packages.tex b/conf/snippets/hardcopyThemes/common/packages.tex
deleted file mode 100644
index 79162cf3fa..0000000000
--- a/conf/snippets/hardcopyThemes/common/packages.tex
+++ /dev/null
@@ -1,31 +0,0 @@
-\usepackage{amsmath,amsfonts,amssymb,multicol}
-\usepackage{booktabs,tabularx,colortbl,caption,xcolor}
-\usepackage{path}
-\discretionaries |~!@$%^&*()_+`-=#{"}[]:;'<>,.?\/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789|
-
-\usepackage{iftex}
-\ifXeTeX
-  \usepackage{graphicx}
-\else
-  \usepackage[pdftex]{graphicx}
-  \usepackage{epstopdf} % allows use of eps files with pdftex
-  \usepackage[utf8]{inputenc}
-  \usepackage{eurosym} % the euro symbol
-  \DeclareUnicodeCharacter{20AC}{\euro} % make it possible to use the UTF-8 character for the euro symbol in problems
-\fi
-
-\usepackage{epsf}
-\usepackage{epsfig}
-\usepackage{pslatex}
-\usepackage{listings}
-\lstset{basicstyle=\ttfamily,breaklines=true,aboveskip=0pt,belowskip=0pt}
-
-\pagestyle{plain}
-
-\def\endline{\bigskip\hrule width \hsize height 0.8pt }
-\newcommand{\lt}{<}
-\newcommand{\gt}{>}
-\newcommand{\less}{<}
-\newcommand{\grt}{>}
-
-\parindent=0pt
diff --git a/conf/snippets/hardcopyThemes/oneColumn/hardcopyPostamble.tex b/conf/snippets/hardcopyThemes/oneColumn/hardcopyPostamble.tex
deleted file mode 100644
index 8e831736a7..0000000000
--- a/conf/snippets/hardcopyThemes/oneColumn/hardcopyPostamble.tex
+++ /dev/null
@@ -1,3 +0,0 @@
-
-\vfill
-\end{document}
diff --git a/conf/snippets/hardcopyThemes/oneColumn/hardcopyPreamble.tex b/conf/snippets/hardcopyThemes/oneColumn/hardcopyPreamble.tex
deleted file mode 100644
index bd25a24b89..0000000000
--- a/conf/snippets/hardcopyThemes/oneColumn/hardcopyPreamble.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\batchmode
-\documentclass[11pt]{amsart}
-\input{packages.tex}
-
-\usepackage{fullpage}
-
-% This is used to signal PG that we are not using multicols
-\newcommand{\nocolumns}{}
-
-\input{CAPA.tex}
-\input{PGML.tex}
-
-\begin{document}
-\newpage
-\setcounter{page}{1}
diff --git a/conf/snippets/hardcopyThemes/oneColumn/hardcopyProblemDivider.tex b/conf/snippets/hardcopyThemes/oneColumn/hardcopyProblemDivider.tex
deleted file mode 100644
index 12a723ba3f..0000000000
--- a/conf/snippets/hardcopyThemes/oneColumn/hardcopyProblemDivider.tex
+++ /dev/null
@@ -1,6 +0,0 @@
-
-\vfill
-\goodbreak
-\hrule
-\nobreak
-\smallskip
diff --git a/conf/snippets/hardcopyThemes/oneColumn/hardcopySetDivider.tex b/conf/snippets/hardcopyThemes/oneColumn/hardcopySetDivider.tex
deleted file mode 100644
index a66b59253a..0000000000
--- a/conf/snippets/hardcopyThemes/oneColumn/hardcopySetDivider.tex
+++ /dev/null
@@ -1,4 +0,0 @@
-
-\newpage%
-\setcounter{page}{1}% 
-
diff --git a/conf/snippets/hardcopyThemes/oneColumn/hardcopySetFooter.pg b/conf/snippets/hardcopyThemes/oneColumn/hardcopySetFooter.pg
deleted file mode 100644
index d556270b6c..0000000000
--- a/conf/snippets/hardcopyThemes/oneColumn/hardcopySetFooter.pg
+++ /dev/null
@@ -1,17 +0,0 @@
-# 
-# hardcopySetFooter.pg - generic hardcopy set footer file
-# 
-
-DOCUMENT();
-loadMacros(
-	"PG.pl",
-	"PGbasicmacros.pl"
-);
-
-BEGIN_TEXT
-$BR
-\noindent {\tiny Generated by \copyright WeBWorK, http://webwork.maa.org, Mathematical Association of America}
-
-END_TEXT
-
-ENDDOCUMENT();
diff --git a/conf/snippets/hardcopyThemes/oneColumn/hardcopySetHeader.pg b/conf/snippets/hardcopyThemes/oneColumn/hardcopySetHeader.pg
deleted file mode 100644
index 7a357d2d13..0000000000
--- a/conf/snippets/hardcopyThemes/oneColumn/hardcopySetHeader.pg
+++ /dev/null
@@ -1,71 +0,0 @@
-DOCUMENT();
-
-loadMacros(
-	"PG.pl",
-	"PGbasicmacros.pl",
-);
-
-TEXT($BEGIN_ONE_COLUMN);
-
-TEXT(MODES(TeX =>EV3(<<'EOT'),HTML=>"",Latex2HTML=>""));
-\noindent {\large \bf $studentName}
-\hfill
-\noindent {\large \bf MTH 161  $sectionNumber   Fall 2003}
-\par
-
-EOT
-
-BEGIN_TEXT
-
-$BBOLD WeBWorK  assignment number  $setNumber  is due :  $formattedDueDate. $EBOLD
-
-$PAR
-The 
-(* home page *)
-\{ 
-#htmlLink(qq!http://www.math.rochester.edu/courses/161/home/!,"home
-page") 
-\} 
-for the course contains the syllabus, grading policy and other
-information.  
-$PAR
-END_TEXT
-
-##################
-# EDIT BELOW HERE
-##################
-BEGIN_TEXT
-$HR
-$PAR
-This file is /conf/snippets/hardcopySetHeader.pg   you can use it as 
-a model for creating files which introduce each problem set.
-$PAR
-$HR
-END_TEXT
-##################
-# EDIT ABOVE HERE
-##################
-BEGIN_TEXT
-The primary purpose of WeBWorK is to let you know that you are getting the correct answer or to alert
-you if you are making some kind of mistake. Usually you can attempt a problem as many times as you want before
-the due date.  However, if you are having trouble figuring out your error, you should
-consult the book, or ask a fellow student, one of the TA's or
-your professor for help.  Don't spend a lot of time guessing -- it's not very efficient or effective.
-$PAR
-Give 4 or 5  significant digits for (floating point) numerical answers.
-For most problems when entering numerical answers, you can if you wish
-enter elementary expressions such as \( 2\wedge3 \) instead of 8, \( sin(3*pi/2) \)instead
-of -1, \( e\wedge (ln(2)) \) instead of 2,
-\( (2+tan(3))*(4-sin(5))\wedge6-7/8 \) instead of 27620.3413, etc.
- Here's the 
-\{ htmlLink(qq!http://webwork.math.rochester.edu/docs/docs/pglanguage/availableFunctions.html!,"list of the functions") \}
- which WeBWorK understands.
-$PAR
-You can use the Feedback button on each problem
-page to send e-mail to the professors. 
-
-
-$END_ONE_COLUMN
-END_TEXT
-
-ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/conf/snippets/hardcopyThemes/oneColumn/hardcopyUserDivider.tex b/conf/snippets/hardcopyThemes/oneColumn/hardcopyUserDivider.tex
deleted file mode 100644
index 25cb763f38..0000000000
--- a/conf/snippets/hardcopyThemes/oneColumn/hardcopyUserDivider.tex
+++ /dev/null
@@ -1,3 +0,0 @@
-
-\newpage%
-\setcounter{page}{1}% 
diff --git a/conf/snippets/hardcopyThemes/twoColumn/hardcopyPostamble.tex b/conf/snippets/hardcopyThemes/twoColumn/hardcopyPostamble.tex
deleted file mode 100644
index 8e46f0cdb3..0000000000
--- a/conf/snippets/hardcopyThemes/twoColumn/hardcopyPostamble.tex
+++ /dev/null
@@ -1,4 +0,0 @@
-
-\end{multicols}
-\vfill
-\end{document}
diff --git a/conf/snippets/hardcopyThemes/twoColumn/hardcopyPreamble.tex b/conf/snippets/hardcopyThemes/twoColumn/hardcopyPreamble.tex
deleted file mode 100644
index f3b99744c5..0000000000
--- a/conf/snippets/hardcopyThemes/twoColumn/hardcopyPreamble.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-\batchmode
-\documentclass[10pt]{amsart}
-\input{packages.tex}
-
-\usepackage[text={7.5in,9in},centering]{geometry}
-\columnsep = .25in
-\columnseprule = .4pt
-
-\input{CAPA.tex}
-\input{PGML.tex}
-
-\begin{document}
-\newpage
-\setcounter{page}{1}
-\begin{multicols}{2}
-\columnwidth=\linewidth
diff --git a/conf/snippets/hardcopyThemes/twoColumn/hardcopyProblemDivider.tex b/conf/snippets/hardcopyThemes/twoColumn/hardcopyProblemDivider.tex
deleted file mode 100644
index 12a723ba3f..0000000000
--- a/conf/snippets/hardcopyThemes/twoColumn/hardcopyProblemDivider.tex
+++ /dev/null
@@ -1,6 +0,0 @@
-
-\vfill
-\goodbreak
-\hrule
-\nobreak
-\smallskip
diff --git a/conf/snippets/hardcopyThemes/twoColumn/hardcopySetDivider.tex b/conf/snippets/hardcopyThemes/twoColumn/hardcopySetDivider.tex
deleted file mode 100644
index 2832139795..0000000000
--- a/conf/snippets/hardcopyThemes/twoColumn/hardcopySetDivider.tex
+++ /dev/null
@@ -1,8 +0,0 @@
-
-\end{multicols}   % close off the columns from the set above
-
-\newpage%
-\setcounter{page}{1}% 
-\begin{multicols}{2}
-\columnwidth=\linewidth % reopen the columns for the following set
-
diff --git a/conf/snippets/hardcopyThemes/twoColumn/hardcopySetFooter.pg b/conf/snippets/hardcopyThemes/twoColumn/hardcopySetFooter.pg
deleted file mode 100644
index 32a8f0da72..0000000000
--- a/conf/snippets/hardcopyThemes/twoColumn/hardcopySetFooter.pg
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# hardcopySetFooter.pg - generic hardcopy set footer file
-#
-
-DOCUMENT();
-loadMacros(
-	"PG.pl",
-	"PGbasicmacros.pl"
-);
-
-BEGIN_TEXT
-$BEGIN_ONE_COLUMN
-
-\noindent {\tiny Generated by \copyright WeBWorK, http://webwork.maa.org, Mathematical Association of America}
-
-$END_ONE_COLUMN
-END_TEXT
-
-ENDDOCUMENT();
diff --git a/conf/snippets/hardcopyThemes/twoColumn/hardcopySetHeader.pg b/conf/snippets/hardcopyThemes/twoColumn/hardcopySetHeader.pg
deleted file mode 100644
index 53d24cf546..0000000000
--- a/conf/snippets/hardcopyThemes/twoColumn/hardcopySetHeader.pg
+++ /dev/null
@@ -1,71 +0,0 @@
-DOCUMENT();
-
-loadMacros(
-	"PG.pl",
-	"PGbasicmacros.pl",
-);
-
-TEXT($BEGIN_ONE_COLUMN);
-
-TEXT(MODES(TeX =>EV3(<<'EOT'),HTML=>"",Latex2HTML=>""));
-\noindent {\large \bf $studentName}
-\hfill
-\noindent {\large \bf MTH 161  $sectionNumber   Fall 2003}
-\par
-
-EOT
-
-BEGIN_TEXT
-
-$BBOLD WeBWorK  assignment number  $setNumber  is due :  $formattedDueDate. $EBOLD
-
-$PAR
-The
-(* home page *)
-\{
-#htmlLink(qq!http://www.math.rochester.edu/courses/161/home/!,"home
-page")
-\}
-for the course contains the syllabus, grading policy and other
-information.
-$PAR
-END_TEXT
-
-##################
-# EDIT BELOW HERE
-##################
-BEGIN_TEXT
-$HR
-$PAR
-This file is /conf/snippets/hardcopySetHeader.pg   you can use it as
-a model for creating files which introduce each problem set.
-$PAR
-$HR
-END_TEXT
-##################
-# EDIT ABOVE HERE
-##################
-BEGIN_TEXT
-The primary purpose of WeBWorK is to let you know that you are getting the correct answer or to alert
-you if you are making some kind of mistake. Usually you can attempt a problem as many times as you want before
-the due date.  However, if you are having trouble figuring out your error, you should
-consult the book, or ask a fellow student, one of the TA's or
-your professor for help.  Don't spend a lot of time guessing -- it's not very efficient or effective.
-$PAR
-Give 4 or 5  significant digits for (floating point) numerical answers.
-For most problems when entering numerical answers, you can if you wish
-enter elementary expressions such as \( 2\wedge3 \) instead of 8, \( sin(3*pi/2) \)instead
-of -1, \( e\wedge (ln(2)) \) instead of 2,
-\( (2+tan(3))*(4-sin(5))\wedge6-7/8 \) instead of 27620.3413, etc.
- Here's the
-\{ htmlLink(qq!http://webwork.math.rochester.edu/docs/docs/pglanguage/availableFunctions.html!,"list of the functions") \}
- which WeBWorK understands.
-$PAR
-You can use the Feedback button on each problem
-page to send e-mail to the professors.
-
-
-$END_ONE_COLUMN
-END_TEXT
-
-ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/conf/snippets/hardcopyThemes/twoColumn/hardcopyUserDivider.tex b/conf/snippets/hardcopyThemes/twoColumn/hardcopyUserDivider.tex
deleted file mode 100644
index a23eb585dc..0000000000
--- a/conf/snippets/hardcopyThemes/twoColumn/hardcopyUserDivider.tex
+++ /dev/null
@@ -1,7 +0,0 @@
-
-\end{multicols}   % close off the columns from the set above
-
-\newpage%
-\setcounter{page}{1}% 
-\begin{multicols}{2}
-\columnwidth=\linewidth % reopen the columns for the following set
diff --git a/conf/snippets/hardcopyUserDivider.tex b/conf/snippets/hardcopyUserDivider.tex
deleted file mode 120000
index 2c5b583baf..0000000000
--- a/conf/snippets/hardcopyUserDivider.tex
+++ /dev/null
@@ -1 +0,0 @@
-hardcopyThemes/twoColumn/./hardcopyUserDivider.tex
\ No newline at end of file
diff --git a/conf/snippets/screenSetHeader.pg b/conf/snippets/screenSetHeader.pg
deleted file mode 100644
index adccf60c45..0000000000
--- a/conf/snippets/screenSetHeader.pg
+++ /dev/null
@@ -1,33 +0,0 @@
-DOCUMENT();
-
-# Load whatever macros you need for the problem
-loadMacros("PG.pl",
-           "PGbasicmacros.pl",
-           "PGchoicemacros.pl",
-           "PGanswermacros.pl",
-           "PGauxiliaryFunctions.pl",
-           "PGgraphmacros.pl",
-          );
-
-## Do NOT show partial correct answers
-$showPartialCorrectAnswers = 0;
-
-BEGIN_TEXT
-$BR
-
-
-Give 4 or 5  significant digits for (floating point) numerical answers.
-For most problems when entering numerical answers, you can if you wish
-enter elementary expressions such as \( 2\wedge3 \) instead of 8, \( sin(3*pi/2)
-\)instead
-of -1, \( e\wedge (ln(2)) \) instead of 2,
-\( (2+tan(3))*(4-sin(5))\wedge6-7/8 \) instead of 27620.3413, etc.
-
-Here's the
-\{
-htmlLink(qq!http://webwork.math.rochester.edu/webwork_system_html/docs/docs/pglanguage/availablefunctions.html!,"list of the functions") \}
-which WeBWorK understands.
-$PAR
-END_TEXT
-
-ENDDOCUMENT();
diff --git a/conf/snippets/setHeader.pg b/conf/snippets/setHeader.pg
deleted file mode 100644
index 04b91abfe3..0000000000
--- a/conf/snippets/setHeader.pg
+++ /dev/null
@@ -1,88 +0,0 @@
-# ASimpleCombinedHeaderFile.pg
-# This header file can be used for both the screen and hardcopy output
-
-
-DOCUMENT();
-
-loadMacros(
-	"PG.pl",
-	"PGbasicmacros.pl",
-
-);
-
-TEXT($BEGIN_ONE_COLUMN);
-
-####################################################
-#
-# The item below printed out only when a hardcopy is made.
-#
-####################################################
-
-
-
-TEXT(MODES(TeX =>EV3(<<'EOT'),HTML=>""));
-
-\noindent {\large \bf $studentName}
-\hfill
-{\large \bf {\{protect_underbar($courseName)\}}}
-% Uncomment the line below if this course has sections. Note that this is a comment in TeX mode since this is only processed by LaTeX
-%   {\large \bf { Section: \{protect_underbar($sectionName)\} } }
-\par
-\noindent{\large \bf {Assignment \{protect_underbar($setNumber)\}  due $formatedDueDate}}
-\par\noindent
-% Uncomment and edit the line below if this course has a web page. Note that this is a comment in TeX mode.
-%See the course web page for information http://yoururl/yourcourse
-
-EOT
-
-####################################################
-#
-# End of hardcopy only output.
-#
-####################################################
-
-
-####################################################
-#
-# The items below are printed out only when set is displayed on screen
-#
-####################################################
-TEXT(MODES(TeX =>"",HTML=>EV3(<<'EOT')));
-
-$BBOLD WeBWorK  Assignment \{ protect_underbar($setNumber) \}  is due :  $formattedDueDate. $EBOLD
-$PAR
-Here's the list of
-\{ htmlLink(qq!http://webwork.maa.org/wiki/Available_Functions!,"functions and symbols") \}
- which WeBWorK understands.
-$BR
-EOT
-
-####################################################
-# Uncomment and edit the lines below if this course has a web page. Note that this is comment in Perl mode.
-# IMPORTANT: Make sure the EOT at the bottom is at the beginning of a line with no spaces preceding it.
-#TEXT(MODES(TeX =>"",HTML=>EV3(<<'EOT')));
-#See the course web page for information \{ htmlLink(qq!http://yoururl/yourcourse!,"your course name") \}
-#EOT
-####################################################
-
-####################################################
-#
-# End of screen only output.
-#
-####################################################
-
-####################################################
-#
-# Anything between the BEGIN_TEXT AND END_TEXT lines
-# will be printed in both screen and hardcopy output
-#
-####################################################
-
-BEGIN_TEXT
-
-END_TEXT
-
-
-TEXT($END_ONE_COLUMN);
-
-ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/conf/webwork.apache2.4-config.dist b/conf/webwork.apache2.4-config.dist
deleted file mode 100644
index 2b9c0046d6..0000000000
--- a/conf/webwork.apache2.4-config.dist
+++ /dev/null
@@ -1,328 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-# This file configures Apache to handle requests for WeBWorK. To install WeBWorK
-# support in your Apache configuration, add the following line to the end of
-# your Apache configuration file (usually apache.conf or httpd.conf):
-#
-#     Include /path/to/webwork.apache2-config
-#
-# Customize the variable $webwork_dir below to match the location of your
-# WeBWorK installation.
-#
-
-# Uncomment the ScriptAliasMatch to allow access to show-source.cgi
-# This allows the "show source" button to work for demonstration "courses"
-# See for example Davide Cervone's Knoxville lectures on math objects
-# It requires that a show-source.cgi script be customized and placed in
-# the myCourse/html  directory of the course
-# The "show source" button is most useful for webwork "courses" used to train new authors
-# It is not desirable to expose the code of regular homework questions to students
-
-ScriptAliasMatch /webwork2_course_files/([^/]*)/show-source.cgi/(.*) /opt/webwork/courses/$1/html/show-source.cgi/$2
-
-PerlChildInitHandler "sub { srand }"
-
-PerlModule mod_perl2
-
-PerlPassEnv MIN_HTML_ERRORS
-PerlPassEnv JSON_ERROR_LOG
-
-<Perl>
-
-#################################################################
-# Set this variable to the path to your WeBWorK installation.
-#################################################################
-
-my $webwork_dir = "/opt/webwork/webwork2";
-# Cache this value for use by other scripts not necessarily in the Apache2 hierarchy
-# Different scripts use different locations :-)
-
-$ENV{WEBWORK_ROOT} = $webwork_dir;
-$WeBWorK::SeedCE{webwork_dir} = $webwork_dir;
-$WeBWorK::Constants::WEBWORK_DIRECTORY = $webwork_dir;
-
-#################################################################
-# The following code reads defaults.config and extracts the remaining configuration
-# variables. There is no need to modify it.
-#################################################################
-
-# link to WeBWorK code libraries
-eval "use lib '$webwork_dir/lib'"; die $@ if $@;
-
-# link to PG code libraries
-my $pg_dir ="/opt/webwork/pg";
-eval "use lib '$pg_dir/lib'"; die $@ if $@;
-$WeBWorK::Constants::PG_DIRECTORY = $pg_dir;
-$ENV{PG_ROOT} = $pg_dir;
-
-eval "use WeBWorK::CourseEnvironment"; die $@ if $@;
-
-# grab course environment (by reading webwork2/conf/defaults.config)
-my $ce = new WeBWorK::CourseEnvironment({ webwork_dir => $webwork_dir });
-
-die "webwork.apach2-config: Can't establish initial Course environment" unless ref($ce);
-
-#  set important configuration variables (from defaults.config)
-
-my $webwork_url = $ce->{webwork_url};                    # e.g.  /webwork2
-my $webwork_htdocs_url = $ce->{webwork_htdocs_url};      # e.g.  /webwork2_files
-my $webwork_htdocs_dir = $ce->{webwork_htdocs_dir};      # e.g.  /opt/webwork/webwork2/htdocs
-my $webwork_courses_url = $ce->{webwork_courses_url};    # e.g.  /webwork2_course_files
-my $webwork_courses_dir = $ce->{webwork_courses_dir};    # e.g.  /opt/webwork/courses
-
-my $webwork_server_admin_email = $ce->{webwork_server_admin_email};
-if ($webwork_server_admin_email) {
-	print "webwork.apache2-config: webwork_server_admin_email for reporting bugs has been set to $webwork_server_admin_email in site.conf\n";
-} else {
-	$webwork_server_admin_email= $ENV{SERVER_ADMIN};
-}
-$ENV{WEBWORK_SERVER_ADMIN} = $webwork_server_admin_email;
-
-#################################################################
-# Modify the manner in which errors are reported.
-# Uncommenting $ENV{MIN_HTML_ERRORS} = 1; will minimize the data provided
-#    on HTML error pages, which some security reviews request, as in particular
-#    the older output provided backtrace information which could help idenfify
-#    the code and version of the code being used on the server.
-#    The useful information will be in the Apache error.log file, with a UID
-#    displayed also in the HTML error page to help match up records.
-# Warning: The Apache error.log is available to system administrators but not to
-#    users with staff level accounts in the courses, so using the more secure
-#    settings requires more cooperation from the system administrators when
-#    debugging data is needed.
-# Uncommenting $ENV{JSON_ERROR_LOG} = 1; will change the output format in the
-#    Apache error.log file to be JSON based, which will make programmatic
-#    processing of the error reports easier, but can break the functionality
-#    of existing scripts which parse error.log.
-#################################################################
-
-#$ENV{MIN_HTML_ERRORS} = 1;
-#$ENV{JSON_ERROR_LOG} = 1;
-
-#################################################################
-# report server setup when child process starts up -- for example when restarting the server
-#################################################################
-print "webwork.apache2-config:  WeBWorK server is starting\n";
-print "webwork.apache2-config:  WeBWorK root directory set to $webwork_dir in webwork2/conf/webwork.apache2-config\n";
-print "webwork.apache2-config:  The following locations and urls are set in webwork2/conf/site.conf\n";
-print "webwork.apache2-config:  PG root directory set to $pg_dir\n";
-print "webwork.apache2-config:  WeBWorK server userID is ", $ce->{server_userID}, "\n";
-print "webwork.apache2-config:  WeBWorK server groupID is ", $ce->{server_groupID}, "\n";
-print "webwork.apache2-config:  The webwork url on this site is ", $ce->{server_root_url},"$webwork_url\n";
-print "webwork.apache2-config:  The webwork smtp server address is ", $ce->{mail}{smtpServer},"\n";
-print "webwork.apache2-config:     The webwork smtp server port is $ce->{mail}->{smtpPort}\n";
-print "webwork.apache2-config:     The webwork smtp server protocol is ", ($ce->{mail}->{tls_allow})?"'ssl'":"'not ssl'","\n";
-
-# check compatibility of sendmail protocols and ports
-if (exists(($ce->{mail}->{smtpPort})) )  { # port not chosen automatically
-   # check port and protocol for compatibility
-	unless (
-			(($ce->{mail}->{smtpPort} == 25)  # 'not ssl mode'
-			  and ($ce->{mail}->{tls_allow} == 0))
-			or
-			(($ce->{mail}->{smtpPort} == 465) # 'ssl mode'
-			  and ($ce->{mail}->{tls_allow} == 1) )
-			) {
-		warn "WARNING:: The smtp port and the smtp protocol do not appear to be compatible";
-	}
-
-}
-
-
-
-require Apache::WeBWorK; # force compilation of pretty much everything
-
-# At this point, the following configuration variables should be present for use
-# in wiring WeBWorK into Apache:
-#
-#     $webwork_url            The base URL handled by Apache::WeBWorK.
-#     $webwork_dir            The path to the base webwork2 directory.
-#     $pg_dir                 The path to the base pg directory.
-#
-#     $webwork_htdocs_url     The base URL of the WeBWorK htdocs directory.
-#     $webwork_htdocs_dir     The path to the WeBWorK htdocs directory.
-#
-#     $webwork_courses_url    The base URL of the WeBWorK courses directory.
-#     $webwork_courses_dir    The path to the WeBWorK courses directory.
-
-# Define the location that is handled by the Apache::WeBWorK module, and tell
-# Perl where to find the libraries Apache::WeBWorK needs to run.
-#
-$Location{$webwork_url} = {
-	SetHandler => "perl-script",
-	PerlHandler => "Apache::WeBWorK",
-};
-
-# Provide access to webwork2 and pg resources.
-# A resource from $webwork_htdocs_dir is used if present,
-# then $pg_dir/htdocs is checked if the file is not found there.
-push @Alias, [ $webwork_htdocs_url => $webwork_htdocs_dir ];
-push @Alias, [ "/pg_files" => "$pg_dir/htdocs" ];
-
-# The order of the directives is important for the rewrite to work, so a hash can not be used,
-# and we must construct the directory section by hand.
-push @PerlConfig, 
-	"<Directory $webwork_htdocs_dir>",
-	'	Require       all granted',
-	'	Options       FollowSymLinks',
-	'	AllowOverride none',
-	'	RewriteEngine on',
-	"	RewriteBase   $webwork_htdocs_url",
-	'	RewriteCond   %{REQUEST_FILENAME} !-f',
-	'	RewriteRule   ^(.*)$ /pg_files/$1 [L]',
-	'</Directory>';
-
-$Directory{"$pg_dir/htdocs"} = {
-	Require       => "all granted",
-	Options       => "FollowSymLinks",
-	AllowOverride => "none"
-};
-
-# Provide access to course-specific resources.
-#
-push @AliasMatch, [ "$webwork_courses_url/([^/]*)/(.*)", "$webwork_courses_dir/\$1/html/\$2" ];
-$Directory{"$webwork_courses_dir/*/html"} = {
-        Require => "all granted",
-	Options => "FollowSymLinks",
-	AllowOverride => "none",
-};
-
-# If WeBWorK is on the root, exempt the static directories from being handled
-# by Apache::WeBWorK.
-#
-if ($webwork_url eq "") {
-	$Location{$webwork_courses_url} = { SetHandler => "none" };
-	$Location{$webwork_htdocs_url} = { SetHandler => "none" };
-}
-
-# Uncomment the line below, and the WebworkSOAP and WSDL handlers sections below
-# that to use the WebworkSOAP handlers.  Make sure that you change the value to
-# something more secure.
-#$WeBWorK::SeedCE{soap_authen_key} = "123456789123456789";
-
-</Perl>
-
-####################################################################
-# WebworkSOAP handlers (for integration with moodle)
-####################################################################
-#PerlModule WebworkSOAP
-
-# WEBWORK SOAP CONFIGURATION
-#<Location /webwork2_rpc>
-#        PerlHandler Apache::SOAP
-#        SetHandler perl-script
-#        PerlSetVar dispatch_to "WebworkSOAP"
-#        PerlSetVar options "compress_threshold => 10000"
-#        Require all granted
-#</Location>
-
-####################################################################
-# WebworkSOAP WSDL HANDLER :: TO BE REPLACED WITH A FILE FOR PRODUCTION SERVERS
-####################################################################
-#<Location /webwork2_wsdl>
-#        PerlSetVar dispatch_to "WebworkSOAP::WSDL"
-#        PerlSetVar options "compress_threshold => 10000"
-#        PerlHandler WebworkSOAP::WSDL
-#        SetHandler perl-script
-#        Require all granted
-#</Location>
-
-
-####################################################################
-# WebworkWebservice handlers -- for integration with external editor
-####################################################################
-
-
-########### WebworkWebservice XMLRPC handler ##########
-
-PerlModule WebworkWebservice
-
-<Location /mod_xmlrpc>
-	SetHandler perl-script
-	PerlHandler Apache::XMLRPC::Lite
-	PerlSetVar dispatch_to "WebworkXMLRPC"
-	PerlSetVar options "compress_threshold => 10000"
-        Require all granted
-</Location>
-
-########### For "raw" json format ###########
-# If a remote site is using this WW server to process WW problems
-# and embed them into web pages, the web browser might not permit
-# the WW problems to be displayed, as it violates security policy
-# to mix content from different originis without an explicit
-# directive from the WW server that it is safe.
-# Uncomment the following to set the header to enable Cross-Origin
-# Resource Sharing (CORS).
-# You will also need to enable headers via something like:
-# sudo a2enmod headers
-# to use this.
-# This is not actually needed to use the client formats unless
-# they are accessed from a *remote* server.
-
-#<IfModule mod_headers.c>
-#    <Location /webwork2/html2xml>
-#        Header set Access-Control-Allow-Origin "*"
-#    </Location>
-#    <Location /webwork2_files>
-#        Header set Access-Control-Allow-Origin "*"
-#    </Location>
-#</IfModule>
-
-
-########## WebworkWebservice SOAP handler ##########
-
-#PerlModule WebworkWebservice
-#
-#<Location /mod_soap>
-#	SetHandler perl-script
-#	PerlHandler Apache::SOAP
-#	PerlSetVar dispatch_to "WebworkXMLRPC"
-#	PerlSetVar options "compress_threshold => 10000"
-#       Require all granted
-#</Location>
-
-####################################################################
-# WebworkSOAP  "bridge2" handler (Moodle/WeBWorK Question bridge)
-####################################################################
-
-#Include /Volumes/WW_test/opt/webwork/ww_opaque_server/conf/opaqueserver.apache-config
-
-####################################################################
-# Expires Module configuration
-####################################################################
-
-#  This will enable expirey information for the webserver which will
-#  cut down on the number of requests made. This is a good option if you
-#  are having bandwidth problems.
-
-#  enable the expires apache module (by using a2enmod expires or
-#  by commenting out the following line and including the right path
-
-#LoadModule expires_module /path/to/mod_expires.so
-
-<IfModule mod_expires.c>
-    ExpiresActive On
-    ExpiresByType image/jpg "access plus 1 year"
-    ExpiresByType image/jpeg "access plus 1 year"
-    ExpiresByType image/gif "access plus 1 year"
-    ExpiresByType image/png "access plus 1 year"
-    ExpiresByType text/css "access plus 1 month"
-    ExpiresByType application/javascript "access plus 1 month"
-    ExpiresByType application/x-javascript "access plus 1 month"
-    ExpiresByType text/javascript "access plus 1 month"
-    ExpiresByType image/x-icon "access plus 1 year"
-    ExpiresByType application/x-font-woff  "access plus 1 year"
-</IfModule>
diff --git a/conf/webwork2-job-queue.dist.service b/conf/webwork2-job-queue.dist.service
new file mode 100644
index 0000000000..df945b3014
--- /dev/null
+++ b/conf/webwork2-job-queue.dist.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=webwork2 job queue
+After=network.target
+
+[Service]
+Type=simple
+User=www-data
+Group=www-data
+WorkingDirectory=/opt/webwork/webwork2
+ExecStart=/opt/webwork/webwork2/bin/webwork2 minion worker -m production
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target
diff --git a/conf/webwork2.apache2.4.dist.conf b/conf/webwork2.apache2.4.dist.conf
new file mode 100644
index 0000000000..81ab34232d
--- /dev/null
+++ b/conf/webwork2.apache2.4.dist.conf
@@ -0,0 +1,57 @@
+# Uncomment the following lines to allow access to show-source.cgi.  This allows the "show source" button that is added
+# by the "source.pl" macro to work for demonstration "courses".  It requires that a show-source.cgi script be customized
+# and placed in the courses html directory.  You will also need to enable the apache2 cgi module with `sudo a2enmod cgi`
+# for this to work.  Note that if you have the mpm_event module enabled instead of mpm_worker, then you will need the
+# cgid module instead.  Apache2 will automatically select this module if the given command is used.  The "show source"
+# button is most useful for webwork "courses" used to train new authors.  It is not desirable to expose the code of
+# regular homework questions to students.
+
+#<DirectoryMatch /opt/webwork/courses/[^/]*/html/>
+#	Options -MultiViews +SymLinksIfOwnerMatch
+#	AllowOverride None
+#	Require all granted
+#</DirectoryMatch>
+#ScriptAliasMatch /webwork2_course_files/([^/]*)/show-source.cgi/(.*) /opt/webwork/courses/$1/html/show-source.cgi/$2
+#ProxyPassMatch /webwork2_course_files/([^/]*)/show-source.cgi/(.*) !
+
+# Note that if $webwork_url in site.conf is changed, then /webwork2
+# should be changed below to match.
+<Proxy /webwork2/*>
+	Require all granted
+</Proxy>
+
+ProxyRequests Off
+ProxyPreserveHost On
+
+ProxyPass /webwork2 http://localhost:8080/webwork2 keepalive=On
+ProxyPassReverse /webwork2 http://localhost:8080/webwork2
+ProxyPass /webwork2/* http://localhost:8080/webwork2/ keepalive=On
+ProxyPassReverse /webwork2/* http://localhost:8080/webwork2/
+
+<Location /webwork2/>
+	RequestHeader set X-Forwarded-Proto "https"
+</Location>
+
+# Note that if $webwork_htdocs_url in site.conf is changed, then /webwork2_files
+# should be changed below to match.
+<Proxy /webwork2_files/*>
+	Require all granted
+</Proxy>
+ProxyRequests Off
+ProxyPass /webwork2_files http://localhost:8080/webwork2_files keepalive=On
+
+# Note that if $pg_htdocs_url in site.conf is changed, then /pg_files
+# should be changed below to match.
+<Proxy /pg_files/*>
+	Require all granted
+</Proxy>
+ProxyRequests Off
+ProxyPass /pg_files http://localhost:8080/pg_files keepalive=On
+
+# Note that if $webwork_courses_url in site.conf is changed, then /pg_files
+# should be changed below to match.
+<Proxy /webwork2_course_files/*>
+	Require all granted
+</Proxy>
+ProxyRequests Off
+ProxyPass /webwork2_course_files http://localhost:8080/webwork2_course_files keepalive=On
diff --git a/conf/webwork2.dist.service b/conf/webwork2.dist.service
new file mode 100644
index 0000000000..be0e0cbd58
--- /dev/null
+++ b/conf/webwork2.dist.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=webwork2
+After=network.target
+
+[Service]
+Type=forking
+User=www-data
+Group=www-data
+RuntimeDirectory=webwork2
+WorkingDirectory=/opt/webwork/webwork2
+PIDFile=/run/webwork2/webwork2.pid
+Environment="MOJO_REVERSE_PROXY=1"
+ExecStart=hypnotoad /opt/webwork/webwork2/bin/webwork2
+ExecReload=hypnotoad /opt/webwork/webwork2/bin/webwork2
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target
diff --git a/conf/webwork2.mojolicious.dist.yml b/conf/webwork2.mojolicious.dist.yml
new file mode 100644
index 0000000000..988d233754
--- /dev/null
+++ b/conf/webwork2.mojolicious.dist.yml
@@ -0,0 +1,207 @@
+---
+secrets:
+  - 607280d0b2c621220b554a1c6ed123aa1a96f2de
+
+# Set to the location of the pg root directory.
+pg_dir: /opt/webwork/pg
+
+# Setting MIN_HTML_ERRORS to 1 will minimize the data provided on HTML error
+# pages, which some security reviews request, as in particular the older output
+# provided backtrace information which could help idenfify the code and version
+# of the code being used on the server.  The useful information will be in the
+# Mojolicious webwork2.log file, with a UID displayed also in the HTML error
+# page to help match up records.
+#
+# Warning: The Mojolicious webwork2.log is available to system administrators
+# but not to users with staff level accounts in the courses, so using the more
+# secure settings requires more cooperation from the system administrators when
+# debugging data is needed.
+MIN_HTML_ERRORS: 0
+
+# Setting JSON_ERROR_LOG to 1 will change the output format in the Mojolicious
+# webwork2.log file to be JSON based, which will make programmatic processing of
+# the error reports easier, but can break the functionality of existing scripts
+# which parse error.log.
+JSON_ERROR_LOG: 0
+
+# Uncomment the line below and change the setting to your desired site in order
+# for the server root location to be redirected to your site.  Note that this
+# will not have effect if hypnotoad is proxied by another server, and the proxy
+# does not forward the server root location.
+#server_root_url_redirect: https://mysite.edu/mypage.html
+
+# Uncomment the line below to use the WebworkSOAP handlers.  Make sure that you
+# change the value to something more secure.  Note that it must consist entirely
+# of digits.
+#soap_authen_key: 123456789123456789
+
+# If a remote site is using this WW server to process WW problems and embed them
+# into web pages, the web browser might not permit the WW problems to be
+# displayed, as it violates security policy to mix content from different
+# origins without an explicit directive from the server that it is safe.
+# Uncomment the extra_headers setting as is to set the header to enable
+# Cross-Origin Resource Sharing (CORS) for url responses to requests to urls
+# that start with /webwork2/render_rpc, /webwork2/html2xml, and /webwork2_files.
+# This may be needed to use the client formats if they are accessed from a
+# *remote* server.
+#
+# Note that the /webwork2/html2xml url is deprecated, and code should be adapted
+# to use the /webwork2/render_rpc path instead.  They both do the same thing
+# that the /webwork2/html2xml endpoint did before, but they no longer pass
+# through the XMLRPC middle man.
+#
+# Additional urls may also be added, and multiple headers may be set per url.
+# The headers will be added to all responses to urls that start with the url
+# given.
+
+#extra_headers:
+#  /webwork2/render_rpc:
+#    Access-Control-Allow-Origin: '*'
+#  /webwork2/html2xml:
+#    Access-Control-Allow-Origin: '*'
+#  /webwork2_files:
+#    Access-Control-Allow-Origin: '*'
+#  /pg_files:
+#    Access-Control-Allow-Origin: '*'
+
+# The user and group to run the server as.  These are only used when the
+# webwork2 app is in production mode and run as the root user.  This means that
+# these settings are not used when proxying via another web server like apache2
+# or nginx.  In that case hypnotoad should directly be run as the correct
+# non-root user.
+server_user: www-data
+server_group: www-data
+
+# Change redirect_http_to_https to 1 to have all http requests redirected to
+# https.  You will also need to add "- http://*:80" as well as "- http://*:443"
+# to the hypnotoad listen values below for this to work.  This should only be
+# used when serving the webwork2 app directly.
+redirect_http_to_https: 0
+
+# hypnotoad server configuration
+# See https://docs.mojolicious.org/Mojo/Server/Daemon
+# Any of the attributes listed there can be set in this section.
+# Make sure to convert the Perl notation there to YAML.
+hypnotoad:
+  listen:
+    - http://*:8080
+    # Below is an example of how to use ssl certificates when serving directly via hypnotoad.
+    #- https://*:443?cert=/etc/ssl/local/fullchain.pem&key=/etc/ssl/local/privkey.pem
+    # Below is an example of how to use ssl certificates when using the docker build.
+    #- https://*:8080?cert=/etc/ssl/local/fullchain.pem&key=/etc/ssl/local/privkey.pem
+
+  # Documentation about the settings being provided below can be found at
+  # https://docs.mojolicious.org/Mojo/Server/Hypnotoad#SETTINGS
+
+  # WeBWorK is essentially all blocking code, so allowing hypnotoad to allow
+  # a worker to accept additional requests when a request is being processed
+  # can cause severe latency/delays when a new request is waiting for a "slow"
+  # request to be completed. Thus, in accordance with the recommendations for
+  # such settings, for example in https://github.com/mojolicious/mojo/wiki/Benchmarking
+  # set clients to 1, and set workers to a larger number.
+
+  # Critical tuning for a production server is to increase workers based on the
+  # system resources available (primarily RAM) and the expected concurrent load.
+  #    workers is the number of hypnotoad processing which are created and
+  #            run at all times to be available to server requests.
+  #    spare is the number of additional workers which can be started as
+  #            replacements for workers which have been signaled to stop
+  #            themselves (gracefully) in order to be replaced by a new worker.
+  # Since spare allows additional workers to be started before old ones have
+  # stopped, the value of workers+spare needs to take into account the
+  # available memory of the system.
+  #
+  # The majority of RAM available for workers should probably be dedicated to
+  # making workers as high as possible, to allow connections from many end
+  # users to be accepted and processed in parallel. However, due to the extensive
+  # amount of time (heartbeat_timeout+graceful_timeout) a worker can remain busy
+  # before being forcefully killed, reserving some RAM to allow a moderate value
+  # of spare is recommended.
+  #
+  # We recommend setting spare to at least 5 on a server with under 8GB of RAM,
+  # and at least 8-10 on a server with over 8GB of RAM. As possible, consider
+  # increasing spare to about 10% of the value of workers on your server, should that
+  # be larger than the setting suggested above.
+  #
+  # Recommendations for tuning of workers and spare based on RAM available:
+  #    Consider using 10-12 workers and one spare for each GB of RAM
+  #    (after setting aside 2-4 GB of RAM for the OS and all other software needed).
+  # On a machine with less than 8GB of RAM, decrease workers and raise spare to make
+  # sure that spare is at least 5.
+  # These are provisional recommendations based on some testing, but without
+  # experience with the Mojolicious webwork system in a production environment.
+  #
+  # It is recommended to monitor memory usage under load to determine what further
+  # tuning of the settings may be appropriate.
+
+  clients: 1
+  workers: 25
+  spare: 8
+
+  # WeBWorK apparently has some memory leaks which lead to workers using up more memory
+  # over time as additional requests are processed.
+  # Requests which process many problem renders in a single call will
+  # trigger faster accumulation of "lost memory". The "accepts" parameter
+  # should be kept relatively low to avoid the "lost memory" from causing
+  # significant problems.
+  accepts: 100
+
+  # Keep-alive related settings. These limit how long an inactive connection
+  # (one with no active request) can remain open, and how many requests (ex.
+  # for additional files) can be sent over the same connection.
+  # In order to prevent a worker from being kept waiting for additional requests
+  # from a browser which in not active, keep_alive_timeout is set relatively low,
+  # but an attempt is made to allow a bit of time before connections will be
+  # closed, to reduce the need for a new connection to be opened if a user
+  # is actively navigating on the site.
+  # To allow all dependencies of a WeBWorK page to be served over a single
+  # connection the value of requests was set to 50.
+  keep_alive_timeout: 15
+  requests: 50
+
+  # The graceful_timeout determines how long hypnotoad will wait before hard
+  # killing a worker which was marked as failing to send heartbeats due to
+  # failing or having "blocked" while doing a very slow operation.
+  # After the graceful_timeout passes, the worker will be killed and whatever
+  # it was doing will get stopped without completing. Potentially, this could
+  # cause inconsistencies in the database or other less than ideal outcomes.
+  # Try to set to provide enough spare time to avoid such problems!
+  graceful_timeout: 120
+
+  # The following timeout settings will be sufficient in most cases.  However, if you have large class sizes they may
+  # not be enough.  If you are seeing long requests fail then increase these.  This may happen, for example, if you have
+  # a class with thousands of users and try to assign a set to all users.  In that case you may need much larger values.
+  # Note that if you are serving via a proxy, you may also need to increase the timeouts for the proxy server.
+  inactivity_timeout: 60
+  heartbeat_timeout: 60
+
+  # Make sure that the user the server is being run as has access to this file.
+  pid_file: /run/webwork2/webwork2.pid
+
+  # Comment out the line below if serving directly.
+  proxy: 1
+
+# The remainder of the settings in this file are primarily for developers,
+# and you usually do not need to change anything below here.
+
+debug:
+  # If set to 1, WeBWorK::Debug will print extensive debugging output.
+  enabled: 0
+
+  # If set, debugging output will be sent to the file named rather than STDERR.
+  # Note that the server must have write access to this file's location.
+  #logfile: /opt/webwork/webwork2/logs/debug.log
+
+  # Prevent subroutines matching the given regular expression from logging.
+  # For example to remove all messages from subroutines in a WeBWorK::Authen
+  # module uncomment the following example.
+  #deny_subroutine_output: ^WeBWorK::Authen::.*$
+
+  # Allow only subroutines matching the following regular expression to log.
+  # For example to only allow messages from subroutines in a WeBWorK::Authen
+  # module uncomment the following example.
+  #allow_subroutine_output: ^WeBWorK::Authen::.*$
+
+hardcopy:
+  # If 1, don't delete temporary files created when a hardcopy is generated.
+  preserve_temp_files: 0
diff --git a/conf/webwork2.nginx.dist.conf b/conf/webwork2.nginx.dist.conf
new file mode 100644
index 0000000000..f546af7ed2
--- /dev/null
+++ b/conf/webwork2.nginx.dist.conf
@@ -0,0 +1,29 @@
+# Note that if $webwork_url in site.conf is changed, then /webwork2
+# should be changed below to match.
+location /webwork2/ {
+	proxy_pass http://127.0.0.1:8080;
+	proxy_http_version 1.1;
+	proxy_set_header Upgrade $http_upgrade;
+	proxy_set_header Connection "upgrade";
+	proxy_set_header Host $host;
+	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+	proxy_set_header X-Forwarded-Proto $scheme;
+}
+
+# Note that if $webwork_htdocs_url in site.conf is changed, then /webwork2_files
+# should be changed below to match.
+location /webwork2_files/ {
+	proxy_pass http://127.0.0.1:8080;
+}
+
+# Note that if $pg_htdocs_url in site.conf is changed, then /pg_files
+# should be changed below to match.
+location /pg_files/ {
+	proxy_pass http://127.0.0.1:8080;
+}
+
+# Note that if $webwork_courses_url in site.conf is changed, then /pg_files
+# should be changed below to match.
+location /webwork2_course_files/ {
+	proxy_pass http://127.0.0.1:8080;
+}
diff --git a/courses.dist/modelCourse/course.conf b/courses.dist/modelCourse/course.conf
index df702e9aa3..fb80c242a5 100644
--- a/courses.dist/modelCourse/course.conf
+++ b/courses.dist/modelCourse/course.conf
@@ -1,102 +1,39 @@
 #!perl
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
 
-# This file is used to override the global WeBWorK course environment for
-# requests to this course. All package variables set in this file are added to
-# the course environment. If you wish to set a variable here but omit it from
-# the course environment,  use the "my" keyword. Commonly changed configuration
-# options are noted below.
+# This file is used to override the global WeBWorK course environment for this course.
 
 # Database Layout (global value typically defined in global.conf)
-# 
 # Several database are defined in the file conf/database.conf and stored in the
 # hash %dbLayouts.
-# 
 # The database layout is always set here, since one should be able to change the
 # default value in global.conf without disrupting existing courses.
-# 
 # global.conf values:
 # 	$dbLayoutName = 'sql_single';
 # 	*dbLayout = $dbLayouts{$dbLayoutName};
-
 $dbLayoutName = 'sql_single';
 *dbLayout = $dbLayouts{$dbLayoutName};
 
-# Allowed Mail Recipients (global value typically not defined)
-#
-# Defines addresses to which the PG system is allowed to send mail. This should
-# probably be set to the addresses of professors of this course. Sending mail
-# from the PG system (i.e. questionaires, essay questions) will fail if this is
-# not set.
-#
-# $mail{allowedRecipients} = ['email@address.here'];
-
-
-# Feedback Mail Recipients (global value typically not defined)
-#
-# Defines recipients for feedback mail. If not defined, mail is sent to all
-# instructors and TAs.
-#
-# $mail{feedbackRecipients} = ['email@address.here'];
-
-
-
 # Users for whom to label problems with the PG file name
-# 
 # For users in this list, PG will display the source file name when rendering a problem.
-# 
-# $pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} = ['user_id1'];
+#$pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} = ['user_id1'];
 
 # The following hashes control which users are allowed to see students from which
-# sections.  This is typically  used for large multi-section classes with many students, ta's and
+# sections.  This is typically used for large multi-section classes with many students, ta's and
 # professors.  When set users will only be allowed to see students from the appropriate section in the following:
-# -  Instructor Tools
-# -  Student Progress
-# -  Email
-# -  Problem Grader
-# -  Show Answers
-# They will be able to see students from other sections on other pages.  
+# - Instructor Tools
+# - Student Progress
+# - Email
+# - Problem Grader
+# - Show Answers
+# They will be able to see students from other sections on other pages.
 # These variables generally should be set here and not in defaults.conf.
-
-# $viewable_sections = { user_id1 => [1 ,2 ,3] , # list of viewable sections for user_id1
-#		       user_id2 => [1],
-#		     };
-
-# $viewable_recitations = { user_id1 => [1 ,2 ,3] , # list of viewable recitations for user_id1
-#			  user_id2 => [1],
-#		     };
-
-
-# controls if the Tagging features are displayed.  This is mainly used by library editors
-# $permissionLevels{modify_tags} = "professor";
-
-# Settings to connect this course to Canvas via  LTI.
-# $LTIGradeOnSubmit = 1;
-# $debug_lti_parameters = 1;
-# $LTIBasicConsumerSecret = "xxxxxxxxx";
-# $LTIGradeMode = "homework";
-
-# For achievements you may set the preamble.at file as described at
-# https://webwork.maa.org/moodle/mod/forum/discuss.php?d=4209 to exclude
-# certain sets or questions from achievement system.  However, these
-# questions still count to the score used to determine the level.  The
-# variable $achievementExcludeSet allows to exclude certain set completely
-# from the achievement system and these questions do not count to the level.
-# Remember that the names of the sets do not contain spaces.
-#
-# $achievementExcludeSet = ["00_Introduction","99_Summary","Sample_exam"];
+#$viewable_sections = {
+#    user_id1 => [1, 2, 3], # list of viewable sections for user_id1
+#    user_id2 => [1],
+#};
+#$viewable_recitations = {
+#    user_id1 => [1, 2, 3], # list of viewable recitations for user_id1
+#    user_id2 => [1],
+#};
 
 1;
diff --git a/courses.dist/modelCourse/templates/ASimpleCombinedHeaderFile.pg b/courses.dist/modelCourse/templates/ASimpleCombinedHeaderFile.pg
deleted file mode 100644
index a617eb63f6..0000000000
--- a/courses.dist/modelCourse/templates/ASimpleCombinedHeaderFile.pg
+++ /dev/null
@@ -1,90 +0,0 @@
-# ASimpleCombinedHeaderFile.pg
-# This header file can be used for both the screen and hardcopy output
-
-
-DOCUMENT();
-
-loadMacros(
-	"PG.pl",
-	"PGbasicmacros.pl",
-	# "source.pl",
-	"PGcourse.pl",
-	"PGML.pl"
-);
-
-TEXT($BEGIN_ONE_COLUMN);
-
-####################################################
-#
-# The item below printed out only when a hardcopy is made.
-#
-####################################################
-
-
-
-TEXT(MODES(TeX =>EV3(<<'EOT'),HTML=>""));
-
-\noindent {\large \bf $studentName}
-\hfill
-{\large \bf {\{protect_underbar($courseName)\}}}
-% Uncomment the line below if this course has sections. Note that this is a comment in TeX mode since this is only processed by LaTeX
-%   {\large \bf { Section: \{protect_underbar($sectionName)\} } }
-\par
-\noindent{\large \bf {Assignment \{protect_underbar($setNumber)\}  closes $formatedDueDate}}
-\par\noindent
-% Uncomment and edit the line below if this course has a web page. Note that this is a comment in TeX mode.
-%See the course web page for information http://yoururl/yourcourse
-
-EOT
-
-####################################################
-#
-# End of hardcopy only output.
-#
-####################################################
-
-
-####################################################
-#
-# The items below are printed out only when set is displayed on screen
-# 
-####################################################
-TEXT(MODES(TeX =>"",HTML=>EV3(<<'EOT')));
-
-$BBOLD WeBWorK  Assignment \{ protect_underbar($setNumber) \}  closes :  $formattedDueDate. $EBOLD
-$PAR
-Here's the list of 
-\{ htmlLink(qq!http://webwork.maa.org/wiki/Available_Functions!,"functions and symbols") \}
- which WeBWorK understands.
-$BR
-EOT
-
-####################################################
-# Uncomment and edit the lines below if this course has a web page. Note that this is comment in Perl mode. 
-# IMPORTANT: Make sure the EOT at the bottom is at the beginning of a line with no spaces preceeding it.
-#TEXT(MODES(TeX =>"",HTML=>EV3(<<'EOT')));
-#See the course web page for information \{ htmlLink(qq!http://yoururl/yourcourse!,"your course name") \}
-#EOT
-####################################################
-
-####################################################
-#
-# End of screen only output.
-#
-####################################################
-
-####################################################
-#
-# Anything between the BEGIN_TEXT AND END_TEXT lines
-# will be printed in both screen and hardcopy output
-#
-####################################################
-
-BEGIN_PGML
-
-END_PGML
-
-
-TEXT($END_ONE_COLUMN);
-
-ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/ASimpleHardCopyHeaderFile.pg b/courses.dist/modelCourse/templates/ASimpleHardCopyHeaderFile.pg
deleted file mode 100644
index ccb3a93d21..0000000000
--- a/courses.dist/modelCourse/templates/ASimpleHardCopyHeaderFile.pg
+++ /dev/null
@@ -1,36 +0,0 @@
-# ASimpleHardCopyHeaderFile.pg
-# This file can be used as a simple Hard Copy Header file which is processed by LaTeX. 
-# Do not use it as a Screen Header file which is processed by html
-
-
-DOCUMENT();
-
-loadMacros(
-"PG.pl",
-"PGbasicmacros.pl",
-
-);
-
-
-BEGIN_TEXT
-$BEGIN_ONE_COLUMN
-\noindent {\large \bf $studentName}
-\hfill
-{\large \bf {\{protect_underbar($courseName)\}}}
-% Uncomment the line below if this course has sections. Note that this is a comment in TeX mode since this is only processed by LaTeX
-%   {\large \bf { Section: \{protect_underbar($sectionName)\} } }
-\par
-\noindent{\large \bf {Assignment \{protect_underbar($setNumber)\}  closes $formatedDueDate}}
-\par\noindent
-% Uncomment and edit the line below if this course has a web page. Note that this is a comment in TeX mode.
-% See the course web page for information http://yoururl/yourcourse
-
-
-$END_ONE_COLUMN
-END_TEXT
-
-ENDDOCUMENT();
-
-
-
-
diff --git a/courses.dist/modelCourse/templates/ASimpleScreenHeaderFile.pg b/courses.dist/modelCourse/templates/ASimpleScreenHeaderFile.pg
deleted file mode 100644
index 8e8178f4d1..0000000000
--- a/courses.dist/modelCourse/templates/ASimpleScreenHeaderFile.pg
+++ /dev/null
@@ -1,27 +0,0 @@
-##ASimpleScreenHeaderFile.pg
-
-DOCUMENT();
-
-loadMacros(
-"PG.pl",
-"PGbasicmacros.pl",
-
-);
-
-BEGIN_TEXT
-$BBOLD WeBWorK  Assignment \{ protect_underbar($setNumber) \}  closes :  $formattedDueDate. $EBOLD
-$PAR
-Here's the list of 
-\{ htmlLink(qq!http://webwork.maa.org/wiki/Available_Functions!,"functions and symbols") \}
- that WeBWorK understands.
-END_TEXT
-
-
-# Uncomment and edit the lines below if this course has a web page. Note that this is comment in Perl mode.
-#BEGIN_TEXT
-#$PAR 
-#See the course web page for information \{ htmlLink(qq!http://yoururl/yourcourse!,"your course name") \}
-#END_TEXT
-
-ENDDOCUMENT();
-
diff --git a/courses.dist/modelCourse/templates/PGMLLab/PGML-lab.pg b/courses.dist/modelCourse/templates/PGMLLab/PGML-lab.pg
new file mode 100644
index 0000000000..7e20ce46ed
--- /dev/null
+++ b/courses.dist/modelCourse/templates/PGMLLab/PGML-lab.pg
@@ -0,0 +1,716 @@
+DOCUMENT();
+
+loadMacros('PGstandard.pl', 'PGML.pl', 'parserMultiAnswer.pl', 'PGcourse.pl');
+
+# Hide the score summary and show past answers and email instructor buttons.
+HEADER_TEXT(MODES(
+	HTML => tag('style', '.problemFooter, #score_summary {display: none}'),
+	TeX  => ''
+));
+
+sub EscapeHTML {
+	my $s = shift;
+	$s =~ s/&/~~&amp;/g;
+	$s =~ s/</~~&lt;/g;
+	$s =~ s/>/~~&gt;/g;
+	$s =~ s/"/~~&quot;/g;
+	return $s;
+}
+
+# Make a reference menu
+sub Menu {
+	return tag(
+		'select',
+		aria_labelledby => 'reference-label',
+		style           => 'width:15em',
+		join('', map { tag('option', $_) } @_)
+	);
+}
+
+# Make an example menu
+sub Examples {
+	my ($title, @examples) = @_;
+
+	return tag(
+		'select',
+		class           => 'example-selector',
+		id              => $title,
+		aria_labelledby => 'examples-label',
+		style           => 'width:15em',
+		tag('option', value => '', $title) . join(
+			'',
+			map {
+				tag(
+					'option',
+					value     => $_->[0],
+					data_vars => EscapeHTML($_->[1][0]),
+					data_pgml => EscapeHTML($_->[1][1]),
+					$_->[0]
+				)
+			} @examples
+		)
+	);
+}
+
+TEXT(MODES(
+	HTML => tag('div', style => 'text-align:center', tag('b', 'Interactive PGML Lab:')),
+	TeX  => $BCENTER . $BBOLD . 'Interactive PGML Lab:' . $EBOLD . $ECENTER
+));
+
+$vars   = $inputs_ref->{vars} // '';
+$pgml   = ($inputs_ref->{pgml} // '') =~ s/~~r?~~n/~~n/gr;
+$result = '';
+
+if ($vars ne '') {
+	($vresult, $verror) = PG_restricted_eval($vars);
+	if ($verror) {
+		$verror =~ s/ at ~~(eval ~~d+~~) line ~~d+(, at EOF)?//;
+		$verror = EscapeHTML($verror);
+		$verror =~ s/~~n/<br>/g;
+		$verror = tag('span', style => 'color:#c00', 'Error processing variables: ' . tag('i', $verror));
+	}
+} else {
+	$vars = '';
+}
+
+if ($pgml ne '') {
+	$PGML::warningsFatal = 1;
+	($result, $error) = PG_restricted_eval('PGML::Format($pgml)');
+	if ($error) {
+		$result = $error;
+		$result =~ s/ at ~~(eval ~~d+~~) line ~~d+//;
+		$result = EscapeHTML($result);
+		$result =~ s/~~n/<br>/g;
+		$result = tag('span', style => 'color:#c00', $result);
+	}
+	warn join('', @PGML::warnings) . "~~n" if scalar(@PGML::warnings);
+	if ($inputs_ref->{showTeX}) {
+		$oldDisplay  = $displayMode;
+		$displayMode = 'TeX';
+
+		# The variables need to be processed again before processing the problem.  This redefines all of the variables
+		# as new objects.  If this is not done, then errors occur for many of the examples with MathObjects because the
+		# the problem has already been processed above.  Ignore the errors this time.  Those have already been caught
+		# above.
+		PG_restricted_eval($vars) if $vars ne '';
+
+		($tex, $error) = PG_restricted_eval('PGML::Format($pgml)');
+		if ($error) {
+			$result = $error;
+			$result =~ s/ at ~~(eval ~~d+~~) line ~~d+//;
+			$result = EscapeHTML($result);
+			$result =~ s/~~n/<br>/g;
+			$result = tag('span', style => 'color:#c00', 'TeX Error: ' . tag('i', $result));
+		}
+		$displayMode = $oldDisplay;
+	}
+	$pgml  = EscapeHTML($pgml);
+} else {
+	$pgml = '';
+}
+
+$prows = scalar(split(/~~n/, $pgml));
+$prows = 8 unless $prows >= 8;
+$vrows = scalar(split(/~~n/, $vars));
+$vrows = 2 unless $vrows >= 2;
+
+RECORD_FORM_LABEL('vars');
+RECORD_FORM_LABEL('pgml');
+RECORD_FORM_LABEL('showHTML');
+RECORD_FORM_LABEL('showTeX');
+
+TEXT(MODES(HTML => '<div id="resultsBox">', TeX => ''));
+TEXT($HR . $verror . $HR) if $verror;
+TEXT(MODES(
+	HTML => tag(
+		'div',
+		style => 'margin:1rem auto;width:fit-content;padding:1rem;'
+			. 'border:1px solid black;border-radius:4px;background-color:#e8e8e8;',
+		$result
+	),
+	TeX => $result
+))
+	if defined $result && $result ne '';
+
+if ($inputs_ref->{showHTML}) {
+	$result = EscapeHTML($result);
+	$result =~ s!~~n!<br>!g;
+	TEXT(tag('hr') . tag('small', tag('pre', $result)) . tag('hr'));
+}
+if ($inputs_ref->{showTeX}) {
+	$tex = EscapeHTML($tex);
+	$tex =~ s!~~n!<br>!g;
+	TEXT(tag('hr') . tag('small', tag('pre', $tex)) . tag('hr'));
+}
+TEXT(MODES(HTML => '</div>', TeX => ''));
+
+TEXT(MODES(
+	HTML => tag(
+		'div',
+		style => 'width:fit-content;max-width:100%;text-align:left;margin:auto',
+		tag('label', for => 'vars', tag('small', tag('i', style => 'color:#555', 'Variable definitions:')))
+			. tag('textarea', name => 'vars', id => 'vars', rows => $vrows, cols => 60, style => 'display:block', $vars)
+			. tag('label',    for  => 'pgml', tag('small', tag('i', style => 'color:#555', 'Text of problem:')))
+			. tag('textarea', name => 'pgml', id => 'pgml', rows => $prows, cols => 60, style => 'display:block', $pgml)
+			. tag(
+				'div',
+				style => 'margin-top:0.25rem;display:flex;justify-content:space-between;align-items:center',
+				tag(
+					'div',
+					tag(
+						'div',
+						tag(
+							'label',
+							tag(
+								'input',
+								type  => 'checkbox',
+								name  => 'showHTML',
+								value => 1,
+								$inputs_ref->{showHTML} ? (checked => undef) : ()
+							)
+							. ' Show HTML code '
+						)
+					)
+					. tag(
+						'div',
+						tag(
+							'label',
+							tag(
+								'input',
+								type  => 'checkbox',
+								name  => 'showTeX',
+								value => 1,
+								$inputs_ref->{showTeX} ? (checked => undef) : ()
+							)
+							. ' Show TeX code'
+						)
+					)
+				)
+				. tag('div', tag('input', type => 'submit', name => 'action', value => 'Process this Text'))
+			)
+	),
+	TeX => "Variable definitions:$BR"
+		. qq!\hbox to .8\hsize{\hrulefill}$BR!
+		. "Text of problem:$BR"
+		. qq!\hbox to .8\hsize{\hrulefill}$BR$SPACE!
+		. "Show HTML code$BR$SPACE"
+		. "Show TeX code$BR"
+		. '[Process this Text]'
+));
+
+if ($displayMode ne 'TeX') {
+	$SP = "&#x2423;";
+	TEXT(tag('script', << 'END_SCRIPT'));
+window.addEventListener('DOMContentLoaded', () => {
+	const unescapeHTML = (html) => {
+		return html
+			.replace(/&gt;/g, '>')
+			.replace(/&lt;/g, '<')
+			.replace(/&amp;/g, '&')
+			.replace(/&quot;/g, '"')
+			.replace(/\n/g, '~~n')
+			.replace(/\\/g, '\');
+	};
+	for (const select of document.querySelectorAll('.example-selector')) {
+		select.addEventListener('change', () => {
+			if (select.value === '') return;
+			const selectedExample = select.options[select.selectedIndex];
+			const dataType = { vars: 2, pgml: 8 };
+			for (const id in dataType) {
+				const el = document.getElementById(id);
+				el.value = unescapeHTML(selectedExample.dataset[id]);
+				el.rows = Math.max(dataType[id], selectedExample.dataset[id].split(/\n/).length);
+			}
+			document.getElementById('resultsBox').style.display = 'none';
+			window.scrollTo(0, 0);
+		});
+	}
+});
+END_SCRIPT
+
+	TEXT(tag(
+		'div',
+		style => 'margin:1rem auto 0;width:fit-content;'
+			. 'display:flex;justify-content:space-between;align-items:flex-start;flex-wrap:wrap;gap:1rem;',
+		tag(
+			'fieldset',
+			style => 'border:1px solid #5555;border-radius:4px;padding:1rem;'
+				. 'display:flex;flex-direction:column;gap:0.25rem',
+			join(
+				'',
+				tag('legend', id => 'examples-label', style => 'font-size:20px', 'Examples:'),
+				Examples(
+					'Math',
+					[
+						'TeX math' => [
+							'',
+							'In-line math: [`\\frac{x+1}{x-1}`], display math: [``\\frac{x+1}{x-1}``]'
+								. "\n\n"
+								. '    [``\\frac{x+1}{x-1}``] (indented)'
+								. "\n\n"
+								. '>>[``\\frac{x+1}{x-1}``] (centered)<<'
+						]
+					],
+					[
+						'Parsed math' => [
+							'',
+							'In-line math: [:(x+1)/(x-1):], display math: [::(x+1)/(x-1)::]'
+								. "\n\n"
+								. '    [::(x+1)/(x-1)::] (indented)'
+								. "\n\n"
+								. '>>[::(x+1)/(x-1)::] (centered)<<'
+						]
+					],
+					[
+						'Specify context' => [
+							'$context = Context("Vector");',
+							'Use vector context: [:<1,2x>:]{"Vector"}  '
+								. "\n"
+								. 'Use context object: [:<1,2x>:]{$context}  '
+								. "\n"
+								. 'Use current context: [:<1,2x>:]*'
+						]
+					],
+				),
+				Examples(
+					'Answers',
+					[ Numeric => [ '', 'The number twelve is [_______]{12}' ] ],
+					[ Formula => [ '', 'The formula is [__________]{"1+x"}' ] ],
+					[
+						'From variable' => [
+							'$f=Formula("1+x^2"); $Df = $f->D;',
+							q!Suppose [`f(x) = [$f]`].  Then [`f'(x) =`] [____________]{$Df}!
+						]
+					],
+					[ MathObject     => [ '', 'Twelve is [______]{Real(12)}' ] ],
+					[ 'MathObject 2' => [ '', '2 mod 10 is [______]{Real(2)->with(period=>10)}' ] ],
+					[
+						'MathObject 3' =>
+							[ '$f = Formula("sqrt(x^2-1)")->with(limits=>[1,2]);', 'The answer is: [_____]{$f}' ]
+					],
+					[ Traditional => [ '', 'Twelve is [______]{num_cmp(12)}' ] ],
+					[
+						'Checker Options' =>
+							[ '', '[::Int(x,2x)::] = [________]{Formula("x^2")->cmp(upToConstant=>1)} [`+C`]' ]
+					],
+					[
+						'Checker Options 1' => [
+							'$cmp = Formula("x^2")->cmp(upToConstant=>1);',
+							'[::Int(x,2x)::] = [________]{$cmp} [`+C`]'
+						]
+					],
+					[ 'Answer Array' => [ '$M = Matrix([1,2],[3,4])', '[`[$M] =`] [___]*{$M}' ] ],
+					[
+						'MultiAnswer' => [
+							'$mp = MultiAnswer(12,6)->with(checker=>sub {1}, singleResult=>1)',
+							'[_____]{$mp} and [_____]{$mp}'
+						]
+					],
+					[ 'Option Form' => [ '', 'The number 12 is [____]{answer=>12,width=>10}' ] ],
+					[
+						'External ANS' => [
+							'Context("Vector"); ANS(Vector(1,2,3)->cmp(showCoodinateHints=>0));',
+							"[:<1,2,3>:]* = [__________]"
+						]
+					],
+				),
+				Examples(
+					'Lists',
+					[
+						Numeric => [
+							'',
+							"Here is a list:\n"
+								. "1.  This is the first list item\n"
+								. "    continued on the next line.\n"
+								. "2.  Additional items are easy to add.\n"
+								. "3.  Continuation need not be indented,\n"
+								. "such as this line.\n\n"
+								. "A paragraph break ends the list...\n"
+								. "1.  Unless you indent the paragraph...\n\n"
+								. "    ...in which case it is part of the list item.\n"
+								. "2.  See?"
+						]
+					],
+					[
+						Alphabetic => [
+							'',
+							"A list with alphabetic markers:\n"
+								. "a)  You can use dots\n"
+								. "b)  or parens to indicate the items\n\n"
+								. "A paragraph break ends the list.\n\n"
+								. "A list with roman numeral markers:\n"
+								. "i.  Item 1\n"
+								. "ii. Item 2   \n"
+								. "Ending with three spaces also ends the list"
+						]
+					],
+					[
+						'Bullet lists' => [
+							'',
+							"A list can be with stars:\n"
+								. "* Item 1\n"
+								. "* Item 1\n\n"
+								. "Or with plus or minus:\n"
+								. "+ Item 1\n"
+								. "+ Item 2\n\n"
+								. "Paragraphs can be used between items:\n\n"
+								. "o Item 1\n\n"
+								. "o Item 2\n\n"
+								. "End of lists."
+						]
+					],
+					[
+						'Sub-lists' => [
+							'',
+							"1.  A list\n"
+								. "    -  with a sub-list\n"
+								. "    -  of three items\n"
+								. "    -  (indent the sub list)\n"
+								. "2.  Back to the main list\n"
+						]
+					],
+				),
+				Examples(
+					'Substitutions',
+					[
+						Variables => [
+							'$a = 1; $f = Formula("(x+1)/(x-1)");',
+							'a = [$a], f = [$f].  In math: [`f = [$f]`] (TeX inserted automatically),' . "\n"
+								. 'parsed: [:f = [$f]:] (string inserted automatically).'
+						]
+					],
+					[ Commands => [ 'sub F {return (shift)+1}; $x = 5;', 'Add one to five: [@ F($x) @]' ] ],
+					[
+						Comments => [
+							'',
+							"This [% text %] is removed.  \n"
+								. "So are these [% partial [@ and incomplete %] commands.  \n"
+								. "Comments can be nested: [% one [% and two %] and three %]\n"
+						]
+					],
+					[
+						'No Escape' => [
+							'$x = "has math: [:x+1:] and ${BBOLD}bold${EBOLD}";',
+							"Contents of substitutions will be escaped, unless\n"
+								. "followed by a star:  \n"
+								. 'Escaped: [$BSMALL] not small [$ESMALL]  ' . "\n"
+								. 'Verbatim: [$BSMALL]* small [$ESMALL]*'
+								. "\n\n"
+								. "Two stars forces the contents to be processed further:  \n"
+								. 'Escaped: [$x]  ' . "\n"
+								. 'Verbatim: [$x]*  ' . "\n"
+								. 'Processed: [$x]**' . "\n"
+						]
+					],
+				),
+				Examples(
+					'Formatting',
+					[
+						'Line breaks' => [
+							'',
+							"Force line break by  \n"
+								. "ending a line with two spaces\n\n"
+								. "## even in a header ##  \n"
+								. "## that runs over two lines ##\n"
+						]
+					],
+					[
+						'Par break' => [
+							'',
+							'A blank line is a paragraph break\n    \nEven if it just contains white space\n'
+						]
+					],
+					[
+						Indentation => [
+							'',
+							"Indent a section by using four spaces or a tab\n"
+								. "    This is indented,\n"
+								. "    and continues on a second line.\n"
+								. "        Another four spaces indents again.\n"
+								. "    Go back to four to end the inner indenting.\n"
+								. "Note, however, that you only need to indent\n"
+								. "the first line of a paragraph to have all of it\n"
+								. "be indented.  (That may need to be changed.)\n\n"
+								. "End the paragraph to go back to no indenting\n"
+								. "    or use _three_ spaces to end the line   \n"
+								. "and that will end the indenting"
+						]
+					],
+					[
+						Centering => [
+							'',
+							"Use angle brackets to center a phrase:\n\n"
+								. ">> This is centered <<\n\n"
+								. "You can center several lines as a paragraph:\n"
+								. ">> These lines will <<\n"
+								. ">> be combined <<\n\n"
+								. "Or you can force line breaks with two spaced at the end:\n"
+								. ">> These lines will <<  \n"
+								. ">> be centered separately <<\n\n"
+								. "A whole paragraph can be centered:\n"
+								. ">> This is a paragraph\n"
+								. "that will be centered <<\n"
+						]
+					],
+					[
+						'Right justify' => [
+							'',
+							"Use right angle brackets to force a line or paragraph\n"
+								. "to be right-justified:\n"
+								. ">> At the right\n\n"
+								. ">> Several lines combined\n"
+								. ">> right justfied\n\n"
+								. ">> Or a whole paragaph\n"
+								. "that is pushed to the right\n\n"
+								. ">> Or two lines  \n"
+								. ">> justified separately."
+						]
+					],
+					[
+						Headings => [
+							'',
+							"# Heading size 1 #\n"
+								. "## Heading size 2 ##\n"
+								. "### Heading size 3 ###\n"
+								. "#### Heading size 4 ####\n"
+								. "##### Heading size 5 #####\n"
+								. "###### Heading size 6 ######\n\n"
+								. "### Two separate lines ###\n"
+								. "### are combined ###\n\n"
+								. "### A whole paragraph\n"
+								. "can be a heading ###\n\n"
+								. "### End with two spaces ###  \n"
+								. "### for two lines separately ###\n\n"
+								. "### The trailing hashes are optional.\n\n"
+								. ">> ## centered heading ## <<\n"
+								. ">> ## right-justified ##"
+						]
+					],
+					[
+						Rules => [
+							'',
+							"Three or more dashes or equals on a line by itself forms a rule\n\n"
+								. "-----\n"
+								. "You can specify the width and size if you want:\n"
+								. "----{200}\n----{'50%'}\n===={200}{5}\n===={size=>5}\n\n"
+								. "You can center and right-justify rules:\n>> ----{100} <<\n>> ----{100}\n"
+						]
+					],
+					[
+						Emphasis => [
+							'',
+							"These words are in *bold* or _italic_.\n\n"
+								. "Stars can be used in*side* a word,\n"
+								. "but underlines_don't_work_that_way."
+						]
+					],
+					[
+						'Smart Quotes' => [
+							'',
+							"Quotes are ~~"smart~~" (~~"even here~~"), and don't forget about 'other' quotes.\n\n"
+								. "You can quote a quote: ~~\\"dumb quotes~~\\"."
+						]
+					],
+					[
+						Preformatted => [
+							'',
+							"Preformatted text starts with a colon and three spaces:\n"
+								. ":   This is preformatted,\n"
+								. ":       and can include any text, e.g., <, >, ~~$, etc.,\n"
+								. ":       but [@ ~~"commands~~" @] and other *mark up* are performed normally.\n"
+								. ":   Use [|verbatim mode|] if you want to include commands literally,\n"
+								. ":   or use a slash to escape them:  \\[~~$x].\n\n"
+								. "The formatting can be indented, too:\n"
+								. "    Here is some indenting\n"
+								. "    :   with preformatting\n"
+								. "    :   on several lines.\n"
+								. "    Now back to normal, but indented.\n"
+						]
+					],
+					[
+						Verbatim => [
+							'',
+							"Text that includes commands can be enclosed\n"
+								. "to prevent interpretation:  \n"
+								. "[|This is not math [`x+1`] in here.|]\n\n"
+								. "You can use more vertical bars to make verbatim verbatims:  \n"
+								. "[||This is [|verbatim|].||]\n\n"
+								. "Use backslashes to escape command characters if you need to:  \n"
+								. "This occurred in the year\n"
+								. "1\\.  (Prevent accidental list).\n\n"
+								. "Don't do comment: \\[% you will see this %]."
+						]
+					],
+					[
+						'Other Chars' =>
+							[ '', 'Other characters quote themselves on their own: <, >, &, %, $, ^, etc.' ]
+					],
+				),
+				Examples(
+					'Problems',
+					[
+						Algebra => [
+							'Context("Interval"); $a = random(1,8,1); $b = random(8,15,1); $min = $a-$b; $max = $a+$b;',
+							"Solve the following inequality and enter your answer using interval notation:\n\n"
+								. '    [``|x-[$a]| > [$b]``]'
+								. "\n\n"
+								. 'Answer: [`x`] must be in [____________________________]{"(-inf,$min)U($max,inf)"}'
+						]
+					],
+					[
+						Composition => [
+							'$b=non_zero_random(-3,1,1)+1; # b=1 makes answers equal' . "\n"
+								. '$f = Formula("x+$b"); $g = Formula("(x-2)^2");' . "\n"
+								. '$F = "$f for x in [-1,5] using color:blue and weight:2";' . "\n"
+								. '$G = "$g for x in [0,4] using color:red and weight:2";'
+								. "\n\n"
+								. 'loadMacros("PGgraphmacros.pl");' . "\n"
+								. '$graph = init_graph(-2,-4,6,8,axes=>[0,0],grid=>[8,12],size=>[200,200]);' . "\n"
+								. 'plot_functions($graph,$F,$G);' . "\n"
+								. '$lf = new Label (5.3,$f->eval(x=>5)+.3,"f","blue","left","bottom");' . "\n"
+								. '$lg = new Label (.3,$g->eval(x=>0)+.3,"g","red","left","bottom");' . "\n"
+								. '$graph->lb($lf,$lg);',
+							"Let [`f`] be the linear function (in blue) and let [`g`] be the\n"
+								. "parabolic function (in red) below.\n\n"
+								. '    [@ image(insertGraph($graph),' . "\n"
+								. '             width=>200,height=>200,tex_size=>480) @]*'
+								. "\n\n"
+								. '    1.  [:(f o g)(2):] = [____]{$b}' . "\n"
+								. '    2.  [:(g o f)(2):] = [____]{$b**2}' . "\n"
+								. '    3.  [:(f o f)(2):] = [____]{2+2*$b}' . "\n"
+								. '    4.  [:(g o g)(2):] = [____]{4}'
+								. "\n\n"
+						]
+					],
+					[
+						Derivative => [
+							'$aa = random(3,8,1);' . "\n"
+								. '$f = Formula("atan(sqrt(${aa}x^2-1))");' . "\n"
+								. '$Df = $f->D->with(limits=>[1/sqrt($aa),1]);',
+							q!Let [`f(x) = [$f]`]. Find [`f'(x)`].!
+								. "\n\n"
+								. q![`f'(x)`] = [____________________________________]{$Df}!
+						]
+					],
+					[
+						Logarithm => [
+							'$a = random(3,5,1); $b = random(2,20,1); $c = random(2,20,1);',
+							'Use the laws of logarithms to rewrite the expression'
+								. "\n\n"
+								. '    [::ln(root [$a] of xy)::]'
+								. "\n\n"
+								. 'in a form that does not contain any logarithm of a product,' . "\n"
+								. 'quotient or power.'
+								. "\n\n"
+								. 'After rewriting, we have'
+								. "\n\n"
+								. '    [::ln(root [$a] of xy) = A ln x + B ln y::]'
+								. "\n\n"
+								. 'with constants'
+								. "\n\n"
+								. '    [`A`] = [_______________]{1/$a} and  ' . "\n"
+								. '    [`B`] = [_______________]{1/$b}.'
+								. "\n\n"
+						]
+					],
+					[
+						Optimization => [
+							'$a = random(200, 320, 10); $b = random(3, 6, 1); $c = random(12, 16, 1);'
+								. "\n\n"
+								. '$length = sqrt($a*($b+$c)/(2*$b)); $width = sqrt(2*$b*$a/($b+$c));'
+								. "\n\n"
+								. '$mp = MultiAnswer(Real($length), Real($width))->with(' . "\n"
+								. '  singleResult => 1, separator => " x ", tex_separator => "\\\\times",'
+								. "\n"
+								. '  checker => sub {' . "\n"
+								. '    my ($correct, $student) = @_;' . "\n"
+								. '    my ($a,$b) = @$correct; my ($A,$B) = @$student;' . "\n"
+								. '    return ($a == $A && $b == $B) || ($a == $B && $b == $A);' . "\n" . '  }'
+								. "\n" . ');',
+							'A fence is to be built to enclose a rectangular area of [$a] square' . "\n"
+								. 'feet.  The fence along three sides is to be made of material that' . "\n"
+								. 'costs [$b] dollars per foot, and the material for the fourth side' . "\n"
+								. 'costs [$c] dollars per foot.  Find the dimensions of the enclosure' . "\n"
+								. 'that is most economical to construct.'
+								. "\n\n"
+								. 'Dimensions: [___________]{$mp} x [___________]{$mp} feet'
+						]
+					],
+				)
+			)
+			)
+			. tag(
+				'fieldset',
+				style => 'border:1px solid #5555;border-radius:4px;padding:1rem;'
+				. 'display:flex;flex-direction:column;gap:0.25rem',
+				join(
+					'',
+					tag('legend', id => 'reference-label', style => 'font-size:20px', 'For reference only:'),
+					Menu(
+						'- Math -',                  '[`tex`]',
+						'[``display-tex``]',         '[:parsed-math:]',
+						'[::parsed-display-math::]', '[:parsed-math:]{context}',
+						'[:parsed-math:]*  (uses current context)',
+					),
+					Menu(
+						'- Answers -',                '[______] (# of _ is width)',
+						'[___]{answer}',              '[___]{answer}{width}',
+						'[___]{answer}{width}{name}', '[___]{answer=>...,width=>...,name=>...}',
+						'[___]*   (ans_array not ans_rule)',
+					),
+					Menu(
+						'- Lists -',
+						'1. (numeric list)',
+						'a. (alpha list)',
+						'A. (capital alphas)',
+						'i. (roman numerals)',
+						'I. (capital roman)',
+						'*  (bullet list)',
+						'-  (bullet list)',
+						'+  (square bullets)',
+						'o  (circle bullets)',
+					),
+					Menu(
+						'- Substitutions -',
+						'[$variable]',
+						'[$variable]* (no escaping)',
+						'[$variable]** (parse results)',
+						'[@ perl-command @]',
+						'[@ perl-command @]* (no escaping)',
+						'[@ perl-command @]** (parse results)',
+						'[% comment %]',
+						'[&lt;url&gt;] (not implemented)',
+						'[!image!]{source}{width}{height}',
+					),
+					Menu(
+						'- Formatting -',
+						"$SP$SP\n     (line break)",
+						"$SP$SP$SP\n  (format break)",
+						'blankline  (par break)',
+						"$SP$SP$SP$SP or \t  (indent)",
+						'>> ... &lt;&lt;  (center)',
+						'>> ...     (right justify)',
+						'---        (hrule)',
+						'---{width}',
+						'---{width}{size}',
+						'*bold*',
+						'_italic_',
+						'*_bold-italic_*',
+						":$SP$SP$SP    (preformatted)",
+						'[|verbatim|]',
+					),
+					Menu(
+						'- Headings -',
+						'# heading 1 #',
+						'## heading 2 ##',
+						'### heading 3 ###',
+						'#### heading 4 ####',
+						'##### heading 5 #####',
+						'###### heading 6 ######',
+					)
+				)
+			)
+	));
+}
+
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/defaultSetHeader.pg b/courses.dist/modelCourse/templates/defaultSetHeader.pg
new file mode 100644
index 0000000000..61e20bb76f
--- /dev/null
+++ b/courses.dist/modelCourse/templates/defaultSetHeader.pg
@@ -0,0 +1,78 @@
+# defaultSetHeader.pg
+# This header file can be used for both the screen and hardcopy output
+
+DOCUMENT();
+
+loadMacros(
+	"PGstandard.pl",
+	"PGML.pl",
+	"PGcourse.pl",
+);
+
+# Content to print only in LaTeX PDF hardcopy output
+# Use PGML markup
+
+$TeX = <<'TEX';
+This PDF is available for convenience. Assignments must be submitted
+within *WeBWorK* for credit.
+TEX
+
+# Content to print only in HTML output
+# Use PGML markup
+
+$HTML = <<"HTML";
+This assignment will close on *$formattedDueDate*.
+HTML
+
+# The first line of PGML below prints the items from above.
+# Other content will appear in all output forms.
+
+BEGIN_PGML
+[@ MODES(TeX => $TeX, HTML => $HTML) @]**
+
+[$setDescription]
+[% You can replace this comment with information that
+   would appear in both screen and hardcopy set headers. %]
+END_PGML
+
+# The hardcopy theme defines headers and footers. If you would like to customize
+# those without changing the theme, they can be overridden here by following the
+# documentation for the LaTeX exam class. However the footer on the last page
+# displays a copyright claim that cannot be overridden here.
+# http://mirrors.ctan.org/macros/latex/contrib/exam/examdoc.pdf
+# Note the following is tex code, not PGML markup
+# Available environment macros are:
+# \webworkFirstName,  \webworkLastName,           \webworkUserId,    \webworkStudentId, \webworkEmailAddress,
+# \webworkOpenDate,   \webworkReducedScoringDate, \webworkDueDate,   \webworkAnswerDate,
+# \webworkSetId,      \webworkPrettySetId,        \webworkDescription,
+# \webworkCourseName, \webworkCourseTitle,        \webworkCourseURL
+# \webworkSection,    \webworkRecitation,
+
+#TEXT(MODES(TeX => EV3(<<'EOT'),HTML=>""));
+#
+#\pagestyle{headandfoot}
+#\firstpageheader%
+#{{\large\bfseries Assignment \href{\webworkCourseURL/\webworkSetId}{\webworkPrettySetId{}}\\}\ifx\webworkReducedScoringDate\empty\else{full credit by \webworkReducedScoringDate, }\fi closes \webworkDueDate\\\href{\webworkCourseURL}{\scshape\webworkCourseTitle}}%
+#{}%
+#{{\large\bfseries\webworkFirstName{} \webworkLastName{} (\webworkUserId)\\}%
+#\ifx\webworkSection\empty{\ \\}\else{Section: \webworkSection\\}\fi%
+#\ifx\webworkRecitation\empty{\ }\else{Recitation: \webworkRecitation}\fi%
+#}%
+#\runningheader{}{}{}
+#\footer{}{}{Page \thepage}
+#
+#EOT
+
+# The following must be processed separately because of its use of the @-symbol
+# Uncomment the lines below to modify the formatting of problem numbers and points
+
+#TEXT(MODES(TeX => EV3P({processVariables => 0}, <<'EOT'), HTML => ''));
+#
+#%\pointpoints{pt.}{pts.}
+#%\makeatletter
+#%\qformat{{\bf Problem \thequestiontitle.} \dotfill \if@placepoints{\bf\footnotesize(\thepoints)}\fi}
+#%\makeatother
+#
+#EOT
+
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/email/welcome.msg b/courses.dist/modelCourse/templates/email/welcome.msg
index 70ad5aa8e1..036c20f686 100644
--- a/courses.dist/modelCourse/templates/email/welcome.msg
+++ b/courses.dist/modelCourse/templates/email/welcome.msg
@@ -5,18 +5,15 @@ Subject: online homework for Math 123
 Message:
     Hi $FN,
 
-Your course is at
-	http://somewhere.edu/webwork2/JT_123
+Our WeBWorK course is at:
+https://somewhere.edu/webwork2/JT_123
 
-Your login name is $LOGIN and your initial password is $SID
+Your username/password is:
+$LOGIN/$SID
 
-You should change your password, once you have logged in, by clicking on the
-User Settings link in the upper left.  
+You should change your password once you have logged in by visiting
+User Settings in the sidebar navigation.
 
-Some help pages about WeBWorK are at URL
-	http://webwork.maa.org/wiki/Category:Students
+Have fun,
+Jan
 
-Have fun.
-
-Take care,
-TJ
diff --git a/courses.dist/modelCourse/templates/set0/paperHeaderFile0.pg b/courses.dist/modelCourse/templates/set0/paperHeaderFile0.pg
index faf4987176..2ae97e50a8 100644
--- a/courses.dist/modelCourse/templates/set0/paperHeaderFile0.pg
+++ b/courses.dist/modelCourse/templates/set0/paperHeaderFile0.pg
@@ -9,21 +9,17 @@ loadMacros(
 "PGanswermacros.pl"
 );
 
-$dateTime = $formatedDueDate;
-
 TEXT(EV2(<<EOT));
-$BEGIN_ONE_COLUMN
 \noindent {\large \bf $studentName}
 \hfill
 {\large \bf {\{protect_underbar($courseName)\}}}
 \par
-\noindent{\large \bf {Assignment \{protect_underbar($setNumber)\}  closes $formatedDueDate}}
+\noindent{\large \bf {Assignment \{protect_underbar($setNumber)\}  closes $formattedDueDate}}
 \par\noindent
 This first set (set 0) is designed to acquaint you with using WeBWorK. 
 {\bf Your score on this set will not be counted toward your final grade.}
 \par
 \noindent You may need to give 4 or 5 significant digits for some (floating point) numerical answers in order to have them accepted by the computer.
-$END_ONE_COLUMN
 EOT
 
 &ENDDOCUMENT;
diff --git a/courses.dist/modelCourse/templates/set0/prob1.pg b/courses.dist/modelCourse/templates/set0/prob1.pg
index 894cf83040..64639f592d 100644
--- a/courses.dist/modelCourse/templates/set0/prob1.pg
+++ b/courses.dist/modelCourse/templates/set0/prob1.pg
@@ -16,7 +16,6 @@ loadMacros(
 "PGauxiliaryFunctions.pl"
 );
 
-TEXT(beginproblem());
 $showPartialCorrectAnswers = 1;
 
 $a = random(-10,-1,1);
diff --git a/courses.dist/modelCourse/templates/set0/prob1a.pg b/courses.dist/modelCourse/templates/set0/prob1a.pg
index a862e59377..312b40820d 100644
--- a/courses.dist/modelCourse/templates/set0/prob1a.pg
+++ b/courses.dist/modelCourse/templates/set0/prob1a.pg
@@ -13,7 +13,6 @@ loadMacros(
 	"PGauxiliaryFunctions.pl"
 );
 
-TEXT(beginproblem());
 $showPartialCorrectAnswers = 1;
 
 
diff --git a/courses.dist/modelCourse/templates/set0/prob1b.pg b/courses.dist/modelCourse/templates/set0/prob1b.pg
index d1de6b1c09..853eba5136 100644
--- a/courses.dist/modelCourse/templates/set0/prob1b.pg
+++ b/courses.dist/modelCourse/templates/set0/prob1b.pg
@@ -14,7 +14,6 @@ loadMacros(
 "PGauxiliaryFunctions.pl"
 );
 
-TEXT(beginproblem());
 $showPartialCorrectAnswers = 1;
 
 
diff --git a/courses.dist/modelCourse/templates/set0/prob2.pg b/courses.dist/modelCourse/templates/set0/prob2.pg
index 45346fbf96..e2b5fea4a5 100644
--- a/courses.dist/modelCourse/templates/set0/prob2.pg
+++ b/courses.dist/modelCourse/templates/set0/prob2.pg
@@ -14,7 +14,6 @@ loadMacros(
 "PGauxiliaryFunctions.pl"
 );
 
-TEXT(beginproblem());
 $showPartialCorrectAnswers = 1;
 
 TEXT(EV2(<<EOT));
@@ -69,4 +68,4 @@ answers must be correct before you get credit for the problem.
 
 
 EOT
-ENDDOCUMENT();        # This should be the last executable line in the problem.
\ No newline at end of file
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/set0/prob3.pg b/courses.dist/modelCourse/templates/set0/prob3.pg
index 6d8618321e..198481171c 100644
--- a/courses.dist/modelCourse/templates/set0/prob3.pg
+++ b/courses.dist/modelCourse/templates/set0/prob3.pg
@@ -14,7 +14,6 @@ loadMacros(
 "PGauxiliaryFunctions.pl"
 );
 
-TEXT(beginproblem());
 $showPartialCorrectAnswers = 0;
 
 
@@ -75,4 +74,4 @@ problem list page (use the button at the top of this page) and choosing "formatt
 of "text". Sometimes there is a 15-20 second delay in viewing a problem in "typeset" mode the first time.
 EOT
 
-ENDDOCUMENT();        # This should be the last executable line in the problem.
\ No newline at end of file
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/set0/prob4/prob4.pg b/courses.dist/modelCourse/templates/set0/prob4/prob4.pg
index d0384ba476..933da600bf 100644
--- a/courses.dist/modelCourse/templates/set0/prob4/prob4.pg
+++ b/courses.dist/modelCourse/templates/set0/prob4/prob4.pg
@@ -16,7 +16,6 @@ loadMacros(
 "PGauxiliaryFunctions.pl"
 );
 
-TEXT(beginproblem());
 $showPartialCorrectAnswers = 0;
 
 
diff --git a/courses.dist/modelCourse/templates/set0/prob5.pg b/courses.dist/modelCourse/templates/set0/prob5.pg
index 6faa34b7e1..5b8bb88121 100644
--- a/courses.dist/modelCourse/templates/set0/prob5.pg
+++ b/courses.dist/modelCourse/templates/set0/prob5.pg
@@ -14,7 +14,6 @@ loadMacros(
 "PGauxiliaryFunctions.pl"
 );
 
-TEXT(beginproblem());
 $showPartialCorrectAnswers = 0;
 
 
diff --git a/courses.dist/modelCourse/templates/set0/screenHeaderFile0.pg b/courses.dist/modelCourse/templates/set0/screenHeaderFile0.pg
index 9bbac3998d..d347007621 100644
--- a/courses.dist/modelCourse/templates/set0/screenHeaderFile0.pg
+++ b/courses.dist/modelCourse/templates/set0/screenHeaderFile0.pg
@@ -12,7 +12,7 @@ loadMacros(
 
 
 BEGIN_TEXT;
-WeBWorK assignment number $setNumber is closes $formatedDueDate.
+WeBWorK assignment number $setNumber is closes $formattedDueDate.
  
 $PAR
 This first problem set (set 0) is designed to acquaint you with using WeBWorK.
diff --git a/courses.dist/modelCourse/templates/setDemo/c4s5p2.pg b/courses.dist/modelCourse/templates/setDemo/c4s5p2.pg
index 9adac50e0e..6eb9981877 100644
--- a/courses.dist/modelCourse/templates/setDemo/c4s5p2.pg
+++ b/courses.dist/modelCourse/templates/setDemo/c4s5p2.pg
@@ -12,7 +12,6 @@ loadMacros("PGbasicmacros.pl",
 			"PGauxiliaryFunctions.pl"
 );
 
-TEXT(beginproblem());
 $showPartialCorrectAnswers = 1;
 
 $n = random(3,6,1);
diff --git a/courses.dist/modelCourse/templates/setDemo/josephus.pg b/courses.dist/modelCourse/templates/setDemo/josephus.pg
index 0cfeb57af3..605dca6f76 100644
--- a/courses.dist/modelCourse/templates/setDemo/josephus.pg
+++ b/courses.dist/modelCourse/templates/setDemo/josephus.pg
@@ -146,8 +146,6 @@ parent.gameStatus.document.close()
 
 EOF
 
-
-TEXT(beginproblem());
 TEXT(MODES(
 TeX	 		=>	'',
 Latex2HTML	=> "\begin{rawhtml} <NOSCRIPT> This problem requires that Java
@@ -203,4 +201,4 @@ $ans =3;
 ANS(num_cmp($ans,reltol=>1,format =>"%0.14g") );  #We are allowing 1 percent error for the answer.
 
 			
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setDemo/limits.pg b/courses.dist/modelCourse/templates/setDemo/limits.pg
index 61b42252e7..4bb29e5280 100644
--- a/courses.dist/modelCourse/templates/setDemo/limits.pg
+++ b/courses.dist/modelCourse/templates/setDemo/limits.pg
@@ -8,7 +8,6 @@ loadMacros(
 	"PGauxiliaryFunctions.pl"
 );
 
-TEXT(&beginproblem);
 $showPartialCorrectAnswers = 1;
 
 $a=random(-3,3,1);
@@ -87,4 +86,4 @@ ANS(num_cmp( [ $b, $bp1,'DNE'] , strings => ['DNE'] ))  ;
 ANS(num_cmp( [ $c, 'DNE' ] , strings => ['DNE'] ))  ;
 
 
-ENDDOCUMENT();        # This should be the last executable line in the problem.
\ No newline at end of file
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setDemo/liteApplet1.pg b/courses.dist/modelCourse/templates/setDemo/liteApplet1.pg
index 7a8cc4c075..a00e0178be 100644
--- a/courses.dist/modelCourse/templates/setDemo/liteApplet1.pg
+++ b/courses.dist/modelCourse/templates/setDemo/liteApplet1.pg
@@ -6,7 +6,6 @@ loadMacros("PGbasicmacros.pl",
 ); 
 
 $showPartialCorrectAnswers = 1;
-TEXT(beginproblem());
 
 # The link to the java applet is hard wired to use the java applet
 # served from the University of Rochester WeBWorK machine.
@@ -65,4 +64,4 @@ ANS(num_cmp(dist($kandahar,$shindand),      reltol => 3,  units=>'km'));
 
 
 			
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setDemo/liteApplet2.pg b/courses.dist/modelCourse/templates/setDemo/liteApplet2.pg
index 6f251df90e..00b754242d 100644
--- a/courses.dist/modelCourse/templates/setDemo/liteApplet2.pg
+++ b/courses.dist/modelCourse/templates/setDemo/liteApplet2.pg
@@ -6,8 +6,6 @@ loadMacros("PGbasicmacros.pl",
 ); 
 
 $showPartialCorrectAnswers = 1;
-TEXT(beginproblem());
-
 
 BEGIN_TEXT
 This is  a lite applet designed by Frank Wattenberg.
@@ -71,4 +69,4 @@ ANS(num_cmp(dist(cityLoc($index[2]),cityLoc($index[2])),   reltol=>3,         un
 
 
 			
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setDemo/nsc2s10p2.pg b/courses.dist/modelCourse/templates/setDemo/nsc2s10p2.pg
index 93bbc266e5..632cad14d7 100644
--- a/courses.dist/modelCourse/templates/setDemo/nsc2s10p2.pg
+++ b/courses.dist/modelCourse/templates/setDemo/nsc2s10p2.pg
@@ -13,7 +13,6 @@ loadMacros(
 	"PGgraphmacros.pl"
 );
 
-TEXT(beginproblem());
 $showPartialCorrectAnswers = 0;
 
 $a=random(0, 6.3, .1);
diff --git a/courses.dist/modelCourse/templates/setDemo/paperHeaderFile1.pg b/courses.dist/modelCourse/templates/setDemo/paperHeaderFile1.pg
index d3bcd7d08a..1b9210ae6e 100644
--- a/courses.dist/modelCourse/templates/setDemo/paperHeaderFile1.pg
+++ b/courses.dist/modelCourse/templates/setDemo/paperHeaderFile1.pg
@@ -9,15 +9,12 @@ loadMacros(
 "PGanswermacros.pl"
 );
 
-$dateTime = $formatedDueDate;
-
 TEXT(EV2(<<EOT));
-$BEGIN_ONE_COLUMN
 \noindent {\large \bf $studentName}
 \hfill
 \noindent {\large \bf MAA Minicourse San Diego January 2002}
 \par
-\noindent{\large \bf Homework Set $setNumber  closes $dateTime}\par
+\noindent{\large \bf Homework Set $setNumber  closes $formattedDueDate}\par
 
 \noindent This is a demonstration set designed to show you some types of questions 
 that can be asked using WeBWorK. 
@@ -25,7 +22,6 @@ that can be asked using WeBWorK.
 \par
 \noindent You may need to give 4 or 5 significant digits for some (floating point) 
 numerical answers in order to have them accepted by the computer.
-$END_ONE_COLUMN
 EOT
 
 &ENDDOCUMENT;
diff --git a/courses.dist/modelCourse/templates/setDemo/prob0837.pg b/courses.dist/modelCourse/templates/setDemo/prob0837.pg
index 62e556e756..bd39f44c66 100644
--- a/courses.dist/modelCourse/templates/setDemo/prob0837.pg
+++ b/courses.dist/modelCourse/templates/setDemo/prob0837.pg
@@ -8,8 +8,6 @@ loadMacros( "PGbasicmacros.pl",
 	             "PG_CAPAmacros.pl"
 );
 	 
-TEXT(beginproblem());
-	
 # machine translated from CAPA.  
 # This is probaly not a good model for elegant PG code.	
 ## **************************************
diff --git a/courses.dist/modelCourse/templates/setDemo/prob5.pg b/courses.dist/modelCourse/templates/setDemo/prob5.pg
index 7cf8acb646..670194a3fe 100644
--- a/courses.dist/modelCourse/templates/setDemo/prob5.pg
+++ b/courses.dist/modelCourse/templates/setDemo/prob5.pg
@@ -49,8 +49,6 @@ return( $a*Math.pow(x,2) + $b*x +$c );}
 
 EOF
 
-
-TEXT(beginproblem());
 TEXT(MODES(
 TeX	 		=>	'',
 Latex2HTML	=> "\begin{rawhtml} <NOSCRIPT> This problem requires that Java
diff --git a/courses.dist/modelCourse/templates/setDemo/prob6b.pg b/courses.dist/modelCourse/templates/setDemo/prob6b.pg
index 74a2fd86f4..60cc2f3e5f 100644
--- a/courses.dist/modelCourse/templates/setDemo/prob6b.pg
+++ b/courses.dist/modelCourse/templates/setDemo/prob6b.pg
@@ -27,8 +27,6 @@ END_TEXT
 $p = random(2,9,1);  # multiplier
 $p2 = ( $p % 2 == 0) ? 2*$p : $p;
 
-TEXT(beginproblem());
-
 # The link to the java applet is hard wired to use the java applet
 # served from the University of Rochester WeBWorK machine.
 # It is possible to set this up so that the java applet is served
diff --git a/courses.dist/modelCourse/templates/setDemo/s2_2_1.pg b/courses.dist/modelCourse/templates/setDemo/s2_2_1.pg
index 6232790fd4..b01f44e3e6 100644
--- a/courses.dist/modelCourse/templates/setDemo/s2_2_1.pg
+++ b/courses.dist/modelCourse/templates/setDemo/s2_2_1.pg
@@ -11,7 +11,6 @@ loadMacros(
 	"PGauxiliaryFunctions.pl"
 );
 
-TEXT(&beginproblem);
 $showPartialCorrectAnswers = 1;
 
 $a1 = random(2,7,1);
diff --git a/courses.dist/modelCourse/templates/setDemo/sample_myown_ans.pg b/courses.dist/modelCourse/templates/setDemo/sample_myown_ans.pg
index 8153a8f3e9..3b7da75f8f 100644
--- a/courses.dist/modelCourse/templates/setDemo/sample_myown_ans.pg
+++ b/courses.dist/modelCourse/templates/setDemo/sample_myown_ans.pg
@@ -6,7 +6,6 @@ loadMacros(
 	"PGanswermacros.pl"
 );
 
-TEXT(&beginproblem);
 $showPartialCorrectAnswers = 1;
  
 BEGIN_TEXT
@@ -83,4 +82,4 @@ $strict_palindrome_test = sub {
     
 ANS($strict_palindrome_test);
 
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setDemo/sample_units_ans.pg b/courses.dist/modelCourse/templates/setDemo/sample_units_ans.pg
index 84cbe6cc8e..a72a70a5a9 100644
--- a/courses.dist/modelCourse/templates/setDemo/sample_units_ans.pg
+++ b/courses.dist/modelCourse/templates/setDemo/sample_units_ans.pg
@@ -5,8 +5,6 @@ loadMacros( "PGbasicmacros.pl",
 	        "PGanswermacros.pl",
 );
 
-TEXT(beginproblem());
-
 $showPartialCorrectAnswers = 1;
 $showHint =0;
 
diff --git a/courses.dist/modelCourse/templates/setDemo/screenHeaderFile1.pg b/courses.dist/modelCourse/templates/setDemo/screenHeaderFile1.pg
index d38e94b928..f486d1658f 100644
--- a/courses.dist/modelCourse/templates/setDemo/screenHeaderFile1.pg
+++ b/courses.dist/modelCourse/templates/setDemo/screenHeaderFile1.pg
@@ -46,7 +46,7 @@ $HR
 Use this box  to give information about this problem
 set.  Typical information might include some of these facts:
 $PAR
-WeBWorK assignment number $setNumber closes on : $formatedDueDate.
+WeBWorK assignment number $setNumber closes on : $formattedDueDate.
 
 
 $PAR
@@ -74,4 +74,4 @@ Along with the \{htmlLink(qq!http://webwork.maa.org/wiki/Units!, "list of units"
 physics problems.
 END_TEXT
 
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setDemo/srw1_9_4.pg b/courses.dist/modelCourse/templates/setDemo/srw1_9_4.pg
index 03f9e5a2fa..c4c663dcda 100644
--- a/courses.dist/modelCourse/templates/setDemo/srw1_9_4.pg
+++ b/courses.dist/modelCourse/templates/setDemo/srw1_9_4.pg
@@ -15,8 +15,6 @@ loadMacros(
 "PGauxiliaryFunctions.pl"
 );
 
-TEXT(&beginproblem);
-
 $showPartialCorrectAnswers = 1;
 
 #install_problem_grader(~~&std_problem_grader);    ##uncomment to use std grader
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/MAAtutorialSetHeader.pg b/courses.dist/modelCourse/templates/setMAAtutorial/MAAtutorialSetHeader.pg
index 23f8b87d00..afb36de910 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/MAAtutorialSetHeader.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/MAAtutorialSetHeader.pg
@@ -6,8 +6,6 @@ loadMacros(
 	"PGanswermacros.pl"
 );
 
-TEXT($BEGIN_ONE_COLUMN);
-
 TEXT(MODES(TeX =>EV3(<<'EOT'), HTML=>"", Latex2HTML=>"" ));
 \noindent {\large \bf $studentName}
 \hfill
@@ -94,8 +92,6 @@ $PAR
 You can use the Feedback button on each problem
 page to send e-mail to the professors. 
 
-
-$END_ONE_COLUMN
 END_TEXT
 
 ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/conditionalquestionexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/conditionalquestionexample.pg
index affe1f9138..4b067b39ee 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/conditionalquestionexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/conditionalquestionexample.pg
@@ -4,7 +4,7 @@ loadMacros(
         "PGchoicemacros.pl",
         "PGanswermacros.pl"
 );
-TEXT(beginproblem(), $BR,$BBOLD, "Conditional questions example", $EBOLD, $BR,$BR);
+TEXT($BBOLD, "Conditional questions example", $EBOLD, $BR,$BR);
 $showPartialCorrectAnswers = 1;
 
 $a1 = random(3,25,1);
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/hermitegraphexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/hermitegraphexample.pg
index 0556dec368..8af5c95cbf 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/hermitegraphexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/hermitegraphexample.pg
@@ -5,8 +5,7 @@ loadMacros("PGbasicmacros.pl",
            "PGnumericalmacros.pl",
            "PGgraphmacros.pl"
 );
-TEXT($BEGIN_ONE_COLUMN);
-TEXT(beginproblem(), $BR,$BBOLD, "Hermite polynomial graph example", $EBOLD, $BR,$BR); 
+TEXT($BBOLD, "Hermite polynomial graph example", $EBOLD, $BR,$BR);
 $showPartialAnswers = 1;
 
 $graph = init_graph(-5,-5,5,5,'axes'=>[0,0],'grid'=>[10,10]);
@@ -122,5 +121,4 @@ $PAR
 END_TEXT
 ANS(num_cmp([ @minimum_points ], tol => .3));
 
-TEXT($END_ONE_COLUMN);
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/htmllinksexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/htmllinksexample.pg
index 708fb789a6..2d2b34176a 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/htmllinksexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/htmllinksexample.pg
@@ -5,7 +5,7 @@ loadMacros("PGbasicmacros.pl",
 );
 $showPartialCorrectAnswers = 0;
 
-TEXT(beginproblem(), $BR,$BBOLD, "HTML links example", $EBOLD, $BR,$BR); 
+TEXT($BBOLD, "HTML links example", $EBOLD, $BR,$BR)
 
 BEGIN_TEXT
 This example shows how to link to resources outside the problem itself.
@@ -77,4 +77,4 @@ TEXT(
    endtable()
 );
 
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/javaappletexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/javaappletexample.pg
index fee0411cbc..c42740511e 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/javaappletexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/javaappletexample.pg
@@ -6,7 +6,7 @@ loadMacros("PG.pl",
            "PGanswermacros.pl",
            ); 
  
-TEXT(beginproblem(), $BR,$BBOLD, "Java applet example", $EBOLD, $BR,$BR); 
+TEXT($BBOLD, "Java applet example", $EBOLD, $BR,$BR);
 # define function to be evaluated
 $a= random(1,3,1);
 $b= random(-4,4,.1);
@@ -92,4 +92,4 @@ ANS(str_cmp('No')  );
 ANS(function_cmp( '(a/2)^2', 'a') );
 
 
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/javascriptexample1.pg b/courses.dist/modelCourse/templates/setMAAtutorial/javascriptexample1.pg
index 1f76031c1b..b12f48a0aa 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/javascriptexample1.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/javascriptexample1.pg
@@ -5,7 +5,7 @@ loadMacros(
            "PGchoicemacros.pl",
            "PGanswermacros.pl",
 ); 
-TEXT(beginproblem(), $BR,$BBOLD, "JavaScript Example 1", $EBOLD, $BR,$BR);
+TEXT($BBOLD, "JavaScript Example 1", $EBOLD, $BR,$BR);
 # define function to be evaluated
 $a= random(1,3,1);
 $b= random(-4,4,.1);
@@ -43,7 +43,6 @@ return( $a*Math.pow(x,2) + $b*x +$c );}
 
 EOF
 
-TEXT(beginproblem());
 TEXT(MODES( TeX => "",
 	        Latex2HTML => "\begin{rawhtml}
                          <NOSCRIPT> This problem requires that Java Script be 
@@ -143,4 +142,4 @@ TEXT(MODES(
 
 ANS(num_cmp($ans,reltol => 1) );  #We are allowing 1 percent error for the answer.
 
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/javascriptexample2.pg b/courses.dist/modelCourse/templates/setMAAtutorial/javascriptexample2.pg
index 898f77e842..53be40e27a 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/javascriptexample2.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/javascriptexample2.pg
@@ -5,7 +5,7 @@ loadMacros("PGbasicmacros.pl",
            "PGanswermacros.pl",
            "PGnumericalmacros.pl",  # needed for the javaScript spline code
            ); 
-TEXT(beginproblem(), $BR,$BBOLD, "JavaScript Example 2", $EBOLD, $BR,$BR);
+TEXT($BBOLD, "JavaScript Example 2", $EBOLD, $BR,$BR);
 
 # define function to be evaluated
 $a= random(1,3,1);
@@ -49,7 +49,6 @@ $javascript= javaScript_cubic_spline(~~@x, ~~@y, name =>'func');
 HEADER_TEXT( javaScript_cubic_spline(~~@x, ~~@y, name =>'func')  );  
 
 
-TEXT(beginproblem());
 TEXT(MODES( TeX => "",
 	        Latex2HTML => "\begin{rawhtml}
                          <NOSCRIPT> This problem requires that Java Script be 
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/liteApplet1.pg b/courses.dist/modelCourse/templates/setMAAtutorial/liteApplet1.pg
index 7a8cc4c075..a00e0178be 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/liteApplet1.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/liteApplet1.pg
@@ -6,7 +6,6 @@ loadMacros("PGbasicmacros.pl",
 ); 
 
 $showPartialCorrectAnswers = 1;
-TEXT(beginproblem());
 
 # The link to the java applet is hard wired to use the java applet
 # served from the University of Rochester WeBWorK machine.
@@ -65,4 +64,4 @@ ANS(num_cmp(dist($kandahar,$shindand),      reltol => 3,  units=>'km'));
 
 
 			
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/liteApplet2.pg b/courses.dist/modelCourse/templates/setMAAtutorial/liteApplet2.pg
index 6f251df90e..00b754242d 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/liteApplet2.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/liteApplet2.pg
@@ -6,8 +6,6 @@ loadMacros("PGbasicmacros.pl",
 ); 
 
 $showPartialCorrectAnswers = 1;
-TEXT(beginproblem());
-
 
 BEGIN_TEXT
 This is  a lite applet designed by Frank Wattenberg.
@@ -71,4 +69,4 @@ ANS(num_cmp(dist(cityLoc($index[2]),cityLoc($index[2])),   reltol=>3,         un
 
 
 			
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/matchinglistexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/matchinglistexample.pg
index 6d85a7eddc..300c8db8e9 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/matchinglistexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/matchinglistexample.pg
@@ -7,7 +7,7 @@ loadMacros(
  );
 
 
-TEXT(beginproblem(), $BR,$BBOLD, "Matching list example", $EBOLD, $BR,$BR);
+TEXT($BBOLD, "Matching list example", $EBOLD, $BR,$BR);
 
 
 # Since this is a matching question, we do not usually wish to tell students
@@ -126,4 +126,4 @@ END_TEXT
 # Enter the correct answers to be checked against the answers to the students.
 ANS( str_cmp( $ml->ra_correct_ans )   ) ;
 
-ENDDOCUMENT();      
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/multiplechoiceexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/multiplechoiceexample.pg
index d1144f0740..42d81e42b2 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/multiplechoiceexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/multiplechoiceexample.pg
@@ -4,7 +4,7 @@ loadMacros("PGbasicmacros.pl",
         "PGanswermacros.pl",
 
 );
-TEXT(beginproblem(), $BR,$BBOLD, "Multiple choice example", $EBOLD, $BR,$BR);
+TEXT($BBOLD, "Multiple choice example", $EBOLD, $BR,$BR);
 
 $showPartialCorrectAnswers = 0;
 # Make a new multiple choice object.
@@ -42,4 +42,4 @@ END_TEXT
 # Enter the correct answers to be checked against the answers to the students.
 ANS( str_cmp( $mc->correct_ans )   ) ;
 
-ENDDOCUMENT();     
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/ontheflygraphicsexample1.pg b/courses.dist/modelCourse/templates/setMAAtutorial/ontheflygraphicsexample1.pg
index be9bda7efa..f3423c4e1e 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/ontheflygraphicsexample1.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/ontheflygraphicsexample1.pg
@@ -6,7 +6,7 @@ loadMacros(
            "PGgraphmacros.pl"
 );
           
-TEXT(beginproblem(), $BR,$BBOLD, "On-the-fly Graphics Example1", $EBOLD, $BR,$BR);
+TEXT($BBOLD, "On-the-fly Graphics Example1", $EBOLD, $BR,$BR);
 $showPartialCorrectAnswers = 0;
 
 # First we define a graph with x and y in the range -4 to 4, axes (strong lines) 
@@ -114,4 +114,4 @@ derivatives (click on the graph to see an enlarged image):$PAR
 END_TEXT
 ANS(str_cmp( [@scrambled_labels] ) );
 
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/ontheflygraphicsexample2.pg b/courses.dist/modelCourse/templates/setMAAtutorial/ontheflygraphicsexample2.pg
index 063ae5804d..16144c5b56 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/ontheflygraphicsexample2.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/ontheflygraphicsexample2.pg
@@ -6,7 +6,7 @@ loadMacros("PGbasicmacros.pl",
            "PGgraphmacros.pl"
 );
            
-TEXT(beginproblem(), $BR,$BBOLD, "On-the-fly Graphics Example2", $EBOLD, $BR,$BR); 
+TEXT($BBOLD, "On-the-fly Graphics Example2", $EBOLD, $BR,$BR);
 
 # First we define a graph with x and y in the range -4 to 4, axes (strong lines) 
 # defined at the point [0,0] and
@@ -121,4 +121,4 @@ END_TEXT
 
 ANS(str_cmp( [@scrambled_labels] ) );
 
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/paperHeader.pg b/courses.dist/modelCourse/templates/setMAAtutorial/paperHeader.pg
index d26d1abcd3..fd1a6af434 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/paperHeader.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/paperHeader.pg
@@ -11,10 +11,8 @@ loadMacros(
 
 
 BEGIN_TEXT
-$BEGIN_ONE_COLUMN
 This set shows how to write simple WeBWorK problems and introduces you to the most common
 constructions.
-$END_ONE_COLUMN
 
 END_TEXT
 
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/popuplistexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/popuplistexample.pg
index eed7511d1d..b31fc8a5e5 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/popuplistexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/popuplistexample.pg
@@ -5,7 +5,7 @@ loadMacros("PGbasicmacros.pl",
            "PGanswermacros.pl",
 );
 
-TEXT(beginproblem(), $BR,$BBOLD, "True False Pop-up Example", $EBOLD, $BR,$BR);
+TEXT($BBOLD, "True False Pop-up Example", $EBOLD, $BR,$BR);
 $showPartialCorrectAnswers = 0;
 
 # Make a new select list
@@ -62,4 +62,4 @@ END_TEXT
 # Enter the correct answers to be checked against the answers to the students.
 ANS( str_cmp( $tf->ra_correct_ans )   ) ;
 
-ENDDOCUMENT();        # This should be the last executable line in the problem.
\ No newline at end of file
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/prob3.pg b/courses.dist/modelCourse/templates/setMAAtutorial/prob3.pg
index 7c1671c93c..01696bcc78 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/prob3.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/prob3.pg
@@ -19,14 +19,6 @@ loadMacros("PGbasicmacros.pl",
 # Is the simplest way of printing text, each string in the input is immediately printed.
 # It does not do any of the simplifying and evaluating tricks performed by the BEGIN_TEXT/END_TEXT construction.
 
-# beginproblem() is a macro which outputs the string 
-# which contains the number
-# of points the problem is worth.
-
-# Putting these two ideas together prints the standard opening line of a problem.
-# We will use this construction routinely at the beginning of all subsequent problems.
-TEXT(beginproblem());
-
 # Since this is a matching questions, we do not usually wish to tell students which
 # parts of the matching question have been answered correctly and which are
 # incorrect.  That is too easy.  To accomplish this we set the following flag to zero.
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/prob4.pg b/courses.dist/modelCourse/templates/setMAAtutorial/prob4.pg
index 7d52a89951..084d6af438 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/prob4.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/prob4.pg
@@ -12,7 +12,6 @@ loadMacros("PGbasicmacros.pl",
            "PGnumericalmacros.pl"
            );
  
-TEXT(&beginproblem);
 $showPartialCorrectAnswers = 0;
 
 
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/simplemultiplechoiceexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/simplemultiplechoiceexample.pg
index f62e09bb28..2f4650ec46 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/simplemultiplechoiceexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/simplemultiplechoiceexample.pg
@@ -4,7 +4,7 @@ loadMacros(
                     "PGchoicemacros.pl", 
                     "PGanswermacros.pl",
 );
-TEXT(beginproblem(), $BR,$BBOLD, "Multiple choice example", $EBOLD, $BR,$BR);
+TEXT($BBOLD, "Multiple choice example", $EBOLD, $BR,$BR);
 
    
 $showPartialCorrectAnswers = 0;
@@ -30,4 +30,4 @@ $PAR Enter the letter corresponding to the correct answer: \{ ans_rule(10) \}
 END_TEXT
 ANS( str_cmp( $inverted_alphabet[0] )   ) ;
 
-ENDDOCUMENT(); 
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/standardexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/standardexample.pg
index 29ea3ecfca..15540480c2 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/standardexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/standardexample.pg
@@ -5,7 +5,7 @@ loadMacros("PGbasicmacros.pl",
            "PGauxiliaryFunctions.pl"    
 );     
 
-TEXT(beginproblem(), $BR,$BBOLD, "Standard Example", $EBOLD, $BR,$BR);
+TEXT($BBOLD, "Standard Example", $EBOLD, $BR,$BR);
 
 # A question requiring a string answer.
 $str = 'world'; 
@@ -44,4 +44,3 @@ $new_exponent = $b-1;
 $ans2 = "$b*x^($new_exponent)";
 ANS( fun_cmp( $ans2 ) );
 ENDDOCUMENT();
- 
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/staticgraphicsexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/staticgraphicsexample.pg
index 97f15b6b25..02ed678ce5 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/staticgraphicsexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/staticgraphicsexample.pg
@@ -3,8 +3,7 @@ loadMacros("PGbasicmacros.pl",
            "PGchoicemacros.pl",
            "PGanswermacros.pl"
 );
-TEXT($BEGIN_ONE_COLUMN);
-TEXT(beginproblem(), $BR,$BBOLD, "Static graphics Example", $EBOLD, $BR,$BR);
+TEXT($BBOLD, "Static graphics Example", $EBOLD, $BR,$BR);
 
 $showPartialCorrectAnswers = 0;
 # Define which of the three sets of pictures to use
@@ -111,5 +110,4 @@ TEXT(
 
 ANS(  str_cmp( $ml ->ra_correct_ans()   ) ) ;
 
-TEXT($END_ONE_COLUMN);
-ENDDOCUMENT();
\ No newline at end of file
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/truefalseexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/truefalseexample.pg
index 36e59f0f87..42f6abe70b 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/truefalseexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/truefalseexample.pg
@@ -4,7 +4,7 @@ loadMacros("PGbasicmacros.pl",
            "PGanswermacros.pl",
 
 );
-TEXT(beginproblem(), $BR,$BBOLD, "True False Example", $EBOLD, $BR,$BR);
+TEXT($BBOLD, "True False Example", $EBOLD, $BR,$BR);
 
 # Since this is a true questions, we do not usually wish to tell students which
 # parts of the matching question have been answered correctly and which are
@@ -60,4 +60,4 @@ END_TEXT
 
 ANS( str_cmp( $tf->ra_correct_ans )   ) ;
 
-ENDDOCUMENT();        # This should be the last executable line in the problem.
\ No newline at end of file
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/vectorfieldexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/vectorfieldexample.pg
index 50214bd5b5..309c092ced 100644
--- a/courses.dist/modelCourse/templates/setMAAtutorial/vectorfieldexample.pg
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/vectorfieldexample.pg
@@ -7,8 +7,6 @@ loadMacros("PG.pl",
            "PGgraphmacros.pl",        
 );
 
-TEXT(beginproblem()); # standard preamble to each problem.
-
 # Since this is a true questions, we do not usually wish to tell students which
 # parts of the matching question have been answered correctly and which are
 # incorrect.  That is too easy.  To accomplish this we set the following flag to zero.
@@ -37,7 +35,6 @@ sub{my ($x,$y) = @_; $y + 2 ;},
 
 $tf ->choose($numberOfQuestions);
 BEGIN_TEXT
-$BEGIN_ONE_COLUMN
 
 Match the following equations with their direction field. 
 Clicking on each picture will give you an
@@ -86,7 +83,6 @@ $PAR
                       [@ALPHABET[$numberOfQuestions/2..$numberOfQuestions-1]],
                              height => 200, width => 200,tex_size=>300 )  \}
        
-$END_ONE_COLUMN
 END_TEXT
 
 ANS( str_cmp( $tf->ra_correct_ans )   ) ;
diff --git a/courses.dist/modelCourse/templates/setOrientation/course_info.txt b/courses.dist/modelCourse/templates/setOrientation/course_info.txt
index 46d185228f..e8a5db2e2b 100644
--- a/courses.dist/modelCourse/templates/setOrientation/course_info.txt
+++ b/courses.dist/modelCourse/templates/setOrientation/course_info.txt
@@ -5,11 +5,11 @@
 If you haven't already done so, you should change your password to
 something other than your student ID or whatever your instructor
 used as your initial password.  To do this, click on the
-User Settings link under MAIN MENU in the list at the far left, 
+User Settings link in the sidebar navigation at the far left,
 and follow the directions on that page. Note you can collapse and
-uncollapse the MAIN MENU by clicking on the boxed angle bracket just 
-above the boldface course name so if you don't see the MAIN MENU click 
-on the boxed angle bracket to make MAIN MENU reappear.
+uncollapse the sidebar navigation by clicking on the three bars "hamburger"
+icon at the top left. So if you don't see the sidebar navigation, click
+on the three bars to make it reappear.
 
 <p align="justify">
 
diff --git a/courses.dist/modelCourse/templates/setOrientation/parserOrientation.pl b/courses.dist/modelCourse/templates/setOrientation/parserOrientation.pl
index 99abee9ff4..1530e2ea32 100644
--- a/courses.dist/modelCourse/templates/setOrientation/parserOrientation.pl
+++ b/courses.dist/modelCourse/templates/setOrientation/parserOrientation.pl
@@ -6,16 +6,15 @@
 #
 ######################################################################
 
-
 #loadMacros("PGcourse.pl");
 
 #
 #  Special use of CARET to have it work in non-math mode
 #
 $CARET = MODES(
-  TeX => '\hbox{\texttt{\char94}}',
-  Latex2HTML => '^',
-  HTML => '^'
+	TeX        => '\hbox{\texttt{\char94}}',
+	Latex2HTML => '^',
+	HTML       => '^'
 );
 
 #
@@ -24,36 +23,33 @@
 #  recoding the problems themselves).
 #
 sub student {
-  my $message = shift;
-  MODES(
-    TeX => '\leavevmode\hbox{\texttt{'.$message.'}}',
-    Latex2HTML =>
-       $bHTML.'<NOBR><TT>'.$eHTML.$message.$bHTML.'</TT></NOBR>'.$eHTML,
-    HTML => '<NOBR><TT>'.$message.'</TT></NOBR>'
-  );
+	my $message = shift;
+	MODES(
+		TeX        => '\leavevmode\hbox{\texttt{' . $message . '}}',
+		Latex2HTML => $bHTML . '<NOBR><TT>' . $eHTML . $message . $bHTML . '</TT></NOBR>' . $eHTML,
+		HTML       => '<NOBR><TT>' . $message . '</TT></NOBR>'
+	);
 }
 
 sub computer {
-  my $message = shift;
-  MODES(
-    TeX => '\hbox{\texttt{'.$message.'}}',
-    Latex2HTML =>
-       $bHTML.'<NOBR><TT>'.$eHTML.$message.$bHTML.'</TT></NOBR>'.$eHTML,
-    HTML => '<NOBR><TT>'.$message.'</TT></NOBR>'
-  );
+	my $message = shift;
+	MODES(
+		TeX        => '\hbox{\texttt{' . $message . '}}',
+		Latex2HTML => $bHTML . '<NOBR><TT>' . $eHTML . $message . $bHTML . '</TT></NOBR>' . $eHTML,
+		HTML       => '<NOBR><TT>' . $message . '</TT></NOBR>'
+	);
 }
 
 #
 #  This prints things we need to fill in yet in red
 #
 sub moreWork {
-  my $message = shift;
-  MODES(
-    TeX => '{\sl ' . $message . '}',
-    Latex2HTML => $bHTML . '<FONT COLOR="#A00000">' . $eHTML .
-      $message . $bHTML . '</FONT>' . $eHTML,
-    HTML => '<FONT COLOR="#A00000">' . $message . '</FONT>'
-  );
+	my $message = shift;
+	MODES(
+		TeX        => '{\sl ' . $message . '}',
+		Latex2HTML => $bHTML . '<FONT COLOR="#A00000">' . $eHTML . $message . $bHTML . '</FONT>' . $eHTML,
+		HTML       => '<FONT COLOR="#A00000">' . $message . '</FONT>'
+	);
 }
 
 #
@@ -61,15 +57,15 @@ sub moreWork {
 #  working on.
 #
 $BCOMMENT = MODES(
-  TeX => '{\footnotesize\it',
-  Latex2HTML => $bHTML.'<BLOCKQUOTE><SMALL><I><FONT COLOR="#A00000">'.$eHTML,
-  HTML => '<BLOCKQUOTE><SMALL><I><FONT COLOR="#A00000">'
+	TeX        => '{\footnotesize\it',
+	Latex2HTML => $bHTML . '<BLOCKQUOTE><SMALL><I><FONT COLOR="#A00000">' . $eHTML,
+	HTML       => '<BLOCKQUOTE><SMALL><I><FONT COLOR="#A00000">'
 );
 
 $ECOMMENT = MODES(
-  TeX => '}',
-  Latex2HTML => $bHTML.'</FONT></I></SMALL></BLOCKQUOTE>'.$eHTML,
-  HTML => '</FONT></I></SMALL></BLOCKQUOTE>'
+	TeX        => '}',
+	Latex2HTML => $bHTML . '</FONT></I></SMALL></BLOCKQUOTE>' . $eHTML,
+	HTML       => '</FONT></I></SMALL></BLOCKQUOTE>'
 );
 
 # $BCOMMENT = MODES(
@@ -77,102 +73,114 @@ sub moreWork {
 #     Latex2HTML => $bHTML.'<!-- '.$eHTML,
 #     HTML => '<!-- '
 # );
-# 
+#
 # $ECOMMENT = MODES(
 #     TeX => '\fi',
 #     Latex2HTML => $bHTML.' -->'.$eHTML,
 #     HTML => ' -->'
 # );
 
-
 #
 #  Hack to get better spacing in HTML_tth math mode but without
 #  messing up the spacing in other modes.
 #
 $SP = MODES(
-   TeX => ' ', Latex2HTML => ' ',
-   HTML => ' ', HTML_tth => '\ ',
-   HTML_jsMath => ' ', HTML_dpng => ' ',
+	TeX         => ' ',
+	Latex2HTML  => ' ',
+	HTML        => ' ',
+	HTML_tth    => '\ ',
+	HTML_jsMath => ' ',
+	HTML_dpng   => ' ',
 );
 
-
 #
-#  Special table macros for questions that have 
+#  Special table macros for questions that have
 #  displayed math expressions equal to an answer rule,
 #  with an accompanying explanation on a separate line.
 #
 
 sub BeginExamples {
-  return "" if ($displayMode eq "TeX");
-  BeginTable(@_);
+	return "" if ($displayMode eq "TeX");
+	BeginTable(@_);
 }
 
 sub EndExamples {
-  return "" if ($displayMode eq "TeX");
-  EndTable();
+	return "" if ($displayMode eq "TeX");
+	EndTable();
 }
 
 @ExampleDefaults = (ans_rule_len => 40, ans_rule_height => 1);
 
 sub BeginExample {
-  my $math = shift;
-  my $ans = shift;
-  my %options = (@ExampleDefaults, @_);
-  my ($cols,$rows) = ($options{ans_rule_len},$options{ans_rule_height});
-  my $rule;
-
-  if ($rows == 1) {$rule = ans_rule($cols)}
-    else {$rule = ans_box($rows,$cols)}
-  ANS($ans);
-
-  #
-  #  HTML_tth puts an unwanted <BR> at the beginning,
-  #  and uses a centered table.  Remove the <BR> and
-  #  align the table to the right.
-  #
-  if ($displayMode eq "HTML_tth") {
-    $math = trimString(EV2('\['.$math.'\]'));
-    $math =~ s!<br clear="all" />!!;
-    $math =~ s!table align="center"!table align="right"!;
-  } elsif ($displayMode eq "HTML") {
-    $math = '\('.$math.'\)'
-  } elsif ($displayMode =~ m/^HTML/) {
-    $math = '\(\displaystyle '.$math.'\)'
-  }
-
-  MODES(
-    TeX => "\n".'\['.$math.'=\hbox to 8em{'.$rule.'}\]',
-    Latex2HTML => $bHTML.'<TR><TD ALIGN="RIGHT">'.$eHTML.
-      '\(\displaystyle '.$math.'\)'.$bHTML.'</TD><TD>&nbsp;=&nbsp;&nbsp;</TD>'.
-      '<TD>'.$eHTML.$rule.$bHTML.'</TD></TR>'.
-      '<TR><TD></TD><TD></TD><TD>'.$eHTML,
-    HTML => 
-      '<TR><TD ALIGN="RIGHT">'.$math.'</TD><TD>&nbsp;=&nbsp;&nbsp;</TD>'.
-      '<TD>'.$rule.'</TD></TR><TR><TD COLSPAN="2"></TD><TD>'
-  );
+	my $math    = shift;
+	my $ans     = shift;
+	my %options = (@ExampleDefaults, @_);
+	my ($cols, $rows) = ($options{ans_rule_len}, $options{ans_rule_height});
+	my $rule;
+
+	if   ($rows == 1) { $rule = ans_rule($cols) }
+	else              { $rule = ans_box($rows, $cols) }
+	ANS($ans);
+
+	#
+	#  HTML_tth puts an unwanted <BR> at the beginning,
+	#  and uses a centered table.  Remove the <BR> and
+	#  align the table to the right.
+	#
+	if ($displayMode eq "HTML_tth") {
+		$math = trimString(EV2('\[' . $math . '\]'));
+		$math =~ s!<br clear="all" />!!;
+		$math =~ s!table align="center"!table align="right"!;
+	} elsif ($displayMode eq "HTML") {
+		$math = '\(' . $math . '\)';
+	} elsif ($displayMode =~ m/^HTML/) {
+		$math = '\(\displaystyle ' . $math . '\)';
+	}
+
+	MODES(
+		TeX        => "\n" . '\[' . $math . '=\hbox to 8em{' . $rule . '}\]',
+		Latex2HTML => $bHTML
+			. '<TR><TD ALIGN="RIGHT">'
+			. $eHTML
+			. '\(\displaystyle '
+			. $math . '\)'
+			. $bHTML
+			. '</TD><TD>&nbsp;=&nbsp;&nbsp;</TD>' . '<TD>'
+			. $eHTML
+			. $rule
+			. $bHTML
+			. '</TD></TR>'
+			. '<TR><TD></TD><TD></TD><TD>'
+			. $eHTML,
+		HTML => '<TR><TD ALIGN="RIGHT">'
+			. $math
+			. '</TD><TD>&nbsp;=&nbsp;&nbsp;</TD>' . '<TD>'
+			. $rule
+			. '</TD></TR><TR><TD COLSPAN="2"></TD><TD>'
+	);
 }
 
 sub EndExample {
-  MODES(
-    TeX => "\n",
-    Latex2HTML => $bHTML.'<BR><BR></TD></TR>'.$eHTML,
-    HTML => '<BR><BR></TD></TR>'
-  );
+	MODES(
+		TeX        => "\n",
+		Latex2HTML => $bHTML . '<BR><BR></TD></TR>' . $eHTML,
+		HTML       => '<BR><BR></TD></TR>'
+	);
 }
 
 sub ExampleRule {
-  MODES(
-    TeX => '\par',
-    Latex2HTML => $bHTML.'<TR><TD COLSPAN="3"><HR></TD></TR>'.$eHTML,
-    HTML => '<TR><TD COLSPAN="3"><HR></TD></TR>'
-  );
+	MODES(
+		TeX        => '\par',
+		Latex2HTML => $bHTML . '<TR><TD COLSPAN="3"><HR></TD></TR>' . $eHTML,
+		HTML       => '<TR><TD COLSPAN="3"><HR></TD></TR>'
+	);
 }
 
 #
 #  Produce a TeX version and an answer checker for the formula
 #
-sub DisplayQA {my $f = shift; return (DMATH($f->TeX),$f->cmp)}
-sub QA {my $f = shift; return ($f->TeX,$f->cmp)}
+sub DisplayQA { my $f = shift; return (DMATH($f->TeX), $f->cmp) }
+sub QA        { my $f = shift; return ($f->TeX,        $f->cmp) }
 
 ##################################################
 #
@@ -181,49 +189,47 @@ sub ExampleRule {
 #
 
 sub MathIMG {
-  my ($img,$text,$tex) = @_;
-  my $useTeX = MODES(TeX => 1, Latex2HTML => 0, HTML => 0, HTML_tth => 0, HTML_dpng => 1);
-  return '\('.$tex.'\)' if $useTeX;
-  $img = alias($img);
-  return qq{<IMG SRC="$img" BORDER="0" ALIGN="MIDDLE" ALT="$text">};
+	my ($img, $text, $tex) = @_;
+	my $useTeX = MODES(TeX => 1, Latex2HTML => 0, HTML => 0, HTML_tth => 0, HTML_dpng => 1);
+	return '\(' . $tex . '\)' if $useTeX;
+	$img = alias($img);
+	return qq{<IMG SRC="$img" BORDER="0" ALIGN="MIDDLE" ALT="$text">};
 }
 
-
 ##################################################
 #
 #  A simple grader that always returns a score of 1.
 #  This is used in the tutorial to give students
 #  credit for reading a problem (even if it doesn't
 #  ask any questions).
-#  
+#
 sub forgiving_grader {
-    my $rh_evaluated_answers = shift;
-    my $rh_problem_state = shift;
-    my %form_options = @_;
-    my %evaluated_answers = %{$rh_evaluated_answers};
-    my %problem_state =	%{$rh_problem_state};
-    
-    my %problem_result = (
-       score  => 1,   # always return 1
-       errors => '',
-       type   => 'forgiving_grader',
-       msg    => '',
-    );
-    
-    return(\%problem_result,\%problem_state)
-      if (!$form_options{answers_submitted});
-    
-    $problem_state{recorded_score} = $problem_result{score};
-    $problem_state{num_of_correct_ans}++;
-    
-    (\%problem_result, \%problem_state);
+	my $rh_evaluated_answers = shift;
+	my $rh_problem_state     = shift;
+	my %form_options         = @_;
+	my %evaluated_answers    = %{$rh_evaluated_answers};
+	my %problem_state        = %{$rh_problem_state};
+
+	my %problem_result = (
+		score  => 1,                    # always return 1
+		errors => '',
+		type   => 'forgiving_grader',
+		msg    => '',
+	);
+
+	return (\%problem_result, \%problem_state)
+		if (!$form_options{answers_submitted});
+
+	$problem_state{recorded_score} = $problem_result{score};
+	$problem_state{num_of_correct_ans}++;
+
+	(\%problem_result, \%problem_state);
 }
 
 ##################################################
 #
 #  Syntactic sugar to avoid ugly ~~& construct in PG.
 #
-sub install_forgiving_grader {install_problem_grader(\&forgiving_grader)}
-
+sub install_forgiving_grader { install_problem_grader(\&forgiving_grader) }
 
 1;
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob01.pg b/courses.dist/modelCourse/templates/setOrientation/prob01.pg
index 3c34350fb8..f86f4bcff4 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob01.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob01.pg
@@ -8,8 +8,6 @@ loadMacros(
 );
 
 
-TEXT(beginproblem());
-
 Title("Understanding $WW Problem Pages");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob02.pg b/courses.dist/modelCourse/templates/setOrientation/prob02.pg
index 590e2b288c..eb10283bed 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob02.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob02.pg
@@ -8,8 +8,6 @@ loadMacros(
 );
 
 
-TEXT(beginproblem());
-
 Title("Controlling $WW");
 
 ##############################################
@@ -25,9 +23,10 @@ The ${LQ}Submit Answers$RQ button causes $WW to check your answers and
 report your score for the problem.  Usually you can continue to work on a
 problem until you get it right, so don't be afraid to submit your
 answer even if you have only finished parts of the problem or are
-not sure of the correctness of your answer.  Sometimes (e.g. for 
+not sure of the correctness of your answer.  Sometimes (e.g. for
 multiple choice or true/false type questions) your instructor
-may limit the number of attempts allowed on a problem. At the bottom of the page you will see how many attempts you have remaining. If the due date is
+may limit the number of attempts allowed on a problem. At the bottom of the
+page you will see how many attempts you have remaining. If the due date is
 passed and the answers are available, you can click the ${LQ}Show
 Correct Answers$RQ button before pressing ${LQ}Submit$RQ.
 If you do, the correct answer(s) will be displayed in the answer area
@@ -39,11 +38,12 @@ answer is incorrect when you think it's right, you may want to use the
 ${LQ}Preview My Answers$RQ button.  This will ask $WW to display at the
 top of the page its interpretation of what you have entered.  This
 can be used to help spot errors in your typing, and verify that $WW
-understands your answer the way you intend it to. And it does not count as an attempt on the problem. (This is discussed
-further in a later problem.)
+understands your answer the way you intend it to. And it does not count
+as an attempt on the problem. (This is discussed further in a later problem.)
 $PAR
 
-The ${LQ}User Settings$RQ link under the ${LQ}MAIN MENU$RQ at the left has a ${LQ}Change Display Options$RQ section that allows you to
+The ${LQ}User Settings$RQ link under the sidebar navigation at the left
+has a ${LQ}Change Display Options$RQ section that allows you to
 change how the problem is displayed.  The equations within the problem
 can be represented in two different ways:
 
@@ -56,9 +56,11 @@ if you want to print out a single problem.
 $ITEMSEP
 
 $ITEM
-${LQ}MathJax${RQ} mode is the default choice (what $WW uses unless you tell 
+${LQ}MathJax${RQ} mode is the default choice (what $WW uses unless you tell
 it otherwise). It uses Cascading Style
-Sheets (CSS) with web fonts or SVG, instead of bitmap images or Flash, so equations scale with surrounding text at all zoom levels.  MathJax is compatible with screenreaders and provides zoom for everyone.
+Sheets (CSS) with web fonts or SVG, instead of bitmap images or Flash, so
+equations scale with surrounding text at all zoom levels.  MathJax is
+compatible with screenreaders and provides zoom for everyone.
 
 \{EndParList("UL")\}
 $PAR
@@ -67,8 +69,9 @@ Choose whichever mode is most comfortable for you.  You can always
 select a different mode if a particular problem needs it.  Here is a
 sample of some simple mathematics, \(x^2 + 3\), and a more complicated
 expression, \(\frac{x(1-x)}{2x + 1}\).  Try changing the display mode
-by clicking the ${LQ}User Settings$RQ link, selecting the  ${LQ}images${RQ} radio
-button, pressing the ${LQ}Change User Settings${RQ} button and then displaying problem 2 again.  Then change the display mode to back to
+by clicking the ${LQ}User Settings$RQ link, selecting the  ${LQ}images${RQ}
+radio button, pressing the ${LQ}Change User Settings${RQ} button and then
+displaying problem 2 again.  Then change the display mode to back to
 ${LQ}MathJax$RQ mode for the rest of the homework set.
 $PAR
 
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob03.pg b/courses.dist/modelCourse/templates/setOrientation/prob03.pg
index fef926ba5d..8692f83f1c 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob03.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob03.pg
@@ -12,7 +12,6 @@ loadMacros(
 
 $showPartialCorrectAnswers = 1;
 
-TEXT(beginproblem());
 Title("Typing in Your Answers");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob04.pg b/courses.dist/modelCourse/templates/setOrientation/prob04.pg
index 09a051ade6..4f7e93577c 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob04.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob04.pg
@@ -13,7 +13,6 @@ loadMacros(
 
 $showPartialCorrectAnswers = 1;
 
-TEXT(beginproblem());
 Title("Rules of Precedence");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob05/prob05.pg b/courses.dist/modelCourse/templates/setOrientation/prob05/prob05.pg
index 3e9f0f9fb2..7eaffa7d5d 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob05/prob05.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob05/prob05.pg
@@ -12,8 +12,6 @@ loadMacros(
 
 $showPartialCorrectAnswers = 1;
 
-TEXT(beginproblem);
-
 Title("Common Errors to Avoid");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob06.pg b/courses.dist/modelCourse/templates/setOrientation/prob06.pg
index 0cb30734d2..14da12db6a 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob06.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob06.pg
@@ -15,7 +15,6 @@ Context("Numeric")->variables->are(y=>'Real'); $y = Formula('y');
 Context("Numeric")->variables->are(x=>'Real'); $x = Formula('x');
 Context()->flags->set(limits=>[0,2]);
 
-TEXT(beginproblem());
 Title("Using Parentheses Effectively");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob07.pg b/courses.dist/modelCourse/templates/setOrientation/prob07.pg
index ae4813dda1..31c041518b 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob07.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob07.pg
@@ -13,7 +13,6 @@ loadMacros(
 
 $showPartialCorrectAnswers = 1;
 
-TEXT(beginproblem());
 Title("Constants and Functions in $WW");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob08.pg b/courses.dist/modelCourse/templates/setOrientation/prob08.pg
index 4534a5c325..a8f06aba30 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob08.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob08.pg
@@ -14,7 +14,6 @@ Context("Numeric")->variables->are(x=>'Real'); $x = Formula('x');
 
 $showPartialCorrectAnswers = 1;
 
-TEXT(beginproblem());
 Title("Rules of Precedence (Again)");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob09.pg b/courses.dist/modelCourse/templates/setOrientation/prob09.pg
index 08c31ab5ce..7d65426f03 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob09.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob09.pg
@@ -10,7 +10,6 @@ loadMacros(
 
 $showPartialCorrectAnswers = 1;
 
-TEXT(beginproblem());
 Title("Non-Numeric Answers");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob10.pg b/courses.dist/modelCourse/templates/setOrientation/prob10.pg
index 2b1d392e58..d0c0d6d24a 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob10.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob10.pg
@@ -11,7 +11,6 @@ loadMacros(
 
 $showPartialCorrectAnswers = 1;
 
-TEXT(beginproblem());
 Title("Points and Vectors");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob11.pg b/courses.dist/modelCourse/templates/setOrientation/prob11.pg
index ca5a2227c5..9703f9b6d1 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob11.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob11.pg
@@ -10,7 +10,6 @@ loadMacros(
 
 $showPartialCorrectAnswers = 1;
 
-TEXT(beginproblem());
 Title("Multiple Answers in One Blank");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob12.pg b/courses.dist/modelCourse/templates/setOrientation/prob12.pg
index 117d7992e3..13c2574f1d 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob12.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob12.pg
@@ -9,7 +9,6 @@ loadMacros(
   "PGcourse.pl",
 );
 
-TEXT(beginproblem());
 Title("True/False Questions in $WW");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob13.pg b/courses.dist/modelCourse/templates/setOrientation/prob13.pg
index 7c43672d71..261adc2840 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob13.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob13.pg
@@ -9,7 +9,6 @@ loadMacros(
   "PGcourse.pl",
 );
 
-TEXT(beginproblem());
 Title("Matching Lists in $WW");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob14/prob14.pg b/courses.dist/modelCourse/templates/setOrientation/prob14/prob14.pg
index 0e4402efe7..41a89857e5 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob14/prob14.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob14/prob14.pg
@@ -17,8 +17,6 @@ loadMacros(
 $htmlWebworkURL = "http://omega.math.union.edu/webwork2_files/local";
 $hintURL = "${htmlWebworkURL}/parserOrientation/prob14-hint.html";
 
-TEXT(beginproblem);
-
 Title("Matching Graphs in $WW");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob15.pg b/courses.dist/modelCourse/templates/setOrientation/prob15.pg
index cebd3a369b..b8d710bd55 100644
--- a/courses.dist/modelCourse/templates/setOrientation/prob15.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/prob15.pg
@@ -8,8 +8,6 @@ loadMacros(
 );
 
 
-TEXT(beginproblem());
-
 Title("When You're Stuck...");
 
 ##############################################
diff --git a/courses.dist/modelCourse/templates/setOrientation/setHeader.pg b/courses.dist/modelCourse/templates/setOrientation/setHeader.pg
index a0ac5fca53..ff9221ab30 100644
--- a/courses.dist/modelCourse/templates/setOrientation/setHeader.pg
+++ b/courses.dist/modelCourse/templates/setOrientation/setHeader.pg
@@ -10,21 +10,20 @@ $WW = "WeBWorK";
 
 if ($displayMode eq 'TeX') {
 
-TEXT($BEGIN_ONE_COLUMN,
+TEXT(
     '\noindent{\large\bf '.$studentName.'}\hfill{\large\bf '.$course.'}',
     '\par\noindent',
 "
-This set of $WW problems is designed to orient you to the 
-$WW system and to help you learn how to communicate with the 
+This set of $WW problems is designed to orient you to the
+$WW system and to help you learn how to communicate with the
 software. You will be learning about how to understand what
-you see on the screen and about how to enter your answers when you do 
+you see on the screen and about how to enter your answers when you do
 the problems. You will practice entering numerical and functional
-expressions and look at ways to find and correct errors in your 
+expressions and look at ways to find and correct errors in your
 entries.
 
 ",
      "WeBWorK assignment $setNumber closes on $formattedDueDate.",
-     $END_ONE_COLUMN
 );
 
 } else {
@@ -43,27 +42,29 @@ ways to find and correct errors in your entries.
 $PAR
 
 Start by examining the features of this page.  The panels at the
-left (the ${LQ}MAIN MENU${RQ}) and top help you to navigate to the different 
+left and top help you to navigate to the different
 pages available in WeBWorK.  Note you can collapse and
-uncollapse the ${LQ}MAIN MENU${RQ} by clicking on the boxed angle bracket just above the boldface course name so if you don't see the MAIN MENU click 
-on the boxed angle bracket to make MAIN MENU reappear.
+uncollapse the sidebar navigation by clicking on the three bars
+"hamburger" icon in the top left, so if you don't see the sidebar
+menu, click the three bars to make it reappear.
 
 $PAR
-On the left, in the ${LQ}MAIN MENU${RQ} panel, you have already 
+On the left, in the sidebar navigation, you have already
 seen the ${LQ}Homework Sets${RQ} page,
 which lists all the homework assignments that have
 been assigned to you.  Links allow you to go to any assignment
-you want to work on.  
+you want to work on.
 $PAR
 The ${LQ}User Settings${RQ} page lets you change your password,
-email address and display options. Display Options gives you control 
-over how you want math equations displayed.  For example with 
-${LQ}MathJax${RQ} you can control the size of equations, have access to accessibility options, etc.  The ${LQ}Grades${RQ} page 
+email address and display options. Display Options gives you control
+over how you want math equations displayed.  For example with
+${LQ}MathJax${RQ} you can control the size of equations, have access
+to accessibility options, etc.  The ${LQ}Grades${RQ} page
 shows your scores on the various assignments (but there is nothing
 much to show at this point).
 $PAR
 
-Links to your homework assignments are also listed in the ${LQ}Sets${RQ} 
+Links to your homework assignments are also listed in the ${LQ}Sets${RQ}
 panel so you can quickly switch to another assignment.
 $PAR
 
@@ -81,8 +82,7 @@ The data in the panel at the top of the page tells you where you
 are in WeBWorK's hierarchy of pages, but you can ignore that for the
 most part.  There is an additional logout button at the far right,
 however, that you will need to use when you are done using $WW (don't
-press it yet).  Also to the left is the boxed angle bracket that
-collapses and uncollapses the ${LQ}MAIN MENU${RQ}.
+press it yet).
 $PAR
 
 \{
@@ -100,13 +100,14 @@ the number of attempts and the score will reflect the work you have
 done.
 $PAR
 Near the bottom is a link that allows you to download a pdf ${LQ}hardcopy${RQ}
-version of your 
-whole assignment which you can print out.  This allows you to work on 
+version of your
+whole assignment which you can print out.  This allows you to work on
 the assignment without having to be connected to $WW.
 $PAR
-Also near the bottom of this and every $WW page there is an 
-${LQ}Email instructor${RQ} link that you can use to send email to your instructor.  That email, in addition to what ever you write, will 
-contain information on whatever page you are on so, e.g. if you are 
+Also near the bottom of this and every $WW page there is an
+${LQ}Email instructor${RQ} link that you can use to send email to
+your instructor.  That email, in addition to what ever you write, will
+contain information on whatever page you are on so, e.g. if you are
 working on a problem, your instructor will know what problem it is.
 
 $PAR
diff --git a/doc/devel/daemon-problem-environment b/doc/devel/daemon-problem-environment
index 183050fdf0..fd9a98e296 100644
--- a/doc/devel/daemon-problem-environment
+++ b/doc/devel/daemon-problem-environment
@@ -6,14 +6,11 @@
 	CAPA_Graphics_URL
 	CAPA_MCTools
 	CAPA_Tools
-	cgiDirectory
-	cgiURL
-	classDirectory
 	courseName
 	courseScriptsDirectory
--	displayHintsQ
+-	showHints
 	displayMode
--	displaySolutionsQ
+-	showSolutions
 	dueDate
 -	externalDvipngPath
 	externalGif2EpsPath
@@ -22,7 +19,6 @@
 	externalPng2EpsPath
 	externalTTHPath
 	fileName
-	formatedDueDate
 	formattedAnswerDate
 	formattedDueDate
 	formattedOpenDate
@@ -57,12 +53,10 @@
 -	PROBLEM_GRADER_TO_USE
 	probNum
 	psvn
-	psvnNumber
 	questionNumber
 -	QUIZ_PREFIX
 -	recitationName
 -	recitationNumber
-	scriptDirectory
 	sectionName
 	sectionNumber
 	sessionKey
@@ -73,5 +67,4 @@
 	tempDirectory
 	templateDirectory
 	tempURL
--	texDisposition
 	webworkDocsURL
diff --git a/doc/devel/headers-footers b/doc/devel/headers-footers
deleted file mode 100644
index 8cea32c548..0000000000
--- a/doc/devel/headers-footers
+++ /dev/null
@@ -1,32 +0,0 @@
-OLD VARIABLE		OLD FILE		NEW FILE			USE
-
-$SET_HEADER		paperSetHeader.pg	paperSetHeader.pg		hardcopy generation (see below)
-$PROB_HEADER		screenSetHeader.pg	screenSetHeader.pg		displayed on ProblemSet page, instructions for problem set
-$TEX_PROB_FOOTER	texProbFooter.tex	screenProblemPostamble.tex	
-$TEX_PROB_PREAMBLE	texProbPreamble.tex	screenProblemPreamble.tex	
-$TEX_SET_FOOTER		texSetFooter.tex	paperSetPostamble.tex		hardcopy generation (see below) 
-$TEX_SET_PREAMBLE	texSetPreamble.tex	paperSetPreamble.tex		hardcopy generation (see below)
-
-
-    $set->set_header  is  paperSetHeader
-$set->problem_header  is  screenSetHeader
-	---> THIS SHOULD BE CHANGED!
-
-
---------------------------------------------------------------------------------
-
-
-Hardcopy Snippets
-
-	TeX(hardcopyPreamble)
-		PG(hardcopySetHeader)
-			PG(problem)
-			TeX(hardcopyProblemDivider) unless last problem
-		PG(hardcopySetFooter)
-		TeX(hardcopySetDivider) unless last set
-	TeX(hardcopyPostamble)
-
-
-Interactive Snippets
-
-	PG(screenSetHeader)
diff --git a/doc/parser/extensions/1-function.pg b/doc/parser/extensions/1-function.pg
index 7e42c75e9f..1a4179becf 100644
--- a/doc/parser/extensions/1-function.pg
+++ b/doc/parser/extensions/1-function.pg
@@ -12,8 +12,6 @@ loadMacros(
   "parserTables.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   Use  standard numeric mode
@@ -55,7 +53,6 @@ $x = Formula('x');
 #  The problem text
 #
 BEGIN_TEXT
-$BEGIN_ONE_COLUMN
 
 In this problem, we have added a new function to the Parser: ${BTT}log2(x)${ETT}.
 (Edit the code to see how this is done.)
@@ -75,7 +72,6 @@ $PAR
      'log2(1,3)',
   )\}
 
-$END_ONE_COLUMN
 END_TEXT
 
 ###########################################################
diff --git a/doc/parser/extensions/2-function.pg b/doc/parser/extensions/2-function.pg
index bcde6c059c..2c68409c74 100644
--- a/doc/parser/extensions/2-function.pg
+++ b/doc/parser/extensions/2-function.pg
@@ -12,8 +12,6 @@ loadMacros(
   "parserTables.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   Use  standard numeric mode
@@ -55,7 +53,6 @@ $x = Formula('x');
 #  The problem text
 #
 BEGIN_TEXT
-$BEGIN_ONE_COLUMN
 
 In this problem, we have added a new function to the Parser: ${BTT}C(n,r)${ETT}.
 (Edit the code to see how this is done).
@@ -75,7 +72,6 @@ $PAR
      'C(1,2,3)',
   )\}
 
-$END_ONE_COLUMN
 END_TEXT
 
 ###########################################################
diff --git a/doc/parser/extensions/3-operator.pg b/doc/parser/extensions/3-operator.pg
index 7cbdfa50c6..1fa295c30a 100644
--- a/doc/parser/extensions/3-operator.pg
+++ b/doc/parser/extensions/3-operator.pg
@@ -12,8 +12,6 @@ loadMacros(
   "parserTables.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  Define our own binary operator
@@ -86,7 +84,6 @@ $CHOOSE = MODES(TeX => '\#', HTML => '#');
 #  The problem text
 #
 BEGIN_TEXT
-$BEGIN_ONE_COLUMN
 
 In this problem, we have added a new operator to the Parser: ${BTT}n $CHOOSE r${ETT}, 
 which returns \(n\choose r\).
@@ -105,7 +102,6 @@ $PAR
     'Formula("1 # <x,3>")',
   )\}
 
-$END_ONE_COLUMN
 END_TEXT
 
 ###########################################################
diff --git a/doc/parser/extensions/4-list.pg b/doc/parser/extensions/4-list.pg
index 1056685ea7..0184117b22 100644
--- a/doc/parser/extensions/4-list.pg
+++ b/doc/parser/extensions/4-list.pg
@@ -12,8 +12,6 @@ loadMacros(
   "parserTables.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  Define our own [n,r] notation for n choose r
@@ -80,7 +78,6 @@ Context()->parens->replace('[' => {close => ']', type => 'Choose'});
 #  The problem text
 #
 BEGIN_TEXT
-$BEGIN_ONE_COLUMN
 
 In this problem, we have added a new list to the Parser: ${BTT}[n,r]${ETT}, 
 which returns \(n\choose r\).
@@ -98,7 +95,6 @@ $PAR
     'Formula("[x,<1,2>]")',
   )\}
 
-$END_ONE_COLUMN
 END_TEXT
 
 ###########################################################
diff --git a/doc/parser/extensions/5-operator.pg b/doc/parser/extensions/5-operator.pg
index 0ccd57b9aa..60dea5eb2b 100644
--- a/doc/parser/extensions/5-operator.pg
+++ b/doc/parser/extensions/5-operator.pg
@@ -12,8 +12,6 @@ loadMacros(
   "parserTables.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  Define our own operator for equality
@@ -63,7 +61,6 @@ Context()->operators->add(
 #  The problem text
 #
 BEGIN_TEXT
-$BEGIN_ONE_COLUMN
 
 In this problem, we have added a new operator to the Parser: ${BTT} a
 = b${ETT}, for equality.
@@ -81,7 +78,6 @@ $PAR
     'Formula("x + y = 0, 3x-y = 4")', # you CAN get a list of equalities
   )\}
 
-$END_ONE_COLUMN
 END_TEXT
 
 ###########################################################
diff --git a/doc/parser/extensions/6-precedence.pg b/doc/parser/extensions/6-precedence.pg
index a3e1f24155..5997a2a838 100644
--- a/doc/parser/extensions/6-precedence.pg
+++ b/doc/parser/extensions/6-precedence.pg
@@ -13,8 +13,6 @@ loadMacros(
   "parserTables.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  Use standard precedences for multiplication
@@ -61,7 +59,6 @@ $nonstandard = ParserTable(
 #  The problem text
 #
 BEGIN_TEXT
-$BEGIN_ONE_COLUMN
 
 In this problem, we compare the standard and non-standard precedences for
 multiplication.
@@ -76,7 +73,6 @@ $PAR$BR
 $PAR
 $standard
 
-$END_ONE_COLUMN
 END_TEXT
 
 ###########################################################
diff --git a/doc/parser/extensions/7-context.pg b/doc/parser/extensions/7-context.pg
index a43ae859c1..191c22d2c7 100644
--- a/doc/parser/extensions/7-context.pg
+++ b/doc/parser/extensions/7-context.pg
@@ -12,10 +12,7 @@ loadMacros(
   "parserTables.pl",
 );
 
-TEXT(beginproblem());
-
 BEGIN_TEXT
-$BEGIN_ONE_COLUMN
 
 In this problem, we compare formulas in complex and vector contexts.
 Note the difference between how ${BTT}i${ETT} is treated in the two
@@ -78,7 +75,6 @@ $PAR
    '3*i + 4*j - k',
 )\}
 
-$END_ONE_COLUMN
 END_TEXT
 
 ###########################################################
diff --git a/doc/parser/extensions/8-answer.pg b/doc/parser/extensions/8-answer.pg
index 6f76804e82..9a45e3b720 100644
--- a/doc/parser/extensions/8-answer.pg
+++ b/doc/parser/extensions/8-answer.pg
@@ -17,8 +17,6 @@ loadMacros(
   "parserUtils.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  Use Vector context
diff --git a/doc/parser/macros/Differentiation.pl b/doc/parser/macros/Differentiation.pl
deleted file mode 100644
index b614caeeb9..0000000000
--- a/doc/parser/macros/Differentiation.pl
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#  Example of how to add new functionality to the Parser.
-#  
-#  Here we load new methods for the Parser object classes.  Note, however,
-#  that these are PERSISTANT when used with webwork2 (mod_perl), and so we
-#  need to take care not to load them more than once.  We look for the
-#  variable $Parser::Differentiation::loaded, which is defined in the
-#  differentiation package, in order to tell.
-#  
-#  DifferentiationDefs.pl is really just a copy of the
-#  Parser::Differentiation.pm file, and you really could just preload the
-#  latter instead by uncommenting the 'use Parser::Differentiation' line at
-#  the bottom of Parser.pm.  (This file is really just a sample).  The way
-#  it's done here will load it the first time it gets used, then will keep
-#  it around, so not much overhead even this way.
-#
-
-loadMacros("DifferentiationDefs.pl") unless $Parser::Differentiation::loaded;
-
-1;
diff --git a/doc/parser/macros/DifferentiationDefs.pl b/doc/parser/macros/DifferentiationDefs.pl
deleted file mode 100644
index 32c37b91aa..0000000000
--- a/doc/parser/macros/DifferentiationDefs.pl
+++ /dev/null
@@ -1,635 +0,0 @@
-#
-#  Extend differentiation to multiple variables
-#  Check differentiation for complex functions
-#  Do derivatives for norm and unit.
-#  
-#  Make shortcuts for getting numbers 1, 2, and sqrt, etc.
-#  
-
-##################################################
-#
-#  Differentiate the formula in terms of the given variable
-#
-sub Parser::D {
-  my $self = shift; my $x = shift;
-  if (!defined($x)) {
-    my @vars = keys(%{$self->{variables}});
-    my $n = scalar(@vars);
-    if ($n == 0) {
-      return $self->new('0') if $self->{isNumber};
-      $x = 'x';
-    } else {
-      $self->Error("You must specify a variable to differentiate by") unless $n ==1;
-      $x = $vars[0];
-    }
-  } else {
-    return $self->new('0') unless defined $self->{variables}{$x};
-  }
-  return $self->new($self->{tree}->D($x));
-}
-
-sub Item::D {
-  my $self = shift;
-  my $type = ref($self); $type =~ s/.*:://;
-  $self->Error("Differentiation for '$type' is not implemented",$self->{ref});
-}
-
-
-#########################################################################
-
-sub Parser::BOP::comma::D {Item::D(shift)}
-sub Parser::BOP::union::D {Item::D(shift)}
-
-sub Parser::BOP::add::D {
-  my $self = shift; my $x = shift;
-  $self = Parser::BOP->new(
-    $self->{equation},$self->{bop},
-    $self->{lop}->D($x),$self->{rop}->D($x)
-  );
-  return $self->reduce;
-}
-
-
-sub Parser::BOP::subtract::D {
-  my $self = shift; my $x = shift;
-  $self = Parser::BOP->new(
-    $self->{equation},$self->{bop},
-    $self->{lop}->D($x),$self->{rop}->D($x)
-  );
-  return $self->reduce;
-}
-
-sub Parser::BOP::multiply::D {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  $self =
-    Parser::BOP->new($equation,'+',
-      Parser::BOP->new($equation,$self->{bop},
-        $self->{lop}->D($x),$self->{rop}->copy($equation)),
-      Parser::BOP->new($equation,$self->{bop},
-        $self->{lop}->copy($equation),$self->{rop}->D($x))
-    );
-  return $self->reduce;
-}
-
-sub Parser::BOP::divide::D {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  $self =
-    Parser::BOP->new($equation,$self->{bop},
-      Parser::BOP->new($equation,'-',
-        Parser::BOP->new($equation,'*',
-          $self->{lop}->D($x),$self->{rop}->copy($equation)),
-        Parser::BOP->new($equation,'*',
-          $self->{lop}->copy($equation),$self->{rop}->D($x))
-      ),
-      Parser::BOP->new($equation,'^',
-        $self->{rop},Parser::Number->new($equation,2)
-      )
-    );
-  return $self->reduce;
-}
-
-sub Parser::BOP::power::D {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  my $vars = $self->{rop}->getVariables;
-  if (defined($vars->{$x})) {
-    $vars = $self->{lop}->getVariables;
-    if (defined($vars->{$x})) {
-      $self =
-        Parser::Function->new($equation,'exp',
-          [Parser::BOP->new($equation,'*',$self->{rop}->copy($equation),
-            Parser::Function->new($equation,'log',[$self->{lop}->copy($equation)],0))]);
-       return $self->D($x);
-    }
-    $self = Parser::BOP->new($equation,'*',
-      Parser::Function->new($equation,'log',[$self->{lop}->copy($equation)],0),
-      Parser::BOP->new($equation,'*',
-        $self->copy($equation),$self->{rop}->D($x))
-    );
-  } else {
-    $self =
-      Parser::BOP->new($equation,'*',
-        Parser::BOP->new($equation,'*',
-          $self->{rop}->copy($equation),
-          Parser::BOP->new($equation,$self->{bop},
-            $self->{lop}->copy($equation),
-            Parser::BOP->new($equation,'-',
-              $self->{rop}->copy($equation),
-              Parser::Number->new($equation,1)
-            )
-          )
-        ),
-        $self->{lop}->D($x)
-      );
-  }
-  return $self->reduce;
-}
-
-sub Parser::BOP::cross::D      {Item::D(shift)}
-sub Parser::BOP::dot::D        {Item::D(shift)}
-sub Parser::BOP::underscore::D {Item::D(shift)}
-
-#########################################################################
-
-sub Parser::UOP::plus::D {
-  my $self = shift; my $x = shift;
-  return $self->{op}->D($x)
-}
-
-sub Parser::UOP::minus::D {
-  my $self = shift; my $x = shift;
-  $self = Parser::UOP->new($self->{equation},'u-',$self->{op}->D($x));
-  return $self->reduce;
-}
-
-sub Parser::UOP::factorial::D  {Item::D(shift)}
-
-#########################################################################
-
-sub Parser::Function::D {
-  my $self = shift;
-  $self->Error("Differentiation of '$self->{name}' not implemented",$self->{ref});
-}
-
-sub Parser::Function::D_chain {
-  my $self = shift; my $x = $self->{params}[0];
-  my $name = "D_" . $self->{name};
-  $self = Parser::BOP->new($self->{equation},'*',$self->$name($x->copy),$x->D(shift));
-  return $self->reduce;
-}
-
-#############################
-
-sub Parser::Function::trig::D {Parser::Function::D_chain(@_)}
-
-sub Parser::Function::trig::D_sin {
-  my $self = shift; my $x = shift;
-  return Parser::Function->new($self->{equation},'cos',[$x]);
-}
-
-sub Parser::Function::trig::D_cos {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return 
-    Parser::UOP->new($equation,'u-',
-      Parser::Function->new($equation,'sin',[$x])
-    );
-}
-
-sub Parser::Function::trig::D_tan {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return 
-    Parser::BOP->new($equation,'^',
-      Parser::Function->new($equation,'sec',[$x]),
-      Parser::Number->new($equation,2)
-    );
-}
-
-sub Parser::Function::trig::D_cot {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return 
-    Parser::UOP->new($equation,'u-',
-      Parser::BOP->new($equation,'^',
-        Parser::Function->new($equation,'csc',[$x]),
-        Parser::Number->new($equation,2)
-      )
-    );
-}
- 
-sub Parser::Function::trig::D_sec {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return 
-    Parser::BOP->new($equation,'*',
-      Parser::Function->new($equation,'sec',[$x]),
-      Parser::Function->new($equation,'tan',[$x])
-    );
-}
-
-sub Parser::Function::trig::D_csc {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return
-    Parser::UOP->new($equation,'u-',
-      Parser::BOP->new($equation,'*',
-        Parser::Function->new($equation,'csc',[$x]),
-        Parser::Function->new($equation,'cot',[$x])
-      )
-    );
-}
-
-sub Parser::Function::trig::D_asin {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return
-    Parser::BOP->new($equation,'/',
-      Parser::Number->new($equation,1),
-      Parser::Function->new($equation,'sqrt',[
-        Parser::BOP->new($equation,'-',
-          Parser::Number->new($equation,1),
-          Parser::BOP->new($equation,'^',
-            $x,Parser::Number->new($equation,2)
-          )
-        )]
-      )
-    );
-}
-
-sub Parser::Function::trig::D_acos {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return
-    Parser::UOP->new($equation,'u-',
-      Parser::BOP->new($equation,'/',
-        Parser::Number->new($equation,1),
-        Parser::Function->new($equation,'sqrt',[
-          Parser::BOP->new($equation,'-',
-            Parser::Number->new($equation,1),
-            Parser::BOP->new($equation,'^',
-              $x,Parser::Number->new($equation,2)
-            )
-          )]
-        )
-      )
-    );
-}
-
-sub Parser::Function::trig::D_atan {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return
-    Parser::BOP->new($equation,'/',
-      Parser::Number->new($equation,1),
-      Parser::BOP->new($equation,'+',
-        Parser::Number->new($equation,1),
-        Parser::BOP->new($equation,'^',
-          $x, Parser::Number->new($equation,2)
-        )
-      )
-    );
-}
-
-sub Parser::Function::trig::D_acot {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return
-    Parser::UOP->new($equation,'u-',
-      Parser::BOP->new($equation,'/',
-        Parser::Number->new($equation,1),
-        Parser::BOP->new($equation,'+',
-          Parser::Number->new($equation,1),
-          Parser::BOP->new($equation,'^',
-            $x, Parser::Number->new($equation,2)
-          )
-        )
-      )
-    );
-}
-
-sub Parser::Function::trig::D_asec {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return
-    Parser::BOP->new($equation,'/',
-      Parser::Number->new($equation,1),
-      Parser::BOP->new($equation,'*',
-        Parser::Function->new($equation,'abs',[$x]),
-        Parser::Function->new($equation,'sqrt',[
-          Parser::BOP->new($equation,'-',
-            Parser::BOP->new($equation,'^',
-              $x, Parser::Number->new($equation,2)
-            ),
-            Parser::Number->new($equation,1)
-          )]
-        )
-      )
-    );
-}
-
-sub Parser::Function::trig::D_acsc {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return
-    Parser::UOP->new($equation,'u-',
-      Parser::BOP->new($equation,'/',
-        Parser::Number->new($equation,1),
-        Parser::BOP->new($equation,'*',
-          Parser::Function->new($equation,'abs',[$x]),
-          Parser::Function->new($equation,'sqrt',[
-            Parser::BOP->new($equation,'-',
-              Parser::BOP->new($equation,'^',
-                $x, Parser::Number->new($equation,2)
-              ),
-              Parser::Number->new($equation,1)
-            )]
-          )
-        )
-      )
-    );
-}
-
-
-#############################
-
-sub Parser::Function::hyperbolic::D {Parser::Function::D_chain(@_)}
-
-sub Parser::Function::hyperbolic::D_sinh {
-  my $self = shift; my $x = shift;
-  return Parser::Function->new($self->{equation},'cosh',[$x]);
-}
-
-sub Parser::Function::hyperbolic::D_cosh {
-  my $self = shift; my $x = shift;
-  return Parser::Function->new($self->{equation},'sinh',[$x]);
-}
-
-sub Parser::Function::hyperbolic::D_tanh {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return 
-    Parser::BOP->new($equation,'^',
-      Parser::Function->new($equation,'sech',[$x]),
-      Parser::Number->new($equation,2)
-    );
-}
-
-sub Parser::Function::hyperbolic::D_coth {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return 
-    Parser::UOP->new($equation,'u-',
-      Parser::BOP->new($equation,'^',
-        Parser::Function->new($equation,'csch',[$x]),
-        Parser::Number->new($equation,2)
-      )
-    );
-}
- 
-sub Parser::Function::hyperbolic::D_sech {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return 
-    Parser::UOP->new($equation,'u-',
-      Parser::BOP->new($equation,'*',
-        Parser::Function->new($equation,'sech',[$x]),
-        Parser::Function->new($equation,'tanh',[$x])
-      )
-    );
-}
-
-sub Parser::Function::hyperbolic::D_csch {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return
-    Parser::UOP->new($equation,'u-',
-      Parser::BOP->new($equation,'*',
-        Parser::Function->new($equation,'csch',[$x]),
-        Parser::Function->new($equation,'coth',[$x])
-      )
-    );
-}
-
-sub Parser::Function::hyperbolic::D_asinh {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return
-    Parser::BOP->new($equation,'/',
-      Parser::Number->new($equation,1),
-      Parser::Function->new($equation,'sqrt',[
-        Parser::BOP->new($equation,'+',
-          Parser::Number->new($equation,1),
-          Parser::BOP->new($equation,'^',
-            $x, Parser::Number->new($equation,2)
-          )
-        )]
-      )
-    );
-}
-
-sub Parser::Function::hyperbolic::D_acosh {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return
-    Parser::BOP->new($equation,'/',
-      Parser::Number->new($equation,1),
-      Parser::Function->new($equation,'sqrt',[
-        Parser::BOP->new($equation,'-',
-          Parser::BOP->new($equation,'^',
-            $x, Parser::Number->new($equation,2)
-          ),
-          Parser::Number->new($equation,1)
-        )]
-      )
-    );
-}
-
-sub Parser::Function::hyperbolic::D_atanh {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return
-    Parser::BOP->new($equation,'/',
-      Parser::Number->new($equation,1),
-      Parser::BOP->new($equation,'-',
-        Parser::Number->new($equation,1),
-        Parser::BOP->new($equation,'^',
-          $x, Parser::Number->new($equation,2)
-        )
-      )
-    );
-}
-
-sub Parser::Function::hyperbolic::D_acoth {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return
-    Parser::BOP->new($equation,'/',
-      Parser::Number->new($equation,1),
-      Parser::BOP->new($equation,'-',
-        Parser::Number->new($equation,1),
-        Parser::BOP->new($equation,'^',
-          $x, Parser::Number->new($equation,2)
-        )
-      )
-    );
-}
-
-sub Parser::Function::hyperbolic::D_asech {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return
-    Parser::UOP->new($equation,'u-',
-      Parser::BOP->new($equation,'/',
-        Parser::Number->new($equation,1),
-        Parser::BOP->new($equation,'*',
-          $x,
-          Parser::Function->new($equation,'sqrt',[
-            Parser::BOP->new($equation,'-',
-              Parser::Number->new($equation,1),
-              Parser::BOP->new($equation,'^',
-                $x, Parser::Number->new($equation,2)
-              )
-            )]
-          )
-        )
-      )
-    );
-}
-
-sub Parser::Function::hyperbolic::D_acsch {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return
-    Parser::UOP->new($equation,'u-',
-      Parser::BOP->new($equation,'/',
-        Parser::Number->new($equation,1),
-        Parser::BOP->new($equation,'*',
-          Parser::Function->new($equation,'abs',[$x]),
-          Parser::Function->new($equation,'sqrt',[
-            Parser::BOP->new($equation,'+',
-              Parser::Number->new($equation,1),
-              Parser::BOP->new($equation,'^',
-                $x, Parser::Number->new($equation,2)
-              )
-            )]
-          )
-        )
-      )
-    );
-}
-
-
-#############################
-
-sub Parser::Function::numeric::D {Parser::Function::D_chain(@_)}
-
-sub Parser::Function::numeric::D_log {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return Parser::BOP->new($equation,'/',Parser::Number->new($equation,1),$x);
-}
-
-sub Parser::Function::numeric::D_log10 {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return
-    Parser::BOP->new($equation,'/',
-      Parser::Number->new($equation,1),
-      Parser::BOP->new($equation,'*',
-        Parser::Number->new($equation,CORE::log(10)), $x
-      )
-    );
-}
-
-sub Parser::Function::numeric::D_exp {
-  my $self = shift; my $x = shift;
-  return $self->copy();
-}
-
-sub Parser::Function::numeric::D_sqrt {
-  my $self = shift; my $x = shift;
-  my $equation = $self->{equation};
-  return
-    Parser::BOP->new($equation,'/',
-      Parser::Number->new($equation,1),
-      Parser::BOP->new($equation,'*',
-        Parser::Number->new($equation,2),
-        $self->copy
-      )
-    );
-}
- 
-sub Parser::Function::numeric::D_abs {Parser::Function::D(@_)} 
-sub Parser::Function::numeric::D_int {Parser::Function::D(@_)} 
-sub Parser::Function::numeric::D_sgn {Parser::Function::D(@_)} 
-
-#########################################################################
-
-sub Parser::List::D {
-  my $self = shift; my $x = shift;
-  $self = $self->copy($self->{equation});
-  foreach my $f (@{$self->{coords}}) {$f = $f->D($x)}
-  return $self->reduce;
-}
-
-
-sub Parser::List::Interval::D {
-  my $self = shift;
-  $self->Error("Can't differentiate intervals",$self->{ref});
-}
-
-sub Parser::List::AbsoluteValue::D {
-  my $self = shift;
-  $self->Error("Can't differentiate absolute values",$self->{ref});
-}
-
-
-#########################################################################
-
-sub Parser::Number::D {Parser::Number->new(shift->{equation},0)}
-
-#########################################################################
-
-sub Parser::Complex::D {Parser::Number->new(shift->{equation},0)}
-
-#########################################################################
-
-sub Parser::Constant::D {Parser::Number->new(shift->{equation},0)}
-
-#########################################################################
-
-sub Parser::Value::D {
-  my $self = shift; my $x = shift; my $equation = $self->{equation};
-  return Parser::Value->new($equation,$self->{value}->D($x,$equation));
-}
-
-sub Value::D {
-  my $self = shift; my $x = shift; my $equation = shift;
-  return 0 if $self->isComplex;
-  my @coords = @{$self->{data}};
-  foreach my $n (@coords)
-    {if (ref($n) eq "") {$n = 0} else {$n = $n->D($x,$equation)->data}}
-  return $self->new([@coords]);
-}
-
-sub Value::List::D {
-  my $self = shift; my $x = shift; my $equation = shift;
-  my @coords = @{$self->{data}};
-  foreach my $n (@coords)
-    {if (ref($n) eq "") {$n = 0} else {$n = $n->D($x)}}
-  return $self->new([@coords]);
-}
-
-sub Value::Interval::D {
-  shift; shift; my $self = shift;
-  $self->Error("Can't differentiate intervals",$self->{ref});
-}
-
-sub Value::Union::D {
-  shift; shift; my $self = shift;
-  $self->Error("Can't differentiate unions",$self->{ref});
-}
-
-#########################################################################
-
-sub Parser::Variable::D {
-  my $self = shift; my $x = shift;
-  my $d = ($self->{name} eq $x)? 1: 0;
-  return Parser::Number->new($self->{equation},$d);
-}
-
-#########################################################################
-
-sub Parser::String::D {Parser::Number->new(shift->{equation},0)}
-
-#########################################################################
-
-package Parser::Differentiation;
-our $loaded = 1;
-
-#########################################################################
-
-1;
diff --git a/doc/parser/macros/parserTables.pl b/doc/parser/macros/parserTables.pl
deleted file mode 100644
index bd382392f6..0000000000
--- a/doc/parser/macros/parserTables.pl
+++ /dev/null
@@ -1,87 +0,0 @@
-loadMacros("parserUtils.pl");
-
-#############################################
-#
-#  For Parser example tables:
-#
-
-$BTT = MODES(TeX=>'{\tt ', Latex2HTML => $bHTML.'<TT>'.$eHTML, HTML => '<TT>');
-$ETT = MODES(TeX=>'}', Latex2HTML => $bHTML.'</TT>'.$eHTML, HTML => '</TT>');
-
-$BC = MODES(
-  TeX=>'{\small\it ',
-  Latex2HTML => $bHTML.'<SMALL><I>'.$eHTML,
-  HTML => '<SMALL><I>'
-);
-$EC = MODES(
-  TeX=>'}',
-  Latex2HTML => $bHTML.'</I></SMALL>'.$eHTML,
-  HTML => '</I></SMALL>'
-);
-
-$LT = MODES(TeX => "<", Latex2HTML => "<", HTML => '&lt;');
-$GT = MODES(TeX => ">", Latex2HTML => ">", HTML => '&gt;');
-
-$TEX = MODES(TeX => '{\TeX}', HTML => 'TeX', HTML_dpng => '\(\bf\TeX\)');
-
-@rowOptions = (
-  indent => 0,
-  separation => 0,
-  align => 'LEFT" NOWRAP="1',  # alignment hack to get NOWRAP
-);
-
-sub ParserRow {
-  my $f = shift; my $t = '';
-  Context()->clearError;
-  my ($s,$err) = PG_restricted_eval($f);
-  if (defined $s) {
-    my $ss = $s;
-    if (ref($s) && \&{$s->string}) {
-      $t = '\('.$s->TeX.'\)';
-      $s = $s->string;
-    } elsif ($s !~ m/^[a-z]+$/i) {
-      $t = '\('.Formula($s)->TeX.'\)';
-      $s = Formula($s)->string;
-    }
-    $s =~ s/</$LT/g; $s =~ s/>/$GT/g;
-    if (ref($ss) && \&{$ss->class}) {
-      if ($ss->class eq 'Formula') {
-	$s .= ' '.$BC.'(Formula returning '.$ss->showType.')'.$EC;
-      } else {
-	$s .= ' '.$BC.'('.$ss->class.' object)'.$EC;
-      }
-    }
-  } else {
-    $s = $BC. (Context()->{error}{message} || $err) . $EC;
-    $t = '';
-  }
-  $f =~ s/</$LT/g; $f =~ s/>/$GT/g;
-  if ($displayMode eq 'TeX') {
-    $f =~ s/\^/\\char`\\^/g; $s =~ s/\^/\\char`\\^/g;
-    $f =~ s/#/\\#/g; $s =~ s/#/\\#/g;
-  }
-  my $row = Row([$BTT.$f.$ETT,$BTT.$s.$ETT,$t],@rowOptions);
-  $row =~ s/\$/\${DOLLAR}/g;
-  return $row;
-}
-
-sub ParserTable {
-  my $table = 
-    BeginTable(border=>1, padding=>20).
-      Row([$BBOLD."Perl Code".$EBOLD,
-           $BBOLD."Result".$EBOLD,
-           $BBOLD.$TEX.' version'.$EBOLD],@rowOptions);
-  foreach my $f (@_) {$table .= ParserRow($f)}
-  $table .= EndTable();
-  return $table;
-}
-
-sub Title {
-  my $title = shift;
-
-  MODES(
-    TeX => "\\par\\centerline{\\bf $title}\\par\\nobreak\n",
-    Latex2HTML => $bHTML.'<CENTER><H2>'.$title.'</H2></CENTER>'.$eHTML,
-    HTML => '<CENTER><H2>'.$title.'</H2></CENTER>'
-  );
-}
diff --git a/doc/parser/macros/parserUtils.pl b/doc/parser/macros/parserUtils.pl
deleted file mode 100644
index 4db7dd5c4d..0000000000
--- a/doc/parser/macros/parserUtils.pl
+++ /dev/null
@@ -1,61 +0,0 @@
-loadMacros(
-  "unionImage.pl",
-  "unionTables.pl",
-);
-
-$bHTML = '\begin{rawhtml}';
-$eHTML = '\end{rawhtml}';
-
-#  HTML(htmlcode)
-#  HTML(htmlcode,texcode)
-#
-#  Insert $html in HTML mode or \begin{rawhtml}$html\end{rawhtml} in
-#  Latex2HTML mode.  In TeX mode, insert nothing for the first form, and
-#  $tex for the second form.
-#
-sub HTML {
-  my ($html,$tex) = @_;
-  return('') unless (defined($html) && $html ne '');
-  $tex = '' unless (defined($tex));
-  MODES(TeX => $tex, Latex2HTML => $bHTML.$html.$eHTML, HTML => $html);
-}
-
-#
-#  Begin and end <TT> mode
-#
-$BTT = HTML('<TT>','\texttt{');
-$ETT = HTML('</TT>','}');
-
-#
-#  Begin and end <SMALL> mode
-#
-$BSMALL = HTML('<SMALL>','{\small ');
-$ESMALL = HTML('</SMALL>','}');
-
-#
-#  Block quotes
-#
-$BBLOCKQUOTE = HTML('<BLOCKQUOTE>','\hskip3em ');
-$EBLOCKQUOTE = HTML('</BLOCKQUOTE>');
-
-#
-#  Smart-quotes in TeX mode, regular quotes in HTML mode
-#
-$LQ = MODES(TeX => '``', Latex2HTML => '"', HTML => '"');
-$RQ = MODES(TeX => "''", Latex2HTML => '"', HTML => '"');
-
-#
-#  make sure all characters are displayed
-#
-sub protectHTML {
-    my $string = shift;
-    $string =~ s/&/\&amp;/g;
-    $string =~ s/</\&lt;/g;
-    $string =~ s/>/\&gt;/g;
-    $string;
-}
-
-sub _parserUtils_init {}
-
-1;
-
diff --git a/doc/parser/macros/unionImage.pl b/doc/parser/macros/unionImage.pl
deleted file mode 100644
index 31162b76a3..0000000000
--- a/doc/parser/macros/unionImage.pl
+++ /dev/null
@@ -1,75 +0,0 @@
-######################################################################
-#
-#  A routine to make including images easier to control
-#
-#  Usage:  Image(name,options)
-#
-#  where name is the name of an image file or a reference to a
-#  graphics object (or a reference to a pair of one of these),
-#  and options are taken from among the following:
-#
-#    size => [w,h]           the size of the image in the HTML page
-#                            (default is [150,150])
-#
-#    tex_size => r           the size to use in TeX mode (as a percentage
-#                            of the line width times 10).  E.g., 500 is 
-#                            half the width, etc.  (default is 200.)
-#
-#    link => 0 or 1          whether to include a link to the original
-#                            image (default is 0, unless there are
-#                            two images given)
-#
-#    border => 0 or 1        size of image border in HTML mode
-#                            (defaults to 2 or 1 depending on whether
-#                            there is a link or not)
-#
-#    align => placement      vertical alignment for image in HTML mode
-#                            (default is "BOTTOM")
-#
-#    tex_center => 0 or 1    whether to center the image horizontally
-#                            in TeX mode  (default is 0)
-#
-#  The image name can be one of a number of different things.  It can be
-#  the name of an image file, or an alias to one produce by the alias()
-#  command.  It can be a graphics object reference created by init_graph().
-#  Or it can be a pair of these (in square brackets).  The first is the
-#  image for the HTML file, and the second is the image that it will be
-#  linked to.
-#
-#  Examples:  Image("graph.gif", size => [200,200]);
-#             Image(["graph.gif","graph-large.gif"]);
-#
-#  The alias() and insertGraph() functions will be called automatically
-#  when needed.
-#
-sub Image {
-  my $image = shift; my $ilink;
-  my %options = (
-    size => [150,150], tex_size => 200,
-    link => 0, align => "BOTTOM", tex_center => 0, @_);
-  my ($w,$h) = @{$options{size}};
-  my ($ratio,$link) = ($options{tex_size}*(.001),$options{link});
-  my ($border,$align) = ($options{border},$options{align});
-  my ($tcenter) = $options{tex_center};
-  my $HTML; my $TeX;
-  ($image,$ilink) = @{$image} if (ref($image) eq "ARRAY");
-  $image = alias(insertGraph($image)) if (ref($image) eq "WWPlot");
-  $image = alias($image) unless ($image =~ m!^/!i);
-  if ($ilink) {
-    $ilink = alias(insertGraph($ilink)) if (ref($ilink) eq "WWPlot");
-    $ilink = alias($ilink) unless ($ilink =~ m!^/!i);
-  } else {$ilink = $image}
-  $border = (($link || $ilink ne $image)? 2: 1) unless defined($border);
-  $HTML = '<IMG SRC="'.$image.'" WIDTH="'.$w.
-          '" HEIGHT="'.$h.'" BORDER="'.$border.'" ALIGN="'.$align.'">';
-  $HTML = '<A HREF="'.$ilink.'">'.$HTML.'</A>' if $link or $ilink ne $image;
-  $TeX = '\includegraphics[width='.$ratio.'\linewidth]{'.$image.'}';
-  $TeX = '\centerline{'.$TeX.'}' if $tcenter;
-  MODES(
-    TeX => $TeX."\n",
-    Latex2HTML => $bHTML.$HTML.$eHTML,
-    HTML => $HTML
-  );
-}
-
-1;
diff --git a/doc/parser/macros/unionTables.pl b/doc/parser/macros/unionTables.pl
deleted file mode 100644
index 8db8c8f46e..0000000000
--- a/doc/parser/macros/unionTables.pl
+++ /dev/null
@@ -1,253 +0,0 @@
-######################################################################
-##
-##  Functions for creating tables of various kinds
-##
-##    ColumnTable()           Creates a two-column display in HTML,
-##                            but only one column in TeX.
-##
-##    ColumnMatchTable()      Does a side-by-side match table
-##
-##    BeginTable()            Begin a borderless HTML table
-##    Row()                   Create a row in the table
-##    AlignedRow()            Create a row with alignment in each column
-##    TableSpace()            Insert extra vertical space in the table
-##    EndTable()              End the table
-##
-
-######################################################################
-#
-#  Make a two-column table in HTML and Latex2HTML modes
-#
-#  Usage:  ColumnTable(col1,col2,[options])
-#
-#  Options can be taken from:
-#
-#      indent => n           the width to indent the first column
-#                            (default is 0)
-#
-#      separation => n       the width of the separating gutter
-#                            (default is 50)
-#
-#      valign => type        set the vertical alignment
-#                            (default is "MIDDLE")
-#
-sub ColumnTable {
-  my $col1 = shift; my $col2 = shift;
-  my %options = (indent => 0, separation => 50, valign => "MIDDLE", @_);
-  my ($ind,$sep) = ($options{"indent"},$options{"separation"});
-  my $valign = $options{"valign"};
-
-  my ($bhtml,$ehtml) = ('\begin{rawhtml}','\end{rawhtml}');
-  ($bhtml,$ehtml) = ('','') unless ($displayMode eq "Latex2HTML");
-
-  my $HTMLtable = qq {
-    $bhtml<TABLE BORDER="0"><TR VALIGN="$valign">
-    <TD WIDTH="$ind">&nbsp;</TD><TD>$ehtml
-    $col1
-    $bhtml</TD><TD WIDTH="$sep">&nbsp;</TD><TD>$ehtml
-    $col2
-    $bhtml</TD></TR></TABLE>$ehtml
-  };
-
-  MODES(
-    TeX => '\par\medskip\hbox{\qquad\vtop{'.
-	   '\advance\hsize by -3em '.$col1.'}}'.
-           '\medskip\hbox{\qquad\vtop{'.
-           '\advance\hsize by -3em '.$col2.'}}\medskip',
-    Latex2HTML => $HTMLtable,
-    HTML => $HTMLtable
-  );
-}
-
-#
-#  Use columns for a match-list output
-#
-#  Usage:  ColumnMatchTable($ml,options)
-#
-#  where $ml is a math list reference and options are those
-#  allowed for ColumnTable above.
-#
-sub ColumnMatchTable {
-  my $ml = shift;
-
-  ColumnTable($ml->print_q,$ml->print_a,@_);
-}
-
-
-#
-#  Command for tables with no borders.
-#
-#  Usage:  BeginTable(options);
-#
-#  Options are taken from:
-#
-#    border => n           value for BORDER attribute (default 0)
-#    spacing => n          value for CELLSPACING attribute (default 0)
-#    padding => n          value for CELLPADDING attribute (default 0)
-#    tex_spacing => dimen  value for spacing between columns in TeX
-#                          (e.g, tex_spacing => 2em) (default 1em)
-#    tex_border => dimen   value for left- and right border in TeX (0pt)
-#    center => 0 or 1      center table or not (default 1)
-#
-sub BeginTable {
-  my %options = (border => 0, padding => 0, spacing => 0, center => 1,
-                 tex_spacing => "1em", tex_border => "0pt", @_);
-  my ($bd,$pd,$sp) = ($options{border},$options{padding},$options{spacing});
-  my ($tsp,$tbd) = ($options{tex_spacing},$options{tex_border});
-  my ($center,$tcenter) = (' ALIGN="CENTER"','\centerline');
-     ($center,$tcenter) = ('','') if (!$options{center});
-  my $table = 
-    qq{<TABLE BORDER="$bd" CELLPADDING="$pd" CELLSPACING="$sp"$center>};
-
-  MODES(
-    TeX => '\par\medskip'.$tcenter.'{\kern '.$tbd.
-           '\vbox{\halign{#\hfil&&\kern '.$tsp.' #\hfil',
-    Latex2HTML => $bHTML.$table.$eHTML."\n",
-    HTML => $table."\n"
-  );
-}
-
-#
-#  Usage:  EndTable(options)
-#
-#  where options are taken from:
-#
-#     tex_border => dimen     extra vertical space in TeX mode (default 0pt)
-#
-sub EndTable {
-  my %options = (tex_border => "0pt", @_);
-  my $tbd = $options{tex_border};
-  MODES(
-    TeX => '\cr}}\kern '.$tbd.'}\medskip'."\n",
-    Latex2HTML => $bHTML.'</TABLE>'.$eHTML."\n",
-    HTML => '</TABLE>'."\n"
-  );
-}
-
-#
-#  Creates a row in the table
-#
-#  Usage:  Row([item1,item2,...],options);
-#
-#  Each item appears as a separate entry in the table.
-#
-#  Options control how the row is displayed:
-#
-#    indent => num           Specifies size of blank column on the left
-#                            (default:  indent => 0)
-#
-#    separation => num       Specifies separation of columns
-#                            (default:  spearation => 30)
-#
-#    align => "type"         Specifies alignment of initial column
-#                            (default:  align => "LEFT")
-#
-#    valign => "type"        Specified vertical alignment of row
-#                            (default:  valign => "MIDDLE")
-#
-sub Row {
-  my $rowref = shift; my @row = @{$rowref};
-  my %options = (
-     indent => 0, separation => 30,
-     align => "LEFT", valign => "MIDDLE",
-     @_
-  );
-  my ($cind,$csep) = ($options{indent},$options{separation});
-  my ($align,$valign) = ($options{align},$options{valign});
-  my $sep = '<TD WIDTH="'.$csep.'">&nbsp;</TD>'; $sep = '' if ($csep < 1);
-  my $ind = '<TD WIDTH="'.$cind.'">&nbsp;</TD>'; $ind = '' if ($cind < 1);
-  my $fill = '';
-  $fill = '\hfil' if (uc($align) eq "CENTER");
-  $fill = '\hfill' if (uc($align) eq "RIGHT");
-
-  MODES(
-    TeX => "\\cr\n". $fill . join('& ',@row),
-    Latex2HTML =>
-      $bHTML."<TR VALIGN=\"$valign\">$ind<TD ALIGN=\"$align\">".$eHTML .
-      join($bHTML."</TD>$sep<TD>".$eHTML,@row) .
-      $bHTML.'</TD></TR>'.$eHTML."\n",
-    HTML => "<TR VALIGN=\"$valign\">$ind<TD ALIGN=\"$align\">" .
-      join("</TD>$sep<TD>",@row) . '</TD></TR>'."\n"
-  );
-}
-
-#
-#  AlignedRow([item1,item2,...],options);
-#
-#  Options control how the row is displayed:
-#
-#    indent => num           Specifies size of blank column on the left
-#                            (default:  indent => 0)
-#
-#    separation => num       Specifies separation of columns
-#                            (default:  spearation => 30)
-#
-#    align => "type"         Specifies alignment of all columns
-#                            (default:  align => "CENTER")
-#
-#    valign => "type"        Specified vertical alignment of row
-#                            (default:  valign => "MIDDLE")
-#
-sub AlignedRow {
-  my $rowref = shift; my @row = @{$rowref};
-  my %options = (
-     indent => 0, separation => 30,
-     align => "CENTER", valign => "MIDDLE",
-     @_
-  );
-  my ($cind,$csep) = ($options{indent},$options{separation});
-  my ($align,$valign) = ($options{align},$options{valign});
-  my $sep = '<TD WIDTH="'.$csep.'">&nbsp;</TD>'; $sep = '' if ($csep < 1);
-  my $ind = '<TD WIDTH="'.$cind.'">&nbsp;</TD>'; $ind = '' if ($cind < 1);
-  my $fill = '';
-  $fill = '\hfil ' if (uc($align) eq "CENTER");
-  $fill = '\hfill ' if (uc($align) eq "RIGHT");
-
-  MODES(
-    TeX => "\\cr\n". $fill . join('&'.$fill,@row),
-    Latex2HTML =>
-      $bHTML."<TR VALIGN=\"$valign\">$ind<TD ALIGN=\"$align\">".$eHTML .
-      join($bHTML."</TD>$sep<TD ALIGN=\"$align\">".$eHTML,@row) .
-      $bHTML.'</TD></TR>'.$eHTML."\n",
-    HTML => "<TR VALIGN=\"$valign\">$ind<TD ALIGN=\"$align\">" .
-      join("</TD>$sep<TD ALIGN=\"$align\">",@row) . '</TD></TR>'."\n"
-  );
-}
-
-#
-#  Add extra space between rows of a table
-#
-#  Usage:  TableSpace(pixels,points)
-#
-#  where pixels is the number of pixels of space in HTML mode and
-#  points is the number of points to use in TeX mode.
-#
-sub TableSpace {
-  my $rsep = shift;
-  my $tsep = shift;
-  $rsep = $tsep if (defined($tsep) && $main::displayMode eq "TeX");
-  return "" if ($rsep < 1);
-  MODES(
-    TeX => '\vadjust{\kern '.$rsep.'pt}' . "\n",
-    Latex2HTML =>
-      $bHTML.'<TR><TD HEIGHT="'.$rsep.'"><!></TD></TR>'.$eHTML."\n",
-    HTML => '<TR><TD HEIGHT="'.$rsep.'"></TD></TR>'."\n",
-  );
-}
-
-#
-#  A horizontal rule within a table.  (Could have been a variable,
-#  but all the other table commands are subroutines, so kept it
-#  one to be consistent.)
-#
-sub TableLine {
-  MODES(
-    TeX => '\vadjust{\kern2pt\hrule\kern2pt}',
-    Latex2HTML => $bHTML.
-      '<TR><TD COLSPAN="10"><HR NOSHADE SIZE="1"></TD></TR>'.
-      $eHTML."\n",
-    HTML =>'<TR><TD COLSPAN="10"><HR NOSHADE SIZE="1"></TD></TR>'."\n"
-  );
-}
-
-1;
diff --git a/doc/parser/problems/sample01.pg b/doc/parser/problems/sample01.pg
index 492f8fdb67..2d810de877 100644
--- a/doc/parser/problems/sample01.pg
+++ b/doc/parser/problems/sample01.pg
@@ -12,8 +12,6 @@ loadMacros(
   "Parser.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   Use  standard numeric mode
@@ -63,4 +61,4 @@ $showPartialCorrectAnswers = 1;
 
 ###########################################################
 
-ENDDOCUMENT();        # This should be the last executable line in the problem.
\ No newline at end of file
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/problems/sample02.pg b/doc/parser/problems/sample02.pg
index c0cc938862..b57c1fadb2 100644
--- a/doc/parser/problems/sample02.pg
+++ b/doc/parser/problems/sample02.pg
@@ -12,8 +12,6 @@ loadMacros(
   "Parser.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   Use  standard numeric mode
diff --git a/doc/parser/problems/sample03.pg b/doc/parser/problems/sample03.pg
index 15fe482fe8..d473412c87 100644
--- a/doc/parser/problems/sample03.pg
+++ b/doc/parser/problems/sample03.pg
@@ -13,8 +13,6 @@ loadMacros(
   "Differentiation.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   Use standard numeric mode
diff --git a/doc/parser/problems/sample04.pg b/doc/parser/problems/sample04.pg
index e325f1df9c..ea39ec7192 100644
--- a/doc/parser/problems/sample04.pg
+++ b/doc/parser/problems/sample04.pg
@@ -17,8 +17,6 @@ loadMacros(
   "parserUtils.pl",
 );
 
-TEXT(&beginproblem);
-
 ##############################################
 #
 #  The setup
diff --git a/doc/parser/problems/sample05.pg b/doc/parser/problems/sample05.pg
index ba69a452c4..35ba15f09f 100644
--- a/doc/parser/problems/sample05.pg
+++ b/doc/parser/problems/sample05.pg
@@ -17,8 +17,6 @@ loadMacros(
   "parserUtils.pl",
 );
 
-TEXT(&beginproblem);
-
 ##############################################
 #
 #  The setup
diff --git a/doc/parser/problems/sample06.pg b/doc/parser/problems/sample06.pg
index a15ea0b2c1..e4d8102bee 100644
--- a/doc/parser/problems/sample06.pg
+++ b/doc/parser/problems/sample06.pg
@@ -12,8 +12,6 @@ loadMacros(
   "Parser.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   The setup
diff --git a/doc/parser/problems/sample07.pg b/doc/parser/problems/sample07.pg
index cacfc7d25e..64a320dc06 100644
--- a/doc/parser/problems/sample07.pg
+++ b/doc/parser/problems/sample07.pg
@@ -11,8 +11,6 @@ loadMacros(
   "Parser.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  The setup
diff --git a/doc/parser/problems/sample08.pg b/doc/parser/problems/sample08.pg
index 42e7f332ec..6c7b6d73d1 100644
--- a/doc/parser/problems/sample08.pg
+++ b/doc/parser/problems/sample08.pg
@@ -11,8 +11,6 @@ loadMacros(
   "Parser.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  The setup
diff --git a/doc/parser/problems/sample09.pg b/doc/parser/problems/sample09.pg
index dbf228f5c2..b2a9776653 100644
--- a/doc/parser/problems/sample09.pg
+++ b/doc/parser/problems/sample09.pg
@@ -11,8 +11,6 @@ loadMacros(
   "Parser.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  The setup
diff --git a/doc/parser/problems/sample10.pg b/doc/parser/problems/sample10.pg
index b63e9e9d92..5a25b8e800 100644
--- a/doc/parser/problems/sample10.pg
+++ b/doc/parser/problems/sample10.pg
@@ -11,8 +11,6 @@ loadMacros(
   "Parser.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  The setup
diff --git a/doc/parser/problems/sample11.pg b/doc/parser/problems/sample11.pg
index 1e1c8514a0..8a1ff5e41d 100644
--- a/doc/parser/problems/sample11.pg
+++ b/doc/parser/problems/sample11.pg
@@ -11,8 +11,6 @@ loadMacros(
   "Parser.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  The setup
diff --git a/doc/parser/problems/sample12.pg b/doc/parser/problems/sample12.pg
index db981a1a7d..36222469d9 100644
--- a/doc/parser/problems/sample12.pg
+++ b/doc/parser/problems/sample12.pg
@@ -12,8 +12,6 @@ loadMacros(
   "parserUtils.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  The setup
diff --git a/doc/parser/problems/sample13.pg b/doc/parser/problems/sample13.pg
index 53d7e09671..5ad161d529 100644
--- a/doc/parser/problems/sample13.pg
+++ b/doc/parser/problems/sample13.pg
@@ -12,8 +12,6 @@ loadMacros(
   "parserUtils.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  The setup
diff --git a/doc/parser/problems/sample14.pg b/doc/parser/problems/sample14.pg
index fbe0f9dd42..5ffef3f161 100644
--- a/doc/parser/problems/sample14.pg
+++ b/doc/parser/problems/sample14.pg
@@ -12,8 +12,6 @@ loadMacros(
   "parserUtils.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  The setup
diff --git a/doc/parser/problems/sample15.pg b/doc/parser/problems/sample15.pg
index 2bb48e6140..de84abe8b1 100644
--- a/doc/parser/problems/sample15.pg
+++ b/doc/parser/problems/sample15.pg
@@ -12,8 +12,6 @@ loadMacros(
   "parserUtils.pl",
 );
 
-TEXT(beginproblem());
-
 ##########################################################
 #
 #  The setup
diff --git a/doc/parser/problems/sample16.pg b/doc/parser/problems/sample16.pg
index f81d89d65e..4317142848 100644
--- a/doc/parser/problems/sample16.pg
+++ b/doc/parser/problems/sample16.pg
@@ -13,8 +13,6 @@ loadMacros(
   "Differentiation.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   The setup
diff --git a/doc/parser/problems/sample17.pg b/doc/parser/problems/sample17.pg
index 710f801a6c..4fea5b52da 100644
--- a/doc/parser/problems/sample17.pg
+++ b/doc/parser/problems/sample17.pg
@@ -13,8 +13,6 @@ loadMacros(
   "Differentiation.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   The setup
diff --git a/doc/parser/problems/sample18.pg b/doc/parser/problems/sample18.pg
index 1321ea31f6..8d6fa17afd 100644
--- a/doc/parser/problems/sample18.pg
+++ b/doc/parser/problems/sample18.pg
@@ -13,8 +13,6 @@ loadMacros(
   "Differentiation.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   The setup
diff --git a/doc/parser/problems/sample19.pg b/doc/parser/problems/sample19.pg
index 3b29af6e59..a0c0cf0e9a 100644
--- a/doc/parser/problems/sample19.pg
+++ b/doc/parser/problems/sample19.pg
@@ -13,8 +13,6 @@ loadMacros(
   "parserUtils.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   The setup
diff --git a/doc/parser/problems/sample20.pg b/doc/parser/problems/sample20.pg
index bfe6b74f6b..ecde485d70 100644
--- a/doc/parser/problems/sample20.pg
+++ b/doc/parser/problems/sample20.pg
@@ -12,8 +12,6 @@ loadMacros(
   "Parser.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   The setup
diff --git a/doc/parser/problems/sample21.pg b/doc/parser/problems/sample21.pg
index 0a7d71addf..bf5c213f85 100644
--- a/doc/parser/problems/sample21.pg
+++ b/doc/parser/problems/sample21.pg
@@ -13,8 +13,6 @@ loadMacros(
   "parserUtils.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   The setup
diff --git a/doc/parser/problems/sample22.pg b/doc/parser/problems/sample22.pg
index 2074914724..ba43b73657 100644
--- a/doc/parser/problems/sample22.pg
+++ b/doc/parser/problems/sample22.pg
@@ -13,8 +13,6 @@ loadMacros(
   "parserUtils.pl",
 );
 
-TEXT(beginproblem());
-
 ###########################################################
 #
 #   The setup
@@ -57,4 +55,4 @@ ANS($L->cmp);
 
 ###########################################################
 
-ENDDOCUMENT();        # This should be the last executable line in the problem.
\ No newline at end of file
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/docker-config/apache/000-default.conf b/docker-config/apache/000-default.conf
deleted file mode 100644
index ab9887a59a..0000000000
--- a/docker-config/apache/000-default.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-<VirtualHost _default_:80>
-	# This fake virtual host is intented to capture traffic which
-	# spoofs the "Host:" header value for security reasons.
-	# It will deny ALL such traffic.
-	ServerName fake
-    DocumentRoot "/www/www/html"
-    <Directory /var/www/html/>
-         Order deny,allow
-         deny from all
-    </Directory>
-</VirtualHost>
-
-<VirtualHost *:80>
-    ServerName localhost
-    DocumentRoot /var/www/html
-    ErrorLog ${APACHE_LOG_DIR}/error.log
-    CustomLog ${APACHE_LOG_DIR}/access.log combined
-</VirtualHost>
-
-<VirtualHost *:80>
-	# The ServerName directive sets the request scheme, hostname and port that
-	# the server uses to identify itself. This is used when creating
-	# redirection URLs. In the context of virtual hosts, the ServerName
-	# specifies what hostname must appear in the request's Host: header to
-	# match this virtual host. For the default virtual host (this file) this
-	# value is not decisive as it is used as a last resort host regardless.
-	# However, you must set it for any further virtual host explicitly.
-
-    ServerAdmin support@mydomain.edu
-    ServerName myserver.mydomain.edu
-    ServerAlias myserver.mydomain.edu
-
-	DocumentRoot /var/www/html
-
-	UseCanonicalName On
-
-	# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
-	# error, crit, alert, emerg.
-	# It is also possible to configure the loglevel for particular
-	# modules, e.g.
-	#LogLevel info ssl:warn
-
-	ErrorLog ${APACHE_LOG_DIR}/error.log
-	CustomLog ${APACHE_LOG_DIR}/access.log combined
-
-	# For most configuration files from conf-available/, which are
-	# enabled or disabled at a global level, it is possible to
-	# include a line for only one particular virtual host. For example the
-	# following line enables the CGI configuration for this host only
-	# after it has been globally disabled with "a2disconf".
-	#Include conf-available/serve-cgi-bin.conf
-</VirtualHost>
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
diff --git a/docker-config/apache/apache2.conf b/docker-config/apache/apache2.conf
deleted file mode 100644
index e9de2b7880..0000000000
--- a/docker-config/apache/apache2.conf
+++ /dev/null
@@ -1,234 +0,0 @@
-# This is the main Apache server configuration file.  It contains the
-# configuration directives that give the server its instructions.
-# See http://httpd.apache.org/docs/2.4/ for detailed information about
-# the directives and /usr/share/doc/apache2/README.Debian about Debian specific
-# hints.
-#
-#
-# Summary of how the Apache 2 configuration works in Debian:
-# The Apache 2 web server configuration in Debian is quite different to
-# upstream's suggested way to configure the web server. This is because Debian's
-# default Apache2 installation attempts to make adding and removing modules,
-# virtual hosts, and extra configuration directives as flexible as possible, in
-# order to make automating the changes and administering the server as easy as
-# possible.
-
-# It is split into several files forming the configuration hierarchy outlined
-# below, all located in the /etc/apache2/ directory:
-#
-#	/etc/apache2/
-#	|-- apache2.conf
-#	|	`--  ports.conf
-#	|-- mods-enabled
-#	|	|-- *.load
-#	|	`-- *.conf
-#	|-- conf-enabled
-#	|	`-- *.conf
-# 	`-- sites-enabled
-#	 	`-- *.conf
-#
-#
-# * apache2.conf is the main configuration file (this file). It puts the pieces
-#   together by including all remaining configuration files when starting up the
-#   web server.
-#
-# * ports.conf is always included from the main configuration file. It is
-#   supposed to determine listening ports for incoming connections which can be
-#   customized anytime.
-#
-# * Configuration files in the mods-enabled/, conf-enabled/ and sites-enabled/
-#   directories contain particular configuration snippets which manage modules,
-#   global configuration fragments, or virtual host configurations,
-#   respectively.
-#
-#   They are activated by symlinking available configuration files from their
-#   respective *-available/ counterparts. These should be managed by using our
-#   helpers a2enmod/a2dismod, a2ensite/a2dissite and a2enconf/a2disconf. See
-#   their respective man pages for detailed information.
-#
-# * The binary is called apache2. Due to the use of environment variables, in
-#   the default configuration, apache2 needs to be started/stopped with
-#   /etc/init.d/apache2 or apache2ctl. Calling /usr/bin/apache2 directly will not
-#   work with the default configuration.
-
-
-# Global configuration
-#
-
-ServerName myserver.mydomain.edu
-ServerAdmin support@mydomain.edu
-
-#
-# ServerRoot: The top of the directory tree under which the server's
-# configuration, error, and log files are kept.
-#
-# NOTE!  If you intend to place this on an NFS (or otherwise network)
-# mounted filesystem then please read the Mutex documentation (available
-# at <URL:http://httpd.apache.org/docs/2.4/mod/core.html#mutex>);
-# you will save yourself a lot of trouble.
-#
-# Do NOT add a slash at the end of the directory path.
-#
-#ServerRoot "/etc/apache2"
-
-#
-# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
-#
-#Mutex file:${APACHE_LOCK_DIR} default
-
-#
-# The directory where shm and other runtime files will be stored.
-#
-
-DefaultRuntimeDir ${APACHE_RUN_DIR}
-
-#
-# PidFile: The file in which the server should record its process
-# identification number when it starts.
-# This needs to be set in /etc/apache2/envvars
-#
-PidFile ${APACHE_PID_FILE}
-
-#
-# Timeout: The number of seconds before receives and sends time out.
-#
-Timeout 1200
-
-#
-# KeepAlive: Whether or not to allow persistent connections (more than
-# one request per connection). Set to "Off" to deactivate.
-#
-KeepAlive On
-
-#
-# MaxKeepAliveRequests: The maximum number of requests to allow
-# during a persistent connection. Set to 0 to allow an unlimited amount.
-# We recommend you leave this number high, for maximum performance.
-#
-MaxKeepAliveRequests 100
-
-#
-# KeepAliveTimeout: Number of seconds to wait for the next request from the
-# same client on the same connection.
-#
-KeepAliveTimeout 5
-
-
-# These need to be set in /etc/apache2/envvars
-User ${APACHE_RUN_USER}
-Group ${APACHE_RUN_GROUP}
-
-#
-# HostnameLookups: Log the names of clients or just their IP addresses
-# e.g., www.apache.org (on) or 204.62.129.132 (off).
-# The default is off because it'd be overall better for the net if people
-# had to knowingly turn this feature on, since enabling it means that
-# each client request will result in AT LEAST one lookup request to the
-# nameserver.
-#
-HostnameLookups Off
-
-# ErrorLog: The location of the error log file.
-# If you do not specify an ErrorLog directive within a <VirtualHost>
-# container, error messages relating to that virtual host will be
-# logged here.  If you *do* define an error logfile for a <VirtualHost>
-# container, that host's errors will be logged there and not here.
-#
-ErrorLog ${APACHE_LOG_DIR}/error.log
-
-#
-# LogLevel: Control the severity of messages logged to the error_log.
-# Available values: trace8, ..., trace1, debug, info, notice, warn,
-# error, crit, alert, emerg.
-# It is also possible to configure the log level for particular modules, e.g.
-# "LogLevel info ssl:warn"
-#
-LogLevel warn
-
-# Include module configuration:
-IncludeOptional mods-enabled/*.load
-IncludeOptional mods-enabled/*.conf
-
-# Include list of ports to listen on
-Include ports.conf
-
-
-# Sets the default security model of the Apache2 HTTPD server. It does
-# not allow access to the root filesystem outside of /usr/share and /var/www.
-# The former is used by web applications packaged in Debian,
-# the latter may be used for local directories served by the web server. If
-# your system is serving content from a sub-directory in /srv you must allow
-# access here, or in any related virtual host.
-<Directory />
-	Options FollowSymLinks
-	AllowOverride None
-	Require all denied
-</Directory>
-
-<Directory /usr/share>
-	AllowOverride None
-	Require all granted
-</Directory>
-
-<Directory /var/www/>
-	Options Indexes FollowSymLinks
-	AllowOverride None
-	Require all granted
-</Directory>
-
-<Directory /var/www/html/>
-    Options Indexes FollowSymLinks
-    AllowOverride All
-    Require all granted
-</Directory>
-
-#<Directory /srv/>
-#	Options Indexes FollowSymLinks
-#	AllowOverride None
-#	Require all granted
-#</Directory>
-
-
-# AccessFileName: The name of the file to look for in each directory
-# for additional configuration directives.  See also the AllowOverride
-# directive.
-#
-AccessFileName .htaccess
-
-#
-# The following lines prevent .htaccess and .htpasswd files from being
-# viewed by Web clients.
-#
-<FilesMatch "^\.ht">
-	Require all denied
-</FilesMatch>
-
-
-#
-# The following directives define some format nicknames for use with
-# a CustomLog directive.
-#
-# These deviate from the Common Log Format definitions in that they use %O
-# (the actual bytes sent including headers) instead of %b (the size of the
-# requested file), because the latter makes it impossible to detect partial
-# requests.
-#
-# Note that the use of %{X-Forwarded-For}i instead of %h is not recommended.
-# Use mod_remoteip instead.
-#
-LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
-LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%h %l %u %t \"%r\" %>s %O" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
-
-# Include of directories ignores editors' and dpkg's backup files,
-# see README.Debian for details.
-
-# Include generic snippets of statements
-IncludeOptional conf-enabled/*.conf
-
-# Include the virtual host configurations:
-IncludeOptional sites-enabled/*.conf
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
diff --git a/docker-config/apache/htaccess b/docker-config/apache/htaccess
deleted file mode 100644
index 0003da531b..0000000000
--- a/docker-config/apache/htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Redirect /index.html https://myserver.mydomain.edu/webwork2/
diff --git a/docker-config/apache/index.html b/docker-config/apache/index.html
deleted file mode 100644
index dc2ebed7f7..0000000000
--- a/docker-config/apache/index.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html LANG="en" DIR="ltr">
-  <head>
-    <META http-equiv="Pragma" content="no-cache">
-    <META HTTP-EQUIV="Refresh" CONTENT="0;URL=https://myserver.mydomain.edu/webwork2/">
-    <title>WeBWorK site - redirects to main page</title>
-  </head>
-  <body style="text-align: center;">
-    You probably want to use the 
-    <a href="https://myserver.mydomain.edu/webwork2/">the WeBWorK list of courses page</a> 
-  </body>
-
-</html>
diff --git a/docker-config/apache/mpm_prefork.conf b/docker-config/apache/mpm_prefork.conf
deleted file mode 100644
index 1ebb9aba57..0000000000
--- a/docker-config/apache/mpm_prefork.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# prefork MPM
-# StartServers: number of server processes to start
-# MinSpareServers: minimum number of server processes which are kept spare
-# MaxSpareServers: maximum number of server processes which are kept spare
-# MaxRequestWorkers: maximum number of server processes allowed to start
-# MaxConnectionsPerChild: maximum number of requests a server process serves
-
-<IfModule mpm_prefork_module>
-    StartServers             5
-    MinSpareServers       5
-    MaxSpareServers       15
-    MaxRequestWorkers     20
-    MaxConnectionsPerChild   50
-</IfModule>
-
-# Was MaxRequestWorkers 30
-# Was MaxConnectionsPerChild 100
-#
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
diff --git a/docker-config/docker-compose.yml.dist b/docker-config/docker-compose.dist.yml
similarity index 59%
rename from docker-config/docker-compose.yml.dist
rename to docker-config/docker-compose.dist.yml
index 80c191b161..bbd0256ff4 100644
--- a/docker-config/docker-compose.yml.dist
+++ b/docker-config/docker-compose.dist.yml
@@ -16,8 +16,8 @@ services:
       #        + skip-name-resolve
       # Note: It seems different versions of the MariaDB container need
       #       this file in different locations. Put in in both places.
-      - "./docker-config/db/mariadb.cnf:/etc/mysql/conf.d/mariadb.cnf"
-      - "./docker-config/db/mariadb.cnf:/etc/mysql/mariadb.cnf"
+      - './docker-config/db/mariadb.cnf:/etc/mysql/conf.d/mariadb.cnf'
+      - './docker-config/db/mariadb.cnf:/etc/mysql/mariadb.cnf'
 
       # Tuning MariaDB config - sample file
       # The sample file modifies wait_timeout, and adds skip-name-resolve
@@ -30,10 +30,10 @@ services:
       #- "/etc/localtime:/etc/localtime:ro"
 
       # The ulimits lines were only tested on Linux hosts in conjuction woth the limits.conf file
-#    ulimits:
-#      nofile:
-#        soft: 4096
-#        hard: 4096
+      #ulimits:
+      #  nofile:
+      #    soft: 4096
+      #    hard: 4096
 
     restart: always
     environment:
@@ -60,54 +60,53 @@ services:
     # overwriting the "standard" one during testing.
     image: webwork
 
-
     # Set a fixed container name, so it does not depend on the directory name
     container_name: webwork2_app_1
 
     # Set up the "build:" configuration:
     build:
-        # For use/building when docker-compose.yml is in the webwork2 directory
-        context: .
-        # For use/building when docker-compose.yml is OUTSIDE the webwork2 directory.
-        # For example, if multiple hosts use a NFS shared webwork2/ directory, and
-        # each one needs customized values in docker-compose.yml.
-        # Under typical use, the Dockerfile should not need to be customized per host,
-        # but may contain some changes/additions relative to the standard webwork image.
-        #
-        #  context: /Path_To/webwork2/
-        #  dockerfile: /Path_To/Dockerfile
-        args:
-            # Build args to set the source Git repositories. Here we set the main repositories:
-            - WEBWORK2_GIT_URL=https://github.com/openwebwork/webwork2.git
-            - PG_GIT_URL=https://github.com/openwebwork/pg.git
-
-            # Build args specifying the branches of webwork2 and pg to install.
-
-            # Exactly one pair of settings should be left uncommented and all the others
-            # should be commented out.
-
-            # main branches:
-            - WEBWORK2_BRANCH=main
-            - PG_BRANCH=main
-
-            # WeBWorK/PG develop branches
-            #    (other valid branches can also be used in a similar manner)
-            #- WEBWORK2_BRANCH=develop
-            #- PG_BRANCH=develop
-
-        # If you would like a 1 stage build process comment out the next line, and just run "docker-compose build".
-        dockerfile: DockerfileStage2
-        # For the 2 stage build process run
-        #     docker build --tag webwork-base:forWW217 -f DockerfileStage1 .
-        # and then
-        #     docker-compose build
-        # When rebuilding to get updated images add the "--no-cache" option to both commands.
-        # You can add something like
-        #         --build-arg ADDITIONAL_BASE_IMAGE_PACKAGES="nano less"
-        # to the stage 1 "docker build" command to include extra OS packages in the base image.
-        # That approach makes them (persistent) so available immediately each time a container is
-        # started and is thus faster than adding them in when a container is started via the
-        # ADD_APT_PACKAGES setting below.
+      # For use/building when docker-compose.yml is in the webwork2 directory
+      context: .
+      # For use/building when docker-compose.yml is OUTSIDE the webwork2 directory.
+      # For example, if multiple hosts use a NFS shared webwork2/ directory, and
+      # each one needs customized values in docker-compose.yml.
+      # Under typical use, the Dockerfile should not need to be customized per host,
+      # but may contain some changes/additions relative to the standard webwork image.
+      #
+      #  context: /Path_To/webwork2/
+      #  dockerfile: /Path_To/Dockerfile
+      args:
+        # Build args to set the source Git repositories. Here we set the main repositories:
+        - WEBWORK2_GIT_URL=https://github.com/openwebwork/webwork2.git
+        - PG_GIT_URL=https://github.com/openwebwork/pg.git
+
+        # Build args specifying the branches of webwork2 and pg to install.
+
+        # Exactly one pair of settings should be left uncommented and all the others
+        # should be commented out.
+
+        # main branches:
+        - WEBWORK2_BRANCH=main
+        - PG_BRANCH=main
+
+        # WeBWorK/PG develop branches
+        #    (other valid branches can also be used in a similar manner)
+        #- WEBWORK2_BRANCH=develop
+        #- PG_BRANCH=develop
+
+      # If you would like a 1 stage build process comment out the next line, and just run "docker-compose build".
+      dockerfile: DockerfileStage2
+      # For the 2 stage build process run
+      #     docker build --tag webwork-base:forWW218 -f DockerfileStage1 .
+      # and then
+      #     docker-compose build
+      # When rebuilding to get updated images add the "--no-cache" option to both commands.
+      # You can add something like
+      #         --build-arg ADDITIONAL_BASE_IMAGE_PACKAGES="nano less"
+      # to the stage 1 "docker build" command to include extra OS packages in the base image.
+      # That approach makes them (persistent) so available immediately each time a container is
+      # started and is thus faster than adding them in when a container is started via the
+      # ADD_APT_PACKAGES setting below.
 
     depends_on:
       - db
@@ -142,48 +141,31 @@ services:
       #- "/per_host_data_path/webwork2/logs:/opt/webwork/webwork2/logs"
       #- "/per_host_data_path/webwork2/htdocs/tmp:/opt/webwork/webwork2/htdocs/tmp"
 
-      # By default the courses tree in a separate tree outside of webwork2/ as follows:
-      - "${COURSES_DIRECTORY_ON_HOST}:/opt/webwork/courses"
-      # OR mount like (here we are assuming that the hosts have different courses on them)
+      # By default mount the courses tree in a separate tree outside of webwork2/ as follows:
+      - '${COURSES_DIRECTORY_ON_HOST}:/opt/webwork/courses'
+      # OR use the following mount if the hosts have different courses on them:
       #- "/per_host_data_path/courses/:/opt/webwork/courses/"
 
       # ======================================================================
 
-      # By default the OPL is stored in a named Docker storage volume:
-      - oplVolume:/opt/webwork/libraries/webwork-open-problem-library
-      #
-      # as an alternative, you can comment out the prior option and uncomment the line below to use a local directory containing the OPL
-      #- "/path_to/webwork-open-problem-library:/opt/webwork/libraries/webwork-open-problem-library"
-
-      # ======================================================================
-
-      # The mounts from ./docker-config/ below are local samples.
-      # In production, there may be per-host versions of most
-      # of these files stored in an appropriate place.
-      # If not - the samples should be edited as needed.
-
-      # Main index.html page with a redirect (you probably need to customize some of these files)
-      #- "./docker-config/apache/index.html:/var/www/html/index.html"
-      #- "./docker-config/apache/htaccess:/var/www/html/.htaccess"
-
-      # Apache config (you probably need to customize some of these files)
-      - "./docker-config/apache/000-default.conf:/etc/apache2/sites-available/000-default.conf"
-      - "./docker-config/apache/apache2.conf:/etc/apache2/apache2.conf"
-      - "./docker-config/apache/mpm_prefork.conf:/etc/apache2/mods-enabled/mpm_prefork.conf"
+      # Mojolicious webwork2 app configuration.  For production you will need to modify this file.
+      # Note that the SSL configuration is done in this file.
+      # See https://docs.mojolicious.org/Mojo/Server/Daemon#listen for how to do this.
+      #- "/per_host_conf_path/conf/webwork2.mojolicious.yml:/opt/webwork/webwork2/conf/webwork2.mojolicious.yml"
 
-      # Apache logs - to have them persistent (per host) mount directory from outside.
-      #- "/per_host_data_path/apache2_logs:/var/log/apache2"
+      # SSL certificates (subdirectory with certificate and key)
+      # Place your ssl certificate files used in webwork2.mojolicious.yml above in docker-config/ssl,
+      # or change the mount location to where your ssl certificate files reside.
+      #- "./docker-config/ssl/:/etc/ssl/local"
 
       # ======================================================================
 
-      # SSL certificates (subdirectory with certificate and key)
-      #    (you MUST replace/customize these files, or change the location they are mounded from)
-      - "./docker-config/ssl/local/:/etc/ssl/local"
-
-      # Apache SSL config (you probably need to customize some of these files)
-      #    (make sure default-ssl.conf points to the certificates where they will be in the container)
-      - "./docker-config/ssl/ssl.conf:/etc/apache2/mods-available/ssl.conf"
-      - "./docker-config/ssl/default-ssl.conf:/etc/apache2/sites-available/default-ssl.conf"
+      # By default the OPL is stored in a named Docker storage volume:
+      - oplVolume:/opt/webwork/libraries/webwork-open-problem-library
+      #
+      # as an alternative, you can comment out the prior option and uncomment the line below to use
+      # a local directory containing the OPL
+      #- "/path_to/webwork-open-problem-library:/opt/webwork/libraries/webwork-open-problem-library"
 
       # ======================================================================
 
@@ -191,11 +173,11 @@ services:
 
     ports:
       # For a personal machine
-      - "${WEBWORK2_HTTP_PORT_ON_HOST}:80"
+      - '${WEBWORK2_HTTP_PORT_ON_HOST}:8080'
 
       # For a production machine
-      #- "80:80"
-      #- "443:443"
+      #- "80:8080"
+      #- "443:8080"
 
     # For a production machine
     #restart: always
@@ -203,11 +185,6 @@ services:
     stop_grace_period: 30s
 
     environment:
-
-      DEV: 0
-
-      APACHE_RUN_GROUP: www-data
-
       # Standard database environment variables needed by WeBWorK:
 
       # Select which DBD driver to use
@@ -261,18 +238,19 @@ services:
       # =======================================================
 
       # If you use https below, make sure to set up the certificate and SSL configuration
-#      WEBWORK_ROOT_URL: https://myhost.mydomain.edu
+      # Note if your server uses a non-standard port, that should also be included.
+      #WEBWORK_ROOT_URL: https://myhost.mydomain.edu
 
-#      WEBWORK_SMTP_SERVER: smtp.mydomain.edu
-#      WEBWORK_SMTP_SENDER: support@mydomain.edu
+      #WEBWORK_SMTP_SERVER: smtp.mydomain.edu
+      #WEBWORK_SMTP_SENDER: support@mydomain.edu
 
-#      WEBWORK_TIMEZONE: America/New_York
+      #WEBWORK_TIMEZONE: America/New_York
 
   r:
     image: ubcctlt/rserve
-#    # The R server need not be available from outside the local Docker network.
-#    ports:
-#      - "6311:6311"
+    # The R server need not be available from outside the local Docker network.
+    #ports:
+    #  - "6311:6311"
 
 volumes:
   oplVolume:
diff --git a/docker-config/docker-entrypoint.sh b/docker-config/docker-entrypoint.sh
index 9bfee599f0..d7a5a07968 100755
--- a/docker-config/docker-entrypoint.sh
+++ b/docker-config/docker-entrypoint.sh
@@ -3,42 +3,30 @@ set -eo pipefail
 
 function wait_for_db {
 	echo "Waiting for database to become available..."
-        while ! timeout 1 bash -c "(cat < /dev/null > /dev/tcp/$WEBWORK_DB_HOST/$WEBWORK_DB_PORT) >/dev/null 2>&1"; do \
+	while ! timeout 1 bash -c "(cat < /dev/null > /dev/tcp/$WEBWORK_DB_HOST/$WEBWORK_DB_PORT) >/dev/null 2>&1"
+	do
 		echo "waiting..."
-		sleep 0.5; \
+		sleep 0.5;
 	done
 }
-# if command starts with an option, prepend apache2
-if [ "${1:0:1}" = '-'  ]; then
-    set -- apache2 "$@"
-fi
-
-# Enable SSL when it is requested by the SSL environment variable
-if [ $SSL -eq 1 ]; then
-  echo "Enabling SSL"
-  a2enmod ssl && a2ensite default-ssl
-fi
 
-echo "Enabling Apache headers module"
-a2enmod headers
-
-# Build more locales
+# Build extra locales if requested.
 if [ "$ADD_LOCALES" != "0" ]; then
-  echo "Rebuilding locales - adding: $ADD_LOCALES"
-  cp -a /etc/locale.gen /etc/locale.gen.orig
-  /bin/echo -e "en_US ISO-8859-1\nen_US.UTF-8 UTF-8\n$ADD_LOCALES" > /etc/locale.gen.tmp
-  /usr/bin/tr "," "\n" < /etc/locale.gen.tmp > /etc/locale.gen
-  rm /etc/locale.gen.orig
-  /usr/sbin/locale-gen
+	echo "Rebuilding locales - adding: $ADD_LOCALES"
+	cp -a /etc/locale.gen /etc/locale.gen.orig
+	/bin/echo -e "en_US ISO-8859-1\nen_US.UTF-8 UTF-8\n$ADD_LOCALES" > /etc/locale.gen.tmp
+	/usr/bin/tr "," "\n" < /etc/locale.gen.tmp > /etc/locale.gen
+	rm /etc/locale.gen.orig
+	/usr/sbin/locale-gen
 fi
 
 # Set system timezone if not the default UTC
 if [ "$SYSTEM_TIMEZONE" != "UTC" ]; then
-  echo "Setting system timezone to $SYSTEM_TIMEZONE"
-  rm /etc/localtime
-  rm /etc/timezone
-  echo "$SYSTEM_TIMEZONE" > /etc/timezone
-  dpkg-reconfigure -f noninteractive tzdata
+	echo "Setting system timezone to $SYSTEM_TIMEZONE"
+	rm /etc/localtime
+	rm /etc/timezone
+	echo "$SYSTEM_TIMEZONE" > /etc/timezone
+	dpkg-reconfigure -f noninteractive tzdata
 fi
 
 # Modify default papersize based on environment variable PAPERSIZE
@@ -49,233 +37,219 @@ dpkg-reconfigure -f noninteractive libpaper1
 
 # Install some extra packages
 if [ "$ADD_APT_PACKAGES" != "0" ]; then
-  apt-get update
-  apt-get install -y --no-install-recommends --no-install-suggests $ADD_APT_PACKAGES
+	apt-get update
+	apt-get install -y --no-install-recommends --no-install-suggests $ADD_APT_PACKAGES
 fi
 
 # If necessary, clone the OPL in the running container, hopefully in persistent storage
 if [ ! -d "$APP_ROOT/libraries/webwork-open-problem-library/OpenProblemLibrary" ]; then
-  echo "Cloning the OPL - This takes time - please be patient."
-  cd $APP_ROOT/libraries/
-  /usr/bin/git clone -v --progress --single-branch --branch main https://github.com/openwebwork/webwork-open-problem-library.git
+	echo "Cloning the OPL - This takes time - please be patient."
+	cd $APP_ROOT/libraries/
+	/usr/bin/git clone -v --progress --single-branch --branch main https://github.com/openwebwork/webwork-open-problem-library.git
 
   # The next line forces the system to download and install the OPL metadata later
   touch "$APP_ROOT/libraries/Restore_or_build_OPL_tables"
 fi
 
-if [ "$1" = 'apache2' ]; then
-    # generate conf files if not exist
-    for i in site.conf localOverrides.conf; do
-        if [ ! -f $WEBWORK_ROOT/conf/$i ]; then
-            echo "Creating a new $WEBWORK_ROOT/conf/$i"
-            cp $WEBWORK_ROOT/conf/$i.dist $WEBWORK_ROOT/conf/$i
-            if [ $i == 'site.conf' ]; then
-                sed -i -e 's/webwork_url       = '\''\/webwork2'\''/webwork_url       = $ENV{"WEBWORK_URL"}/' \
-                    -e 's/server_root_url   = '\'''\''/server_root_url   = $ENV{"WEBWORK_ROOT_URL"}/' \
-                    -e 's/^\$database_driver="MariaDB"/$database_driver = $ENV{"WEBWORK_DB_DRIVER"}/' \
-                    -e 's/^\$database_host="localhost"/$database_host = $ENV{"WEBWORK_DB_HOST"}/' \
-                    -e 's/^\$database_port="3306"/$database_port = $ENV{"WEBWORK_DB_PORT"}/' \
-                    -e 's/^\$database_name="webwork"/$database_name = $ENV{"WEBWORK_DB_NAME"}/' \
-                    -e 's/^\$database_username ="webworkWrite"/$database_username =$ENV{"WEBWORK_DB_USER"}/' \
-                    -e 's/^\$database_password ='\''passwordRW'\''/$database_password =$ENV{"WEBWORK_DB_PASSWORD"}/' \
-                    -e 's/mail{smtpServer} = '\'''\''/mail{smtpServer} = $ENV{"WEBWORK_SMTP_SERVER"}/' \
-                    -e 's/siteDefaults{timezone} = "America\/New_York"/siteDefaults{timezone} = $ENV{"WEBWORK_TIMEZONE"}/' \
-                    -e 's/^# $server_userID     = '\''www-data/$server_userID     = '\''www-data/'  \
-                    -e 's/^# $server_groupID    = '\''www-data/$server_groupID    = '\''www-data/' $WEBWORK_ROOT/conf/site.conf
-
-                echo "$WEBWORK_ROOT/conf/$i has been modified."
-            fi
-
-            if [ $i == 'localOverrides.conf' ]; then
-                sed -i -e 's/#$pg{specialPGEnvironmentVars}{Rserve} = {host => "r"};/$pg{specialPGEnvironmentVars}{Rserve} = {host => "r"};/' \
-                       -e 's/#$problemLibrary{showLibraryLocalStats} = 0;/$problemLibrary{showLibraryLocalStats} = 0;/' $WEBWORK_ROOT/conf/localOverrides.conf
-                echo "$WEBWORK_ROOT/conf/$i has been modified."
-            fi
-        fi
-
-    done
-    # create admin course if not existing
-    # check first if the admin courses directory exists then check that at
-    # least one of the tables associated with the course (the admin_user table) exists
-
-    echo "check admin course and admin tables"
-    wait_for_db
-    ADMIN_TABLE_EXISTS=`mysql -u $WEBWORK_DB_USER  -p$WEBWORK_DB_PASSWORD -B -N -h $WEBWORK_DB_HOST -e "select count(*) from information_schema.tables where table_schema='webwork' and table_name = 'admin_user';"`
-    if [ ! -d "$APP_ROOT/courses/admin" ]; then
-        newgrp www-data
-        umask 2
-        cd $APP_ROOT/courses
-        wait_for_db
-        $WEBWORK_ROOT/bin/addcourse admin --db-layout=sql_single --users=$WEBWORK_ROOT/courses.dist/adminClasslist.lst --professors=admin
-        chown www-data:www-data -R $APP_ROOT/courses
-        echo "Admin course is created."
-        echo "user: admin password: admin added to course admin and tables upgraded"
-    elif [ $ADMIN_TABLE_EXISTS == 0 ]; then
-        echo "admin course db tables need updating"
-        $WEBWORK_ROOT/bin/upgrade_admin_db.pl
-        $WEBWORK_ROOT/bin/wwsh admin $WEBWORK_ROOT/bin/addadmin
-        echo "admin course tables created with one user: admin   whose password is admin"
-    else
-        echo "using pre-existing admin course and admin tables"
-    fi
-
-    # use case for the extra check for the admin:
-    # In rebuilding a docker box one might clear out the docker containers,
-    # images and volumes including mariaDB, BUT leave the
-    # contents of ww-docker-data directory in place.  It now holds the shell of the courses
-    # including the admin course directory. This means that once you rebuild the box
-    # you can't access the admin course (because the admin_user table is missing)
-    # and you need to run bin/upgrade_admin_db.pl from inside the container.
-    # This check insures that if the admin_user table is missing the whole admin course is rebuilt
-    # even if the admin directory is in place.
-
-    # modelCourses link if not existing
-    if [ ! -d "$APP_ROOT/courses/modelCourse" ]; then
-      echo "create modelCourse subdirectory"
-      rm -rf $APP_ROOT/courses/modelCourse
-      cd $WEBWORK_ROOT/courses.dist
-      cp -R modelCourse $APP_ROOT/courses/
-    fi
-    # create htdocs/tmp directory if not existing
-    if [ ! -d "$WEBWORK_ROOT/htdocs/tmp" ]; then
-      echo "Creating htdocs/tmp directory"
-      mkdir $WEBWORK_ROOT/htdocs/tmp
-      chown www-data:www-data -R $WEBWORK_ROOT/htdocs/tmp
-      echo "htdocs/tmp directory created"
-    fi
-
-    # defaultClasslist.lst and adminClasslist.lst files if not existing
-    if [ ! -f "$APP_ROOT/courses/defaultClasslist.lst"  ]; then
-      echo "defaultClasslist.lst is being created"
-      cd $WEBWORK_ROOT/courses.dist
-      cp *.lst $APP_ROOT/courses/
-    fi
-    if [ ! -f "$APP_ROOT/courses/adminClasslist.lst"  ]; then
-      echo "adminClasslist.lst is being created"
-      cd $WEBWORK_ROOT/courses.dist
-      cp *.lst $APP_ROOT/courses/
-    fi
-    # run OPL-update if necessary
-    if [ ! -f "$WEBWORK_ROOT/htdocs/DATA/tagging-taxonomy.json"  ]; then
-      # The next line forces the system to run OPL-update below, as the
-      # tagging-taxonomy.json file was found to be missing.
-      echo "We will run OPL-update as the tagging-taxonomy.json file is missing in webwork2/htdocs/DATA/."
-      echo "Check if you should be mounting webwork2/htdocs/DATA/ from outside the Docker image!"
-      touch "$APP_ROOT/libraries/Restore_or_build_OPL_tables"
-    fi
-    if [ -f "$APP_ROOT/libraries/Restore_or_build_OPL_tables" ]; then
-      if [ ! -f "$APP_ROOT/libraries/webwork-open-problem-library/TABLE-DUMP/OPL-tables.sql" ]; then
-        # Download the metadata and install it
-        export SKIP_UPLOAD_OPL_STATISTICS=1
-        if [ ! -d $APP_ROOT/libraries/webwork-open-problem-library/JSON-SAVED ]; then
-          mkdir $APP_ROOT/libraries/webwork-open-problem-library/JSON-SAVED
-        fi
-        wait_for_db
-        $WEBWORK_ROOT/bin/OPL-update
-      else
-        echo "Restoring OPL tables from the TABLE-DUMP/OPL-tables.sql file"
-        wait_for_db
-        $WEBWORK_ROOT/bin/restore-OPL-tables.pl
-        $WEBWORK_ROOT/bin/load-OPL-global-statistics.pl
-        #$WEBWORK_ROOT/bin/update-OPL-statistics.pl
-        if [ -d $APP_ROOT/libraries/webwork-open-problem-library/JSON-SAVED ]; then
-          # Restore saved JSON files
-          echo "Restoring JSON files from JSON-SAVED directory"
-          cp -a $APP_ROOT/libraries/webwork-open-problem-library/JSON-SAVED/*.json $WEBWORK_ROOT/htdocs/DATA/
-        else
-          echo "No webwork-open-problem-library/JSON-SAVED directory was found."
-          echo "You are missing some of the JSON files including tagging-taxonomy.json"
-          echo "Some of the library functions will not work properly"
-        fi
-      fi
-      rm $APP_ROOT/libraries/Restore_or_build_OPL_tables
-    fi
-
-    # Run generate-OPL-set-def-lists.pl if necessary.
-	# Note that these files will be restored above if they exist from a previous run.
-	if [ ! -f "$APP_ROOT/libraries/webwork-open-problem-library/JSON-SAVED/library-set-defs.json" ] ||
-		[ ! -f "$APP_ROOT/libraries/webwork-open-problem-library/JSON-SAVED/contrib-set-defs.json" ]
-    then
-        echo "The library-set-defs.json or contrib-set-defs.json file is missing."
-        echo "These files will be generated by executing bin/generate-OPL-set-def-lists.pl."
-        $WEBWORK_ROOT/bin/generate-OPL-set-def-lists.pl
-		cp -a $WEBWORK_ROOT/htdocs/DATA/*.json $APP_ROOT/libraries/webwork-open-problem-library/JSON-SAVED
-    fi
-
-    # Compile chromatic/color.c if necessary - may be needed for PG directory mounted from outside image
-    if [ ! -f "$APP_ROOT/pg/lib/chromatic/color"  ]; then
-      cd $APP_ROOT/pg/lib/chromatic
-      gcc color.c -o color
-    fi
-    # generate apache2 reload config if needed
-    if [ $DEV -eq 1 ]; then
-        echo "PerlModule Apache2::Reload" >> /etc/apache2/conf-enabled/apache2-reload.conf
-        echo "PerlInitHandler Apache2::Reload" >> /etc/apache2/conf-enabled/apache2-reload.conf
-        echo "Running in DEV mode..."
-    else
-      if [ $SSL -eq 0 ]; then
-        rm -f /etc/apache2/conf-enabled/apache2-reload.conf
-      fi
-    fi
-
-    # Fix possible permission issues
-    echo "Fixing ownership and permissions (just in case it is needed)"
-    cd $WEBWORK_ROOT
-
-    # Minimal chown/chmod code - moves the critical parts which were in
-    # blocks below to to here
-    # but SKIPS handling htdocs/tmp and ../courses for the chmod line,
-    # and SKIPS the deletion of symbolic links.
-    # This change significantly speeds up Docker startup time on production
-    # servers with many files/courses (on Linux).
-
-    chown -R www-data:www-data logs tmp DATA
-    chmod -R ug+w logs tmp DATA
-    chown  www-data:www-data htdocs/tmp
-    chmod ug+w htdocs/tmp
-
-    # even if the admin and courses directories already existed their permissions might not have been correct
-    # chown www-data:www-data  $APP_ROOT/courses
-    chown www-data:www-data  $APP_ROOT/courses/admin/*
-
-    # Symbolic links which have no target outside the Docker container
-    # cause problems duringt the rebuild process on some systems.
-    # So we delete them. They will be rebuilt automatically when needed again
-    # at the cost of some speed.
-
-    # The following 3 lines (find, chown, chmod) make Docker startup quite slow
-    # slow and have been commented out. The critical parts to chown/chmod the
-    # directories:   logs/ tmp/ DATA/   were moved above and removed below.
-    # Developers who encounter permission issues may want to reenable these lines.
-
-    #find htdocs/tmp -type l -exec rm -f {} \;
-    #chown -R www-data:www-data htdocs/tmp
-    #chmod -R u+w ../courses htdocs/tmp
-
-    # The chown for files/directories under courses is done using find, as
-    # using a simple "chown -R www-data $APP_ROOT/courses" would sometimes
-    # cause errors in Docker on Mac OS X when there was a broken symbolic link
-    # somewhere in the directory tree being processed.
-
-    # The following 3 lines (cd, find, find) make Docker startup quite slow.
-    # Developers who encounter permission issues may want to reenable these lines.
-
-    #cd $APP_ROOT
-    #find courses -type f -exec chown www-data:www-data {} \;
-    #find courses -type d -exec chown www-data:www-data {} \;
-
-    echo "end fixing ownership and permissions"
+# generate conf files if not exist
+for i in site.conf localOverrides.conf; do
+	if [ ! -f $WEBWORK_ROOT/conf/$i ]; then
+		echo "Creating a new $WEBWORK_ROOT/conf/$i"
+		cp $WEBWORK_ROOT/conf/$i.dist $WEBWORK_ROOT/conf/$i
+		if [ $i == 'site.conf' ]; then
+			sed -i -e 's/webwork_url       = '\''\/webwork2'\''/webwork_url       = $ENV{"WEBWORK_URL"}/' \
+				-e 's/server_root_url   = '\'''\''/server_root_url   = $ENV{"WEBWORK_ROOT_URL"}/' \
+				-e 's/^\$database_driver="MariaDB"/$database_driver = $ENV{"WEBWORK_DB_DRIVER"}/' \
+				-e 's/^\$database_host="localhost"/$database_host = $ENV{"WEBWORK_DB_HOST"}/' \
+				-e 's/^\$database_port="3306"/$database_port = $ENV{"WEBWORK_DB_PORT"}/' \
+				-e 's/^\$database_name="webwork"/$database_name = $ENV{"WEBWORK_DB_NAME"}/' \
+				-e 's/^\$database_username ="webworkWrite"/$database_username =$ENV{"WEBWORK_DB_USER"}/' \
+				-e 's/^\$database_password ='\''passwordRW'\''/$database_password =$ENV{"WEBWORK_DB_PASSWORD"}/' \
+				-e 's/mail{smtpServer} = '\'''\''/mail{smtpServer} = $ENV{"WEBWORK_SMTP_SERVER"}/' \
+				-e 's/siteDefaults{timezone} = "America\/New_York"/siteDefaults{timezone} = $ENV{"WEBWORK_TIMEZONE"}/' \
+				-e 's/^# $server_userID     = '\''www-data/$server_userID     = '\''www-data/'  \
+				-e 's/^# $server_groupID    = '\''www-data/$server_groupID    = '\''www-data/' $WEBWORK_ROOT/conf/site.conf
+
+			echo "$WEBWORK_ROOT/conf/$i has been modified."
+		fi
+
+		if [ $i == 'localOverrides.conf' ]; then
+			sed -i -e 's/#$pg{specialPGEnvironmentVars}{Rserve} = {host => "r"};/$pg{specialPGEnvironmentVars}{Rserve} = {host => "r"};/' \
+				-e 's/#$problemLibrary{showLibraryLocalStats} = 0;/$problemLibrary{showLibraryLocalStats} = 0;/' $WEBWORK_ROOT/conf/localOverrides.conf
+							echo "$WEBWORK_ROOT/conf/$i has been modified."
+		fi
+	fi
+done
+
+# Create the admin course if it does not exist.
+# Check first if the admin courses directory exists then check that at least one
+# of the tables associated with the course (the admin_user table) exists.
+#
+# The check for the database tables for the admin course is neccessary for the
+# following situation. In rebuilding a docker box one might clear out the docker
+# containers, images and volumes including mariaDB, BUT leave the contents of
+# ww-docker-data directory in place.  It now holds the shell of the courses
+# including the admin course directory. This means that once you rebuild the box
+# you can't access the admin course (because the admin_user table is missing)
+# and you need to run bin/upgrade_admin_db.pl from inside the container.  This
+# check insures that if the admin_user table is missing the whole admin course
+# is rebuilt even if the admin directory is in place.
+echo "check admin course and admin tables"
+wait_for_db
+ADMIN_TABLE_EXISTS=`mysql -u $WEBWORK_DB_USER  -p$WEBWORK_DB_PASSWORD -B -N -h $WEBWORK_DB_HOST -e "select count(*) from information_schema.tables where table_schema='webwork' and table_name = 'admin_user';"`
+if [ ! -d "$APP_ROOT/courses/admin" ]; then
+	newgrp www-data
+	umask 2
+	cd $APP_ROOT/courses
+	wait_for_db
+	$WEBWORK_ROOT/bin/addcourse admin --db-layout=sql_single --users=$WEBWORK_ROOT/courses.dist/adminClasslist.lst --professors=admin
+	chown www-data:www-data -R $APP_ROOT/courses
+	echo "Admin course is created."
+	echo "user: admin password: admin added to course admin and tables upgraded"
+elif [ $ADMIN_TABLE_EXISTS == 0 ]; then
+	echo "admin course db tables need updating"
+	$WEBWORK_ROOT/bin/upgrade_admin_db.pl
+	$WEBWORK_ROOT/bin/wwsh admin $WEBWORK_ROOT/bin/addadmin
+	echo "admin course tables created with one user: admin   whose password is admin"
+else
+	echo "using pre-existing admin course and admin tables"
+fi
+
+# Create modelCourses if it doesn't exist.
+if [ ! -d "$APP_ROOT/courses/modelCourse" ]; then
+	echo "create modelCourse subdirectory"
+	rm -rf $APP_ROOT/courses/modelCourse
+	cd $WEBWORK_ROOT/courses.dist
+	cp -R modelCourse $APP_ROOT/courses/
 fi
 
-# The code below allows to use
-#    docker container exec -it webwork2_app_1 /usr/sbin/apachectl graceful
-# to restart Apache in the container in a "nice" way.
+# Create the htdocs/tmp directory if it does not exist
+if [ ! -d "$WEBWORK_ROOT/htdocs/tmp" ]; then
+	echo "Creating htdocs/tmp directory"
+	mkdir $WEBWORK_ROOT/htdocs/tmp
+	chown www-data:www-data -R $WEBWORK_ROOT/htdocs/tmp
+	echo "htdocs/tmp directory created"
+fi
+
+# Copy defaultClasslist.lst and adminClasslist.lst into $APP_ROOT/courses if
+# either file does not exist.
+if [ ! -f "$APP_ROOT/courses/defaultClasslist.lst"  ]; then
+	echo "defaultClasslist.lst is being created"
+	cd $WEBWORK_ROOT/courses.dist
+	cp *.lst $APP_ROOT/courses/
+fi
+if [ ! -f "$APP_ROOT/courses/adminClasslist.lst"  ]; then
+	echo "adminClasslist.lst is being created"
+	cd $WEBWORK_ROOT/courses.dist
+	cp *.lst $APP_ROOT/courses/
+fi
+
+# Run OPL-update if necessary
+if [ ! -f "$WEBWORK_ROOT/htdocs/DATA/tagging-taxonomy.json"  ]; then
+	# The next line forces the system to run OPL-update below, as the
+	# tagging-taxonomy.json file was found to be missing.
+	echo "We will run OPL-update as the tagging-taxonomy.json file is missing in webwork2/htdocs/DATA/."
+	echo "Check if you should be mounting webwork2/htdocs/DATA/ from outside the Docker image!"
+	touch "$APP_ROOT/libraries/Restore_or_build_OPL_tables"
+fi
+
+if [ -f "$APP_ROOT/libraries/Restore_or_build_OPL_tables" ]; then
+	if [ ! -f "$APP_ROOT/libraries/webwork-open-problem-library/TABLE-DUMP/OPL-tables.sql" ]; then
+		# Download the metadata and install it
+		export SKIP_UPLOAD_OPL_STATISTICS=1
+		if [ ! -d $APP_ROOT/libraries/webwork-open-problem-library/JSON-SAVED ]; then
+			mkdir $APP_ROOT/libraries/webwork-open-problem-library/JSON-SAVED
+		fi
+		wait_for_db
+		$WEBWORK_ROOT/bin/OPL-update
+	else
+		echo "Restoring OPL tables from the TABLE-DUMP/OPL-tables.sql file"
+		wait_for_db
+		$WEBWORK_ROOT/bin/restore-OPL-tables.pl
+		$WEBWORK_ROOT/bin/load-OPL-global-statistics.pl
+		#$WEBWORK_ROOT/bin/update-OPL-statistics.pl
+		if [ -d $APP_ROOT/libraries/webwork-open-problem-library/JSON-SAVED ]; then
+			# Restore saved JSON files
+			echo "Restoring JSON files from JSON-SAVED directory"
+			cp -a $APP_ROOT/libraries/webwork-open-problem-library/JSON-SAVED/*.json $WEBWORK_ROOT/htdocs/DATA/
+		else
+			echo "No webwork-open-problem-library/JSON-SAVED directory was found."
+			echo "You are missing some of the JSON files including tagging-taxonomy.json"
+			echo "Some of the library functions will not work properly"
+		fi
+	fi
+	rm $APP_ROOT/libraries/Restore_or_build_OPL_tables
+fi
+
+# Run generate-OPL-set-def-lists.pl if necessary.
+# Note that these files will be restored above if they exist from a previous run.
+if [ ! -f "$APP_ROOT/libraries/webwork-open-problem-library/JSON-SAVED/library-set-defs.json" ] ||
+	[ ! -f "$APP_ROOT/libraries/webwork-open-problem-library/JSON-SAVED/contrib-set-defs.json" ]
+then
+	echo "The library-set-defs.json or contrib-set-defs.json file is missing."
+	echo "These files will be generated by executing bin/generate-OPL-set-def-lists.pl."
+	$WEBWORK_ROOT/bin/generate-OPL-set-def-lists.pl
+	cp -a $WEBWORK_ROOT/htdocs/DATA/*.json $APP_ROOT/libraries/webwork-open-problem-library/JSON-SAVED
+fi
+
+# Fix possible permission issues
+echo "Fixing ownership and permissions (just in case it is needed)"
+cd $WEBWORK_ROOT
+
+# Minimal chown/chmod code - moves the critical parts which were in blocks below
+# to here, but SKIPS handling htdocs/tmp and ../courses for the chmod line, and
+# SKIPS the deletion of symbolic links.  This change significantly speeds up
+# Docker startup time on production servers with many files/courses.
+
+chown -R www-data:www-data logs tmp DATA
+chmod -R ug+w logs tmp DATA
+chown  www-data:www-data htdocs/tmp
+chmod ug+w htdocs/tmp
+
+# Even if the admin and courses directories already existed their permissions
+# might not be correct.
+# chown www-data:www-data  $APP_ROOT/courses
+chown www-data:www-data  $APP_ROOT/courses/admin/*
+
+# Symbolic links which have no target outside the Docker container
+# cause problems during the rebuild process on some systems.
+# So we delete them. They will be rebuilt automatically when needed again
+# at the cost of some speed.
+
+# The following 3 lines (find, chown, chmod) make Docker startup quite slow and
+# have been commented out.  Developers who encounter permission issues may want
+# to re-enable these lines.
+
+#find htdocs/tmp -type l -exec rm -f {} \;
+#chown -R www-data:www-data htdocs/tmp
+#chmod -R u+w ../courses htdocs/tmp
+
+# The chown for files/directories under courses is done using find, as
+# using a simple "chown -R www-data $APP_ROOT/courses" would sometimes
+# cause errors in Docker on Mac OS X when there was a broken symbolic link
+# somewhere in the directory tree being processed.
+
+# The following 3 lines (cd, find, find) make Docker startup quite slow.
+# Developers who encounter permission issues may want to re-enable these lines.
+
+#cd $APP_ROOT
+#find courses -type f -exec chown www-data:www-data {} \;
+#find courses -type d -exec chown www-data:www-data {} \;
+
+echo "End fixing ownership and permissions"
+
+# Start the Minion job queue.
+echo "Starting Minion job queue"
+sudo -E -u www-data bin/webwork2 minion worker -m production &
+
+# The code below allows you to use
+#    docker container exec -it webwork2_app_1 hypnotoad -s bin/webwork2
+# to restart the webwork2 Mojolicious app in the container in a "nice" way.
 
 trap "exit 0" SIGWINCH
-# code added here
+
 while true
 do
-    exec "$@" &
-    wait $!
+	exec "$@" &
+	wait $!
 done
-
diff --git a/docker-config/ssl/Readme b/docker-config/ssl/Readme
new file mode 100644
index 0000000000..360a7c8d77
--- /dev/null
+++ b/docker-config/ssl/Readme
@@ -0,0 +1 @@
+Place your ssl certificate and key files here.
diff --git a/docker-config/ssl/default-ssl.conf b/docker-config/ssl/default-ssl.conf
deleted file mode 100644
index 0bd30d4292..0000000000
--- a/docker-config/ssl/default-ssl.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-<IfModule mod_ssl.c>
-	<VirtualHost _default_:443>
-		# This fake virtual host is intented to capture traffic which
-		# spoofs the "Host:" header value for security reasons.
-		# It will deny ALL such traffic.
-		ServerName fake
-		DocumentRoot "/var/www/html/"
-		SSLEngine on
-		SSLCertificateFile		/etc/ssl/local/my.crt
-		SSLCertificateKeyFile	/etc/ssl/local/my.key
-		SSLCertificateChainFile	/etc/ssl/local/myCA_chain.crt
-		<Directory /var/www/html/>
-			Order deny,allow
-			deny from all
-		</Directory>
-	</VirtualHost>
-
-	<VirtualHost *:443>
-		ServerAdmin support@mydomain.edu
-		DocumentRoot /var/www/html/
-		ServerName myserver.mydomain.edu
-		ServerAlias myserver.mydomain.edu
-
-		UseCanonicalName On
-
-		ErrorLog ${APACHE_LOG_DIR}/error.log
-		CustomLog ${APACHE_LOG_DIR}/access.log combined
-
-		SSLEngine on
-
-		SSLCertificateFile		/etc/ssl/local/my.crt
-		SSLCertificateKeyFile	/etc/ssl/local/my.key
-		SSLCertificateChainFile	/etc/ssl/local/myCA_chain.crt
-
-		<FilesMatch "\.(cgi|shtml|phtml|php)$">
-				SSLOptions +StdEnvVars
-		</FilesMatch>
-		<Directory /usr/lib/cgi-bin>
-				SSLOptions +StdEnvVars
-		</Directory>
-
-	</VirtualHost>
-</IfModule>
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
diff --git a/docker-config/ssl/local/PutYourCertificate_and_key_here.txt b/docker-config/ssl/local/PutYourCertificate_and_key_here.txt
deleted file mode 100644
index a1eb1a947d..0000000000
--- a/docker-config/ssl/local/PutYourCertificate_and_key_here.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-This directory should have your real SSL key and certificate, and 
-the Certificate Authority's root certificate or certrificate chain.
-
-The file names should match those defined in default-ssl.conf, ex:
-
-        SSLCertificateFile  /etc/ssl/local/my.crt
-        SSLCertificateKeyFile   /etc/ssl/local/my.key
-        SSLCertificateChainFile /etc/ssl/local/myCA_chain.crt
diff --git a/docker-config/ssl/local/my.crt b/docker-config/ssl/local/my.crt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/docker-config/ssl/local/my.key b/docker-config/ssl/local/my.key
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/docker-config/ssl/local/myCA_chain.crt b/docker-config/ssl/local/myCA_chain.crt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/docker-config/ssl/ssl.conf b/docker-config/ssl/ssl.conf
deleted file mode 100644
index 7e364639e9..0000000000
--- a/docker-config/ssl/ssl.conf
+++ /dev/null
@@ -1,85 +0,0 @@
-<IfModule mod_ssl.c>
-
-	# Pseudo Random Number Generator (PRNG):
-	# Configure one or more sources to seed the PRNG of the SSL library.
-	# The seed data should be of good random quality.
-	# WARNING! On some platforms /dev/random blocks if not enough entropy
-	# is available. This means you then cannot use the /dev/random device
-	# because it would lead to very long connection times (as long as
-	# it requires to make more entropy available). But usually those
-	# platforms additionally provide a /dev/urandom device which doesn't
-	# block. So, if available, use this one instead. Read the mod_ssl User
-	# Manual for more details.
-	#
-	SSLRandomSeed startup builtin
-	SSLRandomSeed startup file:/dev/urandom 512
-	SSLRandomSeed connect builtin
-	SSLRandomSeed connect file:/dev/urandom 512
-
-	##
-	##  SSL Global Context
-	##
-	##  All SSL configuration in this context applies both to
-	##  the main server and all SSL-enabled virtual hosts.
-	##
-
-	#
-	#   Some MIME-types for downloading Certificates and CRLs
-	#
-	AddType application/x-x509-ca-cert .crt
-	AddType application/x-pkcs7-crl	.crl
-
-	#   Pass Phrase Dialog:
-	#   Configure the pass phrase gathering process.
-	#   The filtering dialog program (`builtin' is a internal
-	#   terminal dialog) has to provide the pass phrase on stdout.
-	SSLPassPhraseDialog  exec:/usr/share/apache2/ask-for-passphrase
-
-	#   Inter-Process Session Cache:
-	#   Configure the SSL Session Cache: First the mechanism 
-	#   to use and second the expiring timeout (in seconds).
-	#   (The mechanism dbm has known memory leaks and should not be used).
-	#SSLSessionCache		 dbm:${APACHE_RUN_DIR}/ssl_scache
-	SSLSessionCache		shmcb:${APACHE_RUN_DIR}/ssl_scache(512000)
-	SSLSessionCacheTimeout  300
-
-	#   Semaphore:
-	#   Configure the path to the mutual exclusion semaphore the
-	#   SSL engine uses internally for inter-process synchronization. 
-	#   (Disabled by default, the global Mutex directive consolidates by default
-	#   this)
-	#Mutex file:${APACHE_LOCK_DIR}/ssl_mutex ssl-cache
-
-
-	#   SSL Cipher Suite:
-	#   List the ciphers that the client is permitted to negotiate. See the
-	#   ciphers(1) man page from the openssl package for list of all available
-	#   options.
-	#   Enable only secure ciphers:
-	SSLCipherSuite HIGH:!aNULL
-
-	# SSL server cipher order preference:
-	# Use server priorities for cipher algorithm choice.
-	# Clients may prefer lower grade encryption.  You should enable this
-	# option if you want to enforce stronger encryption, and can afford
-	# the CPU cost, and did not override SSLCipherSuite in a way that puts
-	# insecure ciphers first.
-	# Default: Off
-	#SSLHonorCipherOrder on
-
-	#   The protocols to enable.
-	#   Available values: all, SSLv3, TLSv1, TLSv1.1, TLSv1.2
-	#   SSL v2  is no longer supported
-	SSLProtocol all -SSLv3 -TLSv1 -TLSv1.1
-
-	#   Allow insecure renegotiation with clients which do not yet support the
-	#   secure renegotiation protocol. Default: Off
-	#SSLInsecureRenegotiation on
-
-	#   Whether to forbid non-SNI clients to access name based virtual hosts.
-	#   Default: Off
-	#SSLStrictSNIVHostCheck On
-
-</IfModule>
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
diff --git a/docker-config/xmlrpc-lite-utf8-fix.patch b/docker-config/xmlrpc-lite-utf8-fix.patch
deleted file mode 100644
index 0a6d1571a7..0000000000
--- a/docker-config/xmlrpc-lite-utf8-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/usr/share/perl5/XMLRPC/Lite.pm	2013-05-16 21:02:00.000000000 -0500
-+++ b/usr/share/perl5/XMLRPC/Lite.pm	2021-03-22 10:30:40.498229670 -0500
-@@ -52,7 +52,7 @@
- 
-     return $class->SUPER::new(
-         typelookup => {
--            base64 => [10, sub {$_[0] =~ /[^\x09\x0a\x0d\x20-\x7f]/}, 'as_base64'],
-+            base64 => [10, sub {$_[0] =~ /[^\x09\x0a\x0d\x20-\x7f]/ && !utf8::is_utf8($_[0])}, 'as_base64'],
-             int    => [20, sub {$_[0] =~ /^[+-]?\d+$/}, 'as_int'],
-             double => [30, sub {$_[0] =~ /^(-?(?:\d+(?:\.\d*)?|\.\d+)|([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?)$/}, 'as_double'],
-             dateTime => [35, sub {$_[0] =~ /^\d{8}T\d\d:\d\d:\d\d$/}, 'as_dateTime'],
diff --git a/htdocs/css/rtl.css b/htdocs/css/rtl.css
index 979d21a46b..95691f2401 100644
--- a/htdocs/css/rtl.css
+++ b/htdocs/css/rtl.css
@@ -1,5 +1,5 @@
 /* WeBWorK Online Homework Delivery System
- * Copyright &copy 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+ * Copyright &copy 2000-2023 The WeBWorK Project, https://github.com/openwebwork
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of either: (a) the GNU General Public License as published by the
diff --git a/htdocs/generate-assets.js b/htdocs/generate-assets.js
index 634850aeb5..d297e8b214 100755
--- a/htdocs/generate-assets.js
+++ b/htdocs/generate-assets.js
@@ -13,15 +13,9 @@ const autoprefixer = require('autoprefixer');
 const postcss = require('postcss');
 const rtlcss = require('rtlcss');
 const cssMinify = require('cssnano');
-const thirdPartyAssets = require('./third-party-assets.json');
 
 const argv = yargs
 	.usage('$0 Options').version(false).alias('help', 'h').wrap(100)
-	.option('useCDN', {
-		alias: 'c',
-		description: 'Use third party assets from a CDN rather than serving them locally.',
-		type: 'boolean'
-	})
 	.option('enable-sourcemaps', {
 		alias: 's',
 		description: 'Generate source maps. (Not for use in production!)',
@@ -65,7 +59,7 @@ const processFile = async (file, _details) => {
 
 		if (/(?<!\.min)\.js$/.test(baseName)) {
 			// Process javascript
-			if (!ready) console.log(`\x1b[32mProccessing ${file}\x1b[0m`);
+			if (!ready) console.log(`\x1b[32mProcessing ${file}\x1b[0m`);
 
 			const filePath = path.resolve(__dirname, file);
 
@@ -106,7 +100,7 @@ const processFile = async (file, _details) => {
 			assets[file] = newVersion;
 		} else if (/^(?!_).*(?<!\.min)\.s?css$/.test(baseName)) {
 			// Process scss or css.
-			if (!ready) console.log(`\x1b[32mProccessing ${file}\x1b[0m`);
+			if (!ready) console.log(`\x1b[32mProcessing ${file}\x1b[0m`);
 
 			const filePath = path.resolve(__dirname, file);
 
@@ -195,7 +189,7 @@ const processFile = async (file, _details) => {
 };
 
 const themesDir = path.resolve(__dirname, 'themes');
-const jsDir = path.resolve(__dirname, 'js/apps');
+const jsDir = path.resolve(__dirname, 'js');
 
 // Remove generated files from previous builds.
 cleanDir(themesDir);
@@ -213,23 +207,10 @@ for (const file of fs.readdirSync(themesDir, { withFileTypes: true })) {
 		fs.closeSync(fs.openSync(path.resolve(themesDir, file.name, 'math4-overrides.css'), 'w'));
 }
 
-// Add third party assets to the assets list.
-if (argv.useCDN || process.env.USE_CDN) {
-	// If using a cdn, the values are the cdn location for the file.
-	console.log('\x1b[32mAdding third party assets from CDN.\x1b[0m');
-	Object.assign(assets, thirdPartyAssets);
-} else {
-	// If not using a cdn, the values are the same as the request file.
-	console.log('\x1b[32mAdding third party assets served locally from htdocs/node_modules.\x1b[0m');
-	Object.assign(assets,
-		Object.entries(thirdPartyAssets).reduce(
-			(accumulator, [file]) => { accumulator[file] = file; return accumulator; }, {}));
-}
-
 // Set up the watcher.
 if (argv.watchFiles) console.log('\x1b[32mEstablishing watches and performing initial build.\x1b[0m');
-chokidar.watch(['js/apps', 'themes'], {
-	ignored: /\.min\.(js|css)$/,
+chokidar.watch(['js', 'themes'], {
+	ignored: /layouts|\.min\.(js|css)$/,
 	cwd: __dirname, // Make sure all paths are given relative to the htdocs directory.
 	usePolling: true, // Needed to get changes to symlinks.
 	interval: 500,
diff --git a/htdocs/helpFiles/Grades.html b/htdocs/helpFiles/Grades.html
deleted file mode 100644
index d11af30e0f..0000000000
--- a/htdocs/helpFiles/Grades.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-<head>
-<meta charset="utf-8" />
-<title>Student Grades Help Page</title>
-</head>
-
-<body><br>
-<p>
-<p>The "Ind" column is :  (totalNumberOfCorrectProblems / totalNumberOfProblems)^2/ AvgNumberOfAttemptsPerProblem), which is a more 
-useful number when it comes to summarizing how well you are doing.
-</p>
-<p>In the problems section of the chart the upper letter represents whether or not the problem was answered correctly (C for 
-correct) and the lower number is the number of times the problem was attempted.</p>
-</body>
-</html>
diff --git a/htdocs/helpFiles/InstructorAddUsers.html b/htdocs/helpFiles/InstructorAddUsers.html
deleted file mode 100644
index 4d7afb98c8..0000000000
--- a/htdocs/helpFiles/InstructorAddUsers.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-	
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title>Add User Help Page</title>
-</head>
-
-<body><br>
-<h3>Add User Help Page</h3>
-<p>The number of rows can be changed by changing the number in the text box and hitting the "create" button, but be careful, 
-once some information is entered do not change the number of rows or all the text in the boxes will be lost.</p>
-<p>The only mandatory information is the "login" and the "Student ID", the Student ID will be the student's initial password.</p>
-<p> Any other boxes may be left blank, but it may be useful to fill in section and recitation as they can be used to seperate 
-scores later on.</p>
-<p>Multiple sets may be given to the user by holding down the shift key while selecting from the list.</p>
-
-</body>
-</html>
diff --git a/htdocs/helpFiles/InstructorAssigner.html b/htdocs/helpFiles/InstructorAssigner.html
deleted file mode 100644
index 23733cee72..0000000000
--- a/htdocs/helpFiles/InstructorAssigner.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html>
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-<head>
-<meta charset="utf-8" />
-<title>Set Assigner Help Page</title>
-</head>
-
-<body><br>
-<p>Either list can be reordered by changing the criteria and pushing the button. Then multiple sets can be assigned to a user, or 
-multiple users to a set.</p>
-</body>
-</html>
diff --git a/htdocs/helpFiles/InstructorConfig.html b/htdocs/helpFiles/InstructorConfig.html
deleted file mode 100644
index 50a2a4e21f..0000000000
--- a/htdocs/helpFiles/InstructorConfig.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-	
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title>Course Configuration Help Page</title>
-</head>
-<body>
-<blockquote>
-<p>
-This page allows you to configuration of certain parameters, such as 
-<ul>
-	<li>permission levels, </li>
-	<li>display modes allowed </li>
-	<li>default display mode </li>
-	<li>and email feedback behavior, </li>
-</ul>
-on a course by course basis.
-</p>
-
-<p>
-Click on each of the tabs to view the configuration items.  The question
-mark icon provides access to information about the behavior of the configuration
-settings.
-</p>
-
-
-</blockquote>
-</body>
-</html>
diff --git a/htdocs/helpFiles/InstructorFileManager.html b/htdocs/helpFiles/InstructorFileManager.html
deleted file mode 100644
index 7d489428ff..0000000000
--- a/htdocs/helpFiles/InstructorFileManager.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-	
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title>File Manager Help Page</title>
-</head>
-
-<body><br>
-<h3>File Manager Help Page</h3>
-
-<p align="left">
-The File Manager module will soon replace the File Transfer module.  We'll keep
-both available for the time being.
-<p>
-Locations of files:
-<dl>
-	<dt>Set definition (".def") files</dt>
-		<dd>These are stored in the templates directory.  To view the format for 
-		<strong>Set Definition files</strong> see
-		<a href="http://webwork.math.rochester.edu/docs/docs/courseadmin/setdefinitionformat.html" target="Webworkdocs">Set Definition specification </a>
-		or download set0.def and copy that. Set definition files are mainly
-		useful for transferring set assignments from one course to another.
-		(For example from a calculus course taught the previous year.)They contain a
-		list of problems used and the dates and times.
-		These definitions can be imported into the current course and a set in the current course
-		can be exported to a set definition files.</dd>
-	<dt>Class list (".lst") files</dt>
-		<dd>The classlist files are stored in the templates directory and provide
-		a convenient way to enter a large number of students into your
-		class. To view the format for <strong>ClassList files</strong> see
-		<a href="http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files" target="Webworkdocs">ClassList specification</a>
-		or download demoCourse.lst and use it as a model. 
-		ClassList files can be
-		prepared using a spreadsheet and then saved as .csv (comma separated
-		variables) text files. </dd>
-	<dt>Scoring (".csv") files</dt>
-		<dd>The scoring files are stored in the scoring directory and are produced 
-		using the "Scoring" module or the scoring command in the "Instructor Tools" module.
-		These files can be downloaded, modified in a spread sheet (for example, add midterm scores)
-		and then uploaded again to the scoring directory to be merged with email messages. (Use
-		a new file name, other than courseName_totals.csv, when uploading to prevent the 
-		scoring module from overwriting an uploaded file.)
-		)
-		</dd>
-	<dt>Problem template (".pg") files</dt>
-		<dd>These provide the template from which are problems are created and 
-		are located in the template directory.   They can be edited directly using
-		the "edit problem" link on each problem page. The File Manager allows you to
-		upload or download these files so that you can save them on your desktop.</dd>
-	<dt>html directory</dt>
-		<dd>This directory is accessible from the web. You can use it to store html documents
-		or image documents that are used by the course.  Do not store private information in
-		this directory or in any subdirectory.These documents can be pointed to from within
-		problems using the htmlLink macro</dd>
-	<dt>templates/email directory</dt>
-		<dd>This is where email messages are saved.  You can upload or download files in 
-		this directory if you wish to save the files for later.</dd>
-	<dt>templates/macros directory</dt>
-		<dd>Macro (".pl") files containing favorite macros for your course can be stored here. Those
-		being used for many courses should be stored in pg/macros.</dd>
-</dl>
-
-
-</p>
-  
-
-<p align="left">
-
-</p>
-
-
-</body>
-</html>
diff --git a/htdocs/helpFiles/InstructorFileTransfer.html b/htdocs/helpFiles/InstructorFileTransfer.html
deleted file mode 100644
index 77206a513b..0000000000
--- a/htdocs/helpFiles/InstructorFileTransfer.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-	
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title>File Transfer Help Page</title>
-</head>
-
-<body><br>
-<h3>File Transfer Help Page</h3>
-
-<p align="left">
-To view the format for <strong>ClassList files</strong> see
-<a href="http://webhost.math.rochester.edu/webworkdocs/discuss/msgReader$59#2397" target="Webworkdocs">ClassList specification</a>
-or download demoCourse.lst and use it as a model. 
-ClassList files can be
-prepared using a spreadsheet and then saved as .csv (comma separated
-variables) text files.
-</p>
-  
-
-<p align="left">
-To view the format for <strong>Set Definition files</strong> see
-<a href="http://webwork.math.rochester.edu/docs/docs/courseadmin/setdefinitionformat.html" target="Webworkdocs">Set Definition specification </a>
-or download set0.def and copy that. Set definition files are mainly
-useful for transferring course assignments from one course to another.
-(For example from a calculus course taught the previous year.)
-</p>
-
-
-</body>
-</html>
diff --git a/htdocs/helpFiles/InstructorIndex.html b/htdocs/helpFiles/InstructorIndex.html
deleted file mode 100644
index 92eae0074c..0000000000
--- a/htdocs/helpFiles/InstructorIndex.html
+++ /dev/null
@@ -1,52 +0,0 @@
-
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-	
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title>Instructor Tools Help Page</title>
-</head>
-<body>
-
-<h3>Instructor Tools Help Page</h3>
-<blockquote>
-<p>
-This page allows quick access to an individual student's homework set,
- a homework set for the entire class, or the class roster data for one or more
- students.  
-</p>
-
-<p>
-It is a collection of short cut techniques which allow you to modify the database with fewer
-page clicks than are required when using the "Class List Editor" and "Hmwk Sets Editor" pages. It is often more efficient because the set and the student can both be selected at the same time.
-</p>
-
-<p>
-New users will probably find it easier to use those two pages until they get used to the information required.
-</p>
- 
-<p>
-Importing and exporting class lists, and deleting students <strong>must</strong> be done
-from the class list editor.
-</p>
-</blockquote>
-</body>
-</html>
diff --git a/htdocs/helpFiles/InstructorPGProblemEditor.html b/htdocs/helpFiles/InstructorPGProblemEditor.html
deleted file mode 100644
index 1b7faf9022..0000000000
--- a/htdocs/helpFiles/InstructorPGProblemEditor.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-
-<head>
-<meta charset='utf-8'>
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-
-<title>PG Problem Editor Help Page</title>
-</head>
-
-<body>
-<h1>PG Problem Editor Help Page</h1>
-<blockquote>
-<p>
-	This page allows one to edit the contents of PG problem files (templates) as well as set headers and other files.
-</p>
-<p>
-	When using this page two or more windows may be created -- one to edit the text in the file and one to view the
-	results. This can be a bit confusing. If a window seems to have completely disappeared make sure that it is not
-	hiding behind one of the other windows.
-</p>
-<h2>Features:</h2>
-<dl>
-	<dt>| <a href="http://webwork.math.rochester.edu/docs/docs/pglanguage/manpages/">Manpages</a>
-	| <a href="http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/PGmacrosByFile">macro list</a>
-	| <a href="http://webwork.maa.org/wiki/Category:Authors">authoring info and help</a>
-	| <a href="http://devel.webwork.rochester.edu/doc/cvs/pg_HEAD/">testing lab</a>
-	| <a href="http://devel.webwork.rochester.edu/doc/cvs/pg_HEAD/">pod docs</a>
-	| <a href="http://bugs.webwork.rochester.edu">Report problem bugs</a>
-	|</dt>
-	<dd>The first five links are to pages that give some information about writing problems:
-	<dl>
-		<dt><a href="http://webwork.math.rochester.edu/docs/docs/pglanguage/manpages/">Manpages</a></dt>
-		<dd>
-			This links to an (incomplete) list of the most commonly used macros with a description of their parameters
-			and how to use them.
-		</dd>
-		<dt><a href="http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/PGmacrosByFile">macro list</a></dt>
-		<dd>This link provides a complete list of macros.</dd>
-		<dt><a href="http://webwork.maa.org/wiki/Category:Authors">authoring info and help</a> </dt>
-		<dd>This link takes you to the authoring section of the WeBWorK wiki.</dd>
-		<dt><a href="http://devel.webwork.rochester.edu/doc/cvs/pg_HEAD/">testing lab</a></dt>
-		<dd>This links to a WeBWorK "problem" which allows you to try out fragments of PG code.</dd>
-		<dt><a href="http://devel.webwork.rochester.edu/doc/cvs/pg_HEAD/">pod docs</a></dt>
-		<dd>
-			This link gives details for many macros. It links to documentation embedded in the macro files themselves.
-		</dd>
-		<dt><a href="http://bugs.webwork.rochester.edu">Report problem bugs</a></dt>
-		<dd>
-			If you find an error in a library problem please use the link to notify us so that we can fix it. You will
-			need to register with an email address the first time you use bugzilla, but after that you will not.
-		</dd>
-	</dl>
-	</dd>
-	<dt>The large text window</dt>
-	<dd>
-		This is where you edit the text of the problem template. Nothing happens until you pick an action (below) and
-		click the "Take action!" button.
-	</dd>
-	<dt>Text Editor Options</dt>
-	<dd>
-	<dl>
-		<dt>Theme</dt>
-		<dd>Select your favorite theme for the large text window.</dd>
-		<dt>Key Map</dt>
-		<dd>
-            The key maps that are available are "default", "emacs", "sublime", and "vim". The "default" key map has the
-            standard behavior of a browser text area. You can use Ctrl-C to copy, Ctrl-V to paste, Ctrl-F to search,
-            etc. If you are more comfortable with the "emacs", "sublime", or "vim" text editors then you may choose to
-            use one of those key maps instead.
-		</dd>
-		<dt>Enable Spell Checking</dt>
-		<dd>
-            Spell check the text of the file that your are editing. Note that there will be many spelling errors in the
-            code parts of your file.
-		</dd>
-	</dl>
-	</dd>
-</dl>
-
-<h2>Action items:</h2> <i>(If an action cannot be executed it will not appear as an action item.)
-</i>
-<dl>
-	<dt>View using seed "12345" and display mode "image"</dt>
-	<dd>
-		Will bring up a window to show the results of your editing. It does not change the permanent file on the disk.
-		You can view different versions of the same problem by changing the seed (any number will do). You can also
-		change the manner in which the mathematics is typeset.
-	</dd>
-	<dt>Add to set ...</dt>
-	<dd>
-		Add this problem as the last problem of an existing set, either as a problem or as the set header (the text that
-		appears on the home page of a homework set). You can rearrange the order of the problems later using the "Hmwk
-		Sets Editor"
-	</dd>
-	<dt>Save as [TMPL]/"path"...</dt>
-	<dd>
-		Makes a new copy of the file you are editing at the location relative to the course's templates ([TMPL])
-		directory given by "path". The checkbox allows you to replace the current problem with the new problem in the
-		current homework set.
-		<p>Check the checkbox if you want to edit the current problem without changing the original problem file.</p>
-		<p>
-			Leave the checkbox unchecked if you are using the current problem as a model for a brand new problem. You
-			can add the new file to the homework set from the Library Browser.
-		</p>
-		<p>
-			If the original problem can not be edited than the path name must be changed in order to be allowed to save
-			the problem. Adding "local/" to the beginning of the original path is the default solution. All locally
-			created and edited files will then appear in a subdirectory named "local".
-		</p>
-		<p>
-			A new problem whose path ends in blankProblem.pg should be given a new name, for example, "myNewProblem.pg".
-		</p>
-	</dd>
-	<dt>Revert</dt>
-	<dd>
-		Reverts to the copy of the file saved on the disk -- all unsaved editing changes will be lost. This option only
-		appears when you have making provisional edits using the first option "View..." above
-	</dd>
-	<dt>Take action</dt>
-	<dd>
-		Executes the action item selected above. You can elect to have the results of this action appear in a new
-		window.
-	</dd>
-</dl>
-</blockquote>
-</body>
-
-</html>
diff --git a/htdocs/helpFiles/InstructorPreflight.html b/htdocs/helpFiles/InstructorPreflight.html
deleted file mode 100644
index 45b983be36..0000000000
--- a/htdocs/helpFiles/InstructorPreflight.html
+++ /dev/null
@@ -1 +0,0 @@
-hi
diff --git a/htdocs/helpFiles/InstructorProblemSetDetail.html b/htdocs/helpFiles/InstructorProblemSetDetail.html
deleted file mode 100644
index 976ff7e1c6..0000000000
--- a/htdocs/helpFiles/InstructorProblemSetDetail.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
-<head>
-<title>Set Detail Help Page</title>
-</head>
-
-<body>
-
-<h2>Set Detail Help Page</h2>
-
-<!--
-<h3> Quick Links </h3>
-
-<ul>
-   <li> I do <i>foo</i> and nothing seems to happen! </li>
-   <li> My problems are in random order </li>
-   <li> My nose is leaking. </li>
-   <li> How does this work? </li>
-</ul>
--->
-<h3> "Modes" </h3>
-
-<p>The <strong>Set Detail</strong> page can be viewed in one of two distinct modes:
-	<ul>
-		<li> All students </li>
-		<li> One specific student </li>
-	</ul>
-
-This should be quite clear at the top of the page.
-
-<h3> Contents </h3>
-
-<ul type="1">
-	<li> <a href="#form">Form buttons</a>
-	<li> <a href="#general">General Information</a>
-	<li> <a href="#headers">Headers</a>
-	<li> <a href="#problems">Problems</a>
-</ul>
-
-
-
-
-<h4> <a name="form">Form buttons</a> </h4>
-<dl>
-	<dt> Save Changes </dt>
-		<dd>Occurs twice on the page, at the top and the bottom.  <br>Any and all changes made to any
-		part of the set will be saved with one important exception: When editing the set for one
-		or more students, you can choose to override the default value (defined for the set in
-		general) by clicking on the checkbox and providing a value (or possibly leaving a blank).
-		If you do <strong>NOT</strong> check the checkbox, the override value will be discarded.
-		<p><small>Example:</small>
-		<br><input type="checkbox"> Weight <input value=2 size=5> 1
-		<br><input type="checkbox" checked> Weight <input value=2 size=5> 1
-		<br><small>The first value of 2 will be discarded because the checkbox is not checked.</small>
-		</dd>
-	<dt> Reset Form </dt>
-		<dd>Discards any and all changes, reloading the page by re-reading the database information
-		for this set.  Also, resets the display modes.<p></dd>
-	<dt> Display Mode </dt>
-		<dd>You can maintain a different display mode for the problems if you want.
-	<dt>Add blank problem template</dt>
-		<dd> Adds a new, essentially blank, problem to the homework set when the homework set is saved.
-		You can modify this to create your own problem, by clicking on the "Edit it" link and
-		saving the "blankProblem.pg" to some new file, e.g. "myNewProblem.pg".
-</dl>
-
-<h4> <a name="general">General Information</a> </h4>
-<dl>
-<dt>Reordering Problems</dt>
-<dd>
-You can reorder problems by clicking on the arrow icon and dragging the problem.  You will see a box showing you where the problem will be placed.  When problems are reordered any holes in the numbering will be filled in. </dd>
-
-<dt>Deleting Problems</dt>
-<dd> You can delete problems by clicking the "Delete it?" check box and saving.  If the set is already active it is recommended that you instead use the "Mark Correct?" problem to mark a particular problem correct for all students.</dd>
-
-<dt>Viewing Problems</dt>
-<dd>
-You can view a problem by clicking the render icon underneath the problem number.  The Display Mode used to render the problem is chosen using the drop down menu.  You can render all problems using the Render All button. Hide All will hide all of the problems.
-</dd>
-
-<dt>Problem Paths</dt>
-<dd>
-All of the paths for problem files are relative to the templates directory
-of the current course.  You can access this directory "directly" using the File Manager
-page.
-</dd>
-
-</dl>
-</body>
-</html>
diff --git a/htdocs/helpFiles/InstructorProblemSetList.html b/htdocs/helpFiles/InstructorProblemSetList.html
deleted file mode 100644
index 130bb8d0b6..0000000000
--- a/htdocs/helpFiles/InstructorProblemSetList.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<html>
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-<head>
-<title>Set List Help Page</title>
-</head>
-<body>
-<p>	After selecting a task with the radio buttons (round buttons on the left), 
-click the "Take action" button.
-</p>
-<hr>
-<dl>
-	<dt>Show</dt>
-		<dd>Display  sets matching a selected criteria.  
-		    Useful if there are many sets, such as in a library.</dd>
-	<dt>Sort</dt>
-		<dd>Sorts the lists displayed; by due date, name, etc.</dd>
-	<dt>Edit</dt>
-		<dd>The sets checked below will become available for editing the due dates and set headers.</dd>
-	<dt>Make visible/hidden</dt>
-		<dd>The sets checked below will be visible to students or hidden from students.  Useful for preparing sets
-		    ahead of time, but not showing them to students; or for temporarily hiding a set which has a mistake in 
-		    it while it is being fixed.</dd>
-	<dt>Import</dt>
-		<dd>Import a set from a set definition file. 
-		    (Use "File Transfer" to upload/download set definition files.)</dd>
-	<dt>Export</dt>
-		<dd>The sets checked below will written to set definition files, to be saved for future use, or 
-		    to be transferred to another course.  The set definition files can be uploaded/downloaded 
-		    using "File Transfer".
-		    </dd>
-	<dt>Score</dt>
-		<dd>Student scores for the sets selected below will be calculated.  This and other scoring operations
-		    can also be done using the "Scoring Tools" link. </dd>
-	<dt>Create</dt>
-		<dd>Create a new, empty set.  This can also be done directly from the "Library Browser".</dd>
-	<dt>Delete</dt>
-		<dd>Delete the sets checked below. Be careful, this cannot be undone.</dd>
-</dl>
-<hr>
-Other actions
-<dl>
-	<dt>"Edit Problems" column</dt>
-		<dd>Indicates the number of problems in the set.  Clicking on this link allows you to edit the set headers,
-		change the problem order, specifying the number of allowed attempts and the weight (credit value) of each problem.
-		You can also inspect and edit the template of the problem and delete the problem entirely.  
-		<p>
-		To add new problems use the "Library Browser".
-		</dd>
-	<dt>"Edit Assigned Sets" column</dt>
-		<dd>Shows how many instructors and students have been assigned this problem set, out of the total number in the class. 
-		    (While testing it is best to assign
-		    the problem only to instructors and TA's; once the set is ready, assign it to the entire class or section.)
-		    Clicking on this link allows you to assign or unassign this set to additional users and to individually edit 
-		    the assignment to specific users. For changing dates for individual users there are also 
-		    shortcuts from the "Instructor Tools" link.
-		    </dd>
-	<dt>Changing dates</dt>
-		<dd>Dates for problem sets can be edited by clicking the pencil in the "Edit Set Data" column next to the set name.
-		    To change dates for several sets at once, click the check box in the "Select" column and 
-		    choose "Edit selected" from the tasks above.
-		    <p>
-		    For those upgrading from WW2.0 to WW2.1: The headers have moved -- to edit them click in the "Edit problems" column.
-		    </dd>
-
-</dl>
-
-
-</body>
-</html>
diff --git a/htdocs/helpFiles/InstructorScoring.html b/htdocs/helpFiles/InstructorScoring.html
deleted file mode 100644
index e09784e7fe..0000000000
--- a/htdocs/helpFiles/InstructorScoring.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<html>
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-<head>
-<title>Scoring Tools Help Page</title>
-</head>
-
-<body><br>
-
-<p>
-WeBWorK does not have a full featured scoring ability -- we leave that to your
-favorite spread sheet application.  
-</p>
-
-<p>
-What WeBWorK does have is good support for summarizing the scores on WeBWorK
-homework sets and exporting them in a form (.csv) which any spreadsheet can use.
-WeBWorK reports all of the homework grades,
-creates a column which totals these grades and leaves it at that.
-</p>
-
-<p>
-Click on the sets you want scored (usually all of them :-) ) 
-choose the name of the export file you want to 
-use (by default:  courseName_totals.csv) and then click the
-"score selected sets" button.
-</p>
-
-<p>
-If you want a form that is easy to read on the web (for a quick look at grades)
-click the "pad fields" option.  This adds spaces the fields which makes the 
-columns easy to read when in text form but it can confuse
-some spread sheet applications since the extra spaces violate the csv standard
-(although Excel handles them with no problem). If you want a reliable .csv file
-for use in any spreadsheet application unclick the "pad fields" option.
-You can download the .csv file immediately by clicking on the link, or you
-can download it using the "File Manager" from the scoring directory.
-</p>
-
-<p>
-I have no clue what "record scores for single sets" does -- sorry.
-</p>
-
-<p>
-The index is a number assigned on the basis of the number of incorrect attempts
-(roughly equivalent to 1/the number of attempts) which seems to correlate with
-the relative difficulty the student had with the problem.
-</p>
-
-<p>
-We would all like to be able to merge the spreadsheet with the webwork grades
-and a spread sheet with the excel grades automatically.  Unfortunately this 
-application has not yet been written for WeBWorK and for that matter it doesn't
-appear to be an ability that Excel has either.  The closes I have been able
-to find is third party software for excel (e.g. http://www.synkronizer.com/e/tutorial_merging.html)
-</p>
-
-<p>
-To use the Email and spreadsheet merge feature, upload your spreadsheet with
-calculated grades to the scoring directory using the File Manager link. 
-</p>
-
-<p>
-Do NOT use the file name courseName_totals.csv, since you might accidentally 
-overwrite that if you again export your WeBWorK homework scores (actually the 
-earlier file is moved to courseName_totals_bak1.csv -- so you can recover 
-using the File Manager -- but it's still a pain).
-</p>
-
-<p>
-If you upload your file on the web with the name: <code>report_grades_data.csv</code>
-and also create an email message with the name <code>report_grade.msg</code> with the 
-approriate <code>$COL</code> variables then not only can you email the message
-with the embedded grades to the students, but files with those exact names are 
-automatically appended to the "Grades" page seen by the students.
-</p>
-
-
-
-</body>
-</html>
diff --git a/htdocs/helpFiles/InstructorSendMail.html b/htdocs/helpFiles/InstructorSendMail.html
deleted file mode 100644
index 62c22d67be..0000000000
--- a/htdocs/helpFiles/InstructorSendMail.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-<head>
-<title>Mail Merge Help Page</title>
-</head>
-
-<body><br>
-<p>Emails can be sent from this page to the class. Be sure to change all blanks which read "fixme". The email can be sent to
-all students, or some subset. To change the way the students are ordered, after selecting the criteria, push the "Change Display 
-Settings" button.</p>
-<p>Personalized data can be inserted into the message using any of the variables available in the drop down menu titled "list of 
-insertable macros". Most of the personal data does not need a merge file, but if you wish to include scoring data, you must select 
-that scoring file as the merge file, and then enter the score into the message by using what ever column the score is in. For example,
-if the scores where in the 4 column of s0scr.cvs then I would set the merge file to that file, and then type $COL[4] to have that
-be the score.</p>
-<p>The size of the email box can be changed by changing the numbers in the "columns" and "rows" boxes and pressing enter.</p>
-</body>
-</html>
diff --git a/htdocs/helpFiles/InstructorSetMaker.html b/htdocs/helpFiles/InstructorSetMaker.html
deleted file mode 100644
index b2f167a3bd..0000000000
--- a/htdocs/helpFiles/InstructorSetMaker.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-<head>
-<title>Problem Set Maker Help Page</title>
-</head>
-
-<body><br>
-<p>This page is used to create problem sets. The first step is to choose which set your working on. If you need to name a new problem 
-set fill in the blank next to the "Create a New Set in This Course" button and then press the button. Then choose which set you want to
-work on in the drop down menu.</p>
-<p>Use the options in the uppermost box to pick a collection of problems to look at, and then to add problems to the set select them 
-and then hit update.</p>
-<p>To set the open and close dates, assign the set to users, delete problems from the set, or change their order, click on the 
-"Edit Taget Set" button.</p>
-</body>
-</html>
diff --git a/htdocs/helpFiles/InstructorStats.html b/htdocs/helpFiles/InstructorStats.html
deleted file mode 100644
index e85af63cd3..0000000000
--- a/htdocs/helpFiles/InstructorStats.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<html>
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-<head>
-<title>Statistics Help Page</title>
-</head>
-
-<body><br>
-<p>This page is a useful tool for Professors who want to see how their students are doing. Statistics can either be viewed for a single
-set or for a single user simply by clicking on the link.</p>
-<p>The "Ind" column is :  (totalNumberOfCorrectProblems / totalNumberOfProblems)^2/ AvgNumberOfAttemptsPerProblem), which is a more 
-useful number when it comes to summarizing how well students are doing.</p>
-<p>The bottom most chart on the set statistics can be resorted by any column by clicking the blue link of that column's name.</p>
-</body>
-</html>
diff --git a/htdocs/helpFiles/InstructorUserDetail.html b/htdocs/helpFiles/InstructorUserDetail.html
deleted file mode 100644
index 1fc02bfb32..0000000000
--- a/htdocs/helpFiles/InstructorUserDetail.html
+++ /dev/null
@@ -1,48 +0,0 @@
-
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-	
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
-<head>
-<title>Instructor Tools Help Page</title>
-</head>
-<body>
-
-<h3>Sets assigned to student Help Page</h3>
-<blockquote>
-<p>A student must be assigned a homework set in order for it to appear on their WeBWorK home page. Check the box in the left column to assign a student to that homework set. Uncheck the box to unassign a student.  If a student is unassigned from a homework set, all of the student's data for that homework set is deleted 
-and cannot be recovered. Use this action cautiously! </p>
-
-<p>
-Change the due dates for an individual
-student on this page.  Check the checkbox and enter the new date in order
-to override the date. (You can copy the date format from the date in the right hand column which indicates the date when the homework set is due for the whole class.)
-</p>
-
-<p>
-Click on the homework set links to edit change the grades for this individual student on the homework set. (The grade of each problem is called the "status".)
-You can also change the number of allowed attempts and further modify the 
-individual student's homework set.) You will also be able to change a student's seed which determines the individual values used in the individual version of the student's problem and the weight (how much a problem counts towards the grade.)
-</p>
-
-</blockquote>
-</body>
-</html>
-
diff --git a/htdocs/helpFiles/InstructorUserList.html b/htdocs/helpFiles/InstructorUserList.html
deleted file mode 100644
index 945d40bda5..0000000000
--- a/htdocs/helpFiles/InstructorUserList.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
-<head>
-<title>Class List Editor Help Page</title>
-</head>
-<h3>Class List Editor Help Page</h3>
-<body>
-<blockquote>
-<p>
-From this page you can <strong>add new students</strong>, to <strong>edit</strong> the class list data (names, email addresses, recitation, section
-permission levels and enrollment status), to <strong>change passwords</strong>, to <strong>export</strong> (save)
-class lists for back-up or use in another course. You can also delete students from the class roster, but this cannot be undone.
-</p>
-<p>
-This page gives access to information about the student, independ of the homework sets
-assigned to them.
-</p>
-<p>
-To perform an action first click the radio button next to desired action then click the "Take Action!" button.
-</p>
-
-
-<h4>How to:</h4>
-<dl>
-	<dt>Restrict or sort the students displayed</dt>
-		<dd>When the class is very large not all students will be displayed.  Using the first action on this page you can show only the students from a given recitation or from a given section, or only students whose login or last name fits a pattern match. The second action will sort the students currently being displayed.  You can also sort the displayed students by clicking on the active links at the top of each column.</dd>
-
-	<dt>Edit class list data</dt>
-		<dd>You can edit the class list data for a single student by clicking on the pencil icon next to their login name.  To edit several students at once click on the "Select" checkbox next to their names, click on the radio button for editing selected users and then click "Take Action!". You can also edit all visible users (those students currently being displayed) or even all users in the course although this last option might take a long time to load for a large class. </dd>
-		<dd> The login name cannot be changed. (It is the primary key for the student's data.) If you make a mistake in the login name at the beginning of the course (before any work has been done) then it is best to simply add a new student with the correct entry and drop the student with the bad login name. (See drop and delete students below.)</dd>	
-	<dt>Add a few students to the course.</dt>
-		<dd>	Click the "Add x student(s)" radio button and then click "Take action". This will take you to a new page where the data can be entered for one or more students.  It is also possible to assign the student to one or more problem sets as they are being entered: simply select the homework sets from the list below the data entry table. Use 'command' or 'control' click to select more than one homework set.</dd>
-	
-	<dt>Add many students to a course from a class list.</dt>
-		<dd>This is most easily done by importing a class list.  The class list can be uploaded from your workstation to the server using the File Manager page.  The class list must be a file ending in .lst and must have a specific <a href="http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files">format</a>.  Once the file has been uploaded to the server the file will appear in the import action pop-up list (5th action). demoCourse.lst is available for most courses and adds the "practice users" which activate guest logins to the class list .</dd>
-
-	<dt>Add a TA or an instructor (change permission level of user)</dt>
-		<dd>This is done by first entering the user as a student and then changing the permission level of the user. First edit the user by clicking on the pencil next to their name (or using the technique above for several users), then change their permssion level -- an entry blank at the far right of the screen, you may have to scroll to see it.  The permission levels are
-		<ul>
-			<li>Guest: -5</li>
-			<li>Student: 0</li>
-			<li>Proctor: 2</li>
-			<li>TA: 5</li>
-			<li>Instructor: 10</li>
-		</ul></dd>
-
-	<dt> Drop student from the course</dt>
-		<dd> To drop a student or students, select them for editing as described above and then set the pop-up list to enrolled,drop, or audit.  Dropped students cannot log in to the course, are not assigned new homework sets and are not sent e-mail.  They can be re-enrolled simply by changing their status back to enrolled.  No data is lost, any homework sets assigned before they were dropped are restored  unchanged.  </dd>
-	<dt>Delete a student from a course</dt>
-		<dd>This should be done cautiously.  Once a student is deleted from a course their data is lost forever and cannot be recovered.  They can be added to the course as a new student, but all of their homework set assignments and homework has been permanently deleted.  </dd>
-	<dt>		Assign sets to one student</dt>
-		<dd>	 To assign one or more sets to an individual student click in the column "Assigned Sets" in the student's row.  This will take you to a page where you can assign and unassign homework sets and change the due dates for homework on an individual basis.</dd>
-	<dt>Change the due date for one student</dt>
-		<dd>Click on the column "Assigned Sets" in the student's row. This will take you to a page where you can assign and unassign homework sets and change the due dates for homework on an individual basis.</dd>
-	<dt>		"Act as" a student</dt>
-		<dd>Clicking on the login name link in a student's row allows you to view the student's version of the homework (rather than your own) so that you can more easily answer student questions about homework problems. (A "acting as xxx" alert will appear in the upper right corner of each window while you are acting as a student.) You can submit the answers (which will NOT be recorded) to check that the computer is grading the problem correctly.  You will also be able to view past answers submitted by the student for each problem. To stop acting in the student's role click the "Stop acting" link in the upper right corner of the window. </dd>
-	<dt>	Change the grades on a homework set for one student. </dt>
-		<dd>Click first in the "Assigned Sets" column in the student's row.  This will take you to a new page where you will click on the link to the homework set where the grade change is to be made.  (The grade for each problem is listed as "status" on this third page).</dd>
-	<dt>Extend the number of attempts allowed a student on a given problem</dt>
-		<dd>Click first in the "Assigned Sets" column in the student's row.  This will take you to a new page where you will click on the link to the homework set where the grade change is to be made.  </dd>
-	<dt>Assign sets to many students</dt>
-		<dd>This is  done from the "Hmwrk Sets Editor" or from the "Instructor Tools" page if you wish to assign a homework set to all students or a large group of students (e.g. a section).</dd>
-	<dt>Change dates for a homework set for the whole class.</dt>
-		<dd>This is  done from the "Hmwrk Sets Editor" or from the "Instructor Tools" page.</dd>
-	<dt>Change the grading on a homework set for an entire class.</dt>
-		<dd>You might want to do this if you want to give full credit to everyone on a particular problem that was not worded correctly, or wasn't working properly. This is done from the "Hmwk sets editor" page or the "Instructor tools" page.</dd>
-	<dt>Change the number of atttempts allowed on a problem.</dt>
-		<dd>This is done from the "Hmwk sets editor" page or the "Instructor tools" page.</dd>
-</dl>
-
-<p>
-Many of these editing activities can also be done more quickly from the "Instructor tools" page where students and homework sets can be selected simultaneously. The Instructor Tools page is useful for quick editing of one or two students. The initial setup of the class can be done best from this page.
-Importing and
-exporting class lists can only be done from this page. Deleting students can only be done from this page.
-</p>
-<h4>Review of column functions:</h4>
-<ul>
-	<li>Clicking on any active link at the top of the column sorts the page by that column. You can do lexigraphic sorts: click on "First name" then "Last name" to sort by last name, sorting those with the same last name by their first name.</li>
-	<li>The <strong>login name</strong> column links allow you to "act as" a student.</li>
-	<li>The <strong>pencil</strong> in the login column allows you to edit that student's data.</li>
-	<li>The <strong>Assigned sets</strong> column (x/y) indicates that x sets out of y sets avaiable have been assigned to this student. Click this link to assign or unassign sets to this student, to adjust due dates, or to adjust the grades on a homework set for a student.</li>
-	<li>Clicking the <strong>e-mail address</strong> link will bring up your standard email application so that you can send email to the student.  This works even if the student has been dropped from the course.  To send email to an entire class or to merge grades with the email message use the "Email" page link in the left margin.</li>
-</ul>
-
-</blockquote>
-</body>
-</html>
diff --git a/htdocs/helpFiles/InstructorUsersAssignedToSet.html b/htdocs/helpFiles/InstructorUsersAssignedToSet.html
deleted file mode 100644
index 11bb6f6e58..0000000000
--- a/htdocs/helpFiles/InstructorUsersAssignedToSet.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<html>
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-<head>
-<title>Users Assigned to Set Help Page</title>
-</head>
-
-<body><br>
-<p>A student needs to be assigned a set in order for them to do it. Once a student is unassigned a set, all the data for them is lost 
-and there's no way to undo it. When unassigning be sure to change the option to "Allow unassign".</p>
-</body>
-</html>
diff --git a/htdocs/helpFiles/Levels.html b/htdocs/helpFiles/Levels.html
deleted file mode 100644
index e700bfa580..0000000000
--- a/htdocs/helpFiles/Levels.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-<head>
-<title>OPL Problem Levels</title>
-</head>
-
-<body><br>
-<p>
-Some OPL problems have been rated for difficulty/educational objective.
-The levels are loosely inspired by Bloom's taxonomy.  They are assigned
-numbers from 1 to 6 as follows.
-</p>
-<ol>
-<li> problems with this rating should only require
-direct memory of a fact.  Examples might be a specific value of a function,
-or the statement of a definition.  Very few WeBWorK problems fall into
-this category.
-
-<li> usually means students must demonstrate
-understanding of facts.  This is more than regurgitating the fact.
-We use this category for simple and direct applications of algorithms the 
-student has studied.  There should be no judgement involved in choosing 
-the method.  This would include a simple application of a rule for 
-differentiation
-(e.g., can combine rules for sums and constant multiples with one more
-advanced rule) or for integrals.
-
-
-<li> we use this for carrying out more complicated 
-algorithms, such as derivatives using both the product and chain rule 
-or integrals which involve say both a substitution and parts.
-
-<li> these problems require some application of algorithms, 
-but do not rise to the level of a full word problem. For example, "Identify 
-the local extrema for f(x) = ...".  One has to apply algorithms and interpret
-results.
-
-<li> 
-word problems
-
-<li> Applying definitions theoretically and proof writing
-</ol>
-
-
-
-
-</body>
-</html>
diff --git a/htdocs/helpFiles/Options.html b/htdocs/helpFiles/Options.html
deleted file mode 100644
index 8fd77659ef..0000000000
--- a/htdocs/helpFiles/Options.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html>
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-<head>
-<title>User Option Help Page</title>
-</head>
-
-<body><br>
-<p>The password can be any combination of letters, numbers and special symbols. Students are encouraged to use all three, and stay 
-away from dictionary words. Also you should not use the same password you use elsewhere, such as on your email account.</p>
-<p>It is important that you enter your email address or you won't recieve any of the important emails your professor sends you.</p>
-</body>
-</html>
diff --git a/htdocs/helpFiles/ProblemSets.html b/htdocs/helpFiles/ProblemSets.html
deleted file mode 100644
index 6dfe35f9f7..0000000000
--- a/htdocs/helpFiles/ProblemSets.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-	
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
-<head>
-<title>Course Home Help Page</title>
-</head>
-
-<body><br>
-<h3>Course Home Help Page</h3>
-<p align="left">
-This is the standard entry point for the course.
-</p>
-
-<p align="left">
-It lists the homework problem sets available for the students.
-</p>
-
-<p align="left">
-The information box on the right displays information is useful for
-leaving course wide messages for students.  It contains text from the file 
-templates/course_info.txt.  Instructors can edit this file from the 
-web (click on the "edit" link).
-</p>
- 
-</body>
-</html>
diff --git a/htdocs/helpFiles/Problems.html b/htdocs/helpFiles/Problems.html
deleted file mode 100644
index 3a63a3ab77..0000000000
--- a/htdocs/helpFiles/Problems.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html>
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-<head>
-<title>Problems Help Page</title>
-</head>
-
-<body><br>
-<p>If you want to see the problems change the display mode and press "Refresh". The order of problems can be changed by changing the
-numbers. After a problem is deleted (by checking delete and then the "Save Problem Changes" button on the bottom of the page) 
-the number is left empty unless the option above the button is checked. The
-weight of a problem is how many points will be awarded for it during scoring.</p>
-</body>
-</html>
diff --git a/htdocs/helpFiles/instructor_links.html b/htdocs/helpFiles/instructor_links.html
deleted file mode 100644
index f7c322d43c..0000000000
--- a/htdocs/helpFiles/instructor_links.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title>Instructor Links Help Page</title>
-<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.2/css/all.min.css"/>
-</head>
-<body>
-
-<h3>Instructor Links Help Page</h3>
-
-Click the icon <a href="instructor_links.html"><i class="fas fa-question-circle"></i></a> for
-page and item specific help.
-
-<hr/>
-The main page for WeBWorK documentation is the <a href="http://webwork.maa.org/wiki"> webwork wiki</a>
-while specific help for instructors setting up a a course are
-in the <a href="http://webwork.maa.org/wiki/Instructors" target="_help">instructors' section</a>.
-<hr/>
-
-<dl>
-	<dt>Instructor Tools</dt>
-		<dd>Quick access to many instructor tools, including
-		       <strong>Reset passwords</strong>,
-		       <strong>Act as student</strong>,
-		       <strong>Assign individual sets</strong>
-		       and <strong>Edit individual due dates</strong>.
-				Beginners may find
-		       it easier to use the "Class List Editor", "Hmwk Sets Editor"
-               at first.</dd>
-	<dt>Class List Editor</dt>
-		<dd>Edit class roster data.  Add students, edit student data, drop
-			students from class, import students from a classlist, and give
-			user professor privileges. Access to individual homework sets</dd>
-	<dt>Hmwk Sets Editor</dt>
-		<dd>Edit homework sets for entire class. Change homework set due dates, create new sets from a set
-		    definition file, create new homework sets, make sets visible/invisible,
-			score homework sets. Assign homework sets to the class.</dd>
-	<dt>Library Browser</dt>
-		<dd>Choose problems from a library and add
-		    them to a homework set.</dd>
-	<dt>Statistics</dt>
-		<dd>View statistics of students' performance on homework either by individual or by set.</dd>
-	<dt>Student Progress</dt>
-		<dd>View details of student perofrmance either by individual or by set.</dd>
-	<dt>Scoring Tools</dt>
-		<dd>Score one or more sets.  This can also be done from the "Hmwk
-		Sets Editor" or from the "Instructor Tools", but the "Scoring Tools" page
-		allows control over parameters.</dd>
-	<dt>Email</dt>
-		<dd>Send email to students.</dd>
-	<dt>File Transfer</dt>
-		<dd>Upload, download and delete text files, including scoring
-		    spread sheets, set definition files, class list spread
-		    sheets, and "PG" problems.</dd>
-	<dt>Course configuration</dt>
-		<dd>Allows configuration of certain parameters, such as permission levels,
-		default display mode for equations, and email feedback behavior, on a course by course basis.</dd>
-</dl>
-
-Click the icon <a href="instructor_links.html"><i class="fas fa-question-circle"></i></a> for
-page and item specific help.
-
-</body>
-</html>
diff --git a/htdocs/helpFiles/no_help.html b/htdocs/helpFiles/no_help.html
deleted file mode 100644
index 637a90114a..0000000000
--- a/htdocs/helpFiles/no_help.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
-<head>
-<title>No Help Page</title>
-</head>
-
-<body>
-<p>There is no specific help for this item.  
-Click on 'Help' in the left margin
-for more general information.
-</p>
-</body>
-</html>
-
-
diff --git a/htdocs/index.dist.html b/htdocs/index.dist.html
new file mode 100644
index 0000000000..532c6f4032
--- /dev/null
+++ b/htdocs/index.dist.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="en" dir="ltr">
+	<head>
+		<title>WeBWorK Placeholder Page</title>
+	</head>
+	<body>
+		<h1>WeBWorK Placeholder Page</h1>
+		<p>Exploring?</p>
+		<p>
+			This is the default page for the root url of this site.
+		</p>
+		<p>
+			If you want to see something better here, then copy webwork2/htdocs/index.dist.html (this file) to
+			webwork/htdocs/index.html, and modify it to show what you want to show.  Then that file will be displayed
+			instead.
+		</p>
+		<p>
+			Alternately, you may set the server_root_url_redirect config parameter in conf/webwork2.mojolicious.yml to
+			have the server root url redirect to another site.
+		</p>
+	</body>
+</html>
diff --git a/htdocs/index.html b/htdocs/index.html
deleted file mode 100644
index 74d30d3829..0000000000
--- a/htdocs/index.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>WeBWorK Placeholder Page</title>
-</head>
-<body>
-
-<h1>WeBWorK Placeholder Page</h1>
-
-<p>Exploring?</p>
-
-<p>This page sits at the top level of the WeBWorK 2 system htdocs directory. You should never see it, unless you're verifying that you installed WeBWorK correctly.</p>
-
-</body>
-</html>
diff --git a/htdocs/js/apps/AchievementItems/achievementitems.js b/htdocs/js/AchievementItems/achievementitems.js
similarity index 100%
rename from htdocs/js/apps/AchievementItems/achievementitems.js
rename to htdocs/js/AchievementItems/achievementitems.js
diff --git a/htdocs/js/ActionTabs/actiontabs.js b/htdocs/js/ActionTabs/actiontabs.js
new file mode 100644
index 0000000000..b7c7aca97f
--- /dev/null
+++ b/htdocs/js/ActionTabs/actiontabs.js
@@ -0,0 +1,11 @@
+(() => {
+	const takeAction = document.getElementById('take_action');
+
+	document.querySelectorAll('.action-link').forEach((actionLink) => {
+		const currentAction = document.getElementById('current_action');
+		actionLink.addEventListener('show.bs.tab', () => {
+			if (takeAction) takeAction.value = actionLink.textContent;
+			if (currentAction) currentAction.value = actionLink.dataset.action;
+		});
+	});
+})();
diff --git a/htdocs/js/apps/DatePicker/datepicker.js b/htdocs/js/DatePicker/datepicker.js
similarity index 77%
rename from htdocs/js/apps/DatePicker/datepicker.js
rename to htdocs/js/DatePicker/datepicker.js
index 9b2c077d7a..0bb0c3372f 100644
--- a/htdocs/js/apps/DatePicker/datepicker.js
+++ b/htdocs/js/DatePicker/datepicker.js
@@ -46,15 +46,14 @@
 
 			luxon.Settings.defaultLocale = rule.dataset.locale ?? 'en';
 
-			// Compute the time difference between the current browser timezone and the the course timezone.
+			// Compute the time difference between the current browser timezone and the course timezone.
 			// flatpickr gives the time in the browser's timezone, and this is used to adjust to the course timezone.
-			// Note that this is converted to seconds.
-			const timezoneAdjustment =
-				parseInt(Intl.DateTimeFormat('en-US', { timeZoneName: 'shortOffset' })
-					.format(new Date).split(' ')[1].slice(3) || '0') * 3600000
-				- parseInt(Intl.DateTimeFormat('en-US',
-					{ timeZone: rule.dataset.timezone ?? 'America/New_York', timeZoneName: 'shortOffset' })
-					.format(new Date).split(' ')[1].slice(3) || '0') * 3600000;
+			// Note that this is in seconds.
+			const timezoneAdjustment = (
+				(new Date((new Date).toLocaleString('en-US'))).getTime() -
+				(new Date((new Date).toLocaleString('en-US',
+					{ timeZone: rule.dataset.timezone ?? 'America/New_York' }))).getTime()
+			);
 
 			const fp = flatpickr(rule.parentNode, {
 				allowInput: true,
@@ -70,7 +69,34 @@
 				clickOpens: false,
 				disableMobile: true,
 				wrap: true,
-				plugins: [ new confirmDatePlugin({ confirmText: rule.dataset.doneText ?? 'Done', showAlways: true }) ],
+				plugins: [
+					new confirmDatePlugin({ confirmText: rule.dataset.doneText ?? 'Done', showAlways: true }),
+					new ShortcutButtonsPlugin({
+						button: [
+							{
+								label: rule.dataset.todayText ?? 'Today',
+								attributes: { class: 'btn btn-sm btn-secondary ms-auto me-1 mb-1' }
+							},
+							{
+								label: rule.dataset.nowText ?? 'Now',
+								attributes: { class: 'btn btn-sm btn-secondary me-auto mb-1' }
+							}
+						],
+						onClick: (index, fp) => {
+							if (index === 0) {
+								const today = new Date();
+								// If there isn't a selected date, then use 12:00 am on the current date.
+								const selectedDate = fp.selectedDates[0] ?? new Date(new Date().toDateString());
+								selectedDate.setFullYear(today.getFullYear())
+								selectedDate.setMonth(today.getMonth())
+								selectedDate.setDate(today.getDate());
+								fp.setDate(selectedDate);
+							} else if (index === 1) {
+								fp.setDate(new Date());
+							}
+						}
+					})
+				],
 				onChange(selectedDates) {
 					if (this.input.value === orig_value) this.altInput.classList.remove('changed');
 					else this.altInput.classList.add('changed');
diff --git a/htdocs/js/FileManager/filemanager.js b/htdocs/js/FileManager/filemanager.js
new file mode 100644
index 0000000000..8f579d6bf8
--- /dev/null
+++ b/htdocs/js/FileManager/filemanager.js
@@ -0,0 +1,53 @@
+'use strict';
+(() => {
+	const form = window.document.getElementById('FileManager');
+
+	const files = document.getElementById('files');
+
+	if (form) {
+		const doAction = (action) => {
+			form.formAction.value = action;
+			form.submit();
+		};
+
+		document.getElementsByName('directory')[0]?.addEventListener('change', () => doAction('Go'));
+		document.getElementsByName('dates')[0]?.addEventListener('click', () => doAction('Refresh'));
+		files?.addEventListener('dblclick', () => doAction('View'));
+
+		// If on the confirmation page, then focus the "name" input.
+		form.querySelector('input[name="name"]')?.focus();
+	}
+
+	const fileActionButtons = ['View', 'Edit', 'Download', 'Rename', 'Copy', 'Delete', 'MakeArchive'].map((buttonId) =>
+		document.getElementById(buttonId)
+	);
+	const archiveButton = document.getElementById('MakeArchive');
+
+	const checkFiles = () => {
+		const state = files.selectedIndex < 0;
+
+		for (const button of fileActionButtons) {
+			if (button) button.disabled = state;
+		}
+
+		if (archiveButton && !state) {
+			const numSelected = files.querySelectorAll('option:checked').length;
+			if (
+				numSelected === 0 ||
+				numSelected > 1 ||
+				!/\.(tar|tar\.gz|tgz)$/.test(files.children[files.selectedIndex].value)
+			)
+				archiveButton.value = archiveButton.dataset.archiveText;
+			else archiveButton.value = archiveButton.dataset.unarchiveText;
+		}
+	};
+
+	files?.addEventListener('change', checkFiles);
+	if (files) checkFiles();
+
+	const file = document.getElementById('file');
+	const uploadButton = document.getElementById('Upload');
+	const checkFile = () => (uploadButton.disabled = file.value === '');
+	if (uploadButton) file?.addEventListener('change', checkFile);
+	if (file) checkFile();
+})();
diff --git a/htdocs/js/apps/GatewayQuiz/gateway.js b/htdocs/js/GatewayQuiz/gateway.js
similarity index 99%
rename from htdocs/js/apps/GatewayQuiz/gateway.js
rename to htdocs/js/GatewayQuiz/gateway.js
index f52a05e47f..09f97d2c63 100644
--- a/htdocs/js/apps/GatewayQuiz/gateway.js
+++ b/htdocs/js/GatewayQuiz/gateway.js
@@ -6,6 +6,8 @@
 // The timer code relies on the existence of data attributes for the gwTimer div created by GatewayQuiz.pm.
 
 (() => {
+	if (!document.gwquiz) return;
+
 	// Gateway timer
 	const timerDiv = document.getElementById('gwTimer'); // The timer div element
 	let actuallySubmit = false; // This needs to be set to true to allow an actual submission.
diff --git a/htdocs/js/apps/InstructorTools/instructortools.js b/htdocs/js/InstructorTools/instructortools.js
similarity index 97%
rename from htdocs/js/apps/InstructorTools/instructortools.js
rename to htdocs/js/InstructorTools/instructortools.js
index efb41b456a..6b41ded95c 100644
--- a/htdocs/js/apps/InstructorTools/instructortools.js
+++ b/htdocs/js/InstructorTools/instructortools.js
@@ -1,7 +1,7 @@
 (() => {
 	const form = document.forms['instructor-tools-form'];
 
-	form.addEventListener('submit', (e) => {
+	form?.addEventListener('submit', (e) => {
 		const selectedUsers = Array.from(document.querySelector('select[name=selected_users]')?.options ?? [])
 			.filter((option) => option.selected);
 		const selectedSets = Array.from(document.querySelector('select[name=selected_sets]')?.options ?? [])
@@ -25,7 +25,7 @@
 		}
 
 		if (messages.length) {
-			const msgBoxes = document.querySelectorAll('.Message');
+			const msgBoxes = document.querySelectorAll('.message');
 			msgBoxes.forEach((msgBox) => {
 				while (msgBox.firstChild) msgBox.firstChild.remove();
 				const container = document.createElement('div');
diff --git a/htdocs/js/LTIUpdate/ltiupdate.js b/htdocs/js/LTIUpdate/ltiupdate.js
new file mode 100644
index 0000000000..a526cfdfd6
--- /dev/null
+++ b/htdocs/js/LTIUpdate/ltiupdate.js
@@ -0,0 +1,33 @@
+(() => {
+	// Store select options in dictionary to rebuild the user/set menus from.
+	const userOptions = {};
+	const setOptions = {};
+	const userMenu = document.getElementById('updateUserID');
+	const setMenu = document.getElementById('updateSetID');
+	for (let i = 1; i < userMenu.length; i++) {
+		userOptions[userMenu[i].value] = userMenu[i];
+	}
+	for (let i = 1; i < setMenu.length; i++) {
+		setOptions[setMenu[i].value] = setMenu[i];
+	}
+
+	// Update user and set drop down menus to only include valid user/set combinations.
+	document.getElementById('updateUserID')?.addEventListener('change', (e) => {
+		const setList = e.target.options[e.target.selectedIndex].dataset.sets.split(':');
+		const selectedSet = setMenu.value;
+		while (setMenu.length > 1) setMenu.lastChild.remove();
+		setList.forEach((set) => {
+			setMenu.append(setOptions[set]);
+		});
+		setMenu.value = selectedSet;
+	});
+	document.getElementById('updateSetID')?.addEventListener('change', (e) => {
+		const userList = e.target.options[e.target.selectedIndex].dataset.users.split(':');
+		const selectedUser = userMenu.value;
+		while (userMenu.length > 1) userMenu.lastChild.remove();
+		userList.forEach((user) => {
+			userMenu.append(userOptions[user]);
+		});
+		userMenu.value = selectedUser;
+	});
+})();
diff --git a/htdocs/js/apps/LocalStorage/localstorage.js b/htdocs/js/LocalStorage/localstorage.js
similarity index 97%
rename from htdocs/js/apps/LocalStorage/localstorage.js
rename to htdocs/js/LocalStorage/localstorage.js
index 5c0383fb77..b20022af33 100644
--- a/htdocs/js/apps/LocalStorage/localstorage.js
+++ b/htdocs/js/LocalStorage/localstorage.js
@@ -56,6 +56,6 @@
 
 		const overallScore = document.getElementById('problem-overall-score');
 		if (overallScore)
-			overallScore.textContent = problemData['score'] ? `${Math.round(problemData['score'] * 100)}%` : '0%;';
+			overallScore.textContent = problemData['score'] ? `${Math.round(problemData['score'] * 100)}%` : '0%';
 	}
 })();
diff --git a/htdocs/js/apps/MathJaxConfig/mathjax-config.js b/htdocs/js/MathJaxConfig/mathjax-config.js
similarity index 100%
rename from htdocs/js/apps/MathJaxConfig/mathjax-config.js
rename to htdocs/js/MathJaxConfig/mathjax-config.js
diff --git a/htdocs/js/apps/PGCodeMirror/PG.js b/htdocs/js/PGCodeMirror/PG.js
similarity index 98%
rename from htdocs/js/apps/PGCodeMirror/PG.js
rename to htdocs/js/PGCodeMirror/PG.js
index 5f527b9a00..debcc25100 100644
--- a/htdocs/js/apps/PGCodeMirror/PG.js
+++ b/htdocs/js/PGCodeMirror/PG.js
@@ -966,8 +966,9 @@
 				newPrevState.string = string;
 
 				if (stream.sol()) {
-					if (stream.match(/^ *(>> +)?[ivxIVX]+[.\)] /) ||
-							stream.match(/^ *(>> +)?[\w\d][.\)] /) ||
+					if (stream.match(/^ *(>> +)?[ivxlIVXL]+[.)] /) ||
+							stream.match(/^ *(>> +)?\d+[.)] /) ||
+							stream.match(/^ *(>> +)?\w[.)] /) ||
 							stream.match(/^ *(>> +)?[*\-+o] /)) { // Lists
 						return "atom strong";
 					}
@@ -1004,7 +1005,7 @@
 						newPrevState.mode = "tex";
 						return tokenPGMLSubBlock(stream,state,endstring,style,newPrevState);
 					}
-				} else if (stream.match(/^\[\|+/)) { // Verbatim 
+				} else if (stream.match(/^\[\|+/)) { // Verbatim
 					style = "tag";
 					const endstring = stream.current().substring(1) + "\\]";
 					state.tokenize = function(stream,state) {
@@ -1016,7 +1017,7 @@
 						return tokenPGMLComment(stream,state,"```",style,newPrevState);
 					}
 				} else if (stream.match(/^\[%/)) { // Comment
-					style = "bracket";
+					style = "comment";
 					state.tokenize = function(stream,state) {
 						return tokenPGMLComment(stream,state,"%\\]",style,newPrevState);
 					}
@@ -1417,16 +1418,35 @@
 			lineComment: '#'
 		};
 	});
-	
+
 	CodeMirror.registerHelper("wordChars", "perl", /[\w$]/);
-	
+
+	CodeMirror.registerHelper('fold', 'PG', (cm, start) => {
+		const m1 =
+			/^\s*BEGIN_(PGML|PGML_SOLUTION|PGML_HINT|TEXT)\s*$/.exec(cm.getLine(start.line)) ||
+			/^\s*[$\w]*\s*->\s*BEGIN_(TIKZ|LATEX_IMAGE)\s*$/.exec(cm.getLine(start.line));
+		const m2 = /^\s*(Section|Scaffold)::Begin/.exec(cm.getLine(start.line));
+		if (m1 || m2) {
+			for (let current_line = start.line + 1; current_line <= cm.lineCount(); ++current_line) {
+				const end_re = m1 ? RegExp(`END_${m1[1]}`) : RegExp(`${m2[1]}::End`);
+				if(end_re.test(cm.getLine(current_line))) {
+					return {
+						from: CodeMirror.Pos(start.line, cm.getLine(start.line).length),
+						to: CodeMirror.Pos(current_line, cm.getLine(current_line).length)
+					};
+				}
+			}
+		}
+		return;
+	});
+
 	CodeMirror.defineMIME("text/x-perl", "perl");
-	
+
 	// it's like "peek", but need for look-ahead or look-behind if index < 0
 	function look(stream, c){
 		return stream.string.charAt(stream.pos+(c||0));
 	}
-	
+
 	// return a part of prefix of current stream from current position
 	function prefix(stream, c){
 		if(c){
@@ -1436,14 +1456,14 @@
 			return stream.string.substr(0,stream.pos-1);
 		}
 	}
-	
+
 	// return a part of suffix of current stream from current position
 	function suffix(stream, c){
 		var y=stream.string.length;
 		var x=y-stream.pos+1;
 		return stream.string.substr(stream.pos,(c&&c<y?c:x));
 	}
-	
+
 	// eating and vomiting a part of stream from current position
 	function eatSuffix(stream, c){
 		var x=stream.pos+c;
@@ -1455,5 +1475,5 @@
 		else
 			stream.pos=x;
 	}
-	
+
 })();
diff --git a/htdocs/js/PGCodeMirror/comment.js b/htdocs/js/PGCodeMirror/comment.js
new file mode 100644
index 0000000000..0735a801e1
--- /dev/null
+++ b/htdocs/js/PGCodeMirror/comment.js
@@ -0,0 +1,259 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
+
+(function(mod) {
+	if (typeof exports == "object" && typeof module == "object") // CommonJS
+		mod(require("../../lib/codemirror"));
+	else if (typeof define == "function" && define.amd) // AMD
+		define(["../../lib/codemirror"], mod);
+	else // Plain browser env
+		mod(CodeMirror);
+})(function(CodeMirror) {
+	"use strict";
+
+	var noOptions = {};
+	var nonWS = /[^\s\u00a0]/;
+	var Pos = CodeMirror.Pos, cmp = CodeMirror.cmpPos;
+
+	function firstNonWS(str) {
+		var found = str.search(nonWS);
+		return found == -1 ? 0 : found;
+	}
+
+	CodeMirror.commands.toggleComment = function(cm) {
+		cm.toggleComment();
+	};
+
+	CodeMirror.defineExtension("toggleComment", function(options) {
+		if (!options) options = noOptions;
+		var cm = this;
+		var minLine = Infinity, ranges = this.listSelections(), mode = null;
+		for (var i = ranges.length - 1; i >= 0; i--) {
+			var from = ranges[i].from(), to = ranges[i].to();
+			if (from.line >= minLine) continue;
+			if (to.line >= minLine) to = Pos(minLine, 0);
+			minLine = from.line;
+			if (mode == null) {
+				if (cm.uncomment(from, to, options)) mode = "un";
+				else { cm.lineComment(from, to, options); mode = "line"; }
+			} else if (mode == "un") {
+				cm.uncomment(from, to, options);
+			} else {
+				cm.lineComment(from, to, options);
+			}
+		}
+	});
+
+	// Rough heuristic to try and detect lines that are part of multi-line string
+	function probablyInsideString(cm, pos, line) {
+		return /\bstring\b/.test(cm.getTokenTypeAt(Pos(pos.line, 0))) && !/^[\'\"\`]/.test(line)
+	}
+
+	const md_section = RegExp('DESCRIPTION|KEYWORDS|DBsubject|DBchapter|DBsection|Date|Author|Institution ' +
+		'|MO|Static|TitleText|EditionText|AuthorText|Section|Problem|Language|Level');
+
+	// Custom version of getMode for PG files.
+	function getMode(cm, pos) {
+		const mode = cm.getModeAt(pos);
+		// Clear any comment fields of mode.
+		delete mode.lineComment;
+		delete mode.blockCommentStart;
+		delete mode.blockCommentEnd;
+
+		if(md_section.test(cm.getLine(pos.line)) || insideDescriptionBlock(cm, pos)) {
+			mode.lineComment = '##';
+			mode.name = 'PG_meta';
+		} else if (inPGMLBlock(cm, pos)) {
+			mode.name = 'PGML';
+			mode.blockCommentStart = '[%';
+			mode.blockCommentEnd = '%]';
+		} else if (inTikzBlock(cm, pos)) {
+			mode.lineComment = '%';
+			mode.name = 'tikz';
+		} else {
+			mode.name = 'perl';
+			mode.lineComment = '#';
+		}
+		return mode;
+	}
+
+	function insideDescriptionBlock(cm, pos) {
+		for(let line = pos.line; line >= 0; --line) {
+			if (/ENDDESCRIPTION/.test(cm.getLine(line))) return false;
+			if (/DESCRIPTION/.test(cm.getLine(line))) return true;
+		}
+		return false;
+	}
+
+	function inTikzBlock(cm, pos) {
+		for(let line = pos.line; line >= 0; --line){
+			if (/BEGIN_TIKZ|BEGIN_LATEX_IMAGE/.test(cm.getLine(line))) return true;
+			if (/END_PGML|END_TIKZ|END_LATEX_IMAGE/.test(cm.getLine(line))) return false;
+		}
+		return false;
+	}
+
+	function inPGMLBlock(cm, pos) {
+		for(let line = pos.line; line >= 0; --line){
+			if (/BEGIN_PGML/.test(cm.getLine(line))) return true;
+			if (/END_PGML/.test(cm.getLine(line))) return false;
+		}
+		return false;
+	}
+
+
+	CodeMirror.defineExtension("lineComment", function(from, to, options) {
+		if (!options) options = noOptions;
+		var self = this, mode = getMode(self, from);
+		var firstLine = self.getLine(from.line);
+		if (firstLine == null || probablyInsideString(self, from, firstLine)) return;
+
+		var commentString = options.lineComment || mode.lineComment;
+		if (!commentString) {
+			if (options.blockCommentStart || mode.blockCommentStart) {
+				options.fullLines = true;
+				self.blockComment(from, to, options);
+			}
+			return;
+		}
+
+		var end = Math.min(to.ch != 0 || to.line == from.line ? to.line + 1 : to.line, self.lastLine() + 1);
+		var pad = options.padding == null ? " " : options.padding;
+		var blankLines = options.commentBlankLines || from.line == to.line;
+
+		self.operation(function() {
+			if (options.indent) {
+				var baseString = null;
+				for (var i = from.line; i < end; ++i) {
+					var line = self.getLine(i);
+					var whitespace = line.search(nonWS) === -1 ? line : line.slice(0, firstNonWS(line));
+					if (baseString == null || baseString.length > whitespace.length) {
+						baseString = whitespace;
+					}
+				}
+				for (var i = from.line; i < end; ++i) {
+					var line = self.getLine(i), cut = baseString.length;
+					if (!blankLines && !nonWS.test(line)) continue;
+					if (line.slice(0, cut) != baseString) cut = firstNonWS(line);
+					self.replaceRange(baseString + commentString + pad, Pos(i, 0), Pos(i, cut));
+				}
+			} else {
+				for (var i = from.line; i < end; ++i) {
+					if (blankLines || nonWS.test(self.getLine(i)))
+						self.replaceRange(commentString + pad, Pos(i, 0));
+				}
+			}
+		});
+	});
+
+	CodeMirror.defineExtension("blockComment", function(from, to, options) {
+		if (!options) options = noOptions;
+		var self = this, mode = getMode(self, from);
+		var startString = options.blockCommentStart || mode.blockCommentStart;
+		var endString = options.blockCommentEnd || mode.blockCommentEnd;
+		if (!startString || !endString) {
+			if ((options.lineComment || mode.lineComment) && options.fullLines != false)
+				self.lineComment(from, to, options);
+			return;
+		}
+		if (/\bcomment\b/.test(self.getTokenTypeAt(Pos(from.line, 0)))) return
+
+		var end = Math.min(to.line, self.lastLine());
+		if (end != from.line && to.ch == 0 && nonWS.test(self.getLine(end))) --end;
+
+		var pad = options.padding == null ? " " : options.padding;
+		if (from.line > end) return;
+
+		self.operation(function() {
+			if (options.fullLines != false) {
+				var lastLineHasText = nonWS.test(self.getLine(end));
+				self.replaceRange(pad + endString, Pos(end));
+				self.replaceRange(startString + pad, Pos(from.line, 0));
+				var lead = options.blockCommentLead || mode.blockCommentLead;
+				if (lead != null) for (var i = from.line + 1; i <= end; ++i)
+					if (i != end || lastLineHasText)
+						self.replaceRange(lead + pad, Pos(i, 0));
+			} else {
+				var atCursor = cmp(self.getCursor("to"), to) == 0, empty = !self.somethingSelected()
+				self.replaceRange(endString, to);
+				if (atCursor) self.setSelection(empty ? to : self.getCursor("from"), to)
+				self.replaceRange(startString, from);
+			}
+		});
+	});
+
+	CodeMirror.defineExtension("uncomment", function(from, to, options) {
+		if (!options) options = noOptions;
+		var self = this, mode = getMode(self, from);
+		var end = Math.min(to.ch != 0 || to.line == from.line ? to.line : to.line - 1, self.lastLine()), start = Math.min(from.line, end);
+
+		// Try finding line comments
+		var lineString = options.lineComment || mode.lineComment, lines = [];
+		var pad = options.padding == null ? " " : options.padding, didSomething;
+		lineComment: {
+			if (!lineString) break lineComment;
+			for (var i = start; i <= end; ++i) {
+				var line = self.getLine(i);
+				var found = line.indexOf(lineString);
+				if (found > -1 && !/comment/.test(self.getTokenTypeAt(Pos(i, found + 1)))) found = -1;
+				if (found == -1 && nonWS.test(line)) break lineComment;
+				if (found > -1 && nonWS.test(line.slice(0, found))) break lineComment;
+				lines.push(line);
+			}
+			self.operation(function() {
+				for (var i = start; i <= end; ++i) {
+					var line = lines[i - start];
+					var pos = line.indexOf(lineString), endPos = pos + lineString.length;
+					if (pos < 0) continue;
+					if (line.slice(endPos, endPos + pad.length) == pad) endPos += pad.length;
+					didSomething = true;
+					self.replaceRange("", Pos(i, pos), Pos(i, endPos));
+				}
+			});
+			if (didSomething) return true;
+		}
+
+		// Try block comments
+		var startString = options.blockCommentStart || mode.blockCommentStart;
+		var endString = options.blockCommentEnd || mode.blockCommentEnd;
+		if (!startString || !endString) return false;
+		var lead = options.blockCommentLead || mode.blockCommentLead;
+		var startLine = self.getLine(start), open = startLine.indexOf(startString)
+		if (open == -1) return false
+		var endLine = end == start ? startLine : self.getLine(end)
+		var close = endLine.indexOf(endString, end == start ? open + startString.length : 0);
+		var insideStart = Pos(start, open + 1), insideEnd = Pos(end, close + 1);
+		if (close == -1 ||
+				!/comment/.test(self.getTokenTypeAt(insideStart)) ||
+				!/comment/.test(self.getTokenTypeAt(insideEnd)) ||
+				self.getRange(insideStart, insideEnd, "\n").indexOf(endString) > -1)
+			return false;
+
+		// Avoid killing block comments completely outside the selection.
+		// Positions of the last startString before the start of the selection, and the first endString after it.
+		var lastStart = startLine.lastIndexOf(startString, from.ch);
+		var firstEnd = lastStart == -1 ? -1 : startLine.slice(0, from.ch).indexOf(endString, lastStart + startString.length);
+		if (lastStart != -1 && firstEnd != -1 && firstEnd + endString.length != from.ch) return false;
+		// Positions of the first endString after the end of the selection, and the last startString before it.
+		firstEnd = endLine.indexOf(endString, to.ch);
+		var almostLastStart = endLine.slice(to.ch).lastIndexOf(startString, firstEnd - to.ch);
+		lastStart = (firstEnd == -1 || almostLastStart == -1) ? -1 : to.ch + almostLastStart;
+		if (firstEnd != -1 && lastStart != -1 && lastStart != to.ch) return false;
+
+		self.operation(function() {
+			self.replaceRange("", Pos(end, close - (pad && endLine.slice(close - pad.length, close) == pad ? pad.length : 0)),
+												Pos(end, close + endString.length));
+			var openEnd = open + startString.length;
+			if (pad && startLine.slice(openEnd, openEnd + pad.length) == pad) openEnd += pad.length;
+			self.replaceRange("", Pos(start, open), Pos(start, openEnd));
+			if (lead) for (var i = start + 1; i <= end; ++i) {
+				var line = self.getLine(i), found = line.indexOf(lead);
+				if (found == -1 || nonWS.test(line.slice(0, found))) continue;
+				var foundEnd = found + lead.length;
+				if (pad && line.slice(foundEnd, foundEnd + pad.length) == pad) foundEnd += pad.length;
+				self.replaceRange("", Pos(i, found), Pos(i, foundEnd));
+			}
+		});
+		return true;
+	});
+});
\ No newline at end of file
diff --git a/htdocs/js/apps/PGCodeMirror/pgeditor.js b/htdocs/js/PGCodeMirror/pgeditor.js
similarity index 73%
rename from htdocs/js/apps/PGCodeMirror/pgeditor.js
rename to htdocs/js/PGCodeMirror/pgeditor.js
index b65d6b85d3..f57a8eeb0c 100644
--- a/htdocs/js/apps/PGCodeMirror/pgeditor.js
+++ b/htdocs/js/PGCodeMirror/pgeditor.js
@@ -1,5 +1,5 @@
 /* WeBWorK Online Homework Delivery System
- * Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+ * Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of either: (a) the GNU General Public License as published by the
@@ -19,7 +19,7 @@
 		return new Promise((resolve, reject) => {
 			let shouldAppend = false;
 			let el;
-			if (/\.js(?:\??[0-9a-zA-Z=]*)$/.exec(src)) {
+			if (/\.js(?:\?[0-9a-zA-Z=^.]*)?$/.exec(src)) {
 				el = document.querySelector(`script[src="${src}"]`);
 				if (!el) {
 					el = document.createElement('script');
@@ -27,7 +27,7 @@
 					el.src = src;
 					shouldAppend = true;
 				}
-			} else if (/\.css(?:\??[0-9a-zA-Z=]*)$/.exec(src)) {
+			} else if (/\.css(?:\?[0-9a-zA-Z=^.]*)?$/.exec(src)) {
 				el = document.querySelector(`link[href="${src}"]`);
 				if (!el) {
 					el = document.createElement('link');
@@ -57,7 +57,8 @@
 	};
 
 	const loadConfig = async (file) => {
-		const configName = [...file.matchAll(/.*\/([^.]*?)(?:\.min)?\.(?:js|css)$/g)][0]?.[1] ?? 'default';
+		const configName = [...file.matchAll(/.*\/([^.]*?)(?:\.min)?\.(?:js|css)(?:\?[0-9a-zA-Z=^.]*)?$/g)][0]?.[1]
+			?? 'default';
 		if (configName !== 'default') {
 			try {
 				await loadResource(file);
@@ -68,19 +69,41 @@
 		return configName;
 	};
 
-	cm = CodeMirror.fromTextArea(document.querySelector('.codeMirrorEditor'), {
-		mode: 'PG',
+	const mode = document.querySelector('.codeMirrorEditor')?.dataset.mode ?? 'PG';
+	const options = {
+		mode,
 		indentUnit: 4,
 		tabMode: 'spaces',
 		lineNumbers: true,
 		lineWrapping: true,
-		extraKeys: { Tab: (cm) => cm.execCommand('insertSoftTab') },
+		extraKeys: {
+			Tab:            (cm) => cm.execCommand('insertSoftTab'),
+			'Shift-Ctrl-F': (cm) => cm.foldCode(cm.getCursor(), { scanUp : true }),
+			'Shift-Cmd-F':  (cm) => cm.foldCode(cm.getCursor(), { scanUp : true }),
+			'Shift-Ctrl-A': (cm) => CodeMirror.commands.foldAll(cm),
+			'Shift-Cmd-A':  (cm) => CodeMirror.commands.foldAll(cm),
+			'Shift-Ctrl-G': (cm) => CodeMirror.commands.unfoldAll(cm),
+			'Shift-Cmd-G':  (cm) => CodeMirror.commands.unfoldAll(cm),
+		},
 		highlightSelectionMatches: { annotateScrollbar: true },
 		matchBrackets: true,
 		inputStyle: 'contenteditable',
 		spellcheck: localStorage.getItem('WW_PGEditor_spellcheck') === 'true',
-	});
-	cm.setSize('100%', 400);
+		gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter']
+	};
+
+	if (mode === 'PG') {
+		options.extraKeys['Ctrl-/'] = (cm) => cm.execCommand('toggleComment');
+		options.extraKeys['Cmd-/'] = (cm) => cm.execCommand('toggleComment');
+		options.foldGutter = { rangeFinder: new CodeMirror.fold.combine(CodeMirror.fold.PG) }
+		options.fold = 'PG'
+	} else {
+		options.foldGutter = true;
+	}
+
+	const cm = webworkConfig.pgCodeMirror
+		= CodeMirror.fromTextArea(document.querySelector('.codeMirrorEditor'), options);
+	cm.setSize('100%', '550px');
 
 	const currentThemeFile = localStorage.getItem('WW_PGEditor_selected_theme') ?? 'default';
 	const currentThemeName = await loadConfig(currentThemeFile);
@@ -119,4 +142,5 @@
 	forceRTL.addEventListener('change', () => {
 		cm.setOption('direction', forceRTL.checked ? 'rtl' : 'ltr');
 	});
+
 })();
diff --git a/htdocs/js/apps/PGCodeMirror/pgeditor.css b/htdocs/js/PGCodeMirror/pgeditor.scss
similarity index 57%
rename from htdocs/js/apps/PGCodeMirror/pgeditor.css
rename to htdocs/js/PGCodeMirror/pgeditor.scss
index c48abd6f2e..c506b3a524 100644
--- a/htdocs/js/apps/PGCodeMirror/pgeditor.css
+++ b/htdocs/js/PGCodeMirror/pgeditor.scss
@@ -1,5 +1,5 @@
 /* WeBWorK Online Homework Delivery System
- * Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+ * Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of either: (a) the GNU General Public License as published by the
@@ -12,14 +12,25 @@
  * Artistic License for more details.
  */
 
+.CodeMirror {
+	border: 1px solid #ddd;
+	min-height: 400px;
+	resize: vertical;
+}
+
+// This style is only used if the CodeMirror editor is disabled in localOverrides.conf.
 .codeMirrorEditor {
+	border: 1px solid #ddd;
+	padding: 2px;
+	height: 550px;
 	min-height: 400px;
 	width: 100%;
+	resize: vertical;
 }
 
-/* Additional CSS for codemirror addons and overrides */
+// Additional CSS for codemirror addons and overrides
 
-/* CodeMirror overrides */
+// CodeMirror overrides
 .CodeMirror-code {
 	outline: none;
 }
@@ -28,27 +39,26 @@ pre.CodeMirror-line {
 	unicode-bidi: embed;
 }
 
-/* Match Highligher CSS */
-.CodeMirror-focused .cm-matchhighlight {
-	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFklEQVQI12NgYGBgkKzc8x9CMDAwAAAmhwSbidEoSQAAAABJRU5ErkJggg==);
-	background-position: bottom;
-	background-repeat: repeat-x;
+// Match Highligher CSS
+.CodeMirror-focused {
+	.cm-matchhighlight {
+		background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFklEQVQI12NgYGBgkKzc8x9CMDAwAAAmhwSbidEoSQAAAABJRU5ErkJggg==);
+		background-position: bottom;
+		background-repeat: repeat-x;
+	}
+}
+
+.cm-matchhighlight {
+	background-color: lightgreen;
+}
+
+.CodeMirror-selection-highlight-scrollbar {
+	background-color: green;
 }
-.cm-matchhighlight {background-color: lightgreen}
-.CodeMirror-selection-highlight-scrollbar {background-color: green}
 
-/* CSS to highlight trailing whitespace in PGML blocks */
+// CSS to highlight trailing whitespace in PGML blocks
 .cm-trailingspace {
 	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QUXCToH00Y1UgAAACFJREFUCNdjPMDBUc/AwNDAAAFMTAwMDA0OP34wQgX/AQBYgwYEx4f9lQAAAABJRU5ErkJggg==);
 	background-position: bottom left;
 	background-repeat: repeat-x;
 }
-
-/* Make the codemirror editor resizable and add border */
-.CodeMirror {
-	border: 1px solid #dddddd;
-	resize: both;
-	min-height: 200px;
-	min-width: 400px;
-	resize: vertical !important;
-}
diff --git a/htdocs/js/PGProblemEditor/pgproblemeditor.js b/htdocs/js/PGProblemEditor/pgproblemeditor.js
new file mode 100644
index 0000000000..3cdbdc91dd
--- /dev/null
+++ b/htdocs/js/PGProblemEditor/pgproblemeditor.js
@@ -0,0 +1,484 @@
+(() => {
+	// Add a container for message toasts.
+	const toastContainer = document.createElement('div');
+	toastContainer.classList.add('toast-container', 'position-fixed', 'bottom-0', 'end-0', 'p-3');
+	toastContainer.style.zIndex = 20;
+	document.body.append(toastContainer);
+
+	// Convenience method for showing messages in a Bootstrap toast.
+	const showMessage = (message, success = false) => {
+		if (!message) return;
+
+		const toast = document.createElement('div');
+		toast.classList.add('toast', 'align-items-center', 'border-0');
+		toast.setAttribute('role', 'alert');
+		toast.setAttribute('aria-live', success ? 'polite' : 'assertive');
+		toast.setAttribute('aria-atomic', 'true');
+		toast.innerHTML = `<div class="d-flex alert ${success ? 'alert-success' : 'alert-danger'} p-0">` +
+			`<div class="toast-body">${message}</div>` +
+			'<button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" ' +
+			'aria-label="Close"></button></div>';
+
+		toastContainer.append(toast);
+
+		const bsToast = new bootstrap.Toast(toast, { delay: success ? 2000 : 6000 });
+		toast.addEventListener('hidden.bs.toast', () => { bsToast.dispose(); toast.remove(); })
+		bsToast.show();
+	};
+
+	const webserviceURL = `${webworkConfig?.webwork_url ?? '/webwork2'}/instructor_rpc`;
+
+	// Send a request to the server to save the temporary file for the currently edited file.
+	// This temporary file could be used for recovery, and is displayed if the page is reloaded.
+	const saveTempFile = () => {
+		const request_object = {
+			user: document.getElementById('hidden_user')?.value,
+			courseID: document.getElementsByName('courseID')[0]?.value,
+			key: document.getElementById('hidden_key')?.value
+		};
+
+		request_object.rpc_command = 'saveFile';
+		request_object.outputFilePath = document.getElementsByName('temp_file_path')[0]?.value ?? '';
+		request_object.fileContents = webworkConfig?.pgCodeMirror?.getValue()
+			?? document.getElementById('problemContents')?.value ?? '';
+
+		if (!request_object.outputFilePath) return;
+
+		document.getElementById('revert-to-tmp-container')?.classList.remove('d-none');
+		document.getElementById('revert-tab')?.classList.remove('disabled');
+		const revertRadio = document.getElementById('action_revert_type_revert_id');
+		if (revertRadio && revertRadio.disabled) {
+			revertRadio.disabled = false;
+			revertRadio.checked = true;
+		}
+
+		fetch(webserviceURL, { method: 'post', mode: 'same-origin', body: new URLSearchParams(request_object) })
+			.then((response) => response.json())
+			.then((data) => {
+				showMessage(data.server_response, data.result_data);
+				if (data.result_data) {
+					// Add the temporary file coloring and change the current file to the saved file.
+					document.querySelectorAll('.set-file-info').forEach((nfo) => nfo.classList.add('temporaryFile'));
+					for (const currentFile of document.querySelectorAll('.current-file')) {
+						currentFile.textContent = currentFile.dataset.tmpFile;
+					}
+				}
+			})
+			.catch((err) => showMessage(`Error saving temporary file: ${err?.message ?? err}`));
+	};
+
+	const viewSeedInput = document.getElementById('action_view_seed_id');
+	if (viewSeedInput) {
+		document.getElementById('randomize_view_seed_id')?.addEventListener('click', async () => {
+			viewSeedInput.value = Math.ceil(Math.random() * 9999);
+			await render();
+
+			saveTempFile();
+		});
+	}
+
+	const hardcopySeedInput = document.getElementById('action_hardcopy_seed_id');
+	if (hardcopySeedInput) {
+		document.getElementById('randomize_hardcopy_seed_id')?.addEventListener('click', async () => {
+			hardcopySeedInput.value = Math.ceil(Math.random() * 9999);
+			await generateHardcopy();
+
+			saveTempFile();
+		});
+	}
+
+	const revertBackupCheck = document.getElementById('action_revert_type_backup_id');
+	if (revertBackupCheck) {
+		document.getElementById('action_revert_backup_time_id')
+			?.addEventListener('change', () => revertBackupCheck.checked = true);
+	}
+	const deleteBackupCheck = document.getElementById('action_revert_type_delete_id');
+	if (deleteBackupCheck) {
+		document.getElementById('action_revert_delete_number_id')
+			?.addEventListener('change', () => deleteBackupCheck.checked = true);
+	}
+
+	// Send a request to the server to perltidy the current PG code in the CodeMirror editor.
+	const tidyPGCode = () => {
+		const request_object = {
+			user: document.getElementById('hidden_user')?.value,
+			courseID: document.getElementsByName('courseID')[0]?.value,
+			key: document.getElementById('hidden_key')?.value
+		};
+
+		request_object.rpc_command = 'tidyPGCode';
+		request_object.pgCode = webworkConfig?.pgCodeMirror?.getValue()
+			?? document.getElementById('problemContents')?.value ?? '';
+
+		fetch(webserviceURL, { method: 'post', mode: 'same-origin', body: new URLSearchParams(request_object) })
+			.then((response) => response.json())
+			.then((data) => {
+				if (data.result_data.status) {
+					if (data.result_data.errors) {
+						renderArea.innerHTML = '<div class="alert alert-danger p-1 m-2">' +
+							'<p class="fw-bold">PG perltidy errors:</p>' +
+							'<pre><code>' +
+							data.result_data.errors
+							.replace(/^[\s\S]*Begin Error Output Stream\n\n/, '')
+							.replace(/\n\d*: To save a full \.LOG file rerun with -g/, '') +
+							'</code></pre>';
+					}
+					showMessage('Errors occurred perltidying code.', false);
+					return;
+				}
+				if (request_object.pgCode === data.result_data.tidiedPGCode) {
+					showMessage('There were no changes to the code.', true);
+				} else {
+					if (webworkConfig?.pgCodeMirror) webworkConfig.pgCodeMirror.setValue(data.result_data.tidiedPGCode);
+					else document.getElementById('problemContents').value = data.result_data.tidiedPGCode;
+					saveTempFile();
+					showMessage('Successfuly perltidied code.', true);
+				}
+			})
+			.catch((err) => showMessage(`Error: ${err?.message ?? err}`));
+	};
+
+	document.getElementById('take_action')?.addEventListener('click', async (e) => {
+		if (document.getElementById('current_action')?.value === 'pgtidy') {
+			e.preventDefault();
+			tidyPGCode();
+			return;
+		}
+
+		const actionView = document.getElementById('view');
+		const editorForm = document.getElementById('editor');
+
+		// Make sure this is reset on each click so that a new window isn't always opened once that has been done once.
+		if (editorForm) editorForm.target = '_self';
+
+		if (actionView && actionView.classList.contains('active')) {
+			if (document.getElementById('newWindowView')?.checked) {
+				document.getElementById('revert-tab')?.classList.remove('disabled');
+				document.getElementById('revert-to-tmp-container')?.classList.remove('d-none');
+				const revertRadio = document.getElementById('action_revert_type_revert_id');
+				if (revertRadio && revertRadio.disabled) {
+					revertRadio.disabled = false;
+					revertRadio.checked = true;
+				}
+
+				// Add the temporary file coloring and change the current file to the saved file.
+				document.querySelectorAll('.set-file-info').forEach((nfo) => nfo.classList.add('temporaryFile'));
+				for (const currentFile of document.querySelectorAll('.current-file')) {
+					currentFile.textContent = currentFile.dataset.tmpFile;
+				}
+
+				if (editorForm) editorForm.target = 'WW_View';
+			} else {
+				e.preventDefault();
+				await render();
+
+				saveTempFile();
+			}
+		}
+
+		const actionSave = document.getElementById('save');
+		if (actionSave
+			&& actionSave.classList.contains('active')
+			&& document.getElementById('newWindowSave')?.checked
+			&& editorForm)
+		{
+			if (document.getElementById('backupFile')?.checked) {
+				document.getElementById('show-backups-comment')?.classList.remove('d-none');
+				const deleteBackupCheck = document.getElementById('deleteBackup');
+				if (deleteBackupCheck) deleteBackupCheck.disabled = false;
+			}
+			document.getElementById('revert-tab')?.classList.remove('disabled');
+
+			editorForm.target = 'WW_View';
+		}
+
+
+		const actionHardcopy = document.getElementById('hardcopy');
+		if (actionHardcopy && actionHardcopy.classList.contains('active')) {
+			e.preventDefault();
+			await generateHardcopy();
+
+			saveTempFile();
+		}
+	});
+
+	const renderURL = `${webworkConfig?.webwork_url ?? '/webwork2'}/render_rpc`;
+	const renderArea = document.getElementById('pgedit-render-area');
+	const fileType = document.getElementsByName('file_type')[0]?.value;
+
+	// This is either the div created by the CodeMirror editor or the problemContents textarea in the case that
+	// CodeMirror is disabled in localOverrides.conf.
+	const editorArea = document.querySelector('.CodeMirror') ?? document.getElementById('problemContents');
+
+	// Add hot key, ctrl-enter, to render the problem
+	editorArea.addEventListener('keydown', async (e) => {
+		if (e.ctrlKey && e.code === 'Enter') {
+			e.preventDefault();
+			await render();
+			saveTempFile();
+		}
+	});
+
+	// Synchronize the heights of the render area and the editor area for wide windows.
+	if (editorArea && renderArea) {
+		const codeMirrorResizeObserver = new ResizeObserver((entries) => {
+			if (document.body.clientWidth < 992) return;
+
+			for (const entry of entries) {
+				if (entry.borderBoxSize) {
+					// Note that the blockSize is the height (since width is not resizable).
+					const height = Array.isArray(entry.borderBoxSize)
+						? entry.borderBoxSize[0].blockSize
+						: entry.borderBoxSize.blockSize;
+					if (window.getComputedStyle(renderArea).getPropertyValue('height') !== `${height}px`)
+						renderArea.style.height = `${height}px`;
+					if (window.getComputedStyle(editorArea).getPropertyValue('height') !== `${height}px`) {
+						if (webworkConfig?.pgCodeMirror) webworkConfig.pgCodeMirror.setSize('100%', `${height}px`);
+						else editorArea.style.height = `${height}px`;
+					}
+				}
+			}
+		});
+		codeMirrorResizeObserver.observe(editorArea);
+		codeMirrorResizeObserver.observe(renderArea);
+	}
+
+	// Save the initial placeholder content of the render area so that it can be put back when a problem is reloaded.
+	const placeholder = renderArea.querySelector('.placeholder');
+	const iframe = document.createElement('iframe');
+	iframe.title = 'Rendered content';
+	iframe.id = 'pgedit-render-iframe';
+
+	// Adjust the height of the iframe when the window is resized and when the iframe loads.
+	const adjustIFrameHeight = () => {
+		if (document.body.clientWidth < 992) {
+			if (iframe.contentDocument)
+				renderArea.style.height = `${iframe.contentDocument.documentElement.offsetHeight + 2}px`;
+		} else renderArea.style.height = `${editorArea.offsetHeight}px`;
+	};
+	window.addEventListener('resize', adjustIFrameHeight);
+
+	// When one of the problem form submit buttons is clicked, set the source for the problem in the
+	// hidden problemSource input to the current contents of the CodeMirror editor so that changes
+	// are immediate.
+	iframe.addEventListener('load', () => {
+		const problemForm = iframe.contentWindow.document.getElementById('problemMainForm');
+		if (!problemForm) return;
+
+		for (const button of problemForm.querySelectorAll('input[type="submit"]')) {
+			button.addEventListener('click', (e) => {
+				e.preventDefault();
+
+				// FormData does not support the characters in raw problem source.  URLSearchParams does.
+				// So extract the problem form data using the FormData object and construct the URLSearchParams object
+				// with that.
+				const requestData = new URLSearchParams(new FormData(problemForm));
+				requestData.set('rawProblemSource', webworkConfig?.pgCodeMirror?.getValue()
+					?? document.getElementById('problemContents')?.value ?? '');
+				requestData.set('send_pg_flags', 1);
+				requestData.set(button.name, button.value);
+				requestData.set('set_id', document.getElementsByName('hidden_set_id')[0]?.value ?? 'Unknown Set');
+
+				renderProblem(requestData);
+
+				saveTempFile();
+			});
+		}
+
+		adjustIFrameHeight();
+
+		// Scroll to the top of the render window if the current scroll position is below that.
+		const renderAreaRect = renderArea.getBoundingClientRect();
+		const topBarHeight = document.querySelector('.webwork-logo')?.getBoundingClientRect().height ?? 0;
+		if (renderAreaRect.top < topBarHeight) window.scrollBy(0, renderAreaRect.top - topBarHeight);
+	});
+
+	const render = () => new Promise((resolve) => {
+		if (fileType === 'hardcopy_header') {
+			renderArea.innerHTML = '<div class="alert alert-danger p-1 m-2 fw-bold">' +
+				'Hardcopy header contents can only be viewed in a new window.</div>';
+			resolve();
+			return;
+		}
+
+		if (fileType === 'course_info') {
+			const contents = webworkConfig?.pgCodeMirror?.getValue();
+			if (contents) renderArea.innerHTML = contents;
+			else
+				renderArea.innerHTML = '<div class="alert alert-danger p-1 m-2 fw-bold">The file has no content.</div>';
+
+			// Typeset any math content that may be in the course info file.
+			if (window.MathJax) {
+				MathJax.startup.promise =
+					MathJax.startup.promise.then(() => MathJax.typesetPromise(['#pgedit-render-area']));
+			}
+
+			resolve();
+			return;
+		}
+
+		if (fileType === 'hardcopy_theme') {
+			const contents = webworkConfig?.pgCodeMirror?.getValue();
+			if (contents) {
+				renderArea.innerHTML = '<pre>' + contents.replace(/&/g, "&amp;").replace(/</g, "&lt;") + '</pre>';
+			}
+			else
+				renderArea.innerHTML = '<div class="alert alert-danger p-1 m-2 fw-bold">The file has no content.</div>';
+
+			resolve();
+			return;
+		}
+
+		const isProblem = fileType && /problem/.test(fileType) ? 1 : 0;
+
+		renderProblem(new URLSearchParams({
+			user: document.getElementById('hidden_user')?.value,
+			courseID: document.getElementsByName('courseID')[0]?.value,
+			key: document.getElementById('hidden_key')?.value,
+			problemSeed: document.getElementById('action_view_seed_id')?.value ?? 1,
+			sourceFilePath: document.getElementsByName('edit_file_path')[0]?.value,
+			rawProblemSource: webworkConfig?.pgCodeMirror?.getValue()
+				?? document.getElementById('problemContents')?.value ?? '',
+			outputformat: 'simple',
+			showAnswerNumbers: 0,
+			// The set id is really only needed by set headers to get the correct dates for the set.
+			set_id: document.getElementsByName('hidden_set_id')[0]?.value ?? 'Unknown Set',
+			// This should not be an actual problem number in the set.  If so the current user's seed for that problem
+			// will be used instead of the seed from the editor form.
+			probNum: 0,
+			showHints: 1,
+			showSolutions: 1,
+			isInstructor: 1,
+			noprepostambles: 1,
+			processAnswers: 0,
+			showPreviewButton: isProblem,
+			showCheckAnswersButton: isProblem,
+			showCorrectAnswersButton: isProblem,
+			showFooter: 0,
+			displayMode: document.getElementById('action_view_displayMode_id')?.value ?? 'MathJax',
+			language: document.querySelector('input[name="hidden_language"]')?.value ?? 'en',
+			send_pg_flags: 1,
+			view_problem_debugging_info: 1
+		})).then(() => resolve());
+	});
+
+	// This is used to protect against rapid successive clicks on the "Randomize Seed" or "View/Reload" buttons.
+	let rendering = false;
+
+	const renderProblem = (body) => new Promise((resolve) => {
+		if (rendering) { resolve(); return; }
+		rendering = true;
+
+		// Put the placeholder back until the problem finishes rendering.
+		renderArea.replaceChildren(placeholder);
+
+		const controller = new AbortController();
+		const timeoutId = setTimeout(() => controller.abort(), 20000);
+
+		fetch(renderURL, { method: 'post', mode: 'same-origin', signal: controller.signal, body })
+			.then((response) => {
+				clearTimeout(timeoutId);
+				return response.json();
+			})
+			.then((data) => {
+				// If the error is set, show that.
+				if (data.error) throw data.error;
+				// This generally shouldn't happen.
+				if (!data.html) throw 'A server error occured.  The response had no content';
+
+				renderArea.replaceChildren(iframe);
+				iframe.srcdoc = data.html;
+
+				if (data.pg_flags && data.pg_flags.comment) {
+					// The problem has a comment, so show it.
+					const container = document.createElement('div');
+					container.classList.add('px-2', 'mb-2');
+					container.innerHTML = data.pg_flags.comment;
+					iframe.after(container);
+				}
+
+				iframe.addEventListener('load', () => { rendering = false; resolve(); }, { once: true });
+			})
+			.catch((err) => {
+				renderArea.innerHTML = `<div class="alert alert-danger p-1 m-2 fw-bold">Rendering error: ${
+					err?.message ?? err}</div>`;
+				rendering = false;
+				resolve();
+			});
+	});
+
+	// Render the content when the page loads.
+	render();
+
+	const generateHardcopy = async () => {
+		if (rendering) return;
+		rendering = true;
+
+		const controller = new AbortController();
+		const timeoutId = setTimeout(() => controller.abort(), 30000);
+
+		try {
+			const response = await fetch(renderURL, {
+				method: 'post',
+				mode: 'same-origin',
+				signal: controller.signal,
+				body: new URLSearchParams({
+					user: document.getElementById('hidden_user')?.value,
+					courseID: document.getElementsByName('courseID')[0]?.value,
+					key: document.getElementById('hidden_key')?.value,
+					problemSeed: document.getElementById('action_hardcopy_seed_id')?.value ?? 1,
+					sourceFilePath: document.getElementsByName('edit_file_path')[0]?.value,
+					rawProblemSource: webworkConfig?.pgCodeMirror?.getValue()
+						?? document.getElementById('problemContents')?.value ?? '',
+					outputformat: document.getElementById('action_hardcopy_format_id')?.value ?? 'pdf',
+					hardcopy_theme: document.getElementById('action_hardcopy_theme_id')?.value ?? 'oneColumn',
+					// The set id is really only needed by set headers to get the correct dates for the set.
+					set_id: document.getElementsByName('hidden_set_id')[0]?.value ?? 'Unknown Set',
+					// This should not be an actual problem number in the set.  If so the current user's seed for that
+					// problem will be used instead of the seed from the editor form.
+					probNum: 0,
+					showHints: 1,
+					showSolutions: 1,
+					WWcorrectAns: 1,
+					isInstructor: 1,
+					noprepostambles: 1,
+					processAnswers: 1,
+					displayMode: 'tex',
+					view_problem_debugging_info: 1
+				})
+			});
+
+			clearTimeout(timeoutId);
+
+			if (!response.ok ||
+				!response.headers.get('content-type') ||
+				/text\/html/.test(response.headers.get('content-type')))
+			{
+				throw await response.text();
+				return;
+			}
+
+			const data = await response.blob();
+
+			const element = document.createElement('a');
+			element.href = window.URL.createObjectURL(data);
+			element.download = response.headers.get('content-disposition').split('=')[1];
+			element.style.display = 'none';
+			document.body.appendChild(element);
+			element.click();
+			document.body.removeChild(element);
+
+			rendering = false;
+		} catch (err) {
+			if (typeof err === 'string') {
+				renderArea.innerHTML = '<div class="alert alert-danger p-1 m-2 fw-bold">' +
+					'<div>Hardcopy generation errors:</div>' +
+					err.split('\n').reduce((acc, line) => acc += `<div>${line}</div>`, '');
+			} else {
+				renderArea.innerHTML = `<div class="alert alert-danger p-1 m-2 fw-bold">Hardcopy generation error: ${
+					err?.message ?? err}</div>`;
+			}
+			rendering = false;
+		};
+	};
+})();
diff --git a/htdocs/js/PODViewer/podviewer.css b/htdocs/js/PODViewer/podviewer.css
new file mode 100644
index 0000000000..e4f17811d2
--- /dev/null
+++ b/htdocs/js/PODViewer/podviewer.css
@@ -0,0 +1,66 @@
+.main-index-header,
+.pod-header {
+	height: 65px;
+	top: 0;
+	left: 0;
+	right: 0;
+	z-index: 2;
+}
+
+#sidebar {
+	--bs-offcanvas-width: 300px;
+	overflow-y: auto;
+}
+
+#sidebar ul.nav ul.nav li {
+	border-left: 1px solid #e1e4e8;
+	padding-left: 10px;
+}
+
+#sidebar ul.nav ul.nav li:hover {
+	border-left: 6px solid #e1e4e8;
+	padding-left: 5px;
+}
+
+.main-index-container,
+.pod-page-container {
+	margin-top: 65px;
+}
+
+@media only screen and (min-width: 768px) {
+	#sidebar {
+		height: calc(100vh - 65px);
+		width: 300px;
+	}
+
+	.pod-page-container {
+		margin-left: 300px;
+	}
+}
+
+#_podtop_ pre {
+	border: 1px solid #ccc;
+	border-radius: 5px;
+	background: #f6f6f6;
+	padding: 0.75rem;
+}
+
+#_podtop_,
+#_podtop_ *[id] {
+	scroll-margin-top: calc(65px + 1rem);
+}
+
+@media only screen and (max-width: 768px) {
+	.pod-header {
+		height: 100px;
+	}
+
+	.pod-page-container {
+		margin-top: 100px;
+	}
+
+	#_podtop_,
+	#_podtop_ *[id] {
+		scroll-margin-top: calc(100px + 1rem);
+	}
+}
diff --git a/htdocs/js/PODViewer/podviewer.js b/htdocs/js/PODViewer/podviewer.js
new file mode 100644
index 0000000000..795093205a
--- /dev/null
+++ b/htdocs/js/PODViewer/podviewer.js
@@ -0,0 +1,8 @@
+(() => {
+	const offcanvas = bootstrap.Offcanvas.getOrCreateInstance(document.getElementById('sidebar'));
+	for (const link of document.querySelectorAll('#sidebar .nav-link')) {
+		// The timeout is to workaround an issue in Chrome. If the offcanvas hides before the window scrolls to the
+		// fragment in the page, scrolling stops before it gets there.
+		link.addEventListener('click', () => setTimeout(() => offcanvas.hide(), 500));
+	}
+})();
diff --git a/htdocs/js/apps/Problem/problem.js b/htdocs/js/Problem/problem.js
similarity index 100%
rename from htdocs/js/apps/Problem/problem.js
rename to htdocs/js/Problem/problem.js
diff --git a/htdocs/js/ProblemGrader/problemgrader.js b/htdocs/js/ProblemGrader/problemgrader.js
new file mode 100644
index 0000000000..fb86daa368
--- /dev/null
+++ b/htdocs/js/ProblemGrader/problemgrader.js
@@ -0,0 +1,252 @@
+'use strict';
+
+(() => {
+	const setPointInputValue = (pointInput, score) =>
+		pointInput.value = (Math.round(score * pointInput.max / 100 / pointInput.step) * pointInput.step).toFixed(2);
+
+	// Compute the problem score from any answer sub scores, and update the problem score input.
+	document.querySelectorAll('.answer-part-score').forEach((part) => {
+		part.addEventListener('input', () => {
+			const problemId = part.dataset.problemId;
+			const answerLabels = JSON.parse(part.dataset.answerLabels);
+
+			if (!part.checkValidity()) {
+				part.classList.add('is-invalid');
+			} else {
+				part.classList.remove('is-invalid');
+
+				let score = 0;
+				answerLabels.forEach((label) => {
+					const partElt = document.getElementById(`score_problem${problemId}_${label}`);
+					score += partElt.value * partElt.dataset.weight;
+				});
+				document.getElementById(`score_problem${problemId}`).value = Math.round(score);
+
+				const pointInput = document.getElementById(`score_problem${problemId}_points`);
+				if (pointInput) setPointInputValue(pointInput, score);
+			}
+			document.getElementById(`grader_messages_problem${problemId}`).innerHTML = '';
+		});
+	});
+
+	// Update problem score if point value changes and is a valid value.
+	document.querySelectorAll('.problem-points').forEach((pointInput) => {
+		pointInput.addEventListener('input', () => {
+			const problemId = pointInput.dataset.problemId;
+			if (pointInput.checkValidity()) {
+				const scoreInput = document.getElementById(`score_problem${problemId}`);
+				pointInput.classList.remove('is-invalid');
+				scoreInput.classList.remove('is-invalid');
+				scoreInput.value = Math.round(100 * pointInput.value / pointInput.max);
+			} else {
+				pointInput.classList.add('is-invalid');
+			}
+			document.getElementById(`grader_messages_problem${problemId}`).innerHTML = '';
+		});
+	});
+
+	// Clear messages when the score or comment are changed.
+	document.querySelectorAll('.problem-score,.grader-problem-comment').forEach((el) => {
+		el.addEventListener('input', () => {
+			const problemId = el.dataset.problemId;
+			if (!el.checkValidity()) {
+				el.classList.add('is-invalid');
+			} else {
+				el.classList.remove('is-invalid');
+
+				if (el.classList.contains('problem-score')) {
+					const pointInput = document.getElementById(`score_problem${problemId}_points`);
+					if (pointInput) {
+						pointInput.classList.remove('is-invalid');
+						setPointInputValue(pointInput, el.value);
+					}
+				}
+			}
+			document.getElementById(`grader_messages_problem${el.dataset.problemId}`).innerHTML = '';
+		});
+	});
+
+	// Save the score and comment.
+	document.querySelectorAll('.save-grade').forEach((saveButton) => {
+		saveButton.addEventListener('click', async () => {
+			const saveData = saveButton.dataset;
+
+			const user = document.getElementById('hidden_user').value;
+			const sessionKey = document.getElementById('hidden_key').value;
+
+			const messageArea = document.getElementById(`grader_messages_problem${saveData.problemId}`);
+
+			const scoreInput = document.getElementById('score_problem' + saveData.problemId);
+			if (!scoreInput.checkValidity()) {
+				messageArea.classList.add('alert-danger');
+				messageArea.textContent = scoreInput.validationMessage;
+				setTimeout(() => messageArea.classList.remove('alert-danger'), 100);
+				scoreInput.focus();
+				return;
+			}
+
+			// Save the score.
+			const basicWebserviceURL = `${webworkConfig?.webwork_url ?? '/webwork2'}/instructor_rpc`;
+
+			const controller = new AbortController();
+			const timeoutId = setTimeout(() => controller.abort(), 10000);
+
+			try {
+				const response = await fetch(basicWebserviceURL, {
+					method: 'post',
+					mode: 'same-origin',
+					body: new URLSearchParams({
+						user: user,
+						key: sessionKey,
+						rpc_command: saveData.versionId !== '0' ? 'putProblemVersion' : 'putUserProblem',
+						courseID: saveData.courseId,
+						user_id: saveData.studentId,
+						set_id: saveData.setId,
+						version_id: saveData.versionId,
+						problem_id: saveData.problemId,
+						status: parseInt(scoreInput.value) / 100
+					}),
+					signal: controller.signal
+				});
+
+				clearTimeout(timeoutId);
+
+				if (!response.ok) {
+					throw 'Unknown server communication error.';
+				} else {
+					const data = await response.json();
+					if (data.error) {
+						throw data.error;
+					} else {
+						// Update the hidden problem status fields and score table for gateway quizzes
+						if (saveData.versionId !== '0') {
+							document.gwquiz.elements['probstatus' + saveData.problemId].value =
+								parseInt(scoreInput.value) / 100;
+							let testValue = 0;
+							for (const scoreCell of document.querySelectorAll('table.gwNavigation td.score')) {
+								if (scoreCell.dataset.problemId == saveData.problemId) {
+									scoreCell.textContent = scoreInput.value == '100' ? '\u{1F4AF}' : scoreInput.value;
+								}
+								testValue += document.gwquiz.elements['probstatus'
+									+ scoreCell.dataset.problemId].value * scoreCell.dataset.problemValue;
+							}
+							const recordedScore = document.getElementById('test-recorded-score');
+							if (recordedScore) {
+								recordedScore.textContent = Math.round(100 * testValue / 2) / 100;
+								document.getElementById('test-recorded-percent').textContent =
+									Math.round(100 * testValue /
+										(2 * document.getElementById('test-total-possible').textContent));
+							}
+						}
+
+						if (saveData.pastAnswerId !== '0') {
+							// Save the comment.
+							const comment = document.getElementById(`comment_problem${saveData.problemId}`)?.value;
+
+							const controller = new AbortController();
+							const timeoutId = setTimeout(() => controller.abort(), 10000);
+
+							try {
+								const response = await fetch(basicWebserviceURL, {
+									method: 'post',
+									body: new URLSearchParams({
+										user: user,
+										key: sessionKey,
+										rpc_command: 'putPastAnswer',
+										courseID: saveData.courseId,
+										answer_id: saveData.pastAnswerId,
+										comment_string: comment
+									}),
+									signal: controller.signal
+								});
+
+								clearTimeout(timeoutId);
+
+								if (!response.ok) {
+									throw 'Unknown server communication error.';
+								} else {
+									const data = await response.json();
+									if (data.error) {
+										throw data.error;
+									} else {
+										messageArea.classList.add('alert-success');
+										messageArea.textContent = 'Score and comment saved.';
+										setTimeout(() => messageArea.classList.remove('alert-success'), 100);
+									}
+								}
+							} catch (e) {
+								messageArea.classList.add('alert-danger');
+								messageArea.innerHTML =
+									'<div>The score was saved, but there was an error saving the comment.</div>' +
+									`<div>${e}</div>`;
+								setTimeout(() => messageArea.classList.remove('alert-danger', 100));
+							}
+						} else {
+							messageArea.classList.add('alert-success');
+							messageArea.textContent = 'Score saved.';
+							setTimeout(() => messageArea.classList.remove('alert-success'), 100);
+						}
+					}
+				}
+			} catch (e) {
+				messageArea.classList.add('alert-danger');
+				messageArea.innerHTML = `<div>Error saving score.</div><div>${e?.message ?? e}</div>`;
+				setTimeout(() => messageArea.classList.remove('alert-danger', 100));
+			}
+		});
+	})
+
+	// Problem rendering.
+
+	const userSelect = document.getElementById('student_selector');
+	if (!userSelect) return;
+
+	const render = () => {
+		const selectedUser = userSelect.options[userSelect.selectedIndex];
+		if (!selectedUser) return;
+
+		const ro = {
+			effectiveUser: userSelect.value,
+			sourceFilePath: selectedUser.dataset.sourceFile,
+			problemSeed: selectedUser.dataset.problemSeed,
+			set_id: document.getElementsByName('hidden_set_id')[0]?.value,
+			probNum: document.getElementsByName('hidden_problem_id')[0]?.value,
+			processAnswers: 1
+		};
+
+		if (selectedUser.dataset.versionId) ro.version_id = selectedUser.dataset.versionId;
+		if (selectedUser.dataset.answerPrefix) ro.answerPrefix = selectedUser.dataset.answerPrefix;
+
+		if (selectedUser.dataset.lastAnswer) {
+			for (const [label, answer] of Object.entries(
+				JSON.parse(selectedUser.dataset.lastAnswer).reduce((acc, o, i, arr) => {
+					if (i % 2 === 0) acc[o] = arr[i + 1];
+					return acc;
+				}, {})
+			)) {
+				if (answer !== null) ro[label] = answer;
+			}
+		}
+
+		let haveAltSource = false;
+		for (const answers of document.querySelectorAll('.problem-answers')) {
+			if (answers.dataset.sourceFile !== selectedUser.dataset.sourceFile) {
+				haveAltSource = true;
+				answers.classList.add('alt-source');
+			} else {
+				answers.classList.remove('alt-source');
+			}
+		}
+		if (haveAltSource) document.getElementById('alt-source-key')?.classList.remove('d-none');
+		else document.getElementById('alt-source-key')?.classList.add('d-none');
+
+		webworkConfig.renderProblem('problem_render_area', ro);
+	};
+
+	// Initial render on page load.
+	render();
+
+	// Re-render when a new student/version or display mode is selected.
+	userSelect.addEventListener('change', render);
+	document.getElementById('problem_displaymode')?.addEventListener('change', render);
+})();
diff --git a/htdocs/js/apps/ProblemSetDetail/problemsetdetail.js b/htdocs/js/ProblemSetDetail/problemsetdetail.js
similarity index 80%
rename from htdocs/js/apps/ProblemSetDetail/problemsetdetail.js
rename to htdocs/js/ProblemSetDetail/problemsetdetail.js
index d81db8cebb..49a0c58d13 100644
--- a/htdocs/js/apps/ProblemSetDetail/problemsetdetail.js
+++ b/htdocs/js/ProblemSetDetail/problemsetdetail.js
@@ -228,8 +228,8 @@
 
 	// Set up the button to hide all rendered problems.
 	document.getElementById('psd_hide_all')?.addEventListener('click', () => {
-		document.querySelectorAll('.psr_render_area').forEach((renderArea) => {
-			const iframe = renderArea.querySelector('[id^=psr_render_iframe_]');
+		document.querySelectorAll('.rpc_render_area').forEach((renderArea) => {
+			const iframe = renderArea.querySelector('[id^="psr_render_area_"][id$="_iframe"]');
 			if (iframe && iframe.iFrameResizer) iframe.iFrameResizer.close();
 		});
 	}, { passive: true });
@@ -294,30 +294,17 @@
 	}, { passive: true });
 
 	// Send a request to the webwork webservice and render a problem.
-	const basicWebserviceURL = '/webwork2/html2xml';
+	const basicWebserviceURL = `${webworkConfig?.webwork_url ?? '/webwork2'}/render_rpc`;
 
 	const render = (id) => new Promise((resolve) => {
 		const renderArea = document.getElementById(`psr_render_area_${id}`);
 
 		const ro = {
-			userID: document.getElementById('hidden_user')?.value,
-			courseID: document.getElementById('hidden_course_id')?.value,
-			session_key: document.getElementById('hidden_key')?.value
+			problemSeed: document.getElementById(`problem.${id}.problem_seed_id`)?.value ?? 1,
+			sourceFilePath: document.getElementById(`problem.${id}.source_file_id`)?.value ||
+			document.getElementById(`problem_${id}_default_source_file`)?.value,
 		};
 
-		if (!(ro.userID && ro.courseID && ro.session_key)) {
-			renderArea.innerHTML = '<div class="alert alert-danger p-1 mb-0 fw-bold">'
-				+ 'Missing hidden credentials: user, session_key, courseID</div>';
-			resolve();
-			return;
-		}
-
-		const problemSeed = document.getElementById(`problem.${id}.problem_seed_id`);
-		ro.problemSeed = problemSeed ? problemSeed.value : 1;
-
-		ro.sourceFilePath = document.getElementById(`problem.${id}.source_file_id`)?.value ||
-			document.getElementById(`problem_${id}_default_source_file`)?.value;
-
 		if (ro.sourceFilePath.startsWith('group')) {
 			renderArea.innerHTML = '<div class="alert alert-danger p-1 mb-0" style="font-weight:bold">'
 				+ 'Problem source is drawn from a grouping set.</div>';
@@ -331,83 +318,11 @@
 		const versionIDInput = document.getElementById('hidden_version_id');
 		if (versionIDInput) ro.version_id = versionIDInput.value;
 
-		ro.outputformat = 'simple';
-		ro.showAnswerNumbers = 0;
-		ro.set_id = $('#hidden_set_id').val();
+		ro.set_id = document.getElementById('hidden_set_id')?.value ?? 'Unknown Set';
 		ro.probNum = id;
-		ro.showHints = 1;
-		ro.showSolutions = 1;
-		ro.permissionLevel = 10;
-		ro.noprepostambles = 1;
-		ro.processAnswers = 0;
-		ro.showFooter = 0;
-		ro.displayMode = document.getElementById('problem_displaymode')?.value ?? 'MathJax';
 		ro.language = document.querySelector('input[name="hidden_language"]')?.value ?? 'en';
-		ro.send_pg_flags = 1;
-		ro.extra_header_text = '<style>' +
-			'html{overflow-y:hidden;}body{padding:1px;background:#f5f5f5;}.container-fluid{padding:0px;}' +
-			'</style>';
-		if (window.location.port) ro.forcePortNumber = window.location.port;
-
-		const controller = new AbortController();
-		const timeoutId = setTimeout(() => controller.abort(), 10000);
-
-		fetch(
-			basicWebserviceURL,
-			{
-				method: 'post',
-				mode: 'same-origin',
-				body: new URLSearchParams(ro),
-				signal: controller.signal
-			}
-		).then((response) => {
-			clearTimeout(timeoutId);
-			return response.json();
-		}).then((data) => {
-			// Give nicer session timeout error
-			if (!data.html || /Can\'t authenticate -- session may have timed out/i.test(data.html) ||
-				/Webservice.pm: Error when trying to authenticate./i.test(data.html)) {
-				renderArea.innerHTML = '<div class="alert alert-danger p-1 mb-0 fw-bold">'
-					+ "Can't authenticate -- session may have timed out.</div>";
-				resolve();
-				return;
-			}
-			// Give nicer file not found error
-			if (/this problem file was empty/i.test(data.html)) {
-				renderArea.innerHTML = '<div class="alert alert-danger p-1 mb-0 fw-bold">'
-					+ 'No Such File or Directory!</div>';
-				resolve();
-				return;
-			}
-			// Give nicer problem rendering error
-			if (data.pg_flags && data.pg_flags.error_flag  ||
-				/error caught by translator while processing problem/i.test(data.html) ||
-				/error message for command: renderproblem/i.test(data.html)) {
-				renderArea.innerHTML = '<div class="alert alert-danger p-1 mb-0 fw-bold">'
-					+ 'There was an error rendering this problem!</div>';
-				resolve();
-				return;
-			}
 
-			const iframe = document.createElement('iframe');
-			iframe.id = `psr_render_iframe_${id}`;
-			iframe.style.border = 'none';
-			iframe.srcdoc = data.html;
-			renderArea.innerHTML = '';
-			renderArea.append(iframe);
-
-			if (data.pg_flags && data.pg_flags.comment)
-				iframe.insertAdjacentHTML('afterend', data.pg_flags.comment);
-			if (data.warnings)
-				iframe.insertAdjacentHTML('afterend', data.warnings);
-
-			iFrameResize({ checkOrigin: false, warningTimeout: 20000, scrolling: 'omit' }, iframe);
-			iframe.addEventListener('load', () => resolve());
-		}).catch((err) => {
-			renderArea.innerHTML = '<div class="alert alert-danger p-1 mb-0 fw-bold">'
-				+ `${basicWebserviceURL}: ${err.message}` + '</div>';
-			resolve();
-		});
+		webworkConfig.renderProblem(renderArea, ro).then(resolve);
 	});
 
 	// Set up the problem render buttons.
@@ -415,11 +330,11 @@
 		renderButton.addEventListener('click', () => {
 			const id = renderButton.id.match(/^pdr_render_(\d+)/)[1];
 			const renderArea = document.getElementById(`psr_render_area_${id}`);
-			const iframe = document.getElementById(`psr_render_iframe_${id}`);
+			const iframe = document.getElementById(`psr_render_area_${id}_iframe`);
 			if (iframe && iframe.iFrameResizer) {
 				iframe.iFrameResizer.close();
 				renderArea.innerHTML = '';
-			} else if (renderArea.innerHTML != '') {
+			} else if (/\S/.test(renderArea.innerHTML)) {
 				renderArea.innerHTML = '';
 			} else {
 				collapsibles[id]?.show();
@@ -434,7 +349,7 @@
 		Object.keys(collapsibles).forEach((row) => collapsibles[row].show());
 		document.querySelectorAll('.sortable-branch.collapse').forEach(
 			(branch) => bootstrap.Collapse.getInstance(branch)?.show());
-		const renderAreas = document.querySelectorAll('.psr_render_area');
+		const renderAreas = document.querySelectorAll('.rpc_render_area');
 		for (const renderArea of renderAreas) {
 			renderArea.innerHTML = '<div class="alert alert-success p-1 mb-0">Loading Please Wait...</div>';
 		}
@@ -478,4 +393,25 @@
 		if (!overrideCheck) return;
 		select.addEventListener('change', () => overrideCheck.checked = select.value != '');
 	});
+
+	// This changes the set header textbox text to the currently selected option in the select menu.
+	document.querySelectorAll('.combo-box').forEach((comboBox) => {
+		const comboBoxText = comboBox.querySelector('.combo-box-text');
+		const comboBoxSelect = comboBox.querySelector('.combo-box-select');
+
+		if (!comboBoxText || !comboBoxSelect) return;
+
+		// Try to select best option in select menu as user types in the textbox.
+		comboBoxText.addEventListener('keyup', () => {
+			let i = 0;
+			for (;
+				i < comboBoxSelect.options.length && comboBoxSelect.options[i].value.indexOf(comboBoxText.value) != 0;
+				++i) {}
+			comboBoxSelect.selectedIndex = i;
+		});
+
+		// Set the textbox text to be same as that of select menu
+		comboBoxSelect.addEventListener('change',
+			() => comboBoxText.value = comboBoxSelect.options[comboBoxSelect.selectedIndex].value);
+	});
 })();
diff --git a/htdocs/js/apps/ProblemSetList/problemsetlist.js b/htdocs/js/ProblemSetList/problemsetlist.js
similarity index 79%
rename from htdocs/js/apps/ProblemSetList/problemsetlist.js
rename to htdocs/js/ProblemSetList/problemsetlist.js
index a27281a954..6cd8746916 100644
--- a/htdocs/js/apps/ProblemSetList/problemsetlist.js
+++ b/htdocs/js/ProblemSetList/problemsetlist.js
@@ -1,5 +1,5 @@
 (() => {
-	// Show the filter error message if the 'Take Action' button is clicked when matching set IDs without having entered
+	// Show the filter error message if the 'Filter' button is clicked when matching set IDs without having entered
 	// a text to filter on.
 	document.getElementById('take_action')?.addEventListener('click',
 		(e) => {
@@ -67,15 +67,14 @@
 
 		luxon.Settings.defaultLocale = importDateShift.dataset.locale ?? 'en';
 
-		// Compute the time difference between the current browser timezone and the the course timezone.
+		// Compute the time difference between the current browser timezone and the course timezone.
 		// flatpickr gives the time in the browser's timezone, and this is used to adjust to the course timezone.
-		// Note that this is converted to microseconds.
-		const timezoneAdjustment =
-			parseInt(Intl.DateTimeFormat('en-US', { timeZoneName: 'shortOffset' })
-				.format(new Date).split(' ')[1].slice(3) || '0') * 3600000
-			- parseInt(Intl.DateTimeFormat('en-US',
-				{ timeZone: importDateShift.dataset.timezone ?? 'UTC', timeZoneName: 'shortOffset' })
-				.format(new Date).split(' ')[1].slice(3) || '0') * 3600000
+		// Note that this is in seconds.
+		const timezoneAdjustment = (
+			(new Date((new Date).toLocaleString('en-US'))).getTime() -
+			(new Date((new Date).toLocaleString('en-US',
+				{ timeZone: importDateShift.dataset.timezone ?? 'America/New_York' }))).getTime()
+		);
 
 		const fp = flatpickr(importDateShift.parentNode, {
 			allowInput: true,
@@ -90,7 +89,34 @@
 			clickOpens: false,
 			disableMobile: true,
 			wrap: true,
-			plugins: [ new confirmDatePlugin({ confirmText: importDateShift.dataset.doneText, showAlways: true }) ],
+			plugins: [
+				new confirmDatePlugin({ confirmText: importDateShift.dataset.doneText, showAlways: true }),
+				new ShortcutButtonsPlugin({
+					button: [
+						{
+							label: importDateShift.dataset.todayText ?? 'Today',
+							attributes: { class: 'btn btn-sm btn-secondary ms-auto me-1 mb-1' }
+						},
+						{
+							label: importDateShift.dataset.nowText ?? 'Now',
+							attributes: { class: 'btn btn-sm btn-secondary mx-auto mb-1' }
+						}
+					],
+					onClick: (index, fp) => {
+						if (index === 0) {
+							const today = new Date();
+							// If there isn't a selected date, then use 12:00 am on the current date.
+							const selectedDate = fp.selectedDates[0] ?? new Date(new Date().toDateString());
+							selectedDate.setFullYear(today.getFullYear())
+							selectedDate.setMonth(today.getMonth())
+							selectedDate.setDate(today.getDate());
+							fp.setDate(selectedDate);
+						} else if (index === 1) {
+							fp.setDate(new Date());
+						}
+					}
+				})
+			],
 			onReady(selectedDates) {
 				// Flatpickr hides the original input and adds the alternate input after it.  That messes up the
 				// bootstrap input group styling.  So move the now hidden original input after the created alternate
diff --git a/htdocs/js/README_js_organization b/htdocs/js/README_js_organization
index 542844b814..85a5f5f88a 100644
--- a/htdocs/js/README_js_organization
+++ b/htdocs/js/README_js_organization
@@ -1,20 +1,12 @@
-This is the README file for the WeBWorK htdocs/js folder. 
+This is the README file for the WeBWorK htdocs/js folder.
 
 Please follow these guidelines for javascript used by WeBWorK.
 
-js/app: This directory contain first party WeBWorK javascript.
-        Each library/app should have its own directory.
-        Eventually the `app` sub-directory will be removed and
-        js will directly contain all first party WeBWorK
-        javascript.
-
-js/vendor: Old third party javascript libraries not yet migrated to npm.
-           Eventually this sub-directory will be removed.
-
-js/legacy: Old first javascript files that eventually will be removed.
-           Eventually this sub-directory will be removed.
+js: This directory contains first party WeBWorK javascript.
+    Each library/app should have its own directory.
 
 All third party javascript and css libraries will be installed by npm.
 Run `npm install libname` in the htdocs directory to install a new library.
-Run `npm install` in the htdocs directory to install existing libraries.
-The resulting libraries are install in htdocs/node_modules.
+Run `npm install` in the htdocs directory to install libraries.
+Run `npm ci` in the htdocs directory to install the precise versions of libraries defined in package-lock.json.
+The resulting libraries are installed in htdocs/node_modules.
diff --git a/htdocs/js/RenderProblem/renderproblem.js b/htdocs/js/RenderProblem/renderproblem.js
new file mode 100644
index 0000000000..34397ce62e
--- /dev/null
+++ b/htdocs/js/RenderProblem/renderproblem.js
@@ -0,0 +1,84 @@
+(() => {
+	// renderElement may either be the id of an html element, or directly an html element.
+	// If it is an html element, then that element must have an id.
+	webworkConfig.renderProblem = (renderElement, renderOptions) => new Promise((resolve) => {
+		const renderArea = renderElement instanceof Element ? renderElement : document.getElementById(renderElement);
+		if (!renderArea || !renderArea.id) return resolve();
+
+		let iframe = renderArea.querySelector(`#${renderArea.id}_iframe`);
+		if (iframe && iframe.iFrameResizer) iframe.contentDocument.location.replace('about:blank');
+
+		const ro = {
+			user: document.getElementById('hidden_user')?.value,
+			key: document.getElementById('hidden_key')?.value,
+			courseID: document.getElementsByName('hidden_course_id')[0]?.value,
+			language: document.getElementsByName('hidden_language')[0]?.value ?? 'en',
+			displayMode: document.getElementById('problem_displaymode').value ?? 'MathJax',
+			problemSeed: 1,
+			permissionLevel: 10,
+			outputformat: 'simple',
+			showAnswerNumbers: 0,
+			showHints: 1,
+			showSolutions: 1,
+			isInstructor: 1,
+			forceScaffoldsOpen: 1,
+			noprepostambles: 1,
+			processAnswers: 0,
+			showFooter: 0,
+			send_pg_flags: 1,
+			extra_header_text:
+				'<style>' +
+				'html{overflow-y:hidden;}body{padding:1px;background:#f5f5f5;}.container-fluid{padding:0px;}' +
+				'</style>',
+			...renderOptions
+		};
+
+		const controller = new AbortController();
+		const timeoutId = setTimeout(() => controller.abort(), 10000);
+
+		fetch(`${webworkConfig?.webwork_url ?? '/webwork2'}/render_rpc`, {
+			method: 'post',
+			mode: 'same-origin',
+			body: new URLSearchParams(ro),
+			signal: controller.signal
+		})
+			.then((response) => {
+				clearTimeout(timeoutId);
+				return response.json();
+			})
+			.then((data) => {
+				// If the error is set, show that.
+				if (data.error) throw data.error;
+				// This shouldn't happen if the error is not set.
+				if (!data.html) throw 'A server error occured.  The response had no content.';
+				if (/this problem file was empty/i.test(data.html)) throw 'No such file or file was empty!';
+				// Give nicer problem rendering error
+				if (
+					(data.pg_flags && data.pg_flags.error_flag) ||
+					/error caught by translator while processing problem/i.test(data.html)
+				)
+					throw 'There was an error rendering this problem!';
+
+				if (!(iframe && iframe.iFrameResizer)) {
+					iframe = document.createElement('iframe');
+					iframe.id = `${renderArea.id}_iframe`;
+					iframe.style.border = 'none';
+					while (renderArea.firstChild) renderArea.firstChild.remove();
+					renderArea.append(iframe);
+
+					if (data.pg_flags && data.pg_flags.comment) {
+						const container = document.createElement('div');
+						container.innerHTML = data.pg_flags.comment;
+						iframe.after(container);
+					}
+					iFrameResize({ checkOrigin: false, warningTimeout: 20000, scrolling: 'omit' }, iframe);
+					iframe.addEventListener('load', () => resolve());
+				}
+				iframe.srcdoc = data.html;
+			})
+			.catch((err) => {
+				renderArea.innerHTML = `<div class="alert alert-danger p-1 mb-0 fw-bold">${err?.message ?? err}</div>`;
+				resolve();
+			});
+	});
+})();
diff --git a/htdocs/js/SampleProblemViewer/sample-problem.js b/htdocs/js/SampleProblemViewer/sample-problem.js
new file mode 100644
index 0000000000..7907504d2f
--- /dev/null
+++ b/htdocs/js/SampleProblemViewer/sample-problem.js
@@ -0,0 +1,7 @@
+for (const pre of document.body.querySelectorAll('pre.CodeMirror')) {
+	CodeMirror.runMode(pre.textContent, 'PG', pre);
+}
+
+for (const btn of document.querySelectorAll('.clipboard-btn')) {
+	if (navigator.clipboard) btn.addEventListener('click', () => navigator.clipboard.writeText(btn.dataset.code));
+}
diff --git a/htdocs/js/SampleProblemViewer/sample-problem.scss b/htdocs/js/SampleProblemViewer/sample-problem.scss
new file mode 100644
index 0000000000..4d42527785
--- /dev/null
+++ b/htdocs/js/SampleProblemViewer/sample-problem.scss
@@ -0,0 +1,39 @@
+pre.CodeMirror {
+	background-color: #fcfaf1;
+}
+
+.explanation {
+	--bs-code-color: #971556;
+}
+
+.preamble {
+	background-color: lightblue;
+}
+
+.setup {
+	background-color: #ddffdd;
+}
+
+.statement {
+	background-color: #eeb08199;
+}
+
+.answer {
+	background-color: #ffffdd;
+}
+
+.solution {
+	background-color: #ffb6c199;
+}
+
+.hint {
+	background-color: rgb(239, 207, 251);
+}
+
+.perl {
+	color: darkred;
+}
+
+.clipboard-btn {
+	z-index: 1;
+}
diff --git a/htdocs/js/SampleProblemViewer/viewer.js b/htdocs/js/SampleProblemViewer/viewer.js
new file mode 100644
index 0000000000..b86bf06cf8
--- /dev/null
+++ b/htdocs/js/SampleProblemViewer/viewer.js
@@ -0,0 +1,4 @@
+const offcanvas = bootstrap.Offcanvas.getOrCreateInstance(document.getElementById('sidebar'));
+for (const link of document.querySelectorAll('#sidebar-list .list-group-item-action')) {
+  link.addEventListener('click', () => offcanvas.hide());
+}
\ No newline at end of file
diff --git a/htdocs/js/SampleProblemViewer/viewer.scss b/htdocs/js/SampleProblemViewer/viewer.scss
new file mode 100644
index 0000000000..f0e9536aaf
--- /dev/null
+++ b/htdocs/js/SampleProblemViewer/viewer.scss
@@ -0,0 +1,22 @@
+.navbar {
+	height: 70px;
+}
+
+.main-content {
+	margin-top: 70px;
+}
+
+#sidebar {
+	--bs-offcanvas-width: 320px;
+}
+
+@media only screen and (min-width: 768px) {
+	#sidebar {
+		width: 320px;
+		height: calc(100vh - 70px);
+	}
+
+	.main-content {
+		margin-left: 320px;
+	}
+}
diff --git a/htdocs/js/apps/SelectAll/selectall.js b/htdocs/js/SelectAll/selectall.js
similarity index 100%
rename from htdocs/js/apps/SelectAll/selectall.js
rename to htdocs/js/SelectAll/selectall.js
diff --git a/htdocs/js/SendMail/sendmail.js b/htdocs/js/SendMail/sendmail.js
new file mode 100644
index 0000000000..48dfb2110e
--- /dev/null
+++ b/htdocs/js/SendMail/sendmail.js
@@ -0,0 +1,32 @@
+(() => {
+	const previewUserNameSpan = document.getElementById('preview-user');
+	const classListSelect = document.getElementById('classList');
+	if (previewUserNameSpan && classListSelect) {
+		const setPreviewUser = () => {
+			if (classListSelect.selectedIndex !== -1)
+				previewUserNameSpan.textContent = classListSelect.options[classListSelect.selectedIndex].textContent;
+			else previewUserNameSpan.textContent = previewUserNameSpan.dataset.default;
+		};
+		classListSelect.addEventListener('change', setPreviewUser);
+
+		// The timeout should not be needed.  For some reason the classList select is not set correctly on Google
+		// Chrome when the page first loads after the back button is pressed, and it takes a bit for it to be set.
+		setTimeout(setPreviewUser, 100);
+	}
+
+	for (const select of [
+		['openfilename', 'openMessage'],
+		['merge_file', 'viewMergeFile']
+	]) {
+		document.getElementById(select[0])?.addEventListener('change', () => {
+			const mailForm = document.forms['mail-main-form'];
+			if (!mailForm) return;
+			const submit = document.createElement('input');
+			submit.type = 'submit';
+			submit.name = select[1];
+			submit.style.display = 'none';
+			mailForm.append(submit);
+			submit.click();
+		});
+	}
+})();
diff --git a/htdocs/js/apps/SetMaker/setmaker.js b/htdocs/js/SetMaker/setmaker.js
similarity index 57%
rename from htdocs/js/apps/SetMaker/setmaker.js
rename to htdocs/js/SetMaker/setmaker.js
index da8892733d..e226bd6654 100644
--- a/htdocs/js/apps/SetMaker/setmaker.js
+++ b/htdocs/js/SetMaker/setmaker.js
@@ -1,8 +1,14 @@
 (() => {
-	const basicWebserviceURL = '/webwork2/instructorXMLHandler';
+	const webworkURL = webworkConfig?.webwork_url ?? '/webwork2';
+	const basicWebserviceURL = `${webworkURL}/instructor_rpc`;
 
-	// Informational alerts
+	let unloading = false;
+	window.addEventListener('beforeunload', () => unloading = true);
+
+	// Informational alerts/errors
 	const alertToast = (title, msg, good = false) => {
+		if (unloading) return;
+
 		const toastContainer = document.createElement('div');
 		toastContainer.classList.add(
 			'toast-container', 'position-fixed', 'top-50', 'start-50',  'translate-middle', 'p-3');
@@ -21,30 +27,6 @@
 		bsToast.show();
 	};
 
-	// Error display
-	const reportWWerror = (data) => {
-		const modal = document.createElement('div');
-		modal.classList.add('modal', 'modal-dialog-centered', 'gt-modal');
-		modal.tabIndex = -1;
-		modal.setAttribute('aria-labelledby', 'webwork-error-modal');
-		modal.setAttribute('aria-hidden', 'true');
-
-		modal.innerHTML = '<div class="modal-dialog modal-xl"><div class="modal-content">' +
-			'<div class="modal-header">' +
-			`<h5 class="modal-title" id="webwork-error-modal">WeBWorK Error</h5>` +
-			'<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>' +
-			'</div>' +
-			`<div class="modal-body">${data}</div>` +
-			'<div class="modal-footer">' +
-			'<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>' +
-			'</div>' +
-			'</div></div>';
-		document.body.append(modal);
-		const bsModal = new bootstrap.Modal(modal);
-		bsModal.show();
-		modal.addEventListener('hidden.bs.modal', () => { bsModal.dispose(); modal.remove(); });
-	}
-
 	// This is a convenience method for attaching both a click and keydown handler to spans that are inert by default.
 	const attachEventListeners = (button, handler) => {
 		button.addEventListener('click', handler);
@@ -57,21 +39,15 @@
 	};
 
 	const init_webservice = (command) => {
-		const myUser = document.getElementById('hidden_user')?.value;
-		const myCourseID = document.getElementById('hidden_courseID')?.value;
-		const mySessionKey = document.getElementById('hidden_key')?.value;
-		const requestObject = { xml_command: 'listLib', library_name: 'Library', command: 'buildtree' };
-		if (myUser && mySessionKey && myCourseID) {
-			requestObject.user = myUser;
-			requestObject.session_key = mySessionKey;
-			requestObject.courseID = myCourseID;
-		} else {
-			alertToast('Missing hidden credentials', `user: ${myUser ?? 'uknown'}, session_key: ${
-				mySessionKey ?? 'unknown'}, courseID: ${myCourseID ?? 'unknown'}`);
-			return null;
-		}
-		requestObject.xml_command = command;
-		return requestObject;
+		return {
+			rpc_command: 'listLib',
+			library_name: 'Library',
+			command: 'buildtree',
+			user: document.getElementById('hidden_user')?.value,
+			key: document.getElementById('hidden_key')?.value,
+			courseID: document.getElementsByName('hidden_course_id')[0]?.value,
+			rpc_command: command
+		};
 	};
 
 	// Content request handling
@@ -79,31 +55,32 @@
 	const libSubjects = document.querySelector('select[name="library_subjects"]');
 	const libChapters = document.querySelector('select[name="library_chapters"]');
 	const libSections = document.querySelector('select[name="library_sections"]');
+	const libraryTextbook = document.querySelector('select[name="library_textbook"]');
+	const libraryChapter = document.querySelector('select[name="library_textchapter"]');
+	const librarySection = document.querySelector('select[name="library_textsection"]');
+	const includeOPL = document.querySelector('[name="includeOPL"]');
+	const includeContrib = document.querySelector('[name="includeContrib"]');
+
+	const countLine = document.getElementById('library_count_line');
 
 	const lib_update = async (who, what) => {
 		const child = { subjects: 'chapters', chapters: 'sections', sections: 'count' };
 
-		const all = `All ${who.charAt(0).toUpperCase()}${who.slice(1)}`;
-
 		const requestObject = init_webservice('searchLib');
-		if (!requestObject) return; // Missing credentials
-
-		const subj = libSubjects?.value ?? '';
-		const chap = libChapters?.value ?? '';
-		const sect = libSections?.value ?? '';
-
-		const lib_text = document.querySelector('[name="library_textbook"]')?.value ?? '';
-		const lib_textchap = document.querySelector('[name="library_textchapter"]')?.value ?? '';
-		const lib_textsect = document.querySelector('[name="library_textsection"]')?.value ?? '';
-
-		requestObject.library_subjects = subj === 'All Subjects' ? '' : subj;
-		requestObject.library_chapters = chap === 'All Chapters' ? '' : chap;
-		requestObject.library_sections = sect === 'All Sections' ? '' : sect;
-		requestObject.library_textbooks = lib_text === 'All Textbooks' ? '' : lib_text;
-		requestObject.library_textchapter = lib_textchap === 'All Chapters' ? '' : lib_textchap;
-		requestObject.library_textsection = lib_textsect === 'All Sections' ? '' : lib_textsect;
+		requestObject.library_subjects = libSubjects?.value ?? '';
+		requestObject.library_chapters = libChapters?.value ?? '';
+		requestObject.library_sections = libSections?.value ?? '';
+		requestObject.library_textbook = libraryTextbook?.value ?? '';
+		requestObject.library_textchapter = libraryChapter?.value ?? '';
+		requestObject.library_textsection = librarySection?.value ?? '';
+		requestObject.includeOPL = (includeOPL.type === 'checkbox' && includeOPL?.checked) ||
+			(includeOPL.type === 'hidden' && includeOPL.value) ? 1 : 0;
+		requestObject.includeContrib = includeContrib?.checked ? 1 : 0;
 
 		if (who == 'count') {
+			// Don't perform a count if there is no count line to update.
+			if (!countLine) return;
+
 			requestObject.command = 'countDBListings';
 
 			const controller = new AbortController();
@@ -120,30 +97,32 @@
 				clearTimeout(timeoutId);
 
 				if (!response.ok) {
-					const data = await response.text();
-					if (/WeBWorK error/.test(data)) reportWWerror(data);
-					else throw 'Unknown server communication error.';
+					throw 'Unknown server communication error.';
 				} else {
 					const data = await response.json();
-					const num = data.result_data[0];
-					document.getElementById('library_count_line').innerHTML = num === '1'
-						? 'There is 1 matching WeBWorK problem'
-						: `There are ${num} matching WeBWorK problems.`;
+					if (data.error) {
+						throw data.error;
+					} else {
+						const num = data.result_data[0];
+						countLine.firstElementChild.innerHTML = num === '1'
+							? 'There is 1 matching WeBWorK problem'
+							: `There are ${num} matching WeBWorK problems.`;
+					}
 				}
 			} catch (e) {
-				alertToast(basicWebserviceURL, e.message);
+				alertToast(basicWebserviceURL, e?.message ?? e);
 			}
 			return;
 		}
 
 		if (what == 'clear') {
-			setselect(`library_${who}`, [all]);
+			setselect(`library_${who}`, []);
 			lib_update(child[who], 'clear');
 			return;
 		}
 
-		if (who == 'chapters' && subj == '') { lib_update(who, 'clear'); return; }
-		if (who == 'sections' && chap == '') { lib_update(who, 'clear'); return; }
+		if (who == 'chapters' && requestObject.library_subjects == '') { lib_update(who, 'clear'); return; }
+		if (who == 'sections' && requestObject.library_chapters == '') { lib_update(who, 'clear'); return; }
 
 		requestObject.command = who == 'sections' ? 'getSectionListings' : 'getAllDBchapters';
 
@@ -161,24 +140,27 @@
 			clearTimeout(timeoutId);
 
 			if (!response.ok) {
-				const data = await response.text();
-				if (/WeBWorK error/.test(data)) reportWWerror(data);
-				else throw 'Unknown server communication error.';
+				throw 'Unknown server communication error.';
 			} else {
 				const data = await response.json();
-				const arr = data.result_data;
-				arr.unshift(all);
-				setselect(`library_${who}`, arr);
-				lib_update(child[who], 'clear');
+				if (data.error) {
+					throw data.error;
+				} else {
+					setselect(`library_${who}`, data.result_data);
+					lib_update(child[who], 'clear');
+				}
 			}
 		} catch (e) {
-			alertToast(basicWebserviceURL, e.message);
+			alertToast(basicWebserviceURL, e?.message ?? e);
 		}
 	};
 
 	const setselect = (selname, newarray) => {
 		const sel = document.querySelector(`[name="${selname}"]`);
+		// Save the 'all' option, remove all options, and then restore the 'all' option.
+		const select_all_option = sel.firstChild;
 		while (sel.firstChild) sel.lastChild.remove();
+		sel.append(select_all_option);
 		newarray.forEach((val) => {
 			const option = document.createElement('option');
 			option.value = val;
@@ -190,9 +172,19 @@
 	libChapters?.addEventListener('change', () => lib_update('sections', 'get'));
 	libSubjects?.addEventListener('change', () => lib_update('chapters', 'get'));
 	libSections?.addEventListener('change', () => lib_update('count', 'clear'));
+	includeOPL?.addEventListener('change', () => lib_update('count', 'clear'));
+	includeContrib?.addEventListener('change', () => lib_update('count', 'clear'));
 	document.querySelectorAll('input[name="level"]').forEach(
 		(level) => level.addEventListener('change', () => lib_update('count', 'clear')));
 
+	// Set up the advanced view selects to submit the form when changed.
+	const libraryBrowserForm = document.forms['library_browser_form'];
+	if (libraryBrowserForm) {
+		libraryTextbook?.addEventListener('change', () => libraryBrowserForm.submit());
+		libraryChapter?.addEventListener('change', () => libraryBrowserForm.submit());
+		librarySection?.addEventListener('change', () => libraryBrowserForm.submit());
+	}
+
 	// Add problems to target set
 	const addme = async (path, who) => {
 		const localSets = document.getElementById('local_sets');
@@ -204,7 +196,6 @@
 		}
 
 		const request = init_webservice('addProblem');
-		if (!request) return;
 		request.set_id = target;
 
 		const pathlist = [];
@@ -234,14 +225,14 @@
 				clearTimeout(timeoutId);
 
 				if (!response.ok) {
-					const data = await response.text();
-					if (/WeBWorK error/.test(data)) reportWWerror(data);
-					else throw 'Unknown server communication error.';
-					return;
+					throw 'Unknown server communication error.';
+				} else {
+					const data = await response.json();
+					if (data.error) throw data.error;
 				}
 			}
 		} catch (e) {
-			alertToast(basicWebserviceURL, e.message);
+			alertToast(basicWebserviceURL, e?.message ?? e);
 			return;
 		}
 
@@ -254,13 +245,13 @@
 			true);
 	};
 
-	document.querySelector('input[name="select_all"]')?.addEventListener('click', () => addme('', 'all'));
-	document.querySelectorAll('input[name="add_me"]')
+	document.querySelector('.library-action-btn.add-all-btn')?.addEventListener('click', () => addme('', 'all'));
+	document.querySelectorAll('button.add_me')
 		.forEach((btn) => btn.addEventListener('click', () => addme(btn.dataset.sourceFile, 'one')));
 
 	// Update the messages about which problems are in the current set.
 	const markinset = async () => {
-		const ro = init_webservice('listSetProblems');
+		const ro = init_webservice('listGlobalSetProblems');
 		ro.set_id = document.getElementById('local_sets')?.value;
 		ro.command = 'true';
 
@@ -279,20 +270,22 @@
 
 			if (response.ok) {
 				const data = await response.json();
-				const paths = data.result_data.map((problem) => problem.path);
-				const shownProbs = document.querySelectorAll('[name^="filetrial"]');
-				for (const shownProb of shownProbs) {
-					const inset = document.getElementById(`inset${shownProb.name.replace('filetrial', '')}`);
-					if (paths.includes(shownProb.value)) inset?.classList.remove('d-none');
-					else inset?.classList.add('d-none');
+				if (data.error) {
+					throw data.error;
+				} else {
+					const paths = data.result_data.map((problem) => problem.path);
+					const shownProbs = document.querySelectorAll('[name^="filetrial"]');
+					for (const shownProb of shownProbs) {
+						const inset = document.getElementById(`inset${shownProb.name.replace('filetrial', '')}`);
+						if (paths.includes(shownProb.value)) inset?.classList.remove('d-none');
+						else inset?.classList.add('d-none');
+					}
 				}
 			} else {
-				const data = await response.text();
-				if (/WeBWorK error/.test(data)) reportWWerror(data);
-				else throw 'Unknown server communication error.';
+				throw 'Unknown server communication error.';
 			}
 		} catch (e) {
-			alertToast(basicWebserviceURL, e.message);
+			alertToast(basicWebserviceURL, e?.message ?? e);
 		}
 	};
 
@@ -393,10 +386,10 @@
 
 		const mltIcon = document.getElementById(`mlt${cnt}`);
 		if(mltIcon.textContent == 'M') {
-			unshownAreas.forEach((area) => area.style.display = 'block');
+			unshownAreas.forEach((area) => area.classList.remove('d-none'));
 			// Render any problems that were hidden that have not yet been rendered.
 			for (const area of unshownAreas) {
-				const iframe = area.querySelector('iframe[id^=psr_render_iframe_]');
+				const iframe = area.querySelector('iframe[id^="problem_render_area_"][id$="_iframe"]');
 				if (iframe && iframe.iFrameResizer) iframe.iFrameResizer.resize();
 				else await render(area.id.match(/^pgrow(\d+)/)[1]);
 			}
@@ -406,7 +399,7 @@
 			new bootstrap.Tooltip(mltIcon, { fallbackPlacements: [] })
 			count = -count;
 		} else {
-			unshownAreas.forEach((area) => area.style.display = 'none');
+			unshownAreas.forEach((area) => area.classList.add('d-none'));
 			mltIcon.textContent = 'M';
 			mltIcon.dataset.bsTitle = mltIcon.dataset.moreText;
 			bootstrap.Tooltip.getInstance(mltIcon)?.dispose();
@@ -423,121 +416,27 @@
 		attachEventListeners(button, () => togglemlt(button.dataset.mltCnt, button.dataset.mltNoshowClass)));
 
 	// Problem rendering
-
-	const basicRendererURL = '/webwork2/html2xml';
-
 	const render = (id) => new Promise((resolve) => {
-		const renderArea = document.getElementById(`psr_render_area_${id}`);
+		const renderArea = document.getElementById(`problem_render_area_${id}`);
 		if (!renderArea) { resolve(); return; }
 
-		let iframe = renderArea.querySelector(`#psr_render_iframe_${id}`);
-		if (iframe && iframe.iFrameResizer) iframe.contentDocument.location.replace('about:blank');
-
-		const ro = {
-			userID: document.getElementById('hidden_user')?.value,
-			courseID: document.getElementById('hidden_courseID')?.value,
-			session_key: document.getElementById('hidden_key')?.value
-		};
-
-		if (!(ro.userID && ro.courseID && ro.session_key)) {
-			renderArea.innerHTML = '<div class="alert alert-danger p-1 mb-0 fw-bold">'
-				+ 'Missing hidden credentials: user, session_key, courseID</div>';
-			resolve();
-			return;
-		}
-
-		ro.sourceFilePath = renderArea.dataset.pgFile;
-		ro.outputformat = 'simple';
-		ro.showAnswerNumbers = 0;
-		ro.problemSeed = Math.floor((Math.random()*10000));
-		ro.showHints = document.querySelector('input[name="showHints"]')?.checked ? 1 : 0;
-		ro.showSolutions = document.querySelector('input[name="showSolutions"]')?.checked ? 1 : 0;
-		ro.noprepostambles = 1;
-		ro.processAnswers = 0;
-		ro.showFooter = 0;
-		ro.displayMode = document.querySelector('select[name="mydisplayMode"]').value ?? 'MathJax';
-		ro.language = document.querySelector('input[name="hidden_language"]')?.value ?? 'en';
-
 		// Abort if the display mode is not set to None
-		if (ro.displayMode === 'None') {
+		if (document.getElementById('problem_displaymode')?.value === 'None') {
 			while (renderArea.firstChild) renderArea.firstChild.remove();
 			resolve();
 			return;
 		}
 
-		ro.send_pg_flags = 1;
-		ro.extra_header_text = '<style>' +
-			'html{overflow-y:hidden;}body{padding:1px;background:#f5f5f5;}.container-fluid{padding:0px;}' +
-			'</style>';
-		if (window.location.port) ro.forcePortNumber = window.location.port;
-
-		const controller = new AbortController();
-		const timeoutId = setTimeout(() => controller.abort(), 10000);
-
-		fetch(basicRendererURL, {
-			method: 'post',
-			mode: 'same-origin',
-			body: new URLSearchParams(ro),
-			signal: controller.signal
-		}).then((response) => {
-			clearTimeout(timeoutId);
-			return response.json();
-		}).then((data) => {
-			// Give nicer session timeout error
-			if (!data.html || /Can\'t authenticate -- session may have timed out/i.test(data.html) ||
-				/Webservice.pm: Error when trying to authenticate./i.test(data.html)) {
-				renderArea.innerHTML = '<div class="alert alert-danger p-1 mb-0 fw-bold">'
-					+ "Can't authenticate -- session may have timed out.</div>";
-				resolve();
-				return;
-			}
-			// Give nicer file not found error
-			if (/this problem file was empty/i.test(data.html)) {
-				renderArea.innerHTML = '<div class="alert alert-danger p-1 mb-0 fw-bold">'
-					+ 'No Such File or Directory!</div>';
-				resolve();
-				return;
-			}
-			// Give nicer problem rendering error
-			if ((data.pg_flags && data.pg_flags.error_flag) ||
-				/error caught by translator while processing problem/i.test(data.html) ||
-				/error message for command: renderproblem/i.test(data.html)) {
-				renderArea.innerHTML = '<div class="alert alert-danger p-1 mb-0 fw-bold">'
-					+ 'There was an error rendering this problem!</div>';
-				resolve();
-				return;
-			}
-
-			if (!(iframe && iframe.iFrameResizer)) {
-				iframe = document.createElement('iframe');
-				iframe.id = `psr_render_iframe_${id}`;
-				iframe.style.border = 'none';
-				while (renderArea.firstChild) renderArea.firstChild.remove();
-				renderArea.append(iframe);
-
-				if (data.pg_flags && data.pg_flags.comment) {
-					const container = document.createElement('div');
-					container.innerHTML = data.pg_flags.comment;
-					iframe.after(container);
-				}
-				if (data.warnings) {
-					const container = document.createElement('div');
-					container.innerHTML = data.warnings;
-					iframe.after(container);
-				}
-				iFrameResize({ checkOrigin: false, warningTimeout: 20000, scrolling: 'omit' }, iframe);
-				iframe.addEventListener('load', () => resolve());
-			}
-			iframe.srcdoc = data.html;
-		}).catch((err) => {
-			renderArea.innerHTML = '<div class="alert alert-danger p-1 mb-0 fw-bold">'
-				+ `${basicRendererURL}: ${err.message}</div>`;
-			resolve();
-		});
+		webworkConfig.renderProblem(renderArea, {
+			sourceFilePath: renderArea.dataset.pgFile,
+			problemSeed: Math.floor(Math.random() * 10000),
+			showHints: document.querySelector('input[name="showHints"]')?.checked ? 1 : 0,
+			showSolutions: document.querySelector('input[name="showSolutions"]')?.checked ? 1 : 0
+		}).then(resolve);
 	});
 
 	// Find all render areas
-	const renderAreas = document.querySelectorAll('.psr_render_area');
+	const renderAreas = document.querySelectorAll('.rpc_render_area');
 
 	// Add the loading message to all render areas.
 	for (const renderArea of renderAreas) {
@@ -547,8 +446,9 @@
 	// Render all visible problems on the page
 	(async () => {
 		for (const renderArea of renderAreas) {
-			if (renderArea.style.display === 'none') continue;
-			await render(renderArea.id.match(/^psr_render_area_(\d+)/)[1]);
+			const id = renderArea.id.match(/^problem_render_area_(\d+)/)[1];
+			if (document.getElementById(`pgrow${id}`)?.classList.contains('d-none')) continue;
+			await render(id);
 		}
 	})();
 
diff --git a/htdocs/js/apps/ShowHide/show_hide.js b/htdocs/js/ShowHide/show_hide.js
similarity index 100%
rename from htdocs/js/apps/ShowHide/show_hide.js
rename to htdocs/js/ShowHide/show_hide.js
diff --git a/htdocs/js/Stats/stats.js b/htdocs/js/Stats/stats.js
new file mode 100644
index 0000000000..87d5a743d9
--- /dev/null
+++ b/htdocs/js/Stats/stats.js
@@ -0,0 +1,22 @@
+(() => {
+	// Hover action to show exact value of each bar.
+	document.querySelectorAll('.bar_graph_bar').forEach((el) => new bootstrap.Tooltip(el, { trigger: 'hover' }));
+
+	if (!webworkConfig.renderProblem) return;
+
+	const displayModeSelector = document.getElementById('problem_displaymode');
+
+	const render = () => {
+		webworkConfig.renderProblem('problem_render_area', {
+			set_id: document.getElementById('hidden_set_id')?.value,
+			probNum: document.getElementById('hidden_problem_id')?.value,
+			sourceFilePath: document.getElementById('hidden_source_file')?.value
+		});
+	};
+
+	// Render the problem on page load.
+	render();
+
+	// Re-render when a new display mode is selected.
+	displayModeSelector?.addEventListener('change', render);
+})();
diff --git a/htdocs/js/TagWidget/tagwidget.js b/htdocs/js/TagWidget/tagwidget.js
new file mode 100644
index 0000000000..3a54609b53
--- /dev/null
+++ b/htdocs/js/TagWidget/tagwidget.js
@@ -0,0 +1,328 @@
+'use strict';
+
+(async () => {
+	const tagWidgetScript = document.getElementById('tag-widget-script');
+	if (!tagWidgetScript || !tagWidgetScript.dataset.taxonomy) return;
+
+	// Add a container for message toasts.
+	const toastContainer = document.createElement('div');
+	toastContainer.classList.add('toast-container', 'position-fixed', 'bottom-0', 'end-0', 'p-3');
+	toastContainer.style.zIndex = 1060;
+	document.body.append(toastContainer);
+
+	// Convenience method for showing messages in a Bootstrap toast.
+	const showMessage = (message, success = false) => {
+		if (!message) return;
+
+		const toast = document.createElement('div');
+		toast.classList.add('toast', 'align-items-center', 'border-0');
+		toast.setAttribute('role', 'alert');
+		toast.setAttribute('aria-live', success ? 'polite' : 'assertive');
+		toast.setAttribute('aria-atomic', 'true');
+
+		const alert = document.createElement('div');
+		alert.classList.add('d-flex', 'alert', success ? 'alert-success' : 'alert-danger', 'p-0');
+		toast.append(alert);
+
+		const toastBody = document.createElement('div');
+		toastBody.classList.add('toast-body');
+		toastBody.textContent = message;
+
+		const closeButton = document.createElement('button');
+		closeButton.classList.add('btn-close', 'me-2', 'm-auto');
+		closeButton.type = 'button';
+		closeButton.dataset.bsDismiss = 'toast';
+		closeButton.setAttribute('aria-label', 'Close');
+
+		alert.append(toastBody, closeButton);
+
+		toastContainer.append(toast);
+
+		const bsToast = new bootstrap.Toast(toast, { delay: toastContainer.childElementCount * 5000 });
+		toast.addEventListener('hidden.bs.toast', () => {
+			bsToast.dispose();
+			toast.remove();
+		});
+		bsToast.show();
+	};
+
+	// Load the library taxonomy from the JSON file.
+	const response = await fetch(tagWidgetScript.dataset.taxonomy).catch(
+		(err) => `Could not load the OPL taxonomy from the server: ${err.messsage ?? err}`
+	);
+	if (typeof response === 'string') return showMessage(response);
+	if (!response.ok) return showMessage('Could not load the OPL taxonomy from the server.');
+
+	const taxonomy = await response.json();
+
+	const webServiceURL = `${webworkConfig?.webwork_url ?? '/webwork2'}/instructor_rpc`;
+
+	const readFromTaxonomy = (category, values) => {
+		const subjectTaxonomy = taxonomy;
+		if (category === 'subject') return subjectTaxonomy.map((subject) => subject.name);
+
+		const chapterTaxonomy = subjectTaxonomy.find((value) => value.name === values[0])?.subfields;
+		if (!chapterTaxonomy) return [];
+		if (category === 'chapter') return chapterTaxonomy.map((chapter) => chapter.name);
+
+		const sectionTaxonomy = chapterTaxonomy.find((value) => value.name === values[1])?.subfields;
+		if (!sectionTaxonomy) return [];
+		if (category === 'section') return sectionTaxonomy.map((section) => section['name']);
+
+		return []; // Should not get here
+	};
+
+	const createWebServiceObject = (command, values = {}) => {
+		return {
+			rpc_command: command,
+			library_name: 'Library',
+			command: 'searchLib',
+			user: document.getElementById('hidden_user')?.value,
+			courseID: document.getElementsByName('hidden_course_id')[0]?.value,
+			key: document.getElementById('hidden_key')?.value,
+			...values
+		};
+	};
+
+	class TagWidget {
+		constructor(filePath) {
+			this.filePath = filePath;
+		}
+
+		async show() {
+			await this.getTags();
+
+			if (!this.tags) return;
+
+			if (this.tags.DBsubject && /ZZZ/.test(this.tags.DBsubject)) {
+				showMessage('Problem file is a pointer to another file', true);
+				return;
+			}
+
+			const modal = document.createElement('div');
+			modal.classList.add('modal');
+			modal.ariaLabelledby = 'tag-editor';
+			modal.setAttribute('aria-hidden', 'true');
+			modal.tabIndex = -1;
+
+			const dialog = document.createElement('div');
+			dialog.classList.add('modal-dialog', 'modal-dialog-centered', 'modal-lg');
+			modal.append(dialog);
+
+			const content = document.createElement('div');
+			content.classList.add('modal-content');
+			dialog.append(content);
+
+			const header = document.createElement('div');
+			header.classList.add('modal-header');
+
+			const headerTitle = document.createElement('h1');
+			headerTitle.classList.add('modal-title', 'fs-4');
+			headerTitle.id = 'tag-editor';
+			headerTitle.textContent = 'Tag Editor';
+
+			const headerCloseButton = document.createElement('button');
+			headerCloseButton.type = 'button';
+			headerCloseButton.classList.add('btn-close');
+			headerCloseButton.dataset.bsDismiss = 'modal';
+			headerCloseButton.setAttribute('aria-label', 'Close');
+
+			header.append(headerTitle, headerCloseButton);
+
+			const body = document.createElement('div');
+			body.classList.add('modal-body');
+
+			for (const [select, label] of [
+				['subjectSelect', 'Subject'],
+				['chapterSelect', 'Chapter'],
+				['sectionSelect', 'Section'],
+				['levelSelect', 'Level']
+			]) {
+				const row = document.createElement('div');
+				row.classList.add('row', 'mb-2');
+
+				const labelEl = document.createElement('label');
+				labelEl.classList.add('col-sm-2', 'col-form-label');
+				labelEl.textContent = `${label}:`;
+				labelEl.setAttribute('for', select);
+
+				const selectColumn = document.createElement('div');
+				selectColumn.classList.add('col-sm-10');
+				row.append(labelEl, selectColumn);
+
+				this[select] = document.createElement('select');
+				this[select].id = select;
+				this[select].classList.add('form-select');
+				this[select].add(new Option(`Select ${label}`, '', true));
+				selectColumn.append(this[select]);
+
+				body.append(row);
+			}
+
+			this.subjectSelect.addEventListener('change', () =>
+				this.update('chapter', { DBsubject: '', DBchapter: '', DBsection: '' })
+			);
+
+			this.chapterSelect.addEventListener('change', () =>
+				this.update('section', { DBsubject: '', DBchapter: '', DBsection: '' })
+			);
+
+			for (const j of Array(6).keys()) {
+				this.levelSelect.add(new Option(j + 1));
+			}
+
+			// Show the status menu if this is a problem in "Pending".
+			if (/^Pending\//.test(this.filePath.replace(/^.*templates\//, ''))) {
+				const statusRow = document.createElement('div');
+				statusRow.classList.add('row', 'mt-2');
+
+				const statusLabel = document.createElement('label');
+				statusLabel.classList.add('col-sm-2', 'col-form-label');
+				statusLabel.textContent = 'Status:';
+				statusLabel.setAttribute('for', 'statusSelect');
+
+				const statusColumn = document.createElement('div');
+				statusColumn.classList.add('col-sm-10');
+				statusRow.append(statusLabel, statusColumn);
+
+				this.statusSelect = document.createElement('select');
+				this.statusSelect.id = 'statusSelect';
+				this.statusSelect.classList.add('form-select');
+				for (const value of [
+					['Accept', 'A'],
+					['Review', '0', true, true],
+					['Reject', 'R'],
+					['Further', 'F'],
+					['Needs Resource', 'N']
+				]) {
+					this.statusSelect.add(new Option(...value));
+				}
+				statusColumn.append(this.statusSelect);
+
+				body.append(statusRow);
+			}
+
+			const footer = document.createElement('div');
+			footer.classList.add('modal-footer');
+
+			this.saveButton = document.createElement('button');
+			this.saveButton.type = 'button';
+			this.saveButton.classList.add('btn', 'btn-primary');
+			this.saveButton.textContent = 'Save';
+			this.saveButton.addEventListener('click', () => this.savetags());
+
+			const closeButton = document.createElement('button');
+			closeButton.type = 'button';
+			closeButton.classList.add('btn', 'btn-secondary');
+			closeButton.dataset.bsDismiss = 'modal';
+			closeButton.textContent = 'Close';
+
+			footer.append(this.saveButton, closeButton);
+
+			content.append(header, body, footer);
+
+			modal.addEventListener('shown.bs.modal', () => this.update('subject', this.tags));
+			modal.addEventListener('hidden.bs.modal', () => {
+				this.bsModal.dispose();
+				modal.remove();
+			});
+
+			this.bsModal = new bootstrap.Modal(modal);
+			this.bsModal.show();
+		}
+
+		async getTags() {
+			const response = await fetch(webServiceURL, {
+				method: 'post',
+				mode: 'same-origin',
+				body: new URLSearchParams(createWebServiceObject('getProblemTags', { command: this.filePath }))
+			}).catch((err) => `Error requesting problem tags: ${err.message ?? err}`);
+			if (typeof response === 'string') return showMessage(response);
+			if (!response.ok) return showMessage('Unable to obtain problem tags.');
+			const data = await response.json();
+			if (data.error) return showMessage(data.error);
+			this.tags = data.result_data;
+		}
+
+		update(category, values, clear = false) {
+			if (category === 'level') {
+				if (values.Level) this.levelSelect.value = values.Level;
+				return this.update('status', values);
+			}
+			if (category === 'status') {
+				if (this.statusSelect && values.Status) this.statusSelect.value = values.Status;
+				return;
+			}
+
+			const child = {
+				subject: 'chapter',
+				chapter: 'section',
+				section: 'level'
+			};
+
+			const defaultOption = `Select ${category.charAt(0).toUpperCase() + category.slice(1)}`;
+
+			if (clear) {
+				this.setSelect(category, defaultOption);
+				return this.update(child[category], values);
+			}
+
+			const subject = values.DBsubject || this.subjectSelect.value;
+			const chapter = values.DBchapter || this.chapterSelect.value;
+			const section = values.DBsection || this.sectionSelect.value;
+
+			if (category === 'chapter' && subject === '') return this.update(category, values, true);
+			if (category === 'section' && chapter === '') return this.update(category, values, true);
+
+			this.setSelect(category, defaultOption, readFromTaxonomy(category, [subject, chapter, section]), values);
+
+			this.update(child[category], values);
+		}
+
+		setSelect(category, defaultOption, options = [], values = {}) {
+			const select = this[`${category}Select`];
+			while (select.lastChild) select.firstChild.remove();
+
+			const currentValue = values[`DB${category}`];
+
+			select.add(new Option(defaultOption, '', true, !!currentValue));
+
+			for (const option of options) {
+				select.add(new Option(option, option, false, option === currentValue));
+			}
+
+			if (currentValue && !select.value) {
+				showMessage(`Provided ${category} "${currentValue}" is not in the taxonomy.`);
+				select.remove(0);
+				select.add(new Option(currentValue, currentValue, false, true), 0);
+			}
+		}
+
+		async savetags() {
+			const response = await fetch(webServiceURL, {
+				method: 'post',
+				mode: 'same-origin',
+				body: new URLSearchParams(
+					createWebServiceObject('setProblemTags', {
+						library_subjects: this.subjectSelect.value,
+						library_chapters: this.chapterSelect.value,
+						library_sections: this.sectionSelect.value,
+						library_levels: this.levelSelect.value,
+						library_status: this.statusSelect?.value ?? '0',
+						command: this.filePath
+					})
+				)
+			}).catch((err) => `Error saving problem tags: ${err.message ?? err}`);
+			if (typeof response === 'string') return showMessage(response);
+			if (!response.ok) return showMessage('Unable to save problem tags.');
+			const data = await response.json();
+			if (data.error) return showMessage(data.error);
+			showMessage(data.server_response);
+		}
+	}
+
+	for (const tagEditButton of document.querySelectorAll('.tag-edit-btn')) {
+		if (!tagEditButton.dataset.sourceFile) return;
+		tagEditButton.addEventListener('click', () => new TagWidget(tagEditButton.dataset.sourceFile).show());
+	}
+})();
diff --git a/htdocs/js/apps/UserDetail/userdetail.js b/htdocs/js/UserDetail/userdetail.js
similarity index 100%
rename from htdocs/js/apps/UserDetail/userdetail.js
rename to htdocs/js/UserDetail/userdetail.js
diff --git a/htdocs/js/apps/UserList/userlist.js b/htdocs/js/UserList/userlist.js
similarity index 53%
rename from htdocs/js/apps/UserList/userlist.js
rename to htdocs/js/UserList/userlist.js
index 89cd65cc41..ec41c40e0f 100644
--- a/htdocs/js/apps/UserList/userlist.js
+++ b/htdocs/js/UserList/userlist.js
@@ -25,4 +25,31 @@
 		export_select_target.addEventListener('change', classlist_add_export_elements);
 		classlist_add_export_elements();
 	}
+
+	// Submit the user list form when a sort header is clicked or enter or space is pressed when it has focus.
+	const userListForm = document.forms['userlist'];
+	const currentAction = document.getElementById('current_action');
+
+	if (userListForm && currentAction) {
+		for (const header of document.querySelectorAll('.sort-header')) {
+			const submitSortMethod = (e) => {
+				e.preventDefault();
+
+				currentAction.value = '';
+
+				const sortInput = document.createElement('input');
+				sortInput.name = 'labelSortMethod';
+				sortInput.value = header.dataset.sortField;
+				sortInput.type = 'hidden';
+				userListForm.append(sortInput);
+
+				userListForm.submit();
+			};
+
+			header.addEventListener('click', submitSortMethod);
+			header.addEventListener('keydown', (e) => {
+				if (e.key === ' ' || e.key === 'Enter') submitSortMethod(e);
+			});
+		}
+	}
 })();
diff --git a/htdocs/js/apps/ActionTabs/actiontabs.js b/htdocs/js/apps/ActionTabs/actiontabs.js
deleted file mode 100644
index 4cfe776a0f..0000000000
--- a/htdocs/js/apps/ActionTabs/actiontabs.js
+++ /dev/null
@@ -1,6 +0,0 @@
-document.querySelectorAll('.action-link').forEach((actionLink) => {
-	actionLink.addEventListener('click', () => {
-		actionLink.blur();
-		document.getElementById("current_action").value = actionLink.dataset.action;
-	});
-});
diff --git a/htdocs/js/apps/PGProblemEditor/pgproblemeditor.js b/htdocs/js/apps/PGProblemEditor/pgproblemeditor.js
deleted file mode 100644
index 7a50b8cbca..0000000000
--- a/htdocs/js/apps/PGProblemEditor/pgproblemeditor.js
+++ /dev/null
@@ -1,64 +0,0 @@
-(function () {
-	const bsModal = new bootstrap.Modal(document.getElementById('render-modal'), { keyboard: true, show: false });
-
-	let busyIndicator = null;
-
-	const removeBusyIndicator = () => {
-		if (busyIndicator) {
-			busyIndicator.remove();
-			busyIndicator = null;
-		}
-	};
-
-	const frame = document.getElementById('pg_editor_frame_id');
-	frame?.addEventListener('load', () => {
-		removeBusyIndicator();
-		if (frame.contentDocument.URL == 'about:blank') return;
-		const style = frame.contentDocument.createElement('style');
-		style.type = 'text/css';
-		style.textContent = '#site-navigation,#toggle-sidebar,#masthead,#breadcrumb-row,' +
-			'#footer,.sticky-nav{display:none !important;}';
-		frame.contentDocument.head.appendChild(style);
-		frame.contentDocument.getElementById('content').classList.remove('col-md-10');
-		frame.contentWindow.addEventListener('resize',
-			() => frame.contentDocument.getElementById('content').classList.remove('col-md-10')
-		);
-	});
-
-	document.getElementById('submit_button_id')?.addEventListener('click', () => {
-		const actionView = document.getElementById('view');
-		const actionSave = document.getElementById('save');
-
-		let target = "_self";
-		if (actionView && actionView.classList.contains('active'))
-			target = document.getElementById("newWindowView").checked ? "WW_View" : "pg_editor_frame";
-		else if (actionSave && actionSave.classList.contains('active'))
-			target = document.getElementById("newWindowSave").checked ? "WW_View" : "pg_editor_frame";
-
-		document.getElementById('editor').target = target;
-
-		if (target == "pg_editor_frame") {
-			bsModal.show();
-			busyIndicator = document.createElement('div');
-			busyIndicator.classList.add('page-loading-busy-indicator');
-			busyIndicator.innerHTML = '<div class="busy-text"><h2>Loading...</h2></div>' +
-				'<div><i class="fas fa-circle-notch fa-spin fa-3x"></i></div>' +
-				'<div class="busy-text">Press escape to cancel</div>';
-			busyIndicator.tabIndex = -1;
-			bsModal._element.querySelector('.modal-body')?.appendChild(busyIndicator);
-			busyIndicator.focus();
-
-			// Allow the user to cancel loading of the iframe by pressing escape.
-			busyIndicator.addEventListener('keydown', (e) => {
-				if (e.key === 'Escape') {
-					removeBusyIndicator();
-					window.stop();
-				}
-			});
-		}
-	});
-
-	document.getElementById('randomize_view_seed_id')?.addEventListener('click', () => {
-		document.getElementById('action_view_seed_id').value = Math.ceil(Math.random()*9999);
-	});
-})();
diff --git a/htdocs/js/apps/ProblemGrader/problemgrader.js b/htdocs/js/apps/ProblemGrader/problemgrader.js
deleted file mode 100644
index 13c92289b4..0000000000
--- a/htdocs/js/apps/ProblemGrader/problemgrader.js
+++ /dev/null
@@ -1,150 +0,0 @@
-'use strict';
-
-(() => {
-	// Comment preview popovers.
-	document.querySelectorAll('.preview').forEach((el) => {
-		el.addEventListener('click', () => {
-			el.dataset.bsContent =
-				el.parentNode.querySelector('textarea')?.value.replace(/</g, '< ').replace(/>/g, ' >');
-			if (el.dataset.bsContent) {
-				const popover = new bootstrap.Popover(el, {
-					html: true, trigger: 'focus', placement: 'bottom', delay: { show: 0, hide: 200 }
-				});
-				el.addEventListener('hidden.bs.popover', () => popover.dispose(), { once: true });
-				popover.show();
-				if (window.MathJax) {
-					MathJax.startup.promise = MathJax.startup.promise.then(
-						() => MathJax.typesetPromise(['.popover-body'])
-					);
-				}
-			}
-		});
-	});
-
-	// Check all button for the general problem grader.
-	document.getElementById('check_all_mark_corrects')?.addEventListener('click', () =>
-		document.querySelectorAll('.mark_correct').forEach((check) => {
-			if (check.checked) check.checked = false;
-			else check.checked = true;
-		})
-	);
-
-	// Compute the problem score from any answer sub scores, and update the problem score input.
-	document.querySelectorAll('.answer-part-score').forEach((part) => {
-		part.addEventListener('input', () => {
-			const problemId = part.dataset.problemId;
-			const answerLabels = JSON.parse(part.dataset.answerLabels);
-
-			if (!part.checkValidity()) part.classList.add('is-invalid');
-			else part.classList.remove('is-invalid');
-
-			let score = 0;
-			answerLabels.forEach((label) => {
-				const partElt = document.getElementById(`score_problem${problemId}_${label}`);
-				score += partElt.value * partElt.dataset.weight;
-			});
-			document.getElementById(`score_problem${problemId}`).value = Math.round(score);
-			document.getElementById(`grader_messages_problem${problemId}`).innerHTML = '';
-		});
-	});
-
-	// Clear messages when the score or comment are changed.
-	document.querySelectorAll('.problem-score,.grader-problem-comment').forEach((el) => {
-		el.addEventListener('input', () => {
-			if (!el.checkValidity()) el.classList.add('is-invalid');
-			else el.classList.remove('is-invalid');
-
-			document.getElementById(`grader_messages_problem${el.dataset.problemId}`).innerHTML = '';
-		});
-	});
-
-	// Save the score and comment.
-	document.querySelectorAll('.save-grade').forEach((saveButton) => {
-		saveButton.addEventListener('click', () => {
-			const saveData = saveButton.dataset;
-
-			const user = document.getElementById('hidden_user').value;
-			const sessionKey = document.getElementById('hidden_key').value;
-
-			const messageArea = document.getElementById(`grader_messages_problem${saveData.problemId}`);
-
-			const scoreInput = document.getElementById('score_problem' + saveData.problemId);
-			if (!scoreInput.checkValidity()) {
-				messageArea.classList.add('alert-danger');
-				messageArea.textContent = scoreInput.validationMessage;
-				setTimeout(() => messageArea.classList.remove('alert-danger'), 100);
-				scoreInput.focus();
-				return;
-			}
-
-			// FIXME: /webwork2/ should not be hard coded here.
-			// Save the score.
-			const basicWebserviceURL = '/webwork2/instructorXMLHandler';
-			$.ajax(basicWebserviceURL, {
-				type: 'post',
-				data: {
-					user: user,
-					session_key: sessionKey,
-					xml_command: saveData.versionId !== '0' ? 'putProblemVersion' : 'putUserProblem',
-					courseID: saveData.courseId,
-					user_id: saveData.studentId,
-					set_id: saveData.setId,
-					version_id: saveData.versionId,
-					problem_id: saveData.problemId,
-					status: parseInt(scoreInput.value) / 100
-				},
-				timeout: 10000,
-				success: () => {
-					// Update the hidden problem status fields and score table for gateway quizzes
-					if (saveData.versionId !== '0') {
-						for (const scoreCell of document.querySelectorAll(
-							`table.gwNavigation td.score[data-problem-id="${saveData.problemId}"]`)) {
-							scoreCell.textContent = scoreInput.value == '100' ? '\u{1F4AF}' : scoreInput.value;
-						}
-						document.gwquiz.elements['probstatus' + saveData.problemId].value =
-							parseInt(scoreInput.value) / 100;
-					}
-
-					if (saveData.pastAnswerId !== '0') {
-						// Save the comment.
-						const comment = document.getElementById(`comment_problem${saveData.problemId}`)?.value;
-						$.ajax(basicWebserviceURL, {
-							type: 'post',
-							data: {
-								user: user,
-								session_key: sessionKey,
-								xml_command: 'putPastAnswer',
-								courseID: saveData.courseId,
-								answer_id: saveData.pastAnswerId,
-								comment_string: comment
-							},
-							timeout: 10000,
-							success: () => {
-								messageArea.classList.add('alert-success');
-								messageArea.textContent = 'Score and comment saved.';
-								setTimeout(() => messageArea.classList.remove('alert-success'), 100);
-							},
-							error: (data) => {
-								messageArea.classList.add('alert-danger');
-								messageArea.innerHTML =
-									'<div>The score was saved, but there was an error saving the comment.</div>' +
-									`<div>${basicWebserviceURL} response: ${data.statusText}</div>`;
-								setTimeout(() => messageArea.classList.remove('alert-danger'), 100);
-							},
-						});
-					} else {
-						messageArea.classList.add('alert-success');
-						messageArea.textContent = 'Score saved.';
-						setTimeout(() => messageArea.classList.remove('alert-success'), 100);
-					}
-				},
-				error: function (data) {
-					messageArea.classList.add('alert-danger');
-					messageArea.innerHTML = '<div>Error saving score.</div>' +
-						`<div>${basicWebserviceURL} response: ${data.statusText}</div>`;
-					setTimeout(() => messageArea.classList.remove('alert-danger', 100));
-				},
-			});
-		});
-	})
-})();
diff --git a/htdocs/js/apps/TagWidget/tagwidget.js b/htdocs/js/apps/TagWidget/tagwidget.js
deleted file mode 100644
index 069ad67a42..0000000000
--- a/htdocs/js/apps/TagWidget/tagwidget.js
+++ /dev/null
@@ -1,282 +0,0 @@
-// Setup for ajax
-(async () => {
-	// Load the library taxonomy from the JSON file.
-	const tagWidgetScript = document.getElementById('tag-widget-script');
-	if (!tagWidgetScript || !tagWidgetScript.dataset.taxo) return;
-
-	const response = await fetch(tagWidgetScript.dataset.taxo);
-	if (!response.ok) {
-		alert('Could not load the OPL taxonomy from the server.')
-		return;
-	}
-
-	const taxo = await response.json();
-
-	const basicWebserviceURL = '/webwork2/instructorXMLHandler';
-
-	function readfromtaxo(who, valarray) {
-		var mytaxo = taxo;
-		if (who == 'subjects') {
-			return mytaxo.map(function(z) {return z['name'];} );
-		}
-		var failed = true;
-		for(var i=0; i<mytaxo.length; i++) {
-			if(mytaxo[i]['name'] == valarray[0]) {
-				mytaxo = mytaxo[i]['subfields'];
-				failed=false;
-				break;
-			}
-		}
-		if(failed) {
-			alert('Provided value "' + valarray[0] + '" is not in my subject taxonomy. ' );
-			return([]);
-		}
-		if(who == 'chapters') {
-			return(mytaxo.map(function(z) {return(z['name']);} ));
-		}
-		failed = true;
-		for(var i=0; i<mytaxo.length; i++) {
-			if(mytaxo[i]['name'] == valarray[1]) {
-				mytaxo = mytaxo[i]['subfields'];
-				failed=false;
-				break;
-			}
-		}
-		if(failed) {
-			alert('Provided value "'+ valarray[1] + '" is not in my chapter taxonomy. ' );
-			return([]);
-		}
-		if(who == 'sections') {
-			return mytaxo.map(function(z) {return(z['name']);} );
-		}
-		return([]); // Should not get here
-	}
-
-	function init_webservice(command) {
-		const myUser = $('#hidden_user').val();
-		const myCourseID = $('#hidden_courseID').val();
-		const mySessionKey = $('#hidden_key').val();
-		const requestObject = {
-			'xml_command': 'listLib',
-			'library_name': 'Library',
-			'command': 'searchLib'
-		};
-		if (myUser && mySessionKey && myCourseID) {
-			requestObject.user = myUser;
-			requestObject.session_key = mySessionKey;
-			requestObject.courseID = myCourseID;
-		} else {
-			alert("missing hidden credentials: user "
-				+ myUser + " session_key " + mySessionKey+ " courseID "
-				+ myCourseID, "alert-danger");
-			return null;
-		}
-		requestObject.xml_command = command;
-		return requestObject;
-	}
-
-
-	// New object
-	function tag_widget(el, path) {
-		const id = el.id;
-
-		var nodata = {'DBsubject': '', 'DBchapter': '', 'DBsection': ''};
-
-		var $el = $(el);
-		$el.html('<b>Edit tags:</b> ');
-		$el.append('<select id="'+id+'subjects"></select>');
-		var subj = $('#'+id+'subjects');
-		subj.append('<option value="All Subjects">All Subjects</option>');
-		$el.append('<select id="'+id+'chapters"></select>');
-		var chap = $('#'+id+'chapters');
-		chap.append('<option value="All Chapters">All Chapters</option>');
-		$el.append('<select id="'+id+'sections"></select>');
-		var sect = $('#'+id+'sections');
-		sect.append('<option value="All Sections">All Sections</option>');
-		$el.append('<select id="'+id+'level"></select>');
-		var levels = $('#'+id+'level');
-		levels.append('<option value="">Level</option>');
-		for (var j=1; j<7; j++) {
-			levels.append('<option value="'+j+'">'+j+'</option>');
-		}
-		// Only show the status menu if we are looking at something in Pending
-		var shortpath = path.replace(/^.*templates\//,'');
-		if(/^Pending\//.test(shortpath)) {
-
-			$el.append('<select id="'+id+'stat"></select>');
-			var stat = $('#'+id+'stat');
-			stat.append('<option value="A">Accept</option>');
-			stat.append('<option value="0">Review</option>');
-			stat.append('<option value="R">Reject</option>');
-			stat.append('<option value="F">Further review</option>');
-			stat.append('<option value="N">Needs resource</option>');
-		}
-		subj.on('change', function() {tag_widget_clear_message(id);tag_widget_update('chapters', 'get', id, nodata);});
-		chap.on('change', function() {tag_widget_clear_message(id);tag_widget_update('sections', 'get', id, nodata);});
-		sect.on('change', function() {tag_widget_clear_message(id);});
-		this.tw_gettags(path, id);
-		$el.append('<button id="'+id+'Save">Save</button>');
-		$('#'+id+'Save').on('click', function() {tag_widget_savetags(id, path);return false;});
-		$el.append('<span id="'+id+'result"></span>');
-		return false;
-	}
-
-	tag_widget.prototype.tw_gettags = function(path, id) {
-		var requestObject = init_webservice('getProblemTags');
-		// console.log("In tw_gettags");
-		if(requestObject == null) {
-			// We failed
-			return false;
-		}
-		requestObject.command = path;
-		// console.log(requestObject);
-		return $.post(basicWebserviceURL, requestObject, function (data) {
-			var response = JSON.parse(data);
-			var dat = response.result_data;
-			// console.log(dat);
-			tag_widget_update('subjects', 'get', id, dat);
-		});
-	}
-
-	tag_widget_savetags = function(id, path) {
-		var requestObject = init_webservice('setProblemTags');
-		if(requestObject == null) {
-			// We failed
-			return false;
-		}
-		var subj = $('#'+id+'subjects').find(':selected').text();
-		var chap = $('#'+id+'chapters').find(':selected').text();
-		var sect = $('#'+id+'sections').find(':selected').text();
-		var level = $('#'+id+'level').find(':selected').text();
-		var stat = $('#'+id+'stat').find(':selected').val();
-		if(subj == 'All Subjects') { subj = '';};
-		if(chap == 'All Chapters') { chap = '';};
-		if(sect == 'All Sections') { sect = '';};
-		if(level == 'Level') { level = '';};
-		requestObject.library_subjects = subj;
-		requestObject.library_chapters = chap;
-		requestObject.library_sections = sect;
-		requestObject.library_levels = level;
-		requestObject.library_status = stat;
-		requestObject.command = path;
-		// console.log(requestObject);
-		return $.post(basicWebserviceURL, requestObject, function (data) {
-			var response = JSON.parse(data);
-			var mesg = response.server_response;
-			// console.log(response);
-			$('#'+id+'result').text(mesg);
-		});
-	}
-
-	tag_widget_clear_message = function(id) {
-		$('#'+id+'result').text('');
-	}
-
-	tag_widget_update = function(who, what, where, values) {
-		// where is the start of the id's for the parts
-		const child = {
-			subjects: 'chapters',
-			chapters: 'sections',
-			sections: 'level',
-			level: 'stat',
-			stat: 'count'
-		};
-
-		// console.log({"who": who, "what": what, "where":where, "values": values});
-		var all = 'All ' + capFirstLetter(who);
-		if(who=='level') {
-			all = 'Level';
-		}
-
-		if(who=='count') {
-			return false;
-		}
-		if(!values.DBsubject && values.DBsubject.match(/ZZZ/)) {
-			$('#'+where+'subjects').remove();
-			$('#'+where+'chapters').remove();
-			$('#'+where+'sections').remove();
-			$('#'+where+'level').remove();
-			$('#'+where+'stat').remove();
-			$('#'+where+'Save').remove();
-			$('#'+where+'result').text(' Problem file is a pointer to another file');
-			return false;
-		}
-		var requestObject = init_webservice('searchLib');
-		if(requestObject == null) {
-			// We failed
-			return false;
-		}
-		var subj = $('#'+where+'subjects').find(':selected').text();
-		var chap = $('#'+where+'chapters').find(':selected').text();
-		var sect = $('#'+where+'sections').find(':selected').text();
-		var level = $('#'+where+'level').find(':selected').text();
-		var stat = $('#'+where+'stat').find(':selected').val();
-		if(subj == 'All Subjects') { subj = '';};
-		if(chap == 'All Chapters') { chap = '';};
-		if(sect == 'All Sections') { sect = '';};
-		if(level == 'Level') { level = '';};
-		// Now override in case we were fed values
-		if(values.DBsubject) { subj = values.DBsubject;}
-		if(values.DBchapter) { chap = values.DBchapter;}
-		if(values.DBsection) { sect = values.DBsection;}
-		if(values.Level) { level = values.Level;}
-		if(values.Status) { stat = values.Status;} else { stat = "0" }
-		requestObject.library_subjects = subj;
-		requestObject.library_chapters = chap;
-		requestObject.library_sections = sect;
-		var subcommand = "getAllDBsubjects";
-		if(who == 'level') {
-			$('#'+where+who).val(level);
-			return tag_widget_update('stat','get',where,values);
-		}
-		if(who == 'stat') {
-			$('#'+where+who).val(stat);
-			return true;
-		}
-		if(what == 'clear') {
-			setselectbyid(where+who, [all]);
-			return tag_widget_update(child[who], 'clear',where, values);
-		}
-		if(who=='chapters' && subj=='') { return tag_widget_update(who, 'clear', where, values); }
-		if(who=='sections' && chap=='') { return tag_widget_update(who, 'clear', where, values); }
-		if(who=='chapters') { subcommand = "getAllDBchapters";}
-		if(who=='sections') { subcommand = "getSectionListings";}
-		requestObject.command = subcommand;
-		// console.log("Setting menu "+where+who);
-		// console.log(requestObject);
-		var arr = readfromtaxo(who, [subj, chap, sect]);
-		arr.splice(0,0,all);
-		setselectbyid(where+who, arr);
-		if(values.DBsubject && who=='subjects') {
-			$('#'+where+who).val(values.DBsubject);
-		}
-		if(values.DBchapter && who=='chapters') {
-			$('#'+where+who).val(values.DBchapter);
-		}
-		if(values.DBsection && who=='sections') {
-			$('#'+where+who).val(values.DBsection);
-		}
-		tag_widget_update(child[who], 'get',where, values);
-		return true;
-	}
-
-	// Two utility functions
-	function setselectbyid(id, newarray) {
-		var sel = $('#'+id);
-		// console.log("Setting "+id);
-		sel.empty();
-		$.each(newarray, function(_i,val) {
-			sel.append($("<option></option>").val(val).html(val));
-		});
-	}
-
-	function capFirstLetter(string) {
-		return string.charAt(0).toUpperCase() + string.slice(1);
-	}
-
-	document.querySelectorAll('.tag-widget').forEach(
-		(tagger) => {
-			if (!tagger.dataset.sourceFilePath) return;
-			new tag_widget(tagger, tagger.dataset.sourceFilePath);
-		});
-})();
diff --git a/htdocs/js/legacy/sketchgraphhtml5b/SketchGraph.html b/htdocs/js/legacy/sketchgraphhtml5b/SketchGraph.html
deleted file mode 100644
index 43212a2c4c..0000000000
--- a/htdocs/js/legacy/sketchgraphhtml5b/SketchGraph.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<html>
-<head>
-<title>Trivial HTML5</title>
-<script language="javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
-<script language="javascript" src="processing-dgfix.js"></script>
-<script>
-//set your limits here
-var xmin = -10, xmax = 10, ymin = -5, ymax = 5;
-var points;
-var showGrid = true;
-var yValues = new Array();
-var derivatives = new Array();
-
-//-------------------  Listeners ---------------------------
-    //had to add the listeners with javascript
-    //because it's not currently possible to reference processing methods from the html
-    
-    //reset the graph to 0
-    function reset() {
-      for (var i = 0; i < points; i++) {
-        yValues[i] = 0.5;
-        derivatives[i] = 0;
-      }
-    }
-    
-    //toggle grid
-    function toggleGrid() {
-      showGrid = !showGrid;
-    }
-    
-    //smooth the current graph 
-    function smooth() {
-      var newPoints = new Array(points);
-      for (var i = 0; i < points; i++) {
-        var sum = 0.3 * yValues[i];
-        sum += 0.2 * (i > 0? yValues[i-1] : yValues[i]);
-        sum += 0.2 * (i < points-1? yValues[i+1] : yValues[i]);
-        sum += 0.1 * (i > 1? yValues[i-2] : yValues[i]);
-        sum += 0.1 * (i < points - 2? yValues[i+2] : yValues[i]);
-        sum += 0.05 * (i > 2? yValues[i-3] : yValues[i]);
-        sum += 0.05 * (i < points - 3? yValues[i+3] : yValues[i]);
-        newPoints[i] = sum;
-      }
-      yValues = newPoints;
-    }
-    
-    //grab points from graph and print
-    function getPoints() {
-      var temp = "";
-      for(var i = 0; i < points; i++){
-        temp += xmin + i*(xmax-xmin)/(points-1) + " ";
-        temp += ymin + yValues[i]*(ymax - ymin) + " ";
-        var dx = 1.0/points * (xmax - xmin);
-        if (i == 0)
-          temp += (yValues[1] - yValues[0])*(ymax-ymin)/dx + "\n";
-        else if (i == points-1)
-          temp += (yValues[points-1] - yValues[points-2])*(ymax-ymin)/dx + "\n";
-        else {
-          var i = i;
-          var left = Math.abs(yValues[i] - yValues[i-1]);
-          var right = Math.abs(yValues[i+1] - yValues[i]);
-          if (left < 1e-20 || right < 1e-20)
-            temp += 0 + "\n";
-          else
-            temp += ((1/right)*(yValues[i+1]-yValues[i]) - (1/left)*(yValues[i]-yValues[i-1]))/(2*dx*((1/right)+(1/left))) + "\n";
-        }
-      }
-      $('#pointDisplay').val(temp);
-    }
-    
-    //load points from y-values
-    function setPoints() {
-      var tempString = $('#points').val();
-      var tempPoints = tempString.split(',');
-      var vals = new Array(tempPoints.length);
-      for(var i = 0; i < tempPoints.length; i++){
-        vals[i] = parseInt(tempPoints[i]);
-      }
-      points = vals.length;
-      yValues = new Array(points);
-      derivatives = [points];
-      for (var i = 0; i < points; i++)
-        yValues[i] = 0.5;
-      for (var i = 0; i < vals.length; i++) {
-        if (vals[i] > ymax)
-          yValues[i] = 1;
-        else if (vals[i] < ymin)
-          yValues[i] = 0;
-        else
-          yValues[i] = (vals[i]-ymin)/(ymax-ymin);
-      }
-    }
-</script>
-</head>
-<body>
-
-<canvas data-src="SketchGraph.pjs" id="cv" width="200" height="200"></canvas>  
-<br/>
-<p>
-Y-values: 
-<input type="text" id="points" size=50 ></input>
-<button type="button" id="setPts" onClick="setPoints();">Set</button>
-<br><br>
-
-<button type="button" id="hideGrid" onClick="toggleGrid();">Toggle Grid</button>
-<button type="button" id="reset" onClick="reset();">Reset to Zero</button>
-<button type="button" id="smooth" onClick="smooth();">Smooth</button>
-<br><br>
-<button type="button" id="getPts" onClick="getPoints();">Get Points</button><br/>
-<textarea id="pointDisplay" rows=10 cols=60></textarea>
-</p>
-
-</body>
-</html>
diff --git a/htdocs/js/legacy/sketchgraphhtml5b/SketchGraph.pjs b/htdocs/js/legacy/sketchgraphhtml5b/SketchGraph.pjs
deleted file mode 100644
index ef71b6eae2..0000000000
--- a/htdocs/js/legacy/sketchgraphhtml5b/SketchGraph.pjs
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
-  Lets user sketch a graph by moving the mouse.
-  Origional Java App:
-  --David Eck, June 2000 (eck@hws.edu, http://math.hws.edu/eck/)
-  
-  Rewritten for WebWork in javascript with processingjs for html5 by David Gage 2010
-  see processingjs.org for info on processingjs
-  
-  Drag on the graph to change it.
-  The Y-values box will take numbers separated by commas and space them equaly on the graph.
-  Enjoy!!
-  */
-
-  double xGrid;
-  double yGrid;
-  
-  //show a tick mark every ? spaces
-  int tickEvery = 2
-  
-  //set the border color
-  color borderColor = color(0,0,0);
-  //set the color of the grid
-  color gridColor = color(150,150,150);
-  //set the color of the axes 
-  color axesColor = color(0,0,220);
-  //set the alternat color of the axes
-  color lightAxesColor = color(160,180,255);
-  //set the color of the graph
-  color graphColor = color(255, 0, 255);
-  
-  //set the border width
-  int borderWidth = 20;
-  
-  var padding = 0;
-  //-------------------  methods -------------------------------
-  
-  void setup(){
-    //set the canvas size
-
-    size( canvasWidth+padding, canvasHeight+padding );
-
-    strokeWeight( 1 );
-
-    frameRate( 15 );
-
-    gwidth = width-2*padding;
-    gheight = height -2*padding;
-    gheight = height;
-    xGrid = gwidth/(xmax - xmin);
-    yGrid = gheight/(ymax - ymin);
-    
-
-    //starting number of points
-    points = 101;
-    yValues = new int[points];
-    derivatives = new double[points];
-    for(int i = 0; i < points; i++){
-      yValues[i] = (abs(ymin)*yGrid)/gheight;
-      derivatives[i] = 0;
-    }
-
-  }  
-      
-  //processings draw loop
-
-  void draw() {
-    //background color clears the graph every draw
-    background(color(255,255,255));
-    drawGrid();
-
-    drawAxes();
-    drawGraph();
-  }
-  
-  void drawGrid() {
-    if (!showGrid)
-      return;
-    stroke(gridColor);
-    if (xGrid > 0) {
-      int left = 0.5+padding;
-      int right = left+gwidth;
-      int a     = left;
-      while (a < right) {
-        line(a,padding,a,gheight+padding);
-        a += xGrid;
-      }
-    }
-    //draw the right edge
-    line(right-1, padding, right-1, gheight);
-    if (yGrid > 0) {
-      int top = 0.5+padding;
-      int bottom    = top +gheight; 
-      int b = top;
-      while (b < bottom) {
-        line(padding,b,gwidth+padding,b);
-        b += yGrid;
-      }
-    }
-    //draw the bottom edge
-    line(padding, bottom-1, gwidth, bottom-1);
-  }
-  
-  //--------------------------- Axes ---------------------------------------
-  
-  void drawAxes() {
-  
-    if (ymax < 0 || ymin > 0)
-      stroke(lightAxesColor);
-    else 
-      stroke(axesColor);
-    line(padding, yGrid*abs(ymin)+padding, gwidth+padding, yGrid*abs(ymin)+padding);
-    //draw the x ticks
-    for(int i = 0; i < (xmax - xmin); i += tickEvery) {
-      line(xGrid*abs(xmin)+padding+xGrid*i, yGrid*abs(ymin)-2+padding, xGrid*abs(xmin)+padding + xGrid*i, yGrid*abs(ymin)+2+padding);
-      line(xGrid*abs(xmin)+padding-xGrid*i, yGrid*abs(ymin)-2+padding, xGrid*abs(xmin)+padding - xGrid*i, yGrid*abs(ymin)+padding);
-    }
-    if (xmax < 0 || xmin > 0)
-      stroke(lightAxesColor);
-    else 
-      stroke(axesColor);
-    line(xGrid*abs(xmin)+padding, padding, xGrid*abs(xmin)+padding, gheight+padding);
-    //draw the y ticks
-    for(int i = 0; i < (xmax - xmin); i += tickEvery) {
-      line(xGrid*abs(xmin)-2+padding, yGrid*abs(ymin)+padding+yGrid*i, xGrid*abs(xmin)+2+padding, yGrid*abs(ymin)+padding+yGrid*i);
-      line(xGrid*abs(xmin)-2+padding, yGrid*abs(ymin)+padding-yGrid*i, xGrid*abs(xmin)+2+padding, yGrid*abs(ymin)+padding-yGrid*i);
-    }
-  }
-  //--------------------------- Graph --------------------------------------
-  
-  int[] pixelX;
-  int[] pixelY;
-  
-  void drawGraph() {
-    makeGraphCoords();
-    makeDerivs();
-    stroke(graphColor);
-    //plot the points
-    for (int i = 1; i < pixelX.length; i++) {
-      line(pixelX[i-1], pixelY[i-1], pixelX[i], pixelY[i]);
-    }
-  }
-  
-  void makeGraphCoords() {
-    int pointCt = (gwidth);
-    if (pixelX == null || pixelX.length != pointCt) {
-      pixelX = new int[pointCt];
-      pixelY = new int[pointCt];
-    for (int i = 0; i < pointCt; i++)
-      pixelX[i] = i+padding;
-      pixelX[pointCt-1] = gwidth+padding;
-     
-    }
-    double dx = (xmax - xmin) / (gwidth);
-    double dy = (ymax - ymin) / (gheight);
-    for (int i = 0; i < pointCt; i++) {
-      double x = xmin + dx*(pixelX[i]);
-      double y = eval(x);
-      pixelY[i] = (ymax - y)/dy+padding;
-    }
-  }
-  //math from java applet
-  double eval(double x) {
-    // NOTE:  yvalues and derivatives are stored as if x and y range from 0 to 1!!!
-    double scaledx = (x-xmin)/(xmax-xmin);
-    int interval = (int)((points-1)*scaledx);
-    if (interval >= points-1)
-      return ymin + yValues[points-1]*(ymax-ymin);
-    double temp = 1.0/(points-1);
-    double a = yValues[interval+1]/(temp*temp*temp);
-    double b = derivatives[interval+1]/(temp*temp) - 3*a;
-    double d = -yValues[interval]/(temp*temp*temp);
-    double c = derivatives[interval]/(temp*temp) - 3*d;
-    double t1 = scaledx - interval*temp;
-    double t2 = t1*t1;
-    double t3 = t2*t1;
-    double s1 = scaledx - (interval+1)*temp;
-    double s2 = s1*s1;
-    double s3 = s2*s1;
-    double scaledy = a*t3 + b*t2*s1 + c*t1*s2 + d*s3;
-    
-    return ymin + scaledy*(ymax-ymin);
-  }
-  
-  //--------------------------- Mouse Handling -----------------------------
-  
-  int lastPointNum;
-  double lastY;
-  
-  //couldn't just use mouseDragged because of a bug if dragged off canvas
-  
-  
-  
-  void mouseDragged(){
-      jumpPoint(mouseX, mouseY);
-  }
-  
-  //math from java applet
-  void jumpPoint(int x, int y) {
-    y = min(gheight - 1, y);
-    int pointNum = (int)( ((x)/(gwidth-1))*(points-1) );
-    double newYVal = 1.0 - ((y))/(gheight-1);  // Scaled!
-    if (pointNum >= 0 && pointNum < points) 
-      yValues[pointNum] = newYVal;
-    if (isNaN(lastY) || abs(pointNum - lastPointNum) <= 1 ||abs(pointNum - lastPointNum) >= 20) {}
-    else if (pointNum > lastPointNum) {
-      double dy = (newYVal - lastY)/(pointNum - lastPointNum);
-      for (int i = lastPointNum + 1; i < pointNum && i < points; i++) {
-        if (i >= 0)
-          yValues[i] = lastY + (i-lastPointNum)*dy;
-      }
-    }
-    else {
-      double dy = (newYVal - lastY)/(pointNum - lastPointNum);
-      for (int i = lastPointNum - 1; i > pointNum && i >= 0; i--) {
-        if (i < points)
-          yValues[i] = lastY + (i-lastPointNum)*dy;
-      }
-    }
-    lastPointNum = pointNum;
-    lastY = newYVal;
-  }
-  
-  //math from java applet
-    void makeDerivs() {
-    double dx = 1.0 / (points - 1);
-    derivatives[0] = (yValues[1] - yValues[0])/dx;
-    for (int i = 1; i < points - 1; i++) {
-      double left = abs(yValues[i] - yValues[i-1]);
-      double right = abs(yValues[i+1] - yValues[i]);
-      if (left < 1e-20 || right < 1e-20)
-      derivatives[i] = 0;
-      else
-      derivatives[i] = ((1/right)*(yValues[i+1]-yValues[i]) - (1/left)*(yValues[i]-yValues[i-1]))/(2*dx*((1/right)+(1/left)));
-      }
-    derivatives[points-1] = (yValues[points-1] - yValues[points-2])/dx;
-  }
\ No newline at end of file
diff --git a/htdocs/js/legacy/sketchgraphhtml5b/processing-dgfix.js b/htdocs/js/legacy/sketchgraphhtml5b/processing-dgfix.js
deleted file mode 100644
index 2f45309b3f..0000000000
--- a/htdocs/js/legacy/sketchgraphhtml5b/processing-dgfix.js
+++ /dev/null
@@ -1,8231 +0,0 @@
-/*
-
-    P R O C E S S I N G . J S - 0.9.1
-    a port of the Processing visualization language
-
-    License       : MIT
-    Developer     : John Resig: http://ejohn.org
-    Web Site      : http://processingjs.org
-    Java Version  : http://processing.org
-    Github Repo.  : http://github.com/jeresig/processing-js
-    Bug Tracking  : http://processing-js.lighthouseapp.com
-    Mozilla POW!  : http://wiki.Mozilla.org/Education/Projects/ProcessingForTheWeb
-    Maintained by : Seneca: http://zenit.senecac.on.ca/wiki/index.php/Processing.js
-                    Hyper-Metrix: http://hyper-metrix.com/#Processing
-                    BuildingSky: http://weare.buildingsky.net/pages/processing-js
-
- */
-
-(function() {
-
-  var Processing = this.Processing = function Processing(curElement, aCode) {
-
-    var p = this;
-
-    p.pjs = {
-       imageCache: {
-         pending: 0
-       }
-    }; // by default we have an empty imageCache, no more.
-
-    p.name = 'Processing.js Instance'; // Set Processing defaults / environment variables
-    p.use3DContext = false; // default '2d' canvas context
-    p.canvas = curElement;
-
-    // Glyph path storage for textFonts
-    p.glyphTable = {};
-
-    // Global vars for tracking mouse position
-    p.pmouseX = 0;
-    p.pmouseY = 0;
-    p.mouseX = 0;
-    p.mouseY = 0;
-    p.mouseButton = 0;
-    p.mouseDown = false;
-    p.mouseScroll = 0;
-
-    // Undefined event handlers to be replaced by user when needed
-    p.mouseClicked = undefined;
-    p.mouseDragged = undefined;
-    p.mouseMoved = undefined;
-    p.mousePressed = undefined;
-    p.mouseReleased = undefined;
-    p.mouseScrolled = undefined;
-    p.key = undefined;
-    p.keyPressed = undefined;
-    p.keyReleased = undefined;
-    p.keyTyped = undefined;
-    p.draw = undefined;
-    p.setup = undefined;
-
-    // The height/width of the canvas
-    p.width = curElement.width - 0;
-    p.height = curElement.height - 0;
-
-    // The current animation frame
-    p.frameCount = 0;
-
-    // Color modes
-    p.RGB   = 1;
-    p.ARGB  = 2;
-    p.HSB   = 3;
-    p.ALPHA = 4;
-    p.CMYK  = 5;
-
-    // Renderers
-    p.P2D    = 1;
-    p.JAVA2D = 1;
-    p.WEBGL  = 2;
-    p.P3D    = 2;
-    p.OPENGL = 2;
-    p.EPSILON = 0.0001;
-    p.MAX_FLOAT   = 3.4028235e+38;
-    p.MIN_FLOAT   = -3.4028235e+38;
-    p.MAX_INT     = 2147483647;
-    p.MIN_INT     = -2147483648;
-    p.PI          = Math.PI;
-    p.TWO_PI      = 2 * p.PI;
-    p.HALF_PI     = p.PI / 2;
-    p.THIRD_PI    = p.PI / 3;
-    p.QUARTER_PI  = p.PI / 4;
-    p.DEG_TO_RAD  = p.PI / 180;
-    p.RAD_TO_DEG  = 180 / p.PI;
-    p.WHITESPACE  = " \t\n\r\f\u00A0";
-
-    // Filter/convert types
-    p.BLUR      = 11;
-    p.GRAY      = 12;
-    p.INVERT    = 13;
-    p.OPAQUE    = 14;
-    p.POSTERIZE = 15;
-    p.THRESHOLD = 16;
-    p.ERODE     = 17;
-    p.DILATE    = 18;
-
-    // Blend modes
-    p.REPLACE    = 0;
-    p.BLEND      = 1 << 0;
-    p.ADD        = 1 << 1;
-    p.SUBTRACT   = 1 << 2;
-    p.LIGHTEST   = 1 << 3;
-    p.DARKEST    = 1 << 4;
-    p.DIFFERENCE = 1 << 5;
-    p.EXCLUSION  = 1 << 6;
-    p.MULTIPLY   = 1 << 7;
-    p.SCREEN     = 1 << 8;
-    p.OVERLAY    = 1 << 9;
-    p.HARD_LIGHT = 1 << 10;
-    p.SOFT_LIGHT = 1 << 11;
-    p.DODGE      = 1 << 12;
-    p.BURN       = 1 << 13;
-
-    // Color component bit masks
-    p.ALPHA_MASK = 0xff000000;
-    p.RED_MASK   = 0x00ff0000;
-    p.GREEN_MASK = 0x0000ff00;
-    p.BLUE_MASK  = 0x000000ff;
-
-    // Projection matrices
-    p.CUSTOM       = 0;
-    p.ORTHOGRAPHIC = 2;
-    p.PERSPECTIVE  = 3;
-
-    // Shapes
-    p.POINT          = 2;
-    p.POINTS         = 2;
-    p.LINE           = 4;
-    p.LINES          = 4;
-    p.TRIANGLE       = 8;
-    p.TRIANGLES      = 9;
-    p.TRIANGLE_STRIP = 10;
-    p.TRIANGLE_FAN   = 11;
-    p.QUAD           = 16;
-    p.QUADS          = 16;
-    p.QUAD_STRIP     = 17;
-    p.POLYGON        = 20;
-    p.PATH           = 21;
-    p.RECT           = 30;
-    p.ELLIPSE        = 31;
-    p.ARC            = 32;
-    p.SPHERE         = 40;
-    p.BOX            = 41;
-
-    // Shape closing modes
-    p.OPEN  = 1;
-    p.CLOSE = 2;
-
-    // Shape drawing modes
-    p.CORNER          = 0; // Draw mode convention to use (x, y) to (width, height)
-    p.CORNERS         = 1; // Draw mode convention to use (x1, y1) to (x2, y2) coordinates
-    p.RADIUS          = 2; // Draw mode from the center, and using the radius
-    p.CENTER_RADIUS   = 2; // Deprecated! Use RADIUS instead
-    p.CENTER          = 3; // Draw from the center, using second pair of values as the diameter
-    p.DIAMETER        = 3; // Synonym for the CENTER constant. Draw from the center
-    p.CENTER_DIAMETER = 3; // Deprecated! Use DIAMETER instead
-
-    // Text vertical alignment modes
-    p.BASELINE = 0;   // Default vertical alignment for text placement
-    p.TOP      = 101; // Align text to the top
-    p.BOTTOM   = 102; // Align text from the bottom, using the baseline
-
-    // UV Texture coordinate modes
-    p.NORMAL    = 1;
-    p.NORMALIZE = 1;
-    p.IMAGE     = 2;
-
-    // Text placement modes
-    p.MODEL = 4;
-    p.SHAPE = 5;
-
-    // Stroke modes
-    p.SQUARE  = 'butt';
-    p.ROUND   = 'round';
-    p.PROJECT = 'square';
-    p.MITER   = 'miter';
-    p.BEVEL   = 'bevel';
-
-    // Lighting modes
-    p.AMBIENT     = 0;
-    p.DIRECTIONAL = 1;
-    //POINT       = 2; Shared with Shape constant
-    p.SPOT        = 3;
-
-    // Key constants
-
-    // Both key and keyCode will be equal to these values
-    p.BACKSPACE = 8;
-    p.TAB       = 9;
-    p.ENTER     = 10;
-    p.RETURN    = 13;
-    p.ESC       = 27;
-    p.DELETE    = 127;
-    p.CODED     = 0xffff;
-
-    // p.key will be CODED and p.keyCode will be this value
-    p.SHIFT     = 16;
-    p.CONTROL   = 17;
-    p.ALT       = 18;
-    p.UP        = 38;
-    p.RIGHT     = 39;
-    p.DOWN      = 40;
-    p.LEFT      = 37;
-
-    var codedKeys = [p.SHIFT, p.CONTROL, p.ALT, p.UP, p.RIGHT, p.DOWN, p.LEFT];
-
-    // Cursor types
-    p.ARROW    = 'default';
-    p.CROSS    = 'crosshair';
-    p.HAND     = 'pointer';
-    p.MOVE     = 'move';
-    p.TEXT     = 'text';
-    p.WAIT     = 'wait';
-    p.NOCURSOR = "url('data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=='), auto";
-
-    // Hints
-    p.DISABLE_OPENGL_2X_SMOOTH    =  1;
-    p.ENABLE_OPENGL_2X_SMOOTH     = -1;
-    p.ENABLE_OPENGL_4X_SMOOTH     =  2;
-    p.ENABLE_NATIVE_FONTS         =  3;
-    p.DISABLE_DEPTH_TEST          =  4;
-    p.ENABLE_DEPTH_TEST           = -4;
-    p.ENABLE_DEPTH_SORT           =  5;
-    p.DISABLE_DEPTH_SORT          = -5;
-    p.DISABLE_OPENGL_ERROR_REPORT =  6;
-    p.ENABLE_OPENGL_ERROR_REPORT  = -6;
-    p.ENABLE_ACCURATE_TEXTURES    =  7;
-    p.DISABLE_ACCURATE_TEXTURES   = -7;
-    p.HINT_COUNT                  = 10;
-
-    // PJS defined constants
-    p.SINCOS_LENGTH      = parseInt(360 / 0.5, 10);
-    p.FRAME_RATE         = 0;
-    p.focused            = true;
-    p.PRECISIONB         = 15; // fixed point precision is limited to 15 bits!!
-    p.PRECISIONF         = 1 << p.PRECISIONB;
-    p.PREC_MAXVAL        = p.PRECISIONF - 1;
-    p.PREC_ALPHA_SHIFT   = 24 - p.PRECISIONB;
-    p.PREC_RED_SHIFT     = 16 - p.PRECISIONB;
-    p.NORMAL_MODE_AUTO   = 0;
-    p.NORMAL_MODE_SHAPE  = 1;
-    p.NORMAL_MODE_VERTEX = 2;
-    p.MAX_LIGHTS         = 8;
-
-    // "Private" variables used to maintain state
-    var curContext,
-        online = true,
-        doFill = true,
-        fillStyle = "rgba( 255, 255, 255, 1 )",
-        doStroke = true,
-        strokeStyle = "rgba( 204, 204, 204, 1 )",
-        lineWidth = 1,
-        loopStarted = false,
-        refreshBackground = function() {},
-        doLoop = true,
-        looping = 0,
-        curRectMode = p.CORNER,
-        curEllipseMode = p.CENTER,
-        normalX = 0,
-        normalY = 0,
-        normalZ = 0,
-        normalMode = p.NORMAL_MODE_AUTO,
-        inDraw = false,
-        curBackground = "rgba( 204, 204, 204, 1 )",
-        curFrameRate = 60,
-        curCursor = p.ARROW,
-        oldCursor = curElement.style.cursor,
-        curMsPerFrame = 1,
-        curShape = p.POLYGON,
-        curShapeCount = 0,
-        curvePoints = [],
-        curTightness = 0,
-        curveDetail = 20,
-        curveInited = false,
-        colorModeA = 255,
-        colorModeX = 255,
-        colorModeY = 255,
-        colorModeZ = 255,
-        pathOpen = false,
-        mousePressed = false,
-        mouseDragging = false,
-        keyPressed = false,
-        curColorMode = p.RGB,
-        curTint = function() {},
-        curTextSize = 12,
-        curTextFont = "Arial",
-        getLoaded = false,
-        start = new Date().getTime(),
-        timeSinceLastFPS = start,
-        framesSinceLastFPS = 0,
-        lastTextPos = [0, 0, 0],
-        curveBasisMatrix,
-        curveToBezierMatrix,
-        curveDrawMatrix,
-        bezierBasisInverse,
-        bezierBasisMatrix,
-        programObject3D,
-        programObject2D,
-        boxBuffer,
-        boxNormBuffer,
-        boxOutlineBuffer,
-        sphereBuffer,
-        lineBuffer,
-        fillBuffer,
-        pointBuffer;
-
-    // User can only have MAX_LIGHTS lights
-    var lightCount = 0;
-
-    //sphere stuff
-    var sphereDetailV = 0,
-        sphereDetailU = 0,
-        sphereX = [],
-        sphereY = [],
-        sphereZ = [],
-        sinLUT = new Array(p.SINCOS_LENGTH),
-        cosLUT = new Array(p.SINCOS_LENGTH),
-        sphereVerts,
-        sphereNorms;
-
-    // Camera defaults and settings
-    var cam,
-        cameraInv,
-        forwardTransform,
-        reverseTransform,
-        modelView,
-        modelViewInv,
-        userMatrixStack,
-        inverseCopy,
-        projection,
-        manipulatingCamera = false,
-        frustumMode = false,
-        cameraFOV = 60 * (Math.PI / 180),
-        cameraX = curElement.width / 2,
-        cameraY = curElement.height / 2,
-        cameraZ = cameraY / Math.tan(cameraFOV / 2),
-        cameraNear = cameraZ / 10,
-        cameraFar = cameraZ * 10,
-        cameraAspect = curElement.width / curElement.height;
-
-    var vertArray = [],
-        isCurve = false,
-        isBezier = false,
-        firstVert = true;
-
-    // Stores states for pushStyle() and popStyle().
-    var styleArray = new Array(0);
-
-    // Vertices are specified in a counter-clockwise order
-    // triangles are in this order: back, front, right, bottom, left, top
-    var boxVerts = [0.5, 0.5, -0.5, 0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5,
-                   -0.5, 0.5, -0.5, 0.5, 0.5, -0.5, 0.5, 0.5, 0.5, -0.5, 0.5, 0.5,
-                   -0.5, -0.5, 0.5, -0.5, -0.5, 0.5, 0.5, -0.5, 0.5, 0.5, 0.5, 0.5,
-                    0.5, 0.5, -0.5, 0.5, 0.5, 0.5, 0.5, -0.5, 0.5, 0.5, -0.5, 0.5,
-                    0.5, -0.5, -0.5, 0.5, 0.5, -0.5, 0.5, -0.5, -0.5, 0.5, -0.5, 0.5,
-                   -0.5, -0.5, 0.5, -0.5, -0.5, 0.5, -0.5, -0.5, -0.5, 0.5, -0.5, -0.5,
-                   -0.5, -0.5, -0.5, -0.5, -0.5, 0.5, -0.5, 0.5, 0.5, -0.5, 0.5, 0.5,
-                   -0.5, 0.5, -0.5, -0.5, -0.5, -0.5, 0.5, 0.5, 0.5, 0.5, 0.5, -0.5,
-                   -0.5, 0.5, -0.5, -0.5, 0.5, -0.5, -0.5, 0.5, 0.5, 0.5, 0.5, 0.5];
-
-    var boxNorms = [0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1,
-                    0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1,
-                    1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0,
-                    0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0,
-                    -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0,
-                    0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0];
-
-    var boxOutlineVerts = [0.5, 0.5, 0.5, 0.5, -0.5, 0.5, 0.5, 0.5, -0.5, 0.5, -0.5, -0.5,
-                          -0.5, 0.5, -0.5, -0.5, -0.5, -0.5, -0.5, 0.5, 0.5, -0.5, -0.5, 0.5,
-                           0.5, 0.5, 0.5, 0.5, 0.5, -0.5, 0.5, 0.5, -0.5, -0.5, 0.5, -0.5,
-                          -0.5, 0.5, -0.5, -0.5, 0.5, 0.5, -0.5, 0.5, 0.5, 0.5, 0.5, 0.5,
-                           0.5, -0.5, 0.5, 0.5, -0.5, -0.5, 0.5, -0.5, -0.5, -0.5, -0.5, -0.5,
-                          -0.5, -0.5, -0.5, -0.5, -0.5, 0.5, -0.5, -0.5, 0.5, 0.5, -0.5, 0.5];
-
-    // Vertex shader for points and lines
-    var vertexShaderSource2D =
-      "attribute vec3 Vertex;" +
-      "uniform vec4 color;" +
-
-      "uniform mat4 model;" +
-      "uniform mat4 view;" +
-      "uniform mat4 projection;" +
-
-      "void main(void) {" +
-      "  gl_FrontColor = color;" +
-      "  gl_Position = projection * view * model * vec4(Vertex, 1.0);" +
-      "}";
-
-    var fragmentShaderSource2D =
-      "void main(void){" +
-      "  gl_FragColor = gl_Color;" +
-      "}";
-
-    // Vertex shader for boxes and spheres
-    var vertexShaderSource3D =
-      "attribute vec3 Vertex;" +
-      "attribute vec3 Normal;" +
-
-      "uniform vec4 color;" +
-
-      "uniform bool usingMat;" +
-      "uniform vec3 specular;" +
-      "uniform vec3 mat_emissive;" +
-      "uniform vec3 mat_ambient;" +
-      "uniform vec3 mat_specular;" +
-      "uniform float shininess;" +
-
-      "uniform mat4 model;" +
-      "uniform mat4 view;" +
-      "uniform mat4 projection;" +
-      "uniform mat4 normalTransform;" +
-
-      "uniform int lightCount;" +
-      "uniform vec3 falloff;" +
-
-      "struct Light {" +
-      "  bool dummy;" +
-      "   int type;" +
-      "   vec3 color;" +
-      "   vec3 position;" +
-      "  vec3 direction;" +
-      "  float angle;" +
-      "  vec3 halfVector;" +
-      "  float concentration;" +
-      "};" +
-      "uniform Light lights[8];" +
-
-      "void AmbientLight( inout vec3 totalAmbient, in vec3 ecPos, in Light light ) {" +
-      // Get the vector from the light to the vertex
-      // Get the distance from the current vector to the light position
-      "  float d = length( light.position - ecPos );" +
-      "  float attenuation = 1.0 / ( falloff[0] + ( falloff[1] * d ) + ( falloff[2] * d * d ));" + "  totalAmbient += light.color * attenuation;" +
-      "}" +
-
-      "void DirectionalLight( inout vec3 col, in vec3 ecPos, inout vec3 spec, in vec3 vertNormal, in Light light ) {" +
-      "  float powerfactor = 0.0;" +
-      "  float nDotVP = max(0.0, dot( vertNormal, light.position ));" +
-      "  float nDotVH = max(0.0, dot( vertNormal, normalize( light.position-ecPos )));" +
-
-      "  if( nDotVP != 0.0 ){" +
-      "    powerfactor = pow( nDotVH, shininess );" +
-      "  }" +
-
-      "  col += light.color * nDotVP;" +
-      "  spec += specular * powerfactor;" +
-      "}" +
-
-      "void PointLight( inout vec3 col, inout vec3 spec, in vec3 vertNormal, in vec3 ecPos, in vec3 eye, in Light light ) {" +
-      "  float powerfactor;" +
-
-      // Get the vector from the light to the vertex
-      "   vec3 VP = light.position - ecPos;" +
-
-      // Get the distance from the current vector to the light position
-      "  float d = length( VP ); " +
-
-      // Normalize the light ray so it can be used in the dot product operation.
-      "  VP = normalize( VP );" +
-
-      "  float attenuation = 1.0 / ( falloff[0] + ( falloff[1] * d ) + ( falloff[2] * d * d ));" +
-
-      "  float nDotVP = max( 0.0, dot( vertNormal, VP ));" +
-      "  vec3 halfVector = normalize( VP + eye );" +
-      "  float nDotHV = max( 0.0, dot( vertNormal, halfVector ));" +
-
-      "  if( nDotVP == 0.0) {" +
-      "    powerfactor = 0.0;" +
-      "  }" +
-      "  else{" +
-      "    powerfactor = pow( nDotHV, shininess );" +
-      "  }" +
-
-      "  spec += specular * powerfactor * attenuation;" +
-      "  col += light.color * nDotVP * attenuation;" +
-      "}" +
-
-      /*
-      */
-      "void SpotLight( inout vec3 col, inout vec3 spec, in vec3 vertNormal, in vec3 ecPos, in vec3 eye, in Light light ) {" +
-      "  float spotAttenuation;" +
-      "  float powerfactor;" +
-
-      // calculate the vector from the current vertex to the light.
-      "  vec3 VP = light.position - ecPos; " +
-      "  vec3 ldir = normalize( light.direction );" +
-
-      // get the distance from the spotlight and the vertex
-      "  float d = length( VP );" +
-      "  VP = normalize( VP );" +
-
-      "  float attenuation = 1.0 / ( falloff[0] + ( falloff[1] * d ) + ( falloff[2] * d * d ) );" +
-
-      // dot product of the vector from vertex to light and light direction.
-      "  float spotDot = dot( VP, ldir );" +
-
-      // if the vertex falls inside the cone
-      "  if( spotDot < cos( light.angle ) ) {" +
-      "    spotAttenuation = pow( spotDot, light.concentration );" +
-      "  }" +
-      "  else{" +
-      "    spotAttenuation = 1.0;" +
-      "  }" +
-      "  attenuation *= spotAttenuation;" +
-
-      "  float nDotVP = max( 0.0, dot( vertNormal, VP ));" +
-      "  vec3 halfVector = normalize( VP + eye );" +
-      "  float nDotHV = max( 0.0, dot( vertNormal, halfVector ));" +
-
-      "  if( nDotVP == 0.0 ) {" +
-      "    powerfactor = 0.0;" +
-      "  }" +
-      "  else {" +
-      "    powerfactor = pow( nDotHV, shininess );" +
-      "  }" +
-
-      "  spec += specular * powerfactor * attenuation;" +
-      "  col += light.color * nDotVP * attenuation;" +
-      "}" +
-
-      "void main(void) {" +
-      "  vec3 finalAmbient = vec3( 0.0, 0.0, 0.0 );" +
-      "  vec3 finalDiffuse = vec3( 0.0, 0.0, 0.0 );" +
-      "  vec3 finalSpecular = vec3( 0.0, 0.0, 0.0 );" +
-
-      "  vec3 norm = vec3( normalTransform * vec4( Normal, 0.0 ) );" +
-
-      "  vec4 ecPos4 = view * model * vec4(Vertex,1.0);" +
-      "  vec3 ecPos = (vec3(ecPos4))/ecPos4.w;" +
-      "  vec3 eye = vec3( 0.0, 0.0, 1.0 );" +
-
-      // If there were no lights this draw call, just use the
-      // assigned fill color of the shape and the specular value
-      "  if( lightCount == 0 ) {" +
-      "    gl_FrontColor = color + vec4(mat_specular,1.0);" +
-      "  }" +
-      "  else {" +
-      "    for( int i = 0; i < lightCount; i++ ) {" +
-      "      if( lights[i].type == 0 ) {" +
-      "        AmbientLight( finalAmbient, ecPos, lights[i] );" +
-      "      }" +
-      "      else if( lights[i].type == 1 ) {" +
-      "        DirectionalLight( finalDiffuse,ecPos, finalSpecular, norm, lights[i] );" +
-      "      }" +
-      "      else if( lights[i].type == 2 ) {" +
-      "        PointLight( finalDiffuse, finalSpecular, norm, ecPos, eye, lights[i] );" +
-      "      }" +
-      "      else if( lights[i].type == 3 ) {" +
-      "        SpotLight( finalDiffuse, finalSpecular, norm, ecPos, eye, lights[i] );" +
-      "      }" +
-      "    }" +
-
-      "   if( usingMat == false ) {" +
-      "    gl_FrontColor = vec4(  " +
-      "      vec3(color) * finalAmbient +" +
-      "      vec3(color) * finalDiffuse +" +
-      "      vec3(color) * finalSpecular," +
-      "      color[3] );" +
-      "   }" +
-      "   else{" +
-      "     gl_FrontColor = vec4( " +
-      "       mat_emissive + " +
-      "       (vec3(color) * mat_ambient * finalAmbient) + " +
-      "       (vec3(color) * finalDiffuse) + " +
-      "       (mat_specular * finalSpecular), " +
-      "       color[3] );" +
-      "    }" +
-      "  }" +
-      "  gl_Position = projection * view * model * vec4( Vertex, 1.0 );" +
-      "}";
-
-    var fragmentShaderSource3D =
-      "void main(void){" +
-      "  gl_FragColor = gl_Color;" +
-      "}";
-
-    // Wrapper to easily deal with array names changes.
-    var newWebGLArray = function(data) {
-      return new WebGLFloatArray(data);
-    };
-
-    var imageModeCorner = function imageModeCorner(x, y, w, h, whAreSizes) {
-      return {
-        x: x,
-        y: y,
-        w: w,
-        h: h
-      };
-    };
-    var imageModeConvert = imageModeCorner;
-
-    var imageModeCorners = function imageModeCorners(x, y, w, h, whAreSizes) {
-      return {
-        x: x,
-        y: y,
-        w: whAreSizes ? w : w - x,
-        h: whAreSizes ? h : h - y
-      };
-    };
-
-    var imageModeCenter = function imageModeCenter(x, y, w, h, whAreSizes) {
-      return {
-        x: x - w / 2,
-        y: y - h / 2,
-        w: w,
-        h: h
-      };
-    };
-
-    var createProgramObject = function(curContext, vetexShaderSource, fragmentShaderSource) {
-      var vertexShaderObject = curContext.createShader(curContext.VERTEX_SHADER);
-      curContext.shaderSource(vertexShaderObject, vetexShaderSource);
-      curContext.compileShader(vertexShaderObject);
-      if (!curContext.getShaderParameter(vertexShaderObject, curContext.COMPILE_STATUS)) {
-        throw curContext.getShaderInfoLog(vertexShaderObject);
-      }
-
-      var fragmentShaderObject = curContext.createShader(curContext.FRAGMENT_SHADER);
-      curContext.shaderSource(fragmentShaderObject, fragmentShaderSource);
-      curContext.compileShader(fragmentShaderObject);
-      if (!curContext.getShaderParameter(fragmentShaderObject, curContext.COMPILE_STATUS)) {
-        throw curContext.getShaderInfoLog(fragmentShaderObject);
-      }
-
-      var programObject = curContext.createProgram();
-      curContext.attachShader(programObject, vertexShaderObject);
-      curContext.attachShader(programObject, fragmentShaderObject);
-      curContext.linkProgram(programObject);
-      if (!curContext.getProgramParameter(programObject, curContext.LINK_STATUS)) {
-        throw "Error linking shaders.";
-      }
-
-      return programObject;
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Char handling
-    ////////////////////////////////////////////////////////////////////////////
-    var charMap = {};
-
-    var Char = function Char(chr) {
-      if (typeof chr === 'string' && chr.length === 1) {
-        this.code = chr.charCodeAt(0);
-      } else {
-        this.code = NaN;
-      }
-
-      return (typeof charMap[this.code] === 'undefined') ? charMap[this.code] = this : charMap[this.code];
-    };
-
-    Char.prototype.toString = function() {
-      return String.fromCharCode(this.code);
-    };
-
-    Char.prototype.valueOf = function() {
-      return this.code;
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // PVector
-    ////////////////////////////////////////////////////////////////////////////
-    var PVector = function(x, y, z) {
-      this.x = x || 0;
-      this.y = y || 0;
-      this.z = z || 0;
-    },
-    createPVectorMethod = function(method) {
-      return function(v1, v2) {
-        var v = v1.get();
-        v[method](v2);
-        return v;
-      };
-    },
-    createSimplePVectorMethod = function(method) {
-      return function(v1, v2) {
-        return v1[method](v2);
-      };
-    },
-    simplePVMethods = "dist dot cross".split(" "),
-    method = simplePVMethods.length;
-
-    PVector.angleBetween = function(v1, v2) {
-      return Math.acos(v1.dot(v2) / (v1.mag() * v2.mag()));
-    };
-
-    // Common vector operations for PVector
-    PVector.prototype = {
-      set: function(v, y, z) {
-        if (arguments.length === 1) {
-          this.set(v.x || v[0], v.y || v[1], v.z || v[2]);
-        } else {
-          this.x = v;
-          this.y = y;
-          this.z = z;
-        }
-      },
-      get: function() {
-        return new PVector(this.x, this.y, this.z);
-      },
-      mag: function() {
-        return Math.sqrt(this.x * this.x + this.y * this.y + this.z * this.z);
-      },
-      add: function(v, y, z) {
-        if (arguments.length === 3) {
-          this.x += v;
-          this.y += y;
-          this.z += z;
-        } else if (arguments.length === 1) {
-          this.x += v.x;
-          this.y += v.y;
-          this.z += v.z;
-        }
-      },
-      sub: function(v, y, z) {
-        if (arguments.length === 3) {
-          this.x -= v;
-          this.y -= y;
-          this.z -= z;
-        } else if (arguments.length === 1) {
-          this.x -= v.x;
-          this.y -= v.y;
-          this.z -= v.z;
-        }
-      },
-      mult: function(v) {
-        if (typeof v === 'number') {
-          this.x *= v;
-          this.y *= v;
-          this.z *= v;
-        } else if (typeof v === 'object') {
-          this.x *= v.x;
-          this.y *= v.y;
-          this.z *= v.z;
-        }
-      },
-      div: function(v) {
-        if (typeof v === 'number') {
-          this.x /= v;
-          this.y /= v;
-          this.z /= v;
-        } else if (typeof v === 'object') {
-          this.x /= v.x;
-          this.y /= v.y;
-          this.z /= v.z;
-        }
-      },
-      dist: function(v) {
-        var dx = this.x - v.x,
-          dy = this.y - v.y,
-          dz = this.z - v.z;
-        return Math.sqrt(dx * dx + dy * dy + dz * dz);
-      },
-      dot: function(v, y, z) {
-        var num;
-        if (arguments.length === 3) {
-          num = this.x * v + this.y * y + this.z * z;
-        } else if (arguments.length === 1) {
-          num = this.x * v.x + this.y * v.y + this.z * v.z;
-        }
-        return num;
-      },
-      cross: function(v) {
-        var
-        crossX = this.y * v.z - v.y * this.z,
-          crossY = this.z * v.x - v.z * this.x,
-          crossZ = this.x * v.y - v.x * this.y;
-        return new PVector(crossX, crossY, crossZ);
-      },
-      normalize: function() {
-        var m = this.mag();
-        if (m > 0) {
-          this.div(m);
-        }
-      },
-      limit: function(high) {
-        if (this.mag() > high) {
-          this.normalize();
-          this.mult(high);
-        }
-      },
-      heading2D: function() {
-        var angle = Math.atan2(-this.y, this.x);
-        return -angle;
-      },
-      toString: function() {
-        return "[" + this.x + ", " + this.y + ", " + this.z + "]";
-      },
-      array: function() {
-        return [this.x, this.y, this.z];
-      }
-    };
-
-    while (method--) {
-      PVector[simplePVMethods[method]] = createSimplePVectorMethod(simplePVMethods[method]);
-    }
-
-    for (method in PVector.prototype) {
-      if (PVector.prototype.hasOwnProperty(method) && !PVector.hasOwnProperty(method)) {
-        PVector[method] = createPVectorMethod(method);
-      }
-    }
-
-    p.PVector = PVector;
-
-    ////////////////////////////////////////////////////////////////////////////
-    // 2D Matrix
-    ////////////////////////////////////////////////////////////////////////////
-
-    /*
-      Helper function for printMatrix(). Finds the largest scalar
-      in the matrix, then number of digits left of the decimal.
-      Call from PMatrix2D and PMatrix3D's print() function.
-    */
-    var printMatrixHelper = function printMatrixHelper(elements) {
-      var big = 0;
-      for (var i = 0; i < elements.length; i++) {
-
-        if (i !== 0) {
-          big = Math.max(big, Math.abs(elements[i]));
-        } else {
-          big = Math.abs(elements[i]);
-        }
-      }
-
-      var digits = (big + "").indexOf(".");
-      if (digits === 0) {
-        digits = 1;
-      } else if (digits === -1) {
-        digits = (big + "").length;
-      }
-
-      return digits;
-    };
-
-    var PMatrix2D = function() {
-      if (arguments.length === 0) {
-        this.reset();
-      } else if (arguments.length === 1 && arguments[0] instanceof PMatrix2D) {
-        this.set(arguments[0].array());
-      } else if (arguments.length === 6) {
-        this.set(arguments[0], arguments[1], arguments[2], arguments[3], arguments[4], arguments[5]);
-      }
-    };
-
-    PMatrix2D.prototype = {
-      set: function() {
-        if (arguments.length === 6) {
-          var a = arguments;
-          this.set([a[0], a[1], a[2],
-                    a[3], a[4], a[5]]);
-        } else if (arguments.length === 1 && arguments[0] instanceof PMatrix2D) {
-          this.elements = arguments[0].array();
-        } else if (arguments.length === 1 && arguments[0] instanceof Array) {
-          this.elements = arguments[0].slice();
-        }
-      },
-      get: function() {
-        var outgoing = new PMatrix2D();
-        outgoing.set(this.elements);
-        return outgoing;
-      },
-      reset: function() {
-        this.set([1, 0, 0, 0, 1, 0]);
-      },
-      // Returns a copy of the element values.
-      array: function array() {
-        return this.elements.slice();
-      },
-      translate: function(tx, ty) {
-        this.elements[2] = tx * this.elements[0] + ty * this.elements[1] + this.elements[2];
-        this.elements[5] = tx * this.elements[3] + ty * this.elements[4] + this.elements[5];
-      },
-      // Does nothing in Processing.
-      transpose: function() {
-      },
-      mult: function(source, target) {
-        var x, y;
-        if (source instanceof PVector) {
-          x = source.x;
-          y = source.y;
-          if (!target) {
-            target = new PVector();
-          }
-        } else if (source instanceof Array) {
-          x = source[0];
-          y = source[1];
-          if (!target) {
-            target = [];
-          }
-        }
-        if (target instanceof Array) {
-          target[0] = this.elements[0] * x + this.elements[1] * y + this.elements[2];
-          target[1] = this.elements[3] * x + this.elements[4] * y + this.elements[5];
-        } else if (target instanceof PVector) {
-          target.x = this.elements[0] * x + this.elements[1] * y + this.elements[2];
-          target.y = this.elements[3] * x + this.elements[4] * y + this.elements[5];
-          target.z = 0;
-        }
-        return target;
-      },
-      multX: function(x, y) {
-        return x * this.elements[0] + y * this.elements[1] + this.elements[2];
-      },
-      multY: function(x, y) {
-        return x * this.elements[3] + y * this.elements[4] + this.elements[5];
-      },
-      skewX: function(angle) {
-        this.apply(1, 0, 1, angle, 0, 0);
-      },
-      skewY: function(angle) {
-        this.apply(1, 0, 1, 0, angle, 0);
-      },
-      determinant: function() {
-        return this.elements[0] * this.elements[4] - this.elements[1] * this.elements[3];
-      },
-      invert: function() {
-        var d = this.determinant();
-        if ( Math.abs( d ) > p.FLOAT_MIN ) {
-          var old00 = this.elements[0];
-          var old01 = this.elements[1];
-          var old02 = this.elements[2];
-          var old10 = this.elements[3];
-          var old11 = this.elements[4];
-          var old12 = this.elements[5];
-          this.elements[0] =  old11 / d;
-          this.elements[3] = -old10 / d;
-          this.elements[1] = -old01 / d;
-          this.elements[1] =  old00 / d;
-          this.elements[2] = (old01 * old12 - old11 * old02) / d;
-          this.elements[5] = (old10 * old02 - old00 * old12) / d;
-          return true;
-        }
-        return false;
-      },
-      scale: function(sx, sy) {
-        if (sx && !sy) {
-          sy = sx;
-        }
-        if (sx && sy) {
-          this.elements[0] *= sx;
-          this.elements[1] *= sy;
-          this.elements[3] *= sx;
-          this.elements[4] *= sy;
-        }
-      },
-      apply: function() {
-        if (arguments.length === 1 && arguments[0] instanceof PMatrix2D) {
-          this.apply(arguments[0].array());
-        } else if (arguments.length === 6) {
-          var a = arguments;
-          this.apply([a[0], a[1], a[2],
-                      a[3], a[4], a[5]]);
-        } else if (arguments.length === 1 && arguments[0] instanceof Array) {
-          var source = arguments[0];
-          var result = [0, 0, this.elements[2],
-                        0, 0, this.elements[5]];
-          var e = 0;
-          for (var row = 0; row < 2; row++) {
-            for (var col = 0; col < 3; col++, e++) {
-              result[e] += this.elements[row * 3 + 0] * source[col + 0] + this.elements[row * 3 + 1] * source[col + 3];
-            }
-          }
-          this.elements = result.slice();
-        }
-      },
-      preApply: function() {
-        if (arguments.length === 1 && arguments[0] instanceof PMatrix2D) {
-          this.preApply(arguments[0].array());
-        } else if (arguments.length === 6) {
-          var a = arguments;
-          this.preApply([a[0], a[1], a[2],
-                         a[3], a[4], a[5]]);
-        } else if (arguments.length === 1 && arguments[0] instanceof Array) {
-          var source = arguments[0];
-          var result = [0, 0, source[2],
-                        0, 0, source[5]];
-          result[2]= source[2] + this.elements[2] * source[0] + this.elements[5] * source[1];
-          result[5]= source[5] + this.elements[2] * source[3] + this.elements[5] * source[4];
-          result[0] = this.elements[0] * source[0] + this.elements[3] * source[1];
-          result[3] = this.elements[0] * source[3] + this.elements[3] * source[4];
-          result[1] = this.elements[1] * source[0] + this.elements[4] * source[1];
-          result[4] = this.elements[1] * source[3] + this.elements[4] * source[4];
-          this.elements = result.slice();
-        }
-      },
-      rotate: function(angle) {
-        var c = Math.cos(angle);
-        var s = Math.sin(angle);
-        var temp1 = this.elements[0];
-        var temp2 = this.elements[1];
-        this.elements[0] =  c * temp1 + s * temp2;
-        this.elements[1] = -s * temp1 + c * temp2;
-        temp1 = this.elements[3];
-        temp2 = this.elements[4];
-        this.elements[3] =  c * temp1 + s * temp2;
-        this.elements[4] = -s * temp1 + c * temp2;
-      },
-      rotateZ: function(angle) {
-        this.rotate(angle);
-      },
-      print: function() {
-        var digits = printMatrixHelper(this.elements);
-        var output = "";
-        output += p.nfs(this.elements[0], digits, 4) + " " + p.nfs(this.elements[1], digits, 4) + " " + p.nfs(this.elements[2], digits, 4) + "\n";
-        output += p.nfs(this.elements[3], digits, 4) + " " + p.nfs(this.elements[4], digits, 4) + " " + p.nfs(this.elements[5], digits, 4) + "\n\n";
-        p.println(output);
-      }
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // PMatrix3D
-    ////////////////////////////////////////////////////////////////////////////
-    var PMatrix3D = function PMatrix3D() {
-      //When a matrix is created, it is set to an identity matrix
-      this.reset();
-    };
-
-    PMatrix3D.prototype = {
-      set: function() {
-        if (arguments.length === 16) {
-          var a = arguments;
-          this.set([a[0], a[1], a[2], a[3],
-                    a[4], a[5], a[6], a[7],
-                    a[8], a[9], a[10], a[11],
-                    a[12], a[13], a[14], a[15]]);
-        } else if (arguments.length === 1 && arguments[0] instanceof PMatrix3D) {
-          this.elements = arguments[0].array();
-        } else if (arguments.length === 1 && arguments[0] instanceof Array) {
-          this.elements = arguments[0].slice();
-        }
-      },
-      get: function() {
-        var outgoing = new PMatrix3D();
-        outgoing.set(this.elements);
-        return outgoing;
-      },
-      reset: function() {
-        this.set([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]);
-      },
-      // Returns a copy of the element values.
-      array: function array() {
-        return this.elements.slice();
-      },
-      translate: function(tx, ty, tz) {
-        if (typeof tz === 'undefined') {
-          tx = 0;
-        }
-
-        this.elements[3] += tx * this.elements[0] + ty * this.elements[1] + tz * this.elements[2];
-        this.elements[7] += tx * this.elements[4] + ty * this.elements[5] + tz * this.elements[6];
-        this.elements[11] += tx * this.elements[8] + ty * this.elements[9] + tz * this.elements[10];
-        this.elements[15] += tx * this.elements[12] + ty * this.elements[13] + tz * this.elements[14];
-      },
-      transpose: function() {
-        var temp = this.elements.slice();
-        this.elements[0] = temp[0];
-        this.elements[1] = temp[4];
-        this.elements[2] = temp[8];
-        this.elements[3] = temp[12];
-        this.elements[4] = temp[1];
-        this.elements[5] = temp[5];
-        this.elements[6] = temp[9];
-        this.elements[7] = temp[13];
-        this.elements[8] = temp[2];
-        this.elements[9] = temp[6];
-        this.elements[10] = temp[10];
-        this.elements[11] = temp[14];
-        this.elements[12] = temp[3];
-        this.elements[13] = temp[7];
-        this.elements[14] = temp[11];
-        this.elements[15] = temp[15];
-      },
-      /*
-        You must either pass in two PVectors or two arrays,
-        don't mix between types. You may also omit a second
-        argument and simply read the result from the return.
-      */
-      mult: function(source, target) {
-        var x, y, z, w;
-        if (source instanceof PVector) {
-          x = source.x;
-          y = source.y;
-          z = source.z;
-          w = 1;
-          if (!target) {
-            target = new PVector();
-          }
-        } else if (source instanceof Array) {
-          x = source[0];
-          y = source[1];
-          z = source[2];
-          w = source[3] || 1;
-
-          if (!target || target.length !== 3 && target.length !== 4) {
-            target = [0, 0, 0];
-          }
-        }
-
-        if (target instanceof Array) {
-          if (target.length === 3) {
-            target[0] = this.elements[0] * x + this.elements[1] * y + this.elements[2] * z + this.elements[3];
-            target[1] = this.elements[4] * x + this.elements[5] * y + this.elements[6] * z + this.elements[7];
-            target[2] = this.elements[8] * x + this.elements[9] * y + this.elements[10] * z + this.elements[11];
-          } else if (target.length === 4) {
-            target[0] = this.elements[0] * x + this.elements[1] * y + this.elements[2] * z + this.elements[3] * w;
-            target[1] = this.elements[4] * x + this.elements[5] * y + this.elements[6] * z + this.elements[7] * w;
-            target[2] = this.elements[8] * x + this.elements[9] * y + this.elements[10] * z + this.elements[11] * w;
-            target[3] = this.elements[12] * x + this.elements[13] * y + this.elements[14] * z + this.elements[15] * w;
-          }
-        }
-        if (target instanceof PVector) {
-          target.x = this.elements[0] * x + this.elements[1] * y + this.elements[2] * z + this.elements[3];
-          target.y = this.elements[4] * x + this.elements[5] * y + this.elements[6] * z + this.elements[7];
-          target.z = this.elements[8] * x + this.elements[9] * y + this.elements[10] * z + this.elements[11];
-        }
-        return target;
-      },
-      preApply: function() {
-        if (arguments.length === 1 && arguments[0] instanceof PMatrix3D) {
-          this.preApply(arguments[0].array());
-        } else if (arguments.length === 16) {
-          var a = arguments;
-          this.preApply([a[0], a[1], a[2], a[3],
-                         a[4], a[5], a[6], a[7],
-                         a[8], a[9], a[10], a[11],
-                         a[12], a[13], a[14], a[15]]);
-        } else if (arguments.length === 1 && arguments[0] instanceof Array) {
-          var source = arguments[0];
-
-          var result = [0, 0, 0, 0,
-                        0, 0, 0, 0,
-                        0, 0, 0, 0,
-                        0, 0, 0, 0];
-          var e = 0;
-          for (var row = 0; row < 4; row++) {
-            for (var col = 0; col < 4; col++, e++) {
-              result[e] += this.elements[col + 0] * source[row * 4 + 0] + this.elements[col + 4] * source[row * 4 + 1] + this.elements[col + 8] * source[row * 4 + 2] + this.elements[col + 12] * source[row * 4 + 3];
-            }
-          }
-          this.elements = result.slice();
-        }
-      },
-      apply: function() {
-        if (arguments.length === 1 && arguments[0] instanceof PMatrix3D) {
-          this.apply(arguments[0].array());
-        } else if (arguments.length === 16) {
-          var a = arguments;
-          this.apply([a[0], a[1], a[2], a[3],
-                      a[4], a[5], a[6], a[7],
-                      a[8], a[9], a[10], a[11],
-                      a[12], a[13], a[14], a[15]]);
-        } else if (arguments.length === 1 && arguments[0] instanceof Array) {
-          var source = arguments[0];
-
-          var result = [0, 0, 0, 0,
-                        0, 0, 0, 0,
-                        0, 0, 0, 0,
-                        0, 0, 0, 0];
-          var e = 0;
-          for (var row = 0; row < 4; row++) {
-            for (var col = 0; col < 4; col++, e++) {
-              result[e] += this.elements[row * 4 + 0] * source[col + 0] + this.elements[row * 4 + 1] * source[col + 4] + this.elements[row * 4 + 2] * source[col + 8] + this.elements[row * 4 + 3] * source[col + 12];
-            }
-          }
-          this.elements = result.slice();
-        }
-      },
-      rotate: function(angle, v0, v1, v2) {
-        if (!v1) {
-          this.rotateZ(angle);
-        } else {
-          // TODO should make sure this vector is normalized
-          var c = p.cos(angle);
-          var s = p.sin(angle);
-          var t = 1.0 - c;
-
-          this.apply((t * v0 * v0) + c, (t * v0 * v1) - (s * v2), (t * v0 * v2) + (s * v1), 0, (t * v0 * v1) + (s * v2), (t * v1 * v1) + c, (t * v1 * v2) - (s * v0), 0, (t * v0 * v2) - (s * v1), (t * v1 * v2) + (s * v0), (t * v2 * v2) + c, 0, 0, 0, 0, 1);
-        }
-      },
-      invApply: function() {
-        if (typeof inverseCopy === "undefined") {
-          inverseCopy = new PMatrix3D();
-        }
-        var a = arguments;
-        inverseCopy.set(a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15]);
-
-        if (!inverseCopy.invert()) {
-          return false;
-        }
-        this.preApply(inverseCopy);
-        return true;
-      },
-      rotateX: function(angle) {
-        var c = p.cos(angle);
-        var s = p.sin(angle);
-        this.apply([1, 0, 0, 0, 0, c, -s, 0, 0, s, c, 0, 0, 0, 0, 1]);
-      },
-
-      rotateY: function(angle) {
-        var c = p.cos(angle);
-        var s = p.sin(angle);
-        this.apply([c, 0, s, 0, 0, 1, 0, 0, -s, 0, c, 0, 0, 0, 0, 1]);
-      },
-      rotateZ: function(angle) {
-        var c = Math.cos(angle);
-        var s = Math.sin(angle);
-        this.apply([c, -s, 0, 0, s, c, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]);
-      },
-      // Uniform scaling if only one value passed in
-      scale: function(sx, sy, sz) {
-        if (sx && !sy && !sz) {
-          sy = sz = sx;
-        } else if (sx && sy && !sz) {
-          sz = 1;
-        }
-
-        if (sx && sy && sz) {
-          this.elements[0] *= sx;
-          this.elements[1] *= sy;
-          this.elements[2] *= sz;
-          this.elements[4] *= sx;
-          this.elements[5] *= sy;
-          this.elements[6] *= sz;
-          this.elements[8] *= sx;
-          this.elements[9] *= sy;
-          this.elements[10] *= sz;
-          this.elements[12] *= sx;
-          this.elements[13] *= sy;
-          this.elements[14] *= sz;
-        }
-      },
-      skewX: function(angle) {
-        var t = p.tan(angle);
-        this.apply(1, t, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
-      },
-      skewY: function(angle) {
-        var t = Math.tan(angle);
-        this.apply(1, 0, 0, 0, t, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
-      },
-      multX: function(x, y, z, w) {
-        if (!z) {
-          return this.elements[0] * x + this.elements[1] * y + this.elements[3];
-        } else if (!w) {
-          return this.elements[0] * x + this.elements[1] * y + this.elements[2] * z + this.elements[3];
-        } else {
-          return this.elements[0] * x + this.elements[1] * y + this.elements[2] * z + this.elements[3] * w;
-        }
-      },
-      multY: function(x, y, z, w) {
-        if (!z) {
-          return this.elements[4] * x + this.elements[5] * y + this.elements[7];
-        } else if (!w) {
-          return this.elements[4] * x + this.elements[5] * y + this.elements[6] * z + this.elements[7];
-        } else {
-          return this.elements[4] * x + this.elements[5] * y + this.elements[6] * z + this.elements[7] * w;
-        }
-      },
-      multZ: function(x, y, z, w) {
-        if (!w) {
-          return this.elements[8] * x + this.elements[9] * y + this.elements[10] * z + this.elements[11];
-        } else {
-          return this.elements[8] * x + this.elements[9] * y + this.elements[10] * z + this.elements[11] * w;
-        }
-      },
-      multW: function(x, y, z, w) {
-        if (!w) {
-          return this.elements[12] * x + this.elements[13] * y + this.elements[14] * z + this.elements[15];
-        } else {
-          return this.elements[12] * x + this.elements[13] * y + this.elements[14] * z + this.elements[15] * w;
-        }
-      },
-      invert: function() {
-        var kInv = [];
-        var fA0 = this.elements[0] * this.elements[5] - this.elements[1] * this.elements[4];
-        var fA1 = this.elements[0] * this.elements[6] - this.elements[2] * this.elements[4];
-        var fA2 = this.elements[0] * this.elements[7] - this.elements[3] * this.elements[4];
-        var fA3 = this.elements[1] * this.elements[6] - this.elements[2] * this.elements[5];
-        var fA4 = this.elements[1] * this.elements[7] - this.elements[3] * this.elements[5];
-        var fA5 = this.elements[2] * this.elements[7] - this.elements[3] * this.elements[6];
-        var fB0 = this.elements[8] * this.elements[13] - this.elements[9] * this.elements[12];
-        var fB1 = this.elements[8] * this.elements[14] - this.elements[10] * this.elements[12];
-        var fB2 = this.elements[8] * this.elements[15] - this.elements[11] * this.elements[12];
-        var fB3 = this.elements[9] * this.elements[14] - this.elements[10] * this.elements[13];
-        var fB4 = this.elements[9] * this.elements[15] - this.elements[11] * this.elements[13];
-        var fB5 = this.elements[10] * this.elements[15] - this.elements[11] * this.elements[14];
-
-        // Determinant
-        var fDet = fA0 * fB5 - fA1 * fB4 + fA2 * fB3 + fA3 * fB2 - fA4 * fB1 + fA5 * fB0;
-
-        // Account for a very small value
-        // return false if not successful.
-        if (Math.abs(fDet) <= 1e-9) {
-          return false;
-        }
-
-        kInv[0] = +this.elements[5] * fB5 - this.elements[6] * fB4 + this.elements[7] * fB3;
-        kInv[4] = -this.elements[4] * fB5 + this.elements[6] * fB2 - this.elements[7] * fB1;
-        kInv[8] = +this.elements[4] * fB4 - this.elements[5] * fB2 + this.elements[7] * fB0;
-        kInv[12] = -this.elements[4] * fB3 + this.elements[5] * fB1 - this.elements[6] * fB0;
-        kInv[1] = -this.elements[1] * fB5 + this.elements[2] * fB4 - this.elements[3] * fB3;
-        kInv[5] = +this.elements[0] * fB5 - this.elements[2] * fB2 + this.elements[3] * fB1;
-        kInv[9] = -this.elements[0] * fB4 + this.elements[1] * fB2 - this.elements[3] * fB0;
-        kInv[13] = +this.elements[0] * fB3 - this.elements[1] * fB1 + this.elements[2] * fB0;
-        kInv[2] = +this.elements[13] * fA5 - this.elements[14] * fA4 + this.elements[15] * fA3;
-        kInv[6] = -this.elements[12] * fA5 + this.elements[14] * fA2 - this.elements[15] * fA1;
-        kInv[10] = +this.elements[12] * fA4 - this.elements[13] * fA2 + this.elements[15] * fA0;
-        kInv[14] = -this.elements[12] * fA3 + this.elements[13] * fA1 - this.elements[14] * fA0;
-        kInv[3] = -this.elements[9] * fA5 + this.elements[10] * fA4 - this.elements[11] * fA3;
-        kInv[7] = +this.elements[8] * fA5 - this.elements[10] * fA2 + this.elements[11] * fA1;
-        kInv[11] = -this.elements[8] * fA4 + this.elements[9] * fA2 - this.elements[11] * fA0;
-        kInv[15] = +this.elements[8] * fA3 - this.elements[9] * fA1 + this.elements[10] * fA0;
-
-        // Inverse using Determinant
-        var fInvDet = 1.0 / fDet;
-        kInv[0] *= fInvDet;
-        kInv[1] *= fInvDet;
-        kInv[2] *= fInvDet;
-        kInv[3] *= fInvDet;
-        kInv[4] *= fInvDet;
-        kInv[5] *= fInvDet;
-        kInv[6] *= fInvDet;
-        kInv[7] *= fInvDet;
-        kInv[8] *= fInvDet;
-        kInv[9] *= fInvDet;
-        kInv[10] *= fInvDet;
-        kInv[11] *= fInvDet;
-        kInv[12] *= fInvDet;
-        kInv[13] *= fInvDet;
-        kInv[14] *= fInvDet;
-        kInv[15] *= fInvDet;
-
-        this.elements = kInv.slice();
-        return true;
-      },
-      toString: function() {
-        var str = "";
-        for (var i = 0; i < 15; i++) {
-          str += this.elements[i] + ", ";
-        }
-        str += this.elements[15];
-        return str;
-      },
-      print: function() {
-        var digits = printMatrixHelper(this.elements);
-
-        var output = "";
-        output += p.nfs(this.elements[0], digits, 4) + " " + p.nfs(this.elements[1], digits, 4) + " " + p.nfs(this.elements[2], digits, 4) + " " + p.nfs(this.elements[3], digits, 4) + "\n";
-        output += p.nfs(this.elements[4], digits, 4) + " " + p.nfs(this.elements[5], digits, 4) + " " + p.nfs(this.elements[6], digits, 4) + " " + p.nfs(this.elements[7], digits, 4) + "\n";
-        output += p.nfs(this.elements[8], digits, 4) + " " + p.nfs(this.elements[9], digits, 4) + " " + p.nfs(this.elements[10], digits, 4) + " " + p.nfs(this.elements[11], digits, 4) + "\n";
-        output += p.nfs(this.elements[12], digits, 4) + " " + p.nfs(this.elements[13], digits, 4) + " " + p.nfs(this.elements[14], digits, 4) + " " + p.nfs(this.elements[15], digits, 4) + "\n\n";
-
-        p.println(output);
-      },
-      invTranslate: function(tx, ty, tz) {
-        this.preApply(1, 0, 0, -tx, 0, 1, 0, -ty, 0, 0, 1, -tz, 0, 0, 0, 1);
-      },
-      invRotateX: function(angle) {
-        var c = p.cos(-angle);
-        var s = p.sin(-angle);
-        this.preApply([1, 0, 0, 0, 0, c, -s, 0, 0, s, c, 0, 0, 0, 0, 1]);
-      },
-      invRotateY: function(angle) {
-        var c = p.cos(-angle);
-        var s = p.sin(-angle);
-        this.preApply([c, 0, s, 0, 0, 1, 0, 0, -s, 0, c, 0, 0, 0, 0, 1]);
-      },
-      invRotateZ: function(angle) {
-        var c = p.cos(-angle);
-        var s = p.sin(-angle);
-        this.preApply([c, -s, 0, 0, s, c, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]);
-      },
-      invScale: function(x, y, z) {
-        this.preApply([1 / x, 0, 0, 0, 0, 1 / y, 0, 0, 0, 0, 1 / z, 0, 0, 0, 0, 1]);
-      }
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Matrix Stack
-    ////////////////////////////////////////////////////////////////////////////
-    var PMatrixStack = function PMatrixStack() {
-      this.matrixStack = [];
-    };
-
-    PMatrixStack.prototype.load = function load() {
-      var tmpMatrix;
-      if (p.use3DContext) {
-        tmpMatrix = new PMatrix3D();
-      } else {
-        tmpMatrix = new PMatrix2D();
-      }
-
-      if (arguments.length === 1) {
-        tmpMatrix.set(arguments[0]);
-      } else {
-        tmpMatrix.set(arguments);
-      }
-      this.matrixStack.push(tmpMatrix);
-    };
-
-    PMatrixStack.prototype.push = function push() {
-      this.matrixStack.push(this.peek());
-    };
-
-    PMatrixStack.prototype.pop = function pop() {
-      return this.matrixStack.pop();
-    };
-
-    PMatrixStack.prototype.peek = function peek() {
-      var tmpMatrix;
-      if (p.use3DContext) {
-        tmpMatrix = new PMatrix3D();
-      } else {
-        tmpMatrix = new PMatrix2D();
-      }
-
-      tmpMatrix.set(this.matrixStack[this.matrixStack.length - 1]);
-      return tmpMatrix;
-    };
-
-    PMatrixStack.prototype.mult = function mult(matrix) {
-      this.matrixStack[this.matrixStack.length - 1].apply(matrix);
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Array handling
-    ////////////////////////////////////////////////////////////////////////////
-    p.split = function(str, delim) {
-      return str.split(delim);
-    };
-
-    p.splitTokens = function(str, tokens) {
-      if (arguments.length === 1) {
-        tokens = "\n\t\r\f ";
-      }
-
-      tokens = "[" + tokens + "]";
-
-      var ary = new Array(0);
-      var index = 0;
-      var pos = str.search(tokens);
-
-      while (pos >= 0) {
-        if (pos === 0) {
-          str = str.substring(1);
-        } else {
-          ary[index] = str.substring(0, pos);
-          index++;
-          str = str.substring(pos);
-        }
-        pos = str.search(tokens);
-      }
-
-      if (str.length > 0) {
-        ary[index] = str;
-      }
-
-      if (ary.length === 0) {
-        ary = undefined;
-      }
-
-      return ary;
-    };
-
-    p.append = function(array, element) {
-      array[array.length] = element;
-      return array;
-    };
-
-    p.concat = function(array1, array2) {
-      return array1.concat(array2);
-    };
-
-    p.sort = function(array, numElem) {
-      var ret = [];
-
-      // depending on the type used (int, float) or string
-      // we'll need to use a different compare function
-      if (array.length > 0) {
-        // copy since we need to return another array
-        var elemsToCopy = numElem > 0 ? numElem : array.length;
-        for (var i = 0; i < elemsToCopy; i++) {
-          ret.push(array[i]);
-        }
-        if (typeof array[0] === "string") {
-          ret.sort();
-        }
-        // int or float
-        else {
-          ret.sort(function(a, b) {
-            return a - b;
-          });
-        }
-
-        // copy on the rest of the elements that were not sorted in case the user
-        // only wanted a subset of an array to be sorted.
-        if (numElem > 0) {
-          for (var j = ret.length; j < array.length; j++) {
-            ret.push(array[j]);
-          }
-        }
-      }
-      return ret;
-    };
-
-    p.splice = function(array, value, index) {
-      if (array.length === 0 && value.length === 0) {
-        return array;
-      }
-
-      if (value instanceof Array) {
-        for (var i = 0, j = index; i < value.length; j++, i++) {
-          array.splice(j, 0, value[i]);
-        }
-      } else {
-        array.splice(index, 0, value);
-      }
-
-      return array;
-    };
-
-    p.subset = function(array, offset, length) {
-      if (arguments.length === 2) {
-        return p.subset(array, offset, array.length - offset);
-      } else if (arguments.length === 3) {
-        return array.slice(offset, offset + length);
-      }
-    };
-
-    p.join = function(array, seperator) {
-      return array.join(seperator);
-    };
-
-    p.shorten = function(ary) {
-      var newary = new Array(0);
-
-      // copy array into new array
-      var len = ary.length;
-      for (var i = 0; i < len; i++) {
-        newary[i] = ary[i];
-      }
-      newary.pop();
-
-      return newary;
-    };
-
-    p.expand = function(ary, newSize) {
-      var newary = new Array(0);
-
-      var len = ary.length;
-      for (var i = 0; i < len; i++) {
-        newary[i] = ary[i];
-      }
-
-      if (arguments.length === 1) {
-        // double size of array
-        newary.length *= 2;
-      } else if (arguments.length === 2) {
-        // size is newSize
-        newary.length = newSize;
-      }
-
-      return newary;
-    };
-
-    p.arrayCopy = function(src, srcPos, dest, destPos, length) {
-      if (arguments.length === 2) {
-        // recall itself and copy src to dest from start index 0 to 0 of src.length
-        p.arrayCopy(src, 0, srcPos, 0, src.length);
-      } else if (arguments.length === 3) {
-        // recall itself and copy src to dest from start index 0 to 0 of length
-        p.arrayCopy(src, 0, srcPos, 0, dest);
-      } else if (arguments.length === 5) {
-        // copy src to dest from index srcPos to index destPos of length recursivly on objects
-        for (var i = srcPos, j = destPos; i < length + srcPos; i++, j++) {
-          if (src[i] && typeof src[i] === "object") {
-            // src[i] is not null and is another object or array. go recursive
-            p.arrayCopy(src[i], 0, dest[j], 0, src[i].length);
-          } else {
-            // standard type, just copy
-            dest[j] = src[i];
-          }
-        }
-      }
-    };
-
-    p.ArrayList = function() {
-      var createArrayList = function(args){
-        var array = [];
-        for (var i = 0; i < args[0]; i++){
-          array[i] = (args.length > 1 ? createArrayList(args.slice(1)) : 0 );
-        }
-
-        array.get = function(i) {
-          return this[i];
-        };
-        array.contains = function(item) {
-          return this.indexOf(item) !== -1;
-        };
-        array.add = function(item) {
-          return this.push(item);
-        };
-        array.size = function() {
-          return this.length;
-        };
-        array.clear = function() {
-          this.length = 0;
-        };
-        array.remove = function(i) {
-          return this.splice(i, 1)[0];
-        };
-        array.isEmpty = function() {
-          return !this.length;
-        };
-        array.clone = function() {
-          var size = this.length;
-          var a = new p.ArrayList(size);
-          for (var i = 0; i < size; i++) {
-            a[i] = this[i];
-          }
-          return a;
-        };
-
-        return array;
-      };
-      return createArrayList(Array.prototype.slice.call(arguments));
-    };
-
-    p.reverse = function(array) {
-      return array.reverse();
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // HashMap
-    ////////////////////////////////////////////////////////////////////////////
-
-    var virtHashCode = function virtHashCode(obj) {
-      if (obj.constructor === String) {
-        var hash = 0;
-        for (var i = 0; i < obj.length; ++i) {
-          hash = (hash * 31 + obj.charCodeAt(i)) & 0xFFFFFFFF;
-        }
-        return hash;
-      } else if (typeof(obj) !== "object") {
-        return obj & 0xFFFFFFFF;
-      } else if ("hashCode" in obj) {
-        return obj.hashCode.call(obj);
-      } else {
-        if (obj.$id === undefined) {
-          obj.$id = ((Math.floor(Math.random() * 0x10000) - 0x8000) << 16) | Math.floor(Math.random() * 0x10000);
-        }
-        return obj.$id;
-      }
-    };
-
-    var virtEquals = function virtEquals(obj, other) {
-      if (obj === null || other === null) {
-        return (obj === null) && (other === null);
-      } else if (obj.constructor === String) {
-        return obj === other;
-      } else if (typeof(obj) !== "object") {
-        return obj === other;
-      } else if ("equals" in obj) {
-        return obj.equals.call(obj, other);
-      } else {
-        return obj === other;
-      }
-    };
-
-    p.HashMap = function HashMap() {
-      if (arguments.length === 1 && arguments[0].constructor === HashMap) {
-        return arguments[0].clone();
-      }
-
-      var initialCapacity = arguments.length > 0 ? arguments[0] : 16;
-      var loadFactor = arguments.length > 1 ? arguments[1] : 0.75;
-
-      var buckets = new Array(initialCapacity);
-      var count = 0;
-      var hashMap = this;
-
-      function ensureLoad() {
-        if (count <= loadFactor * buckets.length) {
-          return;
-        }
-        var allEntries = [];
-        for (var i = 0; i < buckets.length; ++i) {
-          if (buckets[i] !== undefined) {
-            allEntries = allEntries.concat(buckets[i]);
-          }
-        }
-        buckets = new Array(buckets.length * 2);
-        for (var j = 0; j < allEntries.length; ++j) {
-          var index = virtHashCode(allEntries[j].key) % buckets.length;
-          var bucket = buckets[index];
-          if (bucket === undefined) {
-            buckets[index] = bucket = [];
-          }
-          bucket.push(allEntries[j]);
-        }
-      }
-
-      function Iterator(conversion, removeItem) {
-        var bucketIndex = 0;
-        var itemIndex = -1;
-        var endOfBuckets = false;
-
-        function findNext() {
-          while (!endOfBuckets) {
-            ++itemIndex;
-            if (bucketIndex >= buckets.length) {
-              endOfBuckets = true;
-            } else if (typeof(buckets[bucketIndex]) === 'undefined' || itemIndex >= buckets[bucketIndex].length) {
-              itemIndex = -1;
-              ++bucketIndex;
-            } else {
-              return;
-            }
-          }
-        }
-
-        this.hasNext = function() {
-          return !endOfBuckets;
-        };
-        this.next = function() {
-          var result = conversion(buckets[bucketIndex][itemIndex]);
-          findNext();
-          return result;
-        };
-        this.remove = function() {
-          removeItem(this.next());
-          --itemIndex;
-        };
-
-        findNext();
-      }
-
-      function Set(conversion, isIn, removeItem) {
-        this.clear = function() {
-          hashMap.clear();
-        };
-        this.contains = function(o) {
-          return isIn(o);
-        };
-        this.containsAll = function(o) {
-          var it = o.iterator();
-          while (it.hasNext()) {
-            if (!this.contains(it.next())) {
-              return false;
-            }
-          }
-          return true;
-        };
-        this.isEmpty = function() {
-          return hashMap.isEmpty();
-        };
-        this.iterator = function() {
-          return new Iterator(conversion, removeItem);
-        };
-        this.remove = function(o) {
-          if (this.contains(o)) {
-            removeItem(o);
-            return true;
-          }
-          return false;
-        };
-        this.removeAll = function(c) {
-          var it = c.iterator();
-          var changed = false;
-          while (it.hasNext()) {
-            var item = it.next();
-            if (this.contains(item)) {
-              removeItem(item);
-              changed = true;
-            }
-          }
-          return true;
-        };
-        this.retainAll = function(c) {
-          var it = this.iterator();
-          var toRemove = [];
-          while (it.hasNext()) {
-            var entry = it.next();
-            if (!c.contains(entry)) {
-              toRemove.push(entry);
-            }
-          }
-          for (var i = 0; i < toRemove.length; ++i) {
-            removeItem(toRemove[i]);
-          }
-          return toRemove.length > 0;
-        };
-        this.size = function() {
-          return hashMap.size();
-        };
-        this.toArray = function() {
-          var result = new p.ArrayList(0);
-          var it = this.iterator();
-          while (it.hasNext()) {
-            result.push(it.next());
-          }
-          return result;
-        };
-      }
-
-      function Entry(pair) {
-        this._isIn = function(map) {
-          return map === hashMap && (typeof(pair.removed) === 'undefined');
-        };
-        this.equals = function(o) {
-          return virtEquals(pair.key, o.getKey());
-        };
-        this.getKey = function() {
-          return pair.key;
-        };
-        this.getValue = function() {
-          return pair.value;
-        };
-        this.hashCode = function(o) {
-          return virtHashCode(pair.key);
-        };
-        this.setValue = function(value) {
-          var old = pair.value;
-          pair.value = value;
-          return old;
-        };
-      }
-
-      this.clear = function() {
-        count = 0;
-        buckets = new Array(initialCapacity);
-      };
-      this.clone = function() {
-        var map = new p.HashMap();
-        map.putAll(this);
-        return map;
-      };
-      this.containsKey = function(key) {
-        var index = virtHashCode(key) % buckets.length;
-        var bucket = buckets[index];
-        if (bucket === undefined) {
-          return false;
-        }
-        for (var i = 0; i < bucket.length; ++i) {
-          if (virtEquals(bucket[i].key, key)) {
-            return true;
-          }
-        }
-        return false;
-      };
-      this.containsValue = function(value) {
-        for (var i = 0; i < buckets.length; ++i) {
-          var bucket = buckets[i];
-          if (bucket === undefined) {
-            continue;
-          }
-          for (var j = 0; j < bucket.length; ++j) {
-            if (virtEquals(bucket[j].value, value)) {
-              return true;
-            }
-          }
-        }
-        return false;
-      };
-      this.entrySet = function() {
-        return new Set(
-
-        function(pair) {
-          return new Entry(pair);
-        },
-
-        function(pair) {
-          return pair.constructor === Entry && pair._isIn(hashMap);
-        },
-
-        function(pair) {
-          return hashMap.remove(pair.getKey());
-        });
-      };
-      this.get = function(key) {
-        var index = virtHashCode(key) % buckets.length;
-        var bucket = buckets[index];
-        if (bucket === undefined) {
-          return null;
-        }
-        for (var i = 0; i < bucket.length; ++i) {
-          if (virtEquals(bucket[i].key, key)) {
-            return bucket[i].value;
-          }
-        }
-        return null;
-      };
-      this.isEmpty = function() {
-        return count === 0;
-      };
-      this.keySet = function() {
-        return new Set(
-
-        function(pair) {
-          return pair.key;
-        },
-
-        function(key) {
-          return hashMap.containsKey(key);
-        },
-
-        function(key) {
-          return hashMap.remove(key);
-        });
-      };
-      this.put = function(key, value) {
-        var index = virtHashCode(key) % buckets.length;
-        var bucket = buckets[index];
-        if (bucket === undefined) {
-          ++count;
-          buckets[index] = [{
-            key: key,
-            value: value
-          }];
-          ensureLoad();
-          return null;
-        }
-        for (var i = 0; i < bucket.length; ++i) {
-          if (virtEquals(bucket[i].key, key)) {
-            var previous = bucket[i].value;
-            bucket[i].value = value;
-            return previous;
-          }
-        }++count;
-        bucket.push({
-          key: key,
-          value: value
-        });
-        ensureLoad();
-        return null;
-      };
-      this.putAll = function(m) {
-        var it = m.entrySet().iterator();
-        while (it.hasNext()) {
-          var entry = it.next();
-          this.put(entry.getKey(), entry.getValue());
-        }
-      };
-      this.remove = function(key) {
-        var index = virtHashCode(key) % buckets.length;
-        var bucket = buckets[index];
-        if (bucket === undefined) {
-          return null;
-        }
-        for (var i = 0; i < bucket.length; ++i) {
-          if (virtEquals(bucket[i].key, key)) {
-            --count;
-            var previous = bucket[i].value;
-            bucket[i].removed = true;
-            if (bucket.length > 1) {
-              bucket.splice(i, 1);
-            } else {
-              buckets[index] = undefined;
-            }
-            return previous;
-          }
-        }
-        return null;
-      };
-      this.size = function() {
-        return count;
-      };
-      this.values = function() {
-        var result = new p.ArrayList(0);
-        var it = this.entrySet().iterator();
-        while (it.hasNext()) {
-          var entry = it.next();
-          result.push(entry.getValue());
-        }
-        return result;
-      };
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Color functions
-    ////////////////////////////////////////////////////////////////////////////
-
-    // helper functions for internal blending modes
-    p.mix = function(a, b, f) {
-      return a + (((b - a) * f) >> 8);
-    };
-
-    p.peg = function(n) {
-      return (n < 0) ? 0 : ((n > 255) ? 255 : n);
-    };
-
-    // blending modes
-    p.modes = {
-      replace: function(c1, c2) {
-        return c2;
-      },
-      blend: function(c1, c2) {
-        var f = (c2 & p.ALPHA_MASK) >>> 24;
-        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | p.mix(c1 & p.RED_MASK, c2 & p.RED_MASK, f) & p.RED_MASK | p.mix(c1 & p.GREEN_MASK, c2 & p.GREEN_MASK, f) & p.GREEN_MASK | p.mix(c1 & p.BLUE_MASK, c2 & p.BLUE_MASK, f));
-      },
-      add: function(c1, c2) {
-        var f = (c2 & p.ALPHA_MASK) >>> 24;
-        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | Math.min(((c1 & p.RED_MASK) + ((c2 & p.RED_MASK) >> 8) * f), p.RED_MASK) & p.RED_MASK | Math.min(((c1 & p.GREEN_MASK) + ((c2 & p.GREEN_MASK) >> 8) * f), p.GREEN_MASK) & p.GREEN_MASK | Math.min((c1 & p.BLUE_MASK) + (((c2 & p.BLUE_MASK) * f) >> 8), p.BLUE_MASK));
-      },
-      subtract: function(c1, c2) {
-        var f = (c2 & p.ALPHA_MASK) >>> 24;
-        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | Math.max(((c1 & p.RED_MASK) - ((c2 & p.RED_MASK) >> 8) * f), p.GREEN_MASK) & p.RED_MASK | Math.max(((c1 & p.GREEN_MASK) - ((c2 & p.GREEN_MASK) >> 8) * f), p.BLUE_MASK) & p.GREEN_MASK | Math.max((c1 & p.BLUE_MASK) - (((c2 & p.BLUE_MASK) * f) >> 8), 0));
-      },
-      lightest: function(c1, c2) {
-        var f = (c2 & p.ALPHA_MASK) >>> 24;
-        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | Math.max(c1 & p.RED_MASK, ((c2 & p.RED_MASK) >> 8) * f) & p.RED_MASK | Math.max(c1 & p.GREEN_MASK, ((c2 & p.GREEN_MASK) >> 8) * f) & p.GREEN_MASK | Math.max(c1 & p.BLUE_MASK, ((c2 & p.BLUE_MASK) * f) >> 8));
-      },
-      darkest: function(c1, c2) {
-        var f = (c2 & p.ALPHA_MASK) >>> 24;
-        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | p.mix(c1 & p.RED_MASK, Math.min(c1 & p.RED_MASK, ((c2 & p.RED_MASK) >> 8) * f), f) & p.RED_MASK | p.mix(c1 & p.GREEN_MASK, Math.min(c1 & p.GREEN_MASK, ((c2 & p.GREEN_MASK) >> 8) * f), f) & p.GREEN_MASK | p.mix(c1 & p.BLUE_MASK, Math.min(c1 & p.BLUE_MASK, ((c2 & p.BLUE_MASK) * f) >> 8), f));
-      },
-      difference: function(c1, c2) {
-        var f = (c2 & p.ALPHA_MASK) >>> 24;
-        var ar = (c1 & p.RED_MASK) >> 16;
-        var ag = (c1 & p.GREEN_MASK) >> 8;
-        var ab = (c1 & p.BLUE_MASK);
-        var br = (c2 & p.RED_MASK) >> 16;
-        var bg = (c2 & p.GREEN_MASK) >> 8;
-        var bb = (c2 & p.BLUE_MASK);
-        // formula:
-        var cr = (ar > br) ? (ar - br) : (br - ar);
-        var cg = (ag > bg) ? (ag - bg) : (bg - ag);
-        var cb = (ab > bb) ? (ab - bb) : (bb - ab);
-        // alpha blend (this portion will always be the same)
-        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | (p.peg(ar + (((cr - ar) * f) >> 8)) << 16) | (p.peg(ag + (((cg - ag) * f) >> 8)) << 8) | (p.peg(ab + (((cb - ab) * f) >> 8))));
-      },
-      exclusion: function(c1, c2) {
-        var f = (c2 & p.ALPHA_MASK) >>> 24;
-        var ar = (c1 & p.RED_MASK) >> 16;
-        var ag = (c1 & p.GREEN_MASK) >> 8;
-        var ab = (c1 & p.BLUE_MASK);
-        var br = (c2 & p.RED_MASK) >> 16;
-        var bg = (c2 & p.GREEN_MASK) >> 8;
-        var bb = (c2 & p.BLUE_MASK);
-        // formula:
-        var cr = ar + br - ((ar * br) >> 7);
-        var cg = ag + bg - ((ag * bg) >> 7);
-        var cb = ab + bb - ((ab * bb) >> 7);
-        // alpha blend (this portion will always be the same)
-        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | (p.peg(ar + (((cr - ar) * f) >> 8)) << 16) | (p.peg(ag + (((cg - ag) * f) >> 8)) << 8) | (p.peg(ab + (((cb - ab) * f) >> 8))));
-      },
-      multiply: function(c1, c2) {
-        var f = (c2 & p.ALPHA_MASK) >>> 24;
-        var ar = (c1 & p.RED_MASK) >> 16;
-        var ag = (c1 & p.GREEN_MASK) >> 8;
-        var ab = (c1 & p.BLUE_MASK);
-        var br = (c2 & p.RED_MASK) >> 16;
-        var bg = (c2 & p.GREEN_MASK) >> 8;
-        var bb = (c2 & p.BLUE_MASK);
-        // formula:
-        var cr = (ar * br) >> 8;
-        var cg = (ag * bg) >> 8;
-        var cb = (ab * bb) >> 8;
-        // alpha blend (this portion will always be the same)
-        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | (p.peg(ar + (((cr - ar) * f) >> 8)) << 16) | (p.peg(ag + (((cg - ag) * f) >> 8)) << 8) | (p.peg(ab + (((cb - ab) * f) >> 8))));
-      },
-      screen: function(c1, c2) {
-        var f = (c2 & p.ALPHA_MASK) >>> 24;
-        var ar = (c1 & p.RED_MASK) >> 16;
-        var ag = (c1 & p.GREEN_MASK) >> 8;
-        var ab = (c1 & p.BLUE_MASK);
-        var br = (c2 & p.RED_MASK) >> 16;
-        var bg = (c2 & p.GREEN_MASK) >> 8;
-        var bb = (c2 & p.BLUE_MASK);
-        // formula:
-        var cr = 255 - (((255 - ar) * (255 - br)) >> 8);
-        var cg = 255 - (((255 - ag) * (255 - bg)) >> 8);
-        var cb = 255 - (((255 - ab) * (255 - bb)) >> 8);
-        // alpha blend (this portion will always be the same)
-        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | (p.peg(ar + (((cr - ar) * f) >> 8)) << 16) | (p.peg(ag + (((cg - ag) * f) >> 8)) << 8) | (p.peg(ab + (((cb - ab) * f) >> 8))));
-      },
-      hard_light: function(c1, c2) {
-        var f = (c2 & p.ALPHA_MASK) >>> 24;
-        var ar = (c1 & p.RED_MASK) >> 16;
-        var ag = (c1 & p.GREEN_MASK) >> 8;
-        var ab = (c1 & p.BLUE_MASK);
-        var br = (c2 & p.RED_MASK) >> 16;
-        var bg = (c2 & p.GREEN_MASK) >> 8;
-        var bb = (c2 & p.BLUE_MASK);
-        // formula:
-        var cr = (br < 128) ? ((ar * br) >> 7) : (255 - (((255 - ar) * (255 - br)) >> 7));
-        var cg = (bg < 128) ? ((ag * bg) >> 7) : (255 - (((255 - ag) * (255 - bg)) >> 7));
-        var cb = (bb < 128) ? ((ab * bb) >> 7) : (255 - (((255 - ab) * (255 - bb)) >> 7));
-        // alpha blend (this portion will always be the same)
-        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | (p.peg(ar + (((cr - ar) * f) >> 8)) << 16) | (p.peg(ag + (((cg - ag) * f) >> 8)) << 8) | (p.peg(ab + (((cb - ab) * f) >> 8))));
-      },
-      soft_light: function(c1, c2) {
-        var f = (c2 & p.ALPHA_MASK) >>> 24;
-        var ar = (c1 & p.RED_MASK) >> 16;
-        var ag = (c1 & p.GREEN_MASK) >> 8;
-        var ab = (c1 & p.BLUE_MASK);
-        var br = (c2 & p.RED_MASK) >> 16;
-        var bg = (c2 & p.GREEN_MASK) >> 8;
-        var bb = (c2 & p.BLUE_MASK);
-        // formula:
-        var cr = ((ar * br) >> 7) + ((ar * ar) >> 8) - ((ar * ar * br) >> 15);
-        var cg = ((ag * bg) >> 7) + ((ag * ag) >> 8) - ((ag * ag * bg) >> 15);
-        var cb = ((ab * bb) >> 7) + ((ab * ab) >> 8) - ((ab * ab * bb) >> 15);
-        // alpha blend (this portion will always be the same)
-        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | (p.peg(ar + (((cr - ar) * f) >> 8)) << 16) | (p.peg(ag + (((cg - ag) * f) >> 8)) << 8) | (p.peg(ab + (((cb - ab) * f) >> 8))));
-      },
-      overlay: function(c1, c2) {
-        var f = (c2 & p.ALPHA_MASK) >>> 24;
-        var ar = (c1 & p.RED_MASK) >> 16;
-        var ag = (c1 & p.GREEN_MASK) >> 8;
-        var ab = (c1 & p.BLUE_MASK);
-        var br = (c2 & p.RED_MASK) >> 16;
-        var bg = (c2 & p.GREEN_MASK) >> 8;
-        var bb = (c2 & p.BLUE_MASK);
-        // formula:
-        var cr = (ar < 128) ? ((ar * br) >> 7) : (255 - (((255 - ar) * (255 - br)) >> 7));
-        var cg = (ag < 128) ? ((ag * bg) >> 7) : (255 - (((255 - ag) * (255 - bg)) >> 7));
-        var cb = (ab < 128) ? ((ab * bb) >> 7) : (255 - (((255 - ab) * (255 - bb)) >> 7));
-        // alpha blend (this portion will always be the same)
-        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | (p.peg(ar + (((cr - ar) * f) >> 8)) << 16) | (p.peg(ag + (((cg - ag) * f) >> 8)) << 8) | (p.peg(ab + (((cb - ab) * f) >> 8))));
-      },
-      dodge: function(c1, c2) {
-        var f = (c2 & p.ALPHA_MASK) >>> 24;
-        var ar = (c1 & p.RED_MASK) >> 16;
-        var ag = (c1 & p.GREEN_MASK) >> 8;
-        var ab = (c1 & p.BLUE_MASK);
-        var br = (c2 & p.RED_MASK) >> 16;
-        var bg = (c2 & p.GREEN_MASK) >> 8;
-        var bb = (c2 & p.BLUE_MASK);
-        // formula:
-        var cr = (br === 255) ? 255 : p.peg((ar << 8) / (255 - br)); // division requires pre-peg()-ing
-        var cg = (bg === 255) ? 255 : p.peg((ag << 8) / (255 - bg)); // "
-        var cb = (bb === 255) ? 255 : p.peg((ab << 8) / (255 - bb)); // "
-        // alpha blend (this portion will always be the same)
-        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | (p.peg(ar + (((cr - ar) * f) >> 8)) << 16) | (p.peg(ag + (((cg - ag) * f) >> 8)) << 8) | (p.peg(ab + (((cb - ab) * f) >> 8))));
-      },
-      burn: function(c1, c2) {
-        var f = (c2 & p.ALPHA_MASK) >>> 24;
-        var ar = (c1 & p.RED_MASK) >> 16;
-        var ag = (c1 & p.GREEN_MASK) >> 8;
-        var ab = (c1 & p.BLUE_MASK);
-        var br = (c2 & p.RED_MASK) >> 16;
-        var bg = (c2 & p.GREEN_MASK) >> 8;
-        var bb = (c2 & p.BLUE_MASK);
-        // formula:
-        var cr = (br === 0) ? 0 : 255 - p.peg(((255 - ar) << 8) / br); // division requires pre-peg()-ing
-        var cg = (bg === 0) ? 0 : 255 - p.peg(((255 - ag) << 8) / bg); // "
-        var cb = (bb === 0) ? 0 : 255 - p.peg(((255 - ab) << 8) / bb); // "
-        // alpha blend (this portion will always be the same)
-        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | (p.peg(ar + (((cr - ar) * f) >> 8)) << 16) | (p.peg(ag + (((cg - ag) * f) >> 8)) << 8) | (p.peg(ab + (((cb - ab) * f) >> 8))));
-      }
-    };
-
-    p.color = function color(aValue1, aValue2, aValue3, aValue4) {
-      var r, g, b, a, rgb, aColor;
-
-      // 4 arguments: (R, G, B, A) or (H, S, B, A)
-      if (aValue1 != null && aValue2 != null && aValue3 != null && aValue4 != null) {
-        if (curColorMode === p.HSB) {
-          rgb = p.color.toRGB(aValue1, aValue2, aValue3);
-          r = rgb[0];
-          g = rgb[1];
-          b = rgb[2];
-        } else {
-          r = Math.round(255 * (aValue1 / colorModeX));
-          g = Math.round(255 * (aValue2 / colorModeY));
-          b = Math.round(255 * (aValue3 / colorModeZ));
-        }
-
-        a = Math.round(255 * (aValue4 / colorModeA));
-
-        // Limit values greater than 255
-        r = (r > 255) ? 255 : r;
-        g = (g > 255) ? 255 : g;
-        b = (b > 255) ? 255 : b;
-        a = (a > 255) ? 255 : a;
-
-        // Create color int
-        aColor = (a << 24) & p.ALPHA_MASK | (r << 16) & p.RED_MASK | (g << 8) & p.GREEN_MASK | b & p.BLUE_MASK;
-      }
-
-      // 3 arguments: (R, G, B) or (H, S, B)
-      else if (aValue1 != null && aValue2 != null && aValue3 != null) {
-        aColor = p.color(aValue1, aValue2, aValue3, colorModeA);
-      }
-
-      // 2 arguments: (Color, A) or (Grayscale, A)
-      else if (aValue1 != null && aValue2 != null) {
-        // Color int and alpha
-        if (aValue1 & p.ALPHA_MASK) {
-          a = Math.round(255 * (aValue2 / colorModeA));
-          a = (a > 255) ? 255 : a;
-
-          aColor = aValue1 - (aValue1 & p.ALPHA_MASK) + ((a << 24) & p.ALPHA_MASK);
-        }
-        // Grayscale and alpha
-        else {
-          switch(curColorMode) {
-            case p.RGB: aColor = p.color(aValue1, aValue1, aValue1, aValue2); break;
-            case p.HSB: aColor = p.color(0, 0, (aValue1 / colorModeX) * colorModeZ, aValue2); break;
-          }
-        }
-      }
-
-      // 1 argument: (Grayscale) or (Color)
-      else if (typeof aValue1 === "number") {
-        // Grayscale
-        if (aValue1 <= colorModeX && aValue1 >= 0) {
-          switch(curColorMode) {
-            case p.RGB: aColor = p.color(aValue1, aValue1, aValue1, colorModeA); break;
-            case p.HSB: aColor = p.color(0, 0, (aValue1 / colorModeX) * colorModeZ, colorModeA); break;
-          }
-        }
-        // Color int
-        else if (aValue1) {
-          aColor = aValue1;
-        }
-      }
-
-      // Default
-      else {
-        aColor = p.color(colorModeX, colorModeY, colorModeZ, colorModeA);
-      }
-
-      return aColor;
-    };
-
-    // Ease of use function to extract the colour bits into a string
-    p.color.toString = function(colorInt) {
-      return "rgba(" + ((colorInt & p.RED_MASK) >>> 16) + "," + ((colorInt & p.GREEN_MASK) >>> 8) + "," + ((colorInt & p.BLUE_MASK)) + "," + ((colorInt & p.ALPHA_MASK) >>> 24) / 255 + ")";
-    };
-
-    // Easy of use function to pack rgba values into a single bit-shifted color int.
-    p.color.toInt = function(r, g, b, a) {
-      return (a << 24) & p.ALPHA_MASK | (r << 16) & p.RED_MASK | (g << 8) & p.GREEN_MASK | b & p.BLUE_MASK;
-    };
-
-    // Creates a simple array in [R, G, B, A] format, [255, 255, 255, 255]
-    p.color.toArray = function(colorInt) {
-      return [(colorInt & p.RED_MASK) >>> 16, (colorInt & p.GREEN_MASK) >>> 8, colorInt & p.BLUE_MASK, (colorInt & p.ALPHA_MASK) >>> 24];
-    };
-
-    // Creates a WebGL color array in [R, G, B, A] format. WebGL wants the color ranges between 0 and 1, [1, 1, 1, 1]
-    p.color.toGLArray = function(colorInt) {
-      return [((colorInt & p.RED_MASK) >>> 16) / 255, ((colorInt & p.GREEN_MASK) >>> 8) / 255, (colorInt & p.BLUE_MASK) / 255, ((colorInt & p.ALPHA_MASK) >>> 24) / 255];
-    };
-
-    // HSB conversion function from Mootools, MIT Licensed
-    p.color.toRGB = function(h, s, b) {
-      // Limit values greater than range
-      h = (h > colorModeX)   ? colorModeX   : h;
-      s = (s > colorModeY) ? colorModeY : s;
-      b = (b > colorModeZ)  ? colorModeZ  : b;
-
-      h = (h / colorModeX) * 360;
-      s = (s / colorModeY) * 100;
-      b = (b / colorModeZ) * 100;
-
-      var br = Math.round(b / 100 * 255);
-
-      if (s === 0) { // Grayscale
-        return [br, br, br];
-      } else {
-        var hue = h % 360;
-        var f = hue % 60;
-        var p = Math.round((b * (100 - s)) / 10000 * 255);
-        var q = Math.round((b * (6000 - s * f)) / 600000 * 255);
-        var t = Math.round((b * (6000 - s * (60 - f))) / 600000 * 255);
-        switch (Math.floor(hue / 60)) {
-        case 0:
-          return [br, t, p];
-        case 1:
-          return [q, br, p];
-        case 2:
-          return [p, br, t];
-        case 3:
-          return [p, q, br];
-        case 4:
-          return [t, p, br];
-        case 5:
-          return [br, p, q];
-        }
-      }
-    };
-
-    p.color.toHSB = function( colorInt ) {
-      var red, green, blue;
-
-      red = ((colorInt & p.RED_MASK) >>> 16) / 255;
-      green = ((colorInt & p.GREEN_MASK) >>> 8) / 255;
-      blue = (colorInt & p.BLUE_MASK) / 255;
-
-      var max = p.max(p.max(red,green), blue),
-          min = p.min(p.min(red,green), blue),
-          hue, saturation;
-
-      if (min === max) {
-        return [0, 0, max];
-      } else {
-        saturation = (max - min) / max;
-
-        if (red === max) {
-          hue = (green - blue) / (max - min);
-        } else if (green === max) {
-          hue = 2 + ((blue - red) / (max - min));
-        } else {
-          hue = 4 + ((red - green) / (max - min));
-        }
-
-        hue /= 6;
-
-        if (hue < 0) {
-          hue += 1;
-        } else if (hue > 1) {
-          hue -= 1;
-        }
-      }
-      return [hue*colorModeX, saturation*colorModeY, max*colorModeZ];
-    };
-
-    p.brightness = function(colInt){
-      return  p.color.toHSB(colInt)[2];
-    };
-
-    p.saturation = function(colInt){
-      return  p.color.toHSB(colInt)[1];
-    };
-
-    p.hue = function(colInt){
-      return  p.color.toHSB(colInt)[0];
-    };
-
-    var verifyChannel = function verifyChannel(aColor) {
-      if (aColor.constructor === Array) {
-        return aColor;
-      } else {
-        return p.color(aColor);
-      }
-    };
-
-    p.red = function(aColor) {
-      return ((aColor & p.RED_MASK) >>> 16) / 255 * colorModeX;
-    };
-
-    p.green = function(aColor) {
-      return ((aColor & p.GREEN_MASK) >>> 8) / 255 * colorModeY;
-    };
-
-    p.blue = function(aColor) {
-      return (aColor & p.BLUE_MASK) / 255 * colorModeZ;
-    };
-
-    p.alpha = function(aColor) {
-      return ((aColor & p.ALPHA_MASK) >>> 24) / 255 * colorModeA;
-    };
-
-    p.lerpColor = function lerpColor(c1, c2, amt) {
-      // Get RGBA values for Color 1 to floats
-      var colorBits1 = p.color(c1);
-      var r1 = (colorBits1 & p.RED_MASK) >>> 16;
-      var g1 = (colorBits1 & p.GREEN_MASK) >>> 8;
-      var b1 = (colorBits1 & p.BLUE_MASK);
-      var a1 = ((colorBits1 & p.ALPHA_MASK) >>> 24) / colorModeA;
-
-      // Get RGBA values for Color 2 to floats
-      var colorBits2 = p.color(c2);
-      var r2 = (colorBits2 & p.RED_MASK) >>> 16;
-      var g2 = (colorBits2 & p.GREEN_MASK) >>> 8;
-      var b2 = (colorBits2 & p.BLUE_MASK);
-      var a2 = ((colorBits2 & p.ALPHA_MASK) >>> 24) / colorModeA;
-
-      // Return lerp value for each channel, INT for color, Float for Alpha-range
-      var r = parseInt(p.lerp(r1, r2, amt), 10);
-      var g = parseInt(p.lerp(g1, g2, amt), 10);
-      var b = parseInt(p.lerp(b1, b2, amt), 10);
-      var a = parseFloat(p.lerp(a1, a2, amt) * colorModeA, 10);
-
-      return p.color.toInt(r, g, b, a);
-    };
-
-    // Forced default color mode for #aaaaaa style
-    p.defaultColor = function(aValue1, aValue2, aValue3) {
-      var tmpColorMode = curColorMode;
-      curColorMode = p.RGB;
-      var c = p.color(aValue1 / 255 * colorModeX, aValue2 / 255 * colorModeY, aValue3 / 255 * colorModeZ);
-      curColorMode = tmpColorMode;
-      return c;
-    };
-
-    p.colorMode = function colorMode(mode, range1, range2, range3, range4) {
-      curColorMode = mode;
-      if (arguments.length >= 4) {
-        colorModeX = range1;
-        colorModeY = range2;
-        colorModeZ = range3;
-      }
-      if (arguments.length === 5) {
-        colorModeA = range4;
-      }
-      if (arguments.length === 2) {
-        p.colorMode(mode, range1, range1, range1, range1);
-      }
-    };
-
-    p.blendColor = function(c1, c2, mode) {
-      var color = 0;
-      switch (mode) {
-      case p.REPLACE:
-        color = p.modes.replace(c1, c2);
-        break;
-      case p.BLEND:
-        color = p.modes.blend(c1, c2);
-        break;
-      case p.ADD:
-        color = p.modes.add(c1, c2);
-        break;
-      case p.SUBTRACT:
-        color = p.modes.subtract(c1, c2);
-        break;
-      case p.LIGHTEST:
-        color = p.modes.lightest(c1, c2);
-        break;
-      case p.DARKEST:
-        color = p.modes.darkest(c1, c2);
-        break;
-      case p.DIFFERENCE:
-        color = p.modes.difference(c1, c2);
-        break;
-      case p.EXCLUSION:
-        color = p.modes.exclusion(c1, c2);
-        break;
-      case p.MULTIPLY:
-        color = p.modes.multiply(c1, c2);
-        break;
-      case p.SCREEN:
-        color = p.modes.screen(c1, c2);
-        break;
-      case p.HARD_LIGHT:
-        color = p.modes.hard_light(c1, c2);
-        break;
-      case p.SOFT_LIGHT:
-        color = p.modes.soft_light(c1, c2);
-        break;
-      case p.OVERLAY:
-        color = p.modes.overlay(c1, c2);
-        break;
-      case p.DODGE:
-        color = p.modes.dodge(c1, c2);
-        break;
-      case p.BURN:
-        color = p.modes.burn(c1, c2);
-        break;
-      }
-      return color;
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Canvas-Matrix manipulation
-    ////////////////////////////////////////////////////////////////////////////
-
-    p.printMatrix = function printMatrix() {
-      modelView.print();
-    };
-
-    p.translate = function translate(x, y, z) {
-      if (p.use3DContext) {
-        forwardTransform.translate(x, y, z);
-        reverseTransform.invTranslate(x, y, z);
-      } else {
-        curContext.translate(x, y);
-      }
-    };
-
-    p.scale = function scale(x, y, z) {
-      if (p.use3DContext) {
-        forwardTransform.scale(x, y, z);
-        reverseTransform.invScale(x, y, z);
-      } else {
-        curContext.scale(x, y || x);
-      }
-    };
-
-    p.pushMatrix = function pushMatrix() {
-      if (p.use3DContext) {
-        userMatrixStack.load(modelView);
-      } else {
-        curContext.save();
-      }
-    };
-
-    p.popMatrix = function popMatrix() {
-      if (p.use3DContext) {
-        modelView.set(userMatrixStack.pop());
-      } else {
-        curContext.restore();
-      }
-    };
-
-    p.resetMatrix = function resetMatrix() {
-      forwardTransform.reset();
-      reverseTransform.reset();
-    };
-
-    p.applyMatrix = function applyMatrix() {
-      var a = arguments;
-      if (!p.use3DContext) {
-        for (var cnt = a.length; cnt < 16; cnt++) {
-          a[cnt] = 0;
-        }
-        a[10] = a[15] = 1;
-      }
-
-      forwardTransform.apply(a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15]);
-      reverseTransform.invApply(a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15]);
-    };
-
-    p.rotateX = function(angleInRadians) {
-      forwardTransform.rotateX(angleInRadians);
-      reverseTransform.invRotateX(angleInRadians);
-    };
-
-    p.rotateZ = function(angleInRadians) {
-      forwardTransform.rotateZ(angleInRadians);
-      reverseTransform.invRotateZ(angleInRadians);
-    };
-
-    p.rotateY = function(angleInRadians) {
-      forwardTransform.rotateY(angleInRadians);
-      reverseTransform.invRotateY(angleInRadians);
-    };
-
-    p.rotate = function rotate(angleInRadians) {
-      if (p.use3DContext) {
-        forwardTransform.rotateZ(angleInRadians);
-        reverseTransform.invRotateZ(angleInRadians);
-      } else {
-        curContext.rotate(angleInRadians);
-      }
-    };
-
-    p.pushStyle = function pushStyle() {
-      // Save the canvas state.
-      curContext.save();
-
-      p.pushMatrix();
-
-      var newState = {
-        'doFill': doFill,
-        'doStroke': doStroke,
-        'curTint': curTint,
-        'curRectMode': curRectMode,
-        'curColorMode': curColorMode,
-        'colorModeX': colorModeX,
-        'colorModeZ': colorModeZ,
-        'colorModeY': colorModeY,
-        'colorModeA': colorModeA,
-        'curTextFont': curTextFont,
-        'curTextSize': curTextSize
-      };
-
-      styleArray.push(newState);
-    };
-
-    p.popStyle = function popStyle() {
-      var oldState = styleArray.pop();
-
-      if (oldState) {
-        curContext.restore();
-
-        p.popMatrix();
-
-        doFill = oldState.doFill;
-        doStroke = oldState.doStroke;
-        curTint = oldState.curTint;
-        curRectMode = oldState.curRectmode;
-        curColorMode = oldState.curColorMode;
-        colorModeX = oldState.colorModeX;
-        colorModeZ = oldState.colorModeZ;
-        colorModeY = oldState.colorModeY;
-        colorModeA = oldState.colorModeA;
-        curTextFont = oldState.curTextFont;
-        curTextSize = oldState.curTextSize;
-      } else {
-        throw "Too many popStyle() without enough pushStyle()";
-      }
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Time based functions
-    ////////////////////////////////////////////////////////////////////////////
-
-    p.year = function year() {
-      return new Date().getFullYear();
-    };
-    p.month = function month() {
-      return new Date().getMonth() + 1;
-    };
-    p.day = function day() {
-      return new Date().getDate();
-    };
-    p.hour = function hour() {
-      return new Date().getHours();
-    };
-    p.minute = function minute() {
-      return new Date().getMinutes();
-    };
-    p.second = function second() {
-      return new Date().getSeconds();
-    };
-    p.millis = function millis() {
-      return new Date().getTime() - start;
-    };
-
-    p.noLoop = function noLoop() {
-      doLoop = false;
-      loopStarted = false;
-      clearInterval(looping);
-    };
-
-    p.redraw = function redraw() {
-      var sec = (new Date().getTime() - timeSinceLastFPS) / 1000;
-      framesSinceLastFPS++;
-      var fps = framesSinceLastFPS / sec;
-
-      // recalculate FPS every half second for better accuracy.
-      if (sec > 0.5) {
-        timeSinceLastFPS = new Date().getTime();
-        framesSinceLastFPS = 0;
-        p.FRAME_RATE = fps;
-      }
-
-      p.frameCount++;
-
-      inDraw = true;
-
-      if (p.use3DContext) {
-        // Delete all the lighting states and the materials the
-        // user set in the last draw() call.
-        p.noLights();
-        p.lightFalloff(1, 0, 0);
-        p.shininess(1);
-        p.ambient(255, 255, 255);
-        p.specular(0, 0, 0);
-        p.camera();
-        p.draw();
-      } else {
-        curContext.save();
-        p.draw();
-        curContext.restore();
-      }
-
-      inDraw = false;
-    };
-
-    p.loop = function loop() {
-      if (loopStarted) {
-        return;
-      }
-
-      looping = window.setInterval(function() {
-        try {
-          try {
-            p.focused = document.hasFocus();
-          } catch(e) {}
-          p.redraw();
-        } catch(e_loop) {
-          window.clearInterval(looping);
-          throw e_loop;
-        }
-      }, curMsPerFrame);
-
-      doLoop = true;
-      loopStarted = true;
-    };
-
-    p.frameRate = function frameRate(aRate) {
-      curFrameRate = aRate;
-      curMsPerFrame = 1000 / curFrameRate;
-    };
-
-    p.exit = function exit() {
-      window.clearInterval(looping);
-
-      for (var i=0, ehl=p.pjs.eventHandlers.length; i<ehl; i++) {
-        var elem = p.pjs.eventHandlers[i][0],
-            type = p.pjs.eventHandlers[i][1],
-            fn   = p.pjs.eventHandlers[i][2];
-
-        if (elem.removeEventListener) {
-          elem.removeEventListener(type, fn, false);
-        } else if (elem.detachEvent) {
-          elem.detachEvent("on" + type, fn);
-        }
-      }
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // MISC functions
-    ////////////////////////////////////////////////////////////////////////////
-
-    p.cursor = function cursor() {
-      if (arguments.length > 1 || (arguments.length === 1 && arguments[0] instanceof p.PImage)) {
-        var image = arguments[0],
-          x, y;
-        if (arguments.length >= 3) {
-          x = arguments[1];
-          y = arguments[2];
-          if (x < 0 || y < 0 || y >= image.height || x >= image.width) {
-            throw "x and y must be non-negative and less than the dimensions of the image";
-          }
-        } else {
-          x = image.width >>> 1;
-          y = image.height >>> 1;
-        }
-
-        // see https://developer.mozilla.org/en/Using_URL_values_for_the_cursor_property
-        var imageDataURL = image.toDataURL();
-        var style = "url(\"" + imageDataURL + "\") " + x + " " + y + ", default";
-        curCursor = curElement.style.cursor = style;
-      } else if (arguments.length === 1) {
-        var mode = arguments[0];
-        curCursor = curElement.style.cursor = mode;
-      } else {
-        curCursor = curElement.style.cursor = oldCursor;
-      }
-    };
-
-    p.noCursor = function noCursor() {
-      curCursor = curElement.style.cursor = p.NOCURSOR;
-    };
-
-    p.link = function(href, target) {
-      if (typeof target !== 'undefined') {
-        window.open(href, target);
-      } else {
-        window.location = href;
-      }
-    };
-
-    // PGraphics methods
-    // TODO: These functions are suppose to be called before any operations are called on the
-    //       PGraphics object. They currently do nothing.
-    p.beginDraw = function beginDraw() {};
-    p.endDraw = function endDraw() {};
-
-    // Imports an external Processing.js library
-    p.Import = function Import(lib) {
-      // Replace evil-eval method with a DOM <script> tag insert method that
-      // binds new lib code to the Processing.lib names-space and the current
-      // p context. -F1LT3R
-    };
-
-    var contextMenu = function(e) {
-      e.preventDefault();
-      e.stopPropagation();
-    };
-
-    p.disableContextMenu = function disableContextMenu() {
-      curElement.addEventListener('contextmenu', contextMenu, false);
-    };
-
-    p.enableContextMenu = function enableContextMenu() {
-      curElement.removeEventListener('contextmenu', contextMenu, false);
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Binary Functions
-    ////////////////////////////////////////////////////////////////////////////
-
-    function decToBin(value, numBitsInValue) {
-      var mask = 1;
-      mask = mask << (numBitsInValue - 1);
-
-      var str = "";
-      for (var i = 0; i < numBitsInValue; i++) {
-        str += (mask & value) ? "1" : "0";
-        mask = mask >>> 1;
-      }
-      return str;
-    }
-
-    p.binary = function(num, numBits) {
-      var numBitsInValue = 32;
-
-      // color
-      if (typeof num === "string" && num.length > 1) {
-        var c = num.slice(5, -1).split(",");
-
-        // if all components are zero, a single "0" is returned for some reason
-        // [0] alpha is normalized, [1] r, [2] g, [3] b
-        var sbin = [
-          decToBin(c[3] * 255, 8),
-          decToBin(c[0], 8),
-          decToBin(c[1], 8),
-          decToBin(c[2], 8)
-          ];
-
-        var s = sbin[0] + sbin[1] + sbin[2] + sbin[3];
-
-        if (numBits) {
-          s = s.substr(-numBits);
-        }
-        // if the user didn't specify number of bits,
-        // trim leading zeros.
-        else {
-          s = s.replace(/^0+$/g, "0");
-          s = s.replace(/^0{1,}1/g, "1");
-        }
-        return s;
-      }
-
-      // char
-      if (typeof num === "string" || num instanceof Char) {
-
-        if (num instanceof Char) {
-          num = num.toString().charCodeAt(0);
-        } else {
-          num = num.charCodeAt(0);
-        }
-
-        if (numBits) {
-          numBitsInValue = 32;
-        } else {
-          numBitsInValue = 16;
-        }
-      }
-
-      var str = decToBin(num, numBitsInValue);
-
-      // trim string if user wanted less chars
-      if (numBits) {
-        str = str.substr(-numBits);
-      }
-      return str;
-    };
-
-    p.unbinary = function unbinary(binaryString) {
-      var binaryPattern = new RegExp("^[0|1]{8}$");
-      var addUp = 0;
-
-      if (isNaN(binaryString)) {
-        throw "NaN_Err";
-      } else {
-        if (arguments.length === 1 || binaryString.length === 8) {
-          if (binaryPattern.test(binaryString)) {
-            for (var i = 0; i < 8; i++) {
-              addUp += (Math.pow(2, i) * parseInt(binaryString.charAt(7 - i), 10));
-            }
-            return addUp + "";
-          } else {
-            throw "notBinary: the value passed into unbinary was not an 8 bit binary number";
-          }
-        } else {
-          throw "longErr";
-        }
-      }
-    };
-
-    p.nfs = function(num, left, right) {
-      var str, len, formatLength, rounded;
-
-      // array handling
-      if (typeof num === "object" && num.constructor === Array) {
-        str = new Array(0);
-        len = num.length;
-        for (var i = 0; i < len; i++) {
-          str[i] = p.nfs(num[i], left, right);
-        }
-      } else if (arguments.length === 3) {
-        var negative = num < 0 ? true : false;
-
-        // Make it work exactly like p5 for right = 0
-        if (right === 0) {
-          right = 1;
-        }
-
-        if (right < 0) {
-          rounded = Math.round(num);
-        } else {
-          // round to 'right' decimal places
-          rounded = Math.round(num * Math.pow(10, right)) / Math.pow(10, right);
-        }
-
-        // split number into whole and fractional components
-        var splitNum = Math.abs(rounded).toString().split("."); // [0] whole number, [1] fractional number
-        // format whole part
-        formatLength = left - splitNum[0].length;
-        for (; formatLength > 0; formatLength--) {
-          splitNum[0] = "0" + splitNum[0];
-        }
-
-        // format fractional part
-        if (splitNum.length === 2 || right > 0) {
-          splitNum[1] = splitNum.length === 2 ? splitNum[1] : "";
-          formatLength = right - splitNum[1].length;
-          for (; formatLength > 0; formatLength--) {
-            splitNum[1] += "0";
-          }
-          str = splitNum.join(".");
-        } else {
-          str = splitNum[0];
-        }
-
-        str = (negative ? "-" : " ") + str;
-      } else if (arguments.length === 2) {
-        str = p.nfs(num, left, -1);
-      }
-      return str;
-    };
-
-    p.nfp = function(num, left, right) {
-      var str, len, formatLength, rounded;
-
-      // array handling
-      if (typeof num === "object" && num.constructor === Array) {
-        str = new Array(0);
-        len = num.length;
-        for (var i = 0; i < len; i++) {
-          str[i] = p.nfp(num[i], left, right);
-        }
-      } else if (arguments.length === 3) {
-        var negative = num < 0 ? true : false;
-
-        // Make it work exactly like p5 for right = 0
-        if (right === 0) {
-          right = 1;
-        }
-
-        if (right < 0) {
-          rounded = Math.round(num);
-        } else {
-          // round to 'right' decimal places
-          rounded = Math.round(num * Math.pow(10, right)) / Math.pow(10, right);
-        }
-
-        // split number into whole and fractional components
-        var splitNum = Math.abs(rounded).toString().split("."); // [0] whole number, [1] fractional number
-        // format whole part
-        formatLength = left - splitNum[0].length;
-        for (; formatLength > 0; formatLength--) {
-          splitNum[0] = "0" + splitNum[0];
-        }
-
-        // format fractional part
-        if (splitNum.length === 2 || right > 0) {
-          splitNum[1] = splitNum.length === 2 ? splitNum[1] : "";
-          formatLength = right - splitNum[1].length;
-          for (; formatLength > 0; formatLength--) {
-            splitNum[1] += "0";
-          }
-          str = splitNum.join(".");
-        } else {
-          str = splitNum[0];
-        }
-
-        str = (negative ? "-" : "+") + str;
-      } else if (arguments.length === 2) {
-        str = p.nfp(num, left, -1);
-      }
-      return str;
-    };
-
-    p.nfc = function(num, right) {
-      var str;
-      var decimals = right >= 0 ? right : 0;
-      if (typeof num === "object") {
-        str = new Array(0);
-        for (var i = 0; i < num.length; i++) {
-          str[i] = p.nfc(num[i], decimals);
-        }
-      } else if (arguments.length === 2) {
-        var rawStr = p.nfs(num, 0, decimals);
-        var ary = new Array(0);
-        ary = rawStr.split('.');
-        // ary[0] contains left of decimal, ary[1] contains decimal places if they exist
-        // insert commas now, then append ary[1] if it exists
-        var leftStr = ary[0];
-        var rightStr = ary.length > 1 ? '.' + ary[1] : '';
-        var commas = /(\d+)(\d{3})/;
-        while (commas.test(leftStr)) {
-          leftStr = leftStr.replace(commas, '$1' + ',' + '$2');
-        }
-        str = leftStr + rightStr;
-      } else if (arguments.length === 1) {
-        str = p.nfc(num, 0);
-      }
-      return str;
-    };
-
-    var decimalToHex = function decimalToHex(d, padding) {
-      //if there is no padding value added, default padding to 8 else go into while statement.
-      padding = typeof(padding) === "undefined" || padding === null ? padding = 8 : padding;
-      if (d < 0) {
-        d = 0xFFFFFFFF + d + 1;
-      }
-      var hex = Number(d).toString(16).toUpperCase();
-      while (hex.length < padding) {
-        hex = "0" + hex;
-      }
-      if (hex.length >= padding) {
-        hex = hex.substring(hex.length - padding, hex.length);
-      }
-      return hex;
-    };
-
-    // note: since we cannot keep track of byte, int types by default the returned string is 8 chars long
-    // if no 2nd argument is passed.  closest compromise we can use to match java implementation Feb 5 2010
-    // also the char parser has issues with chars that are not digits or letters IE: !@#$%^&*
-    p.hex = function hex(value, len) {
-      var hexstring = "";
-      if (arguments.length === 1) {
-        if (value instanceof Char) {
-          hexstring = hex(value, 4);
-        } else { // int or byte, indistinguishable at the moment, default to 8
-          hexstring = hex(value, 8);
-        }
-      } else { // pad to specified length
-        hexstring = decimalToHex(value, len);
-      }
-      return hexstring;
-    };
-
-    p.unhex = function(str) {
-      var value = 0, multiplier = 1, num = 0;
-
-      var len = str.length - 1;
-      for (var i = len; i >= 0; i--) {
-        try {
-          switch (str[i]) {
-          case "0":
-            num = 0;
-            break;
-          case "1":
-            num = 1;
-            break;
-          case "2":
-            num = 2;
-            break;
-          case "3":
-            num = 3;
-            break;
-          case "4":
-            num = 4;
-            break;
-          case "5":
-            num = 5;
-            break;
-          case "6":
-            num = 6;
-            break;
-          case "7":
-            num = 7;
-            break;
-          case "8":
-            num = 8;
-            break;
-          case "9":
-            num = 9;
-            break;
-          case "A":
-          case "a":
-            num = 10;
-            break;
-          case "B":
-          case "b":
-            num = 11;
-            break;
-          case "C":
-          case "c":
-            num = 12;
-            break;
-          case "D":
-          case "d":
-            num = 13;
-            break;
-          case "E":
-          case "e":
-            num = 14;
-            break;
-          case "F":
-          case "f":
-            num = 15;
-            break;
-          default:
-            return 0;
-          }
-          value += num * multiplier;
-          multiplier *= 16;
-        } catch(e) {
-          Processing.debug(e);
-        }
-        // correct for int overflow java expectation
-        if (value > 2147483647) {
-          value -= 4294967296;
-        }
-      }
-      return value;
-    };
-
-    // Load a file or URL into strings
-    p.loadStrings = function loadStrings(url) {
-      return ajax(url).split("\n");
-    };
-
-    p.loadBytes = function loadBytes(url) {
-      var string = ajax(url);
-      var ret = new Array(string.length);
-
-      for (var i = 0; i < string.length; i++) {
-        ret[i] = string.charCodeAt(i);
-      }
-
-      return ret;
-    };
-
-    // nf() should return an array when being called on an array, at the moment it only returns strings. -F1LT3R
-    // This breaks the join() ref-test. The Processing.org documentation says String or String[]. SHOULD BE FIXED NOW
-    p.nf = function() {
-      var str, num, pad, arr, left, right, isNegative, test, i;
-
-      if (arguments.length === 2 && typeof arguments[0] === 'number' && typeof arguments[1] === 'number' && (arguments[0] + "").indexOf('.') === -1) {
-        num = arguments[0];
-        pad = arguments[1];
-
-        isNegative = num < 0;
-
-        if (isNegative) {
-          num = Math.abs(num);
-        }
-
-        str = "" + num;
-        for (i = pad - str.length; i > 0; i--) {
-          str = "0" + str;
-        }
-
-        if (isNegative) {
-          str = "-" + str;
-        }
-      } else if (arguments.length === 2 && typeof arguments[0] === 'object' && arguments[0].constructor === Array && typeof arguments[1] === 'number') {
-        arr = arguments[0];
-        pad = arguments[1];
-
-        str = new Array(arr.length);
-
-        for (i = 0; i < arr.length && str !== undefined; i++) {
-          test = p.nf(arr[i], pad);
-          if (test === undefined) {
-            str = undefined;
-          } else {
-            str[i] = test;
-          }
-        }
-      } else if (arguments.length === 3 && typeof arguments[0] === 'number' && typeof arguments[1] === 'number' && typeof arguments[2] === 'number' && (arguments[0] + "").indexOf('.') >= 0) {
-        num = arguments[0];
-        left = arguments[1];
-        right = arguments[2];
-
-        isNegative = num < 0;
-
-        if (isNegative) {
-          num = Math.abs(num);
-        }
-
-        // Change the way the number is 'floored' based on whether it is odd or even.
-        if (right < 0 && Math.floor(num) % 2 === 1) {
-          // Make sure 1.49 rounds to 1, but 1.5 rounds to 2.
-          if ((num) - Math.floor(num) >= 0.5) {
-            num = num + 1;
-          }
-        }
-
-        str = "" + num;
-
-        for (i = left - str.indexOf('.'); i > 0; i--) {
-          str = "0" + str;
-        }
-
-        var numDec = str.length - str.indexOf('.') - 1;
-        if (numDec <= right) {
-          for (i = right - (str.length - str.indexOf('.') - 1); i > 0; i--) {
-            str = str + "0";
-          }
-        } else if (right > 0) {
-          str = str.substring(0, str.length - (numDec - right));
-        } else if (right < 0) {
-
-          str = str.substring(0, str.indexOf('.'));
-        }
-
-        if (isNegative) {
-          str = "-" + str;
-        }
-      } else if (arguments.length === 3 && typeof arguments[0] === 'object' && arguments[0].constructor === Array && typeof arguments[1] === 'number' && typeof arguments[2] === 'number') {
-        arr = arguments[0];
-        left = arguments[1];
-        right = arguments[2];
-
-        str = new Array(arr.length);
-
-        for (i = 0; i < arr.length && str !== undefined; i++) {
-          test = p.nf(arr[i], left, right);
-          if (test === undefined) {
-            str = undefined;
-          } else {
-            str[i] = test;
-          }
-        }
-      }
-
-      return str;
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // String Functions
-    ////////////////////////////////////////////////////////////////////////////
-
-    p.matchAll = function matchAll(aString, aRegExp) {
-      var results = [],
-        latest;
-      var regexp = new RegExp(aRegExp, "g");
-      while ((latest = regexp.exec(aString)) !== null) {
-        results.push(latest);
-        if (latest[0].length === 0) {
-          ++regexp.lastIndex;
-        }
-      }
-      return results.length > 0 ? results : null;
-    };
-
-    String.prototype.replaceAll = function(re, replace) {
-      return this.replace(new RegExp(re, "g"), replace);
-    };
-
-    String.prototype.equals = function equals(str) {
-      return this.valueOf() === str.valueOf();
-    };
-
-    String.prototype.toCharArray = function() {
-      var chars = this.split("");
-      for (var i = chars.length - 1; i >= 0; i--) {
-        chars[i] = new Char(chars[i]);
-      }
-      return chars;
-    };
-
-    p.match = function(str, regexp) {
-      return str.match(regexp);
-    };
-
-    // tinylog lite JavaScript library
-    /*global tinylog,print*/
-    var tinylogLite = (function() {
-      "use strict";
-
-      var tinylogLite = {},
-        undef = "undefined",
-        func = "function",
-        False = !1,
-        True = !0,
-        log = "log";
-
-      if (typeof tinylog !== undef && typeof tinylog[log] === func) {
-        // pre-existing tinylog present
-        tinylogLite[log] = tinylog[log];
-      } else if (typeof document !== undef && !document.fake) {
-        (function() {
-          // DOM document
-          var doc = document,
-
-          $div = "div",
-          $style = "style",
-          $title = "title",
-
-          containerStyles = {
-            zIndex: 10000,
-            position: "fixed",
-            bottom: "0px",
-            width: "100%",
-            height: "15%",
-            fontFamily: "sans-serif",
-            color: "#ccc",
-            backgroundColor: "black"
-          },
-          outputStyles = {
-            position: "relative",
-            fontFamily: "monospace",
-            overflow: "auto",
-            height: "100%",
-            paddingTop: "5px"
-          },
-          resizerStyles = {
-            height: "5px",
-            marginTop: "-5px",
-            cursor: "n-resize",
-            backgroundColor: "darkgrey"
-          },
-          closeButtonStyles = {
-            position: "absolute",
-            top: "5px",
-            right: "20px",
-            color: "#111",
-            MozBorderRadius: "4px",
-            webkitBorderRadius: "4px",
-            borderRadius: "4px",
-            cursor: "pointer",
-            fontWeight: "normal",
-            textAlign: "center",
-            padding: "3px 5px",
-            backgroundColor: "#333",
-            fontSize: "12px"
-          },
-          entryStyles = {
-            //borderBottom: "1px solid #d3d3d3",
-            minHeight: "16px"
-          },
-          entryTextStyles = {
-            fontSize: "12px",
-            margin: "0 8px 0 8px",
-            maxWidth: "100%",
-            whiteSpace: "pre-wrap",
-            overflow: "auto"
-          },
-
-          view = doc.defaultView,
-            docElem = doc.documentElement,
-            docElemStyle = docElem[$style],
-
-          setStyles = function() {
-            var i = arguments.length,
-              elemStyle, styles, style;
-
-            while (i--) {
-              styles = arguments[i--];
-              elemStyle = arguments[i][$style];
-
-              for (style in styles) {
-                if (styles.hasOwnProperty(style)) {
-                  elemStyle[style] = styles[style];
-                }
-              }
-            }
-          },
-
-          observer = function(obj, event, handler) {
-            if (obj.addEventListener) {
-              obj.addEventListener(event, handler, False);
-            } else if (obj.attachEvent) {
-              obj.attachEvent("on" + event, handler);
-            }
-            return [obj, event, handler];
-          },
-          unobserve = function(obj, event, handler) {
-            if (obj.removeEventListener) {
-              obj.removeEventListener(event, handler, False);
-            } else if (obj.detachEvent) {
-              obj.detachEvent("on" + event, handler);
-            }
-          },
-          clearChildren = function(node) {
-            var children = node.childNodes,
-              child = children.length;
-
-            while (child--) {
-              node.removeChild(children.item(0));
-            }
-          },
-          append = function(to, elem) {
-            return to.appendChild(elem);
-          },
-          createElement = function(localName) {
-            return doc.createElement(localName);
-          },
-          createTextNode = function(text) {
-            return doc.createTextNode(text);
-          },
-
-          createLog = tinylogLite[log] = function(message) {
-            // don't show output log until called once
-            var uninit,
-              originalPadding = docElemStyle.paddingBottom,
-              container = createElement($div),
-              containerStyle = container[$style],
-              resizer = append(container, createElement($div)),
-              output = append(container, createElement($div)),
-              closeButton = append(container, createElement($div)),
-              resizingLog = False,
-              previousHeight = False,
-              previousScrollTop = False,
-
-              updateSafetyMargin = function() {
-                // have a blank space large enough to fit the output box at the page bottom
-                docElemStyle.paddingBottom = container.clientHeight + "px";
-              },
-              setContainerHeight = function(height) {
-                var viewHeight = view.innerHeight,
-                  resizerHeight = resizer.clientHeight;
-
-                // constrain the container inside the viewport's dimensions
-                if (height < 0) {
-                  height = 0;
-                } else if (height + resizerHeight > viewHeight) {
-                  height = viewHeight - resizerHeight;
-                }
-
-                containerStyle.height = height / viewHeight * 100 + "%";
-
-                updateSafetyMargin();
-              },
-              observers = [
-                observer(doc, "mousemove", function(evt) {
-                  if (resizingLog) {
-                    setContainerHeight(view.innerHeight - evt.clientY);
-                    output.scrollTop = previousScrollTop;
-                  }
-                }),
-
-                observer(doc, "mouseup", function() {
-                  if (resizingLog) {
-                    resizingLog = previousScrollTop = False;
-                  }
-                }),
-
-                observer(resizer, "dblclick", function(evt) {
-                  evt.preventDefault();
-
-                  if (previousHeight) {
-                    setContainerHeight(previousHeight);
-                    previousHeight = False;
-                  } else {
-                    previousHeight = container.clientHeight;
-                    containerStyle.height = "0px";
-                  }
-                }),
-
-                observer(resizer, "mousedown", function(evt) {
-                  evt.preventDefault();
-                  resizingLog = True;
-                  previousScrollTop = output.scrollTop;
-                }),
-
-                observer(resizer, "contextmenu", function() {
-                  resizingLog = False;
-                }),
-
-                observer(closeButton, "click", function() {
-                  uninit();
-                })
-              ];
-
-            uninit = function() {
-              // remove observers
-              var i = observers.length;
-
-              while (i--) {
-                unobserve.apply(tinylogLite, observers[i]);
-              }
-
-              // remove tinylog lite from the DOM
-              docElem.removeChild(container);
-              docElemStyle.paddingBottom = originalPadding;
-
-              clearChildren(output);
-              clearChildren(container);
-
-              tinylogLite[log] = createLog;
-            };
-
-            setStyles(
-            container, containerStyles, output, outputStyles, resizer, resizerStyles, closeButton, closeButtonStyles);
-
-            closeButton[$title] = "Close Log";
-            append(closeButton, createTextNode("\u2716"));
-
-            resizer[$title] = "Double-click to toggle log minimization";
-
-            docElem.insertBefore(container, docElem.firstChild);
-
-            tinylogLite[log] = function(message) {
-              var entry = append(output, createElement($div)),
-                entryText = append(entry, createElement($div));
-
-              entry[$title] = (new Date()).toLocaleTimeString();
-
-              setStyles(
-              entry, entryStyles, entryText, entryTextStyles);
-
-              append(entryText, createTextNode(message));
-              output.scrollTop = output.scrollHeight;
-            };
-
-            tinylogLite[log](message);
-          };
-        }());
-      } else if (typeof print === func) { // JS shell
-        tinylogLite[log] = print;
-      }
-
-      return tinylogLite;
-    }()),
-
-    logBuffer = [];
-
-    p.console = window.console || tinylogLite;
-
-    p.println = function println(message) {
-      var bufferLen = logBuffer.length;
-      if (bufferLen) {
-        tinylogLite.log(logBuffer.join(""));
-        logBuffer.length = 0; // clear log buffer
-      }
-
-      if (arguments.length === 0 && bufferLen === 0) {
-        tinylogLite.log("");
-      } else if (arguments.length !== 0) {
-        tinylogLite.log(message);
-      }
-    };
-
-    p.print = function print(message) {
-      logBuffer.push(message);
-    };
-
-    // Alphanumeric chars arguments automatically converted to numbers when
-    // passed in, and will come out as numbers.
-    p.str = function str(val) {
-      var ret;
-
-      if (arguments.length === 1) {
-        if (typeof val === "string" && val.length === 1) {
-          // No strings allowed.
-          ret = val;
-        } else if (typeof val === "object" && val.constructor === Array) {
-          ret = new Array(0);
-
-          for (var i = 0; i < val.length; i++) {
-            ret[i] = str(val[i]);
-          }
-        } else {
-          ret = val + "";
-        }
-      }
-
-      return ret;
-    };
-
-    p.trim = function(str) {
-      var newstr;
-      if (typeof str === "object" && str.constructor === Array) {
-        newstr = new Array(0);
-        for (var i = 0; i < str.length; i++) {
-          newstr[i] = p.trim(str[i]);
-        }
-      } else {
-        // if str is not an array then remove all whitespace, tabs, and returns
-        newstr = str.replace(/^\s*/, '').replace(/\s*$/, '').replace(/\r*$/, '');
-      }
-      return newstr;
-    };
-
-    // Conversion
-    p['boolean'] = function(val) {
-      if (typeof val === 'number') {
-        return val !== 0;
-      } else if (typeof val === 'boolean') {
-        return val;
-      } else if (typeof val === 'string') {
-        return val.toLowerCase() === 'true';
-      } else if (val instanceof Char) {
-        // 1, T or t
-        return val.code === 49 || val.code === 84 || val.code === 116;
-      } else if (typeof val === 'object' && val.constructor === Array) {
-        var ret = new Array(val.length);
-        for (var i = 0; i < val.length; i++) {
-          ret[i] = p['boolean'](val[i]);
-        }
-        return ret;
-      }
-    };
-
-    // a byte is a number between -128 and 127
-    p['byte'] = function(aNumber) {
-      if (typeof aNumber === 'object' && aNumber.constructor === Array) {
-        var bytes = [];
-        for (var i = 0; i < aNumber.length; i++) {
-          bytes[i] = p['byte'](aNumber[i]);
-        }
-        return bytes;
-      } else {
-        return (0 - (aNumber & 0x80)) | (aNumber & 0x7F);
-      }
-    };
-
-    p['char'] = function(key) {
-      if (arguments.length === 1 && typeof key === "number") {
-        return new Char(String.fromCharCode(key & 0xFFFF));
-      } else if (arguments.length === 1 && typeof key === "object" && key.constructor === Array) {
-        var ret = new Array(key.length);
-        for (var i = 0; i < key.length; i++) {
-          ret[i] = p['char'](key[i]);
-        }
-        return ret;
-      } else {
-        throw "char() may receive only one argument of type int, byte, int[], or byte[].";
-      }
-    };
-
-    // Processing doc claims good argument types are: int, char, byte, boolean,
-    // String, int[], char[], byte[], boolean[], String[].
-    // floats should not work. However, floats with only zeroes right of the
-    // decimal will work because JS converts those to int.
-    p['float'] = function(val) {
-      if (arguments.length === 1) {
-        if (typeof val === 'number') {
-          return val;
-        } else if (typeof val === 'boolean') {
-          return val ? 1 : 0;
-        } else if (typeof val === 'string') {
-          return parseFloat(val);
-        } else if (val instanceof Char) {
-          return val.code;
-        } else if (typeof val === 'object' && val.constructor === Array) {
-          var ret = new Array(val.length);
-          for (var i = 0; i < val.length; i++) {
-            ret[i] = p['float'](val[i]);
-          }
-          return ret;
-        }
-      }
-    };
-
-    p['int'] = function(val) {
-      if (typeof val === 'number') {
-        return val & 0xFFFFFFFF;
-      } else if (typeof val === 'boolean') {
-        return val ? 1 : 0;
-      } else if (typeof val === 'string') {
-        var number = parseInt(val, 10); // Force decimal radix. Don't convert hex or octal (just like p5)
-        return number & 0xFFFFFFFF;
-      } else if (val instanceof Char) {
-        return val.code;
-      } else if (typeof val === 'object' && val.constructor === Array) {
-        var ret = new Array(val.length);
-        for (var i = 0; i < val.length; i++) {
-          if (typeof val[i] === 'string' && !/^\s*[+\-]?\d+\s*$/.test(val[i])) {
-            ret[i] = 0;
-          } else {
-            ret[i] = p['int'](val[i]);
-          }
-        }
-        return ret;
-      }
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Math functions
-    ////////////////////////////////////////////////////////////////////////////
-
-    // Calculation
-    p.abs = Math.abs;
-
-    p.ceil = Math.ceil;
-
-    p.constrain = function(aNumber, aMin, aMax) {
-      return aNumber > aMax ? aMax : aNumber < aMin ? aMin : aNumber;
-    };
-
-    p.dist = function() {
-      var dx, dy, dz;
-      if (arguments.length === 4) {
-        dx = arguments[0] - arguments[2];
-        dy = arguments[1] - arguments[3];
-        return Math.sqrt(dx * dx + dy * dy);
-      } else if (arguments.length === 6) {
-        dx = arguments[0] - arguments[3];
-        dy = arguments[1] - arguments[4];
-        dz = arguments[2] - arguments[5];
-        return Math.sqrt(dx * dx + dy * dy + dz * dz);
-      }
-    };
-
-    p.exp = Math.exp;
-
-    p.floor = Math.floor;
-
-    p.lerp = function(value1, value2, amt) {
-      return ((value2 - value1) * amt) + value1;
-    };
-
-    p.log = Math.log;
-
-    p.mag = function(a, b, c) {
-      if (arguments.length === 2) {
-        return Math.sqrt(a * a + b * b);
-      } else if (arguments.length === 3) {
-        return Math.sqrt(a * a + b * b + c * c);
-      }
-    };
-
-    p.map = function(value, istart, istop, ostart, ostop) {
-      return ostart + (ostop - ostart) * ((value - istart) / (istop - istart));
-    };
-
-    p.max = function() {
-      if (arguments.length === 2) {
-        return arguments[0] < arguments[1] ? arguments[1] : arguments[0];
-      } else {
-        var numbers = arguments.length === 1 ? arguments[0] : arguments; // if single argument, array is used
-        if (! ("length" in numbers && numbers.length > 0)) {
-          throw "Non-empty array is expected";
-        }
-        var max = numbers[0],
-          count = numbers.length;
-        for (var i = 1; i < count; ++i) {
-          if (max < numbers[i]) {
-            max = numbers[i];
-          }
-        }
-        return max;
-      }
-    };
-
-    p.min = function() {
-      if (arguments.length === 2) {
-        return arguments[0] < arguments[1] ? arguments[0] : arguments[1];
-      } else {
-        var numbers = arguments.length === 1 ? arguments[0] : arguments; // if single argument, array is used
-        if (! ("length" in numbers && numbers.length > 0)) {
-          throw "Non-empty array is expected";
-        }
-        var min = numbers[0],
-          count = numbers.length;
-        for (var i = 1; i < count; ++i) {
-          if (min > numbers[i]) {
-            min = numbers[i];
-          }
-        }
-        return min;
-      }
-    };
-
-    p.norm = function(aNumber, low, high) {
-      return (aNumber - low) / (high - low);
-    };
-
-    p.pow = Math.pow;
-
-    p.round = Math.round;
-
-    p.sq = function(aNumber) {
-      return aNumber * aNumber;
-    };
-
-    p.sqrt = Math.sqrt;
-
-    // Trigonometry
-    p.acos = Math.acos;
-
-    p.asin = Math.asin;
-
-    p.atan = Math.atan;
-
-    p.atan2 = Math.atan2;
-
-    p.cos = Math.cos;
-
-    p.degrees = function(aAngle) {
-      return (aAngle * 180) / Math.PI;
-    };
-
-    p.radians = function(aAngle) {
-      return (aAngle / 180) * Math.PI;
-    };
-
-    p.sin = Math.sin;
-
-    p.tan = Math.tan;
-
-    var currentRandom = Math.random;
-
-    p.random = function random() {
-      if(arguments.length === 0) {
-        return currentRandom();
-      } else if(arguments.length === 1) {
-        return currentRandom() * arguments[0];
-      } else {
-        var aMin = arguments[0], aMax = arguments[1];
-        return currentRandom() * (aMax - aMin) + aMin;
-      }
-    };
-
-    // Pseudo-random generator
-    function Marsaglia(i1, i2) {
-      // from http://www.math.uni-bielefeld.de/~sillke/ALGORITHMS/random/marsaglia-c
-      var z=i1 || 362436069, w= i2 || 521288629;
-      var nextInt = function() {
-        z=(36969*(z&65535)+(z>>>16)) & 0xFFFFFFFF;
-        w=(18000*(w&65535)+(w>>>16)) & 0xFFFFFFFF;
-        return (((z&0xFFFF)<<16) | (w&0xFFFF)) & 0xFFFFFFFF;
-      };
-
-      this.nextDouble = function() {
-        var i = nextInt() / 4294967296;
-        return i < 0 ? 1 + i : i;
-      };
-      this.nextInt = nextInt;
-    }
-    Marsaglia.createRandomized = function() {
-      var now = new Date();
-      return new Marsaglia((now / 60000) & 0xFFFFFFFF, now & 0xFFFFFFFF);
-    };
-
-    p.randomSeed = function(seed) {
-      currentRandom = (new Marsaglia(seed)).nextDouble;
-    };
-
-    // Random
-    p.Random = function(seed) {
-      var haveNextNextGaussian = false, nextNextGaussian, random;
-
-      this.nextGaussian = function() {
-        if (haveNextNextGaussian) {
-          haveNextNextGaussian = false;
-          return nextNextGaussian;
-        } else {
-          var v1, v2, s;
-          do {
-            v1 = 2 * random() - 1; // between -1.0 and 1.0
-            v2 = 2 * random() - 1; // between -1.0 and 1.0
-            s = v1 * v1 + v2 * v2;
-          }
-          while (s >= 1 || s === 0);
-
-          var multiplier = Math.sqrt(-2 * Math.log(s) / s);
-          nextNextGaussian = v2 * multiplier;
-          haveNextNextGaussian = true;
-
-          return v1 * multiplier;
-        }
-      };
-
-      // by default use standard random, otherwise seeded
-      random = seed === undefined ? Math.random : (new Marsaglia(seed)).nextDouble;
-    };
-
-    // Noise functions and helpers
-    function PerlinNoise(seed) {
-      var rnd = seed !== undefined ? new Marsaglia(seed) : Marsaglia.createRandomized();
-      var i, j;
-      // http://www.noisemachine.com/talk1/17b.html
-      // http://mrl.nyu.edu/~perlin/noise/
-      // generate permutation
-      var p = new Array(512);
-      for(i=0;i<256;++i) { p[i] = i; }
-      for(i=0;i<256;++i) { var t = p[j = rnd.nextInt() & 0xFF]; p[j] = p[i]; p[i] = t; }
-      // copy to avoid taking mod in p[0];
-      for(i=0;i<256;++i) { p[i + 256] = p[i]; }
-
-      function grad3d(i,x,y,z) {
-        var h = i & 15; // convert into 12 gradient directions
-        var u = h<8 ? x : y,
-            v = h<4 ? y : h===12||h===14 ? x : z;
-        return ((h&1) === 0 ? u : -u) + ((h&2) === 0 ? v : -v);
-      }
-
-      function grad2d(i,x,y) {
-        var v = (i & 1) === 0 ? x : y;
-        return (i&2) === 0 ? -v : v;
-      }
-
-      function grad1d(i,x) {
-        return (i&1) === 0 ? -x : x;
-      }
-
-      function lerp(t,a,b) { return a + t * (b - a); }
-
-      this.noise3d = function(x, y, z) {
-        var X = Math.floor(x)&255, Y = Math.floor(y)&255, Z = Math.floor(z)&255;
-        x -= Math.floor(x); y -= Math.floor(y); z -= Math.floor(z);
-        var fx = (3-2*x)*x*x, fy = (3-2*y)*y*y, fz = (3-2*z)*z*z;
-        var p0 = p[X]+Y, p00 = p[p0] + Z, p01 = p[p0 + 1] + Z, p1  = p[X + 1] + Y, p10 = p[p1] + Z, p11 = p[p1 + 1] + Z;
-        return lerp(fz,
-          lerp(fy, lerp(fx, grad3d(p[p00], x, y, z), grad3d(p[p10], x-1, y, z)),
-                   lerp(fx, grad3d(p[p01], x, y-1, z), grad3d(p[p11], x-1, y-1,z))),
-          lerp(fy, lerp(fx, grad3d(p[p00 + 1], x, y, z-1), grad3d(p[p10 + 1], x-1, y, z-1)),
-                   lerp(fx, grad3d(p[p01 + 1], x, y-1, z-1), grad3d(p[p11 + 1], x-1, y-1,z-1))));
-      };
-
-      this.noise2d = function(x, y) {
-        var X = Math.floor(x)&255, Y = Math.floor(y)&255;
-        x -= Math.floor(x); y -= Math.floor(y);
-        var fx = (3-2*x)*x*x, fy = (3-2*y)*y*y;
-        var p0 = p[X]+Y, p1  = p[X + 1] + Y;
-        return lerp(fy,
-          lerp(fx, grad2d(p[p0], x, y), grad2d(p[p1], x-1, y)),
-          lerp(fx, grad2d(p[p0 + 1], x, y-1), grad2d(p[p1 + 1], x-1, y-1)));
-      };
-
-      this.noise1d = function(x) {
-        var X = Math.floor(x)&255;
-        x -= Math.floor(x);
-        var fx = (3-2*x)*x*x;
-        return lerp(fx, grad1d(p[X], x), grad1d(p[X+1], x-1));
-      };
-    }
-
-    // processing defaults
-    var noiseProfile = { generator: undefined, octaves: 4, fallout: 0.5, seed: undefined};
-
-    p.noise = function(x, y, z) {
-      if(noiseProfile.generator === undefined) {
-        // caching
-        noiseProfile.generator = new PerlinNoise(noiseProfile.seed);
-      }
-      var generator = noiseProfile.generator;
-      var effect = 1, k = 1, sum = 0;
-      for(var i=0; i<noiseProfile.octaves; ++i) {
-        effect *= noiseProfile.fallout;
-        switch (arguments.length) {
-        case 1:
-          sum += effect * (1 + generator.noise1d(k*x))/2; break;
-        case 2:
-          sum += effect * (1 + generator.noise2d(k*x, k*y))/2; break;
-        case 3:
-          sum += effect * (1 + generator.noise3d(k*x, k*y, k*z))/2; break;
-        }
-        k *= 2;
-      }
-      return sum;
-    };
-
-    p.noiseDetail = function(octaves, fallout) {
-      noiseProfile.octaves = octaves;
-      if(fallout !== undefined) {
-        noiseProfile.fallout = fallout;
-      }
-    };
-
-    p.noiseSeed = function(seed) {
-      noiseProfile.seed = seed;
-      noiseProfile.generator = undefined;
-    };
-
-    // Changes the size of the Canvas ( this resets context properties like 'lineCap', etc.
-    p.size = function size(aWidth, aHeight, aMode) {
-      if (aMode && (aMode === p.WEBGL)) {
-        // get the 3D rendering context
-        try {
-          // If the HTML <canvas> dimensions differ from the
-          // dimensions specified in the size() call in the sketch, for
-          // 3D sketches, browsers will either not render or render the
-          // scene incorrectly. To fix this, we need to adjust the
-          // width and height attributes of the canvas.
-          if (curElement.width !== aWidth || curElement.height !== aHeight) {
-            curElement.setAttribute("width", aWidth);
-            curElement.setAttribute("height", aHeight);
-          }
-          curContext = curElement.getContext("experimental-webgl");
-        } catch(e_size) {
-          p.debug(e_size);
-        }
-
-        if (!curContext) {
-          throw "OPENGL 3D context is not supported on this browser.";
-        } else {
-          for (var i = 0; i < p.SINCOS_LENGTH; i++) {
-            sinLUT[i] = p.sin(i * (p.PI / 180) * 0.5);
-            cosLUT[i] = p.cos(i * (p.PI / 180) * 0.5);
-          }
-          // Set defaults
-          curContext.viewport(0, 0, curElement.width, curElement.height);
-          curContext.clearColor(204 / 255, 204 / 255, 204 / 255, 1.0);
-          curContext.clear(curContext.COLOR_BUFFER_BIT);
-          curContext.enable(curContext.DEPTH_TEST);
-          curContext.enable(curContext.BLEND);
-          curContext.blendFunc(curContext.SRC_ALPHA, curContext.ONE_MINUS_SRC_ALPHA);
-
-          // Create the program objects to render 2D (points, lines) and
-          // 3D (spheres, boxes) shapes. Because 2D shapes are not lit,
-          // lighting calculations could be ommitted from that program object.
-          programObject2D = createProgramObject(curContext, vertexShaderSource2D, fragmentShaderSource2D);
-          programObject3D = createProgramObject(curContext, vertexShaderSource3D, fragmentShaderSource3D);
-
-          // Now that the programs have been compiled, we can set the default
-          // states for the lights.
-          curContext.useProgram(programObject3D);
-          p.lightFalloff(1, 0, 0);
-          p.shininess(1);
-          p.ambient(255, 255, 255);
-          p.specular(0, 0, 0);
-
-          // Create buffers for 3D primitives
-          boxBuffer = curContext.createBuffer();
-          curContext.bindBuffer(curContext.ARRAY_BUFFER, boxBuffer);
-          curContext.bufferData(curContext.ARRAY_BUFFER, newWebGLArray(boxVerts), curContext.STATIC_DRAW);
-
-          boxNormBuffer = curContext.createBuffer();
-          curContext.bindBuffer(curContext.ARRAY_BUFFER, boxNormBuffer);
-          curContext.bufferData(curContext.ARRAY_BUFFER, newWebGLArray(boxNorms), curContext.STATIC_DRAW);
-
-          boxOutlineBuffer = curContext.createBuffer();
-          curContext.bindBuffer(curContext.ARRAY_BUFFER, boxOutlineBuffer);
-          curContext.bufferData(curContext.ARRAY_BUFFER, newWebGLArray(boxOutlineVerts), curContext.STATIC_DRAW);
-
-          // The sphere vertices are specified dynamically since the user
-          // can change the level of detail. Everytime the user does that
-          // using sphereDetail(), the new vertices are calculated.
-          sphereBuffer = curContext.createBuffer();
-
-          lineBuffer = curContext.createBuffer();
-          curContext.bindBuffer(curContext.ARRAY_BUFFER, lineBuffer);
-
-          fillBuffer = curContext.createBuffer();
-          curContext.bindBuffer(curContext.ARRAY_BUFFER, fillBuffer);
-
-          pointBuffer = curContext.createBuffer();
-          curContext.bindBuffer(curContext.ARRAY_BUFFER, pointBuffer);
-          curContext.bufferData(curContext.ARRAY_BUFFER, newWebGLArray([0, 0, 0]), curContext.STATIC_DRAW);
-
-          cam = new PMatrix3D();
-          cameraInv = new PMatrix3D();
-          forwardTransform = new PMatrix3D();
-          reverseTransform = new PMatrix3D();
-          modelView = new PMatrix3D();
-          modelViewInv = new PMatrix3D();
-          projection = new PMatrix3D();
-          p.camera();
-          p.perspective();
-          forwardTransform = modelView;
-          reverseTransform = modelViewInv;
-
-          userMatrixStack = new PMatrixStack();
-          // used by both curve and bezier, so just init here
-          curveBasisMatrix = new PMatrix3D();
-          curveToBezierMatrix = new PMatrix3D();
-          curveDrawMatrix = new PMatrix3D();
-          bezierBasisInverse = new PMatrix3D();
-          bezierBasisMatrix = new PMatrix3D();
-          bezierBasisMatrix.set(-1, 3, -3, 1, 3, -6, 3, 0, -3, 3, 0, 0, 1, 0, 0, 0);
-        }
-        p.stroke(0);
-        p.fill(255);
-      } else {
-        if (typeof curContext === "undefined") {
-          // size() was called without p.init() default context, ie. p.createGraphics()
-          curContext = curElement.getContext("2d");
-          userMatrixStack = new PMatrixStack();
-          modelView = new PMatrix2D();
-        }
-      }
-
-      // The default 2d context has already been created in the p.init() stage if
-      // a 3d context was not specified. This is so that a 2d context will be
-      // available if size() was not called.
-      var props = {
-        fillStyle: curContext.fillStyle,
-        strokeStyle: curContext.strokeStyle,
-        lineCap: curContext.lineCap,
-        lineJoin: curContext.lineJoin
-      };
-      curElement.width = p.width = aWidth;
-      curElement.height = p.height = aHeight;
-
-      for (var j in props) {
-        if (props) {
-          curContext[j] = props[j];
-        }
-      }
-
-      // redraw the background if background was called before size
-      refreshBackground();
-
-      p.context = curContext; // added for createGraphics
-      p.toImageData = function() {
-        return curContext.getImageData(0, 0, this.width, this.height);
-      };
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // 3D Functions
-    ////////////////////////////////////////////////////////////////////////////
-
-    /*
-      Sets the uniform variable 'varName' to the value specified by 'value'.
-      Before calling this function, make sure the correct program object
-      has been installed as part of the current rendering state.
-
-      On some systems, if the variable exists in the shader but isn't used,
-      the compiler will optimize it out and this function will fail.
-    */
-    function uniformf(programObj, varName, varValue) {
-      var varLocation = curContext.getUniformLocation(programObj, varName);
-      // the variable won't be found if it was optimized out.
-      if (varLocation !== -1) {
-        if (varValue.length === 4) {
-          curContext.uniform4fv(varLocation, varValue);
-        } else if (varValue.length === 3) {
-          curContext.uniform3fv(varLocation, varValue);
-        } else if (varValue.length === 2) {
-          curContext.uniform2fv(varLocation, varValue);
-        } else {
-          curContext.uniform1f(varLocation, varValue);
-        }
-      }
-    }
-
-    function uniformi(programObj, varName, varValue) {
-      var varLocation = curContext.getUniformLocation(programObj, varName);
-      // the variable won't be found if it was optimized out.
-      if (varLocation !== -1) {
-        if (varValue.length === 4) {
-          curContext.uniform4iv(varLocation, varValue);
-        } else if (varValue.length === 3) {
-          curContext.uniform3iv(varLocation, varValue);
-        } else if (varValue.length === 2) {
-          curContext.uniform2iv(varLocation, varValue);
-        } else {
-          curContext.uniform1i(varLocation, varValue);
-        }
-      }
-    }
-
-    function vertexAttribPointer(programObj, varName, size, VBO) {
-      var varLocation = curContext.getAttribLocation(programObj, varName);
-      if (varLocation !== -1) {
-        curContext.bindBuffer(curContext.ARRAY_BUFFER, VBO);
-        curContext.vertexAttribPointer(varLocation, size, curContext.FLOAT, false, 0, 0);
-        curContext.enableVertexAttribArray(varLocation);
-      }
-    }
-
-    function uniformMatrix(programObj, varName, transpose, matrix) {
-      var varLocation = curContext.getUniformLocation(programObj, varName);
-      // the variable won't be found if it was optimized out.
-      if (varLocation !== -1) {
-        if (matrix.length === 16) {
-          curContext.uniformMatrix4fv(varLocation, transpose, matrix);
-        } else if (matrix.length === 9) {
-          curContext.uniformMatrix3fv(varLocation, transpose, matrix);
-        } else {
-          curContext.uniformMatrix2fv(varLocation, transpose, matrix);
-        }
-      }
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Lights
-    ////////////////////////////////////////////////////////////////////////////
-
-    p.ambientLight = function(r, g, b, x, y, z) {
-      if (p.use3DContext) {
-        if (lightCount === p.MAX_LIGHTS) {
-          throw "can only create " + p.MAX_LIGHTS + " lights";
-        }
-
-        var pos = new PVector(x, y, z);
-        var view = new PMatrix3D();
-        view.scale(1, -1, 1);
-        view.apply(modelView.array());
-        view.mult(pos, pos);
-
-        curContext.useProgram(programObject3D);
-        uniformf(programObject3D, "lights[" + lightCount + "].color", [r / 255, g / 255, b / 255]);
-        uniformf(programObject3D, "lights[" + lightCount + "].position", pos.array());
-        uniformi(programObject3D, "lights[" + lightCount + "].type", 0);
-        uniformi(programObject3D, "lightCount", ++lightCount);
-      }
-    };
-
-    p.directionalLight = function(r, g, b, nx, ny, nz) {
-      if (p.use3DContext) {
-        if (lightCount === p.MAX_LIGHTS) {
-          throw "can only create " + p.MAX_LIGHTS + " lights";
-        }
-
-        curContext.useProgram(programObject3D);
-
-        // Less code than manually multiplying, but I'll fix
-        // this when I have more time.
-        var dir = [nx, ny, nz, 0.0000001];
-
-        var view = new PMatrix3D();
-        view.scale(1, -1, 1);
-        view.apply(modelView.array());
-        view.mult(dir, dir);
-
-        uniformf(programObject3D, "lights[" + lightCount + "].color", [r / 255, g / 255, b / 255]);
-        uniformf(programObject3D, "lights[" + lightCount + "].position", [-dir[0], -dir[1], -dir[2]]);
-        uniformi(programObject3D, "lights[" + lightCount + "].type", 1);
-        uniformi(programObject3D, "lightCount", ++lightCount);
-      }
-    };
-
-    p.lightFalloff = function lightFalloff(constant, linear, quadratic) {
-      if (p.use3DContext) {
-        curContext.useProgram(programObject3D);
-        uniformf(programObject3D, "falloff", [constant, linear, quadratic]);
-      }
-    };
-
-    p.lightSpecular = function lightSpecular(r, g, b) {
-      if (p.use3DContext) {
-        curContext.useProgram(programObject3D);
-        uniformf(programObject3D, "specular", [r / 255, g / 255, b / 255]);
-      }
-    };
-
-    /*
-      Sets the default ambient light, directional light,
-      falloff, and specular values. P5 Documentation says specular()
-      is set, but the code calls lightSpecular().
-    */
-    p.lights = function lights() {
-      p.ambientLight(128, 128, 128);
-      p.directionalLight(128, 128, 128, 0, 0, -1);
-      p.lightFalloff(1, 0, 0);
-      p.lightSpecular(0, 0, 0);
-    };
-
-    p.pointLight = function(r, g, b, x, y, z) {
-      if (p.use3DContext) {
-        if (lightCount === p.MAX_LIGHTS) {
-          throw "can only create " + p.MAX_LIGHTS + " lights";
-        }
-
-        // place the point in view space once instead of once per vertex
-        // in the shader.
-        var pos = new PVector(x, y, z);
-        var view = new PMatrix3D();
-        view.scale(1, -1, 1);
-        view.apply(modelView.array());
-        view.mult(pos, pos);
-
-        curContext.useProgram(programObject3D);
-        uniformf(programObject3D, "lights[" + lightCount + "].color", [r / 255, g / 255, b / 255]);
-        uniformf(programObject3D, "lights[" + lightCount + "].position", pos.array());
-        uniformi(programObject3D, "lights[" + lightCount + "].type", 2);
-        uniformi(programObject3D, "lightCount", ++lightCount);
-      }
-    };
-
-    /*
-      Disables lighting so the all shapes drawn after this
-      will not be lit.
-    */
-    p.noLights = function noLights() {
-      if (p.use3DContext) {
-        lightCount = 0;
-        curContext.useProgram(programObject3D);
-        uniformi(programObject3D, "lightCount", lightCount);
-      }
-    };
-
-    /*
-      r,g,b - Color of the light
-      x,y,z - position of the light in modeling space
-      nx,ny,nz - direction of the spotlight
-      angle - in radians
-      concentration -
-    */
-    p.spotLight = function spotLight(r, g, b, x, y, z, nx, ny, nz, angle, concentration) {
-      if (p.use3DContext) {
-        if (lightCount === p.MAX_LIGHTS) {
-          throw "can only create " + p.MAX_LIGHTS + " lights";
-        }
-
-        curContext.useProgram(programObject3D);
-
-        // place the point in view space once instead of once per vertex
-        // in the shader.
-        var pos = new PVector(x, y, z);
-        var view = new PMatrix3D();
-        view.scale(1, -1, 1);
-        view.apply(modelView.array());
-        view.mult(pos, pos);
-
-        // transform the spotlight's direction
-        // need to find a solution for this one. Maybe manual mult?
-        var dir = [nx, ny, nz, 0.0000001];
-        view = new PMatrix3D();
-        view.scale(1, -1, 1);
-        view.apply(modelView.array());
-        view.mult(dir, dir);
-
-        uniformf(programObject3D, "lights[" + lightCount + "].color", [r / 255, g / 255, b / 255]);
-        uniformf(programObject3D, "lights[" + lightCount + "].position", pos.array());
-        uniformf(programObject3D, "lights[" + lightCount + "].direction", [dir[0], dir[1], dir[2]]);
-        uniformf(programObject3D, "lights[" + lightCount + "].concentration", concentration);
-        uniformf(programObject3D, "lights[" + lightCount + "].angle", angle);
-        uniformi(programObject3D, "lights[" + lightCount + "].type", 3);
-        uniformi(programObject3D, "lightCount", ++lightCount);
-      }
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Camera functions
-    ////////////////////////////////////////////////////////////////////////////
-
-    p.beginCamera = function beginCamera() {
-      if (manipulatingCamera) {
-        throw ("You cannot call beginCamera() again before calling endCamera()");
-      } else {
-        manipulatingCamera = true;
-        forwardTransform = cameraInv;
-        reverseTransform = cam;
-      }
-    };
-
-    p.endCamera = function endCamera() {
-      if (!manipulatingCamera) {
-        throw ("You cannot call endCamera() before calling beginCamera()");
-      } else {
-        modelView.set(cam);
-        modelViewInv.set(cameraInv);
-        forwardTransform = modelView;
-        reverseTransform = modelViewInv;
-        manipulatingCamera = false;
-      }
-    };
-
-    p.camera = function camera(eyeX, eyeY, eyeZ, centerX, centerY, centerZ, upX, upY, upZ) {
-      if (arguments.length === 0) {
-        //in case canvas is resized
-        cameraX = curElement.width / 2;
-        cameraY = curElement.height / 2;
-        cameraZ = cameraY / Math.tan(cameraFOV / 2);
-        p.camera(cameraX, cameraY, cameraZ, cameraX, cameraY, 0, 0, 1, 0);
-      } else {
-        var z = new p.PVector(eyeX - centerX, eyeY - centerY, eyeZ - centerZ);
-        var y = new p.PVector(upX, upY, upZ);
-        var transX, transY, transZ;
-        z.normalize();
-        var x = p.PVector.cross(y, z);
-        y = p.PVector.cross(z, x);
-        x.normalize();
-        y.normalize();
-
-        cam.set(x.x, x.y, x.z, 0, y.x, y.y, y.z, 0, z.x, z.y, z.z, 0, 0, 0, 0, 1);
-
-        cam.translate(-eyeX, -eyeY, -eyeZ);
-
-        cameraInv.reset();
-        cameraInv.invApply(x.x, x.y, x.z, 0, y.x, y.y, y.z, 0, z.x, z.y, z.z, 0, 0, 0, 0, 1);
-
-        cameraInv.translate(eyeX, eyeY, eyeZ);
-
-        modelView.set(cam);
-        modelViewInv.set(cameraInv);
-      }
-    };
-
-    p.perspective = function perspective(fov, aspect, near, far) {
-      if (arguments.length === 0) {
-        //in case canvas is resized
-        cameraY = curElement.height / 2;
-        cameraZ = cameraY / Math.tan(cameraFOV / 2);
-        cameraNear = cameraZ / 10;
-        cameraFar = cameraZ * 10;
-        cameraAspect = curElement.width / curElement.height;
-        p.perspective(cameraFOV, cameraAspect, cameraNear, cameraFar);
-      } else {
-        var a = arguments;
-        var yMax, yMin, xMax, xMin;
-        yMax = near * Math.tan(fov / 2);
-        yMin = -yMax;
-        xMax = yMax * aspect;
-        xMin = yMin * aspect;
-        p.frustum(xMin, xMax, yMin, yMax, near, far);
-      }
-    };
-
-    p.frustum = function frustum(left, right, bottom, top, near, far) {
-      frustumMode = true;
-      projection = new PMatrix3D();
-      projection.set((2 * near) / (right - left), 0, (right + left) / (right - left), 0, 0, (2 * near) / (top - bottom), (top + bottom) / (top - bottom), 0, 0, 0, -(far + near) / (far - near), -(2 * far * near) / (far - near), 0, 0, -1, 0);
-    };
-
-    p.ortho = function ortho(left, right, bottom, top, near, far) {
-      if (arguments.length === 0) {
-        p.ortho(0, p.width, 0, p.height, -10, 10);
-      } else {
-        var x = 2 / (right - left);
-        var y = 2 / (top - bottom);
-        var z = -2 / (far - near);
-
-        var tx = -(right + left) / (right - left);
-        var ty = -(top + bottom) / (top - bottom);
-        var tz = -(far + near) / (far - near);
-
-        projection = new PMatrix3D();
-        projection.set(x, 0, 0, tx, 0, y, 0, ty, 0, 0, z, tz, 0, 0, 0, 1);
-
-        frustumMode = false;
-      }
-    };
-
-    p.printProjection = function() {
-      projection.print();
-    };
-
-    p.printCamera = function() {
-      cam.print();
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Shapes
-    ////////////////////////////////////////////////////////////////////////////
-
-    p.box = function(w, h, d) {
-      if (p.use3DContext) {
-        // user can uniformly scale the box by
-        // passing in only one argument.
-        if (!h || !d) {
-          h = d = w;
-        }
-
-        // Modeling transformation
-        var model = new PMatrix3D();
-        model.scale(w, h, d);
-
-        // viewing transformation needs to have Y flipped
-        // becuase that's what Processing does.
-        var view = new PMatrix3D();
-        view.scale(1, -1, 1);
-        view.apply(modelView.array());
-
-        curContext.useProgram(programObject3D);
-        uniformMatrix(programObject3D, "model", true, model.array());
-        uniformMatrix(programObject3D, "view", true, view.array());
-        uniformMatrix(programObject3D, "projection", true, projection.array());
-
-        if (doFill === true) {
-          // fix stitching problems. (lines get occluded by triangles
-          // since they share the same depth values). This is not entirely
-          // working, but it's a start for drawing the outline. So
-          // developers can start playing around with styles.
-          curContext.enable(curContext.POLYGON_OFFSET_FILL);
-          curContext.polygonOffset(1, 1);
-          uniformf(programObject3D, "color", fillStyle);
-
-          var v = new PMatrix3D();
-          v.set(view);
-
-          var m = new PMatrix3D();
-          m.set(model);
-
-          v.mult(m);
-
-          var normalMatrix = new PMatrix3D();
-          normalMatrix.set(v);
-          normalMatrix.invert();
-
-          uniformMatrix(programObject3D, "normalTransform", false, normalMatrix.array());
-
-          vertexAttribPointer(programObject3D, "Vertex", 3, boxBuffer);
-          vertexAttribPointer(programObject3D, "Normal", 3, boxNormBuffer);
-
-          curContext.drawArrays(curContext.TRIANGLES, 0, boxVerts.length / 3);
-          curContext.disable(curContext.POLYGON_OFFSET_FILL);
-        }
-
-        if (lineWidth > 0 && doStroke) {
-          curContext.useProgram(programObject3D);
-          uniformMatrix(programObject3D, "model", true, model.array());
-          uniformMatrix(programObject3D, "view", true, view.array());
-          uniformMatrix(programObject3D, "projection", true, projection.array());
-
-          uniformf(programObject3D, "color", strokeStyle);
-          curContext.lineWidth(lineWidth);
-          vertexAttribPointer(programObject3D, "Vertex", 3, boxOutlineBuffer);
-          curContext.drawArrays(curContext.LINES, 0, boxOutlineVerts.length / 3);
-        }
-      }
-    };
-
-    var initSphere = function() {
-      var i;
-      sphereVerts = [];
-
-      for (i = 0; i < sphereDetailU; i++) {
-        sphereVerts.push(0);
-        sphereVerts.push(-1);
-        sphereVerts.push(0);
-        sphereVerts.push(sphereX[i]);
-        sphereVerts.push(sphereY[i]);
-        sphereVerts.push(sphereZ[i]);
-      }
-      sphereVerts.push(0);
-      sphereVerts.push(-1);
-      sphereVerts.push(0);
-      sphereVerts.push(sphereX[0]);
-      sphereVerts.push(sphereY[0]);
-      sphereVerts.push(sphereZ[0]);
-
-      var v1, v11, v2;
-
-      // middle rings
-      var voff = 0;
-      for (i = 2; i < sphereDetailV; i++) {
-        v1 = v11 = voff;
-        voff += sphereDetailU;
-        v2 = voff;
-        for (var j = 0; j < sphereDetailU; j++) {
-          sphereVerts.push(parseFloat(sphereX[v1]));
-          sphereVerts.push(parseFloat(sphereY[v1]));
-          sphereVerts.push(parseFloat(sphereZ[v1++]));
-          sphereVerts.push(parseFloat(sphereX[v2]));
-          sphereVerts.push(parseFloat(sphereY[v2]));
-          sphereVerts.push(parseFloat(sphereZ[v2++]));
-        }
-
-        // close each ring
-        v1 = v11;
-        v2 = voff;
-
-        sphereVerts.push(parseFloat(sphereX[v1]));
-        sphereVerts.push(parseFloat(sphereY[v1]));
-        sphereVerts.push(parseFloat(sphereZ[v1]));
-        sphereVerts.push(parseFloat(sphereX[v2]));
-        sphereVerts.push(parseFloat(sphereY[v2]));
-        sphereVerts.push(parseFloat(sphereZ[v2]));
-      }
-
-      // add the northern cap
-      for (i = 0; i < sphereDetailU; i++) {
-        v2 = voff + i;
-
-        sphereVerts.push(parseFloat(sphereX[v2]));
-        sphereVerts.push(parseFloat(sphereY[v2]));
-        sphereVerts.push(parseFloat(sphereZ[v2]));
-        sphereVerts.push(0);
-        sphereVerts.push(1);
-        sphereVerts.push(0);
-      }
-
-      sphereVerts.push(parseFloat(sphereX[voff]));
-      sphereVerts.push(parseFloat(sphereY[voff]));
-      sphereVerts.push(parseFloat(sphereZ[voff]));
-      sphereVerts.push(0);
-      sphereVerts.push(1);
-      sphereVerts.push(0);
-
-      //set the buffer data
-      curContext.bindBuffer(curContext.ARRAY_BUFFER, sphereBuffer);
-      curContext.bufferData(curContext.ARRAY_BUFFER, newWebGLArray(sphereVerts), curContext.STATIC_DRAW);
-    };
-
-    p.sphereDetail = function sphereDetail(ures, vres) {
-      var i;
-
-      if (arguments.length === 1) {
-        ures = vres = arguments[0];
-      }
-
-      if (ures < 3) {
-        ures = 3;
-      } // force a minimum res
-      if (vres < 2) {
-        vres = 2;
-      } // force a minimum res
-      // if it hasn't changed do nothing
-      if ((ures === sphereDetailU) && (vres === sphereDetailV)) {
-        return;
-      }
-
-      var delta = p.SINCOS_LENGTH / ures;
-      var cx = new Array(ures);
-      var cz = new Array(ures);
-      // calc unit circle in XZ plane
-      for (i = 0; i < ures; i++) {
-        cx[i] = cosLUT[parseInt((i * delta) % p.SINCOS_LENGTH, 10)];
-        cz[i] = sinLUT[parseInt((i * delta) % p.SINCOS_LENGTH, 10)];
-      }
-
-      // computing vertexlist
-      // vertexlist starts at south pole
-      var vertCount = ures * (vres - 1) + 2;
-      var currVert = 0;
-
-      // re-init arrays to store vertices
-      sphereX = new Array(vertCount);
-      sphereY = new Array(vertCount);
-      sphereZ = new Array(vertCount);
-
-      var angle_step = (p.SINCOS_LENGTH * 0.5) / vres;
-      var angle = angle_step;
-
-      // step along Y axis
-      for (i = 1; i < vres; i++) {
-        var curradius = sinLUT[parseInt(angle % p.SINCOS_LENGTH, 10)];
-        var currY = -cosLUT[parseInt(angle % p.SINCOS_LENGTH, 10)];
-        for (var j = 0; j < ures; j++) {
-          sphereX[currVert] = cx[j] * curradius;
-          sphereY[currVert] = currY;
-          sphereZ[currVert++] = cz[j] * curradius;
-        }
-        angle += angle_step;
-      }
-      sphereDetailU = ures;
-      sphereDetailV = vres;
-
-      // make the sphere verts and norms
-      initSphere();
-    };
-
-    p.sphere = function() {
-      if (p.use3DContext) {
-        var sRad = arguments[0], c;
-
-        if ((sphereDetailU < 3) || (sphereDetailV < 2)) {
-          p.sphereDetail(30);
-        }
-
-        // Modeling transformation
-        var model = new PMatrix3D();
-        model.scale(sRad, sRad, sRad);
-
-        // viewing transformation needs to have Y flipped
-        // becuase that's what Processing does.
-        var view = new PMatrix3D();
-        view.scale(1, -1, 1);
-        view.apply(modelView.array());
-
-        curContext.useProgram(programObject3D);
-
-        uniformMatrix(programObject3D, "model", true, model.array());
-        uniformMatrix(programObject3D, "view", true, view.array());
-        uniformMatrix(programObject3D, "projection", true, projection.array());
-
-        var v = new PMatrix3D();
-        v.set(view);
-
-        var m = new PMatrix3D();
-        m.set(model);
-
-        v.mult(m);
-
-        var normalMatrix = new PMatrix3D();
-        normalMatrix.set(v);
-        normalMatrix.invert();
-
-        uniformMatrix(programObject3D, "normalTransform", false, normalMatrix.array());
-
-        vertexAttribPointer(programObject3D, "Vertex", 3, sphereBuffer);
-        vertexAttribPointer(programObject3D, "Normal", 3, sphereBuffer);
-
-        if (doFill === true) {
-          // fix stitching problems. (lines get occluded by triangles
-          // since they share the same depth values). This is not entirely
-          // working, but it's a start for drawing the outline. So
-          // developers can start playing around with styles.
-          curContext.enable(curContext.POLYGON_OFFSET_FILL);
-          curContext.polygonOffset(1, 1);
-
-          uniformf(programObject3D, "color", fillStyle);
-
-          curContext.drawArrays(curContext.TRIANGLE_STRIP, 0, sphereVerts.length / 3);
-          curContext.disable(curContext.POLYGON_OFFSET_FILL);
-        }
-
-        if (lineWidth > 0 && doStroke) {
-          curContext.useProgram(programObject3D);
-          vertexAttribPointer(programObject3D, "Vertex", 3, sphereBuffer);
-
-          uniformMatrix(programObject3D, "model", true, model.array());
-          uniformMatrix(programObject3D, "view", true, view.array());
-          uniformMatrix(programObject3D, "projection", true, projection.array());
-
-          uniformf(programObject3D, "color", strokeStyle);
-
-          curContext.lineWidth(lineWidth);
-          curContext.drawArrays(curContext.LINE_STRIP, 0, sphereVerts.length / 3);
-        }
-      }
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Coordinates
-    ////////////////////////////////////////////////////////////////////////////
-
-    p.modelX = function modelX(x, y, z) {
-      var mv = modelView.array();
-      var ci = cameraInv.array();
-
-      var ax = mv[0] * x + mv[1] * y + mv[2] * z + mv[3];
-      var ay = mv[4] * x + mv[5] * y + mv[6] * z + mv[7];
-      var az = mv[8] * x + mv[9] * y + mv[10] * z + mv[11];
-      var aw = mv[12] * x + mv[13] * y + mv[14] * z + mv[15];
-
-      var ox = ci[0] * ax + ci[1] * ay + ci[2] * az + ci[3] * aw;
-      var ow = ci[12] * ax + ci[13] * ay + ci[14] * az + ci[15] * aw;
-
-      return (ow !== 0) ? ox / ow : ox;
-    };
-
-    p.modelY = function modelY(x, y, z) {
-      var mv = modelView.array();
-      var ci = cameraInv.array();
-
-      var ax = mv[0] * x + mv[1] * y + mv[2] * z + mv[3];
-      var ay = mv[4] * x + mv[5] * y + mv[6] * z + mv[7];
-      var az = mv[8] * x + mv[9] * y + mv[10] * z + mv[11];
-      var aw = mv[12] * x + mv[13] * y + mv[14] * z + mv[15];
-
-      var oy = ci[4] * ax + ci[5] * ay + ci[6] * az + ci[7] * aw;
-      var ow = ci[12] * ax + ci[13] * ay + ci[14] * az + ci[15] * aw;
-
-      return (ow !== 0) ? oy / ow : oy;
-    };
-
-    p.modelZ = function modelZ(x, y, z) {
-      var mv = modelView.array();
-      var ci = cameraInv.array();
-
-      var ax = mv[0] * x + mv[1] * y + mv[2] * z + mv[3];
-      var ay = mv[4] * x + mv[5] * y + mv[6] * z + mv[7];
-      var az = mv[8] * x + mv[9] * y + mv[10] * z + mv[11];
-      var aw = mv[12] * x + mv[13] * y + mv[14] * z + mv[15];
-
-      var oz = ci[8] * ax + ci[9] * ay + ci[10] * az + ci[11] * aw;
-      var ow = ci[12] * ax + ci[13] * ay + ci[14] * az + ci[15] * aw;
-
-      return (ow !== 0) ? oz / ow : oz;
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Material Properties
-    ////////////////////////////////////////////////////////////////////////////
-
-    p.ambient = function ambient() {
-      // create an alias to shorten code
-      var a = arguments;
-
-      // either a shade of gray or a 'color' object.
-      if (p.use3DContext) {
-        curContext.useProgram(programObject3D);
-        uniformi(programObject3D, "usingMat", true);
-
-        if (a.length === 1) {
-          // color object was passed in
-          if (typeof a[0] === "string") {
-            var c = a[0].slice(5, -1).split(",");
-            uniformf(programObject3D, "mat_ambient", [c[0] / 255, c[1] / 255, c[2] / 255]);
-          }
-          // else a single number was passed in for gray shade
-          else {
-            uniformf(programObject3D, "mat_ambient", [a[0] / 255, a[0] / 255, a[0] / 255]);
-          }
-        }
-        // Otherwise three values were provided (r,g,b)
-        else {
-          uniformf(programObject3D, "mat_ambient", [a[0] / 255, a[1] / 255, a[2] / 255]);
-        }
-      }
-    };
-
-    p.emissive = function emissive() {
-      // create an alias to shorten code
-      var a = arguments;
-
-      if (p.use3DContext) {
-        curContext.useProgram(programObject3D);
-        uniformi(programObject3D, "usingMat", true);
-
-        // If only one argument was provided, the user either gave us a
-        // shade of gray or a 'color' object.
-        if (a.length === 1) {
-          // color object was passed in
-          if (typeof a[0] === "string") {
-            var c = a[0].slice(5, -1).split(",");
-            uniformf(programObject3D, "mat_emissive", [c[0] / 255, c[1] / 255, c[2] / 255]);
-          }
-          // else a regular number was passed in for gray shade
-          else {
-            uniformf(programObject3D, "mat_emissive", [a[0] / 255, a[0] / 255, a[0] / 255]);
-          }
-        }
-        // Otherwise three values were provided (r,g,b)
-        else {
-          uniformf(programObject3D, "mat_emissive", [a[0] / 255, a[1] / 255, a[2] / 255]);
-        }
-      }
-    };
-
-    p.shininess = function shininess(shine) {
-      if (p.use3DContext) {
-        curContext.useProgram(programObject3D);
-        uniformi(programObject3D, "usingMat", true);
-        uniformf(programObject3D, "shininess", shine);
-      }
-    };
-
-    /*
-      Documentation says the following calls are valid, but the
-      Processing throws exceptions:
-      specular(gray, alpha)
-      specular(v1, v2, v3, alpha)
-      So we don't support them either
-      <corban> I dont think this matters so much, let us let color handle it. alpha values are not sent anyways.
-    */
-    p.specular = function specular() {
-      var c = p.color.apply(this, arguments);
-
-      if (p.use3DContext) {
-        curContext.useProgram(programObject3D);
-        uniformi(programObject3D, "usingMat", true);
-        uniformf(programObject3D, "mat_specular", p.color.toGLArray(c).slice(0, 3));
-      }
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Coordinates
-    ////////////////////////////////////////////////////////////////////////////
-    p.screenX = function screenX( x, y, z ) {
-      var mv = modelView.array();
-      var pj = projection.array();
-
-      var ax = mv[ 0]*x + mv[ 1]*y + mv[ 2]*z + mv[ 3];
-      var ay = mv[ 4]*x + mv[ 5]*y + mv[ 6]*z + mv[ 7];
-      var az = mv[ 8]*x + mv[ 9]*y + mv[10]*z + mv[11];
-      var aw = mv[12]*x + mv[13]*y + mv[14]*z + mv[15];
-
-      var ox = pj[ 0]*ax + pj[ 1]*ay + pj[ 2]*az + pj[ 3]*aw;
-      var ow = pj[12]*ax + pj[13]*ay + pj[14]*az + pj[15]*aw;
-
-      if ( ow !== 0 ){
-        ox /= ow;
-      }
-      return p.width * ( 1 + ox ) / 2.0;
-    };
-
-    p.screenY = function screenY( x, y, z ) {
-      var mv = modelView.array();
-      var pj = projection.array();
-
-      var ax = mv[ 0]*x + mv[ 1]*y + mv[ 2]*z + mv[ 3];
-      var ay = mv[ 4]*x + mv[ 5]*y + mv[ 6]*z + mv[ 7];
-      var az = mv[ 8]*x + mv[ 9]*y + mv[10]*z + mv[11];
-      var aw = mv[12]*x + mv[13]*y + mv[14]*z + mv[15];
-
-      var oy = pj[ 4]*ax + pj[ 5]*ay + pj[ 6]*az + pj[ 7]*aw;
-      var ow = pj[12]*ax + pj[13]*ay + pj[14]*az + pj[15]*aw;
-
-      if ( ow !== 0 ){
-        oy /= ow;
-      }
-      return p.height * ( 1 + oy ) / 2.0;
-    };
-
-    p.screenZ = function screenZ( x, y, z ) {
-      var mv = modelView.array();
-      var pj = projection.array();
-
-      var ax = mv[ 0]*x + mv[ 1]*y + mv[ 2]*z + mv[ 3];
-      var ay = mv[ 4]*x + mv[ 5]*y + mv[ 6]*z + mv[ 7];
-      var az = mv[ 8]*x + mv[ 9]*y + mv[10]*z + mv[11];
-      var aw = mv[12]*x + mv[13]*y + mv[14]*z + mv[15];
-
-      var oz = pj[ 8]*ax + pj[ 9]*ay + pj[10]*az + pj[11]*aw;
-      var ow = pj[12]*ax + pj[13]*ay + pj[14]*az + pj[15]*aw;
-
-      if ( ow !== 0 ) {
-        oz /= ow;
-      }
-      return ( oz + 1 ) / 2.0;
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Style functions
-    ////////////////////////////////////////////////////////////////////////////
-
-    p.fill = function fill() {
-      doFill = true;
-      var color = p.color(arguments[0], arguments[1], arguments[2], arguments[3]);
-
-      if (p.use3DContext) {
-        fillStyle = p.color.toGLArray(color);
-      } else {
-        curContext.fillStyle = p.color.toString(color);
-      }
-    };
-
-    p.noFill = function noFill() {
-      doFill = false;
-    };
-
-    p.stroke = function stroke() {
-      doStroke = true;
-      var color = p.color(arguments[0], arguments[1], arguments[2], arguments[3]);
-
-      if (p.use3DContext) {
-        strokeStyle = p.color.toGLArray(color);
-      } else {
-        curContext.strokeStyle = p.color.toString(color);
-      }
-    };
-
-    p.noStroke = function noStroke() {
-      doStroke = false;
-    };
-
-    p.strokeWeight = function strokeWeight(w) {
-      if (p.use3DContext) {
-        lineWidth = w;
-      } else {
-        curContext.lineWidth = w;
-      }
-    };
-
-    p.strokeCap = function strokeCap(value) {
-      curContext.lineCap = value;
-    };
-
-    p.strokeJoin = function strokeJoin(value) {
-      curContext.lineJoin = value;
-    };
-
-    p.smooth = function() {
-      if (!p.use3DContext) {
-        curElement.style.setProperty("image-rendering", "optimizeQuality", "important");
-        curContext.mozImageSmoothingEnabled = true;
-      }
-    };
-
-    p.noSmooth = function() {
-      if (!p.use3DContext) {
-        curElement.style.setProperty("image-rendering", "optimizeSpeed", "important");
-        curContext.mozImageSmoothingEnabled = false;
-      }
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Vector drawing functions
-    ////////////////////////////////////////////////////////////////////////////
-
-    p.Point = function Point(x, y) {
-      this.x = x;
-      this.y = y;
-      this.copy = function() {
-        return new Point(x, y);
-      };
-    };
-
-    p.point = function point(x, y, z) {
-      if (p.use3DContext) {
-        var model = new PMatrix3D();
-
-        // move point to position
-        model.translate(x, y, z || 0);
-
-        var view = new PMatrix3D();
-        view.scale(1, -1, 1);
-        view.apply(modelView.array());
-
-        curContext.useProgram(programObject2D);
-        uniformMatrix(programObject2D, "model", true, model.array());
-        uniformMatrix(programObject2D, "view", true, view.array());
-        uniformMatrix(programObject2D, "projection", true, projection.array());
-
-        if (lineWidth > 0 && doStroke) {
-          // this will be replaced with the new bit shifting color code
-          uniformf(programObject2D, "color", strokeStyle);
-
-          vertexAttribPointer(programObject2D, "Vertex", 3, pointBuffer);
-          curContext.drawArrays(curContext.POINTS, 0, 1);
-        }
-      } else {
-        if (doStroke) {
-          var oldFill = curContext.fillStyle;
-          curContext.fillStyle = curContext.strokeStyle;
-          curContext.fillRect(Math.round(x), Math.round(y), 1, 1);
-          curContext.fillStyle = oldFill;
-        }
-      }
-    };
-
-    p.beginShape = function beginShape(type) {
-      curShape = type;
-      curShapeCount = 0;
-      curvePoints = [];
-      //textureImage = null;
-      vertArray = [];
-      if(p.use3DContext)
-      {
-        //normalMode = NORMAL_MODE_AUTO;
-      }
-    };
-
-    p.vertex = function vertex() {
-      if(firstVert){ firstVert = false; }
-      var vert = [];
-      if(arguments.length === 4){ //x, y, u, v
-        vert[0] = arguments[0];
-        vert[1] = arguments[1];
-        vert[2] = 0;
-        vert[3] = arguments[2];
-        vert[4] = arguments[3];
-      }
-      else{ // x, y, z, u, v
-        vert[0] = arguments[0];
-        vert[1] = arguments[1];
-        vert[2] = arguments[2] || 0;
-        vert[3] = arguments[3] || 0;
-        vert[4] = arguments[4] || 0;
-      }
-      // fill rgba
-      vert[5] = fillStyle[0];
-      vert[6] = fillStyle[1];
-      vert[7] = fillStyle[2];
-      vert[8] = fillStyle[3];
-      // stroke rgba
-      vert[9] = strokeStyle[0];
-      vert[10] = strokeStyle[1];
-      vert[11] = strokeStyle[2];
-      vert[12] = strokeStyle[3];
-      //normals
-      vert[13] = normalX;
-      vert[14] = normalY;
-      vert[15] = normalZ;
-
-      vertArray.push(vert);
-    };
-
-    var point2D = function point2D(vArray){
-      var model = new PMatrix3D();
-      var view = new PMatrix3D();
-      view.scale(1, -1, 1);
-      view.apply(modelView.array());
-
-      curContext.useProgram(programObject2D);
-      uniformMatrix(programObject2D, "model", true, model.array());
-      uniformMatrix(programObject2D, "view", true, view.array());
-      uniformMatrix(programObject2D, "projection", true, projection.array());
-
-      uniformf(programObject2D, "color", strokeStyle);
-      vertexAttribPointer(programObject2D, "Vertex", 3, pointBuffer);
-      curContext.bufferData(curContext.ARRAY_BUFFER, newWebGLArray(vArray), curContext.STREAM_DRAW);
-      curContext.drawArrays(curContext.POINTS, 0, vArray.length/3);
-    };
-
-    var line2D = function line2D(vArray, mode){
-      var ctxMode;
-      if (mode === "LINES"){
-        ctxMode = curContext.LINES;
-      }
-      else if(mode === "LINE_LOOP"){
-        ctxMode = curContext.LINE_LOOP;
-      }
-      else{
-        ctxMode = curContext.LINE_STRIP;
-      }
-      var model = new PMatrix3D();
-      var view = new PMatrix3D();
-      view.scale(1, -1, 1);
-      view.apply(modelView.array());
-
-      curContext.useProgram(programObject2D);
-      uniformMatrix(programObject2D, "model", true, model.array());
-      uniformMatrix(programObject2D, "view", true, view.array());
-      uniformMatrix(programObject2D, "projection", true, projection.array());
-
-      uniformf(programObject2D, "color", strokeStyle);
-      vertexAttribPointer(programObject2D, "Vertex", 3, lineBuffer);
-      curContext.bufferData(curContext.ARRAY_BUFFER, newWebGLArray(vArray), curContext.STREAM_DRAW);
-      curContext.drawArrays(ctxMode, 0, vArray.length/3);
-    };
-
-    var fill2D = function fill2D(vArray, mode){
-      var ctxMode;
-      if(mode === "TRIANGLES"){
-        ctxMode = curContext.TRIANGLES;
-      }
-      else if(mode === "TRIANGLE_FAN"){
-        ctxMode = curContext.TRIANGLE_FAN;
-      }
-      else{
-        ctxMode = curContext.TRIANGLE_STRIP;
-      }
-
-      var model = new PMatrix3D();
-      var view = new PMatrix3D();
-      view.scale(1, -1, 1);
-      view.apply(modelView.array());
-
-      curContext.useProgram( programObject2D );
-      uniformMatrix( programObject2D, "model", true,  model.array() );
-      uniformMatrix( programObject2D, "view", true, view.array() );
-      uniformMatrix( programObject2D, "projection", true, projection.array() );
-
-      curContext.enable( curContext.POLYGON_OFFSET_FILL );
-      curContext.polygonOffset( 1, 1 );
-      uniformf( programObject2D, "color", fillStyle);
-
-      vertexAttribPointer(programObject2D, "Vertex", 3, fillBuffer);
-      curContext.bufferData(curContext.ARRAY_BUFFER, newWebGLArray(vArray), curContext.STREAM_DRAW);
-
-      curContext.drawArrays( ctxMode, 0, vArray.length/3 );
-      curContext.disable( curContext.POLYGON_OFFSET_FILL );
-    };
-
-    p.endShape = function endShape(close){
-      firstVert = true;
-      var i, j, k;
-      var last = vertArray.length - 1;
-      if(!close){
-        p.CLOSE = false;
-      }
-      else{
-        p.CLOSE = true;
-      }
-      if(isCurve && curShape === p.POLYGON || isCurve && curShape === undefined){
-        if(vertArray.length > 3){
-          if(p.use3DContext){
-          }
-          else{
-            var b = [],
-                s = 1 - curTightness;
-            curContext.beginPath();
-            curContext.moveTo(vertArray[1][0], vertArray[1][1]);
-              /*
-              * Matrix to convert from Catmull-Rom to cubic Bezier
-              * where t = curTightness
-              * |0         1          0         0       |
-              * |(t-1)/6   1          (1-t)/6   0       |
-              * |0         (1-t)/6    1         (t-1)/6 |
-              * |0         0          0         0       |
-              */
-            for(i = 1; (i+2) < vertArray.length; i++){
-              b[0] = [vertArray[i][0], vertArray[i][1]];
-              b[1] = [vertArray[i][0] + (s * vertArray[i+1][0] - s * vertArray[i-1][0]) / 6, vertArray[i][1] + (s * vertArray[i+1][1] - s * vertArray[i-1][1]) / 6];
-              b[2] = [vertArray[i+1][0] + (s * vertArray[i][0] - s * vertArray[i+2][0]) / 6, vertArray[i+1][1] + (s * vertArray[i][1] - s * vertArray[i+2][1]) / 6];
-              b[3] = [vertArray[i+1][0], vertArray[i+1][1]];
-              curContext.bezierCurveTo(b[1][0], b[1][1], b[2][0], b[2][1], b[3][0], b[3][1]);
-            }
-            if(doFill){
-              curContext.fill();
-            }
-            if(doStroke){
-              curContext.stroke();
-            }
-            curContext.closePath();
-          }
-        }
-      }
-      else if(isBezier && curShape === p.POLYGON || isBezier && curShape === undefined){
-        curContext.beginPath();
-        curContext.moveTo(vertArray[0][0], vertArray[0][1]);
-        for(i = 1; i < vertArray.length; i++){
-          curContext.bezierCurveTo(vertArray[i][0], vertArray[i][1], vertArray[i][2], vertArray[i][3], vertArray[i][4], vertArray[i][5]);
-        }
-        if(doFill){
-          curContext.fill();
-        }
-        if(doStroke){
-          curContext.stroke();
-        }
-        curContext.closePath();
-      }
-      else{
-        if(p.use3DContext){ // 3D context
-          var lineVertArray = [];
-          var fillVertArray = [];
-          for(i = 0; i < vertArray.length; i++){
-            for(j = 0; j < 3; j++){
-              fillVertArray.push(vertArray[i][j]);
-            }
-          }
-
-          fillVertArray.push(vertArray[0][0]);
-          fillVertArray.push(vertArray[0][1]);
-          fillVertArray.push(vertArray[0][2]);
-
-          if (curShape === p.POINTS){
-            for(i = 0; i < vertArray.length; i++){
-              for(j = 0; j < 3; j++){
-                lineVertArray.push(vertArray[i][j]);
-              }
-            }
-            point2D(lineVertArray);
-          }
-          else if(curShape === p.LINES){
-            for(i = 0; i < vertArray.length; i++){
-              for(j = 0; j < 3; j++){
-                lineVertArray.push(vertArray[i][j]);
-              }
-            }
-            line2D(lineVertArray, "LINES");
-          }
-          else if(curShape === p.TRIANGLES){
-            if(vertArray.length > 2){
-              for(i = 0; (i+2) < vertArray.length; i+=3){
-                fillVertArray = [];
-                lineVertArray = [];
-                for(j = 0; j < 3; j++){
-                  for(k = 0; k < 3; k++){
-                    lineVertArray.push(vertArray[i+j][k]);
-                    fillVertArray.push(vertArray[i+j][k]);
-                  }
-                }
-                if(doStroke){
-                  line2D(lineVertArray, "LINE_LOOP");
-                }
-                if(doFill){
-                  fill2D(fillVertArray, "TRIANGLES");
-                }
-              }
-            }
-          }
-          else if(curShape === p.TRIANGLE_STRIP){
-            if(vertArray.length > 2){
-              for(i = 0; (i+2) < vertArray.length; i++){
-                lineVertArray = [];
-                fillVertArray = [];
-                for(j = 0; j < 3; j++){
-                  for(k = 0; k < 3; k++){
-                    lineVertArray.push(vertArray[i+j][k]);
-                    fillVertArray.push(vertArray[i+j][k]);
-                  }
-                }
-                if(doFill){
-                  fill2D(fillVertArray);
-                }
-                if(doStroke){
-                  line2D(lineVertArray, "LINE_LOOP");
-                }
-              }
-            }
-          }
-          else if(curShape === p.TRIANGLE_FAN){
-            if(vertArray.length > 2){
-              for(i = 0; i < 3; i++){
-                for(j = 0; j < 3; j++){
-                  lineVertArray.push(vertArray[i][j]);
-                }
-              }
-              if(doStroke){
-                line2D(lineVertArray, "LINE_LOOP");
-              }
-              for(i = 2; (i+1) < vertArray.length; i++){
-                lineVertArray = [];
-                lineVertArray.push(vertArray[0][0]);
-                lineVertArray.push(vertArray[0][1]);
-                lineVertArray.push(vertArray[0][2]);
-                for(j = 0; j < 2; j++){
-                  for(k = 0; k < 3; k++){
-                    lineVertArray.push(vertArray[i+j][k]);
-                  }
-                }
-                if(doStroke){
-                  line2D(lineVertArray, "LINE_STRIP");
-                }
-              }
-              if(doFill){
-                fill2D(fillVertArray, "TRIANGLE_FAN");
-              }
-            }
-          }
-          else if(curShape === p.QUADS){
-            for(i = 0; (i + 3) < vertArray.length; i+=4){
-              lineVertArray = [];
-              for(j = 0; j < 4; j++){
-                for(k = 0; k < 3; k++){
-                  lineVertArray.push(vertArray[i+j][k]);
-                }
-              }
-              if(doStroke){
-                line2D(lineVertArray, "LINE_LOOP");
-              }
-
-              if(doFill){
-                fillVertArray = [];
-                for(j = 0; j < 3; j++){
-                  fillVertArray.push(vertArray[i][j]);
-                }
-                for(j = 0; j < 3; j++){
-                  fillVertArray.push(vertArray[i+1][j]);
-                }
-                for(j = 0; j < 3; j++){
-                  fillVertArray.push(vertArray[i+3][j]);
-                }
-                for(j = 0; j < 3; j++){
-                  fillVertArray.push(vertArray[i+2][j]);
-                }
-                fill2D(fillVertArray, "TRIANGLE_STRIP");
-              }
-            }
-          }
-          else if(curShape === p.QUAD_STRIP){
-            var tempArray = [];
-            if(vertArray.length > 3){
-              for(i = 0; i < 2; i++){
-                for(j = 0; j < 3; j++){
-                  lineVertArray.push(vertArray[i][j]);
-                }
-              }
-              line2D(lineVertArray, "LINE_STRIP");
-              if(vertArray.length > 4 && vertArray.length % 2 > 0){
-                tempArray = fillVertArray.splice(fillVertArray.length - 6);
-                vertArray.pop();
-              }
-              for(i = 0; (i+3) < vertArray.length; i+=2){
-                lineVertArray = [];
-                for(j = 0; j < 3; j++){
-                  lineVertArray.push(vertArray[i+1][j]);
-                }
-                for(j = 0; j < 3; j++){
-                  lineVertArray.push(vertArray[i+3][j]);
-                }
-                for(j = 0; j < 3; j++){
-                  lineVertArray.push(vertArray[i+2][j]);
-                }
-                for(j = 0; j < 3; j++){
-                  lineVertArray.push(vertArray[i+0][j]);
-                }
-                line2D(lineVertArray, "LINE_STRIP");
-              }
-              if(doFill){
-                fill2D(fillVertArray);
-              }
-            }
-          }
-          else{
-            if(vertArray.length === 1){
-              for(j = 0; j < 3; j++){
-                lineVertArray.push(vertArray[0][j]);
-              }
-              point2D(lineVertArray);
-            }
-            else{
-              for(i = 0; i < vertArray.length; i++){
-                for(j = 0; j < 3; j++){
-                  lineVertArray.push(vertArray[i][j]);
-                }
-              }
-              if(p.CLOSE){
-                line2D(lineVertArray, "LINE_LOOP");
-              }
-              else{
-                line2D(lineVertArray, "LINE_STRIP");
-              }
-              if(doFill){
-                fill2D(fillVertArray);
-              }
-            }
-          }
-        }
-        // 2D context
-        else{
-          if (curShape === p.POINTS){
-            for(i = 0; i < vertArray.length; i++){
-              p.point(vertArray[i][0], vertArray[i][1]);
-            }
-          }
-          else if(curShape === p.LINES){
-            for(i = 0; (i + 1) < vertArray.length; i+=2){
-              p.line(vertArray[i][0], vertArray[i][1], vertArray[i+1][0], vertArray[i+1][1]);
-            }
-          }
-          else if(curShape === p.TRIANGLES){
-            for(i = 0; (i + 2) < vertArray.length; i+=3){
-              curContext.beginPath();
-              curContext.moveTo(vertArray[i][0], vertArray[i][1]);
-              curContext.lineTo(vertArray[i+1][0], vertArray[i+1][1]);
-              curContext.lineTo(vertArray[i+2][0], vertArray[i+2][1]);
-              curContext.lineTo(vertArray[i][0], vertArray[i][1]);
-              if(doFill){
-                curContext.fill();
-              }
-              if(doStroke){
-                curContext.stroke();
-              }
-              curContext.closePath();
-            }
-          }
-          else if(curShape === p.TRIANGLE_STRIP){
-            if(vertArray.length > 2){
-              curContext.beginPath();
-              curContext.moveTo(vertArray[0][0], vertArray[0][1]);
-              curContext.lineTo(vertArray[1][0], vertArray[1][1]);
-              for(i = 2; i < vertArray.length; i++){
-                curContext.lineTo(vertArray[i][0], vertArray[i][1]);
-                curContext.lineTo(vertArray[i-2][0], vertArray[i-2][1]);
-                if(doFill){
-                  curContext.fill();
-                }
-                if(doStroke){
-                  curContext.stroke();
-                }
-                curContext.moveTo(vertArray[i][0],vertArray[i][1]);
-              }
-            }
-          }
-          else if(curShape === p.TRIANGLE_FAN){
-            if(vertArray.length > 2){
-              curContext.beginPath();
-              curContext.moveTo(vertArray[0][0], vertArray[0][1]);
-              curContext.lineTo(vertArray[1][0], vertArray[1][1]);
-              curContext.lineTo(vertArray[2][0], vertArray[2][1]);
-              if(doFill){
-                  curContext.fill();
-                }
-              if(doStroke){
-                  curContext.stroke();
-                }
-              for(i = 3; i < vertArray.length; i++){
-                curContext.moveTo(vertArray[0][0], vertArray[0][1]);
-                curContext.lineTo(vertArray[i-1][0], vertArray[i-1][1]);
-                curContext.lineTo(vertArray[i][0], vertArray[i][1]);
-                if(doFill){
-                  curContext.fill();
-                }
-                if(doStroke){
-                  curContext.stroke();
-                }
-              }
-            }
-          }
-          else if(curShape === p.QUADS){
-            for(i = 0; (i + 3) < vertArray.length; i+=4){
-              curContext.beginPath();
-              curContext.moveTo(vertArray[i][0], vertArray[i][1]);
-              for(j = 1; j < 4; j++){
-                curContext.lineTo(vertArray[i+j][0], vertArray[i+j][1]);
-              }
-              curContext.lineTo(vertArray[i][0], vertArray[i][1]);
-              if(doFill){
-                curContext.fill();
-              }
-              if(doStroke){
-                curContext.stroke();
-              }
-              curContext.closePath();
-            }
-          }
-          else if(curShape === p.QUAD_STRIP){
-            if(vertArray.length > 3){
-              curContext.beginPath();
-              curContext.moveTo(vertArray[0][0], vertArray[0][1]);
-              curContext.lineTo(vertArray[1][0], vertArray[1][1]);
-              for(i = 2; (i+1) < vertArray.length; i++){
-                if((i % 2) === 0){
-                  curContext.moveTo(vertArray[i-2][0], vertArray[i-2][1]);
-                  curContext.lineTo(vertArray[i][0], vertArray[i][1]);
-                  curContext.lineTo(vertArray[i+1][0], vertArray[i+1][1]);
-                  curContext.lineTo(vertArray[i-1][0], vertArray[i-1][1]);
-                  if(doFill){
-                    curContext.fill();
-                  }
-                  if(doStroke){
-                    curContext.stroke();
-                  }
-                }
-              }
-            }
-          }
-          else{
-            curContext.beginPath();
-            curContext.moveTo(vertArray[0][0], vertArray[0][1]);
-            for(i = 1; i < vertArray.length; i++){
-              curContext.lineTo(vertArray[i][0], vertArray[i][1]);
-            }
-            if(p.CLOSE){
-              curContext.lineTo(vertArray[0][0], vertArray[0][1]);
-            }
-            if(doFill){
-              curContext.fill();
-            }
-            if(doStroke){
-              curContext.stroke();
-            }
-          }
-          curContext.closePath();
-        }
-      }
-      isCurve = false;
-      isBezier = false;
-    };
-
-    p.bezierVertex = function(){
-      isBezier = true;
-      var vert = [];
-      if(firstVert){
-        throw ("vertex() must be used at least once before calling bezierVertex()");
-      }
-      else{
-        if(arguments.length === 6){
-          for(var i = 0; i < arguments.length; i++){ vert[i] = arguments[i]; }
-        }
-        else{ //for 9 arguments (3d)
-        }
-        vertArray.push(vert);
-      }
-    };
-
-    p.curveVertex = function(x, y, z) {
-      isCurve = true;
-      p.vertex(x, y, z);
-    };
-
-    p.curveVertexSegment = function(x1, y1, z1, x2, y2, z2, x3, y3, z3, x4, y4, z4) {
-      var x0 = x2;
-      var y0 = y2;
-      var z0 = z2;
-
-      var draw = curveDrawMatrix.array();
-
-      var xplot1 = draw[4] * x1 + draw[5] * x2 + draw[6] * x3 + draw[7] * x4;
-      var xplot2 = draw[8] * x1 + draw[9] * x2 + draw[10] * x3 + draw[11] * x4;
-      var xplot3 = draw[12] * x1 + draw[13] * x2 + draw[14] * x3 + draw[15] * x4;
-
-      var yplot1 = draw[4] * y1 + draw[5] * y2 + draw[6] * y3 + draw[7] * y4;
-      var yplot2 = draw[8] * y1 + draw[9] * y2 + draw[10] * y3 + draw[11] * y4;
-      var yplot3 = draw[12] * y1 + draw[13] * y2 + draw[14] * y3 + draw[15] * y4;
-
-      var zplot1 = draw[4] * z1 + draw[5] * z2 + draw[6] * z3 + draw[7] * z4;
-      var zplot2 = draw[8] * z1 + draw[9] * z2 + draw[10] * z3 + draw[11] * z4;
-      var zplot3 = draw[12] * z1 + draw[13] * z2 + draw[14] * z3 + draw[15] * z4;
-
-      p.vertex(x0, y0, z0);
-      for (var j = 0; j < curveDetail; j++) {
-        x0 += xplot1;
-        xplot1 += xplot2;
-        xplot2 += xplot3;
-        y0 += yplot1;
-        yplot1 += yplot2;
-        yplot2 += yplot3;
-        z0 += zplot1;
-        zplot1 += zplot2;
-        zplot2 += zplot3;
-        p.vertex(x0, y0, z0);
-      }
-    };
-
-    p.curve = function curve() {
-      if (arguments.length === 8) // curve(x1, y1, x2, y2, x3, y3, x4, y4)
-      {
-        p.beginShape();
-        p.curveVertex(arguments[0], arguments[1]);
-        p.curveVertex(arguments[2], arguments[3]);
-        p.curveVertex(arguments[4], arguments[5]);
-        p.curveVertex(arguments[6], arguments[7]);
-        p.endShape();
-      } else { // curve( x1, y1, z1, x2, y2, z2, x3, y3, z3, x4, y4, z4);
-        if (p.use3DContext) {
-          p.beginShape();
-          p.curveVertex(arguments[0], arguments[1], arguments[2]);
-          p.curveVertex(arguments[3], arguments[4], arguments[5]);
-          p.curveVertex(arguments[6], arguments[7], arguments[8]);
-          p.curveVertex(arguments[9], arguments[10], arguments[11]);
-          p.endShape();
-        }
-      }
-    };
-
-    p.curveTightness = function(tightness) {
-      curTightness = tightness;
-    };
-
-    //used by both curveDetail and bezierDetail
-    var splineForward = function(segments, matrix) {
-      var f = 1.0 / segments;
-      var ff = f * f;
-      var fff = ff * f;
-
-      matrix.set(0, 0, 0, 1, fff, ff, f, 0, 6 * fff, 2 * ff, 0, 0, 6 * fff, 0, 0, 0);
-    };
-
-    //internal curveInit
-    //used by curveDetail, curveTightness
-    var curveInit = function() {
-      // allocate only if/when used to save startup time
-      if (!curveDrawMatrix) {
-        curveBasisMatrix = new PMatrix3D();
-        curveDrawMatrix = new PMatrix3D();
-        curveInited = true;
-      }
-
-      var s = curTightness;
-      curveBasisMatrix.set(((s - 1) / 2).toFixed(2), ((s + 3) / 2).toFixed(2), ((-3 - s) / 2).toFixed(2), ((1 - s) / 2).toFixed(2), (1 - s), ((-5 - s) / 2).toFixed(2), (s + 2), ((s - 1) / 2).toFixed(2), ((s - 1) / 2).toFixed(2), 0, ((1 - s) / 2).toFixed(2), 0, 0, 1, 0, 0);
-
-      splineForward(curveDetail, curveDrawMatrix);
-
-      if (!bezierBasisInverse) {
-        //bezierBasisInverse = bezierBasisMatrix.get();
-        //bezierBasisInverse.invert();
-        curveToBezierMatrix = new PMatrix3D();
-      }
-
-      // TODO only needed for PGraphicsJava2D? if so, move it there
-      // actually, it's generally useful for other renderers, so keep it
-      // or hide the implementation elsewhere.
-      curveToBezierMatrix.set(curveBasisMatrix);
-      curveToBezierMatrix.preApply(bezierBasisInverse);
-
-      // multiply the basis and forward diff matrices together
-      // saves much time since this needn't be done for each curve
-      curveDrawMatrix.apply(curveBasisMatrix);
-    };
-
-    p.curveDetail = function curveDetail() {
-      curveDetail = arguments[0];
-      curveInit();
-    };
-
-    p.rectMode = function rectMode(aRectMode) {
-      curRectMode = aRectMode;
-    };
-
-    p.imageMode = function(mode) {
-      switch (mode) {
-      case p.CORNER:
-        imageModeConvert = imageModeCorner;
-        break;
-      case p.CORNERS:
-        imageModeConvert = imageModeCorners;
-        break;
-      case p.CENTER:
-        imageModeConvert = imageModeCenter;
-        break;
-      default:
-        throw "Invalid imageMode";
-      }
-    };
-
-    p.ellipseMode = function ellipseMode(aEllipseMode) {
-      curEllipseMode = aEllipseMode;
-    };
-
-    p.arc = function arc(x, y, width, height, start, stop) {
-      if (width <= 0) {
-        return;
-      }
-
-      if (curEllipseMode === p.CORNER) {
-        x += width / 2;
-        y += height / 2;
-      }
-
-      curContext.moveTo(x, y);
-      curContext.beginPath();
-      curContext.arc(x, y, curEllipseMode === p.CENTER_RADIUS ? width : width / 2, start, stop, false);
-
-      if (doStroke) {
-        curContext.stroke();
-      }
-      curContext.lineTo(x, y);
-
-      if (doFill) {
-        curContext.fill();
-      }
-      curContext.closePath();
-    };
-
-    p.line = function line() {
-      var x1, y1, z1, x2, y2, z2;
-
-      if (p.use3DContext) {
-        if (arguments.length === 6) {
-          x1 = arguments[0];
-          y1 = arguments[1];
-          z1 = arguments[2];
-          x2 = arguments[3];
-          y2 = arguments[4];
-          z2 = arguments[5];
-        } else if (arguments.length === 4) {
-          x1 = arguments[0];
-          y1 = arguments[1];
-          z1 = 0;
-          x2 = arguments[2];
-          y2 = arguments[3];
-          z2 = 0;
-        }
-
-        var lineVerts = [x1, y1, z1, x2, y2, z2];
-
-        var model = new PMatrix3D();
-        //model.scale(w, h, d);
-        var view = new PMatrix3D();
-        view.scale(1, -1, 1);
-        view.apply(modelView.array());
-
-        curContext.useProgram(programObject2D);
-        uniformMatrix(programObject2D, "model", true, model.array());
-        uniformMatrix(programObject2D, "view", true, view.array());
-        uniformMatrix(programObject2D, "projection", true, projection.array());
-
-        if (lineWidth > 0 && doStroke) {
-          curContext.useProgram(programObject2D);
-
-          uniformf(programObject2D, "color", strokeStyle);
-
-          curContext.lineWidth(lineWidth);
-
-          vertexAttribPointer(programObject2D, "Vertex", 3, lineBuffer);
-          curContext.bufferData(curContext.ARRAY_BUFFER, newWebGLArray(lineVerts), curContext.STREAM_DRAW);
-          curContext.drawArrays(curContext.LINES, 0, 2);
-        }
-      } else {
-        x1 = arguments[0];
-        y1 = arguments[1];
-        x2 = arguments[2];
-        y2 = arguments[3];
-
-        if (doStroke) {
-          curContext.beginPath();
-          curContext.moveTo(x1 || 0, y1 || 0);
-          curContext.lineTo(x2 || 0, y2 || 0);
-          curContext.stroke();
-          curContext.closePath();
-        }
-      }
-    };
-
-    p.bezier = function bezier(x1, y1, x2, y2, x3, y3, x4, y4) {
-      curContext.beginPath();
-      curContext.moveTo(x1, y1);
-      curContext.bezierCurveTo(x2, y2, x3, y3, x4, y4);
-      curContext.stroke();
-      curContext.closePath();
-    };
-
-    p.bezierPoint = function bezierPoint(a, b, c, d, t) {
-      return (1 - t) * (1 - t) * (1 - t) * a + 3 * (1 - t) * (1 - t) * t * b + 3 * (1 - t) * t * t * c + t * t * t * d;
-    };
-
-    p.bezierTangent = function bezierTangent(a, b, c, d, t) {
-      return (3 * t * t * (-a + 3 * b - 3 * c + d) + 6 * t * (a - 2 * b + c) + 3 * (-a + b));
-    };
-
-    p.curvePoint = function curvePoint(a, b, c, d, t) {
-      return 0.5 * ((2 * b) + (-a + c) * t + (2 * a - 5 * b + 4 * c - d) * t * t + (-a + 3 * b - 3 * c + d) * t * t * t);
-    };
-
-    p.curveTangent = function curveTangent(a, b, c, d, t) {
-      return 0.5 * ((-a + c) + 2 * (2 * a - 5 * b + 4 * c - d) * t + 3 * (-a + 3 * b - 3 * c + d) * t * t);
-    };
-
-    p.triangle = function triangle(x1, y1, x2, y2, x3, y3) {
-      p.beginShape(p.TRIANGLES);
-      p.vertex(x1, y1, 0);
-      p.vertex(x2, y2, 0);
-      p.vertex(x3, y3, 0);
-      p.endShape();
-    };
-
-    p.quad = function quad(x1, y1, x2, y2, x3, y3, x4, y4) {
-      p.beginShape(p.QUADS);
-      p.vertex(x1, y1, 0);
-      p.vertex(x2, y2, 0);
-      p.vertex(x3, y3, 0);
-      p.vertex(x4, y4, 0);
-      p.endShape();
-    };
-
-    p.rect = function rect(x, y, width, height) {
-      if (!width && !height) {
-        return;
-      }
-
-      curContext.beginPath();
-
-      var offsetStart = 0;
-      var offsetEnd = 0;
-
-      if (curRectMode === p.CORNERS) {
-        width -= x;
-        height -= y;
-      }
-
-      if (curRectMode === p.RADIUS) {
-        width *= 2;
-        height *= 2;
-      }
-
-      if (curRectMode === p.CENTER || curRectMode === p.RADIUS) {
-        x -= width / 2;
-        y -= height / 2;
-      }
-
-      curContext.rect(
-      Math.round(x) - offsetStart, Math.round(y) - offsetStart, Math.round(width) + offsetEnd, Math.round(height) + offsetEnd);
-
-      if (doFill) {
-        curContext.fill();
-      }
-      if (doStroke) {
-        curContext.stroke();
-      }
-
-      curContext.closePath();
-    };
-
-    p.ellipse = function ellipse(x, y, width, height) {
-      x = x || 0;
-      y = y || 0;
-
-      if (width <= 0 && height <= 0) {
-        return;
-      }
-
-      curContext.beginPath();
-
-      if (curEllipseMode === p.RADIUS) {
-        width *= 2;
-        height *= 2;
-      }
-
-      if (curEllipseMode === p.CORNERS) {
-        width = width - x;
-        height = height - y;
-      }
-
-      if (curEllipseMode === p.CORNER || curEllipseMode === p.CORNERS) {
-        x += width / 2;
-        y += height / 2;
-      }
-
-      var offsetStart = 0;
-
-      // Shortcut for drawing a circle
-      if (width === height) {
-        curContext.arc(x - offsetStart, y - offsetStart, width / 2, 0, p.TWO_PI, false);
-      } else {
-        var w = width / 2,
-          h = height / 2,
-          C = 0.5522847498307933;
-        var c_x = C * w,
-          c_y = C * h;
-
-        // TODO: Audit
-        curContext.moveTo(x + w, y);
-        curContext.bezierCurveTo(x + w, y - c_y, x + c_x, y - h, x, y - h);
-        curContext.bezierCurveTo(x - c_x, y - h, x - w, y - c_y, x - w, y);
-        curContext.bezierCurveTo(x - w, y + c_y, x - c_x, y + h, x, y + h);
-        curContext.bezierCurveTo(x + c_x, y + h, x + w, y + c_y, x + w, y);
-      }
-
-      if (doFill) {
-        curContext.fill();
-      }
-      if (doStroke) {
-        curContext.stroke();
-      }
-
-      curContext.closePath();
-    };
-
-    p.normal = function normal(nx, ny, nz) {
-      if (arguments.length !== 3 || !(typeof nx === "number" && typeof ny === "number" && typeof nz === "number")) {
-        throw "normal() requires three numeric arguments.";
-      }
-
-      normalX = nx;
-      normalY = ny;
-      normalZ = nz;
-
-      if (curShape !== 0) {
-        if (normalMode === p.NORMAL_MODE_AUTO) {
-          normalMode = p.NORMAL_MODE_SHAPE;
-        } else if (normalMode === p.NORMAL_MODE_SHAPE) {
-          normalMode = p.NORMAL_MODE_VERTEX;
-        }
-      }
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Raster drawing functions
-    ////////////////////////////////////////////////////////////////////////////
-
-    // TODO: function incomplete
-    p.save = function save(file) {};
-
-    var Temporary2DContext = document.createElement('canvas').getContext('2d');
-
-    var PImage = function PImage(aWidth, aHeight, aFormat) {
-      this.get = function(x, y, w, h) {
-        if (!arguments.length) {
-          return p.get(this);
-        } else if (arguments.length === 2) {
-          return p.get(x, y, this);
-        } else if (arguments.length === 4) {
-          return p.get(x, y, w, h, this);
-        }
-      };
-
-      this.set = function(x, y, c) {
-        p.set(x, y, c, this);
-      };
-
-      this.blend = function(srcImg, x, y, width, height, dx, dy, dwidth, dheight, MODE) {
-        if (arguments.length === 9) {
-          p.blend(this, srcImg, x, y, width, height, dx, dy, dwidth, dheight, this);
-        } else if (arguments.length === 10) {
-          p.blend(srcImg, x, y, width, height, dx, dy, dwidth, dheight, MODE, this);
-        }
-      };
-
-      this.copy = function(srcImg, sx, sy, swidth, sheight, dx, dy, dwidth, dheight) {
-        if (arguments.length === 8) {
-          p.blend(this, srcImg, sx, sy, swidth, sheight, dx, dy, dwidth, p.REPLACE, this);
-        } else if (arguments.length === 9) {
-          p.blend(srcImg, sx, sy, swidth, sheight, dx, dy, dwidth, dheight, p.REPLACE, this);
-        }
-      };
-
-      this.resize = function(w, h) {
-        if (this.width !== 0 || this.height !== 0) {
-          // make aspect ratio if w or h is 0
-          if (w === 0 && h !== 0) {
-            w = this.width / this.height * h;
-          } else if (h === 0 && w !== 0) {
-            h = w / (this.width / this.height);
-          }
-          // put 'this.imageData' into a new canvas
-          var canvas = document.createElement('canvas');
-          canvas.width = this.width;
-          canvas.height = this.height;
-          // changed for 0.9 slightly this one line
-          canvas.getContext('2d').putImageData(this.imageData, 0, 0);
-          // pass new canvas to drawimage with w,h
-          var canvasResized = document.createElement('canvas');
-          canvasResized.width = w;
-          canvasResized.height = h;
-          canvasResized.getContext('2d').drawImage(canvas, 0, 0, w, h);
-          // pull imageData object out of canvas into ImageData object
-          var imageData = canvasResized.getContext('2d').getImageData(0, 0, w, h);
-          // set this as new pimage
-          this.fromImageData(imageData);
-        }
-      };
-
-      this.mask = function(mask) {
-        this._mask = undefined;
-
-        if (mask instanceof PImage) {
-          if (mask.width === this.width && mask.height === this.height) {
-            this._mask = mask;
-          } else {
-            throw "mask must have the same dimensions as PImage.";
-          }
-        } else if (typeof mask === "object" && mask.constructor === Array) { // this is a pixel array
-          // mask pixel array needs to be the same length as this.pixels
-          // how do we update this for 0.9 this.imageData holding pixels ^^
-          // mask.constructor ? and this.pixels.length = this.imageData.data.length instead ?
-          if (this.pixels.length === mask.length) {
-            this._mask = mask;
-          } else {
-            throw "mask array must be the same length as PImage pixels array.";
-          }
-        }
-      };
-
-      // handle the sketch code for pixels[] and pixels.length
-      // parser code converts pixels[] to getPixels()
-      // or setPixels(), .length becomes getLength()
-      this.pixels = {
-        getLength: (function(aImg) {
-          return function() {
-            return aImg.imageData.data.length ? aImg.imageData.data.length/4 : 0;
-          };
-        }(this)),
-        getPixel: (function(aImg) {
-          return function(i) {
-            var offset = i*4;
-            return p.color.toInt(aImg.imageData.data[offset], aImg.imageData.data[offset+1],
-                                 aImg.imageData.data[offset+2], aImg.imageData.data[offset+3]);
-          };
-        }(this)),
-        setPixel: (function(aImg) {
-          return function(i,c) {
-            if(c && typeof c === "number") {
-              var offset = i*4;
-              // split c into array
-              var c2 = p.color.toArray(c);
-              // change pixel to c
-              aImg.imageData.data[offset] = c2[0];
-              aImg.imageData.data[offset+1] = c2[1];
-              aImg.imageData.data[offset+2] = c2[2];
-              aImg.imageData.data[offset+3] = c2[3];
-            }
-          };
-        }(this))
-      };
-
-      // These are intentionally left blank for PImages, we work live with pixels and draw as necessary
-      this.loadPixels = function() {};
-
-      this.updatePixels = function() {};
-
-      this.toImageData = function() {
-        // changed for 0.9
-        var canvas = document.createElement('canvas');
-        canvas.height = this.height;
-        canvas.width = this.width;
-        var ctx = canvas.getContext('2d');
-        ctx.putImageData(this.imageData, 0, 0);
-        return ctx.getImageData(0, 0, this.width, this.height);
-      };
-
-      this.toDataURL = function() {
-        var canvas = document.createElement('canvas');
-        canvas.height = this.height;
-        canvas.width = this.width;
-        var ctx = canvas.getContext('2d');
-        var imgData = ctx.createImageData(this.width, this.height);
-        // changed for 0.9
-        ctx.putImageData(this.imageData, 0, 0);
-        return canvas.toDataURL();
-      };
-
-      this.fromImageData = function(canvasImg) {
-        this.width = canvasImg.width;
-        this.height = canvasImg.height;
-        this.imageData = canvasImg;
-        // changed for 0.9
-        this.format = p.ARGB;
-        // changed for 0.9
-      };
-
-      this.fromHTMLImageData = function(htmlImg) {
-        // convert an <img> to a PImage
-        var canvas = document.createElement("canvas");
-        canvas.width = htmlImg.width;
-        canvas.height = htmlImg.height;
-        var context = canvas.getContext("2d");
-        context.drawImage(htmlImg, 0, 0);
-        var imageData = context.getImageData(0, 0, htmlImg.width, htmlImg.height);
-        this.fromImageData(imageData);
-      };
-
-      if (arguments.length === 1) {
-        // convert an <img> to a PImage
-        this.fromHTMLImageData(arguments[0]);
-      } else if (arguments.length === 2 || arguments.length === 3) {
-        this.width = aWidth || 1;
-        this.height = aHeight || 1;
-        // changed for 0.9
-        this.imageData = curContext.createImageData(this.width, this.height);
-        this.format = (aFormat === p.ARGB || aFormat === p.ALPHA) ? aFormat : p.RGB;
-      }
-    };
-
-    p.PImage = PImage;
-
-    try {
-      // Opera createImageData fix
-      if (! ("createImageData" in CanvasRenderingContext2D.prototype)) {
-        CanvasRenderingContext2D.prototype.createImageData = function(sw, sh) {
-          return this.getImageData(0, 0, sw, sh);
-        };
-      }
-    } catch(e) {}
-
-    p.createImage = function createImage(w, h, mode) {
-      // changed for 0.9
-      return new PImage(w,h,mode);
-    };
-
-    // Loads an image for display. Type is an extension. Callback is fired on load.
-    p.loadImage = function loadImage(file, type, callback) {
-      // if type is specified add it with a . to file to make the filename
-      if (type) {
-        file = file + "." + type;
-      }
-      // if image is in the preloader cache return a new PImage
-      if (p.pjs.imageCache[file]) {
-        return new PImage(p.pjs.imageCache[file]);
-      }
-      // else aysnc load it
-      else {
-        var pimg = new PImage(0, 0, p.ARGB);
-        var img = document.createElement('img');
-
-        pimg.sourceImg = img;
-
-        img.onload = (function(aImage, aPImage, aCallback) {
-          var image = aImage;
-          var pimg = aPImage;
-          var callback = aCallback;
-          return function() {
-            // change the <img> object into a PImage now that its loaded
-            pimg.fromHTMLImageData(image);
-            pimg.loaded = true;
-            if (callback) {
-              callback();
-            }
-          };
-        }(img, pimg, callback));
-
-        img.src = file; // needs to be called after the img.onload function is declared or it wont work in opera
-        return pimg;
-      }
-    };
-
-    // async loading of large images, same functionality as loadImage above
-    p.requestImage = p.loadImage;
-
-    // Gets a single pixel or block of pixels from the current Canvas Context or a PImage
-    p.get = function get(x, y, w, h, img) {
-      var c;
-      // for 0 2 and 4 arguments use curContext, otherwise PImage.get was called
-      if (!arguments.length) {
-        //return a PImage of curContext
-        c = new PImage(p.width, p.height, p.RGB);
-        c.fromImageData(curContext.getImageData(0, 0, p.width, p.height));
-        return c;
-      } else if (arguments.length === 5) {
-        // PImage.get(x,y,w,h) was called, return x,y,w,h PImage of img
-        // changed for 0.9, offset start point needs to be *4
-        var start = y * img.width * 4 + (x*4);
-        var end = (y + h) * img.width * 4 + ((x + w) * 4);
-        c = new PImage(w, h, p.RGB);
-        for (var i = start, j = 0; i < end; i++, j++) {
-          // changed in 0.9
-          c.imageData.data[j] = img.imageData.data[i];
-          if (j*4 + 1 % w === 0) {
-            //completed one line, increment i by offset
-            i += (img.width - w) * 4;
-          }
-        }
-        return c;
-      } else if (arguments.length === 4) {
-        // return a PImage of w and h from cood x,y of curContext
-        c = new PImage(w, h, p.RGB);
-        c.fromImageData(curContext.getImageData(x, y, w, h));
-        return c;
-      } else if (arguments.length === 3) {
-        // PImage.get(x,y) was called, return the color (int) at x,y of img
-        // changed in 0.9
-        var offset = y * w.width * 4 + (x * 4);
-        return p.color.toInt(w.imageData.data[offset],
-                           w.imageData.data[offset + 1],
-                           w.imageData.data[offset + 2],
-                           w.imageData.data[offset + 3]);
-      } else if (arguments.length === 2) {
-        // return the color at x,y (int) of curContext
-        // create a PImage object of size 1x1 and return the int of the pixels array element 0
-        if (x < p.width && x >= 0 && y >= 0 && y < p.height) {
-          // x,y is inside canvas space
-          c = new PImage(1, 1, p.RGB);
-          c.fromImageData(curContext.getImageData(x, y, 1, 1));
-          // changed for 0.9
-          return p.color.toInt(c.imageData.data[0],
-                               c.imageData.data[1],
-                               c.imageData.data[2],
-                               c.imageData.data[3]);
-        } else {
-          // x,y is outside image return transparent black
-          return 0;
-        }
-      } else if (arguments.length === 1) {
-        // PImage.get() was called, return the PImage
-        return x;
-      }
-    };
-
-    // Creates a new Processing instance and passes it back for... processing
-    p.createGraphics = function createGraphics(w, h) {
-      var canvas = document.createElement("canvas");
-      var ret = new Processing(canvas);
-      ret.size(w, h);
-      ret.canvas = canvas;
-      return ret;
-    };
-
-    // Paints a pixel array into the canvas
-    p.set = function set(x, y, obj, img) {
-      var color, oldFill;
-      // PImage.set(x,y,c) was called, set coordinate x,y color to c of img
-      if (arguments.length === 4) {
-        // changed in 0.9
-        var c = p.color.toArray(obj);
-        var offset = y * img.width * 4 + (x*4);
-        img.imageData.data[offset] = c[0];
-        img.imageData.data[offset+1] = c[1];
-        img.imageData.data[offset+2] = c[2];
-        img.imageData.data[offset+3] = c[3];
-      } else if (arguments.length === 3) {
-        // called p.set(), was it with a color or a img ?
-        if (typeof obj === "number") {
-          oldFill = curContext.fillStyle;
-          color = obj;
-          curContext.fillStyle = p.color.toString(color);
-          curContext.fillRect(Math.round(x), Math.round(y), 1, 1);
-          curContext.fillStyle = oldFill;
-        } else if (obj instanceof PImage) {
-          p.image(obj, x, y);
-        }
-      }
-    };
-    p.imageData = {};
-
-    // handle the sketch code for pixels[]
-    // parser code converts pixels[] to getPixels()
-    // or setPixels(), .length becomes getLength()
-    p.pixels = {
-      getLength: function() { return p.imageData.data.length ? p.imageData.data.length/4 : 0; },
-      getPixel: function(i) {
-        var offset = i*4;
-        return p.color.toInt(p.imageData.data[offset], p.imageData.data[offset+1],
-                             p.imageData.data[offset+2], p.imageData.data[offset+3]);
-      },
-      setPixel: function(i,c) {
-        if(c && typeof c === "number") {
-          var offset = i*4;
-          // split c into array
-          var c2 = p.color.toArray(c);
-          // change pixel to c
-          p.imageData.data[offset] = c2[0];
-          p.imageData.data[offset+1] = c2[1];
-          p.imageData.data[offset+2] = c2[2];
-          p.imageData.data[offset+3] = c2[3];
-        }
-      }
-    };
-
-    // Gets a 1-Dimensional pixel array from Canvas
-    p.loadPixels = function() {
-      // changed in 0.9
-      p.imageData = p.get(0, 0, p.width, p.height).imageData;
-    };
-
-    // Draws a 1-Dimensional pixel array to Canvas
-    p.updatePixels = function() {
-      // changed in 0.9
-      if (p.imageData) {
-        curContext.putImageData(p.imageData, 0, 0);
-      }
-    };
-
-    // Draw an image or a color to the background
-    p.background = function background() {
-      var color, a, img;
-
-      // background params are either a color or a PImage
-      if (typeof arguments[0] === 'number') {
-        color = p.color.apply(this, arguments);
-        // override alpha value, processing ignores the alpha for background color
-        color = color | p.ALPHA_MASK;
-      } else if (arguments.length === 1 && arguments[0] instanceof PImage) {
-        img = arguments[0];
-
-        if (!img.pixels || img.width !== p.width || img.height !== p.height) {
-          throw "Background image must be the same dimensions as the canvas.";
-        }
-      } else {
-        throw "Incorrect background parameters.";
-      }
-
-      if (p.use3DContext) {
-        if (typeof color !== 'undefined') {
-          var c = p.color.toGLArray(color);
-          refreshBackground = function() {
-            curContext.clearColor(c[0], c[1], c[2], c[3]);
-            curContext.clear(curContext.COLOR_BUFFER_BIT | curContext.DEPTH_BUFFER_BIT);
-          };
-        } else {
-          // Handle image background for 3d context. not done yet.
-          refreshBackground = function() {};
-        }
-      } else { // 2d context
-        if (typeof color !== 'undefined') {
-          refreshBackground = function() {
-            var oldFill = curContext.fillStyle;
-            curContext.fillStyle = p.color.toString(color);
-            curContext.fillRect(0, 0, p.width, p.height);
-            curContext.fillStyle = oldFill;
-          };
-        } else {
-          refreshBackground = function() {
-            p.image(img, 0, 0);
-          };
-        }
-      }
-      refreshBackground();
-    };
-
-    // Draws an image to the Canvas
-    p.image = function image(img, x, y, w, h) {
-      if (img.width > 0) {
-        var bounds = imageModeConvert(x || 0, y || 0, w || img.width, h || img.height, arguments.length < 4);
-        var obj = img.toImageData();
-
-        if (img._mask) {
-          var j, size;
-          if (img._mask instanceof PImage) {
-            var objMask = img._mask.toImageData();
-            for (j = 2, size = img.width * img.height * 4; j < size; j += 4) {
-              // using it as an alpha channel
-              obj.data[j + 1] = objMask.data[j];
-              // but only the blue color channel
-            }
-          } else {
-            for (j = 0, size = img._mask.length; j < size; ++j) {
-              obj.data[(j << 2) + 3] = img._mask[j];
-            }
-          }
-        }
-
-        // draw the image
-        //curContext.putImageData(obj, x, y); // this causes error if data overflows the canvas dimensions
-        curTint(obj);
-
-        var c = document.createElement('canvas');
-        c.width = obj.width;
-        c.height = obj.height;
-        var ctx = c.getContext('2d');
-        ctx.putImageData(obj, 0, 0);
-
-        curContext.drawImage(c, 0, 0, img.width, img.height, bounds.x, bounds.y, bounds.w, bounds.h);
-      }
-    };
-
-    // Clears a rectangle in the Canvas element or the whole Canvas
-    p.clear = function clear(x, y, width, height) {
-      if (arguments.length === 0) {
-        curContext.clearRect(0, 0, p.width, p.height);
-      } else {
-        curContext.clearRect(x, y, width, height);
-      }
-    };
-
-    p.tint = function tint() {
-      var tintColor = p.color.apply(this, arguments);
-      var r = p.red(tintColor) / colorModeX;
-      var g = p.green(tintColor) / colorModeY;
-      var b = p.blue(tintColor) / colorModeZ;
-      var a = p.alpha(tintColor) / colorModeA;
-
-      curTint = function(obj) {
-        var data = obj.data,
-          length = 4 * obj.width * obj.height;
-        for (var i = 0; i < length;) {
-          data[i++] *= r;
-          data[i++] *= g;
-          data[i++] *= b;
-          data[i++] *= a;
-        }
-      };
-    };
-
-    p.noTint = function noTint() {
-      curTint = function() {};
-    };
-
-    p.copy = function copy(src, sx, sy, sw, sh, dx, dy, dw, dh) {
-      if (arguments.length === 8) {
-        p.copy(p, src, sx, sy, sw, sh, dx, dy, dw);
-        return;
-      }
-      p.blend(src, sx, sy, sw, sh, dx, dy, dw, dh, p.REPLACE);
-    };
-
-    p.blend = function blend(src, sx, sy, sw, sh, dx, dy, dw, dh, mode, pimgdest) {
-      if (arguments.length === 9) {
-        p.blend(p, src, sx, sy, sw, sh, dx, dy, dw, dh);
-      } else if (arguments.length === 10 || arguments.length === 11) {
-        var sx2 = sx + sw;
-        var sy2 = sy + sh;
-        var dx2 = dx + dw;
-        var dy2 = dy + dh;
-        var dest;
-        // check if pimgdest is there and pixels, if so this was a call from pimg.blend
-        if (arguments.length === 10) {
-          p.loadPixels();
-          dest = p;
-        } else if (arguments.length === 11 && pimgdest && pimgdest.imageData) {
-          dest = pimgdest;
-        }
-        if (src === p) {
-          if (p.intersect(sx, sy, sx2, sy2, dx, dy, dx2, dy2)) {
-            p.blit_resize(p.get(sx, sy, sx2 - sx, sy2 - sy), 0, 0, sx2 - sx - 1, sy2 - sy - 1, dest.imageData.data, dest.width, dest.height, dx, dy, dx2, dy2, mode);
-          } else {
-            // same as below, except skip the loadPixels() because it'd be redundant
-            p.blit_resize(src, sx, sy, sx2, sy2, dest.imageData.data, dest.width, dest.height, dx, dy, dx2, dy2, mode);
-          }
-        } else {
-          src.loadPixels();
-          p.blit_resize(src, sx, sy, sx2, sy2, dest.imageData.data, dest.width, dest.height, dx, dy, dx2, dy2, mode);
-        }
-        if (arguments.length === 10) {
-          p.updatePixels();
-        }
-      }
-    };
-
-    // shared variables for blit_resize(), filter_new_scanline(), filter_bilinear()
-    // change this in the future to not be exposed to p
-    p.shared = {
-      fracU: 0,
-      ifU: 0,
-      fracV: 0,
-      ifV: 0,
-      u1: 0,
-      u2: 0,
-      v1: 0,
-      v2: 0,
-      sX: 0,
-      sY: 0,
-      iw: 0,
-      iw1: 0,
-      ih1: 0,
-      ul: 0,
-      ll: 0,
-      ur: 0,
-      lr: 0,
-      cUL: 0,
-      cLL: 0,
-      cUR: 0,
-      cLR: 0,
-      srcXOffset: 0,
-      srcYOffset: 0,
-      r: 0,
-      g: 0,
-      b: 0,
-      a: 0,
-      srcBuffer: null
-    };
-
-    p.intersect = function intersect(sx1, sy1, sx2, sy2, dx1, dy1, dx2, dy2) {
-      var sw = sx2 - sx1 + 1;
-      var sh = sy2 - sy1 + 1;
-      var dw = dx2 - dx1 + 1;
-      var dh = dy2 - dy1 + 1;
-      if (dx1 < sx1) {
-        dw += dx1 - sx1;
-        if (dw > sw) {
-          dw = sw;
-        }
-      } else {
-        var w = sw + sx1 - dx1;
-        if (dw > w) {
-          dw = w;
-        }
-      }
-      if (dy1 < sy1) {
-        dh += dy1 - sy1;
-        if (dh > sh) {
-          dh = sh;
-        }
-      } else {
-        var h = sh + sy1 - dy1;
-        if (dh > h) {
-          dh = h;
-        }
-      }
-      return ! (dw <= 0 || dh <= 0);
-    };
-
-    p.filter_new_scanline = function filter_new_scanline() {
-      p.shared.sX = p.shared.srcXOffset;
-      p.shared.fracV = p.shared.srcYOffset & p.PREC_MAXVAL;
-      p.shared.ifV = p.PREC_MAXVAL - p.shared.fracV;
-      p.shared.v1 = (p.shared.srcYOffset >> p.PRECISIONB) * p.shared.iw;
-      p.shared.v2 = Math.min((p.shared.srcYOffset >> p.PRECISIONB) + 1, p.shared.ih1) * p.shared.iw;
-    };
-
-    p.filter_bilinear = function filter_bilinear() {
-      p.shared.fracU = p.shared.sX & p.PREC_MAXVAL;
-      p.shared.ifU = p.PREC_MAXVAL - p.shared.fracU;
-      p.shared.ul = (p.shared.ifU * p.shared.ifV) >> p.PRECISIONB;
-      p.shared.ll = (p.shared.ifU * p.shared.fracV) >> p.PRECISIONB;
-      p.shared.ur = (p.shared.fracU * p.shared.ifV) >> p.PRECISIONB;
-      p.shared.lr = (p.shared.fracU * p.shared.fracV) >> p.PRECISIONB;
-      p.shared.u1 = (p.shared.sX >> p.PRECISIONB);
-      p.shared.u2 = Math.min(p.shared.u1 + 1, p.shared.iw1);
-      // get color values of the 4 neighbouring texels
-      // changed for 0.9
-      var cULoffset = (p.shared.v1 + p.shared.u1) * 4;
-      var cURoffset = (p.shared.v1 + p.shared.u2) * 4;
-      var cLLoffset = (p.shared.v2 + p.shared.u1) * 4;
-      var cLRoffset = (p.shared.v2 + p.shared.u2) * 4;
-      p.shared.cUL = p.color.toInt(p.shared.srcBuffer[cULoffset], p.shared.srcBuffer[cULoffset+1], p.shared.srcBuffer[cULoffset+2], p.shared.srcBuffer[cULoffset+3]);
-      p.shared.cUR = p.color.toInt(p.shared.srcBuffer[cURoffset], p.shared.srcBuffer[cURoffset+1], p.shared.srcBuffer[cURoffset+2], p.shared.srcBuffer[cURoffset+3]);
-      p.shared.cLL = p.color.toInt(p.shared.srcBuffer[cLLoffset], p.shared.srcBuffer[cLLoffset+1], p.shared.srcBuffer[cLLoffset+2], p.shared.srcBuffer[cLLoffset+3]);
-      p.shared.cLR = p.color.toInt(p.shared.srcBuffer[cLRoffset], p.shared.srcBuffer[cLRoffset+1], p.shared.srcBuffer[cLRoffset+2], p.shared.srcBuffer[cLRoffset+3]);
-      p.shared.r = ((p.shared.ul * ((p.shared.cUL & p.RED_MASK) >> 16) + p.shared.ll * ((p.shared.cLL & p.RED_MASK) >> 16) + p.shared.ur * ((p.shared.cUR & p.RED_MASK) >> 16) + p.shared.lr * ((p.shared.cLR & p.RED_MASK) >> 16)) << p.PREC_RED_SHIFT) & p.RED_MASK;
-      p.shared.g = ((p.shared.ul * (p.shared.cUL & p.GREEN_MASK) + p.shared.ll * (p.shared.cLL & p.GREEN_MASK) + p.shared.ur * (p.shared.cUR & p.GREEN_MASK) + p.shared.lr * (p.shared.cLR & p.GREEN_MASK)) >>> p.PRECISIONB) & p.GREEN_MASK;
-      p.shared.b = (p.shared.ul * (p.shared.cUL & p.BLUE_MASK) + p.shared.ll * (p.shared.cLL & p.BLUE_MASK) + p.shared.ur * (p.shared.cUR & p.BLUE_MASK) + p.shared.lr * (p.shared.cLR & p.BLUE_MASK)) >>> p.PRECISIONB;
-      p.shared.a = ((p.shared.ul * ((p.shared.cUL & p.ALPHA_MASK) >>> 24) + p.shared.ll * ((p.shared.cLL & p.ALPHA_MASK) >>> 24) + p.shared.ur * ((p.shared.cUR & p.ALPHA_MASK) >>> 24) + p.shared.lr * ((p.shared.cLR & p.ALPHA_MASK) >>> 24)) << p.PREC_ALPHA_SHIFT) & p.ALPHA_MASK;
-      return p.shared.a | p.shared.r | p.shared.g | p.shared.b;
-    };
-
-    p.blit_resize = function blit_resize(img, srcX1, srcY1, srcX2, srcY2, destPixels, screenW, screenH, destX1, destY1, destX2, destY2, mode) {
-      var x, y; // iterator vars
-      if (srcX1 < 0) {
-        srcX1 = 0;
-      }
-      if (srcY1 < 0) {
-        srcY1 = 0;
-      }
-      if (srcX2 >= img.width) {
-        srcX2 = img.width - 1;
-      }
-      if (srcY2 >= img.height) {
-        srcY2 = img.height - 1;
-      }
-      var srcW = srcX2 - srcX1;
-      var srcH = srcY2 - srcY1;
-      var destW = destX2 - destX1;
-      var destH = destY2 - destY1;
-      var smooth = true; // may as well go with the smoothing these days
-      if (!smooth) {
-        srcW++;
-        srcH++;
-      }
-      if (destW <= 0 || destH <= 0 || srcW <= 0 || srcH <= 0 || destX1 >= screenW || destY1 >= screenH || srcX1 >= img.width || srcY1 >= img.height) {
-        return;
-      }
-      var dx = Math.floor(srcW / destW * p.PRECISIONF);
-      var dy = Math.floor(srcH / destH * p.PRECISIONF);
-      p.shared.srcXOffset = Math.floor(destX1 < 0 ? -destX1 * dx : srcX1 * p.PRECISIONF);
-      p.shared.srcYOffset = Math.floor(destY1 < 0 ? -destY1 * dy : srcY1 * p.PRECISIONF);
-      if (destX1 < 0) {
-        destW += destX1;
-        destX1 = 0;
-      }
-      if (destY1 < 0) {
-        destH += destY1;
-        destY1 = 0;
-      }
-      destW = Math.min(destW, screenW - destX1);
-      destH = Math.min(destH, screenH - destY1);
-      // changed in 0.9, TODO
-      var destOffset = destY1 * screenW + destX1;
-      var destColor;
-      p.shared.srcBuffer = img.imageData.data;
-      if (smooth) {
-        // use bilinear filtering
-        p.shared.iw = img.width;
-        p.shared.iw1 = img.width - 1;
-        p.shared.ih1 = img.height - 1;
-        switch (mode) {
-        case p.BLEND:
-          for (y = 0; y < destH; y++) {
-            p.filter_new_scanline();
-            for (x = 0; x < destW; x++) {
-              // changed for 0.9
-              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
-              destColor = p.color.toArray(p.modes.blend(destColor, p.filter_bilinear()));
-              //destPixels[destOffset + x] = p.modes.blend(destPixels[destOffset + x], p.filter_bilinear());
-              destPixels[(destOffset + x) * 4] = destColor[0];
-              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
-              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
-              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
-              p.shared.sX += dx;
-            }
-            destOffset += screenW;
-            p.shared.srcYOffset += dy;
-          }
-          break;
-        case p.ADD:
-          for (y = 0; y < destH; y++) {
-            p.filter_new_scanline();
-            for (x = 0; x < destW; x++) {
-              // changed for 0.9
-              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
-              destColor = p.color.toArray(p.modes.add(destColor, p.filter_bilinear()));
-              destColor = p.color.toArray(p.modes.add(destColor, p.filter_bilinear()));
-              //destPixels[destOffset + x] = p.modes.add(destPixels[destOffset + x], p.filter_bilinear());
-              destPixels[(destOffset + x) * 4] = destColor[0];
-              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
-              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
-              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
-              p.shared.sX += dx;
-            }
-            destOffset += screenW;
-            p.shared.srcYOffset += dy;
-          }
-          break;
-        case p.SUBTRACT:
-          for (y = 0; y < destH; y++) {
-            p.filter_new_scanline();
-            for (x = 0; x < destW; x++) {
-              // changed for 0.9
-              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
-              destColor = p.color.toArray(p.modes.subtract(destColor, p.filter_bilinear()));
-              //destPixels[destOffset + x] = p.modes.subtract(destPixels[destOffset + x], p.filter_bilinear());
-              destPixels[(destOffset + x) * 4] = destColor[0];
-              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
-              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
-              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
-              p.shared.sX += dx;
-            }
-            destOffset += screenW;
-            p.shared.srcYOffset += dy;
-          }
-          break;
-        case p.LIGHTEST:
-          for (y = 0; y < destH; y++) {
-            p.filter_new_scanline();
-            for (x = 0; x < destW; x++) {
-              // changed for 0.9
-              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
-              destColor = p.color.toArray(p.modes.lightest(destColor, p.filter_bilinear()));
-              //destPixels[destOffset + x] = p.modes.lightest(destPixels[destOffset + x], p.filter_bilinear());
-              destPixels[(destOffset + x) * 4] = destColor[0];
-              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
-              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
-              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
-              p.shared.sX += dx;
-            }
-            destOffset += screenW;
-            p.shared.srcYOffset += dy;
-          }
-          break;
-        case p.DARKEST:
-          for (y = 0; y < destH; y++) {
-            p.filter_new_scanline();
-            for (x = 0; x < destW; x++) {
-              // changed for 0.9
-              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
-              destColor = p.color.toArray(p.modes.darkest(destColor, p.filter_bilinear()));
-              //destPixels[destOffset + x] = p.modes.darkest(destPixels[destOffset + x], p.filter_bilinear());
-              destPixels[(destOffset + x) * 4] = destColor[0];
-              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
-              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
-              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
-              p.shared.sX += dx;
-            }
-            destOffset += screenW;
-            p.shared.srcYOffset += dy;
-          }
-          break;
-        case p.REPLACE:
-          for (y = 0; y < destH; y++) {
-            p.filter_new_scanline();
-            for (x = 0; x < destW; x++) {
-              // changed for 0.9
-              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
-              destColor = p.color.toArray(p.filter_bilinear());
-              //destPixels[destOffset + x] = p.filter_bilinear();
-              destPixels[(destOffset + x) * 4] = destColor[0];
-              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
-              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
-              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
-              p.shared.sX += dx;
-            }
-            destOffset += screenW;
-            p.shared.srcYOffset += dy;
-          }
-          break;
-        case p.DIFFERENCE:
-          for (y = 0; y < destH; y++) {
-            p.filter_new_scanline();
-            for (x = 0; x < destW; x++) {
-              // changed for 0.9
-              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
-              destColor = p.color.toArray(p.modes.difference(destColor, p.filter_bilinear()));
-              //destPixels[destOffset + x] = p.modes.difference(destPixels[destOffset + x], p.filter_bilinear());
-              destPixels[(destOffset + x) * 4] = destColor[0];
-              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
-              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
-              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
-              p.shared.sX += dx;
-            }
-            destOffset += screenW;
-            p.shared.srcYOffset += dy;
-          }
-          break;
-        case p.EXCLUSION:
-          for (y = 0; y < destH; y++) {
-            p.filter_new_scanline();
-            for (x = 0; x < destW; x++) {
-              // changed for 0.9
-              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
-              destColor = p.color.toArray(p.modes.exclusion(destColor, p.filter_bilinear()));
-              //destPixels[destOffset + x] = p.modes.exclusion(destPixels[destOffset + x], p.filter_bilinear());
-              destPixels[(destOffset + x) * 4] = destColor[0];
-              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
-              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
-              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
-              p.shared.sX += dx;
-            }
-            destOffset += screenW;
-            p.shared.srcYOffset += dy;
-          }
-          break;
-        case p.MULTIPLY:
-          for (y = 0; y < destH; y++) {
-            p.filter_new_scanline();
-            for (x = 0; x < destW; x++) {
-              // changed for 0.9
-              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
-              destColor = p.color.toArray(p.modes.multiply(destColor, p.filter_bilinear()));
-              //destPixels[destOffset + x] = p.modes.multiply(destPixels[destOffset + x], p.filter_bilinear());
-              destPixels[(destOffset + x) * 4] = destColor[0];
-              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
-              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
-              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
-              p.shared.sX += dx;
-            }
-            destOffset += screenW;
-            p.shared.srcYOffset += dy;
-          }
-          break;
-        case p.SCREEN:
-          for (y = 0; y < destH; y++) {
-            p.filter_new_scanline();
-            for (x = 0; x < destW; x++) {
-              // changed for 0.9
-              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
-              destColor = p.color.toArray(p.modes.screen(destColor, p.filter_bilinear()));
-              //destPixels[destOffset + x] = p.modes.screen(destPixels[destOffset + x], p.filter_bilinear());
-              destPixels[(destOffset + x) * 4] = destColor[0];
-              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
-              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
-              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
-              p.shared.sX += dx;
-            }
-            destOffset += screenW;
-            p.shared.srcYOffset += dy;
-          }
-          break;
-        case p.OVERLAY:
-          for (y = 0; y < destH; y++) {
-            p.filter_new_scanline();
-            for (x = 0; x < destW; x++) {
-              // changed for 0.9
-              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
-              destColor = p.color.toArray(p.modes.overlay(destColor, p.filter_bilinear()));
-              //destPixels[destOffset + x] = p.modes.overlay(destPixels[destOffset + x], p.filter_bilinear());
-              destPixels[(destOffset + x) * 4] = destColor[0];
-              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
-              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
-              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
-              p.shared.sX += dx;
-            }
-            destOffset += screenW;
-            p.shared.srcYOffset += dy;
-          }
-          break;
-        case p.HARD_LIGHT:
-          for (y = 0; y < destH; y++) {
-            p.filter_new_scanline();
-            for (x = 0; x < destW; x++) {
-              // changed for 0.9
-              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
-              destColor = p.color.toArray(p.modes.hard_light(destColor, p.filter_bilinear()));
-              //destPixels[destOffset + x] = p.modes.hard_light(destPixels[destOffset + x], p.filter_bilinear());
-              destPixels[(destOffset + x) * 4] = destColor[0];
-              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
-              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
-              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
-              p.shared.sX += dx;
-            }
-            destOffset += screenW;
-            p.shared.srcYOffset += dy;
-          }
-          break;
-        case p.SOFT_LIGHT:
-          for (y = 0; y < destH; y++) {
-            p.filter_new_scanline();
-            for (x = 0; x < destW; x++) {
-              // changed for 0.9
-              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
-              destColor = p.color.toArray(p.modes.soft_light(destColor, p.filter_bilinear()));
-              //destPixels[destOffset + x] = p.modes.soft_light(destPixels[destOffset + x], p.filter_bilinear());
-              destPixels[(destOffset + x) * 4] = destColor[0];
-              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
-              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
-              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
-              p.shared.sX += dx;
-            }
-            destOffset += screenW;
-            p.shared.srcYOffset += dy;
-          }
-          break;
-        case p.DODGE:
-          for (y = 0; y < destH; y++) {
-            p.filter_new_scanline();
-            for (x = 0; x < destW; x++) {
-              // changed for 0.9
-              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
-              destColor = p.color.toArray(p.modes.dodge(destColor, p.filter_bilinear()));
-              //destPixels[destOffset + x] = p.modes.dodge(destPixels[destOffset + x], p.filter_bilinear());
-              destPixels[(destOffset + x) * 4] = destColor[0];
-              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
-              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
-              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
-              p.shared.sX += dx;
-            }
-            destOffset += screenW;
-            p.shared.srcYOffset += dy;
-          }
-          break;
-        case p.BURN:
-          for (y = 0; y < destH; y++) {
-            p.filter_new_scanline();
-            for (x = 0; x < destW; x++) {
-              // changed for 0.9
-              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
-              destColor = p.color.toArray(p.modes.burn(destColor, p.filter_bilinear()));
-              //destPixels[destOffset + x] = p.modes.burn(destPixels[destOffset + x], p.filter_bilinear());
-              destPixels[(destOffset + x) * 4] = destColor[0];
-              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
-              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
-              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
-              p.shared.sX += dx;
-            }
-            destOffset += screenW;
-            p.shared.srcYOffset += dy;
-          }
-          break;
-        }
-      }
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Font handling
-    ////////////////////////////////////////////////////////////////////////////
-
-    // Loads a font from an SVG or Canvas API
-    p.loadFont = function loadFont(name) {
-      if (name.indexOf(".svg") === -1) {
-        return {
-          name: name,
-          width: function(str) {
-            if (curContext.mozMeasureText) {
-              return curContext.mozMeasureText(
-              typeof str === "number" ? String.fromCharCode(str) : str) / curTextSize;
-            } else {
-              return 0;
-            }
-          }
-        };
-      } else {
-        // If the font is a glyph, calculate by SVG table
-        var font = p.loadGlyphs(name);
-
-        return {
-          name: name,
-          glyph: true,
-          units_per_em: font.units_per_em,
-          horiz_adv_x: 1 / font.units_per_em * font.horiz_adv_x,
-          ascent: font.ascent,
-          descent: font.descent,
-          width: function(str) {
-            var width = 0;
-            var len = str.length;
-            for (var i = 0; i < len; i++) {
-              try {
-                width += parseFloat(p.glyphLook(p.glyphTable[name], str[i]).horiz_adv_x);
-              }
-              catch(e) {
-                Processing.debug(e);
-              }
-            }
-            return width / p.glyphTable[name].units_per_em;
-          }
-        };
-      }
-    };
-
-    p.createFont = function(name, size) {};
-
-    // Sets a 'current font' for use
-    p.textFont = function textFont(name, size) {
-      curTextFont = name;
-      p.textSize(size);
-    };
-
-    // Sets the font size
-    p.textSize = function textSize(size) {
-      if (size) {
-        curTextSize = size;
-      }
-    };
-
-    p.textAlign = function textAlign() {};
-
-    // A lookup table for characters that can not be referenced by Object
-    p.glyphLook = function glyphLook(font, chr) {
-      try {
-        switch (chr) {
-        case "1":
-          return font.one;
-        case "2":
-          return font.two;
-        case "3":
-          return font.three;
-        case "4":
-          return font.four;
-        case "5":
-          return font.five;
-        case "6":
-          return font.six;
-        case "7":
-          return font.seven;
-        case "8":
-          return font.eight;
-        case "9":
-          return font.nine;
-        case "0":
-          return font.zero;
-        case " ":
-          return font.space;
-        case "$":
-          return font.dollar;
-        case "!":
-          return font.exclam;
-        case '"':
-          return font.quotedbl;
-        case "#":
-          return font.numbersign;
-        case "%":
-          return font.percent;
-        case "&":
-          return font.ampersand;
-        case "'":
-          return font.quotesingle;
-        case "(":
-          return font.parenleft;
-        case ")":
-          return font.parenright;
-        case "*":
-          return font.asterisk;
-        case "+":
-          return font.plus;
-        case ",":
-          return font.comma;
-        case "-":
-          return font.hyphen;
-        case ".":
-          return font.period;
-        case "/":
-          return font.slash;
-        case "_":
-          return font.underscore;
-        case ":":
-          return font.colon;
-        case ";":
-          return font.semicolon;
-        case "<":
-          return font.less;
-        case "=":
-          return font.equal;
-        case ">":
-          return font.greater;
-        case "?":
-          return font.question;
-        case "@":
-          return font.at;
-        case "[":
-          return font.bracketleft;
-        case "\\":
-          return font.backslash;
-        case "]":
-          return font.bracketright;
-        case "^":
-          return font.asciicircum;
-        case "`":
-          return font.grave;
-        case "{":
-          return font.braceleft;
-        case "|":
-          return font.bar;
-        case "}":
-          return font.braceright;
-        case "~":
-          return font.asciitilde;
-          // If the character is not 'special', access it by object reference
-        default:
-          return font[chr];
-        }
-      } catch(e) {
-        Processing.debug(e);
-      }
-    };
-
-    // Print some text to the Canvas
-    p.text = function text() {
-      if (typeof arguments[0] !== 'undefined') {
-        var str = arguments[0],
-          x, y, z, pos, width, height;
-
-        if (typeof str === 'number' && (str + "").indexOf('.') >= 0) {
-          // Make sure .15 rounds to .1, but .151 rounds to .2.
-          if ((str * 1000) - Math.floor(str * 1000) === 0.5) {
-            str = str - 0.0001;
-          }
-          str = str.toFixed(3);
-        }
-
-        str = str.toString();
-
-        if (arguments.length === 1) { // for text( str )
-          p.text(str, lastTextPos[0], lastTextPos[1]);
-        } else if (arguments.length === 3) { // for text( str, x, y)
-          text(str, arguments[1], arguments[2], 0);
-        } else if (arguments.length === 4) { // for text( str, x, y, z)
-          x = arguments[1];
-          y = arguments[2];
-          z = arguments[3];
-
-          do {
-            pos = str.indexOf("\n");
-            if (pos !== -1) {
-              if (pos !== 0) {
-                text(str.substring(0, pos));
-              }
-              y += curTextSize;
-              str = str.substring(pos + 1, str.length);
-            }
-          } while (pos !== -1);
-
-          // TODO: handle case for 3d text
-          if (p.use3DContext) {
-          }
-
-          width = 0;
-
-          // If the font is a standard Canvas font...
-          if (!curTextFont.glyph) {
-            if (str && (curContext.fillText || curContext.mozDrawText)) {
-              curContext.save();
-              curContext.font = curContext.mozTextStyle = curTextSize + "px " + curTextFont.name;
-
-              if (curContext.fillText) {
-                curContext.fillText(str, x, y);
-                width = curContext.measureText(str).width;
-              } else if (curContext.mozDrawText) {
-                curContext.translate(x, y);
-                curContext.mozDrawText(str);
-                width = curContext.mozMeasureText(str);
-              }
-              curContext.restore();
-            }
-          } else {
-            // If the font is a Batik SVG font...
-            var font = p.glyphTable[curTextFont.name];
-            curContext.save();
-            curContext.translate(x, y + curTextSize);
-
-            var upem = font.units_per_em,
-              newScale = 1 / upem * curTextSize;
-
-            curContext.scale(newScale, newScale);
-
-            var len = str.length;
-
-            for (var i = 0; i < len; i++) {
-              // Test character against glyph table
-              try {
-                p.glyphLook(font, str[i]).draw();
-              } catch(e) {
-                Processing.debug(e);
-              }
-            }
-            curContext.restore();
-          }
-
-          // TODO: Handle case for 3d text
-          if (p.use3DContext) {
-          }
-
-          lastTextPos[0] = x + width;
-          lastTextPos[1] = y;
-          lastTextPos[2] = z;
-        } else if (arguments.length === 5) { // for text( str, x, y , width, height)
-          text(str, arguments[1], arguments[2], arguments[3], arguments[4], 0);
-        } else if (arguments.length === 6) { // for text( stringdata, x, y , width, height, z)
-          x = arguments[1];
-          y = arguments[2];
-          width = arguments[3];
-          height = arguments[4];
-          z = arguments[5];
-
-          if (str.length > 0) {
-            if (curTextSize > height) {
-              return;
-            }
-            var spaceMark = -1;
-            var start = 0;
-            var lineWidth = 0;
-            var letterWidth = 0;
-            var textboxWidth = width;
-
-            lastTextPos[0] = x;
-            lastTextPos[1] = y - 0.4 * curTextSize;
-
-            curContext.font = curTextSize + "px " + curTextFont.name;
-
-            for (var j = 0; j < str.length; j++) {
-              if (curContext.fillText) {
-                letterWidth = curContext.measureText(str[j]).width;
-              } else if (curContext.mozDrawText) {
-                letterWidth = curContext.mozMeasureText(str[j]);
-              }
-              if (str[j] !== "\n" && (str[j] === " " || (str[j - 1] !== " " && str[j + 1] === " ") || lineWidth + 2 * letterWidth < textboxWidth)) { // check a line of text
-                if (str[j] === " ") {
-                  spaceMark = j;
-                }
-                lineWidth += letterWidth;
-              } else { // draw a line of text
-                if (start === spaceMark + 1) { // in case a whole line without a space
-                  spaceMark = j;
-                }
-
-                lastTextPos[0] = x;
-                lastTextPos[1] = lastTextPos[1] + curTextSize;
-                if (str[j] === "\n") {
-                  text(str.substring(start, j));
-                  start = j + 1;
-                } else {
-                  text(str.substring(start, spaceMark + 1));
-                  start = spaceMark + 1;
-                }
-
-                lineWidth = 0;
-                if (lastTextPos[1] + 2 * curTextSize > y + height + 0.6 * curTextSize) { // stop if no enough space for one more line draw
-                  return;
-                }
-                j = start - 1;
-              }
-            }
-
-            if (start !== str.length) { // draw the last line
-              lastTextPos[0] = x;
-              lastTextPos[1] = lastTextPos[1] + curTextSize;
-              for (; start < str.length; start++) {
-                text(str[start]);
-              }
-            }
-
-          } // end str != ""
-        } // end arguments.length == 6
-      }
-    };
-
-    // Load Batik SVG Fonts and parse to pre-def objects for quick rendering
-    p.loadGlyphs = function loadGlyph(url) {
-      var x, y, cx, cy, nx, ny, d, a, lastCom, lenC, horiz_adv_x, getXY = '[0-9\\-]+', path;
-
-      // Return arrays of SVG commands and coords
-      // get this to use p.matchAll() - will need to work around the lack of null return
-      var regex = function regex(needle, hay) {
-        var i = 0,
-          results = [],
-          latest, regexp = new RegExp(needle, "g");
-        latest = results[i] = regexp.exec(hay);
-        while (latest) {
-          i++;
-          latest = results[i] = regexp.exec(hay);
-        }
-        return results;
-      };
-
-      var buildPath = function buildPath(d) {
-        var c = regex("[A-Za-z][0-9\\- ]+|Z", d);
-
-        // Begin storing path object
-        path = "var path={draw:function(){curContext.beginPath();curContext.save();";
-
-        x = 0;
-        y = 0;
-        cx = 0;
-        cy = 0;
-        nx = 0;
-        ny = 0;
-        d = 0;
-        a = 0;
-        lastCom = "";
-        lenC = c.length - 1;
-
-        // Loop through SVG commands translating to canvas eqivs functions in path object
-        for (var j = 0; j < lenC; j++) {
-          var com = c[j][0], xy = regex(getXY, com);
-
-          switch (com[0]) {
-            case "M":
-              //curContext.moveTo(x,-y);
-              x = parseFloat(xy[0][0]);
-              y = parseFloat(xy[1][0]);
-              path += "curContext.moveTo(" + x + "," + (-y) + ");";
-              break;
-
-            case "L":
-              //curContext.lineTo(x,-y);
-              x = parseFloat(xy[0][0]);
-              y = parseFloat(xy[1][0]);
-              path += "curContext.lineTo(" + x + "," + (-y) + ");";
-              break;
-
-            case "H":
-              //curContext.lineTo(x,-y)
-              x = parseFloat(xy[0][0]);
-              path += "curContext.lineTo(" + x + "," + (-y) + ");";
-              break;
-
-            case "V":
-              //curContext.lineTo(x,-y);
-              y = parseFloat(xy[0][0]);
-              path += "curContext.lineTo(" + x + "," + (-y) + ");";
-              break;
-
-            case "T":
-              //curContext.quadraticCurveTo(cx,-cy,nx,-ny);
-              nx = parseFloat(xy[0][0]);
-              ny = parseFloat(xy[1][0]);
-
-              if (lastCom === "Q" || lastCom === "T") {
-                d = Math.sqrt(Math.pow(x - cx, 2) + Math.pow(cy - y, 2));
-                a = Math.PI + Math.atan2(cx - x, cy - y);
-                cx = x + (Math.sin(a) * (d));
-                cy = y + (Math.cos(a) * (d));
-              } else {
-                cx = x;
-                cy = y;
-              }
-
-              path += "curContext.quadraticCurveTo(" + cx + "," + (-cy) + "," + nx + "," + (-ny) + ");";
-              x = nx;
-              y = ny;
-              break;
-
-            case "Q":
-              //curContext.quadraticCurveTo(cx,-cy,nx,-ny);
-              cx = parseFloat(xy[0][0]);
-              cy = parseFloat(xy[1][0]);
-              nx = parseFloat(xy[2][0]);
-              ny = parseFloat(xy[3][0]);
-              path += "curContext.quadraticCurveTo(" + cx + "," + (-cy) + "," + nx + "," + (-ny) + ");";
-              x = nx;
-              y = ny;
-              break;
-
-            case "Z":
-              //curContext.closePath();
-              path += "curContext.closePath();";
-              break;
-          }
-          lastCom = com[0];
-        }
-
-        path += "doStroke?curContext.stroke():0;";
-        path += "doFill?curContext.fill():0;";
-        path += "curContext.restore();";
-        path += "curContext.translate(" + horiz_adv_x + ",0);";
-        path += "}}";
-
-        return path;
-      };
-
-      // Parse SVG font-file into block of Canvas commands
-      var parseSVGFont = function parseSVGFontse(svg) {
-        // Store font attributes
-        var font = svg.getElementsByTagName("font");
-        p.glyphTable[url].horiz_adv_x = font[0].getAttribute("horiz-adv-x");
-
-        var font_face = svg.getElementsByTagName("font-face")[0];
-        p.glyphTable[url].units_per_em = parseFloat(font_face.getAttribute("units-per-em"));
-        p.glyphTable[url].ascent = parseFloat(font_face.getAttribute("ascent"));
-        p.glyphTable[url].descent = parseFloat(font_face.getAttribute("descent"));
-
-        var glyph = svg.getElementsByTagName("glyph"),
-          len = glyph.length;
-
-        // Loop through each glyph in the SVG
-        for (var i = 0; i < len; i++) {
-          // Store attributes for this glyph
-          var unicode = glyph[i].getAttribute("unicode");
-          var name = glyph[i].getAttribute("glyph-name");
-          horiz_adv_x = glyph[i].getAttribute("horiz-adv-x");
-          if (horiz_adv_x === null) {
-            horiz_adv_x = p.glyphTable[url].horiz_adv_x;
-          }
-          d = glyph[i].getAttribute("d");
-          // Split path commands in glpyh
-          if (d !== undefined) {
-            path = buildPath(d);
-            eval(path);
-            // Store glyph data to table object
-            p.glyphTable[url][name] = {
-              name: name,
-              unicode: unicode,
-              horiz_adv_x: horiz_adv_x,
-              draw: path.draw
-            };
-          }
-        } // finished adding glyphs to table
-      };
-
-      // Load and parse Batik SVG font as XML into a Processing Glyph object
-      var loadXML = function loadXML() {
-        var xmlDoc;
-
-        try {
-          xmlDoc = document.implementation.createDocument("", "", null);
-        }
-        catch(e_fx_op) {
-          Processing.debug(e_fx_op.message);
-          return;
-        }
-
-        try {
-          xmlDoc.async = false;
-          xmlDoc.load(url);
-          parseSVGFont(xmlDoc.getElementsByTagName("svg")[0]);
-        }
-        catch(e_sf_ch) {
-          // Google Chrome, Safari etc.
-          Processing.debug(e_sf_ch);
-          try {
-            var xmlhttp = new window.XMLHttpRequest();
-            xmlhttp.open("GET", url, false);
-            xmlhttp.send(null);
-            parseSVGFont(xmlhttp.responseXML.documentElement);
-          }
-          catch(e) {
-            Processing.debug(e_sf_ch);
-          }
-        }
-      };
-
-      // Create a new object in glyphTable to store this font
-      p.glyphTable[url] = {};
-
-      // Begin loading the Batik SVG font...
-      loadXML(url);
-
-      // Return the loaded font for attribute grabbing
-      return p.glyphTable[url];
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Class methods
-    ////////////////////////////////////////////////////////////////////////////
-
-    p.extendClass = function extendClass(obj, args, fn) {
-      if (arguments.length === 3) {
-        fn.apply(obj, args);
-      } else {
-        args.call(obj);
-      }
-    };
-
-    p.addMethod = function addMethod(object, name, fn) {
-      if (object[name]) {
-        var args = fn.length,
-          oldfn = object[name];
-
-        object[name] = function() {
-          if (arguments.length === args) {
-            return fn.apply(this, arguments);
-          } else {
-            return oldfn.apply(this, arguments);
-          }
-        };
-      } else {
-        object[name] = fn;
-      }
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    // Event handling
-    //////////////////////////////////////////////////////////////////////////
-
-    p.pjs.eventHandlers = [];
-
-    function attach(elem, type, fn) {
-      if (elem.addEventListener) {
-        elem.addEventListener(type, fn, false);
-      } else {
-        elem.attachEvent("on" + type, fn);
-      }
-      p.pjs.eventHandlers.push([elem, type, fn]);
-    }
-
-    attach(curElement, "mousemove", function(e) {
-      var element = curElement, offsetX = 0, offsetY = 0;
-
-      p.pmouseX = p.mouseX;
-      p.pmouseY = p.mouseY;
-
-      if (element.offsetParent) {
-        do {
-          offsetX += element.offsetLeft;
-          offsetY += element.offsetTop;
-        } while (element = element.offsetParent);
-      }
-
-      // Dropping support for IE clientX and clientY, switching to pageX and pageY so we don't have to calculate scroll offset.
-      // Removed in ticket #184. See rev: 2f106d1c7017fed92d045ba918db47d28e5c16f4
-      p.mouseX = e.pageX - offsetX;
-      p.mouseY = e.pageY - offsetY;
-
-      if (p.mouseMoved && !mousePressed) {
-        p.mouseMoved();
-      }
-      if (mousePressed && p.mouseDragged) {
-        p.mouseDragged();
-        p.mouseDragging = true;
-      }
-    });
-
-    attach(curElement, "mouseout", function(e) {
-      //david gage changed here!
-      mousePressed = false;
-    });
-
-    attach(curElement, "mousedown", function(e) {
-      mousePressed = true;
-      p.mouseDragging = false;
-      switch (e.which) {
-      case 1:
-        p.mouseButton = p.LEFT;
-        break;
-      case 2:
-        p.mouseButton = p.CENTER;
-        break;
-      case 3:
-        p.mouseButton = p.RIGHT;
-        break;
-      }
-      p.mouseDown = true;
-      if (typeof p.mousePressed === "function") {
-        p.mousePressed();
-      } else {
-        p.mousePressed = true;
-      }
-    });
-
-    attach(curElement, "mouseup", function(e) {
-      mousePressed = false;
-      if (p.mouseClicked && !p.mouseDragging) {
-        p.mouseClicked();
-      }
-      if (typeof p.mousePressed !== "function") {
-        p.mousePressed = false;
-      }
-      if (p.mouseReleased) {
-        p.mouseReleased();
-      }
-    });
-
-    var mouseWheelHandler = function(e) {
-      var delta = 0;
-
-      if (e.wheelDelta) {
-        delta = e.wheelDelta / 120;
-        if (window.opera) {
-          delta = -delta;
-        }
-      } else if (e.detail) {
-        delta = -e.detail / 3;
-      }
-
-      p.mouseScroll = delta;
-
-      if (delta && typeof p.mouseScrolled === 'function') {
-        p.mouseScrolled();
-      }
-    };
-
-    // Support Gecko and non-Gecko scroll events
-    attach(document, 'DOMMouseScroll', mouseWheelHandler);
-    attach(document, 'mousewheel', mouseWheelHandler);
-
-    attach(document, "keydown", function(e) {
-      keyPressed = true;
-      p.keyCode = null;
-      p.key = e.keyCode;
-
-      // Letters
-      if (e.keyCode >= 65 && e.keyCode <= 90) { // A-Z
-        // Keys return ASCII for upcased letters.
-        // Convert to downcase if shiftKey is not pressed.
-        if (!e.shiftKey) {
-          p.key += 32;
-        }
-      }
-
-      // Numbers and their shift-symbols
-      else if (e.keyCode >= 48 && e.keyCode <= 57) { // 0-9
-        if (e.shiftKey) {
-          switch (e.keyCode) {
-          case 49:
-            p.key = 33;
-            break; // !
-          case 50:
-            p.key = 64;
-            break; // @
-          case 51:
-            p.key = 35;
-            break; // #
-          case 52:
-            p.key = 36;
-            break; // $
-          case 53:
-            p.key = 37;
-            break; // %
-          case 54:
-            p.key = 94;
-            break; // ^
-          case 55:
-            p.key = 38;
-            break; // &
-          case 56:
-            p.key = 42;
-            break; // *
-          case 57:
-            p.key = 40;
-            break; // (
-          case 48:
-            p.key = 41;
-            break; // )
-          }
-        }
-      }
-
-      // Coded keys
-      else if (codedKeys.indexOf(e.keyCode) >= 0) { // SHIFT, CONTROL, ALT, LEFT, RIGHT, UP, DOWN
-        p.key = p.CODED;
-        p.keyCode = e.keyCode;
-      }
-
-      // Symbols and their shift-symbols
-      else {
-        if (e.shiftKey) {
-          switch (e.keyCode) {
-          case 107:
-            p.key = 43;
-            break; // +
-          case 219:
-            p.key = 123;
-            break; // {
-          case 221:
-            p.key = 125;
-            break; // }
-          case 222:
-            p.key = 34;
-            break; // "
-          }
-        } else {
-          switch (e.keyCode) {
-          case 188:
-            p.key = 44;
-            break; // ,
-          case 109:
-            p.key = 45;
-            break; // -
-          case 190:
-            p.key = 46;
-            break; // .
-          case 191:
-            p.key = 47;
-            break; // /
-          case 192:
-            p.key = 96;
-            break; // ~
-          case 219:
-            p.key = 91;
-            break; // [
-          case 220:
-            p.key = 92;
-            break; // \
-          case 221:
-            p.key = 93;
-            break; // ]
-          case 222:
-            p.key = 39;
-            break; // '
-          }
-        }
-      }
-
-      if (typeof p.keyPressed === "function") {
-        p.keyPressed();
-      } else {
-        p.keyPressed = true;
-      }
-    });
-
-    attach(document, "keyup", function(e) {
-      keyPressed = false;
-      if (typeof p.keyPressed !== "function") {
-        p.keyPressed = false;
-      }
-      if (p.keyReleased) {
-        p.keyReleased();
-      }
-    });
-
-    attach(document, "keypress", function (e) {
-      if (p.keyTyped) {
-        p.keyTyped();
-      }
-    });
-
-    // Place-holder for debugging function
-    p.debug = function(e) {};
-
-    // Get the DOM element if string was passed
-    if (typeof curElement === "string") {
-      curElement = document.getElementById(curElement);
-    }
-
-    // Send aCode Processing syntax to be converted to JavaScript
-    if (aCode) {
-      var parsedCode = typeof aCode === "function" ? undefined : Processing.parse(aCode, p);
-
-      if (!this.use3DContext) {
-        // Setup default 2d canvas context.
-        curContext = curElement.getContext('2d');
-
-        modelView = new PMatrix2D();
-
-        // Canvas has trouble rendering single pixel stuff on whole-pixel
-        // counts, so we slightly offset it (this is super lame).
-        curContext.translate(0.5, 0.5);
-
-        curContext.lineCap = 'round';
-
-        // Set default stroke and fill color
-        p.stroke(0);
-        p.fill(255);
-        p.noSmooth();
-        p.disableContextMenu();
-      }
-
-      // Step through the libraries that were attached at doc load...
-      for (var i in Processing.lib) {
-        if (Processing.lib) {
-          // Init the libraries in the context of this p_instance
-          Processing.lib[i].call(this);
-        }
-      }
-
-      var localizedProperties = "";
-      for (var propertyName in p) {
-        localizedProperties += "var " + propertyName + "=__p__." + propertyName + ";";
-        if (typeof p[propertyName] !== "function" || typeof p[propertyName] !== "object") {
-          localizedProperties += "__p__.__defineGetter__('" + propertyName + "',function(){return " + propertyName + ";});" +
-                                 "__p__.__defineSetter__('" + propertyName + "',function(v){" + propertyName + "=v;});";
-        }
-      }
-
-      var executeSketch = function() {
-          // Don't start until all specified images in the cache are preloaded
-          if (!p.pjs.imageCache.pending) {
-            if(typeof aCode === "function") {
-              aCode(p);
-            } else {
-              eval (" (function(__p__) { " +
-                        localizedProperties +
-                        parsedCode +
-                    "   if (setup) {" +
-                    "     __p__.setup = setup;" +
-                    "     setup();" +
-                    "   }" +
-                    "   if (draw) {" +
-                    "     __p__.draw = draw;" +
-                    "     if (!doLoop) {" +
-                    "       redraw();" +
-                    "     } else {" +
-                    "       loop();" +
-                    "     }" +
-                    "   }" +
-                    " })(p);"
-              );
-            }
-          } else {
-            window.setTimeout(executeSketch, 10);
-          }
-      };
-
-      // The parser adds custom methods to the processing context
-      executeSketch();
-    }
-  };
-
-  // Share lib space
-  Processing.lib = {};
-
-  // Parse Processing (Java-like) syntax to JavaScript syntax with Regex
-  Processing.parse = function parse(aCode, p) {
-
-    // Function to grab all code in the opening and closing of two characters
-    var nextBrace = function(right, openChar, closeChar) {
-      var rest = right,
-          position = 0,
-          leftCount = 1,
-          rightCount = 0;
-
-      while (leftCount !== rightCount) {
-        var nextLeft = rest.indexOf(openChar),
-            nextRight = rest.indexOf(closeChar);
-
-        if (nextLeft < nextRight && nextLeft !== -1) {
-          leftCount++;
-          rest = rest.slice(nextLeft + 1);
-          position += nextLeft + 1;
-        } else {
-          rightCount++;
-          rest = rest.slice(nextRight + 1);
-          position += nextRight + 1;
-        }
-      }
-
-      return right.slice(0, position - 1);
-    };
-
-    // Force characters-as-bytes to work.
-    //aCode = aCode.replace(/('(.){1}')/g, "$1.charCodeAt(0)");
-    aCode = aCode.replace(/'.{1}'/g, function(all) {
-      return "(new Char(" + all + "))";
-    });
-
-    // Parse out @pjs directive, if any.
-    var dm = /\/\*\s*@pjs\s+((?:[^\*]|\*+[^\*\/])*)\*\//g.exec(aCode);
-    if (dm && dm.length === 2) {
-      var directives = dm.splice(1, 2)[0].replace('\n', '').replace('\r', '').split(';');
-
-      // We'll L/RTrim, and also remove any surrounding double quotes (e.g., just take string contents)
-      var clean = function(s) {
-        return s.replace(/^\s*\"?/, '').replace(/\"?\s*$/, '');
-      };
-
-      for (var i = 0, dl = directives.length; i < dl; i++) {
-        var pair = directives[i].split('=');
-        if (pair && pair.length === 2) {
-          var key = clean(pair[0]);
-          var value = clean(pair[1]);
-
-          // A few directives require work beyond storying key/value pairings
-          if (key === "preload") {
-            var list = value.split(',');
-            // All pre-loaded images will get put in imageCache, keyed on filename
-            for (var j = 0, ll = list.length; j < ll; j++) {
-              var imageName = clean(list[j]);
-              var img = new Image();
-              img.onload = (function() {
-                return function() {
-                  p.pjs.imageCache.pending--;
-                };
-              }());
-              p.pjs.imageCache.pending++;
-              p.pjs.imageCache[imageName] = img;
-              img.src = imageName;
-            }
-          } else if (key === "opaque") {
-            p.canvas.mozOpaque = value === "true";
-          } else {
-            p.pjs[key] = value;
-          }
-        }
-      }
-      aCode = aCode.replace(dm[0], '');
-    }
-
-    // Saves all strings into an array
-    // masks all strings into <STRING n>
-    // to be replaced with the array strings after parsing is finished
-    var strings = [];
-    aCode = aCode.replace(/(["'])(\\\1|.)*?(\1)/g, function(all) {
-      strings.push(all);
-      return "<STRING " + (strings.length - 1) + ">";
-    });
-
-    // Windows newlines cause problems:
-    aCode = aCode.replace(/\r\n?/g, "\n");
-
-    // Remove multi-line comments
-    aCode = aCode.replace(/\/\*[\s\S]*?\*\//g, "");
-
-    // Remove end-of-line comments
-    aCode = aCode.replace(/\/\/.*\n/g, "\n");
-
-    // Weird parsing errors with %
-    aCode = aCode.replace(/([^\s])%([^\s])/g, "$1 % $2");
-
-    // Since frameRate() and frameRate are different things,
-    // we need to differentiate them somehow. So when we parse
-    // the Processing.js source, replace frameRate so it isn't
-    // confused with frameRate().
-    aCode = aCode.replace(/(\s*=\s*|\(*\s*)frameRate(\s*\)+?|\s*;)/, "$1p.FRAME_RATE$2");
-
-    // Simple convert a function-like thing to function
-    aCode = aCode.replace(/(?:static )?(\w+(?:\[\])*\s+)(\w+)\s*(\([^\)]*\)\s*\{)/g, function(all, type, name, args) {
-      if (name === "if" || name === "for" || name === "while" || type === "public ") {
-        return all;
-      } else {
-        return "PROCESSING." + name + " = function " + name + args;
-      }
-    });
-
-    var matchMethod = /PROCESSING\.(\w+ = function \w+\([^\)]*\)\s*\{)/, mc;
-
-    while ((mc = aCode.match(matchMethod))) {
-      var prev = RegExp.leftContext,
-        allNext = RegExp.rightContext,
-        next = nextBrace(allNext, "{", "}");
-
-        aCode = prev + "processing." + mc[1] + next + "};" + allNext.slice(next.length + 1);
-    }
-
-    // Delete import statements, ie. import processing.video.*;
-    // https://processing-js.lighthouseapp.com/projects/41284/tickets/235-fix-parsing-of-java-import-statement
-    aCode = aCode.replace(/import\s+(.+);/g, "");
-
-    //replace  catch (IOException e) to catch (e)
-    aCode = aCode.replace(/catch\s*\(\W*\w*\s+(\w*)\W*\)/g, "catch ($1)");
-
-    //delete  the multiple catch block
-    var catchBlock = /(catch[^\}]*\})\W*catch[^\}]*\}/;
-
-    while (catchBlock.test(aCode)) {
-      aCode = aCode.replace(new RegExp(catchBlock), "$1");
-    }
-
-    Error.prototype.printStackTrace = function() {
-      this.toString();
-    };
-
-    // changes pixels[n] into pixels.getPixels(n)
-    // and pixels[n] = n2 into pixels.setPixels(n, n2)
-    var matchPixels = /pixels\s*\[/,
-        mp;
-
-    while ((mp = aCode.match(matchPixels))) {
-      var left = RegExp.leftContext,
-          allRest = RegExp.rightContext,
-          rest = nextBrace(allRest, "[", "]"),
-          getOrSet = "getPixel";
-
-      allRest = allRest.slice(rest.length + 1);
-
-      allRest = (function(){
-        return allRest.replace(/^\s*=([^;]*)([;])/, function(all, middle, end){
-          rest += ", " + middle;
-          getOrSet = "setPixel";
-          return end;
-        });
-      }());
-
-      aCode = left + "pixels." + getOrSet + "(" + rest + ")" + allRest;
-    }
-
-    // changes pixel.length to pixels.getLength()
-    aCode = aCode.replace(/pixels.length/g, "pixels.getLength()");
-
-    // Force .length() to be .length
-    aCode = aCode.replace(/\.length\(\)/g, ".length");
-
-    // foo( int foo, float bar )
-    aCode = aCode.replace(/([\(,]\s*)(\w+)((?:\[\])+|\s+)\s*(\w+\s*[\),])/g, "$1$4");
-    aCode = aCode.replace(/([\(,]\s*)(\w+)((?:\[\])+|\s+)\s*(\w+\s*[\),])/g, "$1$4");
-
-    // float[] foo = new float[5];
-    aCode = aCode.replace(/new\s+(\w+)\s*((?:\[(?:[^\]]*)\])+)\s*(\{[^;]*\}\s*;)*/g, function(all, name, args, initVars) {
-      if (initVars) {
-        return initVars.replace(/\{/g, "[").replace(/\}/g, "]");
-      } else {
-        return "new ArrayList(" + args.replace(/\[\]/g, "[0]").slice(1, -1).split("][").join(", ") + ");";
-      }
-    });
-
-    // What does this do? This does the same thing as "Fix Array[] foo = {...} to [...]" below
-    aCode = aCode.replace(/(?:static\s+)?\w+\[\]\s*(\w+)\[?\]?\s*=\s*\{.*?\};/g, function(all) {
-      return all.replace(/\{/g, "[").replace(/\}/g, "]");
-    });
-
-    // int|float foo;
-    var intFloat = /(\s*(?:int|float)\s+(?!\[\])*(?:\s*|[^\(;]*?,\s*))([a-zA-Z]\w*)\s*(,|;)/i;
-    while (intFloat.test(aCode)) {
-      aCode = (function() {
-        return aCode.replace(new RegExp(intFloat), function(all, type, name, sep) {
-          return type + " " + name + " = 0" + sep;
-        });
-      }());
-    }
-
-    // float foo = 5;
-    aCode = aCode.replace(/(?:final\s+)?(\w+)((?:\[\s*\])+|\s)\s*(\w+)\[?\]?(\s*[=,;])/g, function(all, type, arr, name, sep) {
-      if (type === "return" || type === "else") {
-        return all;
-      } else {
-        return "var " + name + sep;
-      }
-    });
-
-    // Fix Array[] foo = {...} to [...]
-    aCode = aCode.replace(/\=\s*\{((.|\s)*?\};)/g, function(all, data) {
-      return "= [" + data.replace(/\{/g, "[").replace(/\}/g, "]");
-    });
-
-    // super() is a reserved word
-    aCode = aCode.replace(/super\(/g, "superMethod(");
-
-    // Stores the variables and mathods of a single class
-    var SuperClass = function(name){
-      return {
-        className: name,
-        classVariables: "",
-        classFunctions: []
-      };
-    };
-    var arrayOfSuperClasses = [];
-
-    // implements Int1, Int2
-    aCode = aCode.replace(/implements\s+(\w+\s*(,\s*\w+\s*)*)\s*\{/g, function(all, interfaces) {
-      var names = interfaces.replace(/\s+/g, "").split(",");
-      return "{ var __psj_interfaces = new ArrayList([\"" + names.join("\", \"") + "\"]);";
-    });
-
-    // Simply turns an interface into a class
-    aCode = aCode.replace(/interface/g, "class");
-
-    var classes = ["int", "float", "boolean", "String", "byte", "double", "long", "ArrayList"];
-
-    var classReplace = function(all, name, extend) {
-      classes.push(name);
-
-      // Move arguments up from constructor
-      return "function " + name + "() {\n " +
-              (extend ? "var __self=this;function superMethod(){extendClass(__self,arguments," + extend + ");}\n" : "") +
-              (extend ? "extendClass(this, " + extend + ");\n" : "") +
-              "<CLASS " + name + " " + extend + ">";
-    };
-
-    var matchClasses = /(?:public\s+|abstract\s+|static\s+)*class\s+?(\w+)\s*(?:extends\s*(\w+)\s*)?\{/g;
-
-    aCode = aCode.replace(matchClasses, classReplace);
-
-    var matchClass = /<CLASS (\w+) (\w+)?>/,
-        m;
-
-    while ((m = aCode.match(matchClass))) {
-      var left = RegExp.leftContext,
-          allRest = RegExp.rightContext,
-          rest = nextBrace(allRest, "{", "}"),
-          className = m[1],
-          thisSuperClass = new SuperClass(className),
-          extendingClass = m[2];
-
-      allRest = allRest.slice(rest.length + 1);
-
-      // Fix class method names
-      // this.collide = function() { ... }
-      rest = (function() {
-        return rest.replace(/(?:public\s+)?processing.\w+ = function (\w+)\(([^\)]*?)\)/g, function(all, name, args) {
-          thisSuperClass.classFunctions.push(name + "|");
-          return "ADDMETHOD(this, '" + name + "', (function(public) { return function(" + args + ")";
-        });
-      }());
-
-      var matchMethod = /ADDMETHOD([^,]+, \s*?')([^']*)('[\s\S]*?\{[^\{]*?\{)/,
-          mc,
-          methods = "",
-          publicVars  = "",
-          methodsArray = [];
-
-      while ((mc = rest.match(matchMethod))) {
-        var prev = RegExp.leftContext,
-            allNext = RegExp.rightContext,
-            next = nextBrace(allNext, "{", "}");
-
-        methodsArray.push("addMethod" + mc[1] + mc[2] + mc[3] + next + "};})(this));\n");
-        publicVars += mc[2] + "|";
-
-        if (extendingClass){
-          for (var i = 0, aLength = arrayOfSuperClasses.length; i < aLength; i++){
-            if (extendingClass === arrayOfSuperClasses[i].className){
-              publicVars += arrayOfSuperClasses[i].classVariables;
-              for (var x = 0, fLength = arrayOfSuperClasses[i].classFunctions.length; x < fLength; x++){
-                publicVars += arrayOfSuperClasses[i].classFunctions[x];
-              }
-            }
-          }
-        }
-
-        rest = prev + allNext.slice(next.length + 1);
-      }
-
-      var matchConstructor = new RegExp("\\b" + className + "\\s*\\(([^\\)]*?)\\)\\s*{"),
-          c,
-          constructor = "",
-          constructorsArray = [];
-
-      // Extract all constructors and put them into the variable "constructors"
-      while ((c = rest.match(matchConstructor))) {
-        var prev = RegExp.leftContext,
-            allNext = RegExp.rightContext,
-            next = nextBrace(allNext, "{", "}"),
-            args = c[1];
-
-          args = args.split(/,\s*?/);
-
-        if (args[0].match(/^\s*$/)) {
-          args.shift();
-        }
-
-        constructor = "if ( arguments.length === " + args.length + " ) {\n";
-
-        for (var i = 0, aLength = args.length; i < aLength; i++) {
-          constructor += " var " + args[i] + " = arguments[" + i + "];\n";
-        }
-
-        constructor += next + "}\n";
-
-        constructorsArray.push(constructor);
-        rest = prev + allNext.slice(next.length + 1);
-      }
-
-      var vars = "",
-          staticVars = "",
-          localStaticVars = [];
-
-      // Put all member variables into "vars"
-      // and keep a list of all public variables
-      rest = (function(){
-        rest.replace(/(?:final|private|public)?\s*?(?:(static)\s+)?var\s+([^;]*?;)/g, function(all, staticVar, variable) {
-          variable = "this." + variable.replace(/,\s*/g, ";\nthis.")
-            .replace(/this.(\w+);/g, "this.$1 = null;") + '\n';
-
-          publicVars += variable.replace(/\s*this\.(\w+)\s*(;|=).*\s?/g, "$1|");
-          thisSuperClass.classVariables += variable.replace(/\s*this\.(\w+)\s*(;|=).*\s?/g, "$1|");
-
-          if (staticVar === "static"){
-            // Fix static methods
-            variable = variable.replace(/this\.(\w+)\s*=\s*([^;]*?;)/g, function(all, sVariable, value){
-              localStaticVars.push(sVariable);
-              value = value.replace(new RegExp("(" + localStaticVars.join("|") + ")", "g"), className + ".$1");
-              staticVars += className + "." + sVariable + " = " + value;
-              return "if (typeof " + className + "." + sVariable + " === 'undefined'){ " + className + "." + sVariable + " = " + value + " }\n" +
-                "this.__defineGetter__('" + sVariable + "', function(){ return "+ className + "." + sVariable + "; });\n" +
-                "this.__defineSetter__('" + sVariable + "', function(val){ " + className + "." + sVariable + " = val; });\n";
-            });
-          }
-          vars += variable;
-          return "";
-        });
-      }());
-
-
-      // add this. to public variables used inside member functions, and constructors
-      if (publicVars) {
-        // Search functions for public variables
-        for (var i = 0, aLength = methodsArray.length; i < aLength; i++){
-          methodsArray[i] = (function(){
-            return methodsArray[i].replace(/(addMethod.*?\{ return function\((.*?)\)\s*\{)([\s\S]*?)(\};\}\)\(this\)\);)/g, function(all, header, localParams, body, footer) {
-              body = body.replace(/this\./g, "public.");
-              localParams = localParams.replace(/\s*,\s*/g, "|");
-              return header + body.replace(new RegExp("(var\\s+?|\\.)?\\b(" + publicVars.substr(0, publicVars.length-1) + ")\\b", "g"), function (all, first, variable) {
-                if (first === ".") {
-                  return all;
-                } else if (/var\s*?$/.test(first)) {
-                  localParams += "|" + variable;
-                  return all;
-                } else if (localParams && new RegExp("\\b(" + localParams + ")\\b").test(variable)){
-                  return all;
-                } else {
-                  return "public." + variable;
-                }
-              }) + footer;
-            });
-          }());
-        }
-        // Search constructors for public variables
-        for (var i = 0, localParameters = "", aLength = constructorsArray.length; i < aLength; i++){
-          localParameters = "";
-          (function(){
-            constructorsArray[i].replace(/var\s+(\w+) = arguments\[[^\]]\];/g, function(all, localParam){
-              localParameters += localParam + "|";
-            });
-          }());
-          (function(){
-            constructorsArray[i] = constructorsArray[i].replace(new RegExp("(var\\s+?|\\.)?\\b(" + publicVars.substr(0, publicVars.length-1) + ")\\b", "g"), function (all, first, variable) {
-              if (first === ".") {
-                return all;
-              } else if (/var\s*?$/.test(first)) {
-                localParameters += variable + "|";
-                return all;
-              } else if (localParameters && new RegExp("\\b(" + localParameters.substr(0, localParameters.length-1) + ")\\b").test(variable)){
-                return all;
-              } else {
-                return "this." + variable;
-              }
-            });
-          }());
-        }
-      }
-
-      var constructors = "";
-
-      for (var i = 0, aLength = methodsArray.length; i < aLength; i++){
-        methods += methodsArray[i];
-      }
-      for (var i = 0, aLength = constructorsArray.length; i < aLength; i++){
-        constructors += constructorsArray[i];
-      }
-      arrayOfSuperClasses.push(thisSuperClass);
-      rest = vars + "\n" + methods + "\n" + constructors;
-      aCode = left + rest + "\n}" + staticVars + allRest;
-    }
-
-    // Do some tidying up, where necessary
-    aCode = aCode.replace(/processing.\w+ = function addMethod/g, "addMethod");
-
-    // Remove processing. from leftover functions
-    aCode = aCode.replace(/processing\.((\w+) = function)/g, "$1");
-
-    // Check if 3D context is invoked -- this is not the best way to do this.
-    if (aCode.match(/size\((?:.+),(?:.+),\s*(OPENGL|P3D)\s*\);/)) {
-      p.use3DContext = true;
-    }
-
-    // Handle (int) Casting
-    aCode = aCode.replace(/\(int\)/g, "0|");
-
-    // Remove Casting
-    aCode = aCode.replace(new RegExp("\\((" + classes.join("|") + ")(\\[\\])*\\)", "g"), "");
-
-    // Force numbers to exist //
-    //aCode = aCode.replace(/([^.])(\w+)\s*\+=/g, "$1$2 = ($2||0) +");
-    var toNumbers = function(str) {
-      var ret = [];
-
-      str.replace(/(..)/g, function(str) {
-        ret.push(parseInt(str, 16));
-      });
-
-      return ret;
-    };
-
-    // Convert #aaaaaa into color
-    aCode = aCode.replace(/#([a-f0-9]{6})/ig, function(m, hex) {
-      var num = toNumbers(hex);
-      return "defaultColor(" + num[0] + "," + num[1] + "," + num[2] + ")";
-    });
-
-    // Convert 3.0f to just 3.0
-    aCode = aCode.replace(/(\d+)f/g, "$1");
-
-    // replaces all masked strings from <STRING n> to the appropriate string contained in the strings array
-    for (var n = 0, sl = strings.length; n < sl; n++) {
-      aCode = (function() {
-        return aCode.replace(new RegExp("(.*)(<STRING " + n + ">)(.*)", "g"), function(all, quoteStart, match, quoteEnd) {
-          var returnString = all,
-            notString = true,
-            quoteType = "",
-            escape = false;
-
-          for (var x = 0, ql = quoteStart.length; x < ql; x++) {
-            if (notString) {
-              if (quoteStart.charAt(x) === "\"" || quoteStart.charAt(x) === "'") {
-                quoteType = quoteStart.charAt(x);
-                notString = false;
-              }
-            } else {
-              if (!escape) {
-                if (quoteStart.charAt(x) === "\\") {
-                  escape = true;
-                } else if (quoteStart.charAt(x) === quoteType) {
-                  notString = true;
-                  quoteType = "";
-                }
-              } else {
-                escape = false;
-              }
-            }
-          }
-
-          if (notString) { // Match is not inside a string
-            returnString = quoteStart + strings[n] + quoteEnd;
-          }
-
-          return returnString;
-        });
-      }());
-    }
-    return aCode;
-  };
-
-  // IE Unfriendly AJAX Method
-  var ajax = function(url) {
-    var AJAX = new window.XMLHttpRequest();
-    if (AJAX) {
-      AJAX.open("GET", url + "?t=" + new Date().getTime(), false);
-      AJAX.send(null);
-      return AJAX.responseText;
-    } else {
-      return false;
-    }
-  };
-
-  // Automatic Initialization Method
-  var init = function() {
-    var canvas = document.getElementsByTagName('canvas');
-
-    for (var i = 0, l = canvas.length; i < l; i++) {
-      // datasrc and data-src are deprecated.
-      var processingSources = canvas[i].getAttribute('data-processing-sources');
-      if (processingSources === null) {
-        // Temporary fallback for datasrc and data-src
-        processingSources = canvas[i].getAttribute('data-src');
-        if (processingSources === null) {
-          processingSources = canvas[i].getAttribute('datasrc');
-        }
-      }
-      if (processingSources) {
-        // The problem: if the HTML canvas dimensions differ from the
-        // dimensions specified in the size() call in the sketch, for
-        // 3D sketches, browsers will either not render or render the
-        // scene incorrectly. To fix this, we need to adjust the attributes
-        // of the canvas width and height.
-        // Get the source, we'll need to find what the user has used in size()
-        var filenames = processingSources.split(' ');
-        var code = "";
-        for (var j=0, fl=filenames.length; j<fl; j++) {
-          if (filenames[j]) {
-            code += ajax(filenames[j]) + ";\n"; // deal with files that don't end with newline
-          }
-        }
-        new Processing(canvas[i], code);
-      }
-    }
-  };
-
-  document.addEventListener('DOMContentLoaded', function() {
-    init();
-  }, false);
-
-}());
-
diff --git a/htdocs/package-lock.json b/htdocs/package-lock.json
index 96999b049c..8e81a4a6ea 100644
--- a/htdocs/package-lock.json
+++ b/htdocs/package-lock.json
@@ -7,32 +7,33 @@
             "name": "webwork.javascript_package_manager",
             "license": "GPL-2.0+",
             "dependencies": {
-                "@fortawesome/fontawesome-free": "^6.0.0",
-                "bootstrap": "~5.1.3",
-                "codemirror": "^5.65.2",
-                "flatpickr": "^4.6.9",
+                "@fortawesome/fontawesome-free": "^6.2.1",
+                "bootstrap": "~5.2.3",
+                "codemirror": "^5.65.11",
+                "flatpickr": "^4.6.13",
                 "iframe-resizer": "^4.3.2",
-                "jquery": "^3.6.0",
-                "jquery-ui-dist": "^1.13.1",
-                "luxon": "^2.5.2",
-                "mathjax": "^3.2.0",
-                "sortablejs": "^1.14.0"
+                "jquery": "^3.6.3",
+                "jquery-ui-dist": "^1.13.2",
+                "luxon": "^3.2.1",
+                "mathjax": "^3.2.2",
+                "shortcut-buttons-flatpickr": "^0.4.0",
+                "sortablejs": "^1.15.0"
             },
             "devDependencies": {
-                "autoprefixer": "^10.4.1",
+                "autoprefixer": "^10.4.13",
                 "chokidar": "^3.5.3",
                 "cssnano": "^6.0.0",
-                "postcss": "^8.4.5",
-                "rtlcss": "^3.5.0",
-                "sass": "^1.45.2",
-                "terser": "^5.10.0",
-                "yargs": "^16.2.0"
+                "postcss": "^8.4.21",
+                "rtlcss": "^4.0.0",
+                "sass": "^1.57.1",
+                "terser": "^5.16.1",
+                "yargs": "^17.6.2"
             }
         },
         "node_modules/@fortawesome/fontawesome-free": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.1.1.tgz",
-            "integrity": "sha512-J/3yg2AIXc9wznaVqpHVX3Wa5jwKovVF0AMYSnbmcXTiL3PpRPfF58pzWucCwEiCJBp+hCNRLWClTomD8SseKg==",
+            "version": "6.2.1",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz",
+            "integrity": "sha512-viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A==",
             "hasInstallScript": true,
             "engines": {
                 "node": ">=6"
@@ -87,19 +88,19 @@
             "dev": true
         },
         "node_modules/@jridgewell/trace-mapping": {
-            "version": "0.3.14",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz",
-            "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==",
+            "version": "0.3.17",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
+            "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
             "dev": true,
             "dependencies": {
-                "@jridgewell/resolve-uri": "^3.0.3",
-                "@jridgewell/sourcemap-codec": "^1.4.10"
+                "@jridgewell/resolve-uri": "3.1.0",
+                "@jridgewell/sourcemap-codec": "1.4.14"
             }
         },
         "node_modules/@popperjs/core": {
-            "version": "2.11.5",
-            "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz",
-            "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==",
+            "version": "2.11.6",
+            "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
+            "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==",
             "peer": true,
             "funding": {
                 "type": "opencollective",
@@ -116,9 +117,9 @@
             }
         },
         "node_modules/acorn": {
-            "version": "8.7.1",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-            "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+            "version": "8.8.1",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+            "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
             "dev": true,
             "bin": {
                 "acorn": "bin/acorn"
@@ -152,9 +153,9 @@
             }
         },
         "node_modules/anymatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-            "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+            "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
             "dev": true,
             "dependencies": {
                 "normalize-path": "^3.0.0",
@@ -165,9 +166,9 @@
             }
         },
         "node_modules/autoprefixer": {
-            "version": "10.4.7",
-            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.7.tgz",
-            "integrity": "sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA==",
+            "version": "10.4.13",
+            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz",
+            "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==",
             "dev": true,
             "funding": [
                 {
@@ -180,8 +181,8 @@
                 }
             ],
             "dependencies": {
-                "browserslist": "^4.20.3",
-                "caniuse-lite": "^1.0.30001335",
+                "browserslist": "^4.21.4",
+                "caniuse-lite": "^1.0.30001426",
                 "fraction.js": "^4.2.0",
                 "normalize-range": "^0.1.2",
                 "picocolors": "^1.0.0",
@@ -213,15 +214,21 @@
             "dev": true
         },
         "node_modules/bootstrap": {
-            "version": "5.1.3",
-            "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz",
-            "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==",
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/bootstrap"
-            },
+            "version": "5.2.3",
+            "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz",
+            "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/twbs"
+                },
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/bootstrap"
+                }
+            ],
             "peerDependencies": {
-                "@popperjs/core": "^2.10.2"
+                "@popperjs/core": "^2.11.6"
             }
         },
         "node_modules/braces": {
@@ -237,9 +244,9 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.21.5",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz",
-            "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==",
+            "version": "4.21.4",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
+            "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
             "dev": true,
             "funding": [
                 {
@@ -252,10 +259,10 @@
                 }
             ],
             "dependencies": {
-                "caniuse-lite": "^1.0.30001449",
-                "electron-to-chromium": "^1.4.284",
-                "node-releases": "^2.0.8",
-                "update-browserslist-db": "^1.0.10"
+                "caniuse-lite": "^1.0.30001400",
+                "electron-to-chromium": "^1.4.251",
+                "node-releases": "^2.0.6",
+                "update-browserslist-db": "^1.0.9"
             },
             "bin": {
                 "browserslist": "cli.js"
@@ -283,9 +290,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001481",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001481.tgz",
-            "integrity": "sha512-KCqHwRnaa1InZBtqXzP98LPg0ajCVujMKjqKDhZEthIpAsJl/YEIa3YvXjGXPVqzZVguccuu7ga9KOE1J9rKPQ==",
+            "version": "1.0.30001517",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz",
+            "integrity": "sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA==",
             "dev": true,
             "funding": [
                 {
@@ -330,20 +337,23 @@
             }
         },
         "node_modules/cliui": {
-            "version": "7.0.4",
-            "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-            "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+            "version": "8.0.1",
+            "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+            "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
             "dev": true,
             "dependencies": {
                 "string-width": "^4.2.0",
-                "strip-ansi": "^6.0.0",
+                "strip-ansi": "^6.0.1",
                 "wrap-ansi": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=12"
             }
         },
         "node_modules/codemirror": {
-            "version": "5.65.7",
-            "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.7.tgz",
-            "integrity": "sha512-zb67cXzgugIQmb6tfD4G11ILjYoMfTjwcjn+cWsa4GewlI2adhR/h3kolkoCQTm1msD/1BuqVTKuO09ELsS++A=="
+            "version": "5.65.11",
+            "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.11.tgz",
+            "integrity": "sha512-Gp62g2eKSCHYt10axmGhKq3WoJSvVpvhXmowNq7pZdRVowwtvBR/hi2LSP5srtctKkRT33T6/n8Kv1UGp7JW4A=="
         },
         "node_modules/color-convert": {
             "version": "2.0.1",
@@ -607,9 +617,9 @@
             }
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.4.371",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.371.tgz",
-            "integrity": "sha512-jlBzY4tFcJaiUjzhRTCWAqRvTO/fWzjA3Bls0mykzGZ7zvcMP7h05W6UcgzfT9Ca1SW2xyKDOFRyI0pQeRNZGw==",
+            "version": "1.4.284",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
+            "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==",
             "dev": true
         },
         "node_modules/emoji-regex": {
@@ -651,22 +661,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/find-up": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-            "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-            "dev": true,
-            "dependencies": {
-                "locate-path": "^6.0.0",
-                "path-exists": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
         "node_modules/flatpickr": {
             "version": "4.6.13",
             "resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-4.6.13.tgz",
@@ -733,9 +727,9 @@
             }
         },
         "node_modules/immutable": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz",
-            "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.2.2.tgz",
+            "integrity": "sha512-fTMKDwtbvO5tldky9QZ2fMX7slR0mYpY5nbnFWYp0fOzDhHqhgIw9KoYgxLWsoNTS9ZHGauHj18DTyEw6BK3Og==",
             "dev": true
         },
         "node_modules/is-binary-path": {
@@ -790,14 +784,14 @@
             }
         },
         "node_modules/jquery": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
-            "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
+            "version": "3.6.3",
+            "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz",
+            "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg=="
         },
         "node_modules/jquery-ui-dist": {
-            "version": "1.13.1",
-            "resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.13.1.tgz",
-            "integrity": "sha512-Y711Pu4BRVrAlL58KSxX4ail74jaCJZaZcdNDLava+MgZeNwmVWmyYiK7KxyoJu1MB73eSunjJvYDbOuNrOA7w==",
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.13.2.tgz",
+            "integrity": "sha512-oVDRd1NLtTbBwpRKAYdIRgpWVDzeBhfy7Gu0RmY6JEaZtmBq6kDn1pm5SgDiAotrnDS+RoTRXO6xvcNTxA9tOA==",
             "dependencies": {
                 "jquery": ">=1.8.0 <4.0.0"
             }
@@ -811,21 +805,6 @@
                 "node": ">=10"
             }
         },
-        "node_modules/locate-path": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-            "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-            "dev": true,
-            "dependencies": {
-                "p-locate": "^5.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
         "node_modules/lodash.memoize": {
             "version": "4.1.2",
             "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -839,9 +818,9 @@
             "dev": true
         },
         "node_modules/luxon": {
-            "version": "2.5.2",
-            "resolved": "https://registry.npmjs.org/luxon/-/luxon-2.5.2.tgz",
-            "integrity": "sha512-Yg7/RDp4nedqmLgyH0LwgGRvMEKVzKbUdkBYyCosbHgJ+kaOUx0qzSiSatVc3DFygnirTPYnMM2P5dg2uH1WvA==",
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.2.1.tgz",
+            "integrity": "sha512-QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg==",
             "engines": {
                 "node": ">=12"
             }
@@ -870,9 +849,9 @@
             }
         },
         "node_modules/node-releases": {
-            "version": "2.0.10",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz",
-            "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==",
+            "version": "2.0.8",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz",
+            "integrity": "sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==",
             "dev": true
         },
         "node_modules/normalize-path": {
@@ -905,45 +884,6 @@
                 "url": "https://github.com/fb55/nth-check?sponsor=1"
             }
         },
-        "node_modules/p-limit": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-            "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-            "dev": true,
-            "dependencies": {
-                "yocto-queue": "^0.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/p-locate": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-            "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-            "dev": true,
-            "dependencies": {
-                "p-limit": "^3.0.2"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/path-exists": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-            "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/picocolors": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
@@ -963,9 +903,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.14",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
-            "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
+            "version": "8.4.21",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
+            "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==",
             "dev": true,
             "funding": [
                 {
@@ -1431,24 +1371,27 @@
             }
         },
         "node_modules/rtlcss": {
-            "version": "3.5.0",
-            "resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-3.5.0.tgz",
-            "integrity": "sha512-wzgMaMFHQTnyi9YOwsx9LjOxYXJPzS8sYnFaKm6R5ysvTkwzHiB0vxnbHwchHQT65PTdBjDG21/kQBWI7q9O7A==",
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-4.0.0.tgz",
+            "integrity": "sha512-j6oypPP+mgFwDXL1JkLCtm6U/DQntMUqlv5SOhpgHhdIE+PmBcjrtAHIpXfbIup47kD5Sgja9JDsDF1NNOsBwQ==",
             "dev": true,
             "dependencies": {
-                "find-up": "^5.0.0",
+                "escalade": "^3.1.1",
                 "picocolors": "^1.0.0",
-                "postcss": "^8.3.11",
+                "postcss": "^8.4.6",
                 "strip-json-comments": "^3.1.1"
             },
             "bin": {
                 "rtlcss": "bin/rtlcss.js"
+            },
+            "engines": {
+                "node": ">=12.0.0"
             }
         },
         "node_modules/sass": {
-            "version": "1.53.0",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.53.0.tgz",
-            "integrity": "sha512-zb/oMirbKhUgRQ0/GFz8TSAwRq2IlR29vOUJZOx0l8sV+CkHUfHa4u5nqrG+1VceZp7Jfj59SVW9ogdhTvJDcQ==",
+            "version": "1.57.1",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.57.1.tgz",
+            "integrity": "sha512-O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw==",
             "dev": true,
             "dependencies": {
                 "chokidar": ">=3.0.0 <4.0.0",
@@ -1462,6 +1405,11 @@
                 "node": ">=12.0.0"
             }
         },
+        "node_modules/shortcut-buttons-flatpickr": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/shortcut-buttons-flatpickr/-/shortcut-buttons-flatpickr-0.4.0.tgz",
+            "integrity": "sha512-JKmT4my3Hm1e18OvG4Q6RcFhN4WRqqpTMkHrvZ7fup/dp6aTIWGVCHdRYtASkp/FCzDlJh6iCLQ/VcwwNpAMoQ=="
+        },
         "node_modules/sortablejs": {
             "version": "1.15.0",
             "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz",
@@ -1574,9 +1522,9 @@
             }
         },
         "node_modules/terser": {
-            "version": "5.14.2",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
-            "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
+            "version": "5.16.1",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz",
+            "integrity": "sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==",
             "dev": true,
             "dependencies": {
                 "@jridgewell/source-map": "^0.3.2",
@@ -1610,9 +1558,9 @@
             }
         },
         "node_modules/update-browserslist-db": {
-            "version": "1.0.11",
-            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
-            "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
+            "version": "1.0.10",
+            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+            "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
             "dev": true,
             "funding": [
                 {
@@ -1622,10 +1570,6 @@
                 {
                     "type": "tidelift",
                     "url": "https://tidelift.com/funding/github/npm/browserslist"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
                 }
             ],
             "dependencies": {
@@ -1633,7 +1577,7 @@
                 "picocolors": "^1.0.0"
             },
             "bin": {
-                "update-browserslist-db": "cli.js"
+                "browserslist-lint": "cli.js"
             },
             "peerDependencies": {
                 "browserslist": ">= 4.21.0"
@@ -1672,50 +1616,38 @@
             }
         },
         "node_modules/yargs": {
-            "version": "16.2.0",
-            "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-            "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+            "version": "17.6.2",
+            "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz",
+            "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==",
             "dev": true,
             "dependencies": {
-                "cliui": "^7.0.2",
+                "cliui": "^8.0.1",
                 "escalade": "^3.1.1",
                 "get-caller-file": "^2.0.5",
                 "require-directory": "^2.1.1",
-                "string-width": "^4.2.0",
+                "string-width": "^4.2.3",
                 "y18n": "^5.0.5",
-                "yargs-parser": "^20.2.2"
+                "yargs-parser": "^21.1.1"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=12"
             }
         },
         "node_modules/yargs-parser": {
-            "version": "20.2.9",
-            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-            "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/yocto-queue": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-            "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+            "version": "21.1.1",
+            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+            "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
             "dev": true,
             "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+                "node": ">=12"
             }
         }
     },
     "dependencies": {
         "@fortawesome/fontawesome-free": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.1.1.tgz",
-            "integrity": "sha512-J/3yg2AIXc9wznaVqpHVX3Wa5jwKovVF0AMYSnbmcXTiL3PpRPfF58pzWucCwEiCJBp+hCNRLWClTomD8SseKg=="
+            "version": "6.2.1",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz",
+            "integrity": "sha512-viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A=="
         },
         "@jridgewell/gen-mapping": {
             "version": "0.3.2",
@@ -1757,19 +1689,19 @@
             "dev": true
         },
         "@jridgewell/trace-mapping": {
-            "version": "0.3.14",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz",
-            "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==",
+            "version": "0.3.17",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
+            "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
             "dev": true,
             "requires": {
-                "@jridgewell/resolve-uri": "^3.0.3",
-                "@jridgewell/sourcemap-codec": "^1.4.10"
+                "@jridgewell/resolve-uri": "3.1.0",
+                "@jridgewell/sourcemap-codec": "1.4.14"
             }
         },
         "@popperjs/core": {
-            "version": "2.11.5",
-            "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz",
-            "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==",
+            "version": "2.11.6",
+            "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
+            "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==",
             "peer": true
         },
         "@trysound/sax": {
@@ -1779,9 +1711,9 @@
             "dev": true
         },
         "acorn": {
-            "version": "8.7.1",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-            "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+            "version": "8.8.1",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+            "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
             "dev": true
         },
         "ansi-regex": {
@@ -1800,9 +1732,9 @@
             }
         },
         "anymatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-            "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+            "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
             "dev": true,
             "requires": {
                 "normalize-path": "^3.0.0",
@@ -1810,13 +1742,13 @@
             }
         },
         "autoprefixer": {
-            "version": "10.4.7",
-            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.7.tgz",
-            "integrity": "sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA==",
+            "version": "10.4.13",
+            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz",
+            "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==",
             "dev": true,
             "requires": {
-                "browserslist": "^4.20.3",
-                "caniuse-lite": "^1.0.30001335",
+                "browserslist": "^4.21.4",
+                "caniuse-lite": "^1.0.30001426",
                 "fraction.js": "^4.2.0",
                 "normalize-range": "^0.1.2",
                 "picocolors": "^1.0.0",
@@ -1836,9 +1768,9 @@
             "dev": true
         },
         "bootstrap": {
-            "version": "5.1.3",
-            "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz",
-            "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==",
+            "version": "5.2.3",
+            "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz",
+            "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==",
             "requires": {}
         },
         "braces": {
@@ -1851,15 +1783,15 @@
             }
         },
         "browserslist": {
-            "version": "4.21.5",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz",
-            "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==",
+            "version": "4.21.4",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
+            "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
             "dev": true,
             "requires": {
-                "caniuse-lite": "^1.0.30001449",
-                "electron-to-chromium": "^1.4.284",
-                "node-releases": "^2.0.8",
-                "update-browserslist-db": "^1.0.10"
+                "caniuse-lite": "^1.0.30001400",
+                "electron-to-chromium": "^1.4.251",
+                "node-releases": "^2.0.6",
+                "update-browserslist-db": "^1.0.9"
             }
         },
         "buffer-from": {
@@ -1881,9 +1813,9 @@
             }
         },
         "caniuse-lite": {
-            "version": "1.0.30001481",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001481.tgz",
-            "integrity": "sha512-KCqHwRnaa1InZBtqXzP98LPg0ajCVujMKjqKDhZEthIpAsJl/YEIa3YvXjGXPVqzZVguccuu7ga9KOE1J9rKPQ==",
+            "version": "1.0.30001517",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz",
+            "integrity": "sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA==",
             "dev": true
         },
         "chokidar": {
@@ -1903,20 +1835,20 @@
             }
         },
         "cliui": {
-            "version": "7.0.4",
-            "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-            "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+            "version": "8.0.1",
+            "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+            "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
             "dev": true,
             "requires": {
                 "string-width": "^4.2.0",
-                "strip-ansi": "^6.0.0",
+                "strip-ansi": "^6.0.1",
                 "wrap-ansi": "^7.0.0"
             }
         },
         "codemirror": {
-            "version": "5.65.7",
-            "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.7.tgz",
-            "integrity": "sha512-zb67cXzgugIQmb6tfD4G11ILjYoMfTjwcjn+cWsa4GewlI2adhR/h3kolkoCQTm1msD/1BuqVTKuO09ELsS++A=="
+            "version": "5.65.11",
+            "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.11.tgz",
+            "integrity": "sha512-Gp62g2eKSCHYt10axmGhKq3WoJSvVpvhXmowNq7pZdRVowwtvBR/hi2LSP5srtctKkRT33T6/n8Kv1UGp7JW4A=="
         },
         "color-convert": {
             "version": "2.0.1",
@@ -2106,9 +2038,9 @@
             }
         },
         "electron-to-chromium": {
-            "version": "1.4.371",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.371.tgz",
-            "integrity": "sha512-jlBzY4tFcJaiUjzhRTCWAqRvTO/fWzjA3Bls0mykzGZ7zvcMP7h05W6UcgzfT9Ca1SW2xyKDOFRyI0pQeRNZGw==",
+            "version": "1.4.284",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
+            "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==",
             "dev": true
         },
         "emoji-regex": {
@@ -2138,16 +2070,6 @@
                 "to-regex-range": "^5.0.1"
             }
         },
-        "find-up": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-            "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-            "dev": true,
-            "requires": {
-                "locate-path": "^6.0.0",
-                "path-exists": "^4.0.0"
-            }
-        },
         "flatpickr": {
             "version": "4.6.13",
             "resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-4.6.13.tgz",
@@ -2187,9 +2109,9 @@
             "integrity": "sha512-gOWo2hmdPjMQsQ+zTKbses08mDfDEMh4NneGQNP4qwePYujY1lguqP6gnbeJkf154gojWlBhIltlgnMfYjGHWA=="
         },
         "immutable": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz",
-            "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.2.2.tgz",
+            "integrity": "sha512-fTMKDwtbvO5tldky9QZ2fMX7slR0mYpY5nbnFWYp0fOzDhHqhgIw9KoYgxLWsoNTS9ZHGauHj18DTyEw6BK3Og==",
             "dev": true
         },
         "is-binary-path": {
@@ -2229,14 +2151,14 @@
             "dev": true
         },
         "jquery": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
-            "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
+            "version": "3.6.3",
+            "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz",
+            "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg=="
         },
         "jquery-ui-dist": {
-            "version": "1.13.1",
-            "resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.13.1.tgz",
-            "integrity": "sha512-Y711Pu4BRVrAlL58KSxX4ail74jaCJZaZcdNDLava+MgZeNwmVWmyYiK7KxyoJu1MB73eSunjJvYDbOuNrOA7w==",
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.13.2.tgz",
+            "integrity": "sha512-oVDRd1NLtTbBwpRKAYdIRgpWVDzeBhfy7Gu0RmY6JEaZtmBq6kDn1pm5SgDiAotrnDS+RoTRXO6xvcNTxA9tOA==",
             "requires": {
                 "jquery": ">=1.8.0 <4.0.0"
             }
@@ -2247,15 +2169,6 @@
             "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
             "dev": true
         },
-        "locate-path": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-            "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-            "dev": true,
-            "requires": {
-                "p-locate": "^5.0.0"
-            }
-        },
         "lodash.memoize": {
             "version": "4.1.2",
             "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -2269,9 +2182,9 @@
             "dev": true
         },
         "luxon": {
-            "version": "2.5.2",
-            "resolved": "https://registry.npmjs.org/luxon/-/luxon-2.5.2.tgz",
-            "integrity": "sha512-Yg7/RDp4nedqmLgyH0LwgGRvMEKVzKbUdkBYyCosbHgJ+kaOUx0qzSiSatVc3DFygnirTPYnMM2P5dg2uH1WvA=="
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.2.1.tgz",
+            "integrity": "sha512-QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg=="
         },
         "mathjax": {
             "version": "3.2.2",
@@ -2291,9 +2204,9 @@
             "dev": true
         },
         "node-releases": {
-            "version": "2.0.10",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz",
-            "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==",
+            "version": "2.0.8",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz",
+            "integrity": "sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==",
             "dev": true
         },
         "normalize-path": {
@@ -2317,30 +2230,6 @@
                 "boolbase": "^1.0.0"
             }
         },
-        "p-limit": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-            "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-            "dev": true,
-            "requires": {
-                "yocto-queue": "^0.1.0"
-            }
-        },
-        "p-locate": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-            "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-            "dev": true,
-            "requires": {
-                "p-limit": "^3.0.2"
-            }
-        },
-        "path-exists": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-            "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-            "dev": true
-        },
         "picocolors": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
@@ -2354,9 +2243,9 @@
             "dev": true
         },
         "postcss": {
-            "version": "8.4.14",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
-            "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
+            "version": "8.4.21",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
+            "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==",
             "dev": true,
             "requires": {
                 "nanoid": "^3.3.4",
@@ -2646,21 +2535,21 @@
             "dev": true
         },
         "rtlcss": {
-            "version": "3.5.0",
-            "resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-3.5.0.tgz",
-            "integrity": "sha512-wzgMaMFHQTnyi9YOwsx9LjOxYXJPzS8sYnFaKm6R5ysvTkwzHiB0vxnbHwchHQT65PTdBjDG21/kQBWI7q9O7A==",
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-4.0.0.tgz",
+            "integrity": "sha512-j6oypPP+mgFwDXL1JkLCtm6U/DQntMUqlv5SOhpgHhdIE+PmBcjrtAHIpXfbIup47kD5Sgja9JDsDF1NNOsBwQ==",
             "dev": true,
             "requires": {
-                "find-up": "^5.0.0",
+                "escalade": "^3.1.1",
                 "picocolors": "^1.0.0",
-                "postcss": "^8.3.11",
+                "postcss": "^8.4.6",
                 "strip-json-comments": "^3.1.1"
             }
         },
         "sass": {
-            "version": "1.53.0",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.53.0.tgz",
-            "integrity": "sha512-zb/oMirbKhUgRQ0/GFz8TSAwRq2IlR29vOUJZOx0l8sV+CkHUfHa4u5nqrG+1VceZp7Jfj59SVW9ogdhTvJDcQ==",
+            "version": "1.57.1",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.57.1.tgz",
+            "integrity": "sha512-O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw==",
             "dev": true,
             "requires": {
                 "chokidar": ">=3.0.0 <4.0.0",
@@ -2668,6 +2557,11 @@
                 "source-map-js": ">=0.6.2 <2.0.0"
             }
         },
+        "shortcut-buttons-flatpickr": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/shortcut-buttons-flatpickr/-/shortcut-buttons-flatpickr-0.4.0.tgz",
+            "integrity": "sha512-JKmT4my3Hm1e18OvG4Q6RcFhN4WRqqpTMkHrvZ7fup/dp6aTIWGVCHdRYtASkp/FCzDlJh6iCLQ/VcwwNpAMoQ=="
+        },
         "sortablejs": {
             "version": "1.15.0",
             "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz",
@@ -2746,9 +2640,9 @@
             }
         },
         "terser": {
-            "version": "5.14.2",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
-            "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
+            "version": "5.16.1",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz",
+            "integrity": "sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==",
             "dev": true,
             "requires": {
                 "@jridgewell/source-map": "^0.3.2",
@@ -2775,9 +2669,9 @@
             }
         },
         "update-browserslist-db": {
-            "version": "1.0.11",
-            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
-            "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
+            "version": "1.0.10",
+            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+            "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
             "dev": true,
             "requires": {
                 "escalade": "^3.1.1",
@@ -2808,30 +2702,24 @@
             "dev": true
         },
         "yargs": {
-            "version": "16.2.0",
-            "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-            "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+            "version": "17.6.2",
+            "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz",
+            "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==",
             "dev": true,
             "requires": {
-                "cliui": "^7.0.2",
+                "cliui": "^8.0.1",
                 "escalade": "^3.1.1",
                 "get-caller-file": "^2.0.5",
                 "require-directory": "^2.1.1",
-                "string-width": "^4.2.0",
+                "string-width": "^4.2.3",
                 "y18n": "^5.0.5",
-                "yargs-parser": "^20.2.2"
+                "yargs-parser": "^21.1.1"
             }
         },
         "yargs-parser": {
-            "version": "20.2.9",
-            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-            "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-            "dev": true
-        },
-        "yocto-queue": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-            "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+            "version": "21.1.1",
+            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+            "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
             "dev": true
         }
     }
diff --git a/htdocs/package.json b/htdocs/package.json
index e96bc3b44f..af460d4ef8 100644
--- a/htdocs/package.json
+++ b/htdocs/package.json
@@ -11,26 +11,27 @@
         "url": "https://github.com/openwebwork/webwork2"
     },
     "dependencies": {
-        "@fortawesome/fontawesome-free": "^6.0.0",
-        "bootstrap": "~5.1.3",
-        "codemirror": "^5.65.2",
-        "flatpickr": "^4.6.9",
+        "@fortawesome/fontawesome-free": "^6.2.1",
+        "bootstrap": "~5.2.3",
+        "codemirror": "^5.65.11",
+        "flatpickr": "^4.6.13",
         "iframe-resizer": "^4.3.2",
-        "jquery": "^3.6.0",
-        "jquery-ui-dist": "^1.13.1",
-        "luxon": "^2.5.2",
-        "mathjax": "^3.2.0",
-        "sortablejs": "^1.14.0"
+        "jquery": "^3.6.3",
+        "jquery-ui-dist": "^1.13.2",
+        "luxon": "^3.2.1",
+        "mathjax": "^3.2.2",
+        "shortcut-buttons-flatpickr": "^0.4.0",
+        "sortablejs": "^1.15.0"
     },
     "devDependencies": {
-        "autoprefixer": "^10.4.1",
+        "autoprefixer": "^10.4.13",
         "chokidar": "^3.5.3",
         "cssnano": "^6.0.0",
-        "postcss": "^8.4.5",
-        "rtlcss": "^3.5.0",
-        "sass": "^1.45.2",
-        "terser": "^5.10.0",
-        "yargs": "^16.2.0"
+        "postcss": "^8.4.21",
+        "rtlcss": "^4.0.0",
+        "sass": "^1.57.1",
+        "terser": "^5.16.1",
+        "yargs": "^17.6.2"
     },
     "browserslist": [
         "last 10 Chrome versions",
diff --git a/htdocs/show-source.cgi b/htdocs/show-source.cgi
index 5ef8268932..8cf298e894 100755
--- a/htdocs/show-source.cgi
+++ b/htdocs/show-source.cgi
@@ -1,72 +1,76 @@
 #!/usr/bin/env perl
 
-print "Content-type:  text/HTML\n\n";
+use strict;
+use warnings;
 
-$file = $ENV{PATH_INFO};
+print "Content-type: text/html\n\n";
 
-Error("Can't load specified file") if ($file =~ m!(\.\./|//|:|~)!);
-Error("Can't load specified file") if ($file !~ m!\.p[lg]$!);
+my $file = $ENV{PATH_INFO};
 
+Error(q{Can't load specified file.}) if $file =~ m!(\.\./|//|:|~)! || $file !~ m!\.p[lg]$!;
 
-#$root = '/usr/local/WeBWorK';
-$root = '/opt/webwork/';
-$filedir = $file; $filedir =~ s!/[^/]+$!!;
+my $root    = '/opt/webwork';
+my $filedir = $file =~ s!/[^/]+$!!r;
 $file =~ s!.*/!!;
 
-@PGdirs = (
-  "../templates$filedir",
-  "../templates/macros",
-#  "$root/local/macros",
-  "$root/pg/macros",
+my @PGdirs = (
+	"../templates$filedir",  '../templates/macros',      "$root/pg/macros",      "$root/pg/macros/answers",
+	"$root/pg/macros/capa",  "$root/pg/macros/contexts", "$root/pg/macros/core", "$root/pg/macros/deprecated",
+	"$root/pg/macros/graph", "$root/pg/macros/math",     "$root/pg/macros/misc", "$root/pg/macros/parsers",
+	"$root/pg/macros/ui",
 );
 
-foreach $dir (@PGdirs) {ShowSource("$dir/$file") if (-e "$dir/$file")}
+for my $dir (@PGdirs) { ShowSource("$dir/$file") if (-e "$dir/$file") }
 
-Error("Can't find specified file",join(",",@PGdirs).": ".$file);
+Error(qq{Can't find file "$file" in the following allowed locations:\n}, @PGdirs);
 
 sub Error {
-  print "<HTML>\n<HEAD>\n<TITLE>Show-Source Error</TITLE>\n</HEAD>\n";
-  print "<BODY>\n\n<H1>Show-Source Error:</H1>\n\n";
-  print join("\n",@_),"\n";
-  print "</BODY>\n</HTML>";
-  exit;
+	my @errors = @_;
+
+	print '<!DOCTYPE html><html lang="en-US"><head><meta charset="utf-8"><title>Show-Source Error</title></head>';
+	print '<body><h1>Show-Source Error:</h1><pre>';
+	print join("\n", @errors);
+	print '</pre></body></html>';
+
+	exit;
 }
 
 sub ShowSource {
-  my $file = shift;
-  my $name = $file; $name =~ s!.*/!!;
-
-  open(PGFILE,$file);
-  $program = join('',<PGFILE>);
-  close(PGFILE);
-
-  $program =~ s/&/\&amp;/g;
-  $program =~ s/</\&lt;/g;
-  $program =~ s/>/\&gt;/g;
-  $program =~ s/\t/        /g;
-  print "<HTML>\n<HEAD>\n<TITLE>Problem Source Code</TITLE>\n</HEAD>\n";
-  print "<BODY>\n\n<H1>Source Code for <CODE>$name</CODE>:</H1>\n\n";
-  print "<HR>\n<BLOCKQUOTE>\n";
-  print "<PRE>";
-  print MarkSource($program);
-  print "</PRE>\n";
-  print "</BLOCKQUOTE>\n<HR>\n";
-  print "</BODY>\n</HTML>\n";
-  exit;
+	my $file = shift;
+	my $name = $file;
+	$name =~ s!.*/!!;
+
+	open(my $pg_file, '<', $file);
+	my $program = join('', <$pg_file>);
+	close($pg_file);
+
+	$program =~ s/&/\&amp;/g;
+	$program =~ s/</\&lt;/g;
+	$program =~ s/>/\&gt;/g;
+
+	print '<!DOCTYPE html><html lang="en-US"><head><meta charset="utf-8"><title>Problem Source Code</title></head>';
+	print "<body><h1>Source Code for <code>$name</code>:</h1>";
+	print '<hr><blockquote>';
+	print '<pre style="tab-size:4;">';
+	print MarkSource($program);
+	print '</pre>';
+	print '</blockquote><hr>';
+	print '</body></html>';
+
+	exit;
 }
 
 sub MarkSource {
-  my $program = shift;
-  local $cgi = $ENV{SCRIPT_NAME};
-  $program =~ s/loadMacros *\(([^\)]*)\)/MakeLinks($1)/ge;
-  return $program;
+	my $program = shift;
+	$program =~ s/loadMacros *\(([^\)]*)\)/MakeLinks($1)/ge;
+	return $program;
 }
 
 sub MakeLinks {
-  my $macros = shift;
-  $macros =~ s!"([^\"<]*)"!"<A HREF="$cgi$filedir/\1">\1</A>"!g;
-  $macros =~ s!'([^\'<]*)'!'<A HREF="$cgi$filedir/\1">\1</A>'!g;
-  return 'loadMacros('.$macros.')';
+	my $macros = shift;
+	$macros =~ s!"([^\"<]*)"!"<a href="$ENV{SCRIPT_NAME}$filedir/$1">$1</a>"!g;
+	$macros =~ s!'([^\'<]*)'!'<a href="$ENV{SCRIPT_NAME}$filedir/$1">$1</a>'!g;
+	return "loadMacros($macros)";
 }
 
 1;
diff --git a/htdocs/themes/layouts b/htdocs/themes/layouts
new file mode 120000
index 0000000000..945c9b46d6
--- /dev/null
+++ b/htdocs/themes/layouts
@@ -0,0 +1 @@
+.
\ No newline at end of file
diff --git a/htdocs/themes/math4-green/gateway.template b/htdocs/themes/math4-green/gateway.template
deleted file mode 120000
index be20bd0efd..0000000000
--- a/htdocs/themes/math4-green/gateway.template
+++ /dev/null
@@ -1 +0,0 @@
-../math4/gateway.template
\ No newline at end of file
diff --git a/htdocs/themes/math4-green/images/maa_logo.png b/htdocs/themes/math4-green/images/maa_logo.png
deleted file mode 120000
index d43eee48c6..0000000000
--- a/htdocs/themes/math4-green/images/maa_logo.png
+++ /dev/null
@@ -1 +0,0 @@
-../../math4/images/maa_logo.png
\ No newline at end of file
diff --git a/htdocs/themes/math4-green/images/maa_logo.svg b/htdocs/themes/math4-green/images/maa_logo.svg
new file mode 120000
index 0000000000..d128251010
--- /dev/null
+++ b/htdocs/themes/math4-green/images/maa_logo.svg
@@ -0,0 +1 @@
+../../math4/images/maa_logo.svg
\ No newline at end of file
diff --git a/htdocs/themes/math4-green/system.html.ep b/htdocs/themes/math4-green/system.html.ep
new file mode 120000
index 0000000000..f7a74c7169
--- /dev/null
+++ b/htdocs/themes/math4-green/system.html.ep
@@ -0,0 +1 @@
+../math4/system.html.ep
\ No newline at end of file
diff --git a/htdocs/themes/math4-green/system.template b/htdocs/themes/math4-green/system.template
deleted file mode 120000
index 27c5fd2222..0000000000
--- a/htdocs/themes/math4-green/system.template
+++ /dev/null
@@ -1 +0,0 @@
-../math4/system.template
\ No newline at end of file
diff --git a/htdocs/themes/math4-red/gateway.template b/htdocs/themes/math4-red/gateway.template
deleted file mode 120000
index be20bd0efd..0000000000
--- a/htdocs/themes/math4-red/gateway.template
+++ /dev/null
@@ -1 +0,0 @@
-../math4/gateway.template
\ No newline at end of file
diff --git a/htdocs/themes/math4-red/images/maa_logo.png b/htdocs/themes/math4-red/images/maa_logo.png
deleted file mode 120000
index d43eee48c6..0000000000
--- a/htdocs/themes/math4-red/images/maa_logo.png
+++ /dev/null
@@ -1 +0,0 @@
-../../math4/images/maa_logo.png
\ No newline at end of file
diff --git a/htdocs/themes/math4-red/images/maa_logo.svg b/htdocs/themes/math4-red/images/maa_logo.svg
new file mode 120000
index 0000000000..d128251010
--- /dev/null
+++ b/htdocs/themes/math4-red/images/maa_logo.svg
@@ -0,0 +1 @@
+../../math4/images/maa_logo.svg
\ No newline at end of file
diff --git a/htdocs/themes/math4-red/system.html.ep b/htdocs/themes/math4-red/system.html.ep
new file mode 120000
index 0000000000..f7a74c7169
--- /dev/null
+++ b/htdocs/themes/math4-red/system.html.ep
@@ -0,0 +1 @@
+../math4/system.html.ep
\ No newline at end of file
diff --git a/htdocs/themes/math4-red/system.template b/htdocs/themes/math4-red/system.template
deleted file mode 120000
index 27c5fd2222..0000000000
--- a/htdocs/themes/math4-red/system.template
+++ /dev/null
@@ -1 +0,0 @@
-../math4/system.template
\ No newline at end of file
diff --git a/htdocs/themes/math4-yellow/_theme-colors.scss b/htdocs/themes/math4-yellow/_theme-colors.scss
index fd9c0419e9..9ef99947b9 100644
--- a/htdocs/themes/math4-yellow/_theme-colors.scss
+++ b/htdocs/themes/math4-yellow/_theme-colors.scss
@@ -32,3 +32,13 @@ $ww-logo-background-color: $info;
 
 // Achievment level bar
 $ww-achievement-level-color: darken($primary, 15%);
+
+// Make accordion buttons darker.
+$accordion-button-active-color: shade-color($primary, 50%);
+
+// Make the navbar colors dark.
+$navbar-dark-color:                 rgba(#000, .55);
+$navbar-dark-hover-color:           rgba(#000, .75);
+$navbar-dark-active-color:          #000;
+$navbar-dark-disabled-color:        rgba(#000, .25);
+$navbar-dark-toggler-border-color:  rgba(#000, .1);
diff --git a/htdocs/themes/math4-yellow/gateway.template b/htdocs/themes/math4-yellow/gateway.template
deleted file mode 120000
index be20bd0efd..0000000000
--- a/htdocs/themes/math4-yellow/gateway.template
+++ /dev/null
@@ -1 +0,0 @@
-../math4/gateway.template
\ No newline at end of file
diff --git a/htdocs/themes/math4-yellow/images/maa_logo.png b/htdocs/themes/math4-yellow/images/maa_logo.png
deleted file mode 120000
index d43eee48c6..0000000000
--- a/htdocs/themes/math4-yellow/images/maa_logo.png
+++ /dev/null
@@ -1 +0,0 @@
-../../math4/images/maa_logo.png
\ No newline at end of file
diff --git a/htdocs/themes/math4-yellow/images/maa_logo.svg b/htdocs/themes/math4-yellow/images/maa_logo.svg
new file mode 120000
index 0000000000..d128251010
--- /dev/null
+++ b/htdocs/themes/math4-yellow/images/maa_logo.svg
@@ -0,0 +1 @@
+../../math4/images/maa_logo.svg
\ No newline at end of file
diff --git a/htdocs/themes/math4-yellow/system.html.ep b/htdocs/themes/math4-yellow/system.html.ep
new file mode 120000
index 0000000000..f7a74c7169
--- /dev/null
+++ b/htdocs/themes/math4-yellow/system.html.ep
@@ -0,0 +1 @@
+../math4/system.html.ep
\ No newline at end of file
diff --git a/htdocs/themes/math4-yellow/system.template b/htdocs/themes/math4-yellow/system.template
deleted file mode 120000
index 27c5fd2222..0000000000
--- a/htdocs/themes/math4-yellow/system.template
+++ /dev/null
@@ -1 +0,0 @@
-../math4/system.template
\ No newline at end of file
diff --git a/htdocs/themes/math4/_theme-colors.scss b/htdocs/themes/math4/_theme-colors.scss
index e694db95ea..d4bee928aa 100644
--- a/htdocs/themes/math4/_theme-colors.scss
+++ b/htdocs/themes/math4/_theme-colors.scss
@@ -1,5 +1,5 @@
 /* WeBWorK Online Homework Delivery System
-* Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+* Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 *
 * This program is free software; you can redistribute it and/or modify it under
 * the terms of either: (a) the GNU General Public License as published by the
diff --git a/htdocs/themes/math4/achievements.scss b/htdocs/themes/math4/achievements.scss
index a3001a0948..32643922af 100644
--- a/htdocs/themes/math4/achievements.scss
+++ b/htdocs/themes/math4/achievements.scss
@@ -20,7 +20,7 @@
 }
 
 .levelinnerbar {
-	height: 16px;
+	height: 100%;
 	background-color: var(--ww-achievement-level-color, #88D);
 }
 
@@ -46,12 +46,12 @@
 }
 
 .cheevoinnerbar {
-	height: 6px;
+	height: 100%;
 	background-color: var(--ww-achievement-level-color, #88D);
 }
 
 .cheevo-toast-container {
-	z-index: 11;
+	z-index: 21;
 }
 
 .cheevo-toast img {
diff --git a/htdocs/themes/math4/bootstrap.scss b/htdocs/themes/math4/bootstrap.scss
index 6156fe9249..934255d767 100644
--- a/htdocs/themes/math4/bootstrap.scss
+++ b/htdocs/themes/math4/bootstrap.scss
@@ -39,6 +39,7 @@ $breadcrumb-active-color: #495057;
 
 // Include the remainder of bootstrap's scss configuration
 @import "../../node_modules/bootstrap/scss/variables";
+@import "../../node_modules/bootstrap/scss/maps";
 @import "../../node_modules/bootstrap/scss/mixins";
 @import "../../node_modules/bootstrap/scss/utilities";
 
@@ -63,6 +64,7 @@ $breadcrumb-active-color: #495057;
 @import "../../node_modules/bootstrap/scss/pagination";
 @import "../../node_modules/bootstrap/scss/badge";
 @import "../../node_modules/bootstrap/scss/alert";
+@import "../../node_modules/bootstrap/scss/placeholders";
 @import "../../node_modules/bootstrap/scss/progress";
 @import "../../node_modules/bootstrap/scss/list-group";
 @import "../../node_modules/bootstrap/scss/close";
@@ -88,12 +90,7 @@ $breadcrumb-active-color: #495057;
 }
 
 // Overrides
-.container-fluid {
-	padding-top: var(--#{$variable-prefix}gutter-x, #{$container-padding-x});
-	padding-bottom: var(--#{$variable-prefix}gutter-x, #{$container-padding-x});
-}
-
-a:focus {
+a:not(.btn):focus {
 	color: $link-hover-color;
 	outline-style: solid;
 	outline-color: $link-hover-color;
diff --git a/htdocs/themes/math4/gateway.scss b/htdocs/themes/math4/gateway.scss
index 470f841682..665b7dc866 100644
--- a/htdocs/themes/math4/gateway.scss
+++ b/htdocs/themes/math4/gateway.scss
@@ -22,22 +22,18 @@ div.gwMessage {
 	border-radius: 3px;
 }
 
-.Message {
-	display: block;
-}
-
 #gwTimer {
 	position: sticky;
 	width: 15em;
-	top: 0.75rem;
+	top: 2.75rem;
 	left: calc(100% - 15em - 0.75rem);
 	right: 0.75rem;
 	text-align: center;
-	z-index: 2;
+	z-index: 31;
 }
 
 .gwAlert {
-	z-index: 10;
+	z-index: 32;
 }
 
 #gwScoreSummary {
@@ -45,7 +41,7 @@ div.gwMessage {
 	color: black;
 	box-shadow: 3px 3px 0.5em darkgray;
 	font-family:Times serif;
-	z-index: 1;
+	z-index: 30;
 	font-size: 85%;
 	border-color: #ffeeaa;
 	border: 2px;
diff --git a/htdocs/themes/math4/gateway.template b/htdocs/themes/math4/gateway.template
deleted file mode 100644
index 15a2f6fa69..0000000000
--- a/htdocs/themes/math4/gateway.template
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE html>
-<html <!--#output_course_lang_and_dir-->>
-<!--  Note that the lang and dir attributes are now set during the
-      processing of the template and not hard-coded above.
--->
-<head>
-<meta charset='utf-8'>
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-
-<link rel="shortcut icon" href="<!--#url type="webwork" name="htdocs" file="images/favicon.ico"-->"/>
-<link rel="stylesheet" href="<!--#url type="webwork" name="theme" file="bootstrap.css"-->"/>
-<link rel="stylesheet" href="<!--#url type="webwork" name="htdocs" file="node_modules/@fortawesome/fontawesome-free/css/all.min.css"-->"/>
-<link rel="stylesheet" href="<!--#url type="webwork" name="theme" file="math4.css"-->"/>
-<link rel="stylesheet" href="<!--#url type="webwork" name="htdocs" file="node_modules/jquery-ui-dist/jquery-ui.min.css"-->"/>
-<!--#if can="output_achievement_CSS"-->
-<link rel="stylesheet" href="<!--#url type="webwork" name="theme" file="achievements.css"-->"/>
-<!--#endif-->
-<link rel="stylesheet" href="<!--#url type="webwork" name="theme" file="gateway.css"-->"/>
-<!--#if exists="math4-overrides.css"-->
-<link rel="stylesheet" href="<!--#url type="webwork" name="theme" file="math4-overrides.css"-->"/>
-<!--#endif-->
-<script src="<!--#url type="webwork" name="htdocs" file="js/apps/MathJaxConfig/mathjax-config.js"-->" defer></script>
-<script src="<!--#url type="webwork" name="htdocs" file="node_modules/mathjax/es5/tex-svg.js"-->" id="MathJax-script" defer></script>
-<script src="<!--#url type="webwork" name="htdocs" file="node_modules/jquery/dist/jquery.min.js"-->"></script>
-<script src="<!--#url type="webwork" name="htdocs" file="node_modules/jquery-ui-dist/jquery-ui.min.js"-->"></script>
-<script src="<!--#url type="webwork" name="htdocs" file="node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"-->" defer></script>
-<script src="<!--#url type="webwork" name="theme" file="math4.js"-->" defer></script>
-<!--#if exists="math4-overrides.js"-->
-<script src="<!--#url type="webwork" name="theme" file="math4-overrides.js"-->" defer></script>
-<!--#endif-->
-<!-- [gateway] since the left-side menus are gone, don't indent the main content area -->
-
-<title><!--#path style="text" text=" : " textonly="1"--></title>
-<!--#output_JS-->
-<!--#head-->
-</head>
-<body>
-<a href="#content" id="stmc-link" class="sr-only sr-only-focusable">Skip to main content</a>
-
-<div class="container-fluid">
-<!-- Header -->
-<div id = "masthead" class="row">
-	<div class="col-md-2 webwork_logo">
-		<!--#webwork_logo-->
-	</div>
-	<div class="col-md-6 institution_logo">
-		<!--#institution_logo-->
-	</div>
-	<div id="loginstatus" class="col-md-4">
-		<!--#loginstatus-->
-	</div>
-</div>
-
-<!-- Breadcrumb -->
-<div id="breadcrumb-row" class="row my-2">
-	<div class="col-12 d-flex align-items-center">
-		<nav id="breadcrumb-navigation" aria-label="breadcrumb navigation" class="w-100">
-			<ol class="breadcrumb">
-				<!--#path style="bootstrap" text=""-->
-			</ol>
-		</nav>
-	</div>
-</div>
-
-<div class="row">
-	<div id="content" class="col-12 toggle-width">
-		<!--#if can="info"-->
-			<!--#info-->
-		<!--#endif-->
-
-		<!--#if can="nav"-->
-			<!--#nav-->
-		<!--#endif-->
-
-		<!--#if can="title"-->
-			<h1><!--#title--></h1>
-		<!--#endif-->
-
-		<!--#if can="message"-->
-			<div class="Message"><!--#message--></div>
-		<!--#endif-->
-
-		<!--#if can="body"-->
-		<div class="Body" <!--#output_problem_lang_and_dir-->>
-			<!--#body-->
-		</div>
-		<!--#endif-->
-
-		<!--#if warnings="1"-->
-		<div class="Warnings">
-			<!--#warnings-->
-		</div>
-		<!--#endif-->
-	</div> <!-- #content -->
-</div><!-- .row -->
-</div><!-- .container-fluid -->
-
-<!-- Footer -->
-<div id="footer">
-	<!--#footer-->
-</div>
-
-</body>
-</html>
-
-
diff --git a/htdocs/themes/math4/images/maa_logo.png b/htdocs/themes/math4/images/maa_logo.png
deleted file mode 100644
index 6f1d84c9aa..0000000000
Binary files a/htdocs/themes/math4/images/maa_logo.png and /dev/null differ
diff --git a/htdocs/themes/math4/images/maa_logo.svg b/htdocs/themes/math4/images/maa_logo.svg
new file mode 100644
index 0000000000..34e790ed55
--- /dev/null
+++ b/htdocs/themes/math4/images/maa_logo.svg
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?><svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="300px" height="120.6px">
+<path fill="#ffffff" stroke="#3256A4" d="M225.2,108.11c-2.77,0-3.97,2.72-3.97,6.15c0,3.42,1.17,6.12,3.94,6.12c2.75,0,3.96-2.72,3.96-6.15
+	C229.12,110.81,227.95,108.11,225.2,108.11z M225.2,118.26c-1.28,0-1.8-1.49-1.8-4.03s0.49-3.99,1.77-3.99
+	c1.26,0,1.79,1.49,1.79,4.03C226.95,116.8,226.45,118.26,225.2,118.26z M213.62,108.3h1.94v11.9h-2.04l-2.19-5.3
+	c-0.31-0.75-0.68-1.72-0.9-2.41c0.01,0.73,0.03,1.96,0.03,2.7v5.01h-1.94v-11.9h2.14l2.09,5.22c0.29,0.71,0.71,1.82,0.94,2.48
+	c-0.01-0.73-0.07-2.02-0.07-2.77V108.3z M194.88,108.3H197v11.9h-2.13V108.3z M230.89,108.3h6.27v2.06h-4.15v2.63h2.79v2.06h-2.79
+	v5.15h-2.13V108.3z M202.83,108.11c-2.77,0-3.97,2.72-3.97,6.15c0,3.42,1.17,6.12,3.94,6.12c2.75,0,3.96-2.72,3.96-6.15
+	C206.76,110.81,205.59,108.11,202.83,108.11z M202.83,118.26c-1.27,0-1.8-1.49-1.8-4.03s0.49-3.99,1.77-3.99
+	c1.26,0,1.79,1.49,1.79,4.03C204.58,116.8,204.09,118.26,202.83,118.26z M275.8,15.25h-11.86l-18.68,76.04l-18.58-76.04h-11.86
+	l-19.81,80.61v1.57h-0.39l0,0h12.21l4.7-21.72h17.84l4.81,21.72h9.55h3.01h9.2l4.7-21.72h17.84l4.81,21.72h12.56L275.8,15.25z
+	 M213.89,64.8l3.05-13.85c1.18-5.52,2.94-14.91,3.52-17.97c0.59,3.05,2.35,12.56,3.52,17.97l3.05,13.85H213.89z M263,64.8
+	l3.05-13.85c1.18-5.52,2.94-14.91,3.52-17.97c0.59,3.05,2.35,12.56,3.52,17.97l3.05,13.85H263z M279.41,108.3h2.13v11.9h-2.13V108.3
+	z M288.82,116.56l1.83,0.78c-0.56,1.96-1.6,3.04-3.42,3.04c-2.63,0-3.86-2.7-3.86-6.12c0-3.43,1.26-6.15,3.89-6.15
+	c2.02,0,2.91,1.29,3.36,3.01l-1.99,0.64c-0.3-1.09-0.63-1.53-1.41-1.53c-1.14,0-1.68,1.46-1.68,3.99s0.56,4.03,1.72,4.03
+	C288.01,118.26,288.38,117.85,288.82,116.56z M245.06,108.3l-3.04,11.9h2.18l0.56-2.48h2.67l0.56,2.48h2.19l-3.04-11.9H245.06z
+	 M245.22,115.73l0.32-1.44c0.22-0.97,0.46-2.24,0.54-2.86c0.09,0.6,0.36,1.97,0.56,2.89l0.32,1.41H245.22z M296.71,108.3h-2.07
+	l-3.04,11.9h2.17l0.56-2.48H297l0.56,2.48h2.19L296.71,108.3z M294.79,115.73l0.32-1.44c0.22-0.97,0.46-2.24,0.54-2.86
+	c0.09,0.6,0.36,1.97,0.56,2.89l0.32,1.41H294.79z M195.01,95.86l-0.39,1.57H182.7V64.71c0-5.11,0.13-16.94,0.26-20.07
+	c-1.02,3.25-4.87,15.09-6.93,21l-11.56,32.17l-11.53-32.17c-2.05-5.92-5.9-17.75-6.93-21c0.13,3.14,0.26,14.97,0.26,20.07v32.72
+	h-11.8V16.21h13.21l11.55,33.77c1.67,4.87,4.74,14.85,5.52,17.75c0.89-3.02,3.97-13.34,5.64-18.1l11.55-33.42h13.09V95.86z
+	 M277.62,112c0-2.46-1.48-3.7-3.79-3.7h-3.16v11.9h2.12v-4.52h0.7l1.85,4.52h2.31l-2.04-4.95
+	C276.77,114.71,277.62,113.67,277.62,112z M273.85,113.69h-1.05v-3.32h0.94c1.28,0,1.77,0.6,1.77,1.67
+	C275.5,113.13,274.94,113.69,273.85,113.69z M258.3,108.3h2.11v11.9h-1.94v-3.84c0-1.41,0.02-2.72,0.03-3.6
+	c-0.24,0.85-0.63,2.17-1.07,3.53l-1.38,4.22l-1.38-4.22c-0.43-1.34-0.83-2.68-1.07-3.53c0.02,0.88,0.04,2.19,0.04,3.6v3.84h-1.9
+	v-11.9h2.14l1.41,4.4c0.35,1.11,0.7,2.13,0.8,2.68c0.12-0.6,0.46-1.63,0.8-2.68L258.3,108.3z M264.72,118.16h4.13v2.04h-6.26v-11.9
+	h6.1v2.04h-3.97v2.51h2.67v2.01h-2.67V118.16z M59.62,108.3h2.13v11.9h-2.13v-5.13H56.9v5.13h-2.13v-11.9h2.13v4.69h2.72V108.3z
+	 M85.28,108.3l-3.04,11.9h2.17l0.56-2.48h2.67l0.56,2.48h2.19l-3.04-11.9H85.28z M85.43,115.73l0.32-1.44
+	c0.22-0.97,0.46-2.24,0.54-2.86c0.09,0.6,0.36,1.97,0.56,2.89l0.32,1.41H85.43z M186.23,108.3h7.05v2.04h-2.47v9.86h-2.12v-9.86
+	h-2.47V108.3z M98.79,108.3h2.13v11.9h-2.13V108.3z M99.31,90.73c0-0.54-0.26-1.09-0.71-1.39c-0.43-0.27-0.94-0.28-1.43-0.28h-2.35
+	v5.58h1.3v-2.21h0.95l0.85,2.21h1.45l-1.04-2.47C98.95,91.95,99.31,91.36,99.31,90.73z M97.64,91.36c-0.24,0.14-0.53,0.11-0.8,0.11
+	h-0.72v-1.42h0.68c0.24,0,0.62-0.03,0.84,0.11c0.18,0.11,0.31,0.34,0.31,0.56C97.96,90.96,97.85,91.22,97.64,91.36z M78.57,108.3
+	h2.11v11.9h-1.94v-3.84c0-1.41,0.02-2.72,0.03-3.6c-0.24,0.85-0.63,2.17-1.07,3.53l-1.38,4.22l-1.38-4.22
+	c-0.43-1.34-0.83-2.68-1.07-3.53c0.02,0.88,0.04,2.19,0.04,3.6v3.84h-1.9v-11.9h2.14l1.41,4.4c0.36,1.11,0.7,2.13,0.8,2.68
+	c0.12-0.6,0.46-1.63,0.79-2.68L78.57,108.3z M97.1,86.83c-2.76,0-5.01,2.25-5.01,5.01c0,2.76,2.25,5,5.01,5c2.76,0,5.01-2.25,5.01-5
+	C102.11,89.08,99.86,86.83,97.1,86.83z M97.1,96.15c-2.38,0-4.31-1.94-4.31-4.31c0-2.38,1.93-4.32,4.31-4.32
+	c2.38,0,4.32,1.94,4.32,4.32C101.41,94.22,99.48,96.15,97.1,96.15z M41.35,108.3l-3.04,11.9h2.17l0.56-2.48h2.67l0.56,2.48h2.19
+	l-3.04-11.9H41.35z M41.5,115.73l0.32-1.44c0.22-0.97,0.46-2.24,0.54-2.86c0.09,0.6,0.36,1.97,0.56,2.89l0.32,1.41H41.5z
+	 M34.64,108.3h2.11v11.9h-1.94v-3.84c0-1.41,0.02-2.72,0.03-3.6c-0.24,0.85-0.63,2.17-1.07,3.53l-1.38,4.22l-1.38-4.22
+	c-0.43-1.34-0.83-2.68-1.07-3.53c0.02,0.88,0.04,2.19,0.04,3.6v3.84h-1.9v-11.9h2.14l1.41,4.4c0.36,1.11,0.7,2.13,0.8,2.68
+	c0.12-0.6,0.46-1.63,0.8-2.68L34.64,108.3z M46.21,108.3h7.05v2.04H50.8v9.86h-2.13v-9.86h-2.46V108.3z M66.06,118.16h4.13v2.04
+	h-6.25v-11.9h6.1v2.04h-3.98v2.51h2.67v2.01h-2.67V118.16z M90.14,108.3h7.05v2.04h-2.46v9.86H92.6v-9.86h-2.46V108.3z
+	 M108.2,116.56l1.84,0.78c-0.56,1.96-1.6,3.04-3.42,3.04c-2.63,0-3.86-2.7-3.86-6.12c0-3.43,1.26-6.15,3.89-6.15
+	c2.02,0,2.91,1.29,3.36,3.01l-1.99,0.64c-0.31-1.09-0.63-1.53-1.41-1.53c-1.14,0-1.68,1.46-1.68,3.99s0.56,4.03,1.72,4.03
+	C107.39,118.26,107.76,117.85,108.2,116.56z M160.29,108.11c-2.77,0-3.97,2.72-3.97,6.15c0,3.42,1.17,6.12,3.94,6.12
+	c2.75,0,3.96-2.72,3.96-6.15C164.22,110.81,163.05,108.11,160.29,108.11z M160.29,118.26c-1.28,0-1.8-1.49-1.8-4.03
+	s0.49-3.99,1.77-3.99c1.26,0,1.79,1.49,1.79,4.03C162.05,116.8,161.55,118.26,160.29,118.26z M171,116.56l1.84,0.78
+	c-0.56,1.96-1.6,3.04-3.42,3.04c-2.63,0-3.86-2.7-3.86-6.12c0-3.43,1.26-6.15,3.89-6.15c2.02,0,2.91,1.29,3.36,3.01l-1.99,0.64
+	c-0.3-1.09-0.62-1.53-1.41-1.53c-1.14,0-1.68,1.46-1.68,3.99s0.56,4.03,1.72,4.03C170.19,118.26,170.56,117.85,171,116.56z
+	 M174.55,108.3h2.13v11.9h-2.13V108.3z M181.37,108.3l-3.04,11.9h2.18l0.56-2.48h2.67l0.56,2.48h2.19l-3.04-11.9H181.37z
+	 M181.52,115.73l0.32-1.44c0.22-0.97,0.46-2.24,0.54-2.86c0.09,0.6,0.36,1.97,0.56,2.89l0.32,1.41H181.52z M155.23,116.99
+	c0,1.97-1.36,3.4-3.57,3.4c-1.62,0-2.74-0.85-3.55-1.87l1.45-1.55c0.71,0.92,1.48,1.36,2.19,1.36c0.88,0,1.32-0.49,1.32-1.29
+	c0-0.68-0.42-1.22-1.82-1.94c-1.77-0.92-2.84-1.82-2.84-3.79c0-1.78,1.33-3.19,3.33-3.19c1.48,0,2.4,0.6,3.25,1.7l-1.41,1.41
+	c-0.7-0.78-1.07-1.05-1.89-1.05c-0.68,0-1.12,0.44-1.12,1.04c0,0.71,0.41,1.15,1.7,1.85C154.33,114.16,155.23,114.98,155.23,116.99z
+	 M122.82,118.12h3.72v2.07h-5.85v-11.9h2.13V118.12z M114.02,108.3l-3.04,11.9h2.17l0.56-2.48h2.67l0.56,2.48h2.19l-3.04-11.9
+	H114.02z M114.17,115.73l0.32-1.44c0.22-0.97,0.46-2.24,0.54-2.86c0.09,0.6,0.36,1.97,0.56,2.89l0.32,1.41H114.17z M147.43,116.99
+	c0,1.97-1.36,3.4-3.57,3.4c-1.62,0-2.74-0.85-3.55-1.87l1.45-1.55c0.71,0.92,1.48,1.36,2.19,1.36c0.88,0,1.32-0.49,1.32-1.29
+	c0-0.68-0.42-1.22-1.82-1.94c-1.77-0.92-2.84-1.82-2.84-3.79c0-1.78,1.33-3.19,3.33-3.19c1.48,0,2.4,0.6,3.25,1.7l-1.41,1.41
+	c-0.7-0.78-1.07-1.05-1.89-1.05c-0.68,0-1.12,0.44-1.12,1.04c0,0.71,0.41,1.15,1.7,1.85C146.53,114.16,147.43,114.98,147.43,116.99z
+	 M134.51,108.3l-3.04,11.9h2.18l0.56-2.48h2.67l0.56,2.48h2.19l-3.04-11.9H134.51z M134.67,115.73l0.32-1.44
+	c0.22-0.97,0.46-2.24,0.54-2.86c0.09,0.6,0.36,1.97,0.56,2.89l0.32,1.41H134.67z M84.02,0.1H28.08L0.25,48.75L28.09,97.4h56.18
+	l27.59-48.9L84.02,0.1z M75.93,22.81l1.22,0.93l-3.37,2.47l0.01-1.68L75.93,22.81z M73.79,23.57l0.01-2.38l1.52,1.16L73.79,23.57z
+	 M77.77,24.2l1.4,1.06l-5.4,4.07l0.01-2.21L77.77,24.2z M79.78,25.73l1.14,0.87l-7.17,5.29l0.01-1.62L79.78,25.73z M81.54,27.07
+	l1.32,1l-9.11,6.81l0.01-2.07L81.54,27.07z M83.48,28.54l1.17,0.89L73.74,37.8l0.01-1.99L83.48,28.54z M85.26,29.89l1.1,0.83
+	l-12.63,9.83l0.01-1.82L85.26,29.89z M86.97,31.19l1.3,0.99L73.72,43.41l0.01-1.91L86.97,31.19z M73.75,44.31l15.12-11.67l1.27,0.96
+	L73.71,46.4l0.01-2.14L73.75,44.31z M90.75,34.06l1.17,0.89l-18.23,14l0.01-1.61L90.75,34.06z M92.54,35.42l1.27,0.96L73.69,52.04
+	l0.01-2.16L92.54,35.42z M94.41,36.84l1.24,0.94L73.68,54.75l0.01-1.76L94.41,36.84z M96.26,38.24l1.16,0.88L73.67,57.67l0.01-1.99
+	L96.26,38.24z M98.04,39.59l1.22,0.92l-25.6,19.8l0.01-1.71L98.04,39.59z M99.86,40.98l1.2,0.91L73.64,63.27l0.01-2.01L99.86,40.98z
+	 M101.67,42.35l1.32,1.01L73.63,66.23l0.01-2.02L101.67,42.35z M103.6,43.82l1.26,0.96L73.62,68.82l0.01-1.65l0,0L103.6,43.82z
+	 M105.48,45.24l1.12,0.85L73.61,71.59l0.01-1.84L105.48,45.24z M107.21,46.55l1.28,0.97L73.6,74.67l0.01-2.15L107.21,46.55z
+	 M108.48,45.61l-2.13-1.65l0.63-0.95L108.48,45.61z M106.57,42.29l-0.8,1.22l-1.14-0.88l1.15-1.71L106.57,42.29z M105.37,40.2
+	l-1.32,1.96l-1.38-1.07l1.67-2.7L105.37,40.2z M103.91,37.67l-1.84,2.97l-1.2-0.93l2.18-3.52L103.91,37.67z M102.71,35.58
+	l-0.11-0.07l-2.31,3.74l-1.3-1.01l2.74-4.36L102.71,35.58z M101.34,33.19l-0.03-0.02l-2.9,4.61l-1.13-0.88l3.22-5.18L101.34,33.19z
+	 M100.13,31.08l-0.07-0.04l-3.37,5.41l-1.58-1.23l0.45,0.27l3.58-6.12L100.13,31.08z M98.72,28.63l-3.78,6.46l-1.35-1.05l4.3-6.84
+	L98.72,28.63z M97.48,26.47L93,33.59l-1.02-0.8l4.6-7.87L97.48,26.47z M96.31,24.44l-0.23-0.13l-4.69,8.02l-1.25-0.97l5.12-8.74
+	L96.31,24.44z M94.84,21.89l-5.29,9.02l-1.36-1.06l5.78-9.47L94.84,21.89z M93.55,19.65l-5.95,9.74l-1.19-0.93l6.29-10.3
+	L93.55,19.65z M92.28,17.43l-6.46,10.57l-1.25-0.97l6.81-11.16L92.28,17.43z M90.97,15.15l-6.98,11.43l-1.24-0.96l7.33-12
+	L90.97,15.15z M89.66,12.89l-7.5,12.28l-1.21-0.94l7.84-12.84L89.66,12.89z M88.38,10.65l-8.01,13.12l-1.28-1l8.38-13.72
+	L88.38,10.65z M87.04,8.33L78.5,22.32l-1.21-0.94l8.89-14.56L87.04,8.33z M85.75,6.09L76.7,20.92l-1.11-0.86l9.3-15.47L85.75,6.09z
+	 M84.47,3.86L75,19.6l-1.18-0.92l9.76-16.38L84.47,3.86z M29.35,2.32L71.16,19L22.75,47.37L29.35,2.32z M26.85,79.21l-0.27-1.95
+	l24.89-10.73l2.32,1.35L26.85,79.21z M54.58,68.34l2.14,1.25L27.23,81.92l-0.27-1.96L54.58,68.34z M26.48,76.5l-0.29-2.12
+	l22.25-9.62l2.24,1.31L26.48,76.5z M26.08,73.62l-0.29-2.08l19.76-8.46l2.1,1.22L26.08,73.62z M25.69,70.77l-0.31-2.27l17.05-7.26
+	l2.33,1.36L25.69,70.77z M25.27,67.75l-0.28-1.99l14.69-6.11l1.95,1.14L25.27,67.75z M24.89,65l-0.29-2.12l12.03-5.01l2.26,1.32
+	L24.89,65z M24.49,62.11l-0.28-2.05l9.34-4l2.27,1.33L24.49,62.11z M24.1,59.31l-0.3-2.16l6.63-2.9l2.32,1.35L24.1,59.31z
+	 M23.7,56.39l-0.27-1.95l4.12-1.87l2.09,1.22L23.7,56.39z M23.33,53.68l-0.3-2.16l1.61-0.65l2.13,1.24L23.33,53.68z M22.92,50.77
+	l-0.13-0.97l1.04,0.61L22.92,50.77z M27.62,3.89l-6.47,44.12H2.38L27.62,3.89z M2.38,49.49h0.79l0.24,1.8L2.38,49.49z M4.38,52.98
+	l-0.46-3.49h1.93l1.04,7.87L4.38,52.98z M7.86,59.06L6.6,49.49h1.95l1.85,13.99L7.86,59.06z M11.36,65.18L9.29,49.49h1.9l2.64,20
+	L11.36,65.18z M14.8,71.19l-2.86-21.69h1.86l3.42,25.92L14.8,71.19z M18.18,77.11l-3.64-27.61h1.9l4.21,31.93L18.18,77.11z
+	 M21.62,83.11l-4.43-33.62h1.9l5,37.94L21.62,83.11z M25.06,89.13l-5.22-39.64h1.41l6.01,43.48L25.06,89.13z M27.33,82.68
+	l30.19-12.62l2.07,1.21l-31.98,13.4L27.33,82.68z M28.03,87.75l-0.32-2.33l32.67-13.69l2.42,1.41L28.03,87.75z M28.14,88.51
+	L63.6,73.6l2.15,1.25L28.41,90.5L28.14,88.51z M28.52,91.26l38.02-15.94l2.06,1.2L28.79,93.23L28.52,91.26z M29.05,95.12l-0.16-1.14
+	l40.5-17.01l1.78,1.04L29.05,95.12z M72.11,76.85L23.63,48.57l1.24-0.72l47.25,27.23L72.11,76.85z M72.12,74.22L25.6,47.41
+	l1.31-0.77l45.21,26.19L72.12,74.22z M72.13,71.97L27.65,46.21l1.57-0.92l42.91,24.86L72.13,71.97z M72.14,69.29L29.96,44.86
+	l1.34-0.79l40.84,23.32L72.14,69.29z M72.15,66.54l-40.11-22.9l1.49-0.87l38.63,22.44L72.15,66.54z M72.16,64.36L34.26,42.34
+	l1.38-0.81l36.52,20.98L72.16,64.36z M72.17,61.66L36.38,41.1l1.35-0.79l34.45,19.51L72.17,61.66z M72.18,58.98l-33.72-19.1
+	l1.78-1.04l31.94,18.53L72.18,58.98z M72.19,56.51L40.98,38.4l1.49-0.87l29.73,17.08L72.19,56.51z M72.2,53.76L43.2,37.1l1.57-0.92
+	l27.43,15.8L72.2,53.76z M72.21,51.13l-26.7-15.38l1.3-0.76l25.41,14.55L72.21,51.13z M72.22,48.69L47.54,34.56l1.39-0.81
+	l23.29,13.29L72.22,48.69z M72.23,46.19L49.67,33.31l1.86-1.09l20.71,12.35L72.23,46.19z M72.23,43.72L52.25,31.8l1.59-0.93
+	l18.4,10.77L72.23,43.72z M72.25,40.79L54.57,30.44l1.18-0.69l16.5,9.49L72.25,40.79z M72.25,38.39l-15.77-9.07l1.48-0.87
+	l14.29,8.18L72.25,38.39z M72.26,35.78L58.7,28.02l1.57-0.92l11.94,6.94l0.05-0.09L72.26,35.78z M72.27,33.21l-11.26-6.55l1.3-0.76
+	l9.97,5.57L72.27,33.21z M72.28,30.63l-9.23-5.16l1.86-1.09l7.38,4.53L72.28,30.63z M72.29,28.04l-6.66-4.09l1.35-0.79l5.32,3.11
+	L72.29,28.04z M72.3,25.43l-4.6-2.69l1.34-0.79c1.26,0.74,2.75,1.62,3.26,1.96L72.3,25.43z M72.31,23.04
+	c-0.51-0.32-1.32-0.8-2.53-1.51l2.55-1.49L72.31,23.04z M31.5,1.58h50.78l-9.75,16.36L31.5,1.58z M73.6,75.61l35.5-27.62l0.68,0.52
+	L73.59,76.62L73.6,75.61z M83.82,95.18l-10-16.86l1.58-1.22L85.05,93L83.82,95.18z M85.47,92.26l-9.49-15.62l1.55-1.2l9.1,14.76
+	L85.47,92.26z M87.04,89.47l-8.93-14.48l1.54-1.19l8.48,13.75L87.04,89.47z M88.55,86.8l-8.31-13.47l1.54-1.2l7.89,12.68L88.55,86.8
+	z M90.08,84.08l-7.71-12.4l1.82-1.42l7.15,11.59L90.08,84.08z M91.76,81.11l-6.97-11.31l1.61-1.25l6.5,10.55L91.76,81.11z
+	 M93.3,78.37L86.98,68.1l1.78-1.39l5.81,9.41L93.3,78.37z M94.98,75.39l-5.64-9.13l1.58-1.23l5.19,8.35L94.98,75.39z M96.53,72.65
+	l-5.01-8.07l1.86-1.45l4.37,7.36L96.53,72.65z M98.17,69.74l-4.2-7.07l1.43-1.11l3.78,6.39L98.17,69.74z M99.6,67.21l-3.61-6.11
+	l1.71-1.33l3.17,5.18L99.6,67.21z M101.29,64.21l-3-4.9l1.56-1.21l2.57,4.1L101.29,64.21z M102.84,61.47l-2.39-3.82l1.69-1.31
+	l1.94,2.95L102.84,61.47z M104.47,58.56l-1.76-2.68l1.66-1.29l1.28,1.88L104.47,58.56z M106.06,55.76l-1.1-1.62l1.62-1.26l0.63,0.83
+	L106.06,55.76z M107.61,53.01l-0.45-0.59l1.38-1.07L107.61,53.01z"/>
+</svg>
diff --git a/htdocs/themes/math4/math4.js b/htdocs/themes/math4/math4.js
index 4084d87d9e..b180770fc9 100644
--- a/htdocs/themes/math4/math4.js
+++ b/htdocs/themes/math4/math4.js
@@ -18,13 +18,12 @@
 	if (navigation_element) {
 		const threshold = 768
 		let currentWidth = window.innerWidth;
-		const toggle_icon = document.querySelector('#toggle-sidebar-icon i');
 		const content = document.getElementById('content');
 
 		const toggleSidebar = () => {
 			navigation_element.classList.toggle('toggle-width');
+			navigation_element.classList.remove('invisible');
 			content.classList.toggle('toggle-width');
-			toggle_icon?.classList.toggle('toggle-icon');
 
 			if (currentWidth < threshold) {
 				const overlay = document.createElement('div');
@@ -34,7 +33,6 @@
 					overlay.remove();
 					navigation_element.classList.toggle('toggle-width');
 					content.classList.toggle('toggle-width');
-					toggle_icon?.classList.toggle('toggle-icon');
 					document.body.classList.remove('no-scroll');
 				});
 				document.body.classList.add('no-scroll');
@@ -43,8 +41,21 @@
 
 		document.getElementById('toggle-sidebar')?.addEventListener('click', toggleSidebar);
 
+		if (currentWidth < threshold) navigation_element.classList.add('invisible');
+
+		navigation_element.addEventListener('transitionend', () => {
+			if (
+				(window.innerWidth >= threshold && navigation_element.classList.contains('toggle-width')) ||
+				(window.innerWidth < threshold && !navigation_element.classList.contains('toggle-width'))
+			)
+				navigation_element.classList.add('invisible');
+		});
+
 		// If the window width changes open or close the sidebar appropriately.
 		window.addEventListener('resize', () => {
+			if (!navigation_element.classList.contains('toggle-width') && window.innerWidth >= threshold)
+				navigation_element.classList.remove('invisible');
+
 			if ((navigation_element.classList.contains('toggle-width') &&
 				window.innerWidth < threshold && currentWidth >= threshold) ||
 				(navigation_element.classList.contains('toggle-width') &&
@@ -59,37 +70,6 @@
 		});
 	}
 
-	// Open help in a new window on a helpMacro click.
-	document.querySelectorAll('.help-macro').forEach((helpLink) =>
-		helpLink.addEventListener('click',
-			() => window.open(helpLink.href, helpLink.target, 'width=550,height=350,scrollbars=yes,resizable=yes'))
-	);
-
-	// Focus on an alert-danger element if one is around and focusable.
-	Array.from(document.querySelectorAll('.alert-danger')).shift()?.focus();
-
-	// ComboBox (see lib/WeBWorK/HTML/ComboBox.pm)
-	// This changes the textbox text to the currently selected option in the select menu.
-	document.querySelectorAll('.combo-box').forEach((comboBox) => {
-		const comboBoxText = comboBox.querySelector('.combo-box-text');
-		const comboBoxSelect = comboBox.querySelector('.combo-box-select');
-
-		if (!comboBoxText || !comboBoxSelect) return;
-
-		// Try to select best option in select menu as user types in the textbox.
-		comboBoxText.addEventListener('keyup', () => {
-			let i = 0;
-			for (;
-				i < comboBoxSelect.options.length && comboBoxSelect.options[i].value.indexOf(comboBoxText.value) != 0;
-				++i) {}
-			comboBoxSelect.selectedIndex = i;
-		});
-
-		// Set the textbox text to be same as that of select menu
-		comboBoxSelect.addEventListener('change',
-			() => comboBoxText.value = comboBoxSelect.options[comboBoxSelect.selectedIndex].value);
-	});
-
 	// Turn help boxes into popovers
 	document.querySelectorAll('.help-popup').forEach((popover) => {
 		new bootstrap.Popover(popover, {trigger: 'hover focus'});
@@ -101,7 +81,7 @@
 	);
 
 	// Set up popovers in the attemptResults table.
-	document.querySelectorAll('table.attemptResults td span.answer-preview').forEach((popover) => {
+	document.querySelectorAll('table.attemptResults td div.answer-preview').forEach((popover) => {
 		if (popover.dataset.bsContent) new bootstrap.Popover(popover, {trigger: 'click', html: true, sanitize: false});
 	});
 
@@ -140,6 +120,24 @@
 	const codeshards = document.querySelectorAll('.codeshard');
 	if (codeshards.length == 1) codeshards[0].setAttribute('aria-label', 'answer');
 
+	const messages = document.querySelectorAll('#message .alert-dismissible, #message_bottom .alert-dismissible');
+	if (messages.length) {
+		const dismissBtn = document.getElementById('dismiss-messages-btn');
+		dismissBtn?.classList.remove('d-none');
+
+		// Hide the dismiss button when the last alert is dismissed.
+		for (const message of messages) {
+			message.addEventListener('closed.bs.alert', () => {
+				if (!document.querySelector('#message .alert-dismissible, #message_bottom .alert-dismissible'))
+					dismissBtn.remove();
+			}, { once: true });
+		}
+
+		dismissBtn?.addEventListener('click', () =>
+			messages.forEach((message) => bootstrap.Alert.getOrCreateInstance(message)?.close())
+		);
+	}
+
 	// Accessibility
 	// Present the contents of the data-alt attribute as alternative content for screen reader users.
 	// The icon should be formatted as <i class="icon fas fa-close" data-alt="close"></i>
diff --git a/htdocs/themes/math4/math4.scss b/htdocs/themes/math4/math4.scss
index fa9d18ce95..0f244b80dd 100644
--- a/htdocs/themes/math4/math4.scss
+++ b/htdocs/themes/math4/math4.scss
@@ -37,27 +37,6 @@ table caption {
 }
 
 /* Screen Reader */
-.sr-only {
-	position: absolute;
-	width: 1px;
-	height: 1px;
-	padding: 0;
-	margin: -1px;
-	overflow: hidden;
-	clip: rect(0, 0, 0, 0);
-	border: 0;
-}
-
-.sr-only-focusable:active,
-.sr-only-focusable:focus {
-	position: static;
-	width: auto;
-	height: auto;
-	margin: 0;
-	overflow: visible;
-	clip: auto;
-}
-
 .sr-only-glyphicon {
 	position: absolute;
 	width: 1em;
@@ -70,11 +49,34 @@ table caption {
 	border: 0 none;
 }
 
+.visually-hidden-focusable:active,
+.visually-hidden-focusable:focus {
+	z-index: 21;
+}
+
+$masthead-height: 70px !default;
+$layout-divider-color: #aaa !default;
+$site-nav-width: 250px !default;
+
 /* Banner */
-#masthead {
+.masthead {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	display: flex;
+	height: $masthead-height;
 	background-color: var(--bs-primary, #038);
+	border-bottom: 1px solid $layout-divider-color;
 	margin: 0;
 	padding: 0;
+	z-index: 20;
+
+	@media only screen and (max-width: 768px) {
+		position: static;
+		flex-direction: column;
+		height: unset;
+	}
 
 	a {
 		color: var(--ww-primary-foreground-color, white);
@@ -83,114 +85,119 @@ table caption {
 			text-decoration: none;
 		}
 	}
-}
 
-.webwork_logo {
-	display: flex;
-	align-items: center;
-	padding: 5px 0;
-	background-color: var(--ww-logo-background-color, #104aad);
+	.webwork-logo {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 5px 0;
+		background-color: var(--ww-logo-background-color, #104aad);
+		z-index: 20;
+		width: $site-nav-width;
 
-	img {
-		max-height: 57px;
-		max-width: 100%;
-	}
+		img {
+			max-height: $masthead-height - 15px;
+			max-width: 100%;
+		}
 
-	a, span {
-		display: block;
-		margin-left: 0.5rem;
-		margin-right: 0.5rem;
-	}
-}
+		@media only screen and (max-width: 768px) {
+			height: 0.75 * $masthead-height;
+			position: fixed;
+			width: 100%;
 
-.institution_logo {
-	display: flex;
-	align-items: center;
-	padding: 8px 0;
-	max-height: 67px;
+			img {
+				max-height: 0.75 * $masthead-height - 11px;
+			}
+		}
 
-	img {
-		max-height: 51px;
-		max-width: 100%;
+		a, span {
+			display: inline-block;
+			margin-right: 0.5rem;
+		}
 	}
 
-	a {
-		display: block;
-		margin-left: 0.5rem;
-		margin-right: 0.5rem;
+	.institution-logo {
+		display: flex;
+		flex-grow: 1;
+		align-items: center;
+		padding: 8px 0;
+		max-height: $masthead-height - 1px;
+
+		@media only screen and (max-width: 768px) {
+			margin-top: 0.75 * $masthead-height;
+		}
+
+		img {
+			max-height: $masthead-height - 15px;
+			max-width: 100%;
+		}
+
+		a {
+			display: block;
+			margin-left: 0.5rem;
+			margin-right: 0.5rem;
+		}
 	}
-}
 
-#loginstatus {
-	padding: 5px 5px 5px 0;
-	color: var(--ww-primary-foreground-color, white);
-	text-align: right;
-	font-size: 0.85em;
-	font-weight: normal;
+	.login-status {
+		flex-shrink: 1;
+		height: $masthead-height - 1px;
+		padding: 4px 10px 4px 0;
+		color: var(--ww-primary-foreground-color, white);
+		text-align: right;
+		font-size: 0.85em;
+		font-weight: normal;
 
-	a {
-		color: black;
+		a {
+			color: black;
 
-		&:first-child {
-			margin-bottom: 5px;
+			&:first-child {
+				margin-bottom: 5px;
+			}
 		}
 	}
 }
 
 /* Site Navigation */
 #site-navigation {
+	position: fixed;
 	line-height: 1.2rem;
-	width: 20%;
-	min-width: 20%;
-	flex: 0 0 auto;
-	margin-right: 1rem;
+	width: $site-nav-width;
+	left: 0;
+	margin-top: $masthead-height;
+	height: calc(100% - $masthead-height);
 	overflow-x: hidden;
-	transition-property: width, min-width, padding;
+	overflow-y: auto;
+	transition-property: left, border-right-width;
 	transition-duration: 0.3s;
-
-	@media only screen and (max-width: 992px) {
-		min-width: 180px;
-	}
+	border-right: 1px solid $layout-divider-color;
 
 	&.toggle-width {
-		width: 0;
-		min-width: 0;
-		margin-right: 0;
+		left: -20%;
+		border-right-width: 0px;
 	}
 
 	@media only screen and (max-width: 768px) {
-		position: fixed;
 		top: 0;
-		left: 0;
+		width: 40%;
+		left: -40%;
 		height: 100%;
 		z-index: 100;
 		background-color: white;
-		width: 0;
-		min-width: 0;
+		margin-top: 0;
+		margin-bottom: 0;
 		margin-right: 0;
-		transition: none;
-		overflow-y: hidden;
 
 		&.toggle-width {
-			padding: 0.5rem 0.25rem;
+			left: 0;
 			box-shadow: 4px 0 4px 2px rgba(0, 0, 0, 0.2);
-			width: 40%;
-			min-width: 200px;
-			overflow-y: auto;
 		}
 	}
 
-	.navbar-brand {
-		text-transform: uppercase;
-		padding-left: 1rem;
-		color: black;
-		font-weight: bold;
-		font-size: 0.9rem;
-		opacity: 0.6;
-	}
-
 	.info-box {
-		margin-top: 0.5rem;
+		border-radius: 0;
+		border: none;
+		border-top: 1px solid $layout-divider-color;
 	}
 
 	.nav {
@@ -210,13 +217,15 @@ table caption {
 					color: var(--ww-primary-foreground-color, white);
 				}
 			}
+			&.list-group-item {
+				.nav-link:focus {
+					position: relative;
+					z-index: 2;
+				}
+			}
 		}
 	}
 
-	#site-links {
-		border: 1px solid #e6e6e6;
-	}
-
 	ul.nav {
 		padding-right: 0;
 
@@ -232,20 +241,29 @@ table caption {
 }
 
 #content {
-	max-width: calc(80% - 1rem);
-	transition-property: max-width;
+	margin-left: $site-nav-width;
+	transition-property: margin;
 	transition-duration: 0.3s;
+	margin-top: $masthead-height;
+	width: calc(100% - $site-nav-width);
 
-	@media only screen and (max-width: 992px) {
-		max-width: calc(100% - 180px - 1rem);
+	*[id] {
+		scroll-margin-top: $masthead-height;
 	}
 
 	&.toggle-width {
-		max-width: 100%;
+		width: 100%;
+		margin-left: 0;
 	}
 
 	@media only screen and (max-width: 768px) {
-		max-width: 100%;
+		width: 100%;
+		margin-top: 0;
+		margin-left: auto;
+
+		*[id] {
+			scroll-margin-top: 0.75 * $masthead-height;
+		}
 	}
 }
 
@@ -266,19 +284,20 @@ table caption {
 	background-color: rgba(0, 0, 0, 0.4);
 }
 
-#toggle-sidebar-icon i {
-	transition: 0.3s;
+#toggle-sidebar {
+	#toggle-sidebar-icon i {
+		padding: 0.25rem;
+		border-radius: 5px;
+		color: rgba(255, 255, 255, 0.85);
+		transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out;
 
-	&.toggle-icon {
-		transform: rotate(180deg);
+		&:hover {
+			color: #fff;
+		}
 	}
 
-	@media only screen and (max-width: 768px) {
-		transform: rotate(180deg);
-
-		&.toggle-icon {
-			transform: none;
-		}
+	&:focus #toggle-sidebar-icon i {
+		outline: 1px solid var(--bs-link-hover-color);
 	}
 }
 
@@ -350,7 +369,6 @@ div.showMeAnotherBox {
 		display: flex;
 		margin-bottom: 0;
 		padding-left: 0.5rem;
-		background-color: #f5f5f5;
 		min-height: 38px;
 		align-items: center;
 		border: 1px solid #e6e6e6;
@@ -358,16 +376,17 @@ div.showMeAnotherBox {
 	}
 }
 
-#toggle-sidebar {
-	margin-right: 5px;
-	width: 35px;
-	height: 38px;
-}
-
 /* Main Content */
 h1.page-title {
 	font-size: 31.5px;
 	line-height: 35px;
+	display: inline-block;
+
+	& + a {
+		font-size: 31.5px;
+		line-height: 35px;
+		margin-left: 0.5rem;
+	}
 }
 
 h2.page-title {
@@ -375,6 +394,7 @@ h2.page-title {
 }
 
 .problem-sub-header {
+	margin-top: 0.25rem;
 	font-weight: bold;
 	font-size: 14px;
 	line-height: 1.4;
@@ -387,6 +407,15 @@ h2.page-title {
 	}
 }
 
+.error-output {
+	word-wrap: break-word;
+	color: #d63384;
+	font-size: 0.875rem;
+	direction: ltr;
+	font-family: monospace;
+	font-size: 9pt;
+}
+
 /* Question nav section */
 .sticky-nav {
 	display: flex;
@@ -394,9 +423,9 @@ h2.page-title {
 	gap: 0.5rem;
 	align-content: space-between;
 	justify-content: space-between;
-	z-index: 1;
+	z-index: 20;
 	position: sticky;
-	top: 0;
+	top: $masthead-height;
 	background-color: white;
 	margin-bottom: 1rem;
 	padding: 0.25rem;
@@ -406,6 +435,10 @@ h2.page-title {
 	box-shadow: 0 0.1rem 0.2rem 1px gray;
 	box-sizing: border-box;
 
+	@media only screen and (max-width: 768px) {
+		top: 0.75 * $masthead-height;
+	}
+
 	& > div {
 		flex-shrink: 1;
 		width: auto;
@@ -420,9 +453,15 @@ h2.page-title {
 }
 
 /* Message section */
-.Message:not(:empty) {
-	display: inline-block;
-	margin-bottom: 0.5rem;
+.message:not(:empty) {
+	display: inline-flex;
+	flex-direction: column;
+	gap: 0.25rem;
+	margin: 0 0 0.5rem;
+
+	p {
+		margin: 0;
+	}
 }
 
 .font-visible { font-weight: bold; }
@@ -552,7 +591,6 @@ ul.courses-list {
 	padding: 0.5em;
 	border-radius: 8px;
 	border: 1px solid #e6e6e6;
-	background: #f6f6f6;
 
 	h2, h3, h4, h5, h6 {
 		background: var(--bs-primary, #038);
@@ -609,6 +647,15 @@ ul.courses-list {
 	#library_sets {
 		max-width: 50%
 	}
+
+	.browse-lib-btn,
+	.library-action-btn {
+		width: 9.3rem;
+	}
+
+	.library-panel-btn {
+		max-width: 9rem;
+	}
 }
 
 .lb-problem-row div.card {
@@ -653,16 +700,15 @@ div.AuthorComment {
 
 /* Footer */
 #footer {
-	display: block;
 	font-size: 0.8em;
 	color: #767676;
 	text-align: center;
 	padding: 1em;
 	margin-top: 1em;
 
-	p {
-		/* Overrides bootstrap default so there's no weird space */
-		margin-bottom: 0;
+	div {
+		margin-left: auto;
+		margin-right: auto;
 	}
 
 	a {
@@ -704,6 +750,12 @@ input.changed[type=text] { /* orange */
 	row-gap: 0.25rem;
 }
 
+.visually-hidden-unfocusable {
+	visibility: hidden;
+	position: absolute;
+	left: -9999px;
+}
+
 /* Styles used when editing a temporary file */
 .temporaryFile { font-style: italic; color: #ca5000; background-color: inherit; }
 
@@ -711,6 +763,7 @@ input.changed[type=text] { /* orange */
 .Audit { font-style: normal; color: purple; background-color: inherit; }
 .Enrolled { font-weight: normal; color: black; background-color: inherit; }
 .Drop { font-style: italic; color: #555; background-color: inherit; }
+.Observer { font-style: normal; color: green; background-color: inherit; }
 
 /* Styles for the PGProblemEditor Page */
 
@@ -720,30 +773,26 @@ input.changed[type=text] { /* orange */
 	}
 }
 
-#render-modal {
-	.modal-dialog {
-		width: 90vw;
-		max-width: unset;
-		height: 86vh;
-	}
+#pgedit-render-area {
+	border: 1px solid #ddd;
+	min-height: 400px;
+	height: 550px;
+	resize: vertical;
+	display: flex;
+	flex-direction: column;
 
-	.modal-content {
-		height: 100%;
+	@media only screen and (max-width: 992px) {
+		min-height: 200px;
+		height: 300px;
 	}
 
-	.modal-body {
-		overflow: hidden;
-		padding: 0;
+	#pgedit-render-iframe {
+		flex-grow: 1;
+		border: none;
+		width: 100%;
 	}
 }
 
-#pg_editor_frame_id {
-	overflow: auto;
-	border: none;
-	width: 100%;
-	height: 100%;
-}
-
 // Fix the style of the save file path input group.
 // It is forced to be ltr, but the bootstrap rtl style makes that look wrong.
 /* rtl:raw:
@@ -763,32 +812,6 @@ input.changed[type=text] { /* orange */
 }
 */
 
-/* Page loading busy indicator */
-/* Currently only used on the problem editor page. */
-.page-loading-busy-indicator {
-	position: absolute;
-	width: 100%;
-	height: 100%;
-	left: 0;
-	top: 0;
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-	gap: 1rem;
-	background: rgba(0, 0, 0, .5);
-	z-index: 105;
-
-	.busy-text {
-		color: white;
-		font-size: 1.4em;
-	}
-
-	i {
-		color: white;
-	}
-}
-
 /* Problem Set Detail */
 #problem_set_form {
 	input[name=add_n_problems] {
@@ -860,7 +883,11 @@ input.changed[type=text] { /* orange */
 	}
 }
 
-.psr_render_area iframe {
+.rpc_render_area_container {
+	background-color: #f5f5f5;
+}
+
+.rpc_render_area iframe {
 	width: 100%;
 	border-radius: 5px;
 }
@@ -938,15 +965,34 @@ span {
 
 /* Problem graders */
 
-.NeedsGrading { font-weight: bold; }
+span.needs-grading,
+td.needs-grading {
+	background-color: #fff3cd;
+
+	div {
+		font-weight: bold;
+	}
+}
+
+span.alt-source,
+td.alt-source {
+	background-color: #e6e7e9;
+}
 
 #problem-grader-form {
-	.graded-answer:not(:last-child),
-	.essay-answer:not(:last-child) {
+	.past-answer:not(:last-child) {
 		border-bottom: 1px solid #d5d5d5;
 		margin-bottom: 2px;
 		padding-bottom: 5px;
 	}
+
+	.restricted-width-col {
+		width: 0.1%;
+	}
+
+	.grader-comment-col {
+		min-width: 300px;
+	}
 }
 
 .problem-grader-table {
@@ -965,16 +1011,22 @@ span {
 		&.alert-success, &.alert-danger {
 			transition: none;
 			border-radius: 3px;
+			color: var(--bs-alert-color);
+			background-color: var(--bs-alert-bg);
 		}
 	}
-}
 
-/* Equation editor bugfixes */
-#eqEditorDiv {
-	overflow: visible;
+	.problem-score,
+	.problem-points,
+	.answer-part-score {
+		width: 5.5rem;
+	}
 }
 
-#openEqEditor {
-	min-height: 35px;
-	min-width: 43px;
+#problem-grader-form,
+.problem-grader-table {
+	.mv-container .mv-inner-container,
+	.mq-latex-editor-container .mq-latex-editor-inner-container {
+		width: 100%;
+	}
 }
diff --git a/htdocs/themes/math4/system.html.ep b/htdocs/themes/math4/system.html.ep
new file mode 100644
index 0000000000..efb0d1a4dd
--- /dev/null
+++ b/htdocs/themes/math4/system.html.ep
@@ -0,0 +1,183 @@
+<!DOCTYPE html>
+<html <%== $c->output_course_lang_and_dir %>>
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+%
+% ################################################################################
+% # WeBWorK Online Homework Delivery System
+% # Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+% #
+% # This program is free software; you can redistribute it and/or modify it under
+% # the terms of either: (a) the GNU General Public License as published by the
+% # Free Software Foundation; either version 2, or (at your option) any later
+% # version, or (b) the "Artistic License" which comes with this package.
+% #
+% # This program is distributed in the hope that it will be useful, but WITHOUT
+% # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+% # FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+% # Artistic License for more details.
+% ################################################################################
+%
+<link rel="icon" type="x-image/icon"
+	href="<%= $c->url({ type => 'webwork', name => 'htdocs', file => 'images/favicon.ico' }) %>">
+%
+% # CSS Loads
+<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'bootstrap.css' }) =%>
+<%= stylesheet $c->url({
+	type => 'webwork', name => 'htdocs',
+	file => 'node_modules/@fortawesome/fontawesome-free/css/all.min.css'
+}) =%>
+<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'math4.css' }) =%>
+<%= content 'css' =%>
+% if ($c->exists_theme_file('math4-overrides.css')) {
+	<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'math4-overrides.css' }) =%>
+% }
+%
+% # Webwork configuration for javascript
+<script>const webworkConfig = { webwork_url: '<%= $c->webwork_url %>' };</script>
+%
+% # JS Loads
+<%= javascript $c->url({ type => 'webwork', name => 'htdocs', file => 'js/MathJaxConfig/mathjax-config.js' }),
+	defer => undef =%>
+<%= javascript $c->url({ type => 'webwork', name => 'htdocs', file => 'node_modules/mathjax/es5/tex-svg.js' }),
+	id => 'MathJax-script', defer => undef =%>
+<%= javascript $c->url({ type => 'webwork', name => 'htdocs', file => 'node_modules/jquery/dist/jquery.min.js' }) %>
+<%= javascript $c->url({
+	type => 'webwork', name => 'htdocs',
+	file => 'node_modules/bootstrap/dist/js/bootstrap.bundle.min.js'
+	}), defer => undef =%>
+<%= javascript $c->url({ type => 'webwork', name => 'theme', file => 'math4.js' }), defer => undef =%>
+<%= content 'js' =%>
+% if ($c->exists_theme_file('math4-overrides.js')) {
+	<%= javascript $c->url({ type => 'webwork', name => 'theme', file => 'math4-overrides.js' }), defer => undef =%>
+% }
+%
+% if ($c->can('head')) {
+	<%== $c->head =%>
+% }
+%
+<title><%= $c->path({ style => 'text', text => ' : ', textonly => '1' }) %></title>
+</head>
+%
+<body>
+<%= link_to 'Skip to main content' => '#page-title',
+	class => 'visually-hidden-focusable bg-white p-2 m-3 position-absolute' =%>
+%
+% # Header
+<div class="masthead" role="banner">
+	<div class="webwork-logo">
+		% if ($c->can('links') || $c->can('siblings') || $c->can('options')) {
+			<button type="button" class="navbar-toggler ms-3 me-2 p-0 fa-2x" id="toggle-sidebar"
+				aria-controls="site-navigation">
+				<span id="toggle-sidebar-icon">
+					<i class="fa-solid fa-bars" aria-hidden="true"></i>
+					<span class="visually-hidden">close sidebar</span>
+				</span>
+			</button>
+		% }
+		<%= $c->webwork_logo %>
+	</div>
+	<div class="institution-logo"><%= $c->institution_logo %></div>
+	<div class="login-status"><%= include 'ContentGenerator/Base/login_status' %></div>
+</div>
+% # Navigation
+% if ($c->can('links') || $c->can('siblings') || $c->can('options')) {
+	<nav id="site-navigation" class="d-flex flex-column bg-light" aria-label="main navigation">
+		% if ($c->can('links')) {
+			<div id="site-links"><%= $c->links %></div>
+		% }
+		% if ($c->can('siblings')) {
+			<div id="siblings"><%= $c->siblings %></div>
+		% }
+		% if ($c->can('options')) {
+			<div id="options" class="info-box"><%= $c->options %></div>
+		% }
+	</nav>
+% }
+%
+<div class="d-flex">
+	% # Main Content Area
+	<div id="content" class="container-fluid <%=
+		$c->can('links') || $c->can('siblings') || $c->can('options')
+			? 'flex-grow-1'
+			: 'flex-grow-1 toggle-width' %>">
+		%
+		% # Breadcrumb
+		<div id="breadcrumb-row" class="row my-2">
+			<div class="col-12 d-flex align-items-center">
+				<nav id="breadcrumb-navigation" aria-label="breadcrumb navigation" class="w-100 bg-light">
+					<ol class="breadcrumb">
+						<%= $c->path({ style => 'bootstrap', text => '' }) =%>
+					</ol>
+				</nav>
+			</div>
+		</div>
+		% # Navigation, e.g.: Prev, Up, Next for homeworks
+		% if ($c->can('nav')) {
+			<%= $c->nav({ style => 'buttons', separator => '' }) =%>
+		% }
+		%
+		% # Page Title
+		% if ($c->can('page_title')) {
+			<div class="row">
+				<div class="col-12">
+					<h1 id="page-title" class="page-title">
+						<%== $c->page_title %>
+					</h1>
+					% if ($authen->{was_verified}
+						% && $authz->hasPermissions(param('user'), 'access_instructor_tools')) {
+						<%= $c->help({ label_size => 'fa-xs' }) %>
+					% }
+				</div>
+			</div>
+		% }
+		%
+		% # Message for the user
+		% if ($c->can('message')) {
+			<div id="message" class="message"><%= $c->message %></div>
+		% }
+		%
+		% # Indicate presence of perl warnings
+		% if ($c->have_warnings) {
+			<div class="row g-0">
+				<div id="alert-error" class="col-12 alert alert-danger"><%== $c->warningMessage %></div>
+			</div>
+		% }
+		%
+		% # Display the page body.
+		<div class="row">
+			<div class="body <%= $c->can('info') ? 'col-md-8' : 'col-12' %>">
+				<%= content =%>
+			</div>
+			% if ($c->can('info')) {
+				<div id="info-panel-right" class="col-md-4 mb-md-0 mb-2 order-md-last order-first">
+					<div class="info-box bg-light">
+						<%= $c->info =%>
+					</div>
+				</div>
+			% }
+		</div>
+		%
+		% if ($c->have_warnings) {
+			<div id="warnings" class="Warnings alert alert-danger mt-2"><%= $c->warnings %></div>
+		% }
+		% if ($c->can('message')) {
+			<div id="message_bottom" class="message"><%= $c->message %></div>
+			<div>
+				<button type="button" id="dismiss-messages-btn" class="btn btn-primary d-none">
+					<%= maketext('Dismiss All Messages') %>
+				</button>
+			</div>
+		% }
+		%
+		% # Footer
+		<div id="footer" role="contentinfo"><%= include 'ContentGenerator/Base/footer' %></div>
+	</div>
+</div>
+%
+% # This is a place that modal dialog html markup can be safely placed if needed by a page.
+<%= content 'modal-dialog-area' =%>
+%
+</body>
+</html>
diff --git a/htdocs/themes/math4/system.template b/htdocs/themes/math4/system.template
deleted file mode 100644
index 3639d99b7a..0000000000
--- a/htdocs/themes/math4/system.template
+++ /dev/null
@@ -1,319 +0,0 @@
-<!DOCTYPE html>
-<html <!--#output_course_lang_and_dir-->>
-<!--  Note that the lang and dir attributes are now set during the
-      processing of the template and not hard-coded above.
--->
-<head>
-<meta charset='utf-8'>
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-
-<link rel="icon" type="x-image/icon" href="<!--#url type="webwork" name="htdocs" file="images/favicon.ico"-->"/>
-
-<!-- CSS Loads -->
-<link rel="stylesheet" href="<!--#url type="webwork" name="theme" file="bootstrap.css"-->"/>
-<link rel="stylesheet" href="<!--#url type="webwork" name="htdocs" file="node_modules/@fortawesome/fontawesome-free/css/all.min.css"-->"/>
-<link rel="stylesheet" href="<!--#url type="webwork" name="theme" file="math4.css"-->"/>
-<!--#if can="output_achievement_CSS"-->
-<link rel="stylesheet" href="<!--#url type="webwork" name="theme" file="achievements.css"-->"/>
-<!--#endif-->
-<!--#if can="output_CSS"-->
-	<!--#output_CSS-->
-<!--#endif-->
-<!--#if exists="math4-overrides.css"-->
-<link rel="stylesheet" href="<!--#url type="webwork" name="theme" file="math4-overrides.css"-->"/>
-<!--#endif-->
-
-<!-- JS Loads -->
-<script src="<!--#url type="webwork" name="htdocs" file="js/apps/MathJaxConfig/mathjax-config.js"-->" defer></script>
-<script src="<!--#url type="webwork" name="htdocs" file="node_modules/mathjax/es5/tex-svg.js"-->" id="MathJax-script" defer></script>
-<script src="<!--#url type="webwork" name="htdocs" file="node_modules/jquery/dist/jquery.min.js"-->"></script>
-<script src="<!--#url type="webwork" name="htdocs" file="node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"-->" defer></script>
-<!--#if can="output_JS"-->
-	<!--#output_JS-->
-<!--#endif-->
-<script src="<!--#url type="webwork" name="theme" file="math4.js"-->" defer></script>
-<!--#if exists="math4-overrides.js"-->
-<script src="<!--#url type="webwork" name="theme" file="math4-overrides.js"-->" defer></script>
-<!--#endif-->
-
-<title><!--#path style="text" text=" : " textonly="1"--></title>
-
-<!--#head-->
-</head>
-
-<body>
-<a href="#page-title" id="stmc-link" class="sr-only sr-only-focusable">Skip to main content</a>
-
-<!-- Bootstrap Fluid Layout Scaffolding start -->
-<div id="bs-container" class="container-fluid">
-<!-- Header -->
-<div id="masthead" class="row" role="banner">
-	<div class="col-md-2 webwork_logo">
-		<!--#webwork_logo-->
-	</div>
-	<div class="col-md-6 institution_logo">
-		<!--#institution_logo-->
-	</div>
-	<div id="loginstatus" class="col-md-4">
-		<!--#loginstatus-->
-	</div>
-</div>
-
-<!-- Breadcrumb -->
-<div id="breadcrumb-row" class="row my-2">
-	<div class="col-12 d-flex align-items-center">
-		<!--#if can="links" can="siblings" can="options"-->
-		<button type="button" class="btn btn-secondary" id="toggle-sidebar">
-			<span id="toggle-sidebar-icon">
-				<i class="icon fas fa-chevron-left" aria-hidden="true" data-alt="close sidebar"></i>
-			</span>
-		</button>
-		<!--#endif-->
-		<nav id="breadcrumb-navigation" aria-label="breadcrumb navigation" class="w-100">
-			<ol class="breadcrumb">
-				<!--#path style="bootstrap" text=""-->
-			</ol>
-		</nav>
-	</div>
-</div>
-
-<div id="body-row" class="d-flex">
-
-<!-- Navigation -->
-<!--#if can="links" can="siblings" can="options"-->
-<div id="site-navigation" class="d-flex flex-column" role="navigation" aria-label="main navigation">
-	<!--#if can="links"-->
-		<div id="site-links" class="bg-light">
-			<!--#links-->
-		</div>
-	<!--#endif-->
-	<!--#if can="siblings"-->
-		<div id="siblings">
-			<!--#siblings-->
-		</div>
-	<!--#endif-->
-	<!--#if can="options"-->
-		<div id="options" class="info-box">
-			<!--#options-->
-		</div>
-	<!--#endif-->
-</div>
-<!--#endif-->
-
-<!-- Main Content Area -->
-<!--#if can="links" can="siblings" can="options"-->
-<div id="content" class="flex-grow-1">
-<!--#else-->
-<div id="content" class="flex-grow-1 toggle-width">
-<!--#endif-->
-	<!--#if can="nav"-->
-		<!-- Question Navigation, e.g.: Prev, Up, Next for homeworks -->
-		<!--#nav style="buttons" separator=""-->
-	<!--#endif-->
-
-	<!-- Page Title -->
-	<!--#if can="title"-->
-	<div class="row"><div class="col-12">
-		<h1 id='page-title' class='page-title'><!--#title --></h1>
-	</div></div>
-	<!--#endif-->
-
-	<!--#if can="message"-->
-	<!-- Message for the user -->
-	<div id="Message" class="Message"><!--#message--></div>
-	<!--#endif-->
-
-	<!-- Header Text for problem -->
-	<!--#if can="post_header_text"-->
-		<!--#post_header_text-->
-	<!--#endif-->
-
-<!-- ==============BEGIN BODY OF PROBLEM=============== -->
-
-	<!-- Indicate presence of perl warnings -->
-	<!--#if warnings="1"-->
-	<div class="row g-0">
-		<div id="alert-error" class="col-12 alert alert-danger">
-		    <!--#warningMessage-->
-		</div>
-	</div>
-	<!--#endif-->
-
-	<!--#if can="output_tag_info"-->
-	<div class="row">
-		<div id="tag_info" class="col-12">
-		<!--#output_tag_info-->
-		</div>
-	</div>
-	<!--#endif-->
-	<!--#if can="output_problem_body"-->
-		<!-- ==== in this case print body parts ELSE print entire body -->
-		<div class="row">
-			<div class="Body col-12">
-
-			<!--#if can="output_custom_edit_message"-->
-			<div id="custom_edit_message" class="row"><div class="col-lg-10">
-				<!--#output_custom_edit_message-->
-			</div></div>
-			<!--#endif-->
-			<!--#if can="output_summary"-->
-			<div class="row"><div id="output_summary" class="col-lg-10">
-				<!--#output_summary-->
-			</div></div>
-			<!--#endif-->
-
-			<!--#if can="output_achievement_message"-->
-			<div class="row"><div id="output_achievement_message" class="col-lg-10">
-				<!--#output_achievement_message-->
-			</div></div>
-			<!--#endif-->
-
-			<!--#if can="output_comments" "-->
-			<div class="row"><div id="output_comments" class="col-lg-10">
-				<!--#output_comments-->
-			</div></div>
-			<!--#endif-->
-
-			<!--#if can="output_grader"-->
-			<div class="row"><div id="output_grader" class="col-lg-10">
-				<!--#output_grader-->
-			</div></div>
-			<!--#endif-->
-
-			<!--#if can="output_form_start"-->
-			<div class="row">
-				<div class="col-lg-10">
-				<!--#output_form_start-->
-				<!--#if can="output_hidden_info"-->
-					<!--#output_hidden_info-->
-				<!--#endif-->
-
-				<!--#if can="output_problem_body" can="output_message" can="output_editorLink"-->
-					<div class="problem">
-						<!--#if can="output_problem_body"-->
-						<div id="problem_body" class="problem-content" <!--#output_problem_lang_and_dir--> >
-							<!--#output_problem_body-->
-						</div>
-						<!--#endif-->
-						<!--#if can="output_message"-->
-							<!--#output_message-->
-						<!--#endif-->
-						<!--#if can="output_editorLink"-->
-							<!--#output_editorLink-->
-						<!--#endif-->
-					</div>
-				<!--#endif-->
-
-				<!--#if can="output_checkboxes" can="output_submit_buttons"-->
-					<div class="checkboxes-container col-12 my-2">
-						<!--#if can="output_checkboxes"-->
-							<!--#output_checkboxes-->
-						<!--#endif-->
-					</div>
-					<div class="submit-buttons-container col-12 mb-2">
-						<!--#if can="output_submit_buttons"-->
-							<!--#output_submit_buttons-->
-						<!--#endif-->
-					</div>
-				<!--#endif-->
-				<!--#if can="output_score_summary"-->
-					<div id="score_summary" class="scoreSummary">
-						<!--#output_score_summary-->
-					</div>
-				<!--#endif-->
-
-				<!--#if can="output_misc"-->
-					<!--#output_misc-->
-				<!--#endif-->
-				</form>
-			<!--#endif-->
-
-		<!-- inserted problem piece by piece -->
-
-		<!--#if can="info"-->
-			<p>Form2</p>
-			<!--  styles could be different for different pages so they are not set here -->
-			<div id="info-panel-right" >
-				<!--#info-->
-			</div>
-		<!--#endif-->
-
-		</div></div>
-	</div></div>
-
-	<!-- ====  end printing body parts   -->
-	<!--#else-->
-	<!-- ==== couldn't print body parts so we'll print entire body -->
-	<div class="row">
-		<!--#if can="info"-->
-			<div class="body col-md-8">
-		<!--#else-->
-			<div id="page_body" class="body col-12">
-		<!--#endif-->
-		<!--#body-->
-	</div>
-	<!-- inserted body as a whole -->
-	<!--#if can="info"-->
-	<div id="info-panel-right" class="col-md-4 mb-md-0 mb-2 order-md-last order-first">
-		<div class="info-box">
-			<!--  styles could be different for different pages so they are not set here -->
-			<!--#info-->
-		</div>
-	</div>
-	<!--#endif-->
-	</div>
-	<!--#endif-->
-
-<!-- ==============END BODY OF PROBLEM=============== -->
-	<!--#if can="output_past_answer_button" can="output_email_instructor"-->
-		<div id="problemFooter" class="problemFooter">
-			<!--#if can="output_past_answer_button"-->
-				<!--#output_past_answer_button-->
-			<!--#endif-->
-			<!--#if can="output_email_instructor"-->
-				<!--#output_email_instructor-->
-			<!--#endif-->
-		</div>
-	<!--#endif-->
-
-<!--#if warnings="1"-->
-<div id="warnings" class="Warnings alert alert-danger mt-2">
-	<!--#warnings-->
-</div>
-<!--#endif-->
-<!--#if can="message"-->
-<div id="Message_bottom" class="Message">
-	<!--#message-->
-</div>
-<!--#endif-->
-
-</div><!-- #content -->
-
-<!-- Bootstrap Fluid Layout Scaffolding stop -->
-</div><!-- #body-row -->
-</div><!-- #bs-container.container-fluid -->
-
-<!-- Footer -->
-<div id="footer" role="contentinfo">
-	<!--#footer-->
-</div>
-
-</body>
-</html>
diff --git a/htdocs/third-party-assets.json b/htdocs/third-party-assets.json
deleted file mode 100644
index 7eeaa94bdb..0000000000
--- a/htdocs/third-party-assets.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"node_modules/@fortawesome/fontawesome-free/css/all.min.css": "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.0.0/css/all.min.css",
-	"node_modules/bootstrap/dist/js/bootstrap.bundle.min.js": "https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.js",
-	"node_modules/codemirror/addon/dialog/dialog.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/addon/dialog/dialog.min.css",
-	"node_modules/codemirror/addon/dialog/dialog.js": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/addon/dialog/dialog.min.js",
-	"node_modules/codemirror/addon/edit/matchbrackets.js": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/addon/edit/matchbrackets.min.js",
-	"node_modules/codemirror/addon/scroll/annotatescrollbar.js": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/addon/scroll/annotatescrollbar.min.js",
-	"node_modules/codemirror/addon/search/match-highlighter.js": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/addon/search/match-highlighter.min.js",
-	"node_modules/codemirror/addon/search/matchesonscrollbar.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/addon/search/matchesonscrollbar.min.css",
-	"node_modules/codemirror/addon/search/matchesonscrollbar.js": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/addon/search/matchesonscrollbar.min.js",
-	"node_modules/codemirror/addon/search/search.js": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/addon/search/search.min.js",
-	"node_modules/codemirror/addon/search/searchcursor.js": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/addon/search/searchcursor.min.js",
-	"node_modules/codemirror/keymap/emacs.js": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/keymap/emacs.min.js",
-	"node_modules/codemirror/keymap/sublime.js": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/keymap/sublime.min.js",
-	"node_modules/codemirror/keymap/vim.js": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/keymap/vim.min.js",
-	"node_modules/codemirror/theme/3024-day.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/3024-day.min.css",
-	"node_modules/codemirror/theme/3024-night.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/3024-night.min.css",
-	"node_modules/codemirror/theme/abbott.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/abbott.min.css",
-	"node_modules/codemirror/theme/abcdef.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/abcdef.min.css",
-	"node_modules/codemirror/theme/ambiance.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/ambiance.min.css",
-	"node_modules/codemirror/theme/ambiance-mobile.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/ambiance-mobile.min.css",
-	"node_modules/codemirror/theme/ayu-dark.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/ayu-dark.min.css",
-	"node_modules/codemirror/theme/ayu-mirage.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/ayu-mirage.min.css",
-	"node_modules/codemirror/theme/base16-dark.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/base16-dark.min.css",
-	"node_modules/codemirror/theme/base16-light.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/base16-light.min.css",
-	"node_modules/codemirror/theme/bespin.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/bespin.min.css",
-	"node_modules/codemirror/theme/blackboard.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/blackboard.min.css",
-	"node_modules/codemirror/theme/cobalt.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/cobalt.min.css",
-	"node_modules/codemirror/theme/colorforth.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/colorforth.min.css",
-	"node_modules/codemirror/theme/darcula.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/darcula.min.css",
-	"node_modules/codemirror/theme/dracula.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/dracula.min.css",
-	"node_modules/codemirror/theme/duotone-dark.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/duotone-dark.min.css",
-	"node_modules/codemirror/theme/duotone-light.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/duotone-light.min.css",
-	"node_modules/codemirror/theme/eclipse.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/eclipse.min.css",
-	"node_modules/codemirror/theme/elegant.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/elegant.min.css",
-	"node_modules/codemirror/theme/erlang-dark.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/erlang-dark.min.css",
-	"node_modules/codemirror/theme/gruvbox-dark.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/gruvbox-dark.min.css",
-	"node_modules/codemirror/theme/hopscotch.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/hopscotch.min.css",
-	"node_modules/codemirror/theme/icecoder.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/icecoder.min.css",
-	"node_modules/codemirror/theme/idea.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/idea.min.css",
-	"node_modules/codemirror/theme/isotope.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/isotope.min.css",
-	"node_modules/codemirror/theme/juejin.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/juejin.min.css",
-	"node_modules/codemirror/theme/lesser-dark.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/lesser-dark.min.css",
-	"node_modules/codemirror/theme/liquibyte.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/liquibyte.min.css",
-	"node_modules/codemirror/theme/lucario.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/lucario.min.css",
-	"node_modules/codemirror/theme/material.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/material.min.css",
-	"node_modules/codemirror/theme/material-darker.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/material-darker.min.css",
-	"node_modules/codemirror/theme/material-ocean.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/material-ocean.min.css",
-	"node_modules/codemirror/theme/material-palenight.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/material-palenight.min.css",
-	"node_modules/codemirror/theme/mbo.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/mbo.min.css",
-	"node_modules/codemirror/theme/mdn-like.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/mdn-like.min.css",
-	"node_modules/codemirror/theme/midnight.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/midnight.min.css",
-	"node_modules/codemirror/theme/monokai.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/monokai.min.css",
-	"node_modules/codemirror/theme/moxer.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/moxer.min.css",
-	"node_modules/codemirror/theme/neat.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/neat.min.css",
-	"node_modules/codemirror/theme/neo.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/neo.min.css",
-	"node_modules/codemirror/theme/night.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/night.min.css",
-	"node_modules/codemirror/theme/nord.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/nord.min.css",
-	"node_modules/codemirror/theme/oceanic-next.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/oceanic-next.min.css",
-	"node_modules/codemirror/theme/panda-syntax.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/panda-syntax.min.css",
-	"node_modules/codemirror/theme/paraiso-dark.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/paraiso-dark.min.css",
-	"node_modules/codemirror/theme/paraiso-light.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/paraiso-light.min.css",
-	"node_modules/codemirror/theme/pastel-on-dark.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/pastel-on-dark.min.css",
-	"node_modules/codemirror/theme/railscasts.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/railscasts.min.css",
-	"node_modules/codemirror/theme/rubyblue.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/rubyblue.min.css",
-	"node_modules/codemirror/theme/seti.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/seti.min.css",
-	"node_modules/codemirror/theme/shadowfox.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/shadowfox.min.css",
-	"node_modules/codemirror/theme/solarized.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/solarized.min.css",
-	"node_modules/codemirror/theme/ssms.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/ssms.min.css",
-	"node_modules/codemirror/theme/the-matrix.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/the-matrix.min.css",
-	"node_modules/codemirror/theme/tomorrow-night-bright.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/tomorrow-night-bright.min.css",
-	"node_modules/codemirror/theme/tomorrow-night-eighties.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/tomorrow-night-eighties.min.css",
-	"node_modules/codemirror/theme/ttcn.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/ttcn.min.css",
-	"node_modules/codemirror/theme/twilight.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/twilight.min.css",
-	"node_modules/codemirror/theme/vibrant-ink.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/vibrant-ink.min.css",
-	"node_modules/codemirror/theme/xq-dark.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/xq-dark.min.css",
-	"node_modules/codemirror/theme/xq-light.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/xq-light.min.css",
-	"node_modules/codemirror/theme/yeti.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/yeti.min.css",
-	"node_modules/codemirror/theme/yonce.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/yonce.min.css",
-	"node_modules/codemirror/theme/zenburn.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/theme/zenburn.min.css",
-	"node_modules/codemirror/lib/codemirror.css": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/lib/codemirror.min.css",
-	"node_modules/codemirror/lib/codemirror.js": "https://cdn.jsdelivr.net/npm/codemirror@5.65.2/lib/codemirror.min.js",
-	"node_modules/flatpickr/dist/flatpickr.min.css": "https://cdn.jsdelivr.net/npm/flatpickr@4.6.9/dist/flatpickr.min.css",
-	"node_modules/flatpickr/dist/flatpickr.min.js": "https://cdn.jsdelivr.net/npm/flatpickr@4.6.9/dist/flatpickr.min.js",
-	"node_modules/flatpickr/dist/l10n/cs.js": "https://cdn.jsdelivr.net/npm/flatpickr@4.6.9/dist/l10n/cs.min.js",
-	"node_modules/flatpickr/dist/l10n/es.js": "https://cdn.jsdelivr.net/npm/flatpickr@4.6.9/dist/l10n/es.min.js",
-	"node_modules/flatpickr/dist/l10n/fr.js": "https://cdn.jsdelivr.net/npm/flatpickr@4.6.9/dist/l10n/fr.min.js",
-	"node_modules/flatpickr/dist/l10n/he.js": "https://cdn.jsdelivr.net/npm/flatpickr@4.6.9/dist/l10n/he.min.js",
-	"node_modules/flatpickr/dist/l10n/hu.js": "https://cdn.jsdelivr.net/npm/flatpickr@4.6.9/dist/l10n/hu.min.js",
-	"node_modules/flatpickr/dist/l10n/ko.js": "https://cdn.jsdelivr.net/npm/flatpickr@4.6.9/dist/l10n/ko.min.js",
-	"node_modules/flatpickr/dist/l10n/ru.js": "https://cdn.jsdelivr.net/npm/flatpickr@4.6.9/dist/l10n/ru.min.js",
-	"node_modules/flatpickr/dist/l10n/tr.js": "https://cdn.jsdelivr.net/npm/flatpickr@4.6.9/dist/l10n/tr.min.js",
-	"node_modules/flatpickr/dist/l10n/zh.js": "https://cdn.jsdelivr.net/npm/flatpickr@4.6.9/dist/l10n/zh.min.js",
-	"node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.css": "https://cdn.jsdelivr.net/npm/flatpickr@4.6.9/dist/plugins/confirmDate/confirmDate.min.css",
-	"node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.js": "https://cdn.jsdelivr.net/npm/flatpickr@4.6.9/dist/plugins/confirmDate/confirmDate.min.js",
-	"node_modules/iframe-resizer/js/iframeResizer.contentWindow.min.js": "https://cdn.jsdelivr.net/npm/iframe-resizer@4.3.2/js/iframeResizer.contentWindow.min.js",
-	"node_modules/iframe-resizer/js/iframeResizer.min.js": "https://cdn.jsdelivr.net/npm/iframe-resizer@4.3.2/js/iframeResizer.min.js",
-	"node_modules/jquery-ui-dist/jquery-ui.min.css": "https://cdn.jsdelivr.net/npm/jquery-ui-dist@1.13.1/jquery-ui.min.css",
-	"node_modules/jquery-ui-dist/jquery-ui.min.js": "https://cdn.jsdelivr.net/npm/jquery-ui-dist@1.13.1/jquery-ui.min.js",
-	"node_modules/jquery/dist/jquery.min.js": "https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js",
-	"node_modules/luxon/build/global/luxon.min.js": "https://cdn.jsdelivr.net/npm/luxon@2.3.1/build/global/luxon.min.js",
-	"node_modules/mathjax/es5/tex-svg.js": "https://cdn.jsdelivr.net/npm/mathjax@3.2.0/es5/tex-svg.js",
-	"node_modules/sortablejs/Sortable.min.js": "https://cdn.jsdelivr.net/npm/sortablejs@1.14.0/Sortable.min.js"
-}
diff --git a/lib/Apache/AuthenWeBWorK.pm b/lib/Apache/AuthenWeBWorK.pm
deleted file mode 100644
index 9be0264493..0000000000
--- a/lib/Apache/AuthenWeBWorK.pm
+++ /dev/null
@@ -1,172 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package Apache::AuthenWeBWorK;
-
-=head1 NAME
-
-Apache::AuthenWeBWorK - Authenticate against WeBWorK::Authen framework.
-
-=head1 CONFIGURATION
-
- PerlSetVar authen_webwork_root /path/to/webwork2
- PerlSetVar authen_webwork_course "some-course-id"
- PerlSetVar authen_webwork_module "WeBWorK::Authen::something"
-
-=cut
-
-use strict;
-use warnings;
-#use Apache::Constants qw(:common);
-use Apache2::Const -compile => qw(OK DECLINED HTTP_UNAUTHORIZED);
-use Apache2::Access ();
-use Apache2::RequestUtil ();
-
-use WeBWorK::Debug;
-use WeBWorK::Request;
-use WeBWorK::ContentGenerator;
-use WeBWorK::DB;
-use WeBWorK::Authz;
-use WeBWorK::Utils qw/runtime_use/;
-
-################################################################################
-
-=head1 APACHE AUTHEN HANDLER
-
-=over
-
-=item handler($r)
-
-=cut
-
-sub handler($) {
-	my ($apache) = @_;
-	my $r = new WeBWorK::Request($apache);
-	
-	my ($res, $sent_pw) = $r->get_basic_auth_pw;
-	return $res unless $res == Apache2::Const::OK;
-	
-	my $webwork_root = $r->dir_config('authen_webwork_root');
-	my $webwork_course = $r->dir_config('authen_webwork_course');
-	
-	return fail($r, "authen_webwork_root not set")
-		unless defined $webwork_root and $webwork_root ne "";
-	return fail($r, "authen_webwork_course not set")
-		unless defined $webwork_course and $webwork_course ne "";
-	
-	# FIXME most of this build-up code is yoinked from lib/WeBWorK.pm
-	# needs to be factored out somehow
-	# (for example, the authen module selection code probably belongs in a factory)
-	
-	my $ce = eval { new WeBWorK::CourseEnvironment({
-		webwork_dir => $webwork_root,
-		courseName => $webwork_course,
-	}) };
-	$@ and return fail($r, "failed to initialize the course environment: $@");
-	$r->ce($ce);
-	
-	my $authz = new WeBWorK::Authz($r);
-	$r->authz($authz);
-	
-	# figure out which authentication module to use
-	my $user_authen_module;
-	my $proctor_authen_module;
-	if (ref $ce->{authen}{user_module} eq "HASH") {
-		if (exists $ce->{authen}{user_module}{$ce->{dbLayoutName}}) {
-			$user_authen_module = $ce->{authen}{user_module}{$ce->{dbLayoutName}};
-		} else {
-			$user_authen_module = $ce->{authen}{user_module}{"*"};
-		}
-	} else {
-		$user_authen_module = $ce->{authen}{user_module};
-	}
-	
-	runtime_use $user_authen_module;
-	my $authen = $user_authen_module->new($r);
-	$r->authen($authen);
-	
-	my $db = new WeBWorK::DB($ce->{dbLayout});
-	$r->db($db);
-	
-	# now, here's the problem... WeBWorK::Authen looks at $r->params directly, whereas we
-	# need to look at $user and $sent_pw. this is a perfect opportunity for a mixin, i think.
-	my $authenOK;
-	{
-		no warnings 'redefine';
-		local *WeBWorK::Authen::get_credentials   = \&Authen::WeBWorK::HTTPBasic::get_credentials;
-		local *WeBWorK::Authen::maybe_send_cookie = \&Authen::WeBWorK::HTTPBasic::noop;
-		local *WeBWorK::Authen::maybe_kill_cookie = \&Authen::WeBWorK::HTTPBasic::noop;
-		local *WeBWorK::Authen::set_params        = \&Authen::WeBWorK::HTTPBasic::noop;
-		
-		$authenOK = $authen->verify;
-	}
-	
-	
-	debug("verify said: '$authenOK'");
-	
-	if ($authenOK) {
-		debug("this will work!!!");
-		#return OK;
-		return Apache2::Const::OK;
-	} else {
-		#return AUTH_REQUIRED;
-		return Apache2::Const::HTTP_UNAUTHORIZED;
-	}
-}
-
-sub fail {
-	my ($r, $msg) = @_;
-		$r->note_basic_auth_failure;
-		$r->log_reason($msg, $r->filename);
-		#return AUTH_REQUIRED;
-		return Apache2::Const::HTTP_UNAUTHORIZED;
-}
-
-=back
-
-=cut
-
-package Authen::WeBWorK::HTTPBasic;
-
-use strict;
-use warnings;
-use Apache2::Const -compile => qw(OK DECLINED HTTP_UNAUTHORIZED);
-use Apache2::Access ();
-use Apache2::RequestUtil ();
-#use Apache::Constants qw(:common);
-use WeBWorK::Debug;
-
-sub get_credentials {
-	my ($self) = @_;
-	my $r = $self->{r};
-	
-	my ($res, $sent_pw) = $r->get_basic_auth_pw;
-	#return unless $res == OK;
-	return unless $res == Apache2::Const::OK;
-	my $user_id = $r->user;
-	#my $user_id = $r->connection->user;
-	
-	#if (defined $r->connection->user) {
-	if (defined $r->user) {
-		$self->{user_id} = $r->user;
-		$self->{password} = $sent_pw;
-		$self->{credential_source} = "http_basic";
-		return 1;
-	}
-}
-
-sub noop {}
-
-1;
diff --git a/lib/Apache/WeBWorK.pm b/lib/Apache/WeBWorK.pm
deleted file mode 100644
index 94b7ea6a1f..0000000000
--- a/lib/Apache/WeBWorK.pm
+++ /dev/null
@@ -1,488 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package Apache::WeBWorK;
-
-=head1 NAME
-
-Apache::WeBWorK - mod_perl handler for WeBWorK 2.
-
-=head1 CONFIGURATION
-
-This module should be installed as a Handler for the location selected for
-WeBWorK on your webserver. Refer to the file F<conf/webwork.apache-config> for
-details.
-
-=cut
-
-use strict;
-use warnings;
-
-use Apache2::Log;
-use Apache2::Const qw(:common);
-use HTML::Entities;
-use HTML::Scrubber;
-use Date::Format;
-use WeBWorK;
-use Encode;
-use utf8;
-use JSON::MaybeXS;
-use UUID::Tiny  ':std';
-
-# Should the minimal (more secure) HTML error output be used?
-use constant MIN_HTML_ERRORS => ( exists $ENV{"MIN_HTML_ERRORS"} and $ENV{"MIN_HTML_ERRORS"} );
-
-# Should Apache logs get JSON formatted record?
-use constant JSON_ERROR_LOG => ( exists $ENV{"JSON_ERROR_LOG"} and $ENV{"JSON_ERROR_LOG"} );
-
-
-################################################################################
-
-=head1 APACHE REQUEST HANDLER
-
-=over
-
-=item handler($r)
-
-=cut
-
-sub handler($) {
-	my ($r) = @_;
-	my $log = $r->log;
-	my $uri = $r->uri;
-
-
-	# We set the binmode for print to utf8 because some language options
-	# use utf8 characters
-	binmode(STDOUT, ":encoding(UTF-8)");
-	# the warning handler accumulates warnings in $r->notes("warnings") for
-	# later cumulative reporting
-	my $warning_handler;
-
-	$warning_handler = sub {
-		my ($warning) = @_;
-		chomp $warning;
-		my $warnings = $r->notes->get("warnings");
-		$warnings = Encode::decode("UTF-8",$warnings);
-		$warnings .= "$warning\n";
-		#my $backtrace = join("\n",backtrace());
-		#$warnings .= "$backtrace\n\n";
-		$warnings = Encode::encode("UTF-8",$warnings);
-		$r->notes->set(warnings => $warnings);
-
-		$log->warn("[$uri] $warning");
-	};
-
-	# the exception handler generates a backtrace when catching an exception
-	my @backtrace;
-	my $exception_handler = sub {
-		@backtrace = backtrace();
-		die @_;
-	};
-
-	my $result = do {
-		local $SIG{__WARN__} = $warning_handler;
-		local $SIG{__DIE__} = $exception_handler;
-
-		eval { WeBWorK::dispatch($r) };
-	};
-
-	if ($@) {
-		my $exception = $@;
-
-		my $warnings = $r->notes->get("warnings");
-		my $htmlMessage;
-		my $uuid = create_uuid_as_string(UUID_SHA1, UUID_NS_URL, $r->uri )
-		  . "::" . create_uuid_as_string(UUID_TIME);
-		my $time = time2str("%a %b %d %H:%M:%S %Y", time);
-
-		if ( MIN_HTML_ERRORS ) {
-			$htmlMessage = htmlMinMessage($r, $exception, $uuid, $time);
-		} else {
-			$htmlMessage = htmlMessage($r, $warnings, $exception, $uuid, $time, @backtrace);
-		}
-		unless ($r->bytes_sent) {
-			$r->content_type("text/html");
-			$htmlMessage = "<html lang=\"en-US\"><head><title>WeBWorK error</title></head><body>$htmlMessage</body></html>";
-		}
-
-		# log the error to the apache error log
-		my $logMessage;
-		if ( JSON_ERROR_LOG ) {
-			$logMessage = jsonMessage($r, $warnings, $exception, $uuid, $time, @backtrace);
-		} else {
-			$logMessage = textMessage($r, $warnings, $exception, $uuid, $time, @backtrace);
-		}
-		$log->error($logMessage);
-
-		$r->custom_response(FORBIDDEN,$htmlMessage);
-
-		$result = FORBIDDEN;
-	}
-
-	return $result;
-}
-
-=back
-
-=cut
-
-################################################################################
-
-=head1 ERROR HANDLING ROUTINES
-
-=over
-
-=item backtrace()
-
-Produce a stack-frame traceback for the calls up through the ones in
-Apache::WeBWorK.
-
-=cut
-
-sub backtrace {
-	my $frame = 2;
-	my @trace;
-
-	while (my ($pkg, $file, $line, $subname) = caller($frame++)) {
-		last if $pkg eq "Apache::WeBWorK";
-		push @trace, "in $subname called at line $line of $file";
-	}
-
-	return @trace;
-}
-
-=back
-
-=cut
-
-################################################################################
-
-=head1 ERROR OUTPUT FUNCTIONS
-
-=over
-
-=item htmlMessage($r, $warnings, $exception, $uuid, $time, @backtrace)
-
-Format a message for HTML output reporting an exception, backtrace, and any
-associated warnings.
-
-=cut
-
-sub htmlMessage($$$@) {
-	my ($r, $warnings, $exception, $uuid, $time, @backtrace) = @_;
-
-	# Warnings have html and look better scrubbed.
-
-	my $scrubber = HTML::Scrubber->new(
-	    default => 1,
-	    script => 0,
-	    comment => 0
-	    );
-	$scrubber->default(
-	    undef,
-	    {
-		'*' => 1,
-	    }
-	    );
-
-	$warnings = $scrubber->scrub($warnings);
-	$exception = $scrubber->scrub($exception);
-
-	my @warnings = defined $warnings ? split m|<br />|, $warnings : ();  #fragile
-	$warnings = htmlWarningsList(@warnings);
-	my $backtrace = htmlBacktrace(@backtrace);
-
-	# $ENV{WEBWORK_SERVER_ADMIN} is set from $webwork_server_admin_email in site.conf
-	# and $ENV{SERVER_ADMIN} which is set by ServerAdmin in httpd.conf is used as a backup
-	# if an explicit email address has not been set.
-
-	$ENV{WEBWORK_SERVER_ADMIN} = $ENV{WEBWORK_SERVER_ADMIN} || $ENV{SERVER_ADMIN} // ''; #guarantee this variable is defined.
-
-	my $admin = ($ENV{WEBWORK_SERVER_ADMIN}
-		? " (<a href=\"mailto:$ENV{WEBWORK_SERVER_ADMIN}\">$ENV{WEBWORK_SERVER_ADMIN}</a>)"
-		: "");
-	my $method = htmlEscape( $r->method  );
-	my $uri = htmlEscape(  $r->uri );
-	my $headers = do {
-		my %headers = %{$r->headers_in};
-		if (defined($headers{"sec-ch-ua"})) {
-			# Was getting warnings about the value of "sec-ch-ua" in my testing...
-			$headers{"sec-ch-ua"} = join("",$headers{"sec-ch-ua"});
-			$headers{"sec-ch-ua"} =~ s/\"//g;
-		}
-
-		join("",
-			"<tr><th id=\"header_key\"><small>Key</small></th><th id=\"header_value\"><small>Value</small></th></tr>\n",
-			map { "<tr><td headers=\"header_key\"><small>" .
-				htmlEscape($_) .
-				"</small></td><td headers=\"header_value\"><small>" .
-				htmlEscape($headers{$_}) .
-				"</small></td></tr>\n"
-			} keys %headers );
-	};
-
-	return <<EOF;
-<main>
-<div style="text-align:left">
- <h1>WeBWorK error</h1>
- <p>An error occured while processing your request.</p>
- <p>For help, please send mail to this site's webmaster $admin, including all of the following information as well as
-    what what you were doing when the error occured.</p>
- <h2>Error record identifier</h2>
- <p style="margin-left: 2em; color: #dc2a2a"><code>$uuid</code></p>
- <h2>Warning messages</h2>
- <ul>$warnings</ul>
- <h2>Error messages</h2>
- <p style="margin-left: 2em; color: #dc2a2a"><code>$exception</code></p>
- <h2>Call stack</h2>
-   <p>The following information can help locate the source of the problem.</p>
-   <ul>$backtrace</ul>
- <h2>Request information</h2>
- <div>
- <p>The HTTP request information is included in the following table.</p>
- <div class="table-responsive">
- <table class="table table-bordered caption-top" border="1" aria-labelledby="req_info_summary1">
-  <caption id="req_info_summary1">HTTP request information</caption>
-  <tr><th id="outer_item">Item</th><th id="outer_data">Data</th></tr>
-  <tr><td headers="outer_item">Method</td><td headers="outer_data">$method</td></tr>
-  <tr><td headers="outer_item">URI</td><td headers="outer_data">$uri</td></tr>
-  <tr><td headers="outer_item">HTTP Headers</td><td headers="outer_data">
-   <table class="table table-bordered caption-top" aria-labelledby="req_header_summary">
-    <caption id="req_header_summary">HTTP request headers</caption>
-    $headers
-   </table>
-  </td></tr>
- </table>
- </div>
- </div>
- <h2>Time generated:</h2>
- <p style="margin-left: 2em;">$time</p>
-</div>
-</main>
-EOF
-}
-
-###############################################################################
-
-=item htmlMinMessage($r, $exception, $uuid, $time)
-
-Format a minimal message for HTML output reporting an error ID number, and NOT providing much
-additional data, which will instead be in the log files.
-
-=cut
-
-sub htmlMinMessage($$$@) {
-	my ($r, $exception, $uuid, $time) = @_;
-
-	# Warnings have html and look better scrubbed.
-
-	my $scrubber = HTML::Scrubber->new(
-	    default => 1,
-	    script => 0,
-	    comment => 0
-	    );
-	$scrubber->default(
-	    undef,
-	    {
-		'*' => 1,
-	    }
-	    );
-
-	$exception = $scrubber->scrub($exception);
-
-	# Drop any code reference from the error message
-	$exception =~ s/ at \/.*//;
-
-	# $ENV{WEBWORK_SERVER_ADMIN} is set from $webwork_server_admin_email in site.conf
-	# and $ENV{SERVER_ADMIN} which is set by ServerAdmin in httpd.conf is used as a backup
-	# if an explicit email address has not been set.
-
-	$ENV{WEBWORK_SERVER_ADMIN} = $ENV{WEBWORK_SERVER_ADMIN} || $ENV{SERVER_ADMIN} // ''; #guarantee this variable is defined.
-
-	my $admin = ($ENV{WEBWORK_SERVER_ADMIN}
-		? " (<a href=\"mailto:$ENV{WEBWORK_SERVER_ADMIN}\">$ENV{WEBWORK_SERVER_ADMIN}</a>)"
-		: "");
-
-	return <<EOF;
-<main>
-<div style="text-align:left">
- <h1>WeBWorK error</h1>
- <p>An error occured while processing your request.</p>
- <p>For help, please send mail to this site's webmaster $admin, including all of the following information as well as what what you were doing when the error occured.</p>
- <h2>Error record identifier</h2>
- <p style="margin-left: 5em; color: #dc2a2a"><code>$uuid</code></p>
- <h2>Error messages</h2>
- <p style="margin-left: 5em; color: #dc2a2a"><code>$exception</code></p>
- <h2>Time generated:</h2>
- <p style="margin-left: 5em;">$time</p>
-</div>
-</main>
-EOF
-}
-
-################################################################################
-
-=item textMessage($r, $warnings, $exception, $uuid, $time, @backtrace)
-
-Format a message for HTML output reporting an exception, backtrace, and any
-associated warnings.
-
-=cut
-
-sub textMessage($$$@) {
-	my ($r, $warnings, $exception, $uuid, $time, @backtrace) = @_;
-
-	chomp $exception;
-	my $backtrace = textBacktrace(@backtrace);
-	my $uri = $r->uri;
-
-	my @warnings = defined $warnings ? split m/\n+/, $warnings : ();
-
-	my %headers = %{$r->headers_in};
-	# Was getting JSON errors for the value of "sec-ch-ua" in my testing, so remove it
-	if ( defined( $headers{"sec-ch-ua"} ) ) {
-		$headers{"sec-ch-ua"} = join("",$headers{"sec-ch-ua"});
-		$headers{"sec-ch-ua"} =~ s/\"//g;
-	}
-
-	my $additional_json = encode_json({
-			"Error record identifier" => $uuid,
-			"Time" => $time,
-			"Method" => $r->method,
-			"URI" => $r->uri,
-			"HTTP Headers" => {%headers},
-			"Warnings" => [ @warnings ],
-		});
-
-	return "[$uuid] [$uri] $additional_json $exception\n$backtrace";
-}
-
-=item jsonMessage($r, $warnings, $exception, $uuid, $time, @backtrace)
-
-Format a JSON message for log output reporting an exception, backtrace, and any
-associated warnings.
-
-=cut
-
-sub jsonMessage($$$@) {
-	my ($r, $warnings, $exception, $uuid, $time, @backtrace) = @_;
-
-	chomp $exception;
-	my @warnings = defined $warnings ? split m/\n+/, $warnings : ();
-
-	my %headers = %{$r->headers_in};
-	# Was getting JSON errors for the value of "sec-ch-ua" in my testing, so remove it
-	if ( defined( $headers{"sec-ch-ua"} ) ) {
-		$headers{"sec-ch-ua"} = join("",$headers{"sec-ch-ua"});
-		$headers{"sec-ch-ua"} =~ s/\"//g;
-	}
-
-	return encode_json({
-			"Error record identifier" => $uuid,
-			"Time" => $time,
-			"Method" => $r->method,
-			"URI" => $r->uri,
-			"HTTP Headers" => {%headers},
-			"Warnings" => [ @warnings ],
-			"Exception" => $exception,
-			"Backtrace" => [ @backtrace ],
-		});
-}
-
-################################################################################
-
-=item htmlBacktrace(@frames)
-
-Formats a list of stack frames in a backtrace as list items for HTML output.
-
-=cut
-
-sub htmlBacktrace(@) {
-	my (@frames) = @_;
-	foreach my $frame (@frames) {
-		$frame = htmlEscape($frame);
-		$frame = "<li><code>$frame</code></li>";
-	}
-	return join "\n", @frames;
-}
-
-=item textBacktrace(@frames)
-
-Formats a list of stack frames in a backtrace as list items for text output.
-
-=cut
-
-sub textBacktrace(@) {
-	my (@frames) = @_;
-	foreach my $frame (@frames) {
-		$frame = " * $frame";
-	}
-	return join "\n", @frames;
-}
-
-################################################################################
-
-=item htmlWarningsList(@warnings)
-
-Formats a list of warning strings as list items for HTML output.
-
-=cut
-
-sub htmlWarningsList(@) {
-	my (@warnings) = @_;
-
-	foreach my $warning (@warnings) {
-		$warning = "<li><code>$warning</code></li>";
-	}
-	return join "\n", @warnings;
-}
-
-=item textWarningsList(@warnings)
-
-Formats a list of warning strings as list items for text output.
-
-=cut
-
-sub textWarningsList(@) {
-	my (@warnings) = @_;
-	foreach my $warning (@warnings) {
-		$warning = " * $warning";
-	}
-	return join "\n", @warnings;
-}
-
-################################################################################
-
-=item htmlEscape($string)
-
-Protect characters that would be interpreted as HTML entities. Then, replace
-line breaks with HTML "<br />" tags.
-
-=cut
-
-sub htmlEscape($) {
-	my ($string) = @_;
-	$string = $string//'';  # make sure it's defined.
-	$string = encode_entities($string);
-	$string =~ s|\n|<br />|g;
-	return $string;
-}
-
-=back
-
-=cut
-
-1;
diff --git a/lib/Caliper/Actor.pm b/lib/Caliper/Actor.pm
index 650d5f2d5b..55f60b2c40 100644
--- a/lib/Caliper/Actor.pm
+++ b/lib/Caliper/Actor.pm
@@ -10,28 +10,25 @@ use Data::Dumper;
 
 use Caliper::ResourceIri;
 
-sub generate_anonymous_actor
-{
+sub generate_anonymous_actor {
 	return {
-		'id' => 'http://purl.imsglobal.org/caliper/Person',
+		'id'   => 'http://purl.imsglobal.org/caliper/Person',
 		'type' => 'Person',
 	};
 }
 
-sub generate_default_actor
-{
+sub generate_default_actor {
 	my ($ce, $db, $user) = @_;
 	my $resource_iri = Caliper::ResourseIri->new($ce);
 
 	return {
-		'id' => $resource_iri->actor_homepage($user->user_id()),
+		'id'   => $resource_iri->actor_homepage($user->user_id()),
 		'type' => 'Person',
 		'name' => $user->first_name() . " " . $user->last_name(),
 	};
 }
 
-sub generate_actor
-{
+sub generate_actor {
 	my ($ce, $db, $user_id) = @_;
 
 	if (!defined($user_id)) {
diff --git a/lib/Caliper/Entity.pm b/lib/Caliper/Entity.pm
index 472b6454c0..11474f4ac3 100644
--- a/lib/Caliper/Entity.pm
+++ b/lib/Caliper/Entity.pm
@@ -15,40 +15,36 @@ use Caliper::Sensor;
 use Caliper::Actor;
 use WeBWorK::Utils qw(grade_set grade_gateway);
 
-sub webwork_app
-{
+sub webwork_app {
 	my ($ce, $db) = @_;
 	my $resource_iri = Caliper::ResourseIri->new($ce);
 
 	# $ce doesn't have WW_VERSION when doing login/logout for some reason
-	my $webwork_dir  = $WeBWorK::Constants::WEBWORK_DIRECTORY;
-	my $seed_ce = new WeBWorK::CourseEnvironment({ webwork_dir => $webwork_dir });
-	my $ww_version = $seed_ce->{WW_VERSION}||"unknown";
+	my $seed_ce    = WeBWorK::CourseEnvironment->new;
+	my $ww_version = $seed_ce->{WW_VERSION} || "unknown";
 
 	return {
-		'id' => $resource_iri->webwork(),
-		'type' => 'SoftwareApplication',
-		'name' => 'WeBWorK',
+		'id'      => $resource_iri->webwork(),
+		'type'    => 'SoftwareApplication',
+		'name'    => 'WeBWorK',
 		'version' => $ww_version,
 	};
 }
 
-sub session
-{
+sub session {
 	my ($ce, $db, $actor, $session_key) = @_;
-	my $resource_iri = Caliper::ResourseIri->new($ce);
+	my $resource_iri     = Caliper::ResourseIri->new($ce);
 	my $session_key_hash = sha1_base64($session_key);
 
 	return {
-		'id' => $resource_iri->user_session($session_key_hash),
-		'type' => 'Session',
-		'user' => $actor,
+		'id'     => $resource_iri->user_session($session_key_hash),
+		'type'   => 'Session',
+		'user'   => $actor,
 		'client' => Caliper::Entity::client($ce, $db, $session_key_hash),
 	};
 }
 
-sub client
-{
+sub client {
 	my ($ce, $db, $session_key_hash) = @_;
 	my $resource_iri = Caliper::ResourseIri->new($ce);
 
@@ -62,23 +58,22 @@ sub client
 	}
 
 	return {
-		'id' => $resource_iri->user_client($session_key_hash),
-		'type' => 'SoftwareApplication',
+		'id'        => $resource_iri->user_client($session_key_hash),
+		'type'      => 'SoftwareApplication',
 		'userAgent' => $ENV{HTTP_USER_AGENT},
 		'ipAddress' => $ip_address,
-		'host' => $ENV{HTTP_HOST},
+		'host'      => $ENV{HTTP_HOST},
 	};
 }
 
-sub membership
-{
+sub membership {
 	my ($ce, $db, $actor, $user_id) = @_;
 	my $resource_iri = Caliper::ResourseIri->new($ce);
 
-	my $user = $db->getUser($user_id);
+	my $user       = $db->getUser($user_id);
 	my $permission = $db->getPermissionLevel($user_id);
 
-	my $roles = [];
+	my $roles  = [];
 	my $status = '';
 
 	if ($user->status() ne 'D') {
@@ -106,22 +101,21 @@ sub membership
 	# guest and nobody aren't tracked
 
 	return {
-		'id' => $resource_iri->user_membership($user_id),
-		'type' => 'Membership',
-		'member' => $actor,
+		'id'           => $resource_iri->user_membership($user_id),
+		'type'         => 'Membership',
+		'member'       => $actor,
 		'organization' => $resource_iri->course(),
-		'roles' => $roles,
-		'status' => $status,
+		'roles'        => $roles,
+		'status'       => $status,
 	};
 }
 
-sub course
-{
+sub course {
 	my ($ce, $db) = @_;
 	my $resource_iri = Caliper::ResourseIri->new($ce);
 
 	my $course_entity = {
-		'id' => $resource_iri->course(),
+		'id'   => $resource_iri->course(),
 		'type' => 'CourseOffering',
 	};
 
@@ -132,54 +126,56 @@ sub course
 	return $course_entity;
 }
 
-sub problem_set
-{
+sub problem_set {
 	my ($ce, $db, $set_id) = @_;
 	my $resource_iri = Caliper::ResourseIri->new($ce);
 
 	my $problem_set = $db->getGlobalSet($set_id);
 
-	my $items = [];
+	my $items       = [];
 	my @problem_ids = $db->listGlobalProblems($set_id);
 	for my $problem_id (@problem_ids) {
-		push(@$items, {
-			'id' => $resource_iri->problem($set_id, $problem_id),
-			'type' => 'AssessmentItem',
-		});
+		push(
+			@$items,
+			{
+				'id'   => $resource_iri->problem($set_id, $problem_id),
+				'type' => 'AssessmentItem',
+			}
+		);
 	}
 
 	my $problem_set_entity = {
-		'id' => $resource_iri->problem_set($set_id),
-		'type' => 'Assessment',
-		'isPartOf' => Caliper::Entity::course($ce, $db),
-		'name' => $set_id,
-		'items' => $items,
+		'id'            => $resource_iri->problem_set($set_id),
+		'type'          => 'Assessment',
+		'isPartOf'      => Caliper::Entity::course($ce, $db),
+		'name'          => $set_id,
+		'items'         => $items,
 		'dateToStartOn' => Caliper::Sensor::formatted_timestamp($problem_set->open_date()),
-		'dateToSubmit' => Caliper::Sensor::formatted_timestamp($problem_set->due_date()),
-		'extensions' => {
-			'answer_date' => $problem_set->answer_date(),
-			'reduced_scoring_date' => $problem_set->reduced_scoring_date(),
-			'visible' => $problem_set->visible(),
-			'enable_reduced_scoring' => $problem_set->enable_reduced_scoring(),
-			'description' => $problem_set->description(),
-			'restricted_release' => $problem_set->restricted_release(),
-			'restricted_status' => $problem_set->restricted_status(),
-			'attempts_per_version' => $problem_set->attempts_per_version(),
-			'time_interval' => $problem_set->time_interval(),
-			'versions_per_interval' => $problem_set->versions_per_interval(),
-			'version_time_limit' => $problem_set->version_time_limit(),
-			'version_creation_time' => $problem_set->version_creation_time(),
-			'problem_randorder' => $problem_set->problem_randorder(),
+		'dateToSubmit'  => Caliper::Sensor::formatted_timestamp($problem_set->due_date()),
+		'extensions'    => {
+			'answer_date'               => $problem_set->answer_date(),
+			'reduced_scoring_date'      => $problem_set->reduced_scoring_date(),
+			'visible'                   => $problem_set->visible(),
+			'enable_reduced_scoring'    => $problem_set->enable_reduced_scoring(),
+			'description'               => $problem_set->description(),
+			'restricted_release'        => $problem_set->restricted_release(),
+			'restricted_status'         => $problem_set->restricted_status(),
+			'attempts_per_version'      => $problem_set->attempts_per_version(),
+			'time_interval'             => $problem_set->time_interval(),
+			'versions_per_interval'     => $problem_set->versions_per_interval(),
+			'version_time_limit'        => $problem_set->version_time_limit(),
+			'version_creation_time'     => $problem_set->version_creation_time(),
+			'problem_randorder'         => $problem_set->problem_randorder(),
 			'version_last_attempt_time' => $problem_set->version_last_attempt_time(),
-			'problems_per_page' => $problem_set->problems_per_page(),
-			'hide_score' => $problem_set->hide_score(),
-			'hide_score_by_problem' => $problem_set->hide_score_by_problem(),
-			'hide_work' => $problem_set->hide_work(),
-			'time_limit_cap' => $problem_set->time_limit_cap(),
-			'restrict_ip' => $problem_set->restrict_ip(),
-			'relax_restrict_ip' => $problem_set->relax_restrict_ip(),
-			'restricted_login_proctor' => $problem_set->restricted_login_proctor(),
-			'hide_hint' => $problem_set->hide_hint(),
+			'problems_per_page'         => $problem_set->problems_per_page(),
+			'hide_score'                => $problem_set->hide_score(),
+			'hide_score_by_problem'     => $problem_set->hide_score_by_problem(),
+			'hide_work'                 => $problem_set->hide_work(),
+			'time_limit_cap'            => $problem_set->time_limit_cap(),
+			'restrict_ip'               => $problem_set->restrict_ip(),
+			'relax_restrict_ip'         => $problem_set->relax_restrict_ip(),
+			'restricted_login_proctor'  => $problem_set->restricted_login_proctor(),
+			'hide_hint'                 => $problem_set->hide_hint(),
 			'restrict_prob_progression' => $problem_set->restrict_prob_progression(),
 		}
 	};
@@ -191,151 +187,159 @@ sub problem_set
 	return $problem_set_entity;
 }
 
-sub problem
-{
+sub problem {
 	my ($ce, $db, $set_id, $problem_id) = @_;
 	my $resource_iri = Caliper::ResourseIri->new($ce);
 
 	my $problem = $db->getGlobalProblem($set_id, $problem_id);
 
 	my $templateDir = $ce->{courseDirs}->{templates};
-	my $tags = WeBWorK::Utils::Tags->new($templateDir.'/'.$problem->source_file());
-	my $keywords = $tags->{'keywords'};
+	my $tags        = WeBWorK::Utils::Tags->new($templateDir . '/' . $problem->source_file());
+	my $keywords    = $tags->{'keywords'};
 	$_ =~ s/(^[\s"']+)|([\s"']+$)//g for @$keywords;
 
-	my %tags_ref = %$tags;
+	my %tags_ref       = %$tags;
 	my $unblessed_tags = \%tags_ref;
 
 	return {
-		'id' => $resource_iri->problem($set_id, $problem_id),
-		'type' => 'AssessmentItem',
-		'name' => 'Problem ' . $problem_id,
-		'isPartOf' => Caliper::Entity::problem_set($ce, $db, $set_id),
-		'keywords' => $keywords,
+		'id'         => $resource_iri->problem($set_id, $problem_id),
+		'type'       => 'AssessmentItem',
+		'name'       => 'Problem ' . $problem_id,
+		'isPartOf'   => Caliper::Entity::problem_set($ce, $db, $set_id),
+		'keywords'   => $keywords,
 		'extensions' => {
-			'source_file' => $problem->source_file(),
-			'value' => $problem->value(),
-			'max_attempts' => $problem->max_attempts(),
+			'source_file'          => $problem->source_file(),
+			'value'                => $problem->value(),
+			'max_attempts'         => $problem->max_attempts(),
 			'att_to_open_children' => $problem->att_to_open_children(),
-			'counts_parent_grade' => $problem->counts_parent_grade(),
-			'showMeAnother' => $problem->showMeAnother(),
-			'showMeAnotherCount' => $problem->showMeAnotherCount(),
-			'prPeriod' => $problem->prPeriod(),
-			'prCount' => $problem->prCount(),
-			'flags' => $problem->flags(),
-			'tags' => $unblessed_tags,
+			'counts_parent_grade'  => $problem->counts_parent_grade(),
+			'showMeAnother'        => $problem->showMeAnother(),
+			'showMeAnotherCount'   => $problem->showMeAnotherCount(),
+			'showHintsAfter'       => $problem->showHintsAfter(),
+			'prPeriod'             => $problem->prPeriod(),
+			'prCount'              => $problem->prCount(),
+			'flags'                => $problem->flags(),
+			'tags'                 => $unblessed_tags,
 		},
 	};
 }
 
-sub problem_user
-{
+sub problem_user {
 	my ($ce, $db, $set_id, $version_id, $problem_id, $user_id, $pg) = @_;
 	my $resource_iri = Caliper::ResourseIri->new($ce);
 
-	my $problem_user = $version_id ?
-		$db->getMergedProblemVersion($user_id, $set_id, $version_id, $problem_id) :
-		$db->getMergedProblem($user_id, $set_id, $problem_id);
+	my $problem_user =
+		$version_id
+		? $db->getMergedProblemVersion($user_id, $set_id, $version_id, $problem_id)
+		: $db->getMergedProblem($user_id, $set_id, $problem_id);
 
 	my $templateDir = $ce->{courseDirs}->{templates};
-	my $tags = WeBWorK::Utils::Tags->new($templateDir.'/'.$problem_user->source_file());
-	my $keywords = $tags->{'keywords'};
+	my $tags        = WeBWorK::Utils::Tags->new($templateDir . '/' . $problem_user->source_file());
+	my $keywords    = $tags->{'keywords'};
 	$_ =~ s/(^[\s"']+)|([\s"']+$)//g for @$keywords;
 
-	my %tags_ref = %$tags;
+	my %tags_ref       = %$tags;
 	my $unblessed_tags = \%tags_ref;
 
 	my $correct_answers = [];
-	foreach my $ans_id (@{$pg->{flags}->{ANSWER_ENTRY_ORDER}//[]} ) {
+	foreach my $ans_id (@{ $pg->{flags}->{ANSWER_ENTRY_ORDER} // [] }) {
 		push @$correct_answers, $pg->{'answers'}->{$ans_id}->{'correct_value'};
 	}
 
 	return {
-		'id' => $resource_iri->problem_user($set_id, $problem_id, $user_id),
-		'type' => 'AssessmentItem',
-		'name' => 'Problem ' . $problem_id,
-		'isPartOf' => Caliper::Entity::problem($ce, $db, $set_id, $problem_id),
-		'keywords' => $keywords,
+		'id'         => $resource_iri->problem_user($set_id, $problem_id, $user_id),
+		'type'       => 'AssessmentItem',
+		'name'       => 'Problem ' . $problem_id,
+		'isPartOf'   => Caliper::Entity::problem($ce, $db, $set_id, $problem_id),
+		'keywords'   => $keywords,
 		'extensions' => {
-			'correct_answers' => $correct_answers,
-			'source_file' => $problem_user->source_file(),
-			'value' => $problem_user->value(),
-			'max_attempts' => $problem_user->max_attempts(),
+			'correct_answers'      => $correct_answers,
+			'source_file'          => $problem_user->source_file(),
+			'value'                => $problem_user->value(),
+			'max_attempts'         => $problem_user->max_attempts(),
 			'att_to_open_children' => $problem_user->att_to_open_children(),
-			'counts_parent_grade' => $problem_user->counts_parent_grade(),
-			'showMeAnother' => $problem_user->showMeAnother(),
-			'showMeAnotherCount' => $problem_user->showMeAnotherCount(),
-			'prPeriod' => $problem_user->prPeriod(),
-			'prCount' => $problem_user->prCount(),
-			'flags' => $problem_user->flags(),
-			'tags' => $unblessed_tags,
-			'problem_seed' => $problem_user->problem_seed(),
-			'source_text' => $problem_user->status(),
-			'problem_source_code' => $pg->{'translator'}->{'source'},
-			'problem_html_text' => $pg->{'body_text'},
-			'status' => $problem_user->status(),
-			'attempted' => $problem_user->attempted(),
-			'last_answer' => $problem_user->last_answer(),
-			'num_correct' => $problem_user->num_correct(),
-			'num_incorrect' => $problem_user->num_incorrect(),
-			'sub_status' => $problem_user->sub_status(),
+			'counts_parent_grade'  => $problem_user->counts_parent_grade(),
+			'showMeAnother'        => $problem_user->showMeAnother(),
+			'showMeAnotherCount'   => $problem_user->showMeAnotherCount(),
+			'showHintsAfter'       => $problem_user->prHintsAfter(),
+			'prPeriod'             => $problem_user->prPeriod(),
+			'prCount'              => $problem_user->prCount(),
+			'flags'                => $problem_user->flags(),
+			'tags'                 => $unblessed_tags,
+			'problem_seed'         => $problem_user->problem_seed(),
+			'source_text'          => $problem_user->status(),
+			'problem_source_code'  => $pg->{problem_source_code},
+			'problem_html_text'    => $pg->{'body_text'},
+			'status'               => $problem_user->status(),
+			'attempted'            => $problem_user->attempted(),
+			'last_answer'          => $problem_user->last_answer(),
+			'num_correct'          => $problem_user->num_correct(),
+			'num_incorrect'        => $problem_user->num_incorrect(),
+			'sub_status'           => $problem_user->sub_status(),
 		}
 	};
 }
 
-sub answer
-{
+sub answer {
 	my ($ce, $db, $set_id, $version_id, $problem_id, $user_id, $pg, $start_time, $end_time) = @_;
 	my $resource_iri = Caliper::ResourseIri->new($ce);
 
-	my $last_answer_id = $db->latestProblemPastAnswer($ce->{"courseName"}, $user_id, ($version_id ? "$set_id,v$version_id" : $set_id), $problem_id);
+	my $last_answer_id =
+		$db->latestProblemPastAnswer($ce->{"courseName"}, $user_id, ($version_id ? "$set_id,v$version_id" : $set_id),
+			$problem_id);
 	my $last_answer = $db->getPastAnswer($last_answer_id);
-	my @answers = split(/\t/, $last_answer->answer_string());
+	my @answers     = split(/\t/, $last_answer->answer_string());
 
 	my $pg_answers_hash = {};
-	foreach my $key (keys %{$pg->{'answers'}})
-	{
-		my %answer_ref = %{$pg->{'answers'}->{$key}};
+	foreach my $key (keys %{ $pg->{'answers'} }) {
+		my %answer_ref       = %{ $pg->{'answers'}->{$key} };
 		my $unblessed_answer = \%answer_ref;
 		$pg_answers_hash->{$key} = $unblessed_answer;
 	}
 
 	return {
-		'id' => $resource_iri->answer($set_id, $problem_id, $user_id),
-		'type' => 'FillinBlankResponse',
-		'attempt' => Caliper::Entity::answer_attempt($ce, $db, $set_id, $version_id, $problem_id, $user_id, $pg, $start_time, $end_time),
-		'values' => \@answers,
+		'id'      => $resource_iri->answer($set_id, $problem_id, $user_id),
+		'type'    => 'FillinBlankResponse',
+		'attempt' => Caliper::Entity::answer_attempt(
+			$ce, $db, $set_id, $version_id, $problem_id, $user_id, $pg, $start_time, $end_time
+		),
+		'values'     => \@answers,
 		'extensions' => {
-			'source_file' => $last_answer->source_file(),
-			'scores' => $last_answer->scores(),
-			'comment' => $last_answer->comment_string(),
+			'source_file'     => $last_answer->source_file(),
+			'scores'          => $last_answer->scores(),
+			'comment'         => $last_answer->comment_string(),
 			'pg_answers_hash' => $pg_answers_hash,
 		}
 	};
 }
 
-sub answer_attempt
-{
+sub answer_attempt {
 	my ($ce, $db, $set_id, $version_id, $problem_id, $user_id, $pg, $start_time, $end_time) = @_;
 	my $resource_iri = Caliper::ResourseIri->new($ce);
 
-	my $problem_user = $version_id ?
-		$db->getMergedProblemVersion($user_id, $set_id, $version_id, $problem_id) :
-		$db->getMergedProblem($user_id, $set_id, $problem_id);
-	my $last_answer_id = $db->latestProblemPastAnswer($ce->{"courseName"}, $user_id, ($version_id ? "$set_id,v$version_id" : $set_id), $problem_id);
+	my $problem_user =
+		$version_id
+		? $db->getMergedProblemVersion($user_id, $set_id, $version_id, $problem_id)
+		: $db->getMergedProblem($user_id, $set_id, $problem_id);
+	my $last_answer_id =
+		$db->latestProblemPastAnswer($ce->{"courseName"}, $user_id, ($version_id ? "$set_id,v$version_id" : $set_id),
+			$problem_id);
 	my $last_answer = $db->getPastAnswer($last_answer_id);
-	my $attempt = $version_id ? $version_id : scalar $db->listProblemPastAnswers($ce->{"courseName"}, $user_id, $set_id, $problem_id);
-    my $score = $problem_user->status || 0;
-	$score = 0 if ($score > 1 || $score < 0 );
+	my $attempt =
+		$version_id
+		? $version_id
+		: scalar $db->listProblemPastAnswers($ce->{"courseName"}, $user_id, $set_id, $problem_id);
+	my $score = $problem_user->status || 0;
+	$score = 0 if ($score > 1 || $score < 0);
 
 	my $answer_attempt = {
-		'id' => $resource_iri->answer_attempt($set_id, $problem_id, $user_id, $last_answer->answer_id()),
-		'type' => 'Attempt',
-		'assignee' => Caliper::Actor::generate_actor($ce, $db, $user_id),
-		'assignable' => $resource_iri->problem_user($set_id, $problem_id, $user_id),
-		'count' => $attempt + 0, #ensure int
+		'id'          => $resource_iri->answer_attempt($set_id, $problem_id, $user_id, $last_answer->answer_id()),
+		'type'        => 'Attempt',
+		'assignee'    => Caliper::Actor::generate_actor($ce, $db, $user_id),
+		'assignable'  => $resource_iri->problem_user($set_id, $problem_id, $user_id),
+		'count'       => $attempt + 0,                                                      #ensure int
 		'dateCreated' => Caliper::Sensor::formatted_timestamp($last_answer->timestamp()),
-		'extensions' => {
+		'extensions'  => {
 			'attempt_score' => $score,
 		}
 	};
@@ -345,21 +349,19 @@ sub answer_attempt
 
 		if ($end_time) {
 			$answer_attempt->{'endedAtTime'} = Caliper::Sensor::formatted_timestamp($end_time);
-			$answer_attempt->{'duration'} = Caliper::Sensor::formatted_duration($end_time - $start_time);
+			$answer_attempt->{'duration'}    = Caliper::Sensor::formatted_duration($end_time - $start_time);
 		}
 	}
 
 	return $answer_attempt;
 }
 
-sub problem_set_attempt
-{
+sub problem_set_attempt {
 	my ($ce, $db, $set_id, $version_id, $user_id, $start_time, $end_time) = @_;
 	my $resource_iri = Caliper::ResourseIri->new($ce);
 
-	my $problem_set_user = $version_id ?
-		$db->getMergedSetVersion($user_id, $set_id, $version_id) :
-		$db->getMergedSet($user_id, $set_id);
+	my $problem_set_user =
+		$version_id ? $db->getMergedSetVersion($user_id, $set_id, $version_id) : $db->getMergedSet($user_id, $set_id);
 
 	my $attempt = 0;
 	if ($version_id) {
@@ -371,21 +373,19 @@ sub problem_set_attempt
 		}
 	}
 
-	my $score = grade_set($db, $problem_set_user, $user_id, $version_id ? 1 : 0);
-	my $extensions = {
-		'attempt_score' => $score,
-	};
+	my $score      = grade_set($db, $problem_set_user, $user_id, $version_id ? 1 : 0);
+	my $extensions = { 'attempt_score' => $score, };
 
 	if ($version_id) {
 		$extensions->{'gateway_score'} = grade_gateway($db, $problem_set_user, $problem_set_user->set_id, $user_id);
 	}
 
 	my $problem_set_attempt = {
-		'id' => $resource_iri->problem_set_attempt($set_id, $user_id, $attempt),
-		'type' => 'Attempt',
-		'assignee' => Caliper::Actor::generate_actor($ce, $db, $user_id),
+		'id'         => $resource_iri->problem_set_attempt($set_id, $user_id, $attempt),
+		'type'       => 'Attempt',
+		'assignee'   => Caliper::Actor::generate_actor($ce, $db, $user_id),
 		'assignable' => $resource_iri->problem_set($set_id),
-		'count' => $attempt + 0, #ensure int
+		'count'      => $attempt + 0,                                                      #ensure int
 		'extensions' => $extensions,
 	};
 
@@ -394,7 +394,7 @@ sub problem_set_attempt
 
 		if ($end_time) {
 			$problem_set_attempt->{'endedAtTime'} = Caliper::Sensor::formatted_timestamp($end_time);
-			$problem_set_attempt->{'duration'} = Caliper::Sensor::formatted_duration($end_time - $start_time);
+			$problem_set_attempt->{'duration'}    = Caliper::Sensor::formatted_duration($end_time - $start_time);
 		}
 	}
 
diff --git a/lib/Caliper/Event.pm b/lib/Caliper/Event.pm
index 08a506cbc5..10d60aa7e3 100644
--- a/lib/Caliper/Event.pm
+++ b/lib/Caliper/Event.pm
@@ -13,26 +13,25 @@ use Caliper::Actor;
 use Caliper::Sensor;
 
 # Constructor
-sub add_defaults
-{
-	my ($r, $event_hash) = @_;
-	my $ce = $r->{ce};
-	my $db = $r->{db};
+sub add_defaults {
+	my ($c, $event_hash) = @_;
+	my $ce = $c->ce;
+	my $db = $c->db;
 	my $ug = new Data::UUID;
 
-	my $user_id = $r->param('user');
-	my $session_key = $r->param('key');
-	my $uuid = $ug->create_str;
-	my $actor = Caliper::Actor::generate_actor($ce, $db, $user_id);
+	my $user_id     = $c->param('user');
+	my $session_key = $c->param('key');
+	my $uuid        = $ug->create_str;
+	my $actor       = Caliper::Actor::generate_actor($ce, $db, $user_id);
 
 	if (!exists($event_hash->{'@context'})) {
 		$event_hash->{'@context'} = 'http://purl.imsglobal.org/ctx/caliper/v1p2';
 	}
-	$event_hash->{'id'} = 'urn:uuid:' . $uuid;
-	$event_hash->{'actor'} = $actor;
-	$event_hash->{'session'} = Caliper::Entity::session($ce, $db, $actor, $session_key);
-	$event_hash->{'edApp'} = Caliper::Entity::webwork_app($ce, $db);
-	$event_hash->{'group'} = Caliper::Entity::course($ce, $db);
+	$event_hash->{'id'}         = 'urn:uuid:' . $uuid;
+	$event_hash->{'actor'}      = $actor;
+	$event_hash->{'session'}    = Caliper::Entity::session($ce, $db, $actor, $session_key);
+	$event_hash->{'edApp'}      = Caliper::Entity::webwork_app($ce, $db);
+	$event_hash->{'group'}      = Caliper::Entity::course($ce, $db);
 	$event_hash->{'membership'} = Caliper::Entity::membership($ce, $db, $actor, $user_id);
 	if (!exists($event_hash->{'eventTime'})) {
 		$event_hash->{'eventTime'} = Caliper::Sensor::formatted_timestamp(time());
diff --git a/lib/Caliper/ResourceIri.pm b/lib/Caliper/ResourceIri.pm
index 1eda4e38a0..0aeab86bb6 100644
--- a/lib/Caliper/ResourceIri.pm
+++ b/lib/Caliper/ResourceIri.pm
@@ -8,15 +8,12 @@ use WeBWorK::DB;
 use WeBWorK::Debug;
 use Data::Dumper;
 
-
 # Constructor
-sub new
-{
+sub new {
 	my ($class, $ce) = @_;
 
 	# need to use $seed_ce in case of logout
-	my $webwork_dir  = $WeBWorK::Constants::WEBWORK_DIRECTORY;
-	my $seed_ce = new WeBWorK::CourseEnvironment({ webwork_dir => $webwork_dir });
+	my $seed_ce  = WeBWorK::CourseEnvironment->new;
 	my $base_url = $seed_ce->{server_root_url} . $seed_ce->{webwork_url};
 	if (defined($seed_ce->{caliper}{base_url}) && $seed_ce->{caliper}{base_url} ne '') {
 		$base_url = $seed_ce->{caliper}{base_url};
@@ -26,93 +23,79 @@ sub new
 	}
 
 	my $self = {
-		ce => $ce,
+		ce       => $ce,
 		base_url => $base_url,
 	};
 	bless $self, $class;
 	return $self;
 }
 
-sub getBaseUrl
-{
+sub getBaseUrl {
 	my $self = shift;
 	return $self->{base_url};
 }
 
-sub webwork
-{
+sub webwork {
 	my $self = shift;
 	return $self->getBaseUrl();
 }
 
-sub course
-{
+sub course {
 	my $self = shift;
 	return $self->getBaseUrl() . $self->{ce}->{"courseName"} . '/';
 }
 
-sub actor_homepage
-{
+sub actor_homepage {
 	my ($self, $user_id) = @_;
-	return $self->course() . 'users/'.$user_id;
+	return $self->course() . 'users/' . $user_id;
 }
 
-sub user_session
-{
+sub user_session {
 	my ($self, $session_key_hash) = @_;
-	return $self->getBaseUrl() . 'session/'. $session_key_hash;
+	return $self->getBaseUrl() . 'session/' . $session_key_hash;
 }
 
-sub user_client
-{
+sub user_client {
 	my ($self, $session_key_hash) = @_;
 	return $self->user_session($session_key_hash) . '/client';
 }
 
-sub user_membership
-{
+sub user_membership {
 	my ($self, $user_id) = @_;
-	return $self->course() . 'instructor/users2/?visible_users='.$user_id;
+	return $self->course() . 'instructor/users2/?visible_users=' . $user_id;
 }
 
-sub problem_set
-{
+sub problem_set {
 	my ($self, $set_id) = @_;
 	return $self->course() . $set_id . '/';
 }
 
-sub problem_set_user
-{
+sub problem_set_user {
 	my ($self, $set_id, $user_id) = @_;
 	return $self->problem_set($set_id) . '?effectiveUser=' . $user_id;
 }
 
-sub problem
-{
+sub problem {
 	my ($self, $set_id, $problem_id) = @_;
 	return $self->problem_set($set_id) . $problem_id . '/';
 }
 
-sub problem_user
-{
+sub problem_user {
 	my ($self, $set_id, $problem_id, $user_id) = @_;
 	return $self->problem($set_id, $problem_id) . '?effectiveUser=' . $user_id;
 }
 
-sub answer
-{
+sub answer {
 	my ($self, $set_id, $problem_id, $user_id) = @_;
 	return $self->problem($set_id, $problem_id) . 'answer/' . '?effectiveUser=' . $user_id;
 }
 
-sub answer_attempt
-{
+sub answer_attempt {
 	my ($self, $set_id, $problem_id, $user_id, $answer_id) = @_;
 	return $self->answer($set_id, $problem_id, $user_id) . '&answer_id=' . $answer_id;
 }
 
-sub problem_set_attempt
-{
+sub problem_set_attempt {
 	my ($self, $set_id, $user_id, $attempt) = @_;
 	return $self->problem_set_user($set_id, $user_id) . '&attempt=' . $attempt;
 }
diff --git a/lib/Caliper/Sensor.pm b/lib/Caliper/Sensor.pm
index 7a65988314..84c3b80cda 100644
--- a/lib/Caliper/Sensor.pm
+++ b/lib/Caliper/Sensor.pm
@@ -17,48 +17,43 @@ use HTTP::Async;
 use Caliper::Event;
 use Caliper::ResourceIri;
 
-
 # Constructor
-sub new
-{
+sub new {
 	my ($class, $ce) = @_;
 	my $self = {
-		ce => $ce,
+		ce      => $ce,
 		enabled => $ce->{caliper}{enabled},
-		host => $ce->{caliper}{host},
+		host    => $ce->{caliper}{host},
 		api_key => $ce->{caliper}{api_key}
 	};
 	bless $self, $class;
 	return $self;
 }
 
-sub caliperEnabled
-{
+sub caliperEnabled {
 	my $self = shift;
 	return $self->{enabled} && exists $self->{host} && exists $self->{api_key};
 }
 
-sub sendEvent
-{
-	my ($self, $r, $event_hash) = @_;
+sub sendEvent {
+	my ($self, $c, $event_hash) = @_;
 
-	return $self->sendEvents($r, [ $event_hash ]);
+	return $self->sendEvents($c, [$event_hash]);
 }
 
-sub sendEvents
-{
-	my ($self, $r, $array_of_events) = @_;
+sub sendEvents {
+	my ($self, $c, $array_of_events) = @_;
 	return 0 unless $self->caliperEnabled();
 
 	for my $event_hash (@$array_of_events) {
-		Caliper::Event::add_defaults($r, $event_hash);
+		Caliper::Event::add_defaults($c, $event_hash);
 	}
 
-	my $ce = $r->{ce};
+	my $ce           = $c->ce;
 	my $resource_iri = Caliper::ResourseIri->new($ce);
-	my $async = HTTP::Async->new;
-	$async->timeout( 5 );
-	$async->max_request_time( 10 );
+	my $async        = HTTP::Async->new;
+	$async->timeout(5);
+	$async->max_request_time(10);
 
 	# chunk events to prevent size issues (send a maximum of 3 events at a time)
 	my $event_chunks = [];
@@ -66,28 +61,36 @@ sub sendEvents
 
 	for my $event_chunk (@$event_chunks) {
 		my $envelope = {
-			'sensor' => $resource_iri->webwork(),
-			'sendTime' => Caliper::Sensor::formatted_timestamp(time()),
+			'sensor'      => $resource_iri->webwork(),
+			'sendTime'    => Caliper::Sensor::formatted_timestamp(time()),
 			'dataVersion' => 'http://purl.imsglobal.org/ctx/caliper/v1p2',
-			'data' => $event_chunk,
+			'data'        => $event_chunk,
 		};
 
 		my $json_payload = JSON->new->canonical->encode($envelope);
 		# debug("Caliper event json_payload: " . $json_payload);
 
-		my $HTTPRequest = HTTP::Request->new('POST', $self->{host}, [
-			'Accept' => '*/*',
-			'Authorization' => 'Bearer ' . $self->{api_key},
-			'Content-Type' => 'application/json',
-		], $json_payload);
+		my $HTTPRequest = HTTP::Request->new(
+			'POST',
+			$self->{host},
+			[
+				'Accept'        => '*/*',
+				'Authorization' => 'Bearer ' . $self->{api_key},
+				'Content-Type'  => 'application/json',
+			],
+			$json_payload
+		);
 		$async->add($HTTPRequest);
 	}
 
-	while ( my $response = $async->wait_for_next_response ) {
+	while (my $response = $async->wait_for_next_response) {
 		if (!$response->is_success) {
 			debug("Caliper event post failed. Error Message: " . $response->message);
 			debug($response->content);
-			$self->log_error("Caliper event post failed. Error Message: ". $response->message . "\nResponse Content: ". $response->content);
+			$self->log_error("Caliper event post failed. Error Message: "
+					. $response->message
+					. "\nResponse Content: "
+					. $response->content);
 		} else {
 			debug("Caliper event post success. Success Message: " . $response->message);
 			debug($response->content);
@@ -95,15 +98,14 @@ sub sendEvents
 	}
 }
 
-sub log_error
-{
+sub log_error {
 	my ($self, $error_message) = @_;
-	my $ce = $self->{ce};
+	my $ce      = $self->{ce};
 	my $logfile = $ce->{caliper}{errorlog};
 
 	my ($sec, $msec) = gettimeofday;
 	my $date = time2str("%a %b %d %H:%M:%S.$msec %Y", $sec);
-	my $msg = "[$date] $error_message\n";
+	my $msg  = "[$date] $error_message\n";
 
 	# create if necessary
 	unless (-e $logfile) {
@@ -114,36 +116,33 @@ sub log_error
 	if (open my $f, ">>", $logfile) {
 		print $f $msg;
 		close $f;
-	}
-	else {
+	} else {
 		debug("Error, unable to open caliper error log file '$logfile' in append mode: $!");
 	}
 }
 
-sub formatted_timestamp
-{
+sub formatted_timestamp {
 	my ($time_value) = @_;
 	# Note: webwork epoch timestamps do not include milliseconds
 	return POSIX::strftime("%Y-%m-%dT%H:%M:%S.000Z", gmtime($time_value));
 }
 
-sub formatted_duration
-{
+sub formatted_duration {
 	my ($duration) = @_;
 
 	# gererate the time portion of a ISO 8601 formatted duration
 	my $seconds = $duration % 60;
 	my $minutes = int($duration / 60) % 60;
-	my $hours = int($duration / 3600);
+	my $hours   = int($duration / 3600);
 
 	my $output = "PT";
 	if ($hours > 0) {
-		$output .= $hours ."H";
+		$output .= $hours . "H";
 	}
 	if ($hours > 0 || $minutes > 0) {
-		$output .= $minutes."M";
+		$output .= $minutes . "M";
 	}
-	$output .= $seconds ."S";
+	$output .= $seconds . "S";
 
 	return $output;
 }
diff --git a/lib/FormatRenderedProblem.pm b/lib/FormatRenderedProblem.pm
index a9d5871404..005b9c2c37 100644
--- a/lib/FormatRenderedProblem.pm
+++ b/lib/FormatRenderedProblem.pm
@@ -1,8 +1,6 @@
-#!/usr/bin/perl -w
-
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -23,143 +21,60 @@ FormatRenderedProblem.pm
 
 package FormatRenderedProblem;
 
-use WeBWorK::Utils::AttemptsTable;
-use WeBWorK::Utils qw(wwRound decode_utf8_base64 getAssetURL);
-use WeBWorK::CGI;
-use XML::Simple qw(XMLout);
-use WeBWorK::Utils::LanguageAndDirection;
+use strict;
+use warnings;
+
 use JSON;
 use Digest::SHA qw(sha1_base64);
+use Mojo::Util qw(xml_escape);
+use Mojo::DOM;
 
-sub new {
-    my $invocant = shift;
-    my $class = ref $invocant || $invocant;
-	$self = {
-		return_object   => {},
-		encoded_source  => {},
-		sourceFilePath  => '',
-		site_url        => 'https://demo.webwork.rochester.edu',
-		form_action_url => '',
-		maketext        => sub { return @_ },
-		courseID        => 'daemon_course',  # optional?
-		userID          => 'daemon',  # optional?
-		course_password => 'daemon',
-		inputs_ref      => {},
-		@_,
-	};
-	bless $self, $class;
-}
-
-sub return_object {   # out
-	my $self = shift;
-	my $object = shift;
-	$self->{return_object} = $object if defined $object and ref($object); # source is non-empty
-	$self->{return_object};
-}
-
-sub encoded_source {
-	my $self = shift;
-	my $source = shift;
-	$self->{encoded_source} = $source if defined $source and $source =~/\S/; # source is non-empty
-	$self->{encoded_source};
-}
-
-sub site_url {
-	my $self = shift;
-	my $new_url = shift;
-	$self->{site_url} = $new_url if defined($new_url) and $new_url =~ /\S/;
-	$self->{site_url};
-}
+use WeBWorK::HTML::AttemptsTable;
+use WeBWorK::Utils qw(getAssetURL);
+use WeBWorK::Utils::LanguageAndDirection;
 
 sub formatRenderedProblem {
-	my $self        = shift;
-	my $problemText = '';
-	my $rh_result   = $self->return_object() || {};  # wrap problem in formats
-	$problemText    = "No output from rendered Problem" unless $rh_result;
+	my $ws = shift;     # $ws is a WebworkWebservice object.
+	my $ce = $ws->ce;
 
-	my $courseID = $self->{courseID} // "";
+	my $rh_result = $ws->return_object;
 
-	# Create a course environment
-	my $ce = WeBWorK::CourseEnvironment->new({
-			webwork_dir => $WeBWorK::Constants::WEBWORK_DIRECTORY,
-			courseName => $courseID,
-			pg_dir => $WeBWorK::Constants::PG_DIRECTORY,
-		});
+	my $forbidGradePassback = 1;    # Default is to forbid, due to the security issue
 
-	my $mt = WeBWorK::Localize::getLangHandle($self->{inputs_ref}{language} // 'en');
-
-	my $forbidGradePassback = 1; # Default is to forbid, due to the security issue
-
-	if ( defined( $ce->{html2xmlAllowGradePassback} ) &&
-	     $ce->{html2xmlAllowGradePassback} eq "This course intentionally enables the insecure LTI grade pass-back feature of html2xml." ) {
-		# It is strongly recommended that you clarify the security risks of enabling the current version of this feature before using it.
+	if (defined($ce->{renderRPCAllowGradePassback})
+		&& $ce->{renderRPCAllowGradePassback} eq
+		'This course intentionally enables the insecure LTI grade pass-back feature of render_rpc.')
+	{
+		# It is strongly recommended that you clarify the security risks of enabling the current version of this feature
+		# before using it.
 		$forbidGradePassback = 0;
 	}
 
 	my $renderErrorOccurred = 0;
 
-	if (ref($rh_result) && $rh_result->{text}) {
-		$problemText = $rh_result->{text};
-	} else {
-		$problemText .= "Unable to decode problem text:<br>$self->{error_string}<br>" .
-			format_hash_ref($rh_result);
-		$rh_result->{problem_result}->{score} = 0; # force score to 0 for such errors.
-		$renderErrorOccurred = 1;
-		$forbidGradePassback = 1; # due to render error
-	}
-
-	my $SITE_URL = $self->site_url // '';
-	my $FORM_ACTION_URL = $self->{form_action_url} // '';
-
-	# Local docker usage with a port number sometimes misbehaves if the port number
-	# is not forced into $SITE_URL and $FORM_ACTION_URL
-	my $forcePortNumber = ($self->{inputs_ref}{forcePortNumber}) // '';
-	if ($forcePortNumber =~ /^[0-9]+$/) {
-		$forcePortNumber = 0 + $forcePortNumber;
-		if (!($SITE_URL =~ /:${forcePortNumber}/)) {
-			$SITE_URL .= ":${forcePortNumber}";
-		}
-		if (!($FORM_ACTION_URL =~ m+:${forcePortNumber}/webwork2/html2xml+)) {
-			$FORM_ACTION_URL =~ s+/webwork2/html2xml+:${forcePortNumber}/webwork2/html2xml+; # Ex: "http://localhost:8080/webwork2/html2xml"
-		}
+	my $problemText = $rh_result->{text} // '';
+	if ($rh_result->{flags}{error_flag}) {
+		$rh_result->{problem_result}{score} = 0;    # force score to 0 for such errors.
+		$renderErrorOccurred                = 1;
+		$forbidGradePassback                = 1;    # due to render error
 	}
 
-	my $userID = $self->{userID} // "";
-	my $course_password = $self->{course_password} // "";
-	my $problemSeed = $rh_result->{problem_seed} // $self->{inputs_ref}{problemSeed} // 6666;
-	my $psvn = $rh_result->{psvn} // $self->{inputs_ref}{psvn} // 54321;
-	my $session_key = $rh_result->{session_key} // "";
-	my $displayMode = $self->{inputs_ref}{displayMode};
-	my $hideWasNotRecordedMessage = $ce->{hideWasNotRecordedMessage} // 0;
-
-	# HTML document language settings
-	my $formLanguage = $self->{inputs_ref}{language} // 'en';
-	my $COURSE_LANG_AND_DIR = get_lang_and_dir($formLanguage);
-
-	# Problem source
-	my $sourceFilePath = $self->{sourceFilePath} // "";
-	my $fileName = $self->{input}{envir}{fileName} // "";
-	my $encoded_source = $self->encoded_source // "";
+	my $SITE_URL = $ws->c->server_root_url;
 
-	# Select the theme.
-	my $theme = $self->{inputs_ref}{theme} || $ce->{defaultTheme};
+	my $displayMode = $ws->{inputs_ref}{displayMode} // 'MathJax';
 
-	# Add the favicon.
-	my $favicon = CGI::Link({ href => "$ce->{webworkURLs}{htdocs}/images/favicon.ico", rel => 'shortcut icon' });
+	# HTML document language setting
+	my $formLanguage = $ws->{inputs_ref}{language} // 'en';
 
-	# Set up the header text
-	my $problemHeadText = '';
-
-	# CSS Loads
+	# Third party CSS
 	# The second element of each array in the following is whether or not the file is a theme file.
-	my @CSSLoads = map { getAssetURL($ce, $_->[0], $_->[1]) } (
-		['bootstrap.css', 1],
-		['node_modules/jquery-ui-dist/jquery-ui.min.css', 0],
-		['node_modules/@fortawesome/fontawesome-free/css/all.min.css', 0],
-		['math4.css', 1],
-		['math4-overrides.css', 1],
+	my @third_party_css = map { getAssetURL($ce, $_->[0], $_->[1]) } (
+		[ 'bootstrap.css',                                              1 ],
+		[ 'node_modules/jquery-ui-dist/jquery-ui.min.css',              0 ],
+		[ 'node_modules/@fortawesome/fontawesome-free/css/all.min.css', 0 ],
+		[ 'math4.css',                                                  1 ],
+		[ 'math4-overrides.css',                                        1 ],
 	);
-	$problemHeadText .= CGI::Link({ href => $_, rel => 'stylesheet' }) for (@CSSLoads);
 
 	# Add CSS files requested by problems via ADD_CSS_FILE() in the PG file
 	# or via a setting of $ce->{pg}{specialPGEnvironmentVars}{extra_css_files}
@@ -178,34 +93,28 @@ sub formatRenderedProblem {
 		$cssFilesAdded{ $_->{file} } = 1;
 		if ($_->{external}) {
 			push(@extra_css_files, $_);
-			$problemHeadText .= CGI::Link({ href => $_->{file}, rel => 'stylesheet' });
 		} else {
-			my $url = getAssetURL($ce, $_->{file});
-			push(@extra_css_files, { file => $url, external => 0 });
-			$problemHeadText .= CGI::Link({ href => $url, rel => 'stylesheet' });
+			push(@extra_css_files, { file => getAssetURL($ce, $_->{file}), external => 0 });
 		}
 	}
 
-	# JS Loads
+	# Third party JavaScript
 	# The second element of each array in the following is whether or not the file is a theme file.
 	# The third element is a hash containing the necessary attributes for the script tag.
-	my @JSLoads = map { [ getAssetURL($ce, $_->[0], $_->[1]), $_->[2] ] } (
+	my @third_party_js = map { [ getAssetURL($ce, $_->[0], $_->[1]), $_->[2] ] } (
 		[ 'node_modules/jquery/dist/jquery.min.js',                            0, {} ],
 		[ 'node_modules/jquery-ui-dist/jquery-ui.min.js',                      0, {} ],
 		[ 'node_modules/iframe-resizer/js/iframeResizer.contentWindow.min.js', 0, {} ],
-		[ 'js/apps/MathJaxConfig/mathjax-config.js',                0, { defer => undef } ],
+		[ 'js/MathJaxConfig/mathjax-config.js',                     0, { defer => undef } ],
 		[ 'node_modules/mathjax/es5/tex-svg.js',                    0, { defer => undef, id => 'MathJax-script' } ],
 		[ 'node_modules/bootstrap/dist/js/bootstrap.bundle.min.js', 0, { defer => undef } ],
-		[ 'js/apps/Problem/problem.js',                             0, { defer => undef } ],
+		[ 'js/Problem/problem.js',                                  0, { defer => undef } ],
 		[ 'math4.js',                                               1, { defer => undef } ],
 		[ 'math4-overrides.js',                                     1, { defer => undef } ]
 	);
-	$problemHeadText .= CGI::script({ src => $_->[0], %{$_->[1] // {}} }, '') for (@JSLoads);
 
-	# Add the local storage javascript for the sticky format.
-	$problemHeadText .=
-		CGI::script({ src => getAssetURL($ce, 'js/apps/LocalStorage/localstorage.js'), defer => undef }, '')
-		if ($self->{inputs_ref}{outputformat} // '') eq 'sticky';
+	# Get the requested format.
+	my $formatName = $ws->{inputs_ref}{outputformat} // 'simple';
 
 	# Add JS files requested by problems via ADD_JS_FILE() in the PG file.
 	my @extra_js_files;
@@ -217,273 +126,192 @@ sub formatRenderedProblem {
 			my %attributes = ref($_->{attributes}) eq 'HASH' ? %{ $_->{attributes} } : ();
 			if ($_->{external}) {
 				push(@extra_js_files, $_);
-				$problemHeadText .= CGI::script({ src => $_->{file}, %attributes }, '');
 			} else {
-				my $url = getAssetURL($ce, $_->{file});
-				push(@extra_js_files, { file => $url, external => 0, attributes => $_->{attributes} });
-				$problemHeadText .= CGI::script({ src => $url, %attributes }, '');
+				push(@extra_js_files,
+					{ file => getAssetURL($ce, $_->{file}), external => 0, attributes => $_->{attributes} });
 			}
 		}
 	}
 
-	$problemHeadText .= $rh_result->{header_text} // '';
-	$problemHeadText .= $rh_result->{post_header_text} // '';
-	$extra_header_text = $self->{inputs_ref}{extra_header_text} // '';
-	$problemHeadText .= $extra_header_text;
-
 	# Set up the problem language and direction
-	# PG files can request their language and text direction be set.  If we do
-	# not have access to a default course language, fall back to the
-	# $formLanguage instead.
-	my %PROBLEM_LANG_AND_DIR = get_problem_lang_and_dir($rh_result->{flags}, $ce->{perProblemLangAndDirSettingMode}, $formLanguage);
-	my $PROBLEM_LANG_AND_DIR = join(" ", map { qq{$_="$PROBLEM_LANG_AND_DIR{$_}"} } keys %PROBLEM_LANG_AND_DIR);
-
-	my $previewMode = defined($self->{inputs_ref}{preview}) || 0;
-	my $checkMode = defined($self->{inputs_ref}{WWcheck}) || 0;
-	my $submitMode = defined($self->{inputs_ref}{WWsubmit}) || 0;
-	my $showCorrectMode = defined($self->{inputs_ref}{WWcorrectAns}) || 0;
-	# problemUUID can be added to the request as a parameter.  It adds a prefix
-	# to the identifier used by the  format so that several different problems
-	# can appear on the same page.
-	my $problemUUID = $self->{inputs_ref}{problemUUID} // 1;
-	my $problemResult = $rh_result->{problem_result} // '';
-	my $problemState = $rh_result->{problem_state} // '';
-	my $showSummary = $self->{inputs_ref}{showSummary} // 1;
-	my $showAnswerNumbers = $self->{inputs_ref}{showAnswerNumbers} // 1;
-
-	my $color_input_blanks_script = "";
+	# PG files can request their language and text direction be set.  If we do not have access to a default course
+	# language, fall back to the $formLanguage instead.
+	my %PROBLEM_LANG_AND_DIR =
+		get_problem_lang_and_dir($rh_result->{flags}, $ce->{perProblemLangAndDirSettingMode}, $formLanguage);
+	my $PROBLEM_LANG_AND_DIR = join(' ', map {qq{$_="$PROBLEM_LANG_AND_DIR{$_}"}} keys %PROBLEM_LANG_AND_DIR);
+
+	my $previewMode     = defined($ws->{inputs_ref}{preview})      || 0;
+	my $submitMode      = defined($ws->{inputs_ref}{WWsubmit})     || 0;
+	my $showCorrectMode = defined($ws->{inputs_ref}{WWcorrectAns}) || 0;
+	# A problemUUID should be added to the request as a parameter.  It is used by PG to create a proper UUID for use in
+	# aliases for resources.  It should be unique for a course, user, set, problem, and version.
+	my $problemUUID       = $ws->{inputs_ref}{problemUUID}       // '';
+	my $problemResult     = $rh_result->{problem_result}         // {};
+	my $showSummary       = $ws->{inputs_ref}{showSummary}       // 1;
+	my $showAnswerNumbers = $ws->{inputs_ref}{showAnswerNumbers} // 1;
 
 	# Attempts table
-	my $answerTemplate = "";
+	my $answerTemplate = '';
 
-	if ($renderErrorOccurred) {
-		# Do not produce an AttemptsTable when we had a rendering error.
-		$answerTemplate = '<!-- No AttemptsTable on errors like this. --> ';
-	} else {
-		my $tbl = WeBWorK::Utils::AttemptsTable->new(
-			$rh_result->{answers} // {},
-			answersSubmitted    => $self->{inputs_ref}{answersSubmitted} // 0,
+	# Do not produce an AttemptsTable when we had a rendering error.
+	if (!$renderErrorOccurred) {
+		my $tbl = WeBWorK::HTML::AttemptsTable->new(
+			$rh_result->{answers} // {}, $ws->c,
+			answersSubmitted    => $ws->{inputs_ref}{answersSubmitted}     // 0,
 			answerOrder         => $rh_result->{flags}{ANSWER_ENTRY_ORDER} // [],
 			displayMode         => $displayMode,
 			showAnswerNumbers   => $showAnswerNumbers,
 			ce                  => $ce,
 			showAttemptPreviews => $previewMode || $submitMode || $showCorrectMode,
-			showAttemptResults  => $submitMode || $showCorrectMode,
+			showAttemptResults  => $submitMode  || $showCorrectMode,
 			showCorrectAnswers  => $showCorrectMode,
 			showMessages        => $previewMode || $submitMode || $showCorrectMode,
-			showSummary         => (($showSummary and ($submitMode or $showCorrectMode)) // 0) ? 1 : 0,
+			showSummary         => (($showSummary && ($submitMode || $showCorrectMode)) // 0) ? 1 : 0,
 			maketext            => WeBWorK::Localize::getLoc($formLanguage),
-			summary             => $problemResult->{summary} // '', # can be set by problem grader
+			summary             => $problemResult->{summary} // '',    # can be set by problem grader
 		);
 		$answerTemplate = $tbl->answerTemplate;
 		$tbl->imgGen->render(refresh => 1) if $tbl->displayMode eq 'images';
 	}
-	# Score summary
-	my $scoreSummary = '';
-
-	if ($submitMode) {
-		if ($renderErrorOccurred) {
-			$scoreSummary  = '<!-- No scoreSummary on errors. -->';
-		} elsif ($problemResult) {
-			$scoreSummary = CGI::p($mt->maketext("You received a score of [_1] for this attempt.",
-				wwRound(0, $problemResult->{score} * 100) . '%'));
-			$scoreSummary .= CGI::p($problemResult->{msg}) if ($problemResult->{msg});
-
-			$scoreSummary .= CGI::p($mt->maketext("Your score was not recorded.")) unless $hideWasNotRecordedMessage;
-			$scoreSummary .= CGI::hidden({id => 'problem-result-score', name => 'problem-result-score', value => $problemResult->{score}});
-		}
-	}
-	if ( !$forbidGradePassback && !$submitMode ) {
-		$forbidGradePassback = 1;
-	}
 
 	# Answer hash in XML format used by the PTX format.
-	my $answerhashXML = XMLout($rh_result->{answers} // {}, RootName => 'answerhashes')
-	if $self->{inputs_ref}{outputformat} // "" eq "ptx";
-
-	# Sticky format local storage messages
-	my $localStorageMessages = CGI::div({ id => 'local-storage-messages' },
-		CGI::p('Your overall score for this problem is&nbsp;' . CGI::span({ id => 'problem-overall-score' }, '')));
-
-	# Submit buttons (all are shown by default)
-	my $showPreviewButton = $self->{inputs_ref}{showPreviewButton} // '';
-	my $previewButton     = $showPreviewButton eq '0' ? '' : CGI::submit({
-		name  => 'preview',
-		id    => 'previewAnswers_id',
-		class => 'btn btn-primary mb-1',
-		value => $mt->maketext('Preview My Answers')
-	});
-	my $showCheckAnswersButton = $self->{inputs_ref}{showCheckAnswersButton} // '';
-	my $checkAnswersButton =
-		$showCheckAnswersButton eq '0'
-		? ''
-		: CGI::submit({ name => 'WWsubmit', class => 'btn btn-primary mb-1', value => $mt->maketext('Check Answers') });
-	my $showCorrectAnswersButton = $self->{inputs_ref}{showCorrectAnswersButton} // '';
-	my $correctAnswersButton =
-		$showCorrectAnswersButton eq '0'
-		? ''
-		: CGI::submit(
-			{ name => 'WWcorrectAns', class => 'btn btn-primary mb-1', value => $mt->maketext('Show Correct Answers') }
-		);
-
-	my $showSolutions = $self->{inputs_ref}{showSolutions} // "";
-	my $showHints = $self->{inputs_ref}{showHints} // "";
+	my $answerhashXML = '';
+	if ($formatName eq 'ptx') {
+		my $dom = Mojo::DOM->new->xml(1);
+		for my $answer (sort keys %{ $rh_result->{answers} }) {
+			$dom->append_content($dom->new_tag(
+				$answer,
+				map { $_ => ($rh_result->{answers}{$answer}{$_} // '') } keys %{ $rh_result->{answers}{$answer} }
+			));
+		}
+		$dom->wrap_content('<answerhashes></answerhashes>');
+		$answerhashXML = $dom->to_string;
 
-	# Regular Perl warning messages generated with warn.
-	my $warnings = '';
-	if ($rh_result->{pg_warnings}) {
-		$warnings .= CGI::div(
-			{ class => 'alert alert-danger mb-2 p-1' },
-			CGI::h3('Warning Messages') . join('<br>', split("\n", decode_utf8_base64($rh_result->{pg_warnings})))
-		);
+		$ws->c->res->headers->content_type('text/xml; charset=utf-8')
+			if $ws->c->current_route eq 'render_rpc' && ($ws->c->param('displayMode') // '') eq 'PTX';
 	}
-	if ($rh_result->{translator_warnings}) {
-		$warnings .= CGI::div(
-			{ class => 'alert alert-danger mb-2 p-1' },
-			CGI::h3('Translator Warnings')
-				. join('<br>', split("\n", decode_utf8_base64($rh_result->{translator_warnings})))
-		);
-	}
-
-	# PG debug messages generated with DEBUG_message();
-	$rh_result->{debug_messages} = join("<br>", @{$rh_result->{debug_messages} || []});
 
-	# PG warning messages generated with WARN_message();
-	my $PG_warning_messages = join("<br>", @{$rh_result->{warning_messages} || []});
+	# Make sure this is defined and is an array reference as saveGradeToLTI might add to it.
+	$rh_result->{debug_messages} = [] unless defined $rh_result && ref $rh_result eq 'ARRAY';
 
-	# Internal debug messages generated within PG_core.
-	# These are sometimes needed if the PG_core warning message system isn't properly set
-	# up before the bug occurs.  In general don't use these unless necessary.
-	my $internal_debug_messages = join("<br>", @{$rh_result->{internal_debug_messages} || []});
+	$forbidGradePassback = 1 if !$forbidGradePassback && !$submitMode;
 
 	# Try to save the grade to an LTI if one provided us data (depending on $forbidGradePassback)
-	my $LTIGradeMessage = saveGradeToLTI($self, $ce, $rh_result, $forbidGradePassback);
-
-	my $debug_messages = $rh_result->{debug_messages};
-
-	# For debugging purposes (only used in the debug format)
-	my $clientDebug = $self->{inputs_ref}{clientDebug} // "";
-	my $client_debug_data = $clientDebug ? CGI::h3('Webwork client data') . WebworkClient::pretty_print($self) : '';
-
-	# Show the footer unless it is explicity disabled.
-	my $showFooter = $self->{inputs_ref}{showFooter} // "";
-	my $footer = $showFooter eq "0" ? '' : CGI::div(
-		{ id => 'footer' },
-		"WeBWorK &copy; 2000-2022 | host: $SITE_URL | course: $courseID | "
-			. "format: $self->{inputs_ref}{outputformat} | theme: $theme"
-	);
+	my $LTIGradeMessage = saveGradeToLTI($ws, $ce, $rh_result, $forbidGradePassback);
 
 	# Execute and return the interpolated problem template
-	my $format_name = $self->{inputs_ref}{outputformat} // 'simple';
-
-	# The json format
-	if ($format_name eq "json") {
-		my $json_output = do("WebworkClient/json_format.pl");
-		for my $key (keys %{$json_output->{hidden_input_field}}) {
-			$json_output->{hidden_input_field}{$key} =~ s/(\$\w+)/$1/gee;
-		}
-
-		for my $key (keys %$json_output) {
-			if (
-				($key =~ /^real_webwork/) ||
-				($key =~ /^internal/) ||
-				($key =~ /_A?VI$/)
-			) {
-				# Interpolate values
-				if ($key =~ /_AVI$/) {
-					map { s/(\$\w+)/$1/gee } @{$json_output->{$key}};
-				} else {
-					$json_output->{$key} =~ s/(\$\w+)/$1/gee;
-				}
-				if (($key =~ /_A?VI$/)) {
-					my $new_key = $key =~ s/_A?VI$//r;
-					$json_output->{$new_key} = $json_output->{$key};
-					delete $json_output->{$key};
-				}
-			}
-		}
-
-		# CSS Loads
-		$json_output->{head_part100} = \@CSSLoads;
-
-		# JS Loads
-		$json_output->{head_part200} = \@JSLoads;
-
-		# Add the current score to the %json_output
-		my $json_score = 0;
-		if ($submitMode && $problemResult) {
-			$json_score = wwRound(0, $problemResult->{score} * 100);
-		}
-		$json_output->{score} = $json_score;
-
-		return JSON->new->utf8(0)->encode($json_output);
-	}
 
 	# Raw format
 	# This format returns javascript object notation corresponding to the perl hash
 	# with everything that a client-side application could use to work with the problem.
 	# There is no wrapping HTML "_format" template.
-	if ($format_name eq "raw") {
+	if ($formatName eq 'raw') {
 		my $output = {};
 
 		# Everything that ships out with other formats can be constructed from these
-		$output->{rh_result} = $rh_result;
-		$output->{inputs_ref} = $self->{inputs_ref};
-		$output->{input} = $self->{input};
+		$output->{rh_result}  = $rh_result;
+		$output->{inputs_ref} = $ws->{inputs_ref};
+		$output->{input}      = $ws->{input};
 
 		# The following could be constructed from the above, but this is a convenience
-		$output->{answerTemplate} = $answerTemplate if ($answerTemplate);
-		$output->{lang} = $PROBLEM_LANG_AND_DIR{lang};
-		$output->{dir} = $PROBLEM_LANG_AND_DIR{dir};
+		$output->{answerTemplate}  = $answerTemplate->to_string if $answerTemplate;
+		$output->{lang}            = $PROBLEM_LANG_AND_DIR{lang};
+		$output->{dir}             = $PROBLEM_LANG_AND_DIR{dir};
 		$output->{extra_css_files} = \@extra_css_files;
-		$output->{extra_js_files} = \@extra_js_files;
+		$output->{extra_js_files}  = \@extra_js_files;
 
 		# Include third party css and javascript files.  Only jquery, jquery-ui, mathjax, and bootstrap are needed for
 		# PG.  See the comments before the subroutine definitions for load_css and load_js in pg/macros/PG.pl.
 		# The other files included are only needed to make themes work in the webwork2 formats.
-		$output->{third_party_css} = \@CSSLoads;
-		$output->{third_party_js} = \@JSLoads;
+		$output->{third_party_css} = \@third_party_css;
+		$output->{third_party_js}  = \@third_party_js;
 
 		# Say what version of WeBWorK this is
 		$output->{ww_version} = $ce->{WW_VERSION};
 		$output->{pg_version} = $ce->{PG_VERSION};
 
-		# Convert to JSON
-		return JSON->new->utf8(0)->encode($output);
+		# Convert to JSON and render.
+		return $ws->c->render(data => JSON->new->utf8(1)->encode($output));
 	}
 
-	# Find and execute the appropriate template in the WebworkClient folder.
-	my $template = do("$WeBWorK::Constants::WEBWORK_DIRECTORY/lib/WebworkClient/${format_name}_format.pl");
-	return "Unknown format name $format_name<br>" unless $template;
-
-	# Interpolate values into the template
-	$template =~ s/(\$\w+)/$1/gee;
+	# Setup arnd render the appropriate template in the templates/RPCRenderFormats folder depending on the outputformat.
+	# "ptx" has a special template.  "json" uses the default json template.  All others use the default html template.
+	my %template_params = (
+		template => $formatName eq 'ptx' ? 'RPCRenderFormats/ptx' : 'RPCRenderFormats/default',
+		$formatName eq 'json' ? (format => 'json') : (),
+		formatName               => $formatName,
+		ws                       => $ws,
+		ce                       => $ce,
+		lh                       => WeBWorK::Localize::getLangHandle($ws->{inputs_ref}{language} // 'en'),
+		rh_result                => $rh_result,
+		SITE_URL                 => $SITE_URL,
+		FORM_ACTION_URL          => $SITE_URL . $ws->c->webwork_url . '/render_rpc',
+		COURSE_LANG_AND_DIR      => get_lang_and_dir($formLanguage),
+		theme                    => $ws->{inputs_ref}{theme} || $ce->{defaultTheme},
+		courseID                 => $ws->{inputs_ref}{courseID} // '',
+		user                     => $ws->{inputs_ref}{user}     // '',
+		passwd                   => $ws->{inputs_ref}{passwd}   // '',
+		key                      => $ws->authen->{session_key},
+		PROBLEM_LANG_AND_DIR     => $PROBLEM_LANG_AND_DIR,
+		problemSeed              => $rh_result->{problem_seed} // $ws->{inputs_ref}{problemSeed} // 6666,
+		psvn                     => $rh_result->{psvn}         // $ws->{inputs_ref}{psvn}        // 54321,
+		problemUUID              => $problemUUID,
+		displayMode              => $displayMode,
+		third_party_css          => \@third_party_css,
+		extra_css_files          => \@extra_css_files,
+		third_party_js           => \@third_party_js,
+		extra_js_files           => \@extra_js_files,
+		problemText              => $problemText,
+		extra_header_text        => $ws->{inputs_ref}{extra_header_text} // '',
+		answerTemplate           => $answerTemplate,
+		showScoreSummary         => $submitMode && !$renderErrorOccurred && $problemResult,
+		answerhashXML            => $answerhashXML,
+		LTIGradeMessage          => $LTIGradeMessage,
+		sourceFilePath           => $ws->{inputs_ref}{sourceFilePath}          // '',
+		problemSource            => $ws->{inputs_ref}{problemSource}           // '',
+		uriEncodedProblemSource  => $ws->{inputs_ref}{uriEncodedProblemSource} // '',
+		fileName                 => $ws->{inputs_ref}{fileName}                // '',
+		formLanguage             => $formLanguage,
+		isInstructor             => $ws->{inputs_ref}{isInstructor}       // '',
+		forceScaffoldsOpen       => $ws->{inputs_ref}{forceScaffoldsOpen} // '',
+		showSummary              => $showSummary,
+		showHints                => $ws->{inputs_ref}{showHints}     // '',
+		showSolutions            => $ws->{inputs_ref}{showSolutions} // '',
+		showAnswerNumbers        => $showAnswerNumbers,
+		showPreviewButton        => $ws->{inputs_ref}{showPreviewButton}        // '',
+		showCheckAnswersButton   => $ws->{inputs_ref}{showCheckAnswersButton}   // '',
+		showCorrectAnswersButton => $ws->{inputs_ref}{showCorrectAnswersButton} // '',
+		showFooter               => $ws->{inputs_ref}{showFooter}               // '',
+		pretty_print             => \&pretty_print
+	);
 
-	return $template unless $self->{inputs_ref}{send_pg_flags};
-	return JSON->new->utf8(0)->encode({ html => $template, pg_flags => $rh_result->{flags}, warnings => $warnings });
+	return $ws->c->render(%template_params) if $formatName eq 'json' || !$ws->{inputs_ref}{send_pg_flags};
+	return $ws->c->render(
+		json => { html => $ws->c->render_to_string(%template_params)->to_string, pg_flags => $rh_result->{flags} });
 }
 
 sub saveGradeToLTI {
-	my ($self, $ce, $rh_result, $forbidGradePassback) = @_;
+	my ($ws, $ce, $rh_result, $forbidGradePassback) = @_;
 	# When $forbidGradePassback is set, we will block the actual submission,
 	# but we still provide the LTI data in the hidden fields.
 
-	return "" if !(defined($self->{inputs_ref}{lis_outcome_service_url}) &&
-		defined($self->{inputs_ref}{'oauth_consumer_key'}) &&
-		defined($self->{inputs_ref}{'oauth_signature_method'}) &&
-		defined($self->{inputs_ref}{'lis_result_sourcedid'}) &&
-		defined($ce->{'LISConsumerKeyHash'}{$self->{inputs_ref}{'oauth_consumer_key'}}));
+	return ''
+		if !(defined($ws->{inputs_ref}{lis_outcome_service_url})
+			&& defined($ws->{inputs_ref}{'oauth_consumer_key'})
+			&& defined($ws->{inputs_ref}{'oauth_signature_method'})
+			&& defined($ws->{inputs_ref}{'lis_result_sourcedid'})
+			&& defined($ce->{'LISConsumerKeyHash'}{ $ws->{inputs_ref}{'oauth_consumer_key'} }));
 
-	my $request_url = $self->{inputs_ref}{lis_outcome_service_url};
-	my $consumer_key = $self->{inputs_ref}{'oauth_consumer_key'};
-	my $signature_method = $self->{inputs_ref}{'oauth_signature_method'};
-	my $sourcedid = $self->{inputs_ref}{'lis_result_sourcedid'};
-	my $consumer_secret = $ce->{'LISConsumerKeyHash'}{$consumer_key};
-	my $score = $rh_result->{problem_result} ? $rh_result->{problem_result}{score} : 0;
+	my $request_url      = $ws->{inputs_ref}{lis_outcome_service_url};
+	my $consumer_key     = $ws->{inputs_ref}{'oauth_consumer_key'};
+	my $signature_method = $ws->{inputs_ref}{'oauth_signature_method'};
+	my $sourcedid        = $ws->{inputs_ref}{'lis_result_sourcedid'};
+	my $consumer_secret  = $ce->{'LISConsumerKeyHash'}{$consumer_key};
+	my $score            = $rh_result->{problem_result} ? $rh_result->{problem_result}{score} : 0;
 
 	my $LTIGradeMessage = '';
 
-	if ( ! $forbidGradePassback ) {
+	if (!$forbidGradePassback) {
 
 		# This is boilerplate XML used to submit the $score for $sourcedid
 		my $replaceResultXML = <<EOS;
@@ -520,19 +348,19 @@ EOS
 			$bodyhash .= '=';
 		}
 
-		my $requestGen = Net::OAuth->request("consumer");
+		my $requestGen = Net::OAuth->request('consumer');
 
 		$requestGen->add_required_message_params('body_hash');
 
 		my $gradeRequest = $requestGen->new(
-			request_url => $request_url,
-			request_method => "POST",
-			consumer_secret => $consumer_secret,
-			consumer_key => $consumer_key,
+			request_url      => $request_url,
+			request_method   => 'POST',
+			consumer_secret  => $consumer_secret,
+			consumer_key     => $consumer_key,
 			signature_method => $signature_method,
-			nonce => int(rand( 2**32)),
-			timestamp => time(),
-			body_hash => $bodyhash
+			nonce            => int(rand(2**32)),
+			timestamp        => time(),
+			body_hash        => $bodyhash
 		);
 		$gradeRequest->sign();
 
@@ -552,31 +380,73 @@ EOS
 			$response->content =~ /<imsx_codeMajor>\s*(\w+)\s*<\/imsx_codeMajor>/;
 			my $message = $1;
 			if ($message ne 'success') {
-				$LTIGradeMessage = CGI::p("Unable to update LMS grade. Error: ".$message);
-				$rh_result->{debug_messages} .= CGI::escapeHTML($response->content);
+				$LTIGradeMessage = $ws->c->tag('p', "Unable to update LMS grade. Error: $message")->to_string;
+				push(@{ $rh_result->{debug_messages} }, xml_escape($response->content));
 			} else {
-				$LTIGradeMessage = CGI::p("Grade sucessfully saved.");
+				$LTIGradeMessage = $ws->c->tag('p', 'Grade sucessfully saved.')->to_string;
 			}
 		} else {
-			$LTIGradeMessage = CGI::p("Unable to update LMS grade. Error: ".$response->message);
-			$rh_result->{debug_messages} .= CGI::escapeHTML($response->content);
+			$LTIGradeMessage = $ws->c->tag('p', 'Unable to update LMS grade. Error: ' . $response->message)->to_string;
+			push(@{ $rh_result->{debug_messages} }, xml_escape($response->content));
 		}
 	}
 
 	# save parameters for next time
-	$LTIGradeMessage .= CGI::input({type => 'hidden', name => 'lis_outcome_service_url', value => $request_url});
-	$LTIGradeMessage .= CGI::input({type => 'hidden', name => 'oauth_consumer_key', value => $consumer_key});
-	$LTIGradeMessage .= CGI::input({type => 'hidden', name => 'oauth_signature_method', value => $signature_method});
-	$LTIGradeMessage .= CGI::input({type => 'hidden', name => 'lis_result_sourcedid', value => $sourcedid});
+	$LTIGradeMessage .= $ws->c->hidden_field(lis_outcome_service_url => $request_url)->to_string;
+	$LTIGradeMessage .= $ws->c->hidden_field(oauth_consumer_key      => $consumer_key)->to_string;
+	$LTIGradeMessage .= $ws->c->hidden_field(oauth_signature_method  => $signature_method)->to_string;
+	$LTIGradeMessage .= $ws->c->hidden_field(lis_result_sourcedid    => $sourcedid)->to_string;
 
 	return $LTIGradeMessage;
 }
 
-# error formatting
-sub format_hash_ref {
-	my $hash = shift;
-	warn "Use a hash reference" unless ref($hash) =~ /HASH/;
-	return join(" ", map { $_= "--" unless defined($_); $_ } %$hash) . "\n";
+# Nice output for debugging
+sub pretty_print {
+	my ($r_input, $level) = @_;
+	$level //= 4;
+	$level--;
+	return '' unless $level > 0;    # Only print three levels of hashes (safety feature)
+	my $out = '';
+	if (!ref $r_input) {
+		$out = $r_input if defined $r_input;
+		$out =~ s/</&lt;/g;         # protect for HTML output
+	} elsif (eval { %$r_input && 1 }) {
+		# eval { %$r_input && 1 } will pick up all objectes that can be accessed like a hash and so works better than
+		# "ref $r_input".  Do not use "$r_input" =~ /hash/i" because that will pick up strings containing the word hash,
+		# and that will cause an error below.
+		local $^W = 0;
+		$out .= qq{$r_input <table border="2" cellpadding="3" bgcolor="#FFFFFF">};
+
+		for my $key (sort keys %$r_input) {
+			# Safety feature - we do not want to display the contents of %seed_ce which
+			# contains the database password and lots of other things, and explicitly hide
+			# certain internals of the CourseEnvironment in case one slips in.
+			next
+				if (($key =~ /database/)
+					|| ($key =~ /dbLayout/)
+					|| ($key eq "ConfigValues")
+					|| ($key eq "ENV")
+					|| ($key eq "externalPrograms")
+					|| ($key eq "permissionLevels")
+					|| ($key eq "seed_ce"));
+			$out .= "<tr><td>$key</td><td>=&gt;</td><td>&nbsp;" . pretty_print($r_input->{$key}, $level) . "</td></tr>";
+		}
+		$out .= '</table>';
+	} elsif (ref $r_input eq 'ARRAY') {
+		my @array = @$r_input;
+		$out .= '( ';
+		while (@array) {
+			$out .= pretty_print(shift @array, $level) . ' , ';
+		}
+		$out .= ' )';
+	} elsif (ref $r_input eq 'CODE') {
+		$out = "$r_input";
+	} else {
+		$out = $r_input;
+		$out =~ s/</&lt;/g;    # Protect for HTML output
+	}
+
+	return $out . ' ';
 }
 
 1;
diff --git a/lib/HardcopyRenderedProblem.pm b/lib/HardcopyRenderedProblem.pm
new file mode 100644
index 0000000000..13a6ed84a8
--- /dev/null
+++ b/lib/HardcopyRenderedProblem.pm
@@ -0,0 +1,293 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+=head1 NAME
+
+HardcopyRenderedProblem.pm -- Generate a pdf file or zip file containing a tex
+file and the neccessary files to generate the pdf file from the result of the
+renderProblem method.
+
+=cut
+
+package HardcopyRenderedProblem;
+
+use strict;
+use warnings;
+
+use File::Path;
+use String::ShellQuote;
+use Archive::Zip qw(:ERROR_CODES);
+use Mojo::File qw(path tempdir);
+use XML::LibXML;
+
+sub hardcopyRenderedProblem {
+	my $ws = shift;     # $ws is a WebworkWebservice object.
+	my $c  = $ws->c;
+	my $ce = $ws->ce;
+
+	my $rh_result = $ws->return_object;
+
+	# Deal with PG errors
+	return $rh_result->{errors} if $rh_result->{flags}{error_flag};
+
+	return 'This problem has no content.' unless $rh_result->{text};
+
+	my @errors;
+
+	my $courseID = $ws->{inputs_ref}{courseID};
+	my $userID   = $ws->{inputs_ref}{user};
+
+	# Create the parent directory for the temporary working directory.
+	my $temp_dir_parent_path = path("$ce->{webworkDirs}{tmp}/$courseID/hardcopy/$userID");
+	eval { $temp_dir_parent_path->make_path };
+	if ($@) {
+		push(@errors, "Couldn't create hardcopy directory $temp_dir_parent_path: $@");
+		return join("\n", @errors);
+	}
+
+	# Create a randomly named directory in the hardcopy directory.
+	my $temp_dir_path = eval { tempdir('work.XXXXXXXX', DIR => $temp_dir_parent_path) };
+	if ($@) {
+		push(@errors, "Couldn't create temporary directory: $@");
+		return join("\n", @errors);
+	}
+
+	# Use the basename of the source file path without the extension prefixed with the course id and user id for the
+	# working directory namd and download filename.
+	my $returnFileName =
+		"$courseID.$userID." . ((($ws->{inputs_ref}{sourceFilePath} =~ s/^.*\///r) =~ s/\.[^.]*$//r) || 'hardcopy');
+
+	# Create a subdirectory of that to do all of the work in.  This directory will be zipped
+	# if the tex outputformat is specified or if pdf generation fails or has errors.
+	my $working_dir = $temp_dir_path->child($returnFileName);
+	eval { $working_dir->make_path };
+	if ($@) {
+		push(@errors, "Couldn't create working directory $working_dir: $@");
+		return join("\n", @errors);
+	}
+
+	# Create TeX file.
+	my $tex_file = $working_dir->child('hardcopy.tex');
+	my $fh       = $tex_file->open('>:encoding(UTF-8)');
+	unless ($fh) {
+		push(@errors, qq{Failed to open file "$tex_file" for writing: $!});
+		return join("\n", @errors);
+	}
+	write_tex($ws, $fh, \@errors);
+	$fh->close;
+
+	# Call the pdf generation subroutine if the pdf outputformat was specified or if no outputformat was specified.
+	if (!$ws->{inputs_ref}{outputformat} || $ws->{inputs_ref}{outputformat} eq 'pdf') {
+		generate_hardcopy_pdf($ws, $working_dir, \@errors);
+
+		# Send the pdf file if it was successfully generated with no errors.
+		my $pdf_file = $working_dir->child('hardcopy.pdf');
+		if (-e $pdf_file && !@errors) {
+			$c->res->headers->content_type('application/pdf');
+			$c->res->headers->add('Content-Disposition' => qq{attachment; filename=$returnFileName.pdf});
+			$c->reply->file($pdf_file);
+			return;
+		}
+	}
+
+	# Call the tex generation subroutine if the tex outputformat was specified,
+	# or if there were errors in generating the pdf file.
+	generate_hardcopy_tex($ws, $working_dir, \@errors);
+
+	# Send the zip file if it exists.
+	my $zip_file = $temp_dir_path->child('hardcopy.zip');
+	if (-e $zip_file) {
+		$c->res->headers->content_type('application/zip');
+		$c->res->headers->add('Content-Disposition' => qq{attachment; filename=$returnFileName.zip});
+		$c->reply->file($zip_file);
+		return;
+	}
+
+	# Something has really gone wrong.  A tex file was written, but hardcopy generation failed or had errors, and a zip
+	# file could not be created.  Just return the errors that have accumulated.  Probably a lengthy list.
+	return join("\n", @errors);
+}
+
+# This subroutine assumes that the TeX source file is located at $working_dir/hardcopy.tex.
+sub generate_hardcopy_tex {
+	my ($ws, $working_dir, $errors) = @_;
+
+	my $src_file = $working_dir->child('hardcopy.tex');
+
+	# Copy the common tex files into the working directory
+	my $ce            = $ws->c->ce;
+	my $assetsTex_dir = path($ce->{webworkDirs}{assetsTex});
+	for (qw{webwork2.sty webwork_logo.png}) {
+		eval { $assetsTex_dir->child($_)->copy_to($working_dir) };
+		push(@$errors, qq{Failed to copy "$ce->{webworkDirs}{assetsTex}/$_" into directory "$working_dir": $@})
+			if $@;
+	}
+	my $pgAssetsTex_dir = path($ce->{pg}{directories}{assetsTex});
+	for (qw{pg.sty PGML.tex CAPA.tex}) {
+		eval { $pgAssetsTex_dir->child($_)->copy_to($working_dir) };
+		push(@$errors, qq{Failed to copy "$ce->{pg}{directories}{assetsTex}/$_" into directory "$working_dir": $@})
+			if $@;
+	}
+	my $pgsty = path("$ce->{pg}{directories}{assetsTex}/pg.sty");
+	eval { $pgsty->copy_to($working_dir) };
+	push(@$errors, qq{Failed to copy "$ce->{pg}{directories}{assetsTex}/pg.sty" into directory "$working_dir": $@})
+		if $@;
+
+	# Attempt to copy image files used into the working directory.
+	my $resource_list = $ws->return_object->{resource_list};
+	if ($resource_list && keys %$resource_list) {
+		my $data = eval { $src_file->slurp };
+		unless ($@) {
+			for my $resource (keys %$resource_list) {
+				my $file_path = path($resource_list->{$resource});
+				$data =~ s{$file_path}{$file_path->basename}ge;
+
+				eval { $file_path->copy_to($working_dir) };
+				push(@$errors, qq{Failed to copy image "$file_path" into directory "$working_dir": $@})
+					if $@;
+			}
+
+			# Rewrite the tex file with the image paths stripped.
+			eval { $src_file->spurt($data) };
+			push(@$errors, "Error rewriting $src_file: $@") if $@;
+		} else {
+			push(@$errors, qq{Failed to open "$$src_file" for reading: $@});
+		}
+	}
+
+	# Write any errors to a file to include in the zip file.
+	eval { $working_dir->child('hardcopy-generation-errors.log')->spurt(join("\n", @$errors)) } if @$errors;
+	push(@$errors, "Failed to generate error log file: $@")                                     if $@;
+
+	# Create a zip archive of the bundle directory
+	my $zip = Archive::Zip->new;
+	$zip->addTree($working_dir->dirname->to_string);
+
+	push(@$errors, qq{Failed to create zip archive of directory "$working_dir"})
+		unless ($zip->writeToFileNamed($working_dir->dirname->child('hardcopy.zip')->to_string) == AZ_OK);
+
+	return;
+}
+
+# This subroutine assumes that the TeX source file is located at $working_dir/hardcopy.tex.
+sub generate_hardcopy_pdf {
+	my ($ws, $working_dir, $errors) = @_;
+
+	# Save the current working directory and change to the temporary directory.
+	my $cwd = path->to_abs;
+	chdir($working_dir);
+
+	# Call pdflatex
+	my $pdflatex_cmd =
+		'TEXINPUTS=.:'
+		. shell_quote($ws->c->ce->{webworkDirs}{assetsTex}) . ':'
+		. shell_quote($ws->c->ce->{pg}{directories}{assetsTex}) . ': '
+		. $ws->c->ce->{externalPrograms}{pdflatex}
+		. ' > pdflatex.stdout 2> pdflatex.stderr hardcopy';
+
+	if (my $rawexit = system $pdflatex_cmd) {
+		my $exit   = $rawexit >> 8;
+		my $signal = $rawexit & 127;
+		my $core   = $rawexit & 128;
+		push(@$errors,
+			qq{Failed to convert TeX to PDF with command "$pdflatex_cmd" (exit=$exit signal=$signal core=$core).},
+			q{See the "hardcopy.log" file for details.});
+	}
+
+	# Restore the current working directory to what it was before.
+	chdir($cwd);
+
+	return;
+}
+
+sub write_tex {
+	my ($ws, $FH, $errors) = @_;
+	my $c  = $ws->c;
+	my $ce = $c->ce;
+
+	# get theme
+	my $theme = $c->param('hardcopy_theme') // $ce->{hardcopyThemePGEditor};
+	my $themeFile;
+	if (-e "$ce->{courseDirs}{hardcopyThemes}/$theme") {
+		$themeFile = "$ce->{courseDirs}{hardcopyThemes}/$theme";
+	} elsif (-e "$ce->{webworkDirs}{hardcopyThemes}/$theme") {
+		$themeFile = "$ce->{webworkDirs}{hardcopyThemes}/$theme";
+	} else {
+		push(@$errors, "Couldn't locate file for theme $theme.");
+		return join("\n", @$errors);
+	}
+	my $themeTree = XML::LibXML->load_xml(location => $themeFile);
+
+	print $FH '\\batchmode';
+	print $FH $themeTree->findvalue('/theme/preamble');
+	print $FH $themeTree->findvalue('/theme/presetheader');
+	print $FH $themeTree->findvalue('/theme/postsetheader');
+	print $FH $themeTree->findvalue('/theme/problemheader');
+	write_problem_tex($ws, $FH);
+	print $FH $themeTree->findvalue('/theme/problemfooter');
+	print $FH $themeTree->findvalue('/theme/setfooter');
+	print $FH $themeTree->findvalue('/theme/postamble');
+
+	return;
+}
+
+sub write_problem_tex {
+	my ($ws, $FH) = @_;
+	my $c = $ws->c;
+
+	my $rh_result = $ws->return_object;
+
+	print $FH " {\\footnotesize\\path|$ws->{inputs_ref}{sourceFilePath}|}\n\n\\vspace{\\baselineskip}"
+		if ($ws->{inputs_ref}{showSourceFile});
+
+	print $FH $rh_result->{text};
+
+	# Write the correct answers if requested and there are answers to write.
+	if ($ws->{inputs_ref}{WWcorrectAns}) {
+		my @ans_entry_order = @{ $rh_result->{flags}{ANSWER_ENTRY_ORDER} // [] };
+		if (@ans_entry_order) {
+			my $correctTeX =
+				"\n\n\\vspace{\\baselineskip}\\par{\\small{\\it "
+				. $c->maketext("Correct Answers:")
+				. "}\n\\begin{itemize}\n";
+
+			for (@ans_entry_order) {
+				$correctTeX .=
+					"\\item\n\$\\displaystyle "
+					. ($rh_result->{answers}{$_}{correct_ans_latex_string}
+						|| "\\text{$rh_result->{answers}{$_}{correct_ans}}")
+					. "\$\n";
+			}
+
+			$correctTeX .= "\\end{itemize}}\\par\n";
+
+			print $FH $correctTeX;
+		}
+	}
+
+	# If there are any PG warnings and the view_problem_debugging_info parameter was set,
+	# then append the warnings to end of the tex file.
+	if ($ws->{inputs_ref}{view_problem_debugging_info} && $rh_result->{pg_warnings}) {
+		print $FH "\n\n\\vspace{\\baselineskip}\\par\n" . $c->maketext('Warning messages:') . "\n\\begin{itemize}\n";
+		for (split("\n", $rh_result->{pg_warnings})) {
+			print $FH "\\item \\verb|$_|\n";
+		}
+		print $FH "\\end{itemize}\n";
+	}
+
+	return;
+}
+
+1;
diff --git a/lib/Mojolicious/WeBWorK.pm b/lib/Mojolicious/WeBWorK.pm
new file mode 100644
index 0000000000..5d54412868
--- /dev/null
+++ b/lib/Mojolicious/WeBWorK.pm
@@ -0,0 +1,274 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package Mojolicious::WeBWorK;
+use Mojo::Base 'Mojolicious', -signatures, -async_await;
+
+=head1 NAME
+
+Mojolicious::WeBWorK - Mojolicious app for WeBWorK 2.
+
+=cut
+
+use Env qw(WEBWORK_SERVER_ADMIN);
+
+use WeBWorK;
+use WeBWorK::CourseEnvironment;
+use WeBWorK::Utils qw(x writeTimingLogEntry);
+use WeBWorK::Utils::Routes qw(setup_content_generator_routes);
+
+sub startup ($app) {
+	# Set up logging.
+	$app->log->path($app->home->child('logs', 'webwork2.log')) if $app->mode eq 'production';
+
+	# Load configuration from config file
+	my $config_file = "$ENV{WEBWORK_ROOT}/conf/webwork2.mojolicious.yml";
+	$config_file = "$ENV{WEBWORK_ROOT}/conf/webwork2.mojolicious.dist.yml" unless -e $config_file;
+	my $config = $app->plugin('NotYAMLConfig', { file => $config_file });
+
+	# Configure the application
+	$app->secrets($config->{secrets});
+
+	# Set constants from the configuration.
+	$WeBWorK::Debug::Enabled                                = $config->{debug}{enabled} // 0;
+	$WeBWorK::Debug::Logfile                                = $config->{debug}{logfile} // '';
+	$WeBWorK::Debug::DenySubroutineOutput                   = $config->{debug}{deny_subroutine_output};
+	$WeBWorK::Debug::AllowSubroutineOutput                  = $config->{debug}{allow_subroutine_output};
+	$WeBWorK::ContentGenerator::Hardcopy::PreserveTempFiles = $config->{hardcopy}{preserve_temp_files} // 0;
+
+	# Load the plugin that switches the server to the non-root server user and group
+	# if the app is run as root and is in production mode.
+	$app->plugin(SetUserGroup => { user => $config->{server_user}, group => $config->{server_group} })
+		if $app->mode eq 'production' && $> == 0;
+
+	# Load a minimal course environment
+	my $ce = WeBWorK::CourseEnvironment->new;
+
+	# Set important configuration variables
+	my $webwork_url         = $ce->{webwork_url};
+	my $webwork_htdocs_url  = $ce->{webwork_htdocs_url};
+	my $pg_htdocs_url       = $ce->{pg_htdocs_url} // '/pg_files';
+	my $webwork_htdocs_dir  = $ce->{webwork_htdocs_dir};
+	my $webwork_courses_url = $ce->{webwork_courses_url};
+	my $webwork_courses_dir = $ce->{webwork_courses_dir};
+	my $server_root_url     = $ce->{server_root_url};
+
+	$app->log->info('WeBWorK server is starting');
+	$app->log->info("WeBWorK root directory set to $ENV{WEBWORK_ROOT}");
+	$app->log->info("PG root directory set to $ENV{PG_ROOT}");
+	$app->log->info("The webwork url on this site is ${server_root_url}$webwork_url");
+
+	$WEBWORK_SERVER_ADMIN = $ce->{webwork_server_admin_email};
+	if ($WEBWORK_SERVER_ADMIN) {
+		$app->log->info(
+			"webwork_server_admin_email for reporting bugs has been set to $WEBWORK_SERVER_ADMIN in site.conf");
+	}
+
+	# Make the htdocs directory the first place to search for static files.  At this point this is only used by the
+	# exception templates, but it could be used to improve the getAssetURL method together with the Mojolicious
+	# url_for_asset controller method.
+	unshift(@{ $app->static->paths }, $webwork_htdocs_dir);
+
+	# Add the themes directory to the template search paths.
+	push(@{ $app->renderer->paths }, $ce->{webworkDirs}{themes});
+
+	# Setup the Minion job queue.
+	$app->plugin(Minion => { $ce->{job_queue}{backend} => $ce->{job_queue}{database_dsn} });
+	$app->minion->add_task(lti_mass_update       => 'Mojolicious::WeBWorK::Tasks::LTIMassUpdate');
+	$app->minion->add_task(send_instructor_email => 'Mojolicious::WeBWorK::Tasks::SendInstructorEmail');
+
+	# Provide the ability to serve data as a file download.
+	$app->plugin('RenderFile');
+
+	# Helpers
+
+	# This replaces the previous Apache2::RequestUtil method that was overridden in
+	# the WeBWorK::Request module to return the empty string for '/'.
+	$app->helper(location => sub ($) { return $webwork_url eq '/' ? '' : $webwork_url });
+
+	$app->helper(server_root_url => sub ($) { return $server_root_url; });
+	$app->helper(webwork_url     => sub ($) { return $webwork_url; });
+
+	$app->helper(
+		maketext => sub ($c, @args) {
+			return $args[0] unless $c->stash->{language_handle};
+			return $c->stash->{language_handle}->(@args);
+			# Comment out the above line and uncomment below to check that your strings are run through maketext.
+			#return 'xXx' . $c->stash->{language_handle}->(@args) . 'xXx';
+		}
+	);
+
+	# Add a hook to add extra headers if set in the config file.
+	if (ref $config->{extra_headers} eq 'HASH') {
+		$app->hook(
+			before_dispatch => sub ($c) {
+				for my $path (keys %{ $config->{extra_headers} }) {
+					if ($c->req->url->path =~ /^$path/) {
+						for (keys %{ $config->{extra_headers}{$path} }) {
+							$c->res->headers->header($_ => $config->{extra_headers}{$path}{$_});
+						}
+					}
+				}
+			}
+		);
+	}
+
+	# Add a hook that redirects http to https if configured to do so.
+	if ($config->{redirect_http_to_https}) {
+		$app->hook(
+			before_dispatch => sub ($c) {
+				my $request_url = $c->req->url->to_abs;
+				if ($request_url->scheme eq 'http') {
+					$request_url->scheme('https');
+					$c->redirect_to($request_url);
+				}
+			}
+		);
+	}
+
+	$app->hook(
+		around_action => async sub ($next, $c, $action, $last) {
+			return $next->() unless $c->isa('WeBWorK::ContentGenerator');
+
+			my $uri = $c->req->url->path->to_string;
+			$c->stash->{warnings} //= '';
+
+			$c->stash->{orig_sig_warn} = $SIG{__WARN__};
+
+			$SIG{__WARN__} = sub {
+				my ($warning) = @_;
+				chomp $warning;
+				$c->stash->{warnings} .= "$warning\n";
+				$c->log->warn("[$uri] $warning");
+			};
+
+			$c->timing->begin('content_generator_rendering');
+
+			my ($result, $message) = eval { await WeBWorK::dispatch($c) };
+			return $c->reply->exception($@)                    if $@;
+			return $c->render(text => $message, status => 404) if !$result && $message;
+			return $next->()                                   if $result;
+
+			return 0;
+		}
+	);
+
+	$app->hook(
+		after_dispatch => sub ($c) {
+			$SIG{__WARN__} = $c->stash->{orig_sig_warn} if defined $c->stash->{orig_sig_warn};
+
+			if ($c->isa('WeBWorK::ContentGenerator') && $c->ce) {
+				writeTimingLogEntry(
+					$c->ce,
+					'[' . $c->url_for . ']',
+					sprintf('runTime = %.3f sec', $c->timing->elapsed('content_generator_rendering')) . ' '
+						. $c->ce->{dbLayoutName},
+					''
+				);
+			}
+		}
+	);
+
+	# Router
+	my $r = $app->routes;
+	push(@{ $r->namespaces }, 'WeBWorK::ContentGenerator');
+
+	# Provide access to webwork2 and pg resources.  A resource from $webwork_htdocs_dir is used if present, then
+	# $pg_dir/htdocs is checked if the file is not found there.
+	$r->any(
+		"$webwork_htdocs_url/*static" => sub ($c) {
+			my $webwork_htdocs_file = "$webwork_htdocs_dir/" . $c->stash('static');
+			return $c->reply->file($webwork_htdocs_file) if -r $webwork_htdocs_file;
+			my $pg_htdocs_file = "$ENV{PG_ROOT}/htdocs/" . $c->stash('static');
+			return $c->reply->file($pg_htdocs_file) if -r $pg_htdocs_file;
+			return $c->render(data => 'File not found', status => 404);
+		}
+	);
+
+	# Provide direct access to the pg htdocs location.
+	$r->any(
+		"$pg_htdocs_url/*static" => sub ($c) {
+			my $pg_htdocs_file = "$ENV{PG_ROOT}/htdocs/" . $c->stash('static');
+			return $c->reply->file($pg_htdocs_file) if -r $pg_htdocs_file;
+			return $c->render(data => 'File not found', status => 404);
+		}
+	);
+
+	# Provide access to course-specific resources.
+	$r->any(
+		"$webwork_courses_url/#course/*static" => sub ($c) {
+			my $file = "$webwork_courses_dir/" . $c->stash('course') . '/html/' . $c->stash('static');
+			return $c->reply->file($file) if -r $file;
+			return $c->render(data => 'File not found', status => 404);
+		}
+	);
+
+	# Provide access to the htdocs temp url in case it is not actually located in htdocs.
+	$r->any(
+		"$ce->{webworkURLs}{htdocs_temp}/*static" => sub ($c) {
+			my $file = "$ce->{webworkDirs}{htdocs_temp}/" . $c->stash('static');
+			return $c->reply->file($file) if -r $file;
+			return $c->render(data => 'File not found', status => 404);
+		}
+	);
+
+	if ($config->{soap_authen_key}) {
+		# Only allow an authen key that consists entirely of digits.  The WebworkSOAP module uses a numeric != for
+		# comparison, and in perl all strings containing alphabetic characters are numerically equal.  So if this is not
+		# numeric all keys that are passed in will succeed in authentication.  Very dangerous!
+		if ($config->{soap_authen_key} =~ /^\d*$/) {
+			$app->log->info('SOAP endpoints enabled');
+			$WeBWorK::SeedCE{soap_authen_key} = $config->{soap_authen_key};
+
+			push(@{ $r->namespaces }, 'WebworkSOAP');
+			$r->any('/webwork2_wsdl')->to('SOAP#wsdl');
+			$r->post('/webwork2_rpc')->to('SOAP#dispatch');
+		} else {
+			$app->log->info(qq{Invalid soap_authen_key "$config->{soap_authen_key}". }
+					. 'It must consist entirely of digits.  SOAP endpoints NOT enabled.');
+		}
+	}
+
+	# Note that these routes must come last to support the case that $webwork_url is '/'.
+
+	my $cg_r = $r->under($webwork_url)->name('root');
+	$cg_r->get('/')->to('Home#go')->name('root');
+
+	# The course admin route is set up here because of its special stash value.
+	$cg_r->any('/admin')->to('CourseAdmin#go', courseID => 'admin')->name('course_admin');
+
+	setup_content_generator_routes($cg_r);
+
+	$r->any(
+		'/' => sub ($c) {
+			return $c->redirect_to($config->{server_root_url_redirect}) if ($config->{server_root_url_redirect});
+			return $c->reply->file("$ENV{WEBWORK_ROOT}/htdocs/index.html")
+				if (-e "$ENV{WEBWORK_ROOT}/htdocs/index.html");
+			return $c->reply->file("$ENV{WEBWORK_ROOT}/htdocs/index.dist.html");
+		}
+	);
+
+	# Catch-all page not found route
+	$r->any(
+		'/*' => sub ($c) {
+			return $c->render(text => 'Page not found', status => 404) if $c->accepts('', 'html');
+			return $c->respond_to(any => { text => 'Invalid request endpoint', status => 404 });
+		}
+	);
+
+	return;
+}
+
+1;
diff --git a/lib/Mojolicious/WeBWorK/Tasks/LTIMassUpdate.pm b/lib/Mojolicious/WeBWorK/Tasks/LTIMassUpdate.pm
new file mode 100644
index 0000000000..163f2eedd1
--- /dev/null
+++ b/lib/Mojolicious/WeBWorK/Tasks/LTIMassUpdate.pm
@@ -0,0 +1,83 @@
+###############################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package Mojolicious::WeBWorK::Tasks::LTIMassUpdate;
+use Mojo::Base 'Minion::Job', -signatures;
+
+use WeBWorK::Authen::LTIAdvanced::SubmitGrade;
+use WeBWorK::Authen::LTIAdvantage::SubmitGrade;
+use WeBWorK::CourseEnvironment;
+use WeBWorK::DB;
+
+# Perform a mass update of grades via LTI.
+sub run ($job, $courseID, $userID = '', $setID = '') {
+	# Establish a lock guard that only allow 1 job at a time (technichally more than one could run at a time if a job
+	# takes more than an hour to complete).  As soon as a job completes (or fails) the lock is released and a new job
+	# can start.  New jobs retry every minute until they can aquire their own lock.
+	return $job->retry({ delay => 60 }) unless my $guard = $job->minion->guard('lti_mass_update', 3600);
+
+	my $ce = eval { WeBWorK::CourseEnvironment->new({ courseName => $courseID }) };
+	return $job->fail("Could not construct course environment for $courseID.") unless $ce;
+
+	my $db = WeBWorK::DB->new($ce->{dbLayout});
+	return $job->fail("Could not obtain database connection for $courseID.") unless $db;
+
+	if ($setID && $userID && $ce->{LTIGradeMode} eq 'homework') {
+		$job->app->log->info("LTI Mass Update: Starting grade update for user $userID and set $setID.");
+	} elsif ($setID && $ce->{LTIGradeMode} eq 'homework') {
+		$job->app->log->info("LTI Mass Update: Starting grade update for all users assigned to set $setID.");
+	} elsif ($userID) {
+		$job->app->log->info("LTI Mass Update: Starting grade update of all sets assigned to user $userID.");
+	} else {
+		$job->app->log->info('LTI Mass Update: Starting grade update for all sets and users.');
+	}
+
+	# Pass a fake controller object that will work for the grader.
+	my $grader =
+		$ce->{LTIVersion} eq 'v1p1'
+		? WeBWorK::Authen::LTIAdvanced::SubmitGrade->new({ ce => $ce, db => $db, app => $job->app }, 1)
+		: WeBWorK::Authen::LTIAdvantage::SubmitGrade->new({ ce => $ce, db => $db, app => $job->app }, 1);
+
+	# Determine what needs to be updated.
+	my %updateUsers;
+	if ($setID && $userID && $ce->{LTIGradeMode} eq 'homework') {
+		$updateUsers{$userID} = [$setID];
+	} elsif ($setID && $ce->{LTIGradeMode} eq 'homework') {
+		%updateUsers = map { $_ => [$setID] } $db->listSetUsers($setID);
+	} else {
+		if ($ce->{LTIGradeMode} eq 'course') {
+			%updateUsers = map { $_ => 'update_course_grade' } ($userID || $db->listUsers);
+		} elsif ($ce->{LTIGradeMode} eq 'homework') {
+			%updateUsers = map { $_ => [ $db->listUserSets($_) ] } ($userID || $db->listUsers);
+		}
+	}
+
+	# Minion does not support asynchronous jobs.  At least if you want notification of job completion.  So call the
+	# Mojolicious::Promise wait method instead.
+	for my $user (keys %updateUsers) {
+		if (ref($updateUsers{$user}) eq 'ARRAY') {
+			for my $set (@{ $updateUsers{$user} }) {
+				$grader->submit_set_grade($user, $set)->wait;
+			}
+		} elsif ($updateUsers{$user} eq 'update_course_grade') {
+			$grader->submit_course_grade($user)->wait;
+		}
+	}
+
+	$job->app->log->info("Updated grades via LTI for course $courseID.");
+	return $job->finish("Updated grades via LTI for course $courseID.");
+}
+
+1;
diff --git a/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm b/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm
new file mode 100644
index 0000000000..44ba7a71f9
--- /dev/null
+++ b/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm
@@ -0,0 +1,141 @@
+###############################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package Mojolicious::WeBWorK::Tasks::SendInstructorEmail;
+use Mojo::Base 'Minion::Job', -signatures;
+
+use Email::Stuffer;
+use Email::Sender::Transport::SMTP;
+
+use WeBWorK::Debug qw(debug);
+use WeBWorK::CourseEnvironment;
+use WeBWorK::DB;
+use WeBWorK::Localize;
+use WeBWorK::Utils qw/processEmailMessage createEmailSenderTransportSMTP/;
+
+# Send instructor email messages to students.
+# FIXME: This job currently allows multiple jobs to run at once.  Should it be limited?
+sub run ($job, $mail_data) {
+	my $ce = eval { WeBWorK::CourseEnvironment->new({ courseName => $mail_data->{courseName} }) };
+	return $job->fail("Could not construct course environment for $mail_data->{courseName}.") unless $ce;
+
+	my $db = WeBWorK::DB->new($ce->{dbLayout});
+	return $job->fail("Could not obtain database connection for $mail_data->{courseName}.") unless $db;
+
+	$job->{language_handle} = WeBWorK::Localize::getLoc($ce->{language} || 'en');
+
+	my $result_message = eval { $job->mail_message_to_recipients($ce, $db, $mail_data) };
+	if ($@) {
+		$result_message .= "An error occurred while trying to send email.\n" . "The error message is:\n\n$@\n\n";
+		$job->app->log->error("An error occurred while trying to send email: $@\n");
+	}
+
+	eval { $job->email_notification($ce, $mail_data, $result_message) };
+	if ($@) {
+		$job->app->log->error("An error occured while trying to send the email notification: $@\n");
+		return $job->fail("FAILURE: Unable to send email notifation to instructor.");
+	}
+
+	return $job->finish("SUCCESS: Email messages sent.");
+}
+
+sub mail_message_to_recipients ($job, $ce, $db, $mail_data) {
+	my $result_message  = '';
+	my $failed_messages = 0;
+	my $error_messages  = '';
+
+	my @recipients = @{ $mail_data->{recipients} };
+
+	for my $recipient (@recipients) {
+		$error_messages = '';
+
+		my $user_record = $db->getUser($recipient);
+		unless ($user_record) {
+			$error_messages .= "Record for user $recipient not found\n";
+			next;
+		}
+		unless ($user_record->email_address =~ /\S/) {
+			$error_messages .= "User $recipient does not have an email address -- skipping\n";
+			next;
+		}
+
+		my $msg = processEmailMessage(
+			$mail_data->{text}, $user_record,
+			$ce->status_abbrev_to_name($user_record->status),
+			$mail_data->{merge_data}
+		);
+
+		my $email =
+			Email::Stuffer->to($user_record->email_address)->from($mail_data->{from})->subject($mail_data->{subject})
+			->text_body($msg)->header('X-Remote-Host' => $mail_data->{remote_host});
+
+		eval {
+			$email->send_or_die({
+				transport => createEmailSenderTransportSMTP($ce),
+				$ce->{mail}{set_return_path} ? (from => $ce->{mail}{set_return_path}) : ()
+			});
+			debug 'email sent successfully to ' . $user_record->email_address;
+		};
+		if ($@) {
+			debug "Error sending email: $@";
+			$error_messages .= "Error sending email: $@";
+			next;
+		}
+
+		$result_message .=
+			$job->maketext('Message sent to [_1] at [_2].', $recipient, $user_record->email_address) . "\n"
+			unless $error_messages;
+	} continue {
+		# Update failed messages before continuing loop.
+		if ($error_messages) {
+			$failed_messages++;
+			$result_message .= $error_messages;
+		}
+	}
+
+	my $number_of_recipients = @recipients - $failed_messages;
+	return $job->maketext(
+		'A message with the subject line "[_1]" has been sent to [quant,_2,recipient] in the class [_3].  '
+			. 'There were [_4] message(s) that could not be sent.',
+		$mail_data->{subject}, $number_of_recipients, $mail_data->{courseName},
+		$failed_messages
+		)
+		. "\n\n"
+		. $result_message;
+}
+
+sub email_notification ($job, $ce, $mail_data, $result_message) {
+	my $email =
+		Email::Stuffer->to($mail_data->{defaultFrom})->from($mail_data->{defaultFrom})->subject('WeBWorK email sent')
+		->text_body($result_message)->header('X-Remote-Host' => $mail_data->{remote_host});
+
+	eval {
+		$email->send_or_die({
+			transport => createEmailSenderTransportSMTP($ce),
+			$ce->{mail}{set_return_path} ? (from => $ce->{mail}{set_return_path}) : ()
+		});
+	};
+	$job->app->log->error("Error sending email: $@") if $@;
+
+	$job->app->log->info("WeBWorK::Tasks::SendInstructorEmail: Instructor message sent from $mail_data->{defaultFrom}");
+
+	return;
+}
+
+sub maketext ($job, @args) {
+	return &{ $job->{language_handle} }(@args);
+}
+
+1;
diff --git a/lib/MySOAP.pm b/lib/MySOAP.pm
deleted file mode 100644
index 0fd13573ae..0000000000
--- a/lib/MySOAP.pm
+++ /dev/null
@@ -1,73 +0,0 @@
-package MySOAP;
-
-use constant DEBUG =>0;
-
-  use Apache::Request;
-  use Apache::Constants qw(:common);
-  use Apache::File ();
-  use SOAP::Transport::HTTP;
-
-  my $server = SOAP::Transport::HTTP::Apache
-    -> dispatch_to('RQP');
-
-  sub handler { 
-    my $save = $_[0];
-    my $r = Apache::Request->instance($_[0]);
-    
-    my $header = $r->as_string;
-    my $args = $r->args;
-    my $content = $r->content;
-    my $body="";
-    # this will read everything, but then it won't be available for SOAP
-    my $r2 = Apache::Request->instance($save) if DEBUG;
-    $r2->read($body, $r2->header_in('Content-length')) if DEBUG;
-    #
-    local(*DEBUGLOG);
-    open DEBUGLOG, ">>/home/gage/debug_info.txt" || die "can't open debug file";
-    
-    
-    
-    
-    ################
-    # Handle a wsdl rquest
-    ################
-    my %args_hash = $r->args;
-   if (exists $args_hash{wsdl}) {
-    	$r->print( $wsdl);
-    	print DEBUGLOG "----------start-------------\n";
-    	print DEBUGLOG "handle wsdl request\n";
-    	print DEBUGLOG "\n-header =\n $header\n" ;
-    	
-    	
-    	my $wsdl = `cat /home/gage/rqp.wsdl`;
-    	$r->content_type('application/wsdl+xml');
-    	$r->send_http_header;
-    	$r->print( $wsdl);
- 
-    	
-    	print DEBUGLOG "---end--- \n";
-    	close(DEBUGLOG);
-    	return OK;
-    ###############
-    # Handle SOAP request
-    ###############  	
-    } else {
-		print DEBUGLOG "----------start-------------\n";
-		print DEBUGLOG "handle soap request\n";
-		print DEBUGLOG "\n-header =\n $header\n" ; #if DEBUG;
-		print DEBUGLOG "args=  $args\n";
-		print DEBUGLOG "\nbody= $body\n" if DEBUG;
-		
-		$server->handler(@_);
-		
-		print DEBUGLOG "---end--- \n";
-		close(DEBUGLOG);
-
-    }
-    
-    
-
-
-  };
-
-1;
diff --git a/lib/RQP.pm b/lib/RQP.pm
deleted file mode 100644
index cc1bc98021..0000000000
--- a/lib/RQP.pm
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/usr/local/bin/perl   -w
-
-
-use SOAP::Lite +trace; 
-#+trace =>
-#[parameters,trace=>sub{ local($|=1); print LOG "start>>", 
-#WebworkWebservice::pretty_print_rh(\@_ ),"<<stop\n\n"; }];
-
-
-
-use WebworkWebservice;
-package RQP;
-@ISA =   (SOAP::Server::Parameters);
-local(*MYLOG);
-
-use WeBWorK::Utils::Tasks qw(fake_set fake_problem);
-use RQP::Render;
-
-our $WW_DIRECTORY = $WebworkWebservice::WW_DIRECTORY;
-our $PG_DIRECTORY = $WebworkWebservice::PG_DIRECTORY;
-our $COURSENAME   = $WebworkWebservice::COURSENAME;
-our $HOST_NAME    = $WebworkWebservice::HOST_NAME;
-our $HOSTURL      ="http://$HOST_NAME:8002"; #FIXME
-our $ce           =$WebworkWebservice::SeedCE;
-# create a local course environment for some course
-    $ce           = WeBWorK::CourseEnvironment->new($WW_DIRECTORY, "", "", $COURSENAME);
-#print "\$ce = \n", WeBWorK::Utils::pretty_print_rh($ce);
-our $db = WeBWorK::DB->new($ce->{dbLayout});
-
-#print MYLOG "restarting server\n\n";
-sub test {
-	open MYLOG, ">>/home/gage/debug_info.txt" ;
-	local($|=1);
-	my $som = pop;
-	my $self = shift;
-	my $rh_parameter = $som->method;
-	#$som->match('/');
-	#print MYLOG "headers\n", WebworkWebservice::pretty_print_rh($rh_parameter),"\n";
-	#warn "parameters ", WebworkWebservice::pretty_print_rh($rh_parameter);
-	#my $params = $som->paramsall();
-	#warn "params ", join(" ", @{$params});
-	print MYLOG "body ", WebworkWebservice::pretty_print_rh($som->body);
-	close(MYLOG);
-	return "test hi bye";
-}
-
-sub RQP_ServerInformation {
-	my $class = shift;
-	my $soap_som = pop;
-	my $rh_params= $soap_som->method;
-	local(*DEBUGLOG);
-    open DEBUGLOG, ">>/home/gage/debug_info.txt" || die "can't open debug file";
-	print DEBUGLOG "--RQP_ServerInformation\n";
-
-	$rh_out = { 'identifier'       => 'http://www.openwebwork.org',
-                 'name'            => 'WeBWorK',
-                 'description'     => 'WeBWorK server.  See http://webwork.math.rochester.edu',
-                 'cloning'         => 0,
-                 'implicitCloning' => 1,
-                 'rendering'       => 1,
-                 'itemFormats'     => ['pg'],
-                 'renderFormats'   => ['xml'],
-                 input            => '<hr>'.WebworkWebservice::pretty_print_rh($rh_params).'<hr>',
-	};
-	return $rh_out;
-}
-
-sub RQP_ItemInformation {
-	my $class = shift;
-	my $soap_som = pop;
-	my $rh_params= $soap_som->method;
-	local(*DEBUGLOG);
-    open DEBUGLOG, ">>/home/gage/debug_info.txt" || die "can't open debug file";
-    print DEBUGLOG "--RQP_ItemInformation\n";
-	my $format = 'HTML';
-	my $sourceErrors = ''; 
-	$rh_out = {
-	    'format'            => $format,
-       'sourceErrors'       => $sourceErrors,
-       'template'           => 1,
-       'adaptive'           => 1,
-       'timeDependent'      => 0,
-       'canComputeScore'   => 1,
-       'solutionAvailable'  => 0,
-       'hintAvailable'      => 0,
-       'validationPossible' => 1,
-       'maxScore'           => 1,
-       'length'             => 1,
-       input                => '<hr>'.WebworkWebservice::pretty_print_rh($rh_params).'<hr>',
-	};
-	close(DEBUGLOG);
-	return $rh_out;
-}
-
-sub RQP_ProcessTemplate {
-
-
-}
-
-sub RQP_Clone  {
-
-}
-sub RQP_SessionInformation {
-	my $class = shift;
-	my $soap_som = pop;
-	my $rh_params= $soap_som->method;
-	local(*DEBUGLOG);
-    open DEBUGLOG, ">>/home/gage/debug_info.txt" || die "can't open debug file";
-	print DEBUGLOG "--RQP_SessionInformation\n";
-	my $templatevars = $rh_params->{templatevars};
-	$templatevars->{seed}=4321;
-	my $correctResponses = [];
-	$rh_out = {
-		'outcomevars'      => {id=>45},
-		'templatevars'     => $templatevars,
-		'correctResponses' => $correctResponses,
-		input              => '<hr>'.WebworkWebservice::pretty_print_rh($rh_params).'<hr>',
-	};
-	close(DEBUGLOG);
-	return $rh_out;
-}
-
-
-sub RQP_Render  {
-	RQP::Render::RQP_Render(@_);
-
-}
-
-
-1;
diff --git a/lib/WeBWorK.pm b/lib/WeBWorK.pm
index c0dafba843..dd4f12e1a2 100644
--- a/lib/WeBWorK.pm
+++ b/lib/WeBWorK.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,487 +14,261 @@
 ################################################################################
 
 package WeBWorK;
+use Mojo::Base -signatures, -async_await;
 
 =head1 NAME
 
-WeBWorK - Dispatch requests to the appropriate content generator.
+WeBWorK - Check authentication and initialize the course environment for a
+content generator controller action.
 
 =head1 SYNOPSIS
 
- my $r = Apache->request;
- my $result = eval { WeBWorK::dispatch($r) };
+ my $result = eval { await WeBWorK::dispatch($c) };
  die "something bad happened: $@" if $@;
 
 =head1 DESCRIPTION
 
-C<WeBWorK> is the dispatcher for the WeBWorK system. Given an Apache request
-object, it performs authentication and determines which subclass of
-C<WeBWorK::ContentGenerator> to call.
+C<WeBWorK> is the content generator initializer for the WeBWorK system. It
+performs authentication and initializes the course environment.  If
+authentication is needed, then it renders the WeBWorK::ContentGenerator::Login
+module.  If proctor authentication is needed, then it renders the
+WeBWorK::ContentGenerator::LoginProctor module.  Otherwise it returns control to
+the action of the content generator module for the designated route.
 
 =cut
 
-
-use strict;
-use warnings;
 use Time::HiRes qw/time/;
-use HTML::Entities qw/encode_entities/;
-use WeBWorK::Localize;
-# load WeBWorK::Constants before anything else
-# this sets package variables in several packages
-use WeBWorK::Constants;
 
+use WeBWorK::Localize;
 use WeBWorK::Authen;
 use WeBWorK::Authz;
 use WeBWorK::CourseEnvironment;
 use WeBWorK::DB;
 use WeBWorK::Debug;
-use WeBWorK::Request;
 use WeBWorK::Upload;
-use WeBWorK::URLPath;
-use WeBWorK::CGI;
-use WeBWorK::Utils qw(runtime_use writeTimingLogEntry);
-
-use Apache2::Upload;
-use Apache2::RequestUtil;
-
-use constant LOGIN_MODULE => "WeBWorK::ContentGenerator::Login";
-use constant PROCTOR_LOGIN_MODULE => "WeBWorK::ContentGenerator::LoginProctor";
-
-BEGIN {
-	# pre-compile all content generators
-	# Login and LoginProctor need to be handled separately, since they don't have paths
-	map { eval "require $_"; die $@ if $@ }
-		WeBWorK::URLPath->all_modules,
-		LOGIN_MODULE,
-		PROCTOR_LOGIN_MODULE;
-	# other candidates for preloading:
-	# - DB Record, Schema, and Driver classes (esp. Driver::SQL as it loads DBI)
-	# - CourseManagement subclasses (ditto. sql_single.pm)
-	# - WeBWorK::PG::Local, which loads WeBWorK::PG::Translator
-	# - Authen subclasses
-}
+use WeBWorK::Utils qw(runtime_use);
+use WeBWorK::ContentGenerator::Login;
+use WeBWorK::ContentGenerator::LoginProctor;
 
 our %SeedCE;
 
-sub dispatch($) {
-	my ($apache) = @_;
-	my $r = WeBWorK::Request->new($apache);
+# This will either return 0 or 1.  If it returns 1, then the around_action hook will render the content generator module
+# for the path.  If it returns 0, then it either must render (login or proctor login) or it must also return a message
+# indicating why it didn't render.  This can also throw an exception in which case the around_action hook will render
+# the exception template.
+async sub dispatch ($c) {
+	# Cache the initial submission time.  This can be used at any point throughout processing of this request.
+	# Note that this is Time::HiRes's time, which gives floating point values.
+	$c->submitTime(time);
 
-	my $method = $r->method;
-	my $location = $r->location;
-	my $uri = $r->uri;
-	my $path_info = $r->path_info | "";
-	my $args = $r->args || "";
-	my $dir_config = $r->dir_config;
-	my %conf_vars = map { $_ => $dir_config->{$_} } grep { /^webwork_/ } keys %$dir_config;
-	@SeedCE{keys %conf_vars} = values %conf_vars;
+	my $method   = $c->req->method;
+	my $location = $c->location;
+	my $uri      = $c->url_for;
+	my $args     = $c->req->params->to_string || '';
 
 	debug("\n\n===> Begin " . __PACKAGE__ . "::dispatch() <===\n\n");
 	debug("Hi, I'm the new dispatcher!\n");
 	debug(("-" x 80) . "\n");
 
 	debug("Okay, I got some basic information:\n");
-	debug("The apache location is $location\n");
+	debug("The site location is $location\n");
 	debug("The request method is $method\n");
 	debug("The URI is $uri\n");
-	debug("The path-info is $path_info\n");
 	debug("The argument string is $args\n");
-	#debug("The WeBWorK root directory is $webwork_root\n");
-	#debug("The PG root directory is $pg_root\n");
-	debug(("-" x 80) . "\n");
-
-	debug("The first thing we need to do is munge the path a little:\n");
+	debug(('-' x 80) . "\n");
 
-	######################################################################
-	# Create a URLPath  object
-	######################################################################
 	my ($path) = $uri =~ m/$location(.*)/;
-	$path = "/" if $path eq ""; # no path at all
+	$path .= '/' if $path !~ m(/$);
+	debug("The path is $path\n");
 
-	debug("We can't trust the path-info, so we make our own path.\n");
-	debug("path-info claims: $path_info\n");
-	debug("but it's really: $path\n");
-	debug("(if it's empty, we set it to \"/\".)\n");
+	debug("The current route is " . $c->current_route . "\n");
+	debug("Here is some information about this route:\n");
 
-	$path =~ s|/+|/|g;
-	debug("...and here it is without repeated slashes: $path\n");
+	my $displayModule = ref $c;
+	my %routeCaptures = %{ $c->stash->{'mojo.captures'} };
 
-	# lookbehind assertion for "not a slash"
-	# matches the boundary after the last char
-	$path =~ s|(?<=[^/])$|/|;
-	debug("...and here it is with a trailing slash: $path\n");
+	if ($c->current_route =~ /^(render_rpc|instructor_rpc|html2xml)$/) {
+		$c->{rpc} = 1;
 
-	debug(("-" x 80) . "\n");
-
-	debug("Now we need to look at the path a little to figure out where we are\n");
-
-	debug("-------------------- call to WeBWorK::URLPath::newFromPath\n");
-	my $urlPath = WeBWorK::URLPath->newFromPath($path, $r);
-	                            # pointer to parent request for access to the $ce and language translation ability
-	                            # need to add this pointer whenever a new URLPath is created.
-	debug("-------------------- call to WeBWorK::URLPath::newFromPath\n");
+		# This provides compatibility for legacy html2xml parameters.
+		# This should be deleted when the html2xml endpoint is removed.
+		if ($c->current_route eq 'html2xml') {
+			for ([ 'userID', 'user' ], [ 'course_password', 'passwd' ], [ 'session_key', 'key' ]) {
+				$c->param($_->[1], $c->param($_->[0])) if defined $c->param($_->[0]) && !defined $c->param($_->[1]);
+			}
+		}
 
-	unless ($urlPath) {
-		debug("This path is invalid... see you later!\n");
-		die "The path '$path' is not valid.\n";
+		# Get the courseID from the parameters for a remote procedure call.
+		$routeCaptures{courseID} = $c->param('courseID') if $c->param('courseID');
 	}
 
-	my $displayModule = $urlPath->module;
-	my %displayArgs = $urlPath->args;
-
-	unless ($displayModule) {
-	    debug("The display module is empty, so we can DECLINE here.\n");
-	    $path = encode_entities($path);
-	    die "No display module found for path '$path'.";
+	# If this is the login phase of an LTI 1.3 login, then extract the courseID from the target_link_uri.
+	if ($c->current_route eq 'ltiadvantage_login') {
+		my $target = $c->param('target_link_uri') ? $c->url_for($c->param('target_link_uri'))->path : '';
+		$c->stash->{courseID} = $1 if $target =~ m|$location/([^/]*)|;
+		$routeCaptures{courseID} = $c->stash->{courseID} || '___';
 	}
 
-	debug("The display module for this path is: $displayModule\n");
-	debug("...and here are the arguments we'll pass to it:\n");
-	foreach my $key (keys %displayArgs) {
-		debug("\t$key => $displayArgs{$key}\n");
+	# If this is the launch phase of an LTI 1.3 login, then get the courseID from the state.  Note that this data can
+	# not be trusted.  It will be verified once the JWT is decrypted.  Also see the comments about the hacks involved
+	# here in the WeBWorK::Authen::LTIAdvantage::verify method.
+	if ($c->current_route eq 'ltiadvantage_launch') {
+		$c->stash->{LTIState} = $c->param('state') || ',set_id:';
+		($c->stash->{lti_lms_user_id}, $c->stash->{courseID}) = split ',set_id:', $c->stash->{LTIState};
+		if ($c->stash->{courseID} && $c->stash->{lti_lms_user_id}) {
+			$c->stash->{courseID} =~ s/@/-/g;
+			$routeCaptures{courseID} = $c->stash->{courseID};
+		} else {
+			$routeCaptures{courseID} = '___';
+		}
 	}
 
-	my $selfPath = $urlPath->path;
-	my $parent = $urlPath->parent;
-	my $parentPath = $parent ? $parent->path : "<no parent>";
-
-	debug("Reconstructing the original path gets us: $selfPath\n");
-	debug("And we can generate the path to our parent, too: $parentPath\n");
-	debug("(We could also figure out who our children are, but we'd need to supply additional arguments.)\n");
-	debug(("-" x 80) . "\n");
+	debug("The display module for this route is $displayModule\n");
+	debug("This route has the following captures:\n");
+	for my $key (keys %routeCaptures) {
+		debug("\t$key => $routeCaptures{$key}\n");
+	}
 
-	debug("The URLPath looks good, we'll add it to the request.\n");
-	$r->urlpath($urlPath);
+	debug(('-' x 80) . "\n");
 
 	debug("Now we want to look at the parameters we got.\n");
 
 	debug("The raw params:\n");
-	foreach my $key ($r->param) {
-	    #make it so we dont debug plain text passwords
-	    my $vals;
-	    if ($key eq 'passwd'||
-		$key eq 'confirmPassword' ||
-		$key eq 'currPassword' ||
-		$key eq 'newPassword' ||
-		$key =~ /\.new_password/) {
-		$vals = '**********';
-	    } else {
-		my @vals = $r->param($key);
-		$vals = join(", ", map { "'$_'" } @vals);
-	    }
-	    debug("\t$key => $vals\n");
-	}
-
-	#mungeParams($r);
-	#
-	#debug("The munged params:\n");
-	#foreach my $key ($r->param) {
-	#	debug("\t$key\n");
-	#	debug("\t\t$_\n") foreach $r->param($key);
-	#}
-
-	debug(("-" x 80) . "\n");
-
-	my $apache_hostname = $r->hostname;
-	my $apache_port     = $r->get_server_port;
-	my $apache_is_ssl   = ($r->subprocess_env('https') ? 1 : "");
-	my $apache_root_url;
-	if ($apache_is_ssl) {
-		$apache_root_url = "https://$apache_hostname";
-		$apache_root_url .= ":$apache_port" if $apache_port != 443;
-	} else {
-		$apache_root_url = "http://$apache_hostname";
-		$apache_root_url .= ":$apache_port" if $apache_port != 80;
+	for my $key ($c->param) {
+		# Make it so we dont debug plain text passwords
+		my $vals;
+		if ($key eq 'passwd'
+			|| $key eq 'confirmPassword'
+			|| $key eq 'currPassword'
+			|| $key eq 'newPassword'
+			|| $key =~ /\.new_password/)
+		{
+			$vals = '**********';
+		} else {
+			my @vals = $c->param($key);
+			$vals = join(', ', map {qq{"$_"}} @vals);
+		}
+		debug("\t$key => $vals\n");
 	}
 
+	debug(('-' x 80) . "\n");
 
-	####################################################################
-	# Create Course Environment    $ce
-	####################################################################
+	# Create Course Environment
 	debug("We need to get a course environment (with or without a courseID!)\n");
-	my $ce = eval { new WeBWorK::CourseEnvironment({
-		%SeedCE,
-		courseName => $displayArgs{courseID},
-		# this is kind of a hack, but it's really the only sane way to get this
-		# server information into the PG box
-		apache_hostname => $apache_hostname,
-		apache_port => $apache_port,
-		apache_is_ssl => $apache_is_ssl,
-		apache_root_url => $apache_root_url,
-	}) };
+	my $ce = eval { WeBWorK::CourseEnvironment->new({ courseName => $routeCaptures{courseID} }) };
 	$@ and die "Failed to initialize course environment: $@\n";
 	debug("Here's the course environment: $ce\n");
-	$r->ce($ce);
+	$c->ce($ce);
 
+	# Localization
+	my $language = $ce->{language} || 'en';
+	$c->language_handle(WeBWorK::Localize::getLoc($language));
 
-	######################
-	# Localizing language
-	######################
-	my $language= $ce->{language} || "en";
-	# $r->language_handle( WeBWorK::Localize->get_handle($language) );
-	$r->language_handle( WeBWorK::Localize::getLoc($language) );
-
-	my @uploads;
-
-	my $upload_table = $r->upload;
-	@uploads = values %$upload_table if defined $upload_table;
+	my @uploads = @{ $c->req->uploads };
 
 	foreach my $u (@uploads) {
-		# make sure it's a "real" upload
+		# Make sure it's a "real" upload.
 		next unless $u->filename;
 
-		# store the upload
-		my $upload = WeBWorK::Upload->store($u,
-			dir => $ce->{webworkDirs}->{uploadCache}
-		);
+		# Store the upload.
+		my $upload = WeBWorK::Upload->store($u, dir => $ce->{webworkDirs}{uploadCache});
 
-		# store the upload ID and hash in the file upload field
-		my $id = $upload->id;
+		# Store the upload ID and hash in the file upload field.
+		my $id   = $upload->id;
 		my $hash = $upload->hash;
-		$r->param($u->name => "$id $hash");
+		$c->param($u->name => "$id $hash");
 	}
 
-	# create these out here. they should fail if they don't have the right information
-	# this lets us not be so careful about whether these objects are defined when we use them.
-	# instead, we just create the behavior that if they don't have a valid $db they fail.
-	my $authz = new WeBWorK::Authz($r);
-	$r->authz($authz);
-
-	# figure out which authentication modules to use
-	#my $user_authen_module;
-	#my $proctor_authen_module;
-	#if (ref $ce->{authen}{user_module} eq "HASH") {
-	#	if (exists $ce->{authen}{user_module}{$ce->{dbLayoutName}}) {
-	#		$user_authen_module = $ce->{authen}{user_module}{$ce->{dbLayoutName}};
-	#	} else {
-	#		$user_authen_module = $ce->{authen}{user_module}{"*"};
-	#	}
-	#} else {
-	#	$user_authen_module = $ce->{authen}{user_module};
-	#}
-	#if (ref $ce->{authen}{proctor_module} eq "HASH") {
-	#	if (exists $ce->{authen}{proctor_module}{$ce->{dbLayoutName}}) {
-	#		$proctor_authen_module = $ce->{authen}{proctor_module}{$ce->{dbLayoutName}};
-	#	} else {
-	#		$proctor_authen_module = $ce->{authen}{proctor_module}{"*"};
-	#	}
-	#} else {
-	#	$proctor_authen_module = $ce->{authen}{proctor_module};
-	#}
-
-	my $user_authen_module = WeBWorK::Authen::class($ce, "user_module");
+	# Create these out here. They should fail if they don't have the right information.
+	# This lets us not be so careful about whether these objects are defined when we use them.
+	# Instead, we just create the behavior that if they don't have a valid $db they fail.
+	my $authz = WeBWorK::Authz->new($c);
+	$c->authz($authz);
+
+	my $user_authen_module = WeBWorK::Authen::class($ce, 'user_module');
 
 	runtime_use $user_authen_module;
-	my $authen = $user_authen_module->new($r);
+	my $authen = $user_authen_module->new($c);
 	debug("Using user_authen_module $user_authen_module: $authen\n");
-	$r->authen($authen);
+	$c->authen($authen);
 
-	my $db;
+	if ($routeCaptures{courseID}) {
+		debug("We got a courseID from the route, now we can do some stuff:\n");
 
-	if ($displayArgs{courseID}) {
-		debug("We got a courseID from the URLPath, now we can do some stuff:\n");
-
-		unless (-e $ce->{courseDirs}->{root}) {
-			die "Course '$displayArgs{courseID}' not found: $!";
-		}
+		return (0, 'This course does not exist.')
+			unless (-e $ce->{courseDirs}{root}
+				|| -e "$ce->{webwork_courses_dir}/admin/archives/$routeCaptures{courseID}.tar.gz");
+		return (0, 'This course has been archived and closed.') unless -e $ce->{courseDirs}{root};
 
 		debug("...we can create a database object...\n");
-		$db = new WeBWorK::DB($ce->{dbLayout});
+		my $db = WeBWorK::DB->new($ce->{dbLayout});
 		debug("(here's the DB handle: $db)\n");
-		$r->db($db);
+		$c->db($db);
+
+		if ($authen->verify) {
+			# If this is the first phase of LTI 1.3 authentication, then return so its special content generator
+			# module will render and submit the login repost form.  This does not contain the neccessary information
+			# to continue here.
+			return 1 if $c->current_route eq 'ltiadvantage_login';
 
-		my $authenOK = $authen->verify;
-		if ($authenOK) {
-			my $userID = $r->param("user");
+			my $userID = $c->param('user');
 			debug("Hi, $userID, glad you made it.\n");
 
-			# tell authorizer to cache this user's permission level
+			# Tell authorizer to cache this user's permission level
 			$authz->setCachedUser($userID);
 
 			debug("Now we deal with the effective user:\n");
-			my $eUserID = $r->param("effectiveUser") || $userID;
+			my $eUserID = $c->param('effectiveUser') || $userID;
 			debug("userID=$userID eUserID=$eUserID\n");
 			if ($userID ne $eUserID) {
 				debug("userID and eUserID differ... seeing if userID has 'become_student' permission.\n");
-				my $su_authorized = $authz->hasPermissions($userID, "become_student");
+				my $su_authorized = $authz->hasPermissions($userID, 'become_student');
 				if ($su_authorized) {
 					debug("Ok, looks like you're allowed to become $eUserID. Whoopie!\n");
 				} else {
 					debug("Uh oh, you're not allowed to become $eUserID. Nice try!\n");
-					die "You do not have permission to act as another user.
-					Close down your browser (this clears temporary cookies),
-					restart and try again.\n";
+					return (0,
+						"You do not have permission to act as another user.\n"
+							. 'Close down your browser (this clears temporary cookies), restart and try again.');
 				}
 			}
 
-			# set effectiveUser in case it was changed or not set to begin with
-			$r->param("effectiveUser" => $eUserID);
+			# Set effectiveUser in case it was changed or not set to begin with.
+			$c->param('effectiveUser' => $eUserID);
 
-			# if we're doing a proctored test, after the user has been authenticated
-			# we need to also check on the proctor.  note that in the gateway quiz
-			# module we double check this, to be sure that someone isn't taking a
-			# proctored quiz but calling the unproctored ContentGenerator
-			my $urlProducedPath = $urlPath->path();
-			if ( $urlProducedPath =~ /proctored_quiz_mode/i ) {
-				my $proctor_authen_module = WeBWorK::Authen::class($ce, "proctor_module");
+			# If this is a proctored test, then after the user has been authenticated
+			# we need to also check on the proctor.  Note that in the gateway quiz
+			# module this is double checked to be sure that someone isn't taking a
+			# proctored quiz but calling the unproctored ContentGenerator.
+			if ($c->current_route =~ /^proctored_gateway_quiz|proctored_gateway_proctor_login$/) {
+				my $proctor_authen_module = WeBWorK::Authen::class($ce, 'proctor_module');
 				runtime_use $proctor_authen_module;
-				my $authenProctor = $proctor_authen_module->new($r);
+				my $authenProctor = $proctor_authen_module->new($c);
 				debug("Using proctor_authen_module $proctor_authen_module: $authenProctor\n");
-			    my $procAuthOK = $authenProctor->verify();
+				my $procAuthOK = $authenProctor->verify();
 
-				if (not $procAuthOK) {
-					$displayModule = PROCTOR_LOGIN_MODULE;
+				if (!$procAuthOK) {
+					await WeBWorK::ContentGenerator::LoginProctor->new($c)->go;
+					return 0;
 				}
 			}
+			return 1;
 		} else {
-			debug("Bad news: authentication failed!\n");
-			$displayModule = LOGIN_MODULE;
-			debug("set displayModule to $displayModule\n");
-		}
-	}
-
-	# store the time before we invoke the content generator
-	my $cg_start = time; # this is Time::HiRes's time, which gives floating point values
-
-	debug(("-" x 80) . "\n");
-	debug("Finally, we'll load the display module...\n");
-
-	runtime_use($displayModule);
-
-	debug("...instantiate it...\n");
-
-	my $instance = $displayModule->new($r);
-
-	debug("...and call it:\n");
-	debug("-------------------- call to ${displayModule}::go\n");
-
-	my $result = $instance->go();
-
-	debug("-------------------- call to ${displayModule}::go\n");
+			# For a remote procedure call continue on to the original display module.
+			# It will give the authentication failure response.
+			return 1 if $c->{rpc};
 
-	my $cg_end = time;
-	my $cg_duration = $cg_end - $cg_start;
-	writeTimingLogEntry($ce, "[".$r->uri."]", sprintf("runTime = %.3f sec", $cg_duration)." ".$ce->{dbLayoutName}, "");
+			# If the user is logging out and authentication failed, still logout.
+			return 1 if $displayModule eq 'WeBWorK::ContentGenerator::Logout';
 
-	debug("returning result: " . (defined $result ? $result : "UNDEF") . "\n");
-	return $result;
-}
-
-sub mungeParams {
-	my ($r) = @_;
-
-	my @paramQueue;
-
-	# remove all the params from the request, and store them in the param queue
-	foreach my $key ($r->param) {
-		push @paramQueue, [ $key => [ $r->param($key) ] ];
-		$r->parms->unset($key)
-	}
-
-	# exhaust the param queue, decoding encoded params
-	while (@paramQueue) {
-		my ($key, $values) = @{ shift @paramQueue };
-
-		if ($key =~ m/\,/) {
-			# we have multiple params encoded in a single param
-			# split them up and add them to the end of the queue
-			push @paramQueue, map { [ $_, $values ] } split m/\,/, $key;
-		} elsif ($key =~ m/\:/) {
-			# we have a whole param encoded in a key
-			# split it up and add it to the end of the queue
-			my ($newKey, $newValue) = split m/\:/, $key;
-			push @paramQueue, [ $newKey, [ $newValue ] ];
-		} else {
-			# this is a "normal" param
-			# add it to the param list
-			if (defined $r->param($key)) {
-				# the param already exists -- append the values we have
-				$r->param($key => [ $r->param($key), @$values ]);
-			} else {
-				# the param doesn't exist -- create it with the values we have
-				$r->param($key => $values);
-			}
-		}
-	}
-}
-
-# split_cap subroutine - ghe3
-
-# A sort of wrapper for the built-in split function which uses capital letters as a delimiter, and returns a string containing the separated substrings separated by a whitespace.  Used to make actionID's more readable.
-
-sub split_cap
-{
-	my $str = shift;
-
-	my @str_arr = split(//,$str);
-	my $count = scalar(@str_arr);
-
-	my $i = 0;
-	my $prev = 0;
-	my @result = ();
-	my $hasCapital = 0;
-	foreach(@str_arr){
-		if($_ =~ /[A-Z]/){
-			$hasCapital = 1;
-			push(@result, join("", @str_arr[$prev..$i-1]));
-			$prev = $i;
-		}
-		$i++;
-	}
-
-	unless($hasCapital){
-		return $str;
-	}
-	else{
-		push(@result, join("", @str_arr[$prev..$count-1]));
-		return join(" ",@result);
-	}
-}
-
-# underscore_to_whitespace subroutine
-
-# a simple subroutine for converting underscores in a given string to whitespace
-
-sub underscore_to_whitespace{
-	my $str = shift;
-
-	my @strArr = split("",$str);
-	foreach(@strArr){
-		if($_ eq "_"){
-			$_ = " "
-		}
-	}
-
-	my $result = join("",@strArr);
-
-	return $result;
-}
-
-sub remove_duplicates{
-	my @arr = @_;
-
-	my %unique;
-	my @result;
-
-	foreach(@arr){
-		if(defined $unique{$_}){
-			next;
-		}
-		else{
-			push(@result, $_);
-			$unique{$_} = "seen";
+			debug("Bad news: authentication failed!\n");
+			debug("Rendering WeBWorK::ContentGenerator::Login\n");
+			await WeBWorK::ContentGenerator::Login->new($c)->go();
+			return 0;
 		}
 	}
 
-	return @result;
-
+	return 1;
 }
 
-=head1 AUTHOR
-
-Written by Dennis Lambe, malsyned at math.rochester.edu. Modified by Sam
-Hathaway, sh002i at math.rochester.edu.
-
-=cut
-
 1;
diff --git a/lib/WeBWorK/AchievementEvaluator.pm b/lib/WeBWorK/AchievementEvaluator.pm
index 337c08b70f..34358d550f 100644
--- a/lib/WeBWorK/AchievementEvaluator.pm
+++ b/lib/WeBWorK/AchievementEvaluator.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::AchievementEvaluator;
-use base qw(WeBWorK);
+use Mojo::Base 'Exporter', -signatures;
 
 =head1 NAME
 
@@ -22,35 +22,26 @@ use base qw(WeBWorK);
 
 =cut
 
-use strict;
-use warnings;
-use WeBWorK::CGI;
-use WeBWorK::Utils qw(before after readFile sortAchievements nfreeze_base64 thaw_base64);
-use WeBWorK::Utils::Tags;
 use DateTime;
 
-use WWSafe;
-
-sub checkForAchievements {
+use WeBWorK::Utils qw(sortAchievements nfreeze_base64 thaw_base64);
+use WeBWorK::Utils::Tags;
+use Safe;
 
-	our $problem = shift;
-	my $pg      = shift;
-	my $r       = shift;
-	my %options = @_;
-	my $db      = $r->db;
-	my $ce      = $r->ce;
+our @EXPORT_OK = qw(checkForAchievements);
 
-	my $course_display_tz = $ce->{siteDefaults}{timezone};
-	# the following line from Utils.pm
-	$course_display_tz ||= "local";    # do our best to provide default vaules
+sub checkForAchievements ($problem_in, $pg, $c, %options) {
+	our $problem = $problem_in;
+	my $db = $c->db;
+	my $ce = $c->ce;
 
 	# Date and time for course timezone (may differ from the server timezone)
 	# Saved into separate array
 	# https://metacpan.org/pod/DateTime
-	my $dtCourseTime = DateTime->from_epoch(epoch => time(), time_zone => $course_display_tz);
+	my $dtCourseTime = DateTime->from_epoch(epoch => time(), time_zone => $ce->{siteDefaults}{timezone} || 'local');
 
-	#set up variables and get achievements
-	my $cheevoMessage = '';
+	# Set up variables and get achievements
+	my $cheevoMessage = $c->c;
 	my $user_id       = $problem->user_id;
 	my $set_id        = $problem->set_id;
 
@@ -79,19 +70,9 @@ sub checkForAchievements {
 		$db->addGlobalUserAchievement($globalUserAchievement);
 	}
 
-	#update the problem with stuff from the pg.
-	# this is kind of a hack.  The achievement checking happens *before* the system has
-	# updated $problem with the new results from $pg.  So we cheat and update the
-	# important bits here.  The only thing that gets left behind is last_answer, which is
-	# still the previous last answer.
-
-	# $pg->{result} reflects the current submission, $pg->{state} holds the best result
-	# close the unlimited achievement points loophole by only using the current result!
-	$problem->status($pg->{result}->{score});
-	$problem->sub_status($pg->{state}->{sub_recorded_score});
-	$problem->attempted(1);
-	$problem->num_correct($pg->{state}->{num_of_correct_ans});
-	$problem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
+	# Do not update the problem with stuff from the pg.  The achievement checking happens
+	# *after* the system has already updated $problem with the new results from $pg.
+	# The code here has no right to modify the problem in any case.
 
 	#These need to be "our" so that they can share to the safe container
 	our $counter;
@@ -108,7 +89,13 @@ sub checkForAchievements {
 		$dtCourseTime->month, $dtCourseTime->year, $dtCourseTime->day_of_week
 	);
 
-	my $compartment = new WWSafe;
+	# Mojolicious sets the INT and TERM signal handlers, and perl Safe overrides those (as those signals can be used to
+	# break out of Safe) which causes an error later when the Mojolicious signals handlers are not called as they should
+	# be.  So the current signal handlers are cached here and restored after the Safe reval is completed.
+	my %ORIG_SIG;
+	$ORIG_SIG{$_} = $SIG{$_} for keys %SIG;
+
+	my $compartment = Safe->new;
 
 	#initialize things that are ""
 	if (not $achievementPoints) {
@@ -128,7 +115,7 @@ sub checkForAchievements {
 	foreach my $achievement (@achievements) {
 		next unless $achievement->enabled;
 		my $userAchievement = $db->getUserAchievement($user_id, $achievement->achievement_id);
-		$userAchievements->{$achievement->achievement_id} = $userAchievement->earned if $userAchievement;
+		$userAchievements->{ $achievement->achievement_id } = $userAchievement->earned if $userAchievement;
 	}
 
 	#Update a couple of "standard" variables in globalData hash.
@@ -180,7 +167,7 @@ sub checkForAchievements {
 	if ($isGatewaySet) {
 		$problem = undef;
 	} else {
-		my $templateDir = $ce->{courseDirs}->{templates};
+		my $templateDir = $ce->{courseDirs}{templates};
 		$tags = WeBWorK::Utils::Tags->new($templateDir . '/' . $problem->source_file());
 	}
 
@@ -203,14 +190,13 @@ sub checkForAchievements {
 		$globalData $counter $nextLevelPoints $set $achievementPoints $tags @courseDateTime));
 
 	#load any preamble code
-	# this line causes the whole file to be read into one string
-	local $/;
 	my $preamble = '';
 	my $source;
-	if (-e "$ce->{courseDirs}->{achievements}/$ce->{achievementPreambleFile}") {
-		open(PREAMB, '<', "$ce->{courseDirs}->{achievements}/$ce->{achievementPreambleFile}");
-		$preamble = <PREAMB>;
-		close(PREAMB);
+	if (-e "$ce->{courseDirs}{achievements}/$ce->{achievementPreambleFile}") {
+		local $/;
+		open(my $PREAMB, '<', "$ce->{courseDirs}{achievements}/$ce->{achievementPreambleFile}");
+		$preamble = <$PREAMB>;
+		close($PREAMB);
 	}
 	#loop through the various achievements, see if they have been obtained,
 	foreach my $achievement (@achievements) {
@@ -233,11 +219,12 @@ sub checkForAchievements {
 		$maxCounter = $achievement->max_counter;
 
 		#check the achievement using Safe
-		my $sourceFilePath = $ce->{courseDirs}->{achievements} . '/' . $achievement->test;
+		my $sourceFilePath = $ce->{courseDirs}{achievements} . '/' . $achievement->test;
 		if (-e $sourceFilePath) {
-			open(SOURCE, '<', $sourceFilePath);
-			$source = <SOURCE>;
-			close(SOURCE);
+			local $/ = undef;
+			open(my $SOURCE, '<', $sourceFilePath);
+			$source = <$SOURCE>;
+			close($SOURCE);
 		} else {
 			warn('Couldnt find achievement evaluator $sourceFilePath');
 			next;
@@ -260,41 +247,8 @@ sub checkForAchievements {
 				$globalUserAchievement->next_level_points($nextLevelPoints);
 			}
 
-			#build the cheevo message. New level messages are slightly different
-			my $imgSrc = $ce->{server_root_url};
-			if ($achievement->{icon}) {
-				$imgSrc .= $ce->{courseURLs}->{achievements} . "/" . $achievement->{icon};
-			} else {
-				$imgSrc .= $ce->{webworkURLs}->{htdocs} . "/images/defaulticon.png";
-			}
-
-			$cheevoMessage .= CGI::start_div({
-				class       => 'cheevo-toast toast hide',
-				role        => 'alert',
-				aria_live   => 'polite',
-				aria_atomic => 'true'
-			});
-			$cheevoMessage .= CGI::start_div({ class => 'toast-body d-flex align-items-center' });
-
-			$cheevoMessage .= CGI::img({ src => $imgSrc, alt => 'Achievement Icon' });
-
-			$cheevoMessage .= CGI::start_div({ class => 'cheevopopuptext' });
-			if ($achievement->category eq 'level') {
-				$cheevoMessage = $cheevoMessage . CGI::h2("$achievement->{name}");
-				# Print the description as part of the message if we are using items.
-				$cheevoMessage .=
-					CGI::div($ce->{achievementItemsEnabled}
-						? $achievement->{description}
-						: $r->maketext("Congratulations, you earned a new level!"));
-			} else {
-				$cheevoMessage .= CGI::h2("$achievement->{name}");
-				$cheevoMessage .= CGI::div("<i>$achievement->{points} Points</i>: $achievement->{description}");
-			}
-			$cheevoMessage .= CGI::end_div();
-
-			$cheevoMessage .= q{<button type="button" class="btn-close me-2 m-auto"
-								data-bs-dismiss="toast" aria-label="Close"></button>};
-			$cheevoMessage .= CGI::end_div() . CGI::end_div();
+			# Construct the cheevo message using the cheevoMessage template.
+			push(@$cheevoMessage, $c->include('AchievementEvaluator/cheevoMessage', achievement => $achievement));
 
 			my $points = $achievement->points;
 			#just in case points is an ininitialzied variable
@@ -312,21 +266,23 @@ sub checkForAchievements {
 
 	}    #end for loop
 
+	# Restore the original signal handlers.
+	local $SIG{$_} = $ORIG_SIG{$_} for keys %ORIG_SIG;
+
 	#nfreeze_base64 globalData and store
 	$globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
 	$db->putGlobalUserAchievement($globalUserAchievement);
 
-	if ($cheevoMessage) {
-		$cheevoMessage = CGI::div(
-			{
-				class => "cheevo-toast-container toast-container "
-					. "position-absolute top-0 start-50 translate-middle-x p-3"
-			},
-			$cheevoMessage
+	if (@$cheevoMessage) {
+		return $c->tag(
+			'div',
+			class =>
+				'cheevo-toast-container toast-container position-absolute top-0 start-50 translate-middle-x p-3',
+			$cheevoMessage->join('')
 		);
 	}
 
-	return $cheevoMessage;
+	return '';
 }
 
 1;
diff --git a/lib/WeBWorK/AchievementItems.pm b/lib/WeBWorK/AchievementItems.pm
index 6177d99a93..cee7011a30 100644
--- a/lib/WeBWorK/AchievementItems.pm
+++ b/lib/WeBWorK/AchievementItems.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,1762 +14,112 @@
 ################################################################################
 
 package WeBWorK::AchievementItems;
-use base qw(WeBWorK);
-
-use WeBWorK::Utils qw(nfreeze_base64 thaw_base64);
-
-use strict;
-use warnings;
-
-# have to add any new items to this list, furthermore
-# the elements of this list have to match the class name/id of the
-# item classes defined below.
-use constant ITEMS => [qw(
-ResetIncorrectAttempts
-DuplicateProb
-DoubleProb
-HalfCreditProb
-FullCreditProb
-ReducedCred
-ExtendDueDate
-DoubleSet
-ResurrectHW
-Surprise
-SuperExtendDueDate
-HalfCreditSet
-FullCreditSet
-AddNewTestGW
-ExtendDueDateGW
-ResurrectGW
-)];
+use Mojo::Base -signatures;
+
+use WeBWorK::Utils qw(thaw_base64);
+
+# List of available achievement items.  Make sure to add any new items to this list. Furthermore, the elements in this
+# list have to match the class name of the achievement item classes loaded below.
+use constant ITEMS => [ qw(
+	ResetIncorrectAttempts
+	DuplicateProb
+	DoubleProb
+	HalfCreditProb
+	FullCreditProb
+	ReducedCred
+	ExtendDueDate
+	DoubleSet
+	ResurrectHW
+	Surprise
+	SuperExtendDueDate
+	HalfCreditSet
+	FullCreditSet
+	AddNewTestGW
+	ExtendDueDateGW
+	ResurrectGW
+) ];
 
 =head2 NAME
 
-Item - this is the base class for achievement times.  This defines an
-interface for all of the achievement items.  Each achievement item will have
-a name, a description, a method for creating an html form to get its inputs
-called print_form and a method for applying those inputs called use_item.
+This is the base class for achievement times.  This defines an interface for all of the achievement items.  Each
+achievement item will have a name, a description, a method for creating an html form to get its inputs called print_form
+and a method for applying those inputs called use_item.
 
 Note: the ID has to match the name of the class.
 
 =cut
 
-sub id { shift->{id} }
-sub name { shift->{name} }
-sub description { shift->{description} }
+sub id          ($c) { return $c->{id}; }
+sub name        ($c) { return $c->{name}; }
+sub description ($c) { return $c->{description}; }
 
 # This is a global method that returns all of the provided users items.
-sub UserItems {
-    my $userName = shift;
-    my $db = shift;
-    my $ce = shift;
-
-    # return unless the user has global achievement data
-    my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
+sub UserItems ($userName, $db, $ce) {
+	# return unless the user has global achievement data
+	my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
 
-    return unless ($globalUserAchievement->frozen_hash);
+	return unless ($globalUserAchievement->frozen_hash);
 
-    my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
-    my @items;
+	my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
+	my @items;
 
-    # ugly eval to get a new item object for each type of item.
-    foreach my $item (@{+ITEMS}) {
-	push (@items, [eval("WeBWorK::AchievementItems::${item}->new"),$globalData->{$item}]) if
-	    ($globalData->{$item});
-    }
+	# Get a new item object for each type of item.
+	for my $item (@{ +ITEMS }) {
+		push(@items, [ "WeBWorK::AchievementItems::$item"->new, $globalData->{$item} ])
+			if ($globalData->{$item});
+	}
 
-    return \@items;
+	return \@items;
 }
 
 # Utility method for outputing a form row with a label and popup menu.
 # The id, label_text, and values are required parameters.
-sub form_popup_menu_row {
+sub form_popup_menu_row ($c, %options) {
 	my %params = (
 		id                  => '',
 		label_text          => '',
 		label_attr          => {},
 		values              => [],
-		labels              => {},
 		menu_attr           => {},
 		menu_container_attr => {},
 		add_container       => 1,
-		@_
-	);
-
-	$params{label_attr}{for}            = $params{id};
-	$params{label_attr}{class}          = 'col-4 col-form-label' unless defined $params{label_attr}{class};
-	$params{menu_attr}{values}          = $params{values};
-	$params{menu_attr}{labels}          = $params{labels};
-	$params{menu_attr}{id}              = $params{id};
-	$params{menu_attr}{name}            = $params{id};
-	$params{menu_attr}{class}           = 'form-select' unless defined $params{menu_attr}{class};
-	$params{menu_container_attr}{class} = 'col-8'       unless defined $params{menu_container_attr}{class};
-
-	return join('',
-		$params{add_container} ? CGI::start_div({ class => 'row mb-3' }) : '',
-		CGI::label($params{label_attr}, $params{label_text}),
-		CGI::div($params{menu_container_attr}, CGI::popup_menu($params{menu_attr})),
-		$params{add_container} ? CGI::end_div() : '');
-}
-
-#Item to resurrect a homework for 24 hours
-
-package WeBWorK::AchievementItems::ResurrectHW;
-our @ISA = qw(WeBWorK::AchievementItems);
-
-use WeBWorK::Utils qw(sortByName before after between x nfreeze_base64 thaw_base64 format_set_name_display);
-
-sub new {
-    my $class = shift;
-    my %options = @_;
-
-    my $self = {
-	id => "ResurrectHW",
-	name => x("Scroll of Resurrection"),
-	description => x("Opens any homework set for 24 hours."),
-	%options,
-    };
-
-    bless($self, $class);
-    return $self;
-}
-
-sub print_form {
-    my $self = shift;
-    my $sets = shift;
-    my $setProblemCount = shift;
-    my $r = shift;
-
-    my @openSets;
-    my @openSetCount;
-    my $maxProblems=0;
-
-    #Find all of the closed sets or sets that are past their reduced scoring date and put them in form
-
-	for (my $i = 0; $i <= $#$sets; $i++) {
-		if (after($$sets[$i]->due_date) && $$sets[$i]->assignment_type eq 'default') {
-			push(@openSets, $$sets[$i]->set_id);
-		} elsif (defined $$sets[$i]->reduced_scoring_date && $$sets[$i]->reduced_scoring_date ne '') {
-			if (after($$sets[$i]->reduced_scoring_date) && $$sets[$i]->assignment_type eq 'default') {
-				push(@openSets, $$sets[$i]->set_id);
-			}
-		}
-	}
-
-	return join(
-		'',
-		CGI::p($r->maketext('Choose the set which you would like to resurrect.')),
-		WeBWorK::AchievementItems::form_popup_menu_row(
-			id         => 'res_set_id',
-			label_text => $r->maketext('Set Name'),
-			values     => \@openSets,
-			labels     => { map { $_ => format_set_name_display($_) } @openSets },
-			menu_attr  => { dir => 'ltr' }
-		)
-	);
-}
-
-sub use_item {
-    my $self = shift;
-    my $userName = shift;
-    my $r = shift;
-    my $db = $r->db;
-    my $ce = $r->ce;
-
-    #check and see if student really has the item and if the data is valid
-    my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
-    return "No achievement data?!?!?!"
-	unless ($globalUserAchievement->frozen_hash);
-    my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
-
-    return "You are $self->{id} trying to use an item you don't have" unless
-	($globalData->{$self->{id}});
-
-    my $setID = $r->param('res_set_id');
-    return "You need to input a Set Name" unless
-	(defined $setID);
-
-    my $set = $db->getUserSet($userName,$setID);
-    return "Couldn't find that set!" unless
-	($set);
-
-    # Set a new reduced scoring date, close date, and answer date for the student; remove the item
-    $set->reduced_scoring_date(time()+86400);
-    $set->due_date(time()+86400);
-    $set->answer_date(time()+86400);
-
-    $db->putUserSet($set);
-
-    my @probIDs = $db->listUserProblems($userName,$setID);
-
-    foreach my $probID (@probIDs) {
-	my $problem = $db->getUserProblem($userName,$setID,$probID);
-	$problem->problem_seed($problem->problem_seed + 100);
-	$db->putUserProblem($problem);
-    }
-
-    $globalData->{$self->{id}}--;
-    $globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
-    $db->putGlobalUserAchievement($globalUserAchievement);
-
-    return;
-}
-
-#Item to extend a close date by 24 hours.
-
-package WeBWorK::AchievementItems::ExtendDueDate;
-our @ISA = qw(WeBWorK::AchievementItems);
-
-use WeBWorK::Utils qw(sortByName before after between x nfreeze_base64 thaw_base64 format_set_name_display);
-
-sub new {
-    my $class = shift;
-    my %options = @_;
-
-    my $self = {
-	id => "ExtendDueDate",
-	name => x("Tunic of Extension"),
-	description => x("Adds 24 hours to the close date of a homework."),
-	%options,
-    };
-
-    bless($self, $class);
-    return $self;
-}
-
-sub print_form {
-    my $self = shift;
-    my $sets = shift;
-    my $setProblemCount = shift;
-    my $r = shift;
-
-    my @openSets;
-    my @openSetCount;
-    my $maxProblems=0;
-
-    #find all currently open sets and print to a form
-    for (my $i=0; $i<=$#$sets; $i++) {
-	if (between($$sets[$i]->open_date, $$sets[$i]->answer_date)  && $$sets[$i]->assignment_type eq "default") {
-	    push(@openSets,$$sets[$i]->set_id);
-	}
-    }
-
-	return join(
-		'',
-		CGI::p($r->maketext('Choose the set whose close date you would like to extend.')),
-		WeBWorK::AchievementItems::form_popup_menu_row(
-			id         => 'ext_set_id',
-			label_text => $r->maketext('Set Name'),
-			values     => \@openSets,
-			labels     => { map { $_ => format_set_name_display($_) } @openSets },
-			menu_attr  => { dir => 'ltr' }
-		)
-	);
-}
-
-sub use_item {
-    my $self = shift;
-    my $userName = shift;
-    my $r = shift;
-    my $db = $r->db;
-    my $ce = $r->ce;
-
-    #check and see if the student has the achievement and if the data is valid
-    my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
-    return "No achievement data?!?!?!"
-	unless ($globalUserAchievement->frozen_hash);
-    my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
-
-    return "You are $self->{id} trying to use an item you don't have" unless
-	($globalData->{$self->{id}});
-
-    my $setID = $r->param('ext_set_id');
-    return "You need to input a Set Name" unless
-	(defined $setID);
-
-    my $set = $db->getMergedSet($userName,$setID);
-    return "Couldn't find that set!" unless
-	($set);
-    my $userSet = $db->getUserSet($userName,$setID);
-
-    #add time to the reduced scoring date, due date, and answer date; remove item from inventory
-    $userSet->reduced_scoring_date($set->reduced_scoring_date()+86400) if defined($set->reduced_scoring_date()) && $set->reduced_scoring_date();
-    $userSet->due_date($set->due_date()+86400);
-    $userSet->answer_date($set->answer_date()+86400);
-
-    $db->putUserSet($userSet);
-
-    $globalData->{$self->{id}}--;
-    $globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
-    $db->putGlobalUserAchievement($globalUserAchievement);
-
-    return;
-}
-
-#Item to extend a close date by 48 hours.
-
-package WeBWorK::AchievementItems::SuperExtendDueDate;
-our @ISA = qw(WeBWorK::AchievementItems);
-
-use WeBWorK::Utils qw(sortByName before after between x nfreeze_base64 thaw_base64 format_set_name_display);
-
-sub new {
-    my $class = shift;
-    my %options = @_;
-
-    my $self = {
-	id => "SuperExtendDueDate",
-	name => x("Robe of Longevity"),
-	description => x("Adds 48 hours to the close date of a homework."),
-	%options,
-    };
-
-    bless($self, $class);
-    return $self;
-}
-
-sub print_form {
-    my $self = shift;
-    my $sets = shift;
-    my $setProblemCount = shift;
-    my $r = shift;
-
-    my @openSets;
-    my @openSetCount;
-    my $maxProblems=0;
-
-    #find all currently open sets and print to a form
-    for (my $i=0; $i<=$#$sets; $i++) {
-	if (between($$sets[$i]->open_date, $$sets[$i]->answer_date)  && $$sets[$i]->assignment_type eq "default") {
-	    push(@openSets,$$sets[$i]->set_id);
-	}
-    }
-
-	return join(
-		'',
-		CGI::p($r->maketext('Choose the set whose close date you would like to extend.')),
-		WeBWorK::AchievementItems::form_popup_menu_row(
-			id         => 'ext_set_id',
-			label_text => $r->maketext('Set Name'),
-			values     => \@openSets,
-			labels     => { map { $_ => format_set_name_display($_) } @openSets },
-			menu_attr  => { dir => 'ltr' }
-		)
-	);
-}
-
-sub use_item {
-    my $self = shift;
-    my $userName = shift;
-    my $r = shift;
-    my $db = $r->db;
-    my $ce = $r->ce;
-
-    #check and see if the student has the achievement and if the data is valid
-    my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
-    return "No achievement data?!?!?!"
-	unless ($globalUserAchievement->frozen_hash);
-    my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
-
-    return "You are $self->{id} trying to use an item you don't have" unless
-	($globalData->{$self->{id}});
-
-    my $setID = $r->param('ext_set_id');
-    return "You need to input a Set Name" unless
-	(defined $setID);
-
-    my $set = $db->getMergedSet($userName,$setID);
-    return "Couldn't find that set!" unless
-	($set);
-    my $userSet = $db->getUserSet($userName,$setID);
-
-    #add time to the reduced scoring date, due date, and answer date; remove item from inventory
-    $userSet->reduced_scoring_date($set->reduced_scoring_date()+172800) if defined($set->reduced_scoring_date()) && $set->reduced_scoring_date();
-    $userSet->due_date($set->due_date()+172800);
-    $userSet->answer_date($set->answer_date()+172800);
-
-    $db->putUserSet($userSet);
-
-    $globalData->{$self->{id}}--;
-    $globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
-    $db->putGlobalUserAchievement($globalUserAchievement);
-
-    return;
-}
-
-#Item to extend a close date by 24 hours for reduced credit
-
-package WeBWorK::AchievementItems::ReducedCred;
-our @ISA = qw(WeBWorK::AchievementItems);
-
-use WeBWorK::Utils qw(sortByName before after between x nfreeze_base64 thaw_base64 format_set_name_display);
-
-sub new {
-    my $class = shift;
-    my %options = @_;
-
-    my $self = {
-	id => "ReducedCred",
-	name => x("Ring of Reduction"),
-	#Reduced credit needs to be set up in course configuration for this
-	# item to work,
-	description => x("Enable reduced scoring for a homework set.  This will allow you to submit answers for partial credit for 24 hours after the close date."),
-	%options,
-    };
-
-    bless($self, $class);
-    return $self;
-}
-
-sub print_form {
-    my $self = shift;
-    my $sets = shift;
-    my $setProblemCount = shift;
-    my $r = shift;
-    my $ce = $r->{ce};
-
-    my @openSets;
-    my @openSetCount;
-    my $maxProblems=0;
-
-
-    #print names of open sets
-    for (my $i=0; $i<=$#$sets; $i++) {
-	if (between($$sets[$i]->open_date, $$sets[$i]->answer_date)  && $$sets[$i]->assignment_type eq "default") {
-	    push(@openSets,$$sets[$i]->set_id);
-	}
-    }
-
-	return join(
-		'',
-		CGI::p($r->maketext('Choose the set which you would like to enable partial credit for.')),
-		WeBWorK::AchievementItems::form_popup_menu_row(
-			id         => 'red_set_id',
-			label_text => $r->maketext('Set Name'),
-			values     => \@openSets,
-			labels     => { map { $_ => format_set_name_display($_) } @openSets },
-			menu_attr  => { dir => 'ltr' }
-		)
-	);
-}
-
-sub use_item {
-    my $self = shift;
-    my $userName = shift;
-    my $r = shift;
-    my $db = $r->db;
-    my $ce = $r->ce;
-
-
-    #check variables
-    my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
-    return "No achievement data?!?!?!"
-	unless ($globalUserAchievement->frozen_hash);
-    my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
-
-    return "This item won't work unless your instructor enables the reduced scoring feature.  Let them know that you recieved this message." unless $ce->{pg}{ansEvalDefaults}{reducedScoringPeriod};
-
-
-    return "You are $self->{id} trying to use an item you don't have" unless
-	($globalData->{$self->{id}});
-
-    my $setID = $r->param('red_set_id');
-    return "You need to input a Set Name" unless
-	(defined $setID);
-
-    my $set = $db->getMergedSet($userName,$setID);
-    return "Couldn't find that set!" unless
-	($set);
-    my $userSet = $db->getUserSet($userName,$setID);
-
-    # enable reduced scoring on the set and add the reduced scoring period
-    # to the due date.
-    my $additionalTime = 60*$ce->{pg}{ansEvalDefaults}{reducedScoringPeriod};
-    $userSet->enable_reduced_scoring(1);
-    $userSet->reduced_scoring_date($set->due_date());
-    $userSet->due_date($set->due_date()+$additionalTime);
-    $userSet->answer_date($set->answer_date()+$additionalTime);
-
-    $db->putUserSet($userSet);
-
-    $globalData->{$self->{id}}--;
-    $globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
-    $db->putGlobalUserAchievement($globalUserAchievement);
-
-    return;
-}
-
-#Item to make a homework set worth twice as much
-
-package WeBWorK::AchievementItems::DoubleSet;
-our @ISA = qw(WeBWorK::AchievementItems);
-
-use WeBWorK::Utils qw(sortByName before after between x nfreeze_base64 thaw_base64 format_set_name_display);
-
-sub new {
-    my $class = shift;
-    my %options = @_;
-
-    my $self = {
-	id => "DoubleSet",
-	name => x("Cake of Enlargement"),
-	description => x("Cause the selected homework set to count for twice as many points as it normally would."),
-	%options,
-    };
-
-    bless($self, $class);
-    return $self;
-}
-
-sub print_form {
-    my $self = shift;
-    my $sets = shift;
-    my $setProblemCount = shift;
-    my $r = shift;
-    my $ce = $r->{ce};
-
-    my @openSets;
-
-    #print open sets
-
-    for (my $i=0; $i<=$#$sets; $i++) {
-	if ($$sets[$i]->assignment_type eq "default") {
-	    push(@openSets,$$sets[$i]->set_id);
-	}
-    }
-
-	return join(
-		'',
-		CGI::p($r->maketext('Choose the set which you would like to be worth twice as much.')),
-		WeBWorK::AchievementItems::form_popup_menu_row(
-			id         => 'dub_set_id',
-			label_text => $r->maketext('Set Name'),
-			values     => \@openSets,
-			labels     => { map { $_ => format_set_name_display($_) } @openSets },
-			menu_attr  => { dir => 'ltr' }
-		)
-	);
-}
-
-sub use_item {
-    my $self = shift;
-    my $userName = shift;
-    my $r = shift;
-    my $db = $r->db;
-    my $ce = $r->ce;
-
-    #validate input data
-
-    my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
-    return "No achievement data?!?!?!"
-	unless ($globalUserAchievement->frozen_hash);
-    my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
-
-    return "You are $self->{id} trying to use an item you don't have" unless
-	($globalData->{$self->{id}});
-
-    my $setID = $r->param('dub_set_id');
-    return "You need to input a Set Name" unless
-	(defined $setID);
-
-    my $set = $db->getMergedSet($userName,$setID);
-    return "Couldn't find that set!" unless
-	($set);
-
-    # got through the problems in the set and double the value/weight of each
-
-    my @probIDs = $db->listUserProblems($userName,$setID);
-
-    foreach my $probID (@probIDs) {
-	my $globalproblem = $db->getMergedProblem($userName, $setID,$probID);
-	my $problem = $db->getUserProblem($userName,$setID,$probID);
-	$problem->value($globalproblem->value*2);
-	$db->putUserProblem($problem);
-    }
-
-    $globalData->{$self->{id}}--;
-    $globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
-    $db->putGlobalUserAchievement($globalUserAchievement);
-
-    return;
-}
-
-#Item to reset number of incorrect attempts.
-package WeBWorK::AchievementItems::ResetIncorrectAttempts;
-our @ISA = qw(WeBWorK::AchievementItems);
-
-use WeBWorK::Utils qw(sortByName before after between x nfreeze_base64 thaw_base64 format_set_name_display);
-
-sub new {
-    my $class = shift;
-    my %options = @_;
-
-    my $self = {
-	id => "ResetIncorrectAttempts",
-	name => x("Potion of Forgetfulness"),
-	description => x("Resets the number of incorrect attempts on a single homework problem."),
-	%options,
-    };
-
-    bless($self, $class);
-    return $self;
-}
-
-sub print_form {
-	my $self            = shift;
-	my $sets            = shift;
-	my $setProblemCount = shift;
-	my $r               = shift;
-
-	my @openSets;
-	my $set_attribs;
-	my @openSetCount;
-	my $maxProblems = 0;
-
-	#print open sets in a drop down and some javascript which will cause the
-	#second drop down to have the correct number of problems for each set
-
-	for (my $i = 0; $i <= $#$sets; $i++) {
-		if (between($$sets[$i]->open_date, $$sets[$i]->due_date) && $$sets[$i]->assignment_type eq "default") {
-			push(@openSets, $$sets[$i]->set_id);
-			$set_attribs->{ $$sets[$i]->set_id }{'data-max'} = $$setProblemCount[$i];
-			push(@openSetCount, $$setProblemCount[$i]);
-			$maxProblems = $$setProblemCount[$i] if ($$setProblemCount[$i] > $maxProblems);
-		}
-	}
-
-	my @problemIDs;
-	my $problem_attribs;
-
-	for (my $i = 1; $i <= $maxProblems; $i++) {
-		push(@problemIDs, $i);
-		if ($i > $openSetCount[0]) {
-			$problem_attribs->{$i}{style} = 'display:none;';
-		}
-	}
-
-	return join(
-		'',
-		CGI::p($r->maketext(
-			'Please choose the set name and problem number of the question which '
-				. 'should have its incorrect attempt count reset.'
-		)),
-		WeBWorK::AchievementItems::form_popup_menu_row(
-			id         => 'ria_set_id',
-			label_text => $r->maketext('Set Name'),
-			values     => \@openSets,
-			labels     => { map { $_ => format_set_name_display($_) } @openSets },
-			menu_attr  => { attributes => $set_attribs, dir => 'ltr', data_problems => 'ria_problem_id' }
-		),
-		WeBWorK::AchievementItems::form_popup_menu_row(
-			id                  => 'ria_problem_id',
-			label_text          => $r->maketext('Problem Number'),
-			values              => \@problemIDs,
-			menu_attr           => { attributes => $problem_attribs },
-			menu_container_attr => { class      => 'col-3' }
-		)
-	);
-}
-
-sub use_item {
-    my $self = shift;
-    my $userName = shift;
-    my $r = shift;
-    my $db = $r->db;
-    my $ce = $r->ce;
-
-    #validate data
-    my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
-    return "No achievement data?!?!?!"
-	unless ($globalUserAchievement->frozen_hash);
-    my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
-
-    return "You are $self->{id} trying to use an item you don't have" unless
-	($globalData->{$self->{id}});
-
-    my $setID = $r->param('ria_set_id');
-    return "You need to input a Set Name" unless
-	(defined $setID);
-    my $problemID = $r->param('ria_problem_id');
-    return "You need to input a Problem Number" unless
-	($problemID);
-
-    my $problem = $db->getUserProblem($userName, $setID, $problemID);
-
-    return "There was an error accessing that problem." unless $problem;
-
-    #set number of incorrect attempts to zero
-
-    $problem->num_incorrect(0);
-
-    $db->putUserProblem($problem);
-
-    $globalData->{$self->{id}}--;
-    $globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
-    $db->putGlobalUserAchievement($globalUserAchievement);
-
-    return;
-}
-
-#Item to make a problem worth double.
-package WeBWorK::AchievementItems::DoubleProb;
-our @ISA = qw(WeBWorK::AchievementItems);
-
-use WeBWorK::Utils qw(sortByName before after between x nfreeze_base64 thaw_base64 format_set_name_display);
-
-sub new {
-    my $class = shift;
-    my %options = @_;
-
-    my $self = {
-	id => "DoubleProb",
-	name => x("Cupcake of Enlargement"),
-	description => x("Causes a single homework problem to be worth twice as much."),
-	%options,
-    };
-
-    bless($self, $class);
-    return $self;
-}
-
-sub print_form {
-	my $self            = shift;
-	my $sets            = shift;
-	my $setProblemCount = shift;
-	my $r               = shift;
-
-	my @openSets;
-	my $set_attribs;
-	my @openSetCount;
-	my $maxProblems = 0;
-
-	#print open sets and javascript to mach second dropdown to number of
-	#problems in each set
-
-	for (my $i = 0; $i <= $#$sets; $i++) {
-		if (between($$sets[$i]->open_date, $$sets[$i]->due_date) && $$sets[$i]->assignment_type eq "default") {
-			push(@openSets, $$sets[$i]->set_id);
-			$set_attribs->{ $$sets[$i]->set_id }{'data-max'} = $$setProblemCount[$i];
-			push(@openSetCount, $$setProblemCount[$i]);
-			$maxProblems = $$setProblemCount[$i] if ($$setProblemCount[$i] > $maxProblems);
-		}
-	}
-
-	my @problemIDs;
-	my $problem_attribs;
-
-	for (my $i = 1; $i <= $maxProblems; $i++) {
-		push(@problemIDs, $i);
-		if ($i > $openSetCount[0]) {
-			$problem_attribs->{$i}{style} = 'display:none;';
-		}
-	}
-
-	return join(
-		'',
-		CGI::p(
-			$r->maketext(
-				'Please choose the set name and problem number of the question which should have its weight doubled.')
-		),
-		WeBWorK::AchievementItems::form_popup_menu_row(
-			id         => 'dbp_set_id',
-			label_text => $r->maketext('Set Name'),
-			values     => \@openSets,
-			labels     => { map { $_ => format_set_name_display($_) } @openSets },
-			menu_attr  => { attributes => $set_attribs, dir => 'ltr', data_problems => 'dbp_problem_id' }
-		),
-		WeBWorK::AchievementItems::form_popup_menu_row(
-			id                  => 'dbp_problem_id',
-			label_text          => $r->maketext('Problem Number'),
-			values              => \@problemIDs,
-			menu_attr           => { attributes => $problem_attribs },
-			menu_container_attr => { class      => 'col-3' }
-		)
+		%options
 	);
-}
-
-sub use_item {
-    my $self = shift;
-    my $userName = shift;
-    my $r = shift;
-    my $db = $r->db;
-    my $ce = $r->ce;
-
-    #validate data
-
-    my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
-    return "No achievement data?!?!?!"
-	unless ($globalUserAchievement->frozen_hash);
-    my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
-
-    return "You are $self->{id} trying to use an item you don't have" unless
-	($globalData->{$self->{id}});
-
-    my $setID = $r->param('dbp_set_id');
-    return "You need to input a Set Name" unless
-	(defined $setID);
-    my $problemID = $r->param('dbp_problem_id');
-    return "You need to input a Problem Number" unless
-	($problemID);
-
-
-    my $globalproblem = $db->getMergedProblem($userName, $setID,$problemID);
-    my $problem = $db->getUserProblem($userName, $setID, $problemID);
-
-    return "There was an error accessing that problem." unless $problem;
-
-    #double value of problem
 
-    $problem->value($globalproblem->value*2);
-    $db->putUserProblem($problem);
+	$params{label_attr}{class}          //= 'col-4 col-form-label';
+	$params{menu_attr}{class}           //= 'form-select';
+	$params{menu_container_attr}{class} //= 'col-8';
 
-    $globalData->{$self->{id}}--;
-    $globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
-    $db->putGlobalUserAchievement($globalUserAchievement);
-
-    return;
-}
-
-#Item to give half credit on a single problem.
-package WeBWorK::AchievementItems::HalfCreditProb;
-our @ISA = qw(WeBWorK::AchievementItems);
-
-use WeBWorK::Utils qw(sortByName before after between x nfreeze_base64 thaw_base64 format_set_name_display);
-
-sub new {
-    my $class = shift;
-    my %options = @_;
-
-    my $self = {
-	id => "HalfCreditProb",
-	name => x("Lesser Rod of Revelation"),
-	description => x("Gives half credit on a single homework problem."),
-	%options,
-    };
-
-    bless($self, $class);
-    return $self;
-}
-
-sub print_form {
-	my $self            = shift;
-	my $sets            = shift;
-	my $setProblemCount = shift;
-	my $r               = shift;
-
-	my @openSets;
-	my $set_attribs;
-	my @openSetCount;
-	my $maxProblems = 0;
-
-	#print form with open sets and javasscript to have appropriate number
-	# of items in second drop down
-
-	for (my $i = 0; $i <= $#$sets; $i++) {
-		if (between($$sets[$i]->open_date, $$sets[$i]->due_date) && $$sets[$i]->assignment_type eq "default") {
-			push(@openSets, $$sets[$i]->set_id);
-			$set_attribs->{ $$sets[$i]->set_id }{'data-max'} = $$setProblemCount[$i];
-			push(@openSetCount, $$setProblemCount[$i]);
-			$maxProblems = $$setProblemCount[$i] if ($$setProblemCount[$i] > $maxProblems);
-		}
-	}
-
-	my @problemIDs;
-	my $problem_attribs;
-
-	for (my $i = 1; $i <= $maxProblems; $i++) {
-		push(@problemIDs, $i);
-		$problem_attribs->{$i}{style} = 'display:none;' if ($i > $openSetCount[0]);
-	}
-
-	return join(
-		'',
-		CGI::p(
-			$r->maketext(
-				'Please choose the set name and problem number of the question which should be given half credit.')
-		),
-		WeBWorK::AchievementItems::form_popup_menu_row(
-			id         => 'hcp_set_id',
-			values     => \@openSets,
-			labels     => { map { $_ => format_set_name_display($_) } @openSets },
-			label_text => $r->maketext('Set Name'),
-			menu_attr  => { attributes => $set_attribs, dir => 'ltr', data_problems => 'hcp_problem_id' }
-		),
-		WeBWorK::AchievementItems::form_popup_menu_row(
-			id                  => 'hcp_problem_id',
-			values              => \@problemIDs,
-			label_text          => $r->maketext('Problem Number'),
-			menu_attr           => { attributes => $problem_attribs },
-			menu_container_attr => { class      => 'col-3' }
+	my $row_contents = $c->c(
+		$c->label_for($params{id} => $params{label_text}, %{ $params{label_attr} }),
+		$c->tag(
+			'div',
+			%{ $params{menu_container_attr} },
+			$c->select_field($params{id} => $params{values}, id => $params{id}, %{ $params{menu_attr} })
 		)
-	);
+	)->join('');
+
+	return $params{add_container} ? $c->tag('div', class => 'row mb-3', $row_contents) : $row_contents;
+}
+
+END {
+	# Load the achievement item classes.
+	use WeBWorK::AchievementItems::AddNewTestGW;
+	use WeBWorK::AchievementItems::DoubleProb;
+	use WeBWorK::AchievementItems::DoubleSet;
+	use WeBWorK::AchievementItems::DuplicateProb;
+	use WeBWorK::AchievementItems::ExtendDueDateGW;
+	use WeBWorK::AchievementItems::ExtendDueDate;
+	use WeBWorK::AchievementItems::FullCreditProb;
+	use WeBWorK::AchievementItems::FullCreditSet;
+	use WeBWorK::AchievementItems::HalfCreditProb;
+	use WeBWorK::AchievementItems::HalfCreditSet;
+	use WeBWorK::AchievementItems::ReducedCred;
+	use WeBWorK::AchievementItems::ResetIncorrectAttempts;
+	use WeBWorK::AchievementItems::ResurrectGW;
+	use WeBWorK::AchievementItems::ResurrectHW;
+	use WeBWorK::AchievementItems::SuperExtendDueDate;
+	use WeBWorK::AchievementItems::Surprise;
 }
 
-sub use_item {
-    my $self = shift;
-    my $userName = shift;
-    my $r = shift;
-    my $db = $r->db;
-    my $ce = $r->ce;
-
-    #validate data
-
-    my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
-    return "No achievement data?!?!?!"
-	unless ($globalUserAchievement->frozen_hash);
-    my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
-
-    return "You are $self->{id} trying to use an item you don't have" unless
-	($globalData->{$self->{id}});
-
-    my $setID = $r->param('hcp_set_id');
-    return "You need to input a Set Name" unless
-	(defined $setID);
-    my $problemID = $r->param('hcp_problem_id');
-    return "You need to input a Problem Number" unless
-	($problemID);
-
-    my $problem = $db->getUserProblem($userName, $setID, $problemID);
-
-    return "There was an error accessing that problem." unless $problem;
-
-    #Add .5 to grade with max of 1
-
-    if ($problem->status < .5) {
-	$problem->status($problem->status + .5);
-    } else {
-	$problem->status(1);
-    }
-
-    $db->putUserProblem($problem);
-
-    $globalData->{$self->{id}}--;
-    $globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
-    $db->putGlobalUserAchievement($globalUserAchievement);
-
-    return;
-}
-
-#Item to give half credit on all problems in a homework set.
-package WeBWorK::AchievementItems::HalfCreditSet;
-our @ISA = qw(WeBWorK::AchievementItems);
-
-use WeBWorK::Utils qw(sortByName before after between x nfreeze_base64 thaw_base64 format_set_name_display);
-
-sub new {
-    my $class = shift;
-    my %options = @_;
-
-    my $self = {
-	id => "HalfCreditSet",
-	name => x("Lesser Tome of Enlightenment"),
-	description => x("Gives half credit on every problem in a set."),
-	%options,
-    };
-
-    bless($self, $class);
-    return $self;
-}
-
-sub print_form {
-    my $self = shift;
-    my $sets = shift;
-    my $setProblemCount = shift;
-    my $r = shift;
-
-    my @openSets;
-    my @openSetCount;
-    my $maxProblems=0;
-
-    for (my $i=0; $i<=$#$sets; $i++) {
-	push(@openSets,$$sets[$i]->set_id);
-    }
-
-
-	# print form with sets
-	return join(
-		'',
-		CGI::p($r->maketext('Choose the set which you would like to resurrect.')),
-		WeBWorK::AchievementItems::form_popup_menu_row(
-			id         => 'hcs_set_id',
-			label_text => $r->maketext('Set Name'),
-			values     => \@openSets,
-			labels     => { map { $_ => format_set_name_display($_) } @openSets },
-			menu_attr  => { dir => 'ltr' }
-		)
-	);
-}
-
-sub use_item {
-    my $self = shift;
-    my $userName = shift;
-    my $r = shift;
-    my $db = $r->db;
-    my $ce = $r->ce;
-
-    #validate data
-
-    my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
-    return "No achievement data?!?!?!"
-	unless ($globalUserAchievement->frozen_hash);
-    my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
-
-    return "You are $self->{id} trying to use an item you don't have" unless
-	($globalData->{$self->{id}});
-
-    my $setID = $r->param('hcs_set_id');
-    return "You need to input a Set Name" unless
-	(defined $setID);
-
-    # go through the problems in the set
-    my @probIDs = $db->listUserProblems($userName,$setID);
-
-    foreach my $probID (@probIDs) {
-	my $problem = $db->getUserProblem($userName, $setID, $probID);
-
-	return "There was an error accessing that problem." unless $problem;
-
-	#Add .5 to grade with max of 1
-
-	if ($problem->status < .5) {
-	    $problem->status($problem->status + .5);
-	} else {
-	    $problem->status(1);
-	}
-
-	$db->putUserProblem($problem);
-    }
-
-    $globalData->{$self->{id}}--;
-    $globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
-    $db->putGlobalUserAchievement($globalUserAchievement);
-
-    return;
-}
-
-#Item to give full credit on a single problem
-package WeBWorK::AchievementItems::FullCreditProb;
-our @ISA = qw(WeBWorK::AchievementItems);
-
-use WeBWorK::Utils qw(sortByName before after between x nfreeze_base64 thaw_base64 format_set_name_display);
-
-sub new {
-    my $class = shift;
-    my %options = @_;
-
-    my $self = {
-	id => "FullCreditProb",
-	name => x("Greater Rod of Revelation"),
-	description => x("Gives full credit on a single homework problem."),
-	%options,
-    };
-
-    bless($self, $class);
-    return $self;
-}
-
-sub print_form {
-	my $self            = shift;
-	my $sets            = shift;
-	my $setProblemCount = shift;
-	my $r               = shift;
-
-	my @openSets;
-	my $set_attribs;
-	my @openSetCount;
-	my $maxProblems = 0;
-
-	#print form getting set and problem number
-
-	for (my $i = 0; $i <= $#$sets; $i++) {
-		if (between($$sets[$i]->open_date, $$sets[$i]->due_date) && $$sets[$i]->assignment_type eq "default") {
-			push(@openSets, $$sets[$i]->set_id);
-			$set_attribs->{ $$sets[$i]->set_id }{'data-max'} = $$setProblemCount[$i];
-			push(@openSetCount, $$setProblemCount[$i]);
-			$maxProblems = $$setProblemCount[$i] if ($$setProblemCount[$i] > $maxProblems);
-		}
-	}
-
-	my @problemIDs;
-	my $problem_attribs;
-
-	for (my $i = 1; $i <= $maxProblems; $i++) {
-		push(@problemIDs, $i);
-		if ($i > $openSetCount[0]) {
-			$problem_attribs->{$i}{style} = 'display:none;' if ($i > $openSetCount[0]);
-		}
-	}
-
-	return join(
-		'',
-		CGI::p(
-			$r->maketext(
-				'Please choose the set name and problem number of the question which should be given full credit.')
-		),
-		WeBWorK::AchievementItems::form_popup_menu_row(
-			id         => 'fcp_set_id',
-			label_text => $r->maketext('Set Name'),
-			values     => \@openSets,
-			labels     => { map { $_ => format_set_name_display($_) } @openSets },
-			menu_attr  => { attributes => $set_attribs, dir => 'ltr', data_problems => 'fcp_problem_id' }
-		),
-		WeBWorK::AchievementItems::form_popup_menu_row(
-			id                  => 'fcp_problem_id',
-			values              => \@problemIDs,
-			label_text          => $r->maketext('Problem Number'),
-			menu_attr           => { attributes => $problem_attribs },
-			menu_container_attr => { class      => 'col-3' }
-		)
-	);
-}
-
-sub use_item {
-    my $self = shift;
-    my $userName = shift;
-    my $r = shift;
-    my $db = $r->db;
-    my $ce = $r->ce;
-
-    #validate data
-
-    my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
-    return "No achievement data?!?!?!"
-	unless ($globalUserAchievement->frozen_hash);
-    my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
-
-    return "You are $self->{id} trying to use an item you don't have" unless
-	($globalData->{$self->{id}});
-
-    my $setID = $r->param('fcp_set_id');
-    return "You need to input a Set Name" unless
-	(defined $setID);
-    my $problemID = $r->param('fcp_problem_id');
-    return "You need to input a Problem Number" unless
-	($problemID);
-
-    my $problem = $db->getUserProblem($userName, $setID, $problemID);
-
-    return "There was an error accessing that problem." unless $problem;
-
-    #set status of the file to one.
-
-    $problem->status(1);
-
-    $db->putUserProblem($problem);
-
-    $globalData->{$self->{id}}--;
-    $globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
-    $db->putGlobalUserAchievement($globalUserAchievement);
-
-    return;
-}
-
-#Item to give half credit on all problems in a homework set.
-package WeBWorK::AchievementItems::FullCreditSet;
-our @ISA = qw(WeBWorK::AchievementItems);
-
-use WeBWorK::Utils qw(sortByName before after between x nfreeze_base64 thaw_base64 format_set_name_display);
-
-sub new {
-    my $class = shift;
-    my %options = @_;
-
-    my $self = {
-	id => "FullCreditSet",
-	name => x("Greater Tome of Enlightenment"),
-	description => x("Gives full credit on every problem in a set."),
-	%options,
-    };
-
-    bless($self, $class);
-    return $self;
-}
-
-sub print_form {
-    my $self = shift;
-    my $sets = shift;
-    my $setProblemCount = shift;
-    my $r = shift;
-
-    my @openSets;
-    my @openSetCount;
-    my $maxProblems=0;
-
-    for (my $i=0; $i<=$#$sets; $i++) {
-	push(@openSets,$$sets[$i]->set_id);
-    }
-
-
-	# print form with sets
-	return join(
-		'',
-		CGI::p($r->maketext('Choose the set which you would like to resurrect.')),
-		WeBWorK::AchievementItems::form_popup_menu_row(
-			id         => 'fcs_set_id',
-			label_text => $r->maketext('Set Name'),
-			values     => \@openSets,
-			labels     => { map { $_ => format_set_name_display($_) } @openSets },
-			menu_attr  => { dir => 'ltr' }
-		)
-	);
-}
-
-sub use_item {
-    my $self = shift;
-    my $userName = shift;
-    my $r = shift;
-    my $db = $r->db;
-    my $ce = $r->ce;
-
-    #validate data
-
-    my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
-    return "No achievement data?!?!?!"
-	unless ($globalUserAchievement->frozen_hash);
-    my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
-
-    return "You are $self->{id} trying to use an item you don't have" unless
-	($globalData->{$self->{id}});
-
-    my $setID = $r->param('fcs_set_id');
-    return "You need to input a Set Name" unless
-	(defined $setID);
-
-    # go through the problems in the set
-    my @probIDs = $db->listUserProblems($userName,$setID);
-
-    foreach my $probID (@probIDs) {
-	my $problem = $db->getUserProblem($userName, $setID, $probID);
-
-	return "There was an error accessing that problem." unless $problem;
-
-	# set status to 1
-	$problem->status(1);
-
-	$db->putUserProblem($problem);
-    }
-
-    $globalData->{$self->{id}}--;
-    $globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
-    $db->putGlobalUserAchievement($globalUserAchievement);
-
-    return;
-}
-
-#Item to turn one problem into another problem
-package WeBWorK::AchievementItems::DuplicateProb;
-our @ISA = qw(WeBWorK::AchievementItems);
-
-use WeBWorK::Utils qw(sortByName before after between x nfreeze_base64 thaw_base64 format_set_name_display);
-
-sub new {
-    my $class = shift;
-    my %options = @_;
-
-    my $self = {
-	id => "DuplicateProb",
-	name => x("Box of Transmogrification"),
-	description => x("Causes a homework problem to become a clone of another problem from the same set."),
-	%options,
-    };
-
-    bless($self, $class);
-    return $self;
-}
-
-sub print_form {
-	my $self            = shift;
-	my $sets            = shift;
-	my $setProblemCount = shift;
-	my $r               = shift;
-
-	my @openSets;
-	my $set_attribs;
-	my @openSetCount;
-	my $maxProblems = 0;
-
-	# print open sets and allow for a choice of two problems from the set
-
-	for (my $i = 0; $i <= $#$sets; $i++) {
-		if (between($$sets[$i]->open_date, $$sets[$i]->due_date) && $$sets[$i]->assignment_type eq "default") {
-			push(@openSets, $$sets[$i]->set_id);
-			$set_attribs->{ $$sets[$i]->set_id }{'data-max'} = $$setProblemCount[$i];
-			push(@openSetCount, $$setProblemCount[$i]);
-			$maxProblems = $$setProblemCount[$i] if ($$setProblemCount[$i] > $maxProblems);
-		}
-	}
-
-	my @problemIDs;
-	my %attributes;
-
-	for (my $i = 1; $i <= $maxProblems; $i++) {
-		push(@problemIDs, $i);
-		if ($i > $openSetCount[0]) {
-			$attributes{$i}{style} = 'display:none;';
-		}
-	}
-
-	return join(
-		'',
-		CGI::p($r->maketext(
-			'Please choose the set, the problem you would like to copy, '
-				. 'and the problem you would like to copy it to.'
-		)),
-		WeBWorK::AchievementItems::form_popup_menu_row(
-			id         => 'tran_set_id',
-			label_text => $r->maketext('Set Name'),
-			values     => \@openSets,
-			labels     => { map { $_ => format_set_name_display($_) } @openSets },
-			menu_attr  => {
-				attributes     => $set_attribs,
-				dir            => 'ltr',
-				data_problems  => 'tran_problem_id',
-				data_problems2 => 'tran_problem_id2'
-			}
-		),
-		CGI::div(
-			{ class => 'row mb-3' },
-			WeBWorK::AchievementItems::form_popup_menu_row(
-				id                  => 'tran_problem_id',
-				values              => \@problemIDs,
-				label_text          => $r->maketext('Copy this Problem'),
-				menu_attr           => { attributes => \%attributes },
-				menu_container_attr => { class      => 'col-2 ps-0' },
-				add_container       => 0
-			),
-			WeBWorK::AchievementItems::form_popup_menu_row(
-				id                  => 'tran_problem_id2',
-				values              => \@problemIDs,
-				label_text          => $r->maketext('To this Problem'),
-				menu_attr           => { attributes => \%attributes },
-				menu_container_attr => { class      => 'col-2 ps-0' },
-				add_container       => 0
-			)
-		)
-	);
-}
-
-sub use_item {
-    my $self = shift;
-    my $userName = shift;
-    my $r = shift;
-    my $db = $r->db;
-    my $ce = $r->ce;
-
-    #validate data
-
-    my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
-    return "No achievement data?!?!?!"
-	unless ($globalUserAchievement->frozen_hash);
-    my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
-
-    return "You are $self->{id} trying to use an item you don't have" unless
-	($globalData->{$self->{id}});
-
-    my $setID = $r->param('tran_set_id');
-    return "You need to input a Set Name" unless
-	(defined $setID);
-    my $problemID = $r->param('tran_problem_id');
-    return "You need to input a Problem Number" unless
-	($problemID);
-    my $problemID2 = $r->param('tran_problem_id2');
-    return "You need to input a Problem Number" unless
-	($problemID2);
-
-    return "You need to pick 2 different problems!" if
-	($problemID == $problemID2);
-
-    my $problem = $db->getMergedProblem($userName, $setID, $problemID);
-    my $problem2 = $db->getUserProblem($userName, $setID, $problemID2);
-
-    return "There was an error accessing that problem." unless $problem;
-
-    #set the source of the second problem to that of the first problem.
-
-    $problem2->source_file($problem->source_file);
-
-    $db->putUserProblem($problem2);
-
-    $globalData->{$self->{id}}--;
-    $globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
-    $db->putGlobalUserAchievement($globalUserAchievement);
-
-    return;
-}
-
-#Item to print a suprise message
-package WeBWorK::AchievementItems::Surprise;
-our @ISA = qw(WeBWorK::AchievementItems);
-
-use WeBWorK::Utils qw(sortByName before after between x nfreeze_base64 thaw_base64);
-
-sub new {
-    my $class = shift;
-    my %options = @_;
-
-    my $self = {
-	id => "Surprise",
-	name => x("Mysterious Package (with Ribbons)"),
-	description => x("What could be inside?"),
-	%options,
-    };
-
-    bless($self, $class);
-    return $self;
-}
-
-sub print_form {
-    my $self = shift;
-    my $sets = shift;
-    my $setProblemCount = shift;
-    my $r = shift;
-
-    # the form opens the file "suprise_message.txt" in the achievements
-    # folder and then prints the contetnts of the file.
-
-    my $sourceFilePath = $r->{ce}->{courseDirs}->{achievements}.'/surprise_message.txt';
-
-    open MESSAGE, $sourceFilePath or return CGI::p($r->maketext("I couldn't find the file [ACHEVDIR]/surprise_message.txt!"));
-
-    my @message = <MESSAGE>;
-
-    return CGI::div(@message);
-
-}
-
-sub use_item {
-    my $self = shift;
-    my $userName = shift;
-    my $r = shift;
-    my $db = $r->db;
-    my $ce = $r->ce;
-
-    #doesn't do anything
-
-    return;
-}
-
-#Item to allow students to take an addition test
-package WeBWorK::AchievementItems::AddNewTestGW;
-our @ISA = qw(WeBWorK::AchievementItems);
-
-use WeBWorK::Utils qw(sortByName before after between x nfreeze_base64 thaw_base64 format_set_name_display);
-
-sub new {
-    my $class = shift;
-    my %options = @_;
-
-    my $self = {
-	id => "AddNewTestGW",
-	name => x("Oil of Cleansing"),
-	description => x("Unlock an additional version of a Gateway Test.  If used before the close date of the Gateway Test this will allow you to generate a new version of the test."),
-	%options,
-    };
-
-    bless($self, $class);
-    return $self;
-}
-
-sub print_form {
-    my $self = shift;
-    my $sets = shift;
-    my $setProblemCount = shift;
-    my $r = shift;
-    my $db = $r->db;
-
-    my $userName = $r->param('user');
-    my $effectiveUserName = defined($r->param('effectiveUser') ) ? $r->param('effectiveUser') : $userName;
-    my @setIDs = $db->listUserSets($effectiveUserName);
-    my @userSetIDs = map {[$effectiveUserName, $_]} @setIDs;
-    my @unfilteredsets = $db->getMergedSets(@userSetIDs);
-    my @sets;
-
-    # we going to have to find the gateways for these achievements.
-    # we don't want the versioned gateways though.
-    foreach my $set (@unfilteredsets) {
-	if ($set->assignment_type() =~ /gateway/ &&
-	    $set->set_id !~ /,v\d+$/) {
-	    push @sets, $set;
-	}
-    }
-
-    # now we need to find out which gateways are open
-    my @openGateways;
-
-    foreach my $set (@sets) {
-	if (between($set->open_date, $set->due_date)) {
-	    push @openGateways, $set->set_id;
-	}
-    }
-
-    #print open gateways in a drop down.
-
-	return join(
-		'',
-		CGI::p($r->maketext('Add a new test for which Gateway?')),
-		WeBWorK::AchievementItems::form_popup_menu_row(
-			id         => 'adtgw_gw_id',
-			label_text => $r->maketext('Gateway Name'),
-			values     => \@openGateways,
-			labels     => { map { $_ => format_set_name_display($_) } @openGateways },
-			menu_attr  => { dir => 'ltr' }
-		)
-	);
-}
-
-sub use_item {
-    my $self = shift;
-    my $userName = shift;
-    my $r = shift;
-    my $db = $r->db;
-    my $ce = $r->ce;
-
-    #validate data
-    my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
-    return "No achievement data?!?!?!"
-	unless ($globalUserAchievement->frozen_hash);
-    my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
-
-    return "You are $self->{id} trying to use an item you don't have" unless
-	($globalData->{$self->{id}});
-
-    my $setID = $r->param('adtgw_gw_id');
-    return "You need to input a Gateway Name" unless
-	(defined $setID);
-
-    my $set = $db->getMergedSet($userName,$setID);
-    return "Couldn't find that set!" unless
-	($set);
-
-    my $userSet = $db->getUserSet($userName,$setID);
-
-    $userSet->versions_per_interval($set->versions_per_interval()+1)
-      unless ($set->versions_per_interval() == 0);
-
-    $db->putUserSet($userSet);
-
-    $globalData->{$self->{id}}--;
-    $globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
-    $db->putGlobalUserAchievement($globalUserAchievement);
-
-
-
-    return;
-}
-
-#Item to extend the due date on a gateway
-package WeBWorK::AchievementItems::ExtendDueDateGW;
-our @ISA = qw(WeBWorK::AchievementItems);
-
-use WeBWorK::Utils qw(sortByName before after between x nfreeze_base64 thaw_base64 format_set_name_display);
-
-sub new {
-    my $class = shift;
-    my %options = @_;
-
-    my $self = {
-	id => "ExtendDueDateGW",
-	name => x("Amulet of Extension"),
-	description => x("Extends the close date of a gateway test by 24 hours. Note: The test must still be open for this to work."),
-	%options,
-    };
-
-    bless($self, $class);
-    return $self;
-}
-
-sub print_form {
-    my $self = shift;
-    my $sets = shift;
-    my $setProblemCount = shift;
-    my $r = shift;
-    my $db = $r->db;
-
-    my $userName = $r->param('user');
-    my $effectiveUserName = defined($r->param('effectiveUser') ) ? $r->param('effectiveUser') : $userName;
-    my @setIDs = $db->listUserSets($effectiveUserName);
-    my @userSetIDs = map {[$effectiveUserName, $_]} @setIDs;
-    my @unfilteredsets = $db->getMergedSets(@userSetIDs);
-    my @sets;
-
-    # we going to have to find the gateways for these achievements.
-    # we don't want the versioned gateways though.
-    foreach my $set (@unfilteredsets) {
-	if ($set->assignment_type() =~ /gateway/ &&
-	    $set->set_id !~ /,v\d+$/) {
-	    push @sets, $set;
-	}
-    }
-
-    # now we need to find out which gateways are open
-    my @openGateways;
-
-    foreach my $set (@sets) {
-	if (between($set->open_date, $set->due_date)) {
-	    push @openGateways, $set->set_id;
-	}
-    }
-
-    # Print open gateways in a drop down.
-	return join(
-		'',
-		CGI::p($r->maketext('Extend the close date for which Gateway?')),
-		WeBWorK::AchievementItems::form_popup_menu_row(
-			id         => 'eddgw_gw_id',
-			label_text => $r->maketext('Gateway Name'),
-			values     => \@openGateways,
-			labels     => { map { $_ => format_set_name_display($_) } @openGateways },
-			menu_attr  => { dir => 'ltr' }
-		)
-	);
-}
-
-sub use_item {
-    my $self = shift;
-    my $userName = shift;
-    my $r = shift;
-    my $db = $r->db;
-    my $ce = $r->ce;
-
-    #validate data
-    my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
-    return "No achievement data?!?!?!"
-	unless ($globalUserAchievement->frozen_hash);
-    my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
-
-    return "You are $self->{id} trying to use an item you don't have" unless
-	($globalData->{$self->{id}});
-
-    my $setID = $r->param('eddgw_gw_id');
-    return "You need to input a Gateway Name" unless
-	(defined $setID);
-
-    my $set = $db->getMergedSet($userName,$setID);
-    return "Couldn't find that set!" unless
-	($set);
-    my $userSet = $db->getUserSet($userName,$setID);
-
-    #add time to the reduced scoring date, due date, and answer date
-    $userSet->reduced_scoring_date($set->reduced_scoring_date()+86400) if defined($set->reduced_scoring_date()) && $set->reduced_scoring_date();
-    $userSet->due_date($set->due_date()+86400);
-    $userSet->answer_date($set->answer_date()+86400);
-
-    $db->putUserSet($userSet);
-
-    #add time to the reduced scoring date, due date, and answer date of various versions
-    my @versions = $db->listSetVersions($userName,$setID);
-
-    foreach my $version (@versions) {
-
-	$set = $db->getSetVersion($userName,$setID,$version);
-	$set->reduced_scoring_date($set->reduced_scoring_date()+86400) if defined($set->reduced_scoring_date()) && $set->reduced_scoring_date();
-	$set->due_date($set->due_date()+86400);
-	$set->answer_date($set->answer_date()+86400);
-	$db->putSetVersion($set);
-
-    }
-
-    $globalData->{$self->{id}}--;
-    $globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
-    $db->putGlobalUserAchievement($globalUserAchievement);
-
-    return;
-}
-
-#Item to extend the due date on a gateway
-package WeBWorK::AchievementItems::ResurrectGW;
-our @ISA = qw(WeBWorK::AchievementItems);
-
-use WeBWorK::Utils qw(sortByName before after between x nfreeze_base64 thaw_base64 format_set_name_display);
-
-sub new {
-    my $class = shift;
-    my %options = @_;
-
-    my $self = {
-	id => "ResurrectGW",
-	name => x("Necromancers Charm"),
-	description => x("Reopens any gateway test for an additional 24 hours. This allows you to take a test even if the close date has past. This item does not allow you to take additional versions of the test."),
-	%options,
-    };
-
-    bless($self, $class);
-    return $self;
-}
-
-sub print_form {
-    my $self = shift;
-    my $sets = shift;
-    my $setProblemCount = shift;
-    my $r = shift;
-    my $db = $r->db;
-
-    my $userName = $r->param('user');
-    my $effectiveUserName = defined($r->param('effectiveUser') ) ? $r->param('effectiveUser') : $userName;
-    my @setIDs = $db->listUserSets($effectiveUserName);
-    my @userSetIDs = map {[$effectiveUserName, $_]} @setIDs;
-    my @unfilteredsets = $db->getMergedSets(@userSetIDs);
-    my @sets;
-
-    # we going to have to find the gateways for these achievements.
-    foreach my $set (@unfilteredsets) {
-	if ($set->assignment_type() =~ /gateway/ &&
-	    $set->set_id !~ /,v\d+$/) {
-	    push @sets, $set->set_id;
-	}
-    }
-
-    # Print gateways in a drop down.
-	return join(
-		'',
-		CGI::p($r->maketext('Resurrect which Gateway?')),
-		WeBWorK::AchievementItems::form_popup_menu_row(
-			id         => 'resgw_gw_id',
-			label_text => $r->maketext('Gateway Name'),
-			values     => \@sets,
-			labels     => { map { $_ => format_set_name_display($_) } @sets },
-			menu_attr  => { dir => 'ltr' }
-		)
-	);
-}
-
-sub use_item {
-    my $self = shift;
-    my $userName = shift;
-    my $r = shift;
-    my $db = $r->db;
-    my $ce = $r->ce;
-
-    #validate data
-    my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
-    return "No achievement data?!?!?!"
-	unless ($globalUserAchievement->frozen_hash);
-    my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
-
-    return "You are $self->{id} trying to use an item you don't have" unless
-	($globalData->{$self->{id}});
-
-    my $setID = $r->param('resgw_gw_id');
-    return "You need to input a Gateway Name" unless
-	(defined $setID);
-
-    my $set = $db->getUserSet($userName,$setID);
-    return "Couldn't find that set!" unless
-	($set);
-
-    #add time to the reduced scoring date, due date, and answer date; remove item from inventory
-    $set->reduced_scoring_date(time()+86400) if defined($set->reduced_scoring_date()) && $set->reduced_scoring_date();
-    $set->due_date(time()+86400);
-    $set->answer_date(time()+86400);
-
-    $db->putUserSet($set);
-
-    $globalData->{$self->{id}}--;
-    $globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
-    $db->putGlobalUserAchievement($globalUserAchievement);
-
-    return;
-}
-
-
 1;
diff --git a/lib/WeBWorK/AchievementItems/AddNewTestGW.pm b/lib/WeBWorK/AchievementItems/AddNewTestGW.pm
new file mode 100644
index 0000000000..0bd970d035
--- /dev/null
+++ b/lib/WeBWorK/AchievementItems/AddNewTestGW.pm
@@ -0,0 +1,90 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::AchievementItems::AddNewTestGW;
+use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
+
+# Item to allow students to take an addition test
+
+use WeBWorK::Utils qw(before between x nfreeze_base64 thaw_base64 format_set_name_display);
+
+sub new ($class) {
+	return bless {
+		id          => 'AddNewTestGW',
+		name        => x('Oil of Cleansing'),
+		description => x(
+			'Unlock an additional version of a test.  If used before the close date of '
+				. 'the test this will allow you to generate a new version of the test.'
+		)
+	}, $class;
+}
+
+sub print_form ($self, $sets, $setProblemCount, $c) {
+	my $db = $c->db;
+
+	my $effectiveUserName = $c->param('effectiveUser') // $c->param('user');
+	my @unfilteredsets = $db->getMergedSets(map { [ $effectiveUserName, $_ ] } $db->listUserSets($effectiveUserName));
+	my @openGateways;
+
+	# Find the template sets of open gateway quizzes.
+	for my $set (@unfilteredsets) {
+		push(@openGateways, [ format_set_name_display($set->set_id) => $set->set_id ])
+			if $set->assignment_type =~ /gateway/
+			&& $set->set_id !~ /,v\d+$/
+			&& between($set->open_date, $set->due_date);
+	}
+
+	return $c->c(
+		$c->tag('p', $c->maketext('Add a new version for which test?')),
+		WeBWorK::AchievementItems::form_popup_menu_row(
+			$c,
+			id         => 'adtgw_gw_id',
+			label_text => $c->maketext('Test Name'),
+			values     => \@openGateways,
+			menu_attr  => { dir => 'ltr' }
+		)
+	)->join('');
+}
+
+sub use_item ($self, $userName, $c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
+
+	# Validate data
+	my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
+	return 'No achievement data?!?!?!' unless $globalUserAchievement->frozen_hash;
+
+	my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
+	return "You are $self->{id} trying to use an item you don't have" unless $globalData->{ $self->{id} };
+
+	my $setID = $c->param('adtgw_gw_id');
+	return 'You need to input a Test Name' unless defined $setID;
+
+	my $set     = $db->getMergedSet($userName, $setID);
+	my $userSet = $db->getUserSet($userName, $setID);
+	return q{Couldn't find that set!} unless $set && $userSet;
+
+	# Add an additional version per interval to the set.
+	$userSet->versions_per_interval($set->versions_per_interval + 1) unless $set->versions_per_interval == 0;
+	$db->putUserSet($userSet);
+
+	$globalData->{ $self->{id} }--;
+	$globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
+	$db->putGlobalUserAchievement($globalUserAchievement);
+
+	return;
+}
+
+1;
diff --git a/lib/WeBWorK/AchievementItems/DoubleProb.pm b/lib/WeBWorK/AchievementItems/DoubleProb.pm
new file mode 100644
index 0000000000..fe7184460e
--- /dev/null
+++ b/lib/WeBWorK/AchievementItems/DoubleProb.pm
@@ -0,0 +1,113 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::AchievementItems::DoubleProb;
+use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
+
+# Item to make a problem worth double.
+
+use WeBWorK::Utils qw(between x nfreeze_base64 thaw_base64 format_set_name_display);
+
+sub new ($class) {
+	return bless {
+		id          => 'DoubleProb',
+		name        => x('Cupcake of Enlargement'),
+		description => x('Causes a single homework problem to be worth twice as much.')
+	}, $class;
+}
+
+sub print_form ($self, $sets, $setProblemCount, $c) {
+	# Construct a dropdown with open sets and another with problems.
+	# Javascript ensures the appropriate number of problems are shown for the selected set.
+
+	my @openSets;
+	my $maxProblems = 0;
+
+	for my $i (0 .. $#$sets) {
+		if (between($sets->[$i]->open_date, $sets->[$i]->due_date) && $sets->[$i]->assignment_type eq 'default') {
+			push(
+				@openSets,
+				[
+					format_set_name_display($sets->[$i]->set_id) => $sets->[$i]->set_id,
+					data                                         => { max => $setProblemCount->[$i] }
+				]
+			);
+			$maxProblems = $setProblemCount->[$i] if $setProblemCount->[$i] > $maxProblems;
+		}
+	}
+
+	my @problemIDs;
+
+	for my $i (1 .. $maxProblems) {
+		push(@problemIDs, [ $i => $i, $i > $openSets[0][3]{max} ? (style => 'display:none') : () ]);
+	}
+
+	return $c->c(
+		$c->tag(
+			'p',
+			$c->maketext(
+				'Please choose the set name and problem number of the question which should have its weight doubled.')
+		),
+		WeBWorK::AchievementItems::form_popup_menu_row(
+			$c,
+			id         => 'dbp_set_id',
+			label_text => $c->maketext('Set Name'),
+			values     => \@openSets,
+			menu_attr  => { dir => 'ltr', data => { problems => 'dbp_problem_id' } }
+		),
+		WeBWorK::AchievementItems::form_popup_menu_row(
+			$c,
+			id                  => 'dbp_problem_id',
+			label_text          => $c->maketext('Problem Number'),
+			values              => \@problemIDs,
+			menu_container_attr => { class => 'col-3' }
+		)
+	)->join('');
+}
+
+sub use_item ($self, $userName, $c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
+
+	# Validate data
+
+	my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
+	return 'No achievement data?!?!?!' unless $globalUserAchievement->frozen_hash;
+
+	my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
+	return "You are $self->{id} trying to use an item you don't have" unless $globalData->{ $self->{id} };
+
+	my $setID = $c->param('dbp_set_id');
+	return 'You need to input a Set Name' unless defined $setID;
+
+	my $problemID = $c->param('dbp_problem_id');
+	return 'You need to input a Problem Number' unless $problemID;
+
+	my $globalproblem = $db->getMergedProblem($userName, $setID, $problemID);
+	my $problem       = $db->getUserProblem($userName, $setID, $problemID);
+	return 'There was an error accessing that problem.' unless $globalproblem && $problem;
+
+	# Double the value of the problem.
+	$problem->value($globalproblem->value * 2);
+	$db->putUserProblem($problem);
+
+	$globalData->{ $self->{id} }--;
+	$globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
+	$db->putGlobalUserAchievement($globalUserAchievement);
+
+	return;
+}
+
+1;
diff --git a/lib/WeBWorK/AchievementItems/DoubleSet.pm b/lib/WeBWorK/AchievementItems/DoubleSet.pm
new file mode 100644
index 0000000000..c67c1e7055
--- /dev/null
+++ b/lib/WeBWorK/AchievementItems/DoubleSet.pm
@@ -0,0 +1,87 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::AchievementItems::DoubleSet;
+use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
+
+# Item to make a homework set worth twice as much
+
+use WeBWorK::Utils qw(between x nfreeze_base64 thaw_base64 format_set_name_display);
+
+sub new ($class) {
+	return bless {
+		id          => 'DoubleSet',
+		name        => x('Cake of Enlargement'),
+		description => x('Cause the selected homework set to count for twice as many points as it normally would.')
+	}, $class;
+}
+
+sub print_form ($self, $sets, $setProblemCount, $c) {
+	my @openSets;
+
+	for my $i (0 .. $#$sets) {
+		push(@openSets, [ format_set_name_display($sets->[$i]->set_id) => $sets->[$i]->set_id ])
+			if (between($sets->[$i]->open_date, $sets->[$i]->due_date) && $sets->[$i]->assignment_type eq 'default');
+	}
+
+	return $c->c(
+		$c->tag('p', $c->maketext('Choose the set which you would like to be worth twice as much.')),
+		WeBWorK::AchievementItems::form_popup_menu_row(
+			$c,
+			id         => 'dub_set_id',
+			label_text => $c->maketext('Set Name'),
+			values     => \@openSets,
+			menu_attr  => { dir => 'ltr' }
+		)
+	)->join('');
+}
+
+sub use_item ($self, $userName, $c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
+
+	# Validate data
+
+	my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
+	return 'No achievement data?!?!?!' unless $globalUserAchievement->frozen_hash;
+
+	my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
+	return "You are $self->{id} trying to use an item you don't have" unless $globalData->{ $self->{id} };
+
+	my $setID = $c->param('dub_set_id');
+	return 'You need to input a Set Name' unless defined $setID;
+
+	my $set = $db->getMergedSet($userName, $setID);
+	return q{Couldn't find that set!} unless $set;
+
+	my @probIDs = $db->listUserProblems($userName, $setID);
+
+	for my $probID (@probIDs) {
+		my $globalproblem = $db->getMergedProblem($userName, $setID, $probID);
+		my $problem       = $db->getUserProblem($userName, $setID, $probID);
+
+		# Double the problem value.
+		$problem->value($globalproblem->value * 2);
+		$db->putUserProblem($problem);
+	}
+
+	$globalData->{ $self->{id} }--;
+	$globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
+	$db->putGlobalUserAchievement($globalUserAchievement);
+
+	return;
+}
+
+1;
diff --git a/lib/WeBWorK/AchievementItems/DuplicateProb.pm b/lib/WeBWorK/AchievementItems/DuplicateProb.pm
new file mode 100644
index 0000000000..0cff78c1de
--- /dev/null
+++ b/lib/WeBWorK/AchievementItems/DuplicateProb.pm
@@ -0,0 +1,137 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::AchievementItems::DuplicateProb;
+use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
+
+# Item to turn one problem into another problem
+
+use WeBWorK::Utils qw(between x nfreeze_base64 thaw_base64 format_set_name_display);
+
+sub new ($class) {
+	return bless {
+		id          => 'DuplicateProb',
+		name        => x('Box of Transmogrification'),
+		description => x('Causes a homework problem to become a clone of another problem from the same set.')
+	}, $class;
+}
+
+sub print_form ($self, $sets, $setProblemCount, $c) {
+	# Show open sets and allow for a choice of two problems from the set.
+
+	my @openSets;
+	my $maxProblems = 0;
+
+	for my $i (0 .. $#$sets) {
+		if (between($sets->[$i]->open_date, $sets->[$i]->due_date) && $sets->[$i]->assignment_type eq 'default') {
+			push(
+				@openSets,
+				[
+					format_set_name_display($sets->[$i]->set_id) => $sets->[$i]->set_id,
+					data                                         => { max => $setProblemCount->[$i] }
+				]
+			);
+			$maxProblems = $setProblemCount->[$i] if $setProblemCount->[$i] > $maxProblems;
+		}
+	}
+
+	my @problemIDs;
+
+	for my $i (1 .. $maxProblems) {
+		push(@problemIDs, [ $i => $i, $i > $openSets[0][3]{max} ? (style => 'display:none') : () ]);
+	}
+
+	return $c->c(
+		$c->tag(
+			'p',
+			$c->maketext(
+				'Please choose the set, the problem you would like to copy, '
+					. 'and the problem you would like to copy it to.'
+			)
+		),
+		WeBWorK::AchievementItems::form_popup_menu_row(
+			$c,
+			id         => 'tran_set_id',
+			label_text => $c->maketext('Set Name'),
+			values     => \@openSets,
+			menu_attr  => {
+				dir  => 'ltr',
+				data => { problems => 'tran_problem_id', problems2 => 'tran_problem_id2' }
+			}
+		),
+		$c->tag(
+			'div',
+			class => 'row mb-3',
+			$c->c(
+				WeBWorK::AchievementItems::form_popup_menu_row(
+					$c,
+					id                  => 'tran_problem_id',
+					values              => \@problemIDs,
+					label_text          => $c->maketext('Copy this Problem'),
+					menu_container_attr => { class => 'col-2 ps-0' },
+					add_container       => 0
+				),
+				WeBWorK::AchievementItems::form_popup_menu_row(
+					$c,
+					id                  => 'tran_problem_id2',
+					values              => \@problemIDs,
+					label_text          => $c->maketext('To this Problem'),
+					menu_container_attr => { class => 'col-2 ps-0' },
+					add_container       => 0
+				)
+			)->join('')
+		)
+	)->join('');
+}
+
+sub use_item ($self, $userName, $c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
+
+	# Validate data
+
+	my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
+	return 'No achievement data?!?!?!' unless $globalUserAchievement->frozen_hash;
+
+	my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
+	return "You are $self->{id} trying to use an item you don't have" unless $globalData->{ $self->{id} };
+
+	my $setID = $c->param('tran_set_id');
+	return 'You need to input a Set Name' unless defined $setID;
+
+	my $problemID = $c->param('tran_problem_id');
+	return 'You need to input a Problem Number' unless $problemID;
+
+	my $problemID2 = $c->param('tran_problem_id2');
+	return 'You need to input a Problem Number' unless $problemID2;
+
+	return 'You need to pick 2 different problems!' if $problemID == $problemID2;
+
+	my $problem  = $db->getMergedProblem($userName, $setID, $problemID);
+	my $problem2 = $db->getUserProblem($userName, $setID, $problemID2);
+	return 'There was an error accessing those problems.' unless $problem && $problem2;
+
+	# Set the source of the second problem to that of the first problem.
+	$problem2->source_file($problem->source_file);
+	$db->putUserProblem($problem2);
+
+	$globalData->{ $self->{id} }--;
+	$globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
+	$db->putGlobalUserAchievement($globalUserAchievement);
+
+	return;
+}
+
+1;
diff --git a/lib/WeBWorK/AchievementItems/ExtendDueDate.pm b/lib/WeBWorK/AchievementItems/ExtendDueDate.pm
new file mode 100644
index 0000000000..f1b521a706
--- /dev/null
+++ b/lib/WeBWorK/AchievementItems/ExtendDueDate.pm
@@ -0,0 +1,83 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::AchievementItems::ExtendDueDate;
+use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
+
+# Item to extend a close date by 24 hours.
+
+use WeBWorK::Utils qw(between x nfreeze_base64 thaw_base64 format_set_name_display);
+
+sub new ($class) {
+	return bless {
+		id          => 'ExtendDueDate',
+		name        => x('Tunic of Extension'),
+		description => x('Adds 24 hours to the close date of a homework.')
+	}, $class;
+}
+
+sub print_form ($self, $sets, $setProblemCount, $c) {
+	my @openSets;
+
+	for my $i (0 .. $#$sets) {
+		push(@openSets, [ format_set_name_display($sets->[$i]->set_id) => $sets->[$i]->set_id ])
+			if (between($sets->[$i]->open_date, $sets->[$i]->due_date) && $sets->[$i]->assignment_type eq 'default');
+	}
+
+	return $c->c(
+		$c->tag('p', $c->maketext('Choose the set whose close date you would like to extend.')),
+		WeBWorK::AchievementItems::form_popup_menu_row(
+			$c,
+			id         => 'ext_set_id',
+			label_text => $c->maketext('Set Name'),
+			values     => \@openSets,
+			menu_attr  => { dir => 'ltr' }
+		)
+	)->join('');
+}
+
+sub use_item ($self, $userName, $c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
+
+	# Validate data
+
+	my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
+	return 'No achievement data?!?!?!' unless $globalUserAchievement->frozen_hash;
+
+	my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
+	return "You are $self->{id} trying to use an item you don't have" unless $globalData->{ $self->{id} };
+
+	my $setID = $c->param('ext_set_id');
+	return 'You need to input a Set Name' unless defined $setID;
+
+	my $set     = $db->getMergedSet($userName, $setID);
+	my $userSet = $db->getUserSet($userName, $setID);
+	return q{Couldn't find that set!} unless $set && $userSet;
+
+	# Add time to the reduced scoring date, due date, and answer date.
+	$userSet->reduced_scoring_date($set->reduced_scoring_date() + 86400) if $set->reduced_scoring_date;
+	$userSet->due_date($set->due_date() + 86400);
+	$userSet->answer_date($set->answer_date() + 86400);
+	$db->putUserSet($userSet);
+
+	$globalData->{ $self->{id} }--;
+	$globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
+	$db->putGlobalUserAchievement($globalUserAchievement);
+
+	return;
+}
+
+1;
diff --git a/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm b/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm
new file mode 100644
index 0000000000..0c8d528033
--- /dev/null
+++ b/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm
@@ -0,0 +1,104 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::AchievementItems::ExtendDueDateGW;
+use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
+
+# Item to extend the due date on a gateway
+
+use WeBWorK::Utils qw(between x nfreeze_base64 thaw_base64 format_set_name_display);
+
+sub new ($class) {
+	return bless {
+		id          => 'ExtendDueDateGW',
+		name        => x('Amulet of Extension'),
+		description =>
+			x('Extends the close date of a test by 24 hours. Note: The test must still be open for this to work.')
+	}, $class;
+}
+
+sub print_form ($self, $sets, $setProblemCount, $c) {
+	my $db = $c->db;
+
+	my $effectiveUserName = $c->param('effectiveUser') // $c->param('user');
+	my @unfilteredsets = $db->getMergedSets(map { [ $effectiveUserName, $_ ] } $db->listUserSets($effectiveUserName));
+	my @openGateways;
+
+	# Find the template sets of open gateway quizzes.
+	for my $set (@unfilteredsets) {
+		push(@openGateways, [ format_set_name_display($set->set_id) => $set->set_id ])
+			if $set->assignment_type =~ /gateway/
+			&& $set->set_id !~ /,v\d+$/
+			&& between($set->open_date, $set->due_date);
+	}
+
+	return $c->c(
+		$c->tag('p', $c->maketext('Extend the close date for which test?')),
+		WeBWorK::AchievementItems::form_popup_menu_row(
+			$c,
+			id         => 'eddgw_gw_id',
+			label_text => $c->maketext('Test Name'),
+			values     => \@openGateways,
+			menu_attr  => { dir => 'ltr' }
+		)
+	)->join('');
+}
+
+sub use_item ($self, $userName, $c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
+
+	# Validate data
+
+	my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
+	return 'No achievement data?!?!?!' unless $globalUserAchievement->frozen_hash;
+
+	my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
+	return "You are $self->{id} trying to use an item you don't have" unless $globalData->{ $self->{id} };
+
+	my $setID = $c->param('eddgw_gw_id');
+	return 'You need to input a Test Name' unless defined $setID;
+
+	my $set     = $db->getMergedSet($userName, $setID);
+	my $userSet = $db->getUserSet($userName, $setID);
+	return q{Couldn't find that set!} unless $set && $userSet;
+
+	# Add time to the reduced scoring date, due date, and answer date.
+	$userSet->reduced_scoring_date($set->reduced_scoring_date() + 86400)
+		if defined($set->reduced_scoring_date()) && $set->reduced_scoring_date();
+	$userSet->due_date($set->due_date() + 86400);
+	$userSet->answer_date($set->answer_date() + 86400);
+	$db->putUserSet($userSet);
+
+	# Add time to the reduced scoring date, due date, and answer date for all versions.
+	my @versions = $db->listSetVersions($userName, $setID);
+
+	for my $version (@versions) {
+		$set = $db->getSetVersion($userName, $setID, $version);
+		$set->reduced_scoring_date($set->reduced_scoring_date() + 86400)
+			if defined($set->reduced_scoring_date()) && $set->reduced_scoring_date();
+		$set->due_date($set->due_date() + 86400);
+		$set->answer_date($set->answer_date() + 86400);
+		$db->putSetVersion($set);
+	}
+
+	$globalData->{ $self->{id} }--;
+	$globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
+	$db->putGlobalUserAchievement($globalUserAchievement);
+
+	return;
+}
+
+1;
diff --git a/lib/WeBWorK/AchievementItems/FullCreditProb.pm b/lib/WeBWorK/AchievementItems/FullCreditProb.pm
new file mode 100644
index 0000000000..bca88938c7
--- /dev/null
+++ b/lib/WeBWorK/AchievementItems/FullCreditProb.pm
@@ -0,0 +1,112 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::AchievementItems::FullCreditProb;
+use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
+
+# Item to give full credit on a single problem
+
+use WeBWorK::Utils qw(between x nfreeze_base64 thaw_base64 format_set_name_display);
+
+sub new ($class) {
+	return bless {
+		id          => 'FullCreditProb',
+		name        => x('Greater Rod of Revelation'),
+		description => x('Gives full credit on a single homework problem.')
+	}, $class;
+}
+
+sub print_form ($self, $sets, $setProblemCount, $c) {
+	# Construct a dropdown with open sets and another with problems.
+	# Javascript ensures the appropriate number of problems are shown for the selected set.
+
+	my @openSets;
+	my $maxProblems = 0;
+
+	for my $i (0 .. $#$sets) {
+		if (between($sets->[$i]->open_date, $sets->[$i]->due_date) && $sets->[$i]->assignment_type eq 'default') {
+			push(
+				@openSets,
+				[
+					format_set_name_display($sets->[$i]->set_id) => $sets->[$i]->set_id,
+					data                                         => { max => $setProblemCount->[$i] }
+				]
+			);
+			$maxProblems = $setProblemCount->[$i] if $setProblemCount->[$i] > $maxProblems;
+		}
+	}
+
+	my @problemIDs;
+
+	for my $i (1 .. $maxProblems) {
+		push(@problemIDs, [ $i => $i, $i > $openSets[0][3]{max} ? (style => 'display:none') : () ]);
+	}
+
+	return $c->c(
+		$c->tag(
+			'p',
+			$c->maketext(
+				'Please choose the set name and problem number of the question which should be given full credit.')
+		),
+		WeBWorK::AchievementItems::form_popup_menu_row(
+			$c,
+			id         => 'fcp_set_id',
+			label_text => $c->maketext('Set Name'),
+			values     => \@openSets,
+			menu_attr  => { dir => 'ltr', data => { problems => 'fcp_problem_id' } }
+		),
+		WeBWorK::AchievementItems::form_popup_menu_row(
+			$c,
+			id                  => 'fcp_problem_id',
+			label_text          => $c->maketext('Problem Number'),
+			values              => \@problemIDs,
+			menu_container_attr => { class => 'col-3' }
+		)
+	)->join('');
+}
+
+sub use_item ($self, $userName, $c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
+
+	# Validate data
+
+	my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
+	return 'No achievement data?!?!?!' unless $globalUserAchievement->frozen_hash;
+
+	my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
+	return "You are $self->{id} trying to use an item you don't have" unless $globalData->{ $self->{id} };
+
+	my $setID = $c->param('fcp_set_id');
+	return 'You need to input a Set Name' unless defined $setID;
+
+	my $problemID = $c->param('fcp_problem_id');
+	return 'You need to input a Problem Number' unless $problemID;
+
+	my $problem = $db->getUserProblem($userName, $setID, $problemID);
+	return 'There was an error accessing that problem.' unless $problem;
+
+	# Set the status of the problem to one.
+	$problem->status(1);
+	$db->putUserProblem($problem);
+
+	$globalData->{ $self->{id} }--;
+	$globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
+	$db->putGlobalUserAchievement($globalUserAchievement);
+
+	return;
+}
+
+1;
diff --git a/lib/WeBWorK/AchievementItems/FullCreditSet.pm b/lib/WeBWorK/AchievementItems/FullCreditSet.pm
new file mode 100644
index 0000000000..812916adac
--- /dev/null
+++ b/lib/WeBWorK/AchievementItems/FullCreditSet.pm
@@ -0,0 +1,83 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::AchievementItems::FullCreditSet;
+use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
+
+# Item to give half credit on all problems in a homework set.
+
+use WeBWorK::Utils qw(between x nfreeze_base64 thaw_base64 format_set_name_display);
+
+sub new ($class) {
+	return bless {
+		id          => 'FullCreditSet',
+		name        => x('Greater Tome of Enlightenment'),
+		description => x('Gives full credit on every problem in a set.')
+	}, $class;
+}
+
+sub print_form ($self, $sets, $setProblemCount, $c) {
+	my @openSets;
+
+	for my $i (0 .. $#$sets) {
+		push(@openSets, [ format_set_name_display($sets->[$i]->set_id) => $sets->[$i]->set_id ])
+			if (between($sets->[$i]->open_date, $sets->[$i]->due_date) && $sets->[$i]->assignment_type eq 'default');
+	}
+
+	return $c->c(
+		$c->tag('p', $c->maketext('Please choose the set for which all problems should be given full credit.')),
+		WeBWorK::AchievementItems::form_popup_menu_row(
+			$c,
+			id         => 'fcs_set_id',
+			label_text => $c->maketext('Set Name'),
+			values     => \@openSets,
+			menu_attr  => { dir => 'ltr' }
+		)
+	)->join('');
+}
+
+sub use_item ($self, $userName, $c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
+
+	# Validate data
+
+	my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
+	return 'No achievement data?!?!?!' unless $globalUserAchievement->frozen_hash;
+
+	my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
+	return "You are $self->{id} trying to use an item you don't have" unless $globalData->{ $self->{id} };
+
+	my $setID = $c->param('fcs_set_id');
+	return 'You need to input a Set Name' unless defined $setID;
+
+	my @probIDs = $db->listUserProblems($userName, $setID);
+
+	for my $probID (@probIDs) {
+		my $problem = $db->getUserProblem($userName, $setID, $probID);
+
+		# Set status to 1.
+		$problem->status(1);
+		$db->putUserProblem($problem);
+	}
+
+	$globalData->{ $self->{id} }--;
+	$globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
+	$db->putGlobalUserAchievement($globalUserAchievement);
+
+	return;
+}
+
+1;
diff --git a/lib/WeBWorK/AchievementItems/HalfCreditProb.pm b/lib/WeBWorK/AchievementItems/HalfCreditProb.pm
new file mode 100644
index 0000000000..859f768a34
--- /dev/null
+++ b/lib/WeBWorK/AchievementItems/HalfCreditProb.pm
@@ -0,0 +1,118 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::AchievementItems::HalfCreditProb;
+use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
+
+# Item to give half credit on a single problem.
+
+use WeBWorK::Utils qw(between x nfreeze_base64 thaw_base64 format_set_name_display);
+
+sub new ($class) {
+	return bless {
+		id          => 'HalfCreditProb',
+		name        => x('Lesser Rod of Revelation'),
+		description => x('Gives half credit on a single homework problem.')
+	}, $class;
+}
+
+sub print_form ($self, $sets, $setProblemCount, $c) {
+	# Construct a dropdown with open sets and another with problems.
+	# Javascript ensures the appropriate number of problems are shown for the selected set.
+
+	my @openSets;
+	my $maxProblems = 0;
+
+	for my $i (0 .. $#$sets) {
+		if (between($sets->[$i]->open_date, $sets->[$i]->due_date) && $sets->[$i]->assignment_type eq 'default') {
+			push(
+				@openSets,
+				[
+					format_set_name_display($sets->[$i]->set_id) => $sets->[$i]->set_id,
+					data                                         => { max => $setProblemCount->[$i] }
+				]
+			);
+			$maxProblems = $setProblemCount->[$i] if $setProblemCount->[$i] > $maxProblems;
+		}
+	}
+
+	my @problemIDs;
+
+	for my $i (1 .. $maxProblems) {
+		push(@problemIDs, [ $i => $i, $i > $openSets[0][3]{max} ? (style => 'display:none') : () ]);
+	}
+
+	return $c->c(
+		$c->tag(
+			'p',
+			$c->maketext(
+				'Please choose the set name and problem number of the question which should be given half credit.')
+		),
+		WeBWorK::AchievementItems::form_popup_menu_row(
+			$c,
+			id         => 'hcp_set_id',
+			label_text => $c->maketext('Set Name'),
+			values     => \@openSets,
+			menu_attr  => { dir => 'ltr', data => { problems => 'hcp_problem_id' } }
+		),
+		WeBWorK::AchievementItems::form_popup_menu_row(
+			$c,
+			id                  => 'hcp_problem_id',
+			values              => \@problemIDs,
+			label_text          => $c->maketext('Problem Number'),
+			menu_container_attr => { class => 'col-3' }
+		)
+	)->join('');
+}
+
+sub use_item ($self, $userName, $c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
+
+	# Validate data
+
+	my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
+	return 'No achievement data?!?!?!' unless $globalUserAchievement->frozen_hash;
+
+	my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
+	return "You are $self->{id} trying to use an item you don't have" unless $globalData->{ $self->{id} };
+
+	my $setID = $c->param('hcp_set_id');
+	return 'You need to input a Set Name' unless defined $setID;
+
+	my $problemID = $c->param('hcp_problem_id');
+	return 'You need to input a Problem Number' unless $problemID;
+
+	my $problem = $db->getUserProblem($userName, $setID, $problemID);
+	return 'There was an error accessing that problem.' unless $problem;
+
+	# Add .5 to grade with max of 1
+
+	if ($problem->status < .5) {
+		$problem->status($problem->status + .5);
+	} else {
+		$problem->status(1);
+	}
+
+	$db->putUserProblem($problem);
+
+	$globalData->{ $self->{id} }--;
+	$globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
+	$db->putGlobalUserAchievement($globalUserAchievement);
+
+	return;
+}
+
+1;
diff --git a/lib/WeBWorK/AchievementItems/HalfCreditSet.pm b/lib/WeBWorK/AchievementItems/HalfCreditSet.pm
new file mode 100644
index 0000000000..d3a9ce07b0
--- /dev/null
+++ b/lib/WeBWorK/AchievementItems/HalfCreditSet.pm
@@ -0,0 +1,87 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::AchievementItems::HalfCreditSet;
+use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
+
+# Item to give half credit on all problems in a homework set.
+
+use WeBWorK::Utils qw(between x nfreeze_base64 thaw_base64 format_set_name_display);
+
+sub new ($class) {
+	return bless {
+		id          => 'HalfCreditSet',
+		name        => x('Lesser Tome of Enlightenment'),
+		description => x('Gives half credit on every problem in a set.')
+	}, $class;
+}
+
+sub print_form ($self, $sets, $setProblemCount, $c) {
+	my @openSets;
+
+	for my $i (0 .. $#$sets) {
+		push(@openSets, [ format_set_name_display($sets->[$i]->set_id) => $sets->[$i]->set_id ])
+			if (between($sets->[$i]->open_date, $sets->[$i]->due_date) && $sets->[$i]->assignment_type eq 'default');
+	}
+
+	return $c->c(
+		$c->tag('p', $c->maketext('Please choose the set for which all problems should have half credit added.')),
+		WeBWorK::AchievementItems::form_popup_menu_row(
+			$c,
+			id         => 'hcs_set_id',
+			label_text => $c->maketext('Set Name'),
+			values     => \@openSets,
+			menu_attr  => { dir => 'ltr' }
+		)
+	)->join('');
+}
+
+sub use_item ($self, $userName, $c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
+
+	# Validate data
+
+	my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
+	return 'No achievement data?!?!?!' unless $globalUserAchievement->frozen_hash;
+
+	my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
+	return "You are $self->{id} trying to use an item you don't have" unless $globalData->{ $self->{id} };
+
+	my $setID = $c->param('hcs_set_id');
+	return 'You need to input a Set Name' unless defined $setID;
+
+	my @probIDs = $db->listUserProblems($userName, $setID);
+
+	for my $probID (@probIDs) {
+		my $problem = $db->getUserProblem($userName, $setID, $probID);
+
+		# Add .5 to grade with max of 1.
+		if ($problem->status < .5) {
+			$problem->status($problem->status + .5);
+		} else {
+			$problem->status(1);
+		}
+		$db->putUserProblem($problem);
+	}
+
+	$globalData->{ $self->{id} }--;
+	$globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
+	$db->putGlobalUserAchievement($globalUserAchievement);
+
+	return;
+}
+
+1;
diff --git a/lib/WeBWorK/AchievementItems/ReducedCred.pm b/lib/WeBWorK/AchievementItems/ReducedCred.pm
new file mode 100644
index 0000000000..c6cec053ac
--- /dev/null
+++ b/lib/WeBWorK/AchievementItems/ReducedCred.pm
@@ -0,0 +1,93 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::AchievementItems::ReducedCred;
+use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
+
+# Item to extend a close date by 24 hours for reduced credit
+# Reduced scoring needs to be enabled for this item to work.
+
+use WeBWorK::Utils qw(after between x nfreeze_base64 thaw_base64 format_set_name_display);
+
+sub new ($class) {
+	return bless {
+		id          => 'ReducedCred',
+		name        => x('Ring of Reduction'),
+		description => x(
+			'Enable reduced scoring for a homework set.  This will allow you to submit answers '
+				. 'for partial credit for 24 hours after the close date.'
+		)
+	}, $class;
+}
+
+sub print_form ($self, $sets, $setProblemCount, $c) {
+	my @openSets;
+
+	for my $i (0 .. $#$sets) {
+		push(@openSets, [ format_set_name_display($sets->[$i]->set_id) => $sets->[$i]->set_id ])
+			if (between($sets->[$i]->open_date, $sets->[$i]->due_date) && $sets->[$i]->assignment_type eq 'default');
+	}
+
+	return $c->c(
+		$c->tag('p', $c->maketext('Choose the set which you would like to enable partial credit for.')),
+		WeBWorK::AchievementItems::form_popup_menu_row(
+			$c,
+			id         => 'red_set_id',
+			label_text => $c->maketext('Set Name'),
+			values     => \@openSets,
+			menu_attr  => { dir => 'ltr' }
+		)
+	)->join('');
+}
+
+sub use_item ($self, $userName, $c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
+
+	# Validate data
+
+	return q{This item won't work unless your instructor enables the reduced scoring feature.  }
+		. 'Let your instructor know that you recieved this message.'
+		unless $ce->{pg}{ansEvalDefaults}{reducedScoringPeriod};
+
+	my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
+	return "No achievement data?!?!?!" unless $globalUserAchievement->frozen_hash;
+
+	my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
+	return "You are $self->{id} trying to use an item you don't have" unless $globalData->{ $self->{id} };
+
+	my $setID = $c->param('red_set_id');
+	return "You need to input a Set Name" unless defined $setID;
+
+	my $set     = $db->getMergedSet($userName, $setID);
+	my $userSet = $db->getUserSet($userName, $setID);
+	return "Couldn't find that set!" unless $set && $userSet;
+
+	# Enable reduced scoring on the set and add the reduced scoring period to the due date.
+	my $additionalTime = 60 * $ce->{pg}{ansEvalDefaults}{reducedScoringPeriod};
+	$userSet->enable_reduced_scoring(1);
+	$userSet->reduced_scoring_date($set->due_date());
+	$userSet->due_date($set->due_date() + $additionalTime);
+	$userSet->answer_date($set->answer_date() + $additionalTime);
+	$db->putUserSet($userSet);
+
+	$globalData->{ $self->{id} }--;
+	$globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
+	$db->putGlobalUserAchievement($globalUserAchievement);
+
+	return;
+}
+
+1;
diff --git a/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm b/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm
new file mode 100644
index 0000000000..0a6cce6306
--- /dev/null
+++ b/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm
@@ -0,0 +1,114 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::AchievementItems::ResetIncorrectAttempts;
+use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
+
+# Item to reset number of incorrect attempts.
+
+use WeBWorK::Utils qw(between x nfreeze_base64 thaw_base64 format_set_name_display);
+
+sub new ($class) {
+	return bless {
+		id          => 'ResetIncorrectAttempts',
+		name        => x('Potion of Forgetfulness'),
+		description => x('Resets the number of incorrect attempts on a single homework problem.')
+	}, $class;
+}
+
+sub print_form ($self, $sets, $setProblemCount, $c) {
+	# Construct a dropdown with open sets and another with problems.
+	# Javascript ensures the appropriate number of problems are shown for the selected set.
+
+	my @openSets;
+	my $maxProblems = 0;
+
+	for my $i (0 .. $#$sets) {
+		if (between($sets->[$i]->open_date, $sets->[$i]->due_date) && $sets->[$i]->assignment_type eq 'default') {
+			push(
+				@openSets,
+				[
+					format_set_name_display($sets->[$i]->set_id) => $sets->[$i]->set_id,
+					data                                         => { max => $setProblemCount->[$i] }
+				]
+			);
+			$maxProblems = $setProblemCount->[$i] if $setProblemCount->[$i] > $maxProblems;
+		}
+	}
+
+	my @problemIDs;
+
+	for my $i (1 .. $maxProblems) {
+		push(@problemIDs, [ $i => $i, $i > $openSets[0][3]{max} ? (style => 'display:none') : () ]);
+	}
+
+	return $c->c(
+		$c->tag(
+			'p',
+			$c->maketext(
+				'Please choose the set name and problem number of the question which '
+					. 'should have its incorrect attempt count reset.'
+			)
+		),
+		WeBWorK::AchievementItems::form_popup_menu_row(
+			$c,
+			id         => 'ria_set_id',
+			label_text => $c->maketext('Set Name'),
+			values     => \@openSets,
+			menu_attr  => { dir => 'ltr', data => { problems => 'ria_problem_id' } }
+		),
+		WeBWorK::AchievementItems::form_popup_menu_row(
+			$c,
+			id                  => 'ria_problem_id',
+			label_text          => $c->maketext('Problem Number'),
+			values              => \@problemIDs,
+			menu_container_attr => { class => 'col-3' }
+		)
+	)->join('');
+}
+
+sub use_item ($self, $userName, $c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
+
+	# Validate data
+
+	my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
+	return 'No achievement data?!?!?!' unless $globalUserAchievement->frozen_hash;
+
+	my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
+	return "You are $self->{id} trying to use an item you don't have" unless $globalData->{ $self->{id} };
+
+	my $setID = $c->param('ria_set_id');
+	return 'You need to input a Set Name' unless defined $setID;
+
+	my $problemID = $c->param('ria_problem_id');
+	return 'You need to input a Problem Number' unless $problemID;
+
+	my $problem = $db->getUserProblem($userName, $setID, $problemID);
+	return 'There was an error accessing that problem.' unless $problem;
+
+	# Set the number of incorrect attempts to zero.
+	$problem->num_incorrect(0);
+	$db->putUserProblem($problem);
+
+	$globalData->{ $self->{id} }--;
+	$globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
+	$db->putGlobalUserAchievement($globalUserAchievement);
+
+	return;
+}
+
+1;
diff --git a/lib/WeBWorK/AchievementItems/ResurrectGW.pm b/lib/WeBWorK/AchievementItems/ResurrectGW.pm
new file mode 100644
index 0000000000..3a3bab10be
--- /dev/null
+++ b/lib/WeBWorK/AchievementItems/ResurrectGW.pm
@@ -0,0 +1,93 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::AchievementItems::ResurrectGW;
+use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
+
+# Item to extend the due date on a gateway
+
+use strict;
+use warnings;
+
+use WeBWorK::Utils qw(x nfreeze_base64 thaw_base64 format_set_name_display);
+
+sub new ($class) {
+	return bless {
+		id          => 'ResurrectGW',
+		name        => x('Necromancers Charm'),
+		description => x(
+			'Reopens any test for an additional 24 hours. This allows you to take a test even if the '
+				. 'close date has past. This item does not allow you to take additional versions of the test.'
+		)
+	}, $class;
+}
+
+sub print_form ($self, $sets, $setProblemCount, $c) {
+	my $db = $c->db;
+
+	my $effectiveUserName = $c->param('effectiveUser') // $c->param('user');
+	my @unfilteredsets = $db->getMergedSets(map { [ $effectiveUserName, $_ ] } $db->listUserSets($effectiveUserName));
+	my @sets;
+
+	# Find the template sets of gateway quizzes.
+	for my $set (@unfilteredsets) {
+		push(@sets, [ format_set_name_display($set->set_id) => $set->set_id ])
+			if ($set->assignment_type =~ /gateway/ && $set->set_id !~ /,v\d+$/);
+	}
+
+	return $c->c(
+		$c->tag('p', $c->maketext('Resurrect which test?')),
+		WeBWorK::AchievementItems::form_popup_menu_row(
+			$c,
+			id         => 'resgw_gw_id',
+			label_text => $c->maketext('Test Name'),
+			values     => \@sets,
+			menu_attr  => { dir => 'ltr' }
+		)
+	)->join('');
+}
+
+sub use_item ($self, $userName, $c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
+
+	# Validate data
+
+	my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
+	return 'No achievement data?!?!?!' unless $globalUserAchievement->frozen_hash;
+
+	my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
+	return "You are $self->{id} trying to use an item you don't have" unless $globalData->{ $self->{id} };
+
+	my $setID = $c->param('resgw_gw_id');
+	return 'You need to input a Test Name' unless defined $setID;
+
+	my $set = $db->getUserSet($userName, $setID);
+	return q{Couldn't find that set!} unless $set;
+
+	# Add time to the reduced scoring date, due date, and answer date.
+	$set->reduced_scoring_date(time + 86400) if defined($set->reduced_scoring_date()) && $set->reduced_scoring_date();
+	$set->due_date(time + 86400);
+	$set->answer_date(time + 86400);
+	$db->putUserSet($set);
+
+	$globalData->{ $self->{id} }--;
+	$globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
+	$db->putGlobalUserAchievement($globalUserAchievement);
+
+	return;
+}
+
+1;
diff --git a/lib/WeBWorK/AchievementItems/ResurrectHW.pm b/lib/WeBWorK/AchievementItems/ResurrectHW.pm
new file mode 100644
index 0000000000..9016a5ea50
--- /dev/null
+++ b/lib/WeBWorK/AchievementItems/ResurrectHW.pm
@@ -0,0 +1,95 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::AchievementItems::ResurrectHW;
+use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
+
+# Item to resurrect a homework for 24 hours
+
+use WeBWorK::Utils qw(after x nfreeze_base64 thaw_base64 format_set_name_display);
+
+sub new ($class) {
+	return bless {
+		id          => 'ResurrectHW',
+		name        => x('Scroll of Resurrection'),
+		description => x('Opens any homework set for 24 hours.')
+	}, $class;
+}
+
+sub print_form ($self, $sets, $setProblemCount, $c) {
+	# List all of the sets that are closed or past their reduced scoring date.
+
+	my @closedSets;
+
+	for my $i (0 .. $#$sets) {
+		push(@closedSets, [ format_set_name_display($sets->[$i]->set_id) => $sets->[$i]->set_id ])
+			if $sets->[$i]->assignment_type eq 'default'
+			&& (after($sets->[$i]->due_date)
+				|| ($sets->[$i]->reduced_scoring_date && after($$sets[$i]->reduced_scoring_date)));
+	}
+
+	return $c->c(
+		$c->tag('p', $c->maketext('Choose the set which you would like to resurrect.')),
+		WeBWorK::AchievementItems::form_popup_menu_row(
+			$c,
+			id         => 'res_set_id',
+			label_text => $c->maketext('Set Name'),
+			values     => \@closedSets,
+			menu_attr  => { dir => 'ltr' }
+		)
+	)->join('');
+}
+
+sub use_item ($self, $userName, $c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
+
+	# Validate data
+
+	my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
+	return 'No achievement data?!?!?!' unless $globalUserAchievement->frozen_hash;
+
+	my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
+	return "You are $self->{id} trying to use an item you don't have" unless $globalData->{ $self->{id} };
+
+	my $setID = $c->param('res_set_id');
+	return 'You need to input a Set Name' unless defined $setID;
+
+	my $set = $db->getUserSet($userName, $setID);
+	return q{Couldn't find that set!} unless $set;
+
+	# Set a new reduced scoring date, close date, and answer date for the student.
+	$set->reduced_scoring_date(time + 86400);
+	$set->due_date(time + 86400);
+	$set->answer_date(time + 86400);
+	$db->putUserSet($set);
+
+	my @probIDs = $db->listUserProblems($userName, $setID);
+
+	# Change the seed for all of the problems in the set.
+	for my $probID (@probIDs) {
+		my $problem = $db->getUserProblem($userName, $setID, $probID);
+		$problem->problem_seed($problem->problem_seed + 100);
+		$db->putUserProblem($problem);
+	}
+
+	$globalData->{ $self->{id} }--;
+	$globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
+	$db->putGlobalUserAchievement($globalUserAchievement);
+
+	return;
+}
+
+1;
diff --git a/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm b/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm
new file mode 100644
index 0000000000..08719c3c18
--- /dev/null
+++ b/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm
@@ -0,0 +1,83 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::AchievementItems::SuperExtendDueDate;
+use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
+
+# Item to extend a close date by 48 hours.
+
+use WeBWorK::Utils qw(between x nfreeze_base64 thaw_base64 format_set_name_display);
+
+sub new ($class) {
+	return bless {
+		id          => 'SuperExtendDueDate',
+		name        => x('Robe of Longevity'),
+		description => x('Adds 48 hours to the close date of a homework.')
+	}, $class;
+}
+
+sub print_form ($self, $sets, $setProblemCount, $c) {
+	my @openSets;
+
+	for my $i (0 .. $#$sets) {
+		push(@openSets, [ format_set_name_display($sets->[$i]->set_id) => $sets->[$i]->set_id ])
+			if (between($sets->[$i]->open_date, $sets->[$i]->due_date) && $sets->[$i]->assignment_type eq 'default');
+	}
+
+	return $c->c(
+		$c->tag('p', $c->maketext('Choose the set whose close date you would like to extend.')),
+		WeBWorK::AchievementItems::form_popup_menu_row(
+			$c,
+			id         => 'ext_set_id',
+			label_text => $c->maketext('Set Name'),
+			values     => \@openSets,
+			menu_attr  => { dir => 'ltr' }
+		)
+	)->join('');
+}
+
+sub use_item ($self, $userName, $c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
+
+	# Validate data
+
+	my $globalUserAchievement = $db->getGlobalUserAchievement($userName);
+	return 'No achievement data?!?!?!' unless $globalUserAchievement->frozen_hash;
+
+	my $globalData = thaw_base64($globalUserAchievement->frozen_hash);
+	return "You are $self->{id} trying to use an item you don't have" unless $globalData->{ $self->{id} };
+
+	my $setID = $c->param('ext_set_id');
+	return 'You need to input a Set Name' unless defined $setID;
+
+	my $set     = $db->getMergedSet($userName, $setID);
+	my $userSet = $db->getUserSet($userName, $setID);
+	return q{Couldn't find that set!} unless $set && $userSet;
+
+	# Add time to the reduced scoring date, due date, and answer date.
+	$userSet->reduced_scoring_date($set->reduced_scoring_date() + 172800) if $set->reduced_scoring_date;
+	$userSet->due_date($set->due_date() + 172800);
+	$userSet->answer_date($set->answer_date() + 172800);
+	$db->putUserSet($userSet);
+
+	$globalData->{ $self->{id} }--;
+	$globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
+	$db->putGlobalUserAchievement($globalUserAchievement);
+
+	return;
+}
+
+1;
diff --git a/lib/WeBWorK/AchievementItems/Surprise.pm b/lib/WeBWorK/AchievementItems/Surprise.pm
new file mode 100644
index 0000000000..c750812f69
--- /dev/null
+++ b/lib/WeBWorK/AchievementItems/Surprise.pm
@@ -0,0 +1,48 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::AchievementItems::Surprise;
+use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
+
+# Item to print a suprise message
+
+use WeBWorK::Utils qw(x);
+
+sub new ($class) {
+	return bless {
+		id          => 'Surprise',
+		name        => x('Mysterious Package (with Ribbons)'),
+		description => x('What could be inside?')
+	}, $class;
+}
+
+sub print_form ($self, $sets, $setProblemCount, $c) {
+	# The form opens the file "suprise_message.txt" in the achievements
+	# folder and prints the contents of the file.
+
+	open my $MESSAGE, '<', "$c->{ce}{courseDirs}{achievements}/surprise_message.txt"
+		or return $c->tag('p', $c->maketext(q{I couldn't find the file [ACHIEVEMENT_DIR]/surprise_message.txt!}));
+	local $/ = undef;
+	my $message = <$MESSAGE>;
+	close $MESSAGE;
+
+	return $c->tag('div', $c->b($message));
+}
+
+sub use_item ($self, $userName, $c) {
+	# This doesn't do anything.
+}
+
+1;
diff --git a/lib/WeBWorK/Authen.pm b/lib/WeBWorK/Authen.pm
index 0507845bf9..d0dded1e94 100644
--- a/lib/WeBWorK/Authen.pm
+++ b/lib/WeBWorK/Authen.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -28,7 +28,7 @@ WeBWorK::Authen - Check user identity, manage session keys.
  require $class_name;
 
  # create an authen object
- my $authen = $class_name->new($r);
+ my $authen = $class_name->new($c);
 
  # verify credentials
  $authen->verify or die "Authentication failed";
@@ -50,20 +50,16 @@ subclasses.
 use strict;
 use warnings;
 use version;
-use WeBWorK::Cookie;
+
 use Date::Format;
-use Socket qw/unpack_sockaddr_in inet_ntoa/; # for logging
-use WeBWorK::Debug;
-use WeBWorK::Utils qw/writeCourseLog runtime_use/;
-use WeBWorK::Localize;
-use URI::Escape;
+use Socket qw/unpack_sockaddr_in inet_ntoa/;    # for logging
 use Carp;
 use Scalar::Util qw(weaken);
+use Mojo::Util qw(url_escape url_unescape);
 
-use APR::SockAddr;
-use Apache2::Connection;
-use APR::Request::Error;
-
+use WeBWorK::Debug;
+use WeBWorK::Utils qw/writeCourseLog runtime_use/;
+use WeBWorK::Localize;
 use Caliper::Sensor;
 use Caliper::Entity;
 
@@ -72,7 +68,7 @@ use Caliper::Entity;
 ## If GENERIC_ERROR_MESSAGE is constant, we can't translate it
 
 #use vars qw($GENERIC_ERROR_MESSAGE);
-our $GENERIC_ERROR_MESSAGE = "";  # define in new
+our $GENERIC_ERROR_MESSAGE = "";    # define in new
 
 ## WeBWorK-tr end modification
 #####################
@@ -101,26 +97,28 @@ sub class {
 
 	if (exists $ce->{authen}{$type}) {
 		if (ref $ce->{authen}{$type} eq "ARRAY") {
-			my $authen_type = shift @{$ce ->{authen}{$type}};
+			my $authen_type = shift @{ $ce->{authen}{$type} };
 			#debug("ref of authen_type = |" . ref($authen_type) . "|");
-			if (ref ($authen_type) eq "HASH") {
-				if (exists $authen_type->{$ce->{dbLayoutName}}) {
-					return $authen_type->{$ce->{dbLayoutName}};
+			if (ref($authen_type) eq "HASH") {
+				if (exists $authen_type->{ $ce->{dbLayoutName} }) {
+					return $authen_type->{ $ce->{dbLayoutName} };
 				} elsif (exists $authen_type->{"*"}) {
 					return $authen_type->{"*"};
 				} else {
-					die "authentication type '$type' in the course environment has no entry for db layout '", $ce->{dbLayoutName}, "' and no default entry (*)";
+					die "authentication type '$type' in the course environment has no entry for db layout '",
+						$ce->{dbLayoutName}, "' and no default entry (*)";
 				}
 			} else {
-					return $authen_type;
+				return $authen_type;
 			}
 		} elsif (ref $ce->{authen}{$type} eq "HASH") {
-			if (exists $ce->{authen}{$type}{$ce->{dbLayoutName}}) {
-				return $ce->{authen}{$type}{$ce->{dbLayoutName}};
+			if (exists $ce->{authen}{$type}{ $ce->{dbLayoutName} }) {
+				return $ce->{authen}{$type}{ $ce->{dbLayoutName} };
 			} elsif (exists $ce->{authen}{$type}{"*"}) {
 				return $ce->{authen}{$type}{"*"};
 			} else {
-				die "authentication type '$type' in the course environment has no entry for db layout '", $ce->{dbLayoutName}, "' and no default entry (*)";
+				die "authentication type '$type' in the course environment has no entry for db layout '",
+					$ce->{dbLayoutName}, "' and no default entry (*)";
 			}
 		} else {
 			return $ce->{authen}{$type};
@@ -132,26 +130,26 @@ sub class {
 
 sub call_next_authen_method {
 	my $self = shift;
-	my $r = $self -> {r};
-	my $ce = $r -> {ce};
+	my $c    = $self->{c};
+	my $ce   = $c->{ce};
 
 	my $user_authen_module = WeBWorK::Authen::class($ce, "user_module");
 	#debug("user_authen_module = |$user_authen_module|");
 	if (!defined($user_authen_module) or ($user_authen_module eq "")) {
-		$self->{error} = $r->maketext("No authentication method found for your request.  If this recurs, please speak with your instructor.");
+		$self->{error} = $c->maketext(
+			"No authentication method found for your request.  If this recurs, please speak with your instructor.");
 		$self->{log_error} .= "None of the specified authentication modules could handle the request.";
-		return(0);
+		return (0);
 	} else {
 		runtime_use $user_authen_module;
-		my $authen = $user_authen_module->new($r);
+		my $authen = $user_authen_module->new($c);
 		#debug("Using user_authen_module $user_authen_module: $authen\n");
-		$r->authen($authen);
+		$c->authen($authen);
 
-		return $authen -> verify;
+		return $authen->verify;
 	}
 }
 
-
 =back
 
 =cut
@@ -160,21 +158,19 @@ sub call_next_authen_method {
 
 =over
 
-=item new($r)
+=item new($c)
 
-Instantiates a new WeBWorK::Authen object for the given WeBWorK::Requst ($r).
+Instantiates a new WeBWorK::Authen object for the given WeBWorK::Controller ($c).
 
 =cut
 
 sub new {
-	my ($invocant, $r) = @_;
+	my ($invocant, $c) = @_;
 	my $class = ref($invocant) || $invocant;
-	my $self = {
-		r => $r,
-	};
-	weaken $self -> {r};
+	my $self  = { c => $c, };
+	weaken $self->{c};
 	#initialize
-	$GENERIC_ERROR_MESSAGE = $r->maketext("Invalid user ID or password.");
+	$GENERIC_ERROR_MESSAGE = $c->maketext("Invalid user ID or password.");
 	bless $self, $class;
 	return $self;
 }
@@ -189,22 +185,22 @@ sub new {
 
 =cut
 
-sub  request_has_data_for_this_verification_module {
+sub request_has_data_for_this_verification_module {
 	#debug("Authen::request_has_data_for_this_verification_module will return a 1");
-	return(1);
+	return (1);
 }
 
 sub verify {
 	debug("BEGIN VERIFY");
 	my $self = shift;
-	my $r = $self->{r};
+	my $c    = $self->{c};
 
-	if (! ($self-> request_has_data_for_this_verification_module)) {
-		return ( $self -> call_next_authen_method());
+	if (!($self->request_has_data_for_this_verification_module)) {
+		return ($self->call_next_authen_method());
 	}
 
-	my $result = $self->do_verify;
-	my $error = $self->{error};
+	my $result    = $self->do_verify;
+	my $error     = $self->{error};
 	my $log_error = $self->{log_error};
 
 	$self->{was_verified} = $result ? 1 : 0;
@@ -221,33 +217,23 @@ sub verify {
 		if (defined $log_error) {
 			$self->write_log_entry("LOGIN FAILED $log_error");
 		}
-		if (defined($error) and $error=~/\S/) { # if error message has a least one non-space character.
-			if ( defined( $log_error ) and $log_error eq "inactivity timeout" ) {
-				# We don't want to override the localized inactivity timeout message.
-				# so do not check next "if" in this case.
-			} elsif (defined($r->param("user")) or defined($r->param("user_id"))) {
-				$error = $r->maketext("Your authentication failed.  Please try again. Please speak with your instructor if you need help.")
-			}
-
-		}
-        #warn "LOGIN FAILED: log_error: $log_error; user error: $error";
 		$self->maybe_kill_cookie;
 		# if error message has a least one non-space character.
-		if (defined($error) and $error =~ /\S/ and $r->can('notes')) {
-			$r->notes->set(authen_error => $error);
+		if (defined($error) and $error =~ /\S/) {
+			$c->stash(authen_error => $error);
 			# FIXME this is a hack to accomodate the webworkservice remixes
 		}
 	}
 
-	my $caliper_sensor = Caliper::Sensor->new($self->{r}->ce);
+	my $caliper_sensor = Caliper::Sensor->new($self->{c}->ce);
 	if ($caliper_sensor->caliperEnabled() && $result && $self->{initial_login}) {
 		my $login_event = {
-			'type' => 'SessionEvent',
-			'action' => 'LoggedIn',
+			'type'    => 'SessionEvent',
+			'action'  => 'LoggedIn',
 			'profile' => 'SessionProfile',
-			'object' => Caliper::Entity::webwork_app()
+			'object'  => Caliper::Entity::webwork_app()
 		};
-		$caliper_sensor->sendEvents($self->{r}, [$login_event]);
+		$caliper_sensor->sendEvents($self->{c}, [$login_event]);
 	}
 
 	debug("END VERIFY");
@@ -276,8 +262,8 @@ Future calls to was_verified() will return false, until verify() is called again
 
 sub forget_verification {
 	my ($self) = @_;
-	my $r = $self -> {r};
-	my $ce = $r -> {ce};
+	my $c      = $self->{c};
+	my $ce     = $c->ce;
 
 	$self->{was_verified} = 0;
 
@@ -293,45 +279,44 @@ sub forget_verification {
 
 sub do_verify {
 	my $self = shift;
-	my $r = $self->{r};
-	my $ce = $r->ce;
-	my $db = $r->db;
+	my $c    = $self->{c};
+	my $db   = $c->db;
 
 	return 0 unless $db;
 	debug("db ok");
 	return 0 unless $self->get_credentials;
 	debug("credentials ok");
 	return 0 unless $self->check_user;
-	debug ("check user ok");
-	if (defined($self->{login_type}) && $self->{login_type} eq "guest"){
+	debug("check user ok");
+	if (defined($self->{login_type}) && $self->{login_type} eq "guest") {
 		return $self->verify_practice_user;
 	} else {
 		return $self->verify_normal_user;
 	}
 }
 
-sub trim {  # used to trim leading and trailing white space from user_id and password
-            # in get_credentials
-  my $s = shift;
-  # If the value was NOT defined, we want to leave it undefined, so
-  # we can still catch session-timeouts and report them properly.
-  # Thus we only do the following substitution if $s is defined.
-  # Otherwise return the undefined value so a non-defined password
-  # can be caught later by authenticate() for the case of a
-  # session-timeout.
-  $s =~ s/(^\s+|\s+$)//g    if ( defined($s) );
-  return $s;
+sub trim {    # used to trim leading and trailing white space from user_id and password
+			  # in get_credentials
+	my $s = shift;
+	# If the value was NOT defined, we want to leave it undefined, so
+	# we can still catch session-timeouts and report them properly.
+	# Thus we only do the following substitution if $s is defined.
+	# Otherwise return the undefined value so a non-defined password
+	# can be caught later by authenticate() for the case of a
+	# session-timeout.
+	$s =~ s/(^\s+|\s+$)//g if (defined($s));
+	return $s;
 }
 
 sub get_credentials {
 	my ($self) = @_;
-	my $r = $self->{r};
-	my $ce = $r->ce;
-	my $db = $r->db;
+	my $c      = $self->{c};
+	my $ce     = $c->ce;
+	my $db     = $c->db;
 	debug("self is $self ");
 	# allow guest login: if the "Guest Login" button was clicked, we find an unused
 	# practice user and create a session for it.
-	if ($r->param("login_practice_user")) {
+	if ($c->param("login_practice_user")) {
 		my @allowedGuestUserIDs =
 			map  { $_->user_id }
 			grep { $ce->status_abbrev_has_behavior($_->status, "allow_course_access") }
@@ -342,110 +327,117 @@ sub get_credentials {
 				my $newKey = $self->create_session($userID);
 				$self->{initial_login} = 1;
 
-				$self->{user_id} = $userID;
-				$self->{session_key} = $newKey;
-				$self->{login_type} = "guest";
+				$self->{user_id}           = $userID;
+				$self->{session_key}       = $newKey;
+				$self->{login_type}        = "guest";
 				$self->{credential_source} = "none";
-				debug("guest user '", $userID. "' key '", $newKey. "'");
+				debug("guest user '", $userID . "' key '", $newKey . "'");
 				return 1;
 			}
 		}
 
 		$self->{log_error} = "no guest logins are available";
-		$self->{error} = $r->maketext("No guest logins are available. Please try again in a few minutes.");
+		$self->{error}     = $c->maketext("No guest logins are available. Please try again in a few minutes.");
 		return 0;
 	}
 
 	my ($cookieUser, $cookieKey, $cookieTimeStamp) = $self->fetchCookie;
 
-	if (defined $cookieUser and defined $r->param("user") ) {
-		if ($cookieUser ne $r->param("user")) {
-			#croak ("cookieUser = $cookieUser and paramUser = ". $r->param("user") . " are different.");
-			$self->maybe_kill_cookie; # use parameter "user" rather than cookie "user";
+	if (defined $cookieUser and defined $c->param("user")) {
+		if ($cookieUser ne $c->param("user")) {
+			#croak ("cookieUser = $cookieUser and paramUser = ". $c->param("user") . " are different.");
+			$self->maybe_kill_cookie;    # use parameter "user" rather than cookie "user";
 		}
-# Use session key for verification
-# else   use cookieKey for verification
-# else    use cookie user name but use password provided by request.
-
-		if (defined $r->param("key")) {
-			$self->{user_id} = $r->param("user");
-			$self->{session_key} = $r->param("key");
-			$self->{password} = $r->param("passwd");
-			$self->{login_type} = "normal";
+		# Use session key for verification
+		# else   use cookieKey for verification
+		# else    use cookie user name but use password provided by request.
+
+		if (defined $c->param("key")) {
+			$self->{user_id}           = $c->param("user");
+			$self->{session_key}       = $c->param("key");
+			$self->{password}          = $c->param("passwd");
+			$self->{login_type}        = "normal";
 			$self->{credential_source} = "params";
-			$self->{user_id}     = trim($self->{user_id});
-			$self->{password}     = trim($self->{password});
+			$self->{user_id}           = trim($self->{user_id});
+			$self->{password}          = trim($self->{password});
 			debug("params user '", $self->{user_id}, "' key '", $self->{session_key}, "'");
 			return 1;
 		} elsif (defined $cookieKey) {
-			$self->{user_id} = $cookieUser;
-			$self->{session_key} = $cookieKey;
-			$self->{cookie_timestamp} = $cookieTimeStamp;
-			$self->{login_type} = "normal";
+			$self->{user_id}           = $cookieUser;
+			$self->{session_key}       = $cookieKey;
+			$self->{cookie_timestamp}  = $cookieTimeStamp;
+			$self->{login_type}        = "normal";
 			$self->{credential_source} = "cookie";
-			$self->{user_id}     = trim($self->{user_id});
-			debug(  "cookie user '", $self->{user_id},
-				"' key '", $self->{session_key},
-				"' cookie_timestamp '", $self->{cookieTimeStamp}, "' "
+			$self->{user_id}           = trim($self->{user_id});
+			debug(
+				"cookie user '",
+				$self->{user_id}, "' key '", $self->{session_key},
+				"' cookie_timestamp '",
+				$self->{cookieTimeStamp}, "' "
 			);
 			return 1;
 		} else {
-			$self->{user_id} = $cookieUser;
-			$self->{session_key} = $cookieKey; # will be undefined
-			$self->{password} = $r->param("passwd");
-			$self->{cookie_timestamp} = $cookieTimeStamp;
-			$self->{login_type} = "normal";
+			$self->{user_id}           = $cookieUser;
+			$self->{session_key}       = $cookieKey;                # will be undefined
+			$self->{password}          = $c->param("passwd");
+			$self->{cookie_timestamp}  = $cookieTimeStamp;
+			$self->{login_type}        = "normal";
 			$self->{credential_source} = "params_and_cookie";
-			$self->{user_id}     = trim($self->{user_id});
-			$self->{password}    = trim($self->{password});
-			debug(  "params and cookie user '", $self->{user_id},
-				"' params and cookie session key = '", $self->{session_key},
-				"' cookie_timestamp '", $self->{cookieTimeStamp}, "' "
+			$self->{user_id}           = trim($self->{user_id});
+			$self->{password}          = trim($self->{password});
+			debug(
+				"params and cookie user '",
+				$self->{user_id}, "' params and cookie session key = '",
+				$self->{session_key},
+				"' cookie_timestamp '",
+				$self->{cookieTimeStamp}, "' "
 			);
 			return 1;
 		}
 	}
 	# at least the user ID is available in request parameters
-	if (defined $r->param("user")) {
-		$self->{user_id} = $r->param("user");
-		$self->{session_key} = $r->param("key");
-		$self->{password} = $r->param("passwd");
-		$self->{login_type} = "normal";
+	if (defined $c->param("user")) {
+		$self->{user_id}           = $c->param("user");
+		$self->{session_key}       = $c->param("key");
+		$self->{password}          = $c->param("passwd");
+		$self->{login_type}        = "normal";
 		$self->{credential_source} = "params";
-		$self->{user_id}      = trim($self->{user_id});
-		$self->{password}     = trim($self->{password});
-		debug("params user '", $self->{user_id}, "' key '", $self->{session_key}, "'");
+		$self->{user_id}           = trim($self->{user_id});
+		$self->{password}          = trim($self->{password});
+		debug("params user '",     $self->{user_id},  "' key '", $self->{session_key}, "'");
 		debug("params password '", $self->{password}, "' key '", $self->{session_key}, "'");
 		return 1;
 	}
 
 	if (defined $cookieUser) {
-		$self->{user_id} = $cookieUser;
-		$self->{session_key} = $cookieKey;
-		$self->{cookie_timestamp} = $cookieTimeStamp;
-		$self->{login_type} = "normal";
+		$self->{user_id}           = $cookieUser;
+		$self->{session_key}       = $cookieKey;
+		$self->{cookie_timestamp}  = $cookieTimeStamp;
+		$self->{login_type}        = "normal";
 		$self->{credential_source} = "cookie";
-		$self->{user_id}     = trim($self->{user_id});
-		debug(  "cookie user '", $self->{user_id},
-			"' key '", $self->{session_key},
-			"' cookie_timestamp '", $self->{cookieTimeStamp}, "' "
+		$self->{user_id}           = trim($self->{user_id});
+		debug(
+			"cookie user '",
+			$self->{user_id}, "' key '", $self->{session_key},
+			"' cookie_timestamp '",
+			$self->{cookieTimeStamp}, "' "
 		);
 		return 1;
 	}
 }
 
 sub check_user {
-	my $self = shift;
-	my $r = $self->{r};
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $authz = $r->authz;
+	my $self  = shift;
+	my $c     = $self->{c};
+	my $ce    = $c->ce;
+	my $db    = $c->db;
+	my $authz = $c->authz;
 
 	my $user_id = $self->{user_id};
 
 	if (defined $user_id and $user_id eq "") {
 		$self->{log_error} = "no user id specified";
-		$self->{error} .= $r->maketext("You must specify a user ID.");
+		$self->{error} .= $c->maketext("You must specify a user ID.");
 		return 0;
 	}
 
@@ -453,7 +445,7 @@ sub check_user {
 
 	unless ($User) {
 		$self->{log_error} = "user unknown";
-		$self->{error} = $GENERIC_ERROR_MESSAGE;
+		$self->{error}     = $GENERIC_ERROR_MESSAGE;
 		return 0;
 	}
 
@@ -461,13 +453,13 @@ sub check_user {
 
 	unless ($ce->status_abbrev_has_behavior($User->status, "allow_course_access")) {
 		$self->{log_error} = "user not allowed course access";
-		$self->{error} = $GENERIC_ERROR_MESSAGE;
+		$self->{error}     = $GENERIC_ERROR_MESSAGE;
 		return 0;
 	}
 
 	unless ($authz->hasPermissions($user_id, "login")) {
 		$self->{log_error} = "user not permitted to login";
-		$self->{error} = $GENERIC_ERROR_MESSAGE;
+		$self->{error}     = $GENERIC_ERROR_MESSAGE;
 		return 0;
 	}
 
@@ -476,10 +468,10 @@ sub check_user {
 
 sub verify_practice_user {
 	my $self = shift;
-	my $r = $self->{r};
-	my $ce = $r->ce;
+	my $c    = $self->{c};
+	my $ce   = $c->ce;
 
-	my $user_id = $self->{user_id};
+	my $user_id     = $self->{user_id};
 	my $session_key = $self->{session_key};
 
 	my ($sessionExists, $keyMatches, $timestampValid) = $self->check_session($user_id, $session_key, 1);
@@ -490,7 +482,7 @@ sub verify_practice_user {
 			if ($timestampValid) {
 				return 1;
 			} else {
-				$self->{session_key} = $self->create_session($user_id);
+				$self->{session_key}   = $self->create_session($user_id);
 				$self->{initial_login} = 1;
 				return 1;
 			}
@@ -498,22 +490,22 @@ sub verify_practice_user {
 			if ($timestampValid) {
 				my $debugPracticeUser = $ce->{debugPracticeUser};
 				if (defined $debugPracticeUser and $user_id eq $debugPracticeUser) {
-					$self->{session_key} = $self->create_session($user_id);
+					$self->{session_key}   = $self->create_session($user_id);
 					$self->{initial_login} = 1;
 					return 1;
 				} else {
 					$self->{log_error} = "guest account in use";
-					$self->{error} = "That guest account is in use.";
+					$self->{error}     = "That guest account is in use.";
 					return 0;
 				}
 			} else {
-				$self->{session_key} = $self->create_session($user_id);
+				$self->{session_key}   = $self->create_session($user_id);
 				$self->{initial_login} = 1;
 				return 1;
 			}
 		}
 	} else {
-		$self->{session_key} = $self->create_session($user_id);
+		$self->{session_key}   = $self->create_session($user_id);
 		$self->{initial_login} = 1;
 		return 1;
 	}
@@ -521,9 +513,9 @@ sub verify_practice_user {
 
 sub verify_normal_user {
 	my $self = shift;
-	my $r = $self->{r};
+	my $c    = $self->{c};
 
-	my $user_id = $self->{user_id};
+	my $user_id     = $self->{user_id};
 	my $session_key = $self->{session_key};
 
 	my ($sessionExists, $keyMatches, $timestampValid) = $self->check_session($user_id, $session_key, 1);
@@ -535,17 +527,17 @@ sub verify_normal_user {
 		my $auth_result = $self->authenticate;
 
 		if ($auth_result > 0) {
-			$self->{session_key} = $self->create_session($user_id);
+			$self->{session_key}   = $self->create_session($user_id);
 			$self->{initial_login} = 1;
 			return 1;
 		} elsif ($auth_result == 0) {
 			$self->{log_error} = "authentication failed";
-			$self->{error} = $GENERIC_ERROR_MESSAGE;
+			$self->{error}     = $GENERIC_ERROR_MESSAGE;
 			return 0;
-		} else { # ($auth_result < 0) => required data was not present
+		} else {    # ($auth_result < 0) => required data was not present
 			if ($keyMatches and not $timestampValid) {
 				$self->{log_error} = "inactivity timeout";
-				$self->{error} .= $r->maketext("Your session has timed out due to inactivity. Please log in again.");
+				$self->{error} .= $c->maketext("Your session has timed out due to inactivity. Please log in again.");
 			}
 			return 0;
 		}
@@ -557,9 +549,9 @@ sub verify_normal_user {
 # -1 == required data was not present (i.e. password missing)
 sub authenticate {
 	my $self = shift;
-	my $r = $self->{r};
+	my $c    = $self->{c};
 
-	my $user_id = $self->{user_id};
+	my $user_id  = $self->{user_id};
 	my $password = $self->{password};
 
 	if (defined $password) {
@@ -571,8 +563,10 @@ sub authenticate {
 
 sub maybe_send_cookie {
 	my $self = shift;
-	my $r = $self->{r};
-	my $ce = $r -> {ce};
+	my $c    = $self->{c};
+	my $ce   = $c->{ce};
+
+	return if $c->{rpc};
 
 	my ($cookie_user, $cookie_key, $cookie_timestamp, $setID) = $self->fetchCookie;
 
@@ -584,20 +578,27 @@ sub maybe_send_cookie {
 	# (b) a cookie was sent but not used for authentication, and the
 	#     credentials used for authentication were the same as those in
 	#     the cookie
-	my $unused_valid_cookie = ($self->{credential_source} ne "cookie"
-		and defined $cookie_user and $self->{user_id} eq $cookie_user
-		and defined $cookie_key and $self->{session_key} eq $cookie_key);
+	my $unused_valid_cookie =
+		($self->{credential_source} ne "cookie"
+			and defined $cookie_user
+			and $self->{user_id} eq $cookie_user
+			and defined $cookie_key
+			and $self->{session_key} eq $cookie_key);
 
 	# (c) the user asked to have a cookie sent and is not a guest user.
-	my $user_requests_cookie = ($self->{login_type} ne "guest"
-		and ( $r->param("send_cookie")//0 )); # prevent warning if "send_cookie" param is not defined.
+	my $user_requests_cookie = ($self->{login_type} ne "guest" and ($c->param("send_cookie") // 0))
+		;    # prevent warning if "send_cookie" param is not defined.
 
 	# (d) session management is done via cookies.
-	my $session_management_via_cookies =
-		$ce -> {session_management_via} eq "session_cookie";
-
-	debug("used_cookie='", $used_cookie, "' unused_valid_cookie='", $unused_valid_cookie, "' user_requests_cookie='", $user_requests_cookie,
-			"' session_management_via_cookies ='", $session_management_via_cookies, "'");
+	my $session_management_via_cookies = $ce->{session_management_via} eq "session_cookie";
+
+	debug(
+		"used_cookie='",                       $used_cookie,
+		"' unused_valid_cookie='",             $unused_valid_cookie,
+		"' user_requests_cookie='",            $user_requests_cookie,
+		"' session_management_via_cookies ='", $session_management_via_cookies,
+		"'"
+	);
 
 	if ($used_cookie or $unused_valid_cookie or $user_requests_cookie or $session_management_via_cookies) {
 		#debug("Authen::maybe_send_cookie is sending a cookie");
@@ -609,19 +610,22 @@ sub maybe_send_cookie {
 
 sub maybe_kill_cookie {
 	my $self = shift;
+
+	return if $self->{c}{rpc};
+
 	$self->killCookie(@_);
 }
 
 sub set_params {
 	my $self = shift;
-	my $r = $self->{r};
+	my $c    = $self->{c};
 
 	# A2 - params are not non-modifiable, with no explanation or workaround given in docs. WTF!
-	$r->param("user", $self->{user_id});
-	$r->param("key", $self->{session_key});
-	$r->param("passwd", "");
+	$c->param("user",   $self->{user_id});
+	$c->param("key",    $self->{session_key});
+	$c->param("passwd", "") unless $c->{rpc};
 
-	debug("params user='", $r->param("user"), "' key='", $r->param("key"), "'");
+	debug("params user='", $c->param("user"), "' key='", $c->param("key"), "'");
 }
 
 ################################################################################
@@ -630,13 +634,13 @@ sub set_params {
 
 sub checkPassword {
 	my ($self, $userID, $possibleClearPassword) = @_;
-	my $db = $self->{r}->db;
+	my $db = $self->{c}->db;
 
-	my $Password = $db->getPassword($userID); # checked
+	my $Password = $db->getPassword($userID);    # checked
 	if (defined $Password) {
 		# check against WW password database
 		my $possibleCryptPassword = crypt $possibleClearPassword, $Password->password;
-		my $dbPassword = $Password->password;
+		my $dbPassword            = $Password->password;
 		# This next line explicitly insures that
 		# blank or null passwords from the database can never
 		# succeed in matching an entered password
@@ -651,7 +655,8 @@ sub checkPassword {
 		# lib/WeBWorK/Authen.pm we do not assume that an all-white space password would have
 		# already been converted to an empty string and instead explicitly test it for a non-space
 		# character.
-		if (($possibleClearPassword =~/\S/) && ($dbPassword =~/\S/) && $possibleCryptPassword eq $Password->password) {
+		if (($possibleClearPassword =~ /\S/) && ($dbPassword =~ /\S/) && $possibleCryptPassword eq $Password->password)
+		{
 			$self->write_log_entry("AUTH WWDB: password accepted");
 			return 1;
 		} else {
@@ -698,7 +703,7 @@ sub checkPassword {
 # 		if ($possibleCryptPassword eq $realCryptPassword) {
 # 			# update WeBWorK password
 # 			use WeBWorK::Utils qw(cryptPassword);
-# 			my $db = $self->{r}->db;
+# 			my $db = $self->{c}->db;
 # 			my $Password = $db->getPassword($userID);
 # 			my $pass = cryptPassword($clearTextPassword);
 # 			$Password->password($pass);
@@ -715,12 +720,12 @@ sub checkPassword {
 
 sub unexpired_session_exists {
 	my ($self, $userID) = @_;
-	my $ce = $self->{r}->ce;
-	my $db = $self->{r}->db;
+	my $ce = $self->{c}->ce;
+	my $db = $self->{c}->db;
 
-	my $Key = $db->getKey($userID); # checked
+	my $Key = $db->getKey($userID);    # checked
 	return 0 unless defined $Key;
-	if (time <= $Key->timestamp()+$ce->{sessionKeyTimeout}) {
+	if (time <= $Key->timestamp() + $ce->{sessionKeyTimeout}) {
 		# unexpired, but leave timestamp alone
 		return 1;
 	} else {
@@ -740,21 +745,20 @@ sub unexpired_session_exists {
 # The $userID is modified in that case and will not work in the hasPermissions call.
 sub create_session {
 	my ($self, $userID, $newKey, $trueUserID) = @_;
-	my $r = $self->{r};
-	my $ce = $r->ce;
-	my $db = $r->db;
+	my $c  = $self->{c};
+	my $ce = $c->ce;
+	my $db = $c->db;
 
 	my $timestamp = time;
 	unless ($newKey) {
-		my @chars = @{ $ce->{sessionKeyChars} };
+		my @chars  = @{ $ce->{sessionKeyChars} };
 		my $length = $ce->{sessionKeyLength};
 
 		srand;
-		$newKey = join ("", @chars[map rand(@chars), 1 .. $length]);
+		$newKey = join("", @chars[ map rand(@chars), 1 .. $length ]);
 	}
 
-	my $setID =
-		!$r->authz->hasPermissions($trueUserID // $userID, 'navigation_allowed') ? $r->urlpath->arg("setID") : '';
+	my $setID = !$c->authz->hasPermissions($trueUserID // $userID, 'navigation_allowed') ? $c->stash('setID') : '';
 
 	my $Key = $db->newKey(user_id => $userID, key => $newKey, timestamp => $timestamp, set_id => $setID);
 
@@ -780,10 +784,10 @@ sub create_session {
 # if $updateTimestamp is true, the timestamp on a valid session is updated
 sub check_session {
 	my ($self, $userID, $possibleKey, $updateTimestamp) = @_;
-	my $ce = $self->{r}->ce;
-	my $db = $self->{r}->db;
+	my $ce = $self->{c}->ce;
+	my $db = $self->{c}->db;
 
-	my $Key = $db->getKey($userID); # checked
+	my $Key = $db->getKey($userID);    # checked
 	return 0 unless defined $Key;
 
 	my $keyMatches = (defined $possibleKey and $possibleKey eq $Key->key);
@@ -793,72 +797,68 @@ sub check_session {
 	# Want key not be too old. Use timestamp from DB and
 	# sessionKeyTimeout to determine this even when using cookies
 	# as we do not trust the timestamp provided by a user's browser.
-	my $timestampValid  = ( $time_now <= $Key->timestamp() + $ce->{sessionKeyTimeout} );
-
-# first part of if clause is disabled for now until we figure out long term fix for using cookies
-# safely (see pull request #576)   This means that the database key time is always being used
-# even when in "session_cookie" mode
-#	if ($ce -> {session_management_via} eq "session_cookie" and defined($self->{cookie_timestamp})) {
-#		$timestampValid = (time <= $self -> {cookie_timestamp} + $ce->{sessionKeyTimeout});
-#	} else {
-		if ($keyMatches and $timestampValid and $updateTimestamp) {
-			$Key->timestamp(time);
-			$db->putKey($Key);
-		}
-#	}
+	my $timestampValid = ($time_now <= $Key->timestamp() + $ce->{sessionKeyTimeout});
+
+	# first part of if clause is disabled for now until we figure out long term fix for using cookies
+	# safely (see pull request #576)   This means that the database key time is always being used
+	# even when in "session_cookie" mode
+	#	if ($ce -> {session_management_via} eq "session_cookie" and defined($self->{cookie_timestamp})) {
+	#		$timestampValid = (time <= $self -> {cookie_timestamp} + $ce->{sessionKeyTimeout});
+	#	} else {
+	if ($keyMatches and $timestampValid and $updateTimestamp) {
+		$Key->timestamp(time);
+		$db->putKey($Key);
+	}
+	#	}
 	return (1, $keyMatches, $timestampValid);
 }
 
 sub killSession {
 	my $self = shift;
 
-	my $r = $self -> {r};
-	my $ce = $r -> {ce};
-	my $db = $r -> {db};
+	my $c  = $self->{c};
+	my $ce = $c->{ce};
+	my $db = $c->{db};
 
 	my $caliper_sensor = Caliper::Sensor->new($ce);
 	if ($caliper_sensor->caliperEnabled()) {
 		my $login_event = {
-			'type' => 'SessionEvent',
-			'action' => 'LoggedOut',
+			'type'    => 'SessionEvent',
+			'action'  => 'LoggedOut',
 			'profile' => 'SessionProfile',
-			'object' => Caliper::Entity::webwork_app()
+			'object'  => Caliper::Entity::webwork_app()
 		};
-		$caliper_sensor->sendEvents($self->{r}, [$login_event]);
+		$caliper_sensor->sendEvents($self->{c}, [$login_event]);
 	}
 
 	$self->forget_verification;
-	if ($ce->{session_management_via} eq "session_cookie")  {
+	if ($ce->{session_management_via} eq "session_cookie") {
 		$self->killCookie();
 	}
 
-	my $userID = $r -> param("user");
+	my $userID = $c->param("user");
 	if (defined($userID)) {
-		 $db->deleteKey($userID);
+		$db->deleteKey($userID);
 	}
 }
 
-
 ################################################################################
 # Cookie management
 ################################################################################
 
 sub fetchCookie {
 	my $self = shift;
-	my $r = $self->{r};
-	my $ce = $r->ce;
-	my $urlpath = $r->urlpath;
+	my $c    = $self->{c};
+	my $ce   = $c->ce;
 
-	my $courseID = $urlpath->arg("courseID");
+	return if $c->{rpc};
 
-	my $cookie = undef;
-	my %cookies = WeBWorK::Cookie->fetch();
-	$cookie = $cookies{"WeBWorKCourseAuthen.$courseID"};
+	my $cookie = $c->cookie('WeBWorKCourseAuthen.' . $c->stash('courseID'));
 
 	if ($cookie) {
-		#debug("found a cookie for this course: '", $cookie->as_string, "'");
-	        debug("cookie has this value: '", $cookie->value, "'");
-		my ($userID, $key, $timestamp, $setID) = split "\t", $cookie->value;
+		$cookie = url_unescape($cookie);
+		debug("cookie has this value: '", $cookie, "'");
+		my ($userID, $key, $timestamp, $setID) = split "\t", $cookie;
 		if (defined $userID and defined $key and $userID ne "" and $key ne "") {
 			debug("looks good, returning userID='$userID' key='$key'");
 			return ($userID, $key, $timestamp, $setID);
@@ -874,72 +874,70 @@ sub fetchCookie {
 
 sub sendCookie {
 	my ($self, $userID, $key, $setID) = @_;
-	my $r = $self->{r};
-	my $ce = $r->ce;
+	my $c  = $self->{c};
+	my $ce = $c->ce;
 
-	my $courseID = $r->urlpath->arg("courseID");
+	return if $c->{rpc};
+
+	my $courseID = $c->stash('courseID');
 
 	# This sets the setID in the cookie on initial login.
-	$setID = $r->urlpath->arg("setID")
+	$setID = $c->stash('setID')
 		if !$setID
-		&& $r->authen->was_verified && !$r->authz->hasPermissions($userID, 'navigation_allowed');
+		&& $c->authen->was_verified
+		&& !$c->authz->hasPermissions($userID, 'navigation_allowed');
 
- 	my $timestamp = time();
+	my $timestamp = time;
 
-	my $cookie = WeBWorK::Cookie->new(
-		-name     => "WeBWorKCourseAuthen.$courseID",
-		-value    => "$userID\t$key\t$timestamp" . ($setID ? "\t$setID" : ''),
-		-path     => $ce->{webworkURLRoot},
-		-samesite => $ce->{CookieSameSite},
-		-secure   => $ce->{CookieSecure}    # Warning: use 1 only if using https
-	);
+	my $cookie_params = {
+		path     => $ce->{webworkURLRoot},
+		samesite => $ce->{CookieSameSite},
+		secure   => $ce->{CookieSecure}
+	};
 
 	# Set how long the browser should retain the cookie. Using max_age is now recommended,
-	# and overrides expires, but some very old browser only support expires.
-	my $lifetime  = $ce->{CookieLifeTime};
-	if ( $lifetime ne 'session' ) {
-		$cookie->expires( $lifetime );
-		$cookie->max_age( $lifetime );
-	} # as when $lifetime eq 'session' the cookie should be a "session cookie"
-	  # and expire when the browser session is closed.
+	# and overrides expires, but some very old browsers only support expires.
+	my $lifetime = $ce->{CookieLifeTime};
+	if ($lifetime ne 'session') {
+		$cookie_params->{expires} = $timestamp + $lifetime;
+		$cookie_params->{max_age} = $lifetime;
+	}
+	# When $lifetime eq 'session' the cookie will be a "session cookie" and expire when the browser session is closed.
 	# At present the CookieLifeTime setting only effects how long the browser is to told to retain the cookie.
 	# Ideally, when $ce->{session_management_via} eq "session_cookie", and if the timestamp in the cookie was
 	# secured again client-side tampering, the timestamp and lifetime could be used to provide ongoing session
 	# authentication.
 
- 	if ($r->hostname ne "localhost" && $r->hostname ne "127.0.0.1") {
-		$cookie->domain($r->hostname);    # if $r->hostname = "localhost" or "127.0.0.1", then this must be omitted.
-	}
+	# If the hostname is 'localhost' or '127.0.0.1', then the cookie domain must be omitted.
+	my $hostname = $c->req->url->to_abs->host;
+	$cookie_params->{domain} = $hostname if ($hostname ne 'localhost' && $hostname ne '127.0.0.1');
 
-#	debug("about to add Set-Cookie header with this string: '", $cookie->as_string, "'");
- 	eval {$r->headers_out->set("Set-Cookie" => $cookie->as_string);};
- 	if ($@) {croak $@; }
+	$c->cookie(
+		"WeBWorKCourseAuthen.$courseID" => url_escape("$userID\t$key\t$timestamp" . ($setID ? "\t$setID" : '')),
+		$cookie_params
+	);
 }
 
 sub killCookie {
 	my ($self) = @_;
-	my $r = $self->{r};
-	my $ce = $r->ce;
-
-	my $courseID = $r->urlpath->arg("courseID");
-
-	my $cookie = WeBWorK::Cookie->new(
-		-name      => "WeBWorKCourseAuthen.$courseID",
-		-value     => "\t",
-		'-max-age' => "-1d", # 1 day ago
-		-expires   => "-1d", # 1 day ago
-		-path      => $ce->{webworkURLRoot},
-		-samesite  => $ce->{CookieSameSite},
-		-secure    => $ce->{CookieSecure}    # Warning: use 1 only if using https
-	);
- 	if ($r->hostname ne "localhost" && $r->hostname ne "127.0.0.1") {
-		$cookie -> domain($r->hostname);  # if $r->hostname = "localhost" or "127.0.0.1", then this must be omitted.
-	}
+	my $c      = $self->{c};
+	my $ce     = $c->ce;
+
+	my $courseID = $c->stash('courseID') // '';
+
+	my $cookie_params = {
+		max_age  => 0,
+		expires  => 0,
+		path     => $ce->{webworkURLRoot},
+		samesite => $ce->{CookieSameSite},
+		secure   => $ce->{CookieSecure}
+	};
+
+	# If the hostname is 'localhost' or '127.0.0.1', then the cookie domain must be omitted.
+	my $hostname = $c->req->url->to_abs->host;
+	$cookie_params->{domain} = $hostname if ($hostname ne 'localhost' && $hostname ne '127.0.0.1');
 
-	#debug( "killCookie is about to set an expired cookie");
-	#debug("about to add Set-Cookie header with this string: '", $cookie->as_string, "'");
- 	eval {$r->headers_out->set("Set-Cookie" => $cookie->as_string);};
- 	if ($@) {croak $@; }
+	$c->cookie("WeBWorKCourseAuthen.$courseID" => '', $cookie_params);
 }
 
 # This method is only used for a user that does not have the navigation_allowed permission,
@@ -948,8 +946,8 @@ sub get_session_set_id {
 	my $self = shift;
 	my $setID;
 
-	if ($self->{r}{ce}{session_management_via} eq 'key') {
-		my $Key = $self->{r}{db}->getKey($self->{r}->param('user'));
+	if ($self->{c}->ce->{session_management_via} eq 'key') {
+		my $Key = $self->{c}->db->getKey($self->{c}->param('user'));
 		return $Key->set_id;
 	} else {
 		my $setID;
@@ -964,33 +962,20 @@ sub get_session_set_id {
 
 sub write_log_entry {
 	my ($self, $message) = @_;
-	my $r = $self->{r};
-	my $ce = $r->ce;
-
-	my $user_id = defined $self->{user_id} ? $self->{user_id} : "";
-	my $login_type = defined $self->{login_type} ? $self->{login_type} : "";
-	my $credential_source = defined $self->{credential_source} ? $self->{credential_source} : "";
-
-	my ($remote_host, $remote_port);
-
-	my $connection;
-	my $user_agent;
-	eval {$connection = $r->connection};
-	if ($@) {
-		# no connection available
-		$remote_host = "UNKNOWN" unless defined $remote_host;
-		$remote_port = "UNKNOWN" unless defined $remote_port;
-		$user_agent  = "UNKNOWN";
-	} else {
-		$remote_host = $r->useragent_addr->ip_get || "UNKNOWN";
-		$remote_port = $r->connection->client_addr->port   || "UNKNOWN";
+	my $c = $self->{c};
 
-		$user_agent = $r->headers_in->{"User-Agent"};
-	}
-	my $log_msg = "$message user_id=$user_id login_type=$login_type credential_source=$credential_source host=$remote_host port=$remote_port UA=$user_agent";
+	my $user_id           = $self->{user_id}           // '';
+	my $login_type        = $self->{login_type}        // '';
+	my $credential_source = $self->{credential_source} // '';
+
+	my $remote_host = $c->tx->remote_address || 'UNKNOWN';
+	my $remote_port = $c->tx->remote_port    || 'UNKNOWN';
+	my $user_agent  = $c->req->headers->user_agent;
+
+	my $log_msg = "$message user_id=$user_id login_type=$login_type credential_source=$credential_source "
+		. "host=$remote_host port=$remote_port UA=$user_agent";
 	debug("Writing to login log: '$log_msg'.\n");
-	writeCourseLog($ce, "login_log", $log_msg);
+	writeCourseLog($c->ce, 'login_log', $log_msg);
 }
 
 1;
-
diff --git a/lib/WeBWorK/Authen/Basic_TheLastOption.pm b/lib/WeBWorK/Authen/Basic_TheLastOption.pm
index 689a99f6bb..e955e97b5e 100644
--- a/lib/WeBWorK/Authen/Basic_TheLastOption.pm
+++ b/lib/WeBWorK/Authen/Basic_TheLastOption.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -28,6 +28,4 @@ be the last one in the array of the Authen module hashes.
 
 =cut
 
-
-
 1;
diff --git a/lib/WeBWorK/Authen/CAS.pm b/lib/WeBWorK/Authen/CAS.pm
index b4302689fc..76e34aee22 100644
--- a/lib/WeBWorK/Authen/CAS.pm
+++ b/lib/WeBWorK/Authen/CAS.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -27,7 +27,7 @@ use WeBWorK::Debug;
 
 sub checkSetUser {
 	my ($self, $user_id, $new_id) = @_;
-	my $ce = $self->{r}->ce;
+	my $ce = $self->{c}->ce;
 
 	unless (defined $ce->{authen}{cas_options}{sudoers}) {
 		$self->{error} = "Set-user capability is not enabled.";
@@ -44,17 +44,11 @@ sub checkSetUser {
 
 	if (ref $allowed_targets eq 'ARRAY') {
 		foreach my $x (@{$allowed_targets}) {
-			return 1 if $x =~ m/(.*)\*$/
-				? $new_id =~ m/^$1/
-				: $new_id eq $x;
+			return 1 if $x =~ m/(.*)\*$/ ? $new_id =~ m/^$1/ : $new_id eq $x;
 		}
-	}
-	elsif (not ref $allowed_targets) {
-		return 1 if $allowed_targets =~ m/(.*)\*$/
-			? $new_id =~ m/^$1/
-			: $new_id eq $allowed_targets;
-	}
-	else {
+	} elsif (not ref $allowed_targets) {
+		return 1 if $allowed_targets =~ m/(.*)\*$/ ? $new_id =~ m/^$1/ : $new_id eq $allowed_targets;
+	} else {
 		$self->{error} = "Malformed sudoers data structure.";
 		$self->write_log_entry("Malformed sudoers data structure.");
 		return 0;
@@ -67,8 +61,8 @@ sub checkSetUser {
 
 sub get_credentials {
 	my $self = shift;
-	my $r = $self->{r};
-	my $ce = $r->ce;
+	my $c    = $self->{c};
+	my $ce   = $c->ce;
 
 	# Disable password authentication
 	$self->{external_auth} = 1;
@@ -81,32 +75,34 @@ sub get_credentials {
 	# when authenticating javascript web service requests (e.g., the
 	# Library Browser).
 
-	if ($r->{xmlrpc}) {
-		debug("falling back to superclass get_credentials (xmlrpc call)");
+	if ($c->{rpc}) {
+		debug("falling back to superclass get_credentials (rpc call)");
 		return $self->SUPER::get_credentials(@_);
 	}
 
 	# if we come in with a user_id, then we've already authenticated
 	#    through the CAS.  So just check the provided user and session key.
-	if (defined $r->param('key') && defined $r->param('user')) {
+	if (defined $c->param('key') && defined $c->param('user')) {
 		# These lines were copied from the superclass get_credentials.
-		$self->{session_key} = $r->param('key');
-		$self->{user_id} = $r->param('user');
-		$self->{login_type} = 'normal';
+		$self->{session_key}       = $c->param('key');
+		$self->{user_id}           = $c->param('user');
+		$self->{login_type}        = 'normal';
 		$self->{credential_source} = 'params';
-		debug("CAS params user '", $self->{user_id},
-		  "' key '", $self->{session_key}, "'");
+		debug("CAS params user '", $self->{user_id}, "' key '", $self->{session_key}, "'");
 		# Check session key and user here.  Otherwise, a student can
 		#    determine the enrollment status of any other student if
 		#    they know the userid (which is public information at
 		#    Berkeley).  That would be a privacy violation.
-		my $Key = $r->db->getKey($self->{user_id});
+		my $Key = $c->db->getKey($self->{user_id});
 		unless (defined $Key && $Key->key eq $self->{session_key}) {
-			debug('undefined or invalid session key:  $Key->key = ',
-			  defined $Key ? $Key->key : undef, ', user value = ',
-			  $self->{session_key});
+			debug(
+				'undefined or invalid session key:  $Key->key = ',
+				defined $Key ? $Key->key : undef,
+				', user value = ',
+				$self->{session_key}
+			);
 			$self->{error} = "Invalid session key";
-			$r->param('key' => undef);
+			$c->param('key' => undef);
 			return $self->get_credentials();
 		}
 		return 1;
@@ -117,17 +113,16 @@ sub get_credentials {
 		#my $cas_certs = $ce->{authen}{cas_options}{certs};
 		#my $cas = new AuthCAS(casUrl => $cas_url,
 		#    CAFile => $cas_certs);
-		my $cas = new AuthCAS(
-		  %{ $ce->{authen}{cas_options}{AuthCAS_opts} });
+		my $cas = new AuthCAS(%{ $ce->{authen}{cas_options}{AuthCAS_opts} });
 
-		my $service = $r->unparsed_uri();
+		my $service = $c->unparsed_uri();
 		# Remove the "ticket=..." parameter that the CAS server added
 		# (Not sure if the second test is really needed.)
 		$service =~ s/[?&]ticket=[^&]*$//
-		  or $service =~ s/([?&])ticket=[^&]*&/$1/;
-		$service = $ce->{apache_root_url} . $service;
+			or $service =~ s/([?&])ticket=[^&]*&/$1/;
+		$service = $ce->{server_root_url} . $service;
 		debug("service = $service");
-		my $ticket = $r->param('ticket');
+		my $ticket = $c->param('ticket');
 		unless (defined $ticket) {
 			# there's no ticket, so redirect to get one
 			#
@@ -148,18 +143,18 @@ sub get_credentials {
 			return 0;
 		} else {
 			debug("ticket is good, user is $user_id");
-			my $new_id = $r->param('setUser');
+			my $new_id = $c->param('setUser');
 			if (defined $new_id) {
 				return 0
-				  unless checkSetUser($self, $user_id, $new_id);
+					unless checkSetUser($self, $user_id, $new_id);
 				$self->write_log_entry("setUser: user $user_id logged in as $new_id");
 				$user_id = $new_id;
 			}
 			$self->{'user_id'} = $user_id;
-			$self->{r}->param('user', $user_id);
-			$self->{session_key} = undef;
-			$self->{password} = "not\tvalid";
-			$self->{login_type} = 'normal';
+			$self->{c}->param('user', $user_id);
+			$self->{session_key}       = undef;
+			$self->{password}          = "not\tvalid";
+			$self->{login_type}        = 'normal';
 			$self->{credential_source} = 'cas';
 			return 1;
 		}
@@ -170,7 +165,7 @@ sub get_credentials {
 # from checkPassword, which we're replacing.
 
 sub checkPassword {
-	my ( $self, $userID, $clearTextPassword ) = @_;
+	my ($self, $userID, $clearTextPassword) = @_;
 	# if we got here, we know we've already successfully authenticated
 	# against the CAS
 	return 1;
@@ -181,14 +176,13 @@ sub checkPassword {
 sub logout_user {
 	my ($self) = @_;
 
-	my $ce = $self->{r}->ce;
+	my $ce = $self->{c}->ce;
 
 	# Using AuthCAS::getServerLogoutURL($service) would be overkill,
 	# and (more important) it would send us back here after logging out,
 	# so we'd end up back at the CAS login screen.
 
-	my $go_to = $ce->{authen}{cas_options}{AuthCAS_opts}{casUrl}
-	  . '/logout';
+	my $go_to = $ce->{authen}{cas_options}{AuthCAS_opts}{casUrl} . '/logout';
 	debug("logging out.  Redirecting to $go_to");
 	$self->{redirect} = $go_to;
 }
diff --git a/lib/WeBWorK/Authen/Cosign.pm b/lib/WeBWorK/Authen/Cosign.pm
index 15f1162b25..09f7e752a2 100644
--- a/lib/WeBWorK/Authen/Cosign.pm
+++ b/lib/WeBWorK/Authen/Cosign.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -25,7 +25,7 @@ to use: include in localOverrides.conf or course.conf
 and add /webwork2 or /webwork2/courseName as a CosignProtected
 Location
 
-if $r->ce->{cosignoff} is set for a course, authentication reverts
+if $c->ce->{cosignoff} is set for a course, authentication reverts
 to standard WeBWorK authentication.
 
 =cut
@@ -34,23 +34,23 @@ use strict;
 use warnings;
 use WeBWorK::Debug;
 
-# this is similar to the method in the base class, except that cosign 
+# this is similar to the method in the base class, except that cosign
 # ensures that we don't get to the address without a login.  this means
 # that we can't allow guest logins, but don't have to do any password
 # checking or cookie management.
 
 sub get_credentials {
 	my ($self) = @_;
-	my $r = $self->{r};
-	my $ce = $r->ce;
-	my $db = $r->db;
-	
-	if ( $ce->{cosignoff} ) {
-		return $self->SUPER::get_credentials( );
+	my $c      = $self->{c};
+	my $ce     = $c->ce;
+	my $db     = $c->db;
+
+	if ($ce->{cosignoff}) {
+		return $self->SUPER::get_credentials();
 	} else {
-		if ( defined( $ENV{'REMOTE_USER'} ) ) {
+		if (defined($ENV{'REMOTE_USER'})) {
 			$self->{'user_id'} = $ENV{'REMOTE_USER'};
-			$self->{r}->param("user", $ENV{'REMOTE_USER'});
+			$self->{c}->param("user", $ENV{'REMOTE_USER'});
 		} else {
 			return 0;
 		}
@@ -59,23 +59,23 @@ sub get_credentials {
 		#    failure.
 		$self->{external_auth} = 1;
 
-		# the session key isn't used (cosign is managing this 
-		#    for us), and we want to force checking against the 
+		# the session key isn't used (cosign is managing this
+		#    for us), and we want to force checking against the
 		#    site_checkPassword
-		$self->{'session_key'} = undef;
-		$self->{'password'} = 1;
+		$self->{'session_key'}       = undef;
+		$self->{'password'}          = 1;
 		$self->{'credential_source'} = "params";
-		$self->{login_type} = "cosign";
-		
+		$self->{login_type}          = "cosign";
+
 		return 1;
 	}
 }
 
-sub site_checkPassword { 
-	my ( $self, $userID, $clearTextPassword ) = @_;
+sub site_checkPassword {
+	my ($self, $userID, $clearTextPassword) = @_;
 
-	if ( $self->{r}->ce->{cosignoff} ) {
-	    return 0;
+	if ($self->{c}->ce->{cosignoff}) {
+		return 0;
 		#return $self->SUPER::checkPassword( $userID, $clearTextPassword );
 	} else {
 		# this is easy; if we're here at all, we've authenticated
@@ -87,32 +87,35 @@ sub site_checkPassword {
 # disable cookie functionality
 sub maybe_send_cookie {
 	my ($self, @args) = @_;
-	if ( $self->{r}->ce->{cosignoff} ) {
-		return $self->SUPER::maybe_send_cookie( @args );
+	if ($self->{c}->ce->{cosignoff}) {
+		return $self->SUPER::maybe_send_cookie(@args);
 	} else {
 		# nothing to do here
 	}
 }
+
 sub fetchCookie {
 	my ($self, @args) = @_;
-	if ( $self->{r}->ce->{cosignoff} ) {
-		return $self->SUPER::fetchCookie( @args );
+	if ($self->{c}->ce->{cosignoff}) {
+		return $self->SUPER::fetchCookie(@args);
 	} else {
 		# nothing to do here
 	}
 }
+
 sub sendCookie {
 	my ($self, @args) = @_;
-	if ( $self->{r}->ce->{cosignoff} ) {
-		return $self->SUPER::sendCookie( @args);
+	if ($self->{c}->ce->{cosignoff}) {
+		return $self->SUPER::sendCookie(@args);
 	} else {
 		# nothing to do here
 	}
 }
+
 sub killCookie {
 	my ($self, @args) = @_;
-	if ( $self->{r}->ce->{cosignoff} ) {
-		return $self->SUPER::killCookie( @args );
+	if ($self->{c}->ce->{cosignoff}) {
+		return $self->SUPER::killCookie(@args);
 	} else {
 		# nothing to do here
 	}
@@ -120,18 +123,18 @@ sub killCookie {
 
 # this is a bit of a cheat, because it does the redirect away from the
 #   logout script or what have you, but I don't see a way around that.
-sub forget_verification { 
+sub forget_verification {
 	my ($self, @args) = @_;
-	my $r = $self->{r};
+	my $c = $self->{c};
 
-	if ( $r->ce->{cosignoff} ) {
-		return $self->SUPER::forget_verification( @args);
+	if ($c->ce->{cosignoff}) {
+		return $self->SUPER::forget_verification(@args);
 	} else {
 		$self->{was_verified} = 0;
-#		$r->headers_out->{"Location"} = $r->ce->{cosign_logout_script};
-#		$r->send_http_header;
-#		return;
-		$self->{redirect} = $r->ce->{cosign_logout_script};
+		#		$c->headers_out->{"Location"} = $c->ce->{cosign_logout_script};
+		#		$c->send_http_header;
+		#		return;
+		$self->{redirect} = $c->ce->{cosign_logout_script};
 	}
 }
 
diff --git a/lib/WeBWorK/Authen/LDAP.pm b/lib/WeBWorK/Authen/LDAP.pm
index 8ca64d6853..e372876307 100644
--- a/lib/WeBWorK/Authen/LDAP.pm
+++ b/lib/WeBWorK/Authen/LDAP.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -23,75 +23,72 @@ use Net::LDAP qw/LDAP_INVALID_CREDENTIALS/;
 
 sub checkPassword {
 	my ($self, $userID, $possibleClearPassword) = @_;
-	my $ce = $self->{r}->ce;
+	my $ce       = $self->{c}->ce;
 	my $failover = $ce->{authen}{ldap_options}{failover};
-	
+
 	debug("LDAP module is doing the password checking.\n");
-	
+
 	# check against LDAP server
 	my $ret = $self->ldap_authen_uid($userID, $possibleClearPassword);
 	return 1 if ($ret == 1);
 
-    #return 0 if ($userID !~ /admin/);
-	
+	#return 0 if ($userID !~ /admin/);
+
 	# optional: fail over to superclass checkPassword
 	if (($failover eq "all" or $failover eq "1") || ($failover eq "local" and $ret < 0)) {
 		$self->write_log_entry("AUTH LDAP: authentication failed, deferring to superclass");
 		return $self->SUPER::checkPassword($userID, $possibleClearPassword);
 	}
-	
+
 	# fail by default
 	return 0;
 }
 
 sub ldap_authen_uid {
 	my ($self, $uid, $password) = @_;
-	my $ce = $self->{r}->ce;
-	my $hosts = $ce->{authen}{ldap_options}{net_ldap_hosts};
-	my $opts = $ce->{authen}{ldap_options}{net_ldap_opts};
-	my $base = $ce->{authen}{ldap_options}{net_ldap_base};
-        my $searchdn = $ce->{authen}{ldap_options}{searchDN};
-	my $bindAccount = $ce->{authen}{ldap_options}{bindAccount};
-        my $bindpassword = $ce->{authen}{ldap_options}{bindPassword};
+	my $ce           = $self->{c}->ce;
+	my $hosts        = $ce->{authen}{ldap_options}{net_ldap_hosts};
+	my $opts         = $ce->{authen}{ldap_options}{net_ldap_opts};
+	my $base         = $ce->{authen}{ldap_options}{net_ldap_base};
+	my $searchdn     = $ce->{authen}{ldap_options}{searchDN};
+	my $bindAccount  = $ce->{authen}{ldap_options}{bindAccount};
+	my $bindpassword = $ce->{authen}{ldap_options}{bindPassword};
 	# Be backwards-compatible with releases that hardcode this value.
 	my $rdn = "sAMAccountName";
 	if (defined $ce->{authen}{ldap_options}{net_ldap_rdn}) {
 		$rdn = $ce->{authen}{ldap_options}{net_ldap_rdn};
 	}
 
-
-	
 	# connect to LDAP server
 	my $ldap = new Net::LDAP($hosts, @$opts);
 	if (not defined $ldap) {
 		warn "AUTH LDAP: couldn't connect to any of ", join(", ", @$hosts), ".\n";
 		return 0;
 	}
-	
+
 	my $msg;
-	
-	
-	if($bindAccount){
-        # bind with a bind USER
-        	$msg = $ldap->bind( $searchdn, password => $bindpassword );
-        	if ($msg->is_error) {
-                	warn "AUTH LDAP: bind error ", $msg->code, ": ", $msg->error_text, ".\n";
-                	return 0;
+
+	if ($bindAccount) {
+		# bind with a bind USER
+		$msg = $ldap->bind($searchdn, password => $bindpassword);
+		if ($msg->is_error) {
+			warn "AUTH LDAP: bind error ", $msg->code, ": ", $msg->error_text, ".\n";
+			return 0;
 		}
-	}
-	else{
-	# bind anonymously
+	} else {
+		# bind anonymously
 		$msg = $ldap->bind;
 		if ($msg->is_error) {
 			warn "AUTH LDAP: bind error ", $msg->code, ": ", $msg->error_text, ".\n";
 			return 0;
-		}	
+		}
 	}
-	
+
 	# look up user's DN
 	$msg = $ldap->search(base => $base, filter => "$rdn=$uid");
 	if ($msg->is_error) {
-		warn "AUTH LDAP: search error ", $msg->code, ": ", $msg->error_text, ".\n",$searchdn,"\n",$base,"\n",$uid,"\n";
+		warn "AUTH LDAP: search error ", $msg->code, ": ", $msg->error_text, ".\n", $searchdn, "\n", $base, "\n", $uid,
+			"\n";
 		return 0;
 	}
 	if ($msg->count > 1) {
@@ -107,7 +104,7 @@ sub ldap_authen_uid {
 		warn "AUTH LDAP: got null DN when looking up UID '$uid'.\n";
 		return 0;
 	}
-	
+
 	# re-bind as user. if that works, we've authenticated!
 	$msg = $ldap->bind($dn, password => $password);
 	if ($msg->code == LDAP_INVALID_CREDENTIALS) {
@@ -118,7 +115,7 @@ sub ldap_authen_uid {
 		warn "AUTH LDAP: bind error ", $msg->code, ": ", $msg->error_text, ".\n";
 		return 0;
 	}
-	
+
 	# it worked! we win!
 	return 1;
 }
diff --git a/lib/WeBWorK/Authen/LTI/MassUpdate.pm b/lib/WeBWorK/Authen/LTI/MassUpdate.pm
new file mode 100644
index 0000000000..cd4758b296
--- /dev/null
+++ b/lib/WeBWorK/Authen/LTI/MassUpdate.pm
@@ -0,0 +1,71 @@
+###############################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Authen::LTI::MassUpdate;
+use Mojo::Base 'Exporter', -signatures;
+
+=head1 NAME
+
+WeBWorK::Authen::LTI::MassUpdate - Mass update grades to the LMS with LTI authentication
+
+=cut
+
+our @EXPORT_OK = qw(mass_update);
+
+# Perform a mass update of all grades.  This is all user grades for course grade mode and all user set grades for
+# homework grade mode if $manual_update is false.  Otherwise what is updated is determined by a combination of the grade
+# mode and the useriD and setID parameters.  Note that the only required parameter is $c which should be a
+# WeBWorK::Controller object with a valid course environment and database.
+sub mass_update ($c, $manual_update = 0, $userID = undef, $setID = undef) {
+	my $ce = $c->ce;
+	my $db = $c->db;
+
+	# Sanity check.
+	unless (ref($ce)) {
+		warn('course environment is not defined');
+		return;
+	}
+	unless (ref($db)) {
+		warn('database reference is not defined');
+		return;
+	}
+
+	# Only run an automatic update if the time interval has passed.
+	if (!$manual_update) {
+		my $lastUpdate     = $db->getSettingValue('LTILastUpdate') || 0;
+		my $updateInterval = $ce->{LTIMassUpdateInterval} // -1;
+		return unless ($updateInterval != -1 && time - $lastUpdate > $updateInterval);
+		$db->setSettingValue('LTILastUpdate', time);
+	}
+
+	# Send warning if debug_lti_grade_passback is set.
+	if ($ce->{debug_lti_grade_passback}) {
+		if ($setID && $userID && $ce->{LTIGradeMode} eq 'homework') {
+			warn "LTI Mass Update: Queueing grade update for user $userID and set $setID.\n";
+		} elsif ($setID && $ce->{LTIGradeMode} eq 'homework') {
+			warn "LTI Mass Update: Queueing grade update for all users assigned to set $setID.\n";
+		} elsif ($userID) {
+			warn "LTI Mass Update: Queueing grade update of all sets assigned to user $userID.\n";
+		} else {
+			warn "LTI Mass Update: Queueing grade update for all sets and users.\n";
+		}
+	}
+
+	$c->minion->enqueue(lti_mass_update => [ $ce->{courseName}, $userID, $setID ]);
+
+	return;
+}
+
+1;
diff --git a/lib/WeBWorK/Authen/LTIAdvanced.pm b/lib/WeBWorK/Authen/LTIAdvanced.pm
index 10b104698b..3e427d99f5 100644
--- a/lib/WeBWorK/Authen/LTIAdvanced.pm
+++ b/lib/WeBWorK/Authen/LTIAdvanced.pm
@@ -1,6 +1,6 @@
 ###############################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -25,41 +25,38 @@ via the IMS LTI Basic/OAuth protocol.
 
 use strict;
 use warnings;
+
 use Carp;
-use WeBWorK::Debug;
 use DBI;
-use WeBWorK::CGI;
-use WeBWorK::Utils qw(formatDateTime);
-use WeBWorK::Localize;
-use WeBWorK::ContentGenerator::Instructor;
+use Mojo::URL;
 use URI::Escape;
 use Net::OAuth;
 
-$Net::OAuth::PROTOCOL_VERSION = Net::OAuth::PROTOCOL_VERSION_1_0A;
+use WeBWorK::Debug;
+use WeBWorK::Utils qw(formatDateTime);
+use WeBWorK::Localize;
+use WeBWorK::Utils::Instructor qw(assignSetToUser);
+use WeBWorK::Authen::LTIAdvanced::Nonce;
 
-use APR::SockAddr;
-use Apache2::Connection;
-use APR::Request::Error;
+$Net::OAuth::PROTOCOL_VERSION = Net::OAuth::PROTOCOL_VERSION_1_0A;
 
 =head1 CONSTRUCTOR
 
 =over
 
-=item new($r)
+=item new($c)
 
-Instantiates a new WeBWorK::Authen object for the given WeBWorK::Requst ($r).
+Instantiates a new WeBWorK::Authen object for the given WeBWorK::Controller ($c).
 
 =cut
 
 sub new {
-  my ($invocant, $r) = @_;
-  my $class = ref($invocant) || $invocant;
-  my $self = {
-	      r => $r,
-	     };
-  #initialize
-  bless $self, $class;
-  return $self;
+	my ($invocant, $c) = @_;
+	my $class = ref($invocant) || $invocant;
+	my $self  = { c => $c, };
+	#initialize
+	bless $self, $class;
+	return $self;
 }
 
 =back
@@ -84,567 +81,608 @@ sub new {
 # Some LMS's misspell the lis_person_sourcedid parameter name
 # so we use a list of variations when needed.
 our @lis_person_sourcedid_options = (
-	"lis_person_sourcedid", # from spec at https://www.imsglobal.org/specs/ltiv1p1/implementation-guide#toc-3
+	"lis_person_sourcedid",    # from spec at https://www.imsglobal.org/specs/ltiv1p1/implementation-guide#toc-3
 	"lis_person_sourced_id",
 	"lis_person_source_id",
 	"lis_person_sourceid"
 );
 
-sub  request_has_data_for_this_verification_module {
-  debug("LTIAdvanced has been called for data verification");
-  my $self = shift;
-  my $r = $self->{r};
-
-  # See comment in get_credentials()
-  if ($r->{xmlrpc}) {
-    debug("LTIAdvanced returning 1 because it is an xmlrpc call");
-    return 1;
-  }
-
-  # We need at least these things to verify an oauth request
-  if (!(defined $r->param("oauth_consumer_key"))
-      || !(defined $r->param("oauth_signature"))
-      || !(defined $r->param("oauth_nonce"))
-      || !(defined $r->param("oauth_timestamp")) ) {
-    debug("LTIAdvanced returning that it has insufficent data");
-    return(0);
-  } else {
-    debug("LTIAdvanced returning that it has sufficient data");
-    return(1);
-  }
+sub request_has_data_for_this_verification_module {
+	debug("LTIAdvanced has been called for data verification");
+	my $self = shift;
+	my $c    = $self->{c};
+
+	# See comment in get_credentials()
+	if ($c->{rpc}) {
+		debug("LTIAdvanced returning 1 because it is an rpc call");
+		return 1;
+	}
+
+	# This module insists that the course is configured for LTI 1.3.
+	if (!$c->ce->{LTIVersion} || $c->ce->{LTIVersion} ne 'v1p1') {
+		debug('LTIAdvanced returning that it is not configured for this course');
+		return 0;
+	}
+
+	# We need at least these things to verify an oauth request.
+	if (!(defined $c->param("oauth_consumer_key"))
+		|| !(defined $c->param("oauth_signature"))
+		|| !(defined $c->param("oauth_nonce"))
+		|| !(defined $c->param("oauth_timestamp")))
+	{
+		debug("LTIAdvanced returning that it has insufficent data");
+		return (0);
+	} else {
+		debug("LTIAdvanced returning that it has sufficient data");
+		return (1);
+	}
 }
 
 sub get_credentials {
-  my $self = shift;
-  my $r = $self->{r};
-  my $ce = $r->{ce};
-
-  debug("LTIAdvanced::get_credentials has been called\n");
-
-  ## Printing parameters to main page can help people set things up
-  ## so we dont use the debug channel here
-  if ( $ce->{debug_lti_parameters} ) {
-    my $rh_headers = $r->headers_in;  #request headers
-
-    my @parameter_names = $r->param;       # form parameter names
-    my $parameter_report = '';
-    foreach my $key (@parameter_names) {
-      $parameter_report .= "$key => ".$r->param($key). "\n";
-    }
-    warn ("===== parameters received =======\n", $parameter_report);
-  }
-
-  my $oauth_time = $r->param("oauth_timestamp");
-  my $curr_time = time();
-  my $delta_time = $curr_time - $oauth_time;
-  my $delta_min = (0.0 + $delta_time) / (60.0);
-  if ( $ce->{debug_lti_parameters} ) {
-    warn join("\n",
-	"============================",
-	"===== timestamp info =======",
-	"oauth_nonce        = $oauth_time",
-	"WW_server_time     = $curr_time",
-	"diff(server-oauth) = $delta_time seconds ($delta_min minutes)",
-	"============================"
-    );
-  }
-
-  #disable password login
-  $self->{external_auth} = 1;
-
-  # This next part is necessary because some parts of webwork (e.g.,
-  # WebworkWebservice.pm) need to replace the get_credentials() routine,
-  # but only replace the one in the parent class (out of caution,
-  # presumably).	Therefore, we end up here even when authenticating
-  # for WebworkWebservice.pm.  This would cause authentication failures
-  # when authenticating javascript web service requests (e.g., the
-  # Library Browser).
-  # Similar changes are needed in check_user() and verify_normal_user().
-
-  if ($r->{xmlrpc}) {
-    debug("falling back to superclass get_credentials (xmlrpc call)");
-    return $self->SUPER::get_credentials(@_);
-  }
-
-  # Determine the WW user_id to use, if possible
-
-  if ( ! $ce->{preferred_source_of_username} ) {
-    warn "LTI is not properly configured (no preferred_source_of_username). Please contact your instructor or system administrator.";
-    $self->{error} = $r->maketext("There was an error during the login process.  Please speak to your instructor or system administrator.");
-    debug("No preferred_source_of_username in " . $r->ce->{'courseName'} . " so LTIAdvanced::get_credentials is returning a 0\n");
-    return 0;
-  }
-
-  my $user_id_source = "";
-  my $type_of_source = "";
-
-  $self->{email} = ""; # set an initial value to avoid warnings when not provided
-  if ( defined( $r->param("lis_person_contact_email_primary") ) ) {
-	$self->{email} = uri_unescape($r->param("lis_person_contact_email_primary")) // "";
-  }
-
-  if ( $ce->{preferred_source_of_username} eq "lis_person_sourcedid" ) {
-	foreach my $key ( @lis_person_sourcedid_options ) {
-		if ( $r->param($key) ) {
-			$user_id_source = $key;
-			$type_of_source = "preferred_source_of_username";
-			$self->{user_id} = $r->param($key);
-			last;
+	my $self = shift;
+	my $c    = $self->{c};
+	my $ce   = $c->{ce};
+
+	debug("LTIAdvanced::get_credentials has been called\n");
+
+	# This next part is necessary because some parts of webwork (e.g.,
+	# WebworkWebservice.pm) need to replace the get_credentials() routine,
+	# but only replace the one in the parent class (out of caution,
+	# presumably).	Therefore, we end up here even when authenticating
+	# for WebworkWebservice.pm.  This would cause authentication failures
+	# when authenticating javascript web service requests (e.g., the
+	# Library Browser).
+	# Similar changes are needed in check_user() and verify_normal_user().
+	if ($c->{rpc}) {
+		debug("falling back to superclass get_credentials (rpc call)");
+		return $self->SUPER::get_credentials(@_);
+	}
+
+	## Printing parameters to main page can help people set things up
+	## so we dont use the debug channel here
+	if ($ce->{debug_lti_parameters}) {
+		my @parameter_names  = $c->param;    # form parameter names
+		my $parameter_report = '';
+		foreach my $key (@parameter_names) {
+			$parameter_report .= "$key => " . $c->param($key) . "\n";
 		}
+		warn("===== parameters received =======\n", $parameter_report);
+	}
+
+	my $oauth_time = $c->param("oauth_timestamp");
+	my $curr_time  = time();
+	my $delta_time = $curr_time - $oauth_time;
+	my $delta_min  = (0.0 + $delta_time) / (60.0);
+	if ($ce->{debug_lti_parameters}) {
+		warn join("\n",
+			"============================",
+			"===== timestamp info =======",
+			"oauth_nonce        = $oauth_time",
+			"WW_server_time     = $curr_time",
+			"diff(server-oauth) = $delta_time seconds ($delta_min minutes)",
+			"============================\n");
+	}
+
+	#disable password login
+	$self->{external_auth} = 1;
+
+	# Determine the WW user_id to use, if possible
+
+	if (!$ce->{LTI}{v1p1}{preferred_source_of_username}) {
+		warn
+			"LTI is not properly configured (no preferred_source_of_username). Please contact your instructor or system administrator.";
+		$self->{error} = $c->maketext(
+			"There was an error during the login process.  Please speak to your instructor or system administrator.");
+		debug("No preferred_source_of_username in "
+				. $c->ce->{'courseName'}
+				. " so LTIAdvanced::get_credentials is returning a 0\n");
+		return 0;
 	}
-  } elsif ( $ce->{preferred_source_of_username} eq "lis_person_contact_email_primary"
-	&& $self->{email} ne "" ) {
-	$user_id_source = "lis_person_contact_email_primary";
-	$type_of_source = "preferred_source_of_username";
-	$self->{user_id} = $self->{email};
-
-	# Strip off the part of the address after @ if requested to do so:
-	$self->{user_id} =~ s/@.*$// if $ce->{strip_address_from_email};
-  } elsif ( $r->param($ce->{preferred_source_of_username}) ) {
-	$user_id_source = $ce->{preferred_source_of_username};
-	$type_of_source = "preferred_source_of_username";
-	$self->{user_id} = $r->param($ce->{preferred_source_of_username});
-  }
-
-  # Fallback if necessary
-  if ( !defined( $self->{user_id} ) && $ce->{fallback_source_of_username} ) {
-	if ( $ce->{fallback_source_of_username} eq "lis_person_sourcedid" ) {
-		foreach my $key ( @lis_person_sourcedid_options ) {
-			if ( $r->param($key) ) {
-				$user_id_source = $key;
-				$type_of_source = "fallback_source_of_username";
-				$self->{user_id} = $r->param($key);
+
+	my $user_id_source = "";
+	my $type_of_source = "";
+
+	$self->{email} = "";    # set an initial value to avoid warnings when not provided
+	if (defined($c->param("lis_person_contact_email_primary"))) {
+		$self->{email} = uri_unescape($c->param("lis_person_contact_email_primary")) // "";
+	}
+
+	if ($ce->{LTI}{v1p1}{preferred_source_of_username} eq "lis_person_sourcedid") {
+		foreach my $key (@lis_person_sourcedid_options) {
+			if ($c->param($key)) {
+				$user_id_source  = $key;
+				$type_of_source  = "preferred_source_of_username";
+				$self->{user_id} = $c->param($key);
 				last;
 			}
 		}
-	} elsif ( $ce->{fallback_source_of_username} eq "lis_person_contact_email_primary"
-		&& $self->{email} ne "" ) {
-		$user_id_source = "lis_person_contact_email_primary";
-		$type_of_source = "fallback_source_of_username";
+	} elsif ($ce->{LTI}{v1p1}{preferred_source_of_username} eq "lis_person_contact_email_primary"
+		&& $self->{email} ne "")
+	{
+		$user_id_source  = "lis_person_contact_email_primary";
+		$type_of_source  = "preferred_source_of_username";
 		$self->{user_id} = $self->{email};
 
 		# Strip off the part of the address after @ if requested to do so:
-		$self->{user_id} =~ s/@.*$// if $ce->{strip_address_from_email};
-	} elsif ( $r->param($ce->{fallback_source_of_username}) ) {
-		$user_id_source = $ce->{fallback_source_of_username};
-		$type_of_source = "fallback_source_of_username";
-		$self->{user_id} = $r->param($ce->{fallback_source_of_username});
-	}
-  }
-
-  # if we were able to set a user_id
-  if ( defined($self->{user_id}) && $self->{user_id} ne "" ) {
-	# Make user_id lowercase for consistency in naming if configured.
-	$self->{user_id} = lc($self->{user_id}) if ($ce->{lti_lowercase_username});
-
-      map {$self->{$_->[0]} = $r->param($_->[1]);}
-	(
-	 ['role', 'roles'],
-	 ['last_name' , 'lis_person_name_family'],
-	 ['first_name', 'lis_person_name_given'],
-	 ['context_id', 'context_id'],
-	 ['oauth_consumer_key', 'oauth_consumer_key'],
-	 ['oauth_signature', 'oauth_signature'],
-	 ['oauth_nonce', 'oauth_nonce'],
-	 ['oauth_timestamp', 'oauth_timestamp'],
-	 ['section', 'custom_section'],
-	 ['recitation', 'custom_recitation'],
-	);
-
-      if (defined($ce->{preferred_source_of_student_id})
-	&& defined($r->param($ce->{preferred_source_of_student_id}))) {
-	$self->{student_id} = $r->param($ce->{preferred_source_of_student_id});
-      } else {
-	$self->{student_id} = ""; # fall back to avoid a warning when debug_lti_parameters enabled
-      }
-
-      # For setting up its helpful to print out what the system think the
-      # User id and address is at this point
-      if ( $ce->{debug_lti_parameters} ) {
-	warn "=========== summary ============";
-	warn "User id is |$self->{user_id}| (obtained from $user_id_source which was $type_of_source)\n";
-	warn "User mail address is |$self->{email}|\n";
-	warn "strip_address_from_email is |", $ce->{strip_address_from_email}//0,"|\n";
-	warn "Student id is |$self->{student_id}|\n";
-	warn "preferred_source_of_username is |$ce->{preferred_source_of_username}|\n";
-	warn "fallback_source_of_username is |", $ce->{fallback_source_of_username}//'undefined',"|\n";
-	warn "preferred_source_of_student_id is |", $ce->{preferred_source_of_student_id}//'undefined',"|\n";
-	warn "================================\n";
-      }
-      if (!defined($self->{user_id})) {
-	croak "LTIAdvanced was unable to create a username from the data provided with the current settings. Set \$debug_lti_parameters=1 in authen_LTI.conf to debug";
-      }
-
-      $self->{login_type} = "normal";
-      $self->{credential_source} = "LTIAdvanced";
-      debug("LTIAdvanced::get_credentials is returning a 1\n");
-      return 1;
-    }
-  warn "LTI is not properly configured (failed to set user_id from preferred_source_of_username or fallback_source_of_username). Please contact your instructor or system administrator.";
-  $self->{error} = $r->maketext("There was an error during the login process.  Please speak to your instructor or system administrator.");
-  debug("LTIAdvanced::get_credentials is returning a 0\n");
-  return 0;
+		$self->{user_id} =~ s/@.*$// if $ce->{LTI}{v1p1}{strip_domain_from_email};
+	} elsif ($c->param($ce->{LTI}{v1p1}{preferred_source_of_username})) {
+		$user_id_source  = $ce->{LTI}{v1p1}{preferred_source_of_username};
+		$type_of_source  = "preferred_source_of_username";
+		$self->{user_id} = $c->param($ce->{LTI}{v1p1}{preferred_source_of_username});
+	}
+
+	# Fallback if necessary
+	if (!defined($self->{user_id}) && $ce->{LTI}{v1p1}{fallback_source_of_username}) {
+		if ($ce->{LTI}{v1p1}{fallback_source_of_username} eq "lis_person_sourcedid") {
+			foreach my $key (@lis_person_sourcedid_options) {
+				if ($c->param($key)) {
+					$user_id_source  = $key;
+					$type_of_source  = "fallback_source_of_username";
+					$self->{user_id} = $c->param($key);
+					last;
+				}
+			}
+		} elsif ($ce->{LTI}{v1p1}{fallback_source_of_username} eq "lis_person_contact_email_primary"
+			&& $self->{email} ne "")
+		{
+			$user_id_source  = "lis_person_contact_email_primary";
+			$type_of_source  = "fallback_source_of_username";
+			$self->{user_id} = $self->{email};
+
+			# Strip off the part of the address after @ if requested to do so:
+			$self->{user_id} =~ s/@.*$// if $ce->{LTI}{v1p1}{strip_domain_from_email};
+		} elsif ($c->param($ce->{LTI}{v1p1}{fallback_source_of_username})) {
+			$user_id_source  = $ce->{LTI}{v1p1}{fallback_source_of_username};
+			$type_of_source  = "fallback_source_of_username";
+			$self->{user_id} = $c->param($ce->{LTI}{v1p1}{fallback_source_of_username});
+		}
+	}
+
+	# if we were able to set a user_id
+	if (defined($self->{user_id}) && $self->{user_id} ne "") {
+		# Make user_id lowercase for consistency in naming if configured.
+		$self->{user_id} = lc($self->{user_id}) if ($ce->{LTI}{v1p1}{lowercase_username});
+
+		map { $self->{ $_->[0] } = $c->param($_->[1]); } (
+			[ 'role',               'roles' ],
+			[ 'last_name',          'lis_person_name_family' ],
+			[ 'first_name',         'lis_person_name_given' ],
+			[ 'context_id',         'context_id' ],
+			[ 'oauth_consumer_key', 'oauth_consumer_key' ],
+			[ 'oauth_signature',    'oauth_signature' ],
+			[ 'oauth_nonce',        'oauth_nonce' ],
+			[ 'oauth_timestamp',    'oauth_timestamp' ],
+			[ 'section',            'custom_section' ],
+			[ 'recitation',         'custom_recitation' ],
+		);
+
+		if (defined($ce->{LTI}{v1p1}{preferred_source_of_student_id})
+			&& defined($c->param($ce->{preferred_source_of_student_id})))
+		{
+			$self->{student_id} = $c->param($ce->{LTI}{v1p1}{preferred_source_of_student_id});
+		} else {
+			$self->{student_id} = "";    # fall back to avoid a warning when debug_lti_parameters enabled
+		}
+
+		# For setting up its helpful to print out what the system think the
+		# User id and address is at this point
+		if ($ce->{debug_lti_parameters}) {
+			warn "=========== summary ============\n";
+			warn "User id is |$self->{user_id}| (obtained from $user_id_source which was $type_of_source)\n";
+			warn "User mail address is |$self->{email}|\n";
+			warn "strip_domain_from_email is |", $ce->{LTI}{v1p1}{strip_domain_from_email} // 0, "|\n";
+			warn "Student id is |$self->{student_id}|\n";
+			warn "preferred_source_of_username is |$ce->{LTI}{v1p1}{preferred_source_of_username}|\n";
+			warn "fallback_source_of_username is |", $ce->{LTI}{v1p1}{fallback_source_of_username} // 'undefined',
+				"|\n";
+			warn "preferred_source_of_student_id is |",
+				$ce->{LTI}{v1p1}{preferred_source_of_student_id} // 'undefined', "|\n";
+			warn "================================\n";
+		}
+		if (!defined($self->{user_id})) {
+			croak
+				"LTIAdvanced was unable to create a username from the data provided with the current settings. Set \$debug_lti_parameters=1 in authen_LTI.conf to debug";
+		}
+
+		$self->{login_type}        = "normal";
+		$self->{credential_source} = "LTIAdvanced";
+		debug("LTIAdvanced::get_credentials is returning a 1\n");
+		return 1;
+	}
+	warn
+		"LTI is not properly configured (failed to set user_id from preferred_source_of_username or fallback_source_of_username). Please contact your instructor or system administrator.";
+	$self->{error} = $c->maketext(
+		"There was an error during the login process.  Please speak to your instructor or system administrator.");
+	debug("LTIAdvanced::get_credentials is returning a 0\n");
+	return 0;
 }
 
 # minor modification of method in superclass
 sub check_user {
-  my $self = shift;
-  my $r = $self->{r};
-  my ($ce, $db, $authz) = map {$r->$_ ;} ('ce', 'db', 'authz');
-
-  my $user_id = $self->{user_id};
-
-  debug("LTIAdvanced::check_user has been called for user_id = |$user_id|");
-
-  # See comment in get_credentials()
-  if ($r->{xmlrpc}) {
-    #debug("falling back to superclass check_user (xmlrpc call)");
-    return $self->SUPER::check_user(@_);
-  }
-
-  if (!defined($user_id) || (defined $user_id && $user_id eq "")) {
-    $self->{log_error} .= "no user id specified";
-    $self->{error} = $r->maketext("There was an error during the login process.  Please speak to your instructor or system administrator.");
-    return 0;
-  }
-
-  my $User = $db->getUser($user_id);
-
-  if (!$User) {
-    my %options;
-    $options{$ce->{preferred_source_of_username}} = 1 if ($ce->{preferred_source_of_username});
-    $options{$ce->{fallback_source_of_username}}  = 1 if ($ce->{fallback_source_of_username});
-
-    # May need to add alternate "spellings" for lis_person_sourcedid
-    my $use_lis_person_sourcedid_options = 0;
-    if ( defined($ce->{preferred_source_of_username})
-	&& $ce->{preferred_source_of_username} eq "lis_person_sourcedid" ) {
-	$use_lis_person_sourcedid_options = 1;
-    } elsif ( defined($ce->{fallback_source_of_username})
-	&& $ce->{fallback_source_of_username} eq "lis_person_sourcedid" ) {
-	$use_lis_person_sourcedid_options = 1;
-    }
-
-    foreach my $key ( keys( %options ), ( $use_lis_person_sourcedid_options ? @lis_person_sourcedid_options : () ) ) {
-	if ( defined($r->param($key)) ) {
-		debug("User |$user_id| is unknown but may be an new user from an LSM via LTI. Saw a value for $key About to return a 1");
-		return 1;  #This may be a new user coming in from a LMS via LTI.
-	}
-    }
-
-    $self->{log_error} .= " $user_id - user unknown";
-    $self->{error} = $r->maketext("There was an error during the login process.  Please speak to your instructor or system administrator.");
-    return 0;
-  }
-
-  unless ($ce->status_abbrev_has_behavior($User->status, "allow_course_access")) {
-    $self->{log_error} .= "LOGIN FAILED $user_id - course access denied";
-    $self->{error} = $r->maketext("Authentication failed.  Please speak to your instructor.");
-    return 0;
-  }
-
-  unless ($authz->hasPermissions($user_id, "login")) {
-    $self->{log_error} .= "LOGIN FAILED $user_id - no permission to login";
-    $self->{error} = $r->maketext("Authentication failed.  Please speak to your instructor.");
-    return 0;
-  }
-
-  debug("LTIAdvanced::check_user is about to return a 1.");
-  return 1;
+	my $self = shift;
+	my $c    = $self->{c};
+	my ($ce, $db, $authz) = map { $c->$_; } ('ce', 'db', 'authz');
+
+	my $user_id = $self->{user_id};
+
+	debug("LTIAdvanced::check_user has been called for user_id = |$user_id|");
+
+	# See comment in get_credentials()
+	if ($c->{rpc}) {
+		#debug("falling back to superclass check_user (rpc call)");
+		return $self->SUPER::check_user(@_);
+	}
+
+	if (!defined($user_id) || (defined $user_id && $user_id eq "")) {
+		$self->{log_error} .= "no user id specified";
+		$self->{error} = $c->maketext(
+			"There was an error during the login process.  Please speak to your instructor or system administrator.");
+		return 0;
+	}
+
+	my $User = $db->getUser($user_id);
+
+	if (!$User) {
+		my %options;
+		$options{ $ce->{LTI}{v1p1}{preferred_source_of_username} } = 1
+			if ($ce->{LTI}{v1p1}{preferred_source_of_username});
+		$options{ $ce->{LTI}{v1p1}{fallback_source_of_username} } = 1
+			if ($ce->{LTI}{v1p1}{fallback_source_of_username});
+
+		# May need to add alternate "spellings" for lis_person_sourcedid
+		my $use_lis_person_sourcedid_options = 0;
+		if (defined($ce->{LTI}{v1p1}{preferred_source_of_username})
+			&& $ce->{LTI}{v1p1}{preferred_source_of_username} eq "lis_person_sourcedid")
+		{
+			$use_lis_person_sourcedid_options = 1;
+		} elsif (defined($ce->{LTI}{v1p1}{fallback_source_of_username})
+			&& $ce->{LTI}{v1p1}{fallback_source_of_username} eq "lis_person_sourcedid")
+		{
+			$use_lis_person_sourcedid_options = 1;
+		}
+
+		foreach my $key (keys(%options), ($use_lis_person_sourcedid_options ? @lis_person_sourcedid_options : ())) {
+			if (defined($c->param($key))) {
+				debug(
+					"User |$user_id| is unknown but may be an new user from an LSM via LTI. Saw a value for $key About to return a 1"
+				);
+				return 1;    #This may be a new user coming in from a LMS via LTI.
+			}
+		}
+
+		$self->{log_error} .= " $user_id - user unknown";
+		$self->{error} = $c->maketext(
+			"There was an error during the login process.  Please speak to your instructor or system administrator.");
+		return 0;
+	}
+
+	unless ($ce->status_abbrev_has_behavior($User->status, "allow_course_access")) {
+		$self->{log_error} .= "LOGIN FAILED $user_id - course access denied";
+		$self->{error} = $c->maketext("Authentication failed.  Please speak to your instructor.");
+		return 0;
+	}
+
+	unless ($authz->hasPermissions($user_id, "login")) {
+		$self->{log_error} .= "LOGIN FAILED $user_id - no permission to login";
+		$self->{error} = $c->maketext("Authentication failed.  Please speak to your instructor.");
+		return 0;
+	}
+
+	debug("LTIAdvanced::check_user is about to return a 1.");
+	return 1;
 }
 
 # disable practice users
-sub verify_practice_user { return(0) ;}
+sub verify_practice_user { return (0); }
 
 sub verify_normal_user {
-  my $self = shift;
-  my ($r, $user_id, $session_key)
-    = map {$self->{$_};} ('r', 'user_id', 'session_key');
+	my $self = shift;
+	my ($c, $user_id, $session_key) = map { $self->{$_}; } ('c', 'user_id', 'session_key');
 
-  debug("LTIAdvanced::verify_normal_user called for user |$user_id|");
+	debug("LTIAdvanced::verify_normal_user called for user |$user_id|");
 
-  # See comment in get_credentials()
-  if ($r->{xmlrpc}) {
-    #debug("falling back to superclass verify_normal_user (xmlrpc call)");
-    return $self->SUPER::verify_normal_user(@_);
-  }
+	# See comment in get_credentials()
+	if ($c->{rpc}) {
+		#debug("falling back to superclass verify_normal_user (rpc call)");
+		return $self->SUPER::verify_normal_user(@_);
+	}
 
-  # Call check_session in order to destroy any existing session cookies and Key table sessions
-  my ($sessionExists, $keyMatches, $timestampValid) = $self->check_session($user_id, $session_key, 0);
+	# Call check_session in order to destroy any existing session cookies and Key table sessions
+	my ($sessionExists, $keyMatches, $timestampValid) = $self->check_session($user_id, $session_key, 0);
 
-  debug("sessionExists='", $sessionExists, "' keyMatches='", $keyMatches, "' timestampValid='", $timestampValid, "'");
+	debug("sessionExists='", $sessionExists, "' keyMatches='", $keyMatches, "' timestampValid='", $timestampValid, "'");
 
-  my $auth_result = $self->authenticate;
+	my $auth_result = $self->authenticate;
 
-  debug("auth_result=|${auth_result}|");
+	debug("auth_result=|${auth_result}|");
 
-  # Parameters CANNOT be modified until after LTIAdvanced authentication
-  # has been done, because the parameters passed with the request
-  # are used in computing the OAuth_signature.  If there
-  # are any changes in $r->{paramcache} (see Request.pm)
-  # before authentication occurs, then authentication will FAIL
-  # even if the consumer_secret is correct.
+	# Parameters CANNOT be modified until after LTIAdvanced authentication
+	# has been done, because the parameters passed with the request
+	# are used in computing the OAuth_signature.  If there
+	# are any changes in $c->{paramcache} (see Controller.pm)
+	# before authentication occurs, then authentication will FAIL
+	# even if the consumer_secret is correct.
 
-  $r->param("user" => $user_id);
+	$c->param("user" => $user_id);
 
-  if ($auth_result eq "1") {
-      $self->{session_key} = $self->create_session($user_id);
-      debug("session_key=|" . $self->{session_key} . "|.");
-      return 1;
-    } else {
-      $self->{error} = $auth_result;
-      $self-> {log_error} .= "$user_id - authentication failed: ". $self->{error};
-      return 0;
-    }
+	if ($auth_result eq "1") {
+		$self->{session_key} = $self->create_session($user_id);
+		debug("session_key=|" . $self->{session_key} . "|.");
+		return 1;
+	} else {
+		$self->{error} = $auth_result;
+		$self->{log_error} .= "$user_id - authentication failed: " . $self->{error};
+		return 0;
+	}
 }
 
 sub authenticate {
-  my $self = shift;
-  my ($r, $user ) = map {$self->{$_};} ('r', 'user_id');
-
-  # See comment in get_credentials()
-  if ($r->{xmlrpc}) {
-    #debug("falling back to superclass authenticate (xmlrpc call)");
-    return $self->SUPER::authenticate(@_);
-  }
-
-  debug("LTIAdvanced::authenticate called for user |$user|");
-  debug "ref(r) = |". ref($r) . "|";
-  debug "ref of r->{paramcache} = |" . ref($r->{paramcache}) . "|";
-
-  my $ce = $r->ce;
-  my $db = $r->db;
-  my $courseName = $r->ce->{'courseName'};
-
-  # Check nonce to see whether request is legitimate
-  debug("Nonce = |" . $self-> {oauth_nonce} . "|");
-  my $nonce = WeBWorK::Authen::LTIAdvanced::Nonce->new($r, $self->{oauth_nonce}, $self->{oauth_timestamp});
-  if (!($nonce->ok ) ) {
-    $self->{error} .=  $r->maketext("There was an error during the login process.  Please speak to your instructor or system administrator if this recurs.");
-    debug("Failed to verify nonce");
-    return 0;
-  }
-
-  debug( "r->param(oauth_signature) = |" . $r->param("oauth_signature") . "|");
-  my %request_hash;
-  my @keys = keys %{$r-> {paramcache}};
-  foreach my $key (@keys) {
-    $request_hash{$key} =  $r->param($key);
-    debug("$key->|" . $request_hash{$key} . "|");
-  }
-  my $requestHash = \%request_hash;
-
-  # We need to provide the request URL when verifying the OAuth request.
-  # We use the url request by default, but also allow it to be overriden
-  my $path = $ce->{server_root_url}.$ce->{webwork_url};
-  $path = $ce->{LTIBasicToThisSiteURL} ?
-    $ce->{LTIBasicToThisSiteURL} : $path;
-
-  # append the path the the server url
-  $path = $path.$r->urlpath()->path;
-
-  if ( $ce->{debug_lti_parameters} ) {
-      warn("The following path was reconstructed by WeBWorK.  It should match the path in the LMS:");
-      warn($path);
-  }
-
-  # We also try a version without the trailing / in case that was not
-  # included when the LMS user created the LMS link
-  my $altpath = $path;
-  $altpath =~ s/\/$//;
-
-  my ($request, $altrequest);
-  eval {
-    $request = Net::OAuth->request("request token")->from_hash($requestHash,
-	       request_url => $path,
-	       request_method => "POST",
-	       consumer_secret => $ce->{LTIBasicConsumerSecret},
-							      );
-
-    $altrequest = Net::OAuth->request("request token")->from_hash($requestHash,
-		  request_url => $altpath,
-		  request_method => "POST",
-		  consumer_secret => $ce->{LTIBasicConsumerSecret},
-								 );
-  };
-
-  if ($@) {
-      debug("construction of Net::OAuth object failed: $@");
-      debug( "eval failed: ", $@, "<br /><br />");
-
-      $self->{error} .= $r->maketext("There was an error during the login process.  Please speak to your instructor or system administrator.");
-      $self->{log_error} .= "Construction of OAuth request record failed";
-      return 0;
-  }
-
-  if (! $request->verify && ! $altrequest->verify) {
-      debug("LTIAdvanced::authenticate request-> verify failed");
-      debug("OAuth verification Failed ");
-
-      $self->{error} .= $r->maketext("There was an error during the login process.  Please speak to your instructor or system administrator.");
-      $self->{log_error} .= "OAuth verification failed.  Check the Consumer Secret and that the URL in the LMS exactly matches the WeBWorK URL.";
-      if ( $ce->{debug_lti_parameters} ) {
-	warn("OAuth verification failed.  Check the Consumer Secret and that the URL in the LMS exactly matches the WeBWorK URL as defined in site.conf. E.G. Check that if you have https in the LMS url then you have https in \$server_root_url in site.conf");
-      }
-      return 0;
-  } else {
-      debug("OAuth verification SUCCEEDED !!");
-
-      my $userID = $self->{user_id};
-
-	# Indentation of the internal blocks below was modified to follow
-	# the WW coding standard; however, the leading indentation of the
-	# if/elsif/closing '}' was kept as in the original code for now.
-	# Thus the apparenly overlarge indentation below.
-      if (! $db->existsUser($userID) ) { # New User. Create User record
-		if ( $ce->{block_lti_create_user} ) {
-			# We don't yet have the next string in the PO/POT files - so the next line is disabled.
-			# $r->maketext("Account creation is currently disabled in this course.  Please speak to your instructor or system administrator.");
-			$self->{log_error} .= "Account creation blocked by block_lti_create_user setting. Did not create user $userID.";
-			if ( $ce->{debug_lti_parameters} ) {
-				warn("Account creation is currently disabled in this course.  Please speak to your instructor or system administrator.");
-			}
-			return 0;
-		} else {
-			# Attempt to create the user, and warn if that fails.
-			unless ($self->create_user()) {
-				$r->maketext("There was an error during the login process.  Please speak to your instructor or system administrator.");
-				$self->{log_error} .= "Failed to create user $userID.";
-				if ( $ce->{debug_lti_parameters} ) {
-					warn("Failed to create user $userID.");
+	my $self = shift;
+	my ($c, $user) = map { $self->{$_}; } ('c', 'user_id');
+
+	# See comment in get_credentials()
+	if ($c->{rpc}) {
+		#debug("falling back to superclass authenticate (rpc call)");
+		return $self->SUPER::authenticate(@_);
+	}
+
+	debug("LTIAdvanced::authenticate called for user |$user|");
+	debug "ref(c) = |" . ref($c) . "|";
+	debug "ref of c->{paramcache} = |" . ref($c->{paramcache}) . "|";
+
+	my $ce         = $c->ce;
+	my $db         = $c->db;
+	my $courseName = $c->ce->{'courseName'};
+
+	# Check nonce to see whether request is legitimate
+	debug("Nonce = |" . $self->{oauth_nonce} . "|");
+	my $nonce = WeBWorK::Authen::LTIAdvanced::Nonce->new($c, $self->{oauth_nonce}, $self->{oauth_timestamp});
+	if (!($nonce->ok)) {
+		$self->{error} .= $c->maketext(
+			"There was an error during the login process.  Please speak to your instructor or system administrator if this recurs."
+		);
+		debug("Failed to verify nonce");
+		return 0;
+	}
+
+	debug("c->param(oauth_signature) = |" . $c->param("oauth_signature") . "|");
+	my %request_hash;
+	my @keys = keys %{ $c->{paramcache} };
+	foreach my $key (@keys) {
+		$request_hash{$key} = $c->param($key);
+		debug("$key->|" . $request_hash{$key} . "|");
+	}
+	my $requestHash = \%request_hash;
+
+	# We need to provide the request URL when verifying the OAuth request.
+	# We use the url request by default, but also allow it to be overridden
+	my $url = $c->url_for->to_abs;
+	if ($ce->{LTI}{v1p1}{OverrideSiteProtocolDomain}) {
+		my $override = Mojo::URL->new($ce->{LTI}{v1p1}{OverrideSiteProtocolDomain});
+		$url->scheme($override->scheme);
+		$url->host($override->host);
+	}
+	my $path = $ce->{LTI}{v1p1}{OverrideSiteURL} || ($url =~ s|/?$|/|r);
+
+	if ($ce->{debug_lti_parameters}) {
+		warn "The following path was reconstructed by WeBWorK.  It should match the path in the LMS:\n";
+		warn "$path\n";
+	}
+
+	# We also try a version without the trailing / in case that was not
+	# included when the LMS user created the LMS link
+	my $altpath = $path;
+	$altpath =~ s/\/$//;
+
+	my ($request, $altrequest);
+	eval {
+		$request = Net::OAuth->request("request token")->from_hash(
+			$requestHash,
+			request_url     => $path,
+			request_method  => "POST",
+			consumer_secret => $ce->{LTI}{v1p1}{BasicConsumerSecret},
+		);
+
+		$altrequest = Net::OAuth->request("request token")->from_hash(
+			$requestHash,
+			request_url     => $altpath,
+			request_method  => "POST",
+			consumer_secret => $ce->{LTI}{v1p1}{BasicConsumerSecret},
+		);
+	};
+
+	if ($@) {
+		debug("construction of Net::OAuth object failed: $@");
+		debug("eval failed: ", $@, "<br /><br />");
+
+		$self->{error} .= $c->maketext(
+			"There was an error during the login process.  Please speak to your instructor or system administrator.");
+		$self->{log_error} .= "Construction of OAuth request record failed";
+		return 0;
+	}
+
+	if (!$request->verify && !$altrequest->verify) {
+		debug("LTIAdvanced::authenticate request-> verify failed");
+		debug("OAuth verification Failed ");
+
+		$self->{error} .= $c->maketext(
+			"There was an error during the login process.  Please speak to your instructor or system administrator.");
+		$self->{log_error} .=
+			"OAuth verification failed.  Check the Consumer Secret and that the URL in the LMS exactly matches the WeBWorK URL.";
+		if ($ce->{debug_lti_parameters}) {
+			warn(
+				"OAuth verification failed.  Check the Consumer Secret and that the URL in the LMS exactly matches the WeBWorK URL as defined in site.conf. E.G. Check that if you have https in the LMS url then you have https in \$server_root_url in site.conf"
+			);
+		}
+		return 0;
+	} else {
+		debug("OAuth verification SUCCEEDED !!");
+
+		my $userID = $self->{user_id};
+
+		# Indentation of the internal blocks below was modified to follow
+		# the WW coding standard; however, the leading indentation of the
+		# if/elsif/closing '}' was kept as in the original code for now.
+		# Thus the apparenly overlarge indentation below.
+		if (!$db->existsUser($userID)) {    # New User. Create User record
+			if ($ce->{block_lti_create_user}) {
+# We don't yet have the next string in the PO/POT files - so the next line is disabled.
+# $c->maketext("Account creation is currently disabled in this course.  Please speak to your instructor or system administrator.");
+				$self->{log_error} .=
+					"Account creation blocked by block_lti_create_user setting. Did not create user $userID.";
+				if ($ce->{debug_lti_parameters}) {
+					warn(
+						"Account creation is currently disabled in this course.  Please speak to your instructor or system administrator."
+					);
 				}
+				return 0;
+			} else {
+				# Attempt to create the user, and warn if that fails.
+				unless ($self->create_user()) {
+					$c->maketext(
+						"There was an error during the login process.  Please speak to your instructor or system administrator."
+					);
+					$self->{log_error} .= "Failed to create user $userID.";
+					if ($ce->{debug_lti_parameters}) {
+						warn("Failed to create user $userID.");
+					}
+				}
+			}
+		} elsif ($ce->{LMSManageUserData}) {
+			$self->{initial_login} = 1
+				; # Set here so login gets logged, even for accounts which maybe_update_user() would not modify or when it fails to update
+				  # Existing user. Possibly modify demographic information and permission level.
+			unless ($self->maybe_update_user()) {
+ # Do not fail the login if data update failed
+ # FIXME - In the future we would like the message below (and other warn messages in this file) to be sent via maketext.
+				warn(
+					"The system failed to update some of your account information. Please speak to your instructor or system administrator."
+				);
 			}
+		} else {
+			# Set here so login gets logged when $ce->{LMSManageUserData} is false
+			$self->{initial_login} = 1;
 		}
-      }  elsif ($ce->{LMSManageUserData}) {
-		$self->{initial_login} = 1; # Set here so login gets logged, even for accounts which maybe_update_user() would not modify or when it fails to update
-		# Existing user. Possibly modify demographic information and permission level.
-		unless ( $self->maybe_update_user() ) {
-			# Do not fail the login if data update failed
-			# FIXME - In the future we would like the message below (and other warn messages in this file) to be sent via maketext.
-			warn("The system failed to update some of your account information. Please speak to your instructor or system administrator.");
+
+		# If we are using grade passback then make sure the data
+		# we need to submit the grade is kept up to date.
+		my $LTIGradeMode = $ce->{LTIGradeMode} // '';
+		if ($LTIGradeMode eq 'course'
+			|| $LTIGradeMode eq 'homework')
+		{
+			my $submitGrade = WeBWorK::Authen::LTIAdvanced::SubmitGrade->new($c);
+			$submitGrade->update_sourcedid($userID);
 		}
-      } else {
-	$self->{initial_login} = 1; # Set here so login gets logged when $ce->{LMSManageUserData} is false
-      }
-
-      # If we are using grade passback then make sure the data
-      # we need to submit the grade is kept up to date.
-      my $LTIGradeMode = $ce->{LTIGradeMode} // '';
-      if ($LTIGradeMode eq 'course' ||
-	  $LTIGradeMode eq 'homework') {
-	my $submitGrade = WeBWorK::Authen::LTIAdvanced::SubmitGrade->new($r);
-	$submitGrade->update_sourcedid($userID);
-      }
-
-      return 1;
-  }
-
-  debug("LTIAdvanced is returning a failed authentication");
-  $self->{error} = $r->maketext("There was an error during the login process.  Please speak to your instructor or system administrator.");
-  return(0);
+
+		return 1;
+	}
+
+	debug("LTIAdvanced is returning a failed authentication");
+	$self->{error} = $c->maketext(
+		"There was an error during the login process.  Please speak to your instructor or system administrator.");
+	return (0);
 }
 
 # create a new user trying to log in
 sub create_user {
-  my $self = shift;
-  my $r = $self->{r};
-  my $userID = $self->{user_id};
-  my $ce = $r->ce;
-  my $db = $r->db;
-  my $courseName = $r->ce->{'courseName'};
-
-  ############################################################
-  # Determine the roles defined for this user by the LTI request
-  # and assign a permission level on that basis.
-  ############################################################
-  my $LTIrolesString = $r->param("roles");
-  my @LTIroles = split /,/, $LTIrolesString;
-
-  #remove the urn string if its present
-  s/^urn:lti:.*:ims\/lis\/// for @LTIroles;
-
-  if ( $ce->{debug_lti_parameters} ) {
-    warn "The adjusted LTI roles defined for this user are: \n--",
-      join("\n--", @LTIroles), "\n",
-      "Any initial ^urn:lti:.*:ims/lis/ segments have been stripped off.\n",
-      "The user will be assigned the highest role defined for them\n",
-      "========================\n"
-    }
-
-  my $nr = scalar(@LTIroles);
-  if (! defined($ce->{userRoles}->{$ce->{LMSrolesToWeBWorKroles}->{$LTIroles[0]}})) {
-    croak("Cannot find a WeBWorK role that corresponds to the LMS role of "
-	  . $LTIroles[0] .".");
-  }
-
-  my $LTI_webwork_permissionLevel
-    = $ce->{userRoles}->{$ce->{LMSrolesToWeBWorKroles}->{$LTIroles[0]}};
-  if ($nr > 1) {
-    for (my $j =1; $j < $nr; $j++) {
-      my $wwRole = $ce->{LMSrolesToWeBWorKroles}->{$LTIroles[$j]};
-      next unless defined $wwRole;
-      if ($LTI_webwork_permissionLevel < $ce->{userRoles}->{$wwRole}) {
-	$LTI_webwork_permissionLevel = $ce->{userRoles}->{$wwRole};
-      }
-    }
-  }
-
-  ####### End defining roles and $LTI_webwork_permissionLevel#######
-
-
-  warn "New user: $userID -- requested permission level is $LTI_webwork_permissionLevel." if ( $ce->{debug_lti_parameters} );
-
-  # We dont create users with too high of a permission level
-  # for security reasons.
-  if ($LTI_webwork_permissionLevel > $ce->{userRoles}->{$ce->{LTIAccountCreationCutoff}}) {
-    $self->{log_error}.= "userID: $userID -- Unknown instructor attempting to log in via LTI.  Instructor accounts must be created manually";
-    croak $r->maketext("The instructor account with user id [_1] does not exist.  Please create the account manually via WeBWorK.",$userID);
-    return 0;
-  }
-
-  my $newUser = $db->newUser();
-  $newUser->user_id($userID);
-  $self->{last_name} =~ s/\+/ /g;
-  $newUser->last_name($self->{last_name});
-  $self->{first_name} =~ s/\+/ /g;
-  $newUser->first_name($self->{first_name});
-  $newUser->email_address($self->{email});
-  $newUser->status("C");
-  $newUser-> section($self->{section} // "");
-  $newUser->recitation($self->{recitation} // "");
-  $newUser->comment(formatDateTime(time, "local"));
-  $newUser->student_id($self->{student_id} // "");
-
-  # Allow sites to customize the user
-  if (defined($ce->{LTI_modify_user})) {
-    $ce->{LTI_modify_user}($self,$newUser);
-  }
-
-  $db->addUser($newUser);
-  $self->write_log_entry("New user $userID added via LTIAdvanced login");
-
-  # Assign permssion level
-  my $newPermissionLevel = $db->newPermissionLevel();
-  $newPermissionLevel->user_id($userID);
-  $newPermissionLevel->permission($LTI_webwork_permissionLevel);
-  $db->addPermissionLevel($newPermissionLevel);
-  $r->authz->{PermissionLevel} = $newPermissionLevel;  #cache the Permission Level Record.
-
-
-  # Assign existing sets
-  my $instructorTools = WeBWorK::ContentGenerator::Instructor->new($r);
-  my @setsToAssign = ();
-
-  my @globalSetIDs = $db->listGlobalSets;
-  my @GlobalSets = $db->getGlobalSets(@globalSetIDs);
-  foreach my $globalSet (@GlobalSets) {
-    # assign all visible or "published" sets
-    if ($globalSet->visible) {
-      push @setsToAssign, $globalSet;
-      $instructorTools->assignSetToUser($userID,$globalSet);
-    }
-  }
-  $self->{numberOfSetsAssigned} = scalar @setsToAssign;
+	my $self       = shift;
+	my $c          = $self->{c};
+	my $userID     = $self->{user_id};
+	my $ce         = $c->ce;
+	my $db         = $c->db;
+	my $courseName = $c->ce->{'courseName'};
+
+	############################################################
+	# Determine the roles defined for this user by the LTI request
+	# and assign a permission level on that basis.
+	############################################################
+	my $LTIrolesString = $c->param("roles");
+	my @LTIroles       = split /,/, $LTIrolesString;
+
+	#remove the urn string if its present
+	s/^urn:lti:.*:ims\/lis\/// for @LTIroles;
+
+	if ($ce->{debug_lti_parameters}) {
+		warn "The adjusted LTI roles defined for this user are: \n--",
+			join("\n--", @LTIroles), "\n",
+			"Any initial ^urn:lti:.*:ims/lis/ segments have been stripped off.\n",
+			"The user will be assigned the highest role defined for them\n",
+			"========================\n";
+	}
+
+	my $nr = scalar(@LTIroles);
+	if (!defined($ce->{userRoles}->{ $ce->{LTI}{v1p1}{LMSrolesToWeBWorKroles}->{ $LTIroles[0] } })) {
+		croak("Cannot find a WeBWorK role that corresponds to the LMS role of " . $LTIroles[0] . ".");
+	}
+
+	my $LTI_webwork_permissionLevel = $ce->{userRoles}->{ $ce->{LTI}{v1p1}{LMSrolesToWeBWorKroles}->{ $LTIroles[0] } };
+	if ($nr > 1) {
+		for (my $j = 1; $j < $nr; $j++) {
+			my $wwRole = $ce->{LTI}{v1p1}{LMSrolesToWeBWorKroles}->{ $LTIroles[$j] };
+			next unless defined $wwRole;
+			if ($LTI_webwork_permissionLevel < $ce->{userRoles}->{$wwRole}) {
+				$LTI_webwork_permissionLevel = $ce->{userRoles}->{$wwRole};
+			}
+		}
+	}
+
+	####### End defining roles and $LTI_webwork_permissionLevel#######
+
+	warn "New user: $userID -- requested permission level is $LTI_webwork_permissionLevel."
+		if ($ce->{debug_lti_parameters});
+
+	# We dont create users with too high of a permission level
+	# for security reasons.
+	if ($LTI_webwork_permissionLevel > $ce->{userRoles}->{ $ce->{LTIAccountCreationCutoff} }) {
+		$self->{log_error} .=
+			"userID: $userID -- Unknown instructor attempting to log in via LTI.  Instructor accounts must be created manually";
+		croak $c->maketext(
+			"The instructor account with user id [_1] does not exist.  Please create the account manually via WeBWorK.",
+			$userID
+		);
+	}
+
+	my $newUser = $db->newUser();
+	$newUser->user_id($userID);
+	$self->{last_name} =~ s/\+/ /g;
+	$newUser->last_name($self->{last_name});
+	$self->{first_name} =~ s/\+/ /g;
+	$newUser->first_name($self->{first_name});
+	$newUser->email_address($self->{email});
+	$newUser->status("C");
+	$newUser->section($self->{section}       // "");
+	$newUser->recitation($self->{recitation} // "");
+	$newUser->comment(formatDateTime(time, "local"));
+	$newUser->student_id($self->{student_id} // "");
+
+	# Allow sites to customize the user
+	if (defined($ce->{LTI}{v1p1}{modify_user})) {
+		$ce->{LTI}{v1p1}{modify_user}($self, $newUser);
+	}
+
+	$db->addUser($newUser);
+	$self->write_log_entry("New user $userID added via LTIAdvanced login");
+
+	# Assign permssion level
+	my $newPermissionLevel = $db->newPermissionLevel();
+	$newPermissionLevel->user_id($userID);
+	$newPermissionLevel->permission($LTI_webwork_permissionLevel);
+	$db->addPermissionLevel($newPermissionLevel);
+	$c->authz->{PermissionLevel} = $newPermissionLevel;    #cache the Permission Level Record.
+
+	# Assign existing sets
+	my @setsToAssign = ();
+
+	my @globalSetIDs = $db->listGlobalSets;
+	my @GlobalSets   = $db->getGlobalSets(@globalSetIDs);
+	foreach my $globalSet (@GlobalSets) {
+		# assign all visible or "published" sets
+		if ($globalSet->visible) {
+			push @setsToAssign, $globalSet;
+			assignSetToUser($db, $userID, $globalSet);
+		}
+	}
+	$self->{numberOfSetsAssigned} = scalar @setsToAssign;
 
 	# Assign all existing achievements
 	my @achievementIDs = $db->listAchievements;
@@ -663,177 +701,94 @@ sub create_user {
 	$globalUserAchievement->achievement_points(0);
 	$db->addGlobalUserAchievement($globalUserAchievement);
 
-  # Give schools the chance to modify newly added sets
-  if (defined($ce->{LTI_modify_user_set})) {
-    foreach my $globalSet (@setsToAssign) {
-      my $userSet = $db->getUserSet($userID,$globalSet->set_id);
-      next unless $userSet;
+	# Give schools the chance to modify newly added sets
+	if (defined($ce->{LTI}{v1p1}{modify_user_set})) {
+		foreach my $globalSet (@setsToAssign) {
+			my $userSet = $db->getUserSet($userID, $globalSet->set_id);
+			next unless $userSet;
 
-      $ce->{LTI_modify_user_set}($self,$globalSet,$userSet);
-      $db->putUserSet($userSet);
-    }
-  }
+			$ce->{LTI}{v1p1}{modify_user_set}($self, $globalSet, $userSet);
+			$db->putUserSet($userSet);
+		}
+	}
 
-  $self->{initial_login} = 1;
+	$self->{initial_login} = 1;
 
-  return 1;
+	return 1;
 }
 
 # possibly update a user logging in
 sub maybe_update_user {
-  my $self = shift;
-  my $r = $self->{r};
-  my $userID = $self->{user_id};
-  my $ce = $r->ce;
-  my $db = $r->db;
-  my $courseName = $r->ce->{'courseName'};
-
-  my $user = $db->getUser($userID);
-  my $permissionLevel = $db->getPermissionLevel($userID);
-  # We don't alter records of users with too high a permission
-  if (defined($permissionLevel->permission) &&
-	$permissionLevel->permission > $ce->{userRoles}->{$ce->{LTIAccountCreationCutoff}}) {
-    return 1; # Treat as OK as not allowed to modify
-  } else {
-    # Create a temp user and run it through the create process
-    my $tempUser = $db->newUser();
-    $tempUser->user_id($userID);
-    my $last_name = $self->{last_name} // '';
-    $last_name =~ s/\+/ /g;
-    $tempUser->last_name($last_name);
-    my $first_name = $self->{first_name} // '';
-    $first_name =~ s/\+/ /g;
-    $tempUser->first_name($first_name);
-    $tempUser->email_address($self->{email});
-    $tempUser->status("C");
-    $tempUser->section($self->{section} // "");
-    $tempUser->recitation($self->{recitation} // "");
-    $tempUser->student_id($self->{student_id} // "");
-
-    # Allow sites to customize the temp user
-    if (defined($ce->{LTI_modify_user})) {
-      $ce->{LTI_modify_user}($self,$tempUser);
-    }
-
-    my @elements = qw(last_name first_name
-		      email_address status
-		      section recitation student_id);
-
-    my $change_made = 0;
-
-    for my $element (@elements) {
-      if ($user->$element ne $tempUser->$element) {
-	$change_made = 1;
-	warn "WeBWorK User has $element: ".$user->$element." but LMS user has $element ".$tempUser->$element."\n"
-	  if ( $ce->{debug_lti_parameters} );
-      }
-    }
-
-    if ($change_made) {
-      $tempUser->comment(formatDateTime(time, "local"));
-      eval { $db->putUser($tempUser) };
-      if ($@) {
-        $self->write_log_entry("Failed to update user $userID in LTIAdvanced login: $@");
-        warn "Failed to update user $userID in LTIAdvanced login.\n"
-	  if ( $ce->{debug_lti_parameters} );
-        return 0;
-      } else {
-        $self->write_log_entry("Demographic data for user $userID modified via LTIAdvanced login");
-        warn "Existing user: $userID updated.\n"
-	  if ( $ce->{debug_lti_parameters} );
-	return 1;
-      }
-    } else {
-      return 1; # No changes needed
-    }
-  }
-}
-
-################################################################################
-# NONCE SUB-PACKAGE
-################################################################################
-
-package WeBWorK::Authen::LTIAdvanced::Nonce;
-
-# This controls how often the key database is scrubbed for old nonce's
-use constant NONCE_PURGE_FREQUENCY => 7200; # 2 hours
-
-# This controls how old a nonce is before it is purged
-use constant NONCE_LIFETIME => 21600; # 6 hours
+	my $self       = shift;
+	my $c          = $self->{c};
+	my $userID     = $self->{user_id};
+	my $ce         = $c->ce;
+	my $db         = $c->db;
+	my $courseName = $c->ce->{'courseName'};
+
+	my $user            = $db->getUser($userID);
+	my $permissionLevel = $db->getPermissionLevel($userID);
+	# We don't alter records of users with too high a permission
+	if (defined($permissionLevel->permission)
+		&& $permissionLevel->permission > $ce->{userRoles}->{ $ce->{LTIAccountCreationCutoff} })
+	{
+		return 1;    # Treat as OK as not allowed to modify
+	} else {
+		# Create a temp user and run it through the create process
+		my $tempUser = $db->newUser();
+		$tempUser->user_id($userID);
+		my $last_name = $self->{last_name} // '';
+		$last_name =~ s/\+/ /g;
+		$tempUser->last_name($last_name);
+		my $first_name = $self->{first_name} // '';
+		$first_name =~ s/\+/ /g;
+		$tempUser->first_name($first_name);
+		$tempUser->email_address($self->{email});
+		$tempUser->status("C");
+		$tempUser->section($self->{section}       // "");
+		$tempUser->recitation($self->{recitation} // "");
+		$tempUser->student_id($self->{student_id} // "");
+
+		# Allow sites to customize the temp user
+		if (defined($ce->{LTI}{v1p1}{modify_user})) {
+			$ce->{LTI}{v1p1}{modify_user}($self, $tempUser);
+		}
 
-sub new {
-  my ($invocant, $r, $nonce, $timestamp) = @_;
-  my $class = ref($invocant) || $invocant;
-  my $self = {
-	      r => $r,
-	      nonce => $nonce,
-	      timestamp => $timestamp,
-	     };
-  bless $self, $class;
-  return $self;
-}
+		my @elements = qw(last_name first_name
+			email_address status
+			section recitation student_id);
 
-sub ok {
-  my $self = shift;
-  my $r = $self->{r};
-  my $ce = $r->{ce};
-  my $db = $self->{r}->{db};
-
-  $self->maybe_purge_nonces();
-
-  if ($self->{timestamp} < time() - $ce->{NonceLifeTime}) {
-    if ( $ce->{debug_lti_parameters} ) {
-      warn("Nonce Expired.  Your NonceLifeTime may be too short");
-    }
-    return 0;
-  }
-
-  my $Key = $db->getKey($self->{nonce});
-  # If we *haven't* used this nonce before then we are OK.
-  if (! defined($Key) ) {
-    # nonce, timestamp are ok.	Add the nonce so its not used again
-    $Key = $db->newKey(user_id=>$self->{nonce},
-		       key=>"nonce",
-		       timestamp=>$self->{"timestamp"},
-		      );
-    $db->addKey($Key);
-    return 1;
-  } else {
-    # The nonce is in the database - so was used "recently" so should NOT be allowed
-    if ( $Key->timestamp <  $self->{"timestamp"} ) {
-      # Update timestamp - so deletion will be delayed from the most recent value
-      # of oauth_timestamp sent by the LTI consumer and not from an earlier timestamp.
-      $Key->timestamp($self->{"timestamp"});
-      $db->putKey($Key);
-    }
-    return 0;
-  }
-}
+		my $change_made = 0;
 
-sub maybe_purge_nonces {
-  my $self = shift;
-  my $r = $self->{r};
-  my $ce = $r->{ce};
-  my $db = $self->{r}->{db};
-  my $time = time;
-  my $lastPurge = $db->getSettingValue('lastNoncePurge');
-
-  # only purge if the last purge was never or over NONCE_PURGE_FREQUENCY ago
-  if ( !defined($lastPurge) || ( $time - $lastPurge > NONCE_PURGE_FREQUENCY ) ) {
-    my @userIDs = $db->listKeys();
-    my @Keys = $db->getKeys(@userIDs);
-
-    # Delete any "nonce" keys that are older than NONCE_LIFETIME
-    foreach my $Key (@Keys) {
-      if ($Key->key eq "nonce" && ($time-$Key->timestamp > NONCE_LIFETIME)) {
-	$db->deleteKey($Key->user_id);
-      }
-    }
-
-    $db->setSettingValue('lastNoncePurge',$time);
-  }
+		for my $element (@elements) {
+			if ($user->$element ne $tempUser->$element) {
+				$change_made = 1;
+				warn "WeBWorK User has $element: "
+					. $user->$element
+					. " but LMS user has $element "
+					. $tempUser->$element . "\n"
+					if ($ce->{debug_lti_parameters});
+			}
+		}
 
+		if ($change_made) {
+			$tempUser->comment(formatDateTime(time, "local"));
+			eval { $db->putUser($tempUser) };
+			if ($@) {
+				$self->write_log_entry("Failed to update user $userID in LTIAdvanced login: $@");
+				warn "Failed to update user $userID in LTIAdvanced login.\n"
+					if ($ce->{debug_lti_parameters});
+				return 0;
+			} else {
+				$self->write_log_entry("Demographic data for user $userID modified via LTIAdvanced login");
+				warn "Existing user: $userID updated.\n"
+					if ($ce->{debug_lti_parameters});
+				return 1;
+			}
+		} else {
+			return 1;    # No changes needed
+		}
+	}
 }
 
 1;
-
diff --git a/lib/WeBWorK/Authen/LTIAdvanced/Nonce.pm b/lib/WeBWorK/Authen/LTIAdvanced/Nonce.pm
new file mode 100644
index 0000000000..458c5078e8
--- /dev/null
+++ b/lib/WeBWorK/Authen/LTIAdvanced/Nonce.pm
@@ -0,0 +1,85 @@
+###############################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Authen::LTIAdvanced::Nonce;
+
+use strict;
+use warnings;
+use experimental 'signatures';
+
+# This controls how often the key database is scrubbed for old nonces.
+use constant NONCE_PURGE_FREQUENCY => 7200;    # 2 hours
+
+# This controls how old a nonce is before it is purged.
+use constant NONCE_LIFETIME => 21600;          # 6 hours
+
+sub new ($invocant, $c, $nonce, $timestamp) {
+	return bless { c => $c, nonce => $nonce, timestamp => $timestamp }, ref($invocant) || $invocant;
+}
+
+sub ok ($self) {
+	my $c  = $self->{c};
+	my $ce = $c->ce;
+	my $db = $c->db;
+
+	$self->maybe_purge_nonces;
+
+	if ($self->{timestamp} < time - $ce->{LTI}{v1p1}{NonceLifeTime}) {
+		if ($ce->{debug_lti_parameters}) {
+			warn('Nonce Expired.  Your NonceLifeTime may be too short');
+		}
+		return 0;
+	}
+
+	my $key = $db->getKey($self->{nonce});
+
+	if (!defined $key) {
+		# The nonce has not been used before, and so it is okay. Add the nonce so it is not used again.
+		$key = $db->newKey(user_id => $self->{nonce}, key => 'nonce', timestamp => $self->{timestamp});
+		$db->addKey($key);
+		return 1;
+	} else {
+		# The nonce is in the database which means it was used "recently".  So it should NOT be allowed.
+		if ($key->timestamp < $self->{timestamp}) {
+			# Update the timestamp so that deletion will be delayed from the most recent time it was used.
+			$key->timestamp($self->{timestamp});
+			$db->putKey($key);
+		}
+		return 0;
+	}
+}
+
+sub maybe_purge_nonces ($self) {
+	my $c  = $self->{c};
+	my $ce = $c->ce;
+	my $db = $c->db;
+
+	my $time      = time;
+	my $lastPurge = $db->getSettingValue('lastNoncePurge');
+
+	# Only purge if there has not been a purge yet, or if last purge was before NONCE_PURGE_FREQUENCY seconds ago.
+	if (!defined $lastPurge || $time - $lastPurge > NONCE_PURGE_FREQUENCY) {
+		# Delete any "nonce" keys that are older than NONCE_LIFETIME
+		for my $key ($db->getKeys($db->listKeys)) {
+			$db->deleteKey($key->user_id) if $key->key eq 'nonce' && $time - $key->timestamp > NONCE_LIFETIME;
+		}
+
+		$db->setSettingValue('lastNoncePurge', $time);
+	}
+
+	return;
+}
+
+1;
diff --git a/lib/WeBWorK/Authen/LTIAdvanced/SubmitGrade.pm b/lib/WeBWorK/Authen/LTIAdvanced/SubmitGrade.pm
index 4fd71a8a80..8c010dec49 100644
--- a/lib/WeBWorK/Authen/LTIAdvanced/SubmitGrade.pm
+++ b/lib/WeBWorK/Authen/LTIAdvanced/SubmitGrade.pm
@@ -1,6 +1,6 @@
 ###############################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,6 @@
 ################################################################################
 
 package WeBWorK::Authen::LTIAdvanced::SubmitGrade;
-use base qw/WeBWorK::Authen::LTIAdvanced/;
 
 =head1 NAME
 
@@ -22,250 +21,185 @@ WeBWorK::Authen::LTIAdvanced::SubmitGrade - pass back grades to an enabled LMS
 
 =cut
 
+use Mojo::Base -signatures, -async_await;
 
-use strict;
-use warnings;
-use WeBWorK::Debug;
-use WeBWorK::CGI;
-use Carp;
-use WeBWorK::Utils qw(grade_set grade_gateway grade_all_sets wwRound);
 use Net::OAuth;
-use HTTP::Request;
-use LWP::UserAgent;
-use UUID::Tiny  ':std';
-
+use Mojo::UserAgent;
+use UUID::Tiny ':std';
 use Digest::SHA qw(sha1_base64);
 
+use WeBWorK::Debug;
+use WeBWorK::Utils qw(grade_set grade_gateway grade_all_sets wwRound);
+
 # This package contains utilities for submitting grades to the LMS
-sub new {
-  my ($invocant, $r) = @_;
-  my $class = ref($invocant) || $invocant;
-  my $self = {
-	      r => $r,
-	     };
-  # sanity check
-  my $ce = $r->{ce};
-  my $db = $self->{r}->{db};
-
-  unless (ref($ce//'') and ref($db)//'') {
-  	warn("course environment is not defined") unless ref($ce//'');
-  	warn("database reference is not defined") unless ref($db//'');
-  	croak("Could not create WeBWorK::Authen::LTIAdvanced::SubmitGrade object, missing items from request");
-  }
-
-  bless $self, $class;
-  return $self;
+sub new ($invocant, $c, $post_processing_mode = 0) {
+	return bless { c => $c, post_processing_mode => $post_processing_mode }, ref($invocant) || $invocant;
+}
+
+# Use the app log for warnings in post processing mode as perl warnings are not caught in the job queue.
+# Otherwise just use warn as those are caught by the global webwork2 warn handler.
+sub warning ($self, $warning) {
+	if ($self->{post_processing_mode}) {
+		$self->{c}{app}->log->warn($warning);
+	} else {
+		warn $warning . "\n";
+	}
+	return;
 }
 
 # This updates the sourcedid for the object we are looking at.  Its either
 # the sourcedid for the user for course grades or the sourcedid for the
 # userset for homework grades.
-sub update_sourcedid {
-  my $self = shift;
-  my $userID = shift;
-  my $r = $self->{r};
-  my $ce = $r->{ce};
-  my $db = $self->{r}->{db};
-
-  # These parameters are used to build the passback request
-  # warn if no outcome service url
-  if (!defined($r->param('lis_outcome_service_url'))) {
-    carp "The parameter lis_outcome_service_url is not defined.  Unable to report grades to the LMS.".
-    " Are external grades enabled in the LMS?" if $ce->{debug_lti_grade_passback};
-  } else {
-    # otherwise keep it up to date
-    my $lis_outcome_service_url = $db->getSettingValue('lis_outcome_service_url');
-    if (!defined($lis_outcome_service_url) ||
-	$lis_outcome_service_url ne $r->param('lis_outcome_service_url')) {
-      $db->setSettingValue('lis_outcome_service_url',
-			   $r->param('lis_outcome_service_url'));
-    }
-  }
-
-  # these parameters have to be here or we couldn't have gotten this far
-  my $consumer_key = $db->getSettingValue('consumer_key');
-  if (!defined($consumer_key) ||
-      $consumer_key ne $r->param('oauth_consumer_key')) {
-    $db->setSettingValue('consumer_key',
-			 $r->param('oauth_consumer_key'));
-  }
-
-  my $signature_method = $db->getSettingValue('signature_method');
-  if (!defined($signature_method) ||
-      $signature_method ne $r->param('oauth_signature_method')) {
-    $db->setSettingValue('signature_method',
-			 $r->param('oauth_signature_method'));
-  }
-
-  # The $sourcedid is what identifies the user and assignment
-  # to the LMS.  It is either a course grade or a set grade
-  # depending on the request and the mode we are in.
-  my $sourcedid = $r->param('lis_result_sourcedid');
-  if (!defined($sourcedid)) {
-    warn "No LISSourceID! Some LMS's do not give grades to instructors, but this ".
-     "could also be a sign that external grades are not enabled in your LMS." if $ce->{debug_lti_grade_passback};
-  } elsif ($ce->{LTIGradeMode} eq 'course') {
-    # Update the SourceDID for the user if we are in course mode
-    my $User = $db->getUser($userID);
-    if (!defined($User->lis_source_did) || $User->lis_source_did ne $sourcedid) {
-      $User->lis_source_did($sourcedid);
-      $db->putUser($User);
-    }
-  } elsif ($ce->{LTIGradeMode} eq 'homework') {
-    my $urlpath = $r->urlpath;
-    my $setID = $urlpath->arg("setID");
-    if (!defined($setID)) {
-      warn "Not a link to a Problem Set and in homework grade mode.".
-        " Links to WeBWorK should point to specific problem sets.";
-    } else {
-      my $set = $db->getUserSet($userID,$setID);
-      # if set is not defined and we are going to a page with
-      # is set dependent then there are problems that will be caught
-      # later
-      if (defined($set) &&
-	  (!defined($set->lis_source_did) ||
-	   $set->lis_source_did ne $sourcedid)) {
-		$set->lis_source_did($sourcedid);
-		$db->putUserSet($set);
-
-      }
-    }
-  }
-} # end update_sourcedid
-
-# computes and submits the course grade for userID to the LMS
-# the course grade is the average of all sets assigned to the user.
-sub submit_course_grade {
-  my $self = shift;
-  my $userID = shift;
-  my $r = $self->{r};
-  my $ce = $r->{ce};
-  my $db = $self->{r}->{db};
-
-  my $score = grade_all_sets($db,$userID);
-  my $user = $db->getUser($userID);
-
-  die("$userID does not exist") unless $user;
-  warn "submitting all grades for user: $userID  \n" if $ce->{debug_lti_grade_passback};
-  warn "lis_source_did is not available for user: $userID \n" if !($user->lis_source_did) and $ce->{debug_lti_grade_passback};
-  return $self->submit_grade($user->lis_source_did,$score);
+sub update_sourcedid ($self, $userID) {
+	my $c  = $self->{c};
+	my $ce = $c->{ce};
+	my $db = $c->{db};
+
+	# These parameters are used to build the passback request
+	# warn if no outcome service url
+	if (!defined($c->param('lis_outcome_service_url'))) {
+		warn 'The parameter lis_outcome_service_url is not defined.  Unable to report grades to the LMS.'
+			. " Are external grades enabled in the LMS?\n"
+			if $ce->{debug_lti_grade_passback};
+	} else {
+		# otherwise keep it up to date
+		my $lis_outcome_service_url = $db->getSettingValue('lis_outcome_service_url');
+		if (!defined($lis_outcome_service_url) || $lis_outcome_service_url ne $c->param('lis_outcome_service_url')) {
+			$db->setSettingValue('lis_outcome_service_url', $c->param('lis_outcome_service_url'));
+		}
+	}
+
+	# these parameters have to be here or we couldn't have gotten this far
+	my $consumer_key = $db->getSettingValue('consumer_key');
+	if (!defined($consumer_key) || $consumer_key ne $c->param('oauth_consumer_key')) {
+		$db->setSettingValue('consumer_key', $c->param('oauth_consumer_key'));
+	}
+
+	my $signature_method = $db->getSettingValue('signature_method');
+	if (!defined($signature_method) || $signature_method ne $c->param('oauth_signature_method')) {
+		$db->setSettingValue('signature_method', $c->param('oauth_signature_method'));
+	}
 
+	# The $sourcedid is what identifies the user and assignment
+	# to the LMS.  It is either a course grade or a set grade
+	# depending on the request and the mode we are in.
+	my $sourcedid = $c->param('lis_result_sourcedid');
+	if (!defined($sourcedid)) {
+		warn q{No LISSourceID! Some LMS's do not give grades to instructors, but this }
+			. "could also be a sign that external grades are not enabled in your LMS.\n"
+			if $ce->{debug_lti_grade_passback};
+	} elsif ($ce->{LTIGradeMode} eq 'course') {
+		# Update the SourceDID for the user if we are in course mode
+		my $User = $db->getUser($userID);
+		if (!defined($User->lis_source_did) || $User->lis_source_did ne $sourcedid) {
+			$User->lis_source_did($sourcedid);
+			$db->putUser($User);
+		}
+	} elsif ($ce->{LTIGradeMode} eq 'homework') {
+		my $setID = $c->stash('setID');
+		if (!defined($setID)) {
+			warn 'Not a link to a Problem Set and in homework grade mode.'
+				. ' Links to WeBWorK should point to specific problem sets.';
+		} else {
+			my $set = $db->getUserSet($userID, $setID);
+			if (defined($set) && (!defined($set->lis_source_did) || $set->lis_source_did ne $sourcedid)) {
+				$set->lis_source_did($sourcedid);
+				$db->putUserSet($set);
+			}
+		}
+	}
+
+	return;
 }
 
-# computes and submits the set grade for $userID and $setID to the
-# LMS.  For gateways the best score is used.
-sub submit_set_grade {
-  my $self = shift;
-  my $userID = shift;
-  my $setID = shift;
-  my $r = $self->{r};
-  my $ce = $r->{ce};
-  my $db = $self->{r}->{db};
-
-  my $user = $db->getUser($userID);
-
-  die("$userID does not exist") unless $user;
-
-  my $userSet = $db->getMergedSet($userID,$setID);
-  my $score = 0;
-
-  if ($userSet->assignment_type() =~ /gateway/) {
-    $score = grade_gateway($db,$userSet,$userSet->set_id,$userID);
-  } else {
-	$score = grade_set($db, $userSet, $userID, 0);
-  }
-  # make debug prettier
-  my $message_string = '';
-  $message_string .= "\nmass_update: " if $self->{post_processing_mode};
-  $message_string .= "submitting grade for user: $userID set $setID ";
-  $message_string .= "-- lis_source_did is not available " unless ($userSet->lis_source_did);
-  warn($message_string."\n") if $ce->{debug_lti_grade_passback};
-  return $self->submit_grade($userSet->lis_source_did,$score);
+# Computes and submits the course grade for userID to the LMS.
+# The course grade is the average of all sets assigned to the user.
+async sub submit_course_grade ($self, $userID) {
+	my $c  = $self->{c};
+	my $ce = $c->{ce};
+	my $db = $c->{db};
+
+	my $user = $db->getUser($userID);
+	return 0 unless $user;
+
+	$self->warning("submitting all grades for user: $userID") if $ce->{debug_lti_grade_passback};
+	$self->warning("lis_source_did is not available for user: $userID")
+		if !$user->lis_source_did && $ce->{debug_lti_grade_passback};
+
+	return await $self->submit_grade($user->lis_source_did, scalar(grade_all_sets($db, $userID)));
 }
 
-# error in reporting michael.gage@rochester.edu, Demo, Global $r object is not available. Set:
-# 	PerlOptions +GlobalRequest
-# in httpd.conf at /opt/rh/perl516/root/usr/local/share/perl5/CGI.pm line 346, <IN> line 76.
-# so we don't use CGI::escapeHTML in post processing mode but use this local version instead.
+# Computes and submits the set grade for $userID and $setID to the LMS.  For gateways the best score is used.
+async sub submit_set_grade ($self, $userID, $setID) {
+	my $c  = $self->{c};
+	my $ce = $c->{ce};
+	my $db = $c->{db};
+
+	my $user = $db->getUser($userID);
+	return 0 unless $user;
+
+	my $userSet = $db->getMergedSet($userID, $setID);
+
+	$self->warning("Submitting grade for user $userID and set $setID.") if $ce->{debug_lti_grade_passback};
+	$self->warning('lis_source_did is not available for this set.')
+		if !$userSet->lis_source_did && $ce->{debug_lti_grade_passback};
+
+	return await $self->submit_grade(
+		$userSet->lis_source_did,
+		scalar(
+			$userSet->assignment_type =~ /gateway/
+			? grade_gateway($db, $userSet, $userSet->set_id, $userID)
+			: grade_set($db, $userSet, $userID, 0)
+		)
+	);
+}
 
-sub local_escape_html {  # a local version of escapeHTML that works for post processing
-	my $self = shift;   # a grading object
-	my @message = @_;
-	if ($self->{post_processing_mode}) {
-		return join('', @message);    # this goes to log files in post processing to escapeHTML is not essential
-	} else {
-		return CGI::escapeHTML(@message);  #FIXME -- why won't this work in post_processing_mode (missing $r ??)
+# Submits a score of $score to the lms with $sourcedid as the identifier.
+async sub submit_grade ($self, $sourcedid, $score) {
+	my $c  = $self->{c};
+	my $ce = $c->{ce};
+	my $db = $c->{db};
+
+	$score = wwRound(2, $score);
+
+	# Fail gracefully.  Some users, like instructors, may not actually have a sourcedid.
+	return 0 if !$sourcedid;
+
+	my $request_url = $db->getSettingValue('lis_outcome_service_url');
+	if (!$request_url) {
+		$self->warning('Cannot send/retrieve grades to/from the LMS, no lis_outcome_service_url');
+		return 0;
+	}
+
+	my $consumer_key = $db->getSettingValue('consumer_key');
+	if (!$consumer_key) {
+		$self->warning('Cannot send/retrieve grades to/from the LMS, no consumer_key');
+		return 0;
+	}
+
+	my $signature_method = $db->getSettingValue('signature_method');
+	if (!$signature_method) {
+		$self->warning('Cannot send/retrieve grades to/from the LMS, no signature_method');
+		return 0;
 	}
-}
 
-# submits a score of $score to the lms with $sourcedid as the
-# identifier.
-sub submit_grade {
-  my $self = shift;
-  my $sourcedid = shift;
-  my $score = shift;
-  my $r = $self->{r};
-  my $ce = $r->{ce};
-  my $db = $self->{r}->{db};
-
-  $score = wwRound(2,$score);
-
-  # We have to fail gracefully here because some users, like instructors,
-  # may not actually have a sourcedid
-  if (!$sourcedid) {
-#     debug("No sourcedid for this user/assignment.  Some LMS's do not provide ".
-#      "sourcedid for instructors so this may not be a problem, or it might ".
-#      "mean your settings are not correct.") if $ce->{debug_lti_grade_passback};
-    return 0;
-  }
-
-  # Needed in both phases
-  my $bodyhash;
-  my $requestGen;
-  my $gradeRequest;
-  my $HTTPRequest;
-  my $response;
-
-  my $request_url = $db->getSettingValue('lis_outcome_service_url');
-  if ( !defined($request_url) || $request_url eq "" ) {
-    warn("Cannot send/retrieve grades to/from the LMS, no lis_outcome_service_url");
-    return 0;
-  }
-
-  my $consumer_key = $db->getSettingValue('consumer_key');
-  if ( !defined($consumer_key) || $consumer_key eq "" ) {
-    warn("Cannot send/retrieve grades to/from the LMS, no consumer_key");
-    return 0;
-  }
-
-  my $signature_method = $db->getSettingValue('signature_method');
-  if ( !defined($signature_method) || $signature_method eq "" ) {
-    warn("Cannot send/retrieve grades to/from the LMS, no signature_method");
-    return 0;
-  }
-
-  debug("found data required for submitting grades to LMS");
-
-  # Generate a better nonce, first a portion unique for the sourcedid
-  # which should be dependent on the student + the assignment if a
-  # "homework" level sourcedid. This part can be used twice
-  my $uuid_p1 = create_uuid_as_string(UUID_SHA1, UUID_NS_URL, $sourcedid);
-
-  # Second part is a time dependent portion
-  my $uuid_p2 = create_uuid_as_string(UUID_TIME);
-
-  my $lti_check_prior = $ce->{lti_check_prior} // 0; # Should we first poll the LMS for the current grade
-
-  my $lti_do_send = 1; # Default to yes
-
-  if ( $lti_check_prior ) {
-
-    # Poll the LMS for prior grade
-
-    $lti_do_send = 0; # Change default to no, and change below if needed
-
-    # This is boilerplate XML used to retrieve the currently recorded score for $sourcedid (which will later be tested)
-    my $readResultXML = <<EOS;
+	debug('found data required for submitting grades to LMS');
+
+	# Generate a nonce. Start with a portion that is unique for the sourcedid.  This should be dependent on the student.
+	# If grade mode is "homework", this is also dependent on the assignment.  This part can be used twice.
+	my $uuid_p1 = create_uuid_as_string(UUID_SHA1, UUID_NS_URL, $sourcedid);
+
+	# The second part is time dependent.
+	my $uuid_p2 = create_uuid_as_string(UUID_TIME);
+
+	my $ua = Mojo::UserAgent->new;
+
+	if ($ce->{LTICheckPrior} // 0) {
+		# Poll the LMS for prior grade.
+
+		# This is boilerplate XML used to retrieve the currently recorded score for $sourcedid
+		# (which will later be tested)
+		my $readResultXML = <<EOS;
 <?xml version = "1.0" encoding = "UTF-8"?>
 <imsx_POXEnvelopeRequest xmlns = "http://www.imsglobal.org/services/ltiv1p1/xsd/imsoms_v1p0">
   <imsx_POXHeader>
@@ -286,105 +220,113 @@ sub submit_grade {
 </imsx_POXEnvelopeRequest>
 EOS
 
-    chomp($readResultXML);
-
-    $bodyhash = sha1_base64($readResultXML);
-
-    # since sha1_base64 doesn't pad we have to do so manually
-    while (length($bodyhash) % 4) {
-      $bodyhash .= '=';
-    }
-
-    warn("Retrieving prior grade using sourcedid: $sourcedid") if
-      $ce->{debug_lti_parameters};
-
-    $requestGen = Net::OAuth->request("consumer");
-
-    $requestGen->add_required_message_params('body_hash');
-
-    $gradeRequest = $requestGen->new(
-		  request_url => $request_url,
-		  request_method => "POST",
-		  consumer_secret => $ce->{LTIBasicConsumerSecret},
-		  consumer_key => $consumer_key,
-		  signature_method => $signature_method,
-		  nonce => "${uuid_p1}__${uuid_p2}",
-		  timestamp => time(),
-		  body_hash => $bodyhash
-							 );
-    $gradeRequest->sign();
-
-    $HTTPRequest = HTTP::Request->new(
-	       $gradeRequest->request_method,
-	       $gradeRequest->request_url,
-	       [
-		  'Authorization' => $gradeRequest->to_authorization_header,
-		  'Content-Type'  => 'application/xml',
-	       ],
-	       $readResultXML,
-				      );
-
-    $response = LWP::UserAgent->new->request($HTTPRequest);
-
-    # debug section
-    if ($ce->{debug_lti_grade_passback} and $ce->{debug_lti_parameters}){
-      warn "The request was:\n ". ($self->local_escape_html(join(" ",%$HTTPRequest)));
-      warn "The nonce used is ${uuid_p1}__${uuid_p2}\n";
-      warn "The response is:\n ". ($self->local_escape_html(join(" ", %$response )));
-      warn "The request was:\n ". ($self->local_escape_html(join(" ",%$HTTPRequest)));
-      debug( "The request was:\n ". ($self->local_escape_html(join(" ",%$HTTPRequest))) );
-      debug( "The nonce used is ${uuid_p1}__${uuid_p2}\n" );
-      debug( "The response is:\n ". ($self->local_escape_html(join(" ", %$response ))) );
-    }
-
-    if ($response->is_success) {
-      $response->content =~ /<imsx_codeMajor>\s*(\w+)\s*<\/imsx_codeMajor>/;
-      my $message = $1;
-      if ($message ne 'success') {
-        warn("Unable to retrieve prior grade from LMS. Note that if your server time is not correct, this may fail for reasons which are less than obvious from the error messages. Error: ".$message);
-        debug("Unable to retrieve prior grade from LMS. Note that if your server time is not correct, this may fail for reasons which are less than obvious from the error messages. Error: ".$message);
-        #debug(CGI::escapeHTML($response->content));
-        return 0;
-      } else {
-        my $oldScore;
-        # Possibly no score yet.
-        if ($response->content =~ /<textString\/>/) {
-          $oldScore = ""
-        } else {
-          $response->content =~ /<textString>\s*(\S+)\s*<\/textString>/;
-          $oldScore = $1;
-        }
-        # Do not update the score if no change.
-        if ( $oldScore eq "success" ) {
-          # Blackboard seems to return this when there is no prior grade.
-          # See: https://webwork.maa.org/moodle/mod/forum/discuss.php?d=5002
-	  debug("LMS grade will be updated. sourcedid: ".$sourcedid." Old score: ".$oldScore." New score: ".$score) if ($ce->{debug_lti_grade_passback});
-	  $lti_do_send = 1; # Change back to sending the update
-        } elsif ( $oldScore ne "" && abs($score-$oldScore) < 0.001 ) {
-          # LMS has essentially the same score, no reason to update it
-          debug("LMS grade will NOT be updated - grade unchanges. Old score: ".$oldScore." New score: ".$score) if ($ce->{debug_lti_grade_passback});
-          warn("LMS grade will NOT be updated - grade unchanges. Old score: ".$oldScore." New score: ".$score) if ($ce->{debug_lti_grade_passback});
-	  $lti_do_send = 0; # Do not send
-          return 1;
-        } else {
-	  $lti_do_send = 1; # Change back to sending the update
-          debug("LMS grade will be updated. sourcedid: ".$sourcedid." Old score: ".$oldScore." New score: ".$score) if ($ce->{debug_lti_grade_passback});
-        }
-      }
-    } else {
-      warn("Unable to retrieve prior grade from LMS. Note that if your server time is not correct, this may fail for reasons which are less than obvious from the error messages. Error: " . $response->message) if ($ce->{debug_lti_grade_passback});
-      debug("Unable to retrieve prior grade from LMS. Note that if your server time is not correct, this may fail for reasons which are less than obvious from the error messages. Error: " . $response->message);
-      debug(CGI::escapeHTML($response->content));
-      return 0;
-    }
-  }
-
-  if ( $lti_do_send ) {
-
-    # Send the LMS the new grade
-
-    # This is boilerplate XML used to submit the $score for $sourcedid
-    my $replaceResultXML = <<EOS;
+		chomp($readResultXML);
+
+		my $bodyhash = sha1_base64($readResultXML);
+
+		# Since sha1_base64 doesn't pad we have to do so manually.
+		while (length($bodyhash) % 4) {
+			$bodyhash .= '=';
+		}
+
+		$self->warning("Retrieving prior grade using sourcedid: $sourcedid") if $ce->{debug_lti_parameters};
+
+		my $requestGen = Net::OAuth->request('consumer');
+
+		$requestGen->add_required_message_params('body_hash');
+
+		my $gradeRequest = $requestGen->new(
+			request_url      => $request_url,
+			request_method   => 'POST',
+			consumer_secret  => $ce->{LTI}{v1p1}{BasicConsumerSecret},
+			consumer_key     => $consumer_key,
+			signature_method => $signature_method,
+			nonce            => "${uuid_p1}__${uuid_p2}",
+			timestamp        => time,
+			body_hash        => $bodyhash
+		);
+		$gradeRequest->sign();
+
+		my $request = await $ua->post_p(
+			$gradeRequest->request_url,
+			{ 'Authorization' => $gradeRequest->to_authorization_header, 'Content-Type' => 'application/xml' },
+			$readResultXML
+		)->catch(sub ($err) {
+				$self->warning("There was an error retrieving prior grade from the LMS: $err");
+				return 0;
+		});
+
+		return 0 unless $request;
+		my $response = $request->result;
+
+		# Debug section
+		if ($ce->{debug_lti_grade_passback} && $ce->{debug_lti_parameters}) {
+			$self->warning("The request was:\n " . $readResultXML);
+			$self->warning("The nonce used is ${uuid_p1}__${uuid_p2}");
+			$self->warning("The response is:\n " . $response->to_string);
+			debug("The request was:\n " . $readResultXML);
+			debug("The nonce used is ${uuid_p1}__${uuid_p2}");
+			debug("The response is:\n " . $response->to_string);
+		}
+
+		if ($response->is_success) {
+			my $content = $response->body;
+			$content =~ /<imsx_codeMajor>\s*(\w+)\s*<\/imsx_codeMajor>/;
+			my $message = $1;
+			if ($message ne 'success') {
+				$self->warning(
+					'Unable to retrieve prior grade from LMS. Note that if your server time is not correct, '
+						. 'this may fail for reasons which are less than obvious from the error messages. Error: '
+						. $message);
+				debug('Unable to retrieve prior grade from LMS. Note that if your server time is not correct, '
+						. 'this may fail for reasons which are less than obvious from the error messages. Error: '
+						. $message);
+				return 0;
+			} else {
+				my $oldScore;
+				# Possibly no score yet.
+				if ($content =~ /<textString\/>/) {
+					$oldScore = '';
+				} else {
+					$content =~ /<textString>\s*(\S+)\s*<\/textString>/;
+					$oldScore = $1;
+				}
+				# Do not update the score if no change.
+				if ($oldScore eq 'success') {
+					# Blackboard seems to return this when there is no prior grade.
+					# See: https://webwork.maa.org/moodle/mod/forum/discuss.php?d=5002
+					debug("LMS grade will be updated. sourcedid: $sourcedid; Old score: $oldScore; New score: $score")
+						if $ce->{debug_lti_grade_passback};
+				} elsif ($oldScore ne '' && abs($score - $oldScore) < 0.001) {
+					# LMS has essentially the same score, no reason to update it
+					debug("LMS grade will NOT be updated - grade unchanges. Old score: $oldScore; New score: $score")
+						if $ce->{debug_lti_grade_passback};
+					$self->warning('LMS grade will NOT be updated - grade unchanged. '
+							. "Old score: $oldScore; New score: $score")
+						if ($ce->{debug_lti_grade_passback});
+					return 1;
+				} else {
+					debug("LMS grade will be updated. sourcedid: $sourcedid; Old score: $oldScore; New score: $score")
+						if $ce->{debug_lti_grade_passback};
+				}
+			}
+		} else {
+			$self->warning('Unable to retrieve prior grade from LMS. Note that if your server time is not correct, '
+					. 'this may fail for reasons which are less than obvious from the error messages. Error: '
+					. $response->message)
+				if ($ce->{debug_lti_grade_passback});
+			debug('Unable to retrieve prior grade from LMS. Note that if your server time is not correct, '
+					. 'this may fail for reasons which are less than obvious from the error messages. Error: '
+					. $response->message);
+			debug($response->body);
+			return 0;
+		}
+	}
+
+	# Send the LMS the new grade
+
+	# This is boilerplate XML used to submit the $score for $sourcedid
+	my $replaceResultXML = <<EOS;
 <?xml version = "1.0" encoding = "UTF-8"?>
 <imsx_POXEnvelopeRequest xmlns = "http://www.imsglobal.org/services/ltiv1p1/xsd/imsoms_v1p0">
   <imsx_POXHeader>
@@ -411,145 +353,79 @@ EOS
 </imsx_POXEnvelopeRequest>
 EOS
 
-    chomp($replaceResultXML);
-
-    $bodyhash = sha1_base64($replaceResultXML);
-
-    # since sha1_base64 doesn't pad we have to do so manually
-    while (length($bodyhash) % 4) {
-      $bodyhash .= '=';
-    }
-    my $message2='';
-    $message2 .= "mass_update: " if $self->{post_processing_mode};
-    $message2 .= "Submitting grade using sourcedid: $sourcedid and score: $score\n";
-    warn($message2) if $ce->{debug_lti_grade_passback};
-
-    $requestGen = Net::OAuth->request("consumer");
-    debug( "obtained requestGen $requestGen");
-
-    $requestGen->add_required_message_params('body_hash');
-    debug("add required message params");
-
-    # Change the time dependent portion of the nonce for the second stage
-    $uuid_p2 .= "-step2";
-
-    $gradeRequest = $requestGen->new(
-		  request_url => $request_url,
-		  request_method => "POST",
-		  consumer_secret => $ce->{LTIBasicConsumerSecret},
-		  consumer_key => $consumer_key,
-		  signature_method => $signature_method,
-		  nonce => "${uuid_p1}__${uuid_p2}",
-		  timestamp => time(),
-		  body_hash => $bodyhash
-							 );
-    debug("created grade request ". $gradeRequest);
-    $gradeRequest->sign();
-    debug("signed grade request");
-
-    $HTTPRequest = HTTP::Request->new(
-	       $gradeRequest->request_method,
-	       $gradeRequest->request_url,
-	       [
-		  'Authorization' => $gradeRequest->to_authorization_header,
-		  'Content-Type'  => 'application/xml',
-	       ],
-	       $replaceResultXML,
-		);
-    debug ("posting grade request: $HTTPRequest");
-
-    $response = eval {
-      LWP::UserAgent->new->request($HTTPRequest);
-    };
-    if ($@) {
-      warn "error sending HTTP request to LMS, $@";
-    }
-
-    # debug section
-    if ($ce->{debug_lti_grade_passback} and $ce->{debug_lti_parameters}){
-      warn "The request was:\n ". ($self->local_escape_html(join(" ",%$HTTPRequest)));
-      warn "The nonce used is ${uuid_p1}__${uuid_p2}\n";
-      warn "The response is:\n ". ($self->local_escape_html(join(" ", %$response )));
-      warn "The request was:\n ". ($self->local_escape_html(join(" ",%$HTTPRequest)));
-      debug( "The request was:\n ". ($self->local_escape_html(join(" ",%$HTTPRequest))) );
-      debug( "The nonce used is ${uuid_p1}__${uuid_p2}\n" );
-      debug( "The response is:\n ". ($self->local_escape_html(join(" ", %$response ))) );
-    }
-
-    if ($response->is_success) {
-      $response->content =~ /<imsx_codeMajor>\s*(\w+)\s*<\/imsx_codeMajor>/;
-      my $message = $1;
-      warn ("result is: $message\n") if $ce->{debug_lti_grade_passback};
-      if ($message ne 'success') {
-        debug("Unable to update LMS grade $sourcedid . LMS responded with message: ". $message) ;
-        return 0;
-      } else {
-        # if we got here we got successes from both the post and the lms
-        debug("Successfully updated LMS grade $sourcedid. LMS responded with message: ".$message );
-      }
-    } else {
-      debug("Unable to update LMS grade $sourcedid. Error: ".($response->message) );
-      debug($self->local_escape_html($response->content));
-      return 0;
-    }
-    debug("Success submitting grade using sourcedid: $sourcedid and score: $score\n") ;
-
-    return 1; # success
-  }
-  return 0; # failure as a fallback value
-}
-
-# does a mass update of all grades.  This is all user grades for
-# course grade mode and all user set grades for homework grade mode.
-sub mass_update {
-  my $self = shift;
-  my $r = $self->{r};
-  my $ce = $r->{ce};
-  my $db = $self->{r}->{db};
-  $self->{post_processing_mode}=1;
-
-  # sanity check
-  warn("course environment is not defined") unless ref($ce//'');
-  warn("database reference is not defined") unless ref($db//'');
-
-  my $lastUpdate = $db->getSettingValue('LTILastUpdate') // 0;
-  my $updateInterval = $ce->{LTIMassUpdateInterval} // -1; # -1 suppresses update
-
-  if ($updateInterval != -1 &&
-      time - $lastUpdate > $updateInterval) {
-
-    warn "\nperforming mass_update via LTI"  if $ce->{debug_lti_grade_passback};
-
-    $db->setSettingValue('LTILastUpdate',time());
+	chomp($replaceResultXML);
 
-    if ($ce->{LTIGradeMode} eq 'course') {
-      my @users = $db->listUsers();
+	my $bodyhash = sha1_base64($replaceResultXML);
 
-      foreach my $user (@users) {
-		$self->submit_course_grade($user);
-      }
-
-    } elsif ($ce->{LTIGradeMode} eq 'homework') {
-      my @users = $db->listUsers();
-
-      foreach my $user (@users) {
-		my @sets = $db->listUserSets($user);
-		warn "\nmass_update: all sets assigned to user $user :\n".join(" ",  @sets)."\n" if $ce->{debug_lti_grade_passback};
-		foreach my $set (@sets) {
-		    eval {
-		    	#$self->update_sourcedid($user);  #CHECK is this the right user id -- this doesn't update properly
-	  			$self->submit_set_grade($user,$set);
-	  		};
-	  		if ($@) {
-	  			warn "error in reporting $user, $set, $@" if $ce->{debug_lti_grade_passback};
-	  		}
+	# since sha1_base64 doesn't pad we have to do so manually
+	while (length($bodyhash) % 4) {
+		$bodyhash .= '=';
+	}
+	$self->warning("Submitting grade using sourcedid: $sourcedid and score: $score") if $ce->{debug_lti_grade_passback};
+
+	my $requestGen = Net::OAuth->request('consumer');
+	debug("obtained requestGen $requestGen");
+
+	$requestGen->add_required_message_params('body_hash');
+
+	# Change the time dependent portion of the nonce for the second stage
+	$uuid_p2 .= '-step2';
+
+	my $gradeRequest = $requestGen->new(
+		request_url      => $request_url,
+		request_method   => 'POST',
+		consumer_secret  => $ce->{LTI}{v1p1}{BasicConsumerSecret},
+		consumer_key     => $consumer_key,
+		signature_method => $signature_method,
+		nonce            => "${uuid_p1}__${uuid_p2}",
+		timestamp        => time(),
+		body_hash        => $bodyhash
+	);
+	debug("created grade request $gradeRequest");
+	$gradeRequest->sign;
+	debug('signed grade request');
+
+	my $request = await $ua->post_p(
+		$gradeRequest->request_url,
+		{ 'Authorization' => $gradeRequest->to_authorization_header, 'Content-Type' => 'application/xml' },
+		$replaceResultXML
+	)->catch(sub ($err) {
+			$self->warning("There was an error sending the grade to the LMS: $err");
+			return 0;
+	});
+
+	return 0 unless $request;
+	my $response = $request->result;
+
+	# Debug section
+	if ($ce->{debug_lti_grade_passback} && $ce->{debug_lti_parameters}) {
+		$self->warning("The request was:\n " . $replaceResultXML);
+		$self->warning("The nonce used is ${uuid_p1}__${uuid_p2}");
+		$self->warning("The response is:\n " . $response->to_string);
+		debug("The request was:\n " . $replaceResultXML);
+		debug("The nonce used is ${uuid_p1}__${uuid_p2}");
+		debug("The response is:\n " . $response->to_string);
+	}
 
+	if ($response->is_success) {
+		$response->body =~ /<imsx_codeMajor>\s*(\w+)\s*<\/imsx_codeMajor>/;
+		my $message = $1;
+		$self->warning("result is: $message") if $ce->{debug_lti_grade_passback};
+		if ($message ne 'success') {
+			debug("Unable to update LMS grade $sourcedid . LMS responded with message: $message");
+			return 0;
+		} else {
+			# If we got here, we got successes from both the post and the lms.
+			debug("Successfully updated LMS grade $sourcedid. LMS responded with message: $message");
 		}
-      }
-    }
-  }
-  $self->{post_processing_mode}=0;
+	} else {
+		debug("Unable to update LMS grade $sourcedid. Error: " . $response->message);
+		debug($response->body);
+		return 0;
+	}
+	debug("Success submitting grade using sourcedid: $sourcedid and score: $score");
+
+	return 1;
 }
 
 1;
-
diff --git a/lib/WeBWorK/Authen/LTIAdvantage.pm b/lib/WeBWorK/Authen/LTIAdvantage.pm
new file mode 100644
index 0000000000..9c6076c030
--- /dev/null
+++ b/lib/WeBWorK/Authen/LTIAdvantage.pm
@@ -0,0 +1,736 @@
+###############################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Authen::LTIAdvantage;
+use parent qw(WeBWorK::Authen);
+
+=head1 NAME
+
+WeBWorK::Authen::LTIAdvantage - Authenticate from a Learning Management System
+via the IMS LTI v1.3 protocol.
+
+=cut
+
+use strict;
+use warnings;
+use experimental 'signatures';
+
+use URI::Escape;
+use Mojo::UserAgent;
+use Mojo::JSON qw(decode_json);
+use Math::Random::Secure qw(irand);
+use Digest::SHA qw(sha256_hex);
+use Crypt::JWT qw(decode_jwt);
+
+use WeBWorK::Debug;
+use WeBWorK::CourseEnvironment;
+use WeBWorK::Localize;
+use WeBWorK::Utils qw(formatDateTime);
+use WeBWorK::Utils::Instructor qw(assignSetToUser);
+use WeBWorK::Authen::LTIAdvantage::SubmitGrade;
+
+=head1 CONSTRUCTOR
+
+=over
+
+=item new($c)
+
+Instantiates a new WeBWorK::Authen object for the given WeBWorK::Controller ($c).
+
+=back
+
+=cut
+
+sub new ($invocant, $c) {
+	return bless { c => $c }, ref($invocant) || $invocant;
+}
+
+sub request_has_data_for_this_verification_module ($self) {
+	debug('LTIAdvantage has been called for data verification');
+	my $c = $self->{c};
+
+	# This module insists that the course is configured for LTI 1.3.
+	if (!$c->ce->{LTIVersion} || $c->ce->{LTIVersion} ne 'v1p3') {
+		debug('LTIAdvantage returning that it is not configured for this course');
+		return 0;
+	}
+
+	# LTI 1.3 requests are exactly those that go through these routes.
+	if ($c->current_route eq 'ltiadvantage_login' || $c->current_route eq 'ltiadvantage_launch') {
+		debug('LTIAdvantage returning that it has sufficient data');
+		return 1;
+	}
+
+	debug('LTIAdvantage returning that it has insufficent data');
+	return 0;
+}
+
+sub verify ($self) {
+	my $c  = $self->{c};
+	my $ce = $c->ce;
+
+	# This happens before the parent class calls request_has_data_for_this_verification_module,
+	# so make sure to check the LTIVersion to ensure the course is configured for LTI 1.3.
+	if ($ce->{LTIVersion} && $ce->{LTIVersion} eq 'v1p3' && $c->current_route eq 'ltiadvantage_login') {
+		unless ($c->param('iss')
+			&& $ce->{LTI}{v1p3}{PlatformID} eq $c->param('iss')
+			&& $c->param('client_id')
+			&& $ce->{LTI}{v1p3}{ClientID} eq $c->param('client_id')
+			&& $c->param('lti_message_hint')
+			&& $c->param('login_hint'))
+		{
+			warn "The LTI Advantage login route was accessed with invalid or missing parameters.\n"
+				if $ce->{debug_lti_parameters};
+			debug('The LTI Advantage login route was accessed with invalid or missing parameters.');
+			return 0;
+		}
+
+		warn "The LTI Advantage login route was accessed with the appropriate parameters.\n"
+			if $ce->{debug_lti_parameters};
+		debug('The LTI Advantage login route was accessed with the appropriate parameters.');
+
+		# Create a state and nonce and save them.  These are generated so that they are cryptographically secure values.
+		#
+		# The courseID is included in the state so that it can be retrieved in the launch request before a course
+		# environment and database are available (in fact so that those things can be accessed for this course).  The
+		# launch request does not contain any unencrypted information other than the state, and the LMS is required to
+		# send the state back unmodified.  This kind of breaks the rule that the state be opaque though.
+		#
+		# To make this work when session_management_via is set to 'key', the hacks are abundant and ugly!  This would be
+		# much simpler if that setting did not need to be supported.  Then the state, nonce, and courseID could just be
+		# stored in a cookie.  It is not even possible to do that when session_management_via is set to 'session_cookie'
+		# because this information is needed before it is known what that setting is.  So the ugly hack described below
+		# needs to always be used.
+		#
+		# To save this to the database a user_id value is needed that is unique for this request, satisfies the database
+		# constrains on user_id's, and won't collide with webwork user_id's.  So the login_hint (the LMS user id) and
+		# courseID are joined with ',set_id:' (hacking into the existing login proctor hack -- what an ugly hack to
+		# begin with).  That means the LMS user id will also be needed to get the information back from the database,
+		# and so this is included in the state as well.
+		#
+		# To make matters worse, courseID's can contain hyphens, but user_id's can not.  Fortunately courseID's can not
+		# contain ampersats, while user_id's can.  So the hyphens in the courseID are replaced with ampersats.
+		#
+		# Finally, hack into the existing "nonce" key hack.  The actual state and nonce are joined with a tab
+		# character and saved in the set_id field.  Since the key value is "nonce", the database will not check
+		# to see that the user_id exists in the user table.
+
+		my $key_id = join(',set_id:', $c->param('login_hint'), $c->stash->{courseID} =~ s/-/@/gr);
+		$c->stash->{LTIState} =
+			join(',set_id:', $key_id, sha256_hex(join('', map { [ 0 .. 9, 'a' .. 'z' ]->[ irand(36) ] } 1 .. 20)));
+		$c->stash->{LTINonce} = sha256_hex(join('', map { [ 0 .. 9, 'a' .. 'z' ]->[ irand(36) ] } 1 .. 20));
+
+		$c->db->deleteKey($key_id);    # Delete a key with this user_id if one happens to exist.
+		my $key = $c->db->newKey(
+			user_id   => $key_id,
+			key       => 'nonce',
+			timestamp => time,
+			set_id    => join("\t", $c->stash->{LTIState}, $c->stash->{LTINonce})
+		);
+		$c->db->addKey($key);
+
+		return 1;
+	}
+
+	return $self->SUPER::verify;
+}
+
+sub get_credentials ($self) {
+	my $c = $self->{c};
+
+	my $ce = $c->ce;
+
+	debug('LTIAdvantage::get_credentials has been called');
+
+	# Disable password login
+	$self->{external_auth} = 1;
+
+	# Retrieve the state and nonce from the key table and delete the key.
+	# See the comments about the hacks involved here in the WeBWorK::Authen::LTIAdvantage::verify method above.
+	my $key_id = join(',set_id:', $c->stash->{lti_lms_user_id}, $c->stash->{courseID} =~ s/-/@/gr);
+	my $key    = $c->db->getKey($key_id);
+	($c->stash->{LTIState}, $c->stash->{LTINonce}) = split "\t", $key->set_id;
+	$c->db->deleteKey($key_id);
+
+	$self->purge_old_state_keys;
+
+	# Verify the state.
+	unless ($c->param('state') && $c->stash->{LTIState} && $c->stash->{LTIState} eq $c->param('state')) {
+		$self->{error} = $c->maketext(
+			'There was an error during the login process.  Please speak to your instructor or system administrator.');
+		warn "Invalid state in response from LMS.  Possible CSFR.\n" if $ce->{debug_lti_parameters};
+		debug('Invalid state in response from LMS.  Possible CSFR.');
+		return 0;
+	}
+
+	return 0 unless (my $claims = $self->extract_jwt_claims);
+
+	if ($ce->{debug_lti_parameters}) {
+		warn "====== JWT PARAMETERS RECEIVED ======\n";
+		warn $c->dumper($claims);
+		warn "\n";
+	}
+
+	# Verify the nonce.
+	if (!defined $claims->{nonce} || $claims->{nonce} ne $c->stash->{LTINonce}) {
+		$self->{error} = $c->maketext(
+			'There was an error during the login process.  Please speak to your instructor or system administrator.');
+		warn "Incorrect nonce received in response.\n" if $ce->{debug_lti_parameters};
+		debug('Incorrect nonce received in response so LTIAdvantage::get_credentials is returning 0.');
+		return 0;
+	}
+
+	# Verify the deployment id.
+	if (!defined $claims->{'https://purl.imsglobal.org/spec/lti/claim/deployment_id'}
+		|| $claims->{'https://purl.imsglobal.org/spec/lti/claim/deployment_id'} ne $ce->{LTI}{v1p3}{DeploymentID})
+	{
+		$c->log->info($claims->{'https://purl.imsglobal.org/spec/lti/claim/deployment_id'});
+		$self->{error} = $c->maketext(
+			'There was an error during the login process.  Please speak to your instructor or system administrator.');
+		warn "Incorrect deployment id received in response.\n" if $ce->{debug_lti_parameters};
+		debug('Incorrect deployment id received in response so LTIAdvantage::get_credentials is returning 0.');
+		return 0;
+	}
+
+	# Get the target_link_uri from the claims.
+	$c->stash->{LTILauncRedirect} = $claims->{'https://purl.imsglobal.org/spec/lti/claim/target_link_uri'};
+
+	unless (defined $c->stash->{LTILauncRedirect}) {
+		$self->{error} = $c->maketext(
+			'There was an error during the login process.  Please speak to your instructor or system administrator.');
+		warn 'LTI is not properly configured (failed to obtain target_link_uri). '
+			. "Please contact your instructor or system administrator.\n";
+		debug('Failed to obtain target_link_uri so LTIAdvantage::get_credentials is returning 0.');
+		return 0;
+	}
+
+	# Get the courseID from the target_link_uri and verify that it is the same as the one that was in the state.
+	my $location = $c->location;
+	my $target   = $c->url_for($c->stash->{LTILauncRedirect})->path;
+	my $courseID;
+	$courseID = $1 if $target =~ m|$location/([^/]*)|;
+
+	unless ($courseID && $courseID eq $c->stash->{courseID}) {
+		$self->{error} = $c->maketext(
+			'There was an error during the login process.  Please speak to your instructor or system administrator.');
+		debug('The courseID in the login request does not match the courseID in the launch request JWT.  '
+				. 'So LTIAdvantage::get_credentials is returning 0.');
+		return 0;
+	}
+
+	# Determine the user_id to use, if possible.
+	if (!$ce->{LTI}{v1p3}{preferred_source_of_username}) {
+		warn 'LTI is not properly configured (no preferred_source_of_username). '
+			. "Please contact your instructor or system administrator.\n";
+		$self->{error} = $c->maketext(
+			'There was an error during the login process.  Please speak to your instructor or system administrator.');
+		debug("No preferred_source_of_username in $ce->{courseName} so LTIAdvantage::get_credentials is returning 0.");
+		return 0;
+	}
+
+	my $user_id_source = '';
+	my $type_of_source = '';
+
+	$self->{email} = defined $claims->{email} ? uri_unescape($claims->{email} // '') : '';
+
+	my $extract_claim = sub ($key) {
+		my $value = $claims;
+		for (split '#', $key) {
+			if (defined $value->{$_}) {
+				$value = $value->{$_};
+			} else {
+				return;
+			}
+		}
+		return $value;
+	};
+
+	if (my $user_id = $extract_claim->($ce->{LTI}{v1p3}{preferred_source_of_username})) {
+		$user_id_source  = $ce->{LTI}{v1p3}{preferred_source_of_username};
+		$type_of_source  = 'preferred_source_of_username';
+		$self->{user_id} = $user_id;
+	}
+
+	# Fallback if necessary
+	if (!defined $self->{user_id} && (my $user_id = $extract_claim->($ce->{LTI}{v1p3}{fallback_source_of_username}))) {
+		$user_id_source  = $ce->{LTI}{v1p3}{fallback_source_of_username};
+		$type_of_source  = 'fallback_source_of_username';
+		$self->{user_id} = $user_id;
+	}
+
+	if ($self->{user_id}) {
+		# Strip off the part of the address after @ if the email address was used and it was requested to do so.
+		$self->{user_id} =~ s/@.*$// if $user_id_source eq 'email' && $ce->{LTI}{v1p3}{strip_domain_from_email};
+
+		# Make user_id lowercase for consistency in naming if configured.
+		$self->{user_id} = lc($self->{user_id}) if $ce->{LTI}{v1p3}{lowercase_username};
+
+		$self->{ $_->[0] } = $extract_claim->($_->[1])
+			for (
+				[ roles      => 'https://purl.imsglobal.org/spec/lti/claim/roles' ],
+				[ last_name  => 'family_name' ],
+				[ first_name => 'given_name' ],
+				[ section    => 'https://purl.imsglobal.org/spec/lti/claim/custom#section' ],
+				[ recitation => 'https://purl.imsglobal.org/spec/lti/claim/custom#recitation' ],
+			);
+
+		$self->{student_id} =
+			$ce->{LTI}{v1p3}{preferred_source_of_student_id}
+			? ($extract_claim->($ce->{LTI}{v1p3}{preferred_source_of_student_id}) // '')
+			: '';
+
+		# For setting up it is helpful to print out what is believed to be the user id and address is at this point.
+		if ($ce->{debug_lti_parameters}) {
+			warn "=========== SUMMARY ============\n";
+			warn "User id is |$self->{user_id}| (obtained from $user_id_source which was $type_of_source)\n";
+			warn "User email address is |$self->{email}|\n";
+			warn "strip_domain_from_email is |", $ce->{LTI}{v1p3}{strip_domain_from_email} // 0, "|\n";
+			warn "Student id is |$self->{student_id}|\n";
+			warn "preferred_source_of_username is |$ce->{LTI}{v1p3}{preferred_source_of_username}|\n";
+			warn "fallback_source_of_username is |", $ce->{LTI}{v1p3}{fallback_source_of_username} // 'undefined',
+				"|\n";
+			warn "preferred_source_of_student_id is |",
+				$ce->{LTI}{v1p3}{preferred_source_of_student_id} // 'undefined', "|\n";
+			warn "================================\n";
+		}
+		if (!defined($self->{user_id})) {
+			die 'LTIAdvantage was unable to create a username from the data provided with the current settings. '
+				. "Set \$debug_lti_parameters=1 in authen_LTI.conf to debug.\n";
+		}
+
+		# Save these for later if they are available in the JWT.  It is important that the lti_lms_user_id be updated
+		# with the 'sub' value from the claim.  The value from the state can not entirely be trusted.  In addition, this
+		# may not be the same as the original login_hint (it is different for Canvas, but the same for Moodle).
+		$c->stash->{lti_lms_user_id} = $claims->{sub};
+		$c->stash->{lti_lms_lineitem} =
+			$extract_claim->('https://purl.imsglobal.org/spec/lti-ags/claim/endpoint#lineitem');
+
+		# Extract a possible setID from the target_link_uri.  This may not be an actual setID.
+		# That will be verified later in WeBWorK::Authen::LTIAdvantage::SubmitGrade::update_sourcedid.
+		$c->stash->{setID} = $1 if $target =~ m|$location/$courseID/([^/]*)|;
+
+		$self->{login_type}        = 'normal';
+		$self->{credential_source} = 'LTIAdvantage';
+		debug('LTIAdvantange::get_credentials is returning 1.');
+		return 1;
+	}
+
+	$self->{error} = $c->maketext(
+		'There was an error during the login process.  Please speak to your instructor or system administrator.');
+	warn 'LTI is not properly configured. Unable to determine username. '
+		. "Please contact your instructor or system administrator.\n";
+	debug('LTIAdvantange::get_credentials is returning 0.');
+	return 0;
+}
+
+# Get the public keyset from the LMS and cache it in the database or just return what is already cached in the database.
+sub get_lms_public_keyset ($self, $renew = 0) {
+	my $c  = $self->{c};
+	my $ce = $c->ce;
+	my $db = $c->db;
+
+	my $keyset_str;
+
+	if (!$renew) {
+		$keyset_str = $db->getSettingValue('LTIAdvantageLMSPublicKey');
+		return decode_json($keyset_str) if $keyset_str;
+	}
+
+	# Get public keyset from the LMS.
+	my $response = Mojo::UserAgent->new->get($ce->{LTI}{v1p3}{PublicKeysetURL})->result;
+	unless ($response->is_success) {
+		$self->{error} = $c->maketext(
+			'There was an error during the login process.  Please speak to your instructor or system administrator.');
+		warn 'Failed to obtain public key from LMS: ' . $response->message . "\n" if $ce->{debug_lti_parameters};
+		debug('Failed to obtain public key from LMS: ' . $response->message);
+		return;
+	}
+
+	$keyset_str = $response->body;
+	my $keyset = eval { decode_json($keyset_str) };
+	if ($@ || ref($keyset) ne 'HASH' || !defined $keyset->{keys}) {
+		$self->{error} = $c->maketext(
+			'There was an error during the login process.  Please speak to your instructor or system administrator.');
+		warn "Received an invalid response from the LMS public keyset URL.\n" if $ce->{debug_lti_parameters};
+		debug('Received an invalid response from the LMS public keyset URL.');
+		return;
+	}
+	$db->setSettingValue('LTIAdvantageLMSPublicKey', $keyset_str);
+
+	return $keyset;
+}
+
+sub extract_jwt_claims ($self) {
+	my $c  = $self->{c};
+	my $ce = $c->ce;
+
+	my %jwt_params = (
+		token      => $c->param('id_token'),
+		verify_iss => $ce->{LTI}{v1p3}{PlatformID},
+		verify_aud => $ce->{LTI}{v1p3}{ClientID},
+		verify_iat => 1,
+		verify_exp => 1,
+		# This just checks that this claim is present.
+		verify_sub => sub ($value) { return $value =~ /\S/ }
+	);
+
+	$jwt_params{kid_keys} = $self->get_lms_public_keyset;
+	return unless $jwt_params{kid_keys};
+
+	my $claims = eval { decode_jwt(%jwt_params); };
+
+	# If decoding of the JWT failed, then try to get a new LMS public keyset and try again.  It could be that the
+	# keyset that was previously saved in the database has expired.
+	unless ($claims) {
+		$jwt_params{kid_keys} = $self->get_lms_public_keyset(1);
+		$claims = eval { $claims = decode_jwt(%jwt_params) };
+	}
+	if ($@) {
+		$self->{error} = $c->maketext(
+			'There was an error during the login process.  Please speak to your instructor or system administrator.');
+		warn "Failed to decode token received from LMS: $@\n" if $ce->{debug_lti_parameters};
+		debug("Failed to decode token received from LMS: $@");
+		return;
+	}
+
+	return $claims;
+}
+
+sub purge_old_state_keys ($self) {
+	my $c    = $self->{c};
+	my $ce   = $c->ce;
+	my $db   = $c->db;
+	my $time = time;
+
+	my @userIDs = $db->listKeys();
+	my @keys    = $db->getKeys(@userIDs);
+
+	my $modCourseID = $ce->{courseName} =~ s/-/@/gr;
+
+	# Delete any "nonce state" keys for this course that are older than $ce->{LTI}{v1p3}{StateKeyLifetime}.
+	for my $key (@keys) {
+		$db->deleteKey($key->user_id)
+			if $key->key eq "nonce"
+			&& ($time - $key->timestamp > $ce->{LTI}{v1p3}{StateKeyLifetime})
+			&& $key->user_id =~ /,set_id:$modCourseID$/;
+	}
+
+	return;
+}
+
+# Minor modification of method in superclass.
+sub check_user ($self) {
+	my $c     = $self->{c};
+	my $ce    = $c->ce;
+	my $db    = $c->db;
+	my $authz = $c->authz;
+
+	my $user_id = $self->{user_id};
+
+	debug("LTIAdvantange::check_user has been called for user_id = |$user_id|");
+
+	if (!defined $user_id || $user_id eq '') {
+		$self->{log_error} .= 'no user id specified';
+		$self->{error} = $c->maketext(
+			'There was an error during the login process.  Please speak to your instructor or system administrator.');
+		return 0;
+	}
+
+	my $User = $db->getUser($user_id);
+
+	if (!$User) {
+		debug("User |$user_id| is unknown but may be an new user from an LMS via LTI.");
+		return 1;
+	}
+
+	unless ($ce->status_abbrev_has_behavior($User->status, 'allow_course_access')) {
+		$self->{log_error} .= "LOGIN FAILED $user_id - course access denied";
+		$self->{error} = $c->maketext('Authentication failed.  Please speak to your instructor.');
+		return 0;
+	}
+
+	unless ($authz->hasPermissions($user_id, 'login')) {
+		$self->{log_error} .= "LOGIN FAILED $user_id - no permission to login";
+		$self->{error} = $c->maketext('Authentication failed.  Please speak to your instructor.');
+		return 0;
+	}
+
+	debug('LTIAdvantange::check_user is about to return a 1.');
+	return 1;
+}
+
+# Disable practice users.  This shouldn't actually be called in any case.
+sub verify_practice_user ($self) { return 0; }
+
+sub verify_normal_user ($self) {
+	my ($c, $user_id, $session_key) = map { $self->{$_}; } ('c', 'user_id', 'session_key');
+
+	debug("LTIAdvantage::verify_normal_user called for user |$user_id|");
+
+	# Call check_session in order to destroy any existing session cookies and key table sessions.
+	my ($sessionExists, $keyMatches, $timestampValid) = $self->check_session($user_id, $session_key, 0);
+	debug('sessionExists="', $sessionExists, '" keyMatches="', $keyMatches, '" timestampValid="', $timestampValid, '"');
+
+	my $auth_result = $self->authenticate;
+
+	debug("auth_result=|${auth_result}|");
+
+	$c->param("user" => $user_id);
+
+	if ($auth_result eq '1') {
+		$self->{session_key} = $self->create_session($user_id);
+		debug("session_key=|" . $self->{session_key} . "|.");
+		return 1;
+	} else {
+		$self->{error} = $auth_result;
+		$self->{log_error} .= "$user_id - authentication failed: " . $self->{error};
+		return 0;
+	}
+}
+
+sub authenticate ($self) {
+	my ($c, $user) = map { $self->{$_}; } ('c', 'user_id');
+
+	debug("LTIAdvantange::authenticate called for user |$user|");
+
+	# The actual authentication for this module has already been done.  This just creates and updates users if needed.
+
+	my $ce         = $c->ce;
+	my $db         = $c->db;
+	my $courseName = $c->ce->{courseName};
+
+	if (!$db->existsUser($self->{user_id})) {
+		# New User. Create User record.
+		if ($ce->{block_lti_create_user}) {
+			$self->{log_error} .=
+				"Account creation blocked by block_lti_create_user setting. Did not create user $self->{user_id}.";
+			if ($ce->{debug_lti_parameters}) {
+				warn $c->maketext('Account creation is currently disabled in this course.  '
+						. 'Please speak to your instructor or system administrator.')
+					. "\n";
+			}
+			return 0;
+		} else {
+			# Attempt to create the user, and warn if that fails.
+			unless ($self->create_user) {
+				$self->{log_error} .= "Failed to create user $self->{user_id}.";
+				warn "Failed to create user $self->{user_id}.\n" if ($ce->{debug_lti_parameters});
+			}
+		}
+	} elsif ($ce->{LMSManageUserData}) {
+		# Existing user. Possibly modify demographic information and permission level.
+		# Set here so login gets logged, even for accounts which maybe_update_user would
+		# not modify or if it fails to update.
+		$self->{initial_login} = 1;
+		unless ($self->maybe_update_user) {
+			# Do not fail the login if data update failed.
+			warn 'The system failed to update some of your account information. '
+				. "Please speak to your instructor or system administrator.\n";
+		}
+	} else {
+		# Set here so login gets logged when $ce->{LMSManageUserData} is false.
+		$self->{initial_login} = 1;
+	}
+
+	# If we are using grade passback then make sure the data we need to submit the grade is kept up to date.
+	my $LTIGradeMode = $ce->{LTIGradeMode} // '';
+	if ($LTIGradeMode eq 'course' || $LTIGradeMode eq 'homework') {
+		WeBWorK::Authen::LTIAdvantage::SubmitGrade->new($c)->update_passback_data($self->{user_id});
+	}
+
+	return 1;
+}
+
+# Create a new user trying to log in for the first time.
+sub create_user ($self) {
+	my $c          = $self->{c};
+	my $ce         = $c->ce;
+	my $db         = $c->db;
+	my $userID     = $self->{user_id};
+	my $courseName = $c->ce->{courseName};
+
+	# Determine the roles defined for this user defined in the LTI request and assign a permission level on that basis.
+	my @LTIroles = @{ $self->{roles} };
+
+	# Restrict to institution and context roles and remove the purl link portion (ignore system roles).
+	@LTIroles =
+		map {s|^[^#]*#||r}
+		grep {m!^http://purl.imsglobal.org/vocab/lis/v2/(membership|institution\/person)#!} @LTIroles;
+
+	if ($ce->{debug_lti_parameters}) {
+		warn "The adjusted LTI roles defined for this user are: \n-- " . join("\n-- ", @LTIroles),
+			"\n" . "The user will be assigned the highest role defined for them.\n";
+	}
+
+	if (!defined($ce->{userRoles}{ $ce->{LTI}{v1p3}{LMSrolesToWeBWorKroles}{ $LTIroles[0] } })) {
+		die "Cannot find a WeBWorK role that corresponds to the LMS role of $LTIroles[0].\n";
+	}
+
+	my $LTI_webwork_permissionLevel = $ce->{userRoles}{ $ce->{LTI}{v1p3}{LMSrolesToWeBWorKroles}{ $LTIroles[0] } };
+	if (@LTIroles > 1) {
+		for (@LTIroles[ 1 .. $#LTIroles ]) {
+			my $wwRole = $ce->{LTI}{v1p3}{LMSrolesToWeBWorKroles}{$_};
+			next unless defined $wwRole;
+			$LTI_webwork_permissionLevel = $ce->{userRoles}{$wwRole}
+				if ($LTI_webwork_permissionLevel < $ce->{userRoles}{$wwRole});
+		}
+	}
+
+	warn "New user: $userID -- requested permission level is $LTI_webwork_permissionLevel.\n"
+		if $ce->{debug_lti_parameters};
+
+	# We dont create users with too high of a permission level for security reasons.
+	if ($LTI_webwork_permissionLevel > $ce->{userRoles}{ $ce->{LTIAccountCreationCutoff} }) {
+		die $c->maketext(
+			'The instructor account with user id [_1] does not exist.  '
+				. 'Instructor accounts must be created manually.',
+			$userID
+		) . "\n";
+	}
+
+	my $newUser = $db->newUser;
+	$newUser->user_id($userID);
+	$newUser->last_name($self->{last_name}   =~ s/\+/ /gr);
+	$newUser->first_name($self->{first_name} =~ s/\+/ /gr);
+	$newUser->email_address($self->{email});
+	$newUser->status('C');
+	$newUser->section($self->{section}       // '');
+	$newUser->recitation($self->{recitation} // '');
+	$newUser->comment(formatDateTime(time, 'local'));
+	$newUser->student_id($self->{student_id} // '');
+
+	# Allow sites to customize the user.
+	$ce->{LTI}{v1p3}{modify_user}($self, $newUser) if ref($ce->{LTI}{v1p3}{modify_user}) eq 'CODE';
+
+	$db->addUser($newUser);
+	$self->write_log_entry("New user $userID added via LTIAdvantange login");
+
+	# Set permission level.
+	my $newPermissionLevel = $db->newPermissionLevel();
+	$newPermissionLevel->user_id($userID);
+	$newPermissionLevel->permission($LTI_webwork_permissionLevel);
+	$db->addPermissionLevel($newPermissionLevel);
+	$c->authz->{PermissionLevel} = $newPermissionLevel;
+
+	# Assign existing sets.
+	my @setsToAssign;
+
+	my @globalSetIDs = $db->listGlobalSets;
+	my @GlobalSets   = $db->getGlobalSets(@globalSetIDs);
+	for my $globalSet (@GlobalSets) {
+		# Assign all visible or "published" sets
+		if ($globalSet->visible) {
+			push @setsToAssign, $globalSet;
+			assignSetToUser($db, $userID, $globalSet);
+		}
+	}
+	$self->{numberOfSetsAssigned} = scalar @setsToAssign;
+
+	# Assign all existing achievements.
+	my @achievementIDs = $db->listAchievements;
+	for my $achievementID (@achievementIDs) {
+		my $achievement = $db->getAchievement($achievementID);
+		if ($achievement->enabled) {
+			my $userAchievement = $db->newUserAchievement();
+			$userAchievement->user_id($userID);
+			$userAchievement->achievement_id($achievementID);
+			$db->addUserAchievement($userAchievement);
+		}
+	}
+	# Initialize global achievement data.
+	my $globalUserAchievement = $db->newGlobalUserAchievement;
+	$globalUserAchievement->user_id($userID);
+	$globalUserAchievement->achievement_points(0);
+	$db->addGlobalUserAchievement($globalUserAchievement);
+
+	# Give schools the chance to modify newly added sets
+	if (ref($ce->{LTI}{v1p3}{modify_user_set}) eq 'CODE') {
+		for my $globalSet (@setsToAssign) {
+			my $userSet = $db->getUserSet($userID, $globalSet->set_id);
+			next unless $userSet;
+
+			$ce->{LTI}{v1p3}{modify_user_set}($self, $globalSet, $userSet);
+			$db->putUserSet($userSet);
+		}
+	}
+
+	$self->{initial_login} = 1;
+
+	return 1;
+}
+
+# possibly update a user logging in
+sub maybe_update_user ($self) {
+	my $c  = $self->{c};
+	my $ce = $c->ce;
+	my $db = $c->db;
+
+	my $userID     = $self->{user_id};
+	my $courseName = $ce->{courseName};
+
+	my $user            = $db->getUser($userID);
+	my $permissionLevel = $db->getPermissionLevel($userID);
+
+	# We don't alter records of users with too high a permission.
+	if (defined($permissionLevel->permission)
+		&& $permissionLevel->permission > $ce->{userRoles}{ $ce->{LTIAccountCreationCutoff} })
+	{
+		return 1;
+	} else {
+		# Create a temp user and run it through the create process
+		my $tempUser = $db->newUser();
+		$tempUser->user_id($userID);
+		$tempUser->last_name(($self->{last_name}   // '') =~ s/\+/ /gr);
+		$tempUser->first_name(($self->{first_name} // '') =~ s/\+/ /gr);
+		$tempUser->email_address($self->{email});
+		$tempUser->status('C');
+		$tempUser->section($self->{section}       // '');
+		$tempUser->recitation($self->{recitation} // '');
+		$tempUser->student_id($self->{student_id} // '');
+
+		# Allow sites to customize the temp user
+		$ce->{LTI}{v1p1}{modify_user}($self, $tempUser) if ref($ce->{LTI}{v1p1}{modify_user}) eq 'CODE';
+
+		my $change_made = 0;
+		for my $element (qw(last_name first_name email_address status section recitation student_id)) {
+			if ($user->$element ne $tempUser->$element) {
+				$change_made = 1;
+				warn "WeBWorK User has $element: "
+					. $user->$element
+					. " but LMS user has $element "
+					. $tempUser->$element . "\n"
+					if ($ce->{debug_lti_parameters});
+			}
+		}
+
+		if ($change_made) {
+			$tempUser->comment(formatDateTime(time, 'local'));
+			eval { $db->putUser($tempUser) };
+			if ($@) {
+				$self->write_log_entry("Failed to update user $userID in LTIAdvantange login: $@");
+				warn "Failed to update user $userID in LTIAdvantange login.\n" if ($ce->{debug_lti_parameters});
+				return 0;
+			} else {
+				$self->write_log_entry("Demographic data for user $userID modified via LTIAdvantange login");
+				warn "Existing user: $userID updated.\n" if ($ce->{debug_lti_parameters});
+				return 1;
+			}
+		} else {
+			return 1;
+		}
+	}
+}
+
+1;
diff --git a/lib/WeBWorK/Authen/LTIAdvantage/SubmitGrade.pm b/lib/WeBWorK/Authen/LTIAdvantage/SubmitGrade.pm
new file mode 100644
index 0000000000..b4eb475b35
--- /dev/null
+++ b/lib/WeBWorK/Authen/LTIAdvantage/SubmitGrade.pm
@@ -0,0 +1,367 @@
+###############################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Authen::LTIAdvantage::SubmitGrade;
+
+=head1 NAME
+
+WeBWorK::Authen::LTIAdvanced::SubmitGrade - pass back grades to an enabled LMS via LTI 1.3
+
+=cut
+
+use Mojo::Base -signatures, -async_await;
+
+use Carp;
+use Net::OAuth;
+use HTML::Entities;
+use Mojo::UserAgent;
+use Mojo::JSON qw(decode_json encode_json);
+use Mojo::File;
+use Mojo::Date;
+use Mojo::IOLoop;
+use Crypt::JWT qw(encode_jwt);
+use Crypt::PK::RSA;
+use Math::Random::Secure qw(irand);
+use Digest::SHA qw(sha256_hex);
+use Time::HiRes;
+
+use WeBWorK::Debug;
+use WeBWorK::Utils qw(grade_set grade_gateway grade_all_sets wwRound);
+
+# This package contains utilities for submitting grades to the LMS via LTI 1.3.
+sub new ($invocant, $c, $post_processing_mode = 0) {
+	return bless { c => $c, post_processing_mode => $post_processing_mode }, ref($invocant) || $invocant;
+}
+
+# Use the app log for warnings in post processing mode as perl warnings are not caught in the job queue.  Otherwise just
+# use warn as those are caught by the global webwork2 warn handler.  Warnings are only sent if debug_lti_grade_passback
+# is set, but these warnings are always sent to the debug log if debugging is enabled.
+sub warning ($self, $warning) {
+	debug($warning);
+	return unless $self->{c}{ce}{debug_lti_grade_passback};
+
+	if ($self->{post_processing_mode}) {
+		$self->{c}{app}->log->info($warning);
+	} else {
+		warn $warning . "\n";
+	}
+
+	return;
+}
+
+# This updates the data needed for grade passback for the user and set.  The LMS lineitem for the set is saved in the
+# the course settings table for course grade mode or in the lis_source_did column of the global set table for homework
+# grade mode.
+sub update_passback_data ($self, $userID) {
+	my $c  = $self->{c};
+	my $ce = $c->{ce};
+	my $db = $c->{db};
+
+	# The lti_lms_user_id is what identifies the user to the LMS.
+	# It was the 'sub' user claim in the JWT received from the lms.
+	# FIXME:  This just uses the old user lis_source_did column for now.
+	# It should have its own appropriately named column.
+	if ($c->stash->{lti_lms_user_id}) {
+		my $user = $db->getUser($userID);
+		if (!defined $user->lis_source_did || $user->lis_source_did ne $c->stash->{lti_lms_user_id}) {
+			$user->lis_source_did($c->stash->{lti_lms_user_id});
+			$db->putUser($user);
+		}
+	} else {
+		$self->warning('Missing LMS user id (sub) in JWT.');
+	}
+
+	# The lti_lms_lineitem is the url to post grades to.  It was the 'lineitem' key of the
+	# 'https://purl.imsglobal.org/spec/lti-ags/claim/endpoint' object in the JWT received from the LMS.
+	if ($ce->{LTIGradeMode} eq 'course') {
+		$db->setSettingValue('LTIAdvantageCourseLineitem', $c->stash->{lti_lms_lineitem});
+	} elsif ($ce->{LTIGradeMode} eq 'homework') {
+		# FIXME:  This uses the global set lis_source_did column.  That column is named such so that a new corresponding
+		# column is not needed in the set_user table (even though this is not an lis_source_did).  An appropriately
+		# named column is needed.  Also, why is the set_user lis_source_did column of type BLOB?  This lineitem also has
+		# much more potential.  You can pass grades back for any student as long as you have the LMS user id above.
+		# That user id will be the same for all sets for this user.
+		if (defined $c->stash->{setID} && $c->stash->{lti_lms_lineitem}) {
+			my $set = $db->getGlobalSet($c->stash->{setID});
+			if (defined $set
+				&& (!defined $set->lis_source_did || $set->lis_source_did ne $c->stash->{lti_lms_lineitem}))
+			{
+				$set->lis_source_did($c->stash->{lti_lms_lineitem});
+				$db->putGlobalSet($set);
+			}
+		}
+	}
+
+	# Update the access token if neccessary.  No need to wait for it to finish here since the token is not needed yet.
+	# This just obtains it if needed for later.
+	$self->get_access_token;
+
+	return;
+}
+
+# Get an access token.  If there is a current token in the database, then use that.
+# Otherwise get a new one from the LMS.
+async sub get_access_token ($self) {
+	my $c  = $self->{c};
+	my $ce = $c->{ce};
+	my $db = $c->{db};
+
+	my $current_token = decode_json($db->getSettingValue('LTIAdvantageAccessToken') // '{}');
+
+	# If the token is still valid (and not about to expire) then it can still be used.
+	if (%$current_token && $current_token->{timestamp} + $current_token->{expires_in} > time + 60) {
+		$self->warning('Using current access token from database.');
+		return $current_token;
+	}
+
+	# The token is about to expire, so get a new one.
+
+	my ($private_key, $err) = get_site_key($ce, 1);
+	if (!$private_key) {
+		$self->warning("Error loading or generating site keys: $err");
+		return;
+	}
+
+	my $jwt = eval {
+		encode_jwt(
+			payload => {
+				aud => $ce->{LTI}{v1p3}{AccessTokenURL},
+				iss => $c->url_for('root')->to_abs->to_string,
+				sub => $ce->{LTI}{v1p3}{ClientID},
+				jti => $private_key->{kid}
+			},
+			key           => $private_key,
+			extra_headers => { kid => $private_key->{kid} },
+			alg           => 'RS256',
+			auto_iat      => 1,
+			relative_exp  => 3600,
+		);
+	};
+	if ($@) {
+		$self->warning("Error encoding JWT: $@") if $@;
+		return;
+	}
+
+	my $request = await Mojo::UserAgent->new->post_p(
+		$ce->{LTI}{v1p3}{AccessTokenURL},
+		{ 'Content-Type' => 'application/x-www-form-urlencoded' },
+		form => {
+			grant_type            => 'client_credentials',
+			client_assertion_type => 'urn:ietf:params:oauth:client-assertion-type:jwt-bearer',
+			scope                 => join(' ',
+				'https://purl.imsglobal.org/spec/lti-ags/scope/lineitem',
+				'https://purl.imsglobal.org/spec/lti-ags/scope/lineitem.readonly',
+				'https://purl.imsglobal.org/spec/lti-ags/scope/result.readonly',
+				'https://purl.imsglobal.org/spec/lti-ags/scope/score'),
+			client_assertion => $jwt
+		}
+	)->catch(sub ($err) {
+			$self->warning("Error communicating with LMS key server: $err\n");
+			return;
+	});
+
+	return unless $request;
+
+	my $response = $request->result;
+
+	if ($response->is_success) {
+		# Decode the JSON response so that a timestamp can be added, then reencode it and save it.
+		$current_token = decode_json($response->body);
+		$current_token->{timestamp} = time;
+		$db->setSettingValue('LTIAdvantageAccessToken', encode_json($current_token));
+		$self->warning('Successfully obtained new access token from LMS.');
+		return $current_token;
+	}
+
+	$self->warning(join("\n", 'Failed to obtain access token from LMS:', $response->message));
+	return;
+}
+
+# Computes and submits the course grade for userID to the LMS.
+# The course grade is the average of all sets assigned to the user.
+async sub submit_course_grade ($self, $userID) {
+	my $c  = $self->{c};
+	my $ce = $c->{ce};
+	my $db = $c->{db};
+
+	my $user = $db->getUser($userID);
+	return 0 unless $user;
+
+	my $lineitem = $db->getSettingValue('LTIAdvantageCourseLineitem');
+
+	$self->warning("Submitting all grades for user $userID");
+	$self->warning('LMS user id is not available for this user.')   unless $user->lis_source_did;
+	$self->warning('LMS lineitem is not available for the course.') unless $lineitem;
+
+	return await $self->submit_grade($user->lis_source_did, $lineitem, scalar(grade_all_sets($db, $userID)));
+}
+
+# Computes and submits the set grade for $userID and $setID to the LMS.  For gateways the best score is used.
+async sub submit_set_grade ($self, $userID, $setID) {
+	my $c  = $self->{c};
+	my $ce = $c->{ce};
+	my $db = $c->{db};
+
+	my $user = $db->getUser($userID);
+	return 0 unless $user;
+
+	my $userSet = $db->getMergedSet($userID, $setID);
+
+	$self->warning("Submitting grade for user $userID and set $setID.");
+	$self->warning('LMS user id is not available for this user.') unless $user->lis_source_did;
+	$self->warning('LMS lineitem is not available for this set.') unless $userSet->lis_source_did;
+
+	return await $self->submit_grade(
+		$user->lis_source_did,
+		$userSet->lis_source_did,
+		scalar(
+			$userSet->assignment_type =~ /gateway/
+			? grade_gateway($db, $userSet, $userSet->set_id, $userID)
+			: grade_set($db, $userSet, $userID, 0)
+		)
+	);
+}
+
+# Submits a score of $score to the lms with $sourcedid as the identifier.
+async sub submit_grade ($self, $LMSuserID, $lineitem, $score) {
+	my $c  = $self->{c};
+	my $ce = $c->{ce};
+
+	return 0 unless $LMSuserID && $lineitem && (my $access_token = await $self->get_access_token);
+
+	$self->warning('Found data required for submitting grades to LMS.');
+
+	# In post processing mode $c is not a real Mojolicious::Controller.  The app is passed in though.
+	# So change $c to be the app instead to get access to the url_for helper.
+	$c = $c->{app} if $self->{post_processing_mode};
+
+	$score = wwRound(2, $score);
+
+	my $ua = Mojo::UserAgent->new;
+
+	if ($ce->{LTICheckPrior}) {
+		$self->warning('Retrieving prior grade.');
+
+		my $results_url = $c->url_for($lineitem);
+		push(@{ $results_url->path }, 'results');
+
+		my $request = await $ua->get_p(
+			$results_url->query(user_id => $LMSuserID),
+			{
+				Authorization => "$access_token->{token_type} $access_token->{access_token}"
+			}
+		)->catch(sub ($err) {
+				$self->warning("There was an error retrieving prior grade from the LMS: $err");
+				return 0;
+		});
+
+		return 0 unless $request;
+		my $response = $request->result;
+
+		if (!$response->is_success) {
+			$self->warning(join("\n", 'Failed to retrieve prior grade from LMS:', $response->message));
+			return 0;
+		}
+
+		my $priorData  = decode_json($response->body);
+		my $priorScore = @$priorData
+			&& $priorData->[0]{resultMaximum} ? $priorData->[0]{resultScore} / $priorData->[0]{resultMaximum} : 0;
+
+		if (abs($score - $priorScore) < 0.001) {
+			$self->warning(
+				"LMS grade will NOT be updated as the grade is unchanged. Old score: $priorScore, New score: $score.");
+			return 1;
+		}
+
+		$self->warning("LMS grade will be updated as the grade has changed. Old score: $priorScore, New score: $score");
+	}
+
+	my $scores_url = $c->url_for($lineitem);
+	push(@{ $scores_url->path }, 'scores');
+
+	my $request = await $ua->post_p(
+		$scores_url,
+		{
+			Authorization  => "$access_token->{token_type} $access_token->{access_token}",
+			'Content-Type' => 'application/vnd.ims.lis.v1.score+json'
+		},
+		json => {
+			# This must be in ISO 8601 format with sub-second precision.  That is why the Time::HiRes::time is used.
+			timestamp        => Mojo::Date->new(Time::HiRes::time())->to_datetime,
+			scoreGiven       => $score,
+			scoreMaximum     => 1,
+			activityProgress => 'Submitted',
+			gradingProgress  => 'FullyGraded',
+			userId           => $LMSuserID
+		}
+	)->catch(sub ($err) {
+			$self->warning("There was an error sending the grade to the LMS: $err");
+			return 0;
+	});
+
+	return 0 unless $request;
+	my $response = $request->result;
+
+	if ($response->is_success) {
+		$self->warning('Successfully updated LMS grade.');
+		return 1;
+	}
+
+	$self->warning(join("\n", 'Failed to send grade:', $response->message));
+	return 0;
+}
+
+# Load and possibly generate private/public keys for the site.  This is only generates new keys if the files do not
+# already exist.  If $private is true then the JSON decoded private key is returned, otherwise the JSON decoded public
+# key is returned as a keyset. If an error occurs in this process then the returned key will be undefined, and the error
+# that was thrown will also be returned. Note that this is not a class method and the only required parameter is $ce
+# which should be a a minimal course environment.  The course environment is only needed to determine the site DATA
+# directory.
+sub get_site_key ($ce, $private = 0) {
+	my $key;
+
+	my $public_key_file  = Mojo::File->new($ce->{webworkDirs}{DATA})->child('lti_public_key.json');
+	my $private_key_file = Mojo::File->new($ce->{webworkDirs}{DATA})->child('lti_private_key.json');
+
+	eval {
+		if (!-r $public_key_file || !-r $private_key_file) {
+			my $pk = Crypt::PK::RSA->new;
+			$pk->generate_key(256, 65537);
+
+			my $private_key = decode_json($pk->export_key_jwk('private'));
+			$private_key->{kid} = sha256_hex(join('', map { [ 0 .. 9, 'a' .. 'z' ]->[ irand(36) ] } 1 .. 20));
+			$private_key->{use} = 'sig';
+			$private_key_file->spurt(encode_json($private_key));
+
+			my $public_keyset = {
+				keys => [ {
+					kid => $private_key->{kid},
+					use => 'sig',
+					alg => 'RS256',
+					%{ decode_json($pk->export_key_jwk('public')) }
+				} ]
+			};
+			$public_key_file->spurt(encode_json($public_keyset));
+
+			$key = $private ? $private_key : $public_keyset;
+		} else {
+			$key = $private ? decode_json($private_key_file->slurp) : decode_json($public_key_file->slurp);
+		}
+	};
+
+	return ($key, $@);
+}
+
+1;
diff --git a/lib/WeBWorK/Authen/LTIBasic.pm b/lib/WeBWorK/Authen/LTIBasic.pm
deleted file mode 100644
index 5b21d5856c..0000000000
--- a/lib/WeBWorK/Authen/LTIBasic.pm
+++ /dev/null
@@ -1,892 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::Authen::LTIBasic;
-use base qw/WeBWorK::Authen/;
-
-=head1 NAME
-
-WeBWorK::Authen::LTIBasic - Authenticate from a Learning Management System
-via the IMS LTI Basic/OAuth protocol.
-
-=cut
-
-use strict;
-use warnings;
-use Carp;
-use WeBWorK::Debug;
-use DBI;
-use WeBWorK::CGI;
-use WeBWorK::Utils qw(formatDateTime);
-use WeBWorK::Localize;
-use URI::Escape;
-use Net::OAuth;
-
-$Net::OAuth::PROTOCOL_VERSION = Net::OAuth::PROTOCOL_VERSION_1_0A;
-
-#$WeBWorK::Debug::Enabled = 1;
-
-use APR::SockAddr;
-use Apache2::Connection;
-use APR::Request::Error;
-
-our $GENERIC_ERROR_MESSAGE =
-	"Your authentication failed.  Please return to "
-	. "your Course Management System ([_1]) and login again.";
-our $GENERIC_MISSING_USER_ID_ERROR_MESSAGE =
-	"Your authentication failed.  Please return to "
-	. "your Course Management System ([_1]) and login again.";
-our $GENERIC_DENIED_LOGIN_ERROR_MESSAGE =
-	"You are not permitted to login into this site at this time. "
-	. "Please speak with your instructor.";
-our $GENERIC_UNKNOWN_USER_ERROR_MESSAGE =
-	"This username does not appear on the roster for this WeBWorK site." ;
-our $GENERIC_UNKNOWN_INSTRUCTOR_ERROR_MESSAGE =
-	"You have attemped to access this site as an instructor without prior authorization.";
-
-=head1 CONSTRUCTOR
-
-=over
-
-=item new($r)
-
-Instantiates a new WeBWorK::Authen object for the given WeBWorK::Requst ($r).
-
-=cut
-
-sub new {
-	my ($invocant, $r) = @_;
-	my $class = ref($invocant) || $invocant;
-	my $self = {
-		r => $r,
-	};
-	#initialize
-	bless $self, $class;
-	return $self;
-}
-
-=back
-
-=cut
-
-
-
-
-## this is only overridden for debug logging
-#sub verify {
-#	debug("BEGIN LTIBasic VERIFY");
-#	my $result = $_[0]->SUPER::verify(@_[1..$#_]);
-#	debug("END LTIBasic VERIFY");
-#	return $result;
-#}
-
-# This module is similar to the base class, with these differences:
-#  1. no WeBWorK guest/practice logins
-#  2. uses the Key database to store nonces, where
-#     the $Key -> username = the nonce
-#         $Key -> key = "nonce"
-#         $Key -> timestamp = the nonce's timestamp
-#  3. when this method is used, there needs to be a CRON job
-#     to delete old nonce records
-#  4. A program ww_purge_old_nonces is available for
-#     deleting old nonce records.  It should be placed
-#     in webwork2/system/bin
-
-########
-#  Example of parameters forwarded by a Course Management System
-#user_id=wheeler
-#roles=Instructor
-#
-#lis_person_name_full=William+H.+Wheeler
-#lis_person_name_family=Wheeler
-#lis_person_contact_email_primary=wheeler%40indiana.edu
-#lis_person_sourcedid=wheeler
-#lis_person_name_given=William+H.
-#
-#basiclti_submit=Press+to+continue+to+external+tool.
-#lti_version=LTI-1p0
-#lti_message_type=basic-lti-launch-request
-#
-#context_id=a75a6608-3698-4b62-803d-063040fce113
-#context_title=Math+Tools+Pages
-#context_label=Math+Tools+Pages
-#
-#resource_link_description=Linking+to+WeBWorK%40IU
-#resource_link_id=109f9125-c711-4151-8601-4567518aed82
-#resource_link_title=WeBWorK+LTI
-#
-#launch_presentation_locale=en_US
-#
-#ext_sakai_serverid=esappo06
-#ext_sakai_server=https%3A%2F%2Foncourse.iu.edu
-#ext_sakai_session=8991b6d6c83c085f5ebb8707048e6631c946310870d6147e9e5e619b0686dafc736891ace760a6b8
-#
-#oauth_version=1.0
-#oauth_consumer_key=webwork
-#oauth_signature=fxcs0nuFgvSGQGnJck59Y2w8VHs%3D
-#oauth_nonce=201683935212232
-#oauth_signature_method=HMAC-SHA1
-#oauth_callback=about%3Ablank
-#oauth_timestamp=1309888775
-#
-#custom_semster=?
-#custom_section=?
-
-# Some LMS's misspell the lis_person_sourcedid parameter name
-# so we use a list of variations when needed.
-our @lis_person_sourcedid_options = (
-	"lis_person_sourcedid", # from spec at https://www.imsglobal.org/specs/ltiv1p1/implementation-guide#toc-3
-	"lis_person_sourced_id",
-	"lis_person_source_id",
-	"lis_person_sourceid"
-);
-
-sub  request_has_data_for_this_verification_module {
-	#debug("LTIBasic has been called for data verification");
-	my $self = shift;
-	my $r = $self -> {r};
-
-	# See comment in get_credentials()
-	if ($r->{xmlrpc}) {
-		#debug("LTIBasic returning 1 because it is an xmlrpc call");
-		return 1;
-	}
-	if (!(defined $r->param("oauth_consumer_key"))
-			or !(defined $r -> param("oauth_signature"))
-			or !(defined $r -> param("oauth_nonce"))
-			or !(defined $r -> param("oauth_timestamp")) ) {
-		#debug("LTIBasic returning that it has insufficent data");
-		return(0);
-	} else {
-		#debug(("LTIBasic returning that it has sufficient data");
-		return(1);
-	}
-}
-
-sub get_credentials {
-	my $self = shift;
-	my $r = $self->{r};
-	my $ce = $r -> {ce};
-
-	#debug("LTIBasic::get_credentials has been called\n");
-
-	## debug code MEG
-	if ( $ce->{debug_lti_parameters} ) {
-		my $rh_headers = $r->headers_in;  #request headers
-
-		my @parameter_names = $r->param;       # form parameter names
-		my $parameter_report = '';
-		foreach my $key (@parameter_names) {
-			$parameter_report .= "$key => ".$r->param($key). "\n";
-		}
-		warn ("===== parameters received =======\n", $parameter_report);
-	}
-	###
-
-	#disable password login
-	$self->{external_auth} = 1;
-
-	# This next part is necessary because some parts of webwork (e.g.,
-	# WebworkWebservice.pm) need to replace the get_credentials() routine,
-	# but only replace the one in the parent class (out of caution,
-	# presumably).  Therefore, we end up here even when authenticating
-	# for WebworkWebservice.pm.  This would cause authentication failures
-	# when authenticating javascript web service requests (e.g., the
-	# Library Browser).
-	# Similar changes are needed in check_user() and verify_normal_user().
-
-	if ($r->{xmlrpc}) {
-		#debug("falling back to superclass get_credentials (xmlrpc call)");
-		return $self->SUPER::get_credentials(@_);
-	}
-
-	# Determine the WW user_id to use, if possible
-
-	if ( ! $ce->{preferred_source_of_username} ) {
-		warn "LTI is not properly configured (no preferred_source_of_username). Please contact your instructor or system administrator.";
-		$self->{error} = $r->maketext("There was an error during the login process.  Please speak to your instructor or system administrator.");
-		debug("No preferred_source_of_username in " . $r->ce->{'courseName'} . " so LTIBasic::get_credentials is returning a 0\n");
-		return 0;
-	}
-
-	my $user_id_source = "";
-	my $type_of_source = "";
-
-	$self->{email} = ""; # set an initial value to avoid warnings when not provided
-	if ( defined( $r->param("lis_person_contact_email_primary") ) ) {
-		$self->{email} = uri_unescape($r->param("lis_person_contact_email_primary")) // "";
-	}
-
-	if ( $ce->{preferred_source_of_username} eq "lis_person_sourcedid" ) {
-		foreach my $key ( @lis_person_sourcedid_options ) {
-			if ( $r->param($key) ) {
-				$user_id_source = $key;
-				$type_of_source = "preferred_source_of_username";
-				$self->{user_id} = $r->param($key);
-				last;
-			}
-		}
-	} elsif ( $ce->{preferred_source_of_username} eq "lis_person_contact_email_primary"
-		    && $self->{email} ne "" ) {
-		$user_id_source = "lis_person_contact_email_primary";
-		$type_of_source = "preferred_source_of_username";
-		$self->{user_id} = $self->{email};
-
-		# Strip off the part of the address after @ if requested to do so:
-		$self->{user_id} =~ s/@.*$// if $ce->{strip_address_from_email};
-	} elsif ( $r->param($ce->{preferred_source_of_username}) ) {
-		$user_id_source = $ce->{preferred_source_of_username};
-		$type_of_source = "preferred_source_of_username";
-		$self->{user_id} = $r->param($ce->{preferred_source_of_username});
-	}
-
-	# Fallback if necessary
-	if ( !defined( $self->{user_id} ) && $ce->{fallback_source_of_username} ) {
-		if ( $ce->{fallback_source_of_username} eq "lis_person_sourcedid" ) {
-			foreach my $key ( @lis_person_sourcedid_options ) {
-				if ( $r->param($key) ) {
-					$user_id_source = $key;
-					$type_of_source = "fallback_source_of_username";
-					$self->{user_id} = $r->param($key);
-					last;
-				}
-			}
-		} elsif ( $ce->{fallback_source_of_username} eq "lis_person_contact_email_primary"
-			    && $self->{email} ne "" ) {
-			$user_id_source = "lis_person_contact_email_primary";
-			$type_of_source = "fallback_source_of_username";
-			$self->{user_id} = $self->{email};
-
-			# Strip off the part of the address after @ if requested to do so:
-			$self->{user_id} =~ s/@.*$// if $ce->{strip_address_from_email};
-		} elsif ( $r->param($ce->{fallback_source_of_username}) ) {
-			$user_id_source = $ce->{fallback_source_of_username};
-			$type_of_source = "fallback_source_of_username";
-			$self->{user_id} = $r->param($ce->{fallback_source_of_username});
-		}
-	}
-
-	# if we were able to set a user_id
-	if ( defined($self->{user_id}) && $self->{user_id} ne "" ) {
-		map {$self -> {$_ -> [0]} = $r -> param($_ -> [1]);}
-						(
-						#['user_id', 'lis_person_sourcedid'],
-						['role', 'roles'],
-						['last_name' , 'lis_person_name_family'],
-						['first_name', 'lis_person_name_given'],
-						['context_id', 'context_id'],
-						['oauth_consumer_key', 'oauth_consumer_key'],
-						['oauth_signature', 'oauth_signature'],
-						['oauth_nonce', 'oauth_nonce'],
-						['oauth_timestamp', 'oauth_timestamp'],
-						['semester', 'custom_semester'],
-						['section', 'custom_section'],
-						['recitation', 'custom_recitation'],
-						);
-
-		if (defined($ce->{preferred_source_of_student_id})
-		      && defined($r->param($ce->{preferred_source_of_student_id}))) {
-			$self->{student_id} = $r->param($ce->{preferred_source_of_student_id});
-		} else {
-			$self->{student_id} = ""; # fall back to avoid a warning when debug_lti_parameters enabled
-		}
-
-		# For setting up its helpful to print out what the system think the
-		# User id and address is at this point
-		if ( $ce->{debug_lti_parameters} ) {
-			warn "=========== summary ============";
-			warn "User id is |$self->{user_id}| (obtained from $user_id_source which was $type_of_source)\n";
-			warn "User mail address is |$self->{email}|\n";
-			warn "strip_address_from_email is |", $ce->{strip_address_from_email}//0,"|\n";
-			warn "Student id is |$self->{student_id}|\n";
-			warn "preferred_source_of_username is |$ce->{preferred_source_of_username}|\n";
-			warn "fallback_source_of_username is |", $ce->{fallback_source_of_username}//'undefined',"|\n";
-			warn "preferred_source_of_student_id is |", $ce->{preferred_source_of_student_id}//'undefined',"|\n";
-			warn "================================\n";
-		}
-
-		if (!defined($self->{user_id})) {
-			croak "LTIBasic was unable to create a username from the data provided with the current settings. Set \$debug_lti_parameters=1 in authen_LTI.conf to debug";
-		}
-		if (defined $ce -> {analyze_context_id}) {
-			$ce -> {analyze_context_id} ($self) ;
-		}
-		if (!defined($self -> {section})) {
-			$self -> {section} = "unknown";
-		}
-		$self->{login_type} = "normal";
-		$self -> {credential_source} = "LTIBasic";
-		#debug("LTIBasic::get_credentials is returning a 1\n");
-		return 1;
-	}
-	#debug("LTIBasic::get_credentials is returning a 0\n");
-	warn "LTI is not properly configured (failed to obtain user_id from preferred_source_of_username or fallback_source_of_username). Please contact your instructor or system administrator.";
-	$self->{error} = $r->maketext("There was an error during the login process.  Please speak to your instructor or system administrator.");
-	return 0;
-}
-
-# minor modification of method in superclass
-sub check_user {
-	my $self = shift;
-	my $r = $self->{r};
-	my ($ce, $db, $authz) = map {$r -> $_ ;} ('ce', 'db', 'authz');
-
-	my $user_id = $self->{user_id};
-
-	#debug("LTIBasic::check_user has been called for user_id = |$user_id|");
-
-	# See comment in get_credentials()
-	if ($r->{xmlrpc}) {
-		#debug("falling back to superclass check_user (xmlrpc call)");
-		return $self->SUPER::check_user(@_);
-	}
-
-	if (!defined($user_id) or (defined $user_id and $user_id eq "")) {
-		$self->{log_error} .= "no user id specified";
-		my $LMS = ($ce->{LMS_url}) ? CGI::a({href => $ce->{LMS_url}},$ce->{LMS_name}) : $ce->{LMS_name};
-		$self->{error} = $r->maketext($GENERIC_MISSING_USER_ID_ERROR_MESSAGE, $LMS);
-		return 0;
-	}
-
-	my $User = $db->getUser($user_id);
-
-	if (!$User) {
-		my %options;
-		$options{$ce->{preferred_source_of_username}} = 1 if ($ce->{preferred_source_of_username});
-		$options{$ce->{fallback_source_of_username}}  = 1 if ($ce->{fallback_source_of_username});
-
-		# May need to add alternate "spellings" for lis_person_sourcedid
-		my $use_lis_person_sourcedid_options = 0;
-		if ( defined($ce->{preferred_source_of_username})
-		       && $ce->{preferred_source_of_username} eq "lis_person_sourcedid" ) {
-			$use_lis_person_sourcedid_options = 1;
-		} elsif ( defined($ce->{fallback_source_of_username})
-			    && $ce->{fallback_source_of_username} eq "lis_person_sourcedid" ) {
-			$use_lis_person_sourcedid_options = 1;
-		}
-
-		foreach my $key ( keys( %options ), ( $use_lis_person_sourcedid_options ? @lis_person_sourcedid_options : () ) ) {
-			if ( defined($r->param($key)) ) {
-				debug("User |$user_id| is unknown but may be an new user from an LSM via LTI. Saw a value for $key About to return a 1");
-				return 1;  #This may be a new user coming in from a LMS via LTI.
-			}
-		}
-
-		$self->{log_error} .= " $user_id - user unknown";
-		$self->{error} = $r->maketext("There was an error during the login process.  Please speak to your instructor or system administrator.");
-		return 0;
-	}
-
-	unless ($ce->status_abbrev_has_behavior($User->status, "allow_course_access")) {
-		$self->{log_error} .= "LOGIN FAILED $user_id - course access denied";
-		$self->{error} = $r->maketext($GENERIC_DENIED_LOGIN_ERROR_MESSAGE);
-		return 0;
-	}
-
-	unless ($authz->hasPermissions($user_id, "login")) {
-		$self->{log_error} .= "LOGIN FAILED $user_id - no permission to login";
-		$self->{error} = $r->maketext($GENERIC_DENIED_LOGIN_ERROR_MESSAGE);
-		return 0;
-	}
-	#debug("LTIBasic::check_user is about to return a 1.");
-	return 1;
-}
-
-# disable practice users
-sub verify_practice_user { return(0) ;}
-
-sub verify_normal_user
-{
-	my $self = shift;
-	my ($r, $user_id, $session_key)
-			= map {$self -> {$_};} ('r', 'user_id', 'session_key');
-
-
-	#debug("LTIBasic::verify_normal_user called for user |$user_id|");
-
-	# See comment in get_credentials()
-	if ($r->{xmlrpc}) {
-		#debug("falling back to superclass verify_normal_user (xmlrpc call)");
-		return $self->SUPER::verify_normal_user(@_);
-	}
-
-    # Call check_session in order to destroy any existing session cookies and Key table sessions
-	my ($sessionExists, $keyMatches, $timestampValid) = $self->check_session($user_id, $session_key, 0);
-	debug("sessionExists='", $sessionExists, "' keyMatches='", $keyMatches, "' timestampValid='", $timestampValid, "'");
-
-	my $auth_result = $self->authenticate;
-
-	#debug("auth_result=|${auth_result}|");
-
-	# Parameters CANNOT be modified until after LTIBasic authentication
-	# has been done, because the parameters passed with the request
-
-	# are used in computing the OAuth_signature.  If there
-
-	# are any changes in $r -> {paramcache} (see Request.pm)
-	# before authentication occurs, then authentication will FAIL
-	# even if the consumer_secret is correct.
-
-	$r -> param("user" => $user_id);
-
-	if ($auth_result eq "1")
-		{
-		#debug("About to call create_session.");
-		$self->{session_key} = $self->create_session($user_id);
-		#debug("session_key=|" . $self -> {session_key} . "|.");
-		return 1;
-		}
-	else
-		{
-		$self->{error} = $r->maketext($auth_result);
-		$self-> {log_error} .= "$user_id - authentication failed: ". $self->{error};
-		return 0;
-		}
-}
-
-sub authenticate
-{
-	my $self = shift;
-	my ($r, $user ) = map {$self -> {$_};} ('r', 'user_id');
-
-	# See comment in get_credentials()
-	if ($r->{xmlrpc}) {
-		#debug("falling back to superclass authenticate (xmlrpc call)");
-		return $self->SUPER::authenticate(@_);
-	}
-
-	#debug("LTIBasic::authenticate called for user |$user|");
-	#debug "ref(r) = |". ref($r) . "|";
-	#debug "ref of r->{paramcache} = |" . ref($r -> {paramcache}) . "|";
-	#debug "request_method = |" . $r -> request_method . "|";
-	my $ce = $r -> ce;
-	my $db = $r -> db;
-	my $courseName = $r -> ce -> {'courseName'};
-	my $webmaster= $ce ->{Local_Email_Addresses} -> {Webmaster};
-	my $verify_code=0;
-	my $timestamp=0;
-
-	# Check nonce to see whether request is legitimate
-	#debug("Nonce = |" . $self-> {oauth_nonce} . "|");
-	my $nonce = WeBWorK::Authen::LTIBasic::Nonce -> new($r, $self -> {oauth_nonce}, $self -> {oauth_timestamp});
-	if (!($nonce -> ok ) ) {
-		my $LMS = ($ce->{LMS_url}) ? CGI::a({href => $ce->{LMS_url}},$ce->{LMS_name}) : $ce->{LMS_name};
-		#debug( "eval failed: ", $@, "<br /><br />"; print_keys($r););
-		$self -> {error} .= $r->maketext($GENERIC_ERROR_MESSAGE
-				. ":  Something was wrong with your Nonce LTI parameters.  If this recurs, please speak with your instructor", $LMS);
-		return 0;
-	}
-	#debug( "r->param(oauth_signature) = |" . $r -> param("oauth_signature") . "|");
-	my %request_hash;
-	my @keys = keys %{$r-> {paramcache}};
-	foreach my $key (@keys) {
-		$request_hash{$key} =  $r -> param($key);
-		#debug("$key -> |" . $requestHash -> {$key} . "|");
-	}
-	my $requestHash = \%request_hash;
-	my $path = $ce->{server_root_url}.$ce->{webwork_url}.$r->urlpath()->path;
-	$path = $ce->{LTIBasicToThisSiteURL} ?
-	    $ce->{LTIBasicToThisSiteURL} : $path;
-
-	my $altpath = $path;
-	$altpath =~ s/\/$//;
-
-	my ($request, $altrequest);
-	eval
-		{
-		$request = Net::OAuth -> request("request token") -> from_hash($requestHash,
-			request_url => $path,
-
-        		request_method => "POST",
-        		consumer_secret => $ce -> {LTIBasicConsumerSecret},
-        	);
-
-		$altrequest = Net::OAuth -> request("request token") -> from_hash($requestHash,
-			request_url => $altpath,
-
-        		request_method => "POST",
-        		consumer_secret => $ce -> {LTIBasicConsumerSecret},
-        	);
-		};
-
-	if ($@)
-		{
-		#debug("construction of Net::OAuth object failed: $@");
-		#debug( "eval failed: ", $@, "<br /><br />"; print_keys($r););
-		$self -> {error} .= $r->maketext("Your authentication failed.  Please return to Oncourse and login again.");
-		$self -> {error} .= $r->maketext("Something was wrong with your LTI parameters.  If this recurs, please speak with your instructor");
-		$self -> {log_error} .= "Construction of OAuth request record failed";
-		return 0;
-		}
-	else
-		{
-		if (! $request -> verify && ! $altrequest -> verify)
-			{
-			#debug("LTIBasic::authenticate request-> verify failed");
-			#debug("<h2> OAuth verification Failed</h2> "; print_keys($r));
-			$self -> {error} .= $r->maketext("Your authentication failed.  Please return to Oncourse and login again.");
-			$self -> {error} .= $r->maketext("Your LTI OAuth verification failed.  If this recurs, please speak with your instructor");
-			$self -> {log_error} .= "OAuth verification failed.  Check the Consumer Secret.";
-			return 0;
-			}
-		else
-			{
-			#debug("<h2> OAuth verification SUCCEEDED !! </h2>");
-			############################################################
-			# Determine the roles defined for this user by the LTI request
-			# and assign a permission level on that basis.
-			############################################################
-			my $userID = $self->{user_id};
-			my $LTIrolesString = $r -> param("roles");
-			my @LTIroles = split /,/, $LTIrolesString;
-
-			#remove the urn string if its present
-			s/^urn:lti:.*:ims\/lis\/// for @LTIroles;
-			if ( $ce->{debug_lti_parameters} ) {
-				warn "The adjusted LTI roles defined for this user are: \n--",
-				       join("\n--", @LTIroles), "\n",
-				       "Any initial ^urn:lti:.*:ims/lis/ segments have been stripped off.\n",
-				       "The user will be assigned the highest role defined for them\n",
-				       "========================\n"
-			}
-
-			my $nr = scalar(@LTIroles);
-			if (! defined($ce -> {userRoles} -> {$ce -> {LMSrolesToWeBWorKroles} -> {$LTIroles[0]}})) {
-				croak("Cannot find a WeBWorK role that corresponds to the LMS role of "
-						. $LTIroles[0] .".");
-			}
-			my $LTI_webwork_permissionLevel
-				= $ce -> {userRoles} -> {$ce -> {LMSrolesToWeBWorKroles} -> {$LTIroles[0]}};
-			if ($nr > 1) {
-				for (my $j =1; $j < $nr; $j++) {
-					my $wwRole = $ce -> {LMSrolesToWeBWorKroles} -> {$LTIroles[$j]};
-					next unless defined $wwRole;
-					if ($LTI_webwork_permissionLevel < $ce -> {userRoles} -> {$wwRole}) {
-						$LTI_webwork_permissionLevel = $ce -> {userRoles} -> {$wwRole};
-					}
-				}
-			}
-			####### End defining roles and $LTI_webwork_permissionLevel#######
-
-			##################################################################
-			# Determine the section name provided by lti
-			# This may vary widely from LTI provider to LTI provider
-			# If custom_section item is provided by the LTI then nothing needs to be done
-			# The code works for the U. of Rochester Blackboard
-			##################################################################
-
-# 			my $LTI_section = $r->param("context_label");   #  for example: MTH208.2014FALL.54648
-# 			my ($course_number, $semester, $CRN) = split(/\./, $LTI_section);
-# 			if ($self->{section} eq "unknown" and $CRN ) {
-# 			    $self->{section}= $CRN//"unknown"; # update unknown sections from CRN if possible
-# 			}
-# 			if ( $ce->{debug_lti_parameters} ) {
-# 			    warn "LTI context_label is $LTI_section";
-# 				warn "course number $course_number\n";
-# 				warn "semester $semester\n";
-# 				warn "CRN $CRN\n";
-# 				warn "section $self->{section}";
-# 			}
-			########### end determine section name
-			if (! $db -> existsUser($userID) )
-				{ # New User. Create User record
-				warn "New user: $userID -- requested permission level is $LTI_webwork_permissionLevel.
-				      Only new users with permission levels less than or equal to 'ta = 5' can be created." if ( $ce->{debug_lti_parameters} );
-				if ($LTI_webwork_permissionLevel > $ce ->{userRoles} -> {"ta"}) {
-				    $self->{log_error}.= "userID: $userID --".' '. $GENERIC_UNKNOWN_INSTRUCTOR_ERROR_MESSAGE;
-					croak $r->maketext("userID: [_1] --", $userID).$r->maketext($GENERIC_UNKNOWN_INSTRUCTOR_ERROR_MESSAGE);
-				}
-				my $newUser = $db -> newUser();
-					$newUser -> user_id($userID);
-					$self -> {last_name} =~ s/\+/ /g;
-					$newUser -> last_name($self -> {last_name});
-					$self -> {first_name} =~ s/\+/ /g;
-					$newUser -> first_name($self -> {first_name});
-					$newUser -> email_address($self -> {email});
-					$newUser -> status("C");
-					$newUser ->  section(($LTI_webwork_permissionLevel > $ce -> {userRoles} -> {"student"}) ?
-						"Admin" : (defined($self -> {section})) ? $self -> {section} : "");
-					$newUser -> recitation($self -> {recitation});
-					$newUser -> comment(formatDateTime(time, "local"));
-				$db -> addUser($newUser);
-				$self->write_log_entry("New user $userID added via LTIBasic login");
-				  # Assign permssion level
-				my $newPermissionLevel = $db -> newPermissionLevel();
-					$newPermissionLevel -> user_id($userID);
-					$newPermissionLevel -> permission($LTI_webwork_permissionLevel);
-				$db -> addPermissionLevel($newPermissionLevel);
-				$r -> authz -> {PermissionLevel} = $newPermissionLevel;  #cache the Permission Level Record.
-				  # Assign existing sets
-				  # This module is not a subclass of WeBWorK::ContentGenerator::Instuctor,
-				  #  do the methods defined therein for assigning problem sets and problems
-				  #  to users are not available for use here.
-				  #  Therefore, we have to resort to the lower level methods in WeBWorK::DB.
-				my $numberOfProblemsAssigned = 0;
-				my %globalProblemsBySet=();
-				my @globalSetIDs = $db->listGlobalSets;
-				my @GlobalSets = $db->getGlobalSets(@globalSetIDs);
-				my $open_cut = time() + 24*3600;
-				my $globalSet;
-				foreach $globalSet (@GlobalSets) {
-					if (defined($globalSet) and $globalSet -> open_date < $open_cut) {
-					    my @GlobalProblems = grep { defined $_ } $db->getAllGlobalProblems($globalSet -> set_id);
-						$globalProblemsBySet{$globalSet->set_id} = \@GlobalProblems;
-						$numberOfProblemsAssigned += scalar(@GlobalProblems);
-					}
-				}
-				my $reasonableNumberOfDays = int($numberOfProblemsAssigned / $ce->{reasonableProblemsPerDayMakeup}) +1;
-				if ($reasonableNumberOfDays < 2) {$reasonableNumberOfDays = 2;}
-				my ($sec, $min, $day, $monthDay, $month, $year, $weekDay, $yearDay, $isdst) = localtime();
-				my $niceDueDay = $yearDay + 1 + $reasonableNumberOfDays;
-				my $niceDueTime = Time::Local::timelocal_nocheck(0,30,8,$niceDueDay,0,$year);
-				   ($sec, $min, $day, $monthDay, $month, $year, $weekDay, $yearDay, $isdst) = localtime($niceDueTime);
-				if ($weekDay == 0) {$niceDueDay +=1;}
-				elsif ($weekDay == 6) {$niceDueDay += 2;}
-				my $niceAnswerTime = $niceDueTime + 600;
-				my $due_cut = time() + 2*24*3600;
-				my $userSet;
-				my $userProblem;
-				foreach $globalSet (@GlobalSets)
-					{
-					if (defined($globalSet))
-						{
-						if (defined($ce -> {"adjustDueDatesForLateAdds"}) and $ce -> {"adjustDueDatesForLateAdds"}
-							and $globalSet -> open_date < $open_cut and $globalSet -> due_date < $due_cut
-							)
-							{
-							if (not $db -> existsUserSet($userID, $globalSet -> set_id ) )
-								{
-								$userSet = $db -> newUserSet();
-								$userSet -> user_id($userID);
-								$userSet -> set_id($globalSet -> set_id);
-								# $userSet -> psvn(int(10**12 * rand()));
-								# $userSet -> open_date(0);
-								$userSet -> due_date($niceDueTime);
-								$userSet -> answer_date($niceAnswerTime);
-								$db -> addUserSet($userSet);
-								}
-							}
-						elsif ( $globalSet -> open_date < $open_cut )
-							{
-							if (not $db -> existsUserSet($userID, $globalSet -> set_id ) ) {
-								$userSet = $db -> newUserSet();
-								$userSet -> user_id($userID);
-								$userSet -> set_id($globalSet -> set_id);
-								# $userSet -> psvn(int(10**12 * rand()));
-								# $userSet -> open_date(0);
-								# $userSet -> due_date(0);
-								# $userSet -> answer_date(0);
-								$db -> addUserSet($userSet);
-							}
-						}
-						foreach my $globalProblem (  @{$globalProblemsBySet{$globalSet -> set_id}} ) {
-							if (defined($globalProblem)) {
-								if (not $db -> existsUserProblem($userID, $globalSet -> set_id, $globalProblem -> problem_id)) {
-									$userProblem = $db -> newUserProblem();
-									$userProblem -> user_id($userID);
-									$userProblem -> set_id($globalSet -> set_id);
-									$userProblem -> problem_id($globalProblem -> problem_id);
-									$userProblem -> problem_seed(int(10**4 * rand()));
-									$userProblem -> {status} = 0;
-									$userProblem -> {attempted} = 0;
-									$userProblem -> {num_correct} = 0;
-									$userProblem -> {num_incorrect} = 0;
-									$userProblem -> {last_answer} = "";
-
-									$db -> addUserProblem($userProblem);
-								}
-							}
-						}
-					}
-				}
-				$self -> {initial_login} = 1;
-			}
-		else
-			{ # Existing user.  Possibly modify demographic information and permission level.
-			my $user = $db -> getUser($userID);
-			my $permissionLevel = $db -> getPermissionLevel($userID);
-			if (($user -> last_name() eq "Teacher" and $user -> first_name() eq "The")
-					or (defined($permissionLevel -> permission)
-							and $permissionLevel -> permission > $ce -> {userRoles} -> {professor}))
-				{  #This is the instructor of record or an administrator.  No changes permitted via LTI.
-				}
-			else
-				{
-				my $change_made = 0;
-				$self -> {last_name} =~ s/\+/ /g;
-				if (defined($user -> last_name) and defined($self -> {last_name})
-					and $user -> last_name ne $self -> {last_name})
-					{
-					$user -> last_name($self -> {last_name});
-					$change_made = 1;
-					}
-				$self -> {first_name} =~ s/\+/ /g;
-				if (defined($user -> first_name) and defined($self -> {first_name})
-					and $user -> first_name ne $self -> {first_name})
-					{
-					$user -> first_name($self -> {first_name});
-					$change_made = 1;
-					}
-				if (defined($user -> email_address) and defined($self -> {email})
-					and $user -> email_address ne $self -> {email})
-					{
-					$user -> email_address($self -> {email});
-					$change_made = 1;
-					}
-				if ($user -> status ne "C")
-					{
-					$user -> status("C");
-					$change_made = 1;
-					}
-				if (defined($permissionLevel -> permission)
-					and $permissionLevel -> permission > $ce ->{userRoles} -> {"student"})
-						{if ($user -> section ne "Admin")
-							{
-							$user -> section("Admin");
-							$change_made = 1;
-							}
-						}
-				elsif ($LTI_webwork_permissionLevel > $ce -> {userRoles}->{"student"}
-					and (!defined($user -> section) or $user -> section ne "Admin") )
-						{
-						$user -> section("Admin");
-						$change_made = 1;
-						}
-				elsif (defined ($self -> {"section"})
-					and (! defined($user -> section)
-						or ($user -> section ne $self -> {"section"}
-							and $self -> {"section"} ne ""
-							and $user -> section ne "Admin"
-							)
-						)
-					  )
-						{
-						$user -> section($self -> {"section"});
-						$change_made = 1;
-						}
-				if (defined($self -> {"recitation"}) and defined($user -> recitation)
-					and $user -> recitation ne $self -> {"recitation"})
-					{$user -> recitation($self ->{"recitation"});
-					$change_made = 1;
-				}
-				if ($change_made)
-					{
-					$user -> comment(formatDateTime(time, "local"));
-					$db -> putUser($user);
-					$self->write_log_entry("Demographic data for user $userID modified via LTIBasic login");
-				}
-				  # Assign permission level
-######## Changed due to Instructor roles passed from Sakai/Oncourse to LTIBasic ######
-#				if (!defined($permissionLevel -> permission) or $permissionLevel -> permission != $LTI_webwork_permissionLevel)
-
-# you seldom fine a defined user without a permissionLevel assigned
-# I don'think the following if statement is ever run.
-				if (!defined($permissionLevel -> permission) )
-#################################################################
-					{
-					$permissionLevel -> permission($LTI_webwork_permissionLevel);
-					$db -> putPermissionLevel($permissionLevel);  # store in database
-					$self->{PermissionLevel} = $permissionLevel;  #cache the revised Permission Level Record.
-					$self->write_log_entry("\n\n\nPermission level for user $userID set to $LTI_webwork_permissionLevel via LTIBasic login");
-					warn "Setting permission level for $userID to $LTI_webwork_permissionLevel" if ( $ce->{debug_lti_parameters} );
-				}
-				warn "Existing user: $userID updated.\n  LTIpermission level is $LTI_webwork_permissionLevel.
-				      webwork level is ". $permissionLevel -> permission. ".\n".
-				      "User section is |".$user->{section}. "|\n recitation is |".$user->{recitation}."|\n" if ( $ce->{debug_lti_parameters} );
-			}
-			$self -> {initial_login} = 1;
-			}
-			return 1;
-		}
-	}
-	#debug("LTIBasic is returning a failed authentication");
-	$self -> {error} = $r->maketext($GENERIC_ERROR_MESSAGE, $ce->{LMS_name});
-	return(0);
-}
-
-
-################################################################################
-################################################################################
-# NONCE SUB-PACKAGE
-################################################################################
-################################################################################
-
-package WeBWorK::Authen::LTIBasic::Nonce;
-
-sub new {
-	my ($invocant, $r, $nonce, $timestamp) = @_;
-	my $class = ref($invocant) || $invocant;
-	my $self = {
-		r => $r,
-		nonce => $nonce,
-		timestamp => $timestamp,
-	};
-	bless $self, $class;
-	return $self;
-}
-
-sub ok {
-	my $self = shift;
-	my $r = $self -> {r};
-	my $ce = $r -> {ce};
-	if ($self -> {timestamp} < time() - $ce->{NonceLifeTime}) {
-		return 0;
-	}
-	my $db = $self->{r}->{db};
-	my $Key = $db->getKey($self->{nonce});
-
-	# If we *haven't* used this nonce before then we are OK.
-	if (! defined($Key) ) {
-		# nonce, timestamp are ok.  Add the nonce so its not used again.
-		$Key = $db->newKey(user_id=>$self->{nonce},
-					key=>"nonce",
-					timestamp=>$self->{"timestamp"},
-					);
-		$db->addKey($Key);
-		return 1;
-	} else {
-		# The nonce is in the database - so was used "recently" so should NOT be allowed
-		if ( $Key->timestamp < $self->{"timestamp"} ) {
-			# Update timestamp - so deletion will be delayed from the most recent value
-			# of oauth_timestamp sent by the LTI consumer and not from an earlier timestamp.
-			$Key->timestamp($self->{"timestamp"});
-			$db->putKey($Key);
-		}
-		return 0;
-	}
-}
-
-#sub ok { #### For Testing Purposes only
-#	return 1;
-#}
-
-################################################################################
-# END NONCE SUB-PACKAGE
-################################################################################
-
-sub print_keys {
-	my ($self, $r) = @_;
-	my @keys = keys %{$r-> {paramcache}};
-	my %request_hash;
-	my $key;
-	foreach $key (@keys) {
-		$request_hash{$key} =  $r -> param($key);
-		warn("$key -> |" . $request_hash{$key} . "|");
-	}
-	my $requestHash = \%request_hash;
-}
-
-1;
-
diff --git a/lib/WeBWorK/Authen/Moodle.pm b/lib/WeBWorK/Authen/Moodle.pm
index 21f17e5da5..40c511dacf 100644
--- a/lib/WeBWorK/Authen/Moodle.pm
+++ b/lib/WeBWorK/Authen/Moodle.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -36,9 +36,8 @@ data, change permission level, add user, delete user. Run this for a rough estim
 use strict;
 use warnings;
 use Digest::MD5 qw/md5_hex/;
-use WeBWorK::Cookie;
 use WeBWorK::Debug;
-use Date::Parse; # for moodle 1.7 date parsing
+use Date::Parse;    # for moodle 1.7 date parsing
 
 sub new {
 	my $self = shift->SUPER::new(@_);
@@ -53,7 +52,7 @@ sub new {
 # (this is similar to what happens when a guest user is selected.)
 sub get_credentials {
 	my $self = shift;
-	my $r = $self->{r};
+	my $c    = $self->{c};
 
 	my $super_result = $self->SUPER::get_credentials;
 	if ($super_result) {
@@ -62,22 +61,24 @@ sub get_credentials {
 	}
 
 	my ($moodle_user_id, $moodle_expiration_time) = $self->fetch_moodle_session;
-	#debug("fetch_moodle_session returned: moodle_user_id='$moodle_user_id' moodle_expiration_time='$moodle_expiration_time'.\n"); # causes errors when undefined
+#debug("fetch_moodle_session returned: moodle_user_id='$moodle_user_id' moodle_expiration_time='$moodle_expiration_time'.\n"); # causes errors when undefined
 
 	if (defined $moodle_user_id and defined $moodle_expiration_time and time <= $moodle_expiration_time) {
 		my $newKey = $self->create_session($moodle_user_id);
 		debug("Unexpired moodle session found. Created new WeBWorK session with newKey='$newKey'.\n");
 
-		$self->{user_id} = $moodle_user_id;
-		$self->{session_key} = $newKey;
-		$self->{login_type} = "normal";
+		$self->{user_id}           = $moodle_user_id;
+		$self->{session_key}       = $newKey;
+		$self->{login_type}        = "normal";
 		$self->{credential_source} = "moodle";
 		return 1;
 	} else {
 		debug("No moodle session found or moodle session expired. No credentials to be had.\n");
-		warn("No moodle session found or moodle sessioin expired.  If this happens repeatedly and you are constantly being asked
+		warn(
+			"No moodle session found or moodle sessioin expired.  If this happens repeatedly and you are constantly being asked
 		      to log back in ask your moodle admin to check that the Moodle item:
-		      Server -> Session Handling -> dbsessions (Use database for session information) has been checked.");
+		      Server -> Session Handling -> dbsessions (Use database for session information) has been checked."
+		);
 	}
 
 	return 0;
@@ -97,11 +98,11 @@ sub site_fixup {
 # this is overridden to accommodate this.
 sub checkPassword {
 	my ($self, $userID, $possibleClearPassword) = @_;
-	my $db = $self->{r}->db;
+	my $db = $self->{c}->db;
 
 	debug("Moodle module is doing the password checking.\n");
 
-	my $Password = $db->getPassword($userID); # checked
+	my $Password = $db->getPassword($userID);    # checked
 	if (defined $Password) {
 		# check against Moodle password database
 		my $possibleMD5Password = md5_hex($possibleClearPassword);
@@ -126,15 +127,26 @@ sub checkPassword {
 sub check_session {
 	my ($self, $user_id, $session_key, $update_timestamp) = @_;
 
-	my ($sessionExists, $keyMatches, $timestampValid) = $self->SUPER::check_session($user_id, $session_key, $update_timestamp);
-	debug("SUPER::check_session returned: sessionExists='", $sessionExists, "' keyMatches='", $keyMatches, "' timestampValid='", $timestampValid, "'");
+	my ($sessionExists, $keyMatches, $timestampValid) =
+		$self->SUPER::check_session($user_id, $session_key, $update_timestamp);
+	debug(
+		"SUPER::check_session returned: sessionExists='",
+		$sessionExists,  "' keyMatches='",
+		$keyMatches,     "' timestampValid='",
+		$timestampValid, "'"
+	);
 
 	if ($update_timestamp and $sessionExists and $keyMatches and not $timestampValid) {
 		debug("special case: webwork key matches an expired session (check for a unexpired moodle session)");
 		my ($moodle_user_id, $moodle_expiration_time) = $self->fetch_moodle_session;
-		debug("fetch_moodle_session returned: moodle_user_id='$moodle_user_id' moodle_expiration_time='$moodle_expiration_time'.\n");
-		if (defined $moodle_user_id and $moodle_user_id eq $user_id
-				and defined $moodle_expiration_time and time <= $moodle_expiration_time) {
+		debug(
+			"fetch_moodle_session returned: moodle_user_id='$moodle_user_id' moodle_expiration_time='$moodle_expiration_time'.\n"
+		);
+		if (defined $moodle_user_id
+			and $moodle_user_id eq $user_id
+			and defined $moodle_expiration_time
+			and time <= $moodle_expiration_time)
+		{
 			$self->{session_key} = $self->create_session($moodle_user_id);
 			$timestampValid = 1;
 		}
@@ -154,14 +166,14 @@ sub init_mdl_session {
 	my $self = shift;
 
 	# version-specific stuff
-	$self->{moodle17} = $self->{r}->ce->{authen}{moodle_options}{moodle17};
+	$self->{moodle17}          = $self->{c}->ce->{authen}{moodle_options}{moodle17};
 	$self->{sql_session_table} = $self->{moodle17} ? "sessions2" : "sessions";
-	$self->{sql_data_field} = $self->{moodle17} ? "sessdata" : "data";
+	$self->{sql_data_field}    = $self->{moodle17} ? "sessdata"  : "data";
 
 	$self->{mdl_dbh} = DBI->connect_cached(
-		$self->{r}->ce->{authen}{moodle_options}{dsn},
-		$self->{r}->ce->{authen}{moodle_options}{username},
-		$self->{r}->ce->{authen}{moodle_options}{password},
+		$self->{c}->ce->{authen}{moodle_options}{dsn},
+		$self->{c}->ce->{authen}{moodle_options}{username},
+		$self->{c}->ce->{authen}{moodle_options}{password},
 		{
 			PrintError => 0,
 			RaiseError => 1,
@@ -176,19 +188,18 @@ sub fetch_moodle_session {
 	# Note that we don't worry about the user being in this course at this point.
 	# That is taken care of in Schema::Moodle::User.
 	my ($self) = @_;
-	my $r = $self->{r};
-	my $db = $r->db;
+	my $c      = $self->{c};
+	my $db     = $c->db;
 
-	my %cookies = WeBWorK::Cookie->fetch($r);
-	my $cookie = $cookies{"MoodleSession"};
+	my $cookie = $c->req->cookie('MoodleSession');
 	return unless $cookie;
 
 	my $session_table = $self->prefix_table($self->{sql_session_table});
-	my $data_field = $self->{sql_data_field};
-	my $stmt = "SELECT `expiry`,`$data_field` FROM `$session_table` WHERE `sesskey`=?";
-	my @bind_vals = $cookie->value;
+	my $data_field    = $self->{sql_data_field};
+	my $stmt          = "SELECT `expiry`,`$data_field` FROM `$session_table` WHERE `sesskey`=?";
+	my @bind_vals     = $cookie->value;
 
-	my $sth = $self->{mdl_dbh}->prepare_cached($stmt, undef, 3); # 3: see DBI docs
+	my $sth = $self->{mdl_dbh}->prepare_cached($stmt, undef, 3);    # 3: see DBI docs
 	$sth->execute(@bind_vals);
 	my $row = $sth->fetchrow_arrayref;
 	$sth->finish;
@@ -199,7 +210,7 @@ sub fetch_moodle_session {
 	# Moodle 1.7 stores expiry as a DATETIME, but WeBWorK wants a UNIX timestamp.
 	$expires = str2time($expires) if $self->{moodle17};
 
-	my $data = unserialize_session($data_string);
+	my $data     = unserialize_session($data_string);
 	my $username = $data->{"USER"}{"username"};
 
 	return $username, $expires;
@@ -208,24 +219,23 @@ sub fetch_moodle_session {
 sub update_moodle_session {
 	# extend the timeout of the current moodle session, if one exists.
 	my ($self) = @_;
-	my $r = $self->{r};
-	my $db = $r->db;
+	my $c      = $self->{c};
+	my $db     = $c->db;
 
-	my %cookies = WeBWorK::Cookie->fetch($r);
-	my $cookie = $cookies{"MoodleSession"};
+	my $cookie = $c->req->cookie('MoodleSession');
 	return unless $cookie;
 
 	my $config_table = $self->prefix_table("config");
-	my $value = "IFNULL((SELECT `value` FROM `$config_table` WHERE `name`=?),?)+?";
+	my $value        = "IFNULL((SELECT `value` FROM `$config_table` WHERE `name`=?),?)+?";
 
 	# Moodle 1.7 stores expiry as a DATETIME, but WeBWorK supplies a UNIX timestamp.
 	$value = "FROM_UNIXTIME($value)" if $self->{moodle17};
 
 	my $session_table = $self->prefix_table($self->{sql_session_table});
-	my $stmt = "UPDATE `$session_table` SET `expiry`=$value WHERE `sesskey`=?";
-	my @bind_vals = ("sessiontimeout", DEFAULT_EXPIRY, time, $cookie->value);
+	my $stmt          = "UPDATE `$session_table` SET `expiry`=$value WHERE `sesskey`=?";
+	my @bind_vals     = ("sessiontimeout", DEFAULT_EXPIRY, time, $cookie->value);
 
-	my $sth = $self->{mdl_dbh}->prepare_cached($stmt, undef, 3); # 3: see DBI docs
+	my $sth    = $self->{mdl_dbh}->prepare_cached($stmt, undef, 3);    # 3: see DBI docs
 	my $result = $sth->execute(@bind_vals);
 	$sth->finish;
 
@@ -234,8 +244,8 @@ sub update_moodle_session {
 
 sub prefix_table {
 	my ($self, $base) = @_;
-	if (defined $self->{r}->ce->{authen}{moodle_options}{table_prefix}) {
-		return $self->{r}->ce->{authen}{moodle_options}{table_prefix} . $base;
+	if (defined $self->{c}->ce->{authen}{moodle_options}{table_prefix}) {
+		return $self->{c}->ce->{authen}{moodle_options}{table_prefix} . $base;
 	} else {
 		return $base;
 	}
@@ -249,8 +259,8 @@ sub unserialize_session {
 	my @serialArray = split(/(\w+)\|/, $serialData);
 	my %variables;
 	# finally, actually deserialize it:
-	for( my $i = 1; $i < $#serialArray; $i += 2 ) {
-		$variables{$serialArray[$i]} = unserialize($serialArray[$i+1]);
+	for (my $i = 1; $i < $#serialArray; $i += 2) {
+		$variables{ $serialArray[$i] } = unserialize($serialArray[ $i + 1 ]);
 	}
 	return \%variables;
 }
diff --git a/lib/WeBWorK/Authen/Proctor.pm b/lib/WeBWorK/Authen/Proctor.pm
index 2100277eed..e9952e99aa 100644
--- a/lib/WeBWorK/Authen/Proctor.pm
+++ b/lib/WeBWorK/Authen/Proctor.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -27,15 +27,23 @@ use warnings;
 use WeBWorK::Debug;
 use WeBWorK::DB::Utils qw(grok_vsetID);
 
-use constant GENERIC_ERROR_MESSAGE => "Invalid user ID or password.";
+use constant GENERIC_ERROR_MESSAGE => 'Invalid user ID or password.';
 
-## this is only overridden for debug logging
-#sub verify {
-#	debug("BEGIN PROCTOR VERIFY");
-#	my $result = $_[0]->SUPER::verify(@_[1..$#_]);
-#	debug("END PROCTOR VERIFY");
-#	return $result;
-#}
+sub verify {
+	my $self = shift;
+	my $c    = $self->{c};
+
+	# At this point the usual authentication has already occurred and the user has been verified.  If the
+	# use_grade_auth_proctor option is set to 'No', then proctor authorization is not not needed.  So return
+	# 1 here to skip proctor authorization and proceed on to the GatewayQuiz module which will grade the test.
+	if ($c->param('submitAnswers')) {
+		my ($setName, $versionNum) = grok_vsetID($c->stash('setID'));
+		my $userSet = $c->db->getMergedSetVersion($c->param('effectiveUser'), $setName, $versionNum);
+		return 1 if $userSet && $userSet->use_grade_auth_proctor eq 'No';
+	}
+
+	return $self->SUPER::verify(@_);
+}
 
 # this is similar to the method in the base class, with these differences:
 #  1. no guest logins
@@ -43,26 +51,24 @@ use constant GENERIC_ERROR_MESSAGE => "Invalid user ID or password.";
 #  3. user_id/session_key/password come from params proctor_user/proctor_key/proctor_passwd
 sub get_credentials {
 	my ($self) = @_;
-	my $r = $self->{r};
-	my $ce = $r->ce;
-	my $db = $r->db;
+	my $c      = $self->{c};
+	my $ce     = $c->ce;
+	my $db     = $c->db;
 
-	my $urlpath = $r->urlpath;
-	my ($set_id, $version_id) = grok_vsetID( $urlpath->arg('setID') );
+	my ($set_id, $version_id) = grok_vsetID($c->stash('setID'));
 
 	# at least the user ID is available in request parameters
-	if (defined $r->param("proctor_user")) {
-		my $student_user_id = $r->param("effectiveUser");
-		$self->{user_id} = $r->param("proctor_user");
-		if ( $self->{user_id} eq $set_id ) {
+	if (defined $c->param('proctor_user')) {
+		my $student_user_id = $c->param('effectiveUser');
+		$self->{user_id} = $c->param('proctor_user');
+		if ($self->{user_id} eq $set_id) {
 			$self->{user_id} = "set_id:$set_id";
 		}
-		$self->{session_key} = $r->param("proctor_key");
-		$self->{password} = $r->param("proctor_passwd");
-		$self->{login_type} = $r->param("submitAnswers")
-			? "proctor_grading:$student_user_id"
-			: "proctor_login:$student_user_id";
-		$self->{credential_source} = "params";
+		$self->{session_key} = $c->param('proctor_key');
+		$self->{password}    = $c->param('proctor_passwd');
+		$self->{login_type} =
+			$c->param('submitAnswers') ? "proctor_grading:$student_user_id" : "proctor_login:$student_user_id";
+		$self->{credential_source} = 'params';
 		return 1;
 	}
 }
@@ -70,31 +76,31 @@ sub get_credentials {
 # duplicates method in superclass, adding additional check for permission
 #    to proctor quizzes
 sub check_user {
-	my $self = shift;
-	my $r = $self->{r};
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $authz = $r->authz;
+	my $self  = shift;
+	my $c     = $self->{c};
+	my $ce    = $c->ce;
+	my $db    = $c->db;
+	my $authz = $c->authz;
 
-	my $submitAnswers = $r->param("submitAnswers");
-	my $user_id = $self->{user_id};
-	my $past_proctor_id = $r->param("past_proctor_user") || $user_id;
+	my $submitAnswers   = $c->param('submitAnswers');
+	my $user_id         = $self->{user_id};
+	my $past_proctor_id = $c->param('past_proctor_user') || $user_id;
 
 	# for set-level authentication we prepended "set_id:"
 	my $show_user_id = $user_id;
 	$show_user_id =~ s/^set_id://;
 
-	if (defined $user_id and ($user_id eq "" || $show_user_id eq "")) {
-		$self->{log_error} = "no user id specified";
-		$self->{error} = "You must specify a user ID.";
+	if (defined $user_id and ($user_id eq '' || $show_user_id eq '')) {
+		$self->{log_error} = 'no user id specified';
+		$self->{error}     = 'You must specify a user ID.';
 		return 0;
 	}
 
 	my $User = $db->getUser($user_id);
 
 	unless ($User) {
-		$self->{log_error} = "user unknown";
-		$self->{error} = GENERIC_ERROR_MESSAGE;
+		$self->{log_error} = 'user unknown';
+		$self->{error}     = GENERIC_ERROR_MESSAGE;
 		return 0;
 	}
 
@@ -104,34 +110,52 @@ sub check_user {
 	#    it seems to me is an overlap between course permissions and
 	#    course status behaviors.
 
-	unless ($authz->hasPermissions($user_id, "login")) {
-		$self->{log_error} = "user not permitted to login";
-		$self->{error} = GENERIC_ERROR_MESSAGE;
+	unless ($authz->hasPermissions($user_id, 'login')) {
+		$self->{log_error} = 'user not permitted to login';
+		$self->{error}     = GENERIC_ERROR_MESSAGE;
 		return 0;
 	}
 
-	if ( $submitAnswers ) {
-		unless ($authz->hasPermissions($user_id,"proctor_quiz_grade")) {
+	if ($submitAnswers) {
+		unless ($authz->hasPermissions($user_id, 'proctor_quiz_grade')) {
 			# only set the error if this proctor is different
 			#    than the past proctor, implying that we have
 			#    tried to grade with a new proctor id
-			if ( $past_proctor_id ne $user_id ) {
-				$self->{log_error} = "user not permitted " .
-				    "to proctor quiz grading.";
-				$self->{error} = "User $show_user_id is not " .
-				    "authorized to proctor test grade " .
-				    "submissions in this course.";
+			if ($past_proctor_id ne $user_id) {
+				$self->{log_error} = 'user not permitted to proctor quiz grading.';
+				$self->{error} =
+					"User $show_user_id is not authorized to proctor test grade submissions in this course.";
 			}
 
 			return 0;
 		}
 	} else {
-		unless ($authz->hasPermissions($user_id,"proctor_quiz_login")) {
-			$self->{log_error} =  "user not permitted to proctor " .
-				"quiz logins.";
-			$self->{error} = "User $show_user_id is not " .
-				"authorized to proctor test logins in this " .
-				"course.";
+		# Need a UserSet to determine if it is configured to skip grade proctor
+		# authorization to grade the quiz. Require a grade proctor permission level
+		# to start a quiz that skips authorization to grade it. This ensures that
+		# a grade proctor level of authorization is always required.
+		my ($setName, $versionNum) = grok_vsetID($c->stash('setID'));
+		my $userSet = $db->getMergedSet($c->param('effectiveUser'), $setName);
+		unless (
+			$authz->hasPermissions($user_id, 'proctor_quiz_grade')
+			|| (($userSet->use_grade_auth_proctor eq 'Yes' || $userSet->restricted_login_proctor eq 'Yes')
+				&& $authz->hasPermissions($user_id, 'proctor_quiz_login'))
+			)
+		{
+			# Set the error based on if a single set password was required, a grade
+			# grade proctor was required to start, or a login proctor was required.
+			if ($userSet->restricted_login_proctor eq 'Yes') {
+				$self->{log_error} = 'invalid set password to start quiz.';
+				$self->{error}     = 'This quiz requires a set password to start, and the password was invalid.';
+			} elsif ($userSet->use_grade_auth_proctor ne 'Yes') {
+				$self->{log_error} =
+					'grade proctor required to login and user is not permitted to proctor quiz grading.';
+				$self->{error} = "This quiz requires a grade proctor to start, and user $show_user_id is not "
+					. 'authorized to proctor test grade submissions in this course.';
+			} else {
+				$self->{log_error} = 'user not permitted to proctor quiz logins.';
+				$self->{error}     = "User $show_user_id is not authorized to proctor test logins in this course.";
+			}
 			return 0;
 		}
 	}
@@ -141,11 +165,11 @@ sub check_user {
 # proctor_user, proctor_key, and proctor_passwd are used
 sub set_params {
 	my $self = shift;
-	my $r = $self->{r};
+	my $c    = $self->{c};
 
-	$r->param("proctor_user", $self->{user_id});
-	$r->param("proctor_key", $self->{session_key});
-	$r->param("proctor_passwd", "");
+	$c->param('proctor_user',   $self->{user_id});
+	$c->param('proctor_key',    $self->{session_key});
+	$c->param('proctor_passwd', '');
 }
 
 # rewrite the userID to include both the proctor's and the student's user ID
@@ -167,18 +191,18 @@ sub check_session {
 # proctor key ID rewriting helper
 sub proctor_key_id {
 	my ($self, $userID, $newKey) = @_;
-	my $r = $self->{r};
+	my $c = $self->{c};
 
-	my $proctor_key_id = $r->param("effectiveUser") . "," . $userID;
-	$proctor_key_id .= ",g" if $self->{login_type} =~ /^proctor_grading/;
+	my $proctor_key_id = $c->param('effectiveUser') . ',' . $userID;
+	$proctor_key_id .= ',g' if $self->{login_type} =~ /^proctor_grading/;
 
 	return $proctor_key_id;
 }
 
 # disable cookie functionality for proctors
-sub maybe_send_cookie {}
-sub fetchCookie {}
-sub sendCookie {}
-sub killCookie {}
+sub maybe_send_cookie { }
+sub fetchCookie       { }
+sub sendCookie        { }
+sub killCookie        { }
 
 1;
diff --git a/lib/WeBWorK/Authen/Shibboleth.pm b/lib/WeBWorK/Authen/Shibboleth.pm
index 6ff06aa370..79bf35642d 100644
--- a/lib/WeBWorK/Authen/Shibboleth.pm
+++ b/lib/WeBWorK/Authen/Shibboleth.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -18,7 +18,7 @@ use base qw/WeBWorK::Authen/;
 
 =head1 NAME
 
-WeBWorK::Authen::Shibboleth - Authentication plug in for Shibboleth. 
+WeBWorK::Authen::Shibboleth - Authentication plug in for Shibboleth.
 This is basd on Cosign.pm
 
 For documentation, please refer to http://webwork.maa.org/wiki/External_(Shibboleth)_Authentication
@@ -28,16 +28,16 @@ to use: include in localOverrides.conf or course.conf
 and add /webwork2/courseName as a Shibboleth Protected
 Location or enable lazy session.
 
-if $r->ce->{shiboff} is set for a course, authentication reverts
+if $c->ce->{shiboff} is set for a course, authentication reverts
 to standard WeBWorK authentication.
 
 add the following to localOverrides.conf to setup the Shibboleth
-  
+
 $shibboleth{login_script} = "/Shibboleth.sso/Login"; # login handler
 $shibboleth{logout_script} = "/Shibboleth.sso/Logout?return=".$server_root_url.$webwork_url; # return URL after logout
 $shibboleth{session_header} = "Shib-Session-ID"; # the header to identify if there is an existing shibboleth session
 $shibboleth{manage_session_timeout} = 1; # allow shib to manage session time instead of webwork
-$shibboleth{hash_user_id_method} = "MD5"; # possible values none, MD5. Use it when you want to hide real user_ids from showing in url. 
+$shibboleth{hash_user_id_method} = "MD5"; # possible values none, MD5. Use it when you want to hide real user_ids from showing in url.
 $shibboleth{hash_user_id_salt} = ""; # salt for hash function
 #define mapping between shib and webwork
 $shibboleth{mapping}{user_id} = "username";
@@ -46,7 +46,7 @@ $shibboleth{mapping}{user_id} = "username";
 
 use strict;
 use warnings;
-use CGI qw/:standard/;
+
 use WeBWorK::Debug;
 
 # this is similar to the method in the base class, except that Shibboleth
@@ -56,12 +56,12 @@ use WeBWorK::Debug;
 
 sub get_credentials {
 	my ($self) = @_;
-	my $r = $self->{r};
-	my $ce = $r->ce;
-	my $db = $r->db;
-	
-	if ( $ce->{shiboff} || $r->param('bypassShib')) {
-		return $self->SUPER::get_credentials( @_ );
+	my $c      = $self->{c};
+	my $ce     = $c->ce;
+	my $db     = $c->db;
+
+	if ($ce->{shiboff} || $c->param('bypassShib')) {
+		return $self->SUPER::get_credentials(@_);
 	}
 
 	debug("Shib is on!");
@@ -71,48 +71,50 @@ sub get_credentials {
 	#    failure.
 	$self->{external_auth} = 1;
 
-	if ( $r->param("user") && ! $r->param("force_passwd_authen") ) {
-		return $self->SUPER::get_credentials( @_ );
+	if ($c->param("user") && !$c->param("force_passwd_authen")) {
+		return $self->SUPER::get_credentials(@_);
 	}
 
-	if ( defined ($ENV{$ce->{shibboleth}{session_header}}) && defined( $ENV{$ce->{shibboleth}{mapping}{user_id}} ) ) {
+	if (defined($ENV{ $ce->{shibboleth}{session_header} }) && defined($ENV{ $ce->{shibboleth}{mapping}{user_id} })) {
 		debug('Got shib header and user_id');
-		my $user_id = $ENV{$ce->{shibboleth}{mapping}{user_id}};
-		if ( defined ($ce->{shibboleth}{hash_user_id_method}) &&
-		     $ce->{shibboleth}{hash_user_id_method} ne "none" &&
-		     $ce->{shibboleth}{hash_user_id_method} ne "" ) {
+		my $user_id = $ENV{ $ce->{shibboleth}{mapping}{user_id} };
+		if (defined($ce->{shibboleth}{hash_user_id_method})
+			&& $ce->{shibboleth}{hash_user_id_method} ne "none"
+			&& $ce->{shibboleth}{hash_user_id_method} ne "")
+		{
 			use Digest;
-			my $digest  = Digest->new($ce->{shibboleth}{hash_user_id_method});
-			$digest->add(uc($user_id). ( defined $ce->{shibboleth}{hash_user_id_salt} ? $ce->{shibboleth}{hash_user_id_salt} : ""));
+			my $digest = Digest->new($ce->{shibboleth}{hash_user_id_method});
+			$digest->add(
+				uc($user_id)
+					. (defined $ce->{shibboleth}{hash_user_id_salt} ? $ce->{shibboleth}{hash_user_id_salt} : ""));
 			$user_id = $digest->hexdigest;
 		}
 		$self->{'user_id'} = $user_id;
-		$self->{r}->param("user", $user_id);
+		$self->{c}->param("user", $user_id);
 
-		# the session key isn't used (Shibboleth is managing this 
-		#    for us), and we want to force checking against the 
+		# the session key isn't used (Shibboleth is managing this
+		#    for us), and we want to force checking against the
 		#    site_checkPassword
-		$self->{'session_key'} = undef;
-		$self->{'password'} = 1;
-		$self->{login_type} = "normal";
+		$self->{'session_key'}       = undef;
+		$self->{'password'}          = 1;
+		$self->{login_type}          = "normal";
 		$self->{'credential_source'} = "params";
 
 		return 1;
 	}
 
 	debug("Couldn't shib header or user_id");
-	my $q = new CGI;
-	my $go_to = $ce->{shibboleth}{login_script}."?target=".$q->url(-path=>1);
+	my $go_to = $ce->{shibboleth}{login_script} . "?target=" . $c->url_for->to_abs;
 	$self->{redirect} = $go_to;
-	print $q->redirect($go_to);
+	$c->redirect_to($go_to);
 	return 0;
 }
 
-sub site_checkPassword { 
-	my ( $self, $userID, $clearTextPassword ) = @_;
+sub site_checkPassword {
+	my ($self, $userID, $clearTextPassword) = @_;
 
-	if ( $self->{r}->ce->{shiboff}  || $self->{r}->param('bypassShib') ) {
-		return $self->SUPER::checkPassword( @_ );
+	if ($self->{c}->ce->{shiboff} || $self->{c}->param('bypassShib')) {
+		return $self->SUPER::checkPassword(@_);
 	} else {
 		# this is easy; if we're here at all, we've authenticated
 		# through shib
@@ -123,32 +125,35 @@ sub site_checkPassword {
 # disable cookie functionality
 sub maybe_send_cookie {
 	my ($self, @args) = @_;
-	if ( $self->{r}->ce->{shiboff} ) {
-		return $self->SUPER::maybe_send_cookie( @_ );
+	if ($self->{c}->ce->{shiboff}) {
+		return $self->SUPER::maybe_send_cookie(@_);
 	} else {
 		# nothing to do here
 	}
 }
+
 sub fetchCookie {
 	my ($self, @args) = @_;
-	if ( $self->{r}->ce->{shiboff} ) {
-		return $self->SUPER::fetchCookie( @_ );
+	if ($self->{c}->ce->{shiboff}) {
+		return $self->SUPER::fetchCookie(@_);
 	} else {
 		# nothing to do here
 	}
 }
+
 sub sendCookie {
 	my ($self, @args) = @_;
-	if ( $self->{r}->ce->{shiboff} ) {
-		return $self->SUPER::sendCookie( @_ );
+	if ($self->{c}->ce->{shiboff}) {
+		return $self->SUPER::sendCookie(@_);
 	} else {
 		# nothing to do here
 	}
 }
+
 sub killCookie {
 	my ($self, @args) = @_;
-	if ( $self->{r}->ce->{shiboff} ) {
-		return $self->SUPER::killCookie( @_ );
+	if ($self->{c}->ce->{shiboff}) {
+		return $self->SUPER::killCookie(@_);
 	} else {
 		# nothing to do here
 	}
@@ -156,15 +161,15 @@ sub killCookie {
 
 # this is a bit of a cheat, because it does the redirect away from the
 #   logout script or what have you, but I don't see a way around that.
-sub forget_verification { 
+sub forget_verification {
 	my ($self, @args) = @_;
-	my $r = $self->{r};
+	my $c = $self->{c};
 
-	if ( $r->ce->{shiboff} ) {
-		return $self->SUPER::forget_verification( @_ );
+	if ($c->ce->{shiboff}) {
+		return $self->SUPER::forget_verification(@_);
 	} else {
 		$self->{was_verified} = 0;
-		$self->{redirect} = $r->ce->{shibboleth}{logout_script};
+		$self->{redirect}     = $c->ce->{shibboleth}{logout_script};
 	}
 }
 
@@ -173,17 +178,17 @@ sub forget_verification {
 # override function: allow shib to handle the session time out
 sub check_session {
 	my ($self, $userID, $possibleKey, $updateTimestamp) = @_;
-	my $ce = $self->{r}->ce;
-	my $db = $self->{r}->db;
-	
-	if ( $ce->{shiboff} ) {
-		return $self->SUPER::check_session( @_ );
+	my $ce = $self->{c}->ce;
+	my $db = $self->{c}->db;
+
+	if ($ce->{shiboff}) {
+		return $self->SUPER::check_session(@_);
 	} else {
-		my $Key = $db->getKey($userID); # checked
-			return 0 unless defined $Key;
+		my $Key = $db->getKey($userID);    # checked
+		return 0 unless defined $Key;
 
-		my $keyMatches = (defined $possibleKey and $possibleKey eq $Key->key);
-		my $timestampValid = (time <= $Key->timestamp()+$ce->{sessionKeyTimeout});
+		my $keyMatches     = (defined $possibleKey and $possibleKey eq $Key->key);
+		my $timestampValid = (time <= $Key->timestamp() + $ce->{sessionKeyTimeout});
 		if ($ce->{shibboleth}{manage_session_timeout}) {
 			# always valid to allow shib to take control of timeout
 			$timestampValid = 1;
diff --git a/lib/WeBWorK/Authen/XMLRPC.pm b/lib/WeBWorK/Authen/XMLRPC.pm
deleted file mode 100644
index 3775d79e66..0000000000
--- a/lib/WeBWorK/Authen/XMLRPC.pm
+++ /dev/null
@@ -1,56 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::Authen::XMLRPC;
-use parent "WeBWorK::Authen";
-
-=head1 NAME
-
-WeBWorK::Authen::XMLRPC - Authenticate xmlrpc requests.
-
-=cut
-
-use strict;
-use warnings;
-use WeBWorK::Debug;
-
-# Instead of being called with an apache request object $r 
-# this authentication method gets its data  
-# from an HTML data form.  It creates a WeBWorK::Authen::XMLRPC object  
-# which fakes the essential properties of the WeBWorK::Request object needed for authentication
-
-
-# sub new {
-# 	my $class = shift;    
-# 	my $fake_r = shift;
-# 	my $user_authen_module = WeBWorK::Authen::class($ce, "user_module");
-#     # runtime_use $user_authen_module;
-#     $GENERIC_ERROR_MESSAGE = $fake_r->maketext("Invalid user ID or password.");
-# 	my $authen = $user_authen_module->new($fake_r);
-# 	return $authen;
-# }
-
-# disable cookie functionality for xmlrpc
-sub connection {
-	return 0;  #indicate that there is no connection
-}
-sub maybe_send_cookie {}
-sub fetchCookie {}
-sub sendCookie {}
-sub killCookie {}
-
-
-
-1;
diff --git a/lib/WeBWorK/Authz.pm b/lib/WeBWorK/Authz.pm
index 06619daf73..c1c6bc9dff 100644
--- a/lib/WeBWorK/Authz.pm
+++ b/lib/WeBWorK/Authz.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -21,8 +21,8 @@ WeBWorK::Authz - check user permissions.
 
 =head1 SYNOPSIS
 
- # create new authorizer -- $r is a WeBWorK::Request object.
- my $authz = new WeBWorK::Authz($r);
+ # create new authorizer -- $c is a WeBWorK::Controller object.
+ my $authz = new WeBWorK::Authz($c);
 
  # tell authorizer to cache permission level of user spammy.
  $authz->setCachedUser("spammy");
@@ -72,22 +72,20 @@ use version;
 
 =over
 
-=item WeBWorK::Authz->new($r)
+=item WeBWorK::Authz->new($c)
 
-Creates a new authorizer instance. $r is a WeBWorK::Request object. It must
+Creates a new authorizer instance. $c is a WeBWorK::Controller object. It must
 already have its C<ce> and C<db> fields set.
 
 =cut
 
 sub new {
-	my ($invocant, $r) = @_;
+	my ($invocant, $c) = @_;
 	my $class = ref($invocant) || $invocant;
-	my $self = {
-		r => $r,
-	};
-	weaken $self -> {r};
+	my $self  = { c => $c, };
+	#weaken $self->{c};
 
-	$r -> {permission_retrieval_error} = 0;
+	$c->{permission_retrieval_error} = 0;
 	bless $self, $class;
 	return $self;
 }
@@ -113,57 +111,59 @@ WeBWorK to cache the "real" user.
 
 sub setCachedUser {
 	my ($self, $userID) = @_;
-	my $r = $self->{r};
-	my $db = $r->db;
+	my $c  = $self->{c};
+	my $db = $c->db;
 
 	delete $self->{userID};
 	delete $self->{PermissionLevel};
 
 	if (defined $userID) {
 		$self->{userID} = $userID;
-		if (! $db -> existsUser($userID) && defined($r -> param("lis_person_sourcedid"))) {
+		if (!$db->existsUser($userID) && defined($c->param("lis_person_sourcedid"))) {
 			# This is a new user referred via an LTI link.
 			# Do not attempt to cache the permission here.
-			# Rather, the LTIBasic authentication module should cache the permission.
+			# Rather, the LTI authentication module should cache the permission.
 			return 1;
 		}
 		my $PermissionLevel;
-		my $tryAgain=1;
-		my $count=0;
+		my $tryAgain = 1;
+		my $count    = 0;
 		while ($tryAgain && $count < 2) {
-			eval {$PermissionLevel = $db->getPermissionLevel($userID); # checked
-				};
+			eval {
+				$PermissionLevel = $db->getPermissionLevel($userID);    # checked
+			};
 			if ($@) {
 				$count++;
-			}
-			else {
-				$tryAgain=0;
+			} else {
+				$tryAgain = 0;
 			}
 		}
-		if (defined $PermissionLevel and defined $PermissionLevel -> permission
-			and $PermissionLevel -> permission ne "") {
+		if (defined $PermissionLevel
+			and defined $PermissionLevel->permission
+			and $PermissionLevel->permission ne "")
+		{
 			# cache the  permission level record in this request to avoid later database calls
 			$self->{PermissionLevel} = $PermissionLevel;
-		}
-		elsif (defined($r -> param("lis_person_sourcedid"))
-				or defined($r -> param("lis_person_sourced_id"))
-				or defined($r -> param("lis_person_source_id"))
-				or defined($r -> param("lis_person_sourceid"))
-				or defined($r -> param("lis_person_contact_email_primary")) ) {
+		} elsif (defined($c->param("lis_person_sourcedid"))
+			or defined($c->param("lis_person_sourced_id"))
+			or defined($c->param("lis_person_source_id"))
+			or defined($c->param("lis_person_sourceid"))
+			or defined($c->param("lis_person_contact_email_primary")))
+		{
 			# This is a new user referred via an LTI link.
 			# Do not attempt to cache the permission here.
-			# Rather, the LTIBasic authentication module should cache the permission.
+			# Rather, the LTI authentication module should cache the permission.
 			return 1;
-		}
-		elsif (defined($r -> param("oauth_nonce"))) {
+		} elsif (defined($c->param("oauth_nonce"))) {
 			# This is a LTI attempt that doesn't have an lis_person_sourcedid username.
-			croak ("Your request did not specify your username.  Perhaps you were attempting to authenticate via LTI but the LTI tool did not transmit "
-				. "any variant of the lis_person_sourced_id parameter and did not transmit the lis_person_contact_email_primary parameter.");
-		}
+			croak(
+				"Your request did not specify your username.  Perhaps you were attempting to authenticate via LTI but the LTI tool did not transmit "
+					. "any variant of the lis_person_sourced_id parameter and did not transmit the lis_person_contact_email_primary parameter."
+			);
 
-		else {
-			if ($r->{permission_retrieval_error} == 0) {
-				$r->{permission_retrieval_error}=1;
+		} else {
+			if ($c->{permission_retrieval_error} == 0) {
+				$c->{permission_retrieval_error} = 1;
 				croak "Unable to retrieve your permissions, perhaps due to a collision "
 					. "between your request and that of another user "
 					. "(or possibly an unfinished request of yours). "
@@ -195,17 +195,17 @@ assumes that the user does not have permission.
 # This currently only uses two of it's arguments, but it accepts any number, in
 # case in the future calculating certain permissions requires more information.
 sub hasPermissions {
-	if (@_ != 3 and not( @_==4 and $_[3] eq 'equal') ) {
-		shift @_; # get rid of self
+	if (@_ != 3 and not(@_ == 4 and $_[3] eq 'equal')) {
+		shift @_;    # get rid of self
 		my $nargs = @_;
-		croak "hasPermissions called with $nargs arguments instead of the expected 2: '@_'"
+		croak "hasPermissions called with $nargs arguments instead of the expected 2: '@_'";
 	}
 
 	my ($self, $userID, $activity, $exactness) = @_;
-	if (!defined($exactness) ) {$exactness='ge';}
-	my $r = $self->{r};
-	my $ce = $r->ce;
-	my $db = $r->db;
+	if (!defined($exactness)) { $exactness = 'ge'; }
+	my $c  = $self->{c};
+	my $ce = $c->ce;
+	my $db = $c->db;
 
 	# this may need to be changed if we get other permission level data sources
 	return 0 unless defined $db;
@@ -218,7 +218,7 @@ sub hasPermissions {
 
 	if (not defined($self->{userID})) {
 		#warn "self->{userID} is undefined";
-		$self-> setCachedUser($userID);
+		$self->setCachedUser($userID);
 	}
 
 	my $cachedUserID = $self->{userID};
@@ -226,24 +226,22 @@ sub hasPermissions {
 		# this is the same user -- we can skip the database call
 		$PermissionLevel = $self->{PermissionLevel};
 	} else {
-		# a different user, or no user was defined before
-		#my $prettyCachedUserID = defined $cachedUserID ? "'$cachedUserID'" : "undefined";
-		#warn "hasPermissions called with user  $userID , but cached user is $prettyCachedUserID. Accessing database.\n";
-		$PermissionLevel = $db->getPermissionLevel($userID); # checked
+	   # a different user, or no user was defined before
+	   #my $prettyCachedUserID = defined $cachedUserID ? "'$cachedUserID'" : "undefined";
+	   #warn "hasPermissions called with user  $userID , but cached user is $prettyCachedUserID. Accessing database.\n";
+		$PermissionLevel = $db->getPermissionLevel($userID);    # checked
 	}
 
 	my $permission_level;
 
 	if (defined $PermissionLevel) {
 		$permission_level = $PermissionLevel->permission;
-	}
-	elsif (defined($r -> param("lis_person_sourcedid"))){
+	} elsif (defined($c->param("lis_person_sourcedid"))) {
 		# This is an LTI login.  Let's see if the LITBasic authentication module will handle this.
 		#return 1;
-	}
-	else {
+	} else {
 		# uh, oh. this user has no permission level record!
-		if ($r -> {permission_retrieval_error} != 1) {
+		if ($c->{permission_retrieval_error} != 1) {
 			warn "User '$userID' has no PermissionLevel record -- assuming no permission.";
 		}
 		return 0;
@@ -254,7 +252,7 @@ sub hasPermissions {
 		return 0;
 	}
 
-	my $userRoles = $ce->{userRoles};
+	my $userRoles        = $ce->{userRoles};
 	my $permissionLevels = $ce->{permissionLevels};
 
 	if (exists $permissionLevels->{$activity}) {
@@ -262,30 +260,36 @@ sub hasPermissions {
 		if (defined $activity_role) {
 			if (exists $userRoles->{$activity_role}) {
 				my $role_permlevel = $userRoles->{$activity_role};
+				# Elevate all permissions greater than a student in the admin course to the
+				# create_and_delete_courses level.  This way a user either has access to all
+				# or only student level permissions tools in the admin course.
+				if (defined($ce->{courseName}) && $ce->{courseName} eq 'admin') {
+					my $admin_permlevel = $userRoles->{ $permissionLevels->{create_and_delete_courses} };
+					$role_permlevel = $admin_permlevel
+						if $role_permlevel > $userRoles->{student} && $role_permlevel < $admin_permlevel;
+				}
 				if (defined $role_permlevel) {
- 					if ($exactness eq 'ge') {
- 						return $permission_level >= $role_permlevel;
- 					}
- 					elsif ($exactness eq 'equal') {
- 						return $permission_level == $role_permlevel;
- 					}
- 					else {
- 						return 0;
- 					}
+					if ($exactness eq 'ge') {
+						return $permission_level >= $role_permlevel;
+					} elsif ($exactness eq 'equal') {
+						return $permission_level == $role_permlevel;
+					} else {
+						return 0;
+					}
 				} else {
-#					warn "Role '$activity_role' has undefined permission level -- assuming no permission.";
+					#					warn "Role '$activity_role' has undefined permission level -- assuming no permission.";
 					return 0;
 				}
 			} else {
-#				warn "Role '$activity_role' for activity '$activity' not found in \%userRoles -- assuming no permission.";
+		 #				warn "Role '$activity_role' for activity '$activity' not found in \%userRoles -- assuming no permission.";
 				return 0;
 			}
 		} else {
-#			warn "Undefined Role, -- assuming no one has permission to perform $activity.";
-			return 0; # undefiend $activity_role, no one has permission to perform $activity
+			#			warn "Undefined Role, -- assuming no one has permission to perform $activity.";
+			return 0;    # undefiend $activity_role, no one has permission to perform $activity
 		}
 	} else {
-#		warn "Activity '$activity' not found in \%permissionLevels -- assuming no permission.";
+		#		warn "Activity '$activity' not found in \%permissionLevels -- assuming no permission.";
 		return 0;
 	}
 }
@@ -293,20 +297,20 @@ sub hasPermissions {
 #########################  IU Addition  ###############
 sub hasExactPermissions {
 	my ($self, $userID, $activity) = @_;
-	my $r = $self->{r};
-	my $ce = $r->ce;
-	my $db = $r->db;
+	my $c  = $self->{c};
+	my $ce = $c->ce;
+	my $db = $c->db;
 
-#	my $Permission = $db->getPermissionLevel($user); # checked
-#	return 0 unless defined $Permission;
-#	my $permissionLevel = $Permission->permission();
+	#	my $Permission = $db->getPermissionLevel($user); # checked
+	#	return 0 unless defined $Permission;
+	#	my $permissionLevel = $Permission->permission();
 
 ##
 	my $PermissionLevel;
 
 	if (not defined($self->{userID})) {
 		#warn "self->{userID} is undefined";
-		$self-> setCachedUser($userID);
+		$self->setCachedUser($userID);
 	}
 
 	my $cachedUserID = $self->{userID};
@@ -314,10 +318,10 @@ sub hasExactPermissions {
 		# this is the same user -- we can skip the database call
 		$PermissionLevel = $self->{PermissionLevel};
 	} else {
-		# a different user, or no user was defined before
-		#my $prettyCachedUserID = defined $cachedUserID ? "'$cachedUserID'" : "undefined";
-		#warn "hasPermissions called with user  $userID , but cached user is $prettyCachedUserID. Accessing database.\n";
-		$PermissionLevel = $db->getPermissionLevel($userID); # checked
+	   # a different user, or no user was defined before
+	   #my $prettyCachedUserID = defined $cachedUserID ? "'$cachedUserID'" : "undefined";
+	   #warn "hasPermissions called with user  $userID , but cached user is $prettyCachedUserID. Accessing database.\n";
+		$PermissionLevel = $db->getPermissionLevel($userID);    # checked
 	}
 
 	my $permission_level;
@@ -326,7 +330,7 @@ sub hasExactPermissions {
 		$permission_level = $PermissionLevel->permission;
 	} else {
 		# uh, oh. this user has no permission level record!
-		if ($r -> {permission_retrieval_error} != 1) {
+		if ($c->{permission_retrieval_error} != 1) {
 			warn "User '$userID' has no PermissionLevel record -- assuming no permission.";
 		}
 		return 0;
@@ -355,21 +359,20 @@ sub hasExactPermissions {
 #### set-level authorization routines
 
 sub checkSet {
-	my $self    = shift;
-	my $r       = $self->{r};
-	my $ce      = $r->ce;
-	my $db      = $r->db;
-	my $urlPath = $r->urlpath;
+	my $self = shift;
+	my $c    = $self->{c};
+	my $ce   = $c->ce;
+	my $db   = $c->db;
 
-	my $node_name = $urlPath->type;
+	my $node_name = $c->current_route;
 
 	# First check to see if we have to worried about set-level access restrictions.
 	return 0 unless (grep {/^$node_name$/} (qw(problem_list problem_detail gateway_quiz proctored_gateway_quiz)));
 
 	# To check set restrictions we need a set and a user.
-	my $setName           = $urlPath->arg("setID");
-	my $userName          = $r->param("user");
-	my $effectiveUserName = $r->param("effectiveUser");
+	my $setName           = $c->stash('setID');
+	my $userName          = $c->param("user");
+	my $effectiveUserName = $c->param("effectiveUser");
 
 	# If there is no input userName, then the content generator will be forcing a login, so just bail.
 	return 0 if (!$userName || !$effectiveUserName);
@@ -390,17 +393,17 @@ sub checkSet {
 			if ($db->existsSetVersion($effectiveUserName, $setName, $verNum)) {
 				$set = $db->getMergedSetVersion($effectiveUserName, $setName, $verNum);
 			} else {
-				return $r->maketext("Requested version ([_1]) of set '[_2]' is not assigned to user [_3].",
+				return $c->maketext("Requested version ([_1]) of set '[_2]' is not assigned to user [_3].",
 					$verNum, $setName, $effectiveUserName);
 			}
 		}
 		if (!$set) {
-			return $r->maketext("Requested set '[_1]' could not be found in the database for user [_2].",
+			return $c->maketext("Requested set '[_1]' could not be found in the database for user [_2].",
 				$setName, $effectiveUserName);
 		}
 		# Don't allow versioned sets to be viewed from the problem-list page.
 		if ($node_name eq 'problem_list') {
-			return $r->maketext("Requested version ([_1]) of set '[_2]' can not be directly accessed.", $verNum,
+			return $c->maketext("Requested version ([_1]) of set '[_2]' can not be directly accessed.", $verNum,
 				$setName);
 		}
 	} else {
@@ -414,11 +417,11 @@ sub checkSet {
 				# happens for instructor tool users.
 				return 0;
 			} else {
-				return $r->maketext("Requested set '[_1]' is not assigned to user [_2].", $setName, $effectiveUserName);
+				return $c->maketext("Requested set '[_1]' is not assigned to user [_2].", $setName, $effectiveUserName);
 			}
 		}
 		if (!$set) {
-			return $r->maketext("Requested set '[_1]' could not be found in the database for user [_2].",
+			return $c->maketext("Requested set '[_1]' could not be found in the database for user [_2].",
 				$setName, $effectiveUserName);
 		}
 	}
@@ -438,13 +441,13 @@ sub checkSet {
 		)
 		)
 	{
-		return $r->maketext("Requested set '[_1]' is not yet open.", $setName);
+		return $c->maketext("Requested set '[_1]' is not yet open.", $setName);
 	}
 
 	# Check to make sure that the set is visible, and that the user is allowed to view hidden sets.
 	my $visible = $set && $set->visible ne '0' && $set->visible ne '1' ? 1 : $set->visible;
 	if (!$visible && !$self->hasPermissions($userName, "view_hidden_sets")) {
-		return $r->maketext("Requested set '[_1]' is not available yet.", $setName);
+		return $c->maketext("Requested set '[_1]' is not available yet.", $setName);
 	}
 
 	# Check to see if conditional release conditions have been met.
@@ -452,19 +455,19 @@ sub checkSet {
 		&& is_restricted($db, $set, $effectiveUserName)
 		&& !$self->hasPermissions($userName, "view_unopened_sets"))
 	{
-		return $r->maketext("The prerequisite conditions have not been met for set '[_1]'.", $setName);
+		return $c->maketext("The prerequisite conditions have not been met for set '[_1]'.", $setName);
 	}
 
 	# Check to be sure that gateways are being sent to the correct content generator.
 	if (defined($set->assignment_type) && $set->assignment_type =~ /gateway/ && $node_name eq 'problem_detail') {
-		return $r->maketext(
-			"Requested set '[_1]' is a test/quiz assignment but the regular homework assignment content "
+		return $c->maketext(
+			"Requested set '[_1]' is a test but the regular homework assignment content "
 				. 'generator [_2] was called.  Try re-entering the set from the problem sets listing page.',
 			$setName, $node_name
 		);
 	} elsif ((!defined($set->assignment_type) || $set->assignment_type eq 'default') && $node_name =~ /gateway/) {
-		return $r->maketext(
-			"Requested set '[_1]' is a homework assignment but the gateway/quiz content generator [_2] was called.  "
+		return $c->maketext(
+			"Requested set '[_1]' is a homework assignment but the test content generator [_2] was called.  "
 				. 'Try re-entering the set from the problem sets listing page.',
 			$setName, $node_name
 		);
@@ -476,13 +479,11 @@ sub checkSet {
 	if (defined($set->assignment_type)
 		&& $set->assignment_type =~ /proctored/
 		&& $node_name ne 'problem_list'
-		&& !WeBWorK::Authen::Proctor->new($r, $ce, $db)->verify())
+		&& !WeBWorK::Authen::Proctor->new($c, $ce, $db)->verify())
 	{
-		return $r->maketext(
-			"Requested set '[_1]' is a proctored test/quiz assignment, "
-				. 'but no valid proctor authorization has been obtained.',
-			$setName
-		);
+		return $c->maketext(
+			'Requested set "[_1]" is a proctored test, but no valid proctor authorization has been obtained.',
+			$setName);
 	}
 
 	# Check for ip restrictions.
@@ -494,10 +495,13 @@ sub checkSet {
 	my $LTIGradeMode = $ce->{LTIGradeMode} // '';
 
 	if ($LTIGradeMode eq 'homework' && !$self->hasPermissions($userName, "view_unopened_sets")) {
-		my $LMS = ($ce->{LMS_url}) ? CGI::a({ href => $ce->{LMS_url} }, $ce->{LMS_name}) : $ce->{LMS_name};
-		return $r->maketext(
-			'You must use your Learning Managment System ([_1]) to access this set.  '
-				. 'Try logging in to the Learning Managment System and visiting the set from there.',
+		my $LMS =
+			$ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+			? $c->link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+			: $ce->{LTI}{ $ce->{LTIVersion} }{LMS_name};
+		return $c->maketext(
+			'You must use your Learning Management System ([_1]) to access this set.  '
+				. 'Try logging in to the Learning Management System and visiting the set from there.',
 			$LMS
 		) unless $set->lis_source_did;
 	}
@@ -506,49 +510,53 @@ sub checkSet {
 }
 
 sub invalidIPAddress {
-# this exists as a separate routine because we need to check multiple
-#    sets in Hardcopy; having this routine to check the set allows us to do
-#    that for all sets individually there.
+	# this exists as a separate routine because we need to check multiple
+	#    sets in Hardcopy; having this routine to check the set allows us to do
+	#    that for all sets individually there.
 
 	my $self = shift;
-	my $set = shift;
+	my $set  = shift;
 
-	my $r = $self->{r};
-	my $db = $r->db;
-	my $ce = $r->ce;
-	my $urlPath = $r->urlpath;
-#	my $setName = $urlPath->arg("setID");  # not always defined
-	my $setName = $set->set_id;
-	my $userName = $r->param("user");
-	my $effectiveUserName = $r->param("effectiveUser");
+	my $c                 = $self->{c};
+	my $db                = $c->db;
+	my $ce                = $c->ce;
+	my $setName           = $set->set_id;
+	my $userName          = $c->param("user");
+	my $effectiveUserName = $c->param("effectiveUser");
 
-	return 0 if (!defined($set->restrict_ip) ||
-			$set->restrict_ip eq '' || $set->restrict_ip eq 'No' ||
-		     $self->hasPermissions($userName,'view_ip_restricted_sets'));
+	return 0
+		if (!defined($set->restrict_ip)
+			|| $set->restrict_ip eq ''
+			|| $set->restrict_ip eq 'No'
+			|| $self->hasPermissions($userName, 'view_ip_restricted_sets'));
 
-	my $clientIP = new Net::IP($r->useragent_ip);
+	my $clientIP = new Net::IP($c->tx->remote_address);
 
 	# make sure that we're using the non-versioned set name
 	$setName =~ s/,v\d+$//;
 
-	my $restrictType = $set->restrict_ip;
-	my @restrictLocations = $db->getAllMergedSetLocations($effectiveUserName,$setName);
-	my @locationIDs = ( map {$_->location_id} @restrictLocations );
-	my @restrictAddresses = ( map {$db->listLocationAddresses($_)} @locationIDs );
+	my $restrictType      = $set->restrict_ip;
+	my @restrictLocations = $db->getAllMergedSetLocations($effectiveUserName, $setName);
+	my @locationIDs       = (map { $_->location_id } @restrictLocations);
+	my @restrictAddresses = (map { $db->listLocationAddresses($_) } @locationIDs);
 
 	# if there are no addresses in the locations, return an error that
 	#    says this
-	return $r->maketext("Client ip address [_1] is not allowed to work this assignment, because the assignment has ip address restrictions and there are no allowed locations associated with the restriction.  Contact your professor to have this problem resolved.",$clientIP->ip() ) if ( ! @restrictAddresses );
+	return $c->maketext(
+		"Client ip address [_1] is not allowed to work this assignment, because the assignment has ip address restrictions and there are no allowed locations associated with the restriction.  Contact your professor to have this problem resolved.",
+		$clientIP->ip()
+	) if (!@restrictAddresses);
 
 	# build a set of IP objects to match against
-	my @restrictIPs = ( map {new Net::IP($_)} @restrictAddresses );
+	my @restrictIPs = (map { new Net::IP($_) } @restrictAddresses);
 
 	# and check the clientAddress against these: is $clientIP
 	#    in @restrictIPs?
 	my $inRestrict = 0;
-	foreach my $rIP ( @restrictIPs ) {
-		if ($rIP->overlaps($clientIP) == $IP_B_IN_A_OVERLAP ||
-		    $rIP->overlaps($clientIP) == $IP_IDENTICAL) {
+	foreach my $rIP (@restrictIPs) {
+		if ($rIP->overlaps($clientIP) == $IP_B_IN_A_OVERLAP
+			|| $rIP->overlaps($clientIP) == $IP_IDENTICAL)
+		{
 			$inRestrict = $rIP->ip();
 			last;
 		}
@@ -556,14 +564,18 @@ sub invalidIPAddress {
 
 	# this is slightly complicated by having to check relax_restrict_ip
 	my $badIP = '';
-	if ( $restrictType eq 'RestrictTo' && ! $inRestrict ) {
-		$badIP = "Client ip address " . $clientIP->ip() .
-			" is not in the list of addresses from " .
-			"which this assignment may be worked.";
-	} elsif ( $restrictType eq 'DenyFrom' && $inRestrict ) {
-		$badIP = "Client ip address " . $clientIP->ip() .
-			" is in the list of addresses from " .
-			"which this assignment may not be worked.";
+	if ($restrictType eq 'RestrictTo' && !$inRestrict) {
+		$badIP =
+			"Client ip address "
+			. $clientIP->ip()
+			. " is not in the list of addresses from "
+			. "which this assignment may be worked.";
+	} elsif ($restrictType eq 'DenyFrom' && $inRestrict) {
+		$badIP =
+			"Client ip address "
+			. $clientIP->ip()
+			. " is in the list of addresses from "
+			. "which this assignment may not be worked.";
 	} else {
 		return 0;
 	}
@@ -574,26 +586,25 @@ sub invalidIPAddress {
 	#    depending on whether the set is versioned or not
 
 	my $relaxRestrict = $set->relax_restrict_ip;
-	return $badIP if ( $relaxRestrict eq 'No' );
+	return $badIP if ($relaxRestrict eq 'No');
 
-	if ( $set->assignment_type =~ /gateway/ ) {
-		if ( $relaxRestrict eq 'AfterAnswerDate' ) {
+	if ($set->assignment_type =~ /gateway/) {
+		if ($relaxRestrict eq 'AfterAnswerDate') {
 			# in this case we need to go and get the userset,
 			#    not the versioned set (which we already have)
 			#    drat!
-			my $userset = $db->getMergedSet($set->user_id,$setName);
-			return( ! $userset || before($userset->answer_date)
-				? $badIP : 0 );
+			my $userset = $db->getMergedSet($set->user_id, $setName);
+			return (!$userset || before($userset->answer_date) ? $badIP : 0);
 		} else {
 			# this is easier; just look at the current answer date
-			return( before($set->answer_date) ? $badIP : 0 );
+			return (before($set->answer_date) ? $badIP : 0);
 		}
 	} else {
 		# the set isn't versioned, so assume that $relaxRestrict
 		#    is 'AfterAnswerDate', regardless of what it actually
 		#    is; 'AfterVersionAnswerDate' doesn't make sense in
 		#    this case
-		return( before($set->answer_date) ? $badIP : 0 );
+		return (before($set->answer_date) ? $badIP : 0);
 	}
 }
 
@@ -608,5 +619,4 @@ Hathaway, sh002i at math.rochester.edu.
 
 =cut
 
-
 1;
diff --git a/lib/WeBWorK/ConfigObject.pm b/lib/WeBWorK/ConfigObject.pm
new file mode 100644
index 0000000000..4572f5059e
--- /dev/null
+++ b/lib/WeBWorK/ConfigObject.pm
@@ -0,0 +1,71 @@
+package WeBWorK::ConfigObject;
+use Mojo::Base -signatures;
+
+# Base object class for all config objects
+
+sub new ($class, $self, $c) {
+	# The current content generator controller object.
+	$self->{c}    = $c;
+	$self->{name} = ($self->{var} =~ s/[{]/_/gr) =~ s/[}]//gr;
+	return bless $self, $class;
+}
+
+# Only input is a value to display, and should produce an html string.
+sub display_value ($self, $val) {
+	return $val;
+}
+
+# This should return the value to compare to the new value.  This is *not* what is displayed.
+sub comparison_value ($self, $val) {
+	return $val;
+}
+
+# Get the value of the corresponding variable in the provided course environment.
+sub get_value ($self, $ce) {
+	my @keys = $self->{var} =~ m/([^{}]+)/g;
+	return '' unless @keys;
+
+	my $value = $ce;
+	for (@keys) {
+		$value = $value->{$_};
+	}
+	return $value;
+}
+
+# If use_current is true then return the current course environment value for this setting.
+# Otherwise use the value of the html form element.
+sub convert_newval_source ($self, $use_current) {
+	if ($use_current) {
+		return $self->comparison_value($self->get_value($self->{c}->ce));
+	} else {
+		return $self->{c}->param($self->{name}) // '';
+	}
+}
+
+# Bit of text to put in the configuration file.  The result should be an assignment which is executable by perl.  oldval
+# will be the value of the perl variable, and newval will be whatever an entry widget produces.
+sub save_string ($self, $oldval, $use_current = 0) {
+	my $newval = $self->convert_newval_source($use_current);
+	return '' if $self->comparison_value($oldval) eq $newval;
+
+	$newval =~ s/['"`]//g;
+	return "\$$self->{var} = '$newval';\n";
+}
+
+# A widget to interact with the user
+sub entry_widget ($self, $default) {
+	return $self->{c}->text_field(
+		$self->{name} => $default,
+		id            => $self->{name},
+		size          => $self->{width} || 15,
+		class         => 'form-control form-control-sm'
+	);
+}
+
+# This produces the documentation string and modal containing detailed documentation.
+# It is the same for all config types.
+sub what_string ($self) {
+	return $self->{c}->include('ContentGenerator/Instructor/Config/config_help', configObject => $self);
+}
+
+1;
diff --git a/lib/WeBWorK/ConfigObject/boolean.pm b/lib/WeBWorK/ConfigObject/boolean.pm
new file mode 100644
index 0000000000..2f8ad7766a
--- /dev/null
+++ b/lib/WeBWorK/ConfigObject/boolean.pm
@@ -0,0 +1,43 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2021 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.	 See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ConfigObject::boolean;
+use Mojo::Base 'WeBWorK::ConfigObject', -signatures;
+
+sub comparison_value ($self, $value) { return $value ? 1 : 0; }
+
+sub display_value ($self, $val) {
+	return $self->{c}->maketext('True') if $val;
+	return $self->{c}->maketext('False');
+}
+
+sub save_string ($self, $oldval, $use_current = 0) {
+	my $newval = $self->convert_newval_source($use_current);
+	return '' if $self->comparison_value($oldval) eq $newval;
+	return "\$$self->{var} = $newval;\n";
+}
+
+sub entry_widget ($self, $default) {
+	return $self->{c}->select_field(
+		$self->{name} => [
+			[ $self->{c}->maketext('True')  => 1, $default == 1 ? (selected => undef) : () ],
+			[ $self->{c}->maketext('False') => 0, $default == 0 ? (selected => undef) : () ]
+		],
+		id    => $self->{name},
+		class => 'form-select form-select-sm'
+	);
+}
+
+1;
diff --git a/lib/WeBWorK/ConfigObject/checkboxlist.pm b/lib/WeBWorK/ConfigObject/checkboxlist.pm
new file mode 100644
index 0000000000..1f2aa764cd
--- /dev/null
+++ b/lib/WeBWorK/ConfigObject/checkboxlist.pm
@@ -0,0 +1,71 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2021 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.	 See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ConfigObject::checkboxlist;
+use Mojo::Base 'WeBWorK::ConfigObject', -signatures;
+
+sub display_value ($self, $val) {
+	return $self->{c}->c(@{ $val // [] })->join($self->{c}->tag('br'));
+}
+
+# r->param() returns an array, so a custom version of convert_newval_source is needed.
+sub convert_newval_source ($self, $use_current) {
+	if ($use_current) {
+		return @{ $self->get_value($self->{c}->ce) };
+	} else {
+		return $self->{c}->param($self->{name});
+	}
+}
+
+sub save_string ($self, $oldval, $use_current = 0) {
+	my @newvals = $self->convert_newval_source($use_current);
+	if ($self->{min} && scalar(@newvals) < $self->{min}) {
+		$self->{c}->addbadmessage(qq!You need to select at least $self->{min} option for "$self->{doc}".!);
+		return '' if $use_current;
+		return $self->save_string($oldval, 1);
+	}
+	return '' if $self->comparison_value($oldval) eq $self->comparison_value(\@newvals);
+	return "\$$self->{var} = [" . join(',', map {"'$_'"} @newvals) . "];\n";
+}
+
+sub comparison_value ($self, $val) {
+	return join(',', @{ $val // [] });
+}
+
+sub entry_widget ($self, $default) {
+	my $c = $self->{c};
+	return $c->c(
+		map {
+			$c->tag(
+				'div',
+				class => 'form-check',
+				$c->tag(
+					'label',
+					class => 'form-check-label',
+					$c->c(
+						$c->check_box(
+							$self->{name} => $_,
+							{ map { $_ => 1 } @$default }->{$_} ? (checked => undef) : (),
+							class => 'form-check-input',
+						),
+						$_
+					)->join('')
+				)
+			)
+		} @{ $self->{values} }
+	)->join('');
+}
+
+1;
diff --git a/lib/WeBWorK/ConfigObject/list.pm b/lib/WeBWorK/ConfigObject/list.pm
new file mode 100644
index 0000000000..17ebf03b92
--- /dev/null
+++ b/lib/WeBWorK/ConfigObject/list.pm
@@ -0,0 +1,56 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2021 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.	 See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ConfigObject::list;
+use Mojo::Base 'WeBWorK::ConfigObject', -signatures;
+
+sub display_value ($self, $val) {
+	my $c = $self->{c};
+	return $c->b('&nbsp;') if ref $val ne 'ARRAY';
+	my $str = $c->c(@$val)->join(',' . $c->tag('br'));
+	return $str =~ /\S/ ? $str : $c->b('&nbsp;');
+}
+
+sub comparison_value ($self, $val) {
+	return join(',', @{ $val // [] });
+}
+
+sub save_string ($self, $oldval, $use_current = 0) {
+	my $newval = $self->convert_newval_source($use_current);
+	$oldval = $self->comparison_value($oldval);
+
+	return '' if $oldval eq $newval;
+
+	$oldval =~ s/^\s*|\s*$//g;
+	$newval =~ s/^\s*|\s*$//g;
+	$oldval =~ s/[\s,]+/,/sg;
+	$newval =~ s/[\s,]+/,/sg;
+	return '' if $newval eq $oldval;
+
+	# This is a new value.  Turn it back into a string and return it.
+	return "\$$self->{var} = [" . join(',', map {"'$_'"} map { $_ =~ s/['"`]//gr } split(',', $newval)) . "];\n";
+}
+
+sub entry_widget ($self, $default) {
+	my $str = join(', ', @{ $default // [] });
+	return $self->{c}->text_area(
+		$self->{name} => $str =~ /\S/ ? $str : '',
+		id            => $self->{name},
+		rows          => 4,
+		class         => 'form-control form-control-sm'
+	);
+}
+
+1;
diff --git a/lib/WeBWorK/RPC/Request.pm b/lib/WeBWorK/ConfigObject/number.pm
similarity index 53%
rename from lib/WeBWorK/RPC/Request.pm
rename to lib/WeBWorK/ConfigObject/number.pm
index 0504d4fcb1..1d45e8dce1 100644
--- a/lib/WeBWorK/RPC/Request.pm
+++ b/lib/WeBWorK/ConfigObject/number.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2021 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -9,41 +9,23 @@
 #
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# FOR A PARTICULAR PURPOSE.	 See either the GNU General Public License or the
 # Artistic License for more details.
 ################################################################################
 
-package WeBWorK::RPC::Request;
-use base "WeBWorK::Request";
+package WeBWorK::ConfigObject::number;
+use Mojo::Base 'WeBWorK::ConfigObject', -signatures;
 
-=head1 NAME
+sub save_string ($self, $oldval, $use_current = 0) {
+	my $newval = $self->convert_newval_source($use_current) =~ s/['"`]//gr;
+	if ($newval !~ m/^[+-]?\d*(\.\d*)?$/) {
+		$self->{c}->addbadmessage(qq{Invalid numeric value "$newval" for variable \$$self->{var}.  }
+				. 'Reverting to the system default value.');
+		return '';
+	}
 
-WeBWorK::Request - a request to the WeBWorK system, a subclass of
-Apache::Request with additional WeBWorK-specific fields.
-
-=cut
-
-use strict;
-use warnings;
-
-=head1 CONSTRUCTOR
-
-=over
-
-=item new(@args)
-
-Creates an new WeBWorK::RPC::Request. No underlying Apache[2]::Request is created.
-
-=cut
-
-sub new {
-	my ($invocant, @args) = @_;
-	my $class = ref $invocant || $invocant;
-	return bless {}, $class;
+	return '' if $self->comparison_value($oldval) == +$newval;
+	return "\$$self->{var} = $newval;\n";
 }
 
-=back
-
-=cut
-
 1;
diff --git a/lib/WeBWorK/ConfigObject/permission.pm b/lib/WeBWorK/ConfigObject/permission.pm
new file mode 100644
index 0000000000..1bf28ed72d
--- /dev/null
+++ b/lib/WeBWorK/ConfigObject/permission.pm
@@ -0,0 +1,52 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2021 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.	 See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ConfigObject::permission;
+use Mojo::Base 'WeBWorK::ConfigObject', -signatures;
+
+sub comparison_value ($self, $val) {
+	return $val // 'nobody';
+}
+
+# This tries to produce a string from a permission number.  If you feed it a string, that's what you get back.
+sub display_value ($self, $val) {
+	my $c = $self->{c};
+	return $c->maketext('nobody') if !defined $val;
+	my %reverseUserRoles = reverse %{ $c->ce->{userRoles} };
+	return defined $reverseUserRoles{$val} ? $c->maketext($reverseUserRoles{$val}) : $c->maketext($val);
+}
+
+sub save_string ($self, $oldval, $use_current = 0) {
+	my $newval = $self->convert_newval_source($use_current);
+	return '' if $self->comparison_value($oldval) eq $newval;
+	return "\$$self->{var} = '$newval';\n";
+}
+
+sub entry_widget ($self, $default) {
+	my $c = $self->{c};
+
+	# The value of a permission can be undefined (for nobody), a standard permission number, or some other number
+	my %userRoles = %{ $c->ce->{userRoles} };
+	my @values    = sort { $userRoles{$a} <=> $userRoles{$b} } keys %userRoles;
+
+	return $c->select_field(
+		$self->{name} =>
+			[ map { [ $c->maketext($_) => $_, ($default // 'nobody') eq $_ ? (selected => undef) : () ] } @values ],
+		id    => $self->{name},
+		class => 'form-select form-select-sm',
+	);
+}
+
+1;
diff --git a/lib/WeBWorK/ConfigObject/permission_checkboxlist.pm b/lib/WeBWorK/ConfigObject/permission_checkboxlist.pm
new file mode 100644
index 0000000000..78f0696b18
--- /dev/null
+++ b/lib/WeBWorK/ConfigObject/permission_checkboxlist.pm
@@ -0,0 +1,75 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2021 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.	 See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ConfigObject::permission_checkboxlist;
+use Mojo::Base 'WeBWorK::ConfigObject', -signatures;
+use WeBWorK::Utils 'role_and_above';
+
+sub display_value ($self, $val) {
+	$val = role_and_above($self->{c}->ce->{userRoles}, $val) unless ref($val) eq 'ARRAY';
+	return $self->{c}->c(@{ $val // [] })->join($self->{c}->tag('br'));
+}
+
+# r->param() returns an array, so a custom version of convert_newval_source is needed.
+sub convert_newval_source ($self, $use_current) {
+	if ($use_current) {
+		return @{ $self->get_value($self->{c}->ce) };
+	} else {
+		return $self->{c}->param($self->{name});
+	}
+}
+
+sub save_string ($self, $oldval, $use_current = 0) {
+	my @newvals = $self->convert_newval_source($use_current);
+	if ($self->{min} && scalar(@newvals) < $self->{min}) {
+		$self->{c}->addbadmessage("You need to select at least $self->{min} display mode.");
+		return '' if $use_current;
+		return $self->save_string($oldval, 1);
+	}
+	return '' if $self->comparison_value($oldval) eq $self->comparison_value(\@newvals);
+	return "\$$self->{var} = [" . join(',', map {"'$_'"} @newvals) . "];\n";
+}
+
+sub comparison_value ($self, $val) {
+	$val = role_and_above($self->{c}->ce->{userRoles}, $val) unless ref($val) eq 'ARRAY';
+	return join(',', @{ $val // [] });
+}
+
+sub entry_widget ($self, $default) {
+	my $c = $self->{c};
+	$default = role_and_above($self->{c}->ce->{userRoles}, $default) unless ref($default) eq 'ARRAY';
+	return $c->c(
+		map {
+			$c->tag(
+				'div',
+				class => 'form-check',
+				$c->tag(
+					'label',
+					class => 'form-check-label',
+					$c->c(
+						$c->check_box(
+							$self->{name} => $_,
+							{ map { $_ => 1 } @$default }->{$_} ? (checked => undef) : (),
+							class => 'form-check-input',
+						),
+						$_
+					)->join('')
+				)
+			)
+		} ('guest', 'student', 'login_proctor', 'grade_proctor', 'ta', 'professor', 'admin')
+	)->join('');
+}
+
+1;
diff --git a/lib/WeBWorK/ConfigObject/popuplist.pm b/lib/WeBWorK/ConfigObject/popuplist.pm
new file mode 100644
index 0000000000..50f6a29397
--- /dev/null
+++ b/lib/WeBWorK/ConfigObject/popuplist.pm
@@ -0,0 +1,44 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2021 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.	 See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ConfigObject::popuplist;
+use Mojo::Base 'WeBWorK::ConfigObject', -signatures;
+
+sub display_value ($self, $val) {
+	my $c = $self->{c};
+	$val //= 'ur';
+	return $c->c($c->maketext($self->{labels}{$val}))->join($c->tag('br')) if ($self->{labels}{$val});
+	return $c->c($val)->join($c->tag('br'));
+}
+
+sub save_string ($self, $oldval, $use_current = 0) {
+	my $newval = $self->convert_newval_source($use_current);
+	return '' if $self->comparison_value($oldval) eq $newval;
+	return ("\$$self->{var} = '$newval';\n");
+}
+
+sub entry_widget ($self, $default) {
+	my $c = $self->{c};
+	return $c->select_field(
+		$self->{name} => [
+			map { [ $c->maketext($self->{labels}{$_} // $_) => $_, $default eq $_ ? (selected => undef) : () ] }
+				@{ $self->{values} }
+		],
+		id    => $self->{name},
+		class => 'form-select form-select-sm',
+	);
+}
+
+1;
diff --git a/lib/WeBWorK/Cookie.pm b/lib/WeBWorK/ConfigObject/text.pm
similarity index 67%
rename from lib/WeBWorK/Cookie.pm
rename to lib/WeBWorK/ConfigObject/text.pm
index 5de6536714..1780eb8b84 100644
--- a/lib/WeBWorK/Cookie.pm
+++ b/lib/WeBWorK/ConfigObject/text.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2021 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -9,27 +9,13 @@
 #
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# FOR A PARTICULAR PURPOSE.	 See either the GNU General Public License or the
 # Artistic License for more details.
 ################################################################################
 
-package WeBWorK::Cookie;
+package WeBWorK::ConfigObject::text;
+use Mojo::Base 'WeBWorK::ConfigObject', -signatures;
 
-=head1 NAME
-
-WeBWorK::Cookie - inherit from CGI::Cookie
-
-=head1 SYNOPSIS
-
-Given C<$r>, a WeBWorK::Request object
-
- my $cookie = new WeBWorK::Cookie
-
-=cut
-
-use strict;
-use warnings;
-
-use base qw(CGI::Cookie);
+# The base ConfigObject handles everything for this package.  This is just a namespace.
 
 1;
diff --git a/lib/WeBWorK/ConfigObject/time.pm b/lib/WeBWorK/ConfigObject/time.pm
new file mode 100644
index 0000000000..74429bc222
--- /dev/null
+++ b/lib/WeBWorK/ConfigObject/time.pm
@@ -0,0 +1,33 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2021 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.	 See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ConfigObject::time;
+use Mojo::Base 'WeBWorK::ConfigObject', -signatures;
+
+# Just like WeBWorK::ConfigObject::text, but it validates the time before saving.
+
+sub save_string ($self, $oldval, $use_current = 0) {
+	my $newval = $self->convert_newval_source($use_current);
+	return '' if $self->comparison_value($oldval) eq $newval;
+
+	if ($newval !~ /^(01|1|02|2|03|3|04|4|05|5|06|6|07|7|08|8|09|9|10|11|12):[0-5]\d(am|pm|AM|PM)$/) {
+		$self->{c}->addbadmessage(qq{String "$newval" is not a valid time.  Reverting to the system default value.});
+		return '';
+	}
+
+	return "\$$self->{var} = '$newval';\n";
+}
+
+1;
diff --git a/lib/WeBWorK/ConfigObject/timezone.pm b/lib/WeBWorK/ConfigObject/timezone.pm
new file mode 100644
index 0000000000..590bd0a09e
--- /dev/null
+++ b/lib/WeBWorK/ConfigObject/timezone.pm
@@ -0,0 +1,36 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2021 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.	 See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ConfigObject::timezone;
+use Mojo::Base 'WeBWorK::ConfigObject', -signatures;
+
+# Just like WeBWorK::ConfigObject::text, but it validates the timezone before saving.
+
+use DateTime::TimeZone;
+
+sub save_string ($self, $oldval, $use_current = 0) {
+	my $newval = $self->convert_newval_source($use_current);
+	return '' if $self->comparison_value($oldval) eq $newval;
+
+	if (not DateTime::TimeZone->is_valid_name($newval)) {
+		$self->{c}->addbadmessage("String '$newval' is not a valid time zone.  Reverting to the system default value.");
+		return '';
+	}
+
+	$newval =~ s/['"`]//g;
+	return "\$$self->{var} = '$newval';\n";
+}
+
+1;
diff --git a/lib/WeBWorK/Constants.pm b/lib/WeBWorK/Constants.pm
deleted file mode 100644
index 33862ab35e..0000000000
--- a/lib/WeBWorK/Constants.pm
+++ /dev/null
@@ -1,119 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::Constants;
-
-=head1 NAME
-
-WeBWorK::Constants - provide constant values for other WeBWorK modules.
-
-=cut
-
-use strict;
-use warnings;
-
-$WeBWorK::Constants::WEBWORK_DIRECTORY = $ENV{WEBWORK_ROOT} unless defined($WeBWorK::Constants::WEBWORK_DIRECTORY);
-$WeBWorK::Constants::PG_DIRECTORY = $ENV{PG_ROOT} unless defined($WeBWorK::Constants::PG_DIRECTORY);
-
-################################################################################
-# WeBWorK::Debug
-################################################################################
-
-# If true, WeBWorK::Debug will print debugging output.
-#
-$WeBWorK::Debug::Enabled = 0;
-
-# If non-empty, debugging output will be sent to the file named rather than STDERR.
-#
-$WeBWorK::Debug::Logfile = $WeBWorK::Constants::WEBWORK_DIRECTORY . "/logs/debug.log";
-
-# If defined, prevent subroutines matching the following regular expression from
-# logging.
-#
-# For example, this pattern prevents the dispatch() function from logging:
-#     $WeBWorK::Debug::DenySubroutineOutput = qr/^WeBWorK::dispatch$/;
-#
-$WeBWorK::Debug::DenySubroutineOutput = undef;
-#$WeBWorK::Debug::DenySubroutineOutput = qr/^WeBWorK::dispatch$/;
-
-# If defined, allow only subroutines matching the following regular expression
-# to log.
-#
-# For example, this pattern allow only some function being worked on to log:
-#     $WeBWorK::Debug::AllowSubroutineOutput = qr/^WeBWorK::SomePkg::myFunc$/;
-#
-# $WeBWorK::Debug::AllowSubroutineOutput = undef;
-# $WeBWorK::Debug::AllowSubroutineOutput =qr/^WeBWorK::Authen::get_credentials$/;
-
-################################################################################
-# WeBWorK::ContentGenerator::Hardcopy
-################################################################################
-
-# If true, don't delete temporary files
-#
-$WeBWorK::ContentGenerator::Hardcopy::PreserveTempFiles = 0;
-
-################################################################################
-# WeBWorK::PG::Local
-################################################################################
-# The maximum amount of time (in seconds) to work on a single problem.
-# At the end of this time a timeout message is sent to the browser.
-
-$WeBWorK::PG::Local::TIMEOUT = 60;
-
-################################################################################
-# WeBWorK::PG::ImageGenerator
-################################################################################
-
-# Arguments to pass to dvipng. This is dependant on the version of dvipng.
-#
-# For dvipng versions 0.x
-#     $WeBWorK::PG::ImageGenerator::DvipngArgs = "-x4000.5 -bgTransparent -Q6 -mode toshiba -D180";
-# For dvipng versions 1.0 to 1.5
-#     $WeBWorK::PG::ImageGenerator::DvipngArgs = "-bgTransparent -D120 -q -depth";
-#
-# For dvipng versions 1.6 (and probably above)
-#     $WeBWorK::PG::ImageGenerator::DvipngArgs = "-bgtransparent -D120 -q -depth";
-# Note: In 1.6 and later, bgTransparent gives alpha-channel transparency while
-# bgtransparent gives single-bit transparency. If you use alpha-channel transparency,
-# the images will not be viewable with MSIE.  bgtransparent works for version 1.5,
-# but does not give transparent backgrounds. It does not work for version 1.2. It has not
-# been tested with other versions.
-#
-$WeBWorK::PG::ImageGenerator::DvipngArgs = "-bgTransparent -D120 -q -depth";
-
-# If true, don't delete temporary files
-#
-$WeBWorK::PG::ImageGenerator::PreserveTempFiles = 0;
-# TeX to prepend to equations to be processed.
-#
-$WeBWorK::PG::ImageGenerator::TexPreamble = <<'EOF';
-\documentclass[12pt]{article}
-\nonstopmode
-\usepackage{amsmath,amsfonts,amssymb}
-\def\gt{>}
-\def\lt{<}
-\usepackage[active,textmath,displaymath]{preview}
-\begin{document}
-EOF
-
-# TeX to append to equations to be processed.
-#
-$WeBWorK::PG::ImageGenerator::TexPostamble = <<'EOF';
-\end{document}
-EOF
-
-
-1;
diff --git a/lib/WeBWorK/ContentGenerator.pm b/lib/WeBWorK/ContentGenerator.pm
index 7351a88c6c..9c0d7dad01 100644
--- a/lib/WeBWorK/ContentGenerator.pm
+++ b/lib/WeBWorK/ContentGenerator.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,6 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator;
+use Mojo::Base 'WeBWorK::Controller', -signatures, -async_await;
 
 =head1 NAME
 
@@ -21,11 +22,11 @@ WeBWorK::ContentGenerator - base class for modules that generate page content.
 
 =head1 SYNOPSIS
 
- # start with a WeBWorK::Request object: $r
+ # start with a WeBWorK::Controller object: $c
 
  use WeBWorK::ContentGenerator::SomeSubclass;
 
- my $cg = WeBWorK::ContentGenerator::SomeSubclass->new($r);
+ my $cg = WeBWorK::ContentGenerator::SomeSubclass->new($c);
  my $result = $cg->go();
 
 =head1 DESCRIPTION
@@ -40,65 +41,20 @@ miscellaneous utilities are provided.
 
 =cut
 
-use strict;
-use warnings;
-
 use Carp;
-
-use Apache2::Const;
-use WeBWorK::CGI;
-use WeBWorK::File::Scoring qw/parse_scoring_file/;
 use Date::Format;
-use URI::Escape;
-use WeBWorK::Debug;
-use WeBWorK::PG;
 use MIME::Base64;
-use WeBWorK::Template qw(template);
-use WeBWorK::Localize;
-
 use Scalar::Util qw(weaken);
 use HTML::Entities;
-use HTML::Scrubber;
-use WeBWorK::Utils qw(jitar_id_to_seq fetchEmailRecipients generateURLs getAssetURL format_set_name_display);
-use WeBWorK::Authen::LTIAdvanced::SubmitGrade;
 use Encode;
-use Email::Sender::Transport::SMTP;
-
-our $TRACE_WARNINGS = 0;   # set to 1 to trace channel used by warning message
-
-###############################################################################
-
-=head1 CONSTRUCTOR
-
-=over
-
-=item new($r)
-
-Creates a new instance of a content generator. Supply a WeBWorK::Request object
-$r.
-
-=cut
-
-sub new {
-	my ($invocant, $r) = @_;
-	my $class = ref($invocant) || $invocant;
-	my $self = {
-		r => $r, # this is now a WeBWorK::Request
-		ce => $r->ce(),       # these three are here for
-		db => $r->db(),       # backward-compatability
-		authz => $r->authz(), # with unconverted CGs
-		noContent => undef, # FIXME this should get clobbered at some point
-		   };
- 	weaken $self -> {r};
-	bless $self, $class;
-	return $self;
-}
-
-=back
-
-=cut
 
-################################################################################
+use WeBWorK::File::Scoring qw(parse_scoring_file);
+use WeBWorK::PG;
+use WeBWorK::Localize;
+use WeBWorK::Utils qw(jitar_id_to_seq fetchEmailRecipients generateURLs getAssetURL format_set_name_display);
+use WeBWorK::Authen::LTI::MassUpdate qw(mass_update);
+use WeBWorK::Utils::LanguageAndDirection qw(get_lang_and_dir);
+use WeBWorK::Utils::Routes qw(route_title route_navigation_is_restricted);
 
 =head1 INVOCATION
 
@@ -132,11 +88,7 @@ didn't perform its function!
 
 =item 3
 
-At this point, go() will terminate if the request is a HEAD request or if the
-field $self->{noContent} contains a true value.
-
-FIXME: I don't think we'll need noContent after reply_with_redirect() is
-adopted by all modules.
+At this point, go() will terminate if the request is a HEAD request.
 
 =item 4
 
@@ -152,85 +104,52 @@ The method content() is called to send the page content to client.
 
 =cut
 
-sub go {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-
-	# If grades are begin passed back to the lti then we peroidically
-	# update all of the grades because things can get out of sync if
-	# instructors add or modify sets.
-	if ($ce->{LTIGradeMode} and ref($r->{db}//'')  ) {
-
-	  my $grader = WeBWorK::Authen::LTIAdvanced::SubmitGrade->new($r);
-
-	  my $post_connection_action = sub {
-	    my $grader = shift;
-
-	    # catch exceptions generated during the sending process
-	    my $result_message = eval { $grader->mass_update() };
-	    if ($@) {
-	      # add the die message to the result message
-	      $result_message .= "An error occurred while trying to update grades via LTI.\n"
-		. "The error message is:\n\n$@\n\n";
-	      # and also write it to the apache log
-	      $r->log->error("An error occurred while trying to update grades via LTI: $@\n");
-	    }
-	  };
-	  $r->connection->pool->cleanup_register($post_connection_action, $grader);
-	}
-
-	# check to verify if there are set-level problems with running
-	#    this content generator (individual content generators must
-	#    check $self->{invalidSet} and react correctly)
-	my $authz = $r->authz;
-	$self->{invalidSet} = $authz->checkSet();
-
-	my $returnValue = Apache2::Const::OK;
-
-	# We only write to the activity log if it has been defined and if
-	# we are in a specific course.  The latter check is to prevent attempts
-	# to write to a course log file when viewing the top-level list of
-	# courses page.
-	WeBWorK::Utils::writeCourseLog($ce, 'activity_log',
-		$self->prepare_activity_entry) if ( $r->urlpath->arg("courseID") and
-			$r->ce->{courseFiles}->{logs}->{activity_log});
+async sub go ($c) {
+	my $ce = $c->ce;
 
-	$self->pre_header_initialize(@_) if $self->can("pre_header_initialize");
+	# If grades are being passed back to the lti, then peroidically update all of the
+	# grades because things can get out of sync if instructors add or modify sets.
+	mass_update($c) if $c->stash('courseID') && ref($c->db) && $ce->{LTIGradeMode};
 
-	# send a file instead of a normal reply (reply_with_file() sets this field)
-	defined $self->{reply_with_file} and do {
-		return $self->do_reply_with_file($self->{reply_with_file});
-	};
-
-	# send a Location: header instead of a normal reply (reply_with_redirect() sets this field)
-	defined $self->{reply_with_redirect} and do {
-		return $self->do_reply_with_redirect($self->{reply_with_redirect});
-	};
+	# Check to determine if this is a problem set response.  Individual content generators must check
+	# $c->{invalidSet} and react appropriately.
+	$c->{invalidSet} = $c->authz->checkSet;
 
-	my $headerReturn = $self->header(@_);
-	$returnValue = $headerReturn if defined $headerReturn;
-	# FIXME: we won't need noContent after reply_with_redirect() is adopted
-	return $returnValue if $r->header_only or $self->{noContent};
+	# We only write to the activity log if it has been defined and if we are in a specific course.  The latter check is
+	# to prevent attempts to write to a course log file when viewing the top-level list of courses page.
+	WeBWorK::Utils::writeCourseLog($ce, 'activity_log', $c->prepare_activity_entry)
+		if ($c->stash('courseID') && $c->ce->{courseFiles}{logs}{activity_log});
 
-	$self->initialize() if $self->can("initialize");
+	my $tx = $c->render_later->tx;
 
-	$self->content();
-
-	return $returnValue;
-}
+	if ($c->can('pre_header_initialize')) {
+		my $pre_header_initialize = $c->pre_header_initialize;
+		await $pre_header_initialize
+			if ref $pre_header_initialize eq 'Future' || ref $pre_header_initialize eq 'Mojo::Promise';
+	}
 
-=item r()
+	# Reply with a file.
+	if (defined $c->{reply_with_file}) {
+		return $c->do_reply_with_file($c->{reply_with_file});
+	}
 
-Returns a reference to the WeBWorK::Request object associated with this
-instance.
+	# Reply with a redirect.
+	if (defined $c->{reply_with_redirect}) {
+		return $c->do_reply_with_redirect($c->{reply_with_redirect});
+	}
 
-=cut
+	if ($c->can('initialize')) {
+		my $initialize = $c->initialize;
+		await $initialize if ref $initialize eq 'Future' || ref $initialize eq 'Mojo::Promise';
+	}
 
-sub r {
-	my ($self) = @_;
+	$c->content;
 
-	return $self->{r};
+	# All content generator modules must have rendered at this point unless there was an error in which case an error
+	# response will be rendered.  There is no special handing for HEAD requests.  Mojolicious takes care of that in its
+	# render methods.  This just returns the status code of the response (typically set by the Mojolicious render
+	# methods.  Although this return value isn't actually used at this point.
+	return $c->header;
 }
 
 =item do_reply_with_file($fileHash)
@@ -239,33 +158,28 @@ Handler for reply_with_file(), used by go(). DO NOT CALL THIS METHOD DIRECTLY.
 
 =cut
 
-sub do_reply_with_file {
-	my ($self, $fileHash) = @_;
-	my $r = $self->r;
-
-	my $type = $fileHash->{type};
-	my $source = $fileHash->{source};
-	my $name = $fileHash->{name};
+sub do_reply_with_file ($c, $fileHash) {
+	my $type         = $fileHash->{type};
+	my $source       = $fileHash->{source};
+	my $name         = $fileHash->{name};
 	my $delete_after = $fileHash->{delete_after};
 
-	# if there was a problem, we return here and let go() worry about sending the reply
-	return Apache2::Const::NOT_FOUND unless -e $source;
-	return Apache2::Const::FORBIDDEN unless -r $source;
-
-	my $fh;
+	# If there was a problem, render the appropriate error response.
+	return $c->render(text => 'File not found',           status => 404) unless -e $source;
+	return $c->render(text => 'Insufficient permissions', status => 403) unless -r $source;
 
-	# send our custom HTTP header
-	$r->content_type($type);
-	$r->headers_out->{"Content-Disposition"} = "attachment; filename=\"$name\"";
+	# Send our custom HTTP header.
+	$c->res->headers->content_type($type);
+	$c->res->headers->add("Content-Disposition" => qq{attachment; filename="$name"});
 
 	# send the file
-	$r->sendfile($source);
+	$c->reply->file($source);
 
 	if ($delete_after) {
-		unlink $source or warn "failed to unlink $source after sending: $!";
+		unlink $source or $c->log->warn("failed to unlink $source after sending: $!");
 	}
 
-	return; # (see comment on return statement in do_reply_with_redirect, below.)
+	return $c->res->code;
 }
 
 =item do_reply_with_redirect($url)
@@ -274,38 +188,15 @@ Handler for reply_with_redirect(), used by go(). DO NOT CALL THIS METHOD DIRECTL
 
 =cut
 
-sub do_reply_with_redirect {
-	my ($self, $url) = @_;
-	my $r = $self->r;
-
-	$r->status(Apache2::Const::REDIRECT);
-	$r->headers_out->{"Location"} = $url;
-
-	return; # we need to explicitly return noting here, otherwise we return $url under Apache2.
-	        # the return value from the mod_perl handler is used to set the HTTP status code,
-	        # but we're setting it explicitly above. i think we should dispense with setting it
-	        # with the return value altogether, and always do it with $r->status. the other way
-	        # is too oblique and error-prone. this is probably a FIXME.
-	        #
-	        # Apache::WeBWorK::handler always returns the value it got from WeBWorK::dispatch
-	        # WeBWorK::dispatch always returns the value it got from WW::ContentGenerator::go
-	        # WW::ContentGenerator::go works like this:
-	        #		- if reply_with_file, return the return value from do_reply_with_file
-	        #		  (do_reply_with_file actually uses this to return NOT_FOUND/FORBIDDEN)
-	        #		- if reply_with_redirect, return the return value from do_reply_with_redirect
-	        #		  (do_reply_with_redirect does NOT use this -- it sets $r->status instead!)
-	        #		- if header returns a defined value, return that
-	        #		  (CG::header always returns OK!)
-	        #		- otherwise, return OK (this never happens!)
-	        # there are no longer any legitimate header() methods other than the one in CG.pm
+sub do_reply_with_redirect ($c, $url) {
+	$c->redirect_to($url);
+	return $c->res->code;
 }
 
 =back
 
 =cut
 
-################################################################################
-
 =head1 DATA MODIFIERS
 
 Modifiers allow the caller to register a piece of data for later retrieval in a
@@ -320,21 +211,19 @@ the client after calling pre_header_initialize(). The content type sent is
 $type, and the suggested client-side file name is $name. If $delete_after is
 true, $source is deleted after it is sent.
 
-Must be called before the HTTP header is sent. Usually called from
-pre_header_initialize().
+Must be called from pre_header_initialize().
 
 =cut
 
-sub reply_with_file {
-	my ($self, $type, $source, $name, $delete_after) = @_;
-	$delete_after ||= "";
-
-	$self->{reply_with_file} = {
-		type => $type,
-		source => $source,
-		name => $name,
+sub reply_with_file ($c, $type, $source, $name, $delete_after = 0) {
+	$c->{reply_with_file} = {
+		type         => $type,
+		source       => $source,
+		name         => $name,
 		delete_after => $delete_after,
 	};
+
+	return;
 }
 
 =item reply_with_redirect($url)
@@ -342,91 +231,96 @@ sub reply_with_file {
 Enables redirect mode, causing go() to redirect to the given URL after calling
 pre_header_initialize().
 
-Must be called before the HTTP header is sent. Usually called from
-pre_header_initialize().
+Must be called from pre_header_initialize().
 
 =cut
 
-sub reply_with_redirect {
-	my ($self, $url) = @_;
-
-	$self->{reply_with_redirect} = $url;
+sub reply_with_redirect ($c, $url) {
+	$c->{reply_with_redirect} = $url;
+	return;
 }
 
 =item addmessage($message)
 
-Adds a message to the list of messages to be printed by the message() template
+Adds a message to the list of messages to be output by the message() template
 escape handler.
 
 Must be called before the message() template escape is invoked.
 
 =cut
 
-
-
-sub addmessage {
-    #addmessages takes html so we use htmlscrubber to get rid of
-    # any scripts or html comments.  However, we leave everything else
-    # by default.
-
-	my ($self, $message) = @_;
-	return unless defined($message);
-
-	my $scrubber = HTML::Scrubber->new(
-	    default => 1,
-	    script => 0,
-	    comment => 0
-	    );
-	$scrubber->default(
-	    undef,
-	    {
-		'*' => 1,
-	    }
-	    );
-
-	$message = $scrubber->scrub($message);
-	$self->{status_message} .= $message;
+sub addmessage ($c, $message) {
+	return '' unless defined $message;
+	$c->{status_message} //= $c->c;
+	push(@{ $c->{status_message} }, $message);
+	return;
 }
 
 =item addgoodmessage($message)
 
-Adds a success message to the list of messages to be printed by the
+Adds a success message to the list of messages to be output by the
 message() template escape handler.
 
 =cut
 
-sub addgoodmessage {
-	my ($self, $message) = @_;
-	$self->addmessage(CGI::div({ class => 'alert alert-success p-1 my-2' }, $message));
+sub addgoodmessage ($c, $message) {
+	$c->addmessage($c->tag(
+		'p',
+		class => 'alert alert-success alert-dismissible fade show ps-1 py-1',
+		$c->c(
+			$message,
+			$c->tag(
+				'button',
+				type         => 'button',
+				class        => 'btn-close p-2',
+				data         => { bs_dismiss => 'alert' },
+				'aria-label' => $c->maketext('Dismiss')
+			)
+		)->join('')
+	));
+	return;
 }
 
 =item addbadmessage($message)
 
-Adds a failure message to the list of messages to be printed by the
+Adds a failure message to the list of messages to be output by the
 message() template escape handler.
 
 =cut
 
-sub addbadmessage {
-	my ($self, $message) = @_;
-	$self->addmessage(CGI::div({ class => 'alert alert-danger p-1 my-2' }, $message));
+sub addbadmessage ($c, $message) {
+	$c->addmessage($c->tag(
+		'p',
+		class => 'alert alert-danger alert-dismissible fade show ps-1 py-1',
+		$c->c(
+			$message,
+			$c->tag(
+				'button',
+				type         => 'button',
+				class        => 'btn-close p-2',
+				data         => { bs_dismiss => 'alert' },
+				'aria-label' => $c->maketext('Dismiss')
+			)
+		)->join('')
+	));
+	return;
 }
 
 =item prepare_activity_entry()
 
 Prepare a string to be sent to the activity log, if it is turned on.
-This can be overriden by different modules.
+This can be overridden by different modules.
 
 =cut
 
-
-sub prepare_activity_entry {
-    my $self = shift;
-	my $r = $self->r;
-	my $string = $r->urlpath->path . "  --->  ".
-		join("\t", (map { $_ eq 'key' || $_ eq 'passwd' ? '' : $_ ." => " . $r->param($_) } $r->param()));
+sub prepare_activity_entry ($c) {
+	my $location = $c->location;
+	my $string =
+		($c->req->url->path->to_string =~ s/^$location//r)
+		. "  --->  "
+		. join("\t", (map { $_ eq 'key' || $_ eq 'passwd' ? '' : $_ . " => " . $c->param($_) } $c->param()));
 	$string =~ s/\t+/\t/g;
-	return($string);
+	return $string;
 }
 
 =back
@@ -441,60 +335,57 @@ The following are the standard content generator methods. Some are defined here,
 but may be overridden in a subclass. Others are not defined unless they are
 defined in a subclass.
 
+FIXME: The names of the first three methods don't really make sense anymore.
+There really is no need for both of the pre_header_initialize and initialize
+methods.  The initialize method should be dropped and the pre_header_initialize
+method renamed.
+
 =over
 
 =item pre_header_initialize()
 
 Not defined in this package.
 
-May be defined by a subclass to perform any processing that must occur before
-the HTTP header is sent.
-
-=cut
+May be defined by a subclass to perform any early processing that is needed.
+This method must be used if responding with a file or redirect.
 
-#sub pre_header_initialize {  }
+This method may be asynchronous.
 
 =item header()
 
 Defined in this package.
 
-Generates and sends a default HTTP header, specifying the "text/html" content
-type.
+This method is not really useful anymore.  For now it returns the response
+status code and this return value is ignored.  Headers are now set when
+rendering a response (as it really should have been done before.
 
 =cut
 
 sub header {
 	my $self = shift;
-	my $r = $self->r;
-
-	$r->content_type("text/html; charset=utf-8");
-	return Apache2::Const::OK;
+	return $self->res->code;
 }
 
 =item initialize()
 
 Not defined in this package.
 
-May be defined by a subclass to perform any processing that must occur after the
-HTTP header is sent but before any content is sent.
+May be defined by a subclass to perform any early processing that is needed.
+This method can not be used if responding with a file or redirect.
 
-=cut
-
-#sub initialize {  }
+This method may be asynchronous.
 
 =item output_course_lang_and_dir()
 
 Output the LANG and DIR tags in the main HTML tag of a generated web page when
-a template files calls this function.
+a template file calls this function.
 
 This calls WeBWorK::Utils::LanguageAndDirection::get_lang_and_dir.
 
 =cut
 
-sub output_course_lang_and_dir{
-	my $self = shift;
-	print WeBWorK::Utils::LanguageAndDirection::get_lang_and_dir($self->r->ce->{language});
-	return "";
+sub output_course_lang_and_dir ($c) {
+	return get_lang_and_dir($c->ce->{language});
 }
 
 =item webwork_logo()
@@ -503,30 +394,19 @@ Create the link to the webwork installation landing page with a logo and alt tex
 
 =cut
 
-sub webwork_logo {
-	my $self   = shift;
-	my $r      = $self->r;
-	my $ce     = $r->ce;
-	my $theme  = $r->param('theme') || $ce->{defaultTheme};
+sub webwork_logo ($c) {
+	my $ce     = $c->ce;
+	my $theme  = $c->param('theme') || $ce->{defaultTheme};
 	my $htdocs = $ce->{webwork_htdocs_url};
 
-	if ($r->authen->was_verified && !$r->authz->hasPermissions($r->param('user'), 'navigation_allowed')) {
+	if ($c->authen->was_verified && !$c->authz->hasPermissions($c->param('user'), 'navigation_allowed')) {
 		# If navigation is restricted for this user, then the webwork logo is not a link to the courses page.
-		print CGI::span(CGI::img({
-			src => "$htdocs/themes/$theme/images/webwork_logo.svg",
-			alt => 'WeBWorK'
-		}));
+		return $c->tag('span', $c->image("$htdocs/themes/$theme/images/webwork_logo.svg", alt => 'WeBWorK'));
 	} else {
-		print CGI::a(
-			{ href => $ce->{webwork_url} },
-			CGI::img({
-				src => "$htdocs/themes/$theme/images/webwork_logo.svg",
-				alt => $r->maketext('to courses page')
-			})
-		);
+		return $c->link_to(
+			$c->image("$htdocs/themes/$theme/images/webwork_logo.svg", alt => $c->maketext('to courses page')) =>
+				$ce->{webwork_url});
 	}
-
-	return '';
 }
 
 =item institution_logo()
@@ -535,20 +415,16 @@ Create the link to the host institution with a logo and alt text
 
 =cut
 
-sub institution_logo {
-	my $self = shift;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $theme = $r->param("theme") || $ce->{defaultTheme};
+sub institution_logo ($c) {
+	my $ce     = $c->ce;
+	my $theme  = $c->param("theme") || $ce->{defaultTheme};
 	my $htdocs = $ce->{webwork_htdocs_url};
-	print CGI::a(
-		{href => $ce->{institutionURL}},
-		CGI::img({
-			src => "$htdocs/themes/$theme/images/" . $ce->{institutionLogo},
-			alt => $r->maketext("to [_1] main web site", $ce->{institutionName})
-		})
+	return $c->link_to(
+		$c->image(
+			"$htdocs/themes/$theme/images/" . $ce->{institutionLogo},
+			alt => $c->maketext("to [_1] main web site", $ce->{institutionName})
+		) => $ce->{institutionURL}
 	);
-	return "";
 }
 
 =item content()
@@ -557,46 +433,43 @@ Defined in this package.
 
 Print the content of the generated page.
 
-The implementation in this package uses WeBWorK::Template to define the content
-of the page. See WeBWorK::Template for details.
+This renders a Mojo::Template.
 
-If a method named templateName() exists, it it called to determine the name of
-the template to use. If not, the default template, "system", is used. The
-location of the template is looked up in the course environment.
+The defaultThemeTemplate in the course environment is used for the page layout.
+If that is not defined, the default "system" template, is used. The location of
+the template is looked up in the course environment.
 
 =cut
 
-sub content {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
+sub content ($c) {
+	my $ce = $c->ce;
 
-	my $themesDir = $ce->{webworkDirs}{themes};
-	my $theme = $r->param("theme") || $ce->{defaultTheme};
+	my $theme = $c->param('theme') || $ce->{defaultTheme};
 	$theme = $ce->{defaultTheme} if $theme =~ m!(?:^|/)\.\.(?:/|$)!;
-	#$ce->{webworkURLs}->{stylesheet} = ($ce->{webworkURLs}->{htdocs})."/css/$theme.css";   # reset the style sheet
-	# the line above is clever -- but I think it is better to link directly to the style sheet from the system.template
-	# then the link between template and css is made in .template file instead of hard coded as above
-	# this means that the {stylesheet} option in defaults.config is never used
-	my $template = $self->can("templateName") ? $self->templateName : $ce->{defaultThemeTemplate};
-	my $templateFile = "$themesDir/$theme/$template.template";
-	unless (-r $templateFile) {  #hack to prevent disaster when missing theme directory
-	   if (-r "$themesDir/math4/$template.template") {
-	   		$templateFile = "$themesDir/math4/$template.template";
-			$theme = HTML::Entities::encode_entities($theme);
-	   		warn "Theme $theme is not one of the available themes. ".
-	   		"Please check the theme configuration ".
-	   		"in the files localOverrides.conf, course.conf and ".
-	   		"simple.conf and on the course configuration page.\n"
-	   	} else {
+
+	my $layout = $ce->{defaultThemeTemplate} // 'system';
+
+	my $layoutName = "$theme/$layout";
+
+	# Attempt to prevent disaster when the theme layout file is missing.
+	unless (-r "$ce->{webworkDirs}{themes}/$theme/$layout.html.ep") {
+		if (-r "$ce->{webworkDirs}{themes}/math4/$layout.html.ep") {
+			$layoutName = "math4/$layout";
+			$theme      = HTML::Entities::encode_entities($theme);
+			warn "Theme $theme is not one of the available themes. "
+				. 'Please check the theme configuration '
+				. 'in the files localOverrides.conf, course.conf and '
+				. "simple.conf and on the course configuration page.\n";
+		} else {
 			$theme = HTML::Entities::encode_entities($theme);
-	   		die "Neither the theme $theme nor the defaultTheme math4 are available.  ".
-	   		"Please notify your site administrator that the structure of the ".
-	   		"themes directory needs attention.";
+			die "Neither the theme $theme nor the defaultTheme math4 are available.  "
+				. 'Please notify your site administrator that the structure of the '
+				. 'themes directory needs attention.';
 
-	   	}
+		}
 	}
-	template($templateFile, $self);
+
+	return $c->render(template => ((ref($c) =~ s/^WeBWorK:://r) =~ s/::/\//gr), layout => $layoutName);
 }
 
 =back
@@ -607,15 +480,11 @@ sub content {
 
 =head2 Template escape handlers
 
-Template escape handlers are invoked when the template processor encounters a
-matching escape sequence in the template. The escapse sequence's arguments are
-passed to the methods as a reference to a hash.
+Template escape handlers are invoked in the templates.
 
-For more information, refer to WeBWorK::Template.
-
-The following template escapes handlers are defined here or may be defined in
-subclasses. For methods that are not defined in this package, the documentation
-defines the interface and behavior that any subclass implementation must follow.
+Some of the template escapes handlers are defined here but may be overridden
+in a subclass.  Others, like C<head> and C<info> are not defined here, but
+may be defined in a subclass if needed.
 
 =over
 
@@ -625,20 +494,12 @@ Not defined in this package.
 
 Any tags that should appear in the HEAD of the document.
 
-=cut
-
-#sub head {  }
-
 =item info()
 
 Not defined in this package.
 
 Auxiliary information related to the content displayed in the C<body>.
 
-=cut
-
-#sub info {  }
-
 =item links()
 
 Defined in this package.
@@ -647,38 +508,27 @@ Links that should appear on every page.
 
 =cut
 
-sub links {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $authen = $r->authen;
-	my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-
-	# we don't currently have any links to display if the user's not logged in. this may change, though.
-	#return "" unless $authen->was_verified;
-
-	# grab some interesting data from the request
-	my $courseID      = $urlpath->arg('courseID');
-	my $userID        = $r->param('user');
-	my $urlUserID     = $urlpath->arg('userID');
-	my $eUserID       = $r->param('effectiveUser');
-	my $setID         = $urlpath->arg('setID');
-	my $problemID     = $urlpath->arg('problemID');
-	my $achievementID = $urlpath->arg('achievementID');
+sub links ($c) {
+	my $ce     = $c->ce;
+	my $db     = $c->db;
+	my $authen = $c->authen;
+	my $authz  = $c->authz;
+
+	# Grab data from the request.
+	my $userID        = $c->param('user');
+	my $eUserID       = $c->param('effectiveUser');
+	my $courseID      = $c->stash('courseID');
+	my $setID         = $c->stash('setID');
+	my $problemID     = $c->stash('problemID');
+	my $achievementID = $c->stash('achievementID');
 
 	# Determine if navigation is restricted for this user.
 	my $restricted_navigation = $authen->was_verified && !$authz->hasPermissions($userID, 'navigation_allowed');
 
-	# If navigation is restricted and the setID was not in the urlpath,
+	# If navigation is restricted and the setID was not in the route stash,
 	# then get the setID this user is restricted to view from the authen cookie.
 	$setID = $authen->get_session_set_id if (!$setID && $restricted_navigation);
 
-	my $prettySetID = format_set_name_display($setID // '');
-	my $prettyAchievementID = $achievementID;
-	$prettyAchievementID =~ s/_/ /g if defined $prettyAchievementID;
-
 	my $prettyProblemID = $problemID;
 
 	# It's possible that the setID and the problemID are invalid, since they're just taken from the URL path info.
@@ -691,455 +541,50 @@ sub links {
 		}
 	}
 
-	# experimental subroutine for generating links, to clean up the rest of the
-	# code. ignore for now. (this is a closure over $self.)
-	my $makelink = sub {
-		my ($module, %options) = @_;
-
-		my $urlpath_args = $options{urlpath_args} || {};
-		my $systemlink_args = $options{systemlink_args} || {};
-		my $text = HTML::Entities::encode_entities($options{text});
-		my $active = $options{active};
-		my %target = ($options{target} ? (target => $options{target}) : ());
-
-		my $new_urlpath = $self->r->urlpath->newFromModule($module, $r, %$urlpath_args);
-		my $new_systemlink = $self->systemLink($new_urlpath, %$systemlink_args);
-
-		defined $text or $text = $new_urlpath->name(1);
-
-
-		# try to set $active automatically by comparing
-		if (not defined $active) {
-			if ($urlpath->module eq $new_urlpath->module) {
-				my @args = sort keys %{{$urlpath->args}};
-				my @new_args = sort keys %{{$new_urlpath->args}};
-				if (@args == @new_args) {
-					foreach my $i (0 .. $#args) {
-						$active = 0;
-						last if $args[$i] ne $new_args[$i];
-						$active = 1;
-					}
-				} else {
-					$active = 0;
-				}
-			} else {
-				$active = 0;
-			}
-		}
-
-		if ($active) {
-			# add active class for current location
-			return CGI::a(
-				{ href => $new_systemlink, class => 'nav-link active', %target, %{ $options{link_attrs} // {} } },
-				$text);
-		} else {
-			return CGI::a({ href => $new_systemlink, class => 'nav-link', %target, %{ $options{link_attrs} // {} } },
-				$text);
-		}
-	};
-
-	# to make things more concise
-	my $pfx = "WeBWorK::ContentGenerator::";
-	my %args = ( courseID => $courseID );
-
-	# we'd like to preserve displayMode and showOldAnswers between pages, and we
-	# don't have a general way of preserving non-authen params between requests,
-	# so here is the hack:
-	my %params;
-	$params{displayMode} = $r->param("displayMode") if defined $r->param("displayMode");
-	$params{showOldAnswers} = $r->param("showOldAnswers") if defined $r->param("showOldAnswers");
-	# in the past, we were checking $self->{displayMode} and $self->{will}->{showOldAnswers}
-	# to set these args, but I don't wanna do that anymore, since it relies on
-	# fields specific to Problem.pm (pretty sure). The only differences in this
-	# approach are:
-	# (a) displayMode will not be set if it wasn't set in the current request,
-	# but this is ok since the resulting page will just use the default value
-	# (b) showOldAnswers will get set to the value specified in the current
-	# request, regardless of whether it is allowed, but this is OK since we
-	# always this value before using it.
-	my %systemlink_args;
-	$systemlink_args{params} = \%params if %params;
-
-	print CGI::h2({ class => 'navbar-brand mb-0' }, $r->maketext('Main Menu'));
-	print CGI::start_ul({ class => 'nav flex-column' });
-
-	print CGI::li({ class => 'nav-item' },
-		&$makelink("${pfx}Home", text => $r->maketext("Courses"), systemlink_args => { authen => 0 }))
-		unless $restricted_navigation;
-
-	if (defined $courseID) {
-		if ($authen->was_verified) {
-			# Homework Sets or Course Administration
-			print CGI::li(
-				{ class => 'nav-item' },
-				$restricted_navigation ? CGI::span({ class => 'nav-link disabled' }, $r->maketext('Homework Sets'))
-				: &$makelink(
-					"${pfx}ProblemSets",
-					text => $ce->{courseName} eq 'admin' ? $r->maketext('Course Administration')
-					: $r->maketext('Homework Sets'),
-					urlpath_args    => {%args},
-					systemlink_args => \%systemlink_args
-				)
-			);
-
-			if (defined $setID) {
-				print CGI::start_li({ class => 'nav-item' });
-				print CGI::start_ul({ class => 'nav flex-column' });
-				print CGI::start_li({ class => 'nav-item' });          # $setID
-
-				# Show a link which depends on if it is a versioned gateway
-				# assignment or not; to know if it's a gateway
-				# assignment, we have to get the set record.
-				my ($globalSetID) = ($setID =~ /(.+?)(,v\d+)?$/);
-				my $setRecord = $db->getGlobalSet($globalSetID);
-
-				if ($setRecord->assignment_type eq 'jitar' && defined $problemID) {
-					$prettyProblemID = join('.', jitar_id_to_seq($problemID));
-				}
-				if ($setRecord->assignment_type =~ /proctor/ && $setID =~ /,v(\d)+$/) {
-					print &$makelink(
-						"${pfx}ProctoredGatewayQuiz",
-						text            => "$prettySetID",
-						urlpath_args    => { %args, setID => $setID },
-						systemlink_args => \%systemlink_args,
-						link_attrs      => { dir => 'ltr' }
-					);
-				} elsif ($setRecord->assignment_type =~ /gateway/ && $setID =~ /,v(\d)+$/) {
-					print &$makelink(
-						"${pfx}GatewayQuiz",
-						text            => "$prettySetID",
-						urlpath_args    => { %args, setID => $setID },
-						systemlink_args => \%systemlink_args,
-						link_attrs      => { dir => 'ltr' }
-					);
-				} else {
-					print &$makelink(
-						"${pfx}ProblemSet",
-						text            => "$prettySetID",
-						urlpath_args    => { %args, setID => $setID },
-						systemlink_args => \%systemlink_args,
-						link_attrs      => { dir => 'ltr' }
-					);
-				}
-				print CGI::end_li();
-
-				if (defined $problemID) {
-					print CGI::start_li({ class => 'nav-item' });
-					print CGI::start_ul({ class => 'nav flex-column' });
-					print CGI::start_li({ class => 'nav-item' });          # $problemID
-					print $setRecord->assignment_type =~ /gateway/
-						? CGI::a({ class => 'nav-link' }, $r->maketext('Problem [_1]', $prettyProblemID))
-						: &$makelink(
-							"${pfx}Problem",
-							text            => $r->maketext("Problem [_1]", $prettyProblemID),
-							urlpath_args    => { %args, setID => $setID, problemID => $problemID },
-							systemlink_args => \%systemlink_args
-						);
-					print CGI::end_li();                                   # end $problemID
-					print CGI::end_ul();
-					print CGI::end_li();                                   # end $setID
-				}
-
-				print CGI::end_ul();
-				print CGI::end_li();                                       # end Homework Sets
-			}
-
-			print CGI::li({ class => 'nav-item' },
-				&$makelink("${pfx}Options", urlpath_args => {%args}, systemlink_args => \%systemlink_args))
-				if ($authz->hasPermissions($userID, 'change_password')
-					|| $authz->hasPermissions($userID, 'change_email_address')
-					|| $authz->hasPermissions($userID, 'change_pg_display_settings'));
-
-			print CGI::li({ class => 'nav-item' },
-				&$makelink("${pfx}Grades", urlpath_args => {%args}, systemlink_args => \%systemlink_args))
-				unless $restricted_navigation;
-
-			if ($ce->{achievementsEnabled}) {
-				print CGI::li({ class => 'nav-item' },
-					&$makelink("${pfx}Achievements", urlpath_args => { %args }, systemlink_args => \%systemlink_args));
-			}
-
-			if ($authz->hasPermissions($userID, "access_instructor_tools")) {
-				$pfx .= "Instructor::";
-
-				print CGI::start_li({ class => 'nav-item' }); # Instructor Tools
-				print &$makelink("${pfx}Index", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args);
-				print CGI::end_li();
-				print CGI::start_li({ class => 'nav-item' });
-				print CGI::start_ul({ class => 'nav flex-column' });
-
-                #class list editor
-				print CGI::li({ class => 'nav-item' }, &$makelink("${pfx}UserList", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
-
-				# Homework Set Editor
-				print CGI::li({ class => 'nav-item' }, &$makelink("${pfx}ProblemSetList", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
-
-				## only show editor link for non-versioned sets
-				if (defined $setID && $setID !~ /,v\d+$/ ) {
-				    print CGI::start_li({ class => 'nav-item' });
-				    print CGI::start_ul({ class => 'nav flex-column' });
-
-					print CGI::start_li({ class => 'nav-item' });
-					print &$makelink(
-						"${pfx}ProblemSetDetail",
-						text            => $prettySetID,
-						urlpath_args    => { %args, setID => $setID },
-						systemlink_args => \%systemlink_args,
-						link_attrs      => { dir => 'ltr' }
-					);
-					print CGI::end_li();
-
-					if (defined $problemID) {
-					    print CGI::start_li({ class => 'nav-item' });
-					    print CGI::start_ul({ class => 'nav flex-column' });
-						print CGI::li({ class => 'nav-item' },
-							&$makelink("${pfx}PGProblemEditor",
-								text => $r->maketext('Problem [_1]', $prettyProblemID),
-								urlpath_args => { %args, setID => $setID, problemID => $problemID },
-								systemlink_args => \%systemlink_args,
-								target => "WW_Editor")
-						);
-					    print CGI::end_ul();
-					    print CGI::end_li();
-					}
-
-					print CGI::end_ul();
-				    print CGI::end_li();
-				}
-
-				print CGI::li({ class => 'nav-item' },
-					&$makelink("${pfx}SetMaker",
-						text => $r->maketext("Library Browser"),
-						urlpath_args => { %args },
-						systemlink_args => \%systemlink_args));
-
-				print CGI::start_li({ class => 'nav-item' }); # Stats
-				print &$makelink("${pfx}Stats", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args);
-				if ($userID ne $eUserID or defined $setID or defined $urlUserID) {
-					print CGI::start_ul({ class => 'nav flex-column' });
-					if (defined $urlUserID) {
-						print CGI::li({ class => 'nav-item' },
-							&$makelink("${pfx}Stats",
-								text => $urlUserID,
-								urlpath_args => { %args, statType => "student", userID => $urlUserID },
-								systemlink_args => \%systemlink_args
-							)
-						);
-					}
-					if ($userID ne $eUserID && (!defined $urlUserID || $urlUserID ne $eUserID)) {
-						print CGI::li({ class => 'nav-item' },
-							&$makelink("${pfx}Stats",
-								text => $eUserID,
-								urlpath_args => { %args, statType => "student", userID => $eUserID },
-								systemlink_args => \%systemlink_args,
-								active => $urlpath->type eq 'instructor_user_statistics' && !defined $urlUserID
-							)
-						);
-					}
-					if (defined $setID) {
-						# make sure we don't try to send a versioned
-						#    set id in to the stats link
-						my ( $nvSetID ) = ( $setID =~ /(.+?)(,v\d+)?$/ );
-						my ( $nvPretty ) = ( $prettySetID =~ /(.+?)(,v\d+)?$/ );
-						print CGI::li(
-							{ class => 'nav-item', dir => 'ltr' },
-							&$makelink(
-								"${pfx}Stats",
-								text            => "$nvPretty",
-								urlpath_args    => { %args, statType => "set", setID => $nvSetID },
-								systemlink_args => \%systemlink_args
-							)
-						);
-					}
-					print CGI::end_ul();
-				}
-				print CGI::end_li(); # end Stats
-
-				print CGI::start_li({ class => 'nav-item' }); # Student Progress
-				print &$makelink("${pfx}StudentProgress", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args);
-				if ($userID ne $eUserID or defined $setID or defined $urlUserID) {
-					print CGI::start_ul({ class => 'nav flex-column' });
-					if (defined $urlUserID) {
-						print CGI::li({ class => 'nav-item' },
-							&$makelink("${pfx}StudentProgress",
-								text => $urlUserID,
-								urlpath_args => { %args, statType => "student", userID => $urlUserID },
-								systemlink_args => \%systemlink_args
-							)
-						);
-					}
-					if ($userID ne $eUserID && (!defined $urlUserID || $urlUserID ne $eUserID)) {
-						print CGI::li({ class => 'nav-item' },
-							&$makelink("${pfx}StudentProgress",
-								text => $eUserID,
-								urlpath_args => { %args, statType => "student", userID => $eUserID },
-								systemlink_args => \%systemlink_args,
-								active => $urlpath->type eq 'instructor_user_progress' && !defined $urlUserID
-							)
-						);
-					}
-					if (defined $setID) {
-						# make sure we don't try to send a versioned
-						#    set id in to the stats link
-						my ( $nvSetID ) = ( $setID =~ /(.+?)(,v\d+)?$/ );
-						my ( $nvPretty ) = ( $prettySetID =~ /(.+?)(,v\d+)?$/ );
-						print CGI::li(
-							{ class => 'nav-item', dir => 'ltr' },
-							&$makelink(
-								"${pfx}StudentProgress",
-								text            => "$nvPretty",
-								urlpath_args    => { %args, statType => "set", setID => $nvSetID },
-								systemlink_args => \%systemlink_args
-							)
-						);
-					}
-					print CGI::end_ul();
-				}
-				print CGI::end_li(); # end Student Progress
-
-				if ($authz->hasPermissions($userID, "score_sets")) {
-					print CGI::li({ class => 'nav-item' },
-					   	&$makelink("${pfx}Scoring",
-						   	urlpath_args => { %args },
-						   	systemlink_args => \%systemlink_args));
-				}
-
-				#Show achievement editor for instructors
-				if ($ce->{achievementsEnabled} && $authz->hasPermissions($userID, "edit_achievements")) {
-				    print CGI::li({ class => 'nav-item' },
-						&$makelink("${pfx}AchievementList",
-						   	urlpath_args => { %args },
-							systemlink_args => \%systemlink_args));
-				    if (defined $achievementID ) {
-					print CGI::start_li({ class => 'nav-item' });
-					print CGI::start_ul({ class => 'nav flex-column' });
-					print CGI::start_li({ class => 'nav-item' }); # $achievementID
-					print &$makelink("${pfx}AchievementEditor",
-					   	text => "$prettyAchievementID",
-					   	urlpath_args => { %args, achievementID => $achievementID },
-					   	systemlink_args => \%systemlink_args);
-					print CGI::end_ul();
-					print CGI::end_li();
-				    }
-
-				}
-
-				if ($authz->hasPermissions($userID, "send_mail")) {
-					print CGI::li({ class => 'nav-item' },
-						&$makelink("${pfx}SendMail",
-						   	urlpath_args => { %args },
-						   	systemlink_args => \%systemlink_args));
-				}
-
-				if ($authz->hasPermissions($userID, "manage_course_files")) {
-					print CGI::li({ class => 'nav-item' },
-						&$makelink("${pfx}FileManager",
-							urlpath_args => { %args },
-							systemlink_args => \%systemlink_args));
-				}
-
-				if ($authz->hasPermissions($userID, "manage_course_files")) {
-					print CGI::li({ class => 'nav-item' },
-					   	&$makelink("${pfx}Config",
-						   	urlpath_args => { %args },
-						   	systemlink_args => \%systemlink_args));
-				}
-				print CGI::li({ class => 'nav-item' },
-					$self->helpMacro('instructor_links', { label => $r->maketext('Help'), class => 'nav-link' }));
-				print CGI::li({ class => 'nav-item' }, $self->help({ class => 'nav-link' }));
-				if ($authz->hasPermissions($userID, "manage_course_files") # show this only on the FileManager page
-				     && $r->urlpath->module eq "WeBWorK::ContentGenerator::Instructor::FileManager") {
-				    my %augmentedSystemLinks = %systemlink_args;
-				    $augmentedSystemLinks{params}->{archiveCourse}=1;
-					print CGI::li({ class => 'nav-item' },
-						&$makelink("${pfx}FileManager",
-							text => $r->maketext("Archive this Course"),
-							urlpath_args => { %args },
-							systemlink_args => \%augmentedSystemLinks,
-							active => 0));
-				}
-				print CGI::end_ul();
-				print CGI::end_li(); # end Instructor Tools
-			} # /* access_instructor_tools */
-
-			if (exists $ce->{webworkURLs}{bugReporter}
-				&& $ce->{webworkURLs}{bugReporter} ne ''
-				&& $authz->hasPermissions($userID, 'report_bugs'))
-			{
-				print CGI::li(
-					{ class => 'nav-item' },
-					CGI::a(
-						{ href => $ce->{webworkURLs}{bugReporter}, class => 'nav-link' },
-						$r->maketext("Report bugs")
-					)
-				);
-			}
-
-		} # /* authentication was_verified */
-
-	} # /* defined $courseID */
-
-	print CGI::end_ul();
-
-
-	return "";
-}
-
-=item loginstatus()
-
-Defined in this package.
-
-Print a notification message announcing the current real user and effective
-user, a link to stop acting as the effective user, and a link to logout.
+	# System link parameters that are common to all links (except the Courses link).
+	my %systemlink_params = (
+		$c->param('displayMode')    ? (displayMode    => $c->param('displayMode'))    : (),
+		$c->param('showOldAnswers') ? (showOldAnswers => $c->param('showOldAnswers')) : ()
+	);
 
-=cut
+	my $current_url = $c->url_for;
 
-sub loginstatus {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $authen = $r->authen;
-	my $urlpath = $r->urlpath;
-	#This will contain any extra parameters which are needed to make
-	# the page function properly.  This will normally be empty.
-	my $extraStopActingParams = $r->{extraStopActingParams};
-
-	if ($authen and $authen->was_verified) {
-		my $courseID = $urlpath->arg("courseID");
-		my $userID = $r->param("user");
-		my $eUserID = $r->param("effectiveUser");
-
-		$extraStopActingParams->{effectiveUser} = $userID;
-		my $stopActingURL = $self->systemLink($urlpath, # current path
-			params=>$extraStopActingParams);
-		my $logoutURL = $self->systemLink($urlpath->newFromModule(__PACKAGE__ . "::Logout", $r, courseID => $courseID));
-
-		my $signOutIcon = CGI::i({ class=> "icon fas fa-sign-out-alt", aria_hidden => "true", data_alt => "signout" }, "");
-
-		my $user = $r->db->getUser($userID);
-		my $prettyUserName = $user->full_name || $user->user_id;
-
-		if ($eUserID eq $userID) {
-			print $r->maketext("Logged in as [_1].", HTML::Entities::encode_entities($prettyUserName))
-				. CGI::a({ href => $logoutURL, class => "btn btn-light btn-sm ms-2" },
-				$r->maketext("Log Out") . " " . $signOutIcon);
-		} else {
-			my $eUser = $r->db->getUser($eUserID);
-			my $prettyEUserName =
-				$eUser->full_name ? join(' ', $eUser->full_name, '(' . $eUser->user_id . ')') : $eUser->user_id;
-
-			print $r->maketext("Logged in as [_1].", HTML::Entities::encode_entities($prettyUserName))
-				. CGI::a({ href => $logoutURL, class => "btn btn-light btn-sm ms-2" },
-				$r->maketext("Log Out") . " " . $signOutIcon);
-			print CGI::br();
-			print $r->maketext("Acting as [_1].", HTML::Entities::encode_entities($prettyEUserName))
-				. CGI::a({ href => $stopActingURL, class => "btn btn-light btn-sm ms-2" },
-				$r->maketext("Stop Acting") . " " . $signOutIcon);
-		}
-	} else {
-		print $r->maketext("Not logged in.");
-	}
+	# Subroutine for generating links.
+	my $makelink = sub {
+		my ($route_name, %options) = @_;
+
+		my $new_url = $c->url_for($route_name, courseID => $courseID, %{ $options{captures} || {} });
+
+		# If 'active' is not set in the options, then determine the active link
+		# by comparing the generated url to the current url.
+		my $active = $options{active} // $c->current_route eq $route_name && $new_url eq $current_url;
+
+		# Do not use HTML::Entities::encode_entities on the link text.
+		# Mojolicious has already encoded html entities at this point.
+		return $c->link_to(
+			($options{text} // route_title($c, $route_name, 1)) => $c->systemLink(
+				$new_url, params => { %systemlink_params, %{ $options{systemlink_params} // {} } }
+			),
+			class => 'nav-link' . ($active ? ' active' : ''),
+			$options{target} ? (target => $options{target}) : (),
+			%{ $options{link_attrs} // {} }
+		);
+	};
 
-	return "";
+	return $c->include(
+		'ContentGenerator/Base/links',
+		courseID              => $courseID,
+		userID                => $userID,
+		eUserID               => $eUserID,
+		urlUserID             => $c->stash('userID'),
+		setID                 => $setID,
+		prettySetID           => format_set_name_display($setID // ''),
+		problemID             => $problemID,
+		prettyProblemID       => $prettyProblemID,
+		achievementID         => $achievementID,
+		restricted_navigation => $restricted_navigation,
+		makelink              => $makelink,
+	);
 }
 
 =item nav($args)
@@ -1157,20 +602,11 @@ For example:
 
  <!--#nav style="buttons" separator=" "-->
 
-=cut
-
-#sub nav {  }
-
 =item options()
 
 Not defined in this package.
 
-View options related to the content displayed in the body or info areas. See also
-optionsMacro().
-
-=cut
-
-#sub options {  }
+View options related to the content displayed in the body or info areas.
 
 =item path($args)
 
@@ -1185,46 +621,39 @@ $args is a reference to a hash containing the following fields:
              if style=image, the ALT text of each separator image
  textonly => suppress all HTML, return only plain text
 
-The implementation in this package takes information from the WeBWorK::URLPath
-associated with the current request.
+The implementation in this package gathers the route information from the
+current request.
 
 =cut
 
-sub path {
-	my ($self, $args) = @_;
-	my $r       = $self->r;
-	my $urlpath = $r->urlpath;
+sub path ($c, $args = {}) {
+	my $route = $c->app->routes->lookup($c->current_route);
 
 	# Determine if navigation is restricted for this user.
 	my $restrict_navigation =
-		$r->authen->was_verified && !$r->authz->hasPermissions($r->param('user'), 'navigation_allowed');
+		$c->authen->was_verified && !$c->authz->hasPermissions($c->param('user'), 'navigation_allowed');
 
 	my @path;
 
 	do {
-		my $name = $urlpath->name;
-		# If it is a problemID for a jitar set (something which requires
-		# a fair bit of checking), then display the pretty id.
-		if (defined $urlpath->module && $urlpath->module eq 'WeBWorK::ContentGenerator::Problem') {
-			if ($urlpath->parent->name) {
-				my $set = $r->db->getGlobalSet($urlpath->parent->name);
-				if ($set && $set->assignment_type eq 'jitar') {
-					$name = join('.', jitar_id_to_seq($r->param('problemID')));
-				}
+		my $title = route_title($c, $route->name);
+		# If it is a problemID for a jitar set, then display the pretty id.
+		if ($route->name eq 'problem_detail' && $c->stash('setID')) {
+			my $set = $c->db->getGlobalSet($c->stash('setID'));
+			if ($set && $set->assignment_type eq 'jitar') {
+				$title = join('.', jitar_id_to_seq($c->stash('problemID')));
 			}
 		}
 
 		# If navigation is restricted for this user and path, then don't provide the link.
-		unshift @path, $name,
-			$restrict_navigation && $urlpath->navigation_restricted ? '' : $r->location . $urlpath->path;
-	} while ($urlpath = $urlpath->parent);
+		unshift @path, $title,
+			$restrict_navigation && route_navigation_is_restricted($route) ? '' : $c->url_for($route->name);
+	} while (($route = $route->parent) && ref($route) eq 'Mojolicious::Routes::Route');
 
 	# We don't want the last path element to be a link.
-	$path[$#path] = '';
+	$path[-1] = '';
 
-	print $self->pathMacro($args, @path);
-
-	return '';
+	return $c->pathMacro($args, @path);
 }
 
 =item siblings()
@@ -1233,39 +662,6 @@ Not defined in this package.
 
 Print links to siblings of the current object.
 
-=cut
-
-#sub siblings {  }
-
-=item footer()
-
-	-by ghe3
-
-	combines timestamp() and other elements of the footer, including the copyright, into one output subroutine,
-=cut
-
-sub footer {
-	my $self            = shift;
-	my $r               = $self->r;
-	my $ce              = $r->ce;
-	my $ww_version      = $ce->{WW_VERSION}         || 'unknown -- set WW_VERSION in VERSION';
-	my $pg_version      = $ce->{PG_VERSION}         || 'unknown -- set PG_VERSION in ../pg/VERSION';
-	my $theme           = $ce->{defaultTheme}       || 'unknown -- set defaultTheme in localOverides.conf';
-	my $copyright_years = $ce->{WW_COPYRIGHT_YEARS} || '1996-2022';
-	print CGI::div({ id => 'last-modified' }, $r->maketext('Page generated at [_1]', timestamp($self)));
-	print CGI::div(
-		{ id => 'copyright' },
-		$r->maketext(
-			'WeBWorK &copy; [_1] | theme: [_2] | ww_version: [_3] | pg_version [_4] |',
-			$copyright_years, $theme, $ww_version, $pg_version
-		),
-		CGI::a({ href => 'https://openwebwork.org/' }, $r->maketext('The WeBWorK Project'))
-	);
-
-	return '';
-}
-
-
 =item timestamp()
 
 Defined in this package.
@@ -1280,17 +676,11 @@ will give standard WeBWorK time format.  Wording and other formatting
 can be done in the template itself.
 =cut
 
-# sub timestamp {
-# 	my ($self, $args) = @_;
-# 	my $formatstring = "%l:%M%P on %b %e, %Y";
-# 	$formatstring = $args->{style} if(defined($args->{style}));
-# 	return(Date::Format::time2str($formatstring, time()));
-# }
-sub timestamp {
-	my ($self, $args) = @_;
-    # need to use the formatDateTime in this file (some subclasses access Util's version.
-	return( $self->formatDateTime( time() ) );
+sub timestamp ($c) {
+	# Need to use the formatDateTime in this file (some subclasses access Util's version).
+	return $c->formatDateTime(time);
 }
+
 =item message()
 
 Defined in this package.
@@ -1298,44 +688,53 @@ Defined in this package.
 Print any messages (error or non-error) resulting from the last form submission.
 This could be used to give Sucess and Failure messages after an action is performed by a module.
 
-The implementation in this package prints the value of the field
-$self->{status_message}, if it is present.
+The implementation in this package outputs the value of the field
+$c->{status_message}, if it is present.
 
 =cut
 
-sub message {
-	my ($self) = @_;
-	print $self->{status_message} if $self->{status_message};
-	return '';
+sub message ($c) {
+	$c->{status_message} //= $c->c;
+	return $c->{status_message}->join('');
 }
 
-=item title()
+=item page_title()
 
 Defined in this package.
 
 Print the title of the current page.
 
-The implementation in this package takes information from the WeBWorK::URLPath
-associated with the current request.
+The implementation in this package takes information from the current route.
 
 =cut
 
-sub title {
-	my ($self, $args) = @_;
-	my $r       = $self->r;
-	my $ce      = $r->ce;
-	my $db      = $r->db;
-	my $urlpath = $r->urlpath;
+sub page_title ($c) {
+	my $ce = $c->ce;
+	my $db = $c->db;
 
-	# If the urlpath type is 'set_list' and the course has a course title then display that.
-	if (($urlpath->type // '') eq 'set_list' && $db->settingExists('courseTitle')) {
-		print $db->getSettingValue('courseTitle');
+	# If the current route name is 'set_list' and the course has a course title then display that.
+	if ($c->current_route eq 'set_list' && $db->settingExists('courseTitle')) {
+		return $db->getSettingValue('courseTitle');
 	} else {
-		# Display the urlpath name
-		print $urlpath->name(1);
+		# Display the route name
+		return route_title($c, $c->current_route, 1);
 	}
+}
 
-	return '';
+=item webwork_url
+
+Defined in this package.
+
+Outputs the $webwork_url defined in site.conf, unless $webwork_url is equal to
+"/", in which case this outputs the empty string.
+
+This is used to set a value in a global webworkConfig javascript variable,
+that can be accessed in javascript files.
+
+=cut
+
+sub webwork_url ($c) {
+	return $c->location;
 }
 
 =item warnings()
@@ -1344,42 +743,25 @@ Defined in this package.
 
 Print accumulated warnings.
 
-The implementation in this package checks for a note in the request named
+The implementation in this package checks for a stash key named
 "warnings". If present, its contents are formatted and returned.
 
 =cut
 
-sub warnings {
-	my ($self) = @_;
-	my $r = $self->r;
-	print CGI::p("Entering ContentGenerator::warnings") if $TRACE_WARNINGS;
-	print "\n<!-- BEGIN " . __PACKAGE__ . "::warnings -->\n";
-	my $warnings = $r->notes->get("warnings");
-	$warnings = Encode::decode("UTF-8",$warnings);
-	print $self->warningOutput($warnings) if $warnings;
-	print "<!-- END " . __PACKAGE__ . "::warnings -->\n";
-
-	return "";
+sub warnings ($c) {
+	return $c->include('ContentGenerator/Base/warning_output', warnings => [ split m/\n+/, $c->stash('warnings') ])
+		if $c->stash('warnings');
+	return '';
 }
 
 =item help()
 
-Display a link to context-sensitive help. If the argument C<name> is defined,
-the link will be to the help document for that name. Otherwise the module of the
-WeBWorK::URLPath node for the current system location will be used.
+Display a link to context-sensitive help for the current content generator module.
 
 =cut
 
-sub help {
-	my $self = shift;
-	my $args = shift;
-
-	my $name = $args->{name};
-	$name = $self->r->urlpath->module unless defined($name);
-	$name =~ s/WeBWorK::ContentGenerator:://;
-	$name =~ s/://g;
-
-	$self->helpMacro($name, $args);
+sub help ($c, $args) {
+	return $c->helpMacro((ref($c) =~ s/WeBWorK::ContentGenerator:://r) =~ s/://gr, $args);
 }
 
 =item url($args)
@@ -1395,9 +777,8 @@ environment. $args is a reference to a hash containing the following fields:
 
 =cut
 
-sub url {
-	my ($self, $args) = @_;
-	my $ce   = $self->r->ce;
+sub url ($c, $args) {
+	my $ce   = $c->ce;
 	my $type = $args->{type} // 'webwork';
 	my $name = $args->{name} // '';
 	my $file = $args->{file};
@@ -1429,138 +810,61 @@ sub url {
 
 # ------------------------------------------------------------------------------
 
-=head2 Conditional predicates
+=head2 Template conditions
 
-Conditional predicate methods are invoked when the C<#if> escape sequence is
-encountered in the template. If a method named C<if_predicate> is defined in
-here or in the instantiated subclass, it is invoked.
+Template condition methods are called in the template. If a method is defined
+here or overridden in the instantiated subclass, it is invoked.
 
-The following predicates are currently defined:
+The following conditions are currently defined:
 
 =over
 
-=item if_can($function)
+=item can($function)
 
 If a function named $function is present in the current content generator (or
 any superclass), a true value is returned. Otherwise, a false value is returned.
 
-The implementation in this package uses the method UNIVERSAL->can(function) to
-arrive at the result.
+This package just uses the UNIVERSAL::can() function.
 
 A subclass could redefine this method to, for example, "hide" a method from the
 template:
 
- sub if_can {
- 	my ($self, $arg) = @_;
-
- 	if ($arg eq "floobar") {
- 		return 0;
- 	} else {
- 		return $self->SUPER::if_can($arg);
- 	}
- }
+    sub can ($c, $arg) {
+        my ($c, $arg) = @_;
 
-=cut
-
-sub if_can {
-	my ($self, $arg) = @_;
-
-	return $self->can($arg) ? 1 : 0;
-}
-
-=item if_loggedin($arg)
-
-If the user is currently logged in, $arg is returned. Otherwise, the inverse of
-$arg is returned.
-
-#The implementation in this package always returns $arg, since most content
-#generators are only reachable when the user is authenticated. It is up to
-#classes that can be reached without logging in to override this method and
-#provide the correct behavior.
-#
-#This is suboptimal, and may change in the future.
-
-The implementation in this package uses WeBWorK::Authen::was_verified() to
-retrieve the result of the last call to WeBWorK::Authen::verify().
-
-=cut
-
-sub if_loggedin {
-	my ($self, $arg) = @_;
-
-	#return $arg;
-	return 0 unless $self->r->authen;
-	return $self->r->authen->was_verified() ? $arg : !$arg;
-}
-
-=item if_message($arg)
-
-If the last form submission generated a message, $arg is returned. Otherwise, the
-inverse of $arg is returned.
-
-The implementation in this package checks for the field $self->{status_message} to
-determine if a message is present.
-
-If a subclass uses some other method to classify submission results, this method could be
-redefined to handle that variance:
-
- sub if_message {
- 	my ($self, $arg) = @_;
-
- 	my $status = $self->{processReturnValue};
- 	if ($status != 0) {
- 		return $arg;
- 	} else {
- 		return !$arg;
- 	}
- }
+        if ($arg eq "floobar") {
+        	return 0;
+        } else {
+        	return $c->SUPER::can($arg);
+        }
+    }
 
 =cut
 
-sub if_message {
-	my ($self, $arg) = @_;
+=item have_warnings
 
-	if (exists $self->{status_message}) {
-		return $arg;
-	} else {
-		return !$arg;
-	}
-}
-
-=item if_warnings
-
-If warnings have been emitted while handling this request, $arg is returned.
-Otherwise, the inverse of $arg is returned.
+If warnings have been emitted while handling this request return true, otherwise
+return false.
 
-The implementation in this package checks for a note in the request named
-"warnings". This is set by the WARN handler in Apache::WeBWorK when a warning is
-handled.
+This implementation checks if a stash value named "warnings" has been set or if
+there are pg errors.
 
 =cut
 
-sub if_warnings {
-	my ($self, $arg) = @_;
-	my $r = $self->r;
-
-	if ($r->notes->get("warnings") || ($self->{pgerrors})) {
-		return $arg;
-	} else {
-		!$arg;
-	}
+sub have_warnings ($c) {
+	return $c->stash('warnings') || $c->{pgerrors};
 }
 
-=item if_exists
+=item exists_theme_file
 
 Returns true if the specified file exists in the current theme directory
 and false otherwise
 
 =cut
 
-sub if_exists {
-	my ($self, $arg) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	return -e $ce->{webworkDirs}{themes}.'/'.$ce->{defaultTheme}.'/'.$arg;
+sub exists_theme_file ($c, $arg) {
+	my $ce = $c->ce;
+	return -e "$ce->{webworkDirs}{themes}/$ce->{defaultTheme}/$arg";
 }
 
 =back
@@ -1591,33 +895,22 @@ Helper macro for the C<#path> escape sequence: $args is a hash reference
 containing the "style", "image", "text", and "textonly" arguments to the escape.
 @path consists of ordered key-value pairs of the form:
 
- "Page Name" => URL
+ "Page Name" => Mojo::URL
 
-If the page should not have a link associated with it, the URL should be left
-empty. Authentication data is added to each URL so you don't have to. A fully-
-formed path line is returned, suitable for returning by a function implementing
-the C<#path> escape.
-
-FIXME: authentication data probably shouldn't be added here any more, now that
-we have systemLink().
+If the page should not have a link associated with it, the URL should be the
+empty string. Authentication data is added to each URL so you don't have to. A
+fully-formed path line is returned, suitable for returning by a function
+implementing the C<#path> escape.
 
 =cut
 
-sub pathMacro {
-	my ($self, $args, @path) = @_;
-	my $r    = $self->r;
+sub pathMacro ($c, $args, @path) {
 	my %args = %$args;
 	$args{style} = 'text' if $args{textonly};
 
-	my $auth = $self->url_authen_args;
-	my $sep;
-	if ($args{style} eq 'image') {
-		$sep = CGI::img({ src => $args{image}, alt => $args{text} });
-	} else {
-		$sep = $args{text};
-	}
+	my %auth = $c->url_authen_args;
 
-	my @result;
+	my $result = $c->c;
 	while (@path) {
 		my $name = shift @path;
 		my $url  = shift @path;
@@ -1627,143 +920,89 @@ sub pathMacro {
 
 		$name =~ s/_/ /g;
 
-		if ($url and not $args{textonly}) {
+		if ($url && !$args{textonly}) {
 			if ($args{style} eq 'bootstrap') {
-				push @result, CGI::li({ class => 'breadcrumb-item' }, CGI::a({ href => "$url?$auth" }, $name));
+				push @$result, $c->tag('li', class => 'breadcrumb-item', $c->link_to($name => $url->query(\%auth)));
 			} else {
-				push @result, CGI::a({ href => "$url?$auth" }, $name);
+				push @$result, $c->link_to($name => $url->querylu(%auth));
 			}
 		} else {
 			if ($args{style} eq 'bootstrap') {
-				push @result, CGI::li({ class => 'breadcrumb-item active' }, $name);
+				push @$result, $c->tag('li', class => 'breadcrumb-item active', $name);
 			} else {
-				push @result, $name;
+				push @$result, $name;
 			}
 		}
 	}
 
-	return join($sep, @result);
+	return $result->join($args{text});
 }
 
-=item siblingsMacro(@siblings)
-
-Helper macro for the C<#siblings> escape sequence. @siblings consists of ordered
-key-value pairs of the form:
-
- "Sibling Name" => URL
-
-If the sibling should not have a link associated with it, the URL should be left
-empty. Authentication data is added to each URL so you don't have to. A fully-
-formed siblings block is returned, suitable for returning by a function
-implementing the C<#siblings> escape.
-
-FIXME: authentication data probably shouldn't be added here any more, now that
-we have systemLink().
-
-=cut
-
-sub siblingsMacro {
-	my ($self, @siblings) = @_;
-
-	my $auth = $self->url_authen_args;
-	my $sep = CGI::br();
-
-	my @result;
-	while (@siblings) {
-		my $name = shift @siblings;
-		my $url = shift @siblings;
-		my $id = $name;
-		$id =~ s/\W/\_/g;
-		push @result, $url
-			? CGI::span( {id=>$id}, CGI::a({-href=>"$url?$auth"}, $name) )
-			: CGI::span( {id=>$id},$name );
-	}
-
-	return join($sep, @result) . "\n";
-}
-
-
-
 =item navMacro($args, $tail, @links)
 
 Helper macro for the C<#nav> escape sequence: C<$args> is a hash reference
 containing the "style" and "separator" arguments to the escape.
-C<@siblings> consists of ordered tuples of the form:
+C<@links> consists of ordered tuples of the form:
 
- "Link Name", URL, ImageBaseName
+ "Link Name", Mojo::URL
 
-If the sibling should not have a link associated with it, the URL should be left
-empty.  C<$tail> is appended to each URL, after the authentication information.
-A fully-formed nav line is returned, suitable for returning by a function
-implementing the C<#nav> escape.
+If a nav element should not have a link associated with it, the URL should be
+the empty string.  C<$tail> should be a hash reference of URL query parameters
+to add to each URL after the authentication information.  A fully-formed nav
+line is returned, suitable for returning by a function implementing the C<#nav>
+escape.
 
 =cut
 
-sub navMacro {
-	my ($self, $args, $tail, @links) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
+sub navMacro ($c, $args, $tail, @links) {
+	my $ce   = $c->ce;
 	my %args = %$args;
 
-	my $auth = $self->url_authen_args;
-	my $prefix = $ce->{webworkURLs}->{htdocs}."/images";
+	my %auth = $c->url_authen_args;
 
-	my @result;
+	my $result = $c->c;
 	while (@links) {
-		my $name = shift @links;
-		my $url = shift @links;
+		my $name      = shift @links;
+		my $url       = shift @links;
 		my $direction = shift @links;
-		my $html = ($direction && $args{style} eq "buttons") ? $direction : $name;
-		push @result, $url
-			? CGI::a({ href => "$url?$auth$tail", class => "btn btn-primary" }, $html)
-			: CGI::span({ class => "btn btn-primary disabled" }, $html);
+		my $html      = ($direction && $args{style} eq "buttons") ? $direction : $name;
+		push @$result,
+			$url
+			? $c->link_to($html => $url->query(%auth, %$tail), class => 'btn btn-primary')
+			: $c->tag('span', class => 'btn btn-primary disabled', $html);
 	}
 
-	return join($args{separator}, @result) . "\n";
+	return $result->join($args{separator});
 }
 
 =item helpMacro($name)
 
-This escape is represented by a question mark which links to an html page in the
-helpFiles  directory.  Currently the link is made to the file $name.html
+This method outputs a link that opens a modal dialog containing the results of rendering a
+HelpFiles template.  The template file that is rendered is $name.html.  If that file does not
+exist, then nothing is output.
 
-The optional argument $args is a hash that may contain the keys label or class.
-$args->{label} is the displayed label, and $args->{class} is added to the html class attribute if defined.
+The optional argument $args is a hash that may contain the keys label, label_size, or class.
+$args->{label} is the displayed label, $args->{label_size} is a font awesome size class and is
+only used if $args->{label} is not set, and $args->{class} is added to the html class attribute
+if defined.
 
 =cut
 
-sub helpMacro {
-	my $self = shift;
-	my $name = shift;
-	my $args = shift;
-
-	my $label = $args->{label}
-		// CGI::i({ class => "icon fas fa-question-circle", aria_hidden => "true", data_alt => " ? " }, '');
-	delete $args->{label};
-
-	$args->{class} = 'help-macro ' . ($args->{class} // '');
+sub helpMacro ($c, $name, $args = {}) {
+	my $ce = $c->ce;
+	return '' unless -e "$ce->{webworkDirs}{root}/templates/HelpFiles/$name.html.ep";
 
-	my $ce = $self->r->ce;
-	$name = 'no_help' unless -e "$ce->{webworkDirs}{local_help}/$name.html";
-
-	return CGI::a(
-		{
-			href   => $ce->{webworkURLs}{local_help} . "/$name.html",
-			target => 'ww_help',
-			%$args
-		},
-		$label
+	my $label = $args->{label} // $c->tag(
+		'i',
+		class         => 'icon fa-solid fa-circle-question ' . ($args->{label_size} // ''),
+		'aria-hidden' => 'true',
+		data          => { alt => ' ? ' },
+		''
 	);
-}
-
-=item sub optionsMacro
-
-This function has been depreciated
-
-=cut
+	delete $args->{label};
+	delete $args->{label_size};
 
-sub optionsMacro {
-    return '';
+	return $c->include("HelpFiles/$name", name => $name, label => $label, args => $args);
 }
 
 =item feedbackMacro(%params)
@@ -1774,88 +1013,23 @@ module and their values.
 
 =cut
 
-sub feedbackMacro {
-	my ($self, %params) = @_;
-	my $r = $self->r;
-	my $authz = $r->authz;
-	my $userID = $r->param("user");
-
-	# don't do anything unless the user has permission to
-	return "" unless $authz->hasPermissions($userID, "submit_feedback");
-
-	my $feedbackURL = $r->ce->{courseURLs}{feedbackURL};
-	my $feedbackFormURL = $r->ce->{courseURLs}{feedbackFormURL};
-	if (defined $feedbackURL and $feedbackURL ne "") {
-		return $self->feedbackMacro_url($feedbackURL);
-	} elsif (defined $feedbackFormURL and $feedbackFormURL ne "") {
-		return $self->feedbackMacro_form($feedbackFormURL,%params);
-	} else {
-		return $self->feedbackMacro_email(%params);
-	}
-}
-
-sub feedbackMacro_email {
-	my ($self, %params) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $urlpath = $r->urlpath;
-	my $courseID = $urlpath->arg("courseID");
-
-	# feedback form url
-	my $feedbackPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Feedback",  $r, courseID => $courseID);
-	my $feedbackURL = $self->systemLink($feedbackPage, authen => 0); # no authen info for form action
-	my $feedbackName = $r->maketext($ce->{feedback_button_name}) || $r->maketext("Email instructor");
-
-	my $result = CGI::start_form(-method=>"POST", -action=>$feedbackURL) . "\n";
-	#This is being used on forms with hidden_authen_fields already included
-	# in many pages so we need to change the fields to be hidden
-	my $hiddenFields = $self->hidden_authen_fields;
-	$hiddenFields =~ s/\"hidden_/\"email-hidden_/g;
-	$result .=  $hiddenFields."\n";
-
-	while (my ($key, $value) = each %params) {
-	    next if $key eq 'pg_object';    # not used in internal feedback mechanism
-		$result .= CGI::hidden($key, $value) . "\n";
-	}
-	$result .= CGI::p(CGI::submit({ name => "feedbackForm", value => $feedbackName, class => 'btn btn-primary' }));
-	$result .= CGI::end_form() . "\n";
+sub feedbackMacro ($c, %params) {
+	return '' unless $c->authz->hasPermissions($c->param('user'), 'submit_feedback');
 
-	return $result;
-}
-
-sub feedbackMacro_form {
-	my ($self, $feedbackFormURL, %params) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-
-	# feedback form url
-	my $feedbackName = $r->maketext($ce->{feedback_button_name}) || $r->maketext("Email instructor");
-
-	my $result = CGI::start_form(-method=>"POST", -action=>$feedbackFormURL,-target=>"WW_info") . "\n";
-
-	$result .= $self->hidden_authen_fields . "\n";
-
-	while (my ($key, $value) = each %params) {
-	    if ($key eq 'pg_object') {
-	        my $tmp = $value->{body_text};
-	        $tmp .= CGI::p(CGI::b("Note: "). CGI::i($value->{result}->{msg})) if $value->{result}->{msg} ;
-	        $result .= CGI::hidden($key, encode_base64(Encode::encode('UTF-8', $tmp), "") );
-	    } else {
-			$result .= CGI::hidden($key, $value) . "\n";
-		}
+	if ($c->ce->{courseURLs}{feedbackURL}) {
+		return $c->link_to(($c->maketext($c->ce->{feedback_button_name}) || $c->maketext('Email instructor')) =>
+				$c->ce->{courseURLs}{feedbackURL});
+	} elsif ($c->ce->{courseURLs}{feedbackFormURL}) {
+		$params{notifyAddresses} =
+			join(';', $c->fetchEmailRecipients('receive_feedback', $c->db->getUser($c->param('user'))));
+		return $c->include(
+			'ContentGenerator/Base/feedback_macro_form',
+			params          => \%params,
+			feedbackFormURL => $c->ce->{courseURLs}{feedbackFormURL}
+		);
+	} else {
+		return $c->include('ContentGenerator/Base/feedback_macro_email', params => \%params);
 	}
-	$result .= CGI::p({-align=>"left"},
-		CGI::submit({ name => "feedbackForm", value => $feedbackName, class => 'btn btn-primary' }));
-	$result .= CGI::end_form() . "\n";
-
-	return $result;
-}
-
-sub feedbackMacro_url {
-	my ($self, $url) = @_;
-	my $r = $self->r;
-	my $feedbackName = $r->maketext($r->ce->{feedback_button_name}) || $r->maketext("Email instructor");
-	return CGI::a({-href=>$url}, $feedbackName);
 }
 
 =back
@@ -1876,24 +1050,28 @@ fragments.
 Return hidden <INPUT> tags for each field mentioned in @fields (or all fields if
 list is empty), taking data from the current request.
 
+A hash of options may be passed for the first argument of this method.  The only
+supported option is an "id_prefix" to prepend to the id's of all of the hidden
+inputs that are created.
+
 =cut
 
-sub hidden_fields {
-	my ($self, @fields) = @_;
-	my $r = $self->r;
+sub hidden_fields ($c, @fields) {
+	my %options   = ref $fields[0] eq 'HASH' ? %{ shift @fields } : ();
+	my $id_prefix = $options{id_prefix} // '';
 
-	@fields = $r->param unless @fields;
+	@fields = $c->param unless @fields;
 
-	my $html = '';
-	foreach my $param (@fields) {
-		my @values = $r->param($param);
-		foreach my $value (@values) {
+	my $html = $c->c;
+	for my $param (@fields) {
+		my @values = $c->param($param);
+		for my $value (@values) {
 			next unless defined($value);
-			$html .= CGI::hidden({ name => $param, default => $value, id => "hidden_" . $param });
+			push(@$html, $c->hidden_field($param => $value, id => "${id_prefix}hidden_$param"));
 		}
 	}
 
-	return $html;
+	return $html->join('');
 }
 
 =item hidden_authen_fields()
@@ -1901,12 +1079,14 @@ sub hidden_fields {
 Use hidden_fields to return hidden <INPUT> tags for request fields used in
 authentication.
 
-=cut
+An optional $id_prefix may be passed as the first argument of this method.
 
-sub hidden_authen_fields {
-	my ($self) = @_;
+=cut
 
-	return $self->hidden_fields("user", "effectiveUser", "key", "theme");
+sub hidden_authen_fields ($c, $id_prefix = undef) {
+	return $c->hidden_fields({ id_prefix => $id_prefix }, 'user', 'effectiveUser', 'key', 'theme')
+		if defined $id_prefix;
+	return $c->hidden_fields('user', 'effectiveUser', 'key', 'theme');
 }
 
 =item hidden_proctor_authen_fields()
@@ -1916,142 +1096,53 @@ proctor authentication.
 
 =cut
 
-sub hidden_proctor_authen_fields {
-	my $self = shift;
-	if ( $self->r->param('proctor_user') ) {
-		return $self->hidden_fields("proctor_user", "proctor_key");
+sub hidden_proctor_authen_fields ($c) {
+	if ($c->param('proctor_user')) {
+		return $c->hidden_fields('proctor_user', 'proctor_key');
 	} else {
 		return '';
 	}
 }
 
-=item hidden_state_fields()
-
-Use hidden_fields to return hidden <INPUT> tags for request fields used to
-maintain state. Currently includes authentication fields and display option
-fields.
-
-=cut
-
-sub hidden_state_fields {
-	my ($self) = @_;
-
-	return $self->hidden_authen_fields();
-
-	# other things that may be state data:
-	#$self->hidden_fields("displayMode", "showOldAnswers", "showCorrectAnswers", "showHints", "showSolutions");
-}
-
 =item url_args(@fields)
 
-Return a URL query string (without the leading `?') containing values for each
-field mentioned in @fields, or all fields if list is empty. Data is taken from
-the current request.
+Return a hash containing values for each field mentioned in @fields, or all
+fields if list is empty. Data is taken from the current request.  This return
+value is suitable for passing to the Mojo::URL query method.
 
 =cut
 
-sub url_args {
-	my ($self, @fields) = @_;
-	my $r = $self->r;
-
-	@fields = $r->param unless @fields;
+sub url_args ($c, @fields) {
+	@fields = $c->param unless @fields;
 
-	my @pairs;
-	foreach my $param (@fields) {
-		my @values = $r->param($param);
-		foreach my $value (@values) {
-			push @pairs, uri_escape_utf8($param) . "=" . uri_escape($value);
-		}
+	my %params;
+	for my $param (@fields) {
+		$params{$param} = [ $c->param($param) ] if defined $c->param($param);
 	}
 
-	return join("&", @pairs);
+	return %params;
 }
 
 =item url_authen_args()
 
-Use url_args to return a URL query string for request fields used in
-authentication.
+Use url_args to return a hash of request fields used in authentication that is
+suitable for passing to the Mojo::URL query method.
 
 =cut
 
-sub url_authen_args {
-	my ($self) = @_;
-	my $ce = $self->r->ce;
+sub url_authen_args ($c) {
+	my $ce = $c->ce;
 
 	# When cookie based session management is in use, there should be no need
 	# to reveal the user and key in the URL. Putting it there makes session
 	# hijacking easier, in particular should a student share such a URL.
-	if ( $ce->{session_management_via} eq "session_cookie" ) {
-		return $self->url_args("effectiveUser", "theme");
+	if ($ce->{session_management_via} eq 'session_cookie') {
+		return $c->url_args('effectiveUser', 'theme');
 	} else {
-		return $self->url_args("user", "effectiveUser", "key", "theme");
+		return $c->url_args('user', 'effectiveUser', 'key', 'theme');
 	}
 }
 
-=item url_state_args()
-
-Use url_args to return a URL query string for request fields used to maintain
-state. Currently includes authentication fields and display option fields.
-
-=cut
-
-sub url_state_args {
-	my ($self) = @_;
-
-	return $self->url_authen_args;
-
-	# other things that may be state data:
-	#$self->url_args("displayMode", "showOldAnswers", "showCorrectAnswers", "showHints", "showSolutions");
-}
-
-# This method is not used anywhere! --sam(1-Aug-05)
-#
-#=item url_display_args()
-#
-#Use url_args to return a URL query string for request fields used in
-#authentication.
-#
-#=cut
-#
-#sub url_display_args {
-#	my ($self) = @_;
-#
-#	return $self->url_args("displayMode", "showOldAnswer");
-#}
-
-# This method is not used anywhere! --sam(1-Aug-05)
-#
-#=item print_form_data($begin, $middle, $end, $omit)
-#
-#Return a string containing every request field not matched by the quoted reguar
-#expression $omit, placing $begin before each field name, $middle between each
-#field name and its value, and $end after each value. Values are taken from the
-#current request.
-#
-#=cut
-#
-#sub print_form_data {
-#	my ($self, $begin, $middle, $end, $qr_omit) = @_;
-#	my $r=$self->r;
-#	my @form_data = $r->param;
-#
-#	my $return_string = "";
-#	foreach my $name (@form_data) {
-#		next if ($qr_omit and $name =~ /$qr_omit/);
-#		my @values = $r->param($name);
-#		foreach my $variable (qw(begin name middle value end)) {
-#			# FIXME: can this loop be moved out of the enclosing loop?
-#			no strict 'refs';
-#			${$variable} = "" unless defined ${$variable};
-#		}
-#		foreach my $value (@values) {
-#			$return_string .= "$begin$name$middle$value$end";
-#		}
-#	}
-#
-#	return $return_string;
-#}
-
 =back
 
 =cut
@@ -2064,7 +1155,7 @@ sub url_state_args {
 
 =item systemLink($urlpath, %options)
 
-Generate a link to another part of the system. $urlpath is WeBWorK::URLPath
+Generate a link to another part of the system. $urlpath is Mojo::URL
 object from which the base path will be taken. %options can consist of:
 
 =over
@@ -2101,12 +1192,8 @@ via email.
 
 =cut
 
-# FIXME: there should probably be an option for prepending "http://hostname:port"
-sub systemLink {
-	my ($self, $urlpath, %options) = @_;
-	my $r = $self->r;
-
-	my %params = ();
+sub systemLink ($c, $urlpath, %options) {
+	my %params;
 	if (exists $options{params}) {
 		if (ref $options{params} eq "HASH") {
 			%params = %{ $options{params} };
@@ -2118,67 +1205,29 @@ sub systemLink {
 		}
 	}
 
-	my $authen = exists $options{authen} ? $options{authen} : 1;
-	if ($authen) {
-
+	if ($options{authen} // 1) {
 		# When cookie based session management is in use, there should be no need
 		# to reveal the user and key in the URL. Putting it there makes session
 		# hijacking easier, in particular should a student share such a URL.
-
-		if ( $r->ce->{session_management_via} eq "session_cookie" ) {
-			undef( $params{user} ) if exists $params{user};
-			undef( $params{key} )  if exists $params{key};
+		if ($c->ce->{session_management_via} eq "session_cookie") {
+			delete $params{user};
+			delete $params{key};
 		} else {
-			$params{user}          = undef unless exists $params{user};
-			$params{key}           = undef unless exists $params{key};
+			$params{user} = undef unless exists $params{user};
+			$params{key}  = undef unless exists $params{key};
 		}
 
 		$params{effectiveUser} = undef unless exists $params{effectiveUser};
 		$params{theme}         = undef unless exists $params{theme};
 	}
 
-	my $url;
-
-	$url = $r->ce->{apache_root_url} if $options{use_abs_url};
-	$url .= $r->location . $urlpath->path;
-	my $first = 1;
-
-	foreach my $name (keys %params) {
-		my $value = $params{$name};
-
-		my @values;
-		if (defined $value) {
-			if (ref $value eq "ARRAY") {
-				@values = @$value;
-			} else {
-				@values = $value;
-			}
-		} elsif (defined $r->param($name)) {
-			@values = $r->param($name);
-		}
-		#FIXME  -- evntually we'd like to catch where this happens
-		if ($name eq 'user' and @values >1 )    {
-			warn "internal error --  user has been multiply defined! You may need to logout and log back in to correct this.";
-			my $user = $r->param("user");
-			$r->param(user => $user);
-		    @values = ($user);
-		    warn "requesting page is ", $r->headers_in->{'Referer'};
-		    warn "Parameters are ", join("|",$r->param());
-
-		}
+	my $url = $options{use_abs_url} ? $urlpath->to_abs : $urlpath;
 
-		if (@values) {
-			if ($first) {
-				$url .= "?";
-				$first = 0;
-			} else {
-				$url .= "&";
-			}
-			$url .= join "&", map { "$name=".HTML::Entities::encode_entities($_) } @values;
-		}
+	for my $name (keys %params) {
+		$params{$name} = [ $c->param($name) ] if (!defined $params{$name} && defined $c->param($name));
 	}
 
-	return $url;
+	return %params ? $url->query(%params) : $url;
 }
 
 =item nbsp($string)
@@ -2188,9 +1237,8 @@ Otherwise $string is returned.
 
 =cut
 
-sub nbsp {
-	my ($self, $str) = @_;
-	return (defined $str && $str =~/\S/) ? $str : "&nbsp;";
+sub nbsp ($c, $str) {
+	return (defined $str && $str =~ /\S/) ? $str : '&nbsp;';
 }
 
 =item errorOutput($error, $details)
@@ -2200,133 +1248,19 @@ problem rendering.
 
 =cut
 
-sub errorOutput($$$) {
-	my ($self, $error, $details) = @_;
-	my $r = $self->{r};
-	print "Entering ContentGenerator::errorOutput subroutine</br>" if $TRACE_WARNINGS;
-	my $time = time2str("%a %b %d %H:%M:%S %Y", time);
-	my $method = $r->method;
-	my $uri = $r->uri;
-	my $headers = do {
-		my %headers = %{$r->headers_in};
-		join("", map { CGI::Tr({},CGI::td(CGI::small($_)), CGI::td(CGI::small($headers{$_}))) } keys %headers);
-	};
-
-	# if it is a long report pass details by reference rather than by value
-	# for consistency we automatically convert all forms of $details into
-	# a reference to an array.
-
-	if (ref($details) =~ /SCALAR/i) {
-		$details = [$$details];
-	} elsif (ref($details) =~/ARRAY/i) {
-		# no change needed
-	} else {
-	   $details = [$details];
-	}
-	return
-		CGI::h2($r->maketext("WeBWorK Error")),
-		CGI::p($r->maketext(
-			'WeBWorK has encountered a software error while attempting to process this problem. It is likely that '
-				. 'there is an error in the problem itself. If you are a student, report this error message to your '
-				. 'professor to have it corrected. If you are a professor, please consult the error output below for '
-				. 'more information.'
-		)),
-
-		CGI::h3($r->maketext("Error messages")),
-
-		CGI::p(CGI::code($error)),
-		CGI::h3("Error details"),
-
-		CGI::start_code(), CGI::start_p(),
-		@{ $details },
-		#CGI::code(CGI::p(@expandedDetails)),
-		# not using inclusive CGI calls here saves about 30Meg of memory!
-		CGI::end_p(),CGI::end_code(),
-
-		CGI::h3($r->maketext("Request information")),
-		CGI::table({border=>"1"},
-			CGI::Tr({},CGI::td($r->maketext("Time")), CGI::td($time)),
-			CGI::Tr({},CGI::td($r->maketext("Method")), CGI::td($method)),
-			CGI::Tr({},CGI::td($r->maketext("URI")), CGI::td($uri)),
-			CGI::Tr({},CGI::td($r->maketext("HTTP Headers")), CGI::td(
-				CGI::table($headers),
-			)),
-		),
-	;
-
+sub errorOutput ($c, $error, $details) {
+	return $c->include('ContentGenerator/Base/error_output', error => $error, details => $details);
 }
 
 =item warningMessage
 
-Used to print out a generic warning message at the top of the page
+Used to display a generic warning message at the top of the page
 
 =cut
 
-sub warningMessage {
-  my $self = shift;
-  my $r = $self->r;
-
-  return CGI::b($r->maketext("Warning")), ' -- ',
-    $r->maketext("There may be something wrong with this question. Please inform your instructor including the warning messages below.");
-
-}
-
-
-=item warningOutput($warnings)
-
-Used by warnings() in this class to report warnings caught during dispatching
-and content generation.
-
-=cut
-
-sub warningOutput($$) {
-	my ($self, $warnings) = @_;
-	my $r = $self->{r};
-	print "Entering ContentGenerator::warningOutput subroutine</br>" if $TRACE_WARNINGS;
-	my @warnings = split m/\n+/, $warnings;
-
-	my $scrubber = HTML::Scrubber->new(
-	    default => 1,
-	    script => 0,
-	    comment => 0
-	    );
-	$scrubber->default(
-	    undef,
-	    {
-		'*' => 1,
-	    }
-	    );
-
-	foreach my $warning (@warnings) {
-            # Since these warnings have html they look better scrubbed
-	    #$warning = HTML::Entities::encode_entities($warning);
-	    $warning = $scrubber->scrub($warning);
-	    $warning = CGI::li(CGI::code($warning));
-	}
-	$warnings = join("", @warnings);
-
-	my $time = time2str("%a %b %d %H:%M:%S %Y", time);
-	my $method = $r->method;
-	my $uri = $r->uri;
-	#my $headers = do {
-	#	my %headers = $r->headers_in;
-	#	join("", map { CGI::Tr(CGI::td(CGI::small($_)), CGI::td(CGI::small($headers{$_}))) } keys %headers);
-	#};
-
-	return
-		CGI::h2($r->maketext("WeBWorK Warnings")),
-		CGI::p($r->maketext('WeBWorK has encountered warnings while processing your request. If this occured when viewing a problem, it was likely caused by an error or ambiguity in that problem. Otherwise, it may indicate a problem with the WeBWorK system itself. If you are a student, report these warnings to your professor to have them corrected. If you are a professor, please consult the warning output below for more information.')),
-		CGI::h3($r->maketext("Warning messages")),
-		CGI::ul($warnings),
-		CGI::h3($r->maketext("Request information")),
-		CGI::table({border=>"1"},
-			CGI::Tr({},CGI::td($r->maketext("Time")), CGI::td($time)),
-			CGI::Tr({},CGI::td($r->maketext("Method")), CGI::td($method)),
-			CGI::Tr({},CGI::td($r->maketext("URI")), CGI::td($uri)),
-			#CGI::Tr(CGI::td("HTTP Headers"), CGI::td(
-			#	CGI::table($headers),
-			#)),
-		);
+sub warningMessage ($c) {
+	return $c->maketext('<strong>Warning</strong>: There may be something wrong with this question. '
+			. 'Please inform your instructor including the warning messages below.');
 }
 
 =item $dateTime = parseDateTime($string, $display_tz)
@@ -2338,12 +1272,9 @@ UNIX datetime (epoch) in the server's timezone.
 
 =cut
 
-sub parseDateTime {
-	my ($self, $string, $display_tz) = @_;
-	my $ce = $self->r->ce;
-	$display_tz ||= $ce->{siteDefaults}{timezone};
-	return WeBWorK::Utils::parseDateTime($string, $display_tz);
-};
+sub parseDateTime ($c, $string, $display_tz = undef) {
+	return WeBWorK::Utils::parseDateTime($string, $display_tz || $c->ce->{siteDefaults}{timezone});
+}
 
 =item $string = formatDateTime($dateTime, $display_tz)
 
@@ -2355,12 +1286,11 @@ $siteDefaults{timezone} is used.
 
 =cut
 
-sub formatDateTime {
-	my ($self, $dateTime, $display_tz,$formatString,$locale) = @_;
-	my $ce = $self->r->ce;
+sub formatDateTime ($c, $dateTime, $display_tz = undef, $formatString = undef, $locale = undef) {
+	my $ce = $c->ce;
 	$display_tz ||= $ce->{siteDefaults}{timezone};
-	$locale ||= $ce->{siteDefaults}{locale};
-	return WeBWorK::Utils::formatDateTime($dateTime, $display_tz,$formatString,$locale);
+	$locale     ||= $ce->{siteDefaults}{locale};
+	return WeBWorK::Utils::formatDateTime($dateTime, $display_tz, $formatString, $locale);
 }
 
 =item read_scoring_file($fileName)
@@ -2370,56 +1300,13 @@ prepends the path to the scoring directory.
 
 =cut
 
-sub read_scoring_file {
-	my ($self, $fileName) = @_;
-	return {} if $fileName eq "None"; # callers expect a hashref in all cases
-	return parse_scoring_file($self->r->ce->{courseDirs}{scoring}."/$fileName");
-}
-
-=item createEmailSenderTransportSMTP
-
-Wrapper that creates an Email::Sender::Transport::SMTP object
-
-=cut
-
-# this function abstracts the process of creating a transport layer for SendMail
-# it is used in Feedback.pm, SendMail.pm and ProblemUtil.pm (for JITAR messages)
-
-sub createEmailSenderTransportSMTP {
-	my $self = shift;
-	my $ce   = $self->r->ce;
-	my $transport;
-	if (defined $ce->{mail}->{smtpPort}) {
-		$transport = Email::Sender::Transport::SMTP->new({
-			host    => $ce->{mail}->{smtpServer},
-			ssl     => $ce->{mail}->{tls_allowed} // 0,    ## turn off ssl security by default
-			port    => $ce->{mail}->{smtpPort},
-			timeout => $ce->{mail}->{smtpTimeout},
-			# debug => 1,
-		});
-	} else {
-		$transport = Email::Sender::Transport::SMTP->new({
-			host    => $ce->{mail}->{smtpServer},
-			ssl     => $ce->{mail}->{tls_allowed} // 0,    ## turn off ssl security by default
-			timeout => $ce->{mail}->{smtpTimeout},
-			# debug => 1,
-		});
-	}
-	#warn "port is ", $transport->port();
-	#warn "ssl is ", $transport->ssl();
-	#warn "tls_allowed is ", $ce->{mail}->{tls_allowed}//'';
-	#warn "smtpPort is set to ", $ce->{mail}->{smtpPort}//'';
-
-	return $transport;
+sub read_scoring_file ($c, $fileName) {
+	return {} if $fileName eq "None";    # callers expect a hashref in all cases
+	return parse_scoring_file($c->ce->{courseDirs}{scoring} . "/$fileName");
 }
 
 =back
 
-=head1 AUTHOR
-
-Written by Dennis Lambe Jr., malsyned (at) math.rochester.edu and Sam Hathaway,
-sh002i (at) math.rochester.edu.
-
 =cut
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Achievements.pm b/lib/WeBWorK/ContentGenerator/Achievements.pm
index ef18680cb0..0e126d5ab6 100644
--- a/lib/WeBWorK/ContentGenerator/Achievements.pm
+++ b/lib/WeBWorK/ContentGenerator/Achievements.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -15,8 +15,7 @@
 
 # This module prints out the list of achievements that a student has earned
 package WeBWorK::ContentGenerator::Achievements;
-use base qw(WeBWorK::ContentGenerator);
-use WeBWorK::AchievementItems;
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -25,327 +24,163 @@ This produces a list of earned achievements for each student.
 
 =cut
 
-use strict;
-use warnings;
-
-use CGI;
-use WeBWorK::Utils qw(sortAchievements thaw_base64 getAssetURL);
-
-sub head {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-
-	return "";
-}
-
-sub output_achievement_CSS {
-    return "";
-}
+use WeBWorK::Utils qw(sortAchievements thaw_base64);
+use WeBWorK::AchievementItems;
 
-sub initialize {
-	my ($self) = @_;
-	my $r      = $self->r;
-	my $db     = $r->db;
-	my $ce     = $r->ce;
+sub initialize ($c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
 
 	# Get user Data
-	$self->{userName}    = $r->param('user');
-	$self->{studentName} = $r->param('effectiveUser') // $self->{userName};
-	$self->{globalData}  = $db->getGlobalUserAchievement($self->{studentName});
+	$c->{userName}    = $c->param('user');
+	$c->{studentName} = $c->param('effectiveUser') // $c->{userName};
+	$c->{globalData}  = $db->getGlobalUserAchievement($c->{studentName});
 
 	# Check to see if user items are enabled and if the user has achievement data.
-	if ($ce->{achievementItemsEnabled} && defined $self->{globalData}) {
-
-		my $itemsWithCounts = WeBWorK::AchievementItems::UserItems($self->{studentName}, $db, $ce);
-		$self->{achievementItems} = $itemsWithCounts;
+	if ($ce->{achievementItemsEnabled} && defined $c->{globalData}) {
+		my $itemsWithCounts = WeBWorK::AchievementItems::UserItems($c->{studentName}, $db, $ce);
+		$c->{achievementItems} = $itemsWithCounts;
 
-		my $usedItem = $r->param('useditem');
+		my $usedItem = $c->param('useditem');
 
 		# If the useditem parameter is defined then the student wanted to use an item, so lets do that by calling the
 		# appropriate item's use method and printing results.
 		if (defined $usedItem) {
-			my $error = $itemsWithCounts->[$usedItem][0]->use_item($self->{studentName}, $r);
+			my $error = $itemsWithCounts->[$usedItem][0]->use_item($c->{studentName}, $c);
 			if ($error) {
-				$self->addbadmessage($error);
+				$c->addbadmessage($error);
 			} else {
-				if   ($itemsWithCounts->[$usedItem]->[1] != 1) { --$itemsWithCounts->[$usedItem][1]; }
-				else                                           { splice(@$itemsWithCounts, $usedItem, 1); }
-				$self->addgoodmessage($r->maketext('Reward used successfully!'));
+				if   ($itemsWithCounts->[$usedItem][1] != 1) { --$itemsWithCounts->[$usedItem][1]; }
+				else                                         { splice(@$itemsWithCounts, $usedItem, 1); }
+				$c->addgoodmessage($c->maketext('Reward used successfully!'));
 			}
 		}
 	}
-}
-
-sub body {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $db = $r->db;
-	my $ce = $r->ce;
-	my $globalUserAchievements = $self->{globalData};
-	my $userID = $self->{studentName};
-	my $achievementURL = $ce->{courseURLs}->{achievements};
-
-
-	#If they dont have a globalUserAchievements record then they dont have achievements
-	if (not defined($globalUserAchievements)) {
-	    print CGI::p($r->maketext("You don't have any Achievement data associated to you!"));
-	    return "";
-	}
 
-	print CGI::br();
-	print CGI::start_div({ class => 'cheevobigbox' });
+	return;
+}
 
-	#Print their "level achievement" if there is one and print the progress bar if there is one
-	my $achievement;
+sub getAchievementLevelData ($c) {
+	my ($achievement, $level_progress, $level_goal, $level_percentage);
 
-	if ($globalUserAchievements->level_achievement_id) {
-	    $achievement = $db->getAchievement($globalUserAchievements->level_achievement_id);
+	if ($c->{globalData}->level_achievement_id) {
+		$achievement = $c->db->getAchievement($c->{globalData}->level_achievement_id);
 	}
 
 	if ($achievement) {
-		print CGI::start_div({ class => 'd-flex align-items-center gap-3' });
-		my $imgSrc;
-		if ($achievement->{icon}) {
-			$imgSrc = $ce->{courseURLs}->{achievements} . "/" . $achievement->{icon};
-		} else {
-			$imgSrc = $ce->{webworkURLs}->{htdocs} . "/images/defaulticon.png";
+		if ($c->{globalData}->next_level_points) {
+			# Get prev_level_points from the globalData frozen_hash in the database.
+			my $globalData = $c->{globalData}->frozen_hash ? thaw_base64($c->{globalData}->frozen_hash) : {};
+			my $prev_level = $globalData->{prev_level_points} || 0;
+			$level_goal       = $c->{globalData}->next_level_points - $prev_level;
+			$level_progress   = $c->{globalData}->achievement_points - $prev_level;
+			$level_progress   = 0           if $level_progress < 0;
+			$level_progress   = $level_goal if $level_progress > $level_goal;
+			$level_percentage = $level_goal ? int(100 * $level_progress / $level_goal) : 0;
 		}
+	}
 
-		print CGI::img({ src => $imgSrc, alt => 'Level Icon' });
-		print CGI::start_div();
-		print CGI::h1($achievement->name);
+	return (
+		achievement      => $achievement,
+		level_progress   => $level_progress,
+		level_goal       => $level_goal,
+		level_percentage => $level_percentage
+	);
+}
 
-		if ($globalUserAchievements->next_level_points) {
+sub getAchievementItemsData ($c) {
+	my $db = $c->db;
 
-			# get prev_level_points from globalData frozen_hash in database
-			my $globalData = {};
-			if ($globalUserAchievements->frozen_hash) {
-				$globalData = thaw_base64($globalUserAchievements->frozen_hash);
-			}
-			my $prev_level = ($globalData->{prev_level_points}) ? $globalData->{prev_level_points} : 0;
-			my $level_goal = $globalUserAchievements->next_level_points - $prev_level;
-			my $level_prog = $globalUserAchievements->achievement_points - $prev_level;
-			$level_prog = $level_prog >= 0 ? $level_prog : 0;
-			$level_prog = $level_prog <= $level_goal ? $level_prog : $level_goal;
-			my $levelpercentage = int(100*$level_prog/$level_goal);
-
-			print CGI::start_div({
-				class      => 'levelouterbar',
-				title      => $r->maketext("[_1]% Complete", $levelpercentage),
-				aria_label => $r->maketext("[_1]% Complete", $levelpercentage),
-				role       => 'figure'
-			});
-			print CGI::div({ class => 'levelinnerbar', style => "width:$levelpercentage\%" }, '');
-			print CGI::end_div();
-			print CGI::div(CGI::strong($r->maketext('Level Progress:')) . " $level_prog/$level_goal");
-		}
-		print CGI::div(CGI::strong($r->maketext('Total Points:')) . ' ' . $globalUserAchievements->achievement_points);
-		print CGI::end_div();
-		print CGI::end_div();
-	}
-	print CGI::end_div();
-
-	#print any items they have if they have items
-	if ($ce->{achievementItemsEnabled} && $self->{achievementItems}) {
-		my @itemsWithCounts = @{$self->{achievementItems}};
-		# remove count data so @items is structured as originally designed
-		my @items = ();
-		my %itemCounts = ();
-		for my $item (@itemsWithCounts) {
-			push (@items, $item->[0]);
-			$itemCounts{$item->[0]->id()} = $item->[1];
-		};
-		my $urlpath = $r->urlpath;
-		my @setIDs = $db->listUserSets($userID);
-		my @setProblemCount;
-
-		my @userSetIDs = map {[$userID, $_]} @setIDs;
-		my @unfilteredsets = $db->getMergedSets(@userSetIDs);
-		my @sets;
-
-		# achievement items only make sense for regular homeworks
-		# so filter gateways out
-		foreach my $set (@unfilteredsets) {
-			if ($set->assignment_type() eq 'default') {
-				push @sets, $set;
-			}
+	my $userID = $c->{studentName};
+
+	my (@items, %itemCounts, @sets, @setProblemCount);
+
+	if ($c->ce->{achievementItemsEnabled} && $c->{achievementItems}) {
+		# Remove count data so @items is structured as originally designed.
+		for my $item (@{ $c->{achievementItems} }) {
+			push(@items, $item->[0]);
+			$itemCounts{ $item->[0]->id() } = $item->[1];
 		}
 
-		# Generate array of problem counts
-		for (my $i=0; $i<=$#sets; $i++) {
-			$setProblemCount[$i] = WeBWorK::Utils::max($db->listUserProblems($userID,$sets[$i]->set_id));
+		# Achievement items only make sense for regular homeworks.  So filter gateways out.
+		for my $set ($db->getMergedSets(map { [ $userID, $_ ] } $db->listUserSets($userID))) {
+			push(@sets, $set) if ($set->assignment_type() eq 'default');
 		}
 
-		print CGI::h2($r->maketext('Rewards'));
-
-		if (@items) {
-			my $itemnumber = 0;
-			foreach my $item (@items) {
-				# Print each item's name, count, and description
-				print CGI::start_div({ class => 'achievement-item' });
-				if ($itemCounts{$item->id()} > 1) {
-					print CGI::h3($r->maketext($item->name())
-						. ' (' . $r->maketext('[_1] remaining', $itemCounts{$item->id()}) . ')')
-				} elsif ($itemCounts{$item->id()} < 0) {
-					print CGI::h3($r->maketext($item->name()) . ' (' . $r->maketext('unlimited reusability') . ')')
-				}
-				else {print CGI::h3($r->maketext($item->name()))};
-
-				print CGI::p($r->maketext($item->description()));
-				# Print a modal popup for each item which contains the form necessary to get the data to use the item.
-				# Print the form in the modal body.
-				print CGI::a({
-						href           => '#modal_' . $item->id(),
-						role           => 'button',
-						data_bs_toggle => 'modal',
-						class          => 'btn btn-secondary',
-						id             => 'popup_' . $item->id()
-					}, $r->maketext('Use Reward'));
-				print CGI::start_div({ id => 'modal_' . $item->id(), class => 'modal hide fade', tabindex => '-1' });
-				print CGI::start_div({ class => 'modal-dialog modal-dialog-centered' });
-				print CGI::start_div({ class => 'modal-content' });
-				print CGI::start_div({ class => 'modal-header' });
-				print CGI::h4({ class => 'modal-title' }, $r->maketext($item->name()));
-				print qq{<button type="button" class="btn-close" data-bs-dismiss="modal"
-					aria-label="@{[$r->maketext('close')]}"></button>};
-				print CGI::end_div();
-				print CGI::start_form({
-						method => 'post',
-						action => $self->systemLink($urlpath, authen => 0),
-						name   => "itemform_$itemnumber",
-						class  => 'achievementitemform'
-					});
-				print CGI::start_div({ class => 'modal-body' });
-				# Note: we provide the item with some information about the current sets to help set up the form fields.
-				print $item->print_form(\@sets, \@setProblemCount, $r);
-				print CGI::hidden({ name => "useditem", value => $itemnumber });
-				print $self->hidden_authen_fields =~ s/id=\"hidden_/id=\"achievement_${itemnumber}_hidden_/gr;
-				print CGI::end_div();
-				print CGI::start_div({ class => 'modal-footer' });
-				print CGI::submit({ value => $r->maketext('Submit'), class => 'btn btn-primary' });
-				print CGI::end_div();
-				print CGI::end_form();
-				print CGI::end_div();
-				print CGI::end_div();
-				print CGI::end_div();
-				print CGI::end_div();
-
-				$itemnumber++;
-			}
-		} else {
-			print CGI::p($r->maketext('You don\'t have any rewards!'));
+		# Generate an array of problem counts.
+		for (my $i = 0; $i <= $#sets; $i++) {
+			$setProblemCount[$i] = WeBWorK::Utils::max($db->listUserProblems($userID, $sets[$i]->set_id));
 		}
-		print CGI::br();
 	}
 
-	#Get all the achievements
+	return (
+		items           => \@items,
+		itemCounts      => \%itemCounts,
+		sets            => \@sets,
+		setProblemCount => \@setProblemCount
+	);
+}
+
+sub getAchievementsData ($c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
+
+	my $userID = $c->{studentName};
+
+	my (@visibleAchievements, %userAchievements);
 
+	# Get all the achievements
 	my @allAchievementIDs = $db->listAchievements;
-	if ( @allAchievementIDs ) { # bail if there are no achievements
+	if (@allAchievementIDs) {
 		my @achievements = $db->getAchievements(@allAchievementIDs);
 
 		@achievements = sortAchievements(@achievements);
 		my $previousCategory = $achievements[0]->category;
-		my $previousNumber = $achievements[0]->number;
-		my $chainName = $achievements[0]->achievement_id =~ s/^([^_]*_).*$/$1/r;
-		my $chainCount = 0;
-		my $chainStart = 0;
-
-		print CGI::h2($r->maketext('Badges'));
-
-		#Loop through achievements and
-		foreach my $achievement (@achievements) {
-			#skip the level achievements and only show achievements assigned to user
+		my $previousNumber   = $achievements[0]->number;
+		my $chainName        = $achievements[0]->achievement_id =~ s/^([^_]*_).*$/$1/r;
+		my $chainCount       = 0;
+		my $chainStart       = 0;
+
+		# Loop through achievements
+		for my $achievement (@achievements) {
+			# Skip the level achievements and only show achievements assigned to user.
 			last if ($achievement->category eq 'level');
-			next unless ($db->existsUserAchievement($userID,$achievement->achievement_id));
+			next unless ($db->existsUserAchievement($userID, $achievement->achievement_id));
 			next unless $achievement->enabled;
 
-			#separate categories with whitespace
-			if ($previousCategory ne $achievement->category) {
-			print CGI::br();
-			}
-
-			#setup up chain achievements
+			# Setup up chain achievements.
 			my $isChain = 1;
-			if (! $achievement->max_counter ||
-				$achievement->max_counter == 0 ||
-				$previousCategory ne $achievement->category ||
-				$previousNumber + 1 != $achievement->number ||
-				$achievement->achievement_id !~ /^$chainName/ )
+			if (!$achievement->max_counter
+				|| $achievement->max_counter == 0
+				|| $previousCategory ne $achievement->category
+				|| $previousNumber + 1 != $achievement->number
+				|| $achievement->achievement_id !~ /^$chainName/)
 			{
-				$isChain = 0;
+				$isChain    = 0;
 				$chainCount = 0;
-				$chainName = $achievement->achievement_id =~ s/^([^_]*_).*$/$1/r;
+				$chainName  = $achievement->achievement_id =~ s/^([^_]*_).*$/$1/r;
 			}
-			$previousNumber = $achievement->number;
 			$previousCategory = $achievement->category;
+			$previousNumber   = $achievement->number;
 
-			my $userAchievement = $db->getUserAchievement($userID,$achievement->achievement_id);
+			my $userAchievement = $db->getUserAchievement($userID, $achievement->achievement_id);
 
-			#dont show unearned secret achievements
-			next if ($achievement->category eq 'secret' and not $userAchievement->earned);
+			# Don't show unearned secret achievements.
+			next if ($achievement->category eq 'secret' && !$userAchievement->earned);
 
-			#dont show chain achievements (beyond first)
-			$chainCount++ if ($isChain && !$userAchievement->earned);
+			# Don't show chain achievements beyond the first.
+			++$chainCount if $isChain && !$userAchievement->earned;
 			if ($chainCount == 0) {
 				$chainStart = $userAchievement->earned ? 1 : 0;
 			}
-			next if ($isChain && ($chainCount > 1 || ($chainCount == '1' && $chainStart == '0')));
-
-			#print achievement and associated progress bar (if there is one)
-			print CGI::start_div(
-				{
-					class => 'cheevoouterbox d-flex justify-content-start align-items-center mb-3 '
-						. ($userAchievement->earned ? 'unlocked' : 'locked')
-				}
-			);
-
-			my $imgSrc;
-			if ($achievement->{icon}) {
-			$imgSrc = $ce->{courseURLs}->{achievements}."/".$achievement->{icon};
-			} else {
-			$imgSrc = $ce->{webworkURLs}->{htdocs}."/images/defaulticon.png";
-			}
-
-			print CGI::div(CGI::img({src=>$imgSrc, alt=>$userAchievement->earned ? 'Achievement Earned' : 'Achievement Unearned'}));
-			print CGI::start_div({ class => 'ms-3' });
-			print CGI::h3({ class => 'fs-5 mb-1 fw-bold' }, $achievement->name);
-			print CGI::div(CGI::i($r->maketext("[_1] Points:", $achievement->{points})).' '.$achievement->{description});
-
-			if ($achievement->max_counter and not $userAchievement->earned) {
-			my $userCounter = $userAchievement->counter;
-			$userCounter = 0 unless ($userAchievement->counter);
-			my $percentage = int(100*$userCounter/$achievement->max_counter);
-			$percentage = $percentage <= 100 ? $percentage : 100;
-			print CGI::start_div({
-				class      => 'cheevoouterbar mt-1',
-				title      => $r->maketext("[_1]% Complete", $percentage),
-				aria_label => $r->maketext("[_1]% Complete", $percentage),
-				role       => 'figure'
-			});
-			print CGI::div({ class => 'cheevoinnerbar', style => sprintf("width:%i%%;", $percentage) }, '');
-			print CGI::end_div();
-			}
-			print CGI::end_div();
-			print CGI::end_div();
+			next if $isChain && ($chainCount > 1 || ($chainCount == 1 && $chainStart == 0));
 
-			}
-		} else { # no achievements
-		print CGI::p($r->maketext('No achievement badges have been assigned yet.'));
+			push(@visibleAchievements, $achievement);
+			$userAchievements{ $achievement->achievement_id } = $userAchievement;
 		}
+	}
 
-	return "";
-
-}
-
-sub output_JS {
-	my $self = shift;
-	my $ce = $self->r->ce;
-
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/AchievementItems/achievementitems.js'), defer => undef }, '');
-
-	return '';
+	return (achievements => \@visibleAchievements, userAchievements => \%userAchievements);
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/CourseAdmin.pm b/lib/WeBWorK/ContentGenerator/CourseAdmin.pm
index ecf72e043d..2b00aa19a2 100644
--- a/lib/WeBWorK/ContentGenerator/CourseAdmin.pm
+++ b/lib/WeBWorK/ContentGenerator/CourseAdmin.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::CourseAdmin;
-use base qw(WeBWorK::ContentGenerator);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -22,700 +22,262 @@ WeBWorK::ContentGenerator::CourseAdmin - Add, rename, and delete courses.
 
 =cut
 
-use strict;
-use warnings;
-#use CGI qw(-nosticky );
-use WeBWorK::CGI;
-use Data::Dumper;
-use File::Temp qw/tempfile/;
+use Net::IP;    # needed for location management
+use File::Path 'remove_tree';
+use File::stat;
+use Time::localtime;
+
 use WeBWorK::CourseEnvironment;
-use IO::File;
-use URI::Escape;
 use WeBWorK::Debug;
-use WeBWorK::Utils qw(cryptPassword writeLog listFilesRecursive trim_spaces getAssetURL);
+use WeBWorK::Utils qw(cryptPassword writeLog trim_spaces);
 use WeBWorK::Utils::CourseManagement qw(addCourse renameCourse retitleCourse deleteCourse listCourses archiveCourse
-                                        listArchivedCourses unarchiveCourse initNonNativeTables);
+	unarchiveCourse initNonNativeTables);
 use WeBWorK::Utils::CourseIntegrityCheck;
 use WeBWorK::DB;
-#use WeBWorK::Utils::DBImportExport qw(dbExport dbImport);
-# needed for location management
-use Net::IP;
-use File::Path 'remove_tree';
-use File::stat;
-use Time::localtime;
-
-sub pre_header_initialize {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-	my $user        = $r->param('user');
-
-	# check permissions
-	unless ($authz->hasPermissions($user, "create_and_delete_courses")) {
-		$self->addbadmessage("$user is not authorized to create or delete courses");
-		return;
-	}
-
-	# get result and send to message
-	my $status_message = $r->param("status_message");
-	$self->addmessage(CGI::p("$status_message")) if $status_message;
 
+sub pre_header_initialize ($c) {
+	my $ce    = $c->ce;
+	my $db    = $c->db;
+	my $authz = $c->authz;
+	my $user  = $c->param('user');
 
-    # Check that the non-native tables are present in the database
-    # These are the tables which are not course specific
+	return unless $authz->hasPermissions($user, 'create_and_delete_courses');
 
-    my $table_update_result = initNonNativeTables($ce, $ce->{dbLayoutName});
-
-    $self->addgoodmessage(CGI::p("$table_update_result")) if $table_update_result;
+	# Get result and send to message
+	# FIXME: I am pretty sure this is not used anymore. All methods add their messages directly to the page except the
+	# table messages, and those are added below and not here.
+	my $status_message = $c->param('status_message');
+	$c->addmessage($c->tag('p', $c->b($status_message))) if $status_message;
 
+	# Check that the non-native tables are present in the database.
+	# These are the tables which are not course specific.
+	my @table_update_messages = initNonNativeTables($ce, $ce->{dbLayoutName});
+	$c->addgoodmessage($c->c(@table_update_messages)->join($c->tag('br'))) if @table_update_messages;
 
 	my @errors;
 	my $method_to_call;
 
-	my $subDisplay = $r->param("subDisplay");
+	my $subDisplay = $c->param('subDisplay');
 	if (defined $subDisplay) {
-
-		if ($subDisplay eq "add_course") {
-			if (defined $r->param("add_course")) {
-				@errors = $self->add_course_validate;
+		if ($subDisplay eq 'add_course') {
+			if (defined $c->param('add_course')) {
+				@errors = $c->add_course_validate;
 				if (@errors) {
-					$method_to_call = "add_course_form";
+					$method_to_call = 'add_course_form';
 				} else {
-					$method_to_call = "do_add_course";
+					$method_to_call = 'do_add_course';
 				}
 			} else {
-				$method_to_call = "add_course_form";
+				$method_to_call = 'add_course_form';
 			}
-		}
-
-		elsif ($subDisplay eq "rename_course") {
-			if (defined $r->param("rename_course")) {
-				@errors = $self->rename_course_validate;
+		} elsif ($subDisplay eq 'rename_course') {
+			if (defined $c->param('rename_course')) {
+				@errors = $c->rename_course_validate;
 				if (@errors) {
-					$method_to_call = "rename_course_form";
+					$method_to_call = 'rename_course_form';
 				} else {
-					$method_to_call = "rename_course_confirm";
+					$method_to_call = 'rename_course_confirm';
 				}
-			} elsif (defined $r->param("confirm_rename_course")) {
-				# validate and rename
-				@errors = $self->rename_course_validate;
+			} elsif (defined $c->param('confirm_rename_course')) {
+				@errors = $c->rename_course_validate;
 				if (@errors) {
-					$method_to_call = "rename_course_form";
+					$method_to_call = 'rename_course_form';
 				} else {
-					$method_to_call = "do_rename_course";
+					$method_to_call = 'do_rename_course';
 				}
-			} elsif (defined $r->param("confirm_retitle_course")) {
-				    $method_to_call = "do_retitle_course";
+			} elsif (defined $c->param('confirm_retitle_course')) {
+				$method_to_call = 'do_retitle_course';
 
-			} elsif (defined $r->param("upgrade_course_tables") ){
-			    # upgrade and revalidate
-			    @errors = $self->rename_course_validate;
+			} elsif (defined $c->param('upgrade_course_tables')) {
+				@errors = $c->rename_course_validate;
 				if (@errors) {
-					$method_to_call = "rename_course_form";
+					$method_to_call = 'rename_course_form';
 				} else {
-					$method_to_call = "rename_course_confirm";
+					$method_to_call = 'rename_course_confirm';
 				}
-
 			} else {
-				$method_to_call = "rename_course_form";
+				$method_to_call = 'rename_course_form';
 			}
-		}
-
-		elsif ($subDisplay eq "delete_course") {
-			if (defined $r->param("delete_course")) {
-				# validate or confirm
-				@errors = $self->delete_course_validate;
+		} elsif ($subDisplay eq 'delete_course') {
+			if (defined $c->param('delete_course')) {
+				@errors = $c->delete_course_validate;
 				if (@errors) {
-					$method_to_call = "delete_course_form";
+					$method_to_call = 'delete_course_form';
 				} else {
-					$method_to_call = "delete_course_confirm";
+					$method_to_call = 'delete_course_confirm';
 				}
-			} elsif (defined $r->param("confirm_delete_course")) {
-				# validate and delete
-				@errors = $self->delete_course_validate;
+			} elsif (defined $c->param('confirm_delete_course')) {
+				@errors = $c->delete_course_validate;
 				if (@errors) {
-					$method_to_call = "delete_course_form";
+					$method_to_call = 'delete_course_form';
 				} else {
-					$method_to_call = "do_delete_course";
+					$method_to_call = 'do_delete_course';
 				}
-			}
-			elsif (defined ($r->param("delete_course_refresh"))) {
-				$method_to_call = "delete_course_form";
+			} elsif (defined($c->param('delete_course_refresh'))) {
+				$method_to_call = 'delete_course_form';
 			} else {
-				# form only
-				$method_to_call = "delete_course_form";
+				$method_to_call = 'delete_course_form';
 			}
-		}
-
-		elsif ($subDisplay eq "export_database") {
-			if (defined $r->param("export_database")) {
-				@errors = $self->export_database_validate;
+		} elsif ($subDisplay eq 'archive_course') {
+			if (defined $c->param('archive_course') || defined $c->param('skip_archive_course')) {
+				@errors = $c->archive_course_validate;
 				if (@errors) {
-					$method_to_call = "export_database_form";
+					$method_to_call = 'archive_course_form';
 				} else {
-					# we have to do something special here, since we're sending
-					# the database as we export it. $method_to_call still gets
-					# set here, but it gets caught by header() and content()
-					# below instead of by body().
-					$method_to_call = "do_export_database";
+					$method_to_call = 'archive_course_confirm';
 				}
-			} else {
-				$method_to_call = "export_database_form";
-			}
-		}
-
-		elsif ($subDisplay eq "import_database") {
-			if (defined $r->param("import_database")) {
-				@errors = $self->import_database_validate;
+			} elsif (defined $c->param('confirm_archive_course')) {
+				@errors = $c->archive_course_validate;
 				if (@errors) {
-					$method_to_call = "import_database_form";
+					$method_to_call = 'archive_course_form';
 				} else {
-					$method_to_call = "do_import_database";
+					$method_to_call = 'do_archive_course';
 				}
+			} elsif (defined $c->param('upgrade_course_tables')) {
+				@errors = $c->archive_course_validate;
+				if (@errors) {
+					$method_to_call = 'archive_course_form';
+				} else {
+					$method_to_call = 'archive_course_confirm';
+				}
+			} elsif (defined($c->param('archive_course_refresh'))) {
+				$method_to_call = 'archive_course_form';
 			} else {
-				$method_to_call = "import_database_form";
+				$method_to_call = 'archive_course_form';
 			}
-		}
-
-		elsif ($subDisplay eq "archive_course") {
-		  if (defined $r->param("archive_course") ||
-		      defined $r->param("skip_archive_course")) {
-
-		    # validate -- if invalid, start over.
-		    # if form is valid a page indicating the status of
-		    # database tables and directories is presented.
-		    # If they are ok, then you can push archive button, otherwise
-		    # you can quit or choose to upgrade the tables
-		    @errors = $self->archive_course_validate;
-		    if (@errors) {
-		      $method_to_call = "archive_course_form";
-		    } else {
-		      $method_to_call = "archive_course_confirm"; #check tables & directories
-		    }
-		  } elsif (defined $r->param("confirm_archive_course")) {
-		    # validate and archive
-		    # the "archive it" button has been pushed and the
-		    # course will be archived
-		    # a report on success or failure will be generated
-		    @errors = $self->archive_course_validate;
-		    if (@errors) {
-		      $method_to_call = "archive_course_form";
-		    } else {
-		      $method_to_call = "do_archive_course";
-		    }
-		  } elsif (defined $r->param("upgrade_course_tables") ){
-		    # upgrade and revalidate
-		    # the "upgrade course" button has been pushed
-		    # after the course has been upgraded you are returned
-		    # to the confirm page.
-		    @errors = $self->archive_course_validate;
-		    if (@errors) {
-		      $method_to_call = "archive_course_form";
-		    } else {
-		      $method_to_call = "archive_course_confirm"; # upgrade and recheck tables & directories.
-		    }
-		  }
-		  elsif (defined ($r->param("archive_course_refresh"))) {
-		    $method_to_call = "archive_course_form";
-		  } else {
-		    # form only
-		    $method_to_call = "archive_course_form";
-		  }
-		}
-		elsif ($subDisplay eq "unarchive_course") {
-			if (defined $r->param("unarchive_course")) {
-				# validate or confirm
-				@errors = $self->unarchive_course_validate;
+		} elsif ($subDisplay eq 'unarchive_course') {
+			if (defined $c->param('unarchive_course')) {
+				@errors = $c->unarchive_course_validate;
 				if (@errors) {
-					$method_to_call = "unarchive_course_form";
+					$method_to_call = 'unarchive_course_form';
 				} else {
-					$method_to_call = "unarchive_course_confirm";
+					$method_to_call = 'unarchive_course_confirm';
 				}
-			} elsif (defined $r->param("confirm_unarchive_course")) {
-				# validate and archive
-				@errors = $self->unarchive_course_validate;
+			} elsif (defined $c->param('confirm_unarchive_course')) {
+				@errors = $c->unarchive_course_validate;
 				if (@errors) {
-					$method_to_call = "unarchive_course_form";
+					$method_to_call = 'unarchive_course_form';
 				} else {
-					$method_to_call = "do_unarchive_course";
+					$method_to_call = 'do_unarchive_course';
 				}
 			} else {
-				# form only
-				# start at the beginning -- get drop down list of courses to unarchive
-				$method_to_call = "unarchive_course_form";
+				$method_to_call = 'unarchive_course_form';
 			}
-		}
-		elsif ($subDisplay eq "upgrade_course") {
-			if (defined $r->param("upgrade_course")) {
-				# validate or confirm
-				# if form is valid present details of analysis of the course structure
-				@errors = $self->upgrade_course_validate;
+		} elsif ($subDisplay eq 'upgrade_course') {
+			if (defined $c->param('upgrade_course')) {
+				@errors = $c->upgrade_course_validate;
 				if (@errors) {
-					$method_to_call = "upgrade_course_form";
+					$method_to_call = 'upgrade_course_form';
 				} else {
-					$method_to_call = "upgrade_course_confirm";
+					$method_to_call = 'upgrade_course_confirm';
 				}
-			} elsif (defined $r->param("confirm_upgrade_course")) {
-				# validate and upgrade
-				# if form is valid upgrade the courses and present results
-				@errors = $self->upgrade_course_validate;
+			} elsif (defined $c->param('confirm_upgrade_course')) {
+				@errors = $c->upgrade_course_validate;
 				if (@errors) {
-					$method_to_call = "upgrade_course_form";
+					$method_to_call = 'upgrade_course_form';
 				} else {
-					$method_to_call = "do_upgrade_course";
+					$method_to_call = 'do_upgrade_course';
 				}
 			} else {
-				# form only
-				# start at the beginning -- get list of courses and their status
-				$method_to_call = "upgrade_course_form";
-			}
-		}
-		elsif ($subDisplay eq "manage_locations") {
-			if (defined ($r->param("manage_location_action"))) {
-				$method_to_call =
-				    $r->param("manage_location_action");
+				$method_to_call = 'upgrade_course_form';
 			}
-			else{
-				$method_to_call = "manage_location_form";
+		} elsif ($subDisplay eq 'manage_locations') {
+			if (defined($c->param('manage_location_action'))) {
+				$method_to_call = $c->param('manage_location_action');
+			} else {
+				$method_to_call = 'manage_location_form';
 			}
-		}
-		elsif ($subDisplay eq "hide_inactive_course") {
-#			warn "subDisplay is $subDisplay";
-			if (defined ($r->param("hide_course"))) {
-				@errors = $self->hide_course_validate;
+		} elsif ($subDisplay eq 'hide_inactive_course') {
+			if (defined($c->param('hide_course'))) {
+				@errors = $c->hide_course_validate;
 				if (@errors) {
-					$method_to_call = "hide_inactive_course_form";
+					$method_to_call = 'hide_inactive_course_form';
 				} else {
-				$method_to_call = "do_hide_inactive_course";
-			  }
-			}
-			elsif (defined ($r->param("unhide_course"))) {
-				@errors = $self->unhide_course_validate;
+					$method_to_call = 'do_hide_inactive_course';
+				}
+			} elsif (defined($c->param('unhide_course'))) {
+				@errors = $c->unhide_course_validate;
 				if (@errors) {
-					$method_to_call = "hide_inactive_course_form";
+					$method_to_call = 'hide_inactive_course_form';
 				} else {
-				$method_to_call = "do_unhide_inactive_course";
-			  }
-			}
-			elsif (defined ($r->param("hide_course_refresh"))) {
-				$method_to_call = "hide_inactive_course_form";
-			}
-			else{
-				$method_to_call = "hide_inactive_course_form";
-			}
-		}
-		elsif ($subDisplay eq "registration") {
-			if (defined ($r->param("register_site"))) {
-				$method_to_call =  "do_registration";
+					$method_to_call = 'do_unhide_inactive_course';
+				}
+			} elsif (defined($c->param('hide_course_refresh'))) {
+				$method_to_call = 'hide_inactive_course_form';
+			} else {
+				$method_to_call = 'hide_inactive_course_form';
 			}
-			else{
-				$method_to_call = "registration_form";
+		} elsif ($subDisplay eq 'registration') {
+			if (defined($c->param('register_site'))) {
+				$method_to_call = 'do_registration';
 			}
+		} else {
+			@errors = "Unrecognized sub-display @{[ $c->tag('b', $subDisplay) ]}.";
 		}
-		else {
-			@errors = "Unrecognized sub-display @{[ CGI::b($subDisplay) ]}.";
-		}
-	}
-
-	$self->{errors} = \@errors;
-	$self->{method_to_call} = $method_to_call;
-}
-
-sub body {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-
-	my $user = $r->param('user');
-
-	# check permissions
-	unless ($authz->hasPermissions($user, "create_and_delete_courses")) {
-		return "";
-	}
-	my $method_to_call = $self->{method_to_call};
-	my $methodMessage ="";
-
-	(defined($method_to_call) and $method_to_call eq "do_export_database") && do {
-	    my @export_courseID = $r->param("export_courseID");
-	    my $course_ids = join(", ", @export_courseID);
-		$methodMessage  = CGI::p("Exporting database for course(s) $course_ids").
-		CGI::p(".... please wait....
-		If your browser times out you will
-		still be able to download the exported database using the
-		file manager.").CGI::hr();
-	};
-
-	print CGI::ul(
-		{ class => 'nav nav-pills justify-content-center my-2' },
-		map {
-			CGI::li(
-				{ class => 'nav-item' },
-				CGI::a(
-					{
-						href  => $self->systemLink($urlpath, params => { subDisplay => $_->[0], %{ $_->[2] // {} } }),
-						class => 'nav-link' . (($r->param('subDisplay') // '') eq $_->[0] ? ' active' : '')
-					},
-					$_->[1]
-				)
-			)
-		} (
-			[
-				'add_course',
-				$r->maketext('Add Course'),
-				{
-					add_admin_users      => 1,
-					add_config_file      => 1,
-					add_dbLayout         => 'sql_single',
-					add_templates_course => $ce->{siteDefaults}->{default_templates_course} || ''
-				}
-			],
-			[ 'rename_course',        $r->maketext('Rename Course') ],
-			[ 'delete_course',        $r->maketext('Delete Course') ],
-			[ 'archive_course',       $r->maketext('Archive Course') ],
-			[ 'unarchive_course',     $r->maketext('Unarchive Course') ],
-			[ 'upgrade_course',       $r->maketext('Upgrade Courses') ],
-			[ 'manage_locations',     $r->maketext('Manage Locations') ],
-			[ 'hide_inactive_course', $r->maketext('Hide Courses') ],
-		)
-	);
-
-	print CGI::hr({ class => 'mt-0' });
-	print $methodMessage;
-
-	print $self->display_registration_form;
-
-	my @errors = @{$self->{errors}};
-
-
-	if (@errors) {
-		print CGI::div(
-			{ class => 'alert alert-danger p-1 mb-2' },
-			CGI::div({ class => 'mb-1' }, $r->maketext("Please correct the following errors and try again:")),
-			CGI::ul({ class => 'mb-1' }, CGI::li(\@errors)),
-		);
 	}
 
-	if (defined $method_to_call and $method_to_call ne "") {
-		$self->$method_to_call;
-	} else {
-		    my $msg = "";
-	    	$msg .= CGI::li($r->maketext("unable to write to directory [_1]", $ce->{webworkDirs}{logs}))  unless -w $ce->{webworkDirs}{logs};
-	    	$msg .=  CGI::li($r->maketext("unable to write to directory [_1]", $ce->{webworkDirs}{tmp}))  unless -w $ce->{webworkDirs}{tmp};
-	    	$msg .=  CGI::li($r->maketext("unable to write to directory [_1]", $ce->{webworkDirs}{DATA}))  unless -w $ce->{webworkDirs}{DATA};
-	    	if ($msg) {
-		  print CGI::h2($r->maketext("Directory permission errors ")).CGI::ul($msg).
-		    CGI::p($r->maketext("The webwork server must be able to write to these directories. Please correct the permssion errors.")) ;
-			}
-
-		print $self->upgrade_notification();
-
-		print CGI::h2($r->maketext("Courses"));
-
-		print CGI::start_ol();
-
-		my @courseIDs = listCourses($ce);
-		foreach my $courseID (sort {lc($a) cmp lc($b) } @courseIDs) {
-			next if $courseID eq "admin"; # done already above
-			next if $courseID eq "modelCourse"; # modelCourse isn't a real course so don't create missing directories, etc
- 			my $urlpath = $r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets", $r, courseID => $courseID);
-			print CGI::li(CGI::a({href=>$self->systemLink($urlpath, authen => 0)}, $courseID));
-		}
-
-		print CGI::end_ol();
-
-		print CGI::h2($r->maketext("Archived Courses"));
-		print CGI::start_ol();
-
-		@courseIDs = listArchivedCourses($ce);
-		foreach my $courseID (sort {lc($a) cmp lc($b) } @courseIDs) {
-			print CGI::li($courseID),
-		}
+	$c->{errors}         = \@errors;
+	$c->{method_to_call} = $method_to_call;
 
-		print CGI::end_ol();
-	}
-	return "";
+	return;
 }
 
-################################################################################
-
-sub add_course_form {
-	my ($self) = @_;
-	my $r      = $self->r;
-	my $ce     = $r->ce;
-
-	my @existingCourses = sort { lc($a) cmp lc($b) } listCourses($ce);    # make sort case insensitive
-	unshift(@existingCourses, @{ $ce->{modelCoursesForCopy} });
-
-	print CGI::h2($r->maketext('Add Course'));
-
-	print CGI::start_form({ method => 'POST', action => $r->uri });
-	print $self->hidden_authen_fields;
-	print $self->hidden_fields('subDisplay');
-
-	print CGI::p($r->maketext(
-		'Specify an ID, title, and institution for the new course. The course ID may contain only letters, '
-			. 'numbers, hyphens, and underscores, and may have at most [_1] characters.',
-		$ce->{maxCourseIdLength}
-	));
-
-	print CGI::div(
-		{ class => 'row mb-2' },
-		CGI::div(
-			{ class => 'col-lg-8 col-md-10' },
-			CGI::div(
-				{ class => 'form-floating mb-1' },
-				CGI::textfield({
-					name        => 'add_courseID',
-					id          => 'add_courseID',
-					value       => trim_spaces($r->param('add_courseID')) || '',
-					placeholder => '',
-					class       => 'form-control'
-				}),
-				CGI::label({ for => 'add_courseID' }, $r->maketext('Course ID'))
-			),
-			CGI::div(
-				{ class => 'form-floating mb-1' },
-				CGI::textfield({
-					name        => 'add_courseTitle',
-					id          => 'add_courseTitle',
-					value       => trim_spaces($r->param('add_courseTitle')) || '',
-					placeholder => '',
-					class       => 'form-control'
-				}),
-				CGI::label({ for => 'add_courseTitle' }, $r->maketext('Course Title'))
-			),
-			CGI::div(
-				{ class => 'form-floating mb-1' },
-				CGI::textfield({
-					name        => 'add_courseInstitution',
-					id          => 'add_courseInstitution',
-					value       => trim_spaces($r->param('add_courseInstitution')) || '',
-					placeholder => '',
-					class       => 'form-control'
-				}),
-				CGI::label({ for => 'add_courseInstitution' }, $r->maketext('Institution'))
-			)
-		)
-	);
-
-	print CGI::div(
-		{ class => 'mb-3' },
-		CGI::div(
-			{ class => 'mb-1' },
-			$r->maketext(
-				'To add the WeBWorK administrators to the new course (as administrators) check the box below.')
-		),
-		CGI::div(
-			{ class => 'form-check mb-2' },
-			CGI::checkbox({
-				name            => 'add_admin_users',
-				label           => $r->maketext('Add WeBWorK administrators to new course'),
-				checked         => trim_spaces($r->param('add_admin_users')) || 0,
-				class           => 'form-check-input',
-				labelattributes => { class => 'form-check-label' }
-			})
-		),
-		CGI::div(
-			{ class => 'form-check' },
-			CGI::checkbox({
-				name            => 'add_config_file',
-				label           => $r->maketext('Copy simple configuration file to new course'),
-				checked         => trim_spaces($r->param('add_config_file')) || 0,
-				class           => 'form-check-input',
-				labelattributes => { class => 'form-check-label' }
-			})
-		)
-	);
-
-	print CGI::div(
-		{ class => 'mb-2' },
-		$r->maketext(
-			'To add an additional instructor to the new course, specify user information below. '
-				. 'The user ID may contain only numbers, letters, hyphens, periods (dots), commas,and underscores.'
-		)
-	);
-
-	print CGI::div(
-		{ class => 'row mb-2' },
-		CGI::div(
-			{ class => 'col-lg-4 col-md-5 col-sm-6' },
-			CGI::div(
-				{ class => 'form-floating mb-1' },
-				CGI::textfield({
-					name        => 'add_initial_userID',
-					id          => 'add_initial_userID',
-					value       => trim_spaces($r->param('add_initial_userID')) || '',
-					placeholder => '',
-					class       => 'form-control'
-				}),
-				CGI::label({ for => 'add_initial_userID' }, $r->maketext('User ID'))
-			),
-			CGI::div(
-				{ class => 'form-floating mb-1' },
-				CGI::password_field({
-					name        => 'add_initial_password',
-					id          => 'add_initial_password',
-					value       => trim_spaces($r->param('add_initial_password')) || '',
-					placeholder => '',
-					class       => 'form-control'
-				}),
-				CGI::label({ for => 'add_initial_password' }, $r->maketext('Password'))
-			),
-			CGI::div(
-				{ class => 'form-floating mb-1' },
-				CGI::password_field({
-					name        => 'add_initial_confirmPassword',
-					id          => 'add_initial_confirmPassword',
-					value       => trim_spaces($r->param('add_initial_confirmPassword')) || '',
-					placeholder => '',
-					class       => 'form-control'
-				}),
-				CGI::label({ for => 'add_initial_confirmPassword' }, $r->maketext('Confirm Password'))
-			)
-		),
-		CGI::div(
-			{ class => 'col-lg-4 col-md-5 col-sm-6' },
-			CGI::div(
-				{ class => 'form-floating mb-1' },
-				CGI::textfield({
-					name        => 'add_initial_firstName',
-					id          => 'add_initial_firstName',
-					value       => trim_spaces($r->param('add_initial_firstName')) || '',
-					placeholder => '',
-					class       => 'form-control'
-				}),
-				CGI::label({ for => 'add_initial_firstName' }, $r->maketext('First Name'))
-			),
-			CGI::div(
-				{ class => 'form-floating mb-1' },
-				CGI::textfield({
-					name        => 'add_initial_lastName',
-					id          => 'add_initial_lastName',
-					value       => trim_spaces($r->param('add_initial_lastName')) || '',
-					placeholder => '',
-					class       => 'form-control'
-				}),
-				CGI::label({ for => 'add_initial_lastName' }, $r->maketext('Last Name'))
-			),
-			CGI::div(
-				{ class => 'form-floating mb-1' },
-				CGI::textfield({
-					name        => 'add_initial_email',
-					id          => 'add_initial_email',
-					value       => trim_spaces($r->param('add_initial_email')) || '',
-					placeholder => '',
-					class       => 'form-control'
-				}),
-				CGI::label({ for => 'add_initial_email' }, $r->maketext('Email Address'))
-			)
-		)
-	);
-
-	print CGI::div({ class => 'mb-1' },
-		$r->maketext('To copy problem templates from an existing course, select the course below.'));
-
-	print CGI::div(
-		{ class => 'row mb-3' },
-		CGI::label(
-			{ for => 'add_templates_course', class => 'col-auto col-form-label fw-bold' },
-			$r->maketext('Copy templates from:')
-		),
-		CGI::div(
-			{ class => 'col-auto' },
-			CGI::popup_menu({
-				name    => 'add_templates_course',
-				id      => 'add_templates_course',
-				values  => [ '', @existingCourses ],
-				labels  => { '' => $r->maketext('No Course'), map { $_ => $_ } @existingCourses },
-				default => trim_spaces($r->param('add_templates_course')) || '',
-				class   => 'form-select'
-			})
-		)
-	);
-
-	print CGI::input({ type => 'hidden', name => 'add_dbLayout', value => 'sql_single' });
-
-	print CGI::submit({ name => 'add_course', label => $r->maketext('Add Course'), class => 'btn btn-primary' });
-
-	print CGI::end_form();
+sub add_course_form ($c) {
+	return $c->include('ContentGenerator/CourseAdmin/add_course_form');
 }
 
-sub add_course_validate {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	#my $db = $r->db;
-	#my $authz = $r->authz;
-	#my $urlpath = $r->urlpath;
-
+sub add_course_validate ($c) {
+	my $ce = $c->ce;
 
-	my $add_courseID                     = trim_spaces( $r->param("add_courseID") ) || "";
-	my $add_courseTitle                  = trim_spaces( $r->param("add_courseTitle") ) || "";
-	my $add_courseInstitution            = trim_spaces( $r->param("add_courseInstitution") ) || "";
-
-	my $add_admin_users                  = trim_spaces( $r->param("add_admin_users") ) || "";
-
-	my $add_initial_userID               = trim_spaces( $r->param("add_initial_userID") ) || "";
-	my $add_initial_password             = trim_spaces( $r->param("add_initial_password") ) || "";
-	my $add_initial_confirmPassword      = trim_spaces( $r->param("add_initial_confirmPassword") ) || "";
-	my $add_initial_firstName            = trim_spaces( $r->param("add_initial_firstName") ) || "";
-	my $add_initial_lastName             = trim_spaces( $r->param("add_initial_lastName") ) || "";
-	my $add_initial_email                = trim_spaces( $r->param("add_initial_email") ) || "";
-	my $add_templates_course             = trim_spaces( $r->param("add_templates_course") ) || "";
-	my $add_config_file                  = trim_spaces( $r->param("add_config_file") ) || "";
-	my $add_dbLayout                     = trim_spaces( $r->param("add_dbLayout") ) || "";
-
-
-
-
-	######################
+	my $add_courseID                = trim_spaces($c->param('add_courseID'))                || '';
+	my $add_initial_userID          = trim_spaces($c->param('add_initial_userID'))          || '';
+	my $add_initial_password        = trim_spaces($c->param('add_initial_password'))        || '';
+	my $add_initial_confirmPassword = trim_spaces($c->param('add_initial_confirmPassword')) || '';
+	my $add_initial_firstName       = trim_spaces($c->param('add_initial_firstName'))       || '';
+	my $add_initial_lastName        = trim_spaces($c->param('add_initial_lastName'))        || '';
+	my $add_initial_email           = trim_spaces($c->param('add_initial_email'))           || '';
+	my $add_dbLayout                = trim_spaces($c->param('add_dbLayout'))                || '';
 
 	my @errors;
 
-	if ($add_courseID eq "") {
-		push @errors, $r->maketext("You must specify a course ID.");
+	if ($add_courseID eq '') {
+		push @errors, $c->maketext('You must specify a course ID.');
 	}
-	unless ($add_courseID =~ /^[\w-]*$/) { # regex copied from CourseAdministration.pm
-		push @errors, $r->maketext("Course ID may only contain letters, numbers, hyphens, and underscores.");
+	unless ($add_courseID =~ /^[\w-]*$/) {    # regex copied from CourseAdministration.pm
+		push @errors, $c->maketext('Course ID may only contain letters, numbers, hyphens, and underscores.');
 	}
 	if (grep { $add_courseID eq $_ } listCourses($ce)) {
-		push @errors, $r->maketext("A course with ID [_1] already exists.", $add_courseID);
+		push @errors, $c->maketext('A course with ID [_1] already exists.', $add_courseID);
 	}
-	if ( length($add_courseID) > $ce->{maxCourseIdLength} ) {
-                push @errors, $r->maketext("Course ID cannot exceed [_1] characters.", $ce->{maxCourseIdLength});
+	if (length($add_courseID) > $ce->{maxCourseIdLength}) {
+		push @errors, $c->maketext('Course ID cannot exceed [_1] characters.', $ce->{maxCourseIdLength});
 	}
 
-	if ($add_initial_userID ne "") {
-		if ($add_initial_password eq "") {
-			push @errors, $r->maketext("You must specify a password for the initial instructor.");
+	if ($add_initial_userID ne '') {
+		if ($add_initial_password eq '') {
+			push @errors, $c->maketext('You must specify a password for the initial instructor.');
 		}
-		if ($add_initial_confirmPassword eq "") {
-			push @errors, $r->maketext("You must confirm the password for the initial instructor.");
+		if ($add_initial_confirmPassword eq '') {
+			push @errors, $c->maketext('You must confirm the password for the initial instructor.');
 		}
 		if ($add_initial_password ne $add_initial_confirmPassword) {
-			push @errors, $r->maketext("The password and password confirmation for the instructor must match.");
+			push @errors, $c->maketext('The password and password confirmation for the instructor must match.');
 		}
-		if ($add_initial_firstName eq "") {
-			push @errors, $r->maketext("You must specify a first name for the initial instructor.");
+		if ($add_initial_firstName eq '') {
+			push @errors, $c->maketext('You must specify a first name for the initial instructor.');
 		}
-		if ($add_initial_lastName eq "") {
-			push @errors, $r->maketext("You must specify a last name for the initial instructor.");
+		if ($add_initial_lastName eq '') {
+			push @errors, $c->maketext('You must specify a last name for the initial instructor.');
 		}
-		if ($add_initial_email eq "") {
-			push @errors, $r->maketext("You must specify an email address for the initial instructor.");
+		if ($add_initial_email eq '') {
+			push @errors, $c->maketext('You must specify an email address for the initial instructor.');
 		}
 	}
 
-	if ($add_dbLayout eq "") {
-		push @errors, "You must select a database layout.";
+	if ($add_dbLayout eq '') {
+		push @errors, 'You must select a database layout.';
 	} else {
-		if (exists $ce->{dbLayouts}->{$add_dbLayout}) {
+		if (exists $ce->{dbLayouts}{$add_dbLayout}) {
 			# we used to check for layout-specific fields here, but there aren't any layouts that require them
 			# anymore. (in the future, we'll probably deal with this in layout-specific modules.)
 		} else {
@@ -726,71 +288,54 @@ sub add_course_validate {
 	return @errors;
 }
 
-sub do_add_course {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-
-	my $add_courseID                     = trim_spaces( $r->param("add_courseID") ) || "";
-	my $add_courseTitle                  = trim_spaces( $r->param("add_courseTitle") ) || "";
-	my $add_courseInstitution            = trim_spaces( $r->param("add_courseInstitution") ) || "";
-
-	my $add_admin_users                  = trim_spaces( $r->param("add_admin_users") ) || "";
+sub do_add_course ($c) {
+	my $ce    = $c->ce;
+	my $db    = $c->db;
+	my $authz = $c->authz;
 
-	my $add_initial_userID               = trim_spaces( $r->param("add_initial_userID") ) || "";
-	my $add_initial_password             = trim_spaces( $r->param("add_initial_password") ) || "";
-	my $add_initial_confirmPassword      = trim_spaces( $r->param("add_initial_confirmPassword") ) || "";
-	my $add_initial_firstName            = trim_spaces( $r->param("add_initial_firstName") ) || "";
-	my $add_initial_lastName             = trim_spaces( $r->param("add_initial_lastName") ) || "";
-	my $add_initial_email                = trim_spaces( $r->param("add_initial_email") ) || "";
+	my $add_courseID          = trim_spaces($c->param('add_courseID'))          || '';
+	my $add_courseTitle       = trim_spaces($c->param('add_courseTitle'))       || '';
+	my $add_courseInstitution = trim_spaces($c->param('add_courseInstitution')) || '';
 
-	my $add_templates_course             = trim_spaces( $r->param("add_templates_course") ) || "";
-	my $add_config_file                  = trim_spaces( $r->param("add_config_file") ) || "";
+	my $add_admin_users = trim_spaces($c->param('add_admin_users')) || '';
 
-	my $add_dbLayout                     = trim_spaces( $r->param("add_dbLayout") ) || "";
+	my $add_initial_userID          = trim_spaces($c->param('add_initial_userID'))          || '';
+	my $add_initial_password        = trim_spaces($c->param('add_initial_password'))        || '';
+	my $add_initial_confirmPassword = trim_spaces($c->param('add_initial_confirmPassword')) || '';
+	my $add_initial_firstName       = trim_spaces($c->param('add_initial_firstName'))       || '';
+	my $add_initial_lastName        = trim_spaces($c->param('add_initial_lastName'))        || '';
+	my $add_initial_email           = trim_spaces($c->param('add_initial_email'))           || '';
 
-	my $ce2 = new WeBWorK::CourseEnvironment({
-		%WeBWorK::SeedCE,
-		courseName => $add_courseID,
-	});
+	my $add_templates_course = trim_spaces($c->param('add_templates_course')) || '';
+	my $add_config_file      = trim_spaces($c->param('add_config_file'))      || '';
 
-	my %courseOptions = ( dbLayoutName => $add_dbLayout );
+	my $add_dbLayout = trim_spaces($c->param('add_dbLayout')) || '';
 
-	if ($add_initial_email ne "") {
-		$courseOptions{allowedRecipients} = [ $add_initial_email ];
-		# don't set feedbackRecipients -- this just gets in the way of the more
-		# intelligent "receive_recipients" method.
-		#$courseOptions{feedbackRecipients} = [ $add_initial_email ];
-	}
+	my $ce2 = WeBWorK::CourseEnvironment->new({ courseName => $add_courseID });
 
-	# this is kinda left over from when we had 'gdbm' and 'sql' database layouts
-	# below this line, we would grab values from getopt and put them in this hash
-	# but for now the hash can remain empty
-	my %dbOptions;
+	my %courseOptions = (dbLayoutName => $add_dbLayout);
 
 	my @users;
 
 	# copy users from current (admin) course if desired
-	if ($add_admin_users ne "") {
+	if ($add_admin_users ne '') {
+		for my $userID ($db->listUsers) {
+			if ($userID eq $add_initial_userID) {
+				$c->addbadmessage($c->maketext(
+					'User "[_1]" will not be copied from admin course as it is the initial instructor.', $userID
+				));
+				next;
+			}
+			my $PermissionLevel = $db->newPermissionLevel();
+			$PermissionLevel->user_id($userID);
+			$PermissionLevel->permission($ce->{userRoles}{admin});
+			my $User     = $db->getUser($userID);
+			my $Password = $db->getPassword($userID);
+			$User->status('O');    # Add admin user as an observer.
 
-	    foreach my $userID ($db->listUsers) {
-		if ($userID eq $add_initial_userID) {
-		    $self->addbadmessage($r->maketext("User '[_1]' will not be copied from admin course as it is the initial instructor.",$userID));
-		    next;
+			push @users, [ $User, $Password, $PermissionLevel ]
+				if $authz->hasPermissions($userID, 'create_and_delete_courses');
 		}
-		my $PermissionLevel = $db->newPermissionLevel();
-		$PermissionLevel->user_id($userID);
-		$PermissionLevel->permission($ce->{userRoles}->{admin});
-		my $User            = $db->getUser($userID);
-		my $Password        = $db->getPassword($userID);
-
-		push @users, [ $User, $Password, $PermissionLevel ]
-		    if $authz->hasPermissions($userID,"create_and_delete_courses");
-		#only transfer the "instructors" in the admin course classlist.
-	    }
 	}
 
 	# add initial instructor if desired
@@ -801,7 +346,7 @@ sub do_add_course {
 			last_name     => $add_initial_lastName,
 			student_id    => $add_initial_userID,
 			email_address => $add_initial_email,
-			status        => "C",
+			status        => 'O',
 		);
 		my $Password = $db->newPassword(
 			user_id  => $add_initial_userID,
@@ -809,79 +354,81 @@ sub do_add_course {
 		);
 		my $PermissionLevel = $db->newPermissionLevel(
 			user_id    => $add_initial_userID,
-			permission => "10",
+			permission => '10',
 		);
 		push @users, [ $User, $Password, $PermissionLevel ];
 	}
 
-	push @{$courseOptions{PRINT_FILE_NAMES_FOR}}, map { $_->[0]->user_id } @users;
+	push @{ $courseOptions{PRINT_FILE_NAMES_FOR} }, map { $_->[0]->user_id } @users;
 
-	# include any optional arguments, including a template course and the
-	# course title and course institution.
+	# Include any optional arguments, including a template course and the course title and course institution.
 	my %optional_arguments;
-	if ($add_templates_course ne "") {
+	if ($add_templates_course ne '') {
 		$optional_arguments{templatesFrom} = $add_templates_course;
 	}
-	if ($add_config_file ne "") {
+	if ($add_config_file ne '') {
 		$optional_arguments{copySimpleConfig} = $add_config_file;
 	}
-	if ($add_courseTitle ne "") {
+	if ($add_courseTitle ne '') {
 		$optional_arguments{courseTitle} = $add_courseTitle;
 	}
-	if ($add_courseInstitution ne "") {
+	if ($add_courseInstitution ne '') {
 		$optional_arguments{courseInstitution} = $add_courseInstitution;
 	}
 
+	my $output = $c->c;
+
 	eval {
 		addCourse(
 			courseID      => $add_courseID,
 			ce            => $ce2,
 			courseOptions => \%courseOptions,
-			dbOptions     => \%dbOptions,
 			users         => \@users,
 			%optional_arguments,
 		);
 	};
 	if ($@) {
 		my $error = $@;
-		print CGI::div(
-			{ class => 'alert alert-danger p-1 mb-2' },
-			CGI::p("An error occured while creating the course $add_courseID:"),
-			CGI::div({ class => 'font-monospace' }, CGI::escapeHTML($error)),
+		push(
+			@$output,
+			$c->tag(
+				'div',
+				class => 'alert alert-danger p-1 mb-2',
+				$c->c($c->tag('p', "An error occured while creating the course $add_courseID:"),
+					$c->tag('div', class => 'font-monospace', $error))->join('')
+			)
 		);
-		# get rid of any partially built courses
-		# FIXME  -- this is too fragile
+		# Get rid of any partially built courses.
+		# FIXME: This is too fragile.
 		unless ($error =~ /course exists/) {
-			eval {
-				deleteCourse(
-					courseID   => $add_courseID,
-					ce         => $ce2,
-					dbOptions  => \%dbOptions,
-				);
-			}
+			eval { deleteCourse(courseID => $add_courseID, ce => $ce2); }
 		}
 	} else {
-	    #log the action
-	    writeLog($ce, "hosted_courses", join("\t",
-	    	"\tAdded",
-	    	( defined $add_courseInstitution ? $add_courseInstitution : "(no institution specified)" ),
-	    	( defined $add_courseTitle ? $add_courseTitle : "(no title specified)" ),
-	    	$add_courseID,
-	    	$add_initial_firstName,
-	    	$add_initial_lastName,
-	  		$add_initial_email,
-	    ));
-	    # add contact to admin course as student?
-	    # FIXME -- should we do this?
-	    if ($add_initial_userID =~ /\S/) {
-	        my $composite_id = "${add_initial_userID}_${add_courseID}"; # student id includes school name and contact
-			my $User = $db->newUser(
-			user_id       => $composite_id,          # student id includes school name and contact
-			first_name    => $add_initial_firstName,
-			last_name     => $add_initial_lastName,
-			student_id    => $add_initial_userID,
-			email_address => $add_initial_email,
-			status        => "C",
+		#log the action
+		writeLog(
+			$ce,
+			'hosted_courses',
+			join("\t",
+				"\tAdded",
+				(defined $add_courseInstitution ? $add_courseInstitution : '(no institution specified)'),
+				(defined $add_courseTitle       ? $add_courseTitle       : '(no title specified)'),
+				$add_courseID,
+				$add_initial_firstName,
+				$add_initial_lastName,
+				$add_initial_email,
+			)
+		);
+		# Add contact to admin course as student?
+		# FIXME -- should we do this?
+		if ($add_initial_userID =~ /\S/) {
+			my $composite_id = "${add_initial_userID}_${add_courseID}";    # student id includes school name and contact
+			my $User         = $db->newUser(
+				user_id       => $composite_id,                            # student id includes school name and contact
+				first_name    => $add_initial_firstName,
+				last_name     => $add_initial_lastName,
+				student_id    => $add_initial_userID,
+				email_address => $add_initial_email,
+				status        => 'C',
 			);
 			my $Password = $db->newPassword(
 				user_id  => $composite_id,
@@ -889,2057 +436,1035 @@ sub do_add_course {
 			);
 			my $PermissionLevel = $db->newPermissionLevel(
 				user_id    => $composite_id,
-				permission => "0",
+				permission => '0',
 			);
 			# add contact to admin course as student
 			# or if this contact and course already exist in a dropped status
 			# change the student's status to enrolled
-			if (my $oldUser = $db->getUser($composite_id) ) {
-				warn "Replacing old data for $composite_id  status: ". $oldUser->status;
+			if (my $oldUser = $db->getUser($composite_id)) {
+				push(
+					@$output,
+					$c->tag(
+						'div',
+						class => 'alert alert-danger p-1 mb-2',
+						$c->maketext('Replacing old data for [_1]: status: [_2]', $composite_id, $oldUser->status)
+					)
+				);
 				$db->deleteUser($composite_id);
 			}
-			eval { $db->addUser($User)                       }; warn $@ if $@;
-			eval { $db->addPassword($Password)               }; warn $@ if $@;
-			eval { $db->addPermissionLevel($PermissionLevel) }; warn $@ if $@;
-		}
-		print CGI::div(
-			{ class => 'alert alert-success p-1 mb-2' },
-			$r->maketext("Successfully created the course [_1]", $add_courseID),
+			eval { $db->addUser($User) };
+			warn $@ if $@;
+			eval { $db->addPassword($Password) };
+			warn $@ if $@;
+			eval { $db->addPermissionLevel($PermissionLevel) };
+			warn $@ if $@;
+		}
+		push(
+			@$output,
+			$c->tag(
+				'div',
+				class => 'alert alert-success p-1 mb-2',
+				$c->maketext('Successfully created the course [_1]', $add_courseID)
+			)
 		);
-		my $newCoursePath = $urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets", $r,
-			courseID => $add_courseID);
-		my $newCourseURL = $self->systemLink($newCoursePath, authen => 0);
-		print CGI::div({ class => 'text-center mb-2'},
-			CGI::a({href=>$newCourseURL}, $r->maketext("Log into [_1]",$add_courseID)),
+		push(
+			@$output,
+			$c->tag(
+				'div',
+				class => 'text-center mb-2',
+				$c->link_to(
+					$c->maketext('Log into [_1]', $add_courseID) => 'set_list' => { courseID => $add_courseID }
+				)
+			)
 		);
 	}
 
-
+	return $output->join('');
 }
 
-################################################################################
-
-sub rename_course_form {
-	my ($self) = @_;
-	my $r      = $self->r;
-	my $ce     = $r->ce;
-
-	print CGI::h2($r->maketext('Rename Course'));
-
-	my @courseIDs = sort { lc($a) cmp lc($b) } listCourses($ce);
-
-	unless (@courseIDs) {
-		print CGI::p($r->maketext('No courses found'));
-		return;
-	}
-
-	my %courseLabels;
-	for my $courseID (@courseIDs) {
-		$courseLabels{$courseID} = $courseID;
-	}
-
-	print CGI::start_form(-method => 'POST', -action => $r->uri);
-	print $self->hidden_authen_fields;
-	print $self->hidden_fields('subDisplay');
-
-	print CGI::p($r->maketext(
-		'Select a course to rename.  The courseID is used in the url and can only contain alphanumeric characters '
-			. 'and underscores. The course title appears on the course home page and can be any string.'
-	));
-
-	print CGI::div(
-		{ class => 'col-lg-7 col-md-8' },
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'rename_oldCourseID', class => 'col-sm-6 col-form-label fw-bold' },
-				$r->maketext('Course ID:')
-				),
-			CGI::div(
-				{ class => 'col-sm-6' },
-				CGI::scrolling_list({
-					name     => 'rename_oldCourseID',
-					id       => 'rename_oldCourseID',
-					values   => \@courseIDs,
-					default  => $r->param('rename_oldCourseID') || '',
-					size     => 10,
-					multiple => 0,
-					labels   => \%courseLabels,
-					class    => 'form-select',
-				})
-			)
-		),
-		CGI::div(
-			{ class => 'row mb-2 align-items-center' },
-			CGI::div(
-				{ class => 'col-sm-6' },
-				CGI::div(
-					{ class => 'form-check' },
-					CGI::checkbox({
-						name            => 'rename_newCourseID_checkbox',
-						label           => $r->maketext('Change CourseID to:'),
-						checked         => $r->param('rename_newCourseID_checkbox') || '',
-						value           => 'on',
-						class           => 'form-check-input',
-						labelattributes => { class => 'form-check-label', id => 'rename_newCourseID_label' }
-					})
-				)
-			),
-			CGI::div(
-				{ class => 'col-sm-6' },
-				CGI::textfield({
-					name            => 'rename_newCourseID',
-					value           => $r->param('rename_newCourseID') || '',
-					class           => 'form-control',
-					aria_labelledby => 'rename_newCourseID_label'
-				}),
-			)
-		),
-		CGI::div(
-			{ class => 'row mb-2 align-items-center' },
-			CGI::div(
-				{ class => 'col-sm-6' },
-				CGI::div(
-					{ class => 'form-check' },
-					CGI::checkbox({
-						name            => 'rename_newCourseTitle_checkbox',
-						label           => $r->maketext('Change Course Title to:'),
-						selected        => $r->param('rename_newCourseTitle_checkbox') || '',
-						value           => 'on',
-						class           => 'form-check-input',
-						labelattributes => { class => 'form-check-label', id => 'rename_newCourseTitle_label' }
-					})
-				)
-			),
-			CGI::div(
-				{ class => 'col-sm-6' },
-				CGI::textfield({
-					name            => 'rename_newCourseTitle',
-					value           => $r->param('rename_newCourseTitle') || '',
-					class           => 'form-control',
-					aria_labelledby => 'rename_newCourseTitle_label'
-				})
-			),
-		),
-		CGI::div(
-			{ class => 'row mb-2 align-items-center' },
-			CGI::div(
-				{ class => 'col-sm-6' },
-				CGI::div(
-					{ class => 'form-check' },
-					CGI::checkbox({
-						name            => 'rename_newCourseInstitution_checkbox',
-						label           => $r->maketext('Change Institution to:'),
-						checked         => $r->param('rename_newCourseInstitution_checkbox') || '',
-						value           => 'on',
-						class           => 'form-check-input',
-						labelattributes => { class => 'form-check-label', id => 'rename_newCourseInstitution_label' }
-					})
-				)
-			),
-			CGI::div(
-				{ class => 'col-sm-6' },
-				CGI::textfield({
-					name            => 'rename_newCourseInstitution',
-					value           => $r->param('rename_newCourseInstitution') || '',
-					class           => 'form-control',
-					aria_labelledby => 'rename_newCourseInstitution_label'
-				})
-			)
-		)
-	);
-
-	print CGI::submit({ name => 'rename_course', label => $r->maketext('Rename Course'), class => 'btn btn-primary' });
-
-	print CGI::end_form();
+sub rename_course_form ($c) {
+	return $c->include('ContentGenerator/CourseAdmin/rename_course_form');
 }
 
-sub rename_course_confirm {
-
-    my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-
-	my $rename_oldCourseID           = $r->param("rename_oldCourseID")     || "";
-	my $rename_newCourseID           = $r->param("rename_newCourseID")     || "";
-	my $rename_newCourseID_checkbox     = $r->param("rename_newCourseID_checkbox")  || "";    ;
-
-	my $rename_newCourseTitle           = $r->param("rename_newCourseTitle")     || "";
-	my $rename_newCourseTitle_checkbox  = $r->param("rename_newCourseTitle_checkbox")    || ""; ;
- 	my $rename_newCourseInstitution           = $r->param("rename_newCourseInstitution")     || "";
-	my $rename_newCourseInstitution_checkbox     = $r->param("rename_newCourseInstitution_checkbox") || ""   ;
-
-
-	my $ce2 = new WeBWorK::CourseEnvironment({
-		%WeBWorK::SeedCE,
-		courseName => $rename_oldCourseID,
-	});
-######################################################
-## Create strings confirming title and institution change
-######################################################
-	# connect to database to get old title and institution
-	my $dbLayoutName = $ce->{dbLayoutName};
-	my $db = new WeBWorK::DB($ce->{dbLayouts}->{$dbLayoutName});
-	my $oldDB =new WeBWorK::DB($ce2->{dbLayouts}->{$dbLayoutName});
-	my $rename_oldCourseTitle = $oldDB->getSettingValue('courseTitle')//'""';
-	my $rename_oldCourseInstitution = $oldDB->getSettingValue('courseInstitution')//'""';
-
-	my ($change_course_title_str, $change_course_institution_str)=("");
-	if ( $rename_newCourseTitle_checkbox) {
-		$change_course_title_str =$r->maketext("Change title from [_1] to [_2]", $rename_oldCourseTitle, $rename_newCourseTitle);
-	}
-	if ( $rename_newCourseInstitution_checkbox) {
-		$change_course_institution_str=$r->maketext("Change course institution from [_1] to [_2]", $rename_oldCourseInstitution, $rename_newCourseInstitution);
-	}
-
-#############################################################################
-# If we are only changing the title or institution we can cut this short
-#############################################################################
-	unless ($rename_newCourseID_checkbox) {  # in this case do not change course ID
-		print CGI::start_form(-method=>"POST", -action=>$r->uri);
-		print $self->hidden_authen_fields;
-		print $self->hidden_fields("subDisplay");
-		print $self->hidden_fields(qw/rename_oldCourseID rename_newCourseID
-		  rename_newCourseTitle rename_newCourseInstitution
-		  rename_newCourseID_checkbox rename_newCourseInstitution_checkbox
-		  rename_newCourseTitle_checkbox /);
-		print CGI::hidden(-name=>"rename_oldCourseTitle",
-					  -default=>$rename_oldCourseTitle,
-		              -id=>"hidden_rename_oldCourseTitle");
-		print CGI::hidden(-name=>"rename_oldCourseInstitution",
-		              -default=>$rename_oldCourseInstitution,
-		              -id=>"hidden_rename_oldCourseInstitution");
-
-		print CGI::div({style=>"text-align: left"},
-			    CGI::hr(),
-			    CGI::h4($r->maketext("Make these changes in  course:")." $rename_oldCourseID"),
-			    CGI::p($change_course_title_str),
-			    CGI::p($change_course_institution_str),
-				CGI::submit({
-					   	name => "decline_retitle_course",
-					   	value => $r->maketext("Don't make changes"),
-					   	class => 'btn btn-primary'
-				   	}),
-				"&nbsp;",
-				CGI::submit({
-					   	name => "confirm_retitle_course",
-					   	value => $r->maketext("Make changes"),
-					   	class => 'btn btn-primary'
-					}) ,
-			    CGI::hr(),
-			);
-		 print CGI::end_form();
-         return;
-	}
-
-#############################################################################
-# Check database
-#############################################################################
-
-	my ($tables_ok,$dbStatus);
-	if ($ce2->{dbLayoutName} ) {
-	     my $CIchecker = new WeBWorK::Utils::CourseIntegrityCheck(ce=>$ce2);
-	    ($tables_ok,$dbStatus) = $CIchecker->checkCourseTables($rename_oldCourseID);
-		if ($r->param("upgrade_course_tables")) {
-			my @schema_table_names = keys %$dbStatus;  # update tables missing from database;
-			my @tables_to_create = grep {$dbStatus->{$_}->[0] == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A} @schema_table_names;
-			my @tables_to_alter  = grep {$dbStatus->{$_}->[0] == WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B} @schema_table_names;
-			my $msg = $CIchecker->updateCourseTables($rename_oldCourseID, [@tables_to_create]);
-			foreach my $table_name (@tables_to_alter) {
-				$msg .= $CIchecker->updateTableFields($rename_oldCourseID, $table_name);
+sub rename_course_confirm ($c) {
+	my $ce = $c->ce;
+
+	my $rename_oldCourseID          = $c->param('rename_oldCourseID')          || '';
+	my $rename_newCourseID          = $c->param('rename_newCourseID')          || '';
+	my $rename_newCourseTitle       = $c->param('rename_newCourseTitle')       || '';
+	my $rename_newCourseInstitution = $c->param('rename_newCourseInstitution') || '';
+
+	my $ce2 = WeBWorK::CourseEnvironment->new({ courseName => $rename_oldCourseID });
+
+	# Create strings confirming title and institution change.
+	# Connect to the database to get old title and institution.
+	my $dbLayoutName                = $ce->{dbLayoutName};
+	my $db                          = WeBWorK::DB->new($ce->{dbLayouts}{$dbLayoutName});
+	my $oldDB                       = WeBWorK::DB->new($ce2->{dbLayouts}{$dbLayoutName});
+	my $rename_oldCourseTitle       = $oldDB->getSettingValue('courseTitle')       // '';
+	my $rename_oldCourseInstitution = $oldDB->getSettingValue('courseInstitution') // '';
+
+	my ($change_course_title_str, $change_course_institution_str) = ('', '');
+	if ($c->param('rename_newCourseTitle_checkbox')) {
+		$change_course_title_str =
+			$c->maketext('Change title from [_1] to [_2]', $rename_oldCourseTitle, $rename_newCourseTitle);
+	}
+	if ($c->param('rename_newCourseInstitution_checkbox')) {
+		$change_course_institution_str = $c->maketext('Change course institution from [_1] to [_2]',
+			$rename_oldCourseInstitution, $rename_newCourseInstitution);
+	}
+
+	# If we are only changing the title or institution, and not the courseID, then we can cut this short.
+	return $c->include(
+		'ContentGenerator/CourseAdmin/rename_course_confirm_short',
+		rename_oldCourseTitle         => $rename_oldCourseTitle,
+		change_course_title_str       => $change_course_title_str,
+		rename_oldCourseInstitution   => $rename_oldCourseInstitution,
+		change_course_institution_str => $change_course_institution_str,
+		rename_oldCourseID            => $rename_oldCourseID
+	) unless $c->param('rename_newCourseID_checkbox');
+
+	if ($ce2->{dbLayoutName}) {
+		my $CIchecker = WeBWorK::Utils::CourseIntegrityCheck->new(ce => $ce2);
+
+		# Check database
+		my ($tables_ok, $dbStatus) = $CIchecker->checkCourseTables($rename_oldCourseID);
+
+		# Upgrade the database if requested.
+		my @upgrade_report;
+		if ($c->param('upgrade_course_tables')) {
+			my @schema_table_names = keys %$dbStatus;
+			my @tables_to_create =
+				grep { $dbStatus->{$_}->[0] == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A } @schema_table_names;
+			my @tables_to_alter =
+				grep { $dbStatus->{$_}->[0] == WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B }
+				@schema_table_names;
+			push(@upgrade_report, $CIchecker->updateCourseTables($rename_oldCourseID, [@tables_to_create]));
+			for my $table_name (@tables_to_alter) {
+				push(@upgrade_report, $CIchecker->updateTableFields($rename_oldCourseID, $table_name));
 			}
-			print CGI::p({ class => 'text-success fw-bold' }, $msg);
-
-		}
- 		($tables_ok,$dbStatus) = $CIchecker->checkCourseTables($rename_oldCourseID);
 
-
-		# print db status
-
-		my %msg = (
-			WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A =>
-				CGI::span({ class => 'text-danger' }, $r->maketext("Table defined in schema but missing in database")),
-			WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B =>
-				CGI::span({ class => 'text-danger' }, $r->maketext("Table defined in database but missing in schema")),
-			WeBWorK::Utils::CourseIntegrityCheck::SAME_IN_A_AND_B =>
-				CGI::span({ class => 'text-success' }, $r->maketext("Table is ok")),
-			WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B => CGI::span(
-				{ class => 'text-danger' },
-				$r->maketext("Schema and database table definitions do not agree")
-			),
-		);
-		my %msg2 = (
-			WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A =>
-				CGI::span({ class => 'text-danger' }, $r->maketext("Field missing in database")),
-			WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B =>
-				CGI::span({ class => 'text-danger' }, $r->maketext("Field missing in schema")),
-			WeBWorK::Utils::CourseIntegrityCheck::SAME_IN_A_AND_B =>
-				CGI::span({ class => 'text-success' }, $r->maketext("Field is ok")),
-			WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B => CGI::span(
-				{ class => 'text-danger' },
-				$r->maketext("Schema and database field definitions do not agree")
-			),
+			($tables_ok, $dbStatus) = $CIchecker->checkCourseTables($rename_oldCourseID);
+		}
+
+		# Check directories
+		my ($directories_ok, $directory_report) = $CIchecker->checkCourseDirectories($ce2);
+
+		return $c->include(
+			'ContentGenerator/CourseAdmin/rename_course_confirm',
+			upgrade_report                => \@upgrade_report,
+			tables_ok                     => $tables_ok,
+			dbStatus                      => $dbStatus,
+			directory_report              => $directory_report,
+			directories_ok                => $directories_ok,
+			rename_oldCourseTitle         => $rename_oldCourseTitle,
+			change_course_title_str       => $change_course_title_str,
+			rename_oldCourseInstitution   => $rename_oldCourseInstitution,
+			change_course_institution_str => $change_course_institution_str,
+			rename_oldCourseID            => $rename_oldCourseID,
+			rename_newCourseID            => $rename_newCourseID
 		);
-		my $all_tables_ok=1;
-		my $extra_database_tables=0;
-		my $extra_database_fields=0;
-		my $str=CGI::h4($r->maketext("Report on database structure for course [_1]:",  $rename_oldCourseID)).CGI::br();
-		foreach my $table (sort keys %$dbStatus) {
-		    my $table_status = $dbStatus->{$table}->[0];
-			$str .= CGI::b($table).': '. $msg{ $table_status } . CGI::br();
-
-			CASE: {
-				$table_status == WeBWorK::Utils::CourseIntegrityCheck::SAME_IN_A_AND_B
-					&& do{ last CASE;
-					};
-				$table_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A
-					&& do{
-						   $all_tables_ok = 0; last CASE;
-					};
-				$table_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B
-					&& do{
-						   $extra_database_tables = 1; last CASE;
-					};
-				$table_status == WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B
-					&& do{
-					    my %fieldInfo = %{ $dbStatus->{$table}->[1] };
-						foreach my $key (keys %fieldInfo) {
-						    my $field_status = $fieldInfo{$key}->[0];
-						    CASE2: {
-						    	$field_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B
-						    		&& do{
-						    		   $extra_database_fields = 1; last CASE2;
-						    		};
-						    	$field_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A
-						    		&& do{
-						    		   $all_tables_ok=0; last CASE2;
-						    		};
-						    }
-							$str .= CGI::br()."\n&nbsp;&nbsp; $key => ". $msg2{$field_status };
-						}
-					};
-			}
-			$str.=CGI::br();
-
-		}
-#############################################################################
-# Report on databases
-#############################################################################
-
-		print CGI::p($str);
-		if ($extra_database_tables) {
-			print CGI::p(
-				{ class => 'text-danger fw-bold' },
-				$r->maketext(
-					'There are extra database tables which are not defined in the schema.  '
-						. 'These can be deleted when upgrading the course.'
-				)
-			);
-		}
-		if ($extra_database_fields) {
-			print CGI::p(
-				{ class => 'text-danger fw-bold' },
-				$r->maketext(
-					'There are extra database fields which are not defined in the schema for at least one table.  '
-						. 'They can only be removed when upgrading the course.'
-				)
-			);
-		}
-		if ($all_tables_ok) {
-			print CGI::p({ class => 'text-success fw-bold' },
-				$r->maketext("Course [_1] database is in order", $rename_oldCourseID));
-		} else {
-			print CGI::p(
-				{ class => 'text-danger fw-bold' },
-				$r->maketext(
-					"Course [_1] databases must be updated before renaming this course.",
-					$rename_oldCourseID
-				)
-			);
-		}
-
-#############################################################################
-# Check directories
-#############################################################################
-
-		my ($directories_ok, $str2) = $CIchecker->checkCourseDirectories($ce2);
-		print CGI::h2('Directory structure'), CGI::p($str2),
-			$directories_ok ? CGI::p({ class => 'text-success' }, $r->maketext('Directory structure is ok')) : CGI::p(
-				{ class => 'text-danger' },
-				$r->maketext(
-					'Directory structure is missing directories or the webserver lacks sufficient privileges.')
-			);
-
-#############################################################################
-# Print form for choosing next action.
-#############################################################################
-
-
-
-		print CGI::start_form(-method=>"POST", -action=>$r->uri);
-		print $self->hidden_authen_fields;
-		print $self->hidden_fields("subDisplay");
-		print $self->hidden_fields(qw/rename_oldCourseID rename_newCourseID
-		  rename_newCourseTitle rename_newCourseInstitution
-		  rename_newCourseID_checkbox rename_newCourseInstitution_checkbox
-		  rename_newCourseTitle_checkbox /);
-		print CGI::hidden(-name=>"rename_oldCourseTitle",
-					  -default=>$rename_oldCourseTitle,
-		              -id=>"hidden_rename_oldCourseTitle");
-		print CGI::hidden(-name=>"rename_oldCourseInstitution",
-		              -default=>$rename_oldCourseInstitution,
-		              -id=>"hidden_rename_oldCourseInstitution");
-
-
-			# grab some values we'll need
-            # fail if the source course does not exist
-
-
-
-		if ($all_tables_ok && $directories_ok ) { # no missing tables or missing fields or directories
-			print CGI::p({style=>"text-align: center"},
-			    CGI::hr(),
-			    CGI::h4($r->maketext("Rename [_1] to [_2]", $rename_oldCourseID, $rename_newCourseID)),
-			    CGI::div($change_course_title_str),
-			    CGI::div($change_course_institution_str),
-				CGI::submit({
-						name => "decline_rename_course",
-						value => $r->maketext("Don't rename"),
-						class => 'btn btn-primary'
-					}),
-				"&nbsp;",
-				CGI::submit({
-						name => "confirm_rename_course",
-						value => $r->maketext("Rename"),
-						class => 'btn btn-primary'
-					}),
-			);
-		} elsif(  $directories_ok  ) {
-			print CGI::p({style=>"text-align: center"},
-				CGI::submit({
-						name => "decline_rename_course",
-					   	-value => $r->maketext("Don't rename"),
-						class => 'btn btn-primary'
-					}),
-				"&nbsp;",
-				CGI::submit({
-						name => "upgrade_course_tables",
-					   	value => $r->maketext("Upgrade Course Tables"),
-						class => 'btn btn-primary'
-					}),
-			);
-		} else  {
-			print CGI::p({style=>"text-align: center"},
-				CGI::submit({
-						name => "decline_rename_course",
-					   	-value => $r->maketext("Don't rename"),
-						class => 'btn btn-primary'
-					}),
-				CGI::br(),$r->maketext("Directory structure needs to be repaired manually before renaming.")
-			);
-		}
-		print CGI::end_form();
+	} else {
+		return $c->tag('p', class => 'text-danger fw-bold', "Unable to find database layout for $rename_oldCourseID");
 	}
 }
-sub rename_course_validate {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
 
-	my $rename_oldCourseID              = $r->param("rename_oldCourseID")     || "";
-	my $rename_newCourseID              = $r->param("rename_newCourseID")     || "";
-	my $rename_newCourseID_checkbox     = $r->param("rename_newCourseID_checkbox")   || "";  ;
+sub rename_course_validate ($c) {
+	my $ce = $c->ce;
 
-	my $rename_newCourseTitle           = $r->param("rename_newCourseTitle")     || "";
-	my $rename_newCourseTitle_checkbox  = $r->param("rename_newCourseTitle_checkbox")  || ""   ;
- 	my $rename_newCourseInstitution           = $r->param("rename_newCourseInstitution")     || "";
-	my $rename_newCourseInstitution_checkbox     = $r->param("rename_newCourseInstitution_checkbox")  || ""  ;
+	my $rename_oldCourseID          = $c->param('rename_oldCourseID')          || '';
+	my $rename_newCourseID          = $c->param('rename_newCourseID')          || '';
+	my $rename_newCourseID_checkbox = $c->param('rename_newCourseID_checkbox') || '';
+
+	my $rename_newCourseTitle                = $c->param('rename_newCourseTitle')                || '';
+	my $rename_newCourseTitle_checkbox       = $c->param('rename_newCourseTitle_checkbox')       || '';
+	my $rename_newCourseInstitution          = $c->param('rename_newCourseInstitution')          || '';
+	my $rename_newCourseInstitution_checkbox = $c->param('rename_newCourseInstitution_checkbox') || '';
 
 	my @errors;
 
-	if ($rename_oldCourseID eq "") {
-		push @errors, $r->maketext("You must select a course to rename.");
+	if ($rename_oldCourseID eq '') {
+		push @errors, $c->maketext('You must select a course to rename.');
 	}
-	if ($rename_newCourseID eq "" and $rename_newCourseID_checkbox eq 'on' ) {
-		push @errors, $r->maketext("You must specify a new name for the course.");
+	if ($rename_newCourseID eq '' and $rename_newCourseID_checkbox eq 'on') {
+		push @errors, $c->maketext('You must specify a new name for the course.');
 	}
 	if ($rename_oldCourseID eq $rename_newCourseID and $rename_newCourseID_checkbox eq 'on') {
-		push @errors, $r->maketext("Can't rename to the same name.");
+		push @errors, $c->maketext(q{Can't rename to the same name.});
 	}
-	if ($rename_newCourseID_checkbox eq 'on' && length($rename_newCourseID) > $ce->{maxCourseIdLength} ) {
-		push @errors, $r->maketext("Course ID cannot exceed [_1] characters.", $ce->{maxCourseIdLength});
+	if ($rename_newCourseID_checkbox eq 'on' && length($rename_newCourseID) > $ce->{maxCourseIdLength}) {
+		push @errors, $c->maketext('Course ID cannot exceed [_1] characters.', $ce->{maxCourseIdLength});
 	}
-	unless ($rename_newCourseID =~ /^[\w-]*$/) { # regex copied from CourseAdministration.pm
-		push @errors, $r->maketext("Course ID may only contain letters, numbers, hyphens, and underscores.");
+	unless ($rename_newCourseID =~ /^[\w-]*$/) {    # regex copied from CourseAdministration.pm
+		push @errors, $c->maketext('Course ID may only contain letters, numbers, hyphens, and underscores.');
 	}
 	if (grep { $rename_newCourseID eq $_ } listCourses($ce)) {
-		push @errors, $r->maketext("A course with ID [_1] already exists.",$rename_newCourseID);
-	}
-	if ($rename_newCourseTitle eq "" and $rename_newCourseTitle_checkbox eq 'on')  {
-		push @errors, $r->maketext("You must specify a new title for the course.");
-	}
-	if ($rename_newCourseInstitution eq "" and $rename_newCourseInstitution_checkbox eq 'on')  {
-		push @errors, $r->maketext("You must specify a new institution for the course.");
-	}
-	unless ($rename_newCourseID or $rename_newCourseID_checkbox or $rename_newCourseTitle_checkbox or $rename_newCourseInstitution_checkbox) {
-		push @errors, $r->maketext("No changes specified.  You must mark the checkbox of the item(s) to be changed and enter the change data.");
+		push @errors, $c->maketext('A course with ID [_1] already exists.', $rename_newCourseID);
+	}
+	if ($rename_newCourseTitle eq '' and $rename_newCourseTitle_checkbox eq 'on') {
+		push @errors, $c->maketext('You must specify a new title for the course.');
+	}
+	if ($rename_newCourseInstitution eq '' and $rename_newCourseInstitution_checkbox eq 'on') {
+		push @errors, $c->maketext('You must specify a new institution for the course.');
+	}
+	unless ($rename_newCourseID
+		or $rename_newCourseID_checkbox
+		or $rename_newCourseTitle_checkbox
+		or $rename_newCourseInstitution_checkbox)
+	{
+		push @errors,
+			$c->maketext(
+			'No changes specified.  You must mark the checkbox of the item(s) to be changed and enter the change data.'
+			);
 	}
 
 	return @errors;
 }
 
-sub do_retitle_course {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	#my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-
-	my $rename_oldCourseID           = $r->param("rename_oldCourseID")     || "";
-#	my $rename_newCourseID           = $r->param("rename_newCourseID")     || "";
-#   There is no new course, but there are new titles and institutions
-	my $rename_newCourseTitle         = $r->param("rename_newCourseTitle")     || "";
-	my $rename_newCourseInstitution   = $r->param("rename_newCourseInstitution")     || "";
-	my $rename_oldCourseTitle         = $r->param("rename_oldCourseTitle")     || "";
-	my $rename_oldCourseInstitution   = $r->param("rename_oldCourseInstitution")     || "";
-	my $title_checkbox                = $r->param("rename_newCourseTitle_checkbox")  || ""   ;
-	my $institution_checkbox          = $r->param("rename_newCourseInstitution_checkbox")  || ""  ;
-
-#	$rename_newCourseID = $rename_oldCourseID ;  #since they are the same FIXME
+sub do_retitle_course ($c) {
+	my $ce = $c->ce;
+	my $db = $c->db;
+
+	my $rename_oldCourseID = $c->param('rename_oldCourseID') || '';
+
+	#   There is no new course, but there are new titles and institutions
+	my $rename_newCourseTitle       = $c->param('rename_newCourseTitle')                || '';
+	my $rename_newCourseInstitution = $c->param('rename_newCourseInstitution')          || '';
+	my $rename_oldCourseTitle       = $c->param('rename_oldCourseTitle')                || '';
+	my $rename_oldCourseInstitution = $c->param('rename_oldCourseInstitution')          || '';
+	my $title_checkbox              = $c->param('rename_newCourseTitle_checkbox')       || '';
+	my $institution_checkbox        = $c->param('rename_newCourseInstitution_checkbox') || '';
+
+	#	$rename_newCourseID = $rename_oldCourseID ;  #since they are the same FIXME
 	# define new courseTitle and new courseInstitution
 	my %optional_arguments = ();
-	$optional_arguments{courseTitle}       = $rename_newCourseTitle if $title_checkbox;
+	$optional_arguments{courseTitle}       = $rename_newCourseTitle       if $title_checkbox;
 	$optional_arguments{courseInstitution} = $rename_newCourseInstitution if $institution_checkbox;
 
 	my $ce2;
-	my %dbOptions =();
-	eval {
-		$ce2 = new WeBWorK::CourseEnvironment({
-			%WeBWorK::SeedCE,
-			courseName => $rename_oldCourseID,
-		});
-	};
+	eval { $ce2 = WeBWorK::CourseEnvironment->new({ courseName => $rename_oldCourseID }); };
 	warn "failed to create environment in do_retitle_course $@" if $@;
 
-	eval {
-		retitleCourse(
-			courseID      => $rename_oldCourseID,
-			ce            => $ce2,
-			dbOptions     => \%dbOptions,
-			%optional_arguments,
-		);
-	};
+	eval { retitleCourse(courseID => $rename_oldCourseID, ce => $ce2, %optional_arguments); };
 	if ($@) {
 		my $error = $@;
-		print CGI::div(
-			{ class => 'alert alert-danger p-1 mb-2' },
-			CGI::p($r->maketext("An error occured while changing the title of the course [_1].", $rename_oldCourseID)),
-			CGI::div({ class => 'font-monospace' }, CGI::escapeHTML($error)),
+		return $c->tag(
+			'div',
+			class => 'alert alert-danger p-1 mb-2',
+			$c->c(
+				$c->tag(
+					'p',
+					$c->maketext(
+						'An error occured while changing the title of the course [_1].',
+						$rename_oldCourseID
+					)
+				),
+				$c->tag('div', class => 'font-monospace', $error)
+			)->join('')
 		);
 	} else {
-		print CGI::div(
-			{ class => 'alert alert-success p-1 mb-2' },
-			($title_checkbox) ? CGI::div($r->maketext("The title of the course [_1] has been changed from [_2] to [_3]",$rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle))
-			:'',
-			($institution_checkbox) ? CGI::div($r->maketext("The institution associated with the course [_1] has been changed from [_2] to [_3]",$rename_oldCourseID, $rename_oldCourseInstitution, $rename_newCourseInstitution))
-			:'',
-		);
-		 writeLog($ce, "hosted_courses", join("\t",
-	    	"\t",$r->maketext("Retitled"),
-	    	"",
-	    	"",
-		$r->maketext("[_1] title and institution changed from [_2] to [_3] and from [_4] to [_5]",$rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle, $rename_oldCourseInstitution, $rename_newCourseInstitution)
-	    ));
-		my $oldCoursePath = $urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets", $r,
-			courseID => $rename_oldCourseID);
-		my $oldCourseURL = $self->systemLink($oldCoursePath, authen => 0);
-		print CGI::div({style=>"text-align: center"},
-			CGI::a({href=>$oldCourseURL}, $r->maketext("Log into [_1]", $rename_oldCourseID)),
+		writeLog(
+			$ce,
+			'hosted_courses',
+			join(
+				"\t", "\t",
+				$c->maketext('Retitled'),
+				'', '',
+				$c->maketext(
+					'[_1] title and institution changed from [_2] to [_3] and from [_4] to [_5]',
+					$rename_oldCourseID,          $rename_oldCourseTitle, $rename_newCourseTitle,
+					$rename_oldCourseInstitution, $rename_newCourseInstitution
+				)
+			)
 		);
+
+		return $c->c(
+			$c->tag(
+				'div',
+				class => 'alert alert-success p-1 my-2',
+				$c->c(
+					($title_checkbox) ? $c->tag(
+						'div',
+						$c->maketext(
+							'The title of the course [_1] has been changed from [_2] to [_3]',
+							$rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle
+						)
+					) : '',
+					($institution_checkbox) ? $c->tag(
+						'div',
+						$c->maketext(
+							'The institution associated with the course [_1] has been changed from [_2] to [_3]',
+							$rename_oldCourseID, $rename_oldCourseInstitution, $rename_newCourseInstitution
+						)
+					) : ''
+				)->join('')
+			),
+			$c->tag(
+				'div',
+				class => 'text-center',
+				$c->link_to(
+					$c->maketext('Log into [_1]', $rename_oldCourseID) => 'set_list' =>
+						{ courseID => $rename_oldCourseID }
+				)
+			)
+		)->join('');
 	}
 }
 
-sub do_rename_course {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	#my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-
-	my $rename_oldCourseID            = $r->param("rename_oldCourseID")     || "";
-	my $rename_newCourseID            = $r->param("rename_newCourseID")     || "";
-	my $rename_newCourseTitle         = $r->param("rename_newCourseTitle")     || "";
-	my $rename_newCourseInstitution   = $r->param("rename_newCourseInstitution")     || "";
-	my $title_checkbox                = $r->param("rename_newCourseTitle_checkbox")  || ""   ;
-	my $institution_checkbox          = $r->param("rename_newCourseInstitution_checkbox")  || ""  ;
-
-
-	my $ce2 = new WeBWorK::CourseEnvironment({
-		%WeBWorK::SeedCE,
-		courseName => $rename_oldCourseID,
-	});
-
-	my $dbLayoutName = $ce->{dbLayoutName};
+sub do_rename_course ($c) {
+	my $rename_oldCourseID = $c->param('rename_oldCourseID') || '';
+	my $rename_newCourseID = $c->param('rename_newCourseID') || '';
 
 	# define new courseTitle and new courseInstitution
 	my %optional_arguments = ();
 	my ($title_message, $institution_message);
-	if ($title_checkbox) {
-		$optional_arguments{courseTitle}       = $rename_newCourseTitle;
-		$title_message = $r->maketext("The title of the course [_1] is now [_2]", $rename_newCourseID, $rename_newCourseTitle) ,
-
-	} else {
+	if ($c->param('rename_newCourseTitle_checkbox')) {
+		$optional_arguments{courseTitle} = $c->param('rename_newCourseTitle') || '';
+		$title_message = $c->maketext('The title of the course [_1] is now [_2]',
+			$rename_newCourseID, $optional_arguments{courseTitle});
 
 	}
-	if ($institution_checkbox) {
-		$optional_arguments{courseInstitution} = $rename_newCourseInstitution;
-		$institution_message = $r->maketext("The institution associated with the course [_1] is now [_2]", $rename_newCourseID, $rename_newCourseInstitution),
 
+	if ($c->param('rename_newCourseInstitution_checkbox')) {
+		$optional_arguments{courseInstitution} = $c->param('rename_newCourseInstitution') || '';
+		$institution_message = $c->maketext('The institution associated with the course [_1] is now [_2]',
+			$rename_newCourseID, $optional_arguments{courseInstitution});
 	}
 
-
-	# this is kinda left over from when we had 'gdbm' and 'sql' database layouts
-	# below this line, we would grab values from getopt and put them in this hash
-	# but for now the hash can remain empty
-	my %dbOptions;
-
 	eval {
 		renameCourse(
-			courseID      => $rename_oldCourseID,
-			ce            => $ce2,
-			dbOptions     => \%dbOptions,
-			newCourseID   => $rename_newCourseID,
-			%optional_arguments,
+			courseID    => $rename_oldCourseID,
+			ce          => WeBWorK::CourseEnvironment->new({ courseName => $rename_oldCourseID }),
+			newCourseID => $rename_newCourseID,
+			%optional_arguments
 		);
 	};
 	if ($@) {
 		my $error = $@;
-		print CGI::div(
-			{ class => 'alert alert-danger p-1 mb-2' },
-			CGI::p( $r->maketext("An error occured while renaming the course [_1] to [_2]:", $rename_oldCourseID, $rename_newCourseID)),
-			CGI::div({ class => 'font-monospace' }, CGI::escapeHTML($error)),
+		return $c->tag(
+			'div',
+			class => 'alert alert-danger p-1 mb-2',
+			$c->c(
+				$c->tag(
+					'p',
+					$c->maketext(
+						'An error occured while renaming the course [_1] to [_2]:', $rename_oldCourseID,
+						$rename_newCourseID
+					)
+				),
+				$c->tag('div', class => 'font-monospace', $error)
+			)->join('')
 		);
 	} else {
-		print CGI::div(
-			{ class => 'alert alert-success p-1 mb-2' },
-			CGI::p($title_message),
-			CGI::p($institution_message),
-			CGI::p($r->maketext("Successfully renamed the course [_1] to [_2]", $rename_oldCourseID, $rename_newCourseID)),
-		);
-		 writeLog($ce, "hosted_courses", join("\t",
-	    	"\tRenamed",
-	    	"",
-	    	"",
-	    	"$rename_oldCourseID to $rename_newCourseID",
-	    ));
-		my $newCoursePath = $urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets", $r,
-			courseID => $rename_newCourseID);
-		my $newCourseURL = $self->systemLink($newCoursePath, authen => 0);
-		print CGI::div({style=>"text-align: center"},
-			CGI::a({href=>$newCourseURL}, $r->maketext("Log into [_1]", $rename_newCourseID)),
-		);
+		writeLog($c->ce, 'hosted_courses',
+			join("\t", "\tRenamed", '', '', "$rename_oldCourseID to $rename_newCourseID"));
+		return $c->c(
+			$c->tag(
+				'div',
+				class => 'alert alert-success p-1 mb-2',
+				$c->c(
+					$title_message       ? $c->tag('p', $title_message)       : '',
+					$institution_message ? $c->tag('p', $institution_message) : '',
+					$c->tag(
+						'p',
+						class => 'mb-0',
+						$c->maketext(
+							'Successfully renamed the course [_1] to [_2]', $rename_oldCourseID,
+							$rename_newCourseID
+						)
+					)
+				)->join('')
+			),
+			$c->tag(
+				'div',
+				style => 'text-align: center',
+				$c->link_to(
+					$c->maketext('Log into [_1]', $rename_newCourseID) => 'set_list' =>
+						{ courseID => $rename_newCourseID }
+				)
+			)
+		)->join('');
 	}
 }
 
-################################################################################
-
-my %coursesData;
-sub byLoginActivity {$coursesData{$a}{'epoch_modify_time'} <=> $coursesData{$b}{'epoch_modify_time'}}
-
-sub delete_course_form {
-	my ($self) = @_;
-	my $r      = $self->r;
-	my $ce     = $r->ce;
-
-	print CGI::h2($r->maketext('Delete Course'));
-
-	my @courseIDs = listCourses($ce);
-
-	unless (@courseIDs) {
-		print CGI::p($r->maketext('No courses found'));
-		return;
-	}
-
-	my $coursesDir            = $ce->{webworkDirs}{courses};
-	my $delete_listing_format = $r->param('delete_listing_format');
-	unless (defined $delete_listing_format) { $delete_listing_format = 'alphabetically'; }    #use the default
+sub delete_course_form ($c) {
+	my $ce = $c->ce;
 
-	# Get and store last modify time for login.log for all courses. Also get visibility status.
+	my @courseIDs = grep { $_ ne $c->stash('courseID') } listCourses($ce);
 	my %courseLabels;
-	my @noLoginLogIDs = ();
-	my @loginLogIDs   = ();
 
-	my ($loginLogFile, $epoch_modify_time, $courseDir);
-	for my $courseID (@courseIDs) {
-		$loginLogFile = "$coursesDir/$courseID/logs/login.log";
-		if (-e $loginLogFile) {
-			# The login log file should always exist except for the model course.
-			$epoch_modify_time                           = stat($loginLogFile)->mtime;
-			$coursesData{$courseID}{'epoch_modify_time'} = $epoch_modify_time;
-			$coursesData{$courseID}{'local_modify_time'} = ctime($epoch_modify_time);
-			push(@loginLogIDs, $courseID);
-		} else {
-			# This is for the model course.
-			$coursesData{$courseID}{'local_modify_time'} = 'no login.log';
-			push(@noLoginLogIDs, $courseID);
+	if (@courseIDs) {
+		my $coursesDir            = $ce->{webworkDirs}{courses};
+		my $delete_listing_format = $c->param('delete_listing_format');
+		unless (defined $delete_listing_format) { $delete_listing_format = 'alphabetically'; }    # Use the default
+
+		# Get and store last modify time for login.log for all courses. Also get visibility status.
+		my @noLoginLogIDs;
+		my @loginLogIDs;
+
+		my %coursesData;
+		for my $courseID (@courseIDs) {
+			my $loginLogFile = "$coursesDir/$courseID/logs/login.log";
+			if (-e $loginLogFile) {
+				# The login log file should always exist except for the model course.
+				my $epoch_modify_time = stat($loginLogFile)->mtime;
+				$coursesData{$courseID}{epoch_modify_time} = $epoch_modify_time;
+				$coursesData{$courseID}{local_modify_time} = ctime($epoch_modify_time);
+				push(@loginLogIDs, $courseID);
+			} else {
+				# This is for the model course.
+				$coursesData{$courseID}{local_modify_time} = 'no login.log';
+				push(@noLoginLogIDs, $courseID);
+			}
+			if (-f "$coursesDir/$courseID/hide_directory") {
+				$coursesData{$courseID}{status} = $c->maketext('hidden');
+			} else {
+				$coursesData{$courseID}{status} = $c->maketext('visible');
+			}
+			$courseLabels{$courseID} =
+				"$courseID  ($coursesData{$courseID}{status} :: $coursesData{$courseID}{local_modify_time}) ";
 		}
-		if (-f "$coursesDir/$courseID/hide_directory") {
-			$coursesData{$courseID}{'status'} = $r->maketext('hidden');
+
+		if ($delete_listing_format eq 'last_login') {
+			# This should be an empty array except for the model course.
+			@noLoginLogIDs = sort { lc($a) cmp lc($b) } @noLoginLogIDs;
+			@loginLogIDs   = sort { $coursesData{$a}{epoch_modify_time} <=> $coursesData{$b}{epoch_modify_time} }
+				@loginLogIDs;    # oldest first
+			@courseIDs = (@noLoginLogIDs, @loginLogIDs);
 		} else {
-			$coursesData{$courseID}{'status'} = $r->maketext('visible');
+			# In this case we sort alphabetically
+			@courseIDs = sort { lc($a) cmp lc($b) } @courseIDs;
 		}
-		$courseLabels{$courseID} =
-			"$courseID  ($coursesData{$courseID}{'status'} :: $coursesData{$courseID}{'local_modify_time'}) ";
-	}
-	if ($delete_listing_format eq 'last_login') {
-		# This should be an empty array except for the model course.
-		@noLoginLogIDs = sort { lc($a) cmp lc($b) } @noLoginLogIDs;
-		@loginLogIDs   = sort byLoginActivity @loginLogIDs;           # oldest first
-		@courseIDs     = (@noLoginLogIDs, @loginLogIDs);
-	} else {
-		# In this case we sort alphabetically
-		@courseIDs = sort { lc($a) cmp lc($b) } @courseIDs;
 	}
 
-	print CGI::start_form(-method => 'POST', -action => $r->uri);
-
-	print CGI::p($r->maketext(
-		'Courses are listed either alphabetically or in order by the time of most recent login activity, '
-			. 'oldest first. To change the listing order check the mode you want and click "Refresh Listing".  '
-			. 'The listing format is: Course_Name (status :: date/time of most recent login) where status is "hidden" '
-			. 'or "visible".'
-	));
-
-	print CGI::div(
-		{ class => 'mb-3' },
-		CGI::div({ class => 'mb-2' }, $r->maketext('Select a listing format:')),
-		map {
-			CGI::div(
-				{ class => 'form-check' },
-				CGI::input({
-					type  => 'radio',
-					name  => 'delete_listing_format',
-					id    => "delete_listing_format_$_->[0]",
-					value => $_->[0],
-					class => 'form-check-input',
-					$_->[0] eq ($r->param('delete_listing_format') // 'alphabetically') ? (checked => undef) : ()
-				}),
-				CGI::label(
-					{
-						for   => "delete_listing_format_$_->[0]",
-						class => 'form-check-label'
-					},
-					$_->[1]
-				)
-			)
-		} (
-			[ alphabetically => $r->maketext('alphabetically') ], [ last_login => $r->maketext('by last login date') ]
-		),
-	);
-
-	print CGI::div(
-		{ class => 'mb-2' },
-		CGI::submit({
-			name  => 'delete_course_refresh',
-			value => $r->maketext('Refresh Listing'),
-			class => 'btn btn-primary'
-		}),
-		CGI::submit({
-			name  => 'delete_course',
-			value => $r->maketext('Delete Course'),
-			class => 'btn btn-primary'
-		})
-	);
-
-	print $self->hidden_authen_fields;
-	print $self->hidden_fields('subDisplay');
-
-	print CGI::div({ class => 'mb-2' }, $r->maketext('Select a course to delete.'));
-	print CGI::div(
-		{ class => 'row mb-2' },
-		CGI::label(
-			{ for => 'delete_courseID', class => 'col-auto col-form-label fw-bold' },
-			$r->maketext('Course Name:')
-		),
-		CGI::div(
-			{ class => 'col-auto' },
-			CGI::scrolling_list({
-				name     => 'delete_courseID',
-				id       => 'delete_courseID',
-				values   => \@courseIDs,
-				default  => $r->param('delete_courseID') || '',
-				size     => 15,
-				multiple => 0,
-				labels   => \%courseLabels,
-				class    => 'form-select'
-			})
-		)
-	);
-
-	print CGI::div(
-		CGI::submit({
-			name  => 'delete_course_refresh',
-			value => $r->maketext('Refresh Listing'),
-			class => 'btn btn-primary'
-		}),
-		CGI::submit({
-			name  => 'delete_course',
-			value => $r->maketext('Delete Course'),
-			class => 'btn btn-primary'
-		})
+	return $c->include(
+		'ContentGenerator/CourseAdmin/delete_course_form',
+		courseIDs    => \@courseIDs,
+		courseLabels => \%courseLabels
 	);
-
-	print CGI::end_form();
 }
 
-sub delete_course_validate {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	#my $db = $r->db;
-	#my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-
-	my $delete_courseID     = $r->param("delete_courseID")     || "";
-
+sub delete_course_validate ($c) {
 	my @errors;
-
-	if ($delete_courseID eq "") {
-		push @errors,  $r->maketext("You must specify a course name.");
-	} elsif ($delete_courseID eq $urlpath->arg("courseID")) {
-		push @errors,  $r->maketext("You cannot delete the course you are currently using.");
+	if (!$c->param('delete_courseID')) {
+		push @errors, $c->maketext('You must specify a course name.');
+	} elsif ($c->param('delete_courseID') eq $c->stash('courseID')) {
+		push @errors, $c->maketext('You cannot delete the course you are currently using.');
 	}
 
-	my $ce2 = new WeBWorK::CourseEnvironment({
-		%WeBWorK::SeedCE,
-		courseName => $delete_courseID,
-	});
-
 	return @errors;
 }
 
-sub delete_course_confirm {
-	my ($self) = @_;
-	my $r      = $self->r;
-	my $ce     = $r->ce;
-
-	print CGI::h2($r->maketext('Delete Course'));
-
-	my $delete_courseID = $r->param('delete_courseID') || '';
-
-	my $ce2 = new WeBWorK::CourseEnvironment({ %WeBWorK::SeedCE, courseName => $delete_courseID });
-
-	print CGI::p($r->maketext(
-		'Are you sure you want to delete the course [_1]? All course files and data will be destroyed. '
-			. 'There is no undo available.',
-		CGI::b($delete_courseID)
-	));
-
-	print CGI::start_form({ method => 'POST', action => $r->uri });
-	print $self->hidden_authen_fields;
-	print $self->hidden_fields('subDisplay');
-	print $self->hidden_fields('delete_courseID');
-
-	print CGI::p(
-		{ style => 'text-align: center' },
-		CGI::submit({
-			name  => 'decline_delete_course',
-			label => $r->maketext("Don't delete"),
-			class => 'btn btn-primary'
-		}),
-		'&nbsp;',
-		CGI::submit({
-			name  => 'confirm_delete_course',
-			label => $r->maketext('Delete'),
-			class => 'btn btn-primary'
-		}),
-	);
-
-	print CGI::end_form();
+sub delete_course_confirm ($c) {
+	return $c->include('ContentGenerator/CourseAdmin/delete_course_confirm');
 }
 
-sub do_delete_course {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	#my $authz = $r->authz;
-	#my $urlpath = $r->urlpath;
-
-	my $delete_courseID     = $r->param("delete_courseID")     || "";
+sub do_delete_course ($c) {
+	my $ce = $c->ce;
+	my $db = $c->db;
 
-	my $ce2 = new WeBWorK::CourseEnvironment({
-		%WeBWorK::SeedCE,
-		courseName => $delete_courseID,
-	});
-
-	# this is kinda left over from when we had 'gdbm' and 'sql' database layouts
-	# below this line, we would grab values from getopt and put them in this hash
-	# but for now the hash can remain empty
-	my %dbOptions;
+	my $delete_courseID = $c->param('delete_courseID') || '';
 
 	eval {
 		deleteCourse(
 			courseID => $delete_courseID,
-			ce => $ce2,
-			dbOptions => \%dbOptions,
+			ce       => WeBWorK::CourseEnvironment->new({ courseName => $delete_courseID }),
 		);
 	};
 
 	if ($@) {
 		my $error = $@;
-		print CGI::div(
-			{ class => 'alert alert-danger p-1 mb-2' },
-			CGI::p($r->maketext("An error occured while deleting the course [_1]:", $delete_courseID)),
-			CGI::div({ class => 'font-monospace' }, CGI::escapeHTML($error)),
+		return $c->tag(
+			'div',
+			class => 'alert alert-danger p-1 my-2',
+			$c->c($c->tag('p', $c->maketext('An error occured while deleting the course [_1]:', $delete_courseID)),
+				$c->tag('div', class => 'font-monospace', $error))->join('')
 		);
 	} else {
-	    # mark the contact person in the admin course as dropped.
-	    # find the contact person for the course by searching the admin classlist.
-	    my @contacts = grep /_$delete_courseID$/,  $db->listUsers;
-	    if (@contacts) {
-			die "Incorrect number of contacts for the course $delete_courseID". join(" ", @contacts) if @contacts !=1;
-			#warn "contacts", join(" ", @contacts);
-			#my $composite_id = "${add_initial_userID}_${add_courseID}";
-			my $composite_id  = $contacts[0];
-
-			# mark the contact person as dropped.
-			my $User = $db->getUser($composite_id);
-			my $status_name = 'Drop';
-			my $status_value = ($ce->status_name_to_abbrevs($status_name))[0];
-			$User->status($status_value);
+		# Mark the contact person in the admin course as dropped.
+		# Find the contact person for the course by searching the admin classlist.
+		my @contacts = grep {/_$delete_courseID$/} $db->listUsers;
+		if (@contacts) {
+			die 'Incorrect number of contacts for the course $delete_courseID' . join(' ', @contacts) if @contacts != 1;
+
+			# Mark the contact person as dropped.
+			my $User = $db->getUser($contacts[0]);
+			$User->status(($ce->status_name_to_abbrevs('Drop'))[0]);
 			$db->putUser($User);
 		}
 
-		print CGI::div(
-			{ class => 'alert alert-success p-1 mb-2' },
-			$r->maketext("Successfully deleted the course [_1].", $delete_courseID),
-		);
-		 writeLog($ce, "hosted_courses", join("\t",
-	    	"\tDeleted",
-	    	"",
-	    	"",
-	    	$delete_courseID,
-	    ));
-		print CGI::start_form(-method=>"POST", -action=>$r->uri);
-		print $self->hidden_authen_fields;
-		print $self->hidden_fields("subDisplay");
-
-		print CGI::p({style=>"text-align: center"},
-			CGI::submit({
-					name => "decline_delete_course",
-					value => $r->maketext("OK"),
-					class => 'btn btn-primary'
-				}));
-
-		print CGI::end_form();
-	}
-}
-
-sub archive_course_form {
-	my ($self) = @_;
-	my $r      = $self->r;
-	my $ce     = $r->ce;
-
-	print CGI::h2($r->maketext('Archive Course'));
+		writeLog($ce, 'hosted_courses', join("\t", "\tDeleted", '', '', $delete_courseID));
 
-	print CGI::p($r->maketext(
-		'Creates a gzipped tar archive (.tar.gz) of a course in the WeBWorK courses directory. '
-			. 'Before archiving, the course database is dumped into a subdirectory of the course\'s DATA directory. '
-			. 'Currently the archive facility is only available for mysql databases. It depends on the mysqldump '
-			. 'application.'
-	));
-
-	my @courseIDs  = listCourses($ce);
-
-	unless (@courseIDs) {
-		print CGI::p($r->maketext('No courses found'));
-		return;
+		return $c->c(
+			$c->tag(
+				'div',
+				class => 'alert alert-success p-1 my-2',
+				$c->maketext('Successfully deleted the course [_1].', $delete_courseID),
+			),
+			$c->form_for(
+				$c->current_route,
+				method => 'POST',
+				$c->c(
+					$c->hidden_authen_fields,
+					$c->hidden_fields('subDisplay'),
+					$c->tag(
+						'div',
+						class => 'text-center',
+						$c->submit_button(
+							$c->maketext('OK'),
+							name  => 'decline_delete_course',
+							class => 'btn btn-primary'
+						)
+					)
+				)->join('')
+			)
+		)->join('');
 	}
+}
 
-	my $archive_listing_format = $r->param('archive_listing_format') // 'alphabetically';
-
-	my $coursesDir = $ce->{webworkDirs}{courses};
+sub archive_course_form ($c) {
+	my $ce = $c->ce;
 
-	# Get and store last modify time for login.log for all courses. Also get visibility status.
+	my @courseIDs = grep { $_ ne $c->stash('courseID') } listCourses($ce);
 	my %courseLabels;
-	my @noLoginLogIDs;
-	my @loginLogIDs;
 
-	my ($loginLogFile, $epoch_modify_time, $courseDir);
-	for my $courseID (@courseIDs) {
-		$loginLogFile = "$coursesDir/$courseID/logs/login.log";
-		if (-e $loginLogFile) {
-			# The login log file should always exist except for the model course.
-			$epoch_modify_time                           = stat($loginLogFile)->mtime;
-			$coursesData{$courseID}{'epoch_modify_time'} = $epoch_modify_time;
-			$coursesData{$courseID}{'local_modify_time'} = ctime($epoch_modify_time);
-			push(@loginLogIDs, $courseID);
-		} else {
-			# This is for the model course.
-			$coursesData{$courseID}{'local_modify_time'} = 'no login.log';
-			push(@noLoginLogIDs, $courseID);
-		}
-		if (-f "$coursesDir/$courseID/hide_directory") {
-			$coursesData{$courseID}{'status'} = $r->maketext('hidden');
+	if (@courseIDs) {
+		# Get and store last modify time for login.log for all courses. Also get visibility status.
+		my @noLoginLogIDs;
+		my @loginLogIDs;
+
+		my ($loginLogFile, $epoch_modify_time, $courseDir, %coursesData);
+		for my $courseID (@courseIDs) {
+			$loginLogFile = "$ce->{webworkDirs}{courses}/$courseID/logs/login.log";
+			if (-e $loginLogFile) {
+				# The login log file should always exist except for the model course.
+				$epoch_modify_time                         = stat($loginLogFile)->mtime;
+				$coursesData{$courseID}{epoch_modify_time} = $epoch_modify_time;
+				$coursesData{$courseID}{local_modify_time} = ctime($epoch_modify_time);
+				push(@loginLogIDs, $courseID);
+			} else {
+				# This is for the model course.
+				$coursesData{$courseID}{local_modify_time} = 'no login.log';
+				push(@noLoginLogIDs, $courseID);
+			}
+			if (-f "$ce->{webworkDirs}{courses}/$courseID/hide_directory") {
+				$coursesData{$courseID}{status} = $c->maketext('hidden');
+			} else {
+				$coursesData{$courseID}{status} = $c->maketext('visible');
+			}
+			$courseLabels{$courseID} =
+				"$courseID  ($coursesData{$courseID}{status} :: $coursesData{$courseID}{local_modify_time}) ";
+		}
+		if (($c->param('archive_listing_format') // 'alphabetically') eq 'last_login') {
+			# This should be an empty array except for the model course
+			@noLoginLogIDs = sort { lc($a) cmp lc($b) } @noLoginLogIDs;
+			@loginLogIDs   = sort { $coursesData{$a}{epoch_modify_time} <=> $coursesData{$b}{epoch_modify_time} }
+				@loginLogIDs;    # Oldest first
+			@courseIDs = (@noLoginLogIDs, @loginLogIDs);
 		} else {
-			$coursesData{$courseID}{'status'} = $r->maketext('visible');
+			# in this case we sort alphabetically
+			@courseIDs = sort { lc($a) cmp lc($b) } @courseIDs;
 		}
-		$courseLabels{$courseID} =
-			"$courseID  ($coursesData{$courseID}{'status'} :: $coursesData{$courseID}{'local_modify_time'}) ";
 	}
-	if ($archive_listing_format eq 'last_login') {
-		# This should be an empty array except for the model course
-		@noLoginLogIDs = sort { lc($a) cmp lc($b) } @noLoginLogIDs;
-		@loginLogIDs = sort byLoginActivity @loginLogIDs; # oldest first
-		@courseIDs   = (@noLoginLogIDs, @loginLogIDs);
-	} else {
-		# in this case we sort alphabetically
-		@courseIDs = sort { lc($a) cmp lc($b) } @courseIDs;
-	}
-
-	print CGI::p($r->maketext(
-		'Courses are listed either alphabetically or in order by the time of most recent login activity, oldest first. '
-			. 'To change the listing order check the mode you want and click "Refresh Listing".  '
-			. 'The listing format is: Course_Name (status :: date/time of most recent login) where status is "hidden" '
-			. 'or "visible".'
-	));
-
-	print CGI::start_form(-method => 'POST', -action => $r->uri);
-
-	print CGI::div(
-		{ class => 'mb-3' },
-		CGI::div({ class => 'mb-2' }, $r->maketext('Select a listing format:')),
-		map {
-			CGI::div(
-				{ class => 'form-check' },
-				CGI::input({
-					type  => 'radio',
-					name  => 'archive_listing_format',
-					id    => "archive_listing_format_$_->[0]",
-					value => $_->[0],
-					class => 'form-check-input',
-					$_->[0] eq ($r->param('archive_listing_format') // 'alphabetically') ? (checked => undef) : ()
-				}),
-				CGI::label(
-					{
-						for   => "archive_listing_format_$_->[0]",
-						class => 'form-check-label'
-					},
-					$_->[1]
-				)
-			)
-		} (
-			[ alphabetically => $r->maketext('alphabetically') ], [ last_login => $r->maketext('by last login date') ]
-		),
-	);
-
-	print CGI::div(
-		{ class => 'mb-2' },
-		CGI::submit({
-			name  => 'archive_course_refresh',
-			value => $r->maketext('Refresh Listing'),
-			class => 'btn btn-primary'
-		}),
-		CGI::submit({
-			name  => 'archive_course',
-			value => $r->maketext('Archive Courses'),
-			class => 'btn btn-primary'
-		})
-	);
-
-	print $self->hidden_authen_fields;
-	print $self->hidden_fields('subDisplay');
-
-	print CGI::div({ class => 'mb-2' }, $r->maketext('Select course(s) to archive.'));
-	print CGI::div(
-		{ class => 'row mb-2' },
-		CGI::label(
-			{ for => 'archive_courseIDs', class => 'col-auto col-form-label fw-bold' },
-			$r->maketext('Course Name:')
-		),
-		CGI::div(
-			{ class => 'col-auto' },
-			CGI::scrolling_list({
-				name     => 'archive_courseIDs',
-				id       => 'archive_courseIDs',
-				values   => \@courseIDs,
-				default  => $r->param('archive_courseID') || '',
-				size     => 15,
-				multiple => 1,
-				labels   => \%courseLabels,
-				class    => 'form-select'
-			})
-		)
-	);
-
-	print CGI::div(
-		{ class => 'row align-items-center mb-2' },
-		CGI::div({ class => 'col-auto fw-bold' }, $r->maketext('Delete course:')),
-		CGI::div(
-			{ class => 'col-auto' },
-			CGI::div(
-				{ class => 'form-check mb-0' },
-				CGI::checkbox({
-					name            => 'delete_course',
-					checked         => 0,
-					value           => 1,
-					label           => $r->maketext('Delete course after archiving. Caution there is no undo!'),
-					class           => 'form-check-input',
-					labelattributes => { class => 'form-check-label alert alert-danger py-0 px-1 mb-0' }
-				})
-			)
-		)
-	);
 
-	print CGI::div(
-		CGI::submit({
-			name  => 'archive_course_refresh',
-			value => $r->maketext('Refresh Listing'),
-			class => 'btn btn-primary'
-		}),
-		CGI::submit({
-			name  => 'archive_course',
-			value => $r->maketext('Archive Courses'),
-			class => 'btn btn-primary'
-		})
+	return $c->include(
+		'ContentGenerator/CourseAdmin/archive_course_form',
+		courseIDs    => \@courseIDs,
+		courseLabels => \%courseLabels
 	);
-
-	print CGI::end_form();
 }
 
-sub archive_course_validate {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	#my $db = $r->db;
-	#my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-
-	my @archive_courseIDs     = $r->param("archive_courseIDs");
-	@archive_courseIDs        = () unless @archive_courseIDs;
+sub archive_course_validate ($c) {
+	my @archive_courseIDs = $c->param('archive_courseIDs');
 	my @errors;
-	foreach my $archive_courseID (@archive_courseIDs) {
-		if ($archive_courseID eq "") {
-			push @errors,  $r->maketext("You must specify a course name.");
-		} elsif ($archive_courseID eq $urlpath->arg("courseID")) {
-			push @errors,  $r->maketext("You cannot archive the course you are currently using.");
+
+	push(@errors, $c->maketext('You must select a course to archive')) unless @archive_courseIDs;
+
+	for my $archive_courseID (@archive_courseIDs) {
+		if ($archive_courseID eq '') {
+			push @errors, $c->maketext('You must specify a course name.');
+		} elsif ($archive_courseID eq $c->stash('courseID')) {
+			push @errors, $c->maketext('You cannot archive the course you are currently using.');
 		}
 	}
 
-	#my $ce2 = new WeBWorK::CourseEnvironment({
-	#	%WeBWorK::SeedCE,
-	#	courseName => $archive_courseID,
-	#});
-
 	return @errors;
 }
 
-sub archive_course_confirm {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	#my $db = $r->db;
-	#my $authz = $r->authz;
-	#my $urlpath = $r->urlpath;
+sub archive_course_confirm ($c) {
+	my $ce = $c->ce;
 
-	print CGI::h2( $r->maketext("Archive Course"));
+	my @archive_courseIDs = $c->param('archive_courseIDs');
 
-	my $delete_course_flag   = $r->param("delete_course")        || "";
+	# If we are skipping a course remove one from the list of courses
+	shift @archive_courseIDs if defined $c->param('skip_archive_course');
 
-	my @archive_courseIDs     = $r->param("archive_courseIDs");
-	@archive_courseIDs        = () unless @archive_courseIDs;
-	# if we are skipping a course remove one from
-	# the list of courses
-	if (defined $r->param("skip_archive_course")) {
-	  shift @archive_courseIDs;
-	}
-
-	my $archive_courseID  = $archive_courseIDs[0];
+	my $archive_courseID = $archive_courseIDs[0];
 
-	my $ce2 = new WeBWorK::CourseEnvironment({
-		%WeBWorK::SeedCE,
-		courseName => $archive_courseID,
-	});
-
-
-	my ($tables_ok,$dbStatus);
-#############################################################################
-# Check database
-#############################################################################
-	my %missing_fields;
-	if ($ce2->{dbLayoutName} ) {
-	    my $CIchecker = new WeBWorK::Utils::CourseIntegrityCheck(ce=>$ce2);
-	    ($tables_ok,$dbStatus) = $CIchecker->checkCourseTables($archive_courseID);
-		if ($r->param("upgrade_course_tables")) {
-			my @schema_table_names = keys %$dbStatus;  # update tables missing from database;
-			my @tables_to_create = grep {$dbStatus->{$_}->[0] == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A} @schema_table_names;
-			my @tables_to_alter  = grep {$dbStatus->{$_}->[0] == WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B} @schema_table_names;
-			my $msg = $CIchecker->updateCourseTables($archive_courseID, [@tables_to_create]);
-			foreach my $table_name (@tables_to_alter) {
-				$msg .= $CIchecker->updateTableFields($archive_courseID, $table_name);
+	my $ce2 = WeBWorK::CourseEnvironment->new({ courseName => $archive_courseID });
+
+	if ($ce2->{dbLayoutName}) {
+		my $CIchecker = WeBWorK::Utils::CourseIntegrityCheck->new(ce => $ce2);
+
+		# Check database
+		my ($tables_ok, $dbStatus) = $CIchecker->checkCourseTables($archive_courseID);
+
+		# Upgrade the database if requested.
+		my @upgrade_report;
+		if ($c->param('upgrade_course_tables')) {
+			my @schema_table_names = keys %$dbStatus;
+			my @tables_to_create =
+				grep { $dbStatus->{$_}->[0] == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A } @schema_table_names;
+			my @tables_to_alter =
+				grep { $dbStatus->{$_}->[0] == WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B }
+				@schema_table_names;
+			push(@upgrade_report, $CIchecker->updateCourseTables($archive_courseID, [@tables_to_create]));
+			for my $table_name (@tables_to_alter) {
+				push(@upgrade_report, $CIchecker->updateTableFields($archive_courseID, $table_name));
 			}
-			print CGI::p({ class => 'text-success fw-bold' }, $msg);
-		}
-		if ($r->param("upgrade_course_tables") ) {
 
-			$CIchecker -> updateCourseDirectories();   # needs more error messages
+			($tables_ok, $dbStatus) = $CIchecker->checkCourseTables($archive_courseID);
 		}
- 		($tables_ok,$dbStatus) = $CIchecker->checkCourseTables($archive_courseID);
-
 
-		# print db status
+		# Update and check directories.
+		my $dir_update_messages = $c->param('upgrade_course_tables') ? $CIchecker->updateCourseDirectories : [];
+		my ($directories_ok, $directory_report) = $CIchecker->checkCourseDirectories($ce2);
 
-		my %msg = (
-			WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A =>
-				CGI::span({ class => 'text-danger' }, $r->maketext("Table defined in schema but missing in database")),
-			WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B =>
-				CGI::span({ class => 'text-danger' }, $r->maketext("Table defined in database but missing in schema")),
-			WeBWorK::Utils::CourseIntegrityCheck::SAME_IN_A_AND_B =>
-				CGI::span({ class => 'text-success' }, $r->maketext("Table is ok")),
-			WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B => CGI::span(
-				{ class => 'text-danger' },
-				$r->maketext("Schema and database table definitions do not agree")
-			),
-		);
-		my %msg2 = (
-			WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A =>
-				CGI::span({ class => 'text-danger' }, $r->maketext("Field missing in database")),
-			WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B =>
-				CGI::span({ class => 'text-danger' }, $r->maketext("Field missing in schema")),
-			WeBWorK::Utils::CourseIntegrityCheck::SAME_IN_A_AND_B =>
-				CGI::span({ class => 'text-success' }, $r->maketext("Field is ok")),
-			WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B => CGI::span(
-				{ class => 'text-danger' },
-				$r->maketext("Schema and database field definitions do not agree")
-			),
+		return $c->include(
+			'ContentGenerator/CourseAdmin/archive_course_confirm',
+			ce2                 => $ce2,
+			upgrade_report      => \@upgrade_report,
+			tables_ok           => $tables_ok,
+			dbStatus            => $dbStatus,
+			dir_update_messages => $dir_update_messages,
+			directory_report    => $directory_report,
+			directories_ok      => $directories_ok,
+			archive_courseID    => $archive_courseID,
+			archive_courseIDs   => \@archive_courseIDs
 		);
-		my $all_tables_ok=1;
-		my $extra_database_tables=0;
-		my $extra_database_fields=0;
-		my $str=CGI::h4($r->maketext("Report on database structure for course [_1]:", $archive_courseID)).CGI::br();
-		foreach my $table (sort keys %$dbStatus) {
-		    my $table_status = $dbStatus->{$table}->[0];
-			$str .= CGI::b($table) .": ".  $msg{ $table_status } . CGI::br();
-
-			CASE: {
-				$table_status == WeBWorK::Utils::CourseIntegrityCheck::SAME_IN_A_AND_B
-					&& do{ last CASE;
-					};
-				$table_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A
-					&& do{
-						   $all_tables_ok = 0; last CASE;
-					};
-				$table_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B
-					&& do{
-						   $extra_database_tables = 1; last CASE;
-					};
-				$table_status == WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B
-					&& do{
-					    my %fieldInfo = %{ $dbStatus->{$table}->[1] };
-						foreach my $key (keys %fieldInfo) {
-						    my $field_status = $fieldInfo{$key}->[0];
-						    CASE2: {
-						    	$field_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B
-						    		&& do{
-						    		   $extra_database_fields = 1; last CASE2;
-						    		};
-						    	$field_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A
-						    		&& do{
-						    		   $all_tables_ok=0; last CASE2;
-						    		};
-						    }
-							$str .= CGI::br()."\n&nbsp;&nbsp;$key => ". $msg2{$field_status };
-						}
-					};
-			}
-			$str.=CGI::br();
-
-		}
-#############################################################################
-# Report on databases
-#############################################################################
-
-		print CGI::p($str);
-		if ($extra_database_tables) {
-			print CGI::p(
-				{ class => 'text-danger fw-bold' },
-				$r->maketext(
-					'There are extra database tables which are not defined in the schema.  '
-						. 'These can be deleted when upgrading the course.'
-				)
-			);
-		}
-		if ($extra_database_fields) {
-			print CGI::p(
-				{ class => 'text-danger fw-bold' },
-				$r->maketext(
-					'There are extra database fields which are not defined in the schema for at least one table.  '
-						. 'They can only be removed when upgrading the course.'
-				)
-			);
-		}
-		if ($all_tables_ok) {
-			print CGI::p({ class => 'text-success fw-bold' },
-				$r->maketext("Course [_1] database is in order", $archive_courseID));
-			print(CGI::p(
-				{ class => 'text-danger fw-bold' },
-				$r->maketext(
-					"Are you sure that you want to delete the course [_1] after archiving? This cannot be undone!",
-					CGI::b($archive_courseID)
-				)
-			))
-				if $delete_course_flag;
-		} else {
-			print CGI::p(
-				{ class => 'text-danger fw-bold' },
-				$r->maketext(
-					'There are tables or fields missing from the database.  '
-						. 'The database must be upgraded before archiving this course.'
-				)
-			);
-		}
-#############################################################################
-# Check directories and report
-#############################################################################
-
-		my ($directories_ok, $str2) = $CIchecker->checkCourseDirectories($ce2);
-		print CGI::h2('Directory structure'), CGI::p($str2),
-			$directories_ok ? CGI::p({ class => 'text-success' }, $r->maketext('Directory structure is ok')) : CGI::p(
-				{ class => 'text-danger' },
-				$r->maketext(
-					'Directory structure is missing directories or the webserver lacks sufficient privileges.')
-			);
-
-#############################################################################
-# Print form for choosing next action.
-#############################################################################
-
-		print CGI::start_form(-method=>"POST", -action=>$r->uri);
-		print $self->hidden_authen_fields;
-		print $self->hidden_fields("subDisplay");
-		print $self->hidden_fields(qw/delete_course/);
-		print CGI::hidden('archive_courseID', $archive_courseID);
-		print CGI::hidden('archive_courseIDs',@archive_courseIDs);
-			# grab some values we'll need
-		my $course_dir   = $ce2->{courseDirs}{root};
-		my $archive_path = $ce2->{webworkDirs}{courses} . "/$archive_courseID.tar.gz";
-        # fail if the source course does not exist
-		unless (-e $course_dir) {
-			print CGI::p(  $r->maketext("[_1]: The directory for the course not found.",$archive_courseID));
-		}
-
-		if ($all_tables_ok && $directories_ok ) { # no missing fields
-			# Warn about overwriting an existing archive
-			if (-e $archive_path and -w $archive_path) {
-				print CGI::p(
-					{ class => 'text-danger fw-bold' },
-					$r->maketext(
-						"The course '[_1]' has already been archived at '[_2]'. "
-							. "This earlier archive will be erased.  This cannot be undone.",
-						$archive_courseID,
-						$archive_path
-					)
-				);
-			}
-			# archive execute button
-			print CGI::p({ style => "text-align: center" },
-				CGI::submit({
-						name => "decline_archive_course",
-					   	value => $r->maketext("Stop Archiving"),
-						class => 'btn btn-primary'
-					}),
-				"&nbsp;",
-				scalar(@archive_courseIDs) > 1
-					? CGI::submit({
-							name => "skip_archive_course",
-							value => $r->maketext("Skip archiving this course"),
-							class => 'btn btn-primary'
-						}) . "&nbsp;"
-					: '',
-				CGI::submit({
-						name => "confirm_archive_course",
-					   	value => $r->maketext("Archive"),
-						class => 'btn btn-primary'
-					}) ,
-			);
-		} elsif( $directories_ok)  {
-			print CGI::p({style=>"text-align: center"},
-				CGI::submit({
-						name => "decline_archive_course",
-						-value => $r->maketext("Don't Archive"),
-						class => 'btn btn-primary'
-					}),
-				"&nbsp;",
-				CGI::submit({
-						name => "upgrade_course_tables",
-						value => $r->maketext("Upgrade Course Tables"),
-						class => 'btn btn-primary'
-					})
-			);
-		} else {
-			print CGI::p({style=>"text-align: center"},
-			CGI::br(),
-			$r->maketext("Directory structure needs to be repaired manually before archiving."),CGI::br(),
-			CGI::submit({
-					name => "decline_archive_course",
-				   	value => $r->maketext("Don't Archive"),
-					class => 'btn btn-primary'
-				}),
-			CGI::submit({
-					name => "upgrade_course_tables",
-				   	value => $r->maketext("Attempt to upgrade directories"),
-					class => 'btn btn-primary'
-				}),
-			);
-
-		}
-		print CGI::end_form();
 	} else {
-		print CGI::p({ class => 'text-danger fw-bold' }, "Unable to find database layout for $archive_courseID");
+		return $c->tag('p', class => 'text-danger fw-bold', "Unable to find database layout for $archive_courseID");
 	}
 }
 
-sub do_archive_course {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	#my $authz = $r->authz;
-	#my $urlpath = $r->urlpath;
+sub do_archive_course ($c) {
+	my $ce = $c->ce;
+	my $db = $c->db;
 
+	my @archive_courseIDs = $c->param('archive_courseIDs');
+	my $archive_courseID  = $archive_courseIDs[0];
 
-	my $delete_course_flag   = $r->param("delete_course")        || "";
-	my @archive_courseIDs     = $r->param("archive_courseIDs");
-	@archive_courseIDs        = () unless @archive_courseIDs;
-	my $archive_courseID = $archive_courseIDs[0];
+	my $ce2 = WeBWorK::CourseEnvironment->new({ courseName => $archive_courseID });
 
-	my $ce2 = new WeBWorK::CourseEnvironment({
-		%WeBWorK::SeedCE,
-		courseName => $archive_courseID,
-	});
+	# Remove course specific temp files before archiving, but don't delete the temp directory itself.
+	remove_tree($ce2->{courseDirs}{html_temp}, { keep_root => 1 });
 
-	# Remove course specific temp files before archiving
-	my $courseTempDir = $ce2->{courseDirs}{html_temp};
-	remove_tree("$courseTempDir");
 	# Remove the original default tmp directory if it exists
 	my $orgDefaultCourseTempDir = "$ce2->{courseDirs}{html}/tmp";
-	if (-d "$orgDefaultCourseTempDir") {
-		remove_tree("$orgDefaultCourseTempDir");
+	if (-d $orgDefaultCourseTempDir) {
+		remove_tree($orgDefaultCourseTempDir);
 	}
 
-	# this is kinda left over from when we had 'gdbm' and 'sql' database layouts
-	# below this line, we would grab values from getopt and put them in this hash
-	# but for now the hash can remain empty
-	my %dbOptions;
-
-	eval {
-		archiveCourse(
-			courseID => $archive_courseID,
-			ce => $ce2,
-			dbOptions => \%dbOptions,
-		);
-	};
+	my $message = eval { archiveCourse(courseID => $archive_courseID, ce => $ce2); };
 
 	if ($@) {
 		my $error = $@;
-		print CGI::div(
-			{ class => 'alert alert-danger p-1 mb-2' },
-			CGI::p($r->maketext("An error occured while archiving the course [_1]:", $archive_courseID)),
-			CGI::div({ class => 'font-monospace' }, CGI::escapeHTML($error)),
+		return $c->tag(
+			'div',
+			class => 'alert alert-danger p-1 mb-2',
+			$c->c(
+				$c->tag('p',   $c->maketext('An error occured while archiving the course [_1]:', $archive_courseID)),
+				$c->tag('div', class => 'font-monospace', $error)
+			)->join('')
 		);
 	} else {
-		print CGI::div(
-			{ class => 'alert alert-success p-1 mb-2' },
-			$r->maketext("Successfully archived the course [_1].", $archive_courseID)
+		my $output = $c->c;
+		push(@$output, $c->tag('div', class => 'alert alert-danger p-1 mb-2', $message)) if $message;
+		push(
+			@$output,
+			$c->tag(
+				'div',
+				class => 'alert alert-success p-1 mb-2',
+				$c->maketext('Successfully archived the course [_1].', $archive_courseID)
+			)
 		);
-		 writeLog($ce, "hosted_courses", join("\t",
-	    	"\tarchived",
-	    	"",
-	    	"",
-	    	$archive_courseID,
-	    ));
-
-		if ($delete_course_flag) {
-			eval {
-				deleteCourse(
-					courseID => $archive_courseID,
-					ce => $ce2,
-					dbOptions => \%dbOptions,
-				);
-			};
+		writeLog($ce, 'hosted_courses', join("\t", "\tarchived", '', '', $archive_courseID,));
+
+		if ($c->param('delete_course')) {
+			eval { deleteCourse(courseID => $archive_courseID, ce => $ce2); };
 
 			if ($@) {
 				my $error = $@;
-				print CGI::div(
-					{ class => 'alert alert-danger p-1 mb-2' },
-					CGI::p($r->maketext("An error occured while deleting the course [_1]:", $archive_courseID)),
-					CGI::div({ class => 'font-monospace' }, CGI::escapeHTML($error)),
+				push(
+					@$output,
+					$c->tag(
+						'div',
+						class => 'alert alert-danger p-1 mb-2',
+						$c->c(
+							$c->tag(
+								'p',
+								$c->maketext('An error occured while deleting the course [_1]:', $archive_courseID)
+							),
+							$c->tag('div', class => 'font-monospace', $error)
+						)->join('')
+					)
 				);
 			} else {
-				# mark the contact person in the admin course as dropped.
-				# find the contact person for the course by searching the admin classlist.
-				my @contacts = grep /_$archive_courseID$/,  $db->listUsers;
+				# Mark the contact person in the admin course as dropped.
+				# Find the contact person for the course by searching the admin classlist.
+				my @contacts = grep {/_$archive_courseID$/} $db->listUsers;
 				if (@contacts) {
-					die "Incorrect number of contacts for the course $archive_courseID". join(" ", @contacts) if @contacts !=1;
-					#warn "contacts", join(" ", @contacts);
-					#my $composite_id = "${add_initial_userID}_${add_courseID}";
-					my $composite_id  = $contacts[0];
-
-					# mark the contact person as dropped.
-					my $User = $db->getUser($composite_id);
-					my $status_name = 'Drop';
+					die "Incorrect number of contacts for the course $archive_courseID" . join(' ', @contacts)
+						if @contacts != 1;
+					my $composite_id = $contacts[0];
+
+					my $User         = $db->getUser($composite_id);
+					my $status_name  = 'Drop';
 					my $status_value = ($ce->status_name_to_abbrevs($status_name))[0];
 					$User->status($status_value);
 					$db->putUser($User);
 				}
 
-				print CGI::div(
-					{ class => 'alert alert-success p-1 mb-2' },
-					$r->maketext("Successfully deleted the course [_1].", $archive_courseID),
+				push(
+					@$output,
+					$c->tag(
+						'div',
+						class => 'alert alert-success p-1 mb-2',
+						$c->maketext('Successfully deleted the course [_1].', $archive_courseID),
+					)
 				);
 			}
 
-
 		}
-		shift @archive_courseIDs;  # remove the course which has just been archived.
+		shift @archive_courseIDs;    # Remove the course which has just been archived.
 		if (@archive_courseIDs) {
-			print CGI::start_form(-method=>"POST", -action=>$r->uri);
-			print $self->hidden_authen_fields;
-			print $self->hidden_fields("subDisplay");
-			print $self->hidden_fields(qw/delete_course/);
-
-			print CGI::hidden('archive_courseIDs',@archive_courseIDs);
-			print CGI::p({ style => "text-align: center" },
-			   	CGI::submit({
-					   	name => "decline_archive_course",
-					   	value => $r->maketext("Stop archiving courses"),
-						class => 'btn btn-primary'
-					}),
-				CGI::submit({
-						name => "archive_course",
-						value => $r->maketext("Archive next course"),
-						class => 'btn btn-primary'
-					})
+			push(
+				@$output,
+				$c->form_for(
+					$c->current_route,
+					method => 'POST',
+					$c->c(
+						$c->hidden_authen_fields,
+						$c->hidden_fields(qw(subDisplay delete_course)),
+						(map { $c->hidden_field(archive_courseIDs => $_) } @archive_courseIDs),
+						$c->tag(
+							'div',
+							class => 'd-flex justify-content-center gap-2',
+							$c->c(
+								$c->submit_button(
+									$c->maketext('Stop archiving courses'),
+									name  => 'decline_archive_course',
+									class => 'btn btn-primary'
+								),
+								$c->submit_button(
+									$c->maketext('Archive next course'),
+									name  => 'archive_course',
+									class => 'btn btn-primary'
+								)
+							)->join('')
+						)
+					)->join('')
+				)
+			);
+		} else {
+			push(
+				@$output,
+				$c->form_for(
+					$c->current_route,
+					method => 'POST',
+					$c->c(
+						$c->hidden_authen_fields,
+						$c->hidden_fields('subDisplay'),
+						$c->hidden_field(archive_courseIDs => $archive_courseID),
+						$c->tag(
+							'div',
+							class => 'd-flex justify-content-center gap-2',
+							$c->submit_button(
+								$c->maketext('OK'),
+								name  => 'decline_archive_course',
+								class => 'btn btn-primary'
+							)
+						)
+					)->join('')
+				)
 			);
- 			print CGI::end_form();
- 		} else {
-			print CGI::start_form(-method=>"POST", -action=>$r->uri);
-			print $self->hidden_authen_fields;
-			print $self->hidden_fields("subDisplay");
-			print CGI::hidden('archive_courseIDs',$archive_courseID);
-			print CGI::p(CGI::submit({
-						name => "decline_archive_course",
-						value => $r->maketext("OK"),
-						class => 'btn btn-primary'
-					}));
-			print CGI::end_form();
 		}
-	}
-}
-
-##########################################################################
-
-sub unarchive_course_form {
-	my ($self) = @_;
-	my $r      = $self->r;
-	my $ce     = $r->ce;
-
-	print CGI::h2($r->maketext('Unarchive Course'));
 
-	print CGI::p($r->maketext(
-		'Restores a course from a gzipped tar archive (.tar.gz). After unarchiving, the course database is '
-			. "restored from a subdirectory of the course's DATA directory. Currently the archive facility is only "
-			. 'available for mysql databases. It depends on the mysqldump application.'
-	));
-
-	# First find courses which have been archived.
-	my @courseIDs = sort { lc($a) cmp lc($b) } listArchivedCourses($ce);    # Make sort case insensitive
-
-	unless (@courseIDs) {
-		print CGI::p($r->maketext('No course archives found.'));
-		return;
-	}
-
-	my %courseLabels;
-	for my $courseID (@courseIDs) {
-		$courseLabels{$courseID} = $courseID;
+		return $output->join('');
 	}
+}
 
-	print CGI::start_form({ method => 'POST', action => $r->uri });
-	print $self->hidden_authen_fields;
-	print $self->hidden_fields('subDisplay');
+sub unarchive_course_form ($c) {
+	return $c->include('ContentGenerator/CourseAdmin/unarchive_course_form');
+}
 
-	print CGI::div({ class => 'mb-2' }, $r->maketext('Select a course to unarchive.'));
+sub unarchive_course_validate ($c) {
+	my $ce = $c->ce;
 
-	print CGI::div(
-		{ class => 'col-lg-7 col-md-8' },
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'unarchive_courseID', class => 'col-sm-4 col-form-label' },
-				$r->maketext('Course Name:')
-			),
-			CGI::div(
-				{ class => 'col-sm-8' },
-				CGI::scrolling_list({
-					name     => 'unarchive_courseID',
-					id       => 'unarchive_courseID',
-					values   => \@courseIDs,
-					default  => $r->param('unarchive_courseID') || '',
-					size     => 10,
-					multiple => 0,
-					labels   => \%courseLabels,
-					class    => 'form-select'
-				})
-			)
-			),
-		CGI::div(
-			{ class => 'row mb-2 align-items-center' },
-			CGI::div(
-				{ class => 'col-sm-4' },
-				CGI::div(
-					{ class => 'form-check' },
-					CGI::checkbox({
-						name            => 'create_newCourseID',
-						value           => 1,
-						label           => $r->maketext('New Name:'),
-						class           => 'form-check-input',
-						labelattributes => { class => 'form-check-label', id => 'create_newCourseID_label' }
-					})
-				)
-			),
-			CGI::div(
-				{ class => 'col-sm-8' },
-				CGI::textfield({
-					name            => 'new_courseID',
-					value           => '',
-					size            => 25,
-					maxlength       => $ce->{maxCourseIdLength},
-					class           => 'form-control',
-					aria_labelledby => 'create_newCourseID_label'
-				})
-			)
-		)
-	);
+	my $unarchive_courseID = $c->param('unarchive_courseID') || '';
+	my $new_courseID       = $c->param('new_courseID')       || '';
 
-	print CGI::div(
-		CGI::submit({
-			name  => 'unarchive_course',
-			value => $r->maketext('Unarchive Course'),
-			class => 'btn btn-primary'
-		})
-	);
+	# Use the archive name for the course unless a course id was provided.
+	my $courseID = ($c->param('create_newCourseID') ? $new_courseID : $unarchive_courseID) =~ s/\.tar\.gz$//r;
 
-	print CGI::end_form();
-}
+	debug(" unarchive_courseID $unarchive_courseID new_courseID $new_courseID ");
 
-sub unarchive_course_validate {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	#my $db = $r->db;
-	#my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-
-	my $unarchive_courseID                   = $r->param("unarchive_courseID")             || "";
-	my $create_newCourseID                   = $r->param("create_newCourseID")      || "";
-	my $new_courseID                         = $r->param("new_courseID")    || "";
 	my @errors;
-	#by default we use the archive name for the course
-	my $courseID = $unarchive_courseID;
-	$courseID =~ s/\.tar\.gz$//;
 
-	if ( $create_newCourseID) {
-		$courseID = $new_courseID;
+	if ($courseID eq '') {
+		push @errors, $c->maketext('You must specify a course name.');
+	} elsif (-d "$ce->{webworkDirs}->{courses}/$courseID") {
+		# Check that a directory for this course doesn't already exist.
+		push @errors,
+			$c->maketext(
+				'A directory already exists with the name [_1]. '
+				. 'You must first delete this existing course before you can unarchive.',
+				$courseID
+			);
+	} elsif (length($courseID) > $ce->{maxCourseIdLength}) {
+		push @errors, $c->maketext('Course ID cannot exceed [_1] characters.', $ce->{maxCourseIdLength});
 	}
-	debug(" unarchive_courseID $unarchive_courseID new_courseID $new_courseID ");
 
-	if ($courseID eq "") {
-		push @errors, $r->maketext("You must specify a course name.");
-	} elsif ( -d $ce->{webworkDirs}->{courses}."/$courseID" ) {
-	    #Check that a directory for this course doesn't already exist
-		push @errors, $r->maketext("A directory already exists with the name [_1]. You must first delete this existing course before you can unarchive.",$courseID);
-	} elsif ( length($courseID) > $ce->{maxCourseIdLength} ) {
-		push @errors, $r->maketext("Course ID cannot exceed [_1] characters.", $ce->{maxCourseIdLength});
+	unless ($courseID =~ /^[\w-]*$/) {    # regex copied from CourseAdministration.pm
+		push @errors, $c->maketext('Course ID may only contain letters, numbers, hyphens, and underscores.');
 	}
 
-
 	return @errors;
 }
 
-sub unarchive_course_confirm {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	#my $db = $r->db;
-	#my $authz = $r->authz;
-	#my $urlpath = $r->urlpath;
+sub unarchive_course_confirm ($c) {
+	my $ce = $c->ce;
 
-	print CGI::h2($r->maketext("Unarchive Course"));
+	my $unarchive_courseID = $c->param('unarchive_courseID') || '';
+	my $new_courseID       = $c->param('new_courseID')       || '';
 
-	my $unarchive_courseID                    = $r->param("unarchive_courseID")     || "";
-	my $create_newCourseID                    = $r->param("create_newCourseID")     || "";
-	my $new_courseID                          = $r->param("new_courseID")           || "";
+	my $courseID = ($c->param('create_newCourseID') ? $new_courseID : $unarchive_courseID) =~ s/\.tar\.gz//r;
 
-	my $courseID = $unarchive_courseID; $courseID =~ s/\.tar\.gz$//;
+	debug(" unarchive_courseID $unarchive_courseID new_courseID $new_courseID ");
 
-	if ( $create_newCourseID) {
-		$courseID = $new_courseID;
-	}
+	return $c->include(
+		'ContentGenerator/CourseAdmin/unarchive_course_confirm',
+		unarchive_courseID => $unarchive_courseID,
+		courseID           => $courseID
+	);
+}
 
-    debug(" unarchive_courseID $unarchive_courseID new_courseID $new_courseID ");
+sub do_unarchive_course ($c) {
+	my $ce = $c->ce;
 
-	print CGI::start_form(-method=>"POST", -action=>$r->uri);
-		print CGI::p($r->maketext("Unarchive [_1] to course:", $unarchive_courseID),
-	             CGI::input({-name=>'new_courseID', -value=>$courseID})
-	);
+	my $new_courseID = $c->param('new_courseID');
 
-	print $self->hidden_authen_fields;
-	print $self->hidden_fields("subDisplay");
-	print $self->hidden_fields(qw/unarchive_courseID create_newCourseID/);
-
-	print CGI::p({ style => "text-align: center" },
-		CGI::submit({
-				name => "decline_unarchive_course",
-			   	value => $r->maketext("Don't Unarchive"),
-				class => 'btn btn-primary'
-			}),
-		"&nbsp;",
-		CGI::submit({
-				name => "confirm_unarchive_course",
-			   	value => $r->maketext("Unarchive"),
-				class => 'btn btn-primary'
-			}),
-	);
+	return $c->tag('div', class => 'alert alert-danger p-1 mb-2', $c->maketext('You must specify a course name.'))
+		unless $new_courseID;
 
-	print CGI::end_form();
-}
+	my $unarchive_courseID = $c->param('unarchive_courseID') || '';
 
-sub do_unarchive_course {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	#my $db = $r->db;
-	#my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-	my $new_courseID           = $r->param("new_courseID")           || "";
-	my $unarchive_courseID     = $r->param("unarchive_courseID")     || "";
-
-	my $old_courseID   = $unarchive_courseID;
-	$old_courseID =~ s/.tar.gz//;
-
-	#eval {
-		unarchiveCourse(
-			newCourseID => $new_courseID,
-			oldCourseID => $old_courseID,
-			archivePath =>$ce->{webworkDirs}->{courses}."/$unarchive_courseID",
-			ce => $ce,
-		);
-	#};
+	unarchiveCourse(
+		newCourseID => $new_courseID,
+		oldCourseID => $unarchive_courseID =~ s/\.tar\.gz$//r,
+		archivePath => "$ce->{webworkDirs}{courses}/admin/archives/$unarchive_courseID",
+		ce          => $ce,
+	);
 
 	if ($@) {
 		my $error = $@;
-		print CGI::div(
-			{ class => 'alert alert-danger p-1 mb-2' },
-			CGI::p($r->maketext("An error occured while archiving the course [_1]:", $unarchive_courseID)),
-			CGI::div({ class => 'font-monospace' }, CGI::escapeHTML($error)),
+		return $c->tag(
+			'div',
+			class => 'alert alert-danger p-1 mb-2',
+			$c->c(
+				$c->tag(
+					'p', $c->maketext('An error occured while archiving the course [_1]:', $unarchive_courseID)
+				),
+				$c->tag('div', class => 'font-monospace', $error)
+			)->join('')
 		);
 	} else {
-		print CGI::div(
-			{ class => 'alert alert-success p-1 mb-2' },
-			$r->maketext("Successfully unarchived [_1] to the course [_2]", $unarchive_courseID, $new_courseID),
-		);
-		 writeLog($ce, "hosted_courses", join("\t",
-	    	"\tunarchived",
-	    	"",
-	    	"",
-	    	"$unarchive_courseID to $new_courseID",
-	    ));
-
-		my $newCoursePath = $urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets", $r,
-			courseID => $new_courseID);
-		my $newCourseURL = $self->systemLink($newCoursePath, authen => 0);
-		print CGI::div({style=>"text-align: center"},
-			CGI::a({href=>$newCourseURL}, $r->maketext("Log into [_1]", $new_courseID)),
-		);
+		writeLog($ce, 'hosted_courses', join("\t", "\tunarchived", '', '', "$unarchive_courseID to $new_courseID",));
 
-		print CGI::start_form(-method=>"POST", -action=>$r->uri);
-		print $self->hidden_authen_fields;
-		print $self->hidden_fields("subDisplay");
-		print CGI::hidden("unarchive_courseID",$unarchive_courseID);
-		print CGI::p(CGI::submit({
-					name => "decline_unarchive_course",
-					value => $r->maketext("Unarchive Next Course"),
-					class => 'btn btn-primary'
-				}));
- 		print CGI::end_form();
+		return $c->c(
+			$c->tag(
+				'div',
+				class => 'alert alert-success p-1 mb-2',
+				$c->maketext('Successfully unarchived [_1] to the course [_2]', $unarchive_courseID, $new_courseID),
+			),
+			$c->tag(
+				'div',
+				class => 'text-center',
+				$c->link_to(
+					$c->maketext('Log into [_1]', $new_courseID) => 'set_list' => { courseID => $new_courseID }
+				),
+			),
+			$c->form_for(
+				$c->current_route,
+				method => 'POST',
+				$c->c(
+					$c->hidden_authen_fields,
+					$c->hidden_fields('subDisplay'),
+					$c->hidden_field(unarchive_courseID => $unarchive_courseID),
+					$c->tag(
+						'div',
+						class => 'd-flex justify-content-center mt-2',
+						$c->submit_button(
+							$c->maketext('Unarchive Next Course'),
+							name  => 'decline_unarchive_course',
+							class => 'btn btn-primary'
+						)
+					)
+				)->join('')
+			)
+		)->join('');
 	}
 }
 
-##########################################################################
 # Course upgrade methods
 
-sub upgrade_course_form {
-	my ($self) = @_;
-	my $r      = $self->r;
-	my $ce     = $r->ce;
-
-	my @courseIDs = listCourses($ce);
-	@courseIDs = sort { lc($a) cmp lc($b) } @courseIDs;    # make sort case insensitive
-
-	print CGI::h2($r->maketext('Upgrade Courses'));
-
-	print CGI::div({ class => 'mb-2' }, $r->maketext('Update the checked directories?'));
-
-	print CGI::start_form({ method => 'POST', action => $r->uri, id => 'courselist', name => 'courselist' });
-
-	print CGI::div(
-		{ class => 'mb-2' },
-		CGI::input({
-			type              => 'button',
-			value             => $r->maketext('Select all eligible courses'),
-			class             => 'select-all btn btn-sm btn-secondary',
-			data_select_group => 'upgrade_courseIDs'
-		}),
-		CGI::input({
-			type              => 'button',
-			value             => $r->maketext('Unselect all courses'),
-			class             => 'select-none btn btn-sm btn-secondary',
-			data_select_group => 'upgrade_courseIDs'
-		})
-	);
-
-	print $self->hidden_authen_fields;
-	print $self->hidden_fields('subDisplay');
-
-	print CGI::start_ul();
-	foreach my $courseID (@courseIDs) {
-		next if $courseID eq 'modelCourse';   # modelCourse isn't a real course so don't create missing directories, etc
-		next unless $courseID =~ /\S/;        # skip empty courseIDs (there shouldn't be any)
-		my $urlpath = $r->urlpath->newFromModule('WeBWorK::ContentGenerator::ProblemSets', $r, courseID => $courseID);
-		my $tempCE;
-		eval { $tempCE = new WeBWorK::CourseEnvironment({ %WeBWorK::SeedCE, courseName => $courseID, }) };
-		print $r->maketext("Can't create course environment for [_1] because [_2]", $courseID, $@) if $@;
-		my $CIchecker = new WeBWorK::Utils::CourseIntegrityCheck(ce => $tempCE);
-		$CIchecker->updateCourseDirectories();    #creates missing html_temp, mailmerge tmpEditFileDir directories;
-		my ($tables_ok,      $dbStatus) = $CIchecker->checkCourseTables($courseID);
-		my ($directories_ok, $str2)     = $CIchecker->checkCourseDirectories();
-		my $checked = ($tables_ok && $directories_ok) ? 0 : 1;    # don't check if everything is ok
-
-		print CGI::li(
-			{ class => 'align-items-center' },
-			# Only show the checkbox if the course is not up to date.
-			$checked ? CGI::div(
-				{ class => 'form-check form-check-inline me-1' },
-				CGI::checkbox({
-					name            => 'upgrade_courseIDs',
-					label           => $r->maketext('Upgrade'),
-					selected        => $checked,
-					value           => $courseID,
-					class           => 'form-check-input',
-					labelattributes => { class => 'form-check-label' }
-				})
-			) : '',
-			CGI::a({ href => $self->systemLink($urlpath, authen => 0) }, $courseID),
-			CGI::code($tempCE->{dbLayoutName},),
-			$directories_ok ? '' : CGI::span(
-				{ class => 'alert alert-danger p-1 mb-0' },
-				$r->maketext('Directory structure or permissions need to be repaired. ')
-			),
-			$tables_ok
-			? CGI::span({ class => 'text-success' }, $r->maketext('Database tables ok'))
-			: CGI::span({ class => 'text-danger' },  $r->maketext('Database tables need updating.')),
-		);
-	}
-	print CGI::end_ul();
-
-	print CGI::div(CGI::submit({
-		name  => 'upgrade_course',
-		value => $r->maketext('Upgrade Courses'),
-		class => 'btn btn-primary'
-	}));
-
-	print CGI::end_form();
+sub upgrade_course_form ($c) {
+	return $c->include('ContentGenerator/CourseAdmin/upgrade_course_form');
 }
 
-sub upgrade_course_validate {
-	my $self = shift;
-	my $r    = $self->r;
-
-	my @upgrade_courseIDs = ($r->param("upgrade_courseIDs"));
-
+sub upgrade_course_validate ($c) {
 	my @errors;
-	for my $upgrade_courseID (@upgrade_courseIDs) {
-		if ($upgrade_courseID eq '') {
-			push @errors, $r->maketext('You must specify a course name.');
-		}
+	for ($c->param('upgrade_courseIDs')) {
+		push @errors, $c->maketext('You must specify a course name.') if ($_ eq '');
 	}
 
 	return @errors;
 }
 
-sub upgrade_course_confirm {
-	my ($self) = @_;
-	my $r      = $self->r;
-	my $ce     = $r->ce;
-	my $db     = $r->db;
+sub upgrade_course_confirm ($c) {
+	my $ce = $c->ce;
+	my $db = $c->db;
 
-	my @upgrade_courseIDs = ($r->param("upgrade_courseIDs"));
+	my @upgrade_courseIDs = $c->param('upgrade_courseIDs');
 
 	my ($extra_database_tables_exist, $extra_database_fields_exist) = (0, 0);
 
-	print CGI::start_form({ method => 'POST', action => $r->uri });
+	my $status_output = $c->c;
 
-	my $output = '';
 	for my $upgrade_courseID (@upgrade_courseIDs) {
 		next unless $upgrade_courseID =~ /\S/;    # skip empty values
 
 		# Analyze one course
-		my $ce2 = new WeBWorK::CourseEnvironment({ %WeBWorK::SeedCE, courseName => $upgrade_courseID });
+		my $ce2 = WeBWorK::CourseEnvironment->new({ courseName => $upgrade_courseID });
 
 		# Create integrity checker
-		my $CIchecker = new WeBWorK::Utils::CourseIntegrityCheck(ce => $ce2);
+		my $CIchecker = WeBWorK::Utils::CourseIntegrityCheck->new(ce => $ce2);
 
 		# Report on database status
 		my ($tables_ok, $dbStatus) = $CIchecker->checkCourseTables($upgrade_courseID);
-		my ($all_tables_ok, $extra_database_tables, $extra_database_fields, $str) =
-			$self->formatReportOnDatabaseTables($tables_ok, $dbStatus, $upgrade_courseID);
-
-		$output .= CGI::start_div({ class => 'border border-dark rounded p-2 mb-2' });
-
-		# Add the report on databases to the output.
-		$output .= CGI::div(
-			{ class => 'form-check mb-2' },
-			CGI::checkbox({
-				name            => 'upgrade_courseIDs',
-				label           => $r->maketext('Upgrade [_1]', $upgrade_courseID),
-				selected        => 1,
-				value           => $upgrade_courseID,
-				class           => 'form-check-input',
-				labelattributes => { class => 'form-check-label' }
-			})
+		my ($all_tables_ok, $extra_database_tables, $extra_database_fields, $db_report) =
+			$c->formatReportOnDatabaseTables($dbStatus, $upgrade_courseID);
+
+		my $course_output = $c->c;
+
+		# Add the report on course database to the output.
+		push(
+			@$course_output,
+			$c->tag(
+				'div',
+				class => 'form-check mb-2',
+				$c->tag(
+					'label',
+					class => 'form-check-label',
+					$c->c(
+						$c->check_box(
+							upgrade_courseIDs => $upgrade_courseID,
+							checked           => undef,
+							class             => 'form-check-input',
+						),
+						$c->maketext('Upgrade [_1]', $upgrade_courseID)
+					)->join('')
+				)
+			)
 		);
-		$output .= CGI::h2($r->maketext('Report for course [_1]:', $upgrade_courseID));
-		$output .= CGI::div({ class => 'mb-2' }, $r->maketext('Database:'));
-		$output .= $str;
+		push(@$course_output, $c->tag('h2',  $c->maketext('Report for course [_1]:', $upgrade_courseID)));
+		push(@$course_output, $c->tag('div', class => 'mb-2', $c->maketext('Database:')));
+		push(@$course_output, $db_report);
 
 		if ($extra_database_tables) {
 			$extra_database_tables_exist = 1;
-			$output .= CGI::p(
-				{ class => 'text-danger fw-bold' },
-				$r->maketext('There are extra database tables which are not defined in the schema. ')
-					. 'Check the checkbox by the table to delete it when upgrading the course. '
-					. 'Warning: Deletion destroys all data contained in the table and is not undoable!'
+			push(
+				@$course_output,
+				$c->tag(
+					'p',
+					class => 'text-danger fw-bold',
+					$c->maketext('There are extra database tables which are not defined in the schema. ')
+						. 'Check the checkbox by the table to delete it when upgrading the course. '
+						. 'Warning: Deletion destroys all data contained in the table and is not undoable!'
+				)
 			);
 		}
 
 		if ($extra_database_fields) {
 			$extra_database_fields_exist = 1;
-			$output .= CGI::p(
-				{ class => 'text-danger fw-bold' },
-				$r->maketext(
-					'There are extra database fields which are not defined in the schema for at least one table. '
-						. 'Check the checkbox by the field to delete it when upgrading the course. '
-						. 'Warning: Deletion destroys all data contained in the field and is not undoable!'
+			push(
+				@$course_output,
+				$c->tag(
+					'p',
+					class => 'text-danger fw-bold',
+					$c->maketext(
+						'There are extra database fields which are not defined in the schema for at least one table. '
+							. 'Check the checkbox by the field to delete it when upgrading the course. '
+							. 'Warning: Deletion destroys all data contained in the field and is not undoable!'
+					)
 				)
 			);
 		}
 
 		# Report on directory status
-		my ($directories_ok, $str2) = $CIchecker->checkCourseDirectories();
-		$output .= CGI::div({ class => 'mb-2' }, $r->maketext('Directory structure:'));
-		$output .= $str2;
-		$output .=
+		my ($directories_ok, $directory_report) = $CIchecker->checkCourseDirectories;
+		push(@$course_output, $c->tag('div', class => 'mb-2', $c->maketext('Directory structure:')));
+		push(
+			@$course_output,
+			$c->tag(
+				'ul',
+				$c->c(
+					map {
+						$c->tag(
+							'li',
+							$c->c("$_->[0]: ",
+								$c->tag('span', class => $_->[2] ? 'text-success' : 'text-danger', $_->[1]))
+								->join('')
+						)
+					} @$directory_report
+				)->join('')
+			)
+		);
+		push(
+			@$course_output,
 			$directories_ok
-			? CGI::p({ class => 'text-success mb-0' }, $r->maketext('Directory structure is ok'))
-			: CGI::p(
-				{ class => 'text-danger mb-0' },
-				$r->maketext(
+			? $c->tag('p', class => 'text-success mb-0', $c->maketext('Directory structure is ok'))
+			: $c->tag(
+				'p',
+				class => 'text-danger mb-0',
+				$c->maketext(
 					'Directory structure is missing directories or the webserver lacks sufficient privileges.')
-			);
-
-		$output .= CGI::end_div();
-	}
-
-	my $checkAlls = '';
-
-	if ($extra_database_tables_exist) {
-		$checkAlls .= CGI::div(
-			{ class => 'form-check' },
-			CGI::checkbox({
-				label             => $r->maketext('Select/unselect all tables missing in schema for deletion.'),
-				class             => 'select-all form-check-input',
-				labelattributes   => { class => 'form-check-label' },
-				data_select_group => 'delete_tableIDs',
-			})
+			)
 		);
-	}
 
-	if ($extra_database_fields_exist) {
-		$checkAlls .= CGI::div(
-			{ class => 'form-check' },
-			CGI::checkbox({
-				label             => $r->maketext('Select/unselect all fields missing in schema for deletion.'),
-				class             => 'select-all form-check-input',
-				labelattributes   => { class => 'form-check-label' },
-				data_select_group => 'delete_fieldIDs'
-			})
-		);
+		push(@$status_output, $c->tag('div', class => 'border border-dark rounded p-2 mb-2', $course_output->join('')));
 	}
 
-	print CGI::div({ class => 'mb-3' }, $checkAlls);
-
-	print $output;
-
-	# Print form for choosing next action.
-	print CGI::h3($r->maketext('No course id defined')) unless @upgrade_courseIDs;
-
-	print $self->hidden_authen_fields;
-	print $self->hidden_fields('subDisplay');
-
-	print CGI::div({ class => 'mb-3' }, $checkAlls);
-
-	# Submit buttons
-	# After presenting a detailed summary of status of selected courses the choice is made to upgrade the selected
-	# courses (confirm_upgrade_course is set or return to the beginning (decline_upgrade_course is set)
-	print CGI::div(
-		{ class => 'submit-buttons-container' },
-		CGI::submit({
-			name  => 'decline_upgrade_course',
-			value => $r->maketext("Don't Upgrade"),
-			class => 'btn btn-primary'
-		}),
-		CGI::submit({
-			name  => 'confirm_upgrade_course',
-			value => $r->maketext('Upgrade'),
-			class => 'btn btn-primary'
-		})
+	return $c->include(
+		'ContentGenerator/CourseAdmin/upgrade_course_confirm',
+		upgrade_courseIDs           => \@upgrade_courseIDs,
+		extra_database_tables_exist => $extra_database_tables_exist,
+		extra_database_fields_exist => $extra_database_fields_exist,
+		status_output               => $status_output->join('')
 	);
-
-	print CGI::end_form();
 }
 
-sub do_upgrade_course {
-	my $self = shift;
-	my $r    = $self->r;
-	my $ce   = $r->ce;
-	my $db   = $r->db;
-
-	my @upgrade_courseIDs = ($r->param("upgrade_courseIDs"));
+sub do_upgrade_course ($c) {
+	my $output = $c->c;
 
-	my %update_error_msg;
-
-	for my $upgrade_courseID (@upgrade_courseIDs) {
+	for my $upgrade_courseID ($c->param('upgrade_courseIDs')) {
 		next unless $upgrade_courseID =~ /\S/;    # Omit blank course IDs
 
 		# Update one course
-		my $ce2 = new WeBWorK::CourseEnvironment({ %WeBWorK::SeedCE, courseName => $upgrade_courseID });
+		my $ce2 = WeBWorK::CourseEnvironment->new({ courseName => $upgrade_courseID });
 
 		# Create integrity checker
-		my $CIchecker = new WeBWorK::Utils::CourseIntegrityCheck(ce => $ce2);
+		my $CIchecker = WeBWorK::Utils::CourseIntegrityCheck->new(ce => $ce2);
 
 		# Add missing tables and missing fields to existing tables
 		my ($tables_ok, $dbStatus) = $CIchecker->checkCourseTables($upgrade_courseID);
@@ -2948,317 +1473,170 @@ sub do_upgrade_course {
 			grep { $dbStatus->{$_}[0] == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A } @schema_table_names;
 		my @tables_to_alter =
 			grep { $dbStatus->{$_}[0] == WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B } @schema_table_names;
-		$update_error_msg{$upgrade_courseID} = $CIchecker->updateCourseTables($upgrade_courseID, [@tables_to_create],
-			[ ($r->param("$upgrade_courseID.delete_tableIDs")) ]);
+
+		my @upgrade_report;
+		push(
+			@upgrade_report,
+			$CIchecker->updateCourseTables(
+				$upgrade_courseID, [@tables_to_create], [ ($c->param("$upgrade_courseID.delete_tableIDs")) ]
+			)
+		);
 		for my $table_name (@tables_to_alter) {
-			$update_error_msg{$upgrade_courseID} .= $CIchecker->updateTableFields($upgrade_courseID, $table_name,
-				[ ($r->param("$upgrade_courseID.$table_name.delete_fieldIDs")) ]);
+			push(
+				@upgrade_report,
+				$CIchecker->updateTableFields(
+					$upgrade_courseID, $table_name,
+					[ ($c->param("$upgrade_courseID.$table_name.delete_fieldIDs")) ]
+				)
+			);
 		}
 
-		# Add missing directories when it can be done safely
-		$CIchecker->updateCourseDirectories();    # Needs more error messages
-
 		# Analyze database status and prepare status report
 		($tables_ok, $dbStatus) = $CIchecker->checkCourseTables($upgrade_courseID);
 
-		my ($all_tables_ok, $extra_database_tables, $extra_database_fields, $str) =
-			$self->formatReportOnDatabaseTables($tables_ok, $dbStatus);
+		my ($all_tables_ok, $extra_database_tables, $extra_database_fields, $db_report) =
+			$c->formatReportOnDatabaseTables($dbStatus);
 
 		# Prepend course name
-		$str = CGI::div({ class => 'mb-2' }, $r->maketext('Database:')) . $str;
+		$db_report = $c->c($c->tag('div', class => 'mb-2', $c->maketext('Database:')), $db_report);
 
 		# Report on databases and report summary
 		if ($extra_database_tables) {
-			$str .= CGI::p({ class => 'text-danger fw-bold' },
-				$r->maketext('There are extra database tables which are not defined in the schema.'));
+			push(
+				@$db_report,
+				$c->tag(
+					'p',
+					class => 'text-danger fw-bold',
+					$c->maketext('There are extra database tables which are not defined in the schema.')
+				)
+			);
 		}
 		if ($extra_database_fields) {
-			$str .= CGI::p(
-				{ class => 'text-danger fw-bold' },
-				$r->maketext(
-					'There are extra database fields which are not defined in the schema for at least one table.')
+			push(
+				@$db_report,
+				$c->tag(
+					'p',
+					class => 'text-danger fw-bold',
+					$c->maketext(
+						'There are extra database fields which are not defined in the schema for at least one table.')
+				)
 			);
 		}
 
-		# Prepare report on directory status
-		my ($directories_ok, $str2) = $CIchecker->checkCourseDirectories();
-		my $dir_msg = join(
-			'',
-			CGI::div({ class => 'mb-2' }, $r->maketext('Directory structure:')),
-			$str2,
+		# Add missing directories and prepare report on directory status
+		my $dir_update_messages = $CIchecker->updateCourseDirectories;    # Needs more error messages
+		my ($directories_ok, $directory_report) = $CIchecker->checkCourseDirectories;
+
+		# Show status
+		my $course_report = $c->c;
+		push(@$course_report, $c->tag('h2', $c->maketext('Report for course [_1]:', $upgrade_courseID)));
+		push(@$course_report,
+			map { $c->tag('p', class => ($_->[1] ? 'text-success' : 'text-danger my-0') . ' fw-bold', $_->[0]) }
+				@upgrade_report);
+
+		push(@$course_report, @$db_report);
+
+		# Show report on directory status
+		push(
+			@$course_report,
+			$c->tag('div', class => 'mb-2', $c->maketext('Directory structure:')),
+			$c->tag(
+				'ul',
+				$c->c(
+					map {
+						$c->tag(
+							'li',
+							$c->c("$_->[0]: ",
+								$c->tag('span', class => $_->[2] ? 'text-success' : 'text-danger', $_->[1]))
+								->join('')
+						)
+					} @$directory_report
+				)->join('')
+			),
+			$c->tag(
+				'ul',
+				$c->c(
+					map {
+						$c->tag(
+							'li',
+							$c->tag(
+								'span',
+								class => $_->[2] ? 'text-success' : 'text-danger',
+								$_->[1]
+							)
+						)
+					} @$dir_update_messages
+				)->join('')
+			),
 			$directories_ok
-			? CGI::p({ class => 'text-success mb-0' }, $r->maketext('Directory structure is ok'))
-			: CGI::p(
-				{ class => 'text-danger mb-0' },
-				$r->maketext(
+			? $c->tag('p', class => 'text-success mb-0', $c->maketext('Directory structure is ok'))
+			: $c->tag(
+				'p',
+				class => 'text-danger mb-0',
+				$c->maketext(
 					'Directory structure is missing directories or the webserver lacks sufficient privileges.')
 			)
 		);
-
-		# Print status
-		print CGI::start_div({ class => 'border border-dark rounded p-2 mb-2' });
-		print CGI::h2($r->maketext('Report for course [_1]:', $upgrade_courseID));
-		print CGI::p({ class => 'text-success fw-bold' }, $update_error_msg{$upgrade_courseID})
-			if $update_error_msg{$upgrade_courseID};
-
-		print $str;        # Print message about tables
-		print $dir_msg;    # Print message about directories
-		print CGI::end_div();
+		push(@$output, $c->tag('div', class => 'border border-dark rounded p-2 mb-2', $course_report->join('')));
 	}
 
 	# Submit buttons -- return to beginning
-	print CGI::h2($r->maketext('Upgrade process completed'));
-	print CGI::start_form({ method => 'POST', action => $r->uri });    # send back to this script
-	print $self->hidden_authen_fields;
-	print $self->hidden_fields('subDisplay');
-	print CGI::p(
-		{ class => 'text-center' },
-		CGI::submit({
-			name  => 'decline_upgrade_course',
-			value => $r->maketext('Done'),
-			class => 'btn btn-primary'
-		})
-	);
-	print CGI::end_form();
-}
-
-################################################################################
-## location management routines; added by DG [Danny Ginn] 20070215
-## revised by glarose
-
-sub manage_location_form {
-	my ($self) = @_;
-	my $r      = $self->r;
-	my $db     = $r->db;
-
-	# Get a list of all existing locations
-	my @locations = sort { lc($a->location_id) cmp lc($b->location_id) } $db->getAllLocations();
-	my %locAddr   = map  { $_->location_id => [ $db->listLocationAddresses($_->location_id) ] } @locations;
-
-	my @locationIDs = map { $_->location_id } @locations;
-
-	print CGI::h2($r->maketext('Manage Locations'));
-
-	print CGI::p(CGI::strong($r->maketext('Currently defined locations are listed below.')));
-
-	print CGI::start_form(-method => 'POST', -action => $r->uri);
-	print $self->hidden_authen_fields;
-	print $self->hidden_fields('subDisplay');
-
-	# Get a list of radio buttons to select an action
-	my @actionRadios = CGI::radio_group({
-		name   => 'manage_location_action',
-		values => [ 'edit_location_form', 'add_location_handler', 'delete_location_handler' ],
-		labels => {
-			edit_location_form      => $r->maketext('Edit Location:'),
-			add_location_handler    => $r->maketext('Create Location:'),
-			delete_location_handler => $r->maketext('Delete location:'),
-		},
-		default         => $r->param('manage_location_action') ? $r->param('manage_location_action') : 'none',
-		class           => 'form-check-input',
-		labelattributes => { class => 'form-check-label' }
-	});
-
-	print CGI::start_div({ class => 'col-lg-8 col-md-9' });
-	print CGI::div({ class => 'mb-2 fw-bold' }, $r->maketext('Select an action to perform:'));
-
-	# Edit action
-	print CGI::div(
-		{ class => 'row align-items-center mb-2' },
-		CGI::div({ class => 'col-sm-4' }, CGI::div({ class => 'form-check' }, $actionRadios[0])),
-		CGI::div(
-			{ class => 'col-sm-8' },
-			CGI::popup_menu({
-				name   => 'edit_location',
-				values => [@locationIDs],
-				class  => 'form-select'
-			})
-		)
-	);
-
-	# Create action
-	print CGI::div(
-		{ class => 'row align-items-center mb-2' },
-		CGI::div({ class => 'col-auto' }, CGI::div({ class => 'form-check' }, $actionRadios[1])),
-	);
-
-	print CGI::div(
-		{ class => 'row ms-sm-3 mb-2' },
-		CGI::label(
-			{ for => 'new_location_name', class => 'col-sm-4 col-form-label' },
-			$r->maketext('Location name:')
-		),
-		CGI::div(
-			{ class => 'col-sm-8' },
-			CGI::textfield({
-				name  => 'new_location_name',
-				id    => 'new_location_name',
-				value => $r->param('new_location_name') // '',
-				class => 'form-control'
-			})
-		)
-	);
-
-	print CGI::div(
-		{ class => 'row ms-sm-3 mb-2' },
-		CGI::label(
-			{ for => 'new_location_description', class => 'col-sm-4 col-form-label' },
-			$r->maketext('Location description:')
-		),
-		CGI::div(
-			{ class => 'col-sm-8' },
-			CGI::textfield({
-				name  => 'new_location_description',
-				id    => 'new_location_description',
-				value => $r->param('new_location_description') // '',
-				class => 'form-control'
-			})
-		)
-	);
-
-	print CGI::div(
-		{ class => 'row ms-sm-3 mb-2' },
-		CGI::div(
-			{ class => 'col' },
-			CGI::label(
-				{ for => 'new_location_addresses' },
-				$r->maketext(
-					'Addresses for new location.  Enter one per line, as single IP addresses (e.g., 192.168.1.101), '
-						. 'address masks (e.g., 192.168.1.0/24), or IP ranges (e.g., 192.168.1.101-192.168.1.150):'
-				)
-			)
-		)
-	);
-
-	print CGI::div(
-		{ class => 'row ms-sm-3 mb-2' },
-		CGI::div(
-			{ class => 'col-auto' },
-			CGI::textarea({
-				name    => 'new_location_addresses',
-				id      => 'new_location_addresses',
-				columns => 28,
-				value   => $r->param('new_location_addresses') ? $r->param('new_location_addresses') : '',
-				class   => 'form-control'
-			})
-		)
-	);
-
-	# Delete action
-	print CGI::div(
-		{ class => 'row mb-2' },
-		CGI::div(
-			{ class => 'text-danger' },
-			CGI::em($r->maketext('Deletion deletes all location data and related addresses, and is not undoable!'))
-		)
-	);
-
-	print CGI::div(
-		{ class => 'row align-items-center mb-2' },
-		CGI::div({ class => 'col-sm-4' }, CGI::div({ class => 'form-check' }, $actionRadios[2])),
-		CGI::div(
-			{ class => 'col-sm-8' },
-			CGI::div(
-				{ class => 'row mb-1' },
-				CGI::div(
-					{ class => 'col-auto' },
-					CGI::popup_menu({
-						name   => 'delete_location',
-						values => [ '', 'selected_locations', @locationIDs ],
-						labels => {
-							selected_locations => $r->maketext('locations selected below'),
-							''                 => $r->maketext('no location')
-						},
-						class => 'form-select'
-					})
-				)
-			),
-			CGI::div(
-				{ class => 'row' },
-				CGI::div(
-					{ class => 'col-auto' },
-					CGI::div(
-						{ class => 'form-check' },
-						CGI::checkbox({
-							name            => 'delete_confirm',
-							value           => 'true',
-							label           => $r->maketext('Confirm'),
-							class           => 'form-check-input',
-							labelattributes => { class => 'form-check-label' }
-
-						})
+	push(@$output, $c->tag('h2', $c->maketext('Upgrade process completed')));
+	push(
+		@$output,
+		$c->form_for(
+			$c->current_route,
+			method => 'POST',
+			$c->c(
+				$c->hidden_authen_fields,
+				$c->tag(
+					'p',
+					class => 'text-center',
+					$c->submit_button(
+						$c->maketext('Done'),
+						name  => 'decline_upgrade_course',
+						class => 'btn btn-primary'
 					)
 				)
-			)
+			)->join('')
 		)
 	);
 
-	print CGI::end_div();
+	return $output->join('');
+}
 
-	print CGI::p(CGI::submit({
-		name  => 'manage_locations',
-		value => $r->maketext('Take Action!'),
-		class => 'btn btn-primary'
-	}));
+# Location management routines
 
-	unless (@locations) {
-		print CGI::div({ class => 'row mt-3' },
-			CGI::div({ class => 'col-lg-8 col-md-9 fw-bold' }, $r->maketext('No locations are currently defined.')));
-		return;
-	}
+sub manage_location_form ($c) {
+	my $db = $c->db;
 
-	# Existing location table
-	print CGI::start_div({ class => 'table-responsive mt-3' }),
-		CGI::start_table({ class => 'table table-sm font-sm table-bordered table-striped' });
-	print CGI::thead(CGI::Tr(CGI::th([
-		$r->maketext('Select'), $r->maketext('Location'), $r->maketext('Description'), $r->maketext('Addresses') ])));
-	print CGI::start_tbody();
-	for my $loc (@locations) {
-		my $editAddr = $self->systemLink(
-			$r->urlpath,
-			params => {
-				subDisplay             => 'manage_locations',
-				manage_location_action => 'edit_location_form',
-				edit_location          => $loc->location_id
-			}
-		);
-		print CGI::Tr(CGI::td([
-			CGI::checkbox({
-				name  => 'delete_selected',
-				id    => $loc->location_id . '_id',
-				value => $loc->location_id,
-				label => '',
-				class => 'form-check-input'
-			}),
-			CGI::label({ for => $loc->location_id . '_id' }, CGI::a({ href => $editAddr }, $loc->location_id)),
-			$loc->description,
-			join(', ', @{ $locAddr{ $loc->location_id } })
-		]));
-	}
-	print CGI::end_tbody();
-	print CGI::end_table(), CGI::end_div();
+	# Get a list of all existing locations
+	my @locations = sort { lc($a->location_id) cmp lc($b->location_id) } $db->getAllLocations();
 
-	print CGI::end_form();
+	return $c->include(
+		'ContentGenerator/CourseAdmin/manage_location_form',
+		locations => \@locations,
+		locAddr   => { map { $_->location_id => [ $db->listLocationAddresses($_->location_id) ] } @locations }
+	);
 }
 
-sub add_location_handler {
-	my $self = shift();
-	my $r = $self->r;
-	my $db = $r->db;
+sub add_location_handler ($c) {
+	my $db = $c->db;
+
+	# Get the new location data.
+	my $locationID    = $c->param('new_location_name');
+	my $locationDescr = $c->param('new_location_description');
+	my $locationAddr  = $c->param('new_location_addresses');
 
-	# the location data we're to add
-	my $locationID = $r->param("new_location_name");
-	my $locationDescr = $r->param("new_location_description");
-	my $locationAddr = $r->param("new_location_addresses");
-	# break the addresses up
+	# Break the addresses up
 	$locationAddr =~ s/\s*-\s*/-/g;
 	$locationAddr =~ s/\s*\/\s*/\//g;
 	my @addresses = split(/\s+/, $locationAddr);
 
-	# sanity checks
+	# Sanity checks
 	my $badAddr = '';
-	foreach my $addr ( @addresses ) {
-		unless ( new Net::IP($addr) ) {
+	for my $addr (@addresses) {
+		unless (Net::IP->new($addr)) {
 			$badAddr .= "$addr, ";
 			$locationAddr =~ s/$addr\n//s;
 		}
@@ -3268,1099 +1646,726 @@ sub add_location_handler {
 	# a check to be sure that the location addresses don't already
 	#    exist
 	my $badLocAddr = '';
-	if ( ! $badAddr && $locationID ) {
-		if ( $db->countLocationAddresses( $locationID ) ) {
+	if (!$badAddr && $locationID) {
+		if ($db->countLocationAddresses($locationID)) {
 			my @allLocAddr = $db->listLocationAddresses($locationID);
-			foreach my $addr ( @addresses ) {
+			for my $addr (@addresses) {
 				$badLocAddr .= "$addr, "
-					if ( grep {/^$addr$/} @allLocAddr );
+					if (grep {/^$addr$/} @allLocAddr);
 			}
 			$badLocAddr =~ s/, $//;
 		}
 	}
 
-	if ( ! @addresses || ! $locationID || ! $locationDescr ) {
-		print CGI::div({ class => 'alert alert-danger p-1 mb-2' },
-			$r->maketext("Missing required input data. Please check that you have filled in all of the create location fields and resubmit."));
-	} elsif ( $badAddr ) {
-		$r->param("new_location_addresses", $locationAddr);
-		print CGI::div({ class => 'alert alert-danger p-1 mb-2' },
-			$r->maketext("Address(es) [_1] is(are) not in a recognized form.  Please check your data entry and resubmit.",$badAddr));
-	} elsif ( $db->existsLocation( $locationID ) ) {
-		print CGI::div({ class => 'alert alert-danger p-1 mb-2' },
-			$r->maketext("A location with the name [_1] already exists in the database.  Did you mean to edit that location instead?",$locationID));
-	} elsif ( $badLocAddr ) {
-		print CGI::div({ class => 'alert alert-danger p-1 mb-2' },
-			$r->maketext("Address(es) [_1] already exist in the database.  THIS SHOULD NOT HAPPEN!  Please double check the integrity of the WeBWorK database before continuing.", $badLocAddr));
+	my $output = $c->c;
+
+	if (!@addresses || !$locationID || !$locationDescr) {
+		push(
+			@$output,
+			$c->tag(
+				'div',
+				class => 'alert alert-danger p-1 mb-2',
+				$c->maketext(
+					'Missing required input data. Please check that you have '
+						. 'filled in all of the create location fields and resubmit.'
+				)
+			)
+		);
+	} elsif ($badAddr) {
+		$c->param('new_location_addresses', $locationAddr);
+		push(
+			@$output,
+			$c->tag(
+				'div',
+				class => 'alert alert-danger p-1 mb-2',
+				$c->maketext(
+					'Address(es) [_1] is(are) not in a recognized form.  Please check your data entry and resubmit.',
+					$badAddr
+				)
+			)
+		);
+	} elsif ($db->existsLocation($locationID)) {
+		push(
+			@$output,
+			$c->tag(
+				'div',
+				class => 'alert alert-danger p-1 mb-2',
+				$c->maketext(
+					'A location with the name [_1] already exists in the database.  '
+						. 'Did you mean to edit that location instead?',
+					$locationID
+				)
+			)
+		);
+	} elsif ($badLocAddr) {
+		push(
+			@$output,
+			$c->tag(
+				'div',
+				{ class => 'alert alert-danger p-1 mb-2' },
+				$c->maketext(
+					'Address(es) [_1] already exist in the database.  THIS SHOULD NOT HAPPEN!  '
+						. 'Please double check the integrity of the WeBWorK database before continuing.',
+					$badLocAddr
+				)
+			)
+		);
 	} else {
 		# add the location
 		my $locationObj = $db->newLocation;
-		$locationObj->location_id( $locationID );
-		$locationObj->description( $locationDescr );
-		$db->addLocation( $locationObj );
+		$locationObj->location_id($locationID);
+		$locationObj->description($locationDescr);
+		$db->addLocation($locationObj);
 
 		# and add the addresses
-		foreach my $addr ( @addresses ) {
+		for my $addr (@addresses) {
 			my $locationAddress = $db->newLocationAddress;
 			$locationAddress->location_id($locationID);
 			$locationAddress->ip_mask($addr);
 
-			$db->addLocationAddress( $locationAddress );
+			$db->addLocationAddress($locationAddress);
 		}
 
 		# we've added the location, so clear those param
 		#    entries
-		$r->param('manage_location_action','none');
-		$r->param('new_location_name','');
-		$r->param('new_location_description','');
-		$r->param('new_location_addresses','');
-
-		print CGI::div(
-			{ class => 'alert alert-success p-1 mb-2' },
-			$r->maketext("Location [_1] has been created, with addresses [_2].", $locationID, join(', ', @addresses)));
+		$c->param('manage_location_action',   'none');
+		$c->param('new_location_name',        '');
+		$c->param('new_location_description', '');
+		$c->param('new_location_addresses',   '');
+
+		push(
+			@$output,
+			$c->tag(
+				'div',
+				class => 'alert alert-success p-1 mb-2',
+				$c->maketext(
+					'Location [_1] has been created, with addresses [_2].',
+					$locationID, join(', ', @addresses)
+				)
+			)
+		);
 	}
 
-	$self->manage_location_form;
+	push(@$output, $c->manage_location_form);
+
+	return $output->join('');
 }
 
-sub delete_location_handler {
-	my $self = shift;
-	my $r = $self->r;
-	my $db = $r->db;
-
-	# what location are we deleting?
-	my $locationID = $r->param("delete_location");
-	# check for selected deletions if appropriate
-	my @delLocations = ( $locationID );
-	if ( $locationID eq 'selected_locations' ) {
-		@delLocations = $r->param("delete_selected");
-		$locationID = @delLocations;
+sub delete_location_handler ($c) {
+	my $db = $c->db;
+
+	# Determine which location was requested to be deleted.
+	my $locationID = $c->param('delete_location');
+
+	# Check for selected deletions if appropriate.
+	my @delLocations = ($locationID);
+	if ($locationID eq 'selected_locations') {
+		@delLocations = $c->param('delete_selected');
+		$locationID   = @delLocations;
 	}
-	# are we sure?
-	my $confirm = $r->param("delete_confirm");
+
+	# Has the confirmation been checked?
+	my $confirm = $c->param('delete_confirm');
+
+	my $output = $c->c;
 
 	my $badID;
-	if ( ! $locationID ) {
-		print CGI::div({ class => 'alert alert-danger p-1 mb-2' },
-			$r->maketext("Please provide a location name to delete."));
+	if (!$locationID) {
+		push(
+			@$output,
+			$c->tag(
+				'div',
+				class => 'alert alert-danger p-1 mb-2',
+				$c->maketext('Please provide a location name to delete.')
+			)
+		);
 
-	} elsif ( $badID = $self->existsLocations_helper( @delLocations ) ) {
-		print CGI::div({ class => 'alert alert-danger p-1 mb-2' },
-			$r->maketext("No location with name [_1] exists in the database", $badID));
+	} elsif ($badID = $c->existsLocations_helper(@delLocations)) {
+		push(
+			@$output,
+			$c->tag(
+				'div',
+				class => 'alert alert-danger p-1 mb-2',
+				$c->maketext('No location with name [_1] exists in the database', $badID)
+			)
+		);
 
-	} elsif ( ! $confirm || $confirm ne 'true' ) {
-		print CGI::div({ class => 'alert alert-danger p-1 mb-2' },
-			$r->maketext("Location deletion requires confirmation."));
+	} elsif (!$confirm || $confirm ne 'true') {
+		push(
+			@$output,
+			$c->tag(
+				'div',
+				class => 'alert alert-danger p-1 mb-2',
+				$c->maketext('Location deletion requires confirmation.')
+			)
+		);
 	} else {
-		foreach ( @delLocations ) {
-			$db->deleteLocation( $_ );
-		}
-		print CGI::div({ class => 'alert alert-success p-1 mb-2' },
-			$r->maketext("Deleted Location(s): [_1]", join(', ', @delLocations)));
-		$r->param('manage_location_action','none');
-		$r->param('delete_location','');
+		for (@delLocations) {
+			$db->deleteLocation($_);
+		}
+		push(
+			@$output,
+			$c->tag(
+				'div',
+				class => 'alert alert-success p-1 mb-2',
+				$c->maketext('Deleted Location(s): [_1]', join(', ', @delLocations))
+			)
+		);
+		$c->param('manage_location_action', 'none');
+		$c->param('delete_location',        '');
 	}
-	$self->manage_location_form;
+	push(@$output, $c->manage_location_form);
+
+	return $output->join('');
 }
-sub existsLocations_helper {
-	my ($self, @locations) = @_;
-	my $db = $self->r->db;
-	foreach ( @locations ) {
-		return $_ if ( ! $db->existsLocation($_) );
+
+sub existsLocations_helper ($c, @locations) {
+	my $db = $c->db;
+	for (@locations) {
+		return $_ if !$db->existsLocation($_);
 	}
 	return 0;
 }
 
-sub edit_location_form {
-	my $self = shift;
-	my $r    = $self->r;
-	my $db   = $r->db;
+sub edit_location_form ($c) {
+	my $db = $c->db;
 
-	my $locationID = $r->param('edit_location');
+	my $locationID = $c->param('edit_location');
 	if ($db->existsLocation($locationID)) {
 		my $location = $db->getLocation($locationID);
-		# This doesn't give that nice a sort for IP addresses,
-		# b/c there's the problem with 192.168.1.168 sorting
-		# ahead of 192.168.1.2.  we could do better if we
-		# either invoked Net::IP in the sort routine, or if
-		# we insisted on dealing only with IPv4.  rather than
-		# deal with either of those, we'll leave this for now
+		# This doesn't give that nice a sort for IP addresses, because there is the problem with 192.168.1.168 sorting
+		# ahead of 192.168.1.2.  we could do better if we either invoked Net::IP in the sort routine, or if we insisted
+		# on dealing only with IPv4.  Rather than deal with either of those, we'll leave this for now.
 		my @locAddresses = sort { $a cmp $b } $db->listLocationAddresses($locationID);
 
-		print CGI::h2($r->maketext('Editing location [_1]', $locationID));
-
-		print CGI::p($r->maketext(
-			'Edit the current value of the location description, if desired, then add and select addresses to delete, '
-				. q{and then click the "Take Action" button to make all of your changes.  Or, click }
-				. q{"Manage Locations" above to make no changes and return to the Manage Locations page.}
-		));
-
-		print CGI::start_form({ method => 'POST', action => $r->uri });
-
-		print $self->hidden_authen_fields;
-		print $self->hidden_fields('subDisplay');
-		print CGI::hidden({ name => 'edit_location',          default => $locationID });
-		print CGI::hidden({ name => 'manage_location_action', default => 'edit_location_handler' });
-
-		print CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'location_description', class => 'col-auto col-form-label' },
-				$r->maketext('Location description:')
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::textfield({
-					name    => 'location_description',
-					id      => 'location_description',
-					size    => '50',
-					default => $location->description,
-					class   => 'form-control'
-				})
-			)
+		return $c->include(
+			'ContentGenerator/CourseAdmin/edit_location_form',
+			location     => $location,
+			locationID   => $locationID,
+			locAddresses => \@locAddresses
 		);
-
-		print CGI::div(
-			{ class => 'row' },
-			CGI::div(
-				{ class => 'col-md-6' },
-				CGI::div(
-					{ class => 'mb-2' },
-					CGI::label(
-						{ for => 'new_location_addresses' },
-						$r->maketext(
-							'Addresses to add to the location.  Enter one per line, as single IP addresses '
-								. '(e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP ranges '
-								. '(e.g., 192.168.1.101-192.168.1.150):'
-						)
-					)
-				),
-				CGI::div(
-					{ class => 'mb-2' },
-					CGI::textarea({
-						name    => 'new_location_addresses',
-						id      => 'new_location_addresses',
-						rows    => 5,
-						columns => 28,
-						class   => 'form-control'
-					})
+	} else {
+		return $c->c(
+			$c->tag(
+				'div',
+				class => 'alert alert-danger p-1 mb-2',
+				$c->maketext(
+					'Location [_1] does not exist in the WeBWorK database.  Please check your input '
+						. '(perhaps you need to reload the location management page?).',
+					$locationID
 				)
 			),
-			CGI::div(
-				{ class => 'col-md-6' },
-				CGI::div(
-					{ class => 'mb-2' },
-					CGI::label(
-						{ for => 'delete_location_addresses' },
-						$r->maketext(
-							'Existing addresses for the location are given in the scrolling list below.  '
-								. 'Select addresses from the list to delete them:'
-						)
-					)
-				),
-				CGI::div(
-					{ class => 'mb-2' },
-					CGI::scrolling_list({
-						name     => 'delete_location_addresses',
-						id       => 'delete_location_addresses',
-						values   => [@locAddresses],
-						size     => 8,
-						multiple => 'multiple',
-						class    => 'form-select'
-					})
-				),
-				CGI::div({ class => 'mb-2' }, $r->maketext('or')),
-				CGI::div(
-					{ class => 'mb-2' },
-					CGI::div(
-						{ class => 'form-check' },
-						CGI::checkbox({
-							name            => 'delete_all_addresses',
-							value           => 'true',
-							label           => $r->maketext('Delete all existing addresses'),
-							class           => 'form-check-input',
-							labelattributes => { class => 'form-check-label' }
-						})
-					)
-				)
-			)
-		);
-
-		print CGI::div(CGI::submit({
-			value => $r->maketext('Take Action!'),
-			class => 'btn btn-primary'
-		}));
-
-		print CGI::end_form();
-	} else {
-		print CGI::div(
-			{ class => 'alert alert-danger p-1 mb-2' },
-			$r->maketext(
-				'Location [_1] does not exist in the WeBWorK database.  Please check your input '
-					. '(perhaps you need to reload the location management page?).',
-				$locationID
-			)
-		);
-		$self->manage_location_form;
+			$c->manage_location_form
+		)->join('');
 	}
 }
 
-sub edit_location_handler {
-	my $self = shift;
-	my $r = $self->r;
-	my $db = $r->db;
-
-	my $locationID = $r->param("edit_location");
-	my $locationDesc = $r->param("location_description");
-	my $addAddresses = $r->param("new_location_addresses");
-	my @delAddresses = $r->param("delete_location_addresses");
-	my $deleteAll = $r->param("delete_all_addresses");
-
-	# gut check
-	if ( ! $locationID ) {
-		print CGI::div({ class => 'alert alert-danger p-1 mb-2' },
-			$r->maketext("No location specified to edit. Please check your input data."));
-		$self->manage_location_form;
-
-	} elsif ( ! $db->existsLocation( $locationID ) ) {
-		print CGI::div({ class => 'alert alert-danger p-1 mb-2' },
-			$r->maketext("Location [_1] does not exist in the WeBWorK database.  Please check your input (perhaps you need to reload the location management page?).", $locationID));
-		$self->manage_location_form;
+sub edit_location_handler ($c) {
+	my $db = $c->db;
+
+	my $locationID   = $c->param('edit_location');
+	my $locationDesc = $c->param('location_description');
+	my $addAddresses = $c->param('new_location_addresses');
+	my @delAddresses = $c->param('delete_location_addresses');
+	my $deleteAll    = $c->param('delete_all_addresses');
+
+	# Gut check
+	if (!$locationID) {
+		return $c->c(
+			$c->tag(
+				'div',
+				class => 'alert alert-danger p-1 mb-2',
+				$c->maketext('No location specified to edit. Please check your input data.')
+			),
+			$c->manage_location_form
+		)->join('');
+
+	} elsif (!$db->existsLocation($locationID)) {
+		return $c->c(
+			$c->tag(
+				'div',
+				class => 'alert alert-danger p-1 mb-2',
+				$c->maketext(
+					'Location [_1] does not exist in the WeBWorK database.  '
+						. 'Please check your input (perhaps you need to reload the location management page?).',
+					$locationID
+				)
+			),
+			$c->manage_location_form
+		)->join('');
 	} else {
 		my $location = $db->getLocation($locationID);
 
-		# get the current location addresses.  if we're deleting
-		#   all of the existing addresses, we don't use this list
-		#   to determine which addresses to add, however.
+		# Get the current location addresses.  If we're deleting all of the existing addresses, we don't use this list
+		# to determine which addresses to add, however.
 		my @currentAddr = $db->listLocationAddresses($locationID);
-		my @compareAddr = ( ! $deleteAll || $deleteAll ne 'true' )
-			? @currentAddr : ();
+		my @compareAddr = (!$deleteAll || $deleteAll ne 'true') ? @currentAddr : ();
 
 		my $doneMsg = '';
 
 		if ($locationDesc && $location->description ne $locationDesc) {
 			$location->description($locationDesc);
 			$db->putLocation($location);
-			$doneMsg .= CGI::p({},$r->maketext("Updated location description."));
+			$doneMsg = $c->tag('p', class => 'my-0', $c->maketext('Updated location description.'));
 		}
-		# get the actual addresses to add out of the text field
+
+		# Get the addresses to add out of the text field.
 		$addAddresses =~ s/\s*-\s*/-/g;
 		$addAddresses =~ s/\s*\/\s*/\//g;
 		my @addAddresses = split(/\s+/, $addAddresses);
 
-		# make sure that we're adding and deleting only those
-		#    addresses that are not yet/currently in the location
-		#    addresses
-		my @toAdd = ();  my @noAdd = ();
-		my @toDel = ();  my @noDel = ();
-		foreach my $addr ( @addAddresses ) {
-			if (grep {/^$addr$/} @compareAddr) {push(@noAdd,$addr);}
-			else { push(@toAdd, $addr); }
+		# Make sure that we're adding and deleting only those addresses
+		# that are not yet/currently in the location addresses.
+		my (@toAdd, @noAdd, @toDel, @noDel);
+
+		my $badAddr = '';
+		for my $addr (@addAddresses) {
+			if (grep {/^$addr$/} @compareAddr) {
+				push(@noAdd, $addr);
+			} else {
+				# Make sure the address is in a sensible form.
+				if (Net::IP->new($addr)) {
+					push(@toAdd, $addr);
+				} else {
+					$badAddr .= "$addr, " unless Net::IP->new($addr);
+				}
+			}
 		}
-		if ( $deleteAll && $deleteAll eq 'true' ) {
+		$badAddr =~ s/, $//;
+
+		if ($deleteAll && $deleteAll eq 'true') {
 			@toDel = @currentAddr;
 		} else {
-			foreach my $addr ( @delAddresses ) {
+			for my $addr (@delAddresses) {
 				if (grep {/^$addr$/} @currentAddr) {
-					push(@toDel,$addr);
-				} else { push(@noDel, $addr); }
-			}
-		}
-
-		# and make sure that all of the addresses we're adding are
-		#    a sensible form
-		my $badAddr = '';
-		foreach my $addr ( @toAdd ) {
-			unless ( new Net::IP($addr) ) {
-				$badAddr .= "$addr, ";
+					push(@toDel, $addr);
+				} else {
+					push(@noDel, $addr);
+				}
 			}
 		}
-		$badAddr =~ s/, $//;
 
-		# delete addresses first, because we allow deletion of
-		#    all existing addresses, then addition of addresses.
-		#    note that we don't allow deletion and then addition
-		#    of the same address normally, however; in that case
-		#    we'll end up just deleting the address.
-		foreach ( @toDel ) {
+		# Delete addresses first, because we allow deletion of all existing addresses, then addition of addresses.  note
+		# that we don't allow deletion and then addition of the same address normally, however; in that case we'll end
+		# up just deleting the address.
+		for (@toDel) {
 			$db->deleteLocationAddress($locationID, $_);
 		}
-		foreach ( @toAdd ) {
+		for (@toAdd) {
 			my $locAddr = $db->newLocationAddress;
 			$locAddr->location_id($locationID);
 			$locAddr->ip_mask($_);
-
 			$db->addLocationAddress($locAddr);
 		}
 
-		my $addrMsg = '';
-		$addrMsg .= $r->maketext("Deleted addresses [_1] from location.", join(', ', @toDel)) . CGI::br() if ( @toDel );
-		$addrMsg .= $r->maketext("Added addresses [_1] to location [_2].", join(', ', @toAdd), $locationID) if ( @toAdd );
-
-		my $badMsg = '';
-		$badMsg .= $r->maketext('Address(es) [_1] in the add list is(are) already in the location [_2], and so were skipped.', join(', ', @noAdd), $locationID) . CGI::br() if ( @noAdd );
-		$badMsg .= $r->maketext("Address(es) [_1] is(are) not in a recognized form.  Please check your data entry and try again.",$badAddr) . CGI::br() if ( $badAddr );
-		$badMsg .= $r->maketext('Address(es) [_1] in the delete list is(are) not in the location [_2], and so were skipped.',join(', ', @noDel),$locationID) if ( @noDel );
-
-		print CGI::div({ class => 'alert alert-danger p-1 mb-2' }, $badMsg)
-			if ($badMsg);
-		if ($doneMsg || $addrMsg) {
-			print CGI::div({ -class => 'alert alert-danger p-1 mb-2' }, CGI::p({}, $doneMsg, $addrMsg));
+		my $addrMsg = $c->c;
+		push(
+			@$addrMsg,
+			$c->tag(
+				'p',
+				class => 'my-0',
+				$c->maketext('Deleted addresses [_1] from location.', join(', ', @toDel))
+			)
+		) if @toDel;
+		push(
+			@$addrMsg,
+			$c->tag(
+				'p',
+				class => 'my-0',
+				$c->maketext('Added addresses [_1] to location [_2].', join(', ', @toAdd), $locationID)
+			)
+		) if @toAdd;
+
+		my $badMsg = $c->c;
+		push(
+			@$badMsg,
+			$c->tag(
+				'p',
+				class => 'my-0',
+				$c->maketext(
+					'Address(es) [_1] in the add list is(are) already in the location [_2], and so were skipped.',
+					join(', ', @noAdd), $locationID
+				)
+			)
+		) if @noAdd;
+		push(
+			@$badMsg,
+			$c->tag(
+				'p',
+				class => 'my-0',
+				$c->maketext(
+					'Address(es) [_1] is(are) not in a recognized form.  Please check your data entry and try again.',
+					$badAddr
+				)
+			)
+		) if $badAddr;
+		push(
+			@$badMsg,
+			$c->tag(
+				'p',
+				class => 'my-0',
+				$c->maketext(
+					'Address(es) [_1] in the delete list is(are) not in the location [_2], and so were skipped.',
+					join(', ', @noDel), $locationID
+				)
+			)
+		) if @noDel;
+
+		my $output = $c->c;
+		push(@$output, $c->tag('div', class => 'alert alert-danger p-1 mb-2', $badMsg->join('')))
+			if @$badMsg;
+		if ($doneMsg || @$addrMsg) {
+			push(
+				@$output,
+				$c->tag(
+					'div',
+					class => 'alert alert-success p-1 mb-2',
+					$c->c($doneMsg, @$addrMsg)->join('')
+				)
+			);
 		} else {
-			print CGI::div({ -class => 'alert alert-danger p-1 mb-2' },
-				$r->maketext("No valid changes submitted for location [_1].", $locationID));
+			push(
+				@$output,
+				$c->tag(
+					'div',
+					class => 'alert alert-danger p-1 mb-2',
+					$c->maketext('No valid changes submitted for location [_1].', $locationID)
+				)
+			);
 		}
-
-		$self->edit_location_form;
+		push(@$output, $c->edit_location_form);
+		return $output->join('');
 	}
 }
 
-sub hide_inactive_course_form {
-	my ($self) = @_;
-	my $r      = $self->r;
-	my $ce     = $r->ce;
+sub hide_inactive_course_form ($c) {
+	my $ce = $c->ce;
 
-	my $coursesDir          = $ce->{webworkDirs}->{courses};
-	my @courseIDs           = listCourses($ce);
-	my $hide_listing_format = $r->param('hide_listing_format') // 'last_login';
+	my @courseIDs = listCourses($ce);
 
 	# Get and store last modify time for login.log for all courses. Also get visibility status.
-	my %courseLabels;
-	my @noLoginLogIDs;
-	my @loginLogIDs;
-	my @hideCourseIDs;
-	my ($loginLogFile, $epoch_modify_time, $courseDir);
+	my ($epoch_modify_time, %coursesData, %courseLabels, @noLoginLogIDs, @loginLogIDs, @hideCourseIDs);
 	for my $courseID (@courseIDs) {
-		$loginLogFile = "$coursesDir/$courseID/logs/login.log";
-		if (-e $loginLogFile) {    #this should always exist except for the model course
-			$epoch_modify_time                           = stat($loginLogFile)->mtime;
-			$coursesData{$courseID}{'epoch_modify_time'} = $epoch_modify_time;
-			$coursesData{$courseID}{'local_modify_time'} = ctime($epoch_modify_time);
+		my $loginLogFile = "$ce->{webworkDirs}{courses}/$courseID/logs/login.log";
+		if (-e $loginLogFile) {    # This should always exist except for the model course.
+			$epoch_modify_time                         = stat($loginLogFile)->mtime;
+			$coursesData{$courseID}{epoch_modify_time} = $epoch_modify_time;
+			$coursesData{$courseID}{local_modify_time} = ctime($epoch_modify_time);
 			push(@loginLogIDs, $courseID);
 		} else {
-			$coursesData{$courseID}{'local_modify_time'} =
-				'no login.log';    #this should never be the case except for the model course
+			$coursesData{$courseID}{local_modify_time} =
+				'no login.log';    # This should never be the case except for the model course
 			push(@noLoginLogIDs, $courseID);
 		}
-		if (-f "$coursesDir/$courseID/hide_directory") {
-			$coursesData{$courseID}{'status'} = $r->maketext('hidden');
+		if (-f "$ce->{webworkDirs}{courses}/$courseID/hide_directory") {
+			$coursesData{$courseID}{status} = $c->maketext('hidden');
 		} else {
-			$coursesData{$courseID}{'status'} = $r->maketext('visible');
+			$coursesData{$courseID}{status} = $c->maketext('visible');
 		}
 		$courseLabels{$courseID} =
-			"$courseID  ($coursesData{$courseID}{'status'} :: $coursesData{$courseID}{'local_modify_time'})";
+			"$courseID  ($coursesData{$courseID}{status} :: $coursesData{$courseID}{local_modify_time})";
 	}
-	if ($hide_listing_format eq 'last_login') {
-		# This should be an empty arrey except for the model course.
+	if (($c->param('hide_listing_format') // 'alphabetically') eq 'last_login') {
+		# This should be an empty array except for the model course.
 		@noLoginLogIDs = sort { lc($a) cmp lc($b) } @noLoginLogIDs;
-		@loginLogIDs   = sort byLoginActivity @loginLogIDs;    # oldest first
+		@loginLogIDs   = sort { $coursesData{$a}{epoch_modify_time} <=> $coursesData{$b}{epoch_modify_time} }
+			@loginLogIDs;    # oldest first
 		@hideCourseIDs = (@noLoginLogIDs, @loginLogIDs);
 	} else {
 		# In this case we sort alphabetically
 		@hideCourseIDs = sort { lc($a) cmp lc($b) } @courseIDs;
 	}
 
-	print CGI::h2($r->maketext('Hide Courses'));
-
-	print CGI::p($r->maketext(
-		'Select the course(s) you want to hide (or unhide) and then click "Hide Courses" (or "Unhide Courses"). '
-			. 'Hiding a course that is already hidden does no harm (the action is skipped). Likewise unhiding a '
-			. 'course that is already visible does no harm (the action is skipped).  Hidden courses are still active '
-			. 'but are not listed in the list of WeBWorK courses on the opening page.  To access the course, an '
-			. 'instructor or student must know the full URL address for the course.'
-	));
-
-	print CGI::p($r->maketext(
-		'Courses are listed either alphabetically or in order by the time of most recent login activity, '
-			. 'oldest first. To change the listing order check the mode you want and click "Refresh Listing".  '
-			. 'The listing format is: Course_Name (status :: date/time of most recent login) where status is "hidden" '
-			. 'or "visible".'
-	));
-
-	print CGI::start_form(-method => 'POST', -action => $r->uri);
-
-	print CGI::div(
-		{ class => 'mb-3' },
-		CGI::div({ class => 'mb-2' }, $r->maketext('Select a listing format:')),
-		map {
-			CGI::div(
-				{ class => 'form-check' },
-				CGI::input({
-					type  => 'radio',
-					name  => 'hide_listing_format',
-					id    => "hide_listing_format_$_->[0]",
-					value => $_->[0],
-					class => 'form-check-input',
-					$_->[0] eq ($r->param('hide_listing_format') // 'alphabetically') ? (checked => undef) : ()
-				}),
-				CGI::label(
-					{
-						for   => "hide_listing_format_$_->[0]",
-						class => 'form-check-label'
-					},
-					$_->[1]
-				)
-			)
-		} (
-			[ alphabetically => $r->maketext('alphabetically') ], [ last_login => $r->maketext('by last login date') ]
-		),
+	return $c->include(
+		'ContentGenerator/CourseAdmin/hide_inactive_course_form',
+		hideCourseIDs => \@hideCourseIDs,
+		courseLabels  => \%courseLabels
 	);
-
-	print CGI::div(
-		{ class => 'mb-2' },
-		CGI::submit({
-			name  => 'hide_course_refresh',
-			value => $r->maketext('Refresh Listing'),
-			class => 'btn btn-primary'
-		}),
-		CGI::submit({
-			name  => 'hide_course',
-			value => $r->maketext('Hide Courses'),
-			class => 'btn btn-primary'
-		}),
-		CGI::submit({
-			name  => 'unhide_course',
-			value => $r->maketext('Unhide Courses'),
-			class => 'btn btn-primary'
-		})
-	);
-
-	print $self->hidden_authen_fields;
-	print $self->hidden_fields('subDisplay');
-
-	print CGI::div({ class => 'mb-2' }, $r->maketext('Select course(s) to hide or unhide.'));
-	print CGI::div(
-		{ class => 'row mb-2' },
-		CGI::label(
-			{ for => 'hide_courseIDs', class => 'col-auto col-form-label fw-bold' },
-			$r->maketext('Course Name:')
-		),
-		CGI::div(
-			{ class => 'col-auto' },
-			CGI::scrolling_list({
-				name     => 'hide_courseIDs',
-				id       => 'hide_courseIDs',
-				values   => \@hideCourseIDs,
-				size     => 15,
-				multiple => 1,
-				labels   => \%courseLabels,
-				class    => 'form-select'
-			})
-		)
-	);
-
-	print CGI::div(
-		CGI::submit({
-			name  => 'hide_course_refresh',
-			value => $r->maketext('Refresh Listing'),
-			class => 'btn btn-primary'
-		}),
-		CGI::submit({
-			name  => 'hide_course',
-			value => $r->maketext('Hide Courses'),
-			class => 'btn btn-primary'
-		}),
-		CGI::submit({
-			name  => 'unhide_course',
-			value => $r->maketext('Unhide Courses'),
-			class => 'btn btn-primary'
-		})
-	);
-
-	print CGI::end_form();
 }
 
-sub hide_course_validate {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	#my $db = $r->db;
-	#my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-
-	my @hide_courseIDs     = $r->param("hide_courseIDs");
-	@hide_courseIDs        = () unless @hide_courseIDs;
-
-	my @errors;
-
-	unless (@hide_courseIDs) {
-		push @errors, $r->maketext("You must specify a course name.");
-	}
-	return @errors;
+sub hide_course_validate ($c) {
+	return $c->maketext('You must specify a course name.') unless $c->param('hide_courseIDs');
+	return;
 }
 
+sub do_hide_inactive_course ($c) {
+	my $ce = $c->ce;
 
-sub do_hide_inactive_course {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-
-  my $coursesDir = $ce->{webworkDirs}->{courses};
-
-	my $hide_courseID;
-	my @hide_courseIDs     = $r->param("hide_courseIDs");
-	@hide_courseIDs        = () unless @hide_courseIDs;
-
-	my $hideDirFileContent = $r->maketext('Place a file named "hide_directory" in a course or other directory and it will not show up in the courses list on the WeBWorK home page. It will still appear in the Course Administration listing.');
-
-	my @succeeded_courses = ();
-	my $succeeded_count = 0;
-	my @failed_courses = ();
+	my (@succeeded_courses, @failed_courses);
 	my $already_hidden_count = 0;
 
-  foreach $hide_courseID (@hide_courseIDs) {
-  	my $hideDirFile = "$coursesDir/$hide_courseID/hide_directory";
-  	if (-f $hideDirFile) {
-  		$already_hidden_count++;
-  		next;
-  	} else {
-  		local *HIDEFILE;
-  		if (open (HIDEFILE, ">", $hideDirFile)) {
-  			print HIDEFILE "$hideDirFileContent";
-  			close HIDEFILE;
-  			push @succeeded_courses,$hide_courseID;
-  			$succeeded_count++;
-  		} else {
-  			push @failed_courses,$hide_courseID;
-  		}
-  	}
-  }
+	for my $hide_courseID ($c->param('hide_courseIDs')) {
+		my $hideDirFile = "$ce->{webworkDirs}{courses}/$hide_courseID/hide_directory";
+		if (-f $hideDirFile) {
+			++$already_hidden_count;
+			next;
+		}
+		if (open(my $HIDEFILE, '>', $hideDirFile)) {
+			print $HIDEFILE $c->maketext(
+				'Place a file named "hide_directory" in a course or other directory and it will not show up '
+					. 'in the courses list on the WeBWorK home page. It will still appear in the '
+					. 'Course Administration listing.');
+			close $HIDEFILE;
+			push @succeeded_courses, $hide_courseID;
+		} else {
+			push @failed_courses, $hide_courseID;
+		}
+	}
+
+	my $output = $c->c;
 
 	if (@failed_courses) {
-		print CGI::div({ class => 'alert alert-danger p-1 mb-2' },
-			CGI::p($r->maketext("Errors occured while hiding the courses listed below when attempting to create the file hide_directory in the course's directory. Check the ownership and permissions of the course's directory, e.g [_1]",
-					"$coursesDir/$failed_courses[0]/")),
-			join(CGI::br(), @failed_courses)
+		push(
+			@$output,
+			$c->tag(
+				'div',
+				class => 'alert alert-danger p-1 mb-2',
+				$c->c(
+					$c->tag(
+						'p',
+						$c->maketext(
+							'Errors occured while hiding the courses listed below when attempting to create the '
+								. q{file hide_directory in the course's directory. Check the ownership and permissions }
+								. q{of the course's directory, e.g "[_1]".},
+							"$ce->{webworkDirs}{courses}/$failed_courses[0]/"
+						)
+					),
+					$c->tag('ul', $c->c(map { $c->tag('li', $_) } @failed_courses)->join(''))
+				)->join('')
+			)
 		);
 	}
+
 	my $succeeded_message = '';
 
-	if ($succeeded_count < 1 and $already_hidden_count > 0) {
-		$succeeded_message = $r->maketext("Except for possible errors listed above, all selected courses are already hidden.");
+	if (!@succeeded_courses && $already_hidden_count) {
+		if (@failed_courses) {
+			$succeeded_message =
+				$c->maketext('Except for the errors listed above, all selected courses are already hidden.');
+		} else {
+			$succeeded_message = $c->maketext('All selected courses are already hidden.');
+		}
+	} elsif (@succeeded_courses) {
+		$succeeded_message = $c->c(
+			$c->tag('p',  $c->maketext('The following courses were successfully hidden:')),
+			$c->tag('ul', $c->c(map { $c->tag('li', $_) } @succeeded_courses)->join(''))
+		)->join('');
 	}
 
-	if ($succeeded_count) {
-		$succeeded_message = CGI::p($r->maketext("The following courses were successfully hidden:"))
-			. join(CGI::br(), @succeeded_courses);
-	}
-	if ($succeeded_count or $already_hidden_count) {
-		print CGI::div({ class => 'alert alert-success p-1 mb-2' }, $succeeded_message);
-	}
-}
+	push(@$output, $c->tag('div', class => 'alert alert-success p-1 mb-2', $succeeded_message)) if ($succeeded_message);
 
-sub unhide_course_validate {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	#my $db = $r->db;
-	#my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-
-	my @unhide_courseIDs     = $r->param("hide_courseIDs");
-	@unhide_courseIDs        = () unless @unhide_courseIDs;
-
-	my @errors;
-
-	unless (@unhide_courseIDs) {
-		push @errors, $r->maketext("You must specify a course name.");
-	}
-	return @errors;
+	return $output->join('');
 }
 
+sub unhide_course_validate ($c) {
+	return $c->maketext('You must specify a course name.') unless $c->param('hide_courseIDs');
+	return;
+}
 
-sub do_unhide_inactive_course {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-
-  my $coursesDir = $ce->{webworkDirs}->{courses};
-
-	my $unhide_courseID;
-	my @unhide_courseIDs     = $r->param("hide_courseIDs");
-	@unhide_courseIDs        = () unless @unhide_courseIDs;
+sub do_unhide_inactive_course ($c) {
+	my $ce = $c->ce;
 
-	my @succeeded_courses = ();
-	my $succeeded_count = 0;
-	my @failed_courses = ();
+	my (@succeeded_courses, @failed_courses);
 	my $already_visible_count = 0;
 
-  foreach $unhide_courseID (@unhide_courseIDs) {
-  	my $hideDirFile = "$coursesDir/$unhide_courseID/hide_directory";
-  	unless (-f $hideDirFile) {
-  		$already_visible_count++;
-  		next;
-  	}
-  	remove_tree("$hideDirFile", {error => \my $err});
-  	if (@$err) {
-  		push @failed_courses,$unhide_courseID;
-    } else {
-  	push @succeeded_courses,$unhide_courseID;
-		$succeeded_count++;
-  	}
-  }
-  my $succeeded_message = '';
-
-  if ($succeeded_count < 1 and $already_visible_count > 0) {
-		$succeeded_message = $r->maketext("Except for possible errors listed above, all selected courses are already unhidden.");
+	for my $unhide_courseID ($c->param('hide_courseIDs')) {
+		my $hideDirFile = "$ce->{webworkDirs}{courses}/$unhide_courseID/hide_directory";
+		unless (-f $hideDirFile) {
+			++$already_visible_count;
+			next;
+		}
+		if (unlink $hideDirFile) {
+			push @succeeded_courses, $unhide_courseID;
+		} else {
+			push @failed_courses, $unhide_courseID;
+		}
 	}
 
-	if ($succeeded_count) {
-		$succeeded_message = CGI::p($r->maketext("The following courses were successfully unhidden:"))
-			. join(CGI::br(), @succeeded_courses);
-	}
-	if ($succeeded_count or $already_visible_count) {
-		print CGI::div({ class => 'alert alert-success p-1 mb-2' }, $succeeded_message);
-	}
+	my $output = $c->c;
+
 	if (@failed_courses) {
-		print CGI::div(
-			{ class => 'alert alert-danger p-1 mb-2' },
-			CGI::p($r->maketext(
-				"Errors occured while unhiding the courses listed below when attempting delete the file hide_directory in the course's directory. Check the ownership and permissions of the course's directory, e.g [_1]",
-				"$coursesDir/$failed_courses[0]/"
-			)),
-			join(CGI::br(), @failed_courses)
+		push(
+			@$output,
+			$c->tag(
+				'div',
+				class => 'alert alert-danger p-1 mb-2',
+				$c->c(
+					$c->tag(
+						'p',
+						$c->maketext(
+							'Errors occured while unhiding the courses listed below when attempting delete the file '
+								. q{hide_directory in the course's directory. Check the ownership and permissions of }
+								. q{the course's directory, e.g "[_1]".},
+							"$ce->{webworkDirs}{courses}/$failed_courses[0]/"
+						)
+					),
+					$c->tag('ul', $c->c(map { $c->tag('li', $_) } @failed_courses)->join(''))
+				)->join('')
+			)
 		);
 	}
-}
-
-
-sub upgrade_notification {
-    my $self = shift;
-    my $r = $self->r;
-    my $ce = $r->ce;
-    my $db = $r->db;
 
-    # exit if notifications are disabled
-    return unless $ce->{enableGitUpgradeNotifier};
-
-    my $git = $ce->{externalPrograms}->{git};
-    my $WeBWorKRemote = $ce->{gitWeBWorKRemoteName};
-    my $WeBWorKBranch = $ce->{gitWeBWorKBranchName};
-    my $PGRemote = $ce->{gitPGRemoteName};
-    my $PGBranch = $ce->{gitPGBranchName};
-    my $LibraryRemote = $ce->{gitLibraryRemoteName};
-    my $LibraryBranch = $ce->{gitLibraryBranchName};
-
-    # we can tproceed unless we have git;
-    if (!(defined($git) && -x $git)) {
-	warn('External Program "git" not found.  Check your site.conf');
-	return;
-    }
-
-    my $upgradeMessage = '';
-    my $upgradesAvailable = 0;
-    my $output;
-    my @lines;
-    my $commit;
-
-    if ($WeBWorKRemote && $WeBWorKBranch) {
-    # Check if there is an updated version of webwork available
-    # this is done by using ls-remote to get the commit sha at the
-    # head of the remote branch and looking to see if that sha is in
-    # the currently selected local branch
-	chdir($ce->{webwork_dir});
-	my $currentBranch = `$git symbolic-ref --short HEAD`;
-	$output = `$git ls-remote --heads $WeBWorKRemote`;
-	@lines = split /\n/, $output;
-	$commit=-1;
-
-	foreach my $line (@lines) {
-	    if ($line =~ /refs\/heads\/$WeBWorKBranch$/) {
-		$line =~ /^(\w+)/;
-		$commit = $1;
-		last;
-	    }
-	}
+	my $succeeded_message = '';
 
-	$output = `$git branch --contains $commit`;
-
-	if ($commit ne '-1' && $output !~ /\s+$currentBranch(\s+|$)/) {
-	    # There are upgrades, we need to figure out if its a
-	    # new version or not
-	    # This is done by using ls-remote to get the commit sha's
-	    # at the heads of the remote tags.
-	    # Tags of the form WeBWorK-x.y are release tags.  If there is
-	    # an sha there which isn't in the current branch then there must
-	    # be a newer version.
-
-	    $output = `$git ls-remote --tags $WeBWorKRemote`;
-	    @lines = split /\n/, $output;
-	    my $newversion = 0;
-
-	    foreach my $line (@lines) {
-		next unless $line =~ /\/tags\/WeBWorK-/;
-		$line =~ /^(\w+)/;
-		$commit = $1;
-		$output = `$git branch --contains $commit`;
-
-		if ($output !~ /\s+$currentBranch(\s+|$)/) {
-		    # There is a version tag which contains a commit that
-		    # isn't in the current branch so there must
-		    # be a new version
-		    $newversion = 1;
-		    last;
+	if (!@succeeded_courses && $already_visible_count) {
+		if (@failed_courses) {
+			$succeeded_message =
+				$c->maketext('Except for the errors listed above, all selected courses are already unhidden.');
+		} else {
+			$succeeded_message = $c->maketext('All selected courses are already unhidden.');
 		}
-	    }
-
-	    if ($newversion) {
-		$upgradesAvailable = 1;
-		$upgradeMessage .= CGI::Tr(CGI::td($r->maketext('There is a new version of WeBWorK available.')));
-	    } else {
-		$upgradesAvailable = 1;
-		$upgradeMessage .= CGI::Tr(CGI::td($r->maketext('There are upgrades available for your current branch of WeBWorK from branch [_1] in remote [_2].', $WeBWorKBranch, $WeBWorKRemote)));
-	    }
-	} elsif ($commit eq '-1') {
-	    $upgradesAvailable = 1;
-	    $upgradeMessage .= CGI::Tr(CGI::td($r->maketext("Couldn't find WeBWorK Branch [_1] in remote [_2]", $WeBWorKBranch, $WeBWorKRemote)));
-	}  else {
-	    $upgradeMessage .= CGI::Tr(CGI::td($r->maketext('Your current branch of WeBWorK is up to date with branch [_1] in remote [_2].', $WeBWorKBranch, $WeBWorKRemote)));
+	} elsif (@succeeded_courses) {
+		$succeeded_message = $c->c(
+			$c->tag('p',  $c->maketext('The following courses were successfully unhidden:')),
+			$c->tag('ul', $c->c(map { $c->tag('li', $_) } @succeeded_courses)->join(''))
+		)->join('');
 	}
-    }
-
-    if ($PGRemote && $PGBranch) {
-	# Check if there is an updated version of pg available
-	# this is done by using ls-remote to get the commit sha at the
-	# head of the remote branch and looking to see if that sha is in
-	# the currently selected local branch
-	chdir($ce->{pg_dir});
-	my $currentBranch = `$git symbolic-ref --short HEAD`;
-	$output = `$git ls-remote --heads $PGRemote`;
-	@lines = split /\n/, $output;
-	$commit='-1';
-
-	foreach my $line (@lines) {
-	    if ($line =~ /refs\/heads\/$PGBranch$/) {
-		$line =~ /^(\w+)\s+/;
-		$commit = $1;
-		last;
-	    }
-	}
-
-	$output = `$git branch --contains $commit`;
-
-	if ($commit ne '-1' && $output !~ /\s+$currentBranch(\s+|$)/) {
-	    # There are upgrades, we need to figure out if its a
-	    # new version or not
-	    # This is done by using ls-remote to get the commit sha's
-	    # at the heads of the remote tags.
-	    # Tags of the form WeBWorK-x.y are release tags.  If there is
-	    # an sha there which isn't in the local branch then there must
-	    # be a newer version.
-	    $output = `$git ls-remote --tags $PGRemote`;
-	    @lines = split /\n/, $output;
-	    my $newversion = 0;
-
-	    foreach my $line (@lines) {
-		next unless $line =~ /\/tags\/PG-/;
-		$line =~ /^(\w+)/;
-		$commit = $1;
-		$output = `$git branch --contains $commit`;
-		if ($output !~ /\s+$currentBranch(\s+|$)/) {
-		    # There is a version tag which contains a commit that
-		    # isn't in the current branch so there must
-		    # be a new version
-		    $newversion = 1;
-		    last;
-		}
-	    }
-
-	    if ($newversion) {
-		$upgradesAvailable = 1;
-		$upgradeMessage .= CGI::Tr(CGI::td($r->maketext('There is a new version of PG available.')));
-	    } else {
-		$upgradesAvailable = 1;
-		$upgradeMessage .= CGI::Tr(CGI::td($r->maketext('There are upgrades available for your current branch of PG from branch [_1] in remote [_2].', $PGBranch, $PGRemote)));
-	    }
-	} elsif ($commit eq '-1') {
-	    $upgradesAvailable = 1;
-	    $upgradeMessage .= CGI::Tr(CGI::td($r->maketext("Couldn't find PG Branch [_1] in remote [_2]", $PGBranch, $PGRemote)));
-	}  else {
-	    $upgradeMessage .= CGI::Tr(CGI::td($r->maketext('Your current branch of PG is up to date with branch [_1] in remote [_2].', $PGBranch, $PGRemote)));
 
-	}
-    }
-
-    die "Couldn't find ".$ce->{problemLibrary}{root}.'.  Are you sure $problemLibrary{root} is set correctly in localOverrides.conf?' unless
-	chdir($ce->{problemLibrary}{root});
-
-    if ($LibraryRemote && $LibraryBranch) {
-	# Check if there is an updated version of the OPL available
-	# this is done by using ls-remote to get the commit sha at the
-	# head of the remote branch and looking to see if that sha is in
-	# the local current branch
-	my $currentBranch = `$git symbolic-ref --short HEAD`;
-	$output = `$git ls-remote --heads $LibraryRemote`;
-	@lines = split /\n/, $output;
-	$commit='-1';
-
-	foreach my $line (@lines) {
-	    if ($line =~ /refs\/heads\/$LibraryBranch$/) {
-		$line =~ /^(\w+)\s+/;
-		$commit = $1;
-		last;
-	    }
-	}
-
-	$output = `$git branch --contains $commit`;
-
-	if ($commit ne '-1' && $output !~ /\s+$currentBranch(\s+|$)/) {
-	    $upgradesAvailable = 1;
-	    $upgradeMessage .= CGI::Tr(CGI::td($r->maketext('There are upgrades available for the Open Problem Library.')));
-	} elsif ($commit eq '-1') {
-	    $upgradesAvailable = 1;
-	    $upgradeMessage .= CGI::Tr(CGI::td($r->maketext("Couldn't find OPL Branch [_1] in remote [_2]", $LibraryBranch, $LibraryRemote)));
-	} else {
-	    $upgradeMessage .= CGI::Tr(CGI::td($r->maketext('Your current branch of the Open Problem Library is up to date.', $LibraryBranch, $LibraryRemote)));
-	}
-    }
-
-    chdir($ce->{webwork_dir});
-
-	if ($upgradesAvailable) {
-		$upgradeMessage =
-			CGI::Tr(CGI::th($r->maketext('The following upgrades are available for your WeBWorK system:')))
-			. $upgradeMessage;
-		return CGI::center(CGI::table({ class => "admin-messagebox" }, $upgradeMessage));
-	} else {
-		return CGI::center(CGI::div(
-			{ class => 'alert alert-success p-1 mb-2' }, $r->maketext('Your systems are up to date!')));
+	if ($succeeded_message) {
+		push(@$output, $c->tag('div', class => 'alert alert-success p-1 mb-2', $succeeded_message));
 	}
 
+	return $output->join('');
 }
 
-################################################################################
-#   registration forms added by Mike Gage 5-5-2008
-################################################################################
-
-
-our $registered_file_name = "registered_???";
-
-sub display_registration_form {
-	my $self       = shift;
-	my $ce         = $self->r->ce;
-	my $ww_version = $ce->{WW_VERSION};
-	$registered_file_name = "registered_$ww_version";
-	my $registeredQ = (-e "$ce->{courseDirs}{root}/$registered_file_name") ? 1 : 0;
-	my $registration_subDisplay =
-		(defined($self->r->param('subDisplay')) && $self->r->param('subDisplay') eq 'registration') ? 1 : 0;
-	my $register_site = ($self->r->param('register_site')) ? 1 : 0;
-
-	return CGI::div({ class => 'd-flex justify-content-center' }, "REGISTERED for WeBWorK $ww_version")
-		if $registeredQ || $register_site || $registration_subDisplay;
-
-	# Otherwise return registration form.
-	return CGI::div(
-		{ class => 'd-flex justify-content-center' },
-		CGI::div(
-			{ class => 'admin-messagebox' },
-
-			CGI::p(
-				CGI::strong('Please consider registering for the WW-security-announce Google group / mailing list'),
-				' using the join group link on the ',
-				CGI::a({ href => $ce->{webworkURLs}{wwSecurityAnnounce}, target => '_blank' }, 'group page'),
-				' which appears when you are logged in to a Google account ',
-				CGI::strong('or'),
-				' by sending an email using ',
-				CGI::a(
-					{
-						href => join('',
-							"mailto:$ce->{webworkSecListManagers}?subject=",
-							uri_escape('Joining ww-security-announce'),
-							'&body=',
-							uri_escape("Server URL: $ce->{apache_root_url}\n"),
-							uri_escape("WeBWorK version: $ce->{WW_VERSION}\n"),
-							uri_escape("Institution name: \n"))
-					},
-					,
-					'this mailto link'
-				),
-				'. This list will help us keep you updated about security issues and patches, '
-					. 'and important related announcements.'
-			),
-
-			CGI::hr(),
-
-			CGI::p(
-				'Please consider contributing to WeBWorK development either with a one time contribution or monthly ',
-				'support. The WeBWorK Project is a registered 501(c)(3) organization and contributions are tax ',
-				'deductible in the United States.'
-			),
-			CGI::div(
-				{ class => 'text-center' },
-				CGI::a(
-					{
-						class  => 'btn btn-secondary',
-						href   => 'https://github.com/sponsors/openwebwork',
-						target => '_blank'
-					},
-					CGI::i({ class => 'fa-regular fa-heart' }, '') . ' Sponsor',
-				)
-			),
-
-			CGI::hr(),
+sub do_registration ($c) {
+	my $ce = $c->ce;
 
-			CGI::p("This site is not registered for WeBWorK version $ww_version."),
-			CGI::p(
-				'We are often asked how many institutions are using WeBWorK and how many students are using WeBWorK. ',
-				'Since WeBWorK is open source and can be freely downloaded from ',
-				CGI::a({ href => $ce->{webworkURLs}{GitHub}, target => '_blank' }, $ce->{webworkURLs}{GitHub}),
-				', it is frequently difficult for us to give a reasonable answer to this question.'
-			),
-			CGI::p(
-				'You can help by ',
-				CGI::a(
-					{ href => $ce->{webworkURLs}{serverRegForm}, target => '_blank' },
-					'registering your current version of WeBWorK'
-				),
-				'. Please complete the Google form as best you can and submit your answers ',
-				'to the WeBWorK Project team. It takes just 2-3 minutes.  Thank you! -- The WeBWorK Project'
-			),
-			CGI::p(
-				'Eventually your site will be listed along with all of the others on the ',
-				CGI::a({ href => $ce->{webworkURLs}{SiteMap}, target => '_blank' }, 'site map'),
-				' on the main ',
-				CGI::a({ href => $ce->{webworkURLs}{WikiMain}, target => '_blank' }, 'WeBWorK Wiki'),
-				'.',
-			),
+	`echo "info" > $ce->{courseDirs}{root}/registered_$ce->{WW_VERSION}`;
 
-			CGI::hr(),
-
-			CGI::p('You can hide this "registration" banner for the future by clicking the button below.'),
-			CGI::start_form({ method => 'POST', id => 'return_to_main_page', action => $self->r->uri }),
-			$self->hidden_authen_fields,
-			CGI::hidden({ name => 'subDisplay', value => 'registration' }),
-			CGI::div(
-				{ class => 'text-center' },
-				CGI::submit({
-					id    => 'register_site',
-					name  => 'register_site',
-					label => 'Hide the banner.',
-					class => 'btn btn-primary'
-				})
+	return $c->tag(
+		'div',
+		class => 'mt-2 mx-auto w-50 text-center',
+		$c->c(
+			$c->tag(
+				'p',
+				'Registration banner has been hidden. '
+					. 'We appreciate your registering your server with the WeBWorK Project!'
 			),
-			CGI::end_form()
-		)
+			$c->form_for(
+				$c->current_route,
+				method => 'POST',
+				$c->c(
+					$c->hidden_authen_fields,
+					$c->submit_button(
+						$c->maketext('Continue'),
+						name  => 'registration_completed',
+						label => 'Continue',
+						class => 'btn btn-primary'
+					)
+				)->join('')
+			)
+		)->join('')
 	);
 }
 
-sub registration_form {
-}
-
-sub do_registration {
-	my $self = shift;
-	my $ce   = $self->r->ce;
-	my $registered_file_path = $ce->{courseDirs}->{root}."/$registered_file_name";
-	# warn qq!`echo "info" >$registered_file_path`!;
-	`echo "info" >$registered_file_path`;
-
-	print  "\n<center>",CGI::p({style=>"text-align: left; width:60%"},q{Registration banner has been hidden. We appreciate your registering your server with the WeBWorK Project!"});
-
-	print CGI::start_form(-method=>"POST", -action=>$self->r->uri);
-	print $self->hidden_authen_fields;
-	print CGI::p({ style => "text-align: center" },
-		CGI::submit({
-				name => "registration_completed",
-				label => "Continue",
-				class => 'btn btn-primary'
-			}));
-	print CGI::end_form();
-	print "</center>";
-
-}
-
 # Format a list of tables and fields in the database, and the status of each.
-sub formatReportOnDatabaseTables {
-	my ($self, $tables_ok, $dbStatus, $courseID) = @_;
-	my $r = $self->r;
-
-	my %msg = (
-		WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A =>
-			CGI::span({ class => 'text-danger' }, $r->maketext('Table defined in schema but missing in database')),
-		WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B =>
-			CGI::span({ class => 'text-danger me-2' }, $r->maketext('Table defined in database but missing in schema')),
+sub formatReportOnDatabaseTables ($c, $dbStatus, $courseID = undef) {
+	my %table_status_message = (
 		WeBWorK::Utils::CourseIntegrityCheck::SAME_IN_A_AND_B =>
-			CGI::span({ class => 'text-success' }, $r->maketext('Table is ok')),
-		WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B =>
-			CGI::span({ class => 'text-danger' }, $r->maketext('Schema and database table definitions do not agree')),
+			$c->tag('span', class => 'text-success me-2', $c->maketext('Table is ok')),
+		WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A => $c->tag(
+			'span',
+			class => 'text-danger me-2',
+			$c->maketext('Table defined in schema but missing in database')
+		),
+		WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B => $c->tag(
+			'span',
+			class => 'text-danger me-2',
+			$c->maketext('Table defined in database but missing in schema')
+		),
+		WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B => $c->tag(
+			'span',
+			class => 'text-danger me-2',
+			$c->maketext('Schema and database table definitions do not agree')
+		)
 	);
-	my %msg2 = (
+	my %field_status_message = (
+		WeBWorK::Utils::CourseIntegrityCheck::SAME_IN_A_AND_B =>
+			$c->tag('span', class => 'text-success me-2', $c->maketext('Field is ok')),
 		WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A =>
-			CGI::span({ class => 'text-danger' }, $r->maketext('Field missing in database')),
+			$c->tag('span', class => 'text-danger me-2', $c->maketext('Field missing in database')),
 		WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B =>
-			CGI::span({ class => 'text-danger me-2' }, $r->maketext('Field missing in schema')),
-		WeBWorK::Utils::CourseIntegrityCheck::SAME_IN_A_AND_B =>
-			CGI::span({ class => 'text-success' }, $r->maketext('Field is ok')),
-		WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B =>
-			CGI::span({ class => 'text-danger' }, $r->maketext('Schema and database field definitions do not agree')),
+			$c->tag('span', class => 'text-danger me-2', $c->maketext('Field missing in schema')),
+		WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B => $c->tag(
+			'span',
+			class => 'text-danger me-2',
+			$c->maketext('Schema and database field definitions do not agree')
+		)
 	);
+
 	my $all_tables_ok         = 1;
 	my $extra_database_tables = 0;
 	my $extra_database_fields = 0;
 
-	my $str                   = CGI::start_ul();
+	my $db_report = $c->c;
+
 	for my $table (sort keys %$dbStatus) {
+		my $table_report = $c->c;
+
 		my $table_status = $dbStatus->{$table}[0];
-		$str .= CGI::start_li();
-		$str .= CGI::b($table) . ': ' . $msg{$table_status};
+		push(@$table_report, $table . ': ', $table_status_message{$table_status});
 
 		if ($table_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A) {
 			$all_tables_ok = 0;
 		} elsif ($table_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B) {
 			$extra_database_tables = 1;
-			$str .= CGI::span(
-				{ class => 'form-check d-inline-block' },
-				CGI::checkbox({
-					name            => "$courseID.delete_tableIDs",
-					value           => $table,
-					label           => $r->maketext('Delete table when upgrading'),
-					class           => 'form-check-input',
-					labelattributes => { class => 'form-check-label' }
-				})
+			push(
+				@$table_report,
+				$c->tag(
+					'span',
+					class => 'form-check d-inline-block',
+					$c->tag(
+						'label',
+						class => 'form-check-label',
+						$c->c($c->check_box("$courseID.delete_tableIDs" => $table, class => 'form-check-input'),
+							$c->maketext('Delete table when upgrading'))->join('')
+					)
+				)
 			) if defined $courseID;
 		} elsif ($table_status == WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B) {
-			my %fieldInfo = %{ $dbStatus->{$table}->[1] };
-			$str .= CGI::start_ul();
+			my %fieldInfo     = %{ $dbStatus->{$table}[1] };
+			my $fields_report = $c->c;
 
 			for my $key (keys %fieldInfo) {
-				my $field_status = $fieldInfo{$key}->[0];
-				$str .= CGI::start_li();
-				$str .= "$key => $msg2{$field_status}";
+				my $field_status = $fieldInfo{$key}[0];
+				my $field_report = $c->c("$key: $field_status_message{$field_status}");
 
 				if ($field_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B) {
 					$extra_database_fields = 1;
-					$str .= CGI::span(
-						{ class => 'form-check d-inline-block' },
-						CGI::checkbox({
-							name            => "$courseID.$table.delete_fieldIDs",
-							value           => $key,
-							label           => $r->maketext('Delete field when upgrading'),
-							class           => 'form-check-input',
-							labelattributes => { class => 'form-check-label' }
-						})
+					push(
+						@$field_report,
+						$c->tag(
+							'span',
+							class => 'form-check d-inline-block',
+							$c->tag(
+								'label',
+								class => 'form-check-label',
+								$c->c(
+									$c->check_box(
+										"$courseID.$table.delete_fieldIDs" => $key,
+										class                              => 'form-check-input'
+									),
+									$c->maketext('Delete field when upgrading')
+								)->join('')
+							)
+						)
 					) if defined $courseID;
 				} elsif ($field_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A) {
 					$all_tables_ok = 0;
 				}
-				$str .= CGI::end_li();
+				push(@$fields_report, $c->tag('li', $field_report->join('')));
 			}
-			$str .= CGI::end_ul();
+			push(@$table_report, $c->tag('ul', $fields_report->join('')));
 		}
-		$str .= CGI::end_li();
+		push(@$db_report, $c->tag('li', $table_report->join('')));
 	}
-	$str .= CGI::end_ul();
-
-	$str .= $all_tables_ok ? CGI::p({ class => 'text-success' }, $r->maketext('Database tables are ok')) : '';
-
-	return ($all_tables_ok, $extra_database_tables, $extra_database_fields, $str);
-}
 
-sub output_JS {
-	my $self = shift;
-	my $ce   = $self->r->ce;
+	$db_report = $c->c($c->tag('ul', $db_report->join('')));
 
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/SelectAll/selectall.js'), defer => undef }, '');
+	push(@$db_report, $c->tag('p', class => 'text-success', $c->maketext('Database tables are ok'))) if $all_tables_ok;
 
-	return '';
+	return ($all_tables_ok, $extra_database_tables, $extra_database_fields, $db_report->join(''));
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/EquationDisplay.pm b/lib/WeBWorK/ContentGenerator/EquationDisplay.pm
index f457d047af..2ad0b7c6e9 100644
--- a/lib/WeBWorK/ContentGenerator/EquationDisplay.pm
+++ b/lib/WeBWorK/ContentGenerator/EquationDisplay.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,119 +14,50 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::EquationDisplay;
-use base qw(WeBWorK::ContentGenerator);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
-
 WeBWorK::ContentGenerator::EquationDisplay -- create .png version of TeX equations.
 
 =cut
 
-use strict;
-use warnings;
-#use CGI qw(-nosticky );
-use WeBWorK::CGI;
 use WeBWorK::PG::ImageGenerator;
 
-sub display_equation {
-	my ($self, $str) = @_;
-	
-	my $imageTag = $self->{image_gen}->add($str, 'inline');
-	$self->{image_gen}->render();
+sub display_equation ($c, $str) {
+	my $ce = $c->ce;
+
+	my $image_gen = WeBWorK::PG::ImageGenerator->new(
+		tempDir         => $ce->{webworkDirs}{tmp},
+		latex           => $ce->{externalPrograms}{latex},
+		dvipng          => $ce->{externalPrograms}{dvipng},
+		useCache        => 1,
+		cacheDir        => $ce->{webworkDirs}{equationCache},
+		cacheURL        => $ce->{webworkURLs}{equationCache},
+		cacheDB         => $ce->{webworkFiles}{equationCacheDB},
+		useMarkers      => 1,
+		dvipng_align    => 'baseline',
+		dvipng_depth_db => { dbsource => '' },
+	);
+
+	my $imageTag = $image_gen->add($str, 'inline');
+	$image_gen->render;
 	return $imageTag;
 }
 
-################################################################################
-# template escape handlers
-################################################################################
+sub initialize ($c) {
+	my $equationStr = $c->param('eq') // '';
 
-sub initialize {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	
-	$self->{image_gen} = WeBWorK::PG::ImageGenerator->new(
-		tempDir  => $ce->{webworkDirs}->{tmp}, # global temp dir
-		latex	 => $ce->{externalPrograms}->{latex},
-		dvipng   => $ce->{externalPrograms}->{dvipng},
-		useCache => 1,
-		cacheDir => $ce->{webworkDirs}->{equationCache},
-		cacheURL => $ce->{webworkURLs}->{equationCache},
-		cacheDB  => $ce->{webworkFiles}->{equationCacheDB},
-	);
-	
-	my $equationStr = $r->param('eq');
-	$self->{equationStr} = $equationStr if defined $equationStr;
-	$self->{typesetStr}  = $self->display_equation($equationStr) if $equationStr;
-}
+	# Prepare to display the typeset image and the HTML code that links to the source image.  The HTML code is linked
+	# also to the image address This requires digging out the link from the string returned by display_equation and
+	# ImageGenerator.  The server name and port are included in the new url.
+	$c->stash->{typesetStr} = $equationStr ? $c->display_equation($equationStr) : '';
 
-#sub path {
-#	my ($self, $args) = @_;
-#	
-#	my $ce = $self->{ce};
-#	my $root = $ce->{webworkURLs}->{root};
-#	my $courseName = $ce->{courseName};
-#	return $self->pathMacro($args,
-#		"Home" => "$root",
-#		$courseName => "$root/$courseName",
-#		"Feedback" => "",
-#	);
-#}
-#
-#sub title {
-#	return "Equation";
-#}
+	# Add the host name to the string.
+	my $hostName = $c->req->url->to_abs->host_port;
+	$c->stash->{typesetStr} =~ s|src="|src="http://$hostName|;
 
-sub body {
-	my ($self) = @_;
-	my $r = $self->r;
-	
-	#######################################
-	# Initial data for the textarea field where the equation is entered
-	#######################################
-	my $initial_str = "Enter equation here";
-	$initial_str = $r->param('eq') if $self->{equationStr};
-	
-	#######################################
-	# Prepare to display the typeset image and
-	# the HTML code that links to the source image.
-	# The HTML code is linked also to the image address
-	# This requires digging out the link from the string returned
-	# by display_equation and ImageGenerator.
-	# The server name and port are included in the new url.
-	#######################################
-	my $typesetStr = (defined $self->{typesetStr})?$self->{typesetStr}:'';
-	
-	#### add the host name to the string
-	my $hostName = $r->hostname;
-	my $port     = $r->get_server_port;
-	$hostName    .= ":$port";
-	$typesetStr =~ s|src="|src="http://$hostName|;
-	
-	my $typeset2Str = $typesetStr;
-	$typeset2Str =~ s/</&lt;/g;
-	$typeset2Str =~ s/>/&gt;/g;
-	
-	my $sourceHref = $typesetStr;
-	$sourceHref =~ /"([^"]*)"/;
-	$sourceHref = $1;
-	
-	#######################################
-	# Print the page
-	#######################################
-	return join( "",
-		"Copy the location of this image (or drag and drop) into your editing area:",
-		CGI::br(),
-		$typeset2Str,
-		CGI::br(),
-		$typesetStr,
-		CGI::start_form(-method=>'POST', -action=>$r->uri),
-		$self->hidden_authen_fields,
-		CGI::textarea( "eq", $initial_str, 5, 40),
-		CGI::submit('typeset', 'typeset'),
-		CGI::end_form(),
-	);
+	return;
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Feedback.pm b/lib/WeBWorK/ContentGenerator/Feedback.pm
index 0eb19743d6..dae2d403c7 100644
--- a/lib/WeBWorK/ContentGenerator/Feedback.pm
+++ b/lib/WeBWorK/ContentGenerator/Feedback.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Feedback;
-use base qw(WeBWorK::ContentGenerator);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -22,29 +22,19 @@ WeBWorK::ContentGenerator::Feedback - Send mail to professors.
 
 =cut
 
-# *** feedback should be exempt from authentication, so that people can send
-# feedback from the login page!
-
-use strict;
-use warnings;
-use utf8;
 use Data::Dumper;
-use Data::Dump qw/dump/;
-use WeBWorK::Debug;
-use WeBWorK::CGI;
 use Email::Stuffer;
 use Try::Tiny;
-use WeBWorK::Upload;
-
-use Socket qw/unpack_sockaddr_in inet_ntoa/; # for remote host/port info
 use Text::Wrap qw(wrap);
-use WeBWorK::Utils qw/ decodeAnswers/;
+
+use WeBWorK::Upload;
+use WeBWorK::Utils qw(decodeAnswers createEmailSenderTransportSMTP fetchEmailRecipients);
 
 # request paramaters used
 #
 # user
 # key
-# module
+# route
 # set (if from ProblemSet or Problem)
 # problem (if from Problem)
 # displayMode (if from Problem)
@@ -58,72 +48,56 @@ use WeBWorK::Utils qw/ decodeAnswers/;
 # user object for current user
 # permission level of current user
 # current session key
-# which ContentGenerator module called Feedback?
+# which ContentGenerator route called Feedback?
 # set object for current set (if from ProblemSet or Problem)
 # problem object for current problem (if from Problem)
 # display options (if from Problem)
 
-sub body {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $authz = $r->authz;
+sub initialize ($c) {
+	my $ce    = $c->ce;
+	my $db    = $c->db;
+	my $authz = $c->authz;
 
 	# get form fields
-	my $key                = $r->param("key");
-	my $userName           = $r->param("user");
-	my $module             = $r->param("module");
-	my $setName            = $r->param("set");
-	my $problemNumber      = $r->param("problem");
-	my $displayMode        = $r->param("displayMode");
-	my $showOldAnswers     = $r->param("showOldAnswers");
-	my $showCorrectAnswers = $r->param("showCorrectAnswers");
-	my $showHints          = $r->param("showHints");
-	my $showSolutions      = $r->param("showSolutions");
-	my $from               = $r->param("from");
-	my $feedback           = $r->param("feedback");
-	my $courseID           = $r->urlpath->arg("courseID");
+	my $userID    = $c->param('user');
+	my $route     = $c->param('route');
+	my $setID     = $c->param('set');
+	my $problemID = $c->param('problem');
+	my $from      = $c->param('from');
+	my $feedback  = $c->param('feedback');
+	my $courseID  = $c->stash('courseID');
 
 	my ($user, $set, $problem);
-	$user = $db->getUser($userName) # checked
-		if defined $userName and $userName ne "";
+
+	$user = $db->getUser($userID) if $userID;
+	$c->stash->{user_email_address} = $user ? $user->email_address : '';
+
 	if (defined $user) {
-		$set = $db->getMergedSet($userName, $setName) # checked
-			if defined $setName and $setName ne "";
-		$problem = $db->getMergedProblem($userName, $setName, $problemNumber) # checked
-			if defined $set and defined $problemNumber && $problemNumber ne "";
+		$set     = $db->getMergedSet($userID, $setID) if defined $setID && $setID ne '';
+		$problem = $db->getMergedProblem($userID, $setID, $problemID)
+			if defined $set && defined $problemID && $problemID ne '';
 	} else {
-		$set = $db->getGlobalSet($setName) # checked
-			if defined $setName and $setName ne "";
-		$problem = $db->getGlobalProblem($setName, $problemNumber) # checked
-			if defined $set and defined $problemNumber && $problemNumber ne "";
+		$set     = $db->getGlobalSet($setID) if defined $setID && $setID ne '';
+		$problem = $db->getGlobalProblem($setID, $problemID)
+			if defined $set && defined $problemID && $problemID ne '';
 	}
 
-	# generate context URLs
-	my ($emailableURL, $returnURL) = $self->generateURLs(set_id => $setName, problem_id => $problemNumber);
+	# Generate context URLs.
+	(my $emailableURL, $c->stash->{returnURL}) = $c->generateURLs(set_id => $setID, problem_id => $problemID);
 
-	my $homeModulePath = $r->urlpath->newFromModule("WeBWorK::ContentGenerator::Home", $r);
-	my $systemURL = $self->systemLink($homeModulePath, authen=>0, use_abs_url=>1);
+	return unless $authz->hasPermissions($userID, 'submit_feedback');
 
-	unless ($authz->hasPermissions($userName, "submit_feedback")) {
-		$self->feedbackNotAllowed($returnURL);
-		return "";
-	}
+	# Determine the recipients of the email.
+	my @recipients = $c->fetchEmailRecipients('receive_feedback', $user);
+	$c->stash->{numRecipients} = scalar @recipients;
 
-	# determine the recipients of the email
-	my @recipients = $self->getFeedbackRecipients($user);
+	return unless $c->stash->{numRecipients};
 
-	unless (@recipients) {
-		$self->noRecipientsAvailable($returnURL);
-		return "";
-	}
-
-	if (defined $r->param("sendFeedback")) {
-		# get verbosity level
-		my $verbosity = $ce->{mail}->{feedbackVerbosity};
+	if (defined $c->param('sendFeedback')) {
+		# Get verbosity level.
+		my $verbosity = $ce->{mail}{feedbackVerbosity};
 
-		# determine the sender of the email
+		# Determine the sender of the email.
 		my $sender;
 		if ($user) {
 			if ($user->email_address) {
@@ -139,16 +113,13 @@ sub body {
 			$sender = $from;
 		}
 
-		# sanity checks
 		unless ($sender) {
-			$self->feedbackForm($user, $returnURL,
-				"No Sender specified.");
-			return "";
+			$c->stash->{send_error} = $c->maketext('No Sender specified.');
+			return;
 		}
 		unless ($feedback) {
-			$self->feedbackForm($user, $returnURL,
-				"Message was blank.");
-			return "";
+			$c->stash->{send_error} = $c->maketext('Message was blank.');
+			return;
 		}
 
 		my %subject_map = (
@@ -160,21 +131,15 @@ sub body {
 			'r' => $user    ? $user->recitation    : undef,
 			'%' => '%',
 		);
-		my $chars = join("", keys %subject_map);
-		my $subject = $ce->{mail}{feedbackSubjectFormat}
-			|| "WeBWorK question from %c: %u set %s/prob %p"; # default if not entered
-		$subject =~ s/%([$chars])/defined $subject_map{$1} ? $subject_map{$1} : ""/eg;
+		my $chars   = join('', keys %subject_map);
+		my $subject = $ce->{mail}{feedbackSubjectFormat} || 'WeBWorK question from %c: %u set %s/prob %p';
+		$subject =~ s/%([$chars])/defined $subject_map{$1} ? $subject_map{$1} : ''/eg;
 
-		# If in the future any fields in the subject can contain non-ASCII characters
-		# then we will also need:
-		# $subject = Encode::encode("MIME-Header", $subject);
-		# at present, this does not seem to be necessary.
+		# Get info about remote user.
+		my $remote_host = $c->tx->remote_address || 'UNKNOWN';
+		my $remote_port = $c->tx->remote_port    || 'UNKNOWN';
 
-		# get info about remote user (stolen from &WeBWorK::Authen::write_log_entry)
-		my ($remote_host, $remote_port);
-
-		$remote_host = $r->useragent_addr->ip_get || "UNKNOWN";
-		$remote_port = $r->connection->client_addr->port || "UNKNOWN";
+		my $systemURL = $c->url_for('root')->to_abs;
 
 		my $msg = qq/This  message was automatically generated by the WeBWorK
 system at $systemURL, in response to a request from $remote_host:$remote_port.
@@ -184,41 +149,46 @@ $emailableURL
 
 /;
 
-		if ($feedback){
+		if ($feedback) {
 			$msg .= qq/***** The feedback message: *****\n\n\n$feedback\n\n\n/;
 		}
-		if($problem and $verbosity >=1){
-			$msg .= qq/***** Data about the problem processor: ***** \n\n/
-			. "Display Mode:         $displayMode\n"
-			. "Show Old Answers:     ". ($showOldAnswers ? "yes" : "no") . "\n"
-			. " Show Correct Answers: " . ($showCorrectAnswers ? "yes" : "no") . "\n"
-			. " Show Hints:           " . ($showHints ? "yes" : "no") . "\n"
-			. " Show Solutions:       " . ($showSolutions ? "yes" : "no") . "\n\n";
+		if ($problem and $verbosity >= 1) {
+			$msg .=
+				qq/***** Data about the problem processor: ***** \n\n/
+				. 'Display Mode:         '
+				. $c->param('displayMode') . "\n"
+				. 'Show Old Answers:     '
+				. ($c->param('showOldAnswers') ? 'yes' : 'no') . "\n"
+				. 'Show Correct Answers: '
+				. ($c->param('showCorrectAnswers') ? 'yes' : 'no') . "\n"
+				. 'Show Hints:           '
+				. ($c->param('showHints') ? 'yes' : 'no') . "\n"
+				. 'Show Solutions:       '
+				. ($c->param('showSolutions') ? 'yes' : 'no') . "\n\n";
 		}
 
-		if ($user and $verbosity >= 1) {
+		if ($user && $verbosity >= 1) {
 			$msg .= "***** Data about the user: *****\n\n";
-			$msg .= $self->format_user($user). "\n";
+			$msg .= $c->format_user($user) . "\n";
 		}
 
-		if ($problem and $verbosity >= 1) {
+		if ($problem && $verbosity >= 1) {
 			$msg .= "***** Data about the problem: *****\n\n";
-			$msg .= $self->format_userproblem($problem). "\n";
+			$msg .= $c->format_userproblem($problem) . "\n";
 		}
-		if ($set and $verbosity >= 1) {
-			$msg .= "***** Data about the homework set: *****\n\n"
-			. $self->format_userset($set). "\n";
+		if ($set && $verbosity >= 1) {
+			$msg .= "***** Data about the homework set: *****\n\n" . $c->format_userset($set) . "\n";
 		}
-		if ($ce and $verbosity >= 2) {
-			$msg .= "***** Data about the environment: *****\n\n",
-			$msg .= Dumper($ce). "\n\n";
+		if ($ce && $verbosity >= 2) {
+			$msg .= "***** Data about the environment: *****\n\n" . Dumper($ce) . "\n\n";
 		}
 
-		my $email = Email::Stuffer->to(join(',', @recipients))->from($sender)->subject($subject)
-			->text_body($msg)->header('X-Remote-Host' => $remote_host);
+		my $email =
+			Email::Stuffer->to(join(',', @recipients))->from($sender)->subject($subject)->text_body($msg)
+			->header('X-Remote-Host' => $remote_host);
 
 		# Extra headers
-		$email->header('X-WeBWorK-Module', $module)   if defined $module;
+		$email->header('X-WeBWorK-Route',  $route)    if defined $route;
 		$email->header('X-WeBWorK-Course', $courseID) if defined $courseID;
 		if ($user) {
 			$email->header('X-WeBWorK-User',       $user->user_id);
@@ -229,7 +199,7 @@ $emailableURL
 		$email->header('X-WeBWorK-Problem', $problem->problem_id) if $problem;
 
 		# Add the attachment if one was provided.
-		my $fileIDhash = $r->param('attachment');
+		my $fileIDhash = $c->param('attachment');
 		if ($fileIDhash) {
 			my $attachment =
 				WeBWorK::Upload->retrieve(split(/\s+/, $fileIDhash), dir => $ce->{webworkDirs}{uploadCache});
@@ -247,22 +217,18 @@ $emailableURL
 
 			# Check to see that this is an allowed filetype.
 			unless (lc($filename =~ s/.*\.//r) =~ /^(jpe?g|gif|png|pdf|zip|txt|csv)$/) {
-				$self->feedbackForm($user, $returnURL,
-					$r->maketext('The filetype of the attached file "[_1]" is not allowed.', $filename));
-				return '';
+				$c->stash->{send_error} =
+					$c->maketext('The filetype of the attached file "[_1]" is not allowed.', $filename);
+				return;
 			}
 
 			# Check to see that the attached file does not exceed the allowed size.
 			if (length($contents) > $ce->{mail}{maxAttachmentSize} * 1000000) {
-				$self->feedbackForm(
-					$user,
-					$returnURL,
-					$r->maketext(
-						'The attached file "[_1]" exceeds the allowed attachment size of [quant,_2,megabyte].',
-						$filename, $ce->{mail}{maxAttachmentSize}
-					)
-				);
-				return '';
+
+				$c->stash->{send_error} =
+					$c->maketext('The attached file "[_1]" exceeds the allowed attachment size of [quant,_2,megabyte].',
+						$filename, $ce->{mail}{maxAttachmentSize});
+				return;
 			}
 
 			# Attach the file.
@@ -270,216 +236,94 @@ $emailableURL
 		}
 
 		# $ce->{mail}{set_return_path} is the address used to report returned email if defined and non empty.
-		# It is an argument used in sendmail() (aka Email::Stuffer::send_or_die).
+		# It is an argument used in sendmail (via Email::Stuffer::send_or_die).
 		# For arcane historical reasons sendmail actually sets the field "MAIL FROM" and the smtp server then
 		# uses that to set "Return-Path".
 		# references:
-		#  https://stackoverflow.com/questions/1235534/what-is-the-behavior-difference-between-return-path-reply-to-and-from
+		#  https://stackoverflow.com/questions/1235534/
+		#      what-is-the-behavior-difference-between-return-path-reply-to-and-from
 		#  https://metacpan.org/pod/Email::Sender::Manual::QuickStart#envelope-information
 		try {
 			$email->send_or_die({
 				# createEmailSenderTransportSMTP is defined in ContentGenerator
-				transport => $self->createEmailSenderTransportSMTP(),
+				transport => createEmailSenderTransportSMTP($ce),
 				$ce->{mail}{set_return_path} ? (from => $ce->{mail}{set_return_path}) : ()
 			});
-			print CGI::p($r->maketext('Your message was sent successfully.'));
-			print CGI::p(CGI::a({ -href => $returnURL }, $r->maketext('Return to your work')));
-			print CGI::pre(wrap('', '', $feedback));
 		} catch {
-			$self->feedbackForm($user, $returnURL, "Failed to send message: $_");
+			$c->stash->{send_error} = $c->maketext('Failed to send message: [_1]', $_);
 		};
-	} else {
-		# just print the feedback form, with no message
-		$self->feedbackForm($user, $returnURL, '');
 	}
 
-	return '';
+	return;
 }
 
-sub feedbackNotAllowed {
-	my ($self, $returnURL) = @_;
-
-	print CGI::p("You are not allowed to send e-mail.");
-	print CGI::p(CGI::a({-href=>$returnURL}, "Cancel E-Mail")) if $returnURL;
-}
-
-sub noRecipientsAvailable {
-	my ($self, $returnURL) = @_;
-
-	print CGI::p("No e-mail recipients are listed for this course.");
-	print CGI::p(CGI::a({-href=>$returnURL}, "Cancel E-Mail")) if $returnURL;
-}
-sub title {
-	my ($self, $user, $returnURL, $message) = @_;
-	my $r = $self->r;
-	return $r->maketext("E-mail Instructor");
-}
-
-sub feedbackForm {
-	my ($self, $user, $returnURL, $message) = @_;
-	my $r = $self->r;
-
-	print CGI::start_form(-method => 'POST', -action => $r->uri);
-	print $self->hidden_authen_fields;
-	print $self->hidden_fields(qw(
-		module set problem displayMode showOldAnswers showCorrectAnswers
-		showHints showSolutions
-	));
-
-	print CGI::div(
-		{ class => 'mb-3' },
-		$r->maketext(
-			'Use this form to ask your instructor a question, to report a problem with the WeBWorK system, or '
-				. 'to report an error in a problem you are attempting. Along with your message, additional '
-				. 'information about the state of the system will be included.'
-		)
-	);
-
-	print CGI::div(
-		{ class => 'row mb-3' },
-		CGI::label({ for => 'from', class => 'col-form-label col-auto' }, CGI::b($r->maketext('From:'))),
-		CGI::div(
-			{ class => 'col-auto' },
-			CGI::textfield({
-				class => 'form-control',
-				size  => 40,
-				name  => 'from',
-				id    => 'from',
-				$user && $user->email_address
-				? (disabled => undef, readonly => undef, value => $user->email_address)
-				: (required => undef, value => $r->param('from') // '')
-			})
-		)
-	);
-	print CGI::div({ class => 'alert alert-danger mb-3' }, $message) if $message;
-	print CGI::div(
-		{ class => 'mb-3' },
-		CGI::label({ for => 'feedback', class => 'form-label' }, CGI::b($r->maketext('E-mail:'))),
-		CGI::textarea({
-			name        => 'feedback',
-			id          => 'feedback',
-			rows        => '20',
-			class       => 'form-control',
-			placeholder => $r->maketext('Compose Email Message'),
-			value       => $r->param('feedback') // '',
-			required    => undef
-		}),
-	);
-
-	# Attachment
-	print CGI::div(
-		{ class => 'row mb-3' },
-		CGI::label({ for => 'attachment', class => 'col-form-label col-auto' }, CGI::b($r->maketext('Attachment:'))),
-		CGI::div(
-			{ class => 'col-auto' },
-			CGI::filefield({
-				name   => 'attachment',
-				id     => 'attachment',
-				class  => 'form-control',
-				accept => 'image/*,application/pdf,application/zip,text/plain,text/csv'
-			})
-		)
-	);
-
-	print CGI::submit(
-		{ name => 'sendFeedback', value => $r->maketext('Send E-mail'), class => 'btn btn-primary mb-1' });
-	print CGI::end_form();
-	print CGI::div(CGI::a({ href => $returnURL, class => 'btn btn-primary mt-2' }, $r->maketext('Cancel E-mail')))
-		if $returnURL;
-}
-
-sub getFeedbackRecipients {
-	my ($self, $user) = @_;
-	my $ce = $self->r->ce;
-	my $db = $self->r->db;
-	my $authz = $self->r->authz;
-
-	my @recipients;
-
-	# send to all users with permission to receive_feedback and an email address
-	foreach my $rcptName ($db->listUsers()) {
-		if ($authz->hasPermissions($rcptName, "receive_feedback")) {
-			my $rcpt = $db->getUser($rcptName); # checked
-			next if $ce->{feedback_by_section} and defined $user
-				and defined $rcpt->section and defined $user->section
-				and $rcpt->section ne $user->section;
-			if ($rcpt and $rcpt->email_address) {
-				push @recipients, $rcpt->rfc822_mailbox;
-			}
-		}
-	}
-
-	if (defined $ce->{mail}->{feedbackRecipients}) {
-		push @recipients, @{$ce->{mail}->{feedbackRecipients}};
-	}
-
-	return @recipients;
+sub page_title ($c) {
+	return $c->ce->{feedback_button_name} || $c->maketext('E-mail Instructor');
 }
 
-sub format_user {
-	my ($self, $User) = @_;
-	my $ce = $self->r->ce;
+sub format_user ($c, $user) {
+	my $ce = $c->ce;
 
-	my $result = "User ID:    " . $User->user_id . "\n";
-	$result .= "Name:       " . $User->full_name . "\n";
-	$result .= "Email:      " . $User->email_address . "\n";
-	unless( $ce->{blockStudentIDinFeedback} ) {
-		$result .= "Student ID: " . $User->student_id . "\n";
+	my $result = "User ID:    " . $user->user_id . "\n";
+	$result .= "Name:       " . $user->full_name . "\n";
+	$result .= "Email:      " . $user->email_address . "\n";
+	unless ($ce->{blockStudentIDinFeedback}) {
+		$result .= "Student ID: " . $user->student_id . "\n";
 	}
 
-	my $status_name = $ce->status_abbrev_to_name($User->status);
-	my $status_string = defined $status_name
-		? "$status_name ('" . $User->status . "')"
-		: $User->status . " (unknown status abbreviation)";
+	my $status_name = $ce->status_abbrev_to_name($user->status);
+	my $status_string =
+		defined $status_name
+		? "$status_name ('" . $user->status . "')"
+		: $user->status . " (unknown status abbreviation)";
 	$result .= "Status:     $status_string\n";
 
-	$result .= "Section:    " . $User->section . "\n";
-	$result .= "Recitation: " . $User->recitation . "\n";
-	$result .= "Comment:    " . $User->comment . "\n";
+	$result .= "Section:    " . $user->section . "\n";
+	$result .= "Recitation: " . $user->recitation . "\n";
+	$result .= "Comment:    " . $user->comment . "\n";
 
 	return $result;
 }
 
-sub format_userset {
-	my ($self, $Set) = @_;
-	my $ce = $self->r->ce;
+sub format_userset ($c, $set) {
+	my $ce = $c->ce;
 
-	my $result = "Set ID:                    " . $Set->set_id . "\n";
-	$result .= "Set header file:           " . $Set->set_header . "\n";
-	$result .= "Hardcopy header file:      " . $Set->hardcopy_header . "\n";
+	my $result = "Set ID:                    " . $set->set_id . "\n";
+	$result .= "Set header file:           " . $set->set_header . "\n";
+	$result .= "Hardcopy header file:      " . $set->hardcopy_header . "\n";
 
 	my $tz = $ce->{siteDefaults}{timezone};
-	$result .= "Open date:                 " . $self->formatDateTime($Set->open_date, $tz). "\n";
-	$result .= "Due date:                  " . $self->formatDateTime($Set->due_date, $tz). "\n";
-	$result .= "Answer date:               " . $self->formatDateTime($Set->answer_date, $tz) . "\n";
-	$result .= "Visible:                   " . ($Set->visible ? "yes" : "no") . "\n";
-	$result .= "Assignment type:           " . $Set->assignment_type . "\n";
-	if ($Set->assignment_type =~ /gateway/) {
-		$result .= "Attempts per version:      " . $Set->assignment_type . "\n";
-		$result .= "Time interval:             " . $Set->time_interval . "\n";
-		$result .= "Versions per interval:     " . $Set->versions_per_interval . "\n";
-		$result .= "Version time limit:        " . $Set->version_time_limit . "\n";
-		$result .= "Version creation time:     " . $self->formatDateTime($Set->version_creation_time, $tz) . "\n";
-		$result .= "Problem randorder:         " . $Set->problem_randorder . "\n";
-		$result .= "Version last attempt time: " . $Set->version_last_attempt_time . "\n";
+	$result .= "Open date:                 " . $c->formatDateTime($set->open_date,   $tz) . "\n";
+	$result .= "Due date:                  " . $c->formatDateTime($set->due_date,    $tz) . "\n";
+	$result .= "Answer date:               " . $c->formatDateTime($set->answer_date, $tz) . "\n";
+	$result .= "Visible:                   " . ($set->visible ? "yes" : "no") . "\n";
+	$result .= "Assignment type:           " . $set->assignment_type . "\n";
+	if ($set->assignment_type =~ /gateway/) {
+		$result .= "Attempts per version:      " . $set->assignment_type . "\n";
+		$result .= "Time interval:             " . $set->time_interval . "\n";
+		$result .= "Versions per interval:     " . $set->versions_per_interval . "\n";
+		$result .= "Version time limit:        " . $set->version_time_limit . "\n";
+		$result .= "Version creation time:     " . $c->formatDateTime($set->version_creation_time, $tz) . "\n";
+		$result .= "Problem randorder:         " . $set->problem_randorder . "\n";
+		$result .= "Version last attempt time: " . $set->version_last_attempt_time . "\n";
 	}
 
 	return $result;
 }
 
-sub format_userproblem {
-	my ($self, $Problem) = @_;
-	my $ce = $self->r->ce;
+sub format_userproblem ($c, $problem) {
+	my $ce = $c->ce;
 
-	my $result = "Problem ID:                   " . $Problem->problem_id . "\n";
-	$result .= "Source file:                  " . $Problem->source_file . "\n";
-	$result .= "Value:                        " . $Problem->value . "\n";
-	$result .= "Max attempts                  " . ($Problem->max_attempts == -1 ? "unlimited" : $Problem->max_attempts) . "\n";
-	$result .= "Random seed:                  " . $Problem->problem_seed . "\n";
-	$result .= "Status:                       " . $Problem->status . "\n";
-	$result .= "Attempted:                    " . ($Problem->attempted ? "yes" : "no") . "\n";
+	my $result = "Problem ID:                   " . $problem->problem_id . "\n";
+	$result .= "Source file:                  " . $problem->source_file . "\n";
+	$result .= "Value:                        " . $problem->value . "\n";
+	$result .=
+		"Max attempts                  " . ($problem->max_attempts == -1 ? "unlimited" : $problem->max_attempts) . "\n";
+	$result .= "Random seed:                  " . $problem->problem_seed . "\n";
+	$result .= "Status:                       " . $problem->status . "\n";
+	$result .= "Attempted:                    " . ($problem->attempted ? "yes" : "no") . "\n";
 
-	my %last_answer = decodeAnswers($Problem->last_answer);
+	my %last_answer = decodeAnswers($problem->last_answer);
 	if (%last_answer) {
 		$result .= "Last answer:\n";
 		foreach my $key (sort keys %last_answer) {
@@ -489,8 +333,8 @@ sub format_userproblem {
 		$result .= "Last answer:                  none\n";
 	}
 
-	$result .= "Number of correct attempts:   " . $Problem->num_correct . "\n";
-	$result .= "Number of incorrect attempts: " . $Problem->num_incorrect . "\n";
+	$result .= "Number of correct attempts:   " . $problem->num_correct . "\n";
+	$result .= "Number of incorrect attempts: " . $problem->num_incorrect . "\n";
 
 	return $result;
 }
diff --git a/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm b/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm
index 7af970dd96..bf49e59896 100644
--- a/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm
+++ b/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::GatewayQuiz;
-use base qw(WeBWorK::ContentGenerator);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures, -async_await;
 
 =head1 NAME
 
@@ -23,490 +23,368 @@ deal with versioning sets
 
 =cut
 
-use strict;
-use warnings;
-use WeBWorK::CGI;
-use File::Path qw(rmtree);
-use WeBWorK::Form;
-use WeBWorK::PG;
+use Mojo::Promise;
+use Mojo::JSON qw(encode_json decode_json);
+
 use WeBWorK::PG::ImageGenerator;
-use WeBWorK::PG::IO;
-use WeBWorK::Utils qw(writeLog writeCourseLog encodeAnswers decodeAnswers
-	ref2string makeTempDirectory path_is_subdir before after getAssetURL
-	between wwRound is_restricted);  # use the ContentGenerator formatDateTime, not the version in Utils
-use WeBWorK::DB::Utils qw(global2user user2global);
+# Use the ContentGenerator formatDateTime, not the version in Utils.
+use WeBWorK::Utils qw(writeLog writeCourseLogGivenTime encodeAnswers decodeAnswers
+	path_is_subdir before after between wwRound is_restricted);
+use WeBWorK::Utils::Instructor qw(assignSetVersionToUser);
+use WeBWorK::Utils::Rendering qw(getTranslatorDebuggingOptions renderPG);
+use WeBWorK::Utils::ProblemProcessing qw/create_ans_str_from_responses compute_reduced_score/;
+use WeBWorK::DB::Utils qw(global2user);
 use WeBWorK::Utils::Tasks qw(fake_set fake_set_version fake_problem);
 use WeBWorK::Debug;
-use WeBWorK::ContentGenerator::Instructor qw(assignSetVersionToUser);
 use WeBWorK::Authen::LTIAdvanced::SubmitGrade;
-use WeBWorK::Utils::AttemptsTable;
-use WeBWorK::ContentGenerator::Instructor::SingleProblemGrader;
+use WeBWorK::Authen::LTIAdvantage::SubmitGrade;
+use WeBWorK::HTML::AttemptsTable;
 use PGrandom;
-
 use Caliper::Sensor;
 use Caliper::Entity;
 
-# template method
-sub templateName {
-	return "gateway";
+# Disable links for gateway tests.
+sub can ($c, $arg) {
+	return $arg eq 'links' ? 0 : $c->SUPER::can($arg);
 }
 
-################################################################################
 # "can" methods
-################################################################################
-
 # Subroutines to determine if a user "can" perform an action. Each subroutine is
 # called with the following arguments:
-#
-#     ($self, $User, $PermissionLevel, $EffectiveUser, $Set, $Problem)
-
-# *** The "can" routines are taken from Problem.pm, with small modifications
-# *** to look at number of attempts per version, not per set, and to allow
-# *** showing of correct answers after all attempts at a version are used
-
-sub can_showOldAnswers {
-	my ($self, $User, $PermissionLevel, $EffectiveUser, $Set, $Problem, $tmplSet) = @_;
-	my $authz = $self->r->authz;
-	# we'd like to use "! $Set->hide_work()", but that hides students' work
-	# as they're working on the set, which isn't quite right.  so use instead:
-	return 0 unless $authz->hasPermissions($User->user_id,"can_show_old_answers");
-
-	return (before($Set->due_date()) ||
-		$authz->hasPermissions($User->user_id,"view_hidden_work") ||
-		($Set->hide_work() eq 'N' ||
-			($Set->hide_work() eq 'BeforeAnswerDate' && time > $tmplSet->answer_date)));
-}
+#   ($c, $user, $permissionLevel, $effectiveUser, $set, $problem, $tmplSet)
+# In addition can_recordAnswers and can_checkAnswers have the argument $submitAnswers
+# that is used to distinguish between this submission and the next.
 
-# gateway change here: add $submitAnswers as an optional additional argument
-#   to be included if it's defined
-sub can_showCorrectAnswers {
-	my ($self, $User, $PermissionLevel, $EffectiveUser, $Set, $Problem,
-		$tmplSet, $submitAnswers) = @_;
-	my $authz = $self->r->authz;
-
-	# gateway change here to allow correct answers to be viewed after all attempts
-	#   at a version are exhausted as well as if it's after the answer date
-	# $addOne allows us to count the current submission
-	my $addOne = defined($submitAnswers) ? $submitAnswers : 0;
-	my $maxAttempts = $Set->attempts_per_version() || 0;
-	my $attemptsUsed = $Problem->num_correct + $Problem->num_incorrect + $addOne || 0;
-
-	# this is complicated by trying to address hiding scores by problem---that
-	#    is, if $set->hide_score_by_problem and $set->hide_score are both set,
-	#    then we should allow scores to be shown, but not show the score on
-	#    any individual problem.  to deal with this, we make
-	#    can_showCorrectAnswers give the least restrictive view of hiding, and
-	#    then filter scores for the problems themselves later
-
-	#    showing correcrt answers but not showing scores doesn't make sense
-	#    so we should hide the correct answers if we aren not showing
-	#    scores GG.
-
-	my $canShowScores = $Set->hide_score_by_problem eq 'N' &&
-		($Set->hide_score eq 'N' ||
-			($Set->hide_score eq 'BeforeAnswerDate' && after($tmplSet->answer_date)));
-
-	return (((after($Set->answer_date) ||
-				($attemptsUsed >= $maxAttempts && $maxAttempts != 0 &&
-					$Set->due_date() == $Set->answer_date())) ||
-			$authz->hasPermissions($User->user_id, "show_correct_answers_before_answer_date")) &&
-		($authz->hasPermissions($User->user_id, "view_hidden_work") || $canShowScores));
+sub can_showOldAnswers ($c, $user, $permissionLevel, $effectiveUser, $set, $problem, $tmplSet) {
+	my $authz = $c->authz;
+
+	return 0 unless $authz->hasPermissions($user->user_id, 'can_show_old_answers');
+
+	return (
+		before($set->due_date, $c->submitTime)
+			|| $authz->hasPermissions($user->user_id, 'view_hidden_work')
+			|| ($set->hide_work eq 'N'
+				|| ($set->hide_work eq 'BeforeAnswerDate' && after($tmplSet->answer_date, $c->submitTime)))
+	);
 }
 
-sub can_showProblemGrader {
-	my ($self, $User, $PermissionLevel, $EffectiveUser, $Set, $Problem) = @_;
-	my $authz = $self->r->authz;
+sub can_showCorrectAnswers ($c, $user, $permissionLevel, $effectiveUser, $set, $problem, $tmplSet) {
+	my $authz = $c->authz;
+
+	# Allow correct answers to be viewed after all attempts at a version
+	# are exhausted or if it is after the answer date.
+	my $attemptsPerVersion = $set->attempts_per_version || 0;
+	my $attemptsUsed       = $problem->num_correct + $problem->num_incorrect + ($c->{submitAnswers} ? 1 : 0);
 
-	return ($authz->hasPermissions($User->user_id, "access_instructor_tools") &&
-		$authz->hasPermissions($User->user_id, "score_sets") &&
-		$Set->set_id ne "Undefined_Set" && !$self->{invalidSet});
+	# This is complicated by trying to address hiding scores by problem.  That is, if $set->hide_score_by_problem and
+	# $set->hide_score are both set, then we should allow scores to be shown, but not show the score on any individual
+	# problem.  To deal with this, we make can_showCorrectAnswers give the least restrictive view of hiding, and then
+	# filter scores for the problems themselves later.
+	return (
+		(
+			(
+				after($set->answer_date, $c->submitTime) || ($attemptsUsed >= $attemptsPerVersion
+					&& $attemptsPerVersion != 0
+					&& $set->due_date == $set->answer_date)
+			)
+				|| $authz->hasPermissions($user->user_id, 'show_correct_answers_before_answer_date')
+		)
+			&& (
+				$authz->hasPermissions($user->user_id, 'view_hidden_work')
+				|| $set->hide_score_by_problem eq 'N' && ($set->hide_score eq 'N'
+					|| ($set->hide_score eq 'BeforeAnswerDate' && after($tmplSet->answer_date, $c->submitTime)))
+			)
+	);
 }
 
-sub can_showHints {
-	#my ($self, $User, $PermissionLevel, $EffectiveUser, $Set, $Problem) = @_;
-	return 1;
+sub can_showProblemGrader ($c, $user, $permissionLevel, $effectiveUser, $set, $problem, $tmplSet) {
+	my $authz = $c->authz;
+
+	return ($authz->hasPermissions($user->user_id, 'access_instructor_tools')
+			&& $authz->hasPermissions($user->user_id, 'score_sets')
+			&& $set->set_id ne 'Undefined_Set'
+			&& !$c->{invalidSet});
 }
 
-# gateway change here: add $submitAnswers as an optional additional argument
-#   to be included if it's defined
-sub can_showSolutions {
-	my ($self, $User, $PermissionLevel, $EffectiveUser, $Set, $Problem,
-		$tmplSet, $submitAnswers) = @_;
-	my $authz = $self->r->authz;
-
-	# this is the same as can_showCorrectAnswers
-	# gateway change here to allow correct answers to be viewed after all attempts
-	#   at a version are exhausted as well as if it's after the answer date
-	# $addOne allows us to count the current submission
-	my $addOne = defined($submitAnswers) ? $submitAnswers : 0;
-	my $attempts_per_version = $Set->attempts_per_version() || 0;
-	my $attemptsUsed = $Problem->num_correct+$Problem->num_incorrect+$addOne || 0;
-
-	# this is complicated by trying to address hiding scores by problem---that
-	#    is, if $set->hide_score_by_problem and $set->hide_score are both set,
-	#    then we should allow scores to be shown, but not show the score on
-	#    any individual problem.  to deal with this, we make can_showSolutions
-	#    give the least restrictive view of hiding, and then filter scores for
-	#    the problems themselves later
-	#    showing correcrt answers but not showing scores doesn't make sense
-	#    so we should hide the correct answers if we aren not showing
-	#    scores GG.
-
-	my $canShowScores = $Set->hide_score_by_problem eq 'N' &&
-		($Set->hide_score eq 'N' ||
-			($Set->hide_score eq 'BeforeAnswerDate' && after($tmplSet->answer_date)));
-
-	return (((after($Set->answer_date) ||
-				($attemptsUsed >= $attempts_per_version &&
-					$attempts_per_version != 0 &&
-					$Set->due_date() == $Set->answer_date())) ||
-			$authz->hasPermissions($User->user_id, "show_correct_answers_before_answer_date")) &&
-		($authz->hasPermissions($User->user_id, "view_hidden_work") || $canShowScores));
+sub can_showHints ($c) { return 1; }
+
+sub can_showSolutions ($c, $user, $permissionLevel, $effectiveUser, $set, $problem, $tmplSet) {
+	my $authz = $c->authz;
+
+	return 1 if $authz->hasPermissions($user->user_id, 'always_show_solution');
+
+	# This is the same as can_showCorrectAnswers.
+	return $c->can_showCorrectAnswers($user, $permissionLevel, $effectiveUser, $set, $problem, $tmplSet);
 }
 
-# gateway change here: add $submitAnswers as an optional additional argument
-#   to be included if it's defined
-# we also allow for a version_last_attempt_time which is the time the set was
-#   submitted; if that's present we use that instead of the current time to
-#   decide if we can record the answers.  this deals with the time between the
-#   submission time and the proctor authorization.
-sub can_recordAnswers {
-	my ($self, $User, $PermissionLevel, $EffectiveUser, $Set, $Problem,
-		$tmplSet, $submitAnswers) = @_;
-	my $authz = $self->r->authz;
-
-	# easy first case: never record answers for undefined sets
-	return 0 if $Set->set_id eq "Undefined_Set";
-
-	my $timeNow = defined($self->{timeNow}) ? $self->{timeNow} : time();
-	# get the sag time after the due date in which we'll still grade the test
-	my $grace = $self->{ce}->{gatewayGracePeriod};
-
-	my $submitTime = ($Set->assignment_type eq 'proctored_gateway' &&
-		defined($Set->version_last_attempt_time()) && $Set->version_last_attempt_time())
-		? $Set->version_last_attempt_time() : $timeNow;
-
-	if ($User->user_id ne $EffectiveUser->user_id) {
-		my $recordAsOther = $authz->hasPermissions($User->user_id, "record_answers_when_acting_as_student");
-		my $recordVersionsAsOther = $authz->hasPermissions($User->user_id, "record_set_version_answers_when_acting_as_student");
-
-		if ($recordAsOther) {
-			return $recordAsOther;
-		} elsif (!$recordVersionsAsOther) {
-			return $recordVersionsAsOther;
-		}
-		## if we're not allowed to record answers as another user,
-		##    return that permission.  if we're allowed to record
-		##    only set version answers, then we allow that between
-		##    the open and close dates, and so drop out of this
-		##    conditional to the usual one.
-		## it isn't clear if this is the correct behavior, but I
-		##    think it's probably reasonable.
+# Allow for a version_last_attempt_time which is the time the set was submitted. If that is present we use that instead
+# of the current time to decide if answers can be recorded.  This deals with the time between the submission time and
+# the proctor authorization.
+sub can_recordAnswers ($c, $user, $permissionLevel, $effectiveUser, $set, $problem, $tmplSet = 0, $submitAnswers = 0) {
+	my $authz = $c->authz;
+
+	# Never record answers for undefined sets
+	return 0 if $set->set_id eq 'Undefined_Set';
+
+	if ($user->user_id ne $effectiveUser->user_id) {
+		# If the user is not allowed to record answers as another user, return that permission.  If the user is allowed
+		# to record only set version answers, then allow that between the open and close dates, and so drop out of this
+		# conditional to the usual one.
+		return 1 if $authz->hasPermissions($user->user_id,  'record_answers_when_acting_as_student');
+		return 0 if !$authz->hasPermissions($user->user_id, 'record_set_version_answers_when_acting_as_student');
 	}
 
-	if (before($Set->open_date, $submitTime)) {
-		return $authz->hasPermissions($User->user_id, "record_answers_before_open_date");
-	} elsif (between($Set->open_date, $Set->due_date + $grace, $submitTime)) {
-
-		# gateway change here; we look at maximum attempts per version, not for the set,
-		#   to determine the number of attempts allowed
-		# $addOne allows us to count the current submission
-		my $addOne = (defined($submitAnswers) && $submitAnswers) ? 1 : 0;
-		my $attempts_per_version = $Set->attempts_per_version() || 0;
-		my $attempts_used = $Problem->num_correct+$Problem->num_incorrect+$addOne;
-		if ($attempts_per_version == 0 or $attempts_used < $attempts_per_version) {
-			return $authz->hasPermissions($User->user_id, "record_answers_after_open_date_with_attempts");
+	my $submitTime =
+		($set->assignment_type eq 'proctored_gateway' && $set->version_last_attempt_time)
+		? $set->version_last_attempt_time
+		: $c->submitTime;
+
+	return $authz->hasPermissions($user->user_id, 'record_answers_before_open_date')
+		if before($set->open_date, $submitTime);
+
+	if (between($set->open_date, $set->due_date + $c->ce->{gatewayGracePeriod}, $submitTime)) {
+		# Look at maximum attempts per version, not for the set, to determine the number of attempts allowed.
+		my $attemptsPerVersion = $set->attempts_per_version || 0;
+		my $attemptsUsed       = $problem->num_correct + $problem->num_incorrect + ($submitAnswers ? 1 : 0);
+
+		if ($attemptsPerVersion == 0 || $attemptsUsed < $attemptsPerVersion) {
+			return $authz->hasPermissions($user->user_id, 'record_answers_after_open_date_with_attempts');
 		} else {
-			return $authz->hasPermissions($User->user_id, "record_answers_after_open_date_without_attempts");
+			return $authz->hasPermissions($user->user_id, 'record_answers_after_open_date_without_attempts');
 		}
-	} elsif (between(($Set->due_date + $grace), $Set->answer_date, $submitTime)) {
-		return $authz->hasPermissions($User->user_id, "record_answers_after_due_date");
-	} elsif (after($Set->answer_date, $submitTime)) {
-		return $authz->hasPermissions($User->user_id, "record_answers_after_answer_date");
 	}
+
+	return $authz->hasPermissions($user->user_id, 'record_answers_after_due_date')
+		if between(($set->due_date + $c->ce->{gatewayGracePeriod}), $set->answer_date, $submitTime);
+
+	return $authz->hasPermissions($user->user_id, 'record_answers_after_answer_date')
+		if after($set->answer_date, $submitTime);
+
+	return 0;
 }
 
-# gateway change here: add $submitAnswers as an optional additional argument
-#   to be included if it's defined
-# we also allow for a version_last_attempt_time which is the time the set was
-#   submitted; if that's present we use that instead of the current time to
-#   decide if we can check the answers.  this deals with the time between the
-#   submission time and the proctor authorization.
-sub can_checkAnswers {
-	my ($self, $User, $PermissionLevel, $EffectiveUser, $Set, $Problem,
-		$tmplSet, $submitAnswers) = @_;
-	my $authz = $self->r->authz;
-
-	# if we can record answers then we dont need to be able to check them
-	# unless we have that specific permission.
-	if ($self->can_recordAnswers($User, $PermissionLevel, $EffectiveUser,
-			$Set, $Problem, $tmplSet, $submitAnswers)
-		&& !$authz->hasPermissions($User->user_id, "can_check_and_submit_answers")) {
-		return 0;
-	}
+# Allow for a version_last_attempt_time which is the time the set was submitted.  If that is present, then use that
+# instead of the current time to decide if answers can be checked.  This deals with the time between the submission time
+# and the proctor authorization.
+sub can_checkAnswers ($c, $user, $permissionLevel, $effectiveUser, $set, $problem, $tmplSet, $submitAnswers = 0) {
+	my $authz = $c->authz;
+
+	return 0
+		if $c->can_recordAnswers($user, $permissionLevel, $effectiveUser, $set, $problem, $tmplSet, $submitAnswers)
+		&& !$authz->hasPermissions($user->user_id, 'can_check_and_submit_answers');
+
+	my $submitTime =
+		($set->assignment_type eq 'proctored_gateway' && $set->version_last_attempt_time)
+		? $set->version_last_attempt_time
+		: $c->submitTime;
+
+	return $authz->hasPermissions($user->user_id, 'check_answers_before_open_date')
+		if before($set->open_date, $submitTime);
+
+	# This is complicated by trying to address hiding scores by problem.  If $set->hide_score_by_problem and
+	# $set->hide_score are both set, then allow scores to be shown, but don't show the score on any individual problem.
+	# To deal with this, use the least restrictive view of hiding, and then filter for the problems themselves later.
+
+	my $canShowProblemScores =
+		$c->can_showProblemScores($user, $permissionLevel, $effectiveUser, $set, $problem, $tmplSet);
+
+	if (between($set->open_date, $set->due_date + $c->ce->{gatewayGracePeriod}, $submitTime)) {
+		# Look at maximum attempts per version, not for the set, to determine the number of attempts allowed.
+		my $attempts_per_version = $set->attempts_per_version || 0;
+		my $attempts_used        = $problem->num_correct + $problem->num_incorrect + ($submitAnswers ? 1 : 0);
 
-	my $timeNow = defined($self->{timeNow}) ? $self->{timeNow} : time();
-	# get the sag time after the due date in which we'll still grade the test
-	my $grace = $self->{ce}->{gatewayGracePeriod};
-
-	my $submitTime = ($Set->assignment_type eq 'proctored_gateway' &&
-		defined($Set->version_last_attempt_time()) && $Set->version_last_attempt_time())
-		? $Set->version_last_attempt_time() : $timeNow;
-
-	# this is further complicated by trying to address hiding scores by
-	#    problem---that is, if $set->hide_score_by_problem and
-	#    $set->hide_score are both set, then we should allow scores to
-	#    be shown, but not show the score on any individual problem.
-	#    to deal with this, we use the least restrictive view of hiding
-	#    here, and then filter for the problems themselves later
-	#    showing correcrt answers but not showing scores doesn't make sense
-	#    so we should hide the correct answers if we aren not showing
-	#    scores GG.
-
-	my $canShowScores = $Set->hide_score_by_problem eq 'N' && ($Set->hide_score eq 'N' ||
-		($Set->hide_score eq 'BeforeAnswerDate' && after($tmplSet->answer_date)));
-
-	if (before($Set->open_date, $submitTime)) {
-		return $authz->hasPermissions($User->user_id, "check_answers_before_open_date");
-	} elsif (between($Set->open_date, $Set->due_date + $grace, $submitTime)) {
-
-		# gateway change here; we look at maximum attempts per version, not for the set,
-		#   to determine the number of attempts allowed
-		# $addOne allows us to count the current submission
-		my $addOne = (defined($submitAnswers) && $submitAnswers) ? 1 : 0;
-		my $attempts_per_version = $Set->attempts_per_version() || 0;
-		my $attempts_used = $Problem->num_correct + $Problem->num_incorrect + $addOne;
-
-		if ($attempts_per_version == -1 or $attempts_used < $attempts_per_version) {
-			return ($authz->hasPermissions($User->user_id, "check_answers_after_open_date_with_attempts") &&
-				($authz->hasPermissions($User->user_id, "view_hidden_work") ||
-					$canShowScores));
+		if ($attempts_per_version == -1 || $attempts_used < $attempts_per_version) {
+			return $authz->hasPermissions($user->user_id, 'check_answers_after_open_date_with_attempts')
+				&& $canShowProblemScores;
 		} else {
-			return ($authz->hasPermissions($User->user_id, "check_answers_after_open_date_without_attempts") &&
-				($authz->hasPermissions($User->user_id, "view_hidden_work") ||
-					$canShowScores));
+			return $authz->hasPermissions($user->user_id, 'check_answers_after_open_date_without_attempts')
+				&& $canShowProblemScores;
 		}
-	} elsif (between(($Set->due_date + $grace), $Set->answer_date, $submitTime)) {
-		return ($authz->hasPermissions($User->user_id, "check_answers_after_due_date")  &&
-			($authz->hasPermissions($User->user_id, "view_hidden_work") ||
-				$canShowScores));
-	} elsif (after($Set->answer_date, $submitTime)) {
-		return ($authz->hasPermissions($User->user_id, "check_answers_after_answer_date") &&
-			($authz->hasPermissions($User->user_id, "view_hidden_work") ||
-				$canShowScores));
 	}
-}
-
-sub can_showScore {
-	my ($self, $User, $PermissionLevel, $EffectiveUser, $Set, $Problem,
-		$tmplSet, $submitAnswers) = @_;
-	my $authz = $self->r->authz;
 
-	my $timeNow = defined($self->{timeNow}) ? $self->{timeNow} : time();
+	return $authz->hasPermissions($user->user_id, 'check_answers_after_due_date') && $canShowProblemScores
+		if between(($set->due_date + $c->ce->{gatewayGracePeriod}), $set->answer_date, $submitTime);
 
-	# address hiding scores by problem
-	my $canShowScores = ($Set->hide_score eq 'N' ||
-		($Set->hide_score eq 'BeforeAnswerDate' &&
-			after($tmplSet->answer_date)));
+	return $authz->hasPermissions($user->user_id, 'check_answers_after_answer_date') && $canShowProblemScores
+		if after($set->answer_date, $submitTime);
 
-	return ($authz->hasPermissions($User->user_id,"view_hidden_work") || $canShowScores);
+	return 0;
 }
 
-sub can_useMathView {
-	my ($self, $User, $EffectiveUser, $Set, $Problem, $submitAnswers) = @_;
-	my $ce= $self->r->ce;
-
-	return $ce->{pg}->{specialPGEnvironmentVars}->{entryAssist} eq 'MathView';
+sub can_showScore ($c, $user, $permissionLevel, $effectiveUser, $set, $problem, $tmplSet) {
+	return
+		$c->authz->hasPermissions($user->user_id, 'view_hidden_work')
+		|| $set->hide_score eq 'N'
+		|| ($set->hide_score eq 'BeforeAnswerDate' && after($tmplSet->answer_date, $c->submitTime));
 }
 
-sub can_useWirisEditor {
-	my ($self, $User, $EffectiveUser, $Set, $Problem, $submitAnswers) = @_;
-	my $ce= $self->r->ce;
-
-	return $ce->{pg}->{specialPGEnvironmentVars}->{entryAssist} eq 'WIRIS';
+sub can_showProblemScores ($c, $user, $permissionLevel, $effectiveUser, $set, $problem, $tmplSet) {
+	return $c->can_showScore($user, $permissionLevel, $effectiveUser, $set, $problem, $tmplSet)
+		&& ($set->hide_score_by_problem eq 'N' || $c->authz->hasPermissions($user->user_id, 'view_hidden_work'));
 }
 
-sub can_useMathQuill {
-	my ($self, $User, $EffectiveUser, $Set, $Problem, $submitAnswers) = @_;
-	my $ce= $self->r->ce;
-
-	return $ce->{pg}->{specialPGEnvironmentVars}->{entryAssist} eq 'MathQuill';
+sub can_showWork ($c, $user, $permissionLevel, $effectiveUser, $set, $problem, $tmplSet) {
+	return $c->authz->hasPermissions($user->user_id, 'view_hidden_work')
+		|| ($set->hide_work eq 'N'
+			|| ($set->hide_work eq 'BeforeAnswerDate' && $c->submitTime > $tmplSet->answer_date));
 }
 
-################################################################################
-# output utilities
-################################################################################
+sub can_useMathView ($c) {
+	return $c->ce->{pg}{specialPGEnvironmentVars}{entryAssist} eq 'MathView';
+}
 
-sub attemptResults {
-	my $self = shift;
-	my $pg = shift;
-	my $showAttemptAnswers = shift;
-	my $showCorrectAnswers = shift;
-	my $showAttemptResults = $showAttemptAnswers && shift;
-	my $showSummary = shift;
-	my $showAttemptPreview = shift || 0;
-	my $ce = $self->{ce};
-
-	# to make grabbing these options easier, we'll pull them out now...
-	my %imagesModeOptions = %{$ce->{pg}{displayModeOptions}{images}};
-
-	my $imgGen = WeBWorK::PG::ImageGenerator->new(
-		tempDir         => $ce->{webworkDirs}{tmp},
-		latex           => $ce->{externalPrograms}{latex},
-		dvipng          => $ce->{externalPrograms}{dvipng},
-		useCache        => 1,
-		cacheDir        => $ce->{webworkDirs}{equationCache},
-		cacheURL        => $ce->{webworkURLs}{equationCache},
-		cacheDB         => $ce->{webworkFiles}{equationCacheDB},
-		dvipng_align    => $imagesModeOptions{dvipng_align},
-		dvipng_depth_db => $imagesModeOptions{dvipng_depth_db},
-	);
+sub can_useMathQuill ($c) {
+	return $c->ce->{pg}{specialPGEnvironmentVars}{entryAssist} eq 'MathQuill';
+}
 
-	my $showEvaluatedAnswers = $ce->{pg}{options}{showEvaluatedAnswers} // '';
+# Output utility
+sub attemptResults ($c, $pg, $showCorrectAnswers, $showAttemptResults, $showSummary) {
+	my $ce = $c->ce;
 
 	# Create AttemptsTable object
-	my $tbl = WeBWorK::Utils::AttemptsTable->new(
+	my $tbl = WeBWorK::HTML::AttemptsTable->new(
 		$pg->{answers},
-		answersSubmitted       => 1,
-		answerOrder            => $pg->{flags}{ANSWER_ENTRY_ORDER},
-		displayMode            => $self->{displayMode},
-		showHeadline           => 0,
-		showAnswerNumbers      => 0,
-		showAttemptAnswers     => $showAttemptAnswers && $showEvaluatedAnswers,
-		showAttemptPreviews    => $showAttemptPreview,
-		showAttemptResults     => $showAttemptResults,
-		showCorrectAnswers     => $showCorrectAnswers,
-		showMessages           => $showAttemptAnswers, # internally checks for messages
-		showSummary            => $showSummary,
-		imgGen                 => $imgGen, # not needed if ce is present ,
-		ce                     => '',      # not needed if $imgGen is present
-		maketext               => WeBWorK::Localize::getLoc($ce->{language}),
+		$c,
+		answersSubmitted    => 1,
+		answerOrder         => $pg->{flags}{ANSWER_ENTRY_ORDER},
+		displayMode         => $c->{displayMode},
+		showHeadline        => 0,
+		showAnswerNumbers   => 0,
+		showAttemptAnswers  => $ce->{pg}{options}{showEvaluatedAnswers},
+		showAttemptPreviews => 1,
+		showAttemptResults  => $showAttemptResults,
+		showCorrectAnswers  => $showCorrectAnswers,
+		showMessages        => 1,
+		showSummary         => $showSummary,
+		imgGen              => WeBWorK::PG::ImageGenerator->new(
+			tempDir         => $ce->{webworkDirs}{tmp},
+			latex           => $ce->{externalPrograms}{latex},
+			dvipng          => $ce->{externalPrograms}{dvipng},
+			useCache        => 1,
+			cacheDir        => $ce->{webworkDirs}{equationCache},
+			cacheURL        => $ce->{webworkURLs}{equationCache},
+			cacheDB         => $ce->{webworkFiles}{equationCacheDB},
+			useMarkers      => 1,
+			dvipng_align    => $ce->{pg}{displayModeOptions}{images}{dvipng_align},
+			dvipng_depth_db => $ce->{pg}{displayModeOptions}{images}{dvipng_depth_db},
+		),
 	);
 
 	my $answerTemplate = $tbl->answerTemplate;
-	$tbl->imgGen->render(refresh => 1) if $tbl->displayMode eq 'images';
+	$tbl->imgGen->render(body_text => $answerTemplate) if $tbl->displayMode eq 'images';
+
 	return $answerTemplate;
 }
 
-sub get_instructor_comment {
-	my ($self, $problem) = @_;
-
+sub get_instructor_comment ($c, $problem) {
 	return unless ref($problem) =~ /ProblemVersion/;
 
-	my $db = $self->r->db;
-	my $userPastAnswerID = $db->latestProblemPastAnswer($self->{ce}{courseName}, $problem->user_id,
-		$problem->set_id . ",v" . $problem->version_id, $problem->problem_id);
+	my $db               = $c->db;
+	my $userPastAnswerID = $db->latestProblemPastAnswer(
+		$c->ce->{courseName},
+		$problem->user_id, $problem->set_id . ',v' . $problem->version_id,
+		$problem->problem_id
+	);
 
 	if ($userPastAnswerID) {
 		my $userPastAnswer = $db->getPastAnswer($userPastAnswerID);
 		return $userPastAnswer->comment_string;
 	}
 
-	return "";
+	return '';
 }
 
-################################################################################
-# Template escape implementations
-################################################################################
-
-# FIXME need to make $Set and $set be used consistently
-
-sub pre_header_initialize {
-	my ($self)     = @_;
-
-	# if authz->checkSet has failed, this set is invalid, and no need to proceeded.
-	return if $self->{invalidSet};
-
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-
-	my $setName = $urlpath->arg("setID");
-	my $userName = $r->param('user');
-	my $effectiveUserName = $r->param('effectiveUser');
-	my $key = $r->param('key');
-
-	# should we allow a new version to be created when acting as a user?
-	my $verCreateOK = defined($r->param('createnew_ok')) ? $r->param('createnew_ok') : 0;
-
-	# user checks
-	my $User = $db->getUser($userName);
-	die "record for user $userName (real user) does not exist." unless defined $User;
-
-	my $EffectiveUser = $db->getUser($effectiveUserName);
-	die "record for user $effectiveUserName (effective user) does not exist." unless defined $EffectiveUser;
-
-	my $PermissionLevel = $db->getPermissionLevel($userName);
-	die "permission level record for $userName does not exist (but the user does? odd...)"
-	unless defined($PermissionLevel);
-
-	my $permissionLevel = $PermissionLevel->permission;
-
-	# we could be coming in with $setName = the versioned or nonversioned set
-	# deal with that first
-	my $requestedVersion = ($setName =~ /,v(\d+)$/) ? $1 : 0;
-	$setName =~ s/,v\d+$//;
-	# note that if we're already working with a version we want to be sure to stick
-	# with that version.  we do this after we've validated that the user is
-	# assigned the set, below
-
-	###################################
-	# gateway set and problem collection
-	###################################
-
-	# we need the template (user) set, the merged set-version, and a
-	#    problem from the set to be able to test whether we're creating a
-	#    new set version.  assemble these
-	my ($tmplSet, $set, $Problem) = (0, 0, 0);
-
-	# if the set comes in as "Undefined_Set", then we're trying/editing a
-	#    single problem in a set, and so create a fake set with which to work
-	#    if the user has the authorization to do that.
-	if ($setName eq "Undefined_Set") {
-
-		# make sure these are defined
+# Template methods
+
+async sub pre_header_initialize ($c) {
+	# Make sure these are defined for the templates.
+	$c->stash->{problems}        = [];
+	$c->stash->{pg_results}      = [];
+	$c->stash->{startProb}       = 0;
+	$c->stash->{endProb}         = 0;
+	$c->stash->{numPages}        = 0;
+	$c->stash->{pageNumber}      = 0;
+	$c->stash->{problem_numbers} = [];
+	$c->stash->{probOrder}       = [];
+
+	# If authz->checkSet has failed, then this set is invalid.  No need to proceeded.
+	return if $c->{invalidSet};
+
+	my $ce    = $c->ce;
+	my $db    = $c->db;
+	my $authz = $c->authz;
+
+	my $setID           = $c->stash('setID');
+	my $userID          = $c->param('user');
+	my $effectiveUserID = $c->param('effectiveUser');
+	my $isFakeSet       = 0;
+
+	# User checks
+	my $user = $db->getUser($userID);
+	die "record for user $userID (real user) does not exist." unless defined $user;
+
+	my $effectiveUser = $db->getUser($effectiveUserID);
+	die "record for user $effectiveUserID (effective user) does not exist." unless defined $effectiveUser;
+
+	my $permissionLevel = $db->getPermissionLevel($userID);
+	die "permission level record for $userID does not exist (but the user does? odd...)"
+		unless defined $permissionLevel;
+
+	# The $setID could be the versioned or nonversioned set.  Extract the version if it is provided.
+	my $requestedVersion = ($setID =~ /,v(\d+)$/) ? $1 : 0;
+	$setID =~ s/,v\d+$//;
+	# Note that if a version was provided the version needs to be checked.  That is done after it has
+	# been validated that the user is assigned the set.
+
+	# Gateway set and problem collection
+
+	# We need the template (user) set, the merged set version, and a problem from the set to be able to test whether
+	# we're creating a new set version.
+	my ($tmplSet, $set, $problem) = (0, 0, 0);
+
+	# If the set comes in as "Undefined_Set", then we're trying/editing a single problem in a set, and so create a fake
+	# set with which to work if the user has the authorization to do that.
+	if ($setID eq 'Undefined_Set') {
+		$isFakeSet = 1;
+		# Make sure these are defined
 		$requestedVersion = 1;
-		$self->{assignment_type} = 'gateway';
+		$c->{assignment_type} = 'gateway';
 
-		if (!$authz->hasPermissions($userName, "modify_problem_sets")) {
-			$self->{invalidSet} = "You do not have the " .
-				"authorization level required to view/edit undefined sets.";
+		if (!$authz->hasPermissions($userID, 'modify_problem_sets')) {
+			$c->{invalidSet} = 'You do not have the authorization level required to view/edit undefined sets.';
 
-			# define these so that we can drop through
-			#    to report the error in body()
+			# Define these so that we can drop through to report the error in body.
 			$tmplSet = fake_set($db);
 			$set     = fake_set_version($db);
-			$Problem = fake_problem($db);
+			$problem = fake_problem($db);
 		} else {
-			# in this case we're creating a fake set from the input, so
-			#    the input must include a source file.
-			if (!$r->param("sourceFilePath")) {
-				$self->{invalidSet} = "An Undefined_Set was requested, but no source " .
-					"file for the contained problem was provided.";
-
-				# define these so that we can drop through
-				#    to report the error in body()
+			# In this case we're creating a fake set from the input, so the input must include a source file.
+			if (!$c->param('sourceFilePath')) {
+				$c->{invalidSet} =
+					'An Undefined_Set was requested, but no source file for the contained problem was provided.';
+
+				# Define these so that we can drop through to report the error in body.
 				$tmplSet = fake_set($db);
 				$set     = fake_set_version($db);
-				$Problem = fake_problem($db);
+				$problem = fake_problem($db);
 
 			} else {
-				my $sourceFPath = $r->param("sourceFilePath");
-				die("sourceFilePath is unsafe!") unless
-				path_is_subdir($sourceFPath, $ce->{courseDirs}->{templates}, 1);
+				my $sourceFPath = $c->param('sourceFilePath');
+				die('sourceFilePath is unsafe!')
+					unless path_is_subdir($sourceFPath, $ce->{courseDirs}{templates}, 1);
 
 				$tmplSet = fake_set($db);
 				$set     = fake_set_version($db);
-				$Problem = fake_problem($db);
+				$problem = fake_problem($db);
+
+				my $creation_time = time;
 
-				$tmplSet->assignment_type("gateway");
+				$tmplSet->assignment_type('gateway');
 				$tmplSet->attempts_per_version(0);
 				$tmplSet->time_interval(0);
 				$tmplSet->versions_per_interval(1);
 				$tmplSet->version_time_limit(0);
-				$tmplSet->version_creation_time(time());
+				$tmplSet->version_creation_time($creation_time);
 				$tmplSet->problem_randorder(0);
 				$tmplSet->problems_per_page(1);
 				$tmplSet->hide_score('N');
@@ -515,81 +393,70 @@ sub pre_header_initialize {
 				$tmplSet->time_limit_cap('0');
 				$tmplSet->restrict_ip('No');
 
-				$set->assignment_type("gateway");
+				$set->assignment_type('gateway');
 				$set->time_interval(0);
 				$set->versions_per_interval(1);
 				$set->version_time_limit(0);
-				$set->version_creation_time(time());
+				$set->version_creation_time($creation_time);
 				$set->time_limit_cap('0');
 
-				$Problem->problem_id(1);
-				$Problem->source_file($sourceFPath);
-				$Problem->user_id($effectiveUserName);
-				$Problem->value(1);
-				$Problem->problem_seed($r->param("problemSeed")) if ($r->param("problemSeed"));
+				$problem->problem_id(1);
+				$problem->source_file($sourceFPath);
+				$problem->user_id($effectiveUserID);
+				$problem->value(1);
+				$problem->problem_seed($c->param('problemSeed')) if ($c->param('problemSeed'));
 			}
 		}
 	} else {
-		# get template set: the non-versioned set that's assigned to the user
-		#    if this fails/failed in authz->checkSet, then $self->{invalidSet} is set
-		$tmplSet = $db->getMergedSet($effectiveUserName, $setName);
+		# Get the template set, i.e., the non-versioned set that's assigned to the user.
+		# If this failed in authz->checkSet, then $c->{invalidSet} is set.
+		$tmplSet = $db->getMergedSet($effectiveUserID, $setID);
 
-		# now we know that we're in a gateway test, save the assignment test
-		#    for the processing of proctor keys for graded proctored tests;
-		#    if we failed to get the set from the database, we store a fake
-		#    value here to be able to continue
-		$self->{'assignment_type'} = $tmplSet->assignment_type() || 'gateway';
+		# Now that is has been validated that this is a gateway test, save the assignment test for the processing of
+		# proctor keys for graded proctored tests.  If a set was not obtained from the database, store a fake value here
+		# to be able to continue.
+		$c->{assignment_type} = $tmplSet->assignment_type || 'gateway';
 
 		# next, get the latest (current) version of the set if we don't have a
 		#     requested version number
-		my @allVersionIds = $db->listSetVersions($effectiveUserName, $setName);
+		my @allVersionIds = $db->listSetVersions($effectiveUserID, $setID);
 		my $latestVersion = (@allVersionIds ? $allVersionIds[-1] : 0);
 
-		# double check that any requested version makes sense
+		# Double check that the requested version makes sense.
 		$requestedVersion = $latestVersion
-		if ($requestedVersion !~ /^\d+$/ ||
-			$requestedVersion > $latestVersion ||
-			$requestedVersion < 0);
-
-		die("No requested version when returning to problem?!")
-		if (($r->param("previewAnswers") ||
-				$r->param("checkAnswers") ||
-				$r->param("submitAnswers") ||
-				$r->param("newPage")) && ! $requestedVersion);
-
-		# to test for a proctored test, we need the set version, not the
-		#    template, to allow a finished proctored test to be checked as an
-		#    unproctored test.  so we get the versioned set here
+			if ($requestedVersion !~ /^\d+$/
+				|| $requestedVersion > $latestVersion
+				|| $requestedVersion < 0);
+
+		die('No requested version when returning to problem?!')
+			if (
+				(
+					$c->param('previewAnswers')
+					|| $c->param('checkAnswers')
+					|| $c->param('submitAnswers')
+					|| $c->param('newPage')
+				)
+				&& !$requestedVersion
+			);
+
+		# To check for a proctored test, the set version is needed, not the template.  So get that.
 		if ($requestedVersion) {
-			# if a specific set version was requested, it was stored in the $authz
-			#    object when we did the set check
-			$set = $db->getMergedSetVersion($effectiveUserName,
-				$setName,
-				$requestedVersion);
+			$set = $db->getMergedSetVersion($effectiveUserID, $setID, $requestedVersion);
 		} elsif ($latestVersion) {
-			# otherwise, if there's a current version, which we take to be the
-			#    latest version taken, we use that
-			$set = $db->getMergedSetVersion($effectiveUserName,
-				$setName,
-				$latestVersion);
+			$set = $db->getMergedSetVersion($effectiveUserID, $setID, $latestVersion);
 		} else {
-			# and if neither of those work, get a dummy set so that we have
-			#    something to work with
-			my $userSetClass = $ce->{dbLayout}->{set_version}->{record};
+			# If there is not a requested version or a latest version, then create dummy set to proceed.
 			# FIXME RETURN TO: should this be global2version?
-			$set = global2user($userSetClass, $db->getGlobalSet($setName));
-			die "set  $setName  not found."  unless $set;
-			$set->user_id($effectiveUserName);
+			$set = global2user($ce->{dbLayout}{set_version}{record}, $db->getGlobalSet($setID));
+			$set->user_id($effectiveUserID);
 			$set->psvn('000');
-			$set->set_id("$setName");  # redundant?
+			$set->set_id($setID);    # redundant?
 			$set->version_id(0);
 		}
 	}
-	my $setVersionNumber = ($set) ? $set->version_id() : 0;
+	my $setVersionNumber = $set ? $set->version_id : 0;
 
-	#################################
-	# assemble gateway parameters
-	#################################
+	# Assemble gateway parameters
 
 	# We get the open and close dates for the gateway from the template set, or from the merged set version if a set has
 	# been requested.  Note $isOpen and $isClosed give the open and close dates for the gateway as a whole (that is, the
@@ -597,104 +464,73 @@ sub pre_header_initialize {
 	# date.  If a specific version has not been requested and conditional release is enabled, then this also checks to
 	# see if the conditions have been met for a conditional release.
 	my $isOpen = (
-		$requestedVersion ? ($set && $set->open_date && after($set->open_date)) : ($tmplSet
+		$requestedVersion ? ($set && $set->open_date && after($set->open_date, $c->submitTime)) : ($tmplSet
 				&& $tmplSet->open_date
-				&& after($tmplSet->open_date)
-				&& !($ce->{options}{enableConditionalRelease} && is_restricted($db, $tmplSet, $effectiveUserName)))
+				&& after($tmplSet->open_date, $c->submitTime)
+				&& !($ce->{options}{enableConditionalRelease} && is_restricted($db, $tmplSet, $effectiveUserID)))
 		)
-		|| $authz->hasPermissions($userName, "view_unopened_sets");
-
-	# FIXME for $isClosed, "record_answers_after_due_date" isn't quite
-	#    the right description, but it seems reasonable
-	my $isClosed = $tmplSet && $tmplSet->due_date && (after($tmplSet->due_date()) &&
-		! $authz->hasPermissions($userName, "record_answers_after_due_date"));
-
-	# to determine if we need a new version, we need to know whether this
-	#    version exceeds the number of attempts per version.  (among other
-	#    things,) the number of attempts is a property of the problem, so
-	#    get a problem to check that.  note that for a gateway/quiz all
-	#    problems will have the same number of attempts.  This means that
-	#    if the set doesn't have any problems we're up a creek, so check
-	#    for that here and bail if it's the case
-	my @setPNum = $setName eq "Undefined_Set" ? (1) : $db->listUserProblems($EffectiveUser->user_id, $setName);
-	die("Set $setName contains no problems.") if (!@setPNum);
-
-	# if we assigned a fake problem above, $Problem is already defined.
-	#    otherwise, we get the Problem, or define it to be undefined if
-	#    the set hasn't been versioned to the user yet--this gets fixed
-	#    when we assign the setVersion
-	if (!$Problem) {
-		$Problem = $setVersionNumber
-			? $db->getMergedProblemVersion($EffectiveUser->user_id, $setName, $setVersionNumber, $setPNum[0])
+		|| $authz->hasPermissions($userID, 'view_unopened_sets');
+
+	my $isClosed =
+		$tmplSet
+		&& $tmplSet->due_date
+		&& after($tmplSet->due_date, $c->submitTime)
+		&& !$authz->hasPermissions($userID, 'record_answers_after_due_date');
+
+	# To determine if we need a new version, we need to know whether this version exceeds the number of attempts per
+	# version.  Among other things, the number of attempts is a property of the problem, so get a problem to check that.
+	# Note that for a gateway quiz all problems will have the same number of attempts.  This means that if the set
+	# doesn't have any problems we're up a creek, so check for that here and bail if that is the case.
+	my @setPNum = $setID eq 'Undefined_Set' ? (1) : $db->listUserProblems($effectiveUser->user_id, $setID);
+	die("Set $setID contains no problems.") if (!@setPNum);
+
+	# If we assigned a fake problem above, $problem is already defined.  Otherwise, get the problem, or define it to be
+	# undefined if the set hasn't been versioned to the user yet.  This is fixed when we assign the setVersion.
+	if (!$problem) {
+		$problem =
+			$setVersionNumber
+			? $db->getMergedProblemVersion($effectiveUser->user_id, $setID, $setVersionNumber, $setPNum[0])
 			: undef;
 	}
 
-	# note that having $maxAttemptsPerVersion set to an infinite/0 value is
-	#    nonsensical; if we did that, why have versions? (might want to do it for one individual?)
-	# Its actually a good thing for "repeatable" practice sets
-	my $maxAttemptsPerVersion = $tmplSet->attempts_per_version() || 0;
-	my $timeInterval          = $tmplSet->time_interval() || 0;
-	my $versionsPerInterval   = $tmplSet->versions_per_interval() || 0;
-	my $timeLimit             = $tmplSet->version_time_limit() || 0;
-
-	# what happens if someone didn't set one of these?  I think this can
-	# happen if we're handed a malformed set, where the values in the
-	# database are null.
-	$timeInterval = 0 if (! defined($timeInterval) || $timeInterval eq '');
-	$versionsPerInterval = 0 if (! defined($versionsPerInterval) ||
-		$versionsPerInterval eq '');
-
-	# every problem in the set must have the same submission characteristics
-	my $currentNumAttempts = (defined($Problem) && $Problem->num_correct() ne '')
-		? $Problem->num_correct() + $Problem->num_incorrect() : 0;
-
-	# $maxAttempts turns into the maximum number of versions we can create;
-	#    if $Problem isn't defined, we can't have made any attempts, so it
-	#    doesn't matter
-	my $maxAttempts = (defined($Problem) && defined($Problem->max_attempts()) && $Problem->max_attempts())
-		? $Problem->max_attempts() : -1;
-
-	# finding the number of versions per time interval is a little harder.
-	#    we interpret the time interval as a rolling interval: that is,
-	#    if we allow two sets per day, that's two sets in any 24 hour
-	#    period.  this is probably not what we really want, but it's
-	#    more extensible to a limitation like "one version per hour",
-	#    and we can set it to two sets per 12 hours for most "2ce daily"
-	#    type applications
-	my $timeNow = time();
-	my $grace = $ce->{gatewayGracePeriod};
-
-	my $currentNumVersions = 0;  # this is the number of versions in the
-	#    time interval
-	my $totalNumVersions = 0;
-
-	# we don't need to check this if $self->{invalidSet} is already set,
-	#    or if we're working with an Undefined_Set
-	if ($setVersionNumber && ! $self->{invalidSet} && $setName ne "Undefined_Set") {
-		my @setVersionIDs = $db->listSetVersions($effectiveUserName, $setName);
-		my @setVersions = $db->getSetVersions(map {[$effectiveUserName, $setName,, $_]} @setVersionIDs);
-		foreach (@setVersions) {
+	my $maxAttemptsPerVersion = $tmplSet->attempts_per_version  || 0;
+	my $timeInterval          = $tmplSet->time_interval         || 0;
+	my $versionsPerInterval   = $tmplSet->versions_per_interval || 0;
+	my $timeLimit             = $tmplSet->version_time_limit    || 0;
+
+	# What happens if someone didn't set one of these?  Perhaps this can happen if we're handed a malformed set, where
+	# the values in the database are null.
+	$timeInterval        = 0 if !defined $timeInterval        || $timeInterval eq '';
+	$versionsPerInterval = 0 if !defined $versionsPerInterval || $versionsPerInterval eq '';
+
+	# Every problem in the set is assumed have the same submission characteristics.
+	my $currentNumAttempts = defined $problem ? $problem->num_correct + $problem->num_incorrect : 0;
+
+	# $maxAttempts is the maximum number of versions that can be created.
+	# If the problem isn't defined it doesn't matter.
+	my $maxAttempts = defined $problem && $problem->max_attempts ? $problem->max_attempts : -1;
+
+	# Find the number of versions per time interval.  Interpret the time interval as a rolling interval. That is, if two
+	# sets are allowed per day, that is two sets in any 24 hour period.
+
+	my $currentNumVersions = 0;    # this is the number of versions in the time interval
+	my $totalNumVersions   = 0;
+
+	if ($setVersionNumber && !$c->{invalidSet} && $setID ne 'Undefined_Set') {
+		my @setVersionIDs = $db->listSetVersions($effectiveUserID, $setID);
+		my @setVersions   = $db->getSetVersions(map { [ $effectiveUserID, $setID,, $_ ] } @setVersionIDs);
+		for (@setVersions) {
 			$totalNumVersions++;
-			$currentNumVersions++
-			if (!$timeInterval ||
-				$_->version_creation_time() > ($timeNow - $timeInterval));
+			$currentNumVersions++ if (!$timeInterval || $_->version_creation_time() > ($c->submitTime - $timeInterval));
 		}
 	}
 
-	####################################
-	# new version creation conditional
-	####################################
+	# New version creation conditional
 
-	my $versionIsOpen = 0;  # can we do anything to this version?
+	my $versionIsOpen = 0;
 
-	# recall $isOpen = timeNow > openDate [for the merged userset] and
-	#    $isClosed = timeNow > dueDate [for the merged userset]
-	#    again, if $self->{invalidSet} is already set, we don't need to
-	#    to check this
-	if ($isOpen && ! $isClosed && ! $self->{invalidSet}) {
-
-		# if no specific version is requested, we can create a new one if
-		#    need be
+	if ($isOpen && !$isClosed && !$c->{invalidSet}) {
+		# If specific version was not requested, then create a new one if needed.
 		if (!$requestedVersion) {
 			if (
 				($maxAttempts == -1 || $totalNumVersions < $maxAttempts)
@@ -704,60 +540,54 @@ sub pre_header_initialize {
 						(
 							($maxAttemptsPerVersion == 0 && $currentNumAttempts > 0)
 							|| ($maxAttemptsPerVersion != 0 && $currentNumAttempts >= $maxAttemptsPerVersion)
-							|| $timeNow >= $set->due_date + $grace
+							|| $c->submitTime >= $set->due_date + $ce->{gatewayGracePeriod}
 						)
 						&& (!$versionsPerInterval || $currentNumVersions < $versionsPerInterval)
 					)
 				)
 				&& (
-					$effectiveUserName eq $userName
+					$effectiveUserID eq $userID
 					|| (
-						$authz->hasPermissions($userName, "record_answers_when_acting_as_student")
-						|| ($authz->hasPermissions($userName, "create_new_set_version_when_acting_as_student")
-							&& $verCreateOK)
+						$authz->hasPermissions($userID, 'record_answers_when_acting_as_student')
+						|| ($authz->hasPermissions($userID, 'create_new_set_version_when_acting_as_student')
+							&& $c->param('createnew_ok'))
 					)
 				)
 				)
 			{
-				# assign set, get the right name, version
-				#    number, etc., and redefine the $set
-				#    and $Problem we're working with
-				my $setTmpl = $db->getUserSet($effectiveUserName,$setName);
-				WeBWorK::ContentGenerator::Instructor::assignSetVersionToUser($self, $effectiveUserName, $setTmpl);
+				# Assign the set, get the right name, version number, etc., and redefine the $set and $problem for the
+				# remainder of this method.
+				my $setTmpl = $db->getUserSet($effectiveUserID, $setID);
+				assignSetVersionToUser($db, $effectiveUserID, $setTmpl);
 				$setVersionNumber++;
 
-				# get a clean version of the set to save,
-				#    and the merged version to use in the
-				#    rest of the routine
-				my $cleanSet = $db->getSetVersion($effectiveUserName, $setName, $setVersionNumber);
-				$set = $db->getMergedSetVersion($effectiveUserName, $setName, $setVersionNumber);
+				# Get a clean version of the set and merged version to use in the rest of the routine.
+				my $cleanSet = $db->getSetVersion($effectiveUserID, $setID, $setVersionNumber);
+				$set = $db->getMergedSetVersion($effectiveUserID, $setID, $setVersionNumber);
+				$set->visible(1);
 
-				$Problem = $db->getMergedProblemVersion($effectiveUserName, $setName, $setVersionNumber, 1);
+				$problem = $db->getMergedProblemVersion($effectiveUserID, $setID, $setVersionNumber, $setPNum[0]);
 
-				# because we're creating this on the fly,
-				#    it should be visible
-				$set->visible(1);
-				# set up creation time, open and due dates
-				my $ansOffset = $set->answer_date() - $set->due_date();
-				$set->version_creation_time($timeNow);
-				$set->open_date($timeNow);
-				# figure out the due date, taking into account
-				#    any time limit cap
-				my $dueTime = ($timeLimit == 0 || ($set->time_limit_cap && $timeNow+$timeLimit > $set->due_date))
-					? $set->due_date : $timeNow+$timeLimit;
+				# Convert the floating point value from Time::HiRes to an integer for use below. Truncate towards 0.
+				my $timeNowInt = int($c->submitTime);
+
+				# Set up creation time, and open and due dates.
+				my $ansOffset = $set->answer_date - $set->due_date;
+				$set->version_creation_time($timeNowInt);
+				$set->open_date($timeNowInt);
+				# Figure out the due date, taking into account the time limit cap.
+				my $dueTime =
+					$timeLimit == 0 || ($set->time_limit_cap && $c->submitTime + $timeLimit > $set->due_date)
+					? $set->due_date
+					: $timeNowInt + $timeLimit;
 
 				$set->due_date($dueTime);
 				$set->answer_date($set->due_date + $ansOffset);
 				$set->version_last_attempt_time(0);
 
-				# put this new info into the database.  we
-				#    put back that data which we need for the
-				#    version, and leave blank any information
-				#    that we'd like to inherit from the user
-				#    set or global set.  we set the data which
-				#    determines if a set is open, because we
-				#    don't want the set version to reopen after
-				#    it's complete
+				# Put this new info into the database.  Put back the data needed for the version, and leave blank any
+				# information that should be inherited from the user set or global set.  Set the data which determines
+				# if a set is open, because a set version should not reopen after it's complete.
 				$cleanSet->version_creation_time($set->version_creation_time);
 				$cleanSet->open_date($set->open_date);
 				$cleanSet->due_date($set->due_date);
@@ -768,172 +598,148 @@ sub pre_header_initialize {
 				$cleanSet->assignment_type($set->assignment_type);
 				$db->putSetVersion($cleanSet);
 
-				# we have a new set version, so it's open
+				# This is a new set version, so it's open.
 				$versionIsOpen = 1;
 
-				# also reset the number of attempts for this
-				#    set to zero
+				# Set the number of attempts for this set to zero.
 				$currentNumAttempts = 0;
 
 			} elsif ($maxAttempts != -1 && $totalNumVersions > $maxAttempts) {
-				$self->{invalidSet} = "No new versions of this assignment are available, " .
-					"because you have already taken the maximum number allowed.";
-
-			} elsif ($effectiveUserName ne $userName &&
-				$authz->hasPermissions($userName, "create_new_set_version_when_acting_as_student")) {
-
-				$self->{invalidSet} = "User $effectiveUserName is being acted " .
-					"as.  If you continue, you will create a new version of this set " .
-					"for that user, which will count against their allowed maximum " .
-					"number of versions for the current time interval.  IN GENERAL, THIS " .
-					"IS NOT WHAT YOU WANT TO DO.  Please be sure that you want to " .
-					"do this before clicking the \"Create new set version\" link " .
-					"below.  Alternately, PRESS THE \"BACK\" BUTTON and continue.";
-				$self->{invalidVersionCreation} = 1;
-
-			} elsif ($effectiveUserName ne $userName) {
-				$self->{invalidSet} = "User $effectiveUserName is being acted as.  " .
-					"When acting as another user, new versions of the set cannot be created.";
-				$self->{invalidVersionCreation} = 2;
-
-			} elsif (($maxAttemptsPerVersion == 0 || $currentNumAttempts < $maxAttemptsPerVersion) &&
-				$timeNow < $set->due_date() + $grace) {
-				if (between($set->open_date(), $set->due_date() + $grace, $timeNow)) {
+				$c->{invalidSet} = 'No new versions of this assignment are available, '
+					. 'because you have already taken the maximum number allowed.';
+
+			} elsif ($effectiveUserID ne $userID
+				&& $authz->hasPermissions($userID, 'create_new_set_version_when_acting_as_student'))
+			{
+
+				$c->{invalidSet} =
+					"User $effectiveUserID is being acted "
+					. 'as.  If you continue, you will create a new version of this set '
+					. 'for that user, which will count against their allowed maximum '
+					. 'number of versions for the current time interval.  IN GENERAL, THIS '
+					. 'IS NOT WHAT YOU WANT TO DO.  Please be sure that you want to '
+					. 'do this before clicking the "Create new set version" link '
+					. 'below.  Alternately, PRESS THE "BACK" BUTTON and continue.';
+				$c->{invalidVersionCreation} = 1;
+
+			} elsif ($effectiveUserID ne $userID) {
+				$c->{invalidSet} = "User $effectiveUserID is being acted as.  "
+					. 'When acting as another user, new versions of the set cannot be created.';
+				$c->{invalidVersionCreation} = 2;
+
+			} elsif (($maxAttemptsPerVersion == 0 || $currentNumAttempts < $maxAttemptsPerVersion)
+				&& $c->submitTime < $set->due_date() + $ce->{gatewayGracePeriod})
+			{
+				if (between($set->open_date(), $set->due_date() + $ce->{gatewayGracePeriod}, $c->submitTime)) {
 					$versionIsOpen = 1;
 				} else {
-					$versionIsOpen = 0;  # redundant
-					$self->{invalidSet} = "No new  versions of this assignment" .
-						" are available,\nbecause the set is not open or its time" .
-						" limit has expired.\n";
+					$c->{invalidSet} =
+						'No new  versions of this assignment are available, because the set is not open or its time'
+						. ' limit has expired.';
 				}
 
-			} elsif ($versionsPerInterval &&
-				($currentNumVersions >= $versionsPerInterval)){
-				$self->{invalidSet} = "You have already taken all available versions of this " .
-					"test in the current time interval.  You may take the test again after " .
-					"the time interval has expired.";
+			} elsif ($versionsPerInterval
+				&& ($currentNumVersions >= $versionsPerInterval))
+			{
+				$c->{invalidSet} =
+					'You have already taken all available versions of this test in the current time interval.  '
+					. 'You may take the test again after the time interval has expired.';
 
 			}
 
 		} else {
-			# (we're still in the $isOpen && ! $isClosed conditional here)
-			#    if a specific version is requested, then we only check to
-			#    see if it's open
-			if (($currentNumAttempts < $maxAttemptsPerVersion)
-				&&
-				($effectiveUserName eq $userName ||
-					$authz->hasPermissions($userName, "record_set_version_answers_when_acting_as_student"))
-			) {
-				if (between($set->open_date(), $set->due_date() + $grace, $timeNow)) {
+			# If a specific version is requested, then check to see if it's open.
+			if (
+				($currentNumAttempts < $maxAttemptsPerVersion)
+				&& ($effectiveUserID eq $userID
+					|| $authz->hasPermissions($userID, 'record_set_version_answers_when_acting_as_student'))
+				)
+			{
+				if (between($set->open_date(), $set->due_date() + $ce->{gatewayGracePeriod}, $c->submitTime)) {
 					$versionIsOpen = 1;
-				} else {
-					$versionIsOpen = 0;  # redundant
 				}
 			}
 		}
 
-		# closed set, with attempt at a new one
-	} elsif (!$self->{invalidSet} && !$requestedVersion) {
-		$self->{invalidSet} = "This set is closed.  No new set versions may be taken.";
+	} elsif (!$c->{invalidSet} && !$requestedVersion) {
+		$c->{invalidSet} = 'This set is closed.  No new set versions may be taken.';
 	}
 
+	# If the set or problem is invalid, then delete any proctor keys if any and return.
+	if ($c->{invalidSet} || $c->{invalidProblem}) {
+		if (defined $c->{assignment_type} && $c->{assignment_type} eq 'proctored_gateway') {
+			my $proctorID = $c->param('proctor_user');
+			if ($proctorID) {
+				eval { $db->deleteKey("$effectiveUserID,$proctorID"); };
+				eval { $db->deleteKey("$effectiveUserID,$proctorID,g"); };
+			}
+		}
+		return;
+	}
 
-	####################################
-	# save problem and user data
-	####################################
+	# Save problem and user data
 
 	my $psvn = $set->psvn();
-	$self->{tmplSet} = $tmplSet;
-	$self->{set} = $set;
-	$self->{problem} = $Problem;
-	$self->{requestedVersion} = $requestedVersion;
-
-	$self->{userName} = $userName;
-	$self->{effectiveUserName} = $effectiveUserName;
-	$self->{user} = $User;
-	$self->{effectiveUser}   = $EffectiveUser;
-	$self->{permissionLevel} = $permissionLevel;
+	$c->{tmplSet} = $tmplSet;
+	$c->{set}     = $set;
+	$c->{problem} = $problem;
 
-	$self->{isOpen} = $isOpen;
-	$self->{isClosed} = $isClosed;
-	$self->{versionIsOpen} = $versionIsOpen;
+	$c->{userID}        = $userID;
+	$c->{user}          = $user;
+	$c->{effectiveUser} = $effectiveUser;
 
-	$self->{timeNow} = $timeNow;
+	$c->{isOpen}        = $isOpen;
+	$c->{isClosed}      = $isClosed;
+	$c->{versionIsOpen} = $versionIsOpen;
 
-	####################################
-	# form processing
-	####################################
+	# Form processing
 
-	# this is the same as the following, but doesn't appear in Problem.pm
-	my $newPage = $r->param("newPage");
-	$self->{newPage} = $newPage;
+	# Get the current page, if it's given.
+	my $currentPage = $c->param('currentPage') || 1;
 
-	# also get the current page, if it's given
-	my $currentPage = $r->param("currentPage") || 1;
-
-	# This is a hack to manage changing pages.  We set previewAnswers to
+	# This is a hack to manage changing pages.  Set previewAnswers to
 	# false if the "pageChangeHack" input is set (a page change link was used).
-	$r->param('previewAnswers', 0) if ($r->param('pageChangeHack'));
-
-	# [This section lifted from Problem.pm] ##############################
-
-	# set options from form fields (see comment at top of file for names)
-	my $displayMode      = $User->displayMode || $ce->{pg}->{options}->{displayMode};
-	my $redisplay        = $r->param("redisplay");
-	my $submitAnswers    = $r->param("submitAnswers") // 0;
-	my $checkAnswers     = $r->param("checkAnswers") // 0;
-	my $previewAnswers   = $r->param("previewAnswers") // 0;
-
-	my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars };
-
-	$self->{displayMode}    = $displayMode;
-	$self->{redisplay}      = $redisplay;
-	$self->{submitAnswers}  = $submitAnswers;
-	$self->{checkAnswers}   = $checkAnswers;
-	$self->{previewAnswers} = $previewAnswers;
-	$self->{formFields}     = $formFields;
+	$c->param('previewAnswers', 0) if $c->param('pageChangeHack');
 
-	# now that we've set all the necessary variables quit out if the set or
-	#    problem is invalid
+	$c->{displayMode} = $user->displayMode || $ce->{pg}{options}{displayMode};
 
-	return if $self->{invalidSet} || $self->{invalidProblem};
+	# Set options from request parameters.
+	$c->{redisplay}      = $c->param('redisplay');
+	$c->{submitAnswers}  = $c->param('submitAnswers') || 0;
+	$c->{checkAnswers}   = $c->param('checkAnswers')   // 0;
+	$c->{previewAnswers} = $c->param('previewAnswers') // 0;
+	$c->{formFields}     = $c->req->params->to_hash;
 
-	# [End lifted section] ###############################################
+	# Permissions
 
-	####################################
-	# permissions
-	####################################
-
-	# bail without doing anything if the set isn't yet open for this user
-	if (!($self->{isOpen} || $authz->hasPermissions($userName,"view_unopened_sets"))) {
-		$self->{invalidSet} = "This set is not yet open.";
+	# Bail without doing anything if the set isn't yet open for this user.
+	if (!($c->{isOpen} || $authz->hasPermissions($userID, 'view_unopened_sets'))) {
+		$c->{invalidSet} = 'This set is not yet open.';
 		return;
 	}
 
-	# what does the user want to do?
+	# What does the user want to do?
 	my %want = (
-		showOldAnswers     => $User->showOldAnswers ne '' ?
-			$User->showOldAnswers : $ce->{pg}->{options}->{showOldAnswers},
+		showOldAnswers => $user->showOldAnswers ne '' ? $user->showOldAnswers : $ce->{pg}{options}{showOldAnswers},
 		# showProblemGrader implies showCorrectAnswers.  This is a convenience for grading.
-		showCorrectAnswers => $r->param('showProblemGrader') ||
-			(($r->param("showCorrectAnswers") || $ce->{pg}->{options}->{showCorrectAnswers})
-				&& ($submitAnswers || $checkAnswers)),
-		showProblemGrader  => $r->param('showProblemGrader') || 0,
-		showHints          => $r->param("showHints") || $ce->{pg}->{options}->{showHints},
+		showCorrectAnswers => ($c->param('showProblemGrader') || 0)
+			|| ($c->param('showCorrectAnswers') && ($c->{submitAnswers} || $c->{checkAnswers}))
+			|| 0,
+		showProblemGrader => $c->param('showProblemGrader')
+			|| 0,
+		# Hints are not yet implemented in gateway quzzes.
+		showHints => 0,
 		# showProblemGrader implies showSolutions.  Another convenience for grading.
-		showSolutions      => $r->param('showProblemGrader') ||
-			(($r->param("showSolutions") || $ce->{pg}->{options}->{showSolutions})
-				&& ($submitAnswers || $checkAnswers)),
-		recordAnswers      => $submitAnswers && !$authz->hasPermissions($userName, "avoid_recording_answers"),
-		# we also want to check answers if we were checking answers and are
-		#    switching between pages
-		checkAnswers       => $checkAnswers,
-		useMathView        => $User->useMathView ne '' ? $User->useMathView : $ce->{pg}->{options}->{useMathView},
-		useWirisEditor     => $User->useWirisEditor ne '' ? $User->useWirisEditor : $ce->{pg}->{options}->{useWirisEditor},
-		useMathQuill       => $User->useMathQuill ne '' ? $User->useMathQuill : $ce->{pg}->{options}->{useMathQuill},
+		showSolutions => $c->param('showProblemGrader')
+			|| ($c->param('showSolutions') && ($c->{submitAnswers} || $c->{checkAnswers})),
+		recordAnswers => $c->{submitAnswers} && !$authz->hasPermissions($userID, 'avoid_recording_answers'),
+		# we also want to check answers if we were checking answers and are switching between pages
+		checkAnswers => $c->{checkAnswers},
+		useMathView  => $user->useMathView ne ''  ? $user->useMathView  : $ce->{pg}{options}{useMathView},
+		useMathQuill => $user->useMathQuill ne '' ? $user->useMathQuill : $ce->{pg}{options}{useMathQuill},
 	);
 
-	# are certain options enforced?
+	# Are certain options enforced?
 	my %must = (
 		showOldAnswers     => 0,
 		showCorrectAnswers => 0,
@@ -943,95 +749,73 @@ sub pre_header_initialize {
 		recordAnswers      => 0,
 		checkAnswers       => 0,
 		useMathView        => 0,
-		useWirisEditor     => 0,
 		useMathQuill       => 0,
 	);
 
-	# does the user have permission to use certain options?
-	my @args = ($User, $PermissionLevel, $EffectiveUser, $set, $Problem, $tmplSet);
-	my $sAns = $submitAnswers ? 1 : 0;
-	my %can = (
-		showOldAnswers        => $self->can_showOldAnswers(@args),
-		showCorrectAnswers    => $self->can_showCorrectAnswers(@args, $sAns),
-		showProblemGrader     => $self->can_showProblemGrader(@args),
-		showHints             => $self->can_showHints(@args),
-		showSolutions         => $self->can_showSolutions(@args, $sAns),
-		recordAnswers         => $self->can_recordAnswers(@args),
-		checkAnswers          => $self->can_checkAnswers(@args),
-		recordAnswersNextTime => $self->can_recordAnswers(@args, $sAns),
-		checkAnswersNextTime  => $self->can_checkAnswers(@args, $sAns),
-		showScore             => $self->can_showScore(@args),
-		useMathView           => $self->can_useMathView(@args),
-		useWirisEditor        => $self->can_useWirisEditor(@args),
-		useMathQuill          => $self->can_useMathQuill(@args)
+	# Does the user have permission to use certain options?
+	my @args = ($user, $permissionLevel, $effectiveUser, $set, $problem, $tmplSet);
+	my %can  = (
+		showOldAnswers        => $c->can_showOldAnswers(@args),
+		showCorrectAnswers    => $c->can_showCorrectAnswers(@args),
+		showProblemGrader     => $c->can_showProblemGrader(@args),
+		showHints             => $c->can_showHints,
+		showSolutions         => $c->can_showSolutions(@args),
+		recordAnswers         => $c->can_recordAnswers(@args),
+		checkAnswers          => $c->can_checkAnswers(@args),
+		recordAnswersNextTime => $c->can_recordAnswers(@args, $c->{submitAnswers}),
+		checkAnswersNextTime  => $c->can_checkAnswers(@args, $c->{submitAnswers}),
+		showScore             => $c->can_showScore(@args),
+		showProblemScores     => $c->can_showProblemScores(@args),
+		showWork              => $c->can_showWork(@args),
+		useMathView           => $c->can_useMathView,
+		useMathQuill          => $c->can_useMathQuill
 	);
 
-	# final values for options
-	my %will;
-	foreach (keys %must) {
-		$will{$_} = $can{$_} && ($must{$_} || $want{$_}) ;
-	}
-	##### store fields #####
-
-	## FIXME: the following is present in Problem.pm, but missing here.  how do we
-	##   deal with it in the context of multiple problems with possible hints?
-	## ##### fix hint/solution options #####
-	## $can{showHints}     &&= $pg->{flags}->{hintExists}
-	##                     &&= $pg->{flags}->{showHintLimit}<=$pg->{state}->{num_of_incorrect_ans};
-	##    $can{showSolutions} &&= $pg->{flags}->{solutionExists};
+	# Final values for options
+	my %will = map { $_ => $can{$_} && ($must{$_} || $want{$_}) } keys %must;
 
-	$self->{want} = \%want;
-	$self->{must} = \%must;
-	$self->{can}  = \%can;
-	$self->{will} = \%will;
+	$c->{want} = \%want;
+	$c->{must} = \%must;
+	$c->{can}  = \%can;
+	$c->{will} = \%will;
 
-
-	####################################
-	# set up problem numbering and multipage variables
-	####################################
+	# Set up problem numbering and multipage variables.
 
 	my @problemNumbers;
-	if ($setName eq "Undefined_Set") {
+	if ($setID eq 'Undefined_Set') {
 		@problemNumbers = (1);
 	} else {
-		@problemNumbers = $db->listProblemVersions($effectiveUserName, $setName, $setVersionNumber);
+		@problemNumbers = $db->listProblemVersions($effectiveUserID, $setID, $setVersionNumber);
 	}
 
-	# to speed up processing of long (multi-page) tests, we want to only
-	#    translate those problems that are being submitted or are currently
-	#    being displayed.  so work out here which problems are on the
-	#    current page.
+	# To speed up processing of long (multi-page) tests, we want to only translate those problems that are being
+	# submitted or are currently being displayed.  So determine which problems are on the current page.
 	my ($numPages, $pageNumber, $numProbPerPage) = (1, 0, 0);
 	my ($startProb, $endProb) = (0, $#problemNumbers);
 
-	# update startProb and endProb for multipage tests
-	if (defined($set->problems_per_page) && $set->problems_per_page) {
+	# Update startProb and endProb for multipage tests
+	if ($set->problems_per_page) {
 		$numProbPerPage = $set->problems_per_page;
-		$pageNumber = ($newPage) ? $newPage : $currentPage;
+		$pageNumber     = $c->param('newPage') || $currentPage;
 
-		$numPages = scalar(@problemNumbers)/$numProbPerPage;
+		$numPages = scalar(@problemNumbers) / $numProbPerPage;
 		$numPages = int($numPages) + 1 if (int($numPages) != $numPages);
 
-		$startProb = ($pageNumber - 1)*$numProbPerPage;
+		$startProb = ($pageNumber - 1) * $numProbPerPage;
 		$startProb = 0 if ($startProb < 0 || $startProb > $#problemNumbers);
-		$endProb = ($startProb + $numProbPerPage > $#problemNumbers)
-			? $#problemNumbers : $startProb + $numProbPerPage - 1;
+		$endProb =
+			($startProb + $numProbPerPage > $#problemNumbers) ? $#problemNumbers : $startProb + $numProbPerPage - 1;
 	}
 
+	# Set up problem list for randomly ordered tests.
+	my @probOrder = (0 .. $#problemNumbers);
 
-	# set up problem list for randomly ordered tests
-	my @probOrder = (0..$#problemNumbers);
-
-	# there's a routine to do this somewhere, I think...
 	if ($set->problem_randorder) {
-		my @newOrder = ();
-		# we need to keep the random order the same each time the set is loaded!
-		#    this requires either saving the order in the set definition, or
-		#    being sure that the random seed that we use is the same each time
-		#    the same set is called.  we'll do the latter by setting the seed
-		#    to the psvn of the problem set.  we use a local PGrandom object
-		#    to avoid mucking with the system seed.
-		my $pgrand = PGrandom->new();
+		my @newOrder;
+		# Make sure to keep the random order the same each time the set is loaded!  This is done by ensuring that the
+		# random seed used is the same each time the same set is called by setting the seed to the psvn of the problem
+		# set.  Use a local PGrandom object to avoid mucking with the system seed.
+		my $pgrand = PGrandom->new;
 		$pgrand->srand($set->psvn);
 		while (@probOrder) {
 			my $i = int($pgrand->rand(scalar(@probOrder)));
@@ -1039,801 +823,439 @@ sub pre_header_initialize {
 		}
 		@probOrder = @newOrder;
 	}
-	# now $probOrder[i] = the problem number, numbered from zero, that's
-	#    displayed in the ith position on the test
+	# Now $probOrder[i] is the problem number, numbered from zero, that is displayed in the ith position on the test.
 
-	# make a list of those problems we're displaying
+	# Make a list of those problems displayed on this page.
 	my @probsToDisplay = ();
-	for (my $i=0; $i<@probOrder; $i++) {
+	for (my $i = 0; $i < @probOrder; $i++) {
 		push(@probsToDisplay, $probOrder[$i])
 			if ($i >= $startProb && $i <= $endProb);
 	}
 
-	####################################
-	# process problems
-	####################################
+	# Process problems
+
+	my @problems;
+	my @pg_results;
 
-	my @problems = ();
-	my @pg_results = ();
-	# pg errors are stored here; initialize it to empty to start
-	$self->{errors} = [ ];
+	# pg errors are stored here.
+	$c->{errors} = [];
 
-	# process the problems as needed
+	# Process the problems as needed.
 	my @mergedProblems;
-	if ($setName eq "Undefined_Set") {
-		@mergedProblems = ($Problem);
+	if ($setID eq 'Undefined_Set') {
+		@mergedProblems = ($problem);
 	} else {
-		@mergedProblems = $db->getAllMergedProblemVersions($effectiveUserName, $setName, $setVersionNumber);
+		@mergedProblems = $db->getAllMergedProblemVersions($effectiveUserID, $setID, $setVersionNumber);
 	}
 
+	my @renderPromises;
+
 	for my $pIndex (0 .. $#problemNumbers) {
+		my $problemN = $mergedProblems[$pIndex];
 
-		if ( ! defined( $mergedProblems[$pIndex] ) ) {
-			$self->{invalidSet} = "One or more of the problems " .
-			"in this set have not been assigned to you.";
+		if (!defined $problemN) {
+			$c->{invalidSet} = 'One or more of the problems in this set have not been assigned to you.';
 			return;
 		}
-		my $ProblemN = $mergedProblems[$pIndex];
 
 		# sticky answers are set up here
-		if (not ($submitAnswers or $previewAnswers or $checkAnswers or $newPage) and $will{showOldAnswers}) {
-			my %oldAnswers = decodeAnswers($ProblemN->last_answer);
-			$formFields->{$_} = $oldAnswers{$_} foreach (keys %oldAnswers);
+		if (!($c->{submitAnswers} || $c->{previewAnswers} || $c->{checkAnswers} || $c->param('newPage'))
+			&& $will{showOldAnswers})
+		{
+			my %oldAnswers = decodeAnswers($problemN->last_answer);
+			$c->{formFields}{$_} = $oldAnswers{$_} for (keys %oldAnswers);
 		}
 
-		push(@problems, $ProblemN);
+		push(@problems, $problemN);
 
-		# if we don't have to translate this problem, just store a placeholder in the array.
+		# If this problem DOES NOT need to be translated, store a defined but false placeholder in the array.
 		my $pg = 0;
-		# this is the actual translation of each problem.  errors are
-		#    stored in @{$self->{errors}} in each case
-		if ((grep /^$pIndex$/, @probsToDisplay) || $submitAnswers) {
-			$pg = $self->getProblemHTML($self->{effectiveUser},
-				$set, $formFields,
-				$ProblemN);
+		# This is the actual translation of each problem.
+		if ((grep {/^$pIndex$/} @probsToDisplay) || $c->{submitAnswers}) {
+			push @renderPromises, $c->getProblemHTML($c->{effectiveUser}, $set, $c->{formFields}, $problemN);
+			# If this problem DOES need to be translated, store an undefined placeholder in the array.
+			# This will be replaced with the rendered problem after all of the above promises are awaited.
+			$pg = undef;
 		}
 		push(@pg_results, $pg);
 	}
-	$self->{ra_problems} = \@problems;
-	$self->{ra_pg_results}=\@pg_results;
-
-	$self->{startProb} = $startProb;
-	$self->{endProb} = $endProb;
-	$self->{numPages} = $numPages;
-	$self->{pageNumber} = $pageNumber;
-	$self->{ra_problem_numbers} = \@problemNumbers;
-	$self->{ra_probOrder} = \@probOrder;
-}
-
-sub head {
-	my ($self) = @_;
-	return "" if !defined($self->{ra_pg_results});
-	my $head_text = "";
-	for (@{$self->{ra_pg_results}})
-	{
-		next if !ref($_);
-		$head_text .= $_->{head_text} if $_->{head_text};
-	}
-	return $head_text;
-}
-
-sub path {
-	my ($self, $args) = @_;
-
-	my $r          = $self->{r};
-	my $ce         = $self->{ce};
-	my $setName    = $r->urlpath->arg("setID");
-	my $root       = $ce->{webworkURLs}{root};
-	my $courseName = $ce->{courseName};
-
-	my $navigation_allowed = $r->authz->hasPermissions($r->param('user'), 'navigation_allowed');
-
-	return $self->pathMacro(
-		$args,
-		'WeBWorK'   => $navigation_allowed ? $root : '',
-		$courseName => $navigation_allowed ? "$root/$courseName" : '',
-		$setName eq "Undefined_Set" || $self->{invalidSet}
-		? ($setName => '')
-		: (
-			$self->{set}->set_id => "$root/"
-				. $r->urlpath->newFromModule(
-				'WeBWorK::ContentGenerator::ProblemSet', $r,
-				courseID => $courseName,
-				setID    => $self->{set}->set_id
-			)->path,
-			'v' . $self->{set}->version_id => ''
-		),
-	);
-}
-
-sub nav {
-	my ($self, $args) = @_;
-	my $r             = $self->{r};
-	my $db            = $r->db;
-	my $user          = $r->param('user');
-	my $effectiveUser = $r->param('effectiveUser');
-
-	# Set up and display a student navigation for those that have permission to act as a student.
-	if ($r->authz->hasPermissions($user, 'become_student') && $effectiveUser ne $user) {
-		my $setName = $self->{set}->set_id;
-
-		return '' if $setName eq 'Undefined_Set' || $self->{invalidSet};
-
-		my $setVersion = $self->{set}->version_id;
-		my $courseName = $self->{ce}{courseName};
-
-		# Find all versions of this set that have been taken (excluding those taken by the current user).
-		my @users =
-			$db->listSetVersionsWhere({ user_id => { not_like => $user }, set_id => { like => "$setName,v\%" } });
-		my @allUserRecords = $db->getUsers(map { $_->[0] } @users);
-
-		my $filter = $r->param('studentNavFilter');
-
-		# Format the student names for display, and associate the users with the test versions.
-		my %filters;
-		my @userRecords;
-		for (0 .. $#allUserRecords) {
-			# Add to the sections and recitations if defined.  Also store the first user found in that section or
-			# recitation.  This user will be switched to when the filter is selected.
-			my $section = $allUserRecords[$_]->section;
-			$filters{"section:$section"} =
-				[ $r->maketext('Filter by section [_1]', $section), $allUserRecords[$_]->user_id, $users[$_][2] ]
-				if $section && !$filters{"section:$section"};
-			my $recitation = $allUserRecords[$_]->recitation;
-			$filters{"recitation:$recitation"} =
-				[ $r->maketext('Filter by recitation [_1]', $recitation), $allUserRecords[$_]->user_id, $users[$_][2] ]
-				if $recitation && !$filters{"recitation:$recitation"};
-
-			# Only keep this user if it satisfies the selected filter if a filter was selected.
-			next
-				unless !$filter
-				|| ($filter =~ /^section:(.*)$/    && $allUserRecords[$_]->section eq $1)
-				|| ($filter =~ /^recitation:(.*)$/ && $allUserRecords[$_]->recitation eq $1);
-
-			my $addRecord = $allUserRecords[$_];
-			push @userRecords, $addRecord;
-
-			$addRecord->{displayName} =
-				($addRecord->last_name || $addRecord->first_name
-					? $addRecord->last_name . ', ' . $addRecord->first_name
-					: $addRecord->user_id);
-			$addRecord->{setVersion} = $users[$_][2];
-		}
-
-		# Sort by last name, then first name, then user_id, then set version.
-		@userRecords = sort {
-			lc($a->last_name) cmp lc($b->last_name)
-				|| lc($a->first_name) cmp lc($b->first_name)
-				|| lc($a->user_id) cmp lc($b->user_id)
-				|| lc($a->{setVersion}) <=> lc($b->{setVersion})
-		} @userRecords;
-
-		# Find the previous, current, and next test.
-		my $currentTestIndex = 0;
-		for (0 .. $#userRecords) {
-			$currentTestIndex = $_, last
-				if $userRecords[$_]->user_id eq $effectiveUser && $userRecords[$_]->{setVersion} == $setVersion;
-		}
-		my $prevTest = $currentTestIndex > 0             ? $userRecords[ $currentTestIndex - 1 ] : 0;
-		my $nextTest = $currentTestIndex < $#userRecords ? $userRecords[ $currentTestIndex + 1 ] : 0;
-
-		# Mark the current test.
-		$userRecords[$currentTestIndex]{currentTest} = 1;
 
-		my $setPage = $r->urlpath->newFromModule(__PACKAGE__, $r,
-			courseID => $courseName,
-			setID    => "$setName,v%s"
-		);
-
-		# Cap the number of tests shown to at most 200.
-		my $numAfter     = $#userRecords - $currentTestIndex;
-		my $numBefore    = 200 - ($numAfter < 100 ? $numAfter : 100);
-		my $minTestIndex = $currentTestIndex < $numBefore      ? 0                   : $currentTestIndex - $numBefore;
-		my $maxTestIndex = $minTestIndex + 200 < $#userRecords ? $minTestIndex + 200 : $#userRecords;
-
-		# Set up the student nav.
-		print CGI::div(
-			{ class => 'row sticky-nav', role => 'navigation', aria_label => 'user navigation' },
-			CGI::div(
-				{ class => 'user-nav' },
-				CGI::div(
-					{ class => 'btn-group', role => 'group', aria_label => 'student selector' },
-					$prevTest
-					? CGI::a(
-						{
-							href => sprintf(
-								$self->systemLink(
-									$setPage,
-									params => {
-										effectiveUser     => $prevTest->user_id,
-										currentPage       => $self->{pageNumber},
-										showProblemGrader => $self->{will}{showProblemGrader},
-										$filter ? (studentNavFilter => $filter) : ()
-									}
-								),
-								$prevTest->{setVersion}
-							),
-							data_bs_toggle    => 'tooltip',
-							data_bs_placement => 'top',
-							title             => "$prevTest->{displayName} (version $prevTest->{setVersion})",
-							class             => 'btn btn-primary student-nav-button'
-						},
-						CGI::i({ class => 'fas fa-chevron-left' }, '')
-						)
-					: CGI::span(
-						{ class => 'btn btn-primary disabled' },
-						CGI::i({ class => 'fas fa-chevron-left' }, '')
-					),
-					' ',
-					CGI::div(
-						{ class => 'btn-group student-nav-selector' },
-						CGI::a(
-							{
-								href           => '#',
-								id             => 'studentSelector',
-								class          => 'btn btn-primary dropdown-toggle',
-								role           => 'button',
-								data_bs_toggle => 'dropdown',
-								aria_expanded  => 'false'
-							},
-							$userRecords[$currentTestIndex]{displayName}
-								. " (version $userRecords[$currentTestIndex]{setVersion})"
-						),
-						CGI::ul(
-							{
-								class           => 'dropdown-menu',
-								role            => 'menu',
-								aria_labelledby => 'studentSelector'
-							},
-							(
-								map {
-									CGI::li(CGI::a(
-										{
-											tabindex => '-1',
-											style    => $_->{currentTest} ? 'background-color: #8F8' : '',
-											class    => 'dropdown-item',
-											href     => sprintf(
-												$self->systemLink(
-													$setPage,
-													params => {
-														effectiveUser     => $_->user_id,
-														currentPage       => $self->{pageNumber},
-														showProblemGrader => $self->{will}{showProblemGrader},
-														$filter ? (studentNavFilter => $filter) : ()
-													}
-												),
-												$_->{setVersion}
-											)
-										},
-										"$_->{displayName} (version $_->{setVersion})"
-									))
-								} @userRecords[ $minTestIndex .. $maxTestIndex ]
-							),
-						),
-					),
-					' ',
-					$nextTest
-					? CGI::a(
-						{
-							href => sprintf(
-								$self->systemLink(
-									$setPage,
-									params => {
-										effectiveUser     => $nextTest->user_id,
-										currentPage       => $self->{pageNumber},
-										showProblemGrader => $self->{will}{showProblemGrader},
-										$filter ? (studentNavFilter => $filter) : ()
-									}
-								),
-								$nextTest->{setVersion}
-							),
-							data_bs_toggle    => 'tooltip',
-							data_bs_placement => 'top',
-							title             => "$nextTest->{displayName} (version $nextTest->{setVersion})",
-							class             => 'btn btn-primary student-nav-button'
-						},
-						CGI::i({ class => 'fas fa-chevron-right' }, '')
-						)
-					: CGI::span(
-						{ class => 'btn btn-primary disabled' },
-						CGI::i({ class => 'fas fa-chevron-right' }, '')
-					),
-				),
-				# Create a section/recitation filter by dropdown if there are sections or recitaitons.
-				scalar keys %filters
-				? CGI::div(
-					{ class => 'btn-group student-nav-filter-selector' },
-					CGI::a(
-						{
-							href           => '#',
-							id             => 'testSelectorFilter',
-							class          => 'btn btn-primary dropdown-toggle dropdown-toggle-split',
-							role           => 'button',
-							data_bs_toggle => 'dropdown',
-							aria_expanded  => 'false',
-						},
-						$filter ? $filters{$filter}[0] : $r->maketext('Showing all tests')
-					),
-					CGI::ul(
-						{
-							class           => 'dropdown-menu',
-							role            => 'menu',
-							aria_labelledby => 'testSelectorFilter'
-						},
-						# If a filter is currently in use, then add an item that will remove that filter.
-						$filter
-						? CGI::li(CGI::a(
-							{
-								class => 'dropdown-item',
-								href  => sprintf(
-									$self->systemLink(
-										$setPage,
-										params => {
-											effectiveUser     => $effectiveUser,
-											currentPage       => $self->{pageNumber},
-											showProblemGrader => $self->{will}{showProblemGrader}
-										}
-									),
-									$setVersion
-								)
-							},
-							$r->maketext('Show all tests')
-						))
-						: '',
-						map {
-							CGI::li(CGI::a(
-								{
-									class => 'dropdown-item',
-									style => ($filter || '') eq $_ ? 'background-color: #8F8' : '',
-									href  => sprintf(
-										$self->systemLink(
-											$setPage,
-											params => {
-												effectiveUser     => $filters{$_}[1],
-												currentPage       => $self->{pageNumber},
-												showProblemGrader => $self->{will}{showProblemGrader},
-												studentNavFilter  => $_
-											}
-										),
-										$filters{$_}[2]
-									)
-								},
-								$filters{$_}[0]
-							))
-						} sort keys %filters
-					),
-					)
-				: ''
-			)
-		);
+	# Wait for all problems to be rendered and replace the undefined entries
+	# in the pg_results array with the rendered result.
+	my @renderedPG = await Mojo::Promise->all(@renderPromises);
+	for (@pg_results) {
+		$_ = (shift @renderedPG)->[0] if !defined $_;
 	}
 
-	return '';
-}
+	$c->stash->{problems}        = \@problems;
+	$c->stash->{pg_results}      = \@pg_results;
+	$c->stash->{startProb}       = $startProb;
+	$c->stash->{endProb}         = $endProb;
+	$c->stash->{numPages}        = $numPages;
+	$c->stash->{pageNumber}      = $pageNumber;
+	$c->stash->{problem_numbers} = \@problemNumbers;
+	$c->stash->{probOrder}       = \@probOrder;
 
-sub body {
-	my $self = shift();
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-	my $user = $r->param('user');
-	my $effectiveUser = $r->param('effectiveUser');
-	my $courseID = $urlpath->arg("courseID");
-
-	# report everything with the same time that we started with
-	my $timeNow = $self->{timeNow};
-	my $grace = $ce->{gatewayGracePeriod};
-
-	#########################################
-	# preliminary error checking and output
-	#########################################
-
-	# if $self->{invalidSet} is set, then we have an error and should
-	#    just bail with the appropriate error message
-
-	if ($self->{invalidSet} || $self->{invalidProblem}) {
-		# delete any proctor keys that are floating around
-		if (defined($self->{'assignment_type'}) && $self->{'assignment_type'} eq 'proctored_gateway') {
-			my $proctorID = $r->param('proctor_user');
-			if ($proctorID) {
-				eval{ $db->deleteKey("$effectiveUser,$proctorID"); };
-				eval{ $db->deleteKey("$effectiveUser,$proctorID,g"); };
-			}
-		}
+	my $versionID = $set->version_id;
+	my $setVName  = "$setID,v$versionID";
 
-		my $newlink = '';
-		my $usernote = '';
-		if (defined($self->{invalidVersionCreation}) &&
-			$self->{invalidVersionCreation} == 1) {
-			my $gwpage = $urlpath->newFromModule($urlpath->module,$r,
-				courseID=>$urlpath->arg("courseID"), setID=>$urlpath->arg("setID"));
-			my $link = $self->systemLink($gwpage,
-				params=>{effectiveUser => $effectiveUser, user => $user, createnew_ok => 1});
-			$newlink = CGI::p(CGI::a({href=>$link}, "Create new set version."));
-			$usernote = " (acted as by $user)";
-		} elsif (defined($self->{invalidVersionCreation}) &&
-			  $self->{invalidVersionCreation} == 2) {
-			$usernote = " (acted as by $user)";
-		}
+	# Report everything with the request submit time. Convert the floating point
+	# value from Time::HiRes to an integer for use below. Truncate towards 0.
+	my $timeNowInt = int($c->submitTime);
 
-		return CGI::div(
-			{ class => 'alert alert-danger mb-2' },
-			CGI::div(
-				{ class => 'mb-2' },
-				$r->maketext(
-					"The selected problem set ([_1]) is not a valid set for [_2][_3]:",
-				   	$urlpath->arg("setID"), $effectiveUser, $usernote
-				)
-			),
-			CGI::div($self->{invalidSet}),
-			$newlink
-		);
-	}
+	# Answer processing
 
-	my $tmplSet = $self->{tmplSet};
-	my $set = $self->{set};
-	my $Problem = $self->{problem};
-	my $permissionLevel = $self->{permissionLevel};
-	my $submitAnswers = $self->{submitAnswers};
-	my $checkAnswers = $self->{checkAnswers};
-	my $previewAnswers = $self->{previewAnswers};
-	my $newPage = $self->{newPage};
-	my %want = %{$self->{want}};
-	my %can = %{$self->{can}};
-	my %must = %{$self->{must}};
-	my %will = %{$self->{will}};
-
-	my @problems = @{$self->{ra_problems}};
-	my @pg_results = @{$self->{ra_pg_results}};
-	my @pg_errors = @{$self->{errors}};
-	my $requestedVersion = $self->{requestedVersion};
-
-	my $startProb = $self->{startProb};
-	my $endProb = $self->{endProb};
-	my $numPages = $self->{numPages};
-	my $pageNumber = $self->{pageNumber};
-	my @problemNumbers = @{$self->{ra_problem_numbers}};
-	my @probOrder = @{$self->{ra_probOrder}};
-
-	my $setName  = $set->set_id;
-	my $versionNumber = $set->version_id;
-	my $setVName = "$setName,v$versionNumber";
-	my $numProbPerPage = $set->problems_per_page;
-
-	# translation errors -- we use the same output routine as Problem.pm,
-	#    but play around to allow for errors on multiple translations
-	#    because we have an array of problems to deal with.
-	if (@pg_errors) {
-		my $errorNum = 1;
-		my ($message, $context) = ('', '');
-		foreach (@pg_errors) {
-
-			$message .= "$errorNum. " if (@pg_errors > 1);
-			$message .= $_->{message} . CGI::br() . "\n";
-
-			$context .= CGI::p((@pg_errors > 1? "$errorNum.": '') .
-				$_->{context}) . "\n\n" . CGI::div({ class => 'gwDivider' }, "") . "\n\n";
-		}
-		return $self->errorOutput($message, $context);
-	}
-
-	####################################
-	# answer processing
-	####################################
-
-	debug("begin answer processing");
+	debug('begin answer processing');
 
 	my @scoreRecordedMessage = ('') x scalar(@problems);
-	my $LTIGradeResult = -1;
-
-	####################################
-	# save results to database as appropriate
-	####################################
-
-	if ($submitAnswers || (($previewAnswers || $newPage) && $can{recordAnswers})) {
-		# if we're submitting answers, we have to save the problems
-		#    to the database.
-		# if we're previewing or switching pages and can still
-		#    record answers, we save the last answer for future
-		#    reference
-
-		# first, if we're submitting answers for a proctored exam,
-		#    we want to delete the proctor keys that authorized
-		#    that grading, so that it isn't possible to just log
-		#    in and take another proctored test without getting
-		#    reauthorized
-		if ($submitAnswers && $self->{'assignment_type'} eq 'proctored_gateway') {
-			my $proctorID = $r->param('proctor_user');
-
-			# if we don't have attempts left, delete all
-			#    proctor keys for this user
-			if ($set->attempts_per_version - 1 - $Problem->num_correct - $Problem->num_incorrect <= 0) {
-				eval { $db->deleteAllProctorKeys($effectiveUser); };
+	my $LTIGradeResult       = -1;
+
+	# Save results to database as appropriate
+	if ($c->{submitAnswers} || (($c->{previewAnswers} || $c->param('newPage')) && $can{recordAnswers})) {
+		# If answers are being submitted, then save the problems to the database.  If this is a preview or pages change
+		# and answers can be recorded, then save the last answer for future reference.
+		# Also save the persistent data to the database even when the last answer is not saved.
+
+		# First, deal with answers being submitted for a proctored exam.  Delete the proctor keys that authorized the
+		# grading, so that it isn't possible to log in and take another proctored test without being reauthorized.
+		if ($c->{submitAnswers} && $c->{assignment_type} eq 'proctored_gateway') {
+			my $proctorID = $c->param('proctor_user');
+
+			# If there are no attempts left, delete all proctor keys for this user.
+			if ($set->attempts_per_version - 1 - $problem->num_correct - $problem->num_incorrect <= 0) {
+				eval { $db->deleteAllProctorKeys($effectiveUserID); };
 			} else {
-				# otherwise, delete only the grading key
-				eval { $db->deleteKey("$effectiveUser,$proctorID,g"); };
-				# in this case we may have a past, login,
-				#    proctor key that we can keep so that
-				#    we don't have to get another login to
-				#    continue working the test
-				if ($r->param("past_proctor_user") && $r->param("past_proctor_key")) {
-					$r->param("proctor_user", $r->param("past_proctor_user"));
-					$r->param("proctor_key", $r->param("past_proctor_key"));
+				# Otherwise, delete only the grading key.
+				eval { $db->deleteKey("$effectiveUserID,$proctorID,g"); };
+				# In this case there may be a past login proctor key that can be kept so that another login to continue
+				# working the test is not needed.
+				if ($c->param('past_proctor_user') && $c->param('past_proctor_key')) {
+					$c->param('proctor_user', $c->param('past_proctor_user'));
+					$c->param('proctor_key',  $c->param('past_proctor_key'));
 				}
 			}
-			# this is unsubtle, but we'd rather not have bogus
-			#    keys sitting around
+			# This is unsubtle, but we'd rather not have bogus keys sitting around.
 			if ($@) {
-				die("ERROR RESETTING PROCTOR GRADING KEY(S): $@\n");
+				die "ERROR RESETTING PROCTOR GRADING KEY(S): $@\n";
 			}
 
 		}
 
-		my @pureProblems = $db->getAllProblemVersions($effectiveUser, $setName, $versionNumber);
-		foreach my $i (0 .. $#problems) {  # process each problem
-			# this code is essentially that from Problem.pm
-			# begin problem loop for sticky answers
-			my $pureProblem = $pureProblems[$i];
-
-			# store answers in problem for sticky answers later
-			# my %answersToStore;
-
-			# we have to be a little careful about getting the
-			#    answers that we're saving, because we don't have
-			#    a pg_results object for all problems if we're not
-			#    submitting
-			my %answerHash = ();
-			my @answer_order = ();
-			my $encoded_last_answer_string;
-			if (ref($pg_results[$i])) {
-				my ($past_answers_string, $scores, $isEssay); #not used here
-				($past_answers_string, $encoded_last_answer_string, $scores, $isEssay) =
-				WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::create_ans_str_from_responses($self, $pg_results[$i]);
+		my @pureProblems = $db->getAllProblemVersions($effectiveUserID, $setID, $versionID);
+		for my $i (0 .. $#problems) {
+			# Process each problem.
+			my $pureProblem = $pureProblems[ $probOrder[$i] ];
+			my $problem     = $problems[ $probOrder[$i] ];
+			my $pg_result   = $pg_results[ $probOrder[$i] ];
+
+			my %answerHash;
+			my @answer_order;
+			my ($encoded_last_answer_string, $answer_types_string);
+
+			if (ref $pg_result) {
+				my ($past_answers_string, $scores);    # Not used here
+				($past_answers_string, $encoded_last_answer_string, $scores, $answer_types_string) =
+					create_ans_str_from_responses($c, $pg_result);
+
+				# Transfer persistent problem data from the PERSISTENCE_HASH:
+				# - Get keys to update first, to avoid extra work when no updated ar
+				#   are needed. When none, we avoid the need to decode/encode JSON,
+				#   to save the pureProblem when it would not otherwise be saved.
+				# - We are assuming that there is no need to DELETE old
+				#   persistent data if the hash is empty, even if in
+				#   potential there may be some data already in the database.
+				my @persistent_data_keys = keys %{ $pg_result->{PERSISTENCE_HASH_UPDATED} };
+				if (@persistent_data_keys) {
+					my $json_data = decode_json($pureProblem->{problem_data} || '{}');
+					for my $key (@persistent_data_keys) {
+						$json_data->{$key} = $pg_result->{PERSISTENCE_HASH}{$key};
+					}
+					$pureProblem->problem_data(encode_json($json_data));
+
+					# If the pureProblem will not be saved below, we should save the
+					# persistent data here before any other changes are made to it.
+					if (($c->{submitAnswers} && !$will{recordAnswers})) {
+						$c->db->putProblemVersion($pureProblem);
+					}
+				}
 			} else {
-				my $prefix = sprintf('Q%04d_', $problemNumbers[$i]);
-				my @fields = sort grep {/^(?!previous).*$prefix/} (keys %{$self->{formFields}});
-				my %answersToStore = map {$_ => $self->{formFields}->{$_}} @fields;
-				my @answer_order = @fields;
+				my $prefix         = sprintf('Q%04d_', $problemNumbers[$i]);
+				my @fields         = sort grep {/^(?!previous).*$prefix/} (keys %{ $c->{formFields} });
+				my %answersToStore = map       { $_ => $c->{formFields}->{$_} } @fields;
+				my @answer_order   = @fields;
 				$encoded_last_answer_string = encodeAnswers(%answersToStore, @answer_order);
 			}
-			# and get the last answer
-			$problems[$i]->last_answer($encoded_last_answer_string);
+
+			# Set the last answer
+			$problem->last_answer($encoded_last_answer_string);
 			$pureProblem->last_answer($encoded_last_answer_string);
 
-			# next, store the state in the database if that makes sense
-			if ($submitAnswers && $will{recordAnswers}) {
-				$problems[$i]->status(wwRound(2,$pg_results[$i]->{state}->{recorded_score}));
-				$problems[$i]->attempted(1);
-				$problems[$i]->num_correct($pg_results[$i]->{state}->{num_of_correct_ans});
-				$problems[$i]->num_incorrect($pg_results[$i]->{state}->{num_of_incorrect_ans});
-				$pureProblem->status(wwRound(2,$pg_results[$i]->{state}->{recorded_score}));
+			# Store the state in the database if answers are being recorded.
+			if ($c->{submitAnswers} && $will{recordAnswers}) {
+				my $score =
+					compute_reduced_score($ce, $problem, $set, $pg_result->{state}{recorded_score}, $c->submitTime);
+				$problem->status($score) if $score > $problem->status;
+
+				$problem->sub_status($problem->status)
+					if (!$ce->{pg}{ansEvalDefaults}{enableReducedScoring}
+						|| !$set->enable_reduced_scoring
+						|| before($set->reduced_scoring_date, $c->submitTime));
+
+				$problem->attempted(1);
+				$problem->num_correct($pg_result->{state}{num_of_correct_ans});
+				$problem->num_incorrect($pg_result->{state}{num_of_incorrect_ans});
+
+				$pureProblem->status($problem->status);
+				$pureProblem->sub_status($problem->sub_status);
 				$pureProblem->attempted(1);
-				$pureProblem->num_correct($pg_results[$i]->{state}->{num_of_correct_ans});
-				$pureProblem->num_incorrect($pg_results[$i]->{state}->{num_of_incorrect_ans});
+				$pureProblem->num_correct($pg_result->{state}{num_of_correct_ans});
+				$pureProblem->num_incorrect($pg_result->{state}{num_of_incorrect_ans});
+
+				if ($answer_types_string) {
+					# Add flags which are really a comma separated list of answer types.  If its an essay question and
+					# the user is submitting an answer then there could be potential changes. So the problem is also
+					# flagged as needing grading by appending ":needs_grading" to the answer types.
+					$pureProblem->flags(
+						$answer_types_string . ($answer_types_string =~ /essay/ ? ':needs_grading' : ''));
+				}
 
 				if ($db->putProblemVersion($pureProblem)) {
-					$scoreRecordedMessage[$i] = $r->maketext("Your score on this problem was recorded.");
+					# Use a simple untranslated value here.  This message will never be shown, and will later be
+					# used in a string comparison.  Don't compare translated strings!
+					$scoreRecordedMessage[ $probOrder[$i] ] = 'recorded';
 				} else {
-					$scoreRecordedMessage[$i] = $r->maketext("Your score was not recorded because there was a " .
-						"failure in storing the problem record to the database.");
+					$scoreRecordedMessage[ $probOrder[$i] ] = $c->maketext('Your score was not recorded because '
+							. 'there was a failure in storing the problem record to the database.');
 				}
-				# write the transaction log
-				writeLog($self->{ce}, "transaction",
-					$problems[$i]->problem_id . "\t" .
-					$problems[$i]->set_id . "\t" .
-					$problems[$i]->user_id . "\t" .
-					$problems[$i]->source_file . "\t" .
-					$problems[$i]->value . "\t" .
-					$problems[$i]->max_attempts . "\t" .
-					$problems[$i]->problem_seed . "\t" .
-					$problems[$i]->status . "\t" .
-					$problems[$i]->attempted . "\t" .
-					$problems[$i]->last_answer . "\t" .
-					$problems[$i]->num_correct . "\t" .
-					$problems[$i]->num_incorrect
-				);
-			} elsif ($submitAnswers) {
-				# this is the case where we submitted answers
-				#    but can't save them; report an error
-				#    message
-
-				if ($self->{isClosed}) {
-					$scoreRecordedMessage[$i] = $r->maketext("Your score was not recorded because this problem " .
-						"set version is not open.");
-				} elsif ($problems[$i]->num_correct + $problems[$i]->num_incorrect >= $set->attempts_per_version) {
-					$scoreRecordedMessage[$i] = $r->maketext("Your score was not recorded because you have no " .
-						"attempts remaining on this set version.");
-				} elsif (! $self->{versionIsOpen}) {
-					my $endTime = ($set->version_last_attempt_time) ? $set->version_last_attempt_time : $timeNow;
-					if ($endTime > $set->due_date && $endTime < $set->due_date + $grace) {
+
+				# Write the transaction log
+				writeLog($c->ce, 'transaction',
+					$problem->problem_id . "\t"
+						. $problem->set_id . "\t"
+						. $problem->user_id . "\t"
+						. $problem->source_file . "\t"
+						. $problem->value . "\t"
+						. $problem->max_attempts . "\t"
+						. $problem->problem_seed . "\t"
+						. $problem->status . "\t"
+						. $problem->attempted . "\t"
+						. $problem->last_answer . "\t"
+						. $problem->num_correct . "\t"
+						. $problem->num_incorrect);
+			} elsif ($c->{submitAnswers}) {
+				# This is the case answers were submitted but can not be saved. Report an error message.
+				if ($c->{isClosed}) {
+					$scoreRecordedMessage[ $probOrder[$i] ] =
+						$c->maketext('Your score was not recorded because this problem set version is not open.');
+				} elsif ($problem->num_correct + $problem->num_incorrect >= $set->attempts_per_version) {
+					$scoreRecordedMessage[ $probOrder[$i] ] = $c->maketext(
+						'Your score was not recorded because you have no attempts remaining on this set version.');
+				} elsif (!$c->{versionIsOpen}) {
+					my $endTime = ($set->version_last_attempt_time) ? $set->version_last_attempt_time : $c->submitTime;
+					if ($endTime > $set->due_date && $endTime < $set->due_date + $ce->{gatewayGracePeriod}) {
 						$endTime = $set->due_date;
 					}
-					my $elapsed = int(($endTime - $set->open_date)/0.6 + 0.5)/100;
-					# we assume that allowed is an even
-					#    number of minutes
-					my $allowed = ($set->due_date - $set->open_date)/60;
-					$scoreRecordedMessage[$i] = $r->maketext("Your score was not recorded because you have " .
-						"exceeded the time limit for this test. (Time taken: [_1] min; allowed: [_2] min.)",
-						$elapsed, $allowed);
+					my $elapsed = int(($endTime - $set->open_date) / 0.6 + 0.5) / 100;
+					$scoreRecordedMessage[ $probOrder[$i] ] = $c->maketext(
+						'Your score was not recorded because you have exceeded the time limit for this test. '
+							. '(Time taken: [_1] min; allowed: [_2] min.)',
+						$elapsed,
+						# Assume the allowed time is an even number of minutes.
+						($set->due_date - $set->open_date) / 60
+					);
 				} else {
-					$scoreRecordedMessage[$i] = $r->maketext("Your score was not recorded.");
+					$scoreRecordedMessage[ $probOrder[$i] ] = $c->maketext('Your score was not recorded.');
 				}
 			} else {
-				# finally, we must be previewing or switching
-				#    pages.  save only the last answer for the
-				#    problems
+				# The final case is that of a preview or page change.  Save the last answers for the problems.
 				$db->putProblemVersion($pureProblem);
 			}
-		} # end loop through problems
-		# end loop through problems for sticky answer
-
-		#Try to update the student score on the LMS
-		# if that option is enabled.
-		my $LTIGradeMode = $self->{ce}->{LTIGradeMode} // '';
-		if ($submitAnswers && $will{recordAnswers} && $LTIGradeMode && $self->{ce}->{LTIGradeOnSubmit}) {
-			my $grader = WeBWorK::Authen::LTIAdvanced::SubmitGrade->new($r);
-			if ($LTIGradeMode eq 'course') {
-				$LTIGradeResult = $grader->submit_course_grade($effectiveUser);
-			} elsif ($LTIGradeMode eq 'homework') {
-				$LTIGradeResult = $grader->submit_set_grade($effectiveUser, $setName);
+		}
+
+		# Try to update the student score on the LMS if that option is enabled.
+		if ($c->{submitAnswers} && $will{recordAnswers} && $ce->{LTIGradeMode} && $ce->{LTIGradeOnSubmit}) {
+			my $grader = $ce->{LTI}{ $ce->{LTIVersion} }{grader}->new($c);
+			if ($ce->{LTIGradeMode} eq 'course') {
+				$LTIGradeResult = await $grader->submit_course_grade($effectiveUserID);
+			} elsif ($ce->{LTIGradeMode} eq 'homework') {
+				$LTIGradeResult = await $grader->submit_set_grade($effectiveUserID, $setID);
 			}
 		}
 
-		# Finally, log student answers if we're submitting answers,
-		# provided that we can record answers.  Note that this will log an overtime submission
-		# (or any case where someone submits the test, or spoofs a request to submit a test).
+		# Finally, log student answers answers are being submitted, provided that answers can be recorded.  Note that
+		# this will log an overtime submission (or any case where someone submits the test, or spoofs a request to
+		# submit a test).
+		my $answer_log = $ce->{courseFiles}{logs}{answer_log};
 
-		my $answer_log = $self->{ce}->{courseFiles}->{logs}->{'answer_log'};
+		if (defined $answer_log && $c->{submitAnswers}) {
+			for my $i (0 .. $#problems) {
+				next unless ref($pg_results[ $probOrder[$i] ]);
 
-		# This is modified from process_and_log_answer in ProblemUtil.pm
-		if (defined($answer_log) && $submitAnswers) {
-			foreach my $i (0 .. $#problems) {
-				# Begin problem loop for passed answers.
-				next unless ref($pg_results[$probOrder[$i]]);
+				my $problem = $problems[ $probOrder[$i] ];
 
-				my ($past_answers_string, $encoded_last_answer_string, $scores, $isEssay) =
-					WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::create_ans_str_from_responses(
-						$self, $pg_results[$probOrder[$i]]
-					);
+				my ($past_answers_string, $encoded_last_answer_string, $scores, $answer_types_string) =
+					create_ans_str_from_responses($c, $pg_results[ $probOrder[$i] ]);
 				$past_answers_string =~ s/\t+$/\t/;
 
 				if (!$past_answers_string || $past_answers_string =~ /^\t$/) {
 					$past_answers_string = "No answer entered\t";
 				}
 
-				# Write to courseLog
-				writeCourseLog($self->{ce}, "answer_log",
-					join("", '|', $problems[$i]->user_id, '|', $setVName, '|', ($i+1), '|', $scores,
-						"\t$timeNow\t", "$past_answers_string"));
+				# Write to courseLog, use the recorded time of when the submission was received, but as an integer
+				writeCourseLogGivenTime(
+					$c->ce,
+					'answer_log',
+					$timeNowInt,
+					join('',
+						'|', $problem->user_id, '|', $setVName, '|', ($i + 1), '|', $scores,
+						"\t$timeNowInt\t", "$past_answers_string")
+				);
 
 				# Add to PastAnswer db
 				my $pastAnswer = $db->newPastAnswer();
-				$pastAnswer->course_id($courseID);
-				$pastAnswer->user_id($problems[$i]->user_id);
+				$pastAnswer->course_id($c->stash('courseID'));
+				$pastAnswer->user_id($problem->user_id);
 				$pastAnswer->set_id($setVName);
-				$pastAnswer->problem_id($problems[$i]->problem_id);
-				$pastAnswer->timestamp($timeNow);
+				$pastAnswer->problem_id($problem->problem_id);
+				$pastAnswer->timestamp($timeNowInt);
 				$pastAnswer->scores($scores);
 				$pastAnswer->answer_string($past_answers_string);
-				$pastAnswer->source_file($problems[$i]->source_file);
+				$pastAnswer->source_file($problem->source_file);
 				$db->addPastAnswer($pastAnswer);
 			}
 		}
 
-		my $caliper_sensor = Caliper::Sensor->new($self->{ce});
-		if ($caliper_sensor->caliperEnabled() && defined($answer_log)) {
+		my $caliper_sensor = Caliper::Sensor->new($c->ce);
+		if ($caliper_sensor->caliperEnabled() && defined $answer_log) {
 			my $events = [];
 
-			my $startTime = $r->param('startTime');
-			my $endTime = time();
-			if ($submitAnswers && $will{recordAnswers}) {
-				foreach my $i (0 .. $#problems) {
-					my $problem = $problems[$i];
-					my $pg = $pg_results[$i];
+			my $startTime = $c->param('startTime');
+			my $endTime   = int($c->submitTime);
+			if ($c->{submitAnswers} && $will{recordAnswers}) {
+				for my $i (0 .. $#problems) {
+					my $problem                  = $problems[ $probOrder[$i] ];
+					my $pg                       = $pg_results[ $probOrder[$i] ];
 					my $completed_question_event = {
-						'type' => 'AssessmentItemEvent',
-						'action' => 'Completed',
+						'type'    => 'AssessmentItemEvent',
+						'action'  => 'Completed',
 						'profile' => 'AssessmentProfile',
-						'object' => Caliper::Entity::problem_user(
-							$self->{ce},
-							$db,
-							$problem->set_id(),
-							$versionNumber,
-							$problem->problem_id(),
-							$problem->user_id(),
-							$pg
+						'object'  => Caliper::Entity::problem_user(
+							$c->ce, $db, $problem->set_id(), $versionID, $problem->problem_id(),
+							$problem->user_id(), $pg
 						),
 						'generated' => Caliper::Entity::answer(
-							$self->{ce},
+							$c->ce,
 							$db,
 							$problem->set_id(),
-							$versionNumber,
+							$versionID,
 							$problem->problem_id(),
 							$problem->user_id(),
 							$pg,
-							0, # don't track start/end time for gateway problems (multiple answers per page)
-							0 # don't track start/end time for gateway problems (multiple answers per page)
+							0,    # don't track start/end time for gateway problems (multiple answers per page)
+							0     # don't track start/end time for gateway problems (multiple answers per page)
 						),
 					};
 					push @$events, $completed_question_event;
 				}
 				my $submitted_set_event = {
-					'type' => 'AssessmentEvent',
-					'action' => 'Submitted',
-					'profile' => 'AssessmentProfile',
-					'object' => Caliper::Entity::problem_set(
-						$self->{ce},
-						$db,
-						$setName
-					),
+					'type'      => 'AssessmentEvent',
+					'action'    => 'Submitted',
+					'profile'   => 'AssessmentProfile',
+					'object'    => Caliper::Entity::problem_set($c->ce, $db, $setID),
 					'generated' => Caliper::Entity::problem_set_attempt(
-						$self->{ce},
-						$db,
-						$setName,
-						$versionNumber,
-						$effectiveUser,
-						$startTime,
-						$endTime
+						$c->ce, $db, $setID, $versionID, $effectiveUserID, $startTime, $endTime
 					),
 				};
 				push @$events, $submitted_set_event;
 			} else {
 				my $paused_set_event = {
-					'type' => 'AssessmentEvent',
-					'action' => 'Paused',
-					'profile' => 'AssessmentProfile',
-					'object' => Caliper::Entity::problem_set(
-						$self->{ce},
-						$db,
-						$setName
-					),
+					'type'      => 'AssessmentEvent',
+					'action'    => 'Paused',
+					'profile'   => 'AssessmentProfile',
+					'object'    => Caliper::Entity::problem_set($c->ce, $db, $setID),
 					'generated' => Caliper::Entity::problem_set_attempt(
-						$self->{ce},
-						$db,
-						$setName,
-						$versionNumber,
-						$effectiveUser,
-						$startTime,
-						$endTime
+						$c->ce, $db, $setID, $versionID, $effectiveUserID, $startTime, $endTime
 					),
 				};
 				push @$events, $paused_set_event;
 			}
 			my $tool_use_event = {
-				'type' => 'ToolUseEvent',
-				'action' => 'Used',
+				'type'    => 'ToolUseEvent',
+				'action'  => 'Used',
 				'profile' => 'ToolUseProfile',
-				'object' => Caliper::Entity::webwork_app(),
+				'object'  => Caliper::Entity::webwork_app(),
 			};
 			push @$events, $tool_use_event;
-			$caliper_sensor->sendEvents($r, $events);
+			$caliper_sensor->sendEvents($c, $events);
+
+			# Reset start time
+			$c->param('startTime', '');
+		}
+	} else {
+		# This 'else' case includes initial load of the first page of the
+		# quiz and checkAnswers calls, as well as when $can{recordAnswers}
+		# is false.
+
+		# Save persistent data to database even in this case, when answers
+		# would not or can not be recorded.
+		my @pureProblems = $db->getAllProblemVersions($effectiveUserID, $setID, $versionID);
+		for my $i (0 .. $#problems) {
+			# Process each problem.
+			my $pureProblem = $pureProblems[ $probOrder[$i] ];
+			my $pg_result   = $pg_results[ $probOrder[$i] ];
+
+			if (ref $pg_result) {
+				# Transfer persistent problem data from the PERSISTENCE_HASH:
+				# - Get keys to update first, to avoid extra work when no updates
+				#   are needed. When none, we avoid the need to decode/encode JSON,
+				#   or to save the pureProblem.
+				# - We are assuming that there is no need to DELETE old
+				#   persistent data if the hash is empty, even if in
+				#   potential there may be some data already in the database.
+				my @persistent_data_keys = keys %{ $pg_result->{PERSISTENCE_HASH_UPDATED} };
+				next unless (@persistent_data_keys);    # stop now if nothing to do
+				if ($isFakeSet) {
+					warn join("",
+						"This problem stores persistent data and this cannot be done in a fake set. ",
+						"Some functionality may not work properly when testing this problem in this setting.");
+					next;
+				}
+
+				my $json_data = decode_json($pureProblem->{problem_data} || '{}');
+				for my $key (@persistent_data_keys) {
+					$json_data->{$key} = $pg_result->{PERSISTENCE_HASH}{$key};
+				}
+				$pureProblem->problem_data(encode_json($json_data));
 
-			# reset start time
-			$r->param('startTime', '');
+				$c->db->putProblemVersion($pureProblem);
+			}
 		}
 	}
-	debug("end answer processing");
-	# end problem loop
+	debug('end answer processing');
+
+	$c->{scoreRecordedMessage} = \@scoreRecordedMessage;
+	$c->{LTIGradeResult}       = $LTIGradeResult;
 
 	# Additional set-level database manipulation: We want to save the time that a set was submitted, and for proctored
 	# tests we want to reset the assignment type after a set is submitted for the last time so that it's possible to
 	# look at it later without getting proctor authorization.
 	if (
 		(
-			$submitAnswers
-			&& ($will{recordAnswers} || (!$set->version_last_attempt_time && $timeNow > $set->due_date + $grace))
+			$c->{submitAnswers}
+			&& (
+				$will{recordAnswers}
+				|| (!$set->version_last_attempt_time && $c->submitTime > $set->due_date + $ce->{gatewayGracePeriod})
+			)
 		)
 		|| (
 			$set->assignment_type eq 'proctored_gateway'
 			&& (
-				($user eq $effectiveUser && !$can{recordAnswersNextTime})
+				($userID eq $effectiveUserID && !$can{recordAnswersNextTime})
 				|| (
-					$user ne $effectiveUser
-					&& $authz->hasPermissions($user, "record_answers_when_acting_as_student")
+					$userID ne $effectiveUserID
+					&& $authz->hasPermissions($userID, 'record_answers_when_acting_as_student')
 					&& $set->attempts_per_version > 0
-					&& ($Problem->num_correct + $Problem->num_incorrect + ($submitAnswers ? 1 : 0) >=
+					&& ($problem->num_correct + $problem->num_incorrect + ($c->{submitAnswers} ? 1 : 0) >=
 						$set->attempts_per_version)
 				)
 			)
@@ -1841,859 +1263,275 @@ sub body {
 		)
 	{
 		# Save the submission time if we're recording the answer, or if the first submission occurs after the due_date.
-		$set->version_last_attempt_time($timeNow)
-			if ($submitAnswers
-				&& ($will{recordAnswers} || (!$set->version_last_attempt_time && $timeNow > $set->due_date + $grace)));
+		$set->version_last_attempt_time($timeNowInt)
+			if (
+				$c->{submitAnswers}
+				&& (
+					$will{recordAnswers}
+					|| (!$set->version_last_attempt_time && $c->submitTime > $set->due_date + $ce->{gatewayGracePeriod})
+				)
+			);
 
 		$set->assignment_type('gateway')
 			if (
 				$set->assignment_type eq 'proctored_gateway'
 				&& (
-					($user eq $effectiveUser && !$can{recordAnswersNextTime})
+					($userID eq $effectiveUserID && !$can{recordAnswersNextTime})
 					|| (
-						$user ne $effectiveUser
-						&& $authz->hasPermissions($user, "record_answers_when_acting_as_student")
+						$userID ne $effectiveUserID
+						&& $authz->hasPermissions($userID, 'record_answers_when_acting_as_student')
 						&& $set->attempts_per_version > 0
-						&& ($Problem->num_correct + $Problem->num_incorrect + ($submitAnswers ? 1 : 0) >=
+						&& ($problem->num_correct + $problem->num_incorrect + ($c->{submitAnswers} ? 1 : 0) >=
 							$set->attempts_per_version)
 					)
 				)
 			);
 
 		# Save only parameters that determine access to the set version.
-		my $cleanSet = $db->getSetVersion($effectiveUser, $set->set_id, $versionNumber);
+		my $cleanSet = $db->getSetVersion($effectiveUserID, $set->set_id, $versionID);
 		$cleanSet->assignment_type($set->assignment_type);
 		$cleanSet->version_last_attempt_time($set->version_last_attempt_time);
 		$db->putSetVersion($cleanSet);
 	}
 
-	####################################
-	# output
-	####################################
-
-	# some convenient output variables
-	my $canShowProblemScores = $can{showScore} &&
-		($set->hide_score_by_problem eq 'N' ||
-			$authz->hasPermissions($user, "view_hidden_work"));
-
-	my $canShowWork = $authz->hasPermissions($user, "view_hidden_work") ||
-		($set->hide_work eq 'N' || ($set->hide_work eq 'BeforeAnswerDate' && $timeNow>$tmplSet->answer_date));
-
-	# for nicer answer checking on multi-page tests, we want to keep
-	#    track of any changes that someone made to a different page,
-	#    and what their score was.  we use @probStatus to do this.  we
-	#    initialize this to any known scores, and then update this when
-	#    calculating the score for checked or submitted tests
-	my @probStatus = ();
-	# we also figure out recorded score for the set, if any, and score
-	#    on this attempt
-	my $recordedScore = 0;
-	my $totPossible = 0;
-	foreach (@problems) {
-		my $pv = ($_->value()) ? $_->value() : 1;
-		$totPossible += $pv;
-		$recordedScore += $_->status*$pv if (defined($_->status));
-		push(@probStatus, ($r->param("probstatus" . $_->problem_id) || $_->status || 0));
+	# For answer checking on multi-page tests, track changes made on other pages, and scores for problems on those
+	# pages.  @probStatus is used for this.  Initialize this to the saved score either from a hidden input or the
+	# database, and then update this when calculating the score for checked or submitted tests.
+	my @probStatus;
+
+	# Figure out the recorded score for the set, and the score on this attempt.
+	$c->{recordedScore} = 0;
+	$c->{totalPossible} = 0;
+	for (@problems) {
+		my $pv = $_->value // 1;
+		$c->{totalPossible} += $pv;
+		$c->{recordedScore} += $_->status * $pv if defined $_->status;
+		push(@probStatus, ($c->param('probstatus' . $_->problem_id) || $_->status || 0));
 	}
 
-	# to get the attempt score, we have to figure out what the score on
-	#    each part of each problem is, and multiply the total for the
-	#    problem by the weight (value) of the problem.  to make things
-	#    even more interesting, we are avoiding translating all of the
-	#    problems when checking answers
-	my $attemptScore = 0;
+	# To get the attempt score, determine the score for each problem, and multiply the total for the problem by the
+	# weight (value) of the problem.  Avoid translating all of the problems when checking answers.
+	# Note that it is okay to ignore problem order here as all arrays used are index the same.
+	$c->{attemptScore} = 0;
 	if ($will{recordAnswers} || $will{checkAnswers}) {
-		my $i=0;
-		foreach my $pg (@pg_results) {
-			my $pValue = $problems[$i]->value() ? $problems[$i]->value() : 1;
+		my $i = 0;
+		for my $pg (@pg_results) {
+			my $pValue = $problems[$i]->value // 1;
 			my $pScore = 0;
-			my $numParts = 0;
-			if (ref($pg)) {  # then we have a pg object
-				###
-				$pScore = $pg->{state}->{recorded_score};
-				$probStatus[$i] = $pScore;
-				$numParts = 1;
-				###
-
+			if (ref $pg) {
+				# If a pg object is available, then use the pg recorded score and save it in the @probStatus array.
+				$pScore = compute_reduced_score($ce, $problems[$i], $set, $pg->{state}{recorded_score}, $c->submitTime);
+				$probStatus[$i] = $pScore if $pScore > $probStatus[$i];
 			} else {
-				# if we don't have a pg object, use any known
-				#    problem status (this defaults to zero)
+				# If a pg object is not available, then use the saved problem status.
 				$pScore = $probStatus[$i];
 			}
-			$attemptScore += $pScore*$pValue/($numParts > 0 ? $numParts : 1);
+			$c->{attemptScore} += $pScore * $pValue;
 			$i++;
 		}
+
+		$c->{attemptScore} = wwRound(2, $c->{attemptScore});
 	}
+	$c->{probStatus} = \@probStatus;
 
-	# we want to print elapsed and allowed times; allowed is easy
-	my $allowed = sprintf("%.0f", 10*($set->due_date - $set->open_date)/6) / 100;
-	# elapsed is a little harder; we're counting to the last submission
-	#    time, or to the current time if the test hasn't been submitted,
-	#    and if the submission fell in the grace period round it to the
-	#    due_date
-	my $exceededAllowedTime = 0;
-	my $endTime = ($set->version_last_attempt_time) ? $set->version_last_attempt_time : $timeNow;
-	if ($endTime > $set->due_date && $endTime < $set->due_date + $grace) {
+	# To compute the elapsed time, take into account the last submission time or the current time if the test hasn't
+	# been submitted. Also, if the submission is during the grace period, then round it to the due date.
+	$c->{exceededAllowedTime} = 0;
+	my $endTime = $set->version_last_attempt_time ? $set->version_last_attempt_time : $timeNowInt;
+	if ($endTime > $set->due_date && $endTime < $set->due_date + $ce->{gatewayGracePeriod}) {
 		$endTime = $set->due_date;
 	} elsif ($endTime > $set->due_date) {
-		$exceededAllowedTime = 1;
+		$c->{exceededAllowedTime} = 1;
 	}
-	my $elapsedTime = int(($endTime - $set->open_date)/0.6 + 0.5)/100;
-
-	# Get the number of remaining attempts.
-	my $numLeft = ($set->attempts_per_version || 0) - $Problem->num_correct - $Problem->num_incorrect
-		- ($submitAnswers && $will{recordAnswers} ? 1 : 0);
-	my $attemptNumber =
-		$Problem->num_correct + $Problem->num_incorrect + ($submitAnswers && $will{recordAnswers} ? 1 : 0);
-
-	# a handy noun for when referring to a test
-	my $testNoun = (($set->attempts_per_version || 0) > 1) ? $r->maketext("submission") : $r->maketext("test");
-	my $testNounNum = (($set->attempts_per_version ||0) > 1)
-		? $r->maketext("submission (version [_1])",$versionNumber) : $r->maketext("version ([_1])",$versionNumber);
-
-	##### start output of test headers:
-	##### display information about recorded and checked scores
-	$attemptScore = wwRound(2,$attemptScore);
-	if ($will{recordAnswers}) {
-		# the distinction between $can{recordAnswers} and ! $can{} has
-		#    been dealt with above and recorded in @scoreRecordedMessage
-		my $divClass = 'ResultsWithoutError';
-		my $recdMsg = '';
-		foreach (@scoreRecordedMessage) {
-			if ($_ !~ $r->maketext('Your score on this problem was recorded.')) {
-				$recdMsg = $_;
-				$divClass = 'ResultsWithError';
-				last;
-			}
-		}
-
-		print CGI::start_div({ class => $divClass . ' mb-3' });
-		if ($recdMsg) {
-			# then there was an error when saving the results
-			print CGI::strong($r->maketext("Your score on this [_1] was NOT recorded.",$testNounNum),
-				$recdMsg), CGI::br();
-		} else {
-			# no error; print recorded message
-			print CGI::strong($r->maketext("Your score on this [_1] WAS recorded.",$testNounNum)), CGI::br();
-
-			# and show the score if we're allowed to do that
-			if ($can{showScore}) {
-				print CGI::strong($r->maketext("Your score on this [_1] is [_2]/[_3].",
-						$testNoun,$attemptScore,$totPossible));
-			} else {
-				if ($set->hide_score eq 'BeforeAnswerDate') {
-					print $r->maketext("(Your score on this [_1] is not available until [_2].)",
-						$testNoun, $self->formatDateTime($set->answer_date));
-				} else {
-					print $r->maketext("(Your score on this [_1] is not available.)",$testNoun);
-				}
-			}
-
-			# Print a message if we are trying to send the score to
-			# an LMS
-			if ($LTIGradeResult != -1) {
-				print CGI::br();
-				print $LTIGradeResult ?
-				$r->maketext("Your score was successfully sent to the LMS.") :
-				$r->maketext("Your score was not successfully sent to the LMS.");
-			}
-		}
-		print CGI::end_div();
-
-		# finally, if there is another, recorded message, print that
-		#    too so that we know what's going on
-		if ($set->attempts_per_version > 1
-			&& $attemptNumber > 0
-			&& $recordedScore != $attemptScore
-			&& $can{showScore})
-		{
-			print CGI::start_div({ class => 'gwMessage' });
-			my $recScore = wwRound(2, $recordedScore);
-			print $r->maketext("The recorded score for this version is  [_1]/[_2].", $recScore, $totPossible);
-			print CGI::end_div();
-		}
-	} elsif ($will{checkAnswers}) {
-		if ($can{showScore}) {
-			print CGI::start_div({class=>'gwMessage'});
-			print CGI::strong($r->maketext("Your score on this (checked, not recorded) submission is [_1]/[_2].",
-					$attemptScore,$totPossible)), CGI::br();
-			my $recScore = wwRound(2,$recordedScore);
-			print $r->maketext("The recorded score for this version is [_1]/[_2].",$recScore, $totPossible);
-			print CGI::end_div();
-		}
-	}
-
-	# Remaining output of test headers:
-	# Display timer or information about elapsed time, print link, and information about any recorded score if not
-	# submitAnswers or checkAnswers.
-	if ($can{recordAnswersNextTime}) {
-		my $timeLeft = $set->due_date() - $timeNow;    # This is in seconds
-
-		# Print the timer if there is less than 24 hours left.
-		if ($timeLeft < 86400) {
-			print CGI::div(
-				{
-					id                   => 'gwTimer',
-					class                => 'alert alert-warning p-1',
-					data_server_time     => $timeNow,
-					data_server_due_time => $set->due_date(),
-					data_grace_period    => $ce->{gatewayGracePeriod},
-					data_alert_title     => $r->maketext('Test Time Notification'),
-					data_alert_three     => $r->maketext(
-						'You have less than 90 seconds left to complete this '
-							. 'assignment. You should finish it soon!'
-					),
-					data_alert_two => ('<div>' . $r->maketext('You have less than 45 seconds left!') . '</div>')
-						. (
-						($set->attempts_per_version > 1 && $attemptNumber > 0) ? ''
-						: '<div>' . $r->maketext('Press "Grade Test" soon!') . '</div>'
-						),
-					data_alert_one => ('<div>' . $r->maketext('You are out of time!') . '</div>')
-						. (
-						($set->attempts_per_version > 1 && $attemptNumber > 0) ? ''
-						: '<div>' . $r->maketext('Press "Grade Test" now!') . '</div>'
-						),
-					$user ne $effectiveUser ? (data_acting => 1) : ()
-				},
-				# '00:00:00' is a placeholder that is replaced by the actual time remaining via javascript.
-				$r->maketext('Remaining time: [_1]', '00:00:00')
-			);
-		}
-		if ($timeLeft < 60 && $timeLeft > 0 && !$authz->hasPermissions($user, 'record_answers_when_acting_as_student'))
-		{
-			print CGI::div({ class => 'ResultsWithError d-inline-block mb-2' },
-				CGI::b($r->maketext('You have less than 1 minute to complete this test.')));
-		} elsif ($timeLeft <= 0 && !$authz->hasPermissions($user, 'record_answers_when_acting_as_student')) {
-			print CGI::div(
-				{ class => 'ResultsWithError d-inline-block mb-2' },
-				CGI::b(
-					$r->maketext('You are out of time!') . ' '
-						. (
-						$set->attempts_per_version > 1 && $attemptNumber > 0
-					   	? '' : $r->maketext('Press "Grade Test" now!')
-						)
-				)
-			);
-		}
-		# If there are multiple attempts per version, indicate the number remaining, and if we've submitted a multiple
-		# attempt multi-page test, show the score on the previous submission
-		if ($set->attempts_per_version > 1) {
-			print CGI::div({ class => 'alert alert-info p-1' },
-				CGI::em($r->maketext('You have [_1] attempt(s) remaining on this test.', $numLeft)));
-			if ($numLeft < $set->attempts_per_version && $numPages > 1 && $can{showScore}) {
-				print CGI::start_div({ id => 'gwScoreSummary' }),
-					CGI::strong($r->maketext('Score summary for last submit:'));
-				print CGI::start_table();
-				print CGI::Tr(
-					CGI::th({ align => 'left' }, $r->maketext('Prob')),
-					CGI::td(''), CGI::th($r->maketext('Status')),
-					CGI::td(''), CGI::th($r->maketext('Result'))
-				);
-				for (my $i = 0; $i < @probStatus; $i++) {
-					print CGI::Tr(CGI::td([
-						($i + 1), '', int(100 * $probStatus[ $probOrder[$i] ] + 0.5) . '%',
-						'', $probStatus[ $probOrder[$i] ] == 1 ? $r->maketext('Correct') : $r->maketext('Incorrect')
-					]));
-				}
-				print CGI::end_table(), CGI::end_div();
-			}
-		}
-	} else {
-		if (! $checkAnswers && ! $submitAnswers) {
-			if ($can{showScore}) {
-				print CGI::start_div({class=>'gwMessage'});
-
-				my $scMsg = $r->maketext("Your recorded score on this test (version [_1]) is [_2]/[_3].",
-					$versionNumber, wwRound(2,$recordedScore), $totPossible);
-				if ($exceededAllowedTime && $recordedScore == 0) {
-					$scMsg .= " " . $r->maketext("You exceeded the allowed time.");
-				}
-				print CGI::strong($scMsg), CGI::br();
-				print CGI::end_div();
-			}
-		}
+	$c->{elapsedTime} = int(($endTime - $set->open_date) / 0.6 + 0.5) / 100;
 
-		if ($set->version_last_attempt_time) {
-			print CGI::start_div({class=>'gwMessage'});
-			print $r->maketext("Time taken on test: [_1] min ([_2] min allowed).",$elapsedTime,$allowed);
-			print CGI::end_div();
-		} elsif ($exceededAllowedTime && $recordedScore != 0) {
-			print CGI::start_div({class=>'gwMessage'});
-			print $r->maketext("(This test is overtime because it was not submitted in the allowed time.)");
-			print CGI::end_div();
-		}
+	# Get the number of attempts and number of remaining attempts.
+	$c->{attemptNumber} =
+		$problem->num_correct + $problem->num_incorrect + ($c->{submitAnswers} && $will{recordAnswers} ? 1 : 0);
+	$c->{numAttemptsLeft} = ($set->attempts_per_version || 0) - $c->{attemptNumber};
 
-		if ($canShowWork && $set->set_id ne 'Undefined_Set') {
-			print CGI::start_div({ class => 'row' });
-			print CGI::div(
-				{ class => 'col-md-10 mb-1' },
-				CGI::div(
-					{ class => 'alert alert-info p-1 mb-0' },
-					$r->maketext('The test (which is version [_1]) may  no longer be submitted for a grade.',
-						$versionNumber)
-						. ($can{showScore} ? (' ' . $r->maketext('You may still check your answers.')) : '')
-				)
-			);
+	return;
+}
 
-			# Display a print test link if the user is allowed to see work.
-			print CGI::div(
-				{ class => 'col-md-2 text-end mb-1' },
-				CGI::a(
-					{
-						href => "$ce->{webworkURLs}{root}/$ce->{courseName}/hardcopy/"
-							. $set->set_id . ',v'
-							. $set->version_id . '/?'
-							. $self->url_authen_args,
-						class => 'btn btn-info'
-					},
-					$r->maketext('Print Test')
-				)
-			);
-			print CGI::end_div();
-		}
+sub head ($c) {
+	return '' unless ref $c->stash->{pg_results} eq 'ARRAY';
+	my $head_text = '';
+	for (@{ $c->stash->{pg_results} }) {
+		next unless ref $_;
+		$head_text .= $_->{head_text} if $_->{head_text};
 	}
+	return $head_text;
+}
 
-	# this is a hack to get a URL that won't require a proctor login if
-	#    we've submitted a proctored test for the last time.  above we've
-	#    reset the assignment_type in this case, so we'll use that to
-	#    decide if we should give a path to an unproctored test.
-	my $action = $r->uri();
-	$action =~ s/proctored_quiz_mode/quiz_mode/ if ($set->assignment_type() eq 'gateway');
-	# we also want to be sure that if we're in a set, the 'action' in the
-	#    form points us to the same set.
-	my $setname = $set->set_id;
-	my $setvnum = $set->version_id;
-	$action =~ s/(quiz_mode\/$setname)\/?$/$1,v$setvnum\//;  #"
-
-	if (!$can{recordAnswersNextTime} && !$canShowWork) {
-		# Problems can not be shown.
-		print CGI::div(
-			{ class => 'gwProblem' },
-			$set->hide_work eq 'BeforeAnswerDate'
-			? CGI::strong($r->maketext(
-				'Completed results for this assignment are not available until [_1].',
-				$self->formatDateTime($set->answer_date)
-			))
-			: CGI::strong($r->maketext('Completed results for this assignment are not available.'))
-		);
-	} else {
-		# Problems can be shown, so print out the main form and the problems.
-		my $startTime = $r->param('startTime') || time();
-
-		print CGI::start_form({ name => 'gwquiz', method => 'POST', action => $action, class => 'problem-main-form' }),
-			$self->hidden_authen_fields,
-			$self->hidden_proctor_authen_fields;
-
-		# Hacks to use a javascript link to trigger previews and jump to subsequent pages of a multipage test.
-		print CGI::hidden({ name => 'pageChangeHack', value => '' });
-		print CGI::hidden({ name => 'startTime',      value => $startTime });
-		if ($numProbPerPage && $numPages > 1) {
-			print CGI::hidden({ name => 'newPage',     value => '' });
-			print CGI::hidden({ name => 'currentPage', value => $pageNumber });
-		}
-
-		# Set up links between problems and, for multi-page tests, pages.
-		my $jumpLinks = '';
-		my $probRow   = [];
-		my @scoreRow;
-		for my $i (0 .. $#pg_results) {
-			my $pn = $i + 1;
-			if ($i >= $startProb && $i <= $endProb) {
-				push(@$probRow, CGI::a({ href => '#', class => 'problem-jump-link', data_problem_number => $pn }, $pn));
-			} else {
-				push(@$probRow, $pn);
-			}
-			my $score = $probStatus[ $probOrder[$i] ];
-			$score = $score == 1 ? "\x{1F4AF}" : wwRound(0, 100 * $score);
-			push(@scoreRow,
-				CGI::td({ class => 'score', data_problem_id => $problems[ $probOrder[$i] ]->problem_id }, $score));
-		}
-		my @tableRows;
-		my @cols = (CGI::colgroup(CGI::col({ class => 'header' })));
-		if ($numProbPerPage && $numPages > 1) {
-			push(@cols,
-				CGI::colgroup({ class => 'page' }, CGI::col({ class => 'problem' }) x $numProbPerPage) x $numPages);
-			my @pages;
-			for my $i (1 .. $numPages) {
-				my $pn =
-					$i == $pageNumber
-					? $i
-					: CGI::a({ href => '#', class => 'page-change-link', data_page_number => $i }, $i);
-				my $class = $i == $pageNumber ? 'page active' : 'page';
-				push(@pages, CGI::td({ colspan => $numProbPerPage, class => $class }, $pn));
-			}
-			if ($numProbPerPage == 1) {
-				push(@tableRows, CGI::Tr(CGI::th({ scope => 'row' }, $r->maketext('Move to Problem:')), @pages));
-			} else {
-				push(
-					@tableRows,
-					CGI::Tr(
-						CGI::th({ scope => 'row', class => 'text-nowrap' }, $r->maketext('Move to Page:')), @pages
-					),
-					CGI::Tr(
-						CGI::th({ class => 'text-nowrap' }, $r->maketext('Jump to Problem:')),
-						CGI::td({ class => 'problem' }, $probRow)
-					)
-				);
-			}
-		} else {
-			push(@cols, CGI::colgroup({ class => 'page' }, CGI::col({ class => 'problem' }) x ($#pg_results + 1)));
-			push(
-				@tableRows,
-				CGI::Tr(
-					CGI::th({ class => 'text-nowrap' }, $r->maketext('Jump to Problem:')),
-					CGI::td({ class => 'problem' }, $probRow)
-				)
-			);
-		}
-		push(@tableRows, CGI::Tr(CGI::th($r->maketext('% Score:')), @scoreRow))
-			if ($canShowProblemScores && $set->version_last_attempt_time);
-		$jumpLinks = CGI::div(
-			{ class => 'table-responsive' },
-			CGI::table(
-				{ class => 'gwNavigation', role => 'navigation', 'aria-label' => 'problem navigation' },
-				@cols, @tableRows
-			)
-		);
-		print $jumpLinks;
-
-		# Print out problems and attempt results, as appropriate.
-		# Note: args to attemptResults are (self,) $pg, $showAttemptAnswers, $showCorrectAnswers, $showAttemptResults
-		# (and-ed with $showAttemptAnswers), $showSummary, $showAttemptPreview (or-ed with zero)
-		my $problemNumber           = 0;
-		my $effectiveUserPermission = $db->getPermissionLevel($effectiveUser)->permission;
-
-		for my $i (0 .. $#pg_results) {
-			my $pg = $pg_results[ $probOrder[$i] ];
-			$problemNumber++;
-
-			if ($i >= $startProb && $i <= $endProb) {
-
-				my $recordMessage = '';
-				my $resultsTable  = '';
-
-				if ($pg->{flags}->{showPartialCorrectAnswers} >= 0 && $submitAnswers) {
-					if ($scoreRecordedMessage[ $probOrder[$i] ] !~
-						$r->maketext('Your score on this problem was recorded.'))
-					{
-						$recordMessage = CGI::div(
-							{ class => 'ResultsWithError d-inline-block mb-2' },
-							$r->maketext('ANSWERS NOT RECORDED --'),
-							$scoreRecordedMessage[ $probOrder[$i] ]
-						);
-					}
-					$resultsTable = $self->attemptResults(
-						$pg, 1,
-						$will{showCorrectAnswers},
-						$pg->{flags}->{showPartialCorrectAnswers} && $canShowProblemScores,
-						$canShowProblemScores, 1
-					);
-
-				} elsif ($will{checkAnswers} || $will{showProblemGrader}) {
-					$recordMessage = CGI::div(
-						{ class => 'ResultsWithError d-inline-block mb-2' },
-						$r->maketext('ANSWERS ONLY CHECKED -- '),
-						$r->maketext('ANSWERS NOT RECORDED')
-					);
-
-					$resultsTable = $self->attemptResults(
-						$pg, 1,
-						$will{showCorrectAnswers},
-						$pg->{flags}->{showPartialCorrectAnswers} && $canShowProblemScores,
-						$canShowProblemScores, 1
-					);
-
-				} elsif ($previewAnswers) {
-					$recordMessage = CGI::div(
-						{ class => 'ResultsWithError d-inline-block mb-2' },
-						$r->maketext('PREVIEW ONLY -- ANSWERS NOT RECORDED')
-					);
-					$resultsTable = $self->attemptResults($pg, 1, 0, 0, 0, 1);
-				}
-
-				print CGI::start_div({ class => 'gwProblem' });
-
-				# Output the jump to anchor.
-				print CGI::div({ id => "prob$i", tabindex => -1 }, $recordMessage);
+sub path ($c, $args) {
+	my $ce         = $c->ce;
+	my $setID      = $c->stash('setID');
+	my $courseName = $ce->{courseName};
 
-				# Output the problem header.
-				print CGI::h2($r->maketext('Problem [_1].', $problemNumber));
+	my $navigation_allowed = $c->authz->hasPermissions($c->param('user'), 'navigation_allowed');
 
-				print CGI::start_span({ class => 'problem-sub-header' });
+	return $c->pathMacro(
+		$args,
+		'WeBWorK'   => $navigation_allowed ? $c->url_for('root')     : '',
+		$courseName => $navigation_allowed ? $c->url_for('set_list') : '',
+		$setID eq 'Undefined_Set' || $c->{invalidSet}
+		? ($setID => '')
+		: (
+			$c->{set}->set_id           => $c->url_for('problem_list', setID => $c->{set}->set_id),
+			'v' . $c->{set}->version_id => ''
+		),
+	);
+}
 
-				my $problemValue = $problems[ $probOrder[$i] ]->value;
-				if (defined($problemValue)) {
-					my $points = $problemValue == 1 ? $r->maketext('point') : $r->maketext('points');
-					print "($problemValue $points)";
-				}
+sub nav ($c, $args) {
+	my $db              = $c->db;
+	my $userID          = $c->param('user');
+	my $effectiveUserID = $c->param('effectiveUser');
 
-				my $inlist = grep($_ eq $effectiveUser, @{ $ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} });
+	return '' if $c->{invalidSet};
 
-				# This uses the permission level and user id of the user assigned to the set.
-				if ($effectiveUserPermission >= $ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_PERMISSION_LEVEL}
-					|| $inlist)
-				{
-					print ' ' . $problems[ $probOrder[$i] ]->source_file;
-				}
+	# Set up and display a student navigation for those that have permission to act as a student.
+	if ($c->authz->hasPermissions($userID, 'become_student') && $effectiveUserID ne $userID) {
+		my $setID = $c->{set}->set_id;
 
-				print CGI::end_span();
+		return '' if $setID eq 'Undefined_Set';
 
-				my $instructor_comment = $self->get_instructor_comment($problems[ $probOrder[$i] ]);
-				if ($instructor_comment) {
-					print CGI::start_div({ id => 'answerComment', class => 'answerComments' });
-					print CGI::b($r->maketext('Instructor Comment:')), CGI::br();
-					print CGI::escapeHTML($instructor_comment);
-					print CGI::end_div();
-				}
+		my $setVersion = $c->{set}->version_id;
 
-				print CGI::div({ class => 'problem-content col-lg-10' }, $pg->{body_text});
-				print CGI::div({ class => 'mb-2' }, CGI::b($r->maketext('Note: [_1]', CGI::i($pg->{result}{msg}))))
-					if $pg->{result}{msg};
-				print CGI::div(
-					{ class => 'text-end mb-2' },
-					CGI::a(
-						{
-							href  => '#',
-							class => 'gateway-preview-btn btn btn-secondary',
-							($numProbPerPage && $numPages > 1) ? (data_page_number => $pageNumber) : ()
-						},
-						$r->maketext('preview answers')
-					)
-				);
+		# Find all versions of this set that have been taken (excluding those taken by the current user).
+		my @users =
+			$db->listSetVersionsWhere({ user_id => { not_like => $userID }, set_id => { like => "$setID,v\%" } });
+		my @allUserRecords = $db->getUsers(map { $_->[0] } @users);
 
-				print $resultsTable if $resultsTable;
+		my $filter = $c->param('studentNavFilter');
 
-				# Initialize the problem graders for the problem.
-				if ($self->{will}{showProblemGrader}) {
-					my $problem_grader = WeBWorK::ContentGenerator::Instructor::SingleProblemGrader->new($self->r, $pg,
-						$problems[ $probOrder[$i] ]);
-					$problem_grader->insertGrader;
-				}
+		# Format the student names for display, and associate the users with the test versions.
+		my %filters;
+		my @userRecords;
+		for (0 .. $#allUserRecords) {
+			# Add to the sections and recitations if defined.  Also store the first user found in that section or
+			# recitation.  This user will be switched to when the filter is selected.
+			my $section = $allUserRecords[$_]->section;
+			$filters{"section:$section"} =
+				[ $c->maketext('Filter by section [_1]', $section), $allUserRecords[$_]->user_id, $users[$_][2] ]
+				if $section && !$filters{"section:$section"};
+			my $recitation = $allUserRecords[$_]->recitation;
+			$filters{"recitation:$recitation"} =
+				[ $c->maketext('Filter by recitation [_1]', $recitation), $allUserRecords[$_]->user_id, $users[$_][2] ]
+				if $recitation && !$filters{"recitation:$recitation"};
 
-				print CGI::end_div();
-				# Store the problem status for continued attempts recording.
-				my $pNum = $probOrder[$i] + 1;
-				print CGI::hidden({ -name => "probstatus$pNum", -value => $probStatus[ $probOrder[$i] ] });
+			# Only keep this user if it satisfies the selected filter if a filter was selected.
+			next
+				unless !$filter
+				|| ($filter =~ /^section:(.*)$/    && $allUserRecords[$_]->section eq $1)
+				|| ($filter =~ /^recitation:(.*)$/ && $allUserRecords[$_]->recitation eq $1);
 
-				print CGI::div({ class => 'gwDivider' }, '');
-			} else {
-				# Print out hidden fields with the current last answers.
-				my $curr_prefix = 'Q' . sprintf('%04d', $problemNumbers[ $probOrder[$i] ]) . '_';
-				my @curr_fields = grep {/^(?!previous).*$curr_prefix/} keys %{ $self->{formFields} };
-				for my $curr_field (@curr_fields) {
-					for (split(/\0/, $self->{formFields}->{$curr_field} // '')) {
-						print CGI::hidden({ -name => $curr_field, -value => $_ });
-					}
-				}
-				# Store the problem status for continued attempts recording.
-				my $pNum = $probOrder[$i] + 1;
-				print CGI::hidden({ -name => "probstatus$pNum", -value => $probStatus[ $probOrder[$i] ] });
-			}
-		}
+			my $addRecord = $allUserRecords[$_];
+			push @userRecords, $addRecord;
 
-		print $jumpLinks;
-		print CGI::div({ class => 'gwDivider' }, '');
-
-		print CGI::start_div({ class => 'checkboxes-container col-12 my-2' });
-		if ($can{showCorrectAnswers}) {
-			print CGI::div(
-				{ class => 'form-check' },
-				CGI::checkbox({
-					name            => 'showCorrectAnswers',
-					checked         => $want{showCorrectAnswers} || $want{showProblemGrader},
-					label           => $r->maketext('Show correct answers'),
-					class           => 'form-check-input',
-					labelattributes => { class => 'form-check-label' }
-				})
-			);
-		}
-		if ($can{showSolutions}) {
-			print CGI::div(
-				{ class => 'form-check' },
-				CGI::checkbox({
-					name            => 'showSolutions',
-					checked         => $will{showSolutions} || $want{showProblemGrader},
-					label           => $r->maketext('Show Solutions'),
-					class           => 'form-check-input',
-					labelattributes => { class => 'form-check-label' }
-				})
-			);
-		}
-		if ($can{showProblemGrader}) {
-			print CGI::div(
-				{ class => 'form-check' },
-				CGI::checkbox({
-					name            => 'showProblemGrader',
-					checked         => $want{showProblemGrader},
-					label           => $r->maketext('Show problem graders'),
-					class           => 'form-check-input',
-					labelattributes => { class => 'form-check-label' }
-				})
-			);
+			$addRecord->{displayName} =
+				($addRecord->last_name || $addRecord->first_name
+					? $addRecord->last_name . ', ' . $addRecord->first_name
+					: $addRecord->user_id);
+			$addRecord->{setVersion} = $users[$_][2];
 		}
-		print CGI::end_div();
-
-		print CGI::div(
-			{ class => 'submit-buttons-container col-12 mb-2' },
-			CGI::submit({
-				name  => 'previewAnswers',
-				label => $r->maketext('Preview Test'),
-				class => 'btn btn-primary mb-1'
-			}),
-			$can{recordAnswersNextTime}
-			? CGI::submit({
-				name  => 'submitAnswers',
-				label => $r->maketext('Grade Test'),
-				class => 'btn btn-primary mb-1',
-				$set->attempts_per_version
-				? (
-					data_confirm_dialog_title   => $r->maketext('Do you want to grade this test?'),
-					data_confirm_btn_text       => $r->maketext('Yes'),
-					data_cancel_btn_text        => $r->maketext('No'),
-					data_confirm_dialog_message => $numLeft > 1
-					? $r->maketext(
-						'You have [_1] submissions remaining for this test.  If you say yes, then you will have '
-							. '[quant,_2,submission] remaining. Once all submissions have been used, your answers '
-							. 'will be final and you will not be able to continue to work this test version.',
-						$numLeft,
-						$numLeft - 1
-						)
-					: $set->attempts_per_version > 1 ? $r->maketext(
-						'This is your last submission.  If you say yes, then your answers will be final, '
-							. 'and you will not be able to continue to work this test version.'
-						)
-					: $r->maketext(
-						'This is your only submission.  If you say yes, then your answers will be final, '
-							. 'and you will not be able to continue to work this test version.'
-					)
-					)
-				: ()
-			})
-			: '',
-			$can{checkAnswersNextTime} && !$can{recordAnswersNextTime}
-			? CGI::submit({
-				name  => 'checkAnswers',
-				label => $r->maketext('Check Test'),
-				class => 'btn btn-primary mb-1'
-			})
-			: ''
-		);
-
-		print CGI::p(CGI::em($r->maketext('Note: grading the test grades all problems, not just those on this page.')))
-			if $numProbPerPage && $numPages > 1 && $can{recordAnswersNextTime};
-
-		print(CGI::hidden({ name => 'sourceFilePath', value => $r->param('sourceFilePath') }))
-			if defined($r->param('sourceFilePath'));
-		print(CGI::hidden({ name => 'problemSeed', value => $r->param('problemSeed') }))
-			if defined($r->param('problemSeed'));
-
-		# Make sure the student nav filter setting is preserved when the problem form is submitted.
-		my $filter = $r->param('studentNavFilter');
-		print CGI::hidden({ name => 'studentNavFilter', value => $filter }) if $filter;
 
-		print CGI::end_form();
-	}
+		# Sort by last name, then first name, then user_id, then set version.
+		@userRecords = sort {
+			lc($a->last_name) cmp lc($b->last_name)
+				|| lc($a->first_name) cmp lc($b->first_name)
+				|| lc($a->user_id) cmp lc($b->user_id)
+				|| lc($a->{setVersion}) <=> lc($b->{setVersion})
+		} @userRecords;
 
-	# finally, put in a show answers option if appropriate
-	# print answer inspection button
-	if ($authz->hasPermissions($user, "view_answers")) {
-		my $hiddenFields = $self->hidden_authen_fields;
-		my $firstProb = $startProb+1;
-		my $lastProb = $endProb+1;
-		$hiddenFields =~ s/\"hidden_/\"pastans-hidden_/g;
-		my $pastAnswersPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::ShowAnswers",
-			$r, courseID => $ce->{courseName});
-		my $showPastAnswersURL = $self->systemLink($pastAnswersPage, authen => 0); # no authen info for form action
-		print "\n", CGI::start_form(-method=>"POST",-action=>$showPastAnswersURL,-target=>"WW_Info"),"\n",
-			$hiddenFields,"\n",
-			CGI::hidden(-name => 'courseID',  -value=>$ce->{courseName}), "\n",
-			CGI::hidden(-name => 'selected_sets',  -value=>$setVName), "\n",
-			CGI::hidden(-name => 'selected_users',    -value=>$effectiveUser), "\n";
-		for (my $prob=$firstProb; $prob <= $lastProb; $prob++) {
-			print CGI::hidden(-name => 'selected_problems', -value=>"$prob"), "\n";
+		# Find the previous, current, and next test.
+		my $currentTestIndex = 0;
+		for (0 .. $#userRecords) {
+			if ($userRecords[$_]->user_id eq $effectiveUserID && $userRecords[$_]->{setVersion} == $setVersion) {
+				$currentTestIndex = $_;
+				last;
+			}
 		}
+		my $prevTest = $currentTestIndex > 0             ? $userRecords[ $currentTestIndex - 1 ] : 0;
+		my $nextTest = $currentTestIndex < $#userRecords ? $userRecords[ $currentTestIndex + 1 ] : 0;
 
-		print CGI::p(CGI::submit({
-					name => 'action',
-					value => $r->maketext('Show Past Answers'),
-					class => 'btn btn-primary'
-				})), "\n";
-
-		print CGI::end_form();
-	}
-
-	# prints the achievement message if there is one
-	#If achievements enabled, and if we are not in a try it page, check to see if there are new ones.and print them.
-	#Gateways are special.  We only provide the first problem just to seed the data, but all of the problems from the
-	#gateway will be provided to the achievement evaluator
-	if ($ce->{achievementsEnabled} && $will{recordAnswers} && $submitAnswers && $set->set_id ne 'Undefined_Set') {
-		print  WeBWorK::AchievementEvaluator::checkForAchievements($problems[0],
-			$pg_results[0], $r, setVersion=>$versionNumber);
+		# Mark the current test.
+		$userRecords[$currentTestIndex]{currentTest} = 1;
 
+		# Show the student nav.
+		return $c->include(
+			'ContentGenerator/GatewayQuiz/nav',
+			userRecords      => \@userRecords,
+			setVersion       => $setVersion,
+			prevTest         => $prevTest,
+			nextTest         => $nextTest,
+			currentTestIndex => $currentTestIndex,
+			filters          => \%filters,
+			filter           => $filter
+		);
 	}
-
-	return "";
 }
 
+sub warningMessage ($c) {
+	return $c->maketext('<strong>Warning</strong>: There may be something wrong with a question in this test. '
+			. 'Please inform your instructor including the warning messages below.');
+}
 
-###########################################################################
-# Evaluation utilities
-############################################################################
-
-sub getProblemHTML {
-	my ($self, $EffectiveUser, $set, $formFields,
-		$mergedProblem, $pgFile) = @_;
-	# in:  $EffectiveUser is the effective user we're working as, $set is the
-	#      merged set version, %$formFields the form fields from the input form
-	#      that we need to worry about putting into the HTML we're generating,
-	#      and $mergedProblem and $pgFile are what we'd expect.
-	#      $pgFile is optional
-	# out: the translated problem is returned
-
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $key =  $r->param('key');
-	my $setName = $set->set_id;
+# Evaluation utility
+# $effectiveUser is the current effective user, $set is the merged set version, $formFields is a reference to the
+# hash of parameters from the input form that need to be passed to the translator, and $mergedProblem
+# is what we'd expect.
+async sub getProblemHTML ($c, $effectiveUser, $set, $formFields, $mergedProblem) {
+	my $setID            = $set->set_id;
 	my $setVersionNumber = $set->version_id;
-	my $permissionLevel = $self->{permissionLevel};
-	my $psvn = $set->psvn();
 
-	if (defined($mergedProblem) && $mergedProblem->problem_id) {
-		# nothing needs to be done
-	} elsif ($pgFile) {
-		$mergedProblem = WeBWorK::DB::Record::ProblemVersion->new(
-			set_id => $setName,
-			version_id => $setVersionNumber,
-			problem_id => 0,
-			login_id => $EffectiveUser->user_id,
-			source_file => $pgFile,
-			# the rest of Problem's fields are not needed, i think
-		);
-	}
-	# figure out if we're allowed to get solutions and call PG->new accordingly.
-	my $showCorrectAnswers = $self->{will}->{showCorrectAnswers};
-	my $showHints          = $self->{will}->{showHints};
-	my $showSolutions      = $self->{will}->{showSolutions};
-	my $processAnswers     = $self->{will}->{checkAnswers};
+	# Figure out solutions are allowed and call renderPG accordingly.
+	my $showCorrectAnswers = $c->{will}{showCorrectAnswers};
+	my $showHints          = $c->{will}{showHints};
+	my $showSolutions      = $c->{will}{showSolutions};
+	my $processAnswers     = $c->{will}{checkAnswers};
 
-	# FIXME  I'm not sure that problem_id is what we want here  FIXME
+	# FIXME: I'm not sure that problem_id is what we want here.
 	my $problemNumber = $mergedProblem->problem_id;
 
-	my $pg = WeBWorK::PG->new(
-		$ce,
-		$EffectiveUser,
-		$key,
+	my $pg = await renderPG(
+		$c,
+		$effectiveUser,
 		$set,
 		$mergedProblem,
-		$psvn,
+		$set->psvn,
 		$formFields,
-		{    # translation options
-			displayMode     => $self->{displayMode},
-			showHints       => $showHints,
-			showSolutions   => $showSolutions,
-			refreshMath2img => $showHints || $showSolutions,
-			processAnswers  => 1,
-			QUIZ_PREFIX     => 'Q' . sprintf("%04d", $problemNumber) . '_',
-			useMathQuill    => $self->{will}{useMathQuill},
-			useMathView     => $self->{will}{useMathView},
-			useWirisEditor  => $self->{will}{useWirisEditor},
+		{
+			displayMode        => $c->{displayMode},
+			showHints          => $showHints,
+			showSolutions      => $showSolutions,
+			refreshMath2img    => $showHints || $showSolutions,
+			processAnswers     => 1,
+			QUIZ_PREFIX        => 'Q' . sprintf('%04d', $problemNumber) . '_',
+			useMathQuill       => $c->{will}{useMathQuill},
+			useMathView        => $c->{will}{useMathView},
+			forceScaffoldsOpen => 1,
+			isInstructor       => $c->authz->hasPermissions($c->{userID}, 'view_answers'),
+			debuggingOptions   => getTranslatorDebuggingOptions($c->authz, $c->{userID})
 		},
 	);
 
+	# Warnings in the renderPG subprocess will not be caught by the global warning handler of this process.
+	# So rewarn them and let the global warning handler take care of it.
+	warn $pg->{warnings} if $pg->{warnings};
 
-	# FIXME  is problem_id the correct thing in the following two stanzas?
-	# FIXME  the original version had "problem number", which is what we want.
-	# FIXME  I think problem_id will work, too
-	if ($pg->{warnings} ne "") {
-		push @{$self->{warnings}}, {
-			set     => "$setName,v$setVersionNumber",
-			problem => $mergedProblem->problem_id,
-			message => $pg->{warnings},
-		};
-	}
-
-	if ($pg->{flags}->{error_flag}) {
-		push @{$self->{errors}}, {
-			set     => "$setName,v$setVersionNumber",
-			problem => $mergedProblem->problem_id,
-			message => $pg->{errors},
-			context => $pg->{body_text},
-		};
-		# if there was an error, body_text contains
-		# the error context, not TeX code
-		$pg->{body_text} = undef;
-	}
-
-	return    $pg;
-}
-
-sub output_JS {
-	my $self = shift;
-	my $ce   = $self->r->ce;
-
-	# Add CSS files requested by problems via ADD_CSS_FILE() in the PG file
-	# or via a setting of $ce->{pg}{specialPGEnvironmentVars}{extra_css_files}
-	# which can be set in course.conf (the value should be an anonomous array).
-	my @cssFiles;
-	if (ref($ce->{pg}{specialPGEnvironmentVars}{extra_css_files}) eq 'ARRAY') {
-		push(@cssFiles, { file => $_, external => 0 }) for @{ $ce->{pg}{specialPGEnvironmentVars}{extra_css_files} };
-	}
-	for my $pg (@{ $self->{ra_pg_results} }) {
-		next unless ref($pg);
-		if (ref($pg->{flags}{extra_css_files}) eq 'ARRAY') {
-			push @cssFiles, @{ $pg->{flags}{extra_css_files} };
-		}
-	}
-	my %cssFilesAdded;    # Used to avoid duplicates
-	for (@cssFiles) {
-		next if $cssFilesAdded{ $_->{file} };
-		$cssFilesAdded{ $_->{file} } = 1;
-		if ($_->{external}) {
-			print CGI::Link({ rel => 'stylesheet', href => $_->{file} });
-		} else {
-			print CGI::Link({ rel => 'stylesheet', href => getAssetURL($ce, $_->{file}) });
-		}
-	}
-
-	# This is for the problem grader
-	if ($self->{will}{showProblemGrader}) {
-		print CGI::script(
+	if ($pg->{flags}{error_flag}) {
+		push @{ $c->{errors} },
 			{
-				src   => getAssetURL($ce, 'js/apps/ProblemGrader/problemgrader.js'),
-				defer => undef
-			},
-			''
-		);
-	}
-
-	#This is for page specfific js
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/GatewayQuiz/gateway.js'), defer => undef }, '');
-
-	# Add JS files requested by problems via ADD_JS_FILE() in the PG file.
-	my %jsFiles;
-	for my $pg (@{ $self->{ra_pg_results} }) {
-		next unless ref($pg);
-		if (ref($pg->{flags}{extra_js_files}) eq 'ARRAY') {
-			for (@{ $pg->{flags}{extra_js_files} }) {
-				next if $jsFiles{ $_->{file} };
-				$jsFiles{ $_->{file} } = 1;
-
-				my %attributes = ref($_->{attributes}) eq 'HASH' ? %{ $_->{attributes} } : ();
-				if ($_->{external}) {
-					print CGI::script({ src => $_->{file}, %attributes }, '');
-				} else {
-					print CGI::script({ src => getAssetURL($ce, $_->{file}), %attributes }, '');
-				}
-			}
-		}
+				set     => "$setID,v$setVersionNumber",
+				problem => $mergedProblem->problem_id,
+				message => $pg->{errors},
+				context => $pg->{body_text},
+			};
+		$pg->{body_text} = undef;
 	}
 
-	return '';
-}
-
-sub output_achievement_CSS {
-	return "";
+	return $pg;
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Grades.pm b/lib/WeBWorK/ContentGenerator/Grades.pm
index ceed131a67..40d200a3e9 100644
--- a/lib/WeBWorK/ContentGenerator/Grades.pm
+++ b/lib/WeBWorK/ContentGenerator/Grades.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,86 +14,37 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Grades;
-use base qw(WeBWorK::ContentGenerator);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
-WeBWorK::ContentGenerator::Instructor::Stats - Display statistics by user or
-problem set.
+WeBWorK::ContentGenerator::Grades - Display statistics by user.
 
 =cut
 
-use strict;
-use warnings;
-
-use WeBWorK::CGI;
-use WeBWorK::Debug;
 use WeBWorK::Utils qw(jitar_id_to_seq wwRound after grade_set format_set_name_display);
 use WeBWorK::Localize;
 
-sub initialize {
-	my $self = shift;
-	my $r    = $self->r;
-
-	$self->{userName}    = $r->param('user');
-	$self->{studentName} = defined $r->param('effectiveUser') ? $r->param('effectiveUser') : $self->{userName};
-}
-
-sub body {
-	my $self = shift;
-
-	$self->displayStudentStats($self->{studentName});
-
-	print $self->scoring_info;
-
-	return '';
-}
-
-# Borrowed from SendMail.pm and Instructor.pm
-sub getRecord {
-	my $self      = shift;
-	my $line      = shift;
-	my $delimiter = shift // ',';
-
-	# Takes a delimited line as a parameter and returns an
-	# array.  Note that all white space is removed.  If the
-	# last field is empty, the last element of the returned
-	# array is also empty (unlike what the perl split command
-	# would return).  E.G. @lineArray=&getRecord(\$delimitedLine).
-
-	my (@lineArray);
-
-	# Add $delimiter to end of line so that last field is never empty
-	$line .= $delimiter;
-
-	@lineArray = split(/\s*${delimiter}\s*/, $line);
-	$lineArray[0] =~ s/^\s*// if defined($lineArray[0]);    # Remove white space from first element
-	@lineArray;
+sub initialize ($c) {
+	$c->{studentID} = $c->param('effectiveUser') // $c->param('user');
+	return;
 }
 
-sub scoring_info {
-	my ($self) = @_;
-	my $r      = $self->r;
-	my $db     = $r->db;
-	my $ce     = $r->ce;
+sub scoring_info ($c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
 
-	my $userName = $r->param('effectiveUser') || $r->param('user');
-	my $userID   = $r->param('user');
+	my $user = $db->getUser($c->{studentID});
+	return '' unless $user;
 
-	my $ur = $db->getUser($userName);
-	return unless ($ur);
-
-	my $emailDirectory   = $ce->{courseDirs}->{email};
-	my $message_file     = 'report_grades.msg';
-	my $filePath         = "$emailDirectory/$message_file";
-	my $merge_file       = "report_grades_data.csv";
-	my $delimiter        = ',';
-	my $scoringDirectory = $ce->{courseDirs}->{scoring};
+	my $message_file = 'report_grades.msg';
+	my $filePath     = "$ce->{courseDirs}{email}/$message_file";
+	my $merge_file   = "report_grades_data.csv";
 
 	# Return if the files don't exist.
-	if (!(-e "$scoringDirectory/$merge_file" && -e "$filePath")) {
-		if ($r->authz->hasPermissions($userID, 'access_instructor_tools')) {
-			return $r->maketext(
+	if (!(-e "$ce->{courseDirs}{scoring}/$merge_file" && -e "$filePath")) {
+		if ($c->authz->hasPermissions($c->param('user'), 'access_instructor_tools')) {
+			return $c->maketext(
 				'There is no additional grade information.  A message about additional grades can go in '
 					. '~[TMPL~]/email/[_1]. It is merged with the file ~[Scoring~]/[_2]. These files can be '
 					. 'edited using the "Email" link and the "File Manager" link in the left margin.',
@@ -104,37 +55,37 @@ sub scoring_info {
 		}
 	}
 
-	my $rh_merge_data = $self->read_scoring_file($merge_file, $delimiter);
+	my $rh_merge_data = $c->read_scoring_file($merge_file);
 	my $text;
 	my $header = '';
-	local (*FILE);
 	if (-e $filePath and -r $filePath) {
-		open FILE, '<:encoding(UTF-8)', $filePath || return ("Can't open $filePath");
-		while ($header !~ s/Message:\s*$//m and not eof(FILE)) {
-			$header .= <FILE>;
+		open my $FILE, '<:encoding(UTF-8)', $filePath or return "Can't open $filePath";
+		while ($header !~ s/Message:\s*$//m && !eof($FILE)) {
+			$header .= <$FILE>;
 		}
+		$text = join('', <$FILE>);
+		close($FILE);
 	} else {
-		return ("There is no additional grade information. <br> The message file $filePath cannot be found.");
+		return r->c('There is no additional grade information.',
+			$c->tag('br'), "The message file $filePath cannot be found.")->join('');
 	}
-	$text = join('', <FILE>);
-	close(FILE);
 
-	my $status_name = $ce->status_abbrev_to_name($ur->status);
-	$status_name = $ur->status unless defined $status_name;
+	my $status_name = $ce->status_abbrev_to_name($user->status);
+	$status_name = $user->status unless defined $status_name;
 
-	my $SID        = $ur->student_id;
-	my $FN         = $ur->first_name;
-	my $LN         = $ur->last_name;
-	my $SECTION    = $ur->section;
-	my $RECITATION = $ur->recitation;
+	my $SID        = $user->student_id;
+	my $FN         = $user->first_name;
+	my $LN         = $user->last_name;
+	my $SECTION    = $user->section;
+	my $RECITATION = $user->recitation;
 	my $STATUS     = $status_name;
-	my $EMAIL      = $ur->email_address;
-	my $LOGIN      = $ur->user_id;
-	my @COL        = defined($rh_merge_data->{$SID}) ? @{ $rh_merge_data->{$SID} } : ();
-	unshift(@COL, '');    ## this makes COL[1] the first column
+	my $EMAIL      = $user->email_address;
+	my $LOGIN      = $user->user_id;
+	my @COL        = ref $rh_merge_data->{$SID} eq 'ARRAY' ? @{ $rh_merge_data->{$SID} } : ();
+	unshift(@COL, '');    # This makes COL[1] the first column
 
 	my $endCol = @COL;
-	# for safety, only evaluate special variables
+	# For safety, only evaluate special variables.
 	my $msg = $text;
 	$msg =~ s/(\$PAR)/<p>/g;
 	$msg =~ s/(\$BR)/<br>/g;
@@ -148,47 +99,55 @@ sub scoring_info {
 	$msg =~ s/\$EMAIL/$EMAIL/g;
 	$msg =~ s/\$LOGIN/$LOGIN/g;
 
-	if (defined($COL[1])) {    # prevents extraneous error messages.
+	if (defined $COL[1]) {
 		$msg =~ s/\$COL\[(\-?\d+)\]/$COL[$1]/g;
-	} else {                   # prevents extraneous $COL's in email message
+	} else {
+		# Prevents extraneous $COL's in email message
 		$msg =~ s/\$COL\[(\-?\d+)\]//g;
 	}
 
 	$msg =~ s/\r//g;
 	$msg =~ s/\n/<br>/g;
 
-	$msg = CGI::div({ class => 'additional-scoring-msg card bg-light p-2' },
-		CGI::h3($r->maketext('Scoring Message')), $msg);
-
-	$msg .= CGI::div($r->maketext(
-		'This scoring message is generated from ~[TMPL~]/email/[_1]. It is merged with the file ~[Scoring~]/[_2]. '
-			. 'These files can be edited using the "Email" link and the "File Manager" link in the left margin.',
-		$message_file,
-		$merge_file
-	))
-		if ($r->authz->hasPermissions($userID, 'access_instructor_tools'));
+	my $output = $c->c($c->tag(
+		'div',
+		class => 'additional-scoring-msg card bg-light p-2',
+		$c->c($c->tag('h3', $c->maketext('Scoring Message')), $msg)->join('')
+	));
+
+	push(
+		@$output,
+		$c->tag(
+			'div',
+			class => 'mt-2',
+			$c->maketext(
+				'This scoring message is generated from ~[TMPL~]/email/[_1]. It is merged with the file '
+					. '~[Scoring~]/[_2]. These files can be edited using the "Email" link and the "File Manager" '
+					. 'link in the left margin.',
+				$message_file,
+				$merge_file
+			)
+		)
+	) if $c->authz->hasPermissions($c->param('user'), 'access_instructor_tools');
 
-	return $msg;
+	return $output->join('');
 }
 
-sub displayStudentStats {
-	my ($self, $studentName) = @_;
-	my $r     = $self->r;
-	my $db    = $r->db;
-	my $ce    = $r->ce;
-	my $authz = $r->authz;
+sub displayStudentStats ($c, $studentID) {
+	my $db    = $c->db;
+	my $ce    = $c->ce;
+	my $authz = $c->authz;
 
-	my $studentRecord = $db->getUser($studentName);
+	my $studentRecord = $db->getUser($studentID);
 	unless ($studentRecord) {
-		$self->addbadmessage($r->maketext('Record for user [_1] not found.', $studentName));
-		return;
+		$c->addbadmessage($c->maketext('Record for user [_1] not found.', $studentID));
+		return '';
 	}
 
 	my $courseName = $ce->{courseName};
-	my $root       = $ce->{webworkURLs}{root};
 
 	# First get all merged sets for this user ordered by set_id.
-	my @sets = $db->getMergedSetsWhere({ user_id => $studentName }, 'set_id');
+	my @sets = $db->getMergedSetsWhere({ user_id => $studentID }, 'set_id');
 	# To be able to find the set objects later, make a handy hash of set ids to set objects.
 	my %setsByID = (map { $_->set_id => $_ } @sets);
 
@@ -196,6 +155,9 @@ sub displayStudentStats {
 	my %setVersionsCount;
 	my @allSetIDs;
 	for my $set (@sets) {
+		# Don't show hidden sets unless user has appropriate permissions.
+		next unless ($set->visible || $authz->hasPermissions($c->param('user'), 'view_hidden_sets'));
+
 		my $setID = $set->set_id();
 
 		# FIXME: Here, as in many other locations, we assume that there is a one-to-one matching between versioned sets
@@ -205,7 +167,7 @@ sub displayStudentStats {
 			# We have to have the merged set versions to know what each of their assignment types are
 			# (because proctoring can change this).
 			my @setVersions =
-				$db->getMergedSetVersionsWhere({ user_id => $studentName, set_id => { like => "$setID,v\%" } });
+				$db->getMergedSetVersionsWhere({ user_id => $studentID, set_id => { like => "$setID,v\%" } });
 
 			# Add the set versions to our list of sets.
 			$setsByID{ $_->set_id . ',v' . $_->version_id } = $_ for (@setVersions);
@@ -224,12 +186,7 @@ sub displayStudentStats {
 
 	my $fullName      = join(' ', $studentRecord->first_name, $studentRecord->last_name);
 	my $effectiveUser = $studentRecord->user_id();
-	my $act_as_student_url =
-		"$root/$courseName/?user=" . $r->param('user') . "&effectiveUser=$effectiveUser&key=" . $r->param('key');
-
-	print CGI::h2($fullName);
 
-	my @rows;
 	my $max_problems     = 0;
 	my $courseTotal      = 0;
 	my $courseTotalRight = 0;
@@ -248,79 +205,127 @@ sub displayStudentStats {
 			# For other sets we just count the number of problems.
 			$num_of_problems = $db->countGlobalProblems($setID);
 		}
-		$max_problems = $max_problems < $num_of_problems ? $num_of_problems : $max_problems;
+		$max_problems =
+			$set && after($set->open_date) && $max_problems < $num_of_problems ? $num_of_problems : $max_problems;
 	}
 
 	# Variables to help compute gateway scores.
 	my $numGatewayVersions = 0;
 	my $bestGatewayScore   = 0;
 
+	my $rows = $c->c;
 	for my $setID (@allSetIDs) {
 		my $act_as_student_set_url =
-			"$root/$courseName/$setID/?user="
-			. $r->param('user')
-			. "&effectiveUser=$effectiveUser&key="
-			. $r->param('key');
+			$c->systemLink($c->url_for('problem_list', setID => $setID), params => { effectiveUser => $effectiveUser });
 		my $set = $setsByID{$setID};
 
+		# Determine if set is a test and create the test url.
+		my $setIsVersioned          = 0;
+		my $act_as_student_test_url = '';
+		if (defined $set->assignment_type && $set->assignment_type =~ /gateway/) {
+			$setIsVersioned = 1;
+			if ($set->assignment_type eq 'proctored_gateway') {
+				$act_as_student_test_url = $act_as_student_set_url =~ s/($courseName)\//$1\/proctored_test_mode\//r;
+			} else {
+				$act_as_student_test_url = $act_as_student_set_url =~ s/($courseName)\//$1\/test_mode\//r;
+			}
+			# Remove version from set url
+			$act_as_student_set_url =~ s/,v\d+//;
+		}
+
+		# Format set name based on set visibility.
+		my $setName = $c->tag(
+			'span',
+			class => $set->visible ? 'font-visible' : 'font-hidden',
+			format_set_name_display($setID =~ s/,v\d+$//r)
+		);
+
 		# If the set is a template gateway set and there are no versions, we acknowledge that the set exists and the
 		# student hasn't attempted it. Otherwise, we skip it and let the versions speak for themselves.
 		if (defined $setVersionsCount{$setID}) {
 			next if $setVersionsCount{$setID};
-			push @rows,
-				CGI::Tr(
-					CGI::td({ dir => 'ltr' }, format_set_name_display($setID)),
-					CGI::td(
-						{ colspan => $max_problems + 3 },
-						CGI::em($r->maketext('No versions of this assignment have been taken.'))
-					)
+			push @$rows,
+				$c->tag(
+					'tr',
+					$c->c(
+						$c->tag(
+							'th',
+							dir => 'ltr',
+							(after($set->open_date) || $authz->hasPermissions($c->param('user'), 'view_unopened_sets'))
+							? $c->link_to($setName => $act_as_student_set_url)
+							: $setName
+						),
+						$c->tag(
+							'td',
+							colspan => $max_problems + 3,
+							$c->tag(
+								'em',
+								after($set->open_date) ? $c->maketext('No versions of this test have been taken.')
+								: $c->maketext(
+									'Will open on [_1].',
+									$c->formatDateTime($set->open_date, undef, $ce->{studentDateDisplayFormat})
+								)
+							)
+						)
+				)->join('')
 				);
 			next;
 		}
 
 		# If the set has hide_score set, then we need to skip printing the score as well.
 		if (
-			defined $set->hide_score
+			defined $set->assignment_type
+			&& $set->assignment_type =~ /gateway/
+			&& defined $set->hide_score
 			&& (
-				!$authz->hasPermissions($r->param('user'), 'view_hidden_work')
+				!$authz->hasPermissions($c->param('user'), 'view_hidden_work')
 				&& ($set->hide_score eq 'Y' || ($set->hide_score eq 'BeforeAnswerDate' && time < $set->answer_date))
 			)
 			)
 		{
-			push(
-				@rows,
-				CGI::Tr(
-					CGI::td({ dir => 'ltr' }, format_set_name_display($setID) . ' (version ' . $set->version_id . ')'),
-					CGI::td(
-						{ colspan => $max_problems + 3 },
-						CGI::em($r->maketext('Display of scores for this set is not allowed.'))
+			# Add a link to the test version if the problems can be seen.
+			my $thisSetName =
+				$c->link_to($setName => $act_as_student_set_url) . ' ('
+				. (
+					(
+						$set->hide_work eq 'N'
+						|| ($set->hide_work eq 'BeforeAnswerDate' && time >= $set->answer_date)
+						|| $authz->hasPermissions($c->param('user'), 'view_unopened_sets')
 					)
+					? $c->link_to($c->maketext('version [_1]', $set->version_id) => $act_as_student_test_url)
+					: $c->maketext('version [_1]', $set->version_id)
+				) . ')';
+			push(
+				@$rows,
+				$c->tag(
+					'tr',
+					$c->c(
+						$c->tag(
+							'th',
+							dir => 'ltr',
+							sub {$thisSetName}
+						),
+						$c->tag(
+							'td',
+							colspan => $max_problems + 3,
+							$c->tag('em', $c->maketext('Display of scores for this test is not allowed.'))
+						)
+					)->join('')
 				)
 			);
 			next;
 		}
 
-		# If its a gateway, adjust the act-as url.
-		my $setIsVersioned = 0;
-		if (defined $set->assignment_type && $set->assignment_type =~ /gateway/) {
-			$setIsVersioned = 1;
-			if ($set->assignment_type eq 'proctored_gateway') {
-				$act_as_student_set_url =~ s/($courseName)\//$1\/proctored_quiz_mode\//;
-			} else {
-				$act_as_student_set_url =~ s/($courseName)\//$1\/quiz_mode\//;
-			}
-		}
-
 		my ($totalRight, $total, $problem_scores, $problem_incorrect_attempts) =
-			grade_set($db, $set, $studentName, $setIsVersioned, 1);
+			grade_set($db, $set, $studentID, $setIsVersioned, 1);
 		$totalRight = wwRound(2, $totalRight);
 
-		my @cgi_prob_scores;
+		my @html_prob_scores;
 
 		my $show_problem_scores = 1;
 
 		if (defined $set->hide_score_by_problem
-			&& !$authz->hasPermissions($r->param('user'), 'view_hidden_work')
+			&& !$authz->hasPermissions($c->param('user'), 'view_hidden_work')
 			&& $set->hide_score_by_problem eq 'Y')
 		{
 			$show_problem_scores = 0;
@@ -328,17 +333,23 @@ sub displayStudentStats {
 
 		for (my $i = 0; $i < $max_problems; ++$i) {
 			my $score = defined $problem_scores->[$i] && $show_problem_scores ? $problem_scores->[$i] : '';
-			$cgi_prob_scores[$i] = CGI::td(
-				{ class => 'problem-data' },
-				CGI::span(
-					{ class => $score eq '100' ? 'correct' : $score eq '&nbsp;.&nbsp;' ? 'unattempted' : '' },
-					$score)
-					. CGI::br()
-					. (
+			push(
+				@html_prob_scores,
+				$c->tag(
+					'td',
+					class => 'problem-data',
+					$c->c(
+						$c->tag(
+							'span',
+							class => $score eq '100' ? 'correct' : $score eq '&nbsp;.&nbsp;' ? 'unattempted' : '',
+							$c->b($score)
+						),
+						$c->tag('br'),
 						(defined $problem_incorrect_attempts->[$i] && $show_problem_scores)
 						? $problem_incorrect_attempts->[$i]
-						: '&nbsp;'
-					)
+						: $c->b('&nbsp;')
+					)->join('')
+				)
 			);
 		}
 
@@ -354,14 +365,13 @@ sub displayStudentStats {
 		# If its a gateway set, then in order to mimic the scoring done in Scoring Tools we need to use the best score a
 		# student had.  Otherwise we just add the set to the running course total.
 		if ($setIsVersioned) {
-			# Prettify versioned set display
-			$setID =~ s/(.+),v(\d+)$/${1} (version $2)/;
+			$setID =~ /(.+),v(\d+)$/;
 			my $gatewayName    = $1;
 			my $currentVersion = $2;
 
 			# If we are just starting a new gateway then set variables to look for the max.
 			if ($currentVersion == 1) {
-				$numGatewayVersions = $db->countSetVersions($studentName, $gatewayName);
+				$numGatewayVersions = $db->countSetVersions($studentID, $gatewayName);
 			}
 
 			if ($totalRight > $bestGatewayScore) {
@@ -383,54 +393,71 @@ sub displayStudentStats {
 			}
 		}
 
-		push @rows, CGI::Tr(
-			CGI::th(
-				{ scope => 'row', dir => 'ltr' },
-				CGI::a({ href => $act_as_student_set_url }, format_set_name_display($setID))
-			),
-			CGI::td(CGI::span({ class => $class }, $totalRightPercent . '%')),
-			CGI::td(sprintf('%0.2f', $totalRight)),    # score
-			CGI::td($total),                           # out of
-			@cgi_prob_scores                           # problems
-		);
+		# Only show scores for open sets, and don't link to non open sets.
+		if (after($set->open_date) || $authz->hasPermissions($c->param('user'), 'view_unopened_sets')) {
+			# Set the set name and link. If a test, don't link to the version unless the problems can be seen.
+			my $thisSetName = $setIsVersioned
+				? $c->link_to($setName => $act_as_student_set_url) . ' ('
+				. (
+					(
+						$set->hide_work eq 'N'
+						|| ($set->hide_work eq 'BeforeAnswerDate' && time >= $set->answer_date)
+						|| $authz->hasPermissions($c->param('user'), 'view_unopened_sets')
+					)
+					? $c->link_to($c->maketext('version [_1]', $set->version_id) => $act_as_student_test_url)
+					: $c->maketext('version [_1]', $set->version_id)
+				)
+				. ')'
+				: $c->link_to($setName => $act_as_student_set_url);
+			push @$rows, $c->tag(
+				'tr',
+				$c->c(
+					$c->tag(
+						'th',
+						scope => 'row',
+						dir   => 'ltr',
+						sub {$thisSetName}
+					),
+					$c->tag('td', $c->tag('span', class => $class, $totalRightPercent . '%')),
+					$c->tag('td', sprintf('%0.2f', $totalRight)),                                # score
+					$c->tag('td', $total),                                                       # out of
+					@html_prob_scores                                                            # problems
+				)->join('')
+			);
+		} else {
+			push @$rows,
+				$c->tag(
+					'tr',
+					$c->c(
+						$c->tag(
+							'th',
+							dir => 'ltr',
+							$setName
+						),
+						$c->tag(
+							'td',
+							colspan => $max_problems + 3,
+							$c->tag(
+								'em',
+								$c->maketext(
+									'Will open on [_1].',
+									$c->formatDateTime($set->open_date, undef, $ce->{studentDateDisplayFormat})
+								)
+							)
+						)
+				)->join('')
+				);
+		}
 	}
 
-	# Print table
-	print CGI::start_div({ class => 'table-responsive' });
-	print CGI::start_table({ class => 'grade-table table table-bordered table-sm font-xs', id => 'grades_table' });
-	print CGI::Tr(
-		CGI::th({ rowspan => 2,             scope => 'col' }, $r->maketext('Set')),
-		CGI::th({ rowspan => 2,             scope => 'col' }, $r->maketext('Percent')),
-		CGI::th({ rowspan => 2,             scope => 'col' }, $r->maketext('Score')),
-		CGI::th({ rowspan => 2,             scope => 'col' }, $r->maketext('Out Of')),
-		CGI::th({ colspan => $max_problems, scope => 'col' }, $r->maketext('Problems'))
+	return $c->include(
+		'ContentGenerator/Grades/student_stats',
+		fullName         => $fullName,
+		max_problems     => $max_problems,
+		rows             => $rows->join(''),
+		courseTotal      => $courseTotal,
+		courseTotalRight => $courseTotalRight
 	);
-	print CGI::Tr(map { CGI::th({ scope => 'col', class => 'problem-data' }, $_) } 1 .. $max_problems);
-
-	print @rows;
-
-	# Compute the percentage correct.
-	my $totalRightPercent = 100 * wwRound(2, $courseTotal ? $courseTotalRight / $courseTotal : 0);
-
-	if ($ce->{showCourseHomeworkTotals}) {
-		print CGI::Tr(
-			{ class => 'grades-course-total' },
-			CGI::th({ scope => 'row' }, $r->maketext('Homework Totals')),
-			CGI::td(CGI::span(
-				{
-					class => $totalRightPercent == 0 ? 'unattempted' : $totalRightPercent == 100 ? 'correct' : ''
-				},
-				$totalRightPercent . '%'
-			)),
-			CGI::td($courseTotalRight),
-			CGI::td($courseTotal),
-			CGI::td({ colspan => $max_problems }, '&nbsp;')
-		);
-	}
-
-	print CGI::end_table(), CGI::end_div();
-
-	return '';
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Hardcopy.pm b/lib/WeBWorK/ContentGenerator/Hardcopy.pm
index 55c9c40610..08764a3c48 100644
--- a/lib/WeBWorK/ContentGenerator/Hardcopy.pm
+++ b/lib/WeBWorK/ContentGenerator/Hardcopy.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Hardcopy;
-use base qw(WeBWorK::ContentGenerator);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures, -async_await;
 
 =head1 NAME
 
@@ -23,23 +23,16 @@ problem sets.
 
 =cut
 
-use strict;
-use warnings;
-
-#use Apache::Constants qw/:common REDIRECT/;
-#use CGI qw(-nosticky );
-use WeBWorK::CGI;
-
 use File::Path;
 use File::Temp qw/tempdir/;
 use String::ShellQuote;
 use Archive::Zip qw(:ERROR_CODES);
+use XML::LibXML;
+
 use WeBWorK::DB::Utils qw/user2global/;
-use WeBWorK::Debug;
-use WeBWorK::Form;
-use WeBWorK::HTML::ScrollingRecordList qw/scrollingRecordList/;
 use WeBWorK::PG;
-use WeBWorK::Utils qw/readFile decodeAnswers jitar_id_to_seq is_restricted after x format_set_name_display/;
+use WeBWorK::Utils qw/readFile decodeAnswers jitar_id_to_seq is_restricted after x/;
+use WeBWorK::Utils::Rendering qw(renderPG);
 use PGrandom;
 
 =head1 CONFIGURATION VARIABLES
@@ -52,20 +45,20 @@ If true, don't delete temporary files.
 
 =cut
 
-our $PreserveTempFiles = 0 unless defined $PreserveTempFiles;
+our $PreserveTempFiles = $PreserveTempFiles // 0;
 
 =back
 
 =cut
 
-our $HC_DEFAULT_FORMAT = "pdf"; # problems if this is not an allowed format for the user...
-our %HC_FORMATS = (
+our $HC_DEFAULT_FORMAT = "pdf";    # problems if this is not an allowed format for the user...
+our %HC_FORMATS        = (
 	tex => { name => x("TeX Source"), subr => "generate_hardcopy_tex", file_type => 'application/zip' },
 	pdf => { name => x("Adobe PDF"),  subr => "generate_hardcopy_pdf", file_type => 'application/pdf' },
 );
 our @HC_FORMAT_DISPLAY_ORDER = ('tex', 'pdf');
 
-# custom fields used in $self hash
+# custom fields used in $c hash
 # FOR HEAVEN'S SAKE, PLEASE KEEP THIS UP-TO-DATE!
 #
 # file_path
@@ -85,8 +78,9 @@ our @HC_FORMAT_DISPLAY_ORDER = ('tex', 'pdf');
 #   Set by generate_hardcopy(), and used by pre_header_initialize(), used by body()
 #
 # hardcopy_errors
-#   reference to array containing HTML strings describing generation errors (and warnings)
-#   used by add_errors(), get_errors(), get_errors_ref()
+#   reference to an array of Mojo::ByteStream objects containing HTML strings
+#   describing generation errors (and warnings)
+#   used by add_error(), has_errors(), get_errors()
 #
 # at_least_one_problem_rendered_without_error
 #   set to a true value by write_problem_tex if it is able to sucessfully render
@@ -119,28 +113,26 @@ our @HC_FORMAT_DISPLAY_ORDER = ('tex', 'pdf');
 # UI subroutines
 ################################################################################
 
-sub pre_header_initialize {
-	my $self  = shift;
-	my $r     = $self->r;
-	my $ce    = $r->ce;
-	my $db    = $r->db;
-	my $authz = $r->authz;
+async sub pre_header_initialize ($c) {
+	my $ce    = $c->ce;
+	my $db    = $c->db;
+	my $authz = $c->authz;
 
-	my $userID            = $r->param('user');
-	my $eUserID           = $r->param('effectiveUser');
-	my @setIDs            = $r->param('selected_sets');
-	my @userIDs           = $r->param('selected_users');
-	my $hardcopy_format   = $r->param('hardcopy_format');
-	my $generate_hardcopy = $r->param('generate_hardcopy');
+	my $userID            = $c->param('user');
+	my $eUserID           = $c->param('effectiveUser');
+	my @setIDs            = $c->param('selected_sets');
+	my @userIDs           = $c->param('selected_users');
+	my $hardcopy_format   = $c->param('hardcopy_format');
+	my $generate_hardcopy = $c->param('generate_hardcopy');
 
 	# This should never happen, but apparently it did once (see bug #714), so we check for it.
 	die 'Parameter "user" not defined -- this should never happen' unless defined $userID;
 
 	# Check to see if the user is authorized to view source file paths.
-	$self->{can_show_source_file} =
+	$c->{can_show_source_file} =
 		($db->getPermissionLevel($userID)->permission >=
 			$ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_PERMISSION_LEVEL})
-		|| grep($_ eq $userID, @{ $ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} });
+		|| (grep { $_ eq $userID } @{ $ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} });
 
 	if ($generate_hardcopy) {
 		my $validation_failed = 0;
@@ -150,28 +142,28 @@ sub pre_header_initialize {
 
 		# Make sure the format is valid.
 		unless (grep { $_ eq $hardcopy_format } keys %HC_FORMATS) {
-			$self->addbadmessage("'$hardcopy_format' is not a valid hardcopy format.");
+			$c->addbadmessage(qq{"$hardcopy_format" is not a valid hardcopy format.});
 			$validation_failed = 1;
 		}
 
 		# Make sure we are allowed to generate hardcopy in this format.
 		unless ($authz->hasPermissions($userID, "download_hardcopy_format_$hardcopy_format")) {
-			$self->addbadmessage(
-				$r->maketext('You do not have permission to generate hardcopy in [_1] format.', $hardcopy_format));
+			$c->addbadmessage(
+				$c->maketext('You do not have permission to generate hardcopy in [_1] format.', $hardcopy_format));
 			$validation_failed = 1;
 		}
 
 		# Make sure we are allowed to use this hardcopy theme.
 		unless ($authz->hasPermissions($userID, 'download_hardcopy_change_theme')
-			|| !defined($r->param('hardcopy_theme')))
+			|| !defined($c->param('hardcopy_theme')))
 		{
-			$self->addbadmessage($r->maketext('You do not have permission to change the hardcopy theme.'));
+			$c->addbadmessage($c->maketext('You do not have permission to change the hardcopy theme.'));
 			$validation_failed = 1;
 		}
 
 		# Is there at least one user selected?
 		unless (@userIDs) {
-			$self->addbadmessage($r->maketext('Please select at least one user and try again.'));
+			$c->addbadmessage($c->maketext('Please select at least one user and try again.'));
 			$validation_failed = 1;
 		}
 
@@ -180,7 +172,7 @@ sub pre_header_initialize {
 		# When professors don't select any sets the size of @setIDs is 0.
 		# The following test catches both cases and prevents warning messages in the case of a professor's empty array.
 		unless (@setIDs && $setIDs[0] =~ /\S+/) {
-			$self->addbadmessage($r->maketext('Please select at least one set and try again.'));
+			$c->addbadmessage($c->maketext('Please select at least one set and try again.'));
 			$validation_failed = 1;
 		}
 
@@ -193,18 +185,18 @@ sub pre_header_initialize {
 
 		my $perm_viewunopened = $authz->hasPermissions($userID, 'view_unopened_sets');
 
-		if (@setIDs > 1 and not $perm_multiset) {
-			$self->addbadmessage('You are not permitted to generate hardcopy for multiple sets. '
+		if (@setIDs > 1 && !$perm_multiset) {
+			$c->addbadmessage('You are not permitted to generate hardcopy for multiple sets. '
 					. 'Please select a single set and try again.');
 			$validation_failed = 1;
 		}
-		if (@userIDs > 1 and not $perm_multiuser) {
-			$self->addbadmessage('You are not permitted to generate hardcopy for multiple users. '
+		if (@userIDs > 1 && !$perm_multiuser) {
+			$c->addbadmessage('You are not permitted to generate hardcopy for multiple users. '
 					. 'Please select a single user and try again.');
 			$validation_failed = 1;
 		}
-		if (@userIDs and $userIDs[0] ne $eUserID and not $perm_multiuser) {
-			$self->addbadmessage('You are not permitted to generate hardcopy for other users.');
+		if (@userIDs && $userIDs[0] ne $eUserID && !$perm_multiuser) {
+			$c->addbadmessage('You are not permitted to generate hardcopy for other users.');
 			$validation_failed = 1;
 			# FIXME: Download_hardcopy_multiuser controls both whether a user can generate hardcopy
 			# that contains sets for multiple users AND whether the user can generate hardcopy that contains
@@ -241,8 +233,8 @@ sub pre_header_initialize {
 							)
 						{
 							$validation_failed = 1;
-							$self->addbadmessage(
-								$r->maketext('You are not permitted to generate a hardcopy for an unopened set.'));
+							$c->addbadmessage(
+								$c->maketext('You are not permitted to generate a hardcopy for an unopened set.'));
 							last;
 
 						}
@@ -255,8 +247,8 @@ sub pre_header_initialize {
 							)
 						{
 							$validation_failed = 1;
-							$self->addbadmessage(
-								$r->maketext(
+							$c->addbadmessage(
+								$c->maketext(
 									'You are not permitted to generate a hardcopy for a set with hidden work.')
 							);
 							last;
@@ -264,9 +256,9 @@ sub pre_header_initialize {
 
 						if ($authz->invalidIPAddress($userSet)) {
 							$validation_failed = 1;
-							$self->addbadmessage($r->maketext(
+							$c->addbadmessage($c->maketext(
 								'You are not allowed to generate a hardcopy for [_1] from your IP address, [_2].',
-								$userSet->set_id, $r->connection->remote_ip
+								$userSet->set_id, $c->tx->remote_address
 							));
 							last;
 						}
@@ -281,35 +273,35 @@ sub pre_header_initialize {
 		}
 
 		unless ($validation_failed) {
-			$self->{canShowScore} = \%canShowScore;
-			$self->{mergedSets}   = \%mergedSets;
-			my $result = $self->generate_hardcopy($hardcopy_format, \@userIDs, \@setIDs);
-			if ($self->get_errors) {
+			$c->{canShowScore} = \%canShowScore;
+			$c->{mergedSets}   = \%mergedSets;
+			my $result = await $c->generate_hardcopy($hardcopy_format, \@userIDs, \@setIDs);
+			if ($c->has_errors) {
 				# Store the result data in self hash so that body() can make a link to it.
-				$self->{file_path}     = $result->{file_path};
-				$self->{temp_file_map} = $result->{temp_file_map};
+				$c->{file_path}     = $result->{file_path};
+				$c->{temp_file_map} = $result->{temp_file_map};
 			} else {
 				# Send the file only (it is deleted from the server after it is sent).
-				$self->reply_with_file($result->{file_type}, $result->{file_path}, $result->{file_name}, 1);
+				$c->reply_with_file($result->{file_type}, $result->{file_path}, $result->{file_name}, 1);
 			}
 		}
 
 		return;
 	}
 
-	my $tempFile = $r->param('tempFilePath');
+	my $tempFile = $c->param('tempFilePath');
 	if ($tempFile) {
-		my $courseID = $r->urlpath->arg('courseID');
-		my $baseName = $tempFile =~ s/.*\/([^\/]*)$/$1/r;
+		my $courseID     = $c->stash('courseID');
+		my $baseName     = $tempFile =~ s/.*\/([^\/]*)$/$1/r;
 		my $fullFilePath = "$ce->{webworkDirs}{tmp}/$courseID/hardcopy/$userID/$tempFile";
 
 		unless (-e $fullFilePath) {
-			$self->addbadmessage($r->maketext('The requested file "[_1]" does not exist on the server.', $tempFile));
+			$c->addbadmessage($c->maketext('The requested file "[_1]" does not exist on the server.', $tempFile));
 			return;
 		}
 
 		unless ($baseName =~ /\.$userID\./ || $authz->hasPermissions($userID, 'download_hardcopy_multiuser')) {
-			$self->addbadmessage($r->maketext('You do not have permission to access the requested file "[_1]".'),
+			$c->addbadmessage($c->maketext('You do not have permission to access the requested file "[_1]".'),
 				$tempFile);
 			return;
 		}
@@ -320,123 +312,43 @@ sub pre_header_initialize {
 		$type = 'application/pdf' if $baseName =~ m/\.pdf/;
 		$type = 'application/zip' if $baseName =~ m/\.zip/;
 
-		$self->reply_with_file($type, $fullFilePath, $baseName);
+		$c->reply_with_file($type, $fullFilePath, $baseName);
 	}
 
 	return;
 }
 
-sub body {
-	my ($self)           = @_;
-	my $r                = $self->r;
-	my $userID           = $self->r->param('user');
-	my $perm_view_errors = $self->r->authz->hasPermissions($userID, 'download_hardcopy_view_errors');
-	$perm_view_errors = defined $perm_view_errors ? $perm_view_errors : 0;
-
-	if (my $num = $self->get_errors) {
-		my $file_path = $self->{file_path};
-		my %temp_file_map  = %{ $self->{temp_file_map} // {} };
-		if ($perm_view_errors) {
-			print CGI::p($r->maketext('[quant,_1,error] occured while generating hardcopy:', $num));
-
-			print CGI::ul(CGI::li($self->get_errors_ref));
-		}
-
-		if ($file_path) {
-			print CGI::p(
-				$r->maketext(
-					'A hardcopy file was generated, but it may not be complete or correct. Please check that no '
-						. 'problems are missing and that they are all legible. If not, please inform your instructor.'
-				),
-				'<br>',
-				CGI::a(
-					{
-						href => $self->systemLink(
-							$r->urlpath->newFromModule(
-								$r->urlpath->module, $r, courseID => $r->urlpath->arg('courseID')
-							),
-							params => { tempFilePath => $file_path }
-						)
-					},
-					$r->maketext('Download Hardcopy')
-				),
-			);
-		} else {
-			print CGI::p(
-				$r->maketext(
-					'WeBWorK was unable to generate a paper copy of this homework set.  Please inform your instructor.')
-			);
-		}
-
-		if ($perm_view_errors) {
-			if (%temp_file_map) {
-				print CGI::start_p();
-				print $r->maketext('You can also examine the following temporary files: ');
-				my $first = 1;
-				while (my ($temp_file_name, $temp_file_url) = each %temp_file_map) {
-					if ($first) {
-						$first = 0;
-					} else {
-						print ', ';
-					}
-					print CGI::a(
-						{
-							href => $self->systemLink(
-								$r->urlpath->newFromModule(
-									$r->urlpath->module, $r, courseID => $r->urlpath->arg('courseID')
-								),
-								params => { tempFilePath => $temp_file_url }
-							)
-						},
-						$temp_file_name
-					);
-				}
-				print CGI::end_p();
-			}
-		}
-
-		print CGI::hr();
-	}
-
-	# don't display the retry form if there are errors and the user doesn't have permission to view the errors.
-	unless ($self->get_errors and not $perm_view_errors) {
-		$self->display_form();
-	}
-	'';    # return a blank
-}
-
-sub display_form {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $db = $r->db;
-	my $ce = $r->ce;
-	my $authz = $r->authz;
-	my $userID = $r->param("user");
-	my $eUserID = $r->param("effectiveUser");
+sub display_form ($c) {
+	my $db      = $c->db;
+	my $ce      = $c->ce;
+	my $authz   = $c->authz;
+	my $userID  = $c->param("user");
+	my $eUserID = $c->param("effectiveUser");
 
 	# first time we show up here, fill in some values
-	unless ($r->param("in_hc_form")) {
+	unless ($c->param("in_hc_form")) {
 		# if a set was passed in via the path_info, add that to the list of sets.
-		my $singleSet = $r->urlpath->arg("setID");
-		if (defined $singleSet and $singleSet ne "") {
-			my @selected_sets = $r->param("selected_sets");
-			$r->param("selected_sets" => [ @selected_sets, $singleSet]) unless grep { $_ eq $singleSet } @selected_sets;
+		my $singleSet = $c->stash('setID');
+		if (defined $singleSet && $singleSet ne '') {
+			my @selected_sets = $c->param("selected_sets");
+			$c->param("selected_sets" => [ @selected_sets, $singleSet ])
+				unless grep { $_ eq $singleSet } @selected_sets;
 		}
 
 		# if no users are selected, select the effective user
-		my @selected_users = $r->param("selected_users");
+		my @selected_users = $c->param("selected_users");
 		unless (@selected_users) {
-			$r->param("selected_users" => $eUserID);
+			$c->param("selected_users" => $eUserID);
 		}
 	}
 
-	my $perm_multiset = $authz->hasPermissions($userID, "download_hardcopy_multiset");
-	my $perm_multiuser = $authz->hasPermissions($userID, "download_hardcopy_multiuser");
-	my $perm_texformat = $authz->hasPermissions($userID, "download_hardcopy_format_tex");
-	my $perm_change_theme = $authz->hasPermissions($userID, "download_hardcopy_change_theme");
-	my $perm_unopened = $authz->hasPermissions($userID, "view_unopened_sets");
-	my $perm_view_hidden = $authz->hasPermissions($userID, "view_hidden_sets");
-	my $perm_view_answers = $authz->hasPermissions($userID, "show_correct_answers_before_answer_date");
+	my $perm_multiset       = $authz->hasPermissions($userID, "download_hardcopy_multiset");
+	my $perm_multiuser      = $authz->hasPermissions($userID, "download_hardcopy_multiuser");
+	my $perm_texformat      = $authz->hasPermissions($userID, "download_hardcopy_format_tex");
+	my $perm_change_theme   = $authz->hasPermissions($userID, "download_hardcopy_change_theme");
+	my $perm_unopened       = $authz->hasPermissions($userID, "view_unopened_sets");
+	my $perm_view_hidden    = $authz->hasPermissions($userID, "view_hidden_sets");
+	my $perm_view_answers   = $authz->hasPermissions($userID, "show_correct_answers_before_answer_date");
 	my $perm_view_solutions = $authz->hasPermissions($userID, "show_solutions_before_answer_date");
 
 	# get formats
@@ -446,18 +358,16 @@ sub display_form {
 	}
 
 	# get format names hash for radio buttons
-	my %format_labels = map { $_ => $r->maketext($HC_FORMATS{$_}{name}) || $_ } @formats;
-
-	print CGI::start_form(-name=>"hardcopy-form", -id=>"hardcopy-form", -method=>"POST", -action=>$r->uri);
-	print $self->hidden_authen_fields();
-	print CGI::hidden("in_hc_form", 1);
+	my %format_labels = map { $_ => $c->maketext($HC_FORMATS{$_}{name}) || $_ } @formats;
 
 	my $canShowCorrectAnswers = 0;
-	my $canShowSolutions = 0;
 
-	if ($perm_multiuser and $perm_multiset) {
+	my (@users, @wantedSets, @setVersions);
+	my ($user,  $user_id,    $selected_set_id);
+
+	if ($perm_multiuser && $perm_multiset) {
 		# Get all users for selection.
-		my @Users = $db->getUsersWhere({ user_id => { not_like => 'set_id:%' } });
+		@users = $db->getUsersWhere({ user_id => { not_like => 'set_id:%' } });
 
 		# Get sets for selection.
 		# Note that we are getting GlobalSets instead of using the list of UserSets assigned to the
@@ -470,95 +380,34 @@ sub display_form {
 		# FIXME: This is another place where we assume that there is a one-to-one correspondence between
 		# assignment_type =~ gateway and versioned sets.  I think we really should have a "is_versioned" flag on set
 		# objects instead.
-		my @SetVersions = ();
 		for my $v (grep { $_->assignment_type =~ /gateway/ } @GlobalSets) {
 			# FIXME: The set_id change here is a hideous, horrible hack.  The identifying key for a global set is the
 			# set_id.  Those for a set version are the set_id and version_id.  But this means that we have trouble
 			# displaying them both together in HTML::scrollingRecordList.  So we brutally play tricks with the set_id
 			# here, which probably is not very robust, and certainly is aesthetically displeasing.  Yuck.
-			push(@SetVersions,
+			push(@setVersions,
 				map { $_->set_id($_->set_id . ",v" . $_->version_id); $_ }
 					$db->getSetVersionsWhere({ user_id => $eUserID, set_id => { like => $v->set_id . ',v%' } }));
 		}
 
 		# Filter out global gateway sets.  Only the versioned sets may be printed.
-		my @WantedGlobalSets = grep { $_->assignment_type !~ /gateway/ } @GlobalSets;
-
-		print CGI::p($r->maketext(
-			"Select the homework sets for which to generate hardcopy versions. You may"
-				. " also select multiple users from the users list. You will receive hardcopy"
-				. " for each (set, user) pair."
-		));
-
-		print CGI::div(
-			{ class => 'row gx-3' },
-			CGI::div(
-				{ class => 'col-xl-5 col-md-6 mb-2' },
-				CGI::div(
-					{ class => 'fw-bold text-center' },
-					CGI::label({ for => 'selected_users' }, $r->maketext('Users'))
-				),
-				scrollingRecordList(
-					{
-						name            => 'selected_users',
-						id              => 'selected_users',
-						request         => $r,
-						default_sort    => 'lnfn',
-						default_format  => 'lnfn_uid',
-						default_filters => ['all'],
-						attrs => {
-							size     => 20,
-							multiple => $perm_multiuser
-						}
-					},
-					@Users
-				)
-			),
-			CGI::div(
-				{ class => 'col-xl-5 col-md-6 mb-2' },
-				CGI::div(
-					{ class => 'fw-bold text-center' },
-					CGI::label({ for => 'selected_sets' }, $r->maketext('Sets'))
-				),
-				scrollingRecordList(
-					{
-						name            => 'selected_sets',
-						id              => 'selected_sets',
-						request         => $r,
-						default_sort    => 'set_id',
-						default_format  => 'sid',
-						default_filters => ['all'],
-						attrs => {
-							size     => 20,
-							multiple => $perm_multiset,
-							dir      => 'ltr'
-						}
-					},
-					@WantedGlobalSets,
-					@SetVersions
-				)
-			)
-		);
+		@wantedSets = grep { $_->assignment_type !~ /gateway/ } @GlobalSets;
 
 		$canShowCorrectAnswers = 1;
-		$canShowSolutions      = 1;
-
 	} else {    # single user mode
-		my $user = $db->getUser($eUserID);
+		$user = $db->getUser($eUserID);
 
-		my $selected_set_id = $r->param("selected_sets");
-		$selected_set_id = '' unless defined $selected_set_id;
+		$selected_set_id = $c->param("selected_sets") // '';
 
-		my $selected_user_id = $user->user_id;
-		print CGI::hidden("selected_sets", $selected_set_id), CGI::hidden("selected_users", $selected_user_id);
+		$user_id = $user->user_id;
 
 		my $mergedSet;
 		if ($selected_set_id =~ /(.*),v(\d+)$/) {
 			# Determining if answers can be shown is more complicated for gateway tests.
 			my $the_set_id      = $1;
 			my $the_set_version = $2;
-			$mergedSet = $db->getMergedSetVersion($selected_user_id, $the_set_id, $the_set_version);
-			my $mergedProblem = $db->getMergedProblemVersion($selected_user_id, $the_set_id, $the_set_version, 1);
+			$mergedSet = $db->getMergedSetVersion($user_id, $the_set_id, $the_set_version);
+			my $mergedProblem = $db->getMergedProblemVersion($user_id, $the_set_id, $the_set_version, 1);
 
 			# Get the parameters needed to determine if correct answers may be shown.
 			my $maxAttempts  = $mergedSet->attempts_per_version()                          || 0;
@@ -582,217 +431,94 @@ sub display_form {
 				);
 
 		} else {
-			$mergedSet = $db->getMergedSet($selected_user_id, $selected_set_id);
+			$mergedSet = $db->getMergedSet($user_id, $selected_set_id);
 
 			$canShowCorrectAnswers = $perm_view_answers
 				|| (defined($mergedSet) && after($mergedSet->answer_date));
 		}
-		# Make display for versioned sets a bit nicer
-		$selected_set_id =~ s/,v(\d+)$/ (version $1)/;
-
-		print CGI::p($r->maketext(
-			"Download hardcopy of set [_1] for [_2]?",
-			CGI::span({ dir => 'ltr' }, format_set_name_display($selected_set_id)),
-			$user->first_name . " " . $user->last_name
-		));
-
-		$canShowSolutions = $canShowCorrectAnswers;
 	}
 
-	# Using maketext on the next line would trigger errors when a local hardcopyTheme is installed.
-	# my %hardcopyThemeNames = map {$_ => $r->maketext($ce->{hardcopyThemeNames}->{$_})} @{$ce->{hardcopyThemes}};
-	my %hardcopyThemeNames = map {$_ => $ce->{hardcopyThemeNames}->{$_}} @{$ce->{hardcopyThemes}};
-
-	print CGI::div(
-		{ class => 'row' },
-		CGI::div(
-			{ class => 'col-md-8 font-sm mb-2' },
-			$r->maketext(
-				'You may choose to show any of the following data. Correct answers, hints, and solutions '
-					. 'are only available [_1] after the answer date of the homework set.',
-				$perm_multiuser ? "to privileged users or" : ""
-			)
-		),
-		CGI::div(
-			{ class => 'row' },
-			CGI::div(
-				{ class => 'col-md-8' },
-				CGI::div(
-					{ class => 'input-group input-group-sm mb-2' },
-					CGI::span({ class => 'input-group-text' }, CGI::b($r->maketext("Show:"))),
-					CGI::div(
-						{ class => 'input-group-text' },
-						CGI::checkbox({
-							name            => "printStudentAnswers",
-							checked         => $r->param("printStudentAnswers") // 1,    # Checked by default
-							label           => $r->maketext("Student answers"),
-							class           => 'form-check-input me-2',
-							labelattributes => { class => 'form-check-label' }
-						})
-					),
-					CGI::div(
-						{ class => 'input-group-text' },
-						CGI::checkbox({
-							name            => "showComments",
-							checked         => scalar($r->param("showComments")) || 0,
-							label           => $r->maketext("Comments"),
-							class           => 'form-check-input me-2',
-							labelattributes => { class => 'form-check-label' }
-						})
-					),
-					$canShowCorrectAnswers ? CGI::div(
-						{ class => 'input-group-text' },
-						CGI::checkbox({
-							name            => "showCorrectAnswers",
-							checked         => scalar($r->param("showCorrectAnswers")) || 0,
-							label           => $r->maketext("Correct answers"),
-							class           => 'form-check-input me-2',
-							labelattributes => { class => 'form-check-label' }
-						})
-					) : '',
-					$canShowSolutions ? CGI::div(
-						{ class => 'input-group-text' },
-						CGI::checkbox({
-							name            => "showHints",
-							checked         => scalar($r->param("showHints")) || 0,
-							label           => $r->maketext("Hints"),
-							class           => 'form-check-input me-2',
-							labelattributes => { class => 'form-check-label' }
-						})
-					) : '',
-					$canShowSolutions ? CGI::div(
-						{ class => 'input-group-text' },
-						CGI::checkbox({
-							name            => "showSolutions",
-							checked         => scalar($r->param("showSolutions")) || 0,
-							label           => $r->maketext("Solutions"),
-							class           => 'form-check-input me-2',
-							labelattributes => { class => 'form-check-label' }
-						})
-					) : ''
-				)
-			)
-		),
-		CGI::div(
-			{ class => 'row' },
-			CGI::div(
-				{ class => 'col-md-8' },
-				CGI::div(
-					{ class => 'input-group input-group-sm mb-2' },
-					CGI::span({ class => 'input-group-text' }, CGI::b($r->maketext("Hardcopy Format:"))),
-					CGI::div(
-						{ class => 'input-group-text' },
-						CGI::radio_group({
-							name            => "hardcopy_format",
-							values          => \@formats,
-							default         => scalar($r->param("hardcopy_format")) || $HC_DEFAULT_FORMAT,
-							labels          => \%format_labels,
-							class           => 'form-check-input me-2',
-							labelattributes => { class => 'form-check-label me-3' }
-						})
-					)
-				)
-			)
-		),
-		$self->{can_show_source_file} ? CGI::div(
-			{ class => 'row' },
-			CGI::div(
-				{ class => 'col-md-8' },
-				CGI::div(
-					{ class => 'input-group input-group-sm mb-2' },
-					CGI::span({ class => 'input-group-text' }, CGI::b($r->maketext("Show Problem Source File:"))),
-					CGI::div(
-						{ class => 'input-group-text' },
-						CGI::radio_group({
-							name            => "show_source_file",
-							values          => [ "Yes", "No" ],
-							default         => "Yes",
-							labels          => { Yes => $r->maketext("Yes"), No => $r->maketext("No") },
-							class           => 'form-check-input me-2',
-							labelattributes => { class => 'form-check-label me-3' }
-						})
-					)
-				)
-			)
-		) : '',
-		$perm_change_theme ? CGI::div(
-			{ class => 'row' },
-			CGI::div(
-				{ class => 'col-md-8' },
-				CGI::div(
-					{ class => 'input-group input-group-sm mb-2' },
-					CGI::span({ class => 'input-group-text' }, CGI::b($r->maketext("Hardcopy Theme"))),
-					CGI::div(
-						{ class => 'input-group-text' },
-						CGI::radio_group({
-							name            => "hardcopy_theme",
-							values          => $ce->{hardcopyThemes},
-							default         => scalar($r->param("hardcopyTheme")) || $ce->{hardcopyTheme},
-							labels          => \%hardcopyThemeNames,
-							class           => 'form-check-input me-2',
-							labelattributes => { class => 'form-check-label me-3' }
-						})
-					)
-				)
-			)
-		) : '',
-		CGI::div(
-			{ class => '' },
-			CGI::submit({
-				name  => "generate_hardcopy",
-				value => $perm_multiuser
-					? $r->maketext("Generate hardcopy for selected sets and selected users")
-					: $r->maketext("Generate Hardcopy"),
-				class => 'btn btn-primary'
-			})
-		)
+	# Get labels for the hardcopy themes, which are attributes in the theme xml file
+	my %hardcopyLabels;
+	opendir(my $dhS, $ce->{webworkDirs}{hardcopyThemes}) || die "can't opendir $ce->{webworkDirs}{hardcopyThemes}: $!";
+	for my $hardcopyTheme (grep {/\.xml$/} sort readdir($dhS)) {
+		my $themeTree = XML::LibXML->load_xml(location => "$ce->{webworkDirs}{hardcopyThemes}/$hardcopyTheme");
+		$hardcopyLabels{$hardcopyTheme} = $themeTree->findvalue('/theme/@label');
+	}
+	my @hardcopyThemesCourse;
+	if (opendir(my $dhC, $ce->{courseDirs}{hardcopyThemes})) {
+		@hardcopyThemesCourse = grep {/\.xml$/} sort readdir($dhC);
+	}
+	for my $hardcopyTheme (@hardcopyThemesCourse) {
+		my $themeTree = XML::LibXML->load_xml(location => "$ce->{courseDirs}{hardcopyThemes}/$hardcopyTheme");
+		$hardcopyLabels{$hardcopyTheme} = $themeTree->findvalue('/theme/@label') || $hardcopyTheme;
+	}
+	my $hardcopyThemesAvailable = [
+		sort(do {
+			my %seen;
+			grep { !$seen{$_}++ } (@{ $ce->{hardcopyThemes} }, @hardcopyThemesCourse);
+		})
+	];
+
+	return $c->include(
+		'ContentGenerator/Hardcopy/form',
+		canShowCorrectAnswers   => $canShowCorrectAnswers,
+		multiuser               => $perm_multiuser && $perm_multiset,
+		can_change_theme        => $perm_change_theme,
+		users                   => \@users,
+		wantedSets              => \@wantedSets,
+		setVersions             => \@setVersions,
+		user                    => $user,
+		user_id                 => $user_id,
+		selected_set_id         => $selected_set_id,
+		formats                 => \@formats,
+		default_format          => $HC_DEFAULT_FORMAT,
+		format_labels           => \%format_labels,
+		hardcopyLabels          => \%hardcopyLabels,
+		hardcopyThemesAvailable => $hardcopyThemesAvailable,
+		can_change_theme        => $perm_change_theme,
 	);
-
-	print CGI::end_form();
-
-	return "";
 }
 
 ################################################################################
 # harddcopy generating subroutines
 ################################################################################
 
-sub generate_hardcopy {
-	my ($self, $format, $userIDsRef, $setIDsRef) = @_;
-	my $r     = $self->r;
-	my $ce    = $r->ce;
-	my $db    = $r->db;
-	my $authz = $r->authz;
+async sub generate_hardcopy ($c, $format, $userIDsRef, $setIDsRef) {
+	my $ce    = $c->ce;
+	my $db    = $c->db;
+	my $authz = $c->authz;
 
-	my $courseID = $r->urlpath->arg('courseID');
-	my $userID = $r->param('user');
+	my $courseID = $c->stash('courseID');
+	my $userID   = $c->param('user');
 
 	# Create the temporary directory.  Use mkpath to ensure it exists (mkpath is pretty much `mkdir -p`).
 	my $temp_dir_parent_path = "$ce->{webworkDirs}{tmp}/$courseID/hardcopy/$userID";
 	eval { mkpath($temp_dir_parent_path) };
 	if ($@) {
-		$self->add_errors(
-			"Couldn't create hardcopy directory $temp_dir_parent_path: " . CGI::code(CGI::escapeHTML($@)));
+		$c->add_error("Couldn't create hardcopy directory $temp_dir_parent_path: ", $c->tag('code', $@));
 		return;
 	}
 
 	# Create a randomly named working directory in the hardcopy directory.
 	my $temp_dir_path = eval { tempdir('work.XXXXXXXX', DIR => $temp_dir_parent_path) };
 	if ($@) {
-		$self->add_errors("Couldn't create temporary working directory: " . CGI::code(CGI::escapeHTML($@)));
+		$c->add_error(q{Couldn't create temporary working directory: }, $c->tag('code', $@));
 		return;
 	}
 
 	# Do some error checking.
 	unless (-e $temp_dir_path) {
-		$self->add_errors("Temporary directory '"
-				. CGI::code(CGI::escapeHTML($temp_dir_path))
-				. "' does not exist, but creation didn't fail. This shouldn't happen.");
+		$c->add_error(
+			'Temporary directory "',
+			$c->tag('code', $temp_dir_path),
+			q{" does not exist, but creation didn't fail. This shouldn't happen.}
+		);
 		return;
 	}
 	unless (-w $temp_dir_path) {
-		$self->add_errors("Temporary directory '" . CGI::code(CGI::escapeHTML($temp_dir_path)) . "' is not writeable.");
-		$self->delete_temp_dir($temp_dir_path);
+		$c->add_error('Temporary directory "', $c->tag('code', $temp_dir_path), '" is not writeable.');
+		$c->delete_temp_dir($temp_dir_path);
 		return;
 	}
 
@@ -801,33 +527,33 @@ sub generate_hardcopy {
 
 	# Create TeX file.
 
-	my $open_result = open my $FH, '>:encoding(UTF-8)', $tex_file_path;
-	unless ($open_result) {
-		$self->add_errors("Failed to open file '"
-				. CGI::code(CGI::escapeHTML($tex_file_path))
-				. "' for writing: "
-				. CGI::code(CGI::escapeHTML($!)));
-		$self->delete_temp_dir($temp_dir_path);
+	if (open my $FH, '>:encoding(UTF-8)', $tex_file_path) {
+		await $c->write_multiuser_tex($FH, $userIDsRef, $setIDsRef);
+		close $FH;
+	} else {
+		$c->add_error('Failed to open file "', $c->tag('code', $tex_file_path), '" for writing: ', $c->tag('code', $!));
+		$c->delete_temp_dir($temp_dir_path);
 		return;
+
 	}
-	$self->write_multiuser_tex($FH, $userIDsRef, $setIDsRef);
-	close $FH;
 
 	# If no problems were successfully rendered, we can't continue.
-	unless ($self->{at_least_one_problem_rendered_without_error}) {
-		$self->add_errors("No problems rendered. Can't continue.");
-		$self->delete_temp_dir($temp_dir_path);
+	unless ($c->{at_least_one_problem_rendered_without_error}) {
+		$c->add_error(q{No problems rendered. Can't continue.});
+		$c->delete_temp_dir($temp_dir_path);
 		return;
 	}
 
 	# If the hardcopy.tex file was not generated, fail now.
 	unless (-e "$temp_dir_path/hardcopy.tex") {
-		$self->add_errors("'"
-				. CGI::code("hardcopy.tex")
-				. "' not written to temporary directory '"
-				. CGI::code(CGI::escapeHTML($temp_dir_path))
-				. "'. Can't continue.");
-		$self->delete_temp_dir($temp_dir_path);
+		$c->add_error(
+			'"',
+			$c->tag('code', 'hardcopy.tex'),
+			'" not written to temporary directory "',
+			$c->tag('code', $temp_dir_path),
+			q{". Can't continue.}
+		);
+		$c->delete_temp_dir($temp_dir_path);
 		return;
 	}
 
@@ -843,21 +569,23 @@ sub generate_hardcopy {
 	# @temp_files is a list of temporary files of interest used by the subroutine.
 	# (all are relative to $temp_dir_path)
 	my $format_subr = $HC_FORMATS{$format}{subr};
-	my ($final_file_name, @temp_files) = $self->$format_subr($temp_dir_path, $final_file_basename);
+	my ($final_file_name, @temp_files) = $c->$format_subr($temp_dir_path, $final_file_basename);
 	my $final_file_path = "$temp_dir_path/$final_file_name";
 
 	# Calculate paths for each temp file of interest.  These paths are relative to the $temp_dir_parent_path.
 	# makeTempDirectory's interface forces us to reverse-engineer the relative temp dir path from the absolute path.
 	my $temp_dir_rel_path = $temp_dir_path =~ s/^$temp_dir_parent_path\///r;
-	my %temp_file_map = map { $_ => "$temp_dir_rel_path/$_" } @temp_files;
+	my %temp_file_map     = map { $_ => "$temp_dir_rel_path/$_" } @temp_files;
 
 	# Make sure the final file exists.
 	unless (-e $final_file_path) {
-		$self->add_errors("Final hardcopy file '"
-				. CGI::code(CGI::escapeHTML($final_file_path))
-				. "' not found after calling '"
-				. CGI::code(CGI::escapeHTML($format_subr)) . "': "
-				. CGI::code(CGI::escapeHTML($!)));
+		$c->add_error(
+			'Final hardcopy file "',
+			$c->tag('code', $final_file_path),
+			"' not found after calling '",
+			$c->tag('code', $format_subr),
+			"': ", $c->tag('code', $!)
+		);
 		return { temp_file_map => \%temp_file_map };
 	}
 
@@ -866,24 +594,27 @@ sub generate_hardcopy {
 	my $mv_cmd = '2>&1 ' . $ce->{externalPrograms}{mv} . ' ' . shell_quote($final_file_path, $final_file_final_path);
 	my $mv_out = readpipe $mv_cmd;
 	if ($?) {
-		$self->add_errors("Failed to move hardcopy file '"
-				. CGI::code(CGI::escapeHTML($final_file_name))
-				. "' from '"
-				. CGI::code(CGI::escapeHTML($temp_dir_path))
-				. "' to '"
-				. CGI::code(CGI::escapeHTML($temp_dir_parent_path)) . "':"
-				. CGI::br()
-				. CGI::pre(CGI::escapeHTML($mv_out)));
+		$c->add_error(
+			'Failed to move hardcopy file "',
+			$c->tag('code', $final_file_name),
+			'" from "',
+			$c->tag('code', $temp_dir_path),
+			'" to "',
+			$c->tag('code', $temp_dir_parent_path),
+			'":',
+			$c->tag('br'),
+			$c->tag('pre', $mv_out)
+		);
 		$final_file_final_path = "$temp_dir_rel_path/$final_file_name";
 	}
 
 	# If there were any errors, then the final file will not be served directly, but will be served via reply_with_file
 	# and the full file path will be built at that time.  So the path needs to be relative to the temporary directory
 	# parent path.
-	$final_file_final_path =~ s/^$temp_dir_parent_path\/// if ($self->get_errors);
+	$final_file_final_path =~ s/^$temp_dir_parent_path\/// if ($c->has_errors);
 
 	# remove the temp directory if there are no errors
-	$self->delete_temp_dir($temp_dir_path) unless ($self->get_errors || $PreserveTempFiles);
+	$c->delete_temp_dir($temp_dir_path) unless ($c->has_errors || $PreserveTempFiles);
 
 	warn "Preserved temporary files in directory '$temp_dir_path'.\n" if $PreserveTempFiles;
 
@@ -896,16 +627,15 @@ sub generate_hardcopy {
 }
 
 # helper function to remove temp dirs
-sub delete_temp_dir {
-	my ($self, $temp_dir_path) = @_;
-
-	my $rm_cmd = '2>&1 ' . $self->r->ce->{externalPrograms}{rm} . ' -rf ' . shell_quote($temp_dir_path);
+sub delete_temp_dir ($c, $temp_dir_path) {
+	my $rm_cmd = '2>&1 ' . $c->ce->{externalPrograms}{rm} . ' -rf ' . shell_quote($temp_dir_path);
 	my $rm_out = readpipe $rm_cmd;
 	if ($?) {
-		$self->add_errors("Failed to remove temporary directory '"
-				. CGI::code(CGI::escapeHTML($temp_dir_path)) . "':"
-				. CGI::br()
-				. CGI::pre($rm_out));
+		$c->add_error(
+			'Failed to remove temporary directory "',
+			$c->tag('code', $temp_dir_path),
+			'":', $c->tag('br'), $c->tag('pre', $rm_out)
+		);
 	}
 
 	return;
@@ -919,83 +649,101 @@ sub delete_temp_dir {
 # error (also located in $temp_dir_path).  These are returned whether or not an error actually
 # occured.
 
-sub generate_hardcopy_tex {
-	my ($self, $temp_dir_path, $final_file_basename) = @_;
-
-	my $src_name = "hardcopy.tex";
+sub generate_hardcopy_tex ($c, $temp_dir_path, $final_file_basename) {
+	my $src_name    = "hardcopy.tex";
 	my $bundle_path = "$temp_dir_path/$final_file_basename";
 
 	# Create directory for the tex bundle
 	if (!mkdir $bundle_path) {
-		$self->add_errors("Failed to create directory '" . CGI::code(CGI::escapeHTML($bundle_path)) . "': " .
-			CGI::br() . CGI::pre(CGI::escapeHTML($!)));
+		$c->add_error(
+			'Failed to create directory "',
+			$c->tag('code', $bundle_path),
+			'": ', $c->tag('br'), $c->tag('pre', $!)
+		);
 		return $src_name;
 	}
 
 	# Move the tex file into the bundle directory
-	my $mv_cmd = "2>&1 " . $self->r->ce->{externalPrograms}{mv} . " " .
-		shell_quote("$temp_dir_path/$src_name", $bundle_path);
+	my $mv_cmd =
+		"2>&1 " . $c->ce->{externalPrograms}{mv} . " " . shell_quote("$temp_dir_path/$src_name", $bundle_path);
 	my $mv_out = readpipe $mv_cmd;
 
 	if ($?) {
-		$self->add_errors("Failed to move '" . CGI::code(CGI::escapeHTML($src_name)) . "' into directory '"
-			. CGI::code(CGI::escapeHTML($bundle_path)) . "':" . CGI::br()
-			. CGI::pre(CGI::escapeHTML($mv_out)));
+		$c->add_error(
+			'Failed to move "',
+			$c->tag('code', $src_name),
+			'" into directory "',
+			$c->tag('code', $bundle_path),
+			'":', $c->tag('br'), $c->tag('pre', $mv_out)
+		);
 		return $src_name;
 	}
 
 	# Copy the common tex files into the bundle directory
-	my $ce = $self->r->ce;
-	for (qw{packages.tex CAPA.tex PGML.tex}) {
-		my $cp_cmd = "2>&1 $ce->{externalPrograms}{cp} " . shell_quote("$ce->{webworkDirs}{texinputs_common}/$_", $bundle_path);
+	my $ce = $c->ce;
+	for (qw{webwork2.sty webwork_logo.png}) {
+		my $cp_cmd =
+			"2>&1 $ce->{externalPrograms}{cp} " . shell_quote("$ce->{webworkDirs}{assetsTex}/$_", $bundle_path);
 		my $cp_out = readpipe $cp_cmd;
 		if ($?) {
-			$self->add_errors("Failed to copy '" . CGI::code(CGI::escapeHTML("$ce->{webworkDirs}{texinputs_common}/$_")) .
-				"' into directory '" . CGI::code(CGI::escapeHTML($bundle_path)) . "':" . CGI::br()
-				. CGI::pre(CGI::escapeHTML($cp_out)));
+			$c->add_error(
+				'Failed to copy "',
+				$c->tag('code', "$ce->{webworkDirs}{assetsTex}/$_"),
+				'" into directory "',
+				$c->tag('code', $bundle_path),
+				'":', $c->tag('br'), $c->tag('pre', $cp_out)
+			);
+		}
+	}
+	for (qw{pg.sty PGML.tex CAPA.tex}) {
+		my $cp_cmd =
+			"2>&1 $ce->{externalPrograms}{cp} " . shell_quote("$ce->{pg}{directories}{assetsTex}/$_", $bundle_path);
+		my $cp_out = readpipe $cp_cmd;
+		if ($?) {
+			$c->add_error(
+				'Failed to copy "',
+				$c->tag('code', "$ce->{pg}{directories}{assetsTex}/$_"),
+				'" into directory "',
+				$c->tag('code', $bundle_path),
+				'":', $c->tag('br'), $c->tag('pre', $cp_out)
+			);
 		}
 	}
 
-	# Attempt to copy image files used into the bundle directory
-	# For security reasons only files in the $ce->{courseDirs}{html_temp}/images are included.
-	# The file names of the images are only allowed to contain alphanumeric characters, underscores, dashes, and
-	# periods.  No spaces or slashes, etc.  This will usually be all of the included images.
-	if (open(my $in_fh,  "<", "$bundle_path/$src_name")) {
-		local $/;
-		my $data = <$in_fh>;
-		close($in_fh);
-
-		# Extract the included image file names and strip the absolute path in the tex file.
-		my @image_files;
-		my $image_tmp_dir = $ce->{courseDirs}{html_temp} . "/images/";
-		$data =~ s{\\includegraphics\[([^]]*)\]\{$image_tmp_dir([^\}]*)\}}
-			{push @image_files, $2; "\\includegraphics[$1]{$2}"}ge;
-
-		# Rewrite the tex file with the image paths stripped.
-		open(my $out_fh, ">", "$bundle_path/$src_name")
-			or warn "Can't open $bundle_path/$src_name for writing.";
-		print $out_fh $data;
-		close $out_fh;
-
-		for (@image_files) {
-			# This is a little protection in case a student enters an answer like
-			# \includegraphics[]{$ce->{courseDirs}{html_temp}/images/malicious code or absolute system file name}
-			$self->add_errors("Unable to safely copy image '" . CGI::code(CGI::escapeHTML("$image_tmp_dir$_")) .
-				"' into directory '" . CGI::code(CGI::escapeHTML($bundle_path)) . "'."),
-			warn "Invalid image file name '$_' detected.  Possible malicious activity?",
-		   	next unless $_ =~ /^[\w._-]*$/ && -f "$image_tmp_dir$_";
-
-			# Copy the image file into the bundle directory.
-			my $cp_cmd = "2>&1 $ce->{externalPrograms}{cp} " . shell_quote("$image_tmp_dir$_", $bundle_path);
-			my $cp_out = readpipe $cp_cmd;
-			if ($?) {
-				$self->add_errors("Failed to copy image '" . CGI::code(CGI::escapeHTML("$image_tmp_dir$_")) .
-					"' into directory '" . CGI::code(CGI::escapeHTML($bundle_path)) . "':" . CGI::br()
-					. CGI::pre(CGI::escapeHTML($cp_out)));
+	# Attempt to copy image files used into the working directory.
+	my $resource_list = $c->{resource_list};
+	if (ref $resource_list eq 'ARRAY' && @$resource_list) {
+		if (open(my $in_fh, "<", "$bundle_path/$src_name")) {
+			local $/;
+			my $data = <$in_fh>;
+			close($in_fh);
+
+			for my $resource (@$resource_list) {
+				my $basename = $resource =~ s/.*\///r;
+				$data =~ s{$resource}{$basename}g;
+
+				# Copy the image file into the bundle directory.
+				my $cp_cmd = "2>&1 $ce->{externalPrograms}{cp} " . shell_quote($resource, $bundle_path);
+				my $cp_out = readpipe $cp_cmd;
+				if ($?) {
+					$c->add_error(
+						'Failed to copy image "',
+						$c->tag('code', $resource),
+						'" into directory "',
+						$c->tag('code', $bundle_path),
+						'":', $c->tag('br'), $c->tag('pre', $cp_out)
+					);
+				}
 			}
-	   	}
-	} else {
-		$self->add_errors("Failed to open '" . CGI::code(CGI::escapeHTML("$bundle_path/$src_name")) . "' for reading.");
+
+			# Rewrite the tex file with the image paths stripped.
+			open(my $out_fh, ">", "$bundle_path/$src_name")
+				or warn "Can't open $bundle_path/$src_name for writing.";
+			print $out_fh $data;
+			close $out_fh;
+		} else {
+			$c->add_error('Failed to open "', $c->tag('code', "$bundle_path/$src_name"), '" for reading.');
+		}
 	}
 
 	# Create a zip archive of the bundle directory
@@ -1004,70 +752,87 @@ sub generate_hardcopy_tex {
 
 	my $zip_file = "$final_file_basename.zip";
 	unless ($zip->writeToFileNamed("$temp_dir_path/$zip_file") == AZ_OK) {
-		$self->add_errors("Failed to create zip archive of directory '" .
-			CGI::code(CGI::escapeHTML($bundle_path)) . "'");
+		$c->add_error('Failed to create zip archive of directory "', $c->tag('code', $bundle_path), '"');
 		return "$bundle_path/$src_name";
 	}
 
 	return $zip_file;
 }
 
-sub generate_hardcopy_pdf {
-	my ($self, $temp_dir_path, $final_file_basename) = @_;
+sub find_log_first_error ($log) {
+	my ($line, $first_error);
+	while ($line = <$log>) {
+		if ($first_error) {
+			last if $line =~ /^!\s+/;
+			$first_error .= $line;
+		} elsif ($line =~ /^!\s+/) {
+			$first_error = $line;
+		}
+	}
 
+	return $first_error;
+}
+
+sub generate_hardcopy_pdf ($c, $temp_dir_path, $final_file_basename) {
 	# call pdflatex - we don't want to chdir in the mod_perl process, as
 	# that might step on the feet of other things (esp. in Apache 2.0)
-	my $pdflatex_cmd = "cd " . shell_quote($temp_dir_path) . " && "
-		. "TEXINPUTS=.:" . shell_quote($self->r->ce->{webworkDirs}{texinputs_common}) . ": "
-		. $self->r->ce->{externalPrograms}{pdflatex}
+	my $pdflatex_cmd = "cd "
+		. shell_quote($temp_dir_path) . " && "
+		. "TEXINPUTS=.:"
+		. shell_quote($c->ce->{webworkDirs}{assetsTex}) . ':'
+		. shell_quote($c->ce->{pg}{directories}{assetsTex}) . ': '
+		. $c->ce->{externalPrograms}{pdflatex}
 		. " >pdflatex.stdout 2>pdflatex.stderr hardcopy";
 	if (my $rawexit = system $pdflatex_cmd) {
-		my $exit = $rawexit >> 8;
+		my $exit   = $rawexit >> 8;
 		my $signal = $rawexit & 127;
-		my $core = $rawexit & 128;
-		$self->add_errors("Failed to convert TeX to PDF with command '"
-			.CGI::code(CGI::escapeHTML($pdflatex_cmd))."' (exit=$exit signal=$signal core=$core).");
+		my $core   = $rawexit & 128;
+		$c->add_error(
+			'Failed to convert TeX to PDF with command "',
+			$c->tag('code', $pdflatex_cmd),
+			qq{" (exit=$exit signal=$signal core=$core).}
+		);
 
 		# read hardcopy.log and report first error
 		my $hardcopy_log = "$temp_dir_path/hardcopy.log";
 		if (-e $hardcopy_log) {
 			if (open my $LOG, "<:encoding(UTF-8)", $hardcopy_log) {
-				my $line;
-				while ($line = <$LOG>) {
-					last if $line =~ /^!\s+/;
-				}
-				my $first_error = $line;
-				while ($line = <$LOG>) {
-					last if $line =~ /^!\s+/;
-					$first_error .= $line;
-				}
+				my $first_error = find_log_first_error($LOG);
 				close $LOG;
 				if (defined $first_error) {
-					$self->add_errors("First error in TeX log is:".CGI::br().
-						CGI::pre(CGI::escapeHTML($first_error)));
+					$c->add_error('First error in TeX log is:', $c->tag('br'), $c->tag('pre', $first_error));
 				} else {
-					$self->add_errors("No errors encoundered in TeX log.");
+					$c->add_error('No errors encoundered in TeX log.');
 				}
 			} else {
-				$self->add_errors("Could not read TeX log: ".CGI::code(CGI::escapeHTML($!)));
+				$c->add_error('Could not read TeX log: ', $c->tag('code', $!));
 			}
 		} else {
-			$self->add_errors("No TeX log was found.");
+			$c->add_error('No TeX log was found.');
 		}
 	}
 
 	my $final_file_name;
 
 	# try rename the pdf file
-	my $src_name = "hardcopy.pdf";
+	my $src_name  = "hardcopy.pdf";
 	my $dest_name = "$final_file_basename.pdf";
-	my $mv_cmd = "2>&1 " . $self->r->ce->{externalPrograms}{mv} . " " . shell_quote("$temp_dir_path/$src_name", "$temp_dir_path/$dest_name");
+	my $mv_cmd    = "2>&1 "
+		. $c->ce->{externalPrograms}{mv} . " "
+		. shell_quote("$temp_dir_path/$src_name", "$temp_dir_path/$dest_name");
 	my $mv_out = readpipe $mv_cmd;
 	if ($?) {
-		$self->add_errors("Failed to rename '".CGI::code(CGI::escapeHTML($src_name))."' to '"
-			.CGI::code(CGI::escapeHTML($dest_name))."' in directory '"
-			.CGI::code(CGI::escapeHTML($temp_dir_path))."':".CGI::br()
-			.CGI::pre(CGI::escapeHTML($mv_out)));
+		$c->add_error(
+			'Failed to rename "',
+			$c->tag('code', $src_name),
+			'" to "',
+			$c->tag('code', $dest_name),
+			'" in directory "',
+			$c->tag('code', $temp_dir_path),
+			'":',
+			$c->tag('br'),
+			$c->tag('pre', $mv_out)
+		);
 		$final_file_name = $src_name;
 	} else {
 		$final_file_name = $dest_name;
@@ -1080,122 +845,133 @@ sub generate_hardcopy_pdf {
 # TeX aggregating subroutines
 ################################################################################
 
-sub write_multiuser_tex {
-	my ($self, $FH, $userIDsRef, $setIDsRef) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
+async sub write_multiuser_tex ($c, $FH, $userIDsRef, $setIDsRef) {
+	my $ce = $c->ce;
 
 	my @userIDs = @$userIDsRef;
-	my @setIDs = @$setIDsRef;
-
-	# get snippets
-	my $theme = $r->param('hardcopy_theme') // $ce->{hardcopyTheme};
-	my $themeDir = $ce->{webworkDirs}->{conf}.'/snippets/hardcopyThemes/'.$theme;
-	my $preamble = $ce->{webworkFiles}->{hardcopySnippets}->{preamble} // "$themeDir/hardcopyPreamble.tex";
-	my $postamble = $ce->{webworkFiles}->{hardcopySnippets}->{postamble} // "$themeDir/hardcopyPostamble.tex";
-	my $divider = $ce->{webworkFiles}->{hardcopySnippets}->{userDivider} // "$themeDir/hardcopyUserDivider.tex";
+	my @setIDs  = @$setIDsRef;
+
+	# get theme
+	my $theme = $c->param('hardcopy_theme') // $ce->{hardcopyTheme};
+	my $themeFile;
+	if (-e "$ce->{courseDirs}{hardcopyThemes}/$theme") {
+		$themeFile = "$ce->{courseDirs}{hardcopyThemes}/$theme";
+	} elsif (-e "$ce->{webworkDirs}{hardcopyThemes}/$theme") {
+		$themeFile = "$ce->{webworkDirs}{hardcopyThemes}/$theme";
+	} else {
+		$c->add_error("Couldn't locate file for theme $theme.");
+		return;
+	}
+	my $themeTree = XML::LibXML->load_xml(location => $themeFile);
 
 	# write preamble
-	$self->write_tex_file($FH, $preamble);
+	print $FH "\\batchmode\n";
+	print $FH $themeTree->findvalue('/theme/preamble');
+	print $FH '\\def\\webworkCourseName{' . handle_underbar($ce->{courseName}) . "}%\n";
+	print $FH '\\def\\webworkCourseTitle{' . handle_underbar($c->db->getSettingValue('courseTitle')) . "}%\n";
+	print $FH '\\def\\webworkCourseURL{'
+		. handle_underbar($ce->{server_root_url} . $ce->{webwork_url} . '/' . $ce->{courseName}) . "}%\n";
 
 	# write section for each user
-	while (defined (my $userID = shift @userIDs)) {
-		$self->write_multiset_tex($FH, $userID, @setIDs);
-		$self->write_tex_file($FH, $divider) if @userIDs; # divide users, but not after the last user
+	while (defined(my $userID = shift @userIDs)) {
+		await $c->write_multiset_tex($FH, $userID, $themeTree, @setIDs);
+		print $FH $themeTree->findvalue('/theme/userdivider') if @userIDs;   # divide users, but not after the last user
 	}
 
 	# write postamble
-	$self->write_tex_file($FH, $postamble);
+	print $FH $themeTree->findvalue('/theme/postamble');
+
+	return;
 }
 
-sub write_multiset_tex {
-	my ($self, $FH, $targetUserID, @setIDs) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
+async sub write_multiset_tex ($c, $FH, $targetUserID, $themeTree, @setIDs) {
+	my $ce = $c->ce;
+	my $db = $c->db;
 
 	# get user record
-	my $TargetUser = $db->getUser($targetUserID); # checked
+	my $TargetUser = $db->getUser($targetUserID);
 	unless ($TargetUser) {
-		$self->add_errors("Can't generate hardcopy for user '".CGI::code(CGI::escapeHTML($targetUserID))."' -- no such user exists.\n");
+		$c->add_error(
+			q{Can't generate hardcopy for user "},
+			$c->tag('code', $targetUserID),
+			qq{" -- no such user exists.\n}
+		);
 		return;
 	}
 
-	# get set divider
-	my $theme = $r->param('hardcopy_theme') // $ce->{hardcopyTheme};
-	my $themeDir = $ce->{webworkDirs}->{conf}.'/snippets/hardcopyThemes/'.$theme;
-	my $divider = $ce->{webworkFiles}->{hardcopySnippets}->{setDivider} // "$themeDir/hardcopySetDivider.tex";
-
 	# write each set
-	while (defined (my $setID = shift @setIDs)) {
-		$self->write_set_tex($FH, $TargetUser, $setID);
-		$self->write_tex_file($FH, $divider) if @setIDs; # divide sets, but not after the last set
+	while (defined(my $setID = shift @setIDs)) {
+		await $c->write_set_tex($FH, $TargetUser, $themeTree, $setID);
+		print $FH $themeTree->findvalue('/theme/setdivider') if @setIDs;    # divide sets, but not after the last set
 	}
+
+	return;
 }
 
-sub write_set_tex {
-	my ($self, $FH, $TargetUser, $setID) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $authz  = $r->authz;
-	my $userID = $r->param("user");
+async sub write_set_tex ($c, $FH, $TargetUser, $themeTree, $setID) {
+	my $ce     = $c->ce;
+	my $db     = $c->db;
+	my $authz  = $c->authz;
+	my $userID = $c->param("user");
 
 	# we may already have the MergedSet from checking hide_work and
 	#    hide_score in pre_header_initialize; check to see if that's true,
 	#    and otherwise, get the set.
-	my %mergedSets = %{$self->{mergedSets}};
-	my $uid = $TargetUser->user_id;
+	my %mergedSets = %{ $c->{mergedSets} };
+	my $uid        = $TargetUser->user_id;
 	my $MergedSet;
 	my $versioned = 0;
-	if ( defined( $mergedSets{"$uid!$setID"} ) ) {
+	if (defined($mergedSets{"$uid!$setID"})) {
 		$MergedSet = $mergedSets{"$uid!$setID"};
 		$versioned = ($setID =~ /,v(\d+)$/) ? $1 : 0;
 	} else {
-		if ( $setID =~ /(.+),v(\d+)$/ ) {
-			$setID = $1;
+		if ($setID =~ /(.+),v(\d+)$/) {
+			$setID     = $1;
 			$versioned = $2;
 		}
-		if ( $versioned ) {
+		if ($versioned) {
 			$MergedSet = $db->getMergedSetVersion($TargetUser->user_id, $setID, $versioned);
 		} else {
-			$MergedSet = $db->getMergedSet($TargetUser->user_id, $setID); # checked
+			$MergedSet = $db->getMergedSet($TargetUser->user_id, $setID);    # checked
 		}
 	}
 	# save versioned info for use in write_problem_tex
-	$self->{versioned} = $versioned;
+	$c->{versioned} = $versioned;
 
 	unless ($MergedSet) {
-		$self->add_errors("Can't generate hardcopy for set ''".CGI::code(CGI::escapeHTML($setID))
-			."' for user '".CGI::code(CGI::escapeHTML($TargetUser->user_id))
-			."' -- set is not assigned to that user.");
+		$c->add_error(
+			q{Can't generate hardcopy for set "},
+			$c->tag('code', $setID),
+			'" for user "',
+			$c->tag('code', $TargetUser->user_id),
+			'" -- set is not assigned to that user.'
+		);
 		return;
 	}
 
 	# see if the *real* user is allowed to access this problem set
-	if ($MergedSet->open_date > time and not $authz->hasPermissions($userID, "view_unopened_sets")) {
-		$self->add_errors("Can't generate hardcopy for set '".CGI::code(CGI::escapeHTML($setID))
-			."' for user '".CGI::code(CGI::escapeHTML($TargetUser->user_id))
-			."' -- set is not yet open.");
+	if ($MergedSet->open_date > time && !$authz->hasPermissions($userID, "view_unopened_sets")) {
+		$c->add_error(
+			q{Can't generate hardcopy for set "},
+			$c->tag('code', $setID),
+			'" for user "',
+			$c->tag('code', $TargetUser->user_id),
+			'" -- set is not yet open.'
+		);
 		return;
 	}
-	if (not $MergedSet->visible and not $authz->hasPermissions($userID, "view_hidden_sets")) {
-		$self->addbadmessage("Can't generate hardcopy for set '".CGI::code(CGI::escapeHTML($setID))
-			."' for user '".CGI::code(CGI::escapeHTML($TargetUser->user_id))
-			."' -- set is not visible to students.");
+	if (!$MergedSet->visible && !$authz->hasPermissions($userID, "view_hidden_sets")) {
+		$c->addbadmessage($c->maketext(
+			q{Can't generate hardcopy for set "[_1]" for user "[_2]". The set is not visible to students.},
+			$setID, $TargetUser->user_id,
+		));
 		return;
 	}
 
-	# get snippets
-	my $theme = $r->param('hardcopy_theme') // $ce->{hardcopyTheme};
-	my $themeDir = $ce->{webworkDirs}->{conf}.'/snippets/hardcopyThemes/'.$theme;
-	my $header = $MergedSet->hardcopy_header
-		? $MergedSet->hardcopy_header
-		: $ce->{webworkFiles}->{hardcopySnippets}->{setHeader};
-  if ($header eq 'defaultHeader') {$header = $ce->{webworkFiles}->{hardcopySnippets}->{setHeader};}
-	my $footer = $ce->{webworkFiles}->{hardcopySnippets}->{setFooter} //
-	  "$themeDir/hardcopySetFooter.pg";
-	my $divider = $ce->{webworkFiles}->{hardcopySnippets}->{problemDivider} // "$themeDir/hardcopyProblemDivider.tex";
+	# get PG header
+	my $header =
+		$MergedSet->hardcopy_header ? $MergedSet->hardcopy_header : $ce->{webworkFiles}{hardcopySnippets}{setHeader};
+	if ($header eq 'defaultHeader') { $header = $ce->{webworkFiles}{hardcopySnippets}{setHeader}; }
 
 	# get list of problem IDs
 	my @problemIDs = map { $_->[2] }
@@ -1203,53 +979,102 @@ sub write_set_tex {
 
 	# for versioned sets (gateways), we might have problems in a random
 	# order; reset the order of the problemIDs if this is the case
-	if ( defined( $MergedSet->problem_randorder ) &&
-	     $MergedSet->problem_randorder ) {
+	if (defined($MergedSet->problem_randorder)
+		&& $MergedSet->problem_randorder)
+	{
 		my @newOrder = ();
 
 		# to set the same order each time we set the random seed to the psvn,
 		# and to avoid messing with the system random number generator we use
 		# our own PGrandom object
 		my $pgrand = PGrandom->new();
-		$pgrand->srand( $MergedSet->psvn );
-		while ( @problemIDs ) {
+		$pgrand->srand($MergedSet->psvn);
+		while (@problemIDs) {
 			my $i = int($pgrand->rand(scalar(@problemIDs)));
-			push( @newOrder, $problemIDs[$i] );
+			push(@newOrder, $problemIDs[$i]);
 			splice(@problemIDs, $i, 1);
 		}
 		@problemIDs = @newOrder;
 	}
 
-	# write set header
-	$self->write_problem_tex($FH, $TargetUser, $MergedSet, 0, $header); # 0 => pg file specified directly
+	# write environment variables as LaTeX macros
+	for (qw(user_id student_id first_name last_name email_address section recitation)) {
+		print $FH '\\def\\webwork' . underscore_to_camel($_) . '{' . handle_underbar($TargetUser->{$_}) . "}%\n"
+			if $TargetUser->{$_};
+	}
+	for (qw(set_id description)) {
+		print $FH '\\def\\webwork' . underscore_to_camel($_) . '{' . handle_underbar($MergedSet->{$_}) . "}%\n"
+			if $MergedSet->{$_};
+	}
+	print $FH '\\def\\webworkPrettySetId{' . handle_underbar($MergedSet->{set_id}, 1) . "}%\n";
+	for (qw(open_date due_date answer_date)) {
+		if ($MergedSet->{$_}) {
+			print $FH '\\def\\webwork'
+				. underscore_to_camel($_) . '{'
+				. $c->formatDateTime($MergedSet->{$_}, $ce->{siteDefaults}{timezone}) . "}%\n";
+		}
+	}
+	# Leave reduced scoring date blank if it is disabled, or enabled but on (or somehow later) than the close date
+	if ($MergedSet->{reduced_scoring_date}
+		&& $ce->{pg}{ansEvalDefaults}{enableReducedScoring}
+		&& $MergedSet->{enable_reduced_scoring}
+		&& $MergedSet->{reduced_scoring_date} < $MergedSet->{due_date})
+	{
+		print $FH '\\def\\webworkReducedScoringDate{'
+			. $c->formatDateTime($MergedSet->{reduced_scoring_date}, $ce->{siteDefaults}{timezone}) . "}%\n";
+	}
 
-	print $FH "\\medskip\\hrule\\nobreak\\smallskip";
+	# write set header (theme presetheader, then PG header, then theme postsetheader)
+	print $FH $themeTree->findvalue('/theme/presetheader');
+	await $c->write_problem_tex($FH, $TargetUser, $MergedSet, $themeTree, 0, $header); # 0 => pg file specified directly
+	print $FH $themeTree->findvalue('/theme/postsetheader');
 
 	# write each problem
 	# for versioned problem sets (gateway tests) we like to include
 	#   problem numbers
 	my $i = 1;
 	while (my $problemID = shift @problemIDs) {
-		$self->write_tex_file($FH, $divider) if $i > 1;
-		$self->{versioned} = $i if $versioned;
-		$self->write_problem_tex($FH, $TargetUser, $MergedSet, $problemID);
+		$c->{versioned} = $i                                     if $versioned;
+		print $FH $themeTree->findvalue('/theme/problemdivider') if $i > 1;
+		await $c->write_problem_tex($FH, $TargetUser, $MergedSet, $themeTree, $problemID);
 		$i++;
 	}
 
+	# attempt to claim copyright
+	print $FH '\\webworkSetCopyrightFooter';
+
 	# write footer
-	$self->write_problem_tex($FH, $TargetUser, $MergedSet, 0, $footer); # 0 => pg file specified directly
+	print $FH $themeTree->findvalue('/theme/setfooter');
+
+	return;
 }
 
-sub write_problem_tex {
-	my ($self, $FH, $TargetUser, $MergedSet, $problemID, $pgFile) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $authz  = $r->authz;
-	my $userID = $r->param("user");
-	my $eUserID = $r->param("effectiveUser");
-	my $versioned = $self->{versioned};
-	my %canShowScore = %{$self->{canShowScore}};
+sub underscore_to_camel {
+	my $key = shift;
+	$key = ucfirst($key);
+	$key =~ s/_(\w)/uc($1)/ge;
+	return $key;
+}
+
+sub handle_underbar {
+	my $string     = shift;
+	my $make_space = shift // 0;
+	if ($make_space) {
+		$string =~ s/_/~/g;
+	} else {
+		$string =~ s/_/\\_/g;
+	}
+	return $string;
+}
+
+async sub write_problem_tex ($c, $FH, $TargetUser, $MergedSet, $themeTree, $problemID = 0, $pgFile = undef) {
+	my $ce           = $c->ce;
+	my $db           = $c->db;
+	my $authz        = $c->authz;
+	my $userID       = $c->param("user");
+	my $eUserID      = $c->param("effectiveUser");
+	my $versioned    = $c->{versioned};
+	my %canShowScore = %{ $c->{canShowScore} };
 
 	my @errors;
 
@@ -1257,33 +1082,39 @@ sub write_problem_tex {
 	my $MergedProblem;
 	if ($problemID) {
 		# a non-zero problem ID was given -- load that problem
-	    # we use $versioned to determine which merging routine to use
-		if ( $versioned ) {
-			$MergedProblem = $db->getMergedProblemVersion($MergedSet->user_id, $MergedSet->set_id, $MergedSet->version_id, $problemID);
+		# we use $versioned to determine which merging routine to use
+		if ($versioned) {
+			$MergedProblem =
+				$db->getMergedProblemVersion($MergedSet->user_id, $MergedSet->set_id, $MergedSet->version_id,
+					$problemID);
 		} else {
-			$MergedProblem = $db->getMergedProblem($MergedSet->user_id, $MergedSet->set_id, $problemID); # checked
+			$MergedProblem = $db->getMergedProblem($MergedSet->user_id, $MergedSet->set_id, $problemID);    # checked
 		}
 
 		# handle nonexistent problem
 		unless ($MergedProblem) {
-			$self->add_errors("Can't generate hardcopy for problem '"
-				.CGI::code(CGI::escapeHTML($problemID))."' in set '"
-				.CGI::code(CGI::escapeHTML($MergedSet->set_id))
-				."' for user '".CGI::code(CGI::escapeHTML($MergedSet->user_id))
-				."' -- problem does not exist in that set or is not assigned to that user.");
+			$c->add_error(
+				q{Can't generate hardcopy for problem "},
+				$c->tag('code', $problemID),
+				'" in set "',
+				$c->tag('code', $MergedSet->set_id),
+				'" for user "',
+				$c->tag('code', $MergedSet->user_id),
+				'" -- problem does not exist in that set or is not assigned to that user.'
+			);
 			return;
 		}
 	} elsif ($pgFile) {
 		# otherwise, we try an explicit PG file
 		$MergedProblem = $db->newUserProblem(
-			user_id => $MergedSet->user_id,
-			set_id => $MergedSet->set_id,
-			problem_id => 0,
-			source_file => $pgFile,
+			user_id       => $MergedSet->user_id,
+			set_id        => $MergedSet->set_id,
+			problem_id    => 0,
+			source_file   => $pgFile,
 			num_correct   => 0,
 			num_incorrect => 0,
 		);
-		die "newUserProblem failed -- WTF?" unless $MergedProblem; # this should never happen
+		die "newUserProblem failed -- WTF?" unless $MergedProblem;    # this should never happen
 	} else {
 		# this shouldn't happen -- error out for real
 		die "write_problem_tex needs either a non-zero \$problemID or a \$pgFile";
@@ -1291,23 +1122,28 @@ sub write_problem_tex {
 
 	# figure out if we're allowed to get correct answers, hints, and solutions
 	# (eventually, we'd like to be able to use the same code as Problem)
-	my $versionName = $MergedSet->set_id .
-		(( $versioned ) ?  ",v" . $MergedSet->version_id : '');
-
-	my $showCorrectAnswers  = $r->param("showCorrectAnswers")  || 0;
-	my $printStudentAnswers = $r->param("printStudentAnswers") || 0;
-	my $showHints           = $r->param("showHints")           || 0;
-	my $showSolutions       = $r->param("showSolutions")       || 0;
-	my $showComments        = $r->param("showComments")        || 0;
-
-	unless( ( $authz->hasPermissions($userID, "show_correct_answers_before_answer_date") or
-		  ( time > $MergedSet->answer_date or
-		    ( $versioned &&
-		      $MergedProblem->num_correct +
-		      $MergedProblem->num_incorrect >=
-		      $MergedSet->attempts_per_version &&
-		      $MergedSet->due_date == $MergedSet->answer_date ) ) ) &&
-		( $canShowScore{$MergedSet->user_id . "!$versionName"} ) ) {
+	my $versionName = $MergedSet->set_id . (($versioned) ? ",v" . $MergedSet->version_id : '');
+
+	my $showCorrectAnswers  = $c->param("showCorrectAnswers")  || 0;
+	my $printStudentAnswers = $c->param("printStudentAnswers") || 0;
+	my $showHints           = $c->param("showHints")           || 0;
+	my $showSolutions       = $c->param("showSolutions")       || 0;
+	my $showComments        = $c->param("showComments")        || 0;
+
+	unless (
+		(
+			$authz->hasPermissions($userID, "show_correct_answers_before_answer_date")
+			|| (
+				time > $MergedSet->answer_date
+				|| ($versioned
+					&& $MergedProblem->num_correct + $MergedProblem->num_incorrect >=
+					$MergedSet->attempts_per_version
+					&& $MergedSet->due_date == $MergedSet->answer_date)
+			)
+		)
+		&& ($canShowScore{ $MergedSet->user_id . "!$versionName" })
+		)
+	{
 		$showCorrectAnswers = 0;
 		$showSolutions      = 0;
 	}
@@ -1315,162 +1151,188 @@ sub write_problem_tex {
 	# FIXME -- there can be a problem if the $siteDefaults{timezone} is not defined?  Why is this?
 	# why does it only occur with hardcopy?
 
-	# we need an additional translation option for versioned sets; also,
-	#   for versioned sets include old answers in the set if we're also
-	#   asking for the answers
-	my $transOpts =
-		{ # translation options
-			displayMode     => "tex",
-			showHints       => $showHints          ? 1 : 0, # insure that this value is numeric
-			showSolutions   => $showSolutions      ? 1 : 0, # (or what? -sam)
-			processAnswers  => ($showCorrectAnswers || $printStudentAnswers) ? 1 : 0,
-			permissionLevel => $db->getPermissionLevel($userID)->permission,
-			effectivePermissionLevel => $db->getPermissionLevel($eUserID)->permission,
-		};
-
-	if ( $versioned && $MergedProblem->problem_id != 0 ) {
-
-		$transOpts->{QUIZ_PREFIX} = 'Q' . sprintf("%04d",$MergedProblem->problem_id()) . '_';
-
+	# Include old answers if answers were requested.
+	my $oldAnswers = {};
+	if ($printStudentAnswers) {
+		%{$oldAnswers} = decodeAnswers($MergedProblem->last_answer);
 	}
-	my $formFields = { };
-	if ( $showCorrectAnswers ||$printStudentAnswers ) {
-			my %oldAnswers = decodeAnswers($MergedProblem->last_answer);
-			$formFields->{$_} = $oldAnswers{$_} foreach (keys %oldAnswers);
-			print $FH "%% decoded old answers, saved. (keys = " . join(',', keys(%oldAnswers)) . "\n";
-		}
 
-#	warn("problem ", $MergedProblem->problem_id, ": source = ", $MergedProblem->source_file, "\n");
-
-	my $pg = WeBWorK::PG->new(
-		$ce,
+	my $pg = await renderPG(
+		$c,
 		$TargetUser,
-		scalar($r->param('key')), # avoid multiple-values problem
 		$MergedSet,
 		$MergedProblem,
 		$MergedSet->psvn,
-		$formFields, # no form fields!
-		$transOpts,
+		$oldAnswers,
+		{    # translation options
+			displayMode              => 'tex',
+			showHints                => $showHints,
+			showSolutions            => $showSolutions,
+			processAnswers           => $showCorrectAnswers || $printStudentAnswers,
+			permissionLevel          => $db->getPermissionLevel($userID)->permission,
+			effectivePermissionLevel => $db->getPermissionLevel($eUserID)->permission,
+			isInstructor             => $authz->hasPermissions($userID, 'view_answers'),
+			# Add the quiz prefix for versioned sets
+			$versioned && $MergedProblem->problem_id != 0
+			? (QUIZ_PREFIX => 'Q' . sprintf('%04d', $MergedProblem->problem_id()) . '_')
+			: ()
+		}
 	);
 
+	push(@{ $c->{resource_list} }, map { $pg->{resource_list}{$_} } keys %{ $pg->{resource_list} })
+		if ref $pg->{resource_list} eq 'HASH';
+
 	# only bother to generate this info if there were warnings or errors
 	my $edit_url;
 	my $problem_name;
 	my $problem_desc;
-	if ($pg->{warnings} ne "" or $pg->{flags}->{error_flag}) {
-		my $edit_urlpath = $r->urlpath->newFromModule(
-			"WeBWorK::ContentGenerator::Instructor::PGProblemEditor", $r,
-			courseID  => $r->urlpath->arg("courseID"),
-			setID     => $MergedProblem->set_id,
-			problemID => $MergedProblem->problem_id,
+	if ($pg->{warnings} ne '' || $pg->{flags}->{error_flag}) {
+		$edit_url = $c->systemLink(
+			$c->url_for(
+				'instructor_problem_editor_withset_withproblem',
+				setID     => $MergedProblem->set_id,
+				problemID => $MergedProblem->problem_id,
+			),
+			$MergedProblem->problem_id == 0
+				# link for a fake problem (like a header file)
+			? (params =>
+					{ sourceFilePath => $MergedProblem->source_file, problemSeed => $MergedProblem->problem_seed })
+				# link for a real problem
+			: (),
 		);
 
-		if ($MergedProblem->problem_id == 0) {
-			# link for an fake problem (like a header file)
-			$edit_url = $self->systemLink($edit_urlpath,
-				params => {
-					sourceFilePath => $MergedProblem->source_file,
-					problemSeed    => $MergedProblem->problem_seed,
-				},
-			);
-		} else {
-			# link for a real problem
-			$edit_url = $self->systemLink($edit_urlpath);
-		}
-
 		if ($MergedProblem->problem_id == 0) {
 			$problem_name = "snippet";
-			$problem_desc = $problem_name." '".$MergedProblem->source_file
-				."' for set '".$MergedProblem->set_id."' and user '"
-				.$MergedProblem->user_id."'";
+			$problem_desc =
+				$problem_name . " '"
+				. $MergedProblem->source_file
+				. "' for set '"
+				. $MergedProblem->set_id
+				. "' and user '"
+				. $MergedProblem->user_id . "'";
 		} else {
 			$problem_name = "problem";
-			$problem_desc = $problem_name." '".$MergedProblem->problem_id
-				."' in set '".$MergedProblem->set_id."' for user '"
-				.$MergedProblem->user_id."'";
+			$problem_desc =
+				$problem_name . " '"
+				. $MergedProblem->problem_id
+				. "' in set '"
+				. $MergedProblem->set_id
+				. "' for user '"
+				. $MergedProblem->user_id . "'";
 		}
 	}
 
 	# deal with PG warnings
-	if ($pg->{warnings} ne "") {
-		$self->add_errors(CGI::a({href=>$edit_url, target=>"WW_Editor"}, $r->maketext("~[Edit~]"))
-			.' '.$r->maketext("Warnings encountered while processing [_1]. Error text: [_2]", $problem_desc , CGI::br().CGI::pre(CGI::escapeHTML($pg->{warnings})))
+	if ($pg->{warnings}) {
+		$c->add_error(
+			$c->link_to(
+				$c->tag('button', type => 'button', class => 'btn btn-sm btn-secondary', $c->maketext('Edit')) =>
+					$edit_url,
+				target => 'WW_Editor'
+			),
+			' ',
+			$c->b($c->maketext(
+				"Warnings encountered while processing [_1]. Error text: [_2]",
+				$problem_desc,
+				$c->tag('br') . $c->tag('pre', $pg->{warnings})
+			))
 		);
 	}
 
 	# deal with PG errors
-	if ($pg->{flags}->{error_flag}) {
-		$self->add_errors(CGI::a({href=>$edit_url, target=>"WW_Editor"}, $r->maketext("~[Edit~]")).' '
-			.$r->maketext("Errors encountered while processing [_1]. This [_2] has been omitted from the hardcopy. Error text: [_3]", $problem_desc, $problem_name, CGI::br().CGI::pre(CGI::escapeHTML($pg->{errors})))
+	if ($pg->{flags}{error_flag}) {
+		$c->add_error(
+			$c->link_to(
+				$c->tag('button', type => 'button', class => 'btn btn-sm btn-secondary', $c->maketext('Edit')) =>
+					$edit_url,
+				target => 'WW_Editor'
+			),
+			' ',
+			$c->b($c->maketext(
+				'Errors encountered while processing [_1]. This [_2] has been omitted from the hardcopy. '
+					. 'Error text: [_3]',
+				$problem_desc, $problem_name, $c->tag('br') . $c->tag('pre', $pg->{errors})
+			))
 		);
 		return;
 	}
 
 	# if we got here, there were no errors (because errors cause a return above)
-	$self->{at_least_one_problem_rendered_without_error} = 1;
+	$c->{at_least_one_problem_rendered_without_error} = 1;
 
 	my $body_text = $pg->{body_text};
 
 	if ($problemID) {
+		my $id = $MergedProblem->problem_id;
 		if (defined($MergedSet) && $MergedSet->assignment_type eq 'jitar') {
 			# Use the pretty problem number if its a jitar problem
-			my $id = $MergedProblem->problem_id;
-			my $prettyID = join('.',jitar_id_to_seq($id));
-			print $FH "{\\bf " . $r->maketext("Problem [_1].", $prettyID) . "}";
-		} elsif ($MergedProblem->problem_id != 0) {
-			print $FH "{\\bf " . $r->maketext("Problem [_1].", $versioned ? $versioned : $MergedProblem->problem_id) . "}";
+			$id = join('.', jitar_id_to_seq($id));
+		} elsif ($id != 0 && $versioned) {
+			$id = $versioned;    # this cannot be right?
 		}
 
+		print $FH "\\def\\webworkProblemId{$id}%\n";
+		print $FH "\\def\\webworkProblemNumber{" . ($versioned ? $versioned : $id) . "}%\n";
+
 		my $problemValue = $MergedProblem->value;
-		if (defined($problemValue)) {
-			my $points = $problemValue == 1 ? $r->maketext('point') : $r->maketext('points');
-			print $FH " {\\bf\\footnotesize($problemValue $points)}";
-		}
+		print $FH "\\def\\webworkProblemWeight{$problemValue}%\n" if defined($problemValue);
 
-		if ($self->{can_show_source_file} && $r->param("show_source_file") eq "Yes") {
-			print $FH " {\\footnotesize\\path|" . $MergedProblem->source_file . "|}";
-		}
+		print $FH $themeTree->findvalue('/theme/problemheader');
 
+		if ($c->{can_show_source_file} && $c->param("show_source_file") eq "Yes") {
+			print $FH "{\\footnotesize\\path|" . $MergedProblem->source_file . "|}\n";
+		}
 		print $FH "\\smallskip\n\n";
 	}
 
+	# Include old answers if answers were requested.
+	if ($printStudentAnswers) {
+		print $FH "%% decoded old answers, saved. (keys = " . join(',', keys(%{$oldAnswers})) . ")\n" if %{$oldAnswers};
+	}
+
 	print $FH $body_text;
 
-	my @ans_entry_order = defined($pg->{flags}->{ANSWER_ENTRY_ORDER}) ? @{$pg->{flags}->{ANSWER_ENTRY_ORDER}} : ( );
+	my @ans_entry_order = defined($pg->{flags}->{ANSWER_ENTRY_ORDER}) ? @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} } : ();
 
 	# print the list of student answers if it is requested
-	if (  $printStudentAnswers &&
-	     $MergedProblem->problem_id != 0 && @ans_entry_order ) {
-			my $pgScore = $pg->{state}->{recorded_score};
-			my $corrMsg = ' submitted: ';
-			if ( $pgScore == 1 ) {
-				$corrMsg .= $r->maketext('(correct)');
-			} elsif ( $pgScore == 0 ) {
-				$corrMsg .= $r->maketext('(incorrect)');
-			} else {
-				$corrMsg .= $r->maketext('(score [_1])',$pgScore);
-			}
+	if ($printStudentAnswers
+		&& $MergedProblem->problem_id != 0
+		&& @ans_entry_order)
+	{
+		my $pgScore = $pg->{state}->{recorded_score};
+		my $corrMsg = ' submitted: ';
+		if ($pgScore == 1) {
+			$corrMsg .= $c->maketext('(correct)');
+		} elsif ($pgScore == 0) {
+			$corrMsg .= $c->maketext('(incorrect)');
+		} else {
+			$corrMsg .= $c->maketext('(score [_1])', $pgScore);
+		}
 
-			$corrMsg .= "\n \\\\ \n recorded: ";
-			my $recScore = $MergedProblem->status;
-			if ( $recScore == 1 ) {
-				$corrMsg .= $r->maketext('(correct)');
-			} elsif ( $recScore == 0 ) {
-				$corrMsg .= $r->maketext('(incorrect)');
-			} else {
-				$corrMsg .= $r->maketext('(score [_1])',$recScore);
-			}
+		$corrMsg .= "\n \\\\ \n recorded: ";
+		my $recScore = $MergedProblem->status;
+		if ($recScore == 1) {
+			$corrMsg .= $c->maketext('(correct)');
+		} elsif ($recScore == 0) {
+			$corrMsg .= $c->maketext('(incorrect)');
+		} else {
+			$corrMsg .= $c->maketext('(score [_1])', $recScore);
+		}
 
-			my $stuAnswers = "\\par{\\small{\\it ".
-			  $r->maketext("Answer(s) submitted:").
-			  "}\n" .
-			"\\vspace{-\\parskip}\\begin{itemize}\n";
-		for my $ansName ( @ans_entry_order ) {
+		my $stuAnswers =
+			"\\par{\\small{\\it "
+			. $c->maketext("Answer(s) submitted:") . "}\n"
+			. "\\vspace{-\\parskip}\\begin{itemize}\n";
+		for my $ansName (@ans_entry_order) {
 			my $stuAns;
-			if (defined $pg->{answers}{$ansName}{preview_latex_string} && $pg->{answers}{$ansName}{preview_latex_string} ne '') {
+			if (defined $pg->{answers}{$ansName}{preview_latex_string}
+				&& $pg->{answers}{$ansName}{preview_latex_string} ne '')
+			{
 				$stuAns = $pg->{answers}{$ansName}{preview_latex_string};
-			} elsif (defined $pg->{answers}{$ansName}{original_student_ans} && $pg->{answers}{$ansName}{original_student_ans} ne '') {
-				$stuAns = "\\text{".$pg->{answers}{$ansName}{original_student_ans}."}";
+			} elsif (defined $pg->{answers}{$ansName}{original_student_ans}
+				&& $pg->{answers}{$ansName}{original_student_ans} ne '')
+			{
+				$stuAns = "\\text{" . $pg->{answers}{$ansName}{original_student_ans} . "}";
 			} else {
 				$stuAns = "\\text{no response}";
 			}
@@ -1481,34 +1343,30 @@ sub write_problem_tex {
 	}
 
 	if ($showComments) {
-		my $userPastAnswerID = $db->latestProblemPastAnswer(
-			$r->urlpath->arg("courseID"),
-			$MergedProblem->user_id,
-			$versionName,
-			$MergedProblem->problem_id);
-
-		my $pastAnswer = $userPastAnswerID ? $db->getPastAnswer($userPastAnswerID) : 0;
-		my $comment = $pastAnswer && $pastAnswer->comment_string ? $pastAnswer->comment_string : "";
-
-		my $commentMsg = "\\par{\\small{\\it ".
-			$r->maketext("Instructor Feedback:").
-			"}\n".
-			"\\vspace{-\\parskip}\n".
-			"\\begin{lstlisting}\n$comment\\end{lstlisting}\n".
-			"\\par\n";
+		my $userPastAnswerID = $db->latestProblemPastAnswer($c->stash('courseID'),
+			$MergedProblem->user_id, $versionName, $MergedProblem->problem_id);
+
+		my $pastAnswer = $userPastAnswerID                          ? $db->getPastAnswer($userPastAnswerID) : 0;
+		my $comment    = $pastAnswer && $pastAnswer->comment_string ? $pastAnswer->comment_string           : "";
+
+		my $commentMsg =
+			"\\par{\\small{\\it "
+			. $c->maketext("Instructor Feedback:") . "}\n"
+			. "\\vspace{-\\parskip}\n"
+			. "\\begin{lstlisting}\n$comment\\end{lstlisting}\n"
+			. "\\par\n";
 		print $FH $commentMsg if $comment;
 	}
 
-	# write the list of correct answers is appropriate; ANSWER_ENTRY_ORDER
+	# write the list of correct answers if appropriate; ANSWER_ENTRY_ORDER
 	#   isn't defined for versioned sets?  this seems odd FIXME  GWCHANGE
 	if ($showCorrectAnswers && $MergedProblem->problem_id != 0 && @ans_entry_order) {
-	  my $correctTeX = "\\par{\\small{\\it ".
-	    $r->maketext("Correct Answers:").
-	    "}\n".
-	    "\\vspace{-\\parskip}\\begin{itemize}\n";
+		my $correctTeX =
+			"\\par{\\small{\\it " . $c->maketext("Correct Answers:") . "}\n" . "\\vspace{-\\parskip}\\begin{itemize}\n";
 
 		foreach my $ansName (@ans_entry_order) {
-			my $correctAnswer = $pg->{answers}{$ansName}{correct_ans_latex_string} || "\\text{".$pg->{answers}{$ansName}{correct_ans}."}";
+			my $correctAnswer = $pg->{answers}{$ansName}{correct_ans_latex_string}
+				|| "\\text{" . $pg->{answers}{$ansName}{correct_ans} . "}";
 			$correctTeX .= "\\item\n\$\\displaystyle $correctAnswer\$\n";
 		}
 
@@ -1516,37 +1374,28 @@ sub write_problem_tex {
 
 		print $FH $correctTeX;
 	}
-}
 
-sub write_tex_file {
-	my ($self, $FH, $file) = @_;
-
-	my $tex = eval { readFile($file) };
-	if ($@) {
-		$self->add_errors("Failed to include TeX file '".CGI::code(CGI::escapeHTML($file))."': "
-			.CGI::escapeHTML($@));
-	} else {
-		print $FH $tex;
+	if ($problemID) {
+		print $FH $themeTree->findvalue('/theme/problemfooter');
 	}
+
+	return;
 }
 
 ################################################################################
 # utilities
 ################################################################################
 
-sub add_errors {
-	my ($self, @errors) = @_;
-	push @{$self->{hardcopy_errors}}, @errors;
+sub add_error ($c, @error_parts) {
+	push @{ $c->{hardcopy_errors} }, $c->c(@error_parts)->join('');
 }
 
-sub get_errors {
-	my ($self) = @_;
-	return $self->{hardcopy_errors} ? @{$self->{hardcopy_errors}} : ();
+sub has_errors ($c) {
+	return scalar @{ $c->{hardcopy_errors} // [] };
 }
 
-sub get_errors_ref {
-	my ($self) = @_;
-	return $self->{hardcopy_errors};
+sub get_errors ($c) {
+	return $c->{hardcopy_errors};
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Home.pm b/lib/WeBWorK/ContentGenerator/Home.pm
index c57a676139..40af4074fb 100644
--- a/lib/WeBWorK/ContentGenerator/Home.pm
+++ b/lib/WeBWorK/ContentGenerator/Home.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Home;
-use base qw(WeBWorK::ContentGenerator);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -22,93 +22,30 @@ WeBWorK::ContentGenerator::Home - display a list of courses.
 
 =cut
 
-use strict;
-use warnings;
-#use CGI qw(-nosticky );
-use WeBWorK::CGI;
-use WeBWorK::Utils qw(readFile readDirectory);
-use WeBWorK::Utils::CourseManagement qw/listCourses/;
+use WeBWorK::Utils qw(readFile);
 use WeBWorK::Localize;
-sub info {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
 
+sub info ($c) {
 	my $result;
 
 	# This section should be kept in sync with the Login.pm version
-	my $site_info = $ce->{webworkFiles}->{site_info};
-	if (defined $site_info and $site_info) {
-		# deal with previewing a temporary file
-		# FIXME: DANGER: this code allows viewing of any file
-		# FIXME: this code is disabled because PGProblemEditor no longer uses editFileSuffix
-		#if (defined $r->param("editMode") and $r->param("editMode") eq "temporaryFile"
-		#		and defined $r->param("editFileSuffix")) {
-		#	$site_info .= $r->param("editFileSuffix");
-		#}
-
-		if (-f $site_info) {
-			my $text = eval { readFile($site_info) };
-			if ($@) {
-				$result = CGI::div({ class => 'alert alert-danger p-1 mb-0' }, $@);
-			} elsif ($text =~ /\S/) {
-				$result = $text;
-			}
+	my $site_info = $c->ce->{webworkFiles}{site_info};
+	if ($site_info && -f $site_info) {
+		# Show the site info file.
+		my $text = eval { readFile($site_info) };
+		if ($@) {
+			$result = $c->tag('div', class => 'alert alert-danger p-1 mb-0', $@);
+		} elsif ($text =~ /\S/) {
+			$result = $text;
 		}
 	}
 
-	if (defined $result and $result ne "") {
-	    return CGI::h2($r->maketext("Site Information")). $result;
-	} else {
-		return "";
-	}
+	return $result ? $c->c($c->tag('h2', $c->maketext('Site Information')), $result)->join('') : '';
 }
 
-# Override the if_can method to disable links for the home page.
-sub if_can {
-	my ($self, $arg) = @_;
-	return $arg eq 'links' ? 0 : $self->SUPER::if_can($arg);
-}
-
-sub body {
-	my ($self) = @_;
-	my $r = $self->r;
-
-	my $coursesDir = $r->ce->{webworkDirs}->{courses};
-	my $coursesURL = $r->ce->{webworkURLs}->{root};
-
-	my @courseIDs = listCourses($r->ce);
-	#filter underscores here!
-
-	my $haveAdminCourse = 0;
-	foreach my $courseID (@courseIDs) {
-		if ($courseID eq "admin") {
-			$haveAdminCourse = 1;
-			last;
-		}
-	}
-
-	print CGI::p($r->maketext("Welcome to WeBWorK!"));
-
-	if ($haveAdminCourse and !(-f "$coursesDir/admin/hide_directory")) {
-		my $urlpath = $r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets", $r, courseID => "admin");
-		print CGI::p(CGI::a({href=>$self->systemLink($urlpath, authen => 0)}, $r->maketext("Course Administration")));
-	}
-
-	print CGI::h2($r->maketext("Courses"));
-
-	print CGI::start_ul({class => "courses-list"});
-
-	foreach my $courseID (sort {lc($a) cmp lc($b) } @courseIDs) {
-		next if $courseID eq "admin"; # done already above
-		next if -f "$coursesDir/$courseID/hide_directory";
-		my $urlpath = $r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets", $r, courseID => $courseID);
-		print CGI::li(CGI::a({href=>$self->systemLink($urlpath, authen => 0)}, $courseID =~ s/_/ /gr));
-	}###place to use underscore sub
-
-	print CGI::end_ul();
-
-	return "";
+# Override the can method to disable links for the home page.
+sub can ($c, $arg) {
+	return $arg eq 'links' ? 0 : $c->SUPER::can($arg);
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor.pm b/lib/WeBWorK/ContentGenerator/Instructor.pm
deleted file mode 100644
index 261baf9811..0000000000
--- a/lib/WeBWorK/ContentGenerator/Instructor.pm
+++ /dev/null
@@ -1,758 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::ContentGenerator::Instructor;
-use base qw(WeBWorK::ContentGenerator);
-
-=head1 NAME
-
-WeBWorK::ContentGenerator::Instructor - Abstract superclass for the Instructor
-tools, providing useful utility functions.
-
-=cut
-
-use strict;
-use warnings;
-#use CGI qw(-nosticky );
-use WeBWorK::CGI;
-use File::Find;
-use WeBWorK::DB::Utils qw(initializeUserProblem);
-use WeBWorK::Debug;
-use WeBWorK::Utils qw(jitar_id_to_seq seq_to_jitar_id);
-
-=head1 METHODS
-
-=cut
-
-################################################################################
-# Primary assignment methods
-################################################################################
-
-=head2 Primary assignment methods
-
-=over
-
-=item assignSetToUser($userID, $GlobalSet)
-
-Assigns the given set and all problems contained therein to the given user. If
-the set (or any problems in the set) are already assigned to the user, a list of
-failure messages is returned.
-
-=cut
-
-sub assignSetToUser {
-	my ($self, $userID, $GlobalSet) = @_;
-	my $setID = $GlobalSet->set_id;
-	my $db = $self->{db};
-
-	my $UserSet = $db->newUserSet;
-	$UserSet->user_id($userID);
-	$UserSet->set_id($setID);
-
-	my @results;
-	my $set_assigned = 0;
-
-	eval { $db->addUserSet($UserSet) };
-	if ($@) {
-		if ($@ =~ m/user set exists/) {
-			push @results, "set $setID is already assigned to user $userID.";
-			$set_assigned = 1;
-		} else {
-			die $@;
-		}
-	}
-
-	my @GlobalProblems = grep { defined $_ } $db->getAllGlobalProblems($setID);
-	foreach my $GlobalProblem (@GlobalProblems) {
-		my @result = $self->assignProblemToUser($userID, $GlobalProblem);
-		push @results, @result if @result and not $set_assigned;
-	}
-
-	return @results;
-}
-
-sub assignSetVersionToUser {
-    my ( $self, $userID, $GlobalSet ) = @_;
-# in:  ($self,) $userID = the userID of the user to which to assign the set,
-#      $GlobalSet = the global set object.
-# out: a new set version is assigned to the user.
-# note: we assume that the global set and user are well defined.  I think this
-#    is a safe assumption.  it would be nice to just call assignSetToUser,
-#    but we run into trouble doing that because of the distinction between
-#    the setID and the setVersionID
-
-    my $setID = $GlobalSet->set_id;
-    my $db = $self->{db};
-
-# figure out what version we're on, reset setID, get a new user set
-# FIXME: old version; new call follows
-#    my $setVersionNum = $db->getUserSetVersionNumber( $userID, $setID );
-    my @allVersionIDs = $db->listSetVersions( $userID, $setID );
-    my $setVersionNum = ( @allVersionIDs ) ? $allVersionIDs[-1] : 0;
-    $setVersionNum++;
-    my $userSet = $db->newSetVersion;
-    $userSet->user_id( $userID );
-    $userSet->set_id( $setID );
-    $userSet->version_id( $setVersionNum );
-
-    my @results = ();
-    my $set_assigned = 0;
-
-# add the set to the database
-    eval { $db->addSetVersion( $userSet ) };
-    if ( $@ ) {
-	if ( $@ =~ m/user set exists/ ) {
-	    push( @results, "set $setID,v$setVersionNum is already assigned" .
-		  "to user $userID" );
-	    $set_assigned = 1;
-	} else {
-	    die $@;
-	}
-    }
-
-# populate set with problems
-    my @GlobalProblems = grep { defined $_ } $db->getAllGlobalProblems($setID);
-
-# keep track of problems assigned from groups so that we can have multiple
-#    problems from a given group, without duplicates
-    my %groupProblems = ();
-
-    foreach my $GlobalProblem ( @GlobalProblems ) {
-	$GlobalProblem->set_id( $setID );
-# this is getting called from within ContentGenerator, so that $self
-#    isn't an Instructor object---therefore, calling $self->assign...
-#    doesn't work.  the following is an ugly workaround that works b/c
-#    both Instructor and ContentGenerator objects have $self->{db}
-# FIXME  it would be nice to have a better solution to this
-	my @result =
-	    assignProblemToUserSetVersion( $self, $userID, $userSet,
-	    			           $GlobalProblem, \%groupProblems );
-	push( @results, @result ) if ( @result && not $set_assigned );
-    }
-
-    return @results;
-}
-
-
-=item unassignSetFromUser($userID, $setID, $problemID)
-
-Unassigns the given set and all problems therein from the given user.
-
-=cut
-
-sub unassignSetFromUser {
-	my ($self, $userID, $setID) = @_;
-	my $db = $self->{db};
-
-	$db->deleteUserSet($userID, $setID);
-}
-
-=item assignProblemToUser($userID, $GlobalProblem, $seed)
-
-Assigns the given problem to the given user. If the problem is already assigned
-to the user, an error string is returned. If $seed is defined, the UserProblem
-will be given that seed.
-
-=cut
-
-sub assignProblemToUser {
-	my ($self, $userID, $GlobalProblem, $seed) = @_;
-	my $db = $self->{db};
-
-	my $UserProblem = $db->newUserProblem;
-	$UserProblem->user_id($userID);
-	$UserProblem->set_id($GlobalProblem->set_id);
-	$UserProblem->problem_id($GlobalProblem->problem_id);
-	initializeUserProblem($UserProblem, $seed);
-
-	eval { $db->addUserProblem($UserProblem) };
-	if ($@) {
-		if ($@ =~ m/user problem exists/) {
-			return "problem " . $GlobalProblem->problem_id
-				. " in set " . $GlobalProblem->set_id
-				. " is already assigned to user $userID.";
-		} else {
-			die $@;
-		}
-	}
-
-	return ();
-}
-
-# $seed is optional -- if set, the UserProblem will be given that seed
-sub assignProblemToUserSetVersion {
-	my ($self, $userID, $userSet, $GlobalProblem, $groupProbRef, $seed) = @_;
-	my $db = $self->{db};
-
-# conditional to allow selection of problems from a group of problems,
-# defined in a set.
-
-    # problem groups are indicated by source files "group:problemGroupName"
-	if ( $GlobalProblem->source_file() =~ /^group:(.+)$/ ) {
-	    my $problemGroupName = $1;
-
-    # get list of problems in group
-	    my @problemList = $db->listGlobalProblems($problemGroupName);
-        # sanity check: if the group set hasn't been defined or doesn't
-        # actually contain problems (oops), then we can't very well assign
-        # this problem to the user.  we could go on and assign all other
-        # problems, but that results in a partial set.  so we die here if
-        # this happens.  philosophically we're requiring that the instructor
-        # set up the sets correctly or have to deal with the carnage after-
-        # wards.  I'm not sure that this is the best long-term solution.
-        # FIXME: this means that we may have created a set version that
-        # doesn't have any problems.  this is bad.  but it's hard to see
-        # where else to deal with it---fixing the problem requires checking
-        # at the set version-creation level that all the problems in the
-        # set are well defined.  FIXME
-	    die("Error in set version creation: no problems are available " .
-		"in problem group $problemGroupName.  Set " .
-		$userSet->set_id . " has been created for $userID, but " .
-		"does not contain the right problems.\n") if (! @problemList);
-
-	    my $nProb = @problemList;
-	    my $whichProblem = int(rand($nProb));
-
-    # we allow selection of multiple problems from a group, but want them to
-    #   be different.  there's probably a better way to do this
-	    if ( defined( $groupProbRef->{$problemGroupName} ) &&
-		 $groupProbRef->{$problemGroupName} =~ /\b$whichProblem\b/ ) {
-		my $nAvail = $nProb -
-		    ( $groupProbRef->{$problemGroupName} =~ tr/,// ) - 1;
-
-		die("Too many problems selected from group.") if ( ! $nAvail );
-
-		$whichProblem = int(rand($nProb));
-		while ( $groupProbRef->{$problemGroupName} =~ /\b$whichProblem\b/ ) {
-		    $whichProblem = ( $whichProblem + 1 )%$nProb;
-		}
-	    }
-	    if ( defined( $groupProbRef->{$problemGroupName} ) ) {
-		$groupProbRef->{$problemGroupName} .= ",$whichProblem";
-	    } else {
-		$groupProbRef->{$problemGroupName} = "$whichProblem";
-	    }
-
-	    my $prob = $db->getGlobalProblem($problemGroupName,
-					     $problemList[$whichProblem]);
-	    $GlobalProblem->source_file($prob->source_file());
-	}
-
-# all set; do problem assignment
-	my $UserProblem = $db->newProblemVersion;
-	$UserProblem->user_id($userID);
-	$UserProblem->set_id($userSet->set_id);
-	$UserProblem->version_id($userSet->version_id);
-	$UserProblem->problem_id($GlobalProblem->problem_id);
-	$UserProblem->source_file($GlobalProblem->source_file);
-	initializeUserProblem($UserProblem, $seed);
-
-	eval { $db->addProblemVersion($UserProblem) };
-	if ($@) {
-		if ($@ =~ m/user problem exists/) {
-			return "problem " . $GlobalProblem->problem_id
-				. " in set " . $GlobalProblem->set_id
-				. " is already assigned to user $userID.";
-		} else {
-			die $@;
-		}
-	}
-
-	return();
-}
-
-=item unassignProblemFromUser($userID, $setID, $problemID)
-
-Unassigns the given problem from the given user.
-
-=cut
-
-sub unassignProblemFromUser {
-	my ($self, $userID, $setID, $problemID) = @_;
-	my $db = $self->{db};
-
-	$db->deleteUserProblem($userID, $setID, $problemID);
-}
-
-=back
-
-=cut
-
-################################################################################
-# Secondary set assignment methods
-################################################################################
-
-=head2 Secondary assignment methods
-
-=over
-
-=item assignSetToAllUsers($setID)
-
-Assigns the set specified and all problems contained therein to all users in
-the course. This is more efficient than repeatedly calling assignSetToUser().
-If any assignments fail, a list of failure messages is returned.
-
-=cut
-
-sub assignSetToAllUsers {
-	my ($self, $setID) = @_;
-	my $db = $self->{db};
-
-	debug("$setID: getting user list");
-	my @userRecords = $db->getUsersWhere({ user_id => { not_like => 'set_id:%' } });
-	debug("$setID: (done with that)");
-
-	debug("$setID: getting problem list");
-	my @GlobalProblems = $db->getAllGlobalProblems($setID);
-	debug("$setID: (done with that)");
-
-	my @results;
-
-	foreach my $User (@userRecords) {
-		next unless $self->r->ce->status_abbrev_has_behavior($User->status, "include_in_assignment");
-		my $UserSet = $db->newUserSet;
-		my $userID = $User->user_id;
-		$UserSet->user_id($userID);
-		$UserSet->set_id($setID);
-		debug("$setID: adding UserSet for $userID");
-		eval { $db->addUserSet($UserSet) };
-		if ($@) {
-			next if $@ =~ m/user set exists/;
-			die $@;
-		}
-		debug("$setID: (done with that)");
-
-		debug("$setID: adding UserProblems for $userID");
-		foreach my $GlobalProblem (@GlobalProblems) {
-			my @result = $self->assignProblemToUser($userID, $GlobalProblem);
-			push @results, @result if @result;
-		}
-		debug("$setID: (done with that)");
-	}
-
-	return @results;
-}
-
-=item unassignSetFromAllUsers($setID)
-
-Unassigns the specified sets and all problems contained therein from all users.
-
-=cut
-
-sub unassignSetFromAllUsers {
-	my ($self, $setID) = @_;
-	my $db = $self->{db};
-
-	my @userIDs = $db->listSetUsers($setID);
-
-	foreach my $userID (@userIDs) {
-		$self->unassignSetFromUser($userID, $setID);
-	}
-}
-
-=item assignAllSetsToUser($userID)
-
-Assigns all sets in the course and all problems contained therein to the
-specified user. If any assignments fail, a list of failure messages is
-returned.
-
-=cut
-
-sub assignAllSetsToUser {
-	my ($self, $userID) = @_;
-	my $db = $self->{db};
-
-	my @GlobalSets = $db->getGlobalSetsWhere();
-
-	my @results;
-
-	for my $GlobalSet (@GlobalSets) {
-		my @result = $self->assignSetToUser($userID, $GlobalSet);
-		push @results, @result if @result;
-	}
-
-	return @results;
-}
-
-=item unassignAllSetsFromUser($userID)
-
-Unassigns all sets and all problems contained therein from the specified user.
-
-=cut
-
-sub unassignAllSetsFromUser {
-	my ($self, $userID) = @_;
-	my $db = $self->{db};
-
-	my @setIDs = $db->listUserSets($userID);
-
-	foreach my $setID (@setIDs) {
-		$self->unassignSetFromUser($userID, $setID);
-	}
-}
-
-=back
-
-=cut
-
-################################################################################
-# Utility assignment methods
-################################################################################
-
-=head2 Utility assignment methods
-
-=over
-
-=item assignSetsToUsers($setIDsRef, $userIDsRef)
-
-Assign each of the given sets to each of the given users. If any assignments
-fail, a list of failure messages is returned.
-
-=cut
-
-sub assignSetsToUsers {
-	my ($self, $setIDsRef, $userIDsRef) = @_;
-	my $db = $self->{db};
-
-	my @setIDs = @$setIDsRef;
-	my @userIDs = @$userIDsRef;
-	my @GlobalSets = $db->getGlobalSets(@setIDs);
-
-	my @results;
-
-	foreach my $GlobalSet (@GlobalSets) {
-		foreach my $userID (@userIDs) {
-			my @result = $self->assignSetToUser($userID, $GlobalSet);
-			push @results, @result if @result;
-		}
-	}
-
-	return @results;
-}
-
-=item unassignSetsFromUsers($setIDsRef, $userIDsRef)
-
-Unassign each of the given sets from each of the given users.
-
-=cut
-
-sub unassignSetsFromUsers {
-	my ($self, $setIDsRef, $userIDsRef) = @_;
-	my @setIDs = @$setIDsRef;
-	my @userIDs = @$userIDsRef;
-
-	foreach my $setID (@setIDs) {
-		foreach my $userID (@userIDs) {
-			$self->unassignSetFromUser($userID, $setID);
-		}
-	}
-}
-
-=item assignProblemToAllSetUsers($GlobalProblem)
-
-Assigns the problem specified to all users to whom the problem's set is
-assigned. If any assignments fail, a list of failure messages is returned.
-
-=cut
-
-sub assignProblemToAllSetUsers {
-	my ($self, $GlobalProblem) = @_;
-	my $db = $self->{db};
-	my $setID = $GlobalProblem->set_id;
-	my @userIDs = $db->listSetUsers($setID);
-
-	my @results;
-
-	foreach my $userID (@userIDs) {
-		my @result = $self->assignProblemToUser($userID, $GlobalProblem);
-		push @results, @result if @result;
-	}
-
-	return @results;
-}
-
-=back
-
-=cut
-
-################################################################################
-# Utility method for adding problems to a set
-################################################################################
-
-=head2 Utility method for adding problems to a set
-
-=over
-
-=cut
-
-sub addProblemToSet {
-	my ($self, %args) = @_;
-	my $db = $self->r->db;
-	my $value_default = $self->{ce}->{problemDefaults}->{value};
-	my $max_attempts_default = $self->{ce}->{problemDefaults}->{max_attempts};
-	my $showMeAnother_default = $self->{ce}->{problemDefaults}->{showMeAnother};
-	my $att_to_open_children_default = $self->{ce}->{problemDefaults}->{att_to_open_children};
-	my $counts_parent_grade_default = $self->{ce}->{problemDefaults}->{counts_parent_grade};
-	my $prPeriod_default = $self->{ce}->{problemDefaults}->{prPeriod};
-    # showMeAnotherCount is the number of times that showMeAnother has been clicked; initially 0
-	my $showMeAnotherCount = 0;
-
-
-	die "addProblemToSet called without specifying the set name." if $args{setName} eq "";
-	my $setName = $args{setName};
-
-	my $sourceFile = $args{sourceFile} or
-		die "addProblemToSet called without specifying the sourceFile.";
-
-	# The rest of the arguments are optional
-
-#	my $value = $args{value} || $value_default;
-	my $value = $value_default;
-	if (defined($args{value})){$value = $args{value};}  # 0 is a valid value for $args{value}
-
-	my $maxAttempts = $args{maxAttempts} || $max_attempts_default;
-	my $showMeAnother = $args{showMeAnother} // $showMeAnother_default;
-	my $prPeriod = $prPeriod_default;
-	if (defined($args{prPeriod})){
-		$prPeriod = $args{prPeriod};
-	}
-
-	my $problemID = $args{problemID};
-	my $countsParentGrade = $args{countsParentGrade} // $counts_parent_grade_default;
-	my $attToOpenChildren = $args{attToOpenChildren} // $att_to_open_children_default;
-
-	unless ($problemID) {
-
-	    my $set = $db->getGlobalSet($setName);
-	    # for jitar sets the new problem id is the one that
-	    # makes it a new top level problem
-	    if ($set && $set->assignment_type eq 'jitar') {
-		my @problemIDs = $db->listGlobalProblems($setName);
-		if (@problemIDs) {
-		  my @seq = jitar_id_to_seq($problemIDs[$#problemIDs]);
-		  $problemID = seq_to_jitar_id($seq[0]+1);
-		} else {
-		  $problemID = seq_to_jitar_id(1);
-		}
-	    } else {
-		$problemID = WeBWorK::Utils::max($db->listGlobalProblems($setName)) + 1;
-	    }
-	}
-
-	my $problemRecord = $db->newGlobalProblem;
-	$problemRecord->problem_id($problemID);
-	$problemRecord->set_id($setName);
-	$problemRecord->source_file($sourceFile);
-	$problemRecord->value($value);
-	$problemRecord->max_attempts($maxAttempts);
-	$problemRecord->att_to_open_children($attToOpenChildren);
-	$problemRecord->counts_parent_grade($countsParentGrade);
-	$problemRecord->showMeAnother($showMeAnother);
-	$problemRecord->{showMeAnotherCount}=$showMeAnotherCount;
-	$problemRecord->prPeriod($prPeriod);
-	$problemRecord->prCount(0);
-	$db->addGlobalProblem($problemRecord);
-
-	return $problemRecord;
-}
-
-=back
-
-=cut
-
-################################################################################
-# Utility methods
-################################################################################
-
-=head2 Utility methods
-
-=over
-
-=cut
-
-sub hiddenEditForUserFields {
-	my ($self, @editForUser) = @_;
-	my $return = "";
-	foreach my $editUser (@editForUser) {
-		$return .= CGI::input({type=>"hidden", name=>"editForUser", value=>$editUser});
-	}
-
-	return $return;
-}
-
-sub userCountMessage {
-	my ($self, $count, $numUsers) = @_;
-
-	my $message;
-	if ($count == 0) {
-		$message = CGI::em($self->r->maketext("no students"));
-	} elsif ($count == $numUsers) {
-		$message = $self->r->maketext("all students");
-	} elsif ($count == 1) {
-		$message = $self->r->maketext("1 student");
-	} elsif ($count > $numUsers || $count < 0) {
-		$message = CGI::em($self->r->maketext("an impossible number of users: [_1] out of [_2]",$count,$numUsers));
-	} else {
-		$message = $self->r->maketext("[_1] students out of [_2]", $count, $numUsers);
-	}
-
-	return $message;
-}
-
-sub setCountMessage {
-	my ($self, $count, $numSets) = @_;
-	my $r = $self->r;
-
-	my $message;
-	if ($count == 0) {
-		$message = CGI::em($r->maketext("no sets"));
-	} elsif ($count == $numSets) {
-		$message = $r->maketext("all sets");
-	} elsif ($count == 1) {
-		$message = "1 ".$r->maketext("set");
-	} elsif ($count > $numSets || $count < 0) {
-		$message = CGI::em($self->r->maketext("an impossible number of sets: [_1] out of [_2]",$count,$numSets));
-	} else {
-		$message = $count." ".$r->maketext("sets");
-	}
-
-	return $message;
-}
-
-sub read_dir {  # read a directory
-	my $self      = shift;
-	my $directory = shift;
-	my $pattern   = shift;
-	my @files = grep /$pattern/, WeBWorK::Utils::readDirectory($directory);
-	return sort @files;
-}
-
-=back
-
-=cut
-
-################################################################################
-# Methods for listing various types of files
-################################################################################
-
-=head2 Methods for listing various types of files
-
-=over
-
-=cut
-
-# list classlist files
-sub getCSVList {
-	my ($self) = @_;
-	my $ce = $self->{ce};
-	my $dir = $ce->{courseDirs}->{templates};
-	return grep { not m/^\./ and m/\.lst$/ and -f "$dir/$_" } WeBWorK::Utils::readDirectory($dir);
-}
-
-sub loadSetDefListFile {
-	my $file = shift;
-
-	if (-r $file) {
-		my $data = do {
-			open(my $fh, "<:encoding(UTF-8)", $file)
-				or die "FATAL: Unable to open '$file'!";
-			local $/;
-			<$fh>;
-		};
-
-		return @{ JSON->new->decode($data) };
-	}
-
-	return;
-}
-
-sub getDefList {
-	my $self   = shift;
-	my $ce     = $self->{ce};
-	my $topdir = $ce->{courseDirs}{templates};
-
-	# Search to a depth of the setDefSearchDepth value plus the depth of the templates directory.
-	my $max_depth = $ce->{options}{setDefSearchDepth} + @{ [ $topdir =~ /\//g ] };
-
-	my @found_set_defs;
-
-	# get_set_defs_wanted is a closure over @found_set_defs
-	my $get_set_defs_wanted = sub {
-		$File::Find::prune = 1, return
-			if $File::Find::dir =~ /^$topdir\/Library/ || $File::Find::dir =~ /^$topdir\/Contrib/;
-		$File::Find::prune = 1, return if @{ [ $File::Find::dir =~ /\//g ] } > $max_depth;
-		push @found_set_defs, $_ =~ s|^$topdir/?||r if m|/set[^/]*\.def$|;
-	};
-
-	find({ wanted => $get_set_defs_wanted, follow_fast => 1, no_chdir => 1 }, $topdir);
-
-	# Load the OPL set definition files from the list file.
-	push(@found_set_defs, loadSetDefListFile("$ce->{webworkDirs}{htdocs}/DATA/library-set-defs.json"))
-		if ($ce->{options}{useOPLdefFiles});
-
-	# Load the Contrib set definition files from the list file.
-	push(@found_set_defs, loadSetDefListFile("$ce->{webworkDirs}{htdocs}/DATA/contrib-set-defs.json"))
-		if ($ce->{options}{useContribDefFiles});
-
-	my @depths;
-	my @caps;
-	for (@found_set_defs) {
-		push @depths, scalar(@{ [ $_ =~ /\//g ] });
-		push @caps,   uc($_);
-	}
-	return @found_set_defs[ sort { $depths[$a] <=> $depths[$b] || $caps[$a] cmp $caps[$b] } 0 .. $#found_set_defs ];
-}
-
-sub getScoringFileList {
-	my ($self) = @_;
-	my $ce = $self->{ce};
-	my $dir = $ce->{courseDirs}->{scoring};
-	return $self->read_dir($dir, qr/.*\.csv/);
-}
-
-sub getTemplateFileList {  # find all .pg files under the template tree (time consuming)
-	my ($self) = shift;
-	my $subDir = shift;
-	my $ce = $self->{ce};
-	$subDir = '' unless defined $subDir;
-	my $dir = $ce->{courseDirs}->{templates}."/$subDir";
-	# FIXME  currently allows one to see most files in the templates directory.
-	# a better facility for handling auxiliary files would be nice.
-	return $self->read_dir($dir, qr/\.pg$|.*\.html|\.png|\.gif|\.txt|\.pl/);
-}
-sub getTemplateDirList {  # find all .pg files under the template tree (time consuming)
-	my ($self) = @_;
-	my $ce = $self->{ce};
-	my $dir = $ce->{courseDirs}->{templates};
-	my @list = ();
-	my $wanted = sub { if (-d $_ ) {
-	                        my $current = $_;
-	                        return if $current =~/CVS/;
-	                        return if -l $current;   # don't list links
-	                        my $name = $File::Find::name;
-	                        $name = " Top" if $current =/^\./; #  top directory
-							$name =~ s/^$dir\///;
-							push @list, $name
-					   }
-	};
-	File::Find::find($wanted, $dir);
-	return sort @list;
-}
-
-=back
-
-=cut
-
-1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm b/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm
index 1ff2170744..3e8edb08bf 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,9 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Instructor::AchievementEditor;
-use base qw(WeBWorK);
-use base qw(WeBWorK::ContentGenerator::Instructor);
-use base qw(WeBWorK::ContentGenerator::renderViaXMLRPC);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -24,680 +22,315 @@ WeBWorK::ContentGenerator::Instructor::AchievementEditor - edit an achevement ev
 
 =cut
 
-use strict;
-use warnings;
-#use CGI qw(-nosticky );
-use WeBWorK::CGI;
-use WeBWorK::Utils qw(readFile surePathToFile path_is_subdir x getAssetURL);
 use HTML::Entities;
-use URI::Escape;
-use WeBWorK::Utils qw(has_aux_files not_blank);
 use File::Copy;
-use WeBWorK::Utils::Tasks qw(fake_user fake_set);
-use WeBWorK::ContentGenerator::Instructor::CodeMirrorEditor;
-use Fcntl;
 
+use WeBWorK::Utils qw(not_blank path_is_subdir x);
 
 use constant ACTION_FORMS => [qw(save save_as)];
 use constant ACTION_FORM_TITLES => {
-save        => x("Save"),
-save_as     => x("Save As"),
+	save    => x('Save'),
+	save_as => x('Save As'),
 };
 
-use constant DEFAULT_ICON => "defaulticon.png";
+use constant DEFAULT_ICON => 'defaulticon.png';
 
-sub pre_header_initialize {
-	my ($self)         = @_;
-	my $r              = $self->r;
-	my $ce             = $r->ce;
-	my $urlpath        = $r->urlpath;
-	my $authz          = $r->authz;
-	my $user           = $r->param('user');
-	$self->{courseID}   = $urlpath->arg("courseID");
-	$self->{achievementID}      = $r->urlpath->arg("achievementID") ;
+sub pre_header_initialize ($c) {
+	my $ce    = $c->ce;
+	my $authz = $c->authz;
+	my $user  = $c->param('user');
+	$c->{courseID}      = $c->stash('courseID');
+	$c->{achievementID} = $c->stash('achievementID');
 
-	my $submit_button   = $r->param('submit');  # obtain submit command from form
-	my $actionID        = $r->param('action');
+	# Make sure that are defined for the templates.
+	$c->stash->{formsToShow}         = ACTION_FORMS();
+	$c->stash->{actionFormTitles}    = ACTION_FORM_TITLES();
+	$c->stash->{achievementContents} = '';
 
 	# Check permissions
-	return unless ($authz->hasPermissions($user, "edit_achievements"));
+	return unless ($authz->hasPermissions($user, 'edit_achievements'));
 
-	#get the achievement
-	my $Achievement = $r->db->getAchievement($self->{achievementID});
+	# Get the achievement
+	my $Achievement = $c->db->getAchievement($c->{achievementID});
 
-	if (not $Achievement) {
-	    $self->addbadmessage("Achievement $self->{achievementID} not found!");
-	    die;
+	if (!$Achievement) {
+		$c->addbadmessage("Achievement $c->{achievementID} not found!");
+		return;
 	}
 
-	$self->{achievement} = $Achievement;
-	$self->{sourceFilePath} = $ce->{courseDirs}->{achievements}."/".$Achievement->test;
-	$self->{r_achievementContents}= undef;
+	$c->{achievement}    = $Achievement;
+	$c->{sourceFilePath} = $ce->{courseDirs}{achievements} . '/' . $Achievement->test;
 
-	#perform a save or save_as action
- 	if ($actionID) {
- 		unless (grep { $_ eq $actionID } @{ ACTION_FORMS() } ) {
- 			die "Action $actionID not found";
- 		}
+	my $actionID = $c->param('action');
 
+	# Perform a save or save_as action
+	if ($actionID) {
+		unless (grep { $_ eq $actionID } @{ ACTION_FORMS() }) {
+			die "Action $actionID not found";
+		}
 
 		my $actionHandler = "${actionID}_handler";
-		my %genericParams =();
-		my %actionParams = $self->getActionParams($actionID);
-		my %tableParams = ();
-		$self->{action}= $actionID;
-		$self->$actionHandler(\%genericParams, \%actionParams, \%tableParams);
-
- 	} else {
-	    # we just opened up this file for the first time
- 		$self->{action}='fresh_edit';
- 		my $actionHandler = "fresh_edit_handler";
- 		my %genericParams;
- 		my %actionParams = ();
- 		my %tableParams = ();
-		my $achievementContents = '';
-		$self->{r_achievementContents}=\$achievementContents;
- 		$self->$actionHandler(\%genericParams, \%actionParams, \%tableParams);
- 	}
-
-
-	##############################################################################
-	# Return
-	#   If  file saving fails or
-	#   if no redirects are required. No further processing takes place in this subroutine.
-	#   Redirects are required only for the following submit values
-	#        'Save'
-	#        'Save as'
-	#
-	#########################################
-
-	return if $self->{failure};
-	# FIXME: even with an error we still open a new page because of the target specified in the form
-	my $action = $self->{action};
-	return ;
-
-}
-
-
-sub initialize  {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $authz = $r->authz;
-	my $user = $r->param('user');
-	my $sourceFilePath = $self->{sourceFilePath};
-
-
-	# Check permissions
-	return unless ($authz->hasPermissions($user, "edit_achievements"));
-
-
-	$self->addmessage($r->param('status_message') ||'');  # record status messages carried over if this is a redirect
-
-	# Check source file path
-	if ( not( -e $sourceFilePath) ) {
-	    $self->addbadmessage("The file '".$self->shortPath($sourceFilePath)."' cannot be found.");
+		$c->$actionHandler;
 	}
-}
-
-sub path {
-	my ($self, $args) = @_;
-	my $r = $self->r;
-	my $urlpath = $r->urlpath;
-	my $courseName  = $urlpath->arg("courseID");
-	my $achievementName = $r->urlpath->arg("achievementID") || '';
-
-	# we need to build a path to the achievement being edited by hand, since it is not the same as the urlpath
-	# For this page the bread crum path leads back to the problem being edited, not to the Instructor tool.
-	my @path = ( 'WeBWork', $r->location,
-	          "$courseName", $r->location."/$courseName",
-		  $r->maketext('Achievement'), $r->location."/$courseName/instructor/achievement_list",
-	          "$achievementName",    $r->location."/$courseName/instructor/achievement_list",
-	);
-
-	#print "\n<!-- BEGIN " . __PACKAGE__ . "::path -->\n";
-	print $self->pathMacro($args, @path);
-	#print "<!-- END " . __PACKAGE__ . "::path -->\n";
-
-	return "";
-}
-
-sub title {
-	my $self = shift;
-	my $r = $self->r;
-	my $courseName    = $r->urlpath->arg("courseID");
-	my $achievementID  = $r->urlpath->arg("achievementID");
-
-	return $r->maketext("Achievement Evaluator for achievement [_1]", $achievementID);
 
+	return;
 }
 
-sub body {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $db = $r->db;
-	my $ce = $r->ce;
-	my $authz = $r->authz;
-	my $user = $r->param('user');
-
-	# Check permissions
-	return CGI::div({ class => 'alert alert-danger p-1' }, "You are not authorized to edit achievements.")
-		unless $authz->hasPermissions($user, "edit_achievements");
-
-	# Gathering info
-	my $sourceFilePath    = $self->{sourceFilePath}; # path to the permanent file to be edited
-	my $achievementID     = $self->{achievementID} ;
-	my $Achievement       = $self->{achievement};
-
-
-	#########################################################################
-	# Find the text for the achievement
-	#########################################################################
-
-	my $achievementContents = ${$self->{r_achievementContents}};
-
-	unless ( $achievementContents =~/\S/)   { # non-empty contents
-	    die "Path is Unsafe!" unless path_is_subdir($sourceFilePath, $ce->{courseDirs}->{achievements}, 1);
+sub initialize ($c) {
+	my $authz          = $c->authz;
+	my $user           = $c->param('user');
+	my $sourceFilePath = $c->{sourceFilePath};
 
-	    eval { $achievementContents = WeBWorK::Utils::readFile($sourceFilePath) };
+	return unless ($authz->hasPermissions($user, 'edit_achievements'));
 
-	    $achievementContents = $@ if $@;
+	$c->addmessage($c->param('status_message') || '');    # Record status messages carried over from a redirect
 
-	} else {
-	    #warn "obtaining input from r_problemContents";
+	# Check source file path
+	if (not(-e $sourceFilePath)) {
+		$c->addbadmessage('The file "' . $c->shortPath($sourceFilePath) . '" cannot be found.');
+		return;
 	}
 
-	my $header = CGI::i($r->maketext("Editing achievement in file '[_1]'", $self->shortPath($sourceFilePath)));
-
-	#########################################################################
-	# Format the page
-	#########################################################################
-
-	print CGI::div({ class => 'mb-2' }, $header),
-		CGI::start_form({
-			method  => 'POST',
-			id      => 'editor',
-			name    => 'editor',
-			action  => $r->uri,
-			enctype => 'application/x-www-form-urlencoded'
-		}),
-		$self->hidden_authen_fields,
-		(not_blank($self->{sourceFilePath}))
-		? CGI::hidden({ name => 'sourceFilePath', value => $self->{sourceFilePath} })
-		: '';
-
-	WeBWorK::ContentGenerator::Instructor::CodeMirrorEditor::output_codemirror_html($r, 'achievementContents',
-		$achievementContents);
-
-	######### print action forms
-	my @formsToShow = @{ ACTION_FORMS() };
-	my %actionFormTitles = %{ ACTION_FORM_TITLES() };
-	my $default_choice;
-
-	my @tabArr;
-	my @contentArr;
-
-	for my $actionID (@formsToShow) {
-		my $actionForm = "${actionID}_form";
-		my $line_contents = $self->$actionForm($self->getActionParams($actionID));
-		my $active = '';
-
-		if ($line_contents) {
-			$active = ' active', $default_choice = $actionID unless $default_choice;
-
-			push(@tabArr, CGI::li({ class => 'nav-item', role => 'presentation' },
-				CGI::a({
-						href => "#$actionID",
-						class => "nav-link action-link$active",
-						id => "$actionID-tab",
-						data_action => $actionID,
-						data_bs_toggle => 'tab',
-						data_bs_target => "#$actionID",
-						role => 'tab',
-						aria_controls => $actionID,
-						aria_selected => $active ? 'true' : 'false'
-					},
-					$r->maketext($actionFormTitles{$actionID}))));
-			push(@contentArr, CGI::div({
-					class => 'tab-pane fade mb-2' . ($active ? " show$active" : ""),
-					id => $actionID,
-					role => 'tabpanel',
-					aria_labelledby => "$actionID-tab"
-				}, $line_contents));
+	# Find the text for the achievement.
+	unless ($c->stash->{achievementContents} =~ /\S/) {
+		unless (path_is_subdir($sourceFilePath, $c->ce->{courseDirs}{achievements}, 1)) {
+			$c->addbadmessage('Path is Unsafe!');
+			return;
 		}
-	}
 
-	print CGI::hidden(-name => 'action', -id => 'current_action', -value => $default_choice);
-	print CGI::div(
-		CGI::ul({ class => 'nav nav-tabs mb-2', role => 'tablist' }, @tabArr),
-		CGI::div({ class => 'tab-content' }, @contentArr)
-	);
-
-	print CGI::div(
-		CGI::submit({ name => 'submit', value => $r->maketext("Take Action!"), class => 'btn btn-primary' }));
-
-	print CGI::end_form();
+		eval { $c->stash->{achievementContents} = WeBWorK::Utils::readFile($sourceFilePath) };
+		$c->stash->{achievementContents} = $@ if $@;
+	}
 
-	return "";
+	return;
 }
 
-#
-#  Convert long paths to [ACHEVDIR]
-#
-sub shortPath {
-  my $self = shift; my $file = shift;
-  my $ache = $self->r->ce->{courseDirs}{achievements};
-  $file =~ s|^$ache|[ACHEVDIR]|;
-  return $file;
+sub page_title ($c) {
+	return $c->maketext('Achievement Evaluator for achievement [_1]', $c->stash('achievementID'));
 }
 
-################################################################################
-# Utilities
-################################################################################
-
-sub getRelativeSourceFilePath {
-	my ($self, $sourceFilePath) = @_;
-
-	my $achievementsDir = $self->r->ce->{courseDirs}->{achievements};
-	$sourceFilePath =~ s|^${achievementsDir}/*||; # remove templates path and any slashes that follow
+# Convert long paths to [ACHEVDIR]
+sub shortPath ($c, $file) {
+	my $ache = $c->ce->{courseDirs}{achievements};
+	$file =~ s|^$ache|[ACHEVDIR]|;
+	return $file;
+}
 
+sub getRelativeSourceFilePath ($c, $sourceFilePath) {
+	my $achievementsDir = $c->ce->{courseDirs}->{achievements};
+	$sourceFilePath =~ s|^${achievementsDir}/*||;    # remove templates path and any slashes that follow
 	return $sourceFilePath;
 }
 
-sub saveFileChanges {
-
-################################################################################
-# saveFileChanges does most of the work. it is a separate method so that it can
-# be called from either pre_header_initialize() or initilize(), depending on
+# saveFileChanges does most of the work. It is a separate method so that it can
+# be called from either pre_header_initialize or initilize, depending on
 # whether a redirect is needed or not.
-#
-# it actually does a lot more than save changes to the file being edited, and
-# sometimes less.
-################################################################################
+sub saveFileChanges ($c, $outputFilePath, $achievementContents = undef) {
+	my $ce = $c->ce;
 
-	my ($self, $outputFilePath, $achievementContents ) = @_;
- 	my $r             = $self->r;
- 	my $ce            = $r->ce;
-
-	my $action          = $self->{action}||'no action';
-
-	if (defined($achievementContents) and ref($achievementContents) ) {
+	if (defined($achievementContents) and ref($achievementContents)) {
 		$achievementContents = ${$achievementContents};
-	} elsif( ! not_blank($achievementContents)  ) {      # if the AchievementContents is undefined or empty
-		$achievementContents = ${$self->{r_achievementContents}};
+	} elsif (!not_blank($achievementContents)) {    # if the AchievementContents is undefined or empty
+		$achievementContents = $c->stash->{achievementContents};
 	}
 
-
-	unless (not_blank($outputFilePath) ) {
-	    $self->addbadmessage($r->maketext("You must specify an file name in order to save a new file."));
-	    return "";
+	unless (not_blank($outputFilePath)) {
+		$c->addbadmessage($c->maketext('You must specify an file name in order to save a new file.'));
+		return '';
 	}
-	my $do_not_save    = 0 ;       # flag to prevent saving of file
-	my $editErrors = '';
+	my $do_not_save = 0;                            # flag to prevent saving of file
+	my $editErrors  = '';
 
-	##############################################################################
 	# write changes to the approriate files
 	# FIXME  make sure that the permissions are set correctly!!!
 	# Make sure that the warning is being transmitted properly.
-	##############################################################################
 
 	my $writeFileErrors;
-	if ( not_blank($outputFilePath)  ) {   # save file
-
-	    # make sure any missing directories are created
-	    WeBWorK::Utils::surePathToFile($ce->{courseDirs}->{achievements},
-					   $outputFilePath);
-	    die "outputFilePath is unsafe!" unless path_is_subdir($outputFilePath, $ce->{courseDirs}->{achievements}, 1); # 1==path can be relative to dir
-
-	    eval {
-		local *OUTPUTFILE;
-		open OUTPUTFILE,  ">$outputFilePath"
-		    or die "Failed to open $outputFilePath";
-		print OUTPUTFILE $achievementContents;
-		close OUTPUTFILE;
-		# any errors are caught in the next block
-	    };
-
-	    $writeFileErrors = $@ if $@;
-	}
-
-	###########################################################
-	# Catch errors in saving files,
-	###########################################################
+	if (not_blank($outputFilePath)) {    # save file
 
-	$self->{saveError} = $do_not_save;    # don't do redirects if the file was not saved.
-	                                    # don't unlink files or send success messages
+		# make sure any missing directories are created
+		WeBWorK::Utils::surePathToFile($ce->{courseDirs}->{achievements}, $outputFilePath);
+		die 'outputFilePath is unsafe!'
+			unless path_is_subdir($outputFilePath, $ce->{courseDirs}->{achievements}, 1);
 
-	if ($writeFileErrors) {
-	    # get the current directory from the outputFilePath
-	    $outputFilePath =~ m|^(/.*?/)[^/]+$|;
-	    my $currentDirectory = $1;
-
-	    my $errorMessage;
-	    # check why we failed to give better error messages
-	    if ( not -w $ce->{courseDirs}->{achievements} ) {
-		$errorMessage = $r->maketext("Write permissions have not been enabled in the templates directory.  No changes can be made.");
-	    } elsif ( not -w $currentDirectory ) {
-		$errorMessage = $r->maketext("Write permissions have not been enabled in '[_1]'.  Changes must be saved to a different directory for viewing.", $self->shortPath($currentDirectory));
-	    } elsif ( -e $outputFilePath and not -w $outputFilePath ) {
-		$errorMessage = $r->maketext("Write permissions have not been enabled for '[_1]'.  Changes must be saved to another file for viewing.", $self->shortPath($outputFilePath));
-	    } else {
-		$errorMessage = $r->maketext("Unable to write to '[_1]': [_2]", $self->shortPath($outputFilePath),$writeFileErrors);
-	    }
-
-	    $self->{failure} = 1;
-	    $self->addbadmessage(CGI::p($errorMessage));
+		eval {
+			open my $OUTPUTFILE, '>', $outputFilePath or die "Failed to open $outputFilePath";
+			print $OUTPUTFILE $achievementContents;
+			close $OUTPUTFILE;
+		};
 
+		$writeFileErrors = $@ if $@;
 	}
 
-	unless( $writeFileErrors or $do_not_save) {  # everything worked!  unlink and announce success!
-
-		if ( defined($outputFilePath) and ! $self->{failure} ) {
-		            # don't announce saving of temporary editing files
-			my $msg = $r->maketext("Saved to file '[_1]'", $self->shortPath($outputFilePath));
+	# Catch errors in saving files,
+	$c->{saveError} = $do_not_save;    # Don't do redirects if the file was not saved.
+									   # Don't unlink files or send success messages
 
-			$self->addgoodmessage($msg);
+	if ($writeFileErrors) {
+		# Get the current directory from the outputFilePath
+		$outputFilePath =~ m|^(/.*?/)[^/]+$|;
+		my $currentDirectory = $1;
+
+		my $errorMessage;
+		# Check why we failed to give better error messages
+		if (not -w $ce->{courseDirs}->{achievements}) {
+			$errorMessage = $c->maketext(
+				'Write permissions have not been enabled in the templates directory.  No changes can be made.');
+		} elsif (not -w $currentDirectory) {
+			$errorMessage = $c->maketext(
+				'Write permissions have not been enabled in "[_1]".  '
+					. 'Changes must be saved to a different directory for viewing.',
+				$c->shortPath($currentDirectory)
+			);
+		} elsif (-e $outputFilePath and not -w $outputFilePath) {
+			$errorMessage = $c->maketext(
+				'Write permissions have not been enabled for "[_1]".  '
+					. 'Changes must be saved to another file for viewing.',
+				$c->shortPath($outputFilePath)
+			);
+		} else {
+			$errorMessage =
+				$c->maketext('Unable to write to "[_1]": [_2]', $c->shortPath($outputFilePath), $writeFileErrors);
 		}
 
+		$c->{failure} = 1;
+		$c->addbadmessage($errorMessage);
 	}
 
-
-}  # end saveFileChanges
-
-
-
-
-
-sub getActionParams {
-	my ($self, $actionID) = @_;
-	my $r = $self->{r};
-
-	my %actionParams=();
-	foreach my $param ($r->param) {
-		next unless $param =~ m/^action\.$actionID\./;
-		$actionParams{$param} = [ $r->param($param) ];
+	if (!$writeFileErrors && !$do_not_save && defined $outputFilePath && !$c->{failure}) {
+		$c->addgoodmessage($c->maketext('Saved to file "[_1]"', $c->shortPath($outputFilePath)));
 	}
-	return %actionParams;
-}
 
-sub fixAchievementContents {
-		#NOT a method
-		my $AchievementContents = shift;
-		# Handle the problem of line endings.
-		# Make sure that all of the line endings are of unix type.
-		# Convert \r\n to \n
-		$AchievementContents =~ s/\r\n/\n/g;
-		$AchievementContents =~ s/\r/\n/g;
-		$AchievementContents;
+	return;
 }
 
-sub save_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	if (-w $self->{sourceFilePath}) {
-		return $r->maketext("Save [_1]", CGI::b($self->shortPath($self->{sourceFilePath})));
-	} else {
-		return "";    #"Can't save -- No write permission";
-	}
+sub fixAchievementContents ($achievementContents) {
+	# Handle the problem of line endings.
+	# Make sure that all of the line endings are of unix type.
+	# Convert \r\n to \n
+	$achievementContents =~ s/\r\n/\n/g;
+	$achievementContents =~ s/\r/\n/g;
+	return $achievementContents;
 }
 
-sub save_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r= $self->r;
-	my $courseName      =  $self->{courseID};
-	my $achievementName         =  $self->{achievementID};
+sub save_handler ($c) {
+	my $courseName      = $c->{courseID};
+	my $achievementName = $c->{achievementID};
 
-	#################################################
-	# grab the achievementContents from the form in order to save it to the source path
-	#################################################
-	my $achievementContents = fixAchievementContents($self->r->param('achievementContents'));
-	$self->{r_achievementContents} = \$achievementContents;
+	# Grab the achievementContents from the form in order to save it to the source path
+	$c->stash->{achievementContents} = fixAchievementContents($c->param('achievementContents'));
 
-	#################################################
 	# Construct the output file path
-	#################################################
-	$self->saveFileChanges($self->{sourceFilePath});
+	$c->saveFileChanges($c->{sourceFilePath});
 
 	return;
-
-}
-
-# calls the save_as_handler
-sub save_as_form {
-	my ($self, %actionParams) = @_;
-	my $r               = $self->r;
-	my $sourceFilePath  = $self->{sourceFilePath};
-	my $achievementsDir = $self->r->ce->{courseDirs}->{achievements};
-	my $achievementID   = $self->{achievementID};
-	my $sourceFileName  = getRelativeSourceFilePath($self, $sourceFilePath);
-
-	# There are three things you can do with a new achievement editor.
-	# You can replace the current achievement, use it in a new achievement, or not use it at all.
-	return CGI::div(
-		CGI::div(
-			{ class => 'row align-items-center mb-2' },
-			CGI::label(
-				{ for => 'action.save_as.target_file_id', class => 'col-form-label col-auto' },
-				$r->maketext('Save as:')
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::textfield({
-					name  => 'action.save_as.target_file',
-					id    => 'action.save_as.target_file_id',
-					size  => 40,
-					value => $sourceFileName,
-					class => 'form-control form-control-sm'
-				})
-			),
-			CGI::hidden(-name => 'action.save_as.source_file', -value => $sourceFilePath)
-		),
-		CGI::div(
-			{ class => 'form-check mb-2' },
-			CGI::input({
-				type  => 'radio',
-				id    => 'action.save_as.saveMode.use_in_current',
-				name  => 'action.save_as.saveMode',
-				value => 'use_in_current',
-				class => 'form-check-input'
-			}),
-			CGI::label(
-				{ for => 'action.save_as.saveMode.use_in_current', class => 'form-check-label' },
-				$r->maketext('Use in achievement [_1]', CGI::b($achievementID))
-			)
-		),
-		CGI::div(
-			{ class => 'mb-2' },
-			CGI::div(
-				{ class => 'form-check d-inline-block' },
-				CGI::input({
-					type  => 'radio',
-					id    => 'action.save_as.saveMode.use_in_new',
-					name  => 'action.save_as.saveMode',
-					value => 'use_in_new',
-					class => 'form-check-input'
-				}),
-				CGI::label(
-					{
-						for   => 'action.save_as.saveMode.use_in_new',
-						class => 'form-check-label me-1',
-						id    => 'action.save_as.saveMode.use_in_new.label'
-					},
-					$r->maketext('Use in new achievement:'),
-				)
-			),
-			CGI::textfield({
-				name            => 'action.save_as.id',
-				aria_labelledby => 'action.save_as.saveMode.use_in_new.label',
-				value           => '',
-				class           => 'form-control form-control-sm d-inline w-auto'
-			})
-		),
-		CGI::div(
-			{ class => 'form-check' },
-			CGI::input({
-				type  => 'radio',
-				id    => 'action.save_as.saveMode.dont_use',
-				name  => 'action.save_as.saveMode',
-				value => 'dont_use',
-				class => 'form-check-input'
-			}),
-			CGI::label(
-				{ for => 'action.save_as.saveMode.dont_use', class => 'form-check-label' },
-				$r->maketext("Don't use in an achievement")
-			)
-		)
-	);
 }
 
-sub save_as_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r = $self->r;
-	my $db = $r->db;
-	$self->{status_message} = ''; ## DPVC -- remove bogus old messages
-	my $courseName      =  $self->{courseID};
-	my $achievementName         =  $self->{achievementID};
-	my $effectiveUserName = $self->r->param('effectiveUser');
-
-	my $do_not_save = 0;
-	my $saveMode       = $actionParams->{'action.save_as.saveMode'}->[0] || 'no_save_mode_selected';
-	my $new_file_name  = $actionParams->{'action.save_as.target_file'}->[0] || '';
-	my $sourceFilePath = $actionParams->{'action.save_as.source_file'}->[0] || '';
-	my $targetAchievementID  =  $actionParams->{'action.save_as.id'}->[0] || '';
-
-	$self ->{sourceFilePath} = $sourceFilePath;  # store for use in saveFileChanges
-	$new_file_name =~ s/^\s*//;  #remove initial and final white space
+sub save_as_handler ($c) {
+	my $db = $c->db;
+	$c->{status_message} = $c->c;    ## DPVC -- remove bogus old messages
+	my $courseName        = $c->{courseID};
+	my $achievementName   = $c->{achievementID};
+	my $effectiveUserName = $c->param('effectiveUser');
+
+	my $do_not_save         = 0;
+	my $saveMode            = $c->param('action.save_as.saveMode')    || 'no_save_mode_selected';
+	my $new_file_name       = $c->param('action.save_as.target_file') || '';
+	my $sourceFilePath      = $c->param('action.save_as.source_file') || '';
+	my $targetAchievementID = $c->param('action.save_as.id')          || '';
+
+	$c->{sourceFilePath} = $sourceFilePath;    # store for use in saveFileChanges
+	$new_file_name =~ s/^\s*//;                #remove initial and final white space
 	$new_file_name =~ s/\s*$//;
-	if ( $new_file_name !~ /\S/) { # need a non-blank file name
-		# setting $self->{failure} stops saving and any redirects
+	if ($new_file_name !~ /\S/) {              # need a non-blank file name
+											   # setting $c->{failure} stops saving and any redirects
 		$do_not_save = 1;
-		$self->addbadmessage(CGI::p($r->maketext("Please specify a file to save to.")));
+		$c->addbadmessage($c->maketext('Please specify a file to save to.'));
 	}
 
-	#################################################
-	# grab the achievementContents from the form in order to save it to a new permanent file
-	#################################################
-	my $achievementContents = fixAchievementContents($self->r->param('achievementContents'));
-	$self->{r_achievementContents} = \$achievementContents;
-	warn "achievement contents is empty" unless $achievementContents;
-	#################################################
-	# Rescue the user in case they forgot to end the file name with .at
-	#################################################
-
-	$new_file_name =~ s/\.at$//; # remove it if it is there
-	$new_file_name .= '.at'; # put it there
+	# Grab the achievementContents from the form in order to save it to a new permanent file
+	$c->stash->{achievementContents} = fixAchievementContents($c->param('achievementContents'));
+	warn 'achievement contents is empty' unless $c->stash->{achievementContents};
 
+	# Rescue the user in case they forgot to end the file name with .at
+	$new_file_name =~ s/\.at$//;    # remove it if it is there
+	$new_file_name .= '.at';        # put it there
 
-	#################################################
 	# Construct the output file path
-	#################################################
-	my $outputFilePath = $self->r->ce->{courseDirs}->{achievements} . '/' .
-								 $new_file_name;
+	my $outputFilePath = $c->ce->{courseDirs}->{achievements} . '/' . $new_file_name;
 	if (defined $outputFilePath and -e $outputFilePath) {
 		# setting $do_not_save stops saving and any redirects
 		$do_not_save = 1;
-		$self->addbadmessage(CGI::p($r->maketext("File '[_1]' exists.  File not saved.  No changes have been made.", $self->shortPath($outputFilePath))));
-	} elsif ($saveMode eq 'use_in_new' && not $targetAchievementID) {
-	    $self->addbadmessage($r->maketext("No new Achievement ID specified.  No new achievement created.  File not saved."));
-	    $do_not_save = 1;
+		$c->addbadmessage($c->maketext(
+			'File "[_1]" exists.  File not saved.  No changes have been made.',
+			$c->shortPath($outputFilePath)
+		));
+	} elsif ($saveMode eq 'use_in_new' && !$targetAchievementID) {
+		$c->addbadmessage(
+			$c->maketext('No new Achievement ID specified.  No new achievement created.  File not saved.'));
+		$do_not_save = 1;
 
 	} elsif ($saveMode eq 'use_in_new' && $db->existsAchievement($targetAchievementID)) {
-	    $self->addbadmessage($r->maketext("Achievement ID exists!  No new achievement created.  File not saved."));
-	    $do_not_save = 1;
+		$c->addbadmessage($c->maketext('Achievement ID exists!  No new achievement created.  File not saved.'));
+		$do_not_save = 1;
 	} else {
-	    $self->{editFilePath} = $outputFilePath;
-	    $self->{inputFilePath} = '';
+		$c->{editFilePath}  = $outputFilePath;
+		$c->{inputFilePath} = '';
 	}
 
-	return "" if $do_not_save;
-
+	return '' if $do_not_save;
 
 	#Save changes
-	$self->saveFileChanges($outputFilePath);
+	$c->saveFileChanges($outputFilePath);
 
 	if ($saveMode eq 'use_in_current' and -r $outputFilePath) {
-	    #################################################
-	    # Modify evaluator path in current achievement
-	    #################################################
-	    my $achievement = $self->r->db->getAchievement($achievementName);
-	    $achievement->test($new_file_name);
-	    if ($self->r->db->putAchievement($achievement)) {
-		$self->addgoodmessage($r->maketext("The evaluator for [_1] has been renamed to '[_2]'.", $achievementName, $self->shortPath($outputFilePath))) ;
-	    } else {
-		$self->addbadmessage($r->maketext("Unable to change the evaluator for set [_1]. Unknown error.",$achievementName));
-	    }
+		# Modify evaluator path in current achievement
+		my $achievement = $c->db->getAchievement($achievementName);
+		$achievement->test($new_file_name);
+		if ($c->db->putAchievement($achievement)) {
+			$c->addgoodmessage($c->maketext(
+				'The evaluator for [_1] has been renamed to "[_2]".', $achievementName,
+				$c->shortPath($outputFilePath)
+			));
+		} else {
+			$c->addbadmessage(
+				$c->maketext('Unable to change the evaluator for set [_1]. Unknown error.', $achievementName));
+		}
 
 	} elsif ($saveMode eq 'use_in_new') {
-	    #Create a new achievement to use the evaluator in
-	    my $achievement = $self->r->db->newAchievement();
-	    $achievement->achievement_id($targetAchievementID);
-	    $achievement->test($new_file_name);
-	    $achievement->icon(DEFAULT_ICON());
-
-	    $self->r->db->addAchievement($achievement);
-	    $self->addgoodmessage($r->maketext("Achievement [_1] created with evaluator '[_2]'.", $targetAchievementID, $self->shortPath($outputFilePath))) ;
+		# Create a new achievement to use the evaluator in
+		my $achievement = $c->db->newAchievement();
+		$achievement->achievement_id($targetAchievementID);
+		$achievement->test($new_file_name);
+		$achievement->icon(DEFAULT_ICON());
+
+		$c->db->addAchievement($achievement);
+		$c->addgoodmessage($c->maketext(
+			'Achievement [_1] created with evaluator "[_2]".', $targetAchievementID,
+			$c->shortPath($outputFilePath)
+		));
 
 	} elsif ($saveMode eq 'dont_use') {
-	    #################################################
-	    # Don't change any achievements - just report
-	    #################################################
-	    $self->addgoodmessage($r->maketext("A new file has been created at '[_1]'", $self->shortPath($outputFilePath)));
+		# Don't change any achievements - just report
+		$c->addgoodmessage($c->maketext('A new file has been created at "[_1]"', $c->shortPath($outputFilePath)));
 	} else {
-	    $self->addbadmessage($r->maketext("Don't recognize saveMode: |[_1]|. Unknown error.", $saveMode));
+		$c->addbadmessage($c->maketext(q{Don't recognize saveMode: |[_1]|. Unknown error.}, $saveMode));
 	}
 
-
-
-	#################################################
 	# Set up redirect
 	# The redirect gives the server time to detect that the new file exists.
-	#################################################
-	my $problemPage;
-
-	if ($saveMode eq 'dont_use' ) {
-		$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::AchievementEditor",$r,
-			courseID => $courseName, achievementID => $achievementName);
-	} elsif ($saveMode eq 'use_in_current') {
-		$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::AchievementEditor",$r,
-			courseID => $courseName, achievementID => $achievementName);
-	} elsif ($saveMode eq 'use_in_new') {
-	    $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::AchievementEditor",$r,
-			courseID => $courseName, achievementID => $targetAchievementID);
-	} else {
-		$self->addbadmessage(" Please use radio buttons to choose the method for saving this file. Can't recognize saveMode: |$saveMode|.");
-		# can't continue since paths have not been properly defined.
-		return "";
-	}
-
-	#warn "save mode is $saveMode";
-
-	my $relativeOutputFilePath = $self->getRelativeSourceFilePath($outputFilePath);
-
-	my $viewURL = $self->systemLink($problemPage,
-					params=>{
-					    sourceFilePath     => $relativeOutputFilePath,
-					    status_message     => uri_escape_utf8($self->{status_message})}
-
-	    );
-
-	$self->reply_with_redirect($viewURL);
-    return "";  # no redirect needed
-}
-
-sub fresh_edit_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	#$self->addgoodmessage("fresh_edit_handler called");
-}
-
-sub output_JS {
-	my $self = shift;
-	my $ce   = $self->r->ce;
-
-	WeBWorK::ContentGenerator::Instructor::CodeMirrorEditor::output_codemirror_static_files($ce);
-
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/ActionTabs/actiontabs.js'), defer => undef }, '');
+	$c->reply_with_redirect($c->systemLink(
+		$c->url_for(
+			'instructor_achievement_editor',
+			achievementID => $saveMode eq 'use_in_new' ? $targetAchievementID : $achievementName
+		),
+		params => {
+			sourceFilePath => $c->getRelativeSourceFilePath($outputFilePath),
+			status_message => $c->{status_message}->join('')
+		}
 
-	return '';
+	));
+	return;
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm b/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm
index a499c6e5c1..68c950ca4a 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,8 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Instructor::AchievementList;
-use base qw(WeBWorK);
-use base qw(WeBWorK::ContentGenerator::Instructor);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -45,137 +44,49 @@ links to edit the evaluator and the individual user data.
 
 =cut
 
-use strict;
-use warnings;
-#use CGI qw(-nosticky );
-use WeBWorK::CGI;
-use WeBWorK::Debug;
-use WeBWorK::Utils qw(timeToSec readFile listFilesRecursive sortAchievements x getAssetURL);
-use DateTime;
+use Mojo::File;
 use Text::CSV;
-use Encode;
-use open IO => ':encoding(UTF-8)';
 
-#constants for forms and the various handlers
-use constant BLANK_ACHIEVEMENT => "blankachievement.at";
-use constant DEFAULT_ENABLED_STATE => 0;
+use WeBWorK::Utils qw(sortAchievements x);
+use WeBWorK::Utils::Instructor qw(read_dir);
 
-use constant EDIT_FORMS => [qw(saveEdit cancelEdit)];
-use constant VIEW_FORMS => [qw(edit assign import export score create delete)];
-use constant EXPORT_FORMS => [qw(saveExport cancelExport)];
+# Forms
+use constant EDIT_FORMS   => [qw(save_edit cancel_edit)];
+use constant VIEW_FORMS   => [qw(edit assign import export score create delete)];
+use constant EXPORT_FORMS => [qw(save_export cancel_export)];
 
 # Prepare the tab titles for translation by maketext
 use constant FORM_TITLES => {
-	saveEdit       => x("Save Edit"),
-	cancelEdit     => x("Cancel Edit"),
-	edit           => x("Edit"),
-	assign         => x("Assign"),
-	import         => x("Import"),
-	export         => x("Export"),
-	score          => x("Score"),
-	create         => x("Create"),
-	delete         => x("Delete"),
-	saveExport     => x("Save Export"),
-	cancelExport   => x("Cancel Export")
+	save_edit     => x('Save Edit'),
+	cancel_edit   => x('Cancel Edit'),
+	edit          => x('Edit'),
+	assign        => x('Assign'),
+	import        => x('Import'),
+	export        => x('Export'),
+	score         => x('Score'),
+	create        => x('Create'),
+	delete        => x('Delete'),
+	save_export   => x('Save Export'),
+	cancel_export => x('Cancel Export')
 };
 
-use constant VIEW_FIELD_ORDER => [ qw( achievement_id enabled name number category ) ];
-use constant EDIT_FIELD_ORDER => [ qw( icon achievement_id name number assignment_type category enabled points max_counter description icon_file test_file) ];
-use constant EXPORT_FIELD_ORDER => [ qw( select achievement_id name) ];
+sub initialize ($c) {
+	my $db            = $c->db;
+	my $ce            = $c->ce;
+	my $authz         = $c->authz;
+	my $courseName    = $c->stash('courseID');
+	my $achievementID = $c->stash('achievementID');
+	my $user          = $c->param('user');
 
-use constant STATE_PARAMS => [qw(user effectiveUser key editMode exportMode)];
+	# Make sure these are available in the templates.
+	$c->stash->{formsToShow}  = VIEW_FORMS();
+	$c->stash->{formTitles}   = FORM_TITLES();
+	$c->stash->{achievements} = [];
 
-use constant ASSIGNMENT_TYPES => [qw(default gateway jitar)];
+	# Check permissions
+	return unless $authz->hasPermissions($user, 'edit_achievements');
 
-use constant ASSIGNMENT_NAMES => {
-    default => 'homework',
-    gateway => 'gateways',
-    jitar => 'just-in-time',
-};
-
-#properites for the fields shown in the tables
-use constant  FIELD_PROPERTIES => {
-	achievement_id => {
-		type => "text",
-		size => 8,
-		access => "readonly",
-	},
-	name => {
-		type => "text",
-		size => 30,
-		access => "readwrite",
-	},
-	assignment_type => {
-		type => "assignment_type",
-		size => 30,
-		access => "readwrite",
-	},
-	category => {
-		type => "text",
-		size => 30,
-		access => "readwrite",
-	},
-	number => {
-		type => "text",
-		size => 8,
-		access => "readwrite",
-	},
-	icon => {
-		type => "text",
-		size => 85,
-		access => "readwrite",
-	},
-	test => {
-		type => "text",
-		size => 85,
-		access => "readwrite",
-	},
-
-	description => {
-		type => "text",
-		size => 85,
-		access => "readwrite",
-	},
-
-	enabled => {
-		type => "checked",
-		size => 8,
-		access => "readwrite",
-	},
-
-	points => {
-		type => "text",
-		size => 8,
-		access => "readwrite",
-	},
-
-	max_counter => {
-	        type => "text",
-		size => 8,
-		access => "readwrite",
-	},
-};
-
-sub initialize {
-
-	my ($self)       = @_;
-	my $r            = $self->r;
-	my $urlpath      = $r->urlpath;
-	my $db           = $r->db;
-	my $ce           = $r->ce;
-	my $authz        = $r->authz;
-	my $courseName   = $urlpath->arg("courseID");
-	my $achievementID= $urlpath->arg("achievementID");
-	my $user         = $r->param('user');
-
-
-	my $root = $ce->{webworkURLs}->{root};
-
-	#check permissions
-	return CGI::div({ class => 'alert alert-danger p-1' }, "You are not authorized to edit achievements.")
-		unless $authz->hasPermissions($user, "edit_achievements");
-
-	########## set initial values for state fields
+	# Set initial values for state fields
 	my @allAchievementIDs = $db->listAchievements;
 
 	#### Temporary Transition Code ####
@@ -185,682 +96,290 @@ sub initialize {
 	# This whole block of code can be removed once people have had time
 	# to transition over.  (I.E. around 2017)
 
-	foreach my $achievementID (@allAchievementIDs) {
-	    my $achievement = $db->getAchievement($achievementID);
-	    unless ($achievement->assignment_type || $achievement->number) {
-		$achievement->assignment_type('default');
-		$db->putAchievement($achievement);
-	    }
+	for my $achievementID (@allAchievementIDs) {
+		my $achievement = $db->getAchievement($achievementID);
+		unless ($achievement->assignment_type || $achievement->number) {
+			$achievement->assignment_type('default');
+			$db->putAchievement($achievement);
+		}
 	}
 	### End Transition Code.  ###
 
-
 	my @users = $db->listUsers;
-	$self->{allAchievementIDs} = \@allAchievementIDs;
-	$self->{totalUsers} = scalar @users;
+	$c->{allAchievementIDs} = \@allAchievementIDs;
+	$c->{totalUsers}        = scalar @users;
 
+	$c->{selectedAchievementIDs} = [ $c->param('selected_achievements') ];
 
-	if (defined $r->param("selected_achievements")) {
-		$self->{selectedAchievementIDs} = [ $r->param("selected_achievements") ];
-	} else {
-		$self->{selectedAchievementIDs} = [];
-	}
-
-	$self->{editMode} = $r->param("editMode") || 0;
+	$c->{editMode} = $c->param('editMode') || 0;
 
-	#########################################
-	#  call action handler
-	#########################################
-
-	my $actionID = $r->param("action");
-	$self->{actionID} = $actionID;
+	# Call action handler
+	my $actionID = $c->param('action');
+	$c->{actionID} = $actionID;
 	if ($actionID) {
 		unless (grep { $_ eq $actionID } @{ VIEW_FORMS() }, @{ EDIT_FORMS() }, @{ EXPORT_FORMS() }) {
 			die "Action $actionID not found";
 		}
 
 		my $actionHandler = "${actionID}_handler";
-		my %genericParams;
-		foreach my $param (qw(selected_achievements)) {
-		    $genericParams{$param} = [ $r->param($param) ];
+		my ($success, $action_result) = $c->$actionHandler;
+		if ($success) {
+			$c->addgoodmessage($c->b($c->maketext('Result of last action performed: [_1]', $action_result)));
+		} else {
+			$c->addbadmessage($c->b($c->maketext('Result of last action performed: [_1]', $action_result)));
 		}
-		my %actionParams = $self->getActionParams($actionID);
-		my %tableParams = $self->getTableParams();
-		$self->addmessage(CGI::div({ class => 'mb-1' }, $r->maketext("Results of last action performed: ")));
-		$self->addmessage($self->$actionHandler(\%genericParams, \%actionParams, \%tableParams));
 	} else {
-	    $self->addgoodmessage($r->maketext("Please select action to be performed."));
+		$c->addgoodmessage($c->maketext('Please select action to be performed.'));
 	}
-}
-
-sub body {
-	my ($self)       = @_;
-	my $r            = $self->r;
-	my $urlpath      = $r->urlpath;
-	my $db           = $r->db;
-	my $ce           = $r->ce;
-	my $authz        = $r->authz;
-	my $courseName   = $urlpath->arg("courseID");
-	my $achievementID= $urlpath->arg("achievementID");
-	my $user         = $r->param('user');
-
-	my $root = $ce->{webworkURLs}->{root};
-
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' }, "You are not authorized to edit achievements.")
-		unless $authz->hasPermissions($user, "edit_achievements");
-
-	my $actionID = $self->{actionID};
-
-	########## retrieve possibly changed values for member fields
-
-	my @allAchievementIDs = @{ $self->{allAchievementIDs} }; # do we need this one? YES, deleting or importing a achievement will change this.
-	my @selectedAchievementIDs = @{ $self->{selectedAchievementIDs} };
-	my $editMode = $self->{editMode};
-	my $exportMode = $self->{exportMode};
 
-	########## get achievements
+	$c->stash->{formsToShow} = $c->{editMode} ? EDIT_FORMS() : $c->{exportMode} ? EXPORT_FORMS() : VIEW_FORMS();
 
-	my @Achievements = $db->getAchievements(@allAchievementIDs);
+	# Get and sort achievements. Achievements are sorted by in the order they are evaluated.
+	$c->stash->{achievements} = [ sortAchievements($c->db->getAchievements(@{ $c->{allAchievementIDs} })) ];
 
-	# sort Achievments.  Achievements are always sorted by in the order they are evaluated
-	if (@Achievements) {
-	    @Achievements = sortAchievements(@Achievements);
-	}
-
-	########## print site identifying information
-
-	print CGI::input({
-		type => "button",
-		id => "show_hide",
-		value => $r->maketext("Show/Hide Site Description"),
-		class => "btn btn-info mb-2"
-	});
-	print CGI::p(
-		{
-			id    => "site_description",
-			style => "display:none"
-		},
-		CGI::em($r->maketext(
-			'This is the Achievement Editor.  It is used to edit the achievements available to students.  Please keep '
-				. 'in mind the following facts: Achievments are displayed, and evaluated, in the order they are '
-				. 'listed. The "secret" category creates achievements which are not visible to students until they are '
-				. 'earned.  The "level" category is used for the achievements associated to a users level.'
-		))
-	);
-
-	########## print beginning of form
-
-	print CGI::start_form({
-		method => 'post',
-		action => $self->systemLink($urlpath, authen => 0),
-		id     => 'achievement-list',
-		name   => 'achievementlist',
-		class  => 'font-sm'
-	});
-	print $self->hidden_authen_fields();
-
-	########## print state data
-
-	print "\n<!-- state data here -->\n";
-
-	print CGI::hidden(-name=>"editMode", -value=>$editMode);
-	print CGI::hidden(-name=>"exportMode", -value=>$exportMode);
-
-	print "\n<!-- state data here -->\n";
-
-	########## print action forms
-
-	print CGI::p(CGI::b($r->maketext("Any changes made below will be reflected in the achievement for ALL students."))) if $editMode;
-
-	print CGI::p($r->maketext("Select an action to perform").":");
-
-	my @formsToShow;
-	if ($editMode) {
-		@formsToShow = @{ EDIT_FORMS() };
-	} elsif ($exportMode) {
-		@formsToShow = @{ EXPORT_FORMS() };
-	} else {
-		@formsToShow = @{ VIEW_FORMS() };
-	}
-	my %formTitles = %{ FORM_TITLES() };
-
-	my @tabArr;
-	my @contentArr;
-
-	for my $actionID (@formsToShow) {
-		my $actionForm = "${actionID}_form";
-
-		push(@tabArr, CGI::li({ class => 'nav-item', role => 'presentation' },
-			CGI::a({
-					href => "#$actionID",
-					class => 'nav-link action-link' . ($actionID eq $formsToShow[0] ? ' active' : ''),
-					id => "$actionID-tab",
-					data_action => $actionID,
-					data_bs_toggle => 'tab',
-					data_bs_target => "#$actionID",
-					role => 'tab',
-					aria_controls => $actionID,
-					aria_selected => $actionID eq $formsToShow[0] ? 'true' : 'false'
-				},
-				$r->maketext($formTitles{$actionID}))));
-		push(@contentArr, CGI::div({
-				class => 'tab-pane fade mb-2' . ($actionID eq $formsToShow[0] ? ' show active' : ''),
-				id => $actionID,
-				role => 'tabpanel',
-				aria_labelledby => "$actionID-tab"
-			},
-			$self->$actionForm($self->getActionParams($actionID))));
-	}
-
-	print CGI::hidden(-name => 'action', -id => 'current_action', -value => $formsToShow[0]);
-	print CGI::div(
-		CGI::ul({ class => 'nav nav-tabs mb-2', role => 'tablist' }, @tabArr),
-		CGI::div({ class => 'tab-content' }, @contentArr)
-	);
-
-	print CGI::submit({
-			id => "take_action",
-			value => $r->maketext("Take Action!"),
-			class => 'btn btn-primary mb-3'
-		});
-
-	########## print table
-
-	$self->printTableHTML(\@Achievements,
-		editMode => $editMode,
-		exportMode => $exportMode,
-		selectedAchievementIDs => \@selectedAchievementIDs,
-	);
-
-
-	########## print end of form
-
- 	print CGI::end_form();
-
-	return "";
-}
-
-################################################################################
-# extract particular params and put them in a hash (values are ARRAYREFs!)
-################################################################################
-
-sub getActionParams {
-	my ($self, $actionID) = @_;
-	my $r = $self->{r};
-
-	my %actionParams;
-	foreach my $param ($r->param) {
-		next unless $param =~ m/^action\.$actionID\./;
-		$actionParams{$param} = [ $r->param($param) ];
-	}
-	return %actionParams;
+	return;
 }
 
-sub getTableParams {
-	my ($self) = @_;
-	my $r = $self->{r};
-
-	my %tableParams;
-	foreach my $param ($r->param) {
-		next unless $param =~ m/^(?:achievement)\./;
-		$tableParams{$param} = [ $r->param($param) ];
-	}
-	return %tableParams;
-}
-
-################################################################################
-# actions and action triggers
-################################################################################
-
-# edit, cancelEdit, and saveEdit should stay with the display module and
+# Actions handlers.
+# The forms for all of the actions are templates.
+# edit, cancel_edit, and save_edit should stay with the display module and
 # not be real "actions". that way, all actions are shown in view mode and no
 # actions are shown in edit mode.
 
-
-# Form for editing achievements.
-sub edit_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	return CGI::div(
-		{ class => 'row mb-2' },
-		CGI::label(
-			{ for => 'edit_select', class => 'col-form-label col-form-label-sm col-auto' },
-			$r->maketext('Edit which achievements?')
-		),
-		CGI::div(
-			{ class => 'col-auto' },
-			CGI::popup_menu({
-				name    => 'action.edit.scope',
-				id      => 'edit_select',
-				values  => [qw(all selected)],
-				default => $actionParams{'action.edit.scope'}[0] || 'selected',
-				class   => 'form-select form-select-sm',
-				labels  => {
-					all      => $r->maketext('all achievements'),
-					selected => $r->maketext('selected achievements'),
-				},
-			})
-		)
-	);
-}
-
-#handler for editing achievements.  Just changes the view mode
-sub edit_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r = $self->r;
+# Handler for editing achievements.  Just changes the view mode.
+sub edit_handler ($c) {
 	my $result;
 
-	my $scope = $actionParams->{"action.edit.scope"}->[0];
+	my $scope = $c->param('action.edit.scope');
 	if ($scope eq "all") {
-	        $self->{selectedAchievementIDs} = $self->{allAchievementIDs};
-		$result = $r->maketext("editing all achievements");
+		$c->{selectedAchievementIDs} = $c->{allAchievementIDs};
+		$result = $c->maketext("editing all achievements");
 	} elsif ($scope eq "selected") {
-		$result = $r->maketext("editing selected achievements");
+		$result = $c->maketext("editing selected achievements");
 	}
-	$self->{editMode} = 1;
-
-	return CGI::div({ class => 'alert alert-success p-1 mb-0' }, $result);
-}
+	$c->{editMode} = 1;
 
-# Form for assigning achievements to users.
-sub assign_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	return CGI::div(
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'assign_select', class => 'col-form-label col-form-label-sm col-sm-auto' },
-				$r->maketext('Assign which achievements?',)
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					name    => 'action.assign.scope',
-					id      => 'assign_select',
-					values  => [qw(all selected)],
-					default => $actionParams{'action.assign.scope'}[0] || 'selected',
-					class   => 'form-select form-select-sm',
-					labels  => {
-						all      => $r->maketext('all achievements'),
-						selected => $r->maketext('selected achievements'),
-					},
-				})
-			)
-		),
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'assign_data_select', class => 'col-form-label col-form-label-sm col-sm-auto' },
-				$r->maketext('Choose what to do with existing data:')
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					name    => 'action.assign.overwrite',
-					id      => 'assign_data_select',
-					values  => [qw(everything new_only)],
-					default => $actionParams{'action.assign.overwrite'}[0] || 'new_only',
-					class   => 'form-select form-select-sm',
-					labels  => {
-						everything => $r->maketext('overwrite'),
-						new_only   => $r->maketext('preserve'),
-					},
-				})
-			)
-		)
-	);
+	return (1, $result);
 }
 
-#handler for assigning achievements to users
-sub assign_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-
-	my $r      = $self->r;
-	my $db     = $r->db;
-	my $ce     = $r->ce;
+# Handler for assigning achievements to users
+sub assign_handler ($c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
 
-	my $scope = $actionParams->{"action.assign.scope"}->[0];
-	my $overwrite = (($actionParams->{"action.assign.overwrite"}->[0] eq 'everything') ? 1 : 0);
+	my $scope     = $c->param('action.assign.scope');
+	my $overwrite = $c->param('action.assign.overwrite') eq 'everything';
 
 	my @achievementIDs;
 	my @users = $db->listUsers;
 
-
 	if ($scope eq "all") {
-	        @achievementIDs = @{$self->{allAchievementIDs}};
+		@achievementIDs = @{ $c->{allAchievementIDs} };
 	} else {
-	    	@achievementIDs = @{$self->{selectedAchievementIDs}};
+		@achievementIDs = @{ $c->{selectedAchievementIDs} };
 	}
 
-	#Enable all achievements
+	# Enable all achievements
 	my @achievements = $db->getAchievements(@achievementIDs);
 
-	foreach my $achievement (@achievements) {
-	    $achievement->enabled(1);
-	    $db->putAchievement($achievement);
-	}
-
-	#Assign globalUserAchievement data, overwriting if necc
-
-	foreach my $user (@users) {
-	    if (not $db->existsGlobalUserAchievement($user)) {
-		my $globalUserAchievement = $db->newGlobalUserAchievement();
-		$globalUserAchievement->user_id($user);
-		$db->addGlobalUserAchievement($globalUserAchievement);
-	    } elsif ($overwrite) {
-		my $globalUserAchievement = $db->newGlobalUserAchievement();
-		$globalUserAchievement->user_id($user);
-		$db->putGlobalUserAchievement($globalUserAchievement);
-	    }
+	for my $achievement (@achievements) {
+		$achievement->enabled(1);
+		$db->putAchievement($achievement);
 	}
 
+	# Assign globalUserAchievement data, overwriting if necc
 
-	#Assign userAchievement data, overwriting if necc
-
-	foreach my $achievementID (@achievementIDs) {
-	    foreach my $user (@users) {
-		if (not $db->existsUserAchievement($user,$achievementID)) {
-		    my $userAchievement = $db->newUserAchievement();
-		    $userAchievement->user_id($user);
-		    $userAchievement->achievement_id($achievementID);
-		    $db->addUserAchievement($userAchievement);
+	for my $user (@users) {
+		if (not $db->existsGlobalUserAchievement($user)) {
+			my $globalUserAchievement = $db->newGlobalUserAchievement();
+			$globalUserAchievement->user_id($user);
+			$db->addGlobalUserAchievement($globalUserAchievement);
 		} elsif ($overwrite) {
-		    my $userAchievement = $db->newUserAchievement();
-		    $userAchievement->user_id($user);
-		    $userAchievement->achievement_id($achievementID);
-		    $db->putUserAchievement($userAchievement);
+			my $globalUserAchievement = $db->newGlobalUserAchievement();
+			$globalUserAchievement->user_id($user);
+			$db->putGlobalUserAchievement($globalUserAchievement);
 		}
-	    }
 	}
 
+	# Assign userAchievement data, overwriting if necc
+
+	for my $achievementID (@achievementIDs) {
+		for my $user (@users) {
+			if (not $db->existsUserAchievement($user, $achievementID)) {
+				my $userAchievement = $db->newUserAchievement();
+				$userAchievement->user_id($user);
+				$userAchievement->achievement_id($achievementID);
+				$db->addUserAchievement($userAchievement);
+			} elsif ($overwrite) {
+				my $userAchievement = $db->newUserAchievement();
+				$userAchievement->user_id($user);
+				$userAchievement->achievement_id($achievementID);
+				$db->putUserAchievement($userAchievement);
+			}
+		}
+	}
 
-	return CGI::div({ class => 'alert alert-success p-1 mb-0' }, $r->maketext('Assigned achievements to users'));
-}
-
-# Form for scoring achievements.
-sub score_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	return CGI::div(
-		{ class => 'row mb-2' },
-		CGI::label(
-			{ for => 'score_select', class => 'col-form-label col-form-label-sm col-auto' },
-			$r->maketext('Score which achievements?')
-		),
-		CGI::div(
-			{ class => 'col-auto' },
-			CGI::popup_menu({
-				name    => 'action.score.scope',
-				id      => 'score_select',
-				values  => [qw(none all selected)],
-				default => $actionParams{'action.score.scope'}[0] || 'none',
-				class   => 'form-select form-select-sm d-inline w-auto',
-				labels  => {
-					none     => $r->maketext('no achievements'),
-					all      => $r->maketext('all achievements'),
-					selected => $r->maketext('selected achievements'),
-				},
-			})
-		),
-	);
+	return (1, $c->maketext('Assigned achievements to users'));
 }
 
-#handler for scoring
-sub score_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+# Handler for scoring
+sub score_handler ($c) {
+	my $ce         = $c->ce;
+	my $db         = $c->db;
+	my $courseName = $c->stash('courseID');
 
-	my $r      = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $urlpath = $r->urlpath;
-	my $courseName = $urlpath->arg("courseID");
-
-	my $scope = $actionParams->{"action.score.scope"}->[0];
+	my $scope = $c->param('action.score.scope');
 	my @achievementsToScore;
 
 	if ($scope eq "none") {
 		@achievementsToScore = ();
 	} elsif ($scope eq "all") {
-		@achievementsToScore = @{ $self->{allAchievementIDs} };
+		@achievementsToScore = @{ $c->{allAchievementIDs} };
 	} elsif ($scope eq "selected") {
-		@achievementsToScore = @{ $genericParams->{selected_achievements} };
+		@achievementsToScore = $c->param('selected_achievements');
 	}
 
-	#define file name
-	my $scoreFileName = $courseName."_achievement_scores.csv";
-	my $scoreFilePath = $ce->{courseDirs}->{scoring}.'/'.$scoreFileName;
+	# Define file name
+	my $scoreFileName = $courseName . "_achievement_scores.csv";
+	my $scoreFilePath = $ce->{courseDirs}->{scoring} . '/' . $scoreFileName;
 
-	# back up existing file
-	if(-e $scoreFilePath) {
-	    rename($scoreFilePath, "$scoreFilePath.bak") or
-		warn "Existing file $scoreFilePath could not be backed up and was lost.";
+	# Back up existing file
+	if (-e $scoreFilePath) {
+		rename($scoreFilePath, "$scoreFilePath.bak")
+			or warn "Existing file $scoreFilePath could not be backed up and was lost.";
 	}
 
-	# check path and open the file
+	# Check path and open the file
 	$scoreFilePath = WeBWorK::Utils::surePathToFile($ce->{courseDirs}->{scoring}, $scoreFilePath);
 
-	local *SCORE;
-	open SCORE, ">$scoreFilePath"
-		or return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-			$r->maketext("Failed to open [_1]", $scoreFilePath));
+	my $SCORE = Mojo::File->new($scoreFilePath)->open('>:encoding(UTF-8)')
+		or return (0, $c->maketext("Failed to open [_1]", $scoreFilePath));
 
-	#print out header info
-	print SCORE $r->maketext("username, last name, first name, section, achievement level, achievement score,");
+	# Print out header info
+	print $SCORE $c->maketext("username, last name, first name, section, achievement level, achievement score,");
 
 	my @achievements = $db->getAchievements(@achievementsToScore);
 	@achievements = sortAchievements(@achievements);
 
-	foreach my $achievement (@achievements) {
-	    print SCORE $achievement->achievement_id.", ";
+	for my $achievement (@achievements) {
+		print $SCORE $achievement->achievement_id . ", ";
 	}
-	print SCORE "\n";
+	print $SCORE "\n";
 
 	my @users = $db->listUsers;
 
-	# get user records
-	my @userRecords  = ();
-	foreach my $currentUser ( @users) {
-		my $userObj = $db->getUser($currentUser); #checked
+	# Get user records
+	my @userRecords = ();
+	for my $currentUser (@users) {
+		my $userObj = $db->getUser($currentUser);
 		die "Unable to find user object for $currentUser. " unless $userObj;
-		push (@userRecords, $userObj );
-	}
-
-	@userRecords = sort { ( lc($a->section) cmp lc($b->section) ) ||
-	                     ( lc($a->last_name) cmp lc($b->last_name )) } @userRecords;
-
-
-	#print out achievement information for each user
-	foreach my $userRecord (@userRecords) {
-	    my $user_id = $userRecord->user_id;
-	    next unless $db->existsGlobalUserAchievement($user_id);
-	    next if ($userRecord->{status} eq 'D' || $userRecord->{status} eq 'A');
-	    print SCORE "$user_id, $userRecord->{last_name}, $userRecord->{first_name}, $userRecord->{section}, ";
-	    my $globalUserAchievement = $db->getGlobalUserAchievement($user_id);
-	    my $level_id = $globalUserAchievement->level_achievement_id;
-	    $level_id = ' ' unless $level_id;
-	    my $points = $globalUserAchievement->achievement_points;
-	    $points = 0 unless $points;
-	    print SCORE "$level_id, $points, ";
-
-	    foreach my $achievement (@achievements) {
-		my $achievement_id = $achievement->achievement_id;
-		if ($db->existsUserAchievement($user_id,$achievement_id)) {
-		    my $userAchievement = $db->getUserAchievement($user_id,$achievement_id);
-		    print SCORE $userAchievement->earned ? "1, ": "0, ";
-		} else {
-		    print SCORE ", ";
+		push(@userRecords, $userObj);
+	}
+
+	@userRecords =
+		sort { (lc($a->section) cmp lc($b->section)) || (lc($a->last_name) cmp lc($b->last_name)) } @userRecords;
+
+	# Print out achievement information for each user
+	for my $userRecord (@userRecords) {
+		my $user_id = $userRecord->user_id;
+		next unless $db->existsGlobalUserAchievement($user_id);
+		next if ($userRecord->{status} eq 'D' || $userRecord->{status} eq 'A');
+		print $SCORE "$user_id, $userRecord->{last_name}, $userRecord->{first_name}, $userRecord->{section}, ";
+		my $globalUserAchievement = $db->getGlobalUserAchievement($user_id);
+		my $level_id              = $globalUserAchievement->level_achievement_id;
+		$level_id = ' ' unless $level_id;
+		my $points = $globalUserAchievement->achievement_points;
+		$points = 0 unless $points;
+		print $SCORE "$level_id, $points, ";
+
+		for my $achievement (@achievements) {
+			my $achievement_id = $achievement->achievement_id;
+			if ($db->existsUserAchievement($user_id, $achievement_id)) {
+				my $userAchievement = $db->getUserAchievement($user_id, $achievement_id);
+				print $SCORE $userAchievement->earned ? "1, " : "0, ";
+			} else {
+				print $SCORE ", ";
+			}
 		}
-	    }
 
-	    print SCORE "\n";
+		print $SCORE "\n";
 	}
 
-	close SCORE;
+	$SCORE->close;
 
 	# Include a download link
-	#
-	my $fileManagerPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::FileManager", $r, courseID => $courseName);
-	my $fileManagerURL  = $self->systemLink($fileManagerPage, params => {action=>"View", files => "${courseName}_achievement_scores.csv", pwd=>"scoring"});
-
-
-	return CGI::div({ class => 'alert alert-success p-1 mb-0' },
-		$r->maketext('Achievement scores saved to [_1]', CGI::a({ href => $fileManagerURL }, $scoreFileName)));
-}
-
-
-# Form for deleting achievements.
-sub delete_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	return CGI::div(
-		CGI::div(
-			{ class => 'd-inline-block alert alert-danger p-1 mb-2' },
-			CGI::em($r->maketext('Deletion destroys all achievement-related data and is not undoable!'))
-		),
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'delete_select', class => 'col-form-label col-form-label-sm col-auto' },
-				$r->maketext('Delete which achievements?')
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					name    => 'action.delete.scope',
-					id      => 'delete_select',
-					values  => [qw(none selected)],
-					default => $actionParams{'action.delete.scope'}[0] || 'none',
-					class   => 'form-select form-select-sm d-inline w-auto me-3',
-					labels  => {
-						none     => $r->maketext('no achievements.'),
-						selected => $r->maketext('selected achievements.'),
-					},
-				})
+	return (
+		1,
+		$c->b($c->maketext(
+			'Achievement scores saved to [_1]',
+			$c->link_to(
+				$scoreFileName => $c->systemLink(
+					$c->url_for('instructor_file_manager'),
+					params =>
+						{ action => 'View', files => "${courseName}_achievement_scores.csv", pwd => 'scoring' }
+				)
 			)
-		)
+		))
 	);
 }
 
-#handler for delete action
-sub delete_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-
-	my $r      = $self->r;
-	my $db     = $r->db;
-
-	my $scope = $actionParams->{"action.delete.scope"}->[0];
+# Handler for delete action
+sub delete_handler ($c) {
+	my $db = $c->db;
 
+	my $scope = $c->param('action.delete.scope');
 
 	my @achievementIDsToDelete = ();
 
 	if ($scope eq "selected") {
-		@achievementIDsToDelete = @{ $self->{selectedAchievementIDs} };
+		@achievementIDsToDelete = @{ $c->{selectedAchievementIDs} };
 	}
 
-	my %allAchievementIDs = map { $_ => 1 } @{ $self->{allAchievementIDs} };
-	my %selectedAchievementIDs = map { $_ => 1 } @{ $self->{selectedAchievementIDs} };
+	my %allAchievementIDs      = map { $_ => 1 } @{ $c->{allAchievementIDs} };
+	my %selectedAchievementIDs = map { $_ => 1 } @{ $c->{selectedAchievementIDs} };
 
-	#run through selected achievements and delete
-	foreach my $achievementID (@achievementIDsToDelete) {
+	# Iterate over selected achievements and delete.
+	for my $achievementID (@achievementIDsToDelete) {
 		delete $allAchievementIDs{$achievementID};
 		delete $selectedAchievementIDs{$achievementID};
 
 		$db->deleteAchievement($achievementID);
 	}
 
-	#update local fields
-	$self->{allAchievementIDs} = [ keys %allAchievementIDs ];
-	$self->{selectedAchievementIDs} = [ keys %selectedAchievementIDs ];
+	# Update local fields
+	$c->{allAchievementIDs}      = [ keys %allAchievementIDs ];
+	$c->{selectedAchievementIDs} = [ keys %selectedAchievementIDs ];
 
 	my $num = @achievementIDsToDelete;
-	return CGI::div({ class => 'alert alert-success p-1 mb-0' }, $r->maketext('Deleted [quant,_1,achievement]', $num));
+	return (1, $c->maketext('Deleted [quant,_1,achievement]', $num));
 }
 
-# Form for creating achievements.
-sub create_form {
-	my ($self, %actionParams) = @_;
-
-	my $r = $self->r;
-
-	return CGI::div(
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'create_text', class => 'col-form-label col-form-label-sm col-auto' },
-				$r->maketext('Create a new achievement with ID')
-					. CGI::span({ class => 'required-field' }, '*') . ': '
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::textfield({
-					name  => 'action.create.id',
-					id    => 'create_text',
-					value => $actionParams{'action.create.name'}[0] || '',
-					class => 'form-control form-control-sm d-inline w-auto'
-				})
-			)
-		),
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'create_select', class => 'col-form-label col-form-label-sm col-auto' },
-				$r->maketext("Create as what type of achievement?")
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					name    => 'action.create.type',
-					id      => 'create_select',
-					values  => [qw(empty copy)],
-					default => $actionParams{'action.create.type'}[0] || 'empty',
-					class   => 'form-select form-select-sm d-inline w-auto',
-					labels  => {
-						empty => $r->maketext('a new empty achievement.'),
-						copy  => $r->maketext('a duplicate of the first selected achievement.'),
-					},
-				})
-			)
-		)
-	);
-}
-
-#handler for creating an ahcievement
-sub create_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-
-	my $r      = $self->r;
-	my $db     = $r->db;
-	my $ce     = $r->ce;
-	my $user         = $r->param('user');
+# Handler for creating an ahcievement
+sub create_handler ($c) {
+	my $db   = $c->db;
+	my $ce   = $c->ce;
+	my $user = $c->param('user');
 
-	#create achievement
-	my $newAchievementID = $actionParams->{"action.create.id"}->[0];
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-		$r->maketext("Failed to create new achievement: no achievement ID specified!"))
+	# Create achievement
+	my $newAchievementID = $c->param('action.create.id');
+	return (0, $c->maketext("Failed to create new achievement: no achievement ID specified!"))
 		unless $newAchievementID =~ /\S/;
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-		$r->maketext("Achievement [_1] exists.  No achievement created", $newAchievementID))
+	return (0, $c->maketext("Achievement [_1] exists.  No achievement created", $newAchievementID))
 		if $db->existsAchievement($newAchievementID);
 	my $newAchievementRecord = $db->newAchievement;
-	my $oldAchievementID = $self->{selectedAchievementIDs}->[0];
+	my $oldAchievementID     = $c->{selectedAchievementIDs}->[0];
 
-	my $type = $actionParams->{"action.create.type"}->[0];
+	my $type = $c->param('action.create.type');
 
-	#either assign empty data or copy over existing data
+	# Either assign empty data or copy over existing data
 	if ($type eq "empty") {
 		$newAchievementRecord->achievement_id($newAchievementID);
 		$newAchievementRecord->enabled(0);
 		$newAchievementRecord->assignment_type('default');
-		$newAchievementRecord->test(BLANK_ACHIEVEMENT());
+		$newAchievementRecord->test('blankachievement.at');
 		$db->addAchievement($newAchievementRecord);
 	} elsif ($type eq "copy") {
-		return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-			$r->maketext("Failed to duplicate achievement: no achievement selected for duplication!"))
+		return (0, $c->maketext("Failed to duplicate achievement: no achievement selected for duplication!"))
 			unless $oldAchievementID =~ /\S/;
 		$newAchievementRecord = $db->getAchievement($oldAchievementID);
 		$newAchievementRecord->achievement_id($newAchievementID);
@@ -868,683 +387,223 @@ sub create_handler {
 
 	}
 
-	# assign achievement to current user
+	# Assign achievement to current user
 	my $userAchievement = $db->newUserAchievement();
 	$userAchievement->user_id($user);
 	$userAchievement->achievement_id($newAchievementID);
 	$db->addUserAchievement($userAchievement);
 
-	#add to local list of achievements
-	push @{ $self->{allAchievementIDs} }, $newAchievementID;
+	# Add to local list of achievements
+	push @{ $c->{allAchievementIDs} }, $newAchievementID;
 
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-		$r->maketext("Failed to create new achievement: [_1]", $@))
-		if $@;
+	return (0, $c->maketext("Failed to create new achievement: [_1]", $@)) if $@;
 
-	return CGI::div({ class => 'alert alert-success p-1 mb-0' },
-		$r->maketext('Successfully created new achievement [_1]', $newAchievementID));
-}
-
-# Form for importing achievements.
-sub import_form {
-	my ($self, %actionParams) = @_;
-
-	my $r     = $self->r;
-	my $authz = $r->authz;
-	my $user  = $r->param('user');
-
-	return CGI::div(
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'import_file_select', class => 'col-form-label col-form-label-sm col-sm-auto' },
-				$r->maketext('Import from where?')
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					name    => 'action.import.source',
-					id      => 'import_file_select',
-					values  => [ '', $self->getAxpList() ],
-					labels  => { '' => $r->maketext('Select import file') },
-					default => $actionParams{'action.import.source'}[0] || '',
-					class   => 'form-select form-select-sm d-inline w-auto'
-				})
-			)
-		),
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'import_users_select', class => 'col-form-label col-form-label-sm col-sm-auto' },
-				$r->maketext('Assign this achievement to which users?')
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					name    => 'action.import.assign',
-					id      => 'import_users_select',
-					value   => [qw(none all)],
-					default => $actionParams{'action.import.assign'}[0] || 'none',
-					class   => 'form-select form-select-sm d-inline w-auto',
-					labels  => {
-						all  => $r->maketext('all current users'),
-						none => $r->maketext('no users'),
-					},
-				})
-			)
-		)
-	);
+	return (1, $c->maketext('Successfully created new achievement [_1]', $newAchievementID));
 }
 
-# handler for importing achievements
-sub import_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r           = $self->r;
-	my $ce          = $r->ce;
-	my $db          = $r->db;
+# Handler for importing achievements
+sub import_handler ($c) {
+	my $ce = $c->ce;
+	my $db = $c->db;
 
-	my $fileName = $actionParams->{"action.import.source"}->[0];
-	my $assign = $actionParams->{"action.import.assign"}->[0];
-	my @users = $db->listUsers;
-	my %allAchievementIDs = map { $_ => 1 } @{ $self->{allAchievementIDs} };
-	my $filePath = $ce->{courseDirs}->{achievements}.'/'.$fileName;
+	my $fileName          = $c->param('action.import.source');
+	my $assign            = $c->param('action.import.assign');
+	my @users             = $db->listUsers;
+	my %allAchievementIDs = map { $_ => 1 } @{ $c->{allAchievementIDs} };
+	my $filePath          = $ce->{courseDirs}->{achievements} . '/' . $fileName;
 
-	#open file name
-	my $fh;
-	open $fh, "$filePath"
-		or return CGI::div({ class => 'alert alert-danger p-1 mb-0' }, $r->maketext("Failed to open [_1]", $filePath));
+	# Open file name
+	my $fh = Mojo::File->new($filePath)->open('<:encoding(UTF-8)')
+		or return (0, $c->maketext("Failed to open [_1]", $filePath));
 
-	#read in lines from file
+	# Read in lines from file
 	my $count = 0;
-	my $csv = Text::CSV->new();
+	my $csv   = Text::CSV->new();
 	while (my $data = $csv->getline($fh)) {
 
-	    my $achievement_id = $$data[0];
-	    #skip achievements that already exist
-	    next if $db->existsAchievement($achievement_id);
+		my $achievement_id = $$data[0];
+		# Skip achievements that already exist
+		next if $db->existsAchievement($achievement_id);
+
+		# Write achievement data.  The "format" for this isn't written down anywhere (!)
+		my $achievement = $db->newAchievement();
 
-	    #write achievement data.  The "format" for this isn't written down anywhere (!)
-	    my $achievement = $db->newAchievement();
+		$achievement->achievement_id($achievement_id);
 
-	    $achievement->achievement_id($achievement_id);
+		# Fall back for importing an old list without the number or assignment_type fields
+		if (scalar(@$data) == 9) {
+			# Old lists tend to have an extraneous space at the front.
+			for (my $i = 1; $i <= 7; $i++) {
+				$$data[$i] =~ s/^\s+//;
+			}
 
-	    # fall back for importing an old list without the number
-	    # or assignment_type fields
-	    if (scalar(@$data) == 9) {
-		# old lists tend to have an extraneous space at the front.
-		for (my $i=1; $i<=7; $i++) {
-		    $$data[$i] =~ s/^\s+//;
+			$$data[1] =~ s/\;/,/;
+			$achievement->name($$data[1]);
+			$achievement->category($$data[2]);
+			$$data[3] =~ s/\;/,/;
+			$achievement->description($$data[3]);
+			$achievement->points($$data[4]);
+			$achievement->max_counter($$data[5]);
+			$achievement->test($$data[6]);
+			$achievement->icon($$data[7]);
+			$achievement->assignment_type('default');
+			$achievement->number($count + 1);
+		} else {
+			$achievement->name($$data[1]);
+			$achievement->number($$data[2]);
+			$achievement->category($$data[3]);
+			$achievement->assignment_type($$data[4]);
+			$achievement->description($$data[5]);
+			$achievement->points($$data[6]);
+			$achievement->max_counter($$data[7]);
+			$achievement->test($$data[8]);
+			$achievement->icon($$data[9]);
 		}
 
-		$$data[1] =~ s/\;/,/;
-		$achievement->name($$data[1]);
-		$achievement->category($$data[2]);
-		$$data[3] =~ s/\;/,/;
-		$achievement->description($$data[3]);
-		$achievement->points($$data[4]);
-		$achievement->max_counter($$data[5]);
-		$achievement->test($$data[6]);
-		$achievement->icon($$data[7]);
-		$achievement->assignment_type('default');
-		$achievement->number($count+1);
-	    } else {
-		$achievement->name($$data[1]);
-		$achievement->number($$data[2]);
-		$achievement->category($$data[3]);
-		$achievement->assignment_type($$data[4]);
-		$achievement->description($$data[5]);
-		$achievement->points($$data[6]);
-		$achievement->max_counter($$data[7]);
-		$achievement->test($$data[8]);
-		$achievement->icon($$data[9]);
-	    }
-
-	    $achievement->enabled($assign eq "all"?1:0);
-
-	    #add achievement
-	    $db->addAchievement($achievement);
-	    $count++;
-	    $allAchievementIDs{$achievement_id} = 1;
-
-	    #assign to usesrs if necc
-	    if ($assign eq "all") {
-		foreach my $user (@users) {
-		    if (not $db->existsGlobalUserAchievement($user)) {
-			my $globalUserAchievement = $db->newGlobalUserAchievement();
-			$globalUserAchievement->user_id($user);
-			$db->addGlobalUserAchievement($globalUserAchievement);
-		    }
-		    my $userAchievement = $db->newUserAchievement();
-		    $userAchievement->user_id($user);
-		    $userAchievement->achievement_id($achievement_id);
-		    $db->addUserAchievement($userAchievement);
+		$achievement->enabled($assign eq "all" ? 1 : 0);
+
+		# Add achievement
+		$db->addAchievement($achievement);
+		$count++;
+		$allAchievementIDs{$achievement_id} = 1;
+
+		# Assign to usesrs if neccessary
+		if ($assign eq "all") {
+			for my $user (@users) {
+				if (not $db->existsGlobalUserAchievement($user)) {
+					my $globalUserAchievement = $db->newGlobalUserAchievement();
+					$globalUserAchievement->user_id($user);
+					$db->addGlobalUserAchievement($globalUserAchievement);
+				}
+				my $userAchievement = $db->newUserAchievement();
+				$userAchievement->user_id($user);
+				$userAchievement->achievement_id($achievement_id);
+				$db->addUserAchievement($userAchievement);
+			}
 		}
-	    }
 	}
 
-	$self->{allAchievementIDs} = [ keys %allAchievementIDs ];
+	$fh->close;
 
-	return CGI::div({ class => 'alert alert-success p-1 mb-0' },
-		$r->maketext('Imported [quant,_1,achievement]', $count));
-}
+	$c->{allAchievementIDs} = [ keys %allAchievementIDs ];
 
-# Form for exporting achievements.
-sub export_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	return CGI::div(
-		{ class => 'row mb-2' },
-		CGI::label(
-			{ for => 'export_select', class => 'col-form-label col-form-label-sm col-auto' },
-			$r->maketext('Export which achievements?')
-		),
-		CGI::div(
-			{ class => 'col-auto' },
-			CGI::popup_menu({
-				name    => 'action.export.scope',
-				id      => 'export_select',
-				values  => [qw(all selected)],
-				default => $actionParams{'action.export.scope'}[0] || 'selected',
-				class   => 'form-select form-select-sm d-inline w-auto',
-				labels  => {
-					all      => $r->maketext('all achievements'),
-					selected => $r->maketext('selected achievements'),
-				},
-			})
-		),
-	);
+	return (1, $c->maketext('Imported [quant,_1,achievement]', $count));
 }
 
-# export handler
-# this does not actually export any files, rather it sends us to a new page in order to export the files
-sub export_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r = $self->r;
+# Export handler
+# This does not actually export any files, rather it sends us to a new page in order to export the files.
+sub export_handler ($c) {
 	my $result;
 
-	my $scope = $actionParams->{"action.export.scope"}->[0];
+	my $scope = $c->param('action.export.scope');
 	if ($scope eq "all") {
-		$result = $r->maketext("exporting all achievements");
-		$self->{selectedAchievementIDs} = $self->{allAchievementIDs};
+		$result = $c->maketext("exporting all achievements");
+		$c->{selectedAchievementIDs} = $c->{allAchievementIDs};
 	} elsif ($scope eq "selected") {
-		$result = $r->maketext("exporting selected achievements");
-		$self->{selectedAchievementIDs} = $genericParams->{selected_achievements}; # an arrayref
+		$result = $c->maketext("exporting selected achievements");
+		$c->{selectedAchievementIDs} = [ $c->param('selected_achievements') ];
 	}
-	$self->{exportMode} = 1;
+	$c->{exportMode} = 1;
 
-	return CGI::div({ class => 'alert alert-success p-1 mb-0' }, $result);
+	return (1, $result);
 }
 
+# Handler for leaving the export page.
+sub cancel_export_handler ($c) {
+	$c->{exportMode} = 0;
 
-# Form and handler for leaving the export page.
-sub cancelExport_form {
-	my ($self, %actionParams) = @_;
-	return CGI::span($self->r->maketext('Abandon export'));
+	return (0, $c->maketext('export abandoned'));
 }
 
-sub cancelExport_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r      = $self->r;
+# Handler actually exporting achievements.
+sub save_export_handler ($c) {
+	my $ce         = $c->ce;
+	my $db         = $c->db;
+	my $courseName = $c->stash('courseID');
 
-	$self->{exportMode} = 0;
+	my @achievementIDsToExport = @{ $c->{selectedAchievementIDs} };
 
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' }, $r->maketext('export abandoned'));
-}
+	# Get file path
+	my $FileName = "${courseName}_achievements.axp";
+	my $FilePath = "$ce->{courseDirs}{achievements}/$FileName";
 
-# Handler and form for actually exporting achievements.
-sub saveExport_form {
-	my ($self, %actionParams) = @_;
-	return CGI::span($self->r->maketext('Export selected achievements.'));
-}
+	# Back up existing file
+	if (-e $FilePath) {
+		rename($FilePath, "$FilePath.bak")
+			or warn "Existing file $FilePath could not be backed up and was lost.";
+	}
 
-sub saveExport_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r           = $self->r;
-	my $ce          = $r->ce;
-	my $db          = $r->db;
-	my $urlpath = $r->urlpath;
-	my $courseName = $urlpath->arg("courseID");
+	$FilePath = WeBWorK::Utils::surePathToFile($ce->{courseDirs}{achievements}, $FilePath);
 
-	my @achievementIDsToExport = $r->param("selected_export") ;
+	my $fh = Mojo::File->new($FilePath)->open('>:encoding(UTF-8)')
+		or return (0, $c->maketext('Failed to open [_1]', $FilePath));
 
-	#get file path
-	my $FileName = $courseName."_achievements.axp";
-	my $FilePath = $ce->{courseDirs}->{achievements}.'/'.$FileName;
+	my $csv = Text::CSV->new({ eol => "\n" });
 
-	# back up existing file
-	if(-e $FilePath) {
-	    rename($FilePath, "$FilePath.bak") or
-		warn "Existing file $FilePath could not be backed up and was lost.";
-	}
+	# Iterate over achievements outputing data as csv list.  This format is not documented anywhere.
+	for my $achievement ($db->getAchievements(@achievementIDsToExport)) {
+		my $line = [
+			$achievement->achievement_id, $achievement->name,            $achievement->number,
+			$achievement->category,       $achievement->assignment_type, $achievement->description,
+			$achievement->points,         $achievement->max_counter,     $achievement->test,
+			$achievement->icon,
+		];
 
-	$FilePath = WeBWorK::Utils::surePathToFile($ce->{courseDirs}->{achievements}, $FilePath);
-	#open file
-	my $fh;
-	open $fh, ">$FilePath"
-		or return CGI::div({ class => 'alert alert-danger p-1 mb-0' }, $r->maketext("Failed to open [_1]", $FilePath));
-
-	my $csv = Text::CSV->new({eol=>"\n"});
-	my @achievements = $db->getAchievements(@achievementIDsToExport);
-	#run through achievements outputing data as csv list.  This format is not documented anywhere
-	foreach my $achievement (@achievements) {
-	    my $line = [$achievement->achievement_id,
-			$achievement->name,
-			$achievement->number,
-			$achievement->category,
-			$achievement->assignment_type,
-			$achievement->description,
-			$achievement->points,
-			$achievement->max_counter,
-			$achievement->test,
-			$achievement->icon,];
-
-	    warn("Error Exporting Achievement ".$achievement->achievement_id)
-		unless $csv->print($fh, $line);
+		warn('Error Exporting Achievement ' . $achievement->achievement_id)
+			unless $csv->print($fh, $line);
 	}
 
-	close EXPORT;
+	$fh->close;
 
-	$self->{exportMode} = 0;
+	$c->{exportMode} = 0;
 
-	return CGI::div({ class => 'alert alert-success p-1 mb-0' },
-		$r->maketext('Exported achievements to [_1]', $FileName));
+	return (1, $c->maketext('Exported achievements to [_1]', $FileName));
 }
 
-# Form and handler for cancelling edits.
-sub cancelEdit_form {
-	my ($self, %actionParams) = @_;
-	return CGI::span($self->r->maketext('Abandon changes'));
+# Handler for cancelling edits.
+sub cancel_edit_handler ($c) {
+	$c->{editMode} = 0;
+	return (1, $c->maketext('changes abandoned'));
 }
 
-sub cancelEdit_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r      = $self->r;
-
-	$self->{editMode} = 0;
+# Handler for saving edits.
+sub save_edit_handler ($c) {
+	my $db = $c->db;
 
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' }, $r->maketext('changes abandoned'));
-}
-
-# Form and handler for saving edits.
-sub saveEdit_form {
-	my ($self, %actionParams) = @_;
-	return CGI::span($self->r->maketext('Save changes'));
-}
+	my @selectedAchievementIDs = @{ $c->{selectedAchievementIDs} };
 
-sub saveEdit_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r           = $self->r;
-	my $db          = $r->db;
+	for my $achievementID (@selectedAchievementIDs) {
+		my $Achievement = $db->getAchievement($achievementID);
 
-	my @selectedAchievementIDs = @{ $self->{selectedAchievementIDs} };
-
-	#run through selected achievements
-	foreach my $achievementID (@selectedAchievementIDs) {
-		my $Achievement = $db->getAchievement($achievementID); # checked
-		# FIXME: we may not want to die on bad sets, they're not as bad as bad users
+		# FIXME: we may not want to die on bad achievements, they're not as bad as bad users
 		die "record for achievement $achievementID not found" unless $Achievement;
 
-		#update fields
-		foreach my $field ($Achievement->NONKEYFIELDS()) {
+		# Update fields
+		for my $field ($Achievement->NONKEYFIELDS()) {
 			my $param = "achievement.${achievementID}.${field}";
 
 			if ($field eq 'assignment_type') {
-			    my @types = ();
-			    my $i = 0;
-
-			    while (defined ($tableParams->{$param}->[$i])) {
-				push @types,  $tableParams->{$param}->[$i];
-				$i++;
-			    }
-
-			    $Achievement->assignment_type(join(',',@types));
-
+				my @types = $c->param($param);
+				$Achievement->assignment_type(join(',', @types));
 			} else {
 
-			    if (defined $tableParams->{$param}->[0]) {
-				$Achievement->$field($tableParams->{$param}->[0]);
-			    }
+				if (defined $c->param($param)) {
+					$Achievement->$field($c->param($param));
+				}
 			}
 		}
 
 		$db->putAchievement($Achievement);
 	}
 
-	$self->{editMode} = 0;
-
-	return CGI::div({ class => 'alert alert-success p-1 mb-0' }, $r->maketext('changes saved'));
-}
-
-################################################################################
-# "display" methods
-################################################################################
-
-#write out a particular field
-sub fieldEditHTML {
-	my ($self, $fieldName, $value, $properties) = @_;
-	my $size = $properties->{size};
-	my $type = $properties->{type};
-	my $access = $properties->{access};
-	my $items = $properties->{items};
-	my $synonyms = $properties->{synonyms};
-	my $headerFiles = $self->{headerFiles};
-
-	return $value if ($access eq 'readonly');
-
-	if ($type eq 'number' || $type eq 'text') {
-		return CGI::input({
-			type            => 'text',
-			name            => $fieldName,
-			aria_labelledby => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header',
-			value           => $value,
-			size            => $size,
-			class           => 'form-control form-control-sm'
-		});
-	}
-
-	if ($type eq 'checked') {
-		# If the checkbox is checked it returns a 1, if it is unchecked it returns nothing
-		# in which case the hidden field overrides the parameter with a 0.
-		return CGI::input({
-			type            => 'checkbox',
-			name            => $fieldName,
-			aria_labelledby => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header',
-			value           => 1,
-			class           => 'form-check-input',
-			$value ? (checked => undef) : (),
-		})
-			. CGI::hidden({
-				name  => $fieldName,
-				value => 0
-			});
-	}
-
-	if ($type eq 'assignment_type') {
-		my @allowedTypes = split(',', $value);
-
-		return CGI::checkbox_group({
-			name            => $fieldName,
-			aria_labelledby => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header',
-			values          => ASSIGNMENT_TYPES,
-			labels          => ASSIGNMENT_NAMES,
-			default         => \@allowedTypes,
-			class           => 'form-check-input me-1',
-			labelattributes => { class => 'form-check-label me-1' }
-		});
-	}
-}
-
-#write out a row of the table
-sub recordEditHTML {
-	my ($self, $Achievement, %options) = @_;
-	my $r           = $self->r;
-	my $urlpath     = $r->urlpath;
-	my $ce          = $r->ce;
-	my $db		= $r->db;
-	my $authz	= $r->authz;
-	my $user	= $r->param('user');
-	my $root        = $ce->{webworkURLs}->{root};
-	my $courseName  = $urlpath->arg("courseID");
-
-	my $editMode = $options{editMode};
-	my $exportMode = $options{exportMode};
-	my $achievementSelected = $options{achievementSelected};
-
-	my $users = $db->countAchievementUsers($Achievement->achievement_id);
-	my $totalUsers = $self->{totalUsers};
-
-	my @tableCells;
-	my $achievement_id = $Achievement->achievement_id;
-	my $editorPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::AchievementEditor",  $r, courseID => $courseName, achievementID => $achievement_id);
-	my $editorURL = $self->systemLink($editorPage, params => {
-	    sourceFilePath => $ce->{courseDirs}->{achievements}."/".$Achievement->test});
-
-	my $userEditorPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::AchievementUserEditor", $r, courseID=>$courseName, achievementID =>$achievement_id);
-	my $userEditorURL = $self->systemLink($userEditorPage, params => {});
-
-	# The formats are "hard coded" below.  Making them more modular would be good.
-	if ($exportMode) {
-		# Format for export row
-		# Select all checkbox
-		push @tableCells,
-			CGI::input({
-				type  => 'checkbox',
-				name  => 'selected_export',
-				value => $achievement_id,
-				id    => "${achievement_id}_id",
-				class => 'form-check-input',
-				$achievementSelected ? (checked => undef) : (),
-			});
-
-		my @fields = ('achievement_id', 'name');
-
-		for my $field (@fields) {
-			my $fieldName  = 'achievement.' . $achievement_id . '.' . $field;
-			my $fieldValue = $Achievement->$field;
-			my %properties = %{ FIELD_PROPERTIES()->{$field} };
-			$properties{access} = 'readonly';
-			push @tableCells,
-				$field eq 'achievement_id'
-				? CGI::label({ for => "${achievement_id}_id" },
-					$self->fieldEditHTML($fieldName, $fieldValue, \%properties))
-				: $self->fieldEditHTML($fieldName, $fieldValue, \%properties);
-		}
-	} elsif ($editMode) {
-		# Format for edit mode
-		return unless $achievementSelected;
-
-		push @tableCells,
-			CGI::hidden({ name => 'selected_achievements', value => $achievement_id })
-			. CGI::img({
-				src    => "$ce->{courseURLs}{achievements}/" . ($Achievement->{icon} // 'defaulticon.png'),
-				alt    => 'Achievement Icon',
-				height => 60,
-				class  => 'm-1'
-			});
-
-		for (
-			[ 'achievement_id', 'name',    'category' ],
-			[ 'number',         'enabled', 'points', 'max_counter' ],
-			[ 'description',    'test',    'icon',   'assignment_type' ]
-			)
-		{
-			my $tableCell = '';
-
-			for my $field (@$_) {
-				$tableCell .= CGI::span(
-					{ class => 'text-nowrap', style => 'height:28px' },
-					$self->fieldEditHTML(
-						"achievement.$achievement_id.$field", $Achievement->$field,
-						\%{ FIELD_PROPERTIES()->{$field} }
-					)
-				);
-			}
-
-			push @tableCells, CGI::div({ class => 'd-flex flex-column gap-1' }, $tableCell);
-		}
-	} else {
-		# Format for regular viewing mode
-		# Select all checkbox
-		push @tableCells,
-			CGI::input({
-				type  => 'checkbox',
-				name  => "selected_achievements",
-				value => $achievement_id,
-				id    => "${achievement_id}_id",
-				class => 'form-check-input',
-				$achievementSelected ? (checked => undef) : (),
-			});
-
-		for my $field (@{ VIEW_FIELD_ORDER() }) {
-			my $fieldName  = "achievement." . $achievement_id . "." . $field;
-			my $fieldValue = $Achievement->$field;
-			my %properties = %{ FIELD_PROPERTIES()->{$field} };
-			$properties{access} = "readonly";
-			$fieldValue =~ s/ /&nbsp;/g;
-			$fieldValue = ($fieldValue) ? $r->maketext("Yes") : $r->maketext("No") if $field =~ /enabled/;
-			if ($field =~ /achievement_id/) {
-				$fieldValue .= " "
-					. CGI::a(
-						{
-							href => $self->systemLink($urlpath->new(
-								type => 'instructor_achievement_list',
-								args => { courseID => $courseName }
-							))
-							. "&editMode=1&selected_achievements="
-							. $achievement_id
-						},
-						CGI::i({ class => 'icon fas fa-pencil-alt', data_alt => 'edit', aria_hidden => "true" }, '')
-					);
-				$fieldValue = CGI::div({ class => 'label-with-edit-icon' },
-					CGI::label({ for => "${achievement_id}_id" }, $fieldValue));
-			}
-			push @tableCells, $self->fieldEditHTML($fieldName, $fieldValue, \%properties);
-		}
-
-		push @tableCells, CGI::a({ href => $userEditorURL }, "$users/$totalUsers");
-
-		push @tableCells, CGI::a({ href => $editorURL }, $r->maketext("Edit Evaluator"));
-	}
-
-	return CGI::Tr(CGI::td(\@tableCells));
-}
-
-#this prints out the whole table
-sub printTableHTML {
-	my ($self, $AchievementsRef, %options) = @_;
-	my $r                       = $self->r;
-	my $authz                   = $r->authz;
-	my $user                    = $r->param('user');
-	my @Achievements                    = @$AchievementsRef;
-
-
-	my $editMode                = $options{editMode};
-	my $exportMode              = $options{exportMode};
-	my %selectedAchievementIDs          = map { $_ => 1 } @{ $options{selectedAchievementIDs} };
-
-	# names of headings:
-
-	if ($editMode and not %selectedAchievementIDs) {
-	    print CGI::p(
-		CGI::i("No achievements shown.  Select an achievement to edit!"));
-	    return;
-	}
-
-	my @tableHeadings;
-
-	# Hardcoded headings.  Making this more modular would be good.
-	if ($exportMode) {
-		@tableHeadings = (
-			CGI::input({
-				type              => 'checkbox',
-				id                => 'select-all',
-				aria_label        => $r->maketext('Select all achievements'),
-				data_select_group => 'selected_export',
-				class             => 'select-all form-check-input'
-			}),
-			CGI::label({ for => 'select-all' }, $r->maketext('Achievement ID')),
-			$r->maketext('Name')
-		);
-	} elsif ($editMode) {
-		@tableHeadings = (
-			$r->maketext('Icon'),
-			CGI::div(
-				{ class => 'd-flex flex-column' },
-				$r->maketext('Achievement ID'),
-				CGI::span({ id => 'name_header' },     $r->maketext('Name')),
-				CGI::span({ id => 'category_header' }, $r->maketext('Category'))
-			),
-			CGI::div(
-				{ class => 'd-flex flex-column' },
-				CGI::span({ id => 'number_header' },      $r->maketext('Number')),
-				CGI::span({ id => 'enabled_header' },     $r->maketext('Enabled')),
-				CGI::span({ id => 'points_header' },      $r->maketext('Points')),
-				CGI::span({ id => 'max_counter_header' }, $r->maketext('Counter'))
-			),
-			CGI::div(
-				{ class => 'd-flex flex-column' },
-				CGI::span({ id => 'description_header' }, $r->maketext('Description')),
-				CGI::span({ id => 'test_header' },        $r->maketext('Evaluator File')),
-				CGI::span({ id => 'icon_header' },        $r->maketext('Icon File')),
-				$r->maketext('Type')
-			)
-		);
-	} else {
-		@tableHeadings = (
-			CGI::input({
-				type              => 'checkbox',
-				id                => 'select-all',
-				aria_label        => $r->maketext('Select all achievements'),
-				data_select_group => 'selected_achievements',
-				class             => 'select-all form-check-input'
-			}),
-			CGI::label({ for => 'select-all' }, $r->maketext('Achievement ID')),
-			$r->maketext('Enabled'),
-			$r->maketext('Name'),
-			$r->maketext('Number'),
-			$r->maketext('Category'),
-			$r->maketext('Edit Users'),
-			$r->maketext('Edit Evaluator')
-		);
-	}
+	$c->{editMode} = 0;
 
-	# print the table
-	print CGI::start_div({ class => 'table-responsive' });
-	print CGI::start_table({
-		class => "table table-sm table-bordered font-sm",
-		id    => "achievement-table"
-	});
-
-	print CGI::thead(CGI::Tr(CGI::th({ class => 'align-top' }, \@tableHeadings)));
-
-	print CGI::start_tbody();
-	for (my $i = 0; $i < @Achievements; $i++) {
-		my $Achievement = $Achievements[$i];
-
-		print $self->recordEditHTML(
-			$Achievement,
-			editMode            => $editMode,
-			exportMode          => $exportMode,
-			achievementSelected => exists $selectedAchievementIDs{ $Achievement->achievement_id }
-		);
-	}
-	print CGI::end_tbody();
-
-	print CGI::end_table(), CGI::end_div();
-	#########################################
-	# if there are no users shown print message
-	#
-	##########################################
-
-	print CGI::p(
-                      CGI::i($r->maketext("No achievements shown.  Create an achievement!"))
-	    ) unless @Achievements;
+	return (1, $c->maketext('changes saved'));
 }
 
-#get list of files that can be imported.
-sub getAxpList {
-	my ($self) = @_;
-	my $ce = $self->{ce};
-	my $dir = $ce->{courseDirs}->{achievements};
-	return $self->read_dir($dir, qr/.*\.axp/);
-}
-
-sub output_JS {
-	my $self = shift;
-	my $ce   = $self->r->ce;
-
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/ShowHide/show_hide.js'),    defer => undef }, '');
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/ActionTabs/actiontabs.js'), defer => undef }, '');
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/SelectAll/selectall.js'),   defer => undef }, '');
-
-	return '';
+# Get list of files that can be imported.
+sub getAxpList ($c) {
+	return read_dir($c->ce->{courseDirs}{achievements}, qr/.*\.axp/);
 }
 
 1;
-
-=head1 AUTHOR
-
-Written by Robert Van Dam, toenail (at) cif.rochester.edu
-
-=cut
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm b/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm
index 205f7dc18f..41f52611f6 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Instructor::AchievementUserEditor;
-use base qw(WeBWorK::ContentGenerator::Instructor);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -23,277 +23,113 @@ users assigned to an achievement.
 
 =cut
 
-use strict;
-use warnings;
-use CGI qw(-nosticky );
-use WeBWorK::Debug;
+sub initialize ($c) {
+	my $authz         = $c->authz;
+	my $db            = $c->db;
+	my $achievementID = $c->stash('achievementID');
+	my $user          = $c->param('user');
 
-sub initialize {
-	my ($self)     = @_;
-	my $r          = $self->r;
-	my $urlpath    = $r->urlpath;
-	my $authz      = $r->authz;
-	my $db         = $r->db;
-	my $achievementID = $urlpath->arg("achievementID");
-	my $user       = $r->param('user');
+	# Make sure this is defined for the template.
+	$c->stash->{userRecords} = [];
 
 	# Check permissions
-	return unless $authz->hasPermissions($user, "edit_achievements");
+	return unless $authz->hasPermissions($user, 'edit_achievements');
 
-	$self->{all_users} = [ $db->listUsers ];
-	my %selectedUsers = map {$_ => 1} $r->param('selected');
+	my @all_users     = $db->listUsers;
+	my %selectedUsers = map { $_ => 1 } $c->param('selected');
 
 	my $doAssignToSelected = 0;
 
 	#Check and see if we need to assign or unassign things
-	if (defined $r->param('assignToAll')) {
-		$self->addmessage(CGI::div(
-			{ class => 'alert alert-success p-1 mb-0' },
-			$r->maketext("Achievement has been assigned to all users.")
-		));
-		%selectedUsers      = map { $_ => 1 } @{ $self->{all_users} };
+	if (defined $c->param('assignToAll')) {
+		$c->addgoodmessage($c->maketext('Achievement has been assigned to all users.'));
+		%selectedUsers      = map { $_ => 1 } @all_users;
 		$doAssignToSelected = 1;
-	} elsif (defined $r->param('unassignFromAll')
-		&& defined($r->param('unassignFromAllSafety'))
-		&& $r->param('unassignFromAllSafety') == 1)
+	} elsif (defined $c->param('unassignFromAll')
+		&& defined($c->param('unassignFromAllSafety'))
+		&& $c->param('unassignFromAllSafety') == 1)
 	{
 		%selectedUsers = ();
-		$self->addmessage(
-			CGI::div(
-				{ class => 'alert alert-danger p-1 mb-0' },
-				$r->maketext("Achievement has been unassigned to all students.")
-			)
-		);
+		$c->addbadmessage($c->maketext('Achievement has been unassigned to all students.'));
 		$doAssignToSelected = 1;
-	} elsif (defined $r->param('assignToSelected')) {
-		$self->addmessage(
-			CGI::div(
-				{ class => 'alert alert-success p-1 mb-0' },
-				$r->maketext("Achievement has been assigned to selected users.")
-			)
-		);
+	} elsif (defined $c->param('assignToSelected')) {
+		$c->addgoodmessage($c->maketext('Achievement has been assigned to selected users.'));
 		$doAssignToSelected = 1;
-	} elsif (defined $r->param("unassignFromAll")) {
+	} elsif (defined $c->param('unassignFromAll')) {
 		# no action taken
-		$self->addmessage(CGI::div({ class => 'alert alert-danger p-1 mb-0' }, $r->maketext("No action taken")));
+		$c->addbadmessage($c->maketext('No action taken'));
 	}
 
 	#do actual assignment and unassignment
 	if ($doAssignToSelected) {
 
 		my %achievementUsers = map { $_ => 1 } $db->listAchievementUsers($achievementID);
-		foreach my $selectedUser (@{ $self->{all_users} }) {
+		foreach my $selectedUser (@all_users) {
 			if (exists $selectedUsers{$selectedUser} && $achievementUsers{$selectedUser}) {
-			    # update existing user data (in case fields were changed)
-			    my $userAchievement = $db->getUserAchievement($selectedUser,$achievementID);
-
-			    my $updatedEarned = $r->param("$selectedUser.earned") ? 1:0;
-			    my $earned = $userAchievement->earned ? 1:0;
-			    if ($updatedEarned != $earned) {
-
-				$userAchievement->earned($updatedEarned);
-				my $globalUserAchievement = $db->getGlobalUserAchievement($selectedUser);
-				my $achievement = $db->getAchievement($achievementID);
-
-				my $points = $achievement->points || 0;
-				my $initialpoints = $globalUserAchievement->achievement_points || 0;
-				#add the correct number of points if we
-				# are saying that the user now earned the
-				# achievement, or remove them otherwise
-				if ($updatedEarned) {
-
-				    $globalUserAchievement->achievement_points(
-					$initialpoints +	$points);
-				} else {
-				    $globalUserAchievement->achievement_points(
-					$initialpoints -	$points);
+				# update existing user data (in case fields were changed)
+				my $userAchievement = $db->getUserAchievement($selectedUser, $achievementID);
+
+				my $updatedEarned = $c->param("$selectedUser.earned") ? 1 : 0;
+				my $earned        = $userAchievement->earned          ? 1 : 0;
+				if ($updatedEarned != $earned) {
+
+					$userAchievement->earned($updatedEarned);
+					my $globalUserAchievement = $db->getGlobalUserAchievement($selectedUser);
+					my $achievement           = $db->getAchievement($achievementID);
+
+					my $points        = $achievement->points                       || 0;
+					my $initialpoints = $globalUserAchievement->achievement_points || 0;
+					#add the correct number of points if we
+					# are saying that the user now earned the
+					# achievement, or remove them otherwise
+					if ($updatedEarned) {
+
+						$globalUserAchievement->achievement_points($initialpoints + $points);
+					} else {
+						$globalUserAchievement->achievement_points($initialpoints - $points);
+					}
+
+					$db->putGlobalUserAchievement($globalUserAchievement);
 				}
 
-				$db->putGlobalUserAchievement($globalUserAchievement);
-			    }
-
-
-			    $userAchievement->counter($r->param("$selectedUser.counter"));
-			    $db->putUserAchievement($userAchievement);
+				$userAchievement->counter($c->param("$selectedUser.counter"));
+				$db->putUserAchievement($userAchievement);
 
 			} elsif (exists $selectedUsers{$selectedUser}) {
-			    # add users that dont exist
-			    my $userAchievement = $db->newUserAchievement();
-			    $userAchievement->user_id($selectedUser);
-			    $userAchievement->achievement_id($achievementID);
-			    $db->addUserAchievement($userAchievement);
-
-			    #If they dont have global achievement data, then add that too
-			    if (not $db->existsGlobalUserAchievement($selectedUser)) {
-				my $globalUserAchievement = $db->newGlobalUserAchievement();
-				$globalUserAchievement->user_id($selectedUser);
-				$db->addGlobalUserAchievement($globalUserAchievement);
-			    }
+				# add users that dont exist
+				my $userAchievement = $db->newUserAchievement();
+				$userAchievement->user_id($selectedUser);
+				$userAchievement->achievement_id($achievementID);
+				$db->addUserAchievement($userAchievement);
+
+				#If they dont have global achievement data, then add that too
+				if (not $db->existsGlobalUserAchievement($selectedUser)) {
+					my $globalUserAchievement = $db->newGlobalUserAchievement();
+					$globalUserAchievement->user_id($selectedUser);
+					$db->addGlobalUserAchievement($globalUserAchievement);
+				}
 
 			} else {
-			    # delete users who are not selected
-			    # but dont delete users who dont exist
-			    next unless $achievementUsers{$selectedUser};
-			    $db->deleteUserAchievement($selectedUser, $achievementID);
+				# delete users who are not selected
+				# but dont delete users who dont exist
+				next unless $achievementUsers{$selectedUser};
+				$db->deleteUserAchievement($selectedUser, $achievementID);
 			}
 		}
 	}
-}
-
-sub body {
-	my ($self)         = @_;
-	my $r              = $self->r;
-	my $urlpath        = $r->urlpath;
-	my $db             = $r->db;
-	my $ce             = $r->ce;
-	my $authz          = $r->authz;
-	my $webworkRoot    = $ce->{webworkURLs}->{root};
-	my $courseName     = $urlpath->arg("courseID");
-	my $achievementID  = $urlpath->arg("achievementID");
-	my $user           = $r->param('user');
-
-	return CGI::div({ class => 'alert alert-danger p-1' }, "You are not authorized to edit achievements.")
-		unless $authz->hasPermissions($user, "edit_achievements");
 
-	print CGI::start_form({name=>"user-achievement-form", id=>"user-achievement-form", method=>"post", action => $self->systemLink( $urlpath, authen=>0) });
-
-	# Assign to everyone message
-	print CGI::div(
-		{ class => 'my-2' },
-		CGI::submit({
-			name  => "assignToAll",
-			value => $r->maketext("Assign to All Current Users"),
-			class => 'btn btn-primary'
-		}),
-		CGI::i($r->maketext("This action will not overwrite existing users."))
-	);
-
-	print CGI::div(
-		{ class => 'alert alert-danger p-1 mb-2' },
-		CGI::div({ class => 'mb-1' }, $r->maketext('Do not uncheck students, unless you know what you are doing.')),
-		CGI::div($r->maketext('There is NO undo for unassigning students.'))
-	);
-	print CGI::p($r->maketext(
-		"When you unassign by unchecking a student's name, you destroy all of the data for achievement [_1] "
-			. 'for this student. Make sure this is what you want to do.',
-		CGI::b($achievementID)
-	));
-
-	# Print table
-	print CGI::start_div({ class => 'table-responsive' }),
-		CGI::start_table({ class => 'table table-sm table-bordered font-sm align-middle w-auto' });
-	print CGI::Tr(
-		CGI::th({ class => 'text-center' }, $r->maketext('Assigned')),
-		CGI::th($r->maketext('Login Name')),
-		CGI::th($r->maketext('Student Name')),
-		CGI::th({ class => 'text-center' }, $r->maketext('Section')),
-		CGI::th({ class => 'text-center', id => 'earned_header' }, $r->maketext('Earned')),
-		CGI::th({ class => 'text-center', id => 'counter_header' }, $r->maketext('Counter'))
-	);
-
-	# get user records
-	my @userRecords  = ();
-	for my $currentUser (@{ $self->{all_users} }) {
-		my $userObj = $db->getUser($currentUser); #checked
+	my @userRecords;
+	for my $currentUser (@all_users) {
+		my $userObj = $c->db->getUser($currentUser);
 		die "Unable to find user object for $currentUser. " unless $userObj;
-		push (@userRecords, $userObj );
-	}
-	@userRecords = sort { ( lc($a->section) cmp lc($b->section) ) ||
-	                     ( lc($a->last_name) cmp lc($b->last_name )) } @userRecords;
-
-	#print row for user
-	for my $userRecord (@userRecords) {
-
-		my $statusClass = $ce->status_abbrev_to_name($userRecord->status) || '';
-
-		my $user            = $userRecord->user_id;
-		my $userAchievement = $db->getUserAchievement($user, $achievementID);
-		my $prettyName      = $userRecord->last_name . ', ' . $userRecord->first_name;
-		my $earned          = $userAchievement->earned  if ref $userAchievement;
-		my $counter         = $userAchievement->counter if ref $userAchievement;
-
-		print CGI::Tr(
-			CGI::td(
-				{ class => 'text-center' },
-				CGI::input({
-					type    => 'checkbox',
-					name    => 'selected',
-					id      => "$user.assigned",
-					value   => $user,
-					class   => 'form-check-input',
-					defined $userAchievement ? (checked => undef) : (),
-				})
-			),
-			CGI::td(CGI::label({ for => "$user.assigned" }, $user)),
-			CGI::td($prettyName),
-			CGI::td({ class => 'text-center' }, $userRecord->section),
-			(
-				defined $userAchievement
-				? (
-					CGI::td(
-						{ class => 'text-center' },
-						CGI::input({
-							type            => 'checkbox',
-							name            => "$user.earned",
-							aria_labelledby => 'earned_header',
-							value           => '1',
-							class           => 'form-check-input',
-							$earned ? (checked => undef) : (),
-						})
-					),
-					CGI::td(
-						{ class => 'text-center' },
-						CGI::input({
-							type            => 'text',
-							name            => "$user.counter",
-							aria_labelledby => 'counter_header',
-							value           => $counter,
-							size            => 6,
-							class           => 'form-control form-control-sm'
-						})
-					),
-					)
-				: (CGI::td(), CGI::td())
-			)
-		);
+		push(@userRecords, $userObj);
 	}
+	@userRecords =
+		sort { (lc($a->section) cmp lc($b->section)) || (lc($a->last_name) cmp lc($b->last_name)) } @userRecords;
 
-	print CGI::end_table(), CGI::end_div();
-	print $self->hidden_authen_fields;
-	print CGI::submit({ name => "assignToSelected", value => $r->maketext("Save"), class => 'btn btn-primary' });
-
-	#Print unassign from everyone stuff
-	print CGI::hr()
-		. CGI::div(
-			CGI::div(
-				{ class => 'alert alert-danger p-1 mb-3' },
-				$r->maketext(
-					"There is NO undo for this function.  Do not use it unless you know what you are doing!  "
-						. "When you unassign a student using this button, or by unchecking their name, you destroy all "
-						. "of the data for achievement [_1] for this student.",
-					$achievementID
-				)
-			),
-			CGI::div(
-				{ class => 'd-flex align-items-center' },
-				CGI::submit({
-					name  => "unassignFromAll",
-					value => $r->maketext("Unassign from All Users"),
-					class => 'btn btn-primary'
-				}),
-				CGI::radio_group({
-					name            => "unassignFromAllSafety",
-					values          => [ 0, 1 ],
-					default         => 0,
-					labels          => { 0 => $r->maketext('Read only'), 1 => $r->maketext('Allow unassign') },
-					class           => 'form-check-input mx-1',
-					labelattributes => { class => 'form-check-label' },
-				}),
-			)
-		) . CGI::hr();
-	print CGI::end_form();
+	$c->stash->{userRecords} = \@userRecords;
 
-	return "";
+	return;
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm b/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm
index fddc64c461..1d5960dd30 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Instructor::AddUsers;
-use base qw(WeBWorK::ContentGenerator::Instructor);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -22,247 +22,84 @@ WeBWorK::ContentGenerator::Instructor::AddUsers - Menu interface for adding user
 
 =cut
 
-use strict;
-use warnings;
-use WeBWorK::CGI;
 use WeBWorK::Utils qw/cryptPassword trim_spaces/;
+use WeBWorK::Utils::Instructor qw(assignSetsToUsers);
 
-sub initialize {
-	my ($self) = @_;
-	my $r      = $self->r;
-	my $db     = $r->db;
-	my $ce     = $r->ce;
-	my $authz  = $r->authz;
+sub initialize ($c) {
+	my $db    = $c->db;
+	my $ce    = $c->ce;
+	my $authz = $c->authz;
 
-	my $user = $r->param('user');
+	my $user = $c->param('user');
 
 	# Check permissions
-	return unless ($authz->hasPermissions($user, "access_instructor_tools"));
-	return unless ($authz->hasPermissions($user, "modify_student_data"));
+	return unless $authz->hasPermissions($user, 'access_instructor_tools');
+	return unless $authz->hasPermissions($user, 'modify_student_data');
+
+	if (defined $c->param('addStudents')) {
+		$c->{studentEntryReport} = $c->c;
 
-	if (defined($r->param('addStudents'))) {
 		my @userIDs;
-		my $numberOfStudents = $r->param('number_of_students');
-		warn "Internal error -- the number of students to be added has not been included" unless defined $numberOfStudents;
-		foreach my $i (1 .. $numberOfStudents) {
-			my $new_user_id  = trim_spaces($r->param("new_user_id_$i"));
-			my $new_password = cryptPassword($r->param("student_id_$i"));
-			next unless defined($new_user_id) and $new_user_id;
-			push @userIDs, $new_user_id;
+		my $numberOfStudents = $c->param('number_of_students') // 0;
+
+		# FIXME: Handle errors if user already exists as well as all other errors that could occur (including errors
+		# when adding the permission, adding the password, and assigning sets to the users).
+		for my $i (1 .. $numberOfStudents) {
+			my $new_user_id  = trim_spaces($c->param("new_user_id_$i"));
+			my $new_password = cryptPassword($c->param("student_id_$i"));
+			next unless $new_user_id;
 
-			my $newUser            = $db->newUser;
-			my $newPermissionLevel = $db->newPermissionLevel;
-			my $newPassword        = $db->newPassword;
+			my $newUser = $db->newUser;
 			$newUser->user_id($new_user_id);
-			$newPermissionLevel->user_id($new_user_id);
-			$newPassword->user_id($new_user_id);
-			$newPassword->password($new_password);
-			$newUser->last_name(trim_spaces($r->param("last_name_$i")));
-			$newUser->first_name(trim_spaces($r->param("first_name_$i")));
-			$newUser->student_id(trim_spaces($r->param("student_id_$i")));
-			$newUser->email_address(trim_spaces($r->param("email_address_$i")));
-			$newUser->section(trim_spaces($r->param("section_$i")));
-			$newUser->recitation(trim_spaces($r->param("recitation_$i")));
-			$newUser->comment(trim_spaces($r->param("comment_$i")));
+			$newUser->last_name(trim_spaces($c->param("last_name_$i")));
+			$newUser->first_name(trim_spaces($c->param("first_name_$i")));
+			$newUser->student_id(trim_spaces($c->param("student_id_$i")));
+			$newUser->email_address(trim_spaces($c->param("email_address_$i")));
+			$newUser->section(trim_spaces($c->param("section_$i")));
+			$newUser->recitation(trim_spaces($c->param("recitation_$i")));
+			$newUser->comment(trim_spaces($c->param("comment_$i")));
 			$newUser->status($ce->status_name_to_abbrevs($ce->{default_status}));
-			$newPermissionLevel->permission(0);
-			#FIXME  handle errors if user exists already
+
 			eval { $db->addUser($newUser) };
 			if ($@) {
-				my $addError = $@;
-				$self->{studentEntryReport} .= join("",
-					CGI::b($r->maketext("Failed to enter student:")), ' ', $newUser->last_name, ", ",$newUser->first_name,
-					CGI::b(", ".$r->maketext("login/studentID:")),' ', $newUser->user_id, "/",$newUser->student_id,
-					CGI::b(", ".$r->maketext("email:")),' ', $newUser->email_address,
-					CGI::b(", ".$r->maketext("section:")),' ', $newUser->section,
-					CGI::br(), CGI::b($r->maketext("Error message:")), ' ', $addError,
-					CGI::hr(),CGI::br(),
+				push(
+					@{ $c->{studentEntryReport} },
+					$c->include(
+						'ContentGenerator/Instructor/AddUsers/student_entry_report',
+						newUser  => $newUser,
+						addError => $@
+					)
 				);
 			} else {
+				push @userIDs, $new_user_id;
+
+				my $newPermissionLevel = $db->newPermissionLevel;
+				$newPermissionLevel->user_id($new_user_id);
+				$newPermissionLevel->permission(0);
 				$db->addPermissionLevel($newPermissionLevel);
+
+				my $newPassword = $db->newPassword;
+				$newPassword->user_id($new_user_id);
+				$newPassword->password($new_password);
 				$db->addPassword($newPassword);
-				$self->{studentEntryReport} .= join("",
-					CGI::b($r->maketext("Entered student:")), ' ', $newUser->last_name, ", ",$newUser->first_name,
-					CGI::b(", ",$r->maketext("login/studentID:")),' ', $newUser->user_id, "/",$newUser->student_id,
-					CGI::b(", ",$r->maketext("email:")),' ', $newUser->email_address,
-					CGI::b(", ",$r->maketext("section:")),' ', $newUser->section,CGI::hr(),CGI::br(),
 
+				push(
+					@{ $c->{studentEntryReport} },
+					$c->include(
+						'ContentGenerator/Instructor/AddUsers/student_entry_report',
+						newUser  => $newUser,
+						addError => ''
+					)
 				);
 			}
 		}
-		if (defined $r->param("assignSets")) {
-			my @setIDs = $r->param("assignSets");
-			if (@setIDs) {
-				$self->assignSetsToUsers(\@setIDs, \@userIDs);
-			}
+		if (defined $c->param('assignSets')) {
+			my @setIDs = $c->param('assignSets');
+			assignSetsToUsers($db, $ce, \@setIDs, \@userIDs);
 		}
 	}
-}
 
-sub body {
-	my ($self) = @_;
-	my $r      = $self->r;
-	my $ce     = $r->ce;
-	my $db     = $r->db;
-	my $authz  = $r->authz;
-
-	my $courseName  = $r->urlpath->arg("courseID");
-	my $authen_args = $self->url_authen_args();
-	my $user        = $r->param('user');
-
-	# Check permissions
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' }, "You are not authorized to access the Instructor tools.")
-		unless $authz->hasPermissions($user, "access_instructor_tools");
-
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' }, "You are not authorized to modify student data.")
-		unless $authz->hasPermissions($user, "modify_student_data");
-
-	return join(
-		"",
-
-		CGI::hr(),
-		CGI::p(defined($self->{studentEntryReport}) ? $self->{studentEntryReport} : ''),
-		CGI::p(
-			$r->maketext(
-				"Enter information below for students you wish to add. Each student's password will initially be set to their student ID."
-			)
-		),
-		$self->addStudentForm,
-	);
-}
-
-sub addStudentForm {
-	my $self             = shift;
-	my $r                = $self->r;
-	my $db               = $r->db;
-	my $ce               = $r->ce;
-	my $numberOfStudents = $r->param("number_of_students") || 5;
-
-	# Add a student form
-
-	my @entryLines = ();
-	foreach my $i (1 .. $numberOfStudents) {
-		push(
-			@entryLines,
-			CGI::Tr(CGI::td([
-				CGI::input({
-					type  => 'text',
-					class => "last-name-input",
-					name  => "last_name_$i",
-					size  => '10',
-					class => 'form-control form-control-sm w-auto'
-				}),
-				CGI::input({
-					type  => 'text',
-					class => "first-name-input",
-					name  => "first_name_$i",
-					size  => '10',
-					class => 'form-control form-control-sm w-auto'
-				}),
-				CGI::input({
-					type          => 'text',
-					class         => "student-id-input",
-					name          => "student_id_$i",
-					size          => "16",
-					class         => 'form-control form-control-sm w-auto'
-				}),
-				CGI::input({
-					type          => 'text',
-					class         => "user-id-input",
-					name          => "new_user_id_$i",
-					size          => "10",
-					aria_required => 'true',
-					class         => 'form-control form-control-sm w-auto',
-				}),
-				CGI::input({
-					type  => 'text',
-					class => "email-input",
-					name  => "email_address_$i",
-					class => 'form-control form-control-sm w-auto'
-				}),
-				CGI::input({
-					type  => 'text',
-					class => "section-input",
-					name  => "section_$i",
-					size  => "4",
-					class => 'form-control form-control-sm w-auto'
-				}),
-				CGI::input({
-					type  => 'text',
-					class => "recitation-input",
-					name  => "recitation_$i",
-					size  => "4",
-					class => 'form-control form-control-sm w-auto'
-				}),
-				CGI::input({
-					type  => 'text',
-					class => "comment-input",
-					name  => "comment_$i",
-					class => 'form-control form-control-sm w-auto'
-				}),
-			]))
-		);
-	}
-
-	return join(
-		"",
-		CGI::start_form({ method => "post", action => $r->uri(), name => "add_users" }),
-		$self->hidden_authen_fields(),
-		CGI::div(
-			{ class => 'input-group d-inline-flex w-auto' },
-			CGI::submit({ name => "Create", value => $r->maketext("Create"), class => 'btn btn-primary' }),
-			CGI::textfield({
-				name  => 'number_of_students',
-				value => $numberOfStudents,
-				size  => 3,
-				class => 'form-control'
-			}),
-			CGI::span({ class => 'input-group-text' }, $r->maketext("entry rows.")),
-		),
-		CGI::end_form(),
-		CGI::hr(),
-
-		CGI::start_form({ method => "post", action => $r->uri(), name => "new-users-form", id => "new-users-form" }),
-		$self->hidden_authen_fields(),
-		CGI::input({ type => 'hidden', name => "number_of_students", value => $numberOfStudents }),
-		CGI::start_div({ class => 'table-responsive' }),
-		CGI::start_table({ class => 'table table-sm table-bordered' }),
-		CGI::Tr(CGI::th([
-			$r->maketext('Last Name'),
-			$r->maketext('First Name'),
-			$r->maketext('Student ID'),
-			$r->maketext('Login Name') . CGI::span({ class => "required-field" }, '*'),
-			$r->maketext('Email Address'),
-			$r->maketext('Section'),
-			$r->maketext('Recitation'),
-			$r->maketext('Comment')
-		])),
-		@entryLines,
-		CGI::end_table(),
-		CGI::end_div(),
-
-		CGI::p($r->maketext("Select sets below to assign them to the newly-created users.")),
-		CGI::scrolling_list({
-			name     => "assignSets",
-			values   => [ $db->listGlobalSets ],
-			size     => 10,
-			multiple => "1",
-			class    => 'form-select w-auto mb-2'
-		}),
-		CGI::p(
-			CGI::submit({ name => "addStudents", value => $r->maketext("Add Students"), class => 'btn btn-primary' }),
-		),
-		CGI::end_form(),
-
-	);
+	return;
 }
 
 1;
-
-__END__
-
-=head1 AUTHOR
-
-Written by Dennis Lambe Jr., malsyned (at) math.rochester.edu
-
-=cut
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm b/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm
index cd04a6afe7..22dd6a8986 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Instructor::Assigner;
-use base qw(WeBWorK::ContentGenerator::Instructor);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -22,188 +22,77 @@ WeBWorK::ContentGenerator::Instructor::Assigner - Assign homework sets to users.
 
 =cut
 
-use strict;
-use warnings;
-#use CGI qw(-nosticky );
-use WeBWorK::CGI;
-use WeBWorK::HTML::ScrollingRecordList qw/scrollingRecordList/;
+use WeBWorK::Utils::Instructor qw(assignSetsToUsers unassignSetsFromUsers);
 
-sub pre_header_initialize {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $db = $r->db;
-	my $authz = $r->authz;
-	my $ce = $r->ce;
-	my $user = $r->param('user');
+sub pre_header_initialize ($c) {
+	my $db    = $c->db;
+	my $authz = $c->authz;
+	my $ce    = $c->ce;
+	my $user  = $c->param('user');
 
-	# Permissions dealt with in the body
-	return "" unless $authz->hasPermissions($user, "access_instructor_tools");
-	return "" unless $authz->hasPermissions($user, "assign_problem_sets");
-
-	my @selected_users = $r->param("selected_users");
-	my @selected_sets = $r->param("selected_sets");
+	# Make sure these are defined for the template.
+	$c->stash->{users}      = [];
+	$c->stash->{globalSets} = [];
 
-	if (defined $r->param("assign") || defined $r->param("unassign")) {
-		if  (@selected_users && @selected_sets) {
-			my @results;  # This is not used?
-			if(defined $r->param("assign")) {
-				$self->assignSetsToUsers(\@selected_sets, \@selected_users);
-				$self->addgoodmessage($r->maketext('All assignments were made successfully.'));
+	# Permissions dealt with in the body
+	return '' unless $authz->hasPermissions($user, 'access_instructor_tools');
+	return '' unless $authz->hasPermissions($user, 'assign_problem_sets');
+
+	my @selected_users = $c->param('selected_users');
+	my @selected_sets  = $c->param('selected_sets');
+
+	if (defined $c->param('assign') || defined $c->param('unassign')) {
+		if (@selected_users && @selected_sets) {
+			my @results;    # This is not used?
+			if (defined $c->param('assign')) {
+				assignSetsToUsers($db, $ce, \@selected_sets, \@selected_users);
+				$c->addgoodmessage($c->maketext('All assignments were made successfully.'));
 			}
-			if (defined $r->param("unassign")) {
-				if(defined $r->param('unassignFromAllSafety') and $r->param('unassignFromAllSafety')==1) {
-					$self->unassignSetsFromUsers(\@selected_sets, \@selected_users) if(defined $r->param("unassign"));
-					$self->addgoodmessage($r->maketext('All unassignments were made successfully.'));
-				} else { # asked for unassign, but no safety radio toggle
-					$self->addbadmessage($r->maketext('Unassignments were not done.  You need to both click to "Allow unassign" and click on the Unassign button.'));
+			if (defined $c->param('unassign')) {
+				if (defined $c->param('unassignFromAllSafety') and $c->param('unassignFromAllSafety') == 1) {
+					unassignSetsFromUsers($db, \@selected_sets, \@selected_users) if (defined $c->param('unassign'));
+					$c->addgoodmessage($c->maketext('All unassignments were made successfully.'));
+				} else {    # asked for unassign, but no safety radio toggle
+					$c->addbadmessage($c->maketext(
+						'Unassignments were not done.  '
+							. 'You need to select "Allow unassign" and then click on the Unassign button.'
+					));
 				}
 			}
 
-			if (@results) { # Can't get here?
-				$self->addbadmessage(
-					"The following error(s) occured while assigning:".
-					CGI::ul(CGI::li(\@results))
+			if (@results) {    # Can't get here?
+				$c->addbadmessage(
+					$c->c('The following error(s) occured while assigning:',
+						$c->tag('ul', $c->c(map { $c->tag('li', $_) } @results)->join('')))->join('')
 				);
 			}
 		} else {
-			$self->addbadmessage("You must select one or more users below.")
+			$c->addbadmessage('You must select one or more users below.')
 				unless @selected_users;
-			$self->addbadmessage("You must select one or more sets below.")
+			$c->addbadmessage('You must select one or more sets below.')
 				unless @selected_sets;
 		}
 	}
-}
-
-sub body {
-	my ($self) = @_;
-	my $r      = $self->r;
-	my $db     = $r->db;
-	my $authz  = $r->authz;
-	my $ce     = $r->ce;
-
-	my $user = $r->param('user');
-
-	# Check permissions
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-		"You are not authorized to access the Instructor tools.")
-		unless $authz->hasPermissions($user, "access_instructor_tools");
-
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' }, "You are not authorized to assign homework sets.")
-		unless $authz->hasPermissions($user, "assign_problem_sets");
-
-	print CGI::p(
-		$r->maketext(
-			"Select one or more sets and one or more users below to assign/unassign each selected set to/from all selected users."
-		)
-	);
 
 	# Get all users except the set level proctors, and restrict to the sections or recitations that are allowed for the
 	# user if such restrictions are defined.
-	my @Users = $db->getUsersWhere({
-		user_id => { not_like => 'set_id:%' },
-		$ce->{viewable_sections}{$user} || $ce->{viewable_recitations}{$user}
-		? (
-			-or => [
-				$ce->{viewable_sections}{$user}    ? (section    => $ce->{viewable_sections}{$user})    : (),
-				$ce->{viewable_recitations}{$user} ? (recitation => $ce->{viewable_recitations}{$user}) : ()
-			]
-			)
-		: ()
-	});
-
-	my @GlobalSets   = $db->getGlobalSetsWhere();
-
-	print CGI::start_form({ method => 'post', action => $r->uri() });
-	print $self->hidden_authen_fields();
-
-	print CGI::div(
-		CGI::div(
-			{ class => 'row gx-3' },
-			CGI::div(
-				{ class => 'col-xl-5 col-md-6 mb-2' },
-				CGI::div(
-					{ class => 'fw-bold text-center' },
-					CGI::label({ for => 'selected_users' }, $r->maketext('Users'))
-				),
-				scrollingRecordList(
-					{
-						name            => 'selected_users',
-						id              => 'selected_users',
-						request         => $r,
-						default_sort    => 'lnfn',
-						default_format  => 'lnfn_uid',
-						default_filters => ['all'],
-						attrs           => {
-							size     => 20,
-							multiple => 1
-						}
-					},
-					@Users
-				)
-			),
-			CGI::div(
-				{ class => 'col-xl-5 col-md-6 mb-2' },
-				CGI::div(
-					{ class => 'fw-bold text-center' },
-					CGI::label({ for => 'selected_sets' }, $r->maketext('Sets'))
-				),
-				scrollingRecordList(
-					{
-						name            => 'selected_sets',
-						id              => 'selected_sets',
-						request         => $r,
-						default_sort    => 'set_id',
-						default_format  => 'set_id',
-						default_filters => ['all'],
-						attrs           => {
-							size     => 20,
-							multiple => 1,
-							dir      => 'ltr'
-						}
-					},
-					@GlobalSets
+	$c->stash->{users} = [
+		$db->getUsersWhere({
+			user_id => { not_like => 'set_id:%' },
+			$ce->{viewable_sections}{$user} || $ce->{viewable_recitations}{$user}
+			? (
+				-or => [
+					$ce->{viewable_sections}{$user}    ? (section    => $ce->{viewable_sections}{$user})    : (),
+					$ce->{viewable_recitations}{$user} ? (recitation => $ce->{viewable_recitations}{$user}) : ()
+				]
 				)
-			)
-		),
-		CGI::div(
-			CGI::submit({
-				name  => 'assign',
-				value => $r->maketext('Assign selected sets to selected users'),
-				class => 'btn btn-primary mb-2'
-			}),
-			CGI::div(
-				{ class => 'alert alert-danger p-1 mb-2' },
-				CGI::div({ class => 'mb-1' }, $r->maketext('Do not unassign students unless you know what you are doing.')),
-				CGI::div($r->maketext('There is NO undo for unassigning students.'))
-			),
-			CGI::div(
-				{ class => 'd-flex align-items-center' },
-				CGI::submit({
-					name  => "unassign",
-					value => $r->maketext("Unassign selected sets from selected users"),
-					class => 'btn btn-primary me-2'
-				}),
-				CGI::radio_group({
-					name            => "unassignFromAllSafety",
-					values          => [ 0, 1 ],
-					default         => 0,
-					labels          => { 0 => $r->maketext('Assignments only'), 1 => $r->maketext('Allow unassign') },
-					class           => 'form-check-input mx-1',
-					labelattributes => { class => 'form-check-label' },
-				})
-			),
-			CGI::div(
-				{ class => 'mt-2' },
-				"When you unassign a student's name, you destroy all of the data for that homework set for that "
-					. "student.  You will then need to reassign the set(s) to these students and they will receive new "
-					. "versions of the problems.  Make sure this is what you want to do before unassigning students."
-			)
-		)
-	);
+			: ()
+		})
+	];
 
-	print CGI::end_form();
+	$c->stash->{globalSets} = [ $db->getGlobalSetsWhere ];
 
-	return '';
+	return;
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm b/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm
deleted file mode 100644
index 55986455e5..0000000000
--- a/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm
+++ /dev/null
@@ -1,202 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::ContentGenerator::Instructor::CodeMirrorEditor;
-
-=head1 NAME
-
-WeBWorK::ContentGenerator::Instructor::CodeMirrorEditor is a module for
-displaying a CodeMirror editor on a page.  This is currently used by the
-AchievementEditor.pm and PGProblemEditor.pm modules.
-
-=cut
-
-use CGI;
-use WeBWorK::Utils qw(getAssetURL);
-
-use strict;
-use warnings;
-
-# Available CodeMirror themes
-use constant CODEMIRROR_THEMES => [
-	'3024-day',                '3024-night',         'abbott',        'abcdef',
-	'ambiance',                'ambiance-mobile',    'ayu-dark',      'ayu-mirage',
-	'base16-dark',             'base16-light',       'bespin',        'blackboard',
-	'cobalt',                  'colorforth',         'darcula',       'dracula',
-	'duotone-dark',            'duotone-light',      'eclipse',       'elegant',
-	'erlang-dark',             'gruvbox-dark',       'hopscotch',     'icecoder',
-	'idea',                    'isotope',            'juejin',        'lesser-dark',
-	'liquibyte',               'lucario',            'material',      'material-darker',
-	'material-ocean',          'material-palenight', 'mbo',           'mdn-like',
-	'midnight',                'monokai',            'moxer',         'neat',
-	'neo',                     'night',              'nord',          'oceanic-next',
-	'panda-syntax',            'paraiso-dark',       'paraiso-light', 'pastel-on-dark',
-	'railscasts',              'rubyblue',           'seti',          'shadowfox',
-	'solarized',               'ssms',               'the-matrix',    'tomorrow-night-bright',
-	'tomorrow-night-eighties', 'ttcn',               'twilight',      'vibrant-ink',
-	'xq-dark',                 'xq-light',           'yeti',          'yonce',
-	'zenburn'
-];
-
-# Available CodeMirror keymaps
-use constant CODEMIRROR_KEYMAPS => [ 'emacs', 'sublime', 'vim' ];
-
-# Javascript for addons used by the PG editor (relative to the node_modules/codemirror/addon directory).
-use constant CODEMIRROR_ADDONS_CSS => [ 'dialog/dialog.css', 'search/matchesonscrollbar.css' ];
-
-# Javascript for addons used by the PG editor (relative to the node_modules/codemirror/addon directory).
-use constant CODEMIRROR_ADDONS_JS => [
-	'dialog/dialog.js',            'search/search.js',
-	'search/searchcursor.js',      'search/matchesonscrollbar.js',
-	'search/match-highlighter.js', 'search/match-highlighter.js',
-	'scroll/annotatescrollbar.js', 'edit/matchbrackets.js'
-];
-
-sub output_codemirror_html {
-	my ($r, $name, $contents) = @_;
-	my $ce = $r->ce;
-
-	if ($ce->{options}{PGCodeMirror}) {
-		# Output the textarea that will be used by CodeMirror.
-		print CGI::div(
-			{ class => 'mb-2' },
-			CGI::textarea({
-				id       => $name,
-				name     => $name,
-				default  => $contents,
-				class    => 'codeMirrorEditor',
-				override => 1,
-			}),
-		);
-
-		# Construct the labels and values for the theme menu.
-		my ($themeLabels, $themeValues) = ({ default => 'default' }, ['default']);
-		for (@{ CODEMIRROR_THEMES() }) {
-			my $value = getAssetURL($ce, "node_modules/codemirror/theme/$_.css");
-			push @$themeValues, $value;
-			$themeLabels->{$value} = $_;
-		}
-
-		# Construct the labels and values for the keymap menu.
-		my ($keymapLabels, $keymapValues) = ({ default => 'default' }, ['default']);
-		for (@{ CODEMIRROR_KEYMAPS() }) {
-			my $value = getAssetURL($ce, "node_modules/codemirror/keymap/$_.js");
-			push @$keymapValues, $value;
-			$keymapLabels->{$value} = $_;
-		}
-
-		# Output the html elements for setting the CodeMirror options.
-		print CGI::div(
-			{ class => 'row align-items-center' },
-			CGI::div(
-				{ class => 'col-sm-auto mb-2' },
-				CGI::div(
-					{ class => 'row align-items-center' },
-					CGI::label(
-						{ for => 'selectTheme', class => 'col-form-label col-auto' },
-						$r->maketext('Theme:')
-					),
-					CGI::div(
-						{ class => 'col-auto' },
-						CGI::popup_menu({
-							name    => 'selectTheme',
-							id      => 'selectTheme',
-							values  => $themeValues,
-							labels  => $themeLabels,
-							default => 'default',
-							class   => 'form-select form-select-sm d-inline w-auto'
-						})
-					)
-				)
-			),
-			CGI::div(
-				{ class => 'col-sm-auto mb-2' },
-				CGI::div(
-					{ class => 'row align-items-center' },
-					CGI::label(
-						{ for => 'selectKeymap', class => 'col-form-label col-auto' },
-						$r->maketext('Key Map:')
-					),
-					CGI::div(
-						{ class => 'col-auto' },
-						CGI::popup_menu({
-							name    => 'selectKeymap',
-							id      => 'selectKeymap',
-							values  => $keymapValues,
-							labels  => $keymapLabels,
-							default => 'default',
-							class   => 'form-select form-select-sm d-inline w-auto'
-						})
-					)
-				)
-			),
-			CGI::div(
-				{ class => 'col-sm-auto mb-2' },
-				CGI::div(
-					{ class => 'form-check mb-0' },
-					CGI::input({
-						type  => 'checkbox',
-						id    => 'enableSpell',
-						class => 'form-check-input'
-					}),
-					CGI::label(
-						{ for => 'enableSpell', class => 'form-check-label' },
-						$r->maketext('Enable Spell Checking')
-					)
-				)
-			),
-			CGI::div(
-				{ class => 'col-sm-auto mb-2' },
-				CGI::div(
-					{ class => 'form-check mb-0' },
-					CGI::input({
-						type  => 'checkbox',
-						id    => 'forceRTL',
-						class => 'form-check-input'
-					}),
-					CGI::label(
-						{ for => 'forceRTL', class => 'form-check-label' },
-						'Force editor to RTL' # FIXME should have $r->maketext()
-					)
-				)
-			)
-		);
-	}
-}
-
-sub output_codemirror_static_files {
-	my $ce = shift;
-
-	if ($ce->{options}{PGCodeMirror}) {
-		print CGI::Link(
-			{ href => getAssetURL($ce, 'node_modules/codemirror/lib/codemirror.css'), rel => 'stylesheet' });
-
-		for my $addon (@{ CODEMIRROR_ADDONS_CSS() }) {
-			print CGI::Link({ href => getAssetURL($ce, "node_modules/codemirror/addon/$addon"), rel => 'stylesheet' });
-		}
-		print CGI::Link({ href => getAssetURL($ce, 'js/apps/PGCodeMirror/pgeditor.css'), rel => 'stylesheet' });
-
-		print CGI::script({ src => getAssetURL($ce, 'node_modules/codemirror/lib/codemirror.js'), defer => undef }, '');
-
-		for my $addon (@{ CODEMIRROR_ADDONS_JS() }) {
-			print CGI::script({ src => getAssetURL($ce, "node_modules/codemirror/addon/$addon"), defer => undef }, '');
-		}
-
-		print CGI::script({ src => getAssetURL($ce, 'js/apps/PGCodeMirror/PG.js'),       defer => undef }, '');
-		print CGI::script({ src => getAssetURL($ce, 'js/apps/PGCodeMirror/pgeditor.js'), defer => undef }, '');
-	}
-}
-
-1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/Config.pm b/lib/WeBWorK/ContentGenerator/Instructor/Config.pm
index 4eb06de1e0..8d2d69afba 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/Config.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/Config.pm
@@ -13,462 +13,8 @@
 # Artistic License for more details.
 ################################################################################
 
-# TODO
-#  convert more html to CGI:: calls
-#  put some formatting in css and in ur.css
-#  add type to deal with boxes around problem text
-#  maybe add a type to deal with files like ur.css and templates (where
-#    a copy of the old file gets created for the course and then the
-#    user can modify it).
-
-# The main package starts lower down.  First we define different
-# types of config objects.
-
-# Each config object might want to override the methods display_value,
-# entry_widget, and save_string
-
-########################### config object defaults
-package configobject;
-
-use strict;
-use warnings;
-
-use URI::Escape;
-
-sub new {
-	my $class = shift;
-	my $self = shift;
-	$self->{Module} = shift;
-	bless $self, $class;
-	return $self;
-}
-
-# Only input is a value to display, and should produce an html string
-sub display_value {
-	my ($self, $val) = @_;
-	return $val;
-}
-
-# This should return the value to compare to the new value.  This is *not* what is displayed.
-sub comparison_value {
-	my ($self, $val) = @_;
-	return $val;
-}
-
-sub convert_newval_source {
-	my ($self, $newvalsource) = @_;
-    my $inlinevarname = WeBWorK::ContentGenerator::Instructor::Config::inline_var($self->{var});
-    my $newval;
-    if($newvalsource =~ /widget/) {
-        $newval = $self->{Module}->{r}->param($newvalsource);
-    } else {
-        $newval = $self->comparison_value(eval('$self->{Module}->{r}->ce->'.
-			$inlinevarname));
-    }
-	return($newval);
-}
-
-# Bit of text to put in the configuration file.  The result should
-# be an assignment which is executable by perl.  oldval will be the
-# value of the perl variable, and newval will be whatever an entry
-# widget produces
-sub save_string {
-	my ($self, $oldval, $newvalsource) = @_;
-	my $varname = $self->{var};
-	my $newval = $self->convert_newval_source($newvalsource);
-	my $cmpoldval = $self->comparison_value($oldval);
-	return '' if($cmpoldval eq $newval);
-	return('$'. $varname . " = '$newval';\n");
-}
-
-# A widget to interact with the user
-sub entry_widget {
-	my ($self, $name, $default) = @_;
-	my $width = $self->{width} || 15;
-	return CGI::textfield({
-		name  => $name,
-		id    => $name,
-		value => $default,
-		size  => $width,
-		class => 'form-control form-control-sm'
-	});
-}
-
-# This produces the documentation string and image link to more
-# documentation.  It is the same for all config types.
-sub what_string {
-	my ($self, $id) = @_;
-	my $r = $self->{Module}->r;
-
-	return (CGI::td(CGI::div(
-		{ class => 'd-flex justify-content-between align-items-center' },
-		CGI::div(
-			ref $self eq 'configcheckboxlist'
-			? $r->maketext($self->{doc})
-			: CGI::label({ for => $id }, $r->maketext($self->{doc}))
-		),
-		CGI::a(
-			{
-				href => $self->{Module}->systemLink(
-					$r->urlpath->new(
-						type => 'instructor_config',
-						args => { courseID => $r->urlpath->arg("courseID") }
-					),
-					params => { show_long_doc => 1, var_name => uri_escape($self->{var}) }
-				),
-				target => "_blank"
-			},
-			CGI::i({ class => "icon fas fa-question-circle", aria_hidden => "true", data_alt => "help" }, '')
-		)
-	)));
-}
-
-########################### configtext
-package configtext;
-@configtext::ISA = qw(configobject);
-
-sub save_string {
-	my ($self, $oldval, $newvalsource) = @_;
-	my $varname = $self->{var};
-	my $newval = $self->convert_newval_source($newvalsource);
-	my $cmpoldval = $self->comparison_value($oldval);
-	return '' if($cmpoldval eq $newval);
-	# Remove quotes from the string, we will have a new type for text with quotes
-	$newval =~ s/['"`]//g;
-	return('$'. $varname . " = '$newval';\n");
-}
-
-########################### configtimezone
-########################### just like text, but it validates the timezone before saving
-package configtimezone;
-@configtimezone::ISA = qw(configobject);
-
-#use DateTime;
-use DateTime::TimeZone;
-
-sub save_string {
-	my ($self, $oldval, $newvalsource) = @_;
-	my $varname = $self->{var};
-	my $newval = $self->convert_newval_source($newvalsource);
-	my $cmpoldval = $self->comparison_value($oldval);
-	return '' if($cmpoldval eq $newval);
-	if(not DateTime::TimeZone->is_valid_name($newval)) {
-		$self->{Module}->addbadmessage("String '$newval' is not a valid time zone.  Reverting to the system default value.");
-		return '';
-	}
-	# Remove quotes from the string, we will have a new type for text with quotes
-	$newval =~ s/['"`]//g; #`"'geditsucks
-	return('$'. $varname . " = '$newval';\n");
-}
-
-########################### configtime
-########################### just like text, but it validates the time before saving
-package configtime;
-@configtime::ISA = qw(configobject);
-
-sub save_string {
-	my ($self, $oldval, $newvalsource) = @_;
-	my $varname = $self->{var};
-	my $newval = $self->convert_newval_source($newvalsource);
-	my $cmpoldval = $self->comparison_value($oldval);
-	return '' if($cmpoldval eq $newval);
-
-	if($newval !~ /^(01|1|02|2|03|3|04|4|05|5|06|6|07|7|08|8|09|9|10|11|12):[0-5]\d(am|pm|AM|PM)$/) {
-		$self->{Module}->addbadmessage("String '$newval' is not a valid time.  Reverting to the system default value.");
-		return '';
-	}
-
-	return('$'. $varname . " = '$newval';\n");
-}
-
-########################### confignumber
-package confignumber;
-@confignumber::ISA = qw(configobject);
-
-sub save_string {
-	my ($self, $oldval, $newvalsource) = @_;
-	my $varname = $self->{var};
-	my $newval = $self->convert_newval_source($newvalsource);
-	my $cmpoldval = $self->comparison_value($oldval);
-	# Remove quotes from the string, we will have a new type for text with quotes
-	$newval =~ s/['"`]//g; #`"'geditsucks
-	my $newval2 = eval($newval);
-	if($@) {
-		$self->{Module}->addbadmessage("Syntax error in numeric value '$newval' for variable \$$self->{var}.  Reverting to the system default value.");
-		return '';
-	}
-	return '' if($cmpoldval == $newval2);
-	return('$'. $varname . " = $newval;\n");
-}
-
-########################### configboolean
-package configboolean;
-@configboolean::ISA = qw(configobject);
-
-sub comparison_value { return $_[1] ? 1 : 0; }
-
-sub display_value {
-  my ($self, $val) = @_;
-  my $r = $self->{Module}->r;
-  return $r->maketext('True') if $val;
-  return $r->maketext('False');
-}
-
-sub save_string {
-	my ($self, $oldval, $newvalsource) = @_;
-	my $r = $self->{Module}->r;
-	my $newval = $self->convert_newval_source($newvalsource);
-	my $cmpoldval = $self->comparison_value($oldval);
-	return '' if $cmpoldval eq $newval;
-	return "\$$self->{var} = $newval;\n";
-}
-
-sub entry_widget {
-	my ($self, $name, $default) = @_;
-	my $r = $self->{Module}->r;
-	return CGI::popup_menu({
-		name    => $name,
-		id      => $name,
-		default => $default,
-		values  => [ 1, 0 ],
-		labels  => { 1 => $r->maketext('True'), 0 => $r->maketext('False') },
-		class   => 'form-select form-select-sm'
-	});
-}
-
-
-########################### configpermission
-package configpermission;
-@configpermission::ISA = qw(configobject);
-
-sub comparison_value {
-	my ($self, $val) = @_;
-	return $val // "nobody";
-}
-
-# This tries to produce a string from a permission number.  If you feed it
-# a string, that's what you get back.
-sub display_value {
-  my ($self, $val) = @_;
-  my $r = $self->{Module}->r;
-  return $r->maketext('nobody') if not defined($val);
-  my %userRoles = %{$self->{Module}->{r}->{ce}->{userRoles}};
-  my %reverseUserRoles = reverse %userRoles;
-  return $r->maketext($reverseUserRoles{$val}) if defined($reverseUserRoles{$val});
-  return $r->maketext($val);
-}
-
-sub save_string {
-	my ($self, $oldval, $newvalsource) = @_;
-	my $newval = $self->convert_newval_source($newvalsource);
-	my $cmpoldval = $self->comparison_value($oldval);
-	my $r = $self->{Module}->r;
-	return '' if($cmpoldval eq $newval);
-	return "\$$self->{var} = $newval;\n";
-}
-
-sub entry_widget {
-	my ($self, $name, $default) = @_;
-	my $ce = $self->{Module}->{r}->{ce};
-	my $r = $self->{Module}->r;
-	my $permHash = {};
-	my %userRoles = %{$ce->{userRoles}};
-	my %reverseUserRoles = reverse %userRoles;
-
-	# the value of a permission can be undefined (for nobody),
-	# a standard permission number, or some other number
-	$default = 'nobody' unless defined($default);
-
-	my @values = sort { $userRoles{$a} <=> $userRoles{$b} } keys %userRoles;
-
-	my %labels = map {$_ => $r->maketext($_)} @values;
-	return CGI::popup_menu({
-		name    => $name,
-		id      => $name,
-		values  => \@values,
-		default => $default,
-		labels  => \%labels,
-		class   => 'form-select form-select-sm'
-	});
-}
-
-########################### configlist
-package configlist;
-@configlist::ISA = qw(configobject);
-
-sub display_value {
-	my ($self, $val) = @_;
-	return '&nbsp;' if not defined($val);
-	my $str = join(','.CGI::br(), @{$val});
-	$str = '&nbsp;' if $str !~  /\S/;
-	return $str;
-}
-
-sub comparison_value {
-	my ($self, $val) = @_;
-	$val = [] if not defined($val);
-	my $str = join(',', @{$val});
-	return($str);
-}
-
-sub save_string {
-	my ($self, $oldval, $newvalsource) = @_;
-	my $newval = $self->convert_newval_source($newvalsource);
-	my $varname = $self->{var};
-	$oldval = $self->comparison_value($oldval);
-	return '' if($oldval eq $newval);
-	my $str = '';
-
-	$oldval =~ s/^\s*(.*)\s*$/$1/;
-	$newval =~ s/^\s*(.*)\s*$/$1/;
-	$oldval =~ s/[\s,]+/,/sg;
-	$newval =~ s/[\s,]+/,/sg;
-	return '' if($newval eq $oldval);
-	# ok we really have a new value, now turn it back into a string
-	my @parts = split ',', $newval;
-	map { $_ =~ s/['"`]//g } @parts; #`"'geditsucks
-	@parts = map { "'". $_ ."'" } @parts;
-	$str = join(',', @parts);
-	$str = '$'. $varname . " = [$str];\n";
-	return($str);
-}
-
-sub entry_widget {
-	my ($self, $name, $default) = @_;
-
-	$default = [] if not defined($default);
-	my $str = join(', ', @{$default});
-	$str = '' if $str !~ /\S/;
-	return CGI::textarea({
-		name    => $name,
-		id      => $name,
-		rows    => 4,
-		value   => $str,
-		class   => 'form-control form-control-sm'
-	});
-}
-
-########################### configcheckboxlist
-package configcheckboxlist;
-@configcheckboxlist::ISA = qw(configobject);
-
-sub display_value {
-	my ($self, $val) = @_;
-	$val = [] if not defined($val);
-	my @vals = @$val;
-	return join(CGI::br(), @vals);
-}
-
-# here r->param() returns an array, so we need a custom
-# version of convert_newval_source
-
-sub convert_newval_source {
-	my ($self, $newvalsource) = @_;
-    my $inlinevarname = WeBWorK::ContentGenerator::Instructor::Config::inline_var($self->{var});
-    my @newvals;
-    if($newvalsource =~ /widget/) {
-        @newvals = $self->{Module}->{r}->param($newvalsource);
-    } else {
-        my $newval = eval('$self->{Module}->{r}->{ce}->'. $inlinevarname);
-		@newvals = @$newval;
-    }
-	return(@newvals);
-}
-
-# Bit of text to put in the configuration file.  The result should
-sub save_string {
-	my ($self, $oldval, $newvalsource) = @_;
-	my $varname = $self->{var};
-	my @newvals = $self->convert_newval_source($newvalsource);
-	if($self->{min} and (scalar(@newvals) < $self->{min})) {
-		$self->{Module}->addbadmessage("You need to select at least $self->{min} display mode.");
-		if($newvalsource =~ /widget/) {
-			return $self->save_string($oldval, 'current'); # try to return the old saved value
-		} else {
-			return '' ; # the previous saved value was empty, reset to system default
-		}
-	}
-	$oldval = $self->comparison_value($oldval);
-	my $newval =  $self->comparison_value(\@newvals);
-	return '' if($oldval eq $newval);
-	@newvals = map { "'".$_."'" } @newvals;
-	my $str = join(',', @newvals);
-	$str = '$'. $varname . " = [$str];\n";
-	return($str);
-}
-
-sub comparison_value {
-	my ($self, $val) = @_;
-	$val = [] if not defined($val);
-	my $str = join(',', @{$val});
-	return($str);
-}
-
-sub entry_widget {
-	my ($self, $name, $default) = @_;
-	my %checked = map { $_ => 1 } @$default;
-	return join(
-		"",
-		map {
-			CGI::div(
-				{ class => 'form-check' },
-				CGI::checkbox({
-					name            => $name,
-					value           => $_,
-					label           => $_,
-					checked         => $checked{$_},
-					class           => 'form-check-input',
-					labelattributes => { class => 'form-check-label' }
-				})
-			)
-		} @{ $self->{values} }
-	);
-}
-
-########################### configpopuplist
-package configpopuplist;
-@configpopuplist::ISA = qw(configobject);
-
-sub display_value {
-	my ($self, $val) = @_;
-  	my $r = $self->{Module}->r;
-	$val = 'ur' if not defined($val);
-
-	if ($self->{labels}->{$val}) {
-	    return join(CGI::br(), $r->maketext($self->{labels}->{$val}));
-	}
-
-	return join(CGI::br(), $val);
-}
-
-sub save_string {
-	my ($self, $oldval, $newvalsource) = @_;
-	my $varname = $self->{var};
-	my $newval = $self->convert_newval_source($newvalsource);
-	my $cmpoldval = $self->comparison_value($oldval);
-	return '' if $cmpoldval eq $newval;
-	return('$'. $varname . " = " . "'$newval';\n");
-}
-
-sub entry_widget {
-	my ($self, $name, $default) = @_;
-	my $r = $self->{Module}->r;
-	my %labels = map {$_ => $r->maketext($self->{labels}->{$_} // $_)} @{$self->{values}};
-
-	return CGI::popup_menu({
-		name    => $name,
-		id      => $name,
-		values  => $self->{values},
-		default => $default,
-		labels  => \%labels,
-		class   => 'form-select form-select-sm'
-	});
-}
-
-########### Main Config Package starts here
-
 package WeBWorK::ContentGenerator::Instructor::Config;
-use base qw(WeBWorK::ContentGenerator::Instructor);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -476,144 +22,174 @@ WeBWorK::ContentGenerator::Instructor::Config - Config
 
 =cut
 
-use strict;
-use warnings;
-
-use CGI qw(-nosticky );
 use WeBWorK::CourseEnvironment;
-
-# Load the configuration parts defined in Constants.pm
-
-#our $ConfigValues = [] unless defined $ConfigValues;
+use WeBWorK::ConfigObject::text;
+use WeBWorK::ConfigObject::timezone;
+use WeBWorK::ConfigObject::time;
+use WeBWorK::ConfigObject::number;
+use WeBWorK::ConfigObject::boolean;
+use WeBWorK::ConfigObject::permission;
+use WeBWorK::ConfigObject::permission_checkboxlist;
+use WeBWorK::ConfigObject::list;
+use WeBWorK::ConfigObject::checkboxlist;
+use WeBWorK::ConfigObject::popuplist;
 
 # Configuation data
 # It is organized by section.  The allowable types are
-#  'text' for a text string,
-#  'list' for a list of text strings,
-#  'permission' for a permission value,
-#  'boolean' for variables which really hold 0/1 values as flags.
-
-# write contents to outputFilePath and return error messages if any
-sub writeFile {
-	my $outputFilePath = shift;
-	my $contents = shift;
-	my $writeFileErrors;
-	eval {
-		local *OUTPUTFILE;
-		if( open OUTPUTFILE, ">utf8:", $outputFilePath) {
-			print OUTPUTFILE $contents;
-			close OUTPUTFILE;
-		} else {
-			$writeFileErrors = "I could not open $outputFilePath".
-				CGI::br() . CGI::br().
-				"We will not be able to make configuration changes unless the permissions are set so that the web server can write to this file.";
-		}
-	};  # any errors are caught in the next block
+#  'Text' for a text string,
+#  'Number' for a number,
+#  'List' for a list of text strings,
+#  'Permission' for a permission value,
+#  'Boolean' for variables which really hold 0/1 values as flags,
+#  'TimeZone' for a time zone,
+#  'Time' for a time,
+#  'CheckboxList' for variables that hold a list of values which can be independently picked yes/no as checkboxes,
+#  'PopupList' for variables that hold a list of values to be selected from.
+
+# Write contents to outputFilePath and return error messages if any.
+sub writeFile ($outputFilePath, $contents) {
+	if (open my $OUTPUTFILE, '>:encoding(UTF-8)', $outputFilePath) {
+		print $OUTPUTFILE $contents;
+		close $OUTPUTFILE;
+	} else {
+		return (
+			"I could not open $outputFilePath",
+			'We will not be able to make configuration changes unless the permissions '
+				. 'are set so that the web server can write to this file.'
+		);
+	}
 
-	$writeFileErrors = $@ if $@;
-	return($writeFileErrors);
+	return;
 }
 
 # Make a new config object from data
-
-sub objectify {
-	my ($self, $data) = @_;
-	return "config$data->{type}"->new($data,$self);
+sub objectify ($c, $data) {
+	return "WeBWorK::ConfigObject::$data->{type}"->new($data, $c);
 }
 
-
-# Take var string from ConfigValues and prepare it for $ce->...
-sub inline_var {
-	my $varstring = shift;
-	return '{'.$varstring.'}' if $varstring =~ /^\w+$/;
-	$varstring =~ s/^(\w+)/{$1}->/;
-	return($varstring);
-}
-
-sub print_navigation_tabs {
-	my ($self, $current_tab, @tab_names) = @_;
-	my $r   = $self->r;
-	my $str = '';
+sub generate_navigation_tabs ($c, $current_tab, @tab_names) {
+	my $tabs = $c->c;
 	for my $tab (0 .. (scalar(@tab_names) - 1)) {
 		if ($current_tab eq "tab$tab") {
-			$tab_names[$tab] = CGI::span({ class => 'nav-link active' }, $r->maketext($tab_names[$tab]));
+			push(@$tabs, $c->tag('span', class => 'nav-link active', $c->maketext($tab_names[$tab])));
 		} else {
-			$tab_names[$tab] = CGI::a(
-				{
-					href  => $self->systemLink($r->urlpath, params => { section_tab => "tab$tab" }),
+			push(
+				@$tabs,
+				$c->link_to(
+					$c->maketext($tab_names[$tab]) =>
+						$c->systemLink($c->url_for, params => { section_tab => "tab$tab" }),
 					class => 'nav-link'
-				},
-				$r->maketext($tab_names[$tab])
+				)
 			);
 		}
 	}
-	print qq{<nav class="config-tabs nav nav-pills justify-content-center my-4">@{[join('', @tab_names)]}</nav>};
+	return $c->tag('nav', class => 'config-tabs nav nav-pills justify-content-center my-4', $tabs->join(''));
 }
 
-sub getConfigValues {
-	my $ce = shift;
-	my $ConfigValues = $ce->{ConfigValues};
+sub getConfigValues ($c, $ce) {
+	my $configValues = $ce->{ConfigValues};
 
-	# get the list of theme folders in the theme directory and remove . and ..
+	# Get the list of theme folders in the theme directory and remove . and .. and 'layouts'.
 	my $themeDir = $ce->{webworkDirs}{themes};
 	opendir(my $dh, $themeDir) || die "can't opendir $themeDir: $!";
-	my $themes =[grep {!/^\.{1,2}$/} sort readdir($dh)];
+	my $themes = [ grep { !/^\.{1,2}$/ && $_ ne 'layouts' } sort readdir($dh) ];
+
+	# Get the list of all site hardcopy theme files
+	opendir(my $dhS, $ce->{webworkDirs}{hardcopyThemes}) || die "can't opendir $ce->{webworkDirs}{hardcopyThemes}: $!";
+	my $hardcopyThemesSite = [ grep {/\.xml$/} (sort readdir($dhS)) ];
+	my @hardcopyThemesCourse;
+	if (opendir(my $dhC, $ce->{courseDirs}{hardcopyThemes})) {
+		@hardcopyThemesCourse = grep {/\.xml$/} sort readdir($dhC);
+	}
+	# get unique file names, merging lists from site and course folders
+	my $hardcopyThemes = [
+		sort(do {
+			my %seen;
+			grep { !$seen{$_}++ } (@$hardcopyThemesSite, @hardcopyThemesCourse);
+		})
+	];
+	# get enabled site themes plus all course themes
+	my $hardcopyThemesAvailable = [
+		sort(do {
+			my %seen;
+			grep { !$seen{$_}++ } (@{ $ce->{hardcopyThemes} }, @hardcopyThemesCourse);
+		})
+	];
 
 	# get list of localization dictionaries
 	my $localizeDir = $ce->{webworkDirs}{localize};
 	opendir(my $dh2, $localizeDir) || die "can't opendir $localizeDir: $!";
-	my %seen=();  # find the languages in the localize direction
-	my $languages =[ grep {!$seen{$_} ++}        # remove duplicate items
-			     map {$_=~s/\...$//; $_}        # get rid of suffix
-                 grep {/\.mo$|\.po$/; } sort readdir($dh2) #look at only .mo and .po files
+	my %seen      = ();    # find the languages in the localize direction
+	my $languages = [
+		grep     { !$seen{$_}++ }                      # remove duplicate items
+			map  { $_ =~ s/\.[pm]o$//r }               # get rid of suffix
+			grep {/\.mo$|\.po$/} sort readdir($dh2)    #look at only .mo and .po files
 
-                ];
+	];
 
-	# insert the anonymous array of theme folder names into ConfigValues
+	# insert the anonymous array of theme names into configValues
 	# FIXME?  Is there a reason this is an array? Couldn't we replace this
 	# with a hash and conceptually simplify this routine? MEG
-	my $modifyThemes = sub { my $item=shift;
-	                         if (ref($item)=~/HASH/ and $item->{var} eq 'defaultTheme' ) {
-	                            $item->{values} =$themes
-	                         }
-	                        };
-    my $modifyLanguages = sub { my $item=shift;
-	                         if (ref($item)=~/HASH/ and $item->{var} eq 'language' ) {
-	                            $item->{values} =$languages
-	                         }
-	                        };
-	foreach my $oneConfig (@$ConfigValues) {
+	my $modifyThemes = sub {
+		my $item = shift;
+		if (
+			ref($item) =~ /HASH/
+			&& ($item->{var} =~
+				/^(defaultTheme|hardcopyThemesSite|hardcopyThemes|hardcopyTheme|hardcopyThemePGEditor)$/)
+			)
+		{
+			$item->{values} = $themes if ($item->{var} eq 'defaultTheme');
+			$item->{values} = $hardcopyThemesAvailable
+				if ($item->{var} eq 'hardcopyTheme' || $item->{var} eq 'hardcopyThemePGEditor');
+			$item->{values} = $hardcopyThemesSite if ($item->{var} eq 'hardcopyThemes');
+		}
+	};
+	my $modifyLanguages = sub {
+		my $item = shift;
+		if (ref($item) =~ /HASH/ and $item->{var} eq 'language') {
+			$item->{values} = $languages;
+		}
+	};
+	foreach my $oneConfig (@$configValues) {
 		foreach my $hash (@$oneConfig) {
 			&$modifyThemes($hash);
 			&$modifyLanguages($hash);
 		}
 	}
 
-	$ConfigValues;
+	if (!$ce->{LTIVersion}) {
+		# If LTI authentication is not enabled for this course, then remove the LTI tab.
+		$configValues = [ grep { $_->[0] ne 'LTI' } @$configValues ];
+	} else {
+		# Remove the LTI settings for the LTI version that is not enabled for this course.
+		for my $oneConfig (@$configValues) {
+			next unless $oneConfig->[0] eq 'LTI';
+			$oneConfig = [
+				grep {
+					ref($_) ne 'HASH' || $_->{var} !~ /^LTI\{v1p[13]\}/ || $_->{var} =~ /^LTI\{$ce->{LTIVersion}\}/
+				} @$oneConfig
+			];
+			last;
+		}
+	}
+
+	return $configValues;
 }
 
-sub pre_header_initialize {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $ConfigValues = getConfigValues($ce);
+sub pre_header_initialize ($c) {
+	my $ce           = $c->ce;
+	my $configValues = $c->getConfigValues($ce);
 	# Get a course environment without course.conf
-	$self->{default_ce} = WeBWorK::CourseEnvironment->new({
-		%WeBWorK::SeedCE,
-	});
+	$c->{default_ce} = WeBWorK::CourseEnvironment->new;
 
-	$self->{ce_file_dir} = $ce->{courseDirs}->{root};
+	$c->{ce_file_dir} = $ce->{courseDirs}{root};
 
 	# Get a copy of the course environment which does not have simple.conf loaded
-	my $ce3 = eval {
-		new WeBWorK::CourseEnvironment({
-			%WeBWorK::SeedCE,
-			courseName => $ce->{courseName},
-			web_config_filename => 'noSuchFilePlease',
-		})
-	};
-	if($r->param("make_changes")) {
-		my $widget_count = 0;
+	my $ce3 = WeBWorK::CourseEnvironment->new({
+		courseName          => $ce->{courseName},
+		web_config_filename => 'noSuchFilePlease'
+	});
+	if ($c->param('make_changes')) {
 		my $fileoutput = "#!perl
 # This file is automatically generated by WeBWorK's web-based
 # configuration module.  Do not make changes directly to this
@@ -621,142 +197,33 @@ sub pre_header_initialize {
 # changes are saved.\n\n";
 
 		# Get the number of the current tab
-		my $tab = $r->param('section_tab') || 'tab0';
+		my $tab = $c->param('section_tab') || 'tab0';
 		$tab =~ s/tab//;
-		# We completely rewrite the simple configuration file
-		# so we need to go through all sections
-		for my $configSection (@{$ConfigValues}) {
+		# We completely rewrite the simple configuration file, so we need to go through all sections.
+		for my $configSection (@{$configValues}) {
 			my @configSectionArray = @{$configSection};
 			shift @configSectionArray;
 			for my $con (@configSectionArray) {
-				my $conobject = $self->objectify($con);
-				if($tab) { # This tab is not being shown
-					my $oldval = eval('$ce3->'.inline_var($con->{var}));
-					$fileoutput .= $conobject->save_string($oldval, 'current');
-				} else { # We reached the tab with entry objects
-					$fileoutput .= $conobject->save_string(eval('$ce3->'.inline_var($con->{var})), "widget$widget_count");
-					$widget_count++;
+				my $conobject = $c->objectify($con);
+				if ($tab) {
+					# This tab is hidden so use the current course environment value.
+					$fileoutput .= $conobject->save_string($con->get_value($ce3), 1);
+				} else {
+					# We reached the tab with entry objects
+					$fileoutput .= $conobject->save_string($con->get_value($ce3));
 				}
 			}
 			$tab--;
 		}
-		my $write_result = writeFile($self->{ce_file_dir}."/simple.conf", $fileoutput);
-		if ($write_result) {
-			$self->addbadmessage($write_result);
+		my @write_result = writeFile("$c->{ce_file_dir}/simple.conf", $fileoutput);
+		if (@write_result) {
+			$c->addbadmessage($c->c(@write_result)->join($c->tag('br')));
 		} else {
-			$self->addgoodmessage($r->maketext("Changes saved"));
-		}
-	}
-}
-
-sub body {
-	my ($self) = @_;
-
-	my $r = $self->r;
-	my $ce = $r->ce;		# course environment
-	my $db = $r->db;		# database
-	my $ConfigValues = getConfigValues($ce);
-	my $userName = $r->param('user');
-
-	my $user = $db->getUser($userName); # checked
-	die "record for user $userName (real user) does not exist."
-		unless defined $user;
-
-	### Check that this is a professor
-	my $authz = $r->authz;
-	unless ($authz->hasPermissions($userName, "modify_problem_sets")) {
-		print "User $userName returned " .
-			$authz->hasPermissions($user, "modify_problem_sets") .
-			" for permission";
-		return (CGI::div(
-			{ class => 'alert alert-danger p-1 mb-0' },
-			CGI::em($r->maketext("You are not authorized to access the Instructor tools."))
-		));
-	}
-
-	if ($r->param('show_long_doc')) {
-		my $docstring;
-		for my $consec (@$ConfigValues) {
-			my @configSectionArray = @$consec;
-			shift @configSectionArray;
-			for my $con (@configSectionArray) {
-				$docstring = $con->{doc2} || $con->{doc}
-					if($con->{var} eq $r->param('var_name'));
-			}
+			$c->addgoodmessage($c->maketext('Changes saved'));
 		}
-		print CGI::h2($r->maketext("Variable Documentation:").' '. CGI::code('$'.$r->param('var_name'))),
-			CGI::p(),
-			CGI::blockquote( $r->maketext($docstring) );
-		return "";
-	}
-
-	my $default_ce = $self->{default_ce};
-	# Get the current course environment again in case we just saved changes
-	my $ce4 = eval {
-		new WeBWorK::CourseEnvironment({
-			%WeBWorK::SeedCE,
-			courseName => $ce->{courseName},
-		})
-	};
-
-	my $widget_count = 0;
-	if(scalar(@$ConfigValues) == 0) {
-		print CGI::p($r->maketext("The configuration module did not find the data it needs to function.  Have your site administrator check that Constants.pm is up to date."));
-		return "";
-	}
-
-	# Start tabs at the top
-	my $current_tab = $r->param('section_tab') || 'tab0';
-	my @tab_names = map { $_->[0] } @{$ConfigValues};
-	$self->print_navigation_tabs($current_tab, @tab_names);
-
-	print CGI::start_form({method=>"post", action=>$r->uri, id=>"config-form", name=>"config-form"});
-	print $self->hidden_authen_fields();
-	print CGI::hidden(-name=> 'section_tab', -value=> $current_tab);
-
-	my $tabnumber = $current_tab;
-	$tabnumber =~ s/tab//;
-	my @configSectionArray = @{$ConfigValues->[$tabnumber]};
-	my $configTitle = shift @configSectionArray;
-	print CGI::h2(CGI::b($r->maketext($configTitle)));
-
-	print CGI::start_div({ class => 'table-responsive' });
-	print CGI::start_table({ class => 'table table-bordered align-middle' });
-	print '<tr>'
-		. CGI::th($r->maketext('Setting'))
-		. CGI::th({ class => 'text-center' }, $r->maketext('Default'))
-		. CGI::th({ class => 'text-center' }, $r->maketext('Current'));
-	for my $con (@configSectionArray) {
-		my $conobject = $self->objectify($con);
-		print '<tr>';
-		print $conobject->what_string("widget$widget_count");
-		print CGI::td({ class => 'text-center' },
-			$conobject->display_value(eval('$default_ce->' . inline_var($con->{var}))));
-		print CGI::td($conobject->entry_widget("widget$widget_count", eval('$ce4->' . inline_var($con->{var}))));
-		print '</tr>';
-		$widget_count++;
 	}
-	print CGI::end_table();
-	print CGI::end_div();
-
-	print CGI::p(CGI::submit({
-		name  => 'make_changes',
-		value => $r->maketext('Save Changes'),
-		class => 'btn btn-primary'
-	}));
-	print CGI::end_form();
-
 
-	return "";
+	return;
 }
 
-
-=head1 AUTHOR
-
-Written by John Jones, jj (at) asu.edu.
-
-=cut
-
-
-
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm b/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm
index 845f23324e..df99b58948 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm
@@ -14,16 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Instructor::FileManager;
-use base qw(WeBWorK::ContentGenerator::Instructor);
-
-use utf8;
-use WeBWorK::Utils qw(readDirectory readFile sortByName listFilesRecursive);
-use WeBWorK::Upload;
-use File::Path;
-use File::Copy;
-use File::Spec;
-
-use String::ShellQuote;
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -31,1417 +22,776 @@ WeBWorK::ContentGenerator::Instructor::FileManager.pm -- simple directory manage
 
 =cut
 
-use strict;
-use warnings;
-#use CGI;
-use WeBWorK::CGI;
+use File::Path;
+use File::Copy;
+use File::Spec;
+use String::ShellQuote;
 
+use WeBWorK::Utils qw(readDirectory readFile sortByName listFilesRecursive);
+use WeBWorK::Upload;
 use WeBWorK::Utils::CourseManagement qw(archiveCourse);
 
 use constant HOME => 'templates';
 
-#
-#  The list of file extensions and the directories they usually go in.
-#
+# The list of file extensions and the directories they usually go in.
 my %uploadDir = (
-  csv  => 'scoring',
-  lst  => 'templates',
-  pg   => 'templates/.*',
-  pl   => 'templates/macros',
-  def  => 'templates',
-  html => 'html/.*',
+	csv  => 'scoring',
+	lst  => 'templates',
+	pg   => 'templates/.*',
+	pl   => 'templates/macros',
+	def  => 'templates',
+	html => 'html/.*',
 );
 
-##################################################
-#
-# Check that the user is authorized, and then
-# see if there is a download to perform.
-#
-sub pre_header_initialize {
-	my $self = shift;
-	my $r = $self->r;
-	my $authz = $r->authz;
-	my $user = $r->param('user');
-
-	# we don't need to return an error here, because body() will print an error for us :)
-	return unless $authz->hasPermissions($user, "manage_course_files");
-
-	my $action = $r->param('action');
-	$self->Download if ($action && ($action eq 'Download' || $action eq $r->maketext("Download")));
-	my $file = $r->param('download');
-	$self->downloadFile($file) if (defined $file);
-	my $ce = $r->ce;
-	my $urlpath = $r->urlpath;
-	my $courseID = $r->urlpath->arg("courseID");
-	# removed archived_course_ prefix -- it is important that path matches the $courseID for consitency with the database dump
-	my $archive_path = $ce->{webworkDirs}{courses} . "/$courseID/templates/$courseID.tar.gz";
-	my %options = (courseID => $courseID, archive_path => $archive_path, ce=>$ce );
-	$self->{archive_options}= \%options;
+# Check that the user is authorized, and see if there is a download to perform.
+sub pre_header_initialize ($c) {
+	return unless $c->authz->hasPermissions($c->param('user'), 'manage_course_files');
+
+	my $action = $c->param('action');
+	$c->Download if $action && ($action eq 'Download' || $action eq $c->maketext('Download'));
+
+	$c->downloadFile($c->param('download')) if defined $c->param('download');
+
+	if ($action && ($action eq 'Archive Course' || $action eq $c->maketext('Archive Course'))) {
+		my $ce       = $c->ce;
+		my $courseID = $c->stash('courseID');
+
+		my $message = eval {
+			WeBWorK::Utils::CourseManagement::archiveCourse(
+				courseID     => $courseID,
+				archive_path => "$ce->{webworkDirs}{courses}/$courseID/templates/$courseID.tar.gz",
+				ce           => $ce
+			);
+		};
+		if ($@) {
+			$c->addbadmessage($c->maketext('Failed to generate course archive: [_1]', $@));
+		} else {
+			$c->addgoodmessage($c->maketext('Archived course as [_1].tar.gz.', $courseID));
+		}
+		$c->addbadmessage($message) if ($message);
+	}
 
+	$c->{pwd}        = $c->checkPWD($c->param('pwd') || HOME);
+	$c->{courseRoot} = $c->ce->{courseDirs}{root};
+	$c->{courseName} = $c->stash('courseID');
+
+	return;
 }
 
-##################################################
-#
 # Download a given file
-#
-sub downloadFile {
-	my $self = shift;
-	my $r = $self->r;
-	my $file = checkName(shift);
-	my $pwd = $self->checkPWD(shift || $self->r->param('pwd') || HOME);
+sub downloadFile ($c, $filename, $directory = '') {
+	my $file = checkName($filename);
+	my $pwd  = $c->checkPWD($directory || $c->param('pwd') || HOME);
 	return unless $pwd;
-	$pwd = $self->{ce}{courseDirs}{root} . '/' . $pwd;
+	$pwd = $c->{ce}{courseDirs}{root} . '/' . $pwd;
 	unless (-e "$pwd/$file") {
-		$self->addbadmessage($r->maketext("The file you are trying to download doesn't exist"));
+		$c->addbadmessage($c->maketext(q{The file you are trying to download doesn't exist}));
 		return;
 	}
 	unless (-f "$pwd/$file") {
-		$self->addbadmessage($r->maketext("You can only download regular files."));
+		$c->addbadmessage($c->maketext('You can only download regular files.'));
 		return;
 	}
-	my $type = "application/octet-stream";
-	$type = "text/plain" if $file =~ m/\.(pg|pl|pm|txt|def|csv|lst)/;
-	$type = "image/gif"  if $file =~ m/\.gif/;
-	$type = "image/jpeg" if $file =~ m/\.(jpg|jpeg)/;
-	$type = "image/png"  if $file =~ m/\.png/;
-	$self->reply_with_file($type, "$pwd/$file", $file, 0);
-}
-
-##################################################
-#
-# The main body of the page
-#
-sub body {
-	my $self       = shift;
-	my $r          = $self->r;
-	my $urlpath    = $r->urlpath;
-	my $db         = $r->db;
-	my $ce         = $r->ce;
-	my $authz      = $r->authz;
-	my $courseRoot = $ce->{courseDirs}{root};
-	my $courseName = $urlpath->arg('courseID');
-	my $user       = $r->param('user');
-	my $key        = $r->param('key');
-
-	return CGI::em("You are not authorized to manage course files")
-		unless $authz->hasPermissions($user, "manage_course_files");
-
-	$self->{pwd} = $self->checkPWD($r->param('pwd') || HOME);
-	return CGI::em("You have specified an illegal working directory!") unless defined $self->{pwd};
-
-	my $fileManagerPage = $urlpath->newFromModule($urlpath->module, $r, courseID => $courseName);
-	my $fileManagerURL  = $self->systemLink($fileManagerPage, authen => 0);
-
-	print CGI::start_form(
-		-method=>"POST",
-		-action=>$fileManagerURL,
-		-id=>"FileManager",
-		-enctype=> 'multipart/form-data',
-		-name=>"FileManager",
-         -style=>"margin:0",
-	);
-	print $self->hidden_authen_fields;
-
-	$self->{courseRoot} = $courseRoot;
-	$self->{courseName} = $courseName;
-
-	#
-	#replaced by a list of if/elsif because the translation didn't recognize the translated actions.
-	#
-	my $action = $r->param('action') || $r->param('formAction') || $r->param("confirmed") || 'Init';
-	#$self->addgoodmessage("|$action|");
-	if($action eq "Refresh" 	|| $action eq $r->maketext("Refresh")) {$self->Refresh;}
-	elsif($action eq "Cancel" 	|| $action eq $r->maketext("Cancel")) {$self->Refresh;}
-	elsif($action eq "Directory"|| $action eq $r->maketext("Directory")) {$self->Go;}
-	elsif($action eq "Go" 		|| $action eq $r->maketext("Go")) {$self->Go;}
-	elsif($action eq "View" 	|| $action eq $r->maketext("View")) {$self->View;}
-	elsif($action eq "Edit" 	|| $action eq $r->maketext("Edit")) {$self->Edit;}
-	elsif($action eq "Download" 	|| $action eq $r->maketext("Download")) {$self->Refresh;}
-	elsif($action eq "Copy" 	|| $action eq $r->maketext("Copy")) {$self->Copy;}
-	elsif($action eq "Rename" 	|| $action eq $r->maketext("Rename")) {$self->Rename;}
-	elsif($action eq "Delete" 	|| $action eq $r->maketext("Delete")) {$self->Delete;}
-	elsif($action eq "Make Archive" || $action eq $r->maketext("Make Archive")) {$self->MakeArchive;}
-	elsif($action eq "Unpack" 	|| $action eq $r->maketext("Unpack")) {$self->UnpackArchive;}
-	elsif($action eq "New Folder"	|| $action eq $r->maketext("New Folder")) {$self->NewFolder;}
-	elsif($action eq "New File" 	|| $action eq $r->maketext("New File")) {$self->NewFile;}
-	elsif($action eq "Upload" 	|| $action eq $r->maketext("Upload")) {$self->Upload;}
-	elsif($action eq "Revert" 	|| $action eq $r->maketext("Revert")) {$self->Edit;}
-	elsif($action eq "Save As" 	|| $action eq $r->maketext("Save As")) {$self->SaveAs;}
-	elsif($action eq "Save" 	|| $action eq $r->maketext("Save")) {$self->Save;}
-	elsif($action eq "Init" 	|| $action eq $r->maketext("Init")) {$self->Init;}
-	elsif($action eq "^"        || $action eq "\\") {$self->ParentDir;}
-	else {
-	  $self->addbadmessage("Unknown action");
-	  $self->Refresh;
-	}
-	#for ($action) {
-#		/^Refresh/i    and do {$self->Refresh; last};
-#		/^Cancel/i     and do {$self->Refresh; last};
-#		/^\^/i         and do {$self->ParentDir; last};
-#		/^Directory/i  and do {$self->Go; last};
-#		/^Go/i         and do {$self->Go; last};
-#		/^View/i       and do {$self->View; last};
-#		/^Edit/i       and do {$self->Edit; last};
-#		/^Download/i   and do {$self->Refresh; last};
-#		/^Copy/i       and do {$self->Copy; last};
-#		/^Rename/i     and do {$self->Rename; last};
-#		/^Delete/i     and do {$self->Delete; last};
-#		/^Make/i       and do {$self->MakeArchive; last};
-#		/^Unpack/i     and do {$self->UnpackArchive; last};
-#		/^New Folder/i and do {$self->NewFolder; last};
-#		/^New File/i   and do {$self->NewFile; last};
-#		/^Upload/i     and do {$self->Upload; last};
-#		/^Revert/i     and do {$self->Edit; last};
-#		/^Save As/i    and do {$self->SaveAs; last};
-#		/^Save/i       and do {$self->Save; last};
-#		/^Init/i       and do {$self->Init; last};
-	#}
-    if ($r->param('archiveCourse') ) {
-         my %options = %{$self->{archive_options}};
-        my $courseID = $options{courseID};
-        $self->addgoodmessage($r->maketext("Archiving course as [_1].tar.gz. Reload FileManager to see it.",$courseID));
-    	WeBWorK::Utils::CourseManagement::archiveCourse(%options);
-    	$self->addgoodmessage($r->maketext("Course archived."));
-
-    }
-	print CGI::hidden({name=>'pwd',value=>$self->{pwd}});
-	print CGI::hidden({name=>'formAction',value=>""});
-	print CGI::end_form();
-
-	return "";
+	my $type = 'application/octet-stream';
+	$type = 'text/plain' if $file =~ m/\.(pg|pl|pm|txt|def|csv|lst)/;
+	$type = 'image/gif'  if $file =~ m/\.gif/;
+	$type = 'image/jpeg' if $file =~ m/\.(jpg|jpeg)/;
+	$type = 'image/png'  if $file =~ m/\.png/;
+	$c->reply_with_file($type, "$pwd/$file", $file, 0);
+	return;
 }
 
-
-##################################################
-#
-#  First time through
-#
-sub Init {
-	my $self = shift;
-	$self->r->param('unpack',1);
-	$self->r->param('autodelete',1);
-	$self->r->param('format','Automatic');
-	$self->Refresh;
+# First time through
+sub Init ($c) {
+	$c->param('unpack',     1)           unless defined($c->param('unpack'));
+	$c->param('autodelete', 1)           unless defined($c->param('autodelete'));
+	$c->param('format',     'Automatic') unless defined($c->param('format'));
+	return $c->Refresh;
 }
 
-sub HiddenFlags {
-	my $self = shift;
-	print CGI::hidden({name=>"dates",     value=>$self->getFlag('dates')});
-	print CGI::hidden({name=>"overwrite", value=>$self->getFlag('overwrite')});
-	print CGI::hidden({name=>"unpack",    value=>$self->getFlag('unpack')});
-	print CGI::hidden({name=>"autodelete",value=>$self->getFlag('autodelete')});
-	print CGI::hidden({name=>"format",    value=>$self->getFlag('format','Automatic')});
+sub HiddenFlags ($c) {
+	return $c->c(
+		$c->hidden_field(dates      => ''),
+		$c->hidden_field(overwrite  => ''),
+		$c->hidden_field(unpack     => ''),
+		$c->hidden_field(autodelete => ''),
+		$c->hidden_field(autodelete => 'Automatic'),
+	)->join('');
 }
 
-##################################################
-#
-# Display the directory listing and associated buttons
-#
-
-sub Refresh {
- 	my $self = shift;
-	my $r = $self->r;
-	my $pwd = shift || $self->{pwd};
-	my $isTop = $pwd eq '.' || $pwd eq '';
-
-	my ($dirs,$dirlabels) = directoryMenu($self->{courseName},$pwd);
-	my ($files,$filelabels) = directoryListing($self->{courseRoot},$pwd,$self->getFlag('dates'));
-
-	unless ($files) {
-		$self->addbadmessage($r->maketext("The directory you specified doesn't exist"));
-		$files = []; $filelabels = {};
-	}
-
-	# Some JavaScript to make things easier for the user
-	print CGI::script(<<EOF);
-		function doForm(action) {
-			var form = window.document.getElementById('FileManager');
-			form.formAction.value = action;
-			form.submit();
-		}
-		function disableButton(id,state) {
-			var element = window.document.getElementById(id);
-			element.disabled = state;
-		}
-		function checkFiles() {
-			var files = window.document.getElementById('files');
-			var state = files.selectedIndex < 0;
-			disableButton('View',state);
-			disableButton('Edit',state);
-			disableButton('Download',state);
-			disableButton('Rename',state);
-			disableButton('Copy',state);
-			disableButton('Delete',state);
-			disableButton('MakeArchive',state);
-			checkArchive(files, state);
-		}
-		function checkFile() {
-			var file = window.document.getElementById('file');
-			if (navigator.vendor && navigator.vendorSub && navigator.vendor == "Netscape") {
-			  if (navigator.vendorSub.match(/(\\d+)\.(\\d+)/)) {
-			    if (RegExp.\$1 < 7 || (RegExp.\$1 == 7 && RegExp.\$2 < 2)) return;
-			  }
-			}
-			var state = (file.value == "");
-			disableButton('Upload',state);
-		}
-		function checkArchive(files, disabled) {
-			if (disabled) return;
-			var button = document.getElementById('MakeArchive');
-			button.value = 'Make Archive';
-			if (!files.children[files.selectedIndex].value?.match(/\\.(tar|tar\\.gz|tgz)\$/)) return;
-			for (var i = files.selectedIndex+1; i < files.length; i++)
-			  {if (files.children[i].selected) return}
-			button.value = 'Unpack Archive';
-		}
-EOF
-
-	# Directory menu and date/size checkbox
-	print CGI::div(
-		{ class => 'row' },
-		CGI::div(
-			{ class => 'col-md-8 mb-2' },
-			CGI::div(
-				{ class => 'input-group input-group-sm' },
-				CGI::submit({
-					name  => "action",
-					value => "^",
-					($isTop ? (disabled => 1) : ()),
-					class => 'btn btn-sm btn-secondary'
-				}),
-				CGI::popup_menu({
-					name     => "directory",
-					values   => $dirs,
-					labels   => $dirlabels,
-					class    => 'form-select',
-					dir      => 'ltr',
-					onChange => "doForm('Go')"
-				})
-			)
-		),
-		CGI::div(
-			{ class => 'col-md-4 mb-2' },
-			CGI::div(
-				{ class => 'form-check font-sm' },
-				CGI::checkbox({
-					name            => 'dates',
-					checked         => $self->getFlag('dates'),
-					value           => 1,
-					class           => 'form-check-input',
-					label           => $r->maketext('Show Date & Size'),
-					labelattributes => { class => 'form-check-label' },
-					onClick         => 'doForm("Refresh")'
-				})
-			)
-		)
-	);
-
-	# Directory Listing and column of buttons
-	my %button = (name => "action", style => "width:10em", class => 'file-manager-btn btn btn btn-sm btn-secondary');
-	my $width = ($self->getFlag('dates') && scalar(@{$files}) > 0) ? "" : " width:30em";
-	print CGI::div(
-		{ class => 'row' },
-		CGI::div(
-			{ class => 'col-md-8 mb-2' },
-			fixSpaces(CGI::scrolling_list({
-				name       => "files",
-				id         => "files",
-				class      => 'form-select font-monospace h-100',
-				dir        => 'ltr',
-				size       => 17,
-				multiple   => 1,
-				values     => $files,
-				labels     => $filelabels,
-				onDblClick => "doForm('View')",
-				onChange   => "checkFiles()"
-			}))
-		),
-		CGI::div(
-			{ class => 'col-md-4 mb-2' },
-			CGI::div(
-				{ class => 'd-md-flex flex-column justify-content-evenly' },
-				CGI::submit({ %button, value => $r->maketext("View"),         id => "View" }),
-				CGI::submit({ %button, value => $r->maketext("Edit"),         id => "Edit" }),
-				CGI::submit({ %button, value => $r->maketext("Download"),     id => "Download" }),
-				CGI::submit({ %button, value => $r->maketext("Rename"),       id => "Rename" }),
-				CGI::submit({ %button, value => $r->maketext("Copy"),         id => "Copy" }),
-				CGI::submit({ %button, value => $r->maketext("Delete"),       id => "Delete" }),
-				CGI::submit({ %button, value => $r->maketext("Make Archive"), id => "MakeArchive" }),
-				CGI::div({ style => 'height: 10px' }, ''),
-				CGI::submit({ %button, value => $r->maketext("New File") }),
-				CGI::submit({ %button, value => $r->maketext("New Folder") }),
-				CGI::submit({ %button, value => $r->maketext("Refresh") }),
-			)
-		)
-	);
-
-	# Upload button and checkboxes
-	print CGI::div(
-		{ class => 'row' },
-		CGI::div(
-			{ class => 'col-md-8' },
-			CGI::div(
-				{ class => 'input-group input-group-sm mb-2' },
-				CGI::submit({
-					name  => "action",
-					style => "width:7em",
-					value => $r->maketext("Upload"),
-					id    => "Upload",
-					class => 'btn btn-sm btn-primary'
-				}),
-				CGI::input({
-					type     => "file",
-					name     => "file",
-					id       => "file",
-					onChange => "checkFile()",
-					class    => 'form-control form-control-sm'
-				})
-			)
-		)
-	);
-
-	print CGI::div(
-		{ class => 'row' },
-		CGI::div(
-			{ class => 'col-md-8' },
-			CGI::div(
-				{ class => 'input-group input-group-sm mb-2' },
-				CGI::span({ class => 'input-group-text' }, $r->maketext('Format') . ':'),
-				CGI::div(
-					{ class => 'input-group-text flex-grow-1' },
-					CGI::radio_group({
-						name            => 'format',
-						values          => [ $r->maketext('Text'), $r->maketext('Binary'), $r->maketext('Automatic') ],
-						default         => $self->getFlag('format', 'Automatic'),
-						class           => 'form-check-input me-2',
-						labelattributes => { class => 'form-check-label me-4' }
-					})
-				)
-			)
-		)
-	);
-
-	print CGI::div(
-		{ class => 'row' },
-		CGI::div(
-			{ class => 'col-md-8' },
-			CGI::div(
-				{ class => 'input-group input-group-sm mb-2' },
-				CGI::div(
-					{ class => 'input-group-text flex-grow-1' },
-					CGI::checkbox({
-						name            => 'overwrite',
-						checked         => $self->getFlag('overwrite'),
-						value           => 1,
-						class           => 'form-check-input me-2',
-						label           => $r->maketext('Overwrite existing files silently'),
-						labelattributes => { class => 'form-check-label' }
-					})
-				)
-			)
-		),
-	);
-
-	print CGI::div(
-		{ class => 'row' },
-		CGI::div(
-			{ class => 'col-md-8' },
-			CGI::div(
-				{ class => 'input-group input-group-sm' },
-				CGI::div(
-					{ class => 'input-group-text' },
-					CGI::checkbox({
-						name            => 'unpack',
-						checked         => $self->getFlag('unpack'),
-						value           => 1,
-						class           => 'form-check-input me-2',
-						label           => $r->maketext('Unpack archives automatically'),
-						labelattributes => { class => 'form-check-label' }
-					})
-				),
-				CGI::div(
-					{ class => 'input-group-text flex-grow-1' },
-					CGI::checkbox({
-						name            => 'autodelete',
-						checked         => $self->getFlag('autodelete'),
-						value           => 1,
-						class           => 'form-check-input me-2',
-						label           => $r->maketext('then delete them'),
-						labelattributes => { class => 'form-check-label' }
-					})
-				)
-			)
-		)
-	);
-
-	print CGI::script("checkFiles(); checkFile();");
+# Display the directory listing and associated buttons.
+sub Refresh ($c) {
+	return $c->include('ContentGenerator/Instructor/FileManager/refresh');
 }
 
-##################################################
-#
 # Move to the parent directory
-#
-sub ParentDir {
-	my $self = shift;
-	$self->{pwd} = '.' unless ($self->{pwd} =~ s!/[^/]*$!!);
-	$self->Refresh;
+sub ParentDir ($c) {
+	$c->{pwd} = '.' unless ($c->{pwd} =~ s!/[^/]*$!!);
+	return $c->Refresh;
 }
 
-##################################################
-#
 # Move to the parent directory
-#
-sub Go {
-	my $self = shift;
-	$self->{pwd} = $self->r->param('directory');
-	$self->Refresh;
+sub Go ($c) {
+	$c->{pwd} = $c->param('directory');
+	return $c->Refresh;
 }
 
-##################################################
-#
 # Open a directory or view a file
-#
-sub View {
-	my $self = shift; my $pwd = $self->{pwd};
-	my $r = $self->r;
-	my $filename = $self->getFile("view"); return unless $filename;
-	my $name = "$pwd/$filename"; $name =~ s!^\./?!!;
-	my $file = "$self->{courseRoot}/$pwd/$filename";
-
-	#
+sub View ($c) {
+	my $filename = $c->getFile('view');
+	return '' unless $filename;
+
+	my $name = "$c->{pwd}/$filename" =~ s!^\./?!!r;
+	my $file = "$c->{courseRoot}/$c->{pwd}/$filename";
+
 	# Don't follow symbolic links
-	#
-	if ($self->isSymLink($file)) {
-	  $self->addbadmessage($r->maketext("You may not follow symbolic links"));
-	  $self->Refresh; return;
+	if ($c->isSymLink($file)) {
+		$c->addbadmessage($c->maketext('You may not follow symbolic links'));
+		return $c->Refresh;
 	}
 
-	#
 	# Handle directories by making them the working directory
-	#
 	if (-d $file) {
-		$self->{pwd} .= '/'.$filename;
-		$self->Refresh; return;
+		$c->{pwd} .= '/' . $filename;
+		return $c->Refresh;
 	}
 
 	unless (-f $file) {
-		$self->addbadmessage($r->maketext("You can't view files of that type"));
-		$self->Refresh; return;
+		$c->addbadmessage($c->maketext(q{You can't view files of that type}));
+		return $c->Refresh;
 	}
 
-	#
-	# Include a download link
-	#
-	my $urlpath = $self->r->urlpath;
-	my $fileManagerPage = $urlpath->newFromModule($urlpath->module, $r, courseID => $self->{courseName});
-	my $fileManagerURL  = $self->systemLink($fileManagerPage, params => {download => $filename, pwd => $pwd});
-	print CGI::div({style=>"float:right"},
-		 CGI::a({href=>$fileManagerURL},"Download"));
-	print CGI::p(),CGI::b($name),CGI::p();
-	print CGI::hr();
-
-	#
-	# For files, display the file, if possible.
-	# If the file is an image, display it as an image.
-	#
-	if (-T $file) { #check that it is a text file
-		my $data = readFile($file);
-		print CGI::div({dir=>"auto"},
-		    CGI::pre(showHTML($data)));
-	} elsif ($file =~ m/\.(gif|jpg|png)/i) {
-		print CGI::img({src=>$fileManagerURL, border=>0});
-	} else {
-		print CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-			"The file $file does not appear to be a text or image file.");
-	}
+	return $c->include(
+		'ContentGenerator/Instructor/FileManager/view',
+		filename => $filename,
+		name     => $name,
+		file     => $file
+	);
 }
 
-##################################################
-#
 # Edit a file
-#
-sub Edit {
-	my $self = shift;
-	my $filename = $self->getFile('edit'); return unless $filename;
-	my $file = "$self->{courseRoot}/$self->{pwd}/$filename";
-	my $r = $self->r;
-	my $userID = $r->param('user');
-	my $ce = $r->ce;
-	my $authz = $r->authz;
-
-	# if its a restricted file, dont allow the web editor to edit it unless
-	# that option has been set for the course.
-	foreach my $restrictedFile (@{$ce->{uneditableCourseFiles}}) {
-	    if (File::Spec->canonpath($file) eq
-		File::Spec->canonpath("$self->{courseRoot}/$restrictedFile") &&
-		!$authz->hasPermissions($userID, "edit_restricted_files") ) {
-		    $self->addbadmessage($r->maketext("You do not have permission to edit this file."));
-		    $self->Refresh; return;
-	    }
+sub Edit ($c) {
+	my $filename = $c->getFile('edit');
+	return '' unless $filename;
+	my $file   = "$c->{courseRoot}/$c->{pwd}/$filename";
+	my $userID = $c->param('user');
+	my $ce     = $c->ce;
+	my $authz  = $c->authz;
+
+	# If its a restricted file, dont allow the web editor to edit it unless that option has been set for the course.
+	for my $restrictedFile (@{ $ce->{uneditableCourseFiles} }) {
+		if (File::Spec->canonpath($file) eq File::Spec->canonpath("$c->{courseRoot}/$restrictedFile")
+			&& !$authz->hasPermissions($userID, 'edit_restricted_files'))
+		{
+			$c->addbadmessage($c->maketext('You do not have permission to edit this file.'));
+			return $c->Refresh;
+		}
 	}
 
 	if (-d $file) {
-		$self->addbadmessage($r->maketext("You can't edit a directory"));
-		$self->Refresh; return;
+		$c->addbadmessage($c->maketext(q{You can't edit a directory}));
+		return $c->Refresh;
 	}
 
-
-
 	unless (-f $file) {
-		$self->addbadmessage($r->maketext("You can only edit text files"));
-		$self->Refresh; return;
+		$c->addbadmessage($c->maketext('You can only edit text files'));
+		return $c->Refresh;
 	}
 	if (-T $file) {
-		my $data = readFile($file);
-		$self->RefreshEdit($data,$filename);
+		return $c->RefreshEdit(readFile($file), $filename);
 	} else {
-		$self->addbadmessage($r->maketext("The file does not appear to be a text file"));
-		$self->Refresh;
+		$c->addbadmessage($c->maketext('The file does not appear to be a text file'));
+		return $c->Refresh;
 	}
-	return;
 }
 
-##################################################
-#
 # Save the edited file
-#
-sub Save {
-	my $self = shift; my $filename = shift;
-	my $r=$self->r;
-	my $pwd = $self->{pwd};
+sub Save ($c, $filename = '') {
+	my $pwd = $c->{pwd};
 	if ($filename) {
-		$pwd = substr($filename,length($self->{courseRoot})+1);
-		$pwd =~ s!(/|^)([^/]*)$!!; $filename = $2;
-                $pwd = '.' if $pwd eq '';
+		$pwd      = substr($filename, length($c->{courseRoot}) + 1) =~ s!(/|^)([^/]*)$!!r;
+		$filename = $2;
+		$pwd      = '.' if $pwd eq '';
 	} else {
-		$filename = $self->getFile("save"); return unless $filename;
+		$filename = $c->getFile('save');
+		return unless $filename;
 	}
-	my $file = "$self->{courseRoot}/$pwd/$filename";
-	my $data = $self->r->param("data");
+	my $file = "$c->{courseRoot}/$pwd/$filename";
+	my $data = $c->param('data');
 
 	if (defined($data)) {
-		$data =~ s/\r\n?/\n/g;  # convert DOS and Mac line ends to unix
-		local (*OUTFILE);
-		if (open(OUTFILE,">:encoding(UTF-8)",$file)) {
-			eval {print OUTFILE $data; close(OUTFILE)};
-			if ($@) {$self->addbadmessage($r->maketext("Failed to save: [_1]",$@))}
-			   else {$self->addgoodmessage($r->maketext("File saved"))}
-		} else {$self->addbadmessage($r->maketext("Can't write to file [_1]", $!))}
-	} else {$data = ""; $self->addbadmessage($r->maketext("Error: no file data was submitted!"))}
-
-	$self->{pwd} = $pwd;
-	$self->RefreshEdit($data,$filename);
+		$data =~ s/\r\n?/\n/g;    # convert DOS and Mac line ends to unix
+		if (open(my $OUTFILE, '>:encoding(UTF-8)', $file)) {
+			print $OUTFILE $data;
+			close($OUTFILE);
+			if ($@) { $c->addbadmessage($c->maketext('Failed to save: [_1]', $@)) }
+			else    { $c->addgoodmessage($c->maketext('File saved')) }
+		} else {
+			$c->addbadmessage($c->maketext(q{Can't write to file [_1]}, $!));
+		}
+	} else {
+		$data = '';
+		$c->addbadmessage($c->maketext('Error: no file data was submitted!'));
+	}
+
+	$c->{pwd} = $pwd;
+	return $c->RefreshEdit($data, $filename);
 }
 
-##################################################
-#
 # Save the edited file under a new name
-#
-sub SaveAs {
-	my $self = shift;
-
-	my $newfile = $self->r->param('name');
-	my $original = $self->r->param('files');
-	$newfile = $self->verifyPath($newfile,$original);
-	if ($newfile) {$self->Save($newfile); return}
-	$self->RefreshEdit($self->r->param('data'),$original);
+sub SaveAs ($c) {
+	my $newfile  = $c->param('name');
+	my $original = $c->param('files');
+	$newfile = $c->verifyPath($newfile, $original);
+	return $c->Save($newfile) if ($newfile);
+	return $c->RefreshEdit($c->param('data'), $original);
 }
 
-##################################################
-#
 # Display the Edit page
-#
-sub RefreshEdit {
-	my $self = shift; my $data = shift; my $file = shift;
-	my $r = $self->r;
-	my $pwd = shift || $self->{pwd};
-	my $name = "$pwd/$file"; $name =~ s!^\./?!!;
-
-	my %button = (name => "action", class => 'btn btn-sm btn-secondary w-100');
-
-	print join(
-		'',
-		CGI::div(
-			{ class => 'd-flex' },
-			CGI::div({ align => "center", class => 'col-12 bg-dark text-white' }, CGI::b($name))
-		),
-		CGI::div(
-			{ class => 'd-flex' },
-			CGI::div(
-				{ class => 'col-12' },
-				CGI::textarea({
-					name     => "data",
-					default  => $data,
-					override => 1,
-					rows     => 30,
-					columns  => 80,
-					dir      => "auto",
-					class    => "file-manager-editor form-control",
-				})
-			)
-		),
-		CGI::div(
-			{ class => 'row' },
-			CGI::div({ class => 'col-md-2 col-4 my-2' }, CGI::submit({ %button, value => $r->maketext("Cancel") })),
-			CGI::div({ class => 'col-md-2 col-4 my-2' }, CGI::submit({ %button, value => $r->maketext("Revert") })),
-			CGI::div({ class => 'col-md-2 col-4 my-2' }, CGI::submit({ %button, value => $r->maketext("Save") })),
-			CGI::div(
-				{ class => 'col-md-6 col-12 my-2' },
-				CGI::div(
-					{ class => 'input-group' },
-					CGI::submit({
-						name  => "action",
-						class => 'btn btn-sm btn-secondary',
-						value => $r->maketext("Save As")
-					}),
-					CGI::input({
-						type  => "text",
-						name  => "name",
-						size  => 20,
-						class => 'form-control form-control-sm'
-					})
-				)
-			)
-		)
-	);
-	print CGI::hidden({ name => "files", value => $file });
-	$self->HiddenFlags;
+sub RefreshEdit ($c, $data, $file) {
+	return $c->include('ContentGenerator/Instructor/FileManager/refresh_edit', contents => $data, file => $file);
 }
 
-##################################################
-#
 # Copy a file
-#
-sub Copy {
-	my $self = shift;
-	my $r = $self->r;
-        my $dir = "$self->{courseRoot}/$self->{pwd}";
-	my $original = $self->getFile('copy'); return unless $original;
+sub Copy ($c) {
+	my $dir      = "$c->{courseRoot}/$c->{pwd}";
+	my $original = $c->getFile('copy');
+	return '' unless $original;
 	my $oldfile = "$dir/$original";
 
 	if (-d $oldfile) {
 		# FIXME: need to do recursive directory copy
-		$self->addbadmessage("Directory copies are not yet implemented");
-		$self->Refresh;
-		return;
+		$c->addbadmessage('Directory copies are not yet implemented');
+		return $c->Refresh;
 	}
 
-	if ($self->r->param('confirmed')) {
-		my $newfile = $self->r->param('name');
-		if ($newfile = $self->verifyPath($newfile,$original)) {
+	if ($c->param('confirmed')) {
+		my $newfile = $c->param('name');
+		if ($newfile = $c->verifyPath($newfile, $original)) {
 			if (copy($oldfile, $newfile)) {
-				$self->addgoodmessage($r->maketext("File successfully copied"));
-				$self->Refresh; return;
-			} else {$self->addbadmessage($r->maketext("Can't copy file: [_1]", $!))}
+				$c->addgoodmessage($c->maketext('File successfully copied'));
+				return $c->Refresh;
+			} else {
+				$c->addbadmessage($c->maketext(q{Can't copy file: [_1]}, $!));
+			}
 		}
 	}
 
-	$self->Confirm($r->maketext("Copy file as:"),uniqueName($dir,$original),$r->maketext("Copy"));
-	print CGI::hidden({name=>"files",value=>$original});
+	return $c->c($c->Confirm($c->maketext('Copy file as:'), uniqueName($dir, $original), $c->maketext('Copy')),
+		$c->hidden_field(files => $original))->join('');
 }
 
-##################################################
-#
 # Rename a file
-#
-sub Rename {
-	my $self = shift;
-	my $r = $self->r;
-        my $dir = "$self->{courseRoot}/$self->{pwd}";
-	my $original = $self->getFile('rename'); return unless $original;
+sub Rename ($c) {
+	my $dir      = "$c->{courseRoot}/$c->{pwd}";
+	my $original = $c->getFile('rename');
+	return '' unless $original;
 	my $oldfile = "$dir/$original";
 
-	if ($self->r->param('confirmed')) {
-		my $newfile = $self->r->param('name');
-		if ($newfile = $self->verifyPath($newfile,$original)) {
+	if ($c->param('confirmed')) {
+		my $newfile = $c->param('name');
+		if ($newfile = $c->verifyPath($newfile, $original)) {
 			if (rename $oldfile, $newfile) {
-				$self->addgoodmessage($r->maketext("File successfully renamed"));
-				$self->Refresh; return;
-			} else {$self->addbadmessage($r->maketext("Can't rename file: [_1]", $!))}
+				$c->addgoodmessage($c->maketext('File successfully renamed'));
+				return $c->Refresh;
+			} else {
+				$c->addbadmessage($c->maketext(q{Can't rename file: [_1]}, $!));
+			}
 		}
 	}
 
-	$self->Confirm($r->maketext("Rename file as:"),$original,$r->maketext("Rename"));
-	print CGI::hidden({name=>"files",value=>$original});
+	return $c->c($c->Confirm($c->maketext('Rename file as:'), $original, $c->maketext('Rename')),
+		$c->hidden_field(files => $original))->join('');
 }
 
-##################################################
-#
 # Delete a file
-#
-sub Delete {
-	my $self = shift;
-	my $r = $self->r;
-	my @files = $self->r->param('files');
-	if (scalar(@files) == 0) {
-		$self->addbadmessage($r->maketext("You must select at least one file to delete"));
-		$self->Refresh; return;
-	}
+sub Delete ($c) {
+	my @files = $c->param('files');
 
-	my $pwd = $self->{pwd};
-	my $dir = $self->{courseRoot}.'/'.$pwd;
-	if ($self->r->param('confirmed')) {
+	if (!@files) {
+		$c->addbadmessage($c->maketext('You must select at least one file to delete'));
+		return $c->Refresh;
+	}
 
-		#
+	my $dir = "$c->{courseRoot}/$c->{pwd}";
+	if ($c->param('confirmed')) {
 		# If confirmed, go ahead and delete the files
-		#
-		foreach my $file (@files) {
-			if (defined $self->checkPWD("$pwd/$file",1)) {
+		for my $file (@files) {
+			if (defined $c->checkPWD("$c->{pwd}/$file", 1)) {
 				if (-d "$dir/$file" && !-l "$dir/$file") {
-					my $removed = eval {rmtree("$dir/$file",0,1)};
-					if ($removed) {$self->addgoodmessage($r->maketext("Directory '[_1]' removed (items deleted: [_2])",$file, $removed))}
-					else {$self->addbadmessage($r->maketext("Directory '[_1]' not removed: [_2]",$file, $!))}
-				} else {
-					if (unlink("$dir/$file")) {$self->addgoodmessage($r->maketext("File '[_1]' successfully removed",$file))}
-					else {$self->addbadmessage($r->maketext("File '[_1]' not removed: [_2]",$file,$!))}
-				}
-			} else {$self->addbadmessage($r->maketext("Illegal file '[_1]' specified",$file)); last}
-		}
-		$self->Refresh;
-
-	} else {
-
-		#
-		#  Look up the files to be deleted, and for directories, add / and the contents of the directory
-		#
-		my @filelist = ();
-		foreach my $file (@files) {
-			if (defined $self->checkPWD("$pwd/$file",1)) {
-				if (-l "$dir/$file") {
-					push(@filelist,"$file@");
-				} elsif (-d "$dir/$file") {
-					my @contents = (); my $dcount = 0;
-					foreach my $item (readDirectory("$dir/$file")) {
-						next if $item eq "." || $item eq "..";
-						if (-l "$dir/$file/$item") {
-							push(@contents, "$item@");
-						} elsif (-d "$dir/$file/$item") {
-							my $count = scalar(listFilesRecursive("$dir/$file/$item",".*"));
-							my $s = ($count == 1 ? "" : "s"); $dcount += $count;
-							push (@contents, "$item/".CGI::small({style=>"float:right;margin-right:3em"},CGI::i("($count item$s)")));
-						} else {
-							push(@contents, $item);
-						}
-						$dcount += 1;
+					my $removed = eval { rmtree("$dir/$file", 0, 1) };
+					if ($removed) {
+						$c->addgoodmessage(
+							$c->maketext('Directory "[_1]" removed (items deleted: [_2])', $file, $removed));
+					} else {
+						$c->addbadmessage($c->maketext('Directory "[_1]" not removed: [_2]', $file, $!));
 					}
-					my $s = ($dcount == 1 ? "": "s");
-					@contents = (@contents[0..10],"&nbsp; .","&nbsp; .","&nbsp; .") if scalar(@contents) > 15;
-					push (@filelist,$file."/".
-								CGI::small({style=>"float:right;margin-right:4em"},CGI::i("($dcount item$s total)")).
-								CGI::div({style=>"margin-left:1ex"},join(CGI::br(),@contents)));
 				} else {
-					push(@filelist,$file);
+					if (unlink("$dir/$file")) {
+						$c->addgoodmessage($c->maketext('File "[_1]" successfully removed', $file));
+					} else {
+						$c->addbadmessage($c->maketext('File "[_1]" not removed: [_2]', $file, $!));
+					}
 				}
+			} else {
+				$c->addbadmessage($c->maketext('Illegal file "[_1]" specified', $file));
+				last;
 			}
 		}
-
-		#
-		# Put up the confirmation dialog box
-		#
-		print CGI::start_div({ class => 'card w-75 mx-auto' });
-		print CGI::div(
-			{ class => 'card-body' },
-			CGI::b($r->maketext("Warning") . ': '),
-			$r->maketext("You have requested that the following items be deleted"),
-			CGI::ul(CGI::li(\@filelist)),
-			(
-				(grep { -d "$dir/$_" } @files)
-				? CGI::p($r->maketext(
-					"Some of these files are directories. Only delete directories if you really know what you are "
-						. "doing. You can seriously damage your course if you delete the wrong thing."
-				))
-				: ""
-			),
-			CGI::p({ class => 'alert alert-danger p-1 mb-3' },
-				$r->maketext("There is no undo for deleting files or directories!")),
-			CGI::p($r->maketext("Really delete the items listed above?")),
-			CGI::div(
-				{ class => 'd-flex justify-content-evenly' },
-				CGI::submit({ name => "action", value => "Cancel", class => 'btn btn-sm btn-secondary' }),
-				CGI::submit({ name => "action", value => "Delete", class => 'btn btn-sm btn-secondary' })
-			)
-		);
-		print CGI::end_div();
-
-		print CGI::hidden({ name => "confirmed", value => "Delete" });
-		foreach my $file (@files) { print CGI::hidden({ name => "files", value => $file }); }
-		$self->HiddenFlags;
+		return $c->Refresh;
+	} else {
+		return $c->include('ContentGenerator/Instructor/FileManager/delete', dir => $dir, files => \@files);
 	}
 }
 
-##################################################
-#
 # Make a gzipped tar archive
-#
-sub MakeArchive {
-	my $self = shift;
-	my $r = $self->r;
-	my @files = $self->r->param('files');
+sub MakeArchive ($c) {
+	my @files = $c->param('files');
 	if (scalar(@files) == 0) {
-		$self->addbadmessage($r->maketext("You must select at least one file for the archive"));
-		$self->Refresh; return;
+		$c->addbadmessage($c->maketext('You must select at least one file for the archive'));
+		return $c->Refresh;
 	}
 
-	my $dir = $self->{courseRoot}.'/'.$self->{pwd};
-	my $archive = uniqueName($dir,(scalar(@files) == 1)?
-				 $files[0].".tgz": $self->{courseName}.".tgz");
-	my $tar = "cd ".shell_quote($dir)." && $self->{ce}{externalPrograms}{tar} -cvzf ".shell_quote($archive,@files);
-	@files = readpipe $tar." 2>&1";
+	my $dir     = "$c->{courseRoot}/$c->{pwd}";
+	my $archive = uniqueName($dir, (scalar(@files) == 1) ? $files[0] . '.tgz' : "$c->{courseName}.tgz");
+	my $tar = 'cd ' . shell_quote($dir) . " && $c->{ce}{externalPrograms}{tar} -cvzf " . shell_quote($archive, @files);
+	@files = readpipe $tar . ' 2>&1';
 	if ($? == 0) {
 		my $n = scalar(@files);
-		$self->addgoodmessage($r->maketext("Archive '[_1]' created successfully ([quant, _2, file])",$archive, $n));
+		$c->addgoodmessage($c->maketext('Archive "[_1]" created successfully ([quant, _2, file])', $archive, $n));
 	} else {
-		$self->addbadmessage($r->maketext("Can't create archive '[_1]': command returned [_2]",$archive,systemError($?)));
+		$c->addbadmessage(
+			$c->maketext(q{Can't create archive "[_1]": command returned [_2]}, $archive, systemError($?)));
 	}
-	$self->Refresh;
+	return $c->Refresh;
 }
 
-##################################################
-#
 # Unpack a gzipped tar archive
-#
-sub UnpackArchive {
-	my $self = shift;
-	my $r = $self->r;
-	my $archive = $self->getFile("unpack"); return unless $archive;
+sub UnpackArchive ($c) {
+	my $archive = $c->getFile('unpack');
+	return '' unless $archive;
 	if ($archive !~ m/\.(tar|tar\.gz|tgz)$/) {
-		$self->addbadmessage($r->maketext("You can only unpack files ending in '.tgz', '.tar' or '.tar.gz'"));
+		$c->addbadmessage($c->maketext('You can only unpack files ending in ".tgz", ".tar" or ".tar.gz"'));
 	} else {
-		$self->unpack($archive);
+		$c->unpack_archive($archive);
 	}
-	$self->Refresh;
+	return $c->Refresh;
 }
 
-sub unpack {
-	my $self = shift;
-	my $r = $self->r;
-	my $archive = shift; my $z = 'z'; $z = '' if $archive =~ m/\.tar$/;
-	my $dir = $self->{courseRoot}.'/'.$self->{pwd};
-	my $tar = "cd ".shell_quote($dir)." && $self->{ce}{externalPrograms}{tar} -vx${z}f ".shell_quote($archive);
-	my @files = readpipe $tar." 2>&1";
+sub unpack_archive ($c, $archive) {
+	my $z     = $archive =~ m/\.tar$/ ? '' : 'z';
+	my $dir   = "$c->{courseRoot}/$c->{pwd}";
+	my $tar   = 'cd ' . shell_quote($dir) . " && $c->{ce}{externalPrograms}{tar} -vx${z}f " . shell_quote($archive);
+	my @files = readpipe "$tar 2>&1";
+
 	if ($? == 0) {
 		my $n = scalar(@files);
-		$self->addgoodmessage($r->maketext("[quant,_1,file] unpacked successfully",$n));
+		$c->addgoodmessage($c->maketext('[quant,_1,file] unpacked successfully', $n));
 		return 1;
 	} else {
-		$self->addbadmessage($r->maketext("Can't unpack '[_1]': command returned [_2]",$archive,systemError($?)));
+		$c->addbadmessage($c->maketext(q{Can't unpack "[_1]": command returned [_2]}, $archive, systemError($?)));
 		return 0;
 	}
 }
 
-##################################################
-#
 # Make a new file and edit it
-#
-sub NewFile {
-	my $self = shift;
-	my $r = $self->r;
-
-	if ($self->r->param('confirmed')) {
-		my $name = $self->r->param('name');
-		if (my $file = $self->verifyName($name,"file")) {
-			local (*NEWFILE);
-			if (open(NEWFILE,">:encoding(UTF-8)",$file)) {
-				close(NEWFILE);
-				$self->RefreshEdit("",$name);
-				return;
-			} else {$self->addbadmessage($r->maketext("Can't create file: [_1]",$!))}
+sub NewFile ($c) {
+	if ($c->param('confirmed')) {
+		my $name = $c->param('name');
+		if (my $file = $c->verifyName($name, 'file')) {
+			if (open(my $NEWFILE, '>:encoding(UTF-8)', $file)) {
+				close $NEWFILE;
+				return $c->RefreshEdit('', $name);
+			} else {
+				$c->addbadmessage($c->maketext(q{Can't create file: [_1]}, $!));
+			}
 		}
 	}
 
-	$self->Confirm($r->maketext("New file name:"),"",$r->maketext("New File"));
+	return $c->Confirm($c->maketext('New file name:'), '', $c->maketext('New File'));
 }
 
-##################################################
-#
 # Make a new directory
-#
-sub NewFolder {
-	my $self = shift;
-	my $r = $self->r;
-
-	if ($self->r->param('confirmed')) {
-		my $name = $self->r->param('name');
-		if (my $dir = $self->verifyName($name,"directory")) {
+sub NewFolder ($c) {
+	if ($c->param('confirmed')) {
+		my $name = $c->param('name');
+		if (my $dir = $c->verifyName($name, 'directory')) {
 			if (mkdir $dir, 0750) {
-				$self->{pwd} .= '/'.$name;
-				$self->Refresh; return;
-			} else {$self->addbadmessage($r->maketext("Can't create directory: [_1]",$!))}
+				$c->{pwd} .= "/$name";
+				return $c->Refresh;
+			} else {
+				$c->addbadmessage($c->maketext(q{Can't create directory: [_1]}, $!));
+			}
 		}
 	}
 
-	$self->Confirm($r->maketext("New folder name:"),"",$r->maketext("New Folder"));
+	return $c->Confirm($c->maketext('New folder name:'), '', $c->maketext('New Folder'));
 }
 
-##################################################
-#
 # Download a file
-#
-sub Download {
-	my $self = shift;
-	my $r = $self->r;
-	my $pwd = $self->checkPWD($self->r->param('pwd') || HOME);
+sub Download ($c) {
+	my $pwd = $c->checkPWD($c->param('pwd') || HOME);
 	return unless $pwd;
-	my $filename = $self->getFile("download"); return unless $filename;
-	my $file = $self->{ce}{courseDirs}{root}.'/'.$pwd.'/'.$filename;
+	my $filename = $c->getFile('download');
+	return unless $filename;
+	my $file = "$c->{ce}{courseDirs}{root}/$pwd/$filename";
 
-	if (-d $file) {$self->addbadmessage($r->maketext("You can't download directories")); return}
-	unless (-f $file) {$self->addbadmessage($r->maketext("You can't download files of that type")); return}
+	if     (-d $file) { $c->addbadmessage($c->maketext(q{You can't download directories}));        return }
+	unless (-f $file) { $c->addbadmessage($c->maketext(q{You can't download files of that type})); return }
 
-	$self->r->param('download',$filename);
+	$c->param('download', $filename);
+
+	return;
 }
 
-##################################################
-#
 # Upload a file to the server
-#
-sub Upload {
-	my $self = shift;
-	my $r = $self->r;
-	my $dir = "$self->{courseRoot}/$self->{pwd}";
-	my $fileIDhash = $self->r->param('file');
+sub Upload ($c) {
+	my $dir        = "$c->{courseRoot}/$c->{pwd}";
+	my $fileIDhash = $c->param('file');
 	unless ($fileIDhash) {
-		$self->addbadmessage($r->maketext("You have not chosen a file to upload."));
-		$self->Refresh;
-		return;
+		$c->addbadmessage($c->maketext('You have not chosen a file to upload.'));
+		return $c->Refresh;
 	}
 
-	my ($id,$hash) = split(/\s+/,$fileIDhash);
-	my $upload = WeBWorK::Upload->retrieve($id,$hash,dir=>$self->{ce}{webworkDirs}{uploadCache});
+	my ($id, $hash) = split(/\s+/, $fileIDhash);
+	my $upload = WeBWorK::Upload->retrieve($id, $hash, dir => $c->{ce}{webworkDirs}{uploadCache});
 
-	my $name = checkName($upload->filename);
-	my $action = $self->r->param("formAction") || "Cancel";
-	if ($self->r->param("confirmed")) {
-		if ($action eq "Cancel" || $action eq $r->maketext("Cancel")) {
+	my $name   = checkName($upload->filename);
+	my $action = $c->param('formAction') || 'Cancel';
+	if ($c->param('confirmed')) {
+		if ($action eq 'Cancel' || $action eq $c->maketext('Cancel')) {
 			$upload->dispose;
-			$self->Refresh;
-			return;
+			return $c->Refresh;
 		}
-		$name = checkName($self->r->param('name')) if ($action eq "Rename" || $action eq $r->maketext("Rename"));
+		$name = checkName($c->param('name')) if ($action eq 'Rename' || $action eq $c->maketext('Rename'));
 	}
 
 	if (-e "$dir/$name") {
-		unless ($self->r->param('overwrite') || $action eq "Overwrite" || $action eq $r->maketext("Overwrite")) {
-
-			$self->Confirm($r->maketext("File <b>[_1]</b> already exists. Overwrite it, or rename it as:",$name).CGI::p(),uniqueName($dir,$name),$r->maketext("Rename"),$r->maketext("Overwrite"));
-			#$self->Confirm("File ".CGI::b($name)." already exists. Overwrite it, or rename it as:".CGI::p(),uniqueName($dir,$name),"Rename","Overwrite");
-			print CGI::hidden({name=>"action",value=>"Upload"});
-			print CGI::hidden({name=>"file",value=>$fileIDhash});
-			return;
+		unless ($c->param('overwrite') || $action eq 'Overwrite' || $action eq $c->maketext('Overwrite')) {
+			return $c->c(
+				$c->Confirm(
+					$c->tag(
+						'p',
+						$c->b(
+							$c->maketext('File <b>[_1]</b> already exists. Overwrite it, or rename it as:', $name)
+						)
+					),
+					uniqueName($dir, $name),
+					$c->maketext('Rename'),
+					$c->maketext('Overwrite')
+				),
+				$c->hidden_field(action => 'Upload'),
+				$c->hidden_field(file   => $fileIDhash)
+			)->join('');
 		}
 	}
-	$self->checkFileLocation($name,$self->{pwd});
+	$c->checkFileLocation($name, $c->{pwd});
 
 	my $file = "$dir/$name";
-	my $type = $self->getFlag('format','Automatic');
+	my $type = $c->getFlag('format', 'Automatic');
 	my $data;
 
-	#
 	#  Check if we need to convert linebreaks
-	#
 	if ($type ne 'Binary') {
-		my $fh = $upload->fileHandle;
-		my @lines = <$fh>; $data = join('',@lines);
-		if ($type eq 'Automatic') {$type = isText($data) ? 'Text' : 'Binary'}
+		my $fh    = $upload->fileHandle;
+		my @lines = <$fh>;
+		$data = join('', @lines);
+		if ($type eq 'Automatic') { $type = isText($data) ? 'Text' : 'Binary' }
 	}
 	if ($type eq 'Text') {
 		$upload->dispose;
 		$data =~ s/\r\n?/\n/g;
-		if (open(UPLOAD,">:encoding(UTF-8)",$file)) {
-			my $backup_data=$data;
-			my $success= utf8::decode($data); # try to decode as utf8
-			unless ($success){
+		if (open(my $UPLOAD, '>:encoding(UTF-8)', $file)) {
+			my $backup_data = $data;
+			my $success     = utf8::decode($data);    # try to decode as utf8
+			unless ($success) {
 				warn "Trying to convert file $file from latin1? to UTF-8";
-				utf8::upgrade($backup_data); # try to convert data from latin1 to utf8.
-				$data=$backup_data;
+				utf8::upgrade($backup_data);          # try to convert data from latin1 to utf8.
+				$data = $backup_data;
 			}
-		  print UPLOAD $data; # print massaged data to file.
-		  close(UPLOAD)}
-		  else {$self->addbadmessage($r->maketext("Can't create file '[_1]': [_2]", $name, $!))}
+			print $UPLOAD $data;                      # print massaged data to file.
+			close $UPLOAD;
+		} else {
+			$c->addbadmessage($c->maketext(q{Can't create file "[_1]": [_2]}, $name, $!));
+		}
 	} else {
 		$upload->disposeTo($file);
 	}
 
 	if (-e $file) {
-	  $self->addgoodmessage($r->maketext("File '[_1]' uploaded successfully",$name));
-	  if ($name =~ m/\.(tar|tar\.gz|tgz)$/ && $self->getFlag('unpack')) {
-	    if ($self->unpack($name) && $self->getFlag('autodelete')) {
-	      if (unlink($file)) {$self->addgoodmessage($r->maketext("Archive '[_1]' deleted", $name))}
-	        else {$self->addbadmessage($r->maketext("Can't delete archive '[_1]': [_2]", $name, $!))}
-	    }
-	  }
+		$c->addgoodmessage($c->maketext('File "[_1]" uploaded successfully', $name));
+		if ($name =~ m/\.(tar|tar\.gz|tgz)$/ && $c->getFlag('unpack')) {
+			if ($c->unpack_archive($name) && $c->getFlag('autodelete')) {
+				if (unlink($file)) { $c->addgoodmessage($c->maketext('Archive "[_1]" deleted', $name)) }
+				else               { $c->addbadmessage($c->maketext(q{Can't delete archive "[_1]": [_2]}, $name, $!)) }
+			}
+		}
 	}
 
-	$self->Refresh;
+	return $c->Refresh;
 }
 
-##################################################
-##################################################
-#
 # Print a confirmation dialog box
-#
-sub Confirm {
-	my $self = shift;
-	my $r = $self->r;
-	my $message = shift; my $value = shift;
-	my $button = shift; my $button2 = shift;
-
-	print CGI::start_div({ class => 'card w-75 mx-auto' });
-	print CGI::div(
-		{ class => 'card-body' },
-		$message,
-		CGI::input({ type => "text", name => "name", size => 50, value => $value }),
-		CGI::div(
-			{ class => 'd-flex justify-content-evenly mt-3' },
-			CGI::submit({ name => "formAction", value => $r->maketext("Cancel"), class => 'btn btn-sm btn-secondary' }),
-			CGI::submit({ name => "formAction", value => $button,                class => 'btn btn-sm btn-secondary' }),
-			(
-				$button2
-				? CGI::submit({ name => "formAction", value => $button2, class => 'btn btn-sm btn-secondary' })
-				: ()
-			)
-		)
+sub Confirm ($c, $message, $value, $button, $button2 = '') {
+	return $c->include(
+		'ContentGenerator/Instructor/FileManager/confirm',
+		message => $message,
+		value   => $value,
+		button  => $button,
+		button2 => $button2
 	);
-	print CGI::end_div();
-	print CGI::hidden({ name => "confirmed", value => $button });
-	$self->HiddenFlags;
-	print CGI::script("window.document.FileManager.name.focus()");
 }
 
-##################################################
-##################################################
-#
 # Check that there is exactly one valid file
-#
-sub getFile {
-	my $self = shift; my $action = shift;
-	my $r = $self->r;
-	my @files = $self->r->param("files");
+sub getFile ($c, $action) {
+	my @files = $c->param('files');
 	if (scalar(@files) > 1) {
-		$self->addbadmessage($r->maketext("You can only [_1] one file at a time.",$action));
-		$self->Refresh unless $action eq 'download';
+		$c->addbadmessage($c->maketext('You can only [_1] one file at a time.', $action));
+		$c->Refresh unless $action eq 'download';
 		return;
 	}
-	if (scalar(@files) == 0 || $files[0] eq "") {
-		$self->addbadmessage($r->maketext("You need to select a file to [_1].",$action));
-		$self->Refresh unless $action eq 'download';
+	if (scalar(@files) == 0 || $files[0] eq '') {
+		$c->addbadmessage($c->maketext('You need to select a file to [_1].', $action));
+		$c->Refresh unless $action eq 'download';
 		return;
 	}
-	my $pwd = $self->checkPWD($self->{pwd} || $self->r->param('pwd') || HOME) || '.';
-	if ($self->isSymLink($pwd.'/'.$files[0])) {
-		$self->addbadmessage($r->maketext("You may not follow symbolic links"));
-		$self->Refresh unless $action eq 'download';
+	my $pwd = $c->checkPWD($c->{pwd} || $c->param('pwd') || HOME) || '.';
+	if ($c->isSymLink($pwd . '/' . $files[0])) {
+		$c->addbadmessage($c->maketext('You may not follow symbolic links'));
+		$c->Refresh unless $action eq 'download';
 		return;
 	}
-	unless ($self->checkPWD($pwd.'/'.$files[0],1)) {
-		$self->addbadmessage($r->maketext("You have specified an illegal file"));
-		$self->Refresh unless $action eq 'download';
+	unless ($c->checkPWD($pwd . '/' . $files[0], 1)) {
+		$c->addbadmessage($c->maketext('You have specified an illegal file'));
+		$c->Refresh unless $action eq 'download';
 		return;
 	}
 	return $files[0];
 }
 
-##################################################
-#
 # Get the entries for the directory menu
-#
-sub directoryMenu {
-	my $course = shift;
-	my $dir  = shift; $dir =~ s!^\.(/|$)!!;
-	my @dirs = split('/',$dir);
-	my $menu = ""; my $pwd;
-
-	my (@values,%labels);
-	while (scalar(@dirs)) {
-		$pwd = join('/',(@dirs)[0..$#dirs]);
+sub directoryMenu ($c, $dir) {
+	$dir =~ s!^\.(/|$)!!;
+	my @dirs = split('/', $dir);
+
+	my @values;
+	while (@dirs) {
+		my $pwd = join('/', (@dirs)[ 0 .. $#dirs ]);
 		$dir = pop(@dirs);
-		push(@values,$pwd); $labels{$pwd} = $dir;
+		push(@values, [ $dir => $pwd ]);
 	}
-	push(@values,'.'); $labels{'.'} = $course;
-	return (\@values,\%labels);
+	push(@values, [ $c->{courseName} => '.' ]);
+	$c->param('directory', $values[0][0]);
+	return \@values;
 }
 
-##################################################
-#
 # Get the directory listing
-#
-sub directoryListing {
-	my $root = shift; my $pwd = shift; my $showdates = shift;
-	my $dir = $root.'/'.$pwd;
-	my (@values,%labels,$size,$data);
+sub directoryListing ($c, $pwd) {
+	my $dir = "$c->{courseRoot}/$pwd";
 
 	return unless -d $dir;
-        my $len = 24;
-	my @names = sortByName(undef,grep(/^[^.]/,readDirectory($dir)));
-	foreach my $name (@names) {
-		unless ($name eq 'DATA') {   #FIXME don't view the DATA directory
-			my $file = "$dir/$name";
-			push(@values,$name); $labels{$name} = $name;
-			$labels{$name} .= '@' if (-l $file);
-			$labels{$name} .= '/' if (-d $file && !-l $file);
-			$len = length($labels{$name}) if length($labels{$name}) > $len;
+
+	my (@values, $size, $data);
+
+	my $len   = 24;
+	my @names = sortByName(undef, grep {/^[^.]/} readDirectory($dir));
+	for my $name (@names) {
+		unless ($name eq 'DATA') {    #FIXME don't view the DATA directory
+			my $file  = "$dir/$name";
+			my $label = $name;
+			$label .= '@' if (-l $file);
+			$label .= '/' if (-d $file && !-l $file);
+			$len = length($label) if length($label) > $len;
+			push(@values, [ $label => $name ]);
 		}
 	}
-	if ($showdates) {
+	if ($c->getFlag('dates')) {
 		$len += 3;
-		foreach my $name (@values) {
-			my $file = "$dir/$name";
-			my ($size,$date) = (lstat($file))[7,9];
-			$labels{$name} = sprintf("%-${len}s%-16s%10s",$labels{$name},
-						 ((-d $file)? ("",""):
-						  (getDate($date),getSize($size))));
+		for my $name (@values) {
+			my $file = "$dir/$name->[1]";
+			my ($size, $date) = (lstat($file))[ 7, 9 ];
+			$name->[0] =
+				$c->b(
+					sprintf("%-${len}s%-16s%10s", $name->[0], -d $file ? ('', '') : (getDate($date), getSize($size)))
+					=~ s/\s/&nbsp;/gr);
 		}
 	}
-	return (\@values,\%labels);
+	return \@values;
 }
 
-sub getDate {
-  my ($sec,$min,$hour,$day,$month,$year) = localtime(shift);
-  sprintf("%02d-%02d-%04d %02d:%02d",$month+1,$day,$year+1900,$hour,$min);
+sub getDate ($date) {
+	my ($sec, $min, $hour, $day, $month, $year) = localtime($date);
+	return sprintf('%02d-%02d-%04d %02d:%02d', $month + 1, $day, $year + 1900, $hour, $min);
 }
 
-sub getSize {
-  my $size = shift;
-  return $size." B "                        if $size < 1024;
-  return sprintf("%.1f KB",$size/1024)      if $size < 1024*100;
-  return sprintf("%d KB",int($size/1024))   if $size < 1024*1024;
-  return sprintf("%.1f MB",$size/1024/1024) if $size < 1024*1024*100;
-  return sprintf("%d MB",$size/1024/1024);
+sub getSize ($size) {
+	return $size . ' B ' if $size < 1024;
+	return sprintf('%.1f KB', $size / 1024)        if $size < 1024 * 100;
+	return sprintf('%d KB',   int($size / 1024))   if $size < 1024 * 1024;
+	return sprintf('%.1f MB', $size / 1024 / 1024) if $size < 1024 * 1024 * 100;
+	return sprintf('%d MB',   $size / 1024 / 1024);
 }
 
-##################################################
-#
-#  Check if a file is a symbolic link that we
-#  are not allowed to follow.
-#
-sub isSymLink {
-	my $self = shift; my $file = shift;
+# Check if a file is a symbolic link that we are not allowed to follow.
+sub isSymLink ($c, $file) {
 	return 0 unless -l $file;
 
-	my $courseRoot = $self->{ce}{courseDirs}{root};
+	my $courseRoot = $c->{ce}{courseDirs}{root};
 	$courseRoot = readlink($courseRoot) if -l $courseRoot;
-	my $pwd = $self->{pwd} || $self->r->param('pwd') || HOME;
-	my $link = File::Spec->rel2abs(readlink($file),"$courseRoot/$pwd");
-	#
+	my $pwd  = $c->{pwd} || $c->param('pwd') || HOME;
+	my $link = File::Spec->rel2abs(readlink($file), "$courseRoot/$pwd");
+
 	# Remove /./ and dir/../ constructs
-	#
 	$link =~ s!(^|/)(\.(/|$))+!$1!g;
-	while ($link =~ s!((\.[^./]+|\.\.[^/]+|[^./][^/]*)/\.\.(/|$))!!) {};
+	while ($link =~ s!((\.[^./]+|\.\.[^/]+|[^./][^/]*)/\.\.(/|$))!!) { }
 
-	#
 	# Look through the list of valid paths to see if this link is OK
-	#
-	my $valid = $self->{ce}{webworkDirs}{valid_symlinks};
+	my $valid = $c->{ce}{webworkDirs}{valid_symlinks};
 	if (defined $valid && $valid) {
-		foreach my $path (@{$valid}) {
-			return 0 if substr($link,0,length($path)) eq $path;
+		for my $path (@{$valid}) {
+			return 0 if substr($link, 0, length($path)) eq $path;
 		}
 	}
 
 	return 1;
 }
 
-##################################################
-#
 # Normalize the working directory and check if it is OK.
-#
-sub checkPWD {
-	my $self = shift;
-	my $pwd = shift;
-	my $renameError = shift;
-
-	$pwd =~ s!//+!/!g;               # remove duplicate slashes
-	$pwd =~ s!(^|/)~!$1_!g;          # remove ~user references
-	$pwd =~ s!(^|/)(\.(/|$))+!$1!g;  # remove dot directories
+sub checkPWD ($c, $pwd, $renameError = 0) {
+	$pwd =~ s!//+!/!g;                 # remove duplicate slashes
+	$pwd =~ s!(^|/)~!$1_!g;            # remove ~user references
+	$pwd =~ s!(^|/)(\.(/|$))+!$1!g;    # remove dot directories
 
 	# remove dir/.. constructions
-	while ($pwd =~ s!((\.[^./]+|\.\.[^/]+|[^./][^/]*)/\.\.(/|$))!!) {};
+	while ($pwd =~ s!((\.[^./]+|\.\.[^/]+|[^./][^/]*)/\.\.(/|$))!!) { }
 
-	$pwd =~ s!/$!!;                        # remove trailing /
-	return if ($pwd =~ m!(^|/)\.\.(/|$)!); # Error if outside the root
+	$pwd =~ s!/$!!;                           # remove trailing /
+	return if ($pwd =~ m!(^|/)\.\.(/|$)!);    # Error if outside the root
 
 	# check for bad symbolic links
-	my @dirs = split('/',$pwd);
-	pop(@dirs) if $renameError;      # don't check file iteself in this case
-	my @path = ($self->{ce}{courseDirs}{root});
-	foreach my $dir (@dirs) {
-		push @path,$dir;
-		return if ($self->isSymLink(join('/',@path)));
+	my @dirs = split('/', $pwd);
+	pop(@dirs) if $renameError;               # don't check file iteself in this case
+	my @path = ($c->{ce}{courseDirs}{root});
+	for my $dir (@dirs) {
+		push @path, $dir;
+		return if ($c->isSymLink(join('/', @path)));
 	}
 
 	my $original = $pwd;
-	$pwd =~ s!(^|/)\.!$1_!g;         # don't enter hidden directories
-	$pwd =~ s!^/!!;                  # remove leading /
-	$pwd =~ s![^-_./A-Z0-9~, ]!_!gi; # no illegal characters
+	$pwd =~ s!(^|/)\.!$1_!g;                  # don't enter hidden directories
+	$pwd =~ s!^/!!;                           # remove leading /
+	$pwd =~ s![^-_./A-Z0-9~, ]!_!gi;          # no illegal characters
 	return if $renameError && $original ne $pwd;
 
 	$pwd = '.' if $pwd eq '';
 	return $pwd;
 }
 
-##################################################
-#
 # Check that a file is uploaded to the correct directory
-#
-sub checkFileLocation {
-  	my $self = shift;
-	my $r = $self->r;
-	my $extension = shift; $extension =~ s/.*\.//;
-	my $dir = shift; my $location = $uploadDir{$extension};
-	return unless defined($location);
+sub checkFileLocation ($c, $extension, $dir) {
+	$extension =~ s/.*\.//;
+	my $location = $uploadDir{$extension};
+	return unless defined $location;
 	return if $dir =~ m/^$location$/;
-	$location =~ s!/\.\*!!;
+	$location      =~ s!/\.\*!!;
 	return if $dir =~ m/^$location$/;
-	$self->addbadmessage(
-		$r->maketext("Files with extension '.[_1]' usually belong in '[_2]'",$extension,$location)
-		. (($extension eq 'csv') ? $r->maketext(". If this is a class roster, rename it to have extension '.lst'") : '')
+	$c->addbadmessage(
+		$c->maketext('Files with extension ".[_1]" usually belong in "[_2]"', $extension, $location)
+			. (
+				$extension eq 'csv'
+				? $c->maketext('. If this is a class roster, rename it to have extension ".lst"')
+				: ''
+			)
 	);
+
+	return;
 }
 
-##################################################
-#
 # Check a name for bad characters, etc.
-#
-sub checkName {
-	my $file = shift;
-	$file =~ s!.*[/\\]!!;               # remove directory
-	$file =~ s/[^-_.a-zA-Z0-9 ]/_/g;    # no illegal characters
-	$file =~ s/^\./_/;                  # no initial dot
-	$file = "newfile.txt" unless $file; # no blank names
+sub checkName ($file) {
+	$file =~ s!.*[/\\]!!;                  # remove directory
+	$file =~ s/[^-_.a-zA-Z0-9 ]/_/g;       # no illegal characters
+	$file =~ s/^\./_/;                     # no initial dot
+	$file = 'newfile.txt' unless $file;    # no blank names
 	return $file;
 }
 
-##################################################
-#
 # Get a unique name (in case it already exists)
-#
-sub uniqueName {
-	my $dir = shift; my $name = shift;
+sub uniqueName ($dir, $name) {
 	return $name unless (-e "$dir/$name");
-	my $type = ""; my $n = 1;
+	my $type = '';
+	my $n    = 1;
 	$type = $1 if ($name =~ s/(\.[^.]*)$//);
-	$n = $1 if ($name =~ s/_(\d+)$/_/);
-	while (-e "$dir/${name}_$n$type") {$n++}
+	$n    = $1 if ($name =~ s/_(\d+)$/_/);
+	while (-e "$dir/${name}_$n$type") { $n++ }
 	return "${name}_$n$type";
 }
 
-##################################################
-#
-# Verify that a name can be added to the current
-# directory.
-#
-sub verifyName {
-	my $self = shift; my $name = shift; my $object = shift;
-	my $r = $self->r;
+# Verify that a name can be added to the current directory.
+sub verifyName ($c, $name, $object) {
 	if ($name) {
 		unless ($name =~ m!/!) {
 			unless ($name =~ m!^\.!) {
 				unless ($name =~ m![^-_.a-zA-Z0-9 ]!) {
-					my $file = "$self->{courseRoot}/$self->{pwd}/$name";
+					my $file = "$c->{courseRoot}/$c->{pwd}/$name";
 					return $file unless (-e $file);
-					$self->addbadmessage($r->maketext("A file with that name already exists"));
-				} else {$self->addbadmessage($r->maketext("Your [_1] name contains illegal characters",$object))}
-			} else {$self->addbadmessage($r->maketext("Your [_1] name may not begin with a dot",$object))}
-		} else {$self->addbadmessage($r->maketext("Your [_1] name may not contain a path component",$object))}
-	} else {$self->addbadmessage($r->maketext("You must specify a [_1] name",$object))}
-	return
+					$c->addbadmessage($c->maketext('A file with that name already exists'));
+				} else {
+					$c->addbadmessage($c->maketext('Your [_1] name contains illegal characters', $object));
+				}
+			} else {
+				$c->addbadmessage($c->maketext('Your [_1] name may not begin with a dot', $object));
+			}
+		} else {
+			$c->addbadmessage($c->maketext('Your [_1] name may not contain a path component', $object));
+		}
+	} else {
+		$c->addbadmessage($c->maketext('You must specify a [_1] name', $object));
+	}
+	return;
 }
 
-##################################################
-#
 # Verify that a file path is valid
-#
-sub verifyPath {
-	my $self = shift; my $path = shift; my $name = shift;
-	my $r = $self->r;
-
+sub verifyPath ($c, $path, $name) {
 	if ($path) {
 		unless ($path =~ m![^-_.a-zA-Z0-9 /]!) {
 			unless ($path =~ m!^/!) {
-				$path = $self->checkPWD($self->{pwd}.'/'.$path,1);
+				$path = $c->checkPWD($c->{pwd} . '/' . $path, 1);
 				if ($path) {
-					$path = $self->{courseRoot}.'/'.$path;
-					$path .= '/'.$name if -d $path && $name;
+					$path = $c->{courseRoot} . '/' . $path;
+					$path .= "/$name" if -d $path && $name;
 					return $path unless (-e $path);
-					$self->addbadmessage($r->maketext("A file with that name already exists"));
-				} else {$self->addbadmessage($r->maketext("You have specified an illegal path"))}
-			} else {$self->addbadmessage($r->maketext("You can not specify an absolute path"))}
-		} else {$self->addbadmessage($r->maketext("Your file name contains illegal characters"))}
-	} else {$self->addbadmessage($r->maketext("You must specify a file name"))}
-	return
+					$c->addbadmessage($c->maketext('A file with that name already exists'));
+				} else {
+					$c->addbadmessage($c->maketext('You have specified an illegal path'));
+				}
+			} else {
+				$c->addbadmessage($c->maketext('You can not specify an absolute path'));
+			}
+		} else {
+			$c->addbadmessage($c->maketext('Your file name contains illegal characters'));
+		}
+	} else {
+		$c->addbadmessage($c->maketext('You must specify a file name'));
+	}
+	return;
 }
 
-##################################################
-#
 # Get the value of a parameter flag
-#
-sub getFlag {
-  my $self = shift; my $flag = shift;
-  my $default = shift; $default = 0 unless defined $default;
-  my $value = $self->r->param($flag);
-  $value = $default unless defined $value;
-  return $value;
-}
-
-##################################################
-#
-# Make HTML symbols printable
-#
-sub showHTML {
-	my $string = shift;
-	return '' unless defined $string;
-	$string =~ s/&/\&amp;/g;
-	$string =~ s/</\&lt;/g;
-	$string =~ s/>/\&gt;/g;
-	$string;
+sub getFlag ($c, $flag, $default = 0) {
+	return $c->param($flag) // $default;
 }
 
-##################################################
-#
 # Check if a string is plain text
-#
-sub isText {
-	my $string = shift;
+sub isText ($string) {
 	return utf8::is_utf8($string);
 }
 
-##################################################
-#
-#  Convert spaces to &nbsp;, but only REAL spaces
-#
-sub sp2nbsp {
-	my $s = shift;
-	$s =~ s/ /\&nbsp;/g;
-	return $s;
+# Interpret command return errors
+sub systemError ($status) {
+	return "error: $!" if $status == 0xFF00;
+	return 'exit status ' . ($status >> 8) if ($status & 0xFF) == 0;
+	return 'signal ' . ($status &= ~0x80);
 }
 
-##################################################
-#
-#  Hack to convert multiple spaces in the file
-#  selection box into &nbsp; so that the columns
-#  will allign properly in fixed-width fonts.
-#  We have to do it agter the fact, since CGI::
-#  is being "helpful" by turning & in the labels
-#  into &amp; for us.  So we have to convert
-#  after the <SELECT> is created (ugh).
-#
-sub fixSpaces {
-	my $s = shift;
-	$s =~ s!(<option[^>]*>)(.*?)(</option>)!$1.sp2nbsp($2).$3!gei;
-	return $s;
-}
-
-##################################################
-#
-#  Interpret command return errors
-#
-sub systemError {
-  my $status = shift;
-  return "error: $!" if $status == 0xFF00;
-  return "exit status ".($status >> 8) if ($status & 0xFF) == 0;
-  return "signal ".($status &= ~0x80);
-}
-
-##################################################
-
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/Index.pm b/lib/WeBWorK/ContentGenerator/Instructor/Index.pm
index 5442085965..e26a8f38b5 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/Index.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/Index.pm
@@ -1,6 +1,6 @@
 ###############################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Instructor::Index;
-use base qw(WeBWorK::ContentGenerator::Instructor);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -23,11 +23,7 @@ pages
 
 =cut
 
-use strict;
-use warnings;
-use WeBWorK::CGI;
-use WeBWorK::HTML::ScrollingRecordList qw/scrollingRecordList/;
-use WeBWorK::Utils qw/x getAssetURL format_set_name_internal/;
+use WeBWorK::Utils qw(x format_set_name_internal);
 
 use constant E_MAX_ONE_SET  => x('Please select at most one set.');
 use constant E_ONE_USER     => x('Please select exactly one user.');
@@ -37,23 +33,29 @@ use constant E_MIN_ONE_SET  => x('Please select at least one set.');
 use constant E_SET_NAME     => x('Please specify a homework set name.');
 use constant E_BAD_NAME     => x('Please use only letters, digits, dashes, underscores, and periods in your set name.');
 
-sub pre_header_initialize {
-	my ($self)  = @_;
-	my $r       = $self->r;
-	my $ce      = $r->ce;
-	my $db      = $r->db;
-	my $authz   = $r->authz;
-	my $urlpath = $r->urlpath;
+sub pre_header_initialize ($c) {
+	my $ce    = $c->ce;
+	my $db    = $c->db;
+	my $authz = $c->authz;
+
+	# Make sure these are defined for the template.
+	$c->stash->{users}          = [];
+	$c->stash->{globalSets}     = [];
+	$c->stash->{E_MAX_ONE_SET}  = E_MAX_ONE_SET;
+	$c->stash->{E_ONE_USER}     = E_ONE_USER;
+	$c->stash->{E_ONE_SET}      = E_ONE_SET;
+	$c->stash->{E_MIN_ONE_USER} = E_MIN_ONE_USER;
+	$c->stash->{E_MIN_ONE_SET}  = E_MIN_ONE_SET;
+	$c->stash->{E_SET_NAME}     = E_SET_NAME;
+	$c->stash->{E_BAD_NAME}     = E_BAD_NAME;
+	$c->stash->{courseID}       = $c->stash('courseID');
+
+	my $userID = $c->param('user');
 
-	my $courseID = $urlpath->arg('courseID');
-	my $userID   = $r->param('user');
-	my $eUserID  = $r->param('effectiveUser');
-	$self->{courseName} = $courseID;
-	# Check permissions
 	return unless ($authz->hasPermissions($userID, 'access_instructor_tools'));
 
-	my @selectedUserIDs = $r->param('selected_users');
-	my @selectedSetIDs  = $r->param('selected_sets');
+	my @selectedUserIDs = $c->param('selected_users');
+	my @selectedSetIDs  = $c->param('selected_sets');
 
 	my $nusers = @selectedUserIDs;
 	my $nsets  = @selectedSetIDs;
@@ -61,108 +63,94 @@ sub pre_header_initialize {
 	my $firstUserID = $nusers ? $selectedUserIDs[0] : '';
 	my $firstSetID  = $nsets  ? $selectedSetIDs[0]  : '';
 
-	# These will be used to construct a new URL.
-	my $module;
-	my %args = (courseID => $courseID);
-	my %params;
-
-	my $pfx  = 'WeBWorK::ContentGenerator';
-	my $ipfx = 'WeBWorK::ContentGenerator::Instructor';
+	# These will be used to construct the target URL.
+	my ($route, %args, %params);
 
 	my @error;
 
 	# Depending on which button was pushed, fill in values for URL construction.
-	if (defined $r->param('sets_assigned_to_user')) {
+	if (defined $c->param('sets_assigned_to_user')) {
 		if ($nusers == 1) {
-			$module = "${ipfx}::UserDetail";
+			$route = 'instructor_user_detail';
 			$args{userID} = $firstUserID;
 		} else {
 			push @error, E_ONE_USER;
 		}
-	} elsif (defined $r->param('users_assigned_to_set')) {
+	} elsif (defined $c->param('users_assigned_to_set')) {
 		if ($nsets == 1) {
-			$module = "${ipfx}::UsersAssignedToSet";
+			$route = 'instructor_users_assigned_to_set';
 			$args{setID} = $firstSetID;
 		} else {
 			push @error, E_ONE_SET;
 		}
-	} elsif (defined $r->param('edit_sets')) {
+	} elsif (defined $c->param('edit_sets')) {
 		if ($nsets == 1) {
-			$module = "${ipfx}::ProblemSetDetail";
+			$route = 'instructor_set_detail';
 			$args{setID} = $firstSetID;
 		} else {
 			push @error, E_ONE_SET;
 		}
-	} elsif (defined $r->param('prob_lib')) {
+	} elsif (defined $c->param('prob_lib')) {
 		if ($nsets == 1) {
-			$module = "${ipfx}::SetMaker";
+			$route = 'instructor_set_maker';
 			$params{local_sets} = $firstSetID;
 		} elsif ($nsets == 0) {
-			$module = "${ipfx}::SetMaker";
+			$route = 'instructor_set_maker';
 		} else {
 			push @error, E_ONE_SET;
 		}
-	} elsif (defined $r->param('user_stats')) {
+	} elsif (defined $c->param('user_stats')) {
 		if ($nusers == 1) {
-			$module         = "${ipfx}::Stats";
-			$args{statType} = 'student';
-			$args{userID}   = $firstUserID;
+			$route = 'instructor_user_statistics';
+			$args{userID} = $firstUserID;
 		} else {
 			push @error, E_ONE_USER;
 		}
-	} elsif (defined $r->param('set_stats')) {
+	} elsif (defined $c->param('set_stats')) {
 		if ($nsets == 1) {
-			$module         = "${ipfx}::Stats";
-			$args{statType} = 'set';
-			$args{setID}    = $firstSetID;
+			$route = 'instructor_set_statistics';
+			$args{setID} = $firstSetID;
 		} else {
 			push @error, E_ONE_SET;
 		}
-	} elsif (defined $r->param('user_progress')) {
+	} elsif (defined $c->param('user_progress')) {
 		if ($nusers == 1) {
-			$module         = "${ipfx}::StudentProgress";
-			$args{statType} = 'student';
-			$args{userID}   = $firstUserID;
+			$route = 'instructor_user_progress';
+			$args{userID} = $firstUserID;
 		} else {
 			push @error, E_ONE_USER;
 		}
-	} elsif (defined $r->param('set_progress')) {
+	} elsif (defined $c->param('set_progress')) {
 		if ($nsets == 1) {
-			$module         = "${ipfx}::StudentProgress";
+			$route          = 'instructor_set_progress';
 			$args{statType} = 'set';
 			$args{setID}    = $firstSetID;
 		} else {
 			push @error, E_ONE_SET;
 		}
-	} elsif (defined $r->param('user_options')) {
+	} elsif (defined $c->param('user_options')) {
 		if ($nusers == 1) {
-			$module = "${pfx}::Options";
+			$route = 'options';
 			$params{effectiveUser} = $firstUserID;
 		} else {
 			push @error, E_ONE_USER;
 		}
-	} elsif (defined $r->param('act_as_user')) {
-		if ($nusers == 1 and $nsets <= 1) {
+	} elsif (defined $c->param('act_as_user')) {
+		if ($nusers == 1 && $nsets <= 1) {
 			if ($nsets) {
-				# Unfortunately, we need to know what type of set it is to figure out the correct module.
-				my $set = $db->getGlobalSet($firstSetID);
-				if (defined($set) && $set->assignment_type =~ /gateway/) {
-					$module = "${pfx}::GatewayQuiz";
-				} else {
-					$module = "${pfx}::ProblemSet";
-				}
+				$route = 'problem_list';
 				$args{setID} = $firstSetID;
 			} else {
-				$module = "${pfx}::ProblemSets";
+				$route = 'set_list';
 			}
 			$params{effectiveUser} = $firstUserID;
 		} else {
 			push @error, E_ONE_USER    unless $nusers == 1;
 			push @error, E_MAX_ONE_SET unless $nsets <= 1;
 		}
-	} elsif (defined $r->param('edit_set_for_users')) {
+	} elsif (defined $c->param('edit_set_for_users')) {
 		if ($nusers >= 1 and $nsets == 1) {
-			$module              = "${ipfx}::ProblemSetDetail";
+			$route               = 'instructor_set_detail';
 			$args{setID}         = $firstSetID;
 			$params{editForUser} = \@selectedUserIDs;
 		} else {
@@ -170,11 +158,11 @@ sub pre_header_initialize {
 			push @error, E_ONE_SET      unless $nsets == 1;
 
 		}
-	} elsif (defined $r->param('create_set')) {
-		my $setname = format_set_name_internal($r->param("new_set_name") // '');
+	} elsif (defined $c->param('create_set')) {
+		my $setname = format_set_name_internal($c->param('new_set_name') // '');
 		if ($setname) {
 			if ($setname =~ /^[\w.-]*$/) {
-				$module                = "${ipfx}::SetMaker";
+				$route                 = 'instructor_set_maker';
 				$params{new_local_set} = 'Create a New Set in this Course';
 				$params{new_set_name}  = $setname;
 				$params{selfassign}    = 1;
@@ -184,421 +172,59 @@ sub pre_header_initialize {
 		} else {
 			push @error, E_SET_NAME;
 		}
-	} elsif (defined $r->param('add_users')) {
-		$module = "${ipfx}::AddUsers";
-	} elsif (defined $r->param('email_users')) {
-		$module = "${ipfx}::SendMail";
-	} elsif (defined $r->param('transfer_files')) {
-		$module = "${ipfx}::FileManager";
+	} elsif (defined $c->param('add_users')) {
+		$route = 'instructor_add_users';
+	} elsif (defined $c->param('email_users')) {
+		$route = 'instructor_mail_merge';
+	} elsif (defined $c->param('transfer_files')) {
+		$route = 'instructor_file_manager';
 	}
 
-	push @error, 'You are not allowed to act as a student.'
-		if (defined $r->param('act_as_user') && !$authz->hasPermissions($userID, 'become_student'));
-	push @error, 'You are not allowed to modify homework sets.'
-		if ((defined $r->param('edit_sets') || defined $r->param('edit_set_for_users'))
+	push @error, x('You are not allowed to act as a student.')
+		if (defined $c->param('act_as_user') && !$authz->hasPermissions($userID, 'become_student'));
+	push @error, x('You are not allowed to modify homework sets.')
+		if ((defined $c->param('edit_sets') || defined $c->param('edit_set_for_users'))
 			&& !$authz->hasPermissions($userID, 'modify_problem_sets'));
-	push @error, 'You are not allowed to assign homework sets.'
-		if ((defined $r->param('sets_assigned_to_user') || defined $r->param('users_assigned_to_set'))
+	push @error, x('You are not allowed to assign homework sets.')
+		if ((defined $c->param('sets_assigned_to_user') || defined $c->param('users_assigned_to_set'))
 			&& !$authz->hasPermissions($userID, 'assign_problem_sets'));
-	push @error, 'You are not allowed to modify student data.'
-		if ((defined $r->param('user_options') || defined $r->param('user_options'))
+	push @error, x('You are not allowed to modify student data.')
+		if ((defined $c->param('user_options') || defined $c->param('user_options'))
 			&& !$authz->hasPermissions($userID, 'modify_student_data'));
 
 	if (@error) {
 		# Handle errors
-		$self->addbadmessage(
-			CGI::div({ class => 'd-flex flex-column gap-1' }, map { CGI::div($r->maketext($_)) } @error));
-	} elsif ($module) {
+		$c->addbadmessage($c->c(map { $c->maketext($_) } @error)->join($c->tag('br')));
+	} elsif ($route) {
 		# Redirect to target page
-		my $page = $urlpath->newFromModule($module, $r, %args);
-		my $url  = $self->systemLink($page, params => \%params);
-		$self->reply_with_redirect($url);
+		$c->reply_with_redirect($c->systemLink($c->url_for($route, %args), params => \%params));
+		return;
 	}
-}
-
-sub body {
-	my ($self)     = @_;
-	my $r          = $self->r;
-	my $db         = $r->db;
-	my $ce         = $r->ce;
-	my $authz      = $r->authz;
-	my $courseName = $self->{courseName};
-	my $user       = $r->param('user');
-
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-		'You are not authorized to access the Instructor tools.')
-		unless $authz->hasPermissions($user, 'access_instructor_tools');
-
-	print CGI::p(
-		$r->maketext(
-			'Use the interface below to quickly access commonly-used instructor tools, '
-				. 'or select a tool from the list to the left.'
-		),
-		CGI::br(),
-		$r->maketext('Select user(s) and/or set(s) below and click the action button of your choice.')
-	);
 
 	# Get all users except the set level proctors, and restrict to the sections or recitations that are allowed for the
 	# user if such restrictions are defined.  This list is sorted by last_name, then first_name, then user_id.
-	my @Users = $db->getUsersWhere(
-		{
-			user_id => { not_like => 'set_id:%' },
-			$ce->{viewable_sections}{$user} || $ce->{viewable_recitations}{$user}
-			? (
-				-or => [
-					$ce->{viewable_sections}{$user}    ? (section    => $ce->{viewable_sections}{$user})    : (),
-					$ce->{viewable_recitations}{$user} ? (recitation => $ce->{viewable_recitations}{$user}) : ()
-				]
-				)
-			: ()
-		},
-		[qw/last_name first_name user_id/]
-	);
-
-	my @GlobalSets = $db->getGlobalSetsWhere();
-
-	my @selected_users = $r->param('selected_users');
-	my @selected_sets  = $r->param('selected_sets');
-
-	print CGI::start_form({ method => 'post', id => 'instructor-tools-form', action => $r->uri() });
-	print $self->hidden_authen_fields();
-
-	print CGI::div(
-		{ class => 'row gx-3' },
-		CGI::div(
-			{ class => 'col-xl-5 col-md-6 mb-2' },
-			CGI::div(
-				{ class => 'fw-bold text-center' },
-				CGI::label({ for => 'selected_users' }, $r->maketext('Users'))
-			),
-			scrollingRecordList(
-				{
-					name            => 'selected_users',
-					request         => $r,
-					default_sort    => 'lnfn',
-					default_format  => 'lnfn_uid',
-					default_filters => ['all'],
-					attrs           => {
-						size     => 10,
-						multiple => 1
-					}
-				},
-				@Users
-			)
-		),
-		CGI::div(
-			{ class => 'col-xl-5 col-md-6 mb-2' },
-			CGI::div(
-				{ class => 'fw-bold text-center' },
-				CGI::label({ for => 'selected_sets' }, $r->maketext('Sets'))
-			),
-			scrollingRecordList(
-				{
-					name            => 'selected_sets',
-					request         => $r,
-					default_sort    => 'set_id',
-					default_format  => 'sid',
-					default_filters => ['all'],
-					attrs           => {
-						size     => 10,
-						multiple => 1,
-						dir      => 'ltr'
-					}
-				},
-				@GlobalSets
-			)
-		)
-		),
-		CGI::div(
-			{ class => 'row gx-3' },
-			CGI::div(
-				{ class => 'col-xl-5 col-md-6 mb-2' },
-				CGI::div(
-					{ class => 'input-group input-group-sm mb-2' },
-					CGI::submit({
-						name              => 'sets_assigned_to_user',
-						label             => $r->maketext('View/Edit'),
-						class             => 'btn btn-sm btn-secondary',
-						data_users_needed => 'exactly one',
-						data_error_users  => $r->maketext(E_ONE_USER)
-					}),
-					CGI::span(
-						{ class => 'input-group-text flex-grow-1', style => 'white-space:pre;' },
-						$r->maketext('all set dates for one <b>user</b>')
-					)
-				),
-				CGI::div(
-					{ class => 'input-group input-group-sm mb-2' },
-					CGI::submit({
-						name       => 'edit_users',
-						label      => $r->maketext('Edit'),
-						class      => 'btn btn-sm btn-secondary',
-						formaction => $self->systemLink($r->urlpath->newFromModule(
-							'WeBWorK::ContentGenerator::Instructor::UserList',
-							$r, courseID => $self->{courseName}
-						)),
-						data_users_needed => 'at least one',
-						data_error_users  => $r->maketext(E_MIN_ONE_USER)
-					}),
-					CGI::span(
-						{ class => 'input-group-text flex-grow-1', style => 'white-space:pre;' },
-						$r->maketext('class list data for selected <b>users</b>')
-					)
-				),
-				CGI::div(
-					{ class => 'input-group input-group-sm mb-2' },
-					CGI::submit({
-						name              => 'user_stats',
-						label             => $r->maketext('Statistics'),
-						class             => 'btn btn-sm btn-secondary',
-						data_users_needed => 'exactly one',
-						data_error_users  => $r->maketext(E_ONE_USER)
-					}),
-					CGI::span({ class => 'input-group-text' }, $r->maketext('or')),
-					CGI::submit({
-						name              => 'user_progress',
-						label             => $r->maketext('progress'),
-						class             => 'btn btn-sm btn-secondary',
-						data_users_needed => 'exactly one',
-						data_error_users  => $r->maketext(E_ONE_USER)
-					}),
-					CGI::span(
-						{ class => 'input-group-text flex-grow-1', style => 'white-space:pre;' },
-						$r->maketext('for one <b>user</b>')
+	$c->stash->{users} = [
+		$db->getUsersWhere(
+			{
+				user_id => { not_like => 'set_id:%' },
+				$ce->{viewable_sections}{$userID} || $ce->{viewable_recitations}{$userID}
+				? (
+					-or => [
+						$ce->{viewable_sections}{$userID} ? (section => $ce->{viewable_sections}{$userID}) : (),
+						$ce->{viewable_recitations}{$userID}
+						? (recitation => $ce->{viewable_recitations}{$userID})
+						: ()
+					]
 					)
-				),
-				CGI::div(
-					{ class => 'input-group input-group-sm mb-2' },
-					CGI::submit({
-						name              => 'user_options',
-						label             => $r->maketext('Change Password'),
-						class             => 'btn btn-sm btn-secondary',
-						data_users_needed => 'exactly one',
-						data_error_users  => $r->maketext(E_ONE_USER)
-					}),
-					CGI::span(
-						{ class => 'input-group-text flex-grow-1', style => 'white-space:pre;' },
-						$r->maketext('for one <b>user</b>')
-					)
-				),
-				CGI::div(
-					{ class => 'input-group input-group-sm mb-2' },
-					CGI::submit({
-						name  => 'add_users',
-						label => $r->maketext('Add'),
-						class => 'btn btn-sm btn-secondary'
-					}),
-					CGI::span(
-						{ class => 'input-group-text flex-grow-1', style => 'white-space:pre;' },
-						$r->maketext('new users')
-					)
-				),
-			),
-			CGI::div(
-				{ class => 'col-xl-5 col-md-6 mb-2 font-sm' },
-				CGI::div(
-					{ class => 'input-group input-group-sm mb-2' },
-					CGI::submit({
-						name             => 'users_assigned_to_set',
-						label            => $r->maketext('View/Edit'),
-						class            => 'btn btn-sm btn-secondary',
-						data_sets_needed => 'exactly one',
-						data_error_sets  => $r->maketext(E_ONE_SET)
-					}),
-					CGI::span(
-						{ class => 'input-group-text flex-grow-1', style => 'white-space:pre;' },
-						$r->maketext('all users for one <b>set</b>')
-					)
-				),
-				CGI::div(
-					{ class => 'input-group input-group-sm mb-2' },
-					CGI::submit({
-						name             => 'edit_sets',
-						label            => $r->maketext('Edit'),
-						class            => 'btn btn-sm btn-secondary',
-						data_sets_needed => 'exactly one',
-						data_error_sets  => $r->maketext(E_ONE_SET)
-					}),
-					CGI::span(
-						{ class => 'input-group-text', style => 'white-space:pre;' },
-						$r->maketext('one <b>set</b>')
-					),
-					CGI::span({ class => 'input-group-text' }, $r->maketext('or')),
-					CGI::submit({
-						name             => 'prob_lib',
-						label            => $r->maketext('add problems'),
-						class            => 'btn btn-sm btn-secondary',
-						data_sets_needed => 'exactly one',
-						data_error_sets  => $r->maketext(E_ONE_SET)
-					}),
-					CGI::span(
-						{ class => 'input-group-text flex-grow-1', style => 'white-space:pre;' },
-						$r->maketext('to one <b>set</b>')
-					)
-				),
-				CGI::div(
-					{ class => 'input-group input-group-sm mb-2' },
-					CGI::submit({
-						name             => 'set_stats',
-						label            => $r->maketext('Statistics'),
-						class            => 'btn btn-sm btn-secondary',
-						data_sets_needed => 'exactly one',
-						data_error_sets  => $r->maketext(E_ONE_SET)
-					}),
-					CGI::span({ class => 'input-group-text' }, $r->maketext('or')),
-					CGI::submit({
-						name             => 'set_progress',
-						label            => $r->maketext('progress'),
-						class            => 'btn btn-sm btn-secondary',
-						data_sets_needed => 'exactly one',
-						data_error_sets  => $r->maketext(E_ONE_SET)
-					}),
-					CGI::span(
-						{ class => 'input-group-text flex-grow-1', style => 'white-space:pre;' },
-						$r->maketext('for one <b>set</b>')
-					)
-				),
-				CGI::div(
-					{ class => 'input-group input-group-sm mb-2' },
-					CGI::submit({
-						name       => 'score_sets',
-						label      => $r->maketext('Score'),
-						class      => 'btn btn-sm btn-secondary',
-						formaction => $self->systemLink($r->urlpath->newFromModule(
-							'WeBWorK::ContentGenerator::Instructor::Scoring',
-							$r, courseID => $self->{courseName}
-						)),
-						data_sets_needed => 'at least one',
-						data_error_sets  => $r->maketext(E_MIN_ONE_SET)
-					}),
-					CGI::span(
-						{ class => 'input-group-text flex-grow-1', style => 'white-space:pre;' },
-						$r->maketext('selected <b>sets</b>')
-					)
-				),
-				CGI::div(
-					{ class => 'input-group input-group-sm mb-2' },
-					CGI::submit({
-						name                        => 'create_set',
-						label                       => $r->maketext('Create'),
-						class                       => 'btn btn-sm btn-secondary',
-						data_set_name_needed        => 'true',
-						data_error_set_name         => $r->maketext(E_SET_NAME),
-						data_error_invalid_set_name => $r->maketext(E_BAD_NAME)
-					}),
-					CGI::label({ for => 'new_set_name', class => 'input-group-text' }, $r->maketext('new set:')),
-					CGI::textfield({
-						name        => 'new_set_name',
-						id          => 'new_set_name',
-						placeholder => $r->maketext("Name for new set here"),
-						size        => 20,
-						class       => 'form-control form-control-sm',
-						dir         => 'ltr'
-					})
-				)
-			)
-		),
-		CGI::div(
-			{ class => 'row gx-3' },
-			CGI::div(
-				{ class => 'col-xl-4 col-md-6 offset-md-3' },
-				CGI::div(
-					{ class => 'input-group input-group-sm mb-2' },
-					CGI::submit({
-						# This name is the same as the name of the submit button in Assigner.pm and the form is
-						# directly submitted to that module without modification.
-						name       => 'assign',
-						label      => $r->maketext('Assign'),
-						class      => 'btn btn-sm btn-secondary',
-						formaction => $self->systemLink($r->urlpath->newFromModule(
-							'WeBWorK::ContentGenerator::Instructor::Assigner',
-							$r, courseID => $self->{courseName}
-						)),
-						data_users_needed => 'at least one',
-						data_error_users  => $r->maketext(E_MIN_ONE_USER),
-						data_sets_needed  => 'at least one',
-						data_error_sets   => $r->maketext(E_MIN_ONE_SET)
-					}),
-					CGI::span(
-						{ class => 'input-group-text flex-grow-1', style => 'white-space:pre;' },
-						$r->maketext('selected <b>users</b> to selected <b>sets</b>')
-					)
-				),
-				CGI::div(
-					{ class => 'input-group input-group-sm mb-2' },
-					CGI::submit({
-						name              => 'act_as_user',
-						label             => $r->maketext('Act as'),
-						class             => 'btn btn-sm btn-secondary',
-						data_users_needed => 'exactly one',
-						data_error_users  => $r->maketext(E_ONE_USER),
-						data_sets_needed  => 'at most one',
-						data_error_sets   => $r->maketext(E_MAX_ONE_SET)
-					}),
-					CGI::span(
-						{ class => 'input-group-text flex-grow-1', style => 'white-space:pre;' },
-						$r->maketext('one <b>user</b> (on one <b>set</b>)')
-					)
-				),
-				CGI::div(
-					{ class => 'input-group input-group-sm mb-2' },
-					CGI::submit({
-						name              => 'edit_set_for_users',
-						label             => $r->maketext('Edit'),
-						class             => 'btn btn-sm btn-secondary',
-						data_users_needed => 'at least one',
-						data_error_users  => $r->maketext(E_MIN_ONE_USER),
-						data_sets_needed  => 'exactly one',
-						data_error_sets   => $r->maketext(E_ONE_SET)
-					}),
-					CGI::span(
-						{ class => 'input-group-text flex-grow-1', style => 'white-space:pre;' },
-						$r->maketext('one <b>set</b> for  <b>users</b>')
-					)
-				),
-				CGI::div(
-					{ class => 'input-group input-group-sm mb-2' },
-					CGI::submit({
-						name  => 'email_users',
-						label => $r->maketext('Email'),
-						class => 'btn btn-sm btn-secondary'
-					}),
-					CGI::span(
-						{ class => 'input-group-text flex-grow-1', style => 'white-space:pre;' },
-						$r->maketext('your students')
-					)
-				),
-				(
-					$authz->hasPermissions($user, 'manage_course_files')
-					? CGI::div(
-						{ class => 'input-group input-group-sm mb-2' },
-						CGI::submit({
-							name  => 'transfer_files',
-							label => $r->maketext('Transfer'),
-							class => 'btn btn-sm btn-secondary'
-						}),
-						CGI::span(
-							{ class => 'input-group-text flex-grow-1', style => 'white-space:pre;' },
-							$r->maketext('course files')
-						)
-					)
-					: ()
-				)
-			)
-		);
-
-	print CGI::end_form();
-
-	return '';
-}
-
-sub output_JS {
-	my $self = shift;
-	my $ce   = $self->r->ce;
+				: ()
+			},
+			[qw/last_name first_name user_id/]
+		)
+	];
 
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/InstructorTools/instructortools.js'), defer => undef }, '');
+	$c->stash->{globalSets} = [ $db->getGlobalSetsWhere ];
 
-	return '';
+	return;
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm b/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm
new file mode 100644
index 0000000000..72aee4bf16
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm
@@ -0,0 +1,96 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+# This page is for triggering LTI grade updates
+
+package WeBWorK::ContentGenerator::Instructor::LTIUpdate;
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
+
+use WeBWorK::Utils(qw(format_set_name_display getAssetURL));
+use WeBWorK::Authen::LTI::MassUpdate qw(mass_update);
+
+sub initialize ($c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
+
+	# Make sure these are defined for the template.
+	$c->stash->{sets}       = [];
+	$c->stash->{users}      = [];
+	$c->stash->{lastUpdate} = 0;
+
+	return unless ($c->authz->hasPermissions($c->param('user'), 'score_sets') && $ce->{LTIGradeMode});
+
+	$c->stash->{sets}       = [ sort $db->listGlobalSets ] if $ce->{LTIGradeMode} eq 'homework';
+	$c->stash->{users}      = [ sort $db->listUsers ];
+	$c->stash->{lastUpdate} = $db->getSettingValue('LTILastUpdate') || 0;
+
+	return unless ($c->param('updateLTI'));
+
+	my $setID       = $c->param('updateSetID');
+	my $userID      = $c->param('updateUserID');
+	my $prettySetID = format_set_name_display($setID // '');
+
+	# Test if setID and userID are valid.
+	if ($userID && !$db->getUser($userID)) {
+		$c->addbadmessage($c->maketext('Update aborted. Invalid user [_1].', $userID));
+		return;
+	}
+	if ($ce->{LTIGradeMode} eq 'homework' && $setID && !$db->getGlobalSet($setID)) {
+		$c->addbadmessage($c->maketext('Update aborted. Invalid set [_1].', $prettySetID));
+		return;
+	}
+
+	if ($setID && $userID && $ce->{LTIGradeMode} eq 'homework') {
+		$c->addgoodmessage($c->maketext('LTI update of user [_1] and set [_2] queued.', $userID, $prettySetID));
+	} elsif ($setID && $ce->{LTIGradeMode} eq 'homework') {
+		$c->addgoodmessage($c->maketext('LTI update of set [_1] queued.', $prettySetID));
+	} elsif ($userID) {
+		$c->addgoodmessage($c->maketext('LTI update of user [_1] queued.', $userID));
+	} else {
+		$c->addgoodmessage($ce->{LTIGradeMode} eq 'homework'
+			? $c->maketext('LTI update of all users and sets queued.')
+			: $c->maketext('LTI update of all users queued.'));
+	}
+
+	# Note that if somehow this point is reached with a setID and grade mode is "course",
+	# then the setID will be ignored by the job.
+
+	mass_update($c, 1, $userID, $setID);
+
+	return;
+}
+
+sub format_interval ($c, $seconds) {
+	my $minutes = int($seconds / 60);
+	my $hours   = int($minutes / 60);
+	my $days    = int($hours / 24);
+	my $out     = '';
+
+	return $c->maketext('0 seconds') unless $seconds > 0;
+
+	$seconds = $seconds - 60 * $minutes;
+	$minutes = $minutes - 60 * $hours;
+	$hours   = $hours - 24 * $days;
+
+	$out .= $c->maketext('[quant,_1,day]',    $days) . ' '    if $days;
+	$out .= $c->maketext('[quant,_1,hour]',   $hours) . ' '   if $hours;
+	$out .= $c->maketext('[quant,_1,minute]', $minutes) . ' ' if $minutes;
+	$out .= $c->maketext('[quant,_1,second]', $seconds) . ' ' if $seconds;
+	chop($out);
+
+	return $out;
+}
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm b/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm
index a4d16eb33a..c358ddc747 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,2088 +14,1340 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Instructor::PGProblemEditor;
-use base qw(WeBWorK);
-use base qw(WeBWorK::ContentGenerator::Instructor);
-use base qw(WeBWorK::ContentGenerator::renderViaXMLRPC);
-
-use constant DEFAULT_SEED => 123456;
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
 WeBWorK::ContentGenerator::Instructor::PGProblemEditor - Edit a pg file
 
+This editor will edit problem files, set header files, hardcopy theme files,
+or files such as course_info whose name is defined in the defaults.config file.
+
+Only files under the template directory (or linked to this location) can be
+edited.
+
+Editable hardcopy themes are in the directory defined by
+$ce->{courseDirs}{hardcopyThemes}
+
+The course information and problems are located in the course templates
+directory.  Course information has the name defined by
+$ce->{courseFiles}{course_info}
+
+editMode = temporaryFile | savedFile
+
+This flag is read by Problem.pm and ProblemSet.pm (perhaps others).
+
+The value of temporaryFile means view the temp file defined by
+fname.user_name.tmp instead of the file fname.
+
+The value of savedFile means to use fname directly.
+
+The suffix for a temporary file is "user_name.tmp" by default.
+
+=head2 File types (file_type) which can be edited.
+
+=over
+
+=item problem
+
+This is the most common type. This editor can be called by an instructor when
+viewing any problem.  The information for retrieving the source file is found
+using the problemID in order to look look up the source file path.
+
+=item source_path_for_problem_file
+
+This is the same as the 'problem' file type except that the source for the
+problem is found in the parameter $r->param('sourceFilePath').  This path is
+relative to the templates directory
+
+=item set_header
+
+This is a special case of editing the problem.  The set header is often listed
+as problem 0 in the set's list of problems.
+
+=item hardcopy_header
+
+This is a special case of editing the problem.  The hardcopy_header is often
+listed as problem 0 in the set's list of problems.  But it is used instead of
+set_header when producing a hardcopy of the problem set in the TeX format,
+instead of producing HTML formatted version for use on the computer screen.
+
+=item hardcopy_theme
+
+This allows editing of a hardcopy theme file, which defines snippets of tex
+code to be inserted before and after problems in a hardcopy.  It can be called
+from this module when using the Hardcopy tab.
+
+=item course_info
+
+This allows editing of the course_info.txt file which gives general information
+about the course.  It is called from the ProblemSets.pm module.
+
+=item blank_problem
+
+This is a special case which allows one to create and edit a new PG problem.
+The "stationary" source for this problem is stored in the assets/pg directory
+and defined in defaults.config as
+$webworkFiles{screenSnippets}{blankProblem}
+
+=back
+
+=head2 Action
+
+The behavior on submit is defined by the value of $file_type and the value of
+the submit button pressed (the action).
+
+    Requested actions and aliases
+        View/Reload                action = view
+        Generate Hardcopy:         action = hardcopy
+        Tidy Code:                 action = pgtidy
+        Save:                      action = save
+        Save as:                   action = save_as
+        Append:                    action = add_problem
+        Revert:                    action = revert
+
+An undefined or invalid action is interpreted as an initial edit of the file.
+
+=head2 Notes
+
+The editFilePath and tempFilePath should always be set.  The tempFilePath may
+not exist.  The path to the actual file being edited is stored in inputFilePath.
+
 =cut
 
-use strict;
-use warnings;
-use WeBWorK::CGI;
-use WeBWorK::Utils qw(readFile surePathToFile path_is_subdir jitar_id_to_seq seq_to_jitar_id x getAssetURL
-	format_set_name_display);
-use HTML::Entities;
-use URI::Escape;
-use WeBWorK::Utils qw(has_aux_files not_blank);
 use File::Copy;
-use File::Basename qw(dirname);
-use WeBWorK::Utils::Tasks qw(fake_user fake_set renderProblems);
-use WeBWorK::ContentGenerator::Instructor::CodeMirrorEditor;
-use Fcntl;
-
-###########################################################
-# This editor will edit problem files or set header files or files, such as course_info
-# whose name is defined in the defaults.config file
-#
-# Only files under the template directory ( or linked to this location) can be edited.
-#
-# The course information and problems are located in the course templates directory.
-# Course information has the name  defined by courseFiles->{course_info}
-#
-# Only files under the template directory ( or linked to this location) can be edited.
-#
-# editMode = temporaryFile    (view the temp file defined by course_info.txt.user_name.tmp
-#                              instead of the file course_info.txt)
-#            this flag is read by Problem.pm and ProblemSet.pm, perhaps others
-# The TEMPFILESUFFIX is "user_name.tmp" by default.  It's definition should be moved to Instructor.pm #FIXME
-###########################################################
-
-###########################################################
-# The behavior of this module is essentially defined
-# by the values of $file_type and the submit button which is placed in $action
-#############################################################
-#  File types which can be edited
-#
-#  file_type  eq 'problem'
-#                 this is the most common type -- this editor can be called by an instructor when viewing any problem.
-#                 the information for retrieving the source file is found using the problemID in order to look
-#                 look up the source file path.
-#
-#  file_type  eq 'source_path_for_problem_file'
-#                 This is the same as the 'problem' file type except that the source for the problem is found in
-#                 the parameter $r->param('sourceFilePath').  This path is relative to the templates directory
-#
-#  file_type  eq 'set_header'
-#                 This is a special case of editing the problem.  The set header is often listed as problem 0 in the set's list of problems.
-#
-#  file_type  eq 'hardcopy_header'
-#                  This is a special case of editing the problem.  The hardcopy_header is often listed as problem 0 in the set's list of problems.
-#                  But it is used instead of set_header when producing a hardcopy of the problem set in the TeX format, instead of producing HTML
-#                  formatted version for use on the computer screen.
-#
-#  file_type eq 'course_info'
-#                 This allows editing of the course_info.txt file which gives general information about the course.  It is called from the
-#                 ProblemSets.pm module.
-#
-#  file_type eq 'options_info'
-#                 This allows editing of the options_info.txt file which gives general information about the course.  It is called from the
-#                 Options.pm module.
-#
-#  file_type  eq 'blank_problem'
-#                 This is a special call which allows one to create and edit a new PG problem.  The "stationery" source for this problem is
-#                 stored in the conf/snippets directory and defined in defaults.config by $webworkFiles{screenSnippets}{blankProblem}
-#############################################################
-# Requested actions  -- these and the file_type determine the state of the module
-#      Save                       ---- action = save
-#      Save as                    ---- action = save_as
-#      View Problem               ---- action = view
-#      Add this problem to:       ---- action = add_problem
-#      Make this set header for:  ---- action = add_problem
-#      Revert                     ---- action = revert
-#      no submit button defined   ---- action = fresh_edit
-###################################################
-#
-# Determining which is the correct path to the file is a mess!!! FIXME
-# The path to the file to be edited is eventually put in tempFilePath
-#
-#  (tempFilePath)(editFilePath)(forcedSourceFile)
-#input parameter is:  sourceFilePath
-#################################################################
-# params read
-# user
-# effectiveUser
-# submit
-# file_type
-# problemSeed
-# displayMode
-# edit_level
-# make_local_copy
-# sourceFilePath
-# problemContents
-# save_to_new_file
-#
+use XML::LibXML;
 
-#hiding add_problem option to see if its needed
-use constant ACTION_FORMS => [qw(view save save_as add_problem revert)];
-use constant ACTION_FORM_TITLES => { # editor tabs
-	view        => x("View"),
-	add_problem => x("Append"),
-	save        => x("Update"),
-	save_as     => x("New Version"),
-	revert      => x("Revert"),
-};
+use WeBWorK::Utils qw(jitar_id_to_seq not_blank path_is_subdir seq_to_jitar_id x
+	surePathToFile readDirectory readFile max format_set_name_display);
+use WeBWorK::Utils::Instructor qw(assignProblemToAllSetUsers addProblemToSet);
+
+use constant DEFAULT_SEED => 123456;
 
-# permissions needed to perform a given action
-use constant FORM_PERMS => {
-	view => "modify_student_data",
-	add_problem => "modify_student_data",
-	make_local_copy => "modify_student_data",
-	save => "modify_student_data",
-	save_as => "modify_student_data",
-	revert => "modify_student_data",
+# Editor tabs
+use constant ACTION_FORMS => [qw(view hardcopy pgtidy save save_as add_problem revert)];
+use constant ACTION_FORM_TITLES => {
+	view        => x('View/Reload'),
+	hardcopy    => x('Generate Hardcopy'),
+	pgtidy      => x('Tidy Code'),
+	save        => x('Save'),
+	save_as     => x('Save As'),
+	add_problem => x('Append'),
+	revert      => x('Revert'),
 };
 
-our $BLANKPROBLEM = 'blankProblem.pg';
-
-sub pre_header_initialize {
-	my ($self)         = @_;
-	my $r              = $self->r;
-	my $ce             = $r->ce;
-	my $urlpath        = $r->urlpath;
-	my $authz          = $r->authz;
-	my $user           = $r->param('user');
-	$self->{courseID}   = $urlpath->arg("courseID");
-	$self->{setID}      = $r->urlpath->arg("setID") ;  # using $r->urlpath->arg("setID")  ||'' causes trouble with set 0!!!
-	$self->{problemID}  = $r->urlpath->arg("problemID");
-
-	# parse setID, which may come in with version data
-	my $fullSetID = $self->{setID};
-	if (defined($fullSetID) ) {
-		if ( $fullSetID =~ /,v(\d+)$/ ) {
-			$self->{versionID} = $1;
-			$self->{setID} =~ s/,v\d+$//;
-		}
-		$self->{fullSetID} = $fullSetID;
-	}
+my $BLANKPROBLEM = 'newProblem.pg';
 
-	my $submit_button   = $r->param('submit');  # obtain submit command from form
-	my $actionID        = $r->param('action');
-	my $file_type       = $r->param("file_type") || '';
-	my $setName         = $self->{setID};
-	my $versionedSetName = $self->{fullSetID};
-	my $problemNumber   = $self->{problemID};
+sub pre_header_initialize ($c) {
+	my $ce    = $c->ce;
+	my $authz = $c->authz;
+	my $user  = $c->param('user');
 
 	# Check permissions
-	return unless ($authz->hasPermissions($user, "access_instructor_tools"));
-	return unless ($authz->hasPermissions($user, "modify_problem_sets"));
-
-	##############################################################################
-	# displayMode   and problemSeed
-	#
-	# Determine the display mode
-	# If $self->{problemSeed} was obtained within saveFileChanges from the problem_record
-	# then it can be overridden by the value obtained from the form.
-	# Insure that $self->{problemSeed} has some non-empty value
-	# displayMode and problemSeed
-	# will be needed for viewing the problem via redirect.
-	# They are also two of the parameters which can be set by the editor
-	##############################################################################
-
-	if (defined $r->param('displayMode')) {
-		$self->{displayMode} = $r->param('displayMode');
-	} else {
-		$self->{displayMode} = $ce->{pg}->{options}->{displayMode};
+	return
+		unless $authz->hasPermissions($user, 'access_instructor_tools')
+		&& $authz->hasPermissions($user, 'modify_problem_sets');
+
+	$c->{courseID}  = $c->stash('courseID');
+	$c->{setID}     = $c->stash('setID');
+	$c->{problemID} = $c->stash('problemID');
+
+	# Parse setID which may come in with version data
+	$c->{fullSetID} = $c->{setID};
+	if (defined $c->{fullSetID} && $c->{fullSetID} =~ /^([^,]*),v(\d+)$/) {
+		$c->{setID}     = $1;
+		$c->{versionID} = $2;
 	}
 
-	# form version of problemSeed overrides version obtained from the the problem_record
-	# inside saveFileChanges
-	$self->{problemSeed} = $r->param('problemSeed') if (defined $r->param('problemSeed'));
-	# Make sure that the problem seed has some value
-	$self->{problemSeed} = DEFAULT_SEED() unless not_blank($self->{problemSeed});
-
-	##############################################################################
-	#############################################################################
-	# Save file to permanent or temporary file, then redirect for viewing
-	#############################################################################
-	#
-	#  Any file "saved as" should be assigned to "Undefined_Set" and redirected to be viewed again in the editor
-	#
-	#  Problems "saved" or 'refreshed' are to be redirected to the Problem.pm module
-	#  Set headers which are "saved" are to be redirected to the ProblemSet.pm page
-	#  Hardcopy headers which are "saved" are also to be redirected to the ProblemSet.pm page
-	#  Course_info files are redirected to the ProblemSets.pm page
-	#  Options_info files are redirected to the Options.pm page
-	##############################################################################
-
-	######################################
+	# Determine displayMode and problemSeed that are needed for viewing the problem.
+	# They are also two of the parameters which can be set by the editor.
+	# Note that the problem seed may be overridden by the value obtained from the problem record later.
+	$c->{displayMode} = $c->param('displayMode') // $ce->{pg}{options}{displayMode};
+	$c->{problemSeed} = (($c->param('problemSeed') // '') =~ s/^\s*|\s*$//gr) || DEFAULT_SEED();
+
+	# Save file to permanent or temporary file, then redirect for viewing if it was requested to view in a new window.
+	# Any problem file "saved as" should be assigned to "Undefined_Set" and redirected to be viewed again in the editor.
+	# Problems "saved" or 'refreshed' are to be redirected to the Problem.pm module
+	# Set headers which are "saved" are to be redirected to the ProblemSet.pm page
+	# Hardcopy headers which are "saved" are also to be redirected to the ProblemSet.pm page
+	# Course info files are redirected to the ProblemSets.pm page
+
 	# Insure that file_type is defined
-	######################################
-	# We have already read in the file_type parameter from the form
-
-	# If this has not been defined we are  dealing with a set header
-	# or regular problem
-	if ( not_blank($file_type) ) { #file_type is defined and is not blank
-		# file type is already defined -- do nothing
-		#warn "file type already defined as $file_type"  #FIXME debug
-	} else {
-		# if "sourceFilePath" is defined in the form, then we are getting the path directly.
-		# if the problem number is defined and is 0
-		# then we are dealing with some kind of
-		# header file.  The default is 'set_header' which prints properly
-		# to the screen.
-		# If the problem number is not zero, we are dealing with a real problem
-		######################################
-		if ( not_blank($r->param('sourceFilePath') )  ) {
-			$file_type ='source_path_for_problem_file';
-			$file_type = 'set_header' if $r->param('sourceFilePath') =~ m!/headers/|Header\.pg$!; #FIXME this need to be cleaned up
-		} elsif ( defined($problemNumber) ) {
-			if ( $problemNumber =~/^\d+$/ and $problemNumber == 0 ) {  # if problem number is numeric and zero
-				$file_type = 'set_header' unless  $file_type eq 'set_header'
-					or $file_type eq 'hardcopy_header';
+	$c->{file_type} = ($c->param('file_type') // '') =~ s/^\s*|\s*$//gr;
+
+	# If file_type has not been defined we are dealing with a set header or regular problem.
+	if (!$c->{file_type}) {
+		# If sourceFilePath is defined in the form, then the path will be obtained from that.
+		# If the problem number is defined and is 0 then a header file is being edited.
+		# If the problem number is not zero, a problem is being edited.
+		if (not_blank($c->param('sourceFilePath'))) {
+			$c->{file_type} =
+				$c->param('sourceFilePath') =~ m!/headers/|Header\.pg$! ? 'set_header' : 'source_path_for_problem_file';
+		} elsif (defined $c->{problemID}) {
+			if ($c->{problemID} == 0) {
+				$c->{file_type} = 'set_header';
 			} else {
-				$file_type = 'problem';
-				#warn "setting file type to 'problem'\n";  #FIXME debug
+				$c->{file_type} = 'problem';
 			}
+		} else {
+			$c->{file_type} = 'blank_problem';
 		}
 	}
 
-	die "The file_type variable |$file_type| has not been defined or is blank." unless not_blank($file_type);
-	# clean up sourceFilePath, just in case
-	# double check that sourceFilePath is relative to the templates file
-	if ($file_type eq 'source_path_for_problem_file' ) {
-		my $templatesDirectory = $ce->{courseDirs}->{templates};
-		my $sourceFilePath = $r->param('sourceFilePath');
-		$sourceFilePath =~ s/$templatesDirectory//;
-		$sourceFilePath =~ s|^/||;  # remove intial /
-		$self->{sourceFilePath} = $sourceFilePath;
+	# Clean up sourceFilePath and check that sourceFilePath is relative to the templates folder
+	if ($c->{file_type} eq 'source_path_for_problem_file') {
+		$c->{sourceFilePath} = $c->getRelativeSourceFilePath($c->param('sourceFilePath'));
 	}
-	$self->{file_type} = $file_type;
-	# $self->addgoodmessage("file type is $file_type");  #FIXME debug
-
-	##########################################
-	# File type is one of:     blank_problem course_info options_info problem set_header hardcopy_header source_path_for_problem_file
-	##########################################
-	#
-	# Determine the path to the file
-	#
-	###########################################
-	$self->getFilePaths($versionedSetName, $problemNumber, $file_type);
-	#defines $self->{editFilePath}   # path to the permanent file to be edited
-	#        $self->{tempFilePath}   # path to the permanent file to be edited  has .tmp suffix
-	#        $self->{inputFilePath}  # path to the file for input, (might be a .tmp file)
-
-	##########################################
+
+	# Initialize these values in case of failure in the getFilePaths method.
+	$c->{editFilePath}   = '';
+	$c->{tempFilePath}   = '';
+	$c->{inputFilePath}  = '';
+	$c->{backupBasePath} = '';
+
+	# Determine the paths for the file.
+	# getFilePath defines:
+	#   $c->{editFilePath}:    path to the permanent file to be edited
+	#   $c->{tempFilePath}:    path to the temporary file to be edited with .tmp suffix
+	#   $c->{inputFilePath}:   path to the file for input, (this is either the editFilePath or the tempFilePath)
+	#   $c->{backupBasePath}:  base path to the backup files
+	$c->getFilePaths;
+
 	# Default problem contents
-	##########################################
-	$self->{r_problemContents}= undef;
-
-	##########################################
-	#
-	# Determine action
-	#
-	###########################################
-
-	if ($actionID) {
-		unless (grep { $_ eq $actionID } @{ ACTION_FORMS() } ) {
-			die "Action $actionID not found";
-		}
-		# Check permissions
-		if (not FORM_PERMS()->{$actionID} or $authz->hasPermissions($user, FORM_PERMS()->{$actionID})) {
-			my $actionHandler = "${actionID}_handler";
-			my %genericParams =();
-			my %actionParams = $self->getActionParams($actionID);
-			my %tableParams = (); # $self->getTableParams();
-			$self->{action}= $actionID;
-			$self->$actionHandler(\%genericParams, \%actionParams, \%tableParams);
-		} else {
-			$self->addbadmessage( "You are not authorized to perform this action.");
-		}
-	} else {
-		$self->{action}='fresh_edit';
-		my $actionHandler = "fresh_edit_handler";
-		my %genericParams;
-		my %actionParams = (); #$self->getActionParams($actionID);
-		my %tableParams = (); # $self->getTableParams();
-		my $problemContents = '';
-		$self->{r_problemContents}=\$problemContents;
-		$self->$actionHandler(\%genericParams, \%actionParams, \%tableParams);
-	}
+	$c->{r_problemContents} = \'';
 
-	##############################################################################
-	# displayMode   and problemSeed
-	#
-	# Determine the display mode
-	# If $self->{problemSeed} was obtained within saveFileChanges from the problem_record
-	# then it can be overridden by the value obtained from the form.
-	# Insure that $self->{problemSeed} has some non-empty value
-	# displayMode and problemSeed
-	# will be needed for viewing the problem via redirect.
-	# They are also two of the parameters which can be set by the editor
-	##############################################################################
-
-	if (defined $r->param('displayMode')) {
-		$self->{displayMode} = $r->param('displayMode');
-	} else {
-		$self->{displayMode} = $ce->{pg}->{options}->{displayMode};
+	$c->{status_message} //= $c->c;
+
+	# Determine action.  If an invalid action is sent in, assume this is an initial edit.
+	$c->{action} = $c->param('action') // '';
+	if ($c->{action} && grep { $_ eq $c->{action} } @{ ACTION_FORMS() }) {
+		my $actionHandler = "$c->{action}_handler";
+		$c->$actionHandler;
 	}
 
-	# form version of problemSeed overrides version obtained from the the problem_record
-	# inside saveFileChanges
-	$self->{problemSeed} = $r->param('problemSeed') if (defined $r->param('problemSeed'));
-	# Make sure that the problem seed has some value
-	$self->{problemSeed} = DEFAULT_SEED() unless not_blank( $self->{problemSeed});
-
-	##############################################################################
-	# Return
-	#   If  file saving fails or
-	#   if no redirects are required. No further processing takes place in this subroutine.
-	#   Redirects are required only for the following submit values
-	#        'Save'
-	#        'Save as'
-	#        'Refresh'
-	#        add problem to set
-	#        add set header to set
-	#
-	#########################################
-
-	return if $self->{failure};
-	# FIXME: even with an error we still open a new page because of the target specified in the form
-
-	# Some cases do not need a redirect: save, refresh, save_as, add_problem_to_set, add_header_to_set,make_local_copy
-	my $action = $self->{action};
-	return ;
+	return;
 }
 
-sub initialize  {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $authz = $r->authz;
-	my $user = $r->param('user');
+sub initialize ($c) {
+	my $ce    = $c->ce;
+	my $db    = $c->db;
+	my $authz = $c->authz;
+	my $user  = $c->param('user');
+
+	# Make sure these are defined for the templates.
+	$c->stash->{problemContents}  = '';
+	$c->stash->{formsToShow}      = ACTION_FORMS();
+	$c->stash->{actionFormTitles} = ACTION_FORM_TITLES();
+	$c->stash->{hardcopyLabels}   = [];
+
+	# Tell the templates if we are working on a PG file
+	$c->{is_pg} = !$c->{file_type} || ($c->{file_type} ne 'course_info' && $c->{file_type} ne 'hardcopy_theme');
 
 	# Check permissions
-	return unless ($authz->hasPermissions($user, "access_instructor_tools"));
-	return unless ($authz->hasPermissions($user, "modify_problem_sets"));
-
-	my $file_type       = $r->param('file_type') || "";
-	my $tempFilePath    = $self->{tempFilePath}; # path to the file currently being worked with (might be a .tmp file)
-	my $inputFilePath   = $self->{inputFilePath};   # path to the file for input, (might be a .tmp file)
-
-	$self->addmessage($r->param('status_message') ||'');  # record status messages carried over if this is a redirect
-	$self->addbadmessage($r->maketext("Changes in this file have not yet been permanently saved.")) if -r $tempFilePath;
-	if ( not( -e $inputFilePath) ) {
-		$self->addbadmessage($r->maketext("The file '[_1]' cannot be found.", $self->shortPath($inputFilePath)));
-	} elsif ((not -w $inputFilePath) && $file_type ne 'blank_problem' ) {
-		$self->addbadmessage($r->maketext("The file '[_1]' is protected!", $self->shortPath($inputFilePath)).CGI::br().
-			$r->maketext("To edit this text you must first make a copy of this file using the 'NewVersion' action below."));
-	}
-	if ($inputFilePath =~/$BLANKPROBLEM$/ && $file_type ne 'blank_problem') {
-		$self->addbadmessage($r->maketext("The file '[_1]' is a blank problem!",
-				$self->shortPath($inputFilePath)).CGI::br().
-			$r->maketext("To edit this text you must use the 'NewVersion' action below to save it to another file."));
+	return
+		unless $authz->hasPermissions($user, 'access_instructor_tools')
+		&& $authz->hasPermissions($user, 'modify_problem_sets');
+
+	# Record status messages carried over if this is a redirect
+	$c->addmessage($c->param('status_message') || '');
+
+	$c->addbadmessage($c->maketext('Changes in this file have not yet been permanently saved.'))
+		if $c->{inputFilePath} eq $c->{tempFilePath} && -r $c->{tempFilePath};
+
+	if (!-e $c->{inputFilePath}) {
+		$c->addbadmessage($c->maketext('The file "[_1]" cannot be found.', $c->shortPath($c->{inputFilePath})));
+	} elsif (!-w $c->{inputFilePath} && $c->{file_type} ne 'blank_problem') {
+		$c->addbadmessage($c->maketext(
+			'The file "[_1]" is protected. You may use "Save As" to create a new file.',
+			$c->shortPath($c->{inputFilePath})
+		));
 	}
-}
 
-sub path {
-	my ($self, $args) = @_;
-	my $r                   = $self->r;
-	my $urlpath             = $r->urlpath;
-	my $courseName          = $urlpath->arg("courseID");
-	my $setName             = $urlpath->arg("setID")     || '';
-	my $problemNumber       = $urlpath->arg("problemID") || '';
-	my $prettyProblemNumber = $problemNumber;
-	my $isGateway           = 0;
-
-	if ($setName) {
-		my $set = $r->db->getGlobalSet($setName);
-		$prettyProblemNumber = join('.', jitar_id_to_seq($problemNumber))
-			if ($set && $set->assignment_type eq 'jitar' && $problemNumber);
-		$isGateway = 1 if $set && $set->assignment_type =~ /gateway/;
+	if ($c->{file_type} eq 'blank_problem') {
+		$c->addbadmessage($c->maketext('This file is a template. You may use "Save As" to create a new file.'));
+	} elsif ($c->{inputFilePath} =~ /$BLANKPROBLEM$/) {
+		$c->addbadmessage($c->maketext(
+			'The file "[_1]" is a template. You may use "Save As" to create a new file.',
+			$c->shortPath($c->{inputFilePath})
+		));
 	}
 
-	# We need to build a path to the problem being edited by hand, since it is not the same as the urlpath.
-	# The breadcrumb path for the problem number leads back to the problem being edited for a regular set,
-	# and is not a link for a problem in a gateway quiz.
-	my @path = (
-		'WeBWorK'              => $r->location,
-		$courseName            => $r->location . "/$courseName",
-		$setName               => $r->location . "/$courseName/$setName",
-		$prettyProblemNumber   => $isGateway ? '' : $r->location . "/$courseName/$setName/$problemNumber",
-		$r->maketext("Editor") => ''
-	);
+	# Find the text for the editor, either in the temporary file if it exists, in the original file in the template
+	# directory, or in the problem contents gathered in the initialization phase.
 
-	print $self->pathMacro($args, @path);
+	my $problemContents = ${ $c->{r_problemContents} };
 
-	return '';
-}
-
-sub title {
-	my $self = shift;
-	my $r = $self->r;
-	my $courseName    = $r->urlpath->arg("courseID");
-	my $setID         = $r->urlpath->arg("setID");
-	my $problemNumber = $r->urlpath->arg("problemID");
-	my $file_type = $self->{'file_type'} || '';
-
-	return "Set Header for  set $setID" if ($file_type eq 'set_header');
-	return "Hardcopy Header for set $setID" if ($file_type eq 'hardcopy_header');
-	return "Course Information for course $courseName" if ($file_type eq 'course_info');
-	return "Options Information" if ($file_type eq 'options_info');
+	unless ($problemContents =~ /\S/) {    # non-empty contents
+		if (-r $c->{tempFilePath} && !-d $c->{tempFilePath}) {
+			if (path_is_subdir($c->{tempFilePath}, $ce->{courseDirs}{templates}, 1)) {
+				eval { $problemContents = readFile($c->{tempFilePath}) };
+				$problemContents = $@ if $@;
+				$c->{inputFilePath} = $c->{tempFilePath};
+			} else {
+				$c->stash->{file_error} = $c->maketext('Unable to open a temporary file at the given location.');
+			}
+		} elsif (-r $c->{editFilePath} && !-d $c->{editFilePath}) {
+			if (path_is_subdir($c->{editFilePath}, $ce->{courseDirs}{templates}, 1)
+				|| $c->{editFilePath} eq $ce->{webworkFiles}{screenSnippets}{setHeader}
+				|| $c->{editFilePath} eq $ce->{webworkFiles}{hardcopySnippets}{setHeader}
+				|| $c->{editFilePath} eq $ce->{webworkFiles}{screenSnippets}{blankProblem}
+				|| $c->{editFilePath} =~ m|^$ce->{webworkDirs}{hardcopyThemes}/[^/]*\.xml$|)
+			{
+				eval { $problemContents = readFile($c->{editFilePath}) };
+				$problemContents = $@ if $@;
+				$c->{inputFilePath} = $c->{editFilePath};
 
-	if ($setID) {
-		my $set = $r->db->getGlobalSet($setID);
-		if ($set && $set->assignment_type eq 'jitar') {
-			$problemNumber = join('.',jitar_id_to_seq($problemNumber));
+			} else {
+				$c->stash->{file_error} = $c->maketext('The given file path is not a valid location.');
+			}
+		} else {
+			# File not existing is not an error
+			$problemContents = '';
 		}
 	}
 
-	return $r->maketext('Problem [_1]', $problemNumber);
-}
-
-sub body {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $db = $r->db;
-	my $ce = $r->ce;
-	my $authz = $r->authz;
-	my $user = $r->param('user');
-	my $make_local_copy = $r->param('make_local_copy');
+	$c->stash->{problemContents} = $problemContents;
 
-	# Check permissions
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-		"You are not authorized to access the Instructor tools.")
-		unless $authz->hasPermissions($user, "access_instructor_tools");
-
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' }, "You are not authorized to modify problems.")
-		unless $authz->hasPermissions($user, "modify_student_data");
-
-	# Gathering info
-	my $editFilePath    = $self->{editFilePath}; # path to the permanent file to be edited
-	my $tempFilePath    = $self->{tempFilePath}; # path to the file currently being worked with (might be a .tmp file)
-	my $inputFilePath   = $self->{inputFilePath};   # path to the file for input, (might be a .tmp file)
-	my $setName         = $self->{setID} // ''; # Allow the numeric set name 0.
-	my $problemNumber   = $self->{problemID} ;
-	my $fullSetName = defined( $self->{fullSetID} ) ? $self->{fullSetID} : $setName;
-	$problemNumber      = defined($problemNumber) ? $problemNumber : '';
-
-	#########################################################################
-	# Construct url for reporting bugs:
-	#########################################################################
-
-	my $libraryName = '';
-	if ($editFilePath =~ m|([^/]*)Library|)   {  #find the path to the file
-		# find the library, if any exists in the path name (first library is picked)
-		my $tempLibraryName = $1;
-		$libraryName = (not_blank($tempLibraryName)) ? $tempLibraryName : "Library";
-		# things that start /Library/setFoo/probBar  are labeled as component "Library"
-		# which refers to the SQL based problem library. (is nationalLibrary a better name?)
-	} else {
-		$libraryName = 'Library';  # make sure there is some default component defined.
+	# Get labels for the hardcopy themes, so the templates can use them.
+	my %hardcopyLabels;
+	opendir(my $dhS, $ce->{webworkDirs}{hardcopyThemes}) || die "can't opendir $ce->{webworkDirs}{hardcopyThemes}: $!";
+	for my $hardcopyTheme (grep {/\.xml$/} sort readdir($dhS)) {
+		my $themeTree = XML::LibXML->load_xml(location => "$ce->{webworkDirs}{hardcopyThemes}/$hardcopyTheme");
+		$hardcopyLabels{$hardcopyTheme} = $themeTree->findvalue('/theme/@label') || $hardcopyTheme;
+	}
+	my @hardcopyThemesCourse;
+	if (opendir(my $dhC, $ce->{courseDirs}{hardcopyThemes})) {
+		@hardcopyThemesCourse = grep {/\.xml$/} sort readdir($dhC);
+	}
+	for my $hardcopyTheme (@hardcopyThemesCourse) {
+		my $themeTree = XML::LibXML->load_xml(location => "$ce->{courseDirs}{hardcopyThemes}/$hardcopyTheme");
+		$hardcopyLabels{$hardcopyTheme} = $themeTree->findvalue('/theme/@label') || $hardcopyTheme;
 	}
+	my $hardcopyThemesAvailable = [
+		sort(do {
+			my %seen;
+			grep { !$seen{$_}++ } (@{ $ce->{hardcopyThemes} }, @hardcopyThemesCourse);
+		})
+	];
+
+	$c->stash->{hardcopyLabels}          = \%hardcopyLabels;
+	$c->stash->{hardcopyThemesAvailable} = $hardcopyThemesAvailable;
+
+	$c->{prettyProblemNumber} = $c->{problemID} // '';
+	$c->{set}                 = $c->db->getGlobalSet($c->{setID}) if $c->{setID};
+	$c->{prettyProblemNumber} = join('.', jitar_id_to_seq($c->{prettyProblemNumber}))
+		if $c->{set} && $c->{set}->assignment_type eq 'jitar';
+
+	return;
+}
 
-	my $BUGZILLA = "$ce->{webworkURLs}{bugReporter}?product=Problem%20libraries".
-		"&component=$libraryName&bug_file_loc=${editFilePath}_with_problemSeed=".$self->{problemSeed};
-	#FIXME  # The construction of this URL is somewhat fragile.  A separate module could be devoted to
-	# intelligent bug reporting.
-
-	#########################################################################
-	# Construct reference row for PGproblemEditor.
-	#########################################################################
-
-	my @PG_Editor_Reference_Links = ({
-			#'http://webwork.maa.org/wiki/Category:Problem_Techniques',
-			label   => $r->maketext('Problem Techniques'),
-			url     => $ce->{webworkURLs}{problemTechniquesHelpURL},
-			target  => 'techniques_window',
-			tooltip => 'Snippets of PG code illustrating specific techniques',
-		}, {
-			#'http://webwork.maa.org/wiki/Category:MathObjects',
-			label   => $r->maketext('Math Objects'),
-			url     => $ce->{webworkURLs}{MathObjectsHelpURL},
-			target  => 'math_objects',
-			tooltip => 'Wiki summary page for MathObjects',
-		}, {
-			#'http://webwork.maa.org/pod/pg_TRUNK/',
-			label   => $r->maketext('POD'),
-			url     => $ce->{webworkURLs}{PODHelpURL},
-			target  => 'pod_docs',
-			tooltip => 'Documentation from source code for PG modules and macro files. Often the most up-to-date information.',
-		}, {
-			#'http://demo.webwork.rochester.edu/webwork2/wikiExamples/MathObjectsLabs2/2/?login_practice_user=true',
-		# 	label   => $r->maketext('PGLab'),
-		# 	url     => $ce->{webworkURLs}{PGLabHelpURL},
-		# 	target  => 'PGLab',
-		# 	tooltip => 'Test snippets of PG code in interactive lab.  This is a good way to learn the PG language.',
-		# }, {
-			#'https://courses1.webwork.maa.org/webwork2/cervone_course/PGML/1/?login_practice_user=true',
-			label   => $r->maketext('PGML'),
-			url     => $ce->{webworkURLs}{PGMLHelpURL},
-			target  => 'PGML',
-			tooltip => 'PG mark down syntax used to format WeBWorK questions. This interactive lab can help you to learn the techniques.',
-		}, {
-			#'http://webwork.maa.org/wiki/Category:Authors',
-			label   => $r->maketext('Author Info'),
-			url     => $ce->{webworkURLs}{AuthorHelpURL},
-			target  => 'author_info',
-			tooltip => 'Top level of author information on the wiki.',
-		}, {
-			label   => $r->maketext('Report Bugs in this Problem'),
-			url     => $BUGZILLA,
-			target  => 'bug_report',
-			tooltip => 'Report bugs in a WeBWorK question/problem using this link. ' .
-			'The very first time you do this you will need to register with an email address so that ' .
-			'information on the bug fix can be reported back to you.',
-		},
+sub path ($c, $args) {
+	# We need to build a path to the problem being edited by hand, since it is not the same as the url path for this
+	# page.  The bread crumb path leads back to the problem being edited, not to the Instructor tool.
+	return $c->pathMacro(
+		$args,
+		'WeBWorK'                         => $c->url_for('root'),
+		$c->stash('courseID')             => $c->url_for('set_list'),
+		($c->stash('setID') // '')        => $c->url_for('problem_list'),
+		($c->{prettyProblemNumber} // '') =>
+			$c->url_for('problem_detail', problemID => $c->stash('problemID') || ''),
+		$c->maketext('Editor') => ''
 	);
+}
 
-	my @PG_Editor_References;
-	foreach my $link (@PG_Editor_Reference_Links) {
-		push(@PG_Editor_References,
-			CGI::a(
-				{
-					href              => $link->{url},
-					target            => $link->{target},
-					title             => $link->{tooltip},
-					class             => 'reference-link btn btn-sm btn-info',
-					data_bs_toggle    => 'tooltip',
-					data_bs_placement => 'top'
-				},
-				$link->{label}
-			)
-		);
-	}
+sub page_title ($c) {
+	my $setID     = $c->stash('setID');
+	my $problemID = $c->stash('problemID');
 
-	#########################################################################
-	# Find the text for the problem, either in the tmp file, if it exists
-	# or in the original file in the template directory
-	# or in the problem contents gathered in the initialization phase.
-	#########################################################################
-
-	my $problemContents = ${$self->{r_problemContents}};
-
-	unless ($problemContents =~/\S/)   { # non-empty contents
-		if (-r $tempFilePath and not -d $tempFilePath) {
-			die "tempFilePath is unsafe!" unless path_is_subdir($tempFilePath, $ce->{courseDirs}->{templates}, 1); # 1==path can be relative to dir
-			eval { $problemContents = WeBWorK::Utils::readFile($tempFilePath) };
-			$problemContents = $@ if $@;
-			$inputFilePath = $tempFilePath;
-		} elsif  (-r $editFilePath and not -d $editFilePath) {
-			die "editFilePath is unsafe!" unless path_is_subdir($editFilePath, $ce->{courseDirs}->{templates}, 1)  # 1==path can be relative to dir
-				|| $editFilePath eq $ce->{webworkFiles}{screenSnippets}{setHeader}
-				|| $editFilePath eq $ce->{webworkFiles}{hardcopySnippets}{setHeader}
-				|| $editFilePath eq $ce->{webworkFiles}{screenSnippets}{blankProblem};
-			eval { $problemContents = WeBWorK::Utils::readFile($editFilePath) };
-			$problemContents = $@ if $@;
-			$inputFilePath = $editFilePath;
-		} else { # file not existing is not an error
-			#warn "No file exists";
-			$problemContents = '';
-		}
-	} else {
-		#warn "obtaining input from r_problemContents";
-	}
+	return $c->maketext('Editor') unless $c->{file_type};
 
-	my $protected_file = not -w $inputFilePath;
-
-	my $prettyProblemNumber = $problemNumber;
-	my $set = $self->r->db->getGlobalSet($setName);
-	$prettyProblemNumber = join('.',jitar_id_to_seq($problemNumber))
-		if ($set && $set->assignment_type eq 'jitar');
-
-	my %titles = (
-		blank_problem                => x('Editing <strong>blank problem</strong> in file "[_1]"'),
-		set_header                   => x('Editing <strong>set header</strong> file "[_1]"'),
-		hardcopy_header              => x('Editing <strong>hardcopy header</strong> file "[_1]"'),
-		course_info                  => x('Editing <strong>course information</strong> file "[_1]"'),
-		options_info                 => x('Editing <strong>options information</strong> file "[_1]"'),
-		''                           => x('Editing <strong>unknown file type</strong> in file "[_1]"'),
-		source_path_for_problem_file => x('Editing <strong>unassigned problem</strong> file "[_1]"')
-	);
-	my $header = CGI::i(
-		$self->{file_type} eq 'problem'
-		? $r->maketext(
-			'Editing <strong>problem [_1] of set [_2]</strong> in file "[_3]"',
-			$prettyProblemNumber,
-			CGI::span({ dir => 'ltr' }, format_set_name_display($fullSetName)),
-			CGI::span({ dir => 'ltr' }, $self->shortPath($inputFilePath))
-			)
-		: $r->maketext($titles{ $self->{file_type} }, $self->shortPath($inputFilePath))
-	);
-	$header = $self->isTempEditFilePath($inputFilePath)
-		? CGI::div({ class => 'temporaryFile' }, $header)    # use colors if temporary file
-		: $header;
-
-	#########################################################################
-	# Format the page
-	#########################################################################
-
-	print CGI::div({ class => 'mb-2' }, $header),
-		CGI::start_form({
-			method  => 'POST',
-			id      => 'editor',
-			name    => 'editor',
-			action  => $r->uri,
-			enctype => 'application/x-www-form-urlencoded',
-			class   => 'col-12'
-		}),
-		$self->hidden_authen_fields,
-		not_blank($self->{sourceFilePath})
-		? CGI::hidden({ name => 'sourceFilePath', value => $self->{sourceFilePath} })
-		: '',
-		CGI::hidden({ name => 'file_type', value => $self->{file_type} }),
-		CGI::div(@PG_Editor_References);
-
-	WeBWorK::ContentGenerator::Instructor::CodeMirrorEditor::output_codemirror_html($r, 'problemContents',
-		$problemContents);
-
-	######### print action forms
-
-	my @formsToShow = @{ ACTION_FORMS() };
-	my %actionFormTitles = %{ACTION_FORM_TITLES()};
-	my $default_choice;
-
-	my @tabArr;
-	my @contentArr;
-
-	for my $actionID (@formsToShow) {
-		my $actionForm    = "${actionID}_form";
-		my $line_contents = $self->$actionForm($self->getActionParams($actionID));
-		my $active        = "";
-
-		if ($line_contents) {
-			$active = " active", $default_choice = $actionID unless $default_choice;
-			push(
-				@tabArr,
-				CGI::li(
-					{ class => 'nav-item', role => 'presentation' },
-					CGI::a(
-						{
-							href           => "#$actionID",
-							class          => "nav-link action-link$active",
-							id             => "$actionID-tab",
-							data_action    => $actionID,
-							data_bs_toggle => "tab",
-							data_bs_target => "#$actionID",
-							role           => 'tab',
-							aria_controls  => $actionID,
-							aria_selected  => $active ? 'true' : 'false'
-						},
-						$r->maketext($actionFormTitles{$actionID})
-					)
-				)
-			);
-			push(
-				@contentArr,
-				CGI::div(
-					{
-						class            => "tab-pane fade" . ($active ? " show$active" : ''),
-						id               => $actionID,
-						role             => 'tabpanel',
-						aria_labelledby => "$actionID-tab"
-					},
-					$line_contents
-				)
-			);
+	return $c->maketext('Set Header for set [_1]',      $setID) if $c->{file_type} eq 'set_header';
+	return $c->maketext('Hardcopy Header for set [_1]', $setID) if $c->{file_type} eq 'hardcopy_header';
+	return $c->maketext('Hardcopy Theme') if $c->{file_type} eq 'hardcopy_theme';
+	return $c->maketext('Course Information for course [_1]', $c->stash('courseID'))
+		if $c->{file_type} eq 'course_info';
+
+	if ($setID) {
+		my $set = $c->db->getGlobalSet($setID);
+		if ($set && $set->assignment_type eq 'jitar') {
+			$problemID = join('.', jitar_id_to_seq($problemID));
 		}
 	}
 
-	print CGI::hidden(-name => 'action', -id => 'current_action', -value => $default_choice);
-	print CGI::div(CGI::ul({ class => 'nav nav-tabs mb-2', role => 'tablist' }, @tabArr),
-		CGI::div({ class => "tab-content" }, @contentArr));
-
-	print CGI::div(CGI::submit({
-		id    => "submit_button_id",
-		name  => 'submit',
-		value => $r->maketext("Take Action!"),
-		class => 'btn btn-primary'
-	}));
-
-	print  CGI::end_form();
-
-	print CGI::start_div({ id    => 'render-modal', class => 'modal hide fade', tabindex => '-1' });
-	print CGI::start_div({ class => 'modal-dialog modal-dialog-centered' });
-	print CGI::start_div({ class => 'modal-content' });
-	print CGI::start_div({ class => 'modal-header' });
-	print CGI::h5({ class => 'modal-title' }, $r->maketext('Problem Viewer'));
-	print '<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>';
-	print CGI::end_div();
-	print CGI::start_div({ class => 'modal-body' });
-	print CGI::iframe({ id => 'pg_editor_frame_id', name => 'pg_editor_frame' }, '');
-	print CGI::end_div();
-	print CGI::start_div({ class => 'modal-footer' });
-	print CGI::button({
-		value           => $r->maketext('Close'),
-		data_bs_dismiss => 'modal',
-		class           => 'btn btn-primary'
-	});
-	print CGI::end_div();
-	print CGI::end_div();
-	print CGI::end_div();
-	print CGI::end_div();
-
-	return "";
+	return (defined $setID    ? $c->tag('span', dir => 'ltr', format_set_name_display($setID)) . ': ' : '')
+		. (defined $problemID ? $c->maketext('Problem [_1]', $problemID) : $c->maketext('New Problem'));
 }
 
-#  Convert long paths to [TMPL], etc.
-sub shortPath {
-	my $self = shift; my $file = shift;
-	my $tmpl = $self->r->ce->{courseDirs}{templates};
-	my $root = $self->r->ce->{courseDirs}{root};
-	my $ww = $self->r->ce->{webworkDirs}{root};
-	$file =~ s|^$tmpl|[TMPL]|; $file =~ s|^$root|[COURSE]|; $file =~ s|^$ww|[WW]|;
+#  Convert initial path component to [TMPL], [COURSE], or [WW].
+sub shortPath ($c, $file) {
+	my $tmpl = $c->ce->{courseDirs}{templates};
+	my $root = $c->ce->{courseDirs}{root};
+	my $ww   = $c->ce->{webworkDirs}{root};
+	$file =~ s|^$tmpl|[TMPL]|;
+	$file =~ s|^$root|[COURSE]|;
+	$file =~ s|^$ww|[WW]|;
+
 	return $file;
 }
 
-################################################################################
 # Utilities
-################################################################################
-
-sub getRelativeSourceFilePath {
-	my ($self, $sourceFilePath) = @_;
-
-	my $templatesDir = $self->r->ce->{courseDirs}->{templates};
-	$sourceFilePath =~ s|^$templatesDir/*||; # remove templates path and any slashes that follow
 
+sub getRelativeSourceFilePath ($c, $sourceFilePath) {
+	my $templatesDir = $c->ce->{courseDirs}{templates};
+	$sourceFilePath =~ s|^$templatesDir/*||;    # remove templates path and any slashes that follow
 	return $sourceFilePath;
 }
 
-# determineLocalFilePath   constructs a local file path parallel to a library file path
-
-sub determineLocalFilePath {
-	my $self= shift;
-	die "determineLocalFilePath is a method" unless ref($self);
-	my $path = shift;
-	my $default_screen_header_path   = $self->r->ce->{webworkFiles}->{hardcopySnippets}->{setHeader};
-	my $default_hardcopy_header_path = $self->r->ce->{webworkFiles}->{screenSnippets}->{setHeader};
-	my $setID = $self->{setID};
-	$setID = int(rand(1000)) unless $setID =~/\S/;  # setID can be 0
-	if ($path =~ /Library/) {
-		#$path =~ s|^.*?Library/||;  # truncate the url up to a segment such as ...rochesterLibrary/.......
-		$path  =~ s|^.*?Library/|local/|;  # truncate the url up to a segment such as ...rochesterLibrary/....... and prepend local
-	} elsif ($path eq $default_screen_header_path) {
-		$path = "set$setID/setHeader.pg";
-	} elsif ($path eq $default_hardcopy_header_path) {
-		$path = "set$setID/hardcopyHeader.tex";
-	} else { # if its not in a library we'll just save it locally
-		$path = "new_problem_".int(rand(1000)).".pg"; #l hope there aren't any collisions.
-	}
-	$path;
-}
+# Determine the location of the temporary file.
+# This does not create the directories in the path to the file.
+# It returns an absolute path to the file.
+# $path should be an absolute path to the original file.
+sub determineTempEditFilePath ($c, $path) {
+	my $user  = $c->param('user');
+	my $setID = $c->{setID} // 'Undefined_Set';
+
+	my $templatesDirectory   = $c->ce->{courseDirs}{templates};
+	my $tmpEditFileDirectory = $c->getTempEditFileDirectory();
+	my $hardcopyThemesDir    = $c->ce->{webworkDirs}{hardcopyThemes};
 
-# this does not create the directories in the path to the file
-# it  returns an absolute path to the file
-sub determineTempEditFilePath {
-	my $self = shift;  die "determineTempEditFilePath is a method" unless ref($self);
-	my $r = $self->r;
-	my $path =shift;    # this should be an absolute path to the file
-	my $user = $self->r->param("user");
-	$user    = int(rand(1000)) unless defined $user;
-	my $setID = $self->{setID} || int(rand(1000));
-	my $courseDirectory = $self->r->ce->{courseDirs};
-	###############
-	# Calculate the location of the temporary file
-	###############
-	my $templatesDirectory           = $courseDirectory->{templates};
-	my $blank_file_path              = $self->r->ce->{webworkFiles}->{screenSnippets}->{blankProblem};
-	my $default_screen_header_path   = $self->r->ce->{webworkFiles}->{hardcopySnippets}->{setHeader};
-	my $default_hardcopy_header_path = $self->r->ce->{webworkFiles}->{screenSnippets}->{setHeader};
-	my $tmpEditFileDirectory = $self->getTempEditFileDirectory();
-	$self->addbadmessage($r->maketext("The path to the original file should be absolute")) unless $path =~m|^/|;  # debug
-	if ($path =~/^$tmpEditFileDirectory/) {
-		$self->addbadmessage("Error: This path is already in the temporary edit directory -- no new temporary file is created. path = $path");
+	$c->addbadmessage($c->maketext('The path to the original file should be absolute.'))
+		unless $path =~ m|^/|;
+
+	if ($path =~ /^$tmpEditFileDirectory/) {
+		$c->addbadmessage($c->maketext('The path can not be the temporary edit directory.'));
 	} else {
-		if ($path =~ /^$templatesDirectory/ ) {
-			$path =~ s|^$templatesDirectory||;
-			$path =~ s|^/||;   # remove the initial slash if any
+		if ($path =~ /^$templatesDirectory/) {
+			$path = $c->getRelativeSourceFilePath($path);
 			$path = "$tmpEditFileDirectory/$path.$user.tmp";
-		} elsif ($path eq $blank_file_path) {
-			$path = "$tmpEditFileDirectory/blank.$setID.$user.tmp";  # handle the case of the blank problem
-		} elsif ($path eq $default_screen_header_path) {
-			$path = "$tmpEditFileDirectory/screenHeader.$setID.$user.tmp";  # handle the case of the screen header in snippets
-		} elsif ($path eq $default_hardcopy_header_path) {
-			$path = "$tmpEditFileDirectory/hardcopyHeader.$setID.$user.tmp";  # handle the case of the hardcopy header in snippets
+		} elsif ($path eq $c->ce->{webworkFiles}{screenSnippets}{blankProblem}) {
+			# Handle the case of the blank problem in snippets.
+			$path = "$tmpEditFileDirectory/blank.$setID.$user.tmp";
+		} elsif ($path eq $c->ce->{webworkFiles}{hardcopySnippets}{setHeader}) {
+			# Handle the case of the screen header in snippets.
+			$path = "$tmpEditFileDirectory/screenHeader.$setID.$user.tmp";
+		} elsif ($path eq $c->ce->{webworkFiles}{screenSnippets}{setHeader}) {
+			# Handle the case of the hardcopy header in snippets.
+			$path = "$tmpEditFileDirectory/hardcopyHeader.$setID.$user.tmp";
+		} elsif ($path =~ m|$hardcopyThemesDir/([^/]*\.xml)$|) {
+			# Handle the case of the hardcopy themes in assets/hardcopyThemes.
+			$path = "$tmpEditFileDirectory/hardcopyTheme.$1.$user.tmp";
 		} else {
-			die "determineTempEditFilePath should only be used on paths within the templates directory, not on $path";
+			# If all else fails, just use a failsafe filename.  This is reused in all of these cases.
+			# This shouldn't be possible in any case.
+			$path = "$tmpEditFileDirectory/failsafe.$setID.$user.tmp";
+			$c->addbadmessage($c->maketext('The original path is not in a valid location. Using failsafe [_1]', $path));
 		}
 	}
-	$path;
+
+	return $path;
 }
 
-# determine the original path to a file corresponding to a temporary edit file
-# returns path relative to the template directory
-sub determineOriginalEditFilePath {
-	my $self = shift;
-	my $path = shift;
-	my $user = $self->r->param("user");
-	$self->addbadmessage("Can't determine user of temporary edit file $path.") unless defined($user);
-	my $templatesDirectory = $self->r->ce->{courseDirs} ->{templates};
-	my $tmpEditFileDirectory = $self->getTempEditFileDirectory();
-	# unless path is absolute assume that it is relative to the template directory
-	my $newpath = $path;
-	unless ($path =~ m|^/| ) {
-		$newpath = "$templatesDirectory/$path";
-	}
-	if ($self->isTempEditFilePath($newpath) ) {
-		$newpath =~ s|^$tmpEditFileDirectory/||; # delete temp edit directory
-		if ($newpath =~m|blank\.[^/]*$|) { # handle the case of the blank problem
-			$newpath = $self->r->ce->{webworkFiles}->{screenSnippets}->{blankProblem};
-		} elsif (($newpath =~m|hardcopyHeader\.[^/]*$|)) { # handle the case of the hardcopy header in snippets
-			$newpath = $self->r->ce->{webworkFiles}->{hardcopySnippets}->{setHeader};
-		} elsif (($newpath =~m|screenHeader\.[^/]*$|)) { # handle the case of the screen header in snippets
-			$newpath = $self->r->ce->{webworkFiles}->{screenSnippets}->{setHeader};
+# Determine the original path to a file corresponding to a temporary edit file.
+# Returns a path that is relative to the template directory.
+sub determineOriginalEditFilePath ($c, $path) {
+	my $ce = $c->ce;
+
+	# Unless path is absolute, assume that it is relative to the template directory.
+	my $newpath = $path =~ m|^/| ? $path : "$ce->{courseDirs}{templates}/$path";
+
+	if ($c->isTempEditFilePath($newpath)) {
+		my $tmpEditFileDirectory = $c->getTempEditFileDirectory();
+		$newpath =~ s|^$tmpEditFileDirectory/||;
+
+		if ($newpath =~ m|blank\.[^/]*$|) {
+			$newpath = $ce->{webworkFiles}{screenSnippets}{blankProblem};
+		} elsif (($newpath =~ m|hardcopyHeader\.[^/]*$|)) {
+			$newpath = $ce->{webworkFiles}{hardcopySnippets}{setHeader};
+		} elsif (($newpath =~ m|screenHeader\.[^/]*$|)) {
+			$newpath = $ce->{webworkFiles}{screenSnippets}{setHeader};
+		} elsif (($newpath =~ m|hardcopyTheme\.([^/]*\.xml)\.[^/]*$|)) {
+			$newpath = "$ce->{courseDirs}{hardcopyThemes}/$1";
 		} else {
-			$newpath =~ s|\.$user\.tmp$||; # delete suffix
+			my $user = $c->param('user');
+			$newpath =~ s|\.$user\.tmp$||;
 		}
-		#$self->addgoodmessage("Original file path is $newpath"); #FIXME debug
 	} else {
-		$self->addbadmessage("This path |$newpath| is not the path to a temporary edit file.");
-		# returns original path
+		$c->addbadmessage("This path |$newpath| is not the path to a temporary edit file.");
+		# Returns the original path.
 	}
-	$newpath;
+
+	return $newpath;
 }
 
-sub getTempEditFileDirectory {
-	my $self = shift;
-	my $courseDirectory       = $self->r->ce->{courseDirs};
-	my $templatesDirectory    = $courseDirectory->{templates};
-	my $tmpEditFileDirectory  = (defined ($courseDirectory->{tmpEditFileDir}) ) ? $courseDirectory->{tmpEditFileDir} : "$templatesDirectory/tmpEdit";
-	$tmpEditFileDirectory;
+sub getTempEditFileDirectory ($c) {
+	my $courseDirectories = $c->ce->{courseDirs};
+	return $courseDirectories->{tmpEditFileDir} // "$courseDirectories->{templates}/tmpEdit";
 }
 
-sub isTempEditFilePath  {
-	my $self = shift;
-	my $path = shift;
-	my $templatesDirectory = $self->r->ce->{courseDirs} ->{templates};
-	# unless path is absolute assume that it is relative to the template directory
-	unless ($path =~ m|^/| ) {
-		$path = "$templatesDirectory/$path";
-	}
-	my $tmpEditFileDirectory = $self->getTempEditFileDirectory();
+sub isTempEditFilePath ($c, $path) {
+	# Unless path is absolute, assume that it is relative to the template directory.
+	$path = $c->ce->{courseDirs}{templates} . "/$path" unless $path =~ m|^/|;
 
-	($path =~/^$tmpEditFileDirectory/) ? 1: 0;
-}
+	my $tmpEditFileDirectory = $c->getTempEditFileDirectory();
 
-sub getFilePaths {
-	my ($self, $setName, $problemNumber, $file_type) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $urlpath = $r->urlpath;
-	my $courseName = $urlpath->arg("courseID");
-	my $user = $r->param('user');
-	my $effectiveUserName = $r->param('effectiveUser');
-
-	$setName = '' unless defined $setName;
-	$problemNumber = '' unless defined $problemNumber;
-
-	# parse possibly versioned set names
-	my $fullSetName = $setName;
-	my $editSetVersion = 0;
-	if ( $setName =~ /,v(\d)+$/ ) {
-		$editSetVersion = $1;
-		$setName =~ s/,v\d+$//;
-	}
+	return $path =~ /^$tmpEditFileDirectory/ ? 1 : 0;
+}
 
-	die 'Internal error to PGProblemEditor -- file type is not defined'  unless defined $file_type;
-	#$self->addgoodmessage("file type is $file_type");  #FIXME remove
-	##########################################################
-	# Determine path to the input file to be edited.
-	#   The permanent path of the input file  == $editFilePath
-	#   A temporary path to the input file    == $tempFilePath
-	##########################################################
-	# Relevant parameters
-	#     $r->param("displayMode")
-	#     $r->param('problemSeed')
-	#     $r->param('submit')
-	#     $r->param('make_local_copy')
-	#     $r->param('sourceFilePath')
-	#     $r->param('problemContents')
-	#     $r->param('save_to_new_file')
-	##########################################################################
-	# Define the following  variables
-	#     path to regular file -- $editFilePath;
-	#     path to file being read (temporary or permanent)
-	#     contents of the file being read  --- $problemContents
-	#     $self->{r_problemContents}        =   \$problemContents;
-	###########################################################################
-
-	my $editFilePath = $ce->{courseDirs}->{templates};
-
-	##########################################################################
-	# Determine path to regular file, place it in $editFilePath
-	# problemSeed is defined for the file_type = 'problem' and 'source_path_to_problem'
-	##########################################################################
-	CASE:
-	{
-		($file_type eq 'course_info') and do {
-			# we are editing the course_info file
-			# value of courseFiles::course_info is relative to templates directory
-			$editFilePath           .= '/' . $ce->{courseFiles}->{course_info};
-			last CASE;
-		};
-
-		($file_type eq 'options_info') and do {
-			# we are editing the options_info file
-			# value of courseFiles::options_info is relative to templates directory
-			$editFilePath           .= '/' . $ce->{courseFiles}->{options_info};
-			last CASE;
-		};
-
-		($file_type eq 'blank_problem') and do {
-			$editFilePath = $ce->{webworkFiles}->{screenSnippets}->{blankProblem};
-			$self->addbadmessage($r->maketext("This is a blank problem template file and can not be edited directly. Use the 'NewVersion' action below to create a local copy of the file and add it to the current problem set."));
-			last CASE;
-		};
-
-		($file_type eq 'set_header' or $file_type eq 'hardcopy_header') and do {
-			# first try getting the merged set for the effective user
-			# FIXME merged set is overwritten immediately with global value... WTF? --sam
-			my $set_record = $db->getMergedSet($effectiveUserName, $setName);
-			# if that doesn't work (the set is not yet assigned), get the global record
-			$set_record = $db->getGlobalSet($setName);
-			# bail if no set is found
-			die "Cannot find a set record for set $setName" unless defined($set_record);
-
-			my $header_file = "";
-			$header_file = $set_record->{$file_type};
-			if ($header_file && $header_file ne "" && $header_file ne "defaultHeader") {
-				if ( $header_file =~ m|^/| ) { # if absolute address
-					$editFilePath  = $header_file;
+# Determine file paths. This defines the following variables:
+#   $c->{editFilePath}    -- path to permanent file
+#   $c->{tempFilePath}    -- temporary file name to use (may not exist)
+#   $c->{inputFilePath}   -- actual file to read and edit (will be one of the above)
+#   $c->{backupBasePath}  -- base path to backup files
+sub getFilePaths ($c) {
+	my $ce   = $c->ce;
+	my $db   = $c->db;
+	my $user = $c->param('user');
+
+	my $editFilePath;
+
+	if ($c->{file_type} eq 'course_info') {
+		$editFilePath = "$ce->{courseDirs}{templates}/$ce->{courseFiles}{course_info}";
+	} elsif ($c->{file_type} eq 'blank_problem') {
+		$editFilePath = $ce->{webworkFiles}{screenSnippets}{blankProblem};
+	} elsif ($c->{file_type} eq 'hardcopy_theme') {
+		$editFilePath = "$ce->{courseDirs}{hardcopyThemes}/" . $c->param('hardcopy_theme');
+		if (!-e $editFilePath) {
+			$editFilePath = "$ce->{webworkDirs}{hardcopyThemes}/" . $c->param('hardcopy_theme');
+		}
+	} elsif ($c->{file_type} eq 'set_header' || $c->{file_type} eq 'hardcopy_header') {
+		my $set_record = $db->getGlobalSet($c->{setID});
+
+		if (defined $set_record) {
+			my $header_file = $set_record->{ $c->{file_type} };
+			if ($header_file && $header_file ne 'defaultHeader') {
+				if ($header_file =~ m|^/|) {
+					# Absolute address
+					$editFilePath = $header_file;
 				} else {
-					$editFilePath .= '/' . $header_file;
+					$editFilePath = "$ce->{courseDirs}{templates}/$header_file";
 				}
 			} else {
-				# if the set record doesn't specify the filename for a header
-				# then the set uses the default from snippets
-				$editFilePath = $ce->{webworkFiles}->{screenSnippets}->{setHeader} if $file_type eq 'set_header';
-				$editFilePath = $ce->{webworkFiles}->{hardcopySnippets}->{setHeader} if $file_type eq 'hardcopy_header';
-			}
-			last CASE;
-		}; #end 'set_header, hardcopy_header' case
-
-		($file_type eq 'problem') and do {
-			# first try getting the merged problem for the effective user
-			my $problem_record;
-			if ( $editSetVersion ) {
-				$problem_record = $db->getMergedProblemVersion($effectiveUserName, $setName, $editSetVersion, $problemNumber);
-			} else {
-				$problem_record = $db->getMergedProblem($effectiveUserName, $setName, $problemNumber);
+				# If the set record doesn't specify the filename for a header or it specifies the defaultHeader,
+				# then the set uses the default from assets/pg.
+				$editFilePath = $ce->{webworkFiles}{screenSnippets}{setHeader}
+					if $c->{file_type} eq 'set_header';
+				$editFilePath = $ce->{webworkFiles}{hardcopySnippets}{setHeader}
+					if $c->{file_type} eq 'hardcopy_header';
 			}
-
-			# if that doesn't work (the problem is not yet assigned), get the global record
-			$problem_record = $db->getGlobalProblem($setName, $problemNumber) unless defined($problem_record);
-			# bail if no source path for the problem is found ;
-			die "Cannot find a problem record for set $setName / problem $problemNumber" unless defined($problem_record);
-			$editFilePath .= '/' . $problem_record->source_file;
-			# define the problem seed for later use
-			$self->{problemSeed}= $problem_record->problem_seed if  defined($problem_record) and  $problem_record->can('problem_seed') ;
-			last CASE;
-		};  # end 'problem' case
-
-		($file_type eq 'source_path_for_problem_file') and do {
-			my $forcedSourceFile = $self->{sourceFilePath};
-			# if the source file is in the temporary edit directory find the original source file
-			# the source file is relative to the templates directory.
-			if ($self->isTempEditFilePath($forcedSourceFile) ) {
-				$forcedSourceFile   = $self->determineOriginalEditFilePath($forcedSourceFile);     # original file path
-				$self->addgoodmessage($r->maketext("the original path to the file is [_1]",$forcedSourceFile));  #FIXME debug
-			}
-			# bail if no source path for the problem is found ;
-			die "Cannot find a file path to save to" unless( not_blank($forcedSourceFile)   );
-			$self->{problemSeed} = DEFAULT_SEED();
-			$editFilePath .= '/' . $forcedSourceFile;
-			last CASE;
-		}; # end 'source_path_for_problem_file' case
-	}  # end CASE: statement
+		} else {
+			$c->addbadmessage("Cannot find a set record for set $c->{setID}");
+			return;
+		}
+	} elsif ($c->{file_type} eq 'problem') {
+		# First try getting the merged problem for the effective user.
+		my $effectiveUserName = $c->param('effectiveUser');
+		my $problem_record =
+			$c->{versionID}
+			? $db->getMergedProblemVersion($effectiveUserName, $c->{setID}, $c->{versionID}, $c->{problemID})
+			: $db->getMergedProblem($effectiveUserName, $c->{setID}, $c->{problemID});
+
+		# If that doesn't work, then the problem is not yet assigned. So get the global record.
+		$problem_record = $db->getGlobalProblem($c->{setID}, $c->{problemID}) unless defined $problem_record;
+
+		if (defined $problem_record) {
+			$editFilePath = "$ce->{courseDirs}{templates}/" . $problem_record->source_file;
+			# Define the problem seed for later use.
+			$c->{problemSeed} = $problem_record->problem_seed if $problem_record->can('problem_seed');
+		} else {
+			$c->addbadmessage(
+				$c->maketext("Cannot find a problem record for set $c->{setID} / problem $c->{problemID}"));
+			return;
+		}
+	} elsif ($c->{file_type} eq 'source_path_for_problem_file') {
+		my $forcedSourceFile = $c->{sourceFilePath};
+		# If the source file is in the temporary edit directory find the original source file.
+		# The source file is relative to the templates directory.
+		if ($c->isTempEditFilePath($forcedSourceFile)) {
+			$forcedSourceFile = $c->determineOriginalEditFilePath($forcedSourceFile);    # Original file path
+			$c->addgoodmessage($c->maketext('The original path to the file is [_1].', $forcedSourceFile));
+		}
+		if (not_blank($forcedSourceFile)) {
+			$c->{problemSeed} = DEFAULT_SEED();
+			$editFilePath = "$ce->{courseDirs}{templates}/$forcedSourceFile";
+		} else {
+			$c->addbadmessage($c->maketext('Cannot find a file path to save to.'));
+			return;
+		}
+	}
 
 	if (-d $editFilePath) {
-		my $msg = $r->maketext("The file '[_1]' is a directory!", $self->shortPath($editFilePath));
-		$self->{failure} = 1;
-		$self->addbadmessage($msg);
+		$c->addbadmessage($c->maketext('The file "[_1]" is a directory!', $c->shortPath($editFilePath)));
 	}
-	if (-e $editFilePath and not -r $editFilePath) {
-		#it's ok if the file doesn't exist, perhaps we're going to create it with save as
-		my $msg = $r->maketext("The file '[_1]' cannot be read!", $self->shortPath($editFilePath));
-		$self->{failure} = 1;
-		$self->addbadmessage($msg);
+	if (-e $editFilePath && !-r $editFilePath) {
+		# It's ok if the file doesn't exist.  Perhaps we're going to create it with save as.
+		$c->addbadmessage($c->maketext('The file "[_1]" cannot be read!', $c->shortPath($editFilePath)));
 	}
 
-	#################################################
 	# The path to the permanent file is now verified and stored in $editFilePath
-	# Whew!!!
-	#################################################
-
-	my $tempFilePath = $self->determineTempEditFilePath($editFilePath);  #"$editFilePath.$TEMPFILESUFFIX";
-	$self->{editFilePath}   = $editFilePath;
-	$self->{tempFilePath}   = $tempFilePath;
-	$self->{inputFilePath}  = (-r $tempFilePath) ? $tempFilePath : $editFilePath;
-	#warn "editfile path is $editFilePath and tempFile is $tempFilePath and inputFilePath is ". $self->{inputFilePath};
+	$c->{editFilePath}   = $editFilePath;
+	$c->{tempFilePath}   = $c->determineTempEditFilePath($editFilePath);
+	$c->{backupBasePath} = $c->{tempFilePath} =~ s/.$user.tmp/.bak/r;
+
+	# $c->{inputFilePath} is $c->{tempFilePath} if it is exists and is readable.
+	# Otherwise it is the original $c->{editFilePath}.
+	$c->{inputFilePath} = -r $c->{tempFilePath} ? $c->{tempFilePath} : $c->{editFilePath};
+
+	return;
 }
 
-################################################################################
-# saveFileChanges does most of the work. it is a separate method so that it can
-# be called from either pre_header_initialize() or initilize(), depending on
-# whether a redirect is needed or not.
-#
-# it actually does a lot more than save changes to the file being edited, and
-# sometimes less.
-################################################################################
-sub saveFileChanges {
-	my ($self, $outputFilePath, $problemContents ) = @_;
-	my $r             = $self->r;
-	my $ce            = $r->ce;
-
-	my $action          = $self->{action}||'no action';
-	# my $editFilePath  = $self->{editFilePath}; # not used??
-	my $sourceFilePath  = $self->{sourceFilePath};
-	my $tempFilePath    = $self->{tempFilePath};
-
-	if (defined($problemContents) and ref($problemContents) ) {
-		$problemContents = ${$problemContents};
-	} elsif( ! not_blank($problemContents)  ) {      # if the problemContents is undefined or empty
-		$problemContents = ${$self->{r_problemContents}};
+sub getBackupTimes ($c) {
+	my $backupBasePath = $c->{backupBasePath};
+	my @files          = glob(qq("$backupBasePath*"));
+	return unless @files;
+	return reverse(map { $_ =~ s/$backupBasePath//r } @files);
+}
+
+sub backupFile ($c, $outputFilePath) {
+	my $ce             = $c->ce;
+	my $backupTime     = time;
+	my $backupFilePath = $c->{backupBasePath} . $backupTime;
+
+	# Make sure any missing directories are created.
+	surePathToFile($ce->{courseDirs}{templates}, $backupFilePath);
+	copy($outputFilePath, $backupFilePath);
+	$c->addgoodmessage($c->maketext(
+		'Backup created on [_1]',
+		$c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+	));
+
+	# Delete oldest backup if option is present.
+	if ($c->param('deleteBackup')) {
+		my @backupTimes      = $c->getBackupTimes;
+		my $backupTime       = $backupTimes[-1];
+		my $backupFilePath   = $c->{backupBasePath} . $backupTime;
+		my $formatBackupTime = $c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat});
+		if (-e $backupFilePath) {
+			unlink($backupFilePath);
+			$c->addgoodmessage($c->maketext('Deleted backup from [_1].', $formatBackupTime));
+		} else {
+			$c->addbadmessage($c->maketext('Unable to delete backup from [_1].', $formatBackupTime));
+		}
 	}
-	##############################################################################
-	# read and update the targetFile and targetFile.tmp files in the directory
-	# if a .tmp file already exists use that, unless the revert button has been pressed.
+	return;
+}
+
+sub saveFileChanges ($c, $outputFilePath, $backup = 0) {
+	my $ce              = $c->ce;
+	my $problemContents = ${ $c->{r_problemContents} };
+
+	# Read and update the targetFile and targetFile.tmp files in the directory.
+	# If a .tmp file already exists use that, unless the revert button has been pressed.
 	# The .tmp files are removed when the file is or when the revert occurs.
-	##############################################################################
 
-	unless (not_blank($outputFilePath) ) {
-		$self->addbadmessage($r->maketext("You must specify an file name in order to save a new file."));
-		return "";
+	unless (not_blank($outputFilePath)) {
+		$c->addbadmessage($c->maketext('You must specify a file name in order to save a new file.'));
+		return;
 	}
-	my $do_not_save    = 0 ;       # flag to prevent saving of file
-	my $editErrors = '';
-
-	##############################################################################
-	# write changes to the approriate files
-	# FIXME  make sure that the permissions are set correctly!!!
-	# Make sure that the warning is being transmitted properly.
-	##############################################################################
-
-	my $writeFileErrors;
-	if ( not_blank($outputFilePath)  ) {   # save file
-		# Handle the problem of line endings.
-		# Make sure that all of the line endings are of unix type.
-		# Convert \r\n to \n
-		#$problemContents =~ s/\r\n/\n/g;
-		#$problemContents =~ s/\r/\n/g;
-
-		# make sure any missing directories are created
-		WeBWorK::Utils::surePathToFile($ce->{courseDirs}->{templates}, $outputFilePath);
-		die "outputFilePath is unsafe!" unless path_is_subdir($outputFilePath, $ce->{courseDirs}->{templates}, 1); # 1==path can be relative to dir
-
-		eval {
-			local *OUTPUTFILE;
-			open OUTPUTFILE,  ">:encoding(UTF-8)", $outputFilePath
-				or die "Failed to open $outputFilePath";
-			print OUTPUTFILE $problemContents;
-			close OUTPUTFILE;
-			# any errors are caught in the next block
-		};
-
-		$writeFileErrors = $@ if $@;
+
+	unless (path_is_subdir($outputFilePath, $ce->{courseDirs}{templates}, 1)) {
+		$c->addbadmessage($c->maketext(
+			'The file [_1] is not contained in the course templates directory and can not be modified.',
+			$outputFilePath
+		));
+		return;
 	}
 
-	###########################################################
-	# Catch errors in saving files,  clean up temp files
-	###########################################################
+	# Make sure any missing directories are created.
+	surePathToFile($ce->{courseDirs}{templates}, $outputFilePath);
 
-	# don't do redirects if the file was not saved.
-	# don't unlink files or send success messages
-	$self->{saveError} = $do_not_save;
+	# Backup file if asked.
+	$c->backupFile($outputFilePath) if $backup;
+
+	# Actually save the file.
+	if (open my $outfile, '>:encoding(UTF-8)', $outputFilePath) {
+		print $outfile $problemContents;
+		close $outfile;
+	} else {
+		# Catch file save errors.
+		my $writeFileErrors = $!;
 
-	if ($writeFileErrors) {
-		# get the current directory from the outputFilePath
+		# Get the current directory from the outputFilePath.
 		$outputFilePath =~ m|^(/.*?/)[^/]+$|;
 		my $currentDirectory = $1;
 
 		my $errorMessage;
-		# check why we failed to give better error messages
-		if ( not -w $ce->{courseDirs}->{templates} ) {
-			$errorMessage = "Write permissions have not been enabled in the templates directory.  No changes can be made.";
-		} elsif ( not -w $currentDirectory ) {
-			$errorMessage = "Write permissions have not been enabled in '".$self->shortPath($currentDirectory)."'.  Changes must be saved to a different directory for viewing.";
-		} elsif ( -e $outputFilePath and not -w $outputFilePath ) {
-			$errorMessage = "Write permissions have not been enabled for '".$self->shortPath($outputFilePath)."'.  Changes must be saved to another file for viewing.";
+
+		if (!-w $ce->{courseDirs}{templates}) {
+			$errorMessage = $c->maketext(
+				'Write permissions have not been enabled in the templates directory. No changes can be made.');
+		} elsif (!-w $currentDirectory) {
+			$errorMessage = $c->maketext(
+				'Write permissions have not been enabled in "[_1]".'
+					. 'Changes must be saved to a different directory for viewing.',
+				$c->shortPath($currentDirectory)
+			);
+		} elsif (-e $outputFilePath && !-w $outputFilePath) {
+			$errorMessage = $c->maketext(
+				'Write permissions have not been enabled for "[_1]". '
+					. 'Changes must be saved to another file for viewing.',
+				$c->shortPath($outputFilePath)
+			);
 		} else {
-			$errorMessage = "Unable to write to '".$self->shortPath($outputFilePath)."': $writeFileErrors";
+			$errorMessage = $c->b($c->maketext(
+				'Unable to write to "[_1]": [_2]',
+				$c->shortPath($outputFilePath),
+				$c->tag('pre', $writeFileErrors)
+			));
 		}
 
-		$self->{failure} = 1;
-		$self->addbadmessage(CGI::p($errorMessage));
+		$c->addbadmessage($errorMessage);
+		return;
 	}
 
-	###########################################################
-	# FIXME if the file is accompanied by auxiliary files transfer them as well
-	# if the filepath ends in   foobar/foobar.pg  then we assume there are auxiliary files
-	# copy the contents of the original foobar directory to the new one
-	#
-	###########################################################
-	# If things have worked so far determine if the file might be accompanied by auxiliary files
-	# a path ending in    foo/foo.pg  is assumed to contain auxilliary files
-	#
-	my $auxiliaryFilesExist = has_aux_files($outputFilePath);
-
-	if ($auxiliaryFilesExist and not $do_not_save ) {
-		my $sourceDirectory = $sourceFilePath || '' ;
-		my $outputDirectory = $outputFilePath || '';
+	# If the file is being saved as a new file in a new location, and the file is accompanied by auxiliary files
+	# transfer them as well.  If the file is a pg file, then assume there are auxiliary files.  Copy all files not
+	# ending in .pg from the original directory to the new one.
+	if ($c->{action} eq 'save_as' && $outputFilePath =~ /\.pg/) {
+		my $sourceDirectory = $c->{sourceFilePath} || '';
+		my $outputDirectory = $outputFilePath;
 		$sourceDirectory =~ s|/[^/]+\.pg$||;
 		$outputDirectory =~ s|/[^/]+\.pg$||;
-		##############
-		# Transfer this to Utils::copyAuxiliaryFiles($sourceDirectory, $destinationDirectory)
-		##############
-		my @filesToCopy;
-		@filesToCopy = WeBWorK::Utils::readDirectory($sourceDirectory) if -d $sourceDirectory;
-		foreach my $file (@filesToCopy) {
-			next if $file =~ /\.pg$/;   # .pg file should already be transferred
-			my $fromPath = "$sourceDirectory/$file";
-			my $toPath   = "$outputDirectory/$file";
-			if (-f $fromPath and -r $fromPath and not -e $toPath) { # don't copy directories, don't copy files that have already been copied
-				copy($fromPath, $toPath) or $writeFileErrors.= "<br> Error copying $fromPath to $toPath";
-				# need to use binary transfer for gif files.  File::Copy does this.
-				#warn "copied from $fromPath to $toPath";
-				#warn "files are different ",system("diff $fromPath $toPath");
+
+		# Only perform the copy if the output directory is an actual new location.
+		if ($sourceDirectory ne $outputDirectory) {
+			for my $file (-d $sourceDirectory ? readDirectory($sourceDirectory) : ()) {
+				# The .pg file being edited has already been transferred. Ignore any others in the directory.
+				next if $file =~ /\.pg$/;
+				my $fromPath = "$sourceDirectory/$file";
+				my $toPath   = "$outputDirectory/$file";
+				# Don't copy directories and don't copy files that have already been copied.
+				if (-f $fromPath && -r $fromPath && !-e $toPath) {
+					# Need to use binary transfer for image files.  File::Copy does this.
+					$c->addbadmessage($c->maketext('Error copying [_1] to [_2].', $fromPath, $toPath))
+						unless copy($fromPath, $toPath);
+				}
 			}
-			$self->addbadmessage($writeFileErrors) if not_blank($writeFileErrors);
+			$c->addgoodmessage($c->maketext(
+				'Copied auxiliary files from [_1] to new location at [_2].',
+				$sourceDirectory, $outputDirectory
+			));
 		}
-		$self->addgoodmessage($r->maketext("Copied auxiliary files from [_1] to new location at [_2]", $sourceDirectory, $outputDirectory));
 	}
 
-	###########################################################
-	# clean up temp files on revert, save and save_as
-	###########################################################
-	unless( $writeFileErrors or $do_not_save) {  # everything worked!  unlink and announce success!
-		# unlink the temporary file if there are no errors and the save button has been pushed
-		if (($action eq 'save' or $action eq 'save_as') and (-w $self->{tempFilePath})  ) {
-			$self->addgoodmessage($r->maketext("Deleting temp file at [_1]", $self->shortPath($self->{tempFilePath})));
-			die "tempFilePath is unsafe!" unless path_is_subdir($self->{tempFilePath}, $ce->{courseDirs}->{templates}, 1); # 1==path can be relative to dir
-			unlink($self->{tempFilePath}) ;
-		}
+	# Clean up temp files on save or save_as.
+	# Unlink the temporary file if there are no errors and the save or save_as button has been pushed.
+	if (($c->{action} eq 'save' || $c->{action} eq 'save_as') && -w $c->{tempFilePath}) {
+		if (path_is_subdir($c->{tempFilePath}, $ce->{courseDirs}{templates}, 1)) {
+			$c->addgoodmessage($c->maketext('Deleted temp file at [_1]', $c->shortPath($c->{tempFilePath})));
+			unlink($c->{tempFilePath});
 
-		if ( defined($outputFilePath) and ! $self->{failure} and not $self->isTempEditFilePath($outputFilePath) ) {
-			# don't announce saving of temporary editing files
-			my $msg = $r->maketext("Saved to file '[_1]'", $self->shortPath($outputFilePath));
-			$self->addgoodmessage($msg);
-			#$self->{inputFilePath} = $outputFilePath; ## DPVC -- avoid file-not-found message
+			# Update the file paths.
+			$c->{tempFilePath}  = $c->determineTempEditFilePath($c->{editFilePath});
+			$c->{inputFilePath} = $c->{editFilePath};
+		} else {
+			$c->addbadmessage($c->maketext(
+				'The temporary file [_1] is not in the course templates directory and can not be deleted!',
+				$c->{tempFilePath}
+			));
 		}
 	}
-}  # end saveFileChanges
 
-sub getActionParams {
-	my ($self, $actionID) = @_;
-	my $r = $self->{r};
-
-	my %actionParams=();
-	foreach my $param ($r->param) {
-		next unless $param =~ m/^action\.$actionID\./;
-		$actionParams{$param} = [ $r->param($param) ];
+	# Announce that the file was saved unless it was a temporary file.
+	unless ($c->isTempEditFilePath($outputFilePath)) {
+		$c->addgoodmessage($c->maketext('Saved to file "[_1]"', $c->shortPath($outputFilePath)));
 	}
-	return %actionParams;
+
+	return;
 }
 
+# Fix line endings in the problem contents.
+# Make sure that all of the line endings are of unix type and convert \r\n to \n.
 sub fixProblemContents {
-	#NOT a method
 	my $problemContents = shift;
-	# Handle the problem of line endings.
-	# Make sure that all of the line endings are of unix type.
-	# Convert \r\n to \n
-	$problemContents =~ s/\r\n/\n/g;
-	$problemContents =~ s/\r/\n/g;
-	$problemContents;
+	return $problemContents =~ s/(\r\n)|(\r)/\n/gr;
 }
 
-sub fresh_edit_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	#$self->addgoodmessage("fresh_edit_handler called");
-}
+sub view_handler ($c) {
+	my $problemSeed = $c->param('action.view.seed')        // DEFAULT_SEED();
+	my $displayMode = $c->param('action.view.displayMode') // $c->ce->{pg}{options}{displayMode};
 
-sub view_form {
-	my ($self, %actionParams) = @_;
-	my $r         = $self->r;
-	my $file_type = $self->{file_type};
-
-	# FIXME: These can't yet be edited from temporary files
-	return '' if $file_type eq 'hardcopy_header';
-
-	unless ($file_type eq 'course_info' || $file_type eq 'options_info') {
-		return CGI::div(
-			CGI::div(
-				{ class => 'row align-items-center' },
-				CGI::label(
-					{ for => 'action_view_seed_id', class => 'col-form-label col-auto mb-2' },
-					$r->maketext('Using what seed?')
-				),
-				CGI::div(
-					{ class => 'col-auto mb-2' },
-					CGI::textfield({
-						id    => 'action_view_seed_id',
-						name  => 'action.view.seed',
-						value => $self->{problemSeed},
-						class => 'form-control form-control-sm'
-					})
-				),
-				CGI::div(
-					{ class => 'col-auto mb-2' },
-					CGI::button({
-						id    => 'randomize_view_seed_id',
-						name  => 'action.randomize.view.seed',
-						value => $r->maketext('Randomize Seed'),
-						class => 'btn btn-info btn-sm'
-					})
-				)
-			),
-			CGI::div(
-				{ class => 'row align-items-center mb-2' },
-				CGI::label(
-					{ for => 'action_view_displayMode_id', class => 'col-form-label col-auto' },
-					$r->maketext('Using what display mode?')
-				),
-				CGI::div(
-					{ class => 'col-auto' },
-					CGI::popup_menu({
-						id      => 'action_view_displayMode_id',
-						name    => 'action.view.displayMode',
-						values  => $self->r->ce->{pg}{displayModes},
-						class   => 'form-select form-select-sm d-inline w-auto',
-						default => $self->{displayMode}
-					})
-				)
-			),
-			CGI::div(
-				{ class => 'row g-0 mb-2' },
-				CGI::div(
-					{ class => 'form-check mb-2' },
-					CGI::input({
-						type  => 'checkbox',
-						id    => 'newWindowView',
-						class => 'form-check-input'
-					}),
-					CGI::label(
-						{ for => 'newWindowView', class => 'form-check-label' },
-						$r->maketext('Open in new window')
-					)
-				)
-			)
-		);
-	}
+	# Grab the problemContents from the form in order to save it to the tmp file.
+	$c->{r_problemContents} = \(fixProblemContents($c->param('problemContents')));
 
-	return '';
-}
+	$c->saveFileChanges($c->{tempFilePath});
 
-sub view_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r = $self->r;
-	my $courseName      =  $self->{courseID};
-	my $setName         =  $self->{setID};
-	my $fullSetName     =  $self->{fullSetID};
-	my $problemNumber   =  $self->{problemID};
-	my $problemSeed     = ($actionParams->{'action.view.seed'}) ? $actionParams->{'action.view.seed'}->[0] : DEFAULT_SEED();
-	my $displayMode     = ($actionParams->{'action.view.displayMode'})
-		? $actionParams->{'action.view.displayMode'}->[0]
-		: $self->r->ce->{pg}->{options}->{displayMode};
-
-	my $editFilePath        = $self->{editFilePath};
-	my $tempFilePath        = $self->{tempFilePath};
-	########################################################
-	# grab the problemContents from the form in order to save it to the tmp file
-	########################################################
-	my $problemContents     = fixProblemContents($self->r->param('problemContents'));
-	$self->{r_problemContents}    = \$problemContents;
+	my $relativeTempFilePath = $c->getRelativeSourceFilePath($c->{tempFilePath});
 
-	my $do_not_save = 0;
-	my $file_type = $self->{file_type};
-	$self->saveFileChanges($tempFilePath,);
-
-	########################################################
-	# construct redirect URL and redirect
-	########################################################
-	my $edit_level = $self->r->param("edit_level") || 0;
-	$edit_level++;
-	my $viewURL;
-
-	my $relativeTempFilePath = $self->getRelativeSourceFilePath($tempFilePath);
-
-	# redirect to Problem.pm or GatewayQuiz.pm
-	if ($file_type eq 'problem' or $file_type eq 'source_path_for_problem_file') {
-		# we need to know if the set is a gateway set to determine the redirect
-		my $globalSet = $r->db->getGlobalSet($setName);
-
-		my $problemPage;
-		if (defined $globalSet && $globalSet->assignment_type =~ /gateway/) {
-			$problemPage = $r->urlpath->newFromModule(
-				'WeBWorK::ContentGenerator::GatewayQuiz', $r,
-				courseID => $courseName,
-				setID    => 'Undefined_Set'
-			);
-		} else {
-			$problemPage = $r->urlpath->newFromModule(
-				'WeBWorK::ContentGenerator::Problem', $r,
-				courseID  => $courseName,
-				setID     => $r->db->existsUserSet($r->param('user'), $setName) ? $setName : 'Undefined_Set',
-				problemID => $problemNumber
-			);
-		}
+	# Construct redirect URL and redirect to it.
+	if ($c->{file_type} eq 'problem' || $c->{file_type} eq 'source_path_for_problem_file') {
+		# Redirect to Problem.pm or GatewayQuiz.pm.
+		# We need to know if the set is a gateway set to determine the redirect.
+		my $globalSet = $c->db->getGlobalSet($c->{setID});
 
-		$viewURL = $self->systemLink($problemPage,
+		$c->reply_with_redirect($c->systemLink(
+			defined $globalSet && $globalSet->assignment_type =~ /gateway/
+			? $c->url_for('gateway_quiz',   setID => 'Undefined_Set')
+			: $c->url_for('problem_detail', setID => $c->{setID}, problemID => $c->{problemID}),
 			params => {
-				displayMode        => $displayMode,
-				problemSeed        => $problemSeed,
-				editMode           => "temporaryFile",
-				edit_level         => $edit_level,
-				sourceFilePath     => $relativeTempFilePath,
-				status_message     => uri_escape_utf8($self->{status_message})
+				displayMode    => $displayMode,
+				problemSeed    => $problemSeed,
+				editMode       => 'temporaryFile',
+				sourceFilePath => $relativeTempFilePath,
+				status_message => $c->{status_message}->join('')
 			}
-		);
-	} elsif ($file_type eq 'set_header' ) { # redirect to ProblemSet
-		my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSet",$r,
-			courseID => $courseName, setID => $setName,
-		);
-
-		$viewURL = $self->systemLink($problemPage,
+		));
+	} elsif ($c->{file_type} eq 'blank_problem') {
+		# Redirect to Problem.pm.pm.
+		$c->reply_with_redirect($c->systemLink(
+			$c->url_for('problem_detail', setID => 'Undefined_Set', problemID => 1),
 			params => {
-				set_header         => $tempFilePath,
-				displayMode        => $displayMode,
-				problemSeed        => $problemSeed,
-				editMode           => "temporaryFile",
-				edit_level         => $edit_level,
-				sourceFilePath     => $relativeTempFilePath,
-				status_message     => uri_escape_utf8($self->{status_message})
+				displayMode    => $displayMode,
+				problemSeed    => $problemSeed,
+				editMode       => 'temporaryFile',
+				sourceFilePath => $relativeTempFilePath,
+				status_message => $c->{status_message}->join('')
 			}
-		);
-	} elsif ($file_type eq 'hardcopy_header') { # redirect to ProblemSet?? # it's difficult to view temporary changes for hardcopy headers
-		my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSet",$r,
-			courseID => $courseName, setID => $setName,
-		);
-
-		$viewURL = $self->systemLink($problemPage,
+		));
+	} elsif ($c->{file_type} eq 'set_header') {
+		# Redirect to ProblemSet
+		$c->reply_with_redirect($c->systemLink(
+			$c->url_for('problem_list', setID => $c->{setID}),
 			params => {
-				set_header         => $tempFilePath,
-				displayMode        => $displayMode,
-				problemSeed        => $problemSeed,
-				editMode           => "temporaryFile",
-				edit_level         => $edit_level,
-				sourceFilePath     => $relativeTempFilePath,
-				status_message     => uri_escape_utf8($self->{status_message})
+				set_header     => $c->{tempFilePath},
+				displayMode    => $displayMode,
+				problemSeed    => $problemSeed,
+				editMode       => 'temporaryFile',
+				sourceFilePath => $relativeTempFilePath,
+				status_message => $c->{status_message}->join('')
 			}
-		);
-	} elsif ($file_type eq 'course_info') {  # redirec to ProblemSets.pm
-		my $problemSetsPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets",$r,
-			courseID => $courseName);
-		$viewURL = $self->systemLink($problemSetsPage,
+		));
+	} elsif ($c->{file_type} eq 'hardcopy_header') {
+		# Redirect to ProblemSet?? It's difficult to view temporary changes for hardcopy headers.
+		$c->reply_with_redirect($c->systemLink(
+			$c->url_for('problem_list', setID => $c->{setID}),
 			params => {
-				course_info        => $tempFilePath,
-				editMode           => "temporaryFile",
-				edit_level         => $edit_level,
-				sourceFilePath     => $relativeTempFilePath,
-				status_message     => uri_escape_utf8($self->{status_message})
+				set_header     => $c->{tempFilePath},
+				displayMode    => $displayMode,
+				problemSeed    => $problemSeed,
+				editMode       => 'temporaryFile',
+				sourceFilePath => $relativeTempFilePath,
+				status_message => $c->{status_message}->join('')
 			}
-		);
-	} elsif ($file_type eq 'options_info') {  # redirec to Options.pm
-		my $optionsPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Options",$r,
-			courseID => $courseName);
-		$viewURL = $self->systemLink($optionsPage,
+		));
+	} elsif ($c->{file_type} eq 'course_info') {
+		# Redirect to ProblemSets.pm.
+		$c->reply_with_redirect($c->systemLink(
+			$c->url_for('set_list'),
 			params => {
-				options_info       => $tempFilePath,
-				editMode           => "temporaryFile",
-				edit_level         => $edit_level,
-				sourceFilePath     => $relativeTempFilePath,
-				status_message     => uri_escape_utf8($self->{status_message})
+				course_info    => $c->{tempFilePath},
+				editMode       => 'temporaryFile',
+				sourceFilePath => $relativeTempFilePath,
+				status_message => $c->{status_message}->join('')
 			}
-		);
+		));
 	} else {
-		die "I don't know how to redirect this file type $file_type ";
+		die "I don't know how to redirect this file type $c->{file_type}.";
 	}
 
-	$self->reply_with_redirect($viewURL);
+	return;
 }
 
-sub add_problem_form {
-	my $self          = shift;
-	my %actionParams  = @_;
-	my $r             = $self->r;
-	my $setName       = $self->{setID} // '';    # Allow numeric 0 for $setName
-	my $problemNumber = $self->{problemID};
-
-	return '' if $self->{file_type} eq 'course_info' || $self->{file_type} eq 'options_info';
-
-	my $filePath = $self->{inputFilePath};
-	$setName =~ s|^set||;
-	my @allSetNames = sort $r->db->listGlobalSets;
-	for (my $j = 0; $j < scalar(@allSetNames); $j++) {
-		$allSetNames[$j] =~ s|^set||;
-		$allSetNames[$j] =~ s|\.def||;
-	}
+# The hardcopy and pgtidy actions are handled by javascript.  These are provided just in case
+# something goes wrong and the actions are called.
+sub hardcopy_action { }
+sub pgtidy_action   { }
+
+sub hardcopy_handler ($c) {
+	# Redirect to problem editor page.
+	$c->reply_with_redirect($c->systemLink(
+		$c->url_for('instructor_problem_editor',),
+		params => {
+			file_type      => 'hardcopy_theme',
+			hardcopy_theme => $c->param('action.hardcopy.theme')
+		}
+	));
+}
 
-	return CGI::div(
-		CGI::div(
-			{ class => 'row align-items-center mb-2' },
-			CGI::label(
-				{ for => 'action_add_problem_target_set_id', class => 'col-form-label col-auto' },
-				$r->maketext('Add to what set?')
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					id      => 'action_add_problem_target_set_id',
-					name    => 'action.add_problem.target_set',
-					values  => \@allSetNames,
-					labels  => { map { $_ => format_set_name_display($_) } @allSetNames },
-					class   => 'form-select form-select-sm d-inline w-auto',
-					dir     => 'ltr',
-					default => $setName
-				})
-			)
-		),
-		CGI::div(
-			{ class => 'row align-items-center mb-2' },
-			CGI::label(
-				{ for => 'action_add_problem_file_type_id', class => 'col-form-label col-auto' },
-				$r->maketext('Add as what filetype?')
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					id     => 'action_add_problem_file_type_id',
-					name   => 'action.add_problem.file_type',
-					values => [ 'problem', 'set_header', 'hardcopy_header' ],
-					labels => {
-						problem         => 'problem',
-						set_header      => 'set header',
-						hardcopy_header => 'hardcopy header',
-					},
-					class   => 'form-select form-select-sm d-inline w-auto',
-					default => $self->{file_type}
-				})
-			)
-		)
-	);
+sub add_problem_handler ($c) {
+	my $db = $c->db;
 
-	return '';
-}
+	my $templatesPath  = $c->ce->{courseDirs}{templates};
+	my $sourceFilePath = $c->{editFilePath} =~ s|^$templatesPath/||r;
+
+	my $targetSetName  = $c->param('action.add_problem.target_set');
+	my $targetFileType = $c->param('action.add_problem.file_type');
 
-sub add_problem_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r= $self->r;
-	my $db = $r->db;
-	#$self->addgoodmessage("add_problem_handler called");
-	my $courseName      =  $self->{courseID};
-	my $setName         =  $self->{setID};
-	my $problemNumber   =  $self->{problemID};
-	my $sourceFilePath  =  $self->{editFilePath};
-	my $displayMode     =  $self->{displayMode};
-	my $problemSeed     =  $self->{problemSeed};
-
-	my $targetSetName         =  $actionParams->{'action.add_problem.target_set'}->[0];
-	my $targetFileType        =  $actionParams->{'action.add_problem.file_type'}->[0];
-	my $templatesPath         =  $self->r->ce->{courseDirs}->{templates};
-	$sourceFilePath    =~ s|^$templatesPath/||;
-
-	my $edit_level = $self->r->param("edit_level") || 0;
-	$edit_level++;
-
-	my $viewURL ='';
 	if ($targetFileType eq 'problem') {
 		my $targetProblemNumber;
 
 		my $set = $db->getGlobalSet($targetSetName);
 
-		# for jitar sets new problems are put as top level
-		# problems at the end
 		if ($set->assignment_type eq 'jitar') {
-			my @problemIDs = $db->listGlobalProblems($targetSetName);
-			@problemIDs = sort { $a <=> $b } @problemIDs;
-			my @seq = jitar_id_to_seq($problemIDs[$#problemIDs]);
-			$targetProblemNumber = seq_to_jitar_id($seq[0]+1);
+			# For jitar sets new problems are put as top level problems at the end.
+			my @problemIDs =
+				map { $_->[1] } $db->listGlobalProblemsWhere({ set_id => $targetSetName }, 'problem_id');
+			my @seq = jitar_id_to_seq($problemIDs[-1]);
+			$targetProblemNumber = seq_to_jitar_id($seq[0] + 1);
 		} else {
-			$targetProblemNumber = 1+ WeBWorK::Utils::max( $db->listGlobalProblems($targetSetName));
+			$targetProblemNumber = 1 + max($db->listGlobalProblems($targetSetName));
 		}
 
-		#################################################
 		# Update problem record
-		#################################################
-		my $problemRecord  = $self->addProblemToSet(
-			setName        => $targetSetName,
-			sourceFile     => $sourceFilePath,
-			problemID      => $targetProblemNumber, #added to end of set
+		my $problemRecord = addProblemToSet(
+			$db, $c->ce->{problemDefaults},
+			setName    => $targetSetName,
+			sourceFile => $sourceFilePath,
+			problemID  => $targetProblemNumber,
 		);
-		$self->assignProblemToAllSetUsers($problemRecord);
-		$self->addgoodmessage($r->maketext("Added [_1] to [_2] as problem [_3]", $sourceFilePath, $targetSetName,($set->assignment_type eq 'jitar' ? join('.',jitar_id_to_seq($targetProblemNumber)) : $targetProblemNumber)));
-		$self->{file_type}   = 'problem'; # change file type to problem -- if it's not already that
-
-		#################################################
-		# Set up redirect to problem editor page.
-		#################################################
-		my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",$r,
-			courseID  => $courseName,
-			setID     => $targetSetName,
-			problemID => $targetProblemNumber,
-		);
-		my $relativeSourceFilePath = $self->getRelativeSourceFilePath($sourceFilePath);
-		$viewURL = $self->systemLink($problemPage,
+
+		assignProblemToAllSetUsers($db, $problemRecord);
+
+		$c->addgoodmessage($c->maketext(
+			'Added [_1] to [_2] as problem [_3]',
+			$sourceFilePath,
+			$targetSetName,
+			(
+				$set->assignment_type eq 'jitar'
+				? join('.', jitar_id_to_seq($targetProblemNumber))
+				: $targetProblemNumber
+			)
+		));
+		$c->{file_type} = 'problem';    # Change file type to problem if it is not already that.
+
+		# Redirect to problem editor page.
+		$c->reply_with_redirect($c->systemLink(
+			$c->url_for(
+				'instructor_problem_editor_withset_withproblem',
+				setID     => $targetSetName,
+				problemID => $targetProblemNumber,
+			),
 			params => {
-				displayMode        => $displayMode,
-				problemSeed        => $problemSeed,
-				editMode           => "savedFile",
-				edit_level         => $edit_level,
-				sourceFilePath     => $relativeSourceFilePath,
-				status_message     => uri_escape_utf8($self->{status_message}),
-				file_type          => 'problem',
+				displayMode    => $c->{displayMode},
+				problemSeed    => $c->{problemSeed},
+				editMode       => 'savedFile',
+				sourceFilePath => $c->getRelativeSourceFilePath($sourceFilePath),
+				status_message => $c->{status_message}->join(''),
+				file_type      => 'problem',
 			}
-		);
-	} elsif ($targetFileType eq 'set_header')  {
-		#################################################
+		));
+	} elsif ($targetFileType eq 'set_header') {
 		# Update set record
-		#################################################
-		my $setRecord  = $self->r->db->getGlobalSet($targetSetName);
+		my $setRecord = $c->db->getGlobalSet($targetSetName);
 		$setRecord->set_header($sourceFilePath);
-		if(  $self->r->db->putGlobalSet($setRecord) ) {
-			$self->addgoodmessage($r->maketext("Added '[_1]' to [_2] as new set header", $self->shortPath($sourceFilePath), $targetSetName)) ;
+		if ($c->db->putGlobalSet($setRecord)) {
+			$c->addgoodmessage($c->maketext(
+				'Added "[_1]" to [_2] as new set header',
+				$c->shortPath($sourceFilePath),
+				$targetSetName
+			));
 		} else {
-			$self->addbadmessage("Unable to make '".$self->shortPath($sourceFilePath)."' the set header for $targetSetName");
+			$c->addbadmessage($c->maketext(
+				'Unable to make "[_1]" the set header for [_2].',
+				$c->shortPath($sourceFilePath),
+				$targetSetName
+			));
 		}
-		$self->{file_type} = 'set_header'; # change file type to set_header if it not already so
-		#################################################
-		# Set up redirect
-		#################################################
-		my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSet",$r,
-			courseID => $courseName, setID => $targetSetName
-		);
-		$viewURL = $self->systemLink($problemPage,
+
+		$c->{file_type} = 'set_header';    # Change file type to set_header if not already so.
+
+		# Redirect
+		$c->reply_with_redirect($c->systemLink(
+			$c->url_for('problem_list', setID => $targetSetName),
 			params => {
-				displayMode        => $displayMode,
-				editMode           => "savedFile",
-				edit_level         => $edit_level,
-				status_message     => uri_escape_utf8($self->{status_message}),
+				displayMode    => $c->{displayMode},
+				editMode       => 'savedFile',
+				status_message => $c->{status_message}->join(''),
 			}
-		);
-	} elsif ($targetFileType eq 'hardcopy_header')  {
-		#################################################
+		));
+	} elsif ($targetFileType eq 'hardcopy_header') {
 		# Update set record
-		#################################################
-		my $setRecord  = $self->r->db->getGlobalSet($targetSetName);
+		my $setRecord = $c->db->getGlobalSet($targetSetName);
 		$setRecord->hardcopy_header($sourceFilePath);
-		if(  $self->r->db->putGlobalSet($setRecord) ) {
-			$self->addgoodmessage($r->maketext("Added '[_1]' to [_2] as new hardcopy header", $self->shortPath($sourceFilePath), $targetSetName)) ;
+		if ($c->db->putGlobalSet($setRecord)) {
+			$c->addgoodmessage($c->maketext(
+				'Added "[_1]" to [_2] as new hardcopy header',
+				$c->shortPath($sourceFilePath),
+				$targetSetName
+			));
 		} else {
-			$self->addbadmessage("Unable to make '".$self->shortPath($sourceFilePath)."' the hardcopy header for $targetSetName");
+			$c->addbadmessage(
+				$c->maketext('Unable to make "[_1]" the hardcopy header for [_2].'),
+				$c->shortPath($sourceFilePath),
+				$targetSetName
+			);
 		}
-		$self->{file_type} = 'hardcopy_header'; # change file type to set_header if it not already so
-		#################################################
-		# Set up redirect
-		#################################################
-		my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Hardcopy",$r,
-			courseID => $courseName, setID => $targetSetName
-		);
-		$viewURL = $self->systemLink($problemPage,
+
+		$c->{file_type} = 'hardcopy_header';    # Change file type to set_header if not already so.
+
+		# Redirect
+		$c->reply_with_redirect($c->systemLink(
+			$c->url_for('hardcopy_preselect_set', setID => $targetSetName),
 			params => {
-				displayMode        => $displayMode,
-				editMode           => "savedFile",
-				edit_level         => $edit_level,
-				status_message     => uri_escape_utf8($self->{status_message}),
+				displayMode    => $c->{displayMode},
+				editMode       => 'savedFile',
+				status_message => $c->{status_message}->join(''),
 			}
-		);
+		));
 	} else {
-		die "Don't know what to do with target file type $targetFileType";
+		die "Unsupported target file type $targetFileType";
 	}
 
-	$self->reply_with_redirect($viewURL);
+	return;
 }
 
-sub save_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	if ($self->{editFilePath} =~ /$BLANKPROBLEM$/) {
-		# Can't save blank problems without changing names.
-		return '';
-	} elsif (-w $self->{editFilePath}) {
-		return CGI::div(
-			CGI::div(
-				{ class => 'mb-2' },
-				$r->maketext(
-					'Save to [_1] and View',
-					CGI::b({ dir => 'ltr' }, $self->shortPath($self->{editFilePath}))
-				)
-			),
-			CGI::div(
-				{ class => 'form-check mb-2' },
-				CGI::input({
-					type  => 'checkbox',
-					id    => 'newWindowSave',
-					class => 'form-check-input'
-				}),
-				CGI::label(
-					{ for => 'newWindowSave', class => 'form-check-label' },
-					$r->maketext('Open in new window')
-				)
-			)
-		);
+sub save_handler ($c) {
+	# Grab the problemContents from the form in order to save it to a new permanent file.
+	# Later we will unlink (delete) the current temporary file.
+	$c->{r_problemContents} = \(fixProblemContents($c->param('problemContents')));
+
+	# Sanity check in case the user has edited the problem set while editing a problem.
+	# This can cause the current editor contents to overwrite the new file that is saved for the problem.
+	if ($c->{editFilePath} ne $c->param('action.save.source_file')) {
+		$c->addbadmessage($c->maketext(
+			'File not saved. The file name for this problem does not match the file name the editor was opened with. '
+				. 'The problem set may have changed. Please reopen this file from the homework sets editor.'
+		));
 	} else {
-		# Can't save -- No write permission;
-		return '';
+		$c->saveFileChanges($c->{editFilePath}, scalar($c->param('backupFile')));
 	}
-}
 
-sub save_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r= $self->r;
-	#$self->addgoodmessage("save_handler called");
-	my $courseName      =  $self->{courseID};
-	my $setName         =  $self->{setID};
-	my $fullSetName     =  $self->{fullSetID};
-	my $problemNumber   =  $self->{problemID};
-	my $displayMode     =  $self->{displayMode};
-	my $problemSeed     =  $self->{problemSeed};
-
-	#################################################
-	# grab the problemContents from the form in order to save it to a new permanent file
-	# later we will unlink (delete) the current temporary file
-	#################################################
-	my $problemContents = fixProblemContents($self->r->param('problemContents'));
-	$self->{r_problemContents} = \$problemContents;
-
-	#################################################
-	# Construct the output file path
-	#################################################
-	my $editFilePath        = $self->{editFilePath};
-	my $outputFilePath      = $editFilePath;
-
-	my $do_not_save = 0;
-	my $file_type = $self->{file_type};
-	$self->saveFileChanges($outputFilePath);
-	#################################################
-	# Set up redirect to Problem.pm
-	#################################################
-	my $viewURL;
-	########################################################
-	# construct redirect URL and redirect
-	########################################################
-	if ($file_type eq 'problem' || $file_type eq 'source_path_for_problem_file') { # redirect to Problem.pm
-		# we need to know if the set is a gateway set to determine the redirect
-		my $globalSet = $self->r->db->getGlobalSet( $setName );
-		my $problemPage;
-		if ( defined( $globalSet) && $globalSet->assignment_type =~ /gateway/ ) {
-			$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::GatewayQuiz",$r,
-				courseID => $courseName, setID => "Undefined_Set");
-			# courseID => $courseName, setID => $fullSetName);
-		} else {
-			$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Problem",$r,
-				courseID => $courseName, setID => $setName, problemID => $problemNumber);
-		}
+	# Don't redirect unless it was requested to open in a new window.
+	return unless $c->param('newWindowSave');
 
-		my $relativeEditFilePath = $self->getRelativeSourceFilePath($editFilePath);
+	if ($c->{file_type} eq 'problem' || $c->{file_type} eq 'source_path_for_problem_file') {
+		# Redirect to Problem.pm or GatewayQuiz.pm.
+		# We need to know if the set is a gateway set to determine the redirect.
+		my $globalSet = $c->db->getGlobalSet($c->{setID});
 
-		$viewURL = $self->systemLink($problemPage,
+		$c->reply_with_redirect($c->systemLink(
+			defined $globalSet && $globalSet->assignment_type =~ /gateway/
+			? $c->url_for('gateway_quiz',   setID => 'Undefined_Set')
+			: $c->url_for('problem_detail', setID => $c->{setID}, problemID => $c->{problemID}),
 			params => {
-				displayMode        => $displayMode,
-				problemSeed        => $problemSeed,
-				editMode           => "savedFile",
-				edit_level         => 0,
-				sourceFilePath     => $relativeEditFilePath,
-				status_message     => uri_escape_utf8($self->{status_message})
+				displayMode    => $c->{displayMode},
+				problemSeed    => $c->{problemSeed},
+				editMode       => 'savedFile',
+				sourceFilePath => $c->getRelativeSourceFilePath($c->{editFilePath}),
+				status_message => $c->{status_message}->join('')
 			}
-		);
-	} elsif ($file_type eq 'set_header' ) { # redirect to ProblemSet
-		my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSet",$r,
-			courseID => $courseName, setID => $setName,
-		);
-
-		$viewURL = $self->systemLink($problemPage,
+		));
+	} elsif ($c->{file_type} eq 'set_header') {
+		# Redirect to ProblemSet.pm
+		$c->reply_with_redirect($c->systemLink(
+			$c->url_for('problem_list', setID => $c->{setID}),
 			params => {
-				displayMode        => $displayMode,
-				problemSeed        => $problemSeed,
-				editMode           => "savedFile",
-				edit_level         => 0,
-				status_message     => uri_escape_utf8($self->{status_message})
+				displayMode    => $c->{displayMode},
+				problemSeed    => $c->{problemSeed},
+				editMode       => 'savedFile',
+				status_message => $c->{status_message}->join('')
 			}
-		);
-	} elsif ( $file_type eq 'hardcopy_header') { # redirect to ProblemSet
-		my $problemPage = $self->r->urlpath->newFromModule('WeBWorK::ContentGenerator::Hardcopy',$r,
-			courseID => $courseName, setID => $setName,
-		);
-
-		$viewURL = $self->systemLink($problemPage,
+		));
+	} elsif ($c->{file_type} eq 'hardcopy_header') {
+		# Redirect to Hardcopy.pm
+		$c->reply_with_redirect($c->systemLink(
+			$c->url_for('hardcopy_preselect_set', setID => $c->{setID}),
 			params => {
-				displayMode        => $displayMode,
-				problemSeed        => $problemSeed,
-				editMode           => "savedFile",
-				edit_level         => 0,
-				status_message     => uri_escape_utf8($self->{status_message})
+				displayMode    => $c->{displayMode},
+				problemSeed    => $c->{problemSeed},
+				editMode       => 'savedFile',
+				status_message => $c->{status_message}->join('')
 			}
-		);
-	} elsif ($file_type eq 'course_info') {  # redirect to ProblemSets.pm
-		my $problemSetsPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets",$r,
-			courseID => $courseName);
-		$viewURL = $self->systemLink($problemSetsPage,
+		));
+	} elsif ($c->{file_type} eq 'hardcopy_theme') {
+		# Redirect to PGProblemEditor.pm
+		$c->reply_with_redirect($c->systemLink(
+			$c->url_for('instructor_problem_editor'),
 			params => {
-				editMode           => ("savedFile"),
-				edit_level         => 0,
-				status_message     => uri_escape_utf8($self->{status_message})
+				editMode       => 'savedFile',
+				hardcopy_theme => $c->{hardcopy_theme},
+				file_type      => 'hardcopy_theme',
+				status_message => $c->{status_message}->join(''),
+				sourceFilePath => $c->getRelativeSourceFilePath($c->{editFilePath}),
 			}
-		);
-	} elsif ($file_type eq 'options_info') {  # redirect to Options.pm
-		my $optionsPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Options",$r,
-			courseID => $courseName);
-		$viewURL = $self->systemLink($optionsPage,
+		));
+	} elsif ($c->{file_type} eq 'course_info') {
+		# Redirect to ProblemSets.pm
+		$c->reply_with_redirect($c->systemLink(
+			$c->url_for('set_list'),
+			params => { editMode => 'savedFile', status_message => $c->{status_message}->join('') }
+		));
+	} elsif ($c->{file_type} eq 'source_path_for_problem_file') {
+		# Redirect to PGProblemEditor.pm
+		$c->reply_with_redirect($c->systemLink(
+			$c->url_for(
+				'instructor_problem_editor_withset_withproblem',
+				setID     => $c->{setID},
+				problemID => $c->{problemID}
+			),
 			params => {
-				editMode           => ("savedFile"),
-				edit_level         => 0,
-				status_message     => uri_escape_utf8($self->{status_message})
-			}
-		);
-	} elsif ($file_type eq 'source_path_for_problem_file') {  # redirect to ProblemSets.pm
-		my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",$r,
-			courseID => $courseName, setID => $setName, problemID => $problemNumber);
-		my $viewURL = $self->systemLink($problemPage,
-			params=>{
-				displayMode        => $displayMode,
-				problemSeed        => $problemSeed,
-				editMode           => "savedFile",
-				edit_level         => 0,
-				sourceFilePath     => $outputFilePath, #The path relative to the templates directory is required.
-				file_type          => 'source_path_for_problem_file',
-				status_message     => uri_escape_utf8($self->{status_message})
+				displayMode => $c->{displayMode},
+				problemSeed => $c->{problemSeed},
+				editMode    => 'savedFile',
+				# The path relative to the templates directory is required.
+				sourceFilePath => $c->{editFilePath},
+				file_type      => 'source_path_for_problem_file',
+				status_message => $c->{status_message}->join('')
 			}
-		);
+		));
 	} else {
-		die "I don't know how to redirect this file type $file_type ";
+		die "Unsupported save file type $c->{file_type}.";
 	}
-	$self->reply_with_redirect($viewURL);
-}
-
-# Calls the save_as_handler
-sub save_as_form {
-	my ($self, %actionParams) = @_;
-	my $r            = $self->r;
-	my $editFilePath = $self->{editFilePath};
-
-	my $templatesDir = $self->r->ce->{courseDirs}->{templates};
-	my $setID        = $self->{setID};
-	my $fullSetID    = $self->{fullSetID};
-
-	my $fileDir       = dirname($editFilePath);
-	my $shortFilePath = $editFilePath;
-	$shortFilePath =~ s|^$templatesDir/||;
 
-	# Suggest that modifications be saved to the "local" subdirectory if its not in a writeable directory
-	$shortFilePath = 'local/' . $shortFilePath
-		if (!-w $fileDir);
+	return;
+}
 
-	# If it is still an absolute path don't suggest a file path to save to.
-	$shortFilePath =~ s|^.*/||
-		if $shortFilePath =~ m|^/|;
+sub save_as_handler ($c) {
+	my $db = $c->db;
 
-	my $probNum = ($self->{file_type} eq 'problem') ? $self->{problemID} : 'header';
+	$c->{status_message} = $c->c;
 
-	# Don't add or replace problems to sets if the set is the Undefined_Set or if the problem is the blank_problem.
-	my $can_add_problem_to_set =
-		not_blank($setID) && $setID ne 'Undefined_Set' && $self->{file_type} ne 'blank_problem';
+	my $do_not_save = 0;
 
-	my $prettyProbNum = $probNum;
-	if ($setID) {
-		my $set = $self->r->db->getGlobalSet($setID);
-		$prettyProbNum = join('.', jitar_id_to_seq($probNum))
-			if ($self->{file_type} eq 'problem' && $set && $set->assignment_type eq 'jitar');
-	}
+	my $saveMode      = $c->param('action.save_as.saveMode') || 'no_save_mode_selected';
+	my $new_file_name = ($c->param('action.save_as.target_file') || '') =~ s/^\s*|\s*$//gr;
+	$c->{sourceFilePath} = $c->param('action.save_as.source_file') || '';    # Store for use in saveFileChanges.
+	my $file_type = $c->param('action.save_as.file_type') || '';
 
-	return CGI::div(
-		CGI::div(
-			{ class => 'row align-items-center mb-2' },
-			CGI::label(
-				{ for => 'action_save_as_target_file_id', class => 'col-form-label col-auto' },
-				$r->maketext('Save file to:')
-			),
-			CGI::div(
-				{ class => 'col-auto d-inline-flex', dir => 'ltr' },
-				CGI::div(
-					{ class => 'editor-save-path input-group input-group-sm' },
-					CGI::label({ for => 'action_save_as_target_file_id', class => 'input-group-text' }, '[TMPL]/'),
-					CGI::textfield({
-						id    => 'action_save_as_target_file_id',
-						name  => 'action.save_as.target_file',
-						size  => 60,
-						value => $shortFilePath,
-						class => 'form-control form-control-sm', dir => 'ltr'
-					})
-				)
-			),
-			CGI::hidden({ name => 'action.save_as.source_file', value => $editFilePath }),
-			CGI::hidden({ name => 'action.save_as.file_type',   value => $self->{file_type} })
-		),
-		(
-			$can_add_problem_to_set ? CGI::div(
-				{ class => 'form-check' },
-				CGI::input({
-					type    => 'radio',
-					id      => 'action_save_as_saveMode_rename_id',
-					name    => 'action.save_as.saveMode',
-					value   => 'rename',
-					checked => undef,
-					class   => 'form-check-input',
-				}),
-				CGI::label(
-					{ for => 'action_save_as_saveMode_rename_id', class => 'form-check-label' },
-					$r->maketext(
-						'Replace current problem: [_1]',
-						CGI::strong(
-							CGI::span({ dir => 'ltr' }, format_set_name_display($fullSetID)) . "/$prettyProbNum"
-						)
-					)
-				)
-			) : ''
-		),
-		(
-			$can_add_problem_to_set ? CGI::div(
-				{ class => 'form-check' },
-				CGI::input({
-					type  => 'radio',
-					id    => 'action_save_as_saveMode_new_problem_id',
-					name  => 'action.save_as.saveMode',
-					value => 'add_to_set_as_new_problem',
-					class => 'form-check-input',
-				}),
-				CGI::label(
-					{ for => 'action_save_as_saveMode_new_problem_id', class => 'form-check-label' },
-					$r->maketext(
-						'Append to end of [_1] set',
-						CGI::strong({ dir => 'ltr' }, format_set_name_display($fullSetID))
-					)
-				)
-			) : ''
-		),
-		CGI::div(
-			{ class => 'form-check' },
-			CGI::input({
-				type  => 'radio',
-				id    => 'action_save_as_saveMode_independent_problem_id',
-				name  => 'action.save_as.saveMode',
-				value => 'new_independent_problem',
-				class => 'form-check-input',
-				$can_add_problem_to_set ? () : (checked => undef)
-			}),
-			CGI::label(
-				{ for => 'action_save_as_saveMode_independent_problem_id', class => 'form-check-label' },
-				$r->maketext('Create unattached problem')
-			)
-		)
-	);
-}
-# suggestions for improvement
-# save as ......
-# * replacing foobar (rename) * and add to set (add_new_problem) * as an independent file (new_independent_problem)
-
-sub save_as_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r = $self->r;
-	#$self->addgoodmessage("save_as_handler called");
-	$self->{status_message} = ''; ## DPVC -- remove bogus old messages
-	my $courseName      =  $self->{courseID};
-	my $setName         =  $self->{setID};
-	my $fullSetName     =  $self->{fullSetID};
-	my $problemNumber   =  $self->{problemID};
-	my $displayMode     =  $self->{displayMode};
-	my $problemSeed     =  $self->{problemSeed};
-	my $effectiveUserName = $self->r->param('effectiveUser');
-
-	my $do_not_save = 0;
-	my $saveMode       = $actionParams->{'action.save_as.saveMode'}->[0] || 'no_save_mode_selected';
-	my $new_file_name  = $actionParams->{'action.save_as.target_file'}->[0] || '';
-	my $sourceFilePath = $actionParams->{'action.save_as.source_file'}->[0] || '';
-	my $file_type      = $actionParams->{'action.save_as.file_type'}->[0] || '';
-	$self ->{sourceFilePath} = $sourceFilePath;  # store for use in saveFileChanges
-	$new_file_name =~ s/^\s*//;  #remove initial and final white space
-	$new_file_name =~ s/\s*$//;
-	if ( $new_file_name !~ /\S/) { # need a non-blank file name
-		# setting $self->{failure} stops saving and any redirects
+	# Need a non-blank file name.
+	if (!$new_file_name) {
 		$do_not_save = 1;
-		$self->addbadmessage(CGI::p($r->maketext("Please specify a file to save to.")));
+		$c->addbadmessage($c->maketext('Please specify a file to save to.'));
 	}
 
-	#################################################
-	# grab the problemContents from the form in order to save it to a new permanent file
-	# later we will unlink (delete) the current temporary file
-	#################################################
-	my $problemContents = fixProblemContents($self->r->param('problemContents'));
-	$self->{r_problemContents} = \$problemContents;
-	warn "problem contents is empty" unless $problemContents;
-	#################################################
-	# Rescue the user in case they forgot to end the file name with .pg
-	#################################################
-
-	if($file_type eq 'problem'
-			or $file_type eq 'blank_problem'
-			or $file_type eq 'set_header') {
-		$new_file_name =~ s/\.pg$//; # remove it if it is there
-		$new_file_name .= '.pg'; # put it there
+	# Rescue the user in case they forgot to end the file name with the right extension.
+	if ($c->{is_pg} && $new_file_name !~ /\.pg$/) {
+		$new_file_name .= '.pg';
+	} elsif ($file_type eq 'hardcopy_theme' && $new_file_name !~ /\.xml$/) {
+		$new_file_name .= '.xml';
 	}
-	#################################################
+
+	# Grab the problemContents from the form in order to save it to a new permanent file.
+	# Later we will unlink (delete) the current temporary file.
+	$c->{r_problemContents} = \(fixProblemContents($c->param('problemContents')));
+
 	# Construct the output file path
-	#################################################
-	my $outputFilePath = $self->r->ce->{courseDirs}->{templates} . '/' . $new_file_name;
-	if (defined $outputFilePath and -e $outputFilePath) {
-		# setting $do_not_save stops saving and any redirects
+	my $outputFilePath = $c->ce->{courseDirs}{templates} . "/$new_file_name";
+	if (defined $outputFilePath && -e $outputFilePath) {
 		$do_not_save = 1;
-		$self->addbadmessage(CGI::p($r->maketext("File '[_1]' exists. File not saved. No changes have been made.  You can change the file path for this problem manually from the 'Hmwk Sets Editor' page", $self->shortPath($outputFilePath))));
-		$self->addgoodmessage(CGI::p($r->maketext("The text box now contains the source of the original problem. You can recover lost edits by using the Back button on your browser.")));
+		$c->addbadmessage($c->maketext(
+			'File "[_1]" exists. File not saved. No changes have been made.',
+			$c->shortPath($outputFilePath)
+		));
+		$c->addbadmessage(
+			$c->maketext('You can change the file path for this problem manually from the "Hmwk Sets Editor" page'))
+			if defined $c->{setID};
+		$c->addgoodmessage($c->maketext(
+			'The text box now contains the source of the original problem. '
+				. 'You can recover lost edits by using the Back button on your browser.'
+		));
 	} else {
-		$self->{editFilePath} = $outputFilePath;
-		$self->{tempFilePath} = ''; # nothing needs to be unlinked.
-		$self->{inputFilePath} = '';
+		$c->{editFilePath} = $outputFilePath;
+		# saveFileChanges will update the tempFilePath and inputFilePath as needed.  Don't do that here.
 	}
 
-	unless ($do_not_save ) {
-		$self->saveFileChanges($outputFilePath);
+	unless ($do_not_save) {
+		$c->saveFileChanges($outputFilePath);
 		my $targetProblemNumber;
 
-		if ($saveMode eq 'rename' and -r $outputFilePath) {
-			#################################################
-			# Modify source file path in problem
-			#################################################
-			if ($file_type eq 'set_header' ) {
-				my $setRecord = $self->r->db->getGlobalSet($setName);
+		if ($file_type eq 'course_info' || $file_type eq 'hardcopy_theme') {
+			# The saveMode is not set for course_info files or hardcopy_theme file as there are no such options
+			# presented in the form.  So set that here so that the correct redirect is chosen below.
+			$saveMode = "new_$file_type";
+		} elsif ($saveMode eq 'rename' && -r $outputFilePath) {
+			# Modify source file path in problem.
+			if ($file_type eq 'set_header') {
+				my $setRecord = $db->getGlobalSet($c->{setID});
 				$setRecord->set_header($new_file_name);
-				if ($self->r->db->putGlobalSet($setRecord)) {
-					$self->addgoodmessage($r->maketext("The set header for set [_1] has been renamed to '[_2]'.", $setName, $self->shortPath($outputFilePath))) ;
+				if ($db->putGlobalSet($setRecord)) {
+					$c->addgoodmessage($c->maketext(
+						'The set header for set [_1] has been renamed to "[_2]".', $c->{setID},
+						$c->shortPath($outputFilePath)
+					));
 				} else {
-					$self->addbadmessage("Unable to change the set header for set $setName. Unknown error.");
+					$c->addbadmessage($c->maketext(
+						'Unable to change the set header for set [_1]. Unknown error.', $c->{setID}));
 				}
-			} elsif ($file_type eq 'hardcopy_header' ) {
-				my $setRecord = $self->r->db->getGlobalSet($setName);
+			} elsif ($file_type eq 'hardcopy_header') {
+				my $setRecord = $db->getGlobalSet($c->{setID});
 				$setRecord->hardcopy_header($new_file_name);
-				if ($self->r->db->putGlobalSet($setRecord)) {
-					$self->addgoodmessage($r->maketext("The hardcopy header for set [_1] has been renamed to '[_2]'.", $setName, $self->shortPath($outputFilePath))) ;
+				if ($db->putGlobalSet($setRecord)) {
+					$c->addgoodmessage($c->maketext(
+						'The hardcopy header for set [_1] has been renamed to "[_2]".', $c->{setID},
+						$c->shortPath($outputFilePath)
+					));
 				} else {
-					$self->addbadmessage("Unable to change the hardcopy header for set $setName. Unknown error.");
+					$c->addbadmessage($c->maketext(
+						'Unable to change the hardcopy header for set [_1]. Unknown error.',
+						$c->{setID}
+					));
 				}
 			} else {
 				my $problemRecord;
-				if ( $fullSetName =~ /,v(\d+)$/ ) {
-					$problemRecord = $self->r->db->getMergedProblemVersion($effectiveUserName, $setName, $1, $problemNumber);
+				if ($c->{versionID}) {
+					$problemRecord =
+						$db->getMergedProblemVersion($c->param('effectiveUser'), $c->{setID}, $1, $c->{problemID});
 				} else {
-					$problemRecord = $self->r->db->getGlobalProblem($setName,$problemNumber);
+					$problemRecord = $db->getGlobalProblem($c->{setID}, $c->{problemID});
 				}
 				$problemRecord->source_file($new_file_name);
-				my $result = ( $fullSetName =~ /,v(\d+)$/ )
-					? $self->r->db->putProblemVersion($problemRecord)
-					: $self->r->db->putGlobalProblem($problemRecord);
-				my $prettyProblemNumber = $problemNumber;
-				my $set = $self->r->db->getGlobalSet($setName);
-				$prettyProblemNumber = join('.',jitar_id_to_seq($problemNumber)) if ($set && $set->assignment_type eq 'jitar');
-
-				if  ($result) {
-					$self->addgoodmessage($r->maketext("The source file for 'set [_1] / problem [_2] has been changed from '[_3]' to '[_4]'",
-							$fullSetName, $prettyProblemNumber, $self->shortPath($sourceFilePath), $self->shortPath($outputFilePath))) ;
+				my $result =
+					$c->{versionID} ? $db->putProblemVersion($problemRecord) : $db->putGlobalProblem($problemRecord);
+
+				if ($result) {
+					$c->addgoodmessage($c->maketext(
+						'The source file for "set [_1] / problem [_2]" has been changed from "[_3]" to "[_4]".',
+						$c->{fullSetID},
+						$c->{prettyProblemNumber},
+						$c->shortPath($c->{sourceFilePath}),
+						$c->shortPath($outputFilePath)
+					));
 				} else {
-					$self->addbadmessage("Unable to change the source file path for set $fullSetName, problem $prettyProblemNumber. Unknown error.");
+					$c->addbadmessage($c->maketext(
+						'Unable to change the source file path for set [_1], problem [_2]. Unknown error.',
+						$c->{fullSetID}, $c->{prettyProblemNumber}
+					));
 				}
 			}
 		} elsif ($saveMode eq 'add_to_set_as_new_problem') {
+			my $set = $db->getGlobalSet($c->{setID});
 
-			my $set = $self->r->db->getGlobalSet($setName);
-
-			# for jitar sets new problems are put as top level
-			# problems at the end
+			# For jitar sets new problems are put as top level problems at the end.
 			if ($set->assignment_type eq 'jitar') {
-				my @problemIDs = $self->r->db->listGlobalProblems($setName);
+				my @problemIDs = $db->listGlobalProblems($c->{setID});
 				@problemIDs = sort { $a <=> $b } @problemIDs;
-				my @seq = jitar_id_to_seq($problemIDs[$#problemIDs]);
-				$targetProblemNumber = seq_to_jitar_id($seq[0]+1);
+				my @seq = jitar_id_to_seq($problemIDs[-1]);
+				$targetProblemNumber = seq_to_jitar_id($seq[0] + 1);
 			} else {
-				$targetProblemNumber = 1+ WeBWorK::Utils::max( $self->r->db->listGlobalProblems($setName));
+				$targetProblemNumber = 1 + max($db->listGlobalProblems($c->{setID}));
 			}
 
-			my $problemRecord  = $self->addProblemToSet(
-				setName        => $setName,
-				sourceFile     => $new_file_name,
-				problemID      => $targetProblemNumber, #added to end of set
+			my $problemRecord = addProblemToSet(
+				$db, $c->ce->{problemDefaults},
+				setName    => $c->{setID},
+				sourceFile => $new_file_name,
+				problemID  => $targetProblemNumber,    # Added to end of set
 			);
-			$self->assignProblemToAllSetUsers($problemRecord);
-			$self->addgoodmessage($r->maketext("Added [_1] to [_2] as problem [_3]", $new_file_name, $setName, ($set->assignment_type eq 'jitar' ? join('.',jitar_id_to_seq($targetProblemNumber)) : $targetProblemNumber))) ;
+			assignProblemToAllSetUsers($db, $problemRecord);
+			$c->addgoodmessage($c->maketext(
+				'Added [_1] to [_2] as problem [_3].',
+				$new_file_name,
+				$c->{setID},
+				(
+					$set->assignment_type eq 'jitar'
+					? join('.', jitar_id_to_seq($targetProblemNumber))
+					: $targetProblemNumber
+				)
+			));
 		} elsif ($saveMode eq 'new_independent_problem') {
-			#################################################
-			# Don't modify source file path in problem -- just report
-			#################################################
-			$self->addgoodmessage($r->maketext("A new file has been created at '[_1]' with the contents below.  No changes have been made to set [_2]", $self->shortPath($outputFilePath), $setName));
+			$c->addgoodmessage($c->maketext(
+				'A new file has been created at "[_1]" with the contents below.',
+				$c->shortPath($outputFilePath)
+			));
+			$c->addgoodmessage($c->maketext(' No changes have been made to set [_1]', $c->{setID}))
+				if ($c->{setID} ne 'Undefined_Set');
 		} else {
-			$self->addbadmessage("Don't recognize saveMode: |$saveMode|. Unknown error.");
+			$c->addbadmessage($c->maketext('Unkown saveMode: [_1].', $saveMode));
+			return;
 		}
 	}
-	my $edit_level = $self->r->param("edit_level") || 0;
-	$edit_level++;
 
-	#################################################
-	# Set up redirect
-	# The redirect gives the server time to detect that the new file exists.
-	#################################################
+	# Set up redirect.
 	my $problemPage;
 	my $new_file_type;
-
-	if ($saveMode eq 'new_independent_problem' ) {
-		$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",$r,
-			courseID => $courseName, setID => 'Undefined_Set', problemID => 1
-		);
+	my %extra_params;
+
+	if ($saveMode eq 'new_course_info') {
+		$problemPage   = $c->url_for('instructor_problem_editor');
+		$new_file_type = 'course_info';
+	} elsif ($saveMode eq 'new_independent_problem') {
+		$problemPage =
+			$c->url_for('instructor_problem_editor_withset_withproblem', setID => 'Undefined_Set', problemID => 1);
 		$new_file_type = 'source_path_for_problem_file';
+	} elsif ($saveMode eq 'new_hardcopy_theme') {
+		$problemPage                  = $c->url_for('instructor_problem_editor');
+		$new_file_type                = 'hardcopy_theme';
+		$extra_params{hardcopy_theme} = $new_file_name =~ s|^.*\/([^/]*\.xml)|$1|r;
 	} elsif ($saveMode eq 'rename') {
-		$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",$r,
-			courseID => $courseName, setID => $setName, problemID => $problemNumber
+		$problemPage = $c->url_for(
+			'instructor_problem_editor_withset_withproblem',
+			setID     => $c->{setID},
+			problemID => $c->{problemID}
 		);
 		$new_file_type = $file_type;
 	} elsif ($saveMode eq 'add_to_set_as_new_problem') {
-		$problemPage = $self->r->urlpath->newFromModule(
-			'WeBWorK::ContentGenerator::Instructor::PGProblemEditor', $r,
-			courseID  => $courseName,
-			setID     => $setName,
-			problemID => $do_not_save
-			? $problemNumber
-			: WeBWorK::Utils::max($self->r->db->listGlobalProblems($setName))
+		$problemPage = $c->url_for(
+			'instructor_problem_editor_withset_withproblem',
+			setID     => $c->{setID},
+			problemID => $do_not_save ? $c->{problemID} : max($db->listGlobalProblems($c->{setID}))
 		);
 		$new_file_type = $file_type;
 	} else {
-		$self->addbadmessage(" Please use radio buttons to choose the method for saving this file. Can't recognize saveMode: |$saveMode|.");
-		# can't continue since paths have not been properly defined.
-		return "";
+		$c->addbadmessage($c->maketext(
+			'Please use radio buttons to choose the method for saving this file. Uknown saveMode: [_1].', $saveMode
+		));
+		return;
 	}
 
-	my $relativeOutputFilePath = $self->getRelativeSourceFilePath($outputFilePath);
-
-	my $viewURL = $self->systemLink($problemPage,
-		params=>{
-			sourceFilePath     => $relativeOutputFilePath, #The path relative to the templates directory is required.
-			problemSeed        => $problemSeed,
-			edit_level         => $edit_level,
-			file_type          => $new_file_type,
-			status_message     => uri_escape_utf8($self->{status_message})
+	$c->reply_with_redirect($c->systemLink(
+		$problemPage,
+		params => {
+			# The path relative to the templates directory is required.
+			sourceFilePath => $c->getRelativeSourceFilePath($outputFilePath),
+			problemSeed    => $c->{problemSeed},
+			file_type      => $new_file_type,
+			status_message => $c->{status_message}->join(''),
+			%extra_params
 		}
-	);
-
-	$self->reply_with_redirect($viewURL);
-	return "";  # no redirect needed
-}
-
-sub revert_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-	my $editFilePath    = $self->{editFilePath};
-	return $r->maketext("Error: The original file [_1] cannot be read.", $editFilePath) unless -r $editFilePath;
-	return "" unless defined($self->{tempFilePath}) and -e $self->{tempFilePath} ;
-	return $r->maketext("Revert to [_1]", CGI::span({ dir => 'ltr' }, $self->shortPath($editFilePath)));
+	));
+	return;
 }
 
-sub revert_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $ce = $self->r->ce;
-	#$self->addgoodmessage("revert_handler called");
-	my $editFilePath       = $self->{editFilePath};
-	$self->{inputFilePath} = $editFilePath;
-	# unlink the temp files;
-	die "tempFilePath is unsafe!" unless path_is_subdir($self->{tempFilePath}, $ce->{courseDirs}->{templates}, 1); # 1==path can be relative to dir
-	unlink($self->{tempFilePath});
-	$self->addgoodmessage("Deleting temp file at " . $self->shortPath($self->{tempFilePath}));
-	$self->{tempFilePath}  = '';
-	my $problemContents    ='';
-	$self->{r_problemContents} = \$problemContents;
-	$self->addgoodmessage("Reverting to original file '".$self->shortPath($editFilePath)."'");
-	# no redirect is needed
-}
+sub revert_handler ($c) {
+	my $ce   = $c->ce;
+	my $user = $c->param('user');
 
-sub output_JS {
-	my $self = shift;
-	my $ce   = $self->r->ce;
+	unless (path_is_subdir($c->{tempFilePath}, $ce->{courseDirs}{templates}, 1)) {
+		$c->addbadmessage($c->maketext(
+			'The temporary file [_1] is not contained in the course templates directory and can not be deleted.',
+			$c->{tempFilePath}
+		));
+		return;
+	}
 
-	WeBWorK::ContentGenerator::Instructor::CodeMirrorEditor::output_codemirror_static_files($ce);
+	# Determine revert action
+	my $revertType = $c->param('action.revert.type') // '';
+
+	if ($revertType eq 'revert') {
+		$c->{inputFilePath} = $c->{editFilePath};
+		unlink($c->{tempFilePath});
+		$c->addgoodmessage($c->maketext('Deleted temporary file "[_1]".',    $c->shortPath($c->{tempFilePath})));
+		$c->addgoodmessage($c->maketext('Reverted to original file "[_1]".', $c->shortPath($c->{editFilePath})));
+	} elsif ($revertType eq 'backup') {
+		my $backupTime     = $c->param('action.revert.backup.time') || '';
+		my $backupFilePath = $c->{backupBasePath} . $backupTime;
+		$c->{inputFilePath} = $c->{tempFilePath};
+
+		if (-r $backupFilePath) {
+			copy($backupFilePath, $c->{tempFilePath});
+			$c->addgoodmessage($c->maketext(
+				'Restored backup from [_1].',
+				$c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+			));
+		} else {
+			$c->addbadmessage($c->maketext('Unable to read backup file "[_1]".', $c->shortPath($backupFilePath)));
+		}
+	} elsif ($revertType eq 'delete') {
+		my $delTime     = $c->param('action.revert.delete.time');
+		my $delFilePath = $c->{backupBasePath} . $delTime;
+
+		if (-e $delFilePath) {
+			unlink($delFilePath);
+			$c->addgoodmessage($c->maketext(
+				'Deleted backup from [_1].',
+				$c->formatDateTime($delTime, undef, $ce->{studentDateDisplayFormat})
+			));
+		} else {
+			$c->addbadmessage($c->maketext('Unable to delete backup file "[_1]".', $c->shortPath($delFilePath)));
+		}
+		return;
+	} else {
+		return;
+	}
 
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/ActionTabs/actiontabs.js'),           defer => undef }, '');
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/PGProblemEditor/pgproblemeditor.js'), defer => undef }, '');
+	$c->{r_problemContents} = \'';
+	$c->param('problemContents', undef);
 
-	return '';
+	return;
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm b/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm
index d7f8293154..617c09389a 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -13,414 +13,196 @@
 # Artistic License for more details.
 ################################################################################
 
-#This is a page for manually grading webwork problems.
-
 package WeBWorK::ContentGenerator::Instructor::ProblemGrader;
-use base qw(WeBWorK::ContentGenerator);
-use WeBWorK::Utils qw(sortByName getAssetURL);
-use WeBWorK::PG;
-use HTML::Entities;
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures, -async_await;
 
 =head1 NAME
 
-=cut
-
-use strict;
-use warnings;
-
-sub pre_header_initialize {
-
-	my ($self)  = @_;
-	my $r       = $self->r;
-	my $ce      = $r->ce;
-	my $db      = $r->db;
-	my $authz   = $r->authz;
-	my $urlpath = $r->urlpath;
-
-	my $setName           = $urlpath->arg("setID");
-	my $problemNumber     = $r->urlpath->arg("problemID");
-	my $userName          = $r->param('user');
-	my $effectiveUserName = $r->param('effectiveUser');
-	my $key               = $r->param('key');
-	my $editMode          = $r->param("editMode");
-
-	# Check permissions
-	return unless $authz->hasPermissions($userName, "access_instructor_tools");
-	return unless $authz->hasPermissions($userName, "score_sets");
-
-	my $user = $db->getUser($userName);
-	die "Couldn't find user $user" unless $user;
-
-	my $displayMode = $user->displayMode ? $user->displayMode : $ce->{pg}->{options}->{displayMode};
-	$self->{displayMode} = $displayMode;
-}
-
-sub head {
-	my $self = shift;
-	my $r    = $self->r;
-	my $ce   = $r->ce;
-
-	my $site_url = $ce->{webworkURLs}->{htdocs};
-
-	print CGI::script({ src => "$site_url/js/apps/ProblemGrader/problemgrader.js", defer => undef }, '');
-
-	return "";
-
-}
+WeBWorK::ContentGenerator::Instructor::ProblemGrader - This is a page for
+manually grading webwork problems.
 
-sub initialize {
-	my ($self)     = @_;
-	my $r          = $self->r;
-	my $urlpath    = $r->urlpath;
-	my $authz      = $r->authz;
-	my $db         = $r->db;
-	my $ce         = $r->ce;
-	my $courseName = $urlpath->arg("courseID");
-	my $setID      = $urlpath->arg("setID");
-	my $problemID  = $urlpath->arg("problemID");
-	my $user       = $r->param('user');
+=cut
 
-	# Check permissions
-	return unless $authz->hasPermissions($user, "access_instructor_tools");
-	return unless $authz->hasPermissions($user, "score_sets");
+use HTML::Entities;
 
-	# Get all users except the set level proctors, and restrict to the sections or recitations that are allowed for the
-	# user if such restrictions are defined.  The users are sorted first by section, then by last name.
-	$self->{users} = [
+use WeBWorK::Utils qw(sortByName wwRound format_set_name_display jitar_id_to_seq getTestProblemPosition);
+use WeBWorK::Utils::Rendering qw(renderPG);
+
+async sub initialize ($c) {
+	my $authz      = $c->authz;
+	my $db         = $c->db;
+	my $ce         = $c->ce;
+	my $courseName = $c->stash('courseID');
+	my $setID      = $c->stash('setID');
+	my $problemID  = $c->stash('problemID');
+	my $userID     = $c->param('user');
+
+	# Make sure these are defined for the template.
+	$c->stash->{set}          = $db->getGlobalSet($setID);
+	$c->stash->{problem}      = $db->getGlobalProblem($setID, $problemID);
+	$c->stash->{users}        = [];
+	$c->stash->{haveSections} = 0;
+
+	return
+		unless $c->stash->{set}
+		&& $c->stash->{problem}
+		&& $authz->hasPermissions($userID, 'access_instructor_tools')
+		&& $authz->hasPermissions($userID, 'score_sets');
+
+	# Get all users of the set, and restrict to the sections or recitations that are allowed for the user if such
+	# restrictions are defined.  For gateway sets only get users for which versions exist.  The users are sorted by
+	# section, last name, first name, and then user_id.
+	$c->stash->{users} = [
 		$db->getUsersWhere(
 			{
-				user_id => { not_like => 'set_id:%' },
-				$ce->{viewable_sections}{$user} || $ce->{viewable_recitations}{$user}
+				user_id => [
+					map { $_->[0] } (
+						$c->stash->{set}->assignment_type =~ /gateway/
+						? $db->listSetVersionsWhere({ set_id => { like => "$setID,v\%" } })
+						: $db->listUserSetsWhere({ set_id => $setID })
+					)
+				],
+				$ce->{viewable_sections}{$userID} || $ce->{viewable_recitations}{$userID}
 				? (
 					-or => [
-						$ce->{viewable_sections}{$user}    ? (section    => $ce->{viewable_sections}{$user})    : (),
-						$ce->{viewable_recitations}{$user} ? (recitation => $ce->{viewable_recitations}{$user}) : ()
+						$ce->{viewable_sections}{$userID} ? (section => $ce->{viewable_sections}{$userID}) : (),
+						$ce->{viewable_recitations}{$userID}
+						? (recitation => $ce->{viewable_recitations}{$userID})
+						: ()
 					]
 					)
 				: ()
 			},
-			[qw/section last_name/]
+			[qw/section last_name first_name user_id/]
 		)
 	];
 
-	# if we need to gothrough and update grades
-	if ($r->param('assignGrades')) {
-		$self->addmessage(CGI::div(
-			{ class => 'alert alert-success p-1 mb-0' },
-			$r->maketext("Grades have been saved for all current users.")
-		));
+	# First process student problems and answers and cache relevant data used both for
+	# saving grades and displaying the grader table.
+	for my $user (@{ $c->stash->{users} }) {
+		$user->{displayName} =
+			$user->last_name || $user->first_name ? $user->last_name . ', ' . $user->first_name : $user->user_id;
+		$c->stash->{haveSections} = 1 if $user->section;
+
+		if ($c->stash->{set}->assignment_type =~ /gateway/) {
+			$user->{data} = [
+				map { { problem => $_ } } $db->getProblemVersionsWhere(
+					{ user_id => $user->user_id, problem_id => $problemID, set_id => { like => "$setID,v\%" } }
+				)
+			];
+		} else {
+			$user->{data} =
+				[ map { { problem => $_ } } $db->getUserProblem($user->user_id, $setID, $problemID) ];
+		}
 
-		for my $user (@{ $self->{users} }) {
-			my $userID      = $user->user_id;
-			my $userProblem = $db->getUserProblem($userID, $setID, $problemID);
-			next unless $userProblem && defined($r->param("$userID.score"));
-			#update grades and set flags
-			$userProblem->{flags} =~ s/needs_grading/graded/;
-			if ($r->param("$userID.mark_correct")) {
-				$userProblem->status(1);
-			} else {
-				my $newscore = $r->param("$userID.score") / 100;
-				if ($newscore != $userProblem->status) {
-					$userProblem->status($newscore);
-				}
-			}
+		for (@{ $user->{data} }) {
+			next unless defined $_->{problem};
+			my $versionID = ref($_->{problem}) =~ /::ProblemVersion/ ? $_->{problem}->version_id : 0;
+			my $userPastAnswerID =
+				$db->latestProblemPastAnswer($courseName, $user->user_id, $setID . ($versionID ? ",v$versionID" : ''),
+					$problemID);
+			$_->{past_answer} = $db->getPastAnswer($userPastAnswerID) if ($userPastAnswerID);
+			($_->{problemNumber}, $_->{pageNumber}) = getTestProblemPosition($db, $_->{problem}) if $versionID;
+
+		}
+	}
 
-			$db->putUserProblem($userProblem);
+	# Update grades if saving.
+	if ($c->param('assignGrades')) {
+		$c->addgoodmessage($c->maketext('Grades have been saved for all current users.'));
+
+		for my $user (@{ $c->stash->{users} }) {
+			my $userID = $user->user_id;
+			for (@{ $user->{data} }) {
+				next unless defined $_->{problem};
+
+				my $versionID = ref($_->{problem}) =~ /::ProblemVersion/ ? $_->{problem}->version_id : 0;
+
+				# Only save if there is a change made.  This prevents the "needs_grading" flag from being removed until
+				# the instructor explicitly grades the problem for this student.
+				next
+					unless (defined $c->param("$userID.$versionID.score")
+						&& $c->param("$userID.$versionID.score") / 100 != $_->{problem}->status)
+					|| $c->param("$userID.$versionID.mark_correct")
+					|| ($c->param("$userID.$versionID.comment") && defined $_->{past_answer});
+
+				# Update grades and set flags.
+				$_->{problem}{flags} =~ s/:needs_grading$//;
+				if ($c->param("$userID.$versionID.mark_correct")) {
+					$_->{problem}->status(1);
+				} elsif (defined $c->param("$userID.$versionID.score")) {
+					my $newscore = $c->param("$userID.$versionID.score") / 100;
+					if ($newscore != $_->{problem}->status) { $_->{problem}->status($newscore); }
+				}
 
-			#if the instructor added a comment we should save that to the latest answer
-			if ($r->param("$userID.comment")) {
-				my $comment          = $r->param("$userID.comment");
-				my $userPastAnswerID = $db->latestProblemPastAnswer($courseName, $userID, $setID, $problemID);
+				if   ($versionID) { $db->putProblemVersion($_->{problem}); }
+				else              { $db->putUserProblem($_->{problem}); }
 
-				if ($userPastAnswerID) {
-					my $userPastAnswer = $db->getPastAnswer($userPastAnswerID);
-					$userPastAnswer->comment_string($comment);
-					warn "Couldn't save comment" unless $db->putPastAnswer($userPastAnswer);
+				# Save the instructor comment to the latest past answer.
+				if ($c->param("$userID.$versionID.comment") && defined $_->{past_answer}) {
+					$_->{past_answer}->comment_string($c->param("$userID.$versionID.comment"));
+					$db->putPastAnswer($_->{past_answer});
 				}
 			}
 		}
 	}
-}
-
-sub body {
-	my ($self)      = @_;
-	my $r           = $self->r;
-	my $urlpath     = $r->urlpath;
-	my $db          = $r->db;
-	my $ce          = $r->ce;
-	my $authz       = $r->authz;
-	my $webworkRoot = $ce->{webworkURLs}->{root};
-	my $courseName  = $urlpath->arg("courseID");
-	my $setID       = $urlpath->arg("setID");
-	my $problemID   = $urlpath->arg("problemID");
-	my $userID      = $r->param('user');
-	my $key         = $r->param('key');
-	my $displayMode = $self->{displayMode};
-	my $formFields  = { WeBWorK::Form->new_from_paramable($r)->Vars };
-
-	# to make grabbing these options easier, we'll pull them out now...
-	my %imagesModeOptions = %{ $ce->{pg}->{displayModeOptions}->{images} };
-
-	# set up some display stuff
-	my $imgGen = WeBWorK::PG::ImageGenerator->new(
-		tempDir         => $ce->{webworkDirs}->{tmp},
-		latex           => $ce->{externalPrograms}->{latex},
-		dvipng          => $ce->{externalPrograms}->{dvipng},
-		useCache        => 1,
-		cacheDir        => $ce->{webworkDirs}->{equationCache},
-		cacheURL        => $ce->{webworkURLs}->{equationCache},
-		cacheDB         => $ce->{webworkFiles}->{equationCacheDB},
-		dvipng_align    => $imagesModeOptions{dvipng_align},
-		dvipng_depth_db => $imagesModeOptions{dvipng_depth_db},
-	);
 
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-		CGI::p("You are not authorized to acces the Instructor tools."))
-		unless $authz->hasPermissions($userID, "access_instructor_tools");
-
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-		CGI::p("You are not authorized to grade homework sets."))
-		unless $authz->hasPermissions($userID, "score_sets");
-
-	my $set     = $db->getMergedSet($userID, $setID);                    # checked
-	my $problem = $db->getMergedProblem($userID, $setID, $problemID);    # checked
-	my $user    = $db->getUser($userID);
-
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-		CGI::p($r->maketext("This set needs to be assigned to you before you can grade it.")))
-		unless $set && $problem;
+	return
+		unless @{ $c->stash->{users} }
+		&& @{ $c->stash->{users}[0]{data} }
+		&& defined $c->stash->{users}[0]{data}[0]{problem};
+
+	# Render the first student's problem.
+	my ($set, $problem);
+	if ($c->stash->{set}->assignment_type =~ /gateway/) {
+		$set = $db->getMergedSetVersion($c->stash->{users}[0]->user_id,
+			$setID, $c->stash->{users}[0]{data}[0]{problem}->version_id);
+		$problem = $db->getMergedProblemVersion($c->stash->{users}[0]->user_id,
+			$setID, $c->stash->{users}[0]{data}[0]{problem}->version_id, $problemID);
+	} else {
+		$set     = $db->getMergedSet($c->stash->{users}[0]->user_id, $setID);
+		$problem = $db->getMergedProblem($c->stash->{users}[0]->user_id, $setID, $problemID);
+	}
 
-	#set up a silly problem to render the problem text
-	my $pg = WeBWorK::PG->new(
-		$ce,
-		$user,
-		$key,
-		$set,
-		$problem,
-		$set->psvn,    # FIXME: this field should be removed
-		$formFields,
-		{              # translation options
-			displayMode              => $displayMode,
+	# These should always be defined except for some odd edge cases.
+	return unless $set && $problem;
+
+	# Get the current user for the displayMode.
+	my $user = $db->getUser($userID);
+
+	# Render the problem text.
+	$c->stash->{pg} = await renderPG(
+		$c,
+		$c->stash->{users}[0],
+		$set, $problem,
+		$set->psvn,
+		{},
+		{
+			displayMode              => $user->displayMode || $c->ce->{pg}{options}{displayMode},
 			showHints                => 0,
 			showSolutions            => 0,
 			refreshMath2img          => 0,
 			processAnswers           => 1,
 			permissionLevel          => $db->getPermissionLevel($userID)->permission,
 			effectivePermissionLevel => $db->getPermissionLevel($userID)->permission,
+			isInstructor             => 1
 		},
 	);
 
-	# check to see what type the answers are.  right now it only checks for essay but could do more
-	my %answerHash = %{ $pg->{answers} };
-	my @answerTypes;
-
-	foreach (sortByName(undef, keys %answerHash)) {
-		push(@answerTypes, $answerHash{$_}->{type});
-	}
-
-	print CGI::div({ class => 'problem-content col-md-12 col-lg-10' }, $pg->{body_text});
-
-	print CGI::start_form({
-		method => "post",
-		action => $self->systemLink($urlpath, authen => 0),
-		id     => "problem-grader-form",
-		name   => "problem-grader-form"
-	});
-
-	my $selectAll = CGI::input({
-		type  => 'button',
-		id    => 'check_all_mark_corrects',
-		value => $r->maketext('Mark All'),
-		class => 'btn btn-secondary btn-sm'
-	});
-
-	print CGI::start_div({ class => 'table-responsive' }), CGI::start_table({ width => '1020px' });
-	print CGI::Tr(
-		{ -valign => "top" },
-		CGI::th([
-			$r->maketext("Section"), $r->maketext("Name"),
-			"&nbsp;",                $r->maketext("Latest Answers"),
-			"&nbsp;",                $r->maketext("Mark Correct") . "<br>" . $selectAll,
-			"&nbsp;",                $r->maketext("Score (%)"),
-			"&nbsp;",                $r->maketext("Comment")
-		])
-	);
-	print CGI::Tr(
-		CGI::td([ CGI::hr(), CGI::hr(), "", CGI::hr(), "", CGI::hr(), "", CGI::hr(), "", CGI::hr(), "&nbsp;" ]));
-
-	my $viewProblemPage = $urlpath->new(
-		type => 'problem_detail',
-		args => { courseID => $courseName, setID => $setID, problemID => $problemID }
-	);
-
-	my %dropDown;
-	my $delta = $ce->{options}{problemGraderScoreDelta};
-	#construct the drop down.
-	for (my $i = int(100 / $delta); $i >= 0; $i--) {
-		$dropDown{ $i * $delta } = $i * $delta;
-	}
-
-	my @scores = sort { $b <=> $a } keys %dropDown;
-
-	#for each user get their latest answer from the past answer db
-	foreach my $userRecord (@{ $self->{users} }) {
-
-		my $statusClass = $ce->status_abbrev_to_name($userRecord->status) || "";
-
-		my $userID           = $userRecord->user_id;
-		my $viewProblemLink  = $self->systemLink($viewProblemPage, params => { effectiveUser => $userID });
-		my $userPastAnswerID = $db->latestProblemPastAnswer($courseName, $userID, $setID, $problemID);
-		my $userAnswerString;
-		my $comment        = "";
-		my $userProblem    = $db->getUserProblem($userID, $setID, $problemID);
-		my $noCommentField = 0;
-
-		next unless $userProblem;
-
-		if ($userPastAnswerID && $userProblem) {
-
-			my $userPastAnswer = $db->getPastAnswer($userPastAnswerID);
-			my @scores         = split(//,   $userPastAnswer->scores);
-			my @answers        = split(/\t/, $userPastAnswer->answer_string);
-			$comment = $userPastAnswer->comment_string;
-
-			#Skip this answer if the pg file doesn't match the current pg file
-			if (defined($userPastAnswer->source_file)
-				&& $userPastAnswer->source_file ne $problem->source_file)
-			{
-				next;
-			}
-
-			for (my $i = 0; $i <= $#answers; $i++) {
-
-				my $answer = $answers[$i];
-
-				#generate answer text.  Need to process it if its an essay answer
-				# if the answwer Type is undefined then just print the result and hope for the best.
-
-				if (!defined($answerTypes[$i])) {
-					$userAnswerString .= CGI::p(HTML::Entities::encode_entities($answer));
-
-				} elsif ($answerTypes[$i] eq 'essay') {
-
-					$answer = HTML::Entities::encode_entities($answer);
-					$answer =~ s/\n/<br>/g;
-					$userAnswerString .= CGI::div({ class => 'essay-answer' }, $answer);
-
-				} elsif ($answerTypes[$i] eq 'Value (Formula)') {
-					#if its a formula then render it and color it
-					$userAnswerString .= CGI::div(
-						{
-							class => 'graded-answer',
-							style => $scores[$i] ? "color:#006600" : "color:#660000"
-						},
-						'`' . HTML::Entities::encode_entities($answer) . '`'
-					);
-
-				} else {
-					# if it isnt an essay then don't render it but color it
-					$userAnswerString .= CGI::div(
-						{
-							class => 'graded-answer',
-							style => $scores[$i] ? "color:#006600" : "color:#660000"
-						},
-						HTML::Entities::encode_entities($answer)
-					);
-				}
-			}
-
-		} else {
-			$noCommentField   = 1;
-			$userAnswerString = "There are no answers for this student.";
-		}
-
-		my $score = int(100 * $userProblem->status);
-
-		my $prettyName = $userRecord->last_name . ", " . $userRecord->first_name;
-
-		#create form for scoring
-
-		my $commentBox = '';
-		$commentBox = CGI::textarea({
-			name  => "$userID.comment",
-			value => "$comment",
-			rows  => 3,
-			class => 'form-control'
-		})
-			. CGI::br()
-			. CGI::input({
-				class => 'preview btn btn-secondary btn-sm',
-				type  => 'button',
-				name  => "$userID.preview",
-				value => "Preview"
-			})
-			unless $noCommentField;
-
-		# this selects the score available in the drop down that is just above the student score
-		my $selectedScore = 0;
-		foreach my $item (@scores) {
-			if ($score <= $item) {
-				$selectedScore = $item;
-			}
-		}
-
-		print CGI::Tr(
-			{ valign => "top" },
-			CGI::td([
-				$userRecord->section,
-				CGI::div(
-					{
-						class => $userProblem->flags =~ /needs_grading/
-						? "NeedsGrading $statusClass"
-						: $statusClass
-					},
-					CGI::a({ href => $viewProblemLink, target => "WW_View" }, $prettyName)
-				),
-				" ",
-				$userAnswerString,
-				" ",
-				CGI::checkbox({
-					type  => "checkbox",
-					class => "mark_correct form-check-input",
-					name  => "$userID.mark_correct",
-					value => "1",
-					label => "",
+	return;
+}
 
-				}),
-				" ",
-				CGI::popup_menu({
-					name    => "$userID.score",
-					class   => "score-selector form-select form-select-sm",
-					values  => \@scores,
-					default => $selectedScore,
-					labels  => \%dropDown
-				}),
-				" ",
-				$commentBox
-			])
-		);
-		print CGI::Tr(
-			CGI::td([ CGI::hr(), CGI::hr(), "", CGI::hr(), "", CGI::hr(), "", CGI::hr(), "", CGI::hr(), "&nbsp;" ])
-		);
+sub page_title ($c) {
+	my $problemID = $c->stash('problemID');
+	if ($c->stash->{set} && $c->stash->{set}->assignment_type eq 'jitar') {
+		$problemID = join('.', jitar_id_to_seq($problemID));
 	}
-
-	print CGI::end_table(), CGI::end_div();
-	print $self->hidden_authen_fields;
-	print CGI::submit({ name => "assignGrades", value => $r->maketext("Save"), class => 'btn btn-primary' });
-
-	print CGI::end_form();
-
-	return "";
+	return $c->maketext('Manual Grader for [_1]: Problem [_2]',
+		$c->tag('span', dir => 'ltr', format_set_name_display($c->stash->{set}->set_id)), $problemID);
 }
 
-sub output_CSS {
-	my $self = shift;
-	my $ce   = $self->r->ce;
-
-	# PG styles
-	print CGI::Link({ rel => 'stylesheet', href => getAssetURL($ce, 'js/apps/Problem/problem.css') });
-
-	return '';
+sub siblings ($c) {
+	return $c->include('ContentGenerator/Instructor/ProblemGrader/siblings');
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm
index e7c96188f3..96f11bb3dc 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,443 +14,652 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Instructor::ProblemSetDetail;
-use base qw(WeBWorK::ContentGenerator::Instructor);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
-WeBWorK::ContentGenerator::Instructor::ProblemSetDetail - Edit general set and specific user/set information as well as problem information
+WeBWorK::ContentGenerator::Instructor::ProblemSetDetail - Edit general set and
+specific user/set information as well as problem information
 
 =cut
 
-use strict;
-use warnings;
-#use CGI qw(-nosticky );
-use WeBWorK::CGI;
-use WeBWorK::Utils qw(after readDirectory list2hash sortByName listFilesRecursive max cryptPassword jitar_id_to_seq
-	seq_to_jitar_id x getAssetURL format_set_name_internal format_set_name_display);
-use WeBWorK::Utils::Tasks qw(renderProblems);
-use WeBWorK::Debug;
-# IP RESTRICT
-
-# Important Note: the following two sets of constants may seem similar
-# 	but they are functionally and semantically different
-
-# these constants determine which fields belong to what type of record
-use constant SET_FIELDS => [qw(set_header hardcopy_header open_date reduced_scoring_date due_date answer_date visible description enable_reduced_scoring  restricted_release restricted_status restrict_ip relax_restrict_ip assignment_type attempts_per_version version_time_limit time_limit_cap versions_per_interval time_interval problem_randorder problems_per_page hide_score:hide_score_by_problem hide_work hide_hint restrict_prob_progression email_instructor)];
-use constant PROBLEM_FIELDS =>[qw(source_file value max_attempts showMeAnother prPeriod att_to_open_children counts_parent_grade)];
+use WeBWorK::Utils qw(cryptPassword jitar_id_to_seq seq_to_jitar_id x format_set_name_internal format_set_name_display);
+use WeBWorK::Utils::Instructor qw(assignProblemToAllSetUsers addProblemToSet);
+
+# These constants determine which fields belong to what type of record.
+use constant SET_FIELDS => [
+	qw(set_header hardcopy_header open_date reduced_scoring_date due_date answer_date visible description
+		enable_reduced_scoring  restricted_release restricted_status restrict_ip relax_restrict_ip
+		assignment_type use_grade_auth_proctor attempts_per_version version_time_limit time_limit_cap
+		versions_per_interval time_interval problem_randorder problems_per_page
+		hide_score:hide_score_by_problem hide_work hide_hint restrict_prob_progression email_instructor)
+];
+use constant PROBLEM_FIELDS =>
+	[qw(source_file value max_attempts showMeAnother showHintsAfter prPeriod att_to_open_children counts_parent_grade)];
 use constant USER_PROBLEM_FIELDS => [qw(problem_seed status num_correct num_incorrect)];
 
-# these constants determine what order those fields should be displayed in
+# These constants determine what order those fields should be displayed in.
 use constant HEADER_ORDER => [qw(set_header hardcopy_header)];
-use constant PROBLEM_FIELD_ORDER => [qw(problem_seed status value max_attempts showMeAnother prPeriod attempted last_answer num_correct num_incorrect)];
-# for gateway sets, we don't want to allow users to change max_attempts on a per
-#    problem basis, as that's nothing but confusing.
-use constant GATEWAY_PROBLEM_FIELD_ORDER => [qw(problem_seed status value attempted last_answer num_correct num_incorrect)];
-use constant JITAR_PROBLEM_FIELD_ORDER => [qw(problem_seed status value max_attempts showMeAnother prPeriod att_to_open_children counts_parent_grade attempted last_answer num_correct num_incorrect)];
-
-
-# we exclude the gateway set fields from the set field order, because they
-#     are only displayed for sets that are gateways.  this results in a bit of
-#     convoluted logic below, but it saves burdening people who are only using
-#     homework assignments with all of the gateway parameters
-# FIXME: in the long run, we may want to let hide_score and hide_work be
-# FIXME: set for non-gateway assignments.  right now (11/30/06) they are
-# FIXME: only used for gateways
-use constant SET_FIELD_ORDER => [qw(open_date reduced_scoring_date due_date answer_date visible enable_reduced_scoring restricted_release restricted_status restrict_ip relax_restrict_ip hide_hint assignment_type)];
-# use constant GATEWAY_SET_FIELD_ORDER => [qw(attempts_per_version version_time_limit time_interval versions_per_interval problem_randorder problems_per_page hide_score hide_work)];
-use constant GATEWAY_SET_FIELD_ORDER => [qw(version_time_limit time_limit_cap attempts_per_version time_interval versions_per_interval problem_randorder problems_per_page hide_score:hide_score_by_problem hide_work)];
+use constant PROBLEM_FIELD_ORDER => [
+	qw(problem_seed status value max_attempts showMeAnother showHintsAfter prPeriod attempted last_answer num_correct
+		num_incorrect)
+];
+# For gateway sets, don't allow changing max_attempts on a per problem basis.
+use constant GATEWAY_PROBLEM_FIELD_ORDER =>
+	[qw(problem_seed status value attempted last_answer num_correct num_incorrect)];
+use constant JITAR_PROBLEM_FIELD_ORDER => [
+	qw(problem_seed status value max_attempts showMeAnother showHintsAfter prPeriod att_to_open_children
+		counts_parent_grade attempted last_answer num_correct num_incorrect)
+];
+
+# Exclude the gateway set fields from the set field order, because they are only displayed for sets that are gateways.
+# This results in a bit of convoluted logic below, but it saves burdening people who are only using homework assignments
+# with all of the gateway parameters.
+# FIXME: In the long run, we may want to let hide_score and hide_work be set for non-gateway assignments.  Currently
+# they are only used for gateways.
+use constant SET_FIELD_ORDER => [
+	qw(open_date reduced_scoring_date due_date answer_date visible enable_reduced_scoring restricted_release
+		restricted_status restrict_ip relax_restrict_ip hide_hint assignment_type)
+];
+use constant GATEWAY_SET_FIELD_ORDER => [
+	qw(version_time_limit time_limit_cap attempts_per_version time_interval versions_per_interval problem_randorder
+		problems_per_page hide_score:hide_score_by_problem hide_work)
+];
 use constant JITAR_SET_FIELD_ORDER => [qw(restrict_prob_progression email_instructor)];
 
-# this constant is massive hash of information corresponding to each db field.
-# override indicates for how many students at a time a field can be overridden
-# this hash should make it possible to NEVER have explicitly: if (somefield) { blah() }
+# This constant is a massive hash of information corresponding to each db field.
+# This hash should make it possible to NEVER have explicitly: if (somefield) { blah() }
 #
-#	All but name are optional
-#	some_field => {
-#		name      => "Some Field",
-#		type      => "edit",		# edit, choose, hidden, view - defines how the data is displayed
-#		size      => "50",		# size of the edit box (if any)
-#		override  => "none",		# none, one, any, all - defines for whom this data can/must be overidden
-#		module    => "problem_list",	# WeBWorK module
-#		default   => 0			# if a field cannot default to undefined/empty what should it default to
-#		labels    => {			# special values can be hashed to display labels
-#				1 => "Yes",
-#				0 => "No",
-#		},
-#               convertby => 60,                # divide incoming database field values by this, and multiply when saving
-
-use constant BLANKPROBLEM => 'blankProblem.pg';
-
-# We use the x function to mark strings for localizaton
+# All but name are optional
+#   some_field => {
+#     name      => "Some Field",
+#     type      => "edit",          # edit, choose, hidden, view - defines how the data is displayed
+#     size      => "50",            # size of the edit box (if any)
+#     override  => "none",          # none, one, any, all - defines for whom this data can/must be overidden
+#     module    => "problem_list",  # WeBWorK module
+#     default   => 0                # if a field cannot default to undefined/empty what should it default to
+#     labels    => {                # special values can be hashed to display labels
+#       1 => x('Yes'),
+#       0 => x('No'),
+#     },
+#     convertby => 60,              # divide incoming database field values by this, and multiply when saving
+
+use constant BLANKPROBLEM => 'newProblem.pg';
+
+# Use the x function to mark strings for localizaton.
 use constant FIELD_PROPERTIES => {
 	# Set information
 	set_header => {
-		name      => x("Set Header"),
-		type      => "edit",
-		size      => "50",
-		override  => "all",
-		module    => "problem_list",
-		default   => "",
+		name     => x('Set Header'),
+		type     => 'edit',
+		size     => '50',
+		override => 'all',
+		module   => 'problem_list',
+		default  => '',
 	},
 	hardcopy_header => {
-		name      => x("Hardcopy Header"),
-		type      => "edit",
-		size      => "50",
-		override  => "all",
-		module    => "hardcopy_preselect_set",
-		default   => "",
+		name     => x('Hardcopy Header'),
+		type     => 'edit',
+		size     => '50',
+		override => 'all',
+		module   => 'hardcopy_preselect_set',
+		default  => '',
 	},
 	description => {
-		name      => x("Description"),
-		type      => "edit",
-		override  => "all",
-		default   => "",
+		name     => x('Description'),
+		type     => 'edit',
+		override => 'all',
+		default  => '',
 	},
 	open_date => {
-		name      => x("Opens"),
-		type      => "edit",
-		size      => "25",
-		override  => "any",
+		name      => x('Open Date'),
+		type      => 'edit',
+		size      => '25',
+		override  => 'any',
+		help_text => x(
+			'This is generally the date when students can begin visiting the set and submitting answers. '
+				. 'Prior to this date, if the set is assigned to a user and it is flagged "visible", '
+				. 'they can see that it exists and when it will open, but cannot view the problems. '
+				. 'If using "course" grade passback to an LMS, only those sets that are past their open date '
+				. 'are factored in to the overall course grade that is passed back.  Note that certain '
+				. 'permissions can be changed so that the details explained here are no longer true.'
+		)
 	},
 	due_date => {
-		name      => x("Closes"),
-		type      => "edit",
-		size      => "25",
-		override  => "any",
+		name      => x('Close Date'),
+		type      => 'edit',
+		size      => '25',
+		override  => 'any',
+		help_text => x(
+			'This is generally the date when students can no longer use the "Submit" button to submit an answer and '
+				. 'have it assessed for credit.  However students can still visit the set, type or select answers, '
+				. 'and use the "Check Answers" button to be assessed without credit.  Note that certain permissions '
+				. 'can be changed so that the details explained here are no longer true. This date must come on or '
+				. 'after the open date.'
+		)
 	},
 	answer_date => {
-		name      => x("Answers Available"),
-		type      => "edit",
-		size      => "25",
-		override  => "any",
+		name      => x('Answers Available Date'),
+		type      => 'edit',
+		size      => '25',
+		override  => 'any',
+		help_text => x(
+			'This is generally the date when students can click a checkbox to see the expected correct answers '
+				. 'to problems in the set.  If a problem has a coded solution, this is also when thy can click '
+				. 'to see that solution.  Note that certain permissions can be changed so that the details '
+				. 'explained here are no longer true.  This date must come on or after the close date.'
+		)
 	},
 	visible => {
-		name      => x("Visible to Students"),
-		type      => "choose",
-		override  => "all",
-		choices   => [qw( 0 1 )],
-		labels    => {
-				1 => x("Yes"),
-				0 => x("No"),
+		name     => x('Visible to Students'),
+		type     => 'choose',
+		override => 'all',
+		choices  => [qw(0 1)],
+		labels   => {
+			1 => x('Yes'),
+			0 => x('No'),
 		},
+		help_text =>
+			x('Use this to hide the existence of this set from students, even when it is assigned to them.'),
 	},
 	enable_reduced_scoring => {
-		name      => x("Reduced Scoring Enabled"),
-		type      => "choose",
-		override  => "any",
-		choices   => [qw( 0 1 )],
-		labels    => {
-				1 => x("Yes"),
-				0 => x("No"),
+		name     => x('Reduced Scoring Enabled'),
+		type     => 'choose',
+		override => 'any',
+		choices  => [qw(0 1)],
+		labels   => {
+			1 => x('Yes'),
+			0 => x('No'),
 		},
+		help_text => x('See "Reduced Scoring Date".'),
 	},
 	reduced_scoring_date => {
-		name      => x("Reduced Scoring Date"),
-		type      => "edit",
-		size      => "25",
-		override  => "any",
+		name      => x('Reduced Scoring Date'),
+		type      => 'edit',
+		size      => '25',
+		override  => 'any',
+		help_text => x(
+			'This date should be on or after the open date, and earlier or equal to the close date. '
+				. 'Answers submitted between the reduced scoring date and the close date are scaled down '
+				. 'by a factor that you can set in the Course Config page.  If reduced scoring is being '
+				. 'used, note that students will consider the reduced scoring date to be the "due date", '
+				. 'since that is the date when they can no longer earn 100% for problems.'
+		)
 	},
 	restricted_release => {
-		name      => x("Restrict release by set(s)"),
-		type      => "edit",
-		size      => "30",
-		override  => "any",
-                help_text => x("This set will be unavailable to students until they have earned a certain score on the sets specified in this field.  The sets should be written as a comma separated list.  The minimum score required on the sets is specified in the following field.")
+		name      => x('Restrict Release by Set(s)'),
+		type      => 'edit',
+		size      => '30',
+		override  => 'any',
+		help_text => x(
+			'This set will be unavailable to students until they have earned the "Score Required for Release" on the '
+				. 'sets specified in this field.  The sets should be written as a comma separated list.'
+		)
 	},
 	restricted_status => {
-		name      => x("Score required for release"),
-		type      => "choose",
-		override  => "any",
-		choices   => [qw( 1 0.9 0.8 0.7 0.6 0.5 0.4 0.3 0.2 0.1 )],
-		labels    => {	'0.1' => '10%',
-				'0.2' => '20%',
-				'0.3' => '30%',
-				'0.4' => '40%',
-				'0.5' => '50%',
-				'0.6' => '60%',
-				'0.7' => '70%',
-				'0.8' => '80%',
-				'0.9' => '90%',
-				'1' => '100%',
+		name     => x('Score Required for Release'),
+		type     => 'choose',
+		override => 'any',
+		choices  => [qw(1 0.9 0.8 0.7 0.6 0.5 0.4 0.3 0.2 0.1)],
+		labels   => {
+			'0.1' => '10%',
+			'0.2' => '20%',
+			'0.3' => '30%',
+			'0.4' => '40%',
+			'0.5' => '50%',
+			'0.6' => '60%',
+			'0.7' => '70%',
+			'0.8' => '80%',
+			'0.9' => '90%',
+			'1'   => '100%',
 		},
+		help_text => x('See "Restrict Release by Set(s)".'),
 	},
 	restrict_ip => {
-		name      => x("Restrict Access by IP"),
-		type      => "choose",
-		override  => "any",
-		choices   => [qw( No RestrictTo DenyFrom )],
-		labels    => {
-				No => x("No"),
-				RestrictTo => x("Restrict To"),
-				DenyFrom => x("Deny From"),
+		name     => x('Restrict Access by Location'),
+		type     => 'choose',
+		override => 'any',
+		choices  => [qw(No RestrictTo DenyFrom)],
+		labels   => {
+			No         => x('No'),
+			RestrictTo => x('Restrict To'),
+			DenyFrom   => x('Deny From'),
 		},
 		default   => 'No',
+		help_text => x(
+			'You may choose to restrict student access to this set to specified locations.  Alternatively, you may '
+				. 'choose to block access from specified locations.  Locations are defined by the WeBWorK '
+				. 'administrator by IP address or address range.  The list of defined locations will appear after '
+				. 'saving this option with "Restrict To" or "Deny From".'
+		)
 	},
 	relax_restrict_ip => {
-		name      => x("Relax IP restrictions when?"),
-		type      => "choose",
-		override  => "any",
-		choices   => [qw( No AfterAnswerDate AfterVersionAnswerDate )],
-		labels    => {
-				No => x("Never"),
-				AfterAnswerDate => x("After set answer date"),
-				AfterVersionAnswerDate => x("(gw/quiz) After version answer date"),
+		name     => x('Relax Location Restrictions'),
+		type     => 'choose',
+		override => 'any',
+		choices  => [qw(No AfterAnswerDate AfterVersionAnswerDate)],
+		labels   => {
+			No                     => x('Never'),
+			AfterAnswerDate        => x('After Answer Date'),
+			AfterVersionAnswerDate => x('After Test Version Answer Date'),
 		},
 		default   => 'No',
+		help_text => x(
+			'When location restrictions are applied (see "Restrict Access by Location") you may choose to relax those '
+				. 'restrictions after the answer date.  In the case of a test, the set\'s answer date and the date of '
+				. 'an individual version may differ, and you can choose which answer date to use.  For a set that is '
+				. 'not a test, both options are interpreted as the regular set answer date.'
+		)
 	},
 	assignment_type => {
-		name      => x("Assignment type"),
-		type      => "choose",
-		override  => "all",
-		choices   => [qw( default gateway proctored_gateway jitar)],
-		labels    => {	default => "homework",
-				gateway => "gateway/quiz",
-				proctored_gateway => "proctored gateway/quiz",
-				jitar => "just-in-time"
+		name     => x('Assignment Type'),
+		type     => 'choose',
+		override => 'all',
+		choices  => [qw(default gateway proctored_gateway jitar)],
+		labels   => {
+			default           => x('Homework'),
+			gateway           => x('Test'),
+			proctored_gateway => x('Proctored Test'),
+			jitar             => x('Just in Time Assessment and Review')
 		},
+		help_text => x(
+			'With "Homework", students visit each problem one at a time.  They submit answers for one problem at a '
+				. 'time and immediately receive feedback.  With "Test", students will submit all answers for all '
+				. 'problems at once.  They may or may not receive feedback right away depending upon other '
+				. 'settings.  Also a "Test" can have a time limit, where the student needs to start between the '
+				. 'open date and the close date, but once started has only so much time.  Also a "Test" can '
+				. 'be configured to allow taking new, re-randomized versions.  A "Proctored Test" is the same as '
+				. 'a "Test", but in order to begin, either a classwide password specific to this set is needed, '
+				. 'or a higher level user must enter their username and password on the student\'s screen. '
+				. 'A "Just in Time Assessment and Review" set is like a "Homework" set, but can be configured '
+				. 'to introduce more exercises when a student answers a given exercise incorrectly so many times.'
+		)
 	},
 	version_time_limit => {
-		name      => x("Test Time Limit (min; 0=Close Date)"),
-		type      => "edit",
-		size      => "4",
-		override  => "any",
-		default => "0",
-#		labels    => {	"" => 0 },  # I'm not sure this is quite right
+		name      => x('Test Time Limit'),
+		type      => 'edit',
+		size      => '4',
+		override  => 'any',
+		default   => '0',
 		convertby => 60,
+		help_text => x(
+			'This sets a number of minutes for each version of a test, once it is started.  Use "0" to indicate no '
+				. 'time limit.  If there is a time limit, then there will be an indication that this is a timed '
+				. 'test on the main "Homework Sets" page.  Additionally the student will be sent to a confirmation '
+				. 'page beefore they can begin.'
+		)
 	},
 	time_limit_cap => {
-		name      => x("Cap Test Time at Set Close Date?"),
-		type      => "choose",
-		override  => "all",
-		choices   => [qw(0 1)],
-		labels    => { '0' => 'No', '1' =>'Yes' },
+		name     => x('Cap Test Time at Close Date'),
+		type     => 'choose',
+		override => 'all',
+		choices  => [qw(0 1)],
+		labels   => {
+			'0' => x('No'),
+			'1' => x('Yes')
+		},
+		help_text => x(
+			'A student might start a timed test close to the close date.  This setting allows to either cut them off '
+				. 'at the close date or allow them the full time limit.'
+		)
 	},
 	attempts_per_version => {
-		name      => x("Number of Graded Submissions per Test (0=infty)"),
-		type      => "edit",
-		size      => "3",
-		override  => "any",
-		default => "0",
-#		labels    => {	"" => 1 },
+		name      => x("Graded Submissions per Version"),
+		type      => 'edit',
+		size      => '3',
+		override  => 'any',
+		default   => '0',
+		help_text => x(
+			'A test may be configured to allow students one or more versions.  For each version, this is the number of '
+				. 'times you will allow them to click to have that version graded.  Depending on other settings, '
+				. 'they may or may not be able to see scores and feedback following each grading. '
+				. 'Use "0" to indicate there is no cap on the number of graded submissions.'
+		)
 	},
 	time_interval => {
-		name      => x("Time Interval for New Test Versions (min; 0=infty)"),
-		type      => "edit",
-                size      => "5",
-		override  => "any",
-		default => "0",
-#		labels    => {	"" => 0 },
+		name      => x('Time Interval for New Versions'),
+		type      => 'edit',
+		size      => '5',
+		override  => 'any',
+		default   => '0',
 		convertby => 60,
+		help_text => x(
+			'You may set a time interval in minutes.  Within this time interval, students may start new randomized '
+				. 'versions of the test.  However they may only start as many new versions as you set for "Versions '
+				. 'per Interval".  When the time interval ends, the cap is reset.  This feature is intended to allow '
+				. 'students an immediate retake, but require them to take a break (and perhaps study more) after too '
+				. 'many low scoring attempts in close succession.  Use "0" to indicate an infinite time interval, '
+				. 'which is what you want for an absolute cap on the number of new versions overall.'
+		)
 	},
 	versions_per_interval => {
-		name      => x("Number of Tests per Time Interval (0=infty)"),
-		type      => "edit",
-                size      => "3",
-		override  => "any",
-		default   => "0",
-		format    => '[0-9]+',      # an integer, possibly zero
-#		labels    => {	"" => 0 },
-#		labels    => {	"" => 1 },
+		name      => x('Versions per Interval'),
+		type      => 'edit',
+		size      => '3',
+		override  => 'any',
+		default   => '0',
+		format    => '[0-9]+',                                     # an integer, possibly zero
+		help_text => x('See "Time Interval for New Versions".'),
 	},
 	problem_randorder => {
-		name      => x("Order Problems Randomly"),
-		type      => "choose",
-		choices   => [qw( 0 1 )],
-		override  => "any",
-		labels    => {	0 => "No", 1 =>"Yes" },
+		name     => x('Order Problems Randomly'),
+		type     => 'choose',
+		choices  => [qw(0 1)],
+		override => 'any',
+		labels   => {
+			0 => x('No'),
+			1 => x('Yes')
+		},
+		help_text => x(
+			'Order problems randomly or not.  If you will be manually reviewing student answers, you might not want to '
+				. 'order problems randomly to facilitate assembly line grading.'
+		)
 	},
 	problems_per_page => {
-	        name      => x("Number of Problems per Page (0=all)"),
-		type      => "edit",
-		size      => "3",
-		override  => "any",
-		default   => "0",
-#		labels    => { "" => 0 },
+		name      => x('Problems per Page'),
+		type      => 'edit',
+		size      => '3',
+		override  => 'any',
+		default   => '1',
+		help_text => x(
+			'A test is broken up into pages with this many problems on each page.  Students can move from page to page '
+				. 'without clicking to grade the test, and their temporary answers will be saved.  Use "0" to indicate '
+				. '"all problems on one page".  For tests with many problems, either extreme (1 per page or "all on '
+				. 'one page") has drawbacks.  With 1 per page, the student has many pages and may be frustrated trying '
+				. 'to go back and find a particular problem.  With "all on one page", the student may spend a lot of '
+				. 'time on that one page without clicking anything that lets WeBWorK know they are still active, and '
+				. 'their session might expire for inactivity before they get around to clicking the grade button. '
+				. 'This situation can lead to their typed answers being lost and unrecoverable.  Additionally, having '
+				. 'many problems load at the same time on one page can put a strain on the server.  This is especially '
+				. 'worth considering if the test has many dynamically generated images, which can slow things down '
+				. 'significantly.'
+		)
 	},
 	'hide_score:hide_score_by_problem' => {
-		name      => x("Show Scores on Finished Assignments?"),
-		type      => "choose",
-		choices   => [ qw( N:N Y:Y BeforeAnswerDate:N N:Y BeforeAnswerDate:Y ) ],
-		override  => "any",
-		labels    => { 'N:N' => 'Yes', 'Y:Y' => 'No', 'BeforeAnswerDate:N' => x('Only after set answer date'), 'N:Y' => x('Totals only (not problem scores)'), 'BeforeAnswerDate:Y' => x('Totals only, only after answer date') },
+		name     => x('Show Scores on Finished Versions'),
+		type     => 'choose',
+		choices  => [qw(N:N Y:Y BeforeAnswerDate:N N:Y BeforeAnswerDate:Y)],
+		override => 'any',
+		labels   => {
+			'N:N'                => x('Yes'),
+			'Y:Y'                => x('No'),
+			'BeforeAnswerDate:N' => x('Only after set answer date'),
+			'N:Y'                => x('Totals only (not problem scores)'),
+			'BeforeAnswerDate:Y' => x('Totals only, only after answer date')
+		},
+		default   => 'N:N',
+		help_text => x(
+			'After a test version either has no more allowed graded submissions or has its time limit expired, you may '
+				. 'configure whether or not to allow students to see their scores on that version.'
+		)
 	},
-	hide_work         => {
-		name      => x("Show Problems on Finished Tests"),
-		type      => "choose",
-		choices   => [ qw(N Y BeforeAnswerDate) ],
-		override  => "any",
-		labels    => { 'N' => "Yes", 'Y' =>"No", 'BeforeAnswerDate' =>x('Only after set answer date') },
+	hide_work => {
+		name     => x('Show Problems on Finished Versions'),
+		type     => 'choose',
+		choices  => [qw(N Y BeforeAnswerDate)],
+		override => 'any',
+		labels   => {
+			'N'                => x('Yes'),
+			'Y'                => x('No'),
+			'BeforeAnswerDate' => x('Only after set answer date')
+		},
+		default   => 'N',
+		help_text => x(
+			'After a test version either has no more allowed graded submissions or has its time limit expired, you may '
+				. 'configure whether or not to allow students to see the questions and the responses they gave.'
+		)
+	},
+	use_grade_auth_proctor => {
+		name     => x('Proctor Authorization Type'),
+		type     => 'choose',
+		override => 'any',
+		choices  => [qw(Yes No)],
+		labels   => {
+			Yes => x('Both Start and Grade'),
+			No  => x('Only Start')
+		},
+		default   => 'Yes',
+		help_text => x(
+			'Proctored tests always require authorization to start the test. "Both Start and Grade" will require '
+				. 'either login proctor authorization or a password specific to this set to start the test, '
+				. 'and grade proctor authorization to grade the test. "Only Start" requires either grade proctor '
+				. 'authorization or a password specific to this set to start and no authorization to grade.'
+		),
 	},
-
 	restrict_prob_progression => {
-		name      => x("Restrict Problem Progression"),
-		type      => "choose",
-		choices   => [ qw(0 1) ],
-		override  => "all",
-                default   => "0",
-		labels    => { '1' => "Yes", '0' =>"No", },
-                help_text => x("If this is enabled then students will be unable to attempt a problem until they have completed all of the previous problems, and their child problems if necessary."),
+		name     => x('Restrict Problem Progression'),
+		type     => 'choose',
+		choices  => [qw(0 1)],
+		override => 'all',
+		default  => '0',
+		labels   => {
+			'1' => x('Yes'),
+			'0' => x('No'),
+		},
+		help_text => x(
+			'If this is enabled then students will be unable to attempt a problem until they have '
+				. 'completed all of the previous problems and their child problems if necessary.'
+		),
 	},
-
-	email_instructor  => {
-		name      => x("Email Instructor On Failed Attempt"),
-		type      => "choose",
-		choices   => [ qw(0 1) ],
-		override  => "any",
-                default   => "0",
-		labels    => { '1' => "Yes", '0' =>"No"},
-                help_text => x("If this is enabled then instructors with the ability to receive feedback emails will be notified whenever a student runs out of attempts on a problem and its children without receiving an adjusted status of 100%."),
+	email_instructor => {
+		name     => x('Email Instructor On Failed Attempt'),
+		type     => 'choose',
+		choices  => [qw(0 1)],
+		override => 'any',
+		default  => '0',
+		labels   => {
+			'1' => x('Yes'),
+			'0' => x('No')
+		},
+		help_text => x(
+			'If this is enabled then instructors with the ability to receive feedback emails will be '
+				. 'notified whenever a student runs out of attempts on a problem and its children '
+				. 'without receiving an adjusted status of 100%.'
+		),
 	},
 
-	# in addition to the set fields above, there are a number of things
-	#    that are set but aren't in this table:
+	# In addition to the set fields above, there are a number of things
+	# that are set but aren"t in this table:
 	#    any set proctor information (which is in the user tables), and
 	#    any set location restriction information (which is in the
 	#    location tables)
-	#
+
 	# Problem information
 	source_file => {
-		name      => x("Source File"),
-		type      => "edit",
-		size      => 50,
-		override  => "any",
-		default   => "",
+		name     => x('Source File'),
+		type     => 'edit',
+		size     => 50,
+		override => 'any',
+		default  => '',
 	},
 	value => {
-		name      => x("Weight"),
-		type      => "edit",
+		name      => x('Weight'),
+		type      => 'edit',
 		size      => 6,
-		override  => "any",
-                default => "1",
+		override  => 'any',
+		default   => '1',
+		help_text => x(
+			'This is a relative weight to be attached to the problem, either in the context of scoring the set, '
+				. 'or in the context of calculating a score for a collection of sets.'
+		)
 	},
 	max_attempts => {
-		name      => x("Max attempts"),
-		type      => "edit",
-		size      => 6,
-		override  => "any",
-                default => "-1",
-		labels    => {
-				"-1" => x("unlimited"),
+		name     => x('Max Attempts'),
+		type     => 'edit',
+		size     => 6,
+		override => 'any',
+		default  => '-1',
+		labels   => {
+			'-1' => x('unlimited'),
 		},
+		help_text => x(
+			'You may cap the number of attempts a student can use for the problem. Use -1 to indicate unlimited attempts.'
+		)
+	},
+	showMeAnother => {
+		name     => x('Show Me Another'),
+		type     => 'edit',
+		size     => '6',
+		override => 'any',
+		default  => '-1',
+		labels   => {
+			'-1' => x('Never'),
+			'-2' => x('Default'),
+		},
+		help_text => x(
+			'When a student has more attempts than is specified here they will be able to view another '
+				. 'version of this problem.  If set to -1 the feature is disabled and if set to -2 '
+				. 'the course default is used.'
+		)
+	},
+	showHintsAfter => {
+		name     => x('Show Hints After'),
+		type     => 'edit',
+		size     => '6',
+		override => 'any',
+		default  => '-2',
+		labels   => {
+			'-2' => x('Default'),
+			'-1' => x('Never'),
+		},
+		help_text => x(
+			'This specifies the number of attempts before hints are shown to students. '
+				. 'The value of -2 uses the default from course configuration. '
+				. 'The value of -1 disables hints. '
+				. 'Note that this will only have an effect if the problem has a hint.'
+		),
 	},
-        showMeAnother => {
-                 name => x("Show me another"),
-                 type => "edit",
-                 size => "6",
-                 override  => "any",
-                 default=>"-1",
-                 labels    => {
-			       "-1" => x("Never"),
-			       "-2" => x("Default"),
-                 },
-                 help_text => x("When a student has more attempts than is specified here they will be able to view another version of this problem.  If set to -1 the feature is disabled and if set to -2 the course default is used.")
-        },
 	prPeriod => {
-		name => x("Rerandomize after"),
-		type => "edit",
-		size => "6",
-		override => "any",
-		default=>"-1",
-		labels => {
-			"-1" => x("Default"),
-			"0" => x("Never"),
+		name     => x('Rerandomize After'),
+		type     => 'edit',
+		size     => '6',
+		override => 'any',
+		default  => '-1',
+		labels   => {
+			'-1' => x('Default'),
+			'0'  => x('Never'),
 		},
-		help_text => x("This specifies the rerandomization period: the number of attempts before a new version of the problem is generated by changing the Seed value. The value of -1 uses the default from course configuration. The value of 0 disables rerandomization."),
+		help_text => x(
+			'This specifies the rerandomization period: the number of attempts before a new version of '
+				. 'the problem is generated by changing the Seed value. The value of -1 uses the '
+				. 'default from course configuration. The value of 0 disables rerandomization.'
+		),
 	},
 	problem_seed => {
-		name      => x("Seed"),
-		type      => "edit",
+		name      => x('Seed'),
+		type      => 'edit',
 		size      => 6,
-		override  => "one",
-
+		override  => 'one',
+		help_text => x(
+			'This number is used to control how the random elements of the problem will be generated. '
+				. 'Change this number to rerandomize a student\'s version.'
+		)
 	},
 	status => {
-		name      => x("Status"),
-		type      => "edit",
+		name      => x('Status'),
+		type      => 'edit',
 		size      => 6,
-		override  => "one",
-		default   => "0",
+		override  => 'one',
+		default   => '0',
+		help_text => x(
+			'This is a number between 0 and 1 indicating the student\'s score for the problem.  Change this '
+				. 'to 1 to manually award full credit on this problem.'
+		)
 	},
 	attempted => {
-		name      => x("Attempted"),
-		type      => "hidden",
-		override  => "none",
-		choices   => [qw( 0 1 )],
-		labels    => {
-				1 => x("Yes"),
-				0 => x("No"),
+		name     => x('Attempted'),
+		type     => 'hidden',
+		override => 'none',
+		choices  => [qw(0 1)],
+		labels   => {
+			1 => x('Yes'),
+			0 => x('No'),
 		},
-		default   => "0",
+		default => '0',
 	},
 	last_answer => {
-		name      => x("Last Answer"),
-		type      => "hidden",
-		override  => "none",
+		name     => x('Last Answer'),
+		type     => 'hidden',
+		override => 'none',
 	},
 	num_correct => {
-		name      => x("Correct"),
-		type      => "hidden",
-		override  => "none",
-		default   => "0",
+		name     => x('Correct'),
+		type     => 'hidden',
+		override => 'none',
+		default  => '0',
 	},
 	num_incorrect => {
-		name      => x("Incorrect"),
-		type      => "hidden",
-		override  => "none",
-		default   => "0",
+		name     => x('Incorrect'),
+		type     => 'hidden',
+		override => 'none',
+		default  => '0',
 	},
 	hide_hint => {
-		name      => x("Hide Hints from Students"),
-		type      => "choose",
-		override  => "all",
-		choices   => [qw( 0 1 )],
-		labels    => {
-				1 => x("Yes"),
-				0 => x("No"),
+		name     => x('Hide Hints from Students'),
+		type     => 'choose',
+		override => 'all',
+		choices  => [qw(0 1)],
+		labels   => {
+			1 => x('Yes'),
+			0 => x('No'),
 		},
+		help_text => x(
+			'Problem files may have hints included in their code.  Use this option to suppress showing students these '
+				. 'hints. Note that even if hints are not suppressed, there is a threshold number of attempts '
+				. 'that a student must make before they have the option to view a hint.'
+		)
 	},
-	att_to_open_children  => {
-		name      => x("Att. to Open Children"),
-		type      => "edit",
-		size      => 6,
-		override  => "any",
-                default => "0",
-		labels    => {
-				"-1" => x("max"),
+	att_to_open_children => {
+		name     => x('Attempt Threshold for Children'),
+		type     => 'edit',
+		size     => 6,
+		override => 'any',
+		default  => '0',
+		labels   => {
+			'-1' => x('max'),
 		},
-                help_text => x("The child problems for this problem will become visible to the student when they either have more incorrect attempts than is specified here, or when they run out of attempts, whichever comes first.  If \"max\" is specified here then child problems will only be available after a student runs out of attempts."),
+		help_text => x(
+			'The child problems for this problem will become visible to the student when they either have more '
+				. 'incorrect attempts than is specified here, or when they run out of attempts, whichever comes '
+				. 'first.  Use -1 to indicate that child problems should only be available after a student '
+				. 'runs out of attempts.'
+		),
 	},
-	counts_parent_grade  => {
-		name      => x("Counts for Parent"),
-		type      => "choose",
-		choices   => [ qw(0 1) ],
-		override  => "any",
-                default   => "0",
-		labels    => { '1' => "Yes", '0' =>"No", },
-                help_text => x("If this flag is set then this problem will count towards the grade of its parent problem.  In general the adjusted status on a problem is the larger of the problem's status and the weighted average of the status of its child problems which have this flag enabled."),
+	counts_parent_grade => {
+		name     => x('Counts for Parent'),
+		type     => 'choose',
+		choices  => [qw(0 1)],
+		override => 'any',
+		default  => '0',
+		labels   => {
+			'1' => x('Yes'),
+			'0' => x('No'),
+		},
+		help_text => x(
+			'If this flag is set then this problem will count towards the grade of its parent problem.  In '
+				. 'general the adjusted status on a problem is the larger of the problem\'s status and the weighted '
+				. 'average of the status of its child problems which have this flag enabled.'
+		),
 	},
 };
 
 use constant FIELD_PROPERTIES_GWQUIZ => {
 	max_attempts => {
-		type	=> "hidden",
-		override=> "any",
+		type     => 'hidden',
+		override => 'any',
 	}
 };
 
 # Create a table of fields for the given parameters, one row for each db field.
 # If only the setID is included, it creates a table of set information.
 # If the problemID is included, it creates a table of problem information.
-sub FieldTable {
-	my ($self, $userID, $setID, $problemID, $globalRecord, $userRecord, $setType) = @_;
-
-	my $r           = $self->r;
-	my $ce          = $r->ce;
-	my @editForUser = $r->param('editForUser');
+sub fieldTable ($c, $userID, $setID, $problemID, $globalRecord, $userRecord = undef, $setType = undef) {
+	my $ce          = $c->ce;
+	my @editForUser = $c->param('editForUser');
 	my $forUsers    = scalar(@editForUser);
 	my $forOneUser  = $forUsers == 1;
-	my $isGWset     = defined $setType && $setType =~ /gateway/ ? 1 : 0;
-	my @fieldOrder;
+	my $isGWset     = defined $setType && $setType =~ /gateway/;
+	my $isJitarSet  = defined $setType && $setType =~ /jitar/;
 
 	# Needed for gateway/jitar output
 	my $extraFields = '';
@@ -459,18 +668,17 @@ sub FieldTable {
 	my $setVersion = defined($userRecord) && $userRecord->can('version_id') ? 1 : 0;
 
 	# Needed for ip restrictions
-	my $ipFields = '';
-	my $ipDefaults;
+	my $ipFields     = '';
 	my $numLocations = 0;
-	my $ipOverride;
 
 	# Needed for set-level proctor
 	my $procFields = '';
 
+	my @fieldOrder;
 	if (defined $problemID) {
-		if ($setType eq 'jitar') {
+		if ($isJitarSet) {
 			@fieldOrder = @{ JITAR_PROBLEM_FIELD_ORDER() };
-		} elsif ($setType =~ /gateway/) {
+		} elsif ($isGWset) {
 			@fieldOrder = @{ GATEWAY_PROBLEM_FIELD_ORDER() };
 		} else {
 			@fieldOrder = @{ PROBLEM_FIELD_ORDER() };
@@ -479,18 +687,47 @@ sub FieldTable {
 		@fieldOrder = @{ SET_FIELD_ORDER() };
 
 		($extraFields, $ipFields, $numLocations, $procFields) =
-			$self->extraSetFields($userID, $setID, $globalRecord, $userRecord, $forUsers);
+			$c->extraSetFields($userID, $setID, $globalRecord, $userRecord, $forUsers);
 	}
 
-	my $output = CGI::start_table({ class => 'table table-sm table-borderless align-middle font-sm w-auto mb-0' });
+	my $rows = $c->c;
+
 	if ($forUsers) {
-		my $id_prefix = defined $problemID ? "problem.$problemID" : "set.$setID";
-		$output .= CGI::Tr(
-			CGI::td({ colspan => '3' }, ''),
-			CGI::th($r->maketext('User Value')),
-			CGI::th($r->maketext('Class value')),
+		push(
+			@$rows,
+			$c->tag(
+				'tr',
+				$problemID ? () : (class => 'table-primary'),
+				$c->c(
+					$c->tag(
+						'th',
+						class   => 'p-2',
+						scope   => 'colgroup',
+						colspan => 3,
+						$problemID ? '' : $c->maketext('General Parameters')
+					),
+					$c->tag('th', class => 'p-2', scope => 'col', $c->maketext('User Overrides')),
+					$c->tag('th', class => 'p-2', scope => 'col', $c->maketext('Set Values'))
+				)->join('')
+			)
+		);
+	} elsif (!$problemID) {
+		push(
+			@$rows,
+			$c->tag(
+				'tr',
+				class => 'table-primary',
+				$c->tag(
+					'th',
+					class   => 'p-2',
+					scope   => 'colgroup',
+					colspan => 4,
+					$c->maketext('General Parameters')
+				)
+			)
 		);
 	}
+
 	for my $field (@fieldOrder) {
 		my %properties;
 
@@ -525,11 +762,11 @@ sub FieldTable {
 		next if ($field eq 'restrict_ip' && (!$numLocations || $setVersion));
 		next
 			if (
-			$field eq 'relax_restrict_ip'
-			&& (!$numLocations
-				|| $setVersion
-				|| ($forUsers  && $userRecord->restrict_ip eq 'No')
-				|| (!$forUsers && ($globalRecord->restrict_ip eq '' || $globalRecord->restrict_ip eq 'No')))
+				$field eq 'relax_restrict_ip'
+				&& (!$numLocations
+					|| $setVersion
+					|| ($forUsers  && $userRecord->restrict_ip eq 'No')
+					|| (!$forUsers && ($globalRecord->restrict_ip eq '' || $globalRecord->restrict_ip eq 'No')))
 			);
 
 		# Skip the problem seed if we are not editing for one user, or if we are editing a gateway set for users,
@@ -546,64 +783,58 @@ sub FieldTable {
 		next if ($field eq 'prPeriod' && !$ce->{pg}{options}{enablePeriodicRandomization});
 
 		unless ($properties{type} eq 'hidden') {
-			my @row = $self->FieldHTML($userID, $setID, $problemID, $globalRecord, $userRecord, $field);
-			$output .= CGI::Tr(CGI::td([ @row ])) if @row > 1;
+			my @row = $c->fieldHTML($userID, $setID, $problemID, $globalRecord, $userRecord, $field);
+			push(@$rows, $c->tag('tr', $c->c(map { $c->tag('td', $_) } @row)->join(''))) if @row > 1;
 		}
 
 		# Finally, put in extra fields that are exceptions to the usual display mechanism.
-		$output .= $ipFields if ($field eq 'restrict_ip' && $ipFields);
+		push(@$rows, $ipFields) if $field eq 'restrict_ip' && $ipFields;
 
-		$output .= "$procFields\n$extraFields\n" if ($field eq 'assignment_type');
+		push(@$rows, $extraFields, $procFields) if $field eq 'assignment_type';
 	}
 
 	if (defined $problemID && $forOneUser) {
 		my $problemRecord = $userRecord;
-		$output .= CGI::Tr(CGI::td([
-			'',
-			CGI::label({ for => "problem.$problemID.attempts.id" }, $r->maketext('Attempts')),
-			'',
-			CGI::textfield({
-				readonly => undef,
-				name     => "problem.$problemID.attempts",
-				id       => "problem.$problemID.attempts.id",
-				value    => ($problemRecord->num_correct || 0) + ($problemRecord->num_incorrect || 0),
-				size     => 5,
-				class    => 'form-control form-control-sm'
-			}),
-			''    # This empty last column is required for valid html
-		]));
+		push(
+			@$rows,
+			$c->include(
+				'ContentGenerator/Instructor/ProblemSetDetail/attempts_row',
+				problemID     => $problemID,
+				problemRecord => $problemRecord
+			)
+		);
 	}
-	$output .= CGI::end_table();
 
-	return $output;
+	return $c->tag(
+		'table',
+		class => 'table table-sm table-borderless align-middle font-sm mb-0',
+		$rows->join('')
+	);
 }
 
 # Returns a list of information and HTML widgets for viewing and editing the specified db fields.
 # If only the setID is included, it creates a list of set information.
 # If the problemID is included, it creates a list of problem information.
-sub FieldHTML {
-	my ($self, $userID, $setID, $problemID, $globalRecord, $userRecord, $field) = @_;
-
-	my $r           = $self->r;
-	my $db          = $r->db;
-	my @editForUser = $r->param('editForUser');
-	my $forUsers    = scalar(@editForUser);
+sub fieldHTML ($c, $userID, $setID, $problemID, $globalRecord, $userRecord, $field) {
+	my $db          = $c->db;
+	my @editForUser = $c->param('editForUser');
+	my $forUsers    = @editForUser;
 	my $forOneUser  = $forUsers == 1;
 
-	return $r->maketext('No data exists for set [_1] and problem [_2]', $setID, $problemID) unless $globalRecord;
-	return $r->maketext('No user specific data exists for user [_1]', $userID)
+	return $c->maketext('No data exists for set [_1] and problem [_2]', $setID, $problemID) unless $globalRecord;
+	return $c->maketext('No user specific data exists for user [_1]', $userID)
 		if $forOneUser && $globalRecord && !$userRecord;
 
 	my %properties = %{ FIELD_PROPERTIES()->{$field} };
 	my %labels     = %{ $properties{labels} };
 
 	for my $key (keys %labels) {
-		$labels{$key} = $r->maketext($labels{$key});
+		$labels{$key} = $c->maketext($labels{$key});
 	}
 
 	return '' if $properties{type} eq 'hidden';
-	return '' if $properties{override} eq 'one'  && not $forOneUser;
-	return '' if $properties{override} eq 'none' && not $forOneUser;
+	return '' if $properties{override} eq 'one'  && !$forOneUser;
+	return '' if $properties{override} eq 'none' && !$forOneUser;
 	return '' if $properties{override} eq 'all'  && $forUsers;
 
 	my $edit   = ($properties{type} eq 'edit')   && ($properties{override} ne 'none');
@@ -613,23 +844,20 @@ sub FieldHTML {
 	my ($globalValue, $userValue) = ('', '');
 	my $blankfield = '';
 	if ($field =~ /:/) {
-		my @gVals = ();
-		my @uVals = ();
-		my @bVals = ();
-		foreach my $f (split(/:/, $field)) {
-			# hmm.  this directly references the data in the
-			# record rather than calling the access method,
-			# thereby avoiding errors if the userRecord is
-			# undefined.  that seems a bit suspect, but it's
-			# used below so we'll leave it here.
-
+		my @gVals;
+		my @uVals;
+		my @bVals;
+		for my $f (split(/:/, $field)) {
+			# Hmm.  This directly references the data in the record rather than calling the access method, thereby
+			# avoiding errors if the access method is undefined.  That seems a bit suspect, but it's used below so we'll
+			# leave it here.
 			push(@gVals, $globalRecord->{$f});
 			push(@uVals, $userRecord->{$f});
 			push(@bVals, '');
 		}
 		# I don't like this, but combining multiple values is a bit messy
-		$globalValue = (grep { defined $_ } @gVals) ? join(':', (map { defined $_ ? $_ : '' } @gVals)) : undef;
-		$userValue   = (grep { defined $_ } @uVals) ? join(':', (map { defined $_ ? $_ : '' } @uVals)) : undef;
+		$globalValue = (grep {defined} @gVals) ? join(':', (map { defined ? $_ : '' } @gVals)) : undef;
+		$userValue   = (grep {defined} @uVals) ? join(':', (map { defined ? $_ : '' } @uVals)) : undef;
 		$blankfield  = join(':', @bVals);
 	} else {
 		$globalValue = $globalRecord->{$field};
@@ -638,10 +866,10 @@ sub FieldHTML {
 
 	# Use defined instead of value in order to allow 0 to printed, e.g. for the 'value' field.
 	$globalValue = defined $globalValue ? ($labels{$globalValue} || $globalValue) : '';
-	$userValue = defined $userValue ? ($labels{$userValue} || $userValue) : $blankfield;
+	$userValue   = defined $userValue   ? ($labels{$userValue}   || $userValue)   : $blankfield;
 
 	if ($field =~ /_date/) {
-		$globalValue = $self->formatDateTime($globalValue, '', 'datetime_format_short', $r->ce->{language})
+		$globalValue = $c->formatDateTime($globalValue, '', 'datetime_format_short', $c->ce->{language})
 			if $forUsers && defined $globalValue && $globalValue ne '';
 	}
 
@@ -671,80 +899,80 @@ sub FieldHTML {
 
 	if ($edit) {
 		if ($field =~ /_date/) {
-			$inputType = CGI::div(
-				{ class => 'input-group input-group-sm flatpickr' },
-				CGI::textfield({
-					name        => "$recordType.$recordID.$field",
-					id          => "$recordType.$recordID.${field}_id",
-					value       => $r->param("$recordType.$recordID.$field") || ($forUsers ? $userValue : $globalValue),
-					class       => 'form-control form-control-sm' . ($field eq 'open_date' ? ' datepicker-group' : ''),
-					placeholder => $r->maketext('None Specified'),
-					data_input  => undef,
-					data_done_text => $r->maketext('Done'),
-					data_locale    => $r->ce->{language},
-					data_timezone  => $r->ce->{siteDefaults}{timezone},
-					data_override  => "$recordType.$recordID.$field.override_id",
-					$forUsers && $check ? (aria_labelledby => "$recordType.$recordID.$field.label") : (),
-				}),
-				CGI::a(
-					{
-						class       => 'btn btn-secondary btn-sm',
-						data_toggle => undef,
-						role        => 'button',
-						tabindex    => 0,
-						aria_label  => $r->maketext('Pick date and time')
-					},
-					CGI::i({ class => 'fas fa-calendar-alt', aria_hidden => 'true' }, '')
-				)
+			$inputType = $c->tag(
+				'div',
+				class => 'input-group input-group-sm flatpickr',
+				$c->c(
+					$c->text_field(
+						"$recordType.$recordID.$field",
+						$forUsers ? $userValue : $globalValue,
+						id    => "$recordType.$recordID.${field}_id",
+						class => 'form-control form-control-sm'
+							. ($field eq 'open_date' ? ' datepicker-group' : ''),
+						placeholder => $c->maketext('None Specified'),
+						data        => {
+							input      => undef,
+							done_text  => $c->maketext('Done'),
+							today_text => $c->maketext('Today'),
+							now_text   => $c->maketext('Now'),
+							locale     => $c->ce->{language},
+							timezone   => $c->ce->{siteDefaults}{timezone},
+							override   => "$recordType.$recordID.$field.override_id"
+						},
+						$forUsers && $check ? ('aria-labelledby' => "$recordType.$recordID.$field.label") : (),
+					),
+					$c->tag(
+						'a',
+						class        => 'btn btn-secondary btn-sm',
+						data         => { toggle => undef },
+						role         => 'button',
+						tabindex     => 0,
+						'aria-label' => $c->maketext('Pick date and time'),
+						$c->tag('i', class => 'fas fa-calendar-alt', 'aria-hidden' => 'true', '')
+					)
+				)->join('')
 			);
 		} else {
-			my $value = $r->param("$recordType.$recordID.$field") || ($forUsers ? $userValue : $globalValue);
+			my $value = $forUsers ? $userValue : $globalValue;
 			$value = format_set_name_display($value =~ s/\s*,\s*/,/gr) if $field eq 'restricted_release';
 
-			$inputType = CGI::textfield({
-				name          => "$recordType.$recordID.$field",
-				id            => "$recordType.$recordID.${field}_id",
-				value         => $value,
-				data_override => "$recordType.$recordID.$field.override_id",
-				class         => 'form-control form-control-sm',
+			$inputType = $c->text_field(
+				"$recordType.$recordID.$field", $value,
+				id    => "$recordType.$recordID.${field}_id",
+				data  => { override => "$recordType.$recordID.$field.override_id" },
+				class => 'form-control form-control-sm',
 				$forUsers && $check ? (aria_labelledby => "$recordType.$recordID.$field.label") : (),
 				$field eq 'restricted_release' || $field eq 'source_file' ? (dir => 'ltr')      : ()
-			});
+			);
 		}
 	} elsif ($choose) {
-		# Note that in popup menus, you're almost guaranteed to have the choices hashed to labels in %properties
-		# but $userValue and and $globalValue are the values in the hash not the keys
-		# so we have to use the actual db record field values to select our default here.
-
-		# FIXME: this allows us to set one selector from two (or more) fields
-		# if $field matches /:/, we have to get two fields to get the data we need here
-		my $value = $r->param("$recordType.$recordID.$field");
+		# If $field matches /:/, then multiple fields are used.
+		my $value = '';
 		if (!$value && $field =~ /:/) {
 			my @fields = split(/:/, $field);
-			$value = '';
-			foreach my $f (@fields) {
-				$value .= ($forUsers && $userRecord->$f ne '' ? $userRecord->$f : $globalRecord->$f) . ':';
+			my @part_values;
+			for (@fields) {
+				push(@part_values, $forUsers && $userRecord->$_ ne '' ? $userRecord->$_ : $globalRecord->$_);
 			}
-			$value =~ s/:$//;
+			$value = join(':', @part_values);
 		} elsif (!$value) {
 			$value = ($forUsers && $userRecord->$field ne '' ? $userRecord->$field : $globalRecord->$field);
 		}
 
-		$inputType = CGI::popup_menu({
-			name          => "$recordType.$recordID.$field",
-			id            => "$recordType.$recordID.${field}_id",
-			values        => $properties{choices},
-			labels        => \%labels,
-			default       => $value,
-			data_override => "$recordType.$recordID.$field.override_id",
-			class         => 'form-select form-select-sm',
-			$forUsers && $check ? (aria_labelledby => "$recordType.$recordID.$field.label") : (),
-		});
+		$inputType = $c->select_field(
+			"$recordType.$recordID.$field", [
+				map { [ $labels{$_} => $_, $_ eq $value ? (selected => undef) : () ] } @{ $properties{choices} }
+			],
+			id    => "$recordType.$recordID.${field}_id",
+			data  => { override => "$recordType.$recordID.$field.override_id" },
+			class => 'form-select form-select-sm',
+			$forUsers && $check ? ('aria-labelledby' => "$recordType.$recordID.$field.label") : (),
+		);
 	}
 
 	my $gDisplVal =
 		(defined $properties{labels} && defined $properties{labels}{$globalValue})
-		? $r->maketext($properties{labels}{$globalValue})
+		? $c->maketext($properties{labels}{$globalValue})
 		: $globalValue;
 	$gDisplVal = format_set_name_display($gDisplVal) if $field eq 'restricted_release';
 
@@ -753,51 +981,41 @@ sub FieldHTML {
 	push @return,
 		(
 			$check
-			? CGI::input({
-				type  => 'checkbox',
-				name  => "$recordType.$recordID.$field.override",
+			? $c->check_box(
+				"$recordType.$recordID.$field.override", $field,
 				id    => "$recordType.$recordID.$field.override_id",
-				value => $field,
-				$r->param("$recordType.$recordID.$field.override")
-				|| ($userValue ne (($labels{''} // '') || $blankfield)) ? (checked => undef) : (),
-				class => 'form-check-input'
-			})
+				class => 'form-check-input',
+				$userValue ne (($labels{''} // '') || $blankfield) ? (checked => undef) : (),
+			)
 			: ''
 		) if $forUsers;
 
 	push @return,
-		CGI::label(
+		$c->label_for(
+			($forUsers && $check ? "$recordType.$recordID.$field.override_id" : "$recordType.$recordID.${field}_id"),
+			$c->maketext($properties{name}),
 			$forUsers && $check
-			? {
-				for   => "$recordType.$recordID.$field.override_id",
-				id    => "$recordType.$recordID.$field.label",
-				class => 'form-check-label mb-0'
-			}
-			: {
-				for   => "$recordType.$recordID.${field}_id",
-				class => 'form-label mb-0'
-			},
-			$r->maketext($properties{name})
+			? (class => 'form-check-label mb-0', id => "$recordType.$recordID.$field.label")
+			: (class => 'form-label mb-0'),
 		);
 
 	push @return,
 		$properties{help_text}
-		? CGI::a(
-			{
-				class             => 'help-popup',
-				data_bs_content   => $r->maketext($properties{help_text}),
-				data_bs_placement => 'top',
-				data_bs_toggle    => 'popover',
-				role              => 'button',
-				tabindex          => 0
+		? $c->tag(
+			'a',
+			class    => 'help-popup',
+			role     => 'button',
+			tabindex => 0,
+			data     => {
+				bs_content   => $c->maketext($properties{help_text}),
+				bs_placement => 'top',
+				bs_toggle    => 'popover'
 			},
-			CGI::i(
-				{
-					class       => 'icon fas fa-question-circle',
-					data_alt    => $r->maketext('Help Icon'),
-					aria_hidden => 'true'
-				},
-				''
+			$c->tag(
+				'i',
+				class         => 'icon fas fa-question-circle',
+				data          => { alt => $c->maketext('Help Icon') },
+				'aria-hidden' => 'true'
 			)
 		)
 		: '';
@@ -807,258 +1025,214 @@ sub FieldHTML {
 	push @return,
 		(
 			$gDisplVal ne ''
-			? CGI::textfield({
-				name            => "$recordType.$recordID.$field.class_value",
-				readonly        => undef,
-				value           => $gDisplVal,
-				size            => $properties{size} || 5,
-				class           => 'form-control form-control-sm',
-				aria_labelledby => "$recordType.$recordID.$field.label",
+			? $c->text_field(
+				"$recordType.$recordID.$field.class_value",
+				$gDisplVal,
+				readonly          => undef,
+				size              => $properties{size} || 5,
+				class             => 'form-control form-control-sm',
+				'aria-labelledby' => "$recordType.$recordID.$field.label",
 				$field =~ /date/ || $field eq 'restricted_release' || $field eq 'source_file' ? (dir => 'ltr') : ()
-			})
+			)
 			: ''
 		) if $forUsers;
 
 	return @return;
 }
 
-# return weird fields that are non-native or which are displayed
-#    for only some sets
-sub extraSetFields {
-	my ($self,$userID,$setID,$globalRecord,$userRecord,$forUsers) = @_;
-	my $db = $self->r->{db};
-	my $r = $self->r;
+# Return weird fields that are non-native or which are displayed for only some sets.
+sub extraSetFields ($c, $userID, $setID, $globalRecord, $userRecord, $forUsers) {
+	my $db = $c->{db};
 
-	my ($extraFields, $ipFields, $ipDefaults, $numLocations, $ipOverride,
-	    $procFields) = ( '', '', '', 0, '', '' );
+	my $extraFields = '';
+	my $num_columns = 0;
 
-	# If we're dealing with a gateway, set up a table of gateway fields
-	my $nF = 0;    # This is the number of columns in the set field table
 	if ($globalRecord->assignment_type() =~ /gateway/) {
-		my $gwhdr    = '';
-		my $gwFields = '';
-		for my $gwfield (@{ GATEWAY_SET_FIELD_ORDER() }) {
+		# If this is a gateway set, set up a table of gateway fields.
+		my @gwFields;
 
-			# don't show template gateway fields when editing set versions
+		for my $gwfield (@{ GATEWAY_SET_FIELD_ORDER() }) {
+			# Don't show template gateway fields when editing set versions.
 			next
 				if (($gwfield eq "time_interval" || $gwfield eq "versions_per_interval")
-				&& ($forUsers && $userRecord->can('version_id')));
+					&& ($forUsers && $userRecord->can('version_id')));
 
-			my @fieldData = $self->FieldHTML($userID, $setID, undef, $globalRecord, $userRecord, $gwfield);
+			my @fieldData = $c->fieldHTML($userID, $setID, undef, $globalRecord, $userRecord, $gwfield);
 			if (@fieldData && defined($fieldData[0]) && $fieldData[0] ne '') {
-				$nF = @fieldData if (@fieldData > $nF);
-				$gwFields .= CGI::Tr(CGI::td([@fieldData]));
+				$num_columns = @fieldData if @fieldData > $num_columns;
+				push(@gwFields, $c->tag('tr', $c->c(map { $c->tag('td', $_) } @fieldData)->join('')));
 			}
 		}
-		$gwhdr .= CGI::Tr(CGI::td({ colspan => $nF }, CGI::em($r->maketext("Gateway parameters"))))
-			if ($nF);
-		$extraFields = "$gwhdr$gwFields";
 
-	} elsif ($globalRecord->assignment_type() eq 'jitar') {
-		my $jthdr    = '';
-		my $jtFields = '';
+		$extraFields = $c->c(
+			$num_columns
+			? $c->tag(
+				'tr',
+				class => 'table-primary',
+				$c->tag(
+					'th',
+					class   => 'p-2',
+					scope   => 'colgroup',
+					colspan => $num_columns,
+					$c->maketext('Test Parameters')
+				)
+				)
+			: '',
+			@gwFields
+		)->join('');
+	} elsif ($globalRecord->assignment_type eq 'jitar') {
+		# If this is a jitar set, set up a table of jitar fields.
+		my $jthdr = '';
+		my @jtFields;
 		for my $jtfield (@{ JITAR_SET_FIELD_ORDER() }) {
-			my @fieldData = $self->FieldHTML($userID, $setID, undef, $globalRecord, $userRecord, $jtfield);
+			my @fieldData = $c->fieldHTML($userID, $setID, undef, $globalRecord, $userRecord, $jtfield);
 			if (@fieldData && defined($fieldData[0]) && $fieldData[0] ne '') {
-				$nF = @fieldData if (@fieldData > $nF);
-				$jtFields .= CGI::Tr(CGI::td([@fieldData]));
+				$num_columns = @fieldData if (@fieldData > $num_columns);
+				push(@jtFields, $c->tag('tr', $c->c(map { $c->tag('td', $_) } @fieldData)->join('')));
 			}
 		}
-		$jthdr .= CGI::Tr(CGI::td({ colspan => $nF }, CGI::em($r->maketext("Just-In-Time parameters"))))
-			if ($nF);
-		$extraFields = "$jthdr$jtFields";
-	}
-
-	# if we have a proctored test, then also generate a proctored set password input
-	if ($globalRecord->assignment_type eq 'proctored_gateway' && !$forUsers) {
-		# We use a routine other than FieldHTML because of getting the default value here.
-		$procFields = CGI::Tr(CGI::td([$self->proctoredFieldHTML($userID, $setID, $globalRecord)]));
+		$extraFields = $c->c(
+			$num_columns
+			? $c->tag(
+				'tr',
+				class => 'table-primary',
+				$c->tag(
+					'th',
+					class   => 'p-2',
+					scope   => 'colgroup',
+					colspan => $num_columns,
+					$c->maketext('Just-In-Time Parameters')
+				)
+				)
+			: '',
+			@jtFields
+		)->join('');
 	}
 
-	# finally, figure out what ip selector fields we want to include
-	my @locations = sort {$a cmp $b} ($db->listLocations());
-	$numLocations = @locations;
-
-	# we don't show ip selector fields if we're editing a set version
-	if (!defined($userRecord) || (defined($userRecord) && !$userRecord->can("version_id"))) {
-		if ((!$forUsers && $globalRecord->restrict_ip && $globalRecord->restrict_ip ne 'No')
-			|| ($forUsers && $userRecord->restrict_ip ne 'No'))
-		{
-			my @globalLocations = $db->listGlobalSetLocations($setID);
-			# what ip locations should be selected?
-			my @defaultLocations;
-			if ($forUsers && !$db->countUserSetLocations($userID, $setID)) {
-				@defaultLocations = @globalLocations;
-				$ipOverride       = 0;
-			} elsif ($forUsers) {
-				@defaultLocations = $db->listUserSetLocations($userID, $setID);
-				$ipOverride       = 1;
-			} else {
-				@defaultLocations = @globalLocations;
-			}
+	my $procFields = '';
 
-			my @tds = (
-				CGI::label(
-					$forUsers
-					? {
-						for   => "set.$setID.selected_ip_locations.override_id",
-						id    => "set.$setID.selected_ip_locations.label",
-						class => 'form-check-label'
-						}
-					: {
-						for   => "set.$setID.selected_ip_locations_id",
-						class => 'form-label'
-					},
-					$r->maketext('Restrict Locations')
-				),
-				'',
-				CGI::scrolling_list({
-					name     => "set.$setID.selected_ip_locations",
-					id       => "set.$setID.selected_ip_locations_id",
-					values   => [@locations],
-					default  => [@defaultLocations],
-					size     => 5,
-					multiple => 'true',
-					class    => 'form-select form-select-sm',
-					$forUsers ? (aria_labelledby => "set.$setID.selected_ip_locations.label") : ()
-				})
-			);
-			if ($forUsers) {
-				unshift(
-					@tds,
-					CGI::div(
-						{ class => 'form-check' },
-						CGI::input({
-							type  => 'checkbox',
-							name  => "set.$setID.selected_ip_locations.override",
-							id    => "set.$setID.selected_ip_locations.override_id",
-							class => 'form-check-input',
-							$ipOverride ? (checked => undef) : ()
-						})
-					)
-				);
-				push(
-					@tds,
-					CGI::textarea({
-						name            => "set.$setID.selected_ip_locations.class_value",
-						readonly        => undef,
-						value           => join("\n", @globalLocations),
-						rows            => 4,
-						class           => 'form-control form-control-sm',
-						aria_labelledby => "set.$setID.selected_ip_locations.label"
-					})
-				);
-			}
-			$ipFields .= CGI::Tr({ class => 'align-top' }, CGI::td([@tds]));
-		}
+	# If this is a proctored test, then add a dropdown menu to configure using a grade proctor
+	# and a proctored set password input.
+	if ($globalRecord->assignment_type eq 'proctored_gateway') {
+		$procFields = $c->c(
+			$c->tag(
+				'tr',
+				class => 'table-primary',
+				$c->tag(
+					'th',
+					class   => 'p-2',
+					scope   => 'colgroup',
+					colspan => $num_columns,
+					$c->maketext('Proctoring Parameters')
+				)
+			),
+			# Dropdown menu to configure using a grade proctor.
+			$c->tag(
+				'tr',
+				$c->c(
+					map { $c->tag('td', $_) }
+						$c->fieldHTML($userID, $setID, undef, $globalRecord, $userRecord, 'use_grade_auth_proctor')
+				)->join('')
+			),
+			$forUsers ? '' : $c->include(
+				'ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row',
+				globalRecord => $globalRecord
+			)
+		)->join('');
 	}
-	return ($extraFields, $ipFields, $numLocations, $procFields);
-}
 
-sub proctoredFieldHTML {
-	my ($self, $userID, $setID, $globalRecord) = @_;
+	# Figure out what ip selector fields to include.
+	my @locations    = sort { $a cmp $b } $db->listLocations;
+	my $numLocations = @locations;
 
-	my $r  = $self->r;
-	my $db = $r->db;
+	my $ipFields = '';
 
-	# Note that this routine assumes that the login proctor password
-	# is something that can only be changed for the global set.
+	if (
+		(!defined $userRecord || (defined $userRecord && !$userRecord->can('version_id')))
+		&& ((!$forUsers && $globalRecord->restrict_ip && $globalRecord->restrict_ip ne 'No')
+			|| ($forUsers && $userRecord->restrict_ip ne 'No'))
+		)
+	{
+		my $ipOverride      = 0;
+		my @globalLocations = $db->listGlobalSetLocations($setID);
+
+		# Which ip locations should be selected?
+		my %defaultLocations;
+		if (!$forUsers || !$db->countUserSetLocations($userID, $setID)) {
+			%defaultLocations = map { $_ => 1 } @globalLocations;
+		} else {
+			%defaultLocations = map { $_ => 1 } $db->listUserSetLocations($userID, $setID);
+			$ipOverride       = 1;
+		}
 
-	# If the set doesn't require a login proctor, then we can assume
-	# that one doesn't exist. Otherwise, we need to check the
-	# database to find if there's an already defined password
-	my $value = '';
-	if ($globalRecord->restricted_login_proctor eq 'Yes' && $db->existsPassword("set_id:$setID")) {
-		$value = '********';
+		$ipFields = $c->include(
+			'ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row',
+			forUsers         => $forUsers,
+			ipOverride       => $ipOverride,
+			locations        => \@locations,
+			defaultLocations => \%defaultLocations,
+			globalLocations  => \@globalLocations
+		);
 	}
-
-	return (
-		$r->maketext('Password (Leave blank for regular proctoring)'),
-		CGI::a(
-			{
-				class           => 'help-popup',
-				data_bs_content => $r->maketext(
-					"Proctored tests require proctor authorization to start and to grade.  "
-						. "Provide a password to have a single password for all students to start a proctored test."
-				),
-				data_bs_placement => 'top',
-				data_bs_toggle    => 'popover',
-				role              => 'button',
-				tabindex          => 0
-			},
-			CGI::i(
-				{
-					class       => 'icon fas fa-question-circle',
-					aria_hidden => 'true',
-					data_alt    => $r->maketext('Help Icon')
-				},
-				''
-			)
-		),
-		CGI::input({
-			name  => "set.$setID.restricted_login_proctor_password",
-			value => $value,
-			size  => 10,
-			class => 'form-control form-control-sm'
-		})
-	);
+	return ($extraFields, $ipFields, $numLocations, $procFields);
 }
 
-# used to print nested lists for jitar sets
-# this is a recursive function which is used to print the tree structure
-# that jitar sets can have using nested unordered lists
-sub print_nested_list {
-	my $nestedHash = shift;
-	my $id         = $nestedHash->{id};
+# This is a recursive function which displays the tree structure of jitar sets.
+# Each child is displayed as a nested ordered list.
+sub print_nested_list ($c, $nestedHash) {
+	my $output = $c->c;
 
-	# this hash contains information about the problem at this node, which
-	# we print and then delete
+	# This hash contains information about the problem at this node.  Output the problem row and delete the "id" and
+	# "row" keys.  Any remaining keys are references to child nodes which are shown in a sub list via the recursion.
+	# Note that the only reason the "id" and "row" keys need to be deleted is because those keys are not numeric for the
+	# key sort.
 	if (defined $nestedHash->{row}) {
-		print CGI::start_li({ class => 'psd_list_item', id => "psd_list_item_$id" });
-		print $nestedHash->{row};
-		delete $nestedHash->{row};
-		delete $nestedHash->{id};
-	}
-
-	# any remaining keys are references to child nodes which need to be
-	# printed in a sub list.
-	my @keys = keys %$nestedHash;
-	print CGI::start_ol({ class => 'sortable-branch collapse', id => "psd_sublist_$id" });
-	if (@keys) {
-		for (sort { $a <=> $b } @keys) {
-			print_nested_list($nestedHash->{$_});
-		}
+		my $id = delete $nestedHash->{id};
+		push(
+			@$output,
+			$c->tag(
+				'li',
+				class => 'psd_list_item',
+				id    => "psd_list_item_$id",
+				$c->c(
+					delete $nestedHash->{row},
+					$c->tag(
+						'ol',
+						class => 'sortable-branch collapse',
+						id    => "psd_sublist_$id",
+						sub {
+							my $sub_output = $c->c;
+							my @keys       = keys %$nestedHash;
+							if (@keys) {
+								for (sort { $a <=> $b } @keys) {
+									push(@$sub_output, $c->print_nested_list($nestedHash->{$_}));
+								}
+							}
+							return $sub_output->join('');
+						}
+					)
+				)->join('')
+			)
+		);
 	}
-	print CGI::end_ol();
 
-	print CGI::end_li();
+	return $output->join('');
 }
 
-# handles rearrangement necessary after changes to problem ordering
-sub handle_problem_numbers {
-	my $self = shift;
-	my $r = $self->r;
-	my $newProblemNumbersref = shift;
-	my %newProblemNumbers = %$newProblemNumbersref;
-	my $db = shift;
-	my $setID = shift;
+# Handles rearrangement necessary after changes to problem ordering.
+sub handle_problem_numbers ($c, $newProblemNumbers, $db, $setID) {
+	# Check to see that everything has a number and if anything was renumbered.
 	my $force = 0;
-	my $maxDepth = 0;
-	my @sortme=();
-	my ($j, $val);
-	my @prob_ids;
-
-	# check to see that everything has a number and if anything was renumbered.
-	foreach $j (keys %newProblemNumbers) {
-		return "" if (not defined $newProblemNumbers{$j});
-		$force = 1 if $newProblemNumbers{$j} != $j;
+	for my $j (keys %$newProblemNumbers) {
+		return ""  if !defined $newProblemNumbers->{$j};
+		$force = 1 if $newProblemNumbers->{$j} != $j;
 	}
 
 	# we dont do anything unless a problem has been reordered or we were asked to
 	return "" unless $force;
 
 	# get problems and store them in a hash.
-        # We do this all at once because its not always clear
+	# We do this all at once because its not always clear
 	# what is overwriting what and when.
 	# We try to keep things sane by only getting and storing things
 	# which have actually been reordered
@@ -1066,249 +1240,241 @@ sub handle_problem_numbers {
 	my @setUsers = $db->listSetUsers($setID);
 	my %userProblemHash;
 
-
-	foreach $j (keys %newProblemNumbers) {
-	    next if $newProblemNumbers{$j} == $j;
-
-	    $problemHash{$j} = $db->getGlobalProblem($setID, $j);
-	    die $r->maketext("global [_1] for set [_2] not found.", $j, $setID) unless $problemHash{$j};
-	    foreach my $user (@setUsers) {
-		$userProblemHash{$user}{$j} = $db->getUserProblem($user,$setID, $j);
-		warn $r->maketext("UserProblem missing for user=[_1] set=[_2] problem=[_3]. This may indicate database corruption.", $user, $setID, $j)."\n"
-		    unless $userProblemHash{$user}{$j};
-	    }
+	for my $j (keys %$newProblemNumbers) {
+		next if $newProblemNumbers->{$j} == $j;
+
+		$problemHash{$j} = $db->getGlobalProblem($setID, $j);
+		die $c->maketext("global [_1] for set [_2] not found.", $j, $setID) unless $problemHash{$j};
+		foreach my $user (@setUsers) {
+			$userProblemHash{$user}{$j} = $db->getUserProblem($user, $setID, $j);
+			warn $c->maketext(
+				"UserProblem missing for user=[_1] set=[_2] problem=[_3]. This may indicate database corruption.",
+				$user, $setID, $j)
+				. "\n"
+				unless $userProblemHash{$user}{$j};
+		}
 	}
 
 	# now go through and move problems around
 	# because of the way the reordering works with the draggable
 	# js handler we cant have any conflicts or holes
-	foreach $j (keys %newProblemNumbers) {
-	    next if ($newProblemNumbers{$j} == $j);
+	for my $j (keys %$newProblemNumbers) {
+		next if ($newProblemNumbers->{$j} == $j);
 
-	    $problemHash{$j}->problem_id($newProblemNumbers{$j});
-	    if ($db->existsGlobalProblem($setID, $newProblemNumbers{$j})) {
-		$db->putGlobalProblem($problemHash{$j});
-	    } else {
-		$db->addGlobalProblem($problemHash{$j});
-	    }
+		$problemHash{$j}->problem_id($newProblemNumbers->{$j});
+		if ($db->existsGlobalProblem($setID, $newProblemNumbers->{$j})) {
+			$db->putGlobalProblem($problemHash{$j});
+		} else {
+			$db->addGlobalProblem($problemHash{$j});
+		}
 
-	    # now deal with the user sets
+		# now deal with the user sets
 
-	    foreach my $user (@setUsers) {
+		foreach my $user (@setUsers) {
 
-		$userProblemHash{$user}{$j}->problem_id($newProblemNumbers{$j});
-		if ($db->existsUserProblem($user, $setID, $newProblemNumbers{$j})) {
-		    $db->putUserProblem($userProblemHash{$user}{$j});
-		} else {
-		    $db->addUserProblem($userProblemHash{$user}{$j});
-		}
+			$userProblemHash{$user}{$j}->problem_id($newProblemNumbers->{$j});
+			if ($db->existsUserProblem($user, $setID, $newProblemNumbers->{$j})) {
+				$db->putUserProblem($userProblemHash{$user}{$j});
+			} else {
+				$db->addUserProblem($userProblemHash{$user}{$j});
+			}
 
-	    }
+		}
 
-	    # now we need to delete "orphan" problems that were not overwritten by something else
-	    my $delete = 1;
-	    foreach my $k (keys %newProblemNumbers) {
-		$delete = 0 if ($j == $newProblemNumbers{$k});
-	    }
+		# now we need to delete "orphan" problems that were not overwritten by something else
+		my $delete = 1;
+		foreach my $k (keys %$newProblemNumbers) {
+			$delete = 0 if ($j == $newProblemNumbers->{$k});
+		}
 
-	    if ($delete) {
-		$db->deleteGlobalProblem($setID, $j);
-	    }
+		if ($delete) {
+			$db->deleteGlobalProblem($setID, $j);
+		}
 
 	}
 
-
 	# return a string form of the old problem IDs in the new order (not used by caller, incidentally)
-	return join(', ', values %newProblemNumbers);
+	return join(', ', values %$newProblemNumbers);
 }
 
-
-# primarily saves any changes into the correct set or problem records (global vs user)
-# also deals with deleting or rearranging problems
-sub initialize {
-	my ($self)    = @_;
-	my $r         = $self->r;
-	my $db        = $r->db;
-	my $ce        = $r->ce;
-	my $authz     = $r->authz;
-	my $user      = $r->param('user');
-	my $setID   = $r->urlpath->arg("setID");
-
-	## we're now allowing setID to come in as setID,v# to edit a set
-	##    version; catch this first
+# Primarily saves any changes into the correct set or problem records (global vs user).
+# Also deals with deleting or rearranging problems.
+sub initialize ($c) {
+	my $db    = $c->db;
+	my $ce    = $c->ce;
+	my $authz = $c->authz;
+	my $user  = $c->param('user');
+	my $setID = $c->stash('setID');
+
+	# Make sure these are defined for the templates.
+	$c->stash->{fullSetID}        = $setID;
+	$c->stash->{headers}          = HEADER_ORDER();
+	$c->stash->{field_properties} = FIELD_PROPERTIES();
+	$c->stash->{display_modes}    = WeBWorK::PG::DISPLAY_MODES();
+	$c->stash->{unassignedUsers}  = [];
+	$c->stash->{problemIDList}    = [];
+	$c->stash->{globalProblems}   = {};
+	$c->stash->{userProblems}     = {};
+	$c->stash->{mergedProblems}   = {};
+
+	# A set may be provided with a version number (as in setID,v#).
+	# If so obtain the template set id and version number.
 	my $editingSetVersion = 0;
-	if ( $setID =~ /,v(\d+)$/ ) {
-	    $editingSetVersion = $1;
-	    $setID =~ s/,v(\d+)$//;
+	if ($setID =~ /,v(\d+)$/) {
+		$editingSetVersion = $1;
+		$setID =~ s/,v(\d+)$//;
 	}
 
-	my $setRecord = $db->getGlobalSet($setID); # checked
-	die $r->maketext("global set [_1] not found.", $setID) unless $setRecord;
+	$c->stash->{setID}             = $setID;
+	$c->stash->{editingSetVersion} = $editingSetVersion;
 
-	$self->{set}  = $setRecord;
-	my @editForUser = $r->param('editForUser');
-	# some useful booleans
-	my $forUsers   = scalar(@editForUser);
-	my $forOneUser = $forUsers == 1;
+	my $setRecord = $db->getGlobalSet($setID);
+	$c->stash->{setRecord} = $setRecord;
+	return unless $setRecord;
 
-	# Check permissions
-	return unless ($authz->hasPermissions($user, "access_instructor_tools"));
-	return unless ($authz->hasPermissions($user, "modify_problem_sets"));
+	return unless ($authz->hasPermissions($user, 'access_instructor_tools'));
+	return unless ($authz->hasPermissions($user, 'modify_problem_sets'));
 
-	## if we're editing a versioned set, it only makes sense to be
-	##    editing it for one user
-	return if ( $editingSetVersion && ! $forOneUser );
+	my @editForUser = $c->param('editForUser');
+
+	my $forUsers = scalar(@editForUser);
+	$c->stash->{forUsers} = $forUsers;
+	my $forOneUser = $forUsers == 1;
+	$c->stash->{forOneUser} = $forOneUser;
+
+	# If editing a versioned set, it only makes sense edit it for one user.
+	return if ($editingSetVersion && !$forOneUser);
 
 	my %properties = %{ FIELD_PROPERTIES() };
 
-	# takes a hash of hashes and inverts it
+	# Invert the labels hashes.
 	my %undoLabels;
-	foreach my $key (keys %properties) {
-		%{ $undoLabels{$key} } = map { $r->maketext($properties{$key}->{labels}->{$_}) => $_ } keys %{ $properties{$key}->{labels} };
+	for my $key (keys %properties) {
+		%{ $undoLabels{$key} } =
+			map { $c->maketext($properties{$key}{labels}{$_}) => $_ } keys %{ $properties{$key}{labels} };
 	}
 
-	# Unfortunately not everyone uses Javascript enabled browsers so
-	# we must fudge the information coming from the ComboBoxes
-	# Since the textfield and menu both have the same name, we get an array of two elements
-	# We then reset the param to the first if its not-empty or the second (empty or not).
-	foreach ( @{ HEADER_ORDER() } ) {
-		my @values = $r->param("set.$setID.$_");
-		my $value = $values[0] || $values[1] || "";
-		$r->param("set.$setID.$_", $value);
-	}
-
-	#####################################################################
-	# Check date information
-	#####################################################################
-
 	my ($open_date, $due_date, $answer_date, $reduced_scoring_date);
 	my $error = 0;
-	if (defined $r->param('submit_changes')) {
+	if (defined $c->param('submit_changes')) {
 		my @names = ("open_date", "due_date", "answer_date", "reduced_scoring_date");
 
 		my %dates;
 		for (@names) {
-			$dates{$_} = $r->param("set.$setID.$_") || '';
+			$dates{$_} = $c->param("set.$setID.$_") || '';
 			if (defined $undoLabels{$_}{ $dates{$_} } || !$dates{$_}) {
 				$dates{$_} = $setRecord->$_;
 			}
 		}
 
-		if (!$error)
-		{
-			($open_date, $due_date, $answer_date, $reduced_scoring_date) = map { $dates{$_}||0 } @names;
-
-			# make sure dates are numeric by using ||0
+		if (!$error) {
+			# Make sure dates are numeric.
+			($open_date, $due_date, $answer_date, $reduced_scoring_date) = map { $dates{$_} || 0 } @names;
 
 			if ($answer_date < $due_date || $answer_date < $open_date) {
-				$self->addbadmessage($r->maketext("Answers cannot be made available until on or after the close date!"));
-				$error = $r->param('submit_changes');
+				$c->addbadmessage($c->maketext("Answers cannot be made available until on or after the close date!"));
+				$error = $c->param('submit_changes');
 			}
 
-			if ($due_date < $open_date ) {
-				$self->addbadmessage($r->maketext("Answers cannot be due until on or after the open date!"));
-				$error = $r->param('submit_changes');
+			if ($due_date < $open_date) {
+				$c->addbadmessage($c->maketext("Answers cannot be due until on or after the open date!"));
+				$error = $c->param('submit_changes');
 			}
 
-			my $enable_reduced_scoring =
-			$ce->{pg}{ansEvalDefaults}{enableReducedScoring} &&
-			(defined($r->param("set.$setID.enable_reduced_scoring")) ?
-				$r->param("set.$setID.enable_reduced_scoring") :
-				$setRecord->enable_reduced_scoring);
+			my $enable_reduced_scoring = $ce->{pg}{ansEvalDefaults}{enableReducedScoring}
+				&& (
+					defined($c->param("set.$setID.enable_reduced_scoring"))
+					? $c->param("set.$setID.enable_reduced_scoring")
+					: $setRecord->enable_reduced_scoring);
 
-			if ($enable_reduced_scoring &&
-				$reduced_scoring_date
+			if (
+				$enable_reduced_scoring
+				&& $reduced_scoring_date
 				&& ($reduced_scoring_date > $due_date
-					|| $reduced_scoring_date < $open_date)) {
-				$self->addbadmessage($r->maketext("The reduced scoring date should be between the open date and close date."));
-				$error = $r->param('submit_changes');
+					|| $reduced_scoring_date < $open_date)
+				)
+			{
+				$c->addbadmessage(
+					$c->maketext("The reduced scoring date should be between the open date and close date."));
+				$error = $c->param('submit_changes');
 			}
 
-			# make sure the dates are not more than 10 years in the future
-			my $curr_time = time;
+			# Make sure the dates are not more than 10 years in the future.
+			my $curr_time        = time;
 			my $seconds_per_year = 31_556_926;
-			my $cutoff = $curr_time + $seconds_per_year*10;
+			my $cutoff           = $curr_time + $seconds_per_year * 10;
 			if ($open_date > $cutoff) {
-				$self->addbadmessage($r->maketext("Error: open date cannot be more than 10 years from now in set [_1]", $setID));
-				$error = $r->param('submit_changes');
+				$c->addbadmessage(
+					$c->maketext("Error: open date cannot be more than 10 years from now in set [_1]", $setID));
+				$error = $c->param('submit_changes');
 			}
 			if ($due_date > $cutoff) {
-				$self->addbadmessage($r->maketext("Error: close date cannot be more than 10 years from now in set [_1]", $setID));
-				$error = $r->param('submit_changes');
+				$c->addbadmessage(
+					$c->maketext("Error: close date cannot be more than 10 years from now in set [_1]", $setID));
+				$error = $c->param('submit_changes');
 			}
 			if ($answer_date > $cutoff) {
-				$self->addbadmessage($r->maketext("Error: answer date cannot be more than 10 years from now in set [_1]", $setID));
-				$error = $r->param('submit_changes');
+				$c->addbadmessage(
+					$c->maketext("Error: answer date cannot be more than 10 years from now in set [_1]", $setID));
+				$error = $c->param('submit_changes');
 			}
 		}
 	}
 
 	if ($error) {
-		$self->addbadmessage($r->maketext("No changes were saved!"));
+		$c->addbadmessage($c->maketext("No changes were saved!"));
 	}
 
-	if (defined $r->param('submit_changes') && !$error) {
+	if (defined $c->param('submit_changes') && !$error) {
 
-		#my $setRecord = $db->getGlobalSet($setID); # already fetched above --sam
-	        my $oldAssignmentType = $setRecord->assignment_type();
+		my $oldAssignmentType = $setRecord->assignment_type();
 
-		#####################################################################
 		# Save general set information (including headers)
-		#####################################################################
 
 		if ($forUsers) {
-			# note that we don't deal with the proctor user
-			#    fields here, with the assumption that it can't
-			#    be possible to change them for users.  this is
-			#    not the most robust treatment of the problem
-			#    (FIXME)
-
-			my @userRecords = $db->getUserSetsWhere({ user_id => [ @editForUser ], set_id => $setID });
-			# if we're editing a set version, we want to edit
-			#    edit that instead of the userset, so get it
-			#    too.
-			my $userSet = $userRecords[0];
+			# Note that we don't deal with the proctor user fields here, with the assumption that it can't be possible
+			# to change them for users.
+			# FIXME: This is not the most robust treatment of the problem
+
+			my @userRecords = $db->getUserSetsWhere({ user_id => [@editForUser], set_id => $setID });
+			# If editing a set version, we want to edit that instead of the userset, so get it too.
+			my $userSet    = $userRecords[0];
 			my $setVersion = 0;
-			if ( $editingSetVersion ) {
-				$setVersion =
-					$db->getSetVersion($editForUser[0],
-							   $setID,
-							   $editingSetVersion);
-				@userRecords = ( $setVersion );
+			if ($editingSetVersion) {
+				$setVersion  = $db->getSetVersion($editForUser[0], $setID, $editingSetVersion);
+				@userRecords = ($setVersion);
 			}
 
 			foreach my $record (@userRecords) {
-				foreach my $field ( @{ SET_FIELDS() } ) {
+				foreach my $field (@{ SET_FIELDS() }) {
 					next unless canChange($forUsers, $field);
-					my $override = $r->param("set.$setID.$field.override");
+					my $override = $c->param("set.$setID.$field.override");
 
 					if (defined $override && $override eq $field) {
 
-					    my $param = $r->param("set.$setID.$field");
-					    $param = defined $properties{$field}->{default} ? $properties{$field}->{default} : "" unless defined $param && $param ne "";
+						my $param = $c->param("set.$setID.$field");
+						$param = defined $properties{$field}->{default} ? $properties{$field}->{default} : ""
+							unless defined $param && $param ne "";
 
-					    my $unlabel = $undoLabels{$field}->{$param};
+						my $unlabel = $undoLabels{$field}->{$param};
 						$param = $unlabel if defined $unlabel;
 						if (defined($properties{$field}->{convertby}) && $properties{$field}->{convertby}) {
-							$param = $param*$properties{$field}->{convertby};
+							$param = $param * $properties{$field}->{convertby};
 						}
-						# special case; does field fill in multiple values?
-						if ( $field =~ /:/ ) {
+						# Special case: Does field fill in multiple values?
+						if ($field =~ /:/) {
 							my @values = split(/:/, $param);
 							my @fields = split(/:/, $field);
-							for ( my $i=0; $i<@values; $i++ ) {
-								my $f=$fields[$i];
+							for (my $i = 0; $i < @values; $i++) {
+								my $f = $fields[$i];
 								$record->$f($values[$i]);
 							}
 						} else {
 							$record->$field($param);
 						}
 					} else {
-						####################
-						# FIXME: allow one selector to set multiple fields
-						#
-						if ( $field =~ /:/ ) {
-							foreach my $f ( split(/:/, $field) ) {
+						if ($field =~ /:/) {
+							foreach my $f (split(/:/, $field)) {
 								$record->$f(undef);
 							}
 						} else {
@@ -1317,93 +1483,79 @@ sub initialize {
 					}
 
 				}
-				####################
-				# FIXME: this is replaced by our allowing multiple fields to be set by one selector
-				# a check for hiding scores: if we have
-				#    $set->hide_score eq 'N', we also want
-				#    $set->hide_score_by_problem eq 'N'
-				# if ( $record->hide_score eq 'N' ) {
-				# 	$record->hide_score_by_problem('N');
-				# }
-				####################
-				if ( $editingSetVersion ) {
-					$db->putSetVersion( $record );
+
+				if ($editingSetVersion) {
+					$db->putSetVersion($record);
 				} else {
 					$db->putUserSet($record);
 				}
 			}
 
-		#######################################################
-		# Save IP restriction Location information
-		#######################################################
-		# FIXME: it would be nice to have this in the field values
-		#    hash, so that we don't have to assume that we can
-		#    override this information for users
-
-			## should we allow resetting set locations for set versions?  this
-			##    requires either putting in a new set of database routines
-			##    to deal with the versioned setID, or fudging it at this end
-			##    by manually putting in the versioned ID setID,v#.  neither
-			##    of these seems desirable, so for now it's not allowed
-			if ( ! $editingSetVersion ) {
-				if ( $r->param("set.$setID.selected_ip_locations.override") ) {
-					foreach my $record ( @userRecords ) {
-						my $userID = $record->user_id;
-						my @selectedLocations = $r->param("set.$setID.selected_ip_locations");
-						my @userSetLocations = $db->listUserSetLocations($userID,$setID);
-						my @addSetLocations = ();
-						my @delSetLocations = ();
-						foreach my $loc ( @selectedLocations ) {
-							push( @addSetLocations, $loc ) if ( ! grep( /^$loc$/, @userSetLocations ) );
+			# Save IP restriction Location information
+			# FIXME: it would be nice to have this in the field values hash, so that we don't have to assume that we can
+			# override this information for users.
+
+			# Should we allow resetting set locations for set versions?  This requires either putting in a new set of
+			# database routines to deal with the versioned setID, or fudging it at this end by manually putting in the
+			# versioned ID setID,v#.  Neither of these seems desirable, so for now it's not allowed
+			if (!$editingSetVersion) {
+				if ($c->param("set.$setID.selected_ip_locations.override")) {
+					foreach my $record (@userRecords) {
+						my $userID            = $record->user_id;
+						my @selectedLocations = $c->param("set.$setID.selected_ip_locations");
+						my @userSetLocations  = $db->listUserSetLocations($userID, $setID);
+						my @addSetLocations   = ();
+						my @delSetLocations   = ();
+						foreach my $loc (@selectedLocations) {
+							push(@addSetLocations, $loc) if (!grep {/^$loc$/} @userSetLocations);
 						}
-						foreach my $loc ( @userSetLocations ) {
-							push( @delSetLocations, $loc ) if ( ! grep( /^$loc$/, @selectedLocations ) );
+						foreach my $loc (@userSetLocations) {
+							push(@delSetLocations, $loc) if (!grep {/^$loc$/} @selectedLocations);
 						}
-						# then update the user set_locations
-						foreach ( @addSetLocations ) {
+						# Update the user set_locations
+						foreach (@addSetLocations) {
 							my $Loc = $db->newUserSetLocation;
-							$Loc->set_id( $setID );
-							$Loc->user_id( $userID );
+							$Loc->set_id($setID);
+							$Loc->user_id($userID);
 							$Loc->location_id($_);
 							$db->addUserSetLocation($Loc);
 						}
-						foreach ( @delSetLocations ) {
-							$db->deleteUserSetLocation($userID,$setID,$_);
+						foreach (@delSetLocations) {
+							$db->deleteUserSetLocation($userID, $setID, $_);
 						}
 					}
 				} else {
-					# if override isn't selected, then we want
-					#    to be sure that there are no
-					#    set_locations_user entries setting around
-					foreach my $record ( @userRecords ) {
-						my $userID = $record->user_id;
-						my @userLocations = $db->listUserSetLocations($userID,$setID);
-						foreach ( @userLocations ) {
-							$db->deleteUserSetLocation($userID,$setID,$_);
+					# If override isn't selected, then make sure that there are no set_locations_user entries.
+					foreach my $record (@userRecords) {
+						my $userID        = $record->user_id;
+						my @userLocations = $db->listUserSetLocations($userID, $setID);
+						foreach (@userLocations) {
+							$db->deleteUserSetLocation($userID, $setID, $_);
 						}
 					}
 				}
 			}
 		} else {
-			foreach my $field ( @{ SET_FIELDS() } ) {
+			foreach my $field (@{ SET_FIELDS() }) {
 				next unless canChange($forUsers, $field);
 
-				my $param = $r->param("set.$setID.$field");
-				$param = defined $properties{$field}->{default} ? $properties{$field}->{default} : "" unless defined $param && $param ne "";
+				my $param = $c->param("set.$setID.$field");
+				$param = defined $properties{$field}->{default} ? $properties{$field}->{default} : ""
+					unless defined $param && $param ne "";
 				my $unlabel = $undoLabels{$field}->{$param};
 				$param = $unlabel if defined $unlabel;
 				if ($field =~ /restricted_release/ && $param) {
 					$param = format_set_name_internal($param =~ s/\s*,\s*/,/gr);
-					$self->check_sets($db, $param);
+					$c->check_sets($db, $param);
 				}
 				if (defined($properties{$field}->{convertby}) && $properties{$field}->{convertby} && $param) {
-					$param = $param*$properties{$field}->{convertby};
+					$param = $param * $properties{$field}->{convertby};
 				}
-				# special case; does field fill in multiple values?
-				if ( $field =~ /:/ ) {
+
+				if ($field =~ /:/) {
 					my @values = split(/:/, $param);
 					my @fields = split(/:/, $field);
-					for ( my $i=0; $i<@fields; $i++ ) {
+					for (my $i = 0; $i < @fields; $i++) {
 						my $f = $fields[$i];
 						$setRecord->$f($values[$i]);
 					}
@@ -1411,91 +1563,61 @@ sub initialize {
 					$setRecord->$field($param);
 				}
 			}
-####################
-# FIXME: this is replaced by our setting both hide_score and hide_score_by_problem
-#    with a single drop down
-#
-# 			# a check for hiding scores: if we have
-# 			#    $set->hide_score eq 'N', we also want
-# 			#    $set->hide_score_by_problem eq 'N', and if it's
-# 			#    changed to 'Y' and hide_score_by_problem is Null,
-# 			#    give it a value 'N'
-# 			if ( $setRecord->hide_score eq 'N' ||
-# 			     ( ! defined($setRecord->hide_score_by_problem) ||
-# 			       $setRecord->hide_score_by_problem eq '' ) ) {
-# 				$setRecord->hide_score_by_problem('N');
-# 			}
-####################
 			$db->putGlobalSet($setRecord);
 
-		#######################################################
-		# Save IP restriction Location information
-		#######################################################
-
-			if ( defined($r->param("set.$setID.restrict_ip")) and $r->param("set.$setID.restrict_ip") ne 'No' ) {
-				my @selectedLocations = $r->param("set.$setID.selected_ip_locations");
+			# Save IP restriction Location information
+			if (defined($c->param("set.$setID.restrict_ip")) && $c->param("set.$setID.restrict_ip") ne 'No') {
+				my @selectedLocations  = $c->param("set.$setID.selected_ip_locations");
 				my @globalSetLocations = $db->listGlobalSetLocations($setID);
-				my @addSetLocations = ();
-				my @delSetLocations = ();
-				foreach my $loc ( @selectedLocations ) {
-					push( @addSetLocations, $loc ) if ( ! grep( /^$loc$/, @globalSetLocations ) );
+				my @addSetLocations    = ();
+				my @delSetLocations    = ();
+				foreach my $loc (@selectedLocations) {
+					push(@addSetLocations, $loc) if (!grep {/^$loc$/} @globalSetLocations);
 				}
-				foreach my $loc ( @globalSetLocations ) {
-					push( @delSetLocations, $loc ) if ( ! grep( /^$loc$/, @selectedLocations ) );
+				foreach my $loc (@globalSetLocations) {
+					push(@delSetLocations, $loc) if (!grep {/^$loc$/} @selectedLocations);
 				}
-				# then update the global set_locations
-				foreach ( @addSetLocations ) {
+				# Update the global set_locations
+				foreach (@addSetLocations) {
 					my $Loc = $db->newGlobalSetLocation;
-					$Loc->set_id( $setID );
+					$Loc->set_id($setID);
 					$Loc->location_id($_);
 					$db->addGlobalSetLocation($Loc);
 				}
-				foreach ( @delSetLocations ) {
-					$db->deleteGlobalSetLocation($setID,$_);
+				foreach (@delSetLocations) {
+					$db->deleteGlobalSetLocation($setID, $_);
 				}
 			} else {
 				my @globalSetLocations = $db->listGlobalSetLocations($setID);
-				foreach ( @globalSetLocations ) {
-					$db->deleteGlobalSetLocation($setID,$_);
+				foreach (@globalSetLocations) {
+					$db->deleteGlobalSetLocation($setID, $_);
 				}
 			}
 
-		#######################################################
-		# Save proctored problem proctor user information
-		#######################################################
-			if ($r->param("set.$setID.restricted_login_proctor_password") &&
-			    $setRecord->assignment_type eq 'proctored_gateway') {
-				# in this case we're adding a set-level proctor
-				#    or updating the password
-
+			# Save proctored problem proctor user information
+			if ($c->param("set.$setID.restricted_login_proctor_password")
+				&& $setRecord->assignment_type eq 'proctored_gateway')
+			{
+				# In this case add a set-level proctor or update the password.
 				my $procID = "set_id:$setID";
-				my $pass = $r->param("set.$setID.restricted_login_proctor_password");
-				# should we carefully check in this case that
-				#    the user and password exist?  the code
-				#    in the add stanza is pretty careful to
-				#    be sure that there's a one-to-one
-				#    correspondence between the existence of
-				#    the user and the setting of the set
-				#    restricted_login_proctor field, so we
-				#    assume that just checking the latter
-				#    here is sufficient.
-				if ( $setRecord->restricted_login_proctor eq 'Yes' ) {
-					# in this case we already have a set
-					#    level proctor, and so should be
-					#    resetting the password
-					if ( $pass ne '********' ) {
-						# then we submitted a new
-						#    password, so save it
-						my $dbPass;
-						eval { $dbPass = $db->getPassword($procID) };
-						if ( $@ ) {
-							$self->addbadmessage($r->maketext("Error getting old set-proctor password from the database: [_1].  No update to the password was done.", $@));
-						} else {
-							$dbPass->password(cryptPassword($pass));
-							$db->putPassword($dbPass);
-						}
+				my $pass   = $c->param("set.$setID.restricted_login_proctor_password");
+				# Should we carefully check in this case that the user and password exist?  The code in the add stanza
+				# is pretty careful to be sure that there's a one-to-one correspondence between the existence of the
+				# user and the setting of the set restricted_login_proctor field, so we assume that just checking the
+				# latter here is sufficient.
+				if ($setRecord->restricted_login_proctor eq 'Yes' && $pass ne '********') {
+					# A new password was submitted. So save it.
+					my $dbPass = eval { $db->getPassword($procID) };
+					if ($@) {
+						$c->addbadmessage($c->maketext(
+							'Error getting old set-proctor password from the database: [_1].  '
+								. 'No update to the password was done.',
+							$@
+						));
+					} else {
+						$dbPass->password(cryptPassword($pass));
+						$db->putPassword($dbPass);
 					}
-
 				} else {
 					$setRecord->restricted_login_proctor('Yes');
 					my $procUser = $db->newUser();
@@ -1506,84 +1628,83 @@ sub initialize {
 					$procUser->status($ce->status_name_to_abbrevs('Proctor'));
 					my $procPerm = $db->newPermissionLevel;
 					$procPerm->user_id($procID);
-					$procPerm->permission($ce->{userRoles}->{login_proctor});
+					$procPerm->permission($ce->{userRoles}{login_proctor});
 					my $procPass = $db->newPassword;
 					$procPass->user_id($procID);
 					$procPass->password(cryptPassword($pass));
-					# put these into the database
+
 					eval { $db->addUser($procUser) };
-					if ( $@ ) {
-						$self->addbadmessage($r->maketext("Error adding set-level proctor: [_1]", $@));
+					if ($@) {
+						$c->addbadmessage($c->maketext("Error adding set-level proctor: [_1]", $@));
 					} else {
 						$db->addPermissionLevel($procPerm);
 						$db->addPassword($procPass);
 					}
 
-					# and set the restricted_login_proctor
-					#    set field
-					$db->putGlobalSet( $setRecord );
+					# Set the restricted_login_proctor set field
+					$db->putGlobalSet($setRecord);
 				}
 
 			} else {
-				# if the parameter isn't set, or if the assignment
-				#    type is not 'proctored_gateway', then we need to be
-				#    sure that there's no set-level proctor defined
-				if ( $setRecord->restricted_login_proctor eq 'Yes' ) {
+				# If the parameter isn't set, or if the assignment type is not 'proctored_gateway', then ensure that
+				# there is no set-level proctor defined.
+				if ($setRecord->restricted_login_proctor eq 'Yes') {
 
 					$setRecord->restricted_login_proctor('No');
-					$db->deleteUser( "set_id:$setID" );
-					$db->putGlobalSet( $setRecord );
+					$db->deleteUser("set_id:$setID");
+					$db->putGlobalSet($setRecord);
 
 				}
 			}
 		}
 
-		#####################################################################
 		# Save problem information
-		#####################################################################
 
-		my @problemIDs = map { $_->[1] } $db->listGlobalProblemsWhere({ set_id => $setID }, 'problem_id');
-		my @problemRecords = $db->getGlobalProblems(map { [$setID, $_] } @problemIDs);
+		my @problemIDs     = map { $_->[1] } $db->listGlobalProblemsWhere({ set_id => $setID }, 'problem_id');
+		my @problemRecords = $db->getGlobalProblems(map { [ $setID, $_ ] } @problemIDs);
 		foreach my $problemRecord (@problemRecords) {
 			my $problemID = $problemRecord->problem_id;
-			die $r->maketext("Global problem [_1] for set [_2] not found.", $problemID, $setID) unless $problemRecord;
+			die $c->maketext("Global problem [_1] for set [_2] not found.", $problemID, $setID) unless $problemRecord;
 
 			if ($forUsers) {
-				# Since we're editing for specific users, we don't allow the GlobalProblem record to be altered on that same page
-				# So we only need to make changes to the UserProblem record and only then if we are overriding a value
-				# in the GlobalProblem record or for fields unique to the UserProblem record.
+				# Since we're editing for specific users, we don't allow the GlobalProblem record to be altered on that
+				# same page So we only need to make changes to the UserProblem record and only then if we are overriding
+				# a value in the GlobalProblem record or for fields unique to the UserProblem record.
 
 				my @userIDs = @editForUser;
 
 				my @userProblemRecords;
-				if ( ! $editingSetVersion ) {
-					my @userProblemIDs = map { [$_, $setID, $problemID] } @userIDs;
+				if (!$editingSetVersion) {
+					my @userProblemIDs = map { [ $_, $setID, $problemID ] } @userIDs;
 					@userProblemRecords = $db->getUserProblemsWhere(
 						{ user_id => [@userIDs], set_id => $setID, problem_id => $problemID });
 				} else {
 					## (we know that we're only editing for one user)
 					@userProblemRecords =
-						( $db->getMergedProblemVersion( $userIDs[0], $setID, $editingSetVersion, $problemID ) );
+						($db->getMergedProblemVersion($userIDs[0], $setID, $editingSetVersion, $problemID));
 				}
 
 				foreach my $record (@userProblemRecords) {
+					my $changed = 0;    # Keep track of changes. If none are made, avoid unnecessary db accesses.
 
-					my $changed = 0; # keep track of any changes, if none are made, avoid unnecessary db accesses
-					foreach my $field ( @{ PROBLEM_FIELDS() } ) {
+					for my $field (@{ PROBLEM_FIELDS() }) {
 						next unless canChange($forUsers, $field);
 
-						my $override = $r->param("problem.$problemID.$field.override");
+						my $override = $c->param("problem.$problemID.$field.override");
 						if (defined $override && $override eq $field) {
 
-							my $param = $r->param("problem.$problemID.$field");
-							$param = defined $properties{$field}->{default} ? $properties{$field}->{default} : "" unless defined $param && $param ne "";
+							my $param = $c->param("problem.$problemID.$field");
+							$param = defined $properties{$field}->{default} ? $properties{$field}->{default} : ""
+								unless defined $param && $param ne "";
 							my $unlabel = $undoLabels{$field}->{$param};
 							$param = $unlabel if defined $unlabel;
-												#protect exploits with source_file
+							# Protect exploits with source_file
 							if ($field eq 'source_file') {
-								# add message
-								if ( $param =~ /\.\./ || $param =~ /^\// ) {
-									$self->addbadmessage( $r->maketext("Source file paths cannot include .. or start with /: your source file path was modified.") );
+								if ($param =~ /\.\./ || $param =~ /^\//) {
+									$c->addbadmessage($c->maketext(
+										'Source file paths cannot include .. or start with /: '
+											. 'your source file path was modified.'
+									));
 								}
 								$param =~ s|\.\.||g;    # prevent access to files above template
 								$param =~ s|^/||;       # prevent access to files above template
@@ -1595,21 +1716,23 @@ sub initialize {
 							$changed ||= changed($record->$field, undef);
 							$record->$field(undef);
 						}
-
 					}
 
-					foreach my $field ( @{ USER_PROBLEM_FIELDS() } ) {
+					for my $field (@{ USER_PROBLEM_FIELDS() }) {
 						next unless canChange($forUsers, $field);
 
-						my $param = $r->param("problem.$problemID.$field");
-						$param = defined $properties{$field}->{default} ? $properties{$field}->{default} : "" unless defined $param && $param ne "";
+						my $param = $c->param("problem.$problemID.$field");
+						$param = defined $properties{$field}->{default} ? $properties{$field}->{default} : ""
+							unless defined $param && $param ne "";
 						my $unlabel = $undoLabels{$field}->{$param};
 						$param = $unlabel if defined $unlabel;
-											#protect exploits with source_file
+						# Protect exploits with source_file
 						if ($field eq 'source_file') {
-							# add message
-							if ( $param =~ /\.\./ || $param =~ /^\// ) {
-								$self->addbadmessage( $r->maketext("Source file paths cannot include .. or start with /: your source file path was modified."));
+							if ($param =~ /\.\./ || $param =~ /^\//) {
+								$c->addbadmessage($c->maketext(
+									'Source file paths cannot include .. or start with /: '
+										. 'your source file path was modified.'
+								));
 							}
 							$param =~ s|\.\.||g;    # prevent access to files above template
 							$param =~ s|^/||;       # prevent access to files above template
@@ -1618,7 +1741,8 @@ sub initialize {
 						$changed ||= changed($record->$field, $param);
 						$record->$field($param);
 					}
-					if ( ! $editingSetVersion ) {
+
+					if (!$editingSetVersion) {
 						$db->putUserProblem($record) if $changed;
 					} else {
 						$db->putProblemVersion($record) if $changed;
@@ -1629,21 +1753,24 @@ sub initialize {
 				# We may also have instances where a field is unique to the UserProblem record but we want
 				# all users to (at least initially) have the same value
 
-				# this only edits a globalProblem record
-				my $changed = 0; # keep track of any changes, if none are made, avoid unnecessary db accesses
-				foreach my $field ( @{ PROBLEM_FIELDS() } ) {
+				# This only edits a globalProblem record
+				my $changed = 0;    # Keep track of changes. If none are made, avoid unnecessary db accesses.
+				foreach my $field (@{ PROBLEM_FIELDS() }) {
 					next unless canChange($forUsers, $field);
 
-					my $param = $r->param("problem.$problemID.$field");
-					$param = defined $properties{$field}->{default} ? $properties{$field}->{default} : "" unless defined $param && $param ne "";
+					my $param = $c->param("problem.$problemID.$field");
+					$param = defined $properties{$field}->{default} ? $properties{$field}->{default} : ""
+						unless defined $param && $param ne "";
 					my $unlabel = $undoLabels{$field}->{$param};
 					$param = $unlabel if defined $unlabel;
 
-					#protect exploits with source_file
+					# Protect exploits with source_file
 					if ($field eq 'source_file') {
-						# add message
-						if ( $param =~ /\.\./ || $param =~ /^\// ) {
-							$self->addbadmessage( $r->maketext("Source file paths cannot include .. or start with /: your source file path was modified.") );
+						if ($param =~ /\.\./ || $param =~ /^\//) {
+							$c->addbadmessage($c->maketext(
+								'Source file paths cannot include .. or start with /: '
+									. 'your source file path was modified.'
+							));
 						}
 						$param =~ s|\.\.||g;    # prevent access to files above template
 						$param =~ s|^/||;       # prevent access to files above template
@@ -1653,29 +1780,27 @@ sub initialize {
 				}
 				$db->putGlobalProblem($problemRecord) if $changed;
 
-				# sometimes (like for status) we might want to change an attribute in
-				# the userProblem record for every assigned user
-				# However, since this data is stored in the UserProblem records,
-				# it won't be displayed once its been changed and if you hit "Save Changes" again
-				# it gets erased
-
-				# So we'll enforce that there be something worth putting in all the UserProblem records
-				# This also will make hitting "Save Changes" on the global page MUCH faster
+				# Sometimes (like for status) we might want to change an attribute in the userProblem record for every
+				# assigned user.  However, since this data is stored in the UserProblem records, it won't be displayed
+				# once its been changed, and if you hit "Save Changes" again it gets erased.  So we'll enforce that
+				# there be something worth putting in all the UserProblem records.  This also will make hitting "Save
+				# Changes" on the global page MUCH faster.
 				my %useful;
-				foreach my $field ( @{ USER_PROBLEM_FIELDS() } ) {
-					my $param = $r->param("problem.$problemID.$field");
+				foreach my $field (@{ USER_PROBLEM_FIELDS() }) {
+					my $param = $c->param("problem.$problemID.$field");
 					$useful{$field} = 1 if defined $param and $param ne "";
 				}
 
 				if (keys %useful) {
 					my @userProblemRecords = $db->getUserProblemsWhere({ set_id => $setID, problem_id => $problemID });
 					foreach my $record (@userProblemRecords) {
-						my $changed = 0; # keep track of any changes, if none are made, avoid unnecessary db accesses
-						foreach my $field ( keys %useful ) {
+						my $changed = 0;    # Keep track of changes. If none are made, avoid unnecessary db accesses.
+						foreach my $field (keys %useful) {
 							next unless canChange($forUsers, $field);
 
-							my $param = $r->param("problem.$problemID.$field");
-							$param = defined $properties{$field}->{default} ? $properties{$field}->{default} : "" unless defined $param && $param ne "";
+							my $param = $c->param("problem.$problemID.$field");
+							$param = defined $properties{$field}->{default} ? $properties{$field}->{default} : ""
+								unless defined $param && $param ne "";
 							my $unlabel = $undoLabels{$field}->{$param};
 							$param = $unlabel if defined $unlabel;
 							$changed ||= changed($record->$field, $param);
@@ -1687,21 +1812,18 @@ sub initialize {
 			}
 		}
 
-		# Mark the specified problems as correct for all users (not applicable when editing a set
-		#    version, because this only shows up when editing for users or editing the
-		#    global set/problem, not for one user)
-		foreach my $problemID ($r->param('markCorrect')) {
+		# Mark the specified problems as correct for all users (not applicable when editing a set version, because this
+		# only shows up when editing for users or editing the global set/problem, not for one user)
+		for my $problemID ($c->param('markCorrect')) {
 			my @userProblemIDs =
 				$forUsers
 				? (map { [ $_, $setID, $problemID ] } @editForUser)
 				: $db->listUserProblemsWhere({ set_id => $setID, problem_id => $problemID });
-			# if the set is not a gateway set, this requires going through the
-			#    user_problems and resetting their status; if it's a gateway set,
-			#    then we have to go through every *version* of every user_problem.
-			#    it may be that there is an argument for being able to get() all
-			#    problem versions for all users in one database call.  The current
-			#    code may be slow for large classes.
-			if ( $setRecord->assignment_type !~ /gateway/ ) {
+			# If the set is not a gateway set, this requires going through the user_problems and resetting their status.
+			# If it's a gateway set, then we have to go through every *version* of every user_problem.  It may be that
+			# there is an argument for being able to get() all problem versions for all users in one database call.  The
+			# current code may be slow for large classes.
+			if ($setRecord->assignment_type !~ /gateway/) {
 				my @userProblemRecords = $db->getUserProblems(@userProblemIDs);
 				foreach my $record (@userProblemRecords) {
 					if (defined $record && ($record->status eq "" || $record->status < 1)) {
@@ -1712,10 +1834,10 @@ sub initialize {
 				}
 			} else {
 				my @userIDs = $forUsers ? @editForUser : $db->listProblemUsers($setID, $problemID);
-				foreach my $uid ( @userIDs ) {
-					my @versions = $db->listSetVersions( $uid, $setID );
+				foreach my $uid (@userIDs) {
+					my @versions = $db->listSetVersions($uid, $setID);
 					my @userProblemVersionIDs =
-						map{ [ $uid, $setID, $_, $problemID ]} @versions;
+						map { [ $uid, $setID, $_, $problemID ] } @versions;
 					my @userProblemVersionRecords = $db->getProblemVersions(@userProblemVersionIDs);
 					foreach my $record (@userProblemVersionRecords) {
 						if (defined $record && ($record->status eq "" || $record->status < 1)) {
@@ -1728,342 +1850,189 @@ sub initialize {
 			}
 		}
 
-		# Delete all problems marked for deletion (not applicable when editing
-		#    for users)
-		foreach my $problemID ($r->param('deleteProblem')) {
+		# Delete all problems marked for deletion (not applicable when editing for users).
+		foreach my $problemID ($c->param('deleteProblem')) {
 			$db->deleteGlobalProblem($setID, $problemID);
 
-			# if its a jitar set we have to delete all of the child problems
+			# If it is a jitar, then delete all of the child problems.
 			if ($setRecord->assignment_type eq 'jitar') {
-			    my @ids = $db->listGlobalProblems($setID);
-			    my @problemSeq = jitar_id_to_seq($problemID);
-			  ID: foreach my $id (@ids) {
-			      my @seq = jitar_id_to_seq($id);
-			      #check and see if this is a child
-			      next unless $#seq > $#problemSeq;
-			      for (my $i = 0; $i<=$#problemSeq; $i++) {
-				  next ID unless $seq[$i] == $problemSeq[$i];
-			      }
-			      $db->deleteGlobalProblem($setID,$id);
-			  }
+				my @ids        = $db->listGlobalProblems($setID);
+				my @problemSeq = jitar_id_to_seq($problemID);
+			ID: foreach my $id (@ids) {
+					my @seq = jitar_id_to_seq($id);
+					# Check and see if this is a child.
+					next unless $#seq > $#problemSeq;
+					for (my $i = 0; $i <= $#problemSeq; $i++) {
+						next ID unless $seq[$i] == $problemSeq[$i];
+					}
+					$db->deleteGlobalProblem($setID, $id);
+				}
 
 			}
 		}
 
-		# Change problem_ids from regular style to jitar style if appropraite.  (not
-		# applicable when editing for users)
-		# this is a very long operaiton because we are shuffling the whole database around
-		if ($oldAssignmentType ne $setRecord->assignment_type() &&(
-		    $oldAssignmentType eq 'jitar' ||
-		    $setRecord->assignment_type eq 'jitar')) {
-
-		    my %newProblemNumbers;
-		    my @ids = $db->listGlobalProblems($setID);
-		    my $i = 1;
-		    foreach my $id (@ids) {
+		# Change problem_ids from regular style to jitar style if appropraite.  (Not applicable when editing for users.)
+		# This is a very long operation because we are shuffling the whole database around.
+		if ($oldAssignmentType ne $setRecord->assignment_type
+			&& ($oldAssignmentType eq 'jitar' || $setRecord->assignment_type eq 'jitar'))
+		{
+			my %newProblemNumbers;
+			my @ids = $db->listGlobalProblems($setID);
+			my $i   = 1;
+			foreach my $id (@ids) {
 
-			if ($setRecord->assignment_type eq 'jitar') {
-			    $newProblemNumbers{$id} = seq_to_jitar_id(($id));
-			} else {
-			    $newProblemNumbers{$id} = $i;
-			    $i++;
+				if ($setRecord->assignment_type eq 'jitar') {
+					$newProblemNumbers{$id} = seq_to_jitar_id(($id));
+				} else {
+					$newProblemNumbers{$id} = $i;
+					$i++;
+				}
 			}
-		    }
 
-		    #we dont want to confuse the script by changing the problem
-		    #ids out from under it so remove the params
-		    foreach my $id (@ids) {
-			$r->param("prob_num_".$id,"");
-		    }
-
-		    handle_problem_numbers($self,\%newProblemNumbers, $db, $setID);
+			# we dont want to confuse the script by changing the problem
+			# ids out from under it so remove the params
+			foreach my $id (@ids) {
+				$c->param("prob_num_$id", undef);
+			}
 
+			$c->handle_problem_numbers(\%newProblemNumbers, $db, $setID);
 		}
 
-		##################################################################
-		# reorder problems
-		##################################################################
+		# Reorder problems
 
-		my %newProblemNumbers = ();
+		my %newProblemNumbers;
 		my $prevNum = 0;
 		my @prevSeq = (0);
 
-
 		for my $jj (sort { $a <=> $b } $db->listGlobalProblems($setID)) {
+			if ($setRecord->assignment_type eq 'jitar') {
+				my @idSeq;
+				my $id = $jj;
 
-		    if ($setRecord->assignment_type eq 'jitar') {
-			my @idSeq;
-			my $id = $jj;
-
-			next unless $r->param('prob_num_'.$id);
-
-			unshift @idSeq, $r->param('prob_num_'.$id);
-			while (defined $r->param('prob_parent_id_'.$id)) {
-			    $id = $r->param('prob_parent_id_'.$id);
-			    unshift @idSeq, $r->param('prob_num_'.$id);
-			}
+				next unless $c->param('prob_num_' . $id);
 
-			$newProblemNumbers{$jj} = seq_to_jitar_id(@idSeq);
+				unshift @idSeq, $c->param('prob_num_' . $id);
+				while (defined $c->param('prob_parent_id_' . $id)) {
+					$id = $c->param('prob_parent_id_' . $id);
+					unshift @idSeq, $c->param('prob_num_' . $id);
+				}
 
-		    } else {
-		      $newProblemNumbers{$jj} = $r->param('prob_num_' . $jj);
-		    }
-		  }
+				$newProblemNumbers{$jj} = seq_to_jitar_id(@idSeq);
 
-		handle_problem_numbers($self,\%newProblemNumbers, $db, $setID) unless defined $r->param('undo_changes');
+			} else {
+				$newProblemNumbers{$jj} = $c->param('prob_num_' . $jj);
+			}
+		}
 
+		$c->handle_problem_numbers(\%newProblemNumbers, $db, $setID) unless defined $c->param('undo_changes');
 
-		#####################################################################
 		# Make problem numbers consecutive if required
-		#####################################################################
-
-
-		if ($r->param('force_renumber')) {
-
-		  my %newProblemNumbers = ();
-		  my $prevNum = 0;
-		  my @prevSeq = (0);
-
-		  for my $jj (sort { $a <=> $b } $db->listGlobalProblems($setID)) {
-
-		    if ($setRecord->assignment_type eq 'jitar') {
-		      my @idSeq;
-		      my $id = $jj;
-
-		      next unless $r->param('prob_num_'.$id);
-
-		      unshift @idSeq, $r->param('prob_num_'.$id);
-		      while (defined $r->param('prob_parent_id_'.$id)) {
-			$id = $r->param('prob_parent_id_'.$id);
-			unshift @idSeq, $r->param('prob_num_'.$id);
-		      }
-
-		      # we dont really care about the content of idSeq
-		      # in this case, just the length
-		      my $depth = $#idSeq;
+		if ($c->param('force_renumber')) {
+			my %newProblemNumbers = ();
+			my $prevNum           = 0;
+			my @prevSeq           = (0);
+
+			for my $jj (sort { $a <=> $b } $db->listGlobalProblems($setID)) {
+				if ($setRecord->assignment_type eq 'jitar') {
+					my @idSeq;
+					my $id = $jj;
+
+					next unless $c->param('prob_num_' . $id);
+
+					unshift @idSeq, $c->param('prob_num_' . $id);
+					while (defined $c->param('prob_parent_id_' . $id)) {
+						$id = $c->param('prob_parent_id_' . $id);
+						unshift @idSeq, $c->param('prob_num_' . $id);
+					}
 
-		      if ($depth <= $#prevSeq) {
-			@prevSeq = @prevSeq[ 0 .. $depth ];
-			$prevSeq[$#prevSeq]++;
-		      } else {
-			$prevSeq[$#prevSeq+1] = 1;
-		      }
+					# we dont really care about the content of idSeq
+					# in this case, just the length
+					my $depth = $#idSeq;
 
-		      $newProblemNumbers{$jj} = seq_to_jitar_id(@prevSeq);
+					if ($depth <= $#prevSeq) {
+						@prevSeq = @prevSeq[ 0 .. $depth ];
+						++$prevSeq[-1];
+					} else {
+						$prevSeq[ $#prevSeq + 1 ] = 1;
+					}
 
-		    } else {
-		      $prevNum++;
-		      $newProblemNumbers{$jj} = $prevNum;
-		    }
-		  }
+					$newProblemNumbers{$jj} = seq_to_jitar_id(@prevSeq);
 
-		  handle_problem_numbers($self,\%newProblemNumbers, $db, $setID) unless defined $r->param('undo_changes');
+				} else {
+					$prevNum++;
+					$newProblemNumbers{$jj} = $prevNum;
+				}
+			}
 
+			$c->handle_problem_numbers(\%newProblemNumbers, $db, $setID) unless defined $c->param('undo_changes');
 		}
 
-		#####################################################################
 		# Add blank problem if needed
-		#####################################################################
-		if (defined($r->param("add_blank_problem") ) and $r->param("add_blank_problem") == 1) {
-		   # get number of problems to add and clean the entry
-		    my $newBlankProblems = (defined($r->param("add_n_problems")) ) ? $r->param("add_n_problems") :1;
-		    $newBlankProblems = int($newBlankProblems);
-		    my $MAX_NEW_PROBLEMS = 20;
-		    my @ids = $self->r->db->listGlobalProblems($setID);
-
-		    if ($setRecord->assignment_type eq 'jitar') {
-			for (my $i=0; $i <= $#ids; $i++) {
-			    my @seq = jitar_id_to_seq($ids[$i]);
-			    $ids[$i] = $seq[0];
-			    #this strips off the depth 0 problem numbers if its a jitar set
+		if (defined($c->param("add_blank_problem")) and $c->param("add_blank_problem") == 1) {
+			# Get number of problems to add and clean the entry
+			my $newBlankProblems = (defined($c->param("add_n_problems"))) ? $c->param("add_n_problems") : 1;
+			$newBlankProblems = int($newBlankProblems);
+			my $MAX_NEW_PROBLEMS = 20;
+			my @ids              = $c->db->listGlobalProblems($setID);
+
+			if ($setRecord->assignment_type eq 'jitar') {
+				for (my $i = 0; $i <= $#ids; $i++) {
+					my @seq = jitar_id_to_seq($ids[$i]);
+					# This strips off the depth 0 problem numbers if its a jitar set
+					$ids[$i] = $seq[0];
+				}
 			}
-		    }
-
-		    my $targetProblemNumber = WeBWorK::Utils::max(@ids);
-
-		    if ($newBlankProblems >=1 and $newBlankProblems <= $MAX_NEW_PROBLEMS ) {
-				foreach my $newProb (1..$newBlankProblems) {
-						$targetProblemNumber++;
-						##################################################
-						# make local copy of the blankProblem
-						##################################################
-						my $blank_file_path       =  $ce->{webworkFiles}->{screenSnippets}->{blankProblem};
-						my $problemContents       =  WeBWorK::Utils::readFile($blank_file_path);
-						my $new_file_path         =  "set$setID/".BLANKPROBLEM();
-						my $fullPath              =  WeBWorK::Utils::surePathToFile($ce->{courseDirs}->{templates},'/'.$new_file_path);
-						local(*TEMPFILE);
-						open(TEMPFILE, ">$fullPath") or warn $r->maketext("Can't write to file [_1]", $fullPath);
-						print TEMPFILE $problemContents;
-						close(TEMPFILE);
-
-						#################################################
-						# Update problem record
-						#################################################
-						my $problemRecord  = $self->addProblemToSet(
-								   setName        => $setID,
-								   sourceFile     => $new_file_path,
-								   problemID      =>
-						    $setRecord->assignment_type eq 'jitar' ?
-						    seq_to_jitar_id(($targetProblemNumber)) :
-						    $targetProblemNumber, #added to end of set
-						);
-
-						$self->assignProblemToAllSetUsers($problemRecord);
-						$self->addgoodmessage($r->maketext("Added [_1] to [_2] as problem [_3]", $new_file_path, $setID, $targetProblemNumber)) ;
+
+			my $targetProblemNumber = WeBWorK::Utils::max(@ids);
+
+			if ($newBlankProblems >= 1 and $newBlankProblems <= $MAX_NEW_PROBLEMS) {
+				foreach my $newProb (1 .. $newBlankProblems) {
+					$targetProblemNumber++;
+					# Make local copy of the blankProblem
+					my $blank_file_path = $ce->{webworkFiles}{screenSnippets}{blankProblem};
+					my $problemContents = WeBWorK::Utils::readFile($blank_file_path);
+					my $new_file_path   = "set$setID/" . BLANKPROBLEM();
+					my $fullPath = WeBWorK::Utils::surePathToFile($ce->{courseDirs}{templates}, '/' . $new_file_path);
+
+					open(my $TEMPFILE, '>', $fullPath) or warn $c->maketext(q{Can't write to file [_1]}, $fullPath);
+					print $TEMPFILE $problemContents;
+					close($TEMPFILE);
+
+					# Update problem record
+					my $problemRecord = addProblemToSet(
+						$db, $ce->{problemDefaults},
+						setName    => $setID,
+						sourceFile => $new_file_path,
+						problemID  => $setRecord->assignment_type eq 'jitar'
+						? seq_to_jitar_id(($targetProblemNumber))
+						: $targetProblemNumber,
+					);
+
+					assignProblemToAllSetUsers($db, $problemRecord);
+					$c->addgoodmessage($c->maketext(
+						"Added [_1] to [_2] as problem [_3]",
+						$new_file_path, $setID, $targetProblemNumber
+					));
 				}
 			} else {
-				$self->addbadmessage($r->maketext("Could not add [_1] problems to this set.  The number must be between 1 and [_2]", $newBlankProblems, $MAX_NEW_PROBLEMS));
+				$c->addbadmessage($c->maketext(
+					"Could not add [_1] problems to this set.  The number must be between 1 and [_2]",
+					$newBlankProblems, $MAX_NEW_PROBLEMS
+				));
 			}
 		}
 
 		# Sets the specified header to "defaultHeader" so that the default file will get used.
-		foreach my $header ($r->param('defaultHeader')) {
+		foreach my $header ($c->param('defaultHeader')) {
 			$setRecord->$header("defaultHeader");
 		}
 	}
 
-	# This erases any sticky fields if the user saves changes, resets the form, or reorders problems
-	# It may not be obvious why this is necessary when saving changes or reordering problems
-	# 	but when the problems are reorder the param problem.1.source_file needs to be the source
-	#	file of the problem that is NOW #1 and not the problem that WAS #1.
-	unless (defined $r->param('refresh')) {
-
-		# reset all the parameters dealing with set/problem/header information
-		# if the current naming scheme is changed/broken, this could reek havoc
-		# on all kinds of things
-		foreach my $param ($r->param) {
-			$r->param($param, "") if $param =~ /^(set|problem|header)\./  && $param !~ /displaymode/;
-		}
-	}
-}
-
-# helper method for debugging
-sub definedness ($) {
-	my ($variable) = @_;
-
-	return "undefined" unless defined $variable;
-	return "empty" unless $variable ne "";
-	return $variable;
-}
-
-# helper method for checking if two things are different
-# the return values will usually be thrown away, but they could be useful for debugging
-sub changed ($$) {
-	my ($first, $second) = @_;
-
-	return "def/undef" if defined $first and not defined $second;
-	return "undef/def" if not defined $first and defined $second;
-	return "" if not defined $first and not defined $second;
-	return "ne" if $first ne $second;
-	return "";	# if they're equal, there's no change
-}
-
-# helper method that determines for how many users at a time a field can be changed
-# 	none means it can't be changed for anyone
-# 	any means it can be changed for anyone
-# 	one means it can ONLY be changed for one at a time. (eg problem_seed)
-# 	all means it can ONLY be changed for all at a time. (eg set_header)
-sub canChange ($$) {
-	my ($forUsers, $field) = @_;
-
-	my %properties = %{ FIELD_PROPERTIES() };
-	my $forOneUser = $forUsers == 1;
-
-	my $howManyCan = $properties{$field}->{override};
-	return 0 if $howManyCan eq "none";
-	return 1 if $howManyCan eq "any";
-	return 1 if $howManyCan eq "one" && $forOneUser;
-	return 1 if $howManyCan eq "all" && !$forUsers;
-	return 0;	# FIXME: maybe it should default to 1?
-}
-
-# helper method that determines if a file is valid and returns a pretty error message
-sub checkFile ($) {
-	my ($self, $filePath, $headerType) = @_;
-
-	my $r = $self->r;
-	my $ce = $r->ce;
-
-	return $r->maketext("No source filePath specified") unless $filePath;
-	return $r->maketext("Problem source is drawn from a grouping set") if $filePath =~ /^group/;
-
-	if ( $filePath eq "defaultHeader" ) {
-		if ($headerType eq 'set_header') {
-		  $filePath = $ce->{webworkFiles}{screenSnippets}{setHeader};
-		} elsif  ($headerType eq 'hardcopy_header') {
-			$filePath = $ce->{webworkFiles}{hardcopySnippets}{setHeader};
-		}	else	{
-			return $r->maketext("Invalid headerType [_1]", $headerType);
-		}
-	} else {
-	#	$filePath = $ce->{courseDirs}->{templates} . '/' . $filePath unless $filePath =~ m|^/|; # bug: 1725 allows access to all files e.g. /etc/passwd
-		$filePath = $ce->{courseDirs}->{templates} . '/' . $filePath ; # only filePaths in template directory can be accessed
-	}
-
-	my $fileError;
-	return "" if -e $filePath && -f $filePath && -r $filePath;
-	return $r->maketext("This source file is not readable!") if -e $filePath && -f $filePath;
-	return $r->maketext("This source file is a directory!") if -d $filePath;
-	return $r->maketext("This source file does not exist!") unless -e $filePath;
-	return $r->maketext("This source file is not a plain file!");
-}
-
-# Make sure restrictor sets exist
-sub check_sets {
-	my ($self,$db,$sets_string) = @_;
-	my @proposed_sets = split(/\s*,\s*/,$sets_string);
-	foreach(@proposed_sets) {
-	  $self->addbadmessage("Error: $_ is not a valid set name in restricted release list!") unless $db->existsGlobalSet($_);
-	}
-}
-
-# Creates two separate tables, first of the headers, and the of the problems in a given set
-# If one or more users are specified in the "editForUser" param, only the data for those users
-# becomes editable, not all the data
-sub body {
-
-	my ($self)      = @_;
-	my $r           = $self->r;
-	my $db          = $r->db;
-	my $ce          = $r->ce;
-	my $authz       = $r->authz;
-	my $userID      = $r->param('user');
-	my $urlpath     = $r->urlpath;
-	my $courseID    = $urlpath->arg("courseID");
-	my $setID       = $urlpath->arg("setID");
-
-	## we're now allowing setID to come in as setID,v# to edit a set
-	##    version; catch this first
-	my $editingSetVersion = 0;
-	my $fullSetID = $setID;
-	if ( $setID =~ /,v(\d+)$/ ) {
-	    $editingSetVersion = $1;
-	    $setID =~ s/,v(\d+)$//;
-	}
-
-	my $setRecord   = $db->getGlobalSet($setID) or die $r->maketext("No record for global set [_1].", $setID);
-
-	my $userRecord = $db->getUser($userID) or die $r->maketext("No record for user [_1].", $userID);
-	# Check permissions
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-		$r->maketext("You are not authorized to access the Instructor tools."))
-		unless $authz->hasPermissions($userRecord->user_id, "access_instructor_tools");
-
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-		$r->maketext("You are not authorized to modify problems."))
-		unless $authz->hasPermissions($userRecord->user_id, "modify_problem_sets");
-
-	my @editForUser = $r->param('editForUser');
-
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-		$r->maketext("Versions of a set can only be edited for one user at a time."))
-		if ($editingSetVersion && @editForUser != 1);
-
-	# Check that every user that we're editing for has a valid UserSet
-	my @assignedUsers;
+	# Check that every user that that is being editing for has a valid UserSet.
 	my @unassignedUsers;
-	if (scalar @editForUser) {
-		foreach my $ID (@editForUser) {
+	if (@editForUser) {
+		my @assignedUsers;
+		for my $ID (@editForUser) {
 			if ($db->getUserSet($ID, $setID)) {
 				unshift @assignedUsers, $ID;
 			} else {
@@ -2071,956 +2040,144 @@ sub body {
 			}
 		}
 		@editForUser = sort @assignedUsers;
-		$r->param("editForUser", \@editForUser);
-
-		if (scalar @editForUser && scalar @unassignedUsers) {
-			print CGI::div(
-				{ class => 'alert alert-danger p-1 mb-0' },
-				$r->maketext(
-					"The following users are NOT assigned to this set and will be ignored: [_1]",
-					CGI::b(join(", ", @unassignedUsers))
-				)
-			);
-		} elsif (scalar @editForUser == 0) {
-			print CGI::div(
-				{ class => 'alert alert-danger p-1 mb-0' },
-				$r->maketext(
-					"None of the selected users are assigned to this set: [_1]",
-					CGI::b(join(", ", @unassignedUsers))
-				)
-			);
-			print CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-				$r->maketext("Global set data will be shown instead of user specific data"));
-		}
+		$c->param('editForUser', \@editForUser);
 	}
 
-	# some useful booleans
-	my $forUsers    = scalar(@editForUser);
-	my $forOneUser  = $forUsers == 1;
-
-	# and check that if we're editing a set version for a user, that
-	#    it exists as well
-	if ( $editingSetVersion && ! $db->existsSetVersion( $editForUser[0], $setID, $editingSetVersion ) ) {
-		return CGI::div(
-			{ class => 'alert alert-danger p-1 mb-0' },
-			$r->maketext(
-				"The set-version ([_1], version [_2]) is not assigned to user [_3].",
-				$setID, $editingSetVersion, $editForUser[0]
-			)
-		);
-	}
-
-	# If you're editing for users, initially their records will be different but
-	# if you make any changes to them they will be the same.
-	# if you're editing for one user, the problems shown should be his/hers
-	my $userToShow        = $forUsers ? $editForUser[0] : $userID;
-
-	# a useful gateway variable
-	my $isGatewaySet = ( $setRecord->assignment_type =~ /gateway/ ) ? 1 : 0;
-	my $isJitarSet = ( $setRecord->assignment_type eq 'jitar' ) ? 1 : 0;
-
-	my $userCount    = $db->countUsers();
-	my $setCount     = $db->countGlobalSets();       # if $forOneUser;
-	my $setUserCount = $db->countSetUsers($setID);
-	# if $forOneUser;
-	my $userSetCount = ($forOneUser && @editForUser) ? $db->countUserSets($editForUser[0]) : 0;
-
-
-	my $editUsersAssignedToSetURL = $self->systemLink(
-	      $urlpath->newFromModule(
-                "WeBWorK::ContentGenerator::Instructor::UsersAssignedToSet", $r, courseID => $courseID, setID => $setID),params=>{pageVersion=> "instructor_set_detail"});
-	my $editSetsAssignedToUserURL = $self->systemLink(
-	      $urlpath->newFromModule(
-                "WeBWorK::ContentGenerator::Instructor::UserDetail",$r,
-                  courseID => $courseID, userID => $editForUser[0])) if $forOneUser;
-
+	$c->stash->{unassignedUsers} = \@unassignedUsers;
 
-	my $setDetailPage  = $urlpath -> newFromModule($urlpath->module, $r, courseID => $courseID, setID => $setID);
-	my $fullsetDetailPage  = $urlpath -> newFromModule($urlpath->module, $r, courseID => $courseID, setID => $fullSetID);
-	my $setDetailURL   = $self->systemLink($fullsetDetailPage, authen=>0);
-
-	if ($forUsers) {
-	    ##############################################
-		# calculate links for the users being edited:
-		##############################################
-		my @userLinks = ();
-		foreach my $userID (@editForUser) {
-			my $u = $db->getUser($userID);
-			my $email_address = $u->email_address;
-			my $line = $u->last_name.", " . $u->first_name . "&nbsp;&nbsp;(" .
-				CGI::a({-href=>"mailto:$email_address"},"email "). $u->user_id .
-				"). ";
-			if ( ! $editingSetVersion ) {
-				$line .= $r->maketext("Assigned to").' ';
-				my $editSetsAssignedToUserURL = $self->systemLink(
-					$urlpath->newFromModule(
-						"WeBWorK::ContentGenerator::Instructor::UserDetail", $r,
-                  				courseID => $courseID, userID => $u->user_id));
-            			$line .= CGI::a({href=>$editSetsAssignedToUserURL},
-                     			$self->setCountMessage($db->countUserSets($u->user_id),
-						$setCount));
-			} else {
-				my $editSetLink = $self->systemLink( $setDetailPage,
-					params=>{effectiveUser=>$u->user_id,
-						 editForUser  =>$u->user_id} );
-				$line .= $r->maketext("Edit set [_1] for this user.", CGI::a({href=>$editSetLink},$setID));
-			}
-			unshift @userLinks,$line;
-		}
-		@userLinks = sort @userLinks;
-
-		my $vermsg = $editingSetVersion ? ",v$editingSetVersion" : '';
-
-		print CGI::div(
-			{ class => 'border border-dark mb-2 rounded' },
-			CGI::div(
-				{ class => 'row p-2 align-items-center' },
-				CGI::div(
-					{ class => 'col-md-6' },
-					$r->maketext(
-						'Editing problem set [_1] data for these individual students: [_2]',
-						CGI::strong({ dir => 'ltr' }, format_set_name_display("$setID$vermsg")),
-						CGI::br() . CGI::strong(join CGI::br(), @userLinks)
-					)
-				),
-				CGI::div(
-					{ class => 'col-md-6 mt-md-0 mt-2' },
-					CGI::a(
-						{ href => $self->systemLink($setDetailPage) },
-						$r->maketext(
-							'Edit set [_1] data for ALL students assigned to this set.',
-							CGI::strong({ dir => 'ltr' }, format_set_name_display($setID))
-						)
-					),
-					# Handy messages when editing gateway sets.
-					$isGatewaySet && !$editingSetVersion
-					? CGI::br()
-						. CGI::em(
-							$r->maketext(
-								'To edit a specific student version of this set, edit (all of) her/his assigned sets.')
-						)
-					: ''
-				)
-			)
-		);
-	} else {
-		print CGI::div(
-			{ class => 'border border-dark mb-2 rounded' },
-			CGI::div(
-				{ class => 'row p-2 align-items-center' },
-				CGI::div(
-					{ class => 'col-md-6' },
-					$r->maketext(
-						'This set [_1] is assigned to [_2].',
-						CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)),
-						$self->userCountMessage($setUserCount, $userCount)
-					)
-				),
-				CGI::div(
-					{ class => 'col-md-6 mt-md-0 mt-2' },
-					$r->maketext(
-						'Edit [_1] of set [_2].',
-						CGI::a({ href => $editUsersAssignedToSetURL }, $r->maketext('individual versions')),
-						CGI::span({ dir => 'ltr' }, format_set_name_display($setID))
-					)
-				)
-			)
-		);
-	}
-
-	my %properties = %{ FIELD_PROPERTIES() };
-
-	my %display_modes = %{WeBWorK::PG::DISPLAY_MODES()};
-	my @active_modes = grep { exists $display_modes{$_} } @{$r->ce->{pg}->{displayModes}};
-	my $default_header_mode = $r->param('header.displaymode') || $r->maketext('None');
-	my $default_problem_mode = $r->param('problem.displaymode') || $r->maketext('None');
-
-	#####################################################################
-	# Browse available header/problem files
-	#####################################################################
-
-	my $templates = $r->ce->{courseDirs}->{templates};
-	my $skip = join("|", keys %{ $r->ce->{courseFiles}->{problibs} });
-
-	my @headerFileList = listFilesRecursive(
-		$templates,
-		qr/header.*\.pg$/i, 		# match these files
-		qr/^(?:$skip|svn)$/, 	# prune these directories
-		0, 				# match against file name only
-		1, 				# prune against path relative to $templates
-	);
-  @headerFileList = sortByName(undef,@headerFileList);
-
-	# Display a useful warning message
-	print CGI::div(
-		{ class => 'mb-2 fw-bold' },
-		$forUsers
-		? $r->maketext('Any changes made below will be reflected in the set for ONLY the student(s) listed above.')
-		: $r->maketext('Any changes made below will be reflected in the set for ALL students.')
-	);
-
-	print CGI::start_form({id=>"problem_set_form", name=>"problem_set_form", method=>"POST", action=>$setDetailURL});
-	print $self->hiddenEditForUserFields(@editForUser);
-	print $self->hidden_authen_fields;
-	print CGI::input({type=>"hidden", id=>"hidden_course_id", name=>"courseID", value=>$courseID});
-	print CGI::input({type=>"hidden", id=>"hidden_set_id", name=>"setID", value=>$setID});
-	print CGI::input({type=>"hidden", id=>"hidden_version_id", name=>"versionID", value=>$editingSetVersion}) if $editingSetVersion;
-
-	# Add the course language in a hidden input so that the javascript can get this information.
-	print CGI::hidden({ name => 'hidden_language', value => $ce->{language} });
-
-	print CGI::div({ class => 'my-3 submit-buttons-container' },
-		CGI::submit({
-			name => "submit_changes",
-			value => $r->maketext("Save Changes"),
-			class => 'btn btn-primary'
-		}),
-		CGI::submit({
-			name => "undo_changes",
-			value => $r->maketext("Reset Form"),
-			class => 'btn btn-primary'
-		})
-	);
-
-	#####################################################################
-	# Display general set information
-	#####################################################################
-
-	# this is kind of a hack -- we need to get a user record here, so we can
-	# pass it to FieldTable, so FieldTable can pass it to FieldHTML, so
-	# FieldHTML doesn't have to fetch it itself.
-	my $userSetRecord = $db->getUserSet($userToShow, $setID);
-
-	my $templateUserSetRecord;
-	# send in the set version if we're editing for versions
-	if ( $editingSetVersion ) {
-		$templateUserSetRecord = $userSetRecord;
-		$userSetRecord = $db->getSetVersion( $userToShow, $setID, $editingSetVersion );
-	}
-
-	print CGI::div(
-		{ class => 'card mb-2 border border-dark', style => 'width:fit-content' },
-		CGI::div(
-			{ class => 'card-body p-2' },
-			CGI::div({ class => 'card-title fw-bold' }, $r->maketext('General Information')),
-			CGI::div(
-				{ class => 'card-text' },
-				$self->FieldTable($userToShow, $setID, undef, $setRecord, $userSetRecord)
-			)
-		)
-	);
-
-	# Display Field for putting in a set description
-	print CGI::div(
-		{ class => 'mb-2' },
-		$forOneUser
-		? (
-			CGI::h2({ class => 'fw-bold fs-4' }, $r->maketext('Set Description')),
-			CGI::hidden({
-				name  => "set.$setID.description",
-				id    => "set.$setID.description",
-				value => $setRecord->description(),
-			}),
-			$setRecord->description ? $setRecord->description : $r->maketext('No Description')
-			)
-		: (
-			CGI::label(
-				{ for => "set.$setID.description", class => 'form-label fw-bold fs-4' },
-				$r->maketext('Set Description')
-			),
-			CGI::textarea({
-				name  => "set.$setID.description",
-				id    => "set.$setID.description",
-				value => $setRecord->description(),
-				rows  => 5,
-				cols  => 62,
-				class => 'form-control'
-			})
-		)
-	);
-
-	# Display header information
-	my @headers = @{ HEADER_ORDER() };
-	my %headerModules = (set_header => 'problem_list', hardcopy_header => 'hardcopy_preselect_set');
-	my %headerDefaults = (set_header => $ce->{webworkFiles}->{screenSnippets}->{setHeader}, hardcopy_header => $ce->{webworkFiles}->{hardcopySnippets}->{setHeader});
-	my @headerFiles = map { $setRecord->{$_} } @headers;
-	if (scalar @headers and not $forUsers) {
-
-		print CGI::start_div({ class => 'card mb-2 border border-dark', style => 'width:fit-content' });
-		print CGI::start_div({ class => 'card-body p-2' });
-
-		print CGI::div({ class => 'card-title fw-bold' }, $r->maketext("Headers"));
-
-		my %error;
-		my $this_set       = $db->getMergedSet($userToShow, $setID);
-		my $guaranteed_set = $this_set;
-		if (!$guaranteed_set) {
-			# in the header loop we need to have a set that
-			#    we know exists, so if the getMergedSet failed
-			#    (that is, the set isn't assigned to the
-			#    the current user), we get the global set instead
-			# $guaranteed_set = $db->getGlobalSet( $setID );
-			$guaranteed_set = $setRecord;
-		}
-
-		for my $headerType (@headers) {
-			my $headerFile = $r->param("set.$setID.$headerType") || $setRecord->{$headerType};
-			$headerFile = 'defaultHeader' unless $headerFile =~ /\S/;    # (some non-white space character required)
-			$error{$headerType} = $self->checkFile($headerFile, $headerType);
-		}
-
-		for my $headerType (@headers) {
-
-			my $editHeaderPage = $urlpath->new(
-				type => 'instructor_problem_editor_withset_withproblem',
-				args => { courseID => $courseID, setID => $setID, problemID => 0 }
-			);
-			my $editHeaderLink =
-				$self->systemLink($editHeaderPage, params => { file_type => $headerType, make_local_copy => 1 });
-
-			my $viewHeaderPage =
-				$urlpath->new(type => $headerModules{$headerType}, args => { courseID => $courseID, setID => $setID });
-			my $viewHeaderLink = $self->systemLink($viewHeaderPage);
-
-			print CGI::div(
-				{ class => 'card-text p-1' },
-				CGI::div(
-					{ class => 'row align-items-center' },
-					CGI::div(
-						{ class => 'col-4' },
-						CGI::table(
-							CGI::Tr(CGI::td(CGI::label(
-								{ for => "set.$setID.$headerType", class => 'form-label' },
-								$r->maketext($properties{$headerType}->{name})
-							))),
-							CGI::Tr(CGI::td(
-								CGI::a(
-									{
-										class             => 'psd_edit btn btn-secondary btn-sm',
-										href              => $editHeaderLink,
-										target            => 'WW_Editor',
-										data_bs_toggle    => 'tooltip',
-										data_bs_title     => $r->maketext('Edit Header'),
-										data_bs_placement => 'top'
-									},
-									CGI::i(
-										{ class => 'icon fas fa-pencil-alt', data_alt => $r->maketext('Edit') }, ''
-									)
-									)
-									. CGI::a(
-										{
-											class             => 'psd_view btn btn-secondary btn-sm',
-											href              => $viewHeaderLink,
-											target            => 'WW_View',
-											data_bs_toggle    => 'tooltip',
-											data_bs_placement => 'top',
-											data_bs_title     => $r->maketext('Open in New Window')
-										},
-										CGI::i({ class => 'icon far fa-eye', data_alt => $r->maketext('View') }, '')
-									)
-							))
-						)
-					),
-					CGI::div(
-						{ class => 'col-8' },
-						CGI::div(
-							{ class => "combo-box" },
-							CGI::div(
-								CGI::textfield({
-									name  => "set.$setID.$headerType",
-									id    => "set.$setID.$headerType",
-									value => $r->param("set.$setID.$headerType")
-										|| $setRecord->{$headerType}
-										|| 'defaultHeader',
-									#size  => $width,
-									class => 'combo-box-text form-control mb-1'
-								}),
-								CGI::popup_menu({
-									name    => "set.$setID.$headerType",
-									values  => [ 'defaultHeader', @headerFileList ],
-									labels  => { 'defaultHeader' => $r->maketext('Use Default Header File') },
-									default => $r->param("set.$setID.$headerType")
-										|| $setRecord->{$headerType}
-										|| 'defaultHeader',
-									class           => 'combo-box-select form-select',
-									aria_labelledby => "set.$setID.$headerType"
-								})
-							)
-						)
-					)
-				)
-			);
-		}
-
-		print CGI::end_div(), CGI::end_div();
-	} else {
-		print CGI::p(
-			CGI::b(
-				$r->maketext(
-					"Screen and Hardcopy set header information can not be overridden for individual students.")
-			)
-		);
-	}
-
-	#####################################################################
-	# Display problem information
-	#####################################################################
+	# Check that if a set version for a user is being edited, that it exists as well
+	return if $editingSetVersion && !$db->existsSetVersion($editForUser[0], $setID, $editingSetVersion);
 
 	# Get global problem records for all problems sorted by problem id.
 	my @globalProblems = $db->getGlobalProblemsWhere({ set_id => $setID }, 'problem_id');
-	my @problemIDList  = map { $_->problem_id } @globalProblems;
-	my %GlobalProblems = map { $_->problem_id => $_ } @globalProblems;
+	$c->stash->{problemIDList}  = [ map { $_->problem_id } @globalProblems ];
+	$c->stash->{globalProblems} = { map { $_->problem_id => $_ } @globalProblems };
 
 	# If editing for one user, get user problem records for all problems also sorted by problem_id.
-	my (%UserProblems, %MergedProblems);
-	if ($forOneUser) {
-		my @userProblems = $db->getUserProblemsWhere({ user_id => $editForUser[0], set_id => $setID }, 'problem_id');
-		%UserProblems = map { $_->problem_id => $_ } @userProblems;
+	if (@editForUser == 1) {
+		$c->stash->{userProblems} = { map { $_->problem_id => $_ }
+				$db->getUserProblemsWhere({ user_id => $editForUser[0], set_id => $setID }, 'problem_id') };
 
 		if ($editingSetVersion) {
-			%MergedProblems =
-				map { $_->problem_id => $_ }
-				$db->getMergedProblemVersionsWhere(
-					{ user_id => $editForUser[0], set_id => "$setID,v$editingSetVersion" }, 'problem_id');
+			$c->stash->{mergedProblems} = {
+				map { $_->problem_id => $_ } $db->getMergedProblemVersionsWhere(
+					{ user_id => $editForUser[0], set_id => "$setID,v$editingSetVersion" }, 'problem_id'
+				)
+			};
 		} else {
-			%MergedProblems = map { $_->problem_id => $_ }
-				$db->getMergedProblemsWhere({ user_id => $editForUser[0], set_id => $setID }, 'problem_id');
+			$c->stash->{mergedProblems} = { map { $_->problem_id => $_ }
+					$db->getMergedProblemsWhere({ user_id => $editForUser[0], set_id => $setID }, 'problem_id') };
 		}
 	}
 
-	if (scalar @globalProblems) {
-		# Create rows for problems.  This is done using divs instead of tables
-		# the spacing and formatting is done via bootstrap.
-		print CGI::h2($r->maketext('Problems'));
-		print CGI::div(
-			{ id => 'psd_toolbar', class => 'col-12 d-flex flex-wrap mb-3' },
-			CGI::div(
-				{ class => 'btn-group w-auto me-3 py-1' },
-				$forOneUser ? '' : CGI::a(
-					{ id => 'psd_renumber', class => 'btn btn-secondary', role => 'button', tabindex => 0 },
-					$r->maketext('Renumber Problems')
-				),
-				CGI::a(
-					{ id => 'psd_render_all', class => 'btn btn-secondary', role => 'button', tabindex => 0 },
-					$r->maketext('Render All')
-				),
-				CGI::a({ id => 'psd_hide_all', class => 'btn btn-secondary', role => 'button', tabindex => 0 },
-					$r->maketext('Hide All'))
-			),
-			$forUsers ? '' : CGI::div(
-				{ class => 'btn-group w-auto me-3 py-1' },
-				CGI::a(
-					{ id => 'psd_expand_details', class => 'btn btn-secondary', role => 'button', tabindex => 0 },
-					$r->maketext('Expand All Details')
-				),
-				CGI::a(
-					{ id => 'psd_collapse_details', class => 'btn btn-secondary', role => 'button', tabindex => 0 },
-					$r->maketext('Collapse All Details')
-				)
-			),
-			$isJitarSet ? CGI::div(
-				{ class => 'btn-group w-auto me-3 py-1' },
-				CGI::a(
-					{ id => 'psd_expand_all', class => 'btn btn-secondary', role => 'button', tabindex => 0 },
-					$r->maketext('Expand All Nesting')
-				),
-				CGI::a(
-					{ id => 'psd_collapse_all', class => 'btn btn-secondary', role => 'button', tabindex => 0 },
-					$r->maketext('Collapse All Nesting')
-				)
-			) : '',
-			CGI::div(
-				{ class => 'input-group d-inline-flex flex-nowrap w-auto py-1' },
-				CGI::label(
-					{ for => 'problem_displaymode', class => 'input-group-text' },
-					$r->maketext('Display Mode:')
-				),
-				CGI::popup_menu({
-					name    => 'problem.displaymode',
-					id      => 'problem_displaymode',
-					values  => \@active_modes,
-					default => $default_problem_mode,
-					class   => 'form-select w-auto flex-grow-0'
-				})
-			)
-		);
-
-		print CGI::start_div({ id => 'problemset_detail_list', class => 'container-fluid p-0' });
-
-		my %shownYet;
-		my $repeatFile;
-		my @problemRow;
-
-		foreach my $problemID (@problemIDList) {
-
-			my $problemRecord;
-			if ($forOneUser) {
-				$problemRecord = $MergedProblems{$problemID};
-			} else {
-				$problemRecord = $GlobalProblems{$problemID};
-			}
-
-			# when we're editing a set version, we want to be sure to
-			#    use the merged problem in the edit, because we could
-			#    be using problem groups (for which the problem is generated
-			#    and then stored in the problem version)
-			my $problemToShow = ($editingSetVersion) ? $MergedProblems{$problemID} : $UserProblems{$problemID};
-
-			my ($editProblemPage, $editProblemLink, $viewProblemPage, $viewProblemLink);
-			if ($isGatewaySet) {
-				$editProblemPage = $urlpath->new(
-					type => 'instructor_problem_editor_withset_withproblem',
-					args => { courseID => $courseID, setID => $fullSetID, problemID => $problemID }
-				);
-				$editProblemLink = $self->systemLink($editProblemPage, params => { make_local_copy => 0 });
-				$viewProblemPage = $urlpath->new(
-					type => 'gateway_quiz',
-					args => {
-						courseID  => $courseID,
-						setID     => "Undefined_Set",
-						problemID => "1"
-					}
-				);
-
-				my $seed = $problemToShow ? $problemToShow->problem_seed : "";
-				my $file = $problemToShow ? $problemToShow->source_file  : $GlobalProblems{$problemID}->source_file;
-
-				$viewProblemLink = $self->systemLink(
-					$viewProblemPage,
-					params => {
-						effectiveUser  => ($forOneUser ? $editForUser[0] : $userID),
-						problemSeed    => $seed,
-						sourceFilePath => $file
-					}
-				);
-			} else {
-				$editProblemPage = $urlpath->new(
-					type => 'instructor_problem_editor_withset_withproblem',
-					args => { courseID => $courseID, setID => $fullSetID, problemID => $problemID }
-				);
-				$editProblemLink = $self->systemLink($editProblemPage, params => { make_local_copy => 0 });
-				# FIXME: should we have an "act as" type link here when editing for multiple users?
-				$viewProblemPage = $urlpath->new(
-					type => 'problem_detail',
-					args => { courseID => $courseID, setID => $setID, problemID => $problemID }
-				);
-				$viewProblemLink = $self->systemLink($viewProblemPage,
-					params => { effectiveUser => ($forOneUser ? $editForUser[0] : $userID) });
-			}
+	# Reset all the parameters dealing with set/problem/header information.  It may not be obvious why this is necessary
+	# when saving changes, but when the problems are reordered the param problem.1.source_file needs to be the source
+	# file of the problem that is NOW #1 and not the problem that WAS #1.
+	for my $param ($c->param) {
+		$c->param($param, undef) if $param =~ /^(set|problem|header)\./ && $param !~ /displaymode/;
+	}
 
-			my $problemFile = $r->param("problem.$problemID.source_file") || $problemRecord->source_file;
-			$problemFile =~ s|^/||;
-			$problemFile =~ s|\.\.||g;
-			# warn of repeat problems
-			if (defined $shownYet{$problemFile}) {
-				my $prettyID = $shownYet{$problemFile};
-				$prettyID = join('.', jitar_id_to_seq($prettyID))
-					if $isJitarSet;
-				$repeatFile = $r->maketext("This problem uses the same source file as number [_1].", $prettyID);
-			} else {
-				$shownYet{$problemFile} = $problemID;
-				$repeatFile = "";
-			}
+	# Reset checkboxes that should always be unchecked when the page loads.
+	$c->param('deleteProblem',     undef);
+	$c->param('markCorrect',       undef);
+	$c->param('force_renumber',    undef);
+	$c->param('add_blank_problem', undef);
 
-			my $error    = $self->checkFile($problemFile, undef);
-			my $this_set = $db->getMergedSet($userToShow, $setID);
-
-			# we want to show the "Try It" and "Edit It" links if there's a
-			#    well defined problem to view; this is when we're editing a
-			#    homework set, or if we're editing a gateway set version, or
-			#    if we're editing a gateway set and the problem is not a
-			#    group problem
-			# we also want "grade problem" links for problems which
-			# have essay questions.
-
-			my $showLinks = (!$isGatewaySet || ($editingSetVersion || $problemFile !~ /^group/));
-
-			my $gradingLink = "";
-			if ($showLinks && $problemRecord->flags =~ /essay/) {
-				$gradingLink = CGI::a(
-					{
-						class => "pdr_grader btn btn-secondary btn-sm",
-						href  => $self->systemLink($urlpath->new(
-							type => 'instructor_problem_grader',
-							args => { courseID => $courseID, setID => $fullSetID, problemID => $problemID }
-						)),
-						data_bs_toggle    => "tooltip",
-						data_bs_placement => "top",
-						data_bs_title     => $r->maketext("Grade Problem")
-					},
-					CGI::i({ class => "icon fas fa-edit", data_alt => $r->maketext("Grade") }, "")
-				);
-			}
+	return;
+}
 
-			my $problemNumber     = $problemID;
-			my $lastProblemNumber = $problemID;
-			my $parentID          = '';
-			my $collapseButton    = '';
-			if ($isJitarSet) {
-				my @seq = jitar_id_to_seq($problemNumber);
-				$problemNumber     = join('.', @seq);
-				$lastProblemNumber = pop @seq;
-				$parentID          = seq_to_jitar_id(@seq) if @seq;
-				$collapseButton    = CGI::span(
-					{
-						class              => 'pdr_collapse me-2 collapsed',
-						data_expand_text   => $r->maketext('Expand Nested Problems'),
-						data_collapse_text => $r->maketext('Collapse Nested Problems'),
-						data_bs_toggle     => 'collapse',
-						aria_expanded      => 'false',
-						role               => 'button',
-						tabindex           => 0
-					},
-					CGI::i({ class => 'fas fa-chevron-right', data_bs_toggle => 'tooltip' }, '')
-				);
-			}
+# Helper method for checking if two values are different.
+# The return values will usually be thrown away, but they could be useful for debugging.
+sub changed ($first, $second) {
+	return "def/undef" if defined $first  && !defined $second;
+	return "undef/def" if !defined $first && defined $second;
+	return ""          if !defined $first && !defined $second;
+	return "ne"        if $first ne $second;
+	return "";
+}
 
-			my @source_file_parts = $self->FieldHTML($userToShow, $setID, $problemID, $GlobalProblems{$problemID},
-				$problemToShow, 'source_file');
-
-			push(
-				@problemRow,
-				CGI::div(
-					{ class => 'problem_detail_row card d-flex flex-column p-2 mb-3 g-0' },
-					CGI::div(
-						{ class => 'pdr_block_1 row align-items-center' },
-						CGI::div(
-							{ class => 'col-md-4 col-10 order-1 d-flex align-items-center' },
-							CGI::div(
-								{ class => 'pdr_handle me-2 text-nowrap', id => "pdr_handle_$problemID" },
-								CGI::span({ class => 'pdr_problem_number' }, $problemNumber) . ' ',
-								$forUsers ? '' : CGI::i(
-									{
-										class          => $isJitarSet ? 'fas fa-arrows-alt' : 'fas fa-arrows-alt-v',
-										data_bs_title  => $r->maketext('Move'),
-										data_bs_toggle => 'tooltip'
-									},
-									''
-								)
-							),
-							$collapseButton,
-							CGI::input({
-								type  => 'hidden',
-								name  => "prob_num_$problemID",
-								id    => "prob_num_$problemID",
-								value => $lastProblemNumber
-							}),
-							CGI::input({
-								type  => 'hidden',
-								name  => "prob_parent_id_$problemID",
-								id    => "prob_parent_id_$problemID",
-								value => $parentID
-							}),
-							CGI::a(
-								{
-									class             => 'pdr_render btn btn-secondary btn-sm',
-									id                => "pdr_render_$problemID",
-									data_bs_toggle    => 'tooltip',
-									data_bs_placement => 'top',
-									data_bs_title     => $r->maketext('Render Problem'),
-									role              => 'button',
-									tabindex          => 0
-								},
-								CGI::i(
-									{
-										class       => 'icon far fa-image',
-										data_alt    => $r->maketext('Render'),
-										aria_hidden => 'true'
-									},
-									''
-								)
-							),
-							(
-								$showLinks ? CGI::a(
-									{
-										class             => 'psd_edit btn btn-secondary btn-sm',
-										href              => $editProblemLink,
-										target            => 'WW_Editor',
-										data_bs_toggle    => 'tooltip',
-										data_bs_placement => 'top',
-										data_bs_title     => $r->maketext('Edit Problem')
-									},
-									CGI::i({ class => 'icon fas fa-pencil-alt', data_alt => $r->maketext('Edit') }, '')
-								) : ''
-							),
-							(
-								$showLinks ? CGI::a(
-									{
-										class             => 'psd_view btn btn-secondary btn-sm',
-										href              => $viewProblemLink,
-										target            => 'WW_View',
-										data_bs_toggle    => 'tooltip',
-										data_bs_placement => 'top',
-										data_bs_title     => $r->maketext('Open in New Window')
-									},
-									CGI::i({ class => 'icon far fa-eye', data_alt => $r->maketext('View') }, '')
-								) : ''
-							),
-							$gradingLink
-						),
-						CGI::div(
-							{ class => 'col-md-2 col-3 order-md-2 order-3' },
-							$forUsers ? CGI::div(
-								{
-									class => 'form-check form-check-inline col-form-label col-form-label-sm text-nowrap'
-								},
-								$source_file_parts[0],
-								$source_file_parts[1]
-							) : CGI::div(
-								{ class => 'col-auto col-form-label col-form-label-sm text-nowrap' },
-								$source_file_parts[0]
-							)
-						),
-						CGI::div(
-							{ class => ($forUsers ? 'col-md-6' : 'col-md-5') . ' col-9 order-md-3 order-4' },
-							$source_file_parts[ $forUsers ? 3 : 2 ],
-							CGI::input({
-								type  => 'hidden',
-								id    => "problem_${problemID}_default_source_file",
-								value => $GlobalProblems{$problemID}->source_file()
-							})
-						),
-						$forUsers ? '' : CGI::div(
-							{
-								class => 'col-md-1 col-2 d-flex align-items-center justify-content-end '
-									. 'order-md-last order-2'
-							},
-							qq{<button class="accordion-button pdr_detail_collapse ps-0 w-auto" type="button"
-									data-bs-toggle="collapse" data-bs-target="#pdr_details_$problemID"
-									aria-expanded="true" aria-controls="pdr_details_$problemID"
-									aria-label="${\($r->maketext('Collapse Problem Details'))}"
-									data-expand-text="${\($r->maketext('Expand Problem Details'))}"
-									data-collapse-text="${\($r->maketext('Collapse Problem Details'))}"
-									></button>}
-						)
-					),
-					CGI::div(
-						{ id => "pdr_details_$problemID", class => 'collapse show mt-1' },
-						CGI::div(
-							{ class => 'row' },
-							CGI::div(
-								{ class => 'col-md-6 d-flex flex-row order-md-first order-last' },
-								(
-									$forUsers ? '' : CGI::div(
-										{ class => 'form-check form-check-inline form-control-sm' },
-										CGI::checkbox({
-											name            => 'deleteProblem',
-											value           => $problemID,
-											label           => $r->maketext('Delete it?'),
-											class           => 'form-check-input',
-											labelattributes => { class => 'form-check-label' }
-										})
-									)
-								),
-								(
-									$forOneUser ? '' : CGI::div(
-										{ class => 'form-check form-check-inline form-control-sm' },
-										CGI::checkbox({
-											name            => 'markCorrect',
-											id              => "problem.${problemID}.mark_correct",
-											value           => $problemID,
-											label           => $r->maketext('Mark Correct?'),
-											class           => 'form-check-input',
-											labelattributes => { class => 'form-check-label' }
-										})
-									)
-								)
-							),
-							$forUsers
-							? CGI::div(
-								{ class => 'col-md-6 offset-md-0 col-9 offset-3 font-sm order-md-last order-first' },
-								$source_file_parts[4])
-							: ''
-						),
-						CGI::div(
-							{ class => 'row' },
-							CGI::div(
-								{ class => 'col-md-5' },
-								$self->FieldTable(
-									$userToShow,                 $setID,         $problemID,
-									$GlobalProblems{$problemID}, $problemToShow, $setRecord->assignment_type()
-								)
-							),
-							CGI::div(
-								{ class => 'font-sm col-md-7' },
-								$repeatFile
-								? CGI::div({ class => 'alert alert-danger p-1 mb-0 fw-bold' }, $repeatFile)
-								: '',
-								CGI::div(
-									{ class => 'psr_render_area', id => "psr_render_area_$problemID" },
-									$error ? CGI::div({ class => 'alert alert-danger p-1 mb-0 fw-bold' }, $error) : ''
-								)
-							)
-						)
-					)
-				)
-			);
-		}
+# Helper method that determines for how many users at a time a field can be changed.
+# 	none means it can't be changed for anyone
+# 	any means it can be changed for anyone
+# 	one means it can ONLY be changed for one at a time. (eg problem_seed)
+# 	all means it can ONLY be changed for all at a time. (eg set_header)
+sub canChange ($forUsers, $field) {
+	my %properties = %{ FIELD_PROPERTIES() };
+	my $forOneUser = $forUsers == 1;
 
-		# If a jitar set then print nested lists, otherwise print an unordered list.
-		if ($isJitarSet) {
-			my $nestedIDHash = {};
+	my $howManyCan = $properties{$field}{override};
+	return 0 if $howManyCan eq "none";
+	return 1 if $howManyCan eq "any";
+	return 1 if $howManyCan eq "one" && $forOneUser;
+	return 1 if $howManyCan eq "all" && !$forUsers;
+	return 0;    # FIXME: maybe it should default to 1?
+}
 
-			for (my $i = 0; $i <= $#problemIDList; $i++) {
-				my @id_seq = jitar_id_to_seq($problemIDList[$i]);
+# Helper method that determines if a file is valid and returns a pretty error message.
+sub checkFile ($c, $filePath, $headerType) {
+	my $ce = $c->ce;
 
-				my $hashref = $nestedIDHash;
-				for my $num (@id_seq) {
-					$hashref->{$num} = {} unless defined $hashref->{$num};
-					$hashref = $hashref->{$num};
-				}
-				$hashref->{'row'} = $problemRow[$i];
-				$hashref->{'id'}  = $problemIDList[$i];
-			}
+	return $c->maketext("No source filePath specified") unless $filePath;
+	return $c->maketext("Problem source is drawn from a grouping set") if $filePath =~ /^group/;
 
-			# now use recursion to print the nested lists
-			print CGI::start_ol(
-				{ id => 'psd_list', class => 'sortable-branch' . ($forUsers ? ' disable_renumber' : '') });
-			for (sort { $a <=> $b } keys %$nestedIDHash) {
-				print_nested_list($nestedIDHash->{$_});
-			}
-			print CGI::end_ol();
+	if ($filePath eq "defaultHeader") {
+		if ($headerType eq 'set_header') {
+			$filePath = $ce->{webworkFiles}{screenSnippets}{setHeader};
+		} elsif ($headerType eq 'hardcopy_header') {
+			$filePath = $ce->{webworkFiles}{hardcopySnippets}{setHeader};
 		} else {
-			print CGI::ol(
-				{ id => 'psd_list', class => 'sortable-branch' . ($forUsers ? ' disable_renumber' : '') },
-				map {
-					CGI::li(
-						{ class => 'psd_list_item', id => "psd_list_item_$problemIDList[$_]" },
-						$problemRow[$_])
-				} 0 .. $#problemIDList
-			);
+			return $c->maketext("Invalid headerType [_1]", $headerType);
 		}
-
-		print CGI::end_div();
-
-		print CGI::div(
-			{ class => 'input-group mb-2' },
-			CGI::div(
-				{ class => 'input-group-text' },
-				CGI::input({
-					type  => 'checkbox',
-					id    => 'auto_render',
-					name  => 'auto_render',
-					value => '1',
-					$r->param('auto_render') ? (checked => undef) : (),
-					class => 'form-check-input mt-0',
-				})
-			),
-			CGI::label(
-				{ for => 'auto_render', class => 'input-group-text' },
-				$r->maketext('Automatically render problems on page load')
-			)
-		);
-		print CGI::div(
-			{ class => 'input-group mb-2' },
-			CGI::div(
-				{ class => 'input-group-text' },
-				CGI::input({
-					type  => 'checkbox',
-					id    => 'force_renumber',
-					name  => 'force_renumber',
-					value => '1',
-					class => 'form-check-input mt-0',
-				})
-			),
-			CGI::label(
-				{ for => 'force_renumber', class => 'input-group-text' },
-				$r->maketext('Force problems to be numbered consecutively from one')
-			)
-		);
 	} else {
-		print CGI::p(CGI::b($r->maketext("This set doesn't contain any problems yet.")));
+		# Only filePaths in the template directory can be accessed.
+		$filePath = "$ce->{courseDirs}{templates}/$filePath";
 	}
 
-	# Always allow one to add a new problem, unless we're editing a set version.
-	if ( ! $editingSetVersion ) {
-		print CGI::div({ class => 'input-group' },
-			CGI::div({ class => 'input-group-text' },
-				CGI::input({
-					type => 'checkbox',
-					id => 'add_blank_problem',
-					name => 'add_blank_problem',
-					value => '1',
-					class => 'form-check-input mt-0',
-				})
-			),
-			CGI::label({ for => 'add_blank_problem', class => 'input-group-text' }, $r->maketext('Add')),
-			CGI::input({
-				name => 'add_n_problems',
-				id   => 'add_n_problems',
-				type => 'text',
-				value => 1,
-				class => 'form-control flex-grow-0'
-			}),
-			CGI::label({ for => 'add_n_problems', class => 'input-group-text' },
-				$r->maketext('blank problem template(s) to end of homework set'))
-		)
-	}
-
-	print CGI::div({ class => 'mt-3 submit-buttons-container align-items-center' },
-		CGI::submit({
-			name => 'submit_changes',
-			value => $r->maketext('Save Changes'),
-			class => 'btn btn-primary'
-		}),
-		CGI::submit({
-			name => 'undo_changes',
-			value => $r->maketext('Reset Form'),
-			class => 'btn btn-primary'
-		}),
-		$r->maketext('(Any unsaved changes will be lost.)')
-	);
-
-	print CGI::end_form();
-
-	return '';
+	my $fileError;
+	return ""                                                if -e $filePath && -f $filePath && -r $filePath;
+	return $c->maketext("This source file is not readable!") if -e $filePath && -f $filePath;
+	return $c->maketext("This source file is a directory!")  if -d $filePath;
+	return $c->maketext("This source file does not exist!") unless -e $filePath;
+	return $c->maketext("This source file is not a plain file!");
 }
 
-sub output_JS {
-	my $self = shift;
-	my $ce   = $self->r->ce;
-
-	# Print javascript and style for the flatpickr date/time picker.
-	print CGI::Link({ rel => 'stylesheet', href => getAssetURL($ce, 'node_modules/flatpickr/dist/flatpickr.min.css') });
-	print CGI::Link({
-		rel  => 'stylesheet',
-		href => getAssetURL($ce, 'node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.css')
-	});
-	print CGI::script({ src => getAssetURL($ce, 'node_modules/luxon/build/global/luxon.min.js'), defer => undef }, '');
-	print CGI::script({ src => getAssetURL($ce, 'node_modules/flatpickr/dist/flatpickr.min.js'), defer => undef }, '');
-	if ($ce->{language} !~ /^en/) {
-		print CGI::script(
-			{
-				src => getAssetURL(
-					$ce, 'node_modules/flatpickr/dist/l10n/' . ($ce->{language} =~ s/^(..).*/$1/gr) . '.js'
-				),
-				defer => undef
-			},
-			''
-		);
+# Make sure restrictor sets exist.
+sub check_sets ($c, $db, $sets_string) {
+	my @proposed_sets = split(/\s*,\s*/, $sets_string);
+	for (@proposed_sets) {
+		$c->addbadmessage("Error: $_ is not a valid set name in restricted release list!")
+			unless $db->existsGlobalSet($_);
 	}
-	print CGI::script(
-		{
-			src   => getAssetURL($ce, 'node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.js'),
-			defer => undef
-		},
-		''
-	);
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/DatePicker/datepicker.js'), defer => undef }, '');
-
-	print CGI::script({ src => getAssetURL($ce, 'node_modules/sortablejs/Sortable.min.js'), defer => undef }, '');
 
-	print CGI::script({ src => getAssetURL($ce, 'node_modules/iframe-resizer/js/iframeResizer.min.js') }, '');
+	return;
+}
 
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/ProblemSetDetail/problemsetdetail.js'), defer => undef }, '');
+sub userCountMessage ($c, $count, $numUsers) {
+	if ($count == 0) {
+		return $c->tag('em', $c->maketext('no students'));
+	} elsif ($count == $numUsers) {
+		return $c->maketext('all students');
+	} elsif ($count == 1) {
+		return $c->maketext('1 student');
+	} elsif ($count > $numUsers || $count < 0) {
+		return $c->tag('em', $c->maketext('an impossible number of users: [_1] out of [_2]', $count, $numUsers));
+	} else {
+		return $c->maketext('[_1] students out of [_2]', $count, $numUsers);
+	}
+}
 
-	return '';
+sub setCountMessage ($c, $count, $numSets) {
+	if ($count == 0) {
+		return $c->tag('em', $c->maketext('no sets'));
+	} elsif ($count == $numSets) {
+		return $c->maketext('all sets');
+	} elsif ($count == 1) {
+		return $c->maketext('1 set');
+	} elsif ($count > $numSets || $count < 0) {
+		return $c->tag('em', $c->maketext('an impossible number of sets: [_1] out of [_2]', $count, $numSets));
+	} else {
+		return $c->maketext('[_1] sets', $count);
+	}
 }
 
 1;
-
-=head1 AUTHOR
-
-Written by Robert Van Dam, toenail (at) cif.rochester.edu
-
-=cut
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
index 74fbd2fffc..903e2df08d 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,8 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Instructor::ProblemSetList;
-use base qw(WeBWorK);
-use base qw(WeBWorK::ContentGenerator::Instructor);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -74,1011 +73,339 @@ Delete sets:
 =cut
 
 # FIXME: rather than having two types of boolean modes $editMode and $exportMode
-#	make one $mode variable that contains a string like "edit", "view", or "export"
+# make one $mode variable that contains a string like "edit", "view", or "export"
+
+use Mojo::File;
 
-use strict;
-use warnings;
-#use CGI qw(-nosticky );
-use WeBWorK::CGI;
 use WeBWorK::Debug;
-use WeBWorK::Utils qw(timeToSec readFile listFilesRecursive jitar_id_to_seq seq_to_jitar_id x getAssetURL
+use WeBWorK::Utils qw(timeToSec listFilesRecursive jitar_id_to_seq seq_to_jitar_id x
 	format_set_name_internal format_set_name_display);
+use WeBWorK::Utils::Instructor qw(assignSetToUser assignSetToAllUsers addProblemToSet);
 
-use constant HIDE_SETS_THRESHOLD => 500;
-use constant DEFAULT_VISIBILITY_STATE => 1;
+use constant HIDE_SETS_THRESHOLD                   => 500;
+use constant DEFAULT_VISIBILITY_STATE              => 1;
 use constant DEFAULT_ENABLED_REDUCED_SCORING_STATE => 0;
-use constant ONE_WEEK => 60*60*24*7;
+use constant ONE_WEEK                              => 60 * 60 * 24 * 7;
 
-use constant EDIT_FORMS => [qw(saveEdit cancelEdit)];
-use constant VIEW_FORMS => [qw(filter sort edit publish import export score create delete)];
-use constant EXPORT_FORMS => [qw(saveExport cancelExport)];
+use constant EDIT_FORMS   => [qw(save_edit cancel_edit)];
+use constant VIEW_FORMS   => [qw(filter sort edit publish import export score create delete)];
+use constant EXPORT_FORMS => [qw(save_export cancel_export)];
 
 # Prepare the tab titles for translation by maketext
 use constant FORM_TITLES => {
-	saveEdit       => x("Save Edit"),
-	cancelEdit     => x("Cancel Edit"),
-	filter         => x("Filter"),
-	sort           => x("Sort"),
-	edit           => x("Edit"),
-	publish        => x("Publish"),
-	import         => x("Import"),
-	export         => x("Export"),
-	score          => x("Score"),
-	create         => x("Create"),
-	delete         => x("Delete"),
-	saveExport     => x("Save Export"),
-	cancelExport   => x("Cancel Export")
+	save_edit     => x("Save Edit"),
+	cancel_edit   => x("Cancel Edit"),
+	filter        => x("Filter"),
+	sort          => x("Sort"),
+	edit          => x("Edit"),
+	publish       => x("Publish"),
+	import        => x("Import"),
+	export        => x("Export"),
+	score         => x("Score"),
+	create        => x("Create"),
+	delete        => x("Delete"),
+	save_export   => x("Save Export"),
+	cancel_export => x("Cancel Export")
 };
 
-use constant VIEW_FIELD_ORDER => [ qw( set_id problems users visible enable_reduced_scoring open_date reduced_scoring_date due_date answer_date) ];
-use constant EDIT_FIELD_ORDER => [ qw( set_id visible enable_reduced_scoring open_date reduced_scoring_date due_date answer_date) ];
-use constant EXPORT_FIELD_ORDER => [ qw( select set_id problems users) ];
+use constant VIEW_FIELD_ORDER =>
+	[qw(set_id problems users visible enable_reduced_scoring open_date reduced_scoring_date due_date answer_date)];
+use constant EDIT_FIELD_ORDER =>
+	[qw(set_id visible enable_reduced_scoring open_date reduced_scoring_date due_date answer_date)];
+use constant EXPORT_FIELD_ORDER => [qw(set_id problems users)];
 
 # permissions needed to perform a given action
 use constant FORM_PERMS => {
-		saveEdit => "modify_problem_sets",
-		edit => "modify_problem_sets",
-		publish => "modify_problem_sets",
-		import => "create_and_delete_problem_sets",
-		export => "modify_set_def_files",
-		saveExport => "modify_set_def_files",
-		score => "score_sets",
-		create => "create_and_delete_problem_sets",
-		delete => "create_and_delete_problem_sets",
-};
-
-# permissions needed to view a given field
-use constant FIELD_PERMS => {
-		problems => "modify_problem_sets",
-		users	=> "assign_problem_sets",
+	save_edit   => "modify_problem_sets",
+	edit        => "modify_problem_sets",
+	publish     => "modify_problem_sets",
+	import      => "create_and_delete_problem_sets",
+	export      => "modify_set_def_files",
+	save_export => "modify_set_def_files",
+	score       => "score_sets",
+	create      => "create_and_delete_problem_sets",
+	delete      => "create_and_delete_problem_sets",
 };
 
-use constant STATE_PARAMS => [qw(user effectiveUser key visible_sets no_visible_sets prev_visible_sets no_prev_visible_set editMode exportMode primarySortField secondarySortField)];
-
-# note that field_properties for some fields, in particular, gateway
-# parameters, are not currently shown in the edit or display tables
-use constant  FIELD_PROPERTIES => {
-	set_id => {
-		type => "text",
-		size => 8,
-		access => "readonly",
-	},
-	open_date => {
-		type => "date",
-		size => 22,
-		access => "readwrite",
-	},
-	reduced_scoring_date => {
-		type => "date",
-		size => 22,
-		access => "readwrite",
-	},
-	due_date => {
-		type => "date",
-		size => 22,
-		access => "readwrite",
-	},
-	answer_date => {
-		type => "date",
-		size => 22,
-		access => "readwrite",
-	},
-	visible => {
-		type => "checked",
-		size => 4,
-		access => "readwrite",
-	},
-	enable_reduced_scoring => {
-		type => "checked",
-		size => 4,
-		access => "readwrite",
-	},
-	assignment_type => {
-		type => "text",
-		size => 20,
-		access => "readwrite",
-	},
-	attempts_per_version => {
-		type => "text",
-		size => 4,
-		access => "readwrite",
-	},
-	time_interval => {
-		type => "text",
-		size => 10,
-		access => "readwrite",
-	},
-	versions_per_interval => {
-		type => "text",
-		size => 4,
-		access => "readwrite",
-	},
-	version_time_limit => {
-		type => "text",
-		size => 10,
-		access => "readwrite",
-	},
-	problem_randorder => {
-		type => "text",
-		size => 4,
-		access => "readwrite",
-	},
-	problems_per_page => {
-		type => "text",
-		size => 4,
-		access => "readwrite",
-	},
-	version_creation_time => {
-		type => "text",
-		size => 10,
-		access => "readonly",
-	},
-	version_last_attempt_time => {
-		type => "text",
-		size => 10,
-		access => "readonly",
-	},
-	# hide_score and hide_work should be drop down selects with
-	#    options 'N', 'Y' and 'BeforeAnswerDate'.  in that we don't
-	#    allow editing of these fields in this module, this is moot.
-	hide_score => {
-		type => "text",
-		size => 16,
-		access => "readwrite",
-	},
-	hide_work => {
-		type => "text",
-		size => 16,
-		access => "readwrite",
-	},
-	time_limit_cap => {
-		type => "checked",
-		size => 4,
-		access => "readwrite",
-	},
-	# this should be 'No', 'RestrictTo' or 'DenyFrom'
-	restrict_ip => {
-		type => "text",
-		size => 10,
-		access => "readwrite",
-	},
-#	hide_hint => {
-#		type => "checked",
-#		size => 4,
-#		access => "readwrite",
-#	}
+# Note that these are the only fields that are ever shown on this page.
+# The set_id is handle separately, and so is not in this list.
+use constant FIELD_TYPES => {
+	open_date              => 'date',
+	reduced_scoring_date   => 'date',
+	due_date               => 'date',
+	answer_date            => 'date',
+	visible                => 'check',
+	enable_reduced_scoring => 'check'
 };
 
-sub pre_header_initialize {
-	my ($self) = @_;
-	my $r      = $self->r;
-	my $db     = $r->db;
-	my $authz  = $r->authz;
-	my $urlpath = $r->urlpath;
-	my $user   = $r->param('user');
-	my $courseName = $urlpath->arg("courseID");
+sub pre_header_initialize ($c) {
+	my $db         = $c->db;
+	my $authz      = $c->authz;
+	my $user       = $c->param('user');
+	my $courseName = $c->stash('courseID');
 
 	# Check permissions
-	return unless $authz->hasPermissions($user, "access_instructor_tools");
+	return unless $authz->hasPermissions($user, 'access_instructor_tools');
 
 	# Get the list of global sets and the number of users and cache them for later use.
-	$self->{allSetIDs} = [ $db->listGlobalSets() ];
-	$self->{totalUsers} = $db->countUsers;
-
-	if (defined $r->param("action") and $r->param("action") eq "score" and $authz->hasPermissions($user, "score_sets")) {
-		my $scope = $r->param("action.score.scope");
-		my @setsToScore = ();
-
-		if ($scope eq "none") {
-			return $r->maketext("No sets selected for scoring");
-		} elsif ($scope eq "all") {
-			@setsToScore = @{ $self->{allSetIDs} };
-		} elsif ($scope eq "visible") {
-			@setsToScore = @{ $r->param("visibleSetIDs") };
-		} elsif ($scope eq "selected") {
-			@setsToScore = $r->param("selected_sets");
+	$c->{allSetIDs}  = [ $db->listGlobalSets ];
+	$c->{totalUsers} = $db->countUsers;
+
+	if (defined $c->param('action') && $c->param('action') eq 'score' && $authz->hasPermissions($user, 'score_sets')) {
+		my $scope = $c->param('action.score.scope');
+		my @setsToScore;
+
+		if ($scope eq 'none') {
+			return;
+		} elsif ($scope eq 'all') {
+			@setsToScore = @{ $c->{allSetIDs} };
+		} elsif ($scope eq 'visible') {
+			@setsToScore = @{ $c->param('visibleSetIDs') };
+		} elsif ($scope eq 'selected') {
+			@setsToScore = $c->param('selected_sets');
 		}
 
-		my $uri = $self->systemLink(
-			$urlpath->newFromModule('WeBWorK::ContentGenerator::Instructor::Scoring', $r, courseID => $courseName),
-			params => {
-				scoreSelected => "ScoreSelected",
-				selectedSet   => \@setsToScore,
-			}
-		);
+		return unless @setsToScore;
 
-		$self->reply_with_redirect($uri);
+		$c->reply_with_redirect($c->systemLink(
+			$c->url_for('instructor_scoring'),
+			params => { scoreSelected => 'ScoreSelected', selectedSet => \@setsToScore }
+		));
 	}
-}
 
-sub initialize {
+	return;
+}
 
-	my ($self)       = @_;
-	my $r            = $self->r;
-	my $urlpath      = $r->urlpath;
-	my $db           = $r->db;
-	my $ce           = $r->ce;
-	my $authz        = $r->authz;
-	my $courseName   = $urlpath->arg("courseID");
-	my $setID        = $urlpath->arg("setID");
-	my $user         = $r->param('user');
+sub initialize ($c) {
+	my $db         = $c->db;
+	my $ce         = $c->ce;
+	my $authz      = $c->authz;
+	my $courseName = $c->stash('courseID');
+	my $setID      = $c->stash('setID');
+	my $user       = $c->param('user');
+
+	# Make sure these are defined for the templats.
+	$c->stash->{fieldNames}  = VIEW_FIELD_ORDER();
+	$c->stash->{formsToShow} = VIEW_FORMS();
+	$c->stash->{formTitles}  = FORM_TITLES();
+	$c->stash->{formPerms}   = FORM_PERMS();
+	$c->stash->{fieldTypes}  = FIELD_TYPES();
+	$c->stash->{sets}        = [];
 
 	# Determine if the user has permisson to do anything here.
 	return unless $authz->hasPermissions($user, 'access_instructor_tools');
 
 	# Determine if edit mode or export mode is request, and check permissions for these modes.
-	$self->{editMode} = $r->param("editMode") || 0;
-	return if $self->{editMode} and not $authz->hasPermissions($user, 'modify_problem_sets');
-
-	$self->{exportMode} = $r->param("exportMode") || 0;
-	return if $self->{exportMode} and not $authz->hasPermissions($user, 'modify_set_def_files');
-
-	my $root = $ce->{webworkURLs}->{root};
+	$c->{editMode} = $c->param("editMode") || 0;
+	return if $c->{editMode} && !$authz->hasPermissions($user, 'modify_problem_sets');
 
-	# Templates for getting field names
-	my $setTemplate = $self->{setTemplate} = $db->newGlobalSet;
+	$c->{exportMode} = $c->param("exportMode") || 0;
+	return if $c->{exportMode} && !$authz->hasPermissions($user, 'modify_set_def_files');
 
-	if (defined $r->param("visible_sets")) {
-		$self->{visibleSetIDs} = [ $r->param("visible_sets") ];
-	} elsif (defined $r->param("no_visible_sets")) {
-		$self->{visibleSetIDs} = [];
+	if (defined $c->param("visible_sets")) {
+		$c->{visibleSetIDs} = [ $c->param("visible_sets") ];
+	} elsif (defined $c->param("no_visible_sets")) {
+		$c->{visibleSetIDs} = [];
 	} else {
-		if (@{ $self->{allSetIDs} } > HIDE_SETS_THRESHOLD) {
-			$self->{visibleSetIDs} = [];
+		if (@{ $c->{allSetIDs} } > HIDE_SETS_THRESHOLD) {
+			$c->{visibleSetIDs} = [];
 		} else {
-			$self->{visibleSetIDs} = $self->{allSetIDs};
+			$c->{visibleSetIDs} = $c->{allSetIDs};
 		}
 	}
 
-	$self->{prevVisibleSetIDs} = $self->{visibleSetIDs};
+	$c->{prevVisibleSetIDs} = $c->{visibleSetIDs};
 
-	if (defined $r->param("selected_sets")) {
-		$self->{selectedSetIDs} = [ $r->param("selected_sets") ];
+	if (defined $c->param("selected_sets")) {
+		$c->{selectedSetIDs} = [ $c->param("selected_sets") ];
 	} else {
-		$self->{selectedSetIDs} = [];
+		$c->{selectedSetIDs} = [];
 	}
 
-	$self->{primarySortField} = $r->param("primarySortField") || "due_date";
-	$self->{secondarySortField} = $r->param("secondarySortField") || "open_date";
+	$c->{primarySortField}   = $c->param("primarySortField")   || "due_date";
+	$c->{secondarySortField} = $c->param("secondarySortField") || "open_date";
 
-	#########################################
-	#  call action handler
-	#########################################
-
-	my $actionID = $r->param("action");
-	$self->{actionID} = $actionID;
+	# Call action handler
+	my $actionID = $c->param("action");
+	$c->{actionID} = $actionID;
 	if ($actionID) {
 		unless (grep { $_ eq $actionID } @{ VIEW_FORMS() }, @{ EDIT_FORMS() }, @{ EXPORT_FORMS() }) {
-			die $r->maketext("Action [_1] not found", $actionID);
+			die $c->maketext("Action [_1] not found", $actionID);
 		}
 		# Check permissions
 		if (not FORM_PERMS()->{$actionID} or $authz->hasPermissions($user, FORM_PERMS()->{$actionID})) {
 			my $actionHandler = "${actionID}_handler";
-			my %genericParams;
-			foreach my $param (qw(selected_sets)) {
-				$genericParams{$param} = [ $r->param($param) ];
+			my ($success, $action_result) = $c->$actionHandler;
+			if ($success) {
+				$c->addgoodmessage($c->b($c->maketext('Result of last action performed: [_1]', $action_result)));
+			} else {
+				$c->addbadmessage($c->b($c->maketext('Result of last action performed: [_1]', $action_result)));
 			}
-			my %actionParams = $self->getActionParams($actionID);
-			my %tableParams = $self->getTableParams();
-			$self->addmessage(CGI::div({ class => 'mb-1' }, $r->maketext("Results of last action performed") . ": "));
-			$self->addmessage($self->$actionHandler(\%genericParams, \%actionParams, \%tableParams));
 		} else {
-			return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-				CGI::p($r->maketext("You are not authorized to perform this action.")));
+			$c->addbadmessage($c->maketext('You are not authorized to perform this action.'));
 		}
 	} else {
-		$self->addgoodmessage($r->maketext("Please select action to be performed."));
-	}
-}
-
-sub body {
-	my ($self)       = @_;
-	my $r            = $self->r;
-	my $urlpath      = $r->urlpath;
-	my $db           = $r->db;
-	my $ce           = $r->ce;
-	my $authz        = $r->authz;
-	my $courseName   = $urlpath->arg("courseID");
-	my $setID        = $urlpath->arg("setID");
-	my $user         = $r->param('user');
-
-	my $root = $ce->{webworkURLs}->{root};
-
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-		$r->maketext("You are not authorized to access the instructor tools."))
-		unless $authz->hasPermissions($user, "access_instructor_tools");
-
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-		CGI::p($r->maketext("You are not authorized to modify homework sets.")))
-		if $self->{editMode} and not $authz->hasPermissions($user, "modify_problem_sets");
-
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-		CGI::p($r->maketext("You are not authorized to modify set definition files.")))
-		if $self->{exportMode} and not $authz->hasPermissions($user, "modify_set_def_files");
-
-	# templates for getting field names
-	my $setTemplate = $self->{setTemplate} = $db->newGlobalSet;
-
-	# This table can be consulted when display-ready forms of field names are needed.
-	my %fieldHeaders;
-
-	@fieldHeaders{qw(
-		problems
-		users
-		filename
-		set_id
-		open_date
-		reduced_scoring_date
-		due_date
-		answer_date
-		visible
-		enable_reduced_scoring
-		hide_hint
-	)} = (
-		CGI::th({ id => 'problems_header' }, $r->maketext("Edit Problems")),
-		CGI::th({ id => 'users_header' }, $r->maketext("Edit Assigned Users")),
-		CGI::th({ id => 'filename_header' }, $r->maketext("Set Definition Filename")),
-		CGI::th(CGI::label({ for => 'select-all' }, $r->maketext("Edit Set Data"))),
-		CGI::th({ id => 'open_date_header' }, $r->maketext("Open Date")),
-		CGI::th({ id => 'reduced_scoring_date_header' }, $r->maketext("Reduced Scoring Date")),
-		CGI::th({ id => 'due_date_header' }, $r->maketext("Close Date")),
-		CGI::th({ id => 'answer_date_header' }, $r->maketext("Answer Date")),
-		CGI::th({ id => 'visible_header' }, $r->maketext("Visible")),
-		CGI::th($r->maketext("Reduced Scoring")),
-		CGI::th({ id => 'hide_hint_header' }, $r->maketext("Hide Hints"))
-	);
-
-	my $actionID = $self->{actionID};
-
-	# Retrieve values for member fields
-	my $editMode = $self->{editMode};
-	my $exportMode = $self->{exportMode};
-	my $primarySortField = $self->{primarySortField};
-	my $secondarySortField = $self->{secondarySortField};
-
-	# Get requested sets in the requested order.
-	my @Sets =
-		@{ $self->{visibleSetIDs} }
-		? $db->getGlobalSetsWhere({ set_id => $self->{visibleSetIDs} }, [ $primarySortField, $secondarySortField ])
-		: ();
-
-	########## print site identifying information
-
-	print CGI::input({
-		type  => 'button',
-		id    => 'show_hide',
-		value => $r->maketext('Show/Hide Site Description'),
-		class => 'btn btn-info mb-2'
-	});
-	print CGI::p(
-		{ id => 'site_description', style => 'display:none' },
-		CGI::em($r->maketext(
-			'This is the homework sets editor page where you can view and edit the homework sets that exist in this '
-				. 'course and the problems that they contain. The top of the page contains forms which allow you to '
-				. 'filter which sets to display in the table, sort the sets in a chosen order, edit homework sets, '
-				. 'publish homework sets, import/export sets from/to an external file, score sets, or create/delete '
-				. 'sets.  To use, please select the action you would like to perform, enter in the relevant '
-				. 'information in the fields below, and hit the "Take Action!" button at the bottom of the form.  The '
-				. 'bottom of the page contains a table displaying the sets and several pieces of relevant information. '
-				. 'The Edit Set Data field in the table contains checkboxes for selection and a link to the set data '
-				. 'editing page.  The cells in the Edit Problems fields contain links which take you to a page where '
-				. 'you can edit the containing problems, and the cells in the edit assigned users field contains links '
-				. 'which take you to a page where you can edit what students the set is assigned to.'
-		))
-	);
-
-	########## print beginning of form
-
-	print CGI::start_form({
-		method => 'post',
-		action => $self->systemLink($urlpath, authen => 0),
-		id     => 'problemsetlist',
-		name   => 'problemsetlist',
-		class  => 'font-sm'
-	});
-	print $self->hidden_authen_fields();
-
-	########## print state data
-
-	print "\n<!-- state data here -->\n";
-
-	if (@{ $self->{visibleSetIDs} }) {
-		print CGI::hidden(-name => "visible_sets", -value => $self->{visibleSetIDs});
-	} else {
-		print CGI::hidden(-name=>"no_visible_sets", -value=>"1");
-	}
-
-	if (@{ $self->{prevVisibleSetIDs} }) {
-		print CGI::hidden(-name => "prev_visible_sets", -value => $self->{prevVisibleSetIDs});
-	} else {
-		print CGI::hidden(-name => "no_prev_visible_sets", -value => "1");
-	}
-
-	print CGI::hidden(-name=>"editMode", -value=>$editMode);
-	print CGI::hidden(-name=>"exportMode", -value=>$exportMode);
-
-	print CGI::hidden(-name=>"primarySortField", -value=>$primarySortField);
-	print CGI::hidden(-name=>"secondarySortField", -value=>$secondarySortField);
-
-	print "\n<!-- state data here -->\n";
-
-	########## print action forms
-
-	print CGI::p(CGI::b($r->maketext("Any changes made below will be reflected in the set for ALL students."))) if $editMode;
-
-	print CGI::p($r->maketext("Select an action to perform").":");
-
-	my @formsToShow;
-	if ($editMode) {
-		@formsToShow = @{ EDIT_FORMS() };
-	} elsif ($exportMode) {
-		@formsToShow = @{ EXPORT_FORMS() };
-	} else {
-		@formsToShow = @{ VIEW_FORMS() };
+		$c->addgoodmessage($c->maketext("Please select action to be performed."));
 	}
-	my %formTitles = %{ FORM_TITLES() };
-
-	my @tabArr;
-	my @contentArr;
-	my $default_choice;
-
-	for my $actionID (@formsToShow) {
-		# Check permissions
-		next if FORM_PERMS()->{$actionID} and not $authz->hasPermissions($user, FORM_PERMS()->{$actionID});
-
-		my $actionForm = "${actionID}_form";
 
-		my $active = '';
-		$active = ' active', $default_choice = $actionID unless $default_choice;
-
-		push(
-			@tabArr,
-			CGI::li(
-				{ class => 'nav-item', role => 'presentation' },
-				CGI::a(
-					{
-						href           => "#$actionID",
-						class          => "nav-link action-link$active",
-						id             => "$actionID-tab",
-						data_action    => $actionID,
-						data_bs_toggle => 'tab',
-						data_bs_target => "#$actionID",
-						role           => 'tab',
-						aria_controls  => $actionID,
-						aria_selected  => $active ? 'true' : 'false'
-					},
-					$r->maketext($formTitles{$actionID})
-				)
-			)
-		);
-		push(
-			@contentArr,
-			CGI::div(
-				{
-					class           => 'tab-pane fade mb-2' . ($active ? " show$active" : ''),
-					id              => $actionID,
-					role            => 'tabpanel',
-					aria_labelledby => "$actionID-tab"
-				},
-				$self->$actionForm($self->getActionParams($actionID))
-			)
-		);
+	$c->stash->{fieldNames} =
+		$c->{editMode} ? EDIT_FIELD_ORDER() : $c->{exportMode} ? EXPORT_FIELD_ORDER() : VIEW_FIELD_ORDER();
+	if (!$c->ce->{pg}{ansEvalDefaults}{enableReducedScoring}) {
+		$c->stash->{fieldNames} =
+			[ grep { !/enable_reduced_scoring|reduced_scoring_date/ } @{ $c->stash->{fieldNames} } ];
 	}
 
-	print CGI::hidden(-name => 'action', -id => 'current_action', -value => $default_choice);
-	print CGI::div(
-		CGI::ul({ class => 'nav nav-tabs mb-2', role => 'tablist' }, @tabArr),
-		CGI::div({ class => 'tab-content' }, @contentArr)
-	);
-
-	print CGI::submit({
-		id    => 'take_action',
-		value => $r->maketext('Take Action!'),
-		class => 'btn btn-primary mb-3'
-	});
-
-	########## print table
-
-	########## first adjust heading if in editMode
-	$fieldHeaders{set_id} = CGI::th($r->maketext("Edit Set")) if $editMode;
-	$fieldHeaders{enable_reduced_scoring} =
-		CGI::th({ id => 'enable_reduced_scoring_header' }, $r->maketext('Enable Reduced Scoring'))
-		if $editMode;
-
-
-	print CGI::p(
-		$r->maketext(
-			"Showing [_1] out of [_2] sets.",
-			scalar @{ $self->{visibleSetIDs} },
-			scalar @{ $self->{allSetIDs} }
-		)
-	);
-
-	$self->printTableHTML(
-		\@Sets, \%fieldHeaders,
-		editMode       => $editMode,
-		exportMode     => $exportMode,
-		selectedSetIDs => $self->{selectedSetIDs},
-	);
-
-	########## print end of form
-
- 	print CGI::end_form();
-
-	return "";
-}
-
-################################################################################
-# extract particular params and put them in a hash (values are ARRAYREFs!)
-################################################################################
-
-sub getActionParams {
-	my ($self, $actionID) = @_;
-	my $r = $self->{r};
-
-	my %actionParams;
-	foreach my $param ($r->param) {
-		next unless $param =~ m/^action\.$actionID\./;
-		$actionParams{$param} = [ $r->param($param) ];
-	}
-	return %actionParams;
-}
-
-sub getTableParams {
-	my ($self) = @_;
-	my $r = $self->{r};
-
-	my %tableParams;
-	foreach my $param ($r->param) {
-		next unless $param =~ m/^(?:.*set)\./;
-		$tableParams{$param} = [ $r->param($param) ];
-	}
-	return %tableParams;
+	$c->stash->{formsToShow} = $c->{editMode} ? EDIT_FORMS() : $c->{exportMode} ? EXPORT_FORMS() : VIEW_FORMS();
+	# Get requested sets in the requested order.
+	$c->stash->{sets} = [
+		@{ $c->{visibleSetIDs} }
+		? $db->getGlobalSetsWhere({ set_id => $c->{visibleSetIDs} },
+			[ $c->{primarySortField}, $c->{secondarySortField} ])
+		: ()
+	];
+
+	return;
 }
 
-################################################################################
-# actions and action triggers
-################################################################################
+# Action handlers
+# The forms for the actions are templates.
 
-# filter, edit, cancelEdit, and saveEdit should stay with the display module and
-# not be real "actions". that way, all actions are shown in view mode and no
+# filter, edit, cancel_edit, and save_edit should stay with the display module and
+# not be real "actions". That way, all actions are shown in view mode and no
 # actions are shown in edit mode.
 
-sub filter_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	return CGI::div(
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'filter_select', class => 'col-form-label col-form-label-sm col-sm-auto' },
-				$r->maketext('Show which sets?')
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					id      => 'filter_select',
-					name    => 'action.filter.scope',
-					values  => [qw(all none selected match_ids visible unvisible)],
-					default => $actionParams{'action.filter.scope'}[0] || 'match_ids',
-					class   => 'form-select form-select-sm',
-					labels  => {
-						all       => $r->maketext('all sets'),
-						none      => $r->maketext('no sets'),
-						selected  => $r->maketext('selected sets'),
-						visible   => $r->maketext('sets visible to students'),
-						unvisible => $r->maketext('sets hidden from students'),
-						match_ids => $r->maketext('enter matching set IDs below'),
-					}
-				})
-			)
-		),
-		CGI::div(
-			{ id => 'filter_elements', class => 'row mb-2' },
-			CGI::label(
-				{ for => 'filter_text', class => 'col-form-label col-form-label-sm col-sm-auto' },
-				$r->maketext('Match on what? (separate multiple IDs with commas)')
-					. CGI::span({ class => 'required-field' }, '*')
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::textfield({
-					id            => 'filter_text',
-					name          => 'action.filter.set_ids',
-					value         => $actionParams{'action.filter.set_ids'}[0] // '',
-					aria_required => 'true',
-					class         => 'form-control form-control-sm',
-					dir           => 'ltr'
-				})
-			)
-		),
-		CGI::div(
-			{ id => 'filter_err_msg', class => 'alert alert-danger p-1 mb-2 d-inline-flex d-none' },
-			$r->maketext('Please enter in a value to match in the filter field.')
-		)
-	);
-}
-
-# this action handler modifies the "visibleSetIDs" field based on the contents
-# of the "action.filter.scope" parameter and the "selected_sets"
-sub filter_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-
-	my $r  = $self->r;
-	my $db = $r->db;
+# This action handler modifies the "visibleSetIDs" field based on the contents
+# of the "action.filter.scope" parameter and the "selected_sets".
+sub filter_handler ($c) {
+	my $db = $c->db;
 
 	my $result;
 
-	my $scope = $actionParams->{"action.filter.scope"}->[0];
+	my $scope = $c->param('action.filter.scope');
 
 	if ($scope eq "all") {
-		$result = $r->maketext("showing all sets");
-		$self->{visibleSetIDs} = $self->{allSetIDs};
+		$result = $c->maketext("showing all sets");
+		$c->{visibleSetIDs} = $c->{allSetIDs};
 	} elsif ($scope eq "none") {
-		$result = $r->maketext("showing no sets");
-		$self->{visibleSetIDs} = [];
+		$result = $c->maketext("showing no sets");
+		$c->{visibleSetIDs} = [];
 	} elsif ($scope eq "selected") {
-		$result = $r->maketext("showing selected sets");
-		$self->{visibleSetIDs} = $genericParams->{selected_sets};
+		$result = $c->maketext("showing selected sets");
+		$c->{visibleSetIDs} = [ $c->param('selected_sets') ];
 	} elsif ($scope eq "match_ids") {
-		$result = $r->maketext("showing matching sets");
-		my @searchTerms = map { format_set_name_internal($_) } split /\s*,\s*/,
-			$actionParams->{'action.filter.set_ids'}[0];
-		my $regexTerms = join('|', @searchTerms);
-		my @setIDs     = grep {/$regexTerms/i} @{ $self->{allSetIDs} };
-		$self->{visibleSetIDs} = \@setIDs;
+		$result = $c->maketext("showing matching sets");
+		my @searchTerms = map { format_set_name_internal($_) } split /\s*,\s*/, $c->param('action.filter.set_ids');
+		my $regexTerms  = join('|', @searchTerms);
+		my @setIDs      = grep {/$regexTerms/i} @{ $c->{allSetIDs} };
+		$c->{visibleSetIDs} = \@setIDs;
 	} elsif ($scope eq "visible") {
-		$result = $r->maketext("showing sets that are visible to students");
-		$self->{visibleSetIDs} = [ map { $_->[0] } $db->listGlobalSetsWhere({ visible => 1 }) ];
+		$result = $c->maketext("showing sets that are visible to students");
+		$c->{visibleSetIDs} = [ map { $_->[0] } $db->listGlobalSetsWhere({ visible => 1 }) ];
 	} elsif ($scope eq "unvisible") {
-		$result = $r->maketext("showing sets that are hidden from students");
-		$self->{visibleSetIDs} = [ map { $_->[0] } $db->listGlobalSetsWhere({ visible => 0 }) ];
+		$result = $c->maketext("showing sets that are hidden from students");
+		$c->{visibleSetIDs} = [ map { $_->[0] } $db->listGlobalSetsWhere({ visible => 0 }) ];
 	}
 
-	return CGI::div({ class => 'alert alert-success p-1 mb-0' }, $result);
-}
-
-sub sort_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	return CGI::div(
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'sort_select_1', class => 'col-form-label col-form-label-sm', style => 'width:4.5rem' },
-				$r->maketext('Sort by') . ':'
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					id      => 'sort_select_1',
-					name    => 'action.sort.primary',
-					values  => [qw(set_id open_date due_date answer_date visible)],
-					default => $actionParams{'action.sort.primary'}[0] || 'due_date',
-					class   => 'form-select form-select-sm',
-					labels  => {
-						set_id      => $r->maketext('Set Name'),
-						open_date   => $r->maketext('Open Date'),
-						due_date    => $r->maketext('Close Date'),
-						answer_date => $r->maketext('Answer Date'),
-						visible     => $r->maketext('Visibility'),
-					}
-				})
-			)
-		),
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'sort_select_2', class => 'col-form-label col-form-label-sm', style => 'width:4.5rem' },
-				$r->maketext('Then by') . ':'
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					id      => 'sort_select_2',
-					name    => 'action.sort.secondary',
-					values  => [qw(set_id open_date due_date answer_date visible)],
-					default => $actionParams{'action.sort.secondary'}[0] || 'open_date',
-					class   => 'form-select form-select-sm',
-					labels  => {
-						set_id      => $r->maketext('Set Name'),
-						open_date   => $r->maketext('Open Date'),
-						due_date    => $r->maketext('Close Date'),
-						answer_date => $r->maketext('Answer Date'),
-						visible     => $r->maketext('Visibility'),
-					}
-				})
-			)
-		)
-	);
+	return (1, $result);
 }
 
-sub sort_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r = $self->r;
-
-	my $primary = $actionParams->{"action.sort.primary"}->[0];
-	my $secondary = $actionParams->{"action.sort.secondary"}->[0];
+sub sort_handler ($c) {
+	my $primary   = $c->param('action.sort.primary');
+	my $secondary = $c->param('action.sort.secondary');
 
-	$self->{primarySortField} = $primary;
-	$self->{secondarySortField} = $secondary;
+	$c->{primarySortField}   = $primary;
+	$c->{secondarySortField} = $secondary;
 
 	my %names = (
-		set_id		=> $r->maketext("Set Name"),
-		open_date	=> $r->maketext("Open Date"),
-		due_date	=> $r->maketext("Close Date"),
-		answer_date	=> $r->maketext("Answer Date"),
-		visible	=> $r->maketext("Visibility"),
+		set_id      => $c->maketext("Set Name"),
+		open_date   => $c->maketext("Open Date"),
+		due_date    => $c->maketext("Close Date"),
+		answer_date => $c->maketext("Answer Date"),
+		visible     => $c->maketext("Visibility"),
 	);
 
-	return CGI::div({ class => 'alert alert-success p-1 mb-0' },
-		$r->maketext("Sort by [_1] and then by [_2]", $names{$primary}, $names{$secondary}));
+	return (1, $c->maketext("Sort by [_1] and then by [_2]", $names{$primary}, $names{$secondary}));
 }
 
-
-sub edit_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	return CGI::div(
-		{ class => 'row mb-2' },
-		CGI::label(
-			{ for => 'edit_select', class => 'col-form-label col-form-label-sm col-auto' },
-			$r->maketext('Edit which sets?')
-		),
-		CGI::div(
-			{ class => 'col-auto' },
-			CGI::popup_menu({
-				id      => 'edit_select',
-				name    => 'action.edit.scope',
-				values  => [qw(all visible selected)],
-				default => $actionParams{'action.edit.scope'}[0] || 'selected',
-				class   => 'form-select form-select-sm',
-				labels  => {
-					all      => $r->maketext('all sets'),
-					visible  => $r->maketext('listed sets'),
-					selected => $r->maketext('selected sets'),
-				}
-			})
-		)
-	);
-}
-
-sub edit_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r = $self->r;
-
+sub edit_handler ($c) {
 	my $result;
 
-	my $scope = $actionParams->{"action.edit.scope"}->[0];
+	my $scope = $c->param('action.edit.scope');
 	if ($scope eq "all") {
-		$result = $r->maketext("editing all sets");
-		$self->{visibleSetIDs} = $self->{allSetIDs};
+		$result = $c->maketext("editing all sets");
+		$c->{visibleSetIDs} = $c->{allSetIDs};
 	} elsif ($scope eq "visible") {
-		$result = $r->maketext("editing listed sets");
+		$result = $c->maketext("editing listed sets");
 		# leave visibleSetIDs alone
 	} elsif ($scope eq "selected") {
-		$result = $r->maketext("editing selected sets");
-		$self->{visibleSetIDs} = $genericParams->{selected_sets}; # an arrayref
+		$result = $c->maketext("editing selected sets");
+		$c->{visibleSetIDs} = [ $c->param('selected_sets') ];
 	}
-	$self->{editMode} = 1;
+	$c->{editMode} = 1;
 
-	return CGI::div({ class => 'alert alert-success p-1 mb-0' }, $result);
+	return (1, $result);
 }
 
-sub publish_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	return CGI::div(
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'publish_filter_select', class => 'col-form-label col-form-label-sm col-sm-auto' },
-				$r->maketext('Choose which sets to be affected') . ':'
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					id      => 'publish_filter_select',
-					name    => 'action.publish.scope',
-					values  => [qw(none all visible selected)],
-					default => $actionParams{'action.publish.scope'}[0] || 'selected',
-					class   => 'form-select form-select-sm',
-					labels  => {
-						none     => $r->maketext('no sets'),
-						all      => $r->maketext('all sets'),
-						visible  => $r->maketext('listed sets'),
-						selected => $r->maketext('selected sets'),
-					}
-				})
-			)
-		),
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'publish_visibility_select', class => 'col-form-label col-form-label-sm col-sm-auto' },
-				$r->maketext('Choose visibility of the sets to be affected') . ':'
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					id      => 'publish_visibility_select',
-					name    => 'action.publish.value',
-					values  => [ 0, 1 ],
-					default => $actionParams{'action.publish.value'}->[0] || '1',
-					class   => 'form-select form-select-sm d-inline w-auto',
-					labels  => {
-						0 => $r->maketext('Hidden'),
-						1 => $r->maketext('Visible'),
-					}
-				})
-			)
-		)
-	);
-}
-
-sub publish_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-
-	my $r  = $self->r;
-	my $db = $r->db;
+sub publish_handler ($c) {
+	my $db = $c->db;
 
-	my $result = "";
+	my @result;
 
-	my $scope = $actionParams->{"action.publish.scope"}->[0];
-	my $value = $actionParams->{"action.publish.value"}->[0];
-
-	my $verb = $value ? $r->maketext("made visible for") : $r->maketext("hidden from");
+	my $scope = $c->param('action.publish.scope');
+	my $value = $c->param('action.publish.value');
 
 	my @setIDs;
 
 	if ($scope eq "none") {
 		@setIDs = ();
-		$result = CGI::div({ class => 'alert alert-danger p-1 mb-0' }, $r->maketext("No change made to any set"));
+		@result = (0, $c->maketext("No change made to any set"));
 	} elsif ($scope eq "all") {
-		@setIDs = @{ $self->{allSetIDs} };
-		$result = $value
-			? CGI::div({ class => 'alert alert-success p-1 mb-0' },
-				$r->maketext("All sets made visible for all students"))
-			: CGI::div({ class => 'alert alert-success p-1 mb-0' }, $r->maketext("All sets hidden from all students"));
+		@setIDs = @{ $c->{allSetIDs} };
+		@result =
+			$value
+			? (1, $c->maketext("All sets made visible for all students"))
+			: (1, $c->maketext("All sets hidden from all students"));
 	} elsif ($scope eq "visible") {
-		@setIDs = @{ $self->{visibleSetIDs} };
-		$result = $value
-			? CGI::div({ class => 'alert alert-success p-1 mb-0' },
-				$r->maketext("All listed sets were made visible for all the students"))
-			: CGI::div({ class => 'alert alert-success p-1 mb-0' },
-				$r->maketext("All listed sets were hidden from all the students"));
+		@setIDs = @{ $c->{visibleSetIDs} };
+		@result =
+			$value
+			? (1, $c->maketext("All listed sets were made visible for all the students"))
+			: (1, $c->maketext("All listed sets were hidden from all the students"));
 	} elsif ($scope eq "selected") {
-		@setIDs = @{ $genericParams->{selected_sets} };
-		$result = $value
-			? CGI::div({ class => 'alert alert-success p-1 mb-0' },
-				$r->maketext("All selected sets made visible for all students"))
-			: CGI::div({ class => 'alert alert-success p-1 mb-0' },
-				$r->maketext("All selected sets hidden from all students"));
+		@setIDs = $c->param('selected_sets');
+		@result =
+			$value
+			? (1, $c->maketext("All selected sets made visible for all students"))
+			: (1, $c->maketext("All selected sets hidden from all students"));
 	}
 
 	# Can we use UPDATE here, instead of fetch/change/store?
 	my @sets = $db->getGlobalSets(@setIDs);
 	map { $_->visible($value); $db->putGlobalSet($_); } @sets;
 
-	return CGI::div({ class => 'alert alert-success p-1 mb-0' }, $result);
-}
-
-sub score_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	return CGI::div(
-		{ class => 'row mb-2' },
-		CGI::label(
-			{ for => 'score_select', class => 'col-form-label col-form-label-sm col-auto' },
-			$r->maketext('Score which sets?')
-		),
-		CGI::div(
-			{ class => 'col-auto' },
-			CGI::popup_menu({
-				id      => 'score_select',
-				name    => 'action.score.scope',
-				values  => [qw(none all selected)],
-				default => $actionParams{'action.score.scope'}[0] || 'none',
-				class   => 'form-select form-select-sm',
-				labels  => {
-					none     => $r->maketext('no sets'),
-					all      => $r->maketext('all sets'),
-					selected => $r->maketext('selected sets'),
-				}
-			})
-		)
-	);
-}
-
-sub score_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-
-	my $r      = $self->r;
-	my $urlpath = $r->urlpath;
-	my $courseName = $urlpath->arg("courseID");
-
-	my $scope = $actionParams->{"action.score.scope"}->[0];
-	my @setsToScore;
-
-	if ($scope eq "none") {
-		@setsToScore = ();
-		return $r->maketext("No sets selected for scoring");
-	} elsif ($scope eq "all") {
-		@setsToScore = @{ $self->{allSetIDs} };
-	} elsif ($scope eq "visible") {
-		@setsToScore = @{ $self->{visibleSetIDs} };
-	} elsif ($scope eq "selected") {
-		@setsToScore = @{ $genericParams->{selected_sets} };
-	}
-
-	my $uri = $self->systemLink( $urlpath->newFromModule('WeBWorK::ContentGenerator::Instructor::Scoring',$r, courseID=>$courseName),
-					params=>{
-						scoreSelected=>"Score Selected",
-						selectedSet=>\@setsToScore,
-#						recordSingleSetScores=>''
-					}
-	);
-
-
-	return $uri;
+	return @result;
 }
 
-
-sub delete_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	return CGI::div(
-		CGI::div(
-			{ class => 'd-inline-block alert alert-danger p-1 mb-2' },
-			CGI::em($r->maketext('Warning: Deletion destroys all set-related data and is not undoable!'))
-		),
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'delete_select', class => 'col-form-label col-form-label-sm col-auto' },
-				$r->maketext('Delete which sets?')
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					id      => 'delete_select',
-					name    => 'action.delete.scope',
-					values  => [qw(none selected)],
-					default => $actionParams{'action.delete.scope'}[0] || 'none',
-					class   => 'form-select form-select-sm',
-					labels  => {
-						none     => $r->maketext('no sets'),
-						selected => $r->maketext('selected sets'),
-					}
-				})
-			)
-		)
-	);
+sub score_handler ($c) {
+	# The only time this is called is if "no sets" is selected (do we really need that option),
+	# or one of the other options was selected but there were no sets to score.
+	return (0, $c->maketext('No sets selected for scoring.'));
 }
 
-sub delete_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+sub delete_handler ($c) {
+	my $db = $c->db;
 
-	my $r  = $self->r;
-	my $db = $r->db;
-
-	my $scope = $actionParams->{"action.delete.scope"}->[0];
+	my $scope = $c->param('action.delete.scope');
 
 	my @setIDsToDelete = ();
 
 	if ($scope eq "selected") {
-		@setIDsToDelete = @{ $self->{selectedSetIDs} };
+		@setIDsToDelete = @{ $c->{selectedSetIDs} };
 	}
 
-	my %allSetIDs      = map { $_ => 1 } @{ $self->{allSetIDs} };
-	my %visibleSetIDs  = map { $_ => 1 } @{ $self->{visibleSetIDs} };
-	my %selectedSetIDs = map { $_ => 1 } @{ $self->{selectedSetIDs} };
+	my %allSetIDs      = map { $_ => 1 } @{ $c->{allSetIDs} };
+	my %visibleSetIDs  = map { $_ => 1 } @{ $c->{visibleSetIDs} };
+	my %selectedSetIDs = map { $_ => 1 } @{ $c->{selectedSetIDs} };
 
 	foreach my $setID (@setIDsToDelete) {
 		delete $allSetIDs{$setID};
@@ -1087,120 +414,72 @@ sub delete_handler {
 		$db->deleteGlobalSet($setID);
 	}
 
-	$self->{allSetIDs}      = [ keys %allSetIDs ];
-	$self->{visibleSetIDs}  = [ keys %visibleSetIDs ];
-	$self->{selectedSetIDs} = [ keys %selectedSetIDs ];
+	$c->{allSetIDs}      = [ keys %allSetIDs ];
+	$c->{visibleSetIDs}  = [ keys %visibleSetIDs ];
+	$c->{selectedSetIDs} = [ keys %selectedSetIDs ];
 
 	my $num = @setIDsToDelete;
-	return CGI::div({ class => 'alert alert-success p-1 mb-0' }, $r->maketext('deleted [_1] sets', $num));
-}
-
-sub create_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	return CGI::div(
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'create_text', class => 'col-form-label col-form-label-sm col-auto' },
-				$r->maketext('Name the new set') . CGI::span({ class => 'required-field' }, '*') . ':'
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::textfield({
-					id            => 'create_text',
-					name          => 'action.create.name',
-					value         => $actionParams{'action.create.name'}[0] || '',
-					maxlength     => '100',
-					aria_required => 'true',
-					class         => 'form-control form-control-sm',
-					dir           => 'ltr'
-				})
-			)
-		),
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'create_select', class => 'col-form-label col-form-label-sm col-auto' },
-				$r->maketext("Create as what type of set?")
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					id      => 'create_select',
-					name    => 'action.create.type',
-					values  => [qw(empty copy)],
-					default => $actionParams{'action.create.type'}[0] || 'empty',
-					class   => 'form-select form-select-sm',
-					labels  => {
-						empty => $r->maketext('a new empty set'),
-						copy  => $r->maketext('a duplicate of the first selected set'),
-					}
-				})
-			)
-		)
-	);
+	return (1, $c->maketext('deleted [_1] sets', $num));
 }
 
-sub create_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+sub create_handler ($c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
 
-	my $r      = $self->r;
-	my $db     = $r->db;
-	my $ce     = $r->ce;
-
-	my $newSetID = format_set_name_internal($actionParams->{'action.create.name'}[0] // '');
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-		$r->maketext("Failed to create new set: set name cannot exceed 100 characters."))
+	my $newSetID = format_set_name_internal($c->param('action.create.name') // '');
+	return (0, $c->maketext("Failed to create new set: Set name cannot exceed 100 characters."))
 		if (length($newSetID) > 100);
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-		$r->maketext("Failed to create new set: no set name specified!"))
-		unless $newSetID =~ /\S/;
-	return CGI::div(
-		{ class => 'alert alert-danger p-1 mb-0' },
-		$r->maketext(
-			"The set name '[_1]' is already in use.  Pick a different name if you would like to start a new set.",
-			$newSetID)
-			. " "
-			. $r->maketext("No set created.")
+	return (0, $c->maketext("Failed to create new set: No set name specified.")) unless $newSetID =~ /\S/;
+	return (
+		0,
+		$c->maketext(
+			'Failed to create new set: Invalid characters in set name "[_1]". '
+				. 'A set name may only contain letters, numbers, hyphens, periods, and spaces.',
+			$newSetID =~ s/_/ /gr
+		)
+	) unless $newSetID =~ m/^[-a-zA-Z0-9_.]*$/;
+	return (
+		0,
+		$c->maketext(
+			'The set name "[_1]" is already in use. Pick a different name if you would like to start a new set. '
+				. 'No set created.',
+			$newSetID
+		)
 	) if $db->existsGlobalSet($newSetID);
 
 	my $newSetRecord = $db->newGlobalSet;
-	my $oldSetID = $self->{selectedSetIDs}->[0];
+	my $oldSetID     = $c->{selectedSetIDs}->[0];
 
-	my $type = $actionParams->{"action.create.type"}->[0];
+	my $type = $c->param('action.create.type');
 	# It's convenient to set the due date two weeks from now so that it is
 	# not accidentally available to students.
 
-	my $dueDate = time+2*ONE_WEEK();
+	my $dueDate    = time + 2 * ONE_WEEK();
 	my $display_tz = $ce->{siteDefaults}{timezone};
-	my $fDueDate = $self->formatDateTime($dueDate, $display_tz, "%m/%d/%Y at %I:%M%P");
-	my $dueTime = $ce->{pg}{timeAssignDue};
+	my $fDueDate   = $c->formatDateTime($dueDate, $display_tz, "%m/%d/%Y at %I:%M%P");
+	my $dueTime    = $ce->{pg}{timeAssignDue};
 
 	# We replace the due time by the one from the config variable
 	# and try to bring it back to unix time if possible
 	$fDueDate =~ s/\d\d:\d\d(am|pm|AM|PM)/$dueTime/;
 
-	$dueDate = $self->parseDateTime($fDueDate, $display_tz);
+	$dueDate = $c->parseDateTime($fDueDate, $display_tz);
 
 	if ($type eq "empty") {
 		$newSetRecord->set_id($newSetID);
 		$newSetRecord->set_header("defaultHeader");
 		$newSetRecord->hardcopy_header("defaultHeader");
 		#Rest of the dates are set according to to course configuration
-		$newSetRecord->open_date($dueDate - 60*$ce->{pg}{assignOpenPriorToDue});
-		$newSetRecord->reduced_scoring_date($dueDate - 60*$ce->{pg}{ansEvalDefaults}{reducedScoringPeriod});
+		$newSetRecord->open_date($dueDate - 60 * $ce->{pg}{assignOpenPriorToDue});
+		$newSetRecord->reduced_scoring_date($dueDate - 60 * $ce->{pg}{ansEvalDefaults}{reducedScoringPeriod});
 		$newSetRecord->due_date($dueDate);
-		$newSetRecord->answer_date($dueDate + 60*$ce->{pg}{answersOpenAfterDueDate});
-		$newSetRecord->visible(DEFAULT_VISIBILITY_STATE());	# don't want students to see an empty set
+		$newSetRecord->answer_date($dueDate + 60 * $ce->{pg}{answersOpenAfterDueDate});
+		$newSetRecord->visible(DEFAULT_VISIBILITY_STATE());    # don't want students to see an empty set
 		$newSetRecord->enable_reduced_scoring(DEFAULT_ENABLED_REDUCED_SCORING_STATE());
 		$newSetRecord->assignment_type('default');
 		$db->addGlobalSet($newSetRecord);
 	} elsif ($type eq "copy") {
-		return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-			$r->maketext('Failed to duplicate set: no set selected for duplication!'))
-			unless $oldSetID =~ /\S/;
+		return (0, $c->maketext('Failed to duplicate set: no set selected for duplication!')) unless $oldSetID =~ /\S/;
 		$newSetRecord = $db->getGlobalSet($oldSetID);
 		$newSetRecord->set_id($newSetID);
 		$db->addGlobalSet($newSetRecord);
@@ -1217,11 +496,11 @@ sub create_handler {
 			$_->set_id($newSetID);
 			$db->addGlobalSetLocation($_);
 		}
-		if ( $newSetRecord->restricted_login_proctor eq 'Yes' ) {
+		if ($newSetRecord->restricted_login_proctor eq 'Yes') {
 			my $procUser = $db->getUser("set_id:$oldSetID");
 			$procUser->user_id("set_id:$newSetID");
-			eval { $db->addUser( $procUser ) };
-			if ( ! $@ ) {
+			eval { $db->addUser($procUser) };
+			if (!$@) {
 				my $procPerm = $db->getPermissionLevel("set_id:$oldSetID");
 				$procPerm->user_id("set_id:$newSetID");
 				$db->addPermissionLevel($procPerm);
@@ -1231,406 +510,199 @@ sub create_handler {
 			}
 		}
 	}
-    # Assign set to current active user.
-	my $userName = $r->param('user');
-	$self->assignSetToUser($userName, $newSetRecord);    # Cures weird date error when no-one assigned to set.
-	$self->addgoodmessage($r->maketext(
+	# Assign set to current active user.
+	my $userName = $c->param('user');
+	assignSetToUser($db, $userName, $newSetRecord);    # Cures weird date error when no-one assigned to set.
+	$c->addgoodmessage($c->maketext(
 		'Set [_1] was assigned to [_2].',
-		CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)), $userName
+		$c->tag('span', dir => 'ltr', format_set_name_display($newSetID)), $userName
 	));
 
-	push @{ $self->{visibleSetIDs} }, $newSetID;
-	push @{ $self->{allSetIds} }, $newSetID;
+	push @{ $c->{visibleSetIDs} }, $newSetID;
+	push @{ $c->{allSetIds} },     $newSetID;
 
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' }, $r->maketext('Failed to create new set: [_1]', $@))
-		if $@;
+	return (0, $c->maketext('Failed to create new set: [_1]', $@)) if $@;
 
-	return CGI::div(
-		{ class => 'alert alert-success p-1 mb-0' },
-		$r->maketext(
+	return (
+		1,
+		$c->b($c->maketext(
 			'Successfully created new set [_1]',
-			CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID))
-		)
-	);
-}
-
-sub import_form {
-	my ($self, %actionParams) = @_;
-
-	my $r     = $self->r;
-	my $authz = $r->authz;
-	my $user  = $r->param('user');
-	my $ce    = $r->ce;
-
-	return CGI::div(
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'import_amt_select', class => 'col-form-label col-form-label-sm col-md-auto' },
-				$r->maketext('Import how many sets?')
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					id      => 'import_amt_select',
-					name    => 'action.import.number',
-					values  => [ 1, 8 ],
-					default => $actionParams{'action.import.number'}[0] || '1',
-					class   => 'form-select form-select-sm',
-					labels  => {
-						1 => $r->maketext('a single set'),
-						8 => $r->maketext('multiple sets'),
-					}
-				})
-			)
-		),
-		CGI::div(
-			{ class => 'row align-items-center mb-2' },
-			CGI::label(
-				{ for => 'import_source_select', class => 'col-form-label col-form-label-sm col-md-auto' },
-				$r->maketext('Import from where?')
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					name    => 'action.import.source',
-					id      => 'import_source_select',
-					values  => [ '', $self->getDefList() ],
-					labels  => { '' => $r->maketext('Enter filenames below') },
-					default => defined($actionParams{'action.import.source'})
-					? $actionParams{'action.import.source'}
-					: '',
-					class => 'form-select form-select-sm',
-					dir   => 'ltr',
-					size  => $actionParams{'action.import.number'}[0] || '1',
-					defined($actionParams{'action.import.number'}[0])
-						&& $actionParams{'action.import.number'}[0] ne '1' ? (multiple => undef) : ()
-				})
-			)
-		),
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'import_text', class => 'col-form-label col-form-label-sm col-md-auto' },
-				$r->maketext('Import sets with names') . ':'
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::textfield({
-					id    => 'import_text',
-					name  => 'action.import.name',
-					value => $actionParams{'action.import.name'}[0] || '',
-					class => 'form-control form-control-sm',
-					dir   => 'ltr'
-				})
-			)
-		),
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'import_date_shift', class => 'col-form-label col-form-label-sm col-md-auto' },
-				$r->maketext('Shift dates so that the earliest is') . ':'
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::div(
-					{ class => 'input-group input-group-sm flatpickr' },
-					CGI::textfield({
-						id             => 'import_date_shift',
-						name           => 'action.import.start.date',
-						size           => '27',
-						value          => $actionParams{'action.import.start.date'}[0] || '',
-						class          => 'form-control',
-						data_input     => undef,
-						data_done_text => $r->maketext('Done'),
-						data_locale    => $ce->{language},
-						data_timezone  => $ce->{siteDefaults}{timezone}
-					}),
-					CGI::a(
-						{
-							class       => 'btn btn-secondary btn-sm',
-							data_toggle => undef,
-							role        => 'button',
-							tabindex    => 0,
-							aria_label  => $r->maketext('Pick date and time')
-						},
-						CGI::i({ class => 'fas fa-calendar-alt' }, '')
-					)
-				)
-			)
-		),
-		$authz->hasPermissions($user, 'assign_problem_sets') ? CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'import_users_select', class => 'col-form-label col-form-label-sm col-md-auto' },
-				$r->maketext('Assign this set to which users?')
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					id      => 'import_users_select',
-					name    => 'action.import.assign',
-					value   => [qw(user all)],
-					default => $actionParams{'action.import.assign'}[0] || 'none',
-					class   => 'form-select form-select-sm',
-					labels  => {
-						all  => $r->maketext('all current users') . '.',
-						user => $r->maketext('only') . ' ' . $user . '.',
-					}
-				})
-			)
-		) : ''    #user does not have permissions to assign problem sets
+			$c->tag('span', dir => 'ltr', format_set_name_display($newSetID))
+		))
 	);
 }
 
-sub import_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r = $self->r;
-
-	my ($added, $skipped) = $self->importSetsFromDef(
-		$actionParams->{"action.import.number"}[0] > 1
+sub import_handler ($c) {
+	my ($added, $skipped) = $c->importSetsFromDef(
+		$c->param('action.import.number') > 1
 		? ''    # Cannot assign set names to multiple imports.
-		: format_set_name_internal($actionParams->{'action.import.name'}[0]),
-		$actionParams->{'action.import.assign'}[0],
-		$actionParams->{'action.import.start.date'}[0] // 0,
-		@{ $actionParams->{'action.import.source'} }
+		: format_set_name_internal($c->param('action.import.name')),
+		$c->param('action.import.assign'),
+		$c->param('action.import.start.date') // 0,
+		$c->param('action.import.source')
 	);
 
 	# Make new sets visible.
-	push @{ $self->{visibleSetIDs} }, @$added;
-	push @{ $self->{allSetIDs} },     @$added;
+	push @{ $c->{visibleSetIDs} }, @$added;
+	push @{ $c->{allSetIDs} },     @$added;
 
 	my $numAdded   = @$added;
 	my $numSkipped = @$skipped;
 
-	return CGI::div(
-		{ class => 'alert alert-success p-1 mb-0' },
-		$r->maketext(
-			'[_1] sets added, [_2] sets skipped. Skipped sets: ([_3])',
-			$numAdded, $numSkipped, join(', ', @$skipped)
-		)
-	);
-}
-
-sub export_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	return CGI::div(
-		{ class => 'row mb-2' },
-		CGI::label(
-			{ for => 'export_select', class => 'col-form-label col-form-label-sm col-auto' },
-			$r->maketext('Prepare which sets for export?')
-		),
-		CGI::div(
-			{ class => 'col-auto' },
-			CGI::popup_menu({
-				id      => 'export_select',
-				name    => 'action.export.scope',
-				values  => [qw(all visible selected)],
-				default => $actionParams{'action.export.scope'}[0] || 'visible',
-				class   => 'form-select form-select-sm',
-				labels  => {
-					all      => $r->maketext('all sets'),
-					visible  => $r->maketext('listed sets'),
-					selected => $r->maketext('selected sets'),
-				}
-			})
+	return (
+		1,
+		$c->maketext(
+			'[_1] sets added, [_2] sets skipped. Skipped sets: ([_3])', $numAdded,
+			$numSkipped,                                                join(', ', @$skipped)
 		)
 	);
 }
 
 # this does not actually export any files, rather it sends us to a new page in order to export the files
-sub export_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r = $self->r;
-
+sub export_handler ($c) {
 	my $result;
 
-	my $scope = $actionParams->{"action.export.scope"}->[0];
+	my $scope = $c->param('action.export.scope');
 	if ($scope eq "all") {
-		$result = $r->maketext("All sets were selected for export.");
-		$self->{selectedSetIDs} = $self->{visibleSetIDs} = $self->{allSetIDs};
+		$result = $c->maketext("All sets were selected for export.");
+		$c->{selectedSetIDs} = $c->{visibleSetIDs} = $c->{allSetIDs};
 	} elsif ($scope eq "visible") {
-		$result = $r->maketext("Visible sets were selected for export.");
-		$self->{selectedSetIDs} = $self->{visibleSetIDs};
+		$result = $c->maketext("Visible sets were selected for export.");
+		$c->{selectedSetIDs} = $c->{visibleSetIDs};
 	} elsif ($scope eq "selected") {
-		$result = $r->maketext("Sets were selected for export.");
-		$self->{selectedSetIDs} = $self->{visibleSetIDs} = $genericParams->{selected_sets}; # an arrayref
+		$result = $c->maketext("Sets were selected for export.");
+		$c->{selectedSetIDs} = $c->{visibleSetIDs} = [ $c->param('selected_sets') ];
 	}
-	$self->{exportMode} = 1;
-
-	return CGI::div({ class => 'alert alert-success p-1 mb-0' }, $result);
-}
+	$c->{exportMode} = 1;
 
-sub cancelExport_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-	return CGI::span($r->maketext('Abandon export'));
+	return (1, $result);
 }
 
-sub cancelExport_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r      = $self->r;
-
-	#$self->{selectedSetIDs) = $self->{visibleSetIDs};
-		# only do the above if we arrived here via "edit selected users"
-	if (defined $r->param("prev_visible_sets")) {
-		$self->{visibleSetIDs} = [ $r->param("prev_visible_sets") ];
-	} elsif (defined $r->param("no_prev_visible_sets")) {
-		$self->{visibleSetIDs} = [];
+sub cancel_export_handler ($c) {
+	if (defined $c->param("prev_visible_sets")) {
+		$c->{visibleSetIDs} = [ $c->param("prev_visible_sets") ];
+	} elsif (defined $c->param("no_prev_visible_sets")) {
+		$c->{visibleSetIDs} = [];
 	} else {
 		# leave it alone
 	}
-	$self->{exportMode} = 0;
-
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' }, $r->maketext('export abandoned'));
-}
+	$c->{exportMode} = 0;
 
-sub saveExport_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-	return CGI::span($r->maketext('Confirm which sets to export.'));
+	return (0, $c->maketext('export abandoned'));
 }
 
-sub saveExport_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r           = $self->r;
+sub save_export_handler ($c) {
+	my @setIDsToExport = @{ $c->{selectedSetIDs} };
 
-	my @setIDsToExport = @{ $self->{selectedSetIDs} };
+	my %filenames = map { $_ => ($c->param("set.$_") || $_) } @setIDsToExport;
 
-	my %filenames = map { $_ => (@{ $tableParams->{"set.$_"} }[0] || $_) } @setIDsToExport;
+	my ($exported, $skipped, $reason) = $c->exportSetsToDef(%filenames);
 
-	my ($exported, $skipped, $reason) = $self->exportSetsToDef(%filenames);
-
-	if (defined $r->param("prev_visible_sets")) {
-		$self->{visibleSetIDs} = [ $r->param("prev_visible_sets") ];
-	} elsif (defined $r->param("no_prev_visble_sets")) {
-		$self->{visibleSetIDs} = [];
-	} else {
-		# leave it alone
+	if (defined $c->param("prev_visible_sets")) {
+		$c->{visibleSetIDs} = [ $c->param("prev_visible_sets") ];
+	} elsif (defined $c->param("no_prev_visble_sets")) {
+		$c->{visibleSetIDs} = [];
 	}
 
-	$self->{exportMode} = 0;
+	$c->{exportMode} = 0;
 
 	my $numExported = @$exported;
-	my $numSkipped = @$skipped;
-	my $resultFont = $numSkipped ? 'alert-danger' : 'alert-success';
+	my $numSkipped  = @$skipped;
 
 	my @reasons = map { "set $_ - " . $reason->{$_} } keys %$reason;
 
-	return CGI::div(
-		{ class => "alert $resultFont p-1 mb-0" },
-		$r->maketext(
+	return (
+		!$numSkipped,
+		$c->b($c->maketext(
 			'[_1] sets exported, [_2] sets skipped. Skipped sets: ([_3])',
-			$numExported, $numSkipped, ($numSkipped) ? CGI::ul(CGI::li(\@reasons)) : ''
-		)
+			$numExported, $numSkipped,
+			$numSkipped ? $c->tag('ul', $c->c(map { $c->tag('li', $_) } @reasons)->join('')) : ''
+		))
 	);
 }
 
-sub cancelEdit_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-	return CGI::span($r->maketext('Abandon changes'));
-}
-
-sub cancelEdit_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r      = $self->r;
-
-	#$self->{selectedSetIDs) = $self->{visibleSetIDs};
-		# only do the above if we arrived here via "edit selected users"
-	if (defined $r->param("prev_visible_sets")) {
-		$self->{visibleSetIDs} = [ $r->param("prev_visible_sets") ];
-	} elsif (defined $r->param("no_prev_visible_sets")) {
-		$self->{visibleSetIDs} = [];
+sub cancel_edit_handler ($c) {
+	if (defined $c->param("prev_visible_sets")) {
+		$c->{visibleSetIDs} = [ $c->param("prev_visible_sets") ];
+	} elsif (defined $c->param("no_prev_visible_sets")) {
+		$c->{visibleSetIDs} = [];
 	} else {
 		# leave it alone
 	}
-	$self->{editMode} = 0;
+	$c->{editMode} = 0;
 
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' }, $r->maketext('changes abandoned'));
+	return (0, $c->maketext('changes abandoned'));
 }
 
-sub saveEdit_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-	return CGI::span($r->maketext('Save changes'));
-}
+sub save_edit_handler ($c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
 
-sub saveEdit_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r           = $self->r;
-	my $db          = $r->db;
-	my $ce          = $r->ce;
-
-	my @visibleSetIDs = @{ $self->{visibleSetIDs} };
+	my @visibleSetIDs = @{ $c->{visibleSetIDs} };
 	foreach my $setID (@visibleSetIDs) {
-	        next unless defined($setID);
-		my $Set = $db->getGlobalSet($setID); # checked
+		next unless defined($setID);
+		my $Set = $db->getGlobalSet($setID);
 		# FIXME: we may not want to die on bad sets, they're not as bad as bad users
 		die "record for visible set $setID not found" unless $Set;
 
 		foreach my $field ($Set->NONKEYFIELDS()) {
-			my $param = "set.${setID}.${field}";
-			if (defined $tableParams->{$param}[0]) {
+			my $value = $c->param("set.$setID.$field");
+			if (defined $value) {
 				if ($field =~ /_date/) {
-					$Set->$field($tableParams->{$param}[0]);
+					$Set->$field($value);
 				} elsif ($field eq 'enable_reduced_scoring') {
 					# If we are enableing reduced scoring, make sure the reduced scoring date
 					# is set and in a proper interval.
-					my $value = $tableParams->{$param}[0];
 					$Set->enable_reduced_scoring($value);
 					if (!$Set->reduced_scoring_date) {
 						$Set->reduced_scoring_date(
 							$Set->due_date - 60 * $ce->{pg}{ansEvalDefaults}{reducedScoringPeriod});
 					}
 				} else {
-					$Set->$field($tableParams->{$param}->[0]);
+					$Set->$field($value);
 				}
 			}
 		}
 
 		# make sure the dates are not more than 10 years in the future
-		my $curr_time = time;
+		my $curr_time        = time;
 		my $seconds_per_year = 31_556_926;
-		my $cutoff = $curr_time + $seconds_per_year*10;
-		return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-			$r->maketext("Error: open date cannot be more than 10 years from now in set [_1]", $setID))
+		my $cutoff           = $curr_time + $seconds_per_year * 10;
+		return (0, $c->maketext("Error: open date cannot be more than 10 years from now in set [_1]", $setID))
 			if $Set->open_date > $cutoff;
-		return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-			$r->maketext("Error: close date cannot be more than 10 years from now in set [_1]", $setID))
+		return (0, $c->maketext("Error: close date cannot be more than 10 years from now in set [_1]", $setID))
 			if $Set->due_date > $cutoff;
-		return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-			$r->maketext("Error: answer date cannot be more than 10 years from now in set [_1]", $setID))
+		return (0, $c->maketext("Error: answer date cannot be more than 10 years from now in set [_1]", $setID))
 			if $Set->answer_date > $cutoff;
 
 		# Check that the open, due and answer dates are in increasing order.
 		# Bail if this is not correct.
 		if ($Set->open_date > $Set->due_date) {
-			return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-				$r->maketext("Error: Close date must come after open date in set [_1]", $setID));
+			return (0, $c->maketext("Error: Close date must come after open date in set [_1]", $setID));
 		}
 		if ($Set->due_date > $Set->answer_date) {
-			return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-				$r->maketext("Error: Answer date must come after close date in set [_1]", $setID));
+			return (0, $c->maketext("Error: Answer date must come after close date in set [_1]", $setID));
 		}
 
 		# check that the reduced scoring date is in the right place
-		my $enable_reduced_scoring =
-		    $ce->{pg}{ansEvalDefaults}{enableReducedScoring} &&
-		    (defined($r->param("set.$setID.enable_reduced_scoring")) ?
-		    $r->param("set.$setID.enable_reduced_scoring") :
-		     $Set->enable_reduced_scoring);
-
-		if ($enable_reduced_scoring &&
-		    $Set->reduced_scoring_date
-		    && ($Set->reduced_scoring_date > $Set->due_date
-			|| $Set->reduced_scoring_date < $Set->open_date)) {
-			return CGI::div(
-				{ class => 'alert alert-danger p-1 mb-0' },
-				$r->maketext(
-					"Error: Reduced scoring date must come between the open date and close date in set [_1]", $setID
+		my $enable_reduced_scoring = $ce->{pg}{ansEvalDefaults}{enableReducedScoring}
+			&& (
+				defined($c->param("set.$setID.enable_reduced_scoring"))
+				? $c->param("set.$setID.enable_reduced_scoring")
+				: $Set->enable_reduced_scoring);
+
+		if (
+			$enable_reduced_scoring
+			&& $Set->reduced_scoring_date
+			&& ($Set->reduced_scoring_date > $Set->due_date
+				|| $Set->reduced_scoring_date < $Set->open_date)
+			)
+		{
+			return (
+				0,
+				$c->maketext(
+					"Error: Reduced scoring date must come between the open date and close date in set [_1]",
+					$setID
 				)
 			);
 		}
@@ -1638,45 +710,41 @@ sub saveEdit_handler {
 		$db->putGlobalSet($Set);
 	}
 
-	if (defined $r->param("prev_visible_sets")) {
-		$self->{visibleSetIDs} = [ $r->param("prev_visible_sets") ];
-	} elsif (defined $r->param("no_prev_visble_sets")) {
-		$self->{visibleSetIDs} = [];
+	if (defined $c->param("prev_visible_sets")) {
+		$c->{visibleSetIDs} = [ $c->param("prev_visible_sets") ];
+	} elsif (defined $c->param("no_prev_visble_sets")) {
+		$c->{visibleSetIDs} = [];
 	} else {
 		# leave it alone
 	}
 
-	$self->{editMode} = 0;
+	$c->{editMode} = 0;
 
-	return CGI::div({ class => 'alert alert-success p-1 mb-0' }, $r->maketext("changes saved"));
+	return (1, $c->maketext("changes saved"));
 }
 
-################################################################################
-# utilities
-################################################################################
+# Utilities
 
-sub importSetsFromDef {
-	my ($self, $newSetName, $assign, $startdate, @setDefFiles) = @_;
-	my $r     = $self->r;
-	my $ce    = $r->ce;
-	my $db    = $r->db;
-	my $dir   = $ce->{courseDirs}->{templates};
+sub importSetsFromDef ($c, $newSetName, $assign, $startdate, @setDefFiles) {
+	my $ce      = $c->ce;
+	my $db      = $c->db;
+	my $dir     = $ce->{courseDirs}{templates};
 	my $mindate = 0;
 
-	# if the user includes "following files" in a multiple selection
-	# it shows up here as "" which causes the importing to die
-	# so, we select on filenames containing non-whitespace
-	@setDefFiles = grep(/\S/, @setDefFiles);
+	# If the user includes "following files" in a multiple selection
+	# it shows up here as "" which causes the importing to die.
+	# So, we select on filenames containing non-whitespace.
+	@setDefFiles = grep {/\S/} @setDefFiles;
 
 	# FIXME: do we really want everything to fail on one bad file name?
 	foreach my $fileName (@setDefFiles) {
-		die $r->maketext("won't be able to read from file [_1]/[_2]: does it exist? is it readable?", $dir, $fileName)
+		die $c->maketext("won't be able to read from file [_1]/[_2]: does it exist? is it readable?", $dir, $fileName)
 			unless -r "$dir/$fileName";
 	}
 
 	# Get a list of set ids of existing sets in the course.  This is used to
 	# ensure that an imported set does not already exist.
-	my %allSets = map { $_ => 1 } @{ $self->{allSetIDs} };
+	my %allSets = map { $_ => 1 } @{ $c->{allSetIDs} };
 
 	my (@added, @skipped);
 
@@ -1692,7 +760,7 @@ sub importSetsFromDef {
 			$hideScore,            $hideScoreByProblem, $hideWork,           $timeCap,
 			$restrictIP,           $restrictLoc,        $relaxRestrictIP,    $description,
 			$emailInstructor,      $restrictProbProgression
-		) = $self->readSetDef($set_definition_file);
+		) = $c->readSetDef($set_definition_file);
 		my @problemList = @{$ra_problemData};
 
 		# Use the original name if form doesn't specify a new one.
@@ -1710,7 +778,7 @@ sub importSetsFromDef {
 
 		# keep track of which as the earliest answer date
 		if ($mindate > $openDate || $mindate == 0) {
-		    $mindate = $openDate;
+			$mindate = $openDate;
 		}
 
 		debug("$set_definition_file: adding set");
@@ -1730,8 +798,8 @@ sub importSetsFromDef {
 		$newSetRecord->restrict_prob_progression($restrictProbProgression);
 
 		# gateway/version data.  these should are all initialized to ''
-        # by readSetDef, so for non-gateway/versioned sets they'll just
-        # be stored as null
+		# by readSetDef, so for non-gateway/versioned sets they'll just
+		# be stored as null
 		$newSetRecord->assignment_type($assignmentType);
 		$newSetRecord->attempts_per_version($attemptsPerVersion);
 		$newSetRecord->time_interval($timeInterval);
@@ -1747,24 +815,37 @@ sub importSetsFromDef {
 		$newSetRecord->relax_restrict_ip($relaxRestrictIP);
 
 		#create the set
-		eval {$db->addGlobalSet($newSetRecord)};
-		die $r->maketext("addGlobalSet [_1] in ProblemSetList:  [_2]", $setName, $@) if $@;
+		eval { $db->addGlobalSet($newSetRecord) };
+		die $c->maketext("addGlobalSet [_1] in ProblemSetList:  [_2]", $setName, $@) if $@;
 
 		#do we need to add locations to the set_locations table?
-		if ( $restrictIP ne 'No' && $restrictLoc ) {
-			if ($db->existsLocation( $restrictLoc ) ) {
-				if ( ! $db->existsGlobalSetLocation($setName,$restrictLoc) ) {
+		if ($restrictIP ne 'No' && $restrictLoc) {
+			if ($db->existsLocation($restrictLoc)) {
+				if (!$db->existsGlobalSetLocation($setName, $restrictLoc)) {
 					my $newSetLocation = $db->newGlobalSetLocation;
-					$newSetLocation->set_id( $setName );
-					$newSetLocation->location_id( $restrictLoc );
-					eval {$db->addGlobalSetLocation($newSetLocation)};
-					warn($r->maketext("error adding set location [_1] for set [_2]: [_3]", $restrictLoc, $setName, $@)) if $@;
+					$newSetLocation->set_id($setName);
+					$newSetLocation->location_id($restrictLoc);
+					eval { $db->addGlobalSetLocation($newSetLocation) };
+					warn($c->maketext(
+						"error adding set location [_1] for set [_2]: [_3]",
+						$restrictLoc, $setName, $@
+					))
+						if $@;
 				} else {
 					# this should never happen.
-					warn($r->maketext("input set location [_1] already exists for set [_2].", $restrictLoc, $setName)."\n");
+					warn(
+						$c->maketext(
+							"input set location [_1] already exists for set [_2].", $restrictLoc, $setName
+							)
+							. "\n"
+					);
 				}
 			} else {
-				warn($r->maketext("restriction location [_1] does not exist.  IP restrictions have been ignored.", $restrictLoc)."\n");
+				warn(
+					$c->maketext("restriction location [_1] does not exist.  IP restrictions have been ignored.",
+						$restrictLoc)
+						. "\n"
+				);
 				$newSetRecord->restrict_ip('No');
 				$newSetRecord->relax_restrict_ip('No');
 				eval { $db->putGlobalSet($newSetRecord) };
@@ -1778,13 +859,15 @@ sub importSetsFromDef {
 		# add problems
 		my $freeProblemID = WeBWorK::Utils::max($db->listGlobalProblems($setName)) + 1;
 		foreach my $rh_problem (@problemList) {
-			$self->addProblemToSet(
+			addProblemToSet(
+				$db, $ce->{problemDefaults},
 				setName           => $setName,
 				sourceFile        => $rh_problem->{source_file},
 				problemID         => $rh_problem->{problemID} ? $rh_problem->{problemID} : $freeProblemID++,
 				value             => $rh_problem->{value},
 				maxAttempts       => $rh_problem->{max_attempts},
 				showMeAnother     => $rh_problem->{showMeAnother},
+				showHintsAfter    => $rh_problem->{showHintsAfter},
 				prPeriod          => $rh_problem->{prPeriod},
 				attToOpenChildren => $rh_problem->{attToOpenChildren},
 				countsParentGrade => $rh_problem->{countsParentGrade}
@@ -1792,11 +875,10 @@ sub importSetsFromDef {
 		}
 
 		if ($assign eq "all") {
-			$self->assignSetToAllUsers($setName);
-		}
-		else {
-			my $userName = $r->param('user');
-			$self->assignSetToUser($userName, $newSetRecord); ## always assign set to instructor
+			assignSetToAllUsers($db, $ce, $setName);
+		} else {
+			my $userName = $c->param('user');
+			assignSetToUser($db, $userName, $newSetRecord);    ## always assign set to instructor
 		}
 	}
 
@@ -1818,76 +900,68 @@ sub importSetsFromDef {
 	return \@added, \@skipped;
 }
 
-sub readSetDef {
-	my ($self, $fileName) = @_;
-	my $templateDir   = $self->{ce}->{courseDirs}->{templates};
-	my $filePath      = "$templateDir/$fileName";
-	my $weight_default = $self->{ce}->{problemDefaults}->{value};
-	my $max_attempts_default = $self->{ce}->{problemDefaults}->{max_attempts};
-	my $att_to_open_children_default =
-	    $self->{ce}->{problemDefaults}->{att_to_open_children};
-	my $counts_parent_grade_default =
-	    $self->{ce}->{problemDefaults}->{counts_parent_grade};
-	my $showMeAnother_default = $self->{ce}->{problemDefaults}->{showMeAnother};
-	my $prPeriod_default=$self->{ce}->{problemDefaults}->{prPeriod};
+sub readSetDef ($c, $fileName) {
+	my $ce                           = $c->ce;
+	my $templateDir                  = $ce->{courseDirs}{templates};
+	my $filePath                     = "$templateDir/$fileName";
+	my $weight_default               = $ce->{problemDefaults}{value};
+	my $max_attempts_default         = $ce->{problemDefaults}{max_attempts};
+	my $att_to_open_children_default = $ce->{problemDefaults}{att_to_open_children};
+	my $counts_parent_grade_default  = $ce->{problemDefaults}{counts_parent_grade};
+	my $showMeAnother_default        = $ce->{problemDefaults}{showMeAnother};
+	my $showHintsAfter_default       = $ce->{problemDefaults}{showHintsAfter};
+	my $prPeriod_default             = $ce->{problemDefaults}{prPeriod};
 
 	my $setName = '';
 
-	my $r = $self->r;
-
 	if ($fileName =~ m|^(.*/)?set([.\w-]+)\.def$|) {
 		$setName = $2;
 	} else {
-		$self->addbadmessage(
-		    qq{The setDefinition file name must begin with   <CODE>set</CODE>},
-			qq{and must end with   <CODE>.def</CODE>  . Every thing in between becomes the name of the set. },
-			qq{For example <CODE>set1.def</CODE>, <CODE>setExam.def</CODE>, and <CODE>setsample7.def</CODE> },
-			qq{define sets named <CODE>1</CODE>, <CODE>Exam</CODE>, and <CODE>sample7</CODE> respectively. },
-			qq{The filename, $fileName, you entered is not legal\n }
+		$c->addbadmessage(
+			qq{The setDefinition file name must begin with <strong>set</strong> and must end with },
+			qq{<strong>.def</strong>. Every thing in between becomes the name of the set. For example },
+			qq{<strong>set1.def</strong>, <strong>setExam.def</strong>, and <strong>setsample7.def</strong> define },
+			qq{sets named <strong>1</strong>, <strong>Exam</strong>, and <strong>sample7</strong> respectively. },
+			qq{The filename "$fileName" you entered is not legal\n }
 		);
 
 	}
 
-	my ($line, $name, $weight, $attemptLimit, $continueFlag);
-	my $paperHeaderFile = '';
+	my ($name, $weight, $attemptLimit, $continueFlag);
+	my $paperHeaderFile  = '';
 	my $screenHeaderFile = '';
-	my $description = '';
+	my $description      = '';
 	my ($dueDate, $openDate, $reducedScoringDate, $answerDate);
 	my @problemData;
 
-# added fields for gateway test/versioned set definitions:
-	my ( $assignmentType, $attemptsPerVersion, $timeInterval, $enableReducedScoring,
-	     $versionsPerInterval, $versionTimeLimit, $problemRandOrder,
-	     $problemsPerPage, $restrictLoc,
-	     $emailInstructor, $restrictProbProgression,
-	     $countsParentGrade, $attToOpenChildren,
-	     $problemID, $showMeAnother, $prPeriod, $listType
-	     ) =
-		 ('')x16;  # initialize these to ''
-	my ( $timeCap, $restrictIP, $relaxRestrictIP ) = ( 0, 'No', 'No');
-# additional fields currently used only by gateways; later, the world?
-	my ( $hideScore, $hideScoreByProblem, $hideWork, ) = ( 'N', 'N', 'N' );
+	# added fields for gateway test/versioned set definitions:
+	my (
+		$assignmentType,      $attemptsPerVersion, $timeInterval,            $enableReducedScoring,
+		$versionsPerInterval, $versionTimeLimit,   $problemRandOrder,        $problemsPerPage,
+		$restrictLoc,         $emailInstructor,    $restrictProbProgression, $countsParentGrade,
+		$attToOpenChildren,   $problemID,          $showMeAnother,           $showHintsAfter,
+		$prPeriod,            $listType
+	) = ('') x 18;    # initialize these to ''
+	my ($timeCap, $restrictIP, $relaxRestrictIP) = (0, 'No', 'No');
+	# additional fields currently used only by gateways; later, the world?
+	my ($hideScore, $hideScoreByProblem, $hideWork,) = ('N', 'N', 'N');
 
 	my %setInfo;
-	if ( open (SETFILENAME, "$filePath") )    {
-	#####################################################################
-	# Read and check set data
-	#####################################################################
-		while (<SETFILENAME>) {
-
-			chomp($line = $_);
-			$line =~ s|(#.*)||;                              ## don't read past comments
-			unless ($line =~ /\S/) {next;}                   ## skip blank lines
-			$line =~ s|\s*$||;                               ## trim trailing spaces
+	if (my $SETFILENAME = Mojo::File->new($filePath)->open('<')) {
+		# Read and check set data
+		while (my $line = <$SETFILENAME>) {
+
+			chomp $line;
+			$line =~ s|(#.*)||;                  # Don't read past comments
+			unless ($line =~ /\S/) { next; }     # Skip blank lines
+			$line =~ s|\s*$||;                   # Trim trailing spaces
 			$line =~ m|^\s*(\w+)\s*=?\s*(.*)|;
 
-			######################
-			# sanity check entries
-			######################
+			# Sanity check entries
 			my $item = $1;
-			$item    = '' unless defined $item;
+			$item = '' unless defined $item;
 			my $value = $2;
-			$value    = '' unless defined $value;
+			$value = '' unless defined $value;
 
 			if ($item eq 'setNumber') {
 				next;
@@ -1900,9 +974,9 @@ sub readSetDef {
 			} elsif ($item eq 'openDate') {
 				$openDate = $value;
 			} elsif ($item eq 'answerDate') {
-			        $answerDate = $value;
+				$answerDate = $value;
 			} elsif ($item eq 'enableReducedScoring') {
-			        $enableReducedScoring = $value;
+				$enableReducedScoring = $value;
 			} elsif ($item eq 'reducedScoringDate') {
 				$reducedScoringDate = $value;
 			} elsif ($item eq 'assignmentType') {
@@ -1920,42 +994,43 @@ sub readSetDef {
 			} elsif ($item eq 'problemsPerPage') {
 				$problemsPerPage = $value;
 			} elsif ($item eq 'hideScore') {
-				$hideScore = ( $value ) ? $value : 'N';
+				$hideScore = ($value) ? $value : 'N';
 			} elsif ($item eq 'hideScoreByProblem') {
-				$hideScoreByProblem = ( $value ) ? $value : 'N';
+				$hideScoreByProblem = ($value) ? $value : 'N';
 			} elsif ($item eq 'hideWork') {
-				$hideWork = ( $value ) ? $value : 'N';
+				$hideWork = ($value) ? $value : 'N';
 			} elsif ($item eq 'capTimeLimit') {
-				$timeCap = ( $value ) ? 1 : 0;
+				$timeCap = ($value) ? 1 : 0;
 			} elsif ($item eq 'restrictIP') {
-				$restrictIP = ( $value ) ? $value : 'No';
-			} elsif ($item eq 'restrictLocation' ) {
-				$restrictLoc = ( $value ) ? $value : '';
-			} elsif ( $item eq 'relaxRestrictIP' ) {
-			    $relaxRestrictIP = ( $value ) ? $value : 'No';
-			} elsif ( $item eq 'emailInstructor' ) {
-			    $emailInstructor = ( $value ) ? $value : 0;
-			} elsif ( $item eq 'restrictProbProgression' ) {
-			    $restrictProbProgression = ( $value ) ? $value : 0;
-			} elsif ( $item eq 'description' ) {
-			    $value =~ s/<n>/\n/g;
-			    $description = $value;
-			} elsif ($item eq 'problemList' ||
-			    $item eq 'problemListV2') {
-			    $listType = $item;
+				$restrictIP = ($value) ? $value : 'No';
+			} elsif ($item eq 'restrictLocation') {
+				$restrictLoc = ($value) ? $value : '';
+			} elsif ($item eq 'relaxRestrictIP') {
+				$relaxRestrictIP = ($value) ? $value : 'No';
+			} elsif ($item eq 'emailInstructor') {
+				$emailInstructor = ($value) ? $value : 0;
+			} elsif ($item eq 'restrictProbProgression') {
+				$restrictProbProgression = ($value) ? $value : 0;
+			} elsif ($item eq 'description') {
+				$value =~ s/<n>/\n/g;
+				$description = $value;
+			} elsif ($item eq 'problemList'
+				|| $item eq 'problemListV2')
+			{
+				$listType = $item;
 				last;
 			} else {
-				warn $r->maketext("readSetDef error, can't read the line: ||[_1]||", $line);
+				warn $c->maketext("readSetDef error, can't read the line: ||[_1]||", $line);
 			}
 		}
 
-		#####################################################################
 		# Check and format dates
-		#####################################################################
-		my ($time1, $time2, $time3) = map {  $self->parseDateTime($_);  }    ($openDate, $dueDate, $answerDate);
+		my ($time1, $time2, $time3) = map { $c->parseDateTime($_); } ($openDate, $dueDate, $answerDate);
 
 		unless ($time1 <= $time2 and $time2 <= $time3) {
-			warn $r->maketext("The open date: [_1], close date: [_2], and answer date: [_3] must be defined and in chronological order.", $openDate, $dueDate, $answerDate);
+			warn $c->maketext('The open date: [_1], close date: [_2], and answer date: [_3] '
+					. 'must be defined and in chronological order.',
+				$openDate, $dueDate, $answerDate);
 		}
 
 		# validate reduced credit date
@@ -1963,95 +1038,137 @@ sub readSetDef {
 		# Special handling for values which seem to roughly correspond to epoch 0.
 		#    namely if the date string contains 12/31/1969 or 01/01/1970
 		if ($reducedScoringDate) {
-			if ( ( $reducedScoringDate =~ m+12/31/1969+ ) || ( $reducedScoringDate =~ m+01/01/1970+ ) ) {
+			if (($reducedScoringDate =~ m+12/31/1969+) || ($reducedScoringDate =~ m+01/01/1970+)) {
 				my $origReducedScoringDate = $reducedScoringDate;
-				$reducedScoringDate = $self->parseDateTime($reducedScoringDate);
-				if ( $reducedScoringDate != 0 ) {
+				$reducedScoringDate = $c->parseDateTime($reducedScoringDate);
+				if ($reducedScoringDate != 0) {
 					# In this case we want to treat it BY FORCE as if the value did correspond to epoch 0.
-					warn $r->maketext("The reduced credit date [_1] in the file probably was generated from the Unix epoch 0 value and is being treated as if it was Unix epoch 0.", $origReducedScoringDate );
+					warn $c->maketext(
+						'The reduced credit date [_1] in the file probably was generated from '
+							. 'the Unix epoch 0 value and is being treated as if it was Unix epoch 0.',
+						$origReducedScoringDate
+					);
 					$reducedScoringDate = 0;
 				}
 			} else {
-				# Original behavior, which may cause problems for some time-zones when epoch 0 was set and does not parse back to 0
-				$reducedScoringDate = $self->parseDateTime($reducedScoringDate);
+				# Original behavior, which may cause problems for some time-zones when epoch 0 was set and does not
+				# parse back to 0.
+				$reducedScoringDate = $c->parseDateTime($reducedScoringDate);
 			}
 		}
 
 		if ($reducedScoringDate) {
 			if ($reducedScoringDate < $time1 || $reducedScoringDate > $time2) {
-				warn $r->maketext("The reduced credit date should be between the open date [_1] and close date [_2]", $openDate, $dueDate);
-			} elsif ( $reducedScoringDate == 0 && $enableReducedScoring ne 'Y' ) {
+				warn $c->maketext("The reduced credit date should be between the open date [_1] and close date [_2]",
+					$openDate, $dueDate);
+			} elsif ($reducedScoringDate == 0 && $enableReducedScoring ne 'Y') {
 				# In this case - the date in the file was Unix epoch 0 (or treated as such),
 				# and unless $enableReducedScoring eq 'Y' we will leave it as 0.
 			}
 		} else {
-		    $reducedScoringDate = $time2 - 60*$r->{ce}->{pg}{ansEvalDefaults}{reducedScoringPeriod};
+			$reducedScoringDate = $time2 - 60 * $ce->{pg}{ansEvalDefaults}{reducedScoringPeriod};
 		}
 
 		if ($enableReducedScoring ne '' && $enableReducedScoring eq 'Y') {
-		    $enableReducedScoring = 1;
+			$enableReducedScoring = 1;
 		} elsif ($enableReducedScoring ne '' && $enableReducedScoring eq 'N') {
-		    $enableReducedScoring = 0;
+			$enableReducedScoring = 0;
 		} elsif ($enableReducedScoring ne '') {
-		    warn($r->maketext("The value [_1] for enableReducedScoring is not valid; it will be replaced with 'N'.",$enableReducedScoring)."\n");
-		    $enableReducedScoring = 0;
+			warn(
+				$c->maketext("The value [_1] for enableReducedScoring is not valid; it will be replaced with 'N'.",
+					$enableReducedScoring)
+					. "\n"
+			);
+			$enableReducedScoring = 0;
 		} else {
-		    $enableReducedScoring = DEFAULT_ENABLED_REDUCED_SCORING_STATE;
+			$enableReducedScoring = DEFAULT_ENABLED_REDUCED_SCORING_STATE;
 		}
 
 		# Check header file names
-		$paperHeaderFile =~ s/(.*?)\s*$/$1/;   #remove trailing white space
-		$screenHeaderFile =~ s/(.*?)\s*$/$1/;   #remove trailing white space
+		$paperHeaderFile  =~ s/(.*?)\s*$/$1/;    # Remove trailing white space
+		$screenHeaderFile =~ s/(.*?)\s*$/$1/;    # Remove trailing white space
 
-                #####################################################################
-                # Gateway/version variable cleanup: convert times into seconds
+		# Gateway/version variable cleanup: convert times into seconds
 		$assignmentType ||= 'default';
 
-		$timeInterval = WeBWorK::Utils::timeToSec( $timeInterval )
-		    if ( $timeInterval );
+		$timeInterval = WeBWorK::Utils::timeToSec($timeInterval)
+			if ($timeInterval);
 		$versionTimeLimit = WeBWorK::Utils::timeToSec($versionTimeLimit)
-		    if ( $versionTimeLimit );
+			if ($versionTimeLimit);
 
-		# check that the values for hideWork and hideScore are valid
-		if ( $hideScore ne 'N' && $hideScore ne 'Y' &&
-		     $hideScore ne 'BeforeAnswerDate' ) {
-			warn($r->maketext("The value [_1] for the hideScore option is not valid; it will be replaced with 'N'.", $hideScore)."\n");
+		# Check that the values for hideWork and hideScore are valid.
+		if ($hideScore ne 'N'
+			&& $hideScore ne 'Y'
+			&& $hideScore ne 'BeforeAnswerDate')
+		{
+			warn(
+				$c->maketext("The value [_1] for the hideScore option is not valid; it will be replaced with 'N'.",
+					$hideScore)
+					. "\n"
+			);
 			$hideScore = 'N';
 		}
-		if ( $hideScoreByProblem ne 'N' && $hideScoreByProblem ne 'Y' &&
-		     $hideScoreByProblem ne 'BeforeAnswerDate' ) {
-			warn($r->maketext("The value [_1] for the hideScore option is not valid; it will be replaced with 'N'.", $hideScoreByProblem)."\n");
+		if ($hideScoreByProblem ne 'N'
+			&& $hideScoreByProblem ne 'Y'
+			&& $hideScoreByProblem ne 'BeforeAnswerDate')
+		{
+			warn(
+				$c->maketext("The value [_1] for the hideScore option is not valid; it will be replaced with 'N'.",
+					$hideScoreByProblem)
+					. "\n"
+			);
 			$hideScoreByProblem = 'N';
 		}
-		if ( $hideWork ne 'N' && $hideWork ne 'Y' &&
-		     $hideWork ne 'BeforeAnswerDate' ) {
-			warn($r->maketext("The value [_1] for the hideWork option is not valid; it will be replaced with 'N'.", $hideWork)."\n");
+		if ($hideWork ne 'N'
+			&& $hideWork ne 'Y'
+			&& $hideWork ne 'BeforeAnswerDate')
+		{
+			warn(
+				$c->maketext("The value [_1] for the hideWork option is not valid; it will be replaced with 'N'.",
+					$hideWork)
+					. "\n"
+			);
 			$hideWork = 'N';
 		}
-		if ( $timeCap ne '0' && $timeCap ne '1' ) {
-			warn($r->maketext("The value [_1] for the capTimeLimit option is not valid; it will be replaced with '0'.", $timeCap)."\n");
+		if ($timeCap ne '0' && $timeCap ne '1') {
+			warn(
+				$c->maketext(
+					"The value [_1] for the capTimeLimit option is not valid; it will be replaced with '0'.",
+					$timeCap)
+					. "\n"
+			);
 			$timeCap = '0';
 		}
-		if ( $restrictIP ne 'No' && $restrictIP ne 'DenyFrom' &&
-		     $restrictIP ne 'RestrictTo' ) {
-			warn($r->maketext("The value [_1] for the restrictIP option is not valid; it will be replaced with 'No'.", $restrictIP)."\n");
-			$restrictIP = 'No';
-			$restrictLoc = '';
+		if ($restrictIP ne 'No'
+			&& $restrictIP ne 'DenyFrom'
+			&& $restrictIP ne 'RestrictTo')
+		{
+			warn(
+				$c->maketext(
+					"The value [_1] for the restrictIP option is not valid; it will be replaced with 'No'.",
+					$restrictIP)
+					. "\n"
+			);
+			$restrictIP      = 'No';
+			$restrictLoc     = '';
 			$relaxRestrictIP = 'No';
 		}
-		if ( $relaxRestrictIP ne 'No' &&
-		     $relaxRestrictIP ne 'AfterAnswerDate' &&
-		     $relaxRestrictIP ne 'AfterVersionAnswerDate' ) {
-			warn($r->maketext("The value [_1] for the relaxRestrictIP option is not valid; it will be replaced with 'No'.", $relaxRestrictIP)."\n");
+		if ($relaxRestrictIP ne 'No'
+			&& $relaxRestrictIP ne 'AfterAnswerDate'
+			&& $relaxRestrictIP ne 'AfterVersionAnswerDate')
+		{
+			warn(
+				$c->maketext(
+					"The value [_1] for the relaxRestrictIP option is not valid; it will be replaced with 'No'.",
+					$relaxRestrictIP)
+					. "\n"
+			);
 			$relaxRestrictIP = 'No';
 		}
 		# to verify that restrictLoc is valid requires a database
 		#    call, so we defer that until we return to add the set
 
-		#####################################################################
 		# Read and check list of problems for the set
-		#####################################################################
-
 
 		# NOTE:  There are now two versions of problemList, the first is an unlabeled
 		# list which may or may not contain a showMeAnother variable.  This is supported
@@ -2060,246 +1177,236 @@ sub readSetDef {
 
 		if ($listType eq 'problemList') {
 
+			while (my $line = <$SETFILENAME>) {
+				chomp $line;
+				$line =~ s/(#.*)//;                 ## don't read past comments
+				unless ($line =~ /\S/) { next; }    ## skip blank lines
+
+				# commas are valid in filenames, so we have to handle commas
+				# using backslash escaping, so \X will be replaced with X
+				my @line = ();
+				my $curr = '';
+				for (my $i = 0; $i < length $line; $i++) {
+					my $c = substr($line, $i, 1);
+					if ($c eq '\\') {
+						$curr .= substr($line, ++$i, 1);
+					} elsif ($c eq ',') {
+						push @line, $curr;
+						$curr = '';
+					} else {
+						$curr .= $c;
+					}
+				}
+				# anything left?
+				push(@line, $curr) if ($curr);
 
-		    while(<SETFILENAME>) {
-			chomp($line=$_);
-			$line =~ s/(#.*)//;                             ## don't read past comments
-			unless ($line =~ /\S/) {next;}                  ## skip blank lines
-
-			# commas are valid in filenames, so we have to handle commas
-			# using backslash escaping, so \X will be replaced with X
-			my @line = ();
-			my $curr = '';
-			for (my $i = 0; $i < length $line; $i++) {
-			    my $c = substr($line,$i,1);
-			    if ($c eq '\\') {
-				$curr .= substr($line,++$i,1);
-			    } elsif ($c eq ',') {
-				push @line, $curr;
-				$curr = '';
-			    } else {
-				$curr .= $c;
-			    }
-			}
-			## anything left?
-			push(@line, $curr) if ( $curr );
+				# read the line and only look for $showMeAnother if it has the correct number of entries
+				# otherwise the default value will be used
+				if (scalar(@line) == 4) {
+					($name, $weight, $attemptLimit, $showMeAnother, $continueFlag) = @line;
+				} else {
+					($name, $weight, $attemptLimit, $continueFlag) = @line;
+				}
 
-			# read the line and only look for $showMeAnother if it has the correct number of entries
-			# otherwise the default value will be used
-			if(scalar(@line)==4){
-			    ($name, $weight, $attemptLimit, $showMeAnother, $continueFlag) = @line;
-			} else {
-			    ($name, $weight, $attemptLimit, $continueFlag) = @line;
+				# clean up problem values
+				$name =~ s/\s*//g;
+				$weight = "" unless defined($weight);
+				$weight =~ s/[^\d\.]*//g;
+				unless ($weight =~ /\d+/) { $weight = $weight_default; }
+				$attemptLimit = "" unless defined($attemptLimit);
+				$attemptLimit =~ s/[^\d-]*//g;
+				unless ($attemptLimit =~ /\d+/) { $attemptLimit = $max_attempts_default; }
+				$continueFlag = "0" unless (defined($continueFlag) && @problemData);
+				# can't put continuation flag onto the first problem
+				push(
+					@problemData,
+					{
+						source_file   => $name,
+						value         => $weight,
+						max_attempts  => $attemptLimit,
+						showMeAnother => $showMeAnother,
+						continuation  => $continueFlag,
+						# Use defaults for these since they are not going to be in the file.
+						prPeriod       => $prPeriod_default,
+						showHintsAfter => $showHintsAfter_default,
+					}
+				);
 			}
-
-			#####################
-			#  clean up problem values
-			###########################
-			$name =~ s/\s*//g;
-			$weight = "" unless defined($weight);
-			$weight =~ s/[^\d\.]*//g;
-			unless ($weight =~ /\d+/) {$weight = $weight_default;}
-			$attemptLimit = "" unless defined($attemptLimit);
-			$attemptLimit =~ s/[^\d-]*//g;
-			unless ($attemptLimit =~ /\d+/) {$attemptLimit = $max_attempts_default;}
-			$continueFlag = "0" unless( defined($continueFlag) && @problemData );
-			# can't put continuation flag onto the first problem
-			push(@problemData, {source_file    => $name,
-			                    value          =>  $weight,
-			                    max_attempts   => $attemptLimit,
-			                    showMeAnother   => $showMeAnother,
-			                    # use default since it's not going to be in the file
-			                    prPeriod		=> $prPeriod_default,
-			                    continuation   => $continueFlag,
-			     });
-		    }
 		} else {
+			# This is the new version, it looks for pairs of entries
+			# of the form field name = value
+			while (my $line = <$SETFILENAME>) {
+
+				chomp $line;
+				$line =~ s|(#.*)||;                  # Don't read past comments
+				unless ($line =~ /\S/) { next; }     # Skip blank lines
+				$line =~ s|\s*$||;                   # Trim trailing spaces
+				$line =~ m|^\s*(\w+)\s*=?\s*(.*)|;
+
+				# sanity check entries
+				my $item = $1;
+				$item = '' unless defined $item;
+				my $value = $2;
+				$value = '' unless defined $value;
+
+				if ($item eq 'problem_start') {
+					next;
+				} elsif ($item eq 'source_file') {
+					warn($c->maketext('No source_file for problem in .def file')) unless $value;
+					$name = $value;
+				} elsif ($item eq 'value') {
+					$weight = ($value) ? $value : $weight_default;
+				} elsif ($item eq 'max_attempts') {
+					$attemptLimit = ($value) ? $value : $max_attempts_default;
+				} elsif ($item eq 'showMeAnother') {
+					$showMeAnother = ($value) ? $value : 0;
+				} elsif ($item eq 'showHintsAfter') {
+					$showHintsAfter = ($value) ? $value : -2;
+				} elsif ($item eq 'prPeriod') {
+					$prPeriod = ($value) ? $value : 0;
+				} elsif ($item eq 'restrictProbProgression') {
+					$restrictProbProgression = ($value) ? $value : 'No';
+				} elsif ($item eq 'problem_id') {
+					$problemID = ($value) ? $value : '';
+				} elsif ($item eq 'counts_parent_grade') {
+					$countsParentGrade = ($value) ? $value : 0;
+				} elsif ($item eq 'att_to_open_children') {
+					$attToOpenChildren = ($value) ? $value : 0;
+				} elsif ($item eq 'problem_end') {
+
+					#  clean up problem values
+					$name =~ s/\s*//g;
+					$weight = "" unless defined($weight);
+					$weight =~ s/[^\d\.]*//g;
+					unless ($weight =~ /\d+/) { $weight = $weight_default; }
+					$attemptLimit = "" unless defined($attemptLimit);
+					$attemptLimit =~ s/[^\d-]*//g;
+					unless ($attemptLimit =~ /\d+/) { $attemptLimit = $max_attempts_default; }
+
+					unless ($countsParentGrade =~ /(0|1)/) { $countsParentGrade = $counts_parent_grade_default; }
+					$countsParentGrade =~ s/[^\d-]*//g;
+
+					unless ($showMeAnother =~ /-?\d+/) { $showMeAnother = $showMeAnother_default; }
+					$showMeAnother =~ s/[^\d-]*//g;
+
+					unless ($showHintsAfter =~ /-?\d+/) { $showHintsAfter = $showHintsAfter_default; }
+					$showHintsAfter =~ s/[^\d-]*//g;
+
+					unless ($prPeriod =~ /-?\d+/) { $prPeriod = $prPeriod_default; }
+					$prPeriod =~ s/[^\d-]*//g;
+
+					unless ($attToOpenChildren =~ /\d+/) { $attToOpenChildren = $att_to_open_children_default; }
+					$attToOpenChildren =~ s/[^\d-]*//g;
+
+					if ($assignmentType eq 'jitar') {
+						unless ($problemID =~ /[\d\.]+/) { $problemID = ''; }
+						$problemID =~ s/[^\d\.-]*//g;
+						$problemID = seq_to_jitar_id(split(/\./, $problemID));
+					} else {
+						unless ($problemID =~ /\d+/) { $problemID = ''; }
+						$problemID =~ s/[^\d-]*//g;
+					}
 
-		    # This is the new version, it looks for pairs of entries
-		    # of the form field name = value
-		    while (<SETFILENAME>) {
-
-			chomp($line = $_);
-			$line =~ s|(#.*)||;                              ## don't read past comments
-			unless ($line =~ /\S/) {next;}                   ## skip blank lines
-			$line =~ s|\s*$||;                               ## trim trailing spaces
-			$line =~ m|^\s*(\w+)\s*=?\s*(.*)|;
-
-			######################
-			# sanity check entries
-			######################
-			my $item = $1;
-			$item    = '' unless defined $item;
-			my $value = $2;
-			$value    = '' unless defined $value;
-
-			if ($item eq 'problem_start') {
-			    next;
-			} elsif ($item eq 'source_file') {
-			    warn($r->maketext('No source_file for problem in .def file')) unless $value;
-			    $name = $value;
-			} elsif ($item eq 'value' ) {
-			    $weight = ( $value ) ? $value : $weight_default;
-			} elsif ( $item eq 'max_attempts' ) {
-			    $attemptLimit = ( $value ) ? $value : $max_attempts_default;
-			} elsif ( $item eq 'showMeAnother' ) {
-			    $showMeAnother = ( $value ) ? $value : 0;
-			} elsif ( $item eq 'prPeriod' ) {
-			    $prPeriod = ( $value ) ? $value : 0;
-			} elsif ( $item eq 'restrictProbProgression' ) {
-			    $restrictProbProgression = ( $value ) ? $value : 'No';
-			} elsif ( $item eq 'problem_id' ) {
-			    $problemID = ( $value ) ? $value : '';
-			} elsif ( $item eq 'counts_parent_grade' ) {
-			    $countsParentGrade = ( $value ) ? $value : 0;
-			} elsif ( $item eq 'att_to_open_children' ) {
-			    $attToOpenChildren = ( $value ) ? $value : 0;
-			} elsif ($item eq 'problem_end') {
-
-			    #####################
-			    #  clean up problem values
-			    ###########################
-			    $name =~ s/\s*//g;
-			    $weight = "" unless defined($weight);
-			    $weight =~ s/[^\d\.]*//g;
-			    unless ($weight =~ /\d+/) {$weight = $weight_default;}
-			    $attemptLimit = "" unless defined($attemptLimit);
-			    $attemptLimit =~ s/[^\d-]*//g;
-			    unless ($attemptLimit =~ /\d+/) {$attemptLimit = $max_attempts_default;}
-
-			    unless ($countsParentGrade =~ /(0|1)/) {$countsParentGrade = $counts_parent_grade_default;}
-			    $countsParentGrade =~ s/[^\d-]*//g;
-
-			    unless ($showMeAnother =~ /-?\d+/) {$showMeAnother = $showMeAnother_default;}
-			    $showMeAnother =~ s/[^-?\d-]*//g;
-
-			    unless ($prPeriod =~ /-?\d+/) {$prPeriod = $prPeriod_default;}
-			    $prPeriod =~ s/[^-?\d-]*//g;
-
-			    unless ($attToOpenChildren =~ /\d+/) {$attToOpenChildren = $att_to_open_children_default;}
-			    $attToOpenChildren =~ s/[^\d-]*//g;
-
-			    if ($assignmentType eq 'jitar') {
-				unless ($problemID =~ /[\d\.]+/) {$problemID = '';}
-				$problemID =~ s/[^\d\.-]*//g;
-				$problemID = seq_to_jitar_id(split(/\./,$problemID));
-			    } else {
-				unless ($problemID =~ /\d+/) {$problemID = '';}
-				$problemID =~ s/[^\d-]*//g;
-			    }
-
-			    # can't put continuation flag onto the first problem
-			    push(@problemData, {source_file    => $name,
-						problemID      => $problemID,
-						value          =>  $weight,
-						max_attempts   => $attemptLimit,
-						showMeAnother  => $showMeAnother,
-						prPeriod		=> $prPeriod,
-						attToOpenChildren => $attToOpenChildren,
-						countsParentGrade => $countsParentGrade,
-				 });
-
-			    # reset the various values
-			    $name = '';
-			    $problemID = '';
-			    $weight = '';
-			    $attemptLimit = '';
-			    $showMeAnother = '';
-			    $attToOpenChildren = '';
-			    $countsParentGrade = '';
+					# can't put continuation flag onto the first problem
+					push(
+						@problemData,
+						{
+							source_file       => $name,
+							problemID         => $problemID,
+							value             => $weight,
+							max_attempts      => $attemptLimit,
+							showMeAnother     => $showMeAnother,
+							showHintsAfter    => $showHintsAfter,
+							prPeriod          => $prPeriod,
+							attToOpenChildren => $attToOpenChildren,
+							countsParentGrade => $countsParentGrade,
+						}
+					);
+
+					# reset the various values
+					$name              = '';
+					$problemID         = '';
+					$weight            = '';
+					$attemptLimit      = '';
+					$showMeAnother     = '';
+					$showHintsAfter    = '';
+					$attToOpenChildren = '';
+					$countsParentGrade = '';
 
-			} else {
-			    warn $r->maketext("readSetDef error, can't read the line: ||[_1]||", $line);
+				} else {
+					warn $c->maketext("readSetDef error, can't read the line: ||[_1]||", $line);
+				}
 			}
-		    }
-
 
 		}
 
-		close(SETFILENAME);
-		($setName,
-		 $paperHeaderFile,
-		 $screenHeaderFile,
-		 $time1,
-		 $time2,
-		 $time3,
-		 \@problemData,
-		 $assignmentType,
-		 $enableReducedScoring,
-		 $reducedScoringDate,
-		 $attemptsPerVersion, $timeInterval,
-		 $versionsPerInterval, $versionTimeLimit, $problemRandOrder,
-		 $problemsPerPage,
-		 $hideScore,
-		 $hideScoreByProblem,
-		 $hideWork,
-		 $timeCap,
-		 $restrictIP,
-		 $restrictLoc,
-		 $relaxRestrictIP,
-		 $description,
-		 $emailInstructor,
-		 $restrictProbProgression
+		$SETFILENAME->close;
+		return (
+			$setName,              $paperHeaderFile,    $screenHeaderFile,   $time1,
+			$time2,                $time3,              \@problemData,       $assignmentType,
+			$enableReducedScoring, $reducedScoringDate, $attemptsPerVersion, $timeInterval,
+			$versionsPerInterval,  $versionTimeLimit,   $problemRandOrder,   $problemsPerPage,
+			$hideScore,            $hideScoreByProblem, $hideWork,           $timeCap,
+			$restrictIP,           $restrictLoc,        $relaxRestrictIP,    $description,
+			$emailInstructor,      $restrictProbProgression
 		);
 	} else {
-		warn $r->maketext("Can't open file [_1]", $filePath)."\n";
+		warn $c->maketext("Can't open file [_1]", $filePath) . "\n";
+		return;
 	}
 }
 
-sub exportSetsToDef {
-	my ($self, %filenames) = @_;
-
-	my $r        = $self->r;
-	my $ce       = $r->ce;
-	my $db       = $r->db;
+sub exportSetsToDef ($c, %filenames) {
+	my $ce = $c->ce;
+	my $db = $c->db;
 
 	my (@exported, @skipped, %reason);
 
 SET: foreach my $set (keys %filenames) {
 
 		my $fileName = $filenames{$set};
-		$fileName .= ".def" unless $fileName =~ m/\.def$/;
-		$fileName  = "set" . $fileName unless $fileName =~ m/^set/;
+		$fileName .= ".def"           unless $fileName =~ m/\.def$/;
+		$fileName = "set" . $fileName unless $fileName =~ m/^set/;
 		# files can be exported to sub directories but not parent directories
 		if ($fileName =~ /\.\./) {
 			push @skipped, $set;
-			$reason{$set} = $r->maketext("Illegal filename contains '..'");
+			$reason{$set} = $c->maketext("Illegal filename contains '..'");
 			next SET;
 		}
 
 		my $setRecord = $db->getGlobalSet($set);
 		unless (defined $setRecord) {
 			push @skipped, $set;
-			$reason{$set} = $r->maketext("No record found.");
+			$reason{$set} = $c->maketext("No record found.");
 			next SET;
 		}
 		my $filePath = $ce->{courseDirs}->{templates} . '/' . $fileName;
 
 		# back up existing file
-		if(-e $filePath) {
-			rename($filePath, "$filePath.bak") or
-				$reason{$set} = $r->maketext("Existing file [_1] could not be backed up and was lost.", $filePath);
+		if (-e $filePath) {
+			rename($filePath, "$filePath.bak")
+				or $reason{$set} = $c->maketext("Existing file [_1] could not be backed up and was lost.", $filePath);
 		}
 
-		my $openDate     = $self->formatDateTime($setRecord->open_date);
-		my $dueDate      = $self->formatDateTime($setRecord->due_date);
-		my $answerDate   = $self->formatDateTime($setRecord->answer_date);
-		my $reducedScoringDate =  $self->formatDateTime($setRecord->reduced_scoring_date);
-		my $description = $setRecord->description;
+		my $openDate           = $c->formatDateTime($setRecord->open_date);
+		my $dueDate            = $c->formatDateTime($setRecord->due_date);
+		my $answerDate         = $c->formatDateTime($setRecord->answer_date);
+		my $reducedScoringDate = $c->formatDateTime($setRecord->reduced_scoring_date);
+		my $description        = $setRecord->description;
 		if ($description) {
-		    $description =~ s/\r?\n/<n>/g;
+			$description =~ s/\r?\n/<n>/g;
 		}
 
-		my $assignmentType = $setRecord->assignment_type;
-		my $enableReducedScoring = $setRecord->enable_reduced_scoring ? 'Y' : 'N';
-		my $setHeader    = $setRecord->set_header;
-		my $paperHeader  = $setRecord->hardcopy_header;
-		my $emailInstructor = $setRecord->email_instructor;
+		my $assignmentType          = $setRecord->assignment_type;
+		my $enableReducedScoring    = $setRecord->enable_reduced_scoring ? 'Y' : 'N';
+		my $setHeader               = $setRecord->set_header;
+		my $paperHeader             = $setRecord->hardcopy_header;
+		my $emailInstructor         = $setRecord->email_instructor;
 		my $restrictProbProgression = $setRecord->restrict_prob_progression;
 
 		my @problemList = $db->getGlobalProblemsWhere({ set_id => $set }, 'problem_id');
 
-		my $problemList  = '';
+		my $problemList = '';
 		for my $problemRecord (@problemList) {
 			my $problem_id = $problemRecord->problem_id();
 
@@ -2311,16 +1418,18 @@ SET: foreach my $set (keys %filenames) {
 			my $value             = $problemRecord->value();
 			my $max_attempts      = $problemRecord->max_attempts();
 			my $showMeAnother     = $problemRecord->showMeAnother();
+			my $showHintsAfter    = $problemRecord->showHintsAfter();
 			my $prPeriod          = $problemRecord->prPeriod();
 			my $countsParentGrade = $problemRecord->counts_parent_grade();
 			my $attToOpenChildren = $problemRecord->att_to_open_children();
 
 			# backslash-escape commas in fields
-			$source_file   =~ s/([,\\])/\\$1/g;
-			$value         =~ s/([,\\])/\\$1/g;
-			$max_attempts  =~ s/([,\\])/\\$1/g;
-			$showMeAnother =~ s/([,\\])/\\$1/g;
-			$prPeriod      =~ s/([,\\])/\\$1/g;
+			$source_file    =~ s/([,\\])/\\$1/g;
+			$value          =~ s/([,\\])/\\$1/g;
+			$max_attempts   =~ s/([,\\])/\\$1/g;
+			$showMeAnother  =~ s/([,\\])/\\$1/g;
+			$showHintsAfter =~ s/([,\\])/\\$1/g;
+			$prPeriod       =~ s/([,\\])/\\$1/g;
 
 			# This is the new way of saving problem information
 			# the labelled list makes it easier to add variables and
@@ -2331,6 +1440,7 @@ SET: foreach my $set (keys %filenames) {
 			$problemList .= "value = $value\n";
 			$problemList .= "max_attempts = $max_attempts\n";
 			$problemList .= "showMeAnother = $showMeAnother\n";
+			$problemList .= "showHintsAfter = $showHintsAfter\n";
 			$problemList .= "prPeriod = $prPeriod\n";
 			$problemList .= "counts_parent_grade = $countsParentGrade\n";
 			$problemList .= "att_to_open_children = $attToOpenChildren \n";
@@ -2339,18 +1449,18 @@ SET: foreach my $set (keys %filenames) {
 
 		# gateway fields
 		my $gwFields = '';
-		if ( $assignmentType =~ /gateway/ ) {
-		    my $attemptsPerV = $setRecord->attempts_per_version;
-		    my $timeInterval = $setRecord->time_interval;
-		    my $vPerInterval = $setRecord->versions_per_interval;
-		    my $vTimeLimit   = $setRecord->version_time_limit;
-		    my $probRandom   = $setRecord->problem_randorder;
-		    my $probPerPage  = $setRecord->problems_per_page;
-		    my $hideScore    = $setRecord->hide_score;
-		    my $hideScoreByProblem  = $setRecord->hide_score_by_problem;
-		    my $hideWork     = $setRecord->hide_work;
-		    my $timeCap      = $setRecord->time_limit_cap;
-		    $gwFields =<<EOG;
+		if ($assignmentType =~ /gateway/) {
+			my $attemptsPerV       = $setRecord->attempts_per_version;
+			my $timeInterval       = $setRecord->time_interval;
+			my $vPerInterval       = $setRecord->versions_per_interval;
+			my $vTimeLimit         = $setRecord->version_time_limit;
+			my $probRandom         = $setRecord->problem_randorder;
+			my $probPerPage        = $setRecord->problems_per_page;
+			my $hideScore          = $setRecord->hide_score;
+			my $hideScoreByProblem = $setRecord->hide_score_by_problem;
+			my $hideWork           = $setRecord->hide_work;
+			my $timeCap            = $setRecord->time_limit_cap;
+			$gwFields = <<EOG;
 
 attemptsPerVersion  = $attemptsPerV
 timeInterval        = $timeInterval
@@ -2363,20 +1473,21 @@ hideScoreByProblem  = $hideScoreByProblem
 hideWork            = $hideWork
 capTimeLimit        = $timeCap
 EOG
-		    chomp($gwFields);
+			chomp($gwFields);
 		}
 
 		# ip restriction fields
-		my $restrictIP = $setRecord->restrict_ip;
+		my $restrictIP     = $setRecord->restrict_ip;
 		my $restrictFields = '';
-		if ( $restrictIP && $restrictIP ne 'No' ) {
+		if ($restrictIP && $restrictIP ne 'No') {
 			# only store the first location
-			my $restrictLoc = ($db->listGlobalSetLocations($setRecord->set_id))[0];
+			my $restrictLoc   = ($db->listGlobalSetLocations($setRecord->set_id))[0];
 			my $relaxRestrict = $setRecord->relax_restrict_ip;
 			$restrictLoc || ($restrictLoc = '');
-			$restrictFields = "restrictIP          = $restrictIP" .
-			    "\nrestrictLocation    = $restrictLoc\n" .
-			    "relaxRestrictIP     = $relaxRestrict\n";
+			$restrictFields =
+				"restrictIP          = $restrictIP"
+				. "\nrestrictLocation    = $restrictLoc\n"
+				. "relaxRestrictIP     = $relaxRestrict\n";
 		}
 
 		my $fileContents = <<EOF;
@@ -2398,10 +1509,9 @@ EOF
 
 		$filePath = WeBWorK::Utils::surePathToFile($ce->{courseDirs}->{templates}, $filePath);
 		eval {
-			local *SETDEF;
-			open SETDEF, ">$filePath" or die $r->maketext("Failed to open [_1]", $filePath);
-			print SETDEF $fileContents;
-			close SETDEF;
+			open(my $SETDEF, '>', $filePath) or die $c->maketext("Failed to open [_1]", $filePath);
+			print $SETDEF $fileContents;
+			close $SETDEF;
 		};
 
 		if ($@) {
@@ -2414,405 +1524,6 @@ EOF
 	}
 
 	return \@exported, \@skipped, \%reason;
-
-}
-
-################################################################################
-# "display" methods
-################################################################################
-
-sub fieldEditHTML {
-	my ($self, $fieldName, $value, $properties) = @_;
-	my $size = $properties->{size};
-	my $type = $properties->{type};
-	my $access = $properties->{access};
-	my $items = $properties->{items};
-	my $synonyms = $properties->{synonyms};
-	my $headerFiles = $self->{headerFiles};
-
-	if ($access eq "readonly") {
-		return CGI::span({ dir => 'ltr' }, $value) if ($type eq 'date');
-		return $value;
-	}
-
-	if ($type eq 'number' || $type eq 'text') {
-		return CGI::div(
-			{ class => 'input-group input-group-sm flex-nowrap' },
-			CGI::input({
-				type            => 'text',
-				name            => $fieldName,
-				id              => "${fieldName}_id",
-				aria_labelledby => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header',
-				value           => $value,
-				size            => $size,
-				class           => 'form-control w-auto'
-			})
-		);
-	}
-
-	if ($type eq 'date') {
-		return CGI::div(
-			{ class => 'input-group input-group-sm flex-nowrap flatpickr' },
-			CGI::textfield({
-				name            => $fieldName,
-				id              => "${fieldName}_id",
-				aria_labelledby => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header',
-				value           => $value,
-				size            => $size,
-				class           => 'form-control w-auto ' . ($fieldName =~ /\.open_date/ ? ' datepicker-group' : ''),
-				placeholder     => $self->r->maketext("None Specified"),
-				data_input      => undef,
-				data_done_text  => $self->r->maketext('Done'),
-				data_locale     => $self->r->ce->{language},
-				data_timezone   => $self->r->ce->{siteDefaults}{timezone},
-				role            => 'button',
-				tabindex        => 0
-			}),
-			CGI::a(
-				{
-					class       => 'btn btn-secondary btn-sm',
-					data_toggle => undef,
-					role        => 'button',
-					tabindex    => 0,
-					aria_label  => $self->r->maketext('Pick date and time')
-				},
-				CGI::i({ class => 'fas fa-calendar-alt' }, '')
-			)
-		);
-	}
-
-	if ($type eq "checked") {
-		# If the checkbox is checked it returns a 1, if it is unchecked it returns nothing
-		# in which case the hidden field overrides the parameter with a 0.
-		# This is actually the accepted way to do this.
-		return CGI::input({
-			type            => 'checkbox',
-			id              => "${fieldName}_id",
-			name            => $fieldName,
-			aria_labelledby => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header',
-			value           => 1,
-			class           => 'form-check-input',
-			$value ? (checked => undef) : ()
-		})
-		. CGI::hidden({
-			name  => $fieldName,
-			value => 0
-		});
-	}
-}
-
-sub recordEditHTML {
-	my ($self, $Set, %options) = @_;
-	my $r          = $self->r;
-	my $urlpath    = $r->urlpath;
-	my $ce         = $r->ce;
-	my $db         = $r->db;
-	my $authz      = $r->authz;
-	my $user       = $r->param('user');
-	my $root       = $ce->{webworkURLs}{root};
-	my $courseName = $urlpath->arg('courseID');
-
-	my $editMode    = $options{editMode};
-	my $exportMode  = $options{exportMode};
-	my $setSelected = $options{setSelected};
-
-	my $visibleClass = $Set->visible ? 'font-visible' : 'font-hidden';
-	my $enable_reduced_scoringClass =
-		$Set->enable_reduced_scoring
-		? $r->maketext('Reduced Scoring Enabled')
-		: $r->maketext('Reduced Scoring Disabled');
-
-	my $users      = $db->countSetUsers($Set->set_id);
-	my $totalUsers = $self->{totalUsers};
-
-	my $problems = $db->countGlobalProblems($Set->set_id);
-
-	my $usersAssignedToSetURL = $self->systemLink($urlpath->new(
-		type => 'instructor_users_assigned_to_set',
-		args => { courseID => $courseName, setID => $Set->set_id }
-	));
-	my $prettySetID    = format_set_name_display($Set->set_id);
-	my $problemListURL = $self->systemLink(
-		$urlpath->new(type => 'instructor_set_detail', args => { courseID => $courseName, setID => $Set->set_id }));
-	my $problemSetListURL = $self->systemLink(
-		$urlpath->new(type => 'instructor_set_list', args => { courseID => $courseName, setID => $Set->set_id }))
-		. '&editMode=1&visible_sets='
-		. $Set->set_id;
-	my $imageLink = '';
-
-	if ($authz->hasPermissions($user, 'modify_problem_sets')) {
-		$imageLink = CGI::a({ href => $problemSetListURL },
-			CGI::i({ class => 'icon fas fa-pencil-alt', data_alt => 'edit', aria_hidden => 'true' }, ''));
-	}
-
-	my @tableCells;
-	my %fakeRecord;
-	my $set_id = $Set->set_id;
-
-	$fakeRecord{select} = CGI::input({
-		type  => 'checkbox',
-		name  => 'selected_sets',
-		value => $set_id,
-		class => 'form-check-input',
-		$setSelected ? (checked => undef) : (),
-	});
-	$fakeRecord{set_id} =
-		$editMode
-		? CGI::a({ href => $problemListURL }, $set_id)
-		: CGI::span({ class => $visibleClass }, $set_id) . ' ' . $imageLink;
-	$fakeRecord{problems} =
-		(FIELD_PERMS()->{problems} and not $authz->hasPermissions($user, FIELD_PERMS()->{problems}))
-		? $problems
-		: CGI::a({ href => $problemListURL }, "$problems");
-	$fakeRecord{users} =
-		(FIELD_PERMS()->{users} and not $authz->hasPermissions($user, FIELD_PERMS()->{users}))
-		? "$users/$totalUsers"
-		: CGI::a({ href => $usersAssignedToSetURL }, "$users/$totalUsers");
-	$fakeRecord{filename} = CGI::input({ -name => "set.$set_id", -value => "set$set_id.def", -size => 60 });
-
-	# Select
-	if ($editMode) {
-		# No checkbox column in this case.
-		push(@tableCells, CGI::td({ dir => 'ltr' }, CGI::a({ href => $problemListURL }, $prettySetID)));
-	} else {
-		# Set ID
-		my $label = CGI::span(
-			{
-				class             => "set-label set-id-tooltip $visibleClass",
-				data_bs_toggle    => 'tooltip',
-				data_bs_placement => 'right',
-				data_bs_title     => $Set->description()
-			},
-			$prettySetID
-			)
-			. ' '
-			. $imageLink;
-
-		# Selection checkbox
-		push @tableCells,
-			CGI::td(CGI::input({
-				type  => 'checkbox',
-				id    => "${set_id}_id",
-				name  => 'selected_sets',
-				value => $set_id,
-				class => 'form-check-input',
-				$setSelected ? (checked => undef) : (),
-			}));
-
-		push @tableCells,
-			CGI::td(CGI::div(
-				{ class => 'label-with-edit-icon', dir => 'ltr' },
-				CGI::label({ for => "${set_id}_id" }, $label)
-			));
-	}
-
-	# Problems link
-	if (!$editMode) {
-		# "problem list" link
-		push @tableCells, CGI::td(CGI::a({ href => $problemListURL }, $problems));
-	}
-
-	# Users link
-	if (!$editMode) {
-		# "edit users assigned to set" link
-		push @tableCells, CGI::td(CGI::a({ href => $usersAssignedToSetURL }, "$users/$totalUsers"));
-	}
-
-	# determine which non-key fields to show
-	my @fieldsToShow;
-	if ($editMode) {
-		@fieldsToShow = @{ EDIT_FIELD_ORDER() };
-	} elsif ($exportMode) {
-		@fieldsToShow = @{ EXPORT_FIELD_ORDER() };
-	} else {
-		@fieldsToShow = @{ VIEW_FIELD_ORDER() };
-	}
-
-	# Remove the enable reduced scoring box if that feature isnt enabled
-	if (!$ce->{pg}{ansEvalDefaults}{enableReducedScoring}) {
-		@fieldsToShow = grep { !/enable_reduced_scoring|reduced_scoring_date/ } @fieldsToShow;
-	}
-
-	# make a hash out of this so we can test membership easily
-	my %nonkeyfields;
-	@nonkeyfields{ $Set->NONKEYFIELDS } = ();
-
-	# Set Fields
-	for my $field (@fieldsToShow) {
-		next unless exists $nonkeyfields{$field};
-		my $fieldName = 'set.' . $set_id . '.' . $field, my $fieldValue = $Set->$field;
-
-		my %properties = %{ FIELD_PROPERTIES()->{$field} };
-		$properties{access} = 'readonly' unless $editMode;
-
-		$fieldValue = $self->formatDateTime($fieldValue, '', 'datetime_format_short', $ce->{language})
-			if !$editMode && $field =~ /_date/;
-
-		$fieldValue =~ s/ /&nbsp;/g unless $editMode;
-		$fieldValue = $fieldValue ? $r->maketext('Yes') : $r->maketext('No')
-			if $field =~ /visible/ and not $editMode;
-		$fieldValue = $fieldValue ? $r->maketext('Yes') : $r->maketext('No')
-			if $field =~ /enable_reduced_scoring/ and not $editMode;
-		$fieldValue = $fieldValue ? $r->maketext('Yes') : $r->maketext('No')
-			if $field =~ /hide_hint/ and not $editMode;
-
-		push @tableCells,
-			CGI::td(CGI::span(
-				{ class => "d-inline-block w-100 text-center $visibleClass" },
-				$self->fieldEditHTML($fieldName, $fieldValue, \%properties)
-			));
-	}
-
-	return CGI::Tr(@tableCells);
-}
-
-sub printTableHTML {
-	my ($self, $SetsRef, $fieldHeadersRef, %options) = @_;
-	my $r                       = $self->r;
-	my $ce = $r->ce;
-	my $authz                   = $r->authz;
-	my $user                    = $r->param('user');
-	my $setTemplate	            = $self->{setTemplate};
-	my @Sets                    = @$SetsRef;
-	my %fieldHeaders            = %$fieldHeadersRef;
-
-	my $editMode                = $options{editMode};
-	my $exportMode              = $options{exportMode};
-	my %selectedSetIDs          = map { $_ => 1 } @{ $options{selectedSetIDs} };
-	my $currentSort             = $options{currentSort};
-
-	# names of headings:
-	my @realFieldNames = (
-		$setTemplate->KEYFIELDS,
-		$setTemplate->NONKEYFIELDS,
-	);
-
-	if ($editMode) {
-		@realFieldNames = @{ EDIT_FIELD_ORDER() };
-	} else {
-		@realFieldNames = @{ VIEW_FIELD_ORDER() };
-	}
-
-	if ($exportMode) {
-		@realFieldNames = @{ EXPORT_FIELD_ORDER() };
-	}
-
-
-	# Remove the enable reduced scoring box if that feature isnt enabled
-	if (!$ce->{pg}{ansEvalDefaults}{enableReducedScoring}) {
-		@realFieldNames = grep {!/enable_reduced_scoring|reduced_scoring_date/} @realFieldNames;
-	}
-
-	# FIXME: should this always presume to use the templates directory?
-	# (no, but that can wait until we have an abstract ProblemLibrary API -- sam)
-	my $templates_dir = $r->ce->{courseDirs}->{templates};
-	my $exempt_dirs = join "|", keys %{ $r->ce->{courseFiles}->{problibs} };
-	my @headers = listFilesRecursive(
-		$templates_dir,
-		qr/header.*\.pg$/i, # match these files
-		qr/^(?:$exempt_dirs|CVS)$/, # prune these directories
-		0, # match against file name only
-		1, # prune against path relative to $templates_dir
-	);
-
-	@headers = sort @headers;
-	my %headers = map { $_ => $_ } @headers;
-	$headers{""} = $r->maketext("Use System Default");
-	$self->{headerFiles} = \%headers;	# store these header files so we don't have to look for them later.
-
-
-	my @tableHeadings = map { $fieldHeaders{$_} } @realFieldNames;
-
-	if (!$editMode) {
-		unshift @tableHeadings,
-			CGI::th(CGI::input({
-				type              => 'checkbox',
-				id                => 'select-all',
-				aria_label        => $r->maketext('Select all sets'),
-				data_select_group => 'selected_sets',
-				class             => 'select-all form-check-input'
-			}));
-	}
-
-	# Print the table
-	print CGI::start_div({ class => 'table-responsive' });
-	print CGI::start_table({
-		id    => "set_table_id",
-		class => "set_table table table-sm table-bordered caption-top font-sm" . ($editMode ? ' align-middle' : '')
-	});
-
-	print CGI::caption($r->maketext("Set List"));
-
-	print CGI::thead(CGI::Tr(@tableHeadings));
-
-	print CGI::start_tbody();
-	for (my $i = 0; $i < @Sets; $i++) {
-		my $Set = $Sets[$i];
-
-		print $self->recordEditHTML($Set,
-			editMode => $editMode,
-			exportMode => $exportMode,
-			setSelected => exists $selectedSetIDs{$Set->set_id}
-		);
-	}
-	print CGI::end_tbody();
-
-	print CGI::end_table(), CGI::end_div();
-
-	# If there are no users, shown print message.
-	print CGI::p(
-		CGI::i($r->maketext("No sets shown.  Choose one of the options above to list the sets in the course."))
-	) unless @Sets;
-}
-
-# output_JS subroutine
-
-# outputs all of the Javascript required for this page
-
-sub output_JS {
-	my $self = shift;
-	my $ce   = $self->r->ce;
-
-	# Print javascript and style for the flatpickr date/time picker.
-	print CGI::Link({ rel => 'stylesheet', href => getAssetURL($ce, 'node_modules/flatpickr/dist/flatpickr.min.css') });
-	print CGI::Link({
-		rel  => 'stylesheet',
-		href => getAssetURL($ce, 'node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.css')
-	});
-	print CGI::script({ src => getAssetURL($ce, 'node_modules/luxon/build/global/luxon.min.js'), defer => undef }, '');
-	print CGI::script({ src => getAssetURL($ce, 'node_modules/flatpickr/dist/flatpickr.min.js'), defer => undef }, '');
-	if ($ce->{language} !~ /^en/) {
-		print CGI::script(
-			{
-				src => getAssetURL(
-					$ce, 'node_modules/flatpickr/dist/l10n/' . ($ce->{language} =~ s/^(..).*/$1/gr) . '.js'
-				),
-				defer => undef
-			},
-			''
-		);
-	}
-	print CGI::script(
-		{
-			src   => getAssetURL($ce, 'node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.js'),
-			defer => undef
-		},
-		''
-	);
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/DatePicker/datepicker.js'), defer => undef }, '');
-
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/ActionTabs/actiontabs.js'),         defer => undef }, '');
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/ProblemSetList/problemsetlist.js'), defer => undef }, '');
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/ShowHide/show_hide.js'),            defer => undef }, '');
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/SelectAll/selectall.js'),           defer => undef }, '');
-
-	return '';
 }
 
 1;
-
-=head1 AUTHOR
-
-Written by Robert Van Dam, toenail (at) cif.rochester.edu
-
-=cut
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm b/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm
index 7aa7a5dc56..c62b82ef3c 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Instructor::Scoring;
-use base qw(WeBWorK::ContentGenerator::Instructor);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -22,54 +22,46 @@ WeBWorK::ContentGenerator::Instructor::Scoring - Generate scoring data files
 
 =cut
 
-use strict;
-use warnings;
-#use CGI qw(-nosticky );
-use WeBWorK::CGI;
 use WeBWorK::Debug;
-use WeBWorK::Utils qw(readFile seq_to_jitar_id jitar_id_to_seq jitar_problem_adjusted_status wwRound x
-	format_set_name_display);
+use WeBWorK::Utils qw(readFile jitar_id_to_seq jitar_problem_adjusted_status wwRound x);
 use WeBWorK::ContentGenerator::Instructor::FileManager;
 
-our @userInfoColumnHeadings = (x("STUDENT ID"), x("login ID"), x("LAST NAME"), x("FIRST NAME"), x("SECTION"), x("RECITATION"));
-our @userInfoFields = ("student_id", "user_id","last_name", "first_name", "section", "recitation");
+our @userInfoColumnHeadings =
+	(x("STUDENT ID"), x("login ID"), x("LAST NAME"), x("FIRST NAME"), x("SECTION"), x("RECITATION"));
+our @userInfoFields = ("student_id", "user_id", "last_name", "first_name", "section", "recitation");
 
-sub initialize {
-	my ($self)     = @_;
-	my $r          = $self->r;
-	my $urlpath    = $r->urlpath;
-	my $ce         = $r->ce;
-	my $db         = $r->db;
-	my $authz      = $r->authz;
+sub initialize ($c) {
+	my $ce         = $c->ce;
+	my $db         = $c->db;
+	my $authz      = $c->authz;
 	my $scoringDir = $ce->{courseDirs}->{scoring};
-	my $courseName = $urlpath->arg("courseID");
-	my $user       = $r->param('user');
+	my $courseName = $c->stash('courseID');
+	my $user       = $c->param('user');
 
 	# Check permission
 	return unless $authz->hasPermissions($user, "access_instructor_tools");
 	return unless $authz->hasPermissions($user, "score_sets");
 
-	my @selected = $r->param('selectedSet');
-	my $scoreSelected = $r->param('scoreSelected');
-	my $scoringFileName = $r->param('scoringFileName') || "${courseName}_totals";
-	$scoringFileName =~ s/\.csv\s*$//; $scoringFileName .='.csv';  # must end in .csv
-	my $scoringFileNameOK = (
-		$scoringFileName eq  WeBWorK::ContentGenerator::Instructor::FileManager::checkName($scoringFileName)
-	);
-	$self->{scoringFileName}=$scoringFileName;
+	my @selected        = $c->param('selectedSet');
+	my $scoringFileName = $c->param('scoringFileName') || "${courseName}_totals";
+	$scoringFileName =~ s/\.csv\s*$//;
+	$scoringFileName .= '.csv';    # must end in .csv
+	my $scoringFileNameOK =
+		($scoringFileName eq WeBWorK::ContentGenerator::Instructor::FileManager::checkName($scoringFileName));
+	$c->{scoringFileName} = $scoringFileName;
 
-	$self->{padFields}  = defined($r->param('padFields') ) ? 1 : 0;
-	$self->{includePercentEachSet} = defined($r->param('includePercentEachSet') ) ? 1 : 0;
+	$c->{padFields}             = defined($c->param('padFields'))             ? 1 : 0;
+	$c->{includePercentEachSet} = defined($c->param('includePercentEachSet')) ? 1 : 0;
 
 	# Save the list of global sets sorted by set_id.
 	my @setRecords = $db->getGlobalSetsWhere({}, 'set_id');
-	$self->{ra_set_ids} = [ map { $_->set_id } @setRecords ];
-	$self->{rh_set_records} = { map { $_->set_id => $_ } @setRecords };
+	$c->{ra_set_ids}     = [ map { $_->set_id } @setRecords ];
+	$c->{rh_set_records} = { map { $_->set_id => $_ } @setRecords };
 
-	if (defined $scoreSelected && @selected && $scoringFileNameOK) {
+	if (@selected && $scoringFileNameOK) {
 
-		my @totals                 = ();
-		my $recordSingleSetScores  = $r->param('recordSingleSetScores');
+		my @totals                = ();
+		my $recordSingleSetScores = $c->param('recordSingleSetScores');
 
 		# Get all users sorted by last_name, then first_name, then user_id.
 		debug("pre-fetching users");
@@ -83,199 +75,46 @@ sub initialize {
 		}
 		debug("done pre-fetching users");
 
-		my $scoringType            = ($recordSingleSetScores) ?'everything':'totals';
-		my (@everything, @normal,@full,@info,@totalsColumn);
-		@info             = $self->scoreSet($selected[0], "info", undef, \%Users, \@sortedUserIDs) if defined($selected[0]);
-		@totals           = @info;
-		my $showIndex     = defined($r->param('includeIndex')) ? defined($r->param('includeIndex')) : 0;
-
+		my $scoringType = ($recordSingleSetScores) ? 'everything' : 'totals';
+		my (@everything, @normal, @full, @info, @totalsColumn);
+		@info   = $c->scoreSet($selected[0], "info", undef, \%Users, \@sortedUserIDs) if defined($selected[0]);
+		@totals = @info;
+		my $showIndex = defined($c->param('includeIndex')) ? defined($c->param('includeIndex')) : 0;
 
 		foreach my $setID (@selected) {
-		    next unless defined $setID;
+			next unless defined $setID;
 			if ($scoringType eq 'everything') {
-				@everything = $self->scoreSet($setID, "everything", $showIndex, \%Users, \@sortedUserIDs);
-				@normal = $self->everything2normal(@everything);
-				@full = $self->everything2full(@everything);
-				@info = $self->everything2info(@everything);
-				@totalsColumn = $self->everything2totals(@everything);
-				$self->appendColumns(\@totals, \@totalsColumn);
-				$self->writeCSV("$scoringDir/s${setID}scr.csv", @normal);
-				$self->writeCSV("$scoringDir/s${setID}ful.csv", @full);
+				@everything   = $c->scoreSet($setID, "everything", $showIndex, \%Users, \@sortedUserIDs);
+				@normal       = $c->everything2normal(@everything);
+				@full         = $c->everything2full(@everything);
+				@info         = $c->everything2info(@everything);
+				@totalsColumn = $c->everything2totals(@everything);
+				$c->appendColumns(\@totals, \@totalsColumn);
+				$c->writeCSV("$scoringDir/s${setID}scr.csv", @normal);
+				$c->writeCSV("$scoringDir/s${setID}ful.csv", @full);
 			} else {
-				@totalsColumn  = $self->scoreSet($setID, "totals", $showIndex, \%Users, \@sortedUserIDs);
-				$self->appendColumns(\@totals, \@totalsColumn);
+				@totalsColumn = $c->scoreSet($setID, "totals", $showIndex, \%Users, \@sortedUserIDs);
+				$c->appendColumns(\@totals, \@totalsColumn);
 			}
 		}
-		my @sum_scores  = $self->sumScores(\@totals, $showIndex, \%Users, \@sortedUserIDs, $self->{includePercentEachSet});
-		$self->appendColumns( \@totals,\@sum_scores);
-		$self->writeCSV("$scoringDir/$scoringFileName", @totals);
+		my @sum_scores = $c->sumScores(\@totals, $showIndex, \%Users, \@sortedUserIDs, $c->{includePercentEachSet});
+		$c->appendColumns(\@totals, \@sum_scores);
+		$c->writeCSV("$scoringDir/$scoringFileName", @totals);
 
 	} else {
-		if ($r->param('score-sets') && !@selected) {  # nothing selected for scoring
-			$self->addbadmessage($r->maketext("You must select one or more sets for scoring!"));
-		}
-		if (!$scoringFileNameOK) { # fileName is not properly formed
-			$self->addbadmessage($r->maketext("Your file name is not valid! "));
-		    $self->addbadmessage($r->maketext("A file name cannot begin with a dot, it cannot be empty, it cannot contain a " .
-				 "directory path component and only the characters -_.a-zA-Z0-9 and space are allowed.")
-			);
-		}
-	}
-}
-
-
-sub body {
-	my ($self)      = @_;
-	my $r           = $self->r;
-	my $urlpath     = $r->urlpath;
-	my $ce          = $r->ce;
-	my $authz       = $r->authz;
-	my $scoringDir  = $ce->{courseDirs}->{scoring};
-	my $courseName  = $urlpath->arg("courseID");
-	my $user        = $r->param('user');
-
-	my $scoringPage       = $urlpath->newFromModule($urlpath->module, $r, courseID => $courseName);
-	my $scoringURL        = $self->systemLink($scoringPage, authen=>0);
-
-	my $scoringDownloadPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::ScoringDownload", $r,
-	                                      courseID => $courseName
-	);
-
-	my $scoringFileName = $self->{scoringFileName};
-
-	# Check permissions
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-		"You are not authorized to access the Instructor tools.")
-		unless $authz->hasPermissions($user, "access_instructor_tools");
-
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' }, "You are not authorized to score sets.")
-		unless $authz->hasPermissions($user, "score_sets");
-
-	print CGI::div(
-		{ class => 'border border-dark p-2', style => 'max-width:700px' },
-		CGI::start_form({ name => 'scoring-form', id => 'scoring-form', method => 'POST', action => $scoringURL }),
-		$self->hidden_authen_fields,
-		CGI::hidden({ name => 'scoreSelected', value => 1 }),
-		CGI::div(
-			{ class => 'row' },
-			CGI::div(
-				{ class => 'col-sm-5 mb-2' },
-				CGI::label({ for => 'selectedSet', class => 'form-label' }, $r->maketext('Selected sets:')),
-				CGI::scrolling_list({
-					name     => 'selectedSet',
-					id       => 'selectedSet',
-					values   => $self->{ra_set_ids},
-					labels   => { map { $_ => format_set_name_display($_) } @{ $self->{ra_set_ids} } },
-					defaults => [ $self->r->param('selectedSet') ],
-					size     => 10,
-					multiple => 1,
-					class    => 'form-select',
-					dir      => 'ltr'
-				})
-			),
-			CGI::div(
-				{ class => 'col-sm-7 my-sm-auto mb-2' },
-				CGI::div(
-					{ class => 'form-check' },
-					CGI::checkbox({
-						name            => 'includeIndex',
-						value           => 1,
-						label           => $r->maketext('Include Success Index'),
-						checked         => $r->param('includeIndex') // 0,
-						class           => 'form-check-input',
-						labelattributes => { class => 'form-check-label' }
-					})
-				),
-				CGI::div(
-					{ class => 'form-check' },
-					CGI::checkbox({
-						name            => 'recordSingleSetScores',
-						value           => 1,
-						label           => $r->maketext('Record Scores for Single Sets'),
-						checked         => $r->param('recordSingleSetScores') // 0,
-						class           => 'form-check-input',
-						labelattributes => { class => 'form-check-label' }
-					})
-				),
-				CGI::div(
-					{ class => 'form-check' },
-					CGI::checkbox({
-						name            => 'padFields',
-						value           => 1,
-						label           => $r->maketext('Pad Fields'),
-						checked         => $r->param('padFields') // 1,
-						class           => 'form-check-input',
-						labelattributes => { class => 'form-check-label' }
-					})
-				),
-				CGI::div(
-					{ class => 'form-check' },
-					CGI::checkbox({
-						name            => 'includePercentEachSet',
-						value           => 1,
-						label           => $r->maketext('Include percentage grades columns for all sets'),
-						checked         => $r->param('includePercentEachSet') // 1,
-						class           => 'form-check-input',
-						labelattributes => { class => 'form-check-label' }
-					})
-				)
-			)
-			),
-		CGI::div(
-			{ class => 'd-flex flex-sm-nowrap flex-wrap' },
-			CGI::input({
-				type  => 'submit',
-				value => $r->maketext('Score selected set(s) and save to:'),
-				name  => 'score-sets',
-				id    => 'score-sets',
-				class => 'btn btn-primary btn-sm me-2 mb-sm-0 mb-2'
-			}),
-			CGI::textfield({
-				name            => 'scoringFileName',
-				size            => '40',
-				value           => $scoringFileName,
-				class           => 'form-control form-control-sm',
-				aria_labelledby => 'score-sets'
-			})
-		),
-		CGI::end_form()
-	);
-
-	if ($authz->hasPermissions($user, "score_sets")) {
-		my @selected = $r->param('selectedSet');
-		if (@selected) {
-			print CGI::p($r->maketext("All of these files will also be made available for mail merge."));
-		}
-		foreach my $setID (@selected) {
-
-			my @validFiles;
-			foreach my $type ("scr", "ful") {
-				my $filename = "s$setID$type.csv";
-				my $path = "$scoringDir/$filename";
-				push @validFiles, $filename if -f $path;
-			}
-			if (@validFiles) {
-				print CGI::h2("$setID");
-				foreach my $filename (@validFiles) {
-					#print CGI::a({href=>"../scoringDownload/?getFile=${filename}&".$self->url_authen_args}, $filename);
-					print CGI::a({href=>$self->systemLink($scoringDownloadPage,
-					               params=>{getFile => $filename } )}, $filename);
-					print CGI::br();
-				}
-				print CGI::hr();
-			}
+		if ($c->param('score-sets') && !@selected) {    # nothing selected for scoring
+			$c->addbadmessage($c->maketext("You must select one or more sets for scoring!"));
 		}
-		if (-f "$scoringDir/$scoringFileName") {
-			print CGI::h2($r->maketext("Totals"));
-			#print CGI::a({href=>"../scoringDownload/?getFile=${courseName}_totals.csv&".$self->url_authen_args}, "${courseName}_totals.csv");
-			print CGI::a({href=>$self->systemLink($scoringDownloadPage,
-					               params=>{getFile => "$scoringFileName" } )}, "$scoringFileName");
-			print CGI::hr();
-			print CGI::pre({style=>'font-size:smaller'},WeBWorK::Utils::readFile("$scoringDir/$scoringFileName"));
+		if (!$scoringFileNameOK) {                      # fileName is not properly formed
+			$c->addbadmessage($c->maketext("Your file name is not valid! "));
+			$c->addbadmessage($c->maketext(
+				"A file name cannot begin with a dot, it cannot be empty, it cannot contain a "
+					. "directory path component and only the characters -_.a-zA-Z0-9 and space are allowed."
+			));
 		}
 	}
 
-	return "";
+	return;
 }
 
 # If, some day, it becomes possible to assign a different number of problems to each student, this code
@@ -286,122 +125,110 @@ sub body {
 #   everything: "full" plus a totals column
 #   info: student info columns only
 #   totals: total column only
-sub scoreSet {
-	my ($self, $setID, $format, $showIndex, $UsersRef, $sortedUserIDsRef) = @_;
-	my $r  = $self->r;
-	my $db = $r->db;
+sub scoreSet ($c, $setID, $format, $showIndex, $UsersRef, $sortedUserIDsRef) {
+	my $db = $c->db;
 	my @scoringData;
-	my $scoringItems   = {    info             => 0,
-		                      successIndex     => 0,
-		                      setTotals        => 0,
-		                      problemScores    => 0,
-		                      problemAttempts  => 0,
-		                      header           => 0,
+	my $scoringItems = {
+		info            => 0,
+		successIndex    => 0,
+		setTotals       => 0,
+		problemScores   => 0,
+		problemAttempts => 0,
+		header          => 0,
 	};
 	$format = "normal" unless defined $format;
 	$format = "normal" unless $format eq "full" or $format eq "everything" or $format eq "totals" or $format eq "info";
 	my $columnsPerProblem = ($format eq "full" or $format eq "everything") ? 3 : 1;
 
-	my $setRecord = $self->{rh_set_records}{$setID};
+	my $setRecord = $c->{rh_set_records}{$setID};
 	die "global set $setID not found. " unless $setRecord;
-	#my %users;
-	#my %userStudentID=();
-	#foreach my $userID ($db->listUsers()) {
-	#	my $userRecord = $db->getUser($userID); # checked
-	#	die "user record for $userID not found" unless $userID;
-	#	# FIXME: if two users have the same student ID, the second one will
-	#	# clobber the first one. this is bad!
-	#	# The key is what we'd like to sort by.
-	#	$users{$userRecord->student_id} = $userRecord;
-	#	$userStudentID{$userID} = $userRecord->student_id;
-	#}
-
-	my %Users = %$UsersRef; # user objects hashed on user ID
-	my @sortedUserIDs = @$sortedUserIDsRef; # user IDs sorted by student ID
+
+	my %Users         = %$UsersRef;            # user objects hashed on user ID
+	my @sortedUserIDs = @$sortedUserIDsRef;    # user IDs sorted by student ID
 
 	my @problemIDs = $db->listGlobalProblems($setID);
 
 	my $isJitarSet = $setRecord->assignment_type eq 'jitar';
 
 	if ($isJitarSet) {
-	  $columnsPerProblem++
-	};
-
+		$columnsPerProblem++;
+	}
 
 	# determine what information will be returned
 	if ($format eq 'normal') {
-		$scoringItems  = {    info             => 1,
-		                      successIndex     => $showIndex,
-		                      setTotals        => 1,
-		                      problemScores    => 1,
-		                      problemAttempts  => 0,
-		                      header           => 1,
+		$scoringItems = {
+			info            => 1,
+			successIndex    => $showIndex,
+			setTotals       => 1,
+			problemScores   => 1,
+			problemAttempts => 0,
+			header          => 1,
 		};
 	} elsif ($format eq 'full') {
-		$scoringItems  = {    info             => 1,
-		                      successIndex     => $showIndex,
-		                      setTotals        => 0,
-		                      problemScores    => 1,
-		                      problemAttempts  => 1,
-		                      header           => 1,
+		$scoringItems = {
+			info            => 1,
+			successIndex    => $showIndex,
+			setTotals       => 0,
+			problemScores   => 1,
+			problemAttempts => 1,
+			header          => 1,
 		};
 	} elsif ($format eq 'everything') {
-		$scoringItems  = {    info             => 1,
-		                      successIndex     => $showIndex,
-		                      setTotals        => 1,
-		                      problemScores    => 1,
-		                      problemAttempts  => 1,
-		                      header           => 1,
+		$scoringItems = {
+			info            => 1,
+			successIndex    => $showIndex,
+			setTotals       => 1,
+			problemScores   => 1,
+			problemAttempts => 1,
+			header          => 1,
 		};
 	} elsif ($format eq 'totals') {
-		$scoringItems  = {    info             => 0,
-		                      successIndex     => $showIndex,
-		                      setTotals        => 1,
-		                      problemScores    => 0,
-		                      problemAttempts  => 0,
-		                      header           => 0,
+		$scoringItems = {
+			info            => 0,
+			successIndex    => $showIndex,
+			setTotals       => 1,
+			problemScores   => 0,
+			problemAttempts => 0,
+			header          => 0,
 		};
 	} elsif ($format eq 'info') {
-		$scoringItems  = {    info             => 0,
-		                      successIndex     => 0,
-		                      setTotals        => 0,
-		                      problemScores    => 0,
-		                      problemAttempts  => 0,
-		                      header           => 1,
+		$scoringItems = {
+			info            => 0,
+			successIndex    => 0,
+			setTotals       => 0,
+			problemScores   => 0,
+			problemAttempts => 0,
+			header          => 1,
 		};
 	} else {
 		warn "unrecognized format";
 	}
 
 	# Initialize a two-dimensional array of the proper size
-	for (my $i = 0; $i < @sortedUserIDs + 7; $i++) { # 7 is how many descriptive fields there are in each column
+	for (my $i = 0; $i < @sortedUserIDs + 7; $i++) {    # 7 is how many descriptive fields there are in each column
 		push @scoringData, [];
 	}
 
-	#my @userKeys = sort keys %users; # list of "student IDs" NOT user IDs
-
 	if ($scoringItems->{header}) {
-		$scoringData[0][0] = $r->maketext("NO OF FIELDS");
-		$scoringData[1][0] = $r->maketext("SET NAME");
-		$scoringData[2][0] = $r->maketext("PROB NUMBER");
-		$scoringData[3][0] = $r->maketext("CLOSE DATE");
-		$scoringData[4][0] = $r->maketext("CLOSE TIME");
-		$scoringData[5][0] = $r->maketext("PROB VALUE");
-
+		$scoringData[0][0] = $c->maketext("NO OF FIELDS");
+		$scoringData[1][0] = $c->maketext("SET NAME");
+		$scoringData[2][0] = $c->maketext("PROB NUMBER");
+		$scoringData[3][0] = $c->maketext("CLOSE DATE");
+		$scoringData[4][0] = $c->maketext("CLOSE TIME");
+		$scoringData[5][0] = $c->maketext("PROB VALUE");
 
+		# Write identifying information about the users
 
-	# Write identifying information about the users
-
-		for (my $field=0; $field < @userInfoFields; $field++) {
+		for (my $field = 0; $field < @userInfoFields; $field++) {
 			if ($field > 0) {
 				for (my $i = 0; $i < 6; $i++) {
 					$scoringData[$i][$field] = "";
 				}
 			}
-			$scoringData[6][$field] = $r->maketext($userInfoColumnHeadings[$field]);
+			$scoringData[6][$field] = $c->maketext($userInfoColumnHeadings[$field]);
 			for (my $user = 0; $user < @sortedUserIDs; $user++) {
 				my $fieldName = $userInfoFields[$field];
-				$scoringData[$user + 7][$field] = $Users{$sortedUserIDs[$user]}->$fieldName;
+				$scoringData[ $user + 7 ][$field] = $Users{ $sortedUserIDs[$user] }->$fieldName;
 			}
 		}
 	}
@@ -409,82 +236,80 @@ sub scoreSet {
 
 	# pre-fetch global problems
 	debug("pre-fetching global problems for set $setID");
-	my %GlobalProblems = map { $_->problem_id => $_ }
-		$db->getAllGlobalProblems($setID);
+	my %GlobalProblems = map { $_->problem_id => $_ } $db->getAllGlobalProblems($setID);
 	debug("done pre-fetching global problems for set $setID");
 
 	# pre-fetch user problems
 	debug("pre-fetching user problems for set $setID");
-	my %UserProblems; # $UserProblems{$userID}{$problemID}
-
-  # Gateway change here: for non-gateway (non-versioned) sets, we just
-  # get each user's problems.  For gateway (versioned) sets, we get the
-  # user's best version and return that
-	if ( ! defined( $setRecord->assignment_type() ) ||
-	     $setRecord->assignment_type() !~ /gateway/) {
+	my %UserProblems;    # $UserProblems{$userID}{$problemID}
+
+	# Gateway change here: for non-gateway (non-versioned) sets, we just
+	# get each user's problems.  For gateway (versioned) sets, we get the
+	# user's best version and return that
+	if (!defined($setRecord->assignment_type())
+		|| $setRecord->assignment_type() !~ /gateway/)
+	{
 		foreach my $userID (@sortedUserIDs) {
-			my %CurrUserProblems = map { $_->problem_id => $_ }
-				$db->getAllMergedUserProblems($userID, $setID);
+			my %CurrUserProblems = map { $_->problem_id => $_ } $db->getAllMergedUserProblems($userID, $setID);
 			$UserProblems{$userID} = \%CurrUserProblems;
 		}
-	} elsif ($setRecord->assignment_type() =~ /gateway/) {  # versioned sets; get the problems for the best version
+	} elsif ($setRecord->assignment_type() =~ /gateway/) {    # versioned sets; get the problems for the best version
 
 		foreach my $userID (@sortedUserIDs) {
 			my $CurrUserProblems = {};
-			my @versionNums = $db->listSetVersions($userID,$setID);
+			my @versionNums      = $db->listSetVersions($userID, $setID);
 
 			my $bestScore = -1;
 
-			if ( @versionNums ) {
-			    for my $i ( @versionNums ) {
-				my %versionUserProblems = map { $_->problem_id => $_ }
-					$db->getAllMergedProblemVersions( $userID, $setID, $i );
-				my $score = 0;
-				foreach ( values ( %versionUserProblems ) ) {
-					my $status = $_->status || 0;
-					my $value = $_->value || 1;
-				# some of these are coming in null; I'm not
-				# why, or if this should be necessary
-					$_->status($status);
-					$_->value($value);
-					$score += $status*$value;
-				}
-				if ( $score > $bestScore ) {
-					$CurrUserProblems = \%versionUserProblems;
-					$bestScore = $score;
+			if (@versionNums) {
+				for my $i (@versionNums) {
+					my %versionUserProblems =
+						map { $_->problem_id => $_ } $db->getAllMergedProblemVersions($userID, $setID, $i);
+					my $score = 0;
+					foreach (values(%versionUserProblems)) {
+						my $status = $_->status || 0;
+						my $value  = $_->value // 1;
+						# some of these are coming in null; I'm not
+						# why, or if this should be necessary
+						$_->status($status);
+						$_->value($value);
+						$score += $status * $value;
+					}
+					if ($score > $bestScore) {
+						$CurrUserProblems = \%versionUserProblems;
+						$bestScore        = $score;
+					}
 				}
-			    }
 			} else {
-			    my %cp = map { $_->problem_id => $_ }
-				$db->getAllMergedUserProblems($userID, $setID);
-			    $CurrUserProblems = \%cp;
+				my %cp = map { $_->problem_id => $_ } $db->getAllMergedUserProblems($userID, $setID);
+				$CurrUserProblems = \%cp;
 			}
 			$UserProblems{$userID} = { %{$CurrUserProblems} };
 		}
 	}
 
-
 	debug("done pre-fetching user problems for set $setID");
 
 	# Write the problem data
-	my $dueDateString = $self->formatDateTime($setRecord->due_date);
+	my $dueDateString = $c->formatDateTime($setRecord->due_date);
 	my ($dueDate, $dueTime) = $dueDateString =~ /^(.*) at (.*)$/;
-	my $valueTotal = 0;
+	my $valueTotal       = 0;
 	my %userStatusTotals = ();
 	my %userSuccessIndex = ();
 	my %numberOfAttempts = ();
 	my $num_of_problems  = @problemIDs;
+
 	for (my $problem = 0; $problem < @problemIDs; $problem++) {
 
 		#my $globalProblem = $db->getGlobalProblem($setID, $problemIDs[$problem]); #checked
-		my $globalProblem = $GlobalProblems{$problemIDs[$problem]};
+		my $globalProblem = $GlobalProblems{ $problemIDs[$problem] };
 		die "global problem $problemIDs[$problem] not found for set $setID" unless $globalProblem;
 
 		my $column = 5 + $problem * $columnsPerProblem;
 		if ($scoringItems->{header}) {
-		        my $prettyProblemID = $globalProblem->problem_id;
-		        if ($isJitarSet && $globalProblem->problem_id) {
-			  $prettyProblemID = join('.',jitar_id_to_seq($prettyProblemID));
+			my $prettyProblemID = $globalProblem->problem_id;
+			if ($isJitarSet && $globalProblem->problem_id) {
+				$prettyProblemID = join('.', jitar_id_to_seq($prettyProblemID));
 			}
 
 			$scoringData[0][$column] = "";
@@ -493,49 +318,48 @@ sub scoreSet {
 			$scoringData[3][$column] = $dueDate;
 			$scoringData[4][$column] = $dueTime;
 			$scoringData[5][$column] = $globalProblem->value;
-			$scoringData[6][$column] = $r->maketext("STATUS");
+			$scoringData[6][$column] = $c->maketext("STATUS");
 			my $extraColumns = 0;
+
 			if ($isJitarSet) {
-			  $extraColumns++;
-			  $scoringData[6][$column + $extraColumns] = $r->maketext("ADJ STATUS");
+				$extraColumns++;
+				$scoringData[6][ $column + $extraColumns ] = $c->maketext("ADJ STATUS");
 			}
 
-			if ($scoringItems->{header} and
-			    $scoringItems->{problemAttempts}) { # Fill in with blanks, or maybe the problem number
-			  $extraColumns++;
-			  $scoringData[6][$column + $extraColumns] = $r->maketext("#corr");
-			  $extraColumns++;
-			  $scoringData[6][$column + $extraColumns] = $r->maketext("#incorr");
+			if ($scoringItems->{header}
+				and $scoringItems->{problemAttempts})
+			{    # Fill in with blanks, or maybe the problem number
+				$extraColumns++;
+				$scoringData[6][ $column + $extraColumns ] = $c->maketext("#corr");
+				$extraColumns++;
+				$scoringData[6][ $column + $extraColumns ] = $c->maketext("#incorr");
 			}
 
 			for (my $row = 0; $row < 6; $row++) {
-			  for (my $col = $column+1; $col <= $column + $extraColumns; $col++) {
-			    if ($row == 2) {
-			      $scoringData[$row][$col] = $prettyProblemID;
-			    } else {
-			      $scoringData[$row][$col] = "";
-			    }
-			  }
+				for (my $col = $column + 1; $col <= $column + $extraColumns; $col++) {
+					if ($row == 2) {
+						$scoringData[$row][$col] = $prettyProblemID;
+					} else {
+						$scoringData[$row][$col] = "";
+					}
+				}
 			}
 
-
 		}
 		# if its a jitar set then we only want to add top level problems to the value total
 		# otherwise we add up everything
 		if ($isJitarSet && $globalProblem->problem_id) {
-		    my @seq = jitar_id_to_seq($globalProblem->problem_id);
-		    if ($#seq == 0) {
-			$valueTotal += $globalProblem->value;
-		    }
+			my @seq = jitar_id_to_seq($globalProblem->problem_id);
+			if ($#seq == 0) {
+				$valueTotal += $globalProblem->value;
+			}
 		} else {
-		    $valueTotal += $globalProblem->value;
+			$valueTotal += $globalProblem->value;
 		}
 
 		for (my $user = 0; $user < @sortedUserIDs; $user++) {
-			#my $userProblem = $userProblems{    $users{$userKeys[$user]}->user_id   };
-			#my $userProblem = $UserProblems{$sers{$userKeys[$user]}->user_id}{$problemIDs[$problem]};
-			my $userProblem = $UserProblems{$sortedUserIDs[$user]}{$problemIDs[$problem]};
-			unless (defined $userProblem) { # assume an empty problem record if the problem isn't assigned to this user
+			my $userProblem = $UserProblems{ $sortedUserIDs[$user] }{ $problemIDs[$problem] };
+			unless (defined $userProblem) {  # assume an empty problem record if the problem isn't assigned to this user
 				$userProblem = $db->newUserProblem;
 				$userProblem->status(0);
 				$userProblem->value(0);
@@ -543,78 +367,85 @@ sub scoreSet {
 				$userProblem->num_incorrect(0);
 			}
 			$userStatusTotals{$user} = 0 unless exists $userStatusTotals{$user};
-			my $user_problem_status          = ($userProblem->status =~/^[\d\.]+$/) ? $userProblem->status : 0; # ensure it's numeric
-			# the grade is the adjusted status if its a jitar set
-			# and this is an actual problem
+			my $user_problem_status =
+				($userProblem->status =~ /^[\d\.]+$/) ? $userProblem->status : 0;    # ensure it's numeric
+				# the grade is the adjusted status if its a jitar set
+				# and this is an actual problem
 			if ($isJitarSet && $userProblem->value) {
-			    $user_problem_status = jitar_problem_adjusted_status($userProblem, $db);
+				$user_problem_status = jitar_problem_adjusted_status($userProblem, $db);
 			}
 
 			# if its a jitar set then we only want to add top level problems
 			# to the student total score
 			# otherwise we add up everything
 			if ($isJitarSet && $userProblem->problem_id) {
-			    my @seq = jitar_id_to_seq($userProblem->problem_id);
-			    if ($#seq == 0) {
-				$userStatusTotals{$user} += $user_problem_status * $userProblem->value;
-			    }
+				my @seq = jitar_id_to_seq($userProblem->problem_id);
+				if ($#seq == 0) {
+					$userStatusTotals{$user} += $user_problem_status * $userProblem->value;
+				}
 			} else {
-			    $userStatusTotals{$user} += $user_problem_status * $userProblem->value;
+				$userStatusTotals{$user} += $user_problem_status * $userProblem->value;
 			}
 
-			if ($scoringItems->{successIndex})   {
-				$numberOfAttempts{$user}  = 0 unless defined($numberOfAttempts{$user});
-				my $num_correct     = $userProblem->num_correct;
-				my $num_incorrect   = $userProblem->num_incorrect;
-				$num_correct        = ( defined($num_correct) and $num_correct) ? $num_correct : 0;
-				$num_incorrect      = ( defined($num_incorrect) and $num_incorrect) ? $num_incorrect : 0;
+			if ($scoringItems->{successIndex}) {
+				$numberOfAttempts{$user} = 0 unless defined($numberOfAttempts{$user});
+				my $num_correct   = $userProblem->num_correct;
+				my $num_incorrect = $userProblem->num_incorrect;
+				$num_correct   = (defined($num_correct)   and $num_correct)   ? $num_correct   : 0;
+				$num_incorrect = (defined($num_incorrect) and $num_incorrect) ? $num_incorrect : 0;
 				$numberOfAttempts{$user} += $num_correct + $num_incorrect;
 			}
 			if ($scoringItems->{problemScores}) {
-			  $scoringData[7 + $user][$column] = $userProblem->status;
-			  my $extraColumns = 0;
-			  if ($isJitarSet) {
-			    $extraColumns++;
-			    $scoringData[7 + $user][$column + $extraColumns] = $user_problem_status;
-			  }
-			  if ($scoringItems->{problemAttempts}) {
-			    $extraColumns++;
-			    $scoringData[7 + $user][$column + $extraColumns] = $userProblem->num_correct;
-			    $extraColumns++;
-			    $scoringData[7 + $user][$column + $extraColumns] = $userProblem->num_incorrect;
-			  }
+				$scoringData[ 7 + $user ][$column] = $userProblem->status;
+				my $extraColumns = 0;
+				if ($isJitarSet) {
+					$extraColumns++;
+					$scoringData[ 7 + $user ][ $column + $extraColumns ] = $user_problem_status;
+				}
+				if ($scoringItems->{problemAttempts}) {
+					$extraColumns++;
+					$scoringData[ 7 + $user ][ $column + $extraColumns ] = $userProblem->num_correct;
+					$extraColumns++;
+					$scoringData[ 7 + $user ][ $column + $extraColumns ] = $userProblem->num_incorrect;
+				}
 			}
 		}
 	}
 	if ($scoringItems->{successIndex}) {
 		for (my $user = 0; $user < @sortedUserIDs; $user++) {
-			my $avg_num_attempts = ($num_of_problems) ? $numberOfAttempts{$user}/$num_of_problems : 0;
-			$userSuccessIndex{$user} = ($avg_num_attempts && $valueTotal) ? ($userStatusTotals{$user}/$valueTotal)**2/$avg_num_attempts : 0;
+			my $avg_num_attempts = ($num_of_problems) ? $numberOfAttempts{$user} / $num_of_problems : 0;
+			$userSuccessIndex{$user} =
+				($avg_num_attempts && $valueTotal)
+				? ($userStatusTotals{$user} / $valueTotal)**2 / $avg_num_attempts
+				: 0;
 		}
 	}
 	# write the status totals
-	if ($scoringItems->{setTotals}) { # Ironic, isn't it?
+	if ($scoringItems->{setTotals}) {    # Ironic, isn't it?
 		my $totalsColumn = $format eq "totals" ? 0 : 5 + @problemIDs * $columnsPerProblem;
-		$scoringData[0][$totalsColumn]    = "";
-		$scoringData[1][$totalsColumn]    = $setRecord->set_id;
-		$scoringData[2][$totalsColumn]    = "";
-		$scoringData[3][$totalsColumn]    = "";
-		$scoringData[4][$totalsColumn]    = "";
-		$scoringData[5][$totalsColumn]    = $valueTotal;
-		$scoringData[6][$totalsColumn]    = $r->maketext("total");
+		$scoringData[0][$totalsColumn] = "";
+		$scoringData[1][$totalsColumn] = $setRecord->set_id;
+		$scoringData[2][$totalsColumn] = "";
+		$scoringData[3][$totalsColumn] = "";
+		$scoringData[4][$totalsColumn] = "";
+		$scoringData[5][$totalsColumn] = $valueTotal;
+		$scoringData[6][$totalsColumn] = $c->maketext("total");
+
 		if ($scoringItems->{successIndex}) {
-			$scoringData[0][$totalsColumn+1]    = "";
-			$scoringData[1][$totalsColumn+1]    = $setRecord->set_id;
-			$scoringData[2][$totalsColumn+1]    = "";
-			$scoringData[3][$totalsColumn+1]    = "";
-			$scoringData[4][$totalsColumn+1]    = "";
-			$scoringData[5][$totalsColumn+1]    = '100';
-			$scoringData[6][$totalsColumn+1]  = $r->maketext("index");
+			$scoringData[0][ $totalsColumn + 1 ] = "";
+			$scoringData[1][ $totalsColumn + 1 ] = $setRecord->set_id;
+			$scoringData[2][ $totalsColumn + 1 ] = "";
+			$scoringData[3][ $totalsColumn + 1 ] = "";
+			$scoringData[4][ $totalsColumn + 1 ] = "";
+			$scoringData[5][ $totalsColumn + 1 ] = '100';
+			$scoringData[6][ $totalsColumn + 1 ] = $c->maketext("index");
 		}
 		for (my $user = 0; $user < @sortedUserIDs; $user++) {
-            $userStatusTotals{$user} =$userStatusTotals{$user} ||0;
-			$scoringData[7+$user][$totalsColumn] = wwRound(2,$userStatusTotals{$user}) if $scoringItems->{setTotals};
-			$scoringData[7+$user][$totalsColumn+1] = sprintf("%.0f",100*$userSuccessIndex{$user}) if $scoringItems->{successIndex};
+			$userStatusTotals{$user} = $userStatusTotals{$user} || 0;
+			$scoringData[ 7 + $user ][$totalsColumn] = wwRound(2, $userStatusTotals{$user})
+				if $scoringItems->{setTotals};
+			$scoringData[ 7 + $user ][ $totalsColumn + 1 ] = sprintf("%.0f", 100 * $userSuccessIndex{$user})
+				if $scoringItems->{successIndex};
 
 		}
 	}
@@ -622,111 +453,109 @@ sub scoreSet {
 	return @scoringData;
 }
 
-sub sumScores {    # Create a totals column for each student
-	# Also create columns with percentage grades per assignment if requested
-	my $self        = shift;
-	my $r_totals    = shift;
-	my $showIndex   = shift;
-	my $r_users     = shift;
-	my $r_sorted_user_ids =shift;
-	my $addPercentagePerAssignmentColumns = shift;
-	my $r           = $self->r;
-	my $db          = $r->db;
-	my @scoringData = ();
-	my $index_increment  = ($showIndex) ? 2 : 1;
+# Create a totals column for each student
+# Also create columns with percentage grades per assignment if requested
+sub sumScores ($c, $r_totals, $showIndex, $r_users, $r_sorted_user_ids, $addPercentagePerAssignmentColumns) {
+	my $db              = $c->db;
+	my @scoringData     = ();
+	my $index_increment = ($showIndex) ? 2 : 1;
 	# This whole thing is a hack, but here goes.  We're going to sum the appropriate columns of the totals file:
 	# I believe we have $r_totals->[rows]->[cols]  -- the way it's printed out.
-	my $start_column  = 6;  #The problem column
-	my $last_column   = $#{$r_totals->[1]};  # try to figure out the number of the last column in the array.
-	my $row_count     = $#{$r_totals};
+	my $start_column = 6;                       #The problem column
+	my $last_column  = $#{ $r_totals->[1] };    # try to figure out the number of the last column in the array.
+	my $row_count    = $#{$r_totals};
 
 	# Calculate total number of problems for the course.
-	my $totalPoints      = 0;
-	my $problemValueRow  = 5;
-	for( my $j = $start_column;$j<=$last_column;$j+= $index_increment) {
+	my $totalPoints     = 0;
+	my $problemValueRow = 5;
+	for (my $j = $start_column; $j <= $last_column; $j += $index_increment) {
 		my $score = $r_totals->[$problemValueRow]->[$j];
-		$totalPoints += ($score =~/^\s*[\d\.]+\s*$/)? $score : 0;
+		$totalPoints += ($score =~ /^\s*[\d\.]+\s*$/) ? $score : 0;
 	}
-    foreach my $i (0..$row_count) {
+	foreach my $i (0 .. $row_count) {
 		# Skip heading rows
-		next if ( $i <= ( $problemValueRow +1 ) ); # the row after $problemValueRow has headers
-    	my $studentTotal = 0;
-		my $hw_Cnum = 2; # The first 2 columns we produce will be for summary and total score from 100
-		for( my $j = $start_column;$j<=$last_column;$j+= $index_increment) {
+		next if ($i <= ($problemValueRow + 1));    # the row after $problemValueRow has headers
+		my $studentTotal = 0;
+		my $hw_Cnum      = 2;    # The first 2 columns we produce will be for summary and total score from 100
+		for (my $j = $start_column; $j <= $last_column; $j += $index_increment) {
 			my $score = $r_totals->[$i]->[$j];
-			$studentTotal += ($score =~/^\s*[\d\.]+\s*$/)? $score : 0;
-			if ( $addPercentagePerAssignmentColumns ) {
-				$scoringData[$i][$hw_Cnum] = ($score) ?
-				  # Note: the multiplication by 100 is OUTSIDE the wwRound() so the computed
-				  # score is an integer percentage, just as that displayed by
-				  # lib/WeBWorK/ContentGenerator/Grades.pm as $totalRightPercent.
-				  ( 100 * wwRound( 2, $score/ ($r_totals->[$problemValueRow]->[$j]) ) ) : 0;
+			$studentTotal += ($score =~ /^\s*[\d\.]+\s*$/) ? $score : 0;
+			if ($addPercentagePerAssignmentColumns) {
+				$scoringData[$i][$hw_Cnum] = ($score)
+					?
+					# Note: the multiplication by 100 is OUTSIDE the wwRound() so the computed
+					# score is an integer percentage, just as that displayed by
+					# lib/WeBWorK/ContentGenerator/Grades.pm as $totalRightPercent.
+					(100 * wwRound(2, $score / ($r_totals->[$problemValueRow]->[$j])))
+					: 0;
 				$hw_Cnum++;
 			}
 		}
-		$scoringData[$i][0] = wwRound(2,$studentTotal);
-		$scoringData[$i][1] = ($totalPoints) ?wwRound(2,100*$studentTotal/$totalPoints) : 0;
-    }
-
-	my @HeaderRowsData0 = ('','');
-	my @HeaderRowsData1 = ($r->maketext('summary'),$r->maketext('%score'));
-	my @HeaderRowsData2 = ('','');
-	if ( $addPercentagePerAssignmentColumns ) {
-		for( my $j = $start_column;$j<=$last_column;$j+= $index_increment) {
-			push( @HeaderRowsData0 , '' );
-			push( @HeaderRowsData1 , $r_totals->[1]->[$j] ); # The assignment number
-			push( @HeaderRowsData2 , $r->maketext('%score') );
+		$scoringData[$i][0] = wwRound(2, $studentTotal);
+		$scoringData[$i][1] = ($totalPoints) ? wwRound(2, 100 * $studentTotal / $totalPoints) : 0;
+	}
+
+	my @HeaderRowsData0 = ('', '');
+	my @HeaderRowsData1 = ($c->maketext('summary'), $c->maketext('%score'));
+	my @HeaderRowsData2 = ('', '');
+	if ($addPercentagePerAssignmentColumns) {
+		for (my $j = $start_column; $j <= $last_column; $j += $index_increment) {
+			push(@HeaderRowsData0, '');
+			push(@HeaderRowsData1, $r_totals->[1]->[$j]);     # The assignment number
+			push(@HeaderRowsData2, $c->maketext('%score'));
 		}
 	}
-    $scoringData[1] = [ @HeaderRowsData1 ];
-    $scoringData[6] = [ @HeaderRowsData1 ]; # Put the header in this row also
+	$scoringData[1] = [@HeaderRowsData1];
+	$scoringData[6] = [@HeaderRowsData1];    # Put the header in this row also
 
-	$scoringData[2] = [ @HeaderRowsData2 ];
+	$scoringData[2] = [@HeaderRowsData2];
 
-	foreach my $j ( 0 , 3 .. 5 ) {
-		$scoringData[$j] = [ @HeaderRowsData0 ];
+	foreach my $j (0, 3 .. 5) {
+		$scoringData[$j] = [@HeaderRowsData0];
 	}
 
 	return @scoringData;
 }
 
-
 # Often it's more efficient to just get everything out of the database
 # and then pick out what you want later.  Hence, these "everything2*" functions
-sub everything2info {
-	my ($self, @everything) = @_;
-	my @result = ();
+sub everything2info ($c, @everything) {
+	my @result;
 	foreach my $row (@everything) {
-		push @result, [@{$row}[0..4]];
+		push @result, [ @{$row}[ 0 .. 4 ] ];
 	}
 	return @result;
 }
 
-sub everything2normal {
-	my ($self, @everything) = @_;
-	my @result = ();
+sub everything2normal ($c, @everything) {
+	my @result;
 	my $adjstatus = 0;
 
-	# if its has adjusted status columns we need to include
-	# those as well
-	my $str = $self->r->maketext('ADJ STATUS');
-	if (grep(grep(/$str/, @{$_}),@everything)) {
-	    $adjstatus = 1;
+	# If its has adjusted status columns we need to include those as well.
+	my $str = $c->maketext('ADJ STATUS');
+	if (
+		grep {
+			grep {/$str/}
+				@$_
+		} @everything
+		)
+	{
+		$adjstatus = 1;
 	}
 
 	foreach my $row (@everything) {
-		my @row = @$row;
+		my @row    = @$row;
 		my @newRow = ();
-		push @newRow, @row[0..4];
+		push @newRow, @row[ 0 .. 4 ];
 		if ($adjstatus) {
-		  for (my $i = 5; $i < @row; $i+=4) {
-		    push @newRow, $row[$i];
-		    push @newRow, $row[$i+1];
-		  }
+			for (my $i = 5; $i < @row; $i += 4) {
+				push @newRow, $row[$i];
+				push @newRow, $row[ $i + 1 ];
+			}
 		} else {
-		  for (my $i = 5; $i < @row; $i+=3) {
-		    push @newRow, $row[$i];
-		  }
+			for (my $i = 5; $i < @row; $i += 3) {
+				push @newRow, $row[$i];
+			}
 		}
 		#push @newRow, $row[$#row];
 		push @result, [@newRow];
@@ -734,45 +563,43 @@ sub everything2normal {
 	return @result;
 }
 
-sub everything2full {
-	my ($self, @everything) = @_;
+sub everything2full ($c, @everything) {
 	my @result = ();
 	foreach my $row (@everything) {
-		push @result, [@{$row}[0..($#{$row}-1)]];
+		push @result, [ @{$row}[ 0 .. ($#{$row} - 1) ] ];
 	}
 	return @result;
 }
 
-sub everything2totals {
-	my ($self, @everything) = @_;
-	my @result = ();
+sub everything2totals ($c, @everything) {
+	my @result;
 	foreach my $row (@everything) {
-		push @result, [${$row}[$#{$row}]];
+		push @result, [ ${$row}[ $#{$row} ] ];
 	}
 	return @result;
 }
 
-sub appendColumns {
-	my ($self, $a1, $a2) = @_;
+sub appendColumns ($c, $a1, $a2) {
 	my @a1 = @$a1;
 	my @a2 = @$a2;
 	for (my $i = 0; $i < @a1; $i++) {
-		push @{$a1[$i]}, @{$a2[$i]};
+		push @{ $a1[$i] }, @{ $a2[$i] };
 	}
+	return;
 }
 
 # Reads a CSV file and returns an array of arrayrefs, each containing a
 # row of data:
 # (["c1r1", "c1r2", "c1r3"], ["c2r1", "c2r2", "c2r3"])
 # Write a CSV file from an array in the same format that readCSV produces
-sub writeCSV {
-	my ($self, $filename, @csv) = @_;
-
+sub writeCSV ($c, $filename, @csv) {
 	my @lengths = ();
 	for (my $row = 0; $row < @csv; $row++) {
-		for (my $column = 0; $column < @{$csv[$row]}; $column++) {
+		for (my $column = 0; $column < @{ $csv[$row] }; $column++) {
 			$lengths[$column] = 0 unless defined $lengths[$column];
-			$lengths[$column] = length $csv[$row][$column] if defined($csv[$row][$column]) and length $csv[$row][$column] > $lengths[$column];
+			$lengths[$column] = length $csv[$row][$column]
+				if defined($csv[$row][$column])
+				and length $csv[$row][$column] > $lengths[$column];
 		}
 	}
 
@@ -780,11 +607,11 @@ sub writeCSV {
 	# We do not backup any other type of scoring files (e.g. ful or scr).
 
 	if (($filename =~ m|(.*)/(.*_totals)\.csv$|) and (-e $filename)) {
-		my $scoringDir = $1;
+		my $scoringDir     = $1;
 		my $short_filename = $2;
-		my $i=1;
-		while(-e "${scoringDir}/${short_filename}_bak$i.csv") {$i++;}      #don't overwrite existing backups
-		my $bakFileName ="${scoringDir}/${short_filename}_bak$i.csv";
+		my $i              = 1;
+		while (-e "${scoringDir}/${short_filename}_bak$i.csv") { $i++; }    #don't overwrite existing backups
+		my $bakFileName = "${scoringDir}/${short_filename}_bak$i.csv";
 		rename $filename, $bakFileName or warn "Unable to rename $filename to $bakFileName";
 	}
 
@@ -792,44 +619,43 @@ sub writeCSV {
 	foreach my $row (@csv) {
 		my @rowPadded = ();
 		foreach (my $column = 0; $column < @$row; $column++) {
-			push @rowPadded, $self->pad($row->[$column], $lengths[$column] + 1);
+			push @rowPadded, $c->pad($row->[$column], $lengths[$column] + 1);
 		}
 		print $fh join(",", @rowPadded);
 		print $fh "\n";
 	}
 	close $fh;
+
+	return;
 }
 
 # As soon as backwards compatability is no longer a concern and we don't expect to have
 # to use old ww1.x code to read the output anymore, I recommend switching to using
 # these routines, which are more versatile and compatable with other programs which
 # deal with CSV files.
-sub readStandardCSV {
-	my ($self, $fileName) = @_;
-	my @result = ();
+sub readStandardCSV ($c, $fileName) {
+	my @result;
 	my @rows = split m/\n/, readFile($fileName);
 	foreach my $row (@rows) {
-		push @result, [$self->splitQuoted($row)];
+		push @result, [ $c->splitQuoted($row) ];
 	}
 	return @result;
 }
 
-sub writeStandardCSV {
-	my ($self, $filename, @csv) = @_;
+sub writeStandardCSV ($c, $filename, @csv) {
 	open my $fh, ">:encoding(UTF-8)", $filename;
 	foreach my $row (@csv) {
-		print $fh (join ",", map {$self->quote($_)} @$row);
+		print $fh (join ",", map { $c->quote($_) } @$row);
 		print $fh "\n";
 	}
 	close $fh;
-}
 
-###
+	return;
+}
 
 # This particular unquote method unquotes (optionally) quoted strings in the
 # traditional CSV style (double-quote for literal quote, etc.)
-sub unquote {
-	my ($self, $string) = @_;
+sub unquote ($c, $string) {
 	if ($string =~ m/^"(.*)"$/) {
 		$string = $1;
 		$string =~ s/""/"/;
@@ -839,10 +665,9 @@ sub unquote {
 
 # Should you wish to treat whitespace differently, this routine has been designed
 # to make it easy to do so.
-sub splitQuoted {
-	my ($self, $string) = @_;
+sub splitQuoted ($c, $string) {
 	my ($leadingSpace, $preText, $quoted, $postText, $trailingSpace, $result);
-	my @result = ();
+	my @result   = ();
 	my $continue = 1;
 	while ($continue) {
 		$string =~ m/\G(\s*)/gc;
@@ -855,13 +680,13 @@ sub splitQuoted {
 		$string =~ m/\G([^,]*?)(\s*)(,?)/gc;
 		($postText, $trailingSpace, $continue) = ($1, $2, $3);
 
-		$preText = "" unless defined $preText;
+		$preText  = "" unless defined $preText;
 		$postText = "" unless defined $postText;
-		$quoted = "" unless defined $quoted;
+		$quoted   = "" unless defined $quoted;
 
 		if ($quoted and (not $preText and not $postText)) {
-				$quoted =~ s/""/"/;
-				$result = $quoted;
+			$quoted =~ s/""/"/;
+			$result = $quoted;
 		} else {
 			$result = "$preText$quoted$postText";
 		}
@@ -871,8 +696,7 @@ sub splitQuoted {
 }
 
 # This particular quoting method does CSV-style (double a quote to escape it) quoting when necessary.
-sub quote {
-	my ($self, $string) = @_;
+sub quote ($c, $string) {
 	if ($string =~ m/[", ]/) {
 		$string =~ s/"/""/;
 		$string = "\"$string\"";
@@ -880,18 +704,16 @@ sub quote {
 	return $string;
 }
 
-sub pad {
-	my ($self, $string, $padTo) = @_;
-	$string = '' unless defined $string;
-	return $string unless $self->{padFields}==1;
+sub pad ($c, $string, $padTo) {
+	$string = ''   unless defined $string;
+	return $string unless $c->{padFields} == 1;
 	my $spaces = $padTo - length $string;
 
-#	return " "x$spaces.$string;
-	return $string." "x$spaces;
+	#	return " "x$spaces.$string;
+	return $string . " " x $spaces;
 }
 
-sub maxLength {
-	my ($self, $arrayRef) = @_;
+sub maxLength ($c, $arrayRef) {
 	my $max = 0;
 	foreach my $cell (@$arrayRef) {
 		$max = length $cell unless length $cell < $max;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm b/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm
index a923cc8831..cff2779737 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,8 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Instructor::ScoringDownload;
-use base qw(WeBWorK::ContentGenerator::Instructor);
-use WeBWorK::ContentGenerator::Instructor::FileManager;
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -23,75 +22,35 @@ WeBWorK::ContentGenerator::Instructor::ScoringDownload - Download scoring data f
 
 =cut
 
-use strict;
-use warnings;
-
-sub pre_header_initialize {
-	my ($self) = @_;
-	my $r          = $self->r;
-	my $ce         = $r->ce;
-	my $authz      = $r->authz;
-	my $scoringDir = $ce->{courseDirs}->{scoring};
-	my $file       = $r->param('getFile');
-	my $user       = $r->param('user');
-
+# FIXME: This should be integrated into scoring.pm, and this file deleted.
 
- # the parameter 'getFile" needs to be sanitized. (see bug #3793 )
- # See checkName in FileManager.pm for a more complete sanitization.
-  	if ($authz->hasPermissions($user, "score_sets")) {
- 		unless ( $file eq  WeBWorK::ContentGenerator::Instructor::FileManager::checkName($file) ) {  #
-			$self->addbadmessage($r->maketext("Your file name is not valid! "));
-		    $self->addbadmessage($r->maketext("A file name cannot begin with a dot, it cannot be empty, it cannot contain a " .
-				 "directory path component and only the characters -_.a-zA-Z0-9 and space are allowed.")
-			);
- 		} else {
- 			$self->reply_with_file("text/comma-separated-values", "$scoringDir/$file", $file, 0);
- 			# 0==don't delete file after downloading
- 		}
- 	} else {
-		$self->addbadmessage("You do not have permission to access scoring data.");
-	}
-}
-
-1;
-
-__END__
+use WeBWorK::ContentGenerator::Instructor::FileManager;
 
-# FIXME replace all crap with a call to reply_with_file
-# FIXME and then maybe merge that functionality into Scoring.pm
-sub header {
-	my ($self)     = @_;
-	my $r          = $self->r;
-	my $ce         = $r->ce;
+sub pre_header_initialize ($c) {
+	my $ce         = $c->ce;
+	my $authz      = $c->authz;
 	my $scoringDir = $ce->{courseDirs}->{scoring};
-	my $file       = $r->param('getFile');
-	if (-f "$scoringDir/$file") {
-		$r->content_type('text/comma-separated-values');
-		$r->header_out("Content-Disposition" => "attachment; filename=$file;");
-		$r->send_http_header();
-		return OK;
+	my $file       = $c->param('getFile');
+	my $user       = $c->param('user');
+
+	# the parameter 'getFile" needs to be sanitized. (see bug #3793 )
+	# See checkName in FileManager.pm for a more complete sanitization.
+	if ($authz->hasPermissions($user, "score_sets")) {
+		unless ($file eq WeBWorK::ContentGenerator::Instructor::FileManager::checkName($file)) {    #
+			$c->addbadmessage($c->maketext("Your file name is not valid! "));
+			$c->addbadmessage($c->maketext(
+				"A file name cannot begin with a dot, it cannot be empty, it cannot contain a "
+					. "directory path component and only the characters -_.a-zA-Z0-9 and space are allowed."
+			));
+		} else {
+			$c->reply_with_file("text/comma-separated-values", "$scoringDir/$file", $file, 0);
+			# 0==don't delete file after downloading
+		}
 	} else {
-		$self->{noContent} = 1;
-		return NOT_FOUND;
+		$c->addbadmessage("You do not have permission to access scoring data.");
 	}
-}
 
-sub content {
-	my ($self)     = @_;
-	my $r          = $self->r;
-	my $ce         = $r->ce;
-	my $authz      = $r->authz;
-	my $scoringDir = $ce->{courseDirs}->{scoring};
-	my $user       = $r->param('user');
-
-	if (!$authz->hasPermissions($user, "score_sets")) {
-		print "You do not have permission to access scoring data";
-	} else {
-		my $file = $r->param('getFile');
-		open my $fh, "<:utf8", "$scoringDir/$file";
-		print while (<$fh>);
-		close $fh;
-	}
+	return;
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm b/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm
index 26a674f607..e4792cccd4 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Instructor::SendMail;
-use base qw(WeBWorK::ContentGenerator::Instructor);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -22,109 +22,84 @@ WeBWorK::ContentGenerator::Instructor::SendMail - Entry point for User-specific
 
 =cut
 
-use strict;
-use warnings;
-
-use WeBWorK::CGI;
 use Email::Address::XS;
-use HTML::Entities;
 use Email::Stuffer;
 use Try::Tiny;
 use Data::Dump qw/dump/;
-use WeBWorK::Debug;
-
-use Socket qw/unpack_sockaddr_in inet_ntoa/; # for remote host/port info
 use Text::Wrap qw(wrap);
-use WeBWorK::HTML::ScrollingRecordList qw/scrollingRecordList/;
-use WeBWorK::Utils qw/readFile readDirectory/;
-use WeBWorK::Utils::FilterRecords qw/filterRecords/;
+use WeBWorK::Utils qw/processEmailMessage createEmailSenderTransportSMTP/;
 
-sub initialize {
-	my ($self) = @_;
-	my $r      = $self->r;
-	my $db     = $r->db;
-	my $ce     = $r->ce;
-	my $authz  = $r->authz;
-	my $user   = $r->param('user');
-
-	my @selected_filters;
-	if (defined ($r->param('classList!filter'))){ @selected_filters = $r->param('classList!filter');}
-	else {@selected_filters = ("all");}
+use WeBWorK::Debug;
+use WeBWorK::Utils::Instructor qw(read_dir);
 
+sub initialize ($c) {
+	my $db    = $c->db;
+	my $ce    = $c->ce;
+	my $authz = $c->authz;
+	my $user  = $c->param('user');
 
 	# Check permissions
 	return unless $authz->hasPermissions($user, "access_instructor_tools");
 	return unless $authz->hasPermissions($user, "send_mail");
 
-	#############################################################################################
-	#	gather directory data
-	#############################################################################################
-	my $emailDirectory    =    $ce->{courseDirs}->{email};
-	my $scoringDirectory  =    $ce->{courseDirs}->{scoring};
-	my $templateDirectory =    $ce->{courseDirs}->{templates};
-
-	my $openfilename      =	   $r->param('openfilename');
-	my $savefilename      =	   $r->param('savefilename');
-	my $mergefile         =    $r->param('merge_file');
+	# Gather directory data
+	my $emailDirectory    = $ce->{courseDirs}{email};
+	my $scoringDirectory  = $ce->{courseDirs}{scoring};
+	my $templateDirectory = $ce->{courseDirs}{templates};
 
-	#FIXME  get these values from global course environment (see subroutines as well)
-	my $default_msg_file       =    'default.msg';
-	my $old_default_msg_file   =    'old_default.msg';
+	my $openfilename = $c->param('openfilename');
+	my $savefilename = $c->param('savefilename');
+	my $mergefile    = $c->param('merge_file');
 
 	#if mergefile or openfilename haven't been defined via parameter
 	# check the database to see if there is a file we should use.
 	# if they have been defined via parameter then we should update the db
 
-	if (defined($openfilename) && $openfilename) {
-	  $db->setSettingValue("${user}_openfile",$openfilename);
+	if ($openfilename) {
+		$db->setSettingValue("${user}_openfile", $openfilename);
+	} elsif (defined $openfilename) {
+		$db->deleteSetting("${user}_openfile");
 	} elsif ($db->settingExists("${user}_openfile")) {
-	  $openfilename = $db->getSettingValue("${user}_openfile");
+		$openfilename = $db->getSettingValue("${user}_openfile");
 	}
 
-	if (defined($mergefile) && $mergefile) {
-	  $db->setSettingValue("${user}_mergefile",$mergefile);
+	if ($mergefile) {
+		$db->setSettingValue("${user}_mergefile", $mergefile);
+	} elsif (defined $mergefile) {
+		$db->deleteSetting("${user}_mergefile");
 	} elsif ($db->settingExists("${user}_mergefile")) {
-	  $mergefile = $db->getSettingValue("${user}_mergefile");
+		$mergefile = $db->getSettingValue("${user}_mergefile");
+		$mergefile = undef unless (-e "$ce->{courseDirs}{scoring}/$mergefile");
 	}
 
 	# Figure out action from submit data
 	my $action = '';
-	if ($r->param('sendEmail')) {
-	    $action = 'sendEmail';
-	} elsif ($r->param('saveMessage')) {
-	    $action = 'saveMessage';
-	} elsif ($r->param('saveAs')) {
-	    $action = 'saveAs';
-	} elsif ($r->param('saveDefault')) {
-	    $action = 'saveDefault';
-	} elsif ($r->param('openMessage')) {
-	    $action = 'openMessage';
-	} elsif ($r->param('updateSettings')) {
-	    $action = 'updateSettings';
-	} elsif ($r->param('previewMessage')) {
-	    $action = 'previewMessage';
+	if ($c->param('sendEmail')) {
+		$action = 'sendEmail';
+	} elsif ($c->param('saveMessage')) {
+		$action = 'saveMessage';
+	} elsif ($c->param('saveAs')) {
+		$action = 'saveAs';
+	} elsif ($c->param('openMessage')) {
+		$action = 'openMessage';
+	} elsif ($c->param('previewMessage')) {
+		$action = 'previewMessage';
 	}
 
-	#  get user record
+	# Get user record
 	my $ur = $db->getUser($user);
 
-	# store data
-	$self->{defaultFrom}            =   $ur->rfc822_mailbox;
-	$self->{defaultReply}           =   $ur->rfc822_mailbox;
-	$self->{defaultSubject}         =   $self->r->urlpath->arg("courseID") . " notice";
-
-	$self->{rows}                   =   (defined($r->param('rows'))) ? $r->param('rows') : $ce->{mail}->{editor_window_rows};
-	$self->{columns}                =   (defined($r->param('columns'))) ? $r->param('columns') : $ce->{mail}->{editor_window_columns};
-	$self->{default_msg_file}	    =   $default_msg_file;
-	$self->{old_default_msg_file}   =   $old_default_msg_file;
-	$self->{merge_file}             =   $mergefile;
-	# an expermiment -- share the scrolling list for preivew and sendTo actions.
-	my @classList                   =   (defined($r->param('classList')))    ? $r->param('classList') : ($user);
-	$self->{preview_user}           =   $classList[0] || $user;
-
-	#############################################################################################
+	# Store data
+	$c->{defaultPreviewUser} = $ur;
+	$c->{defaultFrom}        = $ur->rfc822_mailbox;
+	$c->{defaultReply}       = $ur->rfc822_mailbox;
+	$c->{defaultSubject}     = $c->stash('courseID') . ' notice';
+	$c->{merge_file}         = $mergefile // '';
+
+	my @classList = $c->param('classList') // ($user);
+	$c->{preview_user} = $c->db->getUser($classList[0] || $user);
+
 	# Gather database data
-	#############################################################################################
 	# Get all users except set level proctors and practice users.  If the current user has restrictions on viewable
 	# sections or recitations, those are filtered out as well.  The users are sorted by user_id.
 	my @Users = $db->getUsersWhere(
@@ -146,979 +121,377 @@ sub initialize {
 	@Users = grep { $ce->status_abbrev_has_behavior($_->status, "include_in_email") } @Users;
 
 	# Cache the user records for later use.
-	$self->{ra_user_records} = \@Users;
+	$c->{ra_user_records} = \@Users;
 
-	#############################################################################################
 	# Gather list of recipients
-	#############################################################################################
 	my @send_to;
-	my $recipients = $r->param('send_to') // '';
+	my $recipients = $c->param('send_to') // '';
 	if ($recipients eq 'all_students') {
 		@send_to = map { $_->user_id } @Users;
 	} elsif ($recipients eq 'studentID') {
-		@send_to = $r->param('classList');
+		@send_to = $c->param('classList');
 	}
 
-	$self->{ra_send_to} = \@send_to;
+	$c->{ra_send_to} = \@send_to;
 
-	#################################################################
 	# Check the validity of the input file name
-	#################################################################
-
 	my $input_file = '';
 	# Make sure an input message file was submitted and exists.
-	# Otherwise use the default message.
-	if (defined($openfilename)) {
+	if ($openfilename) {
 		if (-e "${emailDirectory}/$openfilename") {
 			if (-R "${emailDirectory}/$openfilename") {
 				$input_file = $openfilename;
 			} else {
-				$self->addbadmessage(CGI::p(join(
-					"",
-					$r->maketext(
-						"The file [_1]/[_2] is not readable by the webserver.",
-						$emailDirectory, $openfilename
-					),
-					CGI::br(),
-					$r->maketext("Check that it's permissions are set correctly."),
-				)));
+				$c->addbadmessage($c->maketext(
+					'The file [_1] is not readable by the webserver. '
+						. q{Check that it's permissions are set correctly.},
+					"$emailDirectory/$openfilename"
+				));
 			}
 		} else {
-			$input_file = $default_msg_file;
-			$self->addbadmessage(CGI::p(join(
-				"",
-				$r->maketext("The file [_1]/[_2] cannot be found.", $emailDirectory, $openfilename),
-				CGI::br(),
-				$r->maketext(
-					"Check whether it exists and whether the directory [_1] can be read by the webserver.",
-					$emailDirectory
-				),
-				CGI::br(),
-				$r->maketext("Using contents of the default message [_1] instead.", $default_msg_file),
-			)));
+			$c->addbadmessage($c->maketext(
+				'The file [_1] cannot be found. '
+					. 'Check whether it exists and whether the directory [_2] can be read by the webserver. ',
+				"$emailDirectory/$openfilename",
+				$emailDirectory
+			));
 		}
-	} else {
-		$input_file = $default_msg_file;
 	}
-	$self->{input_file} = $input_file;
+	$c->{input_file} = $input_file;
 
-	#################################################################
 	# Determine the file name to save message into
-	#################################################################
-	my $output_file      = 'FIXME no output file specified';
-	if ($action eq 'saveDefault') {
-		$output_file  = $default_msg_file;
-	} elsif ($action eq 'saveMessage' or $action eq 'saveAs') {
-		if (defined($savefilename) and $savefilename ) {
-			$output_file  = $savefilename;
+	my $output_file = '';
+	$savefilename = $input_file if $action eq 'saveMessage';
+	if ($action eq 'saveMessage' or $action eq 'saveAs') {
+		if ($savefilename) {
+			$output_file = $savefilename;
 		} else {
-			$self->addbadmessage(CGI::p($r->maketext("No filename was specified for saving!  The message was not saved.")));
+			$c->addbadmessage($c->maketext('No filename was specified for saving!  The message was not saved.'));
 		}
-	} elsif ( defined($input_file) ) {
-		$output_file  = $input_file;
+	} else {
+		$output_file = $input_file // '';
 	}
 
-	#################################################################
 	# Sanity check on save file name
-	#################################################################
-
 	if ($output_file =~ /^[~.]/ || $output_file =~ /\.\./) {
-		$self->addbadmessage(CGI::p($r->maketext("For security reasons, you cannot specify a message file from a directory higher than the email directory (you can't use ../blah/blah for example). Please specify a different file or move the needed file to the email directory")));
+		$c->addbadmessage($c->maketext(
+			'For security reasons, you cannot specify a message file from a directory higher than the '
+				. q{email directory (you can't use ../blah/blah for example). }
+				. 'Please specify a different file or move the needed file to the email directory.'
+		));
 	}
-	unless ($output_file =~ m|\.msg$| ) {
-		$self->addbadmessage(CGI::p($r->maketext("Invalid file name. The file name \"[_1]\" does not have a \".msg\" extension All email file names must end in the extension \".msg\" choose a file name with a \".msg\" extension. The message was not saved.",$output_file)));
+	if ($output_file && $output_file !~ m|\.msg$|) {
+		$c->addbadmessage($c->maketext(
+			'Invalid file name "[_1]". All email file names must end with the ".msg" extension.  '
+				. 'Choose a file name with the ".msg" extension. The message was not saved.',
+			$output_file
+		));
 	}
 
-	$self->{output_file} = $output_file;  # this is ok.  It will be put back in the text input box for re-editing.
+	$c->{output_file} = $output_file;
+	$c->param('savefilename', $output_file) if ($c->param('savefilename') && $output_file);
 
-
-	#############################################################################################
 	# Determine input source
-	#############################################################################################
-	#warn "Action = $action";
 	my $input_source;
-	if ($action){
-		$input_source =  ( defined( $r->param('body') ) and $action ne 'openMessage' ) ? 'form' : 'file';}
-	else { $input_source = ( defined($r->param('body')) ) ? 'form' : 'file';}
+	if ($action) {
+		$input_source = (defined($c->param('body')) and $action ne 'openMessage') ? 'form' : 'file';
+	} else {
+		$input_source = (defined($c->param('body'))) ? 'form' : 'file';
+	}
 
-	#############################################################################################
 	# Get inputs
-	#############################################################################################
-	my($from, $replyTo, $r_text, $subject);
+	my ($from, $replyTo, $r_text, $subject);
 	if ($input_source eq 'file') {
-
-		($from, $replyTo,$subject,$r_text) = $self->read_input_file("$emailDirectory/$input_file");
-
-
+		if ($input_file) {
+			($from, $replyTo, $subject, $r_text) = $c->read_input_file("$emailDirectory/$input_file");
+		} else {
+			$from    = $c->{defaultFrom};
+			$replyTo = $c->{defaultReply};
+			$subject = $c->{defaultSubject};
+
+			# If action is openMessage and no file was found, then 'None' was selected.
+			# In this case empty the message body and set the saved file name to default.msg.
+			if ($action eq 'openMessage') {
+				$c->param('body',         '')            if $c->param('body');
+				$c->param('savefilename', 'default.msg') if $c->param('savefilename');
+			}
+		}
+		$c->param('from',    $from)    if $from;
+		$c->param('replyTo', $replyTo) if $replyTo;
+		$c->param('subject', $subject) if $subject;
+		$c->param('body',    $$r_text) if $r_text;
 	} elsif ($input_source eq 'form') {
 		# read info from the form
 		# bail if there is no message body
 
-		$from              =    $r->param('from');
-		$replyTo           =    $r->param('replyTo');
-		$subject           =    $r->param('subject');
-		my $body           =    $r->param('body');
-		# Sanity check: body must contain non-white space
-		$self->addbadmessage(CGI::p($r->maketext('You didn\'t enter any message.'))) unless ($r->param('body') =~ /\S/);
-		$r_text               =    \$body;
-
+		$from    = $c->param('from');
+		$replyTo = $c->param('replyTo');
+		$subject = $c->param('subject');
+		my $body = $c->param('body');
+		# Sanity check: body must contain non-white space when previewing message.
+		$c->addbadmessage($c->maketext('You didn\'t enter any message.'))
+			unless ($action ne 'previewMessage' || $c->param('body') =~ /\S/);
+		$r_text = \$body;
 	}
 
-	my $remote_host = $r->useragent_addr->ip_get || "UNKNOWN";
+	my $remote_host = $c->tx->remote_address || "UNKNOWN";
 
-	# store data
-	$self->{from}                   =    $from;
-	$self->{replyTo}                =    $replyTo;
-	$self->{subject}                =    $subject;
-	$self->{remote_host}            =    $remote_host;
-	$self->{r_text}                 =    $r_text;
+	# Store data
+	$c->{from}        = $from;
+	$c->{replyTo}     = $replyTo;
+	$c->{subject}     = $subject;
+	$c->{remote_host} = $remote_host;
+	$c->{r_text}      = $r_text;
 
-	###################################################################################
 	#Determine the appropriate script action from the buttons
-	###################################################################################
 	#     first time actions
 	#          open new file
-	#          open default file
-	#     choose merge file actions
-	#          chose merge button
-	#     option actions
-	#       'reset rows'
-
 	#     save actions
-	#		"save" button
-	#		"save as" button
-	#		"save as default" button
+	#       "save" button
+	#       "save as" button
 	#     preview actions
-	#		'preview' button
+	#       'preview' button
 	#     email actions
-	#		'entire class'
-	#		'selected studentIDs'
+	#       'entire class'
+	#       'selected studentIDs'
 	#     error actions (various)
 
-	#############################################################################################
 	# if no form is submitted, gather data needed to produce the mail form and return
-	#############################################################################################
-	my $to                =    $r->param('To');
-	my $script_action     = '';
+	my $to = $c->param('To');
 
+	return '' if (not $action or $action eq 'openMessage');
 
-	if(not $action or $action eq 'openMessage'
-	   or $action eq 'updateSettings'){
-
-		return '';
-	}
-
-	#############################################################################################
 	# If form is submitted deal with filled out forms
 	# and various actions resulting from different buttons
-	#############################################################################################
 
+	if ($action eq 'saveMessage' or $action eq 'saveAs') {
+		# Check that an output file was specified and protect against overwriting an existing file.
+		if ($action eq 'saveAs') {
+			if (!$output_file) {
+				# A message has been already set if no output filename was specified.  So just return here in that case.
+				return;
+			} elsif (-e "$emailDirectory/$output_file") {
+				$c->addbadmessage($c->maketext(
+					'The file [_1] already exists and cannot be overwritten. The message was not saved.',
+					"$emailDirectory/$output_file"
+				));
+				return;
+			}
+		}
 
-	if ($action eq 'saveMessage' or $action eq 'saveAs' or $action eq 'saveDefault') {
-
-		#warn "FIXME Saving files  action = $action  outputFileName=$output_file";
-
-		#################################################################
 		# construct message body
-		#################################################################
-		my $temp_body = ${ $r_text };
+		my $temp_body = ${$r_text};
 		$temp_body =~ s/\r\n/\n/g;
-		$temp_body = join("\n",
-				  "From: $from",
-				  "Reply-To: $replyTo",
-				  "Subject: $subject",
-				  "Content-Type: text/plain; charset=UTF-8",
-				  "Message:",
-				# Do NOT encode to UTF-8 here.
-				  $temp_body);
-		#warn "FIXME from $from | subject $subject |reply $replyTo|msg $temp_body";
-		#################################################################
-		# overwrite protection
-		#################################################################
-		if ($action eq 'saveAs' and -e "$emailDirectory/$output_file") {
-		  $self->addbadmessage(CGI::p($r->maketext("The file [_1]/[_2] already exists and cannot be overwritten. The message was not saved",$emailDirectory, $openfilename )));
-			return;
-		}
-
-		#################################################################
-	    # Back up existing file?
-	    #################################################################
-	    if ($action eq 'saveDefault' and -e "$emailDirectory/$default_msg_file") {
-	    	rename("$emailDirectory/$default_msg_file","$emailDirectory/$old_default_msg_file") or
-	    	       die "Can't rename $emailDirectory/$default_msg_file to $emailDirectory/$old_default_msg_file ",
-	    	           "Check permissions for webserver on directory $emailDirectory. $!";
-	    	$self->addgoodmessage(CGI::p($r->maketext("Backup file <code>[_1]/[_2]</code> created.",$emailDirectory,$old_default_msg_file) . CGI::br()));
-	    }
-	    #################################################################
-	    # Save the message
-		#################################################################
-		$self->saveProblem($temp_body, "${emailDirectory}/$output_file" ) unless ($output_file =~ /^[~.]/ || $output_file =~ /\.\./ || not $output_file =~ m|\.msg$|);
-		unless ( $self->{submit_message} or not -w "${emailDirectory}/$output_file" )  {  # if there are no errors report success
-		  $self->addgoodmessage(CGI::p($r->maketext("Message saved to file <code>[_1]/[_2]</code>.",$emailDirectory, $output_file)));
-		  $self->{input_file} = $output_file;
-		  $db->setSettingValue("${user}_openfile",$output_file);
+		$temp_body = join(
+			"\n",
+			"From: $from",
+			"Reply-To: $replyTo",
+			"Subject: $subject",
+			"Content-Type: text/plain; charset=UTF-8",
+			"Message:",
+			# Do NOT encode to UTF-8 here.
+			$temp_body
+		);
+
+		# Save the message
+		$c->saveMessageFile($temp_body, "${emailDirectory}/$output_file")
+			unless ($output_file =~ /^[~.]/ || $output_file =~ /\.\./ || $output_file !~ m|\.msg$|);
+		if (-w "${emailDirectory}/$output_file") {    # if there are no errors report success
+			$c->addgoodmessage($c->maketext('Message saved to file [_1].', "$emailDirectory/$output_file"));
+			$c->{input_file} = $output_file;
+			$db->setSettingValue("${user}_openfile", $output_file);
 		}
 
 	} elsif ($action eq 'previewMessage') {
-		$self->{response}         = 'preview';
+		$c->{response} = 'preview';
 
 	} elsif ($action eq 'sendEmail') {
+		# Don't try to send an empty message.
+		unless (${ $c->{r_text} } =~ /\S/) {
+			$c->addbadmessage($c->maketext('Email body is empty. No message sent. '));
+			return;
+		}
+
 		# verify format of From address (one valid rfc2822/rfc5322 address)
-		my @parsed_from_addrs = Email::Address::XS->parse($self->{from});
+		my @parsed_from_addrs = Email::Address::XS->parse($c->{from});
 		unless (@parsed_from_addrs == 1) {
-			$self->addbadmessage($r->maketext("From field must contain one valid email address."));
+			$c->addbadmessage($c->maketext("From field must contain one valid email address."));
 			return;
 		}
 
 		# verify format of Reply-to address (zero or more valid rfc2822/ref5322 addresses)
-		if (defined $self->{replyTo} and $self->{replyTo} ne "") {
-			my @parsed_replyto_addrs = Email::Address::XS->parse($self->{replyTo});
+		if (defined $c->{replyTo} and $c->{replyTo} ne "") {
+			my @parsed_replyto_addrs = Email::Address::XS->parse($c->{replyTo});
 			unless (@parsed_replyto_addrs > 0) {
-				$self->addbadmessage($r->maketext("Invalid Reply-to address."));
+				$c->addbadmessage($c->maketext("Invalid Reply-to address."));
 				return;
 			}
 		}
 
-	    # Check that recipients have been selected.
-		unless (@{ $self->{ra_send_to} }) {
-			$self->addbadmessage(
-				$r->maketext('No recipients selected. Please select one or more recipients from the list below.'));
+		# Check that recipients have been selected.
+		unless (@{ $c->{ra_send_to} }) {
+			$c->addbadmessage(
+				$c->maketext('No recipients selected. Please select one or more recipients from the list below.'));
 			return;
 		}
 
 		#  get merge file
-		my $merge_file      = ( defined($self->{merge_file}) ) ? $self->{merge_file} : 'None';
-		my $delimiter       = ',';
-		my $rh_merge_data   = $self->read_scoring_file("$merge_file", "$delimiter");
-		unless (ref($rh_merge_data) ) {
-			$self->addbadmessage(CGI::p($r->maketext("No merge data file")));
-			$self->addbadmessage(CGI::p($r->maketext("Can't read merge file [_1]. No message sent",$merge_file)));
+		my $merge_file    = $c->{merge_file};
+		my $rh_merge_data = $c->read_scoring_file($merge_file);
+		unless (ref($rh_merge_data)) {
+			$c->addbadmessage($c->maketext("No merge data file"));
+			$c->addbadmessage($c->maketext("Can't read merge file [_1]. No message sent", $merge_file));
 			return;
-		} ;
-		$self->{rh_merge_data} = $rh_merge_data;
+		}
+		$c->{rh_merge_data} = $rh_merge_data;
 
 		# we don't set the response until we're sure that email can be sent
-		$self->{response}         = 'send_email';
+		$c->{response} = 'send_email';
 
-		# FIXME i'm not sure why we're pulling this out here -- mail_message_to_recipients does have
-		# access to the course environment and should just grab it directly
-		$self->{smtpServer}    = $ce->{mail}->{smtpServer};
-
-		# do actual mailing in the cleanup phase, since it could take a long time
+		# Do actual mailing in the after the response is sent, since it could take a long time
 		# FIXME we need to do a better job providing status notifications for long-running email jobs
-		my $post_connection_action = sub {
-			my $r = shift;
-			# catch exceptions generated during the sending process
-			my $result_message = eval { $self->mail_message_to_recipients() };
-			if ($@) {
-				# add the die message to the result message
-				$result_message .= "An error occurred while trying to send email.\n"
-					. "The error message is:\n\n$@\n\n";
-				# and also write it to the apache log
-				$r->log->error("An error occurred while trying to send email: $@\n");
-			}
-			# this could fail too...
-			eval { $self->email_notification($result_message) };
-			if ($@) {
-				$r->log->error("An error occured while trying to send the email notification: $@\n");
-			}
-		};
-		$r->connection->pool->cleanup_register($post_connection_action, $r);
+		$c->minion->enqueue(
+			send_instructor_email => [ {
+				courseName  => $c->stash('courseID'),
+				recipients  => $c->{ra_send_to},
+				subject     => $c->{subject},
+				text        => ${ $c->{r_text} // \'' },
+				merge_data  => $c->{rh_merge_data},
+				from        => $c->{from},
+				defaultFrom => $c->{defaultFrom},
+				remote_host => $c->{remote_host},
+			} ]
+		);
 	} else {
-		$self->addbadmessage(CGI::p($r->maketext("Didn't recognize action")));
+		$c->addbadmessage($c->maketext(q{Didn't recognize action}));
 	}
-}  #end initialize
-
-sub body {
-	my ($self)          = @_;
-	my $r               = $self->r;
-	my $urlpath         = $r->urlpath;
-	my $authz           = $r->authz;
-	my $setID           = $urlpath->arg("setID");
-	my $response        = (defined($self->{response}))? $self->{response} : '';
-	my $user            = $r->param('user');
 
-	# Check permissions
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-		CGI::p("You are not authorized to access instructor tools"))
-		unless $authz->hasPermissions($user, "access_instructor_tools");
-
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-		CGI::p("You are not authorized to send mail to students"))
-		unless $authz->hasPermissions($user, "send_mail");
-
-	if ($response eq 'preview') {
-		$self->print_preview($setID);
-	} elsif ($response eq 'send_email' and $self->{ra_send_to} and @{$self->{ra_send_to}}){
-		my $message = CGI::i($r->maketext(
-			"Email is being sent to [quant,_1,recipient]. You will be notified by email
-				when the task is completed.  This may take several minutes if the class is
-				large.", scalar(@{ $self->{ra_send_to} })
-		));
-		$self->addgoodmessage($message);
-		$self->{message} .= $message;
+	return;
+}
 
-		$self->print_form($setID);
-	} else {
-		$self->print_form($setID);
+sub print_preview ($c) {
+	die "record for preview user " . $c->{preview_user} . " not found." unless $c->{preview_user};
+
+	# Get merge file
+	my $merge_file    = $c->{merge_file};
+	my $rh_merge_data = $c->read_scoring_file($merge_file);
+
+	if ($merge_file && !defined $rh_merge_data->{ $c->{preview_user}->student_id }) {
+		$c->addbadmessage('No merge data for student id: '
+				. $c->{preview_user}->student_id
+				. '; name: '
+				. $c->{preview_user}->first_name . ' '
+				. $c->{preview_user}->last_name
+				. '; login: '
+				. $c->{preview_user}->user_id);
 	}
 
-}
-
-sub print_preview {
-	my ($self)          = @_;
-	my $r               = $self->r;
-	my $urlpath         = $r->urlpath;
-	my $setID           = $urlpath->arg("setID");
-
-	#  get preview user
-	my $ur      = $r->db->getUser($self->{preview_user}); #checked
-	die "record for preview user ".$self->{preview_user}. " not found." unless $ur;
-
-	#  get merge file
-	my $merge_file      = ( defined($self->{merge_file}) ) ? $self->{merge_file} : 'None';
-	my $delimiter       = ',';
-	my $rh_merge_data   = $self->read_scoring_file("$merge_file", "$delimiter");
-
-	my ($msg, $preview_header) = $self->process_message($ur,$rh_merge_data,1); # 1 == for preview
-
-	my $recipients = join(" ", @{ $self->{ra_send_to} });
-	my $errorMessage =  defined($self->{submit_message}) ?  CGI::i($self->{submit_message} ) : '' ;
-
-	# Format message keeping the preview_header lined up
-	$errorMessage = wrap("","",$errorMessage);
-	$msg = wrap("","",$msg);
-
-	$msg = join("",
-		    "To: ", $ur->email_address,"\n",
-		    "From: ", "$self->{from}" , "\n",
-		    "Reply-To: ", $self->{replyTo} , "\n",
-		    "Subject: ", $self->{subject} , "\n",
-		    # In a real mails we would UTF-8 encode the message
-		    # and give the Content-Type header, for the preview which
-		    # is displayed - just add the header, but do NOT use
-		    # Encode::encode("UTF-8",$msg) as it will be done late.
-		    "Content-Type: text/plain; charset=UTF-8\n\n",
-		    $msg, # will be in HTML output, and gets encoded to UTF-8 later on
-		    "\n"
+	my ($msg, $preview_header) = processEmailMessage(
+		${ $c->{r_text} // \'' },
+		$c->{preview_user}, $c->ce->status_abbrev_to_name($c->{preview_user}->status),
+		$rh_merge_data,     1
 	);
 
-
-	# The content in message is going to be put in HTML.
-	# It needs to be encoded to avoid problems with things like
-	# <user@domain.com>.
-	$msg = encode_entities($msg);
-
-	$msg = join("",$errorMessage,$preview_header,$msg);
-
-	return
-		CGI::div({ class => 'mb-3', dir => 'ltr' }, CGI::pre($msg))
-		. CGI::p($r->maketext('Use browser back button to return from preview mode.'))
-		. CGI::h3($r->maketext('Emails to be sent to the following:'))
-		. $recipients;
-}
-
-sub print_form {
-	my ($self)     = @_;
-	my $r          = $self->r;
-	my $urlpath    = $r->urlpath;
-	my $authz      = $r->authz;
-	my $db         = $r->db;
-	my $ce         = $r->ce;
-	my $courseName = $urlpath->arg("courseID");
-	my $setID      = $urlpath->arg("setID");
-	my $user       = $r->param('user');
-
-	my $root         = $ce->{webworkURLs}->{root};
-	my $sendMailPage = $urlpath->newFromModule($urlpath->module, $r, courseID => $courseName);
-	my $sendMailURL  = $self->systemLink($sendMailPage, authen => 0);
-
-	return CGI::em("You are not authorized to access the Instructor tools.")
-		unless $authz->hasPermissions($user, "access_instructor_tools");
-
-	my $userTemplate            = $db->newUser;
-	my $permissionLevelTemplate = $db->newPermissionLevel;
-
-	##############################################################################################################
-
-	my $from       = $self->{from};
-	my $subject    = $self->{subject};
-	my $replyTo    = $self->{replyTo};
-	my $rows       = $self->{rows};
-	my $text       = defined($self->{r_text}) ? ${ $self->{r_text} } : 'FIXME no text was produced by initialization!!';
-	my $input_file = $self->{input_file};
-	my $output_file        = $self->{output_file};
-	my @sorted_messages    = $self->get_message_file_names;
-	my @sorted_merge_files = $self->get_merge_file_names;
-	my $merge_file         = (defined($self->{merge_file})) ? $self->{merge_file} : 'None';
-	my $delimiter          = ',';
-	my $rh_merge_data      = $self->read_scoring_file("$merge_file", "$delimiter");
-	my @merge_keys         = keys %$rh_merge_data;
-	my $preview_user       = $self->{preview_user};
-	my $preview_record     = $db->getUser($preview_user);                                     # checked
-	die "record for preview user " . $self->{preview_user} . " not found." unless $preview_record;
-
-	print CGI::start_form(
-		{ id => "send-mail-form", name => "send-mail-form", method => "post", action => $sendMailURL });
-	print $self->hidden_authen_fields();
-
-	# Email settings
-	print CGI::div(
-		{ class => 'card mb-3' },
-		CGI::div(
-			{ class => 'card-body p-2' },
-			CGI::div(
-				{ class => 'row' },
-				CGI::div(
-					{ class => 'col-md-6 mb-2' },
-					CGI::div(
-						{ class => 'input-group input-group-sm mb-2' },
-						CGI::label(
-							{ for => 'openfilename', class => 'input-group-text' },
-							CGI::strong($r->maketext('Message file:'))
-						),
-						CGI::span({ class => 'input-group-text' }, $input_file)
-					),
-					CGI::div(
-						{ class => 'input-group input-group-sm mb-2' },
-						CGI::submit({
-							name  => 'openMessage',
-							value => $r->maketext('Open'),
-							class => 'btn btn-secondary'
-						}),
-						CGI::popup_menu({
-							name    => 'openfilename',
-							id      => 'openfilename',
-							values  => \@sorted_messages,
-							default => $input_file,
-							class   => 'form-select form-select-sm'
-						})
-					),
-					CGI::div(
-						{ class => 'input-group input-group-sm mb-2' },
-						CGI::span({ class => 'input-group-text' }, CGI::strong($r->maketext('Save file to:'))),
-						CGI::span({ class => 'input-group-text' }, $output_file)
-					),
-					CGI::div(
-						{ class => 'input-group input-group-sm mb-2' },
-						CGI::label(
-							{ for => 'merge_file', class => 'input-group-text' },
-							CGI::strong($r->maketext('Merge file:'))
-						),
-						CGI::span({ class => 'input-group-text' }, $merge_file)
-					),
-					CGI::popup_menu({
-						name    => 'merge_file',
-						id      => 'merge_file',
-						values  => \@sorted_merge_files,
-						default => $merge_file,
-						class   => 'form-select form-select-sm mb-2'
-					}),
-					CGI::div(
-						{ class => 'row mb-1' },
-						CGI::label(
-							{ for => 'from', class => 'col-sm-3 col-form-label col-form-label-sm' },
-							$r->maketext('From:')
-						),
-						CGI::div(
-							{ class => 'col-sm-9' },
-							CGI::textfield({
-								name  => 'from',
-								id    => 'from',
-								value => $from,
-								class => 'form-control form-control-sm'
-							})
-						)
-					),
-					CGI::div(
-						{ class => 'row mb-1' },
-						CGI::label(
-							{ for => 'replyTo', class => 'col-sm-3 col-form-label col-form-label-sm' },
-							$r->maketext('Reply-To:')
-						),
-						CGI::div(
-							{ class => 'col-sm-9' },
-							CGI::textfield({
-								name  => 'replyTo',
-								id    => 'replyTo',
-								value => $replyTo,
-								class => 'form-control form-control-sm'
-							})
-						)
-					),
-					CGI::div(
-						{ class => 'row mb-2' },
-						CGI::label(
-							{ for => 'subject', class => 'col-sm-3 col-form-label col-form-label-sm' },
-							$r->maketext('Subject: ')
-						),
-						CGI::div(
-							{ class => 'col-sm-9' },
-							CGI::textfield({
-								name  => 'subject',
-								id    => 'subject',
-								value => $subject,
-								class => 'form-control form-control-sm'
-							})
-						),
-					),
-					CGI::div(
-						{ class => 'row mb-2' },
-						CGI::label(
-							{ for => 'rows', class => 'col-3 col-form-label col-form-label-sm' },
-							$r->maketext('Editor rows:')
-						),
-						CGI::div(
-							{ class => 'col-9' },
-							CGI::textfield({
-								name  => 'rows',
-								id    => 'rows',
-								size  => 3,
-								value => $rows,
-								class => 'form-control form-control-sm d-inline w-auto'
-							})
-						),
-					),
-					CGI::submit({
-						name  => 'updateSettings',
-						value => $r->maketext('Update settings and refresh page'),
-						class => 'btn btn-secondary btn-sm'
-					}),
-				),
-				CGI::div(
-					{ class => 'col-md-6 mb-2' },
-					CGI::div(
-						{ class => 'form-check' },
-						CGI::input({
-							name  => 'send_to',
-							id    => 'send_to_all',
-							value => 'all_students',
-							type  => 'radio',
-							class => 'form-check-input',
-							(($r->param('send_to') // '') eq 'all_students') ? (checked => undef) : ()
-						}),
-						CGI::label(
-							{ for => 'send_to_all', class => 'form-check-label' },
-							$r->maketext('Send to all students')
-						)
-					),
-					CGI::div(
-						{ class => 'form-check' },
-						CGI::input({
-							name  => 'send_to',
-							id    => 'send_to_selected',
-							value => 'studentID',
-							type  => 'radio',
-							class => 'form-check-input',
-							(!$r->param('send_to') || $r->param('send_to') eq 'studentID') ? (checked => undef) : ()
-						}),
-						CGI::label(
-							{ for => 'send_to_selected', class => 'form-check-label' },
-							$r->maketext('Send to the students selected below')
-						)
-					),
-					CGI::div(
-						{ class => 'mb-2' },
-						scrollingRecordList(
-							{
-								name                => 'classList',
-								request             => $r,
-								default_sort        => 'lnfn',
-								default_format      => 'lnfn_uid',
-								default_filters     => ['all'],
-								refresh_button_name => $r->maketext('Update settings and refresh page'),
-								attrs               => {
-									size     => 5,
-									multiple => 1
-								}
-							},
-							@{ $self->{ra_user_records} }
-						)
-					),
-					CGI::div(
-						{ class => 'input-group input-group-sm mb-2' },
-						CGI::submit({
-							name  => 'previewMessage',
-							value => $r->maketext('Preview Message'),
-							class => 'btn btn-secondary btn-sm'
-						}),
-						CGI::span(
-							{ class => 'input-group-text', style => 'white-space:pre;' },
-							CGI::strong($r->maketext('for')) . ' '
-								. $preview_record->last_name . ', '
-								. $preview_record->first_name . ' ('
-								. $preview_record->user_id . ')'
-						)
-					)
-				)
-			),
-			# Insert a toast containing a list of available macros.
-			CGI::div(
-				{ class => 'd-flex justify-content-center' },
-				'<button id="insertable-macros-btn" class="btn btn-secondary btn-sm" type="button">'
-					. $r->maketext('List of insertable macros')
-					. '</button>'
-			),
-			CGI::div(
-				{ class => 'position-fixed top-0 end-0 p-3', style => 'z-index: 11' },
-				CGI::div(
-					{
-						id          => 'insertable-macros',
-						class       => 'toast bg-white',
-						role        => 'alert',
-						aria_live   => 'polite',
-						aria_atomic => 'true'
-					},
-					CGI::div(
-						{ class => 'toast-header' },
-						CGI::strong({ class => 'me-auto' }, $r->maketext('List of insertable macros')),
-						'<button type="button" class="btn-close" data-bs-dismiss="toast" aria-label="Close"></button>'
-					),
-					CGI::div(
-						{ class => 'toast-body' },
-						CGI::table(
-							{ class => 'table table-bordered table-sm align-middle w-auto mb-0 mx-auto' },
-							CGI::thead(CGI::Tr(CGI::th([ $r->maketext('Macro'), $r->maketext('Value') ]))),
-							CGI::tbody(
-								CGI::Tr(CGI::td([ '$SID',        $r->maketext('Student ID') ])),
-								CGI::Tr(CGI::td([ '$FN',         $r->maketext('First name') ])),
-								CGI::Tr(CGI::td([ '$LN',         $r->maketext('Last name') ])),
-								CGI::Tr(CGI::td([ '$SECTION',    $r->maketext('Section') ])),
-								CGI::Tr(CGI::td([ '$RECITATION', $r->maketext('Recitation') ])),
-								CGI::Tr(CGI::td([ '$STATUS',     $r->maketext('Enrolled, Drop, etc.') ])),
-								CGI::Tr(CGI::td([ '$EMAIL',      $r->maketext('Email address') ])),
-								CGI::Tr(CGI::td([ '$LOGIN',      $r->maketext('Login') ])),
-								CGI::Tr(CGI::td([ '$COL[n]',     $r->maketext('nth colum of merge file') ])),
-								CGI::Tr(CGI::td([ '$COL[-1]',    $r->maketext('Last column of merge file') ]))
-							)
-						)
-					)
-				)
-			)
-		)
+	# The content in message is going to be displayed in HTML.
+	# It needs to have html entities escaped to avoid problems with things like <user@domain.com>.
+	# Note that this escaping is done in the Mojolicious template automatically.
+	$msg = join(
+		"",
+		"To: ",       $c->{preview_user}->email_address, "\n",
+		"From: ",     $c->{from},                        "\n",
+		"Reply-To: ", $c->{replyTo},                     "\n",
+		"Subject: ",  $c->{subject},                     "\n",
+		# In a real mails we would UTF-8 encode the message and give the Content-Type header. For the preview which is
+		# displayed as html, just add the header, but do NOT use Encode::encode("UTF-8",$msg).
+		"Content-Type: text/plain; charset=UTF-8\n\n",
+		wrap('', '', $msg),
+		"\n"
 	);
 
-	# Merge file fragment and message text area field
-	my @merge_data;
-	eval { @merge_data = @{ $rh_merge_data->{ $db->getUser($preview_user)->student_id } }; };    # checked
-	if ($@ and $merge_file ne 'None') {
-		print CGI::div({ class => 'mb-3' }, "No merge data for $preview_user in merge file: &lt;$merge_file&gt;");
-	} elsif (@merge_data) {
-		print CGI::pre("", data_format(1 .. ($#merge_data + 1)), "<br>", data_format2(@merge_data));
-	}
-
-	# Create a textbox with the subject and a textarea with the message.
-	# Print the actual body of message.
-	print CGI::div({ class => 'alert alert-info p-1 my-2' }, $self->{message}) if defined($self->{message});
-	print CGI::div(
-		{ class => 'mb-2' },
-		CGI::label(
-			{ 'for' => "email-body", class => 'form-label' },
-			$r->maketext("Email Body:") . CGI::span({ class => "required-field" }, '*')
-		),
-		CGI::textarea({
-			id       => "email-body",
-			name     => 'body',
-			default  => $text,
-			rows     => $rows,
-			override => 1,
-			class    => 'form-control'
-		})
-	);
+	# Associate usernames to student ids to test if merge data is found.
+	my %student_ids = map { $_->user_id => $_->student_id } @{ $c->{ra_user_records} };
 
-	# Action buttons
-	print CGI::div(
-		{ class => 'card' },
-		CGI::div(
-			{ class => 'card-body p-1 d-md-flex flex-wrap justify-content-evenly' },
-			CGI::div(
-				{ class => 'input-group input-group-sm w-auto m-1' },
-				CGI::submit({
-					name  => 'sendEmail',
-					id    => "sendEmail_id",
-					value => $r->maketext('Send Email'),
-					class => 'btn btn-secondary btn-sm d-inline w-auto'
-				})
-			),
-			CGI::div(
-				{ class => 'input-group input-group-sm w-auto m-1' },
-				CGI::submit({
-					name  => 'saveMessage',
-					value => $r->maketext('Save'),
-					class => 'btn btn-secondary btn-sm'
-				}),
-				CGI::span({ class => 'input-group-text' }, $r->maketext('to') . ' ' . $output_file)
-			),
-			CGI::div(
-				{ class => 'input-group input-group-sm w-auto m-1' },
-				CGI::submit({
-					name  => 'saveAs',
-					id    => 'saveAs',
-					value => $r->maketext('Save as') . ":",
-					class => 'btn btn-secondary btn-sm'
-				}),
-				CGI::textfield({
-					name            => 'savefilename',
-					size            => 20,
-					value           => "$output_file",
-					class           => 'form-control form-control-sm',
-					aria_labelledby => 'saveAs'
-				})
-			),
-			CGI::div(
-				{ class => 'input-group input-group-sm w-auto m-1' },
-				CGI::submit({
-					name  => 'saveDefault',
-					value => $r->maketext('Save as Default'),
-					class => 'btn btn-secondary btn-sm'
-				})
-			)
-		)
+	return $c->include(
+		'ContentGenerator/Instructor/SendMail/preview',
+		preview_header => $preview_header,
+		ur             => $c->{preview_user},
+		msg            => $msg,
+		merge_data     => $rh_merge_data,
+		student_ids    => \%student_ids,
 	);
-
-	print CGI::end_form();
-	return '';
 }
 
-##############################################################################
 # Utility methods
-##############################################################################
-
-sub saveProblem {
-	my $self = shift;
-	my ($body, $probFileName)= @_;
-	local(*PROBLEM);
-	open (PROBLEM, ">:encoding(UTF-8)",$probFileName) ||
-		$self->addbadmessage(CGI::p("Could not open $probFileName for writing.
-						Check that the  permissions for this problem are 660 (-rw-rw----)"));
-	print PROBLEM $body if -w $probFileName;
-	close PROBLEM;
-	chmod 0660, "$probFileName" ||
-	             $self->addbadmessage(CGI::p("CAN'T CHANGE PERMISSIONS ON FILE $probFileName"));
+
+sub saveMessageFile ($c, $body, $msgFileName) {
+	open(my $PROBLEM, ">:encoding(UTF-8)", $msgFileName)
+		|| $c->addbadmessage("Could not open $msgFileName for writing. "
+			. 'Check that the permissions for this file are 660 (-rw-rw----).');
+	print $PROBLEM $body if -w $msgFileName;
+	close $PROBLEM;
+
+	chmod 0660, "$msgFileName"
+		|| $c->addbadmessage("CAN'T CHANGE PERMISSIONS ON FILE $msgFileName");
+
+	return;
 }
 
-sub read_input_file {
-	my $self         = shift;
-	my $filePath     = shift;
-	my $r = $self->r;
+sub read_input_file ($c, $filePath) {
 	my ($text, @text);
 	my $header = '';
 	my ($subject, $from, $replyTo);
-	local(*FILE);
-	if (-e "$filePath" and -r "$filePath") {
-		open FILE, "<:encoding(UTF-8)", $filePath || do { $self->addbadmessage(CGI::p($r->maketext("Can't open [_1]",$filePath))); return};
-		while ($header !~ s/Message:\s*$//m and not eof(FILE)) {
-			$header .= <FILE>;
-		}
-		$text = join( '', <FILE>);
-		$text =~ s/^\s*//; # remove initial white space if any.
-		$header         =~ /^From:\s(.*)$/m;
-		$from           = $1 or $from = $self->{defaultFrom};
-
-		$header         =~ /^Reply-To:\s(.*)$/m;
-		$replyTo        = $1 or $replyTo = $self->{defaultReply};
 
-		$header         =~ /^Subject:\s(.*)$/m;
-		$subject        = $1;
-
-	} else {
-		$from           = $self->{defaultFrom};
-		$replyTo        = $self->{defaultReply};
-		$text           =  (-e "$filePath") ? "FIXME file $filePath can't be read" :"FIXME file $filePath doesn't exist";
-		$subject        = $self->{defaultSubject};
+	open my $FILE, "<:encoding(UTF-8)", $filePath
+		or do { $c->addbadmessage($c->maketext(q{Can't open [_1]}, $filePath)); return };
+	while ($header !~ s/Message:\s*$//m and not eof($FILE)) {
+		$header .= <$FILE>;
 	}
-	return ($from, $replyTo, $subject, \$text);
-}
+	$text = join('', <$FILE>);
+	close $FILE;
 
-sub get_message_file_names {
-	my $self         = shift;
-	return $self->read_dir($self->{ce}->{courseDirs}->{email}, '\\.msg$');
-}
-sub get_merge_file_names   {
-	my $self         = shift;
-	return 'None', $self->read_dir($self->{ce}->{courseDirs}->{scoring}, '\\.csv$'); #FIXME ? check that only readable files are listed.
-}
+	$text   =~ s/^\s*//;           # remove initial white space if any.
+	$header =~ /^From:\s(.*)$/m;
+	$from = $1 || $c->{defaultFrom};
 
-sub mail_message_to_recipients {
-	my $self            = shift;
-	my $r               = $self->r;
-	my $ce              = $r->ce;
-	my $subject         = $self->{subject};
-	my $from            = $self->{from};
-	my @recipients      = @{ $self->{ra_send_to} };
-	my $rh_merge_data   = $self->{rh_merge_data};
-	my $merge_file      = $self->{merge_file};
-	my $result_message  = '';
-	my $failed_messages = 0;
-	my $error_messages  = '';
-
-	for my $recipient (@recipients) {
-		$error_messages = '';
-
-		my $ur = $self->{db}->getUser($recipient);    #checked
-		unless ($ur) {
-			$error_messages .= "Record for user $recipient not found\n";
-			next;
-		}
-		unless ($ur->email_address =~ /\S/) {         #unless address contains a non-blank charachter
-			$error_messages .= "User $recipient does not have an email address -- skipping\n";
-			next;
-		}
+	$header =~ /^Reply-To:\s(.*)$/m;
+	$replyTo = $1 || $c->{defaultReply};
 
-		my $msg = eval { $self->process_message($ur, $rh_merge_data) };
-		$error_messages .= "There were errors in processing user $recipient, merge file $merge_file. \n$@\n" if $@;
-
-		my $email = Email::Stuffer->to($ur->email_address)->from($from)->subject($subject)
-			->text_body($msg)->header('X-Remote-Host' => $self->{remote_host});
-
-		# $ce->{mail}{set_return_path} is the address used to report returned email if defined and non empty.
-		# It is an argument used in sendmail() (aka Email::Stuffer::send_or_die).
-		# For arcane historical reasons sendmail actually sets the field "MAIL FROM" and the smtp server then
-		# uses that to set "Return-Path".
-		# references:
-		#  https://stackoverflow.com/questions/1235534/what-is-the-behavior-difference-between-return-path-reply-to-and-from
-		#  https://metacpan.org/pod/Email::Sender::Manual::QuickStart#envelope-information
-		try {
-			$email->send_or_die({
-				# createEmailSenderTransportSMTP is defined in ContentGenerator
-				transport => $self->createEmailSenderTransportSMTP(),
-				$ce->{mail}{set_return_path} ? (from => $ce->{mail}{set_return_path}) : ()
-			});
-			debug 'email sent successfully to ' . $ur->email_address;
-		} catch {
-			debug "Error sending email: $_";
-			debug dump $@;
-			$error_messages .= "Error sending email: $_";
-			next;
-		};
-
-		$result_message .= $r->maketext("Message sent to [_1] at [_2].", $recipient, $ur->email_address) . "\n"
-			unless $error_messages;
-	} continue {    #update failed messages before continuing loop
-		if ($error_messages) {
-			$failed_messages++;
-			$result_message .= $error_messages;
-		}
-	}
-	my $courseName           = $self->r->urlpath->arg("courseID");
-	my $number_of_recipients = scalar(@recipients) - $failed_messages;
-	$result_message = $r->maketext(
-		"A message with the subject line \"[_1]\" has been sent to [quant,_2,recipient] in the class [_3].  "
-			. "There were [_4] message(s) that could not be sent.",
-		$subject, $number_of_recipients, $courseName, $failed_messages)
-		. "\n\n"
-		. $result_message;
+	$header =~ /^Subject:\s(.*)$/m;
+	$subject = $1 || $c->{defaultSubject};
 
+	return ($from, $replyTo, $subject, \$text);
 }
 
-sub email_notification {
-	my $self           = shift;
-	my $result_message = shift;
-	my $ce             = $self->r->ce;
-
-	my $email = Email::Stuffer->to($self->{defaultFrom})->from($self->{defaultFrom})->subject('WeBWorK email sent')
-		->text_body($result_message)->header('X-Remote-Host' => $self->{remote_host});
-
-	try {
-		$email->send_or_die({
-			# createEmailSenderTransportSMTP is defined in ContentGenerator
-			transport => $self->createEmailSenderTransportSMTP(),
-			$ce->{mail}{set_return_path} ? (from => $ce->{mail}{set_return_path}) : ()
-		});
-	} catch {
-		warn "Error sending email: $_";
-	};
-
-	warn "\nWW::Instructor::SendMail:: instructor message sent from $self->{defaultFrom}\n";
+sub get_message_file_names ($c) {
+	return read_dir($c->{ce}{courseDirs}{email}, '\\.msg$');
 }
 
-sub getRecord {
-	my $self    = shift;
-	my $line    = shift;
-	my $delimiter   = shift;
-	$delimiter       = ',' unless defined($delimiter);
-
-        #       Takes a delimited line as a parameter and returns an
-        #       array.  Note that all white space is removed.  If the
-        #       last field is empty, the last element of the returned
-        #       array is also empty (unlike what the perl split command
-        #       would return).  E.G. @lineArray=&getRecord(\$delimitedLine).
-
-        my(@lineArray);
-        $line.="${delimiter}___";                       # add final field which must be non-empty
-        @lineArray = split(/\s*${delimiter}\s*/,$line); # split line into fields
-        $lineArray[0] =~s/^\s*//;                       # remove white space from first element
-        pop @lineArray;                                 # remove the last artificial field
-        @lineArray;
+sub get_merge_file_names ($c) {
+	# FIXME: Check that only readable files are listed.
+	return read_dir($c->{ce}{courseDirs}{scoring}, '\\.csv$');
 }
 
-sub process_message {
-        my $self          = shift;
-	my $ur            = shift;
-	my $rh_merge_data = shift;
-	my $for_preview   = shift;
-	my $r             = $self->r;
-	my $text          = defined($self->{r_text}) ? ${ $self->{r_text} }:
-	                        'FIXME no text was produced by initialization!!';
-	my $merge_file      = ( defined($self->{merge_file}) ) ? $self->{merge_file} : 'None';
-
-	my $status_name = $self->r->ce->status_abbrev_to_name($ur->status);
-	$status_name = $ur->status unless defined $status_name;
-
-	#user macros that can be used in the email message
-	my $SID           = $ur->student_id;
-	my $FN            = $ur->first_name;
-	my $LN            = $ur->last_name;
-	my $SECTION       = $ur->section;
-	my $RECITATION    = $ur->recitation;
-	my $STATUS        = $status_name;
-	my $EMAIL         = $ur->email_address;
-	my $LOGIN         = $ur->user_id;
-
-	# get record from merge file
-	# FIXME this is inefficient.  The info should be cached
-	my @COL            = defined($rh_merge_data->{$SID}) ? @{$rh_merge_data->{$SID} } : ();
-	if ($merge_file ne 'None' and not defined($rh_merge_data->{$SID}) and $for_preview) {
-		$self->addbadmessage(CGI::p("No merge data for student id:$SID; name:$FN $LN; login:$LOGIN"));
-	}
-	unshift(@COL,"");			## this makes COL[1] the first column
-	my $endCol = @COL;
-	# for safety, only evaluate special variables
- 	my $msg = $text;
-	$msg =~ s/\$SID/$SID/g;
- 	$msg =~ s/\$LN/$LN/g;
- 	$msg =~ s/\$FN/$FN/g;
- 	$msg =~ s/\$STATUS/$STATUS/g;
- 	$msg =~ s/\$SECTION/$SECTION/g;
- 	$msg =~ s/\$RECITATION/$RECITATION/g;
- 	$msg =~ s/\$EMAIL/$EMAIL/g;
- 	$msg =~ s/\$LOGIN/$LOGIN/g;
-	if (defined($COL[1])) {		# prevents extraneous error messages.
-		$msg =~ s/\$COL\[(\-?\d+)\]/$COL[$1]/g
-	}
-	else {						# prevents extraneous $COL's in email message
-		$msg =~ s/\$COL\[(\-?\d+)\]//g
-	}
-
- 	$msg =~ s/\r//g;
-
-	if ($for_preview) {
-		my @preview_COL = @COL;
-		shift @preview_COL; ## shift back for preview
-		my $preview_header = 	CGI::p('',data_format(1..($#COL)),"<br>", data_format2(@preview_COL)).
-			                    CGI::h3( $r->maketext("This sample mail would be sent to [_1]", $EMAIL));
-		return $msg, $preview_header;
-	} else {
-		return $msg;
-	}
+sub getRecord ($c, $line, $delimiter = ',') {
+	# Takes a delimited line as a parameter and returns an
+	# array.  Note that all white space is removed.  If the
+	# last field is empty, the last element of the returned
+	# array is also empty (unlike what the perl split command
+	# would return).  E.G. @lineArray=&getRecord(\$delimitedLine).
+
+	my (@lineArray);
+	$line .= "${delimiter}___";                         # add final field which must be non-empty
+	@lineArray = split(/\s*${delimiter}\s*/, $line);    # split line into fields
+	$lineArray[0] =~ s/^\s*//;                          # remove white space from first element
+	pop @lineArray;                                     # remove the last artificial field
+	return @lineArray;
 }
 
-sub data_format {
-	map { "COL[$_]" . '&nbsp;' x (3 - length($_)); } @_;    # problems if $_ has length bigger than 4
+sub data_format ($c, @data) {
+	return map { "COL[$_]" . '&nbsp;' x (3 - length($_)) } @data;    # problems if $_ has length bigger than 4
 }
 
-sub data_format2 {
-	map { $_ =~ s/\s/&nbsp;/g; $_ } map { sprintf('%-8.8s', $_); } @_;
+sub data_format2 ($c, @data) {
+	return map { $_ =~ s/\s/&nbsp;/gr } map { sprintf('%-8.7s', $_) } @data;
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm
index 777fb12a82..e0e5f0a4cb 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm
@@ -13,9 +13,8 @@
 # Artistic License for more details.
 ################################################################################
 
-
 package WeBWorK::ContentGenerator::Instructor::SetMaker;
-use base qw(WeBWorK::ContentGenerator::Instructor);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -23,63 +22,39 @@ WeBWorK::ContentGenerator::Instructor::SetMaker - Make homework sets.
 
 =cut
 
-use strict;
-use warnings;
-
+use File::Find;
+use Mojo::File;
 
-#use CGI qw(-nosticky);
-use WeBWorK::CGI;
 use WeBWorK::Debug;
-use WeBWorK::Form;
-use WeBWorK::Utils qw(readDirectory max sortByName wwRound x getAssetURL format_set_name_internal
-	format_set_name_display);
-use WeBWorK::Utils::Tasks qw(renderProblems);
+use WeBWorK::Utils qw(readDirectory sortByName x format_set_name_internal);
 use WeBWorK::Utils::Tags;
 use WeBWorK::Utils::LibraryStats;
-use WeBWorK::Utils::LanguageAndDirection;
-use File::Find;
-use MIME::Base64 qw(encode_base64);
-use Encode;
-
-require WeBWorK::Utils::ListingDB;
-
-# we use x to mark strings for maketext
-use constant INCLUDE_CONTRIB_DEFAULT => 0;
-use constant SHOW_HINTS_DEFAULT => 0;
-use constant SHOW_SOLUTIONS_DEFAULT => 0;
-use constant MAX_SHOW_DEFAULT => 20;
-use constant NO_LOCAL_SET_STRING => x('No sets in this course yet');
-use constant MY_PROBLEMS => x('My Problems');
-use constant MAIN_PROBLEMS => x('Unclassified Problems');
+use WeBWorK::Utils::ListingDB qw(getSectionListings);
+use WeBWorK::Utils::Instructor qw(assignSetToUser assignProblemToAllSetUsers addProblemToSet);
 
-use constant LIB2_DATA => {
-	'dbchapter'   => { name => 'library_chapters',    all => x('All Chapters') },
-	'dbsection'   => { name => 'library_sections',    all => x('All Sections') },
-	'dbsubject'   => { name => 'library_subjects',    all => x('All Subjects') },
-	'textbook'    => { name => 'library_textbook',    all => x('All Textbooks') },
-	'textchapter' => { name => 'library_textchapter', all => x('All Chapters') },
-	'textsection' => { name => 'library_textsection', all => x('All Sections') },
-	'keywords'    => { name => 'library_keywords',    all => '' },
-};
-
-## Flags for operations on files
+# Use x to mark strings for maketext
+use constant MY_PROBLEMS   => x('My Problems');
+use constant MAIN_PROBLEMS => x('Unclassified Problems');
 
-use constant ADDED => 1;
-use constant HIDDEN => (1 << 1);
+# Flags for operations on files
+use constant ADDED   => 1;
+use constant HIDDEN  => (1 << 1);
 use constant SUCCESS => (1 << 2);
 
-##	for additional problib buttons
-my %problib;	## This is configured in defaults.config
 my %ignoredir = (
-	'.' => 1, '..' => 1, 'CVS' => 1, 'tmpEdit' => 1,
-	'headers' => 1, 'macros' => 1, 'email' => 1, 'graphics'=>1, '.svn' => 1, 'achievements' => 1,
+	'.'            => 1,
+	'..'           => 1,
+	'tmpEdit'      => 1,
+	'headers'      => 1,
+	'macros'       => 1,
+	'email'        => 1,
+	'graphics'     => 1,
+	'achievements' => 1,
 );
 
-sub prepare_activity_entry {
-	my $self=shift;
-	my $r = $self->r;
-	my $user = $self->r->param('user') || 'NO_USER';
-	return("In SetMaker as user $user");
+sub prepare_activity_entry ($c) {
+	my $user = $c->param('user') || 'NO_USER';
+	return ("In SetMaker as user $user");
 }
 
 ## This is for searching the disk for directories containing pg files.
@@ -101,95 +76,95 @@ sub prepare_activity_entry {
 ## always listed as a separate directory even if it contains only one
 ## pg file.
 
-sub get_library_sets {
-	my $top = shift; my $dir = shift;
+sub get_library_sets ($c, $top, $dir) {
 	# ignore directories that give us an error
 	my @lis = eval { readDirectory($dir) };
 	if ($@) {
 		warn $@;
 		return (0);
 	}
-	return (0) if grep /^=library-ignore$/, @lis;
+	return (0) if grep {/^=library-ignore$/} @lis;
 
-	my @pgfiles = grep { m/\.pg$/ and (not m/(Header|-text)(File)?\.pg$/) and -f "$dir/$_"} @lis;
+	my @pgfiles = grep { m/\.pg$/ && (!m/(Header|-text)(File)?\.pg$/) && -f "$dir/$_" } @lis;
 	my $pgcount = scalar(@pgfiles);
-	my $pgname = $dir; $pgname =~ s!.*/!!; $pgname .= '.pg';
-	my $combineUp = ($pgcount == 1 && $pgname eq $pgfiles[0] && !(grep /^=library-no-combine$/, @lis));
+	my $pgname  = $dir;
+	$pgname =~ s!.*/!!;
+	$pgname .= '.pg';
+	my $combineUp = ($pgcount == 1 && $pgname eq $pgfiles[0] && !(grep {/^=library-no-combine$/} @lis));
 
 	my @pgdirs;
-	my @dirs = grep {!$ignoredir{$_} and -d "$dir/$_"} @lis;
-	if ($top == 1) {@dirs = grep {!$problib{$_}} @dirs}
+	my @dirs = grep { !$ignoredir{$_} && -d "$dir/$_" } @lis;
+	if ($top == 1) {
+		@dirs = grep { !$c->{problibs}{$_} } @dirs;
+	}
 	# Never include Library or Contrib at the top level
-	if ($top == 1) {@dirs = grep {$_ ne 'Library' && $_ ne 'Contrib'} @dirs}
+	if ($top == 1) {
+		@dirs = grep { $_ ne 'Library' && $_ ne 'Contrib' } @dirs;
+	}
 	foreach my $subdir (@dirs) {
-		my @results = get_library_sets(0, "$dir/$subdir");
-		$pgcount += shift @results; push(@pgdirs,@results);
+		my @results = $c->get_library_sets(0, "$dir/$subdir");
+		$pgcount += shift @results;
+		push(@pgdirs, @results);
 	}
 
-	return ($pgcount, @pgdirs) if $top || $combineUp || grep /^=library-combine-up$/, @lis;
-	return (0,@pgdirs,$dir);
+	return ($pgcount, @pgdirs) if $top || $combineUp || (grep {/^=library-combine-up$/} @lis);
+	return (0, @pgdirs, $dir);
 }
 
-sub get_library_pgs {
-	my $top = shift; my $base = shift; my $dir = shift;
+sub get_library_pgs ($c, $top, $base, $dir) {
 	my @lis = readDirectory("$base/$dir");
-	return () if grep /^=library-ignore$/, @lis;
-	return () if !$top && grep /^=library-no-combine$/, @lis;
+	return () if (grep {/^=library-ignore$/} @lis);
+	return () if !$top && (grep {/^=library-no-combine$/} @lis);
 
-	my @pgs = grep { m/\.pg$/ and (not m/(Header|-text)\.pg$/) and -f "$base/$dir/$_"} @lis;
-	my $others = scalar(grep { (!m/\.pg$/ || m/(Header|-text)\.pg$/) &&
-	                            !m/(\.(tmp|bak)|~)$/ && -f "$base/$dir/$_" } @lis);
+	my @pgs = grep { m/\.pg$/ and (not m/(Header|-text)\.pg$/) and -f "$base/$dir/$_" } @lis;
+	my $others =
+		scalar(grep { (!m/\.pg$/ || m/(Header|-text)\.pg$/) && !m/(\.(tmp|bak)|~)$/ && -f "$base/$dir/$_" } @lis);
 
-	my @dirs = grep {!$ignoredir{$_} and -d "$base/$dir/$_"} @lis;
-	if ($top == 1) {@dirs = grep {!$problib{$_}} @dirs}
-	foreach my $subdir (@dirs) {push(@pgs, get_library_pgs(0,"$base/$dir",$subdir))}
+	my @dirs = grep { !$ignoredir{$_} && -d "$base/$dir/$_" } @lis;
+	if ($top == 1) {
+		@dirs = grep { !$c->{problibs}{$_} } @dirs;
+	}
+	foreach my $subdir (@dirs) { push(@pgs, $c->get_library_pgs(0, "$base/$dir", $subdir)) }
 
-	return () unless $top || (scalar(@pgs) == 1 && $others) || grep /^=library-combine-up$/, @lis;
+	return unless $top || (scalar(@pgs) == 1 && $others) || (grep {/^=library-combine-up$/} @lis);
 	return (map {"$dir/$_"} @pgs);
 }
 
-sub list_pg_files {
-	my ($templates,$dir) = @_;
-	my $top = ($dir eq '.')? 1 : 2;
-	my @pgs = get_library_pgs($top,$templates,$dir);
-	return sortByName(undef,@pgs);
+sub list_pg_files ($c, $templates, $dir) {
+	my $top = ($dir eq '.') ? 1 : 2;
+	my @pgs = $c->get_library_pgs($top, $templates, $dir);
+	return sortByName(undef, @pgs);
 }
 
 ## Try to make reading of set defs more flexible.  Additional strategies
 ## for fixing a path can be added here.
 
-sub munge_pg_file_path {
-	my $self = shift;
-	my $pg_path = shift;
-	my $path_to_set_def = shift;
+sub munge_pg_file_path ($c, $pg_path, $path_to_set_def) {
 	my $end_path = $pg_path;
 	# if the path is ok, don't fix it
-	return($pg_path) if(-e $self->r->ce->{courseDirs}{templates}."/$pg_path");
+	return ($pg_path) if (-e $c->ce->{courseDirs}{templates} . "/$pg_path");
 	# if we have followed a link into a self contained course to get
 	# to the set.def file, we need to insert the start of the path to
 	# the set.def file
 	$end_path = "$path_to_set_def/$pg_path";
-	return($end_path) if(-e $self->r->ce->{courseDirs}{templates}."/$end_path");
+	return ($end_path) if (-e $c->ce->{courseDirs}{templates} . "/$end_path");
 	# if we got this far, this path is bad, but we let it produce
 	# an error so the user knows there is a troublesome path in the
 	# set.def file.
-	return($pg_path);
+	return ($pg_path);
 }
 
 ## Problems straight from the OPL database come with MO and static
 ## tag information.  This is for other times, like next/prev page.
 
-sub getDBextras {
-	my $r = shift;
-	my $sourceFileName = shift;
-
-	if($sourceFileName =~ /^Library/) {
-		return @{WeBWorK::Utils::ListingDB::getDBextras($r, $sourceFileName)};
+sub getDBextras ($c, $sourceFileName) {
+	if ($sourceFileName =~ /^Library/) {
+		return @{ WeBWorK::Utils::ListingDB::getDBextras($c, $sourceFileName) };
 	}
 
-	my $filePath = $r->ce->{courseDirs}{templates}."/$sourceFileName";
-	my $tag_obj = WeBWorK::Utils::Tags->new($filePath);
-	my $isMO = $tag_obj->{MO} || 0;
+	my $filePath = $c->ce->{courseDirs}{templates} . "/$sourceFileName";
+	my $tag_obj  = WeBWorK::Utils::Tags->new($filePath);
+	my $isMO     = $tag_obj->{MO}     || 0;
 	my $isstatic = $tag_obj->{Static} || 0;
 
 	return ($isMO, $isstatic);
@@ -198,1432 +173,154 @@ sub getDBextras {
 ## With MLT, problems come in groups, so we need to find next/prev
 ## problems.  Return index, or -1 if there are no more.
 sub next_prob_group {
-	my $ind = shift;
-	my @pgfiles = @_;
+	my ($ind, @pgfiles) = @_;
 	my $len = scalar(@pgfiles);
-	return -1 if($ind >= $len-1);
-	my $mlt= $pgfiles[$ind]->{morelt} || 0;
-	return $ind+1 if($mlt == 0);
-	while($ind<$len and defined($pgfiles[$ind]->{morelt}) and $pgfiles[$ind]->{morelt} == $mlt) {
+	return -1 if ($ind >= $len - 1);
+	my $mlt = $pgfiles[$ind]->{morelt} || 0;
+	return $ind + 1 if ($mlt == 0);
+	while ($ind < $len and defined($pgfiles[$ind]->{morelt}) and $pgfiles[$ind]->{morelt} == $mlt) {
 		$ind++;
 	}
-	return -1 if($ind==$len);
+	return -1 if ($ind == $len);
 	return $ind;
 }
 
 sub prev_prob_group {
-	my $ind = shift;
-	my @pgfiles = @_;
-	return -1 if $ind==0;
+	my ($ind, @pgfiles) = @_;
+	return -1 if $ind == 0;
 	$ind--;
 	my $mlt = $pgfiles[$ind]->{morelt};
-	return $ind if $mlt==0;
+	return $ind if $mlt == 0;
 	# We have to search to the beginning of this group
-	while($ind>=0 and $mlt == $pgfiles[$ind]->{morelt}) {
+	while ($ind >= 0 and $mlt == $pgfiles[$ind]->{morelt}) {
 		$ind--;
 	}
-	return($ind+1);
+	return ($ind + 1);
 }
 
 sub end_prob_group {
-	my $ind = shift;
-	my @pgfiles = @_;
+	my ($ind, @pgfiles) = @_;
 	my $next = next_prob_group($ind, @pgfiles);
-	return( ($next==-1) ? $#pgfiles : $next-1);
+	return (($next == -1) ? $#pgfiles : $next - 1);
 }
 
 ## Read a set definition file.  This could be abstracted since it happens
 ## elsewhere.  Here we don't have to process so much of the file.
-
-sub read_set_def {
-	my $self = shift;
-	my $r = $self->r;
-	my $filePathOrig = shift;
-	my $filePath = $r->ce->{courseDirs}{templates}."/$filePathOrig";
+sub read_set_def ($c, $filePathOrig) {
+	my $filePath = $c->ce->{courseDirs}{templates} . "/$filePathOrig";
 	$filePathOrig =~ s/set.*\.def$//;
 	$filePathOrig =~ s|/$||;
 	$filePathOrig = "." if ($filePathOrig !~ /\S/);
 	my @pg_files = ();
 	my ($line, $got_to_pgs, $name, @rest) = ("", 0, "");
-	if ( open (SETFILENAME, "$filePath") )    {
-	    while($line = <SETFILENAME>) {
-		chomp($line);
-		$line =~ s|(#.*)||; # don't read past comments
-		if($got_to_pgs == 1) {
-		    unless ($line =~ /\S/) {next;} # skip blank lines
-		    ($name,@rest) = split (/\s*,\s*/,$line);
-		    $name =~ s/\s*//g;
-		    push @pg_files, $name;
-		} elsif ($got_to_pgs == 2) {
-		    # skip lines which dont identify source files
-		    unless ($line =~ /source_file\s*=\s*(\S+)/) {
-			next;
-		    }
-		    # otherwise we got the name from the regexp
-		    push @pg_files, $1;
-		} else {
-		    $got_to_pgs = 1 if ($line =~ /problemList\s*=/);
-		    $got_to_pgs = 2 if ($line =~ /problemListV2/);
+
+	if (my $SETFILENAME = Mojo::File->new($filePath)->open('<')) {
+		while ($line = <$SETFILENAME>) {
+			chomp($line);
+			$line =~ s|(#.*)||;    # don't read past comments
+			if ($got_to_pgs == 1) {
+				unless ($line =~ /\S/) { next; }    # skip blank lines
+				($name, @rest) = split(/\s*,\s*/, $line);
+				$name =~ s/\s*//g;
+				push @pg_files, $name;
+			} elsif ($got_to_pgs == 2) {
+				# skip lines which dont identify source files
+				unless ($line =~ /source_file\s*=\s*(\S+)/) {
+					next;
+				}
+				# otherwise we got the name from the regexp
+				push @pg_files, $1;
+			} else {
+				$got_to_pgs = 1 if ($line =~ /problemList\s*=/);
+				$got_to_pgs = 2 if ($line =~ /problemListV2/);
+			}
 		}
-	    }
+		close $SETFILENAME;
 	} else {
-	    $self->addbadmessage($r->maketext("Cannot open [_1]",$filePath));
+		$c->addbadmessage($c->maketext("Cannot open [_1]", $filePath));
 	}
 	# This is where we would potentially munge the pg file paths
 	# One possibility
-	@pg_files = map { $self->munge_pg_file_path($_, $filePathOrig) } @pg_files;
-	return(@pg_files);
+	@pg_files = map { $c->munge_pg_file_path($_, $filePathOrig) } @pg_files;
+	return (@pg_files);
 }
 
 ## go through past page getting a list of identifiers for the problems
 ## and whether or not they are selected, and whether or not they should
 ## be hidden
 
-sub get_past_problem_files {
-	my $r = shift;
-	my @found=();
-	my $count =1;
-	while (defined($r->param("filetrial$count"))) {
+sub get_past_problem_files ($c) {
+	my @found = ();
+	my $count = 1;
+	while (defined($c->param("filetrial$count"))) {
 		my $val = 0;
-		$val |= ADDED if($r->param("trial$count"));
-		$val |= HIDDEN if($r->param("hideme$count"));
-		push @found, [$r->param("filetrial$count"), $val];
+		$val |= ADDED  if ($c->param("trial$count"));
+		$val |= HIDDEN if ($c->param("hideme$count"));
+		push @found, [ $c->param("filetrial$count"), $val ];
 		$count++;
 	}
-	return(\@found);
+	return (\@found);
 }
 
 #### For adding new problems
 
-sub add_selected {
-	my $self = shift;
-	my $db = shift;
-	my $setName = shift;
-	my @past_problems = @{$self->{past_problems}};
-	my @selected = @past_problems;
-	my (@path, $file, $selected, $freeProblemID);
-
-	my $addedcount=0;
-
-	for $selected (@selected) {
-		if($selected->[1] & ADDED) {
-			$file = $selected->[0];
-			my $problemRecord = $self->addProblemToSet(setName => $setName,
-				sourceFile => $file);
+sub add_selected ($c, $db, $setName) {
+	my @past_problems = @{ $c->{past_problems} };
+	my @selected      = @past_problems;
+	my $freeProblemID;
+
+	my $addedcount = 0;
+
+	for my $selected (@selected) {
+		if ($selected->[1] & ADDED) {
+			my $file          = $selected->[0];
+			my $problemRecord = addProblemToSet(
+				$db, $c->ce->{problemDefaults},
+				setName    => $setName,
+				sourceFile => $file
+			);
 			$freeProblemID++;
-			$self->assignProblemToAllSetUsers($problemRecord);
+			assignProblemToAllSetUsers($db, $problemRecord);
 			$selected->[1] |= SUCCESS;
 			$addedcount++;
 		}
 	}
-	return($addedcount);
+	return ($addedcount);
 }
 
-
 ############# List of sets of problems in templates directory
 
-sub get_problem_directories {
-        my $r = shift;
-        my $ce = $r->ce;
-	my $lib = shift;
-	my $source = $ce->{courseDirs}{templates};
-	my $main = $r->maketext(MY_PROBLEMS); my $isTop = 1;
-	if ($lib) {$source .= "/$lib"; $main = $r->maketext(MAIN_PROBLEMS); $isTop = 2}
-	my @all_problem_directories = get_library_sets($isTop, $source);
-	my $includetop = shift @all_problem_directories;
-	my $j;
-	for ($j=0; $j<scalar(@all_problem_directories); $j++) {
+sub get_problem_directories ($c, $lib) {
+	my $ce            = $c->ce;
+	my $source        = $ce->{courseDirs}{templates};
+	my $main_problems = $c->maketext(MY_PROBLEMS);
+	my $isTop         = 1;
+	if ($lib) { $source .= "/$lib"; $main_problems = $c->maketext(MAIN_PROBLEMS); $isTop = 2 }
+	my @all_problem_directories = $c->get_library_sets($isTop, $source);
+	my $includetop              = shift @all_problem_directories;
+
+	for (my $j = 0; $j < scalar(@all_problem_directories); $j++) {
 		$all_problem_directories[$j] =~ s|^$ce->{courseDirs}->{templates}/?||;
 	}
 	@all_problem_directories = sortByName(undef, @all_problem_directories);
-	unshift @all_problem_directories, $main if($includetop);
+	unshift @all_problem_directories, $main_problems if ($includetop);
 	return (\@all_problem_directories);
 }
 
-# All of the browsing panel versions have a view problems line. Abstract it.
-sub view_problems_line {
-	my $internal_name = shift;
-	my $label         = shift;
-	my $r             = shift;    # so we can get parameter values
-	my $contrib_exist = (-r $r->ce->{courseDirs}{templates}.'/Contrib') ? 1 : 0;
-
-	my $result = CGI::start_div({ class => 'd-flex flex-wrap justify-content-center' });
-
-	$result .= CGI::submit({ name => $internal_name, value => $label, class => 'btn btn-secondary btn-sm mb-2' });
-
-	# Give a choice of display modes.
-	my %display_modes = %{ WeBWorK::PG::DISPLAY_MODES() };
-	my @active_modes  = grep { exists $display_modes{$_} } @{ $r->ce->{pg}{displayModes} };
-	push @active_modes, 'None';
-
-	# We have our own displayMode since its value may be None, which is illegal in other modules.
-	my $mydisplayMode = $r->param('mydisplayMode') || $r->ce->{pg}->{options}->{displayMode};
-	$result .= CGI::div(
-		{ class => 'd-inline-block ms-2 mb-2' },
-		CGI::label(
-			{ for => 'mydisplayMode', class => 'col-form-label col-form-label-sm' },
-			$r->maketext('Display Mode:')
-		),
-		CGI::popup_menu({
-			name    => 'mydisplayMode',
-			id      => 'mydisplayMode',
-			values  => \@active_modes,
-			default => $mydisplayMode,
-			class   => 'form-select form-select-sm d-inline w-auto'
-		}),
-		CGI::hidden({ name => "original_displayMode", default => $mydisplayMode })
-	);
-
-	# Now we give a choice of the number of problems to show.
-	$result .= CGI::div(
-		{ class => 'd-inline-block ms-2 mb-2' },
-		CGI::label({ for => 'max_shown', class => 'col-form-label col-form-label-sm' }, $r->maketext('Max. Shown:')),
-		CGI::popup_menu({
-			name    => 'max_shown',
-			id      => 'max_shown',
-			values  => [ 5, 10, 15, 20, 25, 30, 50, 'All' ],
-			default => $r->param('max_shown') || MAX_SHOW_DEFAULT,
-			class   => 'form-select form-select-sm d-inline w-auto'
-		})
-	);
-
-	my $maybe_OPL_box = $contrib_exist ? CGI::div(
-		{ class => 'form-check form-check-inline ms-2' },
-		CGI::checkbox({
-			name            => 'includeOPL',
-			checked         => $r->param('includeOPL') // 1,
-			label           => $r->maketext('Include OPL'),
-			class           => 'form-check-input me-1',
-			labelattributes => { class => 'form-check-label col-form-label-sm' }
-		})
-	) : ();
-
-	my $maybe_contrib_box = $contrib_exist ? CGI::div(
-		{ class => 'form-check form-check-inline ms-2' },
-		CGI::checkbox({
-			name            => 'includeContrib',
-			checked         => $r->param('includeContrib') // INCLUDE_CONTRIB_DEFAULT,
-			label           => $r->maketext('Include Contrib'),
-			class           => 'form-check-input me-1',
-			labelattributes => { class => 'form-check-label col-form-label-sm' }
-		})
-	) : ();
-
-	# Option of whether to show hints and solutions
-	$result .= CGI::div(
-		{ class => 'd-inline-block ms-2 mb-2' },
-		$maybe_OPL_box,
-		$maybe_contrib_box,
-		CGI::div(
-			{ class => 'form-check form-check-inline ms-2' },
-			CGI::checkbox({
-				name            => "showHints",
-				checked         => $r->param('showHints') || SHOW_HINTS_DEFAULT,
-				label           => $r->maketext("Hints"),
-				class           => 'form-check-input me-1',
-				labelattributes => { class => 'form-check-label col-form-label-sm' }
-			})
-		),
-		CGI::div(
-			{ class => 'form-check form-check-inline ms-2' },
-			CGI::checkbox({
-				name            => "showSolutions",
-				checked         => $r->param('showSolutions') || SHOW_SOLUTIONS_DEFAULT,
-				label           => $r->maketext("Solutions"),
-				class           => 'form-check-input me-1',
-				labelattributes => { class => 'form-check-label col-form-label-sm' }
-			})
-		),
-		CGI::hidden({name => 'includeOPL', default => $contrib_exist ? 0 : 1})
-	);
-
-	$result .= CGI::end_div();
-
-	return $result;
-}
-
-# The browsing panel has three versions.
-# Version 1 is local problems
-sub browse_local_panel {
-	my $self             = shift;
-	my $r                = $self->r;
-	my $library_selected = shift // '';
-	my $lib              = (shift || '') =~ s/^browse_//r;
-
-	my $list_of_prob_dirs    = get_problem_directories($r, $lib);
-	my $labels_for_prob_dirs = $lib
-		# Make labels without the $lib prefix.  This reduces the width of the popup menu.
-		? { map { $_ => $_ =~ s/^$lib\/(.*)$/$1/r } @$list_of_prob_dirs }
-		: { map { $_ => $_ } @$list_of_prob_dirs };
-
-	if (@$list_of_prob_dirs == 0) {
-		unshift @$list_of_prob_dirs, '';
-		$labels_for_prob_dirs->{''} = $r->maketext("Found no directories containing problems");
-	} elsif ($library_selected eq '') {
-		unshift @$list_of_prob_dirs, '';
-		$labels_for_prob_dirs->{''} = $r->maketext('Select a Problem Collection');
-	}
-	debug("library is $lib and sets are $library_selected");
-
-	print CGI::div(
-		{ class => "InfoPanel" },
-		CGI::div(
-			{ class => 'mb-2' },
-			CGI::label(
-				{ for => 'library_sets', class => 'col-form-label-sm' },
-				$r->maketext(
-					"[_1] Problems:",
-					$lib eq '' ? $r->maketext('Local') : Encode::decode("UTF-8", $problib{$lib})
-				)
-			),
-			CGI::popup_menu({
-				name    => 'library_sets',
-				id      => 'library_sets',
-				values  => $list_of_prob_dirs,
-				labels  => $labels_for_prob_dirs,
-				default => $library_selected,
-				class   => 'form-select form-select-sm d-inline w-auto'
-			})
-		),
-		view_problems_line('view_local_set', $r->maketext('View Problems'), $self->r),
-	);
-}
-
-# Version 2 is local homework sets
-sub browse_mysets_panel {
-	my $self = shift;
-	my $r = $self->r;
-	my $library_selected = shift // '';
-	my $list_of_local_sets = shift;
-	my $labels_for_local_sets = { map { $_ => format_set_name_display($_) } @$list_of_local_sets };
-
-	if (@$list_of_local_sets == 0) {
-		$list_of_local_sets = [''];
-		$labels_for_local_sets->{''} = $r->maketext(NO_LOCAL_SET_STRING);
-	} elsif ($library_selected eq '') {
-		unshift @$list_of_local_sets, '';
-		$labels_for_local_sets->{''} = $r->maketext('Select a Homework Set');
-	}
-
-	print CGI::div(
-		{ class => "InfoPanel" },
-		CGI::div(
-			{ class => 'mb-2' },
-			CGI::label({ for => 'library_sets', class => 'col-form-label-sm' }, $r->maketext("Browse from:")),
-			CGI::popup_menu({
-				name    => 'library_sets',
-				id      => 'library_sets',
-				values  => $list_of_local_sets,
-				labels  => $labels_for_local_sets,
-				default => $library_selected,
-				class   => 'form-select form-select-sm d-inline w-auto',
-				dir     => 'ltr'
-			})
-		),
-		view_problems_line('view_mysets_set', $r->maketext('View Problems'), $self->r)
-	);
-}
-
-# Version 3 is the problem library
-# This comes in 3 forms: problem library version 1, problem library version 2 basic, and problem library version 2
-# advanced.  This function checks what we are supposed to do, or aborts if the problem library has not been installed.
-
-sub browse_library_panel {
-	my $self = shift;
-	my $r    = $self->r;
-	my $ce   = $r->ce;
-
-	# See if the problem library is installed
-	my $libraryRoot = $r->{ce}{problemLibrary}{root};
-
-	unless ($libraryRoot) {
-		print CGI::div(
-			{ class => 'alert alert-danger p-1 mb-2', align => "center" },
-			"The problem library has not been installed."
-		);
-		return;
-	}
-	# Test if the Library directory link exists.  If not, try to make it
-	unless (-d "$ce->{courseDirs}{templates}/Library") {
-		unless (symlink($libraryRoot, "$ce->{courseDirs}{templates}/Library")) {
-			my $msg = <<"HERE";
-You are missing the directory <code>templates/Library</code>, which is needed
-for the Problem Library to function.	It should be a link pointing to
-<code>$libraryRoot</code>, which you set in <code>conf/site.conf</code>.
-I tried to make the link for you, but that failed.	Check the permissions
-in your <code>templates</code> directory.
-HERE
-			$self->addbadmessage($msg);
-		}
-	}
-
-	# Now check what version we are supposed to use
-	my $libraryVersion = $r->{ce}{problemLibrary}{version} || 2;
-	if ($libraryVersion == 1) {
-		print CGI::div(
-			{ class => 'alert alert-danger p-1 mb-2', align => "center" },
-			"Problem library version 1 is no longer supported."
-		);
-		return;
-	} elsif ($libraryVersion >= 2) {
-		return $self->browse_library_panel2 if ($self->{library_basic} == 1);
-		return $self->browse_library_panel2adv;
-	} else {
-		print CGI::div(
-			{ class => 'alert alert-danger p-1 mb-2', align => "center" },
-			"The problem library version is set to an illegal value."
-		);
-		return;
-	}
-}
-
-sub browse_library_panel2 {
-	my $self = shift;
-	my $r    = $self->r;
-
-	my @subjs       = WeBWorK::Utils::ListingDB::getAllDBsubjects($r);
-	my $subj_labels = { map { $_ => $_ } @subjs };
-	unshift @subjs, LIB2_DATA->{dbsubject}{all};
-	$subj_labels->{ LIB2_DATA->{dbsubject}{all} } = $r->maketext(LIB2_DATA->{dbsubject}{all});
-
-	my @chaps       = WeBWorK::Utils::ListingDB::getAllDBchapters($r);
-	my $chap_labels = { map { $_ => $_ } @chaps };
-	unshift @chaps, LIB2_DATA->{dbchapter}{all};
-	$chap_labels->{ LIB2_DATA->{dbchapter}{all} } = $r->maketext(LIB2_DATA->{dbchapter}{all});
-
-	my @sects       = WeBWorK::Utils::ListingDB::getAllDBsections($r);
-	my $sect_labels = { map { $_ => $_ } @sects };
-	unshift @sects, LIB2_DATA->{dbsection}{all};
-	$sect_labels->{ LIB2_DATA->{dbsection}{all} } = $r->maketext(LIB2_DATA->{dbsection}{all});
-
-	my $count_line = WeBWorK::Utils::ListingDB::countDBListings($r);
-	if ($count_line == 0) {
-		$count_line = $r->maketext("There are no matching WeBWorK problems");
-	} else {
-		$count_line = $r->maketext("There are [_1] matching WeBWorK problems", $count_line);
-	}
-
-	print CGI::div(
-		CGI::hidden({ name => 'library_is_basic', default => 1, override => 1 }),
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::div({ class => 'col-md-3' }, ''),
-			CGI::div(
-				{ class => 'col-md-6 col-sm-8' },
-				CGI::div(
-					{ class => 'row mb-1' },
-					CGI::label(
-						{ for => 'library_subjects', class => 'col-2 col-form-label col-form-label-sm' },
-						$r->maketext('Subject:')
-					),
-					CGI::div(
-						{ class => 'col-10' },
-						CGI::popup_menu({
-							name    => 'library_subjects',
-							id      => 'library_subjects',
-							values  => \@subjs,
-							labels  => $subj_labels,
-							default => $r->param('library_subjects') || LIB2_DATA->{dbsubject}{all},
-							class   => 'form-select form-select-sm'
-						})
-					)
-				),
-				CGI::div(
-					{ class => 'row mb-1' },
-					CGI::label(
-						{ for => 'library_chapters', class => 'col-2 col-form-label col-form-label-sm' },
-						$r->maketext('Chapter:')
-					),
-					CGI::div(
-						{ class => 'col-10' },
-						CGI::popup_menu({
-							name    => 'library_chapters',
-							id      => 'library_chapters',
-							values  => \@chaps,
-							labels  => $chap_labels,
-							default => $r->param('library_chapters') || LIB2_DATA->{dbchapter}{all},
-							class   => 'form-select form-select-sm'
-						})
-					)
-				),
-				CGI::div(
-					{ class => 'row mb-1' },
-					CGI::label(
-						{ for => 'library_sections', class => 'col-2 col-form-label col-form-label-sm' },
-						$r->maketext('Section:')
-					),
-					CGI::div(
-						{ class => 'col-10' },
-						CGI::popup_menu({
-							name    => 'library_sections',
-							id      => 'library_sections',
-							values  => \@sects,
-							labels  => $sect_labels,
-							default => $r->param('library_sections') || LIB2_DATA->{dbsection}{all},
-							class   => 'form-select form-select-sm'
-						})
-					)
-				)
-			),
-			CGI::div(
-				{
-					class =>
-						'col-md-3 col-sm-4 mb-1 d-flex flex-sm-column justify-content-sm-start justify-content-center'
-				},
-				CGI::submit({
-					name  => 'library_advanced',
-					value => $r->maketext("Advanced Search"),
-					class => 'btn btn-secondary btn-sm',
-					style => 'max-width:9rem'
-				})
-			)
-		),
-		view_problems_line('lib_view', $r->maketext('View Problems'), $self->r),
-		CGI::div(
-			{ class => 'text-center', id => 'library_count_line' },
-			CGI::label({ class => 'col-form-label-sm' }, $count_line)
-		)
-	);
-}
-
-sub browse_library_panel2adv {
-	my $self = shift;
-	my $r    = $self->r;
-
-	my $right_button_style = 'max-width:9rem';
-
-	my @subjs = WeBWorK::Utils::ListingDB::getAllDBsubjects($r);
-	$r->param('library_subjects', '') if (!grep { $_ eq $r->param('library_subjects') } @subjs);
-	my $subj_labels = { map { $_ => $_ } @subjs };
-	unshift @subjs, LIB2_DATA->{dbsubject}{all};
-	$subj_labels->{ LIB2_DATA->{dbsubject}{all} } = $r->maketext(LIB2_DATA->{dbsubject}{all});
-
-	my @chaps = WeBWorK::Utils::ListingDB::getAllDBchapters($r);
-	$r->param('library_chapters', '') if (!grep { $_ eq $r->param('library_chapters') } @chaps);
-	my $chap_labels = { map { $_ => $_ } @chaps };
-	unshift @chaps, LIB2_DATA->{dbchapter}{all};
-	$chap_labels->{ LIB2_DATA->{dbchapter}{all} } = $r->maketext(LIB2_DATA->{dbchapter}{all});
-
-	my @sects = WeBWorK::Utils::ListingDB::getAllDBsections($r);
-	$r->param('library_sections', '') if (!grep { $_ eq $r->param('library_sections') } @sects);
-	my $sect_labels = { map { $_ => $_ } @sects };
-	unshift @sects, LIB2_DATA->{dbsection}{all};
-	$sect_labels->{ LIB2_DATA->{dbsection}{all} } = $r->maketext(LIB2_DATA->{dbsection}{all});
-
-	my $texts      = WeBWorK::Utils::ListingDB::getDBTextbooks($r);
-	my @textarray  = map { $_->[0] } @{$texts};
-	my $textlabels = { map { $_->[0] => $_->[1] . " by " . $_->[2] . " (edition " . $_->[3] . ")" } @$texts };
-	$r->param('library_textbook', '') if (!grep { $_ eq $r->param('library_textbook') } @textarray);
-	unshift @textarray, LIB2_DATA->{textbook}{all};
-	$textlabels->{ LIB2_DATA->{textbook}{all} } = $r->maketext(LIB2_DATA->{textbook}{all});
-
-	my $textchap_ref    = WeBWorK::Utils::ListingDB::getDBTextbooks($r, 'textchapter');
-	my @textchaps       = map { $_->[0] } @{$textchap_ref};
-	my $textchap_labels = { map { $_ => $_ } @textchaps };
-	$r->param('library_textchapter', '') if (!grep { $_ eq $r->param('library_textchapter') } @textchaps);
-	unshift @textchaps, LIB2_DATA->{textchapter}{all};
-	$textchap_labels->{ LIB2_DATA->{textchapter}{all} } = $r->maketext(LIB2_DATA->{textchapter}{all});
-
-	my $textsec_ref    = WeBWorK::Utils::ListingDB::getDBTextbooks($r, 'textsection');
-	my @textsecs       = map { $_->[0] } @{$textsec_ref};
-	my $textsec_labels = { map { $_ => $_ } @textsecs };
-	$r->param('library_textsection', '') if (!grep { $_ eq $r->param('library_textsection') } @textsecs);
-	unshift @textsecs, LIB2_DATA->{textsection}{all};
-	$textsec_labels->{ LIB2_DATA->{textsection}{all} } = $r->maketext(LIB2_DATA->{textsection}{all});
-
-	my %selected = ();
-	for my $j (qw( dbsection dbchapter dbsubject textbook textchapter textsection )) {
-		$selected{$j} = $r->param(LIB2_DATA->{$j}{name}) || LIB2_DATA->{$j}{all};
-	}
-
-	my $listingsCount = WeBWorK::Utils::ListingDB::countDBListings($r);
-	my $count_line =
-		$listingsCount == 0
-		? 'There are no matching WeBWorK problems'
-		: "There are $listingsCount matching WeBWorK problems";
-
-	# Formatting level checkboxes by hand
-	my %selected_levels = map { $_ => 1 } $r->param('level');
-
-	print CGI::div(
-		CGI::hidden({ name => "library_is_basic", default => 2, override => 1 }),
-		CGI::div(
-			{ class => 'text-center' },
-			CGI::label(
-				{ class => 'col-form-label-sm pt-0' },
-				$r->maketext('All Selected Constraints Joined by "And"')
-			)
-		),
-		CGI::div(
-			{ class => 'row mb-1' },
-			CGI::div({ class => 'col-md-3 mb-1' }, ''),
-			CGI::div(
-				{ class => 'col-md-6 col-sm-8 mb-1' },
-				CGI::div(
-					{ class => 'row mb-1' },
-					CGI::label(
-						{ for => 'library_subjects', class => 'col-3 col-form-label col-form-label-sm' },
-						$r->maketext('Subject:')
-					),
-					CGI::div(
-						{ class => 'col-9' },
-						CGI::popup_menu({
-							name    => 'library_subjects',
-							id      => 'library_subjects',
-							values  => \@subjs,
-							labels  => $subj_labels,
-							default => $selected{dbsubject},
-							class   => 'form-select form-select-sm',
-						})
-					)
-				),
-				CGI::div(
-					{ class => 'row mb-1' },
-					CGI::label(
-						{ for => 'library_chapters', class => 'col-3 col-form-label col-form-label-sm' },
-						$r->maketext('Chapter:')
-					),
-					CGI::div(
-						{ class => 'col-9' },
-						CGI::popup_menu({
-							name    => 'library_chapters',
-							id      => 'library_chapters',
-							values  => \@chaps,
-							labels  => $chap_labels,
-							default => $selected{dbchapter},
-							class   => 'form-select form-select-sm',
-						})
-					)
-				),
-				CGI::div(
-					{ class => 'row mb-1' },
-					CGI::label(
-						{ for => 'library_sections', class => 'col-3 col-form-label col-form-label-sm' },
-						$r->maketext('Section:')
-					),
-					CGI::div(
-						{ class => 'col-9' },
-						CGI::popup_menu({
-							name    => 'library_sections',
-							id      => 'library_sections',
-							values  => \@sects,
-							labels  => $sect_labels,
-							default => $selected{dbsection},
-							class   => 'form-select form-select-sm',
-						})
-					)
-				),
-				CGI::div(
-					{ class => 'row mb-1' },
-					CGI::label(
-						{ for => 'library_textbook', class => 'col-3 col-form-label col-form-label-sm' },
-						$r->maketext('Textbook:')
-					),
-					CGI::div(
-						{ class => 'col-9' },
-						CGI::popup_menu({
-							name     => 'library_textbook',
-							id       => 'library_textbook',
-							values   => \@textarray,
-							labels   => $textlabels,
-							default  => $selected{textbook},
-							onchange => "submit();return true",
-							class    => 'form-select form-select-sm'
-						})
-					)
-				),
-				CGI::div(
-					{ class => 'row mb-1' },
-					CGI::label(
-						{
-							for   => 'library_textchapter',
-							class => 'col-3 col-form-label col-form-label-sm text-nowrap'
-						},
-						$r->maketext('Text chapter:')
-					),
-					CGI::div(
-						{ class => 'col-9' },
-						CGI::popup_menu({
-							name     => 'library_textchapter',
-							id       => 'library_textchapter',
-							values   => \@textchaps,
-							labels   => $textchap_labels,
-							default  => $selected{textchapter},
-							onchange => "submit();return true",
-							class    => 'form-select form-select-sm'
-						})
-					)
-				),
-				CGI::div(
-					{ class => 'row mb-1' },
-					CGI::label(
-						{
-							for   => 'library_textsection',
-							class => 'col-3 col-form-label col-form-label-sm text-nowrap'
-						},
-						$r->maketext('Text section:')
-					),
-					CGI::div(
-						{ class => 'col-9' },
-						CGI::popup_menu({
-							name     => 'library_textsection',
-							id       => 'library_textsection',
-							values   => \@textsecs,
-							labels   => $textsec_labels,
-							default  => $selected{textsection},
-							onchange => "submit();return true",
-							class    => 'form-select form-select-sm',
-						})
-					)
-				),
-				CGI::div(
-					{ class => 'row mb-1' },
-					CGI::label({ class => 'col-3 col-form-label col-form-label-sm' }, $r->maketext("Level:")),
-					CGI::div(
-						{ class => 'col-9' },
-						CGI::div(
-							{ class => 'd-flex justify-content-between align-items-center' },
-							(
-								map {
-									CGI::div(
-										{ class => 'form-check form-check-inline' },
-										CGI::checkbox({
-											name            => 'level',
-											value           => $_,
-											label           => $_,
-											class           => 'form-check-input',
-											checked         => defined($selected_levels{$_}),
-											labelattributes => { class => 'form-check-label col-form-label-sm' }
-										})
-									)
-								} 1 .. 6
-							),
-							$self->helpMacro("Levels")
-						)
-					),
-				),
-				CGI::div(
-					{ class => 'row mb-1' },
-					CGI::label(
-						{ for => 'library_keywords', class => 'col-3 col-form-label col-form-label-sm' },
-						$r->maketext("Keywords:")
-					),
-					CGI::div(
-						{ class => 'col-9' },
-						CGI::textfield({
-							name     => "library_keywords",
-							id       => "library_keywords",
-							default  => $r->param('library_keywords') || '',
-							override => 1,
-							class    => 'form-control form-control-sm'
-						})
-					),
-				)
-			),
-			CGI::div(
-				{
-					class =>
-						'col-md-3 col-sm-4 mb-1 d-flex flex-sm-column justify-content-sm-start justify-content-center'
-				},
-				CGI::submit({
-					name  => "lib_select_subject",
-					value => $r->maketext("Update Menus"),
-					style => $right_button_style,
-					class => 'btn btn-secondary btn-sm mb-1'
-				}),
-				CGI::submit({
-					name  => "library_reset",
-					value => $r->maketext("Reset"),
-					style => $right_button_style,
-					class => 'btn btn-secondary btn-sm mb-1 ms-sm-0 ms-2'
-				}),
-				CGI::submit({
-					name  => "library_basic",
-					value => $r->maketext("Basic Search"),
-					style => $right_button_style,
-					class => 'btn btn-secondary btn-sm mb-1 ms-sm-0 ms-2'
-				})
-			)
-		),
-		view_problems_line('lib_view', $r->maketext('View Problems'), $self->r),
-		CGI::div(
-			{ class => 'text-center', id => 'library_count_line' },
-			CGI::label(
-				{ class => 'col-form-label-sm' },
-				$listingsCount == 0
-				? 'There are no matching WeBWorK problems'
-				: "There are $listingsCount matching WeBWorK problems"
-			)
-		)
-	);
-}
-
-# Version 4 is the set definition file panel
-sub browse_setdef_panel {
-	my $self             = shift;
-	my $r                = $self->r;
-	my $ce               = $r->ce;
-	my $library_selected = shift // '';
-
-	my @list_of_set_defs = $self->getDefList;
-	my $labels_for_set_defs = { map { $_ => $_ } @list_of_set_defs };
-
-	if (scalar(@list_of_set_defs) == 0) {
-		print CGI::div(
-			{ class => 'InfoPanel' },
-			CGI::label(
-				{ class => 'col-form-label-sm' },
-				$r->maketext('There are no set definition files in this course to look at.')
-			)
-		);
-		return;
-	}
-
-	if ($library_selected eq '') {
-		$labels_for_set_defs->{''} = $r->maketext('Select a Set Definition File');
-		unshift @list_of_set_defs, '';
-	}
-
-	print CGI::div(
-		{ class => 'InfoPanel' },
-		CGI::div(
-			{ class => 'mb-2' },
-			CGI::label({ class => 'col-form-label-sm' }, $r->maketext('Browse from:')),
-			CGI::popup_menu({
-				name    => 'library_sets',
-				values  => \@list_of_set_defs,
-				labels  => $labels_for_set_defs,
-				default => $library_selected,
-				class => 'form-select form-select-sm d-inline w-auto'
-			})
-		),
-		view_problems_line('view_setdef_set', $r->maketext('View Problems'), $self->r)
-	);
-}
-
-sub make_top_row {
-	my $self = shift;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my %data = @_;
-
-	my $list_of_local_sets = $data{all_db_sets};
-	my $labels_for_local_sets = { map { $_ => format_set_name_display($_) } @$list_of_local_sets };
-	my $browse_which = $data{browse_which};
-	my $library_selected = $self->{current_library_set};
-	my $set_selected = $r->param('local_sets') // '';
-	my (@dis1, @dis2, @dis3, @dis4) = ();
-	@dis1 = (disabled => undef) if ($browse_which eq 'browse_npl_library');
-	@dis2 = (disabled => undef) if ($browse_which eq 'browse_local');
-	@dis3 = (disabled => undef) if ($browse_which eq 'browse_mysets');
-	@dis4 = (disabled => undef) if ($browse_which eq 'browse_setdefs');
-
-	my $these_widths = "width:9.3rem";
-
-	if (@$list_of_local_sets == 0) {
-		$list_of_local_sets = [''];
-		$labels_for_local_sets->{''} = $r->maketext(NO_LOCAL_SET_STRING);
-	} elsif ($set_selected eq '') {
-		unshift @{$list_of_local_sets}, '';
-		$labels_for_local_sets->{''} = $r->maketext('Select a Set from this Course');
-	}
-	my $courseID = $self->r->urlpath->arg("courseID");
-
-	print CGI::hr({ class => 'mt-0 mb-2' });
-
-	print CGI::div(
-		{ class => 'd-flex flex-wrap justify-content-center' },
-		CGI::div(
-			{ class => 'd-flex flex-wrap justify-content-center mb-2' },
-			CGI::label(
-				{ for => 'local_sets', class => 'col-form-label-sm' },
-				$r->maketext('Add problems to') . ' ' . CGI::b($r->maketext('Target Set:'))
-			),
-			CGI::popup_menu({
-				name     => 'local_sets',
-				id       => 'local_sets',
-				values   => $list_of_local_sets,
-				labels   => $labels_for_local_sets,
-				default  => $set_selected,
-				override => 1,
-				class    => 'form-select form-select-sm d-inline w-auto mx-2',
-				dir      => 'ltr',
-				data_no_set_selected => $r->maketext('No Target Set Selected'),
-				data_pick_target_set => $r->maketext('Pick a target set above to add this problem to.'),
-				data_problems_added => $r->maketext('Problems Added'),
-				data_added_to_single => $r->maketext('Added one problem to set [_1].', '{set}'),
-				data_added_to_plural => $r->maketext('Added [_1] problems to set [_2].', '{number}', '{set}'),
-			})
-		),
-		CGI::submit({
-			name  => "edit_local",
-			value => $r->maketext("Edit Target Set"),
-			class => 'btn btn-primary btn-sm mb-2'
-		}),
-		CGI::hidden({ name => 'selfassign', default => 0, override => 1 }),
-	);
-
-	print CGI::div(
-		{ class => 'd-flex flex-wrap justify-content-center' },
-		CGI::submit({
-			name    => 'new_local_set',
-			id      => 'new_local_set',
-			value   => $r->maketext('Create a New Set in This Course:'),
-			onclick => 'document.library_browser_form.selfassign.value=1',
-			class   => 'btn btn-primary btn-sm mb-2 mx-2'
-		}),
-		CGI::textfield({
-			name            => 'new_set_name',
-			aria_labelledby => 'new_local_set',
-			placeholder     => $r->maketext('New set name'),
-			override        => 1,
-			size            => 30,
-			class           => 'form-control form-control-sm d-inline w-auto mb-2',
-			dir             => 'ltr'
-		})
-	);
-
-	print CGI::hr({ class => 'mt-0 mb-2' });
-
-	# Tidy this list up since it is used in two different places
-	shift @$list_of_local_sets if ($list_of_local_sets->[0] eq '');
-
-	print CGI::div(
-		{ class => 'd-flex justify-content-center' },
-		CGI::label({ class => 'col-form-label-sm mb-2 me-1' }, $r->maketext("Browse")),
-		CGI::div(
-			{ class => 'd-flex flex-wrap justify-content-center' },
-			CGI::submit({
-				name  => "browse_npl_library",
-				value => $r->maketext("Open Problem Library"),
-				style => $these_widths,
-				class => 'btn btn-secondary btn-sm mb-2 mx-1',
-				@dis1
-			}),
-			CGI::submit({
-				name  => "browse_local",
-				value => $r->maketext("Local Problems"),
-				style => $these_widths,
-				class => 'btn btn-secondary btn-sm mb-2 mx-1',
-				@dis2
-			}),
-			CGI::submit({
-				name  => "browse_mysets",
-				value => $r->maketext("From This Course"),
-				style => $these_widths,
-				class => 'btn btn-secondary btn-sm mb-2 mx-1',
-				@dis3
-			}),
-			CGI::submit({
-				name  => "browse_setdefs",
-				value => $r->maketext("Set Definition Files"),
-				style => $these_widths,
-				class => 'btn btn-secondary btn-sm mb-2 mx-1',
-				@dis4
-			})
-		)
-	);
-
-	# Make buttons for additional problem libraries
-	my $libs = '';
-	foreach my $lib (sort(keys(%problib))) {
-		$libs .= CGI::submit({
-			name  => "browse_$lib",
-			value => Encode::decode("UTF-8", $problib{$lib}),
-			class => 'btn btn-secondary btn-sm ms-2 mb-2',
-			($browse_which eq "browse_$lib") ? (disabled => undef) : ()
-		})
-			if (-d "$ce->{courseDirs}{templates}/$lib");
-	}
-
-	print CGI::div(
-		{ class => 'd-flex justify-content-center' },
-		CGI::label({ class => 'col-form-label-sm mb-2' }, $r->maketext("or Problems from")),
-		CGI::div({ class => 'd-flex flex-wrap justify-content-center' }, $libs)
-	) if $libs ne '';
-
-	print CGI::hr({ class => 'mt-0 mb-2' });
-
-	if ($browse_which eq 'browse_local') {
-		$self->browse_local_panel($library_selected);
-	} elsif ($browse_which eq 'browse_mysets') {
-		$self->browse_mysets_panel($library_selected, $list_of_local_sets);
-	} elsif ($browse_which eq 'browse_npl_library') {
-		$self->browse_library_panel();
-	} elsif ($browse_which eq 'browse_setdefs') {
-		$self->browse_setdef_panel($library_selected);
-	} else { ## handle other problem libraries
-		$self->browse_local_panel($library_selected,$browse_which);
-	}
-
-	print CGI::hr({ class => 'mt-0 mb-2' });
-
-    # For next/previous buttons
-	my ($next_button, $prev_button) = ("", "");
-	my $first_shown = $self->{first_shown};
-	my $last_shown = $self->{last_shown};
-	my $first_index = $self->{first_index};
-	my $last_index = $self->{last_index};
-	my @pg_files = @{$self->{pg_files}};
-	if ($first_index > 0) {
-		$prev_button = CGI::submit({
-			name => "prev_page",
-			style => $these_widths,
-			value => $r->maketext("Previous page"),
-			class => 'btn btn-secondary btn-sm mx-1 mb-2'
-		});
-	}
-	# This will have to be trickier with MLT
-	if ((1 + $last_index) < scalar(@pg_files)) {
-		$next_button = CGI::submit({
-			name => "next_page",
-		   	style => $these_widths,
-			value => $r->maketext("Next page"),
-			class => 'btn btn-secondary btn-sm mx-1 mb-2'
-		});
-	}
-
-	print CGI::div(
-		{ class => 'd-flex flex-wrap justify-content-center' },
-		CGI::button({
-			name  => "select_all",
-			style => $these_widths,
-			value => $r->maketext("Add All"),
-			class => 'btn btn-primary btn-sm mx-1 mb-2'
-		}),
-		CGI::submit({
-			name  => "cleardisplay",
-			style => $these_widths,
-			value => $r->maketext("Clear Problem Display"),
-			class => 'btn btn-secondary btn-sm mx-1 mb-2'
-		}),
-		$prev_button,
-		$next_button
-	);
-}
-
-sub make_data_row {
-	my $self           = shift;
-	my $r              = $self->r;
-	my $ce             = $r->{ce};
-	my $sourceFileData = shift;
-	my $sourceFileName = $sourceFileData->{filepath};
-	my $pg_file        = shift;
-	my $isstatic       = $sourceFileData->{static};
-	my $isMO           = $sourceFileData->{MO};
-
-	if (not defined $isMO) {
-		($isMO, $isstatic) = getDBextras($r, $sourceFileName);
-	}
-	my $cnt        = shift;
-	my $mltnumleft = shift;
-
-	$sourceFileName =~ s|^./||;    # clean up top ugliness
-
-	my $urlpath = $self->r->urlpath;
-	my $db      = $self->r->db;
-
-	# To set up edit and try links we need to know if the target set is a gateway assignment or not.
-	my $localSet     = $self->r->param('local_sets');
-	my $setRecord    = defined $localSet  && $localSet ne '' ? $db->getGlobalSet($localSet) : undef;
-	my $isGatewaySet = defined $setRecord && $setRecord->assignment_type =~ /gateway/;
-
-	my $problem_seed = $self->{'problem_seed'} || 1234;
-	my $edit_link = CGI::a(
-		{
-			href => $self->systemLink(
-				$urlpath->newFromModule(
-					"WeBWorK::ContentGenerator::Instructor::PGProblemEditor", $r,
-					courseID  => $urlpath->arg("courseID"),
-					setID     => "Undefined_Set",
-					problemID => "1"
-				),
-				params => {
-					sourceFilePath => $sourceFileName,
-					problemSeed    => $problem_seed
-				}
-			),
-			id                => "editit$cnt",
-			target            => "WW_Editor",
-			data_bs_title     => $r->maketext('Edit it'),
-			class             => 'btn btn-sm btn-secondary',
-			data_bs_toggle    => 'tooltip',
-			data_bs_placement => 'top'
-		},
-		CGI::i({ class => 'icon fas fa-pencil-alt', data_alt => 'edit', aria_hidden => "true" }, "")
-	);
-
-	my $displayMode = $self->r->param("mydisplayMode");
-	$displayMode = $self->r->ce->{pg}->{options}->{displayMode}
-		if not defined $displayMode or $displayMode eq "None";
-	my $module   = ($isGatewaySet) ? "GatewayQuiz" : "Problem";
-	my %pathArgs = (
-		courseID => $urlpath->arg("courseID"),
-		setID    => "Undefined_Set"
-	);
-	$pathArgs{problemID} = "1" if (!$isGatewaySet);
-
-	my $try_link = CGI::a(
-		{
-			href => $self->systemLink(
-				$urlpath->newFromModule("WeBWorK::ContentGenerator::$module", $r, %pathArgs),
-				params => {
-					effectiveUser  => scalar($self->r->param('user')),
-					editMode       => "SetMaker",
-					problemSeed    => $problem_seed,
-					sourceFilePath => "$sourceFileName",
-					displayMode    => $displayMode,
-				}
-			),
-			target            => "WW_View",
-			data_bs_title     => $r->maketext('Try it'),
-			id                => "tryit$cnt",
-			class             => 'text-decoration-none btn btn-sm btn-secondary',
-			data_bs_toggle    => 'tooltip',
-			data_bs_placement => 'top'
-		},
-		CGI::i({ class => 'far fa-eye' }, '')
-	);
-
-	my $mlt = '';
-	my ($mltstart, $mltend) = ('', '');
-	my $noshowclass = $sourceFileData->{morelt} ? "MLT$sourceFileData->{morelt}" : "NS$cnt";
-	if ($sourceFileData->{children}) {
-		my $numchild = scalar(@{ $sourceFileData->{children} });
-		$mlt = CGI::span(
-			{
-				class                 => 'lb-mlt-parent btn btn-sm btn-secondary',
-				id                    => "mlt$cnt",
-				data_mlt_cnt          => $cnt,
-				data_mlt_noshow_class => $noshowclass,
-				data_less_text        => $r->maketext('Show less like this'),
-				data_more_text        => $r->maketext('Show [_1] more like this', $numchild),
-				data_bs_title         => $r->maketext('Show [_1] more like this', $numchild),
-				data_bs_toggle        => 'tooltip',
-				data_bs_placement     => 'top',
-				tabindex              => 0,
-				role                  => 'button'
-			},
-			'M'
-		);
-		$noshowclass = "NS$cnt";
-		$mltstart    = CGI::start_div({ id => "mlt-table$cnt", class => 'lb-mlt-group' });
-	}
-	$mltend = CGI::end_div() if ($mltnumleft == 0);
-	my $noshow = $sourceFileData->{noshow} ? 'display:none' : '';
-
-	# Include tagwidget?
-	my $tagwidget = $r->authz->hasPermissions($r->param('user'), "modify_tags")
-		? CGI::div(
-			{
-				id                    => "tagger$cnt",
-				class                 => 'tag-widget',
-				data_source_file_path => "$ce->{courseDirs}{templates}/$sourceFileName"
-			},
-			''
-		)
-		: '';
-
-	my $level = 0;
-
-	my $rerand = $isstatic ? '' : CGI::span(
-		{
-			data_target_problem => $cnt,
-			class               => 'rerandomize_problem_button btn btn-sm btn-secondary',
-			data_bs_title       => $r->maketext('Randomize'),
-			data_bs_toggle      => 'tooltip',
-			data_bs_placement   => 'top',
-			tabindex            => 0,
-			role                => 'button',
-			aria_label          => 'rerandomize problem'
-		},
-		CGI::i({ class => 'fas fa-random', aria_hidden => 'true' }, '')
-	);
-	my $MOtag = CGI::span(
-		{ class => 'motag' },
-		$isMO
-		? CGI::span(
-			{
-				class           => 'info-button btn btn-sm btn-secondary',
-				title           => $r->maketext('Uses Math Objects'),
-				data_bs_content => $r->maketext(
-					'Some WeBWorK problems are programmed using what are called <i>Math Objects</i>. '
-						. 'These problems are preferred by some people because they '
-						. 'provide a more consistent collection of messages to faulty student '
-						. 'answers, particularly for answers which are way off base.'
-				),
-				data_bs_toggle    => 'popover',
-				data_bs_placement => 'top',
-				data_bs_html      => 'true',
-				data_bs_trigger   => 'hover focus',
-				tabindex          => 0,
-				role              => 'button'
-			},
-			CGI::img({
-				src => $r->ce->{webworkURLs}{htdocs} . '/images/pi.svg',
-				alt => $r->maketext('Uses Math Objects')
-			})
-		)
-		: ''
-	);
-
-	# Get statistics to display
-
-	my $global_problem_stats = '';
-	if ($ce->{problemLibrary}{showLibraryGlobalStats}) {
-		my $stats = $self->{library_stats_handler}->getGlobalStats($sourceFileName);
-		if ($stats->{students_attempted}) {
-			$global_problem_stats = CGI::div(
-				{ class => 'd-inline-block font-sm text-nowrap' },
-				CGI::span(
-					{
-						class           => 'info-button text-primary',
-						title           => $r->maketext('Global Usage Data'),
-						data_bs_content => $r->maketext(
-							'Global data on problem usage is contributed by many institutions using '
-								. 'WeBWorK all over the world. The Usage figure is the total number of  '
-								. 'individuals who have attemped this problem at least once. A high figure '
-								. 'represents a problem which has been assigned to many students and is  '
-								. 'both popular with instructors and likely bug free.'
-						),
-						data_bs_toggle    => 'popover',
-						data_bs_placement => 'top',
-						data_bs_trigger   => 'hover focus',
-						tabindex          => 0,
-						role              => 'button'
-					},
-					$r->maketext('GLOBAL Usage') . ': '
-				),
-				$stats->{students_attempted} . ', ',
-				CGI::span(
-					{
-						class           => 'info-button text-primary',
-						title           => $r->maketext('Global Attempts'),
-						data_bs_content => $r->maketext(
-							'The Attempts figure is the global average of the number of attempts '
-								. '(both correct and incorrect) individuals take on this problem.  '
-								. 'A high figure may represent a difficult problem.  Note that problems '
-								. 'with multiple parts may have higher average attempts since many students  '
-								. 'will submit an answer to each part before continuing and each such  '
-								. 'submittal counts as an attempt.'
-						),
-						data_bs_toggle    => 'popover',
-						data_bs_placement => 'top',
-						data_bs_trigger   => 'hover focus',
-						tabindex          => 0,
-						role              => 'button'
-					},
-					$r->maketext('Attempts') . ': '
-				),
-				wwRound(2, $stats->{average_attempts}) . ', ',
-				CGI::span(
-					{
-						class           => 'info-button text-primary',
-						title           => $r->maketext('Global Status'),
-						data_bs_content => CGI::p($r->maketext(
-							'The Status figure is the global average of the Status '
-								. 'individuals have earned on this problem. The Status is the percentage '
-								. 'correct (from 0% to 100%) recorded for the problem.  A low figure may  '
-								. 'represent a difficult problem.  The Status is often fairly high since  '
-								. 'many students will work on a problem until they get it correct or nearly so.'
-						))
-							. CGI::p({ class => 'mb-0' }, $r->maketext(
-							'Reviewing a problem and looking at both the average Attempts and  '
-								. 'average Status should give instructors valuable information about '
-								. 'the difficulty of the problem.'
-							)),
-						data_bs_toggle    => 'popover',
-						data_bs_placement => 'top',
-						data_bs_html      => 'true',
-						data_bs_trigger   => 'hover focus',
-						tabindex          => 0,
-						role              => 'button'
-					},
-					$r->maketext('Status') . ': '
-				),
-				wwRound(0, 100 * $stats->{average_status})
-			);
-		}
-	}
-
-	my $local_problem_stats = '';
-	if ($ce->{problemLibrary}{showLibraryLocalStats}) {
-		my $stats = $self->{library_stats_handler}->getLocalStats($sourceFileName);
-		if ($stats->{students_attempted}) {
-			$local_problem_stats = CGI::div(
-				{ class => 'd-inline-block font-sm text-nowrap' },
-				CGI::span(
-					{
-						class           => 'info-button text-primary',
-						title           => $r->maketext('Local Usage Data'),
-						data_bs_content => CGI::p($r->maketext(
-							'Local data on problem usage is generated and maintained by your institution. '
-								. 'The Usage figure is the total number of local '
-								. 'individuals who have attemped this problem at least once. A high figure '
-								. 'represents a problem which has been assigned to many students and is  '
-								. 'both popular with instructors and likely bug free.'
-						))
-							. CGI::p({ class => 'mb-0' }, $r->maketext(
-							'Local data is generated when your systems admin runs the script '
-								. 'update-OPL-statistics.'
-							)),
-						data_bs_toggle    => 'popover',
-						data_bs_placement => 'top',
-						data_bs_trigger   => 'hover focus',
-						data_bs_html      => 'true',
-						tabindex          => 0,
-						role              => 'button'
-					},
-					$r->maketext('LOCAL Usage') . ': '
-				),
-				$stats->{students_attempted} . ', ',
-				CGI::span(
-					{
-						class           => 'info-button text-primary',
-						title           => $r->maketext('Local Attempts'),
-						data_bs_content => $r->maketext(
-							'The Attempts figure is the local average of the number of attempts '
-								. '(both correct and incorrect) individuals at your institution take on this problem. '
-								. 'A high figure may represent a difficult problem.  Note that problems '
-								. 'with multiple parts may have higher average attempts since many students  '
-								. 'will submit an answer to each part before continuing and each such  '
-								. 'submittal counts as an attempt.'
-						),
-						data_bs_toggle    => 'popover',
-						data_bs_placement => 'top',
-						data_bs_trigger   => 'hover focus',
-						tabindex          => 0,
-						role              => 'button'
-					},
-					$r->maketext('Attempts') . ': '
-				),
-				wwRound(2, $stats->{average_attempts}) . ', ',
-				CGI::span(
-					{
-						class           => 'info-button text-primary',
-						title           => $r->maketext('Local Status'),
-						data_bs_content => CGI::p($r->maketext(
-							'The Status figure is the local average of the Status '
-								. 'individuals at your institution have earned on this problem. The Status is the '
-								. 'percentage correct (from 0% to 100%) recorded for the problem.  A low figure may  '
-								. 'represent a difficult problem.  The Status is often fairly high since  '
-								. 'many students will work on a problem until they get it correct or nearly so.'
-						))
-							. CGI::p({ class => 'mb-0' }, $r->maketext(
-							'Reviewing a problem and looking at both the average Attempts and  '
-								. 'average Status should give instructors valuable information about '
-								. 'the difficulty of the problem.'
-							)),
-						data_bs_toggle    => 'popover',
-						data_bs_placement => 'top',
-						data_bs_html      => 'true',
-						data_bs_trigger   => 'hover focus',
-						tabindex          => 0,
-						role              => 'button'
-					},
-					$r->maketext('Status') . ': '
-				),
-				wwRound(0, 100 * $stats->{average_status})
-			);
-		}
-	}
-
-	my $problem_stats = '';
-	if ($global_problem_stats || $local_problem_stats) {
-		$problem_stats = $global_problem_stats . $local_problem_stats;
-	}
-
-	print $mltstart;
-	# Print the cell
-	print CGI::div(
-		{ id => "pgrow$cnt", style => $noshow, class => "lb-problem-row $noshowclass" },
-		CGI::div(
-			{ class => 'card p-2' },
-			CGI::div(
-				{ class => 'lb-problem-header d-flex flex-wrap justify-content-between' },
-				CGI::div(
-					{ class => 'lb-problem-add d-flex align-items-center mb-1' },
-					CGI::button({
-						name              => 'add_me',
-						value             => $r->maketext('Add'),
-						data_bs_title     => $r->maketext('Add problem to target set'),
-						data_source_file  => $sourceFileName,
-						class             => 'btn btn-primary btn-sm',
-						data_bs_toggle    => 'tooltip',
-						data_bs_placement => 'top'
-					}),
-				),
-				CGI::div({ class => 'd-flex flex-wrap align-items-center mb-1 gap-2' },
-					$problem_stats),
-				CGI::div(
-					{ class => 'lb-problem-icons mb-1 d-flex align-items-center' },
-					$mlt, $MOtag, $rerand,
-					$edit_link,
-					$try_link,
-					CGI::span(
-						{
-							class             => 'dont-show btn btn-sm btn-secondary',
-							data_bs_title     => $r->maketext('Hide this problem'),
-							data_row_cnt      => $cnt,
-							data_bs_toggle    => 'tooltip',
-							data_bs_placement => 'top',
-							tabindex          => 0,
-							role              => 'button',
-							aria_label        => 'hide this problem'
-						},
-						CGI::i({ class => 'fas fa-times', aria_hidden => 'true' }, '')
-					)
-				)
-			),
-			CGI::div(
-				{ class => 'lb-problem-sub-header d-flex' },
-				CGI::div({ class => 'lb-problem-path font-sm flex-grow-1 flex-shrink-1' }, $sourceFileName),
-				CGI::div(
-					{
-						class => 'lb-inset text-nowrap' . ($self->{isInSet}{$sourceFileName} ? '' : ' d-none'),
-						id    => "inset$cnt"
-					},
-					CGI::i(CGI::b($r->maketext('(in target set)')))
-				)
-			),
-			CGI::hidden({ name => "filetrial$cnt", default => $sourceFileName, override => 1 }),
-			$tagwidget,
-			CGI::div(
-				CGI::div({ class => 'psr_render_area', id => "psr_render_area_$cnt", data_pg_file => $pg_file }, ''),
-				''
-			)
-		)
-	);
-	print $mltend;
-}
-
-sub clear_default {
-	my $r = shift;
-	my $param = shift;
-	my $default = shift;
-	my $newvalue = $r->param($param) || '';
-	$newvalue = '' if($newvalue eq $default);
-	$r->param($param, $newvalue);
-}
-
 ### Mainly deal with more like this
 
-sub process_search {
-	my $r = shift;
-	my @dbsearch = @_;
+sub process_search ($c, @dbsearch) {
 	# Build a hash of MLT entries keyed by morelt_id
 	my %mlt = ();
 	my $mltind;
-	for my $indx (0..$#dbsearch) {
-		$dbsearch[$indx]->{filepath} = 
-			$dbsearch[$indx]->{libraryroot} . "/" .
-			$dbsearch[$indx]->{path} . "/" .
-			$dbsearch[$indx]->{filename};
+	for my $indx (0 .. $#dbsearch) {
+		$dbsearch[$indx]->{filepath} =
+			$dbsearch[$indx]->{libraryroot} . "/" . $dbsearch[$indx]->{path} . "/" . $dbsearch[$indx]->{filename};
 		# For debugging
 		$dbsearch[$indx]->{oindex} = $indx;
-		if($mltind = $dbsearch[$indx]->{morelt}) {
-			if(defined($mlt{$mltind})) {
-				push @{$mlt{$mltind}}, $indx;
+		if ($mltind = $dbsearch[$indx]->{morelt}) {
+			if (defined($mlt{$mltind})) {
+				push @{ $mlt{$mltind} }, $indx;
 			} else {
 				$mlt{$mltind} = [$indx];
 			}
@@ -1634,26 +331,26 @@ sub process_search {
 	# Find MLT leaders, mark entries for no show,
 	# set up children array for leaders
 	for my $mltid (keys %mlt) {
-		my @idlist = @{$mlt{$mltid}};
-		if(scalar(@idlist)>1) {
-			my $leader = WeBWorK::Utils::ListingDB::getMLTleader($r, $mltid) || 0;
-			my $hold = undef;
+		my @idlist = @{ $mlt{$mltid} };
+		if (scalar(@idlist) > 1) {
+			my $leader = WeBWorK::Utils::ListingDB::getMLTleader($c, $mltid) || 0;
+			my $hold   = undef;
 			for my $subindx (@idlist) {
-				if($dbsearch[$subindx]->{pgid} == $leader) {
-					$dbsearch[$subindx]->{children}=[];
+				if ($dbsearch[$subindx]->{pgid} == $leader) {
+					$dbsearch[$subindx]->{children} = [];
 					$hold = $subindx;
 				} else {
-					$dbsearch[$subindx]->{noshow}=1;
+					$dbsearch[$subindx]->{noshow} = 1;
 				}
 			}
-			do { # we did not find the leader
-				$hold = $idlist[0];
-				$dbsearch[$hold]->{noshow} = undef;
-				$dbsearch[$hold]->{children}=[];
-			} unless($hold);
-			$mlt{$mltid} = $dbsearch[$hold]; # store ref to leader
-		} else { # only one, no more
-			$dbsearch[$idlist[0]]->{morelt} = 0;
+			do {    # we did not find the leader
+				$hold                        = $idlist[0];
+				$dbsearch[$hold]->{noshow}   = undef;
+				$dbsearch[$hold]->{children} = [];
+			} unless ($hold);
+			$mlt{$mltid} = $dbsearch[$hold];    # store ref to leader
+		} else {    # only one, no more
+			$dbsearch[ $idlist[0] ]->{morelt} = 0;
 			delete $mlt{$mltid};
 		}
 	}
@@ -1661,15 +358,15 @@ sub process_search {
 	# Put children in leader and delete them, record index of leaders
 	$mltind = 0;
 	while ($mltind < scalar(@dbsearch)) {
-		if($dbsearch[$mltind]->{noshow}) {
+		if ($dbsearch[$mltind]->{noshow}) {
 			# move the entry to the leader
 			my $mltval = $dbsearch[$mltind]->{morelt};
-			push @{$mlt{$mltval}->{children}}, $dbsearch[$mltind];
+			push @{ $mlt{$mltval}->{children} }, $dbsearch[$mltind];
 			splice @dbsearch, $mltind, 1;
 		} else {
-			if($dbsearch[$mltind]->{morelt}) { # a leader
+			if ($dbsearch[$mltind]->{morelt}) {    # a leader
 				for my $mltid (keys %mlt) {
-					if($mltid == $dbsearch[$mltind]->{morelt}) {
+					if ($mltid == $dbsearch[$mltind]->{morelt}) {
 						$mlt{$mltid}->{index} = $mltind;
 						last;
 					}
@@ -1680,234 +377,212 @@ sub process_search {
 	}
 	# Last pass, reinsert children into dbsearch
 	my @leaders = keys(%mlt);
-	@leaders = reverse sort {$mlt{$a}->{index} <=> $mlt{$b}->{index}} @leaders;
+	@leaders = reverse sort { $mlt{$a}->{index} <=> $mlt{$b}->{index} } @leaders;
 	for my $i (@leaders) {
 		my $base = $mlt{$i}->{index};
-		splice @dbsearch, $base+1, 0, @{$mlt{$i}->{children}};
+		splice @dbsearch, $base + 1, 0, @{ $mlt{$i}->{children} };
 	}
 
 	return @dbsearch;
 }
 
-sub pre_header_initialize {
-	my ($self) = @_;
-	my $r = $self->r;
-	## For all cases, lets set some things
-	$self->{error}=0;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $maxShown = $r->param('max_shown') || MAX_SHOW_DEFAULT;
-	$maxShown = 10000000 if($maxShown eq 'All'); # let's hope there aren't more
-	my $library_basic = $r->param('library_is_basic') || 1;
-	$self->{problem_seed} = $r->param('problem_seed') || 1234;
-	## Fix some parameters
-	for my $key (keys(%{ LIB2_DATA() })) {
-		clear_default($r, LIB2_DATA->{$key}->{name}, LIB2_DATA->{$key}->{all} );
-	}
-	##  Grab library sets to display from parameters list.  We will
-	##  modify this as we go through the if/else tree
-	$self->{current_library_set} =  $r->param('library_sets');
+sub pre_header_initialize ($c) {
+	# Make sure these are defined for the templates.
+	$c->stash->{pg_files} = [];
+	$c->stash->{plist}    = [];
 
-	##	These directories will have individual buttons
-	%problib = %{$ce->{courseFiles}{problibs}} if $ce->{courseFiles}{problibs};
+	$c->{error} = 0;
+	my $ce       = $c->ce;
+	my $db       = $c->db;
+	my $maxShown = $c->param('max_shown') || 20;
+	$maxShown = 10000000 if ($maxShown eq 'All');    # let's hope there aren't more
+	my $library_basic = $c->param('library_is_basic') || 1;
+	$c->{problem_seed} = $c->param('problem_seed') || 1234;
 
-	my $userName = $r->param('user');
-	my $user = $db->getUser($userName); # checked
+	# Grab library sets to display from parameters list.  We will modify this as we go through the if/else tree.
+	$c->{current_library_set} = $c->param('library_sets');
+
+	# These directories will have individual buttons
+	$c->{problibs} = $ce->{courseFiles}{problibs} // {};
+
+	my $userName = $c->param('user');
+	my $user     = $db->getUser($userName);          # checked
 	die "record for user $userName (real user) does not exist."
 		unless defined $user;
-	my $authz = $r->authz;
-	unless ($authz->hasPermissions($userName, "modify_problem_sets")) {
-		return(""); # Error message already produced in the body
-	}
+	my $authz = $c->authz;
 
-	## Now one action we have to deal with here
-	if ($r->param('edit_local')) {
-		my $urlpath = $r->urlpath;
-		my $db = $r->db;
-		my $checkset = $db->getGlobalSet($r->param('local_sets'));
+	return unless ($authz->hasPermissions($userName, "modify_problem_sets"));
+
+	# Now one action we have to deal with here
+	if ($c->param('edit_local')) {
+		my $db       = $c->db;
+		my $checkset = $db->getGlobalSet($c->param('local_sets'));
 		if (not defined($checkset)) {
-			$self->{error} = 1;
-			$self->addbadmessage($r->maketext('You need to select a "Target Set" before you can edit it.'));
+			$c->{error} = 1;
+			$c->addbadmessage($c->maketext('You need to select a "Target Set" before you can edit it.'));
 		} else {
-			my $page = $urlpath->newFromModule('WeBWorK::ContentGenerator::Instructor::ProblemSetDetail',  $r, setID=>$r->param('local_sets'), courseID=>$urlpath->arg("courseID"));
-			my $url = $self->systemLink($page);
-			$self->reply_with_redirect($url);
+			$c->reply_with_redirect(
+				$c->systemLink($c->url_for('instructor_set_detail', setID => $c->param('local_sets'))));
 		}
 	}
 
-	## Next, lots of set up so that errors can be reported with message()
+	# Next, lots of set up so that errors can be reported with message()
 
-	############# List of problems we have already printed
+	# List of problems we have already printed
+	# If we don't end up reusing problems, this will be wiped out.
+	# If we do redisplay the same problems, we must adjust this accordingly.
+	$c->{past_problems} = get_past_problem_files($c);
 
-	$self->{past_problems} = get_past_problem_files($r);
-	# if we don't end up reusing problems, this will be wiped out
-	# if we do redisplay the same problems, we must adjust this accordingly
-	my $none_shown = scalar(@{$self->{past_problems}})==0;
-	my @pg_files=();
+	my $none_shown            = @{ $c->{past_problems} } == 0;
+	my @pg_files              = ();
 	my $use_previous_problems = 1;
-	my $first_shown = $r->param('first_shown') || 0;
-	my $last_shown = $r->param('last_shown');
+	my $first_shown           = $c->param('first_shown') || 0;
+	my $last_shown            = $c->param('last_shown');
 	if (not defined($last_shown)) {
 		$last_shown = -1;
 	}
-	my $first_index = $r->param('first_index') || 0;
-	my $last_index = $r->param('last_index');
+	my $first_index = $c->param('first_index') || 0;
+	my $last_index  = $c->param('last_index');
 	if (not defined($last_index)) {
 		$last_index = -1;
 	}
-	my $total_probs = $r->param('total_probs') || 0;
-	my @all_past_list = (); # these are include requested, but not shown
-	my ($j, $count, $omlt, $nmlt, $hold) = (0,0,-1,0,0);
-	while (defined($r->param("all_past_list$j"))) {
-		$nmlt = $r->param("all_past_mlt$j") || 0;
-		push @all_past_list, {'filepath' => $r->param("all_past_list$j"), 'morelt' => $nmlt};
-		if($nmlt != $omlt or $nmlt == 0) {
-			$count++ if($j>0);
-			if($j>$hold+1) {
-				$all_past_list[$hold]->{children} = [2..($j-$hold)];
+	my $total_probs   = $c->param('total_probs') || 0;
+	my @all_past_list = ();                              # These include requested, but not shown
+	my ($j, $count, $omlt, $nmlt, $hold) = (0, 0, -1, 0, 0);
+	while (defined($c->param("all_past_list$j"))) {
+		$nmlt = $c->param("all_past_mlt$j") || 0;
+		push @all_past_list, { 'filepath' => $c->param("all_past_list$j"), 'morelt' => $nmlt };
+		if ($nmlt != $omlt or $nmlt == 0) {
+			$count++ if ($j > 0);
+			if ($j > $hold + 1) {
+				$all_past_list[$hold]->{children} = [ 2 .. ($j - $hold) ];
 			}
 			$omlt = $nmlt;
 			$hold = $j;
-		} else { # equal and nonzero, so a child
+		} else {    # equal and nonzero, so a child
 			$all_past_list[$j]->{noshow} = 1;
 		}
 		$j++;
 	}
-	if($nmlt && $j-$hold>1) { $all_past_list[$hold]->{children} = [ 2..($j-$hold)]; }
-	$count++ if($j>0);
-
-	############# Default of which problem selector to display
+	if ($nmlt && $j - $hold > 1) { $all_past_list[$hold]->{children} = [ 2 .. ($j - $hold) ]; }
+	$count++ if ($j > 0);
 
-	my $browse_which = $r->param('browse_which') || 'browse_npl_library';
+	# Default of which problem selector to display
+	my $browse_which = $c->param('browse_which') || 'browse_npl_library';
 
-	## check for problem lib buttons
+	# Check for problem lib buttons
 	my $browse_lib = '';
-	foreach my $lib (keys %problib) {
-		if ($r->param("browse_$lib")) {
+	for my $lib (keys %{ $c->{problibs} }) {
+		if ($c->param("browse_$lib")) {
 			$browse_lib = "browse_$lib";
 			last;
 		}
 	}
 
-	########### Start the logic through if elsif elsif ...
-    debug("browse_lib", $r->param("$browse_lib"));
-    debug("browse_npl_library", $r->param("browse_npl_library"));
-    debug("browse_mysets", $r->param("browse_mysets"));
-    debug("browse_setdefs", $r->param("browse_setdefs"));
-	##### Asked to browse certain problems
+	# Start the logic through if elsif elsif ...
+	debug("browse_lib",         $c->param("$browse_lib"));
+	debug("browse_npl_library", $c->param("browse_npl_library"));
+	debug("browse_course_sets", $c->param("browse_course_sets"));
+	debug("browse_setdefs",     $c->param("browse_setdefs"));
+	# Asked to browse certain problems
 	if ($browse_lib ne '') {
-		$browse_which = $browse_lib;
-		$self->{current_library_set} = "";
-		$use_previous_problems = 0; @pg_files = (); ## clear old problems
-	} elsif ($r->param('browse_npl_library')) {
-		$browse_which = 'browse_npl_library';
-		$self->{current_library_set} = "";
-		$use_previous_problems = 0; @pg_files = (); ## clear old problems
-	} elsif ($r->param('browse_local')) {
-		$browse_which = 'browse_local';
-		$use_previous_problems = 0; @pg_files = (); ## clear old problems
-	} elsif ($r->param('browse_mysets')) {
-		$browse_which = 'browse_mysets';
-		$use_previous_problems = 0; @pg_files = (); ## clear old problems
-	} elsif ($r->param('browse_setdefs')) {
-		$browse_which = 'browse_setdefs';
-		$self->{current_library_set} = "";
-		$use_previous_problems = 0; @pg_files = (); ## clear old problems
-
-		##### Change the seed value
-
-	} elsif ($r->param('rerandomize')) {
-		$self->{problem_seed}= 1+$self->{problem_seed};
-		#$r->param('problem_seed', $problem_seed);
-		$self->addbadmessage($r->maketext('Changing the problem seed for display, but there are no problems showing.')) if $none_shown;
-
-		##### Clear the display
-
-	} elsif ($r->param('cleardisplay')) {
-		@pg_files = ();
-		$use_previous_problems=0;
-		$self->addbadmessage($r->maketext('The display was already cleared.')) if $none_shown;
-
-		##### View problems selected from the local list
-
-	} elsif ($r->param('view_local_set')) {
-
-		my $set_to_display = $self->{current_library_set};
+		$browse_which             = $browse_lib;
+		$c->{current_library_set} = "";
+		$use_previous_problems    = 0;
+		@pg_files                 = ();
+	} elsif ($c->param('browse_npl_library')) {
+		$browse_which             = 'browse_npl_library';
+		$c->{current_library_set} = "";
+		$use_previous_problems    = 0;
+		@pg_files                 = ();
+	} elsif ($c->param('browse_local')) {
+		$browse_which          = 'browse_local';
+		$use_previous_problems = 0;
+		@pg_files              = ();
+	} elsif ($c->param('browse_course_sets')) {
+		$browse_which          = 'browse_course_sets';
+		$use_previous_problems = 0;
+		@pg_files              = ();
+	} elsif ($c->param('browse_setdefs')) {
+		$browse_which             = 'browse_setdefs';
+		$c->{current_library_set} = "";
+		$use_previous_problems    = 0;
+		@pg_files                 = ();
+	} elsif ($c->param('rerandomize')) {
+		# Change the seed value
+		$c->{problem_seed} = 1 + $c->{problem_seed};
+		$c->addbadmessage($c->maketext('Changing the problem seed for display, but there are no problems showing.'))
+			if $none_shown;
+	} elsif ($c->param('cleardisplay')) {
+		# Clear the display
+		@pg_files              = ();
+		$use_previous_problems = 0;
+	} elsif ($c->param('view_local_set')) {
+		# View problems selected from the local list
+		my $set_to_display = $c->{current_library_set};
 		if (!defined $set_to_display || $set_to_display eq '') {
-			$self->addbadmessage($r->maketext('You need to select a set to view.'));
+			$c->addbadmessage($c->maketext('You need to select a set to view.'));
 		} else {
-			$set_to_display        = '.'                      if $set_to_display eq $r->maketext(MY_PROBLEMS);
-			$set_to_display        = substr($browse_which, 7) if $set_to_display eq $r->maketext(MAIN_PROBLEMS);
-			@pg_files              = list_pg_files($ce->{courseDirs}{templates}, "$set_to_display");
+			$set_to_display        = '.'                      if $set_to_display eq $c->maketext(MY_PROBLEMS);
+			$set_to_display        = substr($browse_which, 7) if $set_to_display eq $c->maketext(MAIN_PROBLEMS);
+			@pg_files              = $c->list_pg_files($ce->{courseDirs}{templates}, "$set_to_display");
 			@pg_files              = map { { 'filepath' => $_, 'morelt' => 0 } } @pg_files;
 			$use_previous_problems = 0;
 		}
-
-		##### View problems selected from the a set in this course
-
-	} elsif ($r->param('view_mysets_set')) {
-
-		my $set_to_display = $self->{current_library_set};
+	} elsif ($c->param('view_course_set')) {
+		# View problems selected from the a set in this course
+		my $set_to_display = $c->{current_library_set};
 		debug("set_to_display is $set_to_display");
 		if (!defined $set_to_display || $set_to_display eq '') {
-			$self->addbadmessage($r->maketext("You need to select a set from this course to view."));
+			$c->addbadmessage($c->maketext("You need to select a set from this course to view."));
 		} else {
 			@pg_files = map { { 'filepath' => $_->source_file, 'morelt' => 0 } }
 				$db->getGlobalProblemsWhere({ set_id => $set_to_display });
 			$use_previous_problems = 0;
 		}
-
-		##### View from the library database
-
-	} elsif ($r->param('lib_view')) {
-
-		@pg_files=();
-		# TODO: deprecate OPLv1 -- replace getSectionListings with getDBListings($r,0)
-		my @dbsearch = WeBWorK::Utils::ListingDB::getSectionListings($r);
-		@pg_files = process_search($r, @dbsearch);
-		$use_previous_problems=0;
-
-		##### View a set from a set*.def
-
-	} elsif ($r->param('view_setdef_set')) {
-
-		my $set_to_display = $self->{current_library_set};
+	} elsif ($c->param('lib_view')) {
+		# View from the library database
+		@pg_files = ();
+		# TODO: deprecate OPLv1 -- replace getSectionListings with getDBListings($c,0)
+		my @dbsearch = getSectionListings($c);
+		@pg_files              = process_search($c, @dbsearch);
+		$use_previous_problems = 0;
+	} elsif ($c->param('view_setdef_set')) {
+		# View a set from a set*.def
+		my $set_to_display = $c->{current_library_set};
 		debug("set_to_display is $set_to_display");
 		if (!defined $set_to_display || $set_to_display eq '') {
-			$self->addbadmessage($r->maketext("You need to select a set definition file to view."));
+			$c->addbadmessage($c->maketext("You need to select a set definition file to view."));
 		} else {
-			@pg_files = $self->read_set_def($set_to_display);
+			@pg_files = $c->read_set_def($set_to_display);
 			@pg_files = map { { 'filepath' => $_, 'morelt' => 0 } } @pg_files;
 		}
 		$use_previous_problems = 0;
-
-		##### Edit the current local homework set
-
-	} elsif ($r->param('edit_local')) { ## Jump to set edit page
-
-		; # already handled
-
-
-		##### Make a new local homework set
-
-	} elsif ($r->param('new_local_set')) {
-		if ($r->param('new_set_name') !~ /^[\w .-]*$/) {
-			$self->addbadmessage($r->maketext(
+	} elsif ($c->param('edit_local')) {
+		# Edit the current local homework set
+		# Already handled
+	} elsif ($c->param('new_local_set')) {
+		# Make a new local homework set
+		if ($c->param('new_set_name') !~ /^[\w .-]*$/) {
+			$c->addbadmessage($c->maketext(
 				'The name "[_1]" is not a valid set name.  '
 					. 'Use only letters, digits, dashes, underscores, periods, and spaces.',
-				$r->param('new_set_name')
+				$c->param('new_set_name')
 			));
 		} else {
 			# If we want to munge the input set name, do it here.
-			my $newSetName = format_set_name_internal($r->param('new_set_name'));
-			debug("local_sets was ", $r->param('local_sets'));
-			$r->param('local_sets',$newSetName);  ## use of two parameter param
-			debug("new value of local_sets is ", $r->param('local_sets'));
-			if (! $newSetName) {
-			    $self->addbadmessage($r->maketext("You did not specify a new set name."));
+			my $newSetName = format_set_name_internal($c->param('new_set_name'));
+			debug("local_sets was ", $c->param('local_sets'));
+			$c->param('local_sets', $newSetName);    ## use of two parameter param
+			debug("new value of local_sets is ", $c->param('local_sets'));
+			if (!$newSetName) {
+				$c->addbadmessage($c->maketext("You did not specify a new set name."));
 			} elsif (defined $db->getGlobalSet($newSetName)) {
-			    $self->addbadmessage($r->maketext("The set name '[_1]' is already in use.  Pick a different name if you would like to start a new set.",$newSetName));
-			} else {			# Do it!
+				$c->addbadmessage($c->maketext(
+					"The set name '[_1]' is already in use.  Pick a different name if you would like to start a new set.",
+					$newSetName
+				));
+			} else {                                 # Do it!
 				my $newSetRecord = $db->newGlobalSet();
 				$newSetRecord->set_id($newSetName);
 				$newSetRecord->set_header("defaultHeader");
@@ -1915,313 +590,145 @@ sub pre_header_initialize {
 				# It's convenient to set the due date two weeks from now so that it is
 				# not accidentally available to students.
 
-				my $dueDate = time+2*60*60*24*7;
+				my $dueDate    = time + 2 * 60 * 60 * 24 * 7;
 				my $display_tz = $ce->{siteDefaults}{timezone};
-				my $fDueDate = $self->formatDateTime($dueDate, $display_tz, "%m/%d/%Y at %I:%M%P");
-				my $dueTime = $ce->{pg}{timeAssignDue};
+				my $fDueDate   = $c->formatDateTime($dueDate, $display_tz, "%m/%d/%Y at %I:%M%P");
+				my $dueTime    = $ce->{pg}{timeAssignDue};
 
 				# We replace the due time by the one from the config variable
 				# and try to bring it back to unix time if possible
 				$fDueDate =~ s/\d\d:\d\d(am|pm|AM|PM)/$dueTime/;
 
-				$dueDate = $self->parseDateTime($fDueDate, $display_tz);
-				$newSetRecord->open_date($dueDate - 60*$ce->{pg}{assignOpenPriorToDue});
+				$dueDate = $c->parseDateTime($fDueDate, $display_tz);
+				$newSetRecord->open_date($dueDate - 60 * $ce->{pg}{assignOpenPriorToDue});
 				$newSetRecord->due_date($dueDate);
-				$newSetRecord->answer_date($dueDate + 60*$ce->{pg}{answersOpenAfterDueDate});
+				$newSetRecord->answer_date($dueDate + 60 * $ce->{pg}{answersOpenAfterDueDate});
 
 				$newSetRecord->visible(1);
 				$newSetRecord->enable_reduced_scoring(0);
 				$newSetRecord->assignment_type('default');
-				eval {$db->addGlobalSet($newSetRecord)};
+				eval { $db->addGlobalSet($newSetRecord) };
 				if ($@) {
-					$self->addbadmessage("Problem creating set $newSetName<br> $@");
+					$c->addbadmessage("Problem creating set $newSetName<br> $@");
 				} else {
-					$self->addgoodmessage($r->maketext("Set [_1] has been created.", $newSetName));
-					my $selfassign = $r->param('selfassign') || "";
-					$selfassign = "" if($selfassign =~ /false/i); # deal with javascript false
-					if($selfassign) {
-						$self->assignSetToUser($userName, $newSetRecord);
-						$self->addgoodmessage($r->maketext("Set [_1] was assigned to [_2]", $newSetName,$userName));
-					}
+					$c->addgoodmessage($c->maketext("Set [_1] has been created.", $newSetName));
+					assignSetToUser($db, $userName, $newSetRecord);
+					$c->addgoodmessage($c->maketext("Set [_1] was assigned to [_2]", $newSetName, $userName));
 				}
 			}
 		}
-
-	} elsif ($r->param('next_page')) {
+	} elsif ($c->param('next_page')) {
 		# Can set first/last problem, but not index yet
-		$first_index = $last_index+1;
+		$first_index = $last_index + 1;
 		my $oli = 0;
 		my $cnt = 0;
-		while(($oli = next_prob_group($last_index, @all_past_list)) != -1 and $cnt<$maxShown) {
+		while (($oli = next_prob_group($last_index, @all_past_list)) != -1 and $cnt < $maxShown) {
 			$cnt++;
 			$last_index = $oli;
 		}
 		$last_index = end_prob_group($last_index, @all_past_list);
-	} elsif ($r->param('prev_page')) {
+	} elsif ($c->param('prev_page')) {
 		# Can set first/last index, but not problem yet
-		$last_index = $first_index-1;
+		$last_index = $first_index - 1;
 		my $oli = 0;
 		my $cnt = 0;
-		while(($oli = prev_prob_group($first_index, @all_past_list)) != -1 and $cnt<$maxShown) {
+		while (($oli = prev_prob_group($first_index, @all_past_list)) != -1 and $cnt < $maxShown) {
 			$cnt++;
 			$first_index = $oli;
 		}
-		$first_index = 0 if($first_index<0);
-
-	#} elsif ($r->param('select_all')) {
-		#;
-	} elsif ($r->param('library_basic')) {
+		$first_index = 0 if ($first_index < 0);
+	} elsif ($c->param('library_basic')) {
 		$library_basic = 1;
 		for my $jj (qw(textchapter textsection textbook)) {
-			$r->param('library_'.$jj,'');
+			$c->param('library_' . $jj, undef);
 		}
-	} elsif ($r->param('library_advanced')) {
+	} elsif ($c->param('library_advanced')) {
 		$library_basic = 2;
-	} elsif ($r->param('library_reset')) {
-		for my $jj (qw(chapters sections subjects textbook keywords)) {
-			$r->param('library_'.$jj,'');
+	} elsif ($c->param('library_reset')) {
+		for my $jj (qw(chapters sections subjects textbook textchapter textsection keywords)) {
+			$c->param('library_' . $jj, undef);
 		}
-	#} elsif ($r->param('select_none')) {
-	#	;
+		$c->param('level', undef);
 	} else {
-		##### No action requested, probably our first time here
-		;
-	}				##### end of the if elsif ...
-
+		# No action requested, probably our first time here
+	}
 
 	# Get the list of local sets sorted by set_id.
 	my @all_db_sets = map { $_->[0] } $db->listGlobalSetsWhere({}, 'set_id');
 
 	if ($use_previous_problems) {
-		@pg_files = @all_past_list;
+		@pg_files    = @all_past_list;
 		$first_shown = 0;
-		$last_shown = 0;
-		my ($oli, $cnt) = (0,0);
-		while($oli < $first_index and ($oli = next_prob_group($first_shown, @pg_files)) != -1) {
+		$last_shown  = 0;
+		my ($oli, $cnt) = (0, 0);
+		while ($oli < $first_index and ($oli = next_prob_group($first_shown, @pg_files)) != -1) {
 			$cnt++;
 			$first_shown = $oli;
 		}
 		$first_shown = $cnt;
-		$last_shown = $oli;
-		while($oli <= $last_index and $oli != -1) {
+		$last_shown  = $oli;
+		while ($oli <= $last_index and $oli != -1) {
 			$oli = next_prob_group($last_shown, @pg_files);
 			$cnt++;
 			$last_shown = $oli;
 		}
-		$last_shown = $cnt-1;
+		$last_shown  = $cnt - 1;
 		$total_probs = $count;
 	} else {
-		### Main place to set first/last shown for new problems
+		# Main place to set first/last shown for new problems
 		$first_shown = 0;
 		$first_index = 0;
-		$last_index = 0;
-		$last_shown = 1;
+		$last_index  = 0;
+		$last_shown  = 1;
 		$total_probs = 0;
 		my $oli = 0;
-		while(($oli = next_prob_group($last_index, @pg_files)) != -1 and $last_shown<$maxShown) {
+		while (($oli = next_prob_group($last_index, @pg_files)) != -1 and $last_shown < $maxShown) {
 			$last_shown++;
 			$last_index = $oli;
 		}
 		$total_probs = $last_shown;
 		# $last_index points to start of last group
-		$last_shown--; # first_shown = 0
+		$last_shown--;    # first_shown = 0
 		$last_index = end_prob_group($last_index, @pg_files);
-		$oli = $last_index;
-		while(($oli = next_prob_group($oli, @pg_files)) != -1) {
+		$oli        = $last_index;
+		while (($oli = next_prob_group($oli, @pg_files)) != -1) {
 			$total_probs++;
 		}
 	}
 
+	my $library_stats_handler = '';
 
-        my $library_stats_handler = '';
-
-	if ($ce->{problemLibrary}{showLibraryGlobalStats} ||
-	   $ce->{problemLibrary}{showLibraryLocalStats} ) {
-	    $library_stats_handler = WeBWorK::Utils::LibraryStats->new($ce);
-	}
-
-	############# Now store data in self for retreival by body
-	$self->{first_shown} = $first_shown;
-	$self->{last_shown} = $last_shown;
-	$self->{first_index} = $first_index;
-	$self->{last_index} = $last_index;
-	$self->{total_probs} = $total_probs;
-	$self->{browse_which} = $browse_which;
-	#$self->{problem_seed} = $problem_seed;
-	$self->{pg_files} = \@pg_files;
-	$self->{all_db_sets} = \@all_db_sets;
-	$self->{library_basic} = $library_basic;
-	$self->{library_stats_handler} = $library_stats_handler;
-}
-
-
-sub title {
-	my ($self) = @_;
-	return $self->r->maketext("Library Browser");
-}
-
-sub body {
-	my ($self) = @_;
-
-	my $r = $self->r;
-	my $ce = $r->ce;		# course environment
-	my $db = $r->db;		# database
-	my $j;			# garden variety counter
-
-	my $courseID = $self->r->urlpath->arg("courseID");
-	my $userName = $r->param('user');
-
-	my $user = $db->getUser($userName); # checked
-	die "record for user $userName (real user) does not exist."
-		unless defined $user;
-
-	### Check that this is a professor
-	my $authz = $r->authz;
-	unless ($authz->hasPermissions($userName, "modify_problem_sets")) {
-		print "User $userName returned " . $authz->hasPermissions($userName, "modify_problem_sets") . " for permission";
-		return (CGI::div(
-			{ class => 'alert alert-danger p-1 mb-0' },
-			CGI::em("You are not authorized to access the Instructor tools.")
-		));
+	if ($ce->{problemLibrary}{showLibraryGlobalStats}
+		|| $ce->{problemLibrary}{showLibraryLocalStats})
+	{
+		$library_stats_handler = WeBWorK::Utils::LibraryStats->new($ce);
 	}
 
-	# my $showHints = $r->param('showHints');
-	# my $showSolutions = $r->param('showSolutions');
-
-	##########	Extract information computed in pre_header_initialize
-
-	my $first_shown = $self->{first_shown};
-	my $last_shown = $self->{last_shown};
-	my $first_index = $self->{first_index};
-	my $last_index = $self->{last_index};
-	my $total_probs = $self->{total_probs};
-	my $browse_which = $self->{browse_which};
-	my $problem_seed = $self->{problem_seed}||1234;
-	my @pg_files = @{$self->{pg_files}};
-	my @all_db_sets = @{$self->{all_db_sets}};
-
-	my @plist = map {$_->{filepath}} @pg_files[$first_index..$last_index];
+	my @plist = map { $_->{filepath} } @pg_files[ $first_index .. $last_index ];
 
 	# If there are problems to view and a target set is selected, then create a hash of source files in the target set.
 	if (@plist) {
-		my $setName = $r->param("local_sets");
+		my $setName = $c->param('local_sets');
 		if (defined $setName) {
-			$self->{isInSet} =
-				{ map { $_->[0] => 1 } $db->{problem}->get_fields_where(['source_file'], { set_id => $setName }) };
+			$c->{isInSet} =
+				{ map { $_->[0] => 1 } $c->db->{problem}->get_fields_where(['source_file'], { set_id => $setName }) };
 		}
 	}
 
-	##########	Top part
-	print CGI::start_form({ method => "POST", action => $r->uri, name => 'library_browser_form' }),
-		$self->hidden_authen_fields,
-		CGI::hidden({ id => 'hidden_courseID', name => 'courseID', default => $courseID });
-
-	# Add the course language in a hidden input so that the javascript can get this information.
-	print CGI::hidden({ name => 'hidden_language', value => $ce->{language} });
-
-	print CGI::hidden(-name=>'browse_which', -value=>$browse_which,-override=>1),
-		CGI::hidden(-name=>'problem_seed', -value=>$problem_seed, -override=>1);
-	for ($j = 0 ; $j < scalar(@pg_files) ; $j++) {
-		print CGI::hidden(-name=>"all_past_list$j", -value=>$pg_files[$j]->{filepath}, -override=>1)."\n";
-		print CGI::hidden(-name=>"all_past_mlt$j", -value=>($pg_files[$j]->{morelt} || 0), -override=>1)."\n";
-	}
-
-	print CGI::hidden(-name=>'first_shown', -value=>$first_shown,-override=>1);
-
-	print CGI::hidden(-name=>'last_shown', -value=>$last_shown, -override=>1);
-	print CGI::hidden(-name=>'first_index', -value=>$first_index);
-	print CGI::hidden(-name=>'last_index', -value=>$last_index);
-	print CGI::hidden(-name=>'total_probs', -value=>$total_probs);
-
-	print CGI::start_div({ class => 'library-browser-table' });
-	$self->make_top_row('all_db_sets' => \@all_db_sets, 'browse_which' => $browse_which);
-	print CGI::end_div();
-
-	########## Now print problems
-	my ($jj,$mltnumleft)=(0,-1);
-	for ($jj=0; $jj<scalar(@plist); $jj++) {
-		$pg_files[$jj+$first_index]->{filepath} =~ s|^$ce->{courseDirs}->{templates}/?||;
-		# For MLT boxes, need to know if we are at the end of a group
-		# make_data_row can't figure this out since it only sees one file
-		$mltnumleft--;
-		my $sourceFileData = $pg_files[$jj+$first_index];
-		$self->make_data_row($sourceFileData, $plist[$jj], $jj+1,$mltnumleft);
-		$mltnumleft = scalar(@{$sourceFileData->{children}}) if($sourceFileData->{children});
-	}
-
-	########## Finish things off
-	my ($next_button, $prev_button) = ("", "");
-	if ($first_index > 0) {
-		$prev_button = CGI::submit({
-			name => "prev_page",
-			value => $r->maketext("Previous page"),
-			class => 'btn btn-secondary btn-sm'
-		});
-	}
-	if ((1+$last_index)<scalar(@pg_files)) {
-		$next_button = CGI::submit({
-			name => "next_page",
-			value => $r->maketext("Next page"),
-			class => 'btn btn-secondary btn-sm'
-		});
-	}
-	if (scalar(@pg_files) > 0) {
-		print CGI::div(
-			{ class => 'my-2' },
-			CGI::span(
-				{ id => 'what_shown' },
-				CGI::span({ id => 'firstshown' }, $first_shown + 1) . "-"
-					. CGI::span({ id => 'lastshown' }, $last_shown + 1)
-				)
-				. " "
-				. $r->maketext("of") . " "
-				. CGI::span({ id => 'totalshown' }, $total_probs) . " "
-				. $r->maketext("shown") . ".",
-			$prev_button,
-			" ",
-			$next_button,
-		);
-		print CGI::p(
-			$r->maketext(
-				'Some problems shown above represent multiple similar problems from the database.  If the (top) '
-					. 'information line for a problem has a letter M for "More", hover your mouse over the M  to '
-					. 'see how many similar problems are hidden, or click on the M to see the problems.  If you click '
-					. 'to view these problems, the M becomes an L, which can be clicked on to hide the problems again.'
-				)
-		);
-	}
-
-	print CGI::end_form();
-
-	return "";
-}
-
-sub output_JS {
-	my $self = shift;
-	my $ce   = $self->r->ce;
-
-	print CGI::script({ src => getAssetURL($ce, 'node_modules/iframe-resizer/js/iframeResizer.min.js') }, '');
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/SetMaker/setmaker.js'), defer => undef },        '');
-
-	if ($self->r->authz->hasPermissions(scalar($self->r->param('user')), 'modify_tags')) {
-		print CGI::script(
-			{
-				id        => 'tag-widget-script',
-				src       => "$ce->{webworkURLs}{htdocs}/js/apps/TagWidget/tagwidget.js",
-				defer     => undef,
-				data_taxo => "$ce->{webworkURLs}{htdocs}/DATA/tagging-taxonomy.json"
-			},
-			''
-		);
-	}
-
-	return '';
+	# Now store data in self for retreival by body
+	$c->{first_shown}           = $first_shown;
+	$c->{last_shown}            = $last_shown;
+	$c->{first_index}           = $first_index;
+	$c->{last_index}            = $last_index;
+	$c->{total_probs}           = $total_probs;
+	$c->{browse_which}          = $browse_which;
+	$c->{all_db_sets}           = \@all_db_sets;
+	$c->{library_basic}         = $library_basic;
+	$c->{library_stats_handler} = $library_stats_handler;
+	$c->stash->{pg_files}       = \@pg_files;
+	$c->stash->{plist}          = \@plist;
+
+	return;
 }
 
-=head1 AUTHOR
-
-Written by John Jones, jj (at) asu.edu.
-
-=cut
-
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm b/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm
deleted file mode 100644
index 301f8c61bf..0000000000
--- a/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm
+++ /dev/null
@@ -1,241 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::ContentGenerator::Instructor::SetsAssignedToUser;
-use base qw(WeBWorK::ContentGenerator::Instructor);
-
-=head1 NAME
-
-WeBWorK::ContentGenerator::Instructor::SetsAssignedToUsers - List and edit which
-sets are assigned to a given user.
-
-=cut
-
-use strict;
-use warnings;
-#use CGI qw(-nosticky );
-use WeBWorK::CGI;
-use WeBWorK::Debug;
-
-sub initialize {
-	my ($self)     = @_;
-	my $r          = $self->r;
-	my $urlpath    = $r->urlpath;
-	my $db         = $r->db;
-	my $authz      = $r->authz;
-
-	my $userID     = $urlpath->arg("userID");
-	my $user       = $r->param("user");
-
-	# check authorization
-	return unless $authz->hasPermissions($user, "access_instructor_tools");
-	return unless $authz->hasPermissions($user, "assign_problem_sets");
-
-	# Get a list of all set records sorted by set_id.
-	$self->{set_records} = [ $db->getGlobalSetsWhere({}, 'set_id') ];
-
-	if (defined $r->param("assignToAll")) {
-		$self->assignAllSetsToUser($userID);
-		debug("assignAllSetsToUser($userID)");
-		$self->addgoodmessage($r->maketext('User has been assigned to all current sets.'));
-		debug("done assignAllSetsToUsers($userID)");
-	} elsif (defined $r->param('unassignFromAll')
-		&& defined($r->param('unassignFromAllSafety'))
-		&& $r->param('unassignFromAllSafety') == 1)
-	{
-		$self->addgoodmessage($r->maketext('User has been unassigned from all sets.'));
-		$self->unassignAllSetsFromUser($userID);
-	} elsif (defined $r->param('assignToSelected')) {
-		# Create hash for checking if a set is selected.
-		my %selectedSets = map { $_ => 1 } $r->param("selected");
-
-		# get current user
-		my $User = $db->getUser($userID); # checked
-		die "record not found for $userID.\n" unless $User;
-
-		$self->addgoodmessage($r->maketext("User's sets have been reassigned."));
-
-		my %userSets = map { $_ => 1 } $db->listUserSets($userID);
-
-		# go through each possible set
-		foreach my $setRecord (@{ $self->{set_records} }) {
-			my $setID = $setRecord->set_id;
-			# does the user want it to be assigned to the selected user
-			if (exists $selectedSets{$setID}) {
-				unless ($userSets{$setID}) {	# skip users already in the set
-					debug("assignSetToUser($userID, $setID)");
-					$self->assignSetToUser($userID, $setRecord);
-					debug("done assignSetToUser($userID, $setID)");
-				}
-			} else {
-				# user asked to NOT have the set assigned to the selected user
-				next unless $userSets{$setID};	# skip users not in the set
-				$db->deleteUserSet($userID, $setID);
-			}
-		}
-	} elsif (defined $r->param("unassignFromAll")) {
-	   # no action taken
-	   $self->addbadmessage($r->maketext('No action taken'));
-	}
-}
-
-sub getUserName {
-	my ($self, $pathUserName) = @_;
-
-	if (ref $pathUserName eq "HASH") {
-		$pathUserName = undef;
-	}
-
-	return $pathUserName;
-}
-
-sub body {
-	my ($self)      = @_;
-	my $r           = $self->r;
-	my $urlpath     = $r->urlpath;
-	my $db          = $r->db;
-	my $ce          = $r->ce;
-	my $authz       = $r->authz;
-	my $courseName  = $urlpath->arg('courseID');
-	my $webworkRoot = $ce->{webworkURLs}->{root};
-	my $userID      = $urlpath->arg('userID');
-
-	my $user                   = $r->param('user');
-	my $setsAssignedToUserPage = $urlpath->newFromModule(
-		$urlpath->module, $r,
-		courseID => $courseName,
-		userID   => $userID
-	);
-	my $setsAssignedToUserURL = $self->systemLink($setsAssignedToUserPage, authen => 0);
-
-	# check authorization
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-		'You are not authorized to access the Instructor tools.')
-		unless $authz->hasPermissions($user, 'access_instructor_tools');
-
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' }, 'You are not authorized to assign homework sets.')
-		unless $authz->hasPermissions($user, 'assign_problem_sets');
-
-	print CGI::start_form(
-		{ id => 'set-user-form', name => 'set-user-form', method => 'post', action => $setsAssignedToUserURL });
-	print $self->hidden_authen_fields;
-
-	print CGI::div({ class => 'my-2' },
-		CGI::submit({ name => 'assignToAll', value => 'Assign All Sets', class => 'btn btn-primary' }));
-
-	print CGI::div(
-		{ class => 'alert alert-danger p-1 mb-2 fs-6' },
-		CGI::div({ class => 'mb-1' }, 'Do not uncheck a set unless you know what you are doing.'),
-		CGI::div('There is NO undo for unassigning a set.')
-	);
-
-	print CGI::div(
-		{ class => 'fs-6 mb-2' },
-		'When you uncheck a homework set (and save the changes), you destroy all
-		      of the data for that set for this student.   If You then need to
-		      reassign the set and the student will receive new versions of the problems.
-		      Make sure this is what you want to do before unchecking sets.'
-	);
-
-	print CGI::start_div({ class => 'table-responsive' }),
-		CGI::start_table({ class => 'table table-bordered table-sm font-sm w-auto' });
-	print CGI::Tr(CGI::th({ class => 'text-center' }, 'Assigned'),
-		CGI::th([ 'Set Name', 'Close Date', '' ]));
-
-	foreach my $Set (@{ $self->{set_records} }) {
-		my $setID = $Set->set_id;
-
-		my $UserSet           = $db->getUserSet($userID, $setID);
-		my $currentlyAssigned = defined $UserSet;
-
-		my $prettyDate;
-		if ($currentlyAssigned and $UserSet->due_date) {
-			$prettyDate = $self->formatDateTime($UserSet->due_date, '', 'datetime_format_short', $ce->{language});
-		} else {
-			$prettyDate = $self->formatDateTime($Set->due_date, '', 'datetime_format_short', $ce->{language});
-		}
-
-		# URL to edit user-specific set data
-		my $setListPage = $urlpath->new(
-			type => 'instructor_set_detail',
-			args => {
-				courseID => $courseName,
-				setID    => $setID
-			}
-		);
-		my $url = $self->systemLink($setListPage, params => { editForUser => $userID });
-		print CGI::Tr(
-			CGI::td(
-				{ class => 'text-center' },
-				CGI::checkbox({
-					type    => 'checkbox',
-					name    => 'selected',
-					checked => $currentlyAssigned,
-					value   => $setID,
-					label   => '',
-					class   => 'form-check-input'
-				})
-			),
-			CGI::td($setID),
-			CGI::td({ class => 'text-center' }, $prettyDate),
-			CGI::td($currentlyAssigned ? CGI::a({ href => $url }, 'Edit user-specific set data') : '')
-		);
-	}
-	print CGI::end_table(), CGI::end_div();
-	print CGI::submit({ name => 'assignToSelected', value => 'Save', class => 'btn btn-primary' });
-
-	print CGI::hr()
-		. CGI::div(
-			CGI::div(
-				{ class => 'alert alert-danger p-1 mb-3' },
-				$r->maketext(
-					'There is NO undo for this function.  '
-						. 'Do not use it unless you know what you are doing!  When you unassign '
-						. 'sets using this button, or by unchecking their set names, you destroy all '
-						. 'of the data for those sets for this student.',
-				)
-			),
-			CGI::div(
-				{ class => 'd-flex align-items-center' },
-				CGI::submit({
-					name  => "unassignFromAll",
-					value => $r->maketext("Unassign All Sets"),
-					class => 'btn btn-primary'
-				}),
-				CGI::radio_group({
-					name            => "unassignFromAllSafety",
-					values          => [ 0, 1 ],
-					default         => 0,
-					labels          => { 0 => $r->maketext('Read only'), 1 => $r->maketext('Allow unassign') },
-					class           => 'form-check-input mx-1',
-					labelattributes => { class => 'form-check-label' },
-				}),
-			)
-		) . CGI::hr();
-
-	print CGI::end_form();
-
-	return '';
-}
-
-sub title {
-        my ($self) = @_;
-        my $r = $self->{r};
-        my $userID = $r->urlpath->arg("userID");
-
-        return "Assigned Sets for user $userID";
-}
-
-1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm b/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm
index 0532e57126..51b3523911 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Instructor::ShowAnswers;
-use base qw(WeBWorK::ContentGenerator::Instructor);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures, -async_await;
 
 =head1 NAME
 
@@ -22,623 +22,337 @@ WeBWorK::ContentGenerator::Instructor::ShowAnswers.pm  -- display past answers o
 
 =cut
 
-use strict;
-use warnings;
-#use CGI;
-use WeBWorK::CGI;
-use WeBWorK::HTML::ScrollingRecordList qw/scrollingRecordList/;
-use WeBWorK::Utils qw(sortByName jitar_id_to_seq seq_to_jitar_id getAssetURL format_set_name_display);
-use PGcore;
 use Text::CSV;
+use Mojo::File;
+
+use WeBWorK::Utils qw(sortByName jitar_id_to_seq);
+use WeBWorK::Utils::Rendering qw(renderPG);
 
 use constant PAST_ANSWERS_FILENAME => 'past_answers';
 
-sub initialize {
-	my $self       = shift;
-	my $r          = $self->r;
-	my $urlpath    = $r->urlpath;
-	my $db         = $r->db;
-	my $ce         = $r->ce;
-	my $authz      = $r->authz;
-	my $courseName = $urlpath->arg("courseID");
-	my $user       = $r->param('user');
-	my $root          = $ce->{webworkURLs}->{root};
-	my $key           = $r->param('key');
-
-	my $selectedSets = [$r->param('selected_sets')] // [];
-	my $selectedProblems = [$r->param('selected_problems')] // [];
-
-	unless ($authz->hasPermissions($user, "view_answers")) {
-		$self->addbadmessage("You aren't authorized to view past answers");
+async sub initialize ($c) {
+	my $db   = $c->db;
+	my $ce   = $c->ce;
+	my $user = $c->param('user');
+
+	unless ($c->authz->hasPermissions($user, 'view_answers')) {
+		$c->addbadmessage(q{You aren't authorized to view past answers});
 		return;
 	}
 
-	# The stop acting button doesn't perform a submit action and so
-	# these extra parameters are passed so that if an instructor stops
-	# acting the current studentID, setID and problemID will be maintained
-
-	my $extraStopActingParams;
-	$extraStopActingParams->{selected_users} = $r->param('selected_users');
-	$extraStopActingParams->{selected_sets} = $r->param('selected_sets');
-	$extraStopActingParams->{selected_problems} = $r->param('selected_problems');
-	$r->{extraStopActingParams} = $extraStopActingParams;
+	# The stop acting button doesn't perform a submit action and so these extra parameters are passed so that if an
+	# instructor stops acting the current studentID, setID and problemID will be maintained.
+	$c->{extraStopActingParams}{selected_users}    = $c->param('selected_users');
+	$c->{extraStopActingParams}{selected_sets}     = $c->param('selected_sets');
+	$c->{extraStopActingParams}{selected_problems} = $c->param('selected_problems');
 
-	my $selectedUsers = [$r->param('selected_users')] // [];
+	my $selectedUsers    = [ $c->param('selected_users') ]    // [];
+	my $selectedSets     = [ $c->param('selected_sets') ]     // [];
+	my $selectedProblems = [ $c->param('selected_problems') ] // [];
 
-	my $instructor = $authz->hasPermissions($user, "access_instructor_tools");
+	my $instructor = $c->authz->hasPermissions($user, 'access_instructor_tools');
 
 	# If not instructor then force table to use current user-id
-	if (!$instructor) {
-	  $selectedUsers = [$user];
-	}
+	$selectedUsers = [$user] if !$instructor;
 
-	return CGI::div({ class => 'alert alert-danger' },
-		$r->maketext('You must provide a student ID, a set ID, and a problem number.'))
-		unless $selectedUsers && $selectedSets && $selectedProblems;
+	return unless $selectedUsers && $selectedSets && $selectedProblems;
 
 	my %records;
 	my %prettyProblemNumbers;
-	my %answerTypes;
+	my %fallbackAnswerTypes;
 
-  	foreach my $studentUser (@$selectedUsers) {
-	    my @sets;
+	for my $studentUser (@$selectedUsers) {
+		my @sets;
 
 		# search for selected sets assigned to students
 		my @allSets = $db->listUserSets($studentUser);
-		foreach my $setName (@allSets) {
+		for my $setName (@allSets) {
 			my $set = $db->getMergedSet($studentUser, $setName);
 			if (defined($set->assignment_type) && $set->assignment_type =~ /gateway/) {
 				my @versions = $db->listSetVersions($studentUser, $setName);
-				foreach my $version (@versions) {
-					if (grep /^$setName,v$version$/, @$selectedSets) {
+				for my $version (@versions) {
+					if (grep {/^$setName,v$version$/} @$selectedSets) {
 						$set = $db->getUserSet($studentUser, "$setName,v$version");
 						push(@sets, $set);
 					}
 				}
-			} elsif (grep(/^$setName$/, @$selectedSets)) {
+			} elsif (grep {/^$setName$/} @$selectedSets) {
 				push(@sets, $set);
 			}
 
 		}
 
-	    next unless @sets;
-
-	    foreach my $setRecord (@sets) {
-	        my @problemNumbers;
-		my $setName = $setRecord->set_id;
-		my $isJitarSet = (defined($setRecord->assignment_type) && $setRecord->assignment_type eq 'jitar' ) ? 1 : 0;
-
-		# search for matching problems
-		my @allProblems = $db->listUserProblems($studentUser, $setName);
-		next unless @allProblems;
-		foreach my $problemNumber (@allProblems) {
-		  my $prettyProblemNumber = $problemNumber;
-		  if ($isJitarSet) {
-		    $prettyProblemNumber = join('.',jitar_id_to_seq($problemNumber));
-		  }
-		  $prettyProblemNumbers{$setName}{$problemNumber} = $prettyProblemNumber;
-
-		  if (grep(/^$prettyProblemNumber$/,@$selectedProblems)) {
-		    push (@problemNumbers, $problemNumber);
-		  }
-		}
+		next unless @sets;
 
-		next unless @problemNumbers;
-
-		foreach my $problemNumber (@problemNumbers) {
-		  my @pastAnswerIDs = $db->listProblemPastAnswers($studentUser, $setName, $problemNumber);
-
-		  if (!defined($answerTypes{$setName}{$problemNumber})) {
-		    #set up a silly problem to figure out what type the answers are
-		    #(why isn't this stored somewhere)
-		    my $unversionedSetName = $setName;
-		    $unversionedSetName =~ s/,v[0-9]*$//;
-		    my $displayMode   = $self->{displayMode};
-		    my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars };
-		    my $set = $db->getMergedSet($studentUser, $unversionedSetName);
-		    my $problem = $db->getMergedProblem($studentUser, $unversionedSetName, $problemNumber);
-		    my $userobj = $db->getUser($studentUser);
-		    #if these things dont exist then the problem doesnt exist and past answers dont make sense
-		    next unless defined($set) && defined($problem) && defined($userobj);
-
-		    my $pg = WeBWorK::PG->new(
-					      $ce,
-					      $userobj,
-					      $key,
-					      $set,
-					      $problem,
-					      $set->psvn, # FIXME: this field should be removed
-					      $formFields,
-					      { # translation options
-					       displayMode     => 'plainText',
-					       showHints       => 0,
-					       showSolutions   => 0,
-					       refreshMath2img => 0,
-					       processAnswers  => 1,
-					       permissionLevel => $db->getPermissionLevel($studentUser)->permission,
-					       effectivePermissionLevel => $db->getPermissionLevel($studentUser)->permission,
-					      },
-					     );
-
-		    # check to see what type the answers are.  right now it only checks for essay but could do more
-		    my %answerHash = %{ $pg->{answers} };
-		    my @answerTypes;
-
-		    foreach (sortByName(undef, keys %answerHash)) {
-		      push(@answerTypes,defined($answerHash{$_}->{type})?$answerHash{$_}->{type}:'undefined');
-		    }
-
-		    $answerTypes{$setName}{$problemNumber} = [@answerTypes];
-		  }
-
-		  my @pastAnswers = $db->getPastAnswers(\@pastAnswerIDs);
-
-		  foreach my $pastAnswer (@pastAnswers) {
-		    my $answerID = $pastAnswer->answer_id;
-		    my $answers = $pastAnswer->answer_string;
-		    my $scores = $pastAnswer->scores;
-		    my $time = $pastAnswer->timestamp;
-		    my @scores = split(//, $scores);
-		    my @answers = split(/\t/,$answers);
-
-
-		    $records{$studentUser}{$setName}{$problemNumber}{$answerID} =  { time => $time,
-										     answers => [@answers],
-										     answerTypes => $answerTypes{$setName}{$problemNumber},
-										     scores => [@scores],
-										     comment => $pastAnswer->comment_string // '' };
-
-		  }
+		for my $setRecord (@sets) {
+			my @problemNumbers;
+			my $setName    = $setRecord->set_id;
+			my $isJitarSet = (defined($setRecord->assignment_type) && $setRecord->assignment_type eq 'jitar') ? 1 : 0;
 
-		}
-	      }
-	  }
-
-	$self->{records} = \%records;
-	$self->{prettyProblemNumbers} = \%prettyProblemNumbers;
-
-	# Prepare a csv if we are an instructor
-	if ($instructor && $r->param('createCSV')) {
-	    my $filename = PAST_ANSWERS_FILENAME;
-	    my $scoringDir = $ce->{courseDirs}->{scoring};
-	    my $fullFilename = "${scoringDir}/${filename}.csv";
-	    if (-e $fullFilename) {
-		my $i=1;
-		while(-e "${scoringDir}/${filename}_bak$i.csv") {$i++;}      #don't overwrite existing backups
-		my $bakFileName ="${scoringDir}/${filename}_bak$i.csv";
-		rename $fullFilename, $bakFileName or warn "Unable to rename $filename to $bakFileName";
-	    }
-
-	    $filename .= '.csv';
-
-	    open my $fh, ">:utf8", $fullFilename or warn "Unable to open $fullFilename for writing";
-
-	    my $csv = Text::CSV->new({"eol"=>"\n"});
-	    my @columns;
-
-	    $columns[0] = $r->maketext('User ID');
-	    $columns[1] = $r->maketext('Set ID');
-	    $columns[2] = $r->maketext('Problem Number');
-	    $columns[3] = $r->maketext('Timestamp');
-	    $columns[4] = $r->maketext('Scores');
-	    $columns[5] = $r->maketext('Answers');
-	    $columns[6] = $r->maketext('Comment');
-
-	    $csv->print($fh, \@columns);
-
-	    foreach my $studentID (sort keys %records) {
-		$columns[0] = $studentID;
-		foreach my $setID (sort keys %{$records{$studentID}}) {
-		    $columns[1] = $setID;
-		    foreach my $probNum (sort {$a <=> $b} keys %{$records{$studentID}{$setID}}) {
-		      $columns[2] = $prettyProblemNumbers{$setID}{$probNum};
-		      foreach my $answerID (sort {$a <=> $b} keys %{$records{$studentID}{$setID}{$probNum}}) {
-			my %record = %{$records{$studentID}{$setID}{$probNum}{$answerID}};
-
-			$columns[3] = $self->formatDateTime($record{time});
-			$columns[4] = join(',' ,@{$record{scores}});
-			$columns[5] = join("\t" ,@{$record{answers}});
-			$columns[6] = $record{comment};
-
-			$csv->print($fh,\@columns);
-		      }
-		    }
-		}
-	    }
-
-	    close($fh) or warn "Couldn't Close $fullFilename";
-
-	    }
+			# search for matching problems
+			my @allProblems = $db->listUserProblems($studentUser, $setName);
+			next unless @allProblems;
+			for my $problemNumber (@allProblems) {
+				my $prettyProblemNumber = $problemNumber;
+				if ($isJitarSet) {
+					$prettyProblemNumber = join('.', jitar_id_to_seq($problemNumber));
+				}
+				$prettyProblemNumbers{$setName}{$problemNumber} = $prettyProblemNumber;
 
-}
+				if (grep {/^$prettyProblemNumber$/} @$selectedProblems) {
+					push(@problemNumbers, $problemNumber);
+				}
+			}
 
+			next unless @problemNumbers;
+
+			for my $problemNumber (@problemNumbers) {
+				my @pastAnswers = $db->getPastAnswersWhere(
+					{ user_id => $studentUser, set_id => $setName, problem_id => $problemNumber }, 'answer_id');
+				next unless @pastAnswers;
+
+				# Get answer types from the user problem.
+				my $problem;
+				if ($setRecord->assignment_type =~ /gateway/) {
+					my ($unversionedSetID, $versionID) = $setName =~ /^([^,]*),v(\d*)$/;
+					$problem =
+						$db->getMergedProblemVersion($studentUser, $unversionedSetID, $versionID, $problemNumber);
+				} else {
+					$problem = $db->getMergedProblem($studentUser, $setName, $problemNumber);
+				}
+				# If a problem was not found for this user, then it doesn't make sense to show past answers.
+				next unless defined $problem;
+
+				my @answerTypes;
+				# If $problem->flags ends in a comma, then this is the old type of flags value without answer types.
+				@answerTypes = split(',', $problem->flags =~ s/:needs_grading$//r)
+					if $problem->flags && $problem->flags !~ /,$/;
+
+				# If the answer types were not saved in the flags for this user, then render the user's problem to
+				# figure out what type the answers are.  This is usually only the case for the old type of flags value,
+				# which means this is a course restored from a course archive from a previous version of webwork2.
+				if (!@answerTypes) {
+					if (!defined $fallbackAnswerTypes{$setName}{$problemNumber}) {
+						my $set;
+						if ($setName =~ /,v[0-9]*$/) {
+							my ($unversionedSetID, $versionID) = $setName =~ /^([^,]*),v(\d*)$/;
+							$set = $db->getMergedSetVersion($studentUser, $unversionedSetID, $versionID);
+						} else {
+							$set = $db->getMergedSet($studentUser, $setName);
+						}
+						my $userRecord = $db->getUser($studentUser);
+
+						next unless defined $set && defined $userRecord;
+
+						my $pg = await renderPG(
+							$c,
+							$userRecord,
+							$set, $problem,
+							$set->psvn,
+							{},
+							{    # translation options
+								displayMode              => 'plainText',
+								processAnswers           => 1,
+								showHints                => 0,
+								showSolutions            => 0,
+								refreshMath2img          => 0,
+								permissionLevel          => 0,
+								effectivePermissionLevel => 0,
+							},
+						);
 
-sub body {
-	my $self       = shift;
-	my $r          = $self->r;
-	my $urlpath    = $r->urlpath;
-	my $db         = $r->db;
-	my $ce         = $r->ce;
-	my $authz      = $r->authz;
-	my $root       = $ce->{webworkURLs}->{root};
-	my $courseName = $urlpath->arg('courseID');
-	my $user       = $r->param('user');
-	my $key        = $r->param('key');
-
-	my $instructor = $authz->hasPermissions($user, "access_instructor_tools");
-
-	my $selectedSets     = [ $r->param('selected_sets') ]     // [];
-	my $selectedProblems = [ $r->param('selected_problems') ] // [];
-
-	return CGI::em("You are not authorized to view past answers") unless $authz->hasPermissions($user, "view_answers");
-
-	my $showAnswersPage = $urlpath->newFromModule($urlpath->module, $r, courseID => $courseName);
-	my $showAnswersURL  = $self->systemLink($showAnswersPage, authen => 0);
-
-	# Figure out if MathJax is available
-	my $renderAnswers = scalar(grep(/MathJax/, @{ $ce->{pg}->{displayModes} }));
-
-	my $prettyProblemNumbers = $self->{prettyProblemNumbers};
-
-	#####################################################################
-	# print form
-	#####################################################################
-
-	#only instructors should be able to veiw other people's answers.
-
-	if ($instructor) {
-		# Get all users except the set level proctors, and restrict to the sections or recitations that are allowed for
-		# the user if such restrictions are defined.
-		my @Users = $db->getUsersWhere({
-			user_id => { not_like => 'set_id:%' },
-			$ce->{viewable_sections}{$user} || $ce->{viewable_recitations}{$user}
-			? (
-				-or => [
-					$ce->{viewable_sections}{$user}    ? (section    => $ce->{viewable_sections}{$user})    : (),
-					$ce->{viewable_recitations}{$user} ? (recitation => $ce->{viewable_recitations}{$user}) : ()
-				]
-				)
-			: ()
-		});
-
-		my @GlobalSets = $db->getGlobalSetsWhere({}, 'set_id');
-
-		my @expandedGlobalSetIDs;
-
-		# We need to go through the global sets and if its a gateway
-		# we need to actually find the max number of versions
-		# hopefully this isn't too slow.
-		foreach my $globalSet (@GlobalSets) {
-			my $setName = $globalSet->set_id;
-			if ($globalSet->assignment_type()
-				&& $globalSet->assignment_type() =~ /gateway/)
-			{
-
-				my $maxVersions = 0;
-				foreach my $user (@Users) {
-					my $versions = $db->countSetVersions($user->user_id, $setName);
-					if ($versions > $maxVersions) {
-						$maxVersions = $versions;
+						for (@{ $pg->{flags}{ANSWER_ENTRY_ORDER} // [] }) {
+							push(
+								@{ $fallbackAnswerTypes{$setName}{$problemNumber} },
+								$pg->{PG_ANSWERS_HASH}{$_}{rh_ans}{type} // 'undefined'
+							);
+						}
 					}
+					@answerTypes = @{ $fallbackAnswerTypes{$setName}{$problemNumber} }
+						if defined $fallbackAnswerTypes{$setName}{$problemNumber};
 				}
-				if ($maxVersions) {
-					for (my $i = 1; $i <= $maxVersions; $i++) {
-						push @expandedGlobalSetIDs, "$setName,v$i";
-					}
+
+				for my $pastAnswer (@pastAnswers) {
+					my $answerID = $pastAnswer->answer_id;
+					my $answers  = $pastAnswer->answer_string;
+					my $scores   = $pastAnswer->scores;
+					my $time     = $pastAnswer->timestamp;
+					my @scores   = split(//,   $scores);
+					my @answers  = split(/\t/, $answers);
+
+					$records{$studentUser}{$setName}{$problemNumber}{$answerID} = {
+						time        => $time,
+						answers     => [@answers],
+						answerTypes => \@answerTypes,
+						scores      => [@scores],
+						comment     => $pastAnswer->comment_string // ''
+					};
 				}
-			} else {
-				push @expandedGlobalSetIDs, $setName;
 			}
 		}
+	}
 
-		my %all_problems;
-		#Figure out what problems we need to show.
-		foreach my $globalSet (@GlobalSets) {
-			my @problems = $db->listGlobalProblems($globalSet->set_id);
-			if ($globalSet->assignment_type()
-				&& $globalSet->assignment_type() eq 'jitar')
-			{
-				@problems = map { join('.', jitar_id_to_seq($_)) } @problems;
-			}
+	$c->stash->{records}              = \%records;
+	$c->stash->{prettyProblemNumbers} = \%prettyProblemNumbers;
 
-			foreach my $problem (@problems) {
-				$all_problems{$problem} = 1;
-			}
+	# Prepare a csv if we are an instructor
+	if ($instructor && $c->param('createCSV')) {
+		my $filename     = PAST_ANSWERS_FILENAME;
+		my $scoringDir   = $ce->{courseDirs}->{scoring};
+		my $fullFilename = "${scoringDir}/${filename}.csv";
+		if (-e $fullFilename) {
+			my $i = 1;
+			while (-e "${scoringDir}/${filename}_bak$i.csv") { $i++; }    #don't overwrite existing backups
+			my $bakFileName = "${scoringDir}/${filename}_bak$i.csv";
+			rename $fullFilename, $bakFileName or warn "Unable to rename $filename to $bakFileName";
 		}
 
-		@expandedGlobalSetIDs = sort @expandedGlobalSetIDs;
-		my @globalProblemIDs = sort prob_id_sort keys %all_problems;
+		$filename .= '.csv';
 
-		####################################################################
-		# If necessary print a link to the csv file
-		####################################################################
+		if (my $fh = Mojo::File->new($fullFilename)->open('>:encoding(UTF-8)')) {
 
-		my $filename               = PAST_ANSWERS_FILENAME . '.csv';
-		my $scoringDir             = $ce->{courseDirs}->{scoring};
-		my $scoringDownloadMessage = '';
+			my $csv = Text::CSV->new({ eol => "\n" });
+			my @columns;
 
-		if ($r->param('createCSV')
-			&& -e "${scoringDir}/${filename}")
-		{
+			$columns[0] = $c->maketext('User ID');
+			$columns[1] = $c->maketext('Set ID');
+			$columns[2] = $c->maketext('Problem Number');
+			$columns[3] = $c->maketext('Timestamp');
+			$columns[4] = $c->maketext('Scores');
+			$columns[5] = $c->maketext('Answers');
+			$columns[6] = $c->maketext('Comment');
 
-			my $scoringDownloadPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::ScoringDownload",
-				$r, courseID => $courseName);
+			$csv->print($fh, \@columns);
 
-			$scoringDownloadMessage = CGI::span(
-				{ class => 'fw-bold fs-5 mb-2' },
-				$r->maketext('Download:'),
-				CGI::a(
-					{ href => $self->systemLink($scoringDownloadPage, params => { getFile => $filename }) }, $filename
-				)
-			);
+			for my $studentID (sort keys %records) {
+				$columns[0] = $studentID;
+				for my $setID (sort keys %{ $records{$studentID} }) {
+					$columns[1] = $setID;
+					for my $probNum (sort { $a <=> $b } keys %{ $records{$studentID}{$setID} }) {
+						$columns[2] = $prettyProblemNumbers{$setID}{$probNum};
+						for my $answerID (sort { $a <=> $b } keys %{ $records{$studentID}{$setID}{$probNum} }) {
+							my %record = %{ $records{$studentID}{$setID}{$probNum}{$answerID} };
 
-		}
+							$columns[3] = $c->formatDateTime($record{time});
+							$columns[4] = join(',',  @{ $record{scores} });
+							$columns[5] = join("\t", @{ $record{answers} });
+							$columns[6] = $record{comment};
 
-		########## print site identifying information
-
-		print CGI::input({
-			type  => 'button',
-			id    => 'show_hide',
-			value => $r->maketext('Show/Hide Site Description'),
-			class => 'btn btn-info mb-2'
-		});
-		print CGI::p(
-			{ id => 'site_description', style => 'display:none' },
-			CGI::em($r->maketext(
-				'This is the past answer viewer.  Students can only see their answers, and they will not be able to '
-				. 'see which parts are correct.  Instructors can view any users answers using the form below and the '
-				. 'answers will be colored according to correctness.'
-			))
-		);
-
-		print CGI::hr();
-
-		print CGI::start_form({ -target => 'WW_Info', -id => 'past-answer-form' }, "POST", $showAnswersURL);
-		print $self->hidden_authen_fields();
-
-		print CGI::div(
-			{ class => 'row gx-3' },
-			CGI::div(
-				{ class => 'col-sm-5 mb-2' },
-				CGI::div(
-					{ class => 'fw-bold text-center' },
-					CGI::label({ for => 'selected_users' }, $r->maketext('Users'))
-				),
-				scrollingRecordList(
-					{
-						name            => 'selected_users',
-						id              => 'selected_users',
-						request         => $r,
-						default_sort    => 'lnfn',
-						default_format  => 'lnfn_uid',
-						default_filters => ['all'],
-						attrs           => {
-							size     => 10,
-							multiple => 1
+							$csv->print($fh, \@columns);
 						}
-					},
-					@Users
-				)
-			),
-			CGI::div(
-				{ class => 'col-sm-4 mb-2' },
-				CGI::div(
-					{ class => 'fw-bold text-center' },
-					CGI::label({ for => 'selected_sets' }, $r->maketext('Sets'))
-				),
-				CGI::scrolling_list({
-					name     => 'selected_sets',
-					id       => 'selected_sets',
-					values   => \@expandedGlobalSetIDs,
-					labels   => { map { $_ => format_set_name_display($_) } @expandedGlobalSetIDs },
-					default  => $selectedSets,
-					size     => 23,
-					multiple => 1,
-					class    => 'form-select form-select-sm',
-					dir      => 'ltr'
-				})
-			),
-			CGI::div(
-				{ class => 'col-sm-2 mb-2' },
-				CGI::div(
-					{ class => 'fw-bold text-center' },
-					CGI::label({ for => 'selected_problems' }, $r->maketext('Problems'))
-				),
-				CGI::scrolling_list({
-					name     => 'selected_problems',
-					id       => 'selected_problems',
-					values   => \@globalProblemIDs,
-					default  => $selectedProblems,
-					size     => 23,
-					multiple => 1,
-					class    => 'form-select form-select-sm'
-				})
-			)
-		);
-
-		print CGI::div(
-			{ class => 'd-flex flex-wrap justify-content-start align-items-center' },
-			CGI::submit({
-				name  => 'action',
-				value => $r->maketext('Display Past Answers'),
-				class => 'btn btn-primary mb-2'
-			}),
-			CGI::div(
-				{ class => 'form-check form-check-inline ms-2 mb-2' },
-				CGI::checkbox({
-					label           => $r->maketext('Create CSV'),
-					name            => 'createCSV',
-					id              => 'createCSV',
-					checked         => $r->param('createCSV') // 0,
-					class           => 'form-check-input',
-					labelattributes => { class => 'form-check-label' }
-				})
-			),
-			$scoringDownloadMessage
-		);
-
-		print CGI::end_form();
-	}
-
-	#####################################################################
-	# print result table of answers
-	#####################################################################
-
-	my $records = $self->{records};
-
-	my $foundMatches = 0;
-
-	foreach my $studentUser (sort keys %{$records}) {
-		foreach my $setName (sort keys %{ $records->{$studentUser} }) {
-			foreach my $problemNumber (sort { $a <=> $b } keys %{ $records->{$studentUser}{$setName} }) {
-				my @pastAnswerIDs = sort { $a <=> $b } keys %{ $records->{$studentUser}{$setName}{$problemNumber} };
-				my $prettyProblemNumber = $prettyProblemNumbers->{$setName}{$problemNumber};
-				print CGI::h3($r->maketext(
-					"Past Answers for [_1], set [_2], problem [_3]",
-					$studentUser, CGI::span({ dir => 'ltr' }, format_set_name_display($setName)), $prettyProblemNumber
-				));
-
-				my @row;
-				my $rowOptions = {};
-
-				my $previousTime = -1;
-
-				print CGI::start_div({ class => 'table-responsive' }),
-					CGI::start_table({
-						class => 'past-answer-table table table-striped',
-						dir   => "ltr"    # The answers are not well formatted in RTL mode
-					});
-
-				foreach my $answerID (@pastAnswerIDs) {
-					$foundMatches = 1 unless $foundMatches;
-
-					my %record      = %{ $records->{$studentUser}{$setName}{$problemNumber}{$answerID} };
-					my @answers     = @{ $record{answers} };
-					my @scores      = @{ $record{scores} };
-					my @answerTypes = @{ $record{answerTypes} };
-					my $time        = $self->formatDateTime($record{time});
-
-					if ($previousTime < 0) {
-						$previousTime = $record{time};
-					}
-
-					my $num_ans        = $#scores;
-					my $num_ans_blanks = $#answers;
-					my $upper_limit    = ($num_ans > $num_ans_blanks) ? $num_ans : $num_ans_blanks;
-
-					#FIXME -- $num_ans is no longer the value needed -- $num_ans is the number of
-					# answer evaluators (or answer groups) each of which might have several
-					# answer blanks. On the other hand sometimes an answer blank has been left blank
-					# and there is no answer, but the score is zero.
-					# In other words sometimes number of scores is greater than the number of answers
-					# and sometimes it is less.
-
-					if ($record{time} - $previousTime > $ce->{sessionKeyTimeout}) {
-						$rowOptions->{'class'} = 'table-rule';
-					} else {
-						$rowOptions->{'class'} = '';
 					}
+				}
+			}
 
-					@row = (CGI::td({ width => 10 }), CGI::td(CGI::small($time)));
-
-					for (my $i = 0; $i <= $upper_limit; $i++) {
-						my $tdParams;
-						my $answer     = $answers[$i] // '';
-						my $answerType = defined($answerTypes[$i]) ? $answerTypes[$i] : '';
-						my $score      = shift(@scores);
-
-						# Only color the answer if the user is an instructor and there is an answer, score, and its not
-						# an essay question.
-						if ($instructor && $answer ne '' && defined $score && $answerType ne 'essay') {
-							$tdParams->{style} = $score ? "color:#006600" : "color:#660000";
-						}
-
-						my $answerstring;
-						if ($answer eq '') {
-							$answerstring = CGI::small(CGI::i($r->maketext("empty"))) if ($answer eq "");
-						} elsif (!$renderAnswers) {
-							$answerstring = PGcore::encode_pg_and_html($answer);
-						} elsif ($answerType eq 'essay') {
-							$answerstring = PGcore::encode_pg_and_html($answer);
-							$tdParams->{class} = 'essay';
-						} else {
-							$answerstring = PGcore::encode_pg_and_html($answer);
-						}
+			$fh->close;
+		} else {
+			$c->log->warn("Unable to open $fullFilename for writing");
+		}
+	}
 
-						push(@row, CGI::td({ width => 20 }), CGI::td($tdParams, $answerstring));
-					}
+	return;
+}
 
-					if ($record{comment}) {
-						push(
-							@row,
-							CGI::td({ width => 20 }),
-							CGI::td(
-								{ class => 'comment' },
-								$r->maketext("Comment") . ": " . PGcore::encode_pg_and_html($record{comment})
-							)
-						);
-					}
+sub getInstructorData ($c) {
+	my $db   = $c->db;
+	my $ce   = $c->ce;
+	my $user = $c->param('user');
+
+	# Get all users except the set level proctors, and restrict to the sections or recitations that are allowed for
+	# the user if such restrictions are defined.
+	my @users = $db->getUsersWhere({
+		user_id => { not_like => 'set_id:%' },
+		$ce->{viewable_sections}{$user} || $ce->{viewable_recitations}{$user}
+		? (
+			-or => [
+				$ce->{viewable_sections}{$user}    ? (section    => $ce->{viewable_sections}{$user})    : (),
+				$ce->{viewable_recitations}{$user} ? (recitation => $ce->{viewable_recitations}{$user}) : ()
+			]
+			)
+		: ()
+	});
 
-					print CGI::Tr($rowOptions, @row);
+	my @GlobalSets = $db->getGlobalSetsWhere({}, 'set_id');
 
-					$previousTime = $record{time};
+	my @expandedGlobalSetIDs;
 
+	# Process global sets, and find the maximum number of versions for all users for each gateway set.
+	for my $globalSet (@GlobalSets) {
+		my $setName = $globalSet->set_id;
+		if ($globalSet->assignment_type && $globalSet->assignment_type =~ /gateway/) {
+			my $maxVersions = 0;
+			for my $user (@users) {
+				my $versions = $db->countSetVersions($user->user_id, $setName);
+				$maxVersions = $versions if ($versions > $maxVersions);
+			}
+			if ($maxVersions) {
+				for (my $i = 1; $i <= $maxVersions; $i++) {
+					push @expandedGlobalSetIDs, "$setName,v$i";
 				}
-				print CGI::end_table(), CGI::end_div();
 			}
+		} else {
+			push @expandedGlobalSetIDs, $setName;
 		}
 	}
 
-	print CGI::h2($r->maketext('No problems matched the given parameters.')) unless $foundMatches;
+	@expandedGlobalSetIDs = sort @expandedGlobalSetIDs;
 
-	return "";
+	my %all_problems;
+
+	# Determine which problems to show.
+	for my $globalSet (@GlobalSets) {
+		my @problems = $db->listGlobalProblems($globalSet->set_id);
+		if ($globalSet->assignment_type && $globalSet->assignment_type eq 'jitar') {
+			@problems = map { join('.', jitar_id_to_seq($_)) } @problems;
+		}
+
+		@all_problems{@problems} = (1) x @problems;
+	}
+
+	return (
+		users                => \@users,
+		expandedGlobalSetIDs => \@expandedGlobalSetIDs,
+		globalProblemIDs     => [ sort prob_id_sort keys %all_problems ],
+		filename             => PAST_ANSWERS_FILENAME . '.csv'
+	);
 }
 
 sub byData {
-  my ($A,$B) = ($a,$b);
-  $A =~ s/\|[01]*\t([^\t]+)\t.*/|$1/; # remove answers and correct/incorrect status
-  $B =~ s/\|[01]*\t([^\t]+)\t.*/|$1/;
-  return $A cmp $B;
+	my ($A, $B) = ($a, $b);
+	$A =~ s/\|[01]*\t([^\t]+)\t.*/|$1/;    # remove answers and correct/incorrect status
+	$B =~ s/\|[01]*\t([^\t]+)\t.*/|$1/;
+	return $A cmp $B;
 }
 
-# sorts problem ID's so that all just-in-time like ids are at the bottom
+# Sorts problem ID's so that all just-in-time like ids are at the bottom
 # of the list in order and other problems
 sub prob_id_sort {
 
-  my @seqa = split(/\./,$a);
-  my @seqb = split(/\./,$b);
-
-  # go through problem number sequence
-  for (my $i = 0; $i <= $#seqa; $i++) {
-    # if at some point two numbers are different return the comparison.
-    # e.g. 2.1.3 vs 1.2.6
-    if ($seqa[$i] != $seqb[$i]) {
-      return $seqa[$i] <=> $seqb[$i];
-    }
-
-    # if all of the values are equal but b is shorter then it comes first
-    # i.e. 2.1.3 vs 2.1
-    if ($i == $#seqb) {
-      return 1;
-    }
-  }
-
-  # if all of the values are equal and a and b are the same length then equal
-  # otherwise a was shorter than b so a comes first.
-  if ($#seqa == $#seqb) {
-    return 0;
-  } else {
-    return -1;
-  }
-}
+	my @seqa = split(/\./, $a);
+	my @seqb = split(/\./, $b);
 
-sub output_JS {
-	my $self = shift;
-	my $ce   = $self->r->ce;
+	# go through problem number sequence
+	for (my $i = 0; $i <= $#seqa; $i++) {
+		# if at some point two numbers are different return the comparison.
+		# e.g. 2.1.3 vs 1.2.6
+		if ($seqa[$i] != $seqb[$i]) {
+			return $seqa[$i] <=> $seqb[$i];
+		}
 
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/ShowHide/show_hide.js'), defer => undef }, '');
+		# if all of the values are equal but b is shorter then it comes first
+		# i.e. 2.1.3 vs 2.1
+		if ($i == $#seqb) {
+			return 1;
+		}
+	}
 
-	return '';
+	# if all of the values are equal and a and b are the same length then equal
+	# otherwise a was shorter than b so a comes first.
+	if ($#seqa == $#seqb) {
+		return 0;
+	} else {
+		return -1;
+	}
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm b/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm
deleted file mode 100644
index 5a91ca5bd8..0000000000
--- a/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm
+++ /dev/null
@@ -1,249 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::ContentGenerator::Instructor::SingleProblemGrader;
-
-=head1 NAME
-
-WeBWorK::ContentGenerator::Instructor::SingleProblemGrader is a module for
-manually grading a single webwork problem.  It is displayed with the problem
-when an instructor is acting as a student.
-
-=cut
-
-use WeBWorK::PG;
-use WeBWorK::Localize;
-use WeBWorK::Utils 'wwRound';
-use CGI;
-
-use strict;
-use warnings;
-
-sub new {
-	my ($class, $r, $pg, $userProblem) = @_;
-	$class = ref($class) ? ref($class) : $class;
-
-	my $db        = $r->db;
-	my $urlpath   = $r->urlpath;
-	my $courseID  = $urlpath->arg('courseID');
-	my $setID     = $userProblem->set_id;
-	my $versionID = ref($userProblem) =~ /::ProblemVersion/ ? $userProblem->version_id : 0;
-	my $studentID = $userProblem->user_id;
-	my $problemID = $userProblem->problem_id;
-
-	# Get the currently saved score.
-	my $recordedScore = $userProblem->status;
-
-	# Retrieve the latest past answer and comment (if any).
-	my $userPastAnswerID =
-		$db->latestProblemPastAnswer($courseID, $studentID, $setID . ($versionID ? ",v$versionID" : ''), $problemID);
-	my $pastAnswer = $userPastAnswerID ? $db->getPastAnswer($userPastAnswerID) : 0;
-	my $comment    = $pastAnswer       ? $pastAnswer->comment_string           : '';
-
-	my $self = {
-		pg             => $pg,
-		course_id      => $courseID,
-		student_id     => $studentID,
-		problem_id     => $problemID,
-		set_id         => $setID,
-		version_id     => $versionID,
-		recorded_score => $recordedScore,
-		past_answer_id => $userPastAnswerID // 0,
-		comment_string => $comment,
-		maketext       => WeBWorK::Localize::getLoc($r->ce->{language})
-	};
-	bless $self, $class;
-
-	return $self;
-}
-
-sub maketext {
-	my $self = shift;
-	return &{ $self->{maketext} }(@_);
-}
-
-# Output the problem grader.
-
-sub insertGrader {
-	my $self = shift;
-
-	print CGI::start_div({ class => 'problem-grader' });
-	print CGI::hr();
-	print CGI::start_div({ class => 'problem-grader-table' });
-
-	# Subscores for each answer in the problem.
-	if (@{ $self->{pg}{flags}{ANSWER_ENTRY_ORDER} } > 1) {
-
-		# Determine the scores and weights for each part of the problem.
-		my $total = 0;
-		my (@scores, @weights);
-		for my $ans_id (@{ $self->{pg}{flags}{ANSWER_ENTRY_ORDER} }) {
-			push(@scores,  wwRound(0, $self->{pg}{answers}{$ans_id}{score} * 100));
-			push(@weights, $self->{pg}{answers}{$ans_id}{weight} // 1);
-			$total += $weights[$#weights];
-		}
-
-		# Normalize the weights
-		@weights = map { $_ / $total } @weights;
-
-		for my $part (0 .. $#scores) {
-			print CGI::div(
-				{ class => 'row align-items-center mb-2' },
-				CGI::label(
-					{ class => 'col-fixed col-form-label' },
-					$self->maketext('Answer [_1] Score (%):', $part + 1) . ' '
-						. CGI::a(
-						{
-							class           => 'help-popup',
-							data_bs_content => $self->maketext(
-								'The initial value is the answer sub score for the answer '
-									. 'that is currently shown.  If this is modified, it will be used to compute '
-									. 'the total problem score below.  This score is not saved, and will reset to the '
-									. 'score for the shown answer if the page is reloaded.'
-							),
-							data_bs_placement => 'top',
-							data_bs_toggle    => 'popover'
-						},
-						CGI::i(
-							{
-								class       => 'icon fas fa-question-circle',
-								aria_hidden => 'true',
-								data_alt    => 'Help Icon'
-							},
-							''
-						)
-						)
-					)
-					. CGI::div(
-					{ class => 'col-sm' },
-					CGI::input({
-						type         => 'number',
-						min          => 0,
-						max          => 100,
-						autocomplete => 'off',
-						class        => 'answer-part-score form-control form-control-sm w-auto d-inline',
-						id => "score_problem$self->{problem_id}_$self->{pg}{flags}{ANSWER_ENTRY_ORDER}[$part]",
-						data_problem_id    => $self->{problem_id},
-						data_answer_labels => '["' . join('","', @{ $self->{pg}{flags}{ANSWER_ENTRY_ORDER} }) . '"]',
-						data_weight        => $weights[$part],
-						value              => $scores[$part],
-						size               => 5
-					})
-						. '&nbsp'
-						. $self->maketext('<b>Weight:</b> [_1]%', wwRound(2, $weights[$part] * 100))
-					)
-			);
-		}
-	}
-
-	# Total problem score
-	print CGI::div(
-		{ class => 'row align-items-center mb-2' },
-		CGI::label(
-			{ class => 'col-fixed col-form-label' },
-			$self->maketext('Problem Score (%):') . ' '
-				. CGI::a(
-				{
-					class           => 'help-popup',
-					data_bs_content =>
-						$self->maketext('The initial value is the currently saved score for this student.')
-						. (
-						@{ $self->{pg}{flags}{ANSWER_ENTRY_ORDER} } > 1
-						? ' '
-							. $self->maketext(
-							'This is the only part of the score that is actually saved. '
-								. 'This is computed from the answer sub scores above using the weights shown if they '
-								. 'are modified.  Alternatively, enter the score you want saved here '
-								. '(the above sub scores will be ignored).'
-							)
-						: ''
-						),
-					data_bs_placement => 'top',
-					data_bs_toggle    => 'popover'
-				},
-				CGI::i({ class => 'icon fas fa-question-circle', aria_hidden => 'true', data_alt => 'Help Icon' }, '')
-					. CGI::span({ class => 'sr-only-glyphicon' }, 'Help Icon')
-				)
-			)
-			. CGI::div(
-			{ class => 'col-sm' },
-			CGI::input({
-				type            => 'number',
-				id              => "score_problem$self->{problem_id}",
-				class           => 'problem-score form-control form-control-sm w-auto d-inline',
-				min             => 0,
-				max             => 100,
-				autocomplete    => 'off',
-				data_problem_id => $self->{problem_id},
-				value           => wwRound(0, $self->{recorded_score} * 100),
-				size            => 5
-			})
-			)
-	);
-
-	# Instructor comment
-	if ($self->{past_answer_id}) {
-		print CGI::div(
-			{ class => 'row' },
-			CGI::label({ class => 'col-fixed col-form-label' }, $self->maketext('Comment:'))
-				. CGI::div(
-				{ class => 'col-sm' },
-				CGI::textarea({
-					id              => "comment_problem$self->{problem_id}",
-					class           => 'grader-problem-comment form-control d-inline',
-					data_problem_id => $self->{problem_id},
-					value           => $self->{comment_string},
-					rows            => 3
-				}),
-				CGI::input({
-					class => 'preview btn btn-secondary mt-1',
-					type  => 'button',
-					value => $self->maketext('Preview Comment')
-				})
-				)
-		);
-	}
-
-	# Save button
-	print CGI::div(
-		{ class => 'row align-items-center' },
-		CGI::div(
-			{ class => 'col-fixed mt-2' },
-			CGI::input({
-				class               => 'save-grade btn btn-secondary',
-				type                => 'button',
-				id                  => "save_grade_problem$self->{problem_id}",
-				data_course_id      => $self->{course_id},
-				data_student_id     => $self->{student_id},
-				data_set_id         => $self->{set_id},
-				data_version_id     => $self->{version_id},
-				data_problem_id     => $self->{problem_id},
-				data_past_answer_id => $self->{past_answer_id},
-				value               => 'Save'
-			}),
-		),
-		CGI::div(
-			{ class => 'col-sm mt-2' },
-			CGI::div({ id => "grader_messages_problem$self->{problem_id}", class => 'problem-grader-message' }, '')
-		)
-	);
-	print CGI::end_div();
-	print CGI::hr();
-	print CGI::end_div();
-
-	return '';
-}
-
-1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm b/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm
index 7608098a90..d11cbb10a5 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Instructor::Stats;
-use base qw(WeBWorK::ContentGenerator::Instructor);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -23,424 +23,217 @@ homework set (including sv graphs).
 
 =cut
 
-use strict;
-use warnings;
+use SVG;
 
-use WeBWorK::CGI;
-use WeBWorK::Debug;
-use WeBWorK::ContentGenerator::Grades;
-use WeBWorK::Utils qw(jitar_id_to_seq jitar_problem_adjusted_status format_set_name_display);
+use WeBWorK::Utils qw(jitar_id_to_seq jitar_problem_adjusted_status format_set_name_display grade_set);
 
-# The table format has been borrowed from the Grades.pm module
-sub initialize {
-	my $self    = shift;
-	my $r       = $self->r;
-	my $urlpath = $r->urlpath;
-	my $db      = $r->db;
-	my $user    = $r->param('user');
+sub initialize ($c) {
+	my $db   = $c->db;
+	my $ce   = $c->ce;
+	my $user = $c->param('user');
 
 	# Check permissions
-	return unless $r->authz->hasPermissions($user, 'access_instructor_tools');
-
-	$self->{type} = $urlpath->arg('statType') || '';
-	if ($self->{type} eq 'student') {
-		my $studentName = $urlpath->arg('userID') || $user;
-		$self->{studentName} = $studentName;
-
-	} elsif ($self->{type} eq 'set') {
-		my $setName = $urlpath->arg('setID') || 0;
-		$self->{setName} = $setName;
-		my $setRecord = $db->getGlobalSet($setName);
-		return unless $setRecord;
-		$self->{set_due_date} = $setRecord->due_date;
-		$self->{setRecord}    = $setRecord;
-	}
-}
-
-sub title {
-	my $self = shift;
-	my $r    = $self->r;
-
-	return '' unless $r->authz->hasPermissions($r->param('user'), 'access_instructor_tools');
-
-	my $type = $self->{type};
-	if ($type eq 'student') {
-		return $r->maketext('Statistics for [_1] student [_2]', $self->{ce}{courseName}, $self->{studentName});
-	} elsif ($type eq 'set') {
-		return $r->maketext(
-			'Statistics for [_1] set [_2]. Closes [_3]',
-			$self->{ce}{courseName} =~ s/_/ /gr,
-			CGI::span({ dir => 'ltr' }, format_set_name_display($self->{setName})),
-			$self->formatDateTime($self->{set_due_date})
-		);
-	}
-
-	return $r->maketext('Statistics');
-}
-
-sub siblings {
-	my $self    = shift;
-	my $r       = $self->r;
-	my $db      = $r->db;
-	my $urlpath = $r->urlpath;
-
-	# Check permissions
-	return '' unless $r->authz->hasPermissions($r->param('user'), 'access_instructor_tools');
-
-	my $courseID = $urlpath->arg('courseID');
-	my $eUserID  = $r->param('effectiveUser');
-
-	print CGI::start_div({ class => 'info-box', id => 'fisheye' });
-	print CGI::h2($r->maketext('Statistics'));
-	print CGI::start_ul({ class => 'nav flex-column problem-list', dir => 'ltr' });
-
-	# List links depending on if viewing set progress or student progress
-	if ($self->{type} eq 'student') {
-		my $ce = $r->ce;
-		my $user = $r->param('user');
-		# Get all users except the set level proctors, and restrict to the
-		# sections or recitations that are allowed for the user if such
-		# restrictions are defined.  This list is sorted by last_name,
-		# then first_name, then user_id.
-		my @studentRecords = $db->getUsersWhere(
+	return unless $c->authz->hasPermissions($user, 'access_instructor_tools');
+
+	# Cache a list of all users except set level proctors and practice users, and restrict to the sections or
+	# recitations that are allowed for the user if such restrictions are defined.  This list is sorted by last_name,
+	# then first_name, then user_id.  This is used in multiple places in this module, and is guaranteed to be used at
+	# least once.  So it is done here to prevent extra database access.
+	$c->{student_records} = [
+		$db->getUsersWhere(
 			{
-				user_id => { not_like => 'set_id:%' },
+				user_id => [ -and => { not_like => 'set_id:%' }, { not_like => "$ce->{practiceUserPrefix}\%" } ],
 				$ce->{viewable_sections}{$user} || $ce->{viewable_recitations}{$user}
 				? (
 					-or => [
-						$ce->{viewable_sections}{$user}
-						? (section => { in => $ce->{viewable_sections}{$user} })
-						: (),
-						$ce->{viewable_recitations}{$user}
-						? (recitation => { in => $ce->{viewable_recitations}{$user} })
-						: ()
+						$ce->{viewable_sections}{$user}    ? (section    => $ce->{viewable_sections}{$user})    : (),
+						$ce->{viewable_recitations}{$user} ? (recitation => $ce->{viewable_recitations}{$user}) : ()
 					]
 					)
 				: ()
 			},
 			[qw/last_name first_name user_id/]
-		);
+		)
+	];
 
-		for my $studentRecord (@studentRecords) {
-			my $first_name         = $studentRecord->first_name;
-			my $last_name          = $studentRecord->last_name;
-			my $user_id            = $studentRecord->user_id;
-			my $userStatisticsPage = $urlpath->newFromModule(
-				$urlpath->module, $r,
-				courseID => $courseID,
-				statType => 'student',
-				userID   => $user_id
-			);
-			print CGI::li(
-				{ class => 'nav-item' },
-				CGI::a(
-					{
-						$user_id eq $self->{studentName}
-						? (class => 'nav-link active')
-						: (href => $self->systemLink($userStatisticsPage), class => 'nav-link')
-					},
-					"$last_name, $first_name ($user_id)"
-				)
-			);
-		}
-	} else {
-		my @setIDs   = sort $db->listGlobalSets;
-		for my $setID (@setIDs) {
-			my $problemPage = $urlpath->newFromModule(
-				$urlpath->module, $r,
-				courseID => $courseID,
-				setID    => $setID,
-				statType => 'set',
-			);
-			print CGI::li(
-				{ class => 'nav-item' },
-				CGI::a(
-					{
-						defined $self->{setName} && $setID eq $self->{setName}
-						? (class => 'nav-link active')
-						: (href => $self->systemLink($problemPage), class => 'nav-link')
-					},
-					format_set_name_display($setID)
-				)
-			);
+	if ($c->current_route eq 'instructor_user_statistics') {
+		$c->{studentID} = $c->stash('userID');
+	} elsif ($c->current_route =~ /^instructor_(set|problem)_statistics$/) {
+		my $setRecord = $db->getGlobalSet($c->stash('setID'));
+		return unless $setRecord;
+		$c->{setRecord} = $setRecord;
+		my $problemID = $c->stash('problemID') || 0;
+		if ($problemID) {
+			$c->{prettyID} =
+				$setRecord->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($problemID)) : $problemID;
+			my $problemRecord = $db->getGlobalProblem($c->stash('setID'), $problemID);
+			return unless $problemRecord;
+			$c->{problemRecord} = $problemRecord;
 		}
 	}
 
-	print CGI::end_ul();
-	print CGI::end_div();
-
-	return '';
+	return;
 }
 
-sub body {
-	my $self    = shift;
-	my $r       = $self->r;
-	my $urlpath = $r->urlpath;
-	my $authz   = $r->authz;
-	my $user    = $r->param('user');
+sub page_title ($c) {
+	return '' unless $c->authz->hasPermissions($c->param('user'), 'access_instructor_tools');
 
-	# Check permissions
-	return CGI::div({ class => 'alert alert-danger p-1' }, 'You are not authorized to access instructor tools')
-		unless $authz->hasPermissions($user, 'access_instructor_tools');
-
-	if ($self->{type} eq 'student') {
-		my $studentRecord = $r->db->getUser($self->{studentName});
-		unless ($studentRecord) {
-			return CGI::div({ class => 'alert alert-danger p-1' },
-				$r->maketext('Record for user [_1] not found.', $self->{studentName}));
-		}
+	my $setID = $c->stash('setID') || '';
 
-		my $courseHomePage = $urlpath->new(
-			type => 'set_list',
-			args => { courseID => $urlpath->arg('courseID') }
+	if ($c->current_route eq 'instructor_user_statistics') {
+		return $c->maketext('Statistics for student [_1]', $c->{studentID});
+	} elsif ($c->current_route eq 'instructor_set_statistics') {
+		return $c->maketext('Statistics for [_1]', $c->tag('span', dir => 'ltr', format_set_name_display($setID)));
+	} elsif ($c->current_route eq 'instructor_problem_statistics') {
+		return $c->maketext(
+			'Statistics for [_1] problem [_2]',
+			$c->tag('span', dir => 'ltr', format_set_name_display($setID)),
+			$c->{prettyID}
 		);
-
-		my $email = $studentRecord->email_address;
-		print CGI::a({ href => "mailto:$email" }, $email), CGI::br(),
-			$r->maketext('Section') . ': ',    $studentRecord->section,    CGI::br(),
-			$r->maketext('Recitation') . ': ', $studentRecord->recitation, CGI::br();
-
-		if ($authz->hasPermissions($user, 'become_student')) {
-			my $act_as_student_url =
-				$self->systemLink($courseHomePage, params => { effectiveUser => $self->{studentName} });
-
-			print $r->maketext('Act as:') . ' ', CGI::a({ href => $act_as_student_url }, $studentRecord->user_id);
-		}
-
-		print WeBWorK::ContentGenerator::Grades::displayStudentStats($self, $self->{studentName});
-	} elsif ($self->{type} eq 'set') {
-		$self->displaySet($self->{setName});
-	} elsif ($self->{type} eq '') {
-		$self->index;
-	} else {
-		warn "Don't recognize statistics display type: |$self->{type}|";
 	}
 
-	return '';
+	return $c->maketext('Statistics');
 }
 
-sub index {
-	my $self       = shift;
-	my $r          = $self->r;
-	my $urlpath    = $r->urlpath;
-	my $ce         = $r->ce;
-	my $db         = $r->db;
-	my $user       = $r->param('user');
-	my $courseName = $urlpath->arg('courseID');
-
-	my @setList = map { $_->[0] } $db->listGlobalSetsWhere({}, 'set_id');
-
-	my @setLinks     = ();
-	my @studentLinks = ();
-	for my $set (@setList) {
-		my $setStatisticsPage = $urlpath->newFromModule(
-			$urlpath->module, $r,
-			courseID => $courseName,
-			statType => 'set',
-			setID    => $set
-		);
-		push @setLinks,
-			CGI::a({ href => $self->systemLink($setStatisticsPage) }, format_set_name_display($set));
-	}
-
-	# Get a list of students sorted by user_id.
-	# Get all users except the set level proctors, and restrict to the sections or recitations that are allowed for the
-	# user if such restrictions are defined.  This list is sorted by last_name, then first_name, then user_id.
-	my @studentRecords = $db->getUsersWhere(
-		{
-			user_id => { not_like => 'set_id:%' },
-			$ce->{viewable_sections}{$user} || $ce->{viewable_recitations}{$user}
-			? (
-				-or => [
-					$ce->{viewable_sections}{$user}    ? (section    => $ce->{viewable_sections}{$user})    : (),
-					$ce->{viewable_recitations}{$user} ? (recitation => $ce->{viewable_recitations}{$user}) : ()
-				]
-				)
-			: ()
-		},
-		[qw/last_name first_name user_id/]
-	);
-
-	for my $student (@studentRecords) {
-		my $first_name = $student->first_name;
-		my $last_name  = $student->last_name;
-		my $user_id    = $student->user_id;
+sub siblings ($c) {
+	# Stats and StudentProgress share this template.
+	return $c->include('ContentGenerator/Instructor/Stats/siblings', header => $c->maketext('Statistics'));
+}
 
-		my $userStatisticsPage = $urlpath->newFromModule(
-			$urlpath->module, $r,
-			courseID => $courseName,
-			statType => 'student',
-			userID   => $student->user_id
-		);
-		push @studentLinks,
-			CGI::a({ href => $self->systemLink($userStatisticsPage) }, "$last_name, $first_name ($user_id)");
+# Apply the currently selected filter to the the student records cached in initialize, and return a reference to the
+# list of students and a reference to a hash of section/recitation filters.
+sub filter_students ($c) {
+	my $ce   = $c->ce;
+	my $db   = $c->db;
+	my $user = $c->param('user');
+
+	# Create a hash of sections and recitations, if there are any for the course.
+	# Filter out all records except for current/auditing students for stats.
+	# Filter out students not in selected section/recitation.
+	my $filter = $c->param('filter');
+	my %filters;
+	my @outStudents;
+	for my $student (@{ $c->{student_records} }) {
+		# Only include current/auditing students in stats.
+		next
+			unless ($ce->status_abbrev_has_behavior($student->status, 'include_in_stats'));
+
+		my $section = $student->section;
+		$filters{"section:$section"} = $c->maketext('Section [_1]', $section)
+			if $section && !$filters{"section:$section"};
+		my $recitation = $student->recitation;
+		$filters{"recitation:$recitation"} = $c->maketext('Recitation [_1]', $recitation)
+			if $recitation && !$filters{"recitation:$recitation"};
+
+		# Only add users who match the selected section/recitation.
+		push(@outStudents, $student)
+			if (!$filter
+				|| ($filter =~ /^section:(.*)$/    && $section eq $1)
+				|| ($filter =~ /^recitation:(.*)$/ && $recitation eq $1));
 	}
 
-	print CGI::div(
-		{ class => 'row g-0' },
-		CGI::div(
-			{ class => 'col-lg-5 col-sm-6 border border-dark' },
-			CGI::h2({ class => 'text-center fs-3' }, $r->maketext('View statistics by set')),
-			CGI::ul({ dir => 'ltr' }, CGI::li([@setLinks])),
-		),
-		CGI::div(
-			{ class => 'col-lg-5 col-sm-6 border border-dark' },
-			CGI::h2({ class => 'text-center fs-3' }, $r->maketext('View statistics by student')),
-			CGI::ul(CGI::li([@studentLinks])),
-		)
-	);
-}
-
-# Determines the percentage of students whose score is greater than a given value.
-sub determine_percentiles {
-	my $percent_brackets = shift;
-	my @list_of_scores   = sort { $a <=> $b } @_;
-	my $num_students     = $#list_of_scores;
-	my %percentiles = map { $_ => @list_of_scores[ int((100 - $_) * $num_students / 100) ] // 0 } @$percent_brackets;
-	# For example, $percentiles{75} = @list_of_scores[int(25 * $num_students / 100)]
-	# means that 75% of the students received this score $percentiles{75} or higher.
-	return %percentiles;
+	return (\@outStudents, \%filters);
 }
 
-# Replace an array such as "[0, 0, 0, 86, 86, 100, 100, 100]" by "[0, '-', '-', 86, '-', 100, '-', '-']"
-sub prevent_repeats {
-	my @inarray = @_;
-	my @outarray;
-	my $saved_item = shift @inarray;
-	push @outarray, $saved_item;
-	while (@inarray) {
-		my $current_item = shift @inarray;
-		if ($current_item == $saved_item) {
-			push @outarray, '-';
-		} else {
-			push @outarray, $current_item;
-			$saved_item = $current_item;
-		}
-	}
-	@outarray;
-}
+sub set_stats ($c) {
+	return $c->tag(
+		'div',
+		class => 'alert alert-danger p-1',
+		$c->maketext('Global set [_1] not found.', $c->stash('setID'))
+	) unless $c->{setRecord};
 
-sub displaySet {
-	my $self       = shift;
-	my $r          = $self->r;
-	my $urlpath    = $r->urlpath;
-	my $db         = $r->db;
-	my $ce         = $r->ce;
-	my $courseName = $urlpath->arg('courseID');
-	my $setName    = $urlpath->arg('setID');
-	my $setRecord  = $self->{setRecord};
-
-	unless ($setRecord) {
-		print CGI::div({ class => 'alert alert-danger p-1' }, $r->maketext('Global set [_1] not found.', $setName));
-		return;
-	}
+	my $db = $c->db;
 
 	# Get a list of the global problem records for this set.
-	my @problems = $db->getGlobalProblemsWhere({ set_id => $setName }, 'problem_id');
+	my @problems = $db->getGlobalProblemsWhere({ set_id => $c->stash('setID') }, 'problem_id');
 
-	# The number of problems in the set.  Note that for jitar sets, this is the number of top level problems.
-	my $num_problems = 0;
+	# Total point value of the set.
+	my $totalValue = 0;
 
-	# Formatted problem name.  For jitar sets this is the sequence separated by periods.  Otherwise it is just the
-	# problem id.
-	my %prettyProblemIDs;
+	my $isJitarSet = $c->{setRecord}->assignment_type eq 'jitar';
 
 	# For jitar sets we need to know which problems are top level problems.
-	my $isJitarSet = $setRecord->assignment_type eq 'jitar';
 	my %topLevelProblems;
 
-	# Show a grading link for any essay problems in the set (if any).
-	my @GradeableRows;
-	my $showGradeRow = 0;
-
 	# Compile the following data for all students.
-	my @index_list;                              # List of all student indices
-	my @score_list;                              # List of all student total percentage scores
-	my %attempts_list_for_problem;               # A list of the number of attempts for each problem
-	my %num_attempts_for_problem;                # The total number of attempst for this problem (sum of above list)
-	my %num_students_attempting_problem;         # The number of students attempting this problem.
-	my %correct_answers_for_problem;             # The number of students correctly answering this problem
-												 # (partial correctness allowed).
-	my %correct_adjusted_answers_for_problem;    # The number of students with an adjusted status
-												 # of 1 for the problem (only for jitar sets).
+	my @index_list;                         # List of all student success indicators.
+	my @score_list;                         # List of all student total percentage scores.
+	my %attempts_list_for_problem;          # A list of the number of attempts for each problem.
+	my %num_attempts_for_problem;           # Total number of attempts for this problem (sum of above list).
+	my %num_students_attempting_problem;    # The number of students attempting this problem.
+	my %total_status_for_problem;           # The total status of active students (sum of individual status).
+	my %adjusted_status_for_problem;        # The total adjusted status for top level jitar problems.
 
 	for my $problem (@problems) {
-		$prettyProblemIDs{ $problem->problem_id } =
-			$isJitarSet ? join('.', jitar_id_to_seq($problem->problem_id)) : $problem->problem_id;
-
-		if ($problem->flags =~ /essay/) {
-			$showGradeRow = 1;
-			push(
-				@GradeableRows,
-				CGI::a(
-					{
-						href => $self->systemLink($urlpath->new(
-							type => 'instructor_problem_grader',
-							args =>
-								{ courseID => $courseName, setID => $setName, problemID => $problem->problem_id }
-						))
-					},
-					$r->maketext('Grade Problem')
-				)
-			);
-		} else {
-			push(@GradeableRows, '');
-		}
+		my $probID = $problem->problem_id;
 
-		if ($isJitarSet) {
-			my @seq = jitar_id_to_seq($problem->problem_id);
-			if ($#seq == 0) {
-				$topLevelProblems{ $problem->problem_id } = 1;
-				++$num_problems;
-			}
-		} else {
-			++$num_problems;
-		}
+		# Pretty problem number for jitar sets (just the problem id otherwise).
+		$problem->{prettyID} = $isJitarSet ? join('.', jitar_id_to_seq($problem->problem_id)) : $problem->problem_id;
 
-		# Initialize the number of correct answers and correct adjusted answers.
-		$correct_answers_for_problem{ $problem->problem_id }          = 0;
-		$correct_adjusted_answers_for_problem{ $problem->problem_id } = 0 if $isJitarSet;
-	}
+		# Link to individual problem stats page.
+		$problem->{statsLink} =
+			$c->systemLink(
+				$c->url_for('instructor_problem_statistics', setID => $c->stash('setID'), problemID => $probID),
+				params => $c->param('filter') ? { filter => $c->param('filter') } : {});
 
-	# Get user records
-	debug("Begin obtaining problem records for set $setName");
-	my @userRecords = $db->getUsersWhere({
-		user_id => [ -and => { not_like => 'set_id:%' }, { not_like => "$ce->{practiceUserPrefix}\%" } ]
-	});
-	debug("End obtaining user records for set $setName");
+		# Store the point value of each problem.
+		$totalValue += $problem->value;
 
-	debug('begin main loop');
-	for my $studentRecord (@userRecords) {
-		next unless $ce->status_abbrev_has_behavior($studentRecord->status, 'include_in_stats');
+		# Keep track of all problems for non Jitar sets, and top level for Jitar.
+		$topLevelProblems{$probID} = 1 if $isJitarSet && $problem->{prettyID} !~ /\./;
 
-		my $student = $studentRecord->user_id;
+		# Initialize the number of correct answers and correct adjusted answers.
+		$total_status_for_problem{$probID}    = 0;
+		$adjusted_status_for_problem{$probID} = 0 if $isJitarSet;
+	}
 
+	# Only count top level problems for Jitar sets.
+	my $num_problems = $isJitarSet ? scalar(keys %topLevelProblems) : scalar(@problems);
+
+	my ($students, $filters) = $c->filter_students;
+	for my $studentRecord (@$students) {
+		my $student                    = $studentRecord->user_id;
 		my $totalRight                 = 0;
 		my $total                      = 0;
 		my $total_num_attempts_for_set = 0;
-		my $probNum                    = 0;
 
-		debug("Begin obtaining problem records for user $student set $setName");
+		# Get problem data for student.
 		my @problemRecords;
-		if ($setRecord->assignment_type =~ /gateway/) {
-			@problemRecords =
-				$db->getProblemVersionsWhere({ user_id => $student, set_id => { like => "$setName,v\%" } });
+		my $noSkip = 0;
+		if ($c->{setRecord}->assignment_type =~ /gateway/) {
+			# Only use the quiz version with the best score.
+			my @setVersions =
+				$db->getMergedSetVersionsWhere(
+					{ user_id => $student, set_id => { like => $c->stash('setID') . ',v%' } });
+			if (@setVersions) {
+				my $maxVersion = 1;
+				my $maxStatus  = 0;
+				for my $verSet (@setVersions) {
+					my ($total, $possible) = grade_set($db, $verSet, $student, 1);
+					if ($possible > 0 && $total / $possible >= $maxStatus) {
+						$maxStatus  = $total / $possible;
+						$maxVersion = $verSet->version_id;
+					}
+				}
+				@problemRecords = $db->getAllMergedProblemVersions($student, $c->stash('setID'), $maxVersion);
+			} else {
+				# Check if student is assigned to the quiz but hasn't started any version.
+				$noSkip = 1 if $db->getMergedSet($student, $c->stash('setID'));
+			}
 		} else {
-			@problemRecords = $db->getUserProblemsWhere({ user_id => $student, set_id => $setName });
+			@problemRecords = $db->getUserProblemsWhere({ user_id => $student, set_id => $c->stash('setID') });
 		}
-		debug("End obtaining problem records for user $student set $setName");
+		# Don't include students who are not assigned to set.
+		next unless ($noSkip || @problemRecords);
 
 		for my $problemRecord (@problemRecords) {
 			my $probID = $problemRecord->problem_id;
 
-			# It is possible that $problemRecord->num_correct or $problemRecord->num_correct is an empty or blank string
-			# instead of 0.  The || clause fixes this and prevents warning messages in the usage below.
+			# It is possible that $problemRecord->foo can be an empty or blank string instead of 0.
+			# The || clause fixes this and prevents warning messages in the usage below.
 			my $num_attempts = ($problemRecord->num_correct || 0) + ($problemRecord->num_incorrect || 0);
-
-			my $probValue = $problemRecord->value;
-			$probValue = 1 unless defined($probValue) && $probValue ne '';    # FIXME:  Set defaults here?
-
-			# It is also possible that $problemRecord->status is an empty or blank string instead of 0.
+			my $probValue    = $problemRecord->value;
+			$probValue = 1 unless defined($probValue) && $probValue ne '';
 			my $status = $problemRecord->status || 0;
 
 			# Clamp the status value between 0 and 1.
@@ -470,349 +263,512 @@ sub displaySet {
 			if ($problemRecord->attempted) {
 				$num_students_attempting_problem{$probID}++;
 				push(@{ $attempts_list_for_problem{$probID} }, $num_attempts);
-				$num_attempts_for_problem{$probID}             += $num_attempts;
-				$total_num_attempts_for_set                    += $num_attempts;
-				$correct_answers_for_problem{$probID}          += $status;
-				$correct_adjusted_answers_for_problem{$probID} += $adjusted_status if ($isJitarSet);
+				$num_attempts_for_problem{$probID}    += $num_attempts;
+				$total_num_attempts_for_set           += $num_attempts;
+				$total_status_for_problem{$probID}    += $status;
+				$adjusted_status_for_problem{$probID} += $adjusted_status if ($isJitarSet);
 			}
 		}
 
-		my $act_as_student_url =
-			$self->systemLink($urlpath->new(type => 'set_list', args => { courseID => $courseName }),
-				params => { effectiveUser => $studentRecord->user_id });
-		my $email = $studentRecord->email_address;
+		my $avgScore         = $total        ? $totalRight / $total                        : 0;
+		my $avg_num_attempts = $num_problems ? $total_num_attempts_for_set / $num_problems : 0;
 
-		my $avg_num_attempts = $num_problems     ? $total_num_attempts_for_set / $num_problems   : 0;
-		my $successIndicator = $avg_num_attempts ? ($totalRight / $total)**2 / $avg_num_attempts : 0;
+		# Add the success indicator and scores (between 0 and 1) to respective lists.
+		push(@index_list, $avg_num_attempts ? $avgScore**2 / $avg_num_attempts : 0);
+		push(@score_list, $avgScore);
+	}
 
-		# Add the success indicator to the list of success indices.
-		push(@index_list, $successIndicator);
-		# Add the score to the list of total scores (out of 100).
-		push(@score_list, $total ? $totalRight / $total : 0);
+	# Loop over the problems one more time to compute statistics.
+	my (@avgScore, @adjScore, @avgAttempts, @numActive, @attemptsList, @successList);
+	for (@problems) {
+		my $probID  = $_->problem_id;
+		my $nStu    = $num_students_attempting_problem{$probID};
+		my $avgS    = $nStu ? $total_status_for_problem{$probID} / $nStu : 0;
+		my $avgA    = $avgS ? $num_attempts_for_problem{$probID} / $nStu : 0;
+		my $success = $avgA ? sprintf('%0.0f', 100 * $avgS**2 / $avgA)   : '-';
+
+		push(@attemptsList, $attempts_list_for_problem{$probID});
+		push(@avgScore,     $avgS ? sprintf('%0.0f', 100 * $avgS) : '-');
+		push(@avgAttempts,  $avgA ? sprintf('%0.1f', $avgA)       : '-');
+		push(@numActive,    $nStu ? $nStu : '-');
+		push(@successList,  $success);
+		push(@adjScore,
+			$nStu && $topLevelProblems{$probID}
+			? sprintf('%0.0f', 100 * $adjusted_status_for_problem{$probID} / $nStu)
+			: '-')
+			if ($isJitarSet);
 	}
-	debug('end mainloop');
 
-	# Determine index quartiles.
-	# Percentage of students having scores or indices above this cutoff value.
-	my @brackets1         = (90, 80, 70, 60, 50, 40, 30, 20, 10);
-	my %index_percentiles = determine_percentiles(\@brackets1, @index_list);
-	my %score_percentiles = determine_percentiles(\@brackets1, @score_list);
-	my %attempts_percentiles_for_problem;
-	my %problemPage;
+	# Collect data for the histogram of total scores.
+	my @buckets = (0) x 10;
+	for (@score_list) { $buckets[ $_ > 0.995 ? 9 : int(10 * $_ + 0.05) ]++ }
+	my $maxCount = 0;
+	for (@buckets) { $maxCount = $_ if $_ > $maxCount; }
+	$maxCount = int($maxCount / 5) + 1;
+	@buckets  = reverse(@buckets);
+
+	# Overall average
+	my ($mean, $stddev) = $c->compute_stats(@score_list);
+	my ($overallAvgAttempts) = $c->compute_stats(grep { !/-/ } @avgAttempts);
+	my $overallSuccess = $overallAvgAttempts ? $mean**2 / $overallAvgAttempts : 0;
+	($overallSuccess) = $c->compute_stats(@index_list);
+
+	# Data for the SVG bar graph showing the percentage of students with correct answers for each problem.
+	my (@svgProblemData, @svgProblemLabels, @jitarBars);
+	for (@problems) {
+		my $probID = $_->problem_id;
 
-	my @brackets2 = (95, 75, 50, 25, 5, 1);
-	for my $problem (@problems) {
-		my $probID = $problem->problem_id;
+		if ($isJitarSet) {
+			if ($topLevelProblems{$probID}) {
+				push(
+					@jitarBars,
+					$num_students_attempting_problem{$probID}
+					? sprintf('%0.2f',
+						$adjusted_status_for_problem{$probID} / $num_students_attempting_problem{$probID})
+					: 0
+				);    # Avoid division by zero
+			} else {
+				push(@jitarBars, -1);    # Don't draw bars for non-top level problem.
+			}
+		}
+		push(@svgProblemData,
+			$num_students_attempting_problem{$probID}
+			? sprintf('%0.2f', $total_status_for_problem{$probID} / $num_students_attempting_problem{$probID})
+			: 0);                        # Avoid division by zero
+
+		push(@svgProblemLabels, length $_->{prettyID} > 4 ? '##' : $_->{prettyID});
+	}
+
+	return $c->include(
+		'ContentGenerator/Instructor/Stats/set_stats',
+		filters            => $filters,
+		problems           => \@problems,
+		score_list         => [ map { sprintf('%0.0f', 100 * $_) } @score_list ],
+		buckets            => \@buckets,
+		maxCount           => $maxCount,
+		totalValue         => $totalValue,
+		mean               => $mean,
+		stddev             => $stddev,
+		overallAvgAttempts => $overallAvgAttempts,
+		overallSuccess     => $overallSuccess,
+		index_list         => [ map { sprintf('%0.0f', 100 * $_) } @index_list ],
+		svgProblemData     => \@svgProblemData,
+		svgProblemLabels   => \@svgProblemLabels,
+		isJitarSet         => $isJitarSet,
+		jitarBars          => \@jitarBars,
+		adjScore           => \@adjScore,
+		avgScore           => \@avgScore,
+		avgAttempts        => \@avgAttempts,
+		successList        => \@successList,
+		numActive          => \@numActive,
+		attemptsList       => \@attemptsList
+	);
+}
 
-		# Percentage of students having this many attempts or more.
-		$attempts_percentiles_for_problem{$probID} =
-			{ determine_percentiles([@brackets2], @{ $attempts_list_for_problem{$probID} }) };
-
-		if ($setRecord->assignment_type =~ /gateway/ || !$db->existsUserSet($r->param('user') , $setName)) {
-			# If this is a gateway quiz, there is not a valid link to the problem, so use the Problem.pm editMode with
-			# an undefined set instead.
-			$problemPage{$probID} = $self->systemLink(
-				$urlpath->newFromModule(
-					'WeBWorK::ContentGenerator::Problem', $r,
-					courseID  => $courseName,
-					setID     => 'Undefined_Set',
-					problemID => $problem->problem_id
-				),
-				params => {
-					editMode       => 'savedFile',
-					sourceFilePath => $problem->source_file
+sub problem_stats ($c) {
+	return $c->tag(
+		'div',
+		class => 'alert alert-danger p-1',
+		$c->maketext('Global set [_1] not found.', $c->stash('setID'))
+	) unless $c->{setRecord};
+
+	return $c->tag(
+		'div',
+		class => 'alert alert-danger p-1',
+		$c->maketext('Global problem [_1] not found for set [_2].', $c->{prettyID}, $c->stash('setID'))
+	) unless $c->{problemRecord};
+
+	my $db        = $c->db;
+	my $ce        = $c->ce;
+	my $user      = $c->param('user');
+	my $courseID  = $c->stash('courseID');
+	my $problemID = $c->stash('problemID');
+
+	my $isJitarSet    = $c->{setRecord}->assignment_type eq 'jitar';
+	my $topLevelJitar = $c->{prettyID} !~ /\./;
+
+	my ($students, $filters) = $c->filter_students;
+	my (@problemScores, @adjustedScores, @problemAttempts, @successList);
+	my $activeStudents   = 0;
+	my $inactiveStudents = 0;
+	for my $studentRecord (@$students) {
+		my $student = $studentRecord->user_id;
+		my $studentProblem;
+
+		if ($c->{setRecord}->assignment_type =~ /gateway/) {
+			my @problemRecords =
+				$db->getProblemVersionsWhere(
+					{ user_id => $student, problem_id => $problemID, set_id => { like => $c->stash('setID') . ',v%' } }
+				);
+			my $maxRecord = 0;
+			my $maxStatus = 0;
+			for (0 .. $#problemRecords) {
+				if ($problemRecords[$_]->status > $maxStatus) {
+					$maxRecord = $_;
+					$maxStatus = $problemRecords[$_]->status;
 				}
-			);
+			}
+			$studentProblem = $problemRecords[$maxRecord];
 		} else {
-			$problemPage{$probID} = $self->systemLink($urlpath->newFromModule(
-				'WeBWorK::ContentGenerator::Problem', $r,
-				courseID  => $courseName,
-				setID     => $setName,
-				problemID => $probID
-			));
+			$studentProblem = $db->getMergedProblem($student, $c->stash('setID'), $problemID);
 		}
-	}
+		# Don't include students who are not assigned to set.
+		next unless ($studentProblem);
+
+		# It is possible that $problemRecord->num_correct or $problemRecord->num_correct is an empty or blank string
+		# instead of 0.  The || clause fixes this and prevents warning messages in the usage below.
+		my $numAttempts = ($studentProblem->num_correct || 0) + ($studentProblem->num_incorrect || 0);
+
+		# It is also possible that $problemRecord->status is an empty or blank string instead of 0.
+		my $status = $studentProblem->status || 0;
+
+		# Clamp the status value between 0 and 1.
+		$status = 0 if $status < 0;
+		$status = 1 if $status > 1;
+
+		# Compute adjusted scores for jitar sets.
+		my $adjustedStatus = $isJitarSet ? jitar_problem_adjusted_status($studentProblem, $db) : '';
+
+		# Clamp the adjusted status value between 0 and 1.
+		$adjustedStatus = 0 if $adjustedStatus ne '' && $adjustedStatus < 0;
+		$adjustedStatus = 1 if $adjustedStatus ne '' && $adjustedStatus > 1;
 
-	# SVG bar graph showing the percentage of students with correct answers for each problem.
-
-	my ($barwidth, $barsep) = (22, 4);
-	my $totalbarwidth = $barwidth + 2 * $barsep;
-	my ($topmargin, $rightmargin, $bottommargin, $leftmargin) = (30, 20, 35, 40);
-	my ($plotwindowwidth, $plotwindowheight) = (@problems * ($barwidth + 2 * $barsep), 200);
-	# Since $plotwindowheight = 200, the height of each bar is 2 * percentagescore.
-	if ($plotwindowwidth < 450) { $plotwindowwidth = 450; }
-	my ($imagewidth, $imageheight) =
-		($leftmargin + $plotwindowwidth + $rightmargin, $topmargin + $plotwindowheight + $bottommargin);
-	$imagewidth += 200 if $isJitarSet;
-	my ($titlexpixel, $titleypixel) = ($leftmargin + sprintf('%d', $plotwindowwidth / 2), $topmargin - 10);
-	my ($xaxislabelxpixel, $xaxislabelypixel) = ($titlexpixel, $imageheight - 5);
-	my $yaxislabelxpixel = $leftmargin - 4;
-
-	# Create a string for the svg image.
-	my $svg =
-		'<svg id="bargraph" xmlns="http://www.w3.org/2000/svg" '
-		. qq!width="100%" height="100%" viewbox="0 0 $imagewidth $imageheight" !
-		. 'aria-labelledby="bargraphtitle">'
-
-		. qq!<rect id="bargraphwindow" x="0" y="0" width="$imagewidth" height="$imageheight" !
-		. ' rx="20" ry="20" stroke="#888" stroke-width="2" stroke-opacity="1" fill="white" fill-opacity="0" />'
-
-		. qq!<text id="bargraphtitle" x="$titlexpixel" y="$titleypixel" !
-		. 'font-family="sans-serif" font-size="14" fill="black" text-anchor="middle" font-weight="bold">'
-		. $r->maketext('Percentage of Active Students with Correct Answers')
-		. '</text>'
-
-		. qq!<text id="bargraphxaxislabel" x="$xaxislabelxpixel" y="$xaxislabelypixel" !
-		. 'font-family="sans-serif" font-size="14" fill="black" text-anchor="middle" font-weight="normal">'
-		. $r->maketext('Problem Number')
-		. '</text>'
-
-		. qq!<rect id="bargraphplotwindow" x="$leftmargin" y="$topmargin" !
-		. qq!width="$plotwindowwidth" height="$plotwindowheight" !
-		. 'fill="white" stroke="#bbb" stroke-width="1" fill-opacity="0" stroke-opacity="1" />';
-
-	my $yaxislabelypixel = 0;
-	my $yaxislabel       = '';
-	for my $i (0 .. 5) {
-		$yaxislabelypixel = $topmargin + 5 + ($i * sprintf('%d', $plotwindowheight / 5));
-		$yaxislabel       = 20 * (5 - $i);
-		$svg .=
-			qq!<text id="bargraphylabel$yaxislabel" x="$yaxislabelxpixel" y="$yaxislabelypixel" !
-			. 'font-family="sans-serif" font-size="12" fill="black" text-anchor="end" font-weight="normal">'
-			. $yaxislabel
-			. '%</text>';
+		if ($numAttempts) {
+			$activeStudents++;
+			push(@problemScores,   $status);
+			push(@adjustedScores,  $adjustedStatus) if ($isJitarSet && $topLevelJitar);
+			push(@problemAttempts, $numAttempts);
+			push(@successList,     $numAttempts ? $status**2 / $numAttempts : 0);
+		} else {
+			$inactiveStudents++;
+		}
 	}
 
-	my $yaxisruleypixel      = 0;
-	my $yaxisrulerightxpixel = $leftmargin + $plotwindowwidth;
-	for my $i (1 .. 9) {
-		$yaxisruleypixel = $topmargin + ($i * sprintf('%d', $plotwindowheight / 10));
-		$svg .=
-			qq!<line x1="$leftmargin" y1="$yaxisruleypixel" !
-			. qq!x2="$yaxisrulerightxpixel" y2="$yaxisruleypixel" !
-			. 'stroke="#bbb" stroke-width="1" stroke-opacity="1" />';
+	# Data for the histogram of total scores.
+	my @buckets = map {0} 1 .. 10;
+	for (@problemScores) { $buckets[ $_ > 0.995 ? 9 : int(10 * $_ + 0.05) ]++ }
+	my $maxCount = 0;
+	for (@buckets) { $maxCount = $_ if $_ > $maxCount; }
+	@buckets = reverse(@buckets);
+	my @jitarBars;
+	if ($isJitarSet && $topLevelJitar) {
+		@jitarBars = map {0} 1 .. 10;
+		for (@adjustedScores) { $jitarBars[ $_ > 0.995 ? 9 : int(10 * $_ + 0.05) ]++ }
+		for (@jitarBars)      { $maxCount = $_ if $_ > $maxCount; }
 	}
+	@jitarBars = reverse(@jitarBars);
+	$maxCount  = int($maxCount / 5) + 1;
+
+	# Overall statistics
+	my ($mean,  $stddev)  = $c->compute_stats(@problemScores);
+	my ($mean2, $stddev2) = $c->compute_stats(@problemAttempts);
+	my $successIndex = $mean2 ? $mean**2 / $mean2 : 0;
+
+	return $c->include(
+		'ContentGenerator/Instructor/Stats/problem_stats',
+		filters          => $filters,
+		problemID        => $problemID,
+		problems         => [ $db->getGlobalProblemsWhere({ set_id => $c->stash('setID') }, 'problem_id') ],
+		buckets          => \@buckets,
+		maxCount         => $maxCount,
+		isJitarSet       => $isJitarSet,
+		topLevelJitar    => $topLevelJitar,
+		jitarBars        => \@jitarBars,
+		mean             => $mean,
+		stddev           => $stddev,
+		mean2            => $mean2,
+		successIndex     => $successIndex,
+		activeStudents   => $activeStudents,
+		inactiveStudents => $inactiveStudents,
+		problemScores    => [ map { sprintf('%0.0f', 100 * $_) } @problemScores ],
+		adjustedScores   => [ map { sprintf('%0.0f', 100 * $_) } @adjustedScores ],
+		successList      => \@successList,
+		problemAttempts  => \@problemAttempts
+	);
+}
+
+# Determines the percentage of students whose score is greater than a given value.
+sub determine_percentiles ($c, $percent_brackets, @data) {
+	my @list_of_scores = sort { $a <=> $b } @data;
+	my $num_students   = $#list_of_scores;
+	# For example, $percentiles{75} = @list_of_scores[int(25 * $num_students / 100)]
+	# means that 75% of the students received this score $percentiles{75} or higher.
+	my %percentiles = map { $_ => @list_of_scores[ int((100 - $_) * $num_students / 100) ] // 0 } @$percent_brackets;
+	$percentiles{max} = $list_of_scores[-1];
+	$percentiles{min} = $list_of_scores[0];
+	return %percentiles;
+}
 
-	my $problabelypixel = $topmargin + $plotwindowheight + 15;
-
-	for (my $i = 0; $i <= $#problems; $i++) {
-		my $probID = $problems[$i]->problem_id;
-
-		my $percentcorrect = 0;
-		my $barheight      = 0;
-		my $barxpixel      = 0;
-		my $barypixel      = 0;
-
-		if ($isJitarSet && $topLevelProblems{$probID}) {
-			$percentcorrect = $num_students_attempting_problem{$probID}
-				? sprintf('%0.0f',
-					100 * $correct_adjusted_answers_for_problem{$probID} / $num_students_attempting_problem{$probID})
-				: 0;    # Avoid division by zero
-			$barheight = sprintf('%d', $percentcorrect * $plotwindowheight / 100);
-			$barxpixel = $leftmargin + $i * ($barwidth + 2 * $barsep) + $barsep + 3;
-			$barypixel = $topmargin + $plotwindowheight - $barheight;
-			$svg .=
-				qq!<rect id="adjbar$probID" x="$barxpixel" y="$barypixel" width="$barwidth" height="$barheight" !
-				. 'fill="rgb(0,51,136)" />';
+# Replace an array such as "[0, 0, 0, 86, 86, 100, 100, 100]" by "[0, '-', '-', 86, '-', 100, '-', '-']"
+sub prevent_repeats ($c, @inarray) {
+	my @outarray;
+	my $saved_item = shift @inarray;
+	push @outarray, $saved_item;
+	while (@inarray) {
+		my $current_item = shift @inarray;
+		if ($current_item == $saved_item) {
+			push @outarray, '-';
+		} else {
+			push @outarray, $current_item;
+			$saved_item = $current_item;
 		}
-		$percentcorrect =
-			$num_students_attempting_problem{$probID}
-			? sprintf('%0.0f', 100 * $correct_answers_for_problem{$probID} / $num_students_attempting_problem{$probID})
-			: 0;    # Avoid division by zero
-		$barheight = sprintf('%d', $percentcorrect * $plotwindowheight / 100);
-		$barxpixel = $leftmargin + $i * $totalbarwidth + $barsep;
-		$barypixel = $topmargin + $plotwindowheight - $barheight;
-
-		my $problabelxpixel = $leftmargin + $i * $totalbarwidth + sprintf('%d', $totalbarwidth / 2);
-
-		my $prettyID = $prettyProblemIDs{$probID};
-		$prettyID = '##' if (length($prettyID) > 4);
-		$svg .=
-			'<a '
-			. ($problemPage{$probID} ? qq!href="$problemPage{$probID}"! : '')
-			. ' target="ww_stats_problem">'
-			. qq!<rect id="bar$probID" x="$barxpixel" y="$barypixel" !
-			. qq!width="$barwidth" height="$barheight" fill="rgb(0,153,198)" />!
-			. qq!<text id="problem$probID" x="$problabelxpixel" y="$problabelypixel" !
-			. qq!font-family="sans-serif" font-size="12" fill="black" text-anchor="middle">$prettyID</text></a>!;
 	}
+	return @outarray;
+}
 
-	# Print a legend if its a jitar set
-	if ($isJitarSet) {
-		my $barxpixel = $leftmargin + $plotwindowwidth + 10;
-		my $barypixel = 55;
-		$svg .= qq!<rect id="legend1" x="$barxpixel" y="$barypixel" width="10" height="10" fill="rgb(0,153,198)" />!;
-		$svg .=
-			qq!<text id="legend1lab" x="${\($barxpixel + 15)}" y="${\($barypixel + 10)}" !
-			. 'font-family="sans-serif" font-size="12" fill="black" text-anchor="start">'
-			. $r->maketext('Correct Status')
-			. '</text>';
-
-		$barypixel = $barypixel - 15;
-		$svg .= qq!<rect id="legend2" x="$barxpixel" y="$barypixel" width="10" height="10" fill="rgb(0,51,136)" />!;
-		$svg .=
-			qq!<text id="legend2lab" x="${\($barxpixel + 15)}" y="${\($barypixel + 10)}" !
-			. 'font-family="sans-serif" font-size="12" fill="black" text-anchor="start">'
-			. $r->maketext('Correct Adjusted Status')
-			. '</text>';
+# Create percentile bracket table.
+sub bracket_table ($c, $brackets, $data, $headers, %options) {
+	my @dataOut = ([@$brackets]);
+	push(@{ $dataOut[-1] }, $c->maketext('Top Score')) if $options{showMax};
+
+	for (@$data) {
+		my %percentiles =
+			ref($_) eq 'ARRAY' ? $c->determine_percentiles($brackets, @$_) : map { $_ => '-' } @$brackets;
+		my @tableData = map { $percentiles{$_} } @$brackets;
+		@tableData = reverse(@tableData)             if $options{reverse};
+		@tableData = $c->prevent_repeats(@tableData) if ref($_) eq 'ARRAY';
+		push(@tableData, $options{reverse} ? $percentiles{min} : $percentiles{max}) if $options{showMax};
+		push(@dataOut, \@tableData);
 	}
+	return $c->include(
+		'ContentGenerator/Instructor/Stats/stats_table',
+		tableHeaders => [ $c->maketext('Percent of Students'), @$headers ],
+		tableData    => \@dataOut
+	);
+}
 
-	$svg .= '</svg>';
-
-	print CGI::div({ class => 'img-fluid mb-3', style => "max-width:${imagewidth}px" }, $svg);
-
-	# Print tables
-
-	# Table showing the percentage of students with correct answers for each problems
-	print CGI::p($r->maketext('The percentage of active students with correct answers for each problem')),
-		CGI::start_div({ class => 'table-responsive' }),
-		CGI::start_table({ class => 'stats-table table table-bordered' }), CGI::Tr(
-			CGI::th($r->maketext('Problem #')),
-			CGI::td(
-				{ class => 'text-center' },
-				[
-					map {
-						my $probID = $_->problem_id;
-						$problemPage{$probID}
-							? CGI::a({ href => $problemPage{$probID}, target => 'ww_stats_problem' },
-								$prettyProblemIDs{$probID})
-							: $prettyProblemIDs{$probID}
-					} @problems
-				]
-			)
-		),
-		CGI::Tr(
-			CGI::th($r->maketext('% correct')),
-			CGI::td(
-				{ class => 'text-center' },
-				[
-					map {
-						my $probID = $_->problem_id;
-						($num_students_attempting_problem{$probID})
-						? sprintf('%0.0f',
-							100 * $correct_answers_for_problem{$probID} / $num_students_attempting_problem{$probID})
-						: '-'
-					} @problems
-				]
-			)
-		),
-		(
-			$isJitarSet
-			? CGI::TR(
-				CGI::th($r->maketext('% correct with review')),
-				CGI::td(
-					{ class => 'text-center' },
-					[
-						map {
-							my $probID = $_->problem_id;
-							$num_students_attempting_problem{$probID} && $topLevelProblems{$probID}
-							? sprintf('%0.0f',
-								100 * $correct_adjusted_answers_for_problem{$probID} /
-								$num_students_attempting_problem{$probID})
-							: '-'
-						} @problems
-					]
-				)
-			)
-			: ''
-		),
-		CGI::Tr(
-			CGI::th($r->maketext('avg attempts')),
-			CGI::td(
-				{ class => 'text-center' },
-				[
-					map {
-						my $probID = $_->problem_id;
-						($num_students_attempting_problem{$probID})
-						? sprintf('%0.1f',
-							$num_attempts_for_problem{$probID} / $num_students_attempting_problem{$probID})
-						: '-'
-					} @problems
-				]
-			)
-		),
-		CGI::Tr(
-			CGI::th($r->maketext('# of active students')),
-			CGI::td(
-				{ class => 'text-center' },
-				[
-					map {
-						($num_students_attempting_problem{ $_->problem_id })
-						? $num_students_attempting_problem{ $_->problem_id }
-						: '-'
-					} @problems
-				]
-			)
-		);
+# Compute Mean / Std Deviation.
+sub compute_stats ($c, @data) {
+	my $n = scalar(@data);
+	return (0, 0, 0) unless ($n > 0);
+	my $sum = 0;
+	for (@data) { $sum += $_; }
+	my $mean = sprintf('%0.4g', $sum / $n);
+	my $sum2 = 0;
+	for (@data) { $sum2 += ($_ - $mean)**2; }
+	my $stddev = ($n > 1) ? sqrt($sum2 / ($n - 1)) : 0;
+	return ($mean, $stddev, $sum);
+}
 
-	print CGI::Tr(CGI::th($r->maketext('Manual Grader')), CGI::td(\@GradeableRows)) if ($showGradeRow);
-
-	print CGI::end_table(), CGI::end_div();
-
-	# Table showing percentile statistics for scores and success indices.
-	print CGI::p(CGI::i(
-		$r->maketext(
-			'The percentage of students receiving at least these scores. The median score is in the 50% column.')
-	));
-	print CGI::div(
-		{ class => 'table-responsive' },
-		CGI::table(
-			{ class => 'stats-table table table-bordered' },
-			CGI::Tr(
-				CGI::th($r->maketext('% students')),
-				CGI::td({ class => 'text-center' }, \@brackets1),
-				CGI::td({ class => 'text-center' }, $r->maketext('top score'))
-			),
-			CGI::Tr(
-				CGI::th($r->maketext('Score')),
-				CGI::td(
-					{ class => 'text-center' },
-					[ prevent_repeats map { sprintf('%0.0f', 100 * $score_percentiles{$_}) } @brackets1 ]
-				),
-				CGI::td({ class => 'text-center' }, sprintf('%0.0f', 100))
-			),
-			CGI::Tr(
-				CGI::th($r->maketext('Success Index')),
-				CGI::td(
-					{ class => 'text-center' },
-					[ prevent_repeats map { sprintf('%0.0f', 100 * $index_percentiles{$_}) } @brackets1 ]
-				),
-				CGI::td({ class => 'text-center' }, sprintf('%0.0f', 100))
-			)
-		)
+# Create SVG bar graph from input data.
+sub build_bar_chart ($c, $data, %options) {
+	return '' unless (@$data);
+	$c->{barCount} = 1 unless $c->{barCount};
+	my $id   = $c->{barCount}++;
+	my %opts = (
+		yAxisLabels  => [],
+		xAxisLabels  => [],
+		yAxisTicks   => 9,
+		yMax         => 1,
+		isPercent    => 1,
+		isJitarSet   => 0,
+		jitarBars    => [],
+		barLinks     => [],
+		mainTitle    => 'ERROR: This must be set',
+		xTitle       => '',
+		yTitle       => '',
+		barWidth     => 22,
+		barSep       => 4,
+		barFill      => 'rgb(0,153,198)',
+		jitarFill    => 'rgb(0,51,136)',
+		topMargin    => 30,
+		rightMargin  => 20,
+		bottomMargin => 45,
+		leftMargin   => 40,
+		minWidth     => 450,
+		plotHeight   => 200,
+		%options
+	);
+	$opts{rightMargin} += 160 if $opts{isJitarSet};
+
+	my $n;
+	# Image size calculations.
+	my $barWidth  = $opts{barWidth} + 2 * $opts{barSep};
+	my $plotWidth = scalar(@$data) * $barWidth;
+	$plotWidth = $opts{minWidth} if ($plotWidth < $opts{minWidth});
+	my $imageWidth  = $opts{leftMargin} + $plotWidth + $opts{rightMargin};
+	my $imageHeight = $opts{topMargin} + $opts{plotHeight} + $opts{bottomMargin};
+
+	# Create SVG image output.
+	my $svg = SVG->new(
+		-inline           => 1,
+		id                => "bar_graph_$id",
+		height            => '100%',
+		width             => '100%',
+		viewbox           => '-2 -2 ' . ($imageWidth + 3) . ' ' . ($imageHeight + 3),
+		'aria-labelledby' => "bar_graph_title_$id",
+		role              => 'img',
+		-nocredits        => 1
 	);
 
-	# Table showing percentile statistics for scores and success indices.
-	print CGI::p(CGI::i(
-		$r->maketext(
-			'Percentile cutoffs for number of attempts. The 50% column shows the median number of attempts.')
-		)),
-		CGI::start_div({ class => 'table-responsive' }),
-		CGI::start_table({ class => 'stats-table table table-bordered' }),
-		CGI::Tr(CGI::th($r->maketext('% students')), CGI::td({ class => 'text-center' }, \@brackets2));
+	# Main graph setup.
+	$svg->rect(
+		id               => "bar_graph_window_$id",
+		x                => 0,
+		y                => 0,
+		width            => $imageWidth,
+		height           => $imageHeight,
+		rx               => 20,
+		ry               => 20,
+		fill             => 'white',
+		'fill-opacity'   => 0,
+		stroke           => '#888',
+		'stroke-width'   => 1,
+		'stroke-opacity' => 1,
+	);
+	$svg->text(
+		id            => "bar_graph_title_$id",
+		x             => $opts{leftMargin} + int($plotWidth / 2),
+		y             => $opts{topMargin} / 2,
+		'font-family' => 'sans-serif',
+		'font-size'   => 14,
+		fill          => 'black',
+		'text-anchor' => 'middle',
+		'font-weight' => 'bold',
+	)->cdata($opts{mainTitle});
+	$svg->text(
+		id            => "bar_graph_xaxis_label_$id",
+		x             => $opts{leftMargin} + int($plotWidth / 2),
+		y             => $imageHeight - 10,
+		'font-family' => 'sans-serif',
+		'font-size'   => 14,
+		fill          => 'black',
+		'text-anchor' => 'middle',
+	)->cdata($opts{xTitle})
+		if ($opts{xTitle});
+	$svg->text(
+		id            => "bar_graph_yaxis_label_$id",
+		x             => 20,
+		y             => $opts{topMargin} + int($opts{plotHeight} / 2),
+		transform     => 'rotate(-90, 20, ' . ($opts{topMargin} + int($opts{plotHeight} / 2)) . ')',
+		'font-family' => 'sans-serif',
+		'font-size'   => 14,
+		'text-anchor' => 'middle',
+	)->cdata($opts{yTitle})
+		if $opts{yTitle};
+	$svg->rect(
+		id               => "bar_graph_plot_window_$id",
+		x                => $opts{leftMargin},
+		y                => $opts{topMargin},
+		width            => $plotWidth,
+		height           => $opts{plotHeight},
+		fill             => 'white',
+		'fill-opacity'   => 0,
+		stroke           => '#888',
+		'stroke-width'   => 1,
+		'stroke-opacity' => 1,
+	);
 
-	for my $problem (@problems) {
-		my $probID = $problem->problem_id;
-		print CGI::Tr(
-			CGI::th(
-				$problemPage{$probID}
-				? CGI::a({ href => $problemPage{$probID}, target => 'ww_stats_problem' },
-					$r->maketext('Problem [_1]', $prettyProblemIDs{$probID}))
-				: $prettyProblemIDs{$probID}
-			),
-			CGI::td(
-				{ class => 'text-center' },
-				[
-					prevent_repeats reverse
-						map { sprintf('%0.0f', $attempts_percentiles_for_problem{$probID}{$_}) } @brackets2
-				]
-			)
+	# Jitar Legend.
+	if ($opts{isJitarSet}) {
+		$svg->rect(
+			x      => $opts{leftMargin} + $plotWidth + 10,
+			y      => $opts{topMargin} + 20,
+			width  => 10,
+			height => 10,
+			stroke => $opts{jitarFill},
+			fill   => $opts{jitarFill},
+		);
+		$svg->text(
+			x             => $opts{leftMargin} + $plotWidth + 25,
+			y             => $opts{topMargin} + 30,
+			'font-family' => 'sans-serif',
+			'font-size'   => 12,
+			'text-anchor' => 'start',
+		)->cdata($c->maketext('Correct Adjusted Status'));
+		$svg->rect(
+			x      => $opts{leftMargin} + $plotWidth + 10,
+			y      => $opts{topMargin} + 40,
+			width  => 10,
+			height => 10,
+			stroke => $opts{barFill},
+			fill   => $opts{barFill},
+		);
+		$svg->text(
+			x             => $opts{leftMargin} + $plotWidth + 25,
+			y             => $opts{topMargin} + 50,
+			'font-family' => 'sans-serif',
+			'font-size'   => 12,
+			'text-anchor' => 'start',
+		)->cdata($c->maketext('Correct Status'));
+	}
+
+	# y-axis labels.
+	$n = scalar(@{ $opts{yAxisLabels} }) - 1;
+	my $yOffset = int($opts{plotHeight} / (10 * $n));
+	for (0 .. $n) {
+		my $yPos = $opts{topMargin} + ($n - $_) * int($opts{plotHeight} / $n) + $yOffset;
+		$svg->text(
+			x             => $opts{leftMargin} - 5,
+			y             => $yPos,
+			'font-family' => 'sans-serif',
+			'font-size'   => 14,
+			'text-anchor' => 'end',
+			'font-size'   => 12,
+		)->cdata($opts{yAxisLabels}->[$_]);
+	}
+
+	# y-axis ticks.
+	$n = $opts{yAxisTicks} + 1;
+	for (1 .. $opts{yAxisTicks}) {
+		my $yPos = $opts{topMargin} + $_ * int($opts{plotHeight} / $n);
+		$svg->line(
+			x1               => $opts{leftMargin},
+			y1               => $yPos,
+			x2               => $imageWidth - $opts{rightMargin},
+			y2               => $yPos,
+			stroke           => '#888',
+			'stroke-width'   => 1,
+			'stroke-opacity' => 1,
 		);
 	}
 
-	print CGI::end_table(), CGI::end_div();
+	# Bars.
+	$n = scalar(@$data) - 1;
+	for (0 .. $n) {
+		my $xPos    = $opts{leftMargin} + $_ * $barWidth + $opts{barSep};
+		my $yHeight = int($opts{plotHeight} * $data->[$_] / $opts{yMax} + 0.5);
+		if ($opts{isJitarSet} && $opts{jitarBars}->[$_] > 0) {
+			my $jHeight = int($opts{plotHeight} * $opts{jitarBars}->[$_] / $opts{yMax} + 0.5);
+			$svg->rect(
+				x                => $xPos,
+				y                => $opts{topMargin} + $opts{plotHeight} - $jHeight,
+				width            => $opts{barWidth} + $opts{barSep},
+				height           => $jHeight,
+				fill             => $opts{jitarFill},
+				'data-bs-toggle' => 'tooltip',
+				'data-bs-title'  => $opts{isPercent} ? (100 * $opts{jitarBars}->[$_]) . '%' : $opts{jitarBars}->[$_],
+				class            => 'bar_graph_bar',
+			);
+		}
+		my $tag = @{ $opts{barLinks} } ? $svg->anchor(-href => $opts{barLinks}->[$_]) : $svg;
+		$tag->rect(
+			x                => $xPos,
+			y                => $opts{topMargin} + $opts{plotHeight} - $yHeight,
+			width            => $opts{barWidth},
+			height           => $yHeight,
+			fill             => $opts{barFill},
+			'data-bs-toggle' => 'tooltip',
+			'data-bs-title'  => $opts{isPercent} ? (100 * $data->[$_]) . '%' : $data->[$_],
+			class            => 'bar_graph_bar',
+		);
+		$tag->text(
+			x             => $xPos + $opts{barWidth} / 2,
+			y             => $imageHeight - $opts{bottomMargin} + 15,
+			'font-family' => 'sans-serif',
+			'text-anchor' => 'middle',
+			'font-size'   => 12,
+		)->cdata($opts{xAxisLabels}->[$_]);
+	}
 
-	return '';
+	# FIXME:  The invalid html attribute xmlns:svg needs to be removed. The SVG module needs to be fixed to not
+	# add this invalid attribute when rendering for html.
+	return $c->tag(
+		'div',
+		class => 'img-fluid mb-3',
+		style => "max-width: ${imageWidth}px",
+		$c->b($svg->render =~ s/xmlns:svg="[^"]*"//r)
+	);
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm b/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm
index d57b14e9af..28fd8ec827 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Instructor::StudentProgress;
-use base qw(WeBWorK::ContentGenerator::Instructor);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -22,930 +22,263 @@ WeBWorK::ContentGenerator::Instructor::StudentProgress - Display Student Progres
 
 =cut
 
-use strict;
-use warnings;
-
-use WeBWorK::CGI;
-use WeBWorK::Debug;
-use WeBWorK::ContentGenerator::Grades;
 use WeBWorK::Utils qw(jitar_id_to_seq wwRound grade_set format_set_name_display);
-use WeBWorK::Utils::Grades qw/list_set_versions/;
-
-# The table format has been borrowed from the Grades.pm module
-sub initialize {
-	my $self     = shift;
-	my $r          = $self->{r};
-	my $urlpath    = $r->urlpath;
-	my $type       = $urlpath->arg("statType") || '';
-	my $db         = $self->{db};
-	my $ce         = $self->{ce};
-	my $authz      = $self->{authz};
-	my $courseName = $urlpath->arg('courseID');
- 	my $user       = $r->param('user');
-
- 	# Check permissions
-	return unless $authz->hasPermissions($user, "access_instructor_tools");
-
- 	$self->{type}  = $type;
- 	if ($type eq 'student') {
- 		my $studentName = $r->urlpath->arg("userID") || $user;
- 		$self->{studentName } = $studentName;
-
- 	} elsif ($type eq 'set') {
- 		my $setName = $r->urlpath->arg("setID") || 0;
- 		$self->{setName}     = $setName;
- 		my $setRecord  = $db->getGlobalSet($setName); # checked
-		die "global set $setName  not found." unless $setRecord;
-		$self->{set_due_date} = $setRecord->due_date;
-		$self->{setRecord}   = $setRecord;
- 	}
-}
-
-
-sub title {
-	my ($self) = @_;
-	my $r      = $self->r;
-	my $authz  = $r->authz;
-	my $user   = $r->param('user');
-
-	# Check permissions
-	return '' unless $authz->hasPermissions($user, 'access_instructor_tools');
-
-	my $type   = $self->{type};
-	if ($type eq 'student') {
-		return $r->maketext('Student Progress for [_1] student [_2]', $self->{ce}->{courseName}, $self->{studentName});
-	} elsif ($type eq 'set') {
-		return $r->maketext(
-			'Student Progress for [_1] set [_2]. Closes [_3]',
-			$self->{ce}->{courseName},
-			CGI::span({ dir => 'ltr' }, format_set_name_display($self->{setName})),
-			$self->formatDateTime($self->{set_due_date})
-		);
-	}
-
-	return $r->maketext('Student Progress');
-}
+use WeBWorK::Utils::Grades qw(list_set_versions);
 
-sub siblings {
-	my $self    = shift;
-	my $r       = $self->r;
-	my $db      = $r->db;
-	my $urlpath = $r->urlpath;
+sub initialize ($c) {
+	my $db   = $c->db;
+	my $ce   = $c->ce;
+	my $user = $c->param('user');
 
 	# Check permissions
-	return '' unless $r->authz->hasPermissions($r->param('user'), 'access_instructor_tools');
-
-	my $courseID = $urlpath->arg('courseID');
-	my $eUserID  = $r->param('effectiveUser');
-
-	print CGI::start_div({ class => 'info-box', id => 'fisheye' });
-	print CGI::h2($r->maketext('Student Progress'));
-
-	# List links depending on if viewing set progress or student progress
-	if ($self->{type} eq 'student') {
-		my $ce   = $r->ce;
-		my $user = $r->param('user');
-		# Get all users except the set level proctors, and restrict to the
-		# sections or recitations that are allowed for the user if such
-		# restrictions are defined.  This list is sorted by last_name,
-		# then first_name, then user_id.
-		my @studentRecords = $db->getUsersWhere(
+	return unless $c->authz->hasPermissions($user, "access_instructor_tools");
+
+	# Cache a list of all users except set level proctors and practice users, and restrict to the sections or
+	# recitations that are allowed for the user if such restrictions are defined.  This list is sorted by last_name,
+	# then first_name, then user_id.  This is used in multiple places in this module, and is guaranteed to be used at
+	# least once.  So it is done here to prevent extra database access.
+	$c->{student_records} = [
+		$db->getUsersWhere(
 			{
-				user_id => { not_like => 'set_id:%' },
+				user_id => [ -and => { not_like => 'set_id:%' }, { not_like => "$ce->{practiceUserPrefix}\%" } ],
 				$ce->{viewable_sections}{$user} || $ce->{viewable_recitations}{$user}
 				? (
 					-or => [
-						$ce->{viewable_sections}{$user}
-						? (section => { in => $ce->{viewable_sections}{$user} })
-						: (),
-						$ce->{viewable_recitations}{$user}
-						? (recitation => { in => $ce->{viewable_recitations}{$user} })
-						: ()
+						$ce->{viewable_sections}{$user}    ? (section    => $ce->{viewable_sections}{$user})    : (),
+						$ce->{viewable_recitations}{$user} ? (recitation => $ce->{viewable_recitations}{$user}) : ()
 					]
 					)
 				: ()
 			},
 			[qw/last_name first_name user_id/]
-		);
-
-		print CGI::start_ul({ class => 'nav flex-column problem-list' });
-		for my $studentRecord (@studentRecords) {
-			my $first_name         = $studentRecord->first_name;
-			my $last_name          = $studentRecord->last_name;
-			my $user_id            = $studentRecord->user_id;
-			my $userStatisticsPage = $urlpath->newFromModule(
-				$urlpath->module, $r,
-				courseID => $courseID,
-				statType => 'student',
-				userID   => $user_id
-			);
-			print CGI::li(
-				{ class => 'nav-item' },
-				CGI::a(
-					{
-						$user_id eq $self->{studentName}
-						? (class => 'nav-link active')
-						: (href => $self->systemLink($userStatisticsPage), class => 'nav-link')
-					},
-					"$last_name, $first_name ($user_id)"
-				)
-			);
-		}
-		print CGI::end_ul();
-	} else {
-		my @setIDs = sort $db->listGlobalSets;
-
-		print CGI::start_ul({ class => 'nav flex-column problem-list', dir => 'ltr' });
-		for my $setID (@setIDs) {
-			my $problemPage = $urlpath->newFromModule(
-				$urlpath->module, $r,
-				courseID => $courseID,
-				setID    => $setID,
-				statType => 'set',
-			);
-			print CGI::li(
-				{ class => 'nav-item' },
-				CGI::a(
-					{
-						defined $self->{setName} && $setID eq $self->{setName}
-						? (class => 'nav-link active')
-						: (href => $self->systemLink($problemPage), class => 'nav-link')
-					},
-					format_set_name_display($setID)
-				)
-			);
-		}
-		print CGI::end_ul();
-	}
-
-	print CGI::end_div();
-
-	return '';
-}
-
-sub body {
-	my $self       = shift;
-	my $r          = $self->r;
-	my $urlpath    = $r->urlpath;
-	my $db         = $r->db;
-	my $ce         = $r->ce;
-	my $authz      = $r->authz;
-	my $user       = $r->param('user');
-	my $courseName = $urlpath->arg("courseID");
-	my $type       = $self->{type};
-
-	# Check permissions
-	return CGI::div({ class => 'alert alert-danger p-1' } . "You are not authorized to access instructor tools")
-		unless $authz->hasPermissions($user, "access_instructor_tools");
-
-	if ($type eq 'student') {
-		my $studentName = $self->{studentName};
-		my $studentRecord = $db->getUser($studentName) # checked
-			or die "record for user $studentName not found";
-		my $fullName = $studentRecord->full_name;
-        my $courseHomePage = $urlpath->new(type  => 'set_list',
-        	args => {courseID=>$courseName});
-		my $email = $studentRecord->email_address;
-
-		print CGI::a({-href=>"mailto:$email"}, $email), CGI::br(),
-			$r->maketext("Section").": ", $studentRecord->section, CGI::br(),
-			$r->maketext("Recitation").": ", $studentRecord->recitation, CGI::br();
-
-		if ($authz->hasPermissions($user, "become_student")) {
-			my $act_as_student_url = $self->systemLink($courseHomePage,
-				params => {effectiveUser=>$studentName});
-
-			print $r->maketext("Act as:")." ".CGI::a({-href=>$act_as_student_url},$studentRecord->user_id);
-		}
-
-		print WeBWorK::ContentGenerator::Grades::displayStudentStats($self,$studentName);
-	} elsif( $type eq 'set') {
-		$self->displaySets($self->{setName});
-	} elsif ($type eq '') {
-		$self->index;
-	} else {
-		warn "Don't recognize statistics display type: |$type|";
-
+		)
+	];
+
+	if ($c->current_route eq 'instructor_user_progress') {
+		$c->{studentID} = $c->stash('userID');
+	} elsif ($c->current_route eq 'instructor_set_progress') {
+		my $setRecord = $db->getGlobalSet($c->stash('setID'));
+		return unless $setRecord;
+		$c->{setRecord} = $setRecord;
 	}
 
-
-	return '';
-
+	return;
 }
 
-sub index {
-	my $self          = shift;
-	my $r             = $self->r;
-	my $urlpath       = $r->urlpath;
-	my $ce            = $r->ce;
-	my $db            = $r->db;
-	my $courseName    = $urlpath->arg("courseID");
-
-	my $user = $r->param("user");
-
-	# Get all users except the set level proctors, and restrict to the sections or recitations that are allowed for the
-	# user if such restrictions are defined.  This list is sorted by last_name, then first_name, then user_id.
-	my @studentRecords = $db->getUsersWhere(
-		{
-			user_id => { not_like => 'set_id:%' },
-			$ce->{viewable_sections}{$user} || $ce->{viewable_recitations}{$user}
-			? (
-				-or => [
-					$ce->{viewable_sections}{$user} ? (section => { -in => $ce->{viewable_sections}{$user} }) : (),
-					$ce->{viewable_recitations}{$user}
-					? (recitation => { -in => $ce->{viewable_recitations}{$user} })
-					: ()
-				]
-				)
-			: ()
-		},
-		[qw/last_name first_name user_id/]
-	);
-
-	my @setList = map { $_->[0] } $db->listGlobalSetsWhere({}, 'set_id');
+sub page_title ($c) {
+	return '' unless $c->authz->hasPermissions($c->param('user'), 'access_instructor_tools');
 
-	my @setLinks      = ();
-	my @studentLinks  = ();
-	for my $set (@setList) {
-		my $setStatisticsPage = $urlpath->newFromModule(
-			$urlpath->module, $r,
-			courseID => $courseName,
-			statType => 'set',
-			setID    => $set
+	if ($c->current_route eq 'instructor_user_progress') {
+		return $c->maketext('Student Progress for [_1]', $c->{studentID});
+	} elsif ($c->current_route eq 'instructor_set_progress') {
+		return $c->maketext(
+			'Student Progress for set [_1]',
+			$c->tag('span', dir => 'ltr', format_set_name_display($c->stash('setID'))),
 		);
-		push @setLinks, CGI::a({ href => $self->systemLink($setStatisticsPage) }, format_set_name_display($set));
 	}
 
-	for my $studentRecord (@studentRecords) {
-		my $first_name         = $studentRecord->first_name;
-		my $last_name          = $studentRecord->last_name;
-		my $user_id            = $studentRecord->user_id;
-		my $userStatisticsPage = $urlpath->newFromModule(
-			$urlpath->module, $r,
-			courseID => $courseName,
-			statType => 'student',
-			userID   => $user_id
-		);
-
-		push @studentLinks,
-			CGI::a({ href => $self->systemLink($userStatisticsPage) }, "$last_name, $first_name  ($user_id)");
-	}
+	return $c->maketext('Student Progress');
+}
 
-	print CGI::div(
-		{ class => 'row g-0' },
-		CGI::div(
-			{ class => 'col-lg-5 col-sm-6 border border-dark' },
-			CGI::h2({ class => 'text-center fs-3' }, $r->maketext('View student progress by set')),
-			CGI::ul({ dir => 'ltr' }, CGI::li([@setLinks]))
-		),
-		CGI::div(
-			{ class => 'col-lg-5 col-sm-6 border border-dark' },
-			CGI::h2({ class => 'text-center fs-3' }, $r->maketext('View student progress by student')),
-			CGI::ul(CGI::li([@studentLinks]))
-		)
-	);
+sub siblings ($c) {
+	# Stats and StudentProgress share this template.
+	return $c->include('ContentGenerator/Instructor/Stats/siblings', header => $c->maketext('Student Progress'));
 }
 
 # Display student progress table
-sub displaySets {
-	my $self       = shift;
-	my $r          = $self->r;
-	my $urlpath    = $r->urlpath;
-	my $db         = $r->db;
-	my $ce         = $r->ce;
-	my $authz      = $r->authz;
-	my $courseName = $urlpath->arg("courseID");
-	my $setName    = $urlpath->arg("setID");
-	my $user       = $r->param('user');
-	my $GlobalSet  = $self->{setRecord};
-	my $root       = $ce->{webworkURLs}->{root};
-	my $setStatsPage = $urlpath->newFromModule($urlpath->module, $r, courseID => $courseName, statType => 'sets', setID => $setName);
-	my $primary_sort_method_name   = $r->param('primary_sort');
-	my $secondary_sort_method_name = $r->param('secondary_sort');
-	my $ternary_sort_method_name   = $r->param('ternary_sort');
-
-	# another versioning/gateway change.  in many cases we don't want or need
-	# all of the columns that are put in here by default, so we add a set of
-	# flags for which columns to show.  for versioned sets we may also want to
-	# only see the best score, so we include that as an option also.
-	# these are ignored for non-versioned sets
-	my %showColumns = (
-		'name'     => 1,
-		'score'    => 1,
-		'outof'    => 1,
-		'date'     => 0,
-		'testtime' => 0,
-		'login'    => 1,
-		'problems' => 1,
-		'section'  => 1,
-		'recit'    => 1,
-	);
-	my $showBestOnly = 0;
+sub displaySets ($c) {
+	my $db = $c->db;
+	my $ce = $c->ce;
 
-	my @score_list  = ();     # list of all student total percentage scores
-	my $sort_method = sub {
-		my ($a, $b, $sort_method_name) = @_;
-		return 0 unless defined($sort_method_name);
-		return lc($a->{last_name}) cmp lc($b->{last_name})         if $sort_method_name eq 'last_name';
-		return lc($a->{first_name}) cmp lc($b->{first_name})       if $sort_method_name eq 'first_name';
-		return lc($a->{email_address}) cmp lc($b->{email_address}) if $sort_method_name eq 'email_address';
-		return $b->{score} <=> $a->{score}                         if $sort_method_name eq 'score';
-		return lc($a->{section}) cmp lc($b->{section})             if $sort_method_name eq 'section';
-		return lc($a->{recitation}) cmp lc($b->{recitation})       if $sort_method_name eq 'recitation';
-		return lc($a->{user_id}) cmp lc($b->{user_id})             if $sort_method_name eq 'user_id';
-	};
-	my %display_sort_method_name = (
-		last_name     => $r->maketext('last name'),
-		first_name    => $r->maketext('first name'),
-		email_address => $r->maketext('email address'),
-		score         => $r->maketext('score'),
-		section       => $r->maketext('section'),
-		recitation    => $r->maketext('recitation'),
-		user_id       => $r->maketext('login name'),
-	);
+	my $setIsVersioned = defined $c->{setRecord}->assignment_type && $c->{setRecord}->assignment_type =~ /gateway/;
 
-	# get versioning information
-	my $setIsVersioned =
-		(defined($GlobalSet->assignment_type()) && $GlobalSet->assignment_type() =~ /gateway/) ? 1 : 0;
-
-	# reset column view options based on whether the set is versioned and, if so,
-	# the input parameters
-	if ($setIsVersioned) {
-		# the returning parameter lets us set defaults for versioned sets
-		my $ret = defined($r->param('returning')) ? $r->param('returning') : 0;
-		$showColumns{'date'}     = ($ret && !defined($r->param('show_date')))      ? $r->param('show_date')       : 1;
-		$showColumns{'testtime'} = ($ret && !defined($r->param('show_testtime')))  ? $r->param('show_testtime')   : 1;
-		$showColumns{'problems'} = ($ret && defined($r->param('show_problems')))   ? $r->param('show_problems')   : 0;
-		$showColumns{'section'}  = ($ret && defined($r->param('show_section')))    ? $r->param('show_section')    : 0;
-		$showColumns{'recit'}    = ($ret && defined($r->param('show_recitation'))) ? $r->param('show_recitation') : 0;
-		$showColumns{'login'}    = ($ret && defined($r->param('show_login')))      ? $r->param('show_login')      : 0;
-		$showBestOnly            = ($ret && defined($r->param('show_best_only')))  ? $r->param('show_best_only')  : 0;
+	# The returning parameter lets us set defaults for versioned sets
+	if ($setIsVersioned && !$c->param('returning')) {
+		$c->param('show_date',     1) if !$c->param('show_date');
+		$c->param('show_testtime', 1) if !$c->param('show_testtime');
 	}
 
-	# Get all users except the set level proctors and practice users, and restrict to the sections or recitations that
-	# are allowed for the user if such restrictions are defined.  This list is sorted by last_name, then first_name,
-	# then user_id.
-	debug("Begin obtaining user records for set $setName");
-	my @studentRecords = $db->getUsersWhere(
-		{
-			user_id => [ -and => { not_like => 'set_id:%' }, { not_like => "$ce->{practiceUserPrefix}\%" } ],
-			$ce->{viewable_sections}{$user} || $ce->{viewable_recitations}{$user}
-			? (
-				-or => [
-					$ce->{viewable_sections}{$user}    ? (section    => $ce->{viewable_sections}{$user})    : (),
-					$ce->{viewable_recitations}{$user} ? (recitation => $ce->{viewable_recitations}{$user}) : ()
-				]
-				)
-			: ()
-		},
-		[qw/last_name first_name user_id/]
-	);
-	debug("End obtaining user records for set $setName");
+	# For versioned sets some of the columns are optionally shown.  The following flags keep track of which ones to
+	# show.  An additional variable keeps track of whether to show all scores or only the best score.  The defaults set
+	# here used to determine headers for non-versioned sets.
+
+	my %showColumns = $setIsVersioned
+		? (
+			date     => $c->param('show_date')       // 0,
+			testtime => $c->param('show_testtime')   // 0,
+			timeleft => $c->param('show_timeleft')   // 0,
+			problems => $c->param('show_problems')   // 0,
+			section  => $c->param('show_section')    // 0,
+			recit    => $c->param('show_recitation') // 0,
+			login    => $c->param('show_login')      // 0,
+		)
+		: (date => 0, testtime => 0, timeleft => 0, problems => 1, section => 1, recit => 1, login => 1);
+	my $showBestOnly = $setIsVersioned ? $c->param('show_best_only') : 0;
+
+	my @score_list;
+	my @user_set_list;
 
-	debug("begin main loop");
-	my @augmentedUserRecords = ();
+	for my $studentRecord (@{ $c->{student_records} }) {
+		next unless $ce->status_abbrev_has_behavior($studentRecord->status, 'include_in_stats');
 
-	foreach my $studentRecord (@studentRecords) {
 		my $studentName = $studentRecord->user_id;
-		next unless $ce->status_abbrev_has_behavior($studentRecord->status, "include_in_stats");
+		my ($allSetVersionNames, $notAssignedSet) =
+			list_set_versions($db, $studentName, $c->stash('setID'), $setIsVersioned);
 
-		my ($ra_allSetVersionNames, $notAssignedSet) = list_set_versions($db, $studentName, $setName, $setIsVersioned);
-		my @allSetVersionNames = @{$ra_allSetVersionNames};
+		next if $notAssignedSet;
 
-		# for versioned sets, we might be keeping only the high score
-		my $maxScore = -1;
-		my $max_hash = {};
+		my $max_version_data = {};
 
-		foreach my $setName (@allSetVersionNames) {
+		for my $setName (@$allSetVersionNames) {
 			my $set;
 			my $vNum = 0;
 
 			# For versioned tests we might be displaying the test date and test time.
 			my $dateOfTest = '';
 			my $testTime   = '';
+			my $timeLeft   = '';
 
 			if ($setIsVersioned) {
 				($setName, $vNum) = ($setName =~ /(.+),v(\d+)$/);
-				# we'll also need information from the set
-				# as we set up the display below, so get
-				# the merged userset as well
+				# Information from the set is needed to set up the display below. So get the merged user set as well.
 				$set        = $db->getMergedSetVersion($studentRecord->user_id, $setName, $vNum);
 				$dateOfTest = localtime($set->version_creation_time());
-				if (defined $set->version_last_attempt_time() && $set->version_last_attempt_time()) {
-					$testTime = ($set->version_last_attempt_time() - $set->open_date()) / 60;
-					my $timeLimit = $set->version_time_limit() / 60;
+				if ($set->version_last_attempt_time) {
+					$testTime = ($set->version_last_attempt_time - $set->open_date) / 60;
+					my $timeLimit = $set->version_time_limit / 60;
 					$testTime = $timeLimit if ($testTime > $timeLimit);
-					$testTime = sprintf("%3.1f min", $testTime);
-				} elsif (time() - $set->open_date() < $set->version_time_limit()) {
-					$testTime = $r->maketext('still open');
+					$testTime = $c->maketext("[quant,_1,minute]", sprintf('%3.1f', $testTime));
+					$timeLeft = 0;
+					if ($showColumns{timeleft} && time - $set->open_date < $set->version_time_limit) {
+						# Get a problem to determine how many submits have been made.
+						my @ProblemNums = $db->listUserProblems($studentRecord->user_id, $setName);
+						my $Problem =
+							$db->getMergedProblemVersion($studentRecord->user_id, $setName, $vNum, $ProblemNums[0]);
+						my $verSubmits = defined $Problem ? $Problem->num_correct + $Problem->num_incorrect : 0;
+						$timeLeft = sprintf('%3.1f', ($set->version_time_limit - time + $set->open_date) / 60)
+							if ($set->attempts_per_version == 0 || $verSubmits < $set->attempts_per_version);
+					}
+				} elsif (time - $set->open_date < $set->version_time_limit) {
+					$testTime = $c->maketext('still open');
+					$timeLeft = sprintf('%3.1f', ($set->version_time_limit - time + $set->open_date) / 60);
 				} else {
-					$testTime = $r->maketext('time limit exceeded');
+					$testTime = $c->maketext('time limit exceeded');
+					$timeLeft = 0;
 				}
+				$timeLeft = $c->maketext('[quant,_1,minute]', $timeLeft);
 			} else {
 				$set = $db->getMergedSet($studentName, $setName);
 			}
 
-			$set = $db->newUserSet(set_id => $setName) unless ref $set;
-
-			my $email = $studentRecord->email_address;
 			my ($score, $total, $problem_scores, $problem_incorrect_attempts) =
 				grade_set($db, $set, $studentName, $setIsVersioned, 1);
 			$score = wwRound(2, $score);
 
-			# Construct problems row
-			my $problemsRow = [
-				map {
-					CGI::span(
-						{
-							class => $problem_scores->[$_] eq '100' ? 'correct'
-							: $problem_scores->[$_] eq '&nbsp;.&nbsp;' ? 'unattempted'
-							:                                            ''
-						},
-						$problem_scores->[$_]
-						)
-						. CGI::br()
-						. ($problem_incorrect_attempts->[$_] // '&nbsp;')
-				} 0 .. $#$problem_scores
-			];
-
-			$problemsRow = ['&nbsp;'] if !@$problemsRow;
-
-			my $temp_hash = {
-				user_id       => $studentRecord->user_id,
-				last_name     => $studentRecord->last_name,
-				first_name    => $studentRecord->first_name,
-				version       => $vNum,
-				score         => $score,
-				total         => $total,
-				section       => $studentRecord->section,
-				recitation    => $studentRecord->recitation,
-				problemsRow   => $problemsRow,
-				email_address => $studentRecord->email_address,
-				date          => $dateOfTest,
-				testtime      => $testTime,
+			my $version_data = {
+				version                    => $vNum,
+				score                      => $score,
+				total                      => $total,
+				date                       => $dateOfTest,
+				testtime                   => $testTime,
+				timeleft                   => $timeLeft,
+				problem_scores             => $problem_scores,
+				problem_incorrect_attempts => $problem_incorrect_attempts
 			};
 
-			# keep track of best score
-			if ($score > $maxScore) {
-				$maxScore = $score;
-				$max_hash = {%$temp_hash};
-			}
-
-			# if we're showing all records, add it in to the list
-			if (!$showBestOnly) {
-				# add this data to the list of total scores (out of 100)
-				# add this data to the list of success indices.
-				push(@score_list,           ($temp_hash->{total}) ? $temp_hash->{score} / $temp_hash->{total} : 0);
-				push(@augmentedUserRecords, $temp_hash);
-			}
-
-		}    # this closes the loop through all set versions
-
-		# if we're showing only the best score, add the best score now
-		if ($showBestOnly) {
-			# If there's no %$max_hash, then we had no results.
-			# This occurs for proctors, for example.
-			if ($notAssignedSet) {
-				next;
-			} elsif (!%$max_hash) {
-				$max_hash = {
-					user_id       => $studentRecord->user_id(),
-					last_name     => $studentRecord->last_name(),
-					first_name    => $studentRecord->first_name(),
-					score         => 0,
-					total         => 'n/a',
-					section       => $studentRecord->section(),
-					recitation    => $studentRecord->recitation(),
-					problemsRow   => [$r->maketext('no attempt recorded')],
-					email_address => $studentRecord->email_address(),
-					date          => 'n/a',
-					testtime      => 'n/a',
-				};
+			if ($showBestOnly) {
+				# Keep track of the best score.
+				if (!%$max_version_data || $score > $max_version_data->{score}) {
+					$max_version_data = {%$version_data};
+				}
+			} else {
+				# Add the score to the list of scores, and add the data to the set data list.
+				push(@score_list,    $version_data->{total} ? $version_data->{score} / $version_data->{total} : 0);
+				push(@user_set_list, { record => $studentRecord, %$version_data });
 			}
+		}
 
+		if ($showBestOnly || !@$allSetVersionNames) {
+			# If only the best score is to be shown or there were no set versions and the set was assigned to the user,
+			# then add the score to the list of scores and add the data to the set data list.
 			push(@score_list,
-				($max_hash->{total} && $max_hash->{total} ne 'n/a') ? $max_hash->{score} / $max_hash->{total} : 0);
-			push(@augmentedUserRecords, $max_hash);
-		# if there were no set versions and the set was assigned
-		# to the user, also keep the data
-		} elsif (!@allSetVersionNames && !$notAssignedSet) {
-			my $dataH = {
-				user_id       => $studentRecord->user_id(),
-				last_name     => $studentRecord->last_name(),
-				first_name    => $studentRecord->first_name(),
-				score         => 0,
-				total         => 'n/a',
-				section       => $studentRecord->section(),
-				recitation    => $studentRecord->recitation(),
-				problemsRow   => ['&nbsp;'],
-				email_address => $studentRecord->email_address(),
-				date          => 'n/a',
-				testtime      => 'n/a',
-			};
-			push(@score_list,           0);
-			push(@augmentedUserRecords, $dataH);
-		}
-	} # this closes the loop through all student records
-	debug("end mainloop");
-
-	@augmentedUserRecords = sort {
-		&$sort_method($a, $b, $primary_sort_method_name)
-			|| &$sort_method($a, $b, $secondary_sort_method_name)
-			|| &$sort_method($a, $b, $ternary_sort_method_name)
-			|| lc($a->{last_name}) cmp lc($b->{last_name})
-			|| lc($a->{first_name}) cmp lc($b->{first_name})
-			|| lc($a->{user_id}) cmp lc($b->{user_id})
-	} @augmentedUserRecords;
-
-	# construct header
-	my @list_problems = map { $_->[1] } $db->listGlobalProblemsWhere({ set_id => $setName }, 'problem_id');
-	@list_problems    = ($r->maketext('None')) unless (@list_problems);
-	my $maxProblem    = scalar @list_problems;
-
-	# for a jitar set we only get the top level problems
-	if ($GlobalSet->assignment_type eq 'jitar') {
-		my @topLevelProblems;
-		foreach my $id (@list_problems) {
-			my @seq = jitar_id_to_seq($id);
-			push @topLevelProblems, $seq[0] if ($#seq == 0);
+				%$max_version_data
+					&& $max_version_data->{total} ? $max_version_data->{score} / $max_version_data->{total} : 0);
+
+			push(
+				@user_set_list,
+				{
+					record             => $studentRecord,
+					score              => 0,
+					total              => -1,
+					date               => '',
+					testtime           => '',
+					timeleft           => '',
+					problem_scores     => [],
+					incorrect_attempts => [],
+					%$max_version_data
+				}
+			);
 		}
-		@list_problems = @topLevelProblems;
 	}
 
-	# Changes for gateways/versioned sets here.  In this case we allow instructors
-	# to modify the appearance of output, which we do with a form.  So paste in the
-	# form header here, and make appropriate modifications.
-	if ($setIsVersioned) {
-		print CGI::start_div({ class => 'card bg-light mb-3' });
-		print CGI::start_form({
-			method => 'post',
-			id     => 'sp-gateway-form',
-			action => $self->systemLink($urlpath, authen => 0),
-			name   => 'StudentProgress'
-		});
-		print $self->hidden_authen_fields();
-		print CGI::div(
-			{ class => 'card-body' },
-			CGI::h5({ class => 'card-title' }, $r->maketext("Display options: Show")),
-			CGI::div(
-				{ 'class' => 'mb-2' },
-				CGI::hidden({ name => 'returning', value => '1' }),
-				CGI::div(
-					{ class => 'form-check form-check-inline' },
-					CGI::checkbox({
-						name            => 'show_best_only',
-						value           => '1',
-						checked         => $showBestOnly,
-						label           => $r->maketext('only best scores'),
-						class           => 'form-check-input',
-						labelattributes => { class => 'form-check-label' }
-					})
-				),
-				CGI::div(
-					{ class => 'form-check form-check-inline' },
-					CGI::checkbox({
-						name            => 'show_date',
-						value           => '1',
-						checked         => $showColumns{'date'},
-						label           => $r->maketext('test date'),
-						class           => 'form-check-input',
-						labelattributes => { class => 'form-check-label' }
-					})
-				),
-				CGI::div(
-					{ class => 'form-check form-check-inline' },
-					CGI::checkbox({
-						name            => 'show_testtime',
-						value           => '1',
-						checked         => $showColumns{'testtime'},
-						label           => $r->maketext('test time'),
-						class           => 'form-check-input',
-						labelattributes => { class => 'form-check-label' }
-					})
-				),
-				CGI::div(
-					{ class => 'form-check form-check-inline' },
-					CGI::checkbox({
-						name            => 'show_problems',
-						value           => '1',
-						checked         => $showColumns{'problems'},
-						label           => $r->maketext('problems'),
-						class           => 'form-check-input',
-						labelattributes => { class => 'form-check-label' }
-					})
-				),
-				CGI::div(
-					{ class => 'form-check form-check-inline' },
-					CGI::checkbox({
-						name            => 'show_section',
-						value           => '1',
-						checked         => $showColumns{'section'},
-						label           => $r->maketext('section #'),
-						class           => 'form-check-input',
-						labelattributes => { class => 'form-check-label' }
-					})
-				),
-				CGI::div(
-					{ class => 'form-check form-check-inline' },
-					CGI::checkbox({
-						name            => 'show_recitation',
-						value           => '1',
-						checked         => $showColumns{'recit'},
-						label           => $r->maketext('recitation #'),
-						class           => 'form-check-input',
-						labelattributes => { class => 'form-check-label' }
-					})
-				),
-				CGI::div(
-					{ class => 'form-check form-check-inline' },
-					CGI::checkbox({
-						name            => 'show_login',
-						value           => '1',
-						checked         => $showColumns{'login'},
-						label           => $r->maketext('login'),
-						class           => 'form-check-input',
-						labelattributes => { class => 'form-check-label' }
-					})
-				)
-			),
-			CGI::submit({ value => $r->maketext('Update Display'), class => 'btn btn-primary' })
-		);
-		print CGI::end_form();
-		print CGI::end_div();
-	}
+	my $primary_sort_method   = $c->param('primary_sort');
+	my $secondary_sort_method = $c->param('secondary_sort');
+	my $ternary_sort_method   = $c->param('ternary_sort');
 
-	# Table description. Only show the problem description if the problems column is shown.
-	print CGI::start_div();
-	if (!$setIsVersioned || $showColumns{'problems'}) {
-		print CGI::p($r->maketext(
-			'A period (.) indicates a problem has not been attempted, and a number from 0 to 100 '
-				. 'indicates the grade earned. The number on the second line gives the number of incorrect attempts.'
-		));
-	}
-	if ($setIsVersioned) {
-		print CGI::p($r->maketext(
-			'Click a student\'s name to see the student\'s test summary page. '
-				. 'Click a test\'s version number to see the corresponding test version. '
-				. 'Click a heading to sort the table.'
-		));
-	} else {
-		print CGI::p($r->maketext(
-			'Click a student\'s name to see the student\'s homework set. ' . 'Click a heading to sort the table.'
-		));
-	}
-	if (defined $primary_sort_method_name) {
-		print CGI::p(
-			$r->maketext('Entries are sorted by [_1]', $display_sort_method_name{$primary_sort_method_name})
-				. (
-				defined $secondary_sort_method_name
-				? $r->maketext(', then by [_1]', $display_sort_method_name{$secondary_sort_method_name})
-				: ''
-				)
-				. (
-				defined $ternary_sort_method_name
-				? $r->maketext(', then by [_1]', $display_sort_method_name{$ternary_sort_method_name})
-				: ''
-				)
-				. '.'
-		);
-	}
-	print CGI::end_div();
-
-	# calculate secondary and ternary sort methods parameters if appropriate
-	my %past_sort_methods = ();
-	%past_sort_methods = (secondary_sort => "$primary_sort_method_name",) if defined($primary_sort_method_name);
-	%past_sort_methods = (%past_sort_methods, ternary_sort => "$secondary_sort_method_name",)
-		if defined($secondary_sort_method_name);
-	my %params = (%past_sort_methods);
-
-	# we need to preserve display options when the sort headers are clicked on gateway quizzes
-	if ($setIsVersioned) {
-		my %display_options = (
-			returning       => 1,
-			show_best_only  => $showBestOnly,
-			show_date       => $showColumns{date},
-			show_testtime   => $showColumns{testtime},
-			show_problems   => $showColumns{problems},
-			show_section    => $showColumns{section},
-			show_recitation => $showColumns{recit},
-			show_login      => $showColumns{login},
-		);
-		%params = (%past_sort_methods, %display_options);
-	}
-
-	# To deal with the variable number of columns and the problems columns
-	# split the headers into two pieces.
-	# @columnHeaders1 are the columns before the problem columns.
-	# @columnHeaders2 are the columns after the problem columns.
-	my @columnHeaders1 = (
-		$r->maketext('Name')
-			. CGI::br()
-			. CGI::a(
-				{
-					href => $self->systemLink(
-						$setStatsPage, params => { primary_sort => 'first_name', %params }
-					)
-				},
-				$r->maketext('First')
-			)
-			. '&nbsp;&nbsp;&nbsp;'
-			. CGI::a(
-				{
-					href => $self->systemLink(
-						$setStatsPage, params => { primary_sort => 'last_name', %params }
-					)
-				},
-				$r->maketext('Last')
-			)
-			. CGI::br()
-			. CGI::a(
-				{
-					href => $self->systemLink(
-						$setStatsPage, params => { primary_sort => 'email_address', %params }
-					)
-				},
-				$r->maketext('Email')
-			),
-		CGI::a(
-			{
-				href => $self->systemLink(
-					$setStatsPage, params => { primary_sort => 'score', %params }
-				)
-			},
-			$r->maketext('Score')
-		),
-		$r->maketext('Out Of'),
-	);
-	my @columnHeaders2 = ();
-
-	# Additional columns that may or may not be shown depending on if
-	# showing a gateway quiz and any user configuration.
-	push(@columnHeaders1, $r->maketext('Date'))      if ($setIsVersioned && $showColumns{'date'});
-	push(@columnHeaders1, $r->maketext('Test Time')) if ($setIsVersioned && $showColumns{'testtime'});
-	push(
-		@columnHeaders2,
-		CGI::a(
-			{
-				href => $self->systemLink(
-					$setStatsPage, params => { primary_sort => 'section', %params }
-				)
-			},
-			$r->maketext('Section')
-		)
-	) if (!$setIsVersioned || $showColumns{'section'});
-	push(
-		@columnHeaders2,
-		CGI::a(
-			{
-				href => $self->systemLink(
-					$setStatsPage, params => { primary_sort => 'recitation', %params }
-				)
-			},
-			$r->maketext('Recitation')
-		)
-	) if (!$setIsVersioned || $showColumns{'recit'});
-	push(
-		@columnHeaders2,
-		CGI::a(
-			{
-				href => $self->systemLink(
-					$setStatsPage, params => { primary_sort => 'user_id', %params }
-				)
-			},
-			$r->maketext('Login Name')
-		)
-	) if (!$setIsVersioned || $showColumns{'login'});
-
-	# Start table output
-	print CGI::start_div({ class => 'table-responsive' }),
-		CGI::start_table({ class => 'grade-table table table-bordered table-sm font-xs' });
-
-	if (!@columnHeaders2 && $showColumns{'problems'}) {
-		print CGI::thead(
-			CGI::Tr(
-				CGI::th({ rowspan => 2 },           [@columnHeaders1]),
-				CGI::th({ colspan => $maxProblem }, $r->maketext('Problems'))
-			),
-			CGI::Tr(CGI::th({ class => 'problem-data' }, [@list_problems]))
-		);
-	} elsif ($showColumns{'problems'}) {
-		print CGI::thead(
-			CGI::Tr(
-				CGI::th({ rowspan => 2 },           [@columnHeaders1]),
-				CGI::th({ colspan => $maxProblem }, $r->maketext('Problems')),
-				CGI::th({ rowspan => 2 },           [@columnHeaders2])
-			),
-			CGI::Tr(CGI::th({ class => 'problem-data' }, [@list_problems]))
-		);
-	} else {
-		print CGI::thead(CGI::Tr(CGI::th([ @columnHeaders1, @columnHeaders2 ])));
-	}
-	print CGI::start_tbody();
-
-	# variables to keep track of versioned sets
-	my $prevUserID = '';
-
-	# and to make formatting nice for students who haven't taken any tests
-	# (the total number of columns is two more than this; we want the
-	# number that missing record information should span)
-	my $numCol = 1;
-	$numCol++ if $showColumns{'date'};
-	$numCol++ if $showColumns{'testtime'};
-	$numCol += $maxProblem if $showColumns{'problems'};
-
-	# Loop that prints the table rows
-	foreach my $rec (@augmentedUserRecords) {
-		my $fullName = join("", $rec->{first_name}, " ", $rec->{last_name});
-		my $email    = $rec->{email_address};
-
-		if (!$setIsVersioned) {
-			my $problemSetPage = $urlpath->newFromModule(
-				'WeBWorK::ContentGenerator::ProblemSet', $r,
-				courseID => $courseName,
-				setID    => $setName
-			);
-			my $interactiveURL = $self->systemLink($problemSetPage, params => { effectiveUser => $rec->{user_id} });
-			print CGI::Tr(
-				CGI::td(
-					CGI::div(CGI::a({ href => $interactiveURL }, $fullName)),
-					$email ? CGI::div(CGI::a({ href => "mailto:$email" }, $email)) : ''
-				),
-				CGI::td($rec->{score}),
-				CGI::td($rec->{total}),
-				CGI::td({ class => 'problem-data' }, $rec->{problemsRow}),
-				CGI::td($self->nbsp($rec->{section})),
-				CGI::td($self->nbsp($rec->{recitation})),
-				CGI::td($rec->{user_id})
-			);
-		} else {
-			my $problemSetPage = $urlpath->newFromModule(
-				'WeBWorK::ContentGenerator::ProblemSet', $r,
-				courseID => $courseName,
-				setID    => $setName
-			);
-			my $interactiveURL = $self->systemLink($problemSetPage, params => { effectiveUser => $rec->{user_id} });
-
-			# if total is 'n/a', then it's a user who hasn't taken
-			# any tests, which we treat separately
-			if ($rec->{total} ne 'n/a') {
-				# make make versioned sets' name format nicer and link to appropriate test version
-				my $nameEntry   = '';
-				my $versionPage = $urlpath->newFromModule(
-					'WeBWorK::ContentGenerator::GatewayQuiz', $r,
-					courseID => $courseName,
-					setID    => $setName . ',v' . $rec->{version}
-				);
-				my $versionLink = CGI::a(
-					{
-						href => $self->systemLink(
-							$versionPage, params => { effectiveUser => $rec->{user_id} }
-						)
-					},
-					"version $rec->{version}"
-				);
-				if ($rec->{user_id} eq $prevUserID) {
-					$nameEntry = CGI::div({ class => 'ms-4' }, "($versionLink)");
-				} else {
-					$nameEntry =
-						CGI::a({ href => $interactiveURL }, $fullName)
-						. ($setIsVersioned && !$showBestOnly ? " ($versionLink)" : ' ')
-						. CGI::br()
-						. CGI::a({ href => "mailto:$email" }, $email);
-					$prevUserID = $rec->{user_id};
-				}
+	my $sort_method = sub {
+		my ($m, $n, $sort_method_name) = @_;
+		return 0 unless defined($sort_method_name);
+		return lc($m->{record}{last_name}) cmp lc($n->{record}{last_name})   if $sort_method_name eq 'last_name';
+		return lc($m->{record}{first_name}) cmp lc($n->{record}{first_name}) if $sort_method_name eq 'first_name';
+		return lc($m->{record}{email_address}) cmp lc($n->{record}{email_address})
+			if $sort_method_name eq 'email_address';
+		return $n->{score} <=> $m->{score}                                   if $sort_method_name eq 'score';
+		return lc($m->{record}{section}) cmp lc($n->{record}{section})       if $sort_method_name eq 'section';
+		return lc($m->{record}{recitation}) cmp lc($n->{record}{recitation}) if $sort_method_name eq 'recitation';
+		return lc($m->{record}{user_id}) cmp lc($n->{record}{user_id})       if $sort_method_name eq 'user_id';
+	};
 
-				# build columns to show
-				my @cols;
-				push(@cols, CGI::td($nameEntry), CGI::td($rec->{score}), CGI::td($rec->{total}));
-				push(@cols, CGI::td($self->nbsp($rec->{date})))     if ($showColumns{'date'});
-				push(@cols, CGI::td($self->nbsp($rec->{testtime}))) if ($showColumns{'testtime'});
-				push(@cols, CGI::td({ class => 'problem-data' }, $rec->{problemsRow}))
-					if ($showColumns{'problems'});
-				push(@cols, CGI::td($self->nbsp($rec->{section})))    if ($showColumns{'section'});
-				push(@cols, CGI::td($self->nbsp($rec->{recitation}))) if ($showColumns{'recit'});
-				push(@cols, CGI::td($rec->{user_id}))                 if ($showColumns{'login'});
-				print CGI::Tr(@cols);
-			} else {
-				my @cols = (
-					CGI::td(
-						CGI::a({ href => $interactiveURL }, $fullName)
-							. CGI::br()
-							. CGI::a({ href => "mailto:$email" }, $email)
-					),
-					CGI::td($rec->{score}),
-					CGI::td({ colspan => $numCol }, CGI::em($self->nbsp($r->maketext('No tests taken.'))))
-				);
-				push(@cols, CGI::td($self->nbsp($rec->{section})))    if ($showColumns{'section'});
-				push(@cols, CGI::td($self->nbsp($rec->{recitation}))) if ($showColumns{'recit'});
-				push(@cols, CGI::td($self->nbsp($rec->{user_id})))    if ($showColumns{'login'});
-				print CGI::Tr(@cols);
-			}
+	@user_set_list = sort {
+		$sort_method->($a, $b, $primary_sort_method)
+			|| $sort_method->($a, $b, $secondary_sort_method)
+			|| $sort_method->($a, $b, $ternary_sort_method)
+			|| lc($a->{record}{last_name}) cmp lc($b->{record}{last_name})
+			|| lc($a->{record}{first_name}) cmp lc($b->{record}{first_name})
+			|| lc($a->{record}{user_id}) cmp lc($b->{record}{user_id})
+	} @user_set_list;
+
+	# Construct header
+	my @problems = map { $_->[1] } $db->listGlobalProblemsWhere({ set_id => $c->stash('setID') }, 'problem_id');
+	@problems = ($c->maketext('None')) unless @problems;
+
+	# For a jitar set we only get the top level problems
+	if ($c->{setRecord}->assignment_type eq 'jitar') {
+		my @topLevelProblems;
+		for my $id (@problems) {
+			my @seq = jitar_id_to_seq($id);
+			push @topLevelProblems, $seq[0] if $#seq == 0;
 		}
+		@problems = @topLevelProblems;
 	}
 
-	print CGI::end_tbody(), CGI::end_table(), CGI::end_div();
-
-	return '';
+	my $numCols = 1;
+	$numCols++                    if $showColumns{date};
+	$numCols++                    if $showColumns{testtime};
+	$numCols++                    if $showColumns{timeleft};
+	$numCols += scalar(@problems) if $showColumns{problems};
+
+	return $c->include(
+		'ContentGenerator/Instructor/StudentProgress/set_progress',
+		setIsVersioned        => $setIsVersioned,
+		showColumns           => \%showColumns,
+		showBestOnly          => $showBestOnly,
+		numCols               => $numCols,
+		primary_sort_method   => $primary_sort_method,
+		secondary_sort_method => $secondary_sort_method,
+		ternary_sort_method   => $ternary_sort_method,
+		problems              => \@problems,
+		user_set_list         => \@user_set_list
+	);
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm b/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm
index e9598238c7..5e6d00a902 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Instructor::UserDetail;
-use base qw(WeBWorK::ContentGenerator::Instructor);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -22,519 +22,206 @@ WeBWorK::ContentGenerator::Instructor::UserDetail - Detailed User specific infor
 
 =cut
 
-use strict;
-use warnings;
-#use CGI qw(-nosticky );
-use WeBWorK::CGI;
-use WeBWorK::Utils qw(sortByName x getAssetURL format_set_name_display);
+use WeBWorK::Utils qw(x);
+use WeBWorK::Utils::Instructor qw(assignSetToUser);
 use WeBWorK::Debug;
 
 # We use the x function to mark strings for localizaton
-use constant DATE_FIELDS => {   open_date    => x("Open:"),
-                                reduced_scoring_date => x("Reduced:"),
-	                            due_date     => x("Closes:"),
-	                            answer_date  => x("Answer:")
+use constant DATE_FIELDS => {
+	open_date            => x('Open:'),
+	reduced_scoring_date => x('Reduced:'),
+	due_date             => x('Closes:'),
+	answer_date          => x('Answer:')
 };
-use constant DATE_FIELDS_ORDER =>[qw(open_date reduced_scoring_date due_date answer_date )];
-sub initialize {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $urlpath = $r->urlpath;
-	my $db = $r->db;
-	my $authz = $r->authz;
-	my $userID = $r->param("user");
-	my $editForUserID = $urlpath->arg("userID");
-
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' },
-		"You are not authorized to edit user specific information.")
-		unless $authz->hasPermissions($userID, "access_instructor_tools");
+use constant DATE_FIELDS_ORDER => [qw(open_date reduced_scoring_date due_date answer_date )];
 
-	# Get the list of sets and the global set records and cache them for later use.  This list is sorted by set_id.
-	$self->{setRecords} = [ $db->getGlobalSetsWhere({}, 'set_id') ];
+sub initialize ($c) {
+	my $db = $c->db;
 
-	# first check to see if a save form has been submitted
-	return '' unless ($r->param('save_button') ||
-			  $r->param('assignAll'));
+	# Make these available in the templates.
+	$c->stash->{fields}      = DATE_FIELDS_ORDER();
+	$c->stash->{fieldLabels} = DATE_FIELDS();
 
-	# As it stands we need to check each set to see if it is still assigned
-	# the forms are not currently set up to simply transmit changes
+	return unless $c->authz->hasPermissions($c->param('user'), 'access_instructor_tools');
 
-	my @assignedSets = ();
-	foreach my $set (@{ $self->{setRecords} }) {
-	    # add sets to the assigned list if the parameter is checked or the
-	    # assign all button is pushed.  (already assigned sets will be
-	    # skipped later)
-		my $setID = $set->set_id;
-	    push @assignedSets, $setID if defined($r->param("set.$setID.assignment"));
-	}
+	my $editForUserID = $c->stash('userID');
 
-	# note: assignedSets are those sets that are assigned in the submitted form
-	debug("assignedSets", join(" ", @assignedSets));
-
-	my %selectedSets = map { $_ => 1 } @assignedSets;
-
-	#debug ##########################
-		#print STDERR ("aSsigned sets", join(" ",@assignedSets));
-        #my @params = $r->param();
-        #print STDERR " parameters ", join(" ", @params);
-    ###############
-
-	#Get the user(s) whose records are to be modified
-	#  for now: $editForUserID
-	# check the user exists?  Is this necessary?
-	my $editUserRecord = $db->getUser($editForUserID);
-	die "record not found for $editForUserID.\n" unless $editUserRecord;
-
-	# Perform the desired assignments or deletions
-	my %userSets = map { $_ => 1 } $db->listUserSets($editForUserID);
-
-	# Go through each possible set
-	debug(" parameters ", join(" ", $r->param()) );
-	for my $setRecord (@{ $self->{setRecords} }) {
-		my $setID = $setRecord->set_id;
-		# Does the user want this set to be assigned to the selected user?
-		if (exists $selectedSets{$setID}) {
-			# Assign the set if it isn't assigned already.
-			$self->assignSetToUser($editForUserID, $setRecord) if (!$userSets{$setID});
-
-			# Override dates
-			my $userSetRecord = $db->getUserSet($editForUserID, $setID);
-
-			# Check to see if new dates meet criteria
-			my $rh_dates = $self->checkDates($setRecord, $setID);
-			unless ($rh_dates->{error}) {
-				# If no error update database
-				for my $field (keys %{ DATE_FIELDS() }) {
-					if (defined $r->param("set.$setID.$field.override")) {
-						$userSetRecord->$field($rh_dates->{$field});
-					} else {
-						$userSetRecord->$field(undef);    #stop override
+	# Get the user whose records are to be modified.
+	$c->{userRecord} = $db->getUser($editForUserID);
+	return unless $c->{userRecord};
+
+	# Get the list of sets and the global set records and cache them for later use.  This list is sorted by set_id.
+	$c->{setRecords} = [ $db->getGlobalSetsWhere({}, 'set_id') ];
+
+	# Check to see if a save form has been submitted
+	if ($c->param('save_button') || $c->param('assignAll')) {
+		# Check each set to see if it is still assigned.
+		my @assignedSets;
+		for my $set (@{ $c->{setRecords} }) {
+			# Add sets to the assigned list if the parameter is checked or the assign all button is pushed.  (Already
+			# assigned sets will be skipped later.)
+			my $setID = $set->set_id;
+			push @assignedSets, $setID if defined $c->param("set.$setID.assignment");
+		}
+
+		# note: assignedSets are those sets that are assigned in the submitted form
+		debug('assignedSets', join(' ', @assignedSets));
+
+		my %selectedSets = map { $_ => 1 } @assignedSets;
+
+		# Perform the desired assignments or deletions
+		my %userSets = map { $_ => 1 } $db->listUserSets($editForUserID);
+
+		# Go through each possible set
+		debug(' parameters ', join(' ', $c->param()));
+		for my $setRecord (@{ $c->{setRecords} }) {
+			my $setID = $setRecord->set_id;
+			# Does the user want this set to be assigned to the selected user?
+			if (exists $selectedSets{$setID}) {
+				# Assign the set if it isn't assigned already.
+				assignSetToUser($db, $editForUserID, $setRecord) if (!$userSets{$setID});
+
+				# Override dates
+				my $userSetRecord = $db->getUserSet($editForUserID, $setID);
+
+				# Check to see if new dates meet criteria
+				my $rh_dates = $c->checkDates($setRecord, $setID);
+				unless ($rh_dates->{error}) {
+					# If no error update database
+					for my $field (@{ DATE_FIELDS_ORDER() }) {
+						if (defined $c->param("set.$setID.$field.override")) {
+							$userSetRecord->$field($rh_dates->{$field});
+						} else {
+							$userSetRecord->$field(undef);    #stop override
+						}
 					}
+					$db->putUserSet($userSetRecord);
 				}
-				$db->putUserSet($userSetRecord);
-			}
 
-			# If the set is a gateway set, also check to see if we're resetting the dates for any of the assigned set
-			# versions, or if a version is to be deleted.
-			if ($setRecord->assignment_type =~ /gateway/) {
-				my @setVer =
-					$db->getSetVersionsWhere({ user_id => $editForUserID, set_id => { like => "$setID,v\%" } });
-				for my $setVersionRecord (@setVer) {
-					my $ver = $setVersionRecord->version_id;
-					my $action = $r->param("set.$setID,v$ver.assignment");
-					if (defined $action) {
-						if ($action eq 'assigned') {
-							# This version is not to be deleted.
-							# Check to see if we're resetting the dates for this version.
-							my $rh_dates = $self->checkDates($setVersionRecord, "$setID,v$ver");
-							unless ($rh_dates->{error}) {
-								for my $field (keys %{ DATE_FIELDS() }) {
-									if (defined($r->param("set.$setID,v$ver.$field.override"))) {
-										$setVersionRecord->$field($rh_dates->{$field});
-									} else {
-										$setVersionRecord->$field(undef);
+				# If the set is a gateway set, also check to see if we're resetting the dates for any of the assigned
+				# set versions, or if a version is to be deleted.
+				if ($setRecord->assignment_type =~ /gateway/) {
+					my @setVer =
+						$db->getSetVersionsWhere({ user_id => $editForUserID, set_id => { like => "$setID,v\%" } });
+					for my $setVersionRecord (@setVer) {
+						my $ver    = $setVersionRecord->version_id;
+						my $action = $c->param("set.$setID,v$ver.assignment");
+						if (defined $action) {
+							if ($action eq 'assigned') {
+								# This version is not to be deleted.
+								# Check to see if we're resetting the dates for this version.
+								my $rh_dates = $c->checkDates($setVersionRecord, "$setID,v$ver");
+								unless ($rh_dates->{error}) {
+									for my $field (@{ DATE_FIELDS_ORDER() }) {
+										if (defined($c->param("set.$setID,v$ver.$field.override"))) {
+											$setVersionRecord->$field($rh_dates->{$field});
+										} else {
+											$setVersionRecord->$field(undef);
+										}
 									}
+									$db->putSetVersion($setVersionRecord);
 								}
-								$db->putSetVersion($setVersionRecord);
+							} elsif ($action eq 'delete') {
+								# Delete this version.
+								$db->deleteSetVersion($editForUserID, $setID, $ver);
 							}
-						} elsif ($action eq 'delete') {
-							# Delete this version.
-							$db->deleteSetVersion($editForUserID, $setID, $ver);
 						}
 					}
 				}
+			} else {
+				# The user asked to NOT have the set assigned to the selected user.
+				# Delete the set if set was previously assigned.
+				$db->deleteUserSet($editForUserID, $setID) if ($userSets{$setID});
 			}
-		} else {
-			# The user asked to NOT have the set assigned to the selected user.
-			# Delete the set if set was previously assigned.
-			$db->deleteUserSet($editForUserID, $setID) if ($userSets{$setID});
 		}
 	}
 
-	return '';
-}
-
-sub body {
-	my ($self)        = @_;
-	my $r             = $self->r;
-	my $urlpath       = $r->urlpath;
-	my $db            = $r->db;
-	my $ce            = $r->ce;
-	my $authz         = $r->authz;
-	my $courseID      = $urlpath->arg("courseID");
-	my $editForUserID = $urlpath->arg("userID");
-	my $userID        = $r->param("user");
+	# Get the rest of the information from the database that is needed for this user.
+	# This must be done after saving so that the updated data is obtained.
 
-	my @editForSets = $r->param("editForSets");
+	# Create a hash of set ids to set records, and a hash of set ids to merged set records for this user.
+	$c->{userSetRecords} =
+		{ map { $_->set_id => $_ }
+			$db->getUserSetsWhere({ user_id => $editForUserID, set_id => { not_like => '%,v%' } }) };
+	$c->{mergedSetRecords} = { map { $_->set_id => $_ } $db->getMergedSetsWhere({ user_id => $editForUserID }) };
 
-	return CGI::div({ class => 'alert alert-danger p-1' }, "You are not authorized to edit user specific information.")
-		unless $authz->hasPermissions($userID, "access_instructor_tools");
-
-	my $UserRecord       = $db->getUser($editForUserID);
-
-	my $userName = $UserRecord->first_name . " " . $UserRecord->last_name;
-
-	# create a message about how many sets have been assigned to this user
-	my $setCount = $db->countUserSets($editForUserID);
-	my $basicInfoPage = $urlpath->new(
-		type => 'instructor_user_list',
-		args => {
-			courseID => $courseID,
-		}
-	);
-	my $basicInfoUrl = $self->systemLink(
-		$basicInfoPage,
-		params => {
-			visible_users => $editForUserID,
-			editMode      => 1,
-		}
-	);
-
-	print CGI::div(
-		{ class => 'text-center my-3' },
-		CGI::h2(
-			{ class => 'fs-6' },
-			$r->maketext(
-				"Edit [_1] for  [_2] ([_3]) who has been assigned [_4] sets.",
-				CGI::a({ href => $basicInfoUrl }, $r->maketext('class list data')),
-				$userName, $editForUserID, $setCount
-			)
-		)
-	);
-
-	my $userDetailPage = $urlpath->new(
-		type => 'instructor_user_detail',
-		args => {
-			courseID => $courseID,
-			userID   => $editForUserID,    #FIXME eventually this should be a list??
-		}
-	);
-	my $userDetailUrl = $self->systemLink($userDetailPage, authen => 0);
-
-	########################################
-	# Assigned sets form
-	########################################
-
-	print CGI::start_form({ method => 'post', action => $userDetailUrl, name => 'UserDetail', id => 'UserDetail' });
-	print $self->hidden_authen_fields();
-
-	print CGI::div(
-		{ class => 'mb-2' },
-		CGI::submit({
-			name  => 'assignAll',
-			value => $r->maketext('Assign All Sets to Current User'),
-			class => 'btn btn-primary'
-		})
-	);
-
-	# Print warning
-	print CGI::div(
-		{ class => 'alert alert-danger p-1 mb-2' },
-		CGI::div({ class => 'mb-1' }, $r->maketext('Do not uncheck a set unless you know what you are doing.')),
-		CGI::div($r->maketext('There is NO undo for unassigning a set.'))
-	);
-	print CGI::div(
-		{ class => 'fs-6 mb-2' },
-		$r->maketext(
-			'To change status (scores or grades) for this student for one set, click on the individual set link.')
-	);
-	print CGI::div(
-		{ class => 'alert alert-danger p-1 fs-6 mb-2' },
-		$r->maketext(
-			'When you uncheck a homework set (and save the changes), you destroy all of the data for that set for '
-				. 'this student.   If you reassign the set, the student will receive a new version of each problem. '
-				. 'Make sure this is what you want to do before unchecking sets.'
-		)
-	);
-
-	print CGI::div(
-		{ class => 'mb-2' },
-		CGI::submit({
-			name  => 'save_button',
-			label => $r->maketext('Save changes'),
-			class => 'btn btn-primary'
-		})
-	);
-
-	print CGI::start_div({ class => 'table-responsive' });
-	print CGI::start_table({ class => 'table table-bordered table-sm font-sm align-middle' });
-	print CGI::Tr(CGI::th({ class => 'text-center', colspan => 3 }, "Sets assigned to $userName ($editForUserID)"));
-	print CGI::Tr(CGI::th({ class => 'text-center' }, [ 'Assigned', "Edit set for $editForUserID", 'Dates', ]));
-
-	my %UserSetRecords =
-		map { $_->set_id => $_ } $db->getUserSetsWhere({ user_id => $editForUserID, set_id => { not_like => '%,v%' } });
-	my %MergedSetRecords = map { $_->set_id => $_ } $db->getMergedSetsWhere({ user_id => $editForUserID });
-
-	for my $set (@{ $self->{setRecords} }) {
+	# Get all versions and merged versions for gateway sets.
+	for my $set (@{ $c->{setRecords} }) {
+		next unless $set->assignment_type =~ /gateway/;
 		my $setID = $set->set_id;
 
-		$self->outputSetRow($set, $UserSetRecords{$setID}, $MergedSetRecords{$setID});
-
-		if ($set->assignment_type =~ /gateway/) {
-			my @setVersions =
-				$db->getSetVersionsWhere({ user_id => $editForUserID, set_id => { like => "$setID,v\%" } },
-					'version_id');
-			my @mergedVersions =
-				$db->getMergedSetVersionsWhere({ user_id => $editForUserID, set_id => { like => "$setID,v\%" } },
-					\"(SUBSTRING(set_id,INSTR(set_id,',v')+2)+0)");
-			$self->outputSetRow($set, $setVersions[$_], $mergedVersions[$_], $setVersions[$_]->version_id)
-				for (0 .. $#setVersions);
-		}
+		$c->{setVersions}{$setID} = [
+			$db->getSetVersionsWhere(
+				{ user_id => $editForUserID, set_id => { like => "$setID,v\%" } }, 'version_id'
+			)
+		];
+		$c->{mergedVersions}{$setID} = [
+			$db->getMergedSetVersionsWhere(
+				{ user_id => $editForUserID, set_id => { like => "$setID,v\%" } },
+				\q{(SUBSTRING(set_id,INSTR(set_id,',v')+2)+0)}
+			)
+		];
 	}
 
-	print CGI::end_table(), CGI::end_div();
-
-	print CGI::submit({
-		name  => 'save_button',
-		label => $r->maketext('Save changes'),
-		class => 'btn btn-primary'
-	});
-
-	print CGI::end_form();
-
-	# Print warning
-	print CGI::div(
-		{ class => 'alert alert-danger p-1 mt-3' },
-		'There is NO undo for this function. '
-			. 'Do not use it unless you know what you are doing!  When you unassign '
-			. 'sets by unchecking set names and clicking save, you destroy all '
-			. 'of the data for those sets for this student.'
-	);
-
-	return '';
+	return;
 }
 
-sub outputSetRow {
-	my ($self, $set, $userSet, $mergedSet, $version) = @_;
-
-	my $urlpath       = $self->r->urlpath;
-	my $courseID      = $urlpath->arg('courseID');
-	my $editForUserID = $urlpath->arg('userID');
-	my $setID         = $set->set_id;
-
-	my $dateFields      = DATE_FIELDS_ORDER();
-	my $dateFieldLabels = DATE_FIELDS();
-
-	print CGI::Tr(CGI::td(
-		{ class => 'text-center' },
-		[
-			CGI::checkbox({
-				name            => $version ? "set.$setID,v$version.assignment" : "set.$setID.assignment",
-				label           => '',
-				value           => 'assigned',
-				checked         => defined $mergedSet,
-				class           => 'form-check-input',
-				labelattributes => { class => 'form-check-label' }
-			}),
-			defined $mergedSet
-			? CGI::b({ dir => 'ltr' }, CGI::a(
-				{
-					href => $self->systemLink(
-						$urlpath->new(
-							type => 'instructor_set_detail',
-							args => {
-								courseID => $courseID,
-								setID    => $setID . ($version ? ",v$version" : '')
-							}
-						),
-						params => {
-							effectiveUser => $editForUserID,
-							editForUser   => $editForUserID,
-						}
-					)
-				},
-				format_set_name_display($version ? "$setID (version $version)" : $setID)
-			))
-				. ($version ? CGI::hidden({ name => "set.$setID,v$version.assignment", value => 'delete' }) : '')
-			: CGI::b({ dir => 'ltr' }, format_set_name_display($setID)),
-			join '',
-			$self->DBFieldTable($set, $userSet, $mergedSet, 'set', $setID, $dateFields, $dateFieldLabels),
-		]
-	));
-}
-
-sub checkDates {
-	my $self      = shift;
-	my $setRecord = shift;
-	my $setID     = shift;
-	my $r         = $self->r;
-	my $error     = 0;
+sub checkDates ($c, $setRecord, $setID) {
+	my $error = 0;
 
 	# For each of the dates, use the override date if set.  Otherwise use the value from the global set.
 	my %dates;
 	for my $field (@{ DATE_FIELDS_ORDER() }) {
 		$dates{$field} =
-			(defined $r->param("set.$setID.$field.override") && $r->param("set.$setID.$field") ne '')
-			? $r->param("set.$setID.$field")
+			(defined $c->param("set.$setID.$field.override") && $c->param("set.$setID.$field") ne '')
+			? $c->param("set.$setID.$field")
 			: $setRecord->$field;
 	}
 
 	my ($open_date, $reduced_scoring_date, $due_date, $answer_date) = map { $dates{$_} } @{ DATE_FIELDS_ORDER() };
 
 	unless ($answer_date && $due_date && $open_date) {
-		$self->addbadmessage("set $setID has errors in its dates: answer_date |$answer_date|, "
+		$c->addbadmessage("set $setID has errors in its dates: answer_date |$answer_date|, "
 				. "due date |$due_date|, open_date |$open_date|");
 		$error = 1;
 	}
 
 	if ($answer_date < $due_date || $answer_date < $open_date) {
-		$self->addbadmessage("Answers cannot be made available until on or after the due date in set $setID!");
+		$c->addbadmessage("Answers cannot be made available until on or after the due date in set $setID!");
 		$error = 1;
 	}
 
 	if ($due_date < $open_date) {
-		$self->addbadmessage("Answers cannot be due until on or after the open date in set $setID!");
+		$c->addbadmessage("Answers cannot be due until on or after the open date in set $setID!");
 		$error = 1;
 	}
 
-	if ($r->ce->{pg}{ansEvalDefaults}{enableReducedScoring}
+	if ($c->ce->{pg}{ansEvalDefaults}{enableReducedScoring}
 		&& $setRecord->enable_reduced_scoring
 		&& ($reduced_scoring_date < $open_date || $reduced_scoring_date > $due_date))
 	{
-		$self->addbadmessage(
-			"The reduced scoring date should be between the open date and the due date in set $setID!");
+		$c->addbadmessage("The reduced scoring date should be between the open date and the due date in set $setID!");
 		$error = 1;
 	}
 
 	# Make sure the dates are not more than 10 years in the future.
 	my $cutoff = time + 31_556_926 * 10;
 	if ($open_date > $cutoff) {
-		$self->addbadmessage("Error: open date cannot be more than 10 years from now in set $setID");
+		$c->addbadmessage("Error: open date cannot be more than 10 years from now in set $setID");
 		$error = 1;
 	}
 	if ($due_date > $cutoff) {
-		$self->addbadmessage("Error: due date cannot be more than 10 years from now in set $setID");
+		$c->addbadmessage("Error: due date cannot be more than 10 years from now in set $setID");
 		$error = 1;
 	}
 	if ($answer_date > $cutoff) {
-		$self->addbadmessage("Error: answer date cannot be more than 10 years from now in set $setID");
+		$c->addbadmessage("Error: answer date cannot be more than 10 years from now in set $setID");
 		$error = 1;
 	}
 
-	$self->addbadmessage('No date changes were saved!') if ($error);
+	$c->addbadmessage('No date changes were saved!') if ($error);
 
 	return { %dates, error => $error };
 }
 
-sub DBFieldTable {
-	my ($self, $GlobalRecord, $UserRecord, $MergedRecord, $recordType, $recordID, $fieldsRef, $rh_fieldLabels) = @_;
-
-	return CGI::div({ class => 'alert alert-danger p-1 mb-0' }, "No record exists for $recordType $recordID")
-		unless defined $GlobalRecord;
-
-	# modify record name if we're dealing with versioned sets
-	my $isVersioned = 0;
-	if ($recordType eq 'set'
-		&& defined($MergedRecord)
-		&& $MergedRecord->assignment_type =~ /gateway/
-		&& $MergedRecord->can('version_id'))
-	{
-		$recordID .= ',v' . $MergedRecord->version_id;
-		$isVersioned = 1;
-	}
-	my $r      = $self->r;
-	my $ce     = $r->ce;
-	my @fields = @$fieldsRef;
-	my @results;
-	for my $field (@fields) {
-		#Skip reduced credit dates for sets which don't have them
-		next
-			unless $field ne 'reduced_scoring_date'
-			|| ($ce->{pg}{ansEvalDefaults}{enableReducedScoring} && $GlobalRecord->enable_reduced_scoring);
-
-		my $globalValue = $GlobalRecord->$field;
-		my $userValue   = defined $UserRecord   ? $UserRecord->$field   : $globalValue;
-		my $mergedValue = defined $MergedRecord ? $MergedRecord->$field : $globalValue;
-
-		push @results,
-			[
-				$r->maketext($rh_fieldLabels->{$field}) . ' ',
-				defined $UserRecord
-				? CGI::checkbox({
-					name    => "$recordType.$recordID.$field.override",
-					id      => "$recordType.$recordID.$field.override_id",
-					label   => '',
-					value   => $field,
-					checked => $r->param("$recordType.$recordID.$field.override")
-					|| $mergedValue ne $globalValue
-					|| ($isVersioned && $field ne 'reduced_scoring_date'),
-					class           => 'form-check-input',
-					labelattributes => { class => 'form-check-label' }
-				})
-				: '',
-				defined $UserRecord
-				? CGI::div(
-					{ class => 'input-group input-group-sm flex-nowrap flatpickr' },
-					CGI::input({
-						name           => "$recordType.$recordID.$field",
-						id             => "$recordType.$recordID.${field}_id",
-						type           => 'text',
-						value          => $userValue,
-						data_override  => "$recordType.$recordID.$field.override_id",
-						placeholder    => $r->maketext('None Specified'),
-						class          => 'form-control w-auto' . ($field eq 'open_date' ? ' datepicker-group' : ''),
-						data_input     => undef,
-						data_done_text => $r->maketext('Done'),
-						data_locale    => $ce->{language},
-						data_timezone  => $ce->{siteDefaults}{timezone}
-					}),
-					CGI::a(
-						{ class => 'btn btn-secondary btn-sm', data_toggle => undef },
-						CGI::i({ class => 'fas fa-calendar-alt' }, '')
-					)
-				)
-				: '',
-				CGI::span(
-					{ dir => 'ltr' },
-					$self->formatDateTime($globalValue, '', 'datetime_format_short', $ce->{language})
-				)
-			];
-	}
-
-	my @table;
-	for my $row (@results) {
-		push @table, CGI::Tr(CGI::td({ class => 'px-1 text-nowrap' }, $row));
-	}
-
-	return CGI::table({ class => 'UserDetail-date-table' }, @table);
-}
-
-sub output_JS {
-	my $self = shift;
-	my $ce   = $self->r->ce;
-
-	# Print javascript and style for the flatpickr date/time picker.
-	print CGI::Link({ rel => 'stylesheet', href => getAssetURL($ce, 'node_modules/flatpickr/dist/flatpickr.min.css') });
-	print CGI::Link({
-		rel  => 'stylesheet',
-		href => getAssetURL($ce, 'node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.css')
-	});
-	print CGI::script({ src => getAssetURL($ce, 'node_modules/luxon/build/global/luxon.min.js'), defer => undef }, '');
-	print CGI::script({ src => getAssetURL($ce, 'node_modules/flatpickr/dist/flatpickr.min.js'), defer => undef }, '');
-	if ($ce->{language} !~ /^en/) {
-		print CGI::script(
-			{
-				src => getAssetURL(
-					$ce, 'node_modules/flatpickr/dist/l10n/' . ($ce->{language} =~ s/^(..).*/$1/gr) . '.js'
-				),
-				defer => undef
-			},
-			''
-		);
-	}
-	print CGI::script(
-		{
-			src   => getAssetURL($ce, 'node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.js'),
-			defer => undef
-		},
-		''
-	);
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/DatePicker/datepicker.js'), defer => undef }, '');
-
-	# Add javascript specifically for this module.
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/UserDetail/userdetail.js'), defer => undef }, '');
-
-	return '';
-}
-
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm b/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm
index aafa297adb..03a072d5ba 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,9 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Instructor::UserList;
-use base qw(WeBWorK);
-use base qw(WeBWorK::ContentGenerator);
-use base qw(WeBWorK::ContentGenerator::Instructor);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -65,54 +63,42 @@ Export users:
 
 =cut
 
-use strict;
-use warnings;
-#use CGI qw(-nosticky );
-use WeBWorK::CGI;
-use WeBWorK::File::Classlist;
-use WeBWorK::DB qw(check_user_id);
-use WeBWorK::Utils qw(readFile readDirectory cryptPassword x getAssetURL);
+use WeBWorK::File::Classlist qw(parse_classlist write_classlist);
+use WeBWorK::Utils qw(cryptPassword x);
+
 use constant HIDE_USERS_THRESHHOLD => 200;
-use constant EDIT_FORMS => [qw(saveEdit cancelEdit)];
-use constant PASSWORD_FORMS => [qw(savePassword cancelPassword)];
-use constant VIEW_FORMS => [qw(filter sort edit password import export add delete)];
+use constant EDIT_FORMS            => [qw(save_edit cancel_edit)];
+use constant PASSWORD_FORMS        => [qw(save_password cancel_password)];
+use constant VIEW_FORMS            => [qw(filter sort edit password import export add delete)];
 
 # Prepare the tab titles for translation by maketext
 use constant FORM_TITLES => {
-	saveEdit       => x("Save Edit"),
-	cancelEdit     => x("Cancel Edit"),
-	filter         => x("Filter"),
-	sort           => x("Sort"),
-	edit           => x("Edit"),
-	password       => x("Password"),
-	import         => x("Import"),
-	export         => x("Export"),
-	add            => x("Add"),
-	delete         => x("Delete"),
-        savePassword   => x("Save Password"),
-        cancelPassword => x("Cancel Password")
+	save_edit       => x('Save Edit'),
+	cancel_edit     => x('Cancel Edit'),
+	filter          => x('Filter'),
+	sort            => x('Sort'),
+	edit            => x('Edit'),
+	password        => x('Password'),
+	import          => x('Import'),
+	export          => x('Export'),
+	add             => x('Add'),
+	delete          => x('Delete'),
+	save_password   => x('Save Password'),
+	cancel_password => x('Cancel Password')
 };
 
 # permissions needed to perform a given action
 use constant FORM_PERMS => {
-		saveEdit => "modify_student_data",
-		edit => "modify_student_data",
-		savePassword => "change_password",
-		password => "change_password",
-		import => "modify_student_data",
-		export => "modify_classlist_files",
-		add => "modify_student_data",
-		delete => "modify_student_data",
-};
-
-# permissions needed to view a given field
-use constant FIELD_PERMS => {
-		act_as => "become_student",
-		sets	=> "assign_problem_sets",
+	save_edit     => 'modify_student_data',
+	edit          => 'modify_student_data',
+	save_password => 'change_password',
+	password      => 'change_password',
+	import        => 'modify_student_data',
+	export        => 'modify_classlist_files',
+	add           => 'modify_student_data',
+	delete        => 'modify_student_data',
 };
 
-use constant STATE_PARAMS => [qw(user effectiveUser key visible_users no_visible_users prev_visible_users no_prev_visible_users editMode passwordMode primarySortField secondarySortField ternarySortField labelSortMethod)];
-
 use constant SORT_SUBS => {
 	user_id       => \&byUserID,
 	first_name    => \&byFirstName,
@@ -126,1336 +112,447 @@ use constant SORT_SUBS => {
 	permission    => \&byPermission,
 };
 
-use constant  FIELD_PROPERTIES => {
-	user_id => {
-		type => "text",
-		size => 8,
-		access => "readonly",
-	},
-	first_name => {
-		type => "text",
-		size => 10,
-		access => "readwrite",
-	},
-	last_name => {
-		type => "text",
-		size => 10,
-		access => "readwrite",
-	},
-	email_address => {
-		type => "text",
-		size => 20,
-		access => "readwrite",
-	},
-	student_id => {
-		type => "text",
-		size => 11,
-		access => "readwrite",
-	},
-	status => {
-		type => "status",
-		size => 4,
-		access => "readwrite",
-	},
-	section => {
-		type => "text",
-		size => 3,
-		access => "readwrite",
-	},
-	recitation => {
-		type => "text",
-		size => 3,
-		access => "readwrite",
-	},
-	comment => {
-		type => "text",
-		size => 20,
-		access => "readwrite",
-	},
-	permission => {
-# this really should be read from $r->ce, but that's not available here
-		type => "permission",
-		access => "readwrite",
-		size => 4,
-#		type => "number",
-#		size => 2,
-#		access => "readwrite",
-	},
-	displayMode => {
-	    access => 'hidden',
-	},
-	showOldAnswers => {
-	    access => 'hidden',
-	},
-	useMathView => {
-	    access => 'hidden',
-    },
-
-    useWirisEditor => {
-	    access => 'hidden',
-    },
-    useMathQuill => {
-	    access => 'hidden',
-    },
-    lis_source_did => {
-	    access => 'hidden',
-	},
+use constant FIELDS => [
+	'user_id', 'first_name', 'last_name', 'email_address', 'student_id', 'status',
+	'section', 'recitation', 'comment',   'permission'
+];
+
+# Note that only the editable fields need a type (i.e. all but user_id),
+# and only the text fields need a size.
+use constant FIELD_PROPERTIES => {
+	user_id       => { name => x('Login Name') },
+	first_name    => { name => x('First Name'),        type => 'text', size => 10 },
+	last_name     => { name => x('Last Name'),         type => 'text', size => 10 },
+	email_address => { name => x('Email Address'),     type => 'text', size => 20 },
+	student_id    => { name => x('Student ID'),        type => 'text', size => 11 },
+	status        => { name => x('Enrollment Status'), type => 'status' },
+	section       => { name => x('Section'),           type => 'text', size => 3 },
+	recitation    => { name => x('Recitation'),        type => 'text', size => 3 },
+	comment       => { name => x('Comment'),           type => 'text', size => 20 },
+	permission    => { name => x('Permission Level'),  type => 'permission' },
 };
-sub pre_header_initialize {
-	my $self          = shift;
-	my $r             = $self->r;
-	my $urlpath       = $r->urlpath;
-	my $authz         = $r->authz;
-	my $ce            = $r->ce;
-	my $courseName    = $urlpath->arg("courseID");
-	my $user          = $r->param('user');
-	# Handle redirects, if any.
-	##############################
-	# Redirect to the addUser page
-	##################################
-
-	# Check permissions
-	return unless $authz->hasPermissions($user, "access_instructor_tools");
-
-	defined($r->param('action')) && $r->param('action') eq 'add' && do {
-		# fix url and redirect
-		my $root              = $ce->{webworkURLs}->{root};
-
-		my $numberOfStudents  = $r->param('number_of_students');
-		warn $r->maketext("number of students not defined") unless defined $numberOfStudents;
-
-		my $uri=$self->systemLink( $urlpath->newFromModule('WeBWorK::ContentGenerator::Instructor::AddUsers', $r, courseID=>$courseName),
-		                           params=>{
-		                          			number_of_students=>$numberOfStudents,
-		                                   }
-		);
-		#FIXME  does the display mode need to be defined?
-		#FIXME  url_authen_args also includes an effective user, so the new one must come first.
-		# even that might not work with every browser since there are two effective User assignments.
-		$self->reply_with_redirect($uri);
-		return;
-	};
-}
-
-sub initialize {
-	my ($self) = @_;
-	my $r      = $self->r;
-	my $db     = $r->db;
-	my $ce     = $r->ce;
-	my $authz  = $r->authz;
-	my $user   = $r->param('user');
-
-	# Check permissions
-	return unless $authz->hasPermissions($user, "access_instructor_tools");
-
-}
-
-sub body {
-	my ($self)       = @_;
-	my $r            = $self->r;
-	my $urlpath      = $r->urlpath;
-	my $db           = $r->db;
-	my $ce           = $r->ce;
-	my $authz        = $r->authz;
-	my $courseName   = $urlpath->arg("courseID");
-	my $setID        = $urlpath->arg("setID");
-	my $user         = $r->param('user');
-
-	my $root = $ce->{webworkURLs}->{root};
-
-	# templates for getting field names
-	my $userTemplate            = $self->{userTemplate}            = $db->newUser;
-	my $permissionLevelTemplate = $self->{permissionLevelTemplate} = $db->newPermissionLevel;
-
-	return CGI::div({ class => 'alert alert-danger p-1' },
-		$r->maketext("You are not authorized to access the instructor tools."))
-		unless $authz->hasPermissions($user, "access_instructor_tools");
-
-	# This table can be consulted when display-ready forms of field names are needed.
-	my %prettyFieldNames = map { $_ => $_ }
-		$userTemplate->FIELDS(),
-		$permissionLevelTemplate->FIELDS();
-
-	@prettyFieldNames{qw(
-		user_id
-		first_name
-		last_name
-		email_address
-		student_id
-		status
-		section
-		recitation
-		comment
-		permission
-	)} = (
-		$r->maketext("Login Name"),
-		$r->maketext("First Name"),
-		$r->maketext("Last Name"),
-		$r->maketext("Email Address"),
-		$r->maketext("Student ID"),
-		$r->maketext("Status"),
-		$r->maketext("Section"),
-		$r->maketext("Recitation"),
-		$r->maketext("Comment"),
-		$r->maketext("Permission Level")
-	);
-
-	$self->{prettyFieldNames} = \%prettyFieldNames;
-	########## set initial values for state fields
-
-	# Get a list of all users except set-level proctors from the database.
-	my @allUsers = $db->getUsersWhere({ user_id => { not_like => 'set_id:%' } });
-	$self->{allUserIDs} = [ map { $_->user_id } @allUsers ];
-
-	# Get the number of sets in the course for use in the "assigned sets" links.
-	$self->{totalSets} = $db->countGlobalSets;
-
-	if (defined $r->param("visable_user_string")) {
-		$self->{visibleUserIDs} = [ split /:/, $r->param("visable_user_string") ];
-	} elsif (defined $r->param("visible_users")) {
-		$self->{visibleUserIDs} = [ $r->param("visible_users") ];
-	} elsif (defined $r->param("no_visible_users")) {
-		$self->{visibleUserIDs} = [];
-	} else {
-		if ((@{ $self->{allUserIDs} } > HIDE_USERS_THRESHHOLD) and (not defined $r->param("show_all_users"))) {
-			$self->{visibleUserIDs} = [];
-		} else {
-			$self->{visibleUserIDs} = [ @{ $self->{allUserIDs} } ];
-		}
-	}
-
-	$self->{prevVisibleUserIDs} = $self->{visibleUserIDs};
-
-	if (defined $r->param("selected_users")) {
-		$self->{selectedUserIDs} = [ $r->param("selected_users") ];
-	} else {
-		$self->{selectedUserIDs} = [];
-	}
-
-	$self->{editMode} = $r->param("editMode") || 0;
-
-	return CGI::div({ class => 'alert alert-danger p-1' },
-		$r->maketext("You are not authorized to modify student data"))
-		if $self->{editMode} and not $authz->hasPermissions($user, "modify_student_data");
-
-
-	$self->{passwordMode} = $r->param("passwordMode") || 0;
-
-	return CGI::div({ class => 'alert alert-danger p-1' },
-		$r->maketext("You are not authorized to modify student data"))
-		if $self->{passwordMode} and not $authz->hasPermissions($user, "modify_student_data");
 
-	if (defined $r->param("labelSortMethod")) {
-		$self->{primarySortField} = $r->param("labelSortMethod");
-		$self->{secondarySortField} = $r->param("primarySortField");
-		$self->{ternarySortField} = $r->param("secondarySortField");
-	}
-	else {
-		$self->{primarySortField} = $r->param("primarySortField") || "last_name";
-		$self->{secondarySortField} = $r->param("secondarySortField") || "first_name";
-		$self->{ternarySortField} = $r->param("ternarySortField") || "student_id";
-	}
+sub pre_header_initialize ($c) {
+	my $authz = $c->authz;
+	my $ce    = $c->ce;
+	my $db    = $c->db;
+	my $user  = $c->param('user');
 
-	my (%sections, %recitations);
-	for my $User (@allUsers) {
-		push @{ $sections{ defined $User->section       ? $User->section    : '' } }, $User->user_id;
-		push @{ $recitations{ defined $User->recitation ? $User->recitation : '' } }, $User->user_id;
-	}
-	$self->{sections}    = \%sections;
-	$self->{recitations} = \%recitations;
+	return unless $authz->hasPermissions($user, 'access_instructor_tools');
 
-	########## call action handler
+	$c->{editMode}     = $c->param('editMode')     || 0;
+	$c->{passwordMode} = $c->param('passwordMode') || 0;
 
-	my $actionID = $r->param("action");
-	if ($actionID) {
-		unless (grep { $_ eq $actionID } @{ VIEW_FORMS() }, @{ EDIT_FORMS() }, @{ PASSWORD_FORMS() } ) {
-			die $r->maketext("Action [_1] not found", $actionID);
-		}
-		# Check permissions
-		if (not FORM_PERMS()->{$actionID} or $authz->hasPermissions($user, FORM_PERMS()->{$actionID})) {
-			my $actionHandler = "${actionID}_handler";
-			my %genericParams;
-			foreach my $param (qw(selected_users)) {
-				$genericParams{$param} = [ $r->param($param) ];
-			}
-			my %actionParams = $self->getActionParams($actionID);
-			my %tableParams = $self->getTableParams();
-			print CGI::p(
-				CGI::div(
-					{ class => 'alert alert-success p-1' },
-					$r->maketext(
-						"Result of last action performed: [_1]",
-						CGI::i($self->$actionHandler(\%genericParams, \%actionParams, \%tableParams))
-					)
-				),
-				CGI::hr()
-			);
-		} else {
-			return CGI::div({ class => 'alert alert-danger p-1' },
-				$r->maketext("You are not authorized to perform this action."));
-		}
-	}
+	return if ($c->{passwordMode} || $c->{editMode}) && !$authz->hasPermissions($user, 'modify_student_data');
 
-	# Retrieve values for member fields
-	my $editMode = $self->{editMode};
-	my $passwordMode = $self->{passwordMode};
-	my $primarySortField = $self->{primarySortField};
-	my $secondarySortField = $self->{secondarySortField};
-	my $ternarySortField = $self->{ternarySortField};
-
-	# Get requested users
-	my @Users = @{ $self->{visibleUserIDs} } ? $db->getUsers(@{ $self->{visibleUserIDs} }) : ();
-
-	my %sortSubs = %{ SORT_SUBS() };
-	my $primarySortSub = $sortSubs{$primarySortField};
-	my $secondarySortSub = $sortSubs{$secondarySortField};
-	my $ternarySortSub = $sortSubs{$ternarySortField};
-
-	# add permission level to user record hash so we can sort it if necessary
-	if ($primarySortField eq 'permission' or $secondarySortField eq 'permission' or $ternarySortField eq 'permission') {
-		foreach my $User (@Users) {
-			next unless $User;
-			my $permissionLevel = $db->getPermissionLevel($User->user_id);
-        	                $User->{permission} = $permissionLevel->permission;
-		}
+	if (defined $c->param('action') && $c->param('action') eq 'add') {
+		# Redirect to the addUser page
+		$c->reply_with_redirect($c->systemLink(
+			$c->url_for('instructor_add_users'),
+			params => { number_of_students => $c->param('number_of_students') // 1 }
+		));
+		return;
 	}
 
+	# Get a list of all users except set-level proctors from the database.
+	my @allUsersDB = $db->getUsersWhere({ user_id => { not_like => 'set_id:%' } });
 
-	#	# don't forget to sort in opposite order of importance
-	#	@Users = sort $secondarySortSub @Users;
-	#	@Users = sort $primarySortSub @Users;
-	#	#@Users = sort byLnFnUid @Users;
-
-	#   Always have a definite sort order even if first three sorts don't determine things
-	@Users = sort {
-		&$primarySortSub
-			||
-		&$secondarySortSub
-			||
-		&$ternarySortSub
-			||
-		byLastName
-			||
-		byFirstName
-			||
-		byUserID
-		}
-		@Users;
-
-	my @PermissionLevels;
+	my %permissionLevels =
+		map { $_->user_id => $_->permission } $db->getPermissionLevelsWhere({ user_id => { not_like => 'set_id:%' } });
 
-	for (my $i = 0; $i < @Users; $i++) {
-		my $User = $Users[$i];
-		# FIXME  utf8, utf8mb4 debugging codes
-		#		warn "UserList: user  name, ".$User->first_name." ".$User->last_name."\n";
-		my $PermissionLevel = $db->getPermissionLevel($User->user_id); # checked
+	# Add permission level to the user record hash.
+	for my $user (@allUsersDB) {
+		unless (defined $permissionLevels{ $user->user_id }) {
+			# Uh oh! No permission level record found!
+			$c->addbadmessage($c->maketext('Added missing permission level for user [_1].', $user->user_id));
 
-		# DBFIXME this should go in the DB layer
-		unless ($PermissionLevel) {
-			# uh oh! no permission level record found!
-			warn $r->maketext("added missing permission level for user"), $User->user_id, "\n";
+			# Create a new permission level record.
+			my $permissionRecord = $db->newPermissionLevel;
+			$permissionRecord->user_id($user->user_id);
+			$permissionRecord->permission(0);
 
-			# create a new permission level record
-			$PermissionLevel = $db->newPermissionLevel;
-			$PermissionLevel->user_id($User->user_id);
-			$PermissionLevel->permission(0);
+			# Add it to the database.
+			$db->addPermissionLevel($permissionRecord);
 
-			# add it to the database
-			$db->addPermissionLevel($PermissionLevel);
+			$permissionLevels{ $user->user_id } = 0;
 		}
 
-		$PermissionLevels[$i] = $PermissionLevel;
+		$user->{permission} = $permissionLevels{ $user->user_id };
 	}
 
-	########## print site identifying information
-
-	print CGI::input({
-		type  => 'button',
-		id    => 'show_hide',
-		value => $r->maketext('Show/Hide Site Description'),
-		class => 'btn btn-info mb-2'
-	});
-	print CGI::p(
-		{ id => 'site_description', style => 'display:none' },
-		CGI::em($r->maketext(
-			'This is the classlist editor page, where you can view and edit the records of all the students currently '
-				. 'enrolled in this course.  The top of the page contains forms which allow you to filter which '
-				. 'students to view, sort your students in a chosen order, edit student records, give new passwords to '
-				. 'students, import/export student records from/to external files, or add/delete students.  To use, '
-				. 'please select the action you would like to perform, enter in the relevant information in the fields '
-				. 'below, and hit the "Take Action!" button at the bottom of the form.  The bottom of the page '
-				. 'contains a table containing the student usernames and their information. Clicking on the links in '
-				. 'the column headers of the table will sort the table by the field it corresponds to. The Login Name '
-				. 'fields contain checkboxes for selecting the user.  Clicking the link of the name itself will allow '
-				. 'you to act as the selected user.  There is also an edit link following the name which will take you '
-				. 'to a page where you can edit the selected user\'s information.  Clicking the emails will allow you '
-				. 'to email the corresponding user.  Clicking the links in the entries in the assigned sets columns '
-				. 'will take you to a page where you can view and reassign the sets for the selected user. '
-		))
-	);
-
-	########## print beginning of form
-
-	print CGI::start_form({
-		method => 'post',
-		action => $self->systemLink($urlpath, authen => 0),
-		name   => 'userlist',
-		id     => 'user-list-form',
-		class  => 'font-sm'
-	});
-	print $self->hidden_authen_fields();
-
-	########## print state data
+	my %allUsers = map { $_->user_id => $_ } @allUsersDB;
+	$c->{userPermission} = $allUsers{$user}{permission};
 
-	print "\n<!-- state data here -->\n";
-
-	if (@{ $self->{visibleUserIDs} }) {
-		print CGI::hidden(-name => "visible_users", -value => $self->{visibleUserIDs});
+	# Get the number of sets in the course for use in the "assigned sets" links.
+	$c->{totalSets}  = $db->countGlobalSets;
+	$c->{allUserIDs} = [ keys %allUsers ];
+	$c->{allUsers}   = \%allUsers;
+
+	if (defined $c->param('visible_users')) {
+		$c->{visibleUserIDs} = { map { $_ => 1 } @{ $c->every_param('visible_users') } };
+	} elsif (@allUsersDB > HIDE_USERS_THRESHHOLD || defined $c->param('no_visible_users')) {
+		$c->{visibleUserIDs} = {};
 	} else {
-		print CGI::hidden(-name => "no_visible_users", -value => "1");
+		$c->{visibleUserIDs} = { map { $_ => 1 } @{ $c->{allUserIDs} } };
 	}
+	$c->{prevVisibleUserIDs} = $c->{visibleUserIDs};
 
-	if (@{ $self->{prevVisibleUserIDs} }) {
-		print CGI::hidden(-name => "prev_visible_users", -value => $self->{prevVisibleUserIDs});
+	if (defined $c->param('selected_users')) {
+		$c->{selectedUserIDs} = { map { $_ => 1 } @{ $c->every_param('selected_users') } };
 	} else {
-		print CGI::hidden(-name => "no_prev_visible_users", -value => "1");
+		$c->{selectedUserIDs} = {};
 	}
 
-	print CGI::hidden(-name=>"editMode", -value=>$editMode);
-
-	print CGI::hidden(-name=>"passwordMode", -value=>$passwordMode);
-
-	print CGI::hidden(-name=>"primarySortField", -value=>$primarySortField);
-	print CGI::hidden(-name=>"secondarySortField", -value=>$secondarySortField);
-	print CGI::hidden(-name=>"ternarySortField", -value=>$ternarySortField);
+	$c->{userIsEditable} =
+		{ map { $allUsers{$_}{permission} > $c->{userPermission} ? () : ($_ => 1) } (keys %allUsers) };
 
-	print "\n<!-- state data here -->\n";
-
-	########## print action forms
-
-	print CGI::p($r->maketext("Select an action to perform").":");
-
-	my @formsToShow;
-	if ($editMode) {
-		@formsToShow = @{ EDIT_FORMS() };
-	}elsif ($passwordMode) {
-		@formsToShow = @{ PASSWORD_FORMS() };
+	# Always have a definite sort order.
+	if (defined $c->param('labelSortMethod')) {
+		$c->{primarySortField}   = $c->param('labelSortMethod');
+		$c->{secondarySortField} = $c->param('primarySortField')   || 'last_name';
+		$c->{ternarySortField}   = $c->param('secondarySortField') || 'first_name';
 	} else {
-		@formsToShow = @{ VIEW_FORMS() };
+		$c->{primarySortField}   = $c->param('primarySortField')   || 'last_name';
+		$c->{secondarySortField} = $c->param('secondarySortField') || 'first_name';
+		$c->{ternarySortField}   = $c->param('ternarySortField')   || 'student_id';
 	}
-	my %formTitles = %{ FORM_TITLES() };
-
-	my @tabArr;
-	my @contentArr;
-	my $default_choice;
-
-	for my $actionID (@formsToShow) {
-		# Check permissions
-		next if FORM_PERMS()->{$actionID} and not $authz->hasPermissions($user, FORM_PERMS()->{$actionID});
-
-		my $actionForm = "${actionID}_form";
-
-		my $active = '';
-		$active = ' active', $default_choice = $actionID unless $default_choice;
-
-		push(
-			@tabArr,
-			CGI::li(
-				{ class => 'nav-item', role => 'presentation' },
-				CGI::a(
-					{
-						href           => "#$actionID",
-						class          => "nav-link action-link$active",
-						id             => "$actionID-tab",
-						data_action    => $actionID,
-						data_bs_toggle => 'tab',
-						data_bs_target => "#$actionID",
-						role           => 'tab',
-						aria_controls  => $actionID,
-						aria_selected  => $active ? 'true' : 'false'
-					},
-					$r->maketext($formTitles{$actionID})
-				)
-			)
-		);
-		push(
-			@contentArr,
-			CGI::div(
-				{
-					class            => 'tab-pane fade mb-2' . ($active ? " show$active" : ''),
-					id               => $actionID,
-					role             => 'tabpanel',
-					aria_labelledby => "$actionID-tab"
-				},
-				$self->$actionForm($self->getActionParams($actionID))
-			)
-		);
-	}
-
-	print CGI::hidden(-name => 'action', -id => 'current_action', -value => $default_choice);
-	print CGI::div(CGI::ul({ class => 'nav nav-tabs mb-2', role => 'tablist' }, @tabArr),
-		CGI::div({ class => 'tab-content' }, @contentArr));
-
-	print CGI::div(
-		{ class => 'mb-3' },
-		CGI::submit({
-			id    => "take_action",
-			value => $r->maketext("Take Action!"),
-			class => "btn btn-primary"
-		})
-	);
-
-	########## print table
 
-	print CGI::p($r->maketext("Showing [_1] out of [_2] users", scalar @Users, scalar @{ $self->{allUserIDs} }));
-
-	print CGI::p($r->maketext("If a password field is left blank, the student's current password will be maintained.")) if $passwordMode;
-	if ($editMode) {
-		print CGI::p($r->maketext('Click on the login name to edit individual problem set data, (e.g. due dates) for these students.'));
+	my $actionID = $c->param('action');
+	if ($actionID) {
+		unless (grep { $_ eq $actionID } @{ VIEW_FORMS() }, @{ EDIT_FORMS() }, @{ PASSWORD_FORMS() }) {
+			die $c->maketext('Action [_1] not found', $actionID);
+		}
+		if (!FORM_PERMS()->{$actionID} || $authz->hasPermissions($user, FORM_PERMS()->{$actionID})) {
+			# Call the action handler
+			my $actionHandler = "${actionID}_handler";
+			$c->addgoodmessage($c->maketext('Result of last action performed: [_1]', $c->tag('i', $c->$actionHandler)));
+		} else {
+			$c->addbadmessage($c->maketext('You are not authorized to perform this action.'));
+		}
+	} else {
+		$c->addgoodmessage($c->maketext("Please select action to be performed."));
 	}
 
-	$self->printTableHTML(\@Users, \@PermissionLevels, \%prettyFieldNames,
-		editMode => $editMode,
-		passwordMode => $passwordMode,
-		selectedUserIDs => $self->{selectedUserIDs},
-		primarySortField => $primarySortField,
-		secondarySortField => $secondarySortField,
-		visableUserIDs => $self->{visibleUserIDs},
-	);
+	# Sort all users
+	my $primarySortSub   = SORT_SUBS()->{ $c->{primarySortField} };
+	my $secondarySortSub = SORT_SUBS()->{ $c->{secondarySortField} };
+	my $ternarySortSub   = SORT_SUBS()->{ $c->{ternarySortField} };
 
-	########## print end of form
+	$c->{allUserIDs} = [ keys %allUsers ];
 
- 	print CGI::end_form();
+	# Always have a definite sort order in case the first three sorts don't determine things.
+	$c->{sortedUserIDs} = [
+		map  { $_->user_id }
+		sort { &$primarySortSub || &$secondarySortSub || &$ternarySortSub || byLastName || byFirstName || byUserID }
+		grep { $c->{visibleUserIDs}{ $_->user_id } } (values %allUsers)
+	];
 
-	return "";
+	return;
 }
 
-################################################################################
-# extract particular params and put them in a hash (values are ARRAYREFs!)
-################################################################################
-
-sub getActionParams {
-	my ($self, $actionID) = @_;
-	my $r = $self->{r};
+sub initialize ($c) {
+	# Make sure these are defined for the template.
+	# This is done here as it needs to occur after the action handler has been executed.
+	$c->stash->{formsToShow} =
+		$c->{editMode} ? EDIT_FORMS() : $c->{passwordMode} ? PASSWORD_FORMS() : VIEW_FORMS();
+	$c->stash->{formTitles}      = FORM_TITLES();
+	$c->stash->{formPerms}       = FORM_PERMS();
+	$c->stash->{fields}          = FIELDS();
+	$c->stash->{fieldProperties} = FIELD_PROPERTIES();
 
-	my %actionParams;
-	foreach my $param ($r->param) {
-		next unless $param =~ m/^action\.$actionID\./;
-		$actionParams{$param} = [ $r->param($param) ];
-	}
-	return %actionParams;
+	return;
 }
 
-sub getTableParams {
-	my ($self) = @_;
-	my $r = $self->{r};
+# Action handlers
 
-	my %tableParams;
-	foreach my $param ($r->param) {
-		next unless $param =~ m/^(?:user|permission)\./;
-		$tableParams{$param} = [ $r->param($param) ];
-	}
-	return %tableParams;
-}
-
-################################################################################
-# actions and action triggers
-################################################################################
-
-# filter, edit, cancelEdit, and saveEdit should stay with the display module and
-# not be real "actions". that way, all actions are shown in view mode and no
-# actions are shown in edit mode.
-
-sub filter_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	my %prettyFieldNames = %{ $self->{prettyFieldNames} };
-	my %fieldProperties  = %{ FIELD_PROPERTIES() };
-
-	my @fields;
-
-	foreach my $field (keys %fieldProperties) {
-		push @fields, $field
-			unless $fieldProperties{$field}{access} eq 'hidden';
-	}
-
-	@fields = sort { $prettyFieldNames{$a} cmp $prettyFieldNames{$b} } @fields;
-
-	return CGI::div(
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'filter_select', class => 'col-form-label col-form-label-sm col-sm-auto' },
-				$r->maketext('Show which users?')
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					id      => 'filter_select',
-					name    => 'action.filter.scope',
-					values  => [qw(all none selected match_regex)],
-					default => $actionParams{'action.filter.scope'}[0] || 'match_regex',
-					class   => 'form-select form-select-sm',
-					labels  => {
-						all         => $r->maketext('all users'),
-						none        => $r->maketext('no users'),
-						selected    => $r->maketext('selected users'),
-						match_regex => $r->maketext('users who match on selected field'),
-					}
-				})
-			)
-		),
-		CGI::div(
-			{ id => 'filter_elements' },
-			CGI::div(
-				{ class => 'row mb-2' },
-				CGI::label(
-					{ for => 'filter_type_select', class => 'col-form-label col-form-label-sm col-sm-auto' },
-					$r->maketext('What field should filtered users match on?')
-				),
-				CGI::div(
-					{ class => 'col-auto' },
-					CGI::popup_menu({
-						id      => 'filter_type_select',
-						name    => 'action.filter.field',
-						value   => \@fields,
-						default => $actionParams{'action.filter.field'}[0] || 'user_id',
-						class   => 'form-select form-select-sm',
-						labels  => \%prettyFieldNames,
-					})
-				)
-			),
-			CGI::div(
-				{ class => 'row mb-2' },
-				CGI::label(
-					{ for => 'filter_text', class => 'col-form-label col-form-label-sm col-sm-auto' },
-					$r->maketext('Filter by what text?') . CGI::span({ class => 'required-field' }, '*')
-				),
-				CGI::div(
-					{ class => 'col-auto' },
-					CGI::textfield({
-						id            => 'filter_text',
-						name          => 'action.filter.user_ids',
-						value         => $actionParams{'action.filter.user_ids'}[0] || '',
-						aria_required => 'true',
-						class         => 'form-control form-control-sm'
-					})
-				)
-			)
-		)
-	);
-}
-
-# this action handler modifies the "visibleUserIDs" field based on the contents
-# of the "action.filter.scope" parameter and the "selected_users"
-sub filter_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-
-	my $r = $self->r;
-	my $db = $r->db;
-	my $ce = $r->ce;
+# This action handler modifies the "visibleUserIDs" field based on the contents
+# of the "action.filter.scope" parameter and the "selected_users".
+sub filter_handler ($c) {
+	my $ce = $c->ce;
 
 	my $result;
 
-	my $scope = $actionParams->{"action.filter.scope"}->[0];
-	if ($scope eq "all") {
-		$result = $r->maketext("showing all users");
-		$self->{visibleUserIDs} = $self->{allUserIDs};
-	} elsif ($scope eq "none") {
-		$result = $r->maketext("showing no users");
-		$self->{visibleUserIDs} = [];
-	} elsif ($scope eq "selected") {
-		$result = $r->maketext("showing selected users");
-		$self->{visibleUserIDs} = $genericParams->{selected_users}; # an arrayref
-	} elsif ($scope eq "match_regex") {
-		$result = $r->maketext("showing matching users");
-		my $regex = $actionParams->{"action.filter.user_ids"}->[0];
-		my $field = $actionParams->{"action.filter.field"}->[0];
-		my @userRecords = $db->getUsersWhere({ user_id => { not_like => 'set_id:%' } });
-		my @userIDs;
-		my %permissionLabels = reverse %{$ce->{userRoles}};
-		for my $record (@userRecords) {
-			# add permission level to user record hash so we can match it if necessary
-			# also change permission level and status to their text
-			# labels
-			if ($field eq "permission") {
-				my $permissionLevel = $db->getPermissionLevel($record->user_id);
-				$record->{permission} = $permissionLabels{$permissionLevel->permission};
+	my $scope = $c->param('action.filter.scope');
+	if ($scope eq 'all') {
+		$result = $c->maketext('showing all users');
+		$c->{visibleUserIDs} = { map { $_ => 1 } @{ $c->{allUserIDs} } };
+	} elsif ($scope eq 'none') {
+		$result = $c->maketext('showing no users');
+		$c->{visibleUserIDs} = {};
+	} elsif ($scope eq 'selected') {
+		$result = $c->maketext('showing selected users');
+		$c->{visibleUserIDs} = $c->{selectedUserIDs};
+	} elsif ($scope eq 'match_regex') {
+		$result = $c->maketext('showing matching users');
+		my $regex    = $c->param('action.filter.user_ids');
+		my $field    = $c->param('action.filter.field');
+		my %allUsers = %{ $c->{allUsers} };
+		my @matchingUserIDs;
+		my %permissionLabels = reverse %{ $ce->{userRoles} };
+		for my $userID (@{ $c->{allUserIDs} }) {
+			if ($field eq 'permission') {
+				push @matchingUserIDs, $userID
+					if ($permissionLabels{ $allUsers{$userID}{permission} } =~ /^$regex/i);
 			} elsif ($field eq 'status') {
-				$record->{status} = $ce->status_abbrev_to_name($record->{status});
+				push @matchingUserIDs, $userID
+					if ($ce->status_abbrev_to_name($allUsers{$userID}{status}) =~ /^$regex/i);
+			} else {
+				push @matchingUserIDs, $userID if $allUsers{$userID}{$field} =~ /^$regex/i;
 			}
-			push @userIDs, $record->user_id if $record->{$field} =~ /^$regex/i;
 		}
-		$self->{visibleUserIDs} = \@userIDs;
-	} elsif ($scope eq "match_ids") {
-		my @userIDs = split /\s*,\s*/, $actionParams->{"action.filter.user_ids"}->[0];
-		$self->{visibleUserIDs} = \@userIDs;
-	} elsif ($scope eq "match_section") {
-		my $section = $actionParams->{"action.filter.section"}->[0];
-		$self->{visibleUserIDs} = $self->{sections}->{$section}; # an arrayref
-	} elsif ($scope eq "match_recitation") {
-		my $recitation = $actionParams->{"action.filter.recitation"}->[0];
-		$self->{visibleUserIDs} = $self->{recitations}->{$recitation}; # an arrayref
+		$c->{visibleUserIDs} = { map { $_ => 1 } @matchingUserIDs };
 	}
 
 	return $result;
 }
 
-sub sort_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	return CGI::div(
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'sort_select_1', class => 'col-form-label col-form-label-sm', style => 'width:4.5rem' },
-				$r->maketext('Sort by') . ':'
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					id     => 'sort_select_1',
-					name   => 'action.sort.primary',
-					values =>
-						[qw(user_id first_name last_name student_id status section recitation comment permission)],
-					default => $actionParams{'action.sort.primary'}->[0] || 'last_name',
-					class   => 'form-select form-select-sm',
-					labels  => {
-						user_id    => $r->maketext('Login Name'),
-						first_name => $r->maketext('First Name'),
-						last_name  => $r->maketext('Last Name'),
-						student_id => $r->maketext('Student ID'),
-						status     => $r->maketext('Enrollment Status'),
-						section    => $r->maketext('Section'),
-						recitation => $r->maketext('Recitation'),
-						comment    => $r->maketext('Comment'),
-						permission => $r->maketext('Permission Level')
-					}
-				})
-			)
-		),
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'sort_select_2', class => 'col-form-label col-form-label-sm', style => 'width:4.5rem' },
-				$r->maketext('Then by') . ':'
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					id     => 'sort_select_2',
-					name   => 'action.sort.secondary',
-					values =>
-						[qw(user_id first_name last_name student_id status section recitation comment permission)],
-					default => $actionParams{'action.sort.secondary'}->[0] || 'first_name',
-					class   => 'form-select form-select-sm',
-					labels  => {
-						user_id    => $r->maketext('Login Name'),
-						first_name => $r->maketext('First Name'),
-						last_name  => $r->maketext('Last Name'),
-						student_id => $r->maketext('Student ID'),
-						status     => $r->maketext('Enrollment Status'),
-						section    => $r->maketext('Section'),
-						recitation => $r->maketext('Recitation'),
-						comment    => $r->maketext('Comment'),
-						permission => $r->maketext('Permission Level')
-					}
-				})
-			)
-		),
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'sort_select_3', class => 'col-form-label col-form-label-sm', style => 'width:4.5rem' },
-				$r->maketext('Then by') . ':'
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					id     => 'sort_select_3',
-					name   => 'action.sort.ternary',
-					values =>
-						[qw(user_id first_name last_name student_id status section recitation comment permission)],
-					default => $actionParams{'action.sort.ternary'}->[0] || 'user_id',
-					class   => 'form-select form-select-sm',
-					labels  => {
-						user_id    => $r->maketext('Login Name'),
-						first_name => $r->maketext('First Name'),
-						last_name  => $r->maketext('Last Name'),
-						student_id => $r->maketext('Student ID'),
-						status     => $r->maketext('Enrollment Status'),
-						section    => $r->maketext('Section'),
-						recitation => $r->maketext('Recitation'),
-						comment    => $r->maketext('Comment'),
-						permission => $r->maketext('Permission Level')
-					}
-				})
-			)
-		)
-	);
-}
-
-sub sort_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r = $self->r;
-
-	my $primary = $actionParams->{"action.sort.primary"}->[0];
-	my $secondary = $actionParams->{"action.sort.secondary"}->[0];
-	my $ternary = $actionParams->{"action.sort.ternary"}->[0];
-
-	$self->{primarySortField} = $primary;
-	$self->{secondarySortField} = $secondary;
-	$self->{ternarySortField} = $ternary;
-
-	my %names = (
-				user_id		=> $r->maketext("Login Name"),
-				first_name	=> $r->maketext("First Name"),
-				last_name	=> $r->maketext("Last Name"),
-				student_id	=> $r->maketext("Student ID"),
-				status		=> $r->maketext("Enrollment Status"),
-				section		=> $r->maketext("Section"),
-				recitation	=> $r->maketext("Recitation"),
-				comment		=> $r->maketext("Comment"),
-				permission	=> $r->maketext("Permission Level")
-	);
+sub sort_handler ($c) {
+	$c->{primarySortField}   = $c->param('action.sort.primary');
+	$c->{secondarySortField} = $c->param('action.sort.secondary');
+	$c->{ternarySortField}   = $c->param('action.sort.ternary');
 
-	return $r->maketext("Users sorted by [_1], then by [_2], then by [_3]", $names{$primary}, $names{$secondary}, $names{$ternary});
-}
-
-sub edit_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	return CGI::div(
-		{ class => 'row mb-2' },
-		CGI::label(
-			{ for => 'edit_select', class => 'col-form-label col-form-label-sm col-auto' },
-			$r->maketext('Edit which users?')
-		),
-		CGI::div(
-			{ class => 'col-auto' },
-			CGI::popup_menu({
-				id      => 'edit_select',
-				name    => 'action.edit.scope',
-				values  => [qw(all visible selected)],
-				default => $actionParams{'action.edit.scope'}[0] || 'selected',
-				class   => 'form-select form-select-sm',
-				labels  => {
-					all      => $r->maketext('all users'),
-					visible  => $r->maketext('visible users'),
-					selected => $r->maketext('selected users')
-				}
-			})
-		)
+	return $c->maketext(
+		'Users sorted by [_1], then by [_2], then by [_3]',
+		$c->maketext(FIELD_PROPERTIES()->{ $c->{primarySortField} }{name}),
+		$c->maketext(FIELD_PROPERTIES()->{ $c->{secondarySortField} }{name}),
+		$c->maketext(FIELD_PROPERTIES()->{ $c->{ternarySortField} }{name})
 	);
 }
 
-sub edit_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r = $self->r;
-
+sub edit_handler ($c) {
 	my $result;
-
-	my $scope = $actionParams->{"action.edit.scope"}->[0];
-	if ($scope eq "all") {
-		$result = $r->maketext("editing all users");
-		$self->{visibleUserIDs} = $self->{allUserIDs};
-	} elsif ($scope eq "visible") {
-		$result = $r->maketext("editing visible users");
-		# leave visibleUserIDs alone
-	} elsif ($scope eq "selected") {
-		$result = $r->maketext("editing selected users");
-		$self->{visibleUserIDs} = $genericParams->{selected_users}; # an arrayref
-	}
-	$self->{editMode} = 1;
+	my @usersToEdit;
+
+	my $scope = $c->param('action.edit.scope');
+	if ($scope eq 'all') {
+		$result      = $c->maketext('editing all users');
+		@usersToEdit = grep { $c->{userIsEditable}{$_} } @{ $c->{allUserIDs} };
+	} elsif ($scope eq 'visible') {
+		$result      = $c->maketext('editing visible users');
+		@usersToEdit = grep { $c->{userIsEditable}{$_} } (keys %{ $c->{visibleUserIDs} });
+	} elsif ($scope eq 'selected') {
+		$result      = $c->maketext('editing selected users');
+		@usersToEdit = grep { $c->{userIsEditable}{$_} } (keys %{ $c->{selectedUserIDs} });
+	}
+	$c->{visibleUserIDs} = { map { $_ => 1 } @usersToEdit };
+	$c->{editMode}       = 1;
 
 	return $result;
 }
 
-
-sub password_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	return CGI::div(
-		{ class => 'row mb-2' },
-		CGI::label(
-			{ for => 'password_select', class => 'col-form-label col-form-label-sm col-auto' },
-			$r->maketext('Give new password to which users?')
-		),
-		CGI::div(
-			{ class => 'col-auto' },
-			CGI::popup_menu({
-				id     => 'password_select',
-				name    => 'action.password.scope',
-				values  => [qw(all visible selected)],
-				default => $actionParams{'action.password.scope'}[0] || 'selected',
-				class   => 'form-select form-select-sm',
-				labels  => {
-					all      => $r->maketext('all users'),
-					visible  => $r->maketext('visible users'),
-					selected => $r->maketext('selected users')
-				}
-			})
-		)
-	);
-}
-
-sub password_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r = $self->r;
-
+sub password_handler ($c) {
 	my $result;
-
-	my $scope = $actionParams->{"action.password.scope"}->[0];
-	if ($scope eq "all") {
-		$result = $r->maketext("giving new passwords to all users");
-		$self->{visibleUserIDs} = $self->{allUserIDs};
-	} elsif ($scope eq "visible") {
-		$result = $r->maketext("giving new passwords to visible users");
-		# leave visibleUserIDs alone
-	} elsif ($scope eq "selected") {
-		$result = $r->maketext("giving new passwords to selected users");
-		$self->{visibleUserIDs} = $genericParams->{selected_users}; # an arrayref
-	}
-	$self->{passwordMode} = 1;
+	my @usersToEdit;
+
+	my $scope = $c->param('action.password.scope');
+	if ($scope eq 'all') {
+		$result      = $c->maketext('giving new passwords to all users');
+		@usersToEdit = grep { $c->{userIsEditable}{$_} } @{ $c->{allUserIDs} };
+	} elsif ($scope eq 'visible') {
+		$result      = $c->maketext('giving new passwords to visible users');
+		@usersToEdit = grep { $c->{userIsEditable}{$_} } (keys %{ $c->{visibleUserIDs} });
+	} elsif ($scope eq 'selected') {
+		$result      = $c->maketext('giving new passwords to selected users');
+		@usersToEdit = grep { $c->{userIsEditable}{$_} } (keys %{ $c->{selectedUserIDs} });
+	}
+	$c->{visibleUserIDs} = { map { $_ => 1 } @usersToEdit };
+	$c->{passwordMode}   = 1;
 
 	return $result;
 }
 
-sub delete_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	return CGI::div(
-		CGI::div(
-			{ class => 'd-inline-block alert alert-danger p-1 mb-2' },
-			CGI::em($r->maketext('Warning: Deletion destroys all user-related data and is not undoable!'))
-		),
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'delete_select', class => 'col-form-label col-form-label-sm col-auto' },
-				$r->maketext('Delete which users?')
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					id      => 'delete_select',
-					name    => 'action.delete.scope',
-					values  => [qw(none selected)],
-					default => $actionParams{'action.delete.scope'}[0] || 'none',
-					class   => 'form-select form-select-sm',
-					labels  => {
-						none     => $r->maketext('no users'),
-						selected => $r->maketext('selected users')
-					}
-				})
-			)
-		)
-	);
-}
+sub delete_handler ($c) {
+	my $db    = $c->db;
+	my $user  = $c->param('user');
+	my $scope = $c->param('action.delete.scope');
+	my $num   = 0;
 
-sub delete_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r         = $self->r;
-	my $db        = $r->db;
-	my $user      = $r->param('user');
-	my $scope = $actionParams->{"action.delete.scope"}->[0];
-
-	my @userIDsToDelete = ();
-	if ($scope eq "selected") {
-		@userIDsToDelete = @{ $self->{selectedUserIDs} };
-	}
+	return $c->maketext('Deleted [_1] users.', $num) if ($scope eq 'none');
 
-	my %allUserIDs = map { $_ => 1 } @{ $self->{allUserIDs} };
-	my %visibleUserIDs = map { $_ => 1 } @{ $self->{visibleUserIDs} };
-	my %selectedUserIDs = map { $_ => 1 } @{ $self->{selectedUserIDs} };
+	# grep on userIsEditable would still enforce permissions, but no UI feedback
+	my @userIDsToDelete = keys %{ $c->{selectedUserIDs} };
 
-	my $error = "";
-	my $num = 0;
+	my @resultText;
 	foreach my $userID (@userIDsToDelete) {
-		if ($user eq $userID) { # don't delete yourself!!
-			$error = $r->maketext("You cannot delete yourself!");
+		if ($userID eq $user) {
+			push @resultText, $c->maketext('You cannot delete yourself!');
 			next;
 		}
-		delete $allUserIDs{$userID};
-		delete $visibleUserIDs{$userID};
-		delete $selectedUserIDs{$userID};
+
+		unless ($c->{userIsEditable}{$userID}) {
+			push @resultText, $c->maketext('You are not allowed to delete [_1].', $userID);
+			next;
+		}
+		delete $c->{allUsers}{$userID};
+		delete $c->{visibleUserIDs}{$userID};
+		delete $c->{selectedUserIDs}{$userID};
+		delete $c->{userIsEditable}{$userID};
 		$db->deleteUser($userID);
 		$num++;
 	}
 
-	$self->{allUserIDs} = [ keys %allUserIDs ];
-	$self->{visibleUserIDs} = [ keys %visibleUserIDs ];
-	$self->{selectedUserIDs} = [ keys %selectedUserIDs ];
-
-	return $r->maketext("Deleted [_1] users.", $num) . ($error ? " $error" : '');
+	unshift @resultText, $c->maketext('Deleted [_1] users.', $num);
+	return join(' ', @resultText);
 }
 
-sub add_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	return CGI::div(
-		{ class => 'row mb-2' },
-		CGI::label(
-			{ for => 'add_entry', class => 'col-form-label col-form-label-sm col-auto' },
-			$r->maketext('Add how many users?') . CGI::span({ class => 'required-field' }, '*')
-		),
-		CGI::div(
-			{ class => 'col-auto' },
-			CGI::textfield({
-				id            => 'add_entry',
-				name          => 'number_of_students',
-				value         => 1,
-				size          => 3,
-				aria_required => 'true',
-				class         => 'form-control form-control-sm'
-			})
-		)
-	);
-}
-
-sub add_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	# This action is redirected to the addUser.pm module using ../instructor/add_user/...
-	return "Nothing done by add student handler";
-}
-
-sub import_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	return CGI::div(
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'import_select_source', class => 'col-form-label col-form-label-sm col-sm-auto' },
-				$r->maketext('Import users from what file?')
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					name    => 'action.import.source',
-					id      => 'import_select_source',
-					values  => [ $self->getCSVList() ],
-					default => $actionParams{'action.import.source'}[0] || '',
-					class   => 'form-select form-select-sm',
-					dir     => 'ltr',
-				})
-			)
-		),
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'import_select_replace', class => 'col-form-label col-form-label-sm col-sm-auto' },
-				$r->maketext('Replace which users?')
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					id      => 'import_select_replace',
-					name    => 'action.import.replace',
-					values  => [qw(any visible selected none)],
-					default => $actionParams{'action.import.replace'}[0] || 'none',
-					class   => 'form-select form-select-sm',
-					labels  => {
-						any      => $r->maketext('any users'),
-						visible  => $r->maketext('visible users'),
-						selected => $r->maketext('selected users'),
-						none     => $r->maketext('no users'),
-					}
-				})
-			)
-		),
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'import_select_add', class => 'col-form-label col-form-label-sm col-sm-auto' },
-				$r->maketext('Add which new users?')
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					id      => 'import_select_add',
-					name    => 'action.import.add',
-					values  => [qw(any none)],
-					default => $actionParams{'action.import.add'}[0] || 'any',
-					class   => 'form-select form-select-sm',
-					labels  => {
-						any  => $r->maketext('any users'),
-						none => $r->maketext('no users'),
-					}
-				})
-			)
-		)
-	);
+sub add_handler ($c) {
+	# This action is redirected to the AddUsers.pm module using ../instructor/add_user/...
+	return '';
 }
 
-sub import_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r = $self->r;
+sub import_handler ($c) {
+	my $source  = $c->param('action.import.source');
+	my $add     = $c->param('action.import.add');
+	my $replace = $c->param('action.import.replace');
 
-	my $source = $actionParams->{"action.import.source"}->[0];
-	my $add = $actionParams->{"action.import.add"}->[0];
-	my $replace = $actionParams->{"action.import.replace"}->[0];
-
-	my $fileName = $source;
-	my $createNew = $add eq "any";
+	my $fileName  = $source;
+	my $createNew = $add eq 'any';
 	my $replaceExisting;
 	my @replaceList;
-	if ($replace eq "any") {
-		$replaceExisting = "any";
-	} elsif ($replace eq "none") {
-		$replaceExisting = "none";
-	} elsif ($replace eq "visible") {
-		$replaceExisting = "listed";
-		@replaceList = @{ $self->{visibleUserIDs} };
-	} elsif ($replace eq "selected") {
-		$replaceExisting = "listed";
-		@replaceList = @{ $self->{selectedUserIDs} };
+	if ($replace eq 'any') {
+		# even in any mode, do not allow replacement of higher permission users
+		$replaceExisting = 'listed';
+		@replaceList     = grep { $c->{userIsEditable}{$_} } @{ $c->{allUserIDs} };
+	} elsif ($replace eq 'none') {
+		$replaceExisting = 'none';
+	} elsif ($replace eq 'visible') {
+		$replaceExisting = 'listed';
+		@replaceList     = grep { $c->{userIsEditable}{$_} } (keys %{ $c->{visibleUserIDs} });
+	} elsif ($replace eq 'selected') {
+		$replaceExisting = 'listed';
+		@replaceList     = grep { $c->{userIsEditable}{$_} } (keys %{ $c->{selectedUserIDs} });
 	}
 
-	my ($replaced, $added, $skipped)
-		= $self->importUsersFromCSV($fileName, $createNew, $replaceExisting, @replaceList);
+	my ($replaced, $added, $skipped) = $c->importUsersFromCSV($fileName, $createNew, $replaceExisting, @replaceList);
 
-	# make new users visible... do we really want to do this? probably.
-	push @{ $self->{visibleUserIDs} }, @$added;
-	push @{ $self->{allUserIDs} }, @$added;
+	# make new users visible and update records of replaced users
+	for (@$added) {
+		$c->{allUsers}{ $_->user_id }       = $_;
+		$c->{visibleUserIDs}{ $_->user_id } = 1;
+		$c->{userIsEditable}{ $_->user_id } = 1;
+	}
+	for (@$replaced) {
+		$c->{allUsers}{ $_->user_id } = $_;
+	}
 
 	my $numReplaced = @$replaced;
-	my $numAdded = @$added;
-	my $numSkipped = @$skipped;
-
-	return $r->maketext("[_1] users replaced, [_2] users added, [_3] users skipped. Skipped users: ([_4])", $numReplaced, $numAdded, $numSkipped, join (", ", @$skipped));
-}
+	my $numAdded    = @$added;
+	my $numSkipped  = @$skipped;
 
-sub export_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-
-	return CGI::div(
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'export_select_scope', class => 'col-form-label col-form-label-sm col-sm-auto' },
-				$r->maketext('Export which users?')
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					id      => 'export_select_scope',
-					name    => 'action.export.scope',
-					values  => [qw(all visible selected)],
-					default => $actionParams{'action.export.scope'}[0] || 'visible',
-					class   => 'form-select form-select-sm',
-					labels  => {
-						all      => $r->maketext('all users'),
-						visible  => $r->maketext('visible users'),
-						selected => $r->maketext('selected users')
-					}
-				})
-			)
-		),
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => 'export_select_target', class => 'col-form-label col-form-label-sm col-sm-auto' },
-				$r->maketext('Export to what kind of file?')
-			),
-			CGI::div(
-				{ class => 'col-auto' },
-				CGI::popup_menu({
-					id      => 'export_select_target',
-					name    => 'action.export.target',
-					values  => [ 'new', $self->getCSVList() ],
-					labels  => { new => $r->maketext('Enter filename below') },
-					default => $actionParams{'action.export.target'}[0] || '',
-					class   => 'form-select form-select-sm'
-				})
-			)
-		),
-		CGI::div(
-			{ id => 'export_elements', class => 'row mb-2' },
-			CGI::label(
-				{ for => 'export_filename', class => 'col-form-label col-form-label-sm col-sm-auto' },
-				$r->maketext('Filename') . CGI::span({ class => 'required-field' }, '*') . ':'
-			),
-			CGI::div(
-				{ class => 'col-auto d-inline-flex' },
-				CGI::div(
-					{ class => 'input-group input-group-sm' },
-					CGI::textfield({
-						id            => 'export_filename',
-						name          => 'action.export.new',
-						value         => $actionParams{'action.export.new'}[0] || '',
-						aria_required => 'true',
-						class         => 'form-control form-control-sm'
-					}),
-					CGI::span({ class => 'input-group-text font-monospace' }, '.lst')
-				)
-			)
-		)
-	);
+	return $c->maketext('[_1] users replaced, [_2] users added, [_3] users skipped. Skipped users: ([_4])',
+		$numReplaced, $numAdded, $numSkipped, join(', ', @$skipped));
 }
 
-sub export_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r       = $self->r;
-	my $ce      = $r->ce;
-	my $dir     = $ce->{courseDirs}->{templates};
+sub export_handler ($c) {
+	my $ce  = $c->ce;
+	my $dir = $ce->{courseDirs}{templates};
 
-	my $scope = $actionParams->{"action.export.scope"}->[0];
-	my $target = $actionParams->{"action.export.target"}->[0];
-	my $new = $actionParams->{"action.export.new"}->[0];
+	my $scope  = $c->param('action.export.scope');
+	my $target = $c->param('action.export.target');
+	my $new    = $c->param('action.export.new');
 
 	#get name of templates directory as it appears in file manager
 	$dir =~ s|.*/||;
 
 	my $fileName;
-	if ($target eq "new") {
+	if ($target eq 'new') {
 		$fileName = $new;
 	} else {
 		$fileName = $target;
 	}
 
-	$fileName .= ".lst" unless $fileName =~ m/\.lst$/;
+	$fileName .= '.lst' unless $fileName =~ m/\.lst$/;
 
 	my @userIDsToExport;
-	if ($scope eq "all") {
-		@userIDsToExport = @{ $self->{allUserIDs} };
-	} elsif ($scope eq "visible") {
-		@userIDsToExport = @{ $self->{visibleUserIDs} };
-	} elsif ($scope eq "selected") {
-		@userIDsToExport = @{ $self->{selectedUserIDs} };
+	if ($scope eq 'all') {
+		@userIDsToExport = @{ $c->{allUserIDs} };
+	} elsif ($scope eq 'visible') {
+		@userIDsToExport = keys %{ $c->{visibleUserIDs} };
+	} elsif ($scope eq 'selected') {
+		@userIDsToExport = keys %{ $c->{selectedUserIDs} };
 	}
 
-	$self->exportUsersToCSV($fileName, @userIDsToExport);
-
-	return $r->maketext("[_1] users exported to file [_2]/[_3]", scalar @userIDsToExport, $dir, $fileName);
-}
+	$c->exportUsersToCSV($fileName, @userIDsToExport);
 
-sub cancelEdit_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-	return CGI::span($r->maketext("Abandon changes"));
+	return $c->maketext('[_1] users exported to file [_2]', scalar @userIDsToExport, "$dir/$fileName");
 }
 
-sub cancelEdit_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r      = $self->r;
-
-	#$self->{selectedUserIDs} = $self->{visibleUserIDs};
-		# only do the above if we arrived here via "edit selected users"
-	if (defined $r->param("prev_visible_users")) {
-		$self->{visibleUserIDs} = [ $r->param("prev_visible_users") ];
-	} elsif (defined $r->param("no_prev_visible_users")) {
-		$self->{visibleUserIDs} = [];
-	} else {
-		# leave it alone
+sub cancel_edit_handler ($c) {
+	if (defined $c->param('prev_visible_users')) {
+		$c->{visibleUserIDs} = { map { $_ => 1 } @{ $c->every_param('prev_visible_users') } };
+	} elsif (defined $c->param('no_prev_visible_users')) {
+		$c->{visibleUserIDs} = {};
 	}
-	$self->{editMode} = 0;
-
-	return $r->maketext("Changes abandoned");
-}
+	$c->{editMode} = 0;
 
-sub saveEdit_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-	return CGI::span($r->maketext("Save changes"));
+	return $c->maketext('Changes abandoned');
 }
 
-sub saveEdit_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r           = $self->r;
-	my $db          = $r->db;
-	my $editorUser = $r->param('user');
-	my $editorUserPermission = $db->getPermissionLevel($editorUser)->permission;
+sub save_edit_handler ($c) {
+	my $db = $c->db;
 
-	my @visibleUserIDs = @{ $self->{visibleUserIDs} };
+	my @visibleUserIDs = keys %{ $c->{visibleUserIDs} };
 	foreach my $userID (@visibleUserIDs) {
-		my $User = $db->getUser($userID); # checked
-		die $r->maketext("record for visible user [_1] not found", $userID) unless $User;
-		my $PermissionLevel = $db->getPermissionLevel($userID); # checked
-		die $r->maketext("permissions for [_1] not defined", $userID) unless defined $PermissionLevel;
+		my $User = $db->getUser($userID);
+		die $c->maketext('record for visible user [_1] not found', $userID) unless $User;
+		my $PermissionLevel = $db->getPermissionLevel($userID);
+		die $c->maketext('permissions for [_1] not defined', $userID) unless defined $PermissionLevel;
+		# delete requests for elevated users should never make it this far
+		die $c->maketext('insufficient permission to edit [_1]', $userID) unless ($c->{userIsEditable}{$userID});
 		foreach my $field ($User->NONKEYFIELDS()) {
-			my $param = "user.${userID}.${field}";
-			if (defined $tableParams->{$param}->[0]) {
-				$User->$field($tableParams->{$param}->[0]);
+			my $param = "user.$userID.$field";
+			if (defined $c->param($param)) {
+				$User->$field($c->param($param));
 			}
 		}
 
-		foreach my $field ($PermissionLevel->NONKEYFIELDS()) {
-			my $param = "permission.${userID}.${field}";
-			if (defined $tableParams->{$param}->[0] &&
-			    $tableParams->{$param}->[0] <= $editorUserPermission) {
-				$PermissionLevel->$field($tableParams->{$param}->[0]);
-			}
+		my $param = "user.$userID.permission";
+		if (defined $c->param($param) && $c->param($param) <= $c->{userPermission}) {
+			$PermissionLevel->permission($c->param($param));
 		}
 
 		$db->putUser($User);
 		$db->putPermissionLevel($PermissionLevel);
+
+		$User->{permission} = $PermissionLevel->permission;
+		$c->{allUsers}{$userID} = $User;
 	}
 
-	if (defined $r->param("prev_visible_users")) {
-		$self->{visibleUserIDs} = [ $r->param("prev_visible_users") ];
-	} elsif (defined $r->param("no_prev_visible_users")) {
-		$self->{visibleUserIDs} = [];
-	} else {
-		# leave it alone
+	if (defined $c->param('prev_visible_users')) {
+		$c->{visibleUserIDs} = { map { $_ => 1 } @{ $c->every_param('prev_visible_users') } };
+	} elsif (defined $c->param('no_prev_visible_users')) {
+		$c->{visibleUserIDs} = {};
 	}
 
-	$self->{editMode} = 0;
+	$c->{editMode} = 0;
 
-	return $r->maketext("Changes saved");
+	return $c->maketext('Changes saved');
 }
 
-sub cancelPassword_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-	return CGI::span($r->maketext("Abandon changes"));
-}
-
-sub cancelPassword_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r      = $self->r;
-
-	#$self->{selectedUserIDs} = $self->{visibleUserIDs};
-		# only do the above if we arrived here via "edit selected users"
-	if (defined $r->param("prev_visible_users")) {
-		$self->{visibleUserIDs} = [ $r->param("prev_visible_users") ];
-	} elsif (defined $r->param("no_prev_visible_users")) {
-		$self->{visibleUserIDs} = [];
-	} else {
-		# leave it alone
+sub cancel_password_handler ($c) {
+	if (defined $c->param('prev_visible_users')) {
+		$c->{visibleUserIDs} = { map { $_ => 1 } @{ $c->every_param('prev_visible_users') } };
+	} elsif (defined $c->param('no_prev_visible_users')) {
+		$c->{visibleUserIDs} = {};
 	}
-	$self->{passwordMode} = 0;
-
-	return $r->maketext("Changes abandoned");
-}
+	$c->{passwordMode} = 0;
 
-sub savePassword_form {
-	my ($self, %actionParams) = @_;
-	my $r = $self->r;
-	return CGI::span($r->maketext("Save changes"));
+	return $c->maketext('Changes abandoned');
 }
 
-sub savePassword_handler {
-	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r           = $self->r;
-	my $db          = $r->db;
+sub save_password_handler ($c) {
+	my $db = $c->db;
 
-	my @visibleUserIDs = @{ $self->{visibleUserIDs} };
+	my @visibleUserIDs = keys %{ $c->{visibleUserIDs} };
 	foreach my $userID (@visibleUserIDs) {
-		my $User = $db->getUser($userID); # checked
-		die $r->maketext("record for visible user [_1] not found", $userID) unless $User;
+		my $User = $db->getUser($userID);
+		die $c->maketext('record for visible user [_1] not found', $userID) unless $User;
+		# password requests for elevated users should never make it this far
+		die $c->maketext('insufficient permission to edit [_1]', $userID) unless ($c->{userIsEditable}{$userID});
 		my $param = "user.${userID}.new_password";
-		if ((defined $tableParams->{$param}->[0]) and ($tableParams->{$param}->[0])) {
-			my $newP = $tableParams->{$param}->[0];
-			my $Password = eval {$db->getPassword($User->user_id)}; # checked
+		if ($c->param($param)) {
+			my $newP          = $c->param($param);
+			my $Password      = eval { $db->getPassword($User->user_id) };
 			my $cryptPassword = cryptPassword($newP);
 			if (!defined($Password)) {
 				$Password = $db->newPassword();
@@ -1469,50 +566,45 @@ sub savePassword_handler {
 		}
 	}
 
-	if (defined $r->param("prev_visible_users")) {
-		$self->{visibleUserIDs} = [ $r->param("prev_visible_users") ];
-	} elsif (defined $r->param("no_prev_visible_users")) {
-		$self->{visibleUserIDs} = [];
-	} else {
-		# leave it alone
+	if (defined $c->param('prev_visible_users')) {
+		$c->{visibleUserIDs} = { map { $_ => 1 } @{ $c->every_param('prev_visible_users') } };
+	} elsif (defined $c->param('no_prev_visible_users')) {
+		$c->{visibleUserIDs} = {};
 	}
 
-	$self->{passwordMode} = 0;
+	$c->{passwordMode} = 0;
 
-	return $r->maketext("New passwords saved");
+	return $c->maketext('New passwords saved');
 }
 
+# Sort methods
 
-################################################################################
-# sorts
-################################################################################
+sub byUserID { return lc $a->user_id cmp lc $b->user_id }
 
-sub byUserID       { lc $a->user_id       cmp lc $b->user_id       }
-sub byFirstName    {  (defined $a->first_name && defined $b->first_name) ?  lc $a->first_name cmp lc $b->first_name  : 0;  }
-sub byLastName     {  (defined $a->last_name  && defined $b->last_name ) ?  lc $a->last_name  cmp lc $b->last_name   : 0;  }
-sub byEmailAddress { lc $a->email_address cmp lc $b->email_address }
-sub byStudentID    { lc $a->student_id    cmp lc $b->student_id    }
-sub byStatus       { lc $a->status        cmp lc $b->status        }
-sub bySection      { lc $a->section       cmp lc $b->section       }
-sub byRecitation   { lc $a->recitation    cmp lc $b->recitation    }
-sub byComment      { lc $a->comment       cmp lc $b->comment       }
-sub byPermission   { $a->{permission}    <=>  $b->{permission}     }  ## permission level is added to user record hash so we can sort it if necessary
+sub byFirstName {
+	return (defined $a->first_name && defined $b->first_name) ? lc $a->first_name cmp lc $b->first_name : 0;
+}
+sub byLastName { return (defined $a->last_name && defined $b->last_name) ? lc $a->last_name cmp lc $b->last_name : 0; }
+sub byEmailAddress { return lc $a->email_address cmp lc $b->email_address }
+sub byStudentID    { return lc $a->student_id cmp lc $b->student_id }
+sub byStatus       { return lc $a->status cmp lc $b->status }
+sub bySection      { return lc $a->section cmp lc $b->section }
+sub byRecitation   { return lc $a->recitation cmp lc $b->recitation }
+sub byComment      { return lc $a->comment cmp lc $b->comment }
 
-# sub byLnFnUid { &byLastName || &byFirstName || &byUserID }
+# Permission level is added to the user record hash so we can sort by it if necessary.
+sub byPermission { return $a->{permission} <=> $b->{permission}; }
 
-################################################################################
-# utilities
-################################################################################
+# Utilities
 
 # generate labels for section/recitation popup menus
-sub menuLabels {
-	my ($self, $hashRef) = @_;
+sub menuLabels ($c, $hashRef) {
 	my %hash = %$hashRef;
 
 	my %result;
 	foreach my $key (keys %hash) {
-		my $count = @{ $hash{$key} };
-		my $displayKey = $key || "<none>";
+		my $count      = @{ $hash{$key} };
+		my $displayKey = $key || '<none>';
 		$result{$key} = "$displayKey ($count users)";
 	}
 	return %result;
@@ -1520,25 +612,24 @@ sub menuLabels {
 
 # FIXME REFACTOR this belongs in a utility class so that addcourse can use it!
 # (we need a whole suite of higher-level import/export functions somewhere)
-sub importUsersFromCSV {
-	my ($self, $fileName, $createNew, $replaceExisting, @replaceList) = @_;
-	my $r     = $self->r;
-	my $ce    = $r->ce;
-	my $db    = $r->db;
-	my $dir   = $ce->{courseDirs}->{templates};
-	my $user  = $r->param('user');
-
-	die $r->maketext("illegal character in input: '/'") if $fileName =~ m|/|;
-	die $r->maketext("won't be able to read from file [_1]/[_2]: does it exist? is it readable?", $dir, $fileName)
+sub importUsersFromCSV ($c, $fileName, $createNew, $replaceExisting, @replaceList) {
+	my $ce   = $c->ce;
+	my $db   = $c->db;
+	my $dir  = $ce->{courseDirs}->{templates};
+	my $user = $c->param('user');
+	my $perm = $c->{userPermission};
+
+	die $c->maketext("illegal character in input: '/'") if $fileName =~ m|/|;
+	die $c->maketext("won't be able to read from file [_1]/[_2]: does it exist? is it readable?", $dir, $fileName)
 		unless -r "$dir/$fileName";
 
-	my %allUserIDs = map { $_ => 1 } @{ $self->{allUserIDs} };
+	my %allUserIDs = map { $_ => 1 } @{ $c->{allUserIDs} };
 	my %replaceOK;
-	if ($replaceExisting eq "none") {
+	if ($replaceExisting eq 'none') {
 		%replaceOK = ();
-	} elsif ($replaceExisting eq "listed") {
+	} elsif ($replaceExisting eq 'listed') {
 		%replaceOK = map { $_ => 1 } @replaceList;
-	} elsif ($replaceExisting eq "any") {
+	} elsif ($replaceExisting eq 'any') {
 		%replaceOK = %allUserIDs;
 	}
 
@@ -1553,14 +644,18 @@ sub importUsersFromCSV {
 	my $default_status_abbrev = $ce->{statuses}->{Enrolled}->{abbrevs}->[0];
 
 	foreach my $record (@classlist) {
-		my %record = %$record;
+		my %record  = %$record;
 		my $user_id = $record{user_id};
 
-		unless (WeBWorK::DB::check_user_id($user_id) ) {  # try to catch lines with bad characters
+		unless (WeBWorK::DB::check_user_id($user_id)) {    # try to catch lines with bad characters
 			push @skipped, $user_id;
 			next;
 		}
-		if ($user_id eq $user) { # don't replace yourself!!
+		if ($user_id eq $user) {                           # don't replace yourself!!
+			push @skipped, $user_id;
+			next;
+		}
+		if ($record{permission} && $perm < $record{permission}) {
 			push @skipped, $user_id;
 			next;
 		}
@@ -1594,526 +689,58 @@ sub importUsersFromCSV {
 		$record{permission} = $default_permission_level
 			unless defined $record{permission} and $record{permission} ne "";
 
-		my $User = $db->newUser(%record);
+		my $User            = $db->newUser(%record);
 		my $PermissionLevel = $db->newPermissionLevel(user_id => $user_id, permission => $record{permission});
-		my $Password = $db->newPassword(user_id => $user_id, password => $record{password});
+		my $Password        = $db->newPassword(user_id => $user_id, password => $record{password});
 
 		# DBFIXME use REPLACE
 		if (exists $allUserIDs{$user_id}) {
 			$db->putUser($User);
 			$db->putPermissionLevel($PermissionLevel);
 			$db->putPassword($Password);
-			push @replaced, $user_id;
+			$User->{permission} = $PermissionLevel->permission;
+			push @replaced, $User;
 		} else {
 			$allUserIDs{$user_id} = 1;
 			$db->addUser($User);
 			$db->addPermissionLevel($PermissionLevel);
 			$db->addPassword($Password);
-			push @added, $user_id;
+			$User->{permission} = $PermissionLevel->permission;
+			push @added, $User;
 		}
 	}
 
 	return \@replaced, \@added, \@skipped;
 }
 
-sub exportUsersToCSV {
-	my ($self, $fileName, @userIDsToExport) = @_;
-	my $r       = $self->r;
-	my $ce      = $r->ce;
-	my $db      = $r->db;
-	my $dir     = $ce->{courseDirs}->{templates};
+sub exportUsersToCSV ($c, $fileName, @userIDsToExport) {
+	my $ce  = $c->ce;
+	my $db  = $c->db;
+	my $dir = $ce->{courseDirs}->{templates};
 
-	die $r->maketext("illegal character in input: '/'") if $fileName =~ m|/|;
+	die $c->maketext("illegal character in input: '/'") if $fileName =~ m|/|;
 
 	my @records;
 
-	my @Users = $db->getUsers(@userIDsToExport);
-	my @Passwords = $db->getPasswords(@userIDsToExport);
+	my @Users            = $db->getUsers(@userIDsToExport);
+	my @Passwords        = $db->getPasswords(@userIDsToExport);
 	my @PermissionLevels = $db->getPermissionLevels(@userIDsToExport);
 	foreach my $i (0 .. $#userIDsToExport) {
-		my $User = $Users[$i];
-		my $Password = $Passwords[$i];
+		my $User            = $Users[$i];
+		my $Password        = $Passwords[$i];
 		my $PermissionLevel = $PermissionLevels[$i];
 		next unless defined $User;
 		my %record = (
 			defined $PermissionLevel ? $PermissionLevel->toHash : (),
-			defined $Password ? $Password->toHash : (),
+			defined $Password        ? $Password->toHash        : (),
 			$User->toHash,
 		);
 		push @records, \%record;
 	}
 
 	write_classlist("$dir/$fileName", @records);
-}
-
-################################################################################
-# "display" methods
-################################################################################
-
-sub fieldEditHTML {
-	my ($self, $fieldName, $value, $properties) = @_;
-	my $r                    = $self->r;
-	my $ce                   = $r->ce;
-	my $db                   = $r->db;
-	my $editorUser           = $r->param('user');
-	my $editorUserPermission = $db->getPermissionLevel($editorUser)->permission;
-	my $size                 = $properties->{size};
-	my $type                 = $properties->{type};
-	my $access               = $properties->{access};
-
-	if ($type eq "email") {
-		if ($value eq '&nbsp;') {
-			return $value;
-		} else {
-			return CGI::a({ -href => "mailto:$value" }, $r->maketext('Email'));
-		}
-	}
-
-	if ($access eq "readonly") {
-		# hack for status
-		if ($type eq "status") {
-			my $status_name = $ce->status_abbrev_to_name($value);
-			if (defined $status_name) {
-				$value = $r->maketext($status_name);
-			}
-		}
-		return $value;
-	}
-
-	if ($type eq "number" or $type eq "text") {
-		return CGI::input({
-			type            => "text",
-			id              => $fieldName . "_id",
-			name            => $fieldName,
-			aria_labelledby => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header',
-			value           => $value,
-			size            => $size,
-			class           => 'form-control form-control-sm d-inline w-auto'
-		});
-	}
-
-	if ($type eq "status") {
-		# we used to surreptitously map synonyms to a canonical value...
-		# so should we continue to do that?
-		my $status_name = $ce->status_abbrev_to_name($value);
-		if (defined $status_name) {
-			$value = ($ce->status_name_to_abbrevs($status_name))[0];
-		}
-
-		my (@values, %labels);
-		while (my ($k, $v) = each %{ $ce->{statuses} }) {
-			my @abbrevs = @{ $v->{abbrevs} };
-			push @values, $abbrevs[0];
-			foreach my $abbrev (@abbrevs) {
-				$labels{$abbrev} = $r->maketext($k);
-			}
-		}
-
-		return CGI::popup_menu({
-			id              => $fieldName . "_id",
-			name            => $fieldName,
-			aria_labelledby => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header',
-			values          => \@values,
-			default         => $value,
-			labels          => \%labels,
-			class           => 'form-select form-select-sm w-auto flex-grow-0'
-		});
-	}
-
-	if ($type eq "permission") {
-		my ($default, @values, %labels);
-		my %roles = %{ $ce->{userRoles} };
-		foreach my $role (sort { $roles{$a} <=> $roles{$b} } keys(%roles)) {
-			my $val = $roles{$role};
-			next unless $val <= $editorUserPermission;
-			push(@values, $val);
-			$labels{$val} = $r->maketext($role);
-			$default = $val if ($value eq $role);
-		}
-
-		return CGI::popup_menu({
-			id              => $fieldName . "_id",
-			name            => $fieldName,
-			aria_labelledby => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header',
-			values          => \@values,
-			default         => $default // 0,
-			labels          => \%labels,
-			class           => 'form-select form-select-sm w-auto flex-grow-0'
-		});
-	}
-}
-
-sub recordEditHTML {
-	my ($self, $User, $PermissionLevel, %options) = @_;
-	my $r           = $self->r;
-	my $urlpath     = $r->urlpath;
-	my $db          = $r->db;
-	my $ce          = $r->ce;
-	my $authz	= $r->authz;
-	my $user	= $r->param('user');
-	my $root        = $ce->{webworkURLs}->{root};
-	my $courseName  = $urlpath->arg("courseID");
-
-	my $editMode = $options{editMode};
-	my $passwordMode = $options{passwordMode};
-	my $userSelected = $options{userSelected};
-
-	my $statusClass = $ce->status_abbrev_to_name($User->status);
-
-	my $sets = $db->countUserSets($User->user_id);
-	my $totalSets = $self->{totalSets};
-
-	my $changeEUserURL = $self->systemLink($urlpath->new(type=>'set_list',args=>{courseID=>$courseName}),
-										   params => {effectiveUser => $User->user_id}
-	);
 
-	my $setsAssignedToUserURL = $self->systemLink($urlpath->new(type=>'instructor_user_detail',
-	                                                            args=>{courseID => $courseName,
-	                                                                   userID   => $User->user_id
-	                                                                   }),
-										   params => {effectiveUser => $User->user_id}
-	);
-
-	my $userListURL = $self->systemLink($urlpath->new(type=>'instructor_user_list', args=>{courseID => $courseName} )) . "&editMode=1&visible_users=" . $User->user_id;
-
-	my $imageLink = '';
-
-	if ($authz->hasPermissions($user, "modify_student_data")) {
-	  $imageLink = CGI::a({href => $userListURL}, CGI::i({ class => 'icon fas fa-pencil-alt',
-				  data_alt => "Link to Edit Page for " . $User->user_id, aria_hidden => "true" }, ""));
-	}
-
-	my @tableCells;
-
-	# Select
-	if ($editMode or $passwordMode) {
-		# column not there
-	} else {
-		# selection checkbox
-		push @tableCells,
-			CGI::input({
-				type    => 'checkbox',
-				id      => $User->user_id . '_checkbox',
-				name    => "selected_users",
-				value   => $User->user_id,
-				class   => "form-check-input",
-				$userSelected ? (checked => undef) : (),
-			});
-
-		my $label = '';
-		if (FIELD_PERMS()->{act_as} and not $authz->hasPermissions($user, FIELD_PERMS()->{act_as})) {
-			$label = $User->user_id . ' ' . $imageLink;
-		} else {
-			$label = CGI::a({ href => $changeEUserURL }, $User->user_id) . ' ' . $imageLink;
-		}
-
-		# Make the user id the label for the select user checkbox.
-		push @tableCells,
-			CGI::div({ class => 'label-with-edit-icon' }, CGI::label({ for => $User->user_id . '_checkbox' }, $label));
-	}
-
-	# Login Status
-	if (!$editMode && !$passwordMode) {
-		# check to see if a user is currently logged in
-		my $is_active = $db->existsKeyWhere(
-			{ user_id => $User->user_id, timestamp => { '>=' => time - $ce->{sessionKeyTimeout} } });
-		push @tableCells, $is_active ? CGI::b($r->maketext("Active")) : CGI::em($r->maketext("Inactive"));
-	}
-
-	# change password (only in password mode)
-	if ($passwordMode) {
-		if ($User->user_id eq $user) {
-			# Don't allow a professor to change their own password from this form.
-			push(
-				@tableCells,
-				CGI::div(
-					{ class => 'alert alert-danger px-1 py-0 m-0' },
-					$r->maketext("You may not change your own password here!")
-				)
-			);
-		} else {
-			my $fieldName = 'user.' . $User->user_id . '.' . 'new_password';
-			push @tableCells,
-				CGI::textfield({
-					id              => "${fieldName}_id",
-					name            => $fieldName,
-					aria_labelledby => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header',
-					size            => 14,
-					class           => 'form-control form-control-sm d-inline w-auto'
-				});
-		}
-	}
-	# User ID (edit mode) or Assigned Sets (otherwise)
-	if ( $passwordMode) {
-		# straight user ID
-		push @tableCells, CGI::div({class=>$statusClass}, $User->user_id);
-	} elsif ($editMode) {
-		# straight user ID
-		 my $userDetailPage = $urlpath->new(type =>'instructor_user_detail',
-					                       args =>{
-						                             courseID => $courseName,
-						                             userID   => $User->user_id, #FIXME eventually this should be a list??
-	                }
-	    );
-	    my $userDetailUrl = $self->systemLink($userDetailPage,params =>{});
-		push @tableCells, CGI::a({href=>$userDetailUrl}, $User->user_id);
-
-	} else {
-		# "edit sets assigned to user" link
-		#push @tableCells, CGI::a({href=>$setsAssignedToUserURL}, "Edit sets");
-		if ( FIELD_PERMS()->{sets} and not $authz->hasPermissions($user, FIELD_PERMS()->{sets}) ) {
-			push @tableCells, "$sets/$totalSets";
-		} else {
-			push @tableCells, CGI::a({href=>$setsAssignedToUserURL}, "$sets/$totalSets");
-		}
-	}
-
-	# User Fields
-	foreach my $field ($User->NONKEYFIELDS) {
-	        my $fieldName = 'user.' . $User->user_id . '.' . $field,
-		my $fieldValue = $User->$field;
-# FIXME  utf8, utf8mb4 debugging codes
-#		warn "user values ".join(" ", $User->user_id,$User->first_name, $User->last_name)."\n";
-#		warn "variants". join(" ",$User->user_id, Encode::decode("UTF-8",$User->first_name), Encode::decode("UTF-8",$User->last_name))."\n";
-#		warn "is_utf8 flag, first_name, last_name ".join(" ", utf8::is_utf8($User->first_name)?1:0, utf8::is_utf8($User->last_name)?1:0   )."\n";
-		my %properties = %{ FIELD_PROPERTIES()->{$field} };
-	        next if $properties{access} eq 'hidden';
-		$properties{access} = 'readonly' unless $editMode;
-		$properties{type} = 'email' if ($field eq 'email_address' and !$editMode and !$passwordMode);
-		$fieldValue = $self->nbsp($fieldValue) unless $editMode;
-		push @tableCells, CGI::div({class=>$statusClass}, $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
-	}
-
-	# PermissionLevel Fields
-	foreach my $field ($PermissionLevel->NONKEYFIELDS) {
-		my $fieldName = 'permission.' . $PermissionLevel->user_id . '.' . $field,
-		my $fieldValue = $PermissionLevel->$field;
-		# get name out of permission level
-		if ( $field eq 'permission' ) {
-		  ($fieldValue) = grep { $ce->{userRoles}->{$_} eq $fieldValue } ( keys ( %{$ce->{userRoles}} ) );
-		  $fieldValue = $r->maketext($fieldValue)
-		}
-		my %properties = %{ FIELD_PROPERTIES()->{$field} };
-		$properties{access} = 'readonly' unless $editMode;
-		$fieldValue = $self->nbsp($fieldValue) unless $editMode;
-		push @tableCells, CGI::div({class=>$statusClass}, $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
-	}
-
-	return CGI::Tr(CGI::td(\@tableCells));
-}
-
-sub printTableHTML {
-	my ($self, $UsersRef, $PermissionLevelsRef, $fieldNamesRef, %options) = @_;
-	my $r                       = $self->r;
-	my $urlpath     = $r->urlpath;
-	my $courseName  = $urlpath->arg("courseID");
-	my $userTemplate            = $self->{userTemplate};
-	my $permissionLevelTemplate = $self->{permissionLevelTemplate};
-	my @Users                   = @$UsersRef;
-	my @PermissionLevels        = @$PermissionLevelsRef;
-	my %fieldNames              = %$fieldNamesRef;
-
-	my $editMode                = $options{editMode};
-	my $passwordMode            = $options{passwordMode};
-	my %selectedUserIDs         = map { $_ => 1 } @{ $options{selectedUserIDs} };
-	my $primarySortField        = $options{primarySortField};
-	my $secondarySortField      = $options{secondarySortField};
-	my @visableUserIDs          = @{ $options{visableUserIDs} };
-
-	# names of headings:
-	my @realFieldNames = (
-		$userTemplate->KEYFIELDS,
-		$userTemplate->NONKEYFIELDS,
-		$permissionLevelTemplate->NONKEYFIELDS,
-	);
-
-	my @tableHeadings;
-
-	unless ($editMode || $passwordMode) {
-		my %current_state;
-		if (@visableUserIDs) {
-			# This is a hack to get around: Maximum URL Length Is 2,083 Characters in Internet Explorer.
-			# Without passing visable users the URL is about 250 characters. If the total URL is under the limit
-			# we will pass visable users. If it is over, we will not pass any and all users will be displayed.
-			# Maybe we should replace the GET method by POST (but this doesn't look good) --- AKP
-
-			my $visableUserIDsString = join ':', @visableUserIDs;
-			if (length($visableUserIDsString) < 1830) {
-				%current_state = (
-					primarySortField => "$primarySortField",
-					secondarySortField => "$secondarySortField",
-					visable_user_string => "$visableUserIDsString"
-				);
-			} else {
-				%current_state = (
-					primarySortField => "$primarySortField",
-					secondarySortField => "$secondarySortField",
-					show_all_users => "1"
-				);
-			}
-		} else {
-			%current_state = (
-				primarySortField => "$primarySortField",
-				secondarySortField => "$secondarySortField",
-				no_visible_users => "1"
-			);
-		}
-
-		push(
-			@tableHeadings,
-			CGI::th(CGI::input({
-				type              => 'checkbox',
-				id                => 'select-all',
-				aria_label        => $r->maketext('Select all users'),
-				data_select_group => 'selected_users',
-				class             => 'select-all form-check-input',
-			})),
-			CGI::th(CGI::label(
-				{ for => 'select-all' },
-				CGI::a(
-					{
-						href => $self->systemLink(
-							$urlpath->new(type => 'instructor_user_list', args => { courseID => $courseName, }),
-							params => { labelSortMethod => 'user_id', %current_state }
-						)
-					},
-					$r->maketext('Login Name')
-				)
-			)),
-			CGI::th($r->maketext("Login Status")),
-			CGI::th($r->maketext("Assigned Sets")),
-			CGI::th(CGI::a(
-				{
-					href => $self->systemLink(
-						$urlpath->new(type => 'instructor_user_list', args => { courseID => $courseName, }),
-						params => { labelSortMethod => 'first_name', %current_state }
-					)
-				},
-				$r->maketext('First Name')
-			)),
-			CGI::th(CGI::a(
-				{
-					href => $self->systemLink(
-						$urlpath->new(type => 'instructor_user_list', args => { courseID => $courseName, }),
-						params => { labelSortMethod => 'last_name', %current_state }
-					)
-				},
-				$r->maketext('Last Name')
-			)),
-			CGI::th($r->maketext('Email Link')),
-			CGI::th(CGI::a(
-				{
-					href => $self->systemLink(
-						$urlpath->new(type => 'instructor_user_list', args => { courseID => $courseName, }),
-						params => { labelSortMethod => 'student_id', %current_state }
-					)
-				},
-				$r->maketext('Student ID')
-			)),
-			CGI::th(CGI::a(
-				{
-					href => $self->systemLink(
-						$urlpath->new(type => 'instructor_user_list', args => { courseID => $courseName, }),
-						params => { labelSortMethod => 'status', %current_state }
-					)
-				},
-				$r->maketext('Status')
-			)),
-			CGI::th(CGI::a(
-				{
-					href => $self->systemLink(
-						$urlpath->new(type => 'instructor_user_list', args => { courseID => $courseName, }),
-						params => { labelSortMethod => 'section', %current_state }
-					)
-				},
-				$r->maketext('Section')
-			)),
-			CGI::th(CGI::a(
-				{
-					href => $self->systemLink(
-						$urlpath->new(type => 'instructor_user_list', args => { courseID => $courseName, }),
-						params => { labelSortMethod => 'recitation', %current_state }
-					)
-				},
-				$r->maketext('Recitation')
-			)),
-			CGI::th(CGI::a(
-				{
-					href => $self->systemLink(
-						$urlpath->new(type => 'instructor_user_list', args => { courseID => $courseName, }),
-						params => { labelSortMethod => 'comment', %current_state }
-					)
-				},
-				$r->maketext('Comment')
-			)),
-			CGI::th(CGI::a(
-				{
-					href => $self->systemLink(
-						$urlpath->new(type => 'instructor_user_list', args => { courseID => $courseName, }),
-						params => { labelSortMethod => 'permission', %current_state }
-					)
-				},
-				$r->maketext('Permission Level')
-			)),
-		);
-	} else {
-		for my $field (@realFieldNames) {
-			my %properties = %{ FIELD_PROPERTIES()->{$field} };
-			next if $properties{access} eq 'hidden';
-			push @tableHeadings, CGI::th({ id => "${field}_header"}, $fieldNames{$field});
-		}
-	}
-
-	unshift(@tableHeadings, CGI::th({ id => "new_password_header"}, $r->maketext("New Password"))) if ($passwordMode);
-
-	# Print the table.
-	print CGI::start_div({ class => 'table-responsive' });
-	print CGI::start_table({
-		id    => "classlist-table",
-		class => "table table-sm table-bordered caption-top font-sm"
-			. ($editMode || $passwordMode ? ' align-middle' : '')
-	});
-
-	print CGI::caption($r->maketext("Users List"));
-
-	print CGI::thead(CGI::Tr(@tableHeadings));
-
-	print CGI::start_tbody();
-
-	for (my $i = 0; $i < @Users; $i++) {
-		my $User = $Users[$i];
-		my $PermissionLevel = $PermissionLevels[$i];
-
-		print $self->recordEditHTML($User, $PermissionLevel,
-			editMode => $editMode,
-			passwordMode => $passwordMode,
-			userSelected => exists $selectedUserIDs{$User->user_id}
-		);
-	}
-	print CGI::end_tbody();
-
-	print CGI::end_table(), CGI::end_div();
-
-	# if there are no users shown print message
-	print CGI::p(
-		CGI::i($r->maketext("No students shown.  Choose one of the options above to list the students in the course."))
-	) unless @Users;
-}
-
-# output_JS subroutine
-
-# prints out the necessary JS for this page
-
-sub output_JS {
-	my $self = shift;
-	my $ce   = $self->r->ce;
-
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/ShowHide/show_hide.js'),    defer => undef }, '');
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/ActionTabs/actiontabs.js'), defer => undef }, "");
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/UserList/userlist.js'),     defer => undef }, '');
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/SelectAll/selectall.js'),   defer => undef }, '');
-
-	return '';
+	return;
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm b/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm
index 2457de320b..26dff0f76a 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Instructor::UsersAssignedToSet;
-use base qw(WeBWorK::ContentGenerator::Instructor);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -23,51 +23,46 @@ users to which sets are assigned.
 
 =cut
 
-use strict;
-use warnings;
-use CGI qw(-nosticky );
 use WeBWorK::Debug;
 use WeBWorK::Utils qw(format_set_name_display);
+use WeBWorK::Utils::Instructor qw(assignSetToAllUsers assignSetToGivenUsers);
 
-sub initialize {
-	my ($self)  = @_;
-	my $r       = $self->r;
-	my $urlpath = $r->urlpath;
-	my $authz   = $r->authz;
-	my $db      = $r->db;
-	my $setID   = $urlpath->arg("setID");
-	my $user    = $r->param('user');
+sub initialize ($c) {
+	my $authz = $c->authz;
+	my $db    = $c->db;
+	my $setID = $c->stash('setID');
+	my $user  = $c->param('user');
 
 	# Check permissions
 	return unless $authz->hasPermissions($user, "access_instructor_tools");
 	return unless $authz->hasPermissions($user, "assign_problem_sets");
 
-	my %selectedUsers = map { $_ => 1 } $r->param('selected');
+	my %selectedUsers = map { $_ => 1 } $c->param('selected');
 
 	my $doAssignToSelected = 0;
 
-	if (defined $r->param('assignToAll')) {
+	if (defined $c->param('assignToAll')) {
 		debug("assignSetToAllUsers($setID)");
-		$self->addgoodmessage($r->maketext("Problems have been assigned to all current users."));
-		$self->assignSetToAllUsers($setID);
+		$c->addgoodmessage($c->maketext("Problems have been assigned to all current users."));
+		assignSetToAllUsers($db, $c->ce, $setID);
 		debug("done assignSetToAllUsers($setID)");
-	} elsif (defined $r->param('unassignFromAll')
-		&& defined($r->param('unassignFromAllSafety'))
-		&& $r->param('unassignFromAllSafety') == 1)
+	} elsif (defined $c->param('unassignFromAll')
+		&& defined($c->param('unassignFromAllSafety'))
+		&& $c->param('unassignFromAllSafety') == 1)
 	{
 		%selectedUsers = ();
-		$self->addgoodmessage($r->maketext("Problems for all students have been unassigned."));
+		$c->addgoodmessage($c->maketext("Problems for all students have been unassigned."));
 		$doAssignToSelected = 1;
-	} elsif (defined $r->param('assignToSelected')) {
-		$self->addgoodmessage($r->maketext("Problems for selected students have been reassigned."));
+	} elsif (defined $c->param('assignToSelected')) {
+		$c->addgoodmessage($c->maketext("Problems for selected students have been reassigned."));
 		$doAssignToSelected = 1;
-	} elsif (defined $r->param("unassignFromAll")) {
+	} elsif (defined $c->param("unassignFromAll")) {
 		# no action taken
-		$self->addbadmessage($r->maketext("No action taken"));
+		$c->addbadmessage($c->maketext("No action taken"));
 	}
 
 	# Get all user records and cache them for later use.
-	$self->{user_records} =
+	$c->{user_records} =
 		[ $db->getUsersWhere({ user_id => { not_like => 'set_id:%' } }, [qw/section last_name first_name/]) ];
 
 	if ($doAssignToSelected) {
@@ -75,184 +70,26 @@ sub initialize {
 		die "Unable to get global set record for $setID " unless $setRecord;
 
 		my %setUsers = map { $_ => 1 } $db->listSetUsers($setID);
-		for my $selectedUser (map { $_->user_id } @{ $self->{user_records} }) {
+		my @usersToAdd;
+		for my $selectedUser (map { $_->user_id } @{ $c->{user_records} }) {
 			if (exists $selectedUsers{$selectedUser}) {
 				unless ($setUsers{$selectedUser}) {    # skip users already in the set
-					debug("assignSetToUser($selectedUser, ...)");
-					$self->assignSetToUser($selectedUser, $setRecord);
-					debug("done assignSetToUser($selectedUser, ...)");
+					debug("saving $selectedUser to be added to set later");
+					push(@usersToAdd, $selectedUser);
 				}
 			} else {
 				next unless $setUsers{$selectedUser};    # skip users not in the set
 				$db->deleteUserSet($selectedUser, $setID);
 			}
 		}
+		if (@usersToAdd) {
+			debug("assignSetToGivenUsers(...)");
+			assignSetToGivenUsers($db, $c->ce, $setID, 1, $db->getUsers(@usersToAdd));
+			debug("done assignSetToGivenUsers(...)");
+		}
 	}
-}
-
-sub getSetName {
-	my ($self, $pathSetName) = @_;
-	if (ref $pathSetName eq "HASH") {
-		$pathSetName = undef;
-	}
-	return $pathSetName;
-}
-
-sub body {
-	my ($self)      = @_;
-	my $r           = $self->r;
-	my $urlpath     = $r->urlpath;
-	my $db          = $r->db;
-	my $ce          = $r->ce;
-	my $authz       = $r->authz;
-	my $webworkRoot = $ce->{webworkURLs}->{root};
-	my $courseName  = $urlpath->arg('courseID');
-	my $setID       = $urlpath->arg('setID');
-	my $user        = $r->param('user');
-
-	return CGI::div({ class => 'alert alert-danger p-1' }, 'You are not authorized to acces the Instructor tools.')
-		unless $authz->hasPermissions($user, 'access_instructor_tools');
-
-	return CGI::div({ class => 'alert alert-danger p-1' }, 'You are not authorized to assign homework sets.')
-		unless $authz->hasPermissions($user, 'assign_problem_sets');
-
-	print CGI::start_form({
-		id     => 'user-set-form',
-		name   => 'user-set-form',
-		method => 'post',
-		action => $self->systemLink($urlpath, authen => 0)
-	});
-
-	print CGI::div(
-		{ class => 'my-2' },
-		CGI::submit({
-			name  => 'assignToAll',
-			value => $r->maketext('Assign to All Current Users'),
-			class => 'btn btn-primary'
-		}),
-		CGI::i($r->maketext('This action can take a long time if there are many students.'))
-	);
-
-	print CGI::div(
-		{ class => 'alert alert-danger p-1 mb-2' },
-		CGI::div({ class => 'mb-1' }, $r->maketext('Do not uncheck students, unless you know what you are doing.')),
-		CGI::div($r->maketext('There is NO undo for unassigning students.'))
-	);
-
-	print CGI::div(
-		{ class => 'mb-2' },
-		$r->maketext(
-			"When you unassign by unchecking a student's name, you destroy all of the data for homework set [_1] "
-				. 'for this student. You will then need to reassign the set to these students and they will receive '
-				. 'new versions of the problems. Make sure this is what you want to do before unchecking students.',
-			CGI::b({ dir => 'ltr' }, format_set_name_display($setID))
-		)
-	);
-
-	print CGI::start_div({ class => 'table-responsive' }),
-		CGI::start_table({ class => 'table table-bordered table-sm font-sm text-nowrap w-auto' });
-	print CGI::thead(CGI::Tr(
-		CGI::th({ class => 'text-center' }, $r->maketext('Assigned')),
-		CGI::th([ $r->maketext('Login Name'), $r->maketext('Student Name') ]),
-		CGI::th({ class => 'text-center' }, $r->maketext('Section')),
-		CGI::th([ $r->maketext('Close Date'), $r->maketext('Edit Data') ])
-	));
-
-	# there are two set detail pages.  If we were sent here from the second one
-	# there will be a parameter we can use to get back to that one from these links
-	my $detailPageType = 'instructor_set_detail';
-	$detailPageType = $r->param('pageVersion') if ($r->param('pageVersion'));
-
-	print CGI::start_tbody();
-	for my $userRecord (@{ $self->{user_records} }) {
-
-		my $statusClass = $ce->status_abbrev_to_name($userRecord->status) || '';
-
-		my $user          = $userRecord->user_id;
-		my $userSetRecord = $db->getUserSet($user, $setID);
-		my $prettyName    = $userRecord->last_name . ', ' . $userRecord->first_name;
-		my $dueDate       = $userSetRecord->due_date if ref($userSetRecord);
-		my $prettyDate = $dueDate ? $self->formatDateTime($dueDate, '', 'datetime_format_short', $ce->{language}) : '';
-		print CGI::Tr(
-			CGI::td(
-				{ class => 'text-center' },
-				CGI::input({
-					type  => 'checkbox',
-					name  => 'selected',
-					id    => "selected_$user",
-					value => $user,
-					class => 'form-check-input',
-					defined($userSetRecord) ? (checked => undef) : ()
-				})
-			),
-			CGI::td([
-				CGI::div({ class => $statusClass }, CGI::label({ for => "selected_$user" }, $user)), $prettyName ]),
-			CGI::td({ class => 'text-center' }, $userRecord->section),
-			CGI::td([
-				(
-					defined $userSetRecord
-					? (
-						$prettyDate,
-						CGI::a(
-							{
-								href => $self->systemLink(
-									$urlpath->new(
-										type => $detailPageType,
-										args => { courseID => $courseName, setID => $setID }
-									),
-									params => { editForUser => $user }
-								)
-							},
-							'',
-							$r->maketext('Edit data for [_1]', $user)
-						)
-						)
-					: ('', '')
-				),
-			])
-		);
-	}
-	print CGI::end_tbody(), CGI::end_table(), CGI::end_div();
-	print $self->hidden_authen_fields;
-
-	print CGI::submit({
-		name  => 'assignToSelected',
-		value => $r->maketext('Save'),
-		class => 'btn btn-primary'
-	});
-
-	print CGI::hr()
-		. CGI::div(
-			CGI::div(
-				{ class => 'alert alert-danger p-1 mb-3' },
-				$r->maketext(
-					'There is NO undo for this function.  Do not use it unless you know what you are doing!  '
-						. 'When you unassign a student using this button, or by unchecking their name, you destroy all '
-						. "of the data for homework set [_1] for this student.",
-					CGI::span({ dir => 'ltr' }, format_set_name_display($setID))
-				)
-			),
-			CGI::div(
-				{ class => 'd-flex flex-wrap align-items-center' },
-				CGI::submit({
-					name  => 'unassignFromAll',
-					value => $r->maketext('Unassign from All Users'),
-					class => 'btn btn-primary'
-				}),
-				CGI::radio_group({
-					name            => 'unassignFromAllSafety',
-					values          => [ 0, 1 ],
-					default         => 0,
-					labels          => { 0 => $r->maketext('Read only'), 1 => $r->maketext('Allow unassign') },
-					class           => 'form-check-input mx-1',
-					labelattributes => { class => 'form-check-label text-nowrap' },
-				}),
-			)
-		) . CGI::hr();
-
-	print CGI::end_form();
 
-	return '';
+	return;
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/InstructorRPCHandler.pm b/lib/WeBWorK/ContentGenerator/InstructorRPCHandler.pm
new file mode 100644
index 0000000000..4b099cb31b
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/InstructorRPCHandler.pm
@@ -0,0 +1,89 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ContentGenerator::InstructorRPCHandler;
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures, -async_await;
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::InstructorRPCHandler is a front end for instructor
+calls to the rpc WebworkWebservice
+
+=head1 Description
+
+Receives requests containing WebworkWebservice remote procedure call commands,
+executes them, and returns the resutls.
+
+Note that the WebworkWebservice renderProblem command is not supported by this
+endpoint.  The render_rpc endpoint defined in the
+WeBWorK::ContentGenerator::RenderViaRPC module handles that command.
+
+Note that there will always be a valid JSON response to this endpoint.  If an
+error occurs, then the response will contain an "error" key.
+
+=cut
+
+use JSON;
+
+use WebworkWebservice;
+
+async sub pre_header_initialize ($c) {
+	unless ($c->authen->was_verified) {
+		$c->{output} = $c->maketext('Authentication failed. Log in again to continue.');
+		return;
+	}
+
+	my $rpc_command = $c->param('rpc_command');
+
+	unless ($rpc_command) {
+		$c->{output} = 'instructor_rpc: rpc_command not provided.';
+		return;
+	}
+
+	# The renderProblem command is not supported by this method.
+	# The render_rpc endpoint should be used for that instead.
+	if ($rpc_command eq 'renderProblem') {
+		$c->{output} =
+			'instructor_rpc: The renderProblem command is not supported by this endpoint. Use render_rpc instead';
+		return;
+	}
+
+	# Call the WebworkWebservice to execute the requested command.
+	my $rpc_service = WebworkWebservice->new($c);
+	await $rpc_service->rpc_execute($rpc_command);
+	$c->{output} = $rpc_service;
+
+	return;
+}
+
+sub content ($c) {
+	# This endpoint always responds with a valid JSON response.
+
+	return $c->render(json => { error => $c->{output} }) if (ref($c->{output}) !~ /WebworkWebservice/);
+
+	my $rpc_service = $c->{output};
+	if ($rpc_service->error_string) {
+		return $c->render(json => { error => $rpc_service->error_string });
+	} else {
+		return $c->render(
+			json => {
+				server_response => $rpc_service->return_object->{text},
+				result_data     => $rpc_service->return_object->{ra_out} // ''
+			}
+		);
+	}
+}
+
+1;
diff --git a/lib/WeBWorK/HTML/InfoBox.pm b/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm
similarity index 51%
rename from lib/WeBWorK/HTML/InfoBox.pm
rename to lib/WeBWorK/ContentGenerator/LTIAdvantage.pm
index 50f231725a..18772250cb 100644
--- a/lib/WeBWorK/HTML/InfoBox.pm
+++ b/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm
@@ -1,6 +1,6 @@
-################################################################################
+###############################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -13,27 +13,26 @@
 # Artistic License for more details.
 ################################################################################
 
-package WeBWorK::HTML::InfoBox;
-use base qw(Exporter);
-
-=head1 NAME
+package WeBWorK::ContentGenerator::LTIAdvantage;
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
-WeBWorK::HTML::InfoBox - HTML widget for a box to display information in.
+use WeBWorK::Authen::LTIAdvantage::SubmitGrade;
+use WeBWorK::Debug;
 
-=cut
+sub login ($c) {
+	return $c->render('ContentGenerator/LTIAdvantage/login_repost');
+}
 
-use strict;
-use warnings;
-use Carp;
+sub launch ($c) {
+	return $c->redirect_to($c->systemLink($c->url_for($c->stash->{LTILauncRedirect})));
+}
 
-our @EXPORT    = ();
-our @EXPORT_OK = qw(
-	infoBox
-);
+sub keys ($c) {
+	my ($public_keyset, $err) = WeBWorK::Authen::LTIAdvantage::SubmitGrade::get_site_key($c->ce);
+	return $c->render(json => $public_keyset) if $public_keyset;
 
-sub infoBox {
-	# FIXME: write this!
-	# see: Login, ProblemSets, ProblemSet for disasters
+	debug("Error loading or generating site keys: $err");
+	return $c->render(data => 'Internal site configuration error', status => 500);
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Login.pm b/lib/WeBWorK/ContentGenerator/Login.pm
index 9d79a0093c..99abdc0fca 100644
--- a/lib/WeBWorK/ContentGenerator/Login.pm
+++ b/lib/WeBWorK/ContentGenerator/Login.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,8 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Login;
-use base qw(WeBWorK);
-use base qw(WeBWorK::ContentGenerator);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -23,274 +22,109 @@ WeBWorK::ContentGenerator::Login - display a login form.
 
 =cut
 
-use strict;
-use warnings;
-#use CGI qw(-nosticky );
-use WeBWorK::CGI;
-use WeBWorK::Utils qw(readFile dequote jitar_id_to_seq format_set_name_display);
-use Encode;
-
-# This content generator is NOT logged in.
-# BUT one must return a 1 so that error messages can be displayed.
-sub if_loggedin {
-	my ($self, $arg) = @_;
-#	return !$arg;
-	return 1;
-}
-
-sub title {
-	my ($self) = @_;
-	my $r = $self->r;
-	# using the url arguments won't break if the set/problem are invalid
-	my $setID     = $self->r->urlpath->arg('setID');
-	my $problemID = $self->r->urlpath->arg('problemID');
+use WeBWorK::Utils qw(readFile jitar_id_to_seq format_set_name_display);
 
+sub page_title ($c) {
 	# If the url is for a problem page, then the title is the set and problem id.
+	my $problemID = $c->stash('problemID');
 	if ($problemID) {
+		my $setID = $c->stash('setID');
+
 		# Print the pretty version of the problem id for a jitar set.
-		my $set = $r->db->getGlobalSet($setID);
+		my $set = $c->db->getGlobalSet($setID);
 		if ($set && $set->assignment_type eq 'jitar') {
 			$problemID = join('.', jitar_id_to_seq($problemID));
 		}
 
-		return $r->maketext('[_1]: Problem [_2]', CGI::span({ dir => 'ltr' }, format_set_name_display($setID)),
-			$problemID);
+		return $c->maketext('[_1]: Problem [_2]',
+			$c->tag('span', dir => 'ltr', format_set_name_display($setID)), $problemID);
 	}
 
-	my $ref = $self->SUPER::title();
-	return $ref;
+	return $c->SUPER::page_title();
 }
 
-sub info {
+sub info ($c) {
+	my $ce = $c->ce;
 
-	######### NOTES ON TRANSLATION
-	# -translation of the content found in the info panel.  Since most of this content is in fact read from files, a simple use of maketext would be too limited to translate these types of content efficiently.
+	my $result = $c->c;
 
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
+	# This section should be kept in sync with the Home.pm version.
 
-	my $result;
-	# This section should be kept in sync with the Home.pm version
-	# list the login info first.
+	# List the login info first.
+	# Login info is relative to the templates directory.
+	push(
+		@$result,
+		$c->output_info_file(
+			$c->maketext('Login Info'),
+			"$ce->{courseDirs}{templates}/$ce->{courseFiles}{login_info}"
+		)
+	) if ($ce->{courseFiles}{login_info});
 
-	# FIXME this is basically the same code as below... TIME TO REFACTOR!
-	my $login_info = $ce->{courseFiles}->{login_info};
+	push(@$result, $c->output_info_file($c->maketext('Site Information'), $ce->{webworkFiles}{site_info}))
+		if $ce->{webworkFiles}{site_info};
 
-	if (defined $login_info and $login_info) {
-		# login info is relative to the templates directory, apparently
-		$login_info = $ce->{courseDirs}->{templates} . "/$login_info";
-
-		if (-f $login_info) {
-			my $text = eval { readFile($login_info) };
-			if ($@) {
-				$result .= CGI::h2($r->maketext("Login Info"));
-				$result .= CGI::div({ class => 'alert alert-danger p-1 mb-2' }, $@);
-			} elsif ($text =~ /\S/) {
-				$result .= CGI::h2($r->maketext("Login Info"));
-				$result .= $text;
-			}
-		}
-	}
+	return $result->join('');
+}
 
-	my $site_info = $ce->{webworkFiles}->{site_info};
-	if (defined $site_info and $site_info) {
-		if (-f $site_info) {
-			my $text = eval { readFile($site_info) };
-			if ($@) {
-				$result .= CGI::h2($r->maketext("Site Information"));
-				$result .= CGI::div({ class => 'alert alert-danger p-1 mb-2' }, $@);
-			} elsif ($text =~ /\S/) {
-				$result .= CGI::h2($r->maketext("Site Information"));
-				$result .= $text;
-			}
+sub output_info_file ($c, $info_title, $info_file) {
+	if (-f $info_file) {
+		my $text = eval { readFile($info_file) };
+		if ($@) {
+			return $c->tag('h2', $info_title) . $c->tag('div', class => 'alert alert-danger p-1 mb-2', $@);
+		} elsif ($text =~ /\S/) {
+			return $c->tag('h2', $info_title) . $text;
 		}
 	}
 
-	if (defined $result and $result ne "") {
-	    return $result;
-	} else {
-		return "";
-	}
+	return '';
 }
 
-# Override the if_can method to disable links for the login page.
-sub if_can {
-	my ($self, $arg) = @_;
-	return $arg eq 'links' ? 0 : $self->SUPER::if_can($arg);
+# Override the can method to disable links for the login page.
+sub can ($c, $arg) {
+	return $arg eq 'links' ? 0 : $c->SUPER::can($arg);
 }
 
-sub pre_header_initialize {
-	my ($self) = @_;
-	my $authen = $self->r->authen;
+sub pre_header_initialize ($c) {
+	my $ce     = $c->ce;
+	my $authen = $c->authen;
 
-	if ( defined($authen->{redirect}) && $authen->{redirect} ) {
-		$self->reply_with_redirect($authen->{redirect});
+	if ($authen->{redirect}) {
+		$c->reply_with_redirect($authen->{redirect});
+		return;
 	}
-}
-
-sub head {
-	my ($self) = @_;
-	my $ce = $self->r->ce;
-	my $contents = $ce->{options}{metaRobotsContent} // 'none';
-        print '<meta name="robots" content="'.$contents.'" />';
-        return "";
-}
 
-sub body {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $urlpath = $r->urlpath;
+	# This should be set in the course environment when a sequence of authentication modules is used.
+	$c->stash->{externalAuth} = $ce->{external_auth} || $authen->{external_auth};
 
-	# get the authen object to make sure that we should print
-	#    a login form or not
-	my $auth = $r->authen;
+	my $hidden_fields = '';
+	my @allowedGuestUsers;
 
-	# The following line may not work when a sequence of authentication modules
-    # are used, because the preferred module might be external, e.g., LTIBasic,
-    # but a non-external one, e.g., Basic_TheLastChance or
-    # even just WeBWorK::Authen, might handle the ongoing session management.
-    # So this should be set in the course environment when a sequence of
-	# authentication modules is used..
-	#my $externalAuth = (defined($auth->{external_auth}) && $auth->{external_auth} ) ? 1 : 0;
-	my $externalAuth = ((defined($ce->{external_auth}) && $ce->{external_auth})
- 		or (defined($auth->{external_auth}) && $auth->{external_auth}) ) ? 1 : 0;
+	if (!$c->stash->{externalAuth}) {
+		# Preserve the form data posted to the requested URI
+		my @fields_to_print = grep { !m/^(user|passwd|key|force_passwd_authen)$/ } $c->param;
 
-	# get some stuff together
-	my $user = $r->param("user") || "";
-	my $key = $r->param("key");
-	my $passwd = $r->param("passwd") || "";
-	my $course = $urlpath->arg("courseID") =~ s/_/ /gr;
-	my $practiceUserPrefix = $ce->{practiceUserPrefix};
-
-	# don't fill in the user ID for practice users
-	# (they should use the "Guest Login" button)
-	$user = "" if $user =~ m/^$practiceUserPrefix/;
-
-	# WeBWorK::Authen::verify will set the note "authen_error"
-	# if invalid authentication is found.  If this is done, it's a signal to
-	# us to yell at the user for doing that, since Authen isn't a content-
-	# generating module.
-	my $authen_error = $r->notes->get("authen_error");
-	$authen_error = Encode::decode("UTF-8",$authen_error);
-
-	if ($authen_error) {
-		print CGI::div({ class => 'alert alert-danger', tabindex => '0' }, $authen_error);
-	}
-
-	if ($externalAuth ) {
-		my $LMS = ($ce->{LMS_url}) ? CGI::a({ href => $ce->{LMS_url} },$ce->{LMS_name}) : $ce->{LMS_name};
-		if (!$authen_error || $r->authen() eq "WeBWorK::Authen::LTIBasic") {
-			print CGI::p($r->maketext('The course [_1] uses an external authentication system ([_2]). ' .
-					'Please return to that system to access this course.', CGI::strong($course), $LMS));
-		} else {
-			print CGI::p($r->maketext(
-				'The course [_1] uses an external authentication system ([_2]). You\'ve authenticated through that '
-					. 'system, but aren\'t allowed to log in to this course.',
-				CGI::strong($course),
-				$LMS
-			));
-		}
-	} else {
-		print CGI::p($r->maketext("Please enter your username and password for [_1] below:", CGI::b($course)));
-		if ($ce->{session_management_via} ne "session_cookie") {
-			print CGI::p($r->maketext(
-				'If you check [_1] your login information will be remembered by the browser you are using, allowing '
-					. 'you to visit WeBWorK pages without typing your user name and password (until your session '
-					. 'expires). This feature is not safe for public workstations, untrusted machines, and machines '
-					. 'over which you do not have direct control.',
-				CGI::b($r->maketext("Remember Me"))
-			));
-		}
-
-		print CGI::start_form({ method => "POST", action => $r->uri, id => "login_form" });
-
-		# preserve the form data posted to the requested URI
-		my @fields_to_print = grep { not m/^(user|passwd|key|force_passwd_authen)$/ } $r->param;
-
-		# Important note. If hidden_fields is passed an empty array
-		# it prints ALL parameters as hidden fields.  That is not
-		# what we want in this case, so we don't print at all if
-		# @fields_to_print is empty.
-		print $self->hidden_fields(@fields_to_print) if @fields_to_print > 0;
-
-		print CGI::start_div({ class => 'col-xl-5 col-lg-6 col-md-7 col-sm-8 my-3' });
-		print CGI::div(
-			{ class => 'form-floating mb-2' },
-			CGI::textfield({
-				id            => 'uname',
-				name          => 'user',
-				value         => $user,
-				aria_required => 'true',
-				class         => 'form-control',
-				placeholder   => ''
-			}),
-			CGI::label({ for => 'uname' }, $r->maketext('Username'))
-		);
-		print CGI::div(
-			{ class => 'form-floating mb-2' },
-			CGI::password_field({
-				id            => 'pswd',
-				name          => 'passwd',
-				value         => $passwd,
-				aria_required => 'true',
-				class         => 'form-control',
-				placeholder   => ''
-			}),
-			CGI::label({ for => 'pswd' }, $r->maketext('Password'))
-		);
-
-		if ($ce->{session_management_via} ne 'session_cookie') {
-			print CGI::start_div({ class => 'form-check form-control-lg mb-2' });
-			print CGI::checkbox({
-				id              => 'rememberme',
-				label           => $r->maketext('Remember Me'),
-				name            => 'send_cookie',
-				value           => 'on',
-				class           => 'form-check-input',
-				labelattributes => { class => 'form-check-label' }
-			});
-			print CGI::end_div();
-		}
-
-		print CGI::submit({ type => "submit", value => $r->maketext("Continue"), class => 'btn btn-primary' });
-		print CGI::end_div();
+		# Important note. If hidden_fields is passed an empty array it prints ALL parameters as hidden fields.
+		# That is not what we want in this case, so we don't print at all if @fields_to_print is empty.
+		$hidden_fields = $c->hidden_fields(@fields_to_print) if (@fields_to_print);
 
 		# Determine if there are valid practice users.
-		my @GuestUsers = $db->getUsersWhere({ user_id => { like => "$practiceUserPrefix\%" } });
-		my @allowedGuestUsers;
-		foreach my $GuestUser (@GuestUsers) {
+		my @GuestUsers = $c->db->getUsersWhere({ user_id => { like => "$ce->{practiceUserPrefix}\%" } });
+		for my $GuestUser (@GuestUsers) {
 			next unless defined $GuestUser->status;
-			next unless $GuestUser->status ne "";
+			next unless $GuestUser->status ne '';
 			push @allowedGuestUsers, $GuestUser
-			if $ce->status_abbrev_has_behavior($GuestUser->status, "allow_course_access");
+				if $ce->status_abbrev_has_behavior($GuestUser->status, 'allow_course_access');
 		}
+	}
 
-		# Guest login
-		if (@allowedGuestUsers) {
-			# preserve the form data posted to the requested URI
-			my @fields_to_print = grep { not m/^(user|passwd|key|force_passwd_authen)$/ } $r->param;
-			print CGI::start_div({ class => 'my-3' });
-			print CGI::p(
-				$r->maketext(
-					'This course supports guest logins. Click [_1] to log into this course as a guest.',
-					CGI::b($r->maketext("Guest Login"))
-				)
-			);
-			print CGI::input({
-				type  => "submit",
-				name  => "login_practice_user",
-				value => $r->maketext("Guest Login"),
-				class => 'btn btn-primary'
-			});
-			print CGI::end_div();
-		}
+	$c->stash->{hidden_fields}     = $hidden_fields;
+	$c->stash->{allowedGuestUsers} = \@allowedGuestUsers;
 
-		print CGI::end_form();
-	}
-	return "";
+	return;
+}
+
+sub head ($c) {
+	return $c->tag('meta', name => 'robots', content => $c->ce->{options}{metaRobotsContent} // 'none');
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/LoginProctor.pm b/lib/WeBWorK/ContentGenerator/LoginProctor.pm
index 937414bdfe..3e305c8063 100644
--- a/lib/WeBWorK/ContentGenerator/LoginProctor.pm
+++ b/lib/WeBWorK/ContentGenerator/LoginProctor.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::LoginProctor;
-use base qw(WeBWorK::ContentGenerator);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures, -async_await;
 
 =head1 NAME
 
@@ -23,269 +23,95 @@ GatewayQuiz proctored tests.
 
 =cut
 
-use strict;
-use warnings;
-use CGI qw(-nosticky );
-use WeBWorK::Utils qw(readFile dequote);
+use WeBWorK::Utils::Rendering qw(renderPG);
 use WeBWorK::DB::Utils qw(grok_vsetID);
-use WeBWorK::ContentGenerator::GatewayQuiz qw(can_recordAnswers);
 
-# This content generator is NOT logged in.
-# FIXME  I'm not sure this is really what we want for the proctor login,
-# FIXME  but I also don't know what this actually does, so I'm ignoring it
-# FIXME  for now.
-sub if_loggedin {
-	my ($self, $arg) = @_;
+async sub initialize ($c) {
+	my $ce = $c->ce;
+	my $db = $c->db;
 
-	return !$arg;
-}
-
-sub info {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-
-	my $result;
-
-	# This section should be kept in sync with the Home.pm version
-	my $site_info = $ce->{webworkFiles}->{site_info};
-	if (defined $site_info and $site_info) {
-		# deal with previewing a temporary file
-		# FIXME: DANGER: this code allows viewing of any file
-		# FIXME: this code is disabled because PGProblemEditor no longer uses editFileSuffix
-		#if (defined $r->param("editMode") and $r->param("editMode") eq "temporaryFile"
-		#		and defined $r->param("editFileSuffix")) {
-		#	$site_info .= $r->param("editFileSuffix");
-		#}
-
-		if (-f $site_info) {
-			my $text = eval { readFile($site_info) };
-			if ($@) {
-				$result .= CGI::h2($r->maketext("Site Information"));
-				$result .= CGI::div({ class => 'alert alert-danger p-1 mb-2' }, $@);
-			} elsif ($text =~ /\S/) {
-				$result .= CGI::h2($r->maketext("Site Information"));
-				$result .= $text;
-			}
-		}
-	}
-
-	# FIXME this is basically the same code as above... TIME TO REFACTOR!
-	my $login_info = $ce->{courseFiles}->{login_info};
-	if (defined $login_info and $login_info) {
-		# login info is relative to the templates directory, apparently
-		$login_info = $ce->{courseDirs}->{templates} . "/$login_info";
-
-		# deal with previewing a temporary file
-		# FIXME: DANGER: this code allows viewing of any file
-		# FIXME: this code is disabled because PGProblemEditor no longer uses editFileSuffix
-		#if (defined $r->param("editMode") and $r->param("editMode") eq "temporaryFile"
-		#		and defined $r->param("editFileSuffix")) {
-		#	$login_info .= $r->param("editFileSuffix");
-		#}
-
-		if (-f $login_info) {
-			my $text = eval { readFile($login_info) };
-			if ($@) {
-				$result .= CGI::h2("Login Info");
-				$result .= CGI::div({ class => 'alert alert-danger p-1 mb-2' }, $@);
-			} elsif ($text =~ /\S/) {
-				$result .= CGI::h2("Login Info");
-				$result .= $text;
-			}
-		}
-	}
-
-	if (defined $result and $result ne "") {
-#		return CGI::div({class=>"info-box", id=>"InfoPanel"}, $result);
-                return $result;
-	} else {
-		return "";
-	}
-}
-
-sub body {
-	my ($self)  = @_;
-	my $r       = $self->r;
-	my $ce      = $r->ce;
-	my $db      = $r->db;
-	my $urlpath = $r->urlpath;
-
-	# convenient data variables
-	my $effectiveUser = $r->param('effectiveUser') || '';
-	my $user          = $r->param('user');
-	my $proctorUser   = $r->param('proctor_user') || '';
-	my $key           = $r->param('proctor_key');
-	my $passwd        = $r->param('proctor_passwd') || '';
-	my $course        = $urlpath->arg('courseID');
-	my $setID         = $urlpath->arg('setID');
-	my $timeNow       = time();
+	my $userID          = $c->param('user');
+	my $effectiveUserID = $c->param('effectiveUser') || '';
 
-	# these are to manage the transition to, and possibly back from,
-	#    the grading proctor
-	my $pastProctorUser = $r->param('past_proctor_user') || $proctorUser;
-	my $pastProctorKey  = $r->param('past_proctor_key')  || $key;
+	$c->{effectiveUser} = $c->db->getUser($effectiveUserID);
 
-	# data collection
-	my $submitAnswers = $r->param('submitAnswers');
-	my $EffectiveUser = $db->getUser($effectiveUser);
-	my $User          = $db->getUser($user);
-
-	my $effectiveUserFullName = $EffectiveUser->first_name() . ' ' . $EffectiveUser->last_name();
-
-	# we need the UserSet to check for a set-restricted login proctor,
-	#    and to show and possibly save the submission time.
-	#    and to get the UserSet, we need to know what set and version
-	#    we're working with.  if the setName and versionName come in
-	#    with the setID, we're ok; otherwise, get the highest version
-	#    number available and go with that
-	my ($setName, $versionNum) = grok_vsetID($setID);
+	# The user set is needed to check for a set-restricted login proctor, and to show and possibly save the submission
+	# time.  To get the user set, the set name and version number are needed.  Attempt to obtain those from the url path
+	# setID.  Otherwise, use the highest version number.
+	($c->stash->{setID}, my $versionNum) = grok_vsetID($c->stash('setID'));
 	my $noSetVersions = 0;
 	if (!$versionNum) {
-		# get a list of all available versions
-		my @setVersions = $db->listSetVersions($effectiveUser, $setName);
+		# Get a list of all available versions.
+		my @setVersions = $db->listSetVersions($effectiveUserID, $c->stash->{setID});
 		if (@setVersions) {
 			$versionNum = $setVersions[-1];
 		} else {
-			# if there are no versions yet, we must be starting
-			#    the first one
+			# If there are no versions yet, start with the first one.
 			$versionNum    = 1;
 			$noSetVersions = 1;
 		}
 	}
-	# get the merged set; if we're not grading a test,
-	#    get the merged template set instead
-	my $UserSet;
-	if ($noSetVersions || !$submitAnswers) {
-		$UserSet = $db->getMergedSet($effectiveUser, $setName);
-	} else {
-		$UserSet = $db->getMergedSetVersion($effectiveUser, $setName, $versionNum);
-	}
-
-	# let's just make sure that worked
-	die('Proctor authorization requested for a nonexistent set?\n') if (!defined($UserSet));
-
-	# now, if we're submitting the set we need to save the
-	#    submission time.
-	if ($submitAnswers) {
-		# this shouldn't ever happen
-		if ($noSetVersions) {
-			die('Request to grade a set version before any tests have been taken.');
-		}
-		# we save the submission time if the attempt will be recorded,
-		#   so we have to do some research to determine if that's
-		#   the case
-		my $PermissionLevel = $db->getPermissionLevel($user);
-		my $Problem         = $db->getMergedProblemVersion($effectiveUser, $setName, $versionNum, 1);
-		# set last_attempt_time if appropriate
-		if (WeBWorK::ContentGenerator::GatewayQuiz::can_recordAnswers(
-			$self, $User, $PermissionLevel, $EffectiveUser, $UserSet, $Problem
-		))
-		{
-			$UserSet->version_last_attempt_time($timeNow);
-			# FIXME: this saves all of the merged set data into
-			#    the set_user table.  we live with this in other
-			#    places for versioned sets, but it's not ideal
-			$db->putSetVersion($UserSet);
-		}
-	}
 
-	print CGI::div({ class => 'my-2' }, (CGI::strong($r->maketext('Proctor authorization required.'))));
-
-	# WeBWorK::Authen::verifyProctor will set the note "authen_error"
-	# if invalid authentication is found.  If this is done, it's a signal to
-	# us to yell at the user for doing that, since Authen isn't a content-
-	# generating module.
-	my $authen_error = $r->notes->get('authen_error');
-	if ($authen_error) {
-		print CGI::div({ class => 'alert alert-danger' }, $authen_error);
-	}
-
-	# also print a message about submission times if we're submitting
-	# an answer
-	if ($submitAnswers) {
-		my $dueTime   = $UserSet->due_date();
-		my $timeLimit = $UserSet->version_time_limit();
-		my ($color, $msg) = ('#ddddff', '');
-
-		if ($dueTime + $ce->{gatewayGracePeriod} < $timeNow) {
-			$color = '#ffffaa';
-			$msg =
-				$r->maketext('The time limit on this assignment was exceeded. The assignment may be checked, '
-					. 'but the result will not be counted.');
+	# Get the merged set. If a test is being graded or this is a new version, get the merged template set instead.
+	$c->stash->{userSet} =
+		$noSetVersions || !$c->param('submitAnswers')
+		? $db->getMergedSet($effectiveUserID, $c->stash->{setID})
+		: $db->getMergedSetVersion($effectiveUserID, $c->stash->{setID}, $versionNum);
+
+	if (defined $c->stash->{userSet}) {
+		# If the set is being submitted, then save the submission time.
+		if ($c->param('submitAnswers')) {
+			# This should never happen.
+			die 'Request to grade a set version before any tests have been taken.' if $noSetVersions;
+
+			# Determine if answers can be recorded, and set last_attempt_time if appropriate.
+			if (WeBWorK::ContentGenerator::GatewayQuiz::can_recordAnswers(
+				$c,
+				$db->getUser($userID),
+				$db->getPermissionLevel($userID),
+				$c->{effectiveUser},
+				$c->stash->{userSet},
+				$db->getMergedProblemVersion($effectiveUserID, $c->stash->{setID}, $versionNum, 1)
+			))
+			{
+				$c->stash->{userSet}->version_last_attempt_time(int($c->submitTime));
+				# FIXME: This saves all of the merged set data into the set_user table.  We live with this in other
+				# places for versioned sets, but it's not ideal.
+				$db->putSetVersion($c->stash->{userSet});
+			}
 		}
-		my $style = "background-color:$color;color:black;border:solid black 1px;padding: 2px;";
-		print CGI::div(
-			{ -style => $style },
-			CGI::strong(
-				$r->maketext('Grading assignment:') . ' ', CGI::br(),
-				$r->maketext('Submission time:') . ' ',    scalar(localtime($timeNow)),
-				CGI::br(),                                 $r->maketext('Closes:') . ' ',
-				scalar(localtime($dueTime)),               $msg
-			)
-		);
 	}
 
-	print CGI::start_form({ -method => 'POST', -action => $r->uri });
-	# write out the form data posted to the requested URI
-	my @fields_to_print =
-		grep {
-		!/^(user)|(effectiveUser)|(passwd)|(key)|(force_password_authen)|(proctor_user)|(proctor_key)|(proctor_password)$/
-		} $r->param();
-
-	print $self->hidden_fields(@fields_to_print) if (@fields_to_print);
-	print $self->hidden_authen_fields;
-
-	print CGI::hidden({ name => 'past_proctor_user', value => $pastProctorUser });
-	print CGI::hidden({ name => 'past_proctor_key',  value => $pastProctorKey });
-
-	if ($submitAnswers || ($UserSet->restricted_login_proctor eq '' || $UserSet->restricted_login_proctor eq 'No')) {
-		# Display the user info and username field for the proctor.
-		print CGI::div(
-			{ class => 'card p-2 mb-2', style => 'background-color:#ddddff;' },
-			CGI::div($r->maketext("User's username is:") . ' ', CGI::strong($effectiveUser)),
-			CGI::div($r->maketext("User's name is:") . ' ',     CGI::strong($effectiveUserFullName))
-		);
-		print CGI::div(
-			{ class => 'col-xl-5 col-lg-6 col-md-7 col-sm-8 form-floating mb-2' },
-			CGI::textfield({
-				name        => 'proctor_user',
-				id          => 'proctor_user',
-				value       => '',
-				class       => 'form-control',
-				placeholder => ''
-			}),
-			CGI::label({ for => 'proctor_user' }, $r->maketext('Proctor Username'))
-		);
-	} else {
-		# Restricted set login
-		print CGI::div(
-			{ class => 'card p-2 mb-2', style => 'background-color:#ddddff;' },
-			CGI::em(
-				$r->maketext(
-					'This set has a set-level proctor password to authorize logins. Enter the password below.')
-			)
-		);
-		print CGI::hidden({ name => 'proctor_user', value => "set_id:$setName" });
-	}
-
-	# Print the password field for the proctor.
-	print CGI::div(
-		{ class => 'col-xl-5 col-lg-6 col-md-7 col-sm-8 form-floating mb-2' },
-		CGI::password_field({
-			name        => 'proctor_passwd',
-			id          => 'proctor_passwd',
-			value       => '',
-			class       => 'form-control',
-			placeholder => ''
-		}),
-		CGI::label({ for => 'proctor_passwd' }, $r->maketext('Proctor Password'))
+	# Get problem set info.
+	my $set = $c->authz->{merged_set};
+	return unless $set;
+
+	# Hack to prevent errors from uninitialized set_headers.
+	$set->set_header('defaultHeader') unless $set->set_header =~ /\S/;
+
+	$c->{pg} = await renderPG(
+		$c,
+		$c->{effectiveUser},
+		$set,
+		WeBWorK::DB::Record::UserProblem->new(
+			problem_id  => 0,
+			set_id      => $set->set_id,
+			login_id    => $c->{effectiveUser}->user_id,
+			source_file => $set->set_header eq 'defaultHeader'
+			? $ce->{webworkFiles}{screenSnippets}{setHeader}
+			: $set->set_header
+		),
+		$set->psvn,
+		{},
+		{ displayMode => $c->param('displayMode') || $ce->{pg}{options}{displayMode} }
 	);
 
-	print CGI::submit({ value => $r->maketext('Continue'), class => 'btn btn-primary' });
-	print CGI::end_form();
+	return;
+}
 
-	return '';
+sub info ($c) {
+	return '' unless $c->{pg};
+	return $c->c($c->tag('h2', $c->maketext('Set Info')), $c->{pg}{body_text})->join('');
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Logout.pm b/lib/WeBWorK/ContentGenerator/Logout.pm
index c136e143a6..d5ed6020af 100644
--- a/lib/WeBWorK/ContentGenerator/Logout.pm
+++ b/lib/WeBWorK/ContentGenerator/Logout.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Logout;
-use base qw(WeBWorK::ContentGenerator);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -22,146 +22,51 @@ WeBWorK::ContentGenerator::Logout - invalidate key and display logout message.
 
 =cut
 
-use strict;
-use warnings;
-#use CGI qw(-nosticky );
-use WeBWorK::CGI;
 use WeBWorK::Localize;
 use WeBWorK::Authen qw(write_log_entry);
 
-sub pre_header_initialize {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $authen = $r->authen;
+sub pre_header_initialize ($c) {
+	my $ce     = $c->ce;
+	my $db     = $c->db;
+	my $authen = $c->authen;
 
-	my $userID = $r->param("user_id");
-	my $keyError = '';
-#	eval { $db->deleteKey($userID) };
-#	if ($@) {
-#		$keyError .= "Something went wrong while logging out of " .
-#			"WeBWorK: $@";
-#	}
+	my $userID = $c->param('user_id');
 
-	$authen -> killSession;
-	$authen->WeBWorK::Authen::write_log_entry("LOGGED OUT");
+	$authen->killSession;
+	$authen->WeBWorK::Authen::write_log_entry('LOGGED OUT');
 
-	# also check to see if there is a proctor key associated with this
-	#    login.  if there is a proctor user, then we must have a
-	#    proctored test, so we try and delete the key
-	my $proctorID = defined($r->param("proctor_user")) ?
-	    $r->param("proctor_user") : '';
-	if ( $proctorID ) {
-		eval { $db->deleteKey( "$userID,$proctorID" ); };
-		if ( $@ ) {
-			$keyError .= CGI::p(
-				"Error when clearing proctor key: $@");
+	# Check to see if there is a proctor key associated with this login.  If there is a proctor user, then there must be
+	# a proctored test.  So try and delete the key.
+	my $proctorID = $c->param('proctor_user');
+	if ($proctorID) {
+		eval { $db->deleteKey("$userID,$proctorID"); };
+		if ($@) {
+			$c->addbadmessage("Error when clearing proctor key: $@");
 		}
-	# we may also have a proctor key from grading the test
-		eval { $db->deleteKey( "$userID,$proctorID,g" ); };
-		if ( $@ ) {
-			$keyError .= CGI::p(
-				"Error when clearing proctor grading key: $@");
+		# There may also be a proctor key from grading the test.
+		eval { $db->deleteKey("$userID,$proctorID,g"); };
+		if ($@) {
+			$c->addbadmessage("Error when clearing proctor grading key: $@");
 		}
 	}
-	$self->{keyError} = $keyError;
 
-	# Do any special processing needed by external authentication
-	$authen->logout_user() if $authen->can('logout_user');
+	# Do any special processing needed by external authentication.
+	$authen->logout_user if $authen->can('logout_user');
 
-	# if we have an authen redirect, all of those errors may be
-	#    moot, but I think that's unavoidable (-glarose)
-	if ( defined($authen->{redirect}) && $authen->{redirect} ) {
-		$self->reply_with_redirect( $authen->{redirect} );
-	}
-}
-
-## This content generator is NOT logged in,
-## but must return a 1 to get messages.
-sub if_loggedin {
-	my ($self, $arg) = @_;
-#	return !$arg;
-	return 1;
-}
+	$c->reply_with_redirect($authen->{redirect}) if $authen->{redirect};
 
-# Override the if_can method to disable links for the logout page.
-sub if_can {
-	my ($self, $arg) = @_;
-	return $arg eq 'links' ? 0 : $self->SUPER::if_can($arg);
+	return;
 }
 
-sub path {
-	my ($self, $args) = @_;
-	my $r = $self->r;
-	my $urlpath = $r->urlpath;
-	my $ce = $r->{ce};
-	my $authen = $r -> {authen};
-
-	if ((defined($ce -> {external_auth}) and $ce -> {external_auth})
-		or (defined($authen -> {external_auth}) and $authen -> {external_auth}) ) {
-		my $courseID = $urlpath -> arg("courseID");
-		if (defined($courseID)) {
-			print $courseID;
-
-		} else {
-		$self -> SUPER::path($args);
-		}
-	} else {
-	    $self-> SUPER::path($args);
-	}
-	return "";
+# Override the can method to disable links for the logout page.
+sub can ($c, $arg) {
+	return $arg eq 'links' ? 0 : $c->SUPER::can($arg);
 }
 
-sub body {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $urlpath = $r->urlpath;
-	my $auth = $r->authen;
-
-	# The following line may not work when a sequence of authentication modules
-    # are used, because the preferred module might be external, e.g., LTIBasic,
-    # but a non-external one, e.g., Basic_TheLastChance or
-    # even just WeBWorK::Authen, might handle the ongoing session management.
-    # So this should be set in the course environment when a sequence of
-	# authentication modules is used..
-	#my $externalAuth = (defined($auth->{external_auth}) && $auth->{external_auth} ) ? 1 : 0;
-	my $externalAuth = ((defined($ce->{external_auth}) && $ce->{external_auth})
- 		or (defined($auth->{external_auth}) && $auth->{external_auth}) ) ? 1 : 0;
-
-	my $courseID = $urlpath->arg("courseID");
-	my $userID = $r->param("user");
-
-	if ($self->{keyError}) {
-		print CGI::div({ class => 'alert alert-danger' }, $self->{keyError});
-	}
-
-	my $problemSets = $urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets", $r, courseID => $courseID);
-	my $loginURL = $r->location . $problemSets->path;
-
-	print CGI::p($r->maketext("You have been logged out of WeBWorK."));
-
-	if ($externalAuth) {
-		my $LMS = ($ce->{LMS_url}) ? CGI::a({ href => $ce->{LMS_url} }, $ce->{LMS_name}) : $ce->{LMS_name};
-		print CGI::p(
-			$r->maketext(
-				'The course [_1] uses an external authentication system ([_2]). Please go there to log in again.',
-				CGI::b($courseID), $LMS
-			)
-		);
-	} else {
-		print CGI::start_form({ method => 'POST', action => $loginURL });
-		print CGI::hidden('force_passwd_authen', 1);
-		print CGI::p(CGI::submit({
-			name  => 'submit',
-			label => $r->maketext('Log In Again'),
-			class => 'btn btn-primary'
-		}));
-		print CGI::end_form();
-	}
-	return '';
+sub path ($c, $args) {
+	return $c->stash('courseID')
+		if (($c->ce->{external_auth} || $c->authen->{external_auth}) && defined $c->stash('courseID'));
+	return $c->SUPER::path($args);
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Options.pm b/lib/WeBWorK/ContentGenerator/Options.pm
index a8a869d495..5ea4d90a5d 100644
--- a/lib/WeBWorK/ContentGenerator/Options.pm
+++ b/lib/WeBWorK/ContentGenerator/Options.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Options;
-use base qw(WeBWorK::ContentGenerator);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -22,393 +22,121 @@ WeBWorK::ContentGenerator::Options - Change user options.
 
 =cut
 
-use strict;
-use warnings;
-use WeBWorK::CGI;
 use WeBWorK::Utils qw(cryptPassword);
 use WeBWorK::Localize;
 
-sub body {
-	my ($self) = @_;
-	my $r      = $self->r;
-	my $ce     = $r->ce;
-	my $db     = $r->db;
-	my $authz  = $r->authz;
+sub initialize ($c) {
+	my $db    = $c->db;
+	my $authz = $c->authz;
 
-	my $userID = $r->param('user');
-	my $User   = $db->getUser($userID);
-	die "record not found for user '$userID'." unless defined $User;
+	my $userID = $c->param('user');
+	$c->{user} = $db->getUser($userID);
+	return unless defined $c->{user};
 
-	my $eUserID = $r->param('effectiveUser');
-	my $EUser   = $db->getUser($eUserID);       # checked
-	die "record not found for effective user '$eUserID'." unless defined $EUser;
+	my $effectiveUserID = $c->param('effectiveUser');
+	$c->{effectiveUser} = $db->getUser($effectiveUserID);
+	return unless defined $c->{effectiveUser};
 
-	my $user_name   = $User->first_name . ' ' . $User->last_name;
-	my $e_user_name = $EUser->first_name . ' ' . $EUser->last_name;
-
-	my $changeOptions = $r->param('changeOptions');
-	my $currP         = $r->param('currPassword');
-	my $newP          = $r->param('newPassword');
-	my $confirmP      = $r->param('confirmPassword');
-	my $newA          = $r->param('newAddress');
-
-	print CGI::start_form(-method => 'POST', -action => $r->uri);
-	print $self->hidden_authen_fields;
+	my $changeOptions = $c->param('changeOptions');
 
 	if ($authz->hasPermissions($userID, 'change_password')) {
-		print CGI::h2($r->maketext('Change Password'));
-
-		my $Password = eval { $db->getPassword($User->user_id) };
-
-		# Its ok if the $Password doesn't exist because students might be setting it for the first time.
-		warn $r->maketext("Can't get password record for user '[_1]': [_2]", $userID, $@) if $@;
+		my $currP    = $c->param('currPassword');
+		my $newP     = $c->param('newPassword');
+		my $confirmP = $c->param('confirmPassword');
 
-		if ($changeOptions and ($currP or $newP or $confirmP)) {
+		# Note that it is ok if the password doesn't exist because students might be setting it for the first time.
+		my $password = eval { $db->getPassword($c->{user}->user_id) };
 
-			my $EPassword = eval { $db->getPassword($EUser->user_id) };    # checked
-			warn $r->maketext("Can't get password record for effective user '[_1]': [_2]", $eUserID, $@) if $@;
+		if ($changeOptions && ($newP || $confirmP)) {
+			my $effectiveUserPassword =
+				$userID ne $effectiveUserID ? eval { $db->getPassword($c->{effectiveUser}->user_id) } : $password;
 
 			# Check that either password is not defined or if it is defined then we have the right one.
-			if ((not defined $Password) || (crypt($currP // '', $Password->password) eq $Password->password)) {
-				if ($newP or $confirmP) {
-					if ($newP eq $confirmP) {
-						if (not defined $EPassword) {
-							$EPassword = $db->newPassword();
-							$EPassword->user_id($EUser->user_id);
-							$EPassword->password(cryptPassword($newP));
-							eval { $db->addPassword($EPassword) };
-							$Password = $Password // $EPassword;
-							if ($@) {
-								print CGI::div({ class => 'alert alert-danger', tabindex => '-1' },
-									$r->maketext("Couldn't change [_1]'s password: [_2]", $e_user_name, $@));
-							} else {
-								print CGI::div({ class => 'alert alert-success' },
-									$r->maketext("[_1]'s password has been changed.", $e_user_name));
-							}
+			if (!defined $password || crypt($currP // '', $password->password) eq $password->password) {
+				my $e_user_name = $c->{effectiveUser}->first_name . ' ' . $c->{effectiveUser}->last_name;
+				if ($newP eq $confirmP) {
+					if (!defined $effectiveUserPassword) {
+						$effectiveUserPassword = $db->newPassword();
+						$effectiveUserPassword->user_id($c->{effectiveUser}->user_id);
+						$effectiveUserPassword->password(cryptPassword($newP));
+						eval { $db->addPassword($effectiveUserPassword) };
+						$password = $password // $effectiveUserPassword;
+						if ($@) {
+							$c->addbadmessage($c->maketext("Couldn't change [_1]'s password: [_2]", $e_user_name, $@));
 						} else {
-							$EPassword->password(cryptPassword($newP));
-							eval { $db->putPassword($EPassword) };
-							$Password = $Password // $EPassword;
-							if ($@) {
-								print CGI::div({ class => 'alert alert-danger', tabindex => '-1' },
-									$r->maketext("Couldn't change [_1]'s password: [_2]", $e_user_name, $@));
-							} else {
-								print CGI::div({ class => 'alert alert-success' },
-									$r->maketext("[_1]'s password has been changed.", $e_user_name));
-							}
+							$c->addgoodmessage($c->maketext("[_1]'s password has been changed.", $e_user_name));
 						}
 					} else {
-						print CGI::div(
-							{ class => 'alert alert-danger', tabindex => '-1' },
-							$r->maketext(
-								"The passwords you entered in the [_1] and [_2] fields don't match. "
-									. 'Please retype your new password and try again.',
-								CGI::b($r->maketext("[_1]'s New Password",         $e_user_name)),
-								CGI::b($r->maketext("Confirm [_1]'s New Password", $e_user_name))
-							)
-						);
+						$effectiveUserPassword->password(cryptPassword($newP));
+						eval { $db->putPassword($effectiveUserPassword) };
+						$password = $password // $effectiveUserPassword;
+						if ($@) {
+							$c->addbadmessage($c->maketext("Couldn't change [_1]'s password: [_2]", $e_user_name, $@));
+						} else {
+							$c->addgoodmessage($c->maketext("[_1]'s password has been changed.", $e_user_name));
+						}
 					}
 				} else {
-					print CGI::div({ class => 'alert alert-danger', tabindex => '-1' },
-						$r->maketext("[_1]'s new password cannot be blank.", $e_user_name));
+					$c->addbadmessage($c->maketext(
+						"The passwords you entered in the [_1] and [_2] fields don't match. "
+							. 'Please retype your new password and try again.',
+						$c->tag('b', $c->maketext("[_1]'s New Password",         $e_user_name)),
+						$c->tag('b', $c->maketext("Confirm [_1]'s New Password", $e_user_name))
+					));
 				}
 			} else {
-				print CGI::div(
-					{ class => 'alert alert-danger', tabindex => '-1' },
-					$r->maketext(
-						'The password you entered in the [_1] field does not match your current password. '
-							. 'Please retype your current password and try again.',
-						CGI::b($r->maketext("[_1]'s Current Password", $user_name))
+				$c->addbadmessage($c->maketext(
+					'The password you entered in the [_1] field does not match your current password. '
+						. 'Please retype your current password and try again.',
+					$c->tag(
+						'b',
+						$c->maketext(
+							"[_1]'s Current Password",
+							$c->{user}->first_name . ' ' . $c->{user}->last_name
+						)
 					)
-				);
+				));
 			}
-
 		}
-
-		print CGI::div(
-			{ class => 'row mb-2' },
-			CGI::div(
-				{ class => 'col-lg-8 col-md-10' },
-				CGI::div(
-					{ class => 'row mb-2' },
-					CGI::label(
-						{ 'for' => 'currPassword', class => 'col-form-label col-sm-6' },
-						$r->maketext("[_1]'s Current Password", $user_name)
-					),
-					CGI::div(
-						{ class => 'col-sm-6' },
-						CGI::password_field({
-							name => 'currPassword',
-							id   => 'currPassword',
-							(defined $Password) ? () : (disabled => 1),
-							class => 'form-control',
-							dir => 'ltr'
-						})
-					),
-				),
-				CGI::div(
-					{ class => 'row mb-2' },
-					CGI::label(
-						{ 'for' => 'newPassword', class => 'col-form-label col-sm-6' },
-						$r->maketext("[_1]'s New Password", $e_user_name)
-					),
-					CGI::div(
-						{ class => 'col-sm-6' },
-						CGI::password_field({ name => 'newPassword', id => 'newPassword', class => 'form-control', dir => 'ltr' })
-					)
-				),
-				CGI::div(
-					{ class => 'row mb-2' },
-					CGI::label(
-						{ 'for' => 'confirmPassword', class => 'col-form-label col-sm-6' },
-						$r->maketext("Confirm [_1]'s New Password", $e_user_name)
-					),
-					CGI::div(
-						{ class => 'col-sm-6' },
-						CGI::password_field({
-							name  => 'confirmPassword',
-							id    => 'confirmPassword',
-							class => 'form-control',
-							dir   => 'ltr'
-						})
-					)
-				)
-			)
-		);
+		$c->{has_password} = defined $password;
 	}
 
-	if ($authz->hasPermissions($userID, 'change_email_address')) {
-		print CGI::h2($r->maketext('Change Email Address'));
-
-		if ($changeOptions and $newA) {
-			my $oldA = $EUser->email_address;
-			$EUser->email_address($newA);
-			eval { $db->putUser($EUser) };
-			if ($@) {
-				$EUser->email_address($oldA);
-				print CGI::div(
-					{ class => 'alert alert-danger', tabindex => '-1' },
-					$r->maketext("Couldn't change your email address: [_1]", $@)
-				);
-			} else {
-				print CGI::div({ class => 'alert alert-success' },
-					$r->maketext('Your email address has been changed.'));
-			}
+	my $newA = $c->param('newAddress');
+	if ($changeOptions && $authz->hasPermissions($userID, 'change_email_address') && $newA) {
+		my $oldA = $c->{effectiveUser}->email_address;
+		$c->{effectiveUser}->email_address($newA);
+		eval { $db->putUser($c->{effectiveUser}) };
+		if ($@) {
+			$c->{effectiveUser}->email_address($oldA);
+			$c->addbadmessage($c->maketext("Couldn't change your email address: [_1]", $@));
+		} else {
+			$c->addgoodmessage($c->maketext('Your email address has been changed.'));
 		}
-
-		print CGI::div(
-			{ class => 'row mb-2' },
-			CGI::div(
-				{ class => 'col-lg-8 col-md-10' },
-				CGI::div(
-					{ class => 'row mb-2' },
-					CGI::label(
-						{ 'for' => 'currAddress', class => 'col-form-label col-sm-6' },
-						$r->maketext("[_1]'s Current Address", $e_user_name)
-					),
-					CGI::div(
-						{ class => 'col-sm-6' },
-						CGI::textfield({
-							readonly => undef,
-							id       => 'currAddress',
-							name     => 'currAddress',
-							value    => $EUser->email_address,
-							class    => 'form-control',
-							dir      => 'ltr'
-						})
-					)
-				),
-				CGI::div(
-					{ class => 'row mb-2' },
-					CGI::label(
-						{ 'for' => 'newAddress', class => 'col-form-label col-sm-6' },
-						$r->maketext("[_1]'s New Address", $e_user_name)
-					),
-					CGI::div(
-						{ class => 'col-sm-6' },
-						CGI::textfield({ name => 'newAddress', id => 'newAddress', class => 'form-control', dir => 'ltr' })
-					)
-				)
-			)
-		);
 	}
 
-	if ($authz->hasPermissions($userID, 'change_pg_display_settings')) {
-		print CGI::h2($r->maketext('Change Display Settings'));
-
-		if ($changeOptions) {
-			if (
-				(defined($r->param('displayMode')) && $EUser->displayMode() ne $r->param('displayMode'))
-				|| (defined($r->param('showOldAnswers')) && $EUser->showOldAnswers() ne $r->param('showOldAnswers'))
-				|| (defined($r->param('useWirisEditor')) && $EUser->useWirisEditor() ne $r->param('useWirisEditor'))
-				|| (defined($r->param('useMathQuill'))   && $EUser->useMathQuill() ne $r->param('useMathQuill'))
-				)
-			{
-				$EUser->displayMode($r->param('displayMode'));
-				$EUser->showOldAnswers($r->param('showOldAnswers'));
-				$EUser->useWirisEditor($r->param('useWirisEditor'));
-				$EUser->useMathQuill($r->param('useMathQuill'));
+	if ($changeOptions && $authz->hasPermissions($userID, 'change_pg_display_settings')) {
+		if (
+			(defined($c->param('displayMode')) && $c->{effectiveUser}->displayMode() ne $c->param('displayMode'))
+			|| (defined($c->param('showOldAnswers'))
+				&& $c->{effectiveUser}->showOldAnswers() ne $c->param('showOldAnswers'))
+			|| (defined($c->param('useMathQuill'))
+				&& $c->{effectiveUser}->useMathQuill() ne $c->param('useMathQuill'))
+			)
+		{
+			$c->{effectiveUser}->displayMode($c->param('displayMode'));
+			$c->{effectiveUser}->showOldAnswers($c->param('showOldAnswers'));
+			$c->{effectiveUser}->useMathQuill($c->param('useMathQuill'));
 
-				eval { $db->putUser($EUser) };
-				if ($@) {
-					print CGI::div(
-						{ class => 'alert alert-danger', tabindex => '-1' },
-						$r->maketext("Couldn't save your display options: [_1]", $@)
-					);
-				} else {
-					print CGI::div(
-						{ class => 'alert alert-success p-1 mb-0' },
-						$r->maketext('Your display options have been saved.')
-					);
-				}
+			eval { $db->putUser($c->{effectiveUser}) };
+			if ($@) {
+				$c->addbadmessage($c->maketext("Couldn't save your display options: [_1]", $@));
+			} else {
+				$c->addgoodmessage($c->maketext('Your display options have been saved.'));
 			}
 		}
-
-		my $result = '';
-
-		my $curr_displayMode = $EUser->displayMode || $ce->{pg}{options}{displayMode};
-		my %display_modes    = %{ WeBWorK::PG::DISPLAY_MODES() };
-		my @active_modes     = grep { exists $display_modes{$_} } @{ $ce->{pg}{displayModes} };
-
-		if (@active_modes > 1) {
-			$result .= CGI::div(
-				{ class => 'mb-3' },
-				CGI::p({ class => 'lead mb-2' }, $r->maketext('View equations as') . ':'),
-				map {
-					CGI::div(
-						{ class => 'form-check form-check-inline' },
-						CGI::input({
-							type  => 'radio',
-							name  => 'displayMode',
-							id    => "displayMode-$_",
-							value => $_,
-							$_ eq $curr_displayMode ? (checked => undef) : (),
-							class => 'form-check-input'
-						}),
-						CGI::label({ for => "displayMode-$_", class => 'form-check-label' }, $_)
-					)
-				} @active_modes
-			);
-		}
-
-		if ($authz->hasPermissions($userID, 'can_show_old_answers')) {
-			my $curr_showOldAnswers =
-				$EUser->showOldAnswers ne '' ? $EUser->showOldAnswers : $ce->{pg}{options}{showOldAnswers};
-			$result .= CGI::div(
-				{ class => 'mb-3' },
-				CGI::p({ class => 'lead mb-2' }, $r->maketext('Show saved answers?')),
-				map {
-					CGI::div(
-						{ class => 'form-check form-check-inline' },
-						CGI::input({
-							type  => 'radio',
-							name  => 'showOldAnswers',
-							id    => "showOldAnswers$_",
-							value => $_,
-							$_ eq $curr_showOldAnswers ? (checked => undef) : (),
-							class => 'form-check-input'
-						}),
-						CGI::label(
-							{ for => "showOldAnswers$_", class => 'form-check-label' },
-							$_ ? $r->maketext('Yes') : $r->maketext('No')
-						)
-					)
-				} (1, 0)
-			);
-		}
-
-		if ($ce->{pg}{specialPGEnvironmentVars}{entryAssist} eq 'MathView') {
-			# Note, 0 is a legal value, so we can't use || in setting this
-			my $curr_useMathView = $EUser->useMathView ne '' ? $EUser->useMathView : $ce->{pg}{options}{useMathView};
-			$result .= CGI::div(
-				{ class => 'mb-3' },
-				CGI::p({ class => 'lead mb-2' }, $r->maketext('Use Equation Editor?')),
-				map {
-					CGI::div(
-						{ class => 'form-check form-check-inline' },
-						CGI::input({
-							type  => 'radio',
-							name  => 'useMathView',
-							id    => "useMathView$_",
-							value => $_,
-							$_ eq $curr_useMathView ? (checked => undef) : (),
-							class => 'form-check-input'
-						}),
-						CGI::label(
-							{ for => "useMathView$_", class => 'form-check-label' },
-							$_ ? $r->maketext('Yes') : $r->maketext('No')
-						)
-					)
-				} (1, 0)
-			);
-		}
-
-		if ($ce->{pg}{specialPGEnvironmentVars}{entryAssist} eq 'WIRIS') {
-			# Note, 0 is a legal value, so we can't use || in setting this
-			my $curr_useWirisEditor =
-				$EUser->useWirisEditor ne '' ? $EUser->useWirisEditor : $ce->{pg}{options}{useWirisEditor};
-			$result .= CGI::div(
-				{ class => 'mb-3' },
-				CGI::p({ class => 'lead mb-2' }, $r->maketext('Use Equation Editor?')),
-				map {
-					CGI::div(
-						{ class => 'form-check form-check-inline' },
-						CGI::input({
-							type  => 'radio',
-							name  => 'useWirisEditor',
-							id    => "useWirisEditor$_",
-							value => $_,
-							$_ eq $curr_useWirisEditor ? (checked => undef) : (),
-							class => 'form-check-input'
-						}),
-						CGI::label(
-							{ for => "useWirisEditor$_", class => 'form-check-label' },
-							$_ ? $r->maketext('Yes') : $r->maketext('No')
-						)
-					)
-				} (1, 0)
-			);
-		}
-
-		if ($ce->{pg}{specialPGEnvironmentVars}{entryAssist} eq 'MathQuill') {
-			# Note, 0 is a legal value, so we can't use || in setting this
-			my $curr_useMathQuill =
-				$EUser->useMathQuill ne '' ? $EUser->useMathQuill : $ce->{pg}{options}{useMathQuill};
-			$result .= CGI::div(
-				{ class => 'mb-3' },
-				CGI::p({ class => 'lead mb-2' }, $r->maketext('Use live equation rendering?')),
-				map {
-					CGI::div(
-						{ class => 'form-check form-check-inline' },
-						CGI::input({
-							type  => 'radio',
-							name  => 'useMathQuill',
-							id    => "useMathQuill$_",
-							value => $_,
-							$_ eq $curr_useMathQuill ? (checked => undef) : (),
-							class => 'form-check-input'
-						}),
-						CGI::label(
-							{ for => "useMathQuill$_", class => 'form-check-label' },
-							$_ ? $r->maketext('Yes') : $r->maketext('No')
-						)
-					)
-				} (1, 0)
-			);
-		}
-
-		print CGI::div({ class => 'mb-3' }, $result) if $result;
 	}
 
-	print CGI::submit({
-		name  => 'changeOptions',
-		value => $r->maketext('Change User Settings'),
-		class => 'btn btn-primary'
-	});
-
-	print CGI::end_form();
-
-	return '';
+	return;
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/PGtoTexRenderer.pm b/lib/WeBWorK/ContentGenerator/PGtoTexRenderer.pm
deleted file mode 100644
index bef032fcd7..0000000000
--- a/lib/WeBWorK/ContentGenerator/PGtoTexRenderer.pm
+++ /dev/null
@@ -1,70 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-
-
-
-use strict;
-use warnings;
-
-package WeBWorK::ContentGenerator::PGtoTexRenderer;
-use base qw(WeBWorK::ContentGenerator);
-
-use WeBWorK::DB;
-use Data::Dumper;
-use Parser;
-use AlgParser;
-use HTML::Entities;
-
-
-#use encodeURI to send code
-
-sub pre_header_initialize {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $PGcode = "";
-	$self->{result} = "";
-
-	$PGcode = $r->param('pgcode') if $r->param('pgcode');
-
-	$self->translate($PGcode) if $PGcode;
-}
-
-sub content {
-   #######################################################################
-   # Return content of rendered problem to the browser that requested it #
-   #######################################################################
-	my $self = shift;
-	print $self->{result};
-}
-
-sub translate {
-	my $self = shift;
-	my $PGcode = shift;
-	my $mathObject = "*" . $PGcode;
-	eval{$mathObject = AlgParser->new->parse($PGcode)->tolatex};
-	$self->{result} = $mathObject;
-}
-
-#sub translate { #Old version
-#	my $self = shift;
-#	my $PGcode = shift;
-#	my $mathObject = "*" . $PGcode;
-#	eval{$mathObject = Parser->new($PGcode)->TeX};
-#	$self->{result} = $mathObject;
-#}
-
-1;
diff --git a/lib/WeBWorK/ContentGenerator/PODViewer.pm b/lib/WeBWorK/ContentGenerator/PODViewer.pm
new file mode 100644
index 0000000000..58304ecb57
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/PODViewer.pm
@@ -0,0 +1,82 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ContentGenerator::PODViewer;
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::PODViewer - display POD for PG macros.
+
+=cut
+
+use Pod::Simple::Search;
+use Mojo::DOM;
+
+use WeBWorK::Utils::PODParser;
+
+sub PODindex ($c) {
+	my $pgRoot = $c->ce->{pg_dir};
+
+	my $podFiles = Pod::Simple::Search->new->inc(0)->limit_re(qr/^doc|^lib|^macros/)->survey($pgRoot);
+
+	my $sections = {};
+	for (sort keys %$podFiles) {
+		my $section = $_ =~ s/::.*$//r;
+		push(@{ $sections->{$section} }, $podFiles->{$_} =~ s!^$pgRoot/$section/!!r);
+	}
+
+	return $c->render('ContentGenerator/PODViewer', sections => $sections, sidebar_title => $c->maketext('Categories'));
+}
+
+sub renderPOD ($c) {
+	my $macroFile = $c->ce->{pg_dir} . '/' . $c->stash->{filePath};
+
+	if (-e $macroFile) {
+		my $parser = WeBWorK::Utils::PODParser->new(
+			Pod::Simple::Search->new->inc(0)->limit_re(qr/^doc|^lib|^macros/)->survey($c->ce->{pg_dir}));
+		$parser->{verbose}     = 0;
+		$parser->{source_root} = $c->ce->{pg_dir};
+		$parser->{base_url}    = $c->url_for('pod_index')->to_string;
+		$parser->html_header('');
+		$parser->html_footer('');
+		$parser->output_string(\my $html);
+
+		eval { $parser->parse_file($macroFile) };
+		if ($@) {
+			$c->stash->{podError} = $@;
+		} else {
+			my $dom      = Mojo::DOM->new($html);
+			my $podIndex = $dom->at('ul[id="index"]');
+			$c->stash->{podIndex} = $podIndex ? $podIndex->find('ul[id="index"] > li') : $c->c;
+			for (@{ $c->stash->{podIndex} }) {
+				$_->attr({ class => 'nav-item' });
+				$_->at('a')->attr({ class => 'nav-link p-0' });
+				for (@{ $_->find('ul') }) {
+					$_->attr({ class => 'nav flex-column w-100' });
+				}
+				for (@{ $_->find('li') }) {
+					$_->attr({ class => 'nav-item' });
+					$_->at('a')->attr({ class => 'nav-link p-0' });
+				}
+			}
+			$c->stash->{podHTML} = $podIndex ? $podIndex->remove : $html;
+		}
+	}
+
+	return $c->render('ContentGenerator/PODViewer/POD', sidebar_title => $c->maketext('Index'));
+}
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Problem.pm b/lib/WeBWorK/ContentGenerator/Problem.pm
index 77ff63681a..3cbf75816b 100644
--- a/lib/WeBWorK/ContentGenerator/Problem.pm
+++ b/lib/WeBWorK/ContentGenerator/Problem.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,10 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Problem;
-#use base qw(WeBWorK);
-use base qw(WeBWorK::ContentGenerator);
-use  WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil;  # not needed?
-use WeBWorK::ContentGenerator::Instructor::SingleProblemGrader;
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures, -async_await;
 
 =head1 NAME
 
@@ -25,40 +22,27 @@ WeBWorK::ContentGenerator::Problem - Allow a student to interact with a problem.
 
 =cut
 
-use strict;
-use warnings;
-#use CGI qw(-nosticky );
-use WeBWorK::CGI;
-use File::Path qw(rmtree);
+use WeBWorK::HTML::SingleProblemGrader;
 use WeBWorK::Debug;
-use WeBWorK::Form;
-use WeBWorK::PG;
 use WeBWorK::PG::ImageGenerator;
-use WeBWorK::PG::IO;
-use WeBWorK::Utils qw(readFile writeLog writeCourseLog encodeAnswers decodeAnswers is_restricted ref2string
-	makeTempDirectory path_is_subdir before after between wwRound is_jitar_problem_closed is_jitar_problem_hidden
-	jitar_problem_adjusted_status jitar_id_to_seq seq_to_jitar_id jitar_problem_finished getAssetURL
-	format_set_name_display);
-use WeBWorK::DB::Utils qw(global2user user2global);
-require WeBWorK::Utils::ListingDB;
-use URI::Escape;
+use WeBWorK::Utils qw(decodeAnswers is_restricted path_is_subdir before after between
+	wwRound is_jitar_problem_closed is_jitar_problem_hidden jitar_problem_adjusted_status
+	jitar_id_to_seq seq_to_jitar_id jitar_problem_finished format_set_name_display);
+use WeBWorK::Utils::Rendering qw(getTranslatorDebuggingOptions renderPG);
+use WeBWorK::Utils::ProblemProcessing qw/process_and_log_answer jitar_send_warning_email compute_reduced_score/;
+use WeBWorK::AchievementEvaluator qw(checkForAchievements);
+use WeBWorK::DB::Utils qw(global2user);
 use WeBWorK::Localize;
 use WeBWorK::Utils::Tasks qw(fake_set fake_problem);
-use WeBWorK::Utils::LanguageAndDirection;
+use WeBWorK::Utils::LanguageAndDirection qw(get_problem_lang_and_dir);
 use WeBWorK::AchievementEvaluator;
-use WeBWorK::Utils::AttemptsTable;
-
-use utf8;
-#use open ':encoding(utf8)';
-binmode(STDOUT, ":encoding(UTF-8)");
-################################################################################
-# CGI param interface to this module (up-to-date as of v1.153)
-################################################################################
+use WeBWorK::HTML::AttemptsTable;
 
+# GET/POST Parameters for this module
+#
 # Standard params:
 #
 #     user - user ID of real user
-#     key - session key
 #     effectiveUser - user ID of effective user
 #
 # Integration with PGProblemEditor:
@@ -90,545 +74,437 @@ binmode(STDOUT, ":encoding(UTF-8)");
 #     showMeAnother - name of the "Show me another" button
 #     previewAnswers - name of the "Preview Answers" button
 
-################################################################################
 # "can" methods
-################################################################################
-
 # Subroutines to determine if a user "can" perform an action. Each subroutine is
 # called with the following arguments:
-#
-#     ($self, $User, $EffectiveUser, $Set, $Problem)
-
-# Note that significant parts of the "can" methods are lifted into the
-# GatewayQuiz module.  It isn't direct, however, because of the necessity
-# of dealing with versioning there.
+#   ($c, $user, $effectiveUser, $set, $problem)
+# In addition can_recordAnswers and can_showMeAnother have the argument
+# $submitAnswers that is used to distinguish between this submission and the
+# next.
 
-sub can_showOldAnswers {
-	my ($self, $User, $EffectiveUser, $Set, $Problem) = @_;
-	my $authz = $self->r->authz;
-
-	return $authz->hasPermissions($User->user_id, "can_show_old_answers");
+sub can_showOldAnswers ($c, $user, $effectiveUser, $set, $problem) {
+	return $c->authz->hasPermissions($user->user_id, 'can_show_old_answers');
 }
 
-sub can_showCorrectAnswers {
-	my ($self, $User, $EffectiveUser, $Set, $Problem) = @_;
-	my $authz = $self->r->authz;
-
-	return
-		after($Set->answer_date)
-			||
-		$authz->hasPermissions($User->user_id, "show_correct_answers_before_answer_date")
-		;
+sub can_showCorrectAnswers ($c, $user, $effectiveUser, $set, $problem) {
+	return after($set->answer_date, $c->submitTime)
+		|| $c->authz->hasPermissions($user->user_id, 'show_correct_answers_before_answer_date');
 }
 
-sub can_showProblemGrader {
-	my ($self, $User, $EffectiveUser, $Set, $Problem) = @_;
-	my $authz = $self->r->authz;
+sub can_showProblemGrader ($c, $user, $effectiveUser, $set, $problem) {
+	my $authz = $c->authz;
 
-	return ($authz->hasPermissions($User->user_id, "access_instructor_tools") &&
-		$authz->hasPermissions($User->user_id, "score_sets") &&
-		$Set->set_id ne 'Undefined_Set' && !$self->{invalidSet});
+	return ($authz->hasPermissions($user->user_id, 'access_instructor_tools')
+			&& $authz->hasPermissions($user->user_id, 'score_sets')
+			&& $set->set_id ne 'Undefined_Set'
+			&& !$c->{invalidSet});
 }
 
-sub can_showAnsGroupInfo {
-	my ($self, $User, $EffectiveUser, $Set, $Problem) = @_;
-	my $authz = $self->r->authz;
-#FIXME -- may want to adjust this
-	return
-		$authz->hasPermissions($User->user_id, "show_answer_group_info_checkbox")
-		;
+sub can_showAnsGroupInfo ($c, $user, $effectiveUser, $set, $problem) {
+	return $c->authz->hasPermissions($user->user_id, 'show_answer_group_info');
 }
 
-sub can_showAnsHashInfo {
-	my ($self, $User, $EffectiveUser, $Set, $Problem) = @_;
-	my $authz = $self->r->authz;
-#FIXME -- may want to adjust this
-	return
-		$authz->hasPermissions($User->user_id, "show_answer_hash_info_checkbox")
-		;
+sub can_showAnsHashInfo ($c, $user, $effectiveUser, $set, $problem) {
+	return $c->authz->hasPermissions($user->user_id, 'show_answer_hash_info');
 }
 
-sub can_showPGInfo {
-	my ($self, $User, $EffectiveUser, $Set, $Problem) = @_;
-	my $authz = $self->r->authz;
-#FIXME -- may want to adjust this
-	return
-		$authz->hasPermissions($User->user_id, "show_pg_info_checkbox")
-		;
+sub can_showPGInfo ($c, $user, $effectiveUser, $set, $problem) {
+	return $c->authz->hasPermissions($user->user_id, 'show_pg_info');
 }
 
-sub can_showResourceInfo {
-	my ($self, $User, $EffectiveUser, $Set, $Problem) = @_;
-	my $authz = $self->r->authz;
-
-	return
-		$authz->hasPermissions($User->user_id, "show_resource_info")
-		;
+sub can_showResourceInfo ($c, $user, $effectiveUser, $set, $problem) {
+	return $c->authz->hasPermissions($user->user_id, 'show_resource_info');
 }
 
-sub can_showHints {
-	my ($self, $User, $EffectiveUser, $Set, $Problem) = @_;
-	my $authz = $self->r->authz;
+sub can_showHints ($c, $user, $effectiveUser, $set, $problem) {
+	return 1 if $c->authz->hasPermissions($user->user_id, 'always_show_hint');
+
+	my $showHintsAfter =
+		$set->hide_hint                 ? -1
+		: $problem->showHintsAfter > -2 ? $problem->showHintsAfter
+		:                                 $c->ce->{pg}{options}{showHintsAfter};
 
-	return !$Set->hide_hint;
+	return $showHintsAfter > -1
+		&& $showHintsAfter <= $problem->num_correct + $problem->num_incorrect + ($c->{submitAnswers} ? 1 : 0);
 }
 
-sub can_showSolutions {
-	my ($self, $User, $EffectiveUser, $Set, $Problem) = @_;
-	my $authz = $self->r->authz;
+sub can_showSolutions ($c, $user, $effectiveUser, $set, $problem) {
+	my $authz = $c->authz;
 
 	return
-		after($Set->answer_date)
-			||
-		$authz->hasPermissions($User->user_id, "show_solutions_before_answer_date")
-		;
+		$authz->hasPermissions($user->user_id, 'always_show_solutions')
+		|| after($set->answer_date, $c->submitTime)
+		|| $authz->hasPermissions($user->user_id, 'show_solutions_before_answer_date');
 }
 
+sub can_recordAnswers ($c, $user, $effectiveUser, $set, $problem, $submitAnswers = 0) {
+	my $authz = $c->authz;
 
-sub can_recordAnswers {
-	my ($self, $User, $EffectiveUser, $Set, $Problem, $submitAnswers) = @_;
-	my $authz = $self->r->authz;
-	my $thisAttempt = $submitAnswers ? 1 : 0;
-	if ($User->user_id ne $EffectiveUser->user_id) {
-		return $authz->hasPermissions($User->user_id, "record_answers_when_acting_as_student");
+	if ($user->user_id ne $effectiveUser->user_id) {
+		return $authz->hasPermissions($user->user_id, 'record_answers_when_acting_as_student');
 	}
-	if (before($Set->open_date)) {
-		return $authz->hasPermissions($User->user_id, "record_answers_before_open_date");
-	} elsif (between($Set->open_date, $Set->due_date)) {
-		my $max_attempts = $Problem->max_attempts;
-		my $attempts_used = $Problem->num_correct + $Problem->num_incorrect + $thisAttempt;
+
+	return $authz->hasPermissions($user->user_id, 'record_answers_before_open_date')
+		if (before($set->open_date, $c->submitTime));
+
+	if (between($set->open_date, $set->due_date, $c->submitTime)) {
+		my $max_attempts  = $problem->max_attempts;
+		my $attempts_used = $problem->num_correct + $problem->num_incorrect + ($submitAnswers ? 1 : 0);
 		if ($max_attempts == -1 or $attempts_used < $max_attempts) {
-			return $authz->hasPermissions($User->user_id, "record_answers_after_open_date_with_attempts");
+			return $authz->hasPermissions($user->user_id, 'record_answers_after_open_date_with_attempts');
 		} else {
-			return $authz->hasPermissions($User->user_id, "record_answers_after_open_date_without_attempts");
+			return $authz->hasPermissions($user->user_id, 'record_answers_after_open_date_without_attempts');
 		}
-	} elsif (between($Set->due_date, $Set->answer_date)) {
-		return $authz->hasPermissions($User->user_id, "record_answers_after_due_date");
-	} elsif (after($Set->answer_date)) {
-		return $authz->hasPermissions($User->user_id, "record_answers_after_answer_date");
 	}
+
+	return $authz->hasPermissions($user->user_id, 'record_answers_after_due_date')
+		if (between($set->due_date, $set->answer_date, $c->submitTime));
+
+	return $authz->hasPermissions($user->user_id, 'record_answers_after_answer_date')
+		if (after($set->answer_date, $c->submitTime));
+
+	return 0;
 }
 
-sub can_checkAnswers {
-	my ($self, $User, $EffectiveUser, $Set, $Problem, $submitAnswers) = @_;
-	my $authz = $self->r->authz;
-	my $thisAttempt = $submitAnswers ? 1 : 0;
+sub can_checkAnswers ($c, $user, $effectiveUser, $set, $problem) {
+	my $authz = $c->authz;
 
-	# if we can record answers then we dont need to be able to check them
+	# If we can record answers then we dont need to be able to check them
 	# unless we have that specific permission.
-	if ($self->can_recordAnswers($User,$EffectiveUser,$Set,$Problem,$submitAnswers)
-	    && !$authz->hasPermissions($User->user_id, "can_check_and_submit_answers")) {
-	    return 0;
-	}
+	return 0
+		if ($c->can_recordAnswers($user, $effectiveUser, $set, $problem, $c->{submitAnswers})
+			&& !$authz->hasPermissions($user->user_id, 'can_check_and_submit_answers'));
 
-	if (before($Set->open_date)) {
-		return $authz->hasPermissions($User->user_id, "check_answers_before_open_date");
-	} elsif (between($Set->open_date, $Set->due_date)) {
-		my $max_attempts = $Problem->max_attempts;
-		my $attempts_used = $Problem->num_correct + $Problem->num_incorrect + $thisAttempt;
+	return $authz->hasPermissions($user->user_id, 'check_answers_before_open_date')
+		if (before($set->open_date, $c->submitTime));
+
+	if (between($set->open_date, $set->due_date, $c->submitTime)) {
+		my $max_attempts  = $problem->max_attempts;
+		my $attempts_used = $problem->num_correct + $problem->num_incorrect + ($c->{submitAnswers} ? 1 : 0);
 		if ($max_attempts == -1 or $attempts_used < $max_attempts) {
-			return $authz->hasPermissions($User->user_id, "check_answers_after_open_date_with_attempts");
+			return $authz->hasPermissions($user->user_id, 'check_answers_after_open_date_with_attempts');
 		} else {
-			return $authz->hasPermissions($User->user_id, "check_answers_after_open_date_without_attempts");
+			return $authz->hasPermissions($user->user_id, 'check_answers_after_open_date_without_attempts');
 		}
-	} elsif (between($Set->due_date, $Set->answer_date)) {
-		return $authz->hasPermissions($User->user_id, "check_answers_after_due_date");
-	} elsif (after($Set->answer_date)) {
-		return $authz->hasPermissions($User->user_id, "check_answers_after_answer_date");
 	}
-}
-
-sub can_useMathView {
-    my ($self, $User, $EffectiveUser, $Set, $Problem, $submitAnswers) = @_;
-    my $ce= $self->r->ce;
 
-    return $ce->{pg}->{specialPGEnvironmentVars}->{entryAssist} eq 'MathView';
-}
+	return $authz->hasPermissions($user->user_id, 'check_answers_after_due_date')
+		if (between($set->due_date, $set->answer_date, $c->submitTime));
 
-sub can_useWirisEditor {
-    my ($self, $User, $EffectiveUser, $Set, $Problem, $submitAnswers) = @_;
-    my $ce= $self->r->ce;
+	return $authz->hasPermissions($user->user_id, 'check_answers_after_answer_date')
+		if (after($set->answer_date, $c->submitTime));
 
-    return $ce->{pg}->{specialPGEnvironmentVars}->{entryAssist} eq 'WIRIS';
+	return 0;
 }
 
-sub can_useMathQuill {
-    my ($self, $User, $EffectiveUser, $Set, $Problem, $submitAnswers) = @_;
-    my $ce= $self->r->ce;
-
-    return $ce->{pg}->{specialPGEnvironmentVars}->{entryAssist} eq 'MathQuill';
+sub can_useMathView ($c) {
+	return $c->ce->{pg}{specialPGEnvironmentVars}{entryAssist} eq 'MathView';
 }
 
+sub can_useMathQuill ($c) {
+	return $c->ce->{pg}{specialPGEnvironmentVars}{entryAssist} eq 'MathQuill';
+}
 
-sub can_showMeAnother {
-	# PURPOSE: subroutine to check if showMeAnother
-	# button should be allowed; note that this is done
-	# *before* the check to see if showMeAnother is
-	# possible.
-	my ($self, $User, $EffectiveUser, $Set, $Problem, $submitAnswers) = @_;
-	my $ce = $self->r->ce;
+# Check if the showMeAnother button should be allowed.  Note that this is done *before* the check to see if
+# showMeAnother is possible.
+sub can_showMeAnother ($c, $user, $effectiveUser, $set, $problem, $submitAnswers = 0) {
+	my $ce = $c->ce;
 
-	# if the showMeAnother button isn't enabled in the course configuration,
-	# don't show it under any circumstances (not even for the instructor)
-	return 0 unless($ce->{pg}->{options}->{enableShowMeAnother});
+	# If the showMeAnother button isn't enabled in the course configuration,
+	# don't show it under any circumstances (not even for the instructor).
+	return 0 unless $ce->{pg}{options}{enableShowMeAnother};
 
-	# get the hash of information about showMeAnother
-	my %showMeAnother = %{ $self->{showMeAnother} };
+	# Get the hash of information about showMeAnother
+	my %showMeAnother = %{ $c->{showMeAnother} };
 
-	if (after($Set->open_date) or $self->r->authz->hasPermissions($self->r->param('user'), "can_use_show_me_another_early")) {
-		# if $showMeAnother{TriesNeeded} is somehow not an integer or if its -2, use the default value
-		$showMeAnother{TriesNeeded} = $ce->{pg}->{options}->{showMeAnotherDefault} if ($showMeAnother{TriesNeeded} !~ /^[+-]?\d+$/ || $showMeAnother{TriesNeeded} == -2);
+	if (after($set->open_date, $c->submitTime)
+		|| $c->authz->hasPermissions($c->param('user'), 'can_use_show_me_another_early'))
+	{
+		# If $showMeAnother{TriesNeeded} is somehow not an integer or if it is -2, use the default value.
+		$showMeAnother{TriesNeeded} = $ce->{pg}{options}{showMeAnotherDefault}
+			if ($showMeAnother{TriesNeeded} !~ /^[+-]?\d+$/ || $showMeAnother{TriesNeeded} == -2);
 
-		# if SMA is just not permitted for the problem, don't show it
-		return 0 unless ($showMeAnother{TriesNeeded} > -1);
+		# If SMA is not permitted for the problem, don't show it.
+		return 0 unless $showMeAnother{TriesNeeded} > -1;
 
-		my $thisAttempt = $submitAnswers ? 1 : 0;
-		my $attempts_used = $Problem->num_correct + $Problem->num_incorrect + $thisAttempt;
+		# If the student is previewing or checking an answer to SMA then clearly the user can use show me another.
+		return 1 if $showMeAnother{CheckAnswers} || $showMeAnother{Preview};
 
-		# if $showMeAnother{Count} is somehow not an integer, it probably means that the database was never
-		# inititialized meaning that the student hasn't pushed it yet and it should be 0
-		$showMeAnother{Count} = 0 unless ($showMeAnother{Count} =~ /^[+-]?\d+$/);
+		# If $showMeAnother{Count} is somehow not an integer, it probably means that the value in the database was not
+		# initialized correctly.  So set it to 0.
+		$showMeAnother{Count} = 0 unless $showMeAnother{Count} =~ /^[+-]?\d+$/;
 
-		# if the student is *preview*ing or *check*ing their answer to SMA then showMeAnother{Count} IS ALLOWED
-		# to be equal to showMeAnother{MaxReps}
-		$showMeAnother{Count}-- if(defined($showMeAnother{CheckAnswers} && $showMeAnother{CheckAnswers}) or (defined($showMeAnother{Preview}) && $showMeAnother{Preview}));
+		# If the button is enabled globally and for the problem, then check if the student has either
+		# not submitted enough answers yet or has used the SMA button too many times.
+		return 0
+			if $problem->num_correct + $problem->num_incorrect + ($submitAnswers ? 1 : 0) < $showMeAnother{TriesNeeded}
+			|| ($showMeAnother{Count} >= $showMeAnother{MaxReps} && $showMeAnother{MaxReps} > -1);
 
-		# if we've gotten this far, the button is enabled globally and for the problem; check if the student has either
-		# not submitted enough answers yet or has used the SMA button too many times
-		if ($attempts_used < $showMeAnother{TriesNeeded} or ($showMeAnother{Count}>=$showMeAnother{MaxReps} and $showMeAnother{MaxReps}>-1)) {
-			return 0;
-		} else {
-			return 1;
-		}
-	} else {
-		# otherwise the set hasn't been opened yet, so we can't use showMeAnother
-		return 0;
+		return 1;
 	}
-}
 
-################################################################################
-# output utilities
-################################################################################
+	return 0;
+}
 
-sub attemptResults {
-	my $self = shift;
-	my $r = $self->r;
-	my $pg = shift;
-	my $showAttemptAnswers = shift//0;
-	my $showCorrectAnswers = shift;
-	my $showAttemptResults = $showAttemptAnswers && shift;
-	my $showSummary = shift;
-	my $showAttemptPreview = shift // 1;
-	my $ce = $self->r->ce;
-
-	# to make grabbing these options easier, we'll pull them out now...
-	my %imagesModeOptions = %{$ce->{pg}->{displayModeOptions}->{images}};
-
-	my $imgGen = WeBWorK::PG::ImageGenerator->new(
-		tempDir         => $ce->{webworkDirs}->{tmp},
-		latex	        => $ce->{externalPrograms}->{latex},
-		dvipng          => $ce->{externalPrograms}->{dvipng},
-		useCache        => 1,
-		cacheDir        => $ce->{webworkDirs}->{equationCache},
-		cacheURL        => $ce->{webworkURLs}->{equationCache},
-		cacheDB         => $ce->{webworkFiles}->{equationCacheDB},
-		dvipng_align    => $imagesModeOptions{dvipng_align},
-		dvipng_depth_db => $imagesModeOptions{dvipng_depth_db},
+sub attemptResults ($c, $pg, $showCorrectAnswers, $showAttemptResults, $showSummary) {
+	my $ce = $c->ce;
+
+	# Create AttemptsTable object
+	my $tbl = WeBWorK::HTML::AttemptsTable->new(
+		$pg->{answers},
+		$c,
+		answersSubmitted    => 1,
+		answerOrder         => $pg->{flags}{ANSWER_ENTRY_ORDER},
+		displayMode         => $c->{displayMode},
+		showAnswerNumbers   => 0,
+		showAttemptAnswers  => $ce->{pg}{options}{showEvaluatedAnswers},
+		showAttemptPreviews => 1,
+		showAttemptResults  => $showAttemptResults,
+		showCorrectAnswers  => $showCorrectAnswers,
+		showMessages        => 1,
+		showSummary         => $showSummary,
+		imgGen              => WeBWorK::PG::ImageGenerator->new(
+			tempDir         => $ce->{webworkDirs}{tmp},
+			latex           => $ce->{externalPrograms}{latex},
+			dvipng          => $ce->{externalPrograms}{dvipng},
+			useCache        => 1,
+			cacheDir        => $ce->{webworkDirs}{equationCache},
+			cacheURL        => $ce->{webworkURLs}{equationCache},
+			cacheDB         => $ce->{webworkFiles}{equationCacheDB},
+			useMarkers      => 1,
+			dvipng_align    => $ce->{pg}{displayModeOptions}{images}{dvipng_align},
+			dvipng_depth_db => $ce->{pg}{displayModeOptions}{images}{dvipng_depth_db},
+		),
 	);
 
-	my $answers = $pg->{answers};
-	my $showEvaluatedAnswers = $ce->{pg}->{options}->{showEvaluatedAnswers}//'';
-
-# Create AttemptsTable object
-	my $tbl = WeBWorK::Utils::AttemptsTable->new(
-		$answers,
-		answersSubmitted       => 1,
-		answerOrder            => $pg->{flags}->{ANSWER_ENTRY_ORDER},
-		displayMode            => $self->{displayMode},
-		showAnswerNumbers      => 0,
-		showAttemptAnswers     => $showAttemptAnswers && $showEvaluatedAnswers,
-		showAttemptPreviews    => $showAttemptPreview,
-		showAttemptResults     => $showAttemptResults,
-		showCorrectAnswers     => $showCorrectAnswers,
-		showMessages           => $showAttemptAnswers, # internally checks for messages
-		showSummary            => $showSummary,
-		imgGen                 => $imgGen, # not needed if ce is present ,
-		ce                     => '',	   # not needed if $imgGen is present
-		maketext               => WeBWorK::Localize::getLoc($ce->{language}),
-	);
-	# render equation images
+	# Render equation images
 	my $answerTemplate = $tbl->answerTemplate;
-	   # answerTemplate collects all the formulas to be displayed in the attempts table
-	$tbl->imgGen->render(refresh => 1) if $tbl->displayMode eq 'images';
-	    # after all of the formulas have been collected the render command creates png's for them
-	    # refresh=>1 insures that we never reuse old images -- since the answers change frequently
-	return $answerTemplate;
+	$tbl->imgGen->render(body_text => \$answerTemplate) if $tbl->displayMode eq 'images';
 
+	return $answerTemplate;
 }
 
-################################################################################
-# Template escape implementations
-################################################################################
-sub templateName {
-	my $self = shift;
-	my $r = $self->r;
-	my $templateName = $r->param('templateName')//'system';
-	$self->{templateName}= $templateName;
-	$templateName;
-}
-sub content {
-  my $self = shift;
-  my $result = $self->SUPER::content(@_);
-  $self->{pg}->free if $self->{pg};   # be sure to clean up PG environment when the page is done
-  return $result;
-}
+async sub pre_header_initialize ($c) {
+	my $ce    = $c->ce;
+	my $db    = $c->db;
+	my $authz = $c->authz;
 
-sub pre_header_initialize {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-
-	my $setName = $urlpath->arg("setID");
-	my $problemNumber = $r->urlpath->arg("problemID");
-	my $userName = $r->param('user');
-	my $effectiveUserName = $r->param('effectiveUser');
-	my $key = $r->param('key');
-	my $editMode = $r->param("editMode");
-
-	my $user = $db->getUser($userName); # checked
-	die "record for user $userName (real user) does not exist."
-		unless defined $user;
-
-	my $effectiveUser = $db->getUser($effectiveUserName); # checked
-	die "record for user $effectiveUserName (effective user) does not exist."
-		unless defined $effectiveUser;
-
-	# obtain the merged set for $effectiveUser
-	my $set = $db->getMergedSet($effectiveUserName, $setName);
-
-	# check that the set is valid;
-	# $self->{invalidSet} is set by ContentGenerator.pm
-	die($self->{invalidSet}) if $self->{invalidSet};
-
-	# we are open if we can view unopened sets
-	$self->{isOpen} = $authz->hasPermissions($userName, "view_unopened_sets");
-
-	# or if the set is the "Undefined_set"
-	$self->{isOpen} = $self->{isOpen} || $setName eq "Undefined_Set";
-
-	# or if the set is past the answer date
-	$self->{isOpen} = $self->{isOpen} || time >= $set->answer_date;
-
-	my $isClosed = 0;
-	# now we check the reasons why it might be closed
-	unless ($self->{isOpen}) {
-	    # its closed if the set is restricted
-	    $isClosed = $ce->{options}{enableConditionalRelease} && is_restricted($db, $set, $effectiveUserName);
-	    # or if its a jitar set and the problem is hidden or closed
-	    $isClosed = $isClosed || ($set->assignment_type() eq 'jitar' &&
-				      is_jitar_problem_hidden($db,$effectiveUserName,$set->set_id,$problemNumber));
-	    $isClosed = $isClosed || ($set->assignment_type() eq 'jitar' &&
-				      is_jitar_problem_closed($db,$ce,$effectiveUserName,$set->set_id,$problemNumber));
-	}
+	my $setID           = $c->stash('setID');
+	my $problemID       = $c->stash('problemID');
+	my $userID          = $c->param('user');
+	my $effectiveUserID = $c->param('effectiveUser');
+	$c->{editMode} = $c->param('editMode');
 
-	# isOpen overrides $isClosed.
-	$self->{isOpen} = $self->{isOpen} || !$isClosed;
+	my $user          = $db->getUser($userID);
+	my $effectiveUser = $db->getUser($effectiveUserID);
 
-	die("You do not have permission to view unopened sets") unless $self->{isOpen};
+	return unless defined $user && defined $effectiveUser;    # This should be impossible.
+
+	# Check that the set is valid.  $c->{invalidSet} is set in checkSet called by ContentGenerator.pm.
+	return if $c->{invalidSet};
+
+	# Obtain the merged set for $effectiveUser
+	$c->{set} = $db->getMergedSet($effectiveUserID, $setID);
+
+	# Determine if the set should be considered open.
+	# It is open if the user can view unopened sets or is an instructor editing a problem from the problem editor,
+	# or it is after the set open date and is not conditionally restricted and is not jitar hidden or closed.
+	return
+		unless $authz->hasPermissions($userID, 'view_unopened_sets')
+		|| $setID eq 'Undefined_Set'
+		|| (
+			after($c->{set}->open_date, $c->submitTime)
+			&& !(
+				($ce->{options}{enableConditionalRelease} && is_restricted($db, $c->{set}, $effectiveUserID))
+				|| (
+					$c->{set}->assignment_type eq 'jitar'
+					&& (is_jitar_problem_hidden($db, $effectiveUserID, $c->{set}->set_id, $problemID)
+						|| is_jitar_problem_closed($db, $ce, $effectiveUserID, $c->{set}->set_id, $problemID))
+				)
+			)
+		);
 
 	# When a set is created enable_reduced_scoring is null, so we have to set it
-	if ( $set and $set->enable_reduced_scoring ne "0" and $set->enable_reduced_scoring ne "1") {
-		my $globalSet = $db->getGlobalSet($set->set_id);
-		$globalSet->enable_reduced_scoring("0");	# defaults to disabled
+	if ($c->{set} && $c->{set}->enable_reduced_scoring ne '0' && $c->{set}->enable_reduced_scoring ne '1') {
+		my $globalSet = $db->getGlobalSet($c->{set}->set_id);
+		$globalSet->enable_reduced_scoring('0');
 		$db->putGlobalSet($globalSet);
-		$set = $db->getMergedSet($effectiveUserName, $setName);
+		$c->{set} = $db->getMergedSet($effectiveUserID, $setID);
 	}
 
-	# obtain the merged problem for $effectiveUser
-	my $problem = $db->getMergedProblem($effectiveUserName, $setName, $problemNumber); # checked
+	# Obtain the merged problem for the effective user.
+	my $problem = $db->getMergedProblem($effectiveUserID, $setID, $problemID);
 
-	# A very hacky and temporary solution to the max_attempts problem
-	# if($problem->max_attempts == ""){
-		# $problem->max_attempts = -1;
-	# }
+	if ($authz->hasPermissions($userID, 'modify_problem_sets')) {
+		# This is the case of the problem editor for a user that can modify problem sets.
 
-	if ($authz->hasPermissions($userName, "modify_problem_sets")) {
-		# professors are allowed to fabricate sets and problems not
-		# assigned to them (or anyone). this allows them to use the
-		# editor to
-
-		# if a User Set does not exist for this user and this set
-		# then we check the Global Set
-		# if that does not exist we create a fake set
-		# if it does, we add fake user data
-		unless (defined $set) {
+		# If a user set does not exist for this user and this set, then check
+		# the global set.  If that does not exist, then create a fake set.  If it does, then add fake user data.
+		unless (defined $c->{set}) {
 			my $userSetClass = $db->{set_user}->{record};
-			my $globalSet = $db->getGlobalSet($setName); # checked
+			my $globalSet    = $db->getGlobalSet($setID);
 
 			if (not defined $globalSet) {
-				$set = fake_set($db);
+				$c->{set} = fake_set($db);
 			} else {
-				$set = global2user($userSetClass, $globalSet);
-				$set->psvn(0);
+				$c->{set} = global2user($userSetClass, $globalSet);
+				$c->{set}->psvn(0);
 			}
 		}
 
-		# if that is not yet defined obtain the global problem,
-		# convert it to a user problem, and add fake user data
+		# If a problem is not defined obtain the global problem, convert it to a user problem, and add fake user data.
 		unless (defined $problem) {
-			my $userProblemClass = $db->{problem_user}->{record};
-			my $globalProblem = $db->getGlobalProblem($setName, $problemNumber); # checked
-			# if the global problem doesn't exist either, bail!
-			if(not defined $globalProblem) {
-				my $sourceFilePath = $r->param("sourceFilePath");
-				die "sourceFilePath is unsafe!" unless path_is_subdir($sourceFilePath, $ce->{courseDirs}->{templates}, 1); # 1==path can be relative to dir
-				# These are problems from setmaker.  If declared invalid, they won't come up
-				$self->{invalidProblem} = $self->{invalidSet} = 1 unless defined $sourceFilePath;
-#				die "Problem $problemNumber in set $setName does not exist" unless defined $sourceFilePath;
+			my $globalProblem = $db->getGlobalProblem($setID, $problemID);
+
+			# If the global problem doesn't exist either, bail!
+			if (!defined $globalProblem) {
+				my $sourceFilePath = $c->param('sourceFilePath');
+
+				# These are problems from setmaker.  If declared invalid, they won't come up.
+				if (defined $sourceFilePath) {
+					die 'sourceFilePath is unsafe!'
+						unless path_is_subdir($sourceFilePath, $ce->{courseDirs}{templates}, 1);
+				} else {
+					$c->{invalidProblem} = $c->{invalidSet} = 1;
+					return;
+				}
+
 				$problem = fake_problem($db);
 				$problem->problem_id(1);
 				$problem->source_file($sourceFilePath);
-				$problem->user_id($effectiveUserName);
+				$problem->user_id($effectiveUserID);
 			} else {
-				$problem = global2user($userProblemClass, $globalProblem);
-				$problem->user_id($effectiveUserName);
+				$problem = global2user($db->{problem_user}{record}, $globalProblem);
+				$problem->user_id($effectiveUserID);
 				$problem->problem_seed(0);
 				$problem->status(0);
 				$problem->attempted(0);
-				$problem->last_answer("");
+				$problem->last_answer('');
 				$problem->num_correct(0);
 				$problem->num_incorrect(0);
 			}
 		}
 
-		# now we're sure we have valid UserSet and UserProblem objects
-		# yay!
+		# Now we're sure we have valid UserSet and UserProblem objects
 
-		# now deal with possible editor overrides:
-
-		# if the caller is asking to override the source file, and
-		# editMode calls for a temporary file, do so
-		my $sourceFilePath = $r->param("sourceFilePath");
-		if (defined $editMode and $editMode eq "temporaryFile" and defined $sourceFilePath) {
-			die "sourceFilePath is unsafe!" unless path_is_subdir($sourceFilePath, $ce->{courseDirs}->{templates}, 1); # 1==path can be relative to dir
+		# Deal with possible editor overrides.
+		# If the caller is asking to override the source file, and editMode calls for a temporary file, do so.
+		my $sourceFilePath = $c->param('sourceFilePath');
+		if (defined $c->{editMode} && $c->{editMode} eq 'temporaryFile' && defined $sourceFilePath) {
+			die 'sourceFilePath is unsafe!'
+				unless path_is_subdir($sourceFilePath, $ce->{courseDirs}->{templates}, 1);
 			$problem->source_file($sourceFilePath);
 		}
 
-		# if the problem does not have a source file or no source file has been passed in
-		# then this is really an invalid problem (probably from a bad URL)
-		$self->{invalidProblem} = not (defined $sourceFilePath or $problem->source_file);
+		# If the problem does not have a source file or no source file has been passed in
+		# then this is really an invalid problem (probably from a bad URL).
+		$c->{invalidProblem} = !(defined $sourceFilePath || $problem->source_file);
 
-        # if the caller is asking to override the problem seed, do so
-		my $problemSeed = $r->param("problemSeed");
+		# If the caller is asking to override the problem seed, do so.
+		my $problemSeed = $c->param('problemSeed');
 		if (defined $problemSeed && $problemSeed =~ /^[+-]?\d+$/) {
 			$problem->problem_seed($problemSeed);
-        }
+		}
 
-		my $visiblityStateClass = ($set->visible) ? "font-visible" : "font-hidden";
-		my $visiblityStateText = ($set->visible) ? $r->maketext("visible to students")."." : $r->maketext("hidden from students").".";
-		$self->addmessage(CGI::span($r->maketext("This set is [_1]", CGI::span({class=>$visiblityStateClass}, $visiblityStateText))));
+		$c->addmessage($c->{set}->visible
+			? $c->tag('p', class => 'font-visible', $c->maketext('This set is visible to students.'))
+			: $c->tag('p', class => 'font-hidden',  $c->maketext('This set is hidden from students.')));
 
-  # test for additional problem validity if it's not already invalid
-        } else {
-		$self->{invalidProblem} = !(defined $problem and ($set->visible || $authz->hasPermissions($userName, "view_hidden_sets")));
+	} else {
+		# Test for additional problem validity if it's not already invalid.
+		$c->{invalidProblem} =
+			!(defined $problem && ($c->{set}->visible || $authz->hasPermissions($userID, 'view_hidden_sets')));
 
-		$self->addbadmessage(CGI::p($r->maketext("This problem will not count towards your grade."))) if $problem and not $problem->value and not $self->{invalidProblem};
+		$c->addbadmessage($c->maketext('This problem will not count towards your grade.'))
+			if $problem && !$problem->value && !$c->{invalidProblem};
 	}
 
-	$self->{userName}          = $userName;
-	$self->{effectiveUserName} = $effectiveUserName;
-	$self->{user}              = $user;
-	$self->{effectiveUser}     = $effectiveUser;
-	$self->{set}               = $set;
-	$self->{problem}           = $problem;
-	$self->{editMode}          = $editMode;
+	$c->{userID}          = $userID;
+	$c->{effectiveUserID} = $effectiveUserID;
+	$c->{user}            = $user;
+	$c->{effectiveUser}   = $effectiveUser;
+	$c->{problem}         = $problem;
 
-	##### form processing #####
+	# Form processing
 
-	# set options from form fields (see comment at top of file for names)
-	my $displayMode               = $r->param("displayMode") || $user->displayMode || $ce->{pg}->{options}->{displayMode};
-	my $redisplay                 = $r->param("redisplay");
-	my $submitAnswers             = $r->param("submitAnswers");
-	my $checkAnswers              = $r->param("checkAnswers");
-	my $previewAnswers            = $r->param("previewAnswers");
-	my $requestNewSeed            = $r->param("requestNewSeed") // 0;
+	# Set options from form fields (see comment at top of file for form fields).
+	my $displayMode = $c->param('displayMode') || $user->displayMode || $ce->{pg}->{options}->{displayMode};
+	my $redisplay   = $c->param('redisplay');
+	$c->{submitAnswers} = $c->param('submitAnswers');
+	my $checkAnswers   = $c->param('checkAnswers');
+	my $previewAnswers = $c->param('previewAnswers');
+	my $requestNewSeed = $c->param('requestNewSeed') // 0;
 
-	my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars };
+	my $formFields = $c->req->params->to_hash;
 
 	# Check for a page refresh which causes a cached form resubmission.  In that case this is
 	# not a valid submission of answers.
-	$submitAnswers = 0, $self->{resubmitDetected} = 1
-	if ($set->set_id ne 'Undefined_Set' && $submitAnswers && (!defined($formFields->{num_attempts}) ||
-			(defined($formFields->{num_attempts}) &&
-				$formFields->{num_attempts} != $problem->num_correct + $problem->num_incorrect)));
-
-	$self->{displayMode}    = $displayMode;
-	$self->{redisplay}      = $redisplay;
-	$self->{submitAnswers}  = $submitAnswers;
-	$self->{checkAnswers}   = $checkAnswers;
-	$self->{previewAnswers} = $previewAnswers;
-	$self->{formFields}     = $formFields;
-
-	# get result and send to message
-	my $status_message = $r->param("status_message");
-	$self->addmessage(CGI::p("$status_message")) if $status_message;
-
-	# now that we've set all the necessary variables quit out if the set or problem is invalid
-	return if $self->{invalidSet} || $self->{invalidProblem};
-
-    # a hash containing information for showMeAnother
-    #       TriesNeeded:   the number of times the student needs to attempt the problem before the button is available
-    #       MaxReps:       the Maximum Number of times that showMeAnother can be clicked (specified in course configuration
-    #       Count:         the number of times the student has clicked SMA (or clicked refresh on the page)
-    my %SMAoptions = map {$_ => 1} @{$ce->{pg}->{options}->{showMeAnother}};
-    my %showMeAnother = (
-            TriesNeeded => $problem->{showMeAnother},
-            MaxReps => $ce->{pg}->{options}->{showMeAnotherMaxReps},
-            Count => $problem->{showMeAnotherCount},
-          );
-
-    # if $showMeAnother{Count} is somehow not an integer, make it one
-    $showMeAnother{Count} = 0 unless ($showMeAnother{Count} =~ /^[+-]?\d+$/);
-
-    # store the showMeAnother hash for the check to see if the button can be used
-    # (this hash is updated and re-stored after the can, must, will hashes)
-	$self->{showMeAnother} = \%showMeAnother;
-
-	##### permissions #####
-
-	# what does the user want to do?
-	#FIXME  There is a problem with checkboxes -- if they are not checked they are invisible.  Hence if the default mode in $ce is 1
-	# there is no way to override this.  Probably this is ok for the last three options, but it was definitely not ok for showing
-	# saved answers which is normally on, but you want to be able to turn it off!  This section should be moved to ContentGenerator
-	# so that you can set these options anywhere.  We also need mechanisms for making them sticky.
-	# Note: ProblemSet and ProblemSets might set showOldAnswers to '', which
-	#       needs to be treated as if it is not set.
+	if (
+		$c->{set}->set_id ne 'Undefined_Set'
+		&& $c->{submitAnswers}
+		&& (
+			!defined $formFields->{num_attempts}
+			|| (defined $formFields->{num_attempts}
+				&& $formFields->{num_attempts} != $problem->num_correct + $problem->num_incorrect)
+		)
+		)
+	{
+		$c->{submitAnswers}    = 0;
+		$c->{resubmitDetected} = 1;
+	}
+
+	$c->{displayMode}    = $displayMode;
+	$c->{redisplay}      = $redisplay;
+	$c->{checkAnswers}   = $checkAnswers;
+	$c->{previewAnswers} = $previewAnswers;
+	$c->{formFields}     = $formFields;
+
+	# Get the status message and add it to the messages.
+	$c->addmessage($c->tag('p', $c->b($c->param('status_message')))) if $c->param('status_message');
+
+	# Now that the necessary variables are set, return if the set or problem is invalid.
+	return if $c->{invalidSet} || $c->{invalidProblem};
+
+	# Construct a hash containing information for showMeAnother.
+	#   TriesNeeded:   the number of times the student needs to attempt the problem before the button is available
+	#   MaxReps:       the Maximum Number of times that showMeAnother can be clicked (specified in course configuration
+	#   Count:         the number of times the student has clicked SMA (or clicked refresh on the page)
+	my %SMAoptions    = map { $_ => 1 } @{ $ce->{pg}{options}{showMeAnother} };
+	my %showMeAnother = (
+		TriesNeeded => $problem->{showMeAnother},
+		MaxReps     => $ce->{pg}{options}{showMeAnotherMaxReps},
+		Count       => $problem->{showMeAnotherCount},
+	);
+
+	# If $showMeAnother{Count} is somehow not an integer, make it one.
+	$showMeAnother{Count} = 0 unless $showMeAnother{Count} =~ /^[+-]?\d+$/;
+
+	# Store the showMeAnother hash for the check to see if the button can be used
+	# (this hash is updated and re-stored after the can, must, will hashes)
+	$c->{showMeAnother} = \%showMeAnother;
+
+	# Permissions
+
+	# What does the user want to do?
 	my %want = (
-		showOldAnswers     => $user->showOldAnswers ne '' ? $user->showOldAnswers  : $ce->{pg}->{options}->{showOldAnswers},
+		showOldAnswers => $user->showOldAnswers ne '' ? $user->showOldAnswers : $ce->{pg}{options}{showOldAnswers},
 		# showProblemGrader implies showCorrectAnswers.  This is a convenience for grading.
-		showCorrectAnswers => $r->param('showCorrectAnswers') || $r->param('showProblemGrader')
-		                      || $ce->{pg}->{options}->{showCorrectAnswers},
-		showProblemGrader  => $r->param('showProblemGrader') || 0,
-		showAnsGroupInfo     => $r->param('showAnsGroupInfo') || $ce->{pg}->{options}->{showAnsGroupInfo},
-		showAnsHashInfo    => $r->param('showAnsHashInfo') || $ce->{pg}->{options}->{showAnsHashInfo},
-		showPGInfo         => $r->param('showPGInfo') || $ce->{pg}->{options}->{showPGInfo},
-		showResourceInfo   => $r->param('showResourceInfo') || $ce->{pg}->{options}->{showResourceInfo},
-		showHints          => $r->param("showHints") || $ce->{pg}->{options}{use_knowls_for_hints}
-		                      || $ce->{pg}->{options}->{showHints}, #set to 0 in defaults.config
-		showSolutions      => $r->param("showSolutions") || $ce->{pg}->{options}{use_knowls_for_solutions}
-		                      || $ce->{pg}->{options}->{showSolutions}, #set to 0 in defaults.config
-		useMathView        => $user->useMathView ne '' ? $user->useMathView : $ce->{pg}->{options}->{useMathView},
-		useWirisEditor     => $user->useWirisEditor ne '' ? $user->useWirisEditor : $ce->{pg}->{options}->{useWirisEditor},
-		useMathQuill       => $user->useMathQuill ne '' ? $user->useMathQuill : $ce->{pg}->{options}->{useMathQuill},
-		recordAnswers      => $submitAnswers,
+		showCorrectAnswers => $c->param('showCorrectAnswers') || $c->param('showProblemGrader') || 0,
+		showProblemGrader  => $c->param('showProblemGrader')  || 0,
+		showAnsGroupInfo   => $c->param('showAnsGroupInfo')   || $ce->{pg}{options}{showAnsGroupInfo},
+		showAnsHashInfo    => $c->param('showAnsHashInfo')    || $ce->{pg}{options}{showAnsHashInfo},
+		showPGInfo         => $c->param('showPGInfo')         || $ce->{pg}{options}{showPGInfo},
+		showResourceInfo   => $c->param('showResourceInfo')   || $ce->{pg}{options}{showResourceInfo},
+		showHints          => 1,
+		showSolutions      => 1,
+		useMathView        => $user->useMathView ne ''  ? $user->useMathView  : $ce->{pg}{options}{useMathView},
+		useMathQuill       => $user->useMathQuill ne '' ? $user->useMathQuill : $ce->{pg}{options}{useMathQuill},
+		recordAnswers      => $c->{submitAnswers},
 		checkAnswers       => $checkAnswers,
 		getSubmitButton    => 1,
 	);
 
-	# are certain options enforced?
+	# Are certain options enforced?
 	my %must = (
 		showOldAnswers     => 0,
 		showCorrectAnswers => 0,
@@ -639,60 +515,59 @@ sub pre_header_initialize {
 		showResourceInfo   => 0,
 		showHints          => 0,
 		showSolutions      => 0,
-		recordAnswers      => ! $authz->hasPermissions($userName, "avoid_recording_answers"),
+		recordAnswers      => !$authz->hasPermissions($userID, 'avoid_recording_answers'),
 		checkAnswers       => 0,
 		showMeAnother      => 0,
 		getSubmitButton    => 0,
 		useMathView        => 0,
-		useWirisEditor     => 0,
 		useMathQuill       => 0,
 	);
 
-	# does the user have permission to use certain options?
-	my @args = ($user, $effectiveUser, $set, $problem);
+	# Does the user have permission to use certain options?
+	my @args = ($user, $effectiveUser, $c->{set}, $problem);
 
 	my %can = (
-		showOldAnswers     => $self->can_showOldAnswers(@args),
-		showCorrectAnswers => $self->can_showCorrectAnswers(@args),
-		showProblemGrader  => $self->can_showProblemGrader(@args),
-		showAnsGroupInfo   => $self->can_showAnsGroupInfo(@args),
-		showAnsHashInfo    => $self->can_showAnsHashInfo(@args),
-		showPGInfo         => $self->can_showPGInfo(@args),
-		showResourceInfo   => $self->can_showResourceInfo(@args),
-		showHints          => $self->can_showHints(@args),
-		showSolutions      => $self->can_showSolutions(@args),
-		recordAnswers      => $self->can_recordAnswers(@args, 0),
-		checkAnswers       => $self->can_checkAnswers(@args, $submitAnswers),
-		showMeAnother      => $self->can_showMeAnother(@args, $submitAnswers),
-		getSubmitButton    => $self->can_recordAnswers(@args, $submitAnswers),
-		useMathView        => $self->can_useMathView(@args),
-		useWirisEditor     => $self->can_useWirisEditor(@args),
-		useMathQuill       => $self->can_useMathQuill(@args),
+		showOldAnswers     => $c->can_showOldAnswers(@args),
+		showCorrectAnswers => $c->can_showCorrectAnswers(@args),
+		showProblemGrader  => $c->can_showProblemGrader(@args),
+		showAnsGroupInfo   => $c->can_showAnsGroupInfo(@args),
+		showAnsHashInfo    => $c->can_showAnsHashInfo(@args),
+		showPGInfo         => $c->can_showPGInfo(@args),
+		showResourceInfo   => $c->can_showResourceInfo(@args),
+		showHints          => $c->can_showHints(@args),
+		showSolutions      => $c->can_showSolutions(@args),
+		recordAnswers      => $c->can_recordAnswers(@args),
+		checkAnswers       => $c->can_checkAnswers(@args),
+		showMeAnother      => $c->can_showMeAnother(@args, $c->{submitAnswers}),
+		getSubmitButton    => $c->can_recordAnswers(@args, $c->{submitAnswers}),
+		useMathView        => $c->can_useMathView,
+		useMathQuill       => $c->can_useMathQuill,
 	);
 
-	# re-randomization based on the number of attempts and specified period
-	my $prEnabled = $ce->{pg}{options}{enablePeriodicRandomization} // 0;
+	# Re-randomization based on the number of attempts and specified period
+	my $prEnabled         = $ce->{pg}{options}{enablePeriodicRandomization} // 0;
 	my $rerandomizePeriod = $ce->{pg}{options}{periodicRandomizationPeriod} // 0;
 
 	$problem->{prPeriod} = $ce->{problemDefaults}{prPeriod}
-	if (defined($problem->{prPeriod}) && $problem->{prPeriod} =~ /^\s*$/);
+		if (defined $problem->{prPeriod} && $problem->{prPeriod} =~ /^\s*$/);
 
 	$rerandomizePeriod = $problem->{prPeriod}
-	if (defined($problem->{prPeriod}) && $problem->{prPeriod} > -1);
+		if (defined $problem->{prPeriod} && $problem->{prPeriod} > -1);
 
-	$prEnabled = 0 if ($rerandomizePeriod < 1 || $self->{editMode});
+	$prEnabled = 0 if ($rerandomizePeriod < 1 || $c->{editMode});
 	if ($prEnabled) {
 		$problem->{prCount} = 0
-		if !defined($problem->{prCount}) || $problem->{prCount} =~ /^\s*$/;
+			if !defined $problem->{prCount} || $problem->{prCount} =~ /^\s*$/;
 
-		$problem->{prCount} += $submitAnswers ? 1 : 0;
+		$problem->{prCount} += $c->{submitAnswers} ? 1 : 0;
 
 		$requestNewSeed = 0
-		if ($problem->{prCount} < $rerandomizePeriod || after($set->due_date));
+			if ($problem->{prCount} < $rerandomizePeriod || after($c->{set}->due_date, $c->submitTime));
 
 		if ($requestNewSeed) {
 			# obtain new random seed to hopefully change the problem
-			$problem->{problem_seed} = ($problem->{problem_seed} + $problem->num_correct + $problem->num_incorrect) % 10000;
+			$problem->{problem_seed} =
+				($problem->{problem_seed} + $problem->num_correct + $problem->num_incorrect) % 10000;
 			$problem->{prCount} = 0;
 		}
 		if ($problem->{prCount} > -1) {
@@ -703,235 +578,232 @@ sub pre_header_initialize {
 		}
 	}
 
-	# final values for options
-	my %will;
-	foreach (keys %must) {
-		$will{$_} = $can{$_} && ($want{$_} || $must{$_});
-		#warn "final values for options $_ is can $can{$_}, want $want{$_}, must $must{$_}, will $will{$_}";
-	}
-
-	##### sticky answers #####
+	# Final values for options
+	my %will = map { $_ => $can{$_} && ($want{$_} || $must{$_}) } keys %must;
 
-	if (!($submitAnswers || $previewAnswers || $checkAnswers) && $will{showOldAnswers}) {
+	# Sticky answers
+	if (!($c->{submitAnswers} || $previewAnswers || $checkAnswers) && $will{showOldAnswers}) {
 		my %oldAnswers = decodeAnswers($problem->last_answer);
 		# Do this only if new answers are NOT being submitted
 		if ($prEnabled && !$problem->{prCount}) {
 			# Clear answers if this is a new problem version
-			delete $formFields->{$_} foreach keys %oldAnswers;
+			delete $formFields->{$_} for keys %oldAnswers;
 		} else {
-			$formFields->{$_} = $oldAnswers{$_} foreach keys %oldAnswers;
+			$formFields->{$_} = $oldAnswers{$_} for keys %oldAnswers;
 		}
 	}
 
-	##### translation #####
-
-	debug("begin pg processing");
-	my $pg = WeBWorK::PG->new(
-		$ce,
+	# Translation
+	debug('begin pg processing');
+	my $pg = await renderPG(
+		$c,
 		$effectiveUser,
-		$key,
-		$set,
+		$c->{set},
 		$problem,
-		$set->psvn,
+		$c->{set}->psvn,
 		$formFields,
-		{    # translation options
+		{
 			displayMode              => $displayMode,
 			showHints                => $will{showHints},
-			showResourceInfo         => $will{showResourceInfo},
 			showSolutions            => $will{showSolutions},
+			showResourceInfo         => $will{showResourceInfo},
 			refreshMath2img          => $will{showHints} || $will{showSolutions},
 			processAnswers           => 1,
-			permissionLevel          => $db->getPermissionLevel($userName)->permission,
-			effectivePermissionLevel => $db->getPermissionLevel($effectiveUserName)->permission,
+			permissionLevel          => $db->getPermissionLevel($userID)->permission,
+			effectivePermissionLevel => $db->getPermissionLevel($effectiveUserID)->permission,
 			useMathQuill             => $will{useMathQuill},
 			useMathView              => $will{useMathView},
-			useWirisEditor           => $will{useWirisEditor},
-		},
+			forceScaffoldsOpen       => 0,
+			isInstructor             => $authz->hasPermissions($userID, 'view_answers'),
+			debuggingOptions         => getTranslatorDebuggingOptions($authz, $userID)
+		}
 	);
 
-	debug("end pg processing");
+	# Warnings in the renderPG subprocess will not be caught by the global warning handler of this process.
+	# So rewarn them and let the global warning handler take care of it.
+	warn $pg->{warnings} if $pg->{warnings};
+
+	debug('end pg processing');
 
-	$pg->{body_text} .= CGI::hidden({ -name => 'num_attempts', -id => 'num_attempts',
-			-value => $problem->num_correct + $problem->num_incorrect + ($submitAnswers ? 1 : 0) });
+	$pg->{body_text} .= $c->hidden_field(
+		num_attempts => $problem->num_correct + $problem->num_incorrect + ($c->{submitAnswers} ? 1 : 0),
+		id           => 'num_attempts'
+	);
 
-	if ($prEnabled && $problem->{prCount} >= $rerandomizePeriod && !after($set->due_date)) {
-		$showMeAnother{active} = 0;
-		$must{requestNewSeed} = 1;
-		$can{requestNewSeed} = 1;
-		$want{requestNewSeed} = 1;
-		$will{requestNewSeed} = 1;
-		$self->{showCorrectOnRandomize} = $ce->{pg}{options}{showCorrectOnRandomize};
+	if ($prEnabled && $problem->{prCount} >= $rerandomizePeriod && !after($c->{set}->due_date, $c->submitTime)) {
+		$showMeAnother{active}       = 0;
+		$must{requestNewSeed}        = 1;
+		$can{requestNewSeed}         = 1;
+		$want{requestNewSeed}        = 1;
+		$will{requestNewSeed}        = 1;
+		$c->{showCorrectOnRandomize} = $ce->{pg}{options}{showCorrectOnRandomize};
 		# If this happens, it means that the page was refreshed.  So prevent the answers from
 		# being recorded and the number of attempts from being increased.
 		if ($problem->{prCount} > $rerandomizePeriod) {
-			$self->{resubmitDetected} = 1;
-			$must{recordAnswers} = 0;
-			$can{recordAnswers} = 0;
-			$want{recordAnswers} = 0;
-			$will{recordAnswers} = 0;
+			$c->{resubmitDetected} = 1;
+			$must{recordAnswers}   = 0;
+			$can{recordAnswers}    = 0;
+			$want{recordAnswers}   = 0;
+			$will{recordAnswers}   = 0;
 		}
 	}
 
-	##### update and fix hint/solution options after PG processing #####
-
-	$can{showHints}     &&= $pg->{flags}->{hintExists}
-	                    &&= $pg->{flags}->{showHintLimit}<=$pg->{state}->{num_of_incorrect_ans};
-	$can{showSolutions} &&= $pg->{flags}->{solutionExists};
-
-	##### record errors #########
-	if (ref ($pg->{pgcore}) )  {
-		my @debug_messages     = @{$pg->{pgcore}->get_debug_messages};
-		my @warning_messages   = @{$pg->{pgcore}->get_warning_messages};
-		my @internal_errors    = @{$pg->{pgcore}->get_internal_debug_messages};
-		$self->{pgerrors}      = @debug_messages||@warning_messages||@internal_errors;  # is 1 if any of these are non-empty
-		$self->{pgdebug}       =    \@debug_messages;
-		$self->{pgwarning}     =    \@warning_messages;
-		$self->{pginternalerrors} = \@internal_errors ;
-	} else {
-		warn "Processing of this PG problem was not completed.  Probably because of a syntax error.
-		      The translator died prematurely and no PG warning messages were transmitted.";
-	}
+	# Update and fix hint/solution options after PG processing
+	$can{showHints}     &&= $pg->{flags}{hintExists};
+	$can{showSolutions} &&= $pg->{flags}{solutionExists};
 
-	##### store fields #####
+	# Record errors
+	$c->{pgdebug}          = $pg->{debug_messages}          if ref $pg->{debug_messages} eq 'ARRAY';
+	$c->{pgwarning}        = $pg->{warning_messages}        if ref $pg->{warning_messages} eq 'ARRAY';
+	$c->{pginternalerrors} = $pg->{internal_debug_messages} if ref $pg->{internal_debug_messages} eq 'ARRAY';
+	# $c->{pgerrors} is defined if any of the above are defined, and is nonzero if any are non-empty.
+	$c->{pgerrors} = @{ $c->{pgdebug} // [] } || @{ $c->{pgwarning} // [] } || @{ $c->{pginternalerrors} // [] }
+		if defined $c->{pgdebug} || defined $c->{pgwarning} || defined $c->{pginternalerrors};
 
-	$self->{want} = \%want;
-	$self->{must} = \%must;
-	$self->{can}  = \%can;
-	$self->{will} = \%will;
-	$self->{pg} = $pg;
+	# If $c->{pgerrors} is not defined, then the PG messages arrays were not defined,
+	# which means $pg->{pgcore} was not defined and the translator died.
+	warn 'Processing of this PG problem was not completed.  Probably because of a syntax error. '
+		. 'The translator died prematurely and no PG warning messages were transmitted.'
+		unless defined $c->{pgerrors};
 
-	#### process and log answers ####
-	$self->{scoreRecordedMessage} = WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::process_and_log_answer($self) || "";
+	# Store fields
+	$c->{want} = \%want;
+	$c->{must} = \%must;
+	$c->{can}  = \%can;
+	$c->{will} = \%will;
+	$c->{pg}   = $pg;
 
-}
+	# Process and log answers
+	$c->{scoreRecordedMessage} = await process_and_log_answer($c) || '';
 
-sub warnings {
-	my $self = shift;
-	# print "entering warnings() subroutine internal messages = ", $self->{pgerrors},CGI::br();
- 	my $r  = $self->r;
-# 	my $pg = $self->{pg};
-# 	warn "type of pg is ",ref($pg);
-#  	my $pgerrordiv = $pgdebug||$pgwarning||$pginternalerrors;  # is 1 if any of these are non-empty
-    # print warning messages
-    if (not defined $self->{pgerrors} ) {
-    	print CGI::start_div();
-		print CGI::h3({style=>"color:red;"}, $r->maketext("PG question failed to render"));
-		print CGI::p($r->maketext("Unable to obtain error messages from within the PG question." ));
-		print CGI::end_div();
-    } elsif ( $self->{pgerrors} > 0 ) {
-        my @pgdebug          = (defined $self->{pgdebug}) ? @{ $self->{pgdebug}} : () ;
- 		my @pgwarning        = (defined $self->{pgwarning}) ? @{ $self->{pgwarning}} : ();
- 		my @pginternalerrors = (defined $self->{pginternalerrors}) ? @{ $self->{pginternalerrors}} : ();
-		print CGI::start_div();
-		print CGI::h3({style=>"color:red;"}, $r->maketext("PG question processing error messages"));
-		print CGI::p(CGI::h3($r->maketext("PG debug messages" ) ),  join(CGI::br(), @pgdebug  )  )  if @pgdebug   ;
-		print CGI::p(CGI::h3($r->maketext("PG warning messages" ) ),join(CGI::br(), @pgwarning)  )  if @pgwarning ;
-		print CGI::p(CGI::h3($r->maketext("PG internal errors" ) ), join(CGI::br(), @pginternalerrors )) if @pginternalerrors;
-		print CGI::end_div();
-	}
-	# print "proceeding to SUPER::warnings";
-	$self->SUPER::warnings();
-	#  print $self->{pgerrors};
-	"";  #FIXME -- let's see if this is the appropriate output.
+	return;
 }
 
-sub if_errors($$) {
-	my ($self, $arg) = @_;
+sub warnings ($c) {
+	my $output = $c->c;
 
-	if ($self->{isOpen}) {
-		return $self->{pg}->{flags}->{error_flag} ? $arg : !$arg;
-	} else {
-		return !$arg;
+	# Display warning messages
+	if (!defined $c->{pgerrors}) {
+		push(
+			@$output,
+			$c->tag(
+				'div',
+				$c->c(
+					$c->tag('h3', style => 'color:red;', $c->maketext('PG question failed to render')),
+					$c->tag('p',  $c->maketext('Unable to obtain error messages from within the PG question.'))
+				)->join('')
+			)
+		);
+	} elsif ($c->{pgerrors} > 0) {
+		my @pgdebug          = @{ $c->{pgdebug}          // [] };
+		my @pgwarning        = @{ $c->{pgwarning}        // [] };
+		my @pginternalerrors = @{ $c->{pginternalerrors} // [] };
+		push(
+			@$output,
+			$c->tag(
+				'div',
+				$c->c(
+					$c->tag('h2', $c->maketext('PG question processing error messages')),
+					@pgdebug ? $c->c(
+						$c->tag('h3', $c->maketext('PG debug messages')),
+						$c->tag('p',  $c->c(@pgdebug)->join($c->tag('br')))
+					)->join('') : '',
+					@pgwarning ? $c->c(
+						$c->tag('h3', $c->maketext('PG warning messages')),
+						$c->tag('p',  $c->c(@pgwarning)->join($c->tag('br')))
+					)->join('') : '',
+					@pginternalerrors ? $c->c(
+						$c->tag('h3', $c->maketext('PG internal errors')),
+						$c->tag('p',  $c->c(@pginternalerrors)->join($c->tag('br')))
+					)->join('') : ''
+				)->join('')
+			)
+		);
 	}
-}
 
-sub head {
-	my ($self) = @_;
-	my $ce = $self->r->ce;
-	my $webwork_htdocs_url = $ce->{webwork_htdocs_url};
-	return "" if ( $self->{invalidSet} );
+	push(@$output, $c->SUPER::warnings());
 
-	return $self->{pg}->{head_text} if $self->{pg}->{head_text};
+	return $output->join('');
+}
 
+sub head ($c) {
+	return ''                  if ($c->{invalidSet});
+	return $c->{pg}{head_text} if $c->{pg}{head_text};
+	return '';
 }
 
-sub post_header_text {
-	my ($self) = @_;
-	return "" if ( $self->{invalidSet} );
-    return $self->{pg}->{post_header_text} if $self->{pg}->{post_header_text};
+sub post_header_text ($c) {
+	return ''                           if ($c->{invalidSet});
+	return $c->{pg}->{post_header_text} if $c->{pg}->{post_header_text};
+	return '';
 }
 
-sub siblings {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $db = $r->db;
-	my $ce = $r->ce;
-	my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
+sub siblings ($c) {
+	my $db    = $c->db;
+	my $ce    = $c->ce;
+	my $authz = $c->authz;
 
-	# can't show sibling problems if the set is invalid
-	return "" if $self->{invalidSet};
+	# Can't show sibling problems if the set is invalid.
+	return '' if $c->{invalidSet};
 
-	my $courseID = $urlpath->arg("courseID");
-	my $setID = $self->{set}->set_id;
-	my $eUserID = $r->param("effectiveUser");
+	my $setID   = $c->{set}->set_id;
+	my $eUserID = $c->param('effectiveUser');
 
 	my @problemRecords = $db->getMergedProblemsWhere({ user_id => $eUserID, set_id => $setID }, 'problem_id');
 	my @problemIDs     = map { $_->problem_id } @problemRecords;
 
-	my $isJitarSet = $setID ne 'Undefined_Set' && $self->{set}->assignment_type eq 'jitar' ? 1 : 0;
+	my $isJitarSet = $setID ne 'Undefined_Set' && $c->{set}->assignment_type eq 'jitar' ? 1 : 0;
 
-	# variables for the progress bar
-	my $num_of_problems  = 0;
+	# Variables for the progress bar
+	my $num_of_problems = 0;
 	my $problemList;
-	my $total_correct=0;
-	my $total_incorrect=0;
-	my $total_inprogress=0;
-	my $currentProblemID = $self->{problem}->problem_id if !($self->{invalidProblem});
-
-	my $progressBarEnabled = $r->ce->{pg}->{options}->{enableProgressBar};
-
+	my $total_correct    = 0;
+	my $total_incorrect  = 0;
+	my $total_inprogress = 0;
+	my $currentProblemID = $c->{invalidProblem} ? 0 : $c->{problem}->problem_id;
 
-	print CGI::start_div({ class => 'info-box', id => 'fisheye' });
-	print CGI::h2($r->maketext('Problems'));
+	my $progressBarEnabled = $c->ce->{pg}{options}{enableProgressBar};
 
 	my @items;
 
-	foreach my $problemID (@problemIDs) {
-		if ($isJitarSet && !$authz->hasPermissions($eUserID, "view_unopened_sets") && is_jitar_problem_hidden($db,$eUserID, $setID, $problemID)) {
+	# Keep the grader open when linking to problems if it is already open.
+	my %problemGraderLink = $c->{will}{showProblemGrader} ? (params => { showProblemGrader => 1 }) : ();
+
+	for my $problemID (@problemIDs) {
+		if ($isJitarSet
+			&& !$authz->hasPermissions($eUserID, 'view_unopened_sets')
+			&& is_jitar_problem_hidden($db, $eUserID, $setID, $problemID))
+		{
 			shift(@problemRecords) if $progressBarEnabled;
 			next;
 		}
 
-		my $problemPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Problem", $r, courseID => $courseID, setID => $setID, problemID => $problemID);
-		my $link;
-
 		my $status_symbol = '';
-		if($progressBarEnabled){
+		if ($progressBarEnabled) {
 			my $problemRecord = shift(@problemRecords);
 			$num_of_problems++;
-			my $total_attempts = $problemRecord->num_correct+$problemRecord->num_incorrect;
+			my $total_attempts = $problemRecord->num_correct + $problemRecord->num_incorrect;
 
 			my $status = $problemRecord->status;
 			if ($isJitarSet) {
-				$status = jitar_problem_adjusted_status($problemRecord,$db);
+				$status = jitar_problem_adjusted_status($problemRecord, $db);
 			}
 
 			# variables for the widths of the bars in the Progress Bar
-			if( $status ==1 ){
+			if ($status == 1) {
 				# correct
 				$total_correct++;
-				$status_symbol = " &#x2713;"; # checkmark
+				$status_symbol = ' &#x2713;';    # checkmark
 			} else {
 				# incorrect
-				if($total_attempts >= $problemRecord->max_attempts and $problemRecord->max_attempts!=-1){
+				if ($total_attempts >= $problemRecord->max_attempts && $problemRecord->max_attempts != -1) {
 					$total_incorrect++;
-					$status_symbol = " &#x2717;"; # cross
+					$status_symbol = ' &#x2717;';    # cross
 				} else {
 					# in progress
-					if($problemRecord->attempted>0){
+					if ($problemRecord->attempted > 0) {
 						$total_inprogress++;
-						$status_symbol = " &hellip;"; # horizontal ellipsis
+						$status_symbol = ' &hellip;';    # horizontal ellipsis
 					}
 				}
 			}
@@ -939,148 +811,77 @@ sub siblings {
 
 		my $active = ($progressBarEnabled && $currentProblemID eq $problemID);
 
+		my $problemPage = $c->url_for('problem_detail', setID => $setID, problemID => $problemID);
+
 		if ($isJitarSet) {
 			# If it is a jitar set, we need to hide and disable links to hidden or restricted problems.
-			my @seq = jitar_id_to_seq($problemID);
+			my @seq   = jitar_id_to_seq($problemID);
 			my $level = $#seq;
 			my $class = 'nav-link' . ($active ? ' active' : '');
 			if ($level != 0) {
 				$class .= ' nested-problem-' . $level;
 			}
 
-			if (!$authz->hasPermissions($eUserID, "view_unopened_sets")
+			if (!$authz->hasPermissions($eUserID, 'view_unopened_sets')
 				&& is_jitar_problem_closed($db, $ce, $eUserID, $setID, $problemID))
 			{
-				$link = CGI::a(
-					{ href => '#', class => $class . ' disabled-problem' },
-					$r->maketext("Problem [_1]", join('.', @seq))
+				push(
+					@items,
+					$c->link_to(
+						$c->maketext('Problem [_1]', join('.', @seq)) => '#',
+						class                                         => $class . ' disabled-problem',
+					)
 				);
 			} else {
-				$link = CGI::a(
-					{
-						$active ? (class => $class)
-						: (href => $self->systemLink($problemPage), class => $class)
-					},
-					$r->maketext('Problem [_1]', join('.', @seq)) . ($progressBarEnabled ? $status_symbol : '')
+				push(
+					@items,
+					$c->tag(
+						'a',
+						$active ? () : (href => $c->systemLink($problemPage, %problemGraderLink)),
+						class => $class,
+						$c->b($c->maketext('Problem [_1]', join('.', @seq)) . $status_symbol)
+					)
 				);
 			}
 		} else {
-			$link = CGI::a(
-				{
-					$active ? (class => 'nav-link active')
-					: (href => $self->systemLink($problemPage), class => 'nav-link')
-				},
-				$r->maketext('Problem [_1]', $problemID) . ($progressBarEnabled ? $status_symbol : '')
-			);
-		}
-
-		push @items, CGI::li({ class => 'nav-item' }, $link);
-	}
-
-	# output the progress bar
-	if ($num_of_problems > 0 && $r->ce->{pg}->{options}->{enableProgressBar}) {
-		my $unattempted                    = $num_of_problems - $total_correct - $total_incorrect - $total_inprogress;
-		my $progress_bar_correct_width     = $total_correct * 100 / $num_of_problems;
-		my $progress_bar_incorrect_width   = $total_incorrect * 100 / $num_of_problems;
-		my $progress_bar_inprogress_width  = $total_inprogress * 100 / $num_of_problems;
-		my $progress_bar_unattempted_width = $unattempted * 100 / $num_of_problems;
-
-		# Construct the progress bar.
-		# CORRECT | IN PROGRESS | INCORRECT | UNATTEMPTED
-		my $progress_bar = CGI::start_div({
-			class      => 'progress set-id-tooltip',
-			aria_label => 'progress bar for current problem set',
-			role       => 'figure'
-		});
-		if ($total_correct > 0) {
-			$progress_bar .= CGI::div(
-				{
-					class             => 'progress-bar correct-progress set-id-tooltip',
-					style             => "width:$progress_bar_correct_width%",
-					aria_label        => 'correct progress bar for current problem set',
-					role              => 'figure',
-					data_bs_toggle    => 'tooltip',
-					data_bs_placement => 'bottom',
-					data_bs_title     => $r->maketext('Correct: [_1]/[_2]', $total_correct, $num_of_problems)
-				},
-				# perfect scores deserve some stars (&#9733;)
-				$total_correct == $num_of_problems ? '&#9733;Perfect&#9733;' : ''
-			);
-		}
-		if ($total_inprogress > 0) {
-			$progress_bar .= CGI::div(
-				{
-					class             => 'progress-bar inprogress-progress set-id-tooltip',
-					style             => "width:$progress_bar_inprogress_width%",
-					aria_label        => 'in progress bar for current problem set',
-					role              => 'figure',
-					data_bs_toggle    => 'tooltip',
-					data_bs_placement => 'bottom',
-					data_bs_title     => $r->maketext('In progress: [_1]/[_2]', $total_inprogress, $num_of_problems)
-				},
-				''
-			);
-		}
-		if ($total_incorrect > 0) {
-			$progress_bar .= CGI::div(
-				{
-					class             => 'progress-bar incorrect-progress set-id-tooltip',
-					style             => "width:$progress_bar_incorrect_width%",
-					aria_label        => 'incorrect progress bar for current problem set',
-					role              => 'figure',
-					data_bs_toggle    => 'tooltip',
-					data_bs_placement => 'bottom',
-					data_bs_title     => $r->maketext('Incorrect: [_1]/[_2]', $total_incorrect, $num_of_problems)
-				},
-				''
-			);
-		}
-		if ($unattempted > 0) {
-			$progress_bar .= CGI::div(
-				{
-					class             => 'progress-bar unattempted-progress set-id-tooltip',
-					style             => "width:$progress_bar_unattempted_width%",
-					aria_label        => 'unattempted progress bar for current problem set',
-					role              => 'figure',
-					data_bs_toggle    => 'tooltip',
-					data_bs_placement => 'bottom',
-					data_bs_title     => $r->maketext('Unattempted: [_1]/[_2]', $unattempted, $num_of_problems)
-				},
-				''
+			push(
+				@items,
+				$c->tag(
+					'a',
+					$active ? () : (href => $c->systemLink($problemPage, %problemGraderLink)),
+					class => 'nav-link' . ($active ? ' active' : ''),
+					$c->b($c->maketext('Problem [_1]', $problemID) . $status_symbol)
+				)
 			);
 		}
-		# close the progress bar div
-		$progress_bar .= CGI::end_div();
-
-		# output to the screen
-		print $progress_bar;
 	}
 
-	print CGI::ul({ class => 'nav flex-column problem-list' }, @items);
-
-	print CGI::end_div();
-
-	return '';
+	return $c->include(
+		'ContentGenerator/Problem/siblings',
+		items            => \@items,
+		num_of_problems  => $num_of_problems,
+		total_correct    => $total_correct,
+		total_incorrect  => $total_incorrect,
+		total_inprogress => $total_inprogress,
+	);
 }
 
-sub nav {
-	my ($self, $args) = @_;
-	my $r   = $self->r;
-	my %can = %{ $self->{can} };
+sub nav ($c, $args) {
+	return '' if $c->{invalidProblem} || $c->{invalidSet};
+
+	my %can = %{ $c->{can} };
 
-	my $db      = $r->db;
-	my $ce      = $r->ce;
-	my $authz   = $r->authz;
-	my $urlpath = $r->urlpath;
+	my $db    = $c->db;
+	my $ce    = $c->ce;
+	my $authz = $c->authz;
 
-	my $courseID  = $urlpath->arg('courseID');
-	my $setID     = $self->{set}->set_id;
-	my $problemID = $self->{problem}->problem_id if !($self->{invalidProblem});
-	my $userID    = $r->param('user');
-	my $eUserID   = $r->param('effectiveUser');
+	my $setID     = $c->{set}->set_id;
+	my $problemID = $c->{problem}->problem_id;
+	my $userID    = $c->param('user');
+	my $eUserID   = $c->param('effectiveUser');
 
 	my $mergedSet = $db->getMergedSet($eUserID, $setID);
-	return '' if $self->{invalidSet} || !$mergedSet;
+	return '' if !$mergedSet;
 
 	# Set up a student navigation for those that have permission to act as a student.
 	my $userNav = '';
@@ -1095,7 +896,7 @@ sub nav {
 			[qw/last_name first_name user_id/]
 		);
 
-		my $filter = $r->param('studentNavFilter');
+		my $filter = $c->param('studentNavFilter');
 
 		# Find the previous, current, and next users, and format the student names for display.
 		# Also create a hash of sections and recitations if there are any for the course.
@@ -1106,10 +907,10 @@ sub nav {
 			# Add to the sections and recitations if defined.  Also store the first user found in that section or
 			# recitation.  This user will be switched to when the filter is selected.
 			my $section = $_->section;
-			$filters{"section:$section"} = [ $r->maketext('Filter by section [_1]', $section), $_->user_id ]
+			$filters{"section:$section"} = [ $c->maketext('Filter by section [_1]', $section), $_->user_id ]
 				if $section && !$filters{"section:$section"};
 			my $recitation = $_->recitation;
-			$filters{"recitation:$recitation"} = [ $r->maketext('Filter by recitation [_1]', $recitation), $_->user_id ]
+			$filters{"recitation:$recitation"} = [ $c->maketext('Filter by recitation [_1]', $recitation), $_->user_id ]
 				if $recitation && !$filters{"recitation:$recitation"};
 
 			# Only keep this user if it satisfies the selected filter if a filter was selected.
@@ -1134,177 +935,34 @@ sub nav {
 		# Mark the current user.
 		$userRecords[$currentUserIndex]{currentUser} = 1;
 
-		my $problemPage = $urlpath->newFromModule(__PACKAGE__, $r,
-			courseID  => $courseID,
-			setID     => $setID,
-			problemID => $problemID
-		);
-
-		# Cap the number of students shown to at most 200.
-		my $numAfter        = $#userRecords - $currentUserIndex;
-		my $numBefore       = 200 - ($numAfter < 100 ? $numAfter : 100);
-		my $minStudentIndex = $currentUserIndex < $numBefore         ? 0 : $currentUserIndex - $numBefore;
-		my $maxStudentIndex = $minStudentIndex + 200 < $#userRecords ? $minStudentIndex + 200 : $#userRecords;
+		my $problemPage = $c->url_for('problem_detail', setID => $setID, problemID => $problemID);
 
 		# Set up the student nav.
-		$userNav = CGI::div(
-			{ class => 'user-nav d-flex submit-buttons-container' },
-			CGI::div(
-				{ class => 'btn-group', role => 'group', aria_label => 'student selector' },
-				$prevUser
-				? CGI::a(
-					{
-						href => $self->systemLink(
-							$problemPage,
-							params => {
-								effectiveUser     => $prevUser->user_id,
-								showProblemGrader => $self->{will}{showProblemGrader},
-								$filter ? (studentNavFilter => $filter) : ()
-							}
-						),
-						data_bs_toggle    => 'tooltip',
-						data_bs_placement => 'top',
-						title             => $prevUser->{displayName},
-						class             => 'btn btn-primary student-nav-button'
-					},
-					CGI::i({ class => 'fas fa-chevron-left' }, '')
-					)
-				: CGI::span({ class => 'btn btn-primary disabled' },
-					CGI::i({ class => 'fas fa-chevron-left' }, '')),
-				CGI::div(
-					{ class => 'btn-group student-nav-selector' },
-					CGI::a(
-						{
-							href           => '#',
-							id             => 'studentSelector',
-							class          => 'btn btn-primary dropdown-toggle',
-							role           => 'button',
-							data_bs_toggle => 'dropdown',
-							aria_expanded  => 'false'
-						},
-						$userRecords[$currentUserIndex]{displayName}
-					),
-					CGI::ul(
-						{ class => 'dropdown-menu', role => 'menu', aria_labelledby => 'studentSelector' },
-						map {
-							CGI::li(CGI::a(
-								{
-									style => $_->{currentUser} ? 'background-color: #8F8' : '',
-									class => 'dropdown-item',
-									href  => $self->systemLink(
-										$problemPage,
-										params => {
-											effectiveUser     => $_->user_id,
-											showProblemGrader => $self->{will}{showProblemGrader},
-											$filter ? (studentNavFilter => $filter) : ()
-										}
-									)
-								},
-								$_->{displayName}
-							))
-						} @userRecords[ $minStudentIndex .. $maxStudentIndex ]
-					)
-				),
-				$nextUser
-				? CGI::a(
-					{
-						href => $self->systemLink(
-							$problemPage,
-							params => {
-								effectiveUser     => $nextUser->user_id,
-								showProblemGrader => $self->{will}{showProblemGrader},
-								$filter ? (studentNavFilter => $filter) : ()
-							}
-						),
-						data_bs_toggle    => 'tooltip',
-						data_bs_placement => 'top',
-						title             => $nextUser->{displayName},
-						class             => 'btn btn-primary student-nav-button'
-					},
-					CGI::i({ class => 'fas fa-chevron-right' }, '')
-					)
-				: CGI::span(
-					{ class => 'btn btn-primary disabled' },
-					CGI::i({ class => 'fas fa-chevron-right' }, '')
-				),
-			),
-			# Create a section/recitation "filter by" dropdown if there are sections or recitations.
-			scalar keys %filters
-			? CGI::div(
-				{ class => 'btn-group student-nav-filter-selector' },
-				CGI::a(
-					{
-						href           => '#',
-						id             => 'studentSelectorFilter',
-						class          => 'btn btn-primary dropdown-toggle',
-						role           => 'button',
-						data_bs_toggle => 'dropdown',
-						aria_expanded  => 'false',
-					},
-					$filter ? $filters{$filter}[0] : $r->maketext('Showing all students')
-				),
-				CGI::ul(
-					{
-						class           => 'dropdown-menu',
-						role            => 'menu',
-						aria_labelledby => 'studentSelectorFilter'
-					},
-					(
-						# If a filter is currently in use, then add an item that will remove that filter.
-						$filter
-						? CGI::li(CGI::a(
-							{
-								class => 'dropdown-item',
-								href  => $self->systemLink(
-									$problemPage,
-									params => {
-										effectiveUser     => $eUserID,
-										showProblemGrader => $self->{will}{showProblemGrader}
-									}
-								)
-							},
-							$r->maketext('Show all students')
-						))
-						: ''
-					),
-					(
-						map {
-							CGI::li(CGI::a(
-								{
-									class => 'dropdown-item',
-									style => ($filter || '') eq $_ ? 'background-color: #8F8' : '',
-									href  => $self->systemLink(
-										$problemPage,
-										params => {
-											effectiveUser     => $filters{$_}[1],
-											showProblemGrader => $self->{will}{showProblemGrader},
-											studentNavFilter  => $_
-										}
-									)
-								},
-								$filters{$_}[0]
-							))
-						} sort keys %filters
-					)
-				)
-				)
-			: ''
+		$userNav = $c->include(
+			'ContentGenerator/Problem/student_nav',
+			eUserID          => $eUserID,
+			problemPage      => $problemPage,
+			userRecords      => \@userRecords,
+			currentUserIndex => $currentUserIndex,
+			prevUser         => $prevUser,
+			nextUser         => $nextUser,
+			filter           => $filter,
+			filters          => \%filters
 		);
 	}
 
-	my $isJitarSet = ($mergedSet->assignment_type eq 'jitar');
+	my $isJitarSet = $mergedSet->assignment_type eq 'jitar';
 
 	my ($prevID, $nextID);
 
-	# for jitar sets finding the next or previous problem, and seeing if it
-	# is actually open is a bit more of a process.
-	if (!$self->{invalidProblem}) {
+	# Find the next or previous problem, and determine if it is actually open for a jitar set.
+	if (!$c->{invalidProblem}) {
 		my @problemIDs =
 			map { $_->[2] } $db->listUserProblemsWhere({ user_id => $eUserID, set_id => $setID }, 'problem_id');
 
 		if ($isJitarSet) {
 			my @processedProblemIDs;
-			foreach my $id (@problemIDs) {
+			for my $id (@problemIDs) {
 				push @processedProblemIDs, $id
 					unless !$authz->hasPermissions($eUserID, 'view_unopened_sets')
 					&& is_jitar_problem_hidden($db, $eUserID, $setID, $id);
@@ -1330,1235 +988,695 @@ sub nav {
 	my @links;
 
 	if ($prevID) {
-		my $prevPage = $urlpath->newFromModule(__PACKAGE__, $r,
-			courseID  => $courseID,
-			setID     => $setID,
-			problemID => $prevID
-		);
-		push @links, $r->maketext('Previous Problem'), $r->location . $prevPage->path, $r->maketext('Previous Problem');
+		push @links, $c->maketext('Previous Problem'),
+			$c->url_for('problem_detail', setID => $setID, problemID => $prevID),
+			$c->maketext('Previous Problem');
 	} else {
-		push @links, $r->maketext('Previous Problem'), '', $r->maketext('Previous Problem');
+		push @links, $c->maketext('Previous Problem'), '', $c->maketext('Previous Problem');
 	}
 
-	if (defined($setID) && $setID ne 'Undefined_Set') {
-		push @links, $r->maketext('Problem List'), $r->location . $urlpath->parent->path, $r->maketext('Problem List');
+	if (defined $setID && $setID ne 'Undefined_Set') {
+		push @links, $c->maketext('Problem List'), $c->url_for('problem_list', setID => $setID),
+			$c->maketext('Problem List');
 	} else {
-		push @links, $r->maketext('Problem List'), '', $r->maketext('Problem List');
+		push @links, $c->maketext('Problem List'), '', $c->maketext('Problem List');
 	}
 
 	if ($nextID) {
-		my $nextPage = $urlpath->newFromModule(__PACKAGE__, $r,
-			courseID  => $courseID,
-			setID     => $setID,
-			problemID => $nextID
-		);
-		push @links, $r->maketext('Next Problem'), $r->location . $nextPage->path, $r->maketext('Next Problem');
+		push @links, $c->maketext('Next Problem'),
+			$c->url_for('problem_detail', setID => $setID, problemID => $nextID),
+			$c->maketext('Next Problem');
 	} else {
-		push @links, $r->maketext('Next Problem'), '', $r->maketext('Next Problem');
-	}
-
-	my $tail = '';
-	$tail .= "&displayMode=$self->{displayMode}"                   if defined $self->{displayMode};
-	$tail .= "&showOldAnswers=$self->{will}{showOldAnswers}"       if defined $self->{will}{showOldAnswers};
-	$tail .= "&showProblemGrader=$self->{will}{showProblemGrader}" if defined $self->{will}{showProblemGrader};
-	$tail .= '&studentNavFilter=' . $r->param('studentNavFilter')  if $r->param('studentNavFilter');
-
-	return CGI::div({ class => 'row sticky-nav', role => 'navigation', aria_label => 'problem navigation' },
-		CGI::div({ class => 'd-flex submit-buttons-container' }, $self->navMacro($args, $tail, @links)), $userNav);
+		push @links, $c->maketext('Next Problem'), '', $c->maketext('Next Problem');
+	}
+
+	my %tail;
+	$tail{displayMode}       = $c->{displayMode}             if defined $c->{displayMode};
+	$tail{showOldAnswers}    = $c->{will}{showOldAnswers}    if defined $c->{will}{showOldAnswers};
+	$tail{showProblemGrader} = $c->{will}{showProblemGrader} if defined $c->{will}{showProblemGrader};
+	$tail{studentNavFilter}  = $c->param('studentNavFilter') if $c->param('studentNavFilter');
+
+	return $c->tag(
+		'div',
+		class        => 'row sticky-nav',
+		role         => 'navigation',
+		'aria-label' => 'problem navigation',
+		$c->c($c->tag('div', class => 'd-flex submit-buttons-container', $c->navMacro($args, \%tail, @links)),
+			$userNav)->join('')
+	);
 }
 
-sub path {
-	my ($self, $args) = @_;
-	my $r                   = $self->r;
-	my $urlpath             = $r->urlpath;
-	my $courseName          = $urlpath->arg('courseID');
-	my $setName             = $urlpath->arg('setID')     || '';
-	my $problemNumber       = $urlpath->arg('problemID') || '';
-	my $prettyProblemNumber = $problemNumber;
-
-	if ($setName) {
-		my $set = $r->db->getGlobalSet($setName);
-		if ($set && $set->assignment_type eq 'jitar' && $problemNumber) {
-			$prettyProblemNumber = join('.', jitar_id_to_seq($problemNumber));
-		}
+sub path ($c, $args) {
+	my $prettyProblemNumber = $c->stash('problemID');
+
+	my $set = $c->db->getGlobalSet($c->stash('setID'));
+	if ($set && $set->assignment_type eq 'jitar' && $prettyProblemNumber) {
+		$prettyProblemNumber = join('.', jitar_id_to_seq($prettyProblemNumber));
 	}
 
-	my $navigation_allowed = $r->authz->hasPermissions($r->param('user'), 'navigation_allowed');
+	my $navigation_allowed = $c->authz->hasPermissions($c->param('user'), 'navigation_allowed');
 
 	my @path = (
-		WeBWorK     => $navigation_allowed ? $r->location                  : '',
-		$courseName => $navigation_allowed ? $r->location . "/$courseName" : '',
-		$setName    => $r->location . "/$courseName/$setName",
+		WeBWorK               => $navigation_allowed ? $c->url_for('root')     : '',
+		$c->stash('courseID') => $navigation_allowed ? $c->url_for('set_list') : '',
+		$c->stash('setID')    => $c->url_for('problem_list'),
 	);
 
-	if ($urlpath->module =~ /ShowMeAnother$/) {
+	if ($c->current_route eq 'show_me_another') {
 		push(
 			@path,
-			$prettyProblemNumber => $r->location . "/$courseName/$setName/$problemNumber",
+			$prettyProblemNumber => $c->url_for('problem_detail'),
 			'Show Me Another'    => ''
 		);
 	} else {
 		push(@path, $prettyProblemNumber => '');
 	}
 
-	print $self->pathMacro($args, @path);
-
-	return '';
+	return $c->pathMacro($args, @path);
 }
 
-sub title {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $db = $r->db;
+sub page_title ($c) {
+	my $db = $c->db;
 
-	# Using the url arguments won't break if the set/problem are invalid
-	my $setID = $self->r->urlpath->arg("setID");
-	my $problemID = $self->r->urlpath->arg("problemID");
+	my $setID     = $c->stash('setID');
+	my $problemID = $c->stash('problemID');
 
 	my $set = $db->getGlobalSet($setID);
-	$setID = CGI::span({ dir => 'ltr' }, format_set_name_display($setID));
 	if ($set && $set->assignment_type eq 'jitar') {
-	    $problemID = join('.',jitar_id_to_seq($problemID));
+		$problemID = join('.', jitar_id_to_seq($problemID));
 	}
-	my $out = $r->maketext('[_1]: Problem [_2]', $setID, $problemID);
+	my $header =
+		$c->maketext('[_1]: Problem [_2]', $c->tag('span', dir => 'ltr', format_set_name_display($setID)), $problemID);
 
 	# Return here if we don't have the requisite information.
-	return $out if ($self->{invalidSet} || $self->{invalidProblem});
+	return $header if ($c->{invalidSet} || $c->{invalidProblem});
 
-	my $ce = $r->ce;
-	my $problem = $self->{problem};
+	my $ce      = $c->ce;
+	my $problem = $c->{problem};
 
-	$out .= CGI::start_span({ class => "problem-sub-header d-block" });
+	my $subheader = '';
 
 	my $problemValue = $problem->value;
-	if (defined($problemValue) && $problemValue ne "") {
-		my $points = $problemValue == 1 ? $r->maketext('point') : $r->maketext('points');
-		$out .= "($problemValue $points)";
+	if (defined $problemValue && $problemValue ne '') {
+		$subheader .= $c->maketext('([quant,_1,point])', $problemValue);
 	}
 
 	# This uses the permission level and user id of the user assigned to the problem.
 	my $problemUser = $problem->user_id;
-	my $inList = grep($_ eq $problemUser, @{$ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR}});
+	my $inList      = grep { $_ eq $problemUser } @{ $ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} };
 	if ($db->getPermissionLevel($problemUser)->permission >=
-		$ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_PERMISSION_LEVEL} || $inList) {
-		$out .= " " . $problem->source_file;
+		$ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_PERMISSION_LEVEL} || $inList)
+	{
+		$subheader .= ' ' . $problem->source_file;
+	}
+
+	# Add the edit link to the sub header if the user has the permisions ot edit problems.
+	if ($c->authz->hasPermissions($c->param('user'), 'modify_problem_sets')) {
+		$subheader = $c->c(
+			$subheader,
+			$c->tag(
+				'span',
+				class => 'ms-2',
+				$c->link_to(
+					$c->maketext('Edit') => $c->systemLink(
+						$c->url_for(
+							'instructor_problem_editor_withset_withproblem',
+							setID     => $c->{set}->set_id,
+							problemID => $c->{problem}->problem_id
+						),
+						# If we are here without a real homework set, carry that through.
+						$c->{set}->set_id eq 'Undefined_Set'
+						? (params => [ 'sourceFilePath' => $c->param('sourceFilePath') ])
+						: ()
+					),
+					target => 'WW_Editor',
+					class  => 'btn btn-sm btn-secondary'
+				)
+			)
+		)->join('');
+	}
+
+	# Add the tag edit button to the sub header if the user has permission to edit tags.
+	if ($c->authz->hasPermissions($c->param('user'), 'modify_tags')) {
+		$subheader = $c->c(
+			$subheader,
+			$c->tag(
+				'button',
+				id    => 'tagger',
+				type  => 'button',
+				class => 'tag-edit-btn btn btn-secondary btn-sm ms-2',
+				data  => { source_file => $c->ce->{courseDirs}{templates} . '/' . $c->{problem}{source_file} },
+				$c->maketext('Edit Tags')
+			),
+			$c->hidden_field(hidden_course_id => $c->stash('courseID'))
+		)->join('');
 	}
 
-	$out .= CGI::end_span();
-
-	return $out;
+	return $c->c($header, $c->tag('span', class => 'problem-sub-header d-block', $subheader))->join('');
 }
 
-# now altered to outsource most output operations to the template, main functions now are simply error checking and answer processing - ghe3
-sub body {
-	my $self = shift;
-	my $set = $self->{set};
-	my $problem = $self->{problem};
-	my $pg = $self->{pg};
-
-	print CGI::p("Entering Problem::body subroutine.
-	         This indicates an old style system.template file -- consider upgrading. ",
-	         caller(1), );
-
-	my $valid = WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::check_invalid($self);
-	unless($valid eq "valid"){
-		return $valid;
-	}
-
-
+# Add a lang and maybe also a dir setting to the DIV tag attributes, if needed by the PROBLEM language.
+sub output_problem_lang_and_dir ($c) {
+	return get_problem_lang_and_dir($c->{pg}{flags}, $c->ce->{perProblemLangAndDirSettingMode}, $c->ce->{language});
+}
 
-	##### answer processing #####
-	debug("begin answer processing");
-	# if answers were submitted:
-	#my $scoreRecordedMessage = WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::process_and_log_answer($self);
-	debug("end answer processing");
-	# output for templates that only use body instead of calling the body parts individually
-	$self ->output_JS;
-	$self ->output_tag_info;
-	$self ->output_custom_edit_message;
-	$self ->output_summary;
-	$self ->output_grader;
-	$self ->output_hidden_info;
-	$self ->output_form_start();
-	$self ->output_problem_body;
-	$self ->output_message;
-	$self ->output_editorLink;
-	$self ->output_checkboxes;
-	$self ->output_submit_buttons;
-	$self ->output_score_summary;
-	$self ->output_comments;
-	$self ->output_misc;
-	print "</form>";
-	# debugging stuff
-	if (0) {
-		print
-			CGI::hr(),
-			CGI::h2("debugging information"),
-			CGI::h3("form fields"),
-			ref2string($self->{formFields}),
-			CGI::h3("user object"),
-			ref2string($self->{user}),
-			CGI::h3("set object"),
-			ref2string($set),
-			CGI::h3("problem object"),
-			ref2string($problem),
-			CGI::h3("PG object"),
-			ref2string($pg, {'WeBWorK::PG::Translator' => 1});
+# Output the body of the current problem
+sub output_problem_body ($c) {
+	# If there are translation errors then render those with the body text of the problem.
+	if ($c->{pg}{flags}{error_flag}) {
+		if ($c->authz->hasPermissions($c->param('user'), 'view_problem_debugging_info')) {
+			# For instructors render the body text of the problem with the errors.
+			return $c->include(
+				'ContentGenerator/Base/error_output',
+				error   => $c->{pg}{errors},
+				details => $c->{pg}{body_text}
+			);
+		} else {
+			# For students render the body text of the problem with a message about error details.
+			return $c->c(
+				$c->tag('div', id => 'output_problem_body', $c->b($c->{pg}{body_text})),
+				$c->include(
+					'ContentGenerator/Base/error_output',
+					error   => $c->{pg}{errors},
+					details => $c->maketext('You do not have permission to view the details of this error.')
+				)
+			)->join('');
+		}
 	}
-	debug("leaving body of Problem.pm");
-	return "";
-}
 
-# output_form_start subroutine
-
-# prints out the beginning of the main form, and the necessary hidden authentication fields
-
-sub output_form_start{
-	my $self = shift;
-	my $r = $self->r;
-	my $startTime = $r->param('startTime') || time();
-
-	print CGI::start_form({
-		method => 'POST',
-		action => $r->uri,
-		id     => 'problemMainForm',
-		name   => 'problemMainForm',
-		class  => 'problem-main-form'
-	});
-	print $self->hidden_authen_fields;
-	print CGI::hidden({-name=>'startTime', -value=>$startTime});
-	return "";
+	return $c->tag('div', id => 'output_problem_body', $c->b($c->{pg}{body_text}));
 }
 
-# output_problem_lang_and_dir subroutine
-
-# adds a lang and maybe also a dir setting to the DIV tag attributes, if
-# needed by the PROBLEM language
-
-sub output_problem_lang_and_dir {
-	my $self = shift;
-	print " " . get_problem_lang_and_dir($self->{pg}{flags}, $self->r->ce->{perProblemLangAndDirSettingMode}, $self->r->ce->{language});
-	return "";
+# Output messages about the problem
+sub output_message ($c) {
+	return $c->include('ContentGenerator/Problem/messages');
 }
 
-# output_problem_body subroutine
-
-# prints out the body of the current problem
-
-sub output_problem_body{
-	my $self = shift;
-	my $pg = $self->{pg};
-	my %will = %{ $self->{will} };
-
-	print "\n";
-
-	print CGI::div({id=>'output_problem_body'},$pg->{body_text});
+# Output the problem grader if the user has permissions to grade problems
+sub output_grader ($c) {
+	if ($c->{will}{showProblemGrader}) {
+		return WeBWorK::HTML::SingleProblemGrader->new($c, $c->{pg}, $c->{problem})->insertGrader;
+	}
 
-	return "";
+	return '';
 }
 
-# output_message subroutine
-
-# prints out a message about the problem
-
-sub output_message{
-	my $self = shift;
-	my $pg = $self->{pg};
-	my $r = $self->r;
-
-	print CGI::p(CGI::b($r->maketext("Note").": "). CGI::i($pg->{result}->{msg})) if $pg->{result}->{msg};
-	return "";
+# Output the checkbox input elements that are available for the current problem
+sub output_checkboxes ($c) {
+	return $c->include('ContentGenerator/Problem/checkboxes');
 }
 
-# output_grader subroutine
-
-# displays the problem grader if the user has permissions to grade problems
-
-sub output_grader {
-	my $self = shift;
-
-	if ($self->{will}{showProblemGrader}) {
-		my $grader = new WeBWorK::ContentGenerator::Instructor::SingleProblemGrader(
-			$self->r, $self->{pg}, $self->{problem});
-		$grader->insertGrader;
-	}
-
-	return "";
+# Output the submit button input elements that are available for the current problem
+sub output_submit_buttons ($c) {
+	return $c->include('ContentGenerator/Problem/submit_buttons');
 }
 
-# output_editorLink subroutine
-
-# processes and prints out the correct link to the editor of the current problem
+# Output a summary of the student's current progress and status on the current problem.
+sub output_score_summary ($c) {
+	my $ce            = $c->ce;
+	my $db            = $c->db;
+	my $problem       = $c->{problem};
+	my $set           = $c->{set};
+	my $pg            = $c->{pg};
+	my $effectiveUser = $c->param('effectiveUser') || $c->param('user');
 
-sub output_editorLink{
-
-	my $self = shift;
+	my $prEnabled         = $ce->{pg}{options}{enablePeriodicRandomization} // 0;
+	my $rerandomizePeriod = $ce->{pg}{options}{periodicRandomizationPeriod} // 0;
+	$rerandomizePeriod = $problem->{prPeriod} if defined $problem->{prPeriod} && $problem->{prPeriod} > -1;
+	$prEnabled         = 0                    if $rerandomizePeriod < 1;
 
-	my $set             = $self->{set};
-	my $problem         = $self->{problem};
-	my $pg              = $self->{pg};
+	warn 'num_correct = ' . $problem->num_correct . 'num_incorrect = ' . $problem->num_incorrect
+		unless defined $problem->num_correct && defined $problem->num_incorrect;
 
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-	my $user = $r->param('user');
+	my $prMessage = '';
+	if ($prEnabled) {
+		my $attempts_before_rr = $c->{will}{requestNewSeed} ? 0 : ($rerandomizePeriod - $problem->{prCount});
 
-	my $courseName = $urlpath->arg("courseID");
+		$prMessage = ' '
+			. $c->maketext('You have [quant,_1,attempt,attempts] left before new version will be requested.',
+				$attempts_before_rr)
+			if $attempts_before_rr > 0;
 
-	# FIXME: move editor link to top, next to problem number.
-	my $editorLink = '';
-	if ($authz->hasPermissions($user, 'modify_problem_sets')) {
-		# If we are here without a real homework set, carry that through.
-		my $forced_field = $set->set_id eq 'Undefined_Set' ? [ 'sourceFilePath' => $r->param('sourceFilePath') ] : [];
-		$editorLink = CGI::span(CGI::a(
-			{
-				href => $self->systemLink(
-					$urlpath->newFromModule(
-						'WeBWorK::ContentGenerator::Instructor::PGProblemEditor', $r,
-						courseID  => $courseName,
-						setID     => $set->set_id,
-						problemID => $problem->problem_id
-					),
-					params => $forced_field
-				),
-				target => 'WW_Editor',
-				class  => 'btn btn-sm btn-secondary'
-			},
-			$r->maketext('Edit')
-		));
+		$prMessage = ' ' . $c->maketext('Request new version now.') if ($attempts_before_rr == 0);
 	}
-	##### translation errors? #####
-
-	if ($pg->{flags}->{error_flag}) {
-		if ($authz->hasPermissions($user, "view_problem_debugging_info")) {
-			print $self->errorOutput($pg->{errors}, $pg->{body_text});
+	$prMessage = '' if after($set->due_date, $c->submitTime) or before($set->open_date, $c->submitTime);
 
-			print $editorLink;
-		} else {
-			print $self->errorOutput($pg->{errors}, $r->maketext("You do not have permission to view the details of this error."));
+	my $setClosed = 0;
+	my $setClosedMessage;
+	if (before($set->open_date, $c->submitTime) || after($set->due_date, $c->submitTime)) {
+		$setClosed = 1;
+		if (before($set->open_date, $c->submitTime)) {
+			$setClosedMessage = $c->maketext('This homework set is not yet open.');
+		} elsif (after($set->due_date, $c->submitTime)) {
+			$setClosedMessage = $c->maketext('This homework set is closed.');
 		}
-		print "";
-	}
-	else{
-		print $editorLink;
-	}
-	return "";
-}
-
-# output_checkboxes subroutine
-# prints out the checkbox input elements that are available for the current problem
-sub output_checkboxes {
-	my $self                  = shift;
-	my $r                     = $self->r;
-	my %can                   = %{ $self->{can} };
-	my %will                  = %{ $self->{will} };
-	my $ce                    = $r->ce;
-	my $showHintCheckbox      = $ce->{pg}{options}{show_hint_checkbox};
-	my $showSolutionCheckbox  = $ce->{pg}{options}{show_solution_checkbox};
-	my $useKnowlsForHints     = $ce->{pg}{options}{use_knowls_for_hints};
-	my $useKnowlsForSolutions = $ce->{pg}{options}{use_knowls_for_solutions};
-
-	if ($can{showCorrectAnswers}
-		|| $can{showProblemGrader}
-		|| $can{showAnsGroupInfo}
-		|| ($can{showHints}     && ($showHintCheckbox     || !$useKnowlsForHints))
-		|| ($can{showSolutions} && ($showSolutionCheckbox || !$useKnowlsForSolutions))
-		|| $can{showAnsHashInfo}
-		|| $can{showPGInfo}
-		|| $can{showResourceInfo})
-	{
-		print CGI::span({ class => 'me-2' }, $r->maketext('Show:'));
 	}
 
-	if ($can{showCorrectAnswers}) {
-		print CGI::div(
-			{ class => 'form-check form-check-inline' },
-			CGI::checkbox({
-				id              => 'showCorrectAnswers_id',
-				name            => 'showCorrectAnswers',
-				value           => 1,
-				checked         => $will{showCorrectAnswers},
-				label           => $r->maketext('Correct Answers'),
-				class           => 'form-check-input',
-				labelattributes => { class => 'form-check-label' }
-			})
-		);
-	}
+	my $attempts = $problem->num_correct + $problem->num_incorrect;
 
-	if ($can{showProblemGrader}) {
-		print CGI::div(
-			{ class => 'form-check form-check-inline' },
-			CGI::checkbox({
-				id              => 'showProblemGrader_id',
-				name            => 'showProblemGrader',
-				value           => 1,
-				checked         => $will{showProblemGrader},
-				label           => $r->maketext('Problem Grader'),
-				class           => 'form-check-input',
-				labelattributes => { class => 'form-check-label' }
-			})
-		);
-	}
+	my $output = $c->c;
 
-	if ($can{showAnsGroupInfo}) {
-		print CGI::div(
-			{ class => 'form-check form-check-inline' },
-			CGI::checkbox({
-				id              => 'showAnsGroupInfo_id',
-				name            => 'showAnsGroupInfo',
-				value           => 1,
-				checked         => $will{showAnsGroupInfo},
-				label           => $r->maketext('Answer Group Info'),
-				class           => 'form-check-input',
-				labelattributes => { class => 'form-check-label' }
-			})
-		);
-	}
-
-	if ($can{showResourceInfo}) {
-		print CGI::div(
-			{ class => 'form-check form-check-inline' },
-			CGI::checkbox({
-				id              => 'showResourceInfo_id',
-				name            => 'showResourceInfo',
-				value           => 1,
-				checked         => $will{showResourceInfo},
-				label           => $r->maketext('Auxiliary Resources'),
-				class           => 'form-check-input',
-				labelattributes => { class => 'form-check-label' }
-			})
+	unless (defined $pg->{state}{state_summary_msg} && $pg->{state}{state_summary_msg} =~ /\S/) {
+		push(
+			@$output,
+			$c->{submitAnswers} ? $c->{scoreRecordedMessage} . $c->tag('br') : '',
+			$c->maketext('You have attempted this problem [quant,_1,time,times].', $attempts),
+			$prMessage,
+			$c->tag('br'),
+			$c->{submitAnswers}
+			? (
+				$c->maketext(
+					'You received a score of [_1] for this attempt.',
+					wwRound(0,
+						compute_reduced_score($ce, $problem, $set, $pg->{result}{score}, $c->submitTime) * 100)
+						. '%'
+				),
+				$c->tag('br')
+				)
+			: '',
+			$problem->attempted
+			? (
+				$c->maketext(
+					'Your overall recorded score is [_1].  [_2]',
+					wwRound(0, $problem->status * 100) . '%',
+					$problem->value ? '' : $c->maketext('(This problem will not count towards your grade.)')
+				),
+				$c->tag('br')
+				)
+			: '',
+			$setClosed ? $setClosedMessage : $c->maketext(
+				'You have [negquant,_1,unlimited attempts,attempt,attempts] remaining.',
+				$problem->max_attempts - $attempts
+			)
 		);
+	} else {
+		push(@$output, $pg->{state}{state_summary_msg});
 	}
 
-	if ($can{showAnsHashInfo}) {
-		print CGI::div(
-			{ class => 'form-check form-check-inline' },
-			CGI::checkbox({
-				id              => 'showAnsHashInfo_id',
-				name            => 'showAnsHashInfo',
-				value           => 1,
-				checked         => $will{showAnsHashInfo},
-				label           => $r->maketext('Answer Hash Info'),
-				class           => 'form-check-input',
-				labelattributes => { class => 'form-check-label' }
-			})
-		);
-	}
+	# Print jitar specific informaton for students (and notify instructor if necessary).
+	if ($set->set_id ne 'Undefined_Set' && $set->assignment_type() eq 'jitar') {
+		my @problemIDs =
+			map { $_->[2] }
+			$db->listUserProblemsWhere({ user_id => $effectiveUser, set_id => $set->set_id }, 'problem_id');
 
-	if ($can{showPGInfo}) {
-		print CGI::div(
-			{ class => 'form-check form-check-inline' },
-			CGI::checkbox({
-				id              => 'showPGInfo_id',
-				label           => $r->maketext('PG Info'),
-				name            => 'showPGInfo',
-				checked         => $will{showPGInfo},
-				value           => 1,
-				class           => 'form-check-input',
-				labelattributes => { class => 'form-check-label' }
-			})
-		);
-	}
+		my @problemSeqs;
+		my $index;
 
-	if ($can{showHints}) {
-		if ($showHintCheckbox || !$useKnowlsForHints) {
-			# Always allow checkbox to display if knowls are not used.
-			print CGI::div(
-				{ class => 'form-check form-check-inline' },
-				CGI::checkbox({
-					id              => 'showHints_id',
-					label           => $r->maketext('Hints'),
-					name            => 'showHints',
-					checked         => $will{showHints},
-					value           => 1,
-					class           => 'form-check-input',
-					labelattributes => { class => 'form-check-label' }
-				})
-			);
-		} else {
-			print CGI::hidden({ name => 'showHints', id => 'showHints_id', value => 1 });
+		# This sets of an array of the sequence assoicated to the problem_id
+		for (my $i = 0; $i <= $#problemIDs; $i++) {
+			$index = $i if ($problemIDs[$i] == $problem->problem_id);
+			my @seq = jitar_id_to_seq($problemIDs[$i]);
+			push @problemSeqs, \@seq;
 		}
-	}
 
-	if ($can{showSolutions}) {
-		if ($showSolutionCheckbox || !$useKnowlsForSolutions) {
-			# Always allow checkbox to display if knowls are not used.
-			print CGI::div(
-				{ class => 'form-check form-check-inline' },
-				CGI::checkbox({
-					id              => 'showSolutions_id',
-					label           => $r->maketext('Solutions'),
-					name            => 'showSolutions',
-					checked         => $will{showSolutions},
-					value           => 1,
-					class           => 'form-check-input',
-					labelattributes => { class => 'form-check-label' }
-
-				})
-			);
-		} else {
-			print CGI::hidden({ id => 'showSolutions_id', name => 'showSolutions', value => 1 });
+		my $next_id = $index + 1;
+		my @seq     = @{ $problemSeqs[$index] };
+		my @children_counts_indexs;
+		my $hasChildren = 0;
+
+		# Find the index of the next problem at the same level as the current one, check to see if there are any
+		# children, and determine which children count toward the grade of this problem.
+		while ($next_id <= $#problemIDs && scalar(@{ $problemSeqs[$index] }) < scalar(@{ $problemSeqs[$next_id] })) {
+			my $childProblem = $db->getMergedProblem($effectiveUser, $set->set_id, $problemIDs[$next_id]);
+			$hasChildren = 1;
+			push @children_counts_indexs, $next_id
+				if scalar(@{ $problemSeqs[$index] }) + 1 == scalar(@{ $problemSeqs[$next_id] })
+				&& $childProblem->counts_parent_grade;
+			$next_id++;
 		}
-	}
 
-	return '';
-}
-
-# output_submit_buttons
-
-# prints out the submit button input elements that are available for the current problem
-
-sub output_submit_buttons {
-	my $self = shift;
-	my $r = $self->r;
-	my $ce = $self->r->ce;
-	my %can = %{ $self->{can} };
-	my %will = %{ $self->{will} };
-	my $urlpath = $r->urlpath;
-	my $problem = $self->{problem};
-	my $courseID = $urlpath->arg("courseID");
-	my $user = $r->param('user');
-	my $effectiveUser = $r->param('effectiveUser');
-	my %showMeAnother = %{ $self->{showMeAnother} };
-
-	if ($will{requestNewSeed}){
-		print CGI::submit({
-			id         => 'submitAnswers_id',
-			name       => 'requestNewSeed',
-			value      => $r->maketext('Request New Version'),
-			formtarget => '_self',
-			class      => 'btn btn-primary'
-		});
-		return "";
-	}
-
-	print CGI::submit({
-		id         => 'previewAnswers_id',
-		formtarget => '_self',
-		name       => 'previewAnswers',
-		value      => $r->maketext('Preview My Answers'),
-		class      => 'btn btn-primary mb-1'
-	});
-
-	if ($can{checkAnswers}) {
-		print CGI::submit({
-			id         => 'checkAnswers_id',
-			formtarget => '_self',
-			name       => 'checkAnswers',
-			value      => $r->maketext('Check Answers'),
-			class      => 'btn btn-primary mb-1'
-		});
-	}
+		# Output information if this problem has open children, and if the grade
+		# for this problem can be replaced by the grades of its children.
+		if (
+			$hasChildren
+			&& (
+				($problem->att_to_open_children != -1 && $problem->num_incorrect >= $problem->att_to_open_children)
+				|| ($problem->max_attempts != -1
+					&& $problem->num_incorrect >= $problem->max_attempts)
+			)
+			)
+		{
+			push(
+				@$output,
+				$c->tag('br'),
+				$c->maketext(
+					'This problem has open subproblems.  '
+						. 'You can visit them by using the links to the left or visiting the set page.'
+				)
+			);
 
-	if ($can{getSubmitButton}) {
-		if ($user ne $effectiveUser) {
-			# if acting as a student, make it clear that answer submissions will
-			# apply to the student's records, not the professor's.
-			print CGI::submit({
-				id    => 'submitAnswers_id',
-				name  => 'submitAnswers',
-				value => $r->maketext('Submit Answers for [_1]', $effectiveUser),
-				class => 'btn btn-primary'
-			});
-		} else {
-			print CGI::submit({
-				id         => 'submitAnswers_id',
-				name       => 'submitAnswers',
-				value      => $r->maketext('Submit Answers'),
-				formtarget => '_self',
-				class      => 'btn btn-primary mb-1'
-			});
+			if (scalar(@children_counts_indexs) == 1) {
+				push(
+					@$output,
+					$c->tag('br'),
+					$c->maketext(
+						'The grade for this problem is the larger of the score for this problem, '
+							. 'or the score of problem [_1].',
+						join('.', @{ $problemSeqs[ $children_counts_indexs[0] ] })
+					)
+				);
+			} elsif (scalar(@children_counts_indexs) > 1) {
+				push(
+					@$output,
+					$c->tag('br'),
+					$c->maketext(
+						'The grade for this problem is the larger of the score for this problem, '
+							. 'or the weighted average of the problems: [_1].',
+						join(', ', map({ join('.', @{ $problemSeqs[$_] }) } @children_counts_indexs))
+					)
+				);
+			}
 		}
-	}
 
-	if ($can{showMeAnother}) {
-		# only output showMeAnother button if we're not on the showMeAnother page
-		my $SMAURL = $self->systemLink($urlpath->newFromModule(
-			"WeBWorK::ContentGenerator::ShowMeAnother",
-			$r,
-			courseID  => $courseID,
-			setID     => $problem->set_id,
-			problemID => $problem->problem_id
-		));
-		print CGI::a(
+		# Output information if this set has restricted progression and if the user needs
+		# to finish this problem (and maybe its children) to proceed.
+		if ($set->restrict_prob_progression()
+			&& $next_id <= $#problemIDs
+			&& is_jitar_problem_closed($db, $ce, $effectiveUser, $set->set_id, $problemIDs[$next_id]))
+		{
+			if ($hasChildren) {
+				push(
+					@$output,
+					$c->tag('br'),
+					$c->maketext(
+						'You will not be able to proceed to problem [_1] until you have completed, '
+							. 'or run out of attempts, for this problem and its graded subproblems.',
+						join('.', @{ $problemSeqs[$next_id] })
+					)
+				);
+			} elsif (scalar(@seq) == 1
+				|| $problem->counts_parent_grade())
 			{
-				href              => $SMAURL,
-				class             => 'set-id-tooltip btn btn-primary mb-1',
-				data_bs_toggle    => 'tooltip',
-				data_bs_placement => 'right',
-				id                => 'SMA_button',
-				target            => 'WW_Show_Me_Another',
-				data_bs_title     => $r->maketext(
-					'You can use this feature [quant,_1,more time,more times,as many times as you want] on this problem',
-					$showMeAnother{MaxReps} >= $showMeAnother{Count}
-						? ($showMeAnother{MaxReps} - $showMeAnother{Count})
-						: ''
+				push(
+					@$output,
+					$c->tag('br'),
+					$c->maketext(
+						'You will not be able to proceed to problem [_1] until you have completed, '
+							. 'or run out of attempts, for this problem.',
+						join('.', @{ $problemSeqs[$next_id] })
+					)
+				);
+			}
+		}
+		# Show information if this problem counts towards the grade of its parent.
+		# If it doesn't (and its not a top level problem) then its grade doesnt matter.
+		if ($problem->counts_parent_grade() && scalar(@seq) != 1) {
+			pop @seq;
+			push(
+				@$output,
+				$c->tag('br'),
+				$c->maketext(
+					'The score for this problem can count towards score of problem [_1].', join('.', @seq)
+				)
+			);
+		} elsif (scalar(@seq) != 1) {
+			pop @seq;
+			push(
+				@$output,
+				$c->tag('br'),
+				$c->maketext(
+					'This score for this problem does not count for the score of problem [_1] or for the set.',
+					join('.', @seq)
 				)
-			},
-			$r->maketext('Show me another')
-		);
-	} else {
-		# if showMeAnother is available for the course, and for the current problem (but not yet
-		# because the student hasn't tried enough times) then gray it out; otherwise display nothing
-		# if $showMeAnother{TriesNeeded} is somehow not an integer or if its -2, use the default value
-		$showMeAnother{TriesNeeded} = $ce->{pg}->{options}->{showMeAnotherDefault}
-			if ($showMeAnother{TriesNeeded} !~ /^[+-]?\d+$/ || $showMeAnother{TriesNeeded} == -2);
-		if ($ce->{pg}->{options}->{enableShowMeAnother} and $showMeAnother{TriesNeeded} > -1) {
-			my $exhausted =
-				($showMeAnother{Count} >= $showMeAnother{MaxReps} and $showMeAnother{MaxReps} > -1) ? 'exhausted' : '';
-			print CGI::span(
-				{
-					class             => 'set-id-tooltip d-inline-block',
-					tabindex          => '0',
-					data_bs_toggle    => 'tooltip',
-					data_bs_placement => 'right',
-					data_bs_title     => before($r->db->getGlobalSet($self->{set}->set_id)->open_date)
-						? $r->maketext('The problem set is not yet open')
-						: $exhausted eq 'exhausted'
-							? $r->maketext('Feature exhausted for this problem')
-							: $r->maketext(
-								'You must attempt this problem [quant,_1,time,times] before this feature is available',
-								$showMeAnother{TriesNeeded}
-							)
-				},
-				qq{<button class='btn btn-primary mb-1' type='button' disabled>}
-					. $r->maketext('Show me another [_1]', $exhausted)
-					. '</button>'
 			);
 		}
-	}
-	return "";
-}
-
-# output_score_summary subroutine
-
-# prints out a summary of the student's current progress and status on the current problem
-
-sub output_score_summary{
-	my $self = shift;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $problem = $self->{problem};
-	my $set = $self->{set};
-	my $pg = $self->{pg};
-	my $effectiveUser = $r->param('effectiveUser') || $r->param('user');
-	my $scoreRecordedMessage = $self->{scoreRecordedMessage};
-	my $submitAnswers = $self->{submitAnswers};
-	my %will = %{ $self->{will} };
-
-	my $prEnabled = $ce->{pg}->{options}->{enablePeriodicRandomization} // 0;
-	my $rerandomizePeriod = $ce->{pg}->{options}->{periodicRandomizationPeriod} // 0;
-	$rerandomizePeriod = $problem->{prPeriod} if (defined($problem->{prPeriod}) && $problem->{prPeriod} > -1);
-	$prEnabled = 0 if ($rerandomizePeriod < 1);
-
-	# score summary
-	warn "num_correct =", $problem->num_correct,"num_incorrect=",$problem->num_incorrect
-	  unless defined($problem->num_correct) and defined($problem->num_incorrect) ;
-	my $attempts = $problem->num_correct + $problem->num_incorrect;
-	#my $attemptsNoun = $attempts != 1 ? $r->maketext("times") : $r->maketext("time");
-
-	my $prMessage = "";
-	if ($prEnabled) {
-		my $attempts_before_rr = (defined($will{requestNewSeed}) && $will{requestNewSeed}) ? 0
-			: ($rerandomizePeriod - $problem->{prCount});
-
-		$prMessage = " " . $r->maketext(
-			"You have [quant,_1,attempt,attempts] left before new version will be requested.",
-			$attempts_before_rr)
-		if ($attempts_before_rr > 0);
-
-		$prMessage = " " . $r->maketext("Request new version now.")
-		if ($attempts_before_rr == 0);
-	}
-	$prMessage = "" if (after($set->due_date) or before($set->open_date));
 
-	my $problem_status    = $problem->status || 0;
-	my $lastScore = wwRound(0, $problem_status * 100).'%'; # Round to whole number
-	my $attemptsLeft = $problem->max_attempts - $attempts;
+		# If the instructor has set this up, then email the instructor a warning message if the student has run out of
+		# attempts on a top level problem and all of its children and didn't get 100%.
+		if ($c->{submitAnswers} && $set->email_instructor) {
+			my $parentProb = $db->getMergedProblem($effectiveUser, $set->set_id, seq_to_jitar_id($seq[0]));
+			warn("Couldn't find problem $seq[0] from set " . $set->set_id . ' in the database') unless $parentProb;
 
-	my $setClosed = 0;
-	my $setClosedMessage;
-	if (before($set->open_date) or after($set->due_date)) {
-	  $setClosed = 1;
-	  if (before($set->open_date)) {
-	    $setClosedMessage = $r->maketext("This homework set is not yet open.");
-	  } elsif (after($set->due_date)) {
-	    $setClosedMessage = $r->maketext("This homework set is closed.");
-	  }
-	}
-	#if (before($set->open_date) or after($set->due_date)) {
-	#	$setClosed = 1;
-	#	$setClosedMessage = "This homework set is closed.";
-	#	if ($authz->hasPermissions($user, "view_answers")) {
-	#		$setClosedMessage .= " However, since you are a privileged user, additional attempts will be recorded.";
-	#	} else {
-	#		$setClosedMessage .= " Additional attempts will not be recorded.";
-	#	}
-	#}
-	print CGI::start_p();
-	unless (defined( $pg->{state}->{state_summary_msg}) and $pg->{state}->{state_summary_msg}=~/\S/) {
-
-		my $notCountedMessage = ($problem->value) ? "" : $r->maketext("(This problem will not count towards your grade.)");
-		print join("",
-			$submitAnswers ? $scoreRecordedMessage . CGI::br() : "",
-			$r->maketext("You have attempted this problem [quant,_1,time,times].",$attempts), $prMessage, CGI::br(),
-			$submitAnswers ? $r->maketext("You received a score of [_1] for this attempt.",wwRound(0, $pg->{result}->{score} * 100).'%') . CGI::br():'',
-			$problem->attempted
+			if (jitar_problem_finished($parentProb, $db) && jitar_problem_adjusted_status($parentProb, $db) != 1) {
+				jitar_send_warning_email($c, $parentProb);
+			}
 
-		? $r->maketext("Your overall recorded score is [_1].  [_2]",$lastScore,$notCountedMessage) . CGI::br()
-				: "",
-			$setClosed ? $setClosedMessage : $r->maketext("You have [negquant,_1,unlimited attempts,attempt,attempts] remaining.",$attemptsLeft)
-		);
-	}else {
-	  print $pg->{state}->{state_summary_msg};
+		}
 	}
 
-	#print jitar specific informaton for students. (and notify instructor
-	# if necessary
-	if ($set->set_id ne 'Undefined_Set' && $set->assignment_type() eq 'jitar') {
-	  my @problemIDs =
-	    map { $_->[2] } $db->listUserProblemsWhere({ user_id => $effectiveUser, set_id => $set->set_id }, 'problem_id');
-
-	  # get some data
-	  my @problemSeqs;
-	  my $index;
-	  # this sets of an array of the sequence assoicated to the
-	  #problem_id
-	  for (my $i=0; $i<=$#problemIDs; $i++) {
-	    $index = $i if ($problemIDs[$i] == $problem->problem_id);
-	    my @seq = jitar_id_to_seq($problemIDs[$i]);
-	    push @problemSeqs, \@seq;
-	  }
-
-	  my $next_id = $index+1;
-	  my @seq = @{$problemSeqs[$index]};
-	  my @children_counts_indexs;
-	  my $hasChildren = 0;
-
-	  # this does several things.  It finds the index of the next problem
-	  # at the same level as the current one.  It checks to see if there
-	  # are any children, and it finds which of those children count
-	  # toward the grade of this problem.
-
-	  while ($next_id <= $#problemIDs && scalar(@{$problemSeqs[$index]}) < scalar(@{$problemSeqs[$next_id]})) {
-
-	    my $childProblem = $db->getMergedProblem($effectiveUser,$set->set_id, $problemIDs[$next_id]);
-	    $hasChildren = 1;
-	    push @children_counts_indexs, $next_id if scalar(@{$problemSeqs[$index]}) + 1 == scalar(@{$problemSeqs[$next_id]}) && $childProblem->counts_parent_grade;
-	    $next_id++;
-	  }
-
-	  # print information if this problem has open children and if the grade
-	  # for this problem can be replaced by the grades of its children
-	  if ( $hasChildren
-	       && (($problem->att_to_open_children != -1 && $problem->num_incorrect >= $problem->att_to_open_children) ||
-		   ($problem->max_attempts != -1 &&
-		    $problem->num_incorrect >= $problem->max_attempts))) {
-	    print CGI::br().$r->maketext('This problem has open subproblems.  You can visit them by using the links to the left or visiting the set page.');
-
-	    if (scalar(@children_counts_indexs) == 1) {
-	      print CGI::br().$r->maketext('The grade for this problem is the larger of the score for this problem, or the score of problem [_1].', join('.', @{$problemSeqs[$children_counts_indexs[0]]}));
-	    } elsif (scalar(@children_counts_indexs) > 1) {
-	      print CGI::br().$r->maketext('The grade for this problem is the larger of the score for this problem, or the weighted average of the problems: [_1].', join(', ', map({join('.', @{$problemSeqs[$_]})}  @children_counts_indexs)));
-	    }
-	  }
-
-
-	  # print information if this set has restricted progression and if you need
-	  # to finish this problem (and maybe its children) to proceed
-	  if ($set->restrict_prob_progression() &&
-	      $next_id <= $#problemIDs &&
-	      is_jitar_problem_closed($db,$ce,$effectiveUser, $set->set_id, $problemIDs[$next_id])) {
-	    if ($hasChildren) {
-	      print CGI::br().$r->maketext('You will not be able to proceed to problem [_1] until you have completed, or run out of attempts, for this problem and its graded subproblems.',join('.',@{$problemSeqs[$next_id]}));
-	  } elsif (scalar(@seq) == 1 ||
-			   $problem->counts_parent_grade()) {
-	      print CGI::br().$r->maketext('You will not be able to proceed to problem [_1] until you have completed, or run out of attempts, for this problem.',join('.',@{$problemSeqs[$next_id]}));
-	    }
-	  }
-	  # print information if this problem counts towards the grade of its parent,
-	  # if it doesn't (and its not a top level problem) then its grade doesnt matter.
-	  if ($problem->counts_parent_grade() && scalar(@seq) != 1) {
-	    pop @seq;
-	    print CGI::br().$r->maketext('The score for this problem can count towards score of problem [_1].',join('.',@seq));
-	  } elsif (scalar(@seq)!=1) {
-	    pop @seq;
-	    print CGI::br().$r->maketext('This score for this problem does not count for the score of problem [_1] or for the set.',join('.',@seq));
-	  }
-
-	  # if the instructor has set this up, email the instructor a warning message if
-	  # the student has run out of attempts on a top level problem and all of its children
-	  # and didn't get 100%
-	  if ($submitAnswers && $set->email_instructor) {
-	    my $parentProb = $db->getMergedProblem($effectiveUser,$set->set_id,seq_to_jitar_id($seq[0]));
-	    warn("Couldn't find problem $seq[0] from set ".$set->set_id." in the database") unless $parentProb;
-
-	    #email instructor with a message if the student didnt finish
-	    if (jitar_problem_finished($parentProb,$db) &&
-		jitar_problem_adjusted_status($parentProb,$db) != 1) {
-	      WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::jitar_send_warning_email($self,$parentProb);
-	    }
-
-	  }
-	}
-	print CGI::end_p();
-	return "";
+	return $c->tag('p', $output->join(''));
 }
 
-# output_misc subroutine
-
-# prints out other necessary elements
-
-sub output_misc {
-	my $self = shift;
-	my $r    = $self->r;
+# Output other necessary elements
+sub output_misc ($c) {
+	my $output = $c->c;
 
 	# Save state for viewOptions
-	print CGI::hidden(-name => 'showOldAnswers', -value => $self->{will}{showOldAnswers});
-	print CGI::hidden(-name => 'displayMode',    -value => $self->{displayMode});
+	push(@$output,
+		$c->hidden_field(showOldAnswers => $c->{will}{showOldAnswers}),
+		$c->hidden_field(displayMode    => $c->{displayMode}));
+
+	push(@$output, $c->hidden_field(editMode => $c->{editMode}))
+		if defined $c->{editMode} && $c->{editMode} eq 'temporaryFile';
 
-	print(CGI::hidden(-name => 'editMode', -value => $self->{editMode},))
-		if defined($self->{editMode})
-		and $self->{editMode} eq 'temporaryFile';
+	my $permissionLevel          = $c->db->getPermissionLevel($c->param('user'))->permission;
+	my $professorPermissionLevel = $c->ce->{userRoles}{professor};
 
-	# This is a security risk -- students can use this to find the source code for the problem
-	my $permissionLevel          = $r->db->getPermissionLevel($r->param('user'))->permission;
-	my $professorPermissionLevel = $r->ce->{userRoles}{professor};
-	print(CGI::hidden(-name => 'sourceFilePath', -value => $self->{problem}{source_file}))
-		if defined($self->{problem}{source_file})
-		and $permissionLevel >= $professorPermissionLevel;    # Only allow this for professors
+	# Only allow this for professors
+	push(@$output, $c->hidden_field(sourceFilePath => $c->{problem}{source_file}))
+		if defined $c->{problem}{source_file} && $permissionLevel >= $professorPermissionLevel;
 
-	print(CGI::hidden(-name => 'problemSeed', -value => $r->param('problemSeed')))
-		if defined($r->param('problemSeed'))
-		and $permissionLevel >= $professorPermissionLevel;    # Only allow this for professors
+	# Only allow this for professors
+	push(@$output, $c->hidden_field(problemSeed => $c->param('problemSeed')))
+		if defined $c->param('problemSeed') && $permissionLevel >= $professorPermissionLevel;
 
 	# Make sure the student nav filter setting is preserved when the problem form is submitted.
-	my $filter = $r->param('studentNavFilter');
-	print CGI::hidden({ name => 'studentNavFilter', value => $filter }) if $filter;
+	push(@$output, $c->hidden_field(studentNavFilter => $c->param('studentNavFilter')))
+		if $c->param('studentNavFilter');
 
-	return '';
+	return $output->join('');
 }
 
-# output_comments subroutine
-
-# prints out any instructor comments present in the latest past_answer entry
-
-sub output_comments{
-	my $self = shift;
+# Output any instructor comments present in the latest past_answer entry
+sub output_comments ($c) {
+	my $db = $c->db;
 
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-
-	my $problem = $self->{problem};
-	my $set = $self->{set};
-	my $urlpath        = $r->urlpath;
-	my $courseName     = $urlpath->arg("courseID");
-	my $setID          = $urlpath->arg("setID");
-	my $problemID      = $urlpath->arg("problemID");
-	my $key = $r->param('key');
-	my $eUserID          = $r->param('effectiveUser');
-	my $displayMode   = $self->{displayMode};
-	my $authz = $r->authz;
-
-	my $userPastAnswerID = $db->latestProblemPastAnswer($courseName, $eUserID, $setID, $problemID);
+	my $userPastAnswerID = $db->latestProblemPastAnswer(
+		$c->stash('courseID'),
+		$c->param('effectiveUser'),
+		$c->stash('setID'), $c->stash('problemID')
+	);
 
-	#if there is a comment then render it and print it
+	# If there is a comment then display it.
 	if ($userPastAnswerID) {
 		my $userPastAnswer = $db->getPastAnswer($userPastAnswerID);
 		if ($userPastAnswer->comment_string) {
-			my $comment = $userPastAnswer->comment_string;
-			$comment = CGI::escapeHTML($comment);
-			my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars };
-			print CGI::start_div({ id => 'answerComment', class => 'answerComments mt-2' });
-			print CGI::b('Instructor Comment:'),  CGI::br();
-			print $comment;
+			return $c->tag(
+				'div',
+				id    => 'answerComment',
+				class => 'answerComments mt-2',
+				$c->c($c->tag('b', 'Instructor Comment:'), $c->tag('div', $userPastAnswer->comment_string))
+					->join('')
+			);
 		}
 	}
 
-	return "";
+	return '';
 }
 
-# output_summary subroutine
-
-# prints out the summary of the questions that the student has answered
+# Output the summary of the questions that the student has answered
 # for the current problem, along with available information about correctness
+sub output_summary ($c) {
+	my $db   = $c->db;
+	my $pg   = $c->{pg};
+	my %will = %{ $c->{will} };
 
-sub output_summary{
-
-	my $self = shift;
-
-	my $editMode = $self->{editMode};
-	my $problem = $self->{problem};
-	my $pg = $self->{pg};
-	my $submitAnswers = $self->{submitAnswers};
-	my %will = %{ $self->{will} };
-	my %can = %{ $self->{can} };
-	my $checkAnswers = $self->{checkAnswers};
-	my $previewAnswers = $self->{previewAnswers};
-	my $showPartialCorrectAnswers = $self->{pg}{flags}{showPartialCorrectAnswers};
-
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $set = $self->{set};
-	my $authz = $r->authz;
-	my $user = $r->param('user');
-	my $effectiveUser = $r->param('effectiveUser');
-
-        # attempt summary
-	#FIXME -- the following is a kludge:  if showPartialCorrectAnswers is negative don't show anything.
-	# until after the due date
-	# do I need to check $will{showCorrectAnswers} to make preflight work??
-
-	if (defined($pg->{flags}->{showPartialCorrectAnswers}) and ($pg->{flags}->{showPartialCorrectAnswers} >= 0 and $submitAnswers) ) {
-
-	    # print this if user submitted answers OR requested correct answers
-	    my $results = $self->attemptResults($pg,
-	                    1,   # showAttemptAnswers --display the unformatted submitted answer attempt
-						$self->{showCorrectOnRandomize} // $will{showCorrectAnswers}, # showCorrectAnswers
-						$pg->{flags}->{showPartialCorrectAnswers}, # showAttemptResults
-			            1, # showSummary
-			            1  # showAttemptPreview
-		);
-	    print $results;
+	my $output = $c->c;
 
-	} elsif ($will{checkAnswers} || $self->{will}{showProblemGrader}) {
-	    # print this if user checked answers
-		print CGI::div(
-			{ class => 'ResultsWithError d-inline-block mb-3' },
-			$r->maketext("ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED")
+	# Attempt summary
+	if (defined $pg->{flags}{showPartialCorrectAnswers}
+		&& $pg->{flags}{showPartialCorrectAnswers} >= 0
+		&& $c->{submitAnswers})
+	{
+		push(
+			@$output,
+			$c->attemptResults(
+				$pg,
+				$c->{showCorrectOnRandomize} // $will{showCorrectAnswers},
+				$pg->{flags}{showPartialCorrectAnswers}, 1
+			)
 		);
-	    print $self->attemptResults($pg,
-	    	1, # showAttemptAnswers
-	    	$will{showCorrectAnswers}, # showCorrectAnswers
-	    	1, # showAttemptResults
-	    	1, # showSummary
-	    	1  # showAttemptPreview
-	    );
-	    # show attempt answers
-	    # show correct answers if asked
-	    # show attempt results (correctness)
-	    # show attempt previews
-	} elsif ($previewAnswers) {
-	  # print this if user previewed answers
-		print CGI::div(
-				{ class => 'ResultsWithError d-inline-block mb-3' },
-				$r->maketext("PREVIEW ONLY -- ANSWERS NOT RECORDED")
+	} elsif ($will{checkAnswers} || $c->{will}{showProblemGrader}) {
+		push(
+			@$output,
+			$c->tag(
+				'div',
+				class => 'ResultsWithError d-inline-block mb-3',
+				$c->maketext('ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED')
 			),
-			$self->attemptResults($pg, 1, 0, 0, 0, 1);
-	    # show attempt answers
-	    # don't show correct answers
-	    # don't show attempt results (correctness)
-	    # show attempt previews
-	}
-
-	print CGI::div({ class => 'ResultsWithError d-inline-block mb-3' },
-		$r->maketext("ATTEMPT NOT ACCEPTED -- Please submit answers again (or request new version if neccessary)."))
-		if ($self->{resubmitDetected});
-
-	if ($set->set_id ne 'Undefined_Set' && $set->assignment_type() eq 'jitar') {
-	my $hasChildren = 0;
-
-	my @problemIDs =
-		map { $_->[2] } $db->listUserProblemsWhere({ user_id => $effectiveUser, set_id => $set->set_id }, 'problem_id');
-
-	# get some data
-	my @problemSeqs;
-	my $index;
-	# this sets of an array of the sequence associated to the
-	#problem_id
-	for (my $i=0; $i<=$#problemIDs; $i++) {
-	    $index = $i if ($problemIDs[$i] == $problem->problem_id);
-	    my @seq = jitar_id_to_seq($problemIDs[$i]);
-	    push @problemSeqs, \@seq;
-	}
-
-	my $next_id = $index+1;
-	my @seq = @{$problemSeqs[$index]};
-
-	# check to see if the problem has children
-	while ($next_id <= $#problemIDs && scalar(@{$problemSeqs[$index]}) < scalar(@{$problemSeqs[$next_id]})) {
-	    $hasChildren = 1;
-	    $next_id++;
-	}
-
-	# if it has children and conditions are right, print a message
-	if ( $hasChildren
-	     && (($problem->att_to_open_children != -1 && $problem->num_incorrect >= $problem->att_to_open_children) ||
-		    ($problem->max_attempts != -1 &&
-		     $problem->num_incorrect >= $problem->max_attempts))) {
-	    print CGI::div({class=>'showMeAnotherBox'},$r->maketext('This problem has open subproblems.  You can visit them by using the links to the left or visiting the set page.'));
+			$c->attemptResults($pg, $will{showCorrectAnswers}, 1, 1)
+		);
+	} elsif ($c->{previewAnswers}) {
+		push(
+			@$output,
+			$c->tag(
+				'div',
+				class => 'ResultsWithError d-inline-block mb-3',
+				$c->maketext('PREVIEW ONLY -- ANSWERS NOT RECORDED')
+			),
+			$c->attemptResults($pg, 0, 0, 0)
+		);
 	}
-    }
 
-	return "";
-}
+	push(
+		@$output,
+		$c->tag(
+			'div',
+			class => 'ResultsWithError d-inline-block mb-3',
+			$c->maketext(
+				'ATTEMPT NOT ACCEPTED -- Please submit answers again (or request new version if neccessary).')
+		)
+	) if $c->{resubmitDetected};
 
-# prints the achievement message if there is one
+	if ($c->{set}->set_id ne 'Undefined_Set' && $c->{set}->assignment_type eq 'jitar') {
+		my $hasChildren = 0;
 
-sub output_achievement_message{
+		my @problemIDs =
+			map { $_->[2] }
+			$db->listUserProblemsWhere({ user_id => $c->param('effectiveUser'), set_id => $c->{set}->set_id },
+				'problem_id');
 
-    	my $self = shift;
+		my @problemSeqs;
+		my $index;
+		# This sets of an array of the sequence associated to the problem_id.
+		for (my $i = 0; $i <= $#problemIDs; $i++) {
+			$index = $i if ($problemIDs[$i] == $c->{problem}->problem_id);
+			my @seq = jitar_id_to_seq($problemIDs[$i]);
+			push @problemSeqs, \@seq;
+		}
 
-	my $editMode = $self->{editMode};
-	my $problem = $self->{problem};
-	my $pg = $self->{pg};
-	my $submitAnswers = $self->{submitAnswers};
-	my %will = %{ $self->{will} };
+		my $next_id = $index + 1;
+		my @seq     = @{ $problemSeqs[$index] };
 
-	my $r = $self->r;
-	my $ce = $r->ce;
+		# Check to see if the problem has children.
+		while ($next_id <= $#problemIDs && scalar(@{ $problemSeqs[$index] }) < scalar(@{ $problemSeqs[$next_id] })) {
+			$hasChildren = 1;
+			$next_id++;
+		}
 
-	#If achievements enabled, and if we are not in a try it page, check to see if there are new ones.and print them
-	if ($ce->{achievementsEnabled} && $will{recordAnswers}
-	    && $submitAnswers && $problem->set_id ne 'Undefined_Set') {
-	    my $achievementMessage = WeBWorK::AchievementEvaluator::checkForAchievements($problem, $pg, $r);
-	    print $achievementMessage;
+		# If the problem has children and conditions are right, output a message.
+		if (
+			$hasChildren
+			&& (
+				(
+					$c->{problem}->att_to_open_children != -1
+					&& $c->{problem}->num_incorrect >= $c->{problem}->att_to_open_children
+				)
+				|| ($c->{problem}->max_attempts != -1
+					&& $c->{problem}->num_incorrect >= $c->{problem}->max_attempts)
+			)
+			)
+		{
+			push(
+				@$output,
+				$c->tag(
+					'div',
+					class => 'showMeAnotherBox',
+					$c->maketext(
+						'This problem has open subproblems.  You can visit them by using '
+							. 'the links to the left or visiting the set page.'
+					)
+				)
+			);
+		}
 	}
 
-
-	return "";
+	return $output->join('');
 }
 
-# output_tag_info
-# Puts the tags in the page
-
-sub output_tag_info {
-	my $self     = shift;
-	my $r        = $self->r;
-
-	if ($r->authz->hasPermissions($r->param('user'), "modify_tags")) {
-		print CGI::div(
-			{
-				id                    => 'tagger',
-				class                 => 'tag-widget',
-				data_source_file_path => $r->ce->{courseDirs}{templates} . '/' . $self->{problem}{source_file}
-			},
-			''
-		);
-		print CGI::hidden(
-			{ id => 'hidden_courseID', name => 'courseID', default => $self->r->urlpath->arg("courseID") });
+# Output the achievement message if there is one.
+sub output_achievement_message ($c) {
+	# If achievements are enabled and this is not an undefined set,
+	# check to see if there are new achievements and output them.
+	if ($c->ce->{achievementsEnabled}
+		&& $c->{will}{recordAnswers}
+		&& $c->{submitAnswers}
+		&& $c->{problem}->set_id ne 'Undefined_Set')
+	{
+		return checkForAchievements($c->{problem}, $c->{pg}, $c);
 	}
 
 	return '';
 }
 
-# output_custom_edit_message
-
-# prints out a custom edit message
-
-sub output_custom_edit_message{
-	my $self = shift;
-	my $r = $self->r;
-	my $authz = $r->authz;
-	my $user = $r->param('user');
-	my $editMode = $self->{editMode};
-	my $problem = $self->{problem};
-
-	# custom message for editor
-	if ($authz->hasPermissions($user, "modify_problem_sets") and defined $editMode) {
-		if ($editMode eq "temporaryFile") {
-			print CGI::p(CGI::div({class=>'temporaryFile'}, $r->maketext("Viewing temporary file:").' ', $problem->source_file));
-		} elsif ($editMode eq "savedFile") {
-			# taken care of in the initialization phase
-		}
+# Output a custom edit message
+sub output_custom_edit_message ($c) {
+	if ($c->authz->hasPermissions($c->param('user'), 'modify_problem_sets')
+		&& $c->{editMode}
+		&& $c->{editMode} eq 'temporaryFile')
+	{
+		return $c->tag(
+			'p',
+			class => 'temporaryFile',
+			$c->maketext('Viewing temporary file: [_1]', $c->{problem}->source_file)
+		);
 	}
 
-	return "";
+	return '';
 }
 
-
-
-
-# output_past_answer_button
-
-# prints out the "Show Past Answers" button
-
-sub output_past_answer_button{
-	my $self = shift;
-	my $r = $self->r;
-	my $problem = $self->{problem};
-
-	my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-	my $user = $r->param('user');
-
-	my $courseName = $urlpath->arg("courseID");
-
-	my $pastAnswersPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::ShowAnswers", $r,
-		courseID => $courseName);
-	my $showPastAnswersURL = $self->systemLink($pastAnswersPage, authen => 0); # no authen info for form action
-
-	my $problemNumber = $problem->problem_id;
-	my $setRecord = $r->db->getGlobalSet($problem->set_id);
-	if ( defined($setRecord) && $setRecord->assignment_type eq 'jitar' ) {
-	    $problemNumber = join('.',jitar_id_to_seq($problemNumber));
+# Output the "Show Past Answers" button
+sub output_past_answer_button ($c) {
+	my $problemID = $c->{problem}->problem_id;
+	my $setRecord = $c->db->getGlobalSet($c->{problem}->set_id);
+	if (defined $setRecord && $setRecord->assignment_type eq 'jitar') {
+		$problemID = join('.', jitar_id_to_seq($problemID));
 	}
 
-	# print answer inspection button
-	if ($authz->hasPermissions($user, 'view_answers')) {
-		my $hiddenFields = $self->hidden_authen_fields;
+	if ($c->authz->hasPermissions($c->param('user'), 'view_answers')) {
+		my $hiddenFields = $c->hidden_authen_fields;
 		$hiddenFields =~ s/\"hidden_/\"pastans-hidden_/g;
-		print CGI::start_form({ method => 'POST', action => $showPastAnswersURL, target => 'WW_Info' }),
-			$hiddenFields,
-			CGI::hidden({ name => 'courseID',          value => $courseName }),
-			CGI::hidden({ name => 'selected_problems', value => $problemNumber }),
-			CGI::hidden({ name => 'selected_sets',     value => $problem->set_id }),
-			CGI::hidden({ name => 'selected_users',    value => $problem->user_id }),
-			CGI::p(CGI::submit(
-				{ name => 'action', value => $r->maketext('Show Past Answers'), class => 'btn btn-primary' }
-			)),
-			CGI::end_form();
-	}
-
-	return "";
-}
-
-# output_email_instructor subroutine
-
-# prints out the "Email Instructor" button
-
-sub output_email_instructor{
-	my $self = shift;
-	my $r = $self->r;
-	my $courseName = $r->urlpath->arg("courseID");
-	my $problem = $self->{problem};
-	my %will = %{ $self->{will} };
-	my $pg = $self->{pg};
-	my $userName = $r->param('user');
-	my $user = $r->db->getUser($userName);
-
-	print $self->feedbackMacro(
-		module             => __PACKAGE__,
-		courseId           => $courseName,
-		set                => $self->{set}->set_id,
-		problem            => $problem->problem_id,
-		problemPath        => $problem->source_file,
-		randomSeed         => $problem->problem_seed,
-		notifyAddresses    => join(";",$self->fetchEmailRecipients('receive_feedback',$user)),
-		emailableURL       => $self->generateURLs(url_type => 'absolute',
-		                                          set_id => $self->{set}->set_id,
-		                                          problem_id => $self->{problem}->problem_id),
-		studentName        => $user->full_name,
-		displayMode        => $self->{displayMode},
-		showOldAnswers     => $will{showOldAnswers},
-		showCorrectAnswers => $will{showCorrectAnswers},
-		showHints          => $will{showHints},
-		showSolutions      => $will{showSolutions},
-		pg_object          => $pg,
-	);
-
-	return "";
-}
-
-# output_hidden_info subroutine
-# outputs the hidden fields required for the form
-
-sub output_hidden_info {
-    my $self = shift;
-	print CGI::hidden({name => "templateName",
-	            id=>"templateName_id", value => $self->{templateName}}
-	       );
-    return "";
-}
-
-# output_JS subroutine
-# Outputs all of the JavaScript needed for this page.
-sub output_JS {
-	my $self = shift;
-	my $r = $self->r;
-	my $ce = $r->ce;
-
-	# Output javascript for jquery-ui for problems to use.
-	print CGI::script({ src => getAssetURL($ce, 'node_modules/jquery-ui-dist/jquery-ui.min.js') }, '');
-
-	# This is for tagging menus (if allowed)
-	if ($r->authz->hasPermissions($r->param('user'), 'modify_tags')) {
-		print CGI::script(
-			{
-				id        => 'tag-widget-script',
-				src       => getAssetURL($ce, 'js/apps/TagWidget/tagwidget.js'),
-				defer     => undef,
-				data_taxo => "$ce->{webworkURLs}{htdocs}/DATA/tagging-taxonomy.json"
-			},
-			''
-		);
-	}
-
-	# This is for the problem grader
-	if ($self->{will}{showProblemGrader}) {
-		print CGI::script(
-			{
-				src   => getAssetURL($ce, 'js/apps/ProblemGrader/problemgrader.js'),
-				defer => undef
-			},
-			''
+		return $c->form_for(
+			'answer_log',
+			method => 'POST',
+			target => 'WW_Info',
+			$c->c(
+				$hiddenFields,
+				$c->hidden_field(courseID          => $c->stash('courseID')),
+				$c->hidden_field(selected_problems => $problemID),
+				$c->hidden_field(selected_sets     => $c->{problem}->set_id),
+				$c->hidden_field(selected_users    => $c->{problem}->user_id),
+				$c->tag(
+					'p',
+					$c->submit_button(
+						$c->maketext('Show Past Answers'),
+						name  => 'action',
+						class => 'btn btn-primary'
+					)
+				)
+			)->join('')
 		);
 	}
 
-	# This is for any page specific js.  Right now its just used for achievement popups
-	print CGI::script({ src => getAssetURL($ce, 'js/apps/Problem/problem.js'), defer => undef }, '');
-
-	# Add JS files requested by problems via ADD_JS_FILE() in the PG file.
-	if (ref($self->{pg}{flags}{extra_js_files}) eq 'ARRAY') {
-		my %jsFiles;
-		for (@{ $self->{pg}{flags}{extra_js_files} }) {
-			next if $jsFiles{ $_->{file} };
-			$jsFiles{ $_->{file} } = 1;
-			my %attributes = ref($_->{attributes}) eq 'HASH' ? %{ $_->{attributes} } : ();
-			if ($_->{external}) {
-				print CGI::script({ src => $_->{file}, %attributes }, '');
-			} else {
-				print CGI::script({ src => getAssetURL($ce, $_->{file}), %attributes }, '');
-			}
-		}
-	}
-
 	return '';
 }
 
-sub output_CSS {
-	my $self     = shift;
-	my $ce       = $self->r->ce;
-
-	# Output css for jquery-ui for problems to use.
-	print CGI::Link({ href => getAssetURL($ce, 'node_modules/jquery-ui-dist/jquery-ui.min.css'), rel => 'stylesheet' });
-
-	# Add CSS files requested by problems via ADD_CSS_FILE() in the PG file
-	# or via a setting of $ce->{pg}{specialPGEnvironmentVars}{extra_css_files}
-	# which can be set in course.conf (the value should be an anonomous array).
-	my @cssFiles;
-	if (ref($ce->{pg}{specialPGEnvironmentVars}{extra_css_files}) eq 'ARRAY') {
-		push(@cssFiles, { file => $_, external => 0 }) for @{ $ce->{pg}{specialPGEnvironmentVars}{extra_css_files} };
-	}
-	if (ref($self->{pg}{flags}{extra_css_files}) eq 'ARRAY') {
-		push @cssFiles, @{ $self->{pg}{flags}{extra_css_files} };
-	}
-	my %cssFilesAdded;    # Used to avoid duplicates
-	for (@cssFiles) {
-		next if $cssFilesAdded{ $_->{file} };
-		$cssFilesAdded{ $_->{file} } = 1;
-		if ($_->{external}) {
-			print CGI::Link({ rel => 'stylesheet', href => $_->{file} });
-		} else {
-			print CGI::Link({ rel => 'stylesheet', href => getAssetURL($ce, $_->{file}) });
-		}
-	}
-
-	return '';
-}
-
-sub output_achievement_CSS {
-    return "";
-}
-
-# Simply here to indicate to the template that this page has body part methods which can be called
-
-sub can_body_parts{
-	return "";
+# Output the "Email Instructor" button
+sub output_email_instructor ($c) {
+	my $user = $c->db->getUser($c->param('user'));
+
+	# FIXME: Most of what is passed here is only needed by the feedback form, and should be extracted in the
+	# feedbackMacro method and only for that case.
+	return $c->feedbackMacro(
+		route        => $c->current_route,
+		courseId     => $c->stash('courseID'),
+		set          => $c->{set}->set_id,
+		problem      => $c->{problem}->problem_id,
+		problemPath  => $c->{problem}->source_file,
+		randomSeed   => $c->{problem}->problem_seed,
+		emailableURL => $c->generateURLs(
+			url_type   => 'absolute',
+			set_id     => $c->{set}->set_id,
+			problem_id => $c->{problem}->problem_id
+		),
+		studentName        => $user->full_name,
+		displayMode        => $c->{displayMode},
+		showOldAnswers     => $c->{will}{showOldAnswers},
+		showCorrectAnswers => $c->{will}{showCorrectAnswers},
+		showHints          => $c->{will}{showHints},
+		showSolutions      => $c->{will}{showSolutions},
+		pg_object          => $c->{pg},
+	);
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/ProblemRenderer.pm b/lib/WeBWorK/ContentGenerator/ProblemRenderer.pm
deleted file mode 100644
index 77accea71f..0000000000
--- a/lib/WeBWorK/ContentGenerator/ProblemRenderer.pm
+++ /dev/null
@@ -1,84 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::ContentGenerator::ProblemRenderer;
-use base qw(WeBWorK::ContentGenerator);
-
-=head1 NAME
-
-WeBWorK::ContentGenerator::ProblemRenderer - render a problem with a minimal
-amount of UI garbage.
-
-=cut
-
-use strict;
-use warnings;
-use WeBWorK::CGI;
-use WeBWorK::Utils::Tasks qw(renderProblems);
-
-sub pre_header_initialize {
-	my ($self) = @_;
-	my $r = $self->r;
-	
-	my $pg = $r->param('pg');
-	my $file = $r->param('file');
-	my $seed = $r->param('seed');
-	my $mode = $r->param('mode');
-	my $hint = $r->param('hint');
-	my $sol = $r->param('sol');
-	
-	die "must specify either a PG problems (param 'pg') or a path to a PG file (param 'file') and not both"
-		unless defined $pg and length $pg xor defined $file and length $file;
-	
-	my $problem = $self->get_problem($pg, $file);
-	my @options = (r=>$r, problem_list=>[\$pg]);
-	
-	#push @options, (problem_seed=>$seed) if defined $seed;
-	#push @options, (displayMode=>$mode) if defined $mode;
-	#push @options, (showHints=>$hint) if defined $hint;
-	#push @options, (showSolutions=>$sol) if defined $sol;
-	
-	($self->{result}) = renderProblems(@options);
-}
-
-sub get_problem {
-	my ($self, $pg, $file) = @_;
-	
-	if (defined $pg) {
-		return \$pg;
-	} else {
-		return $file;
-	}
-}
-
-use Data::Dumper;
-sub content {
-	my ($self) = @_;
-	my $result = $self->{result};
-	my $dump = Dumper($result);
-	
-	print <<EOF;
-<html>
-<head>
-<title>Yuck!</title>
-</head>
-<body>
-<pre>$dump</pre>
-</body>
-</html>
-EOF
-}
-
-1;
diff --git a/lib/WeBWorK/ContentGenerator/ProblemSet.pm b/lib/WeBWorK/ContentGenerator/ProblemSet.pm
index f22e6e63c0..33f275488b 100644
--- a/lib/WeBWorK/ContentGenerator/ProblemSet.pm
+++ b/lib/WeBWorK/ContentGenerator/ProblemSet.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::ProblemSet;
-use base qw(WeBWorK::ContentGenerator);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures, -async_await;
 
 =head1 NAME
 
@@ -23,122 +23,108 @@ problem set.
 
 =cut
 
-use strict;
-use warnings;
-use WeBWorK::CGI;
-use WeBWorK::PG;
-use URI::Escape;
 use WeBWorK::Debug;
-use WeBWorK::Utils qw(path_is_subdir is_restricted is_jitar_problem_closed is_jitar_problem_hidden
-	jitar_problem_adjusted_status jitar_id_to_seq seq_to_jitar_id wwRound before between after grade_set
-	format_set_name_display);
+use WeBWorK::Utils qw(path_is_subdir is_restricted wwRound before between after grade_set format_set_name_display);
+use WeBWorK::Utils::Rendering qw(renderPG);
 use WeBWorK::Localize;
 
-sub initialize {
-	my ($self)  = @_;
-	my $r       = $self->r;
-	my $db      = $r->db;
-	my $ce      = $r->ce;
-	my $urlpath = $r->urlpath;
-	my $authz   = $r->authz;
+async sub initialize ($c) {
+	my $db    = $c->db;
+	my $ce    = $c->ce;
+	my $authz = $c->authz;
 
-	# $self->{invalidSet} is set in checkSet by ContentGenerator.pm
-	return if $self->{invalidSet};
+	# $c->{invalidSet} is set in checkSet which is called by ContentGenerator.pm
+	return
+		if $c->{invalidSet}
+		&& ($c->{invalidSet} !~ /^Client ip address .* is not in the list of addresses/
+			|| $authz->{merged_set}->assignment_type !~ /gateway/);
 
-	# This will all be valid if checkSet succeeded and we get here.
-	my $setName           = $urlpath->arg("setID");
-	my $userName          = $r->param("user");
-	my $effectiveUserName = $r->param("effectiveUser");
+	# This will all be valid if checkSet did not set $c->{invalidSet}.
+	my $userID  = $c->param('user');
+	my $eUserID = $c->param('effectiveUser');
 
-	my $user          = $db->getUser($userName);
-	my $effectiveUser = $db->getUser($effectiveUserName);
-	$self->{set} = $authz->{merged_set};
+	my $user          = $db->getUser($userID);
+	my $effectiveUser = $db->getUser($eUserID);
+	$c->{set} = $authz->{merged_set};
 
-	$self->{displayMode} = $user->displayMode ? $user->displayMode : $r->ce->{pg}->{options}->{displayMode};
+	$c->{displayMode} = $user->displayMode || $ce->{pg}{options}{displayMode};
 
 	# Display status messages.
-	my $status_message = $r->param("status_message");
-	$self->addmessage(CGI::p($status_message)) if $status_message;
+	$c->addmessage($c->tag('p', $c->b($c->param('status_message')))) if $c->param('status_message');
 
-	if ($authz->hasPermissions($userName, "view_hidden_sets")) {
-		if ($self->{set}->visible) {
-			$self->addmessage(CGI::span({ class => 'font-visible' }, $r->maketext('This set is visible to students.')));
+	if ($authz->hasPermissions($userID, 'view_hidden_sets')) {
+		if ($c->{set}->visible) {
+			$c->addmessage($c->tag('p', class => 'font-visible', $c->maketext('This set is visible to students.')));
 		} else {
-			$self->addmessage(CGI::span({ class => 'font-hidden' }, $r->maketext('This set is hidden from students.')));
+			$c->addmessage($c->tag('p', class => 'font-hidden', $c->maketext('This set is hidden from students.')));
 		}
 	}
-}
-
-sub nav {
-	my ($self, $args) = @_;
-	my $r = $self->r;
-
-	# Don't show the nav if the user does not have unrestricted navigation permissions.
-	return '' unless $r->authz->hasPermissions($r->param('user'), 'navigation_allowed');
 
-	my @links =
-		($r->maketext('Homework Sets'), $r->location . $r->urlpath->parent->path, $r->maketext('Homework Sets'));
-	return CGI::div({ class => 'row sticky-nav', role => 'navigation', aria_label => 'problem navigation' },
-		CGI::div($self->navMacro($args, '', @links)));
-}
-
-sub title {
-	my $self = shift;
-	my $r    = $self->r;
-	my $ce   = $r->ce;
+	# Hack to prevent errors from uninitialized set_headers.
+	$c->{set}->set_header('defaultHeader') unless $c->{set}->set_header =~ /\S/;
+	my $screenSetHeader =
+		$c->{set}->set_header eq 'defaultHeader'
+		? $ce->{webworkFiles}{screenSnippets}{setHeader}
+		: $c->{set}->set_header;
+
+	# Note this may be different than the display mode above when previewing a temporary set header file.
+	my $displayMode = $c->param('displayMode') || $ce->{pg}{options}{displayMode};
+
+	if ($authz->hasPermissions($userID, 'modify_problem_sets')) {
+		if (defined $c->param('editMode') && $c->param('editMode') eq 'temporaryFile') {
+			$screenSetHeader = $c->param('sourceFilePath');
+			$screenSetHeader = "$ce->{courseDirs}{templates}/$screenSetHeader" unless $screenSetHeader =~ m!^/!;
+			die 'sourceFilePath is unsafe!' unless path_is_subdir($screenSetHeader, $ce->{courseDirs}{templates});
+			$c->addmessage($c->tag(
+				'p',
+				class => 'temporaryFile',
+				$c->maketext('Viewing temporary file: [_1]', $screenSetHeader)
+			));
+		}
+	}
 
-	# Using the url arguments won't break if the set/problem are invalid.
-	my $setID       = $r->urlpath->arg('setID');
+	return unless $screenSetHeader;
 
-	my $title = CGI::span({ dir => 'ltr' }, format_set_name_display($setID));
+	my $problem = WeBWorK::DB::Record::UserProblem->new(
+		problem_id  => 0,
+		set_id      => $c->{set}->set_id,
+		login_id    => $effectiveUser->user_id,
+		source_file => $screenSetHeader
+	);
 
-	# Put either due date or reduced scoring date in the title.
-	my $set = $r->db->getMergedSet($r->param('effectiveUser'), $setID);
-	if (defined($set) && between($set->open_date, $set->due_date)) {
-		if ($ce->{pg}{ansEvalDefaults}{enableReducedScoring}
-			&& $set->enable_reduced_scoring
-			&& $set->reduced_scoring_date
-			&& $set->reduced_scoring_date != $set->due_date
-			&& before($set->reduced_scoring_date))
-		{
-			$title .= ' - '
-				. $r->maketext(
-					'Due [_1], after which reduced scoring is available until [_2]',
-					$self->formatDateTime($set->reduced_scoring_date, undef, $ce->{studentDateDisplayFormat}),
-					$self->formatDateTime($set->due_date,             undef, $ce->{studentDateDisplayFormat})
-				);
-		} elsif ($set->due_date) {
-			$title .= ' - '
-				. $r->maketext('Closes [_1]',
-					$self->formatDateTime($set->due_date, undef, $ce->{studentDateDisplayFormat}));
-		}
-	}
+	$c->{pg} =
+		await renderPG($c, $effectiveUser, $c->{set}, $problem, $c->{set}->psvn, {}, { displayMode => $displayMode });
 
-	return $title;
+	return;
 }
 
-sub templateName {
-	my $self = shift;
-	my $r = $self->r;
-	my $templateName = $r->param('templateName')//'system';
-	$self->{templateName}= $templateName;
-	$templateName;
+sub nav ($c, $args) {
+	# Don't show the nav if the user does not have unrestricted navigation permissions.
+	return '' unless $c->authz->hasPermissions($c->param('user'), 'navigation_allowed');
+
+	my @links = (
+		$c->maketext('Homework Sets'),
+		$c->url_for($c->app->routes->lookup($c->current_route)->parent->name),
+		$c->maketext('Homework Sets')
+	);
+	return $c->tag(
+		'div',
+		class      => 'row sticky-nav',
+		role       => 'navigation',
+		aria_label => 'problem navigation',
+		$c->tag('div', $c->navMacro($args, {}, @links))
+	);
 }
 
-sub siblings {
-	my ($self) = @_;
-	my $r         = $self->r;
-	my $db        = $r->db;
-	my $ce        = $r->ce;
-	my $authz     = $r->authz;
-	my $urlpath   = $r->urlpath;
+sub siblings ($c) {
+	my $db    = $c->db;
+	my $ce    = $c->ce;
+	my $authz = $c->authz;
 
-	my $courseID  = $urlpath->arg("courseID");
-	my $user      = $r->param('user');
-	my $eUserID   = $r->param("effectiveUser");
-	my $thisSetID = $urlpath->arg('setID');
+	my $user    = $c->param('user');
+	my $eUserID = $c->param('effectiveUser');
 
-	# restrict navigation to other problem sets if not allowed
+	# Restrict navigation to other problem sets if not allowed.
 	return '' unless $authz->hasPermissions($user, 'navigation_allowed');
 
 	# Note that listUserSets does not list versioned sets, but listUserSetsWhere does.  On the other hand, listUserSets
@@ -146,849 +132,191 @@ sub siblings {
 	my @setIDs =
 		map { $_->[1] } $db->listUserSetsWhere({ user_id => $eUserID, set_id => { not_like => '%,v%' } }, 'set_id');
 
-	# do not show hidden siblings unless user is allowed to view hidden sets.
-	unless ($authz->hasPermissions($user, "view_hidden_sets")) {
+	# Do not show hidden siblings unless user is allowed to view hidden sets.
+	unless ($authz->hasPermissions($user, 'view_hidden_sets')) {
 		@setIDs = grep {
-			my $set = $db->getMergedSet($eUserID, $_);
+			my $set        = $db->getMergedSet($eUserID, $_);
 			my @restricted = $ce->{options}{enableConditionalRelease} ? is_restricted($db, $set, $eUserID) : ();
-			my $LTIRestricted = defined($ce->{LTIGradeMode}) && $ce->{LTIGradeMode} eq 'homework' && !$set->lis_source_did;
+			my $LTIRestricted =
+				defined($ce->{LTIGradeMode}) && $ce->{LTIGradeMode} eq 'homework' && !$set->lis_source_did;
 
-			after($set->open_date) &&
-			(defined($set->visible()) ? $set->visible() : 1)
-			&& !@restricted
-			&& !$LTIRestricted;
+			after($set->open_date)
+				&& (defined($set->visible()) ? $set->visible() : 1)
+				&& !@restricted
+				&& !$LTIRestricted;
 		} @setIDs;
 	}
 
-	print CGI::start_div({class=>"info-box", id=>"fisheye"});
-	print CGI::h2($r->maketext("Sets"));
-	print CGI::start_ul({ class => 'nav flex-column bg-light', dir => 'ltr' });
-
-	debug("Begin printing sets from listUserSets()");
-	for my $setID (@setIDs) {
-		my $setPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSet", $r,
-			courseID => $courseID, setID => $setID);
-		print CGI::li({ class => 'nav-item' },
-			CGI::a({
-					$setID eq $thisSetID
-					? (id => $setID, class => 'nav-link active')
-					: (id => $setID, class => 'nav-link', href => $self->systemLink($setPage))
-				}, format_set_name_display($setID))
-		);
-	}
-	debug("End printing sets from listUserSets()");
-
-	print CGI::end_ul();
-	print CGI::end_div();
-
-	return "";
+	return $c->include('ContentGenerator/ProblemSet/siblings', setIDs => \@setIDs);
 }
 
 sub info {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-
-	return "" if ( $self->{invalidSet} );
-
-	my $courseID = $urlpath->arg("courseID");
-	my $setID = $r->urlpath->arg("setID");
-
-	my $userID = $r->param("user");
-	my $eUserID = $r->param("effectiveUser");
-
-	my $effectiveUser = $db->getUser($eUserID);
-	my $set  = $self->{set};
-
-	die "effective user $eUserID not found. One 'acts as' the effective user." unless $effectiveUser;
-	# FIXME: this was already caught in initialize()
-	die "set $setID for effectiveUser $eUserID not found." unless $set;
-
-	my $psvn = $set->psvn();
-	# hack to prevent errors from uninitialized set_headers.
-	$set->set_header("defaultHeader") unless $set->set_header =~/\S/; # (some non-white space character required)
-	my $screenSetHeader = ($set->set_header eq "defaultHeader") ?
-	$ce->{webworkFiles}->{screenSnippets}->{setHeader} :
-	$set->set_header;
-
-	my $displayMode     = $r->param("displayMode") || $ce->{pg}->{options}->{displayMode};
-
-	if ($authz->hasPermissions($userID, "modify_problem_sets")) {
-		if (defined $r->param("editMode") and $r->param("editMode") eq "temporaryFile") {
-			$screenSetHeader = $r->param('sourceFilePath');
-			$screenSetHeader = $ce->{courseDirs}{templates}.'/'.$screenSetHeader unless $screenSetHeader =~ m!^/!;
-			die "sourceFilePath is unsafe!" unless path_is_subdir($screenSetHeader, $ce->{courseDirs}->{templates});
-			$self->addmessage(CGI::div({class=>'temporaryFile'}, $r->maketext("Viewing temporary file:")." ",
-					$screenSetHeader));
-			$displayMode = $r->param("displayMode") if $r->param("displayMode");
-		}
-	}
-
-	return "" unless defined $screenSetHeader and $screenSetHeader;
-
-	# decide what to do about problem number
-	my $problem = WeBWorK::DB::Record::UserProblem->new(
-		problem_id => 0,
-		set_id => $set->set_id,
-		login_id => $effectiveUser->user_id,
-		source_file => $screenSetHeader,
-		# the rest of Problem's fields are not needed, i think
-	);
-
-	my $pg = WeBWorK::PG->new(
-		$ce,
-		$effectiveUser,
-		$r->param('key'),
-		$set,
-		$problem,
-		$psvn,
-		{}, # no form fields!
-		{ # translation options
-			displayMode     => $displayMode,
-			showHints       => 0,
-			showSolutions   => 0,
-			processAnswers  => 0,
-		},
-	);
-
-	my $editorURL;
-	if (defined($set) and $authz->hasPermissions($userID, "modify_problem_sets")) {
-		my $editorPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor", $r,
-			courseID => $courseID, setID => $set->set_id, problemID => 0);
-		$editorURL = $self->systemLink($editorPage, params => { file_type => 'set_header'});
-	}
-
-	if ($editorURL) {
-		print CGI::h2(
-			{ class => 'd-flex align-items-center justify-content-center' },
-			$r->maketext("Set Info"),
-			CGI::a(
-				{ href => $editorURL, target => "WW_Editor", class => 'btn btn-sm btn-info m-1' },
-				$r->maketext("Edit")
-			)
-		);
-	} else {
-		print CGI::h2($r->maketext("Set Info"));
-	}
-
-	if ($pg->{flags}->{error_flag}) {
-		print CGI::div({ class => 'alert alert-danger p-1 mb-0' }, $self->errorOutput($pg->{errors}, $pg->{body_text}));
-	} else {
-		print $pg->{body_text};
-	}
-
-	return "";
+	my ($c) = @_;
+	return '' unless $c->{pg};
+	return $c->include('ContentGenerator/ProblemSet/info');
 }
 
-sub body {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $authz = $r->authz;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $urlpath = $r->urlpath;
-
-	my $courseID = $urlpath->arg("courseID");
-	my $setName = $urlpath->arg("setID");
-	my $effectiveUser = $r->param('effectiveUser');
-	my $user = $r->param('user');
-
-	my $set = $self->{set};
-
-	if ($self->{invalidSet}) {
-		return CGI::div(
-			{ class => 'alert alert-danger' },
-			CGI::div(
-				{ class => 'mb-3' },
-				$r->maketext("The selected problem set ([_1]) is not a valid set for [_2]", $setName, $effectiveUser)
-					. ":"
-			),
-			CGI::div($self->{invalidSet})
-		);
-	}
+# This is called by the ContentGenerator/ProblemSet/body template for a regular homework set.
+# It lists the problems in the set.
+sub problem_list ($c) {
+	my $authz = $c->authz;
+	my $db    = $c->db;
 
-	my $enable_reduced_scoring =  $ce->{pg}{ansEvalDefaults}{enableReducedScoring} && $set->enable_reduced_scoring && $set->reduced_scoring_date &&$set->reduced_scoring_date != $set->due_date;
+	my $setID = $c->stash('setID');
+	my $user  = $c->param('user');
 
-	my $reduced_scoring_date = $set->reduced_scoring_date;
-	if ($enable_reduced_scoring) {
-		my $dueDate = $self->formatDateTime($set->due_date());
-		my $reducedScoringValue = $ce->{pg}->{ansEvalDefaults}->{reducedScoringValue};
-		my $reducedScoringPerCent = int(100*$reducedScoringValue+.5);
-		my $beginReducedScoringPeriod =  $self->formatDateTime($reduced_scoring_date);
+	my @problems =
+		$db->getMergedProblemsWhere({ user_id => $c->param('effectiveUser'), set_id => $setID }, 'problem_id');
 
-		if (before($reduced_scoring_date)) {
-			print CGI::div({class=>"alert alert-warning mb-3"},
-				$r->maketext("After the reduced scoring period begins all work counts for [_1]% of its value.",
-					$reducedScoringPerCent));
+	return $c->include('ContentGenerator/ProblemSet/problem_list', problems => \@problems);
+}
 
-		} elsif (between($reduced_scoring_date, $set->due_date())) {
-			print CGI::div({class=>"alert alert-warning mb-3"},
-				$r->maketext("This set is in its reduced scoring period.  All work counts for [_1]% of its value.",
-					$reducedScoringPerCent));
-		} else {
-			print CGI::div({class=>"alert alert-warning mb-3"},
-				$r->maketext("This set had a reduced scoring period that started on [_1] and ended on [_2].  During that period all work counted for [_3]% of its value.",
-					$beginReducedScoringPeriod, $dueDate, $reducedScoringPerCent));
+# This is called by the ContentGenerator/ProblemSet/body template for a test.
+# It gives some information about the test parameters, and lists the versions.
+sub gateway_body ($c) {
+	my $authz = $c->authz;
+	my $ce    = $c->ce;
+	my $db    = $c->db;
+
+	my $set           = $c->{set};
+	my $effectiveUser = $c->param('effectiveUser');
+	my $user          = $c->param('user');
+
+	my $timeNow   = time;
+	my $timeLimit = $set->version_time_limit || 0;
+
+	# Compute how many versions have been launched within timeInterval to determine if a new version can be created,
+	# if a version can be continued, and the date a next version can be started.  If there is an open version that
+	# can be resumed, add a button to continue the last such version found.
+	my $continueVersion  = 0;
+	my $continueTimeLeft = 0;
+	my $currentVersions  = 0;
+	my $lastTime         = 0;
+	my $timeInterval     = $set->time_interval || 0;
+	my @versionData;
+
+	my @setVersions =
+		$db->getMergedSetVersionsWhere({ user_id => $effectiveUser, set_id => { like => $set->set_id . ',v%' } },
+			\q{(SUBSTRING(set_id,INSTR(set_id,',v')+2)+0)});
+
+	for my $verSet (@setVersions) {
+		# Count number of versions in current timeInterval
+		if (!$timeInterval || $verSet->version_creation_time > ($timeNow - $timeInterval)) {
+			++$currentVersions;
+			$lastTime = $verSet->version_creation_time
+				if ($lastTime == 0 || $lastTime > $verSet->version_creation_time);
 		}
-	}
-
-	if ($set->assignment_type =~ /gateway/) {
-		# For a gateway quiz list versions.
-
-		my $multiSet  = $authz->hasPermissions($user, "view_multiple_sets");
-		my $timeNow   = time;
-		my $timeLimit = $set->version_time_limit() || 0;
-
-		# Compute how many versions have been launched within timeInterval to determine if a new version can be created,
-		# if a version can be continued, and the date a next version can be started.  If there is an open version that
-		# can be resumed, add a button to continue the last such version found.
-		my $continueVersion  = 0;
-		my $continueTimeLeft = 0;
-		my $currentVersions  = 0;
-		my $lastTime         = 0;
-		my $timeInterval     = $set->time_interval()         || 0;
-		my $maxVersions      = $set->versions_per_interval() || 0;
-		my @versData;
-
-		my @setVers =
-			$db->getMergedSetVersionsWhere({ user_id => $effectiveUser, set_id => { like => $set->set_id . ',v%' } },
-				\"(SUBSTRING(set_id,INSTR(set_id,',v')+2)+0)");
-
-		for my $verSet (@setVers) {
-			# Count number of versions in current timeInterval
-			if (!$timeInterval || $verSet->version_creation_time() > ($timeNow - $timeInterval)) {
-				$currentVersions++;
-				$lastTime = $verSet->version_creation_time()
-					if ($lastTime == 0 || $lastTime > $verSet->version_creation_time);
-			}
-
-			# Get a problem to determine how many submits have been made.
-			my @ProblemNums = $db->listUserProblems($effectiveUser, $set->set_id);
-			my $Problem =
-				$db->getMergedProblemVersion($effectiveUser, $set->set_id, $verSet->version_id, $ProblemNums[0]);
-			my $verSubmits =
-				(defined $Problem && $Problem->num_correct() ne '')
-				? $Problem->num_correct() + $Problem->num_incorrect()
-				: 0;
-			my $maxSubmits = $verSet->attempts_per_version() || 0;
-
-			# Build data hash for this version.
-			my $data = {};
-			$data->{id}      = $set->set_id . ',v' . $verSet->version_id;
-			$data->{version} = $verSet->version_id;
-			$data->{start} =
-				$self->formatDateTime($verSet->version_creation_time, undef, $ce->{studentDateDisplayFormat});
-			$data->{proctored} = $verSet->assignment_type =~ /proctored/;
-
-			# Display close date if this is not a timed test.
-			my $closeText = '';
-			if (!$timeLimit) {
-				$closeText = $r->maketext('Closes on [_1]',
-					$self->formatDateTime($verSet->due_date, undef, $ce->{studentDateDisplayFormat}));
-			}
-
-			if (defined($verSet->version_last_attempt_time) && $verSet->version_last_attempt_time > 0) {
-				if ($timeNow < $verSet->due_date
-					&& ($maxSubmits <= 0 || ($maxSubmits > 0 && $verSubmits < $maxSubmits)))
-				{
-					if ($verSubmits > 0) {
-						$data->{end} = $r->maketext('Additional submissions available.') . " $closeText";
-					} else {
-						$data->{end} = $closeText;
-					}
-				} else {
-					$data->{end} = $self->formatDateTime($verSet->version_last_attempt_time,
-						undef, $ce->{studentDateDisplayFormat});
-				}
-			} elsif ($timeNow < $verSet->due_date) {
-				$data->{end} = $r->maketext('Test not yet submitted.') . " $closeText";
-			} else {
-				$data->{end} = $r->maketext('No submissions. Over time.');
-			}
-
-			# Status Logic: Assuming it is always after the open date for test versions.
-			# Matching can_showCorrectAnswer method where hide_work eq 'N' is
-			# only honored before the answer_date if it also equals the due_date.
-			# Using $set->answer_date since the template date is what is currently used to decide
-			# if answers are available.
-			my $canShowAns = (
-				(
-					$verSet->hide_work eq 'N'
-						&& ($verSet->due_date == $verSet->answer_date || $timeNow >= $set->answer_date)
-				)
-					|| ($verSet->hide_work eq 'BeforeAnswerDate' && $timeNow >= $set->answer_date)
-			) ? 1 : 0;
-
-			if ($timeNow < $verSet->due_date() + $ce->{gatewayGracePeriod}) {
-				if ($maxSubmits > 0 && $verSubmits >= $maxSubmits) {
-					$data->{status} = $r->maketext('Completed.');
-					$data->{status} .= $r->maketext(' Answers Available.') if ($canShowAns);
-				} else {
-					if ($verSubmits) {
-						$data->{status} = $r->maketext('Open. Submitted.');
-					} else {
-						$data->{status} = $r->maketext('Open.');
-					}
-					if (($maxSubmits == 0 && !$verSubmits) || $verSubmits < $maxSubmits) {
-						$continueVersion = $verSet;
-						$continueTimeLeft =
-							$verSet->due_date +
-							($timeNow >= $verSet->due_date() ? $ce->{gatewayGracePeriod} : 0) -
-							$timeNow;
-					}
-				}
-			} else {
-				if ($verSubmits > 0) {
-					$data->{status} = $r->maketext('Completed.');
-				} else {
-					$data->{status} = $r->maketext('Closed.');
-				}
-				$data->{status} .= $r->maketext(' Answers Available.') if ($canShowAns);
-			}
 
-			# Only show download link if work is not hidden.
-			# Only show version link if the set is open or if works is not hidden.
-			$data->{show_download} = ($verSet->hide_work eq 'N'
-					|| ($verSet->hide_work eq 'BeforeAnswerDate' && $timeNow >= $set->answer_date)) ? 1 : 0;
-			$data->{show_link} = ($data->{status} =~ /Open/ || $data->{show_download});
-
-			$data->{score} = '&nbsp;';
-			# Only show score if user has permission and assignment has at least one submit.
-			if ($authz->hasPermissions($user, 'view_hidden_work')
-				|| ($verSet->hide_score eq 'N'                && $verSubmits >= 1)
-				|| ($verSet->hide_score eq 'BeforeAnswerDate' && $timeNow > $set->answer_date))
-			{
-				my ($total, $possible) = grade_set($db, $verSet, $effectiveUser, 1);
-				$total = wwRound(2, $total);
-				$data->{score} = "$total/$possible";
-			}
-			push @versData, $data;
+		# Get a problem to determine how many submits have been made.
+		my @ProblemNums = $db->listUserProblems($effectiveUser, $set->set_id);
+		my $Problem = $db->getMergedProblemVersion($effectiveUser, $set->set_id, $verSet->version_id, $ProblemNums[0]);
+		my $verSubmits = defined $Problem ? $Problem->num_correct + $Problem->num_incorrect : 0;
+		my $maxSubmits = $verSet->attempts_per_version || 0;
+
+		# Build data hash for this version.
+		my $data = {};
+		$data->{id}        = $set->set_id . ',v' . $verSet->version_id;
+		$data->{version}   = $verSet->version_id;
+		$data->{start}     = $c->formatDateTime($verSet->version_creation_time, undef, $ce->{studentDateDisplayFormat});
+		$data->{proctored} = $verSet->assignment_type =~ /proctored/;
+
+		# Display close date if this is not a timed test.
+		my $closeText = '';
+		if (!$timeLimit) {
+			$closeText = $c->maketext('Closes on [_1]',
+				$c->formatDateTime($verSet->due_date, undef, $ce->{studentDateDisplayFormat}));
 		}
 
-		my $urlModule =
-			$set->assignment_type() =~ /proctored/
-			? 'WeBWorK::ContentGenerator::ProctoredGatewayQuiz'
-			: 'WeBWorK::ContentGenerator::GatewayQuiz';
-
-		if ($continueVersion) {
-			# Display information about the current test and a continue open test button.
-			if ($timeLimit > 0) {
-				if ($timeNow >= $continueVersion->due_date()) {
-					# If the currently open test is in the grace period, display a mesage stating this.
-					print CGI::div(
-						{ class => 'alert alert-danger' },
-						$r->maketext(
-							'There is no time remaining on the currently open test. '
-								. 'Click continue below and then click "Grade Test" within [_1] seconds '
-								. 'to submit the test for a grade.',
-							$continueTimeLeft
-						)
-					);
-				} else {
-					my $seconds = $continueTimeLeft;
-					my $hours   = int($seconds / 3600);
-					$seconds %= 3600;
-					my $minutes = int($seconds / 60);
-					$seconds %= 60;
-					my $timeText = '';
-
-					# Several cases are needed to format time to work well with translation.
-					if ($hours && $minutes) {
-						print CGI::div(
-							{ class => 'alert alert-warning' },
-							$r->maketext(
-								'You have [quant,_1,hour] and [quant,_2,minute] '
-									. 'remaining to complete the currently open test.',
-								$hours,
-								$minutes
-							)
-						);
-					} elsif ($hours || ($minutes && (!$seconds || $seconds > 299))) {
-						# Translation Note: In this case only one of hours or minutes is non-zero,
-						# so the zero case of the "quant" will be used for the other one.
-						print CGI::div(
-							{ class => 'alert alert-warning' },
-							$r->maketext(
-								'You have [quant,_1,hour,hours,][quant,_2,minute,minutes,] '
-									. 'remaining to complete the currently open test.',
-								$hours,
-								$minutes
-							)
-						);
-					} else {
-						if ($minutes) {
-							print CGI::div(
-								{ class => 'alert alert-warning' },
-								$r->maketext(
-									'You have [quant,_1,minute] and [quant,_2,second] '
-										. 'remaining to complete the currently open test.',
-									$minutes,
-									$seconds
-								)
-							);
-
-						} else {
-							print CGI::div(
-								{ class => 'alert alert-warning' },
-								$r->maketext(
-									'You have [quant,_1,second] remaining to complete the currently open test.',
-									$seconds
-								)
-							);
-						}
-					}
-				}
-			}
-
-			if ($set->assignment_type =~ /proctor/) {
-				print CGI::div({ class => 'alert alert-warning' },
-					$r->maketext('This test requires a proctor password to continue.'));
-			}
-
-			my $interactiveURL = $self->systemLink($urlpath->newFromModule(
-				$urlModule, $r,
-				courseID => $courseID,
-				setID    => $set->set_id . ',v' . $continueVersion->version_id
-			));
-			print CGI::div(
-				{ class => 'mb-3' },
-				CGI::a({ href => $interactiveURL, class => 'btn btn-primary' }, $r->maketext('Continue Open Test'))
-			);
-		} elsif (($timeNow >= $set->open_date || $authz->hasPermissions($user, "view_hidden_sets"))
-			&& $timeNow <= $set->due_date
-			&& !($ce->{options}{enableConditionalRelease} && is_restricted($db, $set, $effectiveUser))
-			&& ($maxVersions <= 0 || $currentVersions < $maxVersions))
-		{
-			# Display information about a new test and a start new test button.
-			# Print time limit for timed tests
-			if ($timeLimit > 0) {
-				my $hours    = int($timeLimit / 3600);
-				my $minutes  = int(($timeLimit % 3600) / 60);
-				my $timeText = '';
-
-				# Two cases to format time to work well with translation.
-				if ($hours && $minutes) {
-					print CGI::div(
-						{ class => 'alert alert-warning' },
-						$r->maketext(
-							'This is a timed test. '
-								. 'You will have [quant,_1,hour] and [quant,_2,minute] to complete the test.',
-							$hours,
-							$minutes
-						)
-					);
+		if (defined $verSet->version_last_attempt_time && $verSet->version_last_attempt_time > 0) {
+			if ($timeNow < $verSet->due_date
+				&& ($maxSubmits <= 0 || ($maxSubmits > 0 && $verSubmits < $maxSubmits)))
+			{
+				if ($verSubmits > 0) {
+					$data->{end} = $c->maketext('Additional submissions available.') . " $closeText";
 				} else {
-					# Translation Note: In this case only one of hours or minutes is non-zero,
-					# so the zero case of the "quant" will be used for the other one.
-					print CGI::div(
-						{ class => 'alert alert-warning' },
-						$r->maketext(
-							'This is a timed test. You will have [quant,_1,hour,hours,]'
-								. '[quant,_2,minute,minutes,] to complete the test.',
-							$hours,
-							$minutes
-						)
-					);
+					$data->{end} = $closeText;
 				}
+			} else {
+				$data->{end} =
+					$c->formatDateTime($verSet->version_last_attempt_time, undef, $ce->{studentDateDisplayFormat});
 			}
-
-			if ($set->assignment_type =~ /proctor/) {
-				print CGI::div({ class => 'alert alert-warning' },
-					$r->maketext('This test requires a proctor password to start.'));
-			}
-
-			my $interactiveURL = $self->systemLink($urlpath->newFromModule(
-				$urlModule, $r,
-				courseID => $courseID,
-				setID    => $set->set_id
-			));
-			print CGI::div({ class => 'mb-3' },
-				CGI::a({ href => $interactiveURL, class => 'btn btn-primary' }, $r->maketext('Start New Test')));
+		} elsif ($timeNow < $verSet->due_date) {
+			$data->{end} = $c->maketext('Test not yet submitted.') . " $closeText";
 		} else {
-			# Message about if/when next version will be available.
-			my $msg = $r->maketext('No more tests available.');
-
-			# Can they open a test in the future?
-			if ($timeInterval > 0) {
-				my $nextTime =
-					($currentVersions == $maxVersions) ? $lastTime + $timeInterval : $timeNow + $timeInterval;
-				if ($nextTime < $set->due_date) {
-					$msg = $r->maketext('Next test will be available by [_1].',
-						$self->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat}));
-				}
-			}
-
-			# Is it past due date?
-			if ($timeNow >= $set->due_date) {
-				$msg = $r->maketext('This test is closed.');
-			}
-
-			print CGI::div({ class => 'alert alert-dark' }, CGI::strong($msg));
+			$data->{end} = $c->maketext('No submissions. Over time.');
 		}
 
-		if (@setVers) {
-			# Start of form for hardcopy of test versions.
-			if ($multiSet) {
-				print CGI::start_form({
-					name   => 'problem-sets-form',
-					id     => 'problem-sets-form',
-					method => 'POST',
-					action => $self->systemLink(
-						$urlpath->newFromModule("WeBWorK::ContentGenerator::Hardcopy", $r, courseID => $courseID),
-						authen => 0
-					)
-				});
-				print $self->hidden_authen_fields;
-			}
+		# Status Logic: Assuming it is always after the open date for test versions.
+		# Matching can_showCorrectAnswer method where hide_work eq 'N' is
+		# only honored before the answer_date if it also equals the due_date.
+		# Using $set->answer_date since the template date is what is currently used to decide
+		# if answers are available.
+		my $canShowAns = (
+			(
+				$verSet->hide_work eq 'N'
+					&& ($verSet->due_date == $verSet->answer_date || $timeNow >= $set->answer_date)
+			)
+				|| ($verSet->hide_work eq 'BeforeAnswerDate' && $timeNow >= $set->answer_date)
+		) ? 1 : 0;
 
-			print CGI::start_div({ class => 'table-responsive' });
-			print CGI::start_table({
-				class   => 'problem_set_table table table-sm caption-top font-sm',
-				summary => $r->maketext(
-					'This table lists the current attempts for this test/quiz, '
-						. 'along with its status, score, start date, and close date. '
-						. 'Click on the version link to access that version. '
-				)
-			});
-			print CGI::caption($r->maketext('Test Versions'));
-			print CGI::thead(CGI::Tr(
-				CGI::th({ scope => 'col' }, $r->maketext('Versions')),
-				CGI::th({ scope => 'col' }, $r->maketext('Status')),
-				CGI::th({ scope => 'col' }, $r->maketext('Score')),
-				CGI::th({ scope => 'col' }, $r->maketext('Start')),
-				CGI::th({ scope => 'col' }, $r->maketext('End')),
-				CGI::th(
-					{ scope => 'col', class => 'hardcopy' },
-					CGI::i(
-						{
-							class       => 'icon far fa-lg fa-arrow-alt-circle-down',
-							aria_hidden => 'true',
-							title       => $r->maketext('Generate Hardcopy'),
-							data_alt    => $r->maketext('Generate Hardcopy')
-						},
-						''
-					)
-				),
-			));
-			print CGI::start_tbody();
-
-			for my $ver (@versData) {
-				my $interactive = $r->maketext('Version [_1]', $ver->{version});
-				if ($authz->hasPermissions($user, 'view_hidden_work') || $ver->{show_link}) {
-					my $interactiveURL = $self->systemLink($urlpath->newFromModule(
-						$ver->{proctored}
-						? 'WeBWorK::ContentGenerator::ProctoredGatewayQuiz'
-						: 'WeBWorK::ContentGenerator::GatewayQuiz',
-						$r,
-						courseID => $courseID,
-						setID    => $ver->{id}
-					));
-					$interactive = CGI::a(
-						{
-							class             => 'set-id-tooltip text-nowrap',
-							data_bs_toggle    => 'tooltip',
-							data_bs_placement => 'right',
-							data_bs_title     => $set->description(),
-							href              => $interactiveURL
-						},
-						$interactive
-					);
+		if ($timeNow < $verSet->due_date + $ce->{gatewayGracePeriod}) {
+			if ($maxSubmits > 0 && $verSubmits >= $maxSubmits) {
+				$data->{status} = $c->maketext('Completed.');
+				$data->{status} .= $c->maketext(' Answers Available.') if ($canShowAns);
+			} else {
+				if ($verSubmits) {
+					$data->{status} = $c->maketext('Open. Submitted.');
+				} else {
+					$data->{status} = $c->maketext('Open.');
 				}
-
-				# Download hardcopy.
-				my $control = '';
-				if ($multiSet) {
-					$control = CGI::input({
-						type  => 'checkbox',
-						id    => $ver->{id},
-						name  => 'selected_sets',
-						value => $ver->{id},
-						class => 'form-check-input'
-					});
-					# make sure interactive is the label for control
-					$interactive = CGI::label({ "for" => $ver->{id} }, $interactive);
-				} elsif ($ver->{show_download}) {
-					# Only display download option if answers are available.
-					$control = CGI::a(
-						{
-							class => 'hardcopy-link',
-							href  => $self->systemLink(
-								$urlpath->newFromModule(
-									"WeBWorK::ContentGenerator::Hardcopy", $r,
-									courseID => $courseID,
-									setID    => $ver->{id}
-								),
-								params => { selected_sets => $ver->{id} }
-							)
-						},
-						CGI::i(
-							{
-								class       => 'icon far fa-arrow-alt-circle-down fa-lg',
-								aria_hidden => 'true',
-								title       => $r->maketext('Download [_1]', $ver->{id} =~ s/_/ /gr),
-								data_alt    => $r->maketext('Download [_1]', $ver->{id} =~ s/_/ /gr)
-							},
-							''
-						)
-					);
+				if (($maxSubmits == 0 && !$verSubmits) || $verSubmits < $maxSubmits) {
+					$continueVersion = $verSet;
+					$continueTimeLeft =
+						$verSet->due_date + ($timeNow >= $verSet->due_date ? $ce->{gatewayGracePeriod} : 0) - $timeNow;
 				}
-
-				print CGI::Tr(
-					CGI::td($interactive),
-					CGI::td(CGI::strong($ver->{status})),
-					CGI::td([ $ver->{score}, $ver->{start}, $ver->{end} ]),
-					CGI::td({ class => 'hardcopy' }, $control)
-				);
-			}
-			print CGI::end_tbody();
-			print CGI::end_table();
-			print CGI::end_div();
-
-			if ($multiSet) {
-				print CGI::div(
-					{ class => 'mb-3' },
-					CGI::reset({
-						id    => 'clear',
-						value => $r->maketext('Deselect All Test Versions'),
-						class => 'btn btn-primary'
-					})
-				);
-				print CGI::div(
-					{ class => 'mb-3' },
-					CGI::submit({
-						id    => 'hardcopy',
-						name  => 'hardcopy',
-						value => $r->maketext('Download PDF or TeX Hardcopy for Selected Tests'),
-						class => 'btn btn-primary'
-					})
-				);
-				print CGI::end_form();
 			}
 		} else {
-			print CGI::div(CGI::p($r->maketext('No versions of this test have been taken.')));
-		}
-	} else {
-		# For a homework set list problems.
-
-		my $isJitarSet = $set->assignment_type eq 'jitar';
-
-		my @problems = $db->getMergedProblemsWhere({ user_id => $effectiveUser, set_id => $setName }, 'problem_id');
-
-		if (@problems) {
-			# Check permissions and see if any of the problems are gradeable
-			my $canScoreProblems = 0;
-			if ($authz->hasPermissions($user, "access_instructor_tools") && $authz->hasPermissions($user, "score_sets"))
-			{
-				my @setUsers = $db->listSetUsers($setName);
-				my @globalProblems = $db->getGlobalProblemsWhere({ set_id => $setName }, 'problem_id');
-
-				my @gradeableProblems;
-				for my $problem (@globalProblems) {
-					if ($problem->flags =~ /essay/) {
-						$canScoreProblems = 1;
-						$gradeableProblems[ $problem->problem_id ] = 1;
-					}
-				}
-
-				$self->{gradeableProblems} = \@gradeableProblems if $canScoreProblems;
-			}
-
-			# This table contains a summary, a caption, and scope variables for the columns.
-			print CGI::start_div({ class => 'table-responsive' });
-			print CGI::start_table({ class => "problem_set_table table caption-top font-sm" });
-			print CGI::caption($r->maketext("Problems"));
-
-			my $thRow = [
-				CGI::th($r->maketext("Name")),      CGI::th($r->maketext("Attempts")),
-				CGI::th($r->maketext("Remaining")), CGI::th($r->maketext("Worth")),
-				CGI::th($r->maketext("Status"))
-			];
-
-			if ($isJitarSet) {
-				push @$thRow,
-					CGI::th(
-					$r->maketext("Adjusted Status")
-						. "&nbsp;"
-						. CGI::a(
-						{
-							class             => 'help-popup',
-							data_bs_placement => 'top',
-							data_bs_toggle    => 'popover',
-							tabindex          => 0,
-							role              => 'button',
-							data_bs_content   => $r->maketext(
-								'The adjusted status of a problem is the larger of the problem\'s status and'
-									. 'the weighted average of the status of those problems which count towards '
-									. 'the parent grade.'
-							)
-						},
-						CGI::i(
-							{ class => "icon fas fa-question-circle", aria_hidden => "true", data_alt => "Help Icon" },
-							""
-						)
-						)
-					);
-				push @$thRow, CGI::th($r->maketext("Counts for Parent"));
-			}
-
-			if ($canScoreProblems) {
-				push @$thRow, CGI::th($r->maketext("Grader"));
-			}
-
-			print CGI::thead(CGI::Tr(@$thRow));
-			print CGI::start_tbody();
-
-			for my $problem (@problems) {
-				print $self->problemListRow($set, $problem, $db, $canScoreProblems, $isJitarSet);
+			if ($verSubmits > 0) {
+				$data->{status} = $c->maketext('Completed.');
+			} else {
+				$data->{status} = $c->maketext('Closed.');
 			}
-
-			print CGI::end_tbody();
-			print CGI::end_table();
-			print CGI::end_div();
-		} else {
-			print CGI::p($r->maketext("This homework set contains no problems."));
+			$data->{status} .= $c->maketext(' Answers Available.') if ($canShowAns);
 		}
 
-		print CGI::div(
-			{ class => 'mb-3' },
-			CGI::a(
-				{
-					href => $self->systemLink($urlpath->newFromModule(
-						"WeBWorK::ContentGenerator::Hardcopy", $r,
-						courseID => $courseID,
-						setID    => $setName
-					)),
-					class => 'btn btn-primary'
-				},
-				$r->maketext('Download PDF or TeX Hardcopy for Current Set')
-			)
-		);
-	}    # End Gateway Quiz vs Homework Assignment conditional
-
-	print CGI::div(
-		{ class => 'mb-3' },
-		$self->feedbackMacro(
-			module             => __PACKAGE__,
-			set                => $self->{set}->set_id,
-			problem            => "",
-			displayMode        => $self->{displayMode},
-			showOldAnswers     => "",
-			showCorrectAnswers => "",
-			showHints          => "",
-			showSolutions      => "",
-		)
-	);
-
-	return "";
-}
-
-sub problemListRow($$$$$) {
-	my ($self, $set, $problem, $db, $canScoreProblems, $isJitarSet) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-
-	my $courseID = $urlpath->arg("courseID");
-	my $setID = $set->set_id;
-	my $problemID = $problem->problem_id;
-	my $problemNumber = $problemID;
-
-	my $jitarRestriction = 0;
-	my $problemLevel = 0;
-
-	if ($isJitarSet) {
-		my @seq = jitar_id_to_seq($problemID);
-		$problemLevel = $#seq;
-		$problemNumber = join('.', @seq);
-	}
-
-	# if the problem is closed we dont even print it
-	if ($isJitarSet && !$authz->hasPermissions($problem->user_id, "view_unopened_sets") && is_jitar_problem_hidden($db, $problem->user_id, $setID, $problemID)) {
-		return '';
-	}
-
-	my $interactiveURL = $self->systemLink(
-		$urlpath->newFromModule("WeBWorK::ContentGenerator::Problem", $r,
-			courseID => $courseID, setID => $setID, problemID => $problemID ));
-
-	my $linkClasses = '';
-	my $interactive;
-
-	if ($problemLevel != 0) {
-		$linkClasses = "nested-problem-$problemLevel";
-	}
-
-	# if the problem is trestricted we show that it exists but its greyed out
-	if ($isJitarSet
-		&& !$authz->hasPermissions($problem->user_id, "view_unopened_sets")
-		&& is_jitar_problem_closed($db, $ce, $problem->user_id, $setID, $problemID))
-	{
-		$interactive = CGI::span({ class => $linkClasses . " disabled-problem text-nowrap" },
-			$r->maketext("Problem [_1]", $problemNumber));
-	} else {
-		$interactive = CGI::a({ href => $interactiveURL, class => $linkClasses . " text-nowrap" },
-			$r->maketext("Problem [_1]", $problemNumber));
-	}
-
-	my $attempts = $problem->num_correct + $problem->num_incorrect;
-	# a blank yields 'infinite' because it evaluates as false with out giving warnings about comparing non-numbers
-	my $remaining = ($problem->max_attempts || -1) < 0
-		? $r->maketext("unlimited")
-		: $problem->max_attempts - $attempts;
-
-	my $value = $problem->value;
-
-	$value = '' if ($isJitarSet && $problemLevel != 0
-		&& !$problem->counts_parent_grade);
-
-	my $rawStatus = 0;
-	$rawStatus = $problem->status;
-
-	my $status = eval{ wwRound(0, $rawStatus * 100).'%'}; # round to whole number
-	$status = 'unknown(FIXME)' if $@; # use a blank if problem status was not defined or not numeric.
-	# FIXME  -- this may not cover all cases.
-
-	my $adjustedStatus = '';
-	if (!$isJitarSet || $problemLevel == 0) {
-		$adjustedStatus = jitar_problem_adjusted_status($problem, $db);
-		$adjustedStatus = eval{wwRound(0, $adjustedStatus*100).'%'};
-	}
-
-	my $countsForParent = "";
-	if ($isJitarSet && $problemLevel != 0 ) {
-		$countsForParent = $problem->counts_parent_grade() ? $r->maketext('Yes') : $r->maketext('No');
-
-	}
-
-	my $graderLink = "";
-	if ($canScoreProblems && $self->{gradeableProblems}[$problemID]) {
-		my $gradeProblemPage = $urlpath->new(type => 'instructor_problem_grader',
-			args => { courseID => $courseID, setID => $setID, problemID => $problemID });
-		$graderLink = CGI::td(CGI::a({href => $self->systemLink($gradeProblemPage)}, $r->maketext("Grade Problem")));
-	} elsif ($canScoreProblems) {
-		$graderLink = CGI::td('');
-	}
-
-	my $problemRow = [CGI::td($interactive),
-		CGI::td([
-				$attempts,
-				$remaining,
-				$value,
-				$status])];
-	if ($isJitarSet) {
-		push @$problemRow, CGI::td($adjustedStatus);
-		push @$problemRow, CGI::td($countsForParent);
-	}
-
-	if ($canScoreProblems) {
-		push @$problemRow, $graderLink;
+		# Only show download link if work is not hidden.
+		# Only show version link if the set is open or if works is not hidden.
+		$data->{show_download} =
+			($verSet->hide_work eq 'N' || ($verSet->hide_work eq 'BeforeAnswerDate' && $timeNow >= $set->answer_date))
+			? 1
+			: 0;
+		$data->{show_link} = ($data->{status} =~ /Open/ || $data->{show_download});
+
+		$data->{score} = '';
+		# Only show score if user has permission and assignment has at least one submit.
+		if ($authz->hasPermissions($user, 'view_hidden_work')
+			|| ($verSet->hide_score eq 'N'                && $verSubmits >= 1)
+			|| ($verSet->hide_score eq 'BeforeAnswerDate' && $timeNow > $set->answer_date))
+		{
+			my ($total, $possible) = grade_set($db, $verSet, $effectiveUser, 1);
+			$total = wwRound(2, $total);
+			$data->{score} = "$total/$possible";
+		}
+		push @versionData, $data;
 	}
 
-	return CGI::Tr({}, @$problemRow);
+	return $c->include(
+		'ContentGenerator/ProblemSet/version_list',
+		continueVersion  => $continueVersion,
+		continueTimeLeft => $continueTimeLeft,
+		timeLimit        => $timeLimit,
+		timeInterval     => $timeInterval,
+		timeNow          => $timeNow,
+		lastTime         => $lastTime,
+		setVersions      => \@setVersions,
+		versionData      => \@versionData,
+		currentVersions  => $currentVersions
+	);
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/ProblemSets.pm b/lib/WeBWorK/ContentGenerator/ProblemSets.pm
index 77bc5e7c19..ac06246e4b 100644
--- a/lib/WeBWorK/ContentGenerator/ProblemSets.pm
+++ b/lib/WeBWorK/ContentGenerator/ProblemSets.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,8 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::ProblemSets;
-use base qw(WeBWorK);
-use base qw(WeBWorK::ContentGenerator);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 =head1 NAME
 
@@ -23,498 +22,323 @@ WeBWorK::ContentGenerator::ProblemSets - Display a list of built problem sets.
 
 =cut
 
-use strict;
-use warnings;
-#use CGI qw(-nosticky );
-use WeBWorK::CGI;
 use WeBWorK::Debug;
-use WeBWorK::Utils qw(after readFile sortByName path_is_subdir is_restricted wwRound format_set_name_display);
+use WeBWorK::Utils qw(after readFile sortByName path_is_subdir is_restricted format_set_name_display);
 use WeBWorK::Localize;
-# what do we consider a "recent" problem set?
-use constant RECENT => 2*7*24*60*60 ; # Two-Weeks in seconds
-# the "default" data in the course_info.txt file
-use constant DEFAULT_COURSE_INFO_TXT => "Put information about your course here.  Click the edit button above to add your own message.\n";
-
-
-sub if_can {
-  my ($self, $arg) = @_;
-
-  if ($arg ne 'info') {
-    return $self->can($arg) ? 1 : 0;
-  } else {
-    my $r = $self->r;
-    my $ce = $r->ce;
-    my $urlpath = $r->urlpath;
-    my $authz = $r->authz;
-    my $user = $r->param("user");
-
-    # we only print the info box if the viewer has permission
-    # to edit it or if its not the standard template box.
-
-    my $course_info_path = $ce->{courseDirs}->{templates} . "/"
-      . $ce->{courseFiles}->{course_info};
-    my $text = DEFAULT_COURSE_INFO_TXT;
-
-    if (-f $course_info_path) { #check that it's a plain  file
-      $text = eval { readFile($course_info_path) };
-    }
-    return $authz->hasPermissions($user, "access_instructor_tools") ||
-	  $text ne DEFAULT_COURSE_INFO_TXT;
-
-  }
-}
 
-sub info {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $urlpath = $r->urlpath;
-	my $authz = $r->authz;
-
-	my $courseID = $urlpath->arg("courseID");
-	my $user = $r->param("user");
-
-	my $course_info = $ce->{courseFiles}->{course_info};
-
-	if (defined $course_info and $course_info) {
-		my $course_info_path = $ce->{courseDirs}->{templates} . "/$course_info";
-
-		# deal with instructor crap
-		my $editorURL;
-		if ($authz->hasPermissions($user, "access_instructor_tools")) {
-			if (defined $r->param("editMode") and $r->param("editMode") eq "temporaryFile") {
-				$course_info_path = $r->param("sourceFilePath");
-				$course_info_path = $ce->{courseDirs}{templates}.'/'.$course_info_path unless $course_info_path =~ m!^/!;
-				die "sourceFilePath is unsafe!" unless path_is_subdir($course_info_path, $ce->{courseDirs}->{templates});
-				$self->addmessage(CGI::div({class=>'temporaryFile'}, $r->maketext("Viewing temporary file:").' ', $course_info_path));
-			}
+# What do we consider a "recent" problem set?
+use constant RECENT => 2 * 7 * 24 * 60 * 60;    # Two-Weeks in seconds
 
-			my $editorPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",  $r, courseID => $courseID);
-			$editorURL = $self->systemLink($editorPage, params => { file_type => "course_info" });
-		}
+# The "default" data in the course_info.txt file.
+use constant DEFAULT_COURSE_INFO_TXT =>
+	"Put information about your course here.  Click the edit button above to add your own message.\n";
 
-		if ($editorURL) {
-			print CGI::h2(
-				{ class => 'd-flex align-items-center justify-content-center' },
-				$r->maketext("Course Info"),
-				CGI::a(
-					{ href => $editorURL, target => "WW_Editor", class => 'btn btn-sm btn-info m-1' },
-					$r->maketext("Edit")
-				)
-			);
-		} else {
-			print CGI::h2($r->maketext("Course Info"));
-		}
-		die "course info path is unsafe!" unless path_is_subdir($course_info_path, $ce->{courseDirs}->{templates}, 1);
-		if (-f $course_info_path) { #check that it's a plain  file
-			my $text = eval { readFile($course_info_path) };
-			if ($@) {
-				print CGI::div({ class => 'alert alert-danger p-1 mb-0' }, $@);
-			} else {
-				print $text;
-			}
-		}
+sub can ($c, $arg) {
+	if ($arg eq 'info') {
+		my $ce = $c->ce;
 
-		return "";
-	}
-}
+		# Only show the info box if the viewer has permission
+		# to edit it or if it is not the standard template box.
 
-sub templateName {
-	my $self = shift;
-	my $r = $self->r;
-	my $templateName = $r->param('templateName')//'system';
-	$self->{templateName}= $templateName;
-	$templateName;
-}
-sub initialize {
+		my $course_info_path = "$ce->{courseDirs}{templates}/$ce->{courseFiles}{course_info}";
 
+		my $text = DEFAULT_COURSE_INFO_TXT;
+		$text = eval { readFile($course_info_path) } if (-f $course_info_path);
 
+		return $c->authz->hasPermissions($c->param('user'), 'access_instructor_tools')
+			|| $text ne DEFAULT_COURSE_INFO_TXT;
+	}
 
-# get result and send to message
-	my ($self) = @_;
-	my $r = $self->r;
-	my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
+	return $c->SUPER::can($arg);
+}
 
-	my $user               = $r->param("user");
-	my $effectiveUser      = $r->param("effectiveUser");
-	if ($authz->hasPermissions($user, "access_instructor_tools")) {
-		# get result and send to message
-		my $status_message = $r->param("status_message");
-		$self->addmessage(CGI::p("$status_message")) if $status_message;
+sub initialize ($c) {
+	my $ce    = $c->ce;
+	my $authz = $c->authz;
 
+	my $user = $c->param('user');
 
-	}
-}
-sub body {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-
-	my $user            = $r->param("user");
-	my $effectiveUser   = $r->param("effectiveUser");
-	my $sort            = $r->param("sort") || "status";
-
-	my $courseName      = $urlpath->arg("courseID");
-
-	my $hardcopyPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Hardcopy",  $r, courseID => $courseName);
-	my $actionURL = $self->systemLink($hardcopyPage, authen => 0); # no authen info for form action
-
-	# If navigation is restricted, then don't show the body and instead display a
-	# message informing the user to access assignments via an LMS.
-	unless ($authz->hasPermissions($r->param('user'), 'navigation_allowed')) {
-		my $LMS = $ce->{LMS_url} ? CGI::a({ href => $ce->{LMS_url} }, $ce->{LMS_name}) : $ce->{LMS_name};
-		print CGI::div({ class => 'alert alert-danger' },
-			$r->maketext('You must access assignments from your Course Management System ([_1]).', $LMS));
-		return '';
+	if ($authz->hasPermissions($user, 'access_instructor_tools')) {
+		my $status_message = $c->param('status_message');
+		$c->addmessage($c->tag('p', $c->b($status_message))) if $status_message;
 	}
 
-	debug("Begin collecting merged sets");
-	my @sets = $db->getMergedSetsWhere({ user_id => $effectiveUser });
-
-	# Remove proctored gateway sets for users without permission to view them
-	my $viewPr = $authz->hasPermissions( $user, "view_proctored_tests" );
-	@sets = grep {$_->assignment_type !~ /proctored/ || $viewPr} @sets;
-
-	# set sort method
-	$sort = "status" unless $sort eq "status" or $sort eq "name";
-
-	# now set the headers for the table
-	my $nameHeader = $sort eq "name"
-		? CGI::span($r->maketext("Name"))
-		: CGI::a({href=>$self->systemLink($urlpath, params=>{sort=>"name"})}, $r->maketext("Name"));
-	my $statusHeader = $sort eq "status"
-		? CGI::span($r->maketext("Status"))
-		: CGI::a({href=>$self->systemLink($urlpath, params=>{sort=>"status"})}, $r->maketext("Status"));
-	# print the start of the form
-	if ($authz->hasPermissions($user, "view_multiple_sets")) {
-		print CGI::start_form(
-				-name => 'problem-sets-form',
-				-id => 'problem-sets-form',
-				-method => 'POST',
-				-action => $actionURL
-			),
-			$self->hidden_authen_fields;
-	}
+	if ($authz->hasPermissions($user, 'navigation_allowed')) {
+		debug('Begin collecting merged sets');
 
-	# and send the start of the table
-	# This table now contains a summary and a caption, scope attributes for the column headers, and no longer prints a
-	# column for 'Sel.' (due to it having been merged with the second column for accessibility purposes).
-	print CGI::start_div({ class => 'table-responsive' });
-	print CGI::start_table({ class    => 'problem_set_table table table-sm caption-top font-sm' });
-	print CGI::caption($r->maketext('Homework Sets'));
-
-	# Setlist table headers
-	print CGI::thead(CGI::Tr(
-		CGI::th({ -scope => 'col' }, $nameHeader),
-		CGI::th({ -scope => 'col' }, $statusHeader),
-		CGI::th(
-			{ -scope => 'col', class => 'hardcopy' },
-			CGI::i(
-				{
-					class       => 'icon far fa-arrow-alt-circle-down fa-lg',
-					aria_hidden => 'true',
-					title       => $r->maketext('Generate Hardcopy'),
-					data_alt    => $r->maketext('Generate Hardcopy')
-				},
-				''
-			)
-		),
-	));
+		my @sets = $c->db->getMergedSetsWhere({ user_id => $c->param('effectiveUser') || $user });
 
-	debug("Begin sorting merged sets");
+		# Remove proctored gateway sets for users without permission to view them
+		unless ($authz->hasPermissions($user, 'view_proctored_tests')) {
+			@sets = grep { $_->assignment_type !~ /proctored/ } @sets;
+		}
 
-	print CGI::start_tbody();
+		debug('Begin sorting merged sets');
 
-	if ( $sort eq 'name' ) {
-		@sets = sortByName("set_id", @sets);
-	} elsif ( $sort eq 'status' ) {
-		@sets = sort byUrgency (@sets);
-	}
+		if (($c->param('sort') || 'status') eq 'status') {
+			@sets = sort byUrgency (@sets);
+		} else {
+			# Assume sort by 'name' if the parameter was not set to status.
+			# This way there is no need to worry about an invalid parameter value.
+			@sets = sortByName('set_id', @sets);
+		}
 
-	debug("End preparing merged sets");
+		$c->stash->{sets} = \@sets;
 
-	# Regular sets and gateway template sets are merged, but sorted either by name or urgency.
-	# Versions are not shown here. Instead they are on the ProblemSet page for the gateway quiz.
-	for my $set (@sets) {
-		if ($set->visible || $authz->hasPermissions($user, "view_hidden_sets")) {
-			print $self->setListRow($set, $authz->hasPermissions($user, "view_multiple_sets"),
-				$authz->hasPermissions($user, "view_unopened_sets"), $db);
-		}
+		debug('End preparing merged sets');
 	}
 
-	print CGI::end_tbody();
-	print CGI::end_table(), CGI::end_div();
-	my $pl = ($authz->hasPermissions($user, "view_multiple_sets") ? "s" : "");
+	return unless $ce->{courseFiles}{course_info};
 
-	if ($authz->hasPermissions($user, 'view_multiple_sets')) {
-		print CGI::div({ class => 'mb-3' },
-			CGI::reset({ id => 'clear', value => $r->maketext('Deselect All Sets'), class => 'btn btn-info' })
-		);
-		print CGI::div({ class => 'mb-3' },
-			CGI::submit({
-				id    => 'hardcopy',
-				name  => 'hardcopy',
-				value => $r->maketext('Generate Hardcopy for Selected Sets'),
-				class => 'btn btn-info'
-			})
-		);
-		print CGI::end_form();
-	}
+	my $course_info_path = "$ce->{courseDirs}{templates}/$ce->{courseFiles}{course_info}";
 
-	print $self->feedbackMacro(
-		module => __PACKAGE__,
-		set => "",
-		problem => "",
-		displayMode => "",
-		showOldAnswers => "",
-		showCorrectAnswers => "",
-		showHints => "",
-		showSolutions => "",
-	);
+	if ($authz->hasPermissions($user, 'access_instructor_tools')) {
+		if (defined $c->param('editMode') && $c->param('editMode') eq 'temporaryFile') {
+			$course_info_path = $c->param('sourceFilePath');
+			$course_info_path = "$ce->{courseDirs}{templates}/$course_info_path"
+				unless $course_info_path =~ m!^/!;
 
-	return "";
-}
+			unless (path_is_subdir($course_info_path, $ce->{courseDirs}{templates})) {
+				$c->addbadmessage('sourceFilePath is unsafe!');
+				return '';
+			}
 
-# UPDATE - ghe3
-# this subroutine now combines the $control and $interactive elements, by using the $interactive element as the $control element's label.
+			$c->addmessage($c->tag(
+				'p',
+				class => 'temporaryFile',
+				$c->maketext('Viewing temporary file: [_1]', $course_info_path)
+			));
+		}
+	}
 
-sub setListRow {
-	my ($self, $set, $multiSet, $preOpenSets, $db) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $authz = $r->authz;
-	my $user = $r->param("user");
-	my $effectiveUser = $r->param("effectiveUser") || $user;
-	my $urlpath = $r->urlpath;
-	my $globalSet = $db->getGlobalSet($set->set_id);
-	my $gwtype = ($set->assignment_type() =~ /gateway/) ? 1 : 0;
+	if (-f $course_info_path) {
+		$c->stash->{course_info_contents} = eval { readFile($course_info_path) };
+		$c->stash->{course_info_error}    = $@ if $@;
+	}
 
-	my @restricted = $ce->{options}{enableConditionalRelease} ?
-		is_restricted($db, $set, $effectiveUser) : ();
-	# The set shouldn't be shown if the LTI grade mode is set to homework and we dont
-	# have a source did to use to send back grades.
-	my $LTIRestricted = defined($ce->{LTIGradeMode}) && $ce->{LTIGradeMode} eq 'homework'
-		&& !$set->lis_source_did;
+	return;
+}
+
+sub info ($c) {
+	return $c->include('ContentGenerator/ProblemSets/info');
+}
 
-	my $courseName      = $urlpath->arg("courseID");
+sub setListRow ($c, $set) {
+	my $ce            = $c->ce;
+	my $db            = $c->db;
+	my $authz         = $c->authz;
+	my $user          = $c->param('user');
+	my $effectiveUser = $c->param('effectiveUser') || $user;
+	my $globalSet     = $db->getGlobalSet($set->set_id);
+	my $gwtype        = ($set->assignment_type() =~ /gateway/) ? 1 : 0;
+	my $preOpenSets   = $authz->hasPermissions($user, 'view_unopened_sets');
 
-	my $problemSetPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSet", $r,
-				      courseID => $courseName, setID => $set->set_id);
+	my @restricted = $ce->{options}{enableConditionalRelease} ? is_restricted($db, $set, $effectiveUser) : ();
 
-	my $interactiveURL = $self->systemLink($problemSetPage);
+	my $courseName = $c->stash('courseID');
 
 	my $display_name = format_set_name_display($set->set_id);
-	# add clock icon if timed gateway
-	if ($gwtype && $set->{version_time_limit} > 0 && time < $set->due_date()) {
-		$display_name = CGI::i(
-			{
-				class => "icon far fa-clock",
-				-title => $r->maketext("Test/quiz with time limit."),
-				-data_alt => $r->maketext("Test/quiz with time limit.")
-			},
-			'') .
-			' ' .
-			CGI::span($display_name);
+
+	# Add clock icon if timed gateway
+	if ($gwtype && $set->{version_time_limit} > 0 && time < $set->due_date) {
+		$display_name = $c->c(
+			$c->tag(
+				'i',
+				class => 'icon far fa-clock',
+				title => $c->maketext('Test/quiz with time limit.'),
+				data  => { alt => $c->maketext('Test/quiz with time limit.') }
+			),
+			' ',
+			$c->tag('span', $display_name)
+		)->join('');
 	}
 
-	# this is the link to the homework assignment, it has tooltip with the hw description
-	my $interactive = CGI::a(
-		{
-			class             => 'set-id-tooltip',
-			data_bs_toggle    => 'tooltip',
-			data_bs_placement => 'right',
-			data_bs_title     => $globalSet->description(),
-			href              => $interactiveURL
-		},
-		$display_name
+	# This is the link to the set, it has tooltip with the set description.
+	my $interactive = $c->link_to(
+		$display_name => $c->systemLink($c->url_for('problem_list', setID => $set->set_id)),
+		class         => 'set-id-tooltip',
+		data          => { bs_toggle => 'tooltip', bs_placement => 'right', bs_title => $globalSet->description }
 	);
-	my $control = "";
 
-	my $setIsOpen = 0;
+	# Determine set status.
 	my $status = '';
-
-	# determine set status
 	if (time < $set->open_date) {
-		$status = $r->maketext("Will open on [_1].", $self->formatDateTime($set->open_date,undef,$ce->{studentDateDisplayFormat}));
+		$status = $c->maketext('Will open on [_1].',
+			$c->formatDateTime($set->open_date, undef, $ce->{studentDateDisplayFormat}));
 
 		if (@restricted) {
-			my $restriction = ($set->restricted_status)*100;
-			$status .= restricted_progression_msg($r,1,$restriction,@restricted);
+			$status =
+				$c->c($status, $c->restricted_progression_msg(1, $set->restricted_status * 100, @restricted))->join('');
 		}
-		$control = "" unless $preOpenSets;
 		$interactive = $display_name
 			unless $preOpenSets || ($gwtype && $db->countSetVersions($effectiveUser, $set->set_id));
 
 	} elsif (time < $set->due_date) {
-		$status = $self->set_due_msg($set,0);
+		$status = $c->set_due_msg($set);
 
 		if (@restricted) {
-			my $restriction = ($set->restricted_status)*100;
-			$control = "" unless $preOpenSets;
 			$interactive = $display_name unless $preOpenSets;
-			$status .= restricted_progression_msg($r,0,$restriction, @restricted);
-			$setIsOpen = 0;
-		} elsif ($LTIRestricted) {
+			$status =
+				$c->c($status, $c->restricted_progression_msg(0, $set->restricted_status * 100, @restricted))->join('');
+		} elsif (defined $ce->{LTIGradeMode} && $ce->{LTIGradeMode} eq 'homework' && !$set->lis_source_did) {
+			# The set shouldn't be shown if the LTI grade mode is set to homework and we don't
+			# have a source did to use to send back grades.
 			unless ($preOpenSets) {
-				my $LMS = $ce->{LMS_url} ? CGI::a({ href => $ce->{LMS_url} }, $ce->{LMS_name}) : $ce->{LMS_name};
-				$status .= CGI::br().$r->maketext(
-					"You must log into this set via your Learning Management System ([_1]).",
-					$LMS
-				);
-				$control = "";
+				$status = $c->c(
+					$status,
+					$c->tag('br'),
+					$c->maketext(
+						'You must log into this set via your Learning Management System ([_1]).',
+						$ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+						? $c->link_to(
+							$ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+							)
+						: $ce->{LTI}{ $ce->{LTIVersion} }{LMS_name}
+					)
+				)->join('');
 				$interactive = $display_name;
 			}
-			$setIsOpen = 0;
-		} else {
-			$setIsOpen = 1;
 		}
-
 	} elsif (time < $set->answer_date) {
-		$status = $r->maketext("Closed, answers on [_1].", $self->formatDateTime($set->answer_date,undef,$ce->{studentDateDisplayFormat}));
-	} elsif ($set->answer_date <= time and time < $set->answer_date +RECENT ) {
-		$status = $r->maketext("Closed, answers recently available.");
+		$status = $c->maketext('Closed, answers on [_1].',
+			$c->formatDateTime($set->answer_date, undef, $ce->{studentDateDisplayFormat}));
+	} elsif ($set->answer_date <= time and time < $set->answer_date + RECENT) {
+		$status = $c->maketext('Closed, answers recently available.');
 	} else {
-		$status = $r->maketext("Closed, answers available.");
+		$status = $c->maketext('Closed, answers available.');
 	}
 
-	if ($multiSet) {
-		if ( ! $gwtype ) {
-			$control = CGI::input({
-				type  => 'checkbox',
-				id    => $set->set_id,
-				name  => 'selected_sets',
-				value => $set->set_id,
-				class => 'form-check-input'
-			});
-			# make sure interactive is the label for control
-			$interactive = CGI::label({"for"=>$set->set_id}, $interactive);
-
+	my $control = '';
+	if (!$gwtype) {
+		if ($authz->hasPermissions($user, 'view_multiple_sets')) {
+			$control = $c->check_box(selected_sets => $set->set_id, id => $set->set_id, class => 'form-check-input');
+			# Make the interactive be the label for the control.
+			$interactive = $c->label_for($set->set_id => $interactive);
 		} else {
-			$control = '';
-		}
-	} else {
-		if ( ! $gwtype && after($set->open_date) && (!@restricted || after($set->due_date))) {
-			my $hardcopyPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Hardcopy", $r,
-				courseID => $courseName, setID => $set->set_id);
-			my $link = $self->systemLink($hardcopyPage, params => { selected_sets => $set->set_id });
-			$control = CGI::a(
-				{ class => 'hardcopy-link', href => $link },
-				CGI::i(
-					{
-						class       => 'hardcopy-tooltip icon far fa-arrow-alt-circle-down fa-lg',
-						aria_hidden => 'true',
-						title       => $r->maketext(
+			if (after($set->open_date) && (!@restricted || after($set->due_date))) {
+				$control = $c->link_to(
+					$c->tag(
+						'i',
+						class         => 'hardcopy-tooltip icon far fa-arrow-alt-circle-down fa-lg',
+						'aria-hidden' => 'true',
+						title         => $c->maketext(
 							'Download [_1]',
-							CGI::span({ dir => 'ltr' }, format_set_name_display($set->set_id))
+							$c->tag('span', dir => 'ltr', format_set_name_display($set->set_id))
 						),
-						data_alt => $r->maketext(
-							'Download [_1]',
-							CGI::span({ dir => 'ltr' }, format_set_name_display($set->set_id))
-						),
-						data_bs_toggle    => 'tooltip',
-						data_bs_placement => 'left',
-					},
-					''
-				)
-			);
-		} else {
-			$control = '';
+						data => {
+							alt => $c->maketext(
+								'Download [_1]',
+								$c->tag('span', dir => 'ltr', format_set_name_display($set->set_id))
+							),
+							bs_toggle    => 'tooltip',
+							bs_placement => 'left'
+						}
+					) => $c->systemLink(
+						$c->url_for('hardcopy', setID => $set->set_id),
+						params => { selected_sets => $set->set_id }
+					),
+					class => 'hardcopy-link',
+				);
+			}
 		}
 	}
 
-	my $visiblityStateClass = ($set->visible) ? "font-visible" : "font-hidden";
-	$status = CGI::span({class=>$visiblityStateClass}, $status) if $preOpenSets;
+	$status = $c->tag('span', class => $set->visible ? 'font-visible' : 'font-hidden', $status) if $preOpenSets;
 
-	return CGI::Tr(CGI::td({ dir => 'ltr' }, $interactive), CGI::td($status),
-		CGI::td({ class => "hardcopy" }, $control));
+	return $c->tag(
+		'tr',
+		$c->c(
+			$c->tag('td', dir => 'ltr', $interactive),
+			$c->tag('td', $status),
+			$c->tag('td', class => 'hardcopy', $control)
+		)->join('')
+	);
 }
 
-sub byname { $a->set_id cmp $b->set_id; }
+sub byname { return $a->set_id cmp $b->set_id; }
 
 sub byUrgency {
 	my $mytime = time;
-	my @a_parts = ($a->answer_date + RECENT <= $mytime) ?  (4, $a->open_date, $a->due_date, $a->set_id)
-		: ($a->answer_date <= $mytime and $mytime < $a->answer_date + RECENT) ? (3, $a-> answer_date, $a-> due_date, $a->set_id)
-		: ($a->due_date <= $mytime and $mytime < $a->answer_date ) ? (2, $a->answer_date, $a->due_date, $a->set_id)
-		: ($mytime < $a->open_date) ? (1, $a->open_date, $a->due_date, $a->set_id)
-		: (0, $a->due_date, $a->open_date, $a->set_id);
-	my @b_parts = ($b->answer_date + RECENT <= $mytime) ?  (4, $b->open_date, $b->due_date, $b->set_id)
-		: ($b->answer_date <= $mytime and $mytime < $b->answer_date + RECENT) ? (3, $b-> answer_date, $b-> due_date, $b->set_id)
-		: ($b->due_date <= $mytime and $mytime < $b->answer_date ) ? (2, $b->answer_date, $b->due_date, $b->set_id)
-		: ($mytime < $b->open_date) ? (1, $b->open_date, $b->due_date, $b->set_id)
-		: (0, $b->due_date, $b->open_date, $b->set_id);
-	my $returnIt=0;
+	my @a_parts =
+		($a->answer_date + RECENT <= $mytime) ? (4, $a->open_date, $a->due_date, $a->set_id)
+		: ($a->answer_date <= $mytime and $mytime < $a->answer_date + RECENT)
+		? (3, $a->answer_date, $a->due_date, $a->set_id)
+		: ($a->due_date <= $mytime and $mytime < $a->answer_date) ? (2, $a->answer_date, $a->due_date, $a->set_id)
+		: ($mytime < $a->open_date)                               ? (1, $a->open_date,   $a->due_date, $a->set_id)
+		:                                                           (0, $a->due_date, $a->open_date, $a->set_id);
+	my @b_parts =
+		($b->answer_date + RECENT <= $mytime) ? (4, $b->open_date, $b->due_date, $b->set_id)
+		: ($b->answer_date <= $mytime and $mytime < $b->answer_date + RECENT)
+		? (3, $b->answer_date, $b->due_date, $b->set_id)
+		: ($b->due_date <= $mytime and $mytime < $b->answer_date) ? (2, $b->answer_date, $b->due_date, $b->set_id)
+		: ($mytime < $b->open_date)                               ? (1, $b->open_date,   $b->due_date, $b->set_id)
+		:                                                           (0, $b->due_date, $b->open_date, $b->set_id);
+	my $returnIt = 0;
 	while (scalar(@a_parts) > 1) {
-		if ($returnIt = ( (shift @a_parts) <=> (shift @b_parts) ) ) {
-			return($returnIt);
+		if ($returnIt = ((shift @a_parts) <=> (shift @b_parts))) {
+			return ($returnIt);
 		}
 	}
-	return (  $a_parts[0] cmp  $b_parts[0] );
+	return ($a_parts[0] cmp $b_parts[0]);
 }
 
-sub check_sets {
-	my ($self,$db,$sets_string) = @_;
-	my @proposed_sets = split(/\s*,\s*/,$sets_string);
-	foreach(@proposed_sets) {
-	  return 0 unless $db->existsGlobalSet($_);
-	  return 1;
-	}
-}
+sub set_due_msg ($c, $set) {
+	my $ce = $c->ce;
+
+	my $enable_reduced_scoring =
+		$ce->{pg}{ansEvalDefaults}{enableReducedScoring}
+		&& $set->enable_reduced_scoring
+		&& $set->reduced_scoring_date
+		&& $set->reduced_scoring_date < $set->due_date;
+	my $reduced_scoring_date      = $set->reduced_scoring_date;
+	my $beginReducedScoringPeriod = $c->formatDateTime($reduced_scoring_date, undef, $ce->{studentDateDisplayFormat});
+
+	my $t = time;
+
+	if ($enable_reduced_scoring && $t < $reduced_scoring_date) {
+		return $c->c(
+			$c->maketext('Open, due [_1].', $beginReducedScoringPeriod),
+			$c->tag('br'),
+			$c->maketext(
+				'Afterward reduced credit can be earned until [_1].',
+				$c->formatDateTime($set->due_date(), undef, $ce->{studentDateDisplayFormat})
+			)
+		)->join('');
+	} else {
+		if ($enable_reduced_scoring && $reduced_scoring_date && $t > $reduced_scoring_date) {
+			return $c->c(
+				$c->maketext('Due date [_1] has passed.', $beginReducedScoringPeriod),
+				$c->tag('br'),
+				$c->maketext(
+					'Reduced credit can still be earned until [_1].',
+					$c->formatDateTime($set->due_date(), undef, $ce->{studentDateDisplayFormat})
+				)
+			)->join('');
+		}
 
-sub set_due_msg {
-  my $self = shift;
-  my $r = $self->r;
-  my $ce = $r->ce;
-  my $set = shift;
-  my $gwversion = shift;
-  my $status = '';
-
-  my $enable_reduced_scoring =  $ce->{pg}{ansEvalDefaults}{enableReducedScoring} && $set->enable_reduced_scoring && $set->reduced_scoring_date &&$set->reduced_scoring_date < $set->due_date;
-  my $reduced_scoring_date = $set->reduced_scoring_date;
-  my $beginReducedScoringPeriod =  $self->formatDateTime($reduced_scoring_date,undef,$ce->{studentDateDisplayFormat});
-
-  my $t = time;
-
-  if ($enable_reduced_scoring &&
-      $t < $reduced_scoring_date) {
-
-    $status .= $r->maketext("Open, due [_1].",$beginReducedScoringPeriod) . CGI::br() . $r->maketext("Afterward reduced credit can be earned until [_1].", $self->formatDateTime($set->due_date(),undef,$ce->{studentDateDisplayFormat}));
-  } else {
-    if ($gwversion) {
-      $status = $r->maketext("Open, complete by [_1].",  $self->formatDateTime($set->due_date(),undef,$ce->{studentDateDisplayFormat}));
-    } else {
-      $status = $r->maketext("Open, closes [_1].",  $self->formatDateTime($set->due_date(),undef,$ce->{studentDateDisplayFormat}));
-    }
-
-    if ($enable_reduced_scoring && $reduced_scoring_date &&
-	$t > $reduced_scoring_date) {
-      $status = $r->maketext("Due date [_1] has passed.",$beginReducedScoringPeriod) . CGI::br() . $r->maketext("Reduced credit can still be earned until [_1].", $self->formatDateTime($set->due_date(),undef,$ce->{studentDateDisplayFormat}));
-    }
-  }
-
-  return $status;
+		return $c->maketext('Open, closes [_1].',
+			$c->formatDateTime($set->due_date(), undef, $ce->{studentDateDisplayFormat}));
+	}
 }
 
+sub restricted_progression_msg ($c, $open, $restriction, @restricted) {
+	my $status = ' ';
 
-sub restricted_progression_msg {
-  my $r = shift;
-  my $open = shift;
-  my $restriction = shift;
-  my @restricted = @_;
-  my $status = ' ';
-
-  if (scalar(@restricted) == 1) {
-    $status .= $r->maketext("To access this set you must score at least [_1]% on set [_2].", sprintf("%.0f",$restriction), @restricted);
-  } else {
-    $status .= $r->maketext("To access this set you must score at least [_1]% on the following sets: [_2].", sprintf("%.0f",$restriction), join(', ', @restricted));
-  }
+	if (@restricted == 1) {
+		$status .= $c->maketext(
+			'To access this set you must score at least [_1]% on set [_2].',
+			sprintf('%.0f', $restriction),
+			$c->tag('span', dir => 'ltr', format_set_name_display($restricted[0]))
+		);
+	} else {
+		$status .= $c->maketext(
+			'To access this set you must score at least [_1]% on the following sets: [_2].',
+			sprintf('%.0f', $restriction),
+			join(', ', map { $c->tag('span', dir => 'ltr', format_set_name_display($_)) } @restricted)
+		);
+	}
 
-  return $status;
+	return $status;
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm b/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm
deleted file mode 100644
index ea1982007a..0000000000
--- a/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm
+++ /dev/null
@@ -1,651 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-# Created to house most output subroutines for Problem.pm to make that module more lightweight
-# Now mostly defunct due to having moved most of the output declarations to the template
-# -ghe3
-
-package WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil;
-use base qw(WeBWorK);
-use base qw(WeBWorK::ContentGenerator);
-
-=head1 NAME
-
-WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil - contains a bunch of subroutines for generating output for the problem pages, especially those generated by Problem.pm
-
-=cut
-
-use strict;
-use warnings;
-#use CGI qw(-nosticky );
-use WeBWorK::CGI;
-use File::Path qw(rmtree);
-use WeBWorK::Debug;
-use WeBWorK::Form;
-use WeBWorK::PG;
-use WeBWorK::PG::ImageGenerator;
-use WeBWorK::PG::IO;
-use WeBWorK::Utils qw(readFile writeLog writeCourseLog encodeAnswers decodeAnswers
-	ref2string makeTempDirectory path_is_subdir sortByName before after between jitar_problem_adjusted_status jitar_id_to_seq);
-use WeBWorK::DB::Utils qw(global2user user2global);
-use URI::Escape;
-use WeBWorK::Authen::LTIAdvanced::SubmitGrade;
-use WeBWorK::Utils::Tasks qw(fake_set fake_problem);
-
-use Email::Stuffer;
-use Try::Tiny;
-
-use Caliper::Sensor;
-use Caliper::Entity;
-
-
-# process_and_log_answer subroutine.
-
-# performs functions of processing and recording the answer given in the page.
-# Also returns the appropriate scoreRecordedMessage.
-
-sub process_and_log_answer{
-
-	my $self = shift;  #type is ref($self) eq 'WeBWorK::ContentGenerator::Problem'
-	my $r = $self->r;
-	my $db = $r->db;
-	my $effectiveUser = $r->param('effectiveUser');
-	my $authz = $r->authz;
-
-
-	my %will = %{ $self->{will} };
-	my $submitAnswers = $self->{submitAnswers};
-	my $problem = $self->{problem};
-	my $pg = $self->{pg};
-	my $set = $self->{set};
-	my $urlpath = $r->urlpath;
-	my $courseID = $urlpath->arg("courseID");
-
-	# logging student answers
-	my $pureProblem = $db->getUserProblem($problem->user_id, $problem->set_id, $problem->problem_id); # checked
-	my $answer_log    = $self->{ce}->{courseFiles}->{logs}->{'answer_log'};
-
-    my ($encoded_last_answer_string, $scores2, $isEssay2);
-	my $scoreRecordedMessage = "";
-
-	if (defined($answer_log) && defined($pureProblem) && $submitAnswers) {
-		my $past_answers_string;
-		($past_answers_string, $encoded_last_answer_string, $scores2, $isEssay2) =
-			WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::create_ans_str_from_responses($self, $pg);
-
-		if (!$authz->hasPermissions($effectiveUser, "dont_log_past_answers")) {
-			# store in answer_log
-			my $timestamp = time();
-			writeCourseLog($self->{ce}, "answer_log",
-				join("",
-					'|', $problem->user_id,
-					'|', $problem->set_id,
-					'|', $problem->problem_id,
-					'|', $scores2, "\t",
-					$timestamp,"\t",
-					$past_answers_string,
-				),
-			);
-
-			# add to PastAnswer db
-			my $pastAnswer = $db->newPastAnswer();
-			$pastAnswer->course_id($courseID);
-			$pastAnswer->user_id($problem->user_id);
-			$pastAnswer->set_id($problem->set_id);
-			$pastAnswer->problem_id($problem->problem_id);
-			$pastAnswer->timestamp($timestamp);
-			$pastAnswer->scores($scores2);
-			$pastAnswer->answer_string($past_answers_string);
-			$pastAnswer->source_file($problem->source_file);
-			$db->addPastAnswer($pastAnswer);
-		}
-	}
-
-######################################################################
-# this stores previous answers to the problem to
-# provide "sticky answers"
-
-	if ($submitAnswers) {
-		# get a "pure" (unmerged) UserProblem to modify
-		# this will be undefined if the problem has not been assigned to this user
-
-		if (defined $pureProblem) {
-			# store answers in DB for sticky answers
-			my %answersToStore;
-
-			# store last answer to database for use in "sticky" answers
-			$problem->last_answer($encoded_last_answer_string);
-			$pureProblem->last_answer($encoded_last_answer_string);
-			$db->putUserProblem($pureProblem);
-
-			# store state in DB if it makes sense
-			if ($will{recordAnswers}) {
-				$problem->status($pg->{state}->{recorded_score});
-				$problem->sub_status($pg->{state}->{sub_recorded_score});
-				$problem->attempted(1);
-				$problem->num_correct($pg->{state}->{num_of_correct_ans});
-				$problem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
-				$pureProblem->status($pg->{state}->{recorded_score});
-				$pureProblem->sub_status($pg->{state}->{sub_recorded_score});
-				$pureProblem->attempted(1);
-				$pureProblem->num_correct($pg->{state}->{num_of_correct_ans});
-				$pureProblem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
-
-				#add flags for an essay question.  If its an essay question and
-				# we are submitting then there could be potential changes, and it should
-				# be flaged as needing grading
-				# we shoudl also check for the appropriate flag in the global problem and set it
-
-				if ($isEssay2 && $pureProblem->{flags} !~ /needs_grading/) {
-				    $pureProblem->{flags} =~ s/graded,//;
-				    $pureProblem->{flags} .= "needs_grading,";
-				}
-
-				my $globalProblem = $db->getGlobalProblem($problem->set_id, $problem->problem_id);
-				if ($isEssay2 && $globalProblem->{flags} !~ /essay/) {
-				    $globalProblem->{flags} .= "essay,";
-				    $db->putGlobalProblem($globalProblem);
-				} elsif (!$isEssay2 && $globalProblem->{flags} =~ /essay/) {
-				    $globalProblem->{flags} =~ s/essay,//;
-				    $db->putGlobalProblem($globalProblem);
-				}
-
-				if ($db->putUserProblem($pureProblem)) {
-					$scoreRecordedMessage = $r->maketext("Your score was recorded.");
-				} else {
-					$scoreRecordedMessage = $r->maketext("Your score was not recorded because there was a failure in storing the problem record to the database.");
-				}
-				# write to the transaction log, just to make sure
-				writeLog($self->{ce}, "transaction",
-					$problem->problem_id."\t".
-					$problem->set_id."\t".
-					$problem->user_id."\t".
-					$problem->source_file."\t".
-					$problem->value."\t".
-					$problem->max_attempts."\t".
-					$problem->problem_seed."\t".
-					$pureProblem->status."\t".
-					$pureProblem->attempted."\t".
-					$pureProblem->last_answer."\t".
-					$pureProblem->num_correct."\t".
-					$pureProblem->num_incorrect
-					);
-
-				my $caliper_sensor = Caliper::Sensor->new($self->{ce});
-				if ($caliper_sensor->caliperEnabled() && defined($answer_log) && !$authz->hasPermissions($effectiveUser, "dont_log_past_answers")) {
-					my $startTime = $r->param('startTime');
-					my $endTime = time();
-
-					my $completed_question_event = {
-						'type' => 'AssessmentItemEvent',
-						'action' => 'Completed',
-						'profile' => 'AssessmentProfile',
-						'object' => Caliper::Entity::problem_user(
-							$self->{ce},
-							$db,
-							$problem->set_id(),
-							0, #version is 0 for non-gateway problems
-							$problem->problem_id(),
-							$problem->user_id(),
-							$pg
-						),
-						'generated' => Caliper::Entity::answer(
-							$self->{ce},
-							$db,
-							$problem->set_id(),
-							0, #version is 0 for non-gateway problems
-							$problem->problem_id(),
-							$problem->user_id(),
-							$pg,
-							$startTime,
-							$endTime
-						),
-					};
-					my $submitted_set_event = {
-						'type' => 'AssessmentEvent',
-						'action' => 'Submitted',
-						'profile' => 'AssessmentProfile',
-						'object' => Caliper::Entity::problem_set(
-							$self->{ce},
-							$db,
-							$problem->set_id()
-						),
-						'generated' => Caliper::Entity::problem_set_attempt(
-							$self->{ce},
-							$db,
-							$problem->set_id(),
-							0, #version is 0 for non-gateway problems
-							$problem->user_id(),
-							$startTime,
-							$endTime
-						),
-					};
-					my $tool_use_event = {
-						'type' => 'ToolUseEvent',
-						'action' => 'Used',
-						'profile' => 'ToolUseProfile',
-						'object' => Caliper::Entity::webwork_app(),
-					};
-					$caliper_sensor->sendEvents($r, [$completed_question_event, $submitted_set_event, $tool_use_event]);
-
-					# reset start time
-					$r->param('startTime', '');
-				}
-
-				#Try to update the student score on the LMS
-				# if that option is enabled.
-				my $LTIGradeMode = $self->{ce}{LTIGradeMode} // '';
-				if ($LTIGradeMode && $self->{ce}{LTIGradeOnSubmit}) {
-					my $grader = WeBWorK::Authen::LTIAdvanced::SubmitGrade->new($r);
-					if ($LTIGradeMode eq 'course') {
-						if ($grader->submit_course_grade($problem->user_id)) {
-							$scoreRecordedMessage .=
-								CGI::br() . $r->maketext('Your score was successfully sent to the LMS.');
-						} else {
-							$scoreRecordedMessage .=
-								CGI::br() . $r->maketext('Your score was not successfully sent to the LMS.');
-						}
-					} elsif ($LTIGradeMode eq 'homework') {
-						if ($grader->submit_set_grade($problem->user_id, $problem->set_id)) {
-							$scoreRecordedMessage .=
-								CGI::br() . $r->maketext('Your score was successfully sent to the LMS.');
-						} else {
-							$scoreRecordedMessage .=
-								CGI::br() . $r->maketext('Your score was not successfully sent to the LMS.');
-						}
-					}
-				}
-			} else {
-				if (before($set->open_date) or after($set->due_date)) {
-					$scoreRecordedMessage = $r->maketext("Your score was not recorded because this homework set is closed.");
-				} else {
-					$scoreRecordedMessage = $r->maketext("Your score was not recorded.");
-				}
-			}
-		} else {
-			$scoreRecordedMessage = $r->maketext("Your score was not recorded because this problem has not been assigned to you.");
-		}
-	}
-
-
-	$self->{scoreRecordedMessage} = $scoreRecordedMessage;
-	return $scoreRecordedMessage;
-}
-
-# create answer string from responses hash
-# ($past_answers_string, $encoded_last_answer_string, $scores, $isEssay) = create_ans_str_from_responses($problem, $pg)
-#
-# input: ref($pg)eq 'WeBWorK::PG::Local'
-#        ref($problem)eq 'WeBWorK::ContentGenerator::Problem
-# output:  (str, str, str)
-
-
-# 2020_05 MEG  -- previous version seems to have omitted saving $pg->{flags}->{KEPT_EXTRA_ANSWERS} which also
-# labels stored in $PG->{PERSISTANCE_HASH}
-# 2020_05a MEG -- past_answers_string is being created for use in the past_answer table
-# and other persistant objects need not be included.
-# The extra persistence objects do need to be included in problem->last_answer
-# in order to keep those objects persistant -- as long as RECORD_FORM_ANSWER
-# is used to preserve objects by piggy backing on the persistence mechanism for answers.
-
-sub create_ans_str_from_responses {
-	my $problem = shift;  #  ref($problem) eq 'WeBWorK::ContentGenerator::Problem'
-	                   	  #  must contain $self->{formFields}->{$response_id}
-	my $pg = shift;       # ref($pg) eq 'WeBWorK::PG::Local'
-	#warn "create_ans_str_from_responses pg has type ", ref($pg);
-	my $scores2='';
-	my $isEssay2=0;
-	my %answers_to_store;
-	my @past_answers_order;
-	my @last_answer_order;
-
-	my %pg_answers_hash = %{ $pg->{pgcore}->{PG_ANSWERS_HASH}};
-	foreach my $ans_id (@{$pg->{flags}->{ANSWER_ENTRY_ORDER}//[]} ) {
-		$scores2.= ($pg_answers_hash{$ans_id}->{ans_eval}{rh_ans}{score}//0) >= 1 ? "1" : "0";
-		$isEssay2 = 1 if ($pg_answers_hash{$ans_id}->{ans_eval}{rh_ans}{type}//'') eq 'essay';
-		foreach my $response_id ($pg_answers_hash{$ans_id}->response_obj->response_labels) {
-			$answers_to_store{$response_id} = $problem->{formFields}->{$response_id};
-			push @past_answers_order, $response_id;
-			push @last_answer_order, $response_id;
-		 }
-	}
-	# KEPT_EXTRA_ANSWERS need to be stored in last_answer in order to preserve persistence items
-	# the persistence items do not need to be stored in past_answers_string
-	foreach my $entry_id (@{ $pg->{flags}->{KEPT_EXTRA_ANSWERS} }) {
-		next if exists( $answers_to_store{$entry_id}  );
-		$answers_to_store{$entry_id}= $problem->{formFields}->{$entry_id};
-		push @last_answer_order, $entry_id;
-	}
-
-	my $past_answers_string = '';
-	foreach my $response_id (@past_answers_order) {
-		$past_answers_string.=($answers_to_store{$response_id}//'')."\t";
-	}
-	$past_answers_string=~s/\t$//; # remove last tab
-
-	my $encoded_last_answer_string = encodeAnswers(%answers_to_store,
-							 @last_answer_order);
-	# warn "$encoded_last_answer_string", $encoded_last_answer_string;
-    # past_answers_string is stored in past_answer table
-    # encoded_last_answer_string is used in `last_answer` entry of the problem_user table
-	return ($past_answers_string,$encoded_last_answer_string, $scores2,$isEssay2);
-}
-
-# process_editorLink subroutine
-
-# Creates and returns the proper editor link for the current website.  Also checks for translation errors and prints an error message and returning a false value if one is detected.
-
-sub process_editorLink{
-
-	my $self = shift;
-
-	my $set = $self->{set};
-	my $problem = $self->{problem};
-	my $pg = $self->{pg};
-
-	my $r = $self->r;
-
-	my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-	my $user = $r->param('user');
-
-	my $courseName = $urlpath->arg("courseID");
-
-	# FIXME: move editor link to top, next to problem number.
-	# format as "[edit]" like we're doing with course info file, etc.
-	# add edit link for set as well.
-	my $editorLink = "";
-	# if we are here without a real homework set, carry that through
-	my $forced_field = [];
-	$forced_field = ['sourceFilePath' =>  $r->param("sourceFilePath")] if
-		($set->set_id eq 'Undefined_Set');
-	if ($authz->hasPermissions($user, "modify_problem_sets")) {
-		my $editorPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",
-			courseID => $courseName, setID => $set->set_id, problemID => $problem->problem_id);
-		my $editorURL = $self->systemLink($editorPage, params=>$forced_field);
-		$editorLink = CGI::p(CGI::a({href=>$editorURL,target =>'WW_Editor'}, "Edit this problem"));
-	}
-
-	##### translation errors? #####
-
-	if ($pg->{flags}->{error_flag}) {
-		if ($authz->hasPermissions($user, "view_problem_debugging_info")) {
-			print $self->errorOutput($pg->{errors}, $pg->{body_text});
-		} else {
-			print $self->errorOutput($pg->{errors}, "You do not have permission to view the details of this error.");
-		}
-		print $editorLink;
-		return "permission_error";
-	}
-	else{
-		return $editorLink;
-	}
-}
-
-# output_main_form subroutine.
-
-# prints out the main form for the page.  This particular subroutine also takes in $editorLink and $scoreRecordedMessage
-# as required parameters.  Also prints out the score summary where applicable.
-
-sub output_main_form{
-
-	my $self = shift;
-	my $editorLink = shift;
-
-	my $r = $self->r;
-	my $pg = $self->{pg};
-	my $problem = $self->{problem};
-	my $set = $self->{set};
-	my $submitAnswers = $self->{submitAnswers};
-	my $startTime = $r->param('startTime') || time();
-
-	my $db = $r->db;
-	my $ce = $r->ce;
-	my $user = $r->param('user');
-	my $effectiveUser = $r->{'effectiveUser'};
-
-	my %can = %{ $self->{can} };
-	my %will = %{ $self->{will} };
-
-	print "\n";
-	print CGI::start_form({
-		method  => "POST",
-		action  => $r->uri,
-		name    => "problemMainForm",
-		class   => 'problem-main-form'
-	});
-	print $self->hidden_authen_fields;
-	print CGI::hidden({-name=>'startTime', -value=>$startTime});
-	print CGI::end_form();
-}
-
-# output_footer subroutine
-
-# prints out the footer elements to the page.
-
-sub output_footer{
-
-	my $self = shift;
-	my $r = $self->r;
-	my $problem = $self->{problem};
-	my $pg = $self->{pg};
-	my %will = %{ $self->{will} };
-
-	my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-	my $user = $r->param('user');
-
-	my $courseName = $urlpath->arg("courseID");
-
-	print CGI::start_div({class=>"problemFooter"});
-
-
-	my $pastAnswersPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::ShowAnswers",
-		courseID => $courseName);
-	my $showPastAnswersURL = $self->systemLink($pastAnswersPage, authen => 0); # no authen info for form action
-
-	# print answer inspection button
-	if ($authz->hasPermissions($user, "view_answers")) {
-		print "\n",
-			CGI::start_form(-method=>"POST",-action=>$showPastAnswersURL,-target=>"WW_Info"),"\n",
-			$self->hidden_authen_fields,"\n",
-			CGI::hidden(-name => 'courseID',  -value=>$courseName), "\n",
-			CGI::hidden(-name => 'problemID', -value=>$problem->problem_id), "\n",
-			CGI::hidden(-name => 'setID',  -value=>$problem->set_id), "\n",
-			CGI::hidden(-name => 'studentUser',    -value=>$problem->user_id), "\n",
-			CGI::p({ -align=>"left" },
-				CGI::submit({ name => 'action',  value => 'Show Past Answers', class => 'btn btn-primary' })
-			), "\n",
-			CGI::end_form();
-	}
-
-
-	print $self->feedbackMacro(
-		module             => __PACKAGE__,
-		courseId           => $courseName,
-		set                => $self->{set}->set_id,
-		problem            => $problem->problem_id,
-		problemPath        => $problem->source_file,
-		randomSeed         => $problem->problem_seed,
-		emailAddress       => join(";",$self->fetchEmailRecipients('receive_feedback',$user)),
-		emailableURL       => $self->generateURLs(url_type => 'absolute',
-		                                          set_id => $self->{set}->set_id,
-		                                          problem_id => $problem->problem_id),
-		studentName        => $user->full_name,
-		displayMode        => $self->{displayMode},
-		showOldAnswers     => $will{showOldAnswers},
-		showCorrectAnswers => $will{showCorrectAnswers},
-		showHints          => $will{showHints},
-		showSolutions      => $will{showSolutions},
-		pg_object          => $pg,
-	);
-
-	print CGI::end_div();
-}
-
-# check_invalid subroutine
-
-# checks to see if the current problem set is valid for the current user, returns "valid" if it is and an error message if it's not.
-
-sub check_invalid{
-
-	my $self = shift;
-	my $r = $self->r;
-	my $urlpath = $r->urlpath;
-	my $effectiveUser = $r->param('effectiveUser');
-
-	if ($self->{invalidSet}) {
-		return CGI::div(
-			{ class => 'alert alert-danger' },
-			CGI::p(
-				"The selected problem set (" . $urlpath->arg("setID") . ") is not " . "a valid set for $effectiveUser:"
-			),
-			CGI::p($self->{invalidSet})
-		);
-	} elsif ($self->{invalidProblem}) {
-		return CGI::div(
-			{ class => 'alert alert-danger' },
-			CGI::p(
-				"The selected problem ("
-					. $urlpath->arg("problemID")
-					. ") is not a valid problem for set "
-					. $self->{set}->set_id . "."
-			)
-		);
-	} else {
-		return "valid";
-	}
-
-}
-
-sub test{
-	print "test";
-}
-
-# if you provide this subroutine with a userProblem it will notify the
-# instructors of the course that the student has finished the problem,
-# and its children, and did not get 100%
-sub jitar_send_warning_email {
-    my $self = shift;
-    my $userProblem = shift;
-
-    my $r= $self->r;
-    my $ce = $r->ce;
-    my $db = $r->db;
-    my $authz = $r->authz;
-    my $urlpath    = $r->urlpath;
-    my $courseID = $urlpath->arg("courseID");
-    my $userID = $userProblem->user_id;
-    my $setID = $userProblem->set_id;
-    my $problemID = $userProblem->problem_id;
-
-    my $status = jitar_problem_adjusted_status($userProblem,$r->db);
-    $status = eval{ sprintf("%.0f%%", $status * 100)}; # round to whole number
-
-    my $user = $db->getUser($userID);
-
-    debug("Couldn't get user $userID from database") unless $user;
-
-    my $emailableURL = $self->systemLink(
-	$urlpath->newFromModule("WeBWorK::ContentGenerator::Problem", $r,
-				courseID => $courseID, setID => $setID, problemID => $problemID), params=>{effectiveUser=>$userID}, use_abs_url=>1);
-
-
-	  my @recipients = $self->fetchEmailRecipients("score_sets", $user);
-        # send to all users with permission to score_sets and an email address
-
-    my $sender;
-	if ($user->email_address) {
-		$sender = $user->rfc822_mailbox;
-	} elsif ($user->full_name) {
-		$sender = $user->full_name;
-	} else {
-		$sender = $userID;
-	}
-
-    $problemID = join('.',jitar_id_to_seq($problemID));
-
-    my %subject_map = (
-	'c' => $courseID,
-	'u' => $userID,
-	's' => $setID,
-	'p' => $problemID,
-	'x' => $user->section,
-	'r' => $user->recitation,
-	'%' => '%',
-	);
-    my $chars = join("", keys %subject_map);
-    my $subject = $ce->{mail}{feedbackSubjectFormat}
-    || "WeBWorK question from %c: %u set %s/prob %p"; # default if not entered
-    $subject =~ s/%([$chars])/defined $subject_map{$1} ? $subject_map{$1} : ""/eg;
-
-    my $full_name = $user->full_name;
-    my $email_address = $user->email_address;
-    my $student_id = $user->student_id;
-    my $section = $user->section;
-    my $recitation = $user->recitation;
-    my $comment = $user->comment;
-
-    # print message
-my $msg = qq/
-This  message was automatically generated by WeBWorK.
-
-User $full_name ($userID) has not sucessfully completed the review for problem $problemID in set $setID.  Their final adjusted score on the problem is $status.
-
-Click this link to visit the problem: $emailableURL
-
-User ID:    $userID
-Name:       $full_name
-Email:      $email_address
-Student ID: $student_id
-Section:    $section
-Recitation: $recitation
-Comment:    $comment
-/;
-
-	my $email = Email::Stuffer->to(join(",", @recipients))->from($sender)->subject($subject)->text_body($msg);
-
-	# Extra headers
-	$email->header('X-WeBWorK-Course: ', $courseID) if defined $courseID;
-	if ($user) {
-		$email->header('X-WeBWorK-User: ',       $user->user_id);
-		$email->header('X-WeBWorK-Section: ',    $user->section);
-		$email->header('X-WeBWorK-Recitation: ', $user->recitation);
-	}
-	$email->header('X-WeBWorK-Set: ',     $setID)     if defined $setID;
-	$email->header('X-WeBWorK-Problem: ', $problemID) if defined $problemID;
-
-	# $ce->{mail}{set_return_path} is the address used to report returned email if defined and non empty.
-	# It is an argument used in sendmail() (aka Email::Stuffer::send_or_die).
-	# For arcane historical reasons sendmail actually sets the field "MAIL FROM" and the smtp server then
-	# uses that to set "Return-Path".
-	# references:
-	#  https://stackoverflow.com/questions/1235534/what-is-the-behavior-difference-between-return-path-reply-to-and-from
-	#  https://metacpan.org/pod/Email::Sender::Manual::QuickStart#envelope-information
-	try {
-		$email->send_or_die({
-				# createEmailSenderTransportSMTP is defined in ContentGenerator
-				transport => $self->createEmailSenderTransportSMTP(),
-				$ce->{mail}{set_return_path} ? (from => $ce->{mail}{set_return_path}) : ()
-			});
-		debug('Successfully sent JITAR alert message');
-	} catch {
-		$r->log_error("Failed to send JITAR alert message: $_");
-	};
-
-    return '';
-}
-
-1;
diff --git a/lib/WeBWorK/ContentGenerator/ProctoredGatewayQuiz.pm b/lib/WeBWorK/ContentGenerator/ProctoredGatewayQuiz.pm
index b2dcdd46c6..641f843902 100644
--- a/lib/WeBWorK/ContentGenerator/ProctoredGatewayQuiz.pm
+++ b/lib/WeBWorK/ContentGenerator/ProctoredGatewayQuiz.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,14 +14,13 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::ProctoredGatewayQuiz;
-use base qw(WeBWorK::ContentGenerator::GatewayQuiz);
+use Mojo::Base 'WeBWorK::ContentGenerator::GatewayQuiz', -signatures;
 
 =head1 NAME
 
-WeBWorK::ContentGenerator::ProctoredGatewayQuiz - 
+WeBWorK::ContentGenerator::ProctoredGatewayQuiz -
 this is a wrapper for GatewayQuiz.pm and has no content
 
 =cut
 
-
 1;
diff --git a/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm b/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm
new file mode 100644
index 0000000000..baa17c4625
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm
@@ -0,0 +1,73 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ContentGenerator::RenderViaRPC;
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures, -async_await;
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::RenderViaRPC - This is a content generator that
+processes requests for problem rendering via remote procedure calls to the
+webwork webservice.
+
+=head1 Description
+
+Receives WeBWorK requests presented as HTML forms, containing the requisite
+information for rendering a problem.  This package checks that authentication
+succeeded, calls WebworkWebservice::RenderProblem::renderProblem, and then
+passes its return value to FormatRenderedProblem::formatRenderedProblem.  The
+result is returned in the JSON or HTML format as determined by the request type.
+
+=cut
+
+use WebworkWebservice;
+
+async sub pre_header_initialize ($c) {
+	$c->{wantsjson} = ($c->param('outputformat') // '') eq 'json' || ($c->param('send_pg_flags') // 0);
+
+	unless ($c->authen->was_verified) {
+		$c->{output} =
+			$c->{wantsjson}
+			? { error => $c->maketext('Authentication failed. Log in again to continue.') }
+			: $c->maketext('Authentication failed. Log in again to continue.');
+		return;
+	}
+
+	$c->param('displayMode', 'tex') if ($c->param('outputformat') eq 'pdf' || $c->param('outputformat') eq 'tex');
+
+	# Call the WebworkWebservice to render the problem and store the result in $c->return_object.
+	my $rpc_service = WebworkWebservice->new($c);
+	await $rpc_service->rpc_execute('renderProblem');
+	if ($rpc_service->error_string) {
+		$c->{output} = $c->{wantsjson} ? { error => $rpc_service->error_string } : $rpc_service->error_string;
+		return;
+	}
+
+	# Format the return in the requested format.  A response is rendered unless there is an error.
+	$c->{output} = $rpc_service->formatRenderedProblem;
+
+	return;
+}
+
+sub content ($c) {
+	# If there were no errors a response will have been rendered.  Return in that case.
+	return if $c->res->code;
+
+	# Handle rendering of errors.
+	return $c->render(json => $c->{output}) if $c->{wantsjson};
+	return $c->render(text => $c->{output});
+}
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/SampleProblemViewer.pm b/lib/WeBWorK/ContentGenerator/SampleProblemViewer.pm
new file mode 100644
index 0000000000..94116fc97a
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/SampleProblemViewer.pm
@@ -0,0 +1,121 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ContentGenerator::SampleProblemViewer;
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
+
+use File::Basename qw(basename);
+use Pod::Simple::Search;
+
+use SampleProblemParser qw(parseSampleProblem generateMetadata);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::SampleProblemViewer - display locally sample problems.
+
+=head2 C<sampleProblemIndex>
+
+Generates an index file to browse the sample problems.
+
+=cut
+
+sub sampleProblemIndex ($c) {
+	return $c->render('ContentGenerator/SampleProblemViewer');
+}
+
+=head2 C<renderSampleProblem>
+
+Render the requestedSampleProblem or one of the indexes.
+
+=cut
+
+sub renderSampleProblem ($c) {
+	my $pg_root = $c->ce->{pg_dir};
+
+	(undef, my $macro_files) = Pod::Simple::Search->new->inc(0)->survey("$pg_root/macros");
+	my %macro_locations = map { basename($_) => $_ =~ s!$pg_root/macros/!!r } keys %$macro_files;
+	my $metadata        = generateMetadata("$pg_root/tutorial/sample-problems", macro_locations => \%macro_locations);
+
+	if (grep { $c->stash->{filePath} eq $_ } qw(categories techniques subjects macros)) {
+		my %labels = (
+			categories => $c->maketext('Categories'),
+			subjects   => $c->maketext('Subject Areas'),
+			macros     => $c->maketext('Problems by Macro'),
+			techniques => $c->maketext('Problem Techniques')
+		);
+
+		my $list = {};
+		if ($c->stash->{filePath} =~ /^(categories|subjects|macros)$/) {
+			for my $sample_file (keys %$metadata) {
+				for my $category (@{ $metadata->{$sample_file}{ $c->stash->{filePath} } }) {
+					$list->{$category}{ $metadata->{$sample_file}{name} } =
+						"$metadata->{$sample_file}{dir}/" . ($sample_file =~ s/\.pg$//r);
+				}
+			}
+		} elsif ($c->stash->{filePath} eq 'techniques') {
+			for my $sample_file (keys %$metadata) {
+				if (grep { $_ eq 'technique' } @{ $metadata->{$sample_file}{types} }) {
+					$list->{ $metadata->{$sample_file}{name} } =
+						"$metadata->{$sample_file}{dir}/" . ($sample_file =~ s/\.pg$//r);
+				}
+			}
+		}
+
+		# Render one of the four indexes.
+		return $c->render(
+			template => 'ContentGenerator/SampleProblemViewer/viewer',
+			label    => $labels{ $c->stash->{filePath} },
+			list     => $list
+		);
+	} elsif ($c->stash->{filePath} =~ /\.pg$/) {
+		unless ($metadata->{ basename($c->stash->{filePath}) }) {
+			return $c->render(data => $c->maketext('File not found.'));
+		}
+
+		# Render the .pg file as a downloadable file.
+		return $c->render_file(
+			data => parseSampleProblem(
+				"$pg_root/tutorial/sample-problems/" . $c->stash->{filePath},
+				metadata    => $metadata,
+				pod_root    => $c->url_for('pod_index'),
+				pg_doc_home => $c->url_for('sample_problem_index')
+			)->{code}
+		);
+	} else {
+		unless ($metadata->{ basename($c->stash->{filePath}) . '.pg' }) {
+			$c->render(data => $c->maketext('Sample problem not found.'));
+		}
+
+		# Render a problem with its documentation.
+		my $problemFile = "$pg_root/tutorial/sample-problems/" . $c->stash->{filePath} . '.pg';
+		return $c->render(
+			'ContentGenerator/SampleProblemViewer/sample_problem',
+			%{
+				parseSampleProblem(
+					$problemFile,
+					metadata        => $metadata,
+					pod_root        => $c->url_for('pod_viewer', filePath => 'macros'),
+					pg_doc_home     => $c->url_for('sample_problem_index'),
+					macro_locations => \%macro_locations,
+				)
+			},
+			metadata        => $metadata,
+			filename        => basename($problemFile),
+			macro_locations => \%macro_locations,
+		);
+	}
+}
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm b/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm
index 3d61e5909c..b48e5b028d 100644
--- a/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm
+++ b/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,8 +14,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::ShowMeAnother;
-use base qw(WeBWorK);
-use base qw(WeBWorK::ContentGenerator::Problem);    # not needed?
+use Mojo::Base 'WeBWorK::ContentGenerator::Problem', -signatures, -async_await;
 
 =head1 NAME
 
@@ -23,55 +22,45 @@ WeBWorK::ContentGenerator::ShowMeAnother - Show students alternate versions of c
 
 =cut
 
-use strict;
-use warnings;
-use WeBWorK::CGI;
-use WeBWorK::PG;
 use WeBWorK::Debug;
 use WeBWorK::Utils qw(wwRound before after jitar_id_to_seq format_set_name_display);
+use WeBWorK::Utils::Rendering qw(getTranslatorDebuggingOptions renderPG);
 
-################################################################################
-# output utilities
-################################################################################
+async sub pre_header_initialize ($c) {
+	my $ce    = $c->ce;
+	my $db    = $c->db;
+	my $authz = $c->authz;
 
-sub pre_header_initialize {
-	my ($self)  = @_;
-	my $r       = $self->r;
-	my $ce      = $r->ce;
-	my $db      = $r->db;
-	my $authz   = $r->authz;
-	my $urlpath = $r->urlpath;
-
-	my $setName           = $urlpath->arg("setID");
-	my $problemNumber     = $r->urlpath->arg("problemID");
-	my $userName          = $r->param('user');
-	my $effectiveUserName = $r->param('effectiveUser');
-	my $key               = $r->param('key');
-	my $editMode          = $r->param("editMode");
+	my $setName           = $c->stash('setID');
+	my $problemNumber     = $c->stash('problemID');
+	my $userName          = $c->param('user');
+	my $effectiveUserName = $c->param('effectiveUser');
+	my $key               = $c->param('key');
+	my $editMode          = $c->param('editMode');
 
 	# We want to run the existing pre_header_initialize with
 	# the database seed to get a pure copy of the original problem
 	# to test against.
 
-	my $problemSeed = $r->param("problemSeed");
-	$r->param("problemSeed", '');
+	my $problemSeed = $c->param('problemSeed');
+	$c->param('problemSeed', '');
 
 	# Run existsing initialization
-	$self->SUPER::pre_header_initialize();
-
-	# this has to be set back because of CGI and sticky params.
-	$r->param("problemSeed", $problemSeed);
-
-	my $user           = $self->{user};
-	my $effectiveUser  = $self->{effectiveUser};
-	my $set            = $self->{set};
-	my $problem        = $self->{problem};
-	my $displayMode    = $self->{displayMode};
-	my $redisplay      = $self->{redisplay};
-	my $submitAnswers  = $self->{submitAnswers};
-	my $checkAnswers   = $self->{checkAnswers};
-	my $previewAnswers = $self->{previewAnswers};
-	my $formFields     = $self->{formFields};
+	await $c->SUPER::pre_header_initialize();
+
+	# This has to be set back because of sticky params.
+	$c->param('problemSeed', $problemSeed);
+
+	my $user           = $c->{user};
+	my $effectiveUser  = $c->{effectiveUser};
+	my $set            = $c->{set};
+	my $problem        = $c->{problem};
+	my $displayMode    = $c->{displayMode};
+	my $redisplay      = $c->{redisplay};
+	my $submitAnswers  = $c->{submitAnswers};
+	my $checkAnswers   = $c->{checkAnswers};
+	my $previewAnswers = $c->{previewAnswers};
+	my $formFields     = $c->{formFields};
 
 	# a hash containing information for showMeAnother
 	#   active:        has the button been pushed?
@@ -83,19 +72,18 @@ sub pre_header_initialize {
 	#                  available), see correct answer) these are set via check boxes from the configuration screen
 	#   Count:         the number of times the student has clicked SMA (or clicked refresh on the page)
 	#   Preview:       has the preview button been clicked while SMA is active?
-	#   DisplayChange: has a display change been made while SMA is active?
 
-	my %SMAoptions    = map { $_ => 1 } @{ $ce->{pg}->{options}->{showMeAnother} };
+	my %SMAoptions    = map { $_ => 1 } @{ $ce->{pg}{options}{showMeAnother} };
 	my %showMeAnother = (
 		active => !($checkAnswers or $previewAnswers)
 			&& $ce->{pg}{options}{enableShowMeAnother}
 			&& ($problem->{showMeAnother} > -1 || $problem->{showMeAnother} == -2),
 		CheckAnswers => $checkAnswers
-			&& $r->param("showMeAnotherCheckAnswers")
-			&& $ce->{pg}->{options}->{enableShowMeAnother},
+			&& $c->param('showMeAnotherCheckAnswers')
+			&& $ce->{pg}{options}{enableShowMeAnother},
 		IsPossible  => 1,
 		TriesNeeded => $problem->{showMeAnother},
-		MaxReps     => $ce->{pg}->{options}->{showMeAnotherMaxReps},
+		MaxReps     => $ce->{pg}{options}{showMeAnotherMaxReps},
 		options     => {
 			checkAnswers  => exists($SMAoptions{'SMAcheckAnswers'}),
 			showSolutions => exists($SMAoptions{'SMAshowSolutions'}),
@@ -104,43 +92,44 @@ sub pre_header_initialize {
 		},
 		Count   => $problem->{showMeAnotherCount},
 		Preview => $previewAnswers
-			&& $r->param("showMeAnotherCheckAnswers")
-			&& $ce->{pg}->{options}->{enableShowMeAnother},
-		DisplayChange => $r->param("SMAdisplayChange") && $ce->{pg}->{options}->{enableShowMeAnother},
+			&& $c->param('showMeAnotherCheckAnswers')
+			&& $ce->{pg}{options}{enableShowMeAnother}
 	);
 
 	# if $showMeAnother{Count} is somehow not an integer, make it one
-	$showMeAnother{Count} = 0 unless ($showMeAnother{Count} =~ /^[+-]?\d+$/);
+	$showMeAnother{Count} = 0 unless $showMeAnother{Count} =~ /^[+-]?\d+$/;
 
 	# if $showMeAnother{TriesNeeded} is somehow not an integer or if its -2, use the default value
-	$showMeAnother{TriesNeeded} = $ce->{pg}->{options}->{showMeAnotherDefault}
+	$showMeAnother{TriesNeeded} = $ce->{pg}{options}{showMeAnotherDefault}
 		if ($showMeAnother{TriesNeeded} !~ /^[+-]?\d+$/ || $showMeAnother{TriesNeeded} == -2);
 
 	# store the showMeAnother hash for the check to see if the button can be used
 	# (this hash is updated and re-stored after the can, must, will hashes)
-	$self->{showMeAnother} = \%showMeAnother;
+	$c->{showMeAnother} = \%showMeAnother;
 
 	# Show a message if we aren't allowed to show me another here.
-	$self->addbadmessage('You are not allowed to use Show Me Another for this problem.'), return
-		unless $self->can_showMeAnother($user, $effectiveUser, $set, $problem, 0);
+	unless ($c->can_showMeAnother($user, $effectiveUser, $set, $problem, 0)) {
+		$c->addbadmessage('You are not allowed to use Show Me Another for this problem.');
+		return;
+	}
 
-	my $want = $self->{want};
+	my $want = $c->{want};
 	$want->{showMeAnother} = 1;
 
-	my $must = $self->{must};
+	my $must = $c->{must};
 	$must->{showMeAnother} = 0;
 
 	# does the user have permission to use certain options?
 	my @args = ($user, $effectiveUser, $set, $problem);
 
-	my $can = $self->{can};
-	$can->{showMeAnother} = $self->can_showMeAnother(@args, $submitAnswers);
+	my $can = $c->{can};
+	$can->{showMeAnother} = $c->can_showMeAnother(@args, $submitAnswers);
 
 	# store text of original problem for later comparison with text from problem with new seed
-	my $showMeAnotherOriginalPG = WeBWorK::PG->new(
-		$ce,
+	my $showMeAnotherOriginalPG = await renderPG(
+		$c,
 		$effectiveUser,
-		$key, $set, $problem,
+		$set, $problem,
 		$set->psvn,
 		$formFields,
 		{    # translation options
@@ -151,16 +140,15 @@ sub pre_header_initialize {
 			processAnswers           => 0,
 			permissionLevel          => $db->getPermissionLevel($userName)->permission,
 			effectivePermissionLevel => $db->getPermissionLevel($effectiveUserName)->permission,
-			useMathQuill             => $self->{will}{useMathQuill},
-			useMathView              => $self->{will}{useMathView},
-			useWirisEditor           => $self->{will}{useWirisEditor},
+			useMathQuill             => $c->{will}{useMathQuill},
+			useMathView              => $c->{will}{useMathView},
 		},
 	);
 
 	my $orig_body_text = $showMeAnotherOriginalPG->{body_text};
-	for (keys %{ $showMeAnotherOriginalPG->{pgcore}{PG_alias}{resource_list} }) {
-		$orig_body_text =~ s/$showMeAnotherOriginalPG->{pgcore}{PG_alias}{resource_list}{$_}{uri}{content}//g
-			if (defined $showMeAnotherOriginalPG->{pgcore}{PG_alias}{resource_list}{$_}{uri}{content});
+	for (keys %{ $showMeAnotherOriginalPG->{resource_list} }) {
+		$orig_body_text =~ s/$showMeAnotherOriginalPG->{resource_list}{$_}//g
+			if defined $showMeAnotherOriginalPG->{resource_list}{$_};
 	}
 
 	# if showMeAnother is active, then output a new problem in a new tab with a new seed
@@ -171,13 +159,13 @@ sub pre_header_initialize {
 		my $newProblemSeed;
 
 		# check to see if changing the problem seed will change the problem
-		for my $i (0 .. $ce->{pg}->{options}->{showMeAnotherGeneratesDifferentProblem}) {
+		for my $i (0 .. $ce->{pg}{options}{showMeAnotherGeneratesDifferentProblem}) {
 			do { $newProblemSeed = int(rand(10000)) } until ($newProblemSeed != $oldProblemSeed);
 			$problem->{problem_seed} = $newProblemSeed;
-			my $showMeAnotherNewPG = WeBWorK::PG->new(
-				$ce,
+			my $showMeAnotherNewPG = await renderPG(
+				$c,
 				$effectiveUser,
-				$key, $set, $problem,
+				$set, $problem,
 				$set->psvn,
 				$formFields,
 				{    # translation options
@@ -188,16 +176,15 @@ sub pre_header_initialize {
 					processAnswers           => 0,
 					permissionLevel          => $db->getPermissionLevel($userName)->permission,
 					effectivePermissionLevel => $db->getPermissionLevel($effectiveUserName)->permission,
-					useMathQuill             => $self->{will}{useMathQuill},
-					useMathView              => $self->{will}{useMathView},
-					useWirisEditor           => $self->{will}{useWirisEditor},
+					useMathQuill             => $c->{will}{useMathQuill},
+					useMathView              => $c->{will}{useMathView},
 				},
 			);
 
 			my $new_body_text = $showMeAnotherNewPG->{body_text};
-			for (keys %{ $showMeAnotherNewPG->{pgcore}{PG_alias}{resource_list} }) {
-				$new_body_text =~ s/$showMeAnotherNewPG->{pgcore}{PG_alias}{resource_list}{$_}{uri}{content}//g
-					if (defined $showMeAnotherNewPG->{pgcore}{PG_alias}{resource_list}{$_}{uri}{content});
+			for (keys %{ $showMeAnotherNewPG->{resource_list} }) {
+				$new_body_text =~ s/$showMeAnotherNewPG->{resource_list}{$_}//g
+					if defined $showMeAnotherNewPG->{resource_list}{$_};
 			}
 
 			# check to see if we've found a new version
@@ -234,10 +221,10 @@ sub pre_header_initialize {
 		$problem->problem_seed($problemSeed);
 		#### One last check to see if students  have hard coded in a key
 		#### which matches the original problem
-		my $showMeAnotherNewPG = WeBWorK::PG->new(
-			$ce,
+		my $showMeAnotherNewPG = await renderPG(
+			$c,
 			$effectiveUser,
-			$key, $set, $problem,
+			$set, $problem,
 			$set->psvn,
 			$formFields,
 			{    # translation options
@@ -248,9 +235,8 @@ sub pre_header_initialize {
 				processAnswers           => 0,
 				permissionLevel          => $db->getPermissionLevel($userName)->permission,
 				effectivePermissionLevel => $db->getPermissionLevel($effectiveUserName)->permission,
-				useMathQuill             => $self->{will}{useMathQuill},
-				useMathView              => $self->{will}{useMathView},
-				useWirisEditor           => $self->{will}{useWirisEditor},
+				useMathQuill             => $c->{will}{useMathQuill},
+				useMathView              => $c->{will}{useMathView},
 			},
 		);
 
@@ -267,7 +253,7 @@ sub pre_header_initialize {
 	}
 
 	# if showMeAnother is active, then disable all other options
-	if (($showMeAnother{active} or $showMeAnother{CheckAnswers} or $showMeAnother{Preview}) and $can->{showMeAnother}) {
+	if (($showMeAnother{active} || $showMeAnother{CheckAnswers} || $showMeAnother{Preview}) && $can->{showMeAnother}) {
 		$can->{recordAnswers}   = 0;
 		$can->{checkAnswers}    = 0;    # turned on if showMeAnother conditions met below
 		$can->{getSubmitButton} = 0;
@@ -275,38 +261,32 @@ sub pre_header_initialize {
 		# only show solution if showMeAnother has been clicked (or refreshed)
 		# less than the maximum amount allowed specified in Course Configuration,
 		# and also make sure that showMeAnother is possible
-		if (($showMeAnother{Count} <= ($showMeAnother{MaxReps}) or ($showMeAnother{MaxReps} == -1))
-			and $showMeAnother{IsPossible})
+		if (($showMeAnother{Count} <= $showMeAnother{MaxReps} || $showMeAnother{MaxReps} == -1)
+			&& $showMeAnother{IsPossible})
 		{
-			$can->{showCorrectAnswers} =
-				($showMeAnother{options}->{showCorrect} and $showMeAnother{options}->{checkAnswers});
-			$can->{showHints}      = $showMeAnother{options}->{showHints};
-			$can->{showSolutions}  = $showMeAnother{options}->{showSolutions};
-			$must->{showSolutions} = $showMeAnother{options}->{showSolutions};
-			$can->{checkAnswers}   = $showMeAnother{options}->{checkAnswers};
-			# rig the nubmer of attempts to show hints if showing hitns
-			if ($can->{showHints}) {
-				$problem->num_incorrect(1000);
-			}
+			$can->{showCorrectAnswers} = $showMeAnother{options}{showCorrect} && $showMeAnother{options}{checkAnswers};
+			$can->{checkAnswers}       = $showMeAnother{options}{checkAnswers};
+			# If the user can see hints or solutions in the original problem, then the user is allowed to see them here
+			# as well regardless of the SMA setting.
+			$can->{showHints}     = $showMeAnother{options}{showHints}     || $c->{can}{showHints};
+			$can->{showSolutions} = $showMeAnother{options}{showSolutions} || $c->{can}{showSolutions};
 		}
 	}
 
 	# final values for options
-	my $will = $self->{will};
+	my $will = $c->{will};
 	foreach (keys %$must) {
 		$will->{$_} = $can->{$_} && ($want->{$_} || $must->{$_});
 	}
 
-	##### translation #####
-
-	### Unfortunately we have to do this over because we potentially
-	### picked a new problem seed.
+	# PG problem translation
+	# Unfortunately we have to do this over because we potentially picked a new problem seed.
 
-	debug("begin pg processing");
-	my $pg = WeBWorK::PG->new(
-		$ce,
+	debug('begin pg processing');
+	my $pg = await renderPG(
+		$c,
 		$effectiveUser,
-		$key, $set, $problem,
+		$set, $problem,
 		$set->psvn,
 		$formFields,
 		{    # translation options
@@ -317,89 +297,90 @@ sub pre_header_initialize {
 			processAnswers           => 1,
 			permissionLevel          => $db->getPermissionLevel($userName)->permission,
 			effectivePermissionLevel => $db->getPermissionLevel($effectiveUserName)->permission,
-			useMathQuill             => $self->{will}{useMathQuill},
-			useMathView              => $self->{will}{useMathView},
-			useWirisEditor           => $self->{will}{useWirisEditor},
+			useMathQuill             => $c->{will}{useMathQuill},
+			useMathView              => $c->{will}{useMathView},
+			forceScaffoldsOpen       => 0,
+			isInstructor             => $authz->hasPermissions($userName, 'view_answers'),
+			debuggingOptions         => getTranslatorDebuggingOptions($authz, $userName)
 		},
 	);
 
-	debug("end pg processing");
+	# Warnings in the renderPG subprocess will not be caught by the global warning handler of this process.
+	# So rewarn them and let the global warning handler take care of it.
+	warn $pg->{warnings} if $pg->{warnings};
 
-	##### update and fix hint/solution options after PG processing #####
+	debug('end pg processing');
 
-	$can->{showHints} &&= $pg->{flags}->{hintExists} &&=
-		$pg->{flags}->{showHintLimit} <= $pg->{state}->{num_of_incorrect_ans};
-	$can->{showSolutions} &&= $pg->{flags}->{solutionExists};
+	# Update and fix hint/solution options after PG processing
+	$can->{showHints}     &&= $pg->{flags}{hintExists};
+	$can->{showSolutions} &&= $pg->{flags}{solutionExists};
 
-	##### record errors #########
-	if (ref($pg->{pgcore})) {
-		my @debug_messages   = @{ $pg->{pgcore}->get_debug_messages };
-		my @warning_messages = @{ $pg->{pgcore}->get_warning_messages };
-		my @internal_errors  = @{ $pg->{pgcore}->get_internal_debug_messages };
-		$self->{pgerrors}         = @debug_messages || @warning_messages || @internal_errors;
-		$self->{pgdebug}          = \@debug_messages;
-		$self->{pgwarning}        = \@warning_messages;
-		$self->{pginternalerrors} = \@internal_errors;
-	} else {
-		warn "Processing of this PG problem was not completed.  Probably because of a syntax error.
-		      The translator died prematurely and no PG warning messages were transmitted.";
-	}
+	# Record errors
+	$c->{pgdebug}          = $pg->{debug_messages}          if ref $pg->{debug_messages} eq 'ARRAY';
+	$c->{pgwarning}        = $pg->{warning_messages}        if ref $pg->{warning_messages} eq 'ARRAY';
+	$c->{pginternalerrors} = $pg->{internal_debug_messages} if ref $pg->{internal_debug_messages} eq 'ARRAY';
+	# $c->{pgerrors} is defined if any of the above are defined, and is nonzero if any are non-empty.
+	$c->{pgerrors} = @{ $c->{pgdebug} // [] } || @{ $c->{pgwarning} // [] } || @{ $c->{pginternalerrors} // [] }
+		if defined $c->{pgdebug} || defined $c->{pgwarning} || defined $c->{pginternalerrors};
+
+	# If $c->{pgerrors} is not defined, then the PG messages arrays were not defined,
+	# which means $pg->{pgcore} was not defined and the translator died.
+	warn 'Processing of this PG problem was not completed.  Probably because of a syntax error. '
+		. 'The translator died prematurely and no PG warning messages were transmitted.'
+		unless defined $c->{pgerrors};
 
-	$self->{showMeAnother} = \%showMeAnother;
-	$self->{pg}            = $pg;
+	$c->{showMeAnother} = \%showMeAnother;
+	$c->{pg}            = $pg;
+
+	return;
 }
 
 # We disable showOldAnswers because old answers are answers to the original
 # question and not to this question.
 
-sub can_showOldAnswers {
-
+sub can_showOldAnswers ($c, $user, $effectiveUser, $set, $problem) {
 	return 0;
 }
 
-sub title {
-	my ($self) = @_;
-	my $r      = $self->r;
-	my $db     = $r->db;
+sub page_title ($c) {
+	my $db = $c->db;
 
 	# Using the url arguments won't break if the set/problem are invalid
-	my $setID     = $self->r->urlpath->arg("setID");
-	my $problemID = $self->r->urlpath->arg("problemID");
+	my $setID     = $c->stash('setID');
+	my $problemID = $c->stash('problemID');
 
 	my $set = $db->getGlobalSet($setID);
 	if ($set && $set->assignment_type eq 'jitar') {
 		$problemID = join('.', jitar_id_to_seq($problemID));
 	}
-	my $out = $r->maketext('[_1]: Problem [_2] Show Me Another',
-		CGI::span({ dir => 'ltr' }, format_set_name_display($setID)), $problemID);
+	my $header = $c->maketext('[_1]: Problem [_2] Show Me Another',
+		$c->tag('span', dir => 'ltr', format_set_name_display($setID)), $problemID);
 
 	# Return here if we don't have the requisite information.
-	return $out if ($self->{invalidSet} || $self->{invalidProblem});
+	return $header if ($c->{invalidSet} || $c->{invalidProblem});
 
-	my $ce      = $r->ce;
-	my $problem = $self->{problem};
+	my $ce      = $c->ce;
+	my $problem = $c->{problem};
 
-	$out .= CGI::start_div({ class => "problem-sub-header" });
+	my $subheader = '';
 
 	# FIXME: Should the show me another show points?
 	my $problemValue = $problem->value;
-	if (defined($problemValue)) {
-		my $points = $problemValue == 1 ? $r->maketext('point') : $r->maketext('points');
-		$out .= "($problemValue $points)";
+	if (defined $problemValue) {
+		my $points = $problemValue == 1 ? $c->maketext('point') : $c->maketext('points');
+		$subheader .= "($problemValue $points)";
 	}
 
 	# This uses the permission level and user id of the user assigned to the problem.
 	my $problemUser = $problem->user_id;
-	my $inList      = grep($_ eq $problemUser, @{ $ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} });
 	if ($db->getPermissionLevel($problemUser)->permission >=
-		$ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_PERMISSION_LEVEL} || $inList)
+		$ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_PERMISSION_LEVEL}
+		|| grep { $_ eq $problemUser } @{ $ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} })
 	{
-		$out .= " " . $problem->source_file;
+		$subheader .= ' ' . $problem->source_file;
 	}
 
-	$out .= CGI::end_div();
-
-	return $out;
+	return $c->c($header, $c->tag('span', class => 'problem-sub-header d-block', $subheader))->join('');
 }
 
 # If showMeAnother or check answers from showMeAnother is active, then don't show the navigation bar.
@@ -407,224 +388,210 @@ sub nav {
 	return '';
 }
 
-# prints out the body of the current problem
+# Output the body of the current problem
+sub output_problem_body ($c) {
+	# Ignore body if SMA was pushed and no new problem will be shown.
+	return $c->SUPER::output_problem_body if $c->{will}{showMeAnother} && $c->{showMeAnother}{IsPossible};
 
-sub output_problem_body {
-	my $self          = shift;
-	my $pg            = $self->{pg};
-	my %will          = %{ $self->{will} };
-	my %showMeAnother = %{ $self->{showMeAnother} };
-
-	$self->SUPER::output_problem_body()
-		#ignore body if SMA was pushed and no new problem will be shown;
-		if ($will{showMeAnother} and $showMeAnother{IsPossible});
-	return "";
+	return '';
 }
 
-# output_checkboxes subroutine
-
-# prints out the checkbox input elements that are available for the current problem
-
-sub output_checkboxes {
-	my $self          = shift;
-	my %can           = %{ $self->{can} };
-	my %will          = %{ $self->{will} };
-	my %showMeAnother = %{ $self->{showMeAnother} };
-
-	#skip check boxes if SMA was pushed and no new problem will be shown
-	if ($showMeAnother{IsPossible} and $will{showMeAnother}) {
-		$self->SUPER::output_checkboxes();
-
-	}
-	return "";
+# Output messages about the problem
+sub output_message ($c) {
+	return $c->include('ContentGenerator/ShowMeAnother/messages');
 }
 
-# output_submit_buttons
-
-# prints out the submit button input elements that are available for the current problem
-
-sub output_submit_buttons {
-	my $self          = shift;
-	my %will          = %{ $self->{will} };
-	my %showMeAnother = %{ $self->{showMeAnother} };
+# Prints out the checkbox input elements that are available for the current problem
+sub output_checkboxes ($c) {
+	# Skip check boxes if SMA was pushed and no new problem will be shown
+	return $c->SUPER::output_checkboxes if $c->{showMeAnother}{IsPossible} && $c->{will}{showMeAnother};
 
-	# skip buttons if SMA button has been pushed but there is no new problem shown
-	if ($showMeAnother{IsPossible} and $will{showMeAnother}) {
-		$self->SUPER::output_submit_buttons();
-	}
-
-	return "";
+	return '';
 }
 
-# output_score_summary subroutine
+# Prints out the submit button input elements that are available for the current problem
+sub output_submit_buttons ($c) {
+	# Skip buttons if SMA button has been pushed but there is no new problem shown
+	return $c->SUPER::output_submit_buttons if $c->{showMeAnother}{IsPossible} && $c->{will}{showMeAnother};
 
-# prints out a summary of the student's current progress and status on the current problem
-
-sub output_score_summary {
-	my $self = shift;
+	return '';
+}
 
+# Outputs a summary of the student's current progress and status on the current problem
+sub output_score_summary ($c) {
 	# skip score summary
-
-	return "";
+	return '';
 }
 
-# output_summary subroutine
-
-# prints out the summary of the questions that the student has answered
+# Outputs the summary of the questions that the student has answered
 # for the current problem, along with available information about correctness
-
-sub output_summary {
-
-	my $self                      = shift;
-	my $pg                        = $self->{pg};
-	my %will                      = %{ $self->{will} };
-	my %can                       = %{ $self->{can} };
-	my %showMeAnother             = %{ $self->{showMeAnother} };
-	my $checkAnswers              = $self->{checkAnswers};
-	my $previewAnswers            = $self->{previewAnswers};
-	my $showPartialCorrectAnswers = $self->{pg}{flags}{showPartialCorrectAnswers};
-
-	my $r  = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
+sub output_summary ($c) {
+	my $pg                        = $c->{pg};
+	my %will                      = %{ $c->{will} };
+	my %can                       = %{ $c->{can} };
+	my %showMeAnother             = %{ $c->{showMeAnother} };
+	my $checkAnswers              = $c->{checkAnswers};
+	my $previewAnswers            = $c->{previewAnswers};
+	my $showPartialCorrectAnswers = $c->{pg}{flags}{showPartialCorrectAnswers};
+
+	my $ce = $c->ce;
+	my $db = $c->db;
 
 	# if $showMeAnother{Count} is somehow not an integer, make it one
 	$showMeAnother{Count} = 0 unless ($showMeAnother{Count} =~ /^[+-]?\d+$/);
 
+	my $output = $c->c;
+
 	if ($will{checkAnswers}) {
-		if ($showMeAnother{CheckAnswers} and $can{showMeAnother}) {
+		if ($showMeAnother{CheckAnswers} && $can{showMeAnother}) {
 			# if the student is checking answers to a new problem, give them a reminder that they are doing so
-			print CGI::div(
-				{ class => 'showMeAnotherBox' },
-				$r->maketext(
-					'You are currently checking answers to a different version of your problem - these will not be '
-						. 'recorded, and you should remember to return to your original problem once you are done here.'
+			push(
+				@$output,
+				$c->tag(
+					'div',
+					class => 'showMeAnotherBox',
+					$c->maketext(
+						'You are currently checking answers to a different version of your problem - these '
+							. 'will not be recorded, and you should remember to return to your original problem '
+							. 'once you are done here.'
+					)
 				)
 			);
 		}
 	} elsif ($previewAnswers) {
 		# if the student is previewing answers to a new problem, give them a reminder that they are doing so
-		if ($showMeAnother{Preview} and $can{showMeAnother}) {
-			print CGI::div(
-				{ class => 'showMeAnotherBox' },
-				$r->maketext(
-					'You are currently previewing answers to a different version of your problem - these will not be '
-						. 'recorded, and you should remember to return to your original problem once you are done here.'
+		if ($showMeAnother{Preview} && $can{showMeAnother}) {
+			push(
+				@$output,
+				$c->tag(
+					'div',
+					class => 'showMeAnotherBox',
+					$c->maketext(
+						'You are currently previewing answers to a different version of your problem - these '
+							. 'will not be recorded, and you should remember to return to your original problem '
+							. 'once you are done here.'
+					)
 				)
 			);
 		}
-	} elsif ($showMeAnother{IsPossible} and $will{showMeAnother}) {
+	} elsif ($showMeAnother{IsPossible} && $will{showMeAnother}) {
 		# the feedback varies a little bit if Check Answers is available or not
 		my $checkAnswersAvailable =
 			($showMeAnother{options}->{checkAnswers})
-			? $r->maketext('You may check your answers to this problem without affecting '
+			? $c->maketext('You may check your answers to this problem without affecting '
 				. 'the maximum number of tries to your original problem.')
-			: "";
-		my $solutionShown;
+			: '';
+		my $solutionShown = '';
 		# if showMeAnother has been clicked and a new version has been found,
 		# give some details of what the student is seeing
-		if ($showMeAnother{Count} <= $showMeAnother{MaxReps} or ($showMeAnother{MaxReps} == -1)) {
+		if ($showMeAnother{Count} <= $showMeAnother{MaxReps} || ($showMeAnother{MaxReps} == -1)) {
 			# check to see if a solution exists for this problem, and vary the feedback accordingly
-			if ($pg->{flags}->{solutionExists} && $showMeAnother{options}->{showSolutions}) {
-				$solutionShown = $r->maketext("There is a written solution available.");
+			if ($pg->{flags}{solutionExists} && $showMeAnother{options}->{showSolutions}) {
+				$solutionShown = $c->maketext('There is a written solution available.');
 			} elsif ($showMeAnother{options}->{showSolutions}
 				and $showMeAnother{options}->{showCorrect}
 				and $showMeAnother{options}->{checkAnswers})
 			{
-				$solutionShown = $r->maketext('There is no written solution available for this problem, '
+				$solutionShown = $c->maketext('There is no written solution available for this problem, '
 						. 'but you can still view the correct answers.');
 			} elsif ($showMeAnother{options}->{showSolutions}) {
-				$solutionShown = $r->maketext("There is no written solution available for this problem.");
+				$solutionShown = $c->maketext('There is no written solution available for this problem.');
 			}
 		}
-		print CGI::div(
-			{ class => 'showMeAnotherBox' },
-			$r->maketext("Here is a new version of your problem."),
-			$solutionShown, $checkAnswersAvailable
+		push(
+			@$output,
+			$c->tag(
+				'div',
+				class => 'showMeAnotherBox',
+				$c->c(
+					$c->maketext('Here is a new version of your problem.'), $solutionShown,
+					$checkAnswersAvailable
+				)->join(' ')
+			),
+			$c->tag(
+				'div',
+				class => 'ResultsAlert',
+				$c->maketext(q{Remember to return to your original problem when you're finished here!})
+			)
 		);
-		print CGI::div({ class => 'ResultsAlert' },
-			$r->maketext("Remember to return to your original problem when you're finished here!"));
-	} elsif ($showMeAnother{active} and $showMeAnother{IsPossible} and !$can{showMeAnother}) {
+	} elsif ($showMeAnother{active} && $showMeAnother{IsPossible} && !$can{showMeAnother}) {
 		if ($showMeAnother{Count} >= $showMeAnother{MaxReps}) {
 			my $solutionShown =
-				($showMeAnother{options}->{showSolutions} and $pg->{flags}->{solutionExists})
-				? $r->maketext("The solution has been removed.")
-				: "";
-			print CGI::div(
-				{ class => 'ResultsAlert' },
-				$r->maketext(
-					'You are only allowed to click on Show Me Another [quant,_1,time,times] per problem. '
-						. '[_2] Close this tab, and return to the original problem.',
-					$showMeAnother{MaxReps},
-					$solutionShown
+				($showMeAnother{options}->{showSolutions} && $pg->{flags}{solutionExists})
+				? $c->maketext('The solution has been removed.')
+				: '';
+			push(
+				@$output,
+				$c->tag(
+					'div',
+					class => 'ResultsAlert',
+					$c->maketext(
+						'You are only allowed to click on Show Me Another [quant,_1,time,times] per problem. '
+							. '[_2] Close this tab, and return to the original problem.',
+						$showMeAnother{MaxReps},
+						$solutionShown
+					)
 				)
 			);
 		} elsif ($showMeAnother{Count} < $showMeAnother{TriesNeeded}) {
-			print CGI::div(
-				{ class => 'ResultsAlert' },
-				$r->maketext(
-					"You must attempt this problem [quant,_1,time,times] before Show Me Another is available.",
-					$showMeAnother{TriesNeeded}
+			push(
+				@$output,
+				$c->tag(
+					'div',
+					class => 'ResultsAlert',
+					$c->maketext(
+						'You must attempt this problem [quant,_1,time,times] before Show Me Another is available.',
+						$showMeAnother{TriesNeeded}
+					)
 				)
 			);
 		}
 	} elsif ($can{showMeAnother} && !$showMeAnother{IsPossible}) {
 		# print this if showMeAnother has been clicked, but it is not possible to
 		# find a new version of the problem
-		print CGI::div(
-			{ class => 'ResultsAlert' },
-			$r->maketext(
-				'WeBWorK was unable to generate a different version of this problem.  '
-					. 'Close this tab, and return to the original problem.'
+		push(
+			@$output,
+			$c->tag(
+				'div',
+				class => 'ResultsAlert',
+				$c->maketext(
+					'WeBWorK was unable to generate a different version of this problem.  '
+						. 'Close this tab, and return to the original problem.'
+				)
 			)
 		);
 	}
 
-	if ($showMeAnother{IsPossible} and $will{showMeAnother}) {
-		$self->SUPER::output_summary();
+	if ($showMeAnother{IsPossible} && $will{showMeAnother}) {
+		push(@$output, $c->SUPER::output_summary);
 	}
 
-	return "";
+	return $output->join('');
 }
 
-# output_comments subroutine
-
-sub output_comments {
-	my $self = shift;
-
+sub output_comments ($c) {
 	# skip instructor comments.
-
-	return "";
+	return '';
 }
 
-# output_grader subroutine
-
-sub output_grader {
-	my $self = shift;
-
+sub output_grader ($c) {
 	# skip instructor grader.
-
-	return "";
+	return '';
 }
 
-# outputs the hidden fields required for the form
-
-sub output_hidden_info {
-	my $self          = shift;
-	my %showMeAnother = %{ $self->{showMeAnother} };
-	my $problemSeed   = $self->{problem}->problem_seed;
-
-	# hidden field for clicking Preview Answers and Check Answers from a Show Me Another screen
-	# it needs to send the seed from showMeAnother back to the screen
-	if ($showMeAnother{active} or $showMeAnother{CheckAnswers} or $showMeAnother{Preview}) {
-		print CGI::hidden({ name => "showMeAnotherCheckAnswers", id => "showMeAnotherCheckAnswers_id", value => 1 });
-		# output the problem seed from ShowMeAnother so that it can be used in Check Answers
-		print(CGI::hidden({ name => "problemSeed", value => $problemSeed }));
+# Outputs the hidden fields required for the form
+sub output_hidden_info ($c) {
+	# Hidden field for clicking Preview Answers and Check Answers from a Show Me Another screen.
+	# It needs to send the seed from showMeAnother back to the screen.
+	if ($c->{showMeAnother}{active} || $c->{showMeAnother}{CheckAnswers} || $c->{showMeAnother}{Preview}) {
+		return $c->c(
+			$c->hidden_field(showMeAnotherCheckAnswers => 1, id => 'showMeAnotherCheckAnswers_id'),
+			# Output the problem seed from ShowMeAnother so that it can be used in Check Answers.
+			$c->hidden_field(problemSeed => $c->{problem}->problem_seed)
+		)->join('');
 	}
 
-	$self->SUPER::output_hidden_info();
-
-	return "";
+	return '';
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Skeleton.pm b/lib/WeBWorK/ContentGenerator/Skeleton.pm
index f65122e35c..8425cc2d27 100644
--- a/lib/WeBWorK/ContentGenerator/Skeleton.pm
+++ b/lib/WeBWorK/ContentGenerator/Skeleton.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,18 +14,21 @@
 ################################################################################
 
 # SKEL: Welcome to the ContentGenerator skeleton!
-# 
+#
 # This module is designed to help you in creating subclasses of
 # WeBWorK::ContentGenerator. Follow the instructions marked "SKEL" below to
 # create your very own module.
-# 
+#
 # When you've finished, I recommend you do some cleanup. These modules are much
 # easier to maintain if they doesn't contain "vestigal" garbage code. Remove the
 # "SKEL" comments and anything else that that you're not using in your module.
 
 # SKEL: Declare the name and superclass of your module here:
 package WeBWorK::ContentGenerator::Skeleton;
-use base qw(WeBWorK::ContentGenerator);
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
+
+# Add '-async_await' above if needed.  This is needed anytime a problem is
+# rendered.
 
 # SKEL: change the name of the module below and provide a short description. Add
 # additional POD documentation as you see fit.
@@ -33,141 +36,101 @@ use base qw(WeBWorK::ContentGenerator);
 =head1 NAME
 
 WeBWorK::ContentGenerator::Skeleton - Template for creating subclasses of
-WeBWorK::ContentGenerator.
+WeBWorK::ContentGenerator.  Note that in addition to creating your module
+from this template, you must create a Mojolicious template that generates
+the main body of the page.
 
 =cut
 
-use strict;
-use warnings;
-
 # SKEL: Add "use" lines for libraries you will be using here. Note that you only
 # need to add a "use" line here if you will be instantiating now objects or
-# calling free functions. If you have an existing instance (like $self->r) you
+# calling free functions. If you have an existing instance (like $self->c) you
 # can use it without a corresponding "use" line. Sample lines are given below:
-# 
-# You'll probably want to generate HTML code:
-#use CGI qw(-nosticky );
-# 
+#
 # You might need some utility functions:
 #use WeBWorK::Utils qw(function1 function2);
 
 # SKEL: If you need to do any processing before the HTTP header is sent, do it
-# in this method:
-# 
-#sub pre_header_initialize {
-#	my ($self) = @_;
-#	
+# in this method.  Note that this method may be async.
+#
+#sub pre_header_initialize ($c) {
 #	# Do your processing here! Don't print or return anything -- store data in
-#	# the self hash for later retrieveal.
+#	# the $c hash or in $c->stash for later retrieveal.
 #}
 
-# SKEL: To emit your own HTTP header, uncomment this:
-# 
-#sub header {
-#	my ($self) = @_;
-#	
-#	# Generate your HTTP header here.
-#	
-#	# If you return something, it will be used as the HTTP status code for this
-#	# request. The Apache::Constants module might be useful for gerating status
-#	# codes. If you don't return anything, the status code "OK" will be used.
-#	return "";
+# SKEL: This method is not actually of any use anymore.
+#
+#sub header ($c) {
+#	# The return value of this method is not used.
+#	# The practice is to return the status code of the response.
+#	return 0;
 #}
 
 # SKEL: If you need to do any processing after the HTTP header is sent, but before
 # any template processing occurs, or you need to calculate values that will be
-# used in multiple methods, do it in this method:
-# 
-#sub initialize {
-#	my ($self) = @_;
-#	
+# used in multiple methods, do it in this method.  Note that this method may be
+# async.
+#
+#sub initialize ($c) {
 #	# Do your processing here! Don't print or return anything -- store data in
-#	# the self hash for later retrieveal.
+#	# the $c hash or in $c->stash for later retrieveal.
 #}
 
+# Note that all of the template methods below except head should ensure that the
+# return value is a Mojo::ByteStream object if the return value contains HTML.
+
 # SKEL: If you need to add tags to the document <HEAD>, uncomment this method:
-# 
-#sub head {
-#	my ($self) = @_;
-#	
-#	# You can print head tags here, like <META>, <SCRIPT>, etc.
-#	
-#	return "";
+#
+#sub head ($c) {
+#	my $output = '';
+#	# You can append head tags to $output, like <META>, <SCRIPT>, etc.
+#
+#	return $output;
 #}
 
 # SKEL: To fill in the "info" box (to the right of the main body), use this
 # method:
-# 
-#sub info {
-#	my ($self) = @_;
-#	
-#	# Print HTML here.
-#	
-#	return "";
+#
+#sub info ($c) {
+#	my $output = '';
+#	# Append HTML to $output.
+#
+#	# Make sure the return value is a Mojo::ByteStream object if it contains html.
+#	return $output;
 #}
 
 # SKEL: To provide navigation links, use this method:
-# 
-#sub nav {
-#	my ($self, $args) = @_;
-#	
+#
+#sub nav ($c, $args) {
+#	my $output = '';
+#
 #	# See the documentation of path() and pathMacro() in
 #	# WeBWorK::ContentGenerator for more information.
-#	
-#	return "";
+#
+#	# Make sure the return value is a Mojo::ByteStream object if it contains html.
+#	return $output;
 #}
 
 # SKEL: For a little box for display options, etc., use this method:
-# 
-#sub options {
-#	my ($self) = @_;
-#	
-#	# Print HTML here.
-#	
-#	return "";
+#
+#sub options ($c) {
+#	my $output = '';
+#	# Append HTML to $output.
+#
+#	# Make sure the return value is a Mojo::ByteStream object if it contains html.
+#	return $output;
 #}
 
 # SKEL: For a list of sibling objects, use this method:
-# 
-#sub siblings {
-#	my ($self, $args) = @_;
-#	
-#	# See the documentation of siblings() and siblingsMacro() in
-#	# WeBWorK::ContentGenerator for more information.
-#	# 
-#	# Refer to implementations in ProblemSet and Problem.
-#	
-#	return "";
+#
+#sub siblings ($c, $args) {
+#	my $output = '';
+#
+#	# See the documentation of siblings() in WeBWorK::ContentGenerator for more information.
+#	# Also refer to the implementations in ProblemSet and Problem.
+#
+#	# Make sure the return value is a Mojo::ByteStream object if it contains html.
+#	return $output;
 #}
 
-# SKEL: Okay, here's the body. Most of your stuff will go here:
-# 
-sub body {
-	my ($self) = @_;
-	
-	# SKEL: Useful things from the superclass:
-	# 
-	# The WeBWorK::Request object. Good for accessing request params and so on.
-	#my $r = $self->r;
-	# 
-	# Do you need data from the course environment?
-	#my $ce = $r->ce;
-	# 
-	# Will you be accessing the database?
-	#my $db = $r->db;
-	# 
-	# Query authorization:
-	#my $authz = $r->authz;
-	# 
-	# The WeBWorK::URLPath object. Necessary for getting/generating URL data:
-	#my $urlpath = $r->urlpath;
-	
-	# FIXME: Add more examples of common idioms, mention WeBWorK::HTML::*
-	# classes, refer to superclass methods.
-	
-	# SKEL: Print your content here!
-	
-	return "";	
-}
-
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Test.pm b/lib/WeBWorK/ContentGenerator/Test.pm
deleted file mode 100644
index 3c5eb366d1..0000000000
--- a/lib/WeBWorK/ContentGenerator/Test.pm
+++ /dev/null
@@ -1,95 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::ContentGenerator::Test;
-use base qw(WeBWorK::ContentGenerator);
-
-=head1 NAME
-
-WeBWorK::ContentGenerator::Test - Test area for monkeying around with stuff.
-
-=cut
-
-use strict;
-use warnings;
-
-#use CGI;
-use WeBWorK::CGI;
-#use WeBWorK::CGIParamShim;
-use WeBWorK::Utils qw/undefstr/;
-
-sub body {
-	my ($self) = @_;
-	my $r = $self->r;
-	my $ce = $r->ce;
-	my $db = $r->db;
-	my $authz = $r->authz;
-	my $urlpath = $r->urlpath;
-
-	$self->{pwd} = $r->param("pwd") || "helloworld";
-
-	print CGI::p(
-		"REQUEST_METHOD is $ENV{REQUEST_METHOD}", CGI::br(),
-		"CONTENT_TYPE is $ENV{CONTENT_TYPE}", CGI::br(),
-		"CONTENT_LENGTH is $ENV{CONTENT_LENGTH}",
-	);
-
-	use Data::Dumper;
-	print CGI::pre(CGI::escapeHTML(Dumper($CGI::Q)));
-
-	#print CGI::start_form(-method=>"POST", -action=>$r->uri);
-	my $start_form = CGI::start_form(
-		-method=>"POST",
-		-action=>$r->uri,
-		#-enctype=>'application/x-www-form-urlencoded',
-		-enctype=>'multipart/form-data',
-	);
-	print CGI::pre(CGI::escapeHTML($start_form));
-	print $start_form;
-	print $self->hidden_authen_fields;
-
-	print CGI::p("before action:" . CGI::br()
-		. " \$r->param('pwd')=" . (defined $r->param('pwd') ? $r->param('pwd') : "UNDEF") . CGI::br()
-		. " CGI::param('pwd')=" . (defined CGI::param('pwd') ? CGI::param('pwd') : "UNDEF") . CGI::br()
-		. " \$CGI::Q->{pwd}=" . (defined $CGI::Q->{pwd} ? "@{$CGI::Q->{pwd}}" : "UNDEF") . CGI::br()
-		. " \$self->{pwd}=" . (defined $self->{pwd} ? $self->{pwd} : "UNDEF"));
-
-	if (defined $r->param("submit") and $r->param("submit") eq "ChangePWD") {
-		$self->{pwd} = $r->param("new_pwd");
-		print CGI::p("pwd change requested, new pwd is ", $self->{pwd});
-	}
-
-	print "new_pwd: ", CGI::textfield({name=>"new_pwd",value=>$self->{pwd}}), CGI::br();
-
-	print CGI::p("after action:" . CGI::br()
-		. " \$r->param('pwd')=" . (defined $r->param('pwd') ? $r->param('pwd') : "UNDEF") . CGI::br()
-		. " CGI::param('pwd')=" . (defined CGI::param('pwd') ? CGI::param('pwd') : "UNDEF") . CGI::br()
-		. " \$CGI::Q->{pwd}=" . (defined $CGI::Q->{pwd} ? "@{$CGI::Q->{pwd}}" : "UNDEF") . CGI::br()
-		. " \$self->{pwd}=" . (defined $self->{pwd} ? $self->{pwd} : "UNDEF"));
-
-	my $hidden_pwd = CGI::hidden({name=>"pwd",value=>$self->{pwd}});
-	print CGI::p("hidden field is being passed value=>".$self->{pwd}, CGI::br(),
-		"hidden field is ", CGI::pre(CGI::escapeHTML($hidden_pwd)));
-	print $hidden_pwd;
-
-	print CGI::submit({ name => "submit", value => "Refresh", class => 'btn btn-primary' });
-	print CGI::submit({ name => "submit", value => "ChangePWD", class => 'btn btn-primary' });
-
-	print CGI::end_form();
-
-	return "";
-}
-
-1;
diff --git a/lib/WeBWorK/ContentGenerator/instructorXMLHandler.pm b/lib/WeBWorK/ContentGenerator/instructorXMLHandler.pm
deleted file mode 100644
index 044619562a..0000000000
--- a/lib/WeBWorK/ContentGenerator/instructorXMLHandler.pm
+++ /dev/null
@@ -1,361 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-=head1 NAME
-
-WeBWorK::ContentGenerator::ProblemRenderer - renderViaXMLRPC is an HTML
-front end for calls to the xmlrpc webservice
-
-=cut
-
-use strict;
-use warnings;
-
-package WeBWorK::ContentGenerator::instructorXMLHandler;
-use base qw(WeBWorK::ContentGenerator);
-use WeBWorK::Debug;
-use WeBWorK::Utils qw(readFile);
-use PGUtil qw(not_null);
-
-our $UNIT_TESTS_ON = 0;    # should be called DEBUG??  FIXME
-
-#use XMLRPC::Lite;
-
-use strict;
-use warnings;
-use WebworkClient;
-use JSON;
-
-=head1 Description
-
- instructorXMLHandler -- a front end for the Webservice that accepts HTML forms
-
- receives WeBWorK problems presented as HTML forms, usually created with js xmlhttprequests,
- packages the form variables into an XML_RPC request
- suitable for all of the webservices in WebworkWebservices
- returns xml resutls
-
-=cut
-
-# To configure the target webwork server two URLs are required
-# 1. http://test.webwork.maa.org/mod_xmlrpc
-#    points to the Webservice.pm and Webservice/RenderProblem modules
-#    Is used by the client to send the original XML request to the webservice
-#  Note: This NOT the same as the webworkClient->url which does NOT have
-#        the mod_xmlrpc segment attached. webworkClient->url would be http://test.webwork.maa.org
-#        The mod_xmlrpc segment is added by WebworkClient.pm when issuing the webservice call
-#        using the constant REQUEST_URI within the subroutine xmlrpcCall
-# 2. $FORM_ACTION_URL      http:http://test.webwork.maa.org/webwork2/instructorXMLHandler
-#    points to the instructorXMLHandler.pm module.
-#
-#     This url is placed as form action url when the rendered HTML from the original
-#     request is returned to the client from Webservice/RenderProblem. The client
-#     reorganizes the XML it receives into an HTML page (with a WeBWorK form) and
-#     pipes it through a local browser.
-#
-#     The browser uses this url to resubmit the problem (with answers) via the standard
-#     HTML webform used by WeBWorK to the instructorXMLHandler.pm handler.
-#
-#     This instructorXMLHandler.pm handler acts as an intermediary between the browser
-#     and the webservice.  It interprets the HTML form sent by the browser,
-#     rewrites the form data in XML format, submits it to the WebworkWebservice.pm
-#     which processes it and sends the the resulting HTML back to renderViaXMLRPC.pm
-#     which in turn passes it back to the browser.
-# 3.  The second time a problem is submitted instructorXMLHandler.pm receives the WeBWorK form
-#     submitted directly by the browser.
-#     The instructorXMLHandler.pm translates the WeBWorK form, has it processed by the webservice
-#     and returns the result to the browser.
-#     The The client renderProblem.pl script is no longer involved.
-
-# Determine the root directory for webwork on this machine (e.g. /opt/webwork/webwork2 )
-# this is set in webwork.apache2-config
-# it specifies the address of the webwork root directory
-
-my $webwork_dir = $WeBWorK::Constants::WEBWORK_DIRECTORY;
-unless ($webwork_dir) {
-	die " instructorXMLHandler.pm requires that the top WeBWorK directory be set in "
-		. "\$WeBWorK::Constants::WEBWORK_DIRECTORY by webwork.apache-config or webwork.apache2-config\n";
-}
-
-# read the webwork2/conf/defaults.config file to determine other parameters
-#
-my $seed_ce         = new WeBWorK::CourseEnvironment({ webwork_dir => $webwork_dir });
-my $server_root_url = $seed_ce->{server_root_url};
-unless ($server_root_url) {
-	die "unable to determine apache server url using course environment |$seed_ce|."
-		. "check that the variable \$server_root_url has been properly set in conf/site.conf\n";
-}
-
-############################
-# These variables are set when the child process is started
-# and remain constant through all of the calls handled by the
-# child
-############################
-
-our ($SITE_URL, $FORM_ACTION_URL, $XML_PASSWORD, $XML_COURSE);
-
-$XML_PASSWORD = 'xmluser';
-$XML_COURSE   = 'daemon_course';
-
-$SITE_URL        = "$server_root_url";
-$FORM_ACTION_URL = "$server_root_url/webwork2/instructorXMLHandler";
-
-use constant DISPLAYMODE => 'images';    #  Mathjax  is another possibilities.
-
-our @COMMANDS = qw( listLibraries    renderProblem  );    #listLib  readFile tex2pdf
-
-# error formatting
-sub format_hash_ref {
-	my $hash = shift;
-	warn "Use a hash reference" . caller() unless ref($hash) =~ /HASH/;
-	my $out_str = "";
-	my $count   = 4;
-	foreach my $key (sort keys %$hash) {
-		my $value = defined($hash->{$key}) ? $hash->{$key} : "--";
-		$out_str .= " $key=>$value ";
-		$count--;
-		unless ($count) { $out_str .= "\n  "; $count = 4; }
-	}
-	$out_str;
-}
-# template method
-sub templateName {
-	return "";
-}
-##################################################
-# end configuration section
-##################################################
-
-sub pre_header_initialize {
-	my ($self) = @_;
-	my $r = $self->r;
-
-	# debug($r->param("visible"));
-
-	#######################
-	#  setup xmlrpc client
-	#######################
-	my $xmlrpc_client = new WebworkClient;
-
-	$xmlrpc_client->site_url($SITE_URL);    # does NOT include mod_xmlrpc ending
-		#	$xmlrpc_client->{site_url} ='';   # make this the site without the mod_xmlrpc ending? ~= s/mod_xmlrpc$
-	$xmlrpc_client->{form_action_url} = $FORM_ACTION_URL;
-	$xmlrpc_client->{user}            = 'xmluser';
-	$xmlrpc_client->{site_password}   = $XML_PASSWORD;
-	#	$xmlrpc_client->{course}        = $r->param('courseID');
-	$xmlrpc_client->{courseID} = $r->param('courseID');
-
-	# print STDERR WebworkClient::pretty_print($r->{paramcache});
-
-	my $input = { map { $_ => $r->param($_) } $r->param };
-	delete $input->{user};
-	delete $input->{user_id};
-	$input->{userID} = $r->param("user") || undef;
-	$input->{source} = '';
-	$input->{id}     = $r->param('user_id') || undef;
-
-	if ($UNIT_TESTS_ON) {
-		print STDERR "\tinstructorXMLHandler.pm " . __LINE__ . " values obtained from form parameters\n\t",
-			format_hash_ref($input), "\n";
-	}
-	my $source = "";
-	#print $r->param('problemPath');
-	my $problemPath = $r->param('problemPath');
-	if (defined($problemPath) and $problemPath) {
-		$input->{path} = $problemPath;
-	} elsif ($r->param('problemSource')) {
-		$input->{source} = $r->param('problemSource');
-	}
-
-	my $std_input = standard_input();
-	$input = { %$std_input, %$input };
-	# Fix the environment display mode and problemSeed
-	# Set environment variables for hints/solutions
-	# Set the permission level and probNum
-	$input->{envir} = {
-		%{ $input->{envir} },    # this may have undefined entries
-		showHints       => ($r->param('showHints'))     ? $r->param('showHints')     : 0,
-		showSolutions   => ($r->param('showSolutions')) ? $r->param('showSolutions') : 0,
-		probNum         => $r->param("probNum") || undef,
-		permissionLevel => ($r->{ce}->{userRoles}->{ $r->param('permissionLevel') // 0 }) // 0,
-		displayMode     => $r->param("displayMode") || undef,
-		problemSeed     => $r->param("problemSeed") || 0,
-
-	};
-	$input->{envir}->{inputs_ref} = {
-		%{ $input->{envir}->{inputs_ref} },
-		displayMode => $r->param("displayMode") || 0,
-		problemSeed => $r->param("problemSeed") || 0,
-	};
-
-	##############################
-	# xmlrpc_client calls webservice with the requested command
-	#
-	# and stores the resulting XML output in $self->{return_object}
-	# from which it will eventually be returned to the browser
-	#
-	##############################
-	#if ( $xmlrpc_client->jsXmlrpcCall($r->param("xml_command"), $input) ) {
-	#	print "tried to render a problem";
-	#$self->{output} = ($xmlrpc_client->formatRenderedProblem); #not sure what to do here just yet.
-	#} else {
-	#	$self->{output} = $xmlrpc_client->{output};  # error report
-	#	print $xmlrpc_client->{output};
-	#}
-	if ($r->param('xml_command') eq "addProblem" || $r->param('xml_command') eq "deleteProblem") {
-		$input->{path} = $r->param('problemPath');
-	}
-
-	if ($r->param('xml_command') eq "renderProblem") {
-		if (my $problemPath = $r->param('problemPath')) {
-			$problemPath =~ m|templates/(.*)|;
-			$problemPath = $1;                            # get everything in the path after templates
-			$input->{envir}->{fileName} = $problemPath;
-		}
-		$xmlrpc_client->xmlrpcCall('renderProblem', $input);
-		$self->{xml_command} = 'renderProblem';
-		$self->{output}      = $xmlrpc_client;
-		my @params = join(" ", $r->param());    # this seems to be necessary to get things read.?
-			# FIXME  -- figure out why commmenting out the line above means that $envir->{fileName} is not defined.
-			#$self->{output}->{text} = "Rendered problem";
-	} else {
-		$xmlrpc_client->xmlrpcCall($r->param("xml_command"), $input);
-		$self->{xml_command} = $r->param("xml_command");
-		$self->{output}      = $xmlrpc_client;
-	}
-}
-
-sub standard_input {
-	my $out = {
-		course_password       => '',          # not needed  use site_password??
-		session_key           => '',
-		userID                => '',          # not needed
-		set                   => '',
-		library_name          => 'Library',
-		command               => 'all',
-		answer_form_submitted => 1,
-		mode                  => 'images',
-		envir                 => {
-			inputs_ref   => { displayMode => DISPLAYMODE() },
-			problemValue => -1,
-			fileName     => ''
-		},
-		problem_state => {
-
-			num_of_correct_ans   => 200,    # we are picking phoney values so that solutions are available
-			num_of_incorrect_ans => 400,
-			recorded_score       => 1.0,
-		},
-		source => '',                       #base64 encoded
-
-	};
-
-	$out;
-}
-
-sub pretty_print_json {
-	shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
-	my $rh     = shift;
-	my $indent = shift || 0;
-
-	my $out  = "";
-	my $type = ref($rh);
-
-	if (defined($type) and $type) {
-		#$out .= " type = $type; ";
-	} elsif (!defined($rh)) {
-		#$out .= " type = UNDEFINED; ";
-	}
-	return $out . "" unless defined($rh);
-
-	if (ref($rh) =~ /HASH/ or "$rh" =~ /HASH/) {
-		$indent++;
-		foreach my $key (sort keys %{$rh}) {
-			$out .= "  " . '"' . $key . '" : ' . pretty_print_json($rh->{$key}) . ",";
-		}
-		$indent--;
-		#get rid of the last comma
-		chop $out;
-		$out = "{\n$out\n" . "}\n";
-
-	} elsif (ref($rh) =~ /ARRAY/ or "$rh" =~ /ARRAY/) {
-		foreach my $elem (@{$rh}) {
-			$out .= pretty_print_json($elem) . ",";
-
-		}
-		#get rid of the last comma
-		chop $out;
-		$out = "[\n$out\n" . "]\n";
-		#$out =  '"'.$out.'"';
-	} elsif (ref($rh) =~ /SCALAR/) {
-		$out .= "scalar reference " . ${$rh};
-	} elsif (ref($rh) =~ /Base64/) {
-		$out .= "base64 reference " . $$rh;
-
-	} elsif ($rh =~ /^[+-]?\d+$/) {
-		$out .= $rh;
-	} else {
-		$out .= '"' . $rh . '"';
-	}
-
-	return $out . "";
-}
-
-sub content {
-	###########################
-	# Return content of rendered problem to the browser that requested it
-	###########################
-	my $self = shift;
-	my $xmlrpc_client;
-	if (ref($self->{output}) =~ /WebworkClient/) {
-		$xmlrpc_client = $self->{output};
-	} else {
-		Croak("No content was returned by the xmlrpc call");
-	}
-	if (($xmlrpc_client->fault)) {    # error -- print error string
-		my $err_string = $xmlrpc_client->error_string;
-		die($err_string);
-	} elsif ($self->{xml_command} eq 'renderProblem') {
-		# FIXME hack
-		# we need to regularize the way that text is returned.
-		# it behaves differently when re-randomization in the library takes place
-		# then during the initial rendering.
-		# print only the text field (not the ra_out field)
-		# and print the text directly without formatting.
-
-		if ($xmlrpc_client->return_object->{problem_out}->{text}) {
-			print $xmlrpc_client->return_object->{problem_out}->{text};
-		} else {
-			print $xmlrpc_client->return_object->{text};
-		}
-	} else {    #returned something other than a rendered problem.
-				# in this case format a json string and print it.
-				# the contents of "{text}" needs to be labeled server response;
-		print '{"server_response":"' . $xmlrpc_client->return_object->{text} . '",';
-		if ($xmlrpc_client->return_object->{ra_out}) {
-			# print '"result_data":'.pretty_print_json($xmlrpc->return_object->{ra_out}).'}';
-			if (ref($xmlrpc_client->return_object->{ra_out})) {
-				print '"result_data": ' . to_json($xmlrpc_client->return_object->{ra_out}) . '}';
-			} else {
-				print '"result_data": "' . $xmlrpc_client->return_object->{ra_out} . '"}';
-			}
-		} else {
-			print '"result_data":""}';
-		}
-	}
-	#print "".pretty_print_json($self->{output}->{ra_out});
-}
-
-1;
diff --git a/lib/WeBWorK/ContentGenerator/renderViaXMLRPC.pm b/lib/WeBWorK/ContentGenerator/renderViaXMLRPC.pm
deleted file mode 100644
index bbb347bf86..0000000000
--- a/lib/WeBWorK/ContentGenerator/renderViaXMLRPC.pm
+++ /dev/null
@@ -1,217 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-=head1 NAME
-
-WeBWorK::ContentGenerator::ProblemRenderer - renderViaXMLRPC is an HTML 
-front end for calls to the xmlrpc webservice
-
-=cut
-
-use strict;
-use warnings;
-
-package WeBWorK::ContentGenerator::renderViaXMLRPC;
-use base qw(WeBWorK::ContentGenerator);
-
-
-#use XMLRPC::Lite;
-#use MIME::Base64 qw( encode_base64 decode_base64);
-
-
-use strict;
-use warnings;
-use WebworkClient;
-use WeBWorK::Debug;
-use CGI;
-
-=head1 Description
-
- renderViaXMLRPC -- a front end for the Webservice that accepts HTML forms
-
- receives WeBWorK problems presented as HTML forms,
- packages the form variables into an XML_RPC request
- suitable for the Webservice/RenderProblem.pm
- takes the answer returned by the webservice (which has HTML format) and 
- returns it to the browser.
-
-=cut
- 
-# To configure the target webwork server two URLs are required
-# 1.  The url  http://test.webwork.maa.org/mod_xmlrpc
-#    points to the Webservice.pm and Webservice/RenderProblem modules
-#    Is used by the client to send the original XML request to the webservice.
-#    It is constructed in WebworkClient::xmlrpcCall() from the value of $webworkClient->site_url which does 
-#    NOT have the mod_xmlrpc segment (it should be   http://test.webwork.maa.org) 
-#    and the constant  REQUEST_URI defined in WebworkClient.pm to be mod_xmlrpc.  
-#
-# 2. $FORM_ACTION_URL      http:http://test.webwork.maa.org/webwork2/html2xml
-#    points to the renderViaXMLRPC.pm module.
-#
-#     This url is placed as form action url when the rendered HTML from the original
-#     request is returned to the client from Webservice/RenderProblem. The client
-#     reorganizes the XML it receives into an HTML page (with a WeBWorK form) and 
-#     pipes it through a local browser.
-#
-#     The browser uses this url to resubmit the problem (with answers) via the standard
-#     HTML webform used by WeBWorK to the renderViaXMLRPC.pm handler.  
-#
-#     This renderViaXMLRPC.pm handler acts as an intermediary between the browser 
-#     and the webservice.  It interprets the HTML form sent by the browser, 
-#     rewrites the form data in XML format, submits it to the WebworkWebservice.pm 
-#     which processes it and sends the the resulting HTML back to renderViaXMLRPC.pm
-#     which in turn passes it back to the browser.
-# 3.  The second time a problem is submitted renderViaXMLRPC.pm receives the WeBWorK form 
-#     submitted directly by the browser.  
-#     The renderViaXMLRPC.pm translates the WeBWorK form, has it processes by the webservice
-#     and returns the result to the browser. 
-#     The The client renderProblem.pl script is no longer involved.
-# 4.  Summary: renderProblem.pl is only involved in the first round trip
-#     of the submitted problem.  After that the communication is  between the browser and
-#     renderViaXMLRPC using HTML forms and between renderViaXMLRPC and the WebworkWebservice.pm
-#     module using XML_RPC.
-
-
-# Determine the root directory for webwork on this machine (e.g. /opt/webwork/webwork2 )
-# this is set in webwork.apache2-config
-# it specifies the address of the webwork root directory
-
-#my $webwork_dir  = $ENV{WEBWORK_ROOT};
-my $webwork_dir  = $WeBWorK::Constants::WEBWORK_DIRECTORY;
-unless ($webwork_dir) {
-	die "renderViaXMLRPC.pm requires that the top WeBWorK directory be set in ".
-	"\$WeBWorK::Constants::WEBWORK_DIRECTORY by webwork.apache-config or webwork.apache2-config\n";
-}
-
-# read the webwork2/conf/defaults.config file to determine other parameters
-#
-my $seed_ce = new WeBWorK::CourseEnvironment({ webwork_dir => $webwork_dir });
-my $server_root_url = $seed_ce->{server_root_url};
-unless ($server_root_url) {
-	die "unable to determine apache server url using course environment |$seed_ce|.".
-	    "check that the variable \$server_root_url has been properly set in conf/site.conf\n";
-}
-
-############################
-# These variables are set when the child process is started
-# and remain constant through all of the calls handled by the 
-# child
-############################
-
-our ($SITE_URL,$FORM_ACTION_URL, $XML_PASSWORD, $XML_COURSE);
-
-	$XML_PASSWORD     	 =  'xmlwebwork';
-	$XML_COURSE          =  'daemon_course';
-
-
-
-	$SITE_URL             =  "$server_root_url"; 
-	$FORM_ACTION_URL     =  "$server_root_url/webwork2/html2xml";
-
-
-our @COMMANDS = qw( listLibraries    renderProblem  ); #listLib  readFile tex2pdf 
-
-
-##################################################
-# end configuration section
-##################################################
-
-
-sub pre_header_initialize {
-	my ($self) = @_;
-	my $r = $self->r;
-	# Note: Vars helps handle things like checkbox 'packed' data;
-	my %inputs_ref =  WeBWorK::Form->new_from_paramable($r)->Vars ;
-
-	# When passing parameters via an LMS you get "custom_" put in front of them. So lets
-	# try to clean that up
-	$inputs_ref{userID} = $inputs_ref{custom_userid} if $inputs_ref{custom_userid};
-	$inputs_ref{courseID} = $inputs_ref{custom_courseid} if $inputs_ref{custom_courseid};
-	$inputs_ref{displayMode} = $inputs_ref{custom_displaymode} if $inputs_ref{custom_displaymode};
-	$inputs_ref{course_password} = $inputs_ref{custom_course_password} if $inputs_ref{custom_course_password};
-	$inputs_ref{answersSubmitted} = $inputs_ref{custom_answerssubmitted} if $inputs_ref{custom_answerssubmitted};
-	$inputs_ref{problemSeed} = $inputs_ref{custom_problemseed} if $inputs_ref{custom_problemseed};
-	$inputs_ref{problemUUID} = $inputs_ref{problemUUID}//$inputs_ref{problemIdentifierPrefix}; # earlier version of problemUUID
-	$inputs_ref{sourceFilePath} = $inputs_ref{custom_sourcefilepath} if $inputs_ref{custom_sourcefilepath};
-	$inputs_ref{outputformat} = $inputs_ref{custom_outputformat} if $inputs_ref{custom_outputformat};
-	
-	
-	my $user_id      = $inputs_ref{userID};
-	my $courseName   = $inputs_ref{courseID};
-	my $displayMode  = $inputs_ref{displayMode};
-	my $problemSeed  = $inputs_ref{problemSeed};
-	
-	# FIXME -- it might be better to send this error if the input is not all correct
-	# rather than trying to set defaults such as displaymode
-	unless ( $user_id && $courseName && $displayMode && $problemSeed) {
-		print CGI::ul( 
-		      CGI::h1("Missing essential data in web dataform:"),
-			  CGI::li(CGI::escapeHTML([
-		      	"userID: |$user_id|", 
-		      	"courseID: |$courseName|",	
-		        "displayMode: |$displayMode|", 
-		        "problemSeed: |$problemSeed|"
-		      ])));
-		return;
-	}
-    #######################
-    #  setup xmlrpc client
-    #######################
-    my $xmlrpc_client = new WebworkClient;
-
-	$xmlrpc_client ->encoded_source($r->param('problemSource')) ; # this source has already been encoded
-	$xmlrpc_client-> site_url($SITE_URL);
-	$xmlrpc_client->{form_action_url} = $FORM_ACTION_URL;
-	$xmlrpc_client->{userID}          = $inputs_ref{userID};
-	$xmlrpc_client->{course_password} = $inputs_ref{course_password};
-	$xmlrpc_client->{site_password}   = $XML_PASSWORD;
-	$xmlrpc_client->{session_key}     = $inputs_ref{session_key};
-	$xmlrpc_client->{courseID}        = $inputs_ref{courseID};
-	$xmlrpc_client->{outputformat}    = $inputs_ref{outputformat};
-	$xmlrpc_client->{sourceFilePath}  = $inputs_ref{sourceFilePath};
-	$xmlrpc_client->{inputs_ref} = \%inputs_ref;  # contains form data
-	# print STDERR WebworkClient::pretty_print($r->{paramcache});
-
-	$self->{wantsjson} = 1 if $inputs_ref{outputformat} eq 'json' || $inputs_ref{send_pg_flags};
-	
-	##############################
-	# xmlrpc_client calls webservice to have problem rendered
-	#
-	# and stores the resulting HTML output in $self->return_object
-	# from which it will eventually be returned to the browser
-	#
-	##############################
-	if ( $xmlrpc_client->xmlrpcCall('renderProblem', $xmlrpc_client->{inputs_ref}) )    {
-			$self->{output} = $xmlrpc_client->formatRenderedProblem ;
-	} else {
-		$self->{output}= $xmlrpc_client->return_object;  # error report
-	}
-	
-	################################
- }
-
-sub content {
-   ###########################
-   # Return content of rendered problem to the browser that requested it
-   ###########################
-	my $self = shift;
-	$self->{r}->content_type("application/json; charset=utf-8") if $self->{wantsjson};
-	print $self->{output};
-}
-
-
-
-
-1;
diff --git a/lib/WeBWorK/Controller.pm b/lib/WeBWorK/Controller.pm
new file mode 100644
index 0000000000..6c6e4783a2
--- /dev/null
+++ b/lib/WeBWorK/Controller.pm
@@ -0,0 +1,206 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Controller;
+use Mojo::Base 'Mojolicious::Controller', -signatures;
+
+=head1 NAME
+
+WeBWorK::Controller - a controller for the WeBWorK Mojolicious app.  It is a
+subclass of the Mojolicious::Controller class with additional WeBWorK-specific
+fields.
+
+=cut
+
+use Encode;
+use JSON::MaybeXS;
+
+use WeBWorK::Localize;
+
+# The Mojolicous::Controller param method does not work quite the same as the previous WeBWorK::Controller method did.
+# So this override method emulates the old behavior.
+# FIXME: This override should be dropped and the Mojolicious::Controller param and every_param methods used directly.
+# Mojolicious already keeps a cache of parameter values and also allows setting of parameters.  So everything done here
+# is redundant.
+sub param ($c, $name = undef, $val = undef) {
+	if (!defined $c->{paramcache}) {
+		for my $name (@{ $c->req->params->names }) {
+			$c->{paramcache}{$name} = $c->req->every_param($name);
+		}
+	}
+
+	return keys %{ $c->{paramcache} } unless $name;
+
+	if (@_ == 3) {
+		if (!defined $val) {
+			$c->{paramcache}{$name} = [];
+		} elsif (ref $val eq 'ARRAY') {
+			$c->{paramcache}{$name} = [@$val];    # Make a copy
+		} else {
+			$c->{paramcache}{$name} = [$val];
+		}
+		# Set the Mojo::Message::Request param value to the same thing as the paramcache value.
+		# This ensures that the values set via this method are picked up in forms.
+		$c->req->param($name, $c->{paramcache}{$name});
+	}
+	return unless exists $c->{paramcache}{$name};
+	return wantarray ? @{ $c->{paramcache}{$name} } : $c->{paramcache}{$name}[0];
+}
+
+=head1 METHODS
+
+=over
+
+=item $c->ce([$new])
+
+Return the course environment (WeBWorK::CourseEnvironment) associated with this
+request. If $new is specified, set the course environment to $new before
+returning the value.  In this case the value of $new is also saved to the stash
+as 'ce'.  This means that this value is available as $ce in the templates.
+
+=cut
+
+sub ce ($c, $new = undef) {
+	$c->stash->{ce} = $c->{ce} = $new if defined $new;
+	return $c->stash->{ce};
+}
+
+=item $c->db([$new])
+
+Return the database (WeBWorK::DB) associated with this request. If $new is
+specified, set the database to $new before returning the value.  In this case
+the value of $new is also saved to the stash as 'db'.  This means that this is
+available as $db in the templates.
+
+=cut
+
+sub db ($c, $new = undef) {
+	$c->stash->{db} = $c->{db} = $new if defined $new;
+	return $c->stash->{db};
+}
+
+=item $c->authen([$new])
+
+Return the authenticator (WeBWorK::Authen) associated with this request. If $new
+is specified, set the authenticator to $new before returning the value.  In this
+case the value of $new is also saved to the stash as 'authen'.  This means that
+this value is available as $authen in the templates.
+
+=cut
+
+sub authen ($c, $new = undef) {
+	$c->stash->{authen} = $c->{authen} = $new if defined $new;
+	return $c->stash->{authen};
+}
+
+=item $c->authz([$new])
+
+Return the authorizer (WeBWorK::Authz) associated with this request. If $new is
+specified, set the authorizer to $new before returning the value.  In this case
+the value of $new is also saved to the stash as 'authz'.  This means that this
+value is available as $authz in the templates.
+
+=cut
+
+sub authz ($c, $new = undef) {
+	$c->stash->{authz} = $c->{authz} = $new if defined $new;
+	return $c->stash->{authz};
+}
+
+=item $c->submitTime([$new])
+
+Return the time this request was received for processing, which we refer
+to as the submitTime. The time is recorded very early on in the processing
+of the request. If $new is specified, set submitTime to $new before returning
+the value.
+
+=cut
+
+sub submitTime ($c, $new = undef) {
+	$c->stash->{submitTime} = $c->{submitTime} = $new if defined $new;
+	return $c->stash->{submitTime};
+}
+
+sub language_handle ($c, $new = undef) {
+	$c->stash->{language_handle} = $c->{language_handle} = $new if defined $new;
+	return $c->stash->{language_handle};
+}
+
+=head1 ERROR OUTPUT FUNCTIONS
+
+=over
+
+=item textMessage($c, $exception, $uuid, $time)
+
+Format a message for HTML output reporting an exception and any
+associated warnings.
+
+=cut
+
+sub textMessage ($c, $uuid, $time) {
+	my $uri = $c->req->url->to_abs->to_string;
+
+	my $exception = $c->stash->{exception} // '';
+
+	my %headers = %{ $c->req->headers->to_hash };
+	# Avoid JSON errors for the value of 'sec-ch-ua'.
+	if (defined($headers{'sec-ch-ua'})) {
+		$headers{'sec-ch-ua'} = join('', $headers{'sec-ch-ua'});
+		$headers{'sec-ch-ua'} =~ s/\"//g;
+	}
+
+	my $additional_json = encode_json({
+		'Error record identifier' => $uuid,
+		Time                      => $time,
+		Method                    => $c->req->method,
+		URI                       => $uri,
+		'HTTP Headers'            => {%headers},
+		Warnings                  => [ defined $c->stash->{warnings} ? split m/\n+/, $c->stash->{warnings} : () ],
+	});
+
+	return "[$uuid] [$uri] $additional_json $exception";
+}
+
+=item jsonMessage($c, $uuid, $time)
+
+Format a JSON message for log output reporting an exception and any
+associated warnings.
+
+=cut
+
+sub jsonMessage ($c, $uuid, $time) {
+	my %headers = %{ $c->req->headers->to_hash };
+	# Avoid JSON errors for the value of 'sec-ch-ua'.
+	if (defined($headers{'sec-ch-ua'})) {
+		$headers{'sec-ch-ua'} = join('', $headers{'sec-ch-ua'});
+		$headers{'sec-ch-ua'} =~ s/\"//g;
+	}
+
+	return encode_json({
+		'Error record identifier' => $uuid,
+		Time                      => $time,
+		Method                    => $c->req->method,
+		URI                       => $c->req->url->to_abs->to_string,
+		'HTTP Headers'            => {%headers},
+		Warnings                  => [ defined $c->stash->{warnings} ? split m/\n+/, $c->stash->{warnings} : () ],
+		Exception                 => $c->stash->{exception} ? $c->stash->{exception}->to_string : ''
+	});
+}
+
+=back
+
+=cut
+
+1;
diff --git a/lib/WeBWorK/CourseEnvironment.pm b/lib/WeBWorK/CourseEnvironment.pm
index 26a8029ea5..f057b1f140 100644
--- a/lib/WeBWorK/CourseEnvironment.pm
+++ b/lib/WeBWorK/CourseEnvironment.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -51,73 +51,65 @@ safe compartment into a hash. This hash becomes the course environment.
 
 use strict;
 use warnings;
+
 use Carp;
-use WWSafe;
+use Opcode qw(empty_opset);
+
+use Safe;
 use WeBWorK::Utils qw(readFile);
 use WeBWorK::Debug;
-use Opcode qw(empty_opset);
 
 =head1 CONSTRUCTION
 
 =over
 
-=item new(HASHREF)
+=item new($seedVars)
+
+C<$seedVars> is an optional argument.  If provided it must be a reference to a
+hash containing scalar variables with which to seed the course environment. It
+may contain values for the keys C<webwork_dir>, C<pg_dir>, C<courseName>, and
+C<web_config_filename>.
 
-HASHREF is a reference to a hash containing scalar variables with which to seed
-the course environment. It must contain at least a value for the key
-C<webworkRoot>.
+If C<webwork_dir> or C<pg_dir> are not given in C<$seedVars> they will be taken
+from the C<%WeBWorK::SeedCE> hash.  If they are still not found in that hash,
+then they will be taken from the system environment variables C<WEBWORK_ROOT>
+and C<PG_ROOT>.
 
-The C<new> method finds the file F<conf/defaults.config> relative to the given
+The C<new> method finds the file F<conf/defaults.config> relative to the
 C<webwork_dir> directory. After reading this file, it uses the
 C<$courseFiles{environment}> variable, if present, to locate the course
 environment file. If found, the file is read and added to the environment.
 
-=item new(ROOT URLROOT PGROOT COURSENAME)
-
-A deprecated form of the constructor in which four seed variables are given
-explicitly: C<webwork_dir>, C<webwork_url>, C<pg_dir>, and C<courseName>.
-
 =cut
 
-# NEW SYNTAX
-#
-# new($invocant, $seedVarsRef)
-#   $invocant       implicitly set by caller
-#   $seedVarsRef    reference to hash containing scalar variables with which to
-#                   seed the course environment
-#
-# OLD SYNTAX
-#
-# new($invocant, $webworkRoot, $webworkURLRoot, $pgRoot, $courseName)
-#   $invocant          implicitly set by caller
-#   $webworkRoot       directory that contains the WeBWorK distribution
-#   $webworkURLRoot    URL that points to the WeBWorK system
-#   $pgRoot            directory that contains the PG distribution
-#   $courseName        name of the course being used
 sub new {
-	my ($invocant, @rest) = @_;
+	my ($invocant, $seedVars) = @_;
 	my $class = ref($invocant) || $invocant;
 
-	# contains scalar symbols/values with which to seed course environment
-	my %seedVars;
+	$seedVars //= {};
+	croak __PACKAGE__ . ": The only argument for new must be a hash reference.\n" unless ref($seedVars) eq 'HASH';
 
-	# where do we get the seed variables?
-	if (ref $rest[0] eq "HASH") {
-		%seedVars = %{$rest[0]};
-	} else {
-		debug __PACKAGE__, ": deprecated four-argument form of new() used.", caller(1),"\n", caller(2),"\n";
-		$seedVars{webwork_dir}    = $rest[0];
-		$seedVars{webwork_url}    = $rest[1];
-		$seedVars{pg_dir}         = $rest[2];
-		$seedVars{courseName}     = $rest[3];
-	}
-	$seedVars{courseName} = $seedVars{courseName}||"___"; # prevents extraneous error messages
-	my $safe = WWSafe->new;
+	# Get the webwork_dir and pg_dir from the SeedCE or the environment if not set.
+	$seedVars->{webwork_dir} //= $WeBWorK::SeedCE{webwork_dir} // $ENV{WEBWORK_ROOT};
+	$seedVars->{pg_dir}      //= $WeBWorK::SeedCE{pg_dir}      // $ENV{PG_ROOT};
+
+	$seedVars->{courseName} ||= '___';    # prevents extraneous error messages
+
+	# Mojolicious sets the INT and TERM signal handlers, and perl Safe overrides those (as those signals can be used to
+	# break out of Safe) which causes an error later when the Mojolicious signals handlers are not called as they should
+	# be.  So the current signal handlers are cached here and restored after the Safe reval is completed.
+	my %ORIG_SIG;
+	$ORIG_SIG{$_} = $SIG{$_} for keys %SIG;
+
+	# The following line is a work around for a bug that occurs on some systems.  See
+	# https://rt.cpan.org/Public/Bug/Display.html?id=77916 and
+	# https://github.com/openwebwork/webwork2/pull/2098#issuecomment-1619812699.
+	my %dummy = %+;
+
+	my $safe = Safe->new;
 	$safe->permit('rand');
-	# to avoid error messages make sure that courseName is defined
-	$seedVars{courseName} = $seedVars{courseName}//"foobar_course";
 	# seed course environment with initial values
-	while (my ($var, $val) = each %seedVars) {
+	while (my ($var, $val) = each %$seedVars) {
 		$val = "" if not defined $val;
 		$safe->reval("\$$var = '$val';");
 	}
@@ -125,7 +117,7 @@ sub new {
 	# Compile the "include" function with all opcodes available.
 	my $include = q[ sub include {
 		my ($file) = @_;
-		my $fullPath = "].$seedVars{webwork_dir}.q[/$file";
+		my $fullPath = "] . $seedVars->{webwork_dir} . q[/$file";
 		# This regex matches any string that begins with "../",
 		# ends with "/..", contains "/../", or is "..".
 		if ($fullPath =~ m!(?:^|/)\.\.(?:/|$)!) {
@@ -151,23 +143,18 @@ sub new {
 
 	# determine location of globalEnvironmentFile
 	my $globalEnvironmentFile;
-	if (-r "$seedVars{webwork_dir}/conf/defaults.config") {
-		$globalEnvironmentFile = "$seedVars{webwork_dir}/conf/defaults.config";
+	if (-r "$seedVars->{webwork_dir}/conf/defaults.config") {
+		$globalEnvironmentFile = "$seedVars->{webwork_dir}/conf/defaults.config";
 	} else {
 		croak "Cannot read global environment file $globalEnvironmentFile";
 	}
 
 	# read and evaluate the global environment file
 	my $globalFileContents = readFile($globalEnvironmentFile);
-	# warn "about to evaluate defaults.conf $seedVars{courseName}\n";
-	# warn  join(" | ", (caller(1))[0,1,2,3,4] ), "\n";
 	$safe->share_from('main', [qw(%ENV)]);
 	$safe->reval($globalFileContents);
 	# warn "end the evaluation\n";
 
-
-
-
 	# if that evaluation failed, we can't really go on...
 	# we need a global environment!
 	$@ and croak "Could not evaluate global environment file $globalEnvironmentFile: $@";
@@ -176,25 +163,25 @@ sub new {
 	# pull it out of $safe's symbol table ad hoc
 	# (we don't want to do the hash conversion yet)
 	no strict 'refs';
-	my $courseEnvironmentFile = ${*{${$safe->root."::"}{courseFiles}}}{environment};
-	my $courseWebConfigFile = $seedVars{web_config_filename} ||
-		${*{${$safe->root."::"}{courseFiles}}}{simpleConfig};
+	my $courseEnvironmentFile = ${ *{ ${ $safe->root . "::" }{courseFiles} } }{environment};
+	my $courseWebConfigFile   = $seedVars->{web_config_filename}
+		|| ${ *{ ${ $safe->root . "::" }{courseFiles} } }{simpleConfig};
 	use strict 'refs';
 
 	# make sure the course environment file actually exists (it might not if we don't have a real course)
 	# before we try to read it
-	if(-r $courseEnvironmentFile){
+	if (-r $courseEnvironmentFile) {
 		# read and evaluate the course environment file
 		# if readFile failed, we don't bother trying to reval
-		my $courseFileContents = eval { readFile($courseEnvironmentFile) }; # catch exceptions
+		my $courseFileContents = eval { readFile($courseEnvironmentFile) };       # catch exceptions
 		$@ or $safe->reval($courseFileContents);
-		my $courseWebConfigContents = eval { readFile($courseWebConfigFile) }; # catch exceptions
+		my $courseWebConfigContents = eval { readFile($courseWebConfigFile) };    # catch exceptions
 		$@ or $safe->reval($courseWebConfigContents);
 	}
 
 	# get the safe compartment's namespace as a hash
 	no strict 'refs';
-	my %symbolHash = %{$safe->root."::"};
+	my %symbolHash = %{ $safe->root . "::" };
 	use strict 'refs';
 
 	# convert the symbol hash into a hash of regular variables.
@@ -203,9 +190,9 @@ sub new {
 		# weed out internal symbols
 		next if $name =~ /^(INC|_.*|__ANON__|main::|include)$/;
 		# pull scalar, array, and hash values for this symbol
-		my $scalar = ${*{$symbolHash{$name}}};
-		my @array = @{*{$symbolHash{$name}}};
-		my %hash = %{*{$symbolHash{$name}}};
+		my $scalar = ${ *{ $symbolHash{$name} } };
+		my @array  = @{ *{ $symbolHash{$name} } };
+		my %hash   = %{ *{ $symbolHash{$name} } };
 		# for multiple variables sharing a symbol, scalar takes precedence
 		# over array, which takes precedence over hash.
 		if (defined $scalar) {
@@ -217,30 +204,32 @@ sub new {
 		}
 	}
 	# now that we know the name of the pg_dir we can get the pg VERSION file
-	my $PG_version_file = $self->{'pg_dir'}."/VERSION";
+	my $PG_version_file = $self->{'pg_dir'} . "/VERSION";
 
 	# Try a fallback location
-	if ( !-r $PG_version_file ) {
-	  $PG_version_file = $self->{'webwork_dir'}."/../pg/VERSION";
+	if (!-r $PG_version_file) {
+		$PG_version_file = $self->{'webwork_dir'} . "/../pg/VERSION";
 	}
 	# #	We'll get the pg version here and read it into the safe symbol table
-	if (-r $PG_version_file){
-			#print STDERR ( "\n\nread PG_version file $PG_version_file\n\n");
-		my $PG_version_file_contents = readFile($PG_version_file)//'';
+	if (-r $PG_version_file) {
+		#print STDERR ( "\n\nread PG_version file $PG_version_file\n\n");
+		my $PG_version_file_contents = readFile($PG_version_file) // '';
 		$safe->reval($PG_version_file_contents);
-			#print STDERR ("\n contents: $PG_version_file_contents");
+		#print STDERR ("\n contents: $PG_version_file_contents");
 
 		no strict 'refs';
-		my %symbolHash2 = %{$safe->root."::"};
+		my %symbolHash2 = %{ $safe->root . "::" };
 		#print STDERR "symbolHash".join(' ', keys %symbolHash2);
 		use strict 'refs';
-		$self->{PG_VERSION}=${*{$symbolHash2{PG_VERSION}}};
+		$self->{PG_VERSION} = ${ *{ $symbolHash2{PG_VERSION} } };
 	} else {
-		$self->{PG_VERSION}="unknown";
+		$self->{PG_VERSION} = "unknown";
 		#croak "Cannot read PG version file $PG_version_file";
 		warn "Cannot read PG version file $PG_version_file";
 	}
 
+	# Restore the original signal handlers.
+	local $SIG{$_} = $ORIG_SIG{$_} for keys %ORIG_SIG;
 
 	bless $self, $class;
 
@@ -250,15 +239,21 @@ sub new {
 
 	# create reverse-lookup hash mapping status abbreviations to real names
 	$self->{_status_abbrev_to_name} = {
-		map { my $name = $_; map { $_ => $name } @{$self->{statuses}{$name}{abbrevs}} }
-			keys %{$self->{statuses}}
+		map {
+			my $name = $_;
+			map { $_ => $name } @{ $self->{statuses}{$name}{abbrevs} }
+		}
+			keys %{ $self->{statuses} }
 	};
 
+	# Make sure that this is set in case it is not defined in site.conf.
+	$self->{pg_htdocs_url} //= '/pg_files';
+
 	# Fixup for courses that still have an underscore, 'heb', 'zh_hk', or 'en_us' saved in their settings files.
 	$self->{language} =~ s/_/-/g;
 	$self->{language} = 'he-IL' if $self->{language} eq 'heb';
 	$self->{language} = 'zh-HK' if $self->{language} eq 'zh-hk';
-	$self->{language} = 'en' if $self->{language} eq 'en-us';
+	$self->{language} = 'en'    if $self->{language} eq 'en-us';
 
 	# now that we're done, we can go ahead and return...
 	return $self;
@@ -321,7 +316,7 @@ sub status_name_to_abbrevs {
 	}
 
 	return unless exists $ce->{statuses}{$status_name};
-	return @{$ce->{statuses}{$status_name}{abbrevs}};
+	return @{ $ce->{statuses}{$status_name}{abbrevs} };
 }
 
 =item status_has_behavior($status_name, $behavior)
@@ -343,10 +338,10 @@ sub status_has_behavior {
 
 	if (exists $ce->{statuses}{$status_name}) {
 		if (exists $ce->{statuses}{$status_name}{behaviors}) {
-			my $num_matches = grep { $_ eq $behavior } @{$ce->{statuses}{$status_name}{behaviors}};
+			my $num_matches = grep { $_ eq $behavior } @{ $ce->{statuses}{$status_name}{behaviors} };
 			return $num_matches > 0;
 		} else {
-			return 0; # no behaviors
+			return 0;    # no behaviors
 		}
 	} else {
 		warn "status '$status_name' not found in \%statuses -- assuming no behaviors.\n";
diff --git a/lib/WeBWorK/DB.pm b/lib/WeBWorK/DB.pm
index abfa7628fd..32ce214844 100644
--- a/lib/WeBWorK/DB.pm
+++ b/lib/WeBWorK/DB.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -94,15 +94,17 @@ record class currently defined for that table in C<%dbLayout>.
 
 use strict;
 use warnings;
+
 use Carp;
 use Data::Dumper;
 use Scalar::Util qw/blessed/;
+use HTML::Entities qw( encode_entities );
+
 use WeBWorK::DB::Schema;
 use WeBWorK::DB::Utils qw/make_vsetID grok_vsetID grok_setID_from_vsetID_sql
 	grok_versionID_from_vsetID_sql/;
 use WeBWorK::Debug;
 use WeBWorK::Utils qw(runtime_use);
-use HTML::Entities qw( encode_entities );
 
 =for comment
 
@@ -143,21 +145,21 @@ use Exception::Class (
 		description => 'unknown database error',
 	},
 	'WeBWorK::DB::Ex::RecordExists' => {
-		isa => 'WeBWorK::DB::Ex',
-		fields => ['type', 'key'],
-		description =>"record exists"
+		isa         => 'WeBWorK::DB::Ex',
+		fields      => [ 'type', 'key' ],
+		description => "record exists"
 	},
 	'WeBWorK::DB::Ex::RecordNotFound' => {
-		isa => 'WeBWorK::DB::Ex',
-		fields => ['type', 'key'],
-		description =>"record not found"
+		isa         => 'WeBWorK::DB::Ex',
+		fields      => [ 'type', 'key' ],
+		description => "record not found"
 	},
 	'WeBWorK::DB::Ex::DependencyNotFound' => {
 		isa => 'WeBWorK::DB::Ex::RecordNotFound',
 	},
 	'WeBWorK::DB::Ex::TableMissing' => {
-    	isa => 'WeBWorK::DB::Ex',
-    	description =>"missing table",
+		isa         => 'WeBWorK::DB::Ex',
+		description => "missing table",
 	},
 );
 
@@ -219,8 +221,8 @@ thrown.
 sub new {
 	my ($invocant, $dbLayout) = @_;
 	my $class = ref($invocant) || $invocant;
-	my $self = {};
-	bless $self, $class; # bless this here so we can pass it to the schema
+	my $self  = {};
+	bless $self, $class;    # bless this here so we can pass it to the schema
 
 	# load the modules required to handle each table, and create driver
 	foreach my $table (keys %$dbLayout) {
@@ -241,15 +243,15 @@ sub init_table {
 		}
 	}
 
-	my $layout = $dbLayout->{$table};
-	my $record = $layout->{record};
-	my $schema = $layout->{schema};
-	my $driver = $layout->{driver};
-	my $source = $layout->{source};
-	my $depend = $layout->{depend};
-	my $params = $layout->{params};
-  	my $engine = $layout->{engine};
-  	my $character_set = $layout->{character_set};
+	my $layout        = $dbLayout->{$table};
+	my $record        = $layout->{record};
+	my $schema        = $layout->{schema};
+	my $driver        = $layout->{driver};
+	my $source        = $layout->{source};
+	my $depend        = $layout->{depend};
+	my $params        = $layout->{params};
+	my $engine        = $layout->{engine};
+	my $character_set = $layout->{character_set};
 
 	# add a key for this table to the self hash, but don't define it yet
 	# this for loop detection
@@ -269,8 +271,7 @@ sub init_table {
 		if $@;
 
 	runtime_use($schema);
-	my $schemaObject = eval { $schema->new(
-		$self, $driverObject, $table, $record, $params, $engine, $character_set) };
+	my $schemaObject = eval { $schema->new($self, $driverObject, $table, $record, $params, $engine, $character_set) };
 	croak "error instantiating DB schema $schema for table $table: $@"
 		if $@;
 
@@ -371,8 +372,8 @@ sub create_tables {
 	my ($self) = @_;
 
 	foreach my $table (keys %$self) {
-		next if $table =~ /^_/; # skip non-table self fields (none yet)
-		next if $self->{$table}{params}{non_native}; # skip non-native tables
+		next if $table =~ /^_/;                         # skip non-table self fields (none yet)
+		next if $self->{$table}{params}{non_native};    # skip non-native tables
 		my $schema_obj = $self->{$table};
 		if ($schema_obj->can("create_table")) {
 			$schema_obj->create_table;
@@ -388,13 +389,14 @@ sub rename_tables {
 	my ($self, $new_dblayout) = @_;
 
 	foreach my $table (keys %$self) {
-		next if $table =~ /^_/; # skip non-table self fields (none yet)
-		next if $self->{$table}{params}{non_native}; # skip non-native tables
+		next if $table =~ /^_/;                         # skip non-table self fields (none yet)
+		next if $self->{$table}{params}{non_native};    # skip non-native tables
 		my $schema_obj = $self->{$table};
 		if (exists $new_dblayout->{$table}) {
 			if ($schema_obj->can("rename_table")) {
 				# we look into the new dblayout to determine the new table names
-				my $new_sql_table_name = defined $new_dblayout->{$table}{params}{tableOverride}
+				my $new_sql_table_name =
+					defined $new_dblayout->{$table}{params}{tableOverride}
 					? $new_dblayout->{$table}{params}{tableOverride}
 					: $table;
 				$schema_obj->rename_table($new_sql_table_name);
@@ -413,8 +415,8 @@ sub delete_tables {
 	my ($self) = @_;
 
 	foreach my $table (keys %$self) {
-		next if $table =~ /^_/; # skip non-table self fields (none yet)
-		next if $self->{$table}{params}{non_native}; # skip non-native tables
+		next if $table =~ /^_/;                         # skip non-table self fields (none yet)
+		next if $self->{$table}{params}{non_native};    # skip non-native tables
 		my $schema_obj = $self->{$table};
 		if ($schema_obj->can("delete_table")) {
 			$schema_obj->delete_table;
@@ -430,8 +432,8 @@ sub dump_tables {
 	my ($self, $dump_dir) = @_;
 
 	foreach my $table (keys %$self) {
-		next if $table =~ /^_/; # skip non-table self fields (none yet)
-		next if $self->{$table}{params}{non_native}; # skip non-native tables
+		next if $table =~ /^_/;                         # skip non-table self fields (none yet)
+		next if $self->{$table}{params}{non_native};    # skip non-native tables
 		my $schema_obj = $self->{$table};
 		if ($schema_obj->can("dump_table")) {
 			my $dump_file = "$dump_dir/$table.sql";
@@ -448,8 +450,8 @@ sub restore_tables {
 	my ($self, $dump_dir) = @_;
 
 	foreach my $table (keys %$self) {
-		next if $table =~ /^_/; # skip non-table self fields (none yet)
-		next if $self->{$table}{params}{non_native}; # skip non-native tables
+		next if $table =~ /^_/;                         # skip non-table self fields (none yet)
+		next if $self->{$table}{params}{non_native};    # skip non-native tables
 		my $schema_obj = $self->{$table};
 		if ($schema_obj->can("restore_table")) {
 			my $dump_file = "$dump_dir/$table.sql";
@@ -462,17 +464,59 @@ sub restore_tables {
 	return 1;
 }
 
+################################################################################
+# transaction support
+################################################################################
+
+# Any course will have the user table, so that allows getting the database
+# handle.
+
+sub start_transaction {
+	my $self = shift;
+	eval { $self->{user}->dbh->begin_work; };
+	if ($@) {
+		my $msg = "Error in start_transaction: $@";
+		if ($msg =~ /Already in a transaction/) {
+			warn "Aborting active transaction.";
+			$self->{user}->dbh->rollback;
+		}
+		croak $msg;
+	}
+}
+
+sub end_transaction {
+	my $self = shift;
+	eval { $self->{user}->dbh->commit; };
+	if ($@) {
+		my $msg = "Error in end_transaction: $@";
+		$self->abort_transaction;
+		croak $msg;
+	}
+}
+
+sub abort_transaction {
+	my $self = shift;
+	eval {
+		$self->{user}->dbh->{AutoCommit} = 0;
+		$self->{user}->dbh->rollback;
+	};
+	if ($@) {
+		my $msg = "Error in abort_transaction: $@";
+		croak $msg;
+	}
+}
+
 ################################################################################
 # user functions
 ################################################################################
 
 BEGIN {
-	*User = gen_schema_accessor("user");
-	*newUser = gen_new("user");
+	*User            = gen_schema_accessor("user");
+	*newUser         = gen_new("user");
 	*countUsersWhere = gen_count_where("user");
 	*existsUserWhere = gen_exists_where("user");
-	*listUsersWhere = gen_list_where("user");
-	*getUsersWhere = gen_get_records_where("user");
+	*listUsersWhere  = gen_list_where("user");
+	*getUsersWhere   = gen_get_records_where("user");
 }
 
 sub countUsers { return scalar shift->listUsers(@_) }
@@ -494,7 +538,7 @@ sub existsUser {
 
 sub getUser {
 	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
-	return ( $self->getUsers($userID) )[0];
+	return ($self->getUsers($userID))[0];
 }
 
 sub getUsers {
@@ -504,9 +548,7 @@ sub getUsers {
 
 sub addUser {
 	my ($self, $User) = shift->checkArgs(\@_, qw/REC:user/);
-	eval {
-		return $self->{user}->add($User);
-	};
+	eval { return $self->{user}->add($User); };
 	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
 		croak "addUser: user exists (perhaps you meant to use putUser?)";
 	} elsif ($@) {
@@ -525,7 +567,7 @@ sub addUser {
 
 sub putUser {
 	my ($self, $User) = shift->checkArgs(\@_, qw/REC:user/);
-	my $rows = $self->{user}->put($User); # DBI returns 0E0 for 0.
+	my $rows = $self->{user}->put($User);    # DBI returns 0E0 for 0.
 	if ($rows == 0) {
 		croak "putUser: user not found (perhaps you meant to use addUser?)";
 	} else {
@@ -548,12 +590,12 @@ sub deleteUser {
 ################################################################################
 
 BEGIN {
-	*Password = gen_schema_accessor("password");
-	*newPassword = gen_new("password");
+	*Password            = gen_schema_accessor("password");
+	*newPassword         = gen_new("password");
 	*countPasswordsWhere = gen_count_where("password");
 	*existsPasswordWhere = gen_exists_where("password");
-	*listPasswordsWhere = gen_list_where("password");
-	*getPasswordsWhere = gen_get_records_where("password");
+	*listPasswordsWhere  = gen_list_where("password");
+	*getPasswordsWhere   = gen_get_records_where("password");
 }
 
 sub countPasswords { return scalar shift->countPasswords(@_) }
@@ -561,7 +603,7 @@ sub countPasswords { return scalar shift->countPasswords(@_) }
 sub listPasswords {
 	my ($self) = shift->checkArgs(\@_);
 	if (wantarray) {
-		return map { @$_ } $self->{password}->get_fields_where(["user_id"]);
+		return map {@$_} $self->{password}->get_fields_where(["user_id"]);
 	} else {
 		return $self->{password}->count_where;
 	}
@@ -576,7 +618,7 @@ sub existsPassword {
 
 sub getPassword {
 	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
-	return ( $self->getPasswords($userID) )[0];
+	return ($self->getPasswords($userID))[0];
 }
 
 sub getPasswords {
@@ -588,7 +630,7 @@ sub getPasswords {
 	# (this code is duplicated in getPermissionLevels, below)
 	for (my $i = 0; $i < @Passwords; $i++) {
 		my $Password = $Passwords[$i];
-		my $userID = $userIDs[$i];
+		my $userID   = $userIDs[$i];
 		if (not defined $Password) {
 			if ($self->{user}->exists($userID)) {
 				$Password = $self->newPassword(user_id => $userID);
@@ -610,9 +652,7 @@ sub addPassword {
 	croak "addPassword: user ", $Password->user_id, " not found"
 		unless $self->{user}->exists($Password->user_id);
 
-	eval {
-		return $self->{password}->add($Password);
-	};
+	eval { return $self->{password}->add($Password); };
 	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
 		croak "addPassword: password exists (perhaps you meant to use putPassword?)";
 	} elsif ($@) {
@@ -622,7 +662,7 @@ sub addPassword {
 
 sub putPassword {
 	my ($self, $Password) = shift->checkArgs(\@_, qw/REC:password/);
-	my $rows = $self->{password}->put($Password); # DBI returns 0E0 for 0.
+	my $rows = $self->{password}->put($Password);    # DBI returns 0E0 for 0.
 	if ($rows == 0) {
 		# AUTO-CREATE permission level records
 		return $self->addPassword($Password);
@@ -641,12 +681,12 @@ sub deletePassword {
 ################################################################################
 
 BEGIN {
-	*PermissionLevel = gen_schema_accessor("permission");
-	*newPermissionLevel = gen_new("permission");
+	*PermissionLevel            = gen_schema_accessor("permission");
+	*newPermissionLevel         = gen_new("permission");
 	*countPermissionLevelsWhere = gen_count_where("permission");
 	*existsPermissionLevelWhere = gen_exists_where("permission");
-	*listPermissionLevelsWhere = gen_list_where("permission");
-	*getPermissionLevelsWhere = gen_get_records_where("permission");
+	*listPermissionLevelsWhere  = gen_list_where("permission");
+	*getPermissionLevelsWhere   = gen_get_records_where("permission");
 }
 
 sub countPermissionLevels { return scalar shift->listPermissionLevels(@_) }
@@ -654,7 +694,7 @@ sub countPermissionLevels { return scalar shift->listPermissionLevels(@_) }
 sub listPermissionLevels {
 	my ($self) = shift->checkArgs(\@_);
 	if (wantarray) {
-		return map { @$_ } $self->{permission}->get_fields_where(["user_id"]);
+		return map {@$_} $self->{permission}->get_fields_where(["user_id"]);
 	} else {
 		return $self->{permission}->count_where;
 	}
@@ -669,7 +709,7 @@ sub existsPermissionLevel {
 
 sub getPermissionLevel {
 	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
-	return ( $self->getPermissionLevels($userID) )[0];
+	return ($self->getPermissionLevels($userID))[0];
 }
 
 sub getPermissionLevels {
@@ -681,7 +721,7 @@ sub getPermissionLevels {
 	# (this code is duplicated in getPasswords, above)
 	for (my $i = 0; $i < @PermissionLevels; $i++) {
 		my $PermissionLevel = $PermissionLevels[$i];
-		my $userID = $userIDs[$i];
+		my $userID          = $userIDs[$i];
 		if (not defined $PermissionLevel) {
 			if ($self->{user}->exists($userID)) {
 				$PermissionLevel = $self->newPermissionLevel(user_id => $userID);
@@ -703,9 +743,7 @@ sub addPermissionLevel {
 	croak "addPermissionLevel: user ", $PermissionLevel->user_id, " not found"
 		unless $self->{user}->exists($PermissionLevel->user_id);
 
-	eval {
-		return $self->{permission}->add($PermissionLevel);
-	};
+	eval { return $self->{permission}->add($PermissionLevel); };
 	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
 		croak "addPermissionLevel: permission level exists (perhaps you meant to use putPermissionLevel?)";
 	} elsif ($@) {
@@ -715,7 +753,7 @@ sub addPermissionLevel {
 
 sub putPermissionLevel {
 	my ($self, $PermissionLevel) = shift->checkArgs(\@_, qw/REC:permission/);
-	my $rows = $self->{permission}->put($PermissionLevel); # DBI returns 0E0 for 0.
+	my $rows = $self->{permission}->put($PermissionLevel);    # DBI returns 0E0 for 0.
 	if ($rows == 0) {
 		# AUTO-CREATE permission level records
 		return $self->addPermissionLevel($PermissionLevel);
@@ -734,12 +772,12 @@ sub deletePermissionLevel {
 ################################################################################
 
 BEGIN {
-	*Key = gen_schema_accessor("key");
-	*newKey = gen_new("key");
+	*Key            = gen_schema_accessor("key");
+	*newKey         = gen_new("key");
 	*countKeysWhere = gen_count_where("key");
 	*existsKeyWhere = gen_exists_where("key");
-	*listKeysWhere = gen_list_where("key");
-	*getKeysWhere = gen_get_records_where("key");
+	*listKeysWhere  = gen_list_where("key");
+	*getKeysWhere   = gen_get_records_where("key");
 }
 
 sub countKeys { return scalar shift->listKeys(@_) }
@@ -747,7 +785,7 @@ sub countKeys { return scalar shift->listKeys(@_) }
 sub listKeys {
 	my ($self) = shift->checkArgs(\@_);
 	if (wantarray) {
-		return map { @$_ } $self->{key}->get_fields_where(["user_id"]);
+		return map {@$_} $self->{key}->get_fields_where(["user_id"]);
 	} else {
 		return $self->{key}->count_where;
 	}
@@ -760,7 +798,7 @@ sub existsKey {
 
 sub getKey {
 	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
-	return ( $self->getKeys($userID) )[0];
+	return ($self->getKeys($userID))[0];
 }
 
 sub getKeys {
@@ -781,20 +819,18 @@ sub addKey {
 	if ($Key->user_id =~ /([^,]+)(?:,([^,]*))?(,g)?/) {
 		my ($userID, $proctorID) = ($1, $2);
 		croak "addKey: user $userID not found"
-#			unless $self->{user}->exists($userID);
-			unless $Key -> key eq "nonce" or $self->{user}->exists($userID);
+			#			unless $self->{user}->exists($userID);
+			unless $Key->key eq "nonce" or $self->{user}->exists($userID);
 		croak "addKey: proctor $proctorID not found"
-#			unless $self->{user}->exists($proctorID);
-			unless $Key -> key eq "nonce" or $self->{user}->exists($proctorID);
+			#			unless $self->{user}->exists($proctorID);
+			unless $Key->key eq "nonce" or $self->{user}->exists($proctorID);
 	} else {
 		croak "addKey: user ", $Key->user_id, " not found"
-#			unless $self->{user}->exists($Key->user_id);
-			unless $Key -> key eq "nonce" or $self->{user}->exists($Key->user_id);
+			#			unless $self->{user}->exists($Key->user_id);
+			unless $Key->key eq "nonce" or $self->{user}->exists($Key->user_id);
 	}
 
-	eval {
-		return $self->{key}->add($Key);
-	};
+	eval { return $self->{key}->add($Key); };
 	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
 		croak "addKey: key exists (perhaps you meant to use putKey?)";
 	} elsif ($@) {
@@ -805,7 +841,7 @@ sub addKey {
 sub putKey {
 	# PROCTORING - allow comma in keyfields
 	my ($self, $Key) = shift->checkArgs(\@_, qw/VREC:key/);
-	my $rows = $self->{key}->put($Key); # DBI returns 0E0 for 0.
+	my $rows = $self->{key}->put($Key);    # DBI returns 0E0 for 0.
 	if ($rows == 0) {
 		croak "putKey: key not found (perhaps you meant to use addKey?)";
 	} else {
@@ -820,7 +856,7 @@ sub deleteKey {
 
 sub deleteAllProctorKeys {
 	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
-	my $where = [user_id_like => "$userID,%"];
+	my $where = [ user_id_like => "$userID,%" ];
 
 	return $self->{key}->delete_where($where);
 }
@@ -830,14 +866,14 @@ sub deleteAllProctorKeys {
 ################################################################################
 
 BEGIN {
-	*Setting = gen_schema_accessor("setting");
-	*newSetting = gen_new("setting");
-	*countSettingsWhere = gen_count_where("setting");
-	*existsSettingWhere = gen_exists_where("setting");
-	*listSettingsWhere = gen_list_where("setting");
-	*getSettingsWhere = gen_get_records_where("setting");
-	*addSettings = gen_insert_records("setting");
-	*putSettings = gen_update_records("setting");
+	*Setting             = gen_schema_accessor("setting");
+	*newSetting          = gen_new("setting");
+	*countSettingsWhere  = gen_count_where("setting");
+	*existsSettingWhere  = gen_exists_where("setting");
+	*listSettingsWhere   = gen_list_where("setting");
+	*getSettingsWhere    = gen_get_records_where("setting");
+	*addSettings         = gen_insert_records("setting");
+	*putSettings         = gen_update_records("setting");
 	*deleteSettingsWhere = gen_delete_where("setting");
 }
 
@@ -847,13 +883,13 @@ BEGIN {
 
 sub settingExists {
 	my ($self, $name) = @_;
-	return $self->{setting}->exists_where([name_eq=>$name]);
+	return $self->{setting}->exists_where([ name_eq => $name ]);
 }
 
 sub getSettingValue {
 	my ($self, $name) = @_;
 
-	return (map { @$_ } $self->{setting}->get_fields_where(['value'], [name_eq=>$name]))[0];
+	return (map {@$_} $self->{setting}->get_fields_where(['value'], [ name_eq => $name ]))[0];
 }
 
 # we totally don't care if a setting already exists (and in fact i find that
@@ -864,15 +900,15 @@ sub getSettingValue {
 sub setSettingValue {
 	my ($self, $name, $value) = @_;
 	if ($self->settingExists($name)) {
-		return $self->{setting}->update_where({value=>$value}, [name_eq=>$name]);
+		return $self->{setting}->update_where({ value => $value }, [ name_eq => $name ]);
 	} else {
-		return $self->{setting}->insert_fields(['name','value'], [[$name,$value]]);
+		return $self->{setting}->insert_fields([ 'name', 'value' ], [ [ $name, $value ] ]);
 	}
 }
 
 sub deleteSetting {
 	my ($self, $name) = shift->checkArgs(\@_, qw/name/);
-	return $self->{setting}->delete_where([name_eq=>$name]);
+	return $self->{setting}->delete_where([ name_eq => $name ]);
 }
 
 ################################################################################
@@ -884,52 +920,50 @@ sub deleteSetting {
 #    to which assignments can be restricted to or denied from.
 
 BEGIN {
-	*Location = gen_schema_accessor("locations");
-	*newLocation = gen_new("locations");
+	*Location            = gen_schema_accessor("locations");
+	*newLocation         = gen_new("locations");
 	*countLocationsWhere = gen_count_where("locations");
 	*existsLocationWhere = gen_exists_where("locations");
-	*listLocationsWhere = gen_list_where("locations");
-	*getLocationsWhere = gen_get_records_where("locations");
+	*listLocationsWhere  = gen_list_where("locations");
+	*getLocationsWhere   = gen_get_records_where("locations");
 }
 
 sub countLocations { return scalar shift->listLocations(@_) }
 
 sub listLocations {
-	my ( $self ) = shift->checkArgs(\@_);
-	if ( wantarray ) {
-	    return map {@$_} $self->{locations}->get_fields_where(["location_id"]);
+	my ($self) = shift->checkArgs(\@_);
+	if (wantarray) {
+		return map {@$_} $self->{locations}->get_fields_where(["location_id"]);
 	} else {
 		return $self->{locations}->count_where;
 	}
 }
 
 sub existsLocation {
-	my ( $self, $locationID ) = shift->checkArgs(\@_, qw/location_id/);
+	my ($self, $locationID) = shift->checkArgs(\@_, qw/location_id/);
 	return $self->{locations}->exists($locationID);
 }
 
 sub getLocation {
-	my ( $self, $locationID ) = shift->checkArgs(\@_, qw/location_id/);
-	return ( $self->getLocations($locationID) )[0];
+	my ($self, $locationID) = shift->checkArgs(\@_, qw/location_id/);
+	return ($self->getLocations($locationID))[0];
 }
 
 sub getLocations {
-	my ( $self, @locationIDs ) = shift->checkArgs(\@_, qw/location_id*/);
-	return $self->{locations}->gets(map {[$_]} @locationIDs);
+	my ($self, @locationIDs) = shift->checkArgs(\@_, qw/location_id*/);
+	return $self->{locations}->gets(map { [$_] } @locationIDs);
 }
 
 sub getAllLocations {
-	my ( $self ) = shift->checkArgs(\@_);
+	my ($self) = shift->checkArgs(\@_);
 	return $self->{locations}->get_records_where();
 }
 
 sub addLocation {
-	my ( $self, $Location ) = shift->checkArgs(\@_, qw/REC:locations/);
+	my ($self, $Location) = shift->checkArgs(\@_, qw/REC:locations/);
 
-	eval {
-		return $self->{locations}->add($Location);
-	};
-	if ( my $ex = caught WeBWorK::DB::Ex::RecordExists ) {
+	eval { return $self->{locations}->add($Location); };
+	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
 		croak "addLocation: location exists (perhaps you meant to use putLocation?)";
 	} elsif ($@) {
 		die $@;
@@ -939,7 +973,7 @@ sub addLocation {
 sub putLocation {
 	my ($self, $Location) = shift->checkArgs(\@_, qw/REC:locations/);
 	my $rows = $self->{locations}->put($Location);
-	if ( $rows == 0 ) {
+	if ($rows == 0) {
 		croak "putLocation: location not found (perhaps you meant to use addLocation?)";
 	} else {
 		return $rows;
@@ -951,7 +985,7 @@ sub deleteLocation {
 	#    any case where that would happen, but we include it for other
 	#    deletions, so I'll keep it here.
 	my $U = caller eq __PACKAGE__ ? "!" : "";
-	my ( $self, $locationID ) = shift->checkArgs(\@_, "location_id$U");
+	my ($self, $locationID) = shift->checkArgs(\@_, "location_id$U");
 	$self->deleteGlobalSetLocation(undef, $locationID);
 	$self->deleteUserSetLocation(undef, undef, $locationID);
 
@@ -977,21 +1011,21 @@ sub deleteLocation {
 #    with the locations that are used for restrictions.
 
 BEGIN {
-	*LocationAddress = gen_schema_accessor("location_addresses");
-	*newLocationAddress = gen_new("location_addresses");
+	*LocationAddress             = gen_schema_accessor("location_addresses");
+	*newLocationAddress          = gen_new("location_addresses");
 	*countLocationAddressesWhere = gen_count_where("location_addresses");
-	*existsLocationAddressWhere = gen_exists_where("location_addresses");
-	*listLocationAddressesWhere = gen_list_where("location_addresses");
-	*getLocationAddressesWhere = gen_get_records_where("location_addresses");
+	*existsLocationAddressWhere  = gen_exists_where("location_addresses");
+	*listLocationAddressesWhere  = gen_list_where("location_addresses");
+	*getLocationAddressesWhere   = gen_get_records_where("location_addresses");
 }
 
 sub countAddressLocations { return scalar shift->listAddressLocations(@_) }
 
 sub listAddressLocations {
 	my ($self, $ipmask) = shift->checkArgs(\@_, qw/ip_mask/);
-	my $where = [ip_mask_eq => $ipmask];
-	if ( wantarray ) {
-		return map {@$_} $self->{location_addresses}->get_fields_where(["location_id"],$where);
+	my $where = [ ip_mask_eq => $ipmask ];
+	if (wantarray) {
+		return map {@$_} $self->{location_addresses}->get_fields_where(["location_id"], $where);
 	} else {
 		return $self->{location_addresses}->count_where($where);
 	}
@@ -1001,9 +1035,9 @@ sub countLocationAddresses { return scalar shift->listLocationAddresses(@_) }
 
 sub listLocationAddresses {
 	my ($self, $locationID) = shift->checkArgs(\@_, qw/location_id/);
-	my $where = [location_id_eq => $locationID];
-	if ( wantarray ) {
-		return map {@$_} $self->{location_addresses}->get_fields_where(["ip_mask"],$where);
+	my $where = [ location_id_eq => $locationID ];
+	if (wantarray) {
+		return map {@$_} $self->{location_addresses}->get_fields_where(["ip_mask"], $where);
 	} else {
 		return $self->{location_addresses}->count_where($where);
 	}
@@ -1019,7 +1053,7 @@ sub existsLocationAddress {
 
 sub getAllLocationAddresses {
 	my ($self, $locationID) = shift->checkArgs(\@_, qw/location_id/);
-	my $where = [location_id_eq => $locationID];
+	my $where = [ location_id_eq => $locationID ];
 	return $self->{location_addresses}->get_records_where($where);
 }
 
@@ -1027,9 +1061,7 @@ sub addLocationAddress {
 	my ($self, $LocationAddress) = shift->checkArgs(\@_, qw/REC:location_addresses/);
 	croak "addLocationAddress: location ", $LocationAddress->location_id, " not found"
 		unless $self->{locations}->exists($LocationAddress->location_id);
-	eval {
-		return $self->{location_addresses}->add($LocationAddress);
-	};
+	eval { return $self->{location_addresses}->add($LocationAddress); };
 	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
 		croak "addLocationAddress: location address exists (perhaps you meant to use putLocationAddress?)";
 	} elsif ($@) {
@@ -1040,7 +1072,7 @@ sub addLocationAddress {
 sub putLocationAddress {
 	my ($self, $LocationAddress) = shift->checkArgs(\@_, qw/REC:location_addresses/);
 	my $rows = $self->{location_addresses}->put($LocationAddress);
-	if ( $rows == 0 ) {
+	if ($rows == 0) {
 		croak "putLocationAddress: location address not found (perhaps you meant to use addLocationAddress?)";
 	} else {
 		return $rows;
@@ -1054,24 +1086,23 @@ sub deleteLocationAddress {
 	return $self->{location_addresses}->delete($locationID, $ipmask);
 }
 
-
 ################################################################################
 # past_answers functions
 ################################################################################
 
 BEGIN {
-	*PastAnswer = gen_schema_accessor("past_answer");
-	*newPastAnswer = gen_new("past_answer");
-	*countPastAnswersWhere = gen_count_where("past_answer");
+	*PastAnswer             = gen_schema_accessor("past_answer");
+	*newPastAnswer          = gen_new("past_answer");
+	*countPastAnswersWhere  = gen_count_where("past_answer");
 	*existsPastAnswersWhere = gen_exists_where("past_answer");
-	*listPastAnswersWhere = gen_list_where("past_answer");
-	*getPastAnswersWhere = gen_get_records_where("past_answer");
+	*listPastAnswersWhere   = gen_list_where("past_answer");
+	*getPastAnswersWhere    = gen_get_records_where("past_answer");
 }
 
 sub countProblemPastAnswers { return scalar shift->listPastAnswers(@_) }
 
 sub listProblemPastAnswers {
-        my ($self, $courseID, $userID, $setID, $problemID);
+	my ($self, $courseID, $userID, $setID, $problemID);
 	$self = shift;
 	$self->checkArgs(\@_, qw/course_id? user_id set_id problem_id/);
 
@@ -1079,26 +1110,25 @@ sub listProblemPastAnswers {
 	#id.  This is ok becaus the table is course specific.
 	my $where;
 	if ($#_ == 3) {
-	    ($courseID, $userID, $setID, $problemID) = @_;
-	    $where = [course_id_eq_user_id_eq_set_id_eq_problem_id_eq => $courseID,$userID,$setID,$problemID];
+		($courseID, $userID, $setID, $problemID) = @_;
+		$where = [ course_id_eq_user_id_eq_set_id_eq_problem_id_eq => $courseID, $userID, $setID, $problemID ];
 
 	} else {
-	    ($userID, $setID, $problemID) = @_;
-	    $where = [user_id_eq_set_id_eq_problem_id_eq => $userID,$setID,$problemID];
+		($userID, $setID, $problemID) = @_;
+		$where = [ user_id_eq_set_id_eq_problem_id_eq => $userID, $setID, $problemID ];
 	}
 
-        my $order = [ 'answer_id' ];
+	my $order = ['answer_id'];
 
 	if (wantarray) {
-		return map { @$_ } $self->{past_answer}->get_fields_where(["answer_id"], $where, $order);
+		return map {@$_} $self->{past_answer}->get_fields_where(["answer_id"], $where, $order);
 	} else {
 		return $self->{past_answer}->count_where($where);
 	}
 }
 
-
 sub latestProblemPastAnswer {
-        my ($self, $courseID, $userID, $setID, $problemID);
+	my ($self, $courseID, $userID, $setID, $problemID);
 	$self = shift;
 	$self->checkArgs(\@_, qw/course_id? user_id set_id problem_id/);
 
@@ -1106,19 +1136,18 @@ sub latestProblemPastAnswer {
 	#id.  This is ok becaus the table is course specific.
 	my @answerIDs;
 	if ($#_ == 3) {
-	    ($courseID, $userID, $setID, $problemID) = @_;
-	    @answerIDs = $self->listProblemPastAnswers($courseID,$userID,$setID,$problemID);
+		($courseID, $userID, $setID, $problemID) = @_;
+		@answerIDs = $self->listProblemPastAnswers($courseID, $userID, $setID, $problemID);
 
 	} else {
-	    ($userID, $setID, $problemID) = @_;
-	    @answerIDs = $self->listProblemPastAnswers($userID,$setID,$problemID);
+		($userID, $setID, $problemID) = @_;
+		@answerIDs = $self->listProblemPastAnswers($userID, $setID, $problemID);
 	}
 
 	#array should already be returned from lowest id to greatest.  Latest answer is greatest
 	return $answerIDs[$#answerIDs];
 }
 
-
 sub existsPastAnswer {
 	my ($self, $answerID) = shift->checkArgs(\@_, qw/answer_id/);
 	return $self->{past_answer}->exists($answerID);
@@ -1126,7 +1155,7 @@ sub existsPastAnswer {
 
 sub getPastAnswer {
 	my ($self, $answerID) = shift->checkArgs(\@_, qw/answer_id/);
-	return ( $self->getPastAnswers([$answerID]) )[0];
+	return ($self->getPastAnswers([$answerID]))[0];
 }
 
 sub getPastAnswers {
@@ -1137,20 +1166,16 @@ sub getPastAnswers {
 sub addPastAnswer {
 	my ($self, $pastAnswer) = shift->checkArgs(\@_, qw/REC:past_answer/);
 
-#       we dont have a course table yet but when we do we should check this
+	#       we dont have a course table yet but when we do we should check this
 
-#	croak "addPastAnswert: course ", $pastAnswer->course_id, " not found"
-#		unless $self->{course}->exists($pastAnswer->course_id);
+	#	croak "addPastAnswert: course ", $pastAnswer->course_id, " not found"
+	#		unless $self->{course}->exists($pastAnswer->course_id);
 
 	croak "addPastAnswert: user problem ", $pastAnswer->user_id, " ",
-              $pastAnswer->set_id, " ", $pastAnswer->problem_id, " not found"
-		unless 	$self->{problem_user}->exists($pastAnswer->user_id,
-						      $pastAnswer->set_id,
-						      $pastAnswer->problem_id);
+		$pastAnswer->set_id, " ", $pastAnswer->problem_id, " not found"
+		unless $self->{problem_user}->exists($pastAnswer->user_id, $pastAnswer->set_id, $pastAnswer->problem_id);
 
-	eval {
-		return $self->{past_answer}->add($pastAnswer);
-	};
+	eval { return $self->{past_answer}->add($pastAnswer); };
 	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
 		croak "addPastAnswer: past answer exists (perhaps you meant to use putPastAnswer?)";
 	} elsif ($@) {
@@ -1160,7 +1185,7 @@ sub addPastAnswer {
 
 sub putPastAnswer {
 	my ($self, $pastAnswer) = shift->checkArgs(\@_, qw/REC:past_answer/);
-	my $rows = $self->{past_answer}->put($pastAnswer); # DBI returns 0E0 for 0.
+	my $rows = $self->{past_answer}->put($pastAnswer);    # DBI returns 0E0 for 0.
 	if ($rows == 0) {
 		croak "putPastAnswer: past answer not found (perhaps you meant to use addPastAnswer?)";
 	} else {
@@ -1175,18 +1200,17 @@ sub deletePastAnswer {
 	return $self->{past_answer}->delete($answer_id);
 }
 
-
 ################################################################################
 # set functions
 ################################################################################
 
 BEGIN {
-	*GlobalSet = gen_schema_accessor("set");
-	*newGlobalSet = gen_new("set");
+	*GlobalSet            = gen_schema_accessor("set");
+	*newGlobalSet         = gen_new("set");
 	*countGlobalSetsWhere = gen_count_where("set");
 	*existsGlobalSetWhere = gen_exists_where("set");
-	*listGlobalSetsWhere = gen_list_where("set");
-	*getGlobalSetsWhere = gen_get_records_where("set");
+	*listGlobalSetsWhere  = gen_list_where("set");
+	*getGlobalSetsWhere   = gen_get_records_where("set");
 }
 
 sub countGlobalSets { return scalar shift->listGlobalSets(@_) }
@@ -1194,7 +1218,7 @@ sub countGlobalSets { return scalar shift->listGlobalSets(@_) }
 sub listGlobalSets {
 	my ($self) = shift->checkArgs(\@_);
 	if (wantarray) {
-		return map { @$_ } $self->{set}->get_fields_where(["set_id"]);
+		return map {@$_} $self->{set}->get_fields_where(["set_id"]);
 	} else {
 		return $self->{set}->count_where;
 	}
@@ -1207,7 +1231,7 @@ sub existsGlobalSet {
 
 sub getGlobalSet {
 	my ($self, $setID) = shift->checkArgs(\@_, qw/set_id/);
-	return ( $self->getGlobalSets($setID) )[0];
+	return ($self->getGlobalSets($setID))[0];
 }
 
 sub getGlobalSets {
@@ -1231,7 +1255,7 @@ sub addGlobalSet {
 
 sub putGlobalSet {
 	my ($self, $GlobalSet) = shift->checkArgs(\@_, qw/REC:set/);
-	my $rows = $self->{set}->put($GlobalSet); # DBI returns 0E0 for 0.
+	my $rows = $self->{set}->put($GlobalSet);    # DBI returns 0E0 for 0.
 	if ($rows == 0) {
 		croak "putGlobalSet: global set not found (perhaps you meant to use addGlobalSet?)";
 	} else {
@@ -1254,12 +1278,12 @@ sub deleteGlobalSet {
 ###############################################################
 
 BEGIN {
-	*Achievement = gen_schema_accessor("achievement");
-	*newAchievement = gen_new("achievement");
+	*Achievement            = gen_schema_accessor("achievement");
+	*newAchievement         = gen_new("achievement");
 	*countAchievementsWhere = gen_count_where("achievement");
 	*existsAchievementWhere = gen_exists_where("achievement");
-	*listAchievementsWhere = gen_list_where("achievement");
-	*getAchievementsWhere = gen_get_records_where("achievement");
+	*listAchievementsWhere  = gen_list_where("achievement");
+	*getAchievementsWhere   = gen_get_records_where("achievement");
 }
 
 sub countAchievements { return scalar shift->listAchievements(@_) }
@@ -1267,7 +1291,7 @@ sub countAchievements { return scalar shift->listAchievements(@_) }
 sub listAchievements {
 	my ($self) = shift->checkArgs(\@_);
 	if (wantarray) {
-		return map { @$_ } $self->{achievement}->get_fields_where(["achievement_id"]);
+		return map {@$_} $self->{achievement}->get_fields_where(["achievement_id"]);
 	} else {
 		return $self->{achievement}->count_where;
 	}
@@ -1280,7 +1304,7 @@ sub existsAchievement {
 
 sub getAchievement {
 	my ($self, $achievementID) = shift->checkArgs(\@_, qw/achievement_id/);
-	return ( $self->getAchievements($achievementID) )[0];
+	return ($self->getAchievements($achievementID))[0];
 }
 
 sub getAchievements {
@@ -1304,7 +1328,7 @@ sub addAchievement {
 
 sub putAchievement {
 	my ($self, $Achievement) = shift->checkArgs(\@_, qw/REC:achievement/);
-	my $rows = $self->{achievement}->put($Achievement); # DBI returns 0E0 for 0.
+	my $rows = $self->{achievement}->put($Achievement);    # DBI returns 0E0 for 0.
 	if ($rows == 0) {
 		croak "putAchievement: achievement not found (perhaps you meant to use addAchievement?)";
 	} else {
@@ -1325,12 +1349,12 @@ sub deleteAchievement {
 ###############################################################
 
 BEGIN {
-	*GlobalUserAchievement = gen_schema_accessor("global_user_achievement");
-	*newGlobalUserAchievement = gen_new("global_user_achievement");
+	*GlobalUserAchievement            = gen_schema_accessor("global_user_achievement");
+	*newGlobalUserAchievement         = gen_new("global_user_achievement");
 	*countGlobalUserAchievementsWhere = gen_count_where("global_user_achievement");
 	*existsGlobalUserAchievementWhere = gen_exists_where("global_user_achievement");
-	*listGlobalUserAchievementsWhere = gen_list_where("global_user_achievement");
-	*getGlobalUserAchievementsWhere = gen_get_records_where("global_user_achievement");
+	*listGlobalUserAchievementsWhere  = gen_list_where("global_user_achievement");
+	*getGlobalUserAchievementsWhere   = gen_get_records_where("global_user_achievement");
 }
 
 sub countGlobalUserAchievements { return scalar shift->listGlobalUserAchievements(@_) }
@@ -1338,7 +1362,7 @@ sub countGlobalUserAchievements { return scalar shift->listGlobalUserAchievement
 sub listGlobalUserAchievements {
 	my ($self) = shift->checkArgs(\@_);
 	if (wantarray) {
-		return map { @$_ } $self->{global_user_achievement}->get_fields_where(["user_id"]);
+		return map {@$_} $self->{global_user_achievement}->get_fields_where(["user_id"]);
 	} else {
 		return $self->{global_user_achievement}->count_where;
 	}
@@ -1351,7 +1375,7 @@ sub existsGlobalUserAchievement {
 
 sub getGlobalUserAchievement {
 	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
-	return ( $self->getGlobalUserAchievements($userID) )[0];
+	return ($self->getGlobalUserAchievements($userID))[0];
 }
 
 sub getGlobalUserAchievements {
@@ -1364,7 +1388,7 @@ sub addGlobalUserAchievement {
 
 	eval {
 
-	    return $self->{global_user_achievement}->add($globalUserAchievement);
+		return $self->{global_user_achievement}->add($globalUserAchievement);
 	};
 	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
 		croak "addGlobalUserAchievement: user achievement exists (perhaps you meant to use putGlobalUserAchievement?)";
@@ -1375,9 +1399,10 @@ sub addGlobalUserAchievement {
 
 sub putGlobalUserAchievement {
 	my ($self, $globalUserAchievement) = shift->checkArgs(\@_, qw/REC:global_user_achievement/);
-	my $rows = $self->{global_user_achievement}->put($globalUserAchievement); # DBI returns 0E0 for 0.
+	my $rows = $self->{global_user_achievement}->put($globalUserAchievement);    # DBI returns 0E0 for 0.
 	if ($rows == 0) {
-		croak "putGlobalUserAchievement: user achievement not found (perhaps you meant to use addGlobalUserAchievement?)";
+		croak
+			"putGlobalUserAchievement: user achievement not found (perhaps you meant to use addGlobalUserAchievement?)";
 	} else {
 		return $rows;
 	}
@@ -1390,37 +1415,36 @@ sub deleteGlobalUserAchievement {
 
 	my @achievements = $self->listUserAchievements($userID);
 	foreach my $achievement (@achievements) {
-	    $self->deleteUserAchievement($userID,$achievement);
+		$self->deleteUserAchievement($userID, $achievement);
 	}
 
-	if ($self->{global_user_achievement}){
+	if ($self->{global_user_achievement}) {
 		return $self->{global_user_achievement}->delete($userID);
 	} else {
 		return 0;
 	}
 }
 
-
 ################################################################################
 # achievement_user functions
 ################################################################################
 
 BEGIN {
-	*UserAchievement = gen_schema_accessor("achievement_user");
-	*newUserAchievement = gen_new("achievement_user");
+	*UserAchievement            = gen_schema_accessor("achievement_user");
+	*newUserAchievement         = gen_new("achievement_user");
 	*countUserAchievementsWhere = gen_count_where("achievement_user");
 	*existsUserAchievementWhere = gen_exists_where("achievement_user");
-	*listUserAchievementsWhere = gen_list_where("achievement_user");
-	*getUserAchievementsWhere = gen_get_records_where("achievement_user");
+	*listUserAchievementsWhere  = gen_list_where("achievement_user");
+	*getUserAchievementsWhere   = gen_get_records_where("achievement_user");
 }
 
 sub countAchievementUsers { return scalar shift->listAchievementUsers(@_) }
 
 sub listAchievementUsers {
 	my ($self, $achievementID) = shift->checkArgs(\@_, qw/achievement_id/);
-	my $where = [achievement_id_eq => $achievementID];
+	my $where = [ achievement_id_eq => $achievementID ];
 	if (wantarray) {
-		return map { @$_ } $self->{achievement_user}->get_fields_where(["user_id"], $where);
+		return map {@$_} $self->{achievement_user}->get_fields_where(["user_id"], $where);
 	} else {
 		return $self->{achievement_user}->count_where($where);
 	}
@@ -1430,9 +1454,9 @@ sub countUserAchievements { return scalar shift->listUserAchievements(@_) }
 
 sub listUserAchievements {
 	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
-	my $where = [user_id_eq => $userID];
+	my $where = [ user_id_eq => $userID ];
 	if (wantarray) {
-		return map { @$_ } $self->{achievement_user}->get_fields_where(["achievement_id"], $where);
+		return map {@$_} $self->{achievement_user}->get_fields_where(["achievement_id"], $where);
 	} else {
 		return $self->{achievement_user}->count_where($where);
 	}
@@ -1445,7 +1469,7 @@ sub existsUserAchievement {
 
 sub getUserAchievement {
 	my ($self, $userID, $achievementID) = shift->checkArgs(\@_, qw/user_id achievement_id/);
-	return ( $self->getUserAchievements([$userID, $achievementID]) )[0];
+	return ($self->getUserAchievements([ $userID, $achievementID ]))[0];
 }
 
 sub getUserAchievements {
@@ -1461,9 +1485,7 @@ sub addUserAchievement {
 	croak "addUserAchievement: achievement ", $UserAchievement->achievement_id, " not found"
 		unless $self->{achievement}->exists($UserAchievement->achievement_id);
 
-	eval {
-		return $self->{achievement_user}->add($UserAchievement);
-	};
+	eval { return $self->{achievement_user}->add($UserAchievement); };
 	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
 		croak "addUserAchievement: user achievement exists (perhaps you meant to use putUserAchievement?)";
 	} elsif ($@) {
@@ -1473,7 +1495,7 @@ sub addUserAchievement {
 
 sub putUserAchievement {
 	my ($self, $UserAchievement) = shift->checkArgs(\@_, qw/REC:achievement_user/);
-	my $rows = $self->{achievement_user}->put($UserAchievement); # DBI returns 0E0 for 0.
+	my $rows = $self->{achievement_user}->put($UserAchievement);    # DBI returns 0E0 for 0.
 	if ($rows == 0) {
 		croak "putUserAchievement: user achievement not found (perhaps you meant to use addUserAchievement?)";
 	} else {
@@ -1493,21 +1515,21 @@ sub deleteUserAchievement {
 ################################################################################
 
 BEGIN {
-	*UserSet = gen_schema_accessor("set_user");
-	*newUserSet = gen_new("set_user");
+	*UserSet            = gen_schema_accessor("set_user");
+	*newUserSet         = gen_new("set_user");
 	*countUserSetsWhere = gen_count_where("set_user");
 	*existsUserSetWhere = gen_exists_where("set_user");
-	*listUserSetsWhere = gen_list_where("set_user");
-	*getUserSetsWhere = gen_get_records_where("set_user");
+	*listUserSetsWhere  = gen_list_where("set_user");
+	*getUserSetsWhere   = gen_get_records_where("set_user");
 }
 
 sub countSetUsers { return scalar shift->listSetUsers(@_) }
 
 sub listSetUsers {
 	my ($self, $setID) = shift->checkArgs(\@_, qw/set_id/);
-	my $where = [set_id_eq => $setID];
+	my $where = [ set_id_eq => $setID ];
 	if (wantarray) {
-		return map { @$_ } $self->{set_user}->get_fields_where(["user_id"], $where);
+		return map {@$_} $self->{set_user}->get_fields_where(["user_id"], $where);
 	} else {
 		return $self->{set_user}->count_where($where);
 	}
@@ -1517,9 +1539,9 @@ sub countUserSets { return scalar shift->listUserSets(@_) }
 
 sub listUserSets {
 	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
-	my $where = [user_id_eq => $userID];
+	my $where = [ user_id_eq => $userID ];
 	if (wantarray) {
-		return map { @$_ } $self->{set_user}->get_fields_where(["set_id"], $where);
+		return map {@$_} $self->{set_user}->get_fields_where(["set_id"], $where);
 	} else {
 		return $self->{set_user}->count_where($where);
 	}
@@ -1532,7 +1554,7 @@ sub existsUserSet {
 
 sub getUserSet {
 	my ($self, $userID, $setID) = shift->checkArgs(\@_, qw/user_id set_id/);
-	return ( $self->getUserSets([$userID, $setID]) )[0];
+	return ($self->getUserSets([ $userID, $setID ]))[0];
 }
 
 sub getUserSets {
@@ -1549,9 +1571,7 @@ sub addUserSet {
 		unless $self->{user}->exists($UserSet->user_id);
 	croak "addUserSet: set ", $UserSet->set_id, " not found"
 		unless $self->{set}->exists($UserSet->set_id);
-	eval {
-		return $self->{set_user}->add($UserSet);
-	};
+	eval { return $self->{set_user}->add($UserSet); };
 	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
 		croak "addUserSet: user set exists (perhaps you meant to use putUserSet?)";
 	} elsif ($@) {
@@ -1559,11 +1579,46 @@ sub addUserSet {
 	}
 }
 
+# Used to add a list of UserSet records to the DB in less DB calls.
+sub addMultipleUserSets {
+	my ($self, @userSetList) = @_;
+
+	# Do a single checkArgs call, all records in the list were made in the same manner
+	$self->checkArgs([ $userSetList[0] ], qw/REC:set_user/);
+
+	my @badUserIDs;
+	my %badSetIDs;
+	my @toInsert;
+	for my $userSet (@userSetList) {
+		if ($self->{user}->exists($userSet->user_id)) {
+			if ($self->{set}->exists($userSet->set_id)) {
+				# This record is OK
+				push(@toInsert, $userSet);
+			} else {
+				$badSetIDs{ $userSet->set_id } = 1;
+			}
+		} else {
+			push(@badUserIDs, join("", 'user ', $userSet->user_id, " not found, cannot add set ", $userSet->set_id));
+		}
+	}
+	my $badSetIDerrorMsg =
+		keys(%badSetIDs) ? join(" ", 'bad set IDs seen:', keys(%badSetIDs)) : "";
+
+	eval { return $self->{set_user}->insert_records([@toInsert]); };
+	if ($@) {
+		croak join("\n", "addMultipleUserSets errors:\nDB call error: $@", $badSetIDerrorMsg, @badUserIDs);
+	}
+
+	if (@badUserIDs || keys(@badUserIDs)) {
+		croak join("\n", "addMultipleUserSets errors:\n", $badSetIDerrorMsg, @badUserIDs);
+	}
+}
+
 # the code from putUserSet() is duplicated in large part in the following
 # putVersionedUserSet; c.f. that routine
 sub putUserSet {
 	my ($self, $UserSet) = shift->checkArgs(\@_, qw/REC:set_user/);
-	my $rows = $self->{set_user}->put($UserSet); # DBI returns 0E0 for 0.
+	my $rows = $self->{set_user}->put($UserSet);    # DBI returns 0E0 for 0.
 	if ($rows == 0) {
 		croak "putUserSet: user set not found (perhaps you meant to use addUserSet?)";
 	} else {
@@ -1600,7 +1655,7 @@ sub existsMergedSet {
 
 sub getMergedSet {
 	my ($self, $userID, $setID) = shift->checkArgs(\@_, qw/user_id set_id/);
-	return ( $self->getMergedSets([$userID, $setID]) )[0];
+	return ($self->getMergedSets([ $userID, $setID ]))[0];
 }
 
 sub getMergedSets {
@@ -1613,12 +1668,12 @@ sub getMergedSets {
 ################################################################################
 
 BEGIN {
-	*SetVersion = gen_schema_accessor("set_version");
-	*newSetVersion = gen_new("set_version");
+	*SetVersion            = gen_schema_accessor("set_version");
+	*newSetVersion         = gen_new("set_version");
 	*countSetVersionsWhere = gen_count_where("set_version");
 	*existsSetVersionWhere = gen_exists_where("set_version");
-	*listSetVersionsWhere = gen_list_where("set_version");
-	*getSetVersionsWhere = gen_get_records_where("set_version");
+	*listSetVersionsWhere  = gen_list_where("set_version");
+	*getSetVersionsWhere   = gen_get_records_where("set_version");
 }
 
 # versioned analog of countUserSets
@@ -1627,10 +1682,10 @@ sub countSetVersions { return scalar shift->listSetVersions(@_) }
 # versioned analog of listUserSets
 sub listSetVersions {
 	my ($self, $userID, $setID) = shift->checkArgs(\@_, qw/user_id set_id/);
-	my $where = [user_id_eq_set_id_eq => $userID,$setID];
-	my $order = [ 'version_id' ];
+	my $where = [ user_id_eq_set_id_eq => $userID, $setID ];
+	my $order = ['version_id'];
 	if (wantarray) {
-		return map { @$_ } $self->{set_version}->get_fields_where(["version_id"], $where, $order);
+		return map {@$_} $self->{set_version}->get_fields_where(["version_id"], $where, $order);
 	} else {
 		return $self->{set_version}->count_where($where);
 	}
@@ -1645,7 +1700,7 @@ sub existsSetVersion {
 # versioned analog of getUserSet
 sub getSetVersion {
 	my ($self, $userID, $setID, $versionID) = shift->checkArgs(\@_, qw/user_id set_id version_id/);
-	return ( $self->getSetVersions([$userID, $setID, $versionID]) )[0];
+	return ($self->getSetVersions([ $userID, $setID, $versionID ]))[0];
 }
 
 # versioned analog of getUserSets
@@ -1661,9 +1716,7 @@ sub addSetVersion {
 	croak "addSetVersion: set ", $SetVersion->set_id, " not found for user ", $SetVersion->user_id
 		unless $self->{set_user}->exists($SetVersion->user_id, $SetVersion->set_id);
 
-	eval {
-		return $self->{set_version}->add($SetVersion);
-	};
+	eval { return $self->{set_version}->add($SetVersion); };
 	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
 		croak "addSetVersion: set version exists (perhaps you meant to use putSetVersion?)";
 	} elsif ($@) {
@@ -1674,7 +1727,7 @@ sub addSetVersion {
 # versioned analog of putUserSet
 sub putSetVersion {
 	my ($self, $SetVersion) = shift->checkArgs(\@_, qw/REC:set_version/);
-	my $rows = $self->{set_version}->put($SetVersion); # DBI returns 0E0 for 0.
+	my $rows = $self->{set_version}->put($SetVersion);    # DBI returns 0E0 for 0.
 	if ($rows == 0) {
 		croak "putSetVersion: set version not found (perhaps you meant to use addSetVersion?)";
 	} else {
@@ -1711,7 +1764,7 @@ sub existsMergedSetVersion {
 
 sub getMergedSetVersion {
 	my ($self, $userID, $setID, $versionID) = shift->checkArgs(\@_, qw/user_id set_id version_id/);
-	return ( $self->getMergedSetVersions([$userID, $setID, $versionID]) )[0];
+	return ($self->getMergedSetVersions([ $userID, $setID, $versionID ]))[0];
 }
 
 sub getMergedSetVersions {
@@ -1728,56 +1781,54 @@ sub getMergedSetVersions {
 #    restricted or denied.
 
 BEGIN {
-	*GlobalSetLocation = gen_schema_accessor("set_locations");
-	*newGlobalSetLocation = gen_new("set_locations");
+	*GlobalSetLocation            = gen_schema_accessor("set_locations");
+	*newGlobalSetLocation         = gen_new("set_locations");
 	*countGlobalSetLocationsWhere = gen_count_where("set_locations");
 	*existsGlobalSetLocationWhere = gen_exists_where("set_locations");
-	*listGlobalSetLocationsWhere = gen_list_where("set_locations");
-	*getGlobalSetLocationsWhere = gen_get_records_where("set_locations");
+	*listGlobalSetLocationsWhere  = gen_list_where("set_locations");
+	*getGlobalSetLocationsWhere   = gen_get_records_where("set_locations");
 }
 
 sub countGlobalSetLocations { return scalar shift->listGlobalSetLocations(@_) }
 
 sub listGlobalSetLocations {
-	my ( $self, $setID ) = shift->checkArgs(\@_, qw/set_id/);
-	my $where = [set_id_eq => $setID];
-	if ( wantarray ) {
+	my ($self, $setID) = shift->checkArgs(\@_, qw/set_id/);
+	my $where = [ set_id_eq => $setID ];
+	if (wantarray) {
 		my $order = ['location_id'];
-		return map { @$_ } $self->{set_locations}->get_fields_where(["location_id"], $where, $order);
+		return map {@$_} $self->{set_locations}->get_fields_where(["location_id"], $where, $order);
 	} else {
-		return $self->{set_user}->count_where( $where );
+		return $self->{set_user}->count_where($where);
 	}
 }
 
 sub existsGlobalSetLocation {
-	my ( $self, $setID, $locationID ) = shift->checkArgs(\@_, qw/set_id location_id/);
-	return $self->{set_locations}->exists( $setID, $locationID );
+	my ($self, $setID, $locationID) = shift->checkArgs(\@_, qw/set_id location_id/);
+	return $self->{set_locations}->exists($setID, $locationID);
 }
 
 sub getGlobalSetLocation {
-	my ( $self, $setID, $locationID ) = shift->checkArgs(\@_, qw/set_id location_id/);
-	return ( $self->getGlobalSetLocations([$setID, $locationID]) )[0];
+	my ($self, $setID, $locationID) = shift->checkArgs(\@_, qw/set_id location_id/);
+	return ($self->getGlobalSetLocations([ $setID, $locationID ]))[0];
 }
 
 sub getGlobalSetLocations {
-	my ( $self, @locationIDs ) = shift->checkArgsRefList(\@_, qw/set_id location_id/);
+	my ($self, @locationIDs) = shift->checkArgsRefList(\@_, qw/set_id location_id/);
 	return $self->{set_locations}->gets(@locationIDs);
 }
 
 sub getAllGlobalSetLocations {
-	my ( $self, $setID ) = shift->checkArgs(\@_, qw/set_id/);
-	my $where = [set_id_eq => $setID];
-	return $self->{set_locations}->get_records_where( $where );
+	my ($self, $setID) = shift->checkArgs(\@_, qw/set_id/);
+	my $where = [ set_id_eq => $setID ];
+	return $self->{set_locations}->get_records_where($where);
 }
 
 sub addGlobalSetLocation {
-	my ( $self, $GlobalSetLocation ) = shift->checkArgs(\@_, qw/REC:set_locations/);
+	my ($self, $GlobalSetLocation) = shift->checkArgs(\@_, qw/REC:set_locations/);
 	croak "addGlobalSetLocation: set ", $GlobalSetLocation->set_id, " not found"
 		unless $self->{set}->exists($GlobalSetLocation->set_id);
 
-	eval {
-		return $self->{set_locations}->add($GlobalSetLocation);
-	};
+	eval { return $self->{set_locations}->add($GlobalSetLocation); };
 	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
 		croak "addGlobalSetLocation: global set_location exists (perhaps you meant to use putGlobalSetLocation?)";
 	} elsif ($@) {
@@ -1787,7 +1838,7 @@ sub addGlobalSetLocation {
 
 sub putGlobalSetLocation {
 	my ($self, $GlobalSetLocation) = shift->checkArgs(\@_, qw/REC:set_locations/);
-	my $rows = $self->{set_locations}->put($GlobalSetLocation); # DBI returns 0E0 for 0.
+	my $rows = $self->{set_locations}->put($GlobalSetLocation);    # DBI returns 0E0 for 0.
 	if ($rows == 0) {
 		croak "putGlobalSetLocation: global problem not found (perhaps you meant to use addGlobalSetLocation?)";
 	} else {
@@ -1812,21 +1863,21 @@ sub deleteGlobalSetLocation {
 #    global set
 
 BEGIN {
-	*UserSetLocation = gen_schema_accessor("set_locations_user");
-	*newUserSetLocation = gen_new("set_locations_user");
-	*countUserSetLocationWhere = gen_count_where("set_locations_user");
+	*UserSetLocation            = gen_schema_accessor("set_locations_user");
+	*newUserSetLocation         = gen_new("set_locations_user");
+	*countUserSetLocationWhere  = gen_count_where("set_locations_user");
 	*existsUserSetLocationWhere = gen_exists_where("set_locations_user");
-	*listUserSetLocationsWhere = gen_list_where("set_locations_user");
-	*getUserSetLocationsWhere = gen_get_records_where("set_locations_user");
+	*listUserSetLocationsWhere  = gen_list_where("set_locations_user");
+	*getUserSetLocationsWhere   = gen_get_records_where("set_locations_user");
 }
 
 sub countSetLocationUsers { return scalar shift->listSetLocationUsers(@_) }
 
 sub listSetLocationUsers {
 	my ($self, $setID, $locationID) = shift->checkArgs(\@_, qw/set_id location_id/);
-	my $where = [set_id_eq_location_id_eq => $setID,$locationID];
+	my $where = [ set_id_eq_location_id_eq => $setID, $locationID ];
 	if (wantarray) {
-		return map { @$_ } $self->{set_locations_user}->get_fields_where(["user_id"], $where);
+		return map {@$_} $self->{set_locations_user}->get_fields_where(["user_id"], $where);
 	} else {
 		return $self->{set_locations_user}->count_where($where);
 	}
@@ -1836,9 +1887,9 @@ sub countUserSetLocations { return scalar shift->listUserSetLocations(@_) }
 
 sub listUserSetLocations {
 	my ($self, $userID, $setID) = shift->checkArgs(\@_, qw/user_id set_id/);
-	my $where = [user_id_eq_set_id_eq => $userID,$setID];
+	my $where = [ user_id_eq_set_id_eq => $userID, $setID ];
 	if (wantarray) {
-		return map { @$_ } $self->{set_locations_user}->get_fields_where(["location_id"], $where);
+		return map {@$_} $self->{set_locations_user}->get_fields_where(["location_id"], $where);
 	} else {
 		return $self->{set_locations_user}->count_where($where);
 	}
@@ -1846,13 +1897,13 @@ sub listUserSetLocations {
 
 sub existsUserSetLocation {
 	my ($self, $userID, $setID, $locationID) = shift->checkArgs(\@_, qw/user_id set_id location_id/);
-	return $self->{set_locations_user}->exists($userID,$setID,$locationID);
+	return $self->{set_locations_user}->exists($userID, $setID, $locationID);
 }
 
 # FIXME: we won't ever use this because all fields are key fields
 sub getUserSetLocation {
 	my ($self, $userID, $setID, $locationID) = shift->checkArgs(\@_, qw/user_id set_id location_id/);
-	return( $self->getUserSetLocations([$userID, $setID, $locationID]) )[0];
+	return ($self->getUserSetLocations([ $userID, $setID, $locationID ]))[0];
 }
 
 # FIXME: we won't ever use this because all fields are key fields
@@ -1863,7 +1914,7 @@ sub getUserSetLocations {
 
 sub getAllUserSetLocations {
 	my ($self, $userID, $setID) = shift->checkArgs(\@_, qw/user_id set_id/);
-	my $where = [user_id_eq_set_id_eq => $userID,$setID];
+	my $where = [ user_id_eq_set_id_eq => $userID, $setID ];
 	return $self->{set_locations_user}->get_records_where($where);
 }
 
@@ -1871,12 +1922,11 @@ sub addUserSetLocation {
 	# VERSIONING - accept versioned ID fields
 	my ($self, $UserSetLocation) = shift->checkArgs(\@_, qw/VREC:set_locations_user/);
 
-	croak "addUserSetLocation: user set ", $UserSetLocation->set_id, " for user ", $UserSetLocation->user_id, " not found"
+	croak "addUserSetLocation: user set ", $UserSetLocation->set_id, " for user ", $UserSetLocation->user_id,
+		" not found"
 		unless $self->{set_user}->exists($UserSetLocation->user_id, $UserSetLocation->set_id);
 
-	eval {
-		return $self->{set_locations_user}->add($UserSetLocation);
-	};
+	eval { return $self->{set_locations_user}->add($UserSetLocation); };
 	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
 		croak "addUserSetLocation: user set_location exists (perhaps you meant to use putUserSetLocation?)";
 	} elsif ($@) {
@@ -1890,7 +1940,7 @@ sub putUserSetLocation {
 	my $V = $_[2] ? "V" : "";
 	my ($self, $UserSetLocation, undef) = shift->checkArgs(\@_, "${V}REC:set_locations_user", "versioned_ok!?");
 
-	my $rows = $self->{set_locations_user}->put($UserSetLocation); # DBI returns 0E0 for 0.
+	my $rows = $self->{set_locations_user}->put($UserSetLocation);    # DBI returns 0E0 for 0.
 	if ($rows == 0) {
 		croak "putUserSetLocation: user set location not found (perhaps you meant to use addUserSetLocation?)";
 	} else {
@@ -1902,7 +1952,7 @@ sub deleteUserSetLocation {
 	# userID, setID, and locationID can be undefined if being called from this package
 	my $U = caller eq __PACKAGE__ ? "!" : "";
 	my ($self, $userID, $setID, $locationID) = shift->checkArgs(\@_, "user_id$U", "set_id$U", "set_locations_id$U");
-	return $self->{set_locations_user}->delete($userID,$setID,$locationID);
+	return $self->{set_locations_user}->delete($userID, $setID, $locationID);
 }
 
 ################################################################################
@@ -1917,34 +1967,33 @@ sub deleteUserSetLocation {
 sub getAllMergedSetLocations {
 	my ($self, $userID, $setID) = shift->checkArgs(\@_, qw/user_id set_id/);
 
-	if ( $self->countUserSetLocations($userID, $setID) ) {
-		return $self->getAllUserSetLocations( $userID, $setID );
+	if ($self->countUserSetLocations($userID, $setID)) {
+		return $self->getAllUserSetLocations($userID, $setID);
 	} else {
-		return $self->getAllGlobalSetLocations( $setID );
+		return $self->getAllGlobalSetLocations($setID);
 	}
 }
 
-
 ################################################################################
 # problem functions
 ################################################################################
 
 BEGIN {
-	*GlobalProblem = gen_schema_accessor("problem");
-	*newGlobalProblem = gen_new("problem");
+	*GlobalProblem            = gen_schema_accessor("problem");
+	*newGlobalProblem         = gen_new("problem");
 	*countGlobalProblemsWhere = gen_count_where("problem");
 	*existsGlobalProblemWhere = gen_exists_where("problem");
-	*listGlobalProblemsWhere = gen_list_where("problem");
-	*getGlobalProblemsWhere = gen_get_records_where("problem");
+	*listGlobalProblemsWhere  = gen_list_where("problem");
+	*getGlobalProblemsWhere   = gen_get_records_where("problem");
 }
 
 sub countGlobalProblems { return scalar shift->listGlobalProblems(@_) }
 
 sub listGlobalProblems {
 	my ($self, $setID) = shift->checkArgs(\@_, qw/set_id/);
-	my $where = [set_id_eq => $setID];
+	my $where = [ set_id_eq => $setID ];
 	if (wantarray) {
-		return map { @$_ } $self->{problem}->get_fields_where(["problem_id"], $where);
+		return map {@$_} $self->{problem}->get_fields_where(["problem_id"], $where);
 	} else {
 		return $self->{problem}->count_where($where);
 	}
@@ -1957,7 +2006,7 @@ sub existsGlobalProblem {
 
 sub getGlobalProblem {
 	my ($self, $setID, $problemID) = shift->checkArgs(\@_, qw/set_id problem_id/);
-	return ( $self->getGlobalProblems([$setID, $problemID]) )[0];
+	return ($self->getGlobalProblems([ $setID, $problemID ]))[0];
 }
 
 sub getGlobalProblems {
@@ -1967,18 +2016,17 @@ sub getGlobalProblems {
 
 sub getAllGlobalProblems {
 	my ($self, $setID) = shift->checkArgs(\@_, qw/set_id/);
-	my $where = [set_id_eq => $setID];
+	my $where = [ set_id_eq => $setID ];
 	return $self->{problem}->get_records_where($where);
 }
 
-sub addGlobalProblem {	my ($self, $GlobalProblem) = shift->checkArgs(\@_, qw/REC:problem/);
+sub addGlobalProblem {
+	my ($self, $GlobalProblem) = shift->checkArgs(\@_, qw/REC:problem/);
 
 	croak "addGlobalProblem: set ", $GlobalProblem->set_id, " not found"
 		unless $self->{set}->exists($GlobalProblem->set_id);
 
-	eval {
-		return $self->{problem}->add($GlobalProblem);
-	};
+	eval { return $self->{problem}->add($GlobalProblem); };
 	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
 		croak "addGlobalProblem: global problem exists (perhaps you meant to use putGlobalProblem?)";
 	} elsif ($@) {
@@ -1988,7 +2036,7 @@ sub addGlobalProblem {	my ($self, $GlobalProblem) = shift->checkArgs(\@_, qw/REC
 
 sub putGlobalProblem {
 	my ($self, $GlobalProblem) = shift->checkArgs(\@_, qw/REC:problem/);
-	my $rows = $self->{problem}->put($GlobalProblem); # DBI returns 0E0 for 0.
+	my $rows = $self->{problem}->put($GlobalProblem);    # DBI returns 0E0 for 0.
 	if ($rows == 0) {
 		croak "putGlobalProblem: global problem not found (perhaps you meant to use addGlobalProblem?)";
 	} else {
@@ -2009,21 +2057,21 @@ sub deleteGlobalProblem {
 ################################################################################
 
 BEGIN {
-	*UserProblem = gen_schema_accessor("problem_user");
-	*newUserProblem = gen_new("problem_user");
+	*UserProblem            = gen_schema_accessor("problem_user");
+	*newUserProblem         = gen_new("problem_user");
 	*countUserProblemsWhere = gen_count_where("problem_user");
 	*existsUserProblemWhere = gen_exists_where("problem_user");
-	*listUserProblemsWhere = gen_list_where("problem_user");
-	*getUserProblemsWhere = gen_get_records_where("problem_user");
+	*listUserProblemsWhere  = gen_list_where("problem_user");
+	*getUserProblemsWhere   = gen_get_records_where("problem_user");
 }
 
 sub countProblemUsers { return scalar shift->listProblemUsers(@_) }
 
 sub listProblemUsers {
 	my ($self, $setID, $problemID) = shift->checkArgs(\@_, qw/set_id problem_id/);
-	my $where = [set_id_eq_problem_id_eq => $setID,$problemID];
+	my $where = [ set_id_eq_problem_id_eq => $setID, $problemID ];
 	if (wantarray) {
-		return map { @$_ } $self->{problem_user}->get_fields_where(["user_id"], $where);
+		return map {@$_} $self->{problem_user}->get_fields_where(["user_id"], $where);
 	} else {
 		return $self->{problem_user}->count_where($where);
 	}
@@ -2033,9 +2081,9 @@ sub countUserProblems { return scalar shift->listUserProblems(@_) }
 
 sub listUserProblems {
 	my ($self, $userID, $setID) = shift->checkArgs(\@_, qw/user_id set_id/);
-	my $where = [user_id_eq_set_id_eq => $userID,$setID];
+	my $where = [ user_id_eq_set_id_eq => $userID, $setID ];
 	if (wantarray) {
-		return map { @$_ } $self->{problem_user}->get_fields_where(["problem_id"], $where);
+		return map {@$_} $self->{problem_user}->get_fields_where(["problem_id"], $where);
 	} else {
 		return $self->{problem_user}->count_where($where);
 	}
@@ -2048,7 +2096,7 @@ sub existsUserProblem {
 
 sub getUserProblem {
 	my ($self, $userID, $setID, $problemID) = shift->checkArgs(\@_, qw/user_id set_id problem_id/);
-	return ( $self->getUserProblems([$userID, $setID, $problemID]) )[0];
+	return ($self->getUserProblems([ $userID, $setID, $problemID ]))[0];
 }
 
 sub getUserProblems {
@@ -2058,7 +2106,7 @@ sub getUserProblems {
 
 sub getAllUserProblems {
 	my ($self, $userID, $setID) = shift->checkArgs(\@_, qw/user_id set_id/);
-	my $where = [user_id_eq_set_id_eq => $userID,$setID];
+	my $where = [ user_id_eq_set_id_eq => $userID, $setID ];
 	return $self->{problem_user}->get_records_where($where);
 }
 
@@ -2069,14 +2117,12 @@ sub addUserProblem {
 	croak "addUserProblem: user set ", $UserProblem->set_id, " for user ", $UserProblem->user_id, " not found"
 		unless $self->{set_user}->exists($UserProblem->user_id, $UserProblem->set_id);
 
-	my ( $nv_set_id, $versionNum ) = grok_vsetID( $UserProblem->set_id );
+	my ($nv_set_id, $versionNum) = grok_vsetID($UserProblem->set_id);
 
 	croak "addUserProblem: problem ", $UserProblem->problem_id, " in set $nv_set_id not found"
 		unless $self->{problem}->exists($nv_set_id, $UserProblem->problem_id);
 
-	eval {
-		return $self->{problem_user}->add($UserProblem);
-	};
+	eval { return $self->{problem_user}->add($UserProblem); };
 	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
 		croak "addUserProblem: user problem exists (perhaps you meant to use putUserProblem?)";
 	} elsif ($@) {
@@ -2084,12 +2130,52 @@ sub addUserProblem {
 	}
 }
 
+# Used to add multiple problems to a SINGLE set with less DB calls.
+# Not for use by versioned sets
+# This expects @problemLists to be a 2 dimensional array, each
+# entry being the problemList array for one user.
+sub addUserMultipleProblems {
+	my ($self, @problemLists) = @_;
+
+	croak "Error in request to addUserMultipleProblems" if ref($problemLists[0]) ne 'ARRAY';
+
+	# Do a single checkArgs call, all records in the list were made in the same manner
+	$self->checkArgs([ $problemLists[0][0] ], qw/REC:problem_user/);
+
+	my $set_id = $problemLists[0][0]->set_id;
+
+	# Array in which all records to add are collected
+	my @collectedProblemList;
+
+	for my $problemListRef (@problemLists) {
+		my $user_id    = $problemListRef->[0]->user_id;
+		my $problem_id = $problemListRef->[0]->problem_id;
+		croak "addMultipleUserProblems: user set $set_id for user $user_id not found"
+			unless $self->{set_user}->exists($user_id, $set_id);
+
+		# Test whether there are already problem records for this user in this set, as in that case
+		# inserting multiple records at once would trigger an error.
+		my $where = [ user_id_eq_set_id_eq_problem_id_eq => $user_id, $set_id, $problem_id ];
+
+		croak
+			"addMultipleUserProblems cannot be run as set $set_id already contains one of the requested problems for user $user_id"
+			if $self->{problem_user}->count_where($where);
+		# If we got here, we can add this list of problems to those to insert into the database
+		push(@collectedProblemList, @{$problemListRef});
+	}
+
+	eval { $self->{problem_user}->insert_records([@collectedProblemList]); };
+	if ($@) {
+		croak "addUserMultipleProblems: $@";
+	}
+}
+
 # versioned_ok is an optional argument which lets us slip versioned setIDs through checkArgs.
 sub putUserProblem {
 	my $V = $_[2] ? "V" : "";
 	my ($self, $UserProblem, undef) = shift->checkArgs(\@_, "${V}REC:problem_user", "versioned_ok!?");
 
-	my $rows = $self->{problem_user}->put($UserProblem); # DBI returns 0E0 for 0.
+	my $rows = $self->{problem_user}->put($UserProblem);    # DBI returns 0E0 for 0.
 	if ($rows == 0) {
 		croak "putUserProblem: user problem not found (perhaps you meant to use addUserProblem?)";
 	} else {
@@ -2124,7 +2210,7 @@ sub existsMergedProblem {
 
 sub getMergedProblem {
 	my ($self, $userID, $setID, $problemID) = shift->checkArgs(\@_, qw/user_id set_id problem_id/);
-	return ( $self->getMergedProblems([$userID, $setID, $problemID]) )[0];
+	return ($self->getMergedProblems([ $userID, $setID, $problemID ]))[0];
 }
 
 sub getMergedProblems {
@@ -2134,7 +2220,7 @@ sub getMergedProblems {
 
 sub getAllMergedUserProblems {
 	my ($self, $userID, $setID) = shift->checkArgs(\@_, qw/user_id set_id/);
-	my $where = [user_id_eq_set_id_eq => $userID,$setID];
+	my $where = [ user_id_eq_set_id_eq => $userID, $setID ];
 	return $self->{problem_merged}->get_records_where($where);
 }
 
@@ -2143,12 +2229,12 @@ sub getAllMergedUserProblems {
 ################################################################################
 
 BEGIN {
-	*ProblemVersion = gen_schema_accessor("problem_version");
-	*newProblemVersion = gen_new("problem_version");
+	*ProblemVersion            = gen_schema_accessor("problem_version");
+	*newProblemVersion         = gen_new("problem_version");
 	*countProblemVersionsWhere = gen_count_where("problem_version");
 	*existsProblemVersionWhere = gen_exists_where("problem_version");
-	*listProblemVersionsWhere = gen_list_where("problem_version");
-	*getProblemVersionsWhere = gen_get_records_where("problem_version");
+	*listProblemVersionsWhere  = gen_list_where("problem_version");
+	*getProblemVersionsWhere   = gen_get_records_where("problem_version");
 }
 
 # versioned analog of countUserProblems
@@ -2157,9 +2243,9 @@ sub countProblemVersions { return scalar shift->listProblemVersions(@_) }
 # versioned analog of listUserProblems
 sub listProblemVersions {
 	my ($self, $userID, $setID, $versionID) = shift->checkArgs(\@_, qw/user_id set_id version_id/);
-	my $where = [user_id_eq_set_id_eq_version_id_eq => $userID,$setID,$versionID];
+	my $where = [ user_id_eq_set_id_eq_version_id_eq => $userID, $setID, $versionID ];
 	if (wantarray) {
-		return map { @$_ } $self->{problem_version}->get_fields_where(["problem_id"], $where);
+		return map {@$_} $self->{problem_version}->get_fields_where(["problem_id"], $where);
 	} else {
 		return $self->{problem_version}->count_where($where);
 	}
@@ -2180,14 +2266,16 @@ sub listProblemVersions {
 
 # versioned analog of existsUserProblem
 sub existsProblemVersion {
-	my ($self, $userID, $setID, $versionID, $problemID) = shift->checkArgs(\@_, qw/user_id set_id version_id problem_id/);
+	my ($self, $userID, $setID, $versionID, $problemID) =
+		shift->checkArgs(\@_, qw/user_id set_id version_id problem_id/);
 	return $self->{problem_version}->exists($userID, $setID, $versionID, $problemID);
 }
 
 # versioned analog of getUserProblem
 sub getProblemVersion {
-	my ($self, $userID, $setID, $versionID, $problemID) = shift->checkArgs(\@_, qw/user_id set_id version_id problem_id/);
-	return ( $self->getProblemVersions([$userID, $setID, $versionID, $problemID]) )[0];
+	my ($self, $userID, $setID, $versionID, $problemID) =
+		shift->checkArgs(\@_, qw/user_id set_id version_id problem_id/);
+	return ($self->getProblemVersions([ $userID, $setID, $versionID, $problemID ]))[0];
 }
 
 # versioned analog of getUserProblems
@@ -2198,25 +2286,26 @@ sub getProblemVersions {
 
 # versioned analog of getAllUserProblems
 sub getAllProblemVersions {
-	my ( $self, $userID, $setID, $versionID ) = shift->checkArgs(\@_, qw/user_id set_id version_id/);
-	my $where = [user_id_eq_set_id_eq_version_id_eq => $userID,$setID,$versionID];
+	my ($self, $userID, $setID, $versionID) = shift->checkArgs(\@_, qw/user_id set_id version_id/);
+	my $where = [ user_id_eq_set_id_eq_version_id_eq => $userID, $setID, $versionID ];
 	my $order = ["problem_id"];
-	return $self->{problem_version_merged}->get_records_where($where,$order);
+	return $self->{problem_version_merged}->get_records_where($where, $order);
 }
 
-
 # versioned analog of addUserProblem
 sub addProblemVersion {
 	my ($self, $ProblemVersion) = shift->checkArgs(\@_, qw/REC:problem_version/);
 
-	croak "addProblemVersion: set version ", $ProblemVersion->version_id, " of set ", $ProblemVersion->set_id, " not found for user ", $ProblemVersion->user_id
-		unless $self->{set_version}->exists($ProblemVersion->user_id, $ProblemVersion->set_id, $ProblemVersion->version_id);
-	croak "addProblemVersion: problem ", $ProblemVersion->problem_id, " of set ", $ProblemVersion->set_id, " not found for user ", $ProblemVersion->user_id
-		unless $self->{problem_user}->exists($ProblemVersion->user_id, $ProblemVersion->set_id, $ProblemVersion->problem_id);
+	croak "addProblemVersion: set version ", $ProblemVersion->version_id, " of set ", $ProblemVersion->set_id,
+		" not found for user ", $ProblemVersion->user_id
+		unless $self->{set_version}
+		->exists($ProblemVersion->user_id, $ProblemVersion->set_id, $ProblemVersion->version_id);
+	croak "addProblemVersion: problem ", $ProblemVersion->problem_id, " of set ", $ProblemVersion->set_id,
+		" not found for user ", $ProblemVersion->user_id
+		unless $self->{problem_user}
+		->exists($ProblemVersion->user_id, $ProblemVersion->set_id, $ProblemVersion->problem_id);
 
-	eval {
-		return $self->{problem_version}->add($ProblemVersion);
-	};
+	eval { return $self->{problem_version}->add($ProblemVersion); };
 	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
 		croak "addProblemVersion: problem version exists (perhaps you meant to use putProblemVersion?)";
 	} elsif ($@) {
@@ -2227,7 +2316,7 @@ sub addProblemVersion {
 # versioned analog of putUserProblem
 sub putProblemVersion {
 	my ($self, $ProblemVersion) = shift->checkArgs(\@_, qw/REC:problem_version/);
-	my $rows = $self->{problem_version}->put($ProblemVersion); # DBI returns 0E0 for 0.
+	my $rows = $self->{problem_version}->put($ProblemVersion);    # DBI returns 0E0 for 0.
 	if ($rows == 0) {
 		croak "putProblemVersion: problem version not found (perhaps you meant to use addProblemVersion?)";
 	} else {
@@ -2239,7 +2328,8 @@ sub putProblemVersion {
 sub deleteProblemVersion {
 	# userID, setID, versionID, and problemID can be undefined if being called from this package
 	my $U = caller eq __PACKAGE__ ? "!" : "";
-	my ($self, $userID, $setID, $versionID, $problemID) = shift->checkArgs(\@_, "user_id$U", "set_id$U", "version_id$U", "problem_id$U");
+	my ($self, $userID, $setID, $versionID, $problemID) =
+		shift->checkArgs(\@_, "user_id$U", "set_id$U", "version_id$U", "problem_id$U");
 	return $self->{problem_version}->delete($userID, $setID, $versionID, $problemID);
 }
 
@@ -2257,13 +2347,15 @@ BEGIN {
 }
 
 sub existsMergedProblemVersion {
-	my ($self, $userID, $setID, $versionID, $problemID) = shift->checkArgs(\@_, qw/user_id set_id version_id problem_id/);
+	my ($self, $userID, $setID, $versionID, $problemID) =
+		shift->checkArgs(\@_, qw/user_id set_id version_id problem_id/);
 	return $self->{problem_version_merged}->exists($userID, $setID, $versionID, $problemID);
 }
 
 sub getMergedProblemVersion {
-	my ($self, $userID, $setID, $versionID, $problemID) = shift->checkArgs(\@_, qw/user_id set_id version_id problem_id/);
-	return ( $self->getMergedProblemVersions([$userID, $setID, $versionID, $problemID]) )[0];
+	my ($self, $userID, $setID, $versionID, $problemID) =
+		shift->checkArgs(\@_, qw/user_id set_id version_id problem_id/);
+	return ($self->getMergedProblemVersions([ $userID, $setID, $versionID, $problemID ]))[0];
 }
 
 sub getMergedProblemVersions {
@@ -2273,18 +2365,18 @@ sub getMergedProblemVersions {
 
 sub getAllMergedProblemVersions {
 	my ($self, $userID, $setID, $versionID) = shift->checkArgs(\@_, qw/user_id set_id version_id/);
-	my $where = [user_id_eq_set_id_eq_version_id_eq => $userID,$setID,$versionID];
+	my $where = [ user_id_eq_set_id_eq_version_id_eq => $userID, $setID, $versionID ];
 	my $order = ["problem_id"];
-	return $self->{problem_version_merged}->get_records_where($where,$order);
+	return $self->{problem_version_merged}->get_records_where($where, $order);
 }
 
 ################################################################################
 # utilities
 ################################################################################
 
-sub check_user_id { #  (valid characters are [-a-zA-Z0-9_.,@])
+sub check_user_id {    #  (valid characters are [-a-zA-Z0-9_.,@])
 	my $value = shift;
-	if ($value =~ m/^[-a-zA-Z0-9_.@]*,?(set_id:)?[-a-zA-Z0-9_.@]*(,g)?$/ ) {
+	if ($value =~ m/^[-a-zA-Z0-9_.@]*,?(set_id:)?[-a-zA-Z0-9_.@]*(,g)?$/) {
 		return 1;
 	} else {
 		croak "invalid characters in user_id field: '$value' (valid characters are [-a-zA-Z0-9_.,@])";
@@ -2299,42 +2391,53 @@ sub check_user_id { #  (valid characters are [-a-zA-Z0-9_.,@])
 sub checkKeyfields($;$) {
 	my ($Record, $versioned) = @_;
 	foreach my $keyfield ($Record->KEYFIELDS) {
-		my $value = $Record->$keyfield;
+		my $value     = $Record->$keyfield;
 		my $fielddata = $Record->FIELD_DATA;
-		return if ($fielddata->{$keyfield}{type}=~/AUTO_INCREMENT/);
+		return if ($fielddata->{$keyfield}{type} =~ /AUTO_INCREMENT/);
 
 		croak "undefined '$keyfield' field"
 			unless defined $value;
 		croak "empty '$keyfield' field"
 			unless $value ne "";
 
-		validateKeyfieldValue($keyfield,$value,$versioned);
+		validateKeyfieldValue($keyfield, $value, $versioned);
 
 	}
 }
 
-
 sub validateKeyfieldValue {
 
-    my ($keyfield,$value,$versioned) = @_;
+	my ($keyfield, $value, $versioned) = @_;
+
+	if ($keyfield eq "problem_id" || $keyfield eq 'problemID') {
+		croak "invalid characters in '"
+			. encode_entities($keyfield)
+			. "' field: '"
+			. encode_entities($value)
+			. "' (valid characters are [0-9])"
+			unless $value =~ m/^[0-9]*$/;
+	} elsif ($versioned and $keyfield eq "set_id" || $keyfield eq 'setID') {
+		croak "invalid characters in '"
+			. encode_entities($keyfield)
+			. "' field: '"
+			. encode_entities($value)
+			. "' (valid characters are [-a-zA-Z0-9_.,])"
+			unless $value =~ m/^[-a-zA-Z0-9_.,]*$/;
+		# } elsif ($versioned and $keyfield eq "user_id") {
+	} elsif ($keyfield eq "user_id" || $keyfield eq 'userID') {
+		check_user_id($value);    #  (valid characters are [-a-zA-Z0-9_.,]) see above.
+	} elsif ($keyfield eq "ip_mask") {
+		croak "invalid characters in '$keyfield' field: '$value' (valid characters are [-a-zA-Z0-9_.,])"
+			unless $value =~ m/^[-a-fA-F0-9_.:\/]*$/;
 
-    if ($keyfield eq "problem_id" || $keyfield eq 'problemID') {
-	croak "invalid characters in '".encode_entities($keyfield)."' field: '".encode_entities($value)."' (valid characters are [0-9])"
-	    unless $value =~ m/^[0-9]*$/;
-    } elsif ($versioned and $keyfield eq "set_id" || $keyfield eq 'setID') {
-	croak "invalid characters in '".encode_entities($keyfield)."' field: '".encode_entities($value)."' (valid characters are [-a-zA-Z0-9_.,])"
-	    unless $value =~ m/^[-a-zA-Z0-9_.,]*$/;
-	# } elsif ($versioned and $keyfield eq "user_id") {
-    } elsif ($keyfield eq "user_id" || $keyfield eq 'userID') {
-	check_user_id($value); #  (valid characters are [-a-zA-Z0-9_.,]) see above.
-    } elsif ($keyfield eq "ip_mask") {
-	croak "invalid characters in '$keyfield' field: '$value' (valid characters are [-a-zA-Z0-9_.,])"
-	    unless $value =~ m/^[-a-fA-F0-9_.:\/]*$/;
-
-    } else {
-	croak "invalid characters in '".encode_entities($keyfield)."' field: '".encode_entities($value)."' (valid characters are [-a-zA-Z0-9_.])"
-	    unless $value =~ m/^[-a-zA-Z0-9_.]*$/;
-    }
+	} else {
+		croak "invalid characters in '"
+			. encode_entities($keyfield)
+			. "' field: '"
+			. encode_entities($value)
+			. "' (valid characters are [-a-zA-Z0-9_.])"
+			unless $value =~ m/^[-a-zA-Z0-9_.]*$/;
+	}
 
 }
 
@@ -2362,7 +2465,7 @@ sub checkArgs {
 	if ($is_list) {
 		$min_args = 0;
 	} else {
-		foreach my $i (0..$#spec) {
+		foreach my $i (0 .. $#spec) {
 			#print "$i - $spec[$i]\n";
 			if ($spec[$i] =~ s/\?$//) {
 				#print "$i - matched\n";
@@ -2391,9 +2494,9 @@ sub checkArgs {
 		($versioned, $table) = $name =~ /^(V?)REC:(.*)/;
 	}
 
-	foreach my $i (0..@$args-1) {
+	foreach my $i (0 .. @$args - 1) {
 		my $arg = $args->[$i];
-		my $pos = $i+1;
+		my $pos = $i + 1;
 
 		unless ($is_list) {
 			$name = $spec[$i];
@@ -2404,7 +2507,9 @@ sub checkArgs {
 			my $class = $self->{$table}{record};
 			#print "arg=$arg class=$class\n";
 			croak "argument $pos must be of type $class"
-				unless defined $arg and ref $arg and $arg->isa($class);
+				unless defined $arg
+				and ref $arg
+				and $arg->isa($class);
 			eval { checkKeyfields($arg, $versioned) };
 			croak "argument $pos contains $@" if $@;
 		} else {
@@ -2420,9 +2525,9 @@ sub checkArgs {
 
 sub checkArgsRefList {
 	my ($self, $items, @spec) = @_;
-	foreach my $i (0..@$items-1) {
+	foreach my $i (0 .. @$items - 1) {
 		my $item = $items->[$i];
-		my $pos = $i+1;
+		my $pos  = $i + 1;
 		croak "item $pos must be a reference to an array"
 			unless UNIVERSAL::isa($item, "ARRAY");
 		eval { $self->checkArgs($item, @spec) };
diff --git a/lib/WeBWorK/DB/Driver.pm b/lib/WeBWorK/DB/Driver.pm
index 28c82bde6e..57d0f1e9dd 100644
--- a/lib/WeBWorK/DB/Driver.pm
+++ b/lib/WeBWorK/DB/Driver.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
diff --git a/lib/WeBWorK/DB/Driver/Null.pm b/lib/WeBWorK/DB/Driver/Null.pm
index be80d575e3..247e3efee9 100644
--- a/lib/WeBWorK/DB/Driver/Null.pm
+++ b/lib/WeBWorK/DB/Driver/Null.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
diff --git a/lib/WeBWorK/DB/Driver/SQL.pm b/lib/WeBWorK/DB/Driver/SQL.pm
index a20e73dadf..913e8b57e7 100644
--- a/lib/WeBWorK/DB/Driver/SQL.pm
+++ b/lib/WeBWorK/DB/Driver/SQL.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
diff --git a/lib/WeBWorK/DB/Record.pm b/lib/WeBWorK/DB/Record.pm
index 8a60ba3850..e2b5a06b9e 100644
--- a/lib/WeBWorK/DB/Record.pm
+++ b/lib/WeBWorK/DB/Record.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
diff --git a/lib/WeBWorK/DB/Record/Achievement.pm b/lib/WeBWorK/DB/Record/Achievement.pm
index 58a4ee3d5e..f1d06bc434 100644
--- a/lib/WeBWorK/DB/Record/Achievement.pm
+++ b/lib/WeBWorK/DB/Record/Achievement.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -27,7 +27,7 @@ use warnings;
 
 BEGIN {
 	__PACKAGE__->_fields(
-		achievement_id  => { type => "TINYBLOB NOT NULL", key => 1 },
+		achievement_id  => { type => "VARCHAR(100) NOT NULL", key => 1 },
 		name            => { type => "TEXT" },
 		description     => { type => "TEXT" },
 		points          => { type => "INT" },
diff --git a/lib/WeBWorK/DB/Record/Depths.pm b/lib/WeBWorK/DB/Record/Depths.pm
index 008c504d94..806bb87b9a 100644
--- a/lib/WeBWorK/DB/Record/Depths.pm
+++ b/lib/WeBWorK/DB/Record/Depths.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
diff --git a/lib/WeBWorK/DB/Record/GlobalUserAchievement.pm b/lib/WeBWorK/DB/Record/GlobalUserAchievement.pm
index 795e857c4e..7aab63935b 100644
--- a/lib/WeBWorK/DB/Record/GlobalUserAchievement.pm
+++ b/lib/WeBWorK/DB/Record/GlobalUserAchievement.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -27,14 +27,11 @@ use warnings;
 
 BEGIN {
 	__PACKAGE__->_fields(
-		user_id              => { type => "TINYBLOB NOT NULL", key => 1 },
+		user_id              => { type => "VARCHAR(100) NOT NULL", key => 1 },
 		achievement_points   => { type => "INT" },
 		next_level_points    => { type => "INT" },
 		level_achievement_id => { type => "VARCHAR(100)" },
-		# VARCHAR(1024) is only supported by MySQL version 5.0.3 and
-		# later, but it makes freezing and thawing safer to have
-		# more available characters
-		frozen_hash => { type => "VARCHAR(1024)" },
+		frozen_hash          => { type => "MEDIUMBLOB" },
 	);
 }
 
diff --git a/lib/WeBWorK/DB/Record/Key.pm b/lib/WeBWorK/DB/Record/Key.pm
index fe9b3af45d..1f8315f4a6 100644
--- a/lib/WeBWorK/DB/Record/Key.pm
+++ b/lib/WeBWorK/DB/Record/Key.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -27,10 +27,10 @@ use warnings;
 
 BEGIN {
 	__PACKAGE__->_fields(
-		user_id   => { type => "TINYBLOB NOT NULL", key => 1 },
+		user_id   => { type => "VARCHAR(100) NOT NULL", key => 1 },
 		key       => { type => "TEXT" },
 		timestamp => { type => "BIGINT" },
-		set_id    => { type => "TINYBLOB" },
+		set_id    => { type => "TINYTEXT" },
 	);
 }
 
diff --git a/lib/WeBWorK/DB/Record/LocationAddresses.pm b/lib/WeBWorK/DB/Record/LocationAddresses.pm
index 65eafc8a41..09ab6fb6c2 100644
--- a/lib/WeBWorK/DB/Record/LocationAddresses.pm
+++ b/lib/WeBWorK/DB/Record/LocationAddresses.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -26,7 +26,7 @@ use warnings;
 
 BEGIN {
 	__PACKAGE__->_fields(
-		location_id => { type => "TINYBLOB NOT NULL", key => 1 },    # requires up to 256 bytes
+		location_id => { type => "VARCHAR(40) NOT NULL", key => 1 },    # requires up to 256 bytes
 		ip_mask     => { type => "VARCHAR(180)", key => 1 },    # was VARCHAR(255), reduced to VARCHAR(180) for utf8mb4
 	);
 }
diff --git a/lib/WeBWorK/DB/Record/Locations.pm b/lib/WeBWorK/DB/Record/Locations.pm
index cd301a6677..a890f5f1e4 100644
--- a/lib/WeBWorK/DB/Record/Locations.pm
+++ b/lib/WeBWorK/DB/Record/Locations.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -26,7 +26,7 @@ use warnings;
 
 BEGIN {
 	__PACKAGE__->_fields(
-		location_id => { type => "TINYBLOB NOT NULL", key => 1 },
+		location_id => { type => "VARCHAR(40) NOT NULL", key => 1 },
 		description => { type => "TEXT" },
 	);
 }
diff --git a/lib/WeBWorK/DB/Record/Password.pm b/lib/WeBWorK/DB/Record/Password.pm
index d2099ccc0a..cd61e8d180 100644
--- a/lib/WeBWorK/DB/Record/Password.pm
+++ b/lib/WeBWorK/DB/Record/Password.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -27,7 +27,7 @@ use warnings;
 
 BEGIN {
 	__PACKAGE__->_fields(
-		user_id  => { type => "TINYBLOB NOT NULL", key => 1 },
+		user_id  => { type => "VARCHAR(100) NOT NULL", key => 1 },
 		password => { type => "TEXT" },
 	);
 }
diff --git a/lib/WeBWorK/DB/Record/PastAnswer.pm b/lib/WeBWorK/DB/Record/PastAnswer.pm
index acf2bf710c..0bc1e6e916 100644
--- a/lib/WeBWorK/DB/Record/PastAnswer.pm
+++ b/lib/WeBWorK/DB/Record/PastAnswer.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
diff --git a/lib/WeBWorK/DB/Record/PermissionLevel.pm b/lib/WeBWorK/DB/Record/PermissionLevel.pm
index 18d5d65f38..e6951b35ce 100644
--- a/lib/WeBWorK/DB/Record/PermissionLevel.pm
+++ b/lib/WeBWorK/DB/Record/PermissionLevel.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -28,7 +28,7 @@ use warnings;
 
 BEGIN {
 	__PACKAGE__->_fields(
-		user_id    => { type => "TINYBLOB NOT NULL", key => 1 },
+		user_id    => { type => "VARCHAR(100) NOT NULL", key => 1 },
 		permission => { type => "INT" },
 
 	);
diff --git a/lib/WeBWorK/DB/Record/Problem.pm b/lib/WeBWorK/DB/Record/Problem.pm
index 876aac10fa..ebe7e83222 100644
--- a/lib/WeBWorK/DB/Record/Problem.pm
+++ b/lib/WeBWorK/DB/Record/Problem.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -27,8 +27,8 @@ use warnings;
 
 BEGIN {
 	__PACKAGE__->_fields(
-		set_id               => { type => "TINYBLOB NOT NULL", key => 1 },
-		problem_id           => { type => "INT NOT NULL",      key => 1 },
+		set_id               => { type => "VARCHAR(100) NOT NULL", key => 1 },
+		problem_id           => { type => "INT NOT NULL",          key => 1 },
 		source_file          => { type => "TEXT" },
 		value                => { type => "INT" },
 		max_attempts         => { type => "INT" },
@@ -36,6 +36,7 @@ BEGIN {
 		counts_parent_grade  => { type => "INT" },
 		showMeAnother        => { type => "INT" },
 		showMeAnotherCount   => { type => "INT" },
+		showHintsAfter       => { type => "INT NOT NULL DEFAULT -2" },
 		# periodic re-randomization period
 		prPeriod => { type => "INT" },
 		# periodic re-randomization number of attempts for the current seed
diff --git a/lib/WeBWorK/DB/Record/ProblemVersion.pm b/lib/WeBWorK/DB/Record/ProblemVersion.pm
index d77b63f9c9..42eb6e2a9a 100644
--- a/lib/WeBWorK/DB/Record/ProblemVersion.pm
+++ b/lib/WeBWorK/DB/Record/ProblemVersion.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -32,10 +32,10 @@ BEGIN {
 	my $field_data   = $base->FIELD_DATA;
 	my @nonkeyfields = map { $_ => $field_data->{$_} } $base->NONKEYFIELDS;
 	__PACKAGE__->_fields(
-		user_id    => { type => "TINYBLOB NOT NULL", key => 1 },
-		set_id     => { type => "TINYBLOB NOT NULL", key => 1 },
-		version_id => { type => "INT NOT NULL",      key => 1 },
-		problem_id => { type => "INT NOT NULL",      key => 1 },
+		user_id    => { type => "VARCHAR(100) NOT NULL", key => 1 },
+		set_id     => { type => "VARCHAR(100) NOT NULL", key => 1 },
+		version_id => { type => "INT NOT NULL",          key => 1 },
+		problem_id => { type => "INT NOT NULL",          key => 1 },
 		@nonkeyfields,
 	);
 }
diff --git a/lib/WeBWorK/DB/Record/Set.pm b/lib/WeBWorK/DB/Record/Set.pm
index 6d7c859fb6..a9be708b7a 100644
--- a/lib/WeBWorK/DB/Record/Set.pm
+++ b/lib/WeBWorK/DB/Record/Set.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -27,7 +27,7 @@ use warnings;
 
 BEGIN {
 	__PACKAGE__->_fields(
-		set_id                    => { type => "TINYBLOB NOT NULL", key => 1 },
+		set_id                    => { type => "VARCHAR(100) NOT NULL", key => 1 },
 		set_header                => { type => "TEXT" },
 		hardcopy_header           => { type => "TEXT" },
 		open_date                 => { type => "BIGINT" },
@@ -55,9 +55,11 @@ BEGIN {
 		restrict_ip               => { type => "ENUM('No','RestrictTo','DenyFrom') DEFAULT 'No'" },
 		relax_restrict_ip         => { type => "ENUM('No','AfterAnswerDate','AfterVersionAnswerDate') DEFAULT 'No'" },
 		restricted_login_proctor  => { type => "ENUM('No','Yes')" },
+		use_grade_auth_proctor    => { type => "ENUM('No','Yes') DEFAULT 'Yes'" },
 		hide_hint                 => { type => "INT" },
 		restrict_prob_progression => { type => "INT" },
 		email_instructor          => { type => "INT" },
+		lis_source_did            => { type => "TEXT" },
 	);
 }
 
diff --git a/lib/WeBWorK/DB/Record/SetLocations.pm b/lib/WeBWorK/DB/Record/SetLocations.pm
index ecf5d84f7c..1347de924f 100644
--- a/lib/WeBWorK/DB/Record/SetLocations.pm
+++ b/lib/WeBWorK/DB/Record/SetLocations.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -26,8 +26,8 @@ use warnings;
 
 BEGIN {
 	__PACKAGE__->_fields(
-		set_id      => { type => "TINYBLOB NOT NULL", key => 1 },
-		location_id => { type => "TINYBLOB NOT NULL", key => 1 },
+		set_id      => { type => "VARCHAR(100) NOT NULL", key => 1 },
+		location_id => { type => "VARCHAR(40) NOT NULL",  key => 1 },
 	);
 }
 
diff --git a/lib/WeBWorK/DB/Record/SetVersion.pm b/lib/WeBWorK/DB/Record/SetVersion.pm
index 4a7dad5c52..2bb879dadb 100644
--- a/lib/WeBWorK/DB/Record/SetVersion.pm
+++ b/lib/WeBWorK/DB/Record/SetVersion.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -32,9 +32,9 @@ BEGIN {
 	my $field_data   = $base->FIELD_DATA;
 	my @nonkeyfields = map { $_ => $field_data->{$_} } $base->NONKEYFIELDS;
 	__PACKAGE__->_fields(
-		user_id    => { type => "TINYBLOB NOT NULL", key => 1 },
-		set_id     => { type => "TINYBLOB NOT NULL", key => 1 },
-		version_id => { type => "INT NOT NULL",      key => 1 },
+		user_id    => { type => "VARCHAR(100) NOT NULL", key => 1 },
+		set_id     => { type => "VARCHAR(100) NOT NULL", key => 1 },
+		version_id => { type => "INT NOT NULL",          key => 1 },
 		@nonkeyfields,
 	);
 }
diff --git a/lib/WeBWorK/DB/Record/Setting.pm b/lib/WeBWorK/DB/Record/Setting.pm
index 63aa921b84..9af90b3d9e 100644
--- a/lib/WeBWorK/DB/Record/Setting.pm
+++ b/lib/WeBWorK/DB/Record/Setting.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
diff --git a/lib/WeBWorK/DB/Record/User.pm b/lib/WeBWorK/DB/Record/User.pm
index b19f16233a..976fbe5942 100644
--- a/lib/WeBWorK/DB/Record/User.pm
+++ b/lib/WeBWorK/DB/Record/User.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -27,7 +27,7 @@ use warnings;
 
 BEGIN {
 	__PACKAGE__->_fields(
-		user_id        => { type => "TINYBLOB NOT NULL", key => 1 },
+		user_id        => { type => "VARCHAR(100) NOT NULL", key => 1 },
 		first_name     => { type => "TEXT" },
 		last_name      => { type => "TEXT" },
 		email_address  => { type => "TEXT" },
@@ -39,9 +39,8 @@ BEGIN {
 		displayMode    => { type => "TEXT" },
 		showOldAnswers => { type => "INT" },
 		useMathView    => { type => "INT" },
-		useWirisEditor => { type => "INT" },
 		useMathQuill   => { type => "INT" },
-		lis_source_did => { type => "BLOB" },
+		lis_source_did => { type => "TEXT" },
 	);
 }
 
diff --git a/lib/WeBWorK/DB/Record/UserAchievement.pm b/lib/WeBWorK/DB/Record/UserAchievement.pm
index bfb0e1323c..4f883a1966 100644
--- a/lib/WeBWorK/DB/Record/UserAchievement.pm
+++ b/lib/WeBWorK/DB/Record/UserAchievement.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -27,14 +27,11 @@ use warnings;
 
 BEGIN {
 	__PACKAGE__->_fields(
-		user_id        => { type => "TINYBLOB NOT NULL", key => 1 },
-		achievement_id => { type => "TINYBLOB NOT NULL", key => 1 },
+		user_id        => { type => "VARCHAR(100) NOT NULL", key => 1 },
+		achievement_id => { type => "VARCHAR(100) NOT NULL", key => 1 },
 		earned         => { type => "INT" },
 		counter        => { type => "INT" },
-		# VARCHAR(1024) is only supported by MySQL version 5.0.3 and
-		# later, but it makes freezing and thawing safer to have
-		# more available characters
-		frozen_hash => { type => "VARCHAR(1024)" },
+		frozen_hash    => { type => "MEDIUMBLOB" },
 	);
 }
 
diff --git a/lib/WeBWorK/DB/Record/UserProblem.pm b/lib/WeBWorK/DB/Record/UserProblem.pm
index acbbb679f8..0c33f128a7 100644
--- a/lib/WeBWorK/DB/Record/UserProblem.pm
+++ b/lib/WeBWorK/DB/Record/UserProblem.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -28,15 +28,16 @@ use warnings;
 
 BEGIN {
 	__PACKAGE__->_fields(
-		user_id     => { type => "TINYBLOB NOT NULL", key => 1 },
-		set_id      => { type => "TINYBLOB NOT NULL", key => 1 },
-		problem_id  => { type => "INT NOT NULL",      key => 1 },
+		user_id     => { type => "VARCHAR(100) NOT NULL", key => 1 },
+		set_id      => { type => "VARCHAR(100) NOT NULL", key => 1 },
+		problem_id  => { type => "INT NOT NULL",          key => 1 },
 		source_file => { type => "TEXT" },
 		# FIXME i think value should be able to hold decimal values...
 		value              => { type => "INT" },
 		max_attempts       => { type => "INT" },
 		showMeAnother      => { type => "INT" },
 		showMeAnotherCount => { type => "INT" },
+		showHintsAfter     => { type => "INT" },
 		# periodic re-randomization period
 		prPeriod => { type => "INT" },
 		# periodic re-randomization number of attempts for the current seed
@@ -49,9 +50,12 @@ BEGIN {
 		num_incorrect        => { type => "INT" },
 		att_to_open_children => { type => "INT" },
 		counts_parent_grade  => { type => "INT" },
-		sub_status           => { type => "FLOAT" },  # A subsidiary status used to implement the reduced scoring period
-													  # a field for flags which need to be set
-		flags                => { type => "TEXT" },
+		# A subsidiary status used to implement the reduced scoring period
+		sub_status => { type => "FLOAT" },
+		# a field for flags which need to be set
+		flags => { type => "TEXT" },
+		# additional stored data for this problem, internally uses JSON:
+		problem_data => { type => "MEDIUMTEXT" },
 	);
 }
 
diff --git a/lib/WeBWorK/DB/Record/UserSet.pm b/lib/WeBWorK/DB/Record/UserSet.pm
index 735eebe5e6..06723166e4 100644
--- a/lib/WeBWorK/DB/Record/UserSet.pm
+++ b/lib/WeBWorK/DB/Record/UserSet.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -27,8 +27,8 @@ use warnings;
 
 BEGIN {
 	__PACKAGE__->_fields(
-		user_id                   => { type => "TINYBLOB NOT NULL", key => 1 },
-		set_id                    => { type => "TINYBLOB NOT NULL", key => 1 },
+		user_id                   => { type => "VARCHAR(100) NOT NULL", key => 1 },
+		set_id                    => { type => "VARCHAR(100) NOT NULL", key => 1 },
 		psvn                      => { type => "INT UNIQUE NOT NULL AUTO_INCREMENT" },
 		set_header                => { type => "TEXT" },
 		hardcopy_header           => { type => "TEXT" },
@@ -57,10 +57,12 @@ BEGIN {
 		restrict_ip               => { type => "ENUM('No','RestrictTo','DenyFrom')" },
 		relax_restrict_ip         => { type => "ENUM('No','AfterAnswerDate','AfterVersionAnswerDate')" },
 		restricted_login_proctor  => { type => "ENUM('No','Yes')" },
+		use_grade_auth_proctor    => { type => "ENUM('No','Yes')" },
 		hide_hint                 => { type => "INT" },
 		restrict_prob_progression => { type => "INT" },
 		email_instructor          => { type => "INT" },
-		lis_source_did            => { type => "BLOB" },
+		lis_source_did            => { type => "TEXT" },
+		external_data             => { type => "MEDIUMTEXT" },
 	);
 }
 
diff --git a/lib/WeBWorK/DB/Record/UserSetLocations.pm b/lib/WeBWorK/DB/Record/UserSetLocations.pm
index 0a11ca4478..61a81483a6 100644
--- a/lib/WeBWorK/DB/Record/UserSetLocations.pm
+++ b/lib/WeBWorK/DB/Record/UserSetLocations.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -26,9 +26,9 @@ use warnings;
 
 BEGIN {
 	__PACKAGE__->_fields(
-		user_id     => { type => "TINYBLOB NOT NULL", key => 1 },
-		set_id      => { type => "TINYBLOB NOT NULL", key => 1 },
-		location_id => { type => "TINYBLOB NOT NULL", key => 1 },
+		user_id     => { type => "VARCHAR(100) NOT NULL", key => 1 },
+		set_id      => { type => "VARCHAR(100) NOT NULL", key => 1 },
+		location_id => { type => "VARCHAR(40) NOT NULL",  key => 1 },
 	);
 }
 
diff --git a/lib/WeBWorK/DB/Schema.pm b/lib/WeBWorK/DB/Schema.pm
index 2efaaf48c5..1135cf83f0 100644
--- a/lib/WeBWorK/DB/Schema.pm
+++ b/lib/WeBWorK/DB/Schema.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
diff --git a/lib/WeBWorK/DB/Schema/NewSQL.pm b/lib/WeBWorK/DB/Schema/NewSQL.pm
index c505a8f36c..41086c4e15 100644
--- a/lib/WeBWorK/DB/Schema/NewSQL.pm
+++ b/lib/WeBWorK/DB/Schema/NewSQL.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
diff --git a/lib/WeBWorK/DB/Schema/NewSQL/Merge.pm b/lib/WeBWorK/DB/Schema/NewSQL/Merge.pm
index dd2e23adfe..28ec574fa4 100644
--- a/lib/WeBWorK/DB/Schema/NewSQL/Merge.pm
+++ b/lib/WeBWorK/DB/Schema/NewSQL/Merge.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
diff --git a/lib/WeBWorK/DB/Schema/NewSQL/NonVersioned.pm b/lib/WeBWorK/DB/Schema/NewSQL/NonVersioned.pm
index 01e2b000e5..f67fc95763 100644
--- a/lib/WeBWorK/DB/Schema/NewSQL/NonVersioned.pm
+++ b/lib/WeBWorK/DB/Schema/NewSQL/NonVersioned.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
diff --git a/lib/WeBWorK/DB/Schema/NewSQL/Std.pm b/lib/WeBWorK/DB/Schema/NewSQL/Std.pm
index 4e38150950..3510f2fd42 100644
--- a/lib/WeBWorK/DB/Schema/NewSQL/Std.pm
+++ b/lib/WeBWorK/DB/Schema/NewSQL/Std.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
diff --git a/lib/WeBWorK/DB/Schema/NewSQL/Versioned.pm b/lib/WeBWorK/DB/Schema/NewSQL/Versioned.pm
index 13a422a1ba..a942014e34 100644
--- a/lib/WeBWorK/DB/Schema/NewSQL/Versioned.pm
+++ b/lib/WeBWorK/DB/Schema/NewSQL/Versioned.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
diff --git a/lib/WeBWorK/DB/Schema/NewSQL/VersionedMerge.pm b/lib/WeBWorK/DB/Schema/NewSQL/VersionedMerge.pm
index d0851af299..75f866cb53 100644
--- a/lib/WeBWorK/DB/Schema/NewSQL/VersionedMerge.pm
+++ b/lib/WeBWorK/DB/Schema/NewSQL/VersionedMerge.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
diff --git a/lib/WeBWorK/DB/Utils.pm b/lib/WeBWorK/DB/Utils.pm
index df03ba0801..2a6476c0c7 100644
--- a/lib/WeBWorK/DB/Utils.pm
+++ b/lib/WeBWorK/DB/Utils.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
diff --git a/lib/WeBWorK/DB/Utils/SQLAbstractIdentTrans.pm b/lib/WeBWorK/DB/Utils/SQLAbstractIdentTrans.pm
index 825a7ba503..f69bd9ab0c 100644
--- a/lib/WeBWorK/DB/Utils/SQLAbstractIdentTrans.pm
+++ b/lib/WeBWorK/DB/Utils/SQLAbstractIdentTrans.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
diff --git a/lib/WeBWorK/Debug.pm b/lib/WeBWorK/Debug.pm
index 7aa8d9cc03..bf55fcd1fa 100644
--- a/lib/WeBWorK/Debug.pm
+++ b/lib/WeBWorK/Debug.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,8 +14,15 @@
 ################################################################################
 
 package WeBWorK::Debug;
-use base qw(Exporter);
+use parent qw(Exporter);
+
+use strict;
+use warnings;
+
 use Date::Format;
+use Time::HiRes qw/gettimeofday/;
+use WeBWorK::Utils qw/undefstr/;
+
 our @EXPORT = qw(debug);
 
 =head1 NAME
@@ -25,26 +32,16 @@ WeBWorK::Debug - Print (or don't print) debugging output.
 head1 SYNOPSIS
 
  use WeBWorK::Debug;
- 
+
  # Enable debugging
  $WeBWorK::Debug::Enabled = 1;
- 
+
  # Log to a file instead of STDERR
  $WeBWorK::Debug::Logfile = "/path/to/debug.log";
- 
+
  # log some debugging output
  debug("Generated 5 widgets.");
 
-=cut
-
-use strict;
-use warnings;
-use Time::HiRes qw/gettimeofday/;
-use WeBWorK::Constants;
-use WeBWorK::Utils qw/undefstr/;
-
-################################################################################
-
 =head1 CONFIGURATION VARIABLES
 
 =over
@@ -55,7 +52,7 @@ If true, debugging messages will be output. If false, they will be ignored.
 
 =cut
 
-our $Enabled = 0 unless defined $Enabled;
+our $Enabled = $Enabled // 0;
 
 =item $Logfile
 
@@ -63,7 +60,7 @@ If non-empty, debugging output will be sent to the file named rather than STDERR
 
 =cut
 
-our $Logfile = "" unless defined $Logfile;
+our $Logfile = $Logfile // '';
 
 =item $DenySubroutineOutput
 
@@ -85,10 +82,6 @@ our $AllowSubroutineOutput;
 
 =back
 
-=cut
-
-################################################################################
-
 =head1 FUNCTIONS
 
 =over
@@ -100,24 +93,21 @@ Write @messages to the debugging log.
 =cut
 
 sub debug {
-	my (@message) = undefstr("###UNDEF###", @_);
+	my @message = @_;
+	@message = undefstr('###UNDEF###', @message);
 
-	#print STDERR "in ww::debug\n";
-	#print STDERR $WeBWorK::Constants::WEBWORK_DIRECTORY . "\n";
-	#print STDERR $Logfile . "\n";
-	
 	if ($Enabled) {
 		my ($package, $filename, $line, $subroutine) = caller(1);
 		return if defined $AllowSubroutineOutput and not $subroutine =~ m/$AllowSubroutineOutput/;
-		return if defined $DenySubroutineOutput and $subroutine =~ m/$DenySubroutineOutput/;
-		
+		return if defined $DenySubroutineOutput  and $subroutine     =~ m/$DenySubroutineOutput/;
+
 		my ($sec, $msec) = gettimeofday;
-		my $date = time2str("%a %b %d %H:%M:%S.$msec %Y", $sec);
-		my $finalMessage = "[$date] $subroutine: " . join("", @message);
+		my $date         = time2str("%a %b %d %H:%M:%S.$msec %Y", $sec);
+		my $finalMessage = "[$date] $subroutine: " . join('', @message);
 		$finalMessage .= "\n" unless $finalMessage =~ m/\n$/;
 
-		if ($WeBWorK::Debug::Logfile ne "") {
-			if (open my $fh, ">>:encoding(UTF-8)", $Logfile) {
+		if ($WeBWorK::Debug::Logfile ne '') {
+			if (open my $fh, '>>:encoding(UTF-8)', $Logfile) {
 				print $fh $finalMessage;
 				close $fh;
 			} else {
@@ -128,14 +118,12 @@ sub debug {
 			print STDERR $finalMessage;
 		}
 	}
+
+	return;
 }
 
 =back
 
-=cut
-
-################################################################################
-
 =head1 AUTHOR
 
 Written by Sam Hathaway, sh002i (at) math.rochester.edu.
diff --git a/lib/WeBWorK/FakeRequest.pm b/lib/WeBWorK/FakeRequest.pm
deleted file mode 100644
index 7e531f8d08..0000000000
--- a/lib/WeBWorK/FakeRequest.pm
+++ /dev/null
@@ -1,211 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::FakeRequest;
-use parent WeBWorK::Request;
-
-=head1 NAME
-
-	WeBWorK::FakeRequest 
-
-=head1 SYNPOSIS
-
- 	$fake_r = WeBWorK::FakeRequest->new ($input_hash, 'xmlrpc_module')
- 
-=head1 DESCRIPTION
-
-- Imitate WeBWorK::Request behavior without benefit of Apache::Request
-
-This module is used in the WebworkWebservice suite, specifically by the WebworkXMLRPC, to facilitate
-authorization and authentication when the input hash is not an WeBWorK::Request object but does
-contain the authorization and authentication data. 
-
-It might be applicable for use elsewhere.
-
-=cut
-use strict;
-use warnings;
-use WeBWorK::Debug;
-use WeBWorK::Utils qw(runtime_use);
-
-# Instead of being called with an apache request object $r 
-# this RequestObject  gets its data  
-# from an HTML data form.  It creates a WeBWorK::FakeRequest object  
-# which fakes the essential properties of the WeBWorK::Request object needed for authentication
-
-=head1 METHODS overriding those of WeBWorK::Request
-
-
-=over
-
-=item new (input, authen_module_name)
-
-Typically authen_module_name would be xmlrpc_module
-
-The  items userID session_key courseID course_password are taken from input
-and added to the FakeRequest instance variables as user, key, courseName and passwd.
-	
-=cut
-
-sub new {
-	my $class = shift;    
-	my ($rh_input,$authen_module_name) = @_;  #rh_input is required; ce is optional
-	my $self = {
-		user      		    => $rh_input ->{userID},
-		key	 		        => $rh_input ->{session_key},
-		courseName   		=> $rh_input ->{courseID},
-		passwd              => $rh_input ->{course_password},
-		# backwards compatible names
-		user_id             => $rh_input ->{userID},
-		password    =>  $rh_input ->{course_password},
-		session_key =>  $rh_input ->{session_key},
-
-		authen				=> '',
-		authz               => '',
-		urlpath             => '',
-		xmlrpc              => 1,
-		%$rh_input,
-	};
-	#warn "FakeRequest $class, authen_module_name $authen_module_name";
-	$self = bless $self, $class;
-	debug( "self has type ",ref($self),);
-	
-	# now we need to finish initializing $fake_r;
-	# create CourseEnvironment 
-	my $ce = $self->ce( $self->create_course_environment() );
-	
-	# create database object
-	$self->db( WeBWorK::DB->new($ce->{dbLayout}) );
-	
-	# store Localization subroutine
-	my $language= $ce->{language} || "en";
-	$self->language_handle(  WeBWorK::Localize::getLoc($language) );
-	
-	# create, initialize and store authen object
-	my $user_authen_module = WeBWorK::Authen::class($ce, $authen_module_name); #default: xmlrpc_module
-    runtime_use $user_authen_module;
-	my $authen = $user_authen_module->new($self);
-	$self->authen($authen);    
-
-	# create and store authz object
-	my $authz  =  WeBWorK::Authz->new($self);
-	$self->authz($authz); 
-	return $self;     	
-}
-
-=item param
-
-Imitate get behavior of the Apache::Request object params method
-
-=cut
-
-sub param {    # imitate get behavior of the request object params method
-	my $self =shift;
-	my $param = shift;
-	$self->{$param};
-}
-
-=back
-
-=head1 METHODS inherited from WeBWorK::Request
-
-=over
-
-=item ce([$new])
-
-Return the course environment (WeBWorK::CourseEnvironment) associated with this
-request. If $new is specified, set the course environment to $new before
-returning the value.
-
-
-
-=item db([$new])
-
-Return the database (WeBWorK::DB) associated with this request. If $new is
-specified, set the database to $new before returning the value.
-
-
-
-=item authen([$new])
-
-Return the authenticator (WeBWorK::Authen) associated with this request. If $new
-is specified, set the authenticator to $new before returning the value.
-
-
-
-=item authz([$new])
-
-Return the authorizer (WeBWorK::Authz) associated with this request. If $new is
-specified, set the authorizer to $new before returning the value.
-
-
-
-=item urlpath([$new])
-
-Return the URL path (WeBWorK::URLPath) associated with this request. If $new is
-specified, set the URL path to $new before returning the value. (Does this need modification
-from the WeBWorK::Request version???)
-
-=cut
-
-# sub urlpath {
-# 	my $self = shift;
-# 	$self->{urlpath} = shift if @_;
-# 	return $self->{urlpath};
-# }
-
-=item language_handle([$new])
-
-Return the URL path (WeBWorK::URLPath) associated with this request. If $new is
-specified, set the URL path to $new before returning the value.
-
-=cut
-
-=item maketext([$new])
-
-Return the subroutine that translates phrases (defined in WeBWorK::Localization)
-
-=cut
-
-=item location()
-
-Overrides the location() method in Apache::Request (or Apache2::Request) so that
-if the location is "/", the empty string is returned.
-
-=cut
-
-=item create_course_environment()
-
-A method that reads the configuration files and returns the course environment.
-It uses the $self->{courseName}  variable.
-
-=cut 
-
-sub create_course_environment {
-	my $self = shift;
-	my $courseName = $self->{courseName};
-	my $ce = WeBWorK::CourseEnvironment->new( 
-				{webwork_dir		=>		$WeBWorK::Constants::WEBWORK_DIRECTORY, 
-				 courseName         =>      $courseName
-				 });
-	warn "Unable to find environment for course: |$courseName|" unless ref($ce);
-	return ($ce);
-}
-
-=back
-
-=cut
-
-1;
diff --git a/lib/WeBWorK/File/Classlist.pm b/lib/WeBWorK/File/Classlist.pm
index bdbee10d2d..edce1670e3 100644
--- a/lib/WeBWorK/File/Classlist.pm
+++ b/lib/WeBWorK/File/Classlist.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -31,22 +31,21 @@ our $MIN_FIELDS = 9;
 our $MAX_FIELDS = 11;
 
 our @FIELD_ORDER = qw/student_id last_name first_name status comment
-section recitation email_address user_id password permission/;
+	section recitation email_address user_id password permission/;
 
 our @EXPORT = qw/parse_classlist write_classlist/;
 
 sub parse_classlist($) {
 	my ($file) = @_;
 
-	use open qw( :encoding(UTF-8) :std ); # assume classlist is utf8 encoded
-	my $fh = new IO::File($file, "<")
+	# assume classlist is utf8 encoded
+	my $fh = IO::File->new($file, '<:encoding(UTF-8)')
 		or die "Failed to open classlist '$file' for reading: $!\n";
 
 	my (@records);
 
-  my $csv = Text::CSV->new({ binary => 1, allow_whitespace => 1 });
-	   # binary for utf8 compat, allow_whitespace to strip all whitespace from start and end of each field
-
+	my $csv = Text::CSV->new({ binary => 1, allow_whitespace => 1 });
+	# binary for utf8 compat, allow_whitespace to strip all whitespace from start and end of each field
 
 	while (<$fh>) {
 		chomp;
@@ -68,7 +67,8 @@ sub parse_classlist($) {
 
 		my $fields = @fields;
 		if ($fields < $MIN_FIELDS) {
-			warn "Skipped invalid line $. of classlist '$file': expected at least $MIN_FIELDS fields, got $fields fields.\n";
+			warn
+				"Skipped invalid line $. of classlist '$file': expected at least $MIN_FIELDS fields, got $fields fields.\n";
 			next;
 		}
 
@@ -78,8 +78,8 @@ sub parse_classlist($) {
 			$fields = $MAX_FIELDS;
 		}
 
-		my @fields_in_this_record = @FIELD_ORDER[0 .. $fields-1];
-		my @data_in_this_record = @fields[0 .. $fields-1];
+		my @fields_in_this_record = @FIELD_ORDER[ 0 .. $fields - 1 ];
+		my @data_in_this_record   = @fields[ 0 .. $fields - 1 ];
 
 		my %record;
 		@record{@fields_in_this_record} = @data_in_this_record;
@@ -95,10 +95,10 @@ sub parse_classlist($) {
 sub write_classlist($@) {
 	my ($file, @records) = @_;
 
-	my $fh = new IO::File($file, '>:encoding(UTF-8)')
+	my $fh = IO::File->new($file, '>:encoding(UTF-8)')
 		or die "Failed to open classist '$file' for writing: $!\n";
 
-	my $csv = Text::CSV->new({ binary => 1});
+	my $csv = Text::CSV->new({ binary => 1 });
 	# binary for utf8 compat
 
 	print $fh "# Field order: ", join(",", @FIELD_ORDER), "\n";
@@ -113,8 +113,8 @@ sub write_classlist($@) {
 		my %record = %$record;
 		my @fields = @record{@FIELD_ORDER};
 
-		warn "Couldn't form CSV line for user ".$record{user_id}
-		    unless ($csv->combine(@fields));
+		warn "Couldn't form CSV line for user " . $record{user_id}
+			unless ($csv->combine(@fields));
 
 		my $string = $csv->string();
 
diff --git a/lib/WeBWorK/File/Scoring.pm b/lib/WeBWorK/File/Scoring.pm
index 72c6e282e4..5d48a3a6b4 100644
--- a/lib/WeBWorK/File/Scoring.pm
+++ b/lib/WeBWorK/File/Scoring.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -26,40 +26,41 @@ use strict;
 use warnings;
 use IO::File;
 
-our $MIN_FIELDS = 6; # there are six "info" fields. we need at least those
+our $MIN_FIELDS = 6;    # there are six "info" fields. we need at least those
 #our $MAX_FIELDS; # no maximum in scoring files
 
-our $KEY_INDEX = 0; # index of field to use for record key in resulting hash
+our $KEY_INDEX = 0;     # index of field to use for record key in resulting hash
 
 our @EXPORT = qw/parse_scoring_file/;
 
 sub parse_scoring_file($) {
 	my ($file) = @_;
-	
+
 	my $fh = new IO::File($file, "<")
 		or die "Failed to open scoring file '$file' for reading: $!\n";
-	
+
 	my %records;
-	
+
 	while (<$fh>) {
 		chomp;
 		next if /^#/;
 		next unless /\S/;
 		s/^\s*//;
 		s/\s*$//;
-		
-		my @fields = split /\s*,\s*/, $_, -1; # -1 == don't delete empty trailing fields
+
+		my @fields = split /\s*,\s*/, $_, -1;    # -1 == don't delete empty trailing fields
 		my $fields = @fields;
 		if ($fields < $MIN_FIELDS) {
-			warn "Skipped invalid line $. of scoring files '$file': expected at least $MIN_FIELDS fields, got $fields fields.\n";
+			warn
+				"Skipped invalid line $. of scoring files '$file': expected at least $MIN_FIELDS fields, got $fields fields.\n";
 			next;
 		}
-		
-		$records{$fields[$KEY_INDEX]} = \@fields;
+
+		$records{ $fields[$KEY_INDEX] } = \@fields;
 	}
-	
+
 	$fh->close;
-	
+
 	return \%records;
 }
 
diff --git a/lib/WeBWorK/Form.pm b/lib/WeBWorK/Form.pm
deleted file mode 100644
index 63b9ab2257..0000000000
--- a/lib/WeBWorK/Form.pm
+++ /dev/null
@@ -1,191 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::Form::TiedParam;
-
-# See package WeBWorK::Form, below.
-
-use strict;
-use warnings;
-
-sub TIESCALAR ($$$) {
-	my ($invocant, $f, $param) = @_;
-	my $class = ref($invocant) || $invocant;
-	my $self = {
-		f => $f,
-		param => $param,
-	};
-	
-	return bless $self, $class;
-}
-
-sub FETCH {
-	my $self = shift;
-	my $f = $self->{f};
-	my $param = $self->{param};
-	return $f->param($param);
-}
-
-sub STORE {
-	my $self = shift;
-	my @values = @_;
-	my $f = $self->{f};
-	my $param = $self->{param};
-	$f->param($param, @values);
-}
-
-###
-
-package WeBWorK::Form;
-
-=head1 NAME
-
-WeBWorK::Form - extract form input from an Apache::Request and provide an
-interface to it.
-
-=cut
-
-use strict;
-use warnings;
-
-sub new {
-	#print "new called with \@_ = ( " . (join ", ", @_)  . " )\n";
-	my ($invocant, $r) = @_;
-	my $class = ref($invocant) || $invocant;
-	my $self = {};
-
-	return bless $self, $class;
-}
-
-sub new_from_paramable ($$) {
-	my ($invocant, $r) = @_;
-	my $class = ref($invocant) || $invocant;
-	my $self = {};
-
-	# list of param names
-	my @params = $r->param;
-	foreach my $key (@params) {
-		$self->{$key} = [ $r->param($key) ];
-	}
-
-	return bless $self, $class;
-}
-
-sub new_test {
-	my ($invocant, $r) = @_;
-	my $class = ref($invocant) || $invocant;
-	my $self = {
-		a => [qw(aa ab ac)],
-		b => [ "bcontents" ],
-		c => [ "cc", "ccd" ],
-		d => [ "what d has" ],
-	};
-
-	return bless $self, $class;
-}
-
-# @keys = $f->param
-# $value = $f->param("key")
-# @values = $f->param("key")
-# $f->param("key", "value")
-# $f->param(key => [qw(val1 val2 val3)]
-# $f->param(key => "val1", "val2", "val3");
-
-# Oh, there I go again with multiple returns all over.  To be fair,
-# any function that emulates CGI::param has to do a few different things
-# in different contexts.
-sub param {
-	my ($self, $param, @values) = @_;
-	
-	# Called with one argument.  Return keys.
-	if (!defined $param) {
-		return keys %$self;
-	}
-	
-	# called with three arguments.  Set a value, then fall through
-	if (scalar(@values)) {
-		if (ref $values[0]) {
-			$self->{$param} = $values[0];
-		} else {
-			$self->{$param} = [ @values ];
-		}
-	}
-	
-	# Called with 2+ arguments.  Return requested value
-	if (wantarray) {
-		return @{$self->{$param}};
-	} else {
-		return $self->{$param}[0];
-	}
-}
-
-# lparam("key") will return the same value as param("key"), but it returns
-# it as a scalar lvalue, so that you can assign strings or arrayrefs to the
-# function call like this: $form->lparam("foo") = "bar" or
-# $form->lparam("foo") = [qw(bar baz blah)].
-# This function absolutely requires 5.6, which is where :lvalue comes from.
-sub lparam($$) : lvalue {
-	tie my $lvalue, 'WeBWorK::Form::TiedParam', shift, shift;
-	$lvalue;
-}
-
-sub delete {
-	my ($self, $param) = @_;
-	CORE::delete $self->{$param};
-}
-
-sub Delete {
-	my $self = shift;
-	$self->delete(@_);
-}
-
-sub printable {
-	my $self = shift;
-	my $printedform = "";
-	foreach my $key ($self->param) {
-		$printedform .= "[$key]\n";
-		foreach my $value ($self->param($key)) {
-			$printedform .= "$value\n";
-		}
-		$printedform .= "\n";
-	}
-	
-	return $printedform;
-}
-
-# This partially supports the :cgi-lib Vars() interface, a-la CGI.pm.  Not
-# supported is being called in scalar context, which in CGI.pm returned a
-# tied hashref to the original form data.  WeBWorK didn't need that, so I
-# didn't add it.  If you're feeling industrious...
-
-#FIXME?  I originally changed   join("\0",....)  to join(\0, ....) since I'm pretty sure that what was desired
-# was a string separated by nulls.   If one of the items in the list began with a number  eg 14
-# you would get    \014....\0name...\0   etc.  I think \0name evaluates properly but I'm pretty
-# sure that \014 does not.
-#
-# Then I backed out of the change until this gets checked more thoroughly by Sam
-# -- Mike
-
-sub Vars {
-	my $self = shift;
-	my %varsFormat = ();
-	foreach my $key ($self->param) {
-		$varsFormat{$key} = join "\0", $self->param($key);
-	}
-	
-	return %varsFormat;	
-}
-
-1;
diff --git a/lib/WeBWorK/HTML/AttemptsTable.pm b/lib/WeBWorK/HTML/AttemptsTable.pm
new file mode 100644
index 0000000000..15103e0638
--- /dev/null
+++ b/lib/WeBWorK/HTML/AttemptsTable.pm
@@ -0,0 +1,466 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+=head1 NAME
+
+	AttemptsTable
+
+=head1 SYNPOSIS
+
+	my $tbl = WeBWorK::HTML::AttemptsTable->new(
+		$answers,
+		answersSubmitted       => 1,
+		answerOrder            => $pg->{flags}{ANSWER_ENTRY_ORDER},
+		displayMode            => 'MathJax',
+		showAnswerNumbers      => 0,
+		showAttemptAnswers     => $showAttemptAnswers && $showEvaluatedAnswers,
+		showAttemptPreviews    => $showAttemptPreview,
+		showAttemptResults     => $showAttemptResults,
+		showCorrectAnswers     => $showCorrectAnswers,
+		showMessages           => $showAttemptAnswers, # internally checks for messages
+		showSummary            => $showSummary,
+		imgGen                 => $imgGen, # not needed if ce is present ,
+		ce                     => '',	   # not needed if $imgGen is present
+		maketext               => WeBWorK::Localize::getLoc("en"),
+	);
+	$tbl->{imgGen}->render(refresh => 1) if $tbl->displayMode eq 'images';
+	my $answerTemplate = $tbl->answerTemplate;
+
+
+=head1 DESCRIPTION
+
+This module handles the formatting of the table which presents the results of analyzing a student's
+answer to a WeBWorK problem.  It is used in Problem.pm, OpaqueServer.pm, standAlonePGproblemRender
+
+=head2 new
+
+	my $tbl = WeBWorK::HTML::AttemptsTable->new(
+		$answers,
+		answersSubmitted       => 1,
+		answerOrder            => $pg->{flags}{ANSWER_ENTRY_ORDER},
+		displayMode            => 'MathJax',
+		showHeadline           => 1,
+		showAnswerNumbers      => 0,
+		showAttemptAnswers     => $showAttemptAnswers && $showEvaluatedAnswers,
+		showAttemptPreviews    => $showAttemptPreview,
+		showAttemptResults     => $showAttemptResults,
+		showCorrectAnswers     => $showCorrectAnswers,
+		showMessages           => $showAttemptAnswers, # internally checks for messages
+		showSummary            => $showSummary,
+		imgGen                 => $imgGen, # not needed if ce is present ,
+		ce                     => '',	   # not needed if $imgGen is present
+		maketext               => WeBWorK::Localize::getLoc("en"),
+		summary                =>'',
+	);
+
+	$answers -- a hash of student answers e.g. $pg->{answers}
+	answersSubmitted     if 0 then then the attemptsTable is not displayed (???)
+	answerOrder       -- an array indicating the order the answers appear on the page.
+	displayMode       'MathJax' and 'images' are the most common
+
+	showHeadline       Show the header line 'Results for this submission'
+
+	showAnswerNumbers, showAttemptAnswers, showAttemptPreviews,showAttemptResults,
+	showCorrectAnswers and showMessages control the display of each column in the table.
+
+	attemptAnswers     the student's typed in answer (possibly simplified numerically)
+	attemptPreview     the student's answer after typesetting
+	attemptResults     "correct", "_% correct",  "incorrect" or "ungraded"- links to the answer blank
+	correctAnswers     typeset version (untypeset versions are available via popups)
+	messages           warns of formatting typos in the answer, or
+	                    more detailed messages about a wrong answer
+	summary            is obtained from $pg->{result}{summary}.
+	                   If this is empty then a (localized)
+	                   version of "all answers are correct"
+	                   or "at least one answer is not coorrect"
+	imgGen             points to a prebuilt image generator objectfor "images" mode
+	ce                 points to the CourseEnvironment -- it is needed if AttemptsTable
+	                    is required to build its own imgGen object
+	maketext           points to a localization subroutine
+
+=head2 Methods
+
+=over 4
+
+=item answerTemplate
+
+Returns HTML which formats the analysis of the student's answers to the problem.
+
+=back
+
+=head2 Read/Write Properties
+
+=over 4
+
+=item showMessages,
+
+This can be switched on or off before exporting the answerTemplate, perhaps
+under instructions from the PG problem.
+
+=item summary
+
+The contents of the summary can be defined when the attemptsTable object is created.
+
+The summary can be defined by the PG problem grader usually returned as
+$pg->{result}{summary}.
+
+If the summary is not explicitly defined then (localized) versions
+of the default summaries are created:
+
+	"The answer above is correct.",
+	"Some answers will be graded later.",
+	"All of the [gradeable] answers above are correct.",
+	"[N] of the questions remain unanswered.",
+	"At least one of the answers above is NOT [fully] correct.',
+
+Note that if this is set after initialization, you must ensure that it is a
+Mojo::ByteStream object if it contains html or characters that need escaping.
+
+=back
+
+=cut
+
+package WeBWorK::HTML::AttemptsTable;
+use Mojo::Base 'Class::Accessor', -signatures;
+
+use Scalar::Util 'blessed';
+use WeBWorK::Utils 'wwRound';
+
+# %options may contain:  displayMode, submitted, imgGen, ce
+# At least one of imgGen or ce must be provided if displayMode is 'images'.
+sub new ($class, $rh_answers, $c, %options) {
+	$class = ref $class || $class;
+	ref($rh_answers) =~ /HASH/     or die 'The first entry to AttemptsTable must be a hash of answers';
+	$c->isa('WeBWorK::Controller') or die 'The second entry to AttemptsTable must be a WeBWorK::Controller';
+	my $self = bless {
+		answers             => $rh_answers,
+		c                   => $c,
+		answerOrder         => $options{answerOrder}      // [],
+		answersSubmitted    => $options{answersSubmitted} // 0,
+		summary             => undef,                                # summary provided by problem grader (set in _init)
+		displayMode         => $options{displayMode} || 'MathJax',
+		showHeadline        => $options{showHeadline}        // 1,
+		showAnswerNumbers   => $options{showAnswerNumbers}   // 1,
+		showAttemptAnswers  => $options{showAttemptAnswers}  // 1,    # show student answer as entered and parsed
+		showAttemptPreviews => $options{showAttemptPreviews} // 1,    # show preview of student answer
+		showAttemptResults  => $options{showAttemptResults}  // 1,    # show results of grading student answer
+		showMessages        => $options{showMessages}        // 1,    # show messages generated by evaluation
+		showCorrectAnswers  => $options{showCorrectAnswers}  // 0,    # show the correct answers
+		showSummary         => $options{showSummary}         // 1,    # show result summary
+		imgGen              => undef,                                 # set or created in _init method
+	}, $class;
+
+	# Create accessors/mutators
+	$self->mk_ro_accessors(qw(answers c answerOrder answersSubmitted displayMode imgGen showAnswerNumbers
+		showAttemptAnswers showHeadline showAttemptPreviews showAttemptResults showCorrectAnswers showSummary));
+	$self->mk_accessors(qw(showMessages summary));
+
+	# Sanity check and initialize imgGenerator.
+	$self->_init(%options);
+
+	return $self;
+}
+
+# Verify the display mode, and build imgGen if it is not supplied.
+sub _init ($self, %options) {
+	$self->{submitted}   = $options{submitted} // 0;
+	$self->{displayMode} = $options{displayMode} || 'MathJax';
+
+	# Only show message column if there is at least one message.
+	my @reallyShowMessages = grep { $self->answers->{$_}{ans_message} } @{ $self->answerOrder };
+	$self->showMessages($self->showMessages && !!@reallyShowMessages);
+
+	# Only used internally.  Accessors are not needed.
+	$self->{numCorrect} = 0;
+	$self->{numBlanks}  = 0;
+	$self->{numEssay}   = 0;
+
+	if ($self->displayMode eq 'images') {
+		if (blessed($options{imgGen}) && $options{imgGen}->isa('WeBWorK::PG::ImageGenerator')) {
+			$self->{imgGen} = $options{imgGen};
+		} elsif (blessed($options{ce}) && $options{ce}->isa('WeBWorK::CourseEnvironment')) {
+			my $ce = $options{ce};
+
+			$self->{imgGen} = WeBWorK::PG::ImageGenerator->new(
+				tempDir         => $ce->{webworkDirs}{tmp},
+				latex           => $ce->{externalPrograms}{latex},
+				dvipng          => $ce->{externalPrograms}{dvipng},
+				useCache        => 1,
+				cacheDir        => $ce->{webworkDirs}{equationCache},
+				cacheURL        => $ce->{server_root_url} . $ce->{webworkURLs}{equationCache},
+				cacheDB         => $ce->{webworkFiles}{equationCacheDB},
+				dvipng_align    => $ce->{pg}{displayModeOptions}{images}{dvipng_align},
+				dvipng_depth_db => $ce->{pg}{displayModeOptions}{images}{dvipng_depth_db},
+			);
+		} else {
+			warn 'Must provide image Generator (imgGen) or a course environment (ce) to build attempts table.';
+		}
+	}
+
+	# Make sure that the provided summary is a Mojo::ByteStream object.
+	$self->summary(blessed($options{summary})
+			&& $options{summary}->isa('Mojo::ByteStream') ? $options{summary} : $self->c->b($options{summary} // ''));
+
+	return;
+}
+
+sub formatAnswerRow ($self, $rh_answer, $ans_id, $answerNumber) {
+	my $c = $self->c;
+
+	my $answerString         = $rh_answer->{student_ans}               // '';
+	my $answerPreview        = $self->previewAnswer($rh_answer)        // '&nbsp;';
+	my $correctAnswer        = $rh_answer->{correct_ans}               // '';
+	my $correctAnswerPreview = $self->previewCorrectAnswer($rh_answer) // '&nbsp;';
+
+	my $answerMessage = $rh_answer->{ans_message} // '';
+	$answerMessage =~ s/\n/<BR>/g;
+	my $answerScore = $rh_answer->{score} // 0;
+	$self->{numCorrect} += $answerScore >= 1;
+	$self->{numEssay}   += ($rh_answer->{type} // '') eq 'essay';
+	$self->{numBlanks}++ unless $answerString =~ /\S/ || $answerScore >= 1;
+
+	my $feedbackMessageClass = ($answerMessage eq '') ? '' : $c->maketext('FeedbackMessage');
+
+	my $resultString;
+	my $resultStringClass;
+	if ($answerScore >= 1) {
+		$resultString      = $c->maketext('correct');
+		$resultStringClass = 'ResultsWithoutError';
+	} elsif (($rh_answer->{type} // '') eq 'essay') {
+		$resultString = $c->maketext('Ungraded');
+		$self->{essayFlag} = 1;
+	} elsif ($answerScore == 0) {
+		$resultStringClass = 'ResultsWithError';
+		$resultString      = $c->maketext('incorrect');
+	} else {
+		$resultString = $c->maketext('[_1]% correct', wwRound(0, $answerScore * 100));
+	}
+	my $attemptResults = $c->tag(
+		'td',
+		class => $resultStringClass,
+		$c->tag('a', href => '#', data => { answer_id => $ans_id }, $self->nbsp($resultString))
+	);
+
+	return $c->c(
+		$self->showAnswerNumbers  ? $c->tag('td', $answerNumber)                             : '',
+		$self->showAttemptAnswers ? $c->tag('td', dir => 'auto', $self->nbsp($answerString)) : '',
+		$self->showAttemptPreviews
+		? (((defined $answerPreview && $answerPreview ne '') || $self->showAttemptAnswers)
+			? $self->formatToolTip($answerString, $answerPreview)
+			: $c->tag('td', dir => 'auto', $self->nbsp($answerString)))
+		: '',
+		$self->showAttemptResults ? $attemptResults                                                            : '',
+		$self->showCorrectAnswers ? $self->formatToolTip($correctAnswer, $correctAnswerPreview)                : '',
+		$self->showMessages       ? $c->tag('td', class => $feedbackMessageClass, $self->nbsp($answerMessage)) : ''
+	)->join('');
+}
+
+# Determine whether any answers were submitted and create answer template if they have been.
+sub answerTemplate ($self) {
+	my $c = $self->c;
+
+	return '' unless $self->answersSubmitted;    # Only print if there is at least one non-blank answer
+
+	my $tableRows = $c->c;
+
+	push(
+		@$tableRows,
+		$c->tag(
+			'tr',
+			$c->c(
+				$self->showAnswerNumbers   ? $c->tag('th', '#')                            : '',
+				$self->showAttemptAnswers  ? $c->tag('th', $c->maketext('Entered'))        : '',
+				$self->showAttemptPreviews ? $c->tag('th', $c->maketext('Answer Preview')) : '',
+				$self->showAttemptResults  ? $c->tag('th', $c->maketext('Result'))         : '',
+				$self->showCorrectAnswers  ? $c->tag('th', $c->maketext('Correct Answer')) : '',
+				$self->showMessages        ? $c->tag('th', $c->maketext('Message'))        : ''
+			)->join('')
+		)
+	);
+
+	my $answerNumber = 0;
+	for (@{ $self->answerOrder() }) {
+		push @$tableRows, $c->tag('tr', $self->formatAnswerRow($self->{answers}{$_}, $_, ++$answerNumber));
+	}
+
+	return $c->c(
+		$self->showHeadline
+		? $c->tag('h2', class => 'attemptResultsHeader', $c->maketext('Results for this submission'))
+		: '',
+		$c->tag(
+			'div',
+			class => 'table-responsive',
+			$c->tag('table', class => 'attemptResults table table-sm table-bordered', $tableRows->join(''))
+		),
+		$self->showSummary ? $self->createSummary : ''
+	)->join('');
+}
+
+sub previewAnswer ($self, $answerResult) {
+	my $displayMode = $self->displayMode;
+	my $imgGen      = $self->imgGen;
+
+	my $tex = $answerResult->{preview_latex_string};
+
+	return '' unless defined $tex and $tex ne '';
+
+	return $tex if $answerResult->{non_tex_preview};
+
+	if ($displayMode eq 'plainText') {
+		return $tex;
+	} elsif (($answerResult->{type} // '') eq 'essay') {
+		return $tex;
+	} elsif ($displayMode eq 'images') {
+		return $imgGen->add($tex);
+	} elsif ($displayMode eq 'MathJax') {
+		return $self->c->tag('script', type => 'math/tex; mode=display', $self->c->b($tex));
+	}
+}
+
+sub previewCorrectAnswer ($self, $answerResult) {
+	my $displayMode = $self->displayMode;
+	my $imgGen      = $self->imgGen;
+
+	my $tex = $answerResult->{correct_ans_latex_string};
+
+	# Some answers don't have latex strings defined return the raw correct answer
+	# unless defined $tex and $tex contains non whitespace characters;
+	return $answerResult->{correct_ans}
+		unless defined $tex and $tex =~ /\S/;
+
+	return $tex if $answerResult->{non_tex_preview};
+
+	if ($displayMode eq 'plainText') {
+		return $tex;
+	} elsif ($displayMode eq 'images') {
+		return $imgGen->add($tex);
+	} elsif ($displayMode eq 'MathJax') {
+		return $self->c->tag('script', type => 'math/tex; mode=display', $self->c->b($tex));
+	}
+}
+
+# Create summary
+sub createSummary ($self) {
+	my $c = $self->c;
+
+	my $numCorrect = $self->{numCorrect};
+	my $numBlanks  = $self->{numBlanks};
+	my $numEssay   = $self->{numEssay};
+
+	my $summary;
+
+	unless (defined($self->summary) and $self->summary =~ /\S/) {
+		# Default messages
+		$summary = $c->c;
+		my @answerNames = @{ $self->answerOrder() };
+		if (scalar @answerNames == 1) {
+			if ($numCorrect == scalar @answerNames) {
+				push(
+					@$summary,
+					$c->tag(
+						'div',
+						class => 'ResultsWithoutError mb-2',
+						$c->maketext('The answer above is correct.')
+					)
+				);
+			} elsif ($self->{essayFlag}) {
+				push(@$summary, $c->tag('div', $c->maketext('Some answers will be graded later.')));
+			} else {
+				push(
+					@$summary,
+					$c->tag(
+						'div',
+						class => 'ResultsWithError mb-2',
+						$c->maketext('The answer above is NOT correct.')
+					)
+				);
+			}
+		} else {
+			if ($numCorrect + $numEssay == scalar @answerNames) {
+				if ($numEssay) {
+					push(
+						@$summary,
+						$c->tag(
+							'div',
+							class => 'ResultsWithoutError mb-2',
+							$c->maketext('All of the gradeable answers above are correct.')
+						)
+					);
+				} else {
+					push(
+						@$summary,
+						$c->tag(
+							'div',
+							class => 'ResultsWithoutError mb-2',
+							$c->maketext('All of the answers above are correct.')
+						)
+					);
+				}
+			} elsif ($numBlanks + $numEssay != scalar(@answerNames)) {
+				push(
+					@$summary,
+					$c->tag(
+						'div',
+						class => 'ResultsWithError mb-2',
+						$c->maketext('At least one of the answers above is NOT correct.')
+					)
+				);
+			}
+			if ($numBlanks > $numEssay) {
+				my $s = ($numBlanks > 1) ? '' : 's';
+				push(
+					@$summary,
+					$c->tag(
+						'div',
+						class => 'ResultsAlert mb-2',
+						$c->maketext(
+							'[quant,_1,of the questions remains,of the questions remain] unanswered.', $numBlanks
+						)
+					)
+				);
+			}
+		}
+		$summary = $summary->join('');
+	} else {
+		$summary = $self->summary;    # Summary defined by grader
+	}
+	$summary = $c->tag('div', role => 'alert', class => 'attemptResultsSummary', $summary);
+	$self->summary($summary);
+	return $summary;
+}
+
+# Utility subroutine that prevents unwanted line breaks, and ensures that the return value is a Mojo::ByteStream object.
+sub nbsp ($self, $str) {
+	return $self->c->b(defined $str && $str =~ /\S/ ? $str : '&nbsp;');
+}
+
+# Note that formatToolTip output includes the <td></td> wrapper.
+sub formatToolTip ($self, $answer, $formattedAnswer) {
+	return $self->c->tag(
+		'td',
+		$self->c->tag(
+			'div',
+			class => 'answer-preview',
+			data  => {
+				bs_toggle    => 'popover',
+				bs_content   => $answer,
+				bs_placement => 'bottom',
+			},
+			$self->nbsp($formattedAnswer)
+		)
+	);
+}
+
+1;
diff --git a/lib/WeBWorK/HTML/CodeMirrorEditor.pm b/lib/WeBWorK/HTML/CodeMirrorEditor.pm
new file mode 100644
index 0000000000..0502c2c22a
--- /dev/null
+++ b/lib/WeBWorK/HTML/CodeMirrorEditor.pm
@@ -0,0 +1,103 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::HTML::CodeMirrorEditor;
+use Mojo::Base 'Exporter', -signatures;
+
+=head1 NAME
+
+WeBWorK::HTML::CodeMirrorEditor is a module for displaying a CodeMirror editor
+on a page.  This is currently used by the AchievementEditor.pm and
+PGProblemEditor.pm modules.
+
+=cut
+
+use WeBWorK::Utils qw(getAssetURL);
+
+our @EXPORT_OK = qw(generate_codemirror_html generate_codemirror_controls_html output_codemirror_static_files);
+
+# Available CodeMirror themes
+use constant CODEMIRROR_THEMES => [
+	'3024-day',                '3024-night',         'abbott',        'abcdef',
+	'ambiance',                'ambiance-mobile',    'ayu-dark',      'ayu-mirage',
+	'base16-dark',             'base16-light',       'bespin',        'blackboard',
+	'cobalt',                  'colorforth',         'darcula',       'dracula',
+	'duotone-dark',            'duotone-light',      'eclipse',       'elegant',
+	'erlang-dark',             'gruvbox-dark',       'hopscotch',     'icecoder',
+	'idea',                    'isotope',            'juejin',        'lesser-dark',
+	'liquibyte',               'lucario',            'material',      'material-darker',
+	'material-ocean',          'material-palenight', 'mbo',           'mdn-like',
+	'midnight',                'monokai',            'moxer',         'neat',
+	'neo',                     'night',              'nord',          'oceanic-next',
+	'panda-syntax',            'paraiso-dark',       'paraiso-light', 'pastel-on-dark',
+	'railscasts',              'rubyblue',           'seti',          'shadowfox',
+	'solarized',               'ssms',               'the-matrix',    'tomorrow-night-bright',
+	'tomorrow-night-eighties', 'ttcn',               'twilight',      'vibrant-ink',
+	'xq-dark',                 'xq-light',           'yeti',          'yonce',
+	'zenburn'
+];
+
+# Available CodeMirror keymaps
+use constant CODEMIRROR_KEYMAPS => [ 'emacs', 'sublime', 'vim' ];
+
+# Javascript for addons used by the PG editor (relative to the node_modules/codemirror/addon directory).
+use constant CODEMIRROR_ADDONS_CSS => [ 'dialog/dialog.css', 'search/matchesonscrollbar.css', 'fold/foldgutter.css' ];
+
+# Javascript for addons used by the PG editor (relative to the node_modules/codemirror/addon directory).
+use constant CODEMIRROR_ADDONS_JS => [
+	'dialog/dialog.js',            'search/search.js',
+	'search/searchcursor.js',      'search/matchesonscrollbar.js',
+	'search/match-highlighter.js', 'search/match-highlighter.js',
+	'scroll/annotatescrollbar.js', 'edit/matchbrackets.js',
+	'fold/foldcode.js',            'fold/foldgutter.js',
+	'fold/xml-fold.js'
+];
+
+sub generate_codemirror_html ($c, $name, $contents = '', $mode = 'PG') {
+	# Output the textarea that will be used by CodeMirror.
+	# If CodeMirror is disabled, then this is directly the editing area.
+	return $c->text_area($name => $contents, id => $name, class => 'codeMirrorEditor', data => { mode => $mode });
+}
+
+sub generate_codemirror_controls_html ($c) {
+	my $ce = $c->ce;
+
+	return '' unless $ce->{options}{PGCodeMirror};
+
+	# Construct the labels and values for the theme menu.
+	my $themeValues = [ [ default => 'default', selected => 'selected' ] ];
+	for (@{ CODEMIRROR_THEMES() }) {
+		push @$themeValues, [ $_ => getAssetURL($ce, "node_modules/codemirror/theme/$_.css") ];
+	}
+
+	# Construct the labels and values for the keymap menu.
+	my $keymapValues = [ [ default => 'default', selected => 'selected' ] ];
+	for (@{ CODEMIRROR_KEYMAPS() }) {
+		push @$keymapValues, [ $_ => getAssetURL($ce, "node_modules/codemirror/keymap/$_.js") ];
+	}
+
+	return $c->include('HTML/CodeMirrorEditor/controls', themeValues => $themeValues, keymapValues => $keymapValues);
+}
+
+sub output_codemirror_static_files ($c, $mode = 'PG') {
+	return $c->include(
+		'HTML/CodeMirrorEditor/js',
+		codemirrorAddonsCSS => CODEMIRROR_ADDONS_CSS(),
+		codemirrorAddonsJS  => CODEMIRROR_ADDONS_JS(),
+		codemirrorModesJS   => $mode eq 'htmlmixed' ? [ 'xml', 'css', 'javascript', 'htmlmixed' ] : [$mode]
+	);
+}
+
+1;
diff --git a/lib/WeBWorK/HTML/ComboBox.pm b/lib/WeBWorK/HTML/ComboBox.pm
deleted file mode 100644
index d7834c96da..0000000000
--- a/lib/WeBWorK/HTML/ComboBox.pm
+++ /dev/null
@@ -1,69 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::HTML::ComboBox;
-use base qw(Exporter);
-
-=head1 NAME
-
-WeBWorK::HTML::ComboBox - HTML widget for a textfield with a dropdown list
-
-=cut
-
-use strict;
-use warnings;
-
-our @EXPORT    = ();
-our @EXPORT_OK = qw(comboBox);
-
-sub comboBox {
-	my ($options, @Records) = @_;
-
-	# The parameters "name" and at least one of the "values" or "labels" are required.
-	# The "default" value parameter is optional.
-
-	my $name    = $options->{name};
-	my $default = $options->{default};
-	my @values  = ref $options->{values} eq "ARRAY" ? @{ $options->{values} } : ();
-	my %labels  = ref $options->{labels} eq "HASH"  ? %{ $options->{labels} } : map { $_ => $_ } @values;
-
-	# If only the labels are provided, use them as values as well.
-	@values = keys %labels if (%labels and not @values);
-
-	# Set $width equal to the length of the longest value
-	my $width = 20;
-	map { $width = length if (length) > $width } @values;
-
-	return CGI::div(
-		{ class => "combo-box" },
-		CGI::div(
-			CGI::textfield({
-				name  => $name,
-				value => $default // "",
-				size  => $width,
-				class => 'combo-box-text form-control mb-1'
-			}),
-			CGI::popup_menu({
-				name    => $name,
-				values  => \@values,
-				labels  => \%labels,
-				default => $default // 0,
-				class   => 'combo-box-select form-select'
-			})
-		)
-	);
-}
-
-1;
diff --git a/lib/WeBWorK/HTML/DropdownList.pm b/lib/WeBWorK/HTML/DropdownList.pm
deleted file mode 100644
index a1d6baa364..0000000000
--- a/lib/WeBWorK/HTML/DropdownList.pm
+++ /dev/null
@@ -1,183 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::HTML::DropdownRecordList;
-use base qw(Exporter);
-
-=head1 NAME
-
-WeBWorK::HTML::DropdownList - HTML widget for a scrolling list of
-records.
-
-=cut
-
-use strict;
-use warnings;
-use Carp;
-use WeBWorK::Utils::FormatRecords qw/getFormatsForClass formatRecords/;
-use WeBWorK::Utils::SortRecords qw/getSortsForClass sortRecords/;
-use WeBWorK::Utils::FilterRecords qw/getFiltersForClass filterRecords/;
-
-our @EXPORT    = ();
-our @EXPORT_OK = qw(
-	dropdownRecordList
-);
-
-
-
-sub dropdownRecordList {
-	my ($options, @Records) = @_;
-
-	my %options = (default_filters=>[],default_sort=>"",default_format=>"",%$options);
-	# %options must contain:
-	#  name - name of scrolling list -- use $r->param("$name")
-	#  request - the WeBWorK::Request object for the current request
-	# may contain:
-	#  default_sort - name of sort to use by default
-	#  default_format - name of format to use by default
-	#  default_filter - listref, names of filters to apply by default (unimpl.)
-	#  allowed_filters - hashref, mapping field name to list of allowed values (unimpl.)
-	#  size - number of rows shown in scrolling list
-	#  multiple - are multiple selections allowed?
-
-	croak "name not found in options" unless exists $options{name};
-	croak "request not found in options" unless exists $options{request};
-	my $name = $options{name};
-	my $r = $options{request};
-
-	my $default_sort = $options{default_sort} || "";
-	my $default_format = $options{default_format} || "";
-
-	my @default_filters = @{$options{default_filters}} ;
-
-	my $size = $options{size};
-	my $multiple = $options{multiple};
-
-	my $sorts = [];
-	my $sort_labels = {};
-	my $selected_sort = "";
-
-	my $formats = [];
-	my $format_labels = {};
-	my $selected_format = "";
-
-	my $filters = [];
-	my $filter_labels = {};
-	my @selected_filters= ();
-
-	my @ids = ();
-	my %labels = ();
-
-	my @selected_records = $r->param("$name");
-
-	if (@Records) {
-		my $class = ref $Records[0];
-
-		($filters, $filter_labels) = getFiltersForClass(@Records);
-		if (defined $r->param("$name!filter")){
-			@selected_filters = $r->param("$name!filter");
-			@selected_filters = ("all") unless @selected_filters;
-		}
-		else {
-			@selected_filters = @default_filters;
-		}
-
-		($sorts, $sort_labels) = getSortsForClass($class);
-		$selected_sort = $r->param("$name!sort")
-			|| $default_sort
-			|| (@$sorts ? $sorts->[0] : "");
-
-		($formats, $format_labels) = getFormatsForClass($class);
-		$selected_format = $r->param("$name!format")
-			|| $default_format
-			|| (@$formats ? $formats->[0] : "");
-
-		@Records = filterRecords({filter=>\@selected_filters},@Records);
-
-		@Records = sortRecords({preset=>$selected_sort}, @Records);
-
-		# generate IDs from keyfields
-		my @keyfields = $class->KEYFIELDS;
-		foreach my $Record (@Records) {
-			push @ids, join("!", map { $Record->$_ } @keyfields);
-		}
-
-		# generate labels hash
-		@labels{@ids} = @Records;
-		%labels = formatRecords({preset=>$selected_format}, %labels);
-	}
-
-	my %sort_popup_options = (
-		-name => "$name!sort",
-		-values => $sorts,
-		-default => $selected_sort,
-		-labels => $sort_labels,
-	);
-
-	my %format_popup_options = (
-		-name => "$name!format",
-		-values => $formats,
-		-default => $selected_format,
-		-labels => $format_labels,
-	);
-
-	my %filter_options = (
-		-name => "$name!filter",
-		-values => $filters,
-		-default => \@selected_filters,
-		-labels => $filter_labels,
-		-size => 3,
-		-multiple => 1,
-	);
-
-	my %list_options = (
-		-class=>"ScrollingRecordList",
-		-name => "$name",
-		-values => \@ids,
-		-default => \@selected_records,
-		-labels => \%labels,
-	);
-	$list_options{-size} = $size if $size;
-	$list_options{-multiple} = $multiple if $multiple;
-
-	my $value = $r->param($name) || "";
-
-	map { $size = 4 + length if length > $size } values %{ $options{values} };
-
-	my %textfield_options = (
-			name => $name,
-			value => $value,
-			size => $size,		# we need to calculate this to be the same as the popup_menu
-	);
-
-	return CGI::div({-class=>"ScrollingRecordList"},
-		CGI::textfield(%textfield_options),
-		CGI::scrolling_list(%list_options)
-	);
-
-	return CGI::div({ class => "ScrollingRecordList" },
-		$r->maketext("Sort:").' ', CGI::popup_menu(%sort_popup_options), CGI::br(),
-		$r->maketext("Format:").' ', CGI::popup_menu(%format_popup_options), CGI::br(),
-		$r->maketext("Filter:").' ', CGI::scrolling_list(%filter_options), CGI::br(),
-		CGI::submit({
-			name => "$name!refresh",
-			value => $->maketext("Change Display Settings"),
-			class => 'btn btn-secondary'
-		}), CGI::br(),
-		CGI::scrolling_list(%list_options)
-	);
-}
-
-1;
diff --git a/lib/WeBWorK/HTML/OptionList.pm b/lib/WeBWorK/HTML/OptionList.pm
deleted file mode 100644
index 090776ac65..0000000000
--- a/lib/WeBWorK/HTML/OptionList.pm
+++ /dev/null
@@ -1,105 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::HTML::OptionList;
-use base qw(Exporter);
-
-=head1 NAME
-
-WeBWorK::HTML::ScrollingRecordList - HTML widget for a textfield with a dropdown list
-
-=cut
-
-use strict;
-use warnings;
-use Carp;
-
-our @EXPORT    = ();
-our @EXPORT_OK = qw(
-	optionList
-);
-
-
-
-sub optionList {
-	my ($options, @Records) = @_;
-	
-	my %options = (%$options);
-	# %options must contain:
-	#  name - name of option list -- use $r->param("$name")
-	#  request - the WeBWorK::Request object for the current request
-	# may contain:
-	#  default - default selection from pop_up list
-	#  size - number of rows shown in option list
-	#  multiple - are multiple selections allowed?
-	
-	croak "name not found in options" unless exists $options{name};
-	croak "request not found in options" unless exists $options{request};
-	my $name = $options{name};
-	my $r = $options{request};
-	
-	my $default = $options{default};
-	my $size = $options{size};
-	$size = 1 unless defined $size;
-	my $multiple = $options{multiple};
-	$multiple = 0 unless defined $multiple;
-
-	my $value = $r->param($name) || "";
-	
-	my @values = ref $options{values} eq "ARRAY" ? @{ $options{values} } : ();
-	my %labels = ref $options{labels} eq "HASH" ? %{ $options{labels} } : map { $_ => $_ } @values;
-	
-	# if someone just sends in the labels parameter, use all of them as values
-	@values = keys %labels if (%labels and not @values);
-
-
-	map { $size = 4 + length if (length) > $size } @values;
-
-	my %textfield_options = (
-			name => $name,
-			value => $value,
-			size => $size,		# we need to calculate this to be the same as the popup_menu
-	);
-	
-	my %popup_options = (
-			-name => $name,
-			-values => \@values,
-			-labels => \%labels,
-			-default => $default || $r->param($name) || 0,
-	);	
-
-	return CGI::span({-class=>"OptionList"},
-		CGI::table({cellpadding => 0, cellspacing => 0, border => 0}, 
-			CGI::Tr({}, CGI::td({}, CGI::textfield({%textfield_options}))),
-			CGI::Tr({}, CGI::td({}, CGI::popup_menu({%popup_options}))),
-		)
-	);
-
-	return CGI::span({-class=>"OptionList"},
-		CGI::textfield({
-			name => $name,
-			value => $value,
-			size => $size,		# we need to calculate this to be the same as the popup_menu
-		}), CGI::br(),
-		CGI::popup_menu(
-			-name => $name,
-			-values => \@values,
-			-labels => \%labels,
-			-default => $r->param($name),
-		),
-	);
-}
-
-1;
diff --git a/lib/WeBWorK/HTML/ScrollingRecordList.pm b/lib/WeBWorK/HTML/ScrollingRecordList.pm
index 5559d55f80..b547656e39 100644
--- a/lib/WeBWorK/HTML/ScrollingRecordList.pm
+++ b/lib/WeBWorK/HTML/ScrollingRecordList.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::HTML::ScrollingRecordList;
-use base qw(Exporter);
+use Mojo::Base 'Exporter', -signatures;
 
 =head1 NAME
 
@@ -23,159 +23,66 @@ records.
 
 =cut
 
-use strict;
-use warnings;
 use Carp;
-use WeBWorK::Utils::FormatRecords qw/getFormatsForClass formatRecords/;
-use WeBWorK::Utils::SortRecords qw/getSortsForClass sortRecords/;
-use WeBWorK::Utils::FilterRecords qw/getFiltersForClass filterRecords/;
 
-our @EXPORT    = ();
-our @EXPORT_OK = qw(scrollingRecordList);
+use WeBWorK::Utils::FormatRecords qw(getFormatsForClass formatRecords);
+use WeBWorK::Utils::SortRecords qw(getSortsForClass sortRecords);
+use WeBWorK::Utils::FilterRecords qw(getFiltersForClass filterRecords);
 
-sub scrollingRecordList {
-	my ($options, @Records) = @_;
+our @EXPORT_OK = qw(scrollingRecordList);
 
-	my %options = (default_filters => [], default_sort => "", default_format => "", %$options);
+sub scrollingRecordList ($options, @records) {
+	my %options = (default_filters => [], default_sort => '', %$options);
 	# %options must contain:
-	#  name - name of scrolling list
-	#  request - the WeBWorK::Request object for the current request
+	#  name       - name of scrolling list
+	#  controller - the WeBWorK::Controller object for the current route
 	# may contain:
 	#  default_sort - name of sort to use by default
 	#  default_format - name of format to use by default
-	#  default_filter - listref, names of filters to apply by default (unimpl.)
-	#  allowed_filters - hashref, mapping field name to list of allowed values (unimpl.)
+	#  default_filters - a reference to a list of names of filters to apply by default
 	#  size - number of rows shown in scrolling list
 	#  multiple - are multiple selections allowed?
 
-	croak "name not found in options"    unless exists $options{name};
-	croak "request not found in options" unless exists $options{request};
 	my $name = $options{name};
-	my $r    = $options{request};
+	my $c    = $options{controller};
 
-	my ($sorts,   $sort_labels,   $selected_sort)   = ([], {}, "");
-	my ($formats, $format_labels, $selected_format) = ([], {}, "");
-	my ($filters, $filter_labels, @selected_filters) = ([], {});
+	croak 'name not found in options'       unless defined $name;
+	croak 'controller not found in options' unless defined $c;
 
-	my @ids;
-	my %labels;
+	my ($sorts, $formats, $filters, $formattedRecords) = ([], [], [], []);
 
-	my $refresh_button_name =
-		defined($options{refresh_button_name})
-		? $options{refresh_button_name}
-		: $r->maketext("Change Display Settings");
+	if (@records) {
+		my $class = (ref $records[0]) =~ s/Version$//r;
 
-	my @selected_records = $r->param($name);
+		$sorts   = getSortsForClass($class, $options{default_sort});
+		$formats = getFormatsForClass($class, $options{default_format});
+		$filters = getFiltersForClass(@records);
 
-	if (@Records) {
-		my $class = ref $Records[0];
-		$class = $1 if $class =~ /(.*)Version$/;
-
-		($filters, $filter_labels) = getFiltersForClass(@Records);
-		if (defined $r->param("$name!filter")) {
-			@selected_filters = $r->param("$name!filter");
+		my @selected_filters;
+		if (defined $c->param("$name!filter")) {
+			@selected_filters = $c->param("$name!filter");
 			@selected_filters = ("all") unless @selected_filters;
 		} else {
 			@selected_filters = @{ $options{default_filters} };
 		}
 
-		($sorts, $sort_labels) = getSortsForClass($class);
-		$selected_sort =
-			$r->param("$name!sort")
-			|| $options{default_sort}
-			|| (@$sorts ? $sorts->[0] : "");
-
-		($formats, $format_labels) = getFormatsForClass($class);
-		$selected_format =
-			$r->param("$name!format")
-			|| $options{default_format}
-			|| (@$formats ? $formats->[0] : "");
-
-		@Records = filterRecords({ filter => \@selected_filters }, @Records);
-
-		@Records = sortRecords({ preset => $selected_sort }, @Records);
-
-		# Generate IDs from keyfields
-		my @keyfields = $class->KEYFIELDS;
-		foreach my $Record (@Records) {
-			push @ids, join("!", map { $Record->$_ } @keyfields);
-		}
-
-		# Generate labels hash
-		@labels{@ids} = @Records;
-		%labels = formatRecords({ preset => $selected_format }, %labels);
+		$formattedRecords = formatRecords(
+			$c->param("$name!format") || $options{default_format},
+			sortRecords(
+				$c->param("$name!sort") || $options{default_sort} || (@$sorts ? $sorts->[0][1] : ''),
+				filterRecords(\@selected_filters, @records)
+			)
+		);
 	}
 
-	return CGI::div(
-		{ class => "card p-2" },
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => "$name!sort", class => 'col-form-label col-form-label-sm col-2 pe-1 text-nowrap' },
-				$r->maketext('Sort:')
-			),
-			CGI::div(
-				{ class => 'col-10' },
-				CGI::popup_menu({
-					name    => "$name!sort",
-					id      => "$name!sort",
-					values  => $sorts,
-					default => $selected_sort,
-					labels  => $sort_labels,
-					class   => 'form-select form-select-sm'
-				})
-			)
-		),
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => "$name!format", class => 'col-form-label col-form-label-sm col-2 pe-1 text-nowrap' },
-				$r->maketext('Format:')
-			),
-			CGI::div(
-				{ class => 'col-10' },
-				CGI::popup_menu({
-					name    => "$name!format",
-					id      => "$name!format",
-					values  => $formats,
-					default => $selected_format,
-					labels  => $format_labels,
-					class   => 'form-select form-select-sm'
-				})
-			)
-		),
-		CGI::div(
-			{ class => 'row mb-2' },
-			CGI::label(
-				{ for => "$name!filter", class => 'col-form-label col-form-label-sm col-2 pe-1 text-nowrap' },
-				$r->maketext("Filter:")
-			),
-			CGI::div(
-				{ class => 'col-10' },
-				CGI::scrolling_list({
-					name     => "$name!filter",
-					id       => "$name!filter",
-					values   => $filters,
-					default  => \@selected_filters,
-					labels   => $filter_labels,
-					size     => 5,
-					multiple => 1,
-					class    => 'form-select form-select-sm'
-				})
-			)
-		),
-		CGI::div(CGI::submit(
-			{ name => "$name!refresh", label => $refresh_button_name, class => 'btn btn-secondary btn-sm mb-2' }
-		)),
-		CGI::scrolling_list({
-			name    => $name,
-			id      => $name,
-			values  => \@ids,
-			default => \@selected_records,
-			labels  => \%labels,
-			class   => 'form-select form-select-sm',
-			$options{attrs} ? %{ $options{attrs} } : ()
-		}),
+	return $c->include(
+		'HTML/ScrollingRecordList/scrollingRecordList',
+		name             => $name,
+		options          => \%options,
+		sorts            => $sorts,
+		formats          => $formats,
+		filters          => $filters,
+		formattedRecords => $formattedRecords
 	);
 }
 
diff --git a/lib/WeBWorK/HTML/SingleProblemGrader.pm b/lib/WeBWorK/HTML/SingleProblemGrader.pm
new file mode 100644
index 0000000000..35ae7c899b
--- /dev/null
+++ b/lib/WeBWorK/HTML/SingleProblemGrader.pm
@@ -0,0 +1,74 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::HTML::SingleProblemGrader;
+use Mojo::Base -signatures;
+
+=head1 NAME
+
+WeBWorK::HTML::SingleProblemGrader is a module for manually grading a single
+webwork problem.  It is displayed with the problem when an instructor is acting
+as a student.
+
+=cut
+
+use WeBWorK::PG;
+use WeBWorK::Localize;
+use WeBWorK::Utils 'wwRound';
+
+sub new ($class, $c, $pg, $userProblem) {
+	$class = ref($class) || $class;
+
+	my $db           = $c->db;
+	my $courseID     = $c->stash('courseID');
+	my $setID        = $userProblem->set_id;
+	my $versionID    = ref($userProblem) =~ /::ProblemVersion/ ? $userProblem->version_id : 0;
+	my $studentID    = $userProblem->user_id;
+	my $problemID    = $userProblem->problem_id;
+	my $problemValue = $userProblem->value;
+
+	# Get the currently saved score.
+	my $recordedScore = $userProblem->status;
+
+	# Retrieve the latest past answer and comment (if any).
+	my $userPastAnswerID =
+		$db->latestProblemPastAnswer($courseID, $studentID, $setID . ($versionID ? ",v$versionID" : ''), $problemID);
+	my $pastAnswer = $userPastAnswerID ? $db->getPastAnswer($userPastAnswerID) : 0;
+	my $comment    = $pastAnswer       ? $pastAnswer->comment_string           : '';
+
+	my $self = {
+		pg             => $pg,
+		course_id      => $courseID,
+		student_id     => $studentID,
+		problem_id     => $problemID,
+		problem_value  => $problemValue,
+		set_id         => $setID,
+		version_id     => $versionID,
+		recorded_score => $recordedScore,
+		past_answer_id => $userPastAnswerID // 0,
+		comment_string => $comment,
+		c              => $c
+	};
+	bless $self, $class;
+
+	return $self;
+}
+
+# Output the problem grader.
+sub insertGrader ($self) {
+	return $self->{c}->include('HTML/SingleProblemGrader/grader', grader => $self);
+}
+
+1;
diff --git a/lib/WeBWorK/Localize.pm b/lib/WeBWorK/Localize.pm
index 1f3811ac24..fad943e9de 100644
--- a/lib/WeBWorK/Localize.pm
+++ b/lib/WeBWorK/Localize.pm
@@ -6,7 +6,7 @@ use Locale::Maketext::Lexicon;
 
 use WeBWorK::Utils qw(x);
 
-my $path     = "$WeBWorK::Constants::WEBWORK_DIRECTORY/lib/WeBWorK/Localize";
+my $path     = "$ENV{WEBWORK_ROOT}/lib/WeBWorK/Localize";
 my $pattern  = File::Spec->catfile($path, '*.[pm]o');
 my $decode   = 1;
 my $encoding = undef;
diff --git a/lib/WeBWorK/Localize/cs-CZ.po b/lib/WeBWorK/Localize/cs-CZ.po
index f701a05428..5f07e5f810 100644
--- a/lib/WeBWorK/Localize/cs-CZ.po
+++ b/lib/WeBWorK/Localize/cs-CZ.po
@@ -3,263 +3,326 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Robert Mařík <robert.marik.cz@gmail.com>, 2022
+# Robert Mařík <robert.marik.cz@gmail.com>, 2022-2023
 msgid ""
 msgstr ""
 "Project-Id-Version: webwork2\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: 2013-01-27 17:03+0000\n"
-"Last-Translator: Robert Mařík <robert.marik.cz@gmail.com>, 2022\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/webwork/webwork2/language/cs_CZ/)\n"
+"Last-Translator: Robert Mařík <robert.marik.cz@gmail.com>, 2022-2023\n"
+"Language-Team: Czech (Czech Republic) (http://app.transifex.com/webwork/webwork2/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:428
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:449
+#. ($_->{problem}->version_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:69
+msgid " (version %1)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:265
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:284
 msgid " Answers Available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:735
-msgid "# of active students"
-msgstr "počet aktivních studentů"
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1148
+msgid " No changes have been made to set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:130
+msgid "\"Act as\" a student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:31
+msgid "\"Edit Assigned Users\" column"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:24
+msgid "\"Edit Problems\" column"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:187
+msgid "# of Active Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:85
+msgid "# of attempts"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:506
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:333
 msgid "#corr"
 msgstr "počet správně"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:508
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:335
 msgid "#incorr"
 msgstr "počet nesprávně"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2249
-msgid "% Score:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:174
+msgid "% Average with Review"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:685
-msgid "% correct"
-msgstr "% správně"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:702
-msgid "% correct with review"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:66
+msgid "% Score with Review"
 msgstr ""
 
-# Percent students
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:762
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:792
-msgid "% students"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:479
+msgid "% Score:"
 msgstr ""
 
 #. ($achievement->{points})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:24
 msgid "%1 Points:"
 msgstr ""
 
-#. ($lib eq '' ? $r->maketext('Local')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:476
+#. ($lib eq '' ? maketext('Local')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:9
 msgid "%1 Problems:"
 msgstr ""
 
-#. ($itemCounts{$item->id()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:189
+#. ($itemCounts->{ $item->id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:12
 msgid "%1 remaining"
+msgstr "%1 použití k dispozici"
+
+#. ($count)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2001
+msgid "%1 sets"
 msgstr ""
 
-#. ($numAdded, $numSkipped, join(', ', @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1410
+#. ($numAdded,                     $numSkipped,
+#. join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:608
 msgid "%1 sets added, %2 sets skipped. Skipped sets: (%3)"
 msgstr ""
 
-#. ($numExported, $numSkipped, ($numSkipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1526
+#. ($numExported, $numSkipped,                     $numSkipped ? $c->tag('ul',
+#. $c->c(map { $c->tag('li', $_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:673
 msgid "%1 sets exported, %2 sets skipped. Skipped sets: (%3)"
 msgstr ""
 
 #. ($count, $numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:608
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
 msgid "%1 students out of %2"
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle,
+#. ($rename_oldCourseID,          $rename_oldCourseTitle,
+#. $rename_newCourseTitle,
 #. $rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:675
 msgid "%1 title and institution changed from %2 to %3 and from %4 to %5"
 msgstr ""
 
-#. (scalar @userIDsToExport, $dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1338
-msgid "%1 users exported to file %2/%3"
+#. (scalar @userIDsToExport, "$dir/$fileName")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:477
+msgid "%1 users exported to file %2"
 msgstr ""
 
-#. ($numReplaced, $numAdded, $numSkipped, join (", ", @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1233
+#. ($numReplaced, $numAdded, $numSkipped, join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:443
 msgid ""
 "%1 users replaced, %2 users added, %3 users skipped. Skipped users: (%4)"
 msgstr ""
 
-#. ($levelpercentage)
 #. ($percentage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:135
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:136
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:323
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:324
+#. ($level_percentage)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:12
 msgid "%1% Complete"
 msgstr ""
 
 #. (wwRound(0, $answerScore * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:268
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:248
 msgid "%1% correct"
 msgstr "%1% správně"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:207
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:57
 msgid "%1's Current Address"
 msgstr "Současná adresa uživatele %1"
 
-#. ($user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:136
+#. ($c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:26
 msgid "%1's Current Password"
 msgstr "Současné heslo uživatele %1"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:225
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:65
 msgid "%1's New Address"
 msgstr "Nová adresa uživatele %1"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:153
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:34
 msgid "%1's New Password"
 msgstr "Nové heslo uživatele %1"
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
-msgid "%1's new password cannot be blank."
-msgstr "Nové heslo uživatele %1 nemůže být prázdné."
-
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:76
 msgid "%1's password has been changed."
 msgstr "Heslo uživatele %1 bylo aktualizováno."
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:56
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1423
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#. ($c->tag('span', dir => 'ltr', $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1069
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:149
 msgid "%1: Problem %2"
 msgstr "%1: Úloha %2"
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:374
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:357
 msgid "%1: Problem %2 Show Me Another"
 msgstr "%1: Úloha %2, cvičná verze"
 
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2231
-msgid "%1: The directory for the course not found."
-msgstr ""
-
-#. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:340
-msgid "%quant(%1,error) occured while generating hardcopy:"
+#. ($days)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:87
+msgid "%quant(%1,day)"
 msgstr ""
 
 #. ($n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:924
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:389
 msgid "%quant(%1,file) unpacked successfully"
 msgstr ""
 
+#. ($hours)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:88
+msgid "%quant(%1,hour)"
+msgstr ""
+
+#. ($minutes)
+#. (sprintf('%3.1f', $testTime)
+#. ($timeLeft)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:89
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:150
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:168
+msgid "%quant(%1,minute)"
+msgstr ""
+
 #. ($numBlanks)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:430
 msgid ""
 "%quant(%1,of the questions remains,of the questions remain) unanswered."
 msgstr "Nebylo odpovězeno na %quant(%1,otázku,otázky)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:678
+#. ($seconds)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:90
+msgid "%quant(%1,second)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:505
 msgid "%score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2971
+#. ($dcount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:40
+msgid "(%quant(%1,item) total)"
+msgstr ""
+
+#. ($count)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:29
+msgid "(%quant(%1,item))"
+msgstr ""
+
+#. ($problemValue)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1081
+msgid "(%quant(%1,point))"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:697
 msgid "(Any unsaved changes will be lost.)"
 msgstr "(Neuložené změny budou ztraceny)"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1278
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1287
-msgid ""
-"(Instructor hint preview: show the student hint after the following number "
-"of attempts:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:102
+msgid "(If an action cannot be executed it will not appear.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2003
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1262
 msgid "(This problem will not count towards your grade.)"
 msgstr "(Tato úloha se nezapočítává do celkového bodového zisku.)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2122
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:340
 msgid ""
 "(This test is overtime because it was not submitted in the allowed time.)"
 msgstr ""
 
-#. ($testNoun, $self->formatDateTime($set->answer_date)
+#. ($testNoun, $c->formatDateTime($c->{set}->answer_date)
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1986
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:153
 msgid "(Your score on this %1 is not available until %2.)"
 msgstr ""
 
 #. ($testNoun)
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1988
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:155
 msgid "(Your score on this %1 is not available.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1257
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1267
 msgid "(correct)"
 msgstr "(správně)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:197
-msgid "(gw/quiz) After version answer date"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:263
 msgid "(in target set)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1449
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1269
 msgid "(incorrect)"
 msgstr "(nesprávně)"
 
 #. ($pgScore)
 #. ($recScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1461
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1271
 msgid "(score %1)"
 msgstr ""
 
-#. ($display_sort_method_name{$secondary_sort_method_name})
-#. ($display_sort_method_name{$ternary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:701
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:706
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:207
+msgid "(test) After version answer date"
+msgstr ""
+
+#. ($versionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:164
+msgid "(version %1)"
+msgstr ""
+
+#. ($display_sort_method_name{$secondary_sort_method})
+#. ($display_sort_method_name{$ternary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:103
 msgid ", then by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1297
-msgid ". If this is a class roster, rename it to have extension '.lst'"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:702
+msgid ". If this is a class roster, rename it to have extension \".lst\""
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:81
+msgid "0 seconds"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1997
+msgid "1 set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1983
 msgid "1 student"
 msgstr ""
 
 #. (wwRound(2, $weights[$part] * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:145
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:58
 msgid "<b>Weight:</b> %1%"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1749
+#: /opt/webwork/webwork2/conf/defaults.config:1651
 msgid ""
 "<p>After the Reduced Scoring Date all additional work done by the student "
 "counts at a reduced rate. Here is where you set the reduced rate which must "
@@ -274,7 +337,7 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2036
+#: /opt/webwork/webwork2/conf/defaults.config:1937
 msgid ""
 "<p>During summer 2005, a newer version of the answer checkers was "
 "implemented for answers which are functions and numbers.  The newer checkers"
@@ -286,16 +349,74 @@ msgid ""
 " the old answer checkers will be used by default.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2006
+#: /opt/webwork/webwork2/conf/defaults.config:1908
 msgid ""
 "<p>MathQuill renders students answers in real-time as they type on the "
 "keyboard.</p><p>MathView allows students to choose from a variety of common "
 "math structures (such as fractions and square roots) as they attempt to "
-"input their answers.</p><p>WIRIS provides a separate workspace for students "
-"to construct their response in a WYSIWYG environment.</p>"
+"input their answers.</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1459
+msgid ""
+"<p>Mode in which the LANG and DIR settings for a single problem are "
+"determined.</p><p>The system will set the LANGuage attribute to either a "
+"value determined from the problem, a course-wide default, or the system "
+"default, depending on the mode selected. The tag will only be added to the "
+"DIV enclosing the problem if it is different than the value which should be "
+"set in the main HTML tag set for the entire course based on the course "
+"language.</p><p>There are two options for the DIRection attribute: \"ltr\" "
+"for left-to-write scripts, and \"rtl\" for right-to-left scripts like Arabic"
+" and Hebrew.</p><p>The DIRection attribute is needed to trigger proper "
+"display of the question text when the problem text-direction is different "
+"than that used by the current language of the course. For example, English "
+"problems from the library browser would display improperly in RTL mode for a"
+" Hebrew course, unless the problen Direction is set to LTR.</p><p>The "
+"feature to set a problem language and direction was only added in 2018 to "
+"the PG language, so most problems will not declare their language, and the "
+"system needs to fall back to determining the language and direction in a "
+"different manner. The OPL itself is all English, so the system wide fallback"
+" is to en-US in LTR mode.</p><p>Since the defaults fall back to the LTR "
+"direction, most sites should be fine with the \"auto::\" mode, but may want "
+"to select the one which matches their course language. The mode "
+"\"force::ltr\" would also be an option for a course which runs into trouble "
+"with the \"auto\" modes.</p><p>Modes:</p><ul><li>\"none\" prevents any "
+"additional LANG and/or DIR tag being added. The browser will use the main "
+"setting which was applied to the entire HTML page. This is likely to cause "
+"trouble when a problem of the other direction is "
+"displayed.</li><li>\"auto::\" allows the system to make the settings based "
+"on the language and direction reported by the problem (a new feature, so not"
+" set in almost all existing problems) and falling back to the expected "
+"default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" allows the "
+"system to make the settings based on the language and direction reported by "
+"the problem (a new feature, so not set in almost all existing problems) but "
+"falling back to the language with the given LangCode and the direction Dir "
+"when problem settings are not available from PG.</li><li>\"auto::Dir\" for "
+"problems without PG settings, this will use the default en=english language,"
+" but force the direction to Dir. Problems with PG settings will get those "
+"settings.</li><li>\"auto:LangCode:\" for problems without PG settings, this "
+"will use the default LTR direction, but will set the language to "
+"LangCode.Problems with PG settings will get those "
+"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
+" by the PG code of the problem, and will force the system to set the "
+"language with the given LangCode and the direction to Dir for <b>all</b> "
+"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
+"PG code of the problem, and will force the system to set the direction to "
+"Dir for <b>all</b> problems, but will avoid setting any language attribute "
+"for individual problem.</li></ul>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1514
+msgid ""
+"<p>Some servers handle courses taking place in different timezones.  If this"
+" course is not showing the correct timezone, enter the correct value here.  "
+"The format consists of unix times, such as \"America/New_York\", "
+"\"America/Chicago\", \"America/Denver\", \"America/Phoenix\" or "
+"\"America/Los_Angeles\".</p>Complete list: <a "
+"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1736
+#: /opt/webwork/webwork2/conf/defaults.config:1638
 msgid ""
 "<p>This sets whether the Reduced Scoring system will be enabled.  If enabled"
 " you will need to set the default length of the reduced scoring period and "
@@ -307,22 +428,35 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1979
+#: /opt/webwork/webwork2/conf/defaults.config:1881
 msgid ""
 "<p>When viewing a problem, users may choose different methods of rendering "
 "formulas via an options box in the left panel. Here, you can adjust what "
 "display modes are listed.</p><p>Some display modes require other software to"
 " be installed on the server. Be sure to check that all display modes "
-"selected here work from your server.</p><p>The display modes are "
-"<ul><li>plainText: shows the raw LaTeX strings for formulas.</li><li>images:"
-" produces images using the external programs LaTeX and "
-"dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place "
-"render mathematics.</li></ul></p></p>You must use at least one display mode."
-" If you select only one, then the options box will not give a choice of "
-"modes (since there will only be one active).</p>"
+"selected here work from your server.</p><p>The display modes "
+"are</p><ul><li>plainText: shows the raw LaTeX strings for "
+"formulas.</li><li>images: produces images using the external programs LaTeX "
+"and dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place"
+" render mathematics.</li></ul><p>You must use at least one display mode. If "
+"you select only one, then the options box will not give a choice of modes "
+"(since there will only be one active).</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1476
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with a question in "
+"this test. Please inform your instructor including the warning messages "
+"below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1236
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with this question. "
+"Please inform your instructor including the warning messages below."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1828
+#: /opt/webwork/webwork2/conf/defaults.config:1730
 msgid ""
 "<ul><li><b>SMAcheckAnswers</b>: enables the Check Answers button <i>for the "
 "new problem</i> when Show Me Another is "
@@ -334,7 +468,7 @@ msgid ""
 "time</li><li><b>SMAshowHints</b>: show hints <i>for the new problem</i> "
 "(assuming they exist)</li></ul>Note: there is very little point enabling the"
 " button unless you check at least one of these options - the students would "
-"simply see a new version that they can not attempt or learn from.</p>"
+"simply see a new version that they can not attempt or learn from."
 msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:35
@@ -343,73 +477,123 @@ msgstr ""
 
 #. ($add_courseID)
 #. ($rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1376
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:688
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:600
 msgid "A course with ID %1 already exists."
 msgstr ""
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2564
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1220
 msgid ""
 "A directory already exists with the name %1. You must first delete this "
 "existing course before you can unarchive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:119
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:111
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:42
 msgid ""
 "A file name cannot begin with a dot, it cannot be empty, it cannot contain a"
 " directory path component and only the characters -_.a-zA-Z0-9 and space are"
 " allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1342
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1366
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:738
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
 msgid "A file with that name already exists"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:348
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:19
 msgid ""
 "A hardcopy file was generated, but it may not be complete or correct. Please"
 " check that no problems are missing and that they are all legible. If not, "
 "please inform your instructor."
 msgstr "Tištěná verze byla vytvořena, ale může být nekompletní nebo nesprávně formátována. Zkontrolujte prosím, že žádná úloha nechybí a není nesrozumitelná. V případě problémů kontaktujte vyučujícího."
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:56
+msgid ""
+"A hash reference in which the keys are the achievement_id's assigned to the "
+"current user and the values are 0 or 1 which stores if the user has earned "
+"the associated achievement or not."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:52
+msgid ""
+"A hash reference which contains a problems metadata, such as DBsubject, "
+"DBchapter, DBsection,  and so on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:37
+msgid "A hash reference which contains the problem data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:40
+msgid "A hash reference which contains the set data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:60
+msgid ""
+"A hash reference which saves data for this user and this achievement. This "
+"hash is persistent between evaluations and changes to this variable will be "
+"saved in the database."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:64
+msgid ""
+"A hash reference which saves global data for this user. This hash is "
+"persistent between evaluations and changes to this variable will be saved in"
+" the database."
+msgstr ""
+
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3291
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1695
 msgid ""
 "A location with the name %1 already exists in the database.  Did you mean to"
 " edit that location instead?"
 msgstr ""
 
-#. ($subject, $number_of_recipients, $courseName, $failed_messages)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1007
+#. ($mail_data->{subject}, $number_of_recipients, $mail_data->{courseName},
+#. $failed_messages)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:113
 msgid ""
 "A message with the subject line \"%1\" has been sent to %quant(%2,recipient)"
 " in the class %3.  There were %4 message(s) that could not be sent."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:644
-msgid "A new file has been created at '%1'"
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:315
+msgid "A new file has been created at \"%1\""
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1146
+msgid "A new file has been created at \"%1\" with the contents below."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:154
+msgid ""
+"A new problem whose path ends in newProblem.pg should be given a new name, "
+"for example, \"myNewProblem.pg\"."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2006
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:20
 msgid ""
-"A new file has been created at '%1' with the contents below.  No changes "
-"have been made to set %2"
+"A student must be assigned a homework set in order for it to appear on their"
+" WeBWorK home page. Check the box in the left column to assign a student to "
+"that homework set. Uncheck the box to unassign a student. If a student is "
+"unassigned from a homework set, all of the student's data for that homework "
+"set is deleted and cannot be recovered. Use this action cautiously!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:681
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:20
 msgid ""
-"A period (.) indicates a problem has not been attempted, and a number from 0"
-" to 100 indicates the grade earned. The number on the second line gives the "
-"number of incorrect attempts."
+"A student needs to be assigned a set in order for them to work it. Once a "
+"student is unassigned a set, all the data for them is lost and there is no "
+"way to undo it. When unassigning be sure to change the option to \"Allow "
+"unassign\"."
 msgstr ""
 
 # Leave symbol codes in place
-#: /opt/webwork/webwork2/conf/defaults.config:1647
+#: /opt/webwork/webwork2/conf/defaults.config:1549
 msgid ""
 "A switch to govern the use of a Progress Bar for the student; this also "
 "enables/disables the highlighting of the current problem in the side bar, "
@@ -417,472 +601,663 @@ msgid ""
 "(&#x2717;), or unattempted (no symbol)."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:42
+msgid "A unique key identifying the achievement."
+msgstr ""
+
 # Short for ADJUSTED STATUS
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:500
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:712
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:535
 msgid "ADJ STATUS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2296
-msgid "ANSWERS NOT RECORDED"
-msgstr "ODPOVĚDI NEBYLY ULOŽENY"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2281
-msgid "ANSWERS NOT RECORDED --"
-msgstr "ODPOVĚDI NEBYLY ULOŽENY --"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2295
-msgid "ANSWERS ONLY CHECKED -- "
-msgstr "ODPOVĚDI BYLY POUZE ZKONTROLOVÁNY -- "
+#. ($c->{scoreRecordedMessage}[ $probOrder->[$i] ])
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:504
+msgid "ANSWERS NOT RECORDED -- %1"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2232
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1505
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:515
 msgid "ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"
 msgstr "ODPOVĚDI BYLY POUZE ZKONTROLOVÁNY -- ODPOVĚDI NEBYLY ULOŽENY"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1527
 msgid ""
 "ATTEMPT NOT ACCEPTED -- Please submit answers again (or request new version "
 "if neccessary)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1534
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_password_form.html.ep:1
 msgid "Abandon changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1083
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_export_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_export_form.html.ep:1
 msgid "Abandon export"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:520
 msgid ""
 "Account creation is currently disabled in this course.  Please speak to your"
 " instructor or system administrator."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:153
-msgid "Achievement"
-msgstr ""
-
-#. ($targetAchievementID, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:638
-msgid "Achievement %1 created with evaluator '%2'."
+#. ($targetAchievementID,			$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:310
+msgid "Achievement %1 created with evaluator \"%2\"."
 msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:847
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:378
 msgid "Achievement %1 exists.  No achievement created"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:444
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:63
 msgid "Achievement Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:548
-msgid "Achievement Evaluator Editor"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:17
+msgid "Achievement Editor Help"
 msgstr ""
 
-#. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:170
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:17
+msgid "Achievement Evaluator Editor Help"
+msgstr ""
+
+#. ($c->stash('achievementID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:109
 msgid "Achievement Evaluator for achievement %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1446
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1454
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1482
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:13
 msgid "Achievement ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:274
 msgid "Achievement ID exists!  No new achievement created.  File not saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1698
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:41
+msgid "Achievement ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:3
+msgid "Achievement List"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1600
 msgid "Achievement Points Per Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:558
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:455
 msgid "Achievement User Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:17
+msgid "Achievement User Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:48
 msgid "Achievement has been assigned to all users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:67
 msgid "Achievement has been assigned to selected users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:60
 msgid "Achievement has been unassigned to all students."
 msgstr ""
 
-#. (CGI::a({ href => $fileManagerURL }, $scoreFileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:711
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:38
+msgid "Achievement options"
+msgstr ""
+
+#. ($c->link_to(                           $scoreFileName => $c->systemLink(
+#. $c->url_for('instructor_file_manager')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:318
 msgid "Achievement scores saved to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:260
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:241
 msgid "Achievements"
 msgstr "Odznáčky"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:531
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:17
+msgid "Achievements Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:26
+msgid ""
+"Achievements are evaluated in the order shown below, with the exception of "
+"\"level\" achievements.  Achievements in the \"level\" category are "
+"evaluated first and control the XP thresholds and rewards (achievement "
+"items) for reaching each level. Achievements in the \"secret\" category are "
+"not shown to students until they earn the achievement, and is used for "
+"fun/surprise achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:32
+msgid ""
+"Achievements in the same category, with sequential numbers, and whose ID "
+"starts with the same \"prefix_\" (up to the last underscore), are treated as"
+" achievement chains.  Achievement chains are a sequence of achievements "
+"which build upon themselves, such as complete one problem, complete 10 "
+"problems, complete 25 problems, and so on. Students will only see the "
+"achievements in the chain they have completed or are currently working on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:201
 msgid "Act as"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:207
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:26
 msgid "Act as:"
 msgstr ""
 
-#. (HTML::Entities::encode_entities($prettyEUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1134
+#. ($effectiveUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:26
 msgid "Acting as %1."
 msgstr ""
 
 #. ($actionID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:372
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:223
 msgid "Action %1 not found"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1706
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:101
+msgid "Actions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1608
 msgid ""
 "Activating this will enable achievement rewards. This feature allows "
 "students to earn rewards by completing achievements that allow them to "
 "affect their homework in a limited way."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:45
 msgid "Active"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1691
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:50
+msgid "Active Students"
+msgstr ""
+
+#. ($c->{prettyID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:19
+msgid "Active Students Problem %1 Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1593
 msgid ""
 "Activiating this will enable Mathchievements for webwork.  Mathchievements "
 "can be managed by using the Achievement Editor link."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2947
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1548
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:166
 msgid "Add"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:89
 msgid "Add All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:644
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:32
 msgid "Add Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:253
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:17
+msgid "Add Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:14
+msgid "Add Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:98
 msgid "Add Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:406
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:349
 msgid "Add Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:518
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:17
+msgid "Add Users Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:47
 msgid "Add WeBWorK administrators to new course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1509
-msgid "Add a new test for which Gateway?"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:79
+msgid "Add a TA or an instructor (change permission level of user)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:60
+msgid "Add a few students to the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1441
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:50
+msgid "Add a new version for which test?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:20
 msgid "Add as what filetype?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/add_form.html.ep:3
 msgid "Add how many users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1549
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:69
+msgid "Add many students to a course from a class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:108
+msgid "Add n blank problem template(s) to the end of homework set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:164
 msgid "Add problem to target set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Add problems to"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1422
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:161
+msgid ""
+"Add this problem as the last problem of an existing set, either as a problem"
+" or as the set header (the text that appears on the home page of a homework "
+"set). You can rearrange the order of the problems later using the \"Hmwk "
+"Sets Editor\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:7
 msgid "Add to what set?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:20
+msgid ""
+"Add users to the course.  Select the number of students/users to add and "
+"then add any desired information.  The only mandatory information is the "
+"\"Login Name\". Any other fields may be left blank.  The \"Student ID\" will"
+" be the initial password for the user if provided."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:26
 msgid "Add which new users?"
 msgstr ""
 
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:883
+msgid "Added \"%1\" to %2 as new hardcopy header"
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:854
+msgid "Added \"%1\" to %2 as new set header"
+msgstr ""
+
 #. ('{number}', '{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1055
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:27
 msgid "Added %1 problems to set %2."
 msgstr ""
 
-#. ($sourceFilePath, $targetSetName,($set->assignment_type eq 'jitar' ?
-#. join('.',jitar_id_to_seq($targetProblemNumber)
-#. ($new_file_name, $setName, ($set->assignment_type eq 'jitar' ?
-#. join('.',jitar_id_to_seq($targetProblemNumber)
 #. ($new_file_path, $setID, $targetProblemNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1510
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2001
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1912
+#. ($sourceFilePath,                       $targetSetName,                 (
+#. $set->assignment_type eq 'jitar'                                ? join('.',
+#. jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:825
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1837
 msgid "Added %1 to %2 as problem %3"
 msgstr ""
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1566
-msgid "Added '%1' to %2 as new hardcopy header"
-msgstr ""
-
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1540
-msgid "Added '%1' to %2 as new set header"
+#. ($new_file_name,                                $c->{setID},
+#. (                                       $set->assignment_type eq 'jitar'
+#. ? join('.', jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1139
+msgid "Added %1 to %2 as problem %3."
 msgstr ""
 
 #. (join(', ', @toAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1974
 msgid "Added addresses %1 to location %2."
 msgstr ""
 
+#. ($user->user_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:167
+msgid "Added missing permission level for user %1."
+msgstr ""
+
 #. ('{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1054
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:26
 msgid "Added one problem to set %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Added user:"
+msgstr ""
+
+#. ('<code>[Scoring]/report_grades_data.csv</code>',
+#. '<code>[TMPL]/email/report_grades.msg</code>',)
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:33
+msgid ""
+"Additional (external) grades can be shown on this page by placing them in "
+"the CSV file %1.  The first six columns must be (in order): Student ID, "
+"Username, Last Name, First Name, Section, Recitation.  The remaining columns"
+" can list any external grades.  To display the grades, the CSV file is "
+"merged with the \"Email\" message %2, which will be rendered and displayed "
+"below the grade table.  The message can be created on the \"Email\" page and"
+" the CSV file can be created/uploaded using the \"File Manager\".  External "
+"grades can only be displayed here and are not included in any totals or "
+"statistics."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2060
 msgid "Additional addresses for receiving feedback e-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:235
 msgid "Additional submissions available."
 msgstr ""
 
 #. ($badLocAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1708
 msgid ""
 "Address(es) %1 already exist in the database.  THIS SHOULD NOT HAPPEN!  "
 "Please double check the integrity of the WeBWorK database before continuing."
 msgstr ""
 
 #. (join(', ', @noAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1986
 msgid ""
 "Address(es) %1 in the add list is(are) already in the location %2, and so "
 "were skipped."
 msgstr ""
 
 #. (join(', ', @noDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3603
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2008
 msgid ""
 "Address(es) %1 in the delete list is(are) not in the location %2, and so "
 "were skipped."
 msgstr ""
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1683
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and resubmit."
 msgstr ""
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1998
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:117
 msgid "Addresses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:53
 msgid ""
 "Addresses for new location.  Enter one per line, as single IP addresses "
 "(e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP ranges "
 "(e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:27
 msgid ""
 "Addresses to add to the location.  Enter one per line, as single IP "
 "addresses (e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP"
 " ranges (e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:232
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:27
 msgid "Adds 24 hours to the close date of a homework."
-msgstr ""
+msgstr "Prodloužit čas uzavření jedné sady úloh o 24 hodin. Je možné použít jenom na ještě otevřené úkoly."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:323
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:27
 msgid "Adds 48 hours to the close date of a homework."
+msgstr "Prodloužit čas uzavření jedné sady úloh o 48 hodin. Je možné použít jenom na ještě otevřené úkoly."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:110
+msgid ""
+"Adds new template problems to the set when the set is saved. You can modify "
+"the template to create your own problem, by clicking on the \"Edit Problem\""
+" link and saving to some new file, e.g. \"myNewProblem.pg\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:812
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:19
 msgid "Adjusted Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:56
 msgid "Adobe PDF"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:675
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:42
 msgid "Advanced Search"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:196
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:206
 msgid "After set answer date"
 msgstr ""
 
-#. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:325
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:33
 msgid ""
-"After the reduced scoring period begins all work counts for %1% of its "
-"value."
+"After the due date this set enters a reduced scoring period until it closes "
+"on %1.  All work completed during the reduced scoring period counts for %2% "
+"of its value."
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:304
 msgid "Afterward reduced credit can be earned until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:56
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:60
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:23
 msgid "All Chapters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:57
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:34
 msgid "All Sections"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:6
 msgid "All Selected Constraints Joined by \"And\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:71
+msgid "All Sets"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:12
 msgid "All Subjects"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:48
 msgid "All Textbooks"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:54
+msgid "All Users"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:49
 msgid "All assignments were made successfully."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:953
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:386
 msgid "All listed sets were hidden from all the students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:951
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:381
 msgid "All listed sets were made visible for all the students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:407
 msgid "All of the answers above are correct."
 msgstr "Všechny odpovědi uvedené výše jsou odpovězeny správně."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:398
 msgid "All of the gradeable answers above are correct."
 msgstr "Všechny otázky s automatickým hodnocením jsou správně."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:247
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:162
+msgid ""
+"All of the paths for problem files are relative to the templates directory "
+"of the current course. You can access this directory \"directly\" using the "
+"File Manager page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:68
 msgid "All of these files will also be made available for mail merge."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:960
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:9
+msgid "All problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:5
+msgid "All sections"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2145
+msgid "All selected courses are already hidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2214
+msgid "All selected courses are already unhidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:399
 msgid "All selected sets hidden from all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:394
 msgid "All selected sets made visible for all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:946
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:373
 msgid "All sets hidden from all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:945
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:368
 msgid "All sets made visible for all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:619
 msgid "All sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:56
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:54
 msgid "All unassignments were made successfully."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2047
+#: /opt/webwork/webwork2/conf/defaults.config:1948
 msgid "Allow Unicode alternatives in student answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:74
 msgid "Allow the LMS to update user account data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:68
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:105
 msgid "Allow unassign"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2069
+#: /opt/webwork/webwork2/conf/defaults.config:1970
 msgid "Allowed error, as a percentage, for numerical comparisons"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1886
+#: /opt/webwork/webwork2/conf/defaults.config:1788
 msgid "Allowed to <em>act as</em> another user"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1923
+#: /opt/webwork/webwork2/conf/defaults.config:1825
 msgid "Allowed to change display settings used in pg problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1913
+#: /opt/webwork/webwork2/conf/defaults.config:1815
 msgid "Allowed to change their e-mail address"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1877
+#: /opt/webwork/webwork2/conf/defaults.config:1779
 msgid "Allowed to change their password"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1872
+#: /opt/webwork/webwork2/conf/defaults.config:1774
 msgid "Allowed to login to the course"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1950
+#: /opt/webwork/webwork2/conf/defaults.config:1852
 msgid "Allowed to see solutions before the answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1945
+#: /opt/webwork/webwork2/conf/defaults.config:1847
 msgid "Allowed to see the correct answers before the answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1934
+#: /opt/webwork/webwork2/conf/defaults.config:1836
 msgid "Allowed to view past answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1940
+#: /opt/webwork/webwork2/conf/defaults.config:1842
 msgid "Allowed to view problems in sets which are not open yet"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1572
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:82
+msgid ""
+"Allows configuration of certain parameters, such as permission levels, "
+"default display mode for equations, and email feedback behavior, on a course"
+" by course basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:126
+msgid "Also copy simple configuration file"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:26
 msgid "Amulet of Extension"
+msgstr "Prodlužovací kouzlo"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:20
+msgid ""
+"An achievement evaluator is a perl script that is run after each problem is "
+"submitted which returns a truth value of 0 (didn't earn) or 1 (earn). The "
+"evaluator is given access to different variables which contain data about "
+"the problem and set that is used to determine if the achievement is earned "
+"or not."
 msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:37
@@ -892,248 +1267,308 @@ msgid ""
 "WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:43
+msgid ""
+"An array which lists the hash reference of all the problems in the current "
+"set."
+msgstr ""
+
 #. ($archive_courseID)
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2350
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2647
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1274
 msgid "An error occured while archiving the course %1:"
 msgstr ""
 
 #. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:658
 msgid "An error occured while changing the title of the course %1."
 msgstr ""
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1795
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:878
 msgid "An error occured while deleting the course %1:"
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1521
+#. ($rename_oldCourseID,						$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:751
 msgid "An error occured while renaming the course %1 to %2:"
 msgstr ""
 
 #. ($part + 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:106
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:25
 msgid "Answer %1 Score (%):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:425
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:765
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:789
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:812
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:79
 msgid "Answer Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1712
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:39
 msgid "Answer Group Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:59
 msgid "Answer Hash Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:221
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:292
 msgid "Answer Log"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:17
+msgid "Answer Log Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:285
 msgid "Answer Preview"
 msgstr "Náhled odpovědi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1465
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:48
+msgid ""
+"Answer availability for tests depends on multiple settings.  This only "
+"indicates the template answer date has passed.  See set editor for actual "
+"availability."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1276
 msgid "Answer(s) submitted:"
 msgstr "Uložená odpověd:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
 msgid "Answer:"
 msgstr "Odpověď:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:224
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
 msgid "Answers"
 msgstr "Odpovědi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:122
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:37
 msgid "Answers Available"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1202
 msgid "Answers cannot be due until on or after the open date!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1204
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1197
 msgid "Answers cannot be made available until on or after the close date!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:313
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:21
 msgid ""
 "Any changes made below will be reflected in the achievement for ALL "
 "students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2259
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:507
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:175
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:69
 msgid "Any changes made below will be reflected in the set for ALL students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:173
 msgid ""
 "Any changes made below will be reflected in the set for ONLY the student(s) "
 "listed above."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:122
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:159
 msgid "Append"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1849
+#. (tag('strong', dir => 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:71
 msgid "Append to end of %1 set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2264
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:51
+msgid "Applying definitions theoretically and proof writing"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:91
 msgid "Archive"
 msgstr ""
 
 #. ($archive, $n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:892
-msgid "Archive '%1' created successfully (%quant( %2, file))"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:361
+msgid "Archive \"%1\" created successfully (%quant( %2, file))"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1069
-msgid "Archive '%1' deleted"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:525
+msgid "Archive \"%1\" deleted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1846
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2048
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:38
 msgid "Archive Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2005
-msgid "Archive Courses"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:17
+msgid "Archive Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2423
-msgid "Archive next course"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:63
+msgid "Archive Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1056
-msgid "Archive this Course"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1158
+msgid "Archive next course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:61
 msgid "Archived Courses"
 msgstr ""
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:202
-msgid "Archiving course as %1.tar.gz. Reload FileManager to see it."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:69
+msgid "Archived course as %1.tar.gz."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:25
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to access the .tar.gz files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:26
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to upload additional .tar.gz "
+"files to be unarchived."
 msgstr ""
 
-#. (CGI::b($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2191
+#. (tag('b', $archive_courseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:57
 msgid ""
 "Are you sure that you want to delete the course %1 after archiving? This "
 "cannot be undone!"
 msgstr ""
 
-#. (CGI::b($delete_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1736
+#. (tag('b', param('delete_courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:5
 msgid ""
 "Are you sure you want to delete the course %1? All course files and data "
 "will be destroyed. There is no undo available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:72
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:511
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:64
+msgid ""
+"As the checkbox says, this includes a percentage grade column for each set."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:184
 msgid "Assign"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:225
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:62
 msgid "Assign All Sets to Current User"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:171
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:106
+msgid "Assign achievements"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:43
+msgid "Assign and unassign selected exercise sets to selected users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:54
 msgid "Assign selected sets to selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:919
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:154
+msgid "Assign sets to many students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:116
+msgid "Assign sets to one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:15
 msgid "Assign this achievement to which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1366
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:62
 msgid "Assign this set to which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:15
 msgid "Assign to All Current Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:3
 msgid "Assign which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:35
 msgid "Assigned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1984
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:19
 msgid "Assigned Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:580
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:218
 msgid "Assigned achievements to users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2154
-msgid "Assigned to"
+#. (link_to(						$c->setCountMessage($db->countUserSets($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:96
+msgid "Assigned to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:212
 msgid "Assignment type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-msgid "Assignments only"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:2004
+#: /opt/webwork/webwork2/conf/defaults.config:1906
 msgid "Assist with the student answer entry process."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:417
 msgid "At least one of the answers above is NOT correct."
 msgstr "Nejméně jedna z otázek není zodpovězena správně."
 
 # Short for "Attempts to Open Children"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:487
 msgid "Att. to Open Children"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:50
 msgid "Attachment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2293
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:107
 msgid "Attempt to upgrade directories"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:375
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:449
 msgid "Attempted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1416
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1498
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/attempts_row.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:73
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:13
 msgid "Attempts"
 msgstr "Pokusy"
 
@@ -1141,392 +1576,586 @@ msgstr "Pokusy"
 msgid "Audit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:342
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:348
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:360
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:366
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:460
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:466
 msgid "Authentication failed.  Please speak to your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/InstructorRPCHandler.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:44
+msgid "Authentication failed. Log in again to continue."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:116
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:69
 msgid "Author Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:87
 msgid "Automatic"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2058
+#: /opt/webwork/webwork2/conf/defaults.config:1959
 msgid ""
 "Automatically convert Full Width Unicode characters to their ASCII "
 "equivalents"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2911
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:97
+msgid ""
+"Automatically render all problems in the set on this page when \"Save "
+"Changes\" or \"Reset Form\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:667
 msgid "Automatically render problems on page load"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1727
-msgid "Auxiliary Resources"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:95
+msgid "Automatically render problems on page load."
 msgstr ""
 
-#. ($emailDirectory,$old_default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:350
-msgid "Backup file <code>%1/%2</code> created."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:49
+msgid "Auxiliary Resources"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:255
-msgid "Badges"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:179
+msgid "Average Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:942
-msgid "Basic Search"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:118
+msgid "Average Attempts Per Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
-msgid "Binary"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:115
+msgid "Average Percent"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1271
-msgid "Box of Transmogrification"
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:558
+msgid "Backup created on %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1093
-msgid "Browse"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:1
+msgid "Badges"
+msgstr "Odznáčky"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:106
+msgid "Basic Search"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:512
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:991
-msgid "Browse from:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:28
+msgid "Before Open Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2161
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:31
 msgid ""
-"By default, feedback is always sent to all users specified to recieve "
-"feedback.  This variable sets the system to only email feedback to users who"
-" have the same section as the user initiating the feedback.  I.e., feedback "
+"Below the file list is a button and options for uploading files. Click the "
+"\"Choose File\" button, select the file, then click \"Upload\". A single "
+"file or a compressed tar (.tgz) file can be uploaded and if the option is "
+"selected, the archive is automatically unpacked and deleted.  Generally the "
+"\"automatic\" option on Format will correctly pick the correct type of file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:83
+msgid "Binary"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+msgid "Both Start and Grade"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:26
+msgid "Box of Transmogrification"
+msgstr "Transformační kouzlo"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:40
+msgid "Browse"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:16
+msgid "Browse from:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2072
+msgid ""
+"By default, feedback is always sent to all users specified to recieve "
+"feedback.  This variable sets the system to only email feedback to users who"
+" have the same section as the user initiating the feedback.  I.e., feedback "
 "will only be sent to section leaders."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2151
+#: /opt/webwork/webwork2/conf/defaults.config:2062
 msgid ""
 "By default, feedback is sent to all users above who have permission to "
 "receive feedback. Feedback is also sent to any addresses specified in this "
 "blank. Separate email address entries by commas."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
 msgid "CLOSE DATE"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:217
 msgid "CLOSE TIME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:26
 msgid "Cake of Enlargement"
-msgstr ""
+msgstr "Superzdvojovací kouzlo"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1891
+#: /opt/webwork/webwork2/conf/defaults.config:1793
 msgid "Can e-mail instructor"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1904
+#: /opt/webwork/webwork2/conf/defaults.config:1806
 msgid "Can report bugs"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1955
+#: /opt/webwork/webwork2/conf/defaults.config:1857
 msgid "Can show old answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1897
+#: /opt/webwork/webwork2/conf/defaults.config:1799
 msgid "Can submit answers for a student"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:275
 msgid "Can't copy file: %1"
 msgstr ""
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:894
-msgid "Can't create archive '%1': command returned %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
+msgid "Can't create archive \"%1\": command returned %2"
 msgstr ""
 
 #. ($courseID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2725
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:28
 msgid "Can't create course environment for %1 because %2"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:423
 msgid "Can't create directory: %1"
 msgstr ""
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1060
-msgid "Can't create file '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+msgid "Can't create file \"%1\": %2"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:948
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:406
 msgid "Can't create file: %1"
 msgstr ""
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1070
-msgid "Can't delete archive '%1': %2"
-msgstr ""
-
-#. ($eUserID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:69
-msgid "Can't get password record for effective user '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:526
+msgid "Can't delete archive \"%1\": %2"
 msgstr ""
 
-#. ($userID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:64
-msgid "Can't get password record for user '%1': %2"
+#. ($setID, $TargetUser->user_id,)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:925
+msgid ""
+"Can't generate hardcopy for set \"%1\" for user \"%2\". The set is not "
+"visible to students."
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:445
 msgid "Can't open %1"
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1426
 msgid "Can't open file %1"
 msgstr ""
 
 #. ($merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:343
 msgid "Can't read merge file %1. No message sent"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:760
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:298
 msgid "Can't rename file: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:591
 msgid "Can't rename to the same name."
 msgstr ""
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:927
-msgid "Can't unpack '%1': command returned %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:392
+msgid "Can't unpack \"%1\": command returned %2"
 msgstr ""
 
 #. ($fullPath)
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:629
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1895
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1819
 msgid "Can't write to file %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1015
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1096
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:154
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:462
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/confirm.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:69
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:15
 msgid "Cancel"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:387
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:5
+msgid "Cancel E-Mail"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:60
 msgid "Cancel E-mail"
 msgstr "Zrušit E-mail"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:61
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:77
 msgid "Cancel Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:79
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
 msgid "Cancel Export"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:93
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
 msgid "Cancel Password"
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:516
+msgid "Cannot find a file path to save to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:501
+msgid ""
+"Cannot find a problem record for set $c->{setID} / problem $c->{problemID}"
+msgstr ""
+
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:240
 msgid "Cannot open %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:222
-msgid "Cap Test Time at Set Close Date?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:232
+msgid "Cap Test Time at Set Close Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1456
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1486
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:14
 msgid "Category"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:516
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:49
+msgid "Category:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:27
 msgid ""
 "Cause the selected homework set to count for twice as many points as it "
 "normally would."
-msgstr ""
+msgstr "Bodový zisk z vybrané sady domácích úloh se zdvojnásobí."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1272
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:27
 msgid ""
 "Causes a homework problem to become a clone of another problem from the same"
 " set."
-msgstr ""
+msgstr "Vybraná úloha bude zaměněna za klon jiné úlohy ze stejné sady úloh."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:727
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:27
 msgid "Causes a single homework problem to be worth twice as much."
-msgstr ""
+msgstr "Jedna úloha se bude započítávat dvojnásobně."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1006
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:48
 msgid "Change Course Title to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:34
 msgid "Change CourseID to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:176
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:134
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:76
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:25
 msgid "Change Display Settings"
 msgstr "Změnit nastavení zobrazování"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:53
 msgid "Change Email Address"
 msgstr "Změnit E-mailovou adresu"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1032
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:62
 msgid "Change Institution to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:374
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:18
 msgid "Change Password"
 msgstr "Změnit heslo"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:169
 msgid "Change User Settings"
-msgstr "Změnit uživatelská nastavení"
+msgstr "Uložit změnu nastavení"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:35
+msgid "Change a course's ID, Title, or Institution."
+msgstr ""
 
 #. ($rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1092
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
 msgid "Change course institution from %1 to %2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:160
+msgid "Change dates for a homework set for the whole class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:123
+msgid "Change the due date for one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:26
+msgid ""
+"Change the due dates for an individual student on this page. Check the "
+"checkbox and enter the new date in order to override the date. (You can copy"
+" the date format from the date in the right hand column which indicates the "
+"date when the homework set is due for the whole class.) Note that you should"
+" ensure that the close date is before the answer date. If the close date for"
+" a student is extended until after the class answer date for the set, then "
+"the answer date for the student must also be set to a later date. "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:141
+msgid "Change the grades on a homework set for one student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:163
+msgid "Change the grading on a homework set for an entire class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:170
+msgid "Change the number of atttempts allowed on a problem."
+msgstr ""
+
 #. ($rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1089
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:508
 msgid "Change title from %1 to %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1362
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:488
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:540
 msgid "Changes abandoned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:371
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:242
 msgid "Changes in this file have not yet been permanently saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:647
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:529
 msgid "Changes saved"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1822
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:38
+msgid "Changing dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:514
 msgid ""
 "Changing the problem seed for display, but there are no problems showing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:635
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:19
 msgid "Chapter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1849
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:15
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:103
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:37
 msgid "Check Answers"
 msgstr "Zkontrolovat odpovědi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2476
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:682
 msgid "Check Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:183
-msgid "Check that it's permissions are set correctly."
-msgstr ""
-
-#. ($emailDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:195
-msgid ""
-"Check whether it exists and whether the directory %1 can be read by the "
-"webserver."
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:53
+msgid "Choose problems from a library and add them to a homework set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:543
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:40
 msgid "Choose the set which you would like to be worth twice as much."
-msgstr ""
+msgstr "Vyberte sadu úloh, kterou chcete započítat dvojnásobně."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:44
 msgid "Choose the set which you would like to enable partial credit for."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1206
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:992
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:44
 msgid "Choose the set which you would like to resurrect."
-msgstr ""
+msgstr "Vyberte sadu úloh, pro kterou chcete využít odměnu."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:259
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:350
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:40
 msgid "Choose the set whose close date you would like to extend."
-msgstr ""
+msgstr "Vyberte sadu úloh, u které chcete posunout čas uzavření."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:903
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:16
 msgid "Choose visibility of the sets to be affected"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:497
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:15
 msgid "Choose what to do with existing data:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:880
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:3
 msgid "Choose which sets to be affected"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:491
-msgid "Class value"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:17
+msgid "Class List Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:55
+msgid "Class list (\".lst\") files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:334
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:316
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:37
 msgid "Classlist Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1197
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:91
 msgid "Clear Problem Display"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:693
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:82
 msgid ""
 "Click a student's name to see the student's homework set. Click a heading to"
 " sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:74
 msgid ""
 "Click a student's name to see the student's test summary page. Click a "
 "test's version number to see the corresponding test version. Click a heading"
 " to sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:614
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:150
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:143
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made. (The grade for each problem is listed "
+"as \"status\" on this third page)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:24
+msgid ""
+"Click on each of the tabs to view the configuration items. The question mark"
+" icon provides access to information about the behavior of the configuration"
+" settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:125
+msgid ""
+"Click on the column \"Assigned Sets\" in the student's row. This will take "
+"you to a page where you can assign and unassign homework sets and change the"
+" due dates for homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:33
+msgid ""
+"Click on the homework set links to edit the grades for this individual "
+"student on the homework set. (The grade of each problem is called the "
+"\"status\".) You can also change the number of allowed attempts and further "
+"modify the individual student's homework set.) You will also be able to "
+"change a student's seed which determines the individual values used in the "
+"individual version of the student's problem and the weight (how much a "
+"problem counts towards the grade.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:90
 msgid ""
 "Click on the login name to edit individual problem set data, (e.g. due "
 "dates) for these students."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:62
+msgid ""
+"Click the \"Add x student(s)\" radio button and then click \"Take action\". "
+"This will take you to a new page where the data can be entered for one or "
+"more students. It is also possible to assign the student to one or more "
+"problem sets as they are being entered: simply select the homework sets from"
+" the list below the data entry table. Use \"command\" or \"control\" click "
+"to select more than one homework set."
+msgstr ""
+
+#. ('<i class="fas fa-question-circle"></i>')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:88
+msgid "Click the %1 icon for page and item specific help."
+msgstr ""
+
+#. ('<a href="#"><i class="fas fa-question-circle"></i></a>')
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:20
+msgid "Click the icon %1 for page and item specific help."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:185
+msgid ""
+"Clicking on any active link at the top of the column sorts the page by that "
+"column. You can do lexigraphic sorts: click on \"First name\" then \"Last "
+"name\" to sort by last name, sorting those with the same last name by their "
+"first name."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:132
+msgid ""
+"Clicking on the login name link in a student's row allows you to view the "
+"student's version of the homework (rather than your own) so that you can "
+"more easily answer student questions about homework problems. (A \"acting as"
+" xxx\" alert will appear in the upper right corner of each window while you "
+"are acting as a student.) You can submit the answers (which will NOT be "
+"recorded) to check that the computer is grading the problem correctly. You "
+"will also be able to view past answers submitted by the student for each "
+"problem. To stop acting in the student's role click the \"Stop acting\" link"
+" in the upper right corner of the window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:199
+msgid ""
+"Clicking the <strong>e-mail address</strong> link will bring up your "
+"standard email application so that you can send email to the student. This "
+"works even if the student has been dropped from the course. To send email to"
+" an entire class or to merge grades with the email message use the \"Email\""
+" page link in the left margin."
+msgstr ""
+
 #. ($clientIP->ip()
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:541
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:547
 msgid ""
 "Client ip address %1 is not allowed to work this assignment, because the "
 "assignment has ip address restrictions and there are no allowed locations "
@@ -1534,329 +2163,337 @@ msgid ""
 "problem resolved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:713
-msgid "Close"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:316
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:39
+msgid "Close Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:424
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:764
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:788
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:811
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
-msgid "Close Date"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:35
+msgid "Closed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:382
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:208
 msgid "Closed, answers available."
 msgstr "Odevzdávání ukončeno, řešení jsou k dispozici."
 
-#. ($self->formatDateTime($set->answer_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:378
+#. ($c->formatDateTime($set->answer_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:204
 msgid "Closed, answers on %1."
 msgstr "Odevzdávání ukončeno. Termín zpřístupnění řešení je %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:206
 msgid "Closed, answers recently available."
 msgstr "Odevzdávání ukončeno, řešení byla nedávno uvolněna."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:282
 msgid "Closed."
 msgstr "Uzavřeno."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:116
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:121
 msgid "Closes"
 msgstr "Končí"
 
-#. ($self->formatDateTime($set->due_date, undef,
-#. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:113
-msgid "Closes %1"
-msgstr "Končí %1"
-
-#. ($self->formatDateTime($verSet->due_date, undef,
+#. ($c->formatDateTime($verSet->due_date, undef,
 #. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:390
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:227
 msgid "Closes on %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:35
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:33
 msgid "Closes:"
 msgstr "Končí:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2518
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:357
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:71
 msgid "Collapse All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2529
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:367
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:85
 msgid "Collapse All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2668
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:419
 msgid "Collapse Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2791
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2793
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:572
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:575
 msgid "Collapse Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1715
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:73
+msgid ""
+"Collapse problem details to the top row of information about a problem. Note"
+" that the details of a single problem can be collapsed by clicking on the up"
+" arrow to the right of the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1617
 msgid ""
 "Comma separated list of set names that are excluded from all achievements. "
 "No achievement points and badges can be earned for submitting problems in "
 "these sets. Note that underscores (_) must be used for spaces in set names."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:238
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:245
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:225
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:577
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2047
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:299
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:833
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:862
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:891
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:920
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:131
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:46
 msgid "Comment"
 msgstr "Poznámka"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:200
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:25
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:181
 msgid "Comment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:638
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:86
 msgid "Comments"
 msgstr ""
 
-#. ($self->formatDateTime($set->answer_date)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2175
+#. ($c->formatDateTime($c->{set}->answer_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:379
 msgid "Completed results for this assignment are not available until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:382
 msgid "Completed results for this assignment are not available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:264
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:280
 msgid "Completed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:45
 msgid "Compose Email Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3185
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:47
+msgid ""
+"Configure ip ranges (locations) that can be used to restrict set access."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:45
+msgid "Configure which course links appear on the site landing page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:97
 msgid "Confirm"
 msgstr ""
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:107
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:164
+#. ($eUserName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:41
 msgid "Confirm %1's New Password"
 msgstr "Potvrzení hesla pro uživatele %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:579
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:78
 msgid "Confirm Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_export_form.html.ep:1
 msgid "Confirm which sets to export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementEvaluator.pm:288
+#: /opt/webwork/webwork2/templates/AchievementEvaluator/cheevoMessage.html.ep:15
 msgid "Congratulations, you earned a new level!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2250
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:95
 msgid "Continue"
 msgstr "Pokračovat"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:86
 msgid "Continue Open Test"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:59
+msgid "Controls if an achievement is evaluated or not."
+msgstr ""
+
 #. ($sourceDirectory, $outputDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1149
-msgid "Copied auxiliary files from %1 to new location at %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:671
+msgid "Copied auxiliary files from %1 to new location at %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:42
 msgid "Copy"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
 msgid "Copy file as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:528
-msgid "Copy simple configuration file to new course"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:627
-msgid "Copy templates from:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:112
+msgid "Copy from:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1335
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:82
 msgid "Copy this Problem"
-msgstr ""
+msgstr "Kopírovat tuto úlohu"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:391
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:465
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:301
 msgid "Correct"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:656
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:678
 msgid "Correct Adjusted Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:300
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:287
 msgid "Correct Answer"
-msgstr "Správná opdověď"
+msgstr "Správná odpověď"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1682
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:19
 msgid "Correct Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1506
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1317
 msgid "Correct Answers:"
 msgstr "Správné odpovědi:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:693
 msgid "Correct Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:648
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:93
 msgid "Correct answers"
 msgstr "Správné odpovědi"
 
 #. ($total_correct, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1004
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:16
 msgid "Correct: %1/%2"
 msgstr "Správně: %1/%2"
 
 #. ($newBlankProblems, $MAX_NEW_PROBLEMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1915
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1843
 msgid ""
 "Could not add %1 problems to this set.  The number must be between 1 and %2"
 msgstr ""
 
 #. ($e_user_name, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:83
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:94
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:74
 msgid "Couldn't change %1's password: %2"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:111
 msgid "Couldn't change your email address: %1"
 msgstr ""
 
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4111
-msgid "Couldn't find OPL Branch %1 in remote %2"
-msgstr ""
-
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4076
-msgid "Couldn't find PG Branch %1 in remote %2"
-msgstr ""
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4014
-msgid "Couldn't find WeBWorK Branch %1 in remote %2"
-msgstr ""
-
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:132
 msgid "Couldn't save your display options: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1463
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:36
 msgid "Counter"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:424
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:833
-msgid "Counts for Parent"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:66
+msgid "Counter:"
 msgstr ""
 
-#. ($rename_oldCourseID)
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2186
-msgid "Course %1 database is in order"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:503
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:35
+msgid "Counts for Parent"
 msgstr ""
 
-#. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1257
-msgid "Course %1 databases must be updated before renaming this course."
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:154
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:9
+msgid "Course Administration"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:778
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:95
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:138
-msgid "Course Administration"
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:17
+msgid "Course Administration Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:424
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:369
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:80
 msgid "Course Configuration"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:480
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:17
+msgid "Course Configuration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:17
+msgid "Course Home Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:21
 msgid "Course ID"
 msgstr ""
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2566
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:691
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:594
 msgid "Course ID cannot exceed %1 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1227
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:597
 msgid "Course ID may only contain letters, numbers, hyphens, and underscores."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:956
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:21
 msgid "Course ID:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:5
 msgid "Course Info"
 msgstr "Informace k předmětu"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1664
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1961
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3736
-msgid "Course Name:"
+#. ($c->stash('courseID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:325
+msgid "Course Information for course %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:491
-msgid "Course Title"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:30
+msgid "Course Listings"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:17
+msgid "Course Name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:204
-msgid "Course archived."
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:28
+msgid "Course Title"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:418
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:12
 msgid "Courses"
 msgstr "Předměty"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1609
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1904
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3674
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:13
 msgid ""
 "Courses are listed either alphabetically or in order by the time of most "
 "recent login activity, oldest first. To change the listing order check the "
@@ -1865,393 +2502,536 @@ msgid ""
 "\"hidden\" or \"visible\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:7
+msgid ""
+"Courses are listed either alphabetically or in order by the time of most "
+"recent login activity, oldest first. To change the listing order check the "
+"mode you want and click \"Refresh Listing\". The listing format is: "
+"Course_Name (status :: date/time of most recent login) where status is "
+"\"hidden\" or \"visible\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:163
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:84
 msgid "Create"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:41
 msgid "Create CSV"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3054
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:31
 msgid "Create Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1071
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:39
+msgid ""
+"Create a .tar.gz archive which includes the course's database and all course"
+" files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:33
 msgid "Create a New Set in This Course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:795
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:4
 msgid "Create a new achievement with ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:33
+msgid "Create a new course on this server."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:20
+msgid ""
+"Create a new course.  The \"Course ID\" is used as the course name and is "
+"used in course links.  Underscores appear as spaces when displaying the "
+"course name.  The \"Course Title\" is used as the title on the course home "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:86
+msgid ""
+"Create a new set with a given name. This can either create an empty set or a"
+" duplicate of an existing set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:12
 msgid "Create as what type of achievement?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:12
 msgid "Create as what type of set?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1866
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:20
+msgid "Create backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:81
 msgid "Create unattached problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1849
-msgid ""
-"Creates a gzipped tar archive (.tar.gz) of a course in the WeBWorK courses "
-"directory. Before archiving, the course database is dumped into a "
-"subdirectory of the course's DATA directory. Currently the archive facility "
-"is only available for mysql databases. It depends on the mysqldump "
-"application."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:121
+msgid "Create/Delete achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:726
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:26
 msgid "Cupcake of Enlargement"
-msgstr ""
+msgstr "Zdvojovací kouzlo"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:728
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:38
 msgid "Current"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3042
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:2
 msgid "Currently defined locations are listed below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4352
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2365
 msgid "Database tables are ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:54
 msgid "Database tables need updating."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2753
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:52
 msgid "Database tables ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2968
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1499
 msgid "Database:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:783
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:153
 msgid "Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:727
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:355
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:96
+msgid "Dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:40
+msgid ""
+"Dates for problem sets can be edited by clicking the pencil icon in the "
+"\"Edit Set Data\" column next to the set name. To change dates for several "
+"sets at once, click the check box in the \"Select\" column and choose \"Edit"
+" selected\" from the tasks above."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:426
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:37
 msgid "Default"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1675
+#: /opt/webwork/webwork2/conf/defaults.config:1577
 msgid ""
 "Default Amount of Time (in minutes) after Due Date that Answers are Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1665
+#: /opt/webwork/webwork2/conf/defaults.config:1567
 msgid ""
 "Default Amount of Time (in minutes) before Due Date that the Assignment is "
 "Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1785
+#: /opt/webwork/webwork2/conf/defaults.config:1687
 msgid "Default Length of Reduced Scoring Period in minutes"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1655
+#: /opt/webwork/webwork2/conf/defaults.config:1557
 msgid "Default Time that the Assignment is Due"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1808
+#: /opt/webwork/webwork2/conf/defaults.config:1710
 msgid ""
 "Default number of attempts before Show Me Another can be used (-1 => Never)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1755
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:162
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:91
+#: /opt/webwork/webwork2/conf/defaults.config:1994
+msgid ""
+"Default number of attempts before hints are shown in a problem (-1 => hide "
+"hints)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:89
 msgid "Delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1556
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1651
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1689
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1728
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:49
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:36
 msgid "Delete Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3480
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:17
+msgid "Delete Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:23
+msgid "Delete Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:37
+msgid "Delete a course and all associated data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:109
+msgid "Delete a student from a course"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:52
 msgid "Delete all existing addresses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1989
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:65
+msgid "Delete backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:64
+msgid "Delete backup from %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:54
 msgid "Delete course after archiving. Caution there is no undo!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:49
 msgid "Delete course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2348
 msgid "Delete field when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2809
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:588
 msgid "Delete it?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3055
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:78
 msgid "Delete location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:28
+msgid "Delete oldest backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2321
 msgid "Delete table when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:729
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:90
+msgid "Delete the sets checked below. Be careful, this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:6
 msgid "Delete which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1045
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:6
 msgid "Delete which sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1041
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:6
 msgid "Delete which users?"
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:394
 msgid "Deleted %1 users."
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:358
 msgid "Deleted %quant(%1,achievement)"
 msgstr ""
 
 #. (join(', ', @delLocations)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3359
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1810
 msgid "Deleted Location(s): %1"
 msgstr ""
 
 #. (join(', ', @toDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3597
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1966
 msgid "Deleted addresses %1 from location."
 msgstr ""
 
-#. ($self->shortPath($self->{tempFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1158
-msgid "Deleting temp file at %1"
+#. ($formatBackupTime)
+#. ($c->formatDateTime($delTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1243
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:569
+msgid "Deleted backup from %1."
+msgstr ""
+
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:679
+msgid "Deleted temp file at %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3152
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1219
+msgid "Deleted temporary file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:125
+msgid "Deleting Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:68
 msgid ""
 "Deletion deletes all location data and related addresses, and is not "
 "undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:723
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:3
 msgid "Deletion destroys all achievement-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:185
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
 msgid "Deny From"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1467
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:27
 msgid "Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:256
-msgid "Deselect All Sets"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:71
+msgid "Description:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:69
+msgid "Deselect All Sets"
+msgstr "Zrušit označení"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:229
 msgid "Deselect All Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:428
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:366
 msgid "Didn't recognize action"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:27
 msgid "Directory"
 msgstr ""
 
 #. ($file, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:793
-msgid "Directory '%1' not removed: %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:327
+msgid "Directory \"%1\" not removed: %2"
 msgstr ""
 
 #. ($file, $removed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:792
-msgid "Directory '%1' removed (items deleted: %2)"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:325
+msgid "Directory \"%1\" removed (items deleted: %2)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:412
-msgid "Directory permission errors "
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:33
+msgid "Directory permission errors"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2861
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2994
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1439
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1575
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:44
 msgid ""
 "Directory structure is missing directories or the webserver lacks sufficient"
 " privileges."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1267
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2210
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2857
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1434
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1570
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:41
 msgid "Directory structure is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2285
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:102
 msgid "Directory structure needs to be repaired manually before archiving."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1338
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:84
 msgid "Directory structure needs to be repaired manually before renaming."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2750
-msgid "Directory structure or permissions need to be repaired. "
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:48
+msgid "Directory structure or permissions need to be repaired."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2853
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1414
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1540
 msgid "Directory structure:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2536
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:365
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:92
+msgid "Display Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:90
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:104
 msgid "Display Mode:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:463
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:37
 msgid "Display Past Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
-msgid "Display of scores for this set is not allowed."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:44
+msgid "Display mode for equations"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:311
+msgid "Display of scores for this test is not allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:589
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:12
 msgid "Display options: Show"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2017
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:48
+msgid ""
+"Display sets matching a selected criteria. Useful if there are many sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1918
 msgid "Display the evaluated student answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:176
+#. ('<code>COURSENAME_totals.csv</code>',
+#. '<code>COURSENAME_totals_bak1.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:74
+msgid ""
+"Do NOT use the file name %1, since you might accidentally overwrite that if "
+"you again export your WeBWorK homework scores. (Actually the earlier file is"
+" moved to %2 -- so you can recover using the File Manager.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:57
 msgid "Do not unassign students unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:233
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:67
 msgid "Do not uncheck a set unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:20
 msgid "Do not uncheck students, unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2450
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:656
 msgid "Do you want to grade this test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2272
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:93
+msgid "Documentation from source code for PG modules and macro files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:95
 msgid "Don't Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2607
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:13
 msgid "Don't Unarchive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2912
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:46
 msgid "Don't Upgrade"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1749
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:15
 msgid "Don't delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1120
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:24
 msgid "Don't make changes"
 msgstr ""
 
 #. ($saveMode)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:317
 msgid "Don't recognize saveMode: |%1|. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1307
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1321
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1335
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:87
 msgid "Don't rename"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:547
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:33
 msgid "Don't use in an achievement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:683
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1345
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2465
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1595
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:766
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:57
 msgid "Done"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:159
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:365
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:8
 msgid "Download"
 msgstr ""
 
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($set->set_id)
 #. ($ver->{id} =~ s/_/ /gr)
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($set->set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:731
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:732
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:413
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:204
 msgid "Download %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:23
 msgid "Download Hardcopy"
 msgstr "Stáhnout PDF"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:865
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:56
 msgid "Download PDF or TeX Hardcopy for Current Set"
 msgstr "Stáhnout zadání v PDF formátu"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:764
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:233
 msgid "Download PDF or TeX Hardcopy for Selected Tests"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($selected_set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:595
+#. (tag('span', dir => 'ltr', format_set_name_display($selected_set_id =~
+#. s/,v(\d+)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:58
 msgid "Download hardcopy of set %1 for %2?"
 msgstr "Stáhnout zadání %1 uživatele %2?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:369
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:63
+msgid "Download/upload archived courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:46
 msgid "Download:"
 msgstr "Stáhnout:"
 
@@ -2259,314 +3039,401 @@ msgstr "Stáhnout:"
 msgid "Drop"
 msgstr ""
 
-#. ($self->formatDateTime($set->reduced_scoring_date, undef,
-#. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:107
-msgid "Due %1, after which reduced scoring is available until %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:100
+msgid "Drop student from the course"
 msgstr ""
 
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:310
 msgid "Due date %1 has passed."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2093
+#: /opt/webwork/webwork2/conf/defaults.config:2014
 msgid "E-Mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:315
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:261
 msgid "E-mail Instructor"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2128
-msgid "E-mail addresses which can receive e-mail from a pg problem"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:2138
+#: /opt/webwork/webwork2/conf/defaults.config:2049
 msgid ""
 "E-mail feedback from students automatically sent to this permission level "
 "and higher"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2109
+#: /opt/webwork/webwork2/conf/defaults.config:2030
 msgid "E-mail verbosity level"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:357
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:43
 msgid "E-mail:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:35
 msgid "Earned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:71
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:158
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:334
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:417
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:547
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2743
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1628
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1186
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1203
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:257
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:479
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:6
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:53
 msgid "Edit"
 msgstr ""
 
-#. (CGI::a({ href => $basicInfoUrl }, $r->maketext('class list data')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:199
-msgid "Edit %1 for  %2 (%3) who has been assigned %4 sets."
+#. (link_to(maketext('class list data')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:47
+msgid "Edit %1 for %2 (%3) who has been assigned %4 sets."
 msgstr ""
 
-#. (CGI::a({ href => $editUsersAssignedToSetURL }, $r->maketext('individual
-#. versions')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2223
-msgid "Edit %1 of set %2."
+#. (link_to(maketext('individual user settings')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:162
+msgid "Edit %1 for set %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:6
 msgid "Edit Assigned Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:40
 msgid "Edit Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1488
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:58
 msgid "Edit Evaluator"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:253
 msgid "Edit Header"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3053
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:18
 msgid "Edit Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2741
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:111
 msgid "Edit Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:5
 msgid "Edit Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:583
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:3
 msgid "Edit Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:421
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:4
 msgid "Edit Set Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:171
+msgid "Edit Tags"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:30
 msgid "Edit Target Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1487
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:18
 msgid "Edit Users"
 msgstr ""
 
-#. ($user)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:207
-msgid "Edit data for %1"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:127
+msgid "Edit achievement evaluator"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1248
-msgid "Edit it"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:90
+msgid "Edit achievement information"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2192
-msgid "Edit set %1 data for ALL students assigned to this set."
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:65
+msgid ""
+"Edit achivements for the course. This link is only present if achievements "
+"are enabled for the course."
 msgstr ""
 
-#. (CGI::a({href=>$editSetLink},$setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2166
-msgid "Edit set %1 for this user."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:42
+msgid "Edit class list data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3393
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:39
 msgid ""
-"Edit the current value of the location description, if desired, then add and"
-" select addresses to delete, and then click the \"Take Action\" button to "
-"make all of your changes.  Or, click \"Manage Locations\" above to make no "
-"changes and return to the Manage Locations page."
+"Edit class roster data. Add students, edit student data, drop students from "
+"class, import students from a classlist, and give user professor privileges."
+" Access to individual homework sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:429
-msgid "Edit which achievements?"
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:70
+msgid "Edit data for %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:829
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:46
+msgid ""
+"Edit homework sets for entire class. Change homework set due dates, create "
+"new sets from a set definition file, create new homework sets, make sets "
+"visible/invisible, score homework sets. Assign homework sets to the class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:219
+msgid "Edit it"
+msgstr ""
+
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:135
+msgid "Edit set %1 for ALL students assigned to this set."
+msgstr ""
+
+#. (link_to(                                               $setID =>
+#. $c->systemLink(
+#. $setDetailPage, params => { effectiveUser => $user->user_id, editForUser =>
+#. $user->user_id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:106
+msgid "Edit set %1 for this user."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:95
+msgid "Edit set for %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:4
+msgid ""
+"Edit the current value of the location description, if desired, then add and"
+" select addresses to delete, and then click the \"Take Action\" button to "
+"make all of your changes.  Or, click \"Manage Locations\" above to make no "
+"changes and return to the Manage Locations page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:2
+msgid "Edit which achievements?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:2
 msgid "Edit which sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:935
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:2
 msgid "Edit which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:592
-msgid "Editing <strong>blank problem</strong> in file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:31
+msgid "Editing <strong>course information</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:595
-msgid "Editing <strong>course information</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:30
+msgid "Editing <strong>hardcopy header</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
-msgid "Editing <strong>hardcopy header</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:28
+msgid "Editing <strong>new problem</strong> template."
+msgstr ""
+
+#. ($c->{prettyProblemNumber},                             tag('span', dir =>
+#. 'ltr', format_set_name_display($fullSetName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:45
+msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:29
+msgid "Editing <strong>set header</strong> file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:33
+msgid "Editing <strong>unassigned problem</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:596
-msgid "Editing <strong>options information</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:32
+msgid "Editing <strong>unknown file type</strong> in file \"%1\"."
 msgstr ""
 
-#. ($prettyProblemNumber,                  CGI::span({ dir => 'ltr' },
-#. format_set_name_display($fullSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:605
-msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:19
+msgid "Editing Modes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:593
-msgid "Editing <strong>set header</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:140
+msgid "Editing Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:598
-msgid "Editing <strong>unassigned problem</strong> file \"%1\""
+#. ($c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:16
+msgid "Editing achievement in file \"%1\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:597
-msgid "Editing <strong>unknown file type</strong> in file \"%1\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:22
+msgid "Editing for all students"
 msgstr ""
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:209
-msgid "Editing achievement in file '%1'"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:23
+msgid "Editing for one student or a proper subset of all students"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3390
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:1
 msgid "Editing location %1"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display("$setID$vermsg")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2182
-msgid "Editing problem set %1 data for these individual students: %2"
+#. (tag(                                           'strong',
+#. dir => 'ltr',
+#. format_set_name_display($setID . ($editingSetVersion ?
+#. ",v$editingSetVersion" : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:123
+msgid "Editing problem set %1 for these students: %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:315
 msgid "Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:669
-msgid "Editor rows:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1668
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:229
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:53
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:68
 msgid "Email"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:32
 msgid "Email Address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:817
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:170
 msgid "Email Body:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:17
+msgid "Email Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:339
 msgid "Email Instructor On Failed Attempt"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2003
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:28
 msgid "Email Link"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:789
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:112
 msgid "Email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1807
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1832
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:311
+msgid "Email body is empty. No message sent. "
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:994
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_email.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_form.html.ep:24
 msgid "Email instructor"
 msgstr "Email vyučujícímu"
 
-#. (scalar(@{ $self->{ra_send_to} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:454
+#. (scalar(@{ $c->{ra_send_to} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:27
+msgid ""
+"Email is being sent to %quant(%1,recipient). You will be notified by email "
+"when the task is completed.  This may take several minutes if the class is "
+"large."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:13
+msgid "Email:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:26
 msgid ""
-"Email is being sent to %quant(%1,recipient). You will be notified by email\n"
-"\t\t\t\twhen the task is completed.  This may take several minutes if the class is\n"
-"\t\t\t\tlarge."
+"Emails can contain personalized data, such as name, section, or status.  "
+"Click \"List of insertable macros\" for a full list available variables.  "
+"Additional personal data can be included by using a merge file.  A merge "
+"file is a CSV file located in the [Scoring] directory in which the first "
+"column is the student id, followed by additional data (such as student "
+"grades).  This data is identified by which column it is in, for instance if "
+"the scores where in the 4th column of the merge file, insert them into an "
+"email using the variable $COL[4].  The \"Scoring Tools\" page can export "
+"grades into a CSV that can be used as a merge file.  Upload customized merge"
+" files with the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:11
 msgid "Emails to be sent to the following:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1704
+#: /opt/webwork/webwork2/conf/defaults.config:1606
 msgid "Enable Achievement Rewards"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1723
+#: /opt/webwork/webwork2/conf/defaults.config:1625
 msgid "Enable Conditional Release"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1689
+#: /opt/webwork/webwork2/conf/defaults.config:1591
 msgid "Enable Course Achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1645
+#: /opt/webwork/webwork2/conf/defaults.config:1547
 msgid "Enable Progress Bar and current problem highlighting"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1734
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:585
+#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Enable Reduced Scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1799
+#: /opt/webwork/webwork2/conf/defaults.config:1701
 msgid "Enable Show Me Another button"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:156
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:24
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:92
 msgid "Enable Spell Checking"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1844
+#: /opt/webwork/webwork2/conf/defaults.config:1746
 msgid "Enable periodic re-randomization of problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:416
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:29
 msgid ""
 "Enable reduced scoring for a homework set.  This will allow you to submit "
 "answers for partial credit for 24 hours after the close date."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1461
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1483
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:20
 msgid "Enabled"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1846
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:58
+msgid "Enabled:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1748
 msgid ""
 "Enables periodic re-randomization of problems after a given number of "
 "attempts. Student would have to click Request New Version to obtain new "
 "version of the problem and to continue working on the problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1725
+#: /opt/webwork/webwork2/conf/defaults.config:1627
 msgid ""
 "Enables the use of the conditional release system.  To use conditional "
 "release you need to specify a list of set names on the Problem Set Detail "
@@ -2575,14 +3442,14 @@ msgid ""
 " sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1801
+#: /opt/webwork/webwork2/conf/defaults.config:1703
 msgid ""
 "Enables use of the Show Me Another button, which offers the student a newly-"
 "seeded version of the current problem, complete with solution (if it exists "
 "for that problem)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:662
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:163
 msgid "End"
 msgstr ""
 
@@ -2590,538 +3457,662 @@ msgstr ""
 msgid "Enrolled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:788
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:111
 msgid "Enrolled, Drop, etc."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:830
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:859
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:888
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:917
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:128
 msgid "Enrollment Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:21
 msgid "Enter filename below"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:20
 msgid "Enter filenames below"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:19
 msgid ""
 "Enter information below for students you wish to add. Each student's "
 "password will initially be set to their student ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1997
+#: /opt/webwork/webwork2/conf/defaults.config:1899
 msgid ""
 "Enter one of the allowed display mode types above.  See 'display modes "
 "entry' for descriptions."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:297
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:34
+msgid ""
+"Enter the details of the course instructor to be added when the course is "
+"created.  This user will also be added to the admin course with the username"
+" \"userID_courseID\" so you can manage and email the instructors of the "
+"courses on the server."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:284
 msgid "Entered"
 msgstr "Zapsáno"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:85
-msgid "Entered student:"
-msgstr ""
-
-#. ($display_sort_method_name{$primary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:698
+#. ($display_sort_method_name{$primary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:98
 msgid "Entries are sorted by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:247
 msgid "Equation Display"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:61
+msgid "Equation Editor"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1516
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1460
 msgid "Error adding set-level proctor: %1"
 msgstr ""
 
+#. ($fromPath, $toPath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:664
+msgid "Error copying %1 to %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:14
+msgid "Error details"
+msgstr ""
+
+#. ($filePath, stash('podError')
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:27
+msgid "Error generating POD for file %1: %2"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1492
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1437
 msgid ""
 "Error getting old set-proctor password from the database: %1.  No update to "
 "the password was done."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:31
 msgid "Error message:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2235
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:12
 msgid "Error messages"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1616
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:754
 msgid "Error: Answer date must come after close date in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:747
 msgid "Error: Close date must come after open date in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1634
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:778
 msgid ""
 "Error: Reduced scoring date must come between the open date and close date "
 "in set %1"
 msgstr ""
 
-#. ($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2067
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:7
 msgid "Error: The original file %1 cannot be read."
 msgstr ""
 
 #. ($setID)
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1240
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:738
 msgid "Error: answer date cannot be more than 10 years from now in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1235
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:733
 msgid "Error: close date cannot be more than 10 years from now in set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:630
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:234
 msgid "Error: no file data was submitted!"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1599
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:728
 msgid "Error: open date cannot be more than 10 years from now in set %1"
 msgstr ""
 
-#. ($problem_desc, $problem_name, CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1404
+#. ($problem_desc, $problem_name, $c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1210
 msgid ""
 "Errors encountered while processing %1. This %2 has been omitted from the "
 "hardcopy. Error text: %3"
 msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3832
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:8
+msgid "Errors occured while generating hardcopy:"
+msgstr ""
+
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2128
 msgid ""
 "Errors occured while hiding the courses listed below when attempting to "
 "create the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3920
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2197
 msgid ""
 "Errors occured while unhiding the courses listed below when attempting "
 "delete the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1468
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:28
 msgid "Evaluator File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3839
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:76
+msgid "Evaluator File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:28
+msgid "Evaluator Variables"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2143
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
-"hidden."
+"Except for the errors listed above, all selected courses are already hidden."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3904
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2212
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
+"Except for the errors listed above, all selected courses are already "
 "unhidden."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3456
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:39
 msgid ""
 "Existing addresses for the location are given in the scrolling list below.  "
 "Select addresses from the list to delete them:"
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2281
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1460
 msgid "Existing file %1 could not be backed up and was lost."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2514
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:354
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:65
 msgid "Expand All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:364
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:78
 msgid "Expand All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2667
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:418
 msgid "Expand Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2792
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:574
 msgid "Expand Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:74
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:89
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:67
+msgid ""
+"Expand problem details that have been collapsed. Note that the details of a "
+"single problem can be expanded by clicking on the down arrow to the right of"
+" the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:71
 msgid "Export"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1098
-msgid "Export selected achievements."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:113
+msgid "Export achievement data"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_export_form.html.ep:1
+msgid "Export selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1267
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:17
 msgid "Export to what kind of file?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:2
 msgid "Export which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1245
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:5
 msgid "Export which users?"
 msgstr ""
 
 #. ($FileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1151
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:591
 msgid "Exported achievements to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1616
-msgid "Extend the close date for which Gateway?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:48
+msgid "Extend the close date for which test?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:148
+msgid "Extend the number of attempts allowed a student on a given problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1573
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:28
 msgid ""
-"Extends the close date of a gateway test by 24 hours. Note: The test must "
-"still be open for this to work."
+"Extends the close date of a test by 24 hours. Note: The test must still be "
+"open for this to work."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "FIRST NAME"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Failed to add user:"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:416
 msgid "Failed to create new achievement: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:373
 msgid "Failed to create new achievement: no achievement ID specified!"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:573
 msgid "Failed to create new set: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1158
-msgid "Failed to create new set: no set name specified!"
+#. ($newSetID =~ s/_/ /gr)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:482
+msgid ""
+"Failed to create new set: Invalid characters in set name \"%1\". A set name "
+"may only contain letters, numbers, hyphens, periods, and spaces."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:474
+msgid "Failed to create new set: No set name specified."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1155
-msgid "Failed to create new set: set name cannot exceed 100 characters."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:469
+msgid "Failed to create new set: Set name cannot exceed 100 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:396
 msgid ""
 "Failed to duplicate achievement: no achievement selected for duplication!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:530
 msgid "Failed to duplicate set: no set selected for duplication!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:74
-msgid "Failed to enter student:"
+#. ($@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:67
+msgid "Failed to generate course archive: %1"
 msgstr ""
 
 #. ($scoreFilePath)
 #. ($filePath)
 #. ($FilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1125
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:649
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:955
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2402
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1584
 msgid "Failed to open %1"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:227
 msgid "Failed to save: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#. ($_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:253
+msgid "Failed to send message: %1"
+msgstr ""
+
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:23
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:36
 msgid "False"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1919
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:63
 msgid "Feature exhausted for this problem"
 msgstr "Tato možnost je již pro zadanou úlohu vyčerpána"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:200
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:23
+msgid "Features:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:252
 msgid "Feedback"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2159
+#: /opt/webwork/webwork2/conf/defaults.config:2070
 msgid "Feedback by Section."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:234
 msgid "FeedbackMessage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1177
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2113
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2284
 msgid "Field is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2109
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2286
 msgid "Field missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1175
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2111
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4290
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
 msgid "Field missing in schema"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:599
-msgid "File '%1' exists.  File not saved.  No changes have been made."
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:266
+msgid "File \"%1\" exists.  File not saved.  No changes have been made."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1926
-msgid ""
-"File '%1' exists. File not saved. No changes have been made.  You can change"
-" the file path for this problem manually from the 'Hmwk Sets Editor' page"
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1036
+msgid "File \"%1\" exists. File not saved. No changes have been made."
 msgstr ""
 
-#. ($file,$!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:796
-msgid "File '%1' not removed: %2"
+#. ($file, $!)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:333
+msgid "File \"%1\" not removed: %2"
 msgstr ""
 
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:795
-msgid "File '%1' successfully removed"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+msgid "File \"%1\" successfully removed"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1066
-msgid "File '%1' uploaded successfully"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:522
+msgid "File \"%1\" uploaded successfully"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:476
 msgid "File <b>%1</b> already exists. Overwrite it, or rename it as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:364
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:55
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:70
 msgid "File Manager"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:628
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:17
+msgid "File Manager Help"
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:541
+msgid "File not saved. Failed to open \"%1\" for writing."
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:528
+msgid ""
+"File not saved. The file \"%1\" is not contained in the templates directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:921
+msgid ""
+"File not saved. The file name for this problem does not match the file name "
+"the editor was opened with. The problem set may have changed. Please reopen "
+"this file from the homework sets editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:228
 msgid "File saved"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:733
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:272
 msgid "File successfully copied"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:758
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:295
 msgid "File successfully renamed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:29
 msgid "Filename"
 msgstr ""
 
-#. ($extension,$location)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1296
-msgid "Files with extension '.%1' usually belong in '%2'"
+#. ($extension, $location)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:699
+msgid "Files with extension \".%1\" usually belong in \"%2\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:20
+msgid ""
+"Fill out the form below to add, edit, or delete locations.  Locations are "
+"used to restrict access to sets based on ip address.  Locations are "
+"configured here in the administration course, then used in a normal course."
+"  When configuring a set to use a restricted ip address, the instructor can "
+"choose to either restrict access to the location or deny access from a "
+"location, which are identified by their name.  Instructors can select "
+"multiple locations to restrict access to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:78
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:47
 msgid "Filter"
 msgstr ""
 
 #. ($recitation)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1184
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1112
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1420
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:913
 msgid "Filter by recitation %1"
 msgstr ""
 
 #. ($section)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1180
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1416
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:910
 msgid "Filter by section %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:733
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:31
 msgid "Filter by what text?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:151
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:17
 msgid "Filter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:749
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:137
 msgid "First"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:593
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1992
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:827
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:856
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:885
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:914
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:87
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:21
 msgid "First Name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:107
 msgid "First name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:178
 msgid ""
 "For security reasons, you cannot specify a message file from a directory "
 "higher than the email directory (you can't use ../blah/blah for example). "
 "Please specify a different file or move the needed file to the email "
-"directory"
+"directory."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2928
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:30
+msgid "Force editor to RTL"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:674
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:101
 msgid "Force problems to be numbered consecutively from one"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:409
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:35
+msgid "Form Elements Present on the Page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:75
 msgid "Format"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2096
+#: /opt/webwork/webwork2/conf/defaults.config:2017
 msgid "Format for the subject line in feedback e-mails"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:172
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:133
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:10
 msgid "Format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:12
 msgid "Found no directories containing problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1112
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:43
 msgid "From This Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:318
 msgid "From field must contain one valid email address."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:340
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:621
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:20
+msgid ""
+"From this page you can <strong>add new students</strong>, "
+"<strong>edit</strong> class list data (name, email address, recitation, "
+"section, permission level, and enrollment status), <strong>change "
+"passwords</strong>, and <strong>export</strong> (save) class lists for back-"
+"up or use in another course. You can also delete students from the class "
+"roster, but this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:34
 msgid "From:"
 msgstr "Odesílatel:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:59
 msgid "GLOBAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1512
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1619
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1728
-msgid "Gateway Name"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:210
-msgid "Gateway Quiz %2"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:853
-msgid "Gateway parameters"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/conf/defaults.config:1427
 msgid "General"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2305
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:201
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:30
 msgid "General Information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:745
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:669
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:670
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:222
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:116
+msgid "General Page Information"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:121
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:166
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:167
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:113
 msgid "Generate Hardcopy"
 msgstr "Stáhnout"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:262
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:73
 msgid "Generate Hardcopy for Selected Sets"
-msgstr "Státhnout tištěnou verzi označených zadání"
+msgstr "Stáhnout tištěnou verzi označených zadání"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:115
+msgid ""
+"Generate a hardcopy of the problem being edited. This does not change the "
+"permanent file on the disk. You can generate a hardcopy for different "
+"versions of the same problem by changing the seed. You can also change the "
+"format to \"PDF\" or \"TeX Source\". If \"PDF\" is selected, then a PDF file"
+" will be generated for download, unless there are errors. If errors occur or"
+" \"TeX Source\" is selected, then a zip file will be generated for download "
+"that contains the TeX source file and resources needed for generating the "
+"PDF file using pdflatex."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:744
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:20
+msgid ""
+"Generate hardcopies of assignments in PDF or latex format. To produce a "
+"hardcopy, one selects the users on the left and the sets on the right. All "
+"users and sets are listed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:170
 msgid "Generate hardcopy for selected sets and selected users"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:184
-#: /opt/webwork/pg/macros/problemRandomize.pl:185
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:186
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:187
 msgid "Get a new version of this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:986
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:2
 msgid "Give new password to which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1063
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:27
 msgid "Gives full credit on a single homework problem."
-msgstr ""
+msgstr "Přidělí plný počet bodů za jeden vybraný úkol."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1180
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:27
 msgid "Gives full credit on every problem in a set."
-msgstr ""
+msgstr "Přidělí plný počet bodů za celou jednu vybranou sadu."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:846
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:27
 msgid "Gives half credit on a single homework problem."
-msgstr ""
+msgstr "Přidá až polovinu bodů pro jeden vybraný úkol. Má smysl pro právě otevřená zadání."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:27
 msgid "Gives half credit on every problem in a set."
-msgstr ""
+msgstr "Přidá až polovinu bodů pro jednu vybranou sadu."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:62
 msgid "Global Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1422
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:76
 msgid "Global Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:49
 msgid "Global Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:51
 msgid ""
 "Global data on problem usage is contributed by many institutions using "
 "WeBWorK all over the world. The Usage figure is the total number of  "
@@ -3131,198 +4122,324 @@ msgid ""
 msgstr ""
 
 #. ($problemID, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1549
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1489
 msgid "Global problem %1 for set %2 not found."
 msgstr ""
 
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:334
+#. ($c->{prettyID}, $c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:378
+msgid "Global problem %1 not found for set %2."
+msgstr ""
+
+#. ($c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:142
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:372
 msgid "Global set %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2093
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:77
 msgid "Global set data will be shown instead of user specific data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:28
 msgid "Go"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:483
 msgid "Go back to Part 1"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:291
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
-#: /opt/webwork/pg/macros/compoundProblem.pl:491
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:293
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:498
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:512
 msgid "Go on to next part"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2651
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:544
 msgid "Grade"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2649
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:383
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:970
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:541
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:75
 msgid "Grade Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2446
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:651
 msgid "Grade Test"
 msgstr "Opravit Test"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:148
+msgid "Grade of Active Students"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:55
 msgid "Grade passback mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:837
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:38
 msgid "Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:236
 msgid "Grades"
 msgstr "Hodnocení"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:110
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:17
+msgid "Grades Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:115
 msgid "Grades have been saved for all current users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:221
-msgid "Grading assignment:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:28
+msgid "Grading Assignment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1062
-msgid "Greater Rod of Revelation"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:152
+msgid "Grading Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1179
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:26
+msgid "Greater Rod of Revelation"
+msgstr "Plný počet"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:26
 msgid "Greater Tome of Enlightenment"
+msgstr "Plný počet za celou sadu"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:50
+msgid ""
+"Groups types of achievements. The \"level\" and \"secret\" categories are "
+"special (described above), and categories can be used to create achievement "
+"chains."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:74
 msgid "Guest Login"
 msgstr "Vstoupit jako host"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2251
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:86
+msgid "Guest:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:33
 msgid "HTTP Headers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:682
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:35
+msgid "Hardcopy Format"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:115
 msgid "Hardcopy Format:"
 msgstr "Formát:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:270
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:285
 msgid "Hardcopy Generator"
 msgstr "Stažení tištěné verze"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:101
 msgid "Hardcopy Header"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1623
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:724
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:324
+msgid "Hardcopy Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:17
+msgid "Hardcopy Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:153
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:44
 msgid "Hardcopy Theme"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:408
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:427
 msgid "Hardcopy will always print the original version of the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:31
 msgid "Headers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1048
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:296
 msgid "Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:797
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:170
 msgid "Help Icon"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:542
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:30
+msgid ""
+"Here is a list of the variables the evaluator has access to. Unless "
+"indicated, changes to the variables will not be saved.  Evaluators are run "
+"in the same order they are listed on the achievement editor page and are "
+"only run if the achievement has not been earned. Keep this in mind when "
+"using persistent global data."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:507
 msgid "Here is a new version of your problem."
 msgstr "Toto je nová verze řešené úlohy."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:914
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:42
 msgid "Hidden"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:347
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:62
 msgid "Hide All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3663
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3718
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3760
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:384
-msgid "Hide Courses"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:17
+msgid "Hide Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:428
-msgid "Hide Hints"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:57
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:44
+msgid "Hide Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:477
 msgid "Hide Hints from Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1566
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:63
+msgid "Hide all rendered problems on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:252
 msgid "Hide this problem"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1523
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1524
 msgid "Hint:"
 msgstr "Nápověda:"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1522
 msgid "Hint: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:658
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1771
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:99
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:51
 msgid "Hints"
 msgstr "Nápověda"
 
 # Hmwk is short for Homework
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:364
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:327
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:44
 msgid "Hmwk Sets Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:779
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:80
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:108
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:19
 msgid "Homework Sets"
 msgstr "Zadání úloh"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:38
 msgid "Homework Totals"
 msgstr "Celkem"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1432
-msgid "I couldn't find the file [ACHEVDIR]/surprise_message.txt!"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:17
+msgid "Homwork Sets Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:88
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:31
+msgid "How to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1451
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:36
+msgid "I couldn't find the file [ACHIEVEMENT_DIR]/surprise_message.txt!"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:9
 msgid "Icon"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:29
 msgid "Icon File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:612
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:80
+msgid "Icon File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:24
+msgid ""
+"If \"PDF\" is selected, then a PDF file will be generated for download, "
+"unless there are errors.  If errors occur generating a PDF file or \"TeX "
+"Source\" is selected then a zip file will be generated for download that "
+"contains the TeX source file and resources needed for generating the PDF "
+"file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:37
+msgid ""
+"If \"TeX Source\" is selected, a zip file containing a TeX file and other "
+"files needed to generate a PDF hardcopy will be produced. If \"Adobe PDF\" "
+"is selected then only a PDF file will be produced."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:84
 msgid ""
 "If a password field is left blank, the student's current password will be "
 "maintained."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:42
+msgid ""
+"If selected, the file path of the problem source will be printed in the "
+"output."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:38
+msgid ""
+"If selected, this adds spaces between the fields to align the commas, which "
+"makes the columns easy to read when in text form but it can confuse some "
+"spreadsheet applications since the extra spaces violate the csv standard "
+"(although Excel handles them with no problem). This will give a visual form "
+"of the CSV file that is easy to read on the page. If you want a reliable "
+".csv file for use in any spreadsheet application unclick the \"Pad Fields\" "
+"option. You can download the .csv file immediately by clicking on the link "
+"with the filename chosen above, or you can download it using the \"File "
+"Manager\" from the scoring directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:148
+msgid ""
+"If the original problem can not be edited than the path name must be changed"
+" in order to be allowed to save the problem. Adding \"local/\" to the "
+"beginning of the original path is the default solution. All locally created "
+"and edited files will then appear in a subdirectory named \"local\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:513
 msgid ""
 "If this flag is set then this problem will count towards the grade of its "
 "parent problem.  In general the adjusted status on a problem is the larger "
@@ -3330,20 +4447,28 @@ msgid ""
 "problems which have this flag enabled."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
 msgid ""
 "If this is enabled then instructors with the ability to receive feedback "
 "emails will be notified whenever a student runs out of attempts on a problem"
-" and its children without receiving an adjusted status of 100%."
+" and its children  without receiving an adjusted status of 100%."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:334
 msgid ""
 "If this is enabled then students will be unable to attempt a problem until "
 "they have completed all of the previous problems, and their child problems "
 "if necessary."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:57
+msgid ""
+"If this is selected, a success index is listed in each csv file. The success"
+" index is a number assigned on the basis of the number of incorrect attempts"
+" (roughly equivalent to 1/the number of attempts) which seems to correlate "
+"with the relative difficulty the student had with the problem."
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:47
 msgid ""
 "If this is set, all users (including the instructor) must enter the WeBWorK "
@@ -3351,8 +4476,8 @@ msgid ""
 "they receive a message directing them back to the LMS."
 msgstr ""
 
-#. (CGI::b($r->maketext("Remember Me")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:201
+#. (tag('strong', maketext('Remember Me')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:33
 msgid ""
 "If you check %1 your login information will be remembered by the browser you"
 " are using, allowing you to visit WeBWorK pages without typing your user "
@@ -3361,273 +4486,419 @@ msgid ""
 " have direct control."
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:407
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:154
+msgid ""
+"If you click on the \"Grade Problem\" icon to the right of the problem "
+"number, then the problem will open in the manual problem grader. This page "
+"shows the rendered problem and lists all students assigned to the set and "
+"the last answer the students entered for the problem. You can then change "
+"the recorded scores for students on this problem and provide instructor "
+"feedback comments."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:148
+msgid ""
+"If you click on the \"Open in New Window\" icon to the right of the problem "
+"number, then the problem will open in the actual homework set in a new tab "
+"or window."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:425
 msgid "If you come back to it later, it may revert to its original version."
 msgstr ""
 
+#. ('<code>report_grades_data.csv</code>', '<code>report_grade.msg</code>',
+#. '<code>$COL</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:80
+msgid ""
+"If you upload your file on the web with the name: %1 and also create an "
+"email message with the name %2 with the approriate %3 variables then not "
+"only can you email the message with the embedded grades to the students, but"
+" files with those exact names are automatically appended to the \"Grades\" "
+"page seen by the students."
+msgstr ""
+
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:798
-msgid "Illegal file '%1' specified"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:337
+msgid "Illegal file \"%1\" specified"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1445
 msgid "Illegal filename contains '..'"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:73
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:63
 msgid "Import"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1291
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:65
+msgid ""
+"Import a single set or multiple sets from a set definition file. (Use the "
+"\"File Manager\" to upload/download set definition files.) The \"Shift "
+"Dates...\" option is useful for problem sets that were used from other "
+"courses and will shift all of the dates."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:16
 msgid "Import from where?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1270
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:5
 msgid "Import how many sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:31
 msgid "Import sets with names"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:5
 msgid "Import users from what file?"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:99
+msgid "Import/export achievements"
+msgstr ""
+
 #. ($count)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:516
 msgid "Imported %quant(%1,achievement)"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:25
+msgid ""
+"In both cases, one can select the sort field, the format of the display "
+"list, and the filter. \"Change Display Settings\" must be clicked to update "
+"the list."
+msgstr ""
+
 #. ($total_inprogress, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1019
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:28
 msgid "In progress: %1/%2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:47
 msgid "Inactive"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1601
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:51
+msgid "Inactive Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1503
 msgid "Inactivity time before a user is required to login again"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:42
 msgid "Include Contrib"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:35
 msgid "Include OPL"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:32
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:55
 msgid "Include Success Index"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:62
 msgid "Include percentage grades columns for all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:471
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:302
 msgid "Incorrect"
 msgstr ""
 
 #. ($total_incorrect, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1033
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:36
 msgid "Incorrect: %1/%2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:26
+msgid ""
+"Indicates the number of problems in the set. Clicking on the link opens the "
+"set detail page which allows you to modify set parameters, edit set headers,"
+" and change parameters of problems in the set such as the number of allowed "
+"attempts or the weight (credit value). You can also add, remove, view, edit,"
+" and reorder the problems in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:141
+msgid "Individual Problem Results"
+msgstr ""
+
 # Short for Initial
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:41
 msgid "Init"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:502
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:35
 msgid "Institution"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2344
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:560
 msgid "Instructor Comment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1494
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1306
 msgid "Instructor Feedback:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:311
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:17
+msgid "Instructor Links Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:29
 msgid "Instructor Tools"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1228
-msgid "Instructor solution preview: show the student solution after due date."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:17
+msgid "Instructor Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:90
+msgid "Instructor:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:377
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:326
 msgid "Invalid Reply-to address."
 msgstr ""
 
 #. ($output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:187
 msgid ""
-"Invalid file name. The file name \"%1\" does not have a \".msg\" extension "
-"All email file names must end in the extension \".msg\" choose a file name "
-"with a \".msg\" extension. The message was not saved."
+"Invalid file name \"%1\". All email file names must end with the \".msg\" "
+"extension.  Choose a file name with the \".msg\" extension. The message was "
+"not saved."
 msgstr ""
 
 #. ($headerType)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1951
 msgid "Invalid headerType %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:177
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/XMLRPC.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:173
 msgid "Invalid user ID or password."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2244
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:34
+msgid ""
+"It is important that students enter an email address or they will not "
+"recieve any of the important emails sent by the instructor. The email "
+"address will only be present on the page if the user has permission to "
+"change the email address."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:20
+msgid "It lists the homework problem sets available for the students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:472
 msgid "Jump to Problem:"
 msgstr "Přejít na úlohu:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:867
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:939
 msgid "Just-In-Time parameters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:130
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:85
+msgid "Key Map"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:14
 msgid "Key Map:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:93
 msgid "Keywords:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "LAST NAME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1477
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:119
 msgid "LOCAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:100
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:103
 msgid "LTI"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1548
-msgid "Language (refresh page after saving changes to reveal new language.)"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:25
+msgid "LTI Grade Mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:758
-msgid "Last"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:460
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:75
+msgid "LTI Grade Update"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:386
-msgid "Last Answer"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:17
+msgid "LTI Grade Update Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:604
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:231
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2001
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:828
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:857
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:915
-msgid "Last Name"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:16
+msgid "LTI grade passback is not enabled for this course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:792
-msgid "Last column of merge file"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:63
+msgid "LTI update of all users and sets queued."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:785
-msgid "Last name"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:64
+msgid "LTI update of all users queued."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:242
-msgid "Latest Answers"
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:58
+msgid "LTI update of set %1 queued."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1603
-msgid ""
-"Length of time, in seconds, a user has to be inactive before he is required "
-"to login again.<p>This value should be entered as a number, so as 3600 "
-"instead of 60*60 for one hour"
+#. ($userID, $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:56
+msgid "LTI update of user %1 and set %2 queued."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:845
-msgid "Lesser Rod of Revelation"
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:60
+msgid "LTI update of user %1 queued."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:965
-msgid "Lesser Tome of Enlightenment"
+#: /opt/webwork/webwork2/conf/defaults.config:1450
+msgid "Language (refresh page after saving changes to reveal new language.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:141
-msgid "Level Progress:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:140
+msgid "Last"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:881
-msgid "Level:"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:460
+msgid "Last Answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:912
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2060
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:433
-msgid "Library Browser"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:31
+msgid "Last Full Update"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1977
-msgid "List of display modes made available to students"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:25
+msgid "Last Name"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:115
+msgid "Last column of merge file"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:108
+msgid "Last name"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:237
+msgid "Latest Answers"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1505
 msgid ""
-"List of e-mail addresses to which e-mail can be sent by a problem. "
-"Professors need to be added to this list if questionaires are used, or other"
-" WeBWorK problems which send e-mail as part of their answer mechanism."
+"Length of time, in seconds, a user has to be inactive before he is required "
+"to login again. This value should be entered as a number, so as 3600 instead"
+" of 60*60 for one hour."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:26
+msgid "Lesser Rod of Revelation"
+msgstr "Aspoň půlku"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:26
+msgid "Lesser Tome of Enlightenment"
+msgstr "Aspoň půlku za sadu"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:15
+msgid "Level Progress:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:77
+msgid "Level:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:17
+msgid "Library Broswer Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:359
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:52
+msgid "Library Browser"
+msgstr ""
+
+#. ($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:30
+msgid "Link to Edit Page for %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:25
+msgid "Links to pages that give information about writing problems:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1879
+msgid "List of display modes made available to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:759
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:774
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:89
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:96
 msgid "List of insertable macros"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1826
+#: /opt/webwork/webwork2/conf/defaults.config:1728
 msgid "List of options for Show Me Another button"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1713
+#: /opt/webwork/webwork2/conf/defaults.config:1615
 msgid "List of sets excluded from achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1483
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:56
+msgid "Live equation rendering"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:144
+msgid "Loading..."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:122
 msgid "Local Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:41
 msgid "Local Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1504
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:136
 msgid "Local Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:105
 msgid "Local Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1467
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:114
 msgid ""
 "Local data is generated when your systems admin runs the script update-OPL-"
 "statistics."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1460
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:107
 msgid ""
 "Local data on problem usage is generated and maintained by your institution."
 " The Usage figure is the total number of local individuals who have attemped"
@@ -3636,42 +4907,61 @@ msgid ""
 "likely bug free."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:115
 msgid "Location"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3501
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1854
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1890
 msgid ""
 "Location %1 does not exist in the WeBWorK database.  Please check your input"
 " (perhaps you need to reload the location management page?)."
 msgstr ""
 
 #. ($locationID, join(', ', @addresses)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1742
 msgid "Location %1 has been created, with addresses %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3353
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1798
 msgid "Location deletion requires confirmation."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3409
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:43
 msgid "Location description:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3089
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:37
 msgid "Location name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:159
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:27
+msgid ""
+"Locations are a list of ip addresses.  Ip addresses can be a single address "
+"(e.g. 192.168.1.101), a range of ip address (e.g. "
+"192.168.1.101-192.168.1.150), or an ip address mask (e.g. 192.168.1.0/24). "
+"Enter one ip address per line, using as many lines as needed for each "
+"location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:32
+msgid ""
+"Locations are edited by adding new ip addresses to the location, or deleting"
+" existing address.  You must select the confirm checkbox when deleting a "
+"location, and this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:43
+msgid "Locations of files:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:18
 msgid "Log In Again"
 msgstr "Znovu se přihlásit"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1124
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:11
 msgid "Log Out"
 msgstr "Odhlásit"
 
@@ -3679,368 +4969,456 @@ msgstr "Odhlásit"
 #. ($rename_oldCourseID)
 #. ($rename_newCourseID)
 #. ($new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1458
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1541
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2666
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:913
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:704
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:780
 msgid "Log into %1"
 msgstr ""
 
-#. (HTML::Entities::encode_entities($prettyUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1122
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1130
+#. ($userName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:9
 msgid "Logged in as %1."
 msgstr "Přihlášen jako %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:790
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:181
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:187
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:113
 msgid "Login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:58
 msgid "Login Info"
 msgstr "Instrukce pro přihlášení"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:187
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:815
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1980
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:291
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:855
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:884
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:913
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:36
 msgid "Login Name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:18
 msgid "Login Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:6
+msgid "Login:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:225
 msgid "Logout"
 msgstr "Odhlášení"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Macro"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:763
-msgid "Main Menu"
-msgstr "Hlavní nabídka"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:97
+msgid ""
+"Macro (\".pl\") files containing additional functionality for your course "
+"can be stored here."
+msgstr ""
+
+#. ($filePath)
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:29
+msgid "Macro file %1 not found."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:369
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:46
 msgid "Make Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:27
 msgid "Make changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1115
-msgid "Make these changes in  course:"
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:15
+msgid "Make these changes in course: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:137
+msgid ""
+"Makes a new copy of the file you are editing at the location relative to the"
+" course's templates ([TMPL]) directory. You may choose to replace the "
+"current problem in the current set, append to the end to then end of the "
+"current set as a new problem, or create a problem that is not attached to a "
+"problem set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3040
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:1
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:46
 msgid "Manage Locations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:748
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:394
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:17
+msgid "Manage Locations Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:20
+msgid ""
+"Manage achievements for the course.  The actions allow one to edit, assign, "
+"import, export, score, create, or delete achievements.  The action form is "
+"at the top to select the desired action and options to perform when the "
+"submit button is pressed.  Below the action form is the list of all the "
+"achievements, ordered by their achievement \"Number\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:56
+msgid "Manage administration course files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:50
+msgid ""
+"Manage instructors.  When instructors are added to a newly created course, "
+"they are also added to the admin course with username \"userID_courseID\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:344
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:192
 msgid "Manual Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:233
-msgid "Mark All"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:17
+msgid "Manual Grader Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr',
+#. format_set_name_display($c->stash->{set}->set_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:205
+msgid "Manual Grader for %1: Problem %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:77
+msgid ""
+"Manually initiate an LTI grade passback for selected sets or users. This "
+"link is only visible if LTI grade passback is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:175
+msgid ""
+"Many of these editing activities can also be done more quickly from the "
+"\"Instructor Tools\" page where students and homework sets can be selected "
+"simultaneously. The \"Instructor Tools\" page is useful for quick editing of"
+" one or two students. The initial setup of the class can be done best from "
+"this page. Importing and exporting class lists can only be done from this "
+"page. Deleting students can only be done from this page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:120
 msgid "Mark Correct"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2822
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:598
 msgid "Mark Correct?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:681
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:19
 msgid "Match on what? (separate multiple IDs with commas)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:499
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:85
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:36
 msgid "Math Objects"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:327
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:377
 msgid "Max attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:380
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:24
 msgid "Max. Shown:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1817
+#: /opt/webwork/webwork2/conf/defaults.config:1719
 msgid ""
 "Maximum times Show me Another can be used per problem (-1 => unlimited)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:606
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:4
+msgid "Merge file data:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:24
 msgid "Merge file:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:288
 msgid "Message"
 msgstr "Zpráva"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:578
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:13
 msgid "Message file:"
 msgstr ""
 
-#. ($emailDirectory, $output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:357
-msgid "Message saved to file <code>%1/%2</code>."
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:300
+msgid "Message saved to file %1."
 msgstr ""
 
-#. ($recipient, $ur->email_address)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:995
+#. ($recipient, $user_record->email_address)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:98
 msgid "Message sent to %1 at %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2249
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2324
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:121
+msgid "Message was blank."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:48
+msgid ""
+"Messages can be saved to a message file (which must end in the \".msg\" "
+"extension).  Use the \"Message file\" drop down menu to select which message"
+" file to load, or \"None\" to use a blank message. To save a new message, "
+"use the \"Save as\" button after entering in a valid filename.  The \"Save "
+"as\" button will not overwrite currently saved messages.  To edit a "
+"currently saved message first select it using the drop down menu, then click"
+" the \"Save\" button to save any changes.  Use the \"File Manager\" to "
+"delete messages, located in the \"[TMPL]/email\" directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:22
 msgid "Method"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3284
+#: /opt/webwork/webwork2/conf/defaults.config:2003
+msgid "Method to enter problem scores in the single problem manual grader"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1668
 msgid ""
 "Missing required input data. Please check that you have filled in all of the"
 " create location fields and resubmit."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1555
+#: /opt/webwork/webwork2/conf/defaults.config:1457
 msgid ""
 "Mode in which the LANG and DIR settings for a single problem are determined."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1557
-msgid ""
-"Mode in which the LANG and DIR settings for a single problem are "
-"determined.<p>The system will set the LANGuage attribute to either a value "
-"determined from the problem, a course-wide default, or the system default, "
-"depending on the mode selected. The tag will only be added to the DIV "
-"enclosing the problem if it is different than the value which should be set "
-"in the main HTML tag set for the entire course based on the course "
-"language.<p>There are two options for the DIRection attribute: \"ltr\" for "
-"left-to-write sripts, and \"rtl\" for right-to-left scripts like Arabic and "
-"Hebrew.<p>The DIRection attribute is needed to trigger proper display of the"
-" question text when the problem text-direction is different than that used "
-"by the current language of the course. For example, English problems from "
-"the library browser would display improperly in RTL mode for a Hebrew "
-"course, unless the problen Direction is set to LTR.<p>The feature to set a "
-"problem language and direction was only added in 2018 to the PG language, so"
-" most problems will not declare their language, and the system needs to fall"
-" back to determining the language and direction in a different manner. The "
-"OPL itself is all English, so the system wide fallback is to en-US in LTR "
-"mode.<p>Since the defaults fall back to the LTR direction, most sites should"
-" be fine with the \"auto::\" mode, but may want to select the one which "
-"matches their course language. The mode \"force::ltr\" would also be an "
-"option for a course which runs into trouble with the \"auto\" "
-"modes.<p>Modes:<br><ul><li>\"none\" prevents any additional LANG and/or DIR "
-"tag being added. The browser will use the main setting which was applied to "
-"the entire HTML page. This is likely to cause trouble when a problem of the "
-"other direction is displayed.</li><li>\"auto::\" allows the system to make "
-"the settings based on the language and direction reported by the problem (a "
-"new feature, so not set in almost all existing problems) and falling back to"
-" the expected default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" "
-"allows the system to make the settings based on the language and direction "
-"reported by the problem (a new feature, so not set in almost all existing "
-"problems) but falling back to the language with the given LangCode and the "
-"direction Dir when problem settings are not available from "
-"PG.</li><li>\"auto::Dir\" for problems without PG settings, this will use "
-"the default en=english language, but force the direction to Dir. Problems "
-"with PG settings will get those settings.</li><li>\"auto:LangCode:\" for "
-"problems without PG settings, this will use the default LTR direction, but "
-"will set the language to LangCode.Problems with PG settings will get those "
-"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
-" by the PG code of the problem, and will force the system to set the "
-"language with the given LangCode and the direction to Dir for <b>all</b> "
-"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
-"PG code of the problem, and will force the system to set the direction to "
-"Dir for <b>all</b> problems, but will avoid setting any language attribute "
-"for individual problem.</li></ul>"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2695
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:443
 msgid "Move"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2231
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:457
 msgid "Move to Page:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2226
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:452
 msgid "Move to Problem:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:26
+msgid ""
+"Multiple sets may be assigned to the users by holding down the shift key or "
+"the ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:27
+msgid ""
+"Multiple users or sets may be selected by holding down the shift key or the "
+"ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:36
 msgid "My Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1412
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:26
 msgid "Mysterious Package (with Ribbons)"
 msgstr ""
 
 # Short for Number of Fields
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:213
 msgid "NO OF FIELDS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1484
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:741
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:113
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:135
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:29
 msgid "Name"
 msgstr "Název"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:174
 msgid "Name for new set here"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1528
+#: /opt/webwork/webwork2/conf/defaults.config:1430
 msgid "Name of course information file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1107
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:77
+msgid "Name of the evaluator file used to evaluate the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:81
+msgid "Name of the image used for the achievement icon."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:4
 msgid "Name the new set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1691
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:45
+msgid "Name:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:29
 msgid "Necromancers Charm"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:343
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:205
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:393
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:35
 msgid "Never"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:371
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:54
 msgid "New File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:372
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:55
 msgid "New Folder"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:30
 msgid "New Name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2067
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:3
 msgid "New Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:131
-msgid "New Version"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+msgid "New Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
 msgid "New file name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
 msgid "New folder name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:577
 msgid "New passwords saved"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1078
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:36
 msgid "New set name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1357
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1010
 msgid "Next Problem"
 msgstr "Další úloha"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1181
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2164
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:40
+msgid "Next Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:98
 msgid "Next page"
 msgstr ""
 
-#. ($self->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:620
+#. (% $c->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:142
 msgid "Next test will be available by %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2452
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:134
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:144
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:183
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:483
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:510
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:142
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:68
 msgid "No"
 msgstr "Ne"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:635
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:116
 msgid "No Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2324
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:216
 msgid "No Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:117
+msgid "No Sender specified."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:23
 msgid "No Target Set Selected"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:335
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:38
 msgid "No achievement badges have been assigned yet."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1521
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:77
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:37
 msgid "No achievements shown.  Create an achievement!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:90
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:2
+msgid "No achievements shown.  Select an achievement to edit!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:61
 msgid "No action taken"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:141
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:140
 msgid ""
 "No authentication method found for your request.  If this recurs, please "
 "speak with your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:940
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:361
 msgid "No change made to any set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
 msgid ""
 "No changes specified.  You must mark the checkbox of the item(s) to be "
 "changed and enter the change data."
@@ -4050,1379 +5428,1811 @@ msgstr ""
 msgid "No changes were saved!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2462
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:50
 msgid "No course archives found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2898
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:32
 msgid "No course id defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1561
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:932
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:67
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:76
 msgid "No courses found"
 msgstr ""
 
 #. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:593
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:675
 msgid "No data exists for set %1 and problem %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:10
+msgid "No e-mail recipients are listed for this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:169
 msgid "No filename was specified for saving!  The message was not saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:340
 msgid "No guest logins are available. Please try again in a few minutes."
 msgstr "Počet hostů je omezen a nejsou volné prostředky pro přihlášení dalšího hosta. Zkuste prosím později."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3522
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1877
 msgid "No location specified to edit. Please check your input data."
 msgstr ""
 
 #. ($badID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1788
 msgid "No location with name %1 exists in the database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3206
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:149
 msgid "No locations are currently defined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:342
 msgid "No merge data file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:612
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:18
+msgid "No merge data found"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:164
+msgid "No merge data found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:8
+msgid "No merge file selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:135
 msgid "No more tests available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:270
 msgid ""
 "No new Achievement ID specified.  No new achievement created.  File not "
 "saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:63
 msgid "No problems matched the given parameters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:25
+msgid "No recipients selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:334
 msgid ""
 "No recipients selected. Please select one or more recipients from the list "
 "below."
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2044
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:49
 msgid "No record for global set %1."
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2046
-msgid "No record for user %1."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
 msgid "No record found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1166
-msgid "No set created."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:12
 msgid "No sets in this course yet"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1010
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:159
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
 msgid "No sets selected for scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2764
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:46
 msgid ""
 "No sets shown.  Choose one of the options above to list the sets in the "
 "course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1942
 msgid "No source filePath specified"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1327
 msgid "No source_file for problem in .def file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2099
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:87
 msgid ""
-"No students shown.  Choose one of the options above to list the students in "
+"No students shown. Choose one of the options above to list the students in "
 "the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:246
 msgid "No submissions. Over time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:278
 msgid "No tests taken."
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:594
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:676
 msgid "No user specific data exists for user %1"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2031
 msgid "No valid changes submitted for location %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:275
-msgid "No versions of this assignment have been taken."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:771
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:263
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:241
 msgid "No versions of this test have been taken."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:562
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:252
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:17
 msgid "None"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:681
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2463
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:763
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:52
 msgid "None Specified"
 msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2089
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:73
 msgid "None of the selected users are assigned to this set: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:33
 msgid "Not logged in."
 msgstr "Nepřihlášen."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1569
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:4
 msgid "Note"
 msgstr "Poznámka"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:381
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:55
+msgid ""
+"Note that if there are errors, they will be shown at the top of the page. In"
+" some cases, a hard copy is still generated and a link called \"Download "
+"Hardcopy\" appears. In addition, the latex file, log and error files are "
+"generated which can be used in troubleshooting."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:93
+msgid ""
+"Note that if you set the permission level of a user to something other than "
+"\"Student\", you may also want to set the status of the user to "
+"\"Observer\".  Users with the \"Observer\" status are not included in "
+"statistics, scoring, or instructor emails."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:28
+msgid ""
+"Note that some settings require an additional page load after \"Save "
+"Changes\" is clicked in order to take effect.  This is true for a theme "
+"change for example."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:396
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:422
 msgid "Note:"
 msgstr "Poznámka:"
 
-#. (CGI::i($pg->{result}{msg})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2350
+#. (tag('i', maketext('You are in the Reduced Scoring Period.  All work counts
+#. for [_1]% of the original.',
+#. $ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#. (tag('i', $pg->{result}{msg})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:572
 msgid "Note: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2482
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:686
 msgid ""
 "Note: grading the test grades all problems, not just those on this page."
 msgstr "Poznámka: opravují se všechny úlohy v testu, nejenom ty zobrazené na aktuální straně."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1460
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1485
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:768
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:59
+msgid "Now"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:19
 msgid "Number"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:242
 msgid "Number of Graded Submissions per Test (0=infty)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
 msgid "Number of Problems per Page (0=all)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:95
+msgid "Number of Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:257
 msgid "Number of Tests per Time Interval (0=infty)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1833
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2435
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:54
+msgid "Number:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1181
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:912
 msgid "OK"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1464
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:17
+msgid "OPL Problem Levels Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:26
 msgid "Oil of Cleansing"
 msgstr ""
 
+#. ('<code>pdflatex</code>', '<code>hardcopy.tex</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:49
+msgid ""
+"Once \"Generate Hardcopy for selected sets and selected users\" is clicked a"
+" file in the selected hardcopy format will be generated and offered for "
+"download. If PDF output was selected, a single PDF file is generated. If TeX"
+" output is selected, a zip file is generated that contains all files needed "
+"to generated the hardcopy PDF file via %1. The main TeX file is called %2."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:84
 msgid "One Column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:314
+msgid "Only Start"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:289
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:303
 msgid "Only after set answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1892
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:87
+msgid ""
+"Only present for JITAR sets. Collapse JITAR nesting problem groups to the "
+"top row of information about a problem. Note that the nesting of a single "
+"problem group can be collapsed by clicking on the down arrow to the right of"
+" the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:80
+msgid ""
+"Only present for JITAR sets. Expand JITAR nested problem groups that have "
+"been collapsed. Note that the nesting of a single problem group can be "
+"expanded by clicking on the right arrow to the right of the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1794
 msgid ""
 "Only this permission level and higher get buttons for sending e-mail to the "
 "instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:39
 msgid "Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:422
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:763
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:810
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:62
 msgid "Open Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1098
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:42
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:32
 msgid "Open Problem Library"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2417
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:272
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:525
 msgid "Open in New Window"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1263
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1617
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:29
 msgid "Open in new window"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:491
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:320
 msgid "Open, closes %1."
 msgstr "Otevřeno. Uzávěrka je %1."
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:489
-msgid "Open, complete by %1."
-msgstr "Otevřeno, termín odevzdání %1."
-
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:300
 msgid "Open, due %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:433
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
 msgid "Open."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:431
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:268
 msgid "Open. Submitted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:31
 msgid "Open:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:115
 msgid "Opens"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:27
 msgid "Opens any homework set for 24 hours."
-msgstr ""
+msgstr "Otevře na 24 hodin libovolnou sadu úloh."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1686
+#: /opt/webwork/webwork2/conf/defaults.config:1588
 msgid "Optional Modules"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:265
 msgid "Order Problems Randomly"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:50
+msgid "Other Options"
+msgstr ""
+
 # Context is "7 Out Of 10"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:405
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:777
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:150
 msgid "Out Of"
+msgstr "Z kolika"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:85
+msgid "Overall Results"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:93
+msgid "Overall Set Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:122
+msgid "Overall Success Index"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1024
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:470
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:481
 msgid "Overwrite"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:437
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:100
 msgid "Overwrite existing files silently"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:41
+msgid "PDF"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:69
 msgid "PG Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:827
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer.html.ep:1
+msgid "PG POD"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:17
+msgid "PG Problem Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:708
 msgid "PG debug messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:829
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:716
 msgid "PG internal errors"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:818
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:109
+msgid ""
+"PG markdown syntax used to format WeBWorK questions. This interactive lab "
+"can help you to learn the techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:692
 msgid "PG question failed to render"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:826
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:706
 msgid "PG question processing error messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:828
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:712
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:128
 msgid "PG warning messages"
 msgstr ""
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:511
-msgid "PGLab"
-msgstr ""
-
-# Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:98
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:47
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:58
 msgid "PGML"
 msgstr ""
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:91
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:40
 msgid "POD"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2309
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2249
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:200
+msgid "POD Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:208
+msgid "POD Viewer"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1515
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:526
 msgid "PREVIEW ONLY -- ANSWERS NOT RECORDED"
 msgstr "POUZE NÁHLED -- ODPOVĚDI SE NEUKLÁDAJÍ"
 
 # Problem Number
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:215
 msgid "PROB NUMBER"
 msgstr ""
 
 # Problem Value
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:218
 msgid "PROB VALUE"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:205
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:36
 msgid "Pad Fields"
 msgstr ""
 
-#. (timestamp($self)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1255
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:28
+msgid "Page Contents"
+msgstr ""
+
+#. ($c->timestamp)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:1
 msgid "Page generated at %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:568
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:81
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:71
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:56
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:25
 msgid "Password"
 msgstr "Heslo"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:976
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:13
 msgid "Password (Leave blank for regular proctoring)"
 msgstr ""
 
-#. ($studentUser, CGI::span({ dir => 'ltr' },
-#. format_set_name_display($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:498
+#. ($studentUser, tag('span', dir => 'ltr', format_set_name_display($setName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:13
 msgid "Past Answers for %1, set %2, problem %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:8
 msgid "Percent"
 msgstr "Procenta"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:562
-msgid "Percentage of Active Students with Correct Answers"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:94
+msgid "Percent Ranges"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+msgid "Percent Score"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:535
+msgid "Percent of Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:788
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:206
 msgid ""
 "Percentile cutoffs for number of attempts. The 50% column shows the median "
 "number of attempts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2056
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:834
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:863
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:921
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:58
+msgid ""
+"Percentile cutoffs for student's score and success index. The 50% column "
+"shows the median number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:50
 msgid "Permission Level"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1869
+#: /opt/webwork/webwork2/conf/defaults.config:1771
 msgid "Permissions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1052
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:24
 msgid "Pick a target set above to add this problem to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:54
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:21
 msgid "Pick date and time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3804
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
 msgid ""
 "Place a file named \"hide_directory\" in a course or other directory and it "
 "will not show up in the courses list on the WeBWorK home page. It will still"
 " appear in the Course Administration listing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1107
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should be given full credit."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should have half credit added."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given full credit."
-msgstr ""
+msgstr "Zvolte prosím sadu zadání a číslo úlohy, která má být označena jako správně zodpovězená."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:889
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given half credit."
-msgstr ""
+msgstr "Zvolte prosím sadu zadání a číslo úlohy, která se má navýšit bodový zisk až o polovinu maximálního počtu bodů."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:654
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its incorrect attempt count reset."
-msgstr ""
+msgstr "Zvolte prosím sadu zadání a číslo úlohy, u které má být vynulován počet neplatných pokusů"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its weight doubled."
-msgstr ""
+msgstr "Zvolte prosím sadu zadání a číslo úlohy, u které má být zdvojnásobeno bodové hodnocení."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1315
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:60
 msgid ""
 "Please choose the set, the problem you would like to copy, and the problem "
 "you would like to copy it to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:399
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:19
 msgid "Please correct the following errors and try again:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:698
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:28
 msgid "Please enter in a value to match in the filter field."
 msgstr ""
 
-#. (CGI::b($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:197
+#. (tag('b', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:28
 msgid "Please enter your username and password for %1 below:"
 msgstr "Zadejte Vaše vstupní údaje pro přístup do předmětu %1:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1778
 msgid "Please provide a location name to delete."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:233
 msgid "Please select action to be performed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:183
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
 msgid "Please select at least one set and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
 msgid "Please select at least one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:165
 msgid "Please select at least one user and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:35
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:31
 msgid "Please select at least one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:28
 msgid "Please select at most one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:30
 msgid "Please select exactly one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:29
 msgid "Please select exactly one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:574
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1016
 msgid "Please specify a file to save to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:37
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
 msgid "Please specify a homework set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:38
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
 msgid ""
 "Please use only letters, digits, dashes, underscores, and periods in your "
 "set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1462
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1184
+msgid ""
+"Please use radio buttons to choose the method for saving this file. Uknown "
+"saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:165
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:169
+msgid "Point Value"
+msgstr ""
+
+#. ($grader->{problem_value})
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:92
+msgid "Point Value (0 - %1):"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:21
 msgid "Points"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:609
-msgid "Potion of Forgetfulness"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:62
+msgid "Points:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1423
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:26
+msgid "Potion of Forgetfulness"
+msgstr "Nápoj zapomění"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:2
 msgid "Prepare which sets for export?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2054
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2073
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:268
 msgid "Press \"Grade Test\" now!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2049
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:244
 msgid "Press \"Grade Test\" soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:213
-msgid "Preview Comment"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:69
 msgid "Preview Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:314
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1840
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:11
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:99
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:35
 msgid "Preview My Answers"
 msgstr "Náhled odpovědí"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2440
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:646
 msgid "Preview Test"
 msgstr "Náhled Testu"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1340
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:41
+msgid ""
+"Preview the message before sending using the \"Preview Message\" button.  "
+"The preview shows the email that would be sent to the first selected student"
+" or the instructor if no students were selected.  The preview will also list"
+" all of the students that would receive their own personalized message.  If "
+"a merge file was selected, the preview will also indicate which (if any) "
+"recipient's merge file data could not be found."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:991
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:995
 msgid "Previous Problem"
 msgstr "Předchozí úloha"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2157
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:94
 msgid "Previous page"
 msgstr "Předchozí strana"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2149
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:45
+msgid "Primary Actions"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:355
 msgid "Print Test"
 msgstr ""
 
 # Short for Problem
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2088
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:287
 msgid "Prob"
 msgstr "Úloha"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:670
-msgid "Problem #"
-msgstr "Úloha #"
-
-#. ($prettyProblemID)
-#. ($problemNumber)
 #. (join('.', @seq)
 #. ($problemID)
-#. ($prettyProblemIDs{$probID})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:831
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:834
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:897
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:438
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:800
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:956
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:964
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:973
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:933
+#. ($problemNumber)
+#. ($_->{prettyID})
+#. ($c->{prettyID})
+#. ($probID)
+#. ($c->{setRecord}->assignment_type eq 'jitar' ? join('.',
+#. jitar_id_to_seq($_)
+#. ($set->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)
+#. ($prettyProblemID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:831
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:842
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:853
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:57
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/siblings.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:40
 msgid "Problem %1"
 msgstr "Úloha %1"
 
-#. ($problemNumber)
-#. ($prettyID)
-#. ($versioned ? $versioned : $MergedProblem->problem_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1419
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1421
+#. ($i + 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:535
 msgid "Problem %1."
 msgstr "Úloha %1."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1974
-msgid "Problem Display/Answer Checking"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:75
+msgid "Problem (\".pg\") files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:451
-msgid "Problem Editor"
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:38
+msgid "Problem Display Settings"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1697
+#: /opt/webwork/webwork2/conf/defaults.config:1876
+msgid "Problem Display/Answer Checking"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:50
+msgid "Problem Editor"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:29
 msgid "Problem Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1002
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:999
 msgid "Problem List"
 msgstr "Seznam úloh"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1119
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:666
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:783
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:75
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:159
 msgid "Problem Number"
 msgstr "Číslo úlohy"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:156
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:160
+msgid "Problem Paths"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:140
 msgid "Problem Score (%):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:30
 msgid "Problem Techniques"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:705
-msgid "Problem Viewer"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:239
+msgid ""
+"Problem has a different source file than the currently rendered problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:233
+msgid "Problem has an essay answer that needs to be graded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1943
 msgid "Problem source is drawn from a grouping set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:406
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2494
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:445
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:827
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:835
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:896
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:801
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:89
+msgid ""
+"Problem source is drawn from a grouping set and can not be directly rendered"
+" or edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:336
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:9
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:32
 msgid "Problems"
 msgstr "Úlohy"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:25
 msgid "Problems Added"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:59
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:54
 msgid "Problems for all students have been unassigned."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:57
 msgid "Problems for selected students have been reassigned."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:51
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:46
 msgid "Problems have been assigned to all current users."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:25
+msgid ""
+"Problems with this rating should only require direct memory of a fact. "
+"Examples might be a specific value of a function, or the statement of a "
+"definition. Very few WeBWorK problems fall into this category."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:93
 msgid "Proctor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:282
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:92
 msgid "Proctor Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:258
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:71
 msgid "Proctor Username"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:193
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:3
+msgid "Proctor authorization requested for a nonexistent set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:8
 msgid "Proctor authorization required."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:231
-msgid "Proctored Gateway Quiz %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:88
+msgid "Proctor:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:265
+msgid "Proctored Test %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:241
-msgid "Proctored Gateway Quiz %2 Proctor Login"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:272
+msgid "Proctored Test %2 Proctor Login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:981
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:318
+msgid ""
+"Proctored tests always require authorization to start the test. \"Both Start"
+" and Grade\" will require login proctor authorization to start and grade "
+"proctor authorization to grade. \"Only Start\" requires grade proctor "
+"authorization to start and no authorization to grade."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:18
 msgid ""
-"Proctored tests require proctor authorization to start and to grade.  "
 "Provide a password to have a single password for all students to start a "
 "proctored test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:56
 msgid "Publish"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:31
+msgid ""
+"Quick access to many instructor tools, including <strong>Reset "
+"passwords</strong>, <strong>Act as student</strong>, <strong>Assign "
+"individual sets</strong> and <strong>Edit individual due dates</strong>."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "RECITATION"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1333
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:199
 msgid "Randomize"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:13
 msgid "Randomize Seed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:101
 msgid "Read only"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:67
 msgid "Really delete the items listed above?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:201
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:212
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:804
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2038
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:298
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:832
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:861
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:890
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:919
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:184
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:42
 msgid "Recitation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:194
+#. ($recitation)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:125
+msgid "Recitation %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:21
+msgid "Recitation:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:38
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:46
 msgid "Record Scores for Single Sets"
 msgstr ""
 
-#. ($studentName)
-#. ($self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:183
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:190
+#. ($studentID)
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:8
 msgid "Record for user %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Reduced Scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:67
 msgid "Reduced Scoring Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2523
-msgid "Reduced Scoring Disabled"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
+msgid "Reduced Scoring Enabled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2522
-msgid "Reduced Scoring Enabled"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:33
+msgid "Reduced Scoring Period"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:314
 msgid "Reduced credit can still be earned until %1."
 msgstr ""
 
 # Short for "Reduced Scoring:"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:32
 msgid "Reduced:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:153
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:373
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:56
 msgid "Refresh"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1646
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1943
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2000
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3713
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3755
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:56
 msgid "Refresh Listing"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:190
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:200
 msgid "Relax IP restrictions when?"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:88
+msgid "Reload the page to see backup files that have been made."
+msgstr ""
+
 # Context is "Attempts Remaining"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:14
 msgid "Remaining"
 msgstr "Zbývá"
 
 #. ('00:00:00')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:254
 msgid "Remaining time: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:61
 msgid "Remember Me"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:546
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:514
 msgid "Remember to return to your original problem when you're finished here!"
 msgstr "Nezapomeňte se odsud vrátit k původní otázce!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1020
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:466
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:72
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:41
 msgid "Rename"
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1302
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:62
 msgid "Rename %1 to %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:378
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:927
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:73
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:34
 msgid "Rename Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:17
+msgid "Rename Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:22
+msgid "Rename Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
 msgid "Rename file as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2727
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:463
 msgid "Render"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:344
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:59
 msgid "Render All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2720
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:461
 msgid "Render Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2501
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:60
+msgid ""
+"Render all problems on the page. This does not reload the page or save or "
+"reset changes."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:106
+msgid ""
+"Render or re-render the problem, course info file, or set header being "
+"edited. This does not change the permanent file on the disk. You can view "
+"different versions of the same problem by changing the seed. You can also "
+"change the manner in which the mathematics is typeset. If \"Open in new "
+"window\" is checked, then the problem will open in a new tab or window "
+"showing the problem as it will be rendered for students in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:132
+msgid "Rendering Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:341
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:53
 msgid "Renumber Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:55
+msgid ""
+"Renumber problems consecutively starting from 1. This renumbering is not "
+"saved until \"Save Changes\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:103
+msgid ""
+"Renumber problems in the set consecutively starting from one. In the process"
+" of deleting problems, the numbering can be made non-consecutive. This is "
+"useful to clean up the problem numbering."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:31
 msgid ""
-"Reopens any gateway test for an additional 24 hours. This allows you to take"
-" a test even if the close date has past. This item does not allow you to "
-"take additional versions of the test."
+"Reopens any test for an additional 24 hours. This allows you to take a test "
+"even if the close date has past. This item does not allow you to take "
+"additional versions of the test."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:118
+msgid "Reordering Problems"
 msgstr ""
 
-#. (CGI::strong(                                                   CGI::span({
-#. dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1829
+#. (tag(                                           'strong',
+#. c(                                                      tag('span', dir =>
+#. 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:58
 msgid "Replace current problem: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:13
 msgid "Replace which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:637
+#. ($composite_id, $oldUser->status)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:448
+msgid "Replacing old data for %1: status: %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:42
 msgid "Reply-To:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:528
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:123
 msgid "Report Bugs in this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1073
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:305
 msgid "Report bugs"
 msgstr "Nahlásit chybu"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:128
+msgid ""
+"Report bugs in a WeBWorK question/problem using this link. The very first "
+"time you do this you will need to register with an email address so that "
+"information on the bug fix can be reported back to you."
+msgstr ""
+
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2825
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1530
 msgid "Report for course %1:"
 msgstr ""
 
-#. ($rename_oldCourseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2122
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:3
 msgid "Report on database structure for course %1:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1829
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:8
 msgid "Request New Version"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2246
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2321
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:19
 msgid "Request information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1972
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1220
 msgid "Request new version now."
 msgstr ""
 
+#. ($setName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:486
+msgid ""
+"Requested set \"%1\" is a proctored test, but no valid proctor authorization"
+" has been obtained."
+msgstr ""
+
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:399
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:422
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:425
 msgid "Requested set '%1' could not be found in the database for user %2."
 msgstr "Požadované zadání '%1' pro uživatele %2 nebylo nalezeno v databázi."
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:469
-msgid ""
-"Requested set '%1' is a homework assignment but the gateway/quiz content "
-"generator %2 was called.  Try re-entering the set from the problem sets "
-"listing page."
-msgstr ""
-
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:484
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:472
 msgid ""
-"Requested set '%1' is a proctored test/quiz assignment, but no valid proctor"
-" authorization has been obtained."
+"Requested set '%1' is a homework assignment but the test content generator "
+"%2 was called.  Try re-entering the set from the problem sets listing page."
 msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:463
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:466
 msgid ""
-"Requested set '%1' is a test/quiz assignment but the regular homework "
-"assignment content generator %2 was called.  Try re-entering the set from "
-"the problem sets listing page."
+"Requested set '%1' is a test but the regular homework assignment content "
+"generator %2 was called.  Try re-entering the set from the problem sets "
+"listing page."
 msgstr ""
 
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:420
 msgid "Requested set '%1' is not assigned to user %2."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:450
 msgid "Requested set '%1' is not available yet."
 msgstr "Zadání '%1' ještě není k dispozici."
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:441
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:444
 msgid "Requested set '%1' is not yet open."
 msgstr "Zadání '%1' ještě nebylo otevřeno pro studenty."
 
 #. ($verNum,				$setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:404
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:407
 msgid "Requested version (%1) of set '%2' can not be directly accessed."
 msgstr ""
 
 #. ($verNum, $setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:397
 msgid "Requested version (%1) of set '%2' is not assigned to user %3."
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:308
+msgid "Require Proctor Authorization to"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:45
 msgid "Require users to log in through the LMS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:420
 msgid "Rerandomize after"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:104
 msgid "Reset"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2280
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2968
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:195
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:696
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:47
 msgid "Reset Form"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:610
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:27
 msgid "Resets the number of incorrect attempts on a single homework problem."
+msgstr "Vynuluje počet neúspěšných pokusů u jedné vybrané úlohy. Má smysl pouze pro otevřená zadání."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:41
+msgid "Restore a .tar.gz archive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2453
-msgid ""
-"Restores a course from a gzipped tar archive (.tar.gz). After unarchiving, "
-"the course database is restored from a subdirectory of the course's DATA "
-"directory. Currently the archive facility is only available for mysql "
-"databases. It depends on the mysqldump application."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:40
+msgid "Restore backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:39
+msgid "Restore backup from %1"
+msgstr ""
+
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+msgid "Restored backup from %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:178
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:188
 msgid "Restrict Access by IP"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:912
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep:11
 msgid "Restrict Locations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:286
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:324
 msgid "Restrict Problem Progression"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:184
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:194
 msgid "Restrict To"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:154
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:33
+msgid "Restrict or sort the students displayed"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:159
 msgid "Restrict release by set(s)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2090
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:299
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:291
 msgid "Result"
 msgstr "Hodnocení"
 
-#. (CGI::i($self->$actionHandler(\%genericParams, \%actionParams,
-#. \%tableParams)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:388
+#. ($c->tag('i', $c->$actionHandler)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:228
 msgid "Result of last action performed: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:309
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:300
 msgid "Results for this submission"
 msgstr "Hodnocení pro zadané odpovědi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:363
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:236
 msgid "Results of last action performed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:125
 msgid "Results of last action performed: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1725
-msgid "Resurrect which Gateway?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:51
+msgid "Resurrect which test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1449
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:669
 msgid "Retitled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:17
 msgid "Return to your work"
 msgstr "Zpět k úloze"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:686
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:132
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:16
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:166
 msgid "Revert"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, $self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2069
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:83
 msgid "Revert to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1431
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1513
+#. ($c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1220
+msgid "Reverted to original file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:168
+msgid ""
+"Reverts to the copy of the file saved on the disk or to a backup file. All "
+"unsaved editing changes will be lost. This option is only active when a "
+"temporary file or a backup file exists. You may also delete backups that "
+"have been made with this tab."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:182
+msgid "Review of column functions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:145
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:85
 msgid ""
 "Reviewing a problem and looking at both the average Attempts and  average "
 "Status should give instructors valuable information about the difficulty of "
 "the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:55
 msgid "Reward used successfully!"
-msgstr ""
+msgstr "Odměna byla úspěšně použita!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:180
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:4
 msgid "Rewards"
-msgstr ""
+msgstr "Odměny"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:27
 msgid "Ring of Reduction"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:322
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:26
 msgid "Robe of Longevity"
-msgstr ""
+msgstr "Prodlužovačka"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "SECTION"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:214
 msgid "SET NAME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:321
 msgid "STATUS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "STUDENT ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:43
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:263
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:170
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:687
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:847
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:220
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:85
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:207
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:123
 msgid "Save"
 msgstr ""
 
-#. (CGI::b($self->shortPath($self->{sourceFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:438
+#. (tag('b', $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_form.html.ep:2
 msgid "Save %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:44
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:695
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:134
 msgid "Save As"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:744
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2963
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:194
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:695
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:37
 msgid "Save Changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:60
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:76
 msgid "Save Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
 msgid "Save Export"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:92
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
 msgid "Save Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:188
 msgid "Save as"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:872
-msgid "Save as Default"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:481
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:5
 msgid "Save as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1558
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:254
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1443
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_password_form.html.ep:1
 msgid "Save changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1794
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:33
 msgid "Save file to:"
 msgstr ""
 
-#. (CGI::b({ dir => 'ltr' }, $self->shortPath($self->{editFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1605
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:125
+msgid ""
+"Save the contents of the editor window to the file on disk and re-render the"
+" problem. If \"Open in new window\" is checked, then the problem will open "
+"in a new tab or window showing the problem as it will be rendered for "
+"students in the set. If \"Create backup\" is checked then a backup of the "
+"current file on disk will be created before overwriting it with the contents"
+" of the editor window. If a backup already exists, then a \"Delete oldest "
+"backup\" check box will be present. If that is checked, then the oldest "
+"backup will be deleted when \"Save\" is clicked. These backups can be "
+"reverted to and managed on the \"Revert\" tab."
+msgstr ""
+
+#. (tag('b', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:6
 msgid "Save to %1 and View"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:396
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1165
-msgid "Saved to file '%1'"
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:50
+msgid "Saved answers"
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#. ($outputFilePath =~ s/$ce->{courseDirs}{templates}/[TMPL]/r)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:549
+msgid "Saved to file \"%1\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1180
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2116
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2292
 msgid "Schema and database field definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4284
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2279
 msgid "Schema and database table definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:404
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:465
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:660
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:147
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:161
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:78
 msgid "Score"
 msgstr "Body"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:125
 msgid "Score (%)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:161
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:60
+msgid ""
+"Score one or more sets. This can also be done from the \"Hmwk Sets Editor\" "
+"or from the \"Instructor Tools\", but the \"Scoring Tools\" page allows "
+"control over parameters."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:170
 msgid "Score required for release"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:228
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:58
 msgid "Score selected set(s) and save to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2085
-msgid "Score summary for last submit:"
-msgstr "Hodnocení pro předchozí odeslání:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:284
+msgid "Score summary for last submission:"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:2
 msgid "Score which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:978
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:2
 msgid "Score which sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
 msgid "Scores"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:487
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:66
+msgid "Scoring (\".csv\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:396
 msgid "Scoring Download"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:161
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:115
 msgid "Scoring Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:478
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:391
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:58
 msgid "Scoring Tools"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2460
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:17
+msgid "Scoring Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:327
 msgid ""
 "Screen and Hardcopy set header information can not be overridden for "
 "individual students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:26
 msgid "Scroll of Resurrection"
+msgstr "Cesta časem"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:178
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:38
+msgid "Section"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:189
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:200
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:211
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:793
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2029
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:297
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:831
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:860
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:889
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:918
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:157
-msgid "Section"
+#. ($section)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:122
+msgid "Section %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:653
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:802
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:30
 msgid "Section:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:436
 msgid "Seed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:114
 msgid "Select"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:505
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:20
+msgid ""
+"Select Users from the left column and sets from the right column and assign "
+"or unassign the given sets. The list of users or the list of sets can be "
+"reordered under the \"sort\" option or the format of the user or set list.  "
+"Additionally, the set lists can be filtered (by section number or "
+"recitation).  The displayed user and set lists will only be updated upon "
+"clicking \"Change Display Settings\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:11
 msgid "Select a Homework Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:14
 msgid "Select a Problem Collection"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:18
 msgid "Select a Set Definition File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1028
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:14
 msgid "Select a Set from this Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1659
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:20
+msgid ""
+"Select a course to create a .tar.gz archive of, which contains a dump of the"
+" database and all course files (templates, configuration files, etc).  Each "
+"course can only have a single archive.  Creating an archive of a previously "
+"archived course will delete the old archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:36
 msgid "Select a course to delete."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:946
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:20
+msgid ""
+"Select a course to delete.  Warning, all data will be deleted and this "
+"cannot be undone.  This will not delete any course archives."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:14
 msgid ""
 "Select a course to rename.  The courseID is used in the url and can only "
 "contain alphanumeric characters and underscores. The course title appears on"
 " the course home page and can be any string."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2475
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:13
 msgid "Select a course to unarchive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1914
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3684
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:21
 msgid "Select a listing format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1442
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1478
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:18
+msgid "Select action:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:10
 msgid "Select all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2703
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:12
 msgid "Select all eligible courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2731
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:26
 msgid "Select all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1967
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:10
 msgid "Select all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:315
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:509
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:536
-msgid "Select an action to perform"
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:10
+msgid "Select an action to perform:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3063
-msgid "Select an action to perform:"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:20
+msgid ""
+"Select an archive to restore.  You cannot restore an archive into an "
+"existing course. Instead, either rename or delete the old course, or restore"
+" the archive with a new name.  When restoring a course with a new name, the "
+"name is used as the course ID, and must contain only letters, numbers, "
+"hyphens, and underscores, and may have at most 40 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1956
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:36
 msgid "Select course(s) to archive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3731
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:44
 msgid "Select course(s) to hide or unhide."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:7
 msgid "Select import file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:14
 msgid ""
 "Select one or more sets and one or more users below to assign/unassign each "
 "selected set to/from all selected users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:94
 msgid "Select sets below to assign them to the newly-created users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3666
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:20
+msgid ""
+"Select the course to change its Course ID, Course Title, or Institution.  "
+"Note that changing a course's ID will change the URL of all links to the "
+"course, and could break links from external sites such as an LMS."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:4
 msgid ""
 "Select the course(s) you want to hide (or unhide) and then click \"Hide "
 "Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
@@ -5433,133 +7243,230 @@ msgid ""
 "full URL address for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:488
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:20
+msgid ""
+"Select the course(s) you want to hide (or unhide) and then click \"Hide "
+"Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
+"does no harm (the action is skipped). Likewise unhiding a course that is "
+"already visible does no harm (the action is skipped). Hidden courses are "
+"still active but are not listed in the list of WeBWorK courses on the "
+"opening page. To access the course, an instructor or student must know the "
+"full URL address for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:93
+msgid "Select the display mode used to render the problems on this page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:11
 msgid ""
 "Select the homework sets for which to generate hardcopy versions. You may "
 "also select multiple users from the users list. You will receive hardcopy "
 "for each (set, user) pair."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:238
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:30
+msgid ""
+"Select the sets you want scored, choose the name of the export file you want"
+" to use (by default: %1), and then click the \"Score Selected Set(s) and "
+"save to\" button."
+msgstr ""
+
+#. ('<code>ful.csv</code>','<code>scr.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:49
+msgid ""
+"Select this if you want to save the scores for each set in a separate file "
+"in addition to saving all scores to a cumulative file. After clicking the "
+"\"Score Selected Set(s) and save to\" button, you will get a pair of links "
+"for each selected set. The file that ends with %1 contains the number of "
+"correct and incorrect tries about each individual problem for each student. "
+"The file that ends with %2 is a summary of each problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:19
 msgid ""
 "Select user(s) and/or set(s) below and click the action button of your "
 "choice."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2885
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:85
+msgid ""
+"Select which assignment types (homework, tests, just-in-time) the "
+"achievement is evaluated."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:20
+msgid ""
+"Select which courses to upgrade from a previous version of WeBWorK.  The "
+"upgrade process can add missing database columns, delete unused database "
+"columns, and check the course file structure.  Be sure to read over the "
+"changes before confirming the upgrade.  You may want to create an archive of"
+" the course before upgrading.  Only courses that need upgraded will be "
+"selectable."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:84
+msgid "Select your favorite theme for the large text window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:18
 msgid "Select/unselect all fields missing in schema for deletion."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2873
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:9
 msgid "Select/unselect all tables missing in schema for deletion."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:23
 msgid "Selected sets:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:57
 msgid "Send E-mail"
 msgstr "Poslat E-mail"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:839
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:83
 msgid "Send Email"
 msgstr "Poslat Email"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:702
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:69
+msgid "Send email to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:54
+msgid "Send emails to selected instructors."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:59
 msgid "Send to all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:717
-msgid "Send to the students selected below"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:64
+msgid "Send to selected students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:402
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:7
 msgid "Set"
 msgstr "Zadání"
 
 #. ($newSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:614
 msgid "Set %1 has been created."
 msgstr ""
 
-#. ($newSetName,$userName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1944
+#. ($newSetName, $userName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:616
 msgid "Set %1 was assigned to %2"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1239
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:567
 msgid "Set %1 was assigned to %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:415
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:354
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:42
 msgid "Set Assigner"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:420
-msgid "Set Definition Filename"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:17
+msgid "Set Assigner Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:45
 msgid "Set Definition Files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2318
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2329
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:218
 msgid "Set Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:17
+msgid "Set Detail Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:333
 msgid "Set Detail for set %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:93
 msgid "Set Header"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:323
+msgid "Set Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:218
 msgid "Set ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:267
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:114
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:3
 msgid "Set Info"
 msgstr "Informace o zadání"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2744
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:19
 msgid "Set List"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1111
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1209
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1320
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:164
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:262
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:353
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:448
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:546
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:659
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:776
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:895
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:995
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:762
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:809
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:7
 msgid "Set Name"
+msgstr "Sada úloh"
+
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:18
+msgid "Set closes on %1."
+msgstr "Uzavírka úlohy: %1"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:45
+msgid "Set definition (\".def\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:20
+msgid "Set is closed."
+msgstr "Úloha je uzavřena."
+
+#. ($c->formatDateTime($set->reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:16
+msgid "Set is due on %1."
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:186
+#. ($c->formatDateTime($set->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:14
+msgid "Set opens on %1."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:188
 msgid "Set random seed to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2029
+#: /opt/webwork/webwork2/conf/defaults.config:1930
 msgid ""
 "Set to true for log to mean base 10 log and false for log to mean natural "
 "logarithm."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2049
+#: /opt/webwork/webwork2/conf/defaults.config:1950
 msgid ""
 "Set to true to allow students to enter Unicode versions of some characters "
 "(like U+2212 for the minus sign) in their answers.  One reason to allow this"
@@ -5568,7 +7475,7 @@ msgid ""
 "directory from the keyboard."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2019
+#: /opt/webwork/webwork2/conf/defaults.config:1920
 msgid ""
 "Set to true to display the \"Entered\" column which automatically shows the "
 "evaluated student answer, e.g., 1 if student input is sin(pi/2). If this is "
@@ -5577,7 +7484,7 @@ msgid ""
 " answer."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2060
+#: /opt/webwork/webwork2/conf/defaults.config:1961
 msgid ""
 "Set to true to have Full Width Unicode character (U+FF01 to U+FF5E) "
 "converted to their ASCII equivalents (U+0021 to U+007E) automatically in "
@@ -5585,20 +7492,30 @@ msgid ""
 "automatically use Full Width characters for parentheses and commas."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:521
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:164
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:16
+msgid "Set values"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/siblings.html.ep:4
 msgid "Sets"
 msgstr "Zadání"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:352
-msgid "Sets Assigned to User"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:322
+msgid "Sets assigned to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:343
-msgid "Sets assigned to %1"
+#. ($userName, $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:90
+msgid "Sets assigned to %1 (%2)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:17
+msgid "Sets assigned to student Help"
 msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:57
@@ -5612,189 +7529,241 @@ msgid ""
 "links from the LMS must be problem set specific. For example, "
 "<code>webwork.myschool.edu/webwork2/course-name/problem_set_name</code>. If "
 "the problem set name has space characters, they should be underscores in "
-"these addresses. If the problem set is a quiz, it must have this format: "
-"<code>webwork.myschool.edu/webwork2/course-"
-"name/quiz_mode/problem_set_name</code>. Also, to initialize the "
-"communication between WeBWorK and the LMS, the user must follow each of "
-"these external learning tools at least one time. Since there must be a "
-"separate external tool link for each problem set, this option requires more "
-"maintenance of the LMS course.</dd></dl>"
+"these addresses. Also, to initialize the communication between WeBWorK and "
+"the LMS, the user must follow each of these external learning tools at least"
+" one time. Since there must be a separate external tool link for each "
+"problem set, this option requires more maintenance of the LMS "
+"course.</dd></dl>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1458
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:55
+msgid "Sets the order in which achievements are listed and evaluated."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:625
 msgid "Sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:726
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:36
 msgid "Setting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1332
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:39
 msgid "Shift dates so that the earliest is"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:32
+msgid "Show"
+msgstr ""
+
 #. ($numchild)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1301
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:32
 msgid "Show %1 more like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:326
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:107
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:39
 msgid "Show Correct Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:22
 msgid "Show Date & Size"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:86
 msgid "Show LTI parameters (for debugging)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:620
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:34
 msgid "Show Me Another"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2518
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2412
+#. ($exhausted)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:69
+msgid "Show Me Another %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1642
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:711
 msgid "Show Past Answers"
+msgstr "Ukázat předchozí odpovědi"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:41
+msgid "Show Problem Source File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:703
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:132
 msgid "Show Problem Source File:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
 msgid "Show Problems on Finished Tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
-msgid "Show Scores on Finished Assignments?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+msgid "Show Scores on Finished Tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2416
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:630
 msgid "Show Solutions"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/conf/defaults.config:1538
 msgid "Show Total Homework Grade on Grades Page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1266
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:77
 msgid "Show all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1380
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:91
 msgid "Show all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2404
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:621
 msgid "Show correct answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1299
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+msgid "Show hints after"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:30
 msgid "Show less like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:337
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:387
 msgid "Show me another"
 msgstr "Ukázat podobnou otázku"
 
-#. ($exhausted)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1926
-msgid "Show me another %1"
-msgstr "Ukázat podobnou otázku %1"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:20
+msgid ""
+"Show past answers.  Students can only see their past answers, and they will "
+"not be able to see which parts are correct.  Instructors can use the form to"
+" select any combination of users, sets, and problems to view.  The table "
+"below will list the past answers colored according to correctness (green is "
+"correct).  Use control + click to select multiple users, sets, or problems."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2428
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:639
 msgid "Show problem graders"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:105
 msgid "Show saved answers?"
 msgstr "Zobrazovat uložené odpovědi?"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1860
+#: /opt/webwork/webwork2/conf/defaults.config:1762
 msgid ""
 "Show the correct answer to the current problem before re-randomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1862
+#: /opt/webwork/webwork2/conf/defaults.config:1764
 msgid ""
 "Show the correct answer to the current problem on the last attempt before a "
 "new version is requested."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:3
 msgid "Show which sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:690
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:3
 msgid "Show which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:382
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:475
-msgid "Show/Hide Site Description"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:622
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:11
 msgid "Show:"
 msgstr "Zobrazit:"
 
-#. (scalar @{ $self->{visibleSetIDs} },			scalar @{ $self->{allSetIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:594
+#. (scalar @{ $c->{visibleSetIDs} },			scalar @{ $c->{allSetIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:115
 msgid "Showing %1 out of %2 sets."
 msgstr ""
 
-#. (scalar @Users, scalar @{ $self->{allUserIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:610
+#. (scalar(keys %{ $c->{visibleUserIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:80
 msgid "Showing %1 out of %2 users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:70
 msgid "Showing all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1355
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:81
 msgid "Showing all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:61
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:64
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:67
+#. ($c->{merge_file}, $ur->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:5
+msgid "Showing data from merge file %1 for user %2:"
+msgstr ""
+
+#. ($c->{merge_file})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:147
+msgid "Showing data from merge file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:61
+msgid "Showing problem for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:7
+msgid "Showing statistics for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:33
+msgid ""
+"Shows how many instructors and students have been assigned this problem set,"
+" out of the total number in the class. Clicking on this link allows you to "
+"assign the set to users, unassign this set from users, and to individually "
+"edit the assignment for specific users. For changing dates for individual "
+"users there are also shortcuts from the \"Instructor Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:63
 msgid "Site Information"
 msgstr "Informace o serveru"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:88
 msgid "Skip archiving this course"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2080
+#: /opt/webwork/webwork2/conf/defaults.config:1981
 msgid "Skip explanation essay answer fields"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1556
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1557
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:81
+msgid "Snippets of PG code illustrating specific techniques"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1514
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1515
 msgid "Solution:"
 msgstr "Řešení:"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1555
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1513
 msgid "Solution: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:432
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:57
 msgid "Solutions"
 msgstr "Řešení"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1350
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:20
+msgid ""
+"Some OPL problems have been rated for difficulty/educational objective. The "
+"levels are loosely inspired by Bloom's taxonomy. They are assigned numbers "
+"from 1 to 6 as follows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:185
 msgid ""
 "Some WeBWorK problems are programmed using what are called <i>Math "
 "Objects</i>. These problems are preferred by some people because they "
@@ -5802,18 +7771,18 @@ msgid ""
 "particularly for answers which are way off base."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:379
 msgid "Some answers will be graded later."
 msgstr "Některé odpovědi budou vyhodnoceny později."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:60
 msgid ""
 "Some of these files are directories. Only delete directories if you really "
 "know what you are doing. You can seriously damage your course if you delete "
 "the wrong thing."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2082
+#: /opt/webwork/webwork2/conf/defaults.config:1983
 msgid ""
 "Some problems have an explanation essay answer field, typically following a "
 "simpler answer field. For example, find a certain derivative using the "
@@ -5825,7 +7794,7 @@ msgid ""
 "grading."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2186
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:83
 msgid ""
 "Some problems shown above represent multiple similar problems from the "
 "database.  If the (top) information line for a problem has a letter M for "
@@ -5835,300 +7804,396 @@ msgid ""
 "again."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1612
-msgid ""
-"Some servers handle courses taking place in different timezones.  If this "
-"course is not showing the correct timezone, enter the correct value here.  "
-"The format consists of unix times, such as "
-"\"America/New_York\",\"America/Chicago\", \"America/Denver\", "
-"\"America/Phoenix\" or \"America/Los_Angeles\". Complete list: <a "
-"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:529
-msgid ""
-"Something was wrong with your LTI parameters.  If this recurs, please speak "
-"with your instructor"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:50
 msgid "Sort"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:751
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:814
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:4
 msgid "Sort by"
 msgstr ""
 
 #. ($names{$primary}, $names{$secondary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:817
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:324
 msgid "Sort by %1 and then by %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:171
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:115
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:3
 msgid "Sort:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:51
+msgid "Sorts the lists displayed by due date, name, etc."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:363
 msgid "Source File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1586
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1612
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1555
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1593
 msgid ""
 "Source file paths cannot include .. or start with /: your source file path "
 "was modified."
 msgstr ""
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:11
 msgid ""
 "Specify an ID, title, and institution for the new course. The course ID may "
 "contain only letters, numbers, hyphens, and underscores, and may have at "
 "most %1 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:661
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:94
+msgid ""
+"Spell check the text of the file that your are editing. Note that there will"
+" be many spelling errors in the code parts of your file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:116
+msgid "Standard Deviation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:162
 msgid "Start"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:609
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:47
+msgid "Start LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:130
 msgid "Start New Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:443
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:94
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:508
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:84
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:54
 msgid "Statistics"
 msgstr ""
 
-#. ($self->{ce}{courseName} =~ s/_/ /gr,                   CGI::span({ dir =>
-#. 'ltr' }, format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:73
-msgid "Statistics for %1 set %2. Closes %3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:17
+msgid "Statistics Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:86
+msgid "Statistics for %1"
 msgstr ""
 
-#. ($self->{ce}{courseName}, $self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:68
-msgid "Statistics for %1 student %2"
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:90
+msgid "Statistics for %1 problem %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2089
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1442
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1524
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2020
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:296
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:659
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:806
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:191
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:192
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:84
+msgid "Statistics for student %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:442
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:151
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:160
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:36
 msgid "Status"
 msgstr "Stav"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:29
 msgid "Stop Acting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2251
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:85
 msgid "Stop Archiving"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2418
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1153
 msgid "Stop archiving courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:233
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:783
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2011
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:295
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:829
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:887
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:916
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:30
 msgid "Student ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:9
+msgid "Student ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:37
 msgid "Student Name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:570
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:428
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:56
 msgid "Student Progress"
 msgstr ""
 
-#. ($self->{ce}->{courseName},                     CGI::span({ dir => 'ltr' },
-#. format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:81
-msgid "Student Progress for %1 set %2. Closes %3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:17
+msgid "Student Progress Help"
 msgstr ""
 
-#. ($self->{ce}->{courseName}, $self->{studentName})
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:72
+msgid "Student Progress for %1"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($c->stash('setID')
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:76
-msgid "Student Progress for %1 student %2"
+msgid "Student Progress for set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:628
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:80
 msgid "Student answers"
 msgstr "Odpovědi studenta"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:766
-msgid "Subject:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:80
+msgid ""
+"Student scores for the sets selected below will be calculated. This and "
+"other scoring operations can also be done using the \"Scoring Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:87
+msgid "Student:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:124
+msgid "Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:653
-msgid "Subject: "
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:50
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:8
+msgid "Subject:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:222
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:30
 msgid "Submission time:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:226
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:41
 msgid "Submit"
 msgstr "Odeslat"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:26
 msgid "Submit Answers"
 msgstr "Odeslat odpověd(-i)"
 
 #. ($effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1861
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:23
 msgid "Submit Answers for %1"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:502
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:525
 msgid "Submit your answers again to go on to the next part."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:775
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:183
 msgid "Success Index"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:106
+msgid ""
+"Success index is the square of the average score divided by the average "
+"number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:73
+msgid ""
+"Success index is the square of the score divided by the number of attempts."
+msgstr ""
+
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1086
 msgid "Successfully archived the course %1."
 msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:885
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:422
 msgid "Successfully created new achievement %1"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1252
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:581
 msgid "Successfully created new set %1"
 msgstr ""
 
 #. ($add_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:465
 msgid "Successfully created the course %1"
 msgstr ""
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1818
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2401
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1131
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:900
 msgid "Successfully deleted the course %1."
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1529
+#. ($rename_oldCourseID,							$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:772
 msgid "Successfully renamed the course %1 to %2"
 msgstr ""
 
 #. ($unarchive_courseID, $new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2653
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1286
 msgid "Successfully unarchived %1 to the course %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2099
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4280
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:89
+msgid "TA:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2274
 msgid "Table defined in database but missing in schema"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2097
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2269
 msgid "Table defined in schema but missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2265
 msgid "Table is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3200
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3490
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:276
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:576
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:106
 msgid "Take Action!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Target Set:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:63
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:42
 msgid "TeX Source"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:784
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:258
+msgid "Test %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:54
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:52
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:55
+msgid "Test Name"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:156
 msgid "Test Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:224
 msgid "Test Time Limit (min; 0=Close Date)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2041
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:238
 msgid "Test Time Notification"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:156
 msgid "Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:244
 msgid "Test not yet submitted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:317
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:920
+msgid "Test parameters"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:149
 msgid "Test/quiz with time limit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:79
 msgid "Text"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:842
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:80
+msgid "Text Editor Options"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:55
 msgid "Text chapter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:864
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:66
 msgid "Text section:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:44
 msgid "Textbook:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1403
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:58
+msgid ""
+"The \"Edit Target Set\" button at the top of the page will take you to the "
+"Problem Set Editor which will allow you to edit dates, assign users and "
+"other information about the problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:115
+msgid ""
+"The \"Score\" tab will export achievement data to a CSV file that can be "
+"downloaded.  The export contains the global data including number of "
+"achievement points and current level of each student.  In addition for each "
+"selected achievement, a column for if the achievement was earned (1) or not "
+"earned (0) will be added to the CSV."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:194
+msgid ""
+"The <strong>Assigned sets</strong> column (x/y) indicates that x sets out of"
+" y sets avaiable have been assigned to this student. Click this link to "
+"assign or unassign sets to this student, to adjust due dates, or to adjust "
+"the grades on a homework set for a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:20
+msgid ""
+"The <strong>Set Detail</strong> page can be viewed in one of two distinct "
+"modes:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:189
+msgid ""
+"The <strong>login name</strong> column links allow you to \"act as\" a "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:191
+msgid ""
+"The <strong>pencil</strong> in the login column allows you to edit that "
+"student's data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:64
 msgid ""
 "The Attempts figure is the global average of the number of attempts (both "
 "correct and incorrect) individuals take on this problem.  A high figure may "
@@ -6137,7 +8202,7 @@ msgid ""
 "each part before continuing and each such  submittal counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1485
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:124
 msgid ""
 "The Attempts figure is the local average of the number of attempts (both "
 "correct and incorrect) individuals at your institution take on this problem."
@@ -6147,14 +8212,14 @@ msgid ""
 "counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1819
+#: /opt/webwork/webwork2/conf/defaults.config:1721
 msgid ""
 "The Maximum number of times Show me Another can be used per problem by a "
 "student. If set to -1 then there is no limit to the number of times that "
 "Show Me Another can be used."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1787
+#: /opt/webwork/webwork2/conf/defaults.config:1689
 msgid ""
 "The Reduced Scoring Period is the default period before the due date during "
 "which all additional work done by the student counts at a reduced rate. When"
@@ -6167,7 +8232,7 @@ msgid ""
 "work done counts 50% of the original.\" will be displayed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:78
 msgid ""
 "The Status figure is the global average of the Status individuals have "
 "earned on this problem. The Status is the percentage correct (from 0% to "
@@ -6176,7 +8241,7 @@ msgid ""
 "a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1506
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:138
 msgid ""
 "The Status figure is the local average of the Status individuals at your "
 "institution have earned on this problem. The Status is the percentage "
@@ -6185,47 +8250,61 @@ msgid ""
 "students will work on a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1262
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:11
 msgid "The WeBWorK Project"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:822
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:25
+msgid ""
+"The WeBWorK administrators need to be added to the course in order for them "
+"to access the course.  Unchecking this option will make it so WeBWorK "
+"administrators cannot directly login to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:129
+msgid ""
+"The achievement evaluator is the perl code that is run after each submit to "
+"determine if an achievement is earned or not.  Click on the \"Edit "
+"Evaluator\" link to edit the evaluator."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:26
 msgid ""
 "The adjusted status of a problem is the larger of the problem's status "
 "andthe weighted average of the status of those problems which count towards "
 "the parent grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1677
+#: /opt/webwork/webwork2/conf/defaults.config:1579
 msgid ""
 "The amount of time (in minutes) after the due date that the Answers are "
 "available to student to view.  You can change this for individual homework, "
 "but WeBWorK will use this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1667
+#: /opt/webwork/webwork2/conf/defaults.config:1569
 msgid ""
 "The amount of time (in minutes) before the due date when the assignment is "
 "opened.  You can change this for individual homework, but WeBWorK will use "
 "this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:386
 msgid "The answer above is NOT correct."
 msgstr "Zadaná odpověď NENÍ správně."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:375
 msgid "The answer above is correct."
 msgstr "Zadaná odpověď je správně."
 
 #. ($filename, $ce->{mail}{maxAttachmentSize})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:230
 msgid ""
 "The attached file \"%1\" exceeds the allowed attachment size of "
 "%quant(%2,megabyte)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:421
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:496
 msgid ""
 "The child problems for this problem will become visible to the student when "
 "they either have more incorrect attempts than is specified here, or when "
@@ -6234,173 +8313,252 @@ msgid ""
 "attempts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:704
+#. ('href="http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files"
+#. target="Webworkdocs"',
+#. '<code>demoCourse.lst</code>','<code>.csv</code>','<code>.lst</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:59
+msgid ""
+"The classlist files are stored in the templates directory and provide a "
+"convenient way to enter a large number of students into your class. To view "
+"the format for <strong>ClassList files</strong> see the <a %1>ClassList "
+"specification</a> or download the %2 file and use it as a model. ClassList "
+"files can be prepared using a spreadsheet and then saved as %3 (comma "
+"separated values) text files.  However, to access as a classlist file, the "
+"file suffix needs to be changed to %4, which can be done with the \"Rename\""
+" button."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:16
 msgid ""
 "The configuration module did not find the data it needs to function.  Have "
-"your site administrator check that Constants.pm is up to date."
+"your site administrator check that site configuration files are up to date."
+msgstr ""
+
+#. ($archive_courseID,					$archive_path)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:80
+msgid ""
+"The course \"%1\" has already been archived at \"%2\". This earlier archive "
+"will be erased.  This cannot be undone."
 msgstr ""
 
-#. (CGI::b($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:151
+#. (tag('strong', stash('courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:8
 msgid ""
 "The course %1 uses an external authentication system (%2). Please go there "
 "to log in again."
 msgstr ""
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:186
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:17
 msgid ""
 "The course %1 uses an external authentication system (%2). Please return to "
 "that system to access this course."
 msgstr ""
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:191
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:23
 msgid ""
 "The course %1 uses an external authentication system (%2). You've "
 "authenticated through that system, but aren't allowed to log in to this "
 "course."
 msgstr ""
 
-#. ($archive_courseID,						$archive_path)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2243
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:30
+msgid "The course database must be upgraded before archiving this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:30
+msgid "The course database must be upgraded before renaming this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:26
 msgid ""
-"The course '%1' has already been archived at '%2'. This earlier archive will"
-" be erased.  This cannot be undone."
+"The current mode should be made clear by the information at the top of the "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:46
+msgid ""
+"The current value of the achievement counter. Changes to this variable will "
+"be saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1995
+#: /opt/webwork/webwork2/conf/defaults.config:1897
 msgid "The default display mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1855
+#: /opt/webwork/webwork2/conf/defaults.config:1757
 msgid ""
 "The default number of attempts before the problem is re-randomized. ( 0 => "
 "never )"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1854
+#: /opt/webwork/webwork2/conf/defaults.config:1756
 msgid ""
 "The default number of attempts between re-randomization of the problems ( 0 "
 "=> never)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:251
-msgid "The directory you specified doesn't exist"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:73
+msgid ""
+"The description shown to students which states what action is needed to earn"
+" the achievement."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1829
-msgid "The display was already cleared."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:5
+msgid "The directory you specified doesn't exist"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2111
+#: /opt/webwork/webwork2/conf/defaults.config:2032
 msgid ""
 "The e-mail verbosity level controls how much information is automatically "
-"added to feedback e-mails.  Levels are<ol><li value=\"Simple\"> Simple: send"
-" only the feedback comment and context link</li><li value=\"Standard\"> "
-"Standard: as in Simple, plus user, set, problem, and PG data</li><li "
-"value=\"Debug\"> Debug: as in Standard, plus the problem environment "
-"(debugging data)</li></ol>"
+"added to feedback e-mails.  Levels are<ol><li> Simple: send only the "
+"feedback comment and context link</li><li> Standard: as in Simple, plus "
+"user, set, problem, and PG data</li><li> Debug: as in Standard, plus the "
+"problem environment (debugging data)</li></ol>"
 msgstr ""
 
-#. ($achievementName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:625
-msgid "The evaluator for %1 has been renamed to '%2'."
+#. ($achievementName,				$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:293
+msgid "The evaluator for %1 has been renamed to \"%2\"."
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:339
-msgid ""
-"The file %1/%2 already exists and cannot be overwritten. The message was not"
-" saved"
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:246
+msgid "The file \"%1\" cannot be found."
+msgstr ""
+
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:526
+msgid "The file \"%1\" cannot be read!"
+msgstr ""
+
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:522
+msgid "The file \"%1\" is a directory!"
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:190
-msgid "The file %1/%2 cannot be found."
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:259
+msgid "The file \"%1\" is a template. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:181
-msgid "The file %1/%2 is not readable by the webserver."
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:250
+msgid "The file \"%1\" is protected. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:373
-msgid "The file '%1' cannot be found."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:19
+msgid "The file $file does not appear to be a text or image file."
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1004
-msgid "The file '%1' cannot be read!"
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:277
+msgid ""
+"The file %1 already exists and cannot be overwritten. The message was not "
+"saved."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:380
-msgid "The file '%1' is a blank problem!"
+#. ("$emailDirectory/$openfilename",				$emailDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:156
+msgid ""
+"The file %1 cannot be found. Check whether it exists and whether the "
+"directory %2 can be read by the webserver. "
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:998
-msgid "The file '%1' is a directory!"
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
+msgid ""
+"The file %1 is not contained in the course templates directory and can not "
+"be modified."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:375
-msgid "The file '%1' is protected!"
+#. ("$emailDirectory/$openfilename")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:148
+msgid ""
+"The file %1 is not readable by the webserver. Check that it's permissions "
+"are set correctly."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:203
 msgid "The file does not appear to be a text file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:88
 msgid "The file you are trying to download doesn't exist"
 msgstr ""
 
 #. ($filename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:221
 msgid "The filetype of the attached file \"%1\" is not allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3843
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2149
 msgid "The following courses were successfully hidden:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3908
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2218
 msgid "The following courses were successfully unhidden:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4121
-msgid "The following upgrades are available for your WeBWorK system:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:34
+msgid "The following describes how the checkboxes alter the scoring output"
 msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2081
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:66
 msgid ""
 "The following users are NOT assigned to this set and will be ignored: %1"
 msgstr ""
 
-#. (join('.', @{$problemSeqs[$children_counts_indexs[0]]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:288
+msgid "The given file path is not a valid location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:49
+msgid "The goal value of the achievement counter."
+msgstr ""
+
+#. (join('.', @{ $problemSeqs[ $children_counts_indexs[0] ] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1334
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the score of problem %1."
 msgstr ""
 
-#. (join(', ', map({join('.', @{$problemSeqs[$_]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2064
+#. (join(', ', map({ join('.', @{ $problemSeqs[$_] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the weighted average of the problems: %1."
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1954
-msgid "The hardcopy header for set %1 has been renamed to '%2'."
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1078
+msgid "The hardcopy header for set %1 has been renamed to \"%2\"."
+msgstr ""
+
+#. ($showHintsAfter)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:36
+msgid ""
+"The hint shown is an instructor preview and will be shown to students after "
+"%quant(%1,attempt)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:32
+msgid ""
+"The hint shown is an instructor preview and will not be shown to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:22
+msgid ""
+"The information box on the right displays information about the course. This"
+" is useful for leaving course wide messages for students. It contains text "
+"from the file templates/course_info.txt. Instructors can edit this file from"
+" the web (click on the \"Edit\" link)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:111
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:30
 msgid ""
 "The initial value is the answer sub score for the answer that is currently "
 "shown.  If this is modified, it will be used to compute the total problem "
@@ -6408,37 +8566,100 @@ msgid ""
 "shown answer if the page is reloaded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:161
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:97
+msgid ""
+"The initial value is the currently saved score as a point value computed "
+"using the percent score.  This point value is used to compute the percent "
+"score (rounded to a whole percent) that can be saved."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:145
 msgid "The initial value is the currently saved score for this student."
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_oldCourseInstitution,
 #. $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
 msgid ""
 "The institution associated with the course %1 has been changed from %2 to %3"
 msgstr ""
 
-#. ($rename_newCourseID, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1498
+#. ($rename_newCourseID, $optional_arguments{courseInstitution})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:729
 msgid "The institution associated with the course %1 is now %2"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:599
+msgid ""
+"The instructor account with user id %1 does not exist.  Instructor accounts "
+"must be created manually."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:635
 msgid ""
 "The instructor account with user id %1 does not exist.  Please create the "
 "account manually via WeBWorK."
 msgstr ""
 
-#. ($r->param('new_set_name')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1897
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:87
+msgid ""
+"The key maps that are available are \"default\", \"emacs\", \"sublime\", and"
+" \"vim\". The \"default\" key map has the standard behavior of a browser "
+"text area. You can use Ctrl-C to copy, Ctrl-V to paste, Ctrl-F to search, "
+"etc. If you are more comfortable with the \"emacs\", \"sublime\", or \"vim\""
+" text editors then you may choose to use one of those key maps instead."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:75
+msgid "The large text window"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:27
+msgid ""
+"The list of files include regular files, directories (ending in a \"/\") and"
+" links (ending in a \"@\")."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:52
+msgid ""
+"The login name cannot be changed. (It is the primary key for the student's "
+"data.) If you make a mistake in the login name at the beginning of the "
+"course (before any work has been done) then it is best to simply add a new "
+"student with the correct entry and drop the student with the bad login name."
+" (See drop and delete students below.) If the login name must be changed "
+"after a user has started working assignments, then contact your system "
+"administrator, who can use the webwork2 \"bin/change_user_id\" script to "
+"change the user id."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:20
+msgid ""
+"The main page allows access to set and student statistics.  When selecting a"
+" student, their grades page is shown, which lists set totals and per problem"
+" grades for each set assigned to the student.  When selecting a set, various"
+" statistics and histograms are shown for the overall grades of students who "
+"are currently enrolled or auditing the course."
+msgstr ""
+
+#. ('href="http://webwork.maa.org/wiki" target="ww_wiki"',
+#. 'href="http://webwork.maa.org/wiki/Instructors" target="ww_wiki"')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:24
+msgid ""
+"The main page for WeBWorK documentation is the <a %1>webwork wiki</a> while "
+"specific help for instructors setting up a course are in the <a "
+"%2>instructors' section</a>."
+msgstr ""
+
+#. ($c->param('new_set_name')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:569
 msgid ""
 "The name \"%1\" is not a valid set name.  Use only letters, digits, dashes, "
 "underscores, periods, and spaces."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1530
+#: /opt/webwork/webwork2/conf/defaults.config:1432
 msgid ""
 "The name of course information file (located in the templates directory). "
 "Its contents are displayed in the right panel next to the list of homework "
@@ -6455,151 +8676,249 @@ msgid ""
 "go back to the LMS to access something in the WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:63
+msgid "The number of points earned for earning the achievement."
+msgstr ""
+
 #. ($openDate, $dueDate, $answerDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1104
 msgid ""
 "The open date: %1, close date: %2, and answer date: %3 must be defined and "
 "in chronological order."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:702
+#. ($path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:393
+msgid "The original path is not in a valid location. Using failsafe %1"
+msgstr ""
+
+#. ($forcedSourceFile)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:510
+msgid "The original path to the file is %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:262
 msgid "The password and password confirmation for the instructor must match."
 msgstr ""
 
-#. (CGI::b($r->maketext("[_1]'s Current Password", $user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:27
+msgid ""
+"The password can be any combination of letters, numbers and special symbols."
+" Students are encouraged to use all three, and stay away from dictionary "
+"words. The password should not be the same as any password used elsewhere, "
+"such as for an email account. The password will only be present on the page "
+"if the user has permission to change the password."
+msgstr ""
+
+#. ($c->tag(                                               'b',
+#. $c->maketext(                                                   "[_1]'s
+#. Current Password",
+#. $c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:95
 msgid ""
 "The password you entered in the %1 field does not match your current "
 "password. Please retype your current password and try again."
 msgstr ""
 
-#. (CGI::b($r->maketext("[_1]'s New Password",         $e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:105
+#. ($c->tag('b', $c->maketext("[_1]'s New Password",         $e_user_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:82
 msgid ""
 "The passwords you entered in the %1 and %2 fields don't match. Please retype"
 " your new password and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:789
-msgid "The path to the original file should be absolute"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:374
+msgid "The path can not be the temporary edit directory."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:667
-msgid ""
-"The percentage of active students with correct answers for each problem"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:370
+msgid "The path to the original file should be absolute."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:131
 msgid ""
 "The percentage of students receiving at least these scores. The median score"
 " is in the 50% column."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:458
 msgid "The prerequisite conditions have not been met for set '%1'."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1917
-msgid "The problem set is not yet open"
-msgstr ""
-
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2012
-msgid "The recorded score for this version is  %1/%2."
+#. (q(down menu to change which student's seed and answers are shown.  Use the
+#. "Mark Correct" checkbox to set)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:26
+msgid ""
+"The problem is shown at the top with the seed and answers of the selected "
+"student.  Use the drop "
 msgstr ""
 
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2021
-msgid "The recorded score for this version is %1/%2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:62
+msgid "The problem set is not yet open"
 msgstr ""
 
 #. ($origReducedScoringDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1971
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1121
 msgid ""
 "The reduced credit date %1 in the file probably was generated from the Unix "
 "epoch 0 value and is being treated as if it was Unix epoch 0."
 msgstr ""
 
 #. ($openDate, $dueDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1982
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1135
 msgid ""
 "The reduced credit date should be between the open date %1 and close date %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1220
 msgid ""
 "The reduced scoring date should be between the open date and close date."
 msgstr ""
 
 #. ($tempFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:307
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:298
 msgid "The requested file \"%1\" does not exist on the server."
 msgstr ""
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2085
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1389
 msgid "The score for this problem can count towards score of problem %1."
 msgstr ""
 
-#. ($setName, $effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:306
-msgid "The selected problem set (%1) is not a valid set for %2"
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:69
+msgid ""
+"The scoring files are stored in the scoring directory and are produced using"
+" the \"Scoring Tools\" page or the scoring command in the \"Instructor "
+"Tools\" module. These files can be downloaded, modified in a spreadsheet "
+"(for example, to add midterm scores) and then uploaded again to the scoring "
+"directory to be merged with email messages. (Use a new file name, other than"
+" %1, when uploading to prevent the scoring module from overwriting an "
+"uploaded file.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:52
+msgid ""
+"The second row of the problem collection area is for browsing directories. "
+"The OPL will be there as well as any other directories that you may set up "
+"(for example Contrib). If this is selected, all subdirectories containing "
+"problems will be listed."
 msgstr ""
 
-#. ($urlpath->arg("setID")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1467
-msgid "The selected problem set (%1) is not a valid set for %2%3:"
+#. (stash('setID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet.html.ep:13
+msgid "The selected problem set (%1) is not a valid set for %2."
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1946
-msgid "The set header for set %1 has been renamed to '%2'."
+#. ($setID, $effectiveUserID, $c->{invalidVersionCreation} ? " (acted as by
+#. $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:77
+msgid "The selected problem set (%1) is not a valid set for %2: %3"
+msgstr ""
+
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1066
+msgid "The set header for set %1 has been renamed to \"%2\"."
 msgstr ""
 
-#. ($newSetName)
 #. ($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1164
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:491
+msgid ""
+"The set name \"%1\" is already in use. Pick a different name if you would "
+"like to start a new set. No set created."
+msgstr ""
+
+#. ($newSetName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:584
 msgid ""
 "The set name '%1' is already in use.  Pick a different name if you would "
 "like to start a new set."
 msgstr ""
 
-#. ($setID, $editingSetVersion, $editForUser[0])
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2109
-msgid "The set-version (%1, version %2) is not assigned to user %3."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:58
+msgid ""
+"The sets checked below will be visible to students or hidden from students. "
+"Useful for preparing sets ahead of time, but not showing them to students; "
+"or for temporarily hiding a set which has a mistake in it while it is being "
+"fixed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:54
+msgid ""
+"The sets checked below will become available for editing the due dates and "
+"visibility."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:73
+msgid ""
+"The sets checked below will written to set definition files, to be saved for"
+" future use, or to be transferred to another course. The set definition "
+"files can be uploaded/downloaded using the \"File Manager\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:29
+msgid ""
+"The simple configuration file is the name of the configuration file created "
+"when using the \"Course Configuration\" page to configure course options.  "
+"This option sets if this configuration file is copied from the old course or"
+" not and instead use the server defaults."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:551
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:521
 msgid "The solution has been removed."
+msgstr "Řešení bylo odstraněno."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:33
+msgid ""
+"The solution shown is an instructor preview and will only be shown to "
+"students after the due date."
+msgstr ""
+
+#. ($c->{fullSetID},
+#. $c->{prettyProblemNumber},
+#. $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1103
+msgid ""
+"The source file for \"set %1 / problem %2\" has been changed from \"%3\" to "
+"\"%4\"."
+msgstr ""
+
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1209
+msgid ""
+"The temporary file %1 is not contained in the course templates directory and"
+" can not be deleted."
 msgstr ""
 
-#. ($fullSetName, $prettyProblemNumber, $self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1975
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:689
 msgid ""
-"The source file for 'set %1 / problem %2 has been changed from '%3' to '%4'"
+"The temporary file %1 is not in the course templates directory and can not "
+"be deleted!"
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2133
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:349
 msgid ""
 "The test (which is version %1) may  no longer be submitted for a grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1927
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1042
 msgid ""
 "The text box now contains the source of the original problem. You can "
 "recover lost edits by using the Back button on your browser."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:214
+#. (			% . 'but the result will not be counted.')
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:23
 msgid ""
 "The time limit on this assignment was exceeded. The assignment may be "
-"checked, but the result will not be counted."
+"checked, "
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1657
+#: /opt/webwork/webwork2/conf/defaults.config:1559
 msgid ""
 "The time of the day that the assignment is due.  This can be changed on an "
 "individual basis, but WeBWorK will use this value for default when a set is "
@@ -6607,24 +8926,39 @@ msgid ""
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1443
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:689
 msgid "The title of the course %1 has been changed from %2 to %3"
 msgstr ""
 
-#. ($rename_newCourseID, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1491
+#. ($rename_newCourseID, $optional_arguments{courseTitle})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:722
 msgid "The title of the course %1 is now %2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:167
+msgid ""
+"The top number is the percent score on the problem.  A period (.) indicates "
+"a problem has not been attempted. The bottom number is the number of "
+"incorrect attempts."
+msgstr "Horní číslo je procento splnění úlohy. Tečka (.) označuje úlohy bez pokusu o odpověď. Dolní číslo je počet nesprávných pokusů."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:25
+msgid ""
+"The total grade row at the bottom shows the total score and percent average "
+"over all open assignments.  The total grade row can be shown/hidden under "
+"general course configuration settings."
+msgstr ""
+
 #. ($enableReducedScoring)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1151
 msgid ""
 "The value %1 for enableReducedScoring is not valid; it will be replaced with"
 " 'N'."
 msgstr ""
 
 #. ($timeCap)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2032
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1209
 msgid ""
 "The value %1 for the capTimeLimit option is not valid; it will be replaced "
 "with '0'."
@@ -6632,81 +8966,90 @@ msgstr ""
 
 #. ($hideScore)
 #. ($hideScoreByProblem)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2023
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1178
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1189
 msgid ""
 "The value %1 for the hideScore option is not valid; it will be replaced with"
 " 'N'."
 msgstr ""
 
 #. ($hideWork)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1200
 msgid ""
 "The value %1 for the hideWork option is not valid; it will be replaced with "
 "'N'."
 msgstr ""
 
 #. ($relaxRestrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2045
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1235
 msgid ""
 "The value %1 for the relaxRestrictIP option is not valid; it will be "
 "replaced with 'No'."
 msgstr ""
 
 #. ($restrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2037
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1221
 msgid ""
 "The value %1 for the restrictIP option is not valid; it will be replaced "
 "with 'No'."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:46
+msgid "The visible name/title of the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:36
 msgid ""
 "The webwork server must be able to write to these directories. Please "
 "correct the permssion errors."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1537
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:83
+msgid "Theme"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1439
 msgid "Theme (refresh page after saving changes to reveal new theme.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:109
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:5
 msgid "Theme:"
 msgstr ""
 
 # Context is "Sort by ____ Then by _____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:843
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:872
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:30
 msgid "Then by"
 msgstr ""
 
-#. ($count_line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:603
+#. ($listingsCount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:52
 msgid "There are %1 matching WeBWorK problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1625
+#: /opt/webwork/webwork2/conf/defaults.config:1527
 msgid ""
 "There are currently two hardcopy themes to choose from: One Column and Two "
 "Columns.  The Two Columns theme is the traditional hardcopy format.  The One"
 " Column theme uses the full page width for each column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2979
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1519
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
 "least one table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1243
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:23
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
-"least one table.  They can only be removed when upgrading the course."
+"least one table.  They can be removed when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1404
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
 "least one table. Check the checkbox by the field to delete it when upgrading"
@@ -6714,63 +9057,48 @@ msgid ""
 "is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1508
 msgid "There are extra database tables which are not defined in the schema."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2833
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1389
 msgid "There are extra database tables which are not defined in the schema. "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:15
 msgid ""
 "There are extra database tables which are not defined in the schema.  These "
 "can be deleted when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:601
-msgid "There are no matching WeBWorK problems"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:976
-msgid "There are no set definition files in this course to look at."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2199
-msgid ""
-"There are tables or fields missing from the database.  The database must be "
-"upgraded before archiving this course."
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:29
+msgid "There are many options available at the bottom:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4108
-msgid "There are upgrades available for the Open Problem Library."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:49
+msgid "There are no completed versions of this test."
 msgstr ""
 
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4072
-msgid ""
-"There are upgrades available for your current branch of PG from branch %1 in"
-" remote %2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:51
+msgid "There are no matching WeBWorK problems"
 msgstr ""
 
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4010
-msgid ""
-"There are upgrades available for your current branch of WeBWorK from branch "
-"%1 in remote %2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:8
+msgid "There are no set definition files in this course to look at."
 msgstr ""
 
 #. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:273
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:87
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
 "their name, you destroy all of the data for achievement %1 for this student."
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:230
+#. (tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:91
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
@@ -6778,37 +9106,29 @@ msgid ""
 "student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:205
-msgid ""
-"There is NO undo for this function.  Do not use it unless you know what you "
-"are doing!  When you unassign sets using this button, or by unchecking their"
-" set names, you destroy all of the data for those sets for this student."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:234
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:68
 msgid "There is NO undo for unassigning a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:174
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:177
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:139
-msgid "There is NO undo for unassigning students."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4069
-msgid "There is a new version of PG available."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:125
+msgid ""
+"There is NO undo for unassigning sets. Do not do so unless you know what you"
+" are doing!  When you unassign sets by unchecking set names and clicking "
+"save, you destroy all of the data for those sets for this student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4007
-msgid "There is a new version of WeBWorK available."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:21
+msgid "There is NO undo for unassigning students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:529
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:490
 msgid "There is a written solution available."
-msgstr ""
+msgstr "Obsahuje i řešení úlohy."
 
 #. ($message_file, $merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:50
 msgid ""
 "There is no additional grade information.  A message about additional grades"
 " can go in [TMPL]/email/%1. It is merged with the file [Scoring]/%2. These "
@@ -6817,328 +9137,639 @@ msgid ""
 msgstr ""
 
 #. ($continueTimeLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:486
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:25
 msgid ""
 "There is no time remaining on the currently open test. Click continue below "
 "and then click \"Grade Test\" within %1 seconds to submit the test for a "
 "grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:856
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:65
 msgid "There is no undo for deleting files or directories!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:534
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:495
 msgid ""
 "There is no written solution available for this problem, but you can still "
 "view the correct answers."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:537
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:498
 msgid "There is no written solution available for this problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1539
-msgid ""
-"There is one main theme to choose from: math4. It has two variants, "
-"math4-green and math4-red. The theme specifies a unified look and feel for "
-"the WeBWorK course web pages."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2270
+#: /opt/webwork/webwork2/conf/defaults.config:1441
 msgid ""
-"There may be something wrong with this question. Please inform your "
-"instructor including the warning messages below."
+"There is one main theme to choose from: math4. It has three variants: "
+"math4-green, math4-red, and math4-yellow. The theme specifies a unified look"
+" and feel for the WeBWorK course web pages."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:441
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator if this recurs."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:284
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:307
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:475
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:484
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:511
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:543
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:219
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:354
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:492
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:536
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:575
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:172
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:189
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:212
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:227
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:365
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:447
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1935
+#. ('href="https://webwork.maa.org/wiki/Set_Definition_Files"
+#. target="Webworkdocs"')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:48
 msgid ""
-"These users and higher get the \"Show Past Answers\" button on the problem "
-"page."
+"These are stored in the templates directory. The format of <strong>Set "
+"Definition files</strong> is described in the <a %1>Set Definition "
+"specification</a>. Set definition files are mainly useful for transferring "
+"set assignments from one course to another and are created when exporting a "
+"problem set from the \"Hmwk Sets Editor\".  Each set defintion file contains"
+" a list of problems used and the dates and times. These definitions can be "
+"imported into the current course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:133
-msgid "This action can take a long time if there are many students."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:77
+msgid ""
+"These are the files from which problems are generated and are located in the"
+" templates directory or in subdirectories. They can be edited directly using"
+" the \"Edit\" link on each problem page or from the \"Hmwk Sets Editor\". "
+"The File Manager allows you to upload or download these files. \tDirectories"
+" that start with \"set\" contain pg files and are generated when exporting a"
+" problem set in which there are local versions of a problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:168
-msgid "This action will not overwrite existing users."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:40
+msgid ""
+"These options will only be shown if the user has the permission to change "
+"display settings used in pg problems."
 msgstr ""
 
-#. (CGI::b($r->maketext("Guest Login")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:279
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:44
 msgid ""
-"This course supports guest logins. Click %1 to log into this course as a "
-"guest."
-msgstr "Předmět umožňuje přihlášení jako host. Stiskněte %1 pro přihlášení do předmětu v roli hosta."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:851
-msgid "This homework set contains no problems."
+"These problems require some application of algorithms, but do not rise to "
+"the level of a full word problem. For example, \"Identify the local extrema "
+"for f(x) = ...\". One has to apply algorithms and interpret results."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1988
-msgid "This homework set is closed."
-msgstr "Odevzdávání tohoto zadání bylo ukončeno."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1986
-msgid "This homework set is not yet open."
-msgstr "Toto zadání ještě nemá otevřené odevzdávání."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:932
+#: /opt/webwork/webwork2/conf/defaults.config:1837
 msgid ""
-"This is a blank problem template file and can not be edited directly. Use "
-"the 'NewVersion' action below to create a local copy of the file and add it "
-"to the current problem set."
+"These users and higher get the \"Show Past Answers\" button on the problem "
+"page."
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
-msgid "This is a new (re-randomized) version of the problem."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:17
+msgid "This action can take a long time if there are many students."
 msgstr ""
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:580
-msgid ""
-"This is a timed test. You will have %quant(%1,hour) and %quant(%2,minute) to"
-" complete the test."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:12
+msgid "This action will not overwrite existing users."
 msgstr ""
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:592
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:20
 msgid ""
-"This is a timed test. You will have "
-"%quant(%1,hour,hours,)%quant(%2,minute,minutes,) to complete the test."
+"This allows for the viewing, downloading, uploading and other management of "
+"files in the course.  Select a file or set of files (using CTRL or SHIFT) "
+"and click the desired button on the right.  Many actions can only be done "
+"with a single file (like view). Selecting a directory or set of files and "
+"clicking \"Make Archive\" creates a compressed tar file with the name "
+"COURSE_NAME.tgz"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:284
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:34
 msgid ""
-"This is the Achievement Editor.  It is used to edit the achievements "
-"available to students.  Please keep in mind the following facts: Achievments"
-" are displayed, and evaluated, in the order they are listed. The \"secret\" "
-"category creates achievements which are not visible to students until they "
-"are earned.  The \"level\" category is used for the achievements associated "
-"to a users level."
+"This browses the Open Problem Library (OPL) in category "
+"(Subject/Chapter/Section) form. Select the desired categories (all three do "
+"not need to be selected) and click \"View Problems\". If the \"Include "
+"Contrib\" box is selected then those problems in the Contrib section of the "
+"OPL that have the categories defined are also included. Contrib problems are"
+" problem that haven't been vetted as thoroughly as OPL problems. If you want"
+" hints or solutions included while browsing select the appropriate box."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:481
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:49
 msgid ""
-"This is the classlist editor page, where you can view and edit the records "
-"of all the students currently enrolled in this course.  The top of the page "
-"contains forms which allow you to filter which students to view, sort your "
-"students in a chosen order, edit student records, give new passwords to "
-"students, import/export student records from/to external files, or "
-"add/delete students.  To use, please select the action you would like to "
-"perform, enter in the relevant information in the fields below, and hit the "
-"\"Take Action!\" button at the bottom of the form.  The bottom of the page "
-"contains a table containing the student usernames and their information. "
-"Clicking on the links in the column headers of the table will sort the table"
-" by the field it corresponds to. The Login Name fields contain checkboxes "
-"for selecting the user.  Clicking the link of the name itself will allow you"
-" to act as the selected user.  There is also an edit link following the name"
-" which will take you to a page where you can edit the selected user's "
-"information.  Clicking the emails will allow you to email the corresponding "
-"user.  Clicking the links in the entries in the assigned sets columns will "
-"take you to a page where you can view and reassign the sets for the selected"
-" user. "
+"This button is also present both at top and the bottom of the page. Discards"
+" all changes, reloading the page by re-reading the database information for "
+"this set."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1810
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:39
 msgid ""
-"This is the default number of attempts before show me another becomes "
-"available to students.  It can be set to -1 to disable show me another by "
-"default."
+"This button is present both at top and the bottom of the page. Any and all "
+"changes made to any part of the set will be saved with one important "
+"exception: When editing the set for one or more students, you can choose to "
+"override the default value (defined for the set in general) by clicking on "
+"the checkbox and providing a value (or possibly leaving blank) and checking "
+"the override checkbox. If you do <strong>NOT</strong> check the checkbox, "
+"the override value will be discarded and the default value for the set will "
+"be used for the users currently being edited."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:456
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:105
 msgid ""
-"This is the homework sets editor page where you can view and edit the "
-"homework sets that exist in this course and the problems that they contain. "
-"The top of the page contains forms which allow you to filter which sets to "
-"display in the table, sort the sets in a chosen order, edit homework sets, "
-"publish homework sets, import/export sets from/to an external file, score "
-"sets, or create/delete sets.  To use, please select the action you would "
-"like to perform, enter in the relevant information in the fields below, and "
-"hit the \"Take Action!\" button at the bottom of the form.  The bottom of "
-"the page contains a table displaying the sets and several pieces of relevant"
-" information. The Edit Set Data field in the table contains checkboxes for "
-"selection and a link to the set data editing page.  The cells in the Edit "
-"Problems fields contain links which take you to a page where you can edit "
-"the containing problems, and the cells in the edit assigned users field "
-"contains links which take you to a page where you can edit what students the"
-" set is assigned to."
+"This can computed from the answer sub scores above using the weights shown "
+"if they are modified.  Alternatively, enter the point score you want saved "
+"here (the above sub scores will be ignored)."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1699
+#: /opt/webwork/webwork2/conf/defaults.config:2005
 msgid ""
-"This is the number of achievement points given to each user for completing a"
-" problem."
+"This configures if the single problem manual grader has inputs to enter "
+"problem scores as a percent, a point value, or both. Note, the problem score"
+" is always saved as a percent, so when using a point value, the problem "
+"score will be rounded to the nearest whole percent."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:166
+#. (tag('b', maketext('Guest Login')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:72
 msgid ""
-"This is the only part of the score that is actually saved. This is computed "
-"from the answer sub scores above using the weights shown if they are "
-"modified.  Alternatively, enter the score you want saved here (the above sub"
-" scores will be ignored)."
+"This course supports guest logins. Click %1 to log into this course as a "
+"guest."
+msgstr "Předmět umožňuje přihlášení jako host. Stiskněte %1 pro přihlášení do předmětu v roli hosta."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:58
+msgid ""
+"This determines if MathQuill answer blanks are enable for the user. This "
+"option is only present if MathQuill is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:63
+msgid ""
+"This determines if the MathView equation editor button will be appended to "
+"text answer blanks. his option is only present if MathView is enabled for "
+"the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:52
+msgid ""
+"This determines whether or not saved past answers are automatically filled "
+"in to the problem form when a student returns to a problem after having left"
+" the problem. This option is only visible if the user has the permission to "
+"show old answers."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:85
+msgid ""
+"This directory is accessible from the web. You can use it to store html "
+"documents or image documents that are used by the course. Do not store "
+"private information in this directory or in any subdirectory thereof. These "
+"documents can be linked to from within problems using the htmlLink macro."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:255
+msgid "This file is a template. You may use \"Save As\" to create a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:20
+msgid ""
+"This form can assign, unassign, and edit user data for a single achievement."
+"  You can assign the achievement to all current users or select which users "
+"to assign the achievement to and click Save.  You can unassign the "
+"achievement by unchecking a student's name (note all data will be deleted)."
+"  To unassign the achievement from all users, first select \"Allow "
+"unassign\" and then click the \"Unassign from All Users\" button. You can "
+"also toggle the earned status with the checkbox in the \"Earned\" column and"
+" edit the achievement counter for counting achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:19
+msgid ""
+"This gives the status and dates of the main set. Indvidual students may have"
+" different settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:51
+msgid "This homework set contains no problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1231
+msgid "This homework set is closed."
+msgstr "Odevzdávání tohoto zadání bylo ukončeno."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1229
+msgid "This homework set is not yet open."
+msgstr "Toto zadání ještě nemá otevřené odevzdávání."
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:423
+msgid "This is a new (re-randomized) version of the problem."
+msgstr ""
+
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:109
+msgid ""
+"This is a timed test. You will have %quant(%1,hour) and %quant(%2,minute) to"
+" complete the test."
+msgstr ""
+
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:119
+msgid ""
+"This is a timed test. You will have "
+"%quant(%1,hour,hours,)%quant(%2,minute,minutes,) to complete the test."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:81
+msgid ""
+"This is done by first entering the user as a student and then changing the "
+"permission level of the user. First edit the user by clicking on the pencil "
+"next to their name (or using the technique above for several users), then "
+"change their permssion level -- an entry blank at the far right of the "
+"screen, you may have to scroll to see it. The permission levels are"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:156
+msgid ""
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page if you wish to assign a homework set to all students or a large group "
+"of students (e.g. a section)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:161
+msgid ""
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:171
+msgid ""
+"This is done from the \"Hmwk Sets Editor\" page or the \"Instructor tools\" "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:71
+msgid ""
+"This is most easily done by importing a class list. The class list can be "
+"uploaded from your workstation to the server using the File Manager page. "
+"The class list must be a file ending in .lst and must have a specific <a "
+"href=\"http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files\">format</a>."
+" Once the file has been uploaded to the server the file will appear in the "
+"import action pop-up list (5th action). demoCourse.lst is available for most"
+" courses and adds the \"practice users\" which activate guest logins to the "
+"class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:23
+msgid ""
+"This is the administration course which is used to manage courses on this "
+"server.  Use the \"Admin Menu\" to select the desired action."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1996
+msgid ""
+"This is the default number of attempts a student must make before hints will"
+" be shown to the student. Set this to -1 to hide hints.  Note that this can "
+"be overridden with a per problem setting."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1712
+msgid ""
+"This is the default number of attempts before show me another becomes "
+"available to students.  It can be set to -1 to disable show me another by "
+"default."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1601
+msgid ""
+"This is the number of achievement points given to each user for completing a"
+" problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:150
+msgid ""
+"This is the only part of the score that is actually saved. This is computed "
+"from the answer sub scores above using the weights shown if they are "
+"modified.  Alternatively, enter the score you want saved here (the above sub"
+" scores will be ignored)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:19
+msgid "This is the standard entry point for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:388
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:92
 msgid ""
-"This is the past answer viewer.  Students can only see their answers, and "
-"they will not be able to see which parts are correct.  Instructors can view "
-"any users answers using the form below and the answers will be colored "
-"according to correctness."
+"This is where email messages and templates are saved. You can upload or "
+"download files in this directory if you wish to save the files for later."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2462
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:77
+msgid ""
+"This is where you edit the text of the problem template. Type Ctrl-Enter "
+"while this window has focus to re-render the problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:669
 msgid ""
 "This is your last submission.  If you say yes, then your answers will be "
 "final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2466
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:673
 msgid ""
 "This is your only submission.  If you say yes, then your answers will be "
 "final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3038
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:42
+msgid ""
+"This link gives details for many macros. It links to documentation embedded "
+"in the macro files themselves."
+msgstr ""
+
+#. ('PGMLLab/PGML-lab.pg')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:63
+msgid ""
+"This links to a WeBWorK \"problem\" which allows you to try out fragments of"
+" PGML code. This link will not be available if the file %1 is not located in"
+" the templates directory of the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:33
+msgid "This links to a list of problem authoring techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:39
+msgid "This links to a page describing Math Object usage."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:72
+msgid "This links to problem authoring information on the WeBWorK wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:46
+msgid ""
+"This may be Mathjax, images, or plainText. Only the options that are enabled"
+" for the course will be available to select. This option is only visible if "
+"there is more than one display mode enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:42
+msgid "This option shows all pg problems in the course directory structure."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:47
+msgid ""
+"This option shows all problems in set definition files that are located in "
+"the course directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:44
+msgid ""
+"This option shows all problems in sets that have been created in the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:20
+msgid ""
+"This page allows one to edit the contents of PG problem files as well as set"
+" headers and other files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:20
+msgid ""
+"This page allows users to change their password, email address, and display "
+"settings used in problems. Note that you can hide this page entirely for "
+"students by setting permission levels to login_proctor or higher for the "
+"permissions to change password, change e-mail address, and change display "
+"settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:20
+msgid ""
+"This page allows you to configure course settings such as permission levels,"
+" display modes allowed, default display mode, email feedback behavior, and "
+"much more."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:20
+msgid ""
+"This page displays a student's current achievement level and progress toward"
+" the next level, and lists the rewards and badges that the student has "
+"earned. If rewards have been earned, then the student may also redeem those "
+"rewards."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:26
+msgid ""
+"This page gives access to information about the student, independent of the "
+"homework sets assigned to them."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:20
+msgid ""
+"This page gives information about mass LTI grade updates, and allows you to "
+"trigger a grade update for all users and all sets, all sets for one user, "
+"all users for one set, or one user for one set.  When a user is selected, "
+"the sets drop down menu is updated to only allow selecting sets assigned the"
+" selected user.  Similarly when a set is selected, the user menu is updated "
+"to only allow selecting valid users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:20
+msgid ""
+"This page is a collection of tools to modify users and sets.  These tools "
+"are short cuts for common actions that allow selecting multiple users or "
+"sets to act on at once.  Because multiple users and sets can be acted on at "
+"the same time, it is often more efficient to use this page when modifying "
+"multiple items.  For example, after selecting several users and a set you "
+"can change the close date for all selected users for that set.  This page "
+"also gives access to \"View/Edit all sets for one user\", which can be used "
+"to access settings for all sets including test versions for that user."
+msgstr ""
+
+#. (q(table to save any changes.  Each student's name links to that student's
+#. problem and opens up the)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:20
+msgid ""
+"This page is for manually grading a problem for all assigned students.  The "
+"table of students shows their last answers, percent score, and feedback "
+"comment.  The \"Save\" button is located below the "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:20
+msgid ""
+"This page is used to browse problems that will be used to fill problem sets."
+" The first step is to choose which set you are working on. If you need to "
+"create a new problem set fill in the blank next to the \"Create a New Set in"
+" This Course\" button and then press the button. Then choose which set you "
+"want to work on in the drop down menu."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:20
+msgid ""
+"This page is useful for monitoring student progress on assignments. Student "
+"progress can either be viewed for a single set or for a single student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:20
+msgid ""
+"This page manages all of the homework sets (including quizzes/tests). The "
+"following allow editing directly of a single problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:20
+msgid ""
+"This page shows the student's current grades for all sets they are assigned "
+"to.  Only visible sets are shown to the student, while invisible set names "
+"are italic when viewed as an instructor.  Students can only see the per "
+"problem grades on open assignments."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3169
 msgid "This problem contains a video which must be viewed online."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:602
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:631
 msgid "This problem has more than one part."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2059
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2293
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1323
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1576
 msgid ""
 "This problem has open subproblems.  You can visit them by using the links to"
 " the left or visiting the set page."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem.html.ep:66
+msgid "This problem is not valid."
+msgstr ""
+
 #. ($prettyID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2619
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:399
 msgid "This problem uses the same source file as number %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:418
 msgid "This problem will not count towards your grade."
 msgstr "Tato úloha se nezapočítává do celkového bodového zisku."
 
-#. ($EMAIL)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1109
+#. ($ur->email_address)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:1
 msgid "This sample mail would be sent to %1"
 msgstr ""
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2088
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1399
 msgid ""
 "This score for this problem does not count for the score of problem %1 or "
 "for the set."
 msgstr ""
 
-#. ($message_file,		$merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:167
+#. ($message_file,				$merge_file)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:127
 msgid ""
 "This scoring message is generated from [TMPL]/email/%1. It is merged with "
 "the file [Scoring]/%2. These files can be edited using the \"Email\" link "
 "and the \"File Manager\" link in the left margin."
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2215
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:155
 msgid "This set %1 is assigned to %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2932
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:678
 msgid "This set doesn't contain any problems yet."
 msgstr ""
 
-#. ($beginReducedScoringPeriod, $dueDate, $reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:334
+#. ($c->formatDateTime($reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:44
 msgid ""
 "This set had a reduced scoring period that started on %1 and ended on %2.  "
 "During that period all work counted for %3% of its value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:78
 msgid ""
 "This set has a set-level proctor password to authorize logins. Enter the "
 "password below."
 msgstr ""
 
-#. (CGI::span({class=>$visiblityStateClass}, $visiblityStateText)
-# Context is "This set is visible" or "This set is hidden"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:532
-msgid "This set is %1"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:411
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:59
 msgid "This set is hidden from students."
 msgstr ""
 
 #. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:330
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:40
 msgid ""
 "This set is in its reduced scoring period.  All work counts for %1% of its "
 "value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:65
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:51
+msgid "This set is not assigned to any students."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:57
 msgid "This set is visible to students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:190
-msgid "This set needs to be assigned to you before you can grade it."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:42
+msgid "This set or problem is not valid."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:158
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:164
 msgid ""
 "This set will be unavailable to students until they have earned a certain "
-"score on the sets specified in this field.  The sets should be written as a "
-"comma separated list.  The minimum score required on the sets is specified "
-"in the following field."
+"score on the sets specified in this field. The sets should be written as a "
+"comma separated list. The minimum score required on the sets is specified in"
+" the following field."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2007
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:111
+msgid ""
+"This should be done cautiously. Once a student is deleted from a course "
+"their data is lost forever and cannot be recovered. They can be added to the"
+" course as a new student, but all of their homework set assignments and "
+"homework has been permanently deleted."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1962
 msgid "This source file does not exist!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1961
 msgid "This source file is a directory!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1963
 msgid "This source file is not a plain file!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2005
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1960
 msgid "This source file is not readable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:358
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+msgid ""
+"This specifies the number of attempts before hints are shown to students. "
+"The value of -2 uses the default from course configuration. The value of -1 "
+"disables hints. Note that this will only have an effect if the problem has a"
+" hint."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
 msgid ""
 "This specifies the rerandomization period: the number of attempts before a "
 "new version of the problem is generated by changing the Seed value. The "
@@ -7146,344 +9777,516 @@ msgid ""
 "disables rerandomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:651
-msgid ""
-"This table lists the current attempts for this test/quiz, along with its "
-"status, score, start date, and close date. Click on the version link to "
-"access that version. "
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:626
-msgid "This test is closed."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:548
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:81
 msgid "This test requires a proctor password to continue."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:600
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:126
 msgid "This test requires a proctor password to start."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2248
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2323
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:45
+msgid "This will determine if the output is in one or two columns."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:21
 msgid "Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:249
 msgid "Time Interval for New Test Versions (min; 0=infty)"
 msgstr ""
 
-#. ($elapsedTime,$allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:159
+msgid "Time Remaining"
+msgstr ""
+
+#. ($c->{elapsedTime}, sprintf('%.0f', 10 * ($c->{set}->due_date -
+#. $c->{set}->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:336
 msgid "Time taken on test: %1 min (%2 min allowed)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
 msgid "Timestamp"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1610
+#: /opt/webwork/webwork2/conf/defaults.config:1512
 msgid "Timezone for the course"
 msgstr ""
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:512
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:330
 msgid "To access this set you must score at least %1% on set %2."
 msgstr ""
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:514
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:336
 msgid ""
 "To access this set you must score at least %1% on the following sets: %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:53
 msgid ""
 "To add an additional instructor to the new course, specify user information "
 "below. The user ID may contain only numbers, letters, hyphens, periods "
 "(dots), commas,and underscores."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:42
 msgid ""
 "To add the WeBWorK administrators to the new course (as administrators) "
 "check the box below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:239
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:118
+msgid ""
+"To assign one or more sets to an individual student click in the column "
+"\"Assigned Sets\" in the student's row. This will take you to a page where "
+"you can assign and unassign homework sets and change the due dates for "
+"homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:79
 msgid ""
 "To change status (scores or grades) for this student for one set, click on "
 "the individual set link."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:621
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:106
+msgid ""
+"To copy the templates and html folders from an existing course, select the "
+"course below."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:102
 msgid ""
-"To copy problem templates from an existing course, select the course below."
+"To drop a student or students, select them for editing as described above "
+"and then set the pop-up list to enrolled,drop, or audit. Dropped students "
+"cannot log in to the course, are not assigned new homework sets and are not "
+"sent e-mail. They can be re-enrolled simply by changing their status back to"
+" enrolled. No data is lost, any homework sets assigned before they were "
+"dropped are restored unchanged."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2200
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:143
 msgid ""
 "To edit a specific student version of this set, edit (all of) her/his "
 "assigned sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:376
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:29
 msgid ""
-"To edit this text you must first make a copy of this file using the "
-"'NewVersion' action below."
+"To perform an action select the desired action tab and click the submit "
+"button."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:381
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:90
+msgid "To this Problem"
+msgstr "Na tuto úlohu"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:69
 msgid ""
-"To edit this text you must use the 'NewVersion' action below to save it to "
-"another file."
+"To use the Email merge feature, upload a CSV with calculated grades to the "
+"scoring directory using the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1343
-msgid "To this Problem"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:767
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:58
+msgid "Today"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:143
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:33
+msgid "Toggle each of the options to include or not include in the output."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:522
+msgid "Top Score"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:118
+msgid "Top level of author information on the wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:114
+msgid "Total Points"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:18
 msgid "Total Points:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:90
 msgid "Totals"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:290
 msgid "Totals only (not problem scores)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:291
 msgid "Totals only, only after answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:236
 msgid "Transfer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:284
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:22
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:35
 msgid "True"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1279
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:245
 msgid "Try it"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:26
 msgid "Tunic of Extension"
-msgstr ""
+msgstr "Prodlužovací kouzlo"
 
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:86
 msgid "Two Columns"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1470
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:30
 msgid "Type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2325
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:84
+msgid "Type:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:23
 msgid "URI"
 msgstr ""
 
 #. ($achievementName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:297
 msgid "Unable to change the evaluator for set %1. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:819
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1084
+msgid "Unable to change the hardcopy header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1070
+msgid "Unable to change the set header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{fullSetID}, $c->{prettyProblemNumber})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1110
+msgid ""
+"Unable to change the source file path for set %1, problem %2. Unknown error."
+msgstr ""
+
+#. ($c->shortPath($delFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1246
+msgid "Unable to delete backup file \"%1\"."
+msgstr ""
+
+#. ($formatBackupTime)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:571
+msgid "Unable to delete backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:888
+msgid "Unable to make \"%1\" the hardcopy header for %2."
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:860
+msgid "Unable to make \"%1\" the set header for %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:693
 msgid "Unable to obtain error messages from within the PG question."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:384
-msgid "Unable to write to '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:275
+msgid "Unable to open a temporary file at the given location."
+msgstr ""
+
+#. ($c->shortPath($backupFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1233
+msgid "Unable to read backup file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2613
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:636
+msgid "Unable to write to \"%1\": %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:15
 msgid "Unarchive"
 msgstr ""
 
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2596
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:4
 msgid "Unarchive %1 to course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2581
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:40
 msgid "Unarchive Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2675
-msgid "Unarchive Next Course"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:17
+msgid "Unarchive Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:25
+msgid "Unarchive Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:214
-msgid "Unassign All Sets"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1306
+msgid "Unarchive Next Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:281
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:239
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:97
 msgid "Unassign from All Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:61
 msgid "Unassign selected sets from selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:58
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:57
 msgid ""
-"Unassignments were not done.  You need to both click to \"Allow unassign\" "
-"and click on the Unassign button."
+"Unassignments were not done.  You need to select \"Allow unassign\" and then"
+" click on the Unassign button."
 msgstr ""
 
 #. ($unattempted, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1047
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:44
 msgid "Unattempted: %1/%2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:53
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:37
 msgid "Unclassified Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:242
 msgid "Ungraded"
 msgstr "Zatím nehodnoceno"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3723
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3765
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:58
 msgid "Unhide Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1465
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1151
+msgid "Unkown saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:28
 msgid ""
-"Unlock an additional version of a Gateway Test.  If used before the close "
-"date of the Gateway Test this will allow you to generate a new version of "
-"the test."
+"Unlock an additional version of a test.  If used before the close date of "
+"the test this will allow you to generate a new version of the test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:164
-msgid "Unpack"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:47
+msgid "Unpack Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:113
 msgid "Unpack archives automatically"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2709
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:15
 msgid "Unselect all courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:130
-msgid "Update"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:63
+msgid "Update Display"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:671
-msgid "Update Display"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:84
+msgid "Update Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:27
+msgid "Update Interval"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:930
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:102
 msgid "Update Menus"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:729
-msgid "Update settings and refresh page"
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:51
+msgid "Update aborted. Invalid set %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2695
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:47
+msgid "Update aborted. Invalid user %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:67
+msgid "Update set:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:8
 msgid "Update the checked directories?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3544
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:50
+msgid "Update user:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1908
 msgid "Updated location description."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2739
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2917
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:40
 msgid "Upgrade"
 msgstr ""
 
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
 msgid "Upgrade %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1327
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2278
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:97
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:79
 msgid "Upgrade Course Tables"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2693
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2761
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:382
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:42
 msgid "Upgrade Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3010
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:17
+msgid "Upgrade Courses Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:43
+msgid "Upgrade courses from a previous version of WeBWorK."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1582
 msgid "Upgrade process completed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:388
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:65
 msgid "Upload"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2441
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:72
+msgid ""
+"Upload, download and delete text files, including scoring spread sheets, set"
+" definition files, class list spread sheets, and \"PG\" problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:292
 msgid "Use Default Header File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:325
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:127
 msgid "Use Equation Editor?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:204
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:20
 msgid "Use Reward"
-msgstr ""
+msgstr "Použít odměnu"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2720
-msgid "Use System Default"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:516
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:27
 msgid "Use browser back button to return from preview mode."
 msgstr ""
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:506
+#. (tag('b', $c->{achievementID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:16
 msgid "Use in achievement %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:526
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:23
 msgid "Use in new achievement:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:149
 msgid "Use live equation rendering?"
 msgstr "Použít asistenci při zadávání vzorců?"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2028
+#: /opt/webwork/webwork2/conf/defaults.config:1929
 msgid "Use log base 10 instead of base <i>e</i>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2034
+#: /opt/webwork/webwork2/conf/defaults.config:1935
 msgid "Use older answer checkers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:234
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:123
+msgid ""
+"Use the \"Create\" and \"Delete\" actions to create or delete achievements. "
+"Note that deleting an achievement will delete all data associated to the "
+"achievement and cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:35
+msgid ""
+"Use the \"Merge file\" drop down menu to select which merge file to use, or "
+"select \"None\" to not use any merge file.  When a merge file is selected, "
+"the data for active students will be displayed above the \"Email Body\".  "
+"This will show you the structure of the merge file and the column variables "
+"associated with each column.  Data that is longer than 7 characters will be "
+"truncated, and the data can be scrolled up and down to see all rows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:28
+msgid ""
+"Use the \"Users\" and \"Sets\" forms to select which users and sets to act "
+"on.  Multiple items can be selected using ctrl-click or shift-click.  The "
+"action buttons are grouped into three categories.  The first is a set of "
+"actions that act on the selected users, the second is a set of actions that "
+"act on the selected sets, and the third is a set of actions for acting on a "
+"combination of sets and users.  If an invalid number of users or sets are "
+"selected, the action will not be preformed, and an error message will be "
+"placed on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:25
+msgid ""
+"Use the editor to edit the evaluator and the action form at the bottom to "
+"save the evaluator. You can either overwrite the current evaluator file or "
+"save as a new evaluator file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:15
 msgid ""
 "Use the interface below to quickly access commonly-used instructor tools, or"
 " select a tool from the list to the left."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:332
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:26
+msgid ""
+"Use the options in the second box to pick a collection of problems decribed "
+"below. In each case, clicking \"View Problems\" will render a fixed number "
+"of problems (default of 20). After problems are shown, there will be options"
+" to show the next/previous batch of problems, add all problems to the target"
+" set (set at the top of the page) or clear the curent batch of problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:27
 msgid ""
 "Use this form to ask your instructor a question, to report a problem with "
 "the WeBWorK system, or to report an error in a problem you are attempting. "
@@ -7491,73 +10294,103 @@ msgid ""
 "system will be included."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:29
+msgid "Use this page to change your password."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:20
+msgid ""
+"Use this page to send emails to active (enrolled or auditing) students.  "
+"Emails can be sent to all active students or selected students.  Use the "
+"\"Students\" form to sort, filter, or format how the user name is displayed."
+"  Click \"Change Display Settings\" to apply any changes.  Use control-click"
+" or shift-click to select multiple students to email."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:67
+msgid ""
+"Used for \"counting\" achievements, which sets the value a counter must "
+"reach in order to earn the achievement. For example this is used counting "
+"the number of completed problems."
+msgstr ""
+
+#. (param('user')
+#. (param('effectiveUser')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:7
+msgid "User \"%1\" not found."
+msgstr ""
+
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:324
 msgid ""
-"User '%1' will not be copied from admin course as it is the initial "
+"User \"%1\" will not be copied from admin course as it is the initial "
 "instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:557
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:34
+msgid "User %1 not found."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:217
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:64
 msgid "User ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:298
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:230
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:28
 msgid "User Settings"
 msgstr "Uživatelská nastavení"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:490
-msgid "User Value"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:52
-msgid "User has been assigned to all current sets."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:17
+msgid "User Settings Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:58
-msgid "User has been unassigned from all sets."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:576
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:13
+msgid "User overrides"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:247
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:62
 msgid "User's name is:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:68
-msgid "User's sets have been reassigned."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:60
 msgid "User's username is:"
 msgstr ""
 
 #. ($user, $setID, $j)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1077
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
 msgid ""
 "UserProblem missing for user=%1 set=%2 problem=%3. This may indicate "
 "database corruption."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:51
 msgid "Username"
 msgstr "Jméno"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:499
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:126
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:272
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:9
 msgid "Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:339
 msgid "Users Assigned to Set %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2077
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:17
+msgid "Users Assigned to Set Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:65
 msgid "Users List"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1925
+#: /opt/webwork/webwork2/conf/defaults.config:1827
 msgid ""
 "Users at this level and higher are allowed to change display settings used "
 "in pg problems.Note that if it is expected that there will be students that "
@@ -7566,31 +10399,31 @@ msgid ""
 "those students may need to disable MathQuill."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1915
+#: /opt/webwork/webwork2/conf/defaults.config:1817
 msgid ""
 "Users at this level and higher are allowed to change their e-mail address. "
 "Normally guest users are not allowed to change the e-mail address since it "
 "does not make sense to send e-mail to anonymous accounts."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1879
+#: /opt/webwork/webwork2/conf/defaults.config:1781
 msgid ""
 "Users at this level and higher are allowed to change their password. "
 "Normally guest users are not allowed to change their password."
 msgstr ""
 
-#. ($names{$primary}, $names{$secondary}, $names{$ternary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:924
+#. ($c->maketext(FIELD_PROPERTIES()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:316
 msgid "Users sorted by %1, then by %2, then by %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1906
+#: /opt/webwork/webwork2/conf/defaults.config:1808
 msgid ""
 "Users with at least this permission level get a link in the left panel for "
 "reporting bugs to the bug tracking system at bugs.webwork.maa.org."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2140
+#: /opt/webwork/webwork2/conf/defaults.config:2051
 msgid ""
 "Users with this permssion level or greater will automatically be sent "
 "feedback from students (generated when they use the \"Contact instructor\" "
@@ -7599,157 +10432,225 @@ msgid ""
 "permission level to \"nobody\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1348
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:193
 msgid "Uses Math Objects"
 msgstr ""
 
-#. ($default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:197
-msgid "Using contents of the default message %1 instead."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1239
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:18
 msgid "Using what display mode?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:6
 msgid "Using what seed?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:19
+msgid "Using which hardcopy format?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:49
+msgid "Using which hardcopy theme?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:31
+msgid ""
+"Usually means students must demonstrate understanding of facts. This is more"
+" than regurgitating the fact. We use this category for simple and direct "
+"applications of algorithms the student has studied. There should be no "
+"judgement involved in choosing the method. This would include a simple "
+"application of a rule for differentiation (e.g., can combine rules for sums "
+"and constant multiples with one more advanced rule) or for integrals."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Value"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1747
+#: /opt/webwork/webwork2/conf/defaults.config:1649
 msgid "Value of work done in Reduced Scoring Period"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:687
-msgid "Variable Documentation:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config/config_help.html.ep:20
+msgid "Variable Documentation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:115
+msgid "Version"
 msgstr ""
 
 #. ($ver->{version})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:679
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:173
 msgid "Version %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:159
 msgid "Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:43
 msgid "Versions of a set can only be edited for one user at a time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:128
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2419
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2756
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:528
 msgid "View"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1000
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:488
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:523
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:681
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:948
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:6
 msgid "View Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:276
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:57
+msgid "View details of student perofrmance either by individual or by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:86
 msgid "View equations as"
 msgstr "Způsob zobrazování vzorců"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:283
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:18
 msgid "View statistics by set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:288
-msgid "View statistics by student"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:19
+msgid "View statistics by student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:55
+msgid ""
+"View statistics of students' performance on homework either by individual or"
+" by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:14
+msgid "View student progress by set"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:15
+msgid "View student progress by student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:65
+msgid "View/Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:298
-msgid "View student progress by set"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:104
+msgid "View/Reload"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:303
-msgid "View student progress by student"
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:31
+msgid "View/access current and archived courses."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:403
-msgid "View/Edit"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:146
+msgid "Viewing Problems in a New Window"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:224
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:90
-msgid "Viewing temporary file:"
+#. ($c->{problem}->source_file)
+#. ($screenSetHeader)
+#. ($course_info_path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:81
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:109
+msgid "Viewing temporary file: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:766
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:790
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:25
 msgid "Visibility"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:915
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:7
 msgid "Visible"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:622
 msgid "Visible sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
 msgid "Visible to Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2269
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:844
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "Warning"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2319
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:13
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:117
 msgid "Warning messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1039
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:259
+msgid "Warning messages:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all set-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1035
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all user-related data and is not undoable!"
 msgstr ""
 
-#. ($problem_desc , CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1397
+#. ($problem_desc,				$c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1194
 msgid "Warnings encountered while processing %1. Error text: %2"
 msgstr ""
 
-#. ($copyright_years, $theme, $ww_version, $pg_version)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1261
-msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4 |"
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:39
+msgid ""
+"We use this for carrying out more complicated algorithms, such as "
+"derivatives using both the product and chain rule or integrals which involve"
+" say both a substitution and parts."
+msgstr ""
+
+#. ($ce->{WW_COPYRIGHT_YEARS} || '1996-2023',              $ce->{defaultTheme}
+#. || 'unknown -- set defaultTheme in localOverides.conf',
+#. $ce->{WW_VERSION}         || 'unknown -- set WW_VERSION in VERSION',
+#. $ce->{PG_VERSION}         || 'unknown -- set PG_VERSION in ../pg/VERSION')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:9
+msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2227
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:3
 msgid "WeBWorK Error"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:3
 msgid "WeBWorK Warnings"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1549
+#: /opt/webwork/webwork2/conf/defaults.config:1451
 msgid ""
 "WeBWorK currently has translations for the languages listed in the course "
 "configuration."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:20
+msgid ""
+"WeBWorK does not have a full featured scoring ability. We leave that to your"
+" favorite spreadsheet application."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:38
+msgid ""
+"WeBWorK expects many files to be in certain locations.  The following "
+"describe this. Note that by default the File Manager shows the \"templates\""
+" directory.  Other directories mentioned below are at the same level and "
+"need to be accessed by going up a directory by clicking the \"^\" button "
+"above the file list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:6
 msgid ""
 "WeBWorK has encountered a software error while attempting to process this "
 "problem. It is likely that there is an error in the problem itself. If you "
@@ -7758,7 +10659,7 @@ msgid ""
 " more information."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:6
 msgid ""
 "WeBWorK has encountered warnings while processing your request. If this "
 "occured when viewing a problem, it was likely caused by an error or "
@@ -7768,19 +10669,19 @@ msgid ""
 " warning output below for more information."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:577
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:558
 msgid ""
 "WeBWorK was unable to generate a different version of this problem.  Close "
 "this tab, and return to the original problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:367
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:29
 msgid ""
 "WeBWorK was unable to generate a paper copy of this homework set.  Please "
 "inform your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:78
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
 msgid ""
 "WeBWorK will automatically create users when logging in via the LMS for the "
 "first time. If this flag is enabled then it will also keep the user account "
@@ -7790,36 +10691,44 @@ msgid ""
 "next time the user logs in."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:370
 msgid "Weight"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:6
 msgid "Welcome to WeBWorK!"
 msgstr "Vítejte v systému WeBWorK!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:24
+msgid ""
+"What WeBWorK does have is good support for summarizing the scores on WeBWorK"
+" homework sets and tests and exporting them in a form (.csv) which any "
+"spreadsheet can use. WeBWorK reports all of the homework grades with options"
+" shown below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:27
 msgid "What could be inside?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:715
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:17
 msgid "What field should filtered users match on?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
 msgid ""
 "When a student has more attempts than is specified here they will be able to"
 " view another version of this problem.  If set to -1 the feature is disabled"
 " and if set to -2 the course default is used."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1899
+#: /opt/webwork/webwork2/conf/defaults.config:1801
 msgid ""
 "When acting as a student, this permission level and higher can submit "
 "answers for that student."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2071
+#: /opt/webwork/webwork2/conf/defaults.config:1972
 msgid ""
 "When numerical answers are checked, most test if the student's answer is "
 "close enough to the programmed answer be computing the error as a percentage"
@@ -7828,7 +10737,7 @@ msgid ""
 "0.1 means 0.1 percent error is allowed.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2098
+#: /opt/webwork/webwork2/conf/defaults.config:2019
 msgid ""
 "When students click the <em>Email Instructor</em> button to send feedback, "
 "WeBWorK fills in the subject line.  Here you can set the subject line.  In "
@@ -7838,14 +10747,32 @@ msgid ""
 "recitation</li><li>%% = literal percent sign</li></ul>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1638
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:35
+msgid ""
+"When the class is very large not all students will be displayed. Using the "
+"first action on this page you can show only the students from a given "
+"recitation or from a given section, or only students whose login or last "
+"name fits a pattern match. The second action will sort the students "
+"currently being displayed. You can also sort the displayed students by "
+"clicking on the active links at the top of each column."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:56
+msgid ""
+"When the message is ready to send, click \"Send Email\". This will queue the"
+" email to be sent, which can take several minutes depending on the number of"
+" students selected.  You will be notified by email once all the emails have "
+"been sent."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1540
 msgid ""
 "When this is on students will see a line on the Grades page which has their "
 "total cumulative homework score.  This score includes all sets assigned to "
 "the student."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:90
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
 msgid ""
 "When this is true, then when a user enters WeBWorK from an external tool "
 "link in the LMS, the bottom of the screen will display the data that the LMS"
@@ -7853,23 +10780,56 @@ msgid ""
 "different LMS systems have different parameters."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1957
+#: /opt/webwork/webwork2/conf/defaults.config:1859
 msgid ""
 "When viewing a problem, WeBWorK usually puts the previously submitted answer"
 " in the answer blank.  Below this level, old answers are never shown.  "
 "Typically, that is the desired behaviour for guest accounts."
 msgstr ""
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:30
+msgid ""
+"When viewing progress for a single student, their grades page is shown which"
+" lists set totals and per problem grades for each set assigned to the "
+"student.  This shows the same information as the statistics page for the "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:26
+msgid ""
+"When viewing set statistics, the drop down menus can be used to show stats "
+"for individual sections, recitations, or problems.  The overall results "
+"include all students who are assigned to the set, while the individual "
+"problem results only include active (have attempted the problem) students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:24
+msgid ""
+"When viewing student progress for a set, the score for the set and the "
+"status for problems in the set are listed for all students.  The table can "
+"be sorted by clicking the links in the table header.  Click the student's "
+"name to access the student's set.  When viewing progress for a test, "
+"additional columns can be shown/hidden by updating the display at the top"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:74
+msgid ""
+"When you unassign a set from students, you destroy all of the data for the "
+"set for those students. If the set is re-assigned to these students, then "
+"they will receive new versions of problems in the set.  Make sure this is "
+"what you want to do before unassigning sets from students."
+msgstr ""
+
+#. (tag('b', $achievementID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:21
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for achievement %1 for this student. Make sure this is what you want to"
 " do."
 msgstr ""
 
-#. (CGI::b({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:146
+#. (tag('b', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:26
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for homework set %1 for this student. You will then need to reassign "
@@ -7877,7 +10837,7 @@ msgid ""
 "problems. Make sure this is what you want to do before unchecking students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:72
 msgid ""
 "When you uncheck a homework set (and save the changes), you destroy all of "
 "the data for that set for this student.   If you reassign the set, the "
@@ -7885,243 +10845,461 @@ msgid ""
 "you want to do before unchecking sets."
 msgstr ""
 
-#. ($self->formatDateTime($set->open_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:343
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:87
+msgid "Wiki summary page for MathObjects"
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:444
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:167
 msgid "Will open on %1."
 msgstr "Termín otevření je %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:49
+msgid "Word problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:15
 msgid "Worth"
 msgstr "Body"
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:382
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:51
+msgid "Write a new PG problem file or edit an existing one."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:188
 msgid ""
-"Write permissions have not been enabled for '%1'.  Changes must be saved to "
-"another file for viewing."
+"Write permissions have not been enabled for \"%1\".  Changes must be saved "
+"to another file for viewing."
 msgstr ""
 
-#. ($self->shortPath($currentDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:380
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:630
 msgid ""
-"Write permissions have not been enabled in '%1'.  Changes must be saved to a"
+"Write permissions have not been enabled for \"%1\". Changes must be saved to"
+" another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:182
+msgid ""
+"Write permissions have not been enabled in \"%1\".  Changes must be saved to"
+" a different directory for viewing."
+msgstr ""
+
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:624
+msgid ""
+"Write permissions have not been enabled in \"%1\".Changes must be saved to a"
 " different directory for viewing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:178
 msgid ""
 "Write permissions have not been enabled in the templates directory.  No "
 "changes can be made."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:380
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:620
+msgid ""
+"Write permissions have not been enabled in the templates directory. No "
+"changes can be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:287
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:330
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:509
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:82
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:657
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:67
 msgid "Yes"
 msgstr "Ano"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:500
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:454
 msgid ""
 "You are currently checking answers to a different version of your problem - "
 "these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr "Byly zkontrolovány odpovědi na cvičnou verzi Vašeho zadání. Výsledky nebyly uloženy a jakmile zakončíte práci na  cvičné verzi, musíte se vrátit původní ostré verzi."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:511
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:470
 msgid ""
 "You are currently previewing answers to a different version of your problem "
 "- these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr "Prohlížíte si odpovědi k cvičné variantě Vašeho příkladu. Odpovědi nebudou ukládány a musíte pamatovat na návrat k původní ostré variantě otázky."
 
-#. ($userSet->set_id, $r->connection->remote_ip)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:270
+#. ($ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:18
+msgid ""
+"You are in the Reduced Scoring Period.  All work counts for %1% of the "
+"original."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:183
+msgid "You are not allowed to act as a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:188
+msgid "You are not allowed to assign homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:383
+msgid "You are not allowed to delete %1."
+msgstr ""
+
+#. ($userSet->set_id, $c->tx->remote_address)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:261
 msgid ""
 "You are not allowed to generate a hardcopy for %1 from your IP address, %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2049
-msgid "You are not authorized to access the Instructor tools."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:185
+msgid "You are not allowed to modify homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:191
+msgid "You are not allowed to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:4
+msgid "You are not allowed to send e-mail."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:2
+msgid "You are not authorized to access instructor tools"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:4
+msgid "You are not authorized to access instructor tools."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:9
+msgid "You are not authorized to assign homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:10
+msgid "You are not authorized to create or delete courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:2
+msgid "You are not authorized to edit achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:28
+msgid "You are not authorized to edit user specific information."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:37
+msgid "You are not authorized to grade homework sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:271
-msgid "You are not authorized to access the instructor tools."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:8
+msgid "You are not authorized to manage course files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:392
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:33
 msgid "You are not authorized to modify homework sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:35
 msgid "You are not authorized to modify problems."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:396
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:39
 msgid "You are not authorized to modify set definition files."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:15
 msgid "You are not authorized to modify student data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:11
+msgid "You are not authorized to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:3
+msgid "You are not authorized to modify the course configuration."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:230
 msgid "You are not authorized to perform this action."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:260
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:11
+msgid "You are not authorized to score sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:13
+msgid "You are not authorized to send mail to students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:11
+msgid "You are not authorized to update lti scores"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers.html.ep:8
+msgid "You are not authorized to view past answers"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:251
 msgid ""
 "You are not permitted to generate a hardcopy for a set with hidden work."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:236
 msgid "You are not permitted to generate a hardcopy for an unopened set."
 msgstr "Není povoleno stahovat zadání, které není otevřeno."
 
-#. ($showMeAnother{MaxReps},					$solutionShown)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:559
+#. ($showMeAnother{MaxReps},						$solutionShown)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:532
 msgid ""
 "You are only allowed to click on Show Me Another %quant(%1,time,times) per "
 "problem. %2 Close this tab, and return to the original problem."
-msgstr ""
+msgstr "Počet použití jiné varianty řešení byl %quant(%1,,) a tento počet byl vyčerpán. %2 Vraťte se k původnímu zadání."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2051
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2070
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:265
 msgid "You are out of time!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:374
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:36
 msgid "You can also examine the following temporary files: "
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGanswermacros.pl:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:108
+msgid ""
+"You can assign selected achievements to all users by using the \"Assign\" "
+"action action and selecting which achievements to assign.  You can select "
+"which users to assign/unassign to an achievement by clicking on the link in "
+"the \"Edit Users\" column."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1039
+msgid ""
+"You can change the file path for this problem manually from the \"Hmwk Sets "
+"Editor\" page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:27
+msgid ""
+"You can check the boxes to the right of the sets and click \"Generate "
+"Hardcopy for Selected Sets\" to generate a PDF hardcopy of the selected "
+"sets. You can generate hardcopies for multiple users including their answers"
+" as well. Note that students will only be able to generate hardcopies of a "
+"single set at a time. Students will only be able to include answers in the "
+"hardcopy after the answer date."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:127
+msgid ""
+"You can delete problems by clicking the \"Delete it?\" check box and saving."
+" If the set is already active it is recommended that you instead use the "
+"\"Mark Correct?\" problem to mark a particular problem correct for all "
+"students."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGanswermacros.pl:1616
 msgid "You can earn partial credit on this problem."
 msgstr "Za částečné zodpovězení této úlohy můžete obdržet částečné hodnocení."
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:382
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:142
+msgid ""
+"You can edit a problem by clicking the \"Edit Problem\" icon to the right of"
+" the problem number. This will open the problem in the PG problem editor in "
+"a new tab or window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:92
+msgid ""
+"You can edit a single achievement by clicking on the pencil icon next to the"
+" achievement ID.  You can edit multiple achievements by selecting which "
+"achievements to edit, then click the \"Edit\" button. You can edit all of "
+"the achievements by changing which achievements to edit form \"selected "
+"achievements\" to \"all achievements\", or click the checkbox next to the "
+"Achievement ID to select all achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:44
+msgid ""
+"You can edit the class list data for a single student by clicking on the "
+"pencil icon next to their login name. To edit several students at once click"
+" on the \"Select\" checkbox next to their names, click on the radio button "
+"for editing selected users and then click the \"Edit\" button. You can also "
+"edit all visible users (those students currently being displayed) or even "
+"all users in the course although this last option might take a long time to "
+"load for a large class."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:397
 msgid "You can get a new version of this problem after the due date."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1368
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:101
+msgid ""
+"You can import/export from their respective action tab.  Exporting saves "
+"information about the achievement as a .axp file which is a CSV that lists "
+"each achievements information.  You can import .axp files that have been "
+"previously exported."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:769
 msgid "You can not specify an absolute path"
 msgstr ""
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1121
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:549
 msgid "You can only %1 one file at a time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:92
 msgid "You can only download regular files."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:591
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:197
 msgid "You can only edit text files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:908
-msgid "You can only unpack files ending in '.tgz', '.tar' or '.tar.gz'"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:374
+msgid "You can only unpack files ending in \".tgz\", \".tar\" or \".tar.gz\""
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:134
+msgid ""
+"You can render a problem by clicking the \"Render Problem\" icon to the "
+"right of the problem number. The display mode used to render the problem is "
+"chosen using the drop down menu. You can render all problems using the "
+"\"Render All\" button. \"Hide All\" will hide all rendered problems. It is "
+"also useful to collapse problem details when doing this, as it makes it "
+"easier to drag problems around."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:120
+msgid ""
+"You can reorder problems by clicking on the arrow icon and dragging the "
+"problem. You will see a box showing you where the problem will be placed. "
+"When problems are reordered any holes in the numbering will be filled in."
 msgstr ""
 
 #. ($showMeAnother{MaxReps} >= $showMeAnother{Count}
 #. ? ($showMeAnother{MaxReps} - $showMeAnother{Count})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1895
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:44
 msgid ""
 "You can use this feature %quant(%1,more time,more times,as many times as you"
 " want) on this problem"
 msgstr "Tuto volbu můžete použít ještě %quant(%1,-krát,-krát,opakovaně bez omezení)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:439
 msgid "You can't download directories"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:440
 msgid "You can't download files of that type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:584
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:192
 msgid "You can't edit a directory"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:528
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
 msgid "You can't view files of that type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:985
 msgid "You cannot archive the course you are currently using."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1712
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:850
 msgid "You cannot delete the course you are currently using."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1081
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:378
 msgid "You cannot delete yourself!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:579
 msgid "You did not specify a new set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:232
 msgid "You didn't enter any message."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:312
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:303
 msgid "You do not have permission to access the requested file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:159
 msgid "You do not have permission to change the hardcopy theme."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:578
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:186
 msgid "You do not have permission to edit this file."
 msgstr ""
 
 #. ($hardcopy_format)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:151
 msgid "You do not have permission to generate hardcopy in %1 format."
 msgstr "Nemáte dostatečná oprávnění pro stažení zadání ve formátu %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1639
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1161
 msgid "You do not have permission to view the details of this error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements.html.ep:13
 msgid "You don't have any Achievement data associated to you!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:237
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:51
 msgid "You don't have any rewards!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2109
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:325
 msgid "You exceeded the allowed time."
 msgstr "Došlo k překročení časového limitu."
 
-#. ($numLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2082
+#. ($c->{numAttemptsLeft})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:277
 msgid "You have %1 attempt(s) remaining on this test."
 msgstr "Na tento test Vám zbývá %1 pokusů."
 
-#. ($numLeft,						$numLeft - 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2458
+#. ($c->{numAttemptsLeft},								$c->{numAttemptsLeft} - 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:664
 msgid ""
 "You have %1 submissions remaining for this test.  If you say yes, then you "
 "will have %quant(%2,submission) remaining. Once all submissions have been "
@@ -8129,724 +11307,702 @@ msgid ""
 "work this test version."
 msgstr ""
 
-#. ($attemptsLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2012
+#. ($problem->max_attempts - $attempts)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1270
 msgid "You have %negquant(%1,unlimited attempts,attempt,attempts) remaining."
 msgstr "Počet zbývajících pokusů:  %negquant(%1,bez omezení,pokus,pokusů)."
 
 #. ($attempts_before_rr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1217
 msgid ""
 "You have %quant(%1,attempt,attempts) left before new version will be "
 "requested."
 msgstr "Počet pokusů do vygenerování nové verze úlohy je  %quant(%1,,)."
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:506
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:44
 msgid ""
 "You have %quant(%1,hour) and %quant(%2,minute) remaining to complete the "
 "currently open test."
 msgstr ""
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:518
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:54
 msgid ""
 "You have %quant(%1,hour,hours,)%quant(%2,minute,minutes,) remaining to "
 "complete the currently open test."
 msgstr ""
 
-#. ($minutes,									$seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:529
+#. ($minutes,							$seconds)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:64
 msgid ""
 "You have %quant(%1,minute) and %quant(%2,second) remaining to complete the "
 "currently open test."
 msgstr ""
 
 #. ($seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:72
 msgid ""
 "You have %quant(%1,second) remaining to complete the currently open test."
 msgstr ""
 
 #. ($attempts)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1243
 msgid "You have attempted this problem %quant(%1,time,times)."
 msgstr "Na tuto úlohu jste odpověděl(-a)  %1-krát."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:1
 msgid "You have been logged out of WeBWorK."
 msgstr "Odhlášeno ze systému WeBWorK."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2065
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:260
 msgid "You have less than 1 minute to complete this test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2046
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:241
 msgid "You have less than 45 seconds left!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2043
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:240
 msgid ""
 "You have less than 90 seconds left to complete this assignment. You should "
 "finish it soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1004
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:452
 msgid "You have not chosen a file to upload."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:845
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "You have requested that the following items be deleted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1137
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:565
 msgid "You have specified an illegal file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:766
 msgid "You have specified an illegal path"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:520
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:13
+msgid "You have specified an illegal working directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:481
 msgid ""
 "You may check your answers to this problem without affecting the maximum "
 "number of tries to your original problem."
 msgstr "Můžete vyzkoušet odpovědět na tuto otázku aniž byste ovlivnili počet pokusů na původní otázku."
 
-#. ($perm_multiuser ? "to privileged users or" : "")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:613
+#. ($multiuser ? 'to privileged users or' : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:69
 msgid ""
 "You may choose to show any of the following data. Correct answers, hints, "
 "and solutions are only available %1 after the answer date of the homework "
 "set."
 msgstr "Následující data je možné zahrnout do tištěné verze. Správné odpovědi, nápověda a řešení jsou k dispozici %1 po zveřejnění řešení."
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:63
+msgid "You may not change this user's password!"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:646
 msgid "You may not change your answers when going on to the next part!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1831
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:58
 msgid "You may not change your own password here!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1132
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:560
 msgid "You may not follow symbolic links"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2134
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:350
 msgid "You may still check your answers."
 msgstr "Stále ještě můžete kontrolovat vložené odpovědi."
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:172
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:143
+msgid ""
+"You may want to create an unattached problem if you are using the current "
+"problem as a model for a new problem. You can add the new file to a homework"
+" set from the Library Browser or via the set detail page of the Hmwk Sets "
+"Editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:165
+msgid ""
+"You might want to do this if you want to give full credit to everyone on a "
+"particular problem that was not worded correctly, or wasn't working "
+"properly. This is done from the \"Hmwk Sets Editor\" page or the "
+"\"Instructor Tools\" page."
+msgstr ""
+
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:8
 msgid "You must access assignments from your Course Management System (%1)."
 msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:67
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before Show Me Another "
-"is available."
+"You must attempt this problem %quant(%1,time) before this feature is "
+"available"
 msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1923
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:545
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before this feature is "
-"available"
-msgstr "Tato možnost se aktivuje až po %quant(%1,dalším neúspěšném pokusu,dalších neúspěšnýh pokusech)"
+"You must attempt this problem %quant(%1,time,times) before Show Me Another "
+"is available."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:699
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:259
 msgid "You must confirm the password for the initial instructor."
 msgstr ""
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:368
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? $c->link_to(                                                  $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:195
 msgid "You must log into this set via your Learning Management System (%1)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:76
-msgid "You must provide a student ID, a set ID, and a problem number."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:979
+msgid "You must select a course to archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:585
 msgid "You must select a course to rename."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:351
 msgid "You must select at least one file for the archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:777
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:312
 msgid "You must select at least one file to delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:115
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:106
 msgid "You must select one or more sets for scoring!"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:749
 msgid "You must specify a %1 name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:682
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:242
 msgid "You must specify a course ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2026
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2561
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2777
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3865
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2086
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:848
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:983
 msgid "You must specify a course name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:775
 msgid "You must specify a file name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:705
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:586
+msgid "You must specify a file name in order to save a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:265
 msgid "You must specify a first name for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:708
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:268
 msgid "You must specify a last name for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1382
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:606
 msgid "You must specify a new institution for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1364
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:588
 msgid "You must specify a new name for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:603
 msgid "You must specify a new title for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:256
 msgid "You must specify a password for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:448
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:440
 msgid "You must specify a user ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:711
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:271
 msgid "You must specify an email address for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:331
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:138
 msgid "You must specify an file name in order to save a new file."
 msgstr ""
 
 #. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:505
 msgid ""
-"You must use your Learning Managment System (%1) to access this set.  Try "
-"logging in to the Learning Managment System and visiting the set from there."
+"You must use your Learning Management System (%1) to access this set.  Try "
+"logging in to the Learning Management System and visiting the set from "
+"there."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1730
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
 msgid "You need to select a \"Target Set\" before you can edit it."
 msgstr ""
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1126
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:554
 msgid "You need to select a file to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1877
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:555
 msgid "You need to select a set definition file to view."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1853
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:537
 msgid "You need to select a set from this course to view."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1837
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:524
 msgid "You need to select a set to view."
 msgstr ""
 
-#. (wwRound(0, $problemResult->{score} * 100)
-#. (wwRound(0, $pg->{result}->{score} * 100)
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2007
+#. (wwRound(0,
+#. compute_reduced_score($ce, $problem, $set, $pg->{result}{score},
+#. $c->submitTime)
+#. (% wwRound(0, $rh_result->{problem_result}{score} * 100)
+#. (wwRound(0, $rh_result->{problem_result}{score} * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1251
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:48
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:29
 msgid "You received a score of %1 for this attempt."
 msgstr "Za tento pokus získáváte hodnocení %1."
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2075
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1363
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem and its graded subproblems."
 msgstr ""
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2078
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1375
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem."
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1343
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:740
 msgid "Your %1 name contains illegal characters"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1344
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:743
 msgid "Your %1 name may not begin with a dot"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:746
 msgid "Your %1 name may not contain a path component"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:540
-msgid ""
-"Your LTI OAuth verification failed.  If this recurs, please speak with your "
-"instructor"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:528
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:539
-msgid ""
-"Your authentication failed.  Please return to Oncourse and login again."
-msgstr "Zadaná kombinace jména a hesla nebyla rozpoznána. Prosím, zkuste to znovu."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:229
-msgid ""
-"Your authentication failed.  Please try again. Please speak with your "
-"instructor if you need help."
-msgstr "Zadaná kombinace jména a hesla nebyla rozpoznána. Pro pomoc můžete kontaktovat vyučujícího."
-
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3033
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3162
 msgid "Your browser does not support the video tag."
 msgstr ""
 
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4078
-msgid "Your current branch of PG is up to date with branch %1 in remote %2."
-msgstr ""
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4016
-msgid ""
-"Your current branch of WeBWorK is up to date with branch %1 in remote %2."
-msgstr ""
-
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4113
-msgid "Your current branch of the Open Problem Library is up to date."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:134
 msgid "Your display options have been saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:195
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
 msgid "Your email address has been changed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:772
 msgid "Your file name contains illegal characters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:118
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:40
 msgid "Your file name is not valid! "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:16
 msgid "Your message was sent successfully."
 msgstr "Zpráva byla úspěšně odeslána."
 
-#. ($lastScore,$notCountedMessage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2010
+#. (wwRound(0, $problem->status * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1261
 msgid "Your overall recorded score is %1.  %2"
 msgstr "Vaše celkové uložené hodnocení je %1. %2"
 
-#. ($versionNumber, wwRound(2,$recordedScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2107
-msgid "Your recorded score on this test (version %1) is %2/%3."
+#. ('<span id="test-recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:179
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:197
+msgid "Your recorded score for this version is %1/%2 (%3%)."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:603
+#. ($setVersionID,                                         '<span id="test-
+#. recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:317
+msgid "Your recorded score on this test (version %1) is %2/%3 (%4%)."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:634
 msgid "Your score for this attempt is for this part only;"
 msgstr ""
 
 #. ($testNounNum)
 # $testNounNum is either "test (#)" or "submission (#)"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1977
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:142
 msgid "Your score on this %1 WAS recorded."
 msgstr "Vaše hodnocení na tento %1 BYLO uloženo."
 
-#. ($testNoun,$attemptScore,$totPossible)
+#. ($testNoun, $c->{attemptScore}, $c->{totalPossible})
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1982
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:148
 msgid "Your score on this %1 is %2/%3."
 msgstr "Vaše hodnocení na %1 je %2/%3."
 
 #. ($testNounNum)
 # $testNounNum is either "test (#)" or "submission (#)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1973
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:138
 msgid "Your score on this %1 was NOT recorded."
 msgstr ""
 
-#. ($attemptScore,$totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2019
+#. ($c->{attemptScore}, $c->{totalPossible})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:192
 msgid "Your score on this (checked, not recorded) submission is %1/%2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1963
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2277
-msgid "Your score on this problem was recorded."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1619
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1027
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:172
 msgid ""
 "Your score was not recorded because there was a failure in storing the "
 "problem record to the database."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:272
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:276
 msgid "Your score was not recorded because this homework set is closed."
 msgstr "Hodnocení nebylo uloženo, pro tuto domácí úlohu již bylo ukončeno odevzdávání."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:283
 msgid ""
 "Your score was not recorded because this problem has not been assigned to "
 "you."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1643
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1049
 msgid ""
 "Your score was not recorded because this problem set version is not open."
 msgstr "Hodnocení nebylo uloženo, protože odevzdávání ještě nebylo otevřeno."
 
-#. ($elapsed, $allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1658
+#. ($elapsed,                                              # Assume the
+#. allowed time is an even number of minutes.
+#. ($set->due_date - $set->open_date)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1063
 msgid ""
 "Your score was not recorded because you have exceeded the time limit for "
 "this test. (Time taken: %1 min; allowed: %2 min.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1052
 msgid ""
 "Your score was not recorded because you have no attempts remaining on this "
 "set version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1661
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1067
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:278
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:53
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:31
 msgid "Your score was not recorded."
 msgstr "Hodnocení nebylo uloženo."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1998
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:163
 msgid "Your score was not successfully sent to the LMS."
-msgstr ""
+msgstr "Nepodařilo se reportovat bodový zisk zpět do LMS."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:166
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:170
 msgid "Your score was recorded."
 msgstr "Hodnocení bylo uloženo."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1997
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:255
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:162
 msgid "Your score was successfully sent to the LMS."
-msgstr ""
+msgstr "Bodový zisk byl reportován LMS."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:540
 msgid "Your session has timed out due to inactivity. Please log in again."
 msgstr "Přihlášení vypršelo z důvodu nečinnosti. Přihlaste se znovu heslem."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4126
-msgid "Your systems are up to date!"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1396
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1403
-msgid "[Edit]"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:824
-msgid "a duplicate of the first selected achievement."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:17
+msgid "a duplicate of the first selected achievement"
 msgstr ""
 
 # Context is "Create set ______ as a duplicate of the first selected set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:17
 msgid "a duplicate of the first selected set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:823
-msgid "a new empty achievement."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:16
+msgid "a new empty achievement"
 msgstr ""
 
 # Context is "Create set ______ as a new empty set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:16
 msgid "a new empty set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1281
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:9
 msgid "a single set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:429
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:130
 msgid "add problems"
 msgstr ""
 
 #. ($setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1751
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
 msgid "addGlobalSet %1 in ProblemSetList:  %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:456
-msgid "added missing permission level for user"
-msgstr ""
-
 # #short for administrator
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "admin"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1051
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:487
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:604
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:7
 msgid "all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1377
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:66
 msgid "all current users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:327
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:70
 msgid "all set dates for one <b>user</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:622
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1434
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:667
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:840
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1995
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:7
 msgid "all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1981
 msgid "all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1256
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:701
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:946
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:997
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:6
 msgid "all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:120
 msgid "all users for one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:23
 msgid "alphabetically"
 msgstr ""
 
-#. ($count,$numSets)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:626
+#. ($count, $numSets)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1999
 msgid "an impossible number of sets: %1 out of %2"
 msgstr ""
 
-#. ($count,$numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:606
+#. ($count, $numUsers)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1985
 msgid "an impossible number of users: %1 out of %2"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:647
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:658
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:610
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:621
 msgid "answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:30
 msgid "any users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:720
-msgid "avg attempts"
-msgstr ""
-
 # Context is "Append ____ blank problem template(s) to end of homework set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2956
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:689
 msgid "blank problem template(s) to end of homework set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:24
 msgid "by last login date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1552
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:688
 msgid "changes abandoned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1216
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1651
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:633
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:795
 msgid "changes saved"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:80
 msgid "class list data for selected <b>users</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:31
 msgid "close"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:671
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:259
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:239
 msgid "correct"
 msgstr "správně"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:582
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:239
 msgid "course files"
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:458
 msgid "deleted %1 sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:152
 msgid "editing all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:333
 msgid "editing all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:963
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:328
 msgid "editing all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:860
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:336
 msgid "editing listed sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:154
 msgid "editing selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:339
 msgid "editing selected sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:334
 msgid "editing selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:331
 msgid "editing visible users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:360
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:90
 msgid "email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:87
-msgid "email:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:42
 msgid "empty"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:672
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:10
 msgid "enter matching set IDs below"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:220
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:31
 msgid "entry rows."
 msgstr ""
 
 #. ($restrictLoc, $setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1761
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:904
 msgid "error adding set location %1 for set %2: %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1092
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1487
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:542
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:643
 msgid "export abandoned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1068
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:527
 msgid "exporting all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1071
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:530
 msgid "exporting selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:359
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:89
 msgid "first name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:747
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:72
 msgid "for"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:149
 msgid "for one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:103
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:94
 msgid "for one <b>user</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1014
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:349
 msgid "giving new passwords to all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1020
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:355
 msgid "giving new passwords to selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1017
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:352
 msgid "giving new passwords to visible users"
 msgstr ""
 
 #. ($j, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1069
 msgid "global %1 for set %2 not found."
 msgstr ""
 
-#. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1146
-msgid "global set %1 not found."
-msgstr ""
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "grade_proctor"
 msgstr ""
@@ -8855,393 +12011,375 @@ msgstr ""
 msgid "guest"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1589
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:949
 msgid "hidden"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "hidden from"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "hidden from students"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:217
+msgid "homework"
 msgstr ""
 
-#. ('j','k','_0')
-#. ('j','k')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:83
+msgid "html directory"
+msgstr ""
+
+#. ('j', 'k', '_0')
+#. ('j', 'k')
 # doe snot need to be translated
-#: /opt/webwork/pg/lib/Parser/List/Vector.pm:35
-#: /opt/webwork/pg/lib/Value/Vector.pm:278
-#: /opt/webwork/pg/macros/contextLimitedVector.pl:93
+#: /opt/webwork/pg/lib/Parser/List/Vector.pm:39
+#: /opt/webwork/pg/lib/Value/Vector.pm:303
+#: /opt/webwork/pg/macros/contexts/contextLimitedVector.pl:95
 msgid "i"
 msgstr ""
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:773
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:840
 msgid "if"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1626
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:622
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:721
 msgid "illegal character in input: '/'"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:246
 msgid "incorrect"
 msgstr "nesprávně"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:441
 msgid "index"
 msgstr ""
 
 #. ($restrictLoc, $setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:911
 msgid "input set location %1 already exists for set %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:358
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:551
+msgid "insufficient permission to edit %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:220
+msgid "just-in-time"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:88
 msgid "last name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:841
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:893
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:9
 msgid "listed sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3169
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:87
 msgid "locations selected below"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:665
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:59
 msgid "login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "login ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:94
 msgid "login name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:86
-msgid "login/studentID:"
-msgstr ""
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "login_proctor"
 msgstr ""
 
 # Context is "Set _____ made visibile for _____ users"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "made visible for"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:419
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:493
 msgid "max"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1282
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:10
 msgid "multiple sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:489
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:171
 msgid "new set:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:393
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:109
 msgid "new users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:6
 msgid "no achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:740
-msgid "no achievements."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:519
-msgid "no attempt recorded"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:86
 msgid "no location"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:620
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1056
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1993
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:6
 msgid "no sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:600
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1979
 msgid "no students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:931
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1190
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:702
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:31
 msgid "no users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/permission.pm:26
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "nobody"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:114
 msgid "nth colum of merge file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:225
-msgid "number of students not defined"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:70
 msgid "of"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:128
 msgid "one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:556
-msgid "one <b>set</b> for  <b>users</b>"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:225
+msgid "one <b>set</b> for <b>users</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:540
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:211
 msgid "one <b>user</b> (on one <b>set</b>)"
 msgstr ""
 
 # Context is Assign this set to which users?  "only ____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1378
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:67
 msgid "only"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:17
 msgid "only best scores"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3472
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:357
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:448
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:88
 msgid "or"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1141
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:59
 msgid "or Problems from"
 msgstr ""
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:776
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:843
 msgid "otherwise"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:19
 msgid "overwrite"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:664
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:627
 msgid "part"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1383
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:499
 msgid "permissions for %1 not defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "point"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "points"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:509
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:20
 msgid "preserve"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2360
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:576
 msgid "preview answers"
 msgstr "náhled odpovědí"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:653
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:616
 msgid "problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:632
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:41
 msgid "problems"
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:219
+msgid "proctored test"
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "professor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:360
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:451
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:89
 msgid "progress"
 msgstr ""
 
 #. ($line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2212
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1409
 msgid "readSetDef error, can't read the line: ||%1||"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:93
 msgid "recitation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:654
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:53
 msgid "recitation #"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:497
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:549
 msgid "record for visible user %1 not found"
 msgstr ""
 
 #. ($restrictLoc)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1767
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:918
 msgid ""
 "restriction location %1 does not exist.  IP restrictions have been ignored."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:670
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "row"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:91
 msgid "score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:362
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:92
 msgid "section"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:643
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:47
 msgid "section #"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:88
-msgid "section:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:159
 msgid "selected <b>sets</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:524
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:197
 msgid "selected <b>users</b> to selected <b>sets</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:441
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:488
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:605
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:8
 msgid "selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:741
-msgid "selected achievements."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1057
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1436
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:669
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:842
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:894
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:991
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:8
 msgid "selected sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1053
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:703
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:999
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:8
 msgid "selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:624
-msgid "set"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:628
-msgid "sets"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:12
 msgid "sets hidden from students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:670
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:11
 msgid "sets visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:716
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:281
 msgid "showing all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:763
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:277
 msgid "showing all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:725
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:290
 msgid "showing matching sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:286
 msgid "showing matching users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:719
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:284
 msgid "showing no sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:766
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:280
 msgid "showing no users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:722
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:287
 msgid "showing selected sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:769
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:283
 msgid "showing selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:299
 msgid "showing sets that are hidden from students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:732
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:296
 msgid "showing sets that are visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:72
 msgid "shown"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:162
 msgid "still open"
 msgstr ""
 
@@ -9249,16 +12387,16 @@ msgstr ""
 msgid "student"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
 msgid "submission"
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:133
 msgid "submission (version %1)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
 msgid "summary"
 msgstr ""
 
@@ -9266,135 +12404,130 @@ msgstr ""
 msgid "ta"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
-msgid "test"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:90
+msgid "templates/email directory"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:610
-msgid "test date"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:95
+msgid "templates/macros directory"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:621
-msgid "test time"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
+msgid "test"
 msgstr ""
 
-#. ($forcedSourceFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:987
-msgid "the original path to the file is %1"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:23
+msgid "test date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:469
-msgid "then delete them"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:29
+msgid "test time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "time"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:119
+msgid "then delete them"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:165
 msgid "time limit exceeded"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "times"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:35
+msgid "time remaining"
 msgstr ""
 
 # Context is Assign ____ to _____
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:183
 msgid "to"
 msgstr ""
 
 #. ($ce->{institutionName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:399
 msgid "to %1 main web site"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:524
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:381
 msgid "to courses page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:436
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:135
 msgid "to one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:764
-msgid "top score"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:432
 msgid "total"
 msgstr ""
 
 #. ($ce->{webworkDirs}{logs})
 #. ($ce->{webworkDirs}{tmp})
 #. ($ce->{webworkDirs}{DATA})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:47
 msgid "unable to write to directory %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:333
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:49
 msgid "unlimited"
-msgstr ""
+msgstr "neomezeně"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:14
 msgid "unlimited reusability"
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:609
-msgid "userID: %1 --"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:652
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:259
 msgid ""
 "username, last name, first name, section, achievement level, achievement "
 "score,"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:704
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:10
 msgid "users who match on selected field"
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
-msgid "version (%1)"
+#. ($set->version_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:295
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:408
+msgid "version %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1591
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1888
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3648
-msgid "visible"
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:134
+msgid "version (%1)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "visible to students"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:820
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:951
+msgid "visible"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1257
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:947
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:998
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:7
 msgid "visible users"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:485
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:500
 msgid "when you submit your answers"
 msgstr ""
 
 #. ($dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1532
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:623
 msgid "won't be able to read from file %1/%2: does it exist? is it readable?"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:604
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:638
 msgid "your overall score is for all the parts combined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:231
 msgid "your students"
 msgstr ""
diff --git a/lib/WeBWorK/Localize/de.po b/lib/WeBWorK/Localize/de.po
index 8b28fbd69a..50dcc7d0ae 100644
--- a/lib/WeBWorK/Localize/de.po
+++ b/lib/WeBWorK/Localize/de.po
@@ -4,6 +4,8 @@
 # 
 # Translators:
 # Armin Reiser, 2022
+# Armin Reiser, 2022
+# Fabian Gabel, 2022
 # Fabian Gabel, 2022
 msgid ""
 msgstr ""
@@ -11,256 +13,319 @@ msgstr ""
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: 2013-01-27 17:03+0000\n"
 "Last-Translator: Fabian Gabel, 2022\n"
-"Language-Team: German (http://www.transifex.com/webwork/webwork2/language/de/)\n"
+"Language-Team: German (http://app.transifex.com/webwork/webwork2/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:428
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:449
+#. ($_->{problem}->version_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:69
+msgid " (version %1)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:265
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:284
 msgid " Answers Available."
 msgstr "Lösung verfügbar."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:735
-msgid "# of active students"
-msgstr "# aktiver Studierender"
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1148
+msgid " No changes have been made to set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:130
+msgid "\"Act as\" a student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:31
+msgid "\"Edit Assigned Users\" column"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:24
+msgid "\"Edit Problems\" column"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:187
+msgid "# of Active Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:85
+msgid "# of attempts"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:506
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:333
 msgid "#corr"
 msgstr "Anz. richtig"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:508
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:335
 msgid "#incorr"
 msgstr "Anz. falsch"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2249
-msgid "% Score:"
-msgstr "% Punktzahl"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:685
-msgid "% correct"
-msgstr "% richtig"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:174
+msgid "% Average with Review"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:702
-msgid "% correct with review"
-msgstr "% richtig mit Überprüfung"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:66
+msgid "% Score with Review"
+msgstr ""
 
-# Percent students
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:762
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:792
-msgid "% students"
-msgstr "% Studierende"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:479
+msgid "% Score:"
+msgstr "% Punktzahl"
 
 #. ($achievement->{points})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:24
 msgid "%1 Points:"
 msgstr "%1 Punkte:"
 
-#. ($lib eq '' ? $r->maketext('Local')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:476
+#. ($lib eq '' ? maketext('Local')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:9
 msgid "%1 Problems:"
 msgstr "%1 Aufgaben"
 
-#. ($itemCounts{$item->id()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:189
+#. ($itemCounts->{ $item->id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:12
 msgid "%1 remaining"
 msgstr "%1 verbleiben"
 
-#. ($numAdded, $numSkipped, join(', ', @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1410
+#. ($count)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2001
+msgid "%1 sets"
+msgstr ""
+
+#. ($numAdded,                     $numSkipped,
+#. join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:608
 msgid "%1 sets added, %2 sets skipped. Skipped sets: (%3)"
 msgstr "%1 Aufgabensätze hinzugefügt, %2 Aufgabensätze übersprungen. Übersprungene Aufgabensätze: (%3)"
 
-#. ($numExported, $numSkipped, ($numSkipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1526
+#. ($numExported, $numSkipped,                     $numSkipped ? $c->tag('ul',
+#. $c->c(map { $c->tag('li', $_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:673
 msgid "%1 sets exported, %2 sets skipped. Skipped sets: (%3)"
 msgstr "%1 Aufgabensätze exportiert, %2 Aufgabensätze übersprungen. Übersprungene Aufgabensätze: (%3)"
 
 #. ($count, $numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:608
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
 msgid "%1 students out of %2"
 msgstr "%1 Student von %2"
 
-#. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle,
+#. ($rename_oldCourseID,          $rename_oldCourseTitle,
+#. $rename_newCourseTitle,
 #. $rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:675
 msgid "%1 title and institution changed from %2 to %3 and from %4 to %5"
 msgstr "%1 Name und Bildungseinrichtung wurde von %2 auf %3 und von %4 auf %5 geändert"
 
-#. (scalar @userIDsToExport, $dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1338
-msgid "%1 users exported to file %2/%3"
-msgstr "%1 Nutzer in Datei %2/%3 exportiert"
+#. (scalar @userIDsToExport, "$dir/$fileName")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:477
+msgid "%1 users exported to file %2"
+msgstr ""
 
-#. ($numReplaced, $numAdded, $numSkipped, join (", ", @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1233
+#. ($numReplaced, $numAdded, $numSkipped, join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:443
 msgid ""
 "%1 users replaced, %2 users added, %3 users skipped. Skipped users: (%4)"
 msgstr "%1 Nutzer ersetzt, %2 hinzugefügt, %3 übersprungen. Übersprungene Nutzer: (%4)"
 
-#. ($levelpercentage)
 #. ($percentage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:135
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:136
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:323
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:324
+#. ($level_percentage)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:12
 msgid "%1% Complete"
 msgstr "%1% vollständig berarbeitet"
 
 #. (wwRound(0, $answerScore * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:268
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:248
 msgid "%1% correct"
 msgstr "%1% richtig"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:207
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:57
 msgid "%1's Current Address"
 msgstr "Aktuelle Email-Adresse von %1"
 
-#. ($user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:136
+#. ($c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:26
 msgid "%1's Current Password"
 msgstr "Aktuelles Passwort von %1"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:225
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:65
 msgid "%1's New Address"
 msgstr "Neue Email-Adresse von %1"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:153
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:34
 msgid "%1's New Password"
 msgstr "Neues Passwort von %1"
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
-msgid "%1's new password cannot be blank."
-msgstr "Passwort von %1 kann nicht leer sein."
-
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:76
 msgid "%1's password has been changed."
 msgstr "Passwort von %1 erfolgreich geändert."
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:56
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1423
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#. ($c->tag('span', dir => 'ltr', $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1069
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:149
 msgid "%1: Problem %2"
 msgstr "%1: Aufgabe %2"
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:374
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:357
 msgid "%1: Problem %2 Show Me Another"
 msgstr "%1 Aufgabe %2 neue Version anfordern"
 
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2231
-msgid "%1: The directory for the course not found."
-msgstr "%1: Kursverzeichnis nicht gefunden."
-
-#. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:340
-msgid "%quant(%1,error) occured while generating hardcopy:"
-msgstr "%1 Fehler beim Erstellen des Exports aufgetreten"
+#. ($days)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:87
+msgid "%quant(%1,day)"
+msgstr ""
 
 #. ($n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:924
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:389
 msgid "%quant(%1,file) unpacked successfully"
 msgstr "%quant(%1,Datei, Dateien) erfolgreich entpackt"
 
+#. ($hours)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:88
+msgid "%quant(%1,hour)"
+msgstr ""
+
+#. ($minutes)
+#. (sprintf('%3.1f', $testTime)
+#. ($timeLeft)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:89
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:150
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:168
+msgid "%quant(%1,minute)"
+msgstr ""
+
 #. ($numBlanks)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:430
 msgid ""
 "%quant(%1,of the questions remains,of the questions remain) unanswered."
 msgstr "%quant(%1,Frage wurde,Fragen wurden) nicht beantwortet."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:678
+#. ($seconds)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:90
+msgid "%quant(%1,second)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:505
 msgid "%score"
 msgstr "Punkte"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2971
+#. ($dcount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:40
+msgid "(%quant(%1,item) total)"
+msgstr ""
+
+#. ($count)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:29
+msgid "(%quant(%1,item))"
+msgstr ""
+
+#. ($problemValue)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1081
+msgid "(%quant(%1,point))"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:697
 msgid "(Any unsaved changes will be lost.)"
 msgstr "(Alle ungespeicherten Änderungen gehen verloren.)"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1278
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1287
-msgid ""
-"(Instructor hint preview: show the student hint after the following number "
-"of attempts:"
-msgstr "(Hinweis-Vorschau: Die Lösungshinweise  sollen nach folgender Anzahl von Versuchen  für die Lernenden angezeigt werden:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:102
+msgid "(If an action cannot be executed it will not appear.)"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2003
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1262
 msgid "(This problem will not count towards your grade.)"
 msgstr "(Diese Aufgabe zählt nicht für Ihre Bewertung.)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2122
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:340
 msgid ""
 "(This test is overtime because it was not submitted in the allowed time.)"
 msgstr "(Dieser Test wurde nicht innerhalb der vorgegebenen Zeit abgegeben.)"
 
-#. ($testNoun, $self->formatDateTime($set->answer_date)
+#. ($testNoun, $c->formatDateTime($c->{set}->answer_date)
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1986
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:153
 msgid "(Your score on this %1 is not available until %2.)"
 msgstr "(Ihre Punktzahl von %1 ist verfügbar ab %2.)"
 
 #. ($testNoun)
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1988
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:155
 msgid "(Your score on this %1 is not available.)"
 msgstr "(Ihre Punktzahl für %1 ist nicht verfügbar.)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1257
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1267
 msgid "(correct)"
 msgstr "(richtig)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:197
-msgid "(gw/quiz) After version answer date"
-msgstr "(gw/quiz) Nach Beantwortungsdatum"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:263
 msgid "(in target set)"
 msgstr "(auf dem Set)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1449
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1269
 msgid "(incorrect)"
 msgstr "(falsch)"
 
 #. ($pgScore)
 #. ($recScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1461
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1271
 msgid "(score %1)"
 msgstr "(Punktzahl %1)"
 
-#. ($display_sort_method_name{$secondary_sort_method_name})
-#. ($display_sort_method_name{$ternary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:701
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:706
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:207
+msgid "(test) After version answer date"
+msgstr ""
+
+#. ($versionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:164
+msgid "(version %1)"
+msgstr ""
+
+#. ($display_sort_method_name{$secondary_sort_method})
+#. ($display_sort_method_name{$ternary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:103
 msgid ", then by %1"
 msgstr ", dann nach %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1297
-msgid ". If this is a class roster, rename it to have extension '.lst'"
-msgstr "Falls dies eine Klassenliste ist, benennen sie die Datei bitte um mit der Dateiendung '.lst'"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:702
+msgid ". If this is a class roster, rename it to have extension \".lst\""
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:81
+msgid "0 seconds"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1997
+msgid "1 set"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1983
 msgid "1 student"
 msgstr "1 Studierender"
 
 #. (wwRound(2, $weights[$part] * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:145
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:58
 msgid "<b>Weight:</b> %1%"
 msgstr "<b>Gewichtung:</b> %1%"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1749
+#: /opt/webwork/webwork2/conf/defaults.config:1651
 msgid ""
 "<p>After the Reduced Scoring Date all additional work done by the student "
 "counts at a reduced rate. Here is where you set the reduced rate which must "
@@ -275,7 +340,7 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr "Nach dem Datum für Bewertungen mit Punktabzug wird jede zusätzliche Arbeit der Lernenden mit einem Punktabzug bewertet. Hier wird der reduzierte Prozentsatz eingestellt. Ist dieser Wert z.B. 50% und ein Lernender schaut sich die Aufgabe an nach dem Datum für Punktabzug, erscheint für den Lernenden die Nachricht \"Sie befinden sich im Zeitraum für Bewertungen mit Punktabzug: Jede zusätzliche Abgabe zählt mit 50% der ursprünglichen Bewertung.\"<p><p>Um diese Funktion zu nutzen, müssen Sie die Bewertung mit Punktabzug aktivieren und ein Datum für  Bewertungen mit Punktabzug für die einzelnen Hausaufgaben festlegen, in dem Sie mit dem Hmwk-Sets- Editor  den Aufgabensatz abändern.</p><p>Dies funktioniert mit dem avg_prblem_grader (Durchschnitssbwertung, was die Standardbewertungseinstellung ist) und dem std_problem_grader (der alles-oder-nix-Bewerter). Es wird auch mit selbst erstellten Bewertern funktionieren, wenn sie dem entsprechend geschrieben wurden.</p>"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2036
+#: /opt/webwork/webwork2/conf/defaults.config:1937
 msgid ""
 "<p>During summer 2005, a newer version of the answer checkers was "
 "implemented for answers which are functions and numbers.  The newer checkers"
@@ -287,16 +352,74 @@ msgid ""
 " the old answer checkers will be used by default.</p>"
 msgstr "<p>Im Sommer 2005 wurde eine neue Version des Answer-Checkers implementiert, welche Antworten überprüft, die Zahlen oder Funktionen beinhalten. Die neuere Version erlaubt es eine größere Zahl an Funktionen zu überprüfen und liefert zudem verbessertes Verhalten in einigen Anwendungsfällen. Einige Aufgaben wurden speziell dafür programmiert  den neuen (bzw. alten) Answer-Checker zu nutzen. Für den Großteil der Aufgaben, können Sie jedoch die Standardeinstellung verwenden.</p><p>Auswahl von <i>false</i> bedeutet, dass der neuere Answer-Checker standardmäßig genutzt wird und <i>true</i> bedeutet, dass der alte Answer-Checker standardmäßig genutzt wird.</p>"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2006
+#: /opt/webwork/webwork2/conf/defaults.config:1908
 msgid ""
 "<p>MathQuill renders students answers in real-time as they type on the "
 "keyboard.</p><p>MathView allows students to choose from a variety of common "
 "math structures (such as fractions and square roots) as they attempt to "
-"input their answers.</p><p>WIRIS provides a separate workspace for students "
-"to construct their response in a WYSIWYG environment.</p>"
-msgstr "<p>MathQuill rendert Antworten von Studierenden in Echtzeit während der Tastatureingabe.</p><p>MathView erlaubt es Studierenden bei der Einbage aus einer Vielzahl mathematischer Strukturen auszuwählen (z.B. Brüche oder Wurzeln) .</p><p>WIRIS stellt eine separaten Arbeitsumgebung zur Verfügung in der Studierende ihre Antworten in einem WYSIWYG-Editor erstellen können.</p>"
+"input their answers.</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1459
+msgid ""
+"<p>Mode in which the LANG and DIR settings for a single problem are "
+"determined.</p><p>The system will set the LANGuage attribute to either a "
+"value determined from the problem, a course-wide default, or the system "
+"default, depending on the mode selected. The tag will only be added to the "
+"DIV enclosing the problem if it is different than the value which should be "
+"set in the main HTML tag set for the entire course based on the course "
+"language.</p><p>There are two options for the DIRection attribute: \"ltr\" "
+"for left-to-write scripts, and \"rtl\" for right-to-left scripts like Arabic"
+" and Hebrew.</p><p>The DIRection attribute is needed to trigger proper "
+"display of the question text when the problem text-direction is different "
+"than that used by the current language of the course. For example, English "
+"problems from the library browser would display improperly in RTL mode for a"
+" Hebrew course, unless the problen Direction is set to LTR.</p><p>The "
+"feature to set a problem language and direction was only added in 2018 to "
+"the PG language, so most problems will not declare their language, and the "
+"system needs to fall back to determining the language and direction in a "
+"different manner. The OPL itself is all English, so the system wide fallback"
+" is to en-US in LTR mode.</p><p>Since the defaults fall back to the LTR "
+"direction, most sites should be fine with the \"auto::\" mode, but may want "
+"to select the one which matches their course language. The mode "
+"\"force::ltr\" would also be an option for a course which runs into trouble "
+"with the \"auto\" modes.</p><p>Modes:</p><ul><li>\"none\" prevents any "
+"additional LANG and/or DIR tag being added. The browser will use the main "
+"setting which was applied to the entire HTML page. This is likely to cause "
+"trouble when a problem of the other direction is "
+"displayed.</li><li>\"auto::\" allows the system to make the settings based "
+"on the language and direction reported by the problem (a new feature, so not"
+" set in almost all existing problems) and falling back to the expected "
+"default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" allows the "
+"system to make the settings based on the language and direction reported by "
+"the problem (a new feature, so not set in almost all existing problems) but "
+"falling back to the language with the given LangCode and the direction Dir "
+"when problem settings are not available from PG.</li><li>\"auto::Dir\" for "
+"problems without PG settings, this will use the default en=english language,"
+" but force the direction to Dir. Problems with PG settings will get those "
+"settings.</li><li>\"auto:LangCode:\" for problems without PG settings, this "
+"will use the default LTR direction, but will set the language to "
+"LangCode.Problems with PG settings will get those "
+"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
+" by the PG code of the problem, and will force the system to set the "
+"language with the given LangCode and the direction to Dir for <b>all</b> "
+"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
+"PG code of the problem, and will force the system to set the direction to "
+"Dir for <b>all</b> problems, but will avoid setting any language attribute "
+"for individual problem.</li></ul>"
+msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1736
+#: /opt/webwork/webwork2/conf/defaults.config:1514
+msgid ""
+"<p>Some servers handle courses taking place in different timezones.  If this"
+" course is not showing the correct timezone, enter the correct value here.  "
+"The format consists of unix times, such as \"America/New_York\", "
+"\"America/Chicago\", \"America/Denver\", \"America/Phoenix\" or "
+"\"America/Los_Angeles\".</p>Complete list: <a "
+"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1638
 msgid ""
 "<p>This sets whether the Reduced Scoring system will be enabled.  If enabled"
 " you will need to set the default length of the reduced scoring period and "
@@ -308,22 +431,35 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr "<p>Dies aktiviert/deaktiviert das Bewertungssystem mit Punktabzug. Wenn aktiviert, müssen sie den Standardzeitraum für die Bewertung mit Punktabzug festlegen sowie den Wert angegeben, wie viel die  Arbeit in diesem Zeitraum zählt. </p>Um dies zu nutzen, müssen Sie die Bewertung mit Punktabzug aktiviert haben für einzelne Aufgaben und ihr jeweiliges Datum für die Bewertung mit Punktabzug festgelegt haben durch Editieren des Aufgabensatzes.<p><p>Dies funktioniert mit dem avg_problem_grader (Durchschnitssbwertung, was die Standardbewertungseinstellung ist) und dem std_problem_grader (der alles oder nix Bewerter). Es wird auch mit selbst erstellten Bewertern funktionieren, wenn sie dem entsprechend geschrieben wurden</p>"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1979
+#: /opt/webwork/webwork2/conf/defaults.config:1881
 msgid ""
 "<p>When viewing a problem, users may choose different methods of rendering "
 "formulas via an options box in the left panel. Here, you can adjust what "
 "display modes are listed.</p><p>Some display modes require other software to"
 " be installed on the server. Be sure to check that all display modes "
-"selected here work from your server.</p><p>The display modes are "
-"<ul><li>plainText: shows the raw LaTeX strings for formulas.</li><li>images:"
-" produces images using the external programs LaTeX and "
-"dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place "
-"render mathematics.</li></ul></p></p>You must use at least one display mode."
-" If you select only one, then the options box will not give a choice of "
-"modes (since there will only be one active).</p>"
-msgstr "<p>Die Nutzer/innen können in einer Optionsbox an der linken Navigationsleiste  aus verschiedenen Methoden wählen, wie die Formeln eines Problemes gerendert werden. Hier können sie einstellen, welche Darstellungsarten zur Auswahl stehen sollen.</p><p>Einige Darstellungsarten benötigen die Installation zusätzlicher Software auf dem Server.</p><p>Die Darstellungsarten sind<ul><li>plainText: zeigt den Latex code der Formeln an</li><li>images: erstellt Bilder mit den externen Programmen LaTex und dvipng.</li><li>MathJax: Ein Nachfolger zu jsMath, nutzt Javascript um die Formeln darzustellen</li></ul></p></p>Sie müssen mindestenen eine Darstellungsart nutzen. Wenn Sie nur eine gewählt haben, wird die Optionsbox zur Auswahl der Darstellungsarten nicht für die Nutzer angezeigt (da es für Sie keine Auswahl gibt). </p>"
+"selected here work from your server.</p><p>The display modes "
+"are</p><ul><li>plainText: shows the raw LaTeX strings for "
+"formulas.</li><li>images: produces images using the external programs LaTeX "
+"and dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place"
+" render mathematics.</li></ul><p>You must use at least one display mode. If "
+"you select only one, then the options box will not give a choice of modes "
+"(since there will only be one active).</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1476
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with a question in "
+"this test. Please inform your instructor including the warning messages "
+"below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1236
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with this question. "
+"Please inform your instructor including the warning messages below."
+msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1828
+#: /opt/webwork/webwork2/conf/defaults.config:1730
 msgid ""
 "<ul><li><b>SMAcheckAnswers</b>: enables the Check Answers button <i>for the "
 "new problem</i> when Show Me Another is "
@@ -335,7 +471,7 @@ msgid ""
 "time</li><li><b>SMAshowHints</b>: show hints <i>for the new problem</i> "
 "(assuming they exist)</li></ul>Note: there is very little point enabling the"
 " button unless you check at least one of these options - the students would "
-"simply see a new version that they can not attempt or learn from.</p>"
+"simply see a new version that they can not attempt or learn from."
 msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:35
@@ -344,73 +480,123 @@ msgstr "URL für das LMS"
 
 #. ($add_courseID)
 #. ($rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1376
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:688
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:600
 msgid "A course with ID %1 already exists."
 msgstr "Ein Kurs mit der ID %1 existiert bereits"
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2564
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1220
 msgid ""
 "A directory already exists with the name %1. You must first delete this "
 "existing course before you can unarchive."
 msgstr "Verzeichnis %1 existiert bereits. Existierenden Kurs vor Entpacken löschen."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:119
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:111
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:42
 msgid ""
 "A file name cannot begin with a dot, it cannot be empty, it cannot contain a"
 " directory path component and only the characters -_.a-zA-Z0-9 and space are"
 " allowed."
 msgstr "Ein Dateiname darf nicht mit einem Punkt beginnen, er darf nicht leer sein, und er darf keinen Teil eines Verzeichnispfads enthalten. Es sind nur die Zeichen -_.a-zA-Z0-9 and Leerzeichen erlaubt."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1342
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1366
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:738
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
 msgid "A file with that name already exists"
 msgstr "Datei existiert bereits"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:348
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:19
 msgid ""
 "A hardcopy file was generated, but it may not be complete or correct. Please"
 " check that no problems are missing and that they are all legible. If not, "
 "please inform your instructor."
 msgstr "Druckversion erstellt. Bitte überprüfen Sie die Druckversion auf Vollständigkeit, Lesbarkeit und Korrektheit und informieren Sie Ihren Dozenten über etwaige Fehler."
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:56
+msgid ""
+"A hash reference in which the keys are the achievement_id's assigned to the "
+"current user and the values are 0 or 1 which stores if the user has earned "
+"the associated achievement or not."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:52
+msgid ""
+"A hash reference which contains a problems metadata, such as DBsubject, "
+"DBchapter, DBsection,  and so on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:37
+msgid "A hash reference which contains the problem data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:40
+msgid "A hash reference which contains the set data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:60
+msgid ""
+"A hash reference which saves data for this user and this achievement. This "
+"hash is persistent between evaluations and changes to this variable will be "
+"saved in the database."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:64
+msgid ""
+"A hash reference which saves global data for this user. This hash is "
+"persistent between evaluations and changes to this variable will be saved in"
+" the database."
+msgstr ""
+
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3291
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1695
 msgid ""
 "A location with the name %1 already exists in the database.  Did you mean to"
 " edit that location instead?"
 msgstr "Ein Eintrag mit dem Namen %1 existiert bereits in der Datenbank. Wollten Sie den Eintrag anstelledessen editieren?"
 
-#. ($subject, $number_of_recipients, $courseName, $failed_messages)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1007
+#. ($mail_data->{subject}, $number_of_recipients, $mail_data->{courseName},
+#. $failed_messages)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:113
 msgid ""
 "A message with the subject line \"%1\" has been sent to %quant(%2,recipient)"
 " in the class %3.  There were %4 message(s) that could not be sent."
 msgstr "Eine Nachricht mit der Überschrift \"%1\" wurde an %quant(%2, Empfänger) in der Klasse %3 gesendet. Es gab %4 Nachricht(en), die nicht gesendet werden konnten."
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:644
-msgid "A new file has been created at '%1'"
-msgstr "Neue Datei in '%1' angelegt."
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:315
+msgid "A new file has been created at \"%1\""
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1146
+msgid "A new file has been created at \"%1\" with the contents below."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:154
+msgid ""
+"A new problem whose path ends in newProblem.pg should be given a new name, "
+"for example, \"myNewProblem.pg\"."
+msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2006
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:20
 msgid ""
-"A new file has been created at '%1' with the contents below.  No changes "
-"have been made to set %2"
-msgstr "Neue Datei in '%1' angelegt. Es wurden keine Veränderungen an %2 vorgenommen."
+"A student must be assigned a homework set in order for it to appear on their"
+" WeBWorK home page. Check the box in the left column to assign a student to "
+"that homework set. Uncheck the box to unassign a student. If a student is "
+"unassigned from a homework set, all of the student's data for that homework "
+"set is deleted and cannot be recovered. Use this action cautiously!"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:681
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:20
 msgid ""
-"A period (.) indicates a problem has not been attempted, and a number from 0"
-" to 100 indicates the grade earned. The number on the second line gives the "
-"number of incorrect attempts."
-msgstr "Ein Punkt (.) gibt an, dass eine Aufgabe nicht bearbeitet wurde und eine Zahl zwischen 0 und 100 steht für die erreichte Bewertung in %. Die Zahl in der zweiten Zeile steht für die Anzahl der Fehlversuche."
+"A student needs to be assigned a set in order for them to work it. Once a "
+"student is unassigned a set, all the data for them is lost and there is no "
+"way to undo it. When unassigning be sure to change the option to \"Allow "
+"unassign\"."
+msgstr ""
 
 # Leave symbol codes in place
-#: /opt/webwork/webwork2/conf/defaults.config:1647
+#: /opt/webwork/webwork2/conf/defaults.config:1549
 msgid ""
 "A switch to govern the use of a Progress Bar for the student; this also "
 "enables/disables the highlighting of the current problem in the side bar, "
@@ -418,474 +604,665 @@ msgid ""
 "(&#x2717;), or unattempted (no symbol)."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:42
+msgid "A unique key identifying the achievement."
+msgstr ""
+
 # Short for ADJUSTED STATUS
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:500
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:712
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:535
 msgid "ADJ STATUS"
 msgstr "ADJ Status"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2296
-msgid "ANSWERS NOT RECORDED"
-msgstr "IHRE ANTWORTEN WURDEN NICHT GESPEICHERT"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2281
-msgid "ANSWERS NOT RECORDED --"
-msgstr "IHRE ANTWORTEN WURDEN NICHT GESPEICHERT --"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2295
-msgid "ANSWERS ONLY CHECKED -- "
-msgstr "DIE ANTWORTEN WURDEN NUR ÜBERPRÜFT --"
+#. ($c->{scoreRecordedMessage}[ $probOrder->[$i] ])
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:504
+msgid "ANSWERS NOT RECORDED -- %1"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2232
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1505
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:515
 msgid "ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"
 msgstr "DIE ANTWORTEN WURDEN NUR ÜBERPRÜFT -- DIE ANTWORTEN WURDEN NICHT GESPEICHERT"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1527
 msgid ""
 "ATTEMPT NOT ACCEPTED -- Please submit answers again (or request new version "
 "if neccessary)."
 msgstr "VERSUCH WURDE NICHT GEZÄHLT -- Antworten erneut abgeben (falls nötig neue Version anfordern)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1534
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_password_form.html.ep:1
 msgid "Abandon changes"
 msgstr "Änderungen verwerfen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1083
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_export_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_export_form.html.ep:1
 msgid "Abandon export"
 msgstr "Export verwerfen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:520
 msgid ""
 "Account creation is currently disabled in this course.  Please speak to your"
 " instructor or system administrator."
 msgstr "Accounterstellung zur Zeit deaktiviert. Bitte kontaktieren Sie Ihren Dozenten oder Systemadministrator."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:153
-msgid "Achievement"
-msgstr "Trophäe"
-
-#. ($targetAchievementID, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:638
-msgid "Achievement %1 created with evaluator '%2'."
-msgstr "Trophäe %1 erstellt mit Bewerter '%2'."
+#. ($targetAchievementID,			$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:310
+msgid "Achievement %1 created with evaluator \"%2\"."
+msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:847
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:378
 msgid "Achievement %1 exists.  No achievement created"
 msgstr "Trophäe %1 existiert bereits. Keine Trophäe angelegt."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:444
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:63
 msgid "Achievement Editor"
 msgstr "Trophäen Editor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:548
-msgid "Achievement Evaluator Editor"
-msgstr "Achievement-Bewertungs-Editor"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:17
+msgid "Achievement Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:17
+msgid "Achievement Evaluator Editor Help"
+msgstr ""
 
-#. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:170
+#. ($c->stash('achievementID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:109
 msgid "Achievement Evaluator for achievement %1"
 msgstr "Bewertung für Achievement %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1446
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1454
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1482
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:13
 msgid "Achievement ID"
 msgstr "Achievement ID"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:274
 msgid "Achievement ID exists!  No new achievement created.  File not saved."
 msgstr "Achievement ID existiert bereits! Kein neues Achievement angelegt. Datei wurde nicht gespeichert."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1698
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:41
+msgid "Achievement ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:3
+msgid "Achievement List"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1600
 msgid "Achievement Points Per Problem"
 msgstr "Achievement-Punkte pro Aufgabe"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:558
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:455
 msgid "Achievement User Editor"
 msgstr "Achievement-Nutzer-Editor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:17
+msgid "Achievement User Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:48
 msgid "Achievement has been assigned to all users."
 msgstr "Achievement wurde allen Nutzern verliehen."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:67
 msgid "Achievement has been assigned to selected users."
 msgstr "Achievement wurde ausgewählten Nutzern verliehen."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:60
 msgid "Achievement has been unassigned to all students."
 msgstr "Achievement wurde allen Studierenden entzogen."
 
-#. (CGI::a({ href => $fileManagerURL }, $scoreFileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:711
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:38
+msgid "Achievement options"
+msgstr ""
+
+#. ($c->link_to(                           $scoreFileName => $c->systemLink(
+#. $c->url_for('instructor_file_manager')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:318
 msgid "Achievement scores saved to %1"
 msgstr "Achievement-Punkte gespeichert in %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:260
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:241
 msgid "Achievements"
 msgstr "Trophäen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:531
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:17
+msgid "Achievements Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:26
+msgid ""
+"Achievements are evaluated in the order shown below, with the exception of "
+"\"level\" achievements.  Achievements in the \"level\" category are "
+"evaluated first and control the XP thresholds and rewards (achievement "
+"items) for reaching each level. Achievements in the \"secret\" category are "
+"not shown to students until they earn the achievement, and is used for "
+"fun/surprise achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:32
+msgid ""
+"Achievements in the same category, with sequential numbers, and whose ID "
+"starts with the same \"prefix_\" (up to the last underscore), are treated as"
+" achievement chains.  Achievement chains are a sequence of achievements "
+"which build upon themselves, such as complete one problem, complete 10 "
+"problems, complete 25 problems, and so on. Students will only see the "
+"achievements in the chain they have completed or are currently working on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:201
 msgid "Act as"
 msgstr "Rolle übernehmen von"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:207
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:26
 msgid "Act as:"
 msgstr "Rolle übernehmen von:"
 
-#. (HTML::Entities::encode_entities($prettyEUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1134
+#. ($effectiveUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:26
 msgid "Acting as %1."
 msgstr "In der Rolle von %1"
 
 #. ($actionID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:372
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:223
 msgid "Action %1 not found"
 msgstr "Aktion %1 wurde nicht gefunden"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1706
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:101
+msgid "Actions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1608
 msgid ""
 "Activating this will enable achievement rewards. This feature allows "
 "students to earn rewards by completing achievements that allow them to "
 "affect their homework in a limited way."
 msgstr "Dies aktiviert Achievements. Dieses Feature erlaubt es Studierenden Belohnungen zu verdienen, indem sie Achievements erreichen, welche ihre Hausaufgabenpunktzahl in beschränktem Maße beeinflussen."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:45
 msgid "Active"
 msgstr "Aktiv"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1691
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:50
+msgid "Active Students"
+msgstr ""
+
+#. ($c->{prettyID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:19
+msgid "Active Students Problem %1 Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1593
 msgid ""
 "Activiating this will enable Mathchievements for webwork.  Mathchievements "
 "can be managed by using the Achievement Editor link."
 msgstr "Aktiviert Mathchievements für WeBWorK. Mathchievements können über den Trophäen Editor bearbeitet werden."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2947
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1548
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:166
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:89
 msgid "Add All"
 msgstr "Alle hinzufügen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:644
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:32
 msgid "Add Course"
 msgstr "Kurs hinzufügen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:253
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:17
+msgid "Add Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:14
+msgid "Add Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:98
 msgid "Add Students"
 msgstr "Studierende hinzufügen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:406
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:349
 msgid "Add Users"
 msgstr "Nutzer hinzufügen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:518
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:17
+msgid "Add Users Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:47
 msgid "Add WeBWorK administrators to new course"
 msgstr "WeBWorK Adminisratoren zu neuem Kurs hinzufügen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1509
-msgid "Add a new test for which Gateway?"
-msgstr "Neuen Test zu welchem Gateway hinzufügen? "
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:79
+msgid "Add a TA or an instructor (change permission level of user)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:60
+msgid "Add a few students to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:50
+msgid "Add a new version for which test?"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1441
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:20
 msgid "Add as what filetype?"
 msgstr "Als Datei dieses Typs hinzufügen:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/add_form.html.ep:3
 msgid "Add how many users?"
 msgstr "Anzahl hinzuzufügender Nutzer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1549
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:69
+msgid "Add many students to a course from a class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:108
+msgid "Add n blank problem template(s) to the end of homework set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:164
 msgid "Add problem to target set"
 msgstr "Aufgabe zum Set hinzufügen."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Add problems to"
 msgstr "Aufgaben hinzufügen zu"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1422
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:161
+msgid ""
+"Add this problem as the last problem of an existing set, either as a problem"
+" or as the set header (the text that appears on the home page of a homework "
+"set). You can rearrange the order of the problems later using the \"Hmwk "
+"Sets Editor\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:7
 msgid "Add to what set?"
 msgstr "Zu diesem Set hinzufügen:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:20
+msgid ""
+"Add users to the course.  Select the number of students/users to add and "
+"then add any desired information.  The only mandatory information is the "
+"\"Login Name\". Any other fields may be left blank.  The \"Student ID\" will"
+" be the initial password for the user if provided."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:26
 msgid "Add which new users?"
 msgstr "Neu hinzuzufügende Nutzer:"
 
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:883
+msgid "Added \"%1\" to %2 as new hardcopy header"
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:854
+msgid "Added \"%1\" to %2 as new set header"
+msgstr ""
+
 #. ('{number}', '{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1055
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:27
 msgid "Added %1 problems to set %2."
 msgstr "%1 Aufgaben zu Set %2 hizugefügt."
 
-#. ($sourceFilePath, $targetSetName,($set->assignment_type eq 'jitar' ?
-#. join('.',jitar_id_to_seq($targetProblemNumber)
-#. ($new_file_name, $setName, ($set->assignment_type eq 'jitar' ?
-#. join('.',jitar_id_to_seq($targetProblemNumber)
 #. ($new_file_path, $setID, $targetProblemNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1510
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2001
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1912
+#. ($sourceFilePath,                       $targetSetName,                 (
+#. $set->assignment_type eq 'jitar'                                ? join('.',
+#. jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:825
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1837
 msgid "Added %1 to %2 as problem %3"
 msgstr "%1 als Aufgabe %3 zu %2 hinzugefügt."
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1566
-msgid "Added '%1' to %2 as new hardcopy header"
-msgstr "'%1' zu %2 als neuen Druckversions-Header hinzugefügt"
-
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1540
-msgid "Added '%1' to %2 as new set header"
-msgstr "'%1' zu %2 als neuen Set-Header hinzugefügt."
+#. ($new_file_name,                                $c->{setID},
+#. (                                       $set->assignment_type eq 'jitar'
+#. ? join('.', jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1139
+msgid "Added %1 to %2 as problem %3."
+msgstr ""
 
 #. (join(', ', @toAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1974
 msgid "Added addresses %1 to location %2."
 msgstr "%1 als Adresse zu %2 hinzugefügt."
 
+#. ($user->user_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:167
+msgid "Added missing permission level for user %1."
+msgstr ""
+
 #. ('{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1054
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:26
 msgid "Added one problem to set %1."
 msgstr "Eine Aufgabe zu Set %1 hinzugefügt."
 
-#: /opt/webwork/webwork2/conf/defaults.config:2149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Added user:"
+msgstr ""
+
+#. ('<code>[Scoring]/report_grades_data.csv</code>',
+#. '<code>[TMPL]/email/report_grades.msg</code>',)
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:33
+msgid ""
+"Additional (external) grades can be shown on this page by placing them in "
+"the CSV file %1.  The first six columns must be (in order): Student ID, "
+"Username, Last Name, First Name, Section, Recitation.  The remaining columns"
+" can list any external grades.  To display the grades, the CSV file is "
+"merged with the \"Email\" message %2, which will be rendered and displayed "
+"below the grade table.  The message can be created on the \"Email\" page and"
+" the CSV file can be created/uploaded using the \"File Manager\".  External "
+"grades can only be displayed here and are not included in any totals or "
+"statistics."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2060
 msgid "Additional addresses for receiving feedback e-mail"
 msgstr "Weitere Adressen zum Empfangen von Feedback E-Mails"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:235
 msgid "Additional submissions available."
 msgstr "Weitere Abgaben verfügbar."
 
 #. ($badLocAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1708
 msgid ""
 "Address(es) %1 already exist in the database.  THIS SHOULD NOT HAPPEN!  "
 "Please double check the integrity of the WeBWorK database before continuing."
 msgstr "Die Adresse(n) %1 exsistieren bereits. Bitte überprüfen Sie die Integrität der WeBWorK Datenbank!"
 
 #. (join(', ', @noAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1986
 msgid ""
 "Address(es) %1 in the add list is(are) already in the location %2, and so "
 "were skipped."
 msgstr "Adresse(n) %1 in der Liste ist/sind bereits in %2 und wurden übersprungen."
 
 #. (join(', ', @noDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3603
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2008
 msgid ""
 "Address(es) %1 in the delete list is(are) not in the location %2, and so "
 "were skipped."
 msgstr "Adresse(n) %1 in der Liste ist/sind nicht in %2 und wurden übersprungen."
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1683
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and resubmit."
 msgstr "Adresse(n) %1 ist/sind nicht in einem anerkannten Format. Bitte überprüfen Sie Ihre Eingabe."
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1998
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and try again."
 msgstr "Adresse(n) %1 ist/sind nicht in einem anerkannten Format. Bitte überprüfen Sie Ihre Eingabe."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:117
 msgid "Addresses"
 msgstr "Adressen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:53
 msgid ""
 "Addresses for new location.  Enter one per line, as single IP addresses "
 "(e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP ranges "
 "(e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:27
 msgid ""
 "Addresses to add to the location.  Enter one per line, as single IP "
 "addresses (e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP"
 " ranges (e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:232
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:27
 msgid "Adds 24 hours to the close date of a homework."
 msgstr "24h zur Schließungsfrist für die Hausaufgabe hinzufügen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:323
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:27
 msgid "Adds 48 hours to the close date of a homework."
 msgstr "48h zur Schließungsfrist für die Hausaufgabe hinzufügen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:110
+msgid ""
+"Adds new template problems to the set when the set is saved. You can modify "
+"the template to create your own problem, by clicking on the \"Edit Problem\""
+" link and saving to some new file, e.g. \"myNewProblem.pg\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:19
 msgid "Adjusted Status"
 msgstr "angepasster Status"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:56
 msgid "Adobe PDF"
 msgstr "PDF"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:675
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:42
 msgid "Advanced Search"
 msgstr "Fortgeschrittene Suche"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:196
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:206
 msgid "After set answer date"
 msgstr "Nach dem Antwortdatum für den Aufgabensatz"
 
-#. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:325
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:33
 msgid ""
-"After the reduced scoring period begins all work counts for %1% of its "
-"value."
-msgstr "Nach dem die Bewertungsphase mit Punktabzug beginnt, zählt jegliche Leistung nur noch %1% der ursprünglichen Punktzahl."
+"After the due date this set enters a reduced scoring period until it closes "
+"on %1.  All work completed during the reduced scoring period counts for %2% "
+"of its value."
+msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:304
 msgid "Afterward reduced credit can be earned until %1."
 msgstr "Danach erhält man bis %1  verminderte Anrechung."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:56
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:60
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:23
 msgid "All Chapters"
 msgstr "Alle Kapitel"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:57
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:34
 msgid "All Sections"
 msgstr "Alle Abschnitte"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:6
 msgid "All Selected Constraints Joined by \"And\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:71
+msgid "All Sets"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:12
 msgid "All Subjects"
 msgstr "Alle Themen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:48
 msgid "All Textbooks"
 msgstr "Alle Lehrbücher"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:54
+msgid "All Users"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:49
 msgid "All assignments were made successfully."
 msgstr "Alle Aufgabenzuweisungen wurden erfolgreich gemacht."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:953
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:386
 msgid "All listed sets were hidden from all the students"
 msgstr "Alle geliststen Sets sind nun für die Teilnehmer unsichtbar."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:951
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:381
 msgid "All listed sets were made visible for all the students"
 msgstr "Alle gelisteten Aufgabensätze wurden für die Teilnehmer sichtbar gemacht."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:407
 msgid "All of the answers above are correct."
 msgstr "Ihre Antwort ist richtig."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:398
 msgid "All of the gradeable answers above are correct."
 msgstr "Alle der bewertbaren Antworten  oben sind richtig."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:247
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:162
+msgid ""
+"All of the paths for problem files are relative to the templates directory "
+"of the current course. You can access this directory \"directly\" using the "
+"File Manager page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:68
 msgid "All of these files will also be made available for mail merge."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:960
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:9
+msgid "All problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:5
+msgid "All sections"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2145
+msgid "All selected courses are already hidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2214
+msgid "All selected courses are already unhidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:399
 msgid "All selected sets hidden from all students"
 msgstr "Für Studierende unsichtbar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:394
 msgid "All selected sets made visible for all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:946
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:373
 msgid "All sets hidden from all students"
 msgstr "Alle Aufgabensätze sind nun für alle Studierende unsichtbar."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:945
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:368
 msgid "All sets made visible for all students"
 msgstr "Alle Aufgabensätze wurden für die Teilnehmersichtbar gemacht."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:619
 msgid "All sets were selected for export."
 msgstr "Alle Sätze wurden für den Export ausgewählt."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:56
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:54
 msgid "All unassignments were made successfully."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2047
+#: /opt/webwork/webwork2/conf/defaults.config:1948
 msgid "Allow Unicode alternatives in student answers"
 msgstr "Studierende können mit Unicode Alternativen antworten."
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:74
 msgid "Allow the LMS to update user account data"
 msgstr "LMS kann Nutzerdaten aktualisieren."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:68
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:105
 msgid "Allow unassign"
 msgstr "Nutzer austragen"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2069
+#: /opt/webwork/webwork2/conf/defaults.config:1970
 msgid "Allowed error, as a percentage, for numerical comparisons"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1886
+#: /opt/webwork/webwork2/conf/defaults.config:1788
 msgid "Allowed to <em>act as</em> another user"
 msgstr "<em>Rolle</em> eines anderen Nutzers übernehmen"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1923
+#: /opt/webwork/webwork2/conf/defaults.config:1825
 msgid "Allowed to change display settings used in pg problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1913
+#: /opt/webwork/webwork2/conf/defaults.config:1815
 msgid "Allowed to change their e-mail address"
 msgstr "Email-Adresse ändern"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1877
+#: /opt/webwork/webwork2/conf/defaults.config:1779
 msgid "Allowed to change their password"
 msgstr "Passwort ändern"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1872
+#: /opt/webwork/webwork2/conf/defaults.config:1774
 msgid "Allowed to login to the course"
 msgstr "Login"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1950
+#: /opt/webwork/webwork2/conf/defaults.config:1852
 msgid "Allowed to see solutions before the answer date"
 msgstr "Lösungen vor Veröffentlichungsdatum ansehen"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1945
+#: /opt/webwork/webwork2/conf/defaults.config:1847
 msgid "Allowed to see the correct answers before the answer date"
 msgstr "Lösungen vor Veröffentlichungsdatum ansehen"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1934
+#: /opt/webwork/webwork2/conf/defaults.config:1836
 msgid "Allowed to view past answers"
 msgstr "Letzte Antworten ansehen"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1940
+#: /opt/webwork/webwork2/conf/defaults.config:1842
 msgid "Allowed to view problems in sets which are not open yet"
 msgstr "Aufgaben vor Veröffentlichungsdatum ansehen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1572
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:82
+msgid ""
+"Allows configuration of certain parameters, such as permission levels, "
+"default display mode for equations, and email feedback behavior, on a course"
+" by course basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:126
+msgid "Also copy simple configuration file"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:26
 msgid "Amulet of Extension"
 msgstr "Amulett der Ausbreitung"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:20
+msgid ""
+"An achievement evaluator is a perl script that is run after each problem is "
+"submitted which returns a truth value of 0 (didn't earn) or 1 (earn). The "
+"evaluator is given access to different variables which contain data about "
+"the problem and set that is used to determine if the achievement is earned "
+"or not."
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:37
 msgid ""
 "An address that can be used to log in to the LMS. This is used in messages "
@@ -893,248 +1270,308 @@ msgid ""
 "WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:43
+msgid ""
+"An array which lists the hash reference of all the problems in the current "
+"set."
+msgstr ""
+
 #. ($archive_courseID)
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2350
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2647
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1274
 msgid "An error occured while archiving the course %1:"
 msgstr "Ein Fehler ist aufgetreten beim Archivieren des Kurses %1:"
 
 #. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:658
 msgid "An error occured while changing the title of the course %1."
 msgstr "Ein Fehler ist aufgetreten beim Ändern des Kursnamens von Kurs %1."
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1795
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:878
 msgid "An error occured while deleting the course %1:"
 msgstr "Ein Fehler ist aufgetreten beim Löschen des Kurses %1:"
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1521
+#. ($rename_oldCourseID,						$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:751
 msgid "An error occured while renaming the course %1 to %2:"
 msgstr ""
 
 #. ($part + 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:106
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:25
 msgid "Answer %1 Score (%):"
 msgstr "Antwort %1 Punktzahl (%):"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:425
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:765
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:789
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:812
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:79
 msgid "Answer Date"
 msgstr "Veröffentlichungsdatum der Antworten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1712
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:39
 msgid "Answer Group Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:59
 msgid "Answer Hash Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:221
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:292
 msgid "Answer Log"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:17
+msgid "Answer Log Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:285
 msgid "Answer Preview"
 msgstr "Vorschau"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1465
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:48
+msgid ""
+"Answer availability for tests depends on multiple settings.  This only "
+"indicates the template answer date has passed.  See set editor for actual "
+"availability."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1276
 msgid "Answer(s) submitted:"
 msgstr "Eingereichte Antwort(en):"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
 msgid "Answer:"
 msgstr "Antwort:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:224
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
 msgid "Answers"
 msgstr "Antworten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:122
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:37
 msgid "Answers Available"
 msgstr "Lösung verfügbar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1202
 msgid "Answers cannot be due until on or after the open date!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1204
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1197
 msgid "Answers cannot be made available until on or after the close date!"
 msgstr "Die Antworten können erst am oder nach dem Abgabetermin zur Verfügung gestellt werden!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:313
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:21
 msgid ""
 "Any changes made below will be reflected in the achievement for ALL "
 "students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2259
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:507
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:175
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:69
 msgid "Any changes made below will be reflected in the set for ALL students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:173
 msgid ""
 "Any changes made below will be reflected in the set for ONLY the student(s) "
 "listed above."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:122
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:159
 msgid "Append"
 msgstr "Hinzufügen"
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1849
+#. (tag('strong', dir => 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:71
 msgid "Append to end of %1 set"
 msgstr "An das Ende von Set %1 anhängen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2264
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:51
+msgid "Applying definitions theoretically and proof writing"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:91
 msgid "Archive"
 msgstr "Archiv"
 
 #. ($archive, $n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:892
-msgid "Archive '%1' created successfully (%quant( %2, file))"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:361
+msgid "Archive \"%1\" created successfully (%quant( %2, file))"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1069
-msgid "Archive '%1' deleted"
-msgstr "Archiv '%1' gelöscht."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:525
+msgid "Archive \"%1\" deleted"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1846
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2048
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:38
 msgid "Archive Course"
 msgstr "Kurs archivieren"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2005
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:17
+msgid "Archive Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:63
 msgid "Archive Courses"
 msgstr "Kurse Archivieren"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2423
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1158
 msgid "Archive next course"
 msgstr "Nächsten Kurs archivieren"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1056
-msgid "Archive this Course"
-msgstr "Diesen Kurs archivieren"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:61
 msgid "Archived Courses"
 msgstr "Kursarchiv"
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:202
-msgid "Archiving course as %1.tar.gz. Reload FileManager to see it."
-msgstr "Kurs wird als %1.tar.gz archiviert. Dateimanager neu laden um Veränderungen sichtbar zu machen."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:69
+msgid "Archived course as %1.tar.gz."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:25
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to access the .tar.gz files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:26
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to upload additional .tar.gz "
+"files to be unarchived."
+msgstr ""
 
-#. (CGI::b($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2191
+#. (tag('b', $archive_courseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:57
 msgid ""
 "Are you sure that you want to delete the course %1 after archiving? This "
 "cannot be undone!"
 msgstr "Kurs %1 wirklich nach Archivierung löschen? Diese Aktion kann nicht rückgängig gemacht werden!"
 
-#. (CGI::b($delete_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1736
+#. (tag('b', param('delete_courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:5
 msgid ""
 "Are you sure you want to delete the course %1? All course files and data "
 "will be destroyed. There is no undo available."
 msgstr "Kurs %1 wirklich löschen? Alle Kursdaten gehen verloren und können nicht wiederhergestellt werden."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:72
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:511
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:64
+msgid ""
+"As the checkbox says, this includes a percentage grade column for each set."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:184
 msgid "Assign"
 msgstr "Hinzufügen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:225
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:62
 msgid "Assign All Sets to Current User"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:171
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:106
+msgid "Assign achievements"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:43
+msgid "Assign and unassign selected exercise sets to selected users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:54
 msgid "Assign selected sets to selected users"
 msgstr "Die ausgeählten Blätter den ausgewählten Nutzern zuordnen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:919
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:154
+msgid "Assign sets to many students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:116
+msgid "Assign sets to one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:15
 msgid "Assign this achievement to which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1366
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:62
 msgid "Assign this set to which users?"
 msgstr "tr: Assign this set to which users?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:15
 msgid "Assign to All Current Users"
 msgstr "Allen aktuellen Nutzern zuordnen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:3
 msgid "Assign which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:35
 msgid "Assigned"
 msgstr "Hinzugefügt"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1984
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:19
 msgid "Assigned Sets"
 msgstr "Zugeordnete Blätter"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:580
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:218
 msgid "Assigned achievements to users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2154
-msgid "Assigned to"
+#. (link_to(						$c->setCountMessage($db->countUserSets($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:96
+msgid "Assigned to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:212
 msgid "Assignment type"
 msgstr "Art des Tests"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-msgid "Assignments only"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:2004
+#: /opt/webwork/webwork2/conf/defaults.config:1906
 msgid "Assist with the student answer entry process."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:417
 msgid "At least one of the answers above is NOT correct."
 msgstr "Mindestens eine der obigen Anwtworten ist NICHT richtig."
 
 # Short for "Attempts to Open Children"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:487
 msgid "Att. to Open Children"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:50
 msgid "Attachment:"
 msgstr "Anhang:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2293
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:107
 msgid "Attempt to upgrade directories"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:375
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:449
 msgid "Attempted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1416
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1498
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/attempts_row.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:73
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:13
 msgid "Attempts"
 msgstr "Versuche"
 
@@ -1142,64 +1579,114 @@ msgstr "Versuche"
 msgid "Audit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:342
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:348
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:360
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:366
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:460
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:466
 msgid "Authentication failed.  Please speak to your instructor."
 msgstr "Die Authentifizierung war nicht erfolgreich. Bitte nehmen Sie Kontakt zu Ihrer Lehrkraft auf."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:523
-msgid "Author Info"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/InstructorRPCHandler.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:44
+msgid "Authentication failed. Log in again to continue."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:116
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:69
+msgid "Author Info"
 msgstr "Autoreninformation"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:87
 msgid "Automatic"
 msgstr "automatisch"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2058
+#: /opt/webwork/webwork2/conf/defaults.config:1959
 msgid ""
 "Automatically convert Full Width Unicode characters to their ASCII "
 "equivalents"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2911
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:97
+msgid ""
+"Automatically render all problems in the set on this page when \"Save "
+"Changes\" or \"Reset Form\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:667
 msgid "Automatically render problems on page load"
 msgstr "Automatisch die Aufgabe beim Laden der Seite anzeigen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1727
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:95
+msgid "Automatically render problems on page load."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:49
 msgid "Auxiliary Resources"
 msgstr ""
 
-#. ($emailDirectory,$old_default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:350
-msgid "Backup file <code>%1/%2</code> created."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:179
+msgid "Average Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:255
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:118
+msgid "Average Attempts Per Problem"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:115
+msgid "Average Percent"
+msgstr ""
+
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:558
+msgid "Backup created on %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:1
 msgid "Badges"
 msgstr "Abzeichen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:942
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:106
 msgid "Basic Search"
 msgstr "einfache Suche"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:28
+msgid "Before Open Date"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:31
+msgid ""
+"Below the file list is a button and options for uploading files. Click the "
+"\"Choose File\" button, select the file, then click \"Upload\". A single "
+"file or a compressed tar (.tgz) file can be uploaded and if the option is "
+"selected, the archive is automatically unpacked and deleted.  Generally the "
+"\"automatic\" option on Format will correctly pick the correct type of file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:83
 msgid "Binary"
-msgstr "binär"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1271
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+msgid "Both Start and Grade"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:26
 msgid "Box of Transmogrification"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1093
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:40
 msgid "Browse"
 msgstr "Durchsuchen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:512
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:991
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:16
 msgid "Browse from:"
 msgstr "Kurs durchsuchen: "
 
-#: /opt/webwork/webwork2/conf/defaults.config:2161
+#: /opt/webwork/webwork2/conf/defaults.config:2072
 msgid ""
 "By default, feedback is always sent to all users specified to recieve "
 "feedback.  This variable sets the system to only email feedback to users who"
@@ -1207,327 +1694,471 @@ msgid ""
 "will only be sent to section leaders."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2151
+#: /opt/webwork/webwork2/conf/defaults.config:2062
 msgid ""
 "By default, feedback is sent to all users above who have permission to "
 "receive feedback. Feedback is also sent to any addresses specified in this "
 "blank. Separate email address entries by commas."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
 msgid "CLOSE DATE"
 msgstr "ABGABEDATUM"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:217
 msgid "CLOSE TIME"
 msgstr "ABGABEZEIT"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:26
 msgid "Cake of Enlargement"
 msgstr "Kuchen der Vergrößerung"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1891
+#: /opt/webwork/webwork2/conf/defaults.config:1793
 msgid "Can e-mail instructor"
 msgstr "E-Mail an Dozenten schicken"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1904
+#: /opt/webwork/webwork2/conf/defaults.config:1806
 msgid "Can report bugs"
 msgstr "Fehlermeldungen einreichen"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1955
+#: /opt/webwork/webwork2/conf/defaults.config:1857
 msgid "Can show old answers"
 msgstr "Alte Antworten anzeigen"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1897
+#: /opt/webwork/webwork2/conf/defaults.config:1799
 msgid "Can submit answers for a student"
 msgstr "Antworten für einen Studierenden abgeben"
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:275
 msgid "Can't copy file: %1"
 msgstr "Datei konnte nicht kopiert werden: %1"
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:894
-msgid "Can't create archive '%1': command returned %2"
-msgstr "Datei '%1' konnte nicht erzeugt werden: %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
+msgid "Can't create archive \"%1\": command returned %2"
+msgstr ""
 
 #. ($courseID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2725
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:28
 msgid "Can't create course environment for %1 because %2"
 msgstr "Kursumgebung %1 konnte nicht erstellt werden: %2"
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:423
 msgid "Can't create directory: %1"
 msgstr "Verzeichnis konnte nicht erstellt werden: %1"
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1060
-msgid "Can't create file '%1': %2"
-msgstr "Datei '%1' konnte nicht erzeugt werden: %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+msgid "Can't create file \"%1\": %2"
+msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:948
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:406
 msgid "Can't create file: %1"
 msgstr "Datei konnte nicht erzeugt werden: %1"
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1070
-msgid "Can't delete archive '%1': %2"
-msgstr "Datei '%1' konnte nicht gelöscht werden: %2"
-
-#. ($eUserID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:69
-msgid "Can't get password record for effective user '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:526
+msgid "Can't delete archive \"%1\": %2"
 msgstr ""
 
-#. ($userID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:64
-msgid "Can't get password record for user '%1': %2"
-msgstr "Der Passworteintrag für Nutzer '%1' ist nicht verfügbar %2"
+#. ($setID, $TargetUser->user_id,)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:925
+msgid ""
+"Can't generate hardcopy for set \"%1\" for user \"%2\". The set is not "
+"visible to students."
+msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:445
 msgid "Can't open %1"
 msgstr "Datei %1 konnte nicht geöffnet werden"
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1426
 msgid "Can't open file %1"
 msgstr "Datei %1 konnte nicht geöffnet werden"
 
 #. ($merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:343
 msgid "Can't read merge file %1. No message sent"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:760
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:298
 msgid "Can't rename file: %1"
 msgstr "Datei %1 konnte nicht umbenannt werden"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:591
 msgid "Can't rename to the same name."
 msgstr "Name existiert bereits."
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:927
-msgid "Can't unpack '%1': command returned %2"
-msgstr "Datei '%1 konnte nicht entpackt werden: %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:392
+msgid "Can't unpack \"%1\": command returned %2"
+msgstr ""
 
 #. ($fullPath)
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:629
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1895
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1819
 msgid "Can't write to file %1"
 msgstr "Datei %1 konnte nicht beschrieben werden"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1015
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1096
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:154
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:462
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/confirm.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:69
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:15
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:387
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:5
+msgid "Cancel E-Mail"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:60
 msgid "Cancel E-mail"
 msgstr "Abbrechen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:61
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:77
 msgid "Cancel Edit"
 msgstr "Abbrechen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:79
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
 msgid "Cancel Export"
 msgstr "Abbrechen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:93
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
 msgid "Cancel Password"
 msgstr "Abbrechen"
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:516
+msgid "Cannot find a file path to save to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:501
+msgid ""
+"Cannot find a problem record for set $c->{setID} / problem $c->{problemID}"
+msgstr ""
+
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:240
 msgid "Cannot open %1"
 msgstr "Datei %1 konnte nicht geöffnet werden"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:222
-msgid "Cap Test Time at Set Close Date?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:232
+msgid "Cap Test Time at Set Close Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1456
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1486
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:14
 msgid "Category"
 msgstr "Kategorie"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:516
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:49
+msgid "Category:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:27
 msgid ""
 "Cause the selected homework set to count for twice as many points as it "
 "normally would."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1272
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:27
 msgid ""
 "Causes a homework problem to become a clone of another problem from the same"
 " set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:727
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:27
 msgid "Causes a single homework problem to be worth twice as much."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1006
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:48
 msgid "Change Course Title to:"
 msgstr "Name des Kurses ändern:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:34
 msgid "Change CourseID to:"
 msgstr "CourseID ändern zu:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:176
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:134
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:76
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:25
 msgid "Change Display Settings"
 msgstr "Darstellungseinstellungen ändern"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:53
 msgid "Change Email Address"
 msgstr "Email-Adresse ändern"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1032
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:62
 msgid "Change Institution to:"
 msgstr "Institution ändern zu:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:374
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:18
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:169
 msgid "Change User Settings"
 msgstr "Nutzereinstellungen speichern"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:35
+msgid "Change a course's ID, Title, or Institution."
+msgstr ""
+
 #. ($rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1092
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
 msgid "Change course institution from %1 to %2"
 msgstr "Kurs Institution ändern von %1 zu %2"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:160
+msgid "Change dates for a homework set for the whole class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:123
+msgid "Change the due date for one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:26
+msgid ""
+"Change the due dates for an individual student on this page. Check the "
+"checkbox and enter the new date in order to override the date. (You can copy"
+" the date format from the date in the right hand column which indicates the "
+"date when the homework set is due for the whole class.) Note that you should"
+" ensure that the close date is before the answer date. If the close date for"
+" a student is extended until after the class answer date for the set, then "
+"the answer date for the student must also be set to a later date. "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:141
+msgid "Change the grades on a homework set for one student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:163
+msgid "Change the grading on a homework set for an entire class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:170
+msgid "Change the number of atttempts allowed on a problem."
+msgstr ""
+
 #. ($rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1089
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:508
 msgid "Change title from %1 to %2"
 msgstr "Titel ändern von %1 zu %2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1362
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:488
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:540
 msgid "Changes abandoned"
 msgstr "Änderungen verworfen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:371
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:242
 msgid "Changes in this file have not yet been permanently saved."
 msgstr "Die Änderungen dieser Datei wurden noch nicht gespeichert."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:647
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:529
 msgid "Changes saved"
 msgstr "Änderungen gespeichert"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1822
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:38
+msgid "Changing dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:514
 msgid ""
 "Changing the problem seed for display, but there are no problems showing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:635
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:19
 msgid "Chapter:"
 msgstr "Kapitel:"
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1849
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:15
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:103
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:37
 msgid "Check Answers"
 msgstr "Antworten überprüfen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2476
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:682
 msgid "Check Test"
 msgstr "Test bewerten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:183
-msgid "Check that it's permissions are set correctly."
-msgstr ""
-
-#. ($emailDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:195
-msgid ""
-"Check whether it exists and whether the directory %1 can be read by the "
-"webserver."
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:53
+msgid "Choose problems from a library and add them to a homework set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:543
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:40
 msgid "Choose the set which you would like to be worth twice as much."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:44
 msgid "Choose the set which you would like to enable partial credit for."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1206
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:992
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:44
 msgid "Choose the set which you would like to resurrect."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:259
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:350
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:40
 msgid "Choose the set whose close date you would like to extend."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:903
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:16
 msgid "Choose visibility of the sets to be affected"
 msgstr "Sichtbarkeit für die Aufgabensätze auswählen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:497
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:15
 msgid "Choose what to do with existing data:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:880
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:3
 msgid "Choose which sets to be affected"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:491
-msgid "Class value"
-msgstr "Klassen wert"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:17
+msgid "Class List Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:55
+msgid "Class list (\".lst\") files"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:334
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:316
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:37
 msgid "Classlist Editor"
 msgstr "Teilnehmerliste"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1197
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:91
 msgid "Clear Problem Display"
 msgstr "Zurücksetzen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:693
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:82
 msgid ""
 "Click a student's name to see the student's homework set. Click a heading to"
 " sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:74
 msgid ""
 "Click a student's name to see the student's test summary page. Click a "
 "test's version number to see the corresponding test version. Click a heading"
 " to sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:614
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:150
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:143
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made. (The grade for each problem is listed "
+"as \"status\" on this third page)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:24
+msgid ""
+"Click on each of the tabs to view the configuration items. The question mark"
+" icon provides access to information about the behavior of the configuration"
+" settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:125
+msgid ""
+"Click on the column \"Assigned Sets\" in the student's row. This will take "
+"you to a page where you can assign and unassign homework sets and change the"
+" due dates for homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:33
+msgid ""
+"Click on the homework set links to edit the grades for this individual "
+"student on the homework set. (The grade of each problem is called the "
+"\"status\".) You can also change the number of allowed attempts and further "
+"modify the individual student's homework set.) You will also be able to "
+"change a student's seed which determines the individual values used in the "
+"individual version of the student's problem and the weight (how much a "
+"problem counts towards the grade.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:90
 msgid ""
 "Click on the login name to edit individual problem set data, (e.g. due "
 "dates) for these students."
 msgstr "Auf den Nutzernamen klicken, um individuell Daten des Sets (z.B. Abgabedatum) zu ändern"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:62
+msgid ""
+"Click the \"Add x student(s)\" radio button and then click \"Take action\". "
+"This will take you to a new page where the data can be entered for one or "
+"more students. It is also possible to assign the student to one or more "
+"problem sets as they are being entered: simply select the homework sets from"
+" the list below the data entry table. Use \"command\" or \"control\" click "
+"to select more than one homework set."
+msgstr ""
+
+#. ('<i class="fas fa-question-circle"></i>')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:88
+msgid "Click the %1 icon for page and item specific help."
+msgstr ""
+
+#. ('<a href="#"><i class="fas fa-question-circle"></i></a>')
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:20
+msgid "Click the icon %1 for page and item specific help."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:185
+msgid ""
+"Clicking on any active link at the top of the column sorts the page by that "
+"column. You can do lexigraphic sorts: click on \"First name\" then \"Last "
+"name\" to sort by last name, sorting those with the same last name by their "
+"first name."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:132
+msgid ""
+"Clicking on the login name link in a student's row allows you to view the "
+"student's version of the homework (rather than your own) so that you can "
+"more easily answer student questions about homework problems. (A \"acting as"
+" xxx\" alert will appear in the upper right corner of each window while you "
+"are acting as a student.) You can submit the answers (which will NOT be "
+"recorded) to check that the computer is grading the problem correctly. You "
+"will also be able to view past answers submitted by the student for each "
+"problem. To stop acting in the student's role click the \"Stop acting\" link"
+" in the upper right corner of the window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:199
+msgid ""
+"Clicking the <strong>e-mail address</strong> link will bring up your "
+"standard email application so that you can send email to the student. This "
+"works even if the student has been dropped from the course. To send email to"
+" an entire class or to merge grades with the email message use the \"Email\""
+" page link in the left margin."
+msgstr ""
+
 #. ($clientIP->ip()
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:541
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:547
 msgid ""
 "Client ip address %1 is not allowed to work this assignment, because the "
 "assignment has ip address restrictions and there are no allowed locations "
@@ -1535,329 +2166,337 @@ msgid ""
 "problem resolved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:713
-msgid "Close"
-msgstr "Schließen"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:424
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:764
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:788
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:811
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:316
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:39
 msgid "Close Date"
 msgstr "Verfügbar bis"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:382
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:35
+msgid "Closed"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:208
 msgid "Closed, answers available."
 msgstr "Abgelaufen. Lösungen verfügbar."
 
-#. ($self->formatDateTime($set->answer_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:378
+#. ($c->formatDateTime($set->answer_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:204
 msgid "Closed, answers on %1."
 msgstr "Abgelaufen. Lösungen verfügbar ab %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:206
 msgid "Closed, answers recently available."
 msgstr "Abgelaufen. Lösungen seit kurzem verfügbar."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:282
 msgid "Closed."
 msgstr "Abgelaufen."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:116
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:121
 msgid "Closes"
 msgstr "Verfügbar bis"
 
-#. ($self->formatDateTime($set->due_date, undef,
+#. ($c->formatDateTime($verSet->due_date, undef,
 #. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:113
-msgid "Closes %1"
-msgstr "Verfügbar bis %1"
-
-#. ($self->formatDateTime($verSet->due_date, undef,
-#. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:390
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:227
 msgid "Closes on %1"
 msgstr "Verfügbar bis %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:35
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:33
 msgid "Closes:"
 msgstr "Verfügbar bis"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2518
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:357
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:71
 msgid "Collapse All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2529
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:367
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:85
 msgid "Collapse All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2668
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:419
 msgid "Collapse Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2791
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2793
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:572
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:575
 msgid "Collapse Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1715
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:73
+msgid ""
+"Collapse problem details to the top row of information about a problem. Note"
+" that the details of a single problem can be collapsed by clicking on the up"
+" arrow to the right of the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1617
 msgid ""
 "Comma separated list of set names that are excluded from all achievements. "
 "No achievement points and badges can be earned for submitting problems in "
 "these sets. Note that underscores (_) must be used for spaces in set names."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:238
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:245
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:225
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:577
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2047
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:299
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:833
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:862
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:891
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:920
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:131
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:46
 msgid "Comment"
 msgstr "Kommentar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:200
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:25
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:181
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:638
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:86
 msgid "Comments"
 msgstr "Kommentare"
 
-#. ($self->formatDateTime($set->answer_date)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2175
+#. ($c->formatDateTime($c->{set}->answer_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:379
 msgid "Completed results for this assignment are not available until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:382
 msgid "Completed results for this assignment are not available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:264
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:280
 msgid "Completed."
 msgstr "Fertig."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:45
 msgid "Compose Email Message"
 msgstr "Email-Nachricht verfassen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3185
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:47
+msgid ""
+"Configure ip ranges (locations) that can be used to restrict set access."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:45
+msgid "Configure which course links appear on the site landing page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:97
 msgid "Confirm"
 msgstr "Bestätigen"
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:107
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:164
+#. ($eUserName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:41
 msgid "Confirm %1's New Password"
 msgstr "Neues Passwort von %1 bestätigen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:579
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:78
 msgid "Confirm Password"
 msgstr "Passwort bestätigen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_export_form.html.ep:1
 msgid "Confirm which sets to export."
 msgstr "Bestätigen Sie die Aufgabensätze für den Export."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementEvaluator.pm:288
+#: /opt/webwork/webwork2/templates/AchievementEvaluator/cheevoMessage.html.ep:15
 msgid "Congratulations, you earned a new level!"
 msgstr "Herzlichen Glückwunsch! Sie haben einen neuen Level erreicht."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2250
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:95
 msgid "Continue"
 msgstr "Anmelden"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:86
 msgid "Continue Open Test"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:59
+msgid "Controls if an achievement is evaluated or not."
+msgstr ""
+
 #. ($sourceDirectory, $outputDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1149
-msgid "Copied auxiliary files from %1 to new location at %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:671
+msgid "Copied auxiliary files from %1 to new location at %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:42
 msgid "Copy"
 msgstr "Kopieren"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
 msgid "Copy file as:"
 msgstr "Datei kopieren als:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:528
-msgid "Copy simple configuration file to new course"
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:112
+msgid "Copy from:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:627
-msgid "Copy templates from:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1335
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:82
 msgid "Copy this Problem"
 msgstr "Diese Aufgabe Kopieren"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:391
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:465
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:301
 msgid "Correct"
 msgstr "Richtig"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:656
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:678
 msgid "Correct Adjusted Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:300
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:287
 msgid "Correct Answer"
 msgstr "Lösung"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1682
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:19
 msgid "Correct Answers"
 msgstr "richtige Antworten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1506
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1317
 msgid "Correct Answers:"
 msgstr "Richtige Antworten:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:693
 msgid "Correct Status"
 msgstr "Status korrigieren"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:648
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:93
 msgid "Correct answers"
 msgstr "Richtige Antworten"
 
 #. ($total_correct, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1004
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:16
 msgid "Correct: %1/%2"
 msgstr "Richtig: %1/%2"
 
 #. ($newBlankProblems, $MAX_NEW_PROBLEMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1915
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1843
 msgid ""
 "Could not add %1 problems to this set.  The number must be between 1 and %2"
 msgstr ""
 
 #. ($e_user_name, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:83
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:94
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:74
 msgid "Couldn't change %1's password: %2"
 msgstr "Passwort von %1 konnte nicht geändert werden: %2"
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:111
 msgid "Couldn't change your email address: %1"
 msgstr "Ihre Email-Adresse konnte nicht geändert werden: %1"
 
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4111
-msgid "Couldn't find OPL Branch %1 in remote %2"
-msgstr ""
-
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4076
-msgid "Couldn't find PG Branch %1 in remote %2"
-msgstr ""
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4014
-msgid "Couldn't find WeBWorK Branch %1 in remote %2"
-msgstr ""
-
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:132
 msgid "Couldn't save your display options: %1"
 msgstr "Anzeigeeinstellungen konnten nicht gespeichert werden: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1463
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:36
 msgid "Counter"
 msgstr "Zähler"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:424
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:833
-msgid "Counts for Parent"
-msgstr ""
-
-#. ($rename_oldCourseID)
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2186
-msgid "Course %1 database is in order"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:66
+msgid "Counter:"
 msgstr ""
 
-#. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1257
-msgid "Course %1 databases must be updated before renaming this course."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:503
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:35
+msgid "Counts for Parent"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:778
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:95
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:154
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:9
 msgid "Course Administration"
 msgstr "Kursverwaltung"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:424
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:17
+msgid "Course Administration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:369
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:80
 msgid "Course Configuration"
 msgstr "Kurseinstellungen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:480
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:17
+msgid "Course Configuration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:17
+msgid "Course Home Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:21
 msgid "Course ID"
 msgstr "Kurs ID"
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2566
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:691
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:594
 msgid "Course ID cannot exceed %1 characters."
 msgstr "Kurs ID darf nicht %1 Zeichen überschreiten."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1227
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:597
 msgid "Course ID may only contain letters, numbers, hyphens, and underscores."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:956
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:21
 msgid "Course ID:"
 msgstr "Kurs ID:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:5
 msgid "Course Info"
 msgstr "Kursinformation"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1664
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1961
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3736
+#. ($c->stash('courseID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:325
+msgid "Course Information for course %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:30
+msgid "Course Listings"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:17
 msgid "Course Name:"
 msgstr "Kursname:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:491
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:28
 msgid "Course Title"
 msgstr "Kursname"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:204
-msgid "Course archived."
-msgstr "Kurs archiviert."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:418
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:12
 msgid "Courses"
 msgstr "Kurse"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1609
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1904
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3674
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:13
 msgid ""
 "Courses are listed either alphabetically or in order by the time of most "
 "recent login activity, oldest first. To change the listing order check the "
@@ -1866,393 +2505,536 @@ msgid ""
 "\"hidden\" or \"visible\"."
 msgstr "Kurse werden entweder alphabetisch oder nach letzter Loginaktivität sortiert. Ergebnisse werden im folgenden Format angezeigt: Course_Name (status :: date/time des letzten Logins) wobei status entweder \"hidden\" oder \"visible\" anzeigt."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:7
+msgid ""
+"Courses are listed either alphabetically or in order by the time of most "
+"recent login activity, oldest first. To change the listing order check the "
+"mode you want and click \"Refresh Listing\". The listing format is: "
+"Course_Name (status :: date/time of most recent login) where status is "
+"\"hidden\" or \"visible\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:163
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:84
 msgid "Create"
 msgstr "Erstellen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:41
 msgid "Create CSV"
 msgstr "CSV erstellen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3054
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:31
 msgid "Create Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1071
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:39
+msgid ""
+"Create a .tar.gz archive which includes the course's database and all course"
+" files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:33
 msgid "Create a New Set in This Course:"
 msgstr "Neues Set anlegen:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:795
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:4
 msgid "Create a new achievement with ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:33
+msgid "Create a new course on this server."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:20
+msgid ""
+"Create a new course.  The \"Course ID\" is used as the course name and is "
+"used in course links.  Underscores appear as spaces when displaying the "
+"course name.  The \"Course Title\" is used as the title on the course home "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:86
+msgid ""
+"Create a new set with a given name. This can either create an empty set or a"
+" duplicate of an existing set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:12
 msgid "Create as what type of achievement?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:12
 msgid "Create as what type of set?"
 msgstr "Art des Sets"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1866
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:20
+msgid "Create backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:81
 msgid "Create unattached problem"
 msgstr "Unabhängige Aufgabe ersellen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1849
-msgid ""
-"Creates a gzipped tar archive (.tar.gz) of a course in the WeBWorK courses "
-"directory. Before archiving, the course database is dumped into a "
-"subdirectory of the course's DATA directory. Currently the archive facility "
-"is only available for mysql databases. It depends on the mysqldump "
-"application."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:121
+msgid "Create/Delete achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:726
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:26
 msgid "Cupcake of Enlargement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:728
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:38
 msgid "Current"
 msgstr "Aktuell"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3042
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:2
 msgid "Currently defined locations are listed below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4352
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2365
 msgid "Database tables are ok"
 msgstr "Datenbaank Tabellen sind in Ordnung."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:54
 msgid "Database tables need updating."
 msgstr "Datenbank Tabellen benötigen ein Update."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2753
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:52
 msgid "Database tables ok"
 msgstr "Datenbank Tabellen ok."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2968
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1499
 msgid "Database:"
 msgstr "Datenbank:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:783
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:153
 msgid "Date"
 msgstr "Datum"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:727
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:355
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:96
+msgid "Dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:40
+msgid ""
+"Dates for problem sets can be edited by clicking the pencil icon in the "
+"\"Edit Set Data\" column next to the set name. To change dates for several "
+"sets at once, click the check box in the \"Select\" column and choose \"Edit"
+" selected\" from the tasks above."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:426
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:37
 msgid "Default"
 msgstr "Standard"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1675
+#: /opt/webwork/webwork2/conf/defaults.config:1577
 msgid ""
 "Default Amount of Time (in minutes) after Due Date that Answers are Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1665
+#: /opt/webwork/webwork2/conf/defaults.config:1567
 msgid ""
 "Default Amount of Time (in minutes) before Due Date that the Assignment is "
 "Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1785
+#: /opt/webwork/webwork2/conf/defaults.config:1687
 msgid "Default Length of Reduced Scoring Period in minutes"
 msgstr "voreingestellte Standard-Länge für die Bewertungsphase mit Punktabzug in Minuten"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1655
+#: /opt/webwork/webwork2/conf/defaults.config:1557
 msgid "Default Time that the Assignment is Due"
 msgstr "Voreingestellter Abgabezeitpunkt"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1808
+#: /opt/webwork/webwork2/conf/defaults.config:1710
 msgid ""
 "Default number of attempts before Show Me Another can be used (-1 => Never)"
 msgstr "Anzahl Versuche bevor eine neue Version der Aufgabe angefordert werden kann (-1 => Nie)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1755
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:162
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:91
+#: /opt/webwork/webwork2/conf/defaults.config:1994
+msgid ""
+"Default number of attempts before hints are shown in a problem (-1 => hide "
+"hints)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:89
 msgid "Delete"
 msgstr "Löschen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1556
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1651
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1689
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1728
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:49
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:36
 msgid "Delete Course"
 msgstr "Kurs löschen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3480
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:17
+msgid "Delete Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:23
+msgid "Delete Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:37
+msgid "Delete a course and all associated data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:109
+msgid "Delete a student from a course"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:52
 msgid "Delete all existing addresses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1989
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:65
+msgid "Delete backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:64
+msgid "Delete backup from %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:54
 msgid "Delete course after archiving. Caution there is no undo!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:49
 msgid "Delete course:"
 msgstr "Kurs löschen:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2348
 msgid "Delete field when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2809
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:588
 msgid "Delete it?"
 msgstr "Löschen?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3055
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:78
 msgid "Delete location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:28
+msgid "Delete oldest backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2321
 msgid "Delete table when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:729
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:90
+msgid "Delete the sets checked below. Be careful, this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:6
 msgid "Delete which achievements?"
 msgstr "Trophäen löschen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1045
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:6
 msgid "Delete which sets?"
 msgstr "Welche Sätze löschen?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1041
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:6
 msgid "Delete which users?"
 msgstr "Welche Nutzer sollen gelöscht werden?"
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:394
 msgid "Deleted %1 users."
 msgstr "%1 Nutzer wurden gelöscht."
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:358
 msgid "Deleted %quant(%1,achievement)"
 msgstr "%quant(%1,Trophäe,Trophäen) gelöscht"
 
 #. (join(', ', @delLocations)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3359
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1810
 msgid "Deleted Location(s): %1"
 msgstr ""
 
 #. (join(', ', @toDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3597
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1966
 msgid "Deleted addresses %1 from location."
 msgstr ""
 
-#. ($self->shortPath($self->{tempFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1158
-msgid "Deleting temp file at %1"
-msgstr "Die temporäre Datei wurde um %1 gelöscht."
+#. ($formatBackupTime)
+#. ($c->formatDateTime($delTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1243
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:569
+msgid "Deleted backup from %1."
+msgstr ""
+
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:679
+msgid "Deleted temp file at %1"
+msgstr ""
+
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1219
+msgid "Deleted temporary file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:125
+msgid "Deleting Problems"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3152
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:68
 msgid ""
 "Deletion deletes all location data and related addresses, and is not "
 "undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:723
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:3
 msgid "Deletion destroys all achievement-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:185
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
 msgid "Deny From"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1467
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:27
 msgid "Description"
 msgstr "Beschreibung"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:256
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:71
+msgid "Description:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:69
 msgid "Deselect All Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:229
 msgid "Deselect All Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:428
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:366
 msgid "Didn't recognize action"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:27
 msgid "Directory"
 msgstr "Verzeichnis"
 
 #. ($file, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:793
-msgid "Directory '%1' not removed: %2"
-msgstr "Verzeichnis '%1' konnte nicht gelöscht werden: %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:327
+msgid "Directory \"%1\" not removed: %2"
+msgstr ""
 
 #. ($file, $removed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:792
-msgid "Directory '%1' removed (items deleted: %2)"
-msgstr "Verzeichnis '%1' gelöscht (gelöschte Dateien: %2)"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:325
+msgid "Directory \"%1\" removed (items deleted: %2)"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:412
-msgid "Directory permission errors "
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:33
+msgid "Directory permission errors"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2861
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2994
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1439
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1575
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:44
 msgid ""
 "Directory structure is missing directories or the webserver lacks sufficient"
 " privileges."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1267
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2210
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2857
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1434
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1570
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:41
 msgid "Directory structure is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2285
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:102
 msgid "Directory structure needs to be repaired manually before archiving."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1338
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:84
 msgid "Directory structure needs to be repaired manually before renaming."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2750
-msgid "Directory structure or permissions need to be repaired. "
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:48
+msgid "Directory structure or permissions need to be repaired."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2853
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1414
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1540
 msgid "Directory structure:"
 msgstr "Verzeichnisstruktur:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2536
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:365
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:92
+msgid "Display Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:90
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:104
 msgid "Display Mode:"
 msgstr "Anzeigemodus:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:463
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:37
 msgid "Display Past Answers"
 msgstr "Bisherige Antworten anzeigen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
-msgid "Display of scores for this set is not allowed."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:44
+msgid "Display mode for equations"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:311
+msgid "Display of scores for this test is not allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:589
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:12
 msgid "Display options: Show"
 msgstr "Anzeigeoptionen"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2017
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:48
+msgid ""
+"Display sets matching a selected criteria. Useful if there are many sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1918
 msgid "Display the evaluated student answer"
 msgstr "Die bewertete Schülerantwort anzeigen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:176
+#. ('<code>COURSENAME_totals.csv</code>',
+#. '<code>COURSENAME_totals_bak1.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:74
+msgid ""
+"Do NOT use the file name %1, since you might accidentally overwrite that if "
+"you again export your WeBWorK homework scores. (Actually the earlier file is"
+" moved to %2 -- so you can recover using the File Manager.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:57
 msgid "Do not unassign students unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:233
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:67
 msgid "Do not uncheck a set unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:20
 msgid "Do not uncheck students, unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2450
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:656
 msgid "Do you want to grade this test?"
 msgstr "Möchten Sie diesen Test benoten?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2272
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:93
+msgid "Documentation from source code for PG modules and macro files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:95
 msgid "Don't Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2607
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:13
 msgid "Don't Unarchive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2912
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:46
 msgid "Don't Upgrade"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1749
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:15
 msgid "Don't delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1120
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:24
 msgid "Don't make changes"
 msgstr ""
 
 #. ($saveMode)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:317
 msgid "Don't recognize saveMode: |%1|. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1307
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1321
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1335
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:87
 msgid "Don't rename"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:547
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:33
 msgid "Don't use in an achievement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:683
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1345
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2465
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1595
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:766
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:57
 msgid "Done"
 msgstr "Fertig"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:159
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:365
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:8
 msgid "Download"
 msgstr "Herunterladen"
 
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($set->set_id)
 #. ($ver->{id} =~ s/_/ /gr)
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($set->set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:731
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:732
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:413
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:204
 msgid "Download %1"
 msgstr "%1 herunterladen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:23
 msgid "Download Hardcopy"
 msgstr "Druckversion herunderladen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:865
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:56
 msgid "Download PDF or TeX Hardcopy for Current Set"
 msgstr "PDF oder TeX des aktuellen Sets herunterladen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:764
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:233
 msgid "Download PDF or TeX Hardcopy for Selected Tests"
 msgstr "PDF oder TeX der ausgewähltren Sets herunterladen"
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($selected_set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:595
+#. (tag('span', dir => 'ltr', format_set_name_display($selected_set_id =~
+#. s/,v(\d+)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:58
 msgid "Download hardcopy of set %1 for %2?"
 msgstr "Druckversion von %1 für %2 herunterladen?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:369
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:63
+msgid "Download/upload archived courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:46
 msgid "Download:"
 msgstr "Download:"
 
@@ -2260,314 +3042,401 @@ msgstr "Download:"
 msgid "Drop"
 msgstr "tr: Drop"
 
-#. ($self->formatDateTime($set->reduced_scoring_date, undef,
-#. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:107
-msgid "Due %1, after which reduced scoring is available until %2"
-msgstr "fällig bis %1, anschließend sind Bewertungen mit Punktabzug verfügbar bis %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:100
+msgid "Drop student from the course"
+msgstr ""
 
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:310
 msgid "Due date %1 has passed."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2093
+#: /opt/webwork/webwork2/conf/defaults.config:2014
 msgid "E-Mail"
 msgstr "Email versenden"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:315
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:261
 msgid "E-mail Instructor"
 msgstr "Email an Dozenten"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2128
-msgid "E-mail addresses which can receive e-mail from a pg problem"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:2138
+#: /opt/webwork/webwork2/conf/defaults.config:2049
 msgid ""
 "E-mail feedback from students automatically sent to this permission level "
 "and higher"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2109
+#: /opt/webwork/webwork2/conf/defaults.config:2030
 msgid "E-mail verbosity level"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:357
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:43
 msgid "E-mail:"
 msgstr "Email"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:35
 msgid "Earned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:71
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:158
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:334
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:417
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:547
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2743
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1628
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1186
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1203
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:257
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:479
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:6
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:53
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#. (CGI::a({ href => $basicInfoUrl }, $r->maketext('class list data')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:199
-msgid "Edit %1 for  %2 (%3) who has been assigned %4 sets."
+#. (link_to(maketext('class list data')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:47
+msgid "Edit %1 for %2 (%3) who has been assigned %4 sets."
 msgstr ""
 
-#. (CGI::a({ href => $editUsersAssignedToSetURL }, $r->maketext('individual
-#. versions')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2223
-msgid "Edit %1 of set %2."
+#. (link_to(maketext('individual user settings')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:162
+msgid "Edit %1 for set %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:6
 msgid "Edit Assigned Users"
 msgstr "Zugewiesene Nutzer bearbeiten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:40
 msgid "Edit Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1488
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:58
 msgid "Edit Evaluator"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:253
 msgid "Edit Header"
 msgstr "Header bearbeiten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3053
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:18
 msgid "Edit Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2741
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:111
 msgid "Edit Problem"
 msgstr "Aufgabe bearbeiten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:5
 msgid "Edit Problems"
 msgstr "Aufgaben bearbeiten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:583
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:3
 msgid "Edit Set"
 msgstr "Set bearbeiten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:421
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:4
 msgid "Edit Set Data"
 msgstr "Setinfos bearbeiten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:171
+msgid "Edit Tags"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:30
 msgid "Edit Target Set"
 msgstr "Dieses Set bearbeiten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1487
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:18
 msgid "Edit Users"
 msgstr ""
 
-#. ($user)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:207
-msgid "Edit data for %1"
-msgstr "Nutzerdaten von %1 bearbeiten"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:127
+msgid "Edit achievement evaluator"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1248
-msgid "Edit it"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:90
+msgid "Edit achievement information"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2192
-msgid "Edit set %1 data for ALL students assigned to this set."
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:65
+msgid ""
+"Edit achivements for the course. This link is only present if achievements "
+"are enabled for the course."
 msgstr ""
 
-#. (CGI::a({href=>$editSetLink},$setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2166
-msgid "Edit set %1 for this user."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:42
+msgid "Edit class list data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3393
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:39
 msgid ""
-"Edit the current value of the location description, if desired, then add and"
+"Edit class roster data. Add students, edit student data, drop students from "
+"class, import students from a classlist, and give user professor privileges."
+" Access to individual homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:70
+msgid "Edit data for %1"
+msgstr "Nutzerdaten von %1 bearbeiten"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:46
+msgid ""
+"Edit homework sets for entire class. Change homework set due dates, create "
+"new sets from a set definition file, create new homework sets, make sets "
+"visible/invisible, score homework sets. Assign homework sets to the class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:219
+msgid "Edit it"
+msgstr ""
+
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:135
+msgid "Edit set %1 for ALL students assigned to this set."
+msgstr ""
+
+#. (link_to(                                               $setID =>
+#. $c->systemLink(
+#. $setDetailPage, params => { effectiveUser => $user->user_id, editForUser =>
+#. $user->user_id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:106
+msgid "Edit set %1 for this user."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:95
+msgid "Edit set for %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:4
+msgid ""
+"Edit the current value of the location description, if desired, then add and"
 " select addresses to delete, and then click the \"Take Action\" button to "
 "make all of your changes.  Or, click \"Manage Locations\" above to make no "
 "changes and return to the Manage Locations page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:429
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:2
 msgid "Edit which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:829
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:2
 msgid "Edit which sets?"
 msgstr "tr: Edit which sets?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:935
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:2
 msgid "Edit which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:592
-msgid "Editing <strong>blank problem</strong> in file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:31
+msgid "Editing <strong>course information</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:595
-msgid "Editing <strong>course information</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:30
+msgid "Editing <strong>hardcopy header</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
-msgid "Editing <strong>hardcopy header</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:28
+msgid "Editing <strong>new problem</strong> template."
+msgstr ""
+
+#. ($c->{prettyProblemNumber},                             tag('span', dir =>
+#. 'ltr', format_set_name_display($fullSetName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:45
+msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:29
+msgid "Editing <strong>set header</strong> file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:33
+msgid "Editing <strong>unassigned problem</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:596
-msgid "Editing <strong>options information</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:32
+msgid "Editing <strong>unknown file type</strong> in file \"%1\"."
 msgstr ""
 
-#. ($prettyProblemNumber,                  CGI::span({ dir => 'ltr' },
-#. format_set_name_display($fullSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:605
-msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:19
+msgid "Editing Modes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:593
-msgid "Editing <strong>set header</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:140
+msgid "Editing Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:598
-msgid "Editing <strong>unassigned problem</strong> file \"%1\""
+#. ($c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:16
+msgid "Editing achievement in file \"%1\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:597
-msgid "Editing <strong>unknown file type</strong> in file \"%1\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:22
+msgid "Editing for all students"
 msgstr ""
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:209
-msgid "Editing achievement in file '%1'"
-msgstr "Trophäe in Datei '%1' bearbeiten"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:23
+msgid "Editing for one student or a proper subset of all students"
+msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3390
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:1
 msgid "Editing location %1"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display("$setID$vermsg")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2182
-msgid "Editing problem set %1 data for these individual students: %2"
+#. (tag(                                           'strong',
+#. dir => 'ltr',
+#. format_set_name_display($setID . ($editingSetVersion ?
+#. ",v$editingSetVersion" : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:123
+msgid "Editing problem set %1 for these students: %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:315
 msgid "Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:669
-msgid "Editor rows:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1668
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:229
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:53
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:68
 msgid "Email"
 msgstr "Email"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:32
 msgid "Email Address"
 msgstr "Email-Adresse"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:817
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:170
 msgid "Email Body:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:17
+msgid "Email Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:339
 msgid "Email Instructor On Failed Attempt"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2003
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:28
 msgid "Email Link"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:789
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:112
 msgid "Email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1807
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1832
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:311
+msgid "Email body is empty. No message sent. "
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:994
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_email.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_form.html.ep:24
 msgid "Email instructor"
 msgstr "Email an Dozenten"
 
-#. (scalar(@{ $self->{ra_send_to} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:454
+#. (scalar(@{ $c->{ra_send_to} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:27
+msgid ""
+"Email is being sent to %quant(%1,recipient). You will be notified by email "
+"when the task is completed.  This may take several minutes if the class is "
+"large."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:13
+msgid "Email:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:26
 msgid ""
-"Email is being sent to %quant(%1,recipient). You will be notified by email\n"
-"\t\t\t\twhen the task is completed.  This may take several minutes if the class is\n"
-"\t\t\t\tlarge."
+"Emails can contain personalized data, such as name, section, or status.  "
+"Click \"List of insertable macros\" for a full list available variables.  "
+"Additional personal data can be included by using a merge file.  A merge "
+"file is a CSV file located in the [Scoring] directory in which the first "
+"column is the student id, followed by additional data (such as student "
+"grades).  This data is identified by which column it is in, for instance if "
+"the scores where in the 4th column of the merge file, insert them into an "
+"email using the variable $COL[4].  The \"Scoring Tools\" page can export "
+"grades into a CSV that can be used as a merge file.  Upload customized merge"
+" files with the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:11
 msgid "Emails to be sent to the following:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1704
+#: /opt/webwork/webwork2/conf/defaults.config:1606
 msgid "Enable Achievement Rewards"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1723
+#: /opt/webwork/webwork2/conf/defaults.config:1625
 msgid "Enable Conditional Release"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1689
+#: /opt/webwork/webwork2/conf/defaults.config:1591
 msgid "Enable Course Achievements"
 msgstr "Trophäen aktivieren"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1645
+#: /opt/webwork/webwork2/conf/defaults.config:1547
 msgid "Enable Progress Bar and current problem highlighting"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1734
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:585
+#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Enable Reduced Scoring"
 msgstr " Bewertung mit Punktabzug aktivieren"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1799
+#: /opt/webwork/webwork2/conf/defaults.config:1701
 msgid "Enable Show Me Another button"
 msgstr "Möglichkeit neue Version der Aufgabe anzufordern"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:156
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:24
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:92
 msgid "Enable Spell Checking"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1844
+#: /opt/webwork/webwork2/conf/defaults.config:1746
 msgid "Enable periodic re-randomization of problems"
 msgstr "Periodische Neu-Randomisierung der Aufgaben"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:416
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:29
 msgid ""
 "Enable reduced scoring for a homework set.  This will allow you to submit "
 "answers for partial credit for 24 hours after the close date."
 msgstr "Aktiviere die Bewertung mit Punktabzug für ein Set. Dies ermöglicht dir, Antworten für Teilpunkte zu erreichen für 24h nach dem Schließungsdatum."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1461
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1483
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:20
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1846
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:58
+msgid "Enabled:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1748
 msgid ""
 "Enables periodic re-randomization of problems after a given number of "
 "attempts. Student would have to click Request New Version to obtain new "
 "version of the problem and to continue working on the problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1725
+#: /opt/webwork/webwork2/conf/defaults.config:1627
 msgid ""
 "Enables the use of the conditional release system.  To use conditional "
 "release you need to specify a list of set names on the Problem Set Detail "
@@ -2576,14 +3445,14 @@ msgid ""
 " sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1801
+#: /opt/webwork/webwork2/conf/defaults.config:1703
 msgid ""
 "Enables use of the Show Me Another button, which offers the student a newly-"
 "seeded version of the current problem, complete with solution (if it exists "
 "for that problem)."
 msgstr "Aktiviert den \"Andere Version anzeigen\" Knopf, welcher dem Studierenden eine neue Version der aktuellen Aufgabe anzeigt (falls vorhanden inklusive Lösung)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:662
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:163
 msgid "End"
 msgstr ""
 
@@ -2591,538 +3460,662 @@ msgstr ""
 msgid "Enrolled"
 msgstr "Eingeschrieben"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:788
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:111
 msgid "Enrolled, Drop, etc."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:830
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:859
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:888
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:917
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:128
 msgid "Enrollment Status"
 msgstr "tr: Enrollment Status"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:21
 msgid "Enter filename below"
 msgstr "Neue Datei (Dateiname unten angeben)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:20
 msgid "Enter filenames below"
 msgstr "tr: Enter filenames below"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:19
 msgid ""
 "Enter information below for students you wish to add. Each student's "
 "password will initially be set to their student ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1997
+#: /opt/webwork/webwork2/conf/defaults.config:1899
 msgid ""
 "Enter one of the allowed display mode types above.  See 'display modes "
 "entry' for descriptions."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:297
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:34
+msgid ""
+"Enter the details of the course instructor to be added when the course is "
+"created.  This user will also be added to the admin course with the username"
+" \"userID_courseID\" so you can manage and email the instructors of the "
+"courses on the server."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:284
 msgid "Entered"
 msgstr "Ihre Eingabe"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:85
-msgid "Entered student:"
-msgstr ""
-
-#. ($display_sort_method_name{$primary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:698
+#. ($display_sort_method_name{$primary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:98
 msgid "Entries are sorted by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:247
 msgid "Equation Display"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:61
+msgid "Equation Editor"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1516
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1460
 msgid "Error adding set-level proctor: %1"
 msgstr ""
 
+#. ($fromPath, $toPath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:664
+msgid "Error copying %1 to %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:14
+msgid "Error details"
+msgstr ""
+
+#. ($filePath, stash('podError')
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:27
+msgid "Error generating POD for file %1: %2"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1492
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1437
 msgid ""
 "Error getting old set-proctor password from the database: %1.  No update to "
 "the password was done."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:31
 msgid "Error message:"
 msgstr "Fehler: "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2235
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:12
 msgid "Error messages"
 msgstr "Fehlermeldungen"
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1616
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:754
 msgid "Error: Answer date must come after close date in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:747
 msgid "Error: Close date must come after open date in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1634
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:778
 msgid ""
 "Error: Reduced scoring date must come between the open date and close date "
 "in set %1"
 msgstr "Fehler: Das Datum für die Bewertung mit Punktabzug muss zwischen dem Öffungsdatum und des Schließungsdatums von Set %1 liegen."
 
-#. ($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2067
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:7
 msgid "Error: The original file %1 cannot be read."
 msgstr "Fehler: Die Datei %1 konnte nicht gelesen werden."
 
 #. ($setID)
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1240
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:738
 msgid "Error: answer date cannot be more than 10 years from now in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1235
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:733
 msgid "Error: close date cannot be more than 10 years from now in set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:630
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:234
 msgid "Error: no file data was submitted!"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1599
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:728
 msgid "Error: open date cannot be more than 10 years from now in set %1"
 msgstr ""
 
-#. ($problem_desc, $problem_name, CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1404
+#. ($problem_desc, $problem_name, $c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1210
 msgid ""
 "Errors encountered while processing %1. This %2 has been omitted from the "
 "hardcopy. Error text: %3"
 msgstr "Fehler bei der Verarbeitung von %1.  %2 wurde nicht berücksichtigt. Fehlermeldung: %3"
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3832
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:8
+msgid "Errors occured while generating hardcopy:"
+msgstr ""
+
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2128
 msgid ""
 "Errors occured while hiding the courses listed below when attempting to "
 "create the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3920
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2197
 msgid ""
 "Errors occured while unhiding the courses listed below when attempting "
 "delete the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1468
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:28
 msgid "Evaluator File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3839
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:76
+msgid "Evaluator File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:28
+msgid "Evaluator Variables"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2143
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
-"hidden."
-msgstr "Außer den obigen Fehlern, sind die ausgewählten Kurse nun unsichtbar."
+"Except for the errors listed above, all selected courses are already hidden."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3904
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2212
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
+"Except for the errors listed above, all selected courses are already "
 "unhidden."
-msgstr "Außer den obigen Fehlern, sind die ausgewählten Kurse nun sichtbar."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3456
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:39
 msgid ""
 "Existing addresses for the location are given in the scrolling list below.  "
 "Select addresses from the list to delete them:"
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2281
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1460
 msgid "Existing file %1 could not be backed up and was lost."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2514
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:354
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:65
 msgid "Expand All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:364
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:78
 msgid "Expand All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2667
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:418
 msgid "Expand Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2792
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:574
 msgid "Expand Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:74
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:89
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:67
+msgid ""
+"Expand problem details that have been collapsed. Note that the details of a "
+"single problem can be expanded by clicking on the down arrow to the right of"
+" the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:71
 msgid "Export"
 msgstr "Exportieren"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1098
-msgid "Export selected achievements."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:113
+msgid "Export achievement data"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_export_form.html.ep:1
+msgid "Export selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1267
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:17
 msgid "Export to what kind of file?"
 msgstr "Datei"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:2
 msgid "Export which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1245
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:5
 msgid "Export which users?"
 msgstr "Zu exportierende Nutzer"
 
 #. ($FileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1151
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:591
 msgid "Exported achievements to %1"
 msgstr "Trophäen exportiert nach %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1616
-msgid "Extend the close date for which Gateway?"
-msgstr "Schlussdatum für welchen Gateway Test verlängern?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:48
+msgid "Extend the close date for which test?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:148
+msgid "Extend the number of attempts allowed a student on a given problem."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1573
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:28
 msgid ""
-"Extends the close date of a gateway test by 24 hours. Note: The test must "
-"still be open for this to work."
+"Extends the close date of a test by 24 hours. Note: The test must still be "
+"open for this to work."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "FIRST NAME"
 msgstr "VORNAME"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Failed to add user:"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:416
 msgid "Failed to create new achievement: %1"
 msgstr "Trophäe konnte nicht angelegt werden: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:373
 msgid "Failed to create new achievement: no achievement ID specified!"
 msgstr "Trophäe konnte nicht angelegt werden: keine Trophäen ID angegeben!"
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:573
 msgid "Failed to create new set: %1"
 msgstr "Neues Set konnte nicht angelegt werden: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1158
-msgid "Failed to create new set: no set name specified!"
-msgstr "tr: Failed to create new set: no set name specified!"
+#. ($newSetID =~ s/_/ /gr)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:482
+msgid ""
+"Failed to create new set: Invalid characters in set name \"%1\". A set name "
+"may only contain letters, numbers, hyphens, periods, and spaces."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:474
+msgid "Failed to create new set: No set name specified."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1155
-msgid "Failed to create new set: set name cannot exceed 100 characters."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:469
+msgid "Failed to create new set: Set name cannot exceed 100 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:396
 msgid ""
 "Failed to duplicate achievement: no achievement selected for duplication!"
 msgstr "Trophäe konnte nicht dupliziert werden: keine Trophäe ausgewählt!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:530
 msgid "Failed to duplicate set: no set selected for duplication!"
 msgstr "tr: Failed to duplicate set: no set selected for duplication!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:74
-msgid "Failed to enter student:"
+#. ($@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:67
+msgid "Failed to generate course archive: %1"
 msgstr ""
 
 #. ($scoreFilePath)
 #. ($filePath)
 #. ($FilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1125
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:649
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:955
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2402
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1584
 msgid "Failed to open %1"
 msgstr "%1 konnte nicht geöffnet werden"
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:227
 msgid "Failed to save: %1"
 msgstr "Datei konnte nicht gespeichert werden: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#. ($_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:253
+msgid "Failed to send message: %1"
+msgstr ""
+
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:23
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:36
 msgid "False"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1919
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:63
 msgid "Feature exhausted for this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:200
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:23
+msgid "Features:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:252
 msgid "Feedback"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2159
+#: /opt/webwork/webwork2/conf/defaults.config:2070
 msgid "Feedback by Section."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:234
 msgid "FeedbackMessage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1177
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2113
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2284
 msgid "Field is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2109
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2286
 msgid "Field missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1175
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2111
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4290
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
 msgid "Field missing in schema"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:599
-msgid "File '%1' exists.  File not saved.  No changes have been made."
-msgstr "Datei '%1' existiert bereits. Datei konnte nicht gespeichert werden.Es wurden keine Veränderungen vorgenommen."
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:266
+msgid "File \"%1\" exists.  File not saved.  No changes have been made."
+msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1926
-msgid ""
-"File '%1' exists. File not saved. No changes have been made.  You can change"
-" the file path for this problem manually from the 'Hmwk Sets Editor' page"
-msgstr "Datei '%1' existiert bereits. Datei wurde nicht gespeichert. Es wurden keine Veränderungen vorgenommen. Sie können den Dateipfad für diese Aufgabe manuell einstellen im Hwmk-Sets-Editor."
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1036
+msgid "File \"%1\" exists. File not saved. No changes have been made."
+msgstr ""
 
-#. ($file,$!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:796
-msgid "File '%1' not removed: %2"
-msgstr "Datei '%1' nicht entfernt: %2"
+#. ($file, $!)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:333
+msgid "File \"%1\" not removed: %2"
+msgstr ""
 
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:795
-msgid "File '%1' successfully removed"
-msgstr "Datei '%1' erfolgreich entfernt"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+msgid "File \"%1\" successfully removed"
+msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1066
-msgid "File '%1' uploaded successfully"
-msgstr "Datei '%1' erfolgreich hochgeladen"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:522
+msgid "File \"%1\" uploaded successfully"
+msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:476
 msgid "File <b>%1</b> already exists. Overwrite it, or rename it as:"
 msgstr "Datei <b>%1</b> existiert bereits. Überschreiben oder umbenennen zu:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:364
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:55
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:70
 msgid "File Manager"
 msgstr "Dateimanager"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:628
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:17
+msgid "File Manager Help"
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:541
+msgid "File not saved. Failed to open \"%1\" for writing."
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:528
+msgid ""
+"File not saved. The file \"%1\" is not contained in the templates directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:921
+msgid ""
+"File not saved. The file name for this problem does not match the file name "
+"the editor was opened with. The problem set may have changed. Please reopen "
+"this file from the homework sets editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:228
 msgid "File saved"
 msgstr "Datei gespeichert"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:733
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:272
 msgid "File successfully copied"
 msgstr "Datei erfolgreich kopiert"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:758
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:295
 msgid "File successfully renamed"
 msgstr "Datei erfolgreich umbenannt"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:29
 msgid "Filename"
 msgstr "Dateiname"
 
-#. ($extension,$location)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1296
-msgid "Files with extension '.%1' usually belong in '%2'"
+#. ($extension, $location)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:699
+msgid "Files with extension \".%1\" usually belong in \"%2\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:20
+msgid ""
+"Fill out the form below to add, edit, or delete locations.  Locations are "
+"used to restrict access to sets based on ip address.  Locations are "
+"configured here in the administration course, then used in a normal course."
+"  When configuring a set to use a restricted ip address, the instructor can "
+"choose to either restrict access to the location or deny access from a "
+"location, which are identified by their name.  Instructors can select "
+"multiple locations to restrict access to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:78
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:47
 msgid "Filter"
 msgstr ""
 
 #. ($recitation)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1184
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1112
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1420
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:913
 msgid "Filter by recitation %1"
 msgstr ""
 
 #. ($section)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1180
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1416
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:910
 msgid "Filter by section %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:733
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:31
 msgid "Filter by what text?"
 msgstr "Filtern nach Text"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:151
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:17
 msgid "Filter:"
 msgstr "Filtern:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:749
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:137
 msgid "First"
 msgstr "Vorname"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:593
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1992
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:827
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:856
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:885
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:914
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:87
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:21
 msgid "First Name"
 msgstr "Vorname"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:107
 msgid "First name"
 msgstr "Vorname"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:178
 msgid ""
 "For security reasons, you cannot specify a message file from a directory "
 "higher than the email directory (you can't use ../blah/blah for example). "
 "Please specify a different file or move the needed file to the email "
-"directory"
+"directory."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2928
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:30
+msgid "Force editor to RTL"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:674
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:101
 msgid "Force problems to be numbered consecutively from one"
 msgstr "Aufgaben fortlaufend nummerieren (beginnend bei 1)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:409
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:35
+msgid "Form Elements Present on the Page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:75
 msgid "Format"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2096
+#: /opt/webwork/webwork2/conf/defaults.config:2017
 msgid "Format for the subject line in feedback e-mails"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:172
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:133
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:10
 msgid "Format:"
 msgstr "Format:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:12
 msgid "Found no directories containing problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1112
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:43
 msgid "From This Course"
 msgstr "Aus diesem Kurs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:318
 msgid "From field must contain one valid email address."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:340
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:621
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:20
+msgid ""
+"From this page you can <strong>add new students</strong>, "
+"<strong>edit</strong> class list data (name, email address, recitation, "
+"section, permission level, and enrollment status), <strong>change "
+"passwords</strong>, and <strong>export</strong> (save) class lists for back-"
+"up or use in another course. You can also delete students from the class "
+"roster, but this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:34
 msgid "From:"
 msgstr "Von:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:59
 msgid "GLOBAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1512
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1619
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1728
-msgid "Gateway Name"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:210
-msgid "Gateway Quiz %2"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:853
-msgid "Gateway parameters"
-msgstr "Gateway Parameter"
-
-#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/conf/defaults.config:1427
 msgid "General"
 msgstr "Allgemein"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2305
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:201
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:30
 msgid "General Information"
 msgstr "Allgemeine Information"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:745
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:669
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:670
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:222
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:116
+msgid "General Page Information"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:121
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:166
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:167
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:113
 msgid "Generate Hardcopy"
 msgstr "Druckversion erstellen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:262
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:73
 msgid "Generate Hardcopy for Selected Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:744
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:115
+msgid ""
+"Generate a hardcopy of the problem being edited. This does not change the "
+"permanent file on the disk. You can generate a hardcopy for different "
+"versions of the same problem by changing the seed. You can also change the "
+"format to \"PDF\" or \"TeX Source\". If \"PDF\" is selected, then a PDF file"
+" will be generated for download, unless there are errors. If errors occur or"
+" \"TeX Source\" is selected, then a zip file will be generated for download "
+"that contains the TeX source file and resources needed for generating the "
+"PDF file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:20
+msgid ""
+"Generate hardcopies of assignments in PDF or latex format. To produce a "
+"hardcopy, one selects the users on the left and the sets on the right. All "
+"users and sets are listed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:170
 msgid "Generate hardcopy for selected sets and selected users"
 msgstr "Druckversion für ausgewählte Blätter und ausgewählte Nutzer erstellen"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:184
-#: /opt/webwork/pg/macros/problemRandomize.pl:185
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:186
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:187
 msgid "Get a new version of this problem"
 msgstr "Neue Version dieser Aufgabe anfordern"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:986
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:2
 msgid "Give new password to which users?"
 msgstr "Welchen Nutzern soll ein neues Passwort zugeordnet werden?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1063
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:27
 msgid "Gives full credit on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1180
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:27
 msgid "Gives full credit on every problem in a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:846
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:27
 msgid "Gives half credit on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:27
 msgid "Gives half credit on every problem in a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:62
 msgid "Global Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1422
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:76
 msgid "Global Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:49
 msgid "Global Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:51
 msgid ""
 "Global data on problem usage is contributed by many institutions using "
 "WeBWorK all over the world. The Usage figure is the total number of  "
@@ -3132,198 +4125,324 @@ msgid ""
 msgstr ""
 
 #. ($problemID, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1549
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1489
 msgid "Global problem %1 for set %2 not found."
 msgstr ""
 
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:334
+#. ($c->{prettyID}, $c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:378
+msgid "Global problem %1 not found for set %2."
+msgstr ""
+
+#. ($c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:142
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:372
 msgid "Global set %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2093
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:77
 msgid "Global set data will be shown instead of user specific data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:28
 msgid "Go"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:483
 msgid "Go back to Part 1"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:291
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
-#: /opt/webwork/pg/macros/compoundProblem.pl:491
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:293
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:498
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:512
 msgid "Go on to next part"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2651
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:544
 msgid "Grade"
 msgstr "Bewerten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2649
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:383
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:970
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:541
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:75
 msgid "Grade Problem"
 msgstr "Aufgabe bewerten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2446
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:651
 msgid "Grade Test"
 msgstr "Test bewerten"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:148
+msgid "Grade of Active Students"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:55
 msgid "Grade passback mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:837
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:38
 msgid "Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:236
 msgid "Grades"
 msgstr "Notenbuch"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:110
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:17
+msgid "Grades Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:115
 msgid "Grades have been saved for all current users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:221
-msgid "Grading assignment:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:28
+msgid "Grading Assignment"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:152
+msgid "Grading Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1062
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:26
 msgid "Greater Rod of Revelation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1179
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:26
 msgid "Greater Tome of Enlightenment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:285
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:50
+msgid ""
+"Groups types of achievements. The \"level\" and \"secret\" categories are "
+"special (described above), and categories can be used to create achievement "
+"chains."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:74
 msgid "Guest Login"
 msgstr "Als Gast anmelden"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2251
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:86
+msgid "Guest:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:33
 msgid "HTTP Headers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:682
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:35
+msgid "Hardcopy Format"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:115
 msgid "Hardcopy Format:"
 msgstr "Ausgabeformat:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:270
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:285
 msgid "Hardcopy Generator"
 msgstr "Druckversion erstellen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:101
 msgid "Hardcopy Header"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1623
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:724
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:324
+msgid "Hardcopy Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:17
+msgid "Hardcopy Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:153
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:44
 msgid "Hardcopy Theme"
 msgstr "Layout der Druckversion"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:408
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:427
 msgid "Hardcopy will always print the original version of the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:31
 msgid "Headers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1048
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:296
 msgid "Help"
 msgstr "Hilfe"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:797
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:170
 msgid "Help Icon"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:542
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:30
+msgid ""
+"Here is a list of the variables the evaluator has access to. Unless "
+"indicated, changes to the variables will not be saved.  Evaluators are run "
+"in the same order they are listed on the achievement editor page and are "
+"only run if the achievement has not been earned. Keep this in mind when "
+"using persistent global data."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:507
 msgid "Here is a new version of your problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:914
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:42
 msgid "Hidden"
 msgstr "Unsichtbar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:347
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:62
 msgid "Hide All"
 msgstr "Alle verbergen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3663
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3718
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3760
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:384
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:17
+msgid "Hide Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:57
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:44
 msgid "Hide Courses"
 msgstr "Kurse verbergen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:428
-msgid "Hide Hints"
-msgstr "Hinweise verbergen"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:477
 msgid "Hide Hints from Students"
 msgstr "Hinweise für Studierenden unsichtbar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1566
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:63
+msgid "Hide all rendered problems on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:252
 msgid "Hide this problem"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1523
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1524
 msgid "Hint:"
 msgstr "Hinweis: "
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1522
 msgid "Hint: "
 msgstr "Hinweis: "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:658
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1771
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:99
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:51
 msgid "Hints"
 msgstr "Hinweise"
 
 # Hmwk is short for Homework
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:364
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:327
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:44
 msgid "Hmwk Sets Editor"
 msgstr "Hmwk-Sets-Editor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:779
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:80
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:108
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:19
 msgid "Homework Sets"
 msgstr "Aufgabenblätter"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:38
 msgid "Homework Totals"
 msgstr "Gesamtpunktzahl der Hausaufgabe"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1432
-msgid "I couldn't find the file [ACHEVDIR]/surprise_message.txt!"
-msgstr "Datei [ACHEVDIR]/surprise_message.txt konnte nicht gefunden werden"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:17
+msgid "Homwork Sets Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:88
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:31
+msgid "How to:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:36
+msgid "I couldn't find the file [ACHIEVEMENT_DIR]/surprise_message.txt!"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1451
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:9
 msgid "Icon"
 msgstr "Icon"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:29
 msgid "Icon File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:612
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:80
+msgid "Icon File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:24
+msgid ""
+"If \"PDF\" is selected, then a PDF file will be generated for download, "
+"unless there are errors.  If errors occur generating a PDF file or \"TeX "
+"Source\" is selected then a zip file will be generated for download that "
+"contains the TeX source file and resources needed for generating the PDF "
+"file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:37
+msgid ""
+"If \"TeX Source\" is selected, a zip file containing a TeX file and other "
+"files needed to generate a PDF hardcopy will be produced. If \"Adobe PDF\" "
+"is selected then only a PDF file will be produced."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:84
 msgid ""
 "If a password field is left blank, the student's current password will be "
 "maintained."
 msgstr "tr: If a password field is left blank, the student's current password will be maintained."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:42
+msgid ""
+"If selected, the file path of the problem source will be printed in the "
+"output."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:38
+msgid ""
+"If selected, this adds spaces between the fields to align the commas, which "
+"makes the columns easy to read when in text form but it can confuse some "
+"spreadsheet applications since the extra spaces violate the csv standard "
+"(although Excel handles them with no problem). This will give a visual form "
+"of the CSV file that is easy to read on the page. If you want a reliable "
+".csv file for use in any spreadsheet application unclick the \"Pad Fields\" "
+"option. You can download the .csv file immediately by clicking on the link "
+"with the filename chosen above, or you can download it using the \"File "
+"Manager\" from the scoring directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:148
+msgid ""
+"If the original problem can not be edited than the path name must be changed"
+" in order to be allowed to save the problem. Adding \"local/\" to the "
+"beginning of the original path is the default solution. All locally created "
+"and edited files will then appear in a subdirectory named \"local\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:513
 msgid ""
 "If this flag is set then this problem will count towards the grade of its "
 "parent problem.  In general the adjusted status on a problem is the larger "
@@ -3331,20 +4450,28 @@ msgid ""
 "problems which have this flag enabled."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
 msgid ""
 "If this is enabled then instructors with the ability to receive feedback "
 "emails will be notified whenever a student runs out of attempts on a problem"
-" and its children without receiving an adjusted status of 100%."
+" and its children  without receiving an adjusted status of 100%."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:334
 msgid ""
 "If this is enabled then students will be unable to attempt a problem until "
 "they have completed all of the previous problems, and their child problems "
 "if necessary."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:57
+msgid ""
+"If this is selected, a success index is listed in each csv file. The success"
+" index is a number assigned on the basis of the number of incorrect attempts"
+" (roughly equivalent to 1/the number of attempts) which seems to correlate "
+"with the relative difficulty the student had with the problem."
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:47
 msgid ""
 "If this is set, all users (including the instructor) must enter the WeBWorK "
@@ -3352,8 +4479,8 @@ msgid ""
 "they receive a message directing them back to the LMS."
 msgstr ""
 
-#. (CGI::b($r->maketext("Remember Me")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:201
+#. (tag('strong', maketext('Remember Me')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:33
 msgid ""
 "If you check %1 your login information will be remembered by the browser you"
 " are using, allowing you to visit WeBWorK pages without typing your user "
@@ -3362,273 +4489,419 @@ msgid ""
 " have direct control."
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:407
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:154
+msgid ""
+"If you click on the \"Grade Problem\" icon to the right of the problem "
+"number, then the problem will open in the manual problem grader. This page "
+"shows the rendered problem and lists all students assigned to the set and "
+"the last answer the students entered for the problem. You can then change "
+"the recorded scores for students on this problem and provide instructor "
+"feedback comments."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:148
+msgid ""
+"If you click on the \"Open in New Window\" icon to the right of the problem "
+"number, then the problem will open in the actual homework set in a new tab "
+"or window."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:425
 msgid "If you come back to it later, it may revert to its original version."
 msgstr ""
 
+#. ('<code>report_grades_data.csv</code>', '<code>report_grade.msg</code>',
+#. '<code>$COL</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:80
+msgid ""
+"If you upload your file on the web with the name: %1 and also create an "
+"email message with the name %2 with the approriate %3 variables then not "
+"only can you email the message with the embedded grades to the students, but"
+" files with those exact names are automatically appended to the \"Grades\" "
+"page seen by the students."
+msgstr ""
+
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:798
-msgid "Illegal file '%1' specified"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:337
+msgid "Illegal file \"%1\" specified"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1445
 msgid "Illegal filename contains '..'"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:73
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:63
 msgid "Import"
 msgstr "Importieren"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1291
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:65
+msgid ""
+"Import a single set or multiple sets from a set definition file. (Use the "
+"\"File Manager\" to upload/download set definition files.) The \"Shift "
+"Dates...\" option is useful for problem sets that were used from other "
+"courses and will shift all of the dates."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:16
 msgid "Import from where?"
 msgstr "tr: Import from where?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1270
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:5
 msgid "Import how many sets?"
 msgstr "tr: Import how many sets?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:31
 msgid "Import sets with names"
 msgstr "tr: Import sets with names"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:5
 msgid "Import users from what file?"
 msgstr "Import von Nutzerdaten aus Datei:"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:99
+msgid "Import/export achievements"
+msgstr ""
+
 #. ($count)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:516
 msgid "Imported %quant(%1,achievement)"
 msgstr "%quant(%1,Trophäe,Trophäen) importiert"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:25
+msgid ""
+"In both cases, one can select the sort field, the format of the display "
+"list, and the filter. \"Change Display Settings\" must be clicked to update "
+"the list."
+msgstr ""
+
 #. ($total_inprogress, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1019
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:28
 msgid "In progress: %1/%2"
 msgstr "Fortschritt: %1/%2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:47
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1601
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:51
+msgid "Inactive Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1503
 msgid "Inactivity time before a user is required to login again"
 msgstr "Sekunden bis sich ein Nutzer aufgrund Inaktivität erneut anmelden muss"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:42
 msgid "Include Contrib"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:35
 msgid "Include OPL"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:32
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:55
 msgid "Include Success Index"
 msgstr "Success Index"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:62
 msgid "Include percentage grades columns for all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:471
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:302
 msgid "Incorrect"
 msgstr "Falsch"
 
 #. ($total_incorrect, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1033
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:36
 msgid "Incorrect: %1/%2"
 msgstr "Falsch: %1/%2"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:26
+msgid ""
+"Indicates the number of problems in the set. Clicking on the link opens the "
+"set detail page which allows you to modify set parameters, edit set headers,"
+" and change parameters of problems in the set such as the number of allowed "
+"attempts or the weight (credit value). You can also add, remove, view, edit,"
+" and reorder the problems in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:141
+msgid "Individual Problem Results"
+msgstr ""
+
 # Short for Initial
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:41
 msgid "Init"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:502
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:35
 msgid "Institution"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2344
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:560
 msgid "Instructor Comment:"
 msgstr "Kommentar:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1494
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1306
 msgid "Instructor Feedback:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:311
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:17
+msgid "Instructor Links Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:29
 msgid "Instructor Tools"
 msgstr "Werkzeuge"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1228
-msgid "Instructor solution preview: show the student solution after due date."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:17
+msgid "Instructor Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:90
+msgid "Instructor:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:377
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:326
 msgid "Invalid Reply-to address."
 msgstr "Ungültige Antwort-an Adresse."
 
 #. ($output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:187
 msgid ""
-"Invalid file name. The file name \"%1\" does not have a \".msg\" extension "
-"All email file names must end in the extension \".msg\" choose a file name "
-"with a \".msg\" extension. The message was not saved."
+"Invalid file name \"%1\". All email file names must end with the \".msg\" "
+"extension.  Choose a file name with the \".msg\" extension. The message was "
+"not saved."
 msgstr ""
 
 #. ($headerType)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1951
 msgid "Invalid headerType %1"
 msgstr "Ungültiger headerType %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:177
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/XMLRPC.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:173
 msgid "Invalid user ID or password."
 msgstr "Nutzer ID oder Passwort falsch."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2244
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:34
+msgid ""
+"It is important that students enter an email address or they will not "
+"recieve any of the important emails sent by the instructor. The email "
+"address will only be present on the page if the user has permission to "
+"change the email address."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:20
+msgid "It lists the homework problem sets available for the students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:472
 msgid "Jump to Problem:"
 msgstr "Springe zu Aufgabe:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:867
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:939
 msgid "Just-In-Time parameters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:130
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:85
+msgid "Key Map"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:14
 msgid "Key Map:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:93
 msgid "Keywords:"
 msgstr "Keywords:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "LAST NAME"
 msgstr "NACHNAME"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1477
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:119
 msgid "LOCAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:100
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:103
 msgid "LTI"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1548
-msgid "Language (refresh page after saving changes to reveal new language.)"
-msgstr "Sprache (Änderungen werden nach dem Speichern und Aktualisieren der Seite aktiv)"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:25
+msgid "LTI Grade Mode"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:758
-msgid "Last"
-msgstr "Nachname"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:460
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:75
+msgid "LTI Grade Update"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:386
-msgid "Last Answer"
-msgstr "Letzte Antwort"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:17
+msgid "LTI Grade Update Help"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:604
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:231
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2001
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:828
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:857
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:915
-msgid "Last Name"
-msgstr "Nachname"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:16
+msgid "LTI grade passback is not enabled for this course"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:792
-msgid "Last column of merge file"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:63
+msgid "LTI update of all users and sets queued."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:785
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:64
+msgid "LTI update of all users queued."
+msgstr ""
+
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:58
+msgid "LTI update of set %1 queued."
+msgstr ""
+
+#. ($userID, $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:56
+msgid "LTI update of user %1 and set %2 queued."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:60
+msgid "LTI update of user %1 queued."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1450
+msgid "Language (refresh page after saving changes to reveal new language.)"
+msgstr "Sprache (Änderungen werden nach dem Speichern und Aktualisieren der Seite aktiv)"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:140
+msgid "Last"
+msgstr "Nachname"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:460
+msgid "Last Answer"
+msgstr "Letzte Antwort"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:31
+msgid "Last Full Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:25
+msgid "Last Name"
+msgstr "Nachname"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:115
+msgid "Last column of merge file"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:108
 msgid "Last name"
 msgstr "Nachname"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:242
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:237
 msgid "Latest Answers"
 msgstr "Letzte Antworten"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1603
+#: /opt/webwork/webwork2/conf/defaults.config:1505
 msgid ""
 "Length of time, in seconds, a user has to be inactive before he is required "
-"to login again.<p>This value should be entered as a number, so as 3600 "
-"instead of 60*60 for one hour"
+"to login again. This value should be entered as a number, so as 3600 instead"
+" of 60*60 for one hour."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:845
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:26
 msgid "Lesser Rod of Revelation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:965
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:26
 msgid "Lesser Tome of Enlightenment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:141
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:15
 msgid "Level Progress:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:881
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:77
 msgid "Level:"
 msgstr "Level:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:912
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2060
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:433
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:17
+msgid "Library Broswer Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:359
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:52
 msgid "Library Browser"
 msgstr "Aufgabenbibliothek"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1977
-msgid "List of display modes made available to students"
-msgstr "Vefügbare Anzeigeanstellungen für Studierende"
+#. ($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:30
+msgid "Link to Edit Page for %1"
+msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2130
-msgid ""
-"List of e-mail addresses to which e-mail can be sent by a problem. "
-"Professors need to be added to this list if questionaires are used, or other"
-" WeBWorK problems which send e-mail as part of their answer mechanism."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:25
+msgid "Links to pages that give information about writing problems:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:759
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:774
+#: /opt/webwork/webwork2/conf/defaults.config:1879
+msgid "List of display modes made available to students"
+msgstr "Vefügbare Anzeigeanstellungen für Studierende"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:89
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:96
 msgid "List of insertable macros"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1826
+#: /opt/webwork/webwork2/conf/defaults.config:1728
 msgid "List of options for Show Me Another button"
 msgstr "Optionen für den \"Andere Version anzeigen\" Knopf"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1713
+#: /opt/webwork/webwork2/conf/defaults.config:1615
 msgid "List of sets excluded from achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1483
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:56
+msgid "Live equation rendering"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:144
+msgid "Loading..."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:122
 msgid "Local Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:41
 msgid "Local Problems"
 msgstr "Lokale Aufgaben"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1504
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:136
 msgid "Local Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:105
 msgid "Local Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1467
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:114
 msgid ""
 "Local data is generated when your systems admin runs the script update-OPL-"
 "statistics."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1460
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:107
 msgid ""
 "Local data on problem usage is generated and maintained by your institution."
 " The Usage figure is the total number of local individuals who have attemped"
@@ -3637,42 +4910,61 @@ msgid ""
 "likely bug free."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:115
 msgid "Location"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3501
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1854
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1890
 msgid ""
 "Location %1 does not exist in the WeBWorK database.  Please check your input"
 " (perhaps you need to reload the location management page?)."
 msgstr ""
 
 #. ($locationID, join(', ', @addresses)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1742
 msgid "Location %1 has been created, with addresses %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3353
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1798
 msgid "Location deletion requires confirmation."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3409
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:43
 msgid "Location description:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3089
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:37
 msgid "Location name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:159
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:27
+msgid ""
+"Locations are a list of ip addresses.  Ip addresses can be a single address "
+"(e.g. 192.168.1.101), a range of ip address (e.g. "
+"192.168.1.101-192.168.1.150), or an ip address mask (e.g. 192.168.1.0/24). "
+"Enter one ip address per line, using as many lines as needed for each "
+"location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:32
+msgid ""
+"Locations are edited by adding new ip addresses to the location, or deleting"
+" existing address.  You must select the confirm checkbox when deleting a "
+"location, and this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:43
+msgid "Locations of files:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:18
 msgid "Log In Again"
 msgstr "Erneut anmelden"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1124
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:11
 msgid "Log Out"
 msgstr "Abmelden"
 
@@ -3680,368 +4972,456 @@ msgstr "Abmelden"
 #. ($rename_oldCourseID)
 #. ($rename_newCourseID)
 #. ($new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1458
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1541
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2666
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:913
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:704
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:780
 msgid "Log into %1"
 msgstr ""
 
-#. (HTML::Entities::encode_entities($prettyUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1122
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1130
+#. ($userName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:9
 msgid "Logged in as %1."
 msgstr "Angemeldet als %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:790
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:181
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:187
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:113
 msgid "Login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:58
 msgid "Login Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:187
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:815
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1980
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:291
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:855
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:884
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:913
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:36
 msgid "Login Name"
 msgstr "Nutzername"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:18
 msgid "Login Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:6
+msgid "Login:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:225
 msgid "Logout"
 msgstr "Abmelden"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Macro"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:763
-msgid "Main Menu"
-msgstr "Hauptmenü"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:97
+msgid ""
+"Macro (\".pl\") files containing additional functionality for your course "
+"can be stored here."
+msgstr ""
+
+#. ($filePath)
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:29
+msgid "Macro file %1 not found."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:369
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:46
 msgid "Make Archive"
 msgstr "Archivieren"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:27
 msgid "Make changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1115
-msgid "Make these changes in  course:"
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:15
+msgid "Make these changes in course: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:137
+msgid ""
+"Makes a new copy of the file you are editing at the location relative to the"
+" course's templates ([TMPL]) directory. You may choose to replace the "
+"current problem in the current set, append to the end to then end of the "
+"current set as a new problem, or create a problem that is not attached to a "
+"problem set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3040
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:1
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:46
 msgid "Manage Locations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:748
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:394
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:17
+msgid "Manage Locations Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:20
+msgid ""
+"Manage achievements for the course.  The actions allow one to edit, assign, "
+"import, export, score, create, or delete achievements.  The action form is "
+"at the top to select the desired action and options to perform when the "
+"submit button is pressed.  Below the action form is the list of all the "
+"achievements, ordered by their achievement \"Number\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:56
+msgid "Manage administration course files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:50
+msgid ""
+"Manage instructors.  When instructors are added to a newly created course, "
+"they are also added to the admin course with username \"userID_courseID\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:344
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:192
 msgid "Manual Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:233
-msgid "Mark All"
-msgstr "Alles bewerten"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:17
+msgid "Manual Grader Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr',
+#. format_set_name_display($c->stash->{set}->set_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:205
+msgid "Manual Grader for %1: Problem %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:77
+msgid ""
+"Manually initiate an LTI grade passback for selected sets or users. This "
+"link is only visible if LTI grade passback is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:175
+msgid ""
+"Many of these editing activities can also be done more quickly from the "
+"\"Instructor Tools\" page where students and homework sets can be selected "
+"simultaneously. The \"Instructor Tools\" page is useful for quick editing of"
+" one or two students. The initial setup of the class can be done best from "
+"this page. Importing and exporting class lists can only be done from this "
+"page. Deleting students can only be done from this page."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:120
 msgid "Mark Correct"
 msgstr "Als richtig bewerten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2822
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:598
 msgid "Mark Correct?"
 msgstr "Als richtig bewerten?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:681
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:19
 msgid "Match on what? (separate multiple IDs with commas)"
 msgstr "tr: Match on what? (separate multiple IDs with commas)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:499
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:85
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:36
 msgid "Math Objects"
 msgstr "MathObjects"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:327
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:377
 msgid "Max attempts"
 msgstr "Max. Anzahl Versuche"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:380
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:24
 msgid "Max. Shown:"
 msgstr "Ergebnisse pro Seite:"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1817
+#: /opt/webwork/webwork2/conf/defaults.config:1719
 msgid ""
 "Maximum times Show me Another can be used per problem (-1 => unlimited)"
 msgstr "Anzahl pro Aufgabe, wie oft eine neue Version angefordert werden kann (-1 => Unendlich)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:606
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:4
+msgid "Merge file data:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:24
 msgid "Merge file:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:288
 msgid "Message"
 msgstr "Fehlermeldung"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:578
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:13
 msgid "Message file:"
 msgstr ""
 
-#. ($emailDirectory, $output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:357
-msgid "Message saved to file <code>%1/%2</code>."
-msgstr "Nachricht wurde gespeichert in der Datei <code>%1/%21.</code>."
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:300
+msgid "Message saved to file %1."
+msgstr ""
 
-#. ($recipient, $ur->email_address)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:995
+#. ($recipient, $user_record->email_address)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:98
 msgid "Message sent to %1 at %2."
 msgstr "Nachricht wurde an %1 um %2 geschickt."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2249
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2324
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:121
+msgid "Message was blank."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:48
+msgid ""
+"Messages can be saved to a message file (which must end in the \".msg\" "
+"extension).  Use the \"Message file\" drop down menu to select which message"
+" file to load, or \"None\" to use a blank message. To save a new message, "
+"use the \"Save as\" button after entering in a valid filename.  The \"Save "
+"as\" button will not overwrite currently saved messages.  To edit a "
+"currently saved message first select it using the drop down menu, then click"
+" the \"Save\" button to save any changes.  Use the \"File Manager\" to "
+"delete messages, located in the \"[TMPL]/email\" directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:22
 msgid "Method"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3284
+#: /opt/webwork/webwork2/conf/defaults.config:2003
+msgid "Method to enter problem scores in the single problem manual grader"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1668
 msgid ""
 "Missing required input data. Please check that you have filled in all of the"
 " create location fields and resubmit."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1555
+#: /opt/webwork/webwork2/conf/defaults.config:1457
 msgid ""
 "Mode in which the LANG and DIR settings for a single problem are determined."
 msgstr "Einstellungsmodus, die die Sprach und Verzeichnis  Einstellungen einer einzelnen Aufgabe festgelegt."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1557
-msgid ""
-"Mode in which the LANG and DIR settings for a single problem are "
-"determined.<p>The system will set the LANGuage attribute to either a value "
-"determined from the problem, a course-wide default, or the system default, "
-"depending on the mode selected. The tag will only be added to the DIV "
-"enclosing the problem if it is different than the value which should be set "
-"in the main HTML tag set for the entire course based on the course "
-"language.<p>There are two options for the DIRection attribute: \"ltr\" for "
-"left-to-write sripts, and \"rtl\" for right-to-left scripts like Arabic and "
-"Hebrew.<p>The DIRection attribute is needed to trigger proper display of the"
-" question text when the problem text-direction is different than that used "
-"by the current language of the course. For example, English problems from "
-"the library browser would display improperly in RTL mode for a Hebrew "
-"course, unless the problen Direction is set to LTR.<p>The feature to set a "
-"problem language and direction was only added in 2018 to the PG language, so"
-" most problems will not declare their language, and the system needs to fall"
-" back to determining the language and direction in a different manner. The "
-"OPL itself is all English, so the system wide fallback is to en-US in LTR "
-"mode.<p>Since the defaults fall back to the LTR direction, most sites should"
-" be fine with the \"auto::\" mode, but may want to select the one which "
-"matches their course language. The mode \"force::ltr\" would also be an "
-"option for a course which runs into trouble with the \"auto\" "
-"modes.<p>Modes:<br><ul><li>\"none\" prevents any additional LANG and/or DIR "
-"tag being added. The browser will use the main setting which was applied to "
-"the entire HTML page. This is likely to cause trouble when a problem of the "
-"other direction is displayed.</li><li>\"auto::\" allows the system to make "
-"the settings based on the language and direction reported by the problem (a "
-"new feature, so not set in almost all existing problems) and falling back to"
-" the expected default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" "
-"allows the system to make the settings based on the language and direction "
-"reported by the problem (a new feature, so not set in almost all existing "
-"problems) but falling back to the language with the given LangCode and the "
-"direction Dir when problem settings are not available from "
-"PG.</li><li>\"auto::Dir\" for problems without PG settings, this will use "
-"the default en=english language, but force the direction to Dir. Problems "
-"with PG settings will get those settings.</li><li>\"auto:LangCode:\" for "
-"problems without PG settings, this will use the default LTR direction, but "
-"will set the language to LangCode.Problems with PG settings will get those "
-"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
-" by the PG code of the problem, and will force the system to set the "
-"language with the given LangCode and the direction to Dir for <b>all</b> "
-"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
-"PG code of the problem, and will force the system to set the direction to "
-"Dir for <b>all</b> problems, but will avoid setting any language attribute "
-"for individual problem.</li></ul>"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2695
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:443
 msgid "Move"
 msgstr "Verschieben"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2231
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:457
 msgid "Move to Page:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2226
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:452
 msgid "Move to Problem:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:26
+msgid ""
+"Multiple sets may be assigned to the users by holding down the shift key or "
+"the ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:27
+msgid ""
+"Multiple users or sets may be selected by holding down the shift key or the "
+"ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:36
 msgid "My Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1412
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:26
 msgid "Mysterious Package (with Ribbons)"
 msgstr ""
 
 # Short for Number of Fields
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:213
 msgid "NO OF FIELDS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1484
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:741
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:113
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:135
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:29
 msgid "Name"
 msgstr "Name"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:174
 msgid "Name for new set here"
 msgstr "Name des neuen Sets"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1528
+#: /opt/webwork/webwork2/conf/defaults.config:1430
 msgid "Name of course information file"
 msgstr "Name der Kursinformationsdatei"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1107
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:77
+msgid "Name of the evaluator file used to evaluate the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:81
+msgid "Name of the image used for the achievement icon."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:4
 msgid "Name the new set"
 msgstr "Name des neuen Sets"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1691
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:45
+msgid "Name:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:29
 msgid "Necromancers Charm"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:343
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:205
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:393
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:35
 msgid "Never"
 msgstr "Niemals"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:371
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:54
 msgid "New File"
 msgstr "Neue Datei"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:372
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:55
 msgid "New Folder"
 msgstr "Neuer Ordner"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:30
 msgid "New Name:"
 msgstr "Neuer Name"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2067
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:3
 msgid "New Password"
 msgstr "Neues Passwort"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:131
-msgid "New Version"
-msgstr "Neue Version"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+msgid "New Problem"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
 msgid "New file name:"
 msgstr "Neuer Dateiname"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
 msgid "New folder name:"
 msgstr "Neuer Ordnername"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:577
 msgid "New passwords saved"
 msgstr "tr: New passwords saved"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1078
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:36
 msgid "New set name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1357
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1010
 msgid "Next Problem"
 msgstr "Nächste Aufgabe"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1181
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2164
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:40
+msgid "Next Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:98
 msgid "Next page"
 msgstr "Nächste Seite"
 
-#. ($self->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:620
+#. (% $c->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:142
 msgid "Next test will be available by %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2452
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:134
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:144
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:183
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:483
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:510
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:142
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:68
 msgid "No"
 msgstr "Nein"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:635
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:116
 msgid "No Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2324
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:216
 msgid "No Description"
 msgstr "Keine Beschreibung"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:117
+msgid "No Sender specified."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:23
 msgid "No Target Set Selected"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:335
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:38
 msgid "No achievement badges have been assigned yet."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1521
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:77
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:37
 msgid "No achievements shown.  Create an achievement!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:90
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:2
+msgid "No achievements shown.  Select an achievement to edit!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:61
 msgid "No action taken"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:141
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:140
 msgid ""
 "No authentication method found for your request.  If this recurs, please "
 "speak with your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:940
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:361
 msgid "No change made to any set"
 msgstr "tr: No change made to any set"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
 msgid ""
 "No changes specified.  You must mark the checkbox of the item(s) to be "
 "changed and enter the change data."
@@ -4051,1379 +5431,1811 @@ msgstr ""
 msgid "No changes were saved!"
 msgstr "Änderungen wurden nicht gespeichert"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2462
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:50
 msgid "No course archives found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2898
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:32
 msgid "No course id defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1561
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:932
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:67
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:76
 msgid "No courses found"
 msgstr ""
 
 #. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:593
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:675
 msgid "No data exists for set %1 and problem %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:10
+msgid "No e-mail recipients are listed for this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:169
 msgid "No filename was specified for saving!  The message was not saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:340
 msgid "No guest logins are available. Please try again in a few minutes."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3522
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1877
 msgid "No location specified to edit. Please check your input data."
 msgstr ""
 
 #. ($badID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1788
 msgid "No location with name %1 exists in the database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3206
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:149
 msgid "No locations are currently defined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:342
 msgid "No merge data file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:612
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:18
+msgid "No merge data found"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:164
+msgid "No merge data found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:8
+msgid "No merge file selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:135
 msgid "No more tests available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:270
 msgid ""
 "No new Achievement ID specified.  No new achievement created.  File not "
 "saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:63
 msgid "No problems matched the given parameters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:25
+msgid "No recipients selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:334
 msgid ""
 "No recipients selected. Please select one or more recipients from the list "
 "below."
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2044
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:49
 msgid "No record for global set %1."
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2046
-msgid "No record for user %1."
-msgstr "Kein Eintrag für Nutzer %1."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
 msgid "No record found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1166
-msgid "No set created."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:12
 msgid "No sets in this course yet"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1010
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:159
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
 msgid "No sets selected for scoring"
 msgstr "tr: No sets selected for scoring"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2764
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:46
 msgid ""
 "No sets shown.  Choose one of the options above to list the sets in the "
 "course."
 msgstr "Suchanfrage ergab keine Sets. Wählen Sie eine der Optionen zum Auflisten der Sets des Kurses."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1942
 msgid "No source filePath specified"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1327
 msgid "No source_file for problem in .def file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2099
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:87
 msgid ""
-"No students shown.  Choose one of the options above to list the students in "
+"No students shown. Choose one of the options above to list the students in "
 "the course."
-msgstr "Suchanfrage ergab keine Studierenden. Wählen Sie eine der Optionen zum Auflisten der Studierenden des Kurses."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:246
 msgid "No submissions. Over time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:278
 msgid "No tests taken."
 msgstr "Keine Tests bearbeitet."
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:594
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:676
 msgid "No user specific data exists for user %1"
 msgstr "Keine Nutzerspezifischen Daten für Nutzer %1"
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2031
 msgid "No valid changes submitted for location %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:275
-msgid "No versions of this assignment have been taken."
-msgstr "Dieses Set wurde nicht bearbeitet."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:771
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:263
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:241
 msgid "No versions of this test have been taken."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:562
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:252
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:17
 msgid "None"
 msgstr "Keine"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:681
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2463
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:763
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:52
 msgid "None Specified"
 msgstr "Nicht angegeben"
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2089
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:73
 msgid "None of the selected users are assigned to this set: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:33
 msgid "Not logged in."
 msgstr "Nicht angemeldet."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1569
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:4
 msgid "Note"
 msgstr "Note"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:381
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:55
+msgid ""
+"Note that if there are errors, they will be shown at the top of the page. In"
+" some cases, a hard copy is still generated and a link called \"Download "
+"Hardcopy\" appears. In addition, the latex file, log and error files are "
+"generated which can be used in troubleshooting."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:93
+msgid ""
+"Note that if you set the permission level of a user to something other than "
+"\"Student\", you may also want to set the status of the user to "
+"\"Observer\".  Users with the \"Observer\" status are not included in "
+"statistics, scoring, or instructor emails."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:28
+msgid ""
+"Note that some settings require an additional page load after \"Save "
+"Changes\" is clicked in order to take effect.  This is true for a theme "
+"change for example."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:396
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:422
 msgid "Note:"
 msgstr "Note:"
 
-#. (CGI::i($pg->{result}{msg})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2350
+#. (tag('i', maketext('You are in the Reduced Scoring Period.  All work counts
+#. for [_1]% of the original.',
+#. $ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#. (tag('i', $pg->{result}{msg})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:572
 msgid "Note: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2482
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:686
 msgid ""
 "Note: grading the test grades all problems, not just those on this page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1460
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1485
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:768
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:59
+msgid "Now"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:19
 msgid "Number"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:242
 msgid "Number of Graded Submissions per Test (0=infty)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
 msgid "Number of Problems per Page (0=all)"
 msgstr "Anzahl der Aufgaben pro Seite (0=alle)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:95
+msgid "Number of Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:257
 msgid "Number of Tests per Time Interval (0=infty)"
 msgstr "Zahl der Test im Zeitintervall (0=unendlich)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1833
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2435
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:54
+msgid "Number:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1181
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:912
 msgid "OK"
 msgstr "OK"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1464
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:17
+msgid "OPL Problem Levels Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:26
 msgid "Oil of Cleansing"
 msgstr "Öl der Säuberung"
 
+#. ('<code>pdflatex</code>', '<code>hardcopy.tex</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:49
+msgid ""
+"Once \"Generate Hardcopy for selected sets and selected users\" is clicked a"
+" file in the selected hardcopy format will be generated and offered for "
+"download. If PDF output was selected, a single PDF file is generated. If TeX"
+" output is selected, a zip file is generated that contains all files needed "
+"to generated the hardcopy PDF file via %1. The main TeX file is called %2."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:84
 msgid "One Column"
 msgstr "Einspaltig"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:314
+msgid "Only Start"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:289
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:303
 msgid "Only after set answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1892
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:87
+msgid ""
+"Only present for JITAR sets. Collapse JITAR nesting problem groups to the "
+"top row of information about a problem. Note that the nesting of a single "
+"problem group can be collapsed by clicking on the down arrow to the right of"
+" the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:80
+msgid ""
+"Only present for JITAR sets. Expand JITAR nested problem groups that have "
+"been collapsed. Note that the nesting of a single problem group can be "
+"expanded by clicking on the right arrow to the right of the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1794
 msgid ""
 "Only this permission level and higher get buttons for sending e-mail to the "
 "instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:39
 msgid "Open"
 msgstr "Öffnen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:422
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:763
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:810
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:62
 msgid "Open Date"
 msgstr "Verfügbar ab"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1098
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:42
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:32
 msgid "Open Problem Library"
 msgstr "Open Problem Library"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2417
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:272
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:525
 msgid "Open in New Window"
 msgstr "In neuem Fenster öffnen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1263
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1617
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:29
 msgid "Open in new window"
 msgstr "In neuem Fenster öffnen"
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:491
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:320
 msgid "Open, closes %1."
 msgstr "Verfügbar bis %1."
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:489
-msgid "Open, complete by %1."
-msgstr "offen, abgeschlossen von %1"
-
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:300
 msgid "Open, due %1."
 msgstr "Verfügbar bis %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:433
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
 msgid "Open."
 msgstr "Offen."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:431
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:268
 msgid "Open. Submitted."
 msgstr "offen. Abgegeben."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:31
 msgid "Open:"
 msgstr "offen:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:115
 msgid "Opens"
 msgstr "Verfügbar ab"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:27
 msgid "Opens any homework set for 24 hours."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1686
+#: /opt/webwork/webwork2/conf/defaults.config:1588
 msgid "Optional Modules"
 msgstr "Optionale Module"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:265
 msgid "Order Problems Randomly"
 msgstr "Aufgaben zufällig anordnen"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:50
+msgid "Other Options"
+msgstr ""
+
 # Context is "7 Out Of 10"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:405
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:777
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:150
 msgid "Out Of"
 msgstr "von"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1024
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:85
+msgid "Overall Results"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:93
+msgid "Overall Set Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:122
+msgid "Overall Success Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:470
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:481
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:437
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:100
 msgid "Overwrite existing files silently"
 msgstr "Dateien stillschweigend überschreiben"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:41
+msgid "PDF"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:69
 msgid "PG Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:827
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer.html.ep:1
+msgid "PG POD"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:17
+msgid "PG Problem Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:708
 msgid "PG debug messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:829
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:716
 msgid "PG internal errors"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:818
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:109
+msgid ""
+"PG markdown syntax used to format WeBWorK questions. This interactive lab "
+"can help you to learn the techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:692
 msgid "PG question failed to render"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:826
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:706
 msgid "PG question processing error messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:828
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:712
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:128
 msgid "PG warning messages"
 msgstr ""
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:511
-msgid "PGLab"
-msgstr "PGLab"
-
-# Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:98
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:47
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:58
 msgid "PGML"
 msgstr "PGML"
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:91
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:40
 msgid "POD"
 msgstr "POD"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2309
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2249
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:200
+msgid "POD Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:208
+msgid "POD Viewer"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1515
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:526
 msgid "PREVIEW ONLY -- ANSWERS NOT RECORDED"
 msgstr "VORSCHAU -- IHRE ANTWORTEN WURDEN NICHT GESPEICHERT"
 
 # Problem Number
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:215
 msgid "PROB NUMBER"
 msgstr "AUFG NUMMER"
 
 # Problem Value
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:218
 msgid "PROB VALUE"
 msgstr "PUNKTZAHL"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:205
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:36
 msgid "Pad Fields"
 msgstr "Leere Felder auffüllen"
 
-#. (timestamp($self)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1255
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:28
+msgid "Page Contents"
+msgstr ""
+
+#. ($c->timestamp)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:1
 msgid "Page generated at %1"
 msgstr "Seite erzeugt am %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:568
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:81
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:71
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:56
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:25
 msgid "Password"
 msgstr "Passwort"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:976
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:13
 msgid "Password (Leave blank for regular proctoring)"
 msgstr ""
 
-#. ($studentUser, CGI::span({ dir => 'ltr' },
-#. format_set_name_display($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:498
+#. ($studentUser, tag('span', dir => 'ltr', format_set_name_display($setName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:13
 msgid "Past Answers for %1, set %2, problem %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:8
 msgid "Percent"
 msgstr "Prozent"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:562
-msgid "Percentage of Active Students with Correct Answers"
-msgstr "Prozentsatz aktiver Studierender mit richtigen Antworten"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:94
+msgid "Percent Ranges"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+msgid "Percent Score"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:535
+msgid "Percent of Students"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:788
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:206
 msgid ""
 "Percentile cutoffs for number of attempts. The 50% column shows the median "
 "number of attempts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2056
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:834
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:863
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:921
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:58
+msgid ""
+"Percentile cutoffs for student's score and success index. The 50% column "
+"shows the median number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:50
 msgid "Permission Level"
 msgstr "Berechtigung"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1869
+#: /opt/webwork/webwork2/conf/defaults.config:1771
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1052
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:24
 msgid "Pick a target set above to add this problem to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:54
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:21
 msgid "Pick date and time"
 msgstr "Wählen Sie Datum und Uhrzeit"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3804
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
 msgid ""
 "Place a file named \"hide_directory\" in a course or other directory and it "
 "will not show up in the courses list on the WeBWorK home page. It will still"
 " appear in the Course Administration listing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1107
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should be given full credit."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should have half credit added."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given full credit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:889
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given half credit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:654
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its incorrect attempt count reset."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its weight doubled."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1315
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:60
 msgid ""
 "Please choose the set, the problem you would like to copy, and the problem "
 "you would like to copy it to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:399
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:19
 msgid "Please correct the following errors and try again:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:698
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:28
 msgid "Please enter in a value to match in the filter field."
 msgstr ""
 
-#. (CGI::b($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:197
+#. (tag('b', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:28
 msgid "Please enter your username and password for %1 below:"
 msgstr "Nutzername und Passwort für den Kurs %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1778
 msgid "Please provide a location name to delete."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:233
 msgid "Please select action to be performed."
 msgstr "Wählen Sie die auszuführende Aktion."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:183
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
 msgid "Please select at least one set and try again."
 msgstr "Bitte mindestens ein Set auswählen und erneut versuchen."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
 msgid "Please select at least one set."
 msgstr "Bitten wählen Sie mindestens einen Aufgabensatz aus."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:165
 msgid "Please select at least one user and try again."
 msgstr "Bitte mindestens einen Nutzer auswählen und erneut versuchen."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:35
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:31
 msgid "Please select at least one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:28
 msgid "Please select at most one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:30
 msgid "Please select exactly one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:29
 msgid "Please select exactly one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:574
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1016
 msgid "Please specify a file to save to."
 msgstr "tr: Please specify a file to save to."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:37
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
 msgid "Please specify a homework set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:38
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
 msgid ""
 "Please use only letters, digits, dashes, underscores, and periods in your "
 "set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1462
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1184
+msgid ""
+"Please use radio buttons to choose the method for saving this file. Uknown "
+"saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:165
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:169
+msgid "Point Value"
+msgstr ""
+
+#. ($grader->{problem_value})
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:92
+msgid "Point Value (0 - %1):"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:21
 msgid "Points"
 msgstr "Punkte"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:609
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:62
+msgid "Points:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:26
 msgid "Potion of Forgetfulness"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1423
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:2
 msgid "Prepare which sets for export?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2054
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2073
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:268
 msgid "Press \"Grade Test\" now!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2049
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:244
 msgid "Press \"Grade Test\" soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:213
-msgid "Preview Comment"
-msgstr "Vorschau"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:69
 msgid "Preview Message"
 msgstr "Vorschau"
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:314
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1840
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:11
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:99
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:35
 msgid "Preview My Answers"
 msgstr "Vorschau"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2440
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:646
 msgid "Preview Test"
 msgstr "Vorschau"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1340
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:41
+msgid ""
+"Preview the message before sending using the \"Preview Message\" button.  "
+"The preview shows the email that would be sent to the first selected student"
+" or the instructor if no students were selected.  The preview will also list"
+" all of the students that would receive their own personalized message.  If "
+"a merge file was selected, the preview will also indicate which (if any) "
+"recipient's merge file data could not be found."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:991
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:995
 msgid "Previous Problem"
 msgstr "Vorherige Aufgabe"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2157
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:94
 msgid "Previous page"
 msgstr "Vorherige Seite"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2149
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:45
+msgid "Primary Actions"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:355
 msgid "Print Test"
 msgstr "Test drucken"
 
 # Short for Problem
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2088
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:287
 msgid "Prob"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:670
-msgid "Problem #"
-msgstr "Aufgabe #"
-
-#. ($prettyProblemID)
-#. ($problemNumber)
 #. (join('.', @seq)
 #. ($problemID)
-#. ($prettyProblemIDs{$probID})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:831
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:834
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:897
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:438
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:800
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:956
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:964
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:973
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:933
+#. ($problemNumber)
+#. ($_->{prettyID})
+#. ($c->{prettyID})
+#. ($probID)
+#. ($c->{setRecord}->assignment_type eq 'jitar' ? join('.',
+#. jitar_id_to_seq($_)
+#. ($set->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)
+#. ($prettyProblemID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:831
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:842
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:853
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:57
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/siblings.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:40
 msgid "Problem %1"
 msgstr "Aufgabe %1"
 
-#. ($problemNumber)
-#. ($prettyID)
-#. ($versioned ? $versioned : $MergedProblem->problem_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1419
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1421
+#. ($i + 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:535
 msgid "Problem %1."
 msgstr "Aufgabe %1."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1974
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:75
+msgid "Problem (\".pg\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:38
+msgid "Problem Display Settings"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1876
 msgid "Problem Display/Answer Checking"
 msgstr "Aufgabenanzeige/Lösungsüberprüfung"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:451
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:50
 msgid "Problem Editor"
 msgstr "Aufgabeneditor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1697
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:29
 msgid "Problem Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1002
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:999
 msgid "Problem List"
 msgstr "Aufgabenübersicht"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1119
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:666
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:783
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:75
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:159
 msgid "Problem Number"
 msgstr "Aufgabe"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:156
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:160
+msgid "Problem Paths"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:140
 msgid "Problem Score (%):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:30
 msgid "Problem Techniques"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:705
-msgid "Problem Viewer"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:239
+msgid ""
+"Problem has a different source file than the currently rendered problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:233
+msgid "Problem has an essay answer that needs to be graded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1943
 msgid "Problem source is drawn from a grouping set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:406
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2494
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:445
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:827
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:835
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:896
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:801
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:89
+msgid ""
+"Problem source is drawn from a grouping set and can not be directly rendered"
+" or edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:336
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:9
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:32
 msgid "Problems"
 msgstr "Aufgaben"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:25
 msgid "Problems Added"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:59
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:54
 msgid "Problems for all students have been unassigned."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:57
 msgid "Problems for selected students have been reassigned."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:51
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:46
 msgid "Problems have been assigned to all current users."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:25
+msgid ""
+"Problems with this rating should only require direct memory of a fact. "
+"Examples might be a specific value of a function, or the statement of a "
+"definition. Very few WeBWorK problems fall into this category."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:93
 msgid "Proctor"
 msgstr "tr: Proctor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:282
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:92
 msgid "Proctor Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:258
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:71
 msgid "Proctor Username"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:193
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:3
+msgid "Proctor authorization requested for a nonexistent set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:8
 msgid "Proctor authorization required."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:231
-msgid "Proctored Gateway Quiz %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:88
+msgid "Proctor:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:241
-msgid "Proctored Gateway Quiz %2 Proctor Login"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:265
+msgid "Proctored Test %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:981
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:272
+msgid "Proctored Test %2 Proctor Login"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:318
+msgid ""
+"Proctored tests always require authorization to start the test. \"Both Start"
+" and Grade\" will require login proctor authorization to start and grade "
+"proctor authorization to grade. \"Only Start\" requires grade proctor "
+"authorization to start and no authorization to grade."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:18
 msgid ""
-"Proctored tests require proctor authorization to start and to grade.  "
 "Provide a password to have a single password for all students to start a "
 "proctored test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:56
 msgid "Publish"
 msgstr "Veröffentlichen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:31
+msgid ""
+"Quick access to many instructor tools, including <strong>Reset "
+"passwords</strong>, <strong>Act as student</strong>, <strong>Assign "
+"individual sets</strong> and <strong>Edit individual due dates</strong>."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "RECITATION"
 msgstr "UEBUNGSGRUPPE"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1333
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:199
 msgid "Randomize"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:13
 msgid "Randomize Seed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:101
 msgid "Read only"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:67
 msgid "Really delete the items listed above?"
 msgstr "Wiklich löschen?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:201
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:212
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:804
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2038
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:298
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:832
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:861
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:890
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:919
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:184
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:42
 msgid "Recitation"
 msgstr "Übungsgruppe"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:194
+#. ($recitation)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:125
+msgid "Recitation %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:21
+msgid "Recitation:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:38
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:46
 msgid "Record Scores for Single Sets"
 msgstr "Punktzahlen für einzelne Blätter"
 
-#. ($studentName)
-#. ($self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:183
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:190
+#. ($studentID)
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:8
 msgid "Record for user %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Reduced Scoring"
 msgstr "Bewertung mit Punktabzug"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:67
 msgid "Reduced Scoring Date"
 msgstr "Datum für Bewertung mit Punktabzug "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2523
-msgid "Reduced Scoring Disabled"
-msgstr "Bewertung mit Punktabzug deaktiviert"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2522
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
 msgid "Reduced Scoring Enabled"
 msgstr "Bewertung mit Punktabzug aktiviert."
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:33
+msgid "Reduced Scoring Period"
+msgstr ""
+
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:314
 msgid "Reduced credit can still be earned until %1."
 msgstr ""
 
 # Short for "Reduced Scoring:"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:32
 msgid "Reduced:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:153
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:373
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:56
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1646
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1943
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2000
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3713
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3755
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:56
 msgid "Refresh Listing"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:190
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:200
 msgid "Relax IP restrictions when?"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:88
+msgid "Reload the page to see backup files that have been made."
+msgstr ""
+
 # Context is "Attempts Remaining"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:14
 msgid "Remaining"
 msgstr "Verbleibend"
 
 #. ('00:00:00')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:254
 msgid "Remaining time: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:61
 msgid "Remember Me"
 msgstr "tr: Remember Me"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:546
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:514
 msgid "Remember to return to your original problem when you're finished here!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1020
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:466
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:72
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:41
 msgid "Rename"
 msgstr "Umbenennen"
 
 #. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1302
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:62
 msgid "Rename %1 to %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:378
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:927
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:73
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:34
 msgid "Rename Course"
 msgstr "Kurs umbenennen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:17
+msgid "Rename Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:22
+msgid "Rename Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
 msgid "Rename file as:"
 msgstr "Neuer Dateiname"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2727
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:463
 msgid "Render"
 msgstr "Anzeigen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:344
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:59
 msgid "Render All"
 msgstr "Alle anzeigen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2720
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:461
 msgid "Render Problem"
 msgstr "Aufgabe anzeigen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2501
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:60
+msgid ""
+"Render all problems on the page. This does not reload the page or save or "
+"reset changes."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:106
+msgid ""
+"Render or re-render the problem, course info file, or set header being "
+"edited. This does not change the permanent file on the disk. You can view "
+"different versions of the same problem by changing the seed. You can also "
+"change the manner in which the mathematics is typeset. If \"Open in new "
+"window\" is checked, then the problem will open in a new tab or window "
+"showing the problem as it will be rendered for students in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:132
+msgid "Rendering Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:341
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:53
 msgid "Renumber Problems"
 msgstr "Aufgaben neu nummerieren"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:55
+msgid ""
+"Renumber problems consecutively starting from 1. This renumbering is not "
+"saved until \"Save Changes\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:103
+msgid ""
+"Renumber problems in the set consecutively starting from one. In the process"
+" of deleting problems, the numbering can be made non-consecutive. This is "
+"useful to clean up the problem numbering."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:31
 msgid ""
-"Reopens any gateway test for an additional 24 hours. This allows you to take"
-" a test even if the close date has past. This item does not allow you to "
-"take additional versions of the test."
+"Reopens any test for an additional 24 hours. This allows you to take a test "
+"even if the close date has past. This item does not allow you to take "
+"additional versions of the test."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:118
+msgid "Reordering Problems"
 msgstr ""
 
-#. (CGI::strong(                                                   CGI::span({
-#. dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1829
+#. (tag(                                           'strong',
+#. c(                                                      tag('span', dir =>
+#. 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:58
 msgid "Replace current problem: %1"
 msgstr "Aktuelle Aufgabe ersetzen: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:13
 msgid "Replace which users?"
 msgstr "Zu ersetzende Nutzer:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:637
+#. ($composite_id, $oldUser->status)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:448
+msgid "Replacing old data for %1: status: %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:42
 msgid "Reply-To:"
 msgstr "Antwort an:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:528
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:123
 msgid "Report Bugs in this Problem"
 msgstr "Fehler in dieser Aufgabe melden"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1073
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:305
 msgid "Report bugs"
 msgstr "Fehler melden"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:128
+msgid ""
+"Report bugs in a WeBWorK question/problem using this link. The very first "
+"time you do this you will need to register with an email address so that "
+"information on the bug fix can be reported back to you."
+msgstr ""
+
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2825
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1530
 msgid "Report for course %1:"
 msgstr ""
 
-#. ($rename_oldCourseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2122
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:3
 msgid "Report on database structure for course %1:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1829
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:8
 msgid "Request New Version"
 msgstr "Neue Version anfordern"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2246
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2321
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:19
 msgid "Request information"
 msgstr "Request Information"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1972
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1220
 msgid "Request new version now."
 msgstr "Neue Version anfordern."
 
+#. ($setName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:486
+msgid ""
+"Requested set \"%1\" is a proctored test, but no valid proctor authorization"
+" has been obtained."
+msgstr ""
+
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:399
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:422
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:425
 msgid "Requested set '%1' could not be found in the database for user %2."
 msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:469
-msgid ""
-"Requested set '%1' is a homework assignment but the gateway/quiz content "
-"generator %2 was called.  Try re-entering the set from the problem sets "
-"listing page."
-msgstr ""
-
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:484
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:472
 msgid ""
-"Requested set '%1' is a proctored test/quiz assignment, but no valid proctor"
-" authorization has been obtained."
+"Requested set '%1' is a homework assignment but the test content generator "
+"%2 was called.  Try re-entering the set from the problem sets listing page."
 msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:463
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:466
 msgid ""
-"Requested set '%1' is a test/quiz assignment but the regular homework "
-"assignment content generator %2 was called.  Try re-entering the set from "
-"the problem sets listing page."
+"Requested set '%1' is a test but the regular homework assignment content "
+"generator %2 was called.  Try re-entering the set from the problem sets "
+"listing page."
 msgstr ""
 
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:420
 msgid "Requested set '%1' is not assigned to user %2."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:450
 msgid "Requested set '%1' is not available yet."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:441
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:444
 msgid "Requested set '%1' is not yet open."
 msgstr ""
 
 #. ($verNum,				$setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:404
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:407
 msgid "Requested version (%1) of set '%2' can not be directly accessed."
 msgstr ""
 
 #. ($verNum, $setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:397
 msgid "Requested version (%1) of set '%2' is not assigned to user %3."
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:308
+msgid "Require Proctor Authorization to"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:45
 msgid "Require users to log in through the LMS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:420
 msgid "Rerandomize after"
 msgstr "Randomisierung nach"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:104
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2280
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2968
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:195
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:696
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:47
 msgid "Reset Form"
 msgstr "Änderungen verwerfen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:610
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:27
 msgid "Resets the number of incorrect attempts on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2453
-msgid ""
-"Restores a course from a gzipped tar archive (.tar.gz). After unarchiving, "
-"the course database is restored from a subdirectory of the course's DATA "
-"directory. Currently the archive facility is only available for mysql "
-"databases. It depends on the mysqldump application."
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:41
+msgid "Restore a .tar.gz archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:40
+msgid "Restore backup from"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:178
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:39
+msgid "Restore backup from %1"
+msgstr ""
+
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+msgid "Restored backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:188
 msgid "Restrict Access by IP"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:912
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep:11
 msgid "Restrict Locations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:286
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:324
 msgid "Restrict Problem Progression"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:184
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:194
 msgid "Restrict To"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:154
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:33
+msgid "Restrict or sort the students displayed"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:159
 msgid "Restrict release by set(s)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2090
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:299
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:291
 msgid "Result"
 msgstr "Ergebnis"
 
-#. (CGI::i($self->$actionHandler(\%genericParams, \%actionParams,
-#. \%tableParams)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:388
+#. ($c->tag('i', $c->$actionHandler)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:228
 msgid "Result of last action performed: %1"
 msgstr "Ergebnis der zuletzt ausgeführten Aktion: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:309
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:300
 msgid "Results for this submission"
 msgstr "Ergebnisse"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:363
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:236
 msgid "Results of last action performed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:125
 msgid "Results of last action performed: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1725
-msgid "Resurrect which Gateway?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:51
+msgid "Resurrect which test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1449
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:669
 msgid "Retitled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:17
 msgid "Return to your work"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:686
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:132
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:16
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:166
 msgid "Revert"
 msgstr "Zurückstetzen"
 
-#. (CGI::span({ dir => 'ltr' }, $self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2069
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:83
 msgid "Revert to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1431
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1513
+#. ($c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1220
+msgid "Reverted to original file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:168
+msgid ""
+"Reverts to the copy of the file saved on the disk or to a backup file. All "
+"unsaved editing changes will be lost. This option is only active when a "
+"temporary file or a backup file exists. You may also delete backups that "
+"have been made with this tab."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:182
+msgid "Review of column functions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:145
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:85
 msgid ""
 "Reviewing a problem and looking at both the average Attempts and  average "
 "Status should give instructors valuable information about the difficulty of "
 "the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:55
 msgid "Reward used successfully!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:180
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:4
 msgid "Rewards"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:27
 msgid "Ring of Reduction"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:322
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:26
 msgid "Robe of Longevity"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "SECTION"
 msgstr "STUDIENFACH"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:214
 msgid "SET NAME"
 msgstr "SET NAME"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:321
 msgid "STATUS"
 msgstr "STATUS"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "STUDENT ID"
 msgstr "STUDENT ID"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:43
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:263
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:170
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:687
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:847
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:220
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:85
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:207
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:123
 msgid "Save"
 msgstr "Speichern"
 
-#. (CGI::b($self->shortPath($self->{sourceFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:438
+#. (tag('b', $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_form.html.ep:2
 msgid "Save %1"
 msgstr "Speichern %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:44
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:695
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:134
 msgid "Save As"
 msgstr "Speichern unter"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:744
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2963
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:194
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:695
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:37
 msgid "Save Changes"
 msgstr "Änderungen speichern"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:60
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:76
 msgid "Save Edit"
 msgstr "Änderungen speichern"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
 msgid "Save Export"
 msgstr "Export speichern"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:92
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
 msgid "Save Password"
 msgstr "Passwort speichern"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:188
 msgid "Save as"
 msgstr "Speichern unter"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:872
-msgid "Save as Default"
-msgstr "Als Standard festlegen"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:481
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:5
 msgid "Save as:"
 msgstr "Speichern als:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1558
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:254
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1443
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_password_form.html.ep:1
 msgid "Save changes"
 msgstr "Änderungen speichern"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1794
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:33
 msgid "Save file to:"
 msgstr "Datei speichern unter:"
 
-#. (CGI::b({ dir => 'ltr' }, $self->shortPath($self->{editFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1605
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:125
+msgid ""
+"Save the contents of the editor window to the file on disk and re-render the"
+" problem. If \"Open in new window\" is checked, then the problem will open "
+"in a new tab or window showing the problem as it will be rendered for "
+"students in the set. If \"Create backup\" is checked then a backup of the "
+"current file on disk will be created before overwriting it with the contents"
+" of the editor window. If a backup already exists, then a \"Delete oldest "
+"backup\" check box will be present. If that is checked, then the oldest "
+"backup will be deleted when \"Save\" is clicked. These backups can be "
+"reverted to and managed on the \"Revert\" tab."
+msgstr ""
+
+#. (tag('b', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:6
 msgid "Save to %1 and View"
 msgstr "Unter %1 speichern und ansehen"
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:396
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1165
-msgid "Saved to file '%1'"
-msgstr "Gespeichert unter '%1'"
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:50
+msgid "Saved answers"
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#. ($outputFilePath =~ s/$ce->{courseDirs}{templates}/[TMPL]/r)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:549
+msgid "Saved to file \"%1\""
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1180
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2116
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2292
 msgid "Schema and database field definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4284
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2279
 msgid "Schema and database table definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:404
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:465
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:660
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:147
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:161
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:78
 msgid "Score"
 msgstr "Punktzahl"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:125
 msgid "Score (%)"
 msgstr "Punktzahl (%)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:161
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:60
+msgid ""
+"Score one or more sets. This can also be done from the \"Hmwk Sets Editor\" "
+"or from the \"Instructor Tools\", but the \"Scoring Tools\" page allows "
+"control over parameters."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:170
 msgid "Score required for release"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:228
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:58
 msgid "Score selected set(s) and save to:"
 msgstr "Ausgewählte Sets bewerten und speichern unter"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2085
-msgid "Score summary for last submit:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:284
+msgid "Score summary for last submission:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:2
 msgid "Score which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:978
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:2
 msgid "Score which sets?"
 msgstr "Tr: Score which sets?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
 msgid "Scores"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:487
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:66
+msgid "Scoring (\".csv\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:396
 msgid "Scoring Download"
 msgstr "Bewertung herunterladen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:161
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:115
 msgid "Scoring Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:478
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:391
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:58
 msgid "Scoring Tools"
 msgstr "Bewertungswerkzeuge"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2460
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:17
+msgid "Scoring Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:327
 msgid ""
 "Screen and Hardcopy set header information can not be overridden for "
 "individual students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:26
 msgid "Scroll of Resurrection"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:189
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:200
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:211
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:793
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2029
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:297
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:831
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:860
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:889
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:918
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:157
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:178
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:38
 msgid "Section"
 msgstr "Studienfach"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:653
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:802
+#. ($section)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:122
+msgid "Section %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:30
 msgid "Section:"
 msgstr "Unterkapitel:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:436
 msgid "Seed"
 msgstr "Zufalls Seed"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:114
 msgid "Select"
 msgstr "Auswählen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:505
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:20
+msgid ""
+"Select Users from the left column and sets from the right column and assign "
+"or unassign the given sets. The list of users or the list of sets can be "
+"reordered under the \"sort\" option or the format of the user or set list.  "
+"Additionally, the set lists can be filtered (by section number or "
+"recitation).  The displayed user and set lists will only be updated upon "
+"clicking \"Change Display Settings\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:11
 msgid "Select a Homework Set"
 msgstr "Set auswählen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:14
 msgid "Select a Problem Collection"
 msgstr "Aufgabensammlung auswählen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:18
 msgid "Select a Set Definition File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1028
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:14
 msgid "Select a Set from this Course"
 msgstr "Set aus diesem Kurs auswählen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1659
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:20
+msgid ""
+"Select a course to create a .tar.gz archive of, which contains a dump of the"
+" database and all course files (templates, configuration files, etc).  Each "
+"course can only have a single archive.  Creating an archive of a previously "
+"archived course will delete the old archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:36
 msgid "Select a course to delete."
 msgstr "Zu löschenden Kurs auswählen."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:946
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:20
+msgid ""
+"Select a course to delete.  Warning, all data will be deleted and this "
+"cannot be undone.  This will not delete any course archives."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:14
 msgid ""
 "Select a course to rename.  The courseID is used in the url and can only "
 "contain alphanumeric characters and underscores. The course title appears on"
 " the course home page and can be any string."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2475
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:13
 msgid "Select a course to unarchive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1914
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3684
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:21
 msgid "Select a listing format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1442
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1478
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:18
+msgid "Select action:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:10
 msgid "Select all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2703
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:12
 msgid "Select all eligible courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2731
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:26
 msgid "Select all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1967
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:10
 msgid "Select all users"
 msgstr "Alle Nutzer auswählen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:315
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:509
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:536
-msgid "Select an action to perform"
-msgstr "Wählen Sie eine auszuführende Aktion"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3063
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:10
 msgid "Select an action to perform:"
 msgstr "Wählen Sie eine auszuführende Aktion:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1956
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:20
+msgid ""
+"Select an archive to restore.  You cannot restore an archive into an "
+"existing course. Instead, either rename or delete the old course, or restore"
+" the archive with a new name.  When restoring a course with a new name, the "
+"name is used as the course ID, and must contain only letters, numbers, "
+"hyphens, and underscores, and may have at most 40 characters."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:36
 msgid "Select course(s) to archive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3731
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:44
 msgid "Select course(s) to hide or unhide."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:7
 msgid "Select import file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:14
 msgid ""
 "Select one or more sets and one or more users below to assign/unassign each "
 "selected set to/from all selected users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:94
 msgid "Select sets below to assign them to the newly-created users."
 msgstr "Wählen Sie die Blätter, die Sie den neuen Nutzern zuweisen wollen."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3666
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:20
+msgid ""
+"Select the course to change its Course ID, Course Title, or Institution.  "
+"Note that changing a course's ID will change the URL of all links to the "
+"course, and could break links from external sites such as an LMS."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:4
 msgid ""
 "Select the course(s) you want to hide (or unhide) and then click \"Hide "
 "Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
@@ -5434,133 +7246,230 @@ msgid ""
 "full URL address for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:488
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:20
+msgid ""
+"Select the course(s) you want to hide (or unhide) and then click \"Hide "
+"Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
+"does no harm (the action is skipped). Likewise unhiding a course that is "
+"already visible does no harm (the action is skipped). Hidden courses are "
+"still active but are not listed in the list of WeBWorK courses on the "
+"opening page. To access the course, an instructor or student must know the "
+"full URL address for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:93
+msgid "Select the display mode used to render the problems on this page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:11
 msgid ""
 "Select the homework sets for which to generate hardcopy versions. You may "
 "also select multiple users from the users list. You will receive hardcopy "
 "for each (set, user) pair."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:238
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:30
+msgid ""
+"Select the sets you want scored, choose the name of the export file you want"
+" to use (by default: %1), and then click the \"Score Selected Set(s) and "
+"save to\" button."
+msgstr ""
+
+#. ('<code>ful.csv</code>','<code>scr.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:49
+msgid ""
+"Select this if you want to save the scores for each set in a separate file "
+"in addition to saving all scores to a cumulative file. After clicking the "
+"\"Score Selected Set(s) and save to\" button, you will get a pair of links "
+"for each selected set. The file that ends with %1 contains the number of "
+"correct and incorrect tries about each individual problem for each student. "
+"The file that ends with %2 is a summary of each problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:19
 msgid ""
 "Select user(s) and/or set(s) below and click the action button of your "
 "choice."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2885
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:85
+msgid ""
+"Select which assignment types (homework, tests, just-in-time) the "
+"achievement is evaluated."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:20
+msgid ""
+"Select which courses to upgrade from a previous version of WeBWorK.  The "
+"upgrade process can add missing database columns, delete unused database "
+"columns, and check the course file structure.  Be sure to read over the "
+"changes before confirming the upgrade.  You may want to create an archive of"
+" the course before upgrading.  Only courses that need upgraded will be "
+"selectable."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:84
+msgid "Select your favorite theme for the large text window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:18
 msgid "Select/unselect all fields missing in schema for deletion."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2873
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:9
 msgid "Select/unselect all tables missing in schema for deletion."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:23
 msgid "Selected sets:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:57
 msgid "Send E-mail"
 msgstr "Senden"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:839
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:83
 msgid "Send Email"
 msgstr "Senden"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:702
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:69
+msgid "Send email to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:54
+msgid "Send emails to selected instructors."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:59
 msgid "Send to all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:717
-msgid "Send to the students selected below"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:64
+msgid "Send to selected students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:402
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:7
 msgid "Set"
 msgstr "Set"
 
 #. ($newSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:614
 msgid "Set %1 has been created."
 msgstr "Set %1 erfolgreich angelegt."
 
-#. ($newSetName,$userName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1944
+#. ($newSetName, $userName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:616
 msgid "Set %1 was assigned to %2"
 msgstr "Set %1 wurde %2 zugeordnet"
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1239
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:567
 msgid "Set %1 was assigned to %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:415
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:354
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:42
 msgid "Set Assigner"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:420
-msgid "Set Definition Filename"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:17
+msgid "Set Assigner Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:45
 msgid "Set Definition Files"
 msgstr "Definitionsdatei (.def)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2318
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2329
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:218
 msgid "Set Description"
 msgstr "Setbeschreibung"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:17
+msgid "Set Detail Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:333
 msgid "Set Detail for set %2"
 msgstr "Details für Set %2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:93
 msgid "Set Header"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:323
+msgid "Set Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:218
 msgid "Set ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:267
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:114
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:3
 msgid "Set Info"
 msgstr "Informationen zum Set"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2744
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:19
 msgid "Set List"
 msgstr "Aufgabenliste"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1111
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1209
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1320
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:164
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:262
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:353
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:448
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:546
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:659
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:776
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:895
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:995
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:762
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:809
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:7
 msgid "Set Name"
 msgstr "Name des Sets"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:186
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:18
+msgid "Set closes on %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:45
+msgid "Set definition (\".def\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:20
+msgid "Set is closed."
+msgstr ""
+
+#. ($c->formatDateTime($set->reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:16
+msgid "Set is due on %1."
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:14
+msgid "Set opens on %1."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:188
 msgid "Set random seed to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2029
+#: /opt/webwork/webwork2/conf/defaults.config:1930
 msgid ""
 "Set to true for log to mean base 10 log and false for log to mean natural "
 "logarithm."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2049
+#: /opt/webwork/webwork2/conf/defaults.config:1950
 msgid ""
 "Set to true to allow students to enter Unicode versions of some characters "
 "(like U+2212 for the minus sign) in their answers.  One reason to allow this"
@@ -5569,7 +7478,7 @@ msgid ""
 "directory from the keyboard."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2019
+#: /opt/webwork/webwork2/conf/defaults.config:1920
 msgid ""
 "Set to true to display the \"Entered\" column which automatically shows the "
 "evaluated student answer, e.g., 1 if student input is sin(pi/2). If this is "
@@ -5578,7 +7487,7 @@ msgid ""
 " answer."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2060
+#: /opt/webwork/webwork2/conf/defaults.config:1961
 msgid ""
 "Set to true to have Full Width Unicode character (U+FF01 to U+FF5E) "
 "converted to their ASCII equivalents (U+0021 to U+007E) automatically in "
@@ -5586,20 +7495,30 @@ msgid ""
 "automatically use Full Width characters for parentheses and commas."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:521
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:164
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:16
+msgid "Set values"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/siblings.html.ep:4
 msgid "Sets"
 msgstr "Sets"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:352
-msgid "Sets Assigned to User"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:322
+msgid "Sets assigned to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:343
-msgid "Sets assigned to %1"
+#. ($userName, $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:90
+msgid "Sets assigned to %1 (%2)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:17
+msgid "Sets assigned to student Help"
 msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:57
@@ -5613,189 +7532,241 @@ msgid ""
 "links from the LMS must be problem set specific. For example, "
 "<code>webwork.myschool.edu/webwork2/course-name/problem_set_name</code>. If "
 "the problem set name has space characters, they should be underscores in "
-"these addresses. If the problem set is a quiz, it must have this format: "
-"<code>webwork.myschool.edu/webwork2/course-"
-"name/quiz_mode/problem_set_name</code>. Also, to initialize the "
-"communication between WeBWorK and the LMS, the user must follow each of "
-"these external learning tools at least one time. Since there must be a "
-"separate external tool link for each problem set, this option requires more "
-"maintenance of the LMS course.</dd></dl>"
+"these addresses. Also, to initialize the communication between WeBWorK and "
+"the LMS, the user must follow each of these external learning tools at least"
+" one time. Since there must be a separate external tool link for each "
+"problem set, this option requires more maintenance of the LMS "
+"course.</dd></dl>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1458
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:55
+msgid "Sets the order in which achievements are listed and evaluated."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:625
 msgid "Sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:726
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:36
 msgid "Setting"
 msgstr "Einstellung"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1332
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:39
 msgid "Shift dates so that the earliest is"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:32
+msgid "Show"
+msgstr ""
+
 #. ($numchild)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1301
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:32
 msgid "Show %1 more like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:326
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:107
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:39
 msgid "Show Correct Answers"
 msgstr "Richtige Antworten anzeigen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:22
 msgid "Show Date & Size"
 msgstr "Datum & Größe anzeigen"
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:86
 msgid "Show LTI parameters (for debugging)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:620
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:34
 msgid "Show Me Another"
 msgstr "Andere Version anzeigen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2518
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2412
+#. ($exhausted)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:69
+msgid "Show Me Another %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1642
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:711
 msgid "Show Past Answers"
 msgstr "Vergangene Antworten anzeigen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:703
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:41
+msgid "Show Problem Source File"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:132
 msgid "Show Problem Source File:"
 msgstr "Name der Quellcodedatei anzeigen:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
 msgid "Show Problems on Finished Tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
-msgid "Show Scores on Finished Assignments?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+msgid "Show Scores on Finished Tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2416
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:630
 msgid "Show Solutions"
 msgstr "Lösungen anzeigen"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/conf/defaults.config:1538
 msgid "Show Total Homework Grade on Grades Page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1266
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:77
 msgid "Show all students"
 msgstr "Alle SchülerInnen anzeigen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1380
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:91
 msgid "Show all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2404
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:621
 msgid "Show correct answers"
 msgstr "Lösung anzeigen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1299
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+msgid "Show hints after"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:30
 msgid "Show less like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:337
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:387
 msgid "Show me another"
 msgstr "Andere Version anzeigen"
 
-#. ($exhausted)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1926
-msgid "Show me another %1"
-msgstr "Andere Version anzeigen %1"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:20
+msgid ""
+"Show past answers.  Students can only see their past answers, and they will "
+"not be able to see which parts are correct.  Instructors can use the form to"
+" select any combination of users, sets, and problems to view.  The table "
+"below will list the past answers colored according to correctness (green is "
+"correct).  Use control + click to select multiple users, sets, or problems."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2428
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:639
 msgid "Show problem graders"
 msgstr "Problem Grader anzeigen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:105
 msgid "Show saved answers?"
 msgstr "Gespeicherte Antworten anzeigen?"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1860
+#: /opt/webwork/webwork2/conf/defaults.config:1762
 msgid ""
 "Show the correct answer to the current problem before re-randomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1862
+#: /opt/webwork/webwork2/conf/defaults.config:1764
 msgid ""
 "Show the correct answer to the current problem on the last attempt before a "
 "new version is requested."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:3
 msgid "Show which sets?"
 msgstr "Welche Sets anzeigen?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:690
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:3
 msgid "Show which users?"
 msgstr "Welche Nutzer anzeigen?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:382
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:475
-msgid "Show/Hide Site Description"
-msgstr "Seitenbeschreibung anzeigen/verbergen"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:622
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:11
 msgid "Show:"
 msgstr "Anzeigen:"
 
-#. (scalar @{ $self->{visibleSetIDs} },			scalar @{ $self->{allSetIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:594
+#. (scalar @{ $c->{visibleSetIDs} },			scalar @{ $c->{allSetIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:115
 msgid "Showing %1 out of %2 sets."
 msgstr "Gezeigt werden %1 von %2 Sets."
 
-#. (scalar @Users, scalar @{ $self->{allUserIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:610
+#. (scalar(keys %{ $c->{visibleUserIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:80
 msgid "Showing %1 out of %2 users"
 msgstr "Gezeigt werden %1 von %2 Nutzern."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:70
 msgid "Showing all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1355
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:81
 msgid "Showing all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:61
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:64
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:67
+#. ($c->{merge_file}, $ur->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:5
+msgid "Showing data from merge file %1 for user %2:"
+msgstr ""
+
+#. ($c->{merge_file})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:147
+msgid "Showing data from merge file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:61
+msgid "Showing problem for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:7
+msgid "Showing statistics for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:33
+msgid ""
+"Shows how many instructors and students have been assigned this problem set,"
+" out of the total number in the class. Clicking on this link allows you to "
+"assign the set to users, unassign this set from users, and to individually "
+"edit the assignment for specific users. For changing dates for individual "
+"users there are also shortcuts from the \"Instructor Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:63
 msgid "Site Information"
 msgstr "Seitenbeschreibung"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:88
 msgid "Skip archiving this course"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2080
+#: /opt/webwork/webwork2/conf/defaults.config:1981
 msgid "Skip explanation essay answer fields"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1556
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1557
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:81
+msgid "Snippets of PG code illustrating specific techniques"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1514
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1515
 msgid "Solution:"
 msgstr "Lösung:"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1555
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1513
 msgid "Solution: "
 msgstr "Lösung: "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:432
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:57
 msgid "Solutions"
 msgstr "Lösungen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1350
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:20
+msgid ""
+"Some OPL problems have been rated for difficulty/educational objective. The "
+"levels are loosely inspired by Bloom's taxonomy. They are assigned numbers "
+"from 1 to 6 as follows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:185
 msgid ""
 "Some WeBWorK problems are programmed using what are called <i>Math "
 "Objects</i>. These problems are preferred by some people because they "
@@ -5803,18 +7774,18 @@ msgid ""
 "particularly for answers which are way off base."
 msgstr "Einige WeBWorK Aufgaben sind programmiert mit <i>Math Objects</i>. Diese Aufgaben sind bei einigen Menschen beliebter, weil sie eine konsistentere Nachrichtensammlung enthalten für Falschantworten der Teilnehmer, besonders wenn sie total falsch sind."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:379
 msgid "Some answers will be graded later."
 msgstr "Einige der Antworten werden später bewertet"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:60
 msgid ""
 "Some of these files are directories. Only delete directories if you really "
 "know what you are doing. You can seriously damage your course if you delete "
 "the wrong thing."
 msgstr "Einige dieser Dateien sind Verzeichnisse. Löschen Sie Verzeichnisse nur, wenn Sie wirklich wissen was Sie tun. Sie können Kursinhalte stark beschädigen, wenn Sie die falsche Sache löschen."
 
-#: /opt/webwork/webwork2/conf/defaults.config:2082
+#: /opt/webwork/webwork2/conf/defaults.config:1983
 msgid ""
 "Some problems have an explanation essay answer field, typically following a "
 "simpler answer field. For example, find a certain derivative using the "
@@ -5826,7 +7797,7 @@ msgid ""
 "grading."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2186
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:83
 msgid ""
 "Some problems shown above represent multiple similar problems from the "
 "database.  If the (top) information line for a problem has a letter M for "
@@ -5836,300 +7807,396 @@ msgid ""
 "again."
 msgstr " Einige der oben angezeigten Aufgaben sind hier stellvertretend für viele ähnliche weitere Aufgaben in der Datenbank gelistet. Wenn die (obere) Informationszeile  einer Aufgabe mit dem Buchstaben M für \"Mehr\" gekennzeichnet ist, können Sie sehen, wieviele ähnliche Aufgaben es in der Datenbank noch gibt, indem Sie Ihren Mauszeiger über das M bewegen . Durch Klicken auf das M können Sie die Aufgaben sichtbar werden lassen. Dann wird das M durch ein L ersetzt. Durch erneutes Klicken auf das L kann man die Probleme wieder verstecken."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1612
-msgid ""
-"Some servers handle courses taking place in different timezones.  If this "
-"course is not showing the correct timezone, enter the correct value here.  "
-"The format consists of unix times, such as "
-"\"America/New_York\",\"America/Chicago\", \"America/Denver\", "
-"\"America/Phoenix\" or \"America/Los_Angeles\". Complete list: <a "
-"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:529
-msgid ""
-"Something was wrong with your LTI parameters.  If this recurs, please speak "
-"with your instructor"
-msgstr "Irgendetwas ist falsch bei den LTI Parametern. Sollte sich dies wiederholen, sprechen Sie mit ihrer Lehrkraft."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:50
 msgid "Sort"
 msgstr "Sortieren"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:751
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:814
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:4
 msgid "Sort by"
 msgstr "Sortieren nach"
 
 #. ($names{$primary}, $names{$secondary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:817
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:324
 msgid "Sort by %1 and then by %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:171
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:115
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:3
 msgid "Sort:"
 msgstr "Sortieren nach:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:51
+msgid "Sorts the lists displayed by due date, name, etc."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:363
 msgid "Source File"
 msgstr "Datei"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1586
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1612
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1555
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1593
 msgid ""
 "Source file paths cannot include .. or start with /: your source file path "
 "was modified."
 msgstr ""
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:11
 msgid ""
 "Specify an ID, title, and institution for the new course. The course ID may "
 "contain only letters, numbers, hyphens, and underscores, and may have at "
 "most %1 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:661
-msgid "Start"
-msgstr "Start"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:94
+msgid ""
+"Spell check the text of the file that your are editing. Note that there will"
+" be many spelling errors in the code parts of your file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:116
+msgid "Standard Deviation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:162
+msgid "Start"
+msgstr "Start"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:47
+msgid "Start LTI Grade Update"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:609
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:130
 msgid "Start New Test"
 msgstr "Neuen Test starten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:443
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:94
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:508
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:84
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:54
 msgid "Statistics"
 msgstr "Statistik"
 
-#. ($self->{ce}{courseName} =~ s/_/ /gr,                   CGI::span({ dir =>
-#. 'ltr' }, format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:73
-msgid "Statistics for %1 set %2. Closes %3"
-msgstr "Statistik für Kurs %1 und Set %2. Schließt am %3"
-
-#. ($self->{ce}{courseName}, $self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:68
-msgid "Statistics for %1 student %2"
-msgstr "Statistik für Kurs %1 und Studierenden %2"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2089
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1442
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1524
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2020
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:296
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:659
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:806
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:191
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:192
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:17
+msgid "Statistics Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:86
+msgid "Statistics for %1"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:90
+msgid "Statistics for %1 problem %2"
+msgstr ""
+
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:84
+msgid "Statistics for student %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:442
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:151
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:160
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:36
 msgid "Status"
 msgstr "Status"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:29
 msgid "Stop Acting"
 msgstr "Zurück zum Ursprungsnutzer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2251
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:85
 msgid "Stop Archiving"
 msgstr "Archivierung anhalten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2418
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1153
 msgid "Stop archiving courses"
 msgstr "Archivierung des Kurses anhalten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:233
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:783
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2011
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:295
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:829
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:887
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:916
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:30
 msgid "Student ID"
 msgstr "Teilnehmer ID"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:9
+msgid "Student ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:37
 msgid "Student Name"
 msgstr "Name"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:570
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:428
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:56
 msgid "Student Progress"
 msgstr "Fortschritt"
 
-#. ($self->{ce}->{courseName},                     CGI::span({ dir => 'ltr' },
-#. format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:81
-msgid "Student Progress for %1 set %2. Closes %3"
-msgstr "Fortschritt für Set %2 des Kurses %1. Schließt am %3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:17
+msgid "Student Progress Help"
+msgstr ""
+
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:72
+msgid "Student Progress for %1"
+msgstr ""
 
-#. ($self->{ce}->{courseName}, $self->{studentName})
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($c->stash('setID')
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:76
-msgid "Student Progress for %1 student %2"
-msgstr "Fortschritt für Set %1 und Studierenden %2"
+msgid "Student Progress for set %1"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:628
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:80
 msgid "Student answers"
 msgstr "Antworten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:766
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:80
+msgid ""
+"Student scores for the sets selected below will be calculated. This and "
+"other scoring operations can also be done using the \"Scoring Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:87
+msgid "Student:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:124
+msgid "Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:50
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:8
 msgid "Subject:"
 msgstr "Thema:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:653
-msgid "Subject: "
-msgstr "Betreff:"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:222
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:30
 msgid "Submission time:"
 msgstr "Abgabezeitpunkt:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:226
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:41
 msgid "Submit"
 msgstr "Abgabe"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:26
 msgid "Submit Answers"
 msgstr "Antwort abschicken"
 
 #. ($effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1861
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:23
 msgid "Submit Answers for %1"
 msgstr "Antworten für %1 einreichen"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:502
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:525
 msgid "Submit your answers again to go on to the next part."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:775
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:183
 msgid "Success Index"
 msgstr "Success Index"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:106
+msgid ""
+"Success index is the square of the average score divided by the average "
+"number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:73
+msgid ""
+"Success index is the square of the score divided by the number of attempts."
+msgstr ""
+
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1086
 msgid "Successfully archived the course %1."
 msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:885
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:422
 msgid "Successfully created new achievement %1"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1252
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:581
 msgid "Successfully created new set %1"
 msgstr ""
 
 #. ($add_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:465
 msgid "Successfully created the course %1"
 msgstr ""
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1818
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2401
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1131
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:900
 msgid "Successfully deleted the course %1."
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1529
+#. ($rename_oldCourseID,							$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:772
 msgid "Successfully renamed the course %1 to %2"
 msgstr ""
 
 #. ($unarchive_courseID, $new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2653
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1286
 msgid "Successfully unarchived %1 to the course %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2099
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4280
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:89
+msgid "TA:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2274
 msgid "Table defined in database but missing in schema"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2097
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2269
 msgid "Table defined in schema but missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2265
 msgid "Table is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3200
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3490
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:276
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:576
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:106
 msgid "Take Action!"
 msgstr "Ausführen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Target Set:"
 msgstr "Set:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:63
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:42
 msgid "TeX Source"
 msgstr "TeX Source"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:784
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:258
+msgid "Test %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:54
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:52
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:55
+msgid "Test Name"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:156
 msgid "Test Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:224
 msgid "Test Time Limit (min; 0=Close Date)"
 msgstr "Zeitlimit (in Minuten zum Enddatum)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2041
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:238
 msgid "Test Time Notification"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:156
 msgid "Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:244
 msgid "Test not yet submitted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:317
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:920
+msgid "Test parameters"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:149
 msgid "Test/quiz with time limit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:79
 msgid "Text"
 msgstr "Text"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:842
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:80
+msgid "Text Editor Options"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:55
 msgid "Text chapter:"
 msgstr "Kapitel"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:864
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:66
 msgid "Text section:"
 msgstr "Unterkapitel"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:44
 msgid "Textbook:"
 msgstr "Buch"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1403
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:58
+msgid ""
+"The \"Edit Target Set\" button at the top of the page will take you to the "
+"Problem Set Editor which will allow you to edit dates, assign users and "
+"other information about the problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:115
+msgid ""
+"The \"Score\" tab will export achievement data to a CSV file that can be "
+"downloaded.  The export contains the global data including number of "
+"achievement points and current level of each student.  In addition for each "
+"selected achievement, a column for if the achievement was earned (1) or not "
+"earned (0) will be added to the CSV."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:194
+msgid ""
+"The <strong>Assigned sets</strong> column (x/y) indicates that x sets out of"
+" y sets avaiable have been assigned to this student. Click this link to "
+"assign or unassign sets to this student, to adjust due dates, or to adjust "
+"the grades on a homework set for a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:20
+msgid ""
+"The <strong>Set Detail</strong> page can be viewed in one of two distinct "
+"modes:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:189
+msgid ""
+"The <strong>login name</strong> column links allow you to \"act as\" a "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:191
+msgid ""
+"The <strong>pencil</strong> in the login column allows you to edit that "
+"student's data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:64
 msgid ""
 "The Attempts figure is the global average of the number of attempts (both "
 "correct and incorrect) individuals take on this problem.  A high figure may "
@@ -6138,7 +8205,7 @@ msgid ""
 "each part before continuing and each such  submittal counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1485
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:124
 msgid ""
 "The Attempts figure is the local average of the number of attempts (both "
 "correct and incorrect) individuals at your institution take on this problem."
@@ -6148,14 +8215,14 @@ msgid ""
 "counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1819
+#: /opt/webwork/webwork2/conf/defaults.config:1721
 msgid ""
 "The Maximum number of times Show me Another can be used per problem by a "
 "student. If set to -1 then there is no limit to the number of times that "
 "Show Me Another can be used."
 msgstr "Wie oft der eine andere Version der Aufgabe durch einen Studierenden angefordert werden kann. Ist der Wert -1, so ist dies unbegrenzt oft möglich."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1787
+#: /opt/webwork/webwork2/conf/defaults.config:1689
 msgid ""
 "The Reduced Scoring Period is the default period before the due date during "
 "which all additional work done by the student counts at a reduced rate. When"
@@ -6168,7 +8235,7 @@ msgid ""
 "work done counts 50% of the original.\" will be displayed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:78
 msgid ""
 "The Status figure is the global average of the Status individuals have "
 "earned on this problem. The Status is the percentage correct (from 0% to "
@@ -6177,7 +8244,7 @@ msgid ""
 "a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1506
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:138
 msgid ""
 "The Status figure is the local average of the Status individuals at your "
 "institution have earned on this problem. The Status is the percentage "
@@ -6186,47 +8253,61 @@ msgid ""
 "students will work on a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1262
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:11
 msgid "The WeBWorK Project"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:822
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:25
+msgid ""
+"The WeBWorK administrators need to be added to the course in order for them "
+"to access the course.  Unchecking this option will make it so WeBWorK "
+"administrators cannot directly login to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:129
+msgid ""
+"The achievement evaluator is the perl code that is run after each submit to "
+"determine if an achievement is earned or not.  Click on the \"Edit "
+"Evaluator\" link to edit the evaluator."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:26
 msgid ""
 "The adjusted status of a problem is the larger of the problem's status "
 "andthe weighted average of the status of those problems which count towards "
 "the parent grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1677
+#: /opt/webwork/webwork2/conf/defaults.config:1579
 msgid ""
 "The amount of time (in minutes) after the due date that the Answers are "
 "available to student to view.  You can change this for individual homework, "
 "but WeBWorK will use this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1667
+#: /opt/webwork/webwork2/conf/defaults.config:1569
 msgid ""
 "The amount of time (in minutes) before the due date when the assignment is "
 "opened.  You can change this for individual homework, but WeBWorK will use "
 "this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:386
 msgid "The answer above is NOT correct."
 msgstr "Ihre Antwort ist falsch."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:375
 msgid "The answer above is correct."
 msgstr "Ihre Antwort ist richtig."
 
 #. ($filename, $ce->{mail}{maxAttachmentSize})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:230
 msgid ""
 "The attached file \"%1\" exceeds the allowed attachment size of "
 "%quant(%2,megabyte)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:421
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:496
 msgid ""
 "The child problems for this problem will become visible to the student when "
 "they either have more incorrect attempts than is specified here, or when "
@@ -6235,173 +8316,252 @@ msgid ""
 "attempts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:704
+#. ('href="http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files"
+#. target="Webworkdocs"',
+#. '<code>demoCourse.lst</code>','<code>.csv</code>','<code>.lst</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:59
+msgid ""
+"The classlist files are stored in the templates directory and provide a "
+"convenient way to enter a large number of students into your class. To view "
+"the format for <strong>ClassList files</strong> see the <a %1>ClassList "
+"specification</a> or download the %2 file and use it as a model. ClassList "
+"files can be prepared using a spreadsheet and then saved as %3 (comma "
+"separated values) text files.  However, to access as a classlist file, the "
+"file suffix needs to be changed to %4, which can be done with the \"Rename\""
+" button."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:16
 msgid ""
 "The configuration module did not find the data it needs to function.  Have "
-"your site administrator check that Constants.pm is up to date."
+"your site administrator check that site configuration files are up to date."
+msgstr ""
+
+#. ($archive_courseID,					$archive_path)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:80
+msgid ""
+"The course \"%1\" has already been archived at \"%2\". This earlier archive "
+"will be erased.  This cannot be undone."
 msgstr ""
 
-#. (CGI::b($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:151
+#. (tag('strong', stash('courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:8
 msgid ""
 "The course %1 uses an external authentication system (%2). Please go there "
 "to log in again."
 msgstr ""
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:186
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:17
 msgid ""
 "The course %1 uses an external authentication system (%2). Please return to "
 "that system to access this course."
 msgstr ""
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:191
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:23
 msgid ""
 "The course %1 uses an external authentication system (%2). You've "
 "authenticated through that system, but aren't allowed to log in to this "
 "course."
 msgstr ""
 
-#. ($archive_courseID,						$archive_path)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2243
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:30
+msgid "The course database must be upgraded before archiving this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:30
+msgid "The course database must be upgraded before renaming this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:26
+msgid ""
+"The current mode should be made clear by the information at the top of the "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:46
 msgid ""
-"The course '%1' has already been archived at '%2'. This earlier archive will"
-" be erased.  This cannot be undone."
+"The current value of the achievement counter. Changes to this variable will "
+"be saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1995
+#: /opt/webwork/webwork2/conf/defaults.config:1897
 msgid "The default display mode"
 msgstr "Standardanzeige"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1855
+#: /opt/webwork/webwork2/conf/defaults.config:1757
 msgid ""
 "The default number of attempts before the problem is re-randomized. ( 0 => "
 "never )"
 msgstr "Standardmäßige Anzahl an Versuchen bevor die Aufgabe neu randomisiert wird ( 0 => nie )"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1854
+#: /opt/webwork/webwork2/conf/defaults.config:1756
 msgid ""
 "The default number of attempts between re-randomization of the problems ( 0 "
 "=> never)"
 msgstr "Standardmäßige Anzahl an Versuchen bevor die Aufgabe neu randomisiert wird ( 0 => nie )"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:251
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:73
+msgid ""
+"The description shown to students which states what action is needed to earn"
+" the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:5
 msgid "The directory you specified doesn't exist"
 msgstr "Das angegebene Verzeichnis existiert nicht"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1829
-msgid "The display was already cleared."
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:2111
+#: /opt/webwork/webwork2/conf/defaults.config:2032
 msgid ""
 "The e-mail verbosity level controls how much information is automatically "
-"added to feedback e-mails.  Levels are<ol><li value=\"Simple\"> Simple: send"
-" only the feedback comment and context link</li><li value=\"Standard\"> "
-"Standard: as in Simple, plus user, set, problem, and PG data</li><li "
-"value=\"Debug\"> Debug: as in Standard, plus the problem environment "
-"(debugging data)</li></ol>"
-msgstr "Der E-Mail Verbosity Level steuert, wie viel Information die Feedback-E-Mails enthalten. <ol><li value=\"Simple\"> Simple: Nur Kommentare und Kontext Link</li><li value=\"Standard\"> Standard: wie Simple, plus Nutzer, Set, Aufgabe und PG Daten</li><li value=\"Debug\"> Debug: wie Standard, plus Aufgabenumgebung (Debugging Daten)</li></ol>"
+"added to feedback e-mails.  Levels are<ol><li> Simple: send only the "
+"feedback comment and context link</li><li> Standard: as in Simple, plus "
+"user, set, problem, and PG data</li><li> Debug: as in Standard, plus the "
+"problem environment (debugging data)</li></ol>"
+msgstr ""
 
-#. ($achievementName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:625
-msgid "The evaluator for %1 has been renamed to '%2'."
+#. ($achievementName,				$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:293
+msgid "The evaluator for %1 has been renamed to \"%2\"."
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:339
-msgid ""
-"The file %1/%2 already exists and cannot be overwritten. The message was not"
-" saved"
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:246
+msgid "The file \"%1\" cannot be found."
+msgstr ""
+
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:526
+msgid "The file \"%1\" cannot be read!"
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:190
-msgid "The file %1/%2 cannot be found."
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:522
+msgid "The file \"%1\" is a directory!"
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:181
-msgid "The file %1/%2 is not readable by the webserver."
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:259
+msgid "The file \"%1\" is a template. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:373
-msgid "The file '%1' cannot be found."
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:250
+msgid "The file \"%1\" is protected. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1004
-msgid "The file '%1' cannot be read!"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:19
+msgid "The file $file does not appear to be a text or image file."
+msgstr ""
+
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:277
+msgid ""
+"The file %1 already exists and cannot be overwritten. The message was not "
+"saved."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:380
-msgid "The file '%1' is a blank problem!"
+#. ("$emailDirectory/$openfilename",				$emailDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:156
+msgid ""
+"The file %1 cannot be found. Check whether it exists and whether the "
+"directory %2 can be read by the webserver. "
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:998
-msgid "The file '%1' is a directory!"
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
+msgid ""
+"The file %1 is not contained in the course templates directory and can not "
+"be modified."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:375
-msgid "The file '%1' is protected!"
-msgstr "Datei %1 ist geschützt!"
+#. ("$emailDirectory/$openfilename")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:148
+msgid ""
+"The file %1 is not readable by the webserver. Check that it's permissions "
+"are set correctly."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:203
 msgid "The file does not appear to be a text file"
 msgstr " Datei scheint keine Textdatei zu sein"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:88
 msgid "The file you are trying to download doesn't exist"
 msgstr ""
 
 #. ($filename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:221
 msgid "The filetype of the attached file \"%1\" is not allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3843
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2149
 msgid "The following courses were successfully hidden:"
 msgstr "Die folgenden Kurse wurden verborgen:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3908
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2218
 msgid "The following courses were successfully unhidden:"
 msgstr "Die folgenden Kurse wurden sichtbar geschaltet:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4121
-msgid "The following upgrades are available for your WeBWorK system:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:34
+msgid "The following describes how the checkboxes alter the scoring output"
 msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2081
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:66
 msgid ""
 "The following users are NOT assigned to this set and will be ignored: %1"
 msgstr ""
 
-#. (join('.', @{$problemSeqs[$children_counts_indexs[0]]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:288
+msgid "The given file path is not a valid location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:49
+msgid "The goal value of the achievement counter."
+msgstr ""
+
+#. (join('.', @{ $problemSeqs[ $children_counts_indexs[0] ] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1334
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the score of problem %1."
 msgstr ""
 
-#. (join(', ', map({join('.', @{$problemSeqs[$_]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2064
+#. (join(', ', map({ join('.', @{ $problemSeqs[$_] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the weighted average of the problems: %1."
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1954
-msgid "The hardcopy header for set %1 has been renamed to '%2'."
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1078
+msgid "The hardcopy header for set %1 has been renamed to \"%2\"."
+msgstr ""
+
+#. ($showHintsAfter)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:36
+msgid ""
+"The hint shown is an instructor preview and will be shown to students after "
+"%quant(%1,attempt)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:32
+msgid ""
+"The hint shown is an instructor preview and will not be shown to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:22
+msgid ""
+"The information box on the right displays information about the course. This"
+" is useful for leaving course wide messages for students. It contains text "
+"from the file templates/course_info.txt. Instructors can edit this file from"
+" the web (click on the \"Edit\" link)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:111
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:30
 msgid ""
 "The initial value is the answer sub score for the answer that is currently "
 "shown.  If this is modified, it will be used to compute the total problem "
@@ -6409,37 +8569,100 @@ msgid ""
 "shown answer if the page is reloaded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:161
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:97
+msgid ""
+"The initial value is the currently saved score as a point value computed "
+"using the percent score.  This point value is used to compute the percent "
+"score (rounded to a whole percent) that can be saved."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:145
 msgid "The initial value is the currently saved score for this student."
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_oldCourseInstitution,
 #. $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
 msgid ""
 "The institution associated with the course %1 has been changed from %2 to %3"
 msgstr ""
 
-#. ($rename_newCourseID, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1498
+#. ($rename_newCourseID, $optional_arguments{courseInstitution})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:729
 msgid "The institution associated with the course %1 is now %2"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:599
+msgid ""
+"The instructor account with user id %1 does not exist.  Instructor accounts "
+"must be created manually."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:635
 msgid ""
 "The instructor account with user id %1 does not exist.  Please create the "
 "account manually via WeBWorK."
 msgstr ""
 
-#. ($r->param('new_set_name')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1897
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:87
+msgid ""
+"The key maps that are available are \"default\", \"emacs\", \"sublime\", and"
+" \"vim\". The \"default\" key map has the standard behavior of a browser "
+"text area. You can use Ctrl-C to copy, Ctrl-V to paste, Ctrl-F to search, "
+"etc. If you are more comfortable with the \"emacs\", \"sublime\", or \"vim\""
+" text editors then you may choose to use one of those key maps instead."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:75
+msgid "The large text window"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:27
+msgid ""
+"The list of files include regular files, directories (ending in a \"/\") and"
+" links (ending in a \"@\")."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:52
+msgid ""
+"The login name cannot be changed. (It is the primary key for the student's "
+"data.) If you make a mistake in the login name at the beginning of the "
+"course (before any work has been done) then it is best to simply add a new "
+"student with the correct entry and drop the student with the bad login name."
+" (See drop and delete students below.) If the login name must be changed "
+"after a user has started working assignments, then contact your system "
+"administrator, who can use the webwork2 \"bin/change_user_id\" script to "
+"change the user id."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:20
+msgid ""
+"The main page allows access to set and student statistics.  When selecting a"
+" student, their grades page is shown, which lists set totals and per problem"
+" grades for each set assigned to the student.  When selecting a set, various"
+" statistics and histograms are shown for the overall grades of students who "
+"are currently enrolled or auditing the course."
+msgstr ""
+
+#. ('href="http://webwork.maa.org/wiki" target="ww_wiki"',
+#. 'href="http://webwork.maa.org/wiki/Instructors" target="ww_wiki"')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:24
+msgid ""
+"The main page for WeBWorK documentation is the <a %1>webwork wiki</a> while "
+"specific help for instructors setting up a course are in the <a "
+"%2>instructors' section</a>."
+msgstr ""
+
+#. ($c->param('new_set_name')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:569
 msgid ""
 "The name \"%1\" is not a valid set name.  Use only letters, digits, dashes, "
 "underscores, periods, and spaces."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1530
+#: /opt/webwork/webwork2/conf/defaults.config:1432
 msgid ""
 "The name of course information file (located in the templates directory). "
 "Its contents are displayed in the right panel next to the list of homework "
@@ -6456,151 +8679,249 @@ msgid ""
 "go back to the LMS to access something in the WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:63
+msgid "The number of points earned for earning the achievement."
+msgstr ""
+
 #. ($openDate, $dueDate, $answerDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1104
 msgid ""
 "The open date: %1, close date: %2, and answer date: %3 must be defined and "
 "in chronological order."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:702
+#. ($path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:393
+msgid "The original path is not in a valid location. Using failsafe %1"
+msgstr ""
+
+#. ($forcedSourceFile)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:510
+msgid "The original path to the file is %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:262
 msgid "The password and password confirmation for the instructor must match."
 msgstr "Das Passwort muss mit der Passwortbestätigung übereinstimmen."
 
-#. (CGI::b($r->maketext("[_1]'s Current Password", $user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:27
+msgid ""
+"The password can be any combination of letters, numbers and special symbols."
+" Students are encouraged to use all three, and stay away from dictionary "
+"words. The password should not be the same as any password used elsewhere, "
+"such as for an email account. The password will only be present on the page "
+"if the user has permission to change the password."
+msgstr ""
+
+#. ($c->tag(                                               'b',
+#. $c->maketext(                                                   "[_1]'s
+#. Current Password",
+#. $c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:95
 msgid ""
 "The password you entered in the %1 field does not match your current "
 "password. Please retype your current password and try again."
 msgstr ""
 
-#. (CGI::b($r->maketext("[_1]'s New Password",         $e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:105
+#. ($c->tag('b', $c->maketext("[_1]'s New Password",         $e_user_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:82
 msgid ""
 "The passwords you entered in the %1 and %2 fields don't match. Please retype"
 " your new password and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:789
-msgid "The path to the original file should be absolute"
-msgstr "tr: The path to the original file should be absolute"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:374
+msgid "The path can not be the temporary edit directory."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:667
-msgid ""
-"The percentage of active students with correct answers for each problem"
-msgstr "Der Prozentsatz der aktiven Lernenden mit richtigen Antworten für jede Aufgabe"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:370
+msgid "The path to the original file should be absolute."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:131
 msgid ""
 "The percentage of students receiving at least these scores. The median score"
 " is in the 50% column."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:458
 msgid "The prerequisite conditions have not been met for set '%1'."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1917
-msgid "The problem set is not yet open"
-msgstr "Das Set wurde noch nicht zur Bearbeitung geöffnet"
-
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2012
-msgid "The recorded score for this version is  %1/%2."
+#. (q(down menu to change which student's seed and answers are shown.  Use the
+#. "Mark Correct" checkbox to set)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:26
+msgid ""
+"The problem is shown at the top with the seed and answers of the selected "
+"student.  Use the drop "
 msgstr ""
 
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2021
-msgid "The recorded score for this version is %1/%2."
-msgstr ""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:62
+msgid "The problem set is not yet open"
+msgstr "Das Set wurde noch nicht zur Bearbeitung geöffnet"
 
 #. ($origReducedScoringDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1971
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1121
 msgid ""
 "The reduced credit date %1 in the file probably was generated from the Unix "
 "epoch 0 value and is being treated as if it was Unix epoch 0."
 msgstr ""
 
 #. ($openDate, $dueDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1982
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1135
 msgid ""
 "The reduced credit date should be between the open date %1 and close date %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1220
 msgid ""
 "The reduced scoring date should be between the open date and close date."
 msgstr "Das Datum für die Bewertung mit Punktabzug sollte zwischen dem Öffnungsdatum und dem Schließungsdatum liegen."
 
 #. ($tempFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:307
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:298
 msgid "The requested file \"%1\" does not exist on the server."
 msgstr ""
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2085
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1389
 msgid "The score for this problem can count towards score of problem %1."
 msgstr ""
 
-#. ($setName, $effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:306
-msgid "The selected problem set (%1) is not a valid set for %2"
-msgstr "Das ausgewählte Set (%1) is ungültig für %2"
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:69
+msgid ""
+"The scoring files are stored in the scoring directory and are produced using"
+" the \"Scoring Tools\" page or the scoring command in the \"Instructor "
+"Tools\" module. These files can be downloaded, modified in a spreadsheet "
+"(for example, to add midterm scores) and then uploaded again to the scoring "
+"directory to be merged with email messages. (Use a new file name, other than"
+" %1, when uploading to prevent the scoring module from overwriting an "
+"uploaded file.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:52
+msgid ""
+"The second row of the problem collection area is for browsing directories. "
+"The OPL will be there as well as any other directories that you may set up "
+"(for example Contrib). If this is selected, all subdirectories containing "
+"problems will be listed."
+msgstr ""
 
-#. ($urlpath->arg("setID")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1467
-msgid "The selected problem set (%1) is not a valid set for %2%3:"
+#. (stash('setID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet.html.ep:13
+msgid "The selected problem set (%1) is not a valid set for %2."
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1946
-msgid "The set header for set %1 has been renamed to '%2'."
+#. ($setID, $effectiveUserID, $c->{invalidVersionCreation} ? " (acted as by
+#. $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:77
+msgid "The selected problem set (%1) is not a valid set for %2: %3"
+msgstr ""
+
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1066
+msgid "The set header for set %1 has been renamed to \"%2\"."
 msgstr ""
 
-#. ($newSetName)
 #. ($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1164
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:491
+msgid ""
+"The set name \"%1\" is already in use. Pick a different name if you would "
+"like to start a new set. No set created."
+msgstr ""
+
+#. ($newSetName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:584
 msgid ""
 "The set name '%1' is already in use.  Pick a different name if you would "
 "like to start a new set."
 msgstr ""
 
-#. ($setID, $editingSetVersion, $editForUser[0])
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2109
-msgid "The set-version (%1, version %2) is not assigned to user %3."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:58
+msgid ""
+"The sets checked below will be visible to students or hidden from students. "
+"Useful for preparing sets ahead of time, but not showing them to students; "
+"or for temporarily hiding a set which has a mistake in it while it is being "
+"fixed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:54
+msgid ""
+"The sets checked below will become available for editing the due dates and "
+"visibility."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:73
+msgid ""
+"The sets checked below will written to set definition files, to be saved for"
+" future use, or to be transferred to another course. The set definition "
+"files can be uploaded/downloaded using the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:551
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:29
+msgid ""
+"The simple configuration file is the name of the configuration file created "
+"when using the \"Course Configuration\" page to configure course options.  "
+"This option sets if this configuration file is copied from the old course or"
+" not and instead use the server defaults."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:521
 msgid "The solution has been removed."
 msgstr "Lösung wurde entfernt."
 
-#. ($fullSetName, $prettyProblemNumber, $self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1975
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:33
+msgid ""
+"The solution shown is an instructor preview and will only be shown to "
+"students after the due date."
+msgstr ""
+
+#. ($c->{fullSetID},
+#. $c->{prettyProblemNumber},
+#. $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1103
+msgid ""
+"The source file for \"set %1 / problem %2\" has been changed from \"%3\" to "
+"\"%4\"."
+msgstr ""
+
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1209
+msgid ""
+"The temporary file %1 is not contained in the course templates directory and"
+" can not be deleted."
+msgstr ""
+
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:689
 msgid ""
-"The source file for 'set %1 / problem %2 has been changed from '%3' to '%4'"
+"The temporary file %1 is not in the course templates directory and can not "
+"be deleted!"
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2133
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:349
 msgid ""
 "The test (which is version %1) may  no longer be submitted for a grade."
 msgstr "Dieser Test (Version %1) kann nicht mehr zur Bewertung eingereicht werden."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1927
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1042
 msgid ""
 "The text box now contains the source of the original problem. You can "
 "recover lost edits by using the Back button on your browser."
 msgstr "Die Aufgabe enthält nun den Quellcode der ursprünglichen Aufgabe. Sie können verlorene Änderungen wiederherstellen, indem Sie die Schaltfläche \"Zurück\" in Ihrem Browser verwenden."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:214
+#. (			% . 'but the result will not be counted.')
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:23
 msgid ""
 "The time limit on this assignment was exceeded. The assignment may be "
-"checked, but the result will not be counted."
+"checked, "
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1657
+#: /opt/webwork/webwork2/conf/defaults.config:1559
 msgid ""
 "The time of the day that the assignment is due.  This can be changed on an "
 "individual basis, but WeBWorK will use this value for default when a set is "
@@ -6608,24 +8929,39 @@ msgid ""
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1443
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:689
 msgid "The title of the course %1 has been changed from %2 to %3"
 msgstr "Titel des Kurses %1 wurde geändert von %2 auf %3"
 
-#. ($rename_newCourseID, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1491
+#. ($rename_newCourseID, $optional_arguments{courseTitle})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:722
 msgid "The title of the course %1 is now %2"
 msgstr "Neuer Titel des Kurses %1 lautet %2"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:167
+msgid ""
+"The top number is the percent score on the problem.  A period (.) indicates "
+"a problem has not been attempted. The bottom number is the number of "
+"incorrect attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:25
+msgid ""
+"The total grade row at the bottom shows the total score and percent average "
+"over all open assignments.  The total grade row can be shown/hidden under "
+"general course configuration settings."
+msgstr ""
+
 #. ($enableReducedScoring)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1151
 msgid ""
 "The value %1 for enableReducedScoring is not valid; it will be replaced with"
 " 'N'."
 msgstr "Der Eintrag %1 für das Datum für die Bewertung mit Punktabzug ist ungültig; er wird durch 'N' ersetzt."
 
 #. ($timeCap)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2032
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1209
 msgid ""
 "The value %1 for the capTimeLimit option is not valid; it will be replaced "
 "with '0'."
@@ -6633,81 +8969,90 @@ msgstr ""
 
 #. ($hideScore)
 #. ($hideScoreByProblem)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2023
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1178
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1189
 msgid ""
 "The value %1 for the hideScore option is not valid; it will be replaced with"
 " 'N'."
 msgstr ""
 
 #. ($hideWork)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1200
 msgid ""
 "The value %1 for the hideWork option is not valid; it will be replaced with "
 "'N'."
 msgstr ""
 
 #. ($relaxRestrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2045
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1235
 msgid ""
 "The value %1 for the relaxRestrictIP option is not valid; it will be "
 "replaced with 'No'."
 msgstr ""
 
 #. ($restrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2037
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1221
 msgid ""
 "The value %1 for the restrictIP option is not valid; it will be replaced "
 "with 'No'."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:46
+msgid "The visible name/title of the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:36
 msgid ""
 "The webwork server must be able to write to these directories. Please "
 "correct the permssion errors."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1537
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:83
+msgid "Theme"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1439
 msgid "Theme (refresh page after saving changes to reveal new theme.)"
 msgstr "Design (Änderungen werden nach dem Speichern und Aktualisieren der Seite aktiv)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:109
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:5
 msgid "Theme:"
 msgstr ""
 
 # Context is "Sort by ____ Then by _____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:843
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:872
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:30
 msgid "Then by"
 msgstr "Dann nach:"
 
-#. ($count_line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:603
+#. ($listingsCount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:52
 msgid "There are %1 matching WeBWorK problems"
 msgstr "%quant(%1,Aufgabe erfüllt,Aufgaben erfüllen) die angegebenen Kriterien"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1625
+#: /opt/webwork/webwork2/conf/defaults.config:1527
 msgid ""
 "There are currently two hardcopy themes to choose from: One Column and Two "
 "Columns.  The Two Columns theme is the traditional hardcopy format.  The One"
 " Column theme uses the full page width for each column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2979
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1519
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
 "least one table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1243
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:23
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
-"least one table.  They can only be removed when upgrading the course."
+"least one table.  They can be removed when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1404
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
 "least one table. Check the checkbox by the field to delete it when upgrading"
@@ -6715,63 +9060,48 @@ msgid ""
 "is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1508
 msgid "There are extra database tables which are not defined in the schema."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2833
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1389
 msgid "There are extra database tables which are not defined in the schema. "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:15
 msgid ""
 "There are extra database tables which are not defined in the schema.  These "
 "can be deleted when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:601
-msgid "There are no matching WeBWorK problems"
-msgstr "Es gibt keine passenden WeBWorK Aufgaben"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:976
-msgid "There are no set definition files in this course to look at."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2199
-msgid ""
-"There are tables or fields missing from the database.  The database must be "
-"upgraded before archiving this course."
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:29
+msgid "There are many options available at the bottom:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4108
-msgid "There are upgrades available for the Open Problem Library."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:49
+msgid "There are no completed versions of this test."
 msgstr ""
 
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4072
-msgid ""
-"There are upgrades available for your current branch of PG from branch %1 in"
-" remote %2."
-msgstr ""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:51
+msgid "There are no matching WeBWorK problems"
+msgstr "Es gibt keine passenden WeBWorK Aufgaben"
 
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4010
-msgid ""
-"There are upgrades available for your current branch of WeBWorK from branch "
-"%1 in remote %2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:8
+msgid "There are no set definition files in this course to look at."
 msgstr ""
 
 #. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:273
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:87
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
 "their name, you destroy all of the data for achievement %1 for this student."
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:230
+#. (tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:91
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
@@ -6779,37 +9109,29 @@ msgid ""
 "student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:205
-msgid ""
-"There is NO undo for this function.  Do not use it unless you know what you "
-"are doing!  When you unassign sets using this button, or by unchecking their"
-" set names, you destroy all of the data for those sets for this student."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:234
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:68
 msgid "There is NO undo for unassigning a set."
 msgstr "Diese Aktion kann nicht rückgängig gemacht werden."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:174
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:177
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:125
+msgid ""
+"There is NO undo for unassigning sets. Do not do so unless you know what you"
+" are doing!  When you unassign sets by unchecking set names and clicking "
+"save, you destroy all of the data for those sets for this student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:21
 msgid "There is NO undo for unassigning students."
 msgstr "Die Aktion \"Studierende austragen\" kann NICHT rückgängig gemacht werden."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4069
-msgid "There is a new version of PG available."
-msgstr "Eine neue Version von PG ist verfügbar."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4007
-msgid "There is a new version of WeBWorK available."
-msgstr "Eine neue Version von WeBWorK ist verfügbar."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:529
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:490
 msgid "There is a written solution available."
 msgstr "Schriftliche Lösung verfügbar."
 
 #. ($message_file, $merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:50
 msgid ""
 "There is no additional grade information.  A message about additional grades"
 " can go in [TMPL]/email/%1. It is merged with the file [Scoring]/%2. These "
@@ -6818,185 +9140,324 @@ msgid ""
 msgstr ""
 
 #. ($continueTimeLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:486
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:25
 msgid ""
 "There is no time remaining on the currently open test. Click continue below "
 "and then click \"Grade Test\" within %1 seconds to submit the test for a "
 "grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:856
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:65
 msgid "There is no undo for deleting files or directories!"
 msgstr "Diese Aktion kann nicht rückgängig gemacht werden!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:534
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:495
 msgid ""
 "There is no written solution available for this problem, but you can still "
 "view the correct answers."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:537
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:498
 msgid "There is no written solution available for this problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1539
+#: /opt/webwork/webwork2/conf/defaults.config:1441
 msgid ""
-"There is one main theme to choose from: math4. It has two variants, "
-"math4-green and math4-red. The theme specifies a unified look and feel for "
-"the WeBWorK course web pages."
+"There is one main theme to choose from: math4. It has three variants: "
+"math4-green, math4-red, and math4-yellow. The theme specifies a unified look"
+" and feel for the WeBWorK course web pages."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2270
-msgid ""
-"There may be something wrong with this question. Please inform your "
-"instructor including the warning messages below."
-msgstr "Bei dieser Aufgabe ist möglicherweise ein technisches Problem aufgetreten. Bitte informieren Sie Ihren Dozenten und fügen Sie die unten aufgeführen Warnungen hinzu."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:441
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator if this recurs."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:284
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:307
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:475
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:484
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:511
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:543
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:219
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:354
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:492
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:536
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:575
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:172
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:189
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:212
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:227
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:365
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:447
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1935
+#. ('href="https://webwork.maa.org/wiki/Set_Definition_Files"
+#. target="Webworkdocs"')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:48
+msgid ""
+"These are stored in the templates directory. The format of <strong>Set "
+"Definition files</strong> is described in the <a %1>Set Definition "
+"specification</a>. Set definition files are mainly useful for transferring "
+"set assignments from one course to another and are created when exporting a "
+"problem set from the \"Hmwk Sets Editor\".  Each set defintion file contains"
+" a list of problems used and the dates and times. These definitions can be "
+"imported into the current course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:77
+msgid ""
+"These are the files from which problems are generated and are located in the"
+" templates directory or in subdirectories. They can be edited directly using"
+" the \"Edit\" link on each problem page or from the \"Hmwk Sets Editor\". "
+"The File Manager allows you to upload or download these files. \tDirectories"
+" that start with \"set\" contain pg files and are generated when exporting a"
+" problem set in which there are local versions of a problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:40
+msgid ""
+"These options will only be shown if the user has the permission to change "
+"display settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:44
+msgid ""
+"These problems require some application of algorithms, but do not rise to "
+"the level of a full word problem. For example, \"Identify the local extrema "
+"for f(x) = ...\". One has to apply algorithms and interpret results."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1837
 msgid ""
 "These users and higher get the \"Show Past Answers\" button on the problem "
 "page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:17
 msgid "This action can take a long time if there are many students."
 msgstr "Diese Aktion kann eine lange Zeit in Anspruch nehmen."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:168
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:12
 msgid "This action will not overwrite existing users."
 msgstr ""
 
-#. (CGI::b($r->maketext("Guest Login")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:279
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:20
 msgid ""
-"This course supports guest logins. Click %1 to log into this course as a "
-"guest."
-msgstr "Dieser Kurs unterstützt Gastanmeldungen. Klicken Sie %1, um sich als Gast anzumelden."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:851
-msgid "This homework set contains no problems."
-msgstr "Dieses Set enhält keine Aufgaben."
+"This allows for the viewing, downloading, uploading and other management of "
+"files in the course.  Select a file or set of files (using CTRL or SHIFT) "
+"and click the desired button on the right.  Many actions can only be done "
+"with a single file (like view). Selecting a directory or set of files and "
+"clicking \"Make Archive\" creates a compressed tar file with the name "
+"COURSE_NAME.tgz"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1988
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:34
+msgid ""
+"This browses the Open Problem Library (OPL) in category "
+"(Subject/Chapter/Section) form. Select the desired categories (all three do "
+"not need to be selected) and click \"View Problems\". If the \"Include "
+"Contrib\" box is selected then those problems in the Contrib section of the "
+"OPL that have the categories defined are also included. Contrib problems are"
+" problem that haven't been vetted as thoroughly as OPL problems. If you want"
+" hints or solutions included while browsing select the appropriate box."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:49
+msgid ""
+"This button is also present both at top and the bottom of the page. Discards"
+" all changes, reloading the page by re-reading the database information for "
+"this set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:39
+msgid ""
+"This button is present both at top and the bottom of the page. Any and all "
+"changes made to any part of the set will be saved with one important "
+"exception: When editing the set for one or more students, you can choose to "
+"override the default value (defined for the set in general) by clicking on "
+"the checkbox and providing a value (or possibly leaving blank) and checking "
+"the override checkbox. If you do <strong>NOT</strong> check the checkbox, "
+"the override value will be discarded and the default value for the set will "
+"be used for the users currently being edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:105
+msgid ""
+"This can computed from the answer sub scores above using the weights shown "
+"if they are modified.  Alternatively, enter the point score you want saved "
+"here (the above sub scores will be ignored)."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2005
+msgid ""
+"This configures if the single problem manual grader has inputs to enter "
+"problem scores as a percent, a point value, or both. Note, the problem score"
+" is always saved as a percent, so when using a point value, the problem "
+"score will be rounded to the nearest whole percent."
+msgstr ""
+
+#. (tag('b', maketext('Guest Login')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:72
+msgid ""
+"This course supports guest logins. Click %1 to log into this course as a "
+"guest."
+msgstr "Dieser Kurs unterstützt Gastanmeldungen. Klicken Sie %1, um sich als Gast anzumelden."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:58
+msgid ""
+"This determines if MathQuill answer blanks are enable for the user. This "
+"option is only present if MathQuill is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:63
+msgid ""
+"This determines if the MathView equation editor button will be appended to "
+"text answer blanks. his option is only present if MathView is enabled for "
+"the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:52
+msgid ""
+"This determines whether or not saved past answers are automatically filled "
+"in to the problem form when a student returns to a problem after having left"
+" the problem. This option is only visible if the user has the permission to "
+"show old answers."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:85
+msgid ""
+"This directory is accessible from the web. You can use it to store html "
+"documents or image documents that are used by the course. Do not store "
+"private information in this directory or in any subdirectory thereof. These "
+"documents can be linked to from within problems using the htmlLink macro."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:255
+msgid "This file is a template. You may use \"Save As\" to create a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:20
+msgid ""
+"This form can assign, unassign, and edit user data for a single achievement."
+"  You can assign the achievement to all current users or select which users "
+"to assign the achievement to and click Save.  You can unassign the "
+"achievement by unchecking a student's name (note all data will be deleted)."
+"  To unassign the achievement from all users, first select \"Allow "
+"unassign\" and then click the \"Unassign from All Users\" button. You can "
+"also toggle the earned status with the checkbox in the \"Earned\" column and"
+" edit the achievement counter for counting achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:19
+msgid ""
+"This gives the status and dates of the main set. Indvidual students may have"
+" different settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:51
+msgid "This homework set contains no problems."
+msgstr "Dieses Set enhält keine Aufgaben."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1231
 msgid "This homework set is closed."
 msgstr "Der Bearbeitungszeitraum für dieses Set ist abgelaufen."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1986
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1229
 msgid "This homework set is not yet open."
 msgstr "Dieses Set ist noch nicht verfügbar."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:932
-msgid ""
-"This is a blank problem template file and can not be edited directly. Use "
-"the 'NewVersion' action below to create a local copy of the file and add it "
-"to the current problem set."
-msgstr ""
-
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:423
 msgid "This is a new (re-randomized) version of the problem."
 msgstr "Dies is eine neu randomisierte Version der Aufgabe."
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:580
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:109
 msgid ""
 "This is a timed test. You will have %quant(%1,hour) and %quant(%2,minute) to"
 " complete the test."
 msgstr ""
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:592
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:119
 msgid ""
 "This is a timed test. You will have "
 "%quant(%1,hour,hours,)%quant(%2,minute,minutes,) to complete the test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:284
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:81
+msgid ""
+"This is done by first entering the user as a student and then changing the "
+"permission level of the user. First edit the user by clicking on the pencil "
+"next to their name (or using the technique above for several users), then "
+"change their permssion level -- an entry blank at the far right of the "
+"screen, you may have to scroll to see it. The permission levels are"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:156
+msgid ""
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page if you wish to assign a homework set to all students or a large group "
+"of students (e.g. a section)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:161
+msgid ""
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:171
+msgid ""
+"This is done from the \"Hmwk Sets Editor\" page or the \"Instructor tools\" "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:71
+msgid ""
+"This is most easily done by importing a class list. The class list can be "
+"uploaded from your workstation to the server using the File Manager page. "
+"The class list must be a file ending in .lst and must have a specific <a "
+"href=\"http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files\">format</a>."
+" Once the file has been uploaded to the server the file will appear in the "
+"import action pop-up list (5th action). demoCourse.lst is available for most"
+" courses and adds the \"practice users\" which activate guest logins to the "
+"class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:23
 msgid ""
-"This is the Achievement Editor.  It is used to edit the achievements "
-"available to students.  Please keep in mind the following facts: Achievments"
-" are displayed, and evaluated, in the order they are listed. The \"secret\" "
-"category creates achievements which are not visible to students until they "
-"are earned.  The \"level\" category is used for the achievements associated "
-"to a users level."
+"This is the administration course which is used to manage courses on this "
+"server.  Use the \"Admin Menu\" to select the desired action."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:481
+#: /opt/webwork/webwork2/conf/defaults.config:1996
 msgid ""
-"This is the classlist editor page, where you can view and edit the records "
-"of all the students currently enrolled in this course.  The top of the page "
-"contains forms which allow you to filter which students to view, sort your "
-"students in a chosen order, edit student records, give new passwords to "
-"students, import/export student records from/to external files, or "
-"add/delete students.  To use, please select the action you would like to "
-"perform, enter in the relevant information in the fields below, and hit the "
-"\"Take Action!\" button at the bottom of the form.  The bottom of the page "
-"contains a table containing the student usernames and their information. "
-"Clicking on the links in the column headers of the table will sort the table"
-" by the field it corresponds to. The Login Name fields contain checkboxes "
-"for selecting the user.  Clicking the link of the name itself will allow you"
-" to act as the selected user.  There is also an edit link following the name"
-" which will take you to a page where you can edit the selected user's "
-"information.  Clicking the emails will allow you to email the corresponding "
-"user.  Clicking the links in the entries in the assigned sets columns will "
-"take you to a page where you can view and reassign the sets for the selected"
-" user. "
+"This is the default number of attempts a student must make before hints will"
+" be shown to the student. Set this to -1 to hide hints.  Note that this can "
+"be overridden with a per problem setting."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1810
+#: /opt/webwork/webwork2/conf/defaults.config:1712
 msgid ""
 "This is the default number of attempts before show me another becomes "
 "available to students.  It can be set to -1 to disable show me another by "
 "default."
 msgstr "Nach dieser Anzahl an Versuchen wird der Knopf zum Anfordern einer neuen Version der Aufgabe für Studierende verfügbar. Bei einem Wert von -1 ist der Knopf standardmäßig deaktiviert. "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:456
-msgid ""
-"This is the homework sets editor page where you can view and edit the "
-"homework sets that exist in this course and the problems that they contain. "
-"The top of the page contains forms which allow you to filter which sets to "
-"display in the table, sort the sets in a chosen order, edit homework sets, "
-"publish homework sets, import/export sets from/to an external file, score "
-"sets, or create/delete sets.  To use, please select the action you would "
-"like to perform, enter in the relevant information in the fields below, and "
-"hit the \"Take Action!\" button at the bottom of the form.  The bottom of "
-"the page contains a table displaying the sets and several pieces of relevant"
-" information. The Edit Set Data field in the table contains checkboxes for "
-"selection and a link to the set data editing page.  The cells in the Edit "
-"Problems fields contain links which take you to a page where you can edit "
-"the containing problems, and the cells in the edit assigned users field "
-"contains links which take you to a page where you can edit what students the"
-" set is assigned to."
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:1699
+#: /opt/webwork/webwork2/conf/defaults.config:1601
 msgid ""
 "This is the number of achievement points given to each user for completing a"
 " problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:166
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:150
 msgid ""
 "This is the only part of the score that is actually saved. This is computed "
 "from the answer sub scores above using the weights shown if they are "
@@ -7004,142 +9465,314 @@ msgid ""
 " scores will be ignored)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:388
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:19
+msgid "This is the standard entry point for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:92
+msgid ""
+"This is where email messages and templates are saved. You can upload or "
+"download files in this directory if you wish to save the files for later."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:77
 msgid ""
-"This is the past answer viewer.  Students can only see their answers, and "
-"they will not be able to see which parts are correct.  Instructors can view "
-"any users answers using the form below and the answers will be colored "
-"according to correctness."
+"This is where you edit the text of the problem template. Type Ctrl-Enter "
+"while this window has focus to re-render the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2462
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:669
 msgid ""
 "This is your last submission.  If you say yes, then your answers will be "
 "final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2466
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:673
 msgid ""
 "This is your only submission.  If you say yes, then your answers will be "
 "final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3038
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:42
+msgid ""
+"This link gives details for many macros. It links to documentation embedded "
+"in the macro files themselves."
+msgstr ""
+
+#. ('PGMLLab/PGML-lab.pg')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:63
+msgid ""
+"This links to a WeBWorK \"problem\" which allows you to try out fragments of"
+" PGML code. This link will not be available if the file %1 is not located in"
+" the templates directory of the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:33
+msgid "This links to a list of problem authoring techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:39
+msgid "This links to a page describing Math Object usage."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:72
+msgid "This links to problem authoring information on the WeBWorK wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:46
+msgid ""
+"This may be Mathjax, images, or plainText. Only the options that are enabled"
+" for the course will be available to select. This option is only visible if "
+"there is more than one display mode enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:42
+msgid "This option shows all pg problems in the course directory structure."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:47
+msgid ""
+"This option shows all problems in set definition files that are located in "
+"the course directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:44
+msgid ""
+"This option shows all problems in sets that have been created in the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:20
+msgid ""
+"This page allows one to edit the contents of PG problem files as well as set"
+" headers and other files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:20
+msgid ""
+"This page allows users to change their password, email address, and display "
+"settings used in problems. Note that you can hide this page entirely for "
+"students by setting permission levels to login_proctor or higher for the "
+"permissions to change password, change e-mail address, and change display "
+"settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:20
+msgid ""
+"This page allows you to configure course settings such as permission levels,"
+" display modes allowed, default display mode, email feedback behavior, and "
+"much more."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:20
+msgid ""
+"This page displays a student's current achievement level and progress toward"
+" the next level, and lists the rewards and badges that the student has "
+"earned. If rewards have been earned, then the student may also redeem those "
+"rewards."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:26
+msgid ""
+"This page gives access to information about the student, independent of the "
+"homework sets assigned to them."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:20
+msgid ""
+"This page gives information about mass LTI grade updates, and allows you to "
+"trigger a grade update for all users and all sets, all sets for one user, "
+"all users for one set, or one user for one set.  When a user is selected, "
+"the sets drop down menu is updated to only allow selecting sets assigned the"
+" selected user.  Similarly when a set is selected, the user menu is updated "
+"to only allow selecting valid users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:20
+msgid ""
+"This page is a collection of tools to modify users and sets.  These tools "
+"are short cuts for common actions that allow selecting multiple users or "
+"sets to act on at once.  Because multiple users and sets can be acted on at "
+"the same time, it is often more efficient to use this page when modifying "
+"multiple items.  For example, after selecting several users and a set you "
+"can change the close date for all selected users for that set.  This page "
+"also gives access to \"View/Edit all sets for one user\", which can be used "
+"to access settings for all sets including test versions for that user."
+msgstr ""
+
+#. (q(table to save any changes.  Each student's name links to that student's
+#. problem and opens up the)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:20
+msgid ""
+"This page is for manually grading a problem for all assigned students.  The "
+"table of students shows their last answers, percent score, and feedback "
+"comment.  The \"Save\" button is located below the "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:20
+msgid ""
+"This page is used to browse problems that will be used to fill problem sets."
+" The first step is to choose which set you are working on. If you need to "
+"create a new problem set fill in the blank next to the \"Create a New Set in"
+" This Course\" button and then press the button. Then choose which set you "
+"want to work on in the drop down menu."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:20
+msgid ""
+"This page is useful for monitoring student progress on assignments. Student "
+"progress can either be viewed for a single set or for a single student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:20
+msgid ""
+"This page manages all of the homework sets (including quizzes/tests). The "
+"following allow editing directly of a single problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:20
+msgid ""
+"This page shows the student's current grades for all sets they are assigned "
+"to.  Only visible sets are shown to the student, while invisible set names "
+"are italic when viewed as an instructor.  Students can only see the per "
+"problem grades on open assignments."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3169
 msgid "This problem contains a video which must be viewed online."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:602
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:631
 msgid "This problem has more than one part."
 msgstr "Diese Aufgabe besteht aus mehreren Teilen."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2059
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2293
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1323
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1576
 msgid ""
 "This problem has open subproblems.  You can visit them by using the links to"
 " the left or visiting the set page."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem.html.ep:66
+msgid "This problem is not valid."
+msgstr ""
+
 #. ($prettyID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2619
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:399
 msgid "This problem uses the same source file as number %1."
 msgstr "Diese Aufgabe nutzt die gleiche Quelldatei wie Aufgabe %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:418
 msgid "This problem will not count towards your grade."
 msgstr ""
 
-#. ($EMAIL)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1109
+#. ($ur->email_address)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:1
 msgid "This sample mail would be sent to %1"
 msgstr ""
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2088
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1399
 msgid ""
 "This score for this problem does not count for the score of problem %1 or "
 "for the set."
 msgstr ""
 
-#. ($message_file,		$merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:167
+#. ($message_file,				$merge_file)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:127
 msgid ""
 "This scoring message is generated from [TMPL]/email/%1. It is merged with "
 "the file [Scoring]/%2. These files can be edited using the \"Email\" link "
 "and the \"File Manager\" link in the left margin."
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2215
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:155
 msgid "This set %1 is assigned to %2."
 msgstr "Set (%1) wurde %2 zugewiesen."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2932
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:678
 msgid "This set doesn't contain any problems yet."
 msgstr "Dieses Set entählt noch keine Aufgaben."
 
-#. ($beginReducedScoringPeriod, $dueDate, $reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:334
+#. ($c->formatDateTime($reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:44
 msgid ""
 "This set had a reduced scoring period that started on %1 and ended on %2.  "
 "During that period all work counted for %3% of its value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:78
 msgid ""
 "This set has a set-level proctor password to authorize logins. Enter the "
 "password below."
 msgstr ""
 
-#. (CGI::span({class=>$visiblityStateClass}, $visiblityStateText)
-# Context is "This set is visible" or "This set is hidden"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:532
-msgid "This set is %1"
-msgstr "Dieses Set ist %1"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:411
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:59
 msgid "This set is hidden from students."
 msgstr "Dieses Set ist für Studierende unsichtbar."
 
 #. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:330
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:40
 msgid ""
 "This set is in its reduced scoring period.  All work counts for %1% of its "
 "value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:65
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:51
+msgid "This set is not assigned to any students."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:57
 msgid "This set is visible to students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:190
-msgid "This set needs to be assigned to you before you can grade it."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:42
+msgid "This set or problem is not valid."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:158
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:164
 msgid ""
 "This set will be unavailable to students until they have earned a certain "
-"score on the sets specified in this field.  The sets should be written as a "
-"comma separated list.  The minimum score required on the sets is specified "
-"in the following field."
+"score on the sets specified in this field. The sets should be written as a "
+"comma separated list. The minimum score required on the sets is specified in"
+" the following field."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2007
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:111
+msgid ""
+"This should be done cautiously. Once a student is deleted from a course "
+"their data is lost forever and cannot be recovered. They can be added to the"
+" course as a new student, but all of their homework set assignments and "
+"homework has been permanently deleted."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1962
 msgid "This source file does not exist!"
 msgstr "Datei existiert nicht!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1961
 msgid "This source file is a directory!"
 msgstr "Datei ist ein Verzeichnis!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1963
 msgid "This source file is not a plain file!"
 msgstr "Datei ist keine Textdatei!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2005
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1960
 msgid "This source file is not readable!"
 msgstr "Datei kann nicht gelesen werden!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:358
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+msgid ""
+"This specifies the number of attempts before hints are shown to students. "
+"The value of -2 uses the default from course configuration. The value of -1 "
+"disables hints. Note that this will only have an effect if the problem has a"
+" hint."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
 msgid ""
 "This specifies the rerandomization period: the number of attempts before a "
 "new version of the problem is generated by changing the Seed value. The "
@@ -7147,134 +9780,175 @@ msgid ""
 "disables rerandomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:651
-msgid ""
-"This table lists the current attempts for this test/quiz, along with its "
-"status, score, start date, and close date. Click on the version link to "
-"access that version. "
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:626
-msgid "This test is closed."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:548
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:81
 msgid "This test requires a proctor password to continue."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:600
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:126
 msgid "This test requires a proctor password to start."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2248
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2323
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:45
+msgid "This will determine if the output is in one or two columns."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:21
 msgid "Time"
 msgstr "Zeit"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:249
 msgid "Time Interval for New Test Versions (min; 0=infty)"
 msgstr ""
 
-#. ($elapsedTime,$allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:159
+msgid "Time Remaining"
+msgstr ""
+
+#. ($c->{elapsedTime}, sprintf('%.0f', 10 * ($c->{set}->due_date -
+#. $c->{set}->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:336
 msgid "Time taken on test: %1 min (%2 min allowed)."
 msgstr "Benötigte Zeit: %1 min (%2 min erlaubt)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
 msgid "Timestamp"
 msgstr "Zeitstempel"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1610
+#: /opt/webwork/webwork2/conf/defaults.config:1512
 msgid "Timezone for the course"
 msgstr "Zeitzone des Kurses"
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:512
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:330
 msgid "To access this set you must score at least %1% on set %2."
 msgstr ""
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:514
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:336
 msgid ""
 "To access this set you must score at least %1% on the following sets: %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:53
 msgid ""
 "To add an additional instructor to the new course, specify user information "
 "below. The user ID may contain only numbers, letters, hyphens, periods "
 "(dots), commas,and underscores."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:42
 msgid ""
 "To add the WeBWorK administrators to the new course (as administrators) "
 "check the box below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:239
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:118
+msgid ""
+"To assign one or more sets to an individual student click in the column "
+"\"Assigned Sets\" in the student's row. This will take you to a page where "
+"you can assign and unassign homework sets and change the due dates for "
+"homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:79
 msgid ""
 "To change status (scores or grades) for this student for one set, click on "
 "the individual set link."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:621
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:106
 msgid ""
-"To copy problem templates from an existing course, select the course below."
-msgstr "Um Aufgaben-Vorlagen aus einem existierenden Kurs zu kopieren, wählen Sie den Kurs unten aus."
+"To copy the templates and html folders from an existing course, select the "
+"course below."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2200
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:102
+msgid ""
+"To drop a student or students, select them for editing as described above "
+"and then set the pop-up list to enrolled,drop, or audit. Dropped students "
+"cannot log in to the course, are not assigned new homework sets and are not "
+"sent e-mail. They can be re-enrolled simply by changing their status back to"
+" enrolled. No data is lost, any homework sets assigned before they were "
+"dropped are restored unchanged."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:143
 msgid ""
 "To edit a specific student version of this set, edit (all of) her/his "
 "assigned sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:376
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:29
 msgid ""
-"To edit this text you must first make a copy of this file using the "
-"'NewVersion' action below."
-msgstr "Um diese Aufgabe zu bearbeiten müssen Sie eine Kopie dieser Datei über  \"Neue Version\" anlegen."
+"To perform an action select the desired action tab and click the submit "
+"button."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:381
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:90
+msgid "To this Problem"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:69
 msgid ""
-"To edit this text you must use the 'NewVersion' action below to save it to "
-"another file."
-msgstr "Um diese Aufgabe zu bearbeiten müssen Sie eine Kopie dieser Datei mit einem anderen Namen über \"Neue Version\" anlegen."
+"To use the Email merge feature, upload a CSV with calculated grades to the "
+"scoring directory using the \"File Manager\"."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1343
-msgid "To this Problem"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:767
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:58
+msgid "Today"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:33
+msgid "Toggle each of the options to include or not include in the output."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:522
+msgid "Top Score"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:118
+msgid "Top level of author information on the wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:114
+msgid "Total Points"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:18
 msgid "Total Points:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:90
 msgid "Totals"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:290
 msgid "Totals only (not problem scores)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:291
 msgid "Totals only, only after answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:236
 msgid "Transfer"
 msgstr "Übertragen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:284
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:22
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:35
 msgid "True"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1279
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:245
 msgid "Try it"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:26
 msgid "Tunic of Extension"
 msgstr ""
 
@@ -7282,209 +9956,340 @@ msgstr ""
 msgid "Two Columns"
 msgstr "Zweispaltig"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1470
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:30
 msgid "Type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2325
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:84
+msgid "Type:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:23
 msgid "URI"
 msgstr ""
 
 #. ($achievementName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:297
 msgid "Unable to change the evaluator for set %1. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:819
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1084
+msgid "Unable to change the hardcopy header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1070
+msgid "Unable to change the set header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{fullSetID}, $c->{prettyProblemNumber})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1110
+msgid ""
+"Unable to change the source file path for set %1, problem %2. Unknown error."
+msgstr ""
+
+#. ($c->shortPath($delFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1246
+msgid "Unable to delete backup file \"%1\"."
+msgstr ""
+
+#. ($formatBackupTime)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:571
+msgid "Unable to delete backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:888
+msgid "Unable to make \"%1\" the hardcopy header for %2."
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:860
+msgid "Unable to make \"%1\" the set header for %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:693
 msgid "Unable to obtain error messages from within the PG question."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:384
-msgid "Unable to write to '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:275
+msgid "Unable to open a temporary file at the given location."
+msgstr ""
+
+#. ($c->shortPath($backupFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1233
+msgid "Unable to read backup file \"%1\"."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:636
+msgid "Unable to write to \"%1\": %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2613
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:15
 msgid "Unarchive"
 msgstr ""
 
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2596
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:4
 msgid "Unarchive %1 to course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2581
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:40
 msgid "Unarchive Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2675
-msgid "Unarchive Next Course"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:17
+msgid "Unarchive Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:25
+msgid "Unarchive Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:214
-msgid "Unassign All Sets"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1306
+msgid "Unarchive Next Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:281
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:239
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:97
 msgid "Unassign from All Users"
 msgstr "Alle Nutzer austragen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:61
 msgid "Unassign selected sets from selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:58
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:57
 msgid ""
-"Unassignments were not done.  You need to both click to \"Allow unassign\" "
-"and click on the Unassign button."
+"Unassignments were not done.  You need to select \"Allow unassign\" and then"
+" click on the Unassign button."
 msgstr ""
 
 #. ($unattempted, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1047
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:44
 msgid "Unattempted: %1/%2"
 msgstr "Nicht bearbetet: %1/%2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:53
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:37
 msgid "Unclassified Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:242
 msgid "Ungraded"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3723
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3765
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:58
 msgid "Unhide Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1465
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1151
+msgid "Unkown saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:28
 msgid ""
-"Unlock an additional version of a Gateway Test.  If used before the close "
-"date of the Gateway Test this will allow you to generate a new version of "
-"the test."
+"Unlock an additional version of a test.  If used before the close date of "
+"the test this will allow you to generate a new version of the test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:164
-msgid "Unpack"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:47
+msgid "Unpack Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:113
 msgid "Unpack archives automatically"
 msgstr "Archivdateien automatisch entpacken"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2709
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:15
 msgid "Unselect all courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:130
-msgid "Update"
-msgstr "Aktualisieren"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:63
 msgid "Update Display"
 msgstr "Anzeige aktualisieren"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:930
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:84
+msgid "Update Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:27
+msgid "Update Interval"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:102
 msgid "Update Menus"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:729
-msgid "Update settings and refresh page"
-msgstr "Einstellungen und Seite aktualisieren"
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:51
+msgid "Update aborted. Invalid set %1."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2695
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:47
+msgid "Update aborted. Invalid user %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:67
+msgid "Update set:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:8
 msgid "Update the checked directories?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3544
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:50
+msgid "Update user:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1908
 msgid "Updated location description."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2739
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2917
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:40
 msgid "Upgrade"
 msgstr ""
 
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
 msgid "Upgrade %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1327
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2278
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:97
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:79
 msgid "Upgrade Course Tables"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2693
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2761
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:382
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:42
 msgid "Upgrade Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3010
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:17
+msgid "Upgrade Courses Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:43
+msgid "Upgrade courses from a previous version of WeBWorK."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1582
 msgid "Upgrade process completed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:388
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:65
 msgid "Upload"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2441
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:72
+msgid ""
+"Upload, download and delete text files, including scoring spread sheets, set"
+" definition files, class list spread sheets, and \"PG\" problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:292
 msgid "Use Default Header File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:325
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:127
 msgid "Use Equation Editor?"
 msgstr "Gleichungseditor nutzen?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:204
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:20
 msgid "Use Reward"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2720
-msgid "Use System Default"
-msgstr "Systemeinstellungen nutzen"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:516
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:27
 msgid "Use browser back button to return from preview mode."
 msgstr ""
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:506
+#. (tag('b', $c->{achievementID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:16
 msgid "Use in achievement %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:526
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:23
 msgid "Use in new achievement:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:149
 msgid "Use live equation rendering?"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2028
+#: /opt/webwork/webwork2/conf/defaults.config:1929
 msgid "Use log base 10 instead of base <i>e</i>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2034
+#: /opt/webwork/webwork2/conf/defaults.config:1935
 msgid "Use older answer checkers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:234
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:123
+msgid ""
+"Use the \"Create\" and \"Delete\" actions to create or delete achievements. "
+"Note that deleting an achievement will delete all data associated to the "
+"achievement and cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:35
+msgid ""
+"Use the \"Merge file\" drop down menu to select which merge file to use, or "
+"select \"None\" to not use any merge file.  When a merge file is selected, "
+"the data for active students will be displayed above the \"Email Body\".  "
+"This will show you the structure of the merge file and the column variables "
+"associated with each column.  Data that is longer than 7 characters will be "
+"truncated, and the data can be scrolled up and down to see all rows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:28
+msgid ""
+"Use the \"Users\" and \"Sets\" forms to select which users and sets to act "
+"on.  Multiple items can be selected using ctrl-click or shift-click.  The "
+"action buttons are grouped into three categories.  The first is a set of "
+"actions that act on the selected users, the second is a set of actions that "
+"act on the selected sets, and the third is a set of actions for acting on a "
+"combination of sets and users.  If an invalid number of users or sets are "
+"selected, the action will not be preformed, and an error message will be "
+"placed on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:25
+msgid ""
+"Use the editor to edit the evaluator and the action form at the bottom to "
+"save the evaluator. You can either overwrite the current evaluator file or "
+"save as a new evaluator file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:15
 msgid ""
 "Use the interface below to quickly access commonly-used instructor tools, or"
 " select a tool from the list to the left."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:332
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:26
+msgid ""
+"Use the options in the second box to pick a collection of problems decribed "
+"below. In each case, clicking \"View Problems\" will render a fixed number "
+"of problems (default of 20). After problems are shown, there will be options"
+" to show the next/previous batch of problems, add all problems to the target"
+" set (set at the top of the page) or clear the curent batch of problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:27
 msgid ""
 "Use this form to ask your instructor a question, to report a problem with "
 "the WeBWorK system, or to report an error in a problem you are attempting. "
@@ -7492,73 +10297,103 @@ msgid ""
 "system will be included."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:29
+msgid "Use this page to change your password."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:20
+msgid ""
+"Use this page to send emails to active (enrolled or auditing) students.  "
+"Emails can be sent to all active students or selected students.  Use the "
+"\"Students\" form to sort, filter, or format how the user name is displayed."
+"  Click \"Change Display Settings\" to apply any changes.  Use control-click"
+" or shift-click to select multiple students to email."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:67
+msgid ""
+"Used for \"counting\" achievements, which sets the value a counter must "
+"reach in order to earn the achievement. For example this is used counting "
+"the number of completed problems."
+msgstr ""
+
+#. (param('user')
+#. (param('effectiveUser')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:7
+msgid "User \"%1\" not found."
+msgstr ""
+
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:324
 msgid ""
-"User '%1' will not be copied from admin course as it is the initial "
+"User \"%1\" will not be copied from admin course as it is the initial "
 "instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:557
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:34
+msgid "User %1 not found."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:217
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:64
 msgid "User ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:298
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:230
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:28
 msgid "User Settings"
 msgstr "Nutzereinstellungen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:490
-msgid "User Value"
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:17
+msgid "User Settings Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:52
-msgid "User has been assigned to all current sets."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:576
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:13
+msgid "User overrides"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:58
-msgid "User has been unassigned from all sets."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:247
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:62
 msgid "User's name is:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:68
-msgid "User's sets have been reassigned."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:60
 msgid "User's username is:"
 msgstr ""
 
 #. ($user, $setID, $j)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1077
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
 msgid ""
 "UserProblem missing for user=%1 set=%2 problem=%3. This may indicate "
 "database corruption."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:51
 msgid "Username"
 msgstr "Nutzername"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:499
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:126
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:272
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:9
 msgid "Users"
 msgstr "Nutzer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:339
 msgid "Users Assigned to Set %2"
 msgstr "Set %2 zugeordnete Nutzer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2077
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:17
+msgid "Users Assigned to Set Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:65
 msgid "Users List"
 msgstr "Nutzerliste"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1925
+#: /opt/webwork/webwork2/conf/defaults.config:1827
 msgid ""
 "Users at this level and higher are allowed to change display settings used "
 "in pg problems.Note that if it is expected that there will be students that "
@@ -7567,31 +10402,31 @@ msgid ""
 "those students may need to disable MathQuill."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1915
+#: /opt/webwork/webwork2/conf/defaults.config:1817
 msgid ""
 "Users at this level and higher are allowed to change their e-mail address. "
 "Normally guest users are not allowed to change the e-mail address since it "
 "does not make sense to send e-mail to anonymous accounts."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1879
+#: /opt/webwork/webwork2/conf/defaults.config:1781
 msgid ""
 "Users at this level and higher are allowed to change their password. "
 "Normally guest users are not allowed to change their password."
 msgstr ""
 
-#. ($names{$primary}, $names{$secondary}, $names{$ternary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:924
+#. ($c->maketext(FIELD_PROPERTIES()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:316
 msgid "Users sorted by %1, then by %2, then by %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1906
+#: /opt/webwork/webwork2/conf/defaults.config:1808
 msgid ""
 "Users with at least this permission level get a link in the left panel for "
 "reporting bugs to the bug tracking system at bugs.webwork.maa.org."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2140
+#: /opt/webwork/webwork2/conf/defaults.config:2051
 msgid ""
 "Users with this permssion level or greater will automatically be sent "
 "feedback from students (generated when they use the \"Contact instructor\" "
@@ -7600,157 +10435,225 @@ msgid ""
 "permission level to \"nobody\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1348
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:193
 msgid "Uses Math Objects"
 msgstr ""
 
-#. ($default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:197
-msgid "Using contents of the default message %1 instead."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1239
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:18
 msgid "Using what display mode?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:6
 msgid "Using what seed?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:19
+msgid "Using which hardcopy format?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:49
+msgid "Using which hardcopy theme?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:31
+msgid ""
+"Usually means students must demonstrate understanding of facts. This is more"
+" than regurgitating the fact. We use this category for simple and direct "
+"applications of algorithms the student has studied. There should be no "
+"judgement involved in choosing the method. This would include a simple "
+"application of a rule for differentiation (e.g., can combine rules for sums "
+"and constant multiples with one more advanced rule) or for integrals."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Value"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1747
+#: /opt/webwork/webwork2/conf/defaults.config:1649
 msgid "Value of work done in Reduced Scoring Period"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:687
-msgid "Variable Documentation:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config/config_help.html.ep:20
+msgid "Variable Documentation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:115
+msgid "Version"
 msgstr ""
 
 #. ($ver->{version})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:679
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:173
 msgid "Version %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:159
 msgid "Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:43
 msgid "Versions of a set can only be edited for one user at a time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:128
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2419
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2756
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:528
 msgid "View"
 msgstr "Anzeigen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1000
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:488
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:523
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:681
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:948
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:6
 msgid "View Problems"
 msgstr "Aufgaben anzeigen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:276
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:57
+msgid "View details of student perofrmance either by individual or by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:86
 msgid "View equations as"
 msgstr "Gleichungen anzeigen mit"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:283
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:18
 msgid "View statistics by set"
 msgstr "Setstatistik anzeigen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:19
 msgid "View statistics by student"
 msgstr "Studierendenstatistik anzeigen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:55
+msgid ""
+"View statistics of students' performance on homework either by individual or"
+" by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:14
 msgid "View student progress by set"
 msgstr "Fortschritt pro Set"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:303
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:15
 msgid "View student progress by student"
 msgstr "Fortschritt pro Studierenden"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:65
 msgid "View/Edit"
 msgstr "Anzeigen/Bearbeiten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:224
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:90
-msgid "Viewing temporary file:"
-msgstr "tr: Viewing temporary file:"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:104
+msgid "View/Reload"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:766
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:790
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:31
+msgid "View/access current and archived courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:146
+msgid "Viewing Problems in a New Window"
+msgstr ""
+
+#. ($c->{problem}->source_file)
+#. ($screenSetHeader)
+#. ($course_info_path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:81
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:109
+msgid "Viewing temporary file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:25
 msgid "Visibility"
 msgstr "Sichtbarkeit"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:915
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:7
 msgid "Visible"
 msgstr "Sichtbar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:622
 msgid "Visible sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
 msgid "Visible to Students"
 msgstr "Sichtbar für Studierende"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2269
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:844
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "Warning"
 msgstr "Warnung"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2319
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:13
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:117
 msgid "Warning messages"
 msgstr "Warnungen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1039
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:259
+msgid "Warning messages:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all set-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1035
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all user-related data and is not undoable!"
 msgstr "Warnung: zerstört alle nutzerbezogenen Daten und kann nichtrückgängig gemacht werden!"
 
-#. ($problem_desc , CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1397
+#. ($problem_desc,				$c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1194
 msgid "Warnings encountered while processing %1. Error text: %2"
 msgstr "Bei der Verarbeitung von %1 aufgetretene Warnungen: %2"
 
-#. ($copyright_years, $theme, $ww_version, $pg_version)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1261
-msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4 |"
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:39
+msgid ""
+"We use this for carrying out more complicated algorithms, such as "
+"derivatives using both the product and chain rule or integrals which involve"
+" say both a substitution and parts."
+msgstr ""
+
+#. ($ce->{WW_COPYRIGHT_YEARS} || '1996-2023',              $ce->{defaultTheme}
+#. || 'unknown -- set defaultTheme in localOverides.conf',
+#. $ce->{WW_VERSION}         || 'unknown -- set WW_VERSION in VERSION',
+#. $ce->{PG_VERSION}         || 'unknown -- set PG_VERSION in ../pg/VERSION')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:9
+msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2227
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:3
 msgid "WeBWorK Error"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:3
 msgid "WeBWorK Warnings"
 msgstr "WeBWorK Warnungen"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1549
+#: /opt/webwork/webwork2/conf/defaults.config:1451
 msgid ""
 "WeBWorK currently has translations for the languages listed in the course "
 "configuration."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:20
+msgid ""
+"WeBWorK does not have a full featured scoring ability. We leave that to your"
+" favorite spreadsheet application."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:38
+msgid ""
+"WeBWorK expects many files to be in certain locations.  The following "
+"describe this. Note that by default the File Manager shows the \"templates\""
+" directory.  Other directories mentioned below are at the same level and "
+"need to be accessed by going up a directory by clicking the \"^\" button "
+"above the file list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:6
 msgid ""
 "WeBWorK has encountered a software error while attempting to process this "
 "problem. It is likely that there is an error in the problem itself. If you "
@@ -7759,7 +10662,7 @@ msgid ""
 " more information."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:6
 msgid ""
 "WeBWorK has encountered warnings while processing your request. If this "
 "occured when viewing a problem, it was likely caused by an error or "
@@ -7769,19 +10672,19 @@ msgid ""
 " warning output below for more information."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:577
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:558
 msgid ""
 "WeBWorK was unable to generate a different version of this problem.  Close "
 "this tab, and return to the original problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:367
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:29
 msgid ""
 "WeBWorK was unable to generate a paper copy of this homework set.  Please "
 "inform your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:78
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
 msgid ""
 "WeBWorK will automatically create users when logging in via the LMS for the "
 "first time. If this flag is enabled then it will also keep the user account "
@@ -7791,36 +10694,44 @@ msgid ""
 "next time the user logs in."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:370
 msgid "Weight"
 msgstr "Gewicht"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:6
 msgid "Welcome to WeBWorK!"
 msgstr "Wilkommen zu WeBWorK!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:24
+msgid ""
+"What WeBWorK does have is good support for summarizing the scores on WeBWorK"
+" homework sets and tests and exporting them in a form (.csv) which any "
+"spreadsheet can use. WeBWorK reports all of the homework grades with options"
+" shown below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:27
 msgid "What could be inside?"
 msgstr "Was könnte drin sein?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:715
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:17
 msgid "What field should filtered users match on?"
 msgstr "Filtern nach Feld"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
 msgid ""
 "When a student has more attempts than is specified here they will be able to"
 " view another version of this problem.  If set to -1 the feature is disabled"
 " and if set to -2 the course default is used."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1899
+#: /opt/webwork/webwork2/conf/defaults.config:1801
 msgid ""
 "When acting as a student, this permission level and higher can submit "
 "answers for that student."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2071
+#: /opt/webwork/webwork2/conf/defaults.config:1972
 msgid ""
 "When numerical answers are checked, most test if the student's answer is "
 "close enough to the programmed answer be computing the error as a percentage"
@@ -7829,7 +10740,7 @@ msgid ""
 "0.1 means 0.1 percent error is allowed.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2098
+#: /opt/webwork/webwork2/conf/defaults.config:2019
 msgid ""
 "When students click the <em>Email Instructor</em> button to send feedback, "
 "WeBWorK fills in the subject line.  Here you can set the subject line.  In "
@@ -7839,14 +10750,32 @@ msgid ""
 "recitation</li><li>%% = literal percent sign</li></ul>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1638
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:35
+msgid ""
+"When the class is very large not all students will be displayed. Using the "
+"first action on this page you can show only the students from a given "
+"recitation or from a given section, or only students whose login or last "
+"name fits a pattern match. The second action will sort the students "
+"currently being displayed. You can also sort the displayed students by "
+"clicking on the active links at the top of each column."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:56
+msgid ""
+"When the message is ready to send, click \"Send Email\". This will queue the"
+" email to be sent, which can take several minutes depending on the number of"
+" students selected.  You will be notified by email once all the emails have "
+"been sent."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1540
 msgid ""
 "When this is on students will see a line on the Grades page which has their "
 "total cumulative homework score.  This score includes all sets assigned to "
 "the student."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:90
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
 msgid ""
 "When this is true, then when a user enters WeBWorK from an external tool "
 "link in the LMS, the bottom of the screen will display the data that the LMS"
@@ -7854,23 +10783,56 @@ msgid ""
 "different LMS systems have different parameters."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1957
+#: /opt/webwork/webwork2/conf/defaults.config:1859
 msgid ""
 "When viewing a problem, WeBWorK usually puts the previously submitted answer"
 " in the answer blank.  Below this level, old answers are never shown.  "
 "Typically, that is the desired behaviour for guest accounts."
 msgstr ""
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:30
+msgid ""
+"When viewing progress for a single student, their grades page is shown which"
+" lists set totals and per problem grades for each set assigned to the "
+"student.  This shows the same information as the statistics page for the "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:26
+msgid ""
+"When viewing set statistics, the drop down menus can be used to show stats "
+"for individual sections, recitations, or problems.  The overall results "
+"include all students who are assigned to the set, while the individual "
+"problem results only include active (have attempted the problem) students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:24
+msgid ""
+"When viewing student progress for a set, the score for the set and the "
+"status for problems in the set are listed for all students.  The table can "
+"be sorted by clicking the links in the table header.  Click the student's "
+"name to access the student's set.  When viewing progress for a test, "
+"additional columns can be shown/hidden by updating the display at the top"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:74
+msgid ""
+"When you unassign a set from students, you destroy all of the data for the "
+"set for those students. If the set is re-assigned to these students, then "
+"they will receive new versions of problems in the set.  Make sure this is "
+"what you want to do before unassigning sets from students."
+msgstr ""
+
+#. (tag('b', $achievementID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:21
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for achievement %1 for this student. Make sure this is what you want to"
 " do."
 msgstr ""
 
-#. (CGI::b({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:146
+#. (tag('b', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:26
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for homework set %1 for this student. You will then need to reassign "
@@ -7878,7 +10840,7 @@ msgid ""
 "problems. Make sure this is what you want to do before unchecking students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:72
 msgid ""
 "When you uncheck a homework set (and save the changes), you destroy all of "
 "the data for that set for this student.   If you reassign the set, the "
@@ -7886,243 +10848,461 @@ msgid ""
 "you want to do before unchecking sets."
 msgstr ""
 
-#. ($self->formatDateTime($set->open_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:343
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:87
+msgid "Wiki summary page for MathObjects"
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:444
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:167
 msgid "Will open on %1."
 msgstr "Verfügbar ab %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:49
+msgid "Word problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:15
 msgid "Worth"
 msgstr "Wert"
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:382
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:51
+msgid "Write a new PG problem file or edit an existing one."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:188
+msgid ""
+"Write permissions have not been enabled for \"%1\".  Changes must be saved "
+"to another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:630
+msgid ""
+"Write permissions have not been enabled for \"%1\". Changes must be saved to"
+" another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:182
 msgid ""
-"Write permissions have not been enabled for '%1'.  Changes must be saved to "
-"another file for viewing."
+"Write permissions have not been enabled in \"%1\".  Changes must be saved to"
+" a different directory for viewing."
 msgstr ""
 
-#. ($self->shortPath($currentDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:380
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:624
 msgid ""
-"Write permissions have not been enabled in '%1'.  Changes must be saved to a"
+"Write permissions have not been enabled in \"%1\".Changes must be saved to a"
 " different directory for viewing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:178
 msgid ""
 "Write permissions have not been enabled in the templates directory.  No "
 "changes can be made."
 msgstr "tr: Write permissions have not been enabled in the templates directory.  No changes can be made."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:380
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:620
+msgid ""
+"Write permissions have not been enabled in the templates directory. No "
+"changes can be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:287
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:330
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:509
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:82
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:657
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:67
 msgid "Yes"
 msgstr "Ja"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:500
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:454
 msgid ""
 "You are currently checking answers to a different version of your problem - "
 "these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:511
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:470
 msgid ""
 "You are currently previewing answers to a different version of your problem "
 "- these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr ""
 
-#. ($userSet->set_id, $r->connection->remote_ip)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:270
+#. ($ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:18
+msgid ""
+"You are in the Reduced Scoring Period.  All work counts for %1% of the "
+"original."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:183
+msgid "You are not allowed to act as a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:188
+msgid "You are not allowed to assign homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:383
+msgid "You are not allowed to delete %1."
+msgstr ""
+
+#. ($userSet->set_id, $c->tx->remote_address)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:261
 msgid ""
 "You are not allowed to generate a hardcopy for %1 from your IP address, %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2049
-msgid "You are not authorized to access the Instructor tools."
-msgstr "Sie sind nicht berechtigt auf die Werkzeuge zuzugreifen."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:185
+msgid "You are not allowed to modify homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:191
+msgid "You are not allowed to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:4
+msgid "You are not allowed to send e-mail."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:2
+msgid "You are not authorized to access instructor tools"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:4
+msgid "You are not authorized to access instructor tools."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:9
+msgid "You are not authorized to assign homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:10
+msgid "You are not authorized to create or delete courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:2
+msgid "You are not authorized to edit achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:28
+msgid "You are not authorized to edit user specific information."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:37
+msgid "You are not authorized to grade homework sets."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:271
-msgid "You are not authorized to access the instructor tools."
-msgstr "Sie sind nicht berechtigt auf die Werkzeuge zuzugreifen."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:8
+msgid "You are not authorized to manage course files"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:392
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:33
 msgid "You are not authorized to modify homework sets."
 msgstr "Sie sind nicht berechtigt Sets zu bearbeiten."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:35
 msgid "You are not authorized to modify problems."
 msgstr "Sie sind nicht berechtigt Aufgaben zu bearbeiten."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:396
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:39
 msgid "You are not authorized to modify set definition files."
 msgstr "Sie sind nicht berechtig Definitionsdateien zu bearbeiten."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:15
 msgid "You are not authorized to modify student data"
 msgstr "Sie sind nicht berechtigt Nutzerdaten zu bearbeiten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:11
+msgid "You are not authorized to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:3
+msgid "You are not authorized to modify the course configuration."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:230
 msgid "You are not authorized to perform this action."
 msgstr "Sie sind nicht berechtigt zu dieser Aktion."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:260
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:11
+msgid "You are not authorized to score sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:13
+msgid "You are not authorized to send mail to students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:11
+msgid "You are not authorized to update lti scores"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers.html.ep:8
+msgid "You are not authorized to view past answers"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:251
 msgid ""
 "You are not permitted to generate a hardcopy for a set with hidden work."
 msgstr "Sie sind nicht berechtigt eine Druckversion zu erstellen."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:236
 msgid "You are not permitted to generate a hardcopy for an unopened set."
 msgstr "Sie sind nicht berechtigt eine Druckversion für ein nicht verfügbares Set zu erstellen."
 
-#. ($showMeAnother{MaxReps},					$solutionShown)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:559
+#. ($showMeAnother{MaxReps},						$solutionShown)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:532
 msgid ""
 "You are only allowed to click on Show Me Another %quant(%1,time,times) per "
 "problem. %2 Close this tab, and return to the original problem."
 msgstr "Sie können den \"Andere Version anzeigen\" Konpf nur %1 Mal pro Aufgabe nutzen. %2 Tab schließen, um zur ursprünglichen Aufgabe zurückzukehren."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2051
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2070
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:265
 msgid "You are out of time!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:374
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:36
 msgid "You can also examine the following temporary files: "
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGanswermacros.pl:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:108
+msgid ""
+"You can assign selected achievements to all users by using the \"Assign\" "
+"action action and selecting which achievements to assign.  You can select "
+"which users to assign/unassign to an achievement by clicking on the link in "
+"the \"Edit Users\" column."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1039
+msgid ""
+"You can change the file path for this problem manually from the \"Hmwk Sets "
+"Editor\" page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:27
+msgid ""
+"You can check the boxes to the right of the sets and click \"Generate "
+"Hardcopy for Selected Sets\" to generate a PDF hardcopy of the selected "
+"sets. You can generate hardcopies for multiple users including their answers"
+" as well. Note that students will only be able to generate hardcopies of a "
+"single set at a time. Students will only be able to include answers in the "
+"hardcopy after the answer date."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:127
+msgid ""
+"You can delete problems by clicking the \"Delete it?\" check box and saving."
+" If the set is already active it is recommended that you instead use the "
+"\"Mark Correct?\" problem to mark a particular problem correct for all "
+"students."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGanswermacros.pl:1616
 msgid "You can earn partial credit on this problem."
 msgstr "Für diese Aufgabe können Sie Teilpunkte erhalten."
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:382
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:142
+msgid ""
+"You can edit a problem by clicking the \"Edit Problem\" icon to the right of"
+" the problem number. This will open the problem in the PG problem editor in "
+"a new tab or window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:92
+msgid ""
+"You can edit a single achievement by clicking on the pencil icon next to the"
+" achievement ID.  You can edit multiple achievements by selecting which "
+"achievements to edit, then click the \"Edit\" button. You can edit all of "
+"the achievements by changing which achievements to edit form \"selected "
+"achievements\" to \"all achievements\", or click the checkbox next to the "
+"Achievement ID to select all achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:44
+msgid ""
+"You can edit the class list data for a single student by clicking on the "
+"pencil icon next to their login name. To edit several students at once click"
+" on the \"Select\" checkbox next to their names, click on the radio button "
+"for editing selected users and then click the \"Edit\" button. You can also "
+"edit all visible users (those students currently being displayed) or even "
+"all users in the course although this last option might take a long time to "
+"load for a large class."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:397
 msgid "You can get a new version of this problem after the due date."
 msgstr "Nach Ablauf der Bearbeitungszeit erhalten Sie eine neue Version dieser Aufgabe"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1368
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:101
+msgid ""
+"You can import/export from their respective action tab.  Exporting saves "
+"information about the achievement as a .axp file which is a CSV that lists "
+"each achievements information.  You can import .axp files that have been "
+"previously exported."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:769
 msgid "You can not specify an absolute path"
 msgstr "Angabe eines absoluten Pfades nicht möglich"
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1121
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:549
 msgid "You can only %1 one file at a time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:92
 msgid "You can only download regular files."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:591
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:197
 msgid "You can only edit text files"
 msgstr "Es können nur Textdateien bearbeitet werden"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:908
-msgid "You can only unpack files ending in '.tgz', '.tar' or '.tar.gz'"
-msgstr "Nur Dateien mit Endung '.tgz', '.tar' oder '.tar.gz' können entpackt werden"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:374
+msgid "You can only unpack files ending in \".tgz\", \".tar\" or \".tar.gz\""
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:134
+msgid ""
+"You can render a problem by clicking the \"Render Problem\" icon to the "
+"right of the problem number. The display mode used to render the problem is "
+"chosen using the drop down menu. You can render all problems using the "
+"\"Render All\" button. \"Hide All\" will hide all rendered problems. It is "
+"also useful to collapse problem details when doing this, as it makes it "
+"easier to drag problems around."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:120
+msgid ""
+"You can reorder problems by clicking on the arrow icon and dragging the "
+"problem. You will see a box showing you where the problem will be placed. "
+"When problems are reordered any holes in the numbering will be filled in."
+msgstr ""
 
 #. ($showMeAnother{MaxReps} >= $showMeAnother{Count}
 #. ? ($showMeAnother{MaxReps} - $showMeAnother{Count})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1895
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:44
 msgid ""
 "You can use this feature %quant(%1,more time,more times,as many times as you"
 " want) on this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:439
 msgid "You can't download directories"
 msgstr "Verzeichnisse können nicht heruntergeladen werden"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:440
 msgid "You can't download files of that type"
 msgstr "Dateien dieses Typs können nicht heruntergeladen werden"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:584
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:192
 msgid "You can't edit a directory"
 msgstr "Verzeichnisse können nicht bearbeitet werden"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:528
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
 msgid "You can't view files of that type"
 msgstr "Dateien dieses Typs können nicht angezeigt werden"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:985
 msgid "You cannot archive the course you are currently using."
 msgstr "In Nutzung befindlicher Kurs kann nicht archiviert werden."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1712
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:850
 msgid "You cannot delete the course you are currently using."
 msgstr "In Nutzung befindlicher Kurs kann nicht gelöscht werden."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1081
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:378
 msgid "You cannot delete yourself!"
 msgstr "Sie können sich nicht selbst löschen!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:579
 msgid "You did not specify a new set name."
 msgstr "Kein neuer Name für Set angegeben."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:232
 msgid "You didn't enter any message."
 msgstr "Keine Nachricht angegeben."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:312
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:303
 msgid "You do not have permission to access the requested file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:159
 msgid "You do not have permission to change the hardcopy theme."
 msgstr "Sie sind nicht berechtigt das Layout der Druckversion zu ändern."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:578
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:186
 msgid "You do not have permission to edit this file."
 msgstr "Sie sind nicht berechtigt diese Datei zu bearbeiten."
 
 #. ($hardcopy_format)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:151
 msgid "You do not have permission to generate hardcopy in %1 format."
 msgstr "Sie sind nicht berechtigt eine Druckversion  im Format %1 zu erstellen."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1639
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1161
 msgid "You do not have permission to view the details of this error."
 msgstr "Sie sind nicht berechtigt die Fehlerdetails anzuzeigen."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements.html.ep:13
 msgid "You don't have any Achievement data associated to you!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:237
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:51
 msgid "You don't have any rewards!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2109
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:325
 msgid "You exceeded the allowed time."
 msgstr "Sie haben die erlaubte Zeit überschritten."
 
-#. ($numLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2082
+#. ($c->{numAttemptsLeft})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:277
 msgid "You have %1 attempt(s) remaining on this test."
 msgstr "Sie haben %quant(%1,verbleibenden Versuch,verbleibende Versuche) für diesen Test."
 
-#. ($numLeft,						$numLeft - 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2458
+#. ($c->{numAttemptsLeft},								$c->{numAttemptsLeft} - 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:664
 msgid ""
 "You have %1 submissions remaining for this test.  If you say yes, then you "
 "will have %quant(%2,submission) remaining. Once all submissions have been "
@@ -8130,724 +11310,702 @@ msgid ""
 "work this test version."
 msgstr ""
 
-#. ($attemptsLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2012
+#. ($problem->max_attempts - $attempts)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1270
 msgid "You have %negquant(%1,unlimited attempts,attempt,attempts) remaining."
 msgstr "Sie haben %negquant(%1,unendlich viele Versuche,verbleibenden Versuch, verbleibende Versuche) für diese Aufgabe."
 
 #. ($attempts_before_rr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1217
 msgid ""
 "You have %quant(%1,attempt,attempts) left before new version will be "
 "requested."
 msgstr "Sie haben %quant(%1,verbleibenen Versuch,verbleibende Versuche) bevor Sie eine neue Version der Aufgabe anfordern können."
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:506
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:44
 msgid ""
 "You have %quant(%1,hour) and %quant(%2,minute) remaining to complete the "
 "currently open test."
 msgstr ""
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:518
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:54
 msgid ""
 "You have %quant(%1,hour,hours,)%quant(%2,minute,minutes,) remaining to "
 "complete the currently open test."
 msgstr ""
 
-#. ($minutes,									$seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:529
+#. ($minutes,							$seconds)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:64
 msgid ""
 "You have %quant(%1,minute) and %quant(%2,second) remaining to complete the "
 "currently open test."
 msgstr ""
 
 #. ($seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:72
 msgid ""
 "You have %quant(%1,second) remaining to complete the currently open test."
 msgstr ""
 
 #. ($attempts)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1243
 msgid "You have attempted this problem %quant(%1,time,times)."
 msgstr "Sie haben diese Aufgabe %quant(%1,time,times) Mal versucht."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:1
 msgid "You have been logged out of WeBWorK."
 msgstr "Sie haben sich erfolgreich abgemeldet."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2065
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:260
 msgid "You have less than 1 minute to complete this test."
 msgstr "Sie haben weniger als 1 Minute um diesen Test abzuschließen."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2046
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:241
 msgid "You have less than 45 seconds left!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2043
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:240
 msgid ""
 "You have less than 90 seconds left to complete this assignment. You should "
 "finish it soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1004
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:452
 msgid "You have not chosen a file to upload."
 msgstr "Keine Datei zum Upload ausgewählt."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:845
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "You have requested that the following items be deleted"
 msgstr "Folgende Dateien werden gelöscht"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1137
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:565
 msgid "You have specified an illegal file"
 msgstr "Ungültiger Dateiname"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:766
 msgid "You have specified an illegal path"
 msgstr "Ungültiger Pfad"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:520
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:13
+msgid "You have specified an illegal working directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:481
 msgid ""
 "You may check your answers to this problem without affecting the maximum "
 "number of tries to your original problem."
 msgstr ""
 
-#. ($perm_multiuser ? "to privileged users or" : "")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:613
+#. ($multiuser ? 'to privileged users or' : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:69
 msgid ""
 "You may choose to show any of the following data. Correct answers, hints, "
 "and solutions are only available %1 after the answer date of the homework "
 "set."
 msgstr "Wählen Sie die anzuzeigenden Informationen. Richtige Antworten, Hinweise und Lösungen sind erst nach dem Abgabetermin des Sets verfügbar %1."
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:63
+msgid "You may not change this user's password!"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:646
 msgid "You may not change your answers when going on to the next part!"
 msgstr "Antworten können im nächsten Teil nicht mehr geändert werden!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1831
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:58
 msgid "You may not change your own password here!"
 msgstr "Sie dürfen Ihr eigenes Password hier nicht ändern!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1132
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:560
 msgid "You may not follow symbolic links"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2134
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:350
 msgid "You may still check your answers."
 msgstr "Antworten können weiterhin überprüft werden."
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:172
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:143
+msgid ""
+"You may want to create an unattached problem if you are using the current "
+"problem as a model for a new problem. You can add the new file to a homework"
+" set from the Library Browser or via the set detail page of the Hmwk Sets "
+"Editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:165
+msgid ""
+"You might want to do this if you want to give full credit to everyone on a "
+"particular problem that was not worded correctly, or wasn't working "
+"properly. This is done from the \"Hmwk Sets Editor\" page or the "
+"\"Instructor Tools\" page."
+msgstr ""
+
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:8
 msgid "You must access assignments from your Course Management System (%1)."
 msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:67
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before Show Me Another "
-"is available."
+"You must attempt this problem %quant(%1,time) before this feature is "
+"available"
 msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1923
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:545
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before this feature is "
-"available"
+"You must attempt this problem %quant(%1,time,times) before Show Me Another "
+"is available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:699
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:259
 msgid "You must confirm the password for the initial instructor."
 msgstr ""
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:368
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? $c->link_to(                                                  $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:195
 msgid "You must log into this set via your Learning Management System (%1)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:76
-msgid "You must provide a student ID, a set ID, and a problem number."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:979
+msgid "You must select a course to archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:585
 msgid "You must select a course to rename."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:351
 msgid "You must select at least one file for the archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:777
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:312
 msgid "You must select at least one file to delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:115
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:106
 msgid "You must select one or more sets for scoring!"
 msgstr "Wählen Sie mindestens ein Set zur Bewertung aus!"
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:749
 msgid "You must specify a %1 name"
 msgstr "%1 Name angeben."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:682
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:242
 msgid "You must specify a course ID."
 msgstr "Geben Sie eine Kurs ID an."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2026
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2561
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2777
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3865
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2086
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:848
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:983
 msgid "You must specify a course name."
 msgstr "Geben Sie einen Kursnamen an."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:775
 msgid "You must specify a file name"
 msgstr "Geben Sie eienn Dateinamen an."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:705
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:586
+msgid "You must specify a file name in order to save a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:265
 msgid "You must specify a first name for the initial instructor."
 msgstr "Geben Sie den Vornamen des Dozenten an."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:708
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:268
 msgid "You must specify a last name for the initial instructor."
 msgstr "Geben Sie den Nachnamen des Dozenten an."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1382
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:606
 msgid "You must specify a new institution for the course."
 msgstr "Geben Sie eine neue Einrichtung des Kurses an."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1364
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:588
 msgid "You must specify a new name for the course."
 msgstr "Geben Sie einen neuen Kursnamen an."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:603
 msgid "You must specify a new title for the course."
 msgstr "Geben Sie einen neuen Kurstitel an."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:256
 msgid "You must specify a password for the initial instructor."
 msgstr "Geben Sie ein Dozentenpasswort an."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:448
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:440
 msgid "You must specify a user ID."
 msgstr "Geben Sie eine Nutzer ID an."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:711
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:271
 msgid "You must specify an email address for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:331
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:138
 msgid "You must specify an file name in order to save a new file."
 msgstr "Geben Sie einen Dateinamen an, um in einer neuen Date zu speichern"
 
 #. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:505
 msgid ""
-"You must use your Learning Managment System (%1) to access this set.  Try "
-"logging in to the Learning Managment System and visiting the set from there."
+"You must use your Learning Management System (%1) to access this set.  Try "
+"logging in to the Learning Management System and visiting the set from "
+"there."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1730
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
 msgid "You need to select a \"Target Set\" before you can edit it."
 msgstr ""
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1126
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:554
 msgid "You need to select a file to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1877
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:555
 msgid "You need to select a set definition file to view."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1853
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:537
 msgid "You need to select a set from this course to view."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1837
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:524
 msgid "You need to select a set to view."
 msgstr ""
 
-#. (wwRound(0, $problemResult->{score} * 100)
-#. (wwRound(0, $pg->{result}->{score} * 100)
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2007
+#. (wwRound(0,
+#. compute_reduced_score($ce, $problem, $set, $pg->{result}{score},
+#. $c->submitTime)
+#. (% wwRound(0, $rh_result->{problem_result}{score} * 100)
+#. (wwRound(0, $rh_result->{problem_result}{score} * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1251
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:48
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:29
 msgid "You received a score of %1 for this attempt."
 msgstr "Dieser Versuch wurde mit %1 bewertet."
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2075
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1363
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem and its graded subproblems."
 msgstr ""
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2078
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1375
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem."
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1343
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:740
 msgid "Your %1 name contains illegal characters"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1344
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:743
 msgid "Your %1 name may not begin with a dot"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:746
 msgid "Your %1 name may not contain a path component"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:540
-msgid ""
-"Your LTI OAuth verification failed.  If this recurs, please speak with your "
-"instructor"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:528
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:539
-msgid ""
-"Your authentication failed.  Please return to Oncourse and login again."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:229
-msgid ""
-"Your authentication failed.  Please try again. Please speak with your "
-"instructor if you need help."
-msgstr "Nutzername oder Passwort falsch. Falls Sie Hilfe benötigen, wenden Sie sich an Ihren Dozenten."
-
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3033
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3162
 msgid "Your browser does not support the video tag."
 msgstr ""
 
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4078
-msgid "Your current branch of PG is up to date with branch %1 in remote %2."
-msgstr ""
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4016
-msgid ""
-"Your current branch of WeBWorK is up to date with branch %1 in remote %2."
-msgstr ""
-
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4113
-msgid "Your current branch of the Open Problem Library is up to date."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:134
 msgid "Your display options have been saved."
 msgstr "Darstellungseinstellungen gespeichert."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:195
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
 msgid "Your email address has been changed."
 msgstr "Ihre Email-Adresse wurde geändert."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:772
 msgid "Your file name contains illegal characters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:118
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:40
 msgid "Your file name is not valid! "
 msgstr "Ungültiger Dateiname!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:16
 msgid "Your message was sent successfully."
 msgstr "Nachricht gesendet."
 
-#. ($lastScore,$notCountedMessage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2010
+#. (wwRound(0, $problem->status * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1261
 msgid "Your overall recorded score is %1.  %2"
 msgstr "Ihr Gesamtergebnis ist %1. %2"
 
-#. ($versionNumber, wwRound(2,$recordedScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2107
-msgid "Your recorded score on this test (version %1) is %2/%3."
-msgstr "Die erreichte Punktzahl bei diesem Test (Version %1) lautet %2/%3. "
+#. ('<span id="test-recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:179
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:197
+msgid "Your recorded score for this version is %1/%2 (%3%)."
+msgstr ""
+
+#. ($setVersionID,                                         '<span id="test-
+#. recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:317
+msgid "Your recorded score on this test (version %1) is %2/%3 (%4%)."
+msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:603
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:634
 msgid "Your score for this attempt is for this part only;"
 msgstr ""
 
 #. ($testNounNum)
 # $testNounNum is either "test (#)" or "submission (#)"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1977
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:142
 msgid "Your score on this %1 WAS recorded."
 msgstr "Ihre Punktzahl für %1 wurde gespeichert."
 
-#. ($testNoun,$attemptScore,$totPossible)
+#. ($testNoun, $c->{attemptScore}, $c->{totalPossible})
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1982
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:148
 msgid "Your score on this %1 is %2/%3."
 msgstr "Ihre Punktzahl für diesen %1 lautet %2/%3."
 
 #. ($testNounNum)
 # $testNounNum is either "test (#)" or "submission (#)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1973
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:138
 msgid "Your score on this %1 was NOT recorded."
 msgstr "Ihre Punktzahl für diesen %1 wurde NICHT gespeichert."
 
-#. ($attemptScore,$totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2019
+#. ($c->{attemptScore}, $c->{totalPossible})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:192
 msgid "Your score on this (checked, not recorded) submission is %1/%2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1963
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2277
-msgid "Your score on this problem was recorded."
-msgstr "Ihre Punktzahl für diese Aufgabe wurde gespeichert."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1619
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1027
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:172
 msgid ""
 "Your score was not recorded because there was a failure in storing the "
 "problem record to the database."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:272
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:276
 msgid "Your score was not recorded because this homework set is closed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:283
 msgid ""
 "Your score was not recorded because this problem has not been assigned to "
 "you."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1643
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1049
 msgid ""
 "Your score was not recorded because this problem set version is not open."
 msgstr ""
 
-#. ($elapsed, $allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1658
+#. ($elapsed,                                              # Assume the
+#. allowed time is an even number of minutes.
+#. ($set->due_date - $set->open_date)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1063
 msgid ""
 "Your score was not recorded because you have exceeded the time limit for "
 "this test. (Time taken: %1 min; allowed: %2 min.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1052
 msgid ""
 "Your score was not recorded because you have no attempts remaining on this "
 "set version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1661
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1067
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:278
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:53
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:31
 msgid "Your score was not recorded."
 msgstr "Ihre Punktzahl wurde nicht gespeichert."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1998
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:163
 msgid "Your score was not successfully sent to the LMS."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:166
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:170
 msgid "Your score was recorded."
 msgstr "Ihre Punktzahl wurde gespeichert."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1997
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:255
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:162
 msgid "Your score was successfully sent to the LMS."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:540
 msgid "Your session has timed out due to inactivity. Please log in again."
 msgstr "Ihre Sitzung wurde aufgrund von Inaktivität beendet. Bitte melden Sie sich erneut an."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4126
-msgid "Your systems are up to date!"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1396
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1403
-msgid "[Edit]"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:824
-msgid "a duplicate of the first selected achievement."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:17
+msgid "a duplicate of the first selected achievement"
 msgstr ""
 
 # Context is "Create set ______ as a duplicate of the first selected set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:17
 msgid "a duplicate of the first selected set"
 msgstr "tr: a duplicate of the first selected set"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:823
-msgid "a new empty achievement."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:16
+msgid "a new empty achievement"
 msgstr ""
 
 # Context is "Create set ______ as a new empty set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:16
 msgid "a new empty set"
 msgstr "ein leeres Set"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1281
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:9
 msgid "a single set"
 msgstr "tr: a single set"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:429
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:130
 msgid "add problems"
 msgstr ""
 
 #. ($setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1751
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
 msgid "addGlobalSet %1 in ProblemSetList:  %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:456
-msgid "added missing permission level for user"
-msgstr ""
-
 # #short for administrator
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "admin"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1051
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:487
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:604
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:7
 msgid "all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1377
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:66
 msgid "all current users"
 msgstr "alle aktuellen Nutzer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:327
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:70
 msgid "all set dates for one <b>user</b>"
 msgstr "Alle Abgabetermine eines <b>Nutzers</b>"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:622
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1434
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:667
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:840
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1995
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:7
 msgid "all sets"
 msgstr "alle Blätter"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1981
 msgid "all students"
 msgstr "alle Studierenden"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1256
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:701
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:946
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:997
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:6
 msgid "all users"
 msgstr "alle Nutzer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:120
 msgid "all users for one <b>set</b>"
 msgstr "alle Nutzer eines <b>Sets</b>"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:23
 msgid "alphabetically"
 msgstr "alphabetisch"
 
-#. ($count,$numSets)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:626
+#. ($count, $numSets)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1999
 msgid "an impossible number of sets: %1 out of %2"
 msgstr ""
 
-#. ($count,$numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:606
+#. ($count, $numUsers)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1985
 msgid "an impossible number of users: %1 out of %2"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:647
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:658
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:610
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:621
 msgid "answer"
 msgstr "Antwort"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:30
 msgid "any users"
 msgstr "alle Nutzer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:720
-msgid "avg attempts"
-msgstr "Durschschnittliche Anzahl Versuche"
-
 # Context is "Append ____ blank problem template(s) to end of homework set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2956
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:689
 msgid "blank problem template(s) to end of homework set"
 msgstr "leere Aufgaben an das Ende des Aufgabenblattes anfügen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:24
 msgid "by last login date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1552
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:688
 msgid "changes abandoned"
 msgstr "Änderungen verworfen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1216
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1651
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:633
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:795
 msgid "changes saved"
 msgstr "Anderungen gespeichert"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:80
 msgid "class list data for selected <b>users</b>"
 msgstr "Teilnehmerdaten für ausgewählte <b>Nutzer</b>"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:31
 msgid "close"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:671
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "column"
 msgstr "Spalte"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:259
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:239
 msgid "correct"
 msgstr "richtig"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:582
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:239
 msgid "course files"
 msgstr "Kursdateien"
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:458
 msgid "deleted %1 sets"
 msgstr "%1 Aufgabenblätter wurden gelöscht"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:152
 msgid "editing all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:333
 msgid "editing all sets"
 msgstr "Alle Aufgabenblätter bearbeiten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:963
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:328
 msgid "editing all users"
 msgstr "Alle Nutzer bearbeiten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:860
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:336
 msgid "editing listed sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:154
 msgid "editing selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:339
 msgid "editing selected sets"
 msgstr "ausgewählte Aufgabenblätter bearbeiten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:334
 msgid "editing selected users"
 msgstr "ausgewählte Nutzer bearbeiten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:331
 msgid "editing visible users"
 msgstr "sichtbare Nutzer bearbeiten"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:360
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:90
 msgid "email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:87
-msgid "email:"
-msgstr "E-Mail"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:42
 msgid "empty"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:672
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:10
 msgid "enter matching set IDs below"
 msgstr "tr: enter matching set IDs below"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:220
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:31
 msgid "entry rows."
 msgstr ""
 
 #. ($restrictLoc, $setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1761
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:904
 msgid "error adding set location %1 for set %2: %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1092
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1487
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:542
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:643
 msgid "export abandoned"
 msgstr "Export abgebrochen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1068
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:527
 msgid "exporting all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1071
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:530
 msgid "exporting selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:359
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:89
 msgid "first name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:747
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:72
 msgid "for"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:149
 msgid "for one <b>set</b>"
 msgstr "eines <b>Sets</b>"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:103
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:94
 msgid "for one <b>user</b>"
 msgstr "für einen <b>Nutzer</b>"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1014
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:349
 msgid "giving new passwords to all users"
 msgstr "Alle Nutzerpasswörter neu vergeben"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1020
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:355
 msgid "giving new passwords to selected users"
 msgstr "ausgewählten Nutzern neue Passwörter vergeben"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1017
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:352
 msgid "giving new passwords to visible users"
 msgstr "sichtbaren Nutzern neue Passwörter vergeben"
 
 #. ($j, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1069
 msgid "global %1 for set %2 not found."
 msgstr ""
 
-#. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1146
-msgid "global set %1 not found."
-msgstr ""
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "grade_proctor"
 msgstr ""
@@ -8856,393 +12014,375 @@ msgstr ""
 msgid "guest"
 msgstr "Gast"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1589
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:949
 msgid "hidden"
 msgstr "unsichtbar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "hidden from"
 msgstr "unsichtbar für"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "hidden from students"
-msgstr "unsichtbar für Studierende"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:217
+msgid "homework"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:83
+msgid "html directory"
+msgstr ""
 
-#. ('j','k','_0')
-#. ('j','k')
+#. ('j', 'k', '_0')
+#. ('j', 'k')
 # doe snot need to be translated
-#: /opt/webwork/pg/lib/Parser/List/Vector.pm:35
-#: /opt/webwork/pg/lib/Value/Vector.pm:278
-#: /opt/webwork/pg/macros/contextLimitedVector.pl:93
+#: /opt/webwork/pg/lib/Parser/List/Vector.pm:39
+#: /opt/webwork/pg/lib/Value/Vector.pm:303
+#: /opt/webwork/pg/macros/contexts/contextLimitedVector.pl:95
 msgid "i"
 msgstr ""
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:773
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:840
 msgid "if"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1626
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:622
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:721
 msgid "illegal character in input: '/'"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:246
 msgid "incorrect"
 msgstr "falsch"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:441
 msgid "index"
 msgstr ""
 
 #. ($restrictLoc, $setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:911
 msgid "input set location %1 already exists for set %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:358
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:551
+msgid "insufficient permission to edit %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:220
+msgid "just-in-time"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:88
 msgid "last name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:841
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:893
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:9
 msgid "listed sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3169
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:87
 msgid "locations selected below"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:665
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:59
 msgid "login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "login ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:94
 msgid "login name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:86
-msgid "login/studentID:"
-msgstr ""
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "login_proctor"
 msgstr ""
 
 # Context is "Set _____ made visibile for _____ users"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "made visible for"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:419
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:493
 msgid "max"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1282
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:10
 msgid "multiple sets"
 msgstr "tr: multiple sets"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:489
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:171
 msgid "new set:"
 msgstr "eines neuen Sets"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:393
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:109
 msgid "new users"
 msgstr "neuer Nutzer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:6
 msgid "no achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:740
-msgid "no achievements."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:519
-msgid "no attempt recorded"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:86
 msgid "no location"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:620
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1056
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1993
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:6
 msgid "no sets"
 msgstr "keine Sets"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:600
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1979
 msgid "no students"
 msgstr "keine Studierenden"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:931
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1190
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:702
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:31
 msgid "no users"
 msgstr "kein Nutzer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/permission.pm:26
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "nobody"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:114
 msgid "nth colum of merge file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:225
-msgid "number of students not defined"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:70
 msgid "of"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:128
 msgid "one <b>set</b>"
 msgstr "eines <b>Sets</b>"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:556
-msgid "one <b>set</b> for  <b>users</b>"
-msgstr "eines <b>Sets</b> für <b>Nutzer</b>"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:225
+msgid "one <b>set</b> for <b>users</b>"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:540
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:211
 msgid "one <b>user</b> (on one <b>set</b>)"
 msgstr "ein <b>Nutzer</b> (zu einem <b>Set</b>)"
 
 # Context is Assign this set to which users?  "only ____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1378
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:67
 msgid "only"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:17
 msgid "only best scores"
 msgstr "nur bestes Ergebnis"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3472
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:357
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:448
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:88
 msgid "or"
 msgstr "oder"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1141
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:59
 msgid "or Problems from"
 msgstr "oder Aufgaben aus"
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:776
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:843
 msgid "otherwise"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:19
 msgid "overwrite"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:664
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:627
 msgid "part"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1383
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:499
 msgid "permissions for %1 not defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "point"
 msgstr "Punkt"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "points"
 msgstr "Punkte"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:509
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:20
 msgid "preserve"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2360
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:576
 msgid "preview answers"
 msgstr "Vorschau"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:653
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:616
 msgid "problem"
 msgstr "Aufgabe"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:632
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:41
 msgid "problems"
 msgstr "Aufgaben"
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:219
+msgid "proctored test"
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "professor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:360
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:451
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:89
 msgid "progress"
 msgstr "Fortschritt"
 
 #. ($line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2212
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1409
 msgid "readSetDef error, can't read the line: ||%1||"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:93
 msgid "recitation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:654
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:53
 msgid "recitation #"
 msgstr "Übungsgruppe"
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:497
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:549
 msgid "record for visible user %1 not found"
 msgstr ""
 
 #. ($restrictLoc)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1767
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:918
 msgid ""
 "restriction location %1 does not exist.  IP restrictions have been ignored."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:670
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "row"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:91
 msgid "score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:362
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:92
 msgid "section"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:643
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:47
 msgid "section #"
 msgstr "Studienfach"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:88
-msgid "section:"
-msgstr "Abteilung:"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:159
 msgid "selected <b>sets</b>"
 msgstr "ausgewählter <b>Aufgabenblätter</b>"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:524
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:197
 msgid "selected <b>users</b> to selected <b>sets</b>"
 msgstr "ausgewählter <b>Nutzer</b> zu ausgewählten <b>Blättern</b>"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:441
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:488
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:605
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:8
 msgid "selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:741
-msgid "selected achievements."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1057
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1436
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:669
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:842
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:894
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:991
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:8
 msgid "selected sets"
 msgstr "ausgewählte Aufgabenblätter"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1053
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:703
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:999
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:8
 msgid "selected users"
 msgstr "ausgewählte Nutzer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:624
-msgid "set"
-msgstr "Set"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:628
-msgid "sets"
-msgstr "Aufgabenblätter"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:12
 msgid "sets hidden from students"
 msgstr "Für Studierende unsichtbare Sets"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:670
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:11
 msgid "sets visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:716
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:281
 msgid "showing all sets"
 msgstr "alle Aufgabenblätter werden angezeigt"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:763
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:277
 msgid "showing all users"
 msgstr "alle Nutzer werden angezeigt"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:725
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:290
 msgid "showing matching sets"
 msgstr "Ergebnis der Suchanfrage"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:286
 msgid "showing matching users"
 msgstr "Ergebnis der Suchanfrage"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:719
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:284
 msgid "showing no sets"
 msgstr "kein Set wird angezeigt"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:766
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:280
 msgid "showing no users"
 msgstr "Suchanfrage ergab keine Nutzer. "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:722
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:287
 msgid "showing selected sets"
 msgstr "ausgewählte Blätter werden angezeigt"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:769
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:283
 msgid "showing selected users"
 msgstr "ausgewählte Nutzer werden angezeigt"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:299
 msgid "showing sets that are hidden from students"
 msgstr "Für Studierende unsichtbare Sets"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:732
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:296
 msgid "showing sets that are visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:72
 msgid "shown"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:162
 msgid "still open"
 msgstr ""
 
@@ -9250,16 +12390,16 @@ msgstr ""
 msgid "student"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
 msgid "submission"
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:133
 msgid "submission (version %1)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
 msgid "summary"
 msgstr ""
 
@@ -9267,135 +12407,130 @@ msgstr ""
 msgid "ta"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:90
+msgid "templates/email directory"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:95
+msgid "templates/macros directory"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
 msgid "test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:23
 msgid "test date"
 msgstr "Datum"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:621
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:29
 msgid "test time"
 msgstr "Uhrzeit"
 
-#. ($forcedSourceFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:987
-msgid "the original path to the file is %1"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:119
 msgid "then delete them"
 msgstr "und anschließend löschen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "time"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:165
 msgid "time limit exceeded"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "times"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:35
+msgid "time remaining"
 msgstr ""
 
 # Context is Assign ____ to _____
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:183
 msgid "to"
 msgstr "An"
 
 #. ($ce->{institutionName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:399
 msgid "to %1 main web site"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:524
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:381
 msgid "to courses page"
 msgstr "zur Kursseite"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:436
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:135
 msgid "to one <b>set</b>"
 msgstr "zu einem <b>Set</b>"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:764
-msgid "top score"
-msgstr "beste Punktzahl"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:432
 msgid "total"
 msgstr "gesamt"
 
 #. ($ce->{webworkDirs}{logs})
 #. ($ce->{webworkDirs}{tmp})
 #. ($ce->{webworkDirs}{DATA})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:47
 msgid "unable to write to directory %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:333
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:49
 msgid "unlimited"
 msgstr "unbegrenzt"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:14
 msgid "unlimited reusability"
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:609
-msgid "userID: %1 --"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:652
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:259
 msgid ""
 "username, last name, first name, section, achievement level, achievement "
 "score,"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:704
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:10
 msgid "users who match on selected field"
 msgstr "Nutzer mit Übereinstimmung im ausgewählten Feld"
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
+#. ($set->version_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:295
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:408
+msgid "version %1"
+msgstr ""
+
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:134
 msgid "version (%1)"
 msgstr "Version (%1)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1591
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1888
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:820
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:951
 msgid "visible"
 msgstr "sichtbar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "visible to students"
-msgstr "sichtbar für Studierende"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1257
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:947
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:998
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:7
 msgid "visible users"
 msgstr "sichtbare Nutzer"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:485
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:500
 msgid "when you submit your answers"
 msgstr ""
 
 #. ($dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1532
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:623
 msgid "won't be able to read from file %1/%2: does it exist? is it readable?"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:604
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:638
 msgid "your overall score is for all the parts combined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:231
 msgid "your students"
 msgstr "an Studierende"
diff --git a/lib/WeBWorK/Localize/el.po b/lib/WeBWorK/Localize/el.po
new file mode 100644
index 0000000000..41b7f4611d
--- /dev/null
+++ b/lib/WeBWorK/Localize/el.po
@@ -0,0 +1,12559 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Antonis Troullakis, 2022
+# Athina Psoma, 2022
+# Chaido Skandyla, 2022
+# Christina Liouliou, 2022
+# Despoina, 2022-2023
+# Dimitra Papantoniou, 2022
+# Efthimiou Afroditi, 2022
+# Efthymia Papadopoulou, 2022
+# Elena Kapna, 2022
+# Elisavet, 2022-2023
+# Evangelos Papadopoulos, 2022
+# Ioannis Souldatos, 2022-2023
+# kalliopi Kiosse, 2022-2023
+# Kleopatra Chatziioannou, 2022
+# Kyriaki Kourouni, 2022-2023
+# Lika, 2022-2023
+# Maria Liakou, 2022
+# Maria Sakelliadi, 2022
+# Nikoleta Tentoglou, 2022
+# Panagiota Kosteli, 2022
+# Salma Chasan, 2022
+# Sofia Mavroudi, 2022
+# Stavroula Tziortzii, 2022
+# Tsiatsiou Katerina, 2022
+# Tzivani Marianna, 2022
+# ΑΛΕΞΑΝΔΡΑ ΣΤΕΦΑΝΙΔΟΥ, 2022
+# Παρασκευάς Παπαβασιλείου, 2022
+msgid ""
+msgstr ""
+"Project-Id-Version: webwork2\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2013-01-27 17:03+0000\n"
+"Last-Translator: Kyriaki Kourouni, 2022-2023\n"
+"Language-Team: Greek (http://app.transifex.com/webwork/webwork2/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. ($_->{problem}->version_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:69
+msgid " (version %1)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:265
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:284
+msgid " Answers Available."
+msgstr "Διαθέσιμες Απαντήσεις."
+
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1148
+msgid " No changes have been made to set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:130
+msgid "\"Act as\" a student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:31
+msgid "\"Edit Assigned Users\" column"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:24
+msgid "\"Edit Problems\" column"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:187
+msgid "# of Active Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:85
+msgid "# of attempts"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:333
+msgid "#corr"
+msgstr "#σωστό"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:335
+msgid "#incorr"
+msgstr "#λάθος"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:174
+msgid "% Average with Review"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:66
+msgid "% Score with Review"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:479
+msgid "% Score:"
+msgstr "% Βαθμού:"
+
+#. ($achievement->{points})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:24
+msgid "%1 Points:"
+msgstr "%1 Πόντοι:"
+
+#. ($lib eq '' ? maketext('Local')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:9
+msgid "%1 Problems:"
+msgstr "%1 Προβλήματα:"
+
+#. ($itemCounts->{ $item->id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:12
+msgid "%1 remaining"
+msgstr "%1 υπολείπονται"
+
+#. ($count)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2001
+msgid "%1 sets"
+msgstr ""
+
+#. ($numAdded,                     $numSkipped,
+#. join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:608
+msgid "%1 sets added, %2 sets skipped. Skipped sets: (%3)"
+msgstr "προσθήκη %1 σύνολα ασκήσεων, παράλειψη %2 σύνολα ασκήσεων. Παραλείψεις: (%3)"
+
+#. ($numExported, $numSkipped,                     $numSkipped ? $c->tag('ul',
+#. $c->c(map { $c->tag('li', $_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:673
+msgid "%1 sets exported, %2 sets skipped. Skipped sets: (%3)"
+msgstr "εξαγωγή %1 σύνολα ασκήσεων, παράλειψη %2 σύνολα ασκήσεων. Παραλείψεις: (%3)"
+
+#. ($count, $numUsers)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
+msgid "%1 students out of %2"
+msgstr "%1 σπουδαστές από %2"
+
+#. ($rename_oldCourseID,          $rename_oldCourseTitle,
+#. $rename_newCourseTitle,
+#. $rename_oldCourseInstitution, $rename_newCourseInstitution)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:675
+msgid "%1 title and institution changed from %2 to %3 and from %4 to %5"
+msgstr "%1 τίτλος και ίδρυμα άλλαξαν από %2 σε %3 και από %4 σε %5"
+
+#. (scalar @userIDsToExport, "$dir/$fileName")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:477
+msgid "%1 users exported to file %2"
+msgstr ""
+
+#. ($numReplaced, $numAdded, $numSkipped, join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:443
+msgid ""
+"%1 users replaced, %2 users added, %3 users skipped. Skipped users: (%4)"
+msgstr "αντικατάσταση %1, προσθήκη %2, παράλειψη %3 χρηστών. Παραλείφθηκαν: (%4)"
+
+#. ($percentage)
+#. ($level_percentage)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:12
+msgid "%1% Complete"
+msgstr "Ολοκληρώθηκε %1%"
+
+#. (wwRound(0, $answerScore * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:248
+msgid "%1% correct"
+msgstr "%1% σωστό"
+
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:57
+msgid "%1's Current Address"
+msgstr "Τρέχουσα διεύθυνση για %1"
+
+#. ($c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:26
+msgid "%1's Current Password"
+msgstr "Τρέχων κωδικός πρόσβασης για %1"
+
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:65
+msgid "%1's New Address"
+msgstr "Νέα διεύθυνση για %1"
+
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:34
+msgid "%1's New Password"
+msgstr "Νέος κωδικός πρόσβασης %1"
+
+#. ($e_user_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:76
+msgid "%1's password has been changed."
+msgstr "Ο κωδικός πρόσβασης για %1 έχει αλλάξει."
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#. ($c->tag('span', dir => 'ltr', $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1069
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:149
+msgid "%1: Problem %2"
+msgstr "%1: Πρόβλημα %2"
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:357
+msgid "%1: Problem %2 Show Me Another"
+msgstr "%1: Πρόβλημα %2 Παρόμοιο Πρόβλημα"
+
+#. ($days)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:87
+msgid "%quant(%1,day)"
+msgstr ""
+
+#. ($n)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:389
+msgid "%quant(%1,file) unpacked successfully"
+msgstr "%quant(%1,αρχείο) αποσυμπιέστ. επιτυχώς"
+
+#. ($hours)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:88
+msgid "%quant(%1,hour)"
+msgstr ""
+
+#. ($minutes)
+#. (sprintf('%3.1f', $testTime)
+#. ($timeLeft)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:89
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:150
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:168
+msgid "%quant(%1,minute)"
+msgstr ""
+
+#. ($numBlanks)
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:430
+msgid ""
+"%quant(%1,of the questions remains,of the questions remain) unanswered."
+msgstr "%quant(%1,των ερωτήσεων απομένει, των ερωτήσεων απομένουν) αναπάντητες."
+
+#. ($seconds)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:90
+msgid "%quant(%1,second)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:505
+msgid "%score"
+msgstr "%score"
+
+#. ($dcount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:40
+msgid "(%quant(%1,item) total)"
+msgstr ""
+
+#. ($count)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:29
+msgid "(%quant(%1,item))"
+msgstr ""
+
+#. ($problemValue)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1081
+msgid "(%quant(%1,point))"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:697
+msgid "(Any unsaved changes will be lost.)"
+msgstr "(Οι μη αποθηκευμένες αλλαγές θα χαθούν.)"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:102
+msgid "(If an action cannot be executed it will not appear.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1262
+msgid "(This problem will not count towards your grade.)"
+msgstr "(Αυτό το πρόβλημα δεν θα μετρήσει στον βαθμό σας.)"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:340
+msgid ""
+"(This test is overtime because it was not submitted in the allowed time.)"
+msgstr "(Το τεστ είναι εκπρόθεσμο επειδή δεν υποβλήθηκε εμπρόθεσμα.)"
+
+#. ($testNoun, $c->formatDateTime($c->{set}->answer_date)
+# $testNoun is either "test" or "submission"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:153
+msgid "(Your score on this %1 is not available until %2.)"
+msgstr "(Ο βαθμός σας για αυτό %1 δεν είναι διαθέσιμος έως %2.)"
+
+#. ($testNoun)
+# $testNoun is either "test" or "submission"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:155
+msgid "(Your score on this %1 is not available.)"
+msgstr "(Ο βαθμός σας για αυτό %1 δεν είναι διαθέσιμος.)"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1257
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1267
+msgid "(correct)"
+msgstr "(σωστό)"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:263
+msgid "(in target set)"
+msgstr "(ήδη στο σύνολο ασκήσεων)"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1269
+msgid "(incorrect)"
+msgstr "(λάθος)"
+
+#. ($pgScore)
+#. ($recScore)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1271
+msgid "(score %1)"
+msgstr "(βαθμός %1)"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:207
+msgid "(test) After version answer date"
+msgstr ""
+
+#. ($versionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:164
+msgid "(version %1)"
+msgstr ""
+
+#. ($display_sort_method_name{$secondary_sort_method})
+#. ($display_sort_method_name{$ternary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:103
+msgid ", then by %1"
+msgstr ", τότε κατά %1"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:702
+msgid ". If this is a class roster, rename it to have extension \".lst\""
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:81
+msgid "0 seconds"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1997
+msgid "1 set"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1983
+msgid "1 student"
+msgstr "1 σπουδαστής"
+
+#. (wwRound(2, $weights[$part] * 100)
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:58
+msgid "<b>Weight:</b> %1%"
+msgstr "<b>Βάρος:</b> %1% "
+
+#: /opt/webwork/webwork2/conf/defaults.config:1651
+msgid ""
+"<p>After the Reduced Scoring Date all additional work done by the student "
+"counts at a reduced rate. Here is where you set the reduced rate which must "
+"be a percentage. For example if this value is 50% and a student views a "
+"problem during the Reduced Scoring Period, they will see the message \"You "
+"are in the Reduced Scoring Period: All additional work done counts 50% of "
+"the original.\" </p><p>To use this, you also have to enable Reduced Scoring "
+"and set the Reduced Scoring Date for individual assignments by editing the "
+"set data using the Hmwk Sets Editor.</p><p>This works with the "
+"avg_problem_grader (which is the the default grader) and the "
+"std_problem_grader (the all or nothing grader). It will work with custom "
+"graders if they are written appropriately.</p>"
+msgstr "<p>Μετά την Ημερομηνία Μειωμένης Βαθμολογίας όλη η επιπλέον εργασία του σπουδαστή μετρά με μειωμένο δείκτη. Εδώ ορίζετε τον δείκτη ο οποίος πρέπει να είναι σε ποσοστά. Για παράδειγμα, εάν η τιμή είναι 50% και ένας σπουδαστής βλέπει ένα πρόβλημα κατά τη διάρκεια της Περιόδου Μειωμένης Βαθμολογίας, θα δει το μήνυμα \"Είσαι στην Περίοδο Μειωμένης Βαθμολογίας: Η επιπλέον εργασία μετρά 50% της αρχικής.\" </p><p>Η χρήση του απαιτεί να ενεργοποιήσεις τη Μειωμένη Βαθμολογία και να ορίσεις την Ημερομηνία Μειωμένης Βαθμολογίας για ατομικές εργασίες ρυθμίζοντας τα δεδομένα των συνόλων ασκήσεων χρησιμοποιώντας την Επεξεργασία Συνόλων Ασκήσεων Hmwk .</p><p>Αυτό λειτουργεί με το avg_problem_grader (που είναι ο προεπιλεγμένος βαθμολογητής) και το std_problem_grader (όλα ή τίποτα βαθμολογητής). Λειτουργεί</p> με εξατομικευμένους βαθμολογητές αν είναι γραμμένοι κατάλληλα.</p>"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1937
+msgid ""
+"<p>During summer 2005, a newer version of the answer checkers was "
+"implemented for answers which are functions and numbers.  The newer checkers"
+" allow more functions in student answers, and behave better in certain "
+"cases.  Some problems are specifically coded to use new (or old) answer "
+"checkers.  However, for the bulk of the problems, you can choose what the "
+"default will be here.</p><p>Choosing <i>false</i> here means that the newer "
+"answer checkers will be used by default, and choosing <i>true</i> means that"
+" the old answer checkers will be used by default.</p>"
+msgstr "<p>Το καλοκαίρι του 2005 υλοποιήθηκε μία καινούργια έκδοση των ελεγκτών απάντησης για απαντήσεις που είναι συναρτήσεις ή αριθμοί.  Οι καινούργιοι ελεγκτές απάντησης επιτρέπουν να χρησιμοποιηθούν περισσότερες συναρτήσεις και συμπεριφέρονται καλύτερα στις περισσότερες περιπτώσεις. Μερικά προβλήματα είναι προγραμματισμένα να χρησιμοποιούν συγκεκριμένους ελεγκτές απάντησης (είτε τους παλιούς είτε τους καινούργιους). Για όλα τα υπόλοιπα προβλήματα μπορείτε να επιλέξετε εδώ ποιους ελεγκτές απάντησης θα χρησιμοποιήσετε. </p><p>Διαλέξτε <i><<Λάθος>></i> εάν θέλετε να χρησιμοποιήσετε τους καινούργιους ελεγκτές απάντησης. Αλλιώς διαλέξτε  <i><<Σωστό>></i> για να χρησιμοποιήσετε τους παλιούς ελεγκτές απάντησης.</p>"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1908
+msgid ""
+"<p>MathQuill renders students answers in real-time as they type on the "
+"keyboard.</p><p>MathView allows students to choose from a variety of common "
+"math structures (such as fractions and square roots) as they attempt to "
+"input their answers.</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1459
+msgid ""
+"<p>Mode in which the LANG and DIR settings for a single problem are "
+"determined.</p><p>The system will set the LANGuage attribute to either a "
+"value determined from the problem, a course-wide default, or the system "
+"default, depending on the mode selected. The tag will only be added to the "
+"DIV enclosing the problem if it is different than the value which should be "
+"set in the main HTML tag set for the entire course based on the course "
+"language.</p><p>There are two options for the DIRection attribute: \"ltr\" "
+"for left-to-write scripts, and \"rtl\" for right-to-left scripts like Arabic"
+" and Hebrew.</p><p>The DIRection attribute is needed to trigger proper "
+"display of the question text when the problem text-direction is different "
+"than that used by the current language of the course. For example, English "
+"problems from the library browser would display improperly in RTL mode for a"
+" Hebrew course, unless the problen Direction is set to LTR.</p><p>The "
+"feature to set a problem language and direction was only added in 2018 to "
+"the PG language, so most problems will not declare their language, and the "
+"system needs to fall back to determining the language and direction in a "
+"different manner. The OPL itself is all English, so the system wide fallback"
+" is to en-US in LTR mode.</p><p>Since the defaults fall back to the LTR "
+"direction, most sites should be fine with the \"auto::\" mode, but may want "
+"to select the one which matches their course language. The mode "
+"\"force::ltr\" would also be an option for a course which runs into trouble "
+"with the \"auto\" modes.</p><p>Modes:</p><ul><li>\"none\" prevents any "
+"additional LANG and/or DIR tag being added. The browser will use the main "
+"setting which was applied to the entire HTML page. This is likely to cause "
+"trouble when a problem of the other direction is "
+"displayed.</li><li>\"auto::\" allows the system to make the settings based "
+"on the language and direction reported by the problem (a new feature, so not"
+" set in almost all existing problems) and falling back to the expected "
+"default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" allows the "
+"system to make the settings based on the language and direction reported by "
+"the problem (a new feature, so not set in almost all existing problems) but "
+"falling back to the language with the given LangCode and the direction Dir "
+"when problem settings are not available from PG.</li><li>\"auto::Dir\" for "
+"problems without PG settings, this will use the default en=english language,"
+" but force the direction to Dir. Problems with PG settings will get those "
+"settings.</li><li>\"auto:LangCode:\" for problems without PG settings, this "
+"will use the default LTR direction, but will set the language to "
+"LangCode.Problems with PG settings will get those "
+"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
+" by the PG code of the problem, and will force the system to set the "
+"language with the given LangCode and the direction to Dir for <b>all</b> "
+"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
+"PG code of the problem, and will force the system to set the direction to "
+"Dir for <b>all</b> problems, but will avoid setting any language attribute "
+"for individual problem.</li></ul>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1514
+msgid ""
+"<p>Some servers handle courses taking place in different timezones.  If this"
+" course is not showing the correct timezone, enter the correct value here.  "
+"The format consists of unix times, such as \"America/New_York\", "
+"\"America/Chicago\", \"America/Denver\", \"America/Phoenix\" or "
+"\"America/Los_Angeles\".</p>Complete list: <a "
+"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1638
+msgid ""
+"<p>This sets whether the Reduced Scoring system will be enabled.  If enabled"
+" you will need to set the default length of the reduced scoring period and "
+"the value of work done in the reduced scoring period below.</p><p>To use "
+"this, you also have to enable Reduced Scoring for individual assignments and"
+" set their Reduced Scoring Dates by editing the set data.</p><p>This works "
+"with the avg_problem_grader (which is the the default grader) and the "
+"std_problem_grader (the all or nothing grader).  It will work with custom "
+"graders if they are written appropriately.</p>"
+msgstr "<p>Αυτό ορίζει αν θα ενεργοποιηθεί το σύστημα Μειωμένης Βαθμολόγησης. Αν ενεργοποιηθεί θα χρειαστεί να ορίσετε την προεπιλεγμένη διάρκεια της περιόδου μειωμένης βαθμολόγησης και την αξία της προσπάθειας που έγινε κατά την περίοδο της μειωμένης βαθμολόγησης παρακάτω.</p><p>Η χρήση του απαιτεί να ενεργοποιήσετε τη Μειωμένη Βαθμολόγηση για ατομικές εργασίες και να ορίσετε τις Ημερομηνίες Μειωμένης Βαθμολόγησης τους ρυθμίζοντας τα δεδομένα του συνόλου ασκήσεων.</p><p>Αυτό λειτουργεί με το avg_problem_grader (που είναι ο προεπιλεγμένος βαθμολογητής) και το std_problem_grader (όλα ή τίποτα βαθμολογητής). Λειτουργεί με εξατομικευμένους βαθμολογητές αν είναι γραμμένοι κατάλληλα.</p>"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1881
+msgid ""
+"<p>When viewing a problem, users may choose different methods of rendering "
+"formulas via an options box in the left panel. Here, you can adjust what "
+"display modes are listed.</p><p>Some display modes require other software to"
+" be installed on the server. Be sure to check that all display modes "
+"selected here work from your server.</p><p>The display modes "
+"are</p><ul><li>plainText: shows the raw LaTeX strings for "
+"formulas.</li><li>images: produces images using the external programs LaTeX "
+"and dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place"
+" render mathematics.</li></ul><p>You must use at least one display mode. If "
+"you select only one, then the options box will not give a choice of modes "
+"(since there will only be one active).</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1476
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with a question in "
+"this test. Please inform your instructor including the warning messages "
+"below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1236
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with this question. "
+"Please inform your instructor including the warning messages below."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1730
+msgid ""
+"<ul><li><b>SMAcheckAnswers</b>: enables the Check Answers button <i>for the "
+"new problem</i> when Show Me Another is "
+"clicked</li><li><b>SMAshowSolutions</b>: shows walk-through solution <i>for "
+"the new problem</i> when Show Me Another is clicked; a check is done first "
+"to make sure that a solution exists </li><li><b>SMAshowCorrect</b>: correct "
+"answers <i>for the new problem</i> can be viewed when Show Me Another is "
+"clicked; note that <b>SMAcheckAnswers</b>needs to be enabled at the same "
+"time</li><li><b>SMAshowHints</b>: show hints <i>for the new problem</i> "
+"(assuming they exist)</li></ul>Note: there is very little point enabling the"
+" button unless you check at least one of these options - the students would "
+"simply see a new version that they can not attempt or learn from."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:35
+msgid "A URL for the LMS"
+msgstr "URL για το LMS"
+
+#. ($add_courseID)
+#. ($rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:600
+msgid "A course with ID %1 already exists."
+msgstr "Υπάρχει ήδη μάθημα με κωδικό %1."
+
+#. ($courseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1220
+msgid ""
+"A directory already exists with the name %1. You must first delete this "
+"existing course before you can unarchive."
+msgstr "Υπάρχει ήδη κατάλογος με το όνομα %1. Διαγράψτε το υπάρχον μάθημα πριν κάνετε αποσυμπίεση."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:111
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:42
+msgid ""
+"A file name cannot begin with a dot, it cannot be empty, it cannot contain a"
+" directory path component and only the characters -_.a-zA-Z0-9 and space are"
+" allowed."
+msgstr "Το όνομα αρχείου δεν ξεκινά με τελεία, δεν είναι κενό, δεν έχει στοιχείο διαδρομής καταλόγου. Επιτρέπονται οι χαρακτήρες -_.a-zA-Z0-9 και το πλήκτρο διαστήματος."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:738
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+msgid "A file with that name already exists"
+msgstr "Υπάρχει ήδη αρχείο με αυτό το όνομα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:19
+msgid ""
+"A hardcopy file was generated, but it may not be complete or correct. Please"
+" check that no problems are missing and that they are all legible. If not, "
+"please inform your instructor."
+msgstr "Δημιουργήθηκε έντυπο αρχείο, αλλά μπορεί να μην είναι πλήρες ή σωστό. Ελέγξτε ότι δεν λείπουν προβλήματα και ότι είναι ευανάγνωστα. Έαν όχι, ενημερώστε τον καθηγητή σας."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:56
+msgid ""
+"A hash reference in which the keys are the achievement_id's assigned to the "
+"current user and the values are 0 or 1 which stores if the user has earned "
+"the associated achievement or not."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:52
+msgid ""
+"A hash reference which contains a problems metadata, such as DBsubject, "
+"DBchapter, DBsection,  and so on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:37
+msgid "A hash reference which contains the problem data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:40
+msgid "A hash reference which contains the set data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:60
+msgid ""
+"A hash reference which saves data for this user and this achievement. This "
+"hash is persistent between evaluations and changes to this variable will be "
+"saved in the database."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:64
+msgid ""
+"A hash reference which saves global data for this user. This hash is "
+"persistent between evaluations and changes to this variable will be saved in"
+" the database."
+msgstr ""
+
+#. ($locationID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1695
+msgid ""
+"A location with the name %1 already exists in the database.  Did you mean to"
+" edit that location instead?"
+msgstr "Υπάρχει ήδη τοποθεσία με όνομα %1 στη βάση δεδομένων. Μήπως θέλατε να επεξεργαστείτε αυτήν την τοποθεσία;"
+
+#. ($mail_data->{subject}, $number_of_recipients, $mail_data->{courseName},
+#. $failed_messages)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:113
+msgid ""
+"A message with the subject line \"%1\" has been sent to %quant(%2,recipient)"
+" in the class %3.  There were %4 message(s) that could not be sent."
+msgstr "Ένα μήνυμα με θέμα \"%1\" έχει αποσταλεί στο %quant(%2,recipient) στην τάξη %3. Υπήρχαν %4 μηνύματα που δεν μπόρεσαν να αποσταλούν."
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:315
+msgid "A new file has been created at \"%1\""
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1146
+msgid "A new file has been created at \"%1\" with the contents below."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:154
+msgid ""
+"A new problem whose path ends in newProblem.pg should be given a new name, "
+"for example, \"myNewProblem.pg\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:20
+msgid ""
+"A student must be assigned a homework set in order for it to appear on their"
+" WeBWorK home page. Check the box in the left column to assign a student to "
+"that homework set. Uncheck the box to unassign a student. If a student is "
+"unassigned from a homework set, all of the student's data for that homework "
+"set is deleted and cannot be recovered. Use this action cautiously!"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:20
+msgid ""
+"A student needs to be assigned a set in order for them to work it. Once a "
+"student is unassigned a set, all the data for them is lost and there is no "
+"way to undo it. When unassigning be sure to change the option to \"Allow "
+"unassign\"."
+msgstr ""
+
+# Leave symbol codes in place
+#: /opt/webwork/webwork2/conf/defaults.config:1549
+msgid ""
+"A switch to govern the use of a Progress Bar for the student; this also "
+"enables/disables the highlighting of the current problem in the side bar, "
+"and whether it is correct (&#x2713;), in progress (&hellip;), incorrect "
+"(&#x2717;), or unattempted (no symbol)."
+msgstr "Διακόπτης διαχείρισης Μπάρας Προόδου σπουδαστή. Επίσης ενεργοποιεί/απενεργοποιεί την επισήμανση του τρέχοντος προβλήματος στην ακριανή μπάρα, καθώς και αν είναι σωστό (&#x2713;), σε εξέλιξη (&hellip;), λανθασμένο (&#x2717;), ή χωρίς απόπειρα (χωρίς σύμβολο)."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:42
+msgid "A unique key identifying the achievement."
+msgstr ""
+
+# Short for ADJUSTED STATUS
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:535
+msgid "ADJ STATUS"
+msgstr "ΔΙΟΡΘ. ΠΟΣΟΣΤΟ"
+
+#. ($c->{scoreRecordedMessage}[ $probOrder->[$i] ])
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:504
+msgid "ANSWERS NOT RECORDED -- %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1505
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:515
+msgid "ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"
+msgstr "ΜΟΝΟ ΕΛΕΓΧΟΣ ΑΠΑΝΤΗΣΕΩΝ -- ΜΗ ΚΑΤΑΓΡΑΦΗ ΑΠΑΝΤΗΣΕΩΝ"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1527
+msgid ""
+"ATTEMPT NOT ACCEPTED -- Please submit answers again (or request new version "
+"if neccessary)."
+msgstr "ΠΡΟΣΠΑΘΕΙΑ ΑΝΕΠΙΤΥΧΗΣ -- Παρακαλούμε υποβάλετε τις απαντήσεις ξανά  (ή ζητήστε νέα έκδοση αν χρειαστεί)."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_password_form.html.ep:1
+msgid "Abandon changes"
+msgstr "Ανάκληση αλλαγών"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_export_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_export_form.html.ep:1
+msgid "Abandon export"
+msgstr "Ανάκληση εξαγωγής"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:520
+msgid ""
+"Account creation is currently disabled in this course.  Please speak to your"
+" instructor or system administrator."
+msgstr "Η δημιουργία λογαριασμού σε αυτό το μάθημα είναι απενεργοποιημένη αυτή τη στιγμή. Παρακαλούμε επικοινωνήστε με τον καθηγητή σας ή τον διαχειριστή συστήματος."
+
+#. ($targetAchievementID,			$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:310
+msgid "Achievement %1 created with evaluator \"%2\"."
+msgstr ""
+
+#. ($newAchievementID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:378
+msgid "Achievement %1 exists.  No achievement created"
+msgstr "Το επίτευγμα %1 υπάρχει. Δεν δημιουργήθηκε κανένα επίτευγμα"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:444
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:63
+msgid "Achievement Editor"
+msgstr "Επεξεργασία Επιτευγμάτων"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:17
+msgid "Achievement Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:17
+msgid "Achievement Evaluator Editor Help"
+msgstr ""
+
+#. ($c->stash('achievementID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:109
+msgid "Achievement Evaluator for achievement %1"
+msgstr "Αξιολογητής Επιτεύγματος για το επίτευγμα %1"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:13
+msgid "Achievement ID"
+msgstr "Κωδικός Επιτεύγματος"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:274
+msgid "Achievement ID exists!  No new achievement created.  File not saved."
+msgstr "Ο Κωδικός Επιτεύγματος υπάρχει! Δεν δημιουργήθηκε νέο επίτευγμα. Το αρχείο δεν αποθηκεύτηκε."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:41
+msgid "Achievement ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:3
+msgid "Achievement List"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1600
+msgid "Achievement Points Per Problem"
+msgstr "Πόντοι Επιτευγμάτων Ανά Πρόβλημα"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:455
+msgid "Achievement User Editor"
+msgstr "Επεξεργασία Επιτευγμάτων Χρήστη"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:17
+msgid "Achievement User Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:48
+msgid "Achievement has been assigned to all users."
+msgstr "Έγινε ανάθεση επιτεύγματος σε όλους τους χρήστες."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:67
+msgid "Achievement has been assigned to selected users."
+msgstr "Έγινε ανάθεση επιτεύγματος στους επιλεγμένους χρήστες."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:60
+msgid "Achievement has been unassigned to all students."
+msgstr "Έγινε ανάκληση επιτεύγματος σε όλους τους χρήστες."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:38
+msgid "Achievement options"
+msgstr ""
+
+#. ($c->link_to(                           $scoreFileName => $c->systemLink(
+#. $c->url_for('instructor_file_manager')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:318
+msgid "Achievement scores saved to %1"
+msgstr "Οι βαθμοί επιτεύγματος αποθηκεύτηκαν στο %1"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:241
+msgid "Achievements"
+msgstr "Επιτεύγματα"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:17
+msgid "Achievements Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:26
+msgid ""
+"Achievements are evaluated in the order shown below, with the exception of "
+"\"level\" achievements.  Achievements in the \"level\" category are "
+"evaluated first and control the XP thresholds and rewards (achievement "
+"items) for reaching each level. Achievements in the \"secret\" category are "
+"not shown to students until they earn the achievement, and is used for "
+"fun/surprise achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:32
+msgid ""
+"Achievements in the same category, with sequential numbers, and whose ID "
+"starts with the same \"prefix_\" (up to the last underscore), are treated as"
+" achievement chains.  Achievement chains are a sequence of achievements "
+"which build upon themselves, such as complete one problem, complete 10 "
+"problems, complete 25 problems, and so on. Students will only see the "
+"achievements in the chain they have completed or are currently working on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:201
+msgid "Act as"
+msgstr "Ενεργεί ως"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:26
+msgid "Act as:"
+msgstr "Ενεργεί ως:"
+
+#. ($effectiveUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:26
+msgid "Acting as %1."
+msgstr "Ενεργεί ως %1."
+
+#. ($actionID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:223
+msgid "Action %1 not found"
+msgstr "Ενέργεια %1 δεν βρέθηκε"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:101
+msgid "Actions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1608
+msgid ""
+"Activating this will enable achievement rewards. This feature allows "
+"students to earn rewards by completing achievements that allow them to "
+"affect their homework in a limited way."
+msgstr "Θέτοντας σε λειτουργία αυτήν την επιλογή ενεργοποιείται τις ανταμοιβές επιτευγμάτων.Αυτή η λειτουργία επιτρέπει στους σπουδαστές να κερδίζουν ανταμοιβές με την ολοκλήρωση επιτευγμάτων που τους επιτρέπουν να επηρεάζουν τις εργασίες τους με περιορισμένο τρόπο."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:45
+msgid "Active"
+msgstr "Ενεργή"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:50
+msgid "Active Students"
+msgstr ""
+
+#. ($c->{prettyID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:19
+msgid "Active Students Problem %1 Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1593
+msgid ""
+"Activiating this will enable Mathchievements for webwork.  Mathchievements "
+"can be managed by using the Achievement Editor link."
+msgstr "Θέτοντας σε λειτουργία αυτήν την επιλογή ενεργοποιείται το Mathchievements για webwork. Η διαχείριση του Mathchievements γίνεται με τη χρήση του συνδέσμου Επεξεργασία Επιτευγμάτων."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:166
+msgid "Add"
+msgstr "Προσθήκη"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:89
+msgid "Add All"
+msgstr "Προσθήκη Όλων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:32
+msgid "Add Course"
+msgstr "Προσθήκη Μαθήματος"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:17
+msgid "Add Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:14
+msgid "Add Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:98
+msgid "Add Students"
+msgstr "Προσθήκη Σπουδαστών"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:349
+msgid "Add Users"
+msgstr "Προσθήκη Χρηστών"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:17
+msgid "Add Users Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:47
+msgid "Add WeBWorK administrators to new course"
+msgstr "Προσθήκη διαχειριστών WeBWorK σε νέο μάθημα"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:79
+msgid "Add a TA or an instructor (change permission level of user)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:60
+msgid "Add a few students to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:50
+msgid "Add a new version for which test?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:20
+msgid "Add as what filetype?"
+msgstr "Προσθήκη ως τι αρχείο;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/add_form.html.ep:3
+msgid "Add how many users?"
+msgstr "Προσθήκη πόσους χρήστες;"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:69
+msgid "Add many students to a course from a class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:108
+msgid "Add n blank problem template(s) to the end of homework set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:164
+msgid "Add problem to target set"
+msgstr "Προσθήκη προβλήματος στο σύνολο ασκήσεων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
+msgid "Add problems to"
+msgstr "Προσθήκη προβλημάτων στο"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:161
+msgid ""
+"Add this problem as the last problem of an existing set, either as a problem"
+" or as the set header (the text that appears on the home page of a homework "
+"set). You can rearrange the order of the problems later using the \"Hmwk "
+"Sets Editor\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:7
+msgid "Add to what set?"
+msgstr "Προσθήκη σε ποιο σύνολο ασκήσεων;"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:20
+msgid ""
+"Add users to the course.  Select the number of students/users to add and "
+"then add any desired information.  The only mandatory information is the "
+"\"Login Name\". Any other fields may be left blank.  The \"Student ID\" will"
+" be the initial password for the user if provided."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:26
+msgid "Add which new users?"
+msgstr "Προσθήκη ποιων νέων χρηστών;"
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:883
+msgid "Added \"%1\" to %2 as new hardcopy header"
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:854
+msgid "Added \"%1\" to %2 as new set header"
+msgstr ""
+
+#. ('{number}', '{set}')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:27
+msgid "Added %1 problems to set %2."
+msgstr "Προσθήκη %1 προβλημάτων στο σύνολο ασκήσεων %2."
+
+#. ($new_file_path, $setID, $targetProblemNumber)
+#. ($sourceFilePath,                       $targetSetName,                 (
+#. $set->assignment_type eq 'jitar'                                ? join('.',
+#. jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:825
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1837
+msgid "Added %1 to %2 as problem %3"
+msgstr "Προσθήκη %1 στο %2 ως πρόβλημα %3"
+
+#. ($new_file_name,                                $c->{setID},
+#. (                                       $set->assignment_type eq 'jitar'
+#. ? join('.', jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1139
+msgid "Added %1 to %2 as problem %3."
+msgstr ""
+
+#. (join(', ', @toAdd)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1974
+msgid "Added addresses %1 to location %2."
+msgstr "Προσθήκη διευθύνσεων %1 στην τοποθεσία %2."
+
+#. ($user->user_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:167
+msgid "Added missing permission level for user %1."
+msgstr ""
+
+#. ('{set}')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:26
+msgid "Added one problem to set %1."
+msgstr "Προσθήκη ενός προβλήματος στο σύνολο ασκήσεων %1."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Added user:"
+msgstr ""
+
+#. ('<code>[Scoring]/report_grades_data.csv</code>',
+#. '<code>[TMPL]/email/report_grades.msg</code>',)
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:33
+msgid ""
+"Additional (external) grades can be shown on this page by placing them in "
+"the CSV file %1.  The first six columns must be (in order): Student ID, "
+"Username, Last Name, First Name, Section, Recitation.  The remaining columns"
+" can list any external grades.  To display the grades, the CSV file is "
+"merged with the \"Email\" message %2, which will be rendered and displayed "
+"below the grade table.  The message can be created on the \"Email\" page and"
+" the CSV file can be created/uploaded using the \"File Manager\".  External "
+"grades can only be displayed here and are not included in any totals or "
+"statistics."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2060
+msgid "Additional addresses for receiving feedback e-mail"
+msgstr "Επιπλέον διευθύνσεις για τη λήψη e-mail σχολίων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:235
+msgid "Additional submissions available."
+msgstr "Επιτρέπονται επιπλέον υποβολές."
+
+#. ($badLocAddr)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1708
+msgid ""
+"Address(es) %1 already exist in the database.  THIS SHOULD NOT HAPPEN!  "
+"Please double check the integrity of the WeBWorK database before continuing."
+msgstr "Η διεύθυνση %1 υπάρχει ήδη στη βάση δεδομένων. ΑΥΤΟ ΔΕΝ ΠΡΕΠΕΙ ΝΑ ΣΥΜΒΑΙΝΕΙ! Ελέγξτε ξανά την αξιοπιστία της βάσης δεδομένων WeBWorK πριν συνεχίσετε."
+
+#. (join(', ', @noAdd)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1986
+msgid ""
+"Address(es) %1 in the add list is(are) already in the location %2, and so "
+"were skipped."
+msgstr "Η διεύθυνση %1 στη λίστα προσθήκης είναι ήδη στην τοποθεσία %2, και έτσι παραλείφθηκε."
+
+#. (join(', ', @noDel)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2008
+msgid ""
+"Address(es) %1 in the delete list is(are) not in the location %2, and so "
+"were skipped."
+msgstr "Η διεύθυνση %1 στη λίστα διαγραφής δεν είναι στην τοποθεσία %2, και έτσι παραλείφθηκε."
+
+#. ($badAddr)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1683
+msgid ""
+"Address(es) %1 is(are) not in a recognized form.  Please check your data "
+"entry and resubmit."
+msgstr "Η διεύθυνση %1 δεν είναι σε εγκεκριμένη μορφή. Ελέγξτε την καταχώρησή σας και υποβάλετε εκ νέου."
+
+#. ($badAddr)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1998
+msgid ""
+"Address(es) %1 is(are) not in a recognized form.  Please check your data "
+"entry and try again."
+msgstr "Η διεύθυνση %1 δεν είναι σε εγκεκριμένη μορφή. Ελέγξτε την καταχώρισή σας και προσπαθήστε ξανά."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:117
+msgid "Addresses"
+msgstr "Διευθύνσεις"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:53
+msgid ""
+"Addresses for new location.  Enter one per line, as single IP addresses "
+"(e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP ranges "
+"(e.g., 192.168.1.101-192.168.1.150):"
+msgstr "Διευθύνσεις για τη νέα τοποθεσία. Εισάγετε μία ανά γραμμή είτε π.χ., 192.168.1.101 είτε π.χ., 192.168.1.0/24 είτε π.χ., 192.168.1.101-192.168.1.150:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:27
+msgid ""
+"Addresses to add to the location.  Enter one per line, as single IP "
+"addresses (e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP"
+" ranges (e.g., 192.168.1.101-192.168.1.150):"
+msgstr "Διευθύνσεις για προσθήκη στην τοποθεσία. Εισάγετε μία ανά γραμμή είτε π.χ., 192.168.1.101 είτε π.χ., 192.168.1.0/24 είτε π.χ., 192.168.1.101-192.168.1.150:"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:27
+msgid "Adds 24 hours to the close date of a homework."
+msgstr "Προσθέτει 24 ώρες στην ημερομηνία λήξης μίας εργασίας."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:27
+msgid "Adds 48 hours to the close date of a homework."
+msgstr "Προσθέτει 48 ώρες στην ημερομηνία λήξης μιας εργασίας για το σπίτι."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:110
+msgid ""
+"Adds new template problems to the set when the set is saved. You can modify "
+"the template to create your own problem, by clicking on the \"Edit Problem\""
+" link and saving to some new file, e.g. \"myNewProblem.pg\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:19
+msgid "Adjusted Status"
+msgstr "Διορθωμένο Ποσοστό"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:56
+msgid "Adobe PDF"
+msgstr "Adobe PDF"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:42
+msgid "Advanced Search"
+msgstr "Σύνθετη Αναζήτηση"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:206
+msgid "After set answer date"
+msgstr "Μετά την ημερομηνία απάντησης του συνόλου ασκήσεων"
+
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:33
+msgid ""
+"After the due date this set enters a reduced scoring period until it closes "
+"on %1.  All work completed during the reduced scoring period counts for %2% "
+"of its value."
+msgstr ""
+
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:304
+msgid "Afterward reduced credit can be earned until %1."
+msgstr "Έπειτα η μειωμένη πίστωση μπορεί να αποκτηθεί έως %1."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:23
+msgid "All Chapters"
+msgstr "Όλα τα κεφάλαια"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:34
+msgid "All Sections"
+msgstr "Όλες οι Eνότητες"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:6
+msgid "All Selected Constraints Joined by \"And\""
+msgstr "Όλοι οι επιλεγμένοι περιορισμοί συνδέονται με «και»"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:71
+msgid "All Sets"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:12
+msgid "All Subjects"
+msgstr "Όλα τα Θέματα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:48
+msgid "All Textbooks"
+msgstr "Όλα τα Βιβλία"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:54
+msgid "All Users"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:49
+msgid "All assignments were made successfully."
+msgstr "Όλες οι εργασίες πραγματοποιήθηκαν επιτυχώς."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:386
+msgid "All listed sets were hidden from all the students"
+msgstr "Όλα τα εμφανιζόμενα σύνολα ασκήσεων αποκρυμμένα από όλους τους σπουδαστές"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:381
+msgid "All listed sets were made visible for all the students"
+msgstr "Όλα τα εμφανιζόμενα σύνολα ασκήσεων έγιναν ορατά για όλους τους σπουδαστές"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:407
+msgid "All of the answers above are correct."
+msgstr "Όλες οι παραπάνω απαντήσεις είναι σωστές."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:398
+msgid "All of the gradeable answers above are correct."
+msgstr "Όλες οι παραπάνω βαθμολογημένες απαντήσεις είναι σωστές."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:162
+msgid ""
+"All of the paths for problem files are relative to the templates directory "
+"of the current course. You can access this directory \"directly\" using the "
+"File Manager page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:68
+msgid "All of these files will also be made available for mail merge."
+msgstr "Όλα αυτά τα αρχεία θα είναι επίσης διαθέσιμα για συγχώνευση mail."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:9
+msgid "All problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:5
+msgid "All sections"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2145
+msgid "All selected courses are already hidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2214
+msgid "All selected courses are already unhidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:399
+msgid "All selected sets hidden from all students"
+msgstr "Όλα τα επιλεγμένα σύνολα ασκήσεων αποκρύπτονται από όλους τους σπουδαστές"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:394
+msgid "All selected sets made visible for all students"
+msgstr "Όλα τα επιλεγμένα σύνολα ασκήσεων γίνονται ορατά για όλους τους σπουδαστές"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:373
+msgid "All sets hidden from all students"
+msgstr "Όλα τα σύνολα ασκήσεων κρυμμένα από όλους τους σπουδαστές"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:368
+msgid "All sets made visible for all students"
+msgstr "Όλα τα σύνολα ασκήσεων ορατά για όλους τους σπουδαστές"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:619
+msgid "All sets were selected for export."
+msgstr "Επιλέχτηκαν για εξαγωγή όλα τα σύνολα ασκήσεων."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:54
+msgid "All unassignments were made successfully."
+msgstr "Όλα τα ανεκχώρητα έγιναν με επιτυχία."
+
+#: /opt/webwork/webwork2/conf/defaults.config:1948
+msgid "Allow Unicode alternatives in student answers"
+msgstr "Επιτρέπονται οι Unicode εναλλακτικές στις απαντήσεις των σπουδαστών "
+
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:74
+msgid "Allow the LMS to update user account data"
+msgstr "Να επιτρέπεται στο LMS η ενημέρωση δεδομένων λογαριασμού χρήστη"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:68
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:105
+msgid "Allow unassign"
+msgstr "Επιτρέπεται η αναίρεση ανάθεσης"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1970
+msgid "Allowed error, as a percentage, for numerical comparisons"
+msgstr "Επιτρέπεται σφάλμα, ως ποσοστό, για αριθμητικές συγκρίσεις"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1788
+msgid "Allowed to <em>act as</em> another user"
+msgstr "Επιτρέπεται στο<em>να δρα ως</em> άλλος χρήστης"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1825
+msgid "Allowed to change display settings used in pg problems"
+msgstr "Επιτρέπεται η αλλαγή ρυθμίσεων προβολής που χρησιμοποιούνται σε προβλήματα pg"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1815
+msgid "Allowed to change their e-mail address"
+msgstr "Επιτρέπεται η αλλαγή διεύθυνσης των e-mail τους"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1779
+msgid "Allowed to change their password"
+msgstr "Επιτρέπεται η αλλαγή του κωδικού πρόσβασής τους"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1774
+msgid "Allowed to login to the course"
+msgstr "Επιτρέπεται η σύνδεση στο μάθημα"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1852
+msgid "Allowed to see solutions before the answer date"
+msgstr "Επιτρέπεται να δείτε λύσεις πριν από την ημερομηνία απάντησης"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1847
+msgid "Allowed to see the correct answers before the answer date"
+msgstr "Επιτρέπεται να δείτε σωστές απαντήσεις πριν από την ημερομηνία απάντησης"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1836
+msgid "Allowed to view past answers"
+msgstr "Επιτρέπεται η προβολή προηγούμενων απαντήσεων"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1842
+msgid "Allowed to view problems in sets which are not open yet"
+msgstr "Επιτρέπεται η προβολή των προβλημάτων στα σύνολα ασκήσεων που δεν είναι ακόμη ανοιχτά"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:82
+msgid ""
+"Allows configuration of certain parameters, such as permission levels, "
+"default display mode for equations, and email feedback behavior, on a course"
+" by course basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:126
+msgid "Also copy simple configuration file"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:26
+msgid "Amulet of Extension"
+msgstr "Παράταση Yποβολής"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:20
+msgid ""
+"An achievement evaluator is a perl script that is run after each problem is "
+"submitted which returns a truth value of 0 (didn't earn) or 1 (earn). The "
+"evaluator is given access to different variables which contain data about "
+"the problem and set that is used to determine if the achievement is earned "
+"or not."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:37
+msgid ""
+"An address that can be used to log in to the LMS. This is used in messages "
+"to users that direct them to go back to the LMS to access something in the "
+"WeBWorK course."
+msgstr "Μια διεύθυνση που μπορεί να χρησιμοποιηθεί για τη σύνδεση στο LMS. Αυτή χρησιμοποιείται για μηνύματα προς τους χρήστες που τους κατευθύνουν πίσω στο LMS για να αποκτήσουν πρόσβαση σε κάτι στο WeBWorK μάθημα. "
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:43
+msgid ""
+"An array which lists the hash reference of all the problems in the current "
+"set."
+msgstr ""
+
+#. ($archive_courseID)
+#. ($unarchive_courseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1274
+msgid "An error occured while archiving the course %1:"
+msgstr "Σφάλμα κατά την αρχειοθέτηση του μαθήματος %1:"
+
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:658
+msgid "An error occured while changing the title of the course %1."
+msgstr "Σφάλμα κατά την αλλαγή τίτλου μαθήματος %1."
+
+#. ($delete_courseID)
+#. ($archive_courseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:878
+msgid "An error occured while deleting the course %1:"
+msgstr "Σφάλμα κατά την διαγραφή μαθήματος %1:"
+
+#. ($rename_oldCourseID,						$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:751
+msgid "An error occured while renaming the course %1 to %2:"
+msgstr "Σφάλμα κατά την αλλαγή ονόματος μαθήματος %1 σε %2:"
+
+#. ($part + 1)
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:25
+msgid "Answer %1 Score (%):"
+msgstr "Απάντηση %1 Βαθμός (%):"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:79
+msgid "Answer Date"
+msgstr "Ημερομηνία Απάντησης"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:39
+msgid "Answer Group Info"
+msgstr "Απάντησε Ομαδικές Πληροφορίες"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:59
+msgid "Answer Hash Info"
+msgstr "Απάντησε Πληροφορίες Κατακερματισμού"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:292
+msgid "Answer Log"
+msgstr "Καταφραφή Απαντήσεων"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:17
+msgid "Answer Log Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:285
+msgid "Answer Preview"
+msgstr "Προεπισκόπηση Απαντήσεων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:48
+msgid ""
+"Answer availability for tests depends on multiple settings.  This only "
+"indicates the template answer date has passed.  See set editor for actual "
+"availability."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1276
+msgid "Answer(s) submitted:"
+msgstr "Υποβληθείσες απανταήσεις:"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
+msgid "Answer:"
+msgstr "Απάντηση:"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
+msgid "Answers"
+msgstr "Απαντήσεις"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:37
+msgid "Answers Available"
+msgstr "Διαθέσιμες Απαντήσεις"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1202
+msgid "Answers cannot be due until on or after the open date!"
+msgstr "Οι απντήσεις δεν μπορούν να υποβληθούν μέχρι την ημερομηνία έναρξης ή μετά τη λήξη της!"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1197
+msgid "Answers cannot be made available until on or after the close date!"
+msgstr "Οι απαντήσεις δεν μπορούν να γίνουν διαθέσιμες μέχρι την ημερομηνία έναρξης ή λήξης!"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:21
+msgid ""
+"Any changes made below will be reflected in the achievement for ALL "
+"students."
+msgstr "Τυχόν αλλαγές που γίνονται παρακάτω θα αντανακλώνται στο επίτευγμα για ΟΛΟΥΣ τους σπουδαστές."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:175
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:69
+msgid "Any changes made below will be reflected in the set for ALL students."
+msgstr "Τυχόν αλλαγές που θα γίνουν παρακάτω θα αντανακλώνται στα σύνολα ασκήσεων για ΟΛΟΥΣ τους σπουδαστές."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:173
+msgid ""
+"Any changes made below will be reflected in the set for ONLY the student(s) "
+"listed above."
+msgstr "Τυχόν αλλαγές που θα γίνουν παρακάτω θα αντανακλώνται στα σύνολα ασκήσεων για ΟΛΟΥΣ τους προαναφερόμενους σπουδαστές."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:122
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:159
+msgid "Append"
+msgstr "Προσθήκη"
+
+#. (tag('strong', dir => 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:71
+msgid "Append to end of %1 set"
+msgstr "Προσθήκη στο τέλος του %1 συνόλου ασκήσεων"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:51
+msgid "Applying definitions theoretically and proof writing"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:91
+msgid "Archive"
+msgstr "Αρχειοθέτηση"
+
+#. ($archive, $n)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:361
+msgid "Archive \"%1\" created successfully (%quant( %2, file))"
+msgstr ""
+
+#. ($name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:525
+msgid "Archive \"%1\" deleted"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:38
+msgid "Archive Course"
+msgstr "Αρχειοθέτηση Μαθήματος"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:17
+msgid "Archive Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:63
+msgid "Archive Courses"
+msgstr "Αρχειοθέτηση Μαθημάτων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1158
+msgid "Archive next course"
+msgstr "Αρχειοθέτηση επόμενου μαθήματος"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:61
+msgid "Archived Courses"
+msgstr "Αρχειοθετημένα Μαθήματα"
+
+#. ($courseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:69
+msgid "Archived course as %1.tar.gz."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:25
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to access the .tar.gz files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:26
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to upload additional .tar.gz "
+"files to be unarchived."
+msgstr ""
+
+#. (tag('b', $archive_courseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:57
+msgid ""
+"Are you sure that you want to delete the course %1 after archiving? This "
+"cannot be undone!"
+msgstr "Είστε βέβαιοι πως θέλετε να διαγράψετε το μάθημα %1 μετά την αρχειοθέτηση; Δεν μπορεί να αναιρεθεί!"
+
+#. (tag('b', param('delete_courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:5
+msgid ""
+"Are you sure you want to delete the course %1? All course files and data "
+"will be destroyed. There is no undo available."
+msgstr "Είστε βέβαιοι πως θέλετε να διαγράψετε το μάθημα %1; Όλα τα αρχεία και τα δεδομένα θα καταστραφούν. Μη δυνατότητα αναίρεσης."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:64
+msgid ""
+"As the checkbox says, this includes a percentage grade column for each set."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:184
+msgid "Assign"
+msgstr "Ανάθεση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:62
+msgid "Assign All Sets to Current User"
+msgstr "Αναθέστε Όλα τα Συνόλα Ασκήσεων στον Τρέχοντα Χρήστη"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:106
+msgid "Assign achievements"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:43
+msgid "Assign and unassign selected exercise sets to selected users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:54
+msgid "Assign selected sets to selected users"
+msgstr "Ανάθεση επιλεγμένων συνόλων ασκήσεων σε επιλεγμένους χρήστες"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:154
+msgid "Assign sets to many students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:116
+msgid "Assign sets to one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:15
+msgid "Assign this achievement to which users?"
+msgstr "Σε ποιους χρήστες να γίνει η ανάθεση αυτού του επιτεύγματος;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:62
+msgid "Assign this set to which users?"
+msgstr "Σε ποιους χρήστες να γίνει η ανάθεση συνόλων ασκήσεων;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:15
+msgid "Assign to All Current Users"
+msgstr "Αναθέστε σε Όλους τους Τρέχοντες Χρήστες"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:3
+msgid "Assign which achievements?"
+msgstr "Ανάθεση ποιων επιτευγμάτων;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:35
+msgid "Assigned"
+msgstr "Ανατεθειμένα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:19
+msgid "Assigned Sets"
+msgstr "Ανατεθειμένα Σύνολα Ασκήσεων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:218
+msgid "Assigned achievements to users"
+msgstr "Ανατεθειμένα επιτεύγματα σε χρήστες"
+
+#. (link_to(						$c->setCountMessage($db->countUserSets($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:96
+msgid "Assigned to %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:212
+msgid "Assignment type"
+msgstr "Τύπος ανάθεσης"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1906
+msgid "Assist with the student answer entry process."
+msgstr "Βοήθεια κατά τη διαδικασία καταχώρισης απαντήσεων των σπουδαστών."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:417
+msgid "At least one of the answers above is NOT correct."
+msgstr "Τουλάχιστον μία από τις παραπάνω απαντήσεις ΔΕΝ είναι σωστή."
+
+# Short for "Attempts to Open Children"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:487
+msgid "Att. to Open Children"
+msgstr "Att. to Open Children"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:50
+msgid "Attachment:"
+msgstr "Επισύναψη:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:107
+msgid "Attempt to upgrade directories"
+msgstr "Επιχειρήστε να αναβαθμίσετε τους καταλόγους"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:449
+msgid "Attempted"
+msgstr "Επιχειρημένα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/attempts_row.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:73
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:13
+msgid "Attempts"
+msgstr "Επιχειρήσεις"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:93
+msgid "Audit"
+msgstr "Έλεγχος"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:360
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:366
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:460
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:466
+msgid "Authentication failed.  Please speak to your instructor."
+msgstr "Αποτυχία ταυτοποίησης. Παρακαλώ επικοι/στε με τον καθγητή σας."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/InstructorRPCHandler.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:44
+msgid "Authentication failed. Log in again to continue."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:116
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:69
+msgid "Author Info"
+msgstr "Πληροφορίες Συντάκτη"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:87
+msgid "Automatic"
+msgstr "Αυτόματο"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1959
+msgid ""
+"Automatically convert Full Width Unicode characters to their ASCII "
+"equivalents"
+msgstr "Αυτόματη μετατροπή των χαρακτήρων Full Width Unicode στις ASCII αντιστοιχίες τους"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:97
+msgid ""
+"Automatically render all problems in the set on this page when \"Save "
+"Changes\" or \"Reset Form\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:667
+msgid "Automatically render problems on page load"
+msgstr "Εμφάνιση προβ/των αυτόματα κατά την φόρτωση σελίδας"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:95
+msgid "Automatically render problems on page load."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:49
+msgid "Auxiliary Resources"
+msgstr "Βοηθητικές Πηγές"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:179
+msgid "Average Attempts"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:118
+msgid "Average Attempts Per Problem"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:115
+msgid "Average Percent"
+msgstr ""
+
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:558
+msgid "Backup created on %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:1
+msgid "Badges"
+msgstr "Σύμβολα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:106
+msgid "Basic Search"
+msgstr "Βασική Αναζήτηση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:28
+msgid "Before Open Date"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:31
+msgid ""
+"Below the file list is a button and options for uploading files. Click the "
+"\"Choose File\" button, select the file, then click \"Upload\". A single "
+"file or a compressed tar (.tgz) file can be uploaded and if the option is "
+"selected, the archive is automatically unpacked and deleted.  Generally the "
+"\"automatic\" option on Format will correctly pick the correct type of file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:83
+msgid "Binary"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+msgid "Both Start and Grade"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:26
+msgid "Box of Transmogrification"
+msgstr "Πλαίσιο Μετατροπής"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:40
+msgid "Browse"
+msgstr "Αναζήτηση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:16
+msgid "Browse from:"
+msgstr "Αναζ/ση από:"
+
+#: /opt/webwork/webwork2/conf/defaults.config:2072
+msgid ""
+"By default, feedback is always sent to all users specified to recieve "
+"feedback.  This variable sets the system to only email feedback to users who"
+" have the same section as the user initiating the feedback.  I.e., feedback "
+"will only be sent to section leaders."
+msgstr "Ως προεπιλογή, τα σχόλια πάντα στέλνονται σε όλους τους χρήστες που ορίζονται να λάβουν σχόλια. Η μεταβλητή ρυθμίζει το σύστημα να στέλνει σχόλια με email σε χρήστες που έχουν το ίδιο τμήμα με τον χρήστη που εισάγει τα σχόλια. Δηλαδή, σχόλια θα σταλθούν μόνο στους αρχηγούς τμημάτων. "
+
+#: /opt/webwork/webwork2/conf/defaults.config:2062
+msgid ""
+"By default, feedback is sent to all users above who have permission to "
+"receive feedback. Feedback is also sent to any addresses specified in this "
+"blank. Separate email address entries by commas."
+msgstr "Ως προεπιλογή, τα σχόλια στέλνονται σε όλους τους χρήστες που έχουν δικαίωμα να λάβουν σχόλια. Τα σχόλια στέλνονται επίσης σε κάθε ηλεκτρονική διεύθυνση που ορίζεται σε αυτό το κενό. Χωρίστε τις διευθύνσεις email με κόμματα."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
+msgid "CLOSE DATE"
+msgstr "ΗΜΕΡΟΜΗΝΙΑ ΛΗΞΗΣ"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:217
+msgid "CLOSE TIME"
+msgstr "ΩΡΑ ΛΗΞΗΣ"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:26
+msgid "Cake of Enlargement"
+msgstr "Δίσκος Διεύρυνσης"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1793
+msgid "Can e-mail instructor"
+msgstr "Αποστολή e-mail σε καθηγητή"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1806
+msgid "Can report bugs"
+msgstr "Αναφορά σφάλματος"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1857
+msgid "Can show old answers"
+msgstr "Ανάδειξη παλιών απαντήσεων"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1799
+msgid "Can submit answers for a student"
+msgstr "Υποβολή απαντήσεων για τον σπουδαστή"
+
+#. ($!)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:275
+msgid "Can't copy file: %1"
+msgstr "Αποτυχία αντιγραφής αρχείου: %1"
+
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
+msgid "Can't create archive \"%1\": command returned %2"
+msgstr ""
+
+#. ($courseID, $@)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:28
+msgid "Can't create course environment for %1 because %2"
+msgstr "Αποτυχία δημ/γίας περιβ/ος μαθήματος %1 επειδή %2"
+
+#. ($!)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:423
+msgid "Can't create directory: %1"
+msgstr "Αποτυψχία δημ/γίας καταλόγου: %1"
+
+#. ($name, $!)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+msgid "Can't create file \"%1\": %2"
+msgstr ""
+
+#. ($!)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:406
+msgid "Can't create file: %1"
+msgstr "Αποτυχία δημ/γίας αρχείου: '%1"
+
+#. ($name, $!)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:526
+msgid "Can't delete archive \"%1\": %2"
+msgstr ""
+
+#. ($setID, $TargetUser->user_id,)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:925
+msgid ""
+"Can't generate hardcopy for set \"%1\" for user \"%2\". The set is not "
+"visible to students."
+msgstr ""
+
+#. ($filePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:445
+msgid "Can't open %1"
+msgstr "Αποτύχια ανοίγματος %1"
+
+#. ($filePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1426
+msgid "Can't open file %1"
+msgstr "Αποτυχία ανοίγματος αρχείου %1"
+
+#. ($merge_file)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:343
+msgid "Can't read merge file %1. No message sent"
+msgstr "Αποτυχία ανάγνωσης συγχ/ων αρχείων %1. Κανένα μήνυμα δεν εστάλη"
+
+#. ($!)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:298
+msgid "Can't rename file: %1"
+msgstr "Αποτυχία μετ/σιάς αρχείου: %1"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:591
+msgid "Can't rename to the same name."
+msgstr "Αποτυχία μετ/σίας στο ίδιο όνομα."
+
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:392
+msgid "Can't unpack \"%1\": command returned %2"
+msgstr ""
+
+#. ($fullPath)
+#. ($!)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1819
+msgid "Can't write to file %1"
+msgstr "Αποτυχία εγγραφής στο αρχείο %1"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:462
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/confirm.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:69
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:15
+msgid "Cancel"
+msgstr "Ακύρωση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:5
+msgid "Cancel E-Mail"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:60
+msgid "Cancel E-mail"
+msgstr "Ακύρωση E-mail"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:61
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:77
+msgid "Cancel Edit"
+msgstr "Ακύρωση επεξεργασίας"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
+msgid "Cancel Export"
+msgstr "Ακύρωση εξαγωγής"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
+msgid "Cancel Password"
+msgstr "Ακύρωση κωδικού πρόσβασης"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:516
+msgid "Cannot find a file path to save to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:501
+msgid ""
+"Cannot find a problem record for set $c->{setID} / problem $c->{problemID}"
+msgstr ""
+
+#. ($filePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:240
+msgid "Cannot open %1"
+msgstr "Αποτυχία ανοίγματος %1"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:232
+msgid "Cap Test Time at Set Close Date"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:14
+msgid "Category"
+msgstr "Κατηγορία"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:49
+msgid "Category:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:27
+msgid ""
+"Cause the selected homework set to count for twice as many points as it "
+"normally would."
+msgstr "Κάνετε την επιλεγμένη εργασία συνόλων ασκήσεων να μετράει τα διπλάσια από τους κανονικούς πόντους."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:27
+msgid ""
+"Causes a homework problem to become a clone of another problem from the same"
+" set."
+msgstr "Κάνετε το πρόβλημα της εργασίας να γίνει αντίγραφο ενός άλλου του ίδιου σθνόλου ασκήσεων."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:27
+msgid "Causes a single homework problem to be worth twice as much."
+msgstr "Κάνετε ένα ενιαίο πρόβλημα εργασίας να αξίζει τα διπλά."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:48
+msgid "Change Course Title to:"
+msgstr "Αλλαγή Τίτλου Μαθ/τος σε:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:34
+msgid "Change CourseID to:"
+msgstr "Αλλαγή Κωδικό Μαθήματος σε:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:134
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:76
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:25
+msgid "Change Display Settings"
+msgstr "Αλλαγή Ρυθμίσεων Προβολής"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:53
+msgid "Change Email Address"
+msgstr "Αλλαγή Διεύθ. Email"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:62
+msgid "Change Institution to:"
+msgstr "Αλλαγή Ιδρύματος σε:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:18
+msgid "Change Password"
+msgstr "Αλλαγή Κωδικού"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:169
+msgid "Change User Settings"
+msgstr "Αλλαγή Ρυθμίσεων Χρήστη"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:35
+msgid "Change a course's ID, Title, or Institution."
+msgstr ""
+
+#. ($rename_oldCourseInstitution, $rename_newCourseInstitution)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
+msgid "Change course institution from %1 to %2"
+msgstr "Αλλαγή προγράμματος από %1 σε %2"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:160
+msgid "Change dates for a homework set for the whole class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:123
+msgid "Change the due date for one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:26
+msgid ""
+"Change the due dates for an individual student on this page. Check the "
+"checkbox and enter the new date in order to override the date. (You can copy"
+" the date format from the date in the right hand column which indicates the "
+"date when the homework set is due for the whole class.) Note that you should"
+" ensure that the close date is before the answer date. If the close date for"
+" a student is extended until after the class answer date for the set, then "
+"the answer date for the student must also be set to a later date. "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:141
+msgid "Change the grades on a homework set for one student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:163
+msgid "Change the grading on a homework set for an entire class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:170
+msgid "Change the number of atttempts allowed on a problem."
+msgstr ""
+
+#. ($rename_oldCourseTitle, $rename_newCourseTitle)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:508
+msgid "Change title from %1 to %2"
+msgstr "Αλλαγή τίτλου από %1 σε %2"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:488
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:540
+msgid "Changes abandoned"
+msgstr "Οι αλλαγές εγκαταλείφθηκαν"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:242
+msgid "Changes in this file have not yet been permanently saved."
+msgstr "Οι αλλαγές στο αρχείο αυτό δεν έχουν αποθηκευτεί ακόμη μόνιμα."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:529
+msgid "Changes saved"
+msgstr "Αποθήκευση αλλαγών"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:38
+msgid "Changing dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:514
+msgid ""
+"Changing the problem seed for display, but there are no problems showing."
+msgstr "Αλλαγή του τυχαίου αριθμού του προβλ για την οθόνη, αλλά δεν εμφανίζονται προβλ"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:19
+msgid "Chapter:"
+msgstr "Κεφάλαιο:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:15
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:103
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:37
+msgid "Check Answers"
+msgstr "Έλεγχος Απαντήσεων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:682
+msgid "Check Test"
+msgstr "Έλεγχος Τεστ"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:53
+msgid "Choose problems from a library and add them to a homework set."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:40
+msgid "Choose the set which you would like to be worth twice as much."
+msgstr "Επιλέξτε το σύνολο ασκήσεων που θα θέλατε να αξίζει το διπλάσιο."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:44
+msgid "Choose the set which you would like to enable partial credit for."
+msgstr "Επιλέξτε το σύνολο ασκήσεων για το οποίο θα θέλατε να ενεργ/σετε μερική πίστωση."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:44
+msgid "Choose the set which you would like to resurrect."
+msgstr "Επιλέξτε το σύνολο ασκήσεων που θα θέλατε να επαναφέρετε."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:40
+msgid "Choose the set whose close date you would like to extend."
+msgstr "Επιλέξτε το σύνολο ασκήσεων του οποίου την προθεσμία θα θέλατε να παρατείνετε."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:16
+msgid "Choose visibility of the sets to be affected"
+msgstr "Επιλέξτε την ορατότητα των συνόλων ασκήσεων που θα επηρεαστούν"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:15
+msgid "Choose what to do with existing data:"
+msgstr "Επιλέξτε τι να κάνετε τα υπάρχων δεδομένα:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:3
+msgid "Choose which sets to be affected"
+msgstr "Επιλέξτε σύνολα προς εμφάνιση"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:17
+msgid "Class List Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:55
+msgid "Class list (\".lst\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:316
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:37
+msgid "Classlist Editor"
+msgstr "Επεξεργαστής Λίστας Τάξεων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:91
+msgid "Clear Problem Display"
+msgstr "Διαγραφή Προβλημάτων Οθόνης"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:82
+msgid ""
+"Click a student's name to see the student's homework set. Click a heading to"
+" sort the table."
+msgstr "Επιλέξτε το όνομα σπουδαστή για να δείτε το σύνολο ασκήσεων του. Επιλέξτε επικεφαλίδα για να ταξινομήσετε τον πίνακα."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:74
+msgid ""
+"Click a student's name to see the student's test summary page. Click a "
+"test's version number to see the corresponding test version. Click a heading"
+" to sort the table."
+msgstr "Επιλέξτε το όνομα σπουδαστή για να δείτε την σελίδα επισκόπισης τεστ του. Επιλέξτε τον αριθμό εκδοχής του τεστ για να δείτε την αντίστοιχη εκδοχή τεστ. Επιλέξτε επικεφαλίδα για να ταξινομήσετε τον πίνακα."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:150
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:143
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made. (The grade for each problem is listed "
+"as \"status\" on this third page)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:24
+msgid ""
+"Click on each of the tabs to view the configuration items. The question mark"
+" icon provides access to information about the behavior of the configuration"
+" settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:125
+msgid ""
+"Click on the column \"Assigned Sets\" in the student's row. This will take "
+"you to a page where you can assign and unassign homework sets and change the"
+" due dates for homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:33
+msgid ""
+"Click on the homework set links to edit the grades for this individual "
+"student on the homework set. (The grade of each problem is called the "
+"\"status\".) You can also change the number of allowed attempts and further "
+"modify the individual student's homework set.) You will also be able to "
+"change a student's seed which determines the individual values used in the "
+"individual version of the student's problem and the weight (how much a "
+"problem counts towards the grade.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:90
+msgid ""
+"Click on the login name to edit individual problem set data, (e.g. due "
+"dates) for these students."
+msgstr "Κάντε κλικ στο όνομα σύνδ για να επεξ/στείτε μεμονωμένα δεδομ ρύθμ προβλ, (π.χ. ημερ/νίες λήξης) για αυτούς τους σπουδαστές."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:62
+msgid ""
+"Click the \"Add x student(s)\" radio button and then click \"Take action\". "
+"This will take you to a new page where the data can be entered for one or "
+"more students. It is also possible to assign the student to one or more "
+"problem sets as they are being entered: simply select the homework sets from"
+" the list below the data entry table. Use \"command\" or \"control\" click "
+"to select more than one homework set."
+msgstr ""
+
+#. ('<i class="fas fa-question-circle"></i>')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:88
+msgid "Click the %1 icon for page and item specific help."
+msgstr ""
+
+#. ('<a href="#"><i class="fas fa-question-circle"></i></a>')
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:20
+msgid "Click the icon %1 for page and item specific help."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:185
+msgid ""
+"Clicking on any active link at the top of the column sorts the page by that "
+"column. You can do lexigraphic sorts: click on \"First name\" then \"Last "
+"name\" to sort by last name, sorting those with the same last name by their "
+"first name."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:132
+msgid ""
+"Clicking on the login name link in a student's row allows you to view the "
+"student's version of the homework (rather than your own) so that you can "
+"more easily answer student questions about homework problems. (A \"acting as"
+" xxx\" alert will appear in the upper right corner of each window while you "
+"are acting as a student.) You can submit the answers (which will NOT be "
+"recorded) to check that the computer is grading the problem correctly. You "
+"will also be able to view past answers submitted by the student for each "
+"problem. To stop acting in the student's role click the \"Stop acting\" link"
+" in the upper right corner of the window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:199
+msgid ""
+"Clicking the <strong>e-mail address</strong> link will bring up your "
+"standard email application so that you can send email to the student. This "
+"works even if the student has been dropped from the course. To send email to"
+" an entire class or to merge grades with the email message use the \"Email\""
+" page link in the left margin."
+msgstr ""
+
+#. ($clientIP->ip()
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:547
+msgid ""
+"Client ip address %1 is not allowed to work this assignment, because the "
+"assignment has ip address restrictions and there are no allowed locations "
+"associated with the restriction.  Contact your professor to have this "
+"problem resolved."
+msgstr "Η διεύθυνση ip του πελάτη %1 δεν επιτρέπεται να εργαστεί σε αυτή την ανάθεση, επειδή έχει περιορισμούς διεύθυνσης ip και δεν υπάρχουν επιτρεπόμενες τοποθεσίες που σχετίζονται με τον περιορισμό. Επικοινωνήστε με τον καθηγητή σας για να επιλύσετε αυτό το πρόβλημα."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:316
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:39
+msgid "Close Date"
+msgstr "Ημερομηνία Λήξης"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:35
+msgid "Closed"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:208
+msgid "Closed, answers available."
+msgstr "Ολοκληρώθηκε, απαντήσεις διαθέσιμες."
+
+#. ($c->formatDateTime($set->answer_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:204
+msgid "Closed, answers on %1."
+msgstr "Ολοκληρώθηκε, απαντήσεις στο %1."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:206
+msgid "Closed, answers recently available."
+msgstr "Ολοκληρώθηκε, πρόσφατα διαθέσιμες απαντήσεις."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:282
+msgid "Closed."
+msgstr "Κλειστό."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:121
+msgid "Closes"
+msgstr "Κλείσιμο"
+
+#. ($c->formatDateTime($verSet->due_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:227
+msgid "Closes on %1"
+msgstr "Κλείσιμο στο %1"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:33
+msgid "Closes:"
+msgstr "Κλείσιμο:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:357
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:71
+msgid "Collapse All Details"
+msgstr "Κατάρρευση λεπτομερειών"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:367
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:85
+msgid "Collapse All Nesting"
+msgstr "Κατάρρευση ένθετων βρόχων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:419
+msgid "Collapse Nested Problems"
+msgstr "Κατάρρευση ένθετων προβλημάτων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:572
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:575
+msgid "Collapse Problem Details"
+msgstr "Κατάρρευση λεπτομερειών προβλήματος"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:73
+msgid ""
+"Collapse problem details to the top row of information about a problem. Note"
+" that the details of a single problem can be collapsed by clicking on the up"
+" arrow to the right of the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1617
+msgid ""
+"Comma separated list of set names that are excluded from all achievements. "
+"No achievement points and badges can be earned for submitting problems in "
+"these sets. Note that underscores (_) must be used for spaces in set names."
+msgstr "Λίστες συγκεκριμένων ονομάτων, οι οποίες χωρίζονται με κόμμα και εξαιρούνται από όλα τα επιτεύγματα. Κανένας πόντος επιτεύγματος και κανένα παράσημο δεν μπορεί να αποκτηθεί για την υποβολή προβλημάτων σε αυτά τα σύνολα ασκήσεων. Επισημαίνεται ότι η κάτω παύλα (_) πρέπει να χρησιμοποιείται για τα κενά των ονομάτων συνόλων ασκήσεων."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:131
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:46
+msgid "Comment"
+msgstr "Σχόλιο"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:25
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:181
+msgid "Comment:"
+msgstr "Σχόλιο:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:86
+msgid "Comments"
+msgstr "Σχόλια"
+
+#. ($c->formatDateTime($c->{set}->answer_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:379
+msgid "Completed results for this assignment are not available until %1."
+msgstr "Τα ολοκληρωμένα αποτελέσματα της εργασίας δεν είναι διαθέσιμα μέχρι το 1%"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:382
+msgid "Completed results for this assignment are not available."
+msgstr "Ολοκληρωμένα αποτελέσματα για αυτή την ανάθεση δεν είναι διαθέσιμα."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:264
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:280
+msgid "Completed."
+msgstr "Ολοκληρώθηκε."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:45
+msgid "Compose Email Message"
+msgstr "Σύνταξη μηνύματος e-mail"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:47
+msgid ""
+"Configure ip ranges (locations) that can be used to restrict set access."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:45
+msgid "Configure which course links appear on the site landing page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:97
+msgid "Confirm"
+msgstr "Επιβεβαίωση"
+
+#. ($e_user_name)
+#. ($eUserName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:41
+msgid "Confirm %1's New Password"
+msgstr "Επιβεβαίωση Νέου Κωδικού Πρόσβασης του %1"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:78
+msgid "Confirm Password"
+msgstr "Επιβεβαίωση Κωδικού"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_export_form.html.ep:1
+msgid "Confirm which sets to export."
+msgstr "Επιβεβαίωση συνόλων ασκήσεων προς εξαγωγή."
+
+#: /opt/webwork/webwork2/templates/AchievementEvaluator/cheevoMessage.html.ep:15
+msgid "Congratulations, you earned a new level!"
+msgstr "Συγχαρητήρια, κερδίσατε ένα νέο επίπεδο!"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2250
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:95
+msgid "Continue"
+msgstr "Συνέχεια"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:86
+msgid "Continue Open Test"
+msgstr "Συνέχιση Ανοιχτού Τεστ"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:59
+msgid "Controls if an achievement is evaluated or not."
+msgstr ""
+
+#. ($sourceDirectory, $outputDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:671
+msgid "Copied auxiliary files from %1 to new location at %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:42
+msgid "Copy"
+msgstr "Αντιγραφή"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
+msgid "Copy file as:"
+msgstr "Αντιγραφή αρχείου ως:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:112
+msgid "Copy from:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:82
+msgid "Copy this Problem"
+msgstr "Αντιγράψτε αυτό το Πρόβλημα"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:465
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:301
+msgid "Correct"
+msgstr "Διόρθωση"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:678
+msgid "Correct Adjusted Status"
+msgstr "Διόρθωση Διορθωμένου Ποσοστού"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:287
+msgid "Correct Answer"
+msgstr "Διόρθωση Απάντησης"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:19
+msgid "Correct Answers"
+msgstr "Σωστές Απαντήσεις"
+
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1317
+msgid "Correct Answers:"
+msgstr "Σωστές Απαντήσεις:"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:693
+msgid "Correct Status"
+msgstr "Σωστή Κατάσταση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:93
+msgid "Correct answers"
+msgstr "Σωστές απαντήσεις"
+
+#. ($total_correct, $num_of_problems)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:16
+msgid "Correct: %1/%2"
+msgstr "Σωστό: %1/%2"
+
+#. ($newBlankProblems, $MAX_NEW_PROBLEMS)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1843
+msgid ""
+"Could not add %1 problems to this set.  The number must be between 1 and %2"
+msgstr "Δεν ήταν δυνατή η προσθ προβλημάτων %1 σε αυτό το σύνολο ασκήσεων. Ο αριθμός πρέπει να είναι μεταξύ 1 και %2"
+
+#. ($e_user_name, $@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:74
+msgid "Couldn't change %1's password: %2"
+msgstr "Αδυναμία αλλαγής του κωδικού πρόσβασης του %1: %2"
+
+#. ($@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:111
+msgid "Couldn't change your email address: %1"
+msgstr "Δεν ήταν δυνατή η αλλαγή της διεύθυνσης email σας: %1"
+
+#. ($@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:132
+msgid "Couldn't save your display options: %1"
+msgstr "Δεν ήταν δυνατή η αποθήκευση των επιλογών οθόνης σας: %1"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:36
+msgid "Counter"
+msgstr "Μετρητής"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:66
+msgid "Counter:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:503
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:35
+msgid "Counts for Parent"
+msgstr "Μετρήσεις για το Γονέα"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:154
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:9
+msgid "Course Administration"
+msgstr "Διαχείριση Μαθήματος"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:17
+msgid "Course Administration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:369
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:80
+msgid "Course Configuration"
+msgstr "Ρυθμίσεις Μαθήματος"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:17
+msgid "Course Configuration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:17
+msgid "Course Home Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:21
+msgid "Course ID"
+msgstr "Κωδικός μαθήματος"
+
+#. ($ce->{maxCourseIdLength})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:594
+msgid "Course ID cannot exceed %1 characters."
+msgstr "Ο κωδικός μαθήματος δεν μπορεί να ξεπερνά το 1% των χαρακτήρων."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1227
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:597
+msgid "Course ID may only contain letters, numbers, hyphens, and underscores."
+msgstr "Ο κωδικός μαθήματος μπορεί να περιέχει μόνο γράμματα, αριθμούς, παύλες, και υπογραμμίσεις."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:21
+msgid "Course ID:"
+msgstr "Κωδικός Μαθήματος:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:5
+msgid "Course Info"
+msgstr "Πληροφορίες Μαθήματος"
+
+#. ($c->stash('courseID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:325
+msgid "Course Information for course %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:30
+msgid "Course Listings"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:17
+msgid "Course Name:"
+msgstr "Όνομα Μαθήματος:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:28
+msgid "Course Title"
+msgstr "Τίτλος μαθήματος"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:12
+msgid "Courses"
+msgstr "Μαθήματα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:13
+msgid ""
+"Courses are listed either alphabetically or in order by the time of most "
+"recent login activity, oldest first. To change the listing order check the "
+"mode you want and click \"Refresh Listing\".  The listing format is: "
+"Course_Name (status :: date/time of most recent login) where status is "
+"\"hidden\" or \"visible\"."
+msgstr "Τα μαθήματα εμφανίζονται είτε αλφαβητικά είτε κατά σειρά σύνδεσης, με την παλαιότερη να εμφανίζεται πρώτη. Για να αλλάξετε τη σειρά καταχώρισης επιλέξτε τη λειτουργία που θέλετε και πατήστε στο \"Ανανέωση Καταχώρισης\". Η μορφή καταχώρισης είναι: Όνομα_Μαθήματος (κατάσταση :: ημερ./ώρα πιο πρόσφατης σύνδεσης) όπου η κατάσταση είναι \"κρυφή\" or \"ορατή\"."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:7
+msgid ""
+"Courses are listed either alphabetically or in order by the time of most "
+"recent login activity, oldest first. To change the listing order check the "
+"mode you want and click \"Refresh Listing\". The listing format is: "
+"Course_Name (status :: date/time of most recent login) where status is "
+"\"hidden\" or \"visible\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:163
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:84
+msgid "Create"
+msgstr "Δημιουργία"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:41
+msgid "Create CSV"
+msgstr "Δημιουργία CSV"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:31
+msgid "Create Location:"
+msgstr "Δημιουργία Τοποθεσίας:"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:39
+msgid ""
+"Create a .tar.gz archive which includes the course's database and all course"
+" files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:33
+msgid "Create a New Set in This Course:"
+msgstr "Δημιουργήστε ένα Νέο Σύνολο Ασκήσεων σε Αυτό το Μάθημα:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:4
+msgid "Create a new achievement with ID"
+msgstr "Δημιουργία νέου επιτεύγματος με κωδικό"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:33
+msgid "Create a new course on this server."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:20
+msgid ""
+"Create a new course.  The \"Course ID\" is used as the course name and is "
+"used in course links.  Underscores appear as spaces when displaying the "
+"course name.  The \"Course Title\" is used as the title on the course home "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:86
+msgid ""
+"Create a new set with a given name. This can either create an empty set or a"
+" duplicate of an existing set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:12
+msgid "Create as what type of achievement?"
+msgstr "Δημιουργία ως ποιο είδος επιτεύγματος;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:12
+msgid "Create as what type of set?"
+msgstr "Δημιουργία ως τι είδους σύνολο ασκήσεων;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:20
+msgid "Create backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:81
+msgid "Create unattached problem"
+msgstr "Δημιουργία μη συνημμένου προβλ"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:121
+msgid "Create/Delete achievements"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:26
+msgid "Cupcake of Enlargement"
+msgstr "Cupcake Μεγέθυνσης"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:38
+msgid "Current"
+msgstr "Τρέχων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:2
+msgid "Currently defined locations are listed below."
+msgstr "Οι τρέχουσες καθορισμένες τοποθεσίες αναφέρονται παρακάτω."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2365
+msgid "Database tables are ok"
+msgstr "Οι πίνακες βάσης δεδομένων είναι εντάξει"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:54
+msgid "Database tables need updating."
+msgstr "Οι πίνακες βάσης δεδομένων χρειάζονται ενημέρωση."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:52
+msgid "Database tables ok"
+msgstr "Πίνακες βάσης δεδομένων εντάξει"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1499
+msgid "Database:"
+msgstr "Βάση Δεδομένων:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:153
+msgid "Date"
+msgstr "Ημερ/νία"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:96
+msgid "Dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:40
+msgid ""
+"Dates for problem sets can be edited by clicking the pencil icon in the "
+"\"Edit Set Data\" column next to the set name. To change dates for several "
+"sets at once, click the check box in the \"Select\" column and choose \"Edit"
+" selected\" from the tasks above."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:426
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:37
+msgid "Default"
+msgstr "Προεπιλογή"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1577
+msgid ""
+"Default Amount of Time (in minutes) after Due Date that Answers are Open"
+msgstr "Προεπιλεγμένος Χρόνος (σε λεπτά) μετά την Ημερ/νία Λήξης που οι Απαντήσεις είναι Ανοιχτές"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1567
+msgid ""
+"Default Amount of Time (in minutes) before Due Date that the Assignment is "
+"Open"
+msgstr "Προεπιλεγμένος Χρόνος (σε λεπτά) πριν την Ημερ/νία Λήξης που η Ανάθεση είναι Ανοιχτή"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1687
+msgid "Default Length of Reduced Scoring Period in minutes"
+msgstr "Προεπιλεγμένο Μήκος της Μειωμένης Περιόδου Βαθμολογίας σε λεπτά"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1557
+msgid "Default Time that the Assignment is Due"
+msgstr "Προεπιλεγμένος Χρόνος που η Ανάθεση Λήγει"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1710
+msgid ""
+"Default number of attempts before Show Me Another can be used (-1 => Never)"
+msgstr "Προεπιλεγμένος αριθμός προσπαθειών πριν από το Παρόμοιο Πρόβλημα μπορεί να χρησιμοποιηθεί (-1 =>Ποτέ)"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1994
+msgid ""
+"Default number of attempts before hints are shown in a problem (-1 => hide "
+"hints)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:89
+msgid "Delete"
+msgstr "Διαγραφή"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:49
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:36
+msgid "Delete Course"
+msgstr "Διαγραφή Μαθήματος"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:17
+msgid "Delete Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:23
+msgid "Delete Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:37
+msgid "Delete a course and all associated data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:109
+msgid "Delete a student from a course"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:52
+msgid "Delete all existing addresses"
+msgstr "Διαγραφή όλων των υπαρχουσών διευθύνσεων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:65
+msgid "Delete backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:64
+msgid "Delete backup from %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:54
+msgid "Delete course after archiving. Caution there is no undo!"
+msgstr "Διαγραφή μαθ/τος μετά την αρχειοθέτηση. Προσοχή δεν υπάρχει αναίρεση!"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:49
+msgid "Delete course:"
+msgstr "Διαγραφή Μαθ/τος:"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2348
+msgid "Delete field when upgrading"
+msgstr "Διαγραφή πεδίου κατά την αναβάθμιση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:588
+msgid "Delete it?"
+msgstr "Διαγραφή;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:78
+msgid "Delete location:"
+msgstr "Διαγραφή τοποθεσίας:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:28
+msgid "Delete oldest backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2321
+msgid "Delete table when upgrading"
+msgstr "Διαγραφή πίνακα κατά την αναβάθμιση"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:90
+msgid "Delete the sets checked below. Be careful, this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:6
+msgid "Delete which achievements?"
+msgstr "Διαγραφή ποιων επιτευγμάτων;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:6
+msgid "Delete which sets?"
+msgstr "Διαγραφή ποιων συνόλων ασκήσεων;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:6
+msgid "Delete which users?"
+msgstr "Διαγραφή ποιων χρηστών;"
+
+#. ($num)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:394
+msgid "Deleted %1 users."
+msgstr "Διαγράφηκαν %1 χρήστες."
+
+#. ($num)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:358
+msgid "Deleted %quant(%1,achievement)"
+msgstr "Διαγράφηκε %quant(%1, επίτευγμα)"
+
+#. (join(', ', @delLocations)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1810
+msgid "Deleted Location(s): %1"
+msgstr "Διαγραμμένη(-ες) Τοποθεσία: %1"
+
+#. (join(', ', @toDel)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1966
+msgid "Deleted addresses %1 from location."
+msgstr "Διαγράφηκαν διευθύνσεις %1 από τοποθεσία."
+
+#. ($formatBackupTime)
+#. ($c->formatDateTime($delTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1243
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:569
+msgid "Deleted backup from %1."
+msgstr ""
+
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:679
+msgid "Deleted temp file at %1"
+msgstr ""
+
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1219
+msgid "Deleted temporary file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:125
+msgid "Deleting Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:68
+msgid ""
+"Deletion deletes all location data and related addresses, and is not "
+"undoable!"
+msgstr "Η διαγραφή αφορά όλα τα δεδομένα τοποθεσίας και τις σχετικές διευθύνσεις, και δεν αναιρείται!"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:3
+msgid "Deletion destroys all achievement-related data and is not undoable!"
+msgstr "Η διαγραφή αφορά όλα τα δεδομένα που σχετίζονται με τα επιτεύγματα και δεν αναιρείται!"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
+msgid "Deny From"
+msgstr "Απόρριψη Από"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:27
+msgid "Description"
+msgstr "Περιγραφή"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:71
+msgid "Description:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:69
+msgid "Deselect All Sets"
+msgstr "Αποεπιλογή Όλων των Συνόλων Ασκήσεων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:229
+msgid "Deselect All Test Versions"
+msgstr "Αποεπιλογή Όλων των Εκδοχών Τεστ"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:366
+msgid "Didn't recognize action"
+msgstr "Δεν αναγνωρίζεται ενέργεια"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:27
+msgid "Directory"
+msgstr "Κατάλογος"
+
+#. ($file, $!)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:327
+msgid "Directory \"%1\" not removed: %2"
+msgstr ""
+
+#. ($file, $removed)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:325
+msgid "Directory \"%1\" removed (items deleted: %2)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:33
+msgid "Directory permission errors"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1439
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1575
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:44
+msgid ""
+"Directory structure is missing directories or the webserver lacks sufficient"
+" privileges."
+msgstr "Λείπουν κατάλογοι από τη δομή καταλόγων ή ο διακομιστής ιστού δεν διαθέτει επαρκή δικαιώματα."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1434
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1570
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:41
+msgid "Directory structure is ok"
+msgstr "Η δομή του καταλόγου είναι εντάξει"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:102
+msgid "Directory structure needs to be repaired manually before archiving."
+msgstr "Η δομή καταλόγου πρέπει να διορθωθεί χειροκίνητα πριν από την αρχειοθέτηση."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:84
+msgid "Directory structure needs to be repaired manually before renaming."
+msgstr "Η δομή καταλόγου πρέπει να διορθωθεί χειροκίνητα πριν την μετονομασία."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:48
+msgid "Directory structure or permissions need to be repaired."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1414
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1540
+msgid "Directory structure:"
+msgstr "Δομή καταλόγου:"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:92
+msgid "Display Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:90
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:104
+msgid "Display Mode:"
+msgstr "Τύπος προβολής:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:37
+msgid "Display Past Answers"
+msgstr "Παλιότερες Απαντήσεις"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:44
+msgid "Display mode for equations"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:311
+msgid "Display of scores for this test is not allowed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:12
+msgid "Display options: Show"
+msgstr "Προβολή: Εμφανίστε"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:48
+msgid ""
+"Display sets matching a selected criteria. Useful if there are many sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1918
+msgid "Display the evaluated student answer"
+msgstr "Προβολή βαθμολογημένης απάντησης σπουδαστή"
+
+#. ('<code>COURSENAME_totals.csv</code>',
+#. '<code>COURSENAME_totals_bak1.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:74
+msgid ""
+"Do NOT use the file name %1, since you might accidentally overwrite that if "
+"you again export your WeBWorK homework scores. (Actually the earlier file is"
+" moved to %2 -- so you can recover using the File Manager.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:57
+msgid "Do not unassign students unless you know what you are doing."
+msgstr "Μην αποδεσμεύετε σπουδαστές, αν δεν γνωρίζετε τι κάνετε."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:67
+msgid "Do not uncheck a set unless you know what you are doing."
+msgstr "Μην αποεπιλέγετε ένα σύνολο ασκήσεων, αν δεν γνωρίζετε τι κάνετε."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:20
+msgid "Do not uncheck students, unless you know what you are doing."
+msgstr "Μην αποεπιλέγετε σπουδαστές, αν δεν γνωρίζετε τι κάνετε."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:656
+msgid "Do you want to grade this test?"
+msgstr "Θέλετε να βαθμολογήσετε αυτό το τεστ;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:93
+msgid "Documentation from source code for PG modules and macro files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:95
+msgid "Don't Archive"
+msgstr "Μην Αρχειοθετείτε"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:13
+msgid "Don't Unarchive"
+msgstr "Μην Επαναφέρετε"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:46
+msgid "Don't Upgrade"
+msgstr "Μην Ενημερώνετε"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:15
+msgid "Don't delete"
+msgstr "Μην διαγράφετε"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:24
+msgid "Don't make changes"
+msgstr "Μην κάνετε αλλαγές"
+
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:317
+msgid "Don't recognize saveMode: |%1|. Unknown error."
+msgstr "Μην αναγνωρίζετε Λειτ. αποθ: |%1|. Άγνωστο σφάλμα."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:87
+msgid "Don't rename"
+msgstr "Μην μετονομάζετε"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:33
+msgid "Don't use in an achievement"
+msgstr "Να μην χρησιμοποιείται σε επίτευγμα"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1595
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:766
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:57
+msgid "Done"
+msgstr "Έτοιμο"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:8
+msgid "Download"
+msgstr "Λήψη"
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($set->set_id)
+#. ($ver->{id} =~ s/_/ /gr)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:204
+msgid "Download %1"
+msgstr "Λήψη %1"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:23
+msgid "Download Hardcopy"
+msgstr "Λήψη Έντυπου"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:56
+msgid "Download PDF or TeX Hardcopy for Current Set"
+msgstr "Λήψη PDF ή Έντυπου TeX για το Παρόν Σύνολο Ασκήσεων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:233
+msgid "Download PDF or TeX Hardcopy for Selected Tests"
+msgstr "Λήψη PDF ή Έντυπου TeX για τα Eπιλεγμένα Tεστ"
+
+#. (tag('span', dir => 'ltr', format_set_name_display($selected_set_id =~
+#. s/,v(\d+)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:58
+msgid "Download hardcopy of set %1 for %2?"
+msgstr "Λήψη έντυπου από το σύνολο ασκήσεων %1 για %2;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:63
+msgid "Download/upload archived courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:46
+msgid "Download:"
+msgstr "Λήψη:"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:93
+msgid "Drop"
+msgstr "Αφήστε"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:100
+msgid "Drop student from the course"
+msgstr ""
+
+#. ($beginReducedScoringPeriod)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:310
+msgid "Due date %1 has passed."
+msgstr "Η προθεσμία %1 έχει περάσει."
+
+#: /opt/webwork/webwork2/conf/defaults.config:2014
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:261
+msgid "E-mail Instructor"
+msgstr "E-mail σε Καθηγητή"
+
+#: /opt/webwork/webwork2/conf/defaults.config:2049
+msgid ""
+"E-mail feedback from students automatically sent to this permission level "
+"and higher"
+msgstr "E-mail σχολίων από τους σπουδαστές στέλνεται αυτόματα σε αυτό το επίπεδο δικαιωμάτων και άνω"
+
+#: /opt/webwork/webwork2/conf/defaults.config:2030
+msgid "E-mail verbosity level"
+msgstr "Έκταση κειμένου email"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:43
+msgid "E-mail:"
+msgstr "E-mail:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:35
+msgid "Earned"
+msgstr "Κερδισμένα"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1186
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1203
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:257
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:479
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:6
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:53
+msgid "Edit"
+msgstr "Επεξεργασία"
+
+#. (link_to(maketext('class list data')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:47
+msgid "Edit %1 for %2 (%3) who has been assigned %4 sets."
+msgstr ""
+
+#. (link_to(maketext('individual user settings')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:162
+msgid "Edit %1 for set %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:6
+msgid "Edit Assigned Users"
+msgstr "Επ. Ανατεθειμένων Χρηστών"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:40
+msgid "Edit Data"
+msgstr "Επεξ/σία Δεδομένων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:58
+msgid "Edit Evaluator"
+msgstr "Επεξ/σία Αξιολογητή"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:253
+msgid "Edit Header"
+msgstr "Επεξ/σία Κεφαλίδας"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:18
+msgid "Edit Location:"
+msgstr "Επεξ/σία Τοποθεσίας:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:111
+msgid "Edit Problem"
+msgstr "Επ. Προβλήματος"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:5
+msgid "Edit Problems"
+msgstr "Επ. Προβλημάτων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:3
+msgid "Edit Set"
+msgstr "Επεξ/σία Συνόλου Ασκήσεων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:4
+msgid "Edit Set Data"
+msgstr "Επεξεργασία Δεδομένων Συνόλου Ασκήσεων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:171
+msgid "Edit Tags"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:30
+msgid "Edit Target Set"
+msgstr "Επεξεργασία Συνόλου Ασκήσεων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:18
+msgid "Edit Users"
+msgstr "Επεξ/σία Χρηστών"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:127
+msgid "Edit achievement evaluator"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:90
+msgid "Edit achievement information"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:65
+msgid ""
+"Edit achivements for the course. This link is only present if achievements "
+"are enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:42
+msgid "Edit class list data"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:39
+msgid ""
+"Edit class roster data. Add students, edit student data, drop students from "
+"class, import students from a classlist, and give user professor privileges."
+" Access to individual homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:70
+msgid "Edit data for %1"
+msgstr "Επεξ/σία δεδομ. για %1"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:46
+msgid ""
+"Edit homework sets for entire class. Change homework set due dates, create "
+"new sets from a set definition file, create new homework sets, make sets "
+"visible/invisible, score homework sets. Assign homework sets to the class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:219
+msgid "Edit it"
+msgstr "Επεξεργασία"
+
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:135
+msgid "Edit set %1 for ALL students assigned to this set."
+msgstr ""
+
+#. (link_to(                                               $setID =>
+#. $c->systemLink(
+#. $setDetailPage, params => { effectiveUser => $user->user_id, editForUser =>
+#. $user->user_id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:106
+msgid "Edit set %1 for this user."
+msgstr "Επεξ/σία συνόλου ασκήσεων %1 για τον/την χρήστη/-ρια."
+
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:95
+msgid "Edit set for %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:4
+msgid ""
+"Edit the current value of the location description, if desired, then add and"
+" select addresses to delete, and then click the \"Take Action\" button to "
+"make all of your changes.  Or, click \"Manage Locations\" above to make no "
+"changes and return to the Manage Locations page."
+msgstr "Αλλάξτε, αν το επιθυμείτε, την ισχύουσα αξία της περιγραφής τοποθεσίας, μετά προσθέστε και επιλέξτε διευθύνσεις για διαγραφή, και μετά πατήστε το κουμπί «Πάμε» για να κάνετε αλλαγές. Ή πατήστε «Διαχείριση Τοποθεσιών» και επιστρέψτε στη σελίδα Διαχείριση Τοποθεσιών χωρίς νέες αλλαγές."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:2
+msgid "Edit which achievements?"
+msgstr "Επεξ/σία ποιων επιτευγμάτων;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:2
+msgid "Edit which sets?"
+msgstr "Επεξ/σία ποιων συνόλων ασκήσεων;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:2
+msgid "Edit which users?"
+msgstr "Επεξ/σία ποιων χρηστών;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:31
+msgid "Editing <strong>course information</strong> file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:30
+msgid "Editing <strong>hardcopy header</strong> file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:28
+msgid "Editing <strong>new problem</strong> template."
+msgstr ""
+
+#. ($c->{prettyProblemNumber},                             tag('span', dir =>
+#. 'ltr', format_set_name_display($fullSetName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:45
+msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:29
+msgid "Editing <strong>set header</strong> file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:33
+msgid "Editing <strong>unassigned problem</strong> file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:32
+msgid "Editing <strong>unknown file type</strong> in file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:19
+msgid "Editing Modes"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:140
+msgid "Editing Problems"
+msgstr ""
+
+#. ($c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:16
+msgid "Editing achievement in file \"%1\""
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:22
+msgid "Editing for all students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:23
+msgid "Editing for one student or a proper subset of all students"
+msgstr ""
+
+#. ($locationID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:1
+msgid "Editing location %1"
+msgstr "Επεξ/σία τοποθεσίας %1"
+
+#. (tag(                                           'strong',
+#. dir => 'ltr',
+#. format_set_name_display($setID . ($editingSetVersion ?
+#. ",v$editingSetVersion" : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:123
+msgid "Editing problem set %1 for these students: %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:315
+msgid "Editor"
+msgstr "Επιμέλεια"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:229
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:53
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:68
+msgid "Email"
+msgstr "Email"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:32
+msgid "Email Address"
+msgstr "Διεύθ. Email"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:170
+msgid "Email Body:"
+msgstr "Μήνυμα:"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:17
+msgid "Email Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:339
+msgid "Email Instructor On Failed Attempt"
+msgstr "Email σε Καθηγητή Μετά Από Αποτυχία"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:28
+msgid "Email Link"
+msgstr "Email"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:112
+msgid "Email address"
+msgstr "Διεύθ. Email"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:311
+msgid "Email body is empty. No message sent. "
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:994
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_email.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_form.html.ep:24
+msgid "Email instructor"
+msgstr "E-mail σε Καθηγητή"
+
+#. (scalar(@{ $c->{ra_send_to} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:27
+msgid ""
+"Email is being sent to %quant(%1,recipient). You will be notified by email "
+"when the task is completed.  This may take several minutes if the class is "
+"large."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:13
+msgid "Email:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:26
+msgid ""
+"Emails can contain personalized data, such as name, section, or status.  "
+"Click \"List of insertable macros\" for a full list available variables.  "
+"Additional personal data can be included by using a merge file.  A merge "
+"file is a CSV file located in the [Scoring] directory in which the first "
+"column is the student id, followed by additional data (such as student "
+"grades).  This data is identified by which column it is in, for instance if "
+"the scores where in the 4th column of the merge file, insert them into an "
+"email using the variable $COL[4].  The \"Scoring Tools\" page can export "
+"grades into a CSV that can be used as a merge file.  Upload customized merge"
+" files with the \"File Manager\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:11
+msgid "Emails to be sent to the following:"
+msgstr "Αποστολή μηνυμάτων σε:"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1606
+msgid "Enable Achievement Rewards"
+msgstr "Ενερ/ση Βραβείων Επιτευγμάτων"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1625
+msgid "Enable Conditional Release"
+msgstr "Ενεργ/ση Πρόσβασης Υπό Όρους"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1591
+msgid "Enable Course Achievements"
+msgstr "Ενεργ/ση Επιτευγμ. Μαθήματος"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1547
+msgid "Enable Progress Bar and current problem highlighting"
+msgstr "Ενεργοποίηση Μπάρας Προόδου και Τονισμός Τωρινών Προβλημάτων"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
+msgid "Enable Reduced Scoring"
+msgstr "Ενεργ/ση Μειωμένης Βαθμ/γίας"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1701
+msgid "Enable Show Me Another button"
+msgstr "Ενεργ/ση κουμπιού Παρόμοιο Πρόβλημα"
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:24
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:92
+msgid "Enable Spell Checking"
+msgstr "Ενεργ/ση Ορθογραφικού Έλεγχου"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1746
+msgid "Enable periodic re-randomization of problems"
+msgstr "Ενεργ/ση περιοδικής επανατυχαιοποίησης προβλ."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:29
+msgid ""
+"Enable reduced scoring for a homework set.  This will allow you to submit "
+"answers for partial credit for 24 hours after the close date."
+msgstr "Ενεργ/ση μειωμένης βαθμ/γίας για ένα σύνολο εργασιών. Αυτό σας επιτρέπει να υποβάλλετε απαντήσεις με δυνατότητα μερικής βαθμ/γίας έως 24ώρες μετά την ημερ/νία λήξης."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:20
+msgid "Enabled"
+msgstr "Ενεργό"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:58
+msgid "Enabled:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1748
+msgid ""
+"Enables periodic re-randomization of problems after a given number of "
+"attempts. Student would have to click Request New Version to obtain new "
+"version of the problem and to continue working on the problem"
+msgstr "Ενεργοποιεί την περιοδική επανατυχαιοποίηση προβλημάτων μετά από έναν αριθμό προσπαθειών. Ο σπουδαστής πρέπει να πατήσει Ζήτησε Νέα Έκδοση για να λάβει νέα έκδοση του προβλήματος και να συνεχίσει την επίλυση"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1627
+msgid ""
+"Enables the use of the conditional release system.  To use conditional "
+"release you need to specify a list of set names on the Problem Set Detail "
+"Page, along with a minimum score.  Students will not be able to access that "
+"homework set until they have achieved the minimum score on all of the listed"
+" sets."
+msgstr "Ενεργοποιεί τη χρήση του συστήματος πρόσβασης υπό όρους. Για τη χρήση του συστήματος πρέπει να ορίσετε μια λίστα συγκεκριμένων ονομάτων στη Σελίδα Λεπτομέρειες Συνόλου Προβλ. μαζί με τον κατώτατο βαθμό. Οι σπουδαστές δεν έχουν πρόσβαση στο σύνολο εργασιών, αν δεν έχουν περάσει τον κατώτατο βαθμό σε όλα τα σύνολα της λίστας."
+
+#: /opt/webwork/webwork2/conf/defaults.config:1703
+msgid ""
+"Enables use of the Show Me Another button, which offers the student a newly-"
+"seeded version of the current problem, complete with solution (if it exists "
+"for that problem)."
+msgstr "Ενεργοποιεί τη χρήση του κουμπιού Παρόμοιο Πρόβλημα που προσφέρει στον σπουδαστή μια νέα εκδοχή του παρόντος προβλήματος μαζί με τη λύση του (αν υπάρχει για το συγκεκριμένο)."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:163
+msgid "End"
+msgstr "Τέλος "
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:93
+msgid "Enrolled"
+msgstr "Εγγεγρ."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:111
+msgid "Enrolled, Drop, etc."
+msgstr "Εγγεγρ., Ακυρ., κλπ."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:128
+msgid "Enrollment Status"
+msgstr "Κατάσταση Εγγραφής"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:21
+msgid "Enter filename below"
+msgstr "Εισάγετε όνομα αρχείου"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:20
+msgid "Enter filenames below"
+msgstr "Εισάγετε ονόματα αρχείων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:19
+msgid ""
+"Enter information below for students you wish to add. Each student's "
+"password will initially be set to their student ID."
+msgstr "Εισάγετε πληροφορίες για τους σπουδαστές που θέλετε να προσθέσετε. Ο κωδικός του καθενός θα συνάδει αρχικά με τον Κωδικό Σπουδαστή του."
+
+#: /opt/webwork/webwork2/conf/defaults.config:1899
+msgid ""
+"Enter one of the allowed display mode types above.  See 'display modes "
+"entry' for descriptions."
+msgstr "Εισάγετε έναν από τους επιτρεπόμενους τύπους λειτουργίας προβολής επάνω. Δείτε 'εισαγωγή προβολής κατάστασης' για περιγραφές. "
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:34
+msgid ""
+"Enter the details of the course instructor to be added when the course is "
+"created.  This user will also be added to the admin course with the username"
+" \"userID_courseID\" so you can manage and email the instructors of the "
+"courses on the server."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:284
+msgid "Entered"
+msgstr "Καταχωρήθηκε"
+
+#. ($display_sort_method_name{$primary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:98
+msgid "Entries are sorted by %1"
+msgstr "Οι εισαγωγές έχουν ταξινομηθεί κατά %1"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:247
+msgid "Equation Display"
+msgstr "Προβολή Εξίσωσης"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:61
+msgid "Equation Editor"
+msgstr ""
+
+#. ($@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1460
+msgid "Error adding set-level proctor: %1"
+msgstr "Σφάλμα προσθήκης επιτήρησης συνόλου ασκήσεων: %1"
+
+#. ($fromPath, $toPath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:664
+msgid "Error copying %1 to %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:14
+msgid "Error details"
+msgstr ""
+
+#. ($filePath, stash('podError')
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:27
+msgid "Error generating POD for file %1: %2"
+msgstr ""
+
+#. ($@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1437
+msgid ""
+"Error getting old set-proctor password from the database: %1.  No update to "
+"the password was done."
+msgstr "Σφάλμα λήψης του παλιού κωδικού επιτήρησης-συνόλου ασκήσεων από τη βάση δεδομ.: %1. Δεν έγινε ενημέρωση κωδικού."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:31
+msgid "Error message:"
+msgstr "Μήνυμα σφάλματος:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:12
+msgid "Error messages"
+msgstr "Μηνύματα σφάλματος"
+
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:754
+msgid "Error: Answer date must come after close date in set %1"
+msgstr "Σφ: Η ημερ/νία απάντησης πάντα μετά την ημερ/νία λήξης στο σύνολο ασκήσεων%1"
+
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:747
+msgid "Error: Close date must come after open date in set %1"
+msgstr "Σφ: Η ημερ/νία λήξης πάντα μετά την ημερ/νία έναρξης στο σύνολο ασκήσεων %1"
+
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:778
+msgid ""
+"Error: Reduced scoring date must come between the open date and close date "
+"in set %1"
+msgstr "Σφ: Η ημερ/νία μειωμένου βαθμού πάντα ανάμεσα στην ημερ/νία έναρξης και ημερ/νία λήξης στο σύνολο ασκήσεων %1"
+
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:7
+msgid "Error: The original file %1 cannot be read."
+msgstr "Σφ: Το αρχικό αρχείο %1 είναι μη αναγνώσιμο."
+
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1240
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:738
+msgid "Error: answer date cannot be more than 10 years from now in set %1"
+msgstr "Σφ: η ημερ/νία απάντησης να μην ξεπερνά τα 10 χρόνια από τώρα στο σύνολο ασκήσεων %1"
+
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1235
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:733
+msgid "Error: close date cannot be more than 10 years from now in set %1"
+msgstr "Σφ: η ημερ/νία λήξης να μην ξεπερνάει τα 10 χρόνια από τώρα στο σύνολο ασκήσεων %1"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:234
+msgid "Error: no file data was submitted!"
+msgstr "Σφ: δεν υποβλήθηκαν δεδομένα αρχείου!"
+
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:728
+msgid "Error: open date cannot be more than 10 years from now in set %1"
+msgstr "Σφ: η ημερ/νία έναρξης να μην ξεπερνάει τα 10χρόνια από τώρα στο σύνολο ασκήσεων %1"
+
+#. ($problem_desc, $problem_name, $c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1210
+msgid ""
+"Errors encountered while processing %1. This %2 has been omitted from the "
+"hardcopy. Error text: %3"
+msgstr "Βρέθηκαν σφάλματα κατά την επεξ/σία του %1. Το %2 παραλείφθηκε από το έντυπο. Κείμενο σφάλματος: %3"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:8
+msgid "Errors occured while generating hardcopy:"
+msgstr ""
+
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2128
+msgid ""
+"Errors occured while hiding the courses listed below when attempting to "
+"create the file hide_directory in the course's directory. Check the "
+"ownership and permissions of the course's directory, e.g \"%1\"."
+msgstr ""
+
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2197
+msgid ""
+"Errors occured while unhiding the courses listed below when attempting "
+"delete the file hide_directory in the course's directory. Check the "
+"ownership and permissions of the course's directory, e.g \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:28
+msgid "Evaluator File"
+msgstr "Αρχείο Αξιολογ."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:76
+msgid "Evaluator File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:28
+msgid "Evaluator Variables"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2143
+msgid ""
+"Except for the errors listed above, all selected courses are already hidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2212
+msgid ""
+"Except for the errors listed above, all selected courses are already "
+"unhidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:39
+msgid ""
+"Existing addresses for the location are given in the scrolling list below.  "
+"Select addresses from the list to delete them:"
+msgstr "Δίνονται υπάρχουσες διευθύνσεις για την τοποθεσία στην παρακάτω λίστα. Επιλέξτε από αυτή διευθύνσεις προς διαγραφή:"
+
+#. ($filePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1460
+msgid "Existing file %1 could not be backed up and was lost."
+msgstr "Το υπάρχον αρχείο %1 δεν αντιγράφηκε και χάθηκε."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:354
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:65
+msgid "Expand All Details"
+msgstr "Ανάλυσε όλες τις λεπτομέρειες "
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:364
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:78
+msgid "Expand All Nesting"
+msgstr "Ανάλυσε όλες τις εμφωλεύσεις "
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:418
+msgid "Expand Nested Problems"
+msgstr "Ανάλυσε τα προβλήματα εμφώλευσης"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:574
+msgid "Expand Problem Details"
+msgstr "Ανάλυσε τις λεπτομέρειες των προβλημάτων "
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:67
+msgid ""
+"Expand problem details that have been collapsed. Note that the details of a "
+"single problem can be expanded by clicking on the down arrow to the right of"
+" the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:71
+msgid "Export"
+msgstr "Εξαγωγή"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:113
+msgid "Export achievement data"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_export_form.html.ep:1
+msgid "Export selected achievements"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:17
+msgid "Export to what kind of file?"
+msgstr "Εξαγωγή στο αρχείο"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:2
+msgid "Export which achievements?"
+msgstr "Ποια επιτεύγματα να εξαχθούν;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:5
+msgid "Export which users?"
+msgstr "Εξαγωγή"
+
+#. ($FileName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:591
+msgid "Exported achievements to %1"
+msgstr "Εξαγόμενα επιτεύγματα στο %1"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:48
+msgid "Extend the close date for which test?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:148
+msgid "Extend the number of attempts allowed a student on a given problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:28
+msgid ""
+"Extends the close date of a test by 24 hours. Note: The test must still be "
+"open for this to work."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
+msgid "FIRST NAME"
+msgstr "ΌΝΟΜΑ"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Failed to add user:"
+msgstr ""
+
+#. ($@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:416
+msgid "Failed to create new achievement: %1"
+msgstr "Αποτυχία δημιουργίας επιτεύγματος: %1"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:373
+msgid "Failed to create new achievement: no achievement ID specified!"
+msgstr "Αποτυχία δημιουργίας επιτεύγματος: δεν ορίστηκε αναγνωριστικό!"
+
+#. ($@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:573
+msgid "Failed to create new set: %1"
+msgstr "Αποτυχία δημιουργίας νέου συνόλου ασκήσεων: %1"
+
+#. ($newSetID =~ s/_/ /gr)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:482
+msgid ""
+"Failed to create new set: Invalid characters in set name \"%1\". A set name "
+"may only contain letters, numbers, hyphens, periods, and spaces."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:474
+msgid "Failed to create new set: No set name specified."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:469
+msgid "Failed to create new set: Set name cannot exceed 100 characters."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:396
+msgid ""
+"Failed to duplicate achievement: no achievement selected for duplication!"
+msgstr "Αποτυχία αντιγραφής επιτεύγματος: δεν επιλέχθηκε επίτευγμα για αντιγραφή!"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:530
+msgid "Failed to duplicate set: no set selected for duplication!"
+msgstr "Αποτυχία αντιγραφής συνόλου ασκήσεων: δεν επιλέχθηκε σύνολο για αντιγραφή!"
+
+#. ($@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:67
+msgid "Failed to generate course archive: %1"
+msgstr ""
+
+#. ($scoreFilePath)
+#. ($filePath)
+#. ($FilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1584
+msgid "Failed to open %1"
+msgstr "Άνοιγμα %1 απέτυχε"
+
+#. ($@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:227
+msgid "Failed to save: %1"
+msgstr "Δεν αποθηκεύτηκε: %1"
+
+#. ($_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:253
+msgid "Failed to send message: %1"
+msgstr ""
+
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:23
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:36
+msgid "False"
+msgstr "Λάθος"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:63
+msgid "Feature exhausted for this problem"
+msgstr "Εξαντλημένη λειτουργία προβλήματος"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:23
+msgid "Features:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:252
+msgid "Feedback"
+msgstr "Σχόλια"
+
+#: /opt/webwork/webwork2/conf/defaults.config:2070
+msgid "Feedback by Section."
+msgstr "Σχόλια ανά Ενότητα."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:234
+msgid "FeedbackMessage"
+msgstr "Μήνυμα Σχολίου"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2284
+msgid "Field is ok"
+msgstr "Πεδίο εντάξει"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2286
+msgid "Field missing in database"
+msgstr "Πεδίο απόν στη βάση δεδομένων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
+msgid "Field missing in schema"
+msgstr "Πεδίο απόν στο σχήμα"
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:266
+msgid "File \"%1\" exists.  File not saved.  No changes have been made."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1036
+msgid "File \"%1\" exists. File not saved. No changes have been made."
+msgstr ""
+
+#. ($file, $!)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:333
+msgid "File \"%1\" not removed: %2"
+msgstr ""
+
+#. ($file)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+msgid "File \"%1\" successfully removed"
+msgstr ""
+
+#. ($name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:522
+msgid "File \"%1\" uploaded successfully"
+msgstr ""
+
+#. ($name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:476
+msgid "File <b>%1</b> already exists. Overwrite it, or rename it as:"
+msgstr "Αρχείο <b>%1</b> υπάρχει ήδη. Αντικατάσταση, ή μετονομασία ως:"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:364
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:55
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:70
+msgid "File Manager"
+msgstr "Διαχείριση Αρχείων"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:17
+msgid "File Manager Help"
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:541
+msgid "File not saved. Failed to open \"%1\" for writing."
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:528
+msgid ""
+"File not saved. The file \"%1\" is not contained in the templates directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:921
+msgid ""
+"File not saved. The file name for this problem does not match the file name "
+"the editor was opened with. The problem set may have changed. Please reopen "
+"this file from the homework sets editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:228
+msgid "File saved"
+msgstr "Αποθηκεύτηκε"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:272
+msgid "File successfully copied"
+msgstr "Επιτυχής αντιγραφή αρχείου"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:295
+msgid "File successfully renamed"
+msgstr "Επιτυχής μετονομασία αρχείου"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:29
+msgid "Filename"
+msgstr "Όνομα αρχείου"
+
+#. ($extension, $location)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:699
+msgid "Files with extension \".%1\" usually belong in \"%2\""
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:20
+msgid ""
+"Fill out the form below to add, edit, or delete locations.  Locations are "
+"used to restrict access to sets based on ip address.  Locations are "
+"configured here in the administration course, then used in a normal course."
+"  When configuring a set to use a restricted ip address, the instructor can "
+"choose to either restrict access to the location or deny access from a "
+"location, which are identified by their name.  Instructors can select "
+"multiple locations to restrict access to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:78
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:47
+msgid "Filter"
+msgstr "Φίλτρο"
+
+#. ($recitation)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1420
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:913
+msgid "Filter by recitation %1"
+msgstr "Φιλτράρισμα με ενισχυτική %1"
+
+#. ($section)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1416
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:910
+msgid "Filter by section %1"
+msgstr "Φιλτράρισμα ενότητας %1"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:31
+msgid "Filter by what text?"
+msgstr "Φιλτράρισμα με κείμενο"
+
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:17
+msgid "Filter:"
+msgstr "Φίλτρο:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:137
+msgid "First"
+msgstr "Πρώτο"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:87
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:21
+msgid "First Name"
+msgstr "Όνομα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:107
+msgid "First name"
+msgstr "Όνομα"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:178
+msgid ""
+"For security reasons, you cannot specify a message file from a directory "
+"higher than the email directory (you can't use ../blah/blah for example). "
+"Please specify a different file or move the needed file to the email "
+"directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:30
+msgid "Force editor to RTL"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:674
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:101
+msgid "Force problems to be numbered consecutively from one"
+msgstr "Αναγκαστική αρίθμηση προβλημάτων διαδοχικά από το ένα"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:35
+msgid "Form Elements Present on the Page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:75
+msgid "Format"
+msgstr "Μορφή"
+
+#: /opt/webwork/webwork2/conf/defaults.config:2017
+msgid "Format for the subject line in feedback e-mails"
+msgstr "Μορφή της γραμμής θέματος σε e-mail σχολίων"
+
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:10
+msgid "Format:"
+msgstr "Μορφή:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:12
+msgid "Found no directories containing problems"
+msgstr "Δεν βρέθηκαν κατάλογοι με προβλήματα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:43
+msgid "From This Course"
+msgstr "Από Αυτό Το Μάθημα"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:318
+msgid "From field must contain one valid email address."
+msgstr "Από πεδίο πρέπει να περιέχει έγκυρη διεύθυνση email."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:20
+msgid ""
+"From this page you can <strong>add new students</strong>, "
+"<strong>edit</strong> class list data (name, email address, recitation, "
+"section, permission level, and enrollment status), <strong>change "
+"passwords</strong>, and <strong>export</strong> (save) class lists for back-"
+"up or use in another course. You can also delete students from the class "
+"roster, but this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:34
+msgid "From:"
+msgstr "Από:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:59
+msgid "GLOBAL Usage"
+msgstr "ΠΑΓΚΟΣΜΙΑ Χρήση"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1427
+msgid "General"
+msgstr "Γενικά"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:201
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:30
+msgid "General Information"
+msgstr "Γενικές Πληροφορίες"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:116
+msgid "General Page Information"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:121
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:166
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:167
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:113
+msgid "Generate Hardcopy"
+msgstr "Δημιουργία Έντυπης Μορφής"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:73
+msgid "Generate Hardcopy for Selected Sets"
+msgstr "Δημιουργία έντυπης μορφής για επιλεγμένα σύνολα ασκήσεων"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:115
+msgid ""
+"Generate a hardcopy of the problem being edited. This does not change the "
+"permanent file on the disk. You can generate a hardcopy for different "
+"versions of the same problem by changing the seed. You can also change the "
+"format to \"PDF\" or \"TeX Source\". If \"PDF\" is selected, then a PDF file"
+" will be generated for download, unless there are errors. If errors occur or"
+" \"TeX Source\" is selected, then a zip file will be generated for download "
+"that contains the TeX source file and resources needed for generating the "
+"PDF file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:20
+msgid ""
+"Generate hardcopies of assignments in PDF or latex format. To produce a "
+"hardcopy, one selects the users on the left and the sets on the right. All "
+"users and sets are listed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:170
+msgid "Generate hardcopy for selected sets and selected users"
+msgstr "Δημιουργία έντυπης μορφής για επιλεγμένα σύνολα ασκήσεων και χρήστες"
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:186
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:187
+msgid "Get a new version of this problem"
+msgstr "Λήψη νέας εκδοχής του προβλήματος"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:2
+msgid "Give new password to which users?"
+msgstr "Δώστε νέο κωδικό πρόσβασης σε"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:27
+msgid "Gives full credit on a single homework problem."
+msgstr "Δίνει πλήρη βαθμό σε ένα πρόβλημα για το σπίτι."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:27
+msgid "Gives full credit on every problem in a set."
+msgstr "Δίνει πλήρη βαθμό σε κάθε πρόβλημα ενός συνόλου ασκήσεων."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:27
+msgid "Gives half credit on a single homework problem."
+msgstr "Δίνει τον μισό βαθμό σε ένα πρόβλημα για το σπίτι."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:27
+msgid "Gives half credit on every problem in a set."
+msgstr "Δίνει τον μισό βαθμό σε κάθε πρόβλημα ενός συνόλου ασκήσεων."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:62
+msgid "Global Attempts"
+msgstr "Προσπάθειες παγκοσμίως"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:76
+msgid "Global Status"
+msgstr "Παγκόσμιο Ποσοστό"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:49
+msgid "Global Usage Data"
+msgstr "Παγκόσμια Χρήση Δεδομένων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:51
+msgid ""
+"Global data on problem usage is contributed by many institutions using "
+"WeBWorK all over the world. The Usage figure is the total number of  "
+"individuals who have attemped this problem at least once. A high figure "
+"represents a problem which has been assigned to many students and is  both "
+"popular with instructors and likely bug free."
+msgstr "Τα παγκόσμια δεδομένα για τα προβλήματα χρήσης προσφέρονται από πολλά ιδρύματα που χρησιμοποιούν το WeBWork σε όλο τον κόσμο. Το νούμερο Χρήσης είναι ο συνολικός αριθμός ατόμων που έχουν επιχειρήσει να λύσουν αυτό το πρόβλημα τουλάχιστον μία φορά. Ένα υψηλό νούμερο αντιπροσωπεύει ένα πρόβλημα που έχει ανατεθεί σε πολλούς μαθητές και είναι όχι μόνο γνωστό στους καθηγητές αλλά πιθανόν και χωρίς σφάλματα."
+
+#. ($problemID, $setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1489
+msgid "Global problem %1 for set %2 not found."
+msgstr "Παγκόσμιο πρόβλημα %1 για σύνολο ασκήσεων %2 δεν βρέθηκε."
+
+#. ($c->{prettyID}, $c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:378
+msgid "Global problem %1 not found for set %2."
+msgstr ""
+
+#. ($c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:142
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:372
+msgid "Global set %1 not found."
+msgstr "Το παγκόσμιο σετ ασκήσεων %1 δεν βρέθηκε."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:77
+msgid "Global set data will be shown instead of user specific data"
+msgstr "Εμφάνιση παγκόσμιων δεδομένων του συνόλου ασκήσεων αντί των εξειδικευμένων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:28
+msgid "Go"
+msgstr "Μετάβαση"
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:483
+msgid "Go back to Part 1"
+msgstr "Επιστροφή σε Μέρος 1"
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:293
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:498
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:512
+msgid "Go on to next part"
+msgstr "Μετάβαση στο επόμενο"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:544
+msgid "Grade"
+msgstr "Βαθμός"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:541
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:75
+msgid "Grade Problem"
+msgstr "Βαθμολόγηση Προβλήματος"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:651
+msgid "Grade Test"
+msgstr "Βαθμολόγηση Τεστ"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:148
+msgid "Grade of Active Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:55
+msgid "Grade passback mode"
+msgstr "Βαθμολόγηση λειτουργίας επιστροφής"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:38
+msgid "Grader"
+msgstr "Βαθμολογητής"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:236
+msgid "Grades"
+msgstr "Βαθμοί"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:17
+msgid "Grades Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:115
+msgid "Grades have been saved for all current users."
+msgstr "Οι βαθμοί των τρεχόντων χρηστών αποθηκεύτηκαν."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:28
+msgid "Grading Assignment"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:152
+msgid "Grading Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:26
+msgid "Greater Rod of Revelation"
+msgstr "Ανώτερη Ράβδος Αποκάλυψης"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:26
+msgid "Greater Tome of Enlightenment"
+msgstr "Ανώτερος Τόμος Διαφωτισμού"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:50
+msgid ""
+"Groups types of achievements. The \"level\" and \"secret\" categories are "
+"special (described above), and categories can be used to create achievement "
+"chains."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:74
+msgid "Guest Login"
+msgstr "Ως Επισκέπτης"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:86
+msgid "Guest:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:33
+msgid "HTTP Headers"
+msgstr "Κεφαλίδες HTTP"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:35
+msgid "Hardcopy Format"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:115
+msgid "Hardcopy Format:"
+msgstr "Μορφή Έντυπου:"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:285
+msgid "Hardcopy Generator"
+msgstr "Δημιουργός Έντυπης Μορφής"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:101
+msgid "Hardcopy Header"
+msgstr "Κεφαλίδα Έντυπης Μορφής"
+
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:324
+msgid "Hardcopy Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:17
+msgid "Hardcopy Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:153
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:44
+msgid "Hardcopy Theme"
+msgstr "Θέμα Έντυπης Μορφής"
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:427
+msgid "Hardcopy will always print the original version of the problem."
+msgstr "Στην έντυπη μορφή εμφανίζεται πάντα η αρχική μορφή του προβλήματος."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:31
+msgid "Headers"
+msgstr "Κεφαλίδες"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:296
+msgid "Help"
+msgstr "Βοήθεια"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:170
+msgid "Help Icon"
+msgstr "Εικονίδιο βοήθειας"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:30
+msgid ""
+"Here is a list of the variables the evaluator has access to. Unless "
+"indicated, changes to the variables will not be saved.  Evaluators are run "
+"in the same order they are listed on the achievement editor page and are "
+"only run if the achievement has not been earned. Keep this in mind when "
+"using persistent global data."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:507
+msgid "Here is a new version of your problem."
+msgstr "Εδώ υπάρχει νέα εκδοχή του προβλήματος."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:42
+msgid "Hidden"
+msgstr "Κρυφό"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:347
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:62
+msgid "Hide All"
+msgstr "Απόκρυψη Όλων"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:17
+msgid "Hide Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:57
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:44
+msgid "Hide Courses"
+msgstr "Απόκρυψη Μαθημάτων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:477
+msgid "Hide Hints from Students"
+msgstr "Απόκρυψη Υποδείξεων από Σπουδαστές"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:63
+msgid "Hide all rendered problems on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:252
+msgid "Hide this problem"
+msgstr "Απόκρυψη αυτού του προβλήματος"
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1523
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1524
+msgid "Hint:"
+msgstr "Υπόδειξη:"
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1522
+msgid "Hint: "
+msgstr "Υπόδειξη:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:99
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:51
+msgid "Hints"
+msgstr "Υποδείξεις"
+
+# Hmwk is short for Homework
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:327
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:44
+msgid "Hmwk Sets Editor"
+msgstr "Επεξεργαστής Συνόλου Ασκήσεων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:108
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:19
+msgid "Homework Sets"
+msgstr "Σύνολο Ασκήσεων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:38
+msgid "Homework Totals"
+msgstr "Σύνολο Εργασιών"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:17
+msgid "Homwork Sets Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:88
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:31
+msgid "How to:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:36
+msgid "I couldn't find the file [ACHIEVEMENT_DIR]/surprise_message.txt!"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:9
+msgid "Icon"
+msgstr "Εικόνα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:29
+msgid "Icon File"
+msgstr "Αρχείο Εικόνας"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:80
+msgid "Icon File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:24
+msgid ""
+"If \"PDF\" is selected, then a PDF file will be generated for download, "
+"unless there are errors.  If errors occur generating a PDF file or \"TeX "
+"Source\" is selected then a zip file will be generated for download that "
+"contains the TeX source file and resources needed for generating the PDF "
+"file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:37
+msgid ""
+"If \"TeX Source\" is selected, a zip file containing a TeX file and other "
+"files needed to generate a PDF hardcopy will be produced. If \"Adobe PDF\" "
+"is selected then only a PDF file will be produced."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:84
+msgid ""
+"If a password field is left blank, the student's current password will be "
+"maintained."
+msgstr "Αν ένα πεδίο κωδικού πρόσβασης παραμείνει κενό, θα διατηρηθεί ο τρέχων κωδικός του σπουδαστή."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:42
+msgid ""
+"If selected, the file path of the problem source will be printed in the "
+"output."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:38
+msgid ""
+"If selected, this adds spaces between the fields to align the commas, which "
+"makes the columns easy to read when in text form but it can confuse some "
+"spreadsheet applications since the extra spaces violate the csv standard "
+"(although Excel handles them with no problem). This will give a visual form "
+"of the CSV file that is easy to read on the page. If you want a reliable "
+".csv file for use in any spreadsheet application unclick the \"Pad Fields\" "
+"option. You can download the .csv file immediately by clicking on the link "
+"with the filename chosen above, or you can download it using the \"File "
+"Manager\" from the scoring directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:148
+msgid ""
+"If the original problem can not be edited than the path name must be changed"
+" in order to be allowed to save the problem. Adding \"local/\" to the "
+"beginning of the original path is the default solution. All locally created "
+"and edited files will then appear in a subdirectory named \"local\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:513
+msgid ""
+"If this flag is set then this problem will count towards the grade of its "
+"parent problem.  In general the adjusted status on a problem is the larger "
+"of the problem's status and the weighted average of the status of its child "
+"problems which have this flag enabled."
+msgstr "Εάν επιλέξετε αυτή την επιλογή το πρόβλημα θα μετρήσει για το βαθμό του\nκύριου προβλήματος. Κύριο είναι ένα πρόβλημα που μπορεί να περιέχει και\nάλλα προβλήματα σαν υποπροβλήματα. Χρησιμοποιήστε την παρούσα επιλογή\nγια να διαλέξετε ποια προβλήματα θα αποτελέσουν  υποπροβλήματα του\nκύριου προβλήματος. Το τελικό ποσοστό του κύριου προβλήματος είναι το\nμέγιστο του ποσοστού του κύριου προβλήματος και του σταθμισμένου μέσου\nόρου των υποπροβλημάτων του."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
+msgid ""
+"If this is enabled then instructors with the ability to receive feedback "
+"emails will be notified whenever a student runs out of attempts on a problem"
+" and its children  without receiving an adjusted status of 100%."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:334
+msgid ""
+"If this is enabled then students will be unable to attempt a problem until "
+"they have completed all of the previous problems, and their child problems "
+"if necessary."
+msgstr "Αν αυτό είναι ενεργό, οι σπουδαστές αδυνατούν να επιχειρήσουν ένα πρόβλημα μέχρι να έχουν λύσει όλα τα προηγούμενα προβλήματα και τα υποπροβλήματά τους αν είναι απαραίτητο."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:57
+msgid ""
+"If this is selected, a success index is listed in each csv file. The success"
+" index is a number assigned on the basis of the number of incorrect attempts"
+" (roughly equivalent to 1/the number of attempts) which seems to correlate "
+"with the relative difficulty the student had with the problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:47
+msgid ""
+"If this is set, all users (including the instructor) must enter the WeBWorK "
+"course through the LMS. If a user reaches the regular WeBWorK login screen, "
+"they receive a message directing them back to the LMS."
+msgstr "Αν αυτό είναι επιλεγμένο, όλοι οι χρήστες (συμπεριλαμβάνοντας τον καθηγητή) πρέπει να εισαχθούν στο μάθημα του WeBWorK μέσω του LMS. Εάν στον χρήστη εμφανιστεί η κανονική είσοδος χρήστη του WeBWorK στην οθόνη, αυτοί λαμβάνουν ένα μήνυμα καθοδηγώντας τους πίσω στο LMS."
+
+#. (tag('strong', maketext('Remember Me')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:33
+msgid ""
+"If you check %1 your login information will be remembered by the browser you"
+" are using, allowing you to visit WeBWorK pages without typing your user "
+"name and password (until your session expires). This feature is not safe for"
+" public workstations, untrusted machines, and machines over which you do not"
+" have direct control."
+msgstr "Αν επιλέξετε %1 οι πληροφορίες σύνδεσής σας θα αποθηκευτούν στην μηχανή αναζήτησης, δίνοντας σας πρόσβαση στις σελίδες WeBWorK χωρίς την πληκτρολόγηση ονόματος χρήστη και κωδικού πρόσβασης (μέχρι την λήξη του μαθήματος). Μη ασφαλές για δημόσιους χώρους εργασίας, μη αξιόπιστες μηχανές και μηχανές που δεν ελέγχετε άμεσα."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:154
+msgid ""
+"If you click on the \"Grade Problem\" icon to the right of the problem "
+"number, then the problem will open in the manual problem grader. This page "
+"shows the rendered problem and lists all students assigned to the set and "
+"the last answer the students entered for the problem. You can then change "
+"the recorded scores for students on this problem and provide instructor "
+"feedback comments."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:148
+msgid ""
+"If you click on the \"Open in New Window\" icon to the right of the problem "
+"number, then the problem will open in the actual homework set in a new tab "
+"or window."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:425
+msgid "If you come back to it later, it may revert to its original version."
+msgstr "Αν επιστρέψετε αργότερα, ενδέχεται να επανέλθει στην αρχική του μορφή."
+
+#. ('<code>report_grades_data.csv</code>', '<code>report_grade.msg</code>',
+#. '<code>$COL</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:80
+msgid ""
+"If you upload your file on the web with the name: %1 and also create an "
+"email message with the name %2 with the approriate %3 variables then not "
+"only can you email the message with the embedded grades to the students, but"
+" files with those exact names are automatically appended to the \"Grades\" "
+"page seen by the students."
+msgstr ""
+
+#. ($file)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:337
+msgid "Illegal file \"%1\" specified"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1445
+msgid "Illegal filename contains '..'"
+msgstr "Μη έγκυρο όνομα αρχείου περιέχει '..'"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:63
+msgid "Import"
+msgstr "Εισαγωγή"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:65
+msgid ""
+"Import a single set or multiple sets from a set definition file. (Use the "
+"\"File Manager\" to upload/download set definition files.) The \"Shift "
+"Dates...\" option is useful for problem sets that were used from other "
+"courses and will shift all of the dates."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:16
+msgid "Import from where?"
+msgstr "Εισαγωγή από"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:5
+msgid "Import how many sets?"
+msgstr "Εισαγωγή"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:31
+msgid "Import sets with names"
+msgstr "Εισαγωγή συνόλων ασκήσεων με ονόματα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:5
+msgid "Import users from what file?"
+msgstr "Εισαγωγή χρηστών από"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:99
+msgid "Import/export achievements"
+msgstr ""
+
+#. ($count)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:516
+msgid "Imported %quant(%1,achievement)"
+msgstr "Εισήχθη %quant(%1, επιτυχία)"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:25
+msgid ""
+"In both cases, one can select the sort field, the format of the display "
+"list, and the filter. \"Change Display Settings\" must be clicked to update "
+"the list."
+msgstr ""
+
+#. ($total_inprogress, $num_of_problems)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:28
+msgid "In progress: %1/%2"
+msgstr "Σε εξέλιξη: %1%2"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:47
+msgid "Inactive"
+msgstr "Ανενεργή"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:51
+msgid "Inactive Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1503
+msgid "Inactivity time before a user is required to login again"
+msgstr "Χρόνος αδράνειας μέχρι την επανασύνδεση ενός χρήστη"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:42
+msgid "Include Contrib"
+msgstr "Συμπερίληψη Contrib"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:35
+msgid "Include OPL"
+msgstr "Συμπερίληψη OPL"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:32
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:55
+msgid "Include Success Index"
+msgstr "Συμπερίληψη Δείκτη Επιτυχίας"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:62
+msgid "Include percentage grades columns for all sets"
+msgstr "Συμπερίληψη των στηλών με τα ποσοστά βαθμών για όλα τα σετ ασκήσεων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:471
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:302
+msgid "Incorrect"
+msgstr "Λάθος"
+
+#. ($total_incorrect, $num_of_problems)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:36
+msgid "Incorrect: %1/%2"
+msgstr "Λάθος: %1%2"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:26
+msgid ""
+"Indicates the number of problems in the set. Clicking on the link opens the "
+"set detail page which allows you to modify set parameters, edit set headers,"
+" and change parameters of problems in the set such as the number of allowed "
+"attempts or the weight (credit value). You can also add, remove, view, edit,"
+" and reorder the problems in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:141
+msgid "Individual Problem Results"
+msgstr ""
+
+# Short for Initial
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:41
+msgid "Init"
+msgstr "΄Εναρξη"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:35
+msgid "Institution"
+msgstr "Ίδρυμα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:560
+msgid "Instructor Comment:"
+msgstr "Σχόλιο Καθηγητή:"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1306
+msgid "Instructor Feedback:"
+msgstr "Ανατροφοδότηση Καθηγητή:"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:17
+msgid "Instructor Links Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:29
+msgid "Instructor Tools"
+msgstr "Εργαλεία Καθηγητή"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:17
+msgid "Instructor Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:90
+msgid "Instructor:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:326
+msgid "Invalid Reply-to address."
+msgstr "Μη έγκυρη διεύθυνση e-mail."
+
+#. ($output_file)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:187
+msgid ""
+"Invalid file name \"%1\". All email file names must end with the \".msg\" "
+"extension.  Choose a file name with the \".msg\" extension. The message was "
+"not saved."
+msgstr ""
+
+#. ($headerType)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1951
+msgid "Invalid headerType %1"
+msgstr "Μη έγκυρη επικεφαλίδα %1"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:173
+msgid "Invalid user ID or password."
+msgstr "Μη έγκυρος κωδικός πρόσβασης."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:34
+msgid ""
+"It is important that students enter an email address or they will not "
+"recieve any of the important emails sent by the instructor. The email "
+"address will only be present on the page if the user has permission to "
+"change the email address."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:20
+msgid "It lists the homework problem sets available for the students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:472
+msgid "Jump to Problem:"
+msgstr "Μετάβαση στο πρόβλημα:"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:939
+msgid "Just-In-Time parameters"
+msgstr "Παράμετροι just-in-time"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:85
+msgid "Key Map"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:14
+msgid "Key Map:"
+msgstr "Κλειδί Χάρτη"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:93
+msgid "Keywords:"
+msgstr "Λέξεις-κλειδιά:"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
+msgid "LAST NAME"
+msgstr "ΕΠΩΝΥΜΟ"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:119
+msgid "LOCAL Usage"
+msgstr "ΤΟΠΙΚΗ Χρήση"
+
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:103
+msgid "LTI"
+msgstr "LTI"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:25
+msgid "LTI Grade Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:460
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:75
+msgid "LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:17
+msgid "LTI Grade Update Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:16
+msgid "LTI grade passback is not enabled for this course"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:63
+msgid "LTI update of all users and sets queued."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:64
+msgid "LTI update of all users queued."
+msgstr ""
+
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:58
+msgid "LTI update of set %1 queued."
+msgstr ""
+
+#. ($userID, $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:56
+msgid "LTI update of user %1 and set %2 queued."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:60
+msgid "LTI update of user %1 queued."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1450
+msgid "Language (refresh page after saving changes to reveal new language.)"
+msgstr "Γλώσσα (ανανεώστε τη σελίδα μετά την αποθήκευση αλλαγών για να εμφανιστεί νέα γλώσσα)"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:140
+msgid "Last"
+msgstr "Τελευταίος"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:460
+msgid "Last Answer"
+msgstr "Τελευταία απάντηση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:31
+msgid "Last Full Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:25
+msgid "Last Name"
+msgstr "Επώνυμο"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:115
+msgid "Last column of merge file"
+msgstr "Τελευταία στήλη συγχωνευμένου αρχείου"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:108
+msgid "Last name"
+msgstr "Επώνυμο"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:237
+msgid "Latest Answers"
+msgstr "Τελευταίες απαντήσεις"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1505
+msgid ""
+"Length of time, in seconds, a user has to be inactive before he is required "
+"to login again. This value should be entered as a number, so as 3600 instead"
+" of 60*60 for one hour."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:26
+msgid "Lesser Rod of Revelation"
+msgstr "Μικρότερη ράβδος αποκάλυψης"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:26
+msgid "Lesser Tome of Enlightenment"
+msgstr "Μικρότερος τόμος Διαφωτισμού"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:15
+msgid "Level Progress:"
+msgstr "Επίπεδο προόδου:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:77
+msgid "Level:"
+msgstr "Επίπεδο:"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:17
+msgid "Library Broswer Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:359
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:52
+msgid "Library Browser"
+msgstr "Περιήγηση στη Βιβλιοθήκη"
+
+#. ($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:30
+msgid "Link to Edit Page for %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:25
+msgid "Links to pages that give information about writing problems:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1879
+msgid "List of display modes made available to students"
+msgstr "Λίστα λειτουργιών προβολής διατίθεται στους σπουδαστές"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:89
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:96
+msgid "List of insertable macros"
+msgstr "Λίστα εισαγμένων μακροεντολών"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1728
+msgid "List of options for Show Me Another button"
+msgstr "Λίστα επιλογών για Εμφάνισέ μου Άλλο κουμπί"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1615
+msgid "List of sets excluded from achievements"
+msgstr "Λίστα συνόλου ασκήσεων αποκλεισμένα από τα επιτεύγματα"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:56
+msgid "Live equation rendering"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:144
+msgid "Loading..."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:122
+msgid "Local Attempts"
+msgstr "Τοπικές απόπειρες"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:41
+msgid "Local Problems"
+msgstr "Τοπικά προβλήματα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:136
+msgid "Local Status"
+msgstr "Τοπικό ποσοστό"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:105
+msgid "Local Usage Data"
+msgstr "Τοπική χρήση δεδομένων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:114
+msgid ""
+"Local data is generated when your systems admin runs the script update-OPL-"
+"statistics."
+msgstr "Τα τοπικά δεδομένα δημιουργούνται όταν ο διαχειριστής του συστήματος χρησιμοποιεί το σενάριο update-OPL-statistics."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:107
+msgid ""
+"Local data on problem usage is generated and maintained by your institution."
+" The Usage figure is the total number of local individuals who have attemped"
+" this problem at least once. A high figure represents a problem which has "
+"been assigned to many students and is  both popular with instructors and "
+"likely bug free."
+msgstr "Τοπικά δεδομένα πάνω στη χρήση προβλήματος δημιουργούνται και διατηρούνται από το ίδρυμα σας. Η φιγούρα Χρήσης είναι το συνολικό νούμερο τοπικών ατόμων που έχουν επιχειρήσει αυτό το πρόβλημα τουλάχιστον μια φορά. Μια υψηλή φιγούρα απεικονίζει ένα πρόβλημα το οποίο έχει ανατεθεί σε πολλούς μαθητές, είναι γνωστό στους καθηγητές και πιθανότατα χωρίς σφάλματα."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:115
+msgid "Location"
+msgstr "Τοποθεσία"
+
+#. ($locationID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1854
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1890
+msgid ""
+"Location %1 does not exist in the WeBWorK database.  Please check your input"
+" (perhaps you need to reload the location management page?)."
+msgstr "Η τοποθεσία %1 δεν υπάρχει στη βάση δεδομένων WeBWorK. Παρακαλώ ελέγξτε την είσοδό σας (ίσως χρειαστεί να φορτώσετε ξανά τη σελίδα διαχείρισης τοποθεσίας?)."
+
+#. ($locationID, join(', ', @addresses)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1742
+msgid "Location %1 has been created, with addresses %2."
+msgstr "Η τοποθεσία %1 έχει δημιουργηθεί, με τις διευθύνσεις %2."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1798
+msgid "Location deletion requires confirmation."
+msgstr "Η διαγραφή τοποθεσίας απαιτεί επιβεβαίωση."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:43
+msgid "Location description:"
+msgstr "Περιγραφή τοποθεσίας:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:37
+msgid "Location name:"
+msgstr "Όνομα τοποθεσίας:"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:27
+msgid ""
+"Locations are a list of ip addresses.  Ip addresses can be a single address "
+"(e.g. 192.168.1.101), a range of ip address (e.g. "
+"192.168.1.101-192.168.1.150), or an ip address mask (e.g. 192.168.1.0/24). "
+"Enter one ip address per line, using as many lines as needed for each "
+"location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:32
+msgid ""
+"Locations are edited by adding new ip addresses to the location, or deleting"
+" existing address.  You must select the confirm checkbox when deleting a "
+"location, and this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:43
+msgid "Locations of files:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:18
+msgid "Log In Again"
+msgstr "Επανασύνδεση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:11
+msgid "Log Out"
+msgstr "Αποσύνδεση"
+
+#. ($add_courseID)
+#. ($rename_oldCourseID)
+#. ($rename_newCourseID)
+#. ($new_courseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:704
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:780
+msgid "Log into %1"
+msgstr "Σύνδεση στο %1"
+
+#. ($userName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:9
+msgid "Logged in as %1."
+msgstr "Συνδεδεμένος/η ως: %1."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:181
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:187
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:113
+msgid "Login"
+msgstr "Σύνδεση"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:58
+msgid "Login Info"
+msgstr "Πληροφορίες Σύνδεσης"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:36
+msgid "Login Name"
+msgstr "Όνομα σύνδεσης"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:18
+msgid "Login Status"
+msgstr "Κατάσταση σύνδεσης"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:6
+msgid "Login:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:225
+msgid "Logout"
+msgstr "Αποσύνδεση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
+msgid "Macro"
+msgstr "Μακροεντολή"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:97
+msgid ""
+"Macro (\".pl\") files containing additional functionality for your course "
+"can be stored here."
+msgstr ""
+
+#. ($filePath)
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:29
+msgid "Macro file %1 not found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:46
+msgid "Make Archive"
+msgstr "Δημιουργία Αρχείου"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:27
+msgid "Make changes"
+msgstr "Κάνε αλλαγές"
+
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:15
+msgid "Make these changes in course: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:137
+msgid ""
+"Makes a new copy of the file you are editing at the location relative to the"
+" course's templates ([TMPL]) directory. You may choose to replace the "
+"current problem in the current set, append to the end to then end of the "
+"current set as a new problem, or create a problem that is not attached to a "
+"problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:1
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:46
+msgid "Manage Locations"
+msgstr "Διαχείριση Τοποθεσιών"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:17
+msgid "Manage Locations Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:20
+msgid ""
+"Manage achievements for the course.  The actions allow one to edit, assign, "
+"import, export, score, create, or delete achievements.  The action form is "
+"at the top to select the desired action and options to perform when the "
+"submit button is pressed.  Below the action form is the list of all the "
+"achievements, ordered by their achievement \"Number\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:56
+msgid "Manage administration course files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:50
+msgid ""
+"Manage instructors.  When instructors are added to a newly created course, "
+"they are also added to the admin course with username \"userID_courseID\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:344
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:192
+msgid "Manual Grader"
+msgstr "Χειροκίνητη Βαθμολόγηση"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:17
+msgid "Manual Grader Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr',
+#. format_set_name_display($c->stash->{set}->set_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:205
+msgid "Manual Grader for %1: Problem %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:77
+msgid ""
+"Manually initiate an LTI grade passback for selected sets or users. This "
+"link is only visible if LTI grade passback is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:175
+msgid ""
+"Many of these editing activities can also be done more quickly from the "
+"\"Instructor Tools\" page where students and homework sets can be selected "
+"simultaneously. The \"Instructor Tools\" page is useful for quick editing of"
+" one or two students. The initial setup of the class can be done best from "
+"this page. Importing and exporting class lists can only be done from this "
+"page. Deleting students can only be done from this page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:120
+msgid "Mark Correct"
+msgstr "Σημείωση ως σωστό"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:598
+msgid "Mark Correct?"
+msgstr "Σημείωση ως σωστό;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:19
+msgid "Match on what? (separate multiple IDs with commas)"
+msgstr "Συνδυασμός με (διαχώρισε πολλαπλούς κωδικούς με κόμμα)"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:85
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:36
+msgid "Math Objects"
+msgstr "Μαθηματικά Αντικείμενα"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:377
+msgid "Max attempts"
+msgstr "Μέγιστος αριθμός προσπαθειών"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:24
+msgid "Max. Shown:"
+msgstr "Μεγ. Εμφάνιση:"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1719
+msgid ""
+"Maximum times Show me Another can be used per problem (-1 => unlimited)"
+msgstr "Μέγιστες φορές Δείξε μου Ένα άλλο μπορεί να χρησιμοποιηθεί ανά πρόβλημα (-1 => απεριόριστο)"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:4
+msgid "Merge file data:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:24
+msgid "Merge file:"
+msgstr "Συγχώνευση αρχείου:"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:288
+msgid "Message"
+msgstr "Μήνυμα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:13
+msgid "Message file:"
+msgstr "Αρχείο μηνυμάτων:"
+
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:300
+msgid "Message saved to file %1."
+msgstr ""
+
+#. ($recipient, $user_record->email_address)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:98
+msgid "Message sent to %1 at %2."
+msgstr "Μήνυμα στάλθηκε στο %1 σε %2."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:121
+msgid "Message was blank."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:48
+msgid ""
+"Messages can be saved to a message file (which must end in the \".msg\" "
+"extension).  Use the \"Message file\" drop down menu to select which message"
+" file to load, or \"None\" to use a blank message. To save a new message, "
+"use the \"Save as\" button after entering in a valid filename.  The \"Save "
+"as\" button will not overwrite currently saved messages.  To edit a "
+"currently saved message first select it using the drop down menu, then click"
+" the \"Save\" button to save any changes.  Use the \"File Manager\" to "
+"delete messages, located in the \"[TMPL]/email\" directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:22
+msgid "Method"
+msgstr "Μέθοδος"
+
+#: /opt/webwork/webwork2/conf/defaults.config:2003
+msgid "Method to enter problem scores in the single problem manual grader"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1668
+msgid ""
+"Missing required input data. Please check that you have filled in all of the"
+" create location fields and resubmit."
+msgstr "Έλλειψη απαιτούμενων δεδομένων εισόδου. Παρακαλώ ελέγξτε ότι έχετε συμπληρώσει όλα τα πεδία δημιουργίας τοποθεσίας και επανυποβάλετε."
+
+#: /opt/webwork/webwork2/conf/defaults.config:1457
+msgid ""
+"Mode in which the LANG and DIR settings for a single problem are determined."
+msgstr "Λειτουργία στην οποία οι LANG και DIR ρυθμίσεις για ένα ενιαίο πρόβλημα είναι καθορισμένα."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:443
+msgid "Move"
+msgstr "Μετ/νηση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:457
+msgid "Move to Page:"
+msgstr "Συνεχίστε στη σελίδα:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:452
+msgid "Move to Problem:"
+msgstr "Συνεχίστε στο πρόβλημα:"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:26
+msgid ""
+"Multiple sets may be assigned to the users by holding down the shift key or "
+"the ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:27
+msgid ""
+"Multiple users or sets may be selected by holding down the shift key or the "
+"ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:36
+msgid "My Problems"
+msgstr "Τα Προβλήματά Μου"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:26
+msgid "Mysterious Package (with Ribbons)"
+msgstr "Μυστηριώδες Πακέτο (με Κορδέλες)"
+
+# Short for Number of Fields
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:213
+msgid "NO OF FIELDS"
+msgstr "ΟΧΙ ΤΩΝ ΤΟΜΕΩΝ"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:113
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:135
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:29
+msgid "Name"
+msgstr "Όνομα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:174
+msgid "Name for new set here"
+msgstr "Όνομα για νέο σετ εδώ"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1430
+msgid "Name of course information file"
+msgstr "Όνομα φακέλου πληροφοριών μαθημάτων"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:77
+msgid "Name of the evaluator file used to evaluate the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:81
+msgid "Name of the image used for the achievement icon."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:4
+msgid "Name the new set"
+msgstr "Ονομάστε το νέο σύνολο"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:45
+msgid "Name:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:29
+msgid "Necromancers Charm"
+msgstr "Γοητεία Νεκρομαντών"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:205
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:393
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:35
+msgid "Never"
+msgstr "Ποτέ"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:54
+msgid "New File"
+msgstr "Νέο αρχείο"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:55
+msgid "New Folder"
+msgstr "Νέος Φάκελος"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:30
+msgid "New Name:"
+msgstr "Νέο όνομα:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:3
+msgid "New Password"
+msgstr "Νέος Κωδικός"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+msgid "New Problem"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
+msgid "New file name:"
+msgstr "'Oνομα νέου αρχείου:"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
+msgid "New folder name:"
+msgstr "Νέο όνομα φακέλου:"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:577
+msgid "New passwords saved"
+msgstr "Οι νέοι κωδικοί αποθηκεύτηκαν"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:36
+msgid "New set name"
+msgstr "Όνομα νέου συνόλου ασκήσεων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1010
+msgid "Next Problem"
+msgstr "Επόμενο Πρόβλημα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:40
+msgid "Next Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:98
+msgid "Next page"
+msgstr "Επόμενη σελίδα"
+
+#. (% $c->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:142
+msgid "Next test will be available by %1."
+msgstr "Το επόμενο τεστ θα είναι διαθέσιμο από το %1."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:483
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:510
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:142
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:68
+msgid "No"
+msgstr "Όχι"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:116
+msgid "No Course"
+msgstr "Κανένα Μάθημα."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:216
+msgid "No Description"
+msgstr "Καμία περιγραφή"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:117
+msgid "No Sender specified."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:23
+msgid "No Target Set Selected"
+msgstr "Δεν Επιλέχθηκε Σύνολο Ασκήσεων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:38
+msgid "No achievement badges have been assigned yet."
+msgstr "Δεν έχουν οριστεί σύμβολα επιτεύγματος ακόμη."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:77
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:37
+msgid "No achievements shown.  Create an achievement!"
+msgstr "Δεν εμφανίζονται επιτεύγματα. Δημιουργήστε ένα επίτευγμα!"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:2
+msgid "No achievements shown.  Select an achievement to edit!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:61
+msgid "No action taken"
+msgstr "Δεν έγινε καμία ενέργεια"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:140
+msgid ""
+"No authentication method found for your request.  If this recurs, please "
+"speak with your instructor."
+msgstr "Δεν βρέθηκε μέθοδος ταυτοποίησης για το αίτημά σας. Αν αυτό επαναληφθεί, παρακαλώ μιλήστε με τον εκπαιδευτή σας."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:361
+msgid "No change made to any set"
+msgstr "Καμία αλλαγή δεν έγινε σε κανένα σετ"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
+msgid ""
+"No changes specified.  You must mark the checkbox of the item(s) to be "
+"changed and enter the change data."
+msgstr "Δεν ορίστηκαν αλλαγές. Πρέπει να επισημάνετε το πλαίσιο ελέγχου των αντικειμένων για αλλαγή και να εισάγετε τα δεδομένα αλλαγής."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1247
+msgid "No changes were saved!"
+msgstr "Δεν αποθηκεύτηκαν αλλαγές!"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:50
+msgid "No course archives found."
+msgstr "Δεν βρέθηκαν αρχεία μαθημάτων."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:32
+msgid "No course id defined"
+msgstr "Δεν ορίστηκε id μαθήματος"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:67
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:76
+msgid "No courses found"
+msgstr "Δεν βρέθηκαν μαθήματα"
+
+#. ($setID, $problemID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:675
+msgid "No data exists for set %1 and problem %2"
+msgstr "Δεν υπάρχουν δεδομένα για το σετ %1 και πρόβλημα %2"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:10
+msgid "No e-mail recipients are listed for this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:169
+msgid "No filename was specified for saving!  The message was not saved."
+msgstr "Δεν ορίστηκε όνομα αρχείου για αποθήκευση! Το μήνυμα δεν αποθηκεύτηκε."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:340
+msgid "No guest logins are available. Please try again in a few minutes."
+msgstr "Δεν υπάρχουν συνδέσεις επισκέπτη. Παρακαλώ ξαναδοκιμάστε σε λίγα λεπτά."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1877
+msgid "No location specified to edit. Please check your input data."
+msgstr "Δεν ορίστηκε τοποθεσία για επεξεργασία. Παρακαλούμε ελέγξτε τα δεδομένα εισόδου."
+
+#. ($badID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1788
+msgid "No location with name %1 exists in the database"
+msgstr "Δεν υπάρχει τοποθεσία με όνομα %1 στη βάση δεδομένων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:149
+msgid "No locations are currently defined."
+msgstr "Δεν έχουν καθοριστεί τοποθεσίες την τρέχουσα στιγμή."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:342
+msgid "No merge data file"
+msgstr "Δεν υπάρχει συγχωνευμένο αρχείο"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:18
+msgid "No merge data found"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:164
+msgid "No merge data found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:8
+msgid "No merge file selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:135
+msgid "No more tests available."
+msgstr "Δεν υπάρχουν άλλα διαθέσιμα τεστ."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:270
+msgid ""
+"No new Achievement ID specified.  No new achievement created.  File not "
+"saved."
+msgstr "Δεν ορίστηκε νέο ID επιτεύγματος. Δεν δημιουργήθηκε νέο επίτευγμα. Το αρχείο δεν αποθηκεύτηκε."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:63
+msgid "No problems matched the given parameters."
+msgstr "Δεν βρέθηκαν προβλήματα με τις δοθείσες παραμέτρους."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:25
+msgid "No recipients selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:334
+msgid ""
+"No recipients selected. Please select one or more recipients from the list "
+"below."
+msgstr "Δεν επιλέχθηκαν παραλήπτες. Παρακαλώ επιλέξτε έναν ή περισσότερους παραλήπτες από την παρακάτω λίστα."
+
+#. ($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:49
+msgid "No record for global set %1."
+msgstr "Καμία εγγραφή για το παγκόσμιο σετ %1."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
+msgid "No record found."
+msgstr "Δεν βρέθηκε εγγραφή."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:12
+msgid "No sets in this course yet"
+msgstr "Κανένα σύνολο ασκήσεων ακόμα σε αυτό το μάθημα"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:159
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
+msgid "No sets selected for scoring"
+msgstr "Κανένα επιλεγμένο σύνολο ασκήσεων για βαθμολογία"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:46
+msgid ""
+"No sets shown.  Choose one of the options above to list the sets in the "
+"course."
+msgstr "Κανένα σύνολο ασκήσεων. Επιλέξτε από τις παραπάνω επιλογές για να καταγράψετε τα σύνολα ασκήσεων του μαθήματος."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1942
+msgid "No source filePath specified"
+msgstr "Δεν ορίστηκε αρχείο πηγής"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1327
+msgid "No source_file for problem in .def file"
+msgstr "Κανένα source_file για το πρόβλημα στο αρχείο .def"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:87
+msgid ""
+"No students shown. Choose one of the options above to list the students in "
+"the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:246
+msgid "No submissions. Over time."
+msgstr "Καμία υποβολή. Τέλος χρόνου."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:278
+msgid "No tests taken."
+msgstr "Δεν έγιναν δοκιμές."
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:676
+msgid "No user specific data exists for user %1"
+msgstr "Δεν υπάρχουν δεδομένα για τον χρήστη %1"
+
+#. ($locationID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2031
+msgid "No valid changes submitted for location %1."
+msgstr "Δεν υποβλήθηκαν έγκυρες αλλαγές για την τοποθεσία %1."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:263
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:241
+msgid "No versions of this test have been taken."
+msgstr "Δεν έχουν ληφθεί εκδοχές αυτού του τεστ."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:252
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:17
+msgid "None"
+msgstr "Καμία"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:763
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:52
+msgid "None Specified"
+msgstr "Μη Καθορισμένο"
+
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:73
+msgid "None of the selected users are assigned to this set: %1"
+msgstr "Κανένας από τους επιλεγμένους χρήστες δεν αντιστοιχεί στο σετ: %1"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:33
+msgid "Not logged in."
+msgstr "Δεν έχετε συνδεθεί."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:4
+msgid "Note"
+msgstr "Σημείωση"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:55
+msgid ""
+"Note that if there are errors, they will be shown at the top of the page. In"
+" some cases, a hard copy is still generated and a link called \"Download "
+"Hardcopy\" appears. In addition, the latex file, log and error files are "
+"generated which can be used in troubleshooting."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:93
+msgid ""
+"Note that if you set the permission level of a user to something other than "
+"\"Student\", you may also want to set the status of the user to "
+"\"Observer\".  Users with the \"Observer\" status are not included in "
+"statistics, scoring, or instructor emails."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:28
+msgid ""
+"Note that some settings require an additional page load after \"Save "
+"Changes\" is clicked in order to take effect.  This is true for a theme "
+"change for example."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:396
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:422
+msgid "Note:"
+msgstr "Σημείωση:"
+
+#. (tag('i', maketext('You are in the Reduced Scoring Period.  All work counts
+#. for [_1]% of the original.',
+#. $ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#. (tag('i', $pg->{result}{msg})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:572
+msgid "Note: %1"
+msgstr "Σημείωση: %1"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:686
+msgid ""
+"Note: grading the test grades all problems, not just those on this page."
+msgstr "Σημείωση: βαθμολογώντας το τεστ βαθμολογεί όλα τα προβλήματα, όχι μόνο αυτά σε αυτήν τη σελίδα."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:768
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:59
+msgid "Now"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:19
+msgid "Number"
+msgstr "Αριθμός"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:242
+msgid "Number of Graded Submissions per Test (0=infty)"
+msgstr "Αριθμός βαθμολογημένων υποβολών ανά δοκιμή (0=infty)"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+msgid "Number of Problems per Page (0=all)"
+msgstr "Αριθμός προβλημάτων ανά σελίδα (0=all)"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:95
+msgid "Number of Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:257
+msgid "Number of Tests per Time Interval (0=infty)"
+msgstr "Αριθμός δοκιμών ανά χρονικό διάστημα (0=infty)"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:54
+msgid "Number:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1181
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:912
+msgid "OK"
+msgstr "ΟΚ"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:17
+msgid "OPL Problem Levels Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:26
+msgid "Oil of Cleansing"
+msgstr "Έλαιο Καθαρισμού"
+
+#. ('<code>pdflatex</code>', '<code>hardcopy.tex</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:49
+msgid ""
+"Once \"Generate Hardcopy for selected sets and selected users\" is clicked a"
+" file in the selected hardcopy format will be generated and offered for "
+"download. If PDF output was selected, a single PDF file is generated. If TeX"
+" output is selected, a zip file is generated that contains all files needed "
+"to generated the hardcopy PDF file via %1. The main TeX file is called %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:84
+msgid "One Column"
+msgstr "Μία στήλη"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:314
+msgid "Only Start"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:289
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:303
+msgid "Only after set answer date"
+msgstr "Μόνο μετά την ημερομηνία απάντησης"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:87
+msgid ""
+"Only present for JITAR sets. Collapse JITAR nesting problem groups to the "
+"top row of information about a problem. Note that the nesting of a single "
+"problem group can be collapsed by clicking on the down arrow to the right of"
+" the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:80
+msgid ""
+"Only present for JITAR sets. Expand JITAR nested problem groups that have "
+"been collapsed. Note that the nesting of a single problem group can be "
+"expanded by clicking on the right arrow to the right of the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1794
+msgid ""
+"Only this permission level and higher get buttons for sending e-mail to the "
+"instructor."
+msgstr "Μόνο αυτό το επίπεδο δικαιωμάτων και άνω παρουσιάζονται κουμπιά για αποστολή e-mail στον καθηγητή."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:39
+msgid "Open"
+msgstr "Άνοιγμα"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:62
+msgid "Open Date"
+msgstr "Ημερομηνία Έναρξης"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:42
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:32
+msgid "Open Problem Library"
+msgstr "Άνοιγμα βιβλιοθήκης"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:272
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:525
+msgid "Open in New Window"
+msgstr "Άνοιγμα σε νέο παράθυρο"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:29
+msgid "Open in new window"
+msgstr "Άνοιγμα σε νέο παράθυρο"
+
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:320
+msgid "Open, closes %1."
+msgstr "Ανοιχτό, κλείνει %1."
+
+#. ($beginReducedScoringPeriod)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:300
+msgid "Open, due %1."
+msgstr "Ανοιχτό, αναμένεται %1."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
+msgid "Open."
+msgstr "Άνοιγμα."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:268
+msgid "Open. Submitted."
+msgstr "Ανοιχτό. Υποβλήθηκε."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:31
+msgid "Open:"
+msgstr "Ανοιχτό:"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:115
+msgid "Opens"
+msgstr "Ανοίγει"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:27
+msgid "Opens any homework set for 24 hours."
+msgstr "Ανοίγει οποιοδήποτε αναθετημένο σύνολο ασκήσεων για 24 ώρες."
+
+#: /opt/webwork/webwork2/conf/defaults.config:1588
+msgid "Optional Modules"
+msgstr "Προαιρετικές Ενότητες"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:265
+msgid "Order Problems Randomly"
+msgstr "Τυχαία Προβλήματα"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:50
+msgid "Other Options"
+msgstr ""
+
+# Context is "7 Out Of 10"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:150
+msgid "Out Of"
+msgstr "Από τα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:85
+msgid "Overall Results"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:93
+msgid "Overall Set Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:122
+msgid "Overall Success Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:470
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:481
+msgid "Overwrite"
+msgstr "Αντικατάσταση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:100
+msgid "Overwrite existing files silently"
+msgstr "Αντικατάσταση υπαρχόντων αρχείων "
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:41
+msgid "PDF"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:69
+msgid "PG Info"
+msgstr "Πληροφορίες PG"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer.html.ep:1
+msgid "PG POD"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:17
+msgid "PG Problem Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:708
+msgid "PG debug messages"
+msgstr "PG μηνύματα εντοπισμού σφαλμάτων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:716
+msgid "PG internal errors"
+msgstr "PG εσωτερικό σφάλμα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:109
+msgid ""
+"PG markdown syntax used to format WeBWorK questions. This interactive lab "
+"can help you to learn the techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:692
+msgid "PG question failed to render"
+msgstr "Η ερώτηση PG δεν αποδόθηκε"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:706
+msgid "PG question processing error messages"
+msgstr "Η PG ερώτηση επεξεργάζεται τα μηνύματα σφάλματος"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:712
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:128
+msgid "PG warning messages"
+msgstr "PG μηνύματα προειδοποίησης"
+
+# Doesn't need to be translated
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:98
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:47
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:58
+msgid "PGML"
+msgstr "PGML"
+
+# Doesn't need to be translated
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:91
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:40
+msgid "POD"
+msgstr "POD"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:200
+msgid "POD Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:208
+msgid "POD Viewer"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1515
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:526
+msgid "PREVIEW ONLY -- ANSWERS NOT RECORDED"
+msgstr "ΜΟΝΟ ΠΡΟΕΠΙΣΚΟΠΗΣΗ--ΟΙ ΑΠΑΝΤΗΣΕΙΣ ΔΕΝ ΑΠΟΘΗΚΕΥΤΗΚΑΝ"
+
+# Problem Number
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:215
+msgid "PROB NUMBER"
+msgstr "ΑΡΙΘΜΟΣ ΠΡΟΒ"
+
+# Problem Value
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:218
+msgid "PROB VALUE"
+msgstr "TIMH ΠΡΟΒ"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:36
+msgid "Pad Fields"
+msgstr "Πεδία Pad"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:28
+msgid "Page Contents"
+msgstr ""
+
+#. ($c->timestamp)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:1
+msgid "Page generated at %1"
+msgstr "Η σελίδα δημιουργήθηκε στο %1"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:81
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:71
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:56
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:25
+msgid "Password"
+msgstr "Κωδικός Πρόσβασης"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:13
+msgid "Password (Leave blank for regular proctoring)"
+msgstr "Κωδικός Πρόσβασης (Άφησε κενό για την τακτική επίβλεψη)"
+
+#. ($studentUser, tag('span', dir => 'ltr', format_set_name_display($setName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:13
+msgid "Past Answers for %1, set %2, problem %3"
+msgstr "Προηγούμενες Απαντήσεις για το %1, όρισε %2, πρόβλημα %3"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:8
+msgid "Percent"
+msgstr "Ποσοστό"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:94
+msgid "Percent Ranges"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+msgid "Percent Score"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:535
+msgid "Percent of Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:206
+msgid ""
+"Percentile cutoffs for number of attempts. The 50% column shows the median "
+"number of attempts."
+msgstr "Ποσοστιαίες αποκοπές για αριθμό προσπαθειών. Η στήλη 50% δείχνει το μέσο αριθμό προσπαθειών."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:58
+msgid ""
+"Percentile cutoffs for student's score and success index. The 50% column "
+"shows the median number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:50
+msgid "Permission Level"
+msgstr "Επίπεδο Δικαιωμάτων"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1771
+msgid "Permissions"
+msgstr "Δικαιώματα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:24
+msgid "Pick a target set above to add this problem to."
+msgstr "Επιλέξτε παραπάνω ένα σύνολο ασκήσεων όπου θα προσθέσετε αυτό το πρόβλημα."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:54
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:21
+msgid "Pick date and time"
+msgstr "Επιλέξτε ημερομηνία και ώρα"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
+msgid ""
+"Place a file named \"hide_directory\" in a course or other directory and it "
+"will not show up in the courses list on the WeBWorK home page. It will still"
+" appear in the Course Administration listing."
+msgstr "Τοποθετήστε ένα αρχείο με όνομα \"hide_directory\" σε ένα μάθημα ή άλλο κατάλογο και δεν θα εμφανιστεί στη λίστα μαθημάτων στην αρχική σελίδα του WeBWorK. Θα εμφανίζεται στη λίστα της Διοίκησης Μαθημάτων."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should be given full credit."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should have half credit added."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:61
+msgid ""
+"Please choose the set name and problem number of the question which should "
+"be given full credit."
+msgstr "Επιλέξτε το όνομα του συνόλου ασκήσεων και αριθμό προβλήματος της ερώτησης στην οποία θα δοθεί πλήρης πίστωση."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:61
+msgid ""
+"Please choose the set name and problem number of the question which should "
+"be given half credit."
+msgstr "Επιλέξτε το όνομα του συνόλου ασκήσεων και τον αριθμό προβλήματος της ερώτησης που θα πιστωθεί με μισές μονάδες."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:61
+msgid ""
+"Please choose the set name and problem number of the question which should "
+"have its incorrect attempt count reset."
+msgstr "Επιλέξτε το όνομα συνόλου ασκήσεων και τον αριθμό προβλήματος της ερώτησης στην οποία θα γίνει επαναφορά της λάθος προσπάθειας."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:61
+msgid ""
+"Please choose the set name and problem number of the question which should "
+"have its weight doubled."
+msgstr "Επιλέξτε παρακαλώ το όνομα συνόλου ασκήσεων και τον αριθμό του προβλήματος της ερώτησης που θα μετρήσει διπλά."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:60
+msgid ""
+"Please choose the set, the problem you would like to copy, and the problem "
+"you would like to copy it to."
+msgstr "Επιλέξτε το σύνολο ασκήσεων, το πρόβλημα που επιθυμείτε να αντιγράψετε, και το πρόβλημα στο οποίο θέλετε να το αντιγράψετε."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:19
+msgid "Please correct the following errors and try again:"
+msgstr "Παρακαλώ διορθώστε τα ακόλουθα λάθη και δοκιμάστε ξανά:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:28
+msgid "Please enter in a value to match in the filter field."
+msgstr "Εισάγετε μια τιμή που να ταιριάζει στο πεδίο φίλτρου."
+
+#. (tag('b', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:28
+msgid "Please enter your username and password for %1 below:"
+msgstr "Εισάγετε το όνομα χρήστη και τον κωδικό για το %1 παρακάτω:"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1778
+msgid "Please provide a location name to delete."
+msgstr "Δώστε παρακαλώ μία τοποθεσία για διαγραφή."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:233
+msgid "Please select action to be performed."
+msgstr "Επιλέξτε μια ενέργεια για εκτέλεση."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
+msgid "Please select at least one set and try again."
+msgstr "Επιλέξτε τουλάχιστον ένα σύνολο ασκήσεων και προσπαθήστε ξανά."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
+msgid "Please select at least one set."
+msgstr "Παρακαλώ επιλέξτε τουλάχιστον ένα σύνολο ασκήσεων."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:165
+msgid "Please select at least one user and try again."
+msgstr "Επιλέξτε τουλάχιστον έναν χρήστη και προσπαθήστε ξανά."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:31
+msgid "Please select at least one user."
+msgstr "Παρακαλώ επιλέξτε τουλάχιστον ένα χρήστη."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:28
+msgid "Please select at most one set."
+msgstr "Παρακαλώ επιλέξτε το πολύ ένα σύνολο ασκήσεων."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:30
+msgid "Please select exactly one set."
+msgstr "Παρακαλώ επιλέξτε μόνο ένα σύνολο ασκήσεων."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:29
+msgid "Please select exactly one user."
+msgstr "Παρακαλώ επιλέξτε μόνο ένα χρήστη."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1016
+msgid "Please specify a file to save to."
+msgstr "Ορίστε ένα αρχείο για αποθήκευση."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
+msgid "Please specify a homework set name."
+msgstr "Παρακαλώ ορίστε ένα όνομα για το σύνολο ασκήσεων ως εργασία."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
+msgid ""
+"Please use only letters, digits, dashes, underscores, and periods in your "
+"set name."
+msgstr "Παρακαλώ χρησιμοποιήστε μόνο γράμματα, ψηφία, παύλες, κάτω παύλες και τελείες στο όνομα του συνόλου ασκήσεών σας."
+
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1184
+msgid ""
+"Please use radio buttons to choose the method for saving this file. Uknown "
+"saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:165
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:169
+msgid "Point Value"
+msgstr ""
+
+#. ($grader->{problem_value})
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:92
+msgid "Point Value (0 - %1):"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:21
+msgid "Points"
+msgstr "Πόντοι"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:62
+msgid "Points:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:26
+msgid "Potion of Forgetfulness"
+msgstr "Φίλτρο Αμνησίας"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:2
+msgid "Prepare which sets for export?"
+msgstr "Προετοιμασία ποιων συνόλων ασκήσεων για εξαγωγή;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:268
+msgid "Press \"Grade Test\" now!"
+msgstr "Πατήστε \"Βαθμολογία Τεστ\" τώρα!"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:244
+msgid "Press \"Grade Test\" soon!"
+msgstr "Πατήστε \"Βαθμολογία Τεστ\" σύντομα!"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:69
+msgid "Preview Message"
+msgstr "Προεπισκόπηση μηνύματος"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:11
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:99
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:35
+msgid "Preview My Answers"
+msgstr "Προεπισκόπηση των Απαντήσεων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:646
+msgid "Preview Test"
+msgstr "Δοκιμή Προεπισκόπησης"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:41
+msgid ""
+"Preview the message before sending using the \"Preview Message\" button.  "
+"The preview shows the email that would be sent to the first selected student"
+" or the instructor if no students were selected.  The preview will also list"
+" all of the students that would receive their own personalized message.  If "
+"a merge file was selected, the preview will also indicate which (if any) "
+"recipient's merge file data could not be found."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:991
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:995
+msgid "Previous Problem"
+msgstr "Προηγούμενο Πρόβλημα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:94
+msgid "Previous page"
+msgstr "Προηγούμενη σελίδα"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:45
+msgid "Primary Actions"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:355
+msgid "Print Test"
+msgstr "Εκτύπωση τεστ"
+
+# Short for Problem
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:287
+msgid "Prob"
+msgstr "Προβ"
+
+#. (join('.', @seq)
+#. ($problemID)
+#. ($problemNumber)
+#. ($_->{prettyID})
+#. ($c->{prettyID})
+#. ($probID)
+#. ($c->{setRecord}->assignment_type eq 'jitar' ? join('.',
+#. jitar_id_to_seq($_)
+#. ($set->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)
+#. ($prettyProblemID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:831
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:842
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:853
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:57
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/siblings.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:40
+msgid "Problem %1"
+msgstr "Πρόβλημα %1"
+
+#. ($i + 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:535
+msgid "Problem %1."
+msgstr "Πρόβλημα %1."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:75
+msgid "Problem (\".pg\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:38
+msgid "Problem Display Settings"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1876
+msgid "Problem Display/Answer Checking"
+msgstr "Προβολή Προβλήματος/Έλεγχος Απάντησης "
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:50
+msgid "Problem Editor"
+msgstr "Επεξεργαστής Προβλημάτων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:29
+msgid "Problem Grader"
+msgstr "Βαθμολογητής Προβλήματος"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1002
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:999
+msgid "Problem List"
+msgstr "Λίστα Προβλημάτων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:75
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:159
+msgid "Problem Number"
+msgstr "Αριθμός Προβλήματος"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:160
+msgid "Problem Paths"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:140
+msgid "Problem Score (%):"
+msgstr "Βαθμολογία Προβλήματος (%):"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:30
+msgid "Problem Techniques"
+msgstr "Τεχνικές Προβλημάτων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:239
+msgid ""
+"Problem has a different source file than the currently rendered problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:233
+msgid "Problem has an essay answer that needs to be graded."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1943
+msgid "Problem source is drawn from a grouping set"
+msgstr "Η πηγή του προβλήματος προέρχεται από ένα σύνολο ομαδοποίησης"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:89
+msgid ""
+"Problem source is drawn from a grouping set and can not be directly rendered"
+" or edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:336
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:9
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:32
+msgid "Problems"
+msgstr "Προβλήματα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:25
+msgid "Problems Added"
+msgstr "Προστιθέμενα Προβλήματα"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:54
+msgid "Problems for all students have been unassigned."
+msgstr "Δεν έχουν εκχωρηθεί προβλήματα για όλους τους σπουδαστές."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:57
+msgid "Problems for selected students have been reassigned."
+msgstr "Επανεκχωρήθηκαν προβλήματα για επιλεγμένους μαθητές."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:46
+msgid "Problems have been assigned to all current users."
+msgstr "Τα προβλήματα έχουν ανατεθεί σε όλους τους τρέχοντες χρήστες."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:25
+msgid ""
+"Problems with this rating should only require direct memory of a fact. "
+"Examples might be a specific value of a function, or the statement of a "
+"definition. Very few WeBWorK problems fall into this category."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:93
+msgid "Proctor"
+msgstr "Επιτηρητής"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:92
+msgid "Proctor Password"
+msgstr "Κωδικός Πρόσβασης Επιτηρητή"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:71
+msgid "Proctor Username"
+msgstr "Όνομα Χρήστη Επιτηρητή"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:3
+msgid "Proctor authorization requested for a nonexistent set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:8
+msgid "Proctor authorization required."
+msgstr "Απαιτείται άδεια του επιτηρητή."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:88
+msgid "Proctor:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:265
+msgid "Proctored Test %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:272
+msgid "Proctored Test %2 Proctor Login"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:318
+msgid ""
+"Proctored tests always require authorization to start the test. \"Both Start"
+" and Grade\" will require login proctor authorization to start and grade "
+"proctor authorization to grade. \"Only Start\" requires grade proctor "
+"authorization to start and no authorization to grade."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:18
+msgid ""
+"Provide a password to have a single password for all students to start a "
+"proctored test."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:56
+msgid "Publish"
+msgstr "Εμφάνιση"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:31
+msgid ""
+"Quick access to many instructor tools, including <strong>Reset "
+"passwords</strong>, <strong>Act as student</strong>, <strong>Assign "
+"individual sets</strong> and <strong>Edit individual due dates</strong>."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
+msgid "RECITATION"
+msgstr "ΕΝΙΣΧΥΤΙΚΗ"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:199
+msgid "Randomize"
+msgstr "Τυχαιοποίηση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:13
+msgid "Randomize Seed"
+msgstr "Τυχαιοποιημένος αριθμός"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:101
+msgid "Read only"
+msgstr "Μόνο για ανάγνωση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:67
+msgid "Really delete the items listed above?"
+msgstr "Οριστική διαγρ. των παραπάνω στοιχείων;"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:184
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:42
+msgid "Recitation"
+msgstr "Ενισχυτική"
+
+#. ($recitation)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:125
+msgid "Recitation %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:21
+msgid "Recitation:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:38
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:46
+msgid "Record Scores for Single Sets"
+msgstr "Καταγραφή Σκορ για Ενιαία Σύνολα Ασκήσεων"
+
+#. ($studentID)
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:8
+msgid "Record for user %1 not found."
+msgstr "Εγγραφή για χρήστη %1 δεν βρέθηκε."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
+msgid "Reduced Scoring"
+msgstr "Μειωμένη Βαθμολ."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:67
+msgid "Reduced Scoring Date"
+msgstr "Μειωμ. Ημ/νία Βαθμολ."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
+msgid "Reduced Scoring Enabled"
+msgstr "Μειωμένη Βαθμολ. Ενεργή"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:33
+msgid "Reduced Scoring Period"
+msgstr ""
+
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:314
+msgid "Reduced credit can still be earned until %1."
+msgstr "Μειωμένη πίστωση μπορεί ακόμα να αποκτηθεί έως %1."
+
+# Short for "Reduced Scoring:"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:32
+msgid "Reduced:"
+msgstr "Μειώθηκε:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:56
+msgid "Refresh"
+msgstr "Ανανέωση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:56
+msgid "Refresh Listing"
+msgstr "Ανανέωση Λίστας"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:200
+msgid "Relax IP restrictions when?"
+msgstr "Πότε γίνεται χαλάρωση περιορισμών IP;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:88
+msgid "Reload the page to see backup files that have been made."
+msgstr ""
+
+# Context is "Attempts Remaining"
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:14
+msgid "Remaining"
+msgstr "Απομένουν"
+
+#. ('00:00:00')
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:254
+msgid "Remaining time: %1"
+msgstr "Υπολειπόμενος χρόνος: %1"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:61
+msgid "Remember Me"
+msgstr "Θυμήσου Με"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:514
+msgid "Remember to return to your original problem when you're finished here!"
+msgstr "Θυμηθείτε να επιστρέψετε στο αρχικό σας πρόβλημα όταν τελειώσετε εδώ!"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:466
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:72
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:41
+msgid "Rename"
+msgstr "Μετονομασία"
+
+#. ($rename_oldCourseID, $rename_newCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:62
+msgid "Rename %1 to %2"
+msgstr "Μετ/σία %1 σε %2"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:73
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:34
+msgid "Rename Course"
+msgstr "Μετονομασία Μαθήματος"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:17
+msgid "Rename Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:22
+msgid "Rename Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
+msgid "Rename file as:"
+msgstr "Μετ/σία αρχείου ως:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:463
+msgid "Render"
+msgstr "Απόδοση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:344
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:59
+msgid "Render All"
+msgstr "Απόδοση Όλων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:461
+msgid "Render Problem"
+msgstr "Απόδοση Προβλ/τος"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:60
+msgid ""
+"Render all problems on the page. This does not reload the page or save or "
+"reset changes."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:106
+msgid ""
+"Render or re-render the problem, course info file, or set header being "
+"edited. This does not change the permanent file on the disk. You can view "
+"different versions of the same problem by changing the seed. You can also "
+"change the manner in which the mathematics is typeset. If \"Open in new "
+"window\" is checked, then the problem will open in a new tab or window "
+"showing the problem as it will be rendered for students in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:132
+msgid "Rendering Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:341
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:53
+msgid "Renumber Problems"
+msgstr "Επαναρίθμηση Προβλ/των"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:55
+msgid ""
+"Renumber problems consecutively starting from 1. This renumbering is not "
+"saved until \"Save Changes\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:103
+msgid ""
+"Renumber problems in the set consecutively starting from one. In the process"
+" of deleting problems, the numbering can be made non-consecutive. This is "
+"useful to clean up the problem numbering."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:31
+msgid ""
+"Reopens any test for an additional 24 hours. This allows you to take a test "
+"even if the close date has past. This item does not allow you to take "
+"additional versions of the test."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:118
+msgid "Reordering Problems"
+msgstr ""
+
+#. (tag(                                           'strong',
+#. c(                                                      tag('span', dir =>
+#. 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:58
+msgid "Replace current problem: %1"
+msgstr "Αντικαταστήστε τρέχον πρόβλ.: %1"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:13
+msgid "Replace which users?"
+msgstr "Αντικ/σταση ποιων χρηστών;"
+
+#. ($composite_id, $oldUser->status)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:448
+msgid "Replacing old data for %1: status: %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:42
+msgid "Reply-To:"
+msgstr "Απάντηση προς:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:123
+msgid "Report Bugs in this Problem"
+msgstr "Αναφορά σφαλμάτων στο Πρόβλημα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:305
+msgid "Report bugs"
+msgstr "Αναφορά Σφαλμάτων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:128
+msgid ""
+"Report bugs in a WeBWorK question/problem using this link. The very first "
+"time you do this you will need to register with an email address so that "
+"information on the bug fix can be reported back to you."
+msgstr ""
+
+#. ($upgrade_courseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1530
+msgid "Report for course %1:"
+msgstr "Αναφορά μαθήματος %1:"
+
+#. ($archive_courseID)
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:3
+msgid "Report on database structure for course %1:"
+msgstr "Αναφορά στη δομή της βάσης δεδομένων για το μάθημα %1:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:8
+msgid "Request New Version"
+msgstr "Ζητήστε Νέα Έκδοση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:19
+msgid "Request information"
+msgstr "Ζητήστε πληροφορίες"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1220
+msgid "Request new version now."
+msgstr "Ζητήστε νέα έκδοση τώρα."
+
+#. ($setName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:486
+msgid ""
+"Requested set \"%1\" is a proctored test, but no valid proctor authorization"
+" has been obtained."
+msgstr ""
+
+#. ($setName, $effectiveUserName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:425
+msgid "Requested set '%1' could not be found in the database for user %2."
+msgstr "Το ζητούμενο σύνολο ασκήσεων '%1' δεν βρέθηκε στη βάση για το χρήστη %2."
+
+#. ($setName, $node_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:472
+msgid ""
+"Requested set '%1' is a homework assignment but the test content generator "
+"%2 was called.  Try re-entering the set from the problem sets listing page."
+msgstr ""
+
+#. ($setName, $node_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:466
+msgid ""
+"Requested set '%1' is a test but the regular homework assignment content "
+"generator %2 was called.  Try re-entering the set from the problem sets "
+"listing page."
+msgstr ""
+
+#. ($setName, $effectiveUserName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:420
+msgid "Requested set '%1' is not assigned to user %2."
+msgstr "Το ζητούμενο σύνολο ασκήσεων '%1' δεν ανατέθηκε στο χρήστη %2."
+
+#. ($setName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:450
+msgid "Requested set '%1' is not available yet."
+msgstr "Το ζητούμενο σύνολο ασκήσεων '%1' δεν είναι ακόμα διαθέσιμο."
+
+#. ($setName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:444
+msgid "Requested set '%1' is not yet open."
+msgstr "Το ζητούμενο σύνολο ασκήσεων '%1' δεν είναι ακόμα ανοιχτό."
+
+#. ($verNum,				$setName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:407
+msgid "Requested version (%1) of set '%2' can not be directly accessed."
+msgstr "Η ζητούμενη έκδοση (%1) του συνόλου ασκήσεων '%2' δεν είναι άμεσα προσβάσιμη."
+
+#. ($verNum, $setName, $effectiveUserName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:397
+msgid "Requested version (%1) of set '%2' is not assigned to user %3."
+msgstr "Η ζητούμενη έκδοση (%1) του συνόλου ασκήσεων '%2' δεν έχει ανατεθεί στο χρήστη %3."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:308
+msgid "Require Proctor Authorization to"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:45
+msgid "Require users to log in through the LMS"
+msgstr "Απαιτείται από τους χρήστες να συνδεθούν μέσω του LMS."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:420
+msgid "Rerandomize after"
+msgstr "Επανατυχαιοποίηση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:104
+msgid "Reset"
+msgstr "Επαναφορά"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:195
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:696
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:47
+msgid "Reset Form"
+msgstr "Επαναφορά Φόρμας"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:27
+msgid "Resets the number of incorrect attempts on a single homework problem."
+msgstr "Επαναφέρει τον αριθμό των λανθασμένων δοκιμών σε μία άσκηση προβλήματος ."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:41
+msgid "Restore a .tar.gz archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:40
+msgid "Restore backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:39
+msgid "Restore backup from %1"
+msgstr ""
+
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+msgid "Restored backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:188
+msgid "Restrict Access by IP"
+msgstr "Περι/σμός πρόσβ. μέσω IP"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep:11
+msgid "Restrict Locations"
+msgstr "Περι/σμός Τοποθεσιών"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:324
+msgid "Restrict Problem Progression"
+msgstr "Περι/σμός Προβλημάτων Προόδου"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:194
+msgid "Restrict To"
+msgstr "Περι/σμός σε"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:33
+msgid "Restrict or sort the students displayed"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:159
+msgid "Restrict release by set(s)"
+msgstr "Περιορισμός κυκλοφορίας ανά σύνολο(α)"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:291
+msgid "Result"
+msgstr "Αποτέλεσμα"
+
+#. ($c->tag('i', $c->$actionHandler)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:228
+msgid "Result of last action performed: %1"
+msgstr "Αποτέλεσμα τελευταίας ενέργειας: %1"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:300
+msgid "Results for this submission"
+msgstr "Αποτελέσματα για αυτήν την υποβολή"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:236
+msgid "Results of last action performed"
+msgstr "Αποτελέσματα τελευταίας ενέργειας"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:125
+msgid "Results of last action performed: "
+msgstr "Αποτελέσματα τελευταίας ενέργειας: "
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:51
+msgid "Resurrect which test?"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:669
+msgid "Retitled"
+msgstr "Μετονομασμένο"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:17
+msgid "Return to your work"
+msgstr "Επιστρέψτε στην εργασία σας"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:16
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:166
+msgid "Revert"
+msgstr "Επαναφορά"
+
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:83
+msgid "Revert to %1"
+msgstr "Επαναφορά σε %1"
+
+#. ($c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1220
+msgid "Reverted to original file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:168
+msgid ""
+"Reverts to the copy of the file saved on the disk or to a backup file. All "
+"unsaved editing changes will be lost. This option is only active when a "
+"temporary file or a backup file exists. You may also delete backups that "
+"have been made with this tab."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:182
+msgid "Review of column functions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:145
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:85
+msgid ""
+"Reviewing a problem and looking at both the average Attempts and  average "
+"Status should give instructors valuable information about the difficulty of "
+"the problem."
+msgstr "Η προεπισκόπηση ενός προβλήματος και η εξέταση τόσο του μέσου όρου των προσπαθειών όσο και της μέσης κατάστασης μπορεί να δώσει στους καθηγητές πολύτιμες πληροφορίες σχετικά με τη δυσκολία του προβλήματος."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:55
+msgid "Reward used successfully!"
+msgstr "Η ανταμοιβή χρησιμοποιήθηκε με επιτυχία!"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:4
+msgid "Rewards"
+msgstr "Ανταμοιβές"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:27
+msgid "Ring of Reduction"
+msgstr "Δακτύλιος Αναγωγής"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:26
+msgid "Robe of Longevity"
+msgstr "Χιτώνας Mακροζωίας"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
+msgid "SECTION"
+msgstr "ΕΝΟΤΗΤΑ"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:214
+msgid "SET NAME"
+msgstr "ΟΝΟΜΑΣΙΑ ΣΥΝΟΛΟΥ ΑΣΚΗΣΕΩΝ"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:321
+msgid "STATUS"
+msgstr "ΚΑΤΑΣΤΑΣΗ"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
+msgid "STUDENT ID"
+msgstr "ΚΩΔΙΚΟΣ ΣΠΟΥΔΑΣΤΗ"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:85
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:207
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:123
+msgid "Save"
+msgstr "Αποθήκευση"
+
+#. (tag('b', $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_form.html.ep:2
+msgid "Save %1"
+msgstr "Αποθήκευση %1"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:134
+msgid "Save As"
+msgstr "Αποθήκευση ως"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:194
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:695
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:37
+msgid "Save Changes"
+msgstr "Αποθήκευση Αλλαγών"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:60
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:76
+msgid "Save Edit"
+msgstr "Αποθήκευση Επεξεργασίας"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
+msgid "Save Export"
+msgstr "Αποθήκευση Εξαγωγής"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
+msgid "Save Password"
+msgstr "Αποθήκευση Κωδικού Πρόσβασης"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:188
+msgid "Save as"
+msgstr "Αποθήκευση ως"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:5
+msgid "Save as:"
+msgstr "Αποθήκευση ως:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_password_form.html.ep:1
+msgid "Save changes"
+msgstr "Αποθήκευση αλλαγών"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:33
+msgid "Save file to:"
+msgstr "Αποθήκευση αρχείου σε:"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:125
+msgid ""
+"Save the contents of the editor window to the file on disk and re-render the"
+" problem. If \"Open in new window\" is checked, then the problem will open "
+"in a new tab or window showing the problem as it will be rendered for "
+"students in the set. If \"Create backup\" is checked then a backup of the "
+"current file on disk will be created before overwriting it with the contents"
+" of the editor window. If a backup already exists, then a \"Delete oldest "
+"backup\" check box will be present. If that is checked, then the oldest "
+"backup will be deleted when \"Save\" is clicked. These backups can be "
+"reverted to and managed on the \"Revert\" tab."
+msgstr ""
+
+#. (tag('b', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:6
+msgid "Save to %1 and View"
+msgstr "Αποθήκευση σε %1 και Προβολή"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:50
+msgid "Saved answers"
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#. ($outputFilePath =~ s/$ce->{courseDirs}{templates}/[TMPL]/r)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:549
+msgid "Saved to file \"%1\""
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2292
+msgid "Schema and database field definitions do not agree"
+msgstr "Οι ορισμοί του σχήματος και του πεδίου της βάσης δεδ. δεν συμφωνούν"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2279
+msgid "Schema and database table definitions do not agree"
+msgstr "Οι ορισμοί του σχήματος και του πίνακα της βάσης δεδ. δεν συμφωνούν"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:147
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:161
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:78
+msgid "Score"
+msgstr "Βαθμός"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:125
+msgid "Score (%)"
+msgstr "Βαθμός (%)"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:60
+msgid ""
+"Score one or more sets. This can also be done from the \"Hmwk Sets Editor\" "
+"or from the \"Instructor Tools\", but the \"Scoring Tools\" page allows "
+"control over parameters."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:170
+msgid "Score required for release"
+msgstr "Απαιτείται βαθμολ. για αποδέσμευση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:58
+msgid "Score selected set(s) and save to:"
+msgstr "Βαθμολόγηση επιλεγμ. συνόλων ασκήσεων και αποθήκευση σε:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:284
+msgid "Score summary for last submission:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:2
+msgid "Score which achievements?"
+msgstr "Βαθμολόγηση επιτευγμάτων:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:2
+msgid "Score which sets?"
+msgstr "Βαθμολογία για ποια σύνολα ασκήσεων;"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
+msgid "Scores"
+msgstr "Βαθμοί"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:66
+msgid "Scoring (\".csv\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:396
+msgid "Scoring Download"
+msgstr "Λήψη Βαθμολογίας"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:115
+msgid "Scoring Message"
+msgstr "Μηνύμα Βαθμολογίας"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:391
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:58
+msgid "Scoring Tools"
+msgstr "Εργαλεία Βαθμολόγησης"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:17
+msgid "Scoring Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:327
+msgid ""
+"Screen and Hardcopy set header information can not be overridden for "
+"individual students."
+msgstr "Οι πληρ/ίες επικεφαλίδας Οθόνης και Έντυπου δεν μπορούν να παρακαμφθούν για μεμον/ους σπουδαστές."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:26
+msgid "Scroll of Resurrection"
+msgstr "Κύλιση Επαναφοράς"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:178
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:38
+msgid "Section"
+msgstr "Ενότητα"
+
+#. ($section)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:122
+msgid "Section %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:30
+msgid "Section:"
+msgstr "Ενότητα:"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:436
+msgid "Seed"
+msgstr "Τυχαίος Αριθμός"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:114
+msgid "Select"
+msgstr "Επιλέξτε"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:20
+msgid ""
+"Select Users from the left column and sets from the right column and assign "
+"or unassign the given sets. The list of users or the list of sets can be "
+"reordered under the \"sort\" option or the format of the user or set list.  "
+"Additionally, the set lists can be filtered (by section number or "
+"recitation).  The displayed user and set lists will only be updated upon "
+"clicking \"Change Display Settings\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:11
+msgid "Select a Homework Set"
+msgstr "Επιλέξτε Σύνολο Καθηκόντων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:14
+msgid "Select a Problem Collection"
+msgstr "Επιλέξτε Σύνολο Προβλημάτων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:18
+msgid "Select a Set Definition File"
+msgstr "Επιλέξτε ένα Αρχείο Προσδιορισμού Συνόλου Ασκήσεων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:14
+msgid "Select a Set from this Course"
+msgstr "Επιλέξτε Σύνολο Ασκήσεων από αυτό το Μάθημα"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:20
+msgid ""
+"Select a course to create a .tar.gz archive of, which contains a dump of the"
+" database and all course files (templates, configuration files, etc).  Each "
+"course can only have a single archive.  Creating an archive of a previously "
+"archived course will delete the old archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:36
+msgid "Select a course to delete."
+msgstr "Επιλέξτε μάθημα για διαγραφή."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:20
+msgid ""
+"Select a course to delete.  Warning, all data will be deleted and this "
+"cannot be undone.  This will not delete any course archives."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:14
+msgid ""
+"Select a course to rename.  The courseID is used in the url and can only "
+"contain alphanumeric characters and underscores. The course title appears on"
+" the course home page and can be any string."
+msgstr "Επιλέξτε μάθημα για μετονομασία. Ο κωδικός μαθ/τος χρησ/είται στο url και μπορεί να περιέχει μόνο αλφ/κούς χαρακτήρες και κάτω παύλες. Ο τίτλος του εμφανίζεται στην αρχ. σελίδα μαθ/τος και μπορεί να είναι συμβολοσειρά."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:13
+msgid "Select a course to unarchive."
+msgstr "Επιλέξτε μάθ. για μη αρχειοθέτηση."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:21
+msgid "Select a listing format:"
+msgstr "Επιλέξτε μορφή καταχώρησης:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:18
+msgid "Select action:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:10
+msgid "Select all achievements"
+msgstr "Επιλέξτε όλα τα επιτεύγματα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:12
+msgid "Select all eligible courses"
+msgstr "Επιλογή των κατάλληλων μαθημάτων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:26
+msgid "Select all sets"
+msgstr "Επιλογή όλων των συνόλων ασκήσεων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:10
+msgid "Select all users"
+msgstr "Επιλογή όλων των χρηστών"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:10
+msgid "Select an action to perform:"
+msgstr "Επιλέξτε ενέργεια για εκτέλεση:"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:20
+msgid ""
+"Select an archive to restore.  You cannot restore an archive into an "
+"existing course. Instead, either rename or delete the old course, or restore"
+" the archive with a new name.  When restoring a course with a new name, the "
+"name is used as the course ID, and must contain only letters, numbers, "
+"hyphens, and underscores, and may have at most 40 characters."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:36
+msgid "Select course(s) to archive."
+msgstr "Επιλέξτε μάθημα(τα) για αρχ/ση."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:44
+msgid "Select course(s) to hide or unhide."
+msgstr "Επιλέξτε μάθημα(τα) για απόκρ. ή επανεμφ."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:7
+msgid "Select import file"
+msgstr "Επιλέξτε αρχείο εισαγωγής"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:14
+msgid ""
+"Select one or more sets and one or more users below to assign/unassign each "
+"selected set to/from all selected users."
+msgstr "Επιλέξτε ένα ή παραπάνω σύνολα και έναν ή παραπάνω από τους παρακάτω χρήστες για να αναθέσετε/αφαιρέσετε κάθε επιλεγμένο σύνολο σε/από όλους τους επιλεγμένους χρήστες."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:94
+msgid "Select sets below to assign them to the newly-created users."
+msgstr "Επιλέξτε τα παρακάτω σύνολα για ανάθεση σε νέους χρήστες."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:20
+msgid ""
+"Select the course to change its Course ID, Course Title, or Institution.  "
+"Note that changing a course's ID will change the URL of all links to the "
+"course, and could break links from external sites such as an LMS."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:4
+msgid ""
+"Select the course(s) you want to hide (or unhide) and then click \"Hide "
+"Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
+"does no harm (the action is skipped). Likewise unhiding a course that is "
+"already visible does no harm (the action is skipped).  Hidden courses are "
+"still active but are not listed in the list of WeBWorK courses on the "
+"opening page.  To access the course, an instructor or student must know the "
+"full URL address for the course."
+msgstr "Επιλέξτε το/τα μάθημα/τα που θέλετε να αποκρύψετε (ή να επανεμφανίσετε) και πατήστε \"Απόκρυψη\" (ή \"Επανεμφάνιση\"). Η απόκρυψη ενός μαθήματος που είναι ήδη κρυμμένο δεν επηρεάζει κάτι. Ομοίως, η επανεμφάνιση ενός μαθήματος που είναι ήδη ορατό δεν επηρεάζει κάτι. Τα κρυφά μαθήματα είναι ακόμα ενεργά, αλλά δεν περιλαμβάνονται στη λίστα μαθημάτων WeBWorK στην αρχική σελίδα. Για να αποκτήσετε πρόσβαση στο μάθημα, ένας καθηγητής ή σπουδαστής πρέπει να γνωρίζει την πλήρη διεύθυνση URL του μαθήματος."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:20
+msgid ""
+"Select the course(s) you want to hide (or unhide) and then click \"Hide "
+"Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
+"does no harm (the action is skipped). Likewise unhiding a course that is "
+"already visible does no harm (the action is skipped). Hidden courses are "
+"still active but are not listed in the list of WeBWorK courses on the "
+"opening page. To access the course, an instructor or student must know the "
+"full URL address for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:93
+msgid "Select the display mode used to render the problems on this page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:11
+msgid ""
+"Select the homework sets for which to generate hardcopy versions. You may "
+"also select multiple users from the users list. You will receive hardcopy "
+"for each (set, user) pair."
+msgstr "Επιλέξτε τα σύνολα καθηκόντων για τη δημιουργία τους σε έντυπη μορφή. Μπορείτε επίσης να επιλεξετε πολλούς χρήστες από τη λίστα χρηστών. Θα λάβετε έντυπο για κάθε ζεύγος (σύνολο, χρήστη)."
+
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:30
+msgid ""
+"Select the sets you want scored, choose the name of the export file you want"
+" to use (by default: %1), and then click the \"Score Selected Set(s) and "
+"save to\" button."
+msgstr ""
+
+#. ('<code>ful.csv</code>','<code>scr.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:49
+msgid ""
+"Select this if you want to save the scores for each set in a separate file "
+"in addition to saving all scores to a cumulative file. After clicking the "
+"\"Score Selected Set(s) and save to\" button, you will get a pair of links "
+"for each selected set. The file that ends with %1 contains the number of "
+"correct and incorrect tries about each individual problem for each student. "
+"The file that ends with %2 is a summary of each problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:19
+msgid ""
+"Select user(s) and/or set(s) below and click the action button of your "
+"choice."
+msgstr "Επιλέξτε χρήστη(ες) ή/και σύνολα και επιλέξτε ενέργεια."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:85
+msgid ""
+"Select which assignment types (homework, tests, just-in-time) the "
+"achievement is evaluated."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:20
+msgid ""
+"Select which courses to upgrade from a previous version of WeBWorK.  The "
+"upgrade process can add missing database columns, delete unused database "
+"columns, and check the course file structure.  Be sure to read over the "
+"changes before confirming the upgrade.  You may want to create an archive of"
+" the course before upgrading.  Only courses that need upgraded will be "
+"selectable."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:84
+msgid "Select your favorite theme for the large text window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:18
+msgid "Select/unselect all fields missing in schema for deletion."
+msgstr "Επιλογή/ αποεπιλογή όλων των πεδίων που λείπουν στο σχήμα για διαγραφή"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:9
+msgid "Select/unselect all tables missing in schema for deletion."
+msgstr "Επιλογή/ αποεπιλογή όλων των πινάκων που λείπουν στο σχήμα για διαγραφή "
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:23
+msgid "Selected sets:"
+msgstr "Επιλεγμένα σύνολα ασκήσεων:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:57
+msgid "Send E-mail"
+msgstr "Αποστολή Email"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:83
+msgid "Send Email"
+msgstr "Αποστολή Email"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:69
+msgid "Send email to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:54
+msgid "Send emails to selected instructors."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:59
+msgid "Send to all students"
+msgstr "Αποστολή σε όλους τους σπουδαστές"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:64
+msgid "Send to selected students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:7
+msgid "Set"
+msgstr "Σύνολο Ασκήσεων"
+
+#. ($newSetName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:614
+msgid "Set %1 has been created."
+msgstr "Το σύνολο ασκήσεων %1 δημιουργήθηκε."
+
+#. ($newSetName, $userName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:616
+msgid "Set %1 was assigned to %2"
+msgstr "Το σύνολο ασκήσεων %1 ανατέθηκε σε %2"
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:567
+msgid "Set %1 was assigned to %2."
+msgstr "Το σύνολο ασκήσεων %1 ανατέθηκε στο %2."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:354
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:42
+msgid "Set Assigner"
+msgstr "Αναθέτης Συνόλου Ασκήσεων"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:17
+msgid "Set Assigner Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:45
+msgid "Set Definition Files"
+msgstr "Αρχεία Περιγραφής"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:218
+msgid "Set Description"
+msgstr "Περιγραφή Συνόλου Ασκήσεων"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:17
+msgid "Set Detail Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:333
+msgid "Set Detail for set %2"
+msgstr "Επιλογή για το σύνολο ασκήσεων %2"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:93
+msgid "Set Header"
+msgstr "Επικεφαλίδα Συνόλου Ασκήσεων"
+
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:323
+msgid "Set Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:218
+msgid "Set ID"
+msgstr "Κωδικός Συνόλου Ασκήσεων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:114
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:3
+msgid "Set Info"
+msgstr "Πληροφορίες Συνόλου Ασκήσεων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:19
+msgid "Set List"
+msgstr "Λίστα Συνόλων Ασκήσεων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:7
+msgid "Set Name"
+msgstr "Όνομα Συνόλου Ασκήσεων"
+
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:18
+msgid "Set closes on %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:45
+msgid "Set definition (\".def\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:20
+msgid "Set is closed."
+msgstr ""
+
+#. ($c->formatDateTime($set->reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:16
+msgid "Set is due on %1."
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:14
+msgid "Set opens on %1."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:188
+msgid "Set random seed to:"
+msgstr "Ορισμός τυχαίου αριθμού:"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1930
+msgid ""
+"Set to true for log to mean base 10 log and false for log to mean natural "
+"logarithm."
+msgstr "Ορίστε <<σωστό>> για να χρησιμοποιήσετε τον λογάριθμο με βάση το 10 και  <<λάθος>> για να χρησιμοποιήσετε τον φυσικό λογάριθμο. "
+
+#: /opt/webwork/webwork2/conf/defaults.config:1950
+msgid ""
+"Set to true to allow students to enter Unicode versions of some characters "
+"(like U+2212 for the minus sign) in their answers.  One reason to allow this"
+" is that copying and pasting output from MathJax can introduce these "
+"characters, but it is also getting easier to enter these characters "
+"directory from the keyboard."
+msgstr "Ορίστε σωστό να επιτρέπεται στους σπουδαστές να εισάγουν τις εκδοχές Unicode μερικών χαρακτήρων (όπως U+2212 για το σύμβολο του πλην) στις απαντήσεις τους. Ένας λόγος για να επιτραπεί αυτό είναι ότι η αντιγραφή και η επικόλληση παραρτήματος από το MathJax μπορούν να εισάγουν αυτούς τους χαρακτήρες, αλλά είναι επίσης πιο εύκολο να εισάγουν αυτούς τους χαρακτήρες καταλόγου από το πληκτρολόγιο. "
+
+#: /opt/webwork/webwork2/conf/defaults.config:1920
+msgid ""
+"Set to true to display the \"Entered\" column which automatically shows the "
+"evaluated student answer, e.g., 1 if student input is sin(pi/2). If this is "
+"set to false, e.g., to save space in the response area, the student can "
+"still see their evaluated answer by clicking on the typeset version of their"
+" answer."
+msgstr "Ορίστε <<σωστό>> για να εμφανίζεται η απάντηση των σπουδαστών σαν δεκαδικός. Π.χ., θα εμφανίζεται 1 αν ο σπουδαστής εισάγει ημ(π/2). Ακόμα και εάν οριστεί <<λάθος>>, ο σπουδαστής μπορεί να δει την δεκαδική τιμή της απάντησής του κάνοντας κλικ πάνω της. "
+
+#: /opt/webwork/webwork2/conf/defaults.config:1961
+msgid ""
+"Set to true to have Full Width Unicode character (U+FF01 to U+FF5E) "
+"converted to their ASCII equivalents (U+0021 to U+007E) automatically in "
+"MathObjects.  This may be valuable for Chinese keyboards, for example, that "
+"automatically use Full Width characters for parentheses and commas."
+msgstr "Ορίστε σωστό να έχει μετατραπεί αυτόματα  ο Unicode χαρακτήρας Πλήρες Πλάτος  (U+FF01 to U+FF5E) στις αντιστοιχίες ASCII (U+0021 to U+007E) στο MathObjects. Αυτό μπορεί να είναι πολύτιμο για τα Κινεζικά πληκτρολόγια, για παράδειγμα, να χρησιμοποιούν αυτόματα χαρακτήρες Πλήρες Πλάτος για παρενθέσεις και κόμματα. "
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:16
+msgid "Set values"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/siblings.html.ep:4
+msgid "Sets"
+msgstr "Σύνολα Ασκήσεων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:322
+msgid "Sets assigned to %1"
+msgstr "Ανατέθηκαν σύνολα ασκήσεων σε %1"
+
+#. ($userName, $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:90
+msgid "Sets assigned to %1 (%2)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:17
+msgid "Sets assigned to student Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:57
+msgid ""
+"Sets how grades will be passed back from WeBWorK to the "
+"LMS.<dl><dt>course</dt><dd>Sends a single grade back to the LMS. This grade "
+"is calculated out of the total question set that has been assigned to a user"
+" and made open. Therefore it can appear low, since it counts problem sets "
+"with future due dates as zero.</dd> <dt>homework</dt><dd>Sends back a score "
+"for each problem set (including for each quiz). To use this, the external "
+"links from the LMS must be problem set specific. For example, "
+"<code>webwork.myschool.edu/webwork2/course-name/problem_set_name</code>. If "
+"the problem set name has space characters, they should be underscores in "
+"these addresses. Also, to initialize the communication between WeBWorK and "
+"the LMS, the user must follow each of these external learning tools at least"
+" one time. Since there must be a separate external tool link for each "
+"problem set, this option requires more maintenance of the LMS "
+"course.</dd></dl>"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:55
+msgid "Sets the order in which achievements are listed and evaluated."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:625
+msgid "Sets were selected for export."
+msgstr "Τα σύνολα ασκήσεων έχουν επιλεχθεί για εξαγωγή."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:36
+msgid "Setting"
+msgstr "Ρυθμίσεις"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:39
+msgid "Shift dates so that the earliest is"
+msgstr "Αλλαγή ημ/νίας ώστε το νωρίτερο να είναι"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:32
+msgid "Show"
+msgstr ""
+
+#. ($numchild)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:32
+msgid "Show %1 more like this"
+msgstr "Δείξε το %1 περισσότερο κάπως έτσι"
+
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:107
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:39
+msgid "Show Correct Answers"
+msgstr "Δείξε Σωστές Απαντήσεις"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:22
+msgid "Show Date & Size"
+msgstr "Ημ/νία & Μέγεθος"
+
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:86
+msgid "Show LTI parameters (for debugging)"
+msgstr "Δείξε παραμέτρους LTI (για εντοπισμό σφαλμάτων)"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:34
+msgid "Show Me Another"
+msgstr "Παρόμοιο Πρόβλημα"
+
+#. ($exhausted)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:69
+msgid "Show Me Another %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1642
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:711
+msgid "Show Past Answers"
+msgstr "Παλιές Απαντήσεις"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:41
+msgid "Show Problem Source File"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:132
+msgid "Show Problem Source File:"
+msgstr "Δείξε Πρόβλημα Αρχείο Προέλευσης:"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
+msgid "Show Problems on Finished Tests"
+msgstr "Εμφάνιση Προβλημάτων στα Ολοκληρωμένα Τεστ"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+msgid "Show Scores on Finished Tests"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:630
+msgid "Show Solutions"
+msgstr "Εμφάνιση Λύσης"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1538
+msgid "Show Total Homework Grade on Grades Page"
+msgstr "Εμφάνιση Συνολικής Βαθμολογίας στη Σελίδα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:77
+msgid "Show all students"
+msgstr "Δείξε σε όλους τους σπουδαστές"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:91
+msgid "Show all tests"
+msgstr "Δείξε όλα τα διαγωνίσματα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:621
+msgid "Show correct answers"
+msgstr "Εμφάνιση σωστών απαντήσεων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+msgid "Show hints after"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:30
+msgid "Show less like this"
+msgstr "Δείξε λιγότερα από αυτά"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:387
+msgid "Show me another"
+msgstr "Παρόμοιο πρόβλημα"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:20
+msgid ""
+"Show past answers.  Students can only see their past answers, and they will "
+"not be able to see which parts are correct.  Instructors can use the form to"
+" select any combination of users, sets, and problems to view.  The table "
+"below will list the past answers colored according to correctness (green is "
+"correct).  Use control + click to select multiple users, sets, or problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:639
+msgid "Show problem graders"
+msgstr "Δείξε βαθμολογία προβλημάτων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:105
+msgid "Show saved answers?"
+msgstr "Εμφάνιση αποθηκευμένων απαντήσεων;"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1762
+msgid ""
+"Show the correct answer to the current problem before re-randomization."
+msgstr "Δείξε την σωστή απάντηση στο τρέχον πρόβλημα πριν την επανατυχαιοποίηση."
+
+#: /opt/webwork/webwork2/conf/defaults.config:1764
+msgid ""
+"Show the correct answer to the current problem on the last attempt before a "
+"new version is requested."
+msgstr "Δείξε την σωστή απάντηση στο τρέχον πρόβλημα στην τελευταία προσπάθεια πριν ζητηθεί η καινούρια έκδοση. "
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:3
+msgid "Show which sets?"
+msgstr "Εμφάνιση των συνόλων ασκήσεων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:3
+msgid "Show which users?"
+msgstr "Δείξε ποιους χρήστες;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:11
+msgid "Show:"
+msgstr "Εμφάνιση:"
+
+#. (scalar @{ $c->{visibleSetIDs} },			scalar @{ $c->{allSetIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:115
+msgid "Showing %1 out of %2 sets."
+msgstr "Εμφάνιση του %1από %2 σύνολα ασκήσεων."
+
+#. (scalar(keys %{ $c->{visibleUserIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:80
+msgid "Showing %1 out of %2 users"
+msgstr "Εμφάνιση %1 από %2 χρήστες"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:70
+msgid "Showing all students"
+msgstr "Δείξε όλους τους σπουδαστές"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:81
+msgid "Showing all tests"
+msgstr "Δείξε όλα τα διαγωνίσματα"
+
+#. ($c->{merge_file}, $ur->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:5
+msgid "Showing data from merge file %1 for user %2:"
+msgstr ""
+
+#. ($c->{merge_file})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:147
+msgid "Showing data from merge file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:61
+msgid "Showing problem for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:7
+msgid "Showing statistics for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:33
+msgid ""
+"Shows how many instructors and students have been assigned this problem set,"
+" out of the total number in the class. Clicking on this link allows you to "
+"assign the set to users, unassign this set from users, and to individually "
+"edit the assignment for specific users. For changing dates for individual "
+"users there are also shortcuts from the \"Instructor Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:63
+msgid "Site Information"
+msgstr "Πληροφορίες Ιστοτόπου"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:88
+msgid "Skip archiving this course"
+msgstr "Μη αρχειοθέτηση μαθήματος"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1981
+msgid "Skip explanation essay answer fields"
+msgstr "Παράληψη εξηγηματικής έκθεσης πεδίων απαντήσεων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:81
+msgid "Snippets of PG code illustrating specific techniques"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1514
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1515
+msgid "Solution:"
+msgstr "Απάντηση:"
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1513
+msgid "Solution: "
+msgstr "Λύση:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:57
+msgid "Solutions"
+msgstr "Απαντήσεις"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:20
+msgid ""
+"Some OPL problems have been rated for difficulty/educational objective. The "
+"levels are loosely inspired by Bloom's taxonomy. They are assigned numbers "
+"from 1 to 6 as follows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:185
+msgid ""
+"Some WeBWorK problems are programmed using what are called <i>Math "
+"Objects</i>. These problems are preferred by some people because they "
+"provide a more consistent collection of messages to faulty student answers, "
+"particularly for answers which are way off base."
+msgstr "Μερικά προβλήματα στο WeBWork είναι προγραμματισμένα να χρησιμοποιούν τα<i>Μαθηματικά Αντικείμενα</i>. Αυτά τα προβλήματα προτιμούνται απο μερικούς επειδή παρέχουν μια πιο σταθερή συλλογή μηνυμάτων για ατελείς απαντήσεις των σπουδαστών, συγκεκριμένα για απαντήσεις που είναι αβάσημες."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:379
+msgid "Some answers will be graded later."
+msgstr "Κάποιες απαντήσεις θα βαθμολογηθούν αργότερα."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:60
+msgid ""
+"Some of these files are directories. Only delete directories if you really "
+"know what you are doing. You can seriously damage your course if you delete "
+"the wrong thing."
+msgstr "Μερικά από αυτά τα αρχεία είναι κατάλογοι. Διαγράψτε τα μόνο αν γνωρίζετε πραγματικά τι κάνετε. Μπορεί να προκαλέσετε σοβαρή ζημία με τη διαγραφή του λάθους αρχείου."
+
+#: /opt/webwork/webwork2/conf/defaults.config:1983
+msgid ""
+"Some problems have an explanation essay answer field, typically following a "
+"simpler answer field. For example, find a certain derivative using the "
+"definition. An answer blank would be present for the derivative to be "
+"automatically checked, and then there would be a separate essay answer field"
+" to show the steps of actually using the definition of the derivative, to be"
+" scored manually. With this setting, the essay explanation fields are "
+"supperessed. Instructors may use the exercise without incurring the manual "
+"grading."
+msgstr "Κάποια προβλήματα έχουν πεδίο απάντησης με κείμενο, το οποίο κατά κανόνα ακολουθεί κάποιο απλούστερο πεδίο απάντησης. Για παράδειγμα, το πρόβλημα ζητάει να <<Βρείτε μία συγκεκριμένη παράγωγο χρησιμοποιώντας τον ορισμό>>.  Υπάρχει ένα πεδίο  απάντησης που θα συμπληρωθεί με την παράγωγο και θα διορθωθεί αυτόματα. Έπειτα υπάρχει ένα ξεχωριστό πεδίο απάντησης με κείμενο για να εξηγήσει ο σπουδαστής τα βήματα της εύρεσης της παράγωγου. Η δεύτερη απάντηση θα βαθμολογηθεί από τον καθηγητή. Με αυτήν τη ρύθμιση, τα πεδία απάντησης με κείμενο παραλείπονται.. Οι καθηγητές μπορούν να χρησιμοποιούν την άσκηση, χωρίς να βαθμολογήσουν τις απαντήσεις με κείμενο. "
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:83
+msgid ""
+"Some problems shown above represent multiple similar problems from the "
+"database.  If the (top) information line for a problem has a letter M for "
+"\"More\", hover your mouse over the M  to see how many similar problems are "
+"hidden, or click on the M to see the problems.  If you click to view these "
+"problems, the M becomes an L, which can be clicked on to hide the problems "
+"again."
+msgstr "Μερικά από τα παραπάνω προβλήματα αντιπροσωπεύουν πολλαπλά προβλήματα από τη βάση δεδομένων. Εάν η (άνω) γραμμή πληροφοριών φέρει το γράμμα \"Μ\", πηγαίνετε το ποντίκι σας από πάνω για να δείτε πόσα παρόμοια προβλήματα κρύβονται ή πατήστε το Μ για να δείτε τα προβλήματα. Εάν επιλέξετε να τα δείτε, το Μ θα μετατραπεί σε L, το οποίο χρησιμεύει στην απόκρυψη των προβλημάτων."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:50
+msgid "Sort"
+msgstr "Ταξινόμηση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:4
+msgid "Sort by"
+msgstr "Ταξινόμηση κατά"
+
+#. ($names{$primary}, $names{$secondary})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:324
+msgid "Sort by %1 and then by %2"
+msgstr "Ταξινόμηση κατά %1 και %2"
+
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:3
+msgid "Sort:"
+msgstr "Ταξινόμηση:"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:51
+msgid "Sorts the lists displayed by due date, name, etc."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:363
+msgid "Source File"
+msgstr "Πηγαίο αρχείο"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1555
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1593
+msgid ""
+"Source file paths cannot include .. or start with /: your source file path "
+"was modified."
+msgstr "Τα μονοπάτια πηγαίων αρχείων δεν δέχονται τις .. ή να ξεκινούν με /: το μονοπάτι άλλαξε."
+
+#. ($ce->{maxCourseIdLength})
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:11
+msgid ""
+"Specify an ID, title, and institution for the new course. The course ID may "
+"contain only letters, numbers, hyphens, and underscores, and may have at "
+"most %1 characters."
+msgstr "Ορίστε έναν κωδικό, τίτλο και ίδρυμα για το νέο μάθημα. Ο κωδικός Μαθήματος μπορεί να περιλαμβάνει μόνο γράμματα, αριθμούς, άνω και κάτω παύλες και μπορεί να έχει το πολύ %1 χαρακτήρες,"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:94
+msgid ""
+"Spell check the text of the file that your are editing. Note that there will"
+" be many spelling errors in the code parts of your file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:116
+msgid "Standard Deviation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:162
+msgid "Start"
+msgstr "Εκκίνηση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:47
+msgid "Start LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:130
+msgid "Start New Test"
+msgstr "Ξεκινήστε Νέο Τεστ."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:84
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:54
+msgid "Statistics"
+msgstr "Στατιστικά"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:17
+msgid "Statistics Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:86
+msgid "Statistics for %1"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:90
+msgid "Statistics for %1 problem %2"
+msgstr ""
+
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:84
+msgid "Statistics for student %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:442
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:151
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:160
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:36
+msgid "Status"
+msgstr "Κατάσταση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:29
+msgid "Stop Acting"
+msgstr "Παύση Δράσης"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:85
+msgid "Stop Archiving"
+msgstr "Παύση Αρχειοθέτησης"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1153
+msgid "Stop archiving courses"
+msgstr "Παύση των αρχειοθετήσεων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:30
+msgid "Student ID"
+msgstr "Κωδικός Σπουδαστή"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:9
+msgid "Student ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:37
+msgid "Student Name"
+msgstr "Όνομα σπουδαστή"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:428
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:56
+msgid "Student Progress"
+msgstr "Πρόοδος Σπουδαστή"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:17
+msgid "Student Progress Help"
+msgstr ""
+
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:72
+msgid "Student Progress for %1"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:76
+msgid "Student Progress for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:80
+msgid "Student answers"
+msgstr "Απαντήσεις σπουδαστή"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:80
+msgid ""
+"Student scores for the sets selected below will be calculated. This and "
+"other scoring operations can also be done using the \"Scoring Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:87
+msgid "Student:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:124
+msgid "Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:50
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:8
+msgid "Subject:"
+msgstr "Θέμα:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:30
+msgid "Submission time:"
+msgstr "Χρόνος υποβολής:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:41
+msgid "Submit"
+msgstr "Υποβολή"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:26
+msgid "Submit Answers"
+msgstr "Υποβολή Απάντησης"
+
+#. ($effectiveUser)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:23
+msgid "Submit Answers for %1"
+msgstr "Υποβολή Απάντησης για %1"
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:525
+msgid "Submit your answers again to go on to the next part."
+msgstr "Υποβάλετε τις απαντήσεις σας ξανά για να συνεχίσετε."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:183
+msgid "Success Index"
+msgstr "Index Επιτυχίας"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:106
+msgid ""
+"Success index is the square of the average score divided by the average "
+"number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:73
+msgid ""
+"Success index is the square of the score divided by the number of attempts."
+msgstr ""
+
+#. ($archive_courseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1086
+msgid "Successfully archived the course %1."
+msgstr "Το μάθημα αρχειοθετήθηκε επιτυχώς %1."
+
+#. ($newAchievementID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:422
+msgid "Successfully created new achievement %1"
+msgstr "Επιτυχής δημιουργία νέου επιτεύγματος %1"
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:581
+msgid "Successfully created new set %1"
+msgstr "Επιτυχής δημιουργία νέου συνόλου ασκήσεων %1"
+
+#. ($add_courseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:465
+msgid "Successfully created the course %1"
+msgstr "Επιτυχής δημιουργία του μαθήματος %1"
+
+#. ($delete_courseID)
+#. ($archive_courseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1131
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:900
+msgid "Successfully deleted the course %1."
+msgstr "Επιτυχής διαγραφή του μαθήματος %1."
+
+#. ($rename_oldCourseID,							$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:772
+msgid "Successfully renamed the course %1 to %2"
+msgstr "Επιτυχής μετονομασία μαθήματος %1 σε %2"
+
+#. ($unarchive_courseID, $new_courseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1286
+msgid "Successfully unarchived %1 to the course %2"
+msgstr "Επιτυχής μη αρχειοθέτηση %1 στο μάθημα %2"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:89
+msgid "TA:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2274
+msgid "Table defined in database but missing in schema"
+msgstr "Ο πίνακας ορίζεται στη βάση δεδομένων αλλά όχι στο σχήμα"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2269
+msgid "Table defined in schema but missing in database"
+msgstr "Ο πίνακας ορίζεται στο σχήμα αλλά όχι στη βάση δεδομένων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2265
+msgid "Table is ok"
+msgstr "Πίνακας Οκ"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:106
+msgid "Take Action!"
+msgstr "Πάμε!"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
+msgid "Target Set:"
+msgstr "Σύνολο Ασκήσεων:"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:42
+msgid "TeX Source"
+msgstr "Προέλευση TeX"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:258
+msgid "Test %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:54
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:52
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:55
+msgid "Test Name"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:156
+msgid "Test Time"
+msgstr "Χρόνος τεστ"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:224
+msgid "Test Time Limit (min; 0=Close Date)"
+msgstr "Χρονικό Όριο (λεπτά, 0=Ημ/νία Λήξης)"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:238
+msgid "Test Time Notification"
+msgstr "Ειδοποίηση Χρόνου Δοκιμασίας."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:156
+msgid "Test Versions"
+msgstr "Εκδοχές  τεστ."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:244
+msgid "Test not yet submitted."
+msgstr "Το τεστ δεν έχει ακόμη υποβληθεί."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:920
+msgid "Test parameters"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:149
+msgid "Test/quiz with time limit."
+msgstr "Τεστ/κουίζ με χρονικό όριο. "
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:79
+msgid "Text"
+msgstr "Κείμενο"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:80
+msgid "Text Editor Options"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:55
+msgid "Text chapter:"
+msgstr "Ενότητα κειμένου:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:66
+msgid "Text section:"
+msgstr "Τμήμα κειμένου:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:44
+msgid "Textbook:"
+msgstr "Βιβλίο:"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:58
+msgid ""
+"The \"Edit Target Set\" button at the top of the page will take you to the "
+"Problem Set Editor which will allow you to edit dates, assign users and "
+"other information about the problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:115
+msgid ""
+"The \"Score\" tab will export achievement data to a CSV file that can be "
+"downloaded.  The export contains the global data including number of "
+"achievement points and current level of each student.  In addition for each "
+"selected achievement, a column for if the achievement was earned (1) or not "
+"earned (0) will be added to the CSV."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:194
+msgid ""
+"The <strong>Assigned sets</strong> column (x/y) indicates that x sets out of"
+" y sets avaiable have been assigned to this student. Click this link to "
+"assign or unassign sets to this student, to adjust due dates, or to adjust "
+"the grades on a homework set for a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:20
+msgid ""
+"The <strong>Set Detail</strong> page can be viewed in one of two distinct "
+"modes:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:189
+msgid ""
+"The <strong>login name</strong> column links allow you to \"act as\" a "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:191
+msgid ""
+"The <strong>pencil</strong> in the login column allows you to edit that "
+"student's data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:64
+msgid ""
+"The Attempts figure is the global average of the number of attempts (both "
+"correct and incorrect) individuals take on this problem.  A high figure may "
+"represent a difficult problem.  Note that problems with multiple parts may "
+"have higher average attempts since many students  will submit an answer to "
+"each part before continuing and each such  submittal counts as an attempt."
+msgstr "Το νούμερο που αντιστοιχεί στις \"Προσπάθειες\" είναι ο παγκόσμιος μέσος όρος του αριθμού των προσπαθειών (σωστών και λανθασμένων) που επιχειρούν τα άτομα στο συγκεκριμένο πρόβλημα. Ένα υψηλό νούμερο μπορεί να αντιστοιχεί σε ένα δύσκολο πρόβλημα. Σημειώστε ότι τα προβλήματα με πολλαπλά σκέλη μπορεί να φέρουν μεγαλύτερο αριθμό προσπαθειών καθώς πολλοί σπουδαστές θα υποβάλλουν μία απάντηση για κάθε σκέλος προτού συνεχίσουν και κάθε τέτοια υποβολή μετράται ως προσπάθεια."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:124
+msgid ""
+"The Attempts figure is the local average of the number of attempts (both "
+"correct and incorrect) individuals at your institution take on this problem."
+" A high figure may represent a difficult problem.  Note that problems with "
+"multiple parts may have higher average attempts since many students  will "
+"submit an answer to each part before continuing and each such  submittal "
+"counts as an attempt."
+msgstr "Το νούμερο που αντιστοιχεί στις Προαπάθειες είναι ο τοπικός μέσος όρος του αριθμού των προσπαθειών (σωστών και λανθασμένων) που επιχειρούν τα άτομα του ιδρύματός σας στο συγκεκριμένο πρόβλημα. Ένα υψηλό νούμερο μπορεί να αντιστοιχεί σε ένα δύσκολο πρόβλημα. Σημειώστε ότι τα προβλήματα με πολλαπλά σκέλη μπορεί να φέρουν μεγαλύτερο αριθμό προσπαθειών καθώς πολλοί σπουδαστές θα υποβάλλουν μία απάντηση για κάθε σκέλος προτού συνεχίσουν και κάθε τέτοια υποβολή μετράται ως προσπάθεια."
+
+#: /opt/webwork/webwork2/conf/defaults.config:1721
+msgid ""
+"The Maximum number of times Show me Another can be used per problem by a "
+"student. If set to -1 then there is no limit to the number of times that "
+"Show Me Another can be used."
+msgstr "Ο Μέγιστος αριθμός των φορών που το \"Παρόμοιο Πρόβλημα\" μπορεί να χρησιμοποιηθεί από το σπoυδαστή ανά πρόβλημα. Εάν επιλέξετε -1 τότε δεν υπάρχει όριο στον αριθμό των φορών που το \"Παρόμοιο Πρόβλημα\" μπορεί να χρησιμοποιηθεί."
+
+#: /opt/webwork/webwork2/conf/defaults.config:1689
+msgid ""
+"The Reduced Scoring Period is the default period before the due date during "
+"which all additional work done by the student counts at a reduced rate. When"
+" enabling reduced scoring for a set the reduced scoring date will be set to "
+"the due date minus this number. The reduced scoring date can then be "
+"changed. If the Reduced Scoring is enabled and if it is after the reduced "
+"scoring date, but before the due date, a message like \"This assignment has "
+"a Reduced Scoring Period that begins 11/08/2009 at 06:17pm EST and ends on "
+"the due date, 11/10/2009 at 06:17pm EST. During this period all additional "
+"work done counts 50% of the original.\" will be displayed."
+msgstr "Η Περίοδος Μειωμένης Βαθμολογίας είναι μία περίοδος πριν από την ημ/νία παράδοσης κατά την οποία οποιαδήποτε πρόσθετη δουλειά μετράει λιγότερο. Όταν ενεργοποιείται, η περίοδος αυτή θα ισούται με την ημ/νία παράδοσης πλην του αριθμού αυτού. Η περίοδος αυτή μπορεί να αλλάξει. Εάν είναι ενεργοποιημένη και εάν έχει επέλθει η ημ/νία μειωμένης βαθμολογίας, αλλά δεν έχει φτάσει η ημ/νία παράδοσης, τότε ένα μήνυμα του τύπου \"Η εργασία έχει Περίοδο Μειωμένης Βαθμολογίας που ξεκινάει στις 11/08/2009 18:17 EST και τελειώνει στην ημ/νία παράδοσης στις 11/10/2009 18:17 EST. Κατά την περίοδο αυτή οποιαδήποτε πρόσθετη δουλειά μετράει για 50%\" θα εμφανίζεται."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:78
+msgid ""
+"The Status figure is the global average of the Status individuals have "
+"earned on this problem. The Status is the percentage correct (from 0% to "
+"100%) recorded for the problem.  A low figure may  represent a difficult "
+"problem.  The Status is often fairly high since  many students will work on "
+"a problem until they get it correct or nearly so."
+msgstr "Το νούμερο που αντιστοιχεί στο Ποσοστό είναι ο παγκόσμιος μέσος όρος του Ποσοστού που έχουν εξασφαλίσει τα άτομα στο συγκεκριμένο πρόβλημα. Tο Ποσοστό είναι το ποσοστό σωστού (από 0% εως 100%) που έχει καταγραφεί για το πρόβλημα. Ένα χαμηλό νούμερο μπορεί να αντιστοιχεί σε ένα δύσκολο πρόβλημα. Το Ποσοστό είναι συχνά αρκετά υψηλό καθώς πολλοί σπουδαστές δουλεύουν πάνω σε ένα πρόβλημα μέχρι να το λύσουν ή να πλησιάσουν στη λύση."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:138
+msgid ""
+"The Status figure is the local average of the Status individuals at your "
+"institution have earned on this problem. The Status is the percentage "
+"correct (from 0% to 100%) recorded for the problem.  A low figure may  "
+"represent a difficult problem.  The Status is often fairly high since  many "
+"students will work on a problem until they get it correct or nearly so."
+msgstr "Το νούμερο που αντιστοιχεί στο Ποσοστό είναι ο τοπικός μέσος όρος του Ποσοστού που έχουν εξασφαλίσει τα άτομα του ιδρύματός σας στο συγκεκριμένο πρόβλημα. Tο Ποσοστό είναι το ποσοστό σωστού (από 0% εως 100%) που έχει καταγραφεί για το πρόβλημα. Ένα χαμηλό νούμερο μπορεί να αντιστοιχεί σε ένα δύσκολο πρόβλημα. Το Ποσοστό είναι συχνά αρκετά υψηλό καθώς πολλοί σπουδαστές δουλεύουν πάνω σε ένα πρόβλημα μέχρι να το λύσουν ή να πλησιάσουν στη λύση."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:11
+msgid "The WeBWorK Project"
+msgstr "Σχετικά με το WeBWorK."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:25
+msgid ""
+"The WeBWorK administrators need to be added to the course in order for them "
+"to access the course.  Unchecking this option will make it so WeBWorK "
+"administrators cannot directly login to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:129
+msgid ""
+"The achievement evaluator is the perl code that is run after each submit to "
+"determine if an achievement is earned or not.  Click on the \"Edit "
+"Evaluator\" link to edit the evaluator."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:26
+msgid ""
+"The adjusted status of a problem is the larger of the problem's status "
+"andthe weighted average of the status of those problems which count towards "
+"the parent grade."
+msgstr "Το διορθωμένο ποσοστό ενός προβλήματος είναι το μέγιστο ποσοστό του προβλήματος και ο σταθμισμένος μέσος όρος του ποσοστού εκείνων των προβλημάτων που προσμετρώνται στον κύριο βαθμό."
+
+#: /opt/webwork/webwork2/conf/defaults.config:1579
+msgid ""
+"The amount of time (in minutes) after the due date that the Answers are "
+"available to student to view.  You can change this for individual homework, "
+"but WeBWorK will use this value when a set is created."
+msgstr "Το χρονικό διάστημα (σε λεπτά) μετά τη λήξη της προθεσμίας για το οποίο οι Απαντήσεις είναι διαθέσιμες για το σπουδαστή. Αυτό μπορεί να αλλαχθεί για προσωπική εξάσκηση αλλά το WeBWork θα συνεχίσει να χρησιμοποιεί αυτή την τιμή όταν δημιουργηθεί ένα σύνολο ασκήσεων."
+
+#: /opt/webwork/webwork2/conf/defaults.config:1569
+msgid ""
+"The amount of time (in minutes) before the due date when the assignment is "
+"opened.  You can change this for individual homework, but WeBWorK will use "
+"this value when a set is created."
+msgstr "Το χρονικό διάστημα (σε λεπτά) πριν τη λήξη της προθεσμίας κατά το οποίο η εργασία είναι ανοιχτή. Αυτό μπορεί να αλλαχθεί για προσωπική εξάσκηση αλλά το WeBWork θα συνεχίσει να χρησιμοποιεί αυτή την τιμή όταν δημιουργηθεί ένα σύνολο ασκήσεων."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:386
+msgid "The answer above is NOT correct."
+msgstr "Η παραπάνω απάντηση είναι ΛΑΘΟΣ."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:375
+msgid "The answer above is correct."
+msgstr "Η παραπάνω απάντηση είναι σωστή."
+
+#. ($filename, $ce->{mail}{maxAttachmentSize})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:230
+msgid ""
+"The attached file \"%1\" exceeds the allowed attachment size of "
+"%quant(%2,megabyte)."
+msgstr "Ο επισυναφθείς φάκελος υπερβαίνει το επιτρεπόμενο μέγεθος επισύναψης κατά %quant(%2,megabyte)."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:496
+msgid ""
+"The child problems for this problem will become visible to the student when "
+"they either have more incorrect attempts than is specified here, or when "
+"they run out of attempts, whichever comes first.  If \"max\" is specified "
+"here then child problems will only be available after a student runs out of "
+"attempts."
+msgstr "Τα υποπροβλήματα αυτού του κυρίου προβλήματος θα γίνουν ορατά στο σπουδαστή είτε όταν έχει περισσότερες λανθασμένες προσπάθειες από όσες ορίζονται εδώ είτε όταν έχει εξαντλήσει όλες τις προσπάθειες, όποιο από τα δύο συμβεί πρώτο.  Αν  ορίζεται εδώ “max” τότε τα υποπροβλήματα θα είναι διαθέσιμα όταν ο σπουδαστής εξαντλήσει όλες τις προσπάθειες."
+
+#. ('href="http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files"
+#. target="Webworkdocs"',
+#. '<code>demoCourse.lst</code>','<code>.csv</code>','<code>.lst</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:59
+msgid ""
+"The classlist files are stored in the templates directory and provide a "
+"convenient way to enter a large number of students into your class. To view "
+"the format for <strong>ClassList files</strong> see the <a %1>ClassList "
+"specification</a> or download the %2 file and use it as a model. ClassList "
+"files can be prepared using a spreadsheet and then saved as %3 (comma "
+"separated values) text files.  However, to access as a classlist file, the "
+"file suffix needs to be changed to %4, which can be done with the \"Rename\""
+" button."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:16
+msgid ""
+"The configuration module did not find the data it needs to function.  Have "
+"your site administrator check that site configuration files are up to date."
+msgstr ""
+
+#. ($archive_courseID,					$archive_path)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:80
+msgid ""
+"The course \"%1\" has already been archived at \"%2\". This earlier archive "
+"will be erased.  This cannot be undone."
+msgstr ""
+
+#. (tag('strong', stash('courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:8
+msgid ""
+"The course %1 uses an external authentication system (%2). Please go there "
+"to log in again."
+msgstr "Το μάθημα %1 χρησιμοποιεί ένα εξωτερικό σύστημα ταυτοποίησης (&2). Παρακαλώ πηγαίνετε εκεί για να συνδεθείτε εκ νέου."
+
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:17
+msgid ""
+"The course %1 uses an external authentication system (%2). Please return to "
+"that system to access this course."
+msgstr "Το μάθημα %1 χρησιμοποιεί ένα εξωτερικό σύστημα ταυτοποίησης (&2). Παρακαλώ επιστρέψτε σε εκείνο το σύστημα για να αποκτήσετε πρόσβαση στο μάθημα."
+
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:23
+msgid ""
+"The course %1 uses an external authentication system (%2). You've "
+"authenticated through that system, but aren't allowed to log in to this "
+"course."
+msgstr "Το μάθημα %1 χρησιμοποιεί ένα εξωτερικό σύστημα ταυτοποίησης (&2). Έχετε ταυτοποιηθεί από το σύστημα, αλλά δεν μπορείτε να συνδεθείτε στο μάθημα."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:30
+msgid "The course database must be upgraded before archiving this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:30
+msgid "The course database must be upgraded before renaming this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:26
+msgid ""
+"The current mode should be made clear by the information at the top of the "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:46
+msgid ""
+"The current value of the achievement counter. Changes to this variable will "
+"be saved."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1897
+msgid "The default display mode"
+msgstr "Η προεπιλεγμένη λειτουργία οθόνης"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1757
+msgid ""
+"The default number of attempts before the problem is re-randomized. ( 0 => "
+"never )"
+msgstr "Ο προεπιλεγμένος αριθμός προσπαθειών πριν το πρόβλημα επανατυχαιοποιηθεί. (0 => ποτέ)"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1756
+msgid ""
+"The default number of attempts between re-randomization of the problems ( 0 "
+"=> never)"
+msgstr "Ο προεπιλεγμένος αριθμός προσπαθειών μεταξύ της τυχαιοποίησης των προβλημάτων ( 0 => ποτέ)"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:73
+msgid ""
+"The description shown to students which states what action is needed to earn"
+" the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:5
+msgid "The directory you specified doesn't exist"
+msgstr "Ο κατάλογος που καθορίσατε δεν υπάρχει"
+
+#: /opt/webwork/webwork2/conf/defaults.config:2032
+msgid ""
+"The e-mail verbosity level controls how much information is automatically "
+"added to feedback e-mails.  Levels are<ol><li> Simple: send only the "
+"feedback comment and context link</li><li> Standard: as in Simple, plus "
+"user, set, problem, and PG data</li><li> Debug: as in Standard, plus the "
+"problem environment (debugging data)</li></ol>"
+msgstr ""
+
+#. ($achievementName,				$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:293
+msgid "The evaluator for %1 has been renamed to \"%2\"."
+msgstr ""
+
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:246
+msgid "The file \"%1\" cannot be found."
+msgstr ""
+
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:526
+msgid "The file \"%1\" cannot be read!"
+msgstr ""
+
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:522
+msgid "The file \"%1\" is a directory!"
+msgstr ""
+
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:259
+msgid "The file \"%1\" is a template. You may use \"Save As\" to create a new file."
+msgstr ""
+
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:250
+msgid "The file \"%1\" is protected. You may use \"Save As\" to create a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:19
+msgid "The file $file does not appear to be a text or image file."
+msgstr ""
+
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:277
+msgid ""
+"The file %1 already exists and cannot be overwritten. The message was not "
+"saved."
+msgstr ""
+
+#. ("$emailDirectory/$openfilename",				$emailDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:156
+msgid ""
+"The file %1 cannot be found. Check whether it exists and whether the "
+"directory %2 can be read by the webserver. "
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
+msgid ""
+"The file %1 is not contained in the course templates directory and can not "
+"be modified."
+msgstr ""
+
+#. ("$emailDirectory/$openfilename")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:148
+msgid ""
+"The file %1 is not readable by the webserver. Check that it's permissions "
+"are set correctly."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:203
+msgid "The file does not appear to be a text file"
+msgstr "Το αρχείο δεν φαίνεται να είναι αρχείο κειμένου"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:88
+msgid "The file you are trying to download doesn't exist"
+msgstr "Το αρχείο που προσπαθείτε να κατεβάσετε δεν υπάρχει"
+
+#. ($filename)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:221
+msgid "The filetype of the attached file \"%1\" is not allowed."
+msgstr "Ο τύπος αρχείου του συνημμένου αρχείου \"%1\" δεν επιτρέπεται."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2149
+msgid "The following courses were successfully hidden:"
+msgstr "Τα ακόλουθα μαθήματα αποκρύφθηκαν επιτυχώς:"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2218
+msgid "The following courses were successfully unhidden:"
+msgstr "Τα ακόλουθα μαθήματα εμφανίστηκαν επιτυχώς:"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:34
+msgid "The following describes how the checkboxes alter the scoring output"
+msgstr ""
+
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:66
+msgid ""
+"The following users are NOT assigned to this set and will be ignored: %1"
+msgstr "Οι ακόλουθοι χρήστες ΔΕΝ έχουν εκχωρηθεί σε αυτό το σύνολο ασκήσεων και θα αγνοηθούν: %1"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:288
+msgid "The given file path is not a valid location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:49
+msgid "The goal value of the achievement counter."
+msgstr ""
+
+#. (join('.', @{ $problemSeqs[ $children_counts_indexs[0] ] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1334
+msgid ""
+"The grade for this problem is the larger of the score for this problem, or "
+"the score of problem %1."
+msgstr "Ο βαθμός για αυτό το πρόβλημα είναι το μεγαλύτερο σκορ για αυτό το πρόβλημα ή το σκορ του προβλήματος %1."
+
+#. (join(', ', map({ join('.', @{ $problemSeqs[$_] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
+msgid ""
+"The grade for this problem is the larger of the score for this problem, or "
+"the weighted average of the problems: %1."
+msgstr "Ο βαθμός για αυτό το πρόβλημα είναι το μεγαλύτερο σκορ για αυτό το πρόβλημα ή ο σταθμισμένος μέσος όρος των προβλημάτων: %1."
+
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1078
+msgid "The hardcopy header for set %1 has been renamed to \"%2\"."
+msgstr ""
+
+#. ($showHintsAfter)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:36
+msgid ""
+"The hint shown is an instructor preview and will be shown to students after "
+"%quant(%1,attempt)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:32
+msgid ""
+"The hint shown is an instructor preview and will not be shown to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:22
+msgid ""
+"The information box on the right displays information about the course. This"
+" is useful for leaving course wide messages for students. It contains text "
+"from the file templates/course_info.txt. Instructors can edit this file from"
+" the web (click on the \"Edit\" link)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:30
+msgid ""
+"The initial value is the answer sub score for the answer that is currently "
+"shown.  If this is modified, it will be used to compute the total problem "
+"score below.  This score is not saved, and will reset to the score for the "
+"shown answer if the page is reloaded."
+msgstr "Η αρχική τιμή είναι η απάντηση της δευτερεύουσας βαθμολογίας για την απάντηση που προβάλλεται αυτή τη στιγμή. Αν αυτό αλλάξει, θα χρησιμοποιηθεί για να υπολογίσει το συνολικό σκορ του προβλήματος παρακάτω. Αυτό το σκορ δεν έχει αποθηκευτεί και θα επαναφερθεί στο σκορ που εμφανίζεται, αν η σελίδα ξαναφορτώσει."
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:97
+msgid ""
+"The initial value is the currently saved score as a point value computed "
+"using the percent score.  This point value is used to compute the percent "
+"score (rounded to a whole percent) that can be saved."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:145
+msgid "The initial value is the currently saved score for this student."
+msgstr "Η αρχική τιμή είναι το τρέχον αποθηκευμένο σκορ για αυτόν τον μαθητή."
+
+#. ($rename_oldCourseID, $rename_oldCourseInstitution,
+#. $rename_newCourseInstitution)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
+msgid ""
+"The institution associated with the course %1 has been changed from %2 to %3"
+msgstr "Το ίδρυμα που σχετίζεται με το μάθημα %1 έχει αλλάξει από %2 σε %3"
+
+#. ($rename_newCourseID, $optional_arguments{courseInstitution})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:729
+msgid "The institution associated with the course %1 is now %2"
+msgstr "Το ίδρυμα που σχετίζεται με το μάθημα %1 είναι τώρα %2"
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:599
+msgid ""
+"The instructor account with user id %1 does not exist.  Instructor accounts "
+"must be created manually."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:635
+msgid ""
+"The instructor account with user id %1 does not exist.  Please create the "
+"account manually via WeBWorK."
+msgstr "Ο λογαριασμός καθηγητή με αναγνωριστικό χρήστη %1 δεν υπάρχει. Παρακαλώ δημιουργήστε τον λογαριασμό χειροκίνητα μέσω WeBWorK."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:87
+msgid ""
+"The key maps that are available are \"default\", \"emacs\", \"sublime\", and"
+" \"vim\". The \"default\" key map has the standard behavior of a browser "
+"text area. You can use Ctrl-C to copy, Ctrl-V to paste, Ctrl-F to search, "
+"etc. If you are more comfortable with the \"emacs\", \"sublime\", or \"vim\""
+" text editors then you may choose to use one of those key maps instead."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:75
+msgid "The large text window"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:27
+msgid ""
+"The list of files include regular files, directories (ending in a \"/\") and"
+" links (ending in a \"@\")."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:52
+msgid ""
+"The login name cannot be changed. (It is the primary key for the student's "
+"data.) If you make a mistake in the login name at the beginning of the "
+"course (before any work has been done) then it is best to simply add a new "
+"student with the correct entry and drop the student with the bad login name."
+" (See drop and delete students below.) If the login name must be changed "
+"after a user has started working assignments, then contact your system "
+"administrator, who can use the webwork2 \"bin/change_user_id\" script to "
+"change the user id."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:20
+msgid ""
+"The main page allows access to set and student statistics.  When selecting a"
+" student, their grades page is shown, which lists set totals and per problem"
+" grades for each set assigned to the student.  When selecting a set, various"
+" statistics and histograms are shown for the overall grades of students who "
+"are currently enrolled or auditing the course."
+msgstr ""
+
+#. ('href="http://webwork.maa.org/wiki" target="ww_wiki"',
+#. 'href="http://webwork.maa.org/wiki/Instructors" target="ww_wiki"')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:24
+msgid ""
+"The main page for WeBWorK documentation is the <a %1>webwork wiki</a> while "
+"specific help for instructors setting up a course are in the <a "
+"%2>instructors' section</a>."
+msgstr ""
+
+#. ($c->param('new_set_name')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:569
+msgid ""
+"The name \"%1\" is not a valid set name.  Use only letters, digits, dashes, "
+"underscores, periods, and spaces."
+msgstr "Το όνομα \"%1\" δεν είναι έγκυρο όνομα συνόλου. Χρησιμοποιήστε μόνο γράμματα, ψηφία, παύλες, κάτω παύλες, τελείες και κενά."
+
+#: /opt/webwork/webwork2/conf/defaults.config:1432
+msgid ""
+"The name of course information file (located in the templates directory). "
+"Its contents are displayed in the right panel next to the list of homework "
+"sets."
+msgstr "Το όνομα του αρχείου πληροφοριών μαθημάτων (βρίσκεται στον κατάλογο προτύπων). Τα περιεχόμενά του εμφανίζονται στο δεξί πάνελ δίπλα στη λίστα το σύνολο των ασκήσεων."
+
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:26
+msgid "The name of the LMS"
+msgstr "Το όνομα του LMS"
+
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:28
+msgid ""
+"The name of the LMS. This is used in messages to users that direct them to "
+"go back to the LMS to access something in the WeBWorK course."
+msgstr "Το όνομα του LMS. Αυτό χρησιμοποιείται σε μηνύματα προς τους χρήστες που τους κατευθύνουν να επιστρέψουν στο LMS για πρόσβαση σε κάτι στο μάθημα WeBWorK."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:63
+msgid "The number of points earned for earning the achievement."
+msgstr ""
+
+#. ($openDate, $dueDate, $answerDate)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1104
+msgid ""
+"The open date: %1, close date: %2, and answer date: %3 must be defined and "
+"in chronological order."
+msgstr "Η ημερομηνία έναρξης: %1, ημερομηνία λήξης: %2, και ημερομηνία απάντησης: %3 πρέπει να οριστεί και με χρονολογική σειρά."
+
+#. ($path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:393
+msgid "The original path is not in a valid location. Using failsafe %1"
+msgstr ""
+
+#. ($forcedSourceFile)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:510
+msgid "The original path to the file is %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:262
+msgid "The password and password confirmation for the instructor must match."
+msgstr "Ο καθηγητής πρέπει να ταιριάζει τον κωδικό πρόσβασης και την επιβεβαίωση του κωδικού πρόσβασης."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:27
+msgid ""
+"The password can be any combination of letters, numbers and special symbols."
+" Students are encouraged to use all three, and stay away from dictionary "
+"words. The password should not be the same as any password used elsewhere, "
+"such as for an email account. The password will only be present on the page "
+"if the user has permission to change the password."
+msgstr ""
+
+#. ($c->tag(                                               'b',
+#. $c->maketext(                                                   "[_1]'s
+#. Current Password",
+#. $c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:95
+msgid ""
+"The password you entered in the %1 field does not match your current "
+"password. Please retype your current password and try again."
+msgstr "Ο κωδικός που εισάγατε στο πεδίο %1 δεν ταιριάζει με τον τρέχοντα κωδικό πρόσβασης σας. Παρακαλώ πληκτρολογήστε ξανά τον τρέχοντα κωδικό πρόσβασης και προσπαθήστε ξανά."
+
+#. ($c->tag('b', $c->maketext("[_1]'s New Password",         $e_user_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:82
+msgid ""
+"The passwords you entered in the %1 and %2 fields don't match. Please retype"
+" your new password and try again."
+msgstr "Οι κωδικοί πρόσβασης που εισάγατε στα πεδία %1 και %2 δεν ταιριάζουν. Παρακαλώ πληκτρολογήστε ξανά τον νέο κωδικό σας και προσπαθήστε ξανά."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:374
+msgid "The path can not be the temporary edit directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:370
+msgid "The path to the original file should be absolute."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:131
+msgid ""
+"The percentage of students receiving at least these scores. The median score"
+" is in the 50% column."
+msgstr "Το ποσοστό των σπουδαστών που λαμβάνουν τουλάχιστον αυτά τα σκορ. Το διάμεσο σκορ είναι στη στήλη 50%."
+
+#. ($setName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:458
+msgid "The prerequisite conditions have not been met for set '%1'."
+msgstr "Οι προαπαιτούμενες προϋποθέσεις δεν πληρούνται για το σύνολο %1'."
+
+#. (q(down menu to change which student's seed and answers are shown.  Use the
+#. "Mark Correct" checkbox to set)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:26
+msgid ""
+"The problem is shown at the top with the seed and answers of the selected "
+"student.  Use the drop "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:62
+msgid "The problem set is not yet open"
+msgstr "Το σύνολο προβλημάτων δεν είναι ακόμα ανοιχτό"
+
+#. ($origReducedScoringDate)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1121
+msgid ""
+"The reduced credit date %1 in the file probably was generated from the Unix "
+"epoch 0 value and is being treated as if it was Unix epoch 0."
+msgstr "Η μειωμένη ημερομηνία πίστωσης %1 στο αρχείο πιθανότατα δημιουργήθηκε από την τιμή Unix epoch 0 και αντιμετωπίζεται ως Unix epoch 0."
+
+#. ($openDate, $dueDate)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1135
+msgid ""
+"The reduced credit date should be between the open date %1 and close date %2"
+msgstr "Η μειωμένη ημερομηνία πίστωσης πρέπει να είναι μεταξύ της ανοιχτής ημερομηνίας %1 και της ημερομηνίας κλεισίματος %2"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1220
+msgid ""
+"The reduced scoring date should be between the open date and close date."
+msgstr "Η μειωμένη ημερομηνία βαθμολόγησης πρέπει να είναι μεταξύ της ημερομηνίας έναρξης και της ημερομηνίας κλεισίματος."
+
+#. ($tempFile)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:298
+msgid "The requested file \"%1\" does not exist on the server."
+msgstr "Το ζητούμενο αρχείο \"%1\" δεν υπάρχει στον διακομιστή."
+
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1389
+msgid "The score for this problem can count towards score of problem %1."
+msgstr "Η βαθμολογία για αυτό το πρόβλημα μπορεί να μετρήσει για βαθμολογία του προβλήματος %1."
+
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:69
+msgid ""
+"The scoring files are stored in the scoring directory and are produced using"
+" the \"Scoring Tools\" page or the scoring command in the \"Instructor "
+"Tools\" module. These files can be downloaded, modified in a spreadsheet "
+"(for example, to add midterm scores) and then uploaded again to the scoring "
+"directory to be merged with email messages. (Use a new file name, other than"
+" %1, when uploading to prevent the scoring module from overwriting an "
+"uploaded file.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:52
+msgid ""
+"The second row of the problem collection area is for browsing directories. "
+"The OPL will be there as well as any other directories that you may set up "
+"(for example Contrib). If this is selected, all subdirectories containing "
+"problems will be listed."
+msgstr ""
+
+#. (stash('setID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet.html.ep:13
+msgid "The selected problem set (%1) is not a valid set for %2."
+msgstr ""
+
+#. ($setID, $effectiveUserID, $c->{invalidVersionCreation} ? " (acted as by
+#. $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:77
+msgid "The selected problem set (%1) is not a valid set for %2: %3"
+msgstr ""
+
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1066
+msgid "The set header for set %1 has been renamed to \"%2\"."
+msgstr ""
+
+#. ($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:491
+msgid ""
+"The set name \"%1\" is already in use. Pick a different name if you would "
+"like to start a new set. No set created."
+msgstr ""
+
+#. ($newSetName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:584
+msgid ""
+"The set name '%1' is already in use.  Pick a different name if you would "
+"like to start a new set."
+msgstr "Το όνομα '%1' είναι ήδη σε χρήση. Επιλέξτε ένα διαφορετικό όνομα αν θέλετε να ξεκινήσετε ένα νέο σετ ασκήσεων."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:58
+msgid ""
+"The sets checked below will be visible to students or hidden from students. "
+"Useful for preparing sets ahead of time, but not showing them to students; "
+"or for temporarily hiding a set which has a mistake in it while it is being "
+"fixed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:54
+msgid ""
+"The sets checked below will become available for editing the due dates and "
+"visibility."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:73
+msgid ""
+"The sets checked below will written to set definition files, to be saved for"
+" future use, or to be transferred to another course. The set definition "
+"files can be uploaded/downloaded using the \"File Manager\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:29
+msgid ""
+"The simple configuration file is the name of the configuration file created "
+"when using the \"Course Configuration\" page to configure course options.  "
+"This option sets if this configuration file is copied from the old course or"
+" not and instead use the server defaults."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:521
+msgid "The solution has been removed."
+msgstr "Η λύση αφαιρέθηκε."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:33
+msgid ""
+"The solution shown is an instructor preview and will only be shown to "
+"students after the due date."
+msgstr ""
+
+#. ($c->{fullSetID},
+#. $c->{prettyProblemNumber},
+#. $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1103
+msgid ""
+"The source file for \"set %1 / problem %2\" has been changed from \"%3\" to "
+"\"%4\"."
+msgstr ""
+
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1209
+msgid ""
+"The temporary file %1 is not contained in the course templates directory and"
+" can not be deleted."
+msgstr ""
+
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:689
+msgid ""
+"The temporary file %1 is not in the course templates directory and can not "
+"be deleted!"
+msgstr ""
+
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:349
+msgid ""
+"The test (which is version %1) may  no longer be submitted for a grade."
+msgstr "Η δοκιμή (η οποία είναι η εκδοχή %1) δεν επιτρέπεται να υποβληθεί πλέον για βαθμολόγηση."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1042
+msgid ""
+"The text box now contains the source of the original problem. You can "
+"recover lost edits by using the Back button on your browser."
+msgstr "Το πλαίσιο κειμένου περιέχει τώρα την πηγή του αρχικού προβλήματος. Μπορείτε να ανακτήσετε τις χαμένες επεξεργασίες χρησιμοποιώντας το κουμπί \"Πίσω\" στο πρόγραμμα περιήγησης."
+
+#. (			% . 'but the result will not be counted.')
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:23
+msgid ""
+"The time limit on this assignment was exceeded. The assignment may be "
+"checked, "
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1559
+msgid ""
+"The time of the day that the assignment is due.  This can be changed on an "
+"individual basis, but WeBWorK will use this value for default when a set is "
+"created."
+msgstr "Η ώρα της ημέρας που οφείλεται στην ανάθεση. Αυτό μπορεί να αλλάξει σε ατομική βάση, αλλά το WeBWorK θα χρησιμοποιήσει αυτήν την τιμή για προεπιλογή όταν δημιουργήσει ένα σετ ασκήσεων."
+
+#. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:689
+msgid "The title of the course %1 has been changed from %2 to %3"
+msgstr "Ο τίτλος του μαθήματος %1 έχει αλλάξει από %2 σε %3"
+
+#. ($rename_newCourseID, $optional_arguments{courseTitle})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:722
+msgid "The title of the course %1 is now %2"
+msgstr "Ο τίτλος του μαθήματος %1 είναι τώρα %2"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:167
+msgid ""
+"The top number is the percent score on the problem.  A period (.) indicates "
+"a problem has not been attempted. The bottom number is the number of "
+"incorrect attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:25
+msgid ""
+"The total grade row at the bottom shows the total score and percent average "
+"over all open assignments.  The total grade row can be shown/hidden under "
+"general course configuration settings."
+msgstr ""
+
+#. ($enableReducedScoring)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1151
+msgid ""
+"The value %1 for enableReducedScoring is not valid; it will be replaced with"
+" 'N'."
+msgstr "Η τιμή %1 για την ενεργοποίησηReducedScoring δεν είναι έγκυρη. Θα αντικατασταθεί με 'N'."
+
+#. ($timeCap)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1209
+msgid ""
+"The value %1 for the capTimeLimit option is not valid; it will be replaced "
+"with '0'."
+msgstr "Η τιμή %1 για την επιλογή capTimeLimit δεν είναι έγκυρη. Θα αντικατασταθεί με '0'."
+
+#. ($hideScore)
+#. ($hideScoreByProblem)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1178
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1189
+msgid ""
+"The value %1 for the hideScore option is not valid; it will be replaced with"
+" 'N'."
+msgstr "Η τιμή %1 για την επιλογή κρυφό σκορ δεν είναι έγκυρη. Θα αντικατασταθεί με 'N'."
+
+#. ($hideWork)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1200
+msgid ""
+"The value %1 for the hideWork option is not valid; it will be replaced with "
+"'N'."
+msgstr "Η τιμή %1 για την επιλογή κρυφής εργασίας δεν είναι έγκυρη. Θα αντικατασταθεί με 'Ν'."
+
+#. ($relaxRestrictIP)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1235
+msgid ""
+"The value %1 for the relaxRestrictIP option is not valid; it will be "
+"replaced with 'No'."
+msgstr "Η τιμή %1 για την επιλογή relaxRestrictIP δεν είναι έγκυρη. Θα αντικατασταθεί με 'Όχι'."
+
+#. ($restrictIP)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1221
+msgid ""
+"The value %1 for the restrictIP option is not valid; it will be replaced "
+"with 'No'."
+msgstr "Η τιμή %1 για την επιλογή restrictIP δεν είναι έγκυρη. Θα αντικατασταθεί με 'Όχι'."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:46
+msgid "The visible name/title of the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:36
+msgid ""
+"The webwork server must be able to write to these directories. Please "
+"correct the permssion errors."
+msgstr "Ο διακομιστής webwork πρέπει να είναι σε θέση να γράψει σε αυτούς τα ευρετήρια. Παρακαλώ διορθώστε τα σφάλματα έγκρισης."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:83
+msgid "Theme"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1439
+msgid "Theme (refresh page after saving changes to reveal new theme.)"
+msgstr "Θέμα (ανανεώστε τη σελίδα μετά την αποθήκευση αλλαγών για να εμφανιστεί νέο θέμα)"
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:5
+msgid "Theme:"
+msgstr "Θέμα:"
+
+# Context is "Sort by ____ Then by _____"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:30
+msgid "Then by"
+msgstr "Μετά από"
+
+#. ($listingsCount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:52
+msgid "There are %1 matching WeBWorK problems"
+msgstr "Εμφανίζονται %1 προβλήματα WeBWorK"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1527
+msgid ""
+"There are currently two hardcopy themes to choose from: One Column and Two "
+"Columns.  The Two Columns theme is the traditional hardcopy format.  The One"
+" Column theme uses the full page width for each column"
+msgstr "Αυτή τη στιγμή υπάρχουν δύο θέματα για να διαλέξετε: Μία Στήλη και Δύο Στήλες. Το θέμα Δύο Στηλών είναι η παραδοσιακή μορφή υλικοτυπίας. Το θέμα Ενός Στήλης χρησιμοποιεί το πλήρες πλάτος της σελίδας για κάθε στήλη"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1519
+msgid ""
+"There are extra database fields which are not defined in the schema for at "
+"least one table."
+msgstr "Υπάρχουν επιπλέον πεδία βάσεων δεδομένων τα οποία δεν είναι καθορισμένα στο σχήμα για τουλάχιστον ένα πίνακα."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:23
+msgid ""
+"There are extra database fields which are not defined in the schema for at "
+"least one table.  They can be removed when upgrading the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1404
+msgid ""
+"There are extra database fields which are not defined in the schema for at "
+"least one table. Check the checkbox by the field to delete it when upgrading"
+" the course. Warning: Deletion destroys all data contained in the field and "
+"is not undoable!"
+msgstr "Υπάρχουν επιπλέον πεδία βάσεων δεδομένων τα οποία δεν καθορίζονται στο σχήμα για τουλάχιστον ένα πίνακα. Ελέγξετε το πλαίσιο ελέγχου δίπλα στο πεδίο για να το διαγράψετε οταν αναβαθμίζεται το μάθημα. Προσοχή: Η διαγραφή καταστρέφει όλα τα δεδομένα που περιέχονται στο πεδίο και δεν αναιρείται! "
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1508
+msgid "There are extra database tables which are not defined in the schema."
+msgstr "Υπάρχουν επιπλέον πίνακες βάσεων δεδομένων οι οποίοι δεν καθορίζονται στο σχήμα."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1389
+msgid "There are extra database tables which are not defined in the schema. "
+msgstr "Υπάρχουν επιπλέον πίνακες βάσεων δεδομένων οι οποίοι δεν καθορίζονται στο σχήμα."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:15
+msgid ""
+"There are extra database tables which are not defined in the schema.  These "
+"can be deleted when upgrading the course."
+msgstr "Υπάρχουν επιπλέον πίνακες βάσεων δεδομένων οι οποίοι δεν καθορίζονται στο σχήμα. Αυτοί μπορούν να διαγραφτούν οταν αναβαθμίζεται το μάθημα."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:29
+msgid "There are many options available at the bottom:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:49
+msgid "There are no completed versions of this test."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:51
+msgid "There are no matching WeBWorK problems"
+msgstr "Δεν εμφανίζονται προβλήματα WeBWorK"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:8
+msgid "There are no set definition files in this course to look at."
+msgstr "Δεν υπάρχουν αρχεία περιγραφής σε αυτό το μάθημα."
+
+#. ($achievementID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:87
+msgid ""
+"There is NO undo for this function.  Do not use it unless you know what you "
+"are doing!  When you unassign a student using this button, or by unchecking "
+"their name, you destroy all of the data for achievement %1 for this student."
+msgstr "ΔΕΝ αναιρείται. Μη τη χρησιμοποιήσετε εκτός αν ξέρετε τι κάνετε! Όταν καταργείτε έναν σπουδαστή με αυτό το κουμπί, ή αποεπιλέγοντας το όνομά του, καταστρέφετε όλα τα δεδομένα προόδου %1 για αυτόν τον σπουδαστή."
+
+#. (tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:91
+msgid ""
+"There is NO undo for this function.  Do not use it unless you know what you "
+"are doing!  When you unassign a student using this button, or by unchecking "
+"their name, you destroy all of the data for homework set %1 for this "
+"student."
+msgstr "ΔΕΝ αναιρείται. Μη τη χρησιμοποιήσετε εκτός αν ξέρετε τι κάνετε! Όταν καταργείτε έναν σπουδαστή με αυτό το κουμπί, ή αποεπιλέγοντας το όνομά του, καταστρέφετε όλα τα δεδομένα προόδου %1 για αυτόν τον σπουδαστή."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:68
+msgid "There is NO undo for unassigning a set."
+msgstr "Δεν υπάρχει αναίρεση για την κατάργηση ενός συνόλου ασκήσεων."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:125
+msgid ""
+"There is NO undo for unassigning sets. Do not do so unless you know what you"
+" are doing!  When you unassign sets by unchecking set names and clicking "
+"save, you destroy all of the data for those sets for this student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:21
+msgid "There is NO undo for unassigning students."
+msgstr "Δεν υπάρχει αναίρεση για αναίρεση σπουδαστών."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:490
+msgid "There is a written solution available."
+msgstr "Υπαρχεί γραμμένη λύση διαθέσιμη. "
+
+#. ($message_file, $merge_file)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:50
+msgid ""
+"There is no additional grade information.  A message about additional grades"
+" can go in [TMPL]/email/%1. It is merged with the file [Scoring]/%2. These "
+"files can be edited using the \"Email\" link and the \"File Manager\" link "
+"in the left margin."
+msgstr "Δεν υπάρχουν πληροφορίες για επιπλέον βαθμό. Ένα μύνημα για επιπλέον βαθμούς μπορεί να πάει στο [TMPL]/email/%1. Είναι συγχωνευμένο με το αρχείο [Scoring]/%2. Αυτά τα αρχεία μπορούν να διορθωθούν χρησιμποποιώντας τον σύνδεσμο \"Email\" και τον σύνδεσμο \"Διαχειριστής Αρχείων\" στο αριστερό κενό."
+
+#. ($continueTimeLeft)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:25
+msgid ""
+"There is no time remaining on the currently open test. Click continue below "
+"and then click \"Grade Test\" within %1 seconds to submit the test for a "
+"grade."
+msgstr "Δεν υπάρχει υπολειπόμενος χρόνος στο τρέχον ανοιχτό τεστ. Πατήστε συνέχεια παρακάτω και μετά πατήστε \"Τεστ Βαθμολογίας\" μέσα σε %1 δευτερόλεπτα για να υποβάλλετε το τεστ για βαθμολόγηση."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:65
+msgid "There is no undo for deleting files or directories!"
+msgstr "Δεν υπάρχει αναίρεση για τη διαγραφή αρχείων ή καταλόγων!"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:495
+msgid ""
+"There is no written solution available for this problem, but you can still "
+"view the correct answers."
+msgstr "Δεν υπάρχει διαθέσιμη γραπτή λύση για αυτό το πρόβλημα, αλλά μπορείτε ακόμα να δείτε τις σωστές απαντήσεις."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:498
+msgid "There is no written solution available for this problem."
+msgstr "Δεν υπάρχει διαθέσιμη γραπτή λύση για αυτό το πρόβλημα."
+
+#: /opt/webwork/webwork2/conf/defaults.config:1441
+msgid ""
+"There is one main theme to choose from: math4. It has three variants: "
+"math4-green, math4-red, and math4-yellow. The theme specifies a unified look"
+" and feel for the WeBWorK course web pages."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:441
+msgid ""
+"There was an error during the login process.  Please speak to your "
+"instructor or system administrator if this recurs."
+msgstr "Παρουσιάστηκε σφάλμα κατά τη σύνδεση. Παρακαλούμε μιλήστε στον καθηγητή σας ή τον διαχειριστή συστήματος αν αυτό επαναληφθεί."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:354
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:492
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:536
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:575
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:172
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:189
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:212
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:227
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:365
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:447
+msgid ""
+"There was an error during the login process.  Please speak to your "
+"instructor or system administrator."
+msgstr "Παρουσιάστηκε σφάλμα κατά τη σύνδεση. Παρακαλούμε μιλήστε στον καθηγητή σας ή τον διαχειριστή συστήματος."
+
+#. ('href="https://webwork.maa.org/wiki/Set_Definition_Files"
+#. target="Webworkdocs"')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:48
+msgid ""
+"These are stored in the templates directory. The format of <strong>Set "
+"Definition files</strong> is described in the <a %1>Set Definition "
+"specification</a>. Set definition files are mainly useful for transferring "
+"set assignments from one course to another and are created when exporting a "
+"problem set from the \"Hmwk Sets Editor\".  Each set defintion file contains"
+" a list of problems used and the dates and times. These definitions can be "
+"imported into the current course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:77
+msgid ""
+"These are the files from which problems are generated and are located in the"
+" templates directory or in subdirectories. They can be edited directly using"
+" the \"Edit\" link on each problem page or from the \"Hmwk Sets Editor\". "
+"The File Manager allows you to upload or download these files. \tDirectories"
+" that start with \"set\" contain pg files and are generated when exporting a"
+" problem set in which there are local versions of a problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:40
+msgid ""
+"These options will only be shown if the user has the permission to change "
+"display settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:44
+msgid ""
+"These problems require some application of algorithms, but do not rise to "
+"the level of a full word problem. For example, \"Identify the local extrema "
+"for f(x) = ...\". One has to apply algorithms and interpret results."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1837
+msgid ""
+"These users and higher get the \"Show Past Answers\" button on the problem "
+"page."
+msgstr "Αυτοί οι χρήστες και άνω παίρνουν το κουμπί «Προηγούμενες Απαντήσεις» στη σελίδα του προβλήματος."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:17
+msgid "This action can take a long time if there are many students."
+msgstr "Αυτή η ενέργεια μπορεί να διαρκέσει πολύ αν υπάρχουν πολλοί σπουδαστές."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:12
+msgid "This action will not overwrite existing users."
+msgstr "Αυτή η ενέργεια δεν αντικαθιστά υπάρχοντες χρήστες."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:20
+msgid ""
+"This allows for the viewing, downloading, uploading and other management of "
+"files in the course.  Select a file or set of files (using CTRL or SHIFT) "
+"and click the desired button on the right.  Many actions can only be done "
+"with a single file (like view). Selecting a directory or set of files and "
+"clicking \"Make Archive\" creates a compressed tar file with the name "
+"COURSE_NAME.tgz"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:34
+msgid ""
+"This browses the Open Problem Library (OPL) in category "
+"(Subject/Chapter/Section) form. Select the desired categories (all three do "
+"not need to be selected) and click \"View Problems\". If the \"Include "
+"Contrib\" box is selected then those problems in the Contrib section of the "
+"OPL that have the categories defined are also included. Contrib problems are"
+" problem that haven't been vetted as thoroughly as OPL problems. If you want"
+" hints or solutions included while browsing select the appropriate box."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:49
+msgid ""
+"This button is also present both at top and the bottom of the page. Discards"
+" all changes, reloading the page by re-reading the database information for "
+"this set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:39
+msgid ""
+"This button is present both at top and the bottom of the page. Any and all "
+"changes made to any part of the set will be saved with one important "
+"exception: When editing the set for one or more students, you can choose to "
+"override the default value (defined for the set in general) by clicking on "
+"the checkbox and providing a value (or possibly leaving blank) and checking "
+"the override checkbox. If you do <strong>NOT</strong> check the checkbox, "
+"the override value will be discarded and the default value for the set will "
+"be used for the users currently being edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:105
+msgid ""
+"This can computed from the answer sub scores above using the weights shown "
+"if they are modified.  Alternatively, enter the point score you want saved "
+"here (the above sub scores will be ignored)."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2005
+msgid ""
+"This configures if the single problem manual grader has inputs to enter "
+"problem scores as a percent, a point value, or both. Note, the problem score"
+" is always saved as a percent, so when using a point value, the problem "
+"score will be rounded to the nearest whole percent."
+msgstr ""
+
+#. (tag('b', maketext('Guest Login')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:72
+msgid ""
+"This course supports guest logins. Click %1 to log into this course as a "
+"guest."
+msgstr "Το μάθημα υποστηρίζει συνδέσεις επισκεπτών. Κάντε κλικ στο %1 για να συνδεθείτε σε αυτό το μάθημα ως επισκέπτης."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:58
+msgid ""
+"This determines if MathQuill answer blanks are enable for the user. This "
+"option is only present if MathQuill is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:63
+msgid ""
+"This determines if the MathView equation editor button will be appended to "
+"text answer blanks. his option is only present if MathView is enabled for "
+"the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:52
+msgid ""
+"This determines whether or not saved past answers are automatically filled "
+"in to the problem form when a student returns to a problem after having left"
+" the problem. This option is only visible if the user has the permission to "
+"show old answers."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:85
+msgid ""
+"This directory is accessible from the web. You can use it to store html "
+"documents or image documents that are used by the course. Do not store "
+"private information in this directory or in any subdirectory thereof. These "
+"documents can be linked to from within problems using the htmlLink macro."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:255
+msgid "This file is a template. You may use \"Save As\" to create a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:20
+msgid ""
+"This form can assign, unassign, and edit user data for a single achievement."
+"  You can assign the achievement to all current users or select which users "
+"to assign the achievement to and click Save.  You can unassign the "
+"achievement by unchecking a student's name (note all data will be deleted)."
+"  To unassign the achievement from all users, first select \"Allow "
+"unassign\" and then click the \"Unassign from All Users\" button. You can "
+"also toggle the earned status with the checkbox in the \"Earned\" column and"
+" edit the achievement counter for counting achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:19
+msgid ""
+"This gives the status and dates of the main set. Indvidual students may have"
+" different settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:51
+msgid "This homework set contains no problems."
+msgstr "Αυτό το σύνολο ασκήσεων δεν περιέχει προβλήματα."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1231
+msgid "This homework set is closed."
+msgstr "Το σύνολο ασκήσεων είναι κλειστό."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1229
+msgid "This homework set is not yet open."
+msgstr "Αυτό το σύνολο ασκήσεων δεν είναι ακόμη ανοιχτό."
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:423
+msgid "This is a new (re-randomized) version of the problem."
+msgstr "Αυτή είναι μια νέα (επανατυχαιοποιημένη) έκδοση του προβλήματος."
+
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:109
+msgid ""
+"This is a timed test. You will have %quant(%1,hour) and %quant(%2,minute) to"
+" complete the test."
+msgstr "Αυτό είναι ένα χρονομετρημένο τέστ. Θα έχετε %ποσό(%1,ώρα) και &ποσό(%2,λεπτό) για να ολοκληρώσετε το τέστ."
+
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:119
+msgid ""
+"This is a timed test. You will have "
+"%quant(%1,hour,hours,)%quant(%2,minute,minutes,) to complete the test."
+msgstr "Αυτή είναι μια χρονολογημένη δοκιμή. Θα έχετε %ποσό(%1,ώρα,ώρες,)%ποσό(%2,λεπτό,λεπτά,) για να ολοκληρώσετε τη δοκιμή."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:81
+msgid ""
+"This is done by first entering the user as a student and then changing the "
+"permission level of the user. First edit the user by clicking on the pencil "
+"next to their name (or using the technique above for several users), then "
+"change their permssion level -- an entry blank at the far right of the "
+"screen, you may have to scroll to see it. The permission levels are"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:156
+msgid ""
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page if you wish to assign a homework set to all students or a large group "
+"of students (e.g. a section)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:161
+msgid ""
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:171
+msgid ""
+"This is done from the \"Hmwk Sets Editor\" page or the \"Instructor tools\" "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:71
+msgid ""
+"This is most easily done by importing a class list. The class list can be "
+"uploaded from your workstation to the server using the File Manager page. "
+"The class list must be a file ending in .lst and must have a specific <a "
+"href=\"http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files\">format</a>."
+" Once the file has been uploaded to the server the file will appear in the "
+"import action pop-up list (5th action). demoCourse.lst is available for most"
+" courses and adds the \"practice users\" which activate guest logins to the "
+"class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:23
+msgid ""
+"This is the administration course which is used to manage courses on this "
+"server.  Use the \"Admin Menu\" to select the desired action."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1996
+msgid ""
+"This is the default number of attempts a student must make before hints will"
+" be shown to the student. Set this to -1 to hide hints.  Note that this can "
+"be overridden with a per problem setting."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1712
+msgid ""
+"This is the default number of attempts before show me another becomes "
+"available to students.  It can be set to -1 to disable show me another by "
+"default."
+msgstr "Αυτός είναι ο προεπιλεγμένος αριθμός των προσπαθειών πριν το παρόμοιο πρόβλημα γίνει διαθέσιμο στους σπουδαστές. Μπορεί να είναι σύνολο ασκήσεων σε -1  σε απενεργοποίηση παρόμοιου προβλήματος ως προεπιλογή. "
+
+#: /opt/webwork/webwork2/conf/defaults.config:1601
+msgid ""
+"This is the number of achievement points given to each user for completing a"
+" problem."
+msgstr "Αυτός είναι ο αριθμός των πόντων για τα επιτεύγματα που δίνονται σε κάθε χρήστη για την ολοκλήρωση ενός προβλήματος."
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:150
+msgid ""
+"This is the only part of the score that is actually saved. This is computed "
+"from the answer sub scores above using the weights shown if they are "
+"modified.  Alternatively, enter the score you want saved here (the above sub"
+" scores will be ignored)."
+msgstr "Αυτό είναι το μοναδικό μέρος της βαθμολογίας που είναι πραγματικά αποθηκευμένο. Αυτό είναι βαθμολογημένο από την απάντηση υποβαθμολογιών παραπάνω χρησιμοποιώντας τα προβεβλημένα βάρη εάν είναι τροποποιημένα. Εναλλακτικά, εισάγετε τη βαθμολογία που θα θέλατε αποθηκευμένη εδώ (οι παραπάνω υποβαθμολογίες θα αγνοηθούν). "
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:19
+msgid "This is the standard entry point for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:92
+msgid ""
+"This is where email messages and templates are saved. You can upload or "
+"download files in this directory if you wish to save the files for later."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:77
+msgid ""
+"This is where you edit the text of the problem template. Type Ctrl-Enter "
+"while this window has focus to re-render the problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:669
+msgid ""
+"This is your last submission.  If you say yes, then your answers will be "
+"final, and you will not be able to continue to work this test version."
+msgstr "Αυτή είναι η τελευταία σας υποβολή. Αν πατήσετε ναι, τότε οι απαντήσεις σας θα είναι οριστικές και δε θα μπορείτε να συνεχίσετε αυτήν την εκδοχή τεστ. "
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:673
+msgid ""
+"This is your only submission.  If you say yes, then your answers will be "
+"final, and you will not be able to continue to work this test version."
+msgstr "Αυτή είναι η μόνη σας υποβολή. Αν πατήσετε ναι, τότε οι απαντήσεις σας θα είναι οριστικές και δε θα μπορείτε να συνεχίσετε αυτήν την εκδοχή τεστ. "
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:42
+msgid ""
+"This link gives details for many macros. It links to documentation embedded "
+"in the macro files themselves."
+msgstr ""
+
+#. ('PGMLLab/PGML-lab.pg')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:63
+msgid ""
+"This links to a WeBWorK \"problem\" which allows you to try out fragments of"
+" PGML code. This link will not be available if the file %1 is not located in"
+" the templates directory of the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:33
+msgid "This links to a list of problem authoring techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:39
+msgid "This links to a page describing Math Object usage."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:72
+msgid "This links to problem authoring information on the WeBWorK wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:46
+msgid ""
+"This may be Mathjax, images, or plainText. Only the options that are enabled"
+" for the course will be available to select. This option is only visible if "
+"there is more than one display mode enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:42
+msgid "This option shows all pg problems in the course directory structure."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:47
+msgid ""
+"This option shows all problems in set definition files that are located in "
+"the course directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:44
+msgid ""
+"This option shows all problems in sets that have been created in the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:20
+msgid ""
+"This page allows one to edit the contents of PG problem files as well as set"
+" headers and other files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:20
+msgid ""
+"This page allows users to change their password, email address, and display "
+"settings used in problems. Note that you can hide this page entirely for "
+"students by setting permission levels to login_proctor or higher for the "
+"permissions to change password, change e-mail address, and change display "
+"settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:20
+msgid ""
+"This page allows you to configure course settings such as permission levels,"
+" display modes allowed, default display mode, email feedback behavior, and "
+"much more."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:20
+msgid ""
+"This page displays a student's current achievement level and progress toward"
+" the next level, and lists the rewards and badges that the student has "
+"earned. If rewards have been earned, then the student may also redeem those "
+"rewards."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:26
+msgid ""
+"This page gives access to information about the student, independent of the "
+"homework sets assigned to them."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:20
+msgid ""
+"This page gives information about mass LTI grade updates, and allows you to "
+"trigger a grade update for all users and all sets, all sets for one user, "
+"all users for one set, or one user for one set.  When a user is selected, "
+"the sets drop down menu is updated to only allow selecting sets assigned the"
+" selected user.  Similarly when a set is selected, the user menu is updated "
+"to only allow selecting valid users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:20
+msgid ""
+"This page is a collection of tools to modify users and sets.  These tools "
+"are short cuts for common actions that allow selecting multiple users or "
+"sets to act on at once.  Because multiple users and sets can be acted on at "
+"the same time, it is often more efficient to use this page when modifying "
+"multiple items.  For example, after selecting several users and a set you "
+"can change the close date for all selected users for that set.  This page "
+"also gives access to \"View/Edit all sets for one user\", which can be used "
+"to access settings for all sets including test versions for that user."
+msgstr ""
+
+#. (q(table to save any changes.  Each student's name links to that student's
+#. problem and opens up the)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:20
+msgid ""
+"This page is for manually grading a problem for all assigned students.  The "
+"table of students shows their last answers, percent score, and feedback "
+"comment.  The \"Save\" button is located below the "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:20
+msgid ""
+"This page is used to browse problems that will be used to fill problem sets."
+" The first step is to choose which set you are working on. If you need to "
+"create a new problem set fill in the blank next to the \"Create a New Set in"
+" This Course\" button and then press the button. Then choose which set you "
+"want to work on in the drop down menu."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:20
+msgid ""
+"This page is useful for monitoring student progress on assignments. Student "
+"progress can either be viewed for a single set or for a single student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:20
+msgid ""
+"This page manages all of the homework sets (including quizzes/tests). The "
+"following allow editing directly of a single problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:20
+msgid ""
+"This page shows the student's current grades for all sets they are assigned "
+"to.  Only visible sets are shown to the student, while invisible set names "
+"are italic when viewed as an instructor.  Students can only see the per "
+"problem grades on open assignments."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3169
+msgid "This problem contains a video which must be viewed online."
+msgstr "Αυτό το πρόβλημα περιέχει ένα βίντεο που πρέπει να προβληθεί στο διαδίκτυο."
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:631
+msgid "This problem has more than one part."
+msgstr "Αυτό το πρόβλημα έχει περισσότερα από ένα μέρη."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1323
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1576
+msgid ""
+"This problem has open subproblems.  You can visit them by using the links to"
+" the left or visiting the set page."
+msgstr "Αυτό το πρόβλημα έχει υποπροβλήματα. Μπορείτε να τα επισκεφθείτε με τους συνδέσμους στα αριστερά ή δεξιά ή να επισκεφθείτε τη σελίδα των συνόλων ασκήσεων."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem.html.ep:66
+msgid "This problem is not valid."
+msgstr ""
+
+#. ($prettyID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:399
+msgid "This problem uses the same source file as number %1."
+msgstr "Αυτό το πρόβλημα χρησιμοποιεί το ίδιο αρχείο προέλευσης ως αριθμό %1."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:418
+msgid "This problem will not count towards your grade."
+msgstr "Αυτό το πρόβλημα δε θα μετρήσει στο βαθμό σας."
+
+#. ($ur->email_address)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:1
+msgid "This sample mail would be sent to %1"
+msgstr "Αυτό το δείγμα αλληλογραφίας θα σταλεί στο %1"
+
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1399
+msgid ""
+"This score for this problem does not count for the score of problem %1 or "
+"for the set."
+msgstr "Αυτό το σκορ για αυτό το πρόβλημα δεν μετράει για το σκορ του προβλήματος %1 ή για το σύνολο εργασιών."
+
+#. ($message_file,				$merge_file)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:127
+msgid ""
+"This scoring message is generated from [TMPL]/email/%1. It is merged with "
+"the file [Scoring]/%2. These files can be edited using the \"Email\" link "
+"and the \"File Manager\" link in the left margin."
+msgstr "Αυτό το μήνυμα βαθμολογίας δημιουργείται από [TMPL]/email/%1. Συγχωνεύεται με το αρχείο [Scoring]/%2. Μπορείτε να επεξεργαστείτε τα αρχεία χρησιμοποιώντας τους συνδέσμους «Email» και «Διαχείριση Αρχείων» στο αριστερό περιθώριο."
+
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:155
+msgid "This set %1 is assigned to %2."
+msgstr "Το σύνολο ασκήσεων %1 έχει ανατεθεί σε %2."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:678
+msgid "This set doesn't contain any problems yet."
+msgstr "Αυτό το σύνολο ασκήσεων δεν περιέχει κανένα πρόβλημα ακόμα."
+
+#. ($c->formatDateTime($reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:44
+msgid ""
+"This set had a reduced scoring period that started on %1 and ended on %2.  "
+"During that period all work counted for %3% of its value."
+msgstr "Αυτό το σύνολο ασκήσεων ήταν σε περίοδο μειωμένης βαθμολόγησης που ξεκίνησε στο %1 και τελείωσε στο %2. Κατά τη διάρκεια της όλες οι εργασίες μετρούσαν στο %3% της αξίας τους."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:78
+msgid ""
+"This set has a set-level proctor password to authorize logins. Enter the "
+"password below."
+msgstr "Αυτό το σύνολο ασκήσεων έχει έναν κωδικό επόπτη συνόλου ασκήσεων-επιπέδου για να εξουσιοδοτεί τις συνδέσεις. Εισάγετε τον κωδικό παρακάτω."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:411
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:59
+msgid "This set is hidden from students."
+msgstr "Το σύνολο ασκήσεων είναι κρυφό από τους σπουδαστές."
+
+#. ($reducedScoringPerCent)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:40
+msgid ""
+"This set is in its reduced scoring period.  All work counts for %1% of its "
+"value."
+msgstr "Αυτό το σύνολο ασκήσεων είναι σε περίοδο μειωμένης βαθμολογίας. Όλες οι ασκήσεις μετράνε για %1% της αξίας τους."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:51
+msgid "This set is not assigned to any students."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:57
+msgid "This set is visible to students."
+msgstr "Το σύνολο ασκήσεων είναι ορατό στους σπουδαστές."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:42
+msgid "This set or problem is not valid."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:164
+msgid ""
+"This set will be unavailable to students until they have earned a certain "
+"score on the sets specified in this field. The sets should be written as a "
+"comma separated list. The minimum score required on the sets is specified in"
+" the following field."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:111
+msgid ""
+"This should be done cautiously. Once a student is deleted from a course "
+"their data is lost forever and cannot be recovered. They can be added to the"
+" course as a new student, but all of their homework set assignments and "
+"homework has been permanently deleted."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1962
+msgid "This source file does not exist!"
+msgstr "Το πηγαίο αρχείο δεν υπάρχει!"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1961
+msgid "This source file is a directory!"
+msgstr "Αυτό το πηγαίο αρχείο είναι κατάλογος!"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1963
+msgid "This source file is not a plain file!"
+msgstr "Αυτό το πηγαίο αρχείο δεν είναι απλό αρχείο!"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1960
+msgid "This source file is not readable!"
+msgstr "Πηγαίο αρχείο μη αναγνώσιμο!"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+msgid ""
+"This specifies the number of attempts before hints are shown to students. "
+"The value of -2 uses the default from course configuration. The value of -1 "
+"disables hints. Note that this will only have an effect if the problem has a"
+" hint."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
+msgid ""
+"This specifies the rerandomization period: the number of attempts before a "
+"new version of the problem is generated by changing the Seed value. The "
+"value of -1 uses the default from course configuration. The value of 0 "
+"disables rerandomization."
+msgstr "Αυτό καθορίζει την περίοδο επανατυχαιοποίησης: ο αριθμός των προσπαθειών πριν από μια νέα εκδοχή του προβλήματος δημιουργείται με την αλλαγή της τιμής Seed. Η τιμή -1 χρησιμοποιείται ως προεπιλογή. Η τιμή 0 απενεργοποιεί την τυχαιοποίηση."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:81
+msgid "This test requires a proctor password to continue."
+msgstr "Το τεστ απαιτεί κωδικό για να συνεχίσετε."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:126
+msgid "This test requires a proctor password to start."
+msgstr "Το τεστ απαιτεί κωδικό επόπτη για να ξεκινήσετε."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:45
+msgid "This will determine if the output is in one or two columns."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:21
+msgid "Time"
+msgstr "Χρόνος"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:249
+msgid "Time Interval for New Test Versions (min; 0=infty)"
+msgstr "Χρονικό Διάστημα για Νέες Εκδοχές Τεστ (min; 0=infty)"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:159
+msgid "Time Remaining"
+msgstr ""
+
+#. ($c->{elapsedTime}, sprintf('%.0f', 10 * ($c->{set}->due_date -
+#. $c->{set}->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:336
+msgid "Time taken on test: %1 min (%2 min allowed)."
+msgstr "Χρόνος τεστ: %1 λεπτό (%2 επιτρεπόμενα λεπτά)."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
+msgid "Timestamp"
+msgstr "Χρονοσήμανση"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1512
+msgid "Timezone for the course"
+msgstr "Χρονική ζώνη για το μάθημα"
+
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:330
+msgid "To access this set you must score at least %1% on set %2."
+msgstr "Για πρόσβαση στο σύνολο ασκήσεων πρέπει να πετύχετε τουλάχιστον %1% σε σύνολα ασκήσεων %2."
+
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:336
+msgid ""
+"To access this set you must score at least %1% on the following sets: %2."
+msgstr "Για πρόσβαση στο σύνολο ασκήσεων πρέπει να πετύχετε τουλάχιστον %1% στα ακόλουθα σύνολα: %2."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:53
+msgid ""
+"To add an additional instructor to the new course, specify user information "
+"below. The user ID may contain only numbers, letters, hyphens, periods "
+"(dots), commas,and underscores."
+msgstr "Για να προσθέσετε έναν επιπλέον καθηγητή στο νέο μάθημα, ορίστε παρακάτω τις πληροφορίες χρήστη. Ο κωδικός χρήστη μπορεί να περιέχει μόνο αριθμούς, γράμματα, παύλες, τελείες, κόμματα και κάτω παύλες."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:42
+msgid ""
+"To add the WeBWorK administrators to the new course (as administrators) "
+"check the box below."
+msgstr "Για προσθήκη των WeBWorK διαχειριστών στο νέο μάθημα (ως διαχειριστές) επιλέξτε το κάτω κουτί."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:118
+msgid ""
+"To assign one or more sets to an individual student click in the column "
+"\"Assigned Sets\" in the student's row. This will take you to a page where "
+"you can assign and unassign homework sets and change the due dates for "
+"homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:79
+msgid ""
+"To change status (scores or grades) for this student for one set, click on "
+"the individual set link."
+msgstr "Για αλλαγή κατάστασης (σκορ ή βαθμοί) ενός συνόλου ασκήσεων αυτού του σπουδαστή, πατήστε τον σύνδεσμο του συνόλου."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:106
+msgid ""
+"To copy the templates and html folders from an existing course, select the "
+"course below."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:102
+msgid ""
+"To drop a student or students, select them for editing as described above "
+"and then set the pop-up list to enrolled,drop, or audit. Dropped students "
+"cannot log in to the course, are not assigned new homework sets and are not "
+"sent e-mail. They can be re-enrolled simply by changing their status back to"
+" enrolled. No data is lost, any homework sets assigned before they were "
+"dropped are restored unchanged."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:143
+msgid ""
+"To edit a specific student version of this set, edit (all of) her/his "
+"assigned sets."
+msgstr "Για να επεξεργαστείτε την προβολή σπουδαστή συγκεκριμένου συνόλου ασκήσεων, επεξεργαστείτε (όλα) τα σύνολά του."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:29
+msgid ""
+"To perform an action select the desired action tab and click the submit "
+"button."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:90
+msgid "To this Problem"
+msgstr "Σε αυτό το πρόβλημα"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:69
+msgid ""
+"To use the Email merge feature, upload a CSV with calculated grades to the "
+"scoring directory using the \"File Manager\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:767
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:58
+msgid "Today"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:33
+msgid "Toggle each of the options to include or not include in the output."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:522
+msgid "Top Score"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:118
+msgid "Top level of author information on the wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:114
+msgid "Total Points"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:18
+msgid "Total Points:"
+msgstr "Συνολικοί πόντοι:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:90
+msgid "Totals"
+msgstr "Σύνολο"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:290
+msgid "Totals only (not problem scores)"
+msgstr "Σύνολο μόνο (όχι βαθμολογία προβλήματος)"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:291
+msgid "Totals only, only after answer date"
+msgstr "Σύνολα μόνο, μετά την ημ/νία απάντησης"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:236
+msgid "Transfer"
+msgstr "Μεταφορά"
+
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:284
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:22
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:35
+msgid "True"
+msgstr "Σωστό"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:245
+msgid "Try it"
+msgstr "Δοκιμάστε"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:26
+msgid "Tunic of Extension"
+msgstr "Παράταση Yποβολής"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:86
+msgid "Two Columns"
+msgstr "Δύο Στήλες"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:30
+msgid "Type"
+msgstr "Γράψτε"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:84
+msgid "Type:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:23
+msgid "URI"
+msgstr "URI"
+
+#. ($achievementName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:297
+msgid "Unable to change the evaluator for set %1. Unknown error."
+msgstr "Αδύνατη η αλλαγή αξιολογητή για σύνολα ασκήσεων %1. Άγνωστο σφάλμα."
+
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1084
+msgid "Unable to change the hardcopy header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1070
+msgid "Unable to change the set header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{fullSetID}, $c->{prettyProblemNumber})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1110
+msgid ""
+"Unable to change the source file path for set %1, problem %2. Unknown error."
+msgstr ""
+
+#. ($c->shortPath($delFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1246
+msgid "Unable to delete backup file \"%1\"."
+msgstr ""
+
+#. ($formatBackupTime)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:571
+msgid "Unable to delete backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:888
+msgid "Unable to make \"%1\" the hardcopy header for %2."
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:860
+msgid "Unable to make \"%1\" the set header for %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:693
+msgid "Unable to obtain error messages from within the PG question."
+msgstr "Αδύνατη η λήψη μηνυμάτων σφάλματος μέσα από την PG ερώτηση."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:275
+msgid "Unable to open a temporary file at the given location."
+msgstr ""
+
+#. ($c->shortPath($backupFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1233
+msgid "Unable to read backup file \"%1\"."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:636
+msgid "Unable to write to \"%1\": %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:15
+msgid "Unarchive"
+msgstr "Μη αρχειοθέτηση"
+
+#. ($unarchive_courseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:4
+msgid "Unarchive %1 to course:"
+msgstr "Μη αρχειοθέτηση %1 σε μάθημα:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:40
+msgid "Unarchive Course"
+msgstr "Μη Αρχειοθέτηση Μαθ/τος"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:17
+msgid "Unarchive Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:25
+msgid "Unarchive Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1306
+msgid "Unarchive Next Course"
+msgstr "Μη Αρχειοθέτηση επόμενου μαθ/τος"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:97
+msgid "Unassign from All Users"
+msgstr "Αποδέσμευση από όλους"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:61
+msgid "Unassign selected sets from selected users"
+msgstr "Αποδέσμευση επιλεγμένων συνόλων ασκήσεων από επιλεγμένους χρήστες"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:57
+msgid ""
+"Unassignments were not done.  You need to select \"Allow unassign\" and then"
+" click on the Unassign button."
+msgstr ""
+
+#. ($unattempted, $num_of_problems)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:44
+msgid "Unattempted: %1/%2"
+msgstr "Χωρίς προσπάθεια: %1/%2"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:37
+msgid "Unclassified Problems"
+msgstr "Αταξινόμητα Προβλήματα"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:242
+msgid "Ungraded"
+msgstr "Χωρίς βαθμό"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:58
+msgid "Unhide Courses"
+msgstr "Επανεμφάνιση μαθημάτων"
+
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1151
+msgid "Unkown saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:28
+msgid ""
+"Unlock an additional version of a test.  If used before the close date of "
+"the test this will allow you to generate a new version of the test."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:47
+msgid "Unpack Archive"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:113
+msgid "Unpack archives automatically"
+msgstr "Αυτόματη αποσυμπίεση αρχείων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:15
+msgid "Unselect all courses"
+msgstr "Αποεπιλογή μαθημάτων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:63
+msgid "Update Display"
+msgstr "Ενημέρωση προβολής"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:84
+msgid "Update Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:27
+msgid "Update Interval"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:102
+msgid "Update Menus"
+msgstr "Ενημέρωση Μενού"
+
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:51
+msgid "Update aborted. Invalid set %1."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:47
+msgid "Update aborted. Invalid user %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:67
+msgid "Update set:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:8
+msgid "Update the checked directories?"
+msgstr "Ενημέρωση επιλεγμένων καταλόγων;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:50
+msgid "Update user:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1908
+msgid "Updated location description."
+msgstr "Ενημερωμένη περιγραφή τοποθεσίας."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:40
+msgid "Upgrade"
+msgstr "Αναβάθμιση"
+
+#. ($upgrade_courseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
+msgid "Upgrade %1"
+msgstr "Αναβάθμιση %1"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:97
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:79
+msgid "Upgrade Course Tables"
+msgstr "Αναβάθμιση Πινάκων Μαθημάτων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:42
+msgid "Upgrade Courses"
+msgstr "Αναβάθμιση Μαθημάτων"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:17
+msgid "Upgrade Courses Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:43
+msgid "Upgrade courses from a previous version of WeBWorK."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1582
+msgid "Upgrade process completed"
+msgstr "Η αναβάθμιση ολοκληρώθηκε"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:65
+msgid "Upload"
+msgstr "Μεταφόρτωση"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:72
+msgid ""
+"Upload, download and delete text files, including scoring spread sheets, set"
+" definition files, class list spread sheets, and \"PG\" problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:292
+msgid "Use Default Header File"
+msgstr "Προεπιλεγμένη Κεφαλίδα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:127
+msgid "Use Equation Editor?"
+msgstr "Επεξεργαστής Εξίσωσης;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:20
+msgid "Use Reward"
+msgstr "Επιβράβευση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:27
+msgid "Use browser back button to return from preview mode."
+msgstr "Πατήστε \"Πίσω\" στο πρόγραμμα περιήγησης για επιστροφή σε λειτουργία προεπισκόπησης."
+
+#. (tag('b', $c->{achievementID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:16
+msgid "Use in achievement %1"
+msgstr "Χρήση σε επίτευγμα %1"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:23
+msgid "Use in new achievement:"
+msgstr "Χρήση σε νέο επίτευγμα:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:149
+msgid "Use live equation rendering?"
+msgstr "Χρήση ζωντανής απεικόνισης εξίσωσης;"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1929
+msgid "Use log base 10 instead of base <i>e</i>"
+msgstr "Χρήση βάσης καταγραφής 10 αντί βάσης <i>e</i>"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1935
+msgid "Use older answer checkers"
+msgstr "Χρήση παλιών ελεγκτών απάντησης"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:123
+msgid ""
+"Use the \"Create\" and \"Delete\" actions to create or delete achievements. "
+"Note that deleting an achievement will delete all data associated to the "
+"achievement and cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:35
+msgid ""
+"Use the \"Merge file\" drop down menu to select which merge file to use, or "
+"select \"None\" to not use any merge file.  When a merge file is selected, "
+"the data for active students will be displayed above the \"Email Body\".  "
+"This will show you the structure of the merge file and the column variables "
+"associated with each column.  Data that is longer than 7 characters will be "
+"truncated, and the data can be scrolled up and down to see all rows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:28
+msgid ""
+"Use the \"Users\" and \"Sets\" forms to select which users and sets to act "
+"on.  Multiple items can be selected using ctrl-click or shift-click.  The "
+"action buttons are grouped into three categories.  The first is a set of "
+"actions that act on the selected users, the second is a set of actions that "
+"act on the selected sets, and the third is a set of actions for acting on a "
+"combination of sets and users.  If an invalid number of users or sets are "
+"selected, the action will not be preformed, and an error message will be "
+"placed on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:25
+msgid ""
+"Use the editor to edit the evaluator and the action form at the bottom to "
+"save the evaluator. You can either overwrite the current evaluator file or "
+"save as a new evaluator file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:15
+msgid ""
+"Use the interface below to quickly access commonly-used instructor tools, or"
+" select a tool from the list to the left."
+msgstr "Χρησιμοποιήστε την παρακάτω διεπαφή για γρήγορη πρόσβαση στα χρήσιμα εργαλεία καθηγητών ή επιλέξτε εργαλείο από τη λίστα στα αριστερά."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:26
+msgid ""
+"Use the options in the second box to pick a collection of problems decribed "
+"below. In each case, clicking \"View Problems\" will render a fixed number "
+"of problems (default of 20). After problems are shown, there will be options"
+" to show the next/previous batch of problems, add all problems to the target"
+" set (set at the top of the page) or clear the curent batch of problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:27
+msgid ""
+"Use this form to ask your instructor a question, to report a problem with "
+"the WeBWorK system, or to report an error in a problem you are attempting. "
+"Along with your message, additional information about the state of the "
+"system will be included."
+msgstr "Χρησιμοποιήστε αυτήν την φόρμα για να κάνετε ερώτηση στον καθηγητή σας, να αναφέρετε ένα σφάλμα στο WeBWork ή στο πρόβλημα που επιχειρείτε. Μαζί με το μήνυμά σας συμπεριλάβετε επιπλέον πληροφορίες σχετικά με την κατάσταση του συστήματος."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:29
+msgid "Use this page to change your password."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:20
+msgid ""
+"Use this page to send emails to active (enrolled or auditing) students.  "
+"Emails can be sent to all active students or selected students.  Use the "
+"\"Students\" form to sort, filter, or format how the user name is displayed."
+"  Click \"Change Display Settings\" to apply any changes.  Use control-click"
+" or shift-click to select multiple students to email."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:67
+msgid ""
+"Used for \"counting\" achievements, which sets the value a counter must "
+"reach in order to earn the achievement. For example this is used counting "
+"the number of completed problems."
+msgstr ""
+
+#. (param('user')
+#. (param('effectiveUser')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:7
+msgid "User \"%1\" not found."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:324
+msgid ""
+"User \"%1\" will not be copied from admin course as it is the initial "
+"instructor."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:34
+msgid "User %1 not found."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:217
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:64
+msgid "User ID"
+msgstr "Κωδικός Χρήστη"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:230
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:28
+msgid "User Settings"
+msgstr "Ρυθμίσεις Χρήστη"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:17
+msgid "User Settings Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:576
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:13
+msgid "User overrides"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:62
+msgid "User's name is:"
+msgstr "Το ονοματεπώνυμο χρήστη είναι:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:60
+msgid "User's username is:"
+msgstr "Το όνομα χρήστη είναι:"
+
+#. ($user, $setID, $j)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
+msgid ""
+"UserProblem missing for user=%1 set=%2 problem=%3. This may indicate "
+"database corruption."
+msgstr "UserProblem λείπει για χρήστη=%1 σετ=%2 πρόβλημα=%3. Πιθανή διαφθορά της βάσης δεδομένων."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:51
+msgid "Username"
+msgstr "Όνομα Χρήστη"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:9
+msgid "Users"
+msgstr "Χρήστες"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:339
+msgid "Users Assigned to Set %2"
+msgstr "Χρήστες στους οποίους ανατέθηκε το σύνολο %2"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:17
+msgid "Users Assigned to Set Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:65
+msgid "Users List"
+msgstr "Λίστα Χρηστών"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1827
+msgid ""
+"Users at this level and higher are allowed to change display settings used "
+"in pg problems.Note that if it is expected that there will be students that "
+"have vision impairments and MathQuill is enabled to assist with answer "
+"entry, then you should not set this permission to a level above student as "
+"those students may need to disable MathQuill."
+msgstr "Από αυτό το επίπεδο δικαιωμάτων και άνω, επιτρέπεται στους χρήστες η αλλαγή ρυθμίσεων προβολής που χρησιμοποιούνται σε προβλήματα pg. Σημειώστε πως αναμένεται ότι εάν υπάρχουν σπουδαστές με αδυναμία όρασης και το MathQuill είναι ενεργοποιημένο, τότε θα πρέπει να ορίσετε το επίπεδο δικαιωμάτων ώστε οι σπουδαστές αυτοί να μπορούν να απενεργοποιήσουν το MathQuill."
+
+#: /opt/webwork/webwork2/conf/defaults.config:1817
+msgid ""
+"Users at this level and higher are allowed to change their e-mail address. "
+"Normally guest users are not allowed to change the e-mail address since it "
+"does not make sense to send e-mail to anonymous accounts."
+msgstr "Οι χρήστες από αυτό το επίπεδο και πάνω επιτρέπεται να αλλάξουν το email τους. Κανονικά οι επισκέπτες δεν επιτρέπεται να το αλλάξουν, καθώς δεν έχει νόημα να στέλνετε email σε ανώνυμους λογαριασμούς."
+
+#: /opt/webwork/webwork2/conf/defaults.config:1781
+msgid ""
+"Users at this level and higher are allowed to change their password. "
+"Normally guest users are not allowed to change their password."
+msgstr "Οι χρήστες από αυτό το επίπεδο και άνω επιτρέπεται να αλλάξουν τον κωδικό πρόσβασης. Οι επισκέπτες δεν επιτρέπεται να τον αλλάξουν."
+
+#. ($c->maketext(FIELD_PROPERTIES()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:316
+msgid "Users sorted by %1, then by %2, then by %3"
+msgstr "Χρήστες ταξινομημένοι κατά %1, κατά %2, κατά %3"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1808
+msgid ""
+"Users with at least this permission level get a link in the left panel for "
+"reporting bugs to the bug tracking system at bugs.webwork.maa.org."
+msgstr "Στους χρήστες που είναι τουλάχιστον σε αυτό το επίπεδο άδειας δίνεται ένας σύνδεσμος στον αριστερό πίνακα για να αναφέρουν σφάλματα στο σύστημα καταγραφής σφαλμάτων στο bugs.webwork.maa.org."
+
+#: /opt/webwork/webwork2/conf/defaults.config:2051
+msgid ""
+"Users with this permssion level or greater will automatically be sent "
+"feedback from students (generated when they use the \"Contact instructor\" "
+"button on any problem page).  In addition the feedback message will be sent "
+"to addresses listed below.  To send ONLY to addresses listed below set "
+"permission level to \"nobody\"."
+msgstr "Χρήστες με αυτό το επίπεδο δικαιωμάτων και άνω θα λάβουν αυτόματα ανατροφοδότηση από σπουδαστές (δημιουργούνται πατώντας το κουμπί «Επικοινωνήστε με τον καθηγητή» σε οποιαδήποτε σελίδα προβλήματος). Η ανατροφοδότηση θα σταλεί στις παρακάτω διευθύνσεις. Για να σταλεί ΜΟΝΟ στις παρακάτω διευθύνσεις, ορίστε το επίπεδο δικαιωμάτων σε «κανένα»."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:193
+msgid "Uses Math Objects"
+msgstr "Χρησιμοποιεί Μαθηματικά Αντικείμενα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:18
+msgid "Using what display mode?"
+msgstr "Ποια λειτουργία προβολής χρησιμοποιείται;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:6
+msgid "Using what seed?"
+msgstr "Ποιος τυχαίος αριθμός χρησιμποιείται;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:19
+msgid "Using which hardcopy format?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:49
+msgid "Using which hardcopy theme?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:31
+msgid ""
+"Usually means students must demonstrate understanding of facts. This is more"
+" than regurgitating the fact. We use this category for simple and direct "
+"applications of algorithms the student has studied. There should be no "
+"judgement involved in choosing the method. This would include a simple "
+"application of a rule for differentiation (e.g., can combine rules for sums "
+"and constant multiples with one more advanced rule) or for integrals."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
+msgid "Value"
+msgstr "Τιμή"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1649
+msgid "Value of work done in Reduced Scoring Period"
+msgstr "Αξία της εργασίας που γίνεται στη Mειωμένη Bαθμολογία"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config/config_help.html.ep:20
+msgid "Variable Documentation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:115
+msgid "Version"
+msgstr ""
+
+#. ($ver->{version})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:173
+msgid "Version %1"
+msgstr "Έκδοση %1"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:159
+msgid "Versions"
+msgstr "Εκδόσεις"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:43
+msgid "Versions of a set can only be edited for one user at a time."
+msgstr "Οι εκδοχές συνόλου μπορούν να επεξεργαστούν μόνο για έναν χρήστη τη φορά."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:528
+msgid "View"
+msgstr "Προβολή"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:6
+msgid "View Problems"
+msgstr "Προβολή Προβλημάτων"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:57
+msgid "View details of student perofrmance either by individual or by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:86
+msgid "View equations as"
+msgstr "Προβολή εξισώσεων ως"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:18
+msgid "View statistics by set"
+msgstr "Στατιστικά ανά σύνολο ασκήσεων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:19
+msgid "View statistics by student"
+msgstr "Στατιστικά ανά άτομο"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:55
+msgid ""
+"View statistics of students' performance on homework either by individual or"
+" by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:14
+msgid "View student progress by set"
+msgstr "Πρόοδος σπουδαστή ανά σύνολο"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:15
+msgid "View student progress by student"
+msgstr "Πρόοδος σπουδαστή ανά άτομο"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:65
+msgid "View/Edit"
+msgstr "Προβολή/Επεξεργασία"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:104
+msgid "View/Reload"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:31
+msgid "View/access current and archived courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:146
+msgid "Viewing Problems in a New Window"
+msgstr ""
+
+#. ($c->{problem}->source_file)
+#. ($screenSetHeader)
+#. ($course_info_path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:81
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:109
+msgid "Viewing temporary file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:25
+msgid "Visibility"
+msgstr "Ορατότητα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:7
+msgid "Visible"
+msgstr "Ορατό"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:622
+msgid "Visible sets were selected for export."
+msgstr "Τα ορατά σύνολα ασκήσεων επιλέχθηκαν για εξαγωγή."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
+msgid "Visible to Students"
+msgstr "Ορατό στους σπουδαστές"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
+msgid "Warning"
+msgstr "Προσοχή"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:13
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:117
+msgid "Warning messages"
+msgstr "Προειδοποιητικά μηνύματα"
+
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:259
+msgid "Warning messages:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:3
+msgid "Warning: Deletion destroys all set-related data and is not undoable!"
+msgstr "Προσοχή: Η διαγραφή αφορά όλα τα δεδομένα που σχετίζονται με το σύνολο ασκήσεων και δεν αναιρείται!"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:3
+msgid "Warning: Deletion destroys all user-related data and is not undoable!"
+msgstr "Προσοχή: Η διαγραφή αφορά όλα τα δεδομένα χρήστη και δεν αναιρείται!"
+
+#. ($problem_desc,				$c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1194
+msgid "Warnings encountered while processing %1. Error text: %2"
+msgstr "Προειδοποιήσεις κατά την επεξεργασία %1. Σφάλμα κειμένου: %2"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:39
+msgid ""
+"We use this for carrying out more complicated algorithms, such as "
+"derivatives using both the product and chain rule or integrals which involve"
+" say both a substitution and parts."
+msgstr ""
+
+#. ($ce->{WW_COPYRIGHT_YEARS} || '1996-2023',              $ce->{defaultTheme}
+#. || 'unknown -- set defaultTheme in localOverides.conf',
+#. $ce->{WW_VERSION}         || 'unknown -- set WW_VERSION in VERSION',
+#. $ce->{PG_VERSION}         || 'unknown -- set PG_VERSION in ../pg/VERSION')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:9
+msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:3
+msgid "WeBWorK Error"
+msgstr "Σφάλμα WeBWorK"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:3
+msgid "WeBWorK Warnings"
+msgstr "Προειδοποιήσεις WeBWorK"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1451
+msgid ""
+"WeBWorK currently has translations for the languages listed in the course "
+"configuration."
+msgstr "Το WeBWorK έχει τις τρέχουσες μεταφράσεις για τις εμφανιζόμενες γλώσσες στις ρυθμίσεις μαθήματος."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:20
+msgid ""
+"WeBWorK does not have a full featured scoring ability. We leave that to your"
+" favorite spreadsheet application."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:38
+msgid ""
+"WeBWorK expects many files to be in certain locations.  The following "
+"describe this. Note that by default the File Manager shows the \"templates\""
+" directory.  Other directories mentioned below are at the same level and "
+"need to be accessed by going up a directory by clicking the \"^\" button "
+"above the file list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:6
+msgid ""
+"WeBWorK has encountered a software error while attempting to process this "
+"problem. It is likely that there is an error in the problem itself. If you "
+"are a student, report this error message to your professor to have it "
+"corrected. If you are a professor, please consult the error output below for"
+" more information."
+msgstr "Το WeBWorK αντιμετώπισε σφάλμα λογισμικού κατά την επεξεργασία αυτού του προβλήματος. Είναι πιθανό να υπάρχει σφάλμα στο ίδιο το πρόβλημα. Εάν είστε σπουδαστής, αναφέρετε αυτό το μήνυμα σφάλματος στον καθηγητή σας. Εάν είστε καθηγητής, συμβουλευτείτε το παράρτημα σφαλμάτων παρακάτω για περισσότερες πληροφορίες."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:6
+msgid ""
+"WeBWorK has encountered warnings while processing your request. If this "
+"occured when viewing a problem, it was likely caused by an error or "
+"ambiguity in that problem. Otherwise, it may indicate a problem with the "
+"WeBWorK system itself. If you are a student, report these warnings to your "
+"professor to have them corrected. If you are a professor, please consult the"
+" warning output below for more information."
+msgstr "Το WeBWork αντιμετώπισε πρόβλημα στην επεξεργασία του αιτήματός σας. Αν αυτό συνέβη κατά την προβολή προβλήματος, μπορεί να προκλήθηκε από σφάλμα ή ασάφεια στο πρόβλημα. Ειδάλλως, μπορεί να υπάρχει πρόβλημα στο σύστημα WeBWorK. Εάν είστε σπουδαστής, αναφέρετε αυτές τις προειδοποιήσεις στον καθηγητή σας. Εάν είστε καθηγητής, συμβουλευτείτε το παράρτημα προειδοποιήσεων στη συνέχεια για περισσότερες πληροφορίες."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:558
+msgid ""
+"WeBWorK was unable to generate a different version of this problem.  Close "
+"this tab, and return to the original problem."
+msgstr "Το WeBWorK ήταν αδύνατο να δημιουργήσει μία διαφορετική εκδοχή του προβλήματος. Κλείστε αυτή την καρτέλα και επιστρέψτε στο αρχικό πρόβλημα."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:29
+msgid ""
+"WeBWorK was unable to generate a paper copy of this homework set.  Please "
+"inform your instructor."
+msgstr "Το WeBWorK ήταν αδύνατο να δημιουργήσει αντίγραφο σε χαρτί του συνόλου ασκήσεων αυτής της εργασίας. Παρακαλώ ενημερώστε τον καθηγητή σας."
+
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
+msgid ""
+"WeBWorK will automatically create users when logging in via the LMS for the "
+"first time. If this flag is enabled then it will also keep the user account "
+"data (first name, last name, section, recitation) up to date with the LMS. "
+"If a user's information changes in the LMS then it will change in WeBWorK. "
+"However, any changes to the user data via WeBWorK will be overwritten the "
+"next time the user logs in."
+msgstr "Το WeBWorK θα δημιουργήσει αυτόματα χρήστες όταν συνδέονται μέσω του LMS για πρώτη φορά. Αν η επιλογή αυτή είναι επιτρεπτή θα διατηρήσει επίσης τα δεδομένα λογαριασμού του χρήστη (όνομα, ονοματεπώνυμο, τμήμα, απαγγελία) ενήμερα με το LMS. Αν οι πληροφορίες του χρήστη αλλάξουν στο LMS τότε θα αλλάξουν και στο WeBWorK. Ωστόσο, οποιαδήποτε αλλαγή στα δεδομένα του χρήστη μέσω του WeBWorK θα αντικατσταθεί την επόμενη φορά που θα συνδεθεί ο χρήστης."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:370
+msgid "Weight"
+msgstr "Συντελεστής"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:6
+msgid "Welcome to WeBWorK!"
+msgstr "Καλωσορίσατε στο WeBWorK!"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:24
+msgid ""
+"What WeBWorK does have is good support for summarizing the scores on WeBWorK"
+" homework sets and tests and exporting them in a form (.csv) which any "
+"spreadsheet can use. WeBWorK reports all of the homework grades with options"
+" shown below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:27
+msgid "What could be inside?"
+msgstr "Τι θα μπορούσε να είναι μέσα;"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:17
+msgid "What field should filtered users match on?"
+msgstr "Επιλογή πεδίου για φιλτραρισμένους χρήστες"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
+msgid ""
+"When a student has more attempts than is specified here they will be able to"
+" view another version of this problem.  If set to -1 the feature is disabled"
+" and if set to -2 the course default is used."
+msgstr "Αν ο σπουδαστής κάνει παραπάνω απ' τις ορισμένες προσπάθειες βλέπει άλλη εκδοχή του ίδιου προβλήματος. Αν επιλέξει  -1 η λειτουργία απενεργοποιείται ενώ με  -2 ακολουθείται η προεπιλεγμένη πορεία."
+
+#: /opt/webwork/webwork2/conf/defaults.config:1801
+msgid ""
+"When acting as a student, this permission level and higher can submit "
+"answers for that student."
+msgstr "Όταν ενεργείτε ως κάποιος σπουδαστής, το εξής επίπεδο άδειας και τα υψηλότερα μπορούν να υποβάλλουν απαντήσεις για αυτόν τον σπουδαστή."
+
+#: /opt/webwork/webwork2/conf/defaults.config:1972
+msgid ""
+"When numerical answers are checked, most test if the student's answer is "
+"close enough to the programmed answer be computing the error as a percentage"
+" of the correct answer.  This value controls the default for how close the "
+"student answer has to be in order to be marked correct.<p>A value such as "
+"0.1 means 0.1 percent error is allowed.</p>"
+msgstr "Όταν ελέγχουν τις αριθμητικές απαντήσεις, οι πιο πολλοί δοκιμάζουν αν η απάντηση του μαθητή είναι αρκετά κοντά στην προγραμματισμένη υπολογίζοντας το λάθος ως ποσοστό της σωστής απάντησης. Αυτή η τιμή ελέγχει την προεπιλογή για το πόσο κοντά πρέπει να είναι η απάντηση του σπουδαστή ώστε να σημειωθεί σωστά. <p>Μία τιμή όπως το 0.1 σημαίνει ότι επιτρέπεται 0.1 ποσοστό λάθους. </p>"
+
+#: /opt/webwork/webwork2/conf/defaults.config:2019
+msgid ""
+"When students click the <em>Email Instructor</em> button to send feedback, "
+"WeBWorK fills in the subject line.  Here you can set the subject line.  In "
+"it, you can have various bits of information filled in with the following "
+"escape sequences.<p><ul><li>%c = course ID</li><li>%u = user ID</li><li>%s ="
+" set ID</li><li>%p = problem ID</li><li>%x = section</li><li>%r = "
+"recitation</li><li>%% = literal percent sign</li></ul>"
+msgstr "Όταν ο σπουδαστής πατήσει το κουμπί <em>Email σε καθηγητή </em> για να του αποσταλλούν σχόλια, το WeBWorK συμπληρώνει το θέμα. Εδώ μπορείς να επιλέξεις το θέμα. Σε αυτό, μπορείς να έχεις διάφορα κομμάτια πληροφοριών συμπληρωμένα με τις ακόλουθες σειρές.<p><ul><li>%c= κωδικός μαθήματος</li><li>%u=κωδικός χρήστη</li><li>%s=κωδικός συνόλου</li><li>%p=κωδικός προβλήματος</li><li>%x=τμήμα</li><li>%r =απαγγελία</li><li>%% =εμπεριστατωμένη ένδειξη ποσοστού</li></ul>"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:35
+msgid ""
+"When the class is very large not all students will be displayed. Using the "
+"first action on this page you can show only the students from a given "
+"recitation or from a given section, or only students whose login or last "
+"name fits a pattern match. The second action will sort the students "
+"currently being displayed. You can also sort the displayed students by "
+"clicking on the active links at the top of each column."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:56
+msgid ""
+"When the message is ready to send, click \"Send Email\". This will queue the"
+" email to be sent, which can take several minutes depending on the number of"
+" students selected.  You will be notified by email once all the emails have "
+"been sent."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1540
+msgid ""
+"When this is on students will see a line on the Grades page which has their "
+"total cumulative homework score.  This score includes all sets assigned to "
+"the student."
+msgstr "Με την ενεργοποίηση, οι σπουδαστές βλέπουν στη σελίδα Βαθμοί μια γραμμή που περιλαμβάνει το συνολικό σκορ των εργασιών. Αυτό περιέχει τα σετ ασκήσεων που ανατέθηκαν."
+
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
+msgid ""
+"When this is true, then when a user enters WeBWorK from an external tool "
+"link in the LMS, the bottom of the screen will display the data that the LMS"
+" passed to WeBWorK. This may be useful to debug LTI, especially because "
+"different LMS systems have different parameters."
+msgstr "Εάν σωστό, τότε όταν ένας χρήστης μπαίνει στο WebWork από σύνδεσμο εξωτερικού υλικού στο LMS, στο κάτω της οθόνης εμφανίζονται τα δεδομένα που μεταφέρθηκαν από το LMS στο WebWork. Ενδέχεται χρήσιμο για εντοπισμό σφαλμάτων στο LTI, κυρίως λόγω των διαφορετικών παραμέτρων που έχουν μεταξύ τους τα συστήματα LMS."
+
+#: /opt/webwork/webwork2/conf/defaults.config:1859
+msgid ""
+"When viewing a problem, WeBWorK usually puts the previously submitted answer"
+" in the answer blank.  Below this level, old answers are never shown.  "
+"Typically, that is the desired behaviour for guest accounts."
+msgstr "Κατά την προβολή προβλήματος, το WeBWorK συνήθως βάζει την προηγούμενη απάντηση στο κενό. Σε παρακάτω επίπεδα, οι παλιές απαντήσεις είναι μη ορατές. Aυτή είναι η αναμενόμενη συμπεριφορά για λογαριασμούς επισκεπτών."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:30
+msgid ""
+"When viewing progress for a single student, their grades page is shown which"
+" lists set totals and per problem grades for each set assigned to the "
+"student.  This shows the same information as the statistics page for the "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:26
+msgid ""
+"When viewing set statistics, the drop down menus can be used to show stats "
+"for individual sections, recitations, or problems.  The overall results "
+"include all students who are assigned to the set, while the individual "
+"problem results only include active (have attempted the problem) students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:24
+msgid ""
+"When viewing student progress for a set, the score for the set and the "
+"status for problems in the set are listed for all students.  The table can "
+"be sorted by clicking the links in the table header.  Click the student's "
+"name to access the student's set.  When viewing progress for a test, "
+"additional columns can be shown/hidden by updating the display at the top"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:74
+msgid ""
+"When you unassign a set from students, you destroy all of the data for the "
+"set for those students. If the set is re-assigned to these students, then "
+"they will receive new versions of problems in the set.  Make sure this is "
+"what you want to do before unassigning sets from students."
+msgstr ""
+
+#. (tag('b', $achievementID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:21
+msgid ""
+"When you unassign by unchecking a student's name, you destroy all of the "
+"data for achievement %1 for this student. Make sure this is what you want to"
+" do."
+msgstr "Όταν αναιρείτε την ανάθεση με την αποεπιλογή του ονόματος του σπουδαστή, διαγράφετε όλα τα δεδομένα για το επιτεύγμα %1 για αυτόν το σπουδαστή. Σιγουρευτείτε ότι θέλετε να αναιρέσετε την ανάθεση. "
+
+#. (tag('b', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:26
+msgid ""
+"When you unassign by unchecking a student's name, you destroy all of the "
+"data for homework set %1 for this student. You will then need to reassign "
+"the set to these students and they will receive new versions of the "
+"problems. Make sure this is what you want to do before unchecking students."
+msgstr "Όταν αναιρείτε την ανάθεση με την αποεπιλογή του ονόματος του σπουδαστή, καταστρέφετε τα δεδομένα του συνόλου ασκήσεων που είχαν ανατεθεί ως εργασία %1 γι' αυτόν. Θα πρέπει να αναθέσετε ξανά το σύνολο ασκήσεων σ'αυτούς τους σπουδαστές ώστε να λάβουν νέες εκδοχές των προβλημάτων. Σιγουρεύετε την επιλογή σας πριν την αποεπιλογή τους."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:72
+msgid ""
+"When you uncheck a homework set (and save the changes), you destroy all of "
+"the data for that set for this student.   If you reassign the set, the "
+"student will receive a new version of each problem. Make sure this is what "
+"you want to do before unchecking sets."
+msgstr "Όταν αποεπιλέγετε ένα σύνολο ασκήσεων που είχαν ανατεθεί ως εργασία (και αποθηκεύετε τις αλλαγές), καταστρέφετε όλα τα δεδομένα για τον συγκεκριμένο σπουδαστή. Αν αναθέσετε ξανά το σύνολο ασκήσεων, ο σπουδαστής θα λάβει νέα εκδοχή για κάθε πρόβλημα. Σιγουρεύετε την επιλογή σας πριν την αποεπιλογή των συνόλων ασκήσεων."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:87
+msgid "Wiki summary page for MathObjects"
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:444
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:167
+msgid "Will open on %1."
+msgstr "Ανοίγει σε %1."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:49
+msgid "Word problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:15
+msgid "Worth"
+msgstr "Αξία"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:51
+msgid "Write a new PG problem file or edit an existing one."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:188
+msgid ""
+"Write permissions have not been enabled for \"%1\".  Changes must be saved "
+"to another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:630
+msgid ""
+"Write permissions have not been enabled for \"%1\". Changes must be saved to"
+" another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:182
+msgid ""
+"Write permissions have not been enabled in \"%1\".  Changes must be saved to"
+" a different directory for viewing."
+msgstr ""
+
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:624
+msgid ""
+"Write permissions have not been enabled in \"%1\".Changes must be saved to a"
+" different directory for viewing."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:178
+msgid ""
+"Write permissions have not been enabled in the templates directory.  No "
+"changes can be made."
+msgstr "Έχουν απενεργοποιηθεί δικαιώματα γραφής για δείγμα καταλόγου. Αλλαγές μη δεκτές."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:620
+msgid ""
+"Write permissions have not been enabled in the templates directory. No "
+"changes can be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:287
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:330
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:509
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:82
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:657
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:67
+msgid "Yes"
+msgstr "Ναι"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:454
+msgid ""
+"You are currently checking answers to a different version of your problem - "
+"these will not be recorded, and you should remember to return to your "
+"original problem once you are done here."
+msgstr "Αυτή τη στιγμή ελέγχετε απαντήσεις για διαφορετική εκδοχή του προβλήματος - αυτές δεν καταγράφονται, και θα πρέπει να ανατρέξετε στο αρχικό πρόβλημα μετά την ολοκλήρωσή σας εδώ."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:470
+msgid ""
+"You are currently previewing answers to a different version of your problem "
+"- these will not be recorded, and you should remember to return to your "
+"original problem once you are done here."
+msgstr "Αυτή τη στιγμή βλέπετε την προεπισκόπηση απαντήσεων διαφορετικής εκδοχής του προβλήματός σας - αυτές δεν καταγράφονται, και θα πρέπει να ανατρέξετε στο αρχικό πρόβλημα μόλις ολοκληρώσετε εδώ."
+
+#. ($ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:18
+msgid ""
+"You are in the Reduced Scoring Period.  All work counts for %1% of the "
+"original."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:183
+msgid "You are not allowed to act as a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:188
+msgid "You are not allowed to assign homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:383
+msgid "You are not allowed to delete %1."
+msgstr ""
+
+#. ($userSet->set_id, $c->tx->remote_address)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:261
+msgid ""
+"You are not allowed to generate a hardcopy for %1 from your IP address, %2."
+msgstr "Δεν επιτρέπεται η δημιουργία έντυπου αντιγράφου για %1 από τη διεύθυνση IP σας, %2."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:185
+msgid "You are not allowed to modify homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:191
+msgid "You are not allowed to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:4
+msgid "You are not allowed to send e-mail."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:2
+msgid "You are not authorized to access instructor tools"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:4
+msgid "You are not authorized to access instructor tools."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:9
+msgid "You are not authorized to assign homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:10
+msgid "You are not authorized to create or delete courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:2
+msgid "You are not authorized to edit achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:28
+msgid "You are not authorized to edit user specific information."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:37
+msgid "You are not authorized to grade homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:8
+msgid "You are not authorized to manage course files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:33
+msgid "You are not authorized to modify homework sets."
+msgstr "Δεν επιτρέπεται η αλλαγή συνόλου ασκήσεων εργασίας."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:35
+msgid "You are not authorized to modify problems."
+msgstr "Δεν έχετε πρόσβαση στη τροποποίηση προβλημάτων."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:39
+msgid "You are not authorized to modify set definition files."
+msgstr "Δεν επιτρέπεται η αλλαγή αρχείων προσδιορισμού συνόλου ασκήσεων."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:15
+msgid "You are not authorized to modify student data"
+msgstr "Δεν επιτρέπεται η τροποποίηση δεδομένων σπουδαστή"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:11
+msgid "You are not authorized to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:3
+msgid "You are not authorized to modify the course configuration."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:230
+msgid "You are not authorized to perform this action."
+msgstr "Δεν επιτρέπεται η εκτέλεση αυτής της ενέργειας."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:11
+msgid "You are not authorized to score sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:13
+msgid "You are not authorized to send mail to students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:11
+msgid "You are not authorized to update lti scores"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers.html.ep:8
+msgid "You are not authorized to view past answers"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:251
+msgid ""
+"You are not permitted to generate a hardcopy for a set with hidden work."
+msgstr "Δεν επιτρέπεται η δημιουργία έντυπου αντιγράφου για ένα σύνολο ασκήσεων με κρυφή εργασία."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:236
+msgid "You are not permitted to generate a hardcopy for an unopened set."
+msgstr "Δεν επιτρέπεται η δημιουργία έντυπου αντιγράφου για ένα σφραγισμένο σύνολο ασκήσεων."
+
+#. ($showMeAnother{MaxReps},						$solutionShown)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:532
+msgid ""
+"You are only allowed to click on Show Me Another %quant(%1,time,times) per "
+"problem. %2 Close this tab, and return to the original problem."
+msgstr "Επιτρέπεται μόνο η επιλογή \"Δείξε Παρόμοιο Πρόβλημα\" %quant(%1,φορά,φορές) για κάθε πρόβλημα. %2 Κλείστε την καρτέλα, κι επιστρέψτε στο αρχικό πρόβλημα."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:265
+msgid "You are out of time!"
+msgstr "Είστε εκτός χρόνου!"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:36
+msgid "You can also examine the following temporary files: "
+msgstr "Μπορείτε επίσης να ελέγξετε τα ακόλουθα προσωρινά αρχεία: "
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:108
+msgid ""
+"You can assign selected achievements to all users by using the \"Assign\" "
+"action action and selecting which achievements to assign.  You can select "
+"which users to assign/unassign to an achievement by clicking on the link in "
+"the \"Edit Users\" column."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1039
+msgid ""
+"You can change the file path for this problem manually from the \"Hmwk Sets "
+"Editor\" page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:27
+msgid ""
+"You can check the boxes to the right of the sets and click \"Generate "
+"Hardcopy for Selected Sets\" to generate a PDF hardcopy of the selected "
+"sets. You can generate hardcopies for multiple users including their answers"
+" as well. Note that students will only be able to generate hardcopies of a "
+"single set at a time. Students will only be able to include answers in the "
+"hardcopy after the answer date."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:127
+msgid ""
+"You can delete problems by clicking the \"Delete it?\" check box and saving."
+" If the set is already active it is recommended that you instead use the "
+"\"Mark Correct?\" problem to mark a particular problem correct for all "
+"students."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGanswermacros.pl:1616
+msgid "You can earn partial credit on this problem."
+msgstr "Μπορείτε να κερδίσετε μερική πίστωση σε αυτό το πρόβλημα."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:142
+msgid ""
+"You can edit a problem by clicking the \"Edit Problem\" icon to the right of"
+" the problem number. This will open the problem in the PG problem editor in "
+"a new tab or window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:92
+msgid ""
+"You can edit a single achievement by clicking on the pencil icon next to the"
+" achievement ID.  You can edit multiple achievements by selecting which "
+"achievements to edit, then click the \"Edit\" button. You can edit all of "
+"the achievements by changing which achievements to edit form \"selected "
+"achievements\" to \"all achievements\", or click the checkbox next to the "
+"Achievement ID to select all achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:44
+msgid ""
+"You can edit the class list data for a single student by clicking on the "
+"pencil icon next to their login name. To edit several students at once click"
+" on the \"Select\" checkbox next to their names, click on the radio button "
+"for editing selected users and then click the \"Edit\" button. You can also "
+"edit all visible users (those students currently being displayed) or even "
+"all users in the course although this last option might take a long time to "
+"load for a large class."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:397
+msgid "You can get a new version of this problem after the due date."
+msgstr "Μπορείτε να λάβετε νέα εκδοχή του προβλήματος μετά την ημερομηνία λήξης."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:101
+msgid ""
+"You can import/export from their respective action tab.  Exporting saves "
+"information about the achievement as a .axp file which is a CSV that lists "
+"each achievements information.  You can import .axp files that have been "
+"previously exported."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:769
+msgid "You can not specify an absolute path"
+msgstr "Δεν μπορείτε να ορίσετε μια απόλυτη διαδρομή"
+
+#. ($action)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:549
+msgid "You can only %1 one file at a time."
+msgstr "Μπορείτε μόνο %1 ένα αρχείο κάθε φορά."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:92
+msgid "You can only download regular files."
+msgstr "Μπορείτε να κατεβάσετε μόνο κανονικά αρχεία."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:197
+msgid "You can only edit text files"
+msgstr "Μπορείτε να επεξεργαστείτε μόνο αρχεία κειμένου"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:374
+msgid "You can only unpack files ending in \".tgz\", \".tar\" or \".tar.gz\""
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:134
+msgid ""
+"You can render a problem by clicking the \"Render Problem\" icon to the "
+"right of the problem number. The display mode used to render the problem is "
+"chosen using the drop down menu. You can render all problems using the "
+"\"Render All\" button. \"Hide All\" will hide all rendered problems. It is "
+"also useful to collapse problem details when doing this, as it makes it "
+"easier to drag problems around."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:120
+msgid ""
+"You can reorder problems by clicking on the arrow icon and dragging the "
+"problem. You will see a box showing you where the problem will be placed. "
+"When problems are reordered any holes in the numbering will be filled in."
+msgstr ""
+
+#. ($showMeAnother{MaxReps} >= $showMeAnother{Count}
+#. ? ($showMeAnother{MaxReps} - $showMeAnother{Count})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:44
+msgid ""
+"You can use this feature %quant(%1,more time,more times,as many times as you"
+" want) on this problem"
+msgstr "Μπορείτε να χρησιμοποιήσετε τη λειτουργία %quant(%1, περισσότερος χρόνος,περισσότερες φορές,όσες φορές θέλετε) σε αυτό το πρόβλημα"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:439
+msgid "You can't download directories"
+msgstr "Δεν δύναται λήψη καταλόγων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:440
+msgid "You can't download files of that type"
+msgstr "Δεν δύναται λήψη αρχείων αυτού του τύπου"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:192
+msgid "You can't edit a directory"
+msgstr "Δεν δύναται η επεξεργασία καταλόγου"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
+msgid "You can't view files of that type"
+msgstr "Δεν δύναται η προβολή αρχείων τέτοιου τύπου"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:985
+msgid "You cannot archive the course you are currently using."
+msgstr "Μη εφικτή η αρχειοθέτηση του μαθήματος που χρησιμοποιείτε τώρα."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:850
+msgid "You cannot delete the course you are currently using."
+msgstr "Μη εφικτή η διαγραφή του μαθήματος που χρησιμοποιείτε τώρα."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:378
+msgid "You cannot delete yourself!"
+msgstr "Μη εφικτή η αυτοδιαγραφή!"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:579
+msgid "You did not specify a new set name."
+msgstr "Δεν ορίσατε νέο όνομα συνόλου ασκήσεων."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:232
+msgid "You didn't enter any message."
+msgstr "Δεν εισαγάγατε κανένα μήνυμα."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:303
+msgid "You do not have permission to access the requested file \"%1\"."
+msgstr "Δεν έχετε άδεια πρόσβασης στο ζητούμενο αρχείο \"%1\"."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:159
+msgid "You do not have permission to change the hardcopy theme."
+msgstr "Δεν έχετε άδεια να αλλάξετε το θέμα του έντυπου αντίγραφου."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:186
+msgid "You do not have permission to edit this file."
+msgstr "Δεν έχετε άδεια να επεξεργαστείτε αυτό το αρχείο."
+
+#. ($hardcopy_format)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:151
+msgid "You do not have permission to generate hardcopy in %1 format."
+msgstr "Δεν έχετε άδεια δημιουργίας έντυπου αντιγράφου σε %1 μορφή."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1161
+msgid "You do not have permission to view the details of this error."
+msgstr "Δεν έχετε άδεια να δείτε λεπτομέρειες του σφάλματος."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements.html.ep:13
+msgid "You don't have any Achievement data associated to you!"
+msgstr "Δεν υπάρχουν Δεδομένα Επιτευγμάτων που να σχετίζονται με εσάς!"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:51
+msgid "You don't have any rewards!"
+msgstr "Δεν έχετε επιβραβεύσεις!"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:325
+msgid "You exceeded the allowed time."
+msgstr "Έχετε υπερβεί τον επιτρεπόμενο χρόνο."
+
+#. ($c->{numAttemptsLeft})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:277
+msgid "You have %1 attempt(s) remaining on this test."
+msgstr "Απομένουν %1 προσπάθεια(ες) σε αυτό το τεστ."
+
+#. ($c->{numAttemptsLeft},								$c->{numAttemptsLeft} - 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:664
+msgid ""
+"You have %1 submissions remaining for this test.  If you say yes, then you "
+"will have %quant(%2,submission) remaining. Once all submissions have been "
+"used, your answers will be final and you will not be able to continue to "
+"work this test version."
+msgstr "Απομένουν %1 υποβολές για αυτό το τεστ.  Αν πατήσετε ναι, τότε θα απομείνουν %quant(%2,υποβολές) . Μόλις αξιοποιηθούν όλες οι υποβολές, οι απαντήσεις σας θα είναι τελικές, και δεν θα μπορείτε να συνεχίσετε σε αυτή την εκδοχή του τεστ."
+
+#. ($problem->max_attempts - $attempts)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1270
+msgid "You have %negquant(%1,unlimited attempts,attempt,attempts) remaining."
+msgstr "Απομένουν %negquant(%1,απεριόριστες προσπάθειες,προσπάθεια,προσπάθειες)."
+
+#. ($attempts_before_rr)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1217
+msgid ""
+"You have %quant(%1,attempt,attempts) left before new version will be "
+"requested."
+msgstr "Απομένουν %quant(%1,προσπάθεια,προσπάθειες) προτού ζητηθεί η νέα έκδοση."
+
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:44
+msgid ""
+"You have %quant(%1,hour) and %quant(%2,minute) remaining to complete the "
+"currently open test."
+msgstr "Απομένουν %quant(%1,ώρα) και %quant(%2,λεπτά) για την ολοκλήρωση του ανοιχτού τεστ."
+
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:54
+msgid ""
+"You have %quant(%1,hour,hours,)%quant(%2,minute,minutes,) remaining to "
+"complete the currently open test."
+msgstr "Απομένουν %quant(%1, ώρα, ώρες)%quant(%2,λεπτό,λεπτά,) προς ολοκλήρωση τρέχοντος ανοιχτού τεστ."
+
+#. ($minutes,							$seconds)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:64
+msgid ""
+"You have %quant(%1,minute) and %quant(%2,second) remaining to complete the "
+"currently open test."
+msgstr "Απομένουν %quant(%1,λεπτό) and %quant(%2,δευτερόλεπτο)προς ολοκλήρωση τρέχοντος ανοικτού τεστ."
+
+#. ($seconds)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:72
+msgid ""
+"You have %quant(%1,second) remaining to complete the currently open test."
+msgstr "Απομένει %quant(%1,δευτερόλεπτο) προς ολοκλήρωση τρέχοντος ανοικτού τεστ"
+
+#. ($attempts)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1243
+msgid "You have attempted this problem %quant(%1,time,times)."
+msgstr "Επιχειρήσατε αυτό το πρόβλημα: %quant(%1,φορά,φορές)."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:1
+msgid "You have been logged out of WeBWorK."
+msgstr "Έχετε αποσυνδεθεί από το WeBWorK."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:260
+msgid "You have less than 1 minute to complete this test."
+msgstr "Έχετε λιγότερο από 1' για την ολοκλήρωση του τεστ."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:241
+msgid "You have less than 45 seconds left!"
+msgstr "Απομένουν λιγότερο από 45 δευτερόλεπτα!"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:240
+msgid ""
+"You have less than 90 seconds left to complete this assignment. You should "
+"finish it soon!"
+msgstr "Έχετε λιγότερο από 90'' για να ολοκληρώσετε αυτή την εργασία. Πρέπει να την τελειώσετε σύντομα!"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:452
+msgid "You have not chosen a file to upload."
+msgstr "Δεν έχει επιλεγεί φάκελος για μεταφόρτωση."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
+msgid "You have requested that the following items be deleted"
+msgstr "Έχετε αιτηθεί διαγραφή των ακόλουθων αρχείων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:565
+msgid "You have specified an illegal file"
+msgstr "Έχετε ορίσει ένα μη έγκυρο αρχείο"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:766
+msgid "You have specified an illegal path"
+msgstr "Έχετε ορίσει μια μη έγκυρη διαδρομή"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:13
+msgid "You have specified an illegal working directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:481
+msgid ""
+"You may check your answers to this problem without affecting the maximum "
+"number of tries to your original problem."
+msgstr "Ελέγχετε τις απαντήσεις σας σ' αυτό πρόβλημα χωρίς να επηρεαστεί ο μέγιστος αριθμός προσπαθειών για το αρχικό πρόβλημα."
+
+#. ($multiuser ? 'to privileged users or' : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:69
+msgid ""
+"You may choose to show any of the following data. Correct answers, hints, "
+"and solutions are only available %1 after the answer date of the homework "
+"set."
+msgstr "Επιλέξτε να είναι ορατά τα ακόλουθα δεδομένα. Σωστές απαντήσεις, στοιχεία, και λύσεις είναι διαθέσιμα %1 μετά την ημερομηνία απάντησης του συνόλου ασκήσεων που είχαν ανατεθεί ως εργασία."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:63
+msgid "You may not change this user's password!"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:646
+msgid "You may not change your answers when going on to the next part!"
+msgstr "Μη δεκτές αλλαγές σε απαντήσεις αν συνεχίσετε στο επόμενο μέρος!"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:58
+msgid "You may not change your own password here!"
+msgstr "Μην αλλάζετε τον κωδικό πρόσβασής σας εδώ!"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:560
+msgid "You may not follow symbolic links"
+msgstr "Μην ακολουθείτε συμβολικούς συνδέσμους"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:350
+msgid "You may still check your answers."
+msgstr "Επιτρεπεται ο έλεγχος των απαντήσεών σας."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:143
+msgid ""
+"You may want to create an unattached problem if you are using the current "
+"problem as a model for a new problem. You can add the new file to a homework"
+" set from the Library Browser or via the set detail page of the Hmwk Sets "
+"Editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:165
+msgid ""
+"You might want to do this if you want to give full credit to everyone on a "
+"particular problem that was not worded correctly, or wasn't working "
+"properly. This is done from the \"Hmwk Sets Editor\" page or the "
+"\"Instructor Tools\" page."
+msgstr ""
+
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:8
+msgid "You must access assignments from your Course Management System (%1)."
+msgstr "Αποκτήστε πρόσβαση στις εργασίες από το Σύστημα Διαχείρισης Μαθημάτων (%1)."
+
+#. ($showMeAnother{TriesNeeded})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:67
+msgid ""
+"You must attempt this problem %quant(%1,time) before this feature is "
+"available"
+msgstr ""
+
+#. ($showMeAnother{TriesNeeded})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:545
+msgid ""
+"You must attempt this problem %quant(%1,time,times) before Show Me Another "
+"is available."
+msgstr "Προσπαθήστε αυτό το πρόβλημα %quant(%1,φορά, φορές) προτού το Εμφάνισε Άλλο γίνει διαθέσιμο."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:259
+msgid "You must confirm the password for the initial instructor."
+msgstr "Επιβεβαιώστε τον κωδικό πρόσβασης για τον αρχικό καθηγητή."
+
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? $c->link_to(                                                  $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:195
+msgid "You must log into this set via your Learning Management System (%1)."
+msgstr "Συνδεθείτε σε αυτό το σύνολο ασκήσεων μέσω του Συστήματος Διαχείρισης (%1)."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:979
+msgid "You must select a course to archive"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:585
+msgid "You must select a course to rename."
+msgstr "Πρέπει να επιλέξετε ένα μάθημα για μετονομασία."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:351
+msgid "You must select at least one file for the archive"
+msgstr "Πρέπει να επιλέξετε τουλάχιστον ένα φάκελο για αρχειοθέτηση"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:312
+msgid "You must select at least one file to delete"
+msgstr "Πρέπει να επιλέξετε τουλάχιστον ένα φάκελο για διαγραφή"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:106
+msgid "You must select one or more sets for scoring!"
+msgstr "Πρέπει να επιλέξετε ένα ή παραπάνω σύνολα ασκήσεων για βαθμολόγηση!"
+
+#. ($object)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:749
+msgid "You must specify a %1 name"
+msgstr "Πρέπει να ορίσετε %1 όνομα"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:242
+msgid "You must specify a course ID."
+msgstr "Πρέπει να ορίσετε κωδικό μαθήματος."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2086
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:848
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:983
+msgid "You must specify a course name."
+msgstr "Πρέπει να ορίσετε όνομα μαθήματος."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:775
+msgid "You must specify a file name"
+msgstr "Πρέπει να ορίσετε όνομα αρχείου"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:586
+msgid "You must specify a file name in order to save a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:265
+msgid "You must specify a first name for the initial instructor."
+msgstr "Πρέπει να ορίσετε όνομα του αρχικού καθηγητή."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:268
+msgid "You must specify a last name for the initial instructor."
+msgstr "Πρέπει να ορίσετε επώνυμο του αρχικού καθηγητή."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:606
+msgid "You must specify a new institution for the course."
+msgstr "Πρέπει να ορίσετε νέο ίδρυμα για το μάθημα."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:588
+msgid "You must specify a new name for the course."
+msgstr "Πρέπει να ορίσετε νέο όνομα για το μάθημα."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:603
+msgid "You must specify a new title for the course."
+msgstr "Πρέπει να ορίσετε νέο τίτλο για το μάθημα."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:256
+msgid "You must specify a password for the initial instructor."
+msgstr "Πρέπει να ορίσετε κωδικό πρόσβασης για τον αρχικό καθηγητή."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:440
+msgid "You must specify a user ID."
+msgstr "Πρέπει να ορίσετε κωδικό χρήστη."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:271
+msgid "You must specify an email address for the initial instructor."
+msgstr "Πρέπει να ορίσετε ηλεκτρονική διεύθυνση του αρχικού καθηγητή."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:138
+msgid "You must specify an file name in order to save a new file."
+msgstr "Πρέπει να ορίσετε όνομα αρχείου ώστε να αποθηκευτεί το νέο αρχείο."
+
+#. ($LMS)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:505
+msgid ""
+"You must use your Learning Management System (%1) to access this set.  Try "
+"logging in to the Learning Management System and visiting the set from "
+"there."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
+msgid "You need to select a \"Target Set\" before you can edit it."
+msgstr "Πρέπει να επιλέξετε ένα Σύνολο Ασκήσεων πριν την επεξεργασία."
+
+#. ($action)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:554
+msgid "You need to select a file to %1."
+msgstr "Πρέπει να επιλέξετε ένα αρχείο για %1."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:555
+msgid "You need to select a set definition file to view."
+msgstr "Πρέπει να επιλέξετε αρχείο προσδιορισμού συνόλου ασκήσεων για προβολή."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:537
+msgid "You need to select a set from this course to view."
+msgstr "Πρέπει να επιλέξετε ένα σύνολο ασκήσεων αυτού του μαθήματος για προβολή."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:524
+msgid "You need to select a set to view."
+msgstr "Πρέπει να επιλέξετε ένα σύνολο ασκήσεων για προβολή."
+
+#. (wwRound(0,
+#. compute_reduced_score($ce, $problem, $set, $pg->{result}{score},
+#. $c->submitTime)
+#. (% wwRound(0, $rh_result->{problem_result}{score} * 100)
+#. (wwRound(0, $rh_result->{problem_result}{score} * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1251
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:48
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:29
+msgid "You received a score of %1 for this attempt."
+msgstr "Συγκεντρώσατε σκορ %1 γι' αυτή την προσπάθεια."
+
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1363
+msgid ""
+"You will not be able to proceed to problem %1 until you have completed, or "
+"run out of attempts, for this problem and its graded subproblems."
+msgstr "Δεν μπορείτε να προχωρήσετε στο πρόβλημα %1 μέχρι να ολοκληρώσετε ή να εξαντλήσετε τις προσπάθειες για το ενεργό πρόβλημα και τα βαθμολογημένα υποερωτήματά του."
+
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1375
+msgid ""
+"You will not be able to proceed to problem %1 until you have completed, or "
+"run out of attempts, for this problem."
+msgstr "Δε μπορείτε να συνεχίσετε στο πρόβλημα %1 μέχρι να ολοκληρώσετε, ή να ξεμείνετε από προσπάθειες, γι' αυτό."
+
+#. ($object)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:740
+msgid "Your %1 name contains illegal characters"
+msgstr "Το όνομά σας%1 έχει μη έγκυρους χαρακτήρες"
+
+#. ($object)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:743
+msgid "Your %1 name may not begin with a dot"
+msgstr "Το %1 όνομά σας να μην ξεκινά με τελεία"
+
+#. ($object)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:746
+msgid "Your %1 name may not contain a path component"
+msgstr "To όνομά σας %1 δεν πρέπει να περιέχει στοιχεία διαδρομής"
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3162
+msgid "Your browser does not support the video tag."
+msgstr "Ο περιηγητής σας δεν υποστηρίζει την ετικέτα βίντεο."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:134
+msgid "Your display options have been saved."
+msgstr "Οι επιλογές σας έχουν αποθηκευτεί."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
+msgid "Your email address has been changed."
+msgstr "Η διεύθυνση email σας έχει αλλάξει."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:772
+msgid "Your file name contains illegal characters"
+msgstr "Το όνομα αρχείου έχει μη έγκυρους χαρακτήρες"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:40
+msgid "Your file name is not valid! "
+msgstr "Το όνομα του αρχείου σας δεν είναι έγκυρο! "
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:16
+msgid "Your message was sent successfully."
+msgstr "Το μήνυμά σας στάλθηκε επιτυχώς."
+
+#. (wwRound(0, $problem->status * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1261
+msgid "Your overall recorded score is %1.  %2"
+msgstr "Συνολικό καταγεγραμμένο σκορ: %1.  %2"
+
+#. ('<span id="test-recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:179
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:197
+msgid "Your recorded score for this version is %1/%2 (%3%)."
+msgstr ""
+
+#. ($setVersionID,                                         '<span id="test-
+#. recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:317
+msgid "Your recorded score on this test (version %1) is %2/%3 (%4%)."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:634
+msgid "Your score for this attempt is for this part only;"
+msgstr "Το σκορ σας σε αυτήν την προσπάθεια είναι μόνο για αυτό το μέρος˙"
+
+#. ($testNounNum)
+# $testNounNum is either "test (#)" or "submission (#)"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:142
+msgid "Your score on this %1 WAS recorded."
+msgstr "Το σκορ σας σε αυτό %1 καταγράφηκε."
+
+#. ($testNoun, $c->{attemptScore}, $c->{totalPossible})
+# $testNoun is either "test" or "submission"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:148
+msgid "Your score on this %1 is %2/%3."
+msgstr "Ο βαθμός σας σε αυτό %1 είναι %2/%3."
+
+#. ($testNounNum)
+# $testNounNum is either "test (#)" or "submission (#)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:138
+msgid "Your score on this %1 was NOT recorded."
+msgstr "Ο βαθμός σας σε αυτό %1 ΔΕΝ καταγράφηκε."
+
+#. ($c->{attemptScore}, $c->{totalPossible})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:192
+msgid "Your score on this (checked, not recorded) submission is %1/%2."
+msgstr "Το σκορ (ελέγχεται, δεν καταγράφεται) σε αυτήν την υποβολή είναι %1/%2."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1027
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:172
+msgid ""
+"Your score was not recorded because there was a failure in storing the "
+"problem record to the database."
+msgstr "Το σκορ σας δεν καταγράφηκε, επειδή απέτυχε η αποθήκευση του αρχείου του προβλήματος στη βάση δεδομένων."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:276
+msgid "Your score was not recorded because this homework set is closed."
+msgstr "Το σκορ σας δεν καταγράφηκε, επειδή αυτή η ομάδα καθηκόντων είναι κλειστή."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:283
+msgid ""
+"Your score was not recorded because this problem has not been assigned to "
+"you."
+msgstr "Το σκορ σας δεν καταγράφηκε, επειδή αυτό το πρόβλημα δεν σας έχει ανατεθεί."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1049
+msgid ""
+"Your score was not recorded because this problem set version is not open."
+msgstr "Το σκορ σας δεν καταγράφηκε, επειδή αυτή η καθορισμένη μορφή προβλημάτων είναι κλειστή."
+
+#. ($elapsed,                                              # Assume the
+#. allowed time is an even number of minutes.
+#. ($set->due_date - $set->open_date)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1063
+msgid ""
+"Your score was not recorded because you have exceeded the time limit for "
+"this test. (Time taken: %1 min; allowed: %2 min.)"
+msgstr "Το σκορ σας δεν καταγράφηκε, επειδή έχετε υπερβεί το χρονικό όριο για αυτό το τεστ. (Χρόνος που χρειάστηκε: %1 λ.· επιτρέπεται: %2 λ.)"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1052
+msgid ""
+"Your score was not recorded because you have no attempts remaining on this "
+"set version."
+msgstr "Το σκορ σας δεν καταγράφηκε, επειδή δεν απομένουν προσπάθειες σε αυτή την καθορισμένη έκδοση."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1067
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:278
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:53
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:31
+msgid "Your score was not recorded."
+msgstr "Το σκορ σας δεν καταγράφηκε."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:163
+msgid "Your score was not successfully sent to the LMS."
+msgstr "Το σκορ σας στάλθηκε ανεπιτυχώς στο LMS."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:170
+msgid "Your score was recorded."
+msgstr "Το σκορ σας καταγράφηκε."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:162
+msgid "Your score was successfully sent to the LMS."
+msgstr "Το σκορ σας στάλθηκε επιτυχώς στο LMS."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:540
+msgid "Your session has timed out due to inactivity. Please log in again."
+msgstr "Αποσυνδεθήκατε λόγω αδράνειας. Παρακαλούμε συνδεθείτε ξανά."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:17
+msgid "a duplicate of the first selected achievement"
+msgstr ""
+
+# Context is "Create set ______ as a duplicate of the first selected set"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:17
+msgid "a duplicate of the first selected set"
+msgstr "αντίγραφο του πρώτου επιλεγμένου συνόλου ασκήσεων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:16
+msgid "a new empty achievement"
+msgstr ""
+
+# Context is "Create set ______ as a new empty set"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:16
+msgid "a new empty set"
+msgstr "ένα νέο κενό σύνολο ασκήσεων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:9
+msgid "a single set"
+msgstr "ένα ενιαίο σύνολο ασκήσεων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:130
+msgid "add problems"
+msgstr "προσθέστε προβλήματα"
+
+#. ($setName, $@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
+msgid "addGlobalSet %1 in ProblemSetList:  %2"
+msgstr "addGlobalSet %1 in ProblemSetList:  %2"
+
+# #short for administrator
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
+msgid "admin"
+msgstr "διαχειριστής"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:7
+msgid "all achievements"
+msgstr "όλα τα επιτεύγματα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:66
+msgid "all current users"
+msgstr "όλοι οι τρέχοντες χρήστες"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:70
+msgid "all set dates for one <b>user</b>"
+msgstr "όλες οι καθορισμένες ημερομηνίες για έναν <b>χρήστη</b>"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1995
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:7
+msgid "all sets"
+msgstr "όλα τα σύνολα ασκήσεων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1981
+msgid "all students"
+msgstr "όλοι οι σπουδαστές"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:6
+msgid "all users"
+msgstr "όλοι οι χρήστες"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:120
+msgid "all users for one <b>set</b>"
+msgstr "όλοι οι χρήστες για ένα <b>σύνολο ασκήσεων</b>"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:23
+msgid "alphabetically"
+msgstr "αλφαβητικά"
+
+#. ($count, $numSets)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1999
+msgid "an impossible number of sets: %1 out of %2"
+msgstr "ένας αδύνατος αριθμός συνόλων ασκήσεων: %1 από %2"
+
+#. ($count, $numUsers)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1985
+msgid "an impossible number of users: %1 out of %2"
+msgstr "ένας αδύνατος αριθμός χρηστών: %1 από %2"
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:610
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:621
+msgid "answer"
+msgstr "απάντηση"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:30
+msgid "any users"
+msgstr "κάποιοι χρήστες"
+
+# Context is "Append ____ blank problem template(s) to end of homework set"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:689
+msgid "blank problem template(s) to end of homework set"
+msgstr "δείγμα(τα) κενού προβλήματος στο τέλος των καθηκόντων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:24
+msgid "by last login date"
+msgstr "από την τελευταία ημ/νία εισόδου"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:688
+msgid "changes abandoned"
+msgstr "οι αλλαγές εγκαταλείφθηκαν"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:633
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:795
+msgid "changes saved"
+msgstr "αποθήκευση αλλαγών"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:80
+msgid "class list data for selected <b>users</b>"
+msgstr "δεδομένα καταλόγου για επιλεγμένους <b>χρήστες</b>"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:31
+msgid "close"
+msgstr "λήξη"
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
+msgid "column"
+msgstr "στήλη"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:239
+msgid "correct"
+msgstr "σωστό"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:239
+msgid "course files"
+msgstr "αρχεία μαθήματος"
+
+#. ($num)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:458
+msgid "deleted %1 sets"
+msgstr "διαγράφηκαν %1 σύνολα ασκήσεων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:152
+msgid "editing all achievements"
+msgstr "αλλαγή όλων των επιτευγμάτων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:333
+msgid "editing all sets"
+msgstr "αλλαγή όλων των σύνολων ακήσεων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:328
+msgid "editing all users"
+msgstr "αλλαγή όλων των χρηστών"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:336
+msgid "editing listed sets"
+msgstr "αλλαγή συνόλων λίστας"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:154
+msgid "editing selected achievements"
+msgstr "αλλαγή επιλεγμένων επιτευγμάτων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:339
+msgid "editing selected sets"
+msgstr "αλλαγή των επιλεγμένων συνόλων ασκήσεων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:334
+msgid "editing selected users"
+msgstr "αλλαγή επιλεγμένων χρηστών"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:331
+msgid "editing visible users"
+msgstr "αλλαγή ορατών χρηστών"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:90
+msgid "email address"
+msgstr "διεύθυνση email"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:42
+msgid "empty"
+msgstr "κενό"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:10
+msgid "enter matching set IDs below"
+msgstr "εισαγάγετε αντίστοιχους κωδικούς παρακάτω"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:31
+msgid "entry rows."
+msgstr "γραμμές εισόδου."
+
+#. ($restrictLoc, $setName, $@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:904
+msgid "error adding set location %1 for set %2: %3"
+msgstr "σφάλμα κατά την προσθήκη καθορισμένης θέσης %1 για το σύνολο ακήσσεων %2: %3"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:542
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:643
+msgid "export abandoned"
+msgstr "εξαγωγή εγκαταλελειμμένων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:527
+msgid "exporting all achievements"
+msgstr "εξαγωγή όλων των επιτευγμάτων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:530
+msgid "exporting selected achievements"
+msgstr "εξαγωγή επιλεγμένων επιτευγμάτων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:89
+msgid "first name"
+msgstr "όνομα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:72
+msgid "for"
+msgstr "για"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:149
+msgid "for one <b>set</b>"
+msgstr "για ένα <b>σύνολο ασκήσεων</b>"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:103
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:94
+msgid "for one <b>user</b>"
+msgstr "για έναν <b>χρήστη</b>"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:349
+msgid "giving new passwords to all users"
+msgstr "παροχή νέων κωδικών σε όλους τους χρήστες"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:355
+msgid "giving new passwords to selected users"
+msgstr "παροχή νέων κωδικών σε επιλεγμένους χρήστες"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:352
+msgid "giving new passwords to visible users"
+msgstr "παροχή νέων κωδικών σε ορατούς χρήστες"
+
+#. ($j, $setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1069
+msgid "global %1 for set %2 not found."
+msgstr "παγκοσμίως %1 για το σύνολο ασκήσεων %2 δε βρέθηκε."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
+msgid "grade_proctor"
+msgstr "grade_proctor"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
+msgid "guest"
+msgstr "επισκέπτης"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:949
+msgid "hidden"
+msgstr "κρυφό"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
+msgid "hidden from"
+msgstr "κρυφό από"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:217
+msgid "homework"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:83
+msgid "html directory"
+msgstr ""
+
+#. ('j', 'k', '_0')
+#. ('j', 'k')
+# doe snot need to be translated
+#: /opt/webwork/pg/lib/Parser/List/Vector.pm:39
+#: /opt/webwork/pg/lib/Value/Vector.pm:303
+#: /opt/webwork/pg/macros/contexts/contextLimitedVector.pl:95
+msgid "i"
+msgstr "άι"
+
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:840
+msgid "if"
+msgstr "εάν"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:622
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:721
+msgid "illegal character in input: '/'"
+msgstr "μη έγκυρος χαρακτήρας εισόδου: '/'"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:246
+msgid "incorrect"
+msgstr "λανθασμένο"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:441
+msgid "index"
+msgstr "ευρετήριο"
+
+#. ($restrictLoc, $setName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:911
+msgid "input set location %1 already exists for set %2."
+msgstr "εισαγωγή σετ τοποθεσιών %1 υπάρχει ήδη για το ορισμό %2."
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:551
+msgid "insufficient permission to edit %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:220
+msgid "just-in-time"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:88
+msgid "last name"
+msgstr "επώνυμο"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:9
+msgid "listed sets"
+msgstr "σύνολα της λίστας "
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:87
+msgid "locations selected below"
+msgstr "επιλεγμένες τοποθεσίες κάτω"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:59
+msgid "login"
+msgstr "σύνδεση"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
+msgid "login ID"
+msgstr "ΚΩΔΙΚΟΣ ΣΥΝΔΕΣΗΣ"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:94
+msgid "login name"
+msgstr "όνομα σύνδεσης"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
+msgid "login_proctor"
+msgstr "proctor_σύνδεσης"
+
+# Context is "Set _____ made visibile for _____ users"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
+msgid "made visible for"
+msgstr "έγινε ορατό για"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:493
+msgid "max"
+msgstr "μέγ"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:10
+msgid "multiple sets"
+msgstr "πολλαπλά σύνολα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:171
+msgid "new set:"
+msgstr "νέο σύνολο ασκήσεων:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:109
+msgid "new users"
+msgstr "νέοι χρήστες"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:6
+msgid "no achievements"
+msgstr "χωρίς επιτεύγματα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:86
+msgid "no location"
+msgstr "καμία τοποθεσία"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1993
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:6
+msgid "no sets"
+msgstr "κανένα σύνολο ασκήσεων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1979
+msgid "no students"
+msgstr "κανείς σπουδαστής"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:31
+msgid "no users"
+msgstr "κανείς χρήστης"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/permission.pm:26
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
+msgid "nobody"
+msgstr "κανείς"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:114
+msgid "nth colum of merge file"
+msgstr "νιοστή στήλη συγχώνευσης αρχείου"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:70
+msgid "of"
+msgstr "από"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:128
+msgid "one <b>set</b>"
+msgstr "ένα <b>σύνολο ασκήσεων</b>"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:225
+msgid "one <b>set</b> for <b>users</b>"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:211
+msgid "one <b>user</b> (on one <b>set</b>)"
+msgstr "ένας <b>χρήστης</b> (σε ένα <b>σύνολο ασκήσεων</b>)"
+
+# Context is Assign this set to which users?  "only ____"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:67
+msgid "only"
+msgstr "μόνο"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:17
+msgid "only best scores"
+msgstr "μόνο τα καλύτερα σκορ"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:88
+msgid "or"
+msgstr "ή"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:59
+msgid "or Problems from"
+msgstr "ή Προβλήματα από"
+
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:843
+msgid "otherwise"
+msgstr "αλλιώς"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:19
+msgid "overwrite"
+msgstr "αντικατάσταση"
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:627
+msgid "part"
+msgstr "μέρος"
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:499
+msgid "permissions for %1 not defined"
+msgstr "άδειες για %1 δεν καθορίστηκαν"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
+msgid "point"
+msgstr "σημείο"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
+msgid "points"
+msgstr "πόντοι"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:20
+msgid "preserve"
+msgstr "διατηρώ"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:576
+msgid "preview answers"
+msgstr "προεπισκόπηση απαντήσεων"
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:616
+msgid "problem"
+msgstr "πρόβλημα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:41
+msgid "problems"
+msgstr "προβλήματα"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:219
+msgid "proctored test"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
+msgid "professor"
+msgstr "καθηγητής"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:89
+msgid "progress"
+msgstr "πρόοδος"
+
+#. ($line)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1409
+msgid "readSetDef error, can't read the line: ||%1||"
+msgstr "readSetDef σφάλμα, δεν είναι δυνατή η ανάγνωση της γραμμής: ||%1||"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:93
+msgid "recitation"
+msgstr "ενισχυτική"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:53
+msgid "recitation #"
+msgstr "ενισχυτική #"
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:497
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:549
+msgid "record for visible user %1 not found"
+msgstr "ιστορικό ορατού χρήστη %1 δε βρέθηκε"
+
+#. ($restrictLoc)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:918
+msgid ""
+"restriction location %1 does not exist.  IP restrictions have been ignored."
+msgstr "η περιορισμένη θέση %1 δεν υπάρχει.  Οι IP περιορισμοί αγνοήθηκαν."
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
+msgid "row"
+msgstr "σειρά"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:91
+msgid "score"
+msgstr "βαθμός"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:92
+msgid "section"
+msgstr "ενότητα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:47
+msgid "section #"
+msgstr "τμήμα #"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:159
+msgid "selected <b>sets</b>"
+msgstr "επιλεγμένα <b>σετ</b>"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:197
+msgid "selected <b>users</b> to selected <b>sets</b>"
+msgstr "επιλεγμένοι <b>χρήστες</b> σε επιλεγμένα <b>σύνολα ασκήσεων</b>"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:8
+msgid "selected achievements"
+msgstr "επιλεγμένα επιτεύγματα"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:8
+msgid "selected sets"
+msgstr "επιλεγμένα σετ"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:8
+msgid "selected users"
+msgstr "επιλεγμένοι χρήστες"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:12
+msgid "sets hidden from students"
+msgstr "σύνολα ασκήσεων κρυμμένα από σπουδαστές"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:11
+msgid "sets visible to students"
+msgstr "σύνολα ασκήσεων ορατά στους σπουδαστές"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:281
+msgid "showing all sets"
+msgstr "εμφάνιση όλων των συνόλων ασκήσεων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:277
+msgid "showing all users"
+msgstr "εμφάνιση όλων των χρηστών"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:290
+msgid "showing matching sets"
+msgstr "εμφάνιση συνόλων ασκήσεων αντιστοίχισης"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:286
+msgid "showing matching users"
+msgstr "προβολή ταιριαστών χρηστών"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:284
+msgid "showing no sets"
+msgstr "δεν εμφανίζει σύνολα ασκήσεων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:280
+msgid "showing no users"
+msgstr "δεν εμφανίζει χρήστες"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:287
+msgid "showing selected sets"
+msgstr "εμφάνιση επιλεγμένων συνόλων ασκήσεων"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:283
+msgid "showing selected users"
+msgstr "εμφάνιση επιλεγμένων χρηστών"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:299
+msgid "showing sets that are hidden from students"
+msgstr "εμφάνιση συνόλων ασκήσεων που είναι κρυμμένα από τους σπουδαστές"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:296
+msgid "showing sets that are visible to students"
+msgstr "εμφάνιση συνόλων ασκήσεων που είναι ορατά στους σπουδαστές"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:72
+msgid "shown"
+msgstr "προβλήθηκε"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:162
+msgid "still open"
+msgstr "ακόμα ανοιχτό"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
+msgid "student"
+msgstr "σπουδαστής"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
+msgid "submission"
+msgstr "υποβολή"
+
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:133
+msgid "submission (version %1)"
+msgstr "υποβολή (εκδοχή %1)"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
+msgid "summary"
+msgstr "σύνοψη"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
+msgid "ta"
+msgstr "τα"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:90
+msgid "templates/email directory"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:95
+msgid "templates/macros directory"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
+msgid "test"
+msgstr "δοκιμή"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:23
+msgid "test date"
+msgstr "ημερομηνία δοκιμής"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:29
+msgid "test time"
+msgstr "χρόνος δοκιμασίας"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:119
+msgid "then delete them"
+msgstr "μετά διαγράψτε τα"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:165
+msgid "time limit exceeded"
+msgstr "υπέρβαση προθεσμίας"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:35
+msgid "time remaining"
+msgstr ""
+
+# Context is Assign ____ to _____
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:183
+msgid "to"
+msgstr "για"
+
+#. ($ce->{institutionName})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:399
+msgid "to %1 main web site"
+msgstr "στην %1 κύρια ιστοσελίδα"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:381
+msgid "to courses page"
+msgstr "στη σελίδα μαθημάτων"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:135
+msgid "to one <b>set</b>"
+msgstr "για ένα <b>σύνολο ασκήσεων</b>"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:432
+msgid "total"
+msgstr "σύνολο"
+
+#. ($ce->{webworkDirs}{logs})
+#. ($ce->{webworkDirs}{tmp})
+#. ($ce->{webworkDirs}{DATA})
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:47
+msgid "unable to write to directory %1"
+msgstr "αδυναμία εγγραφής στον κατάλογο %1"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:49
+msgid "unlimited"
+msgstr "απεριόριστο"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:14
+msgid "unlimited reusability"
+msgstr "απεριόριστη επαναχρησιμοποίηση"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:259
+msgid ""
+"username, last name, first name, section, achievement level, achievement "
+"score,"
+msgstr "όνομα χρήστη, επίθετο, όνομα, τμήμα, επίπεδο επίτευξης, βαθμός επίτευξης,"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:10
+msgid "users who match on selected field"
+msgstr "χρήστες που ταιριάζουν στο επιλεγμένο πεδίο"
+
+#. ($set->version_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:295
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:408
+msgid "version %1"
+msgstr ""
+
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:134
+msgid "version (%1)"
+msgstr "εκδοχή (%1)"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:820
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:951
+msgid "visible"
+msgstr "ορατό"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:7
+msgid "visible users"
+msgstr "ορατοί χρήστες"
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:485
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:500
+msgid "when you submit your answers"
+msgstr "όταν υποβάλλετε τις απαντήσεις σας"
+
+#. ($dir, $fileName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:623
+msgid "won't be able to read from file %1/%2: does it exist? is it readable?"
+msgstr "δεν θα μπορεί να διαβάσει από αρχείο %1/%2: υπάρχει; είναι αναγνώσιμο;"
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:638
+msgid "your overall score is for all the parts combined."
+msgstr "το συνολικό σκορ σας είναι για όλα τα μέρη που συνδυάζονται."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:231
+msgid "your students"
+msgstr "σπουδαστές σας"
diff --git a/lib/WeBWorK/Localize/en.po b/lib/WeBWorK/Localize/en.po
index ffc183120d..9754339533 100644
--- a/lib/WeBWorK/Localize/en.po
+++ b/lib/WeBWorK/Localize/en.po
@@ -17,242 +17,307 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:476
+#. ($_->{problem}->version_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:69
+msgid " (version %1)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:265
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:284
 msgid " Answers Available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:710
-msgid "# of active students"
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1148
+msgid " No changes have been made to set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:489
-msgid "#corr"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:130
+msgid "\"Act as\" a student"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:491
-msgid "#incorr"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:31
+msgid "\"Edit Assigned Users\" column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2226
-msgid "% Score:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:24
+msgid "\"Edit Problems\" column"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:187
+msgid "# of Active Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:85
+msgid "# of attempts"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:333
+msgid "#corr"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:694
-msgid "% correct"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:335
+msgid "#incorr"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:174
+msgid "% Average with Review"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:701
-msgid "% correct with review"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:66
+msgid "% Score with Review"
 msgstr ""
 
-# Percent students
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:749
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:786
-msgid "% students"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:479
+msgid "% Score:"
 msgstr ""
 
 #. ($achievement->{points})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:341
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:24
 msgid "%1 Points:"
 msgstr ""
 
-#. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:481
+#. ($lib eq '' ? maketext('Local')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:9
 msgid "%1 Problems:"
 msgstr ""
 
-#. ($itemCounts{$item->id()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:242
+#. ($itemCounts->{ $item->id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:12
 msgid "%1 remaining"
 msgstr ""
 
-#. ($numAdded, $numSkipped, join(", ", @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1373
+#. ($count)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2001
+msgid "%1 sets"
+msgstr ""
+
+#. ($numAdded,			$numSkipped,                                                join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:608
 msgid "%1 sets added, %2 sets skipped. Skipped sets: (%3)"
 msgstr ""
 
-#. ($numExported, $numSkipped, ($numSkipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1489
+#. ($numExported, $numSkipped,			$numSkipped ? $c->tag('ul', $c->c(map { $c->tag('li', $_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:673
 msgid "%1 sets exported, %2 sets skipped. Skipped sets: (%3)"
 msgstr ""
 
 #. ($count, $numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:609
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
 msgid "%1 students out of %2"
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle, $rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1415
+#. ($rename_oldCourseID,          $rename_oldCourseTitle, $rename_newCourseTitle,					$rename_oldCourseInstitution, $rename_newCourseInstitution)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:675
 msgid "%1 title and institution changed from %2 to %3 and from %4 to %5"
 msgstr ""
 
-#. (scalar @userIDsToExport, $dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1320
-msgid "%1 users exported to file %2/%3"
+#. (scalar @userIDsToExport, "$dir/$fileName")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:477
+msgid "%1 users exported to file %2"
 msgstr ""
 
-#. ($numReplaced, $numAdded, $numSkipped, join (", ", @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1215
+#. ($numReplaced, $numAdded, $numSkipped, join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:443
 msgid ""
 "%1 users replaced, %2 users added, %3 users skipped. Skipped users: (%4)"
 msgstr ""
 
-#. ($levelpercentage)
 #. ($percentage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:191
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:192
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:350
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:351
+#. ($level_percentage)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:12
 msgid "%1% Complete"
 msgstr ""
 
 #. (wwRound(0, $answerScore * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:268
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:248
 msgid "%1% correct"
 msgstr ""
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:236
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:57
 msgid "%1's Current Address"
 msgstr ""
 
-#. ($user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:154
+#. ($c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:26
 msgid "%1's Current Password"
 msgstr ""
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:253
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:65
 msgid "%1's New Address"
 msgstr ""
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:170
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:34
 msgid "%1's New Password"
 msgstr ""
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:125
-msgid "%1's new password cannot be blank."
-msgstr ""
-
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:107
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:92
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:76
 msgid "%1's password has been changed."
 msgstr ""
 
-#. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:60
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1394
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#. ($c->tag('span', dir => 'ltr', $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1069
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:149
 msgid "%1: Problem %2"
 msgstr ""
 
-#. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:374
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:357
 msgid "%1: Problem %2 Show Me Another"
 msgstr ""
 
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2157
-msgid "%1: The directory for the course not found."
-msgstr ""
-
-#. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:301
-msgid "%quant(%1,error) occured while generating hardcopy:"
+#. ($days)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:87
+msgid "%quant(%1,day)"
 msgstr ""
 
 #. ($n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:922
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:389
 msgid "%quant(%1,file) unpacked successfully"
 msgstr ""
 
+#. ($hours)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:88
+msgid "%quant(%1,hour)"
+msgstr ""
+
+#. ($minutes)
+#. (sprintf('%3.1f', $testTime)
+#. ($timeLeft)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:89
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:150
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:168
+msgid "%quant(%1,minute)"
+msgstr ""
+
 #. ($numBlanks)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:430
 msgid "%quant(%1,of the questions remains,of the questions remain) unanswered."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:655
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:661
+#. ($seconds)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:90
+msgid "%quant(%1,second)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:505
 msgid "%score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2915
+#. ($dcount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:40
+msgid "(%quant(%1,item) total)"
+msgstr ""
+
+#. ($count)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:29
+msgid "(%quant(%1,item))"
+msgstr ""
+
+#. ($problemValue)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1081
+msgid "(%quant(%1,point))"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:697
 msgid "(Any unsaved changes will be lost.)"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1278
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1287
-msgid ""
-"(Instructor hint preview: show the student hint after the following number "
-"of attempts:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:102
+msgid "(If an action cannot be executed it will not appear.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1974
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1262
 msgid "(This problem will not count towards your grade.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2108
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:340
 msgid ""
 "(This test is overtime because it was not submitted in the allowed time.)"
 msgstr ""
 
 # $testNoun is either "test" or "submission"
-#. ($testNoun, $self->formatDateTime($set->answer_date)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1972
+#. ($testNoun, $c->formatDateTime($c->{set}->answer_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:153
 msgid "(Your score on this %1 is not available until %2.)"
 msgstr ""
 
 # $testNoun is either "test" or "submission"
 #. ($testNoun)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1974
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:155
 msgid "(Your score on this %1 is not available.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1390
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1400
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1257
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1267
 msgid "(correct)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:198
-msgid "(gw/quiz) After version answer date"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:263
+msgid "(in target set)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1392
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1402
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1269
 msgid "(incorrect)"
 msgstr ""
 
 #. ($pgScore)
 #. ($recScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1394
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1404
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1271
 msgid "(score %1)"
 msgstr ""
 
-#. ($display_sort_method_name{$secondary_sort_method_name})
-#. ($display_sort_method_name{$ternary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:646
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:651
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:207
+msgid "(test) After version answer date"
+msgstr ""
+
+#. ($versionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:164
+msgid "(version %1)"
+msgstr ""
+
+#. ($display_sort_method_name{$secondary_sort_method})
+#. ($display_sort_method_name{$ternary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:103
 msgid ", then by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1295
-msgid ". If this is a class roster, rename it to have extension '.lst'"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:702
+msgid ". If this is a class roster, rename it to have extension \".lst\""
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:81
+msgid "0 seconds"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1997
+msgid "1 set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1983
 msgid "1 student"
 msgstr ""
 
 #. (wwRound(2, $weights[$part] * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:145
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:58
 msgid "<b>Weight:</b> %1%"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:240
+#: /opt/webwork/webwork2/conf/defaults.config:1651
 msgid ""
 "<p>After the Reduced Scoring Date all additional work done by the student "
 "counts at a reduced rate. Here is where you set the reduced rate which must "
@@ -267,116 +332,261 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr ""
 
-# Leave HTML in place
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:362
+#: /opt/webwork/webwork2/conf/defaults.config:1937
+msgid ""
+"<p>During summer 2005, a newer version of the answer checkers was "
+"implemented for answers which are functions and numbers.  The newer checkers "
+"allow more functions in student answers, and behave better in certain "
+"cases.  Some problems are specifically coded to use new (or old) answer "
+"checkers.  However, for the bulk of the problems, you can choose what the "
+"default will be here.</p><p>Choosing <i>false</i> here means that the newer "
+"answer checkers will be used by default, and choosing <i>true</i> means that "
+"the old answer checkers will be used by default.</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1908
+msgid ""
+"<p>MathQuill renders students answers in real-time as they type on the "
+"keyboard.</p><p>MathView allows students to choose from a variety of common "
+"math structures (such as fractions and square roots) as they attempt to "
+"input their answers.</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1459
+msgid ""
+"<p>Mode in which the LANG and DIR settings for a single problem are "
+"determined.</p><p>The system will set the LANGuage attribute to either a "
+"value determined from the problem, a course-wide default, or the system "
+"default, depending on the mode selected. The tag will only be added to the "
+"DIV enclosing the problem if it is different than the value which should be "
+"set in the main HTML tag set for the entire course based on the course "
+"language.</p><p>There are two options for the DIRection attribute: \"ltr\" "
+"for left-to-write scripts, and \"rtl\" for right-to-left scripts like Arabic "
+"and Hebrew.</p><p>The DIRection attribute is needed to trigger proper "
+"display of the question text when the problem text-direction is different "
+"than that used by the current language of the course. For example, English "
+"problems from the library browser would display improperly in RTL mode for a "
+"Hebrew course, unless the problen Direction is set to LTR.</p><p>The feature "
+"to set a problem language and direction was only added in 2018 to the PG "
+"language, so most problems will not declare their language, and the system "
+"needs to fall back to determining the language and direction in a different "
+"manner. The OPL itself is all English, so the system wide fallback is to en-"
+"US in LTR mode.</p><p>Since the defaults fall back to the LTR direction, "
+"most sites should be fine with the \"auto::\" mode, but may want to select "
+"the one which matches their course language. The mode \"force::ltr\" would "
+"also be an option for a course which runs into trouble with the \"auto\" "
+"modes.</p><p>Modes:</p><ul><li>\"none\" prevents any additional LANG and/or "
+"DIR tag being added. The browser will use the main setting which was applied "
+"to the entire HTML page. This is likely to cause trouble when a problem of "
+"the other direction is displayed.</li><li>\"auto::\" allows the system to "
+"make the settings based on the language and direction reported by the "
+"problem (a new feature, so not set in almost all existing problems) and "
+"falling back to the expected default of en-US in LTR mode. </li><li>\"auto:"
+"LangCode:Dir\" allows the system to make the settings based on the language "
+"and direction reported by the problem (a new feature, so not set in almost "
+"all existing problems) but falling back to the language with the given "
+"LangCode and the direction Dir when problem settings are not available from "
+"PG.</li><li>\"auto::Dir\" for problems without PG settings, this will use "
+"the default en=english language, but force the direction to Dir. Problems "
+"with PG settings will get those settings.</li><li>\"auto:LangCode:\" for "
+"problems without PG settings, this will use the default LTR direction, but "
+"will set the language to LangCode.Problems with PG settings will get those "
+"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made "
+"by the PG code of the problem, and will force the system to set the language "
+"with the given LangCode and the direction to Dir for <b>all</b> problems.</"
+"li><li>\"force::Dir\" will <b>ignore</b> any setting made by the PG code of "
+"the problem, and will force the system to set the direction to Dir for "
+"<b>all</b> problems, but will avoid setting any language attribute for "
+"individual problem.</li></ul>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1514
+msgid ""
+"<p>Some servers handle courses taking place in different timezones.  If this "
+"course is not showing the correct timezone, enter the correct value here.  "
+"The format consists of unix times, such as \"America/New_York\", \"America/"
+"Chicago\", \"America/Denver\", \"America/Phoenix\" or \"America/"
+"Los_Angeles\".</p>Complete list: <a href=\"http://en.wikipedia.org/wiki/"
+"List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1638
+msgid ""
+"<p>This sets whether the Reduced Scoring system will be enabled.  If enabled "
+"you will need to set the default length of the reduced scoring period and "
+"the value of work done in the reduced scoring period below.</p><p>To use "
+"this, you also have to enable Reduced Scoring for individual assignments and "
+"set their Reduced Scoring Dates by editing the set data.</p><p>This works "
+"with the avg_problem_grader (which is the the default grader) and the "
+"std_problem_grader (the all or nothing grader).  It will work with custom "
+"graders if they are written appropriately.</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1881
 msgid ""
 "<p>When viewing a problem, users may choose different methods of rendering "
 "formulas via an options box in the left panel. Here, you can adjust what "
 "display modes are listed.</p><p>Some display modes require other software to "
 "be installed on the server. Be sure to check that all display modes selected "
-"here work from your server.</p><p>The display modes are <ul><li> plainText: "
-"shows the raw LaTeX srings for formulas.<li> images: produces images using "
-"the external programs LaTeX and dvipng.<li> MathJax: a successor to jsMath, "
-"uses javascript to place render mathematics.</ul></p></p>You must use at "
-"least one display mode. If you select only one, then the options box will "
-"not give a choice of modes (since there will only be one active).</p>"
+"here work from your server.</p><p>The display modes are</"
+"p><ul><li>plainText: shows the raw LaTeX strings for formulas.</"
+"li><li>images: produces images using the external programs LaTeX and dvipng."
+"</li><li>MathJax: a successor to jsMath, uses javascript to place render "
+"mathematics.</li></ul><p>You must use at least one display mode. If you "
+"select only one, then the options box will not give a choice of modes (since "
+"there will only be one active).</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1476
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with a question in "
+"this test. Please inform your instructor including the warning messages "
+"below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1236
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with this question. "
+"Please inform your instructor including the warning messages below."
 msgstr ""
 
-# Leave HTML in place
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:280
+#: /opt/webwork/webwork2/conf/defaults.config:1730
 msgid ""
 "<ul><li><b>SMAcheckAnswers</b>: enables the Check Answers button <i>for the "
-"new problem</i> when Show Me Another is clicked</li> "
-"<li><b>SMAshowSolutions</b>: shows walk-through solution <i>for the new "
-"problem</i> when Show Me Another is clicked; a check is done first to make "
-"sure that a solution exists </li><li><b>SMAshowCorrect</b>: correct answers "
-"<i>for the new problem</i> can be viewed when Show Me Another is clicked; "
-"note that <b>SMAcheckAnswers</b> needs to be enabled at the same time</"
+"new problem</i> when Show Me Another is clicked</li><li><b>SMAshowSolutions</"
+"b>: shows walk-through solution <i>for the new problem</i> when Show Me "
+"Another is clicked; a check is done first to make sure that a solution "
+"exists </li><li><b>SMAshowCorrect</b>: correct answers <i>for the new "
+"problem</i> can be viewed when Show Me Another is clicked; note that "
+"<b>SMAcheckAnswers</b>needs to be enabled at the same time</"
 "li><li><b>SMAshowHints</b>: show hints <i>for the new problem</i> (assuming "
 "they exist)</li></ul>Note: there is very little point enabling the button "
 "unless you check at least one of these options - the students would simply "
-"see a new version that they can not attempt or learn from.</p>"
+"see a new version that they can not attempt or learn from."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:461
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:35
 msgid "A URL for the LMS"
 msgstr ""
 
 #. ($add_courseID)
 #. ($rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:688
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:600
 msgid "A course with ID %1 already exists."
 msgstr ""
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2484
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1220
 msgid ""
 "A directory already exists with the name %1. You must first delete this "
 "existing course before you can unarchive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:118
-msgid ""
-"A file name cannot begin with a dot, it cannot be empty, it cannot contain a "
-"directory path component and only the characters -_.a-zA-Z0-9 and space  are "
-"allowed."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:111
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:42
 msgid ""
 "A file name cannot begin with a dot, it cannot be empty, it cannot contain a "
 "directory path component and only the characters -_.a-zA-Z0-9 and space are "
 "allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1340
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1364
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:738
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
 msgid "A file with that name already exists"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:307
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:19
 msgid ""
 "A hardcopy file was generated, but it may not be complete or correct. Please "
 "check that no problems are missing and that they are all legible. If not, "
 "please inform your instructor."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:56
+msgid ""
+"A hash reference in which the keys are the achievement_id's assigned to the "
+"current user and the values are 0 or 1 which stores if the user has earned "
+"the associated achievement or not."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:52
+msgid ""
+"A hash reference which contains a problems metadata, such as DBsubject, "
+"DBchapter, DBsection,  and so on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:37
+msgid "A hash reference which contains the problem data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:40
+msgid "A hash reference which contains the set data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:60
+msgid ""
+"A hash reference which saves data for this user and this achievement. This "
+"hash is persistent between evaluations and changes to this variable will be "
+"saved in the database."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:64
+msgid ""
+"A hash reference which saves global data for this user. This hash is "
+"persistent between evaluations and changes to this variable will be saved in "
+"the database."
+msgstr ""
+
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3204
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1695
 msgid ""
 "A location with the name %1 already exists in the database.  Did you mean to "
 "edit that location instead?"
 msgstr ""
 
-#. ($subject, $number_of_recipients, $courseName, $failed_messages)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1018
+#. ($mail_data->{subject}, $number_of_recipients, $mail_data->{courseName},		$failed_messages)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:113
 msgid ""
 "A message with the subject line \"%1\" has been sent to %quant(%2,recipient) "
 "in the class %3.  There were %4 message(s) that could not be sent."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:643
-msgid "A new file has been created at '%1'"
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:315
+msgid "A new file has been created at \"%1\""
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1146
+msgid "A new file has been created at \"%1\" with the contents below."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:154
+msgid ""
+"A new problem whose path ends in newProblem.pg should be given a new name, "
+"for example, \"myNewProblem.pg\"."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1976
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:20
 msgid ""
-"A new file has been created at '%1' with the contents below.  No changes "
-"have been made to set %2"
+"A student must be assigned a homework set in order for it to appear on their "
+"WeBWorK home page. Check the box in the left column to assign a student to "
+"that homework set. Uncheck the box to unassign a student. If a student is "
+"unassigned from a homework set, all of the student's data for that homework "
+"set is deleted and cannot be recovered. Use this action cautiously!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:626
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:20
 msgid ""
-"A period (.) indicates a problem has not been attempted, and a number from 0 "
-"to 100 indicates the grade earned. The number on the second line gives the "
-"number of incorrect attempts."
+"A student needs to be assigned a set in order for them to work it. Once a "
+"student is unassigned a set, all the data for them is lost and there is no "
+"way to undo it. When unassigning be sure to change the option to \"Allow "
+"unassign\"."
 msgstr ""
 
 # Leave symbol codes in place
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:190
+#: /opt/webwork/webwork2/conf/defaults.config:1549
 msgid ""
 "A switch to govern the use of a Progress Bar for the student; this also "
 "enables/disables the highlighting of the current problem in the side bar, "
@@ -384,1083 +594,1554 @@ msgid ""
 "(&#x2717;), or unattempted (no symbol)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:108
-msgid ""
-"A table showing all the current users along with several fields of user "
-"information. The fields from left to right are: Login Name, Login Status, "
-"Assigned Sets, First Name, Last Name, Email Address, Student ID, Enrollment "
-"Status, Section, Recitation, Comments, and Permission Level.  Clicking on "
-"the links in the column headers will sort the table by the field it "
-"corresponds to. The Login Name fields contain checkboxes for selecting the "
-"user.  Clicking the link of the name itself will allow you to act as the "
-"selected user.  There will also be an image link following the name which "
-"will take you to a page where you can edit the selected user's information.  "
-"Clicking the emails will allow you to email the corresponding user.  "
-"Clicking the links in the entries in the assigned sets columns will take you "
-"to a page where you can view and reassign the sets for the selected user."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:42
+msgid "A unique key identifying the achievement."
 msgstr ""
 
 # Short for ADJUSTED STATUS
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:695
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:535
 msgid "ADJ STATUS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2265
-msgid "ANSWERS NOT RECORDED"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2252
-msgid "ANSWERS NOT RECORDED --"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2264
-msgid "ANSWERS ONLY CHECKED -- "
+#. ($c->{scoreRecordedMessage}[ $probOrder->[$i] ])
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:504
+msgid "ANSWERS NOT RECORDED -- %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2203
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1505
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:515
 msgid "ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1527
 msgid ""
 "ATTEMPT NOT ACCEPTED -- Please submit answers again (or request new version "
 "if neccessary)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1077
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1497
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_password_form.html.ep:1
 msgid "Abandon changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1003
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1432
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_export_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_export_form.html.ep:1
 msgid "Abandon export"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:508
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:520
 msgid ""
 "Account creation is currently disabled in this course.  Please speak to your "
 "instructor or system administrator."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:155
-msgid "Achievement"
-msgstr ""
-
-#. ($targetAchievementID, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:637
-msgid "Achievement %1 created with evaluator '%2'."
+#. ($targetAchievementID,			$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:310
+msgid "Achievement %1 created with evaluator \"%2\"."
 msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:792
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:378
 msgid "Achievement %1 exists.  No achievement created"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:531
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:444
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:63
 msgid "Achievement Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:541
-msgid "Achievement Evaluator Editor"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:17
+msgid "Achievement Editor Help"
 msgstr ""
 
-#. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:172
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:17
+msgid "Achievement Evaluator Editor Help"
+msgstr ""
+
+#. ($c->stash('achievementID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:109
 msgid "Achievement Evaluator for achievement %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1439
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1443
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1466
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:13
 msgid "Achievement ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:274
 msgid "Achievement ID exists!  No new achievement created.  File not saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:219
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:41
+msgid "Achievement ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:3
+msgid "Achievement List"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1600
 msgid "Achievement Points Per Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:551
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:455
 msgid "Achievement User Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:17
+msgid "Achievement User Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:48
 msgid "Achievement has been assigned to all users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:67
 msgid "Achievement has been assigned to selected users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:60
 msgid "Achievement has been unassigned to all students."
 msgstr ""
 
-#. (CGI::a({ href => $fileManagerURL }, $scoreFileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:679
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:38
+msgid "Achievement options"
+msgstr ""
+
+#. ($c->link_to(				$scoreFileName => $c->systemLink(					$c->url_for('instructor_file_manager')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:318
 msgid "Achievement scores saved to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:255
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:241
 msgid "Achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:546
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:17
+msgid "Achievements Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:26
+msgid ""
+"Achievements are evaluated in the order shown below, with the exception of "
+"\"level\" achievements.  Achievements in the \"level\" category are "
+"evaluated first and control the XP thresholds and rewards (achievement "
+"items) for reaching each level. Achievements in the \"secret\" category are "
+"not shown to students until they earn the achievement, and is used for fun/"
+"surprise achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:32
+msgid ""
+"Achievements in the same category, with sequential numbers, and whose ID "
+"starts with the same \"prefix_\" (up to the last underscore), are treated as "
+"achievement chains.  Achievement chains are a sequence of achievements which "
+"build upon themselves, such as complete one problem, complete 10 problems, "
+"complete 25 problems, and so on. Students will only see the achievements in "
+"the chain they have completed or are currently working on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:201
 msgid "Act as"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:26
 msgid "Act as:"
 msgstr ""
 
-#. (HTML::Entities::encode_entities($eUserID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1068
+#. ($effectiveUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:26
 msgid "Acting as %1."
 msgstr ""
 
 #. ($actionID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:372
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:223
 msgid "Action %1 not found"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1800
-msgid "Active"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:101
+msgid "Actions:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:215
+#: /opt/webwork/webwork2/conf/defaults.config:1608
 msgid ""
-"Activiating this will enable Mathchievements for webwork.  Mathchievements "
-"can be managed by using the Achievement Editor link."
+"Activating this will enable achievement rewards. This feature allows "
+"students to earn rewards by completing achievements that allow them to "
+"affect their homework in a limited way."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:45
+msgid "Active"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:50
+msgid "Active Students"
+msgstr ""
+
+#. ($c->{prettyID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:19
+msgid "Active Students Problem %1 Grades"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:225
+#: /opt/webwork/webwork2/conf/defaults.config:1593
 msgid ""
-"Activiating this will enable achievement items. This features rewards "
-"students who earn achievements with items that allow them to affect their "
-"homework in a limited way."
+"Activiating this will enable Mathchievements for webwork.  Mathchievements "
+"can be managed by using the Achievement Editor link."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:433
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1578
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:166
 msgid "Add"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:89
 msgid "Add All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:644
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:32
 msgid "Add Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:253
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:17
+msgid "Add Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:14
+msgid "Add Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:98
 msgid "Add Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:399
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:349
 msgid "Add Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:518
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:17
+msgid "Add Users Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:47
 msgid "Add WeBWorK administrators to new course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1461
-msgid "Add a new test for which Gateway?"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:79
+msgid "Add a TA or an instructor (change permission level of user)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:60
+msgid "Add a few students to the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1425
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:50
+msgid "Add a new version for which test?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:20
 msgid "Add as what filetype?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1089
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/add_form.html.ep:3
 msgid "Add how many users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1579
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:69
+msgid "Add many students to a course from a class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:108
+msgid "Add n blank problem template(s) to the end of homework set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:164
 msgid "Add problem to target set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1071
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Add problems to"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1408
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:161
+msgid ""
+"Add this problem as the last problem of an existing set, either as a problem "
+"or as the set header (the text that appears on the home page of a homework "
+"set). You can rearrange the order of the problems later using the \"Hmwk "
+"Sets Editor\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:7
 msgid "Add to what set?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1160
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:20
+msgid ""
+"Add users to the course.  Select the number of students/users to add and "
+"then add any desired information.  The only mandatory information is the "
+"\"Login Name\". Any other fields may be left blank.  The \"Student ID\" will "
+"be the initial password for the user if provided."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:26
 msgid "Add which new users?"
 msgstr ""
 
-#. ($new_file_path, $setID, $targetProblemNumber)
-#. ($sourceFilePath, $targetSetName,($set->assignment_type eq 'jitar' ? join('.',jitar_id_to_seq($targetProblemNumber)
-#. ($new_file_name, $setName, ($set->assignment_type eq 'jitar' ? join('.',jitar_id_to_seq($targetProblemNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1494
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1971
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1896
-msgid "Added %1 to %2 as problem %3"
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:883
+msgid "Added \"%1\" to %2 as new hardcopy header"
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:854
+msgid "Added \"%1\" to %2 as new set header"
 msgstr ""
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1550
-msgid "Added '%1' to %2 as new hardcopy header"
+#. ('{number}', '{set}')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:27
+msgid "Added %1 problems to set %2."
+msgstr ""
+
+#. ($new_file_path, $setID, $targetProblemNumber)
+#. ($sourceFilePath,			$targetSetName,			(				$set->assignment_type eq 'jitar'				? join('.', jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:825
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1837
+msgid "Added %1 to %2 as problem %3"
 msgstr ""
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1524
-msgid "Added '%1' to %2 as new set header"
+#. ($new_file_name,				$c->{setID},				(					$set->assignment_type eq 'jitar'					? join('.', jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1139
+msgid "Added %1 to %2 as problem %3."
 msgstr ""
 
 #. (join(', ', @toAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3511
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1974
 msgid "Added addresses %1 to location %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:441
-msgid "Additional addresses for receiving feedback e-mail."
+#. ($user->user_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:167
+msgid "Added missing permission level for user %1."
+msgstr ""
+
+#. ('{set}')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:26
+msgid "Added one problem to set %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Added user:"
+msgstr ""
+
+#. ('<code>[Scoring]/report_grades_data.csv</code>',		'<code>[TMPL]/email/report_grades.msg</code>',)
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:33
+msgid ""
+"Additional (external) grades can be shown on this page by placing them in "
+"the CSV file %1.  The first six columns must be (in order): Student ID, "
+"Username, Last Name, First Name, Section, Recitation.  The remaining columns "
+"can list any external grades.  To display the grades, the CSV file is merged "
+"with the \"Email\" message %2, which will be rendered and displayed below "
+"the grade table.  The message can be created on the \"Email\" page and the "
+"CSV file can be created/uploaded using the \"File Manager\".  External "
+"grades can only be displayed here and are not included in any totals or "
+"statistics."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2060
+msgid "Additional addresses for receiving feedback e-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:430
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:235
 msgid "Additional submissions available."
 msgstr ""
 
 #. ($badLocAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3207
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1708
 msgid ""
 "Address(es) %1 already exist in the database.  THIS SHOULD NOT HAPPEN!  "
 "Please double check the integrity of the WeBWorK database before continuing."
 msgstr ""
 
 #. (join(', ', @noAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3514
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1986
 msgid ""
 "Address(es) %1 in the add list is(are) already in the location %2, and so "
 "were skipped."
 msgstr ""
 
 #. (join(', ', @noDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3516
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2008
 msgid ""
 "Address(es) %1 in the delete list is(are) not in the location %2, and so "
 "were skipped."
 msgstr ""
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3201
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1683
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and resubmit."
 msgstr ""
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3515
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1998
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3127
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:117
 msgid "Addresses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3039
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:53
 msgid ""
 "Addresses for new location.  Enter one per line, as single IP addresses (e."
 "g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP ranges (e."
 "g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3345
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:27
 msgid ""
 "Addresses to add to the location.  Enter one per line, as single IP "
 "addresses (e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP "
 "ranges (e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:227
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:27
 msgid "Adds 24 hours to the close date of a homework."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:313
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:27
 msgid "Adds 48 hours to the close date of a homework."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:818
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:110
+msgid ""
+"Adds new template problems to the set when the set is saved. You can modify "
+"the template to create your own problem, by clicking on the \"Edit Problem\" "
+"link and saving to some new file, e.g. \"myNewProblem.pg\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:19
 msgid "Adjusted Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:56
 msgid "Adobe PDF"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:707
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:42
 msgid "Advanced Search"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:197
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:206
 msgid "After set answer date"
 msgstr ""
 
-#. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:359
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:33
 msgid ""
-"After the reduced scoring period begins all work counts for %1% of its value."
+"After the due date this set enters a reduced scoring period until it closes "
+"on %1.  All work completed during the reduced scoring period counts for %2% "
+"of its value."
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:478
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:304
 msgid "Afterward reduced credit can be earned until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:821
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:23
+msgid "All Chapters"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:34
+msgid "All Sections"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:6
 msgid "All Selected Constraints Joined by \"And\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:71
+msgid "All Sets"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:12
+msgid "All Subjects"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:48
+msgid "All Textbooks"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:54
+msgid "All Users"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:49
 msgid "All assignments were made successfully."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:386
+msgid "All listed sets were hidden from all the students"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:381
+msgid "All listed sets were made visible for all the students"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:407
 msgid "All of the answers above are correct."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:398
 msgid "All of the gradeable answers above are correct."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:230
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:162
+msgid ""
+"All of the paths for problem files are relative to the templates directory "
+"of the current course. You can access this directory \"directly\" using the "
+"File Manager page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:68
 msgid "All of these files will also be made available for mail merge."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:938
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:9
+msgid "All problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:5
+msgid "All sections"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2145
+msgid "All selected courses are already hidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2214
+msgid "All selected courses are already unhidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:399
 msgid "All selected sets hidden from all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:936
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:394
 msgid "All selected sets made visible for all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:924
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:373
 msgid "All sets hidden from all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:923
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:368
 msgid "All sets made visible for all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1415
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:619
 msgid "All sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:56
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:54
 msgid "All unassignments were made successfully."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:931
-msgid "All visible hidden from all students"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:929
-msgid "All visible sets made visible for all students"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:397
+#: /opt/webwork/webwork2/conf/defaults.config:1948
 msgid "Allow Unicode alternatives in student answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:482
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:74
 msgid "Allow the LMS to update user account data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:286
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:185
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:223
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:248
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:68
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:105
 msgid "Allow unassign"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:408
+#: /opt/webwork/webwork2/conf/defaults.config:1970
 msgid "Allowed error, as a percentage, for numerical comparisons"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:313
+#: /opt/webwork/webwork2/conf/defaults.config:1788
 msgid "Allowed to <em>act as</em> another user"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:332
+#: /opt/webwork/webwork2/conf/defaults.config:1825
+msgid "Allowed to change display settings used in pg problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1815
 msgid "Allowed to change their e-mail address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:308
+#: /opt/webwork/webwork2/conf/defaults.config:1779
 msgid "Allowed to change their password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:304
+#: /opt/webwork/webwork2/conf/defaults.config:1774
 msgid "Allowed to login to the course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:350
+#: /opt/webwork/webwork2/conf/defaults.config:1852
 msgid "Allowed to see solutions before the answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:346
+#: /opt/webwork/webwork2/conf/defaults.config:1847
 msgid "Allowed to see the correct answers before the answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:337
+#: /opt/webwork/webwork2/conf/defaults.config:1836
 msgid "Allowed to view past answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:342
+#: /opt/webwork/webwork2/conf/defaults.config:1842
 msgid "Allowed to view problems in sets which are not open yet"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1520
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:82
+msgid ""
+"Allows configuration of certain parameters, such as permission levels, "
+"default display mode for equations, and email feedback behavior, on a course "
+"by course basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:126
+msgid "Also copy simple configuration file"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:26
 msgid "Amulet of Extension"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:462
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:20
+msgid ""
+"An achievement evaluator is a perl script that is run after each problem is "
+"submitted which returns a truth value of 0 (didn't earn) or 1 (earn). The "
+"evaluator is given access to different variables which contain data about "
+"the problem and set that is used to determine if the achievement is earned "
+"or not."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:37
 msgid ""
 "An address that can be used to log in to the LMS. This is used in messages "
 "to users that direct them to go back to the LMS to access something in the "
 "WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:43
+msgid ""
+"An array which lists the hash reference of all the problems in the current "
+"set."
+msgstr ""
+
 #. ($archive_courseID)
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2271
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2567
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1274
 msgid "An error occured while archiving the course %1:"
 msgstr ""
 
 #. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1400
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:658
 msgid "An error occured while changing the title of the course %1."
 msgstr ""
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1758
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2299
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:878
 msgid "An error occured while deleting the course %1:"
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1484
+#. ($rename_oldCourseID,						$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:751
 msgid "An error occured while renaming the course %1 to %2:"
 msgstr ""
 
 #. ($part + 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:106
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:25
 msgid "Answer %1 Score (%):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:744
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:768
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:791
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:79
 msgid "Answer Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1683
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:39
 msgid "Answer Group Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1713
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:59
 msgid "Answer Hash Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:218
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:292
 msgid "Answer Log"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:17
+msgid "Answer Log Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:285
 msgid "Answer Preview"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1408
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:48
+msgid ""
+"Answer availability for tests depends on multiple settings.  This only "
+"indicates the template answer date has passed.  See set editor for actual "
+"availability."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1276
 msgid "Answer(s) submitted:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
 msgid "Answer:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:224
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
 msgid "Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:123
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:37
 msgid "Answers Available"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1187
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1202
 msgid "Answers cannot be due until on or after the open date!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1182
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1197
 msgid "Answers cannot be made available until on or after the close date!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:313
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:21
 msgid ""
 "Any changes made below will be reflected in the achievement for ALL students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:175
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:69
 msgid "Any changes made below will be reflected in the set for ALL students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2240
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:173
 msgid ""
 "Any changes made below will be reflected in the set for ONLY the student(s) "
 "listed above."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:122
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:159
 msgid "Append"
 msgstr ""
 
-#. (CGI::strong($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1820
+#. (tag('strong', dir => 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:71
 msgid "Append to end of %1 set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2185
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:51
+msgid "Applying definitions theoretically and proof writing"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:91
 msgid "Archive"
 msgstr ""
 
 #. ($archive, $n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:890
-msgid "Archive '%1' created successfully (%quant( %2, file))"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:361
+msgid "Archive \"%1\" created successfully (%quant( %2, file))"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1067
-msgid "Archive '%1' deleted"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:525
+msgid "Archive \"%1\" deleted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1809
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2011
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:38
 msgid "Archive Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1911
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1968
-msgid "Archive Courses"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:17
+msgid "Archive Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2344
-msgid "Archive next course"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:63
+msgid "Archive Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:998
-msgid "Archive this Course"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1158
+msgid "Archive next course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:61
 msgid "Archived Courses"
 msgstr ""
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:202
-msgid "Archiving course as %1.tar.gz. Reload FileManager to see it."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:69
+msgid "Archived course as %1.tar.gz."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:25
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to access the .tar.gz files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:26
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to upload additional .tar.gz "
+"files to be unarchived."
 msgstr ""
 
-#. (CGI::b($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2123
+#. (tag('b', $archive_courseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:57
 msgid ""
 "Are you sure that you want to delete the course %1 after archiving? This "
 "cannot be undone!"
 msgstr ""
 
-#. (CGI::b($delete_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1699
+#. (tag('b', param('delete_courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:5
 msgid ""
 "Are you sure you want to delete the course %1? All course files and data "
 "will be destroyed. There is no undo available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:72
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:534
-msgid "Assign"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:64
+msgid ""
+"As the checkbox says, this includes a percentage grade column for each set."
 msgstr ""
 
-#. (CGI::popup_menu({				name    => 'action.assign.scope',				values  => [qw(all selected)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:470
-msgid "Assign %1 to all users, create global data, and %2."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:184
+msgid "Assign"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:225
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:62
 msgid "Assign All Sets to Current User"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:166
-msgid "Assign selected sets to selected users"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:106
+msgid "Assign achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1327
-msgid "Assign this set to which users?"
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:43
+msgid "Assign and unassign selected exercise sets to selected users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:54
+msgid "Assign selected sets to selected users"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:154
+msgid "Assign sets to many students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:116
+msgid "Assign sets to one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:15
+msgid "Assign this achievement to which users?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:62
+msgid "Assign this set to which users?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:15
 msgid "Assign to All Current Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:154
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:3
+msgid "Assign which achievements?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:35
 msgid "Assigned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1958
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:19
 msgid "Assigned Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:555
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:218
 msgid "Assigned achievements to users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2138
-msgid "Assigned to"
+#. (link_to(						$c->setCountMessage($db->countUserSets($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:96
+msgid "Assigned to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:203
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:212
 msgid "Assignment type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:185
-msgid "Assignments only"
+#: /opt/webwork/webwork2/conf/defaults.config:1906
+msgid "Assist with the student answer entry process."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:417
 msgid "At least one of the answers above is NOT correct."
 msgstr ""
 
 # Short for "Attempts to Open Children"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:414
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:487
 msgid "Att. to Open Children"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:409
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:50
 msgid "Attachment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:107
 msgid "Attempt to upgrade directories"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:376
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:449
 msgid "Attempted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1446
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1528
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:810
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/attempts_row.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:73
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:13
 msgid "Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:118
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:93
 msgid "Audit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:348
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:354
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:360
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:366
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:460
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:466
 msgid "Authentication failed.  Please speak to your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:521
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/InstructorRPCHandler.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:44
+msgid "Authentication failed. Log in again to continue."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:116
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:69
 msgid "Author Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:412
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:87
 msgid "Automatic"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:402
+#: /opt/webwork/webwork2/conf/defaults.config:1959
 msgid ""
 "Automatically convert Full Width Unicode characters to their ASCII "
 "equivalents"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2856
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:97
+msgid ""
+"Automatically render all problems in the set on this page when \"Save "
+"Changes\" or \"Reset Form\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:667
 msgid "Automatically render problems on page load"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1698
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:95
+msgid "Automatically render problems on page load."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:49
 msgid "Auxiliary Resources"
 msgstr ""
 
-#. ($emailDirectory,$old_default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:383
-msgid "Backup file <code>%1/%2</code> created."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:179
+msgid "Average Attempts"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:118
+msgid "Average Attempts Per Problem"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:115
+msgid "Average Percent"
+msgstr ""
+
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:558
+msgid "Backup created on %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:1
+msgid "Badges"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:976
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:106
 msgid "Basic Search"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:412
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:28
+msgid "Before Open Date"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:31
+msgid ""
+"Below the file list is a button and options for uploading files. Click the "
+"\"Choose File\" button, select the file, then click \"Upload\". A single "
+"file or a compressed tar (.tgz) file can be uploaded and if the option is "
+"selected, the archive is automatically unpacked and deleted.  Generally the "
+"\"automatic\" option on Format will correctly pick the correct type of file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:83
 msgid "Binary"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1232
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+msgid "Both Start and Grade"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:26
 msgid "Box of Transmogrification"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:40
 msgid "Browse"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1024
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:507
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:16
 msgid "Browse from:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:447
+#: /opt/webwork/webwork2/conf/defaults.config:2072
 msgid ""
 "By default, feedback is always sent to all users specified to recieve "
 "feedback.  This variable sets the system to only email feedback to users who "
-"have the same section as the user initiating the feedback.  I.E.  Feedback "
+"have the same section as the user initiating the feedback.  I.e., feedback "
 "will only be sent to section leaders."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:442
+#: /opt/webwork/webwork2/conf/defaults.config:2062
 msgid ""
 "By default, feedback is sent to all users above who have permission to "
 "receive feedback. Feedback is also sent to any addresses specified in this "
 "blank. Separate email address entries by commas."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
 msgid "CLOSE DATE"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:371
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:217
 msgid "CLOSE TIME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:495
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:26
 msgid "Cake of Enlargement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:317
+#: /opt/webwork/webwork2/conf/defaults.config:1793
 msgid "Can e-mail instructor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:327
+#: /opt/webwork/webwork2/conf/defaults.config:1806
 msgid "Can report bugs"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:354
+#: /opt/webwork/webwork2/conf/defaults.config:1857
 msgid "Can show old answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:322
+#: /opt/webwork/webwork2/conf/defaults.config:1799
 msgid "Can submit answers for a student"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:733
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:275
 msgid "Can't copy file: %1"
 msgstr ""
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:892
-msgid "Can't create archive '%1': command returned %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
+msgid "Can't create archive \"%1\": command returned %2"
 msgstr ""
 
 #. ($courseID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2654
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:28
 msgid "Can't create course environment for %1 because %2"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:967
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:423
 msgid "Can't create directory: %1"
 msgstr ""
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1058
-msgid "Can't create file '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+msgid "Can't create file \"%1\": %2"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:946
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:406
 msgid "Can't create file: %1"
 msgstr ""
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1068
-msgid "Can't delete archive '%1': %2"
-msgstr ""
-
-#. ($eUserID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:73
-msgid "Can't get password record for effective user '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:526
+msgid "Can't delete archive \"%1\": %2"
 msgstr ""
 
-#. ($userID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:66
-msgid "Can't get password record for user '%1': %2"
+#. ($setID, $TargetUser->user_id,)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:925
+msgid ""
+"Can't generate hardcopy for set \"%1\" for user \"%2\". The set is not "
+"visible to students."
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:920
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:445
 msgid "Can't open %1"
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2222
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1426
 msgid "Can't open file %1"
 msgstr ""
 
 #. ($merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:428
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:343
 msgid "Can't read merge file %1. No message sent"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:758
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:298
 msgid "Can't rename file: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1330
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:591
 msgid "Can't rename to the same name."
 msgstr ""
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:925
-msgid "Can't unpack '%1': command returned %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:392
+msgid "Can't unpack \"%1\": command returned %2"
 msgstr ""
 
 #. ($fullPath)
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:627
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1879
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1819
 msgid "Can't write to file %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1013
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1094
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:154
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:683
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:462
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/confirm.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:69
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:15
 msgid "Cancel"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:5
+msgid "Cancel E-Mail"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:60
 msgid "Cancel E-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:61
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:77
 msgid "Cancel Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:79
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
 msgid "Cancel Export"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:93
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
 msgid "Cancel Password"
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:516
+msgid "Cannot find a file path to save to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:501
+msgid ""
+"Cannot find a problem record for set $c->{setID} / problem $c->{problemID}"
+msgstr ""
+
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:293
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:240
 msgid "Cannot open %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:223
-msgid "Cap Test Time at Set Close Date?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:232
+msgid "Cap Test Time at Set Close Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1470
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:14
 msgid "Category"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:496
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:49
+msgid "Category:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:27
 msgid ""
 "Cause the selected homework set to count for twice as many points as it "
 "normally would."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1233
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:27
 msgid ""
 "Causes a homework problem to become a clone of another problem from the same "
 "set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:700
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:27
 msgid "Causes a single homework problem to be worth twice as much."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1005
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:48
 msgid "Change Course Title to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:34
 msgid "Change CourseID to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:267
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:176
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:134
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:76
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:25
 msgid "Change Display Settings"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:198
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:53
 msgid "Change Email Address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1030
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:62
 msgid "Change Institution to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:421
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:18
 msgid "Change Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:465
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:169
 msgid "Change User Settings"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:35
+msgid "Change a course's ID, Title, or Institution."
+msgstr ""
+
 #. ($rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1089
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
 msgid "Change course institution from %1 to %2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:160
+msgid "Change dates for a homework set for the whole class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:123
+msgid "Change the due date for one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:26
+msgid ""
+"Change the due dates for an individual student on this page. Check the "
+"checkbox and enter the new date in order to override the date. (You can copy "
+"the date format from the date in the right hand column which indicates the "
+"date when the homework set is due for the whole class.) Note that you should "
+"ensure that the close date is before the answer date. If the close date for "
+"a student is extended until after the class answer date for the set, then "
+"the answer date for the student must also be set to a later date. "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:141
+msgid "Change the grades on a homework set for one student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:163
+msgid "Change the grading on a homework set for an entire class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:170
+msgid "Change the number of atttempts allowed on a problem."
+msgstr ""
+
 #. ($rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1086
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:508
 msgid "Change title from %1 to %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1419
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:488
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:540
 msgid "Changes abandoned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:242
 msgid "Changes in this file have not yet been permanently saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:647
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1395
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:529
 msgid "Changes saved"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1846
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:38
+msgid "Changing dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:514
 msgid ""
 "Changing the problem seed for display, but there are no problems showing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:597
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:670
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:849
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:19
 msgid "Chapter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:312
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:15
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:103
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:37
 msgid "Check Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2406
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:682
 msgid "Check Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:188
-msgid "Check that it's permissions are set correctly."
-msgstr ""
-
-#. ($emailDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:200
-msgid ""
-"Check whether it exists and whether the directory %1 can be read by the "
-"webserver."
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:53
+msgid "Choose problems from a library and add them to a homework set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:522
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:40
 msgid "Choose the set which you would like to be worth twice as much."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:429
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:44
 msgid "Choose the set which you would like to enable partial credit for."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1171
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:160
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:964
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:44
 msgid "Choose the set which you would like to resurrect."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:253
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:339
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:40
 msgid "Choose the set whose close date you would like to extend."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:881
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:16
 msgid "Choose visibility of the sets to be affected"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:859
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:15
+msgid "Choose what to do with existing data:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:3
 msgid "Choose which sets to be affected"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:491
-msgid "Class values"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:17
+msgid "Class List Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:55
+msgid "Class list (\".lst\") files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:326
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:316
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:37
 msgid "Classlist Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1220
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:91
 msgid "Clear Problem Display"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:638
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:82
 msgid ""
 "Click a student's name to see the student's homework set. Click a heading to "
 "sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:632
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:74
 msgid ""
 "Click a student's name to see the student's test summary page. Click a "
 "test's version number to see the corresponding test version. Click a heading "
 "to sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:597
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:150
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:143
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made. (The grade for each problem is listed "
+"as \"status\" on this third page)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:24
+msgid ""
+"Click on each of the tabs to view the configuration items. The question mark "
+"icon provides access to information about the behavior of the configuration "
+"settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:125
+msgid ""
+"Click on the column \"Assigned Sets\" in the student's row. This will take "
+"you to a page where you can assign and unassign homework sets and change the "
+"due dates for homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:33
+msgid ""
+"Click on the homework set links to edit the grades for this individual "
+"student on the homework set. (The grade of each problem is called the "
+"\"status\".) You can also change the number of allowed attempts and further "
+"modify the individual student's homework set.) You will also be able to "
+"change a student's seed which determines the individual values used in the "
+"individual version of the student's problem and the weight (how much a "
+"problem counts towards the grade.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:90
 msgid ""
 "Click on the login name to edit individual problem set data, (e.g. due "
 "dates) for these students."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:62
+msgid ""
+"Click the \"Add x student(s)\" radio button and then click \"Take action\". "
+"This will take you to a new page where the data can be entered for one or "
+"more students. It is also possible to assign the student to one or more "
+"problem sets as they are being entered: simply select the homework sets from "
+"the list below the data entry table. Use \"command\" or \"control\" click to "
+"select more than one homework set."
+msgstr ""
+
+#. ('<i class="fas fa-question-circle"></i>')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:88
+msgid "Click the %1 icon for page and item specific help."
+msgstr ""
+
+#. ('<a href="#"><i class="fas fa-question-circle"></i></a>')
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:20
+msgid "Click the icon %1 for page and item specific help."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:185
+msgid ""
+"Clicking on any active link at the top of the column sorts the page by that "
+"column. You can do lexigraphic sorts: click on \"First name\" then \"Last "
+"name\" to sort by last name, sorting those with the same last name by their "
+"first name."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:132
+msgid ""
+"Clicking on the login name link in a student's row allows you to view the "
+"student's version of the homework (rather than your own) so that you can "
+"more easily answer student questions about homework problems. (A \"acting as "
+"xxx\" alert will appear in the upper right corner of each window while you "
+"are acting as a student.) You can submit the answers (which will NOT be "
+"recorded) to check that the computer is grading the problem correctly. You "
+"will also be able to view past answers submitted by the student for each "
+"problem. To stop acting in the student's role click the \"Stop acting\" link "
+"in the upper right corner of the window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:199
+msgid ""
+"Clicking the <strong>e-mail address</strong> link will bring up your "
+"standard email application so that you can send email to the student. This "
+"works even if the student has been dropped from the course. To send email to "
+"an entire class or to merge grades with the email message use the \"Email\" "
+"page link in the left margin."
+msgstr ""
+
 #. ($clientIP->ip()
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:555
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:547
 msgid ""
 "Client ip address %1 is not allowed to work this assignment, because the "
 "assignment has ip address restrictions and there are no allowed locations "
@@ -1468,320 +2149,335 @@ msgid ""
 "problem resolved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:714
-msgid "Close"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:316
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:39
+msgid "Close Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:425
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:743
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:790
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:157
-msgid "Close Date"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:35
+msgid "Closed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:383
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:208
 msgid "Closed, answers available."
 msgstr ""
 
-#. ($self->formatDateTime($set->answer_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:379
+#. ($c->formatDateTime($set->answer_date, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:204
 msgid "Closed, answers on %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:381
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:206
 msgid "Closed, answers recently available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:282
 msgid "Closed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:117
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:121
 msgid "Closes"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date, undef,					$r->ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:125
-msgid "Closes %1"
-msgstr ""
-
-#. ($self->formatDateTime($verSet->due_date, undef, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:422
+#. ($c->formatDateTime($verSet->due_date, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:227
 msgid "Closes on %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:35
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:33
 msgid "Closes:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2477
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:357
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:71
 msgid "Collapse All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2488
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:367
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:85
 msgid "Collapse All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2624
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:419
 msgid "Collapse Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2738
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:572
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:575
 msgid "Collapse Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:238
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:245
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:225
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:569
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1966
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:299
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:816
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:845
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:874
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:903
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:73
+msgid ""
+"Collapse problem details to the top row of information about a problem. Note "
+"that the details of a single problem can be collapsed by clicking on the up "
+"arrow to the right of the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1617
+msgid ""
+"Comma separated list of set names that are excluded from all achievements. "
+"No achievement points and badges can be earned for submitting problems in "
+"these sets. Note that underscores (_) must be used for spaces in set names."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:131
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:46
 msgid "Comment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:200
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:25
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:181
 msgid "Comment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:569
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:86
 msgid "Comments"
 msgstr ""
 
-#. ($self->formatDateTime($set->answer_date)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2160
-msgid "Completed results for this assignment are not available until %1"
+#. ($c->formatDateTime($c->{set}->answer_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:379
+msgid "Completed results for this assignment are not available until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2162
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:382
 msgid "Completed results for this assignment are not available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:454
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:472
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:264
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:280
 msgid "Completed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:400
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:45
 msgid "Compose Email Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3098
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:47
+msgid ""
+"Configure ip ranges (locations) that can be used to restrict set access."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:45
+msgid "Configure which course links appear on the site landing page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:97
 msgid "Confirm"
 msgstr ""
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:118
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:181
+#. ($eUserName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:41
 msgid "Confirm %1's New Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:579
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:78
 msgid "Confirm Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1456
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_export_form.html.ep:1
 msgid "Confirm which sets to export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementEvaluator.pm:275
+#: /opt/webwork/webwork2/templates/AchievementEvaluator/cheevoMessage.html.ep:15
 msgid "Congratulations, you earned a new level!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2250
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:95
 msgid "Continue"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:580
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:86
 msgid "Continue Open Test"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:59
+msgid "Controls if an achievement is evaluated or not."
+msgstr ""
+
 #. ($sourceDirectory, $outputDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1150
-msgid "Copied auxiliary files from %1 to new location at %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:671
+msgid "Copied auxiliary files from %1 to new location at %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:365
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:737
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:42
 msgid "Copy"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:737
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
 msgid "Copy file as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:528
-msgid "Copy simple configuration file to new course"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:627
-msgid "Copy templates from:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:112
+msgid "Copy from:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1290
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:82
 msgid "Copy this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2081
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:392
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:465
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:301
 msgid "Correct"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:671
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:678
 msgid "Correct Adjusted Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:300
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:287
 msgid "Correct Answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1653
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:19
 msgid "Correct Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1449
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1317
 msgid "Correct Answers:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:667
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:693
 msgid "Correct Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:579
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:93
 msgid "Correct answers"
 msgstr ""
 
 #. ($total_correct, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:990
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:16
 msgid "Correct: %1/%2"
 msgstr ""
 
 #. ($newBlankProblems, $MAX_NEW_PROBLEMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1843
 msgid ""
 "Could not add %1 problems to this set.  The number must be between 1 and %2"
 msgstr ""
 
 #. ($e_user_name, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:103
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:74
 msgid "Couldn't change %1's password: %2"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:210
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:111
 msgid "Couldn't change your email address: %1"
 msgstr ""
 
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4024
-msgid "Couldn't find OPL Branch %1 in remote %2"
-msgstr ""
-
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3989
-msgid "Couldn't find PG Branch %1 in remote %2"
-msgstr ""
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3927
-msgid "Couldn't find WeBWorK Branch %1 in remote %2"
-msgstr ""
-
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:317
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:132
 msgid "Couldn't save your display options: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1454
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:36
 msgid "Counter"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:425
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:839
-msgid "Counts for Parent"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:66
+msgid "Counter:"
 msgstr ""
 
-#. ($rename_oldCourseID)
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1220
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2122
-msgid "Course %1 database is in order"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:503
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:35
+msgid "Counts for Parent"
 msgstr ""
 
-#. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1222
-msgid "Course %1 databases must be updated before renaming this course."
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:154
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:9
+msgid "Course Administration"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:89
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:138
-msgid "Course Administration"
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:17
+msgid "Course Administration Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:369
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:80
 msgid "Course Configuration"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:480
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:17
+msgid "Course Configuration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:17
+msgid "Course Home Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:21
 msgid "Course ID"
 msgstr ""
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1333
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2486
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:691
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:594
 msgid "Course ID cannot exceed %1 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1336
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1227
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:597
 msgid "Course ID may only contain letters, numbers, hyphens, and underscores."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:956
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:21
 msgid "Course ID:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:5
 msgid "Course Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1627
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1924
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2404
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3649
-msgid "Course Name:"
+#. ($c->stash('courseID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:325
+msgid "Course Information for course %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:491
-msgid "Course Title"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:30
+msgid "Course Listings"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:17
+msgid "Course Name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:204
-msgid "Course archived."
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:28
+msgid "Course Title"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:780
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:418
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:12
 msgid "Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1572
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1867
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3587
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:13
 msgid ""
 "Courses are listed either alphabetically or in order by the time of most "
 "recent login activity, oldest first. To change the listing order check the "
@@ -1790,522 +2486,712 @@ msgid ""
 "\"hidden\" or \"visible\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:512
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:7
+msgid ""
+"Courses are listed either alphabetically or in order by the time of most "
+"recent login activity, oldest first. To change the listing order check the "
+"mode you want and click \"Refresh Listing\". The listing format is: "
+"Course_Name (status :: date/time of most recent login) where status is "
+"\"hidden\" or \"visible\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:163
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:84
 msgid "Create"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:41
 msgid "Create CSV"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2967
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:31
 msgid "Create Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1094
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:39
+msgid ""
+"Create a .tar.gz archive which includes the course's database and all course "
+"files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:33
 msgid "Create a New Set in This Course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:756
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:4
 msgid "Create a new achievement with ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1103
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:33
+msgid "Create a new course on this server."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:20
+msgid ""
+"Create a new course.  The \"Course ID\" is used as the course name and is "
+"used in course links.  Underscores appear as spaces when displaying the "
+"course name.  The \"Course Title\" is used as the title on the course home "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:86
+msgid ""
+"Create a new set with a given name. This can either create an empty set or a "
+"duplicate of an existing set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:12
+msgid "Create as what type of achievement?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:12
 msgid "Create as what type of set?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1836
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:20
+msgid "Create backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:81
 msgid "Create unattached problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1812
-msgid ""
-"Creates a gzipped tar archive (.tar.gz) of a course in the WeBWorK courses "
-"directory. Before archiving, the course database is dumped into a "
-"subdirectory of the course's DATA directory. Currently the archive facility "
-"is only available for mysql databases. It depends on the mysqldump "
-"application."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:121
+msgid "Create/Delete achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:699
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:26
 msgid "Cupcake of Enlargement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:727
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:38
 msgid "Current"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2955
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:2
 msgid "Currently defined locations are listed below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4220
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2365
 msgid "Database tables are ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2683
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:54
 msgid "Database tables need updating."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2682
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:52
 msgid "Database tables ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2884
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1499
 msgid "Database:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:728
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:153
 msgid "Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:425
-msgid "Debug"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:96
+msgid "Dates"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:726
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:345
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:356
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:40
+msgid ""
+"Dates for problem sets can be edited by clicking the pencil icon in the "
+"\"Edit Set Data\" column next to the set name. To change dates for several "
+"sets at once, click the check box in the \"Select\" column and choose \"Edit "
+"selected\" from the tasks above."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:426
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:37
 msgid "Default"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:206
+#: /opt/webwork/webwork2/conf/defaults.config:1577
 msgid ""
 "Default Amount of Time (in minutes) after Due Date that Answers are Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:200
+#: /opt/webwork/webwork2/conf/defaults.config:1567
 msgid ""
 "Default Amount of Time (in minutes) before Due Date that the Assignment is "
 "Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:264
+#: /opt/webwork/webwork2/conf/defaults.config:1687
 msgid "Default Length of Reduced Scoring Period in minutes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:194
+#: /opt/webwork/webwork2/conf/defaults.config:1557
 msgid "Default Time that the Assignment is Due"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1718
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:696
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:162
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:91
+#: /opt/webwork/webwork2/conf/defaults.config:1710
+msgid ""
+"Default number of attempts before Show Me Another can be used (-1 => Never)"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1994
+msgid ""
+"Default number of attempts before hints are shown in a problem (-1 => hide "
+"hints)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:89
 msgid "Delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1519
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1614
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1691
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:49
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:36
 msgid "Delete Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3393
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:17
+msgid "Delete Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:23
+msgid "Delete Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:37
+msgid "Delete a course and all associated data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:109
+msgid "Delete a student from a course"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:52
 msgid "Delete all existing addresses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1952
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:65
+msgid "Delete backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:64
+msgid "Delete backup from %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:54
 msgid "Delete course after archiving. Caution there is no undo!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1943
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:49
 msgid "Delete course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2754
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2348
+msgid "Delete field when upgrading"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:588
 msgid "Delete it?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2968
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:78
 msgid "Delete location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1023
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:28
+msgid "Delete oldest backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2321
+msgid "Delete table when upgrading"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:90
+msgid "Delete the sets checked below. Be careful, this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:6
+msgid "Delete which achievements?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:6
 msgid "Delete which sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1024
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:6
 msgid "Delete which users?"
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1078
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:394
 msgid "Deleted %1 users."
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:744
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:358
 msgid "Deleted %quant(%1,achievement)"
 msgstr ""
 
 #. (join(', ', @delLocations)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3272
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1810
 msgid "Deleted Location(s): %1"
 msgstr ""
 
 #. (join(', ', @toDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3510
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1966
 msgid "Deleted addresses %1 from location."
 msgstr ""
 
-#. ($self->shortPath($self->{tempFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1159
-msgid "Deleting temp file at %1"
+#. ($formatBackupTime)
+#. ($c->formatDateTime($delTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1243
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:569
+msgid "Deleted backup from %1."
+msgstr ""
+
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:679
+msgid "Deleted temp file at %1"
+msgstr ""
+
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1219
+msgid "Deleted temporary file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:125
+msgid "Deleting Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3065
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:68
 msgid ""
 "Deletion deletes all location data and related addresses, and is not "
 "undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:692
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:3
 msgid "Deletion destroys all achievement-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:186
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
 msgid "Deny From"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3127
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:105
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:27
 msgid "Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:260
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:71
+msgid "Description:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:69
 msgid "Deselect All Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:869
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:229
 msgid "Deselect All Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:465
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:366
 msgid "Didn't recognize action"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:27
 msgid "Directory"
 msgstr ""
 
 #. ($file, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:791
-msgid "Directory '%1' not removed: %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:327
+msgid "Directory \"%1\" not removed: %2"
 msgstr ""
 
 #. ($file, $removed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:790
-msgid "Directory '%1' removed (items deleted: %2)"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:412
-msgid "Directory permission errors "
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:325
+msgid "Directory \"%1\" removed (items deleted: %2)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2135
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2790
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2904
-msgid "Directory structure"
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:33
+msgid "Directory permission errors"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2137
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2792
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1439
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1575
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:44
 msgid ""
 "Directory structure is missing directories or the webserver lacks sufficient "
 "privileges."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1233
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2136
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2791
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2906
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1434
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1570
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:41
 msgid "Directory structure is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2206
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:102
 msgid "Directory structure needs to be repaired manually before archiving."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1301
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:84
 msgid "Directory structure needs to be repaired manually before renaming."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2679
-msgid "Directory structure or permissions need to be repaired. "
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:48
+msgid "Directory structure or permissions need to be repaired."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1414
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1540
+msgid "Directory structure:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:92
+msgid "Display Mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2493
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:387
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:90
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:104
 msgid "Display Mode:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:455
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:37
 msgid "Display Past Answers"
 msgstr ""
 
-# $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:318
-msgid "Display of scores for this set is not allowed."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:44
+msgid "Display mode for equations"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:311
+msgid "Display of scores for this test is not allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:534
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:12
 msgid "Display options: Show"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:381
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:48
+msgid ""
+"Display sets matching a selected criteria. Useful if there are many sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1918
 msgid "Display the evaluated student answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:171
+#. ('<code>COURSENAME_totals.csv</code>', '<code>COURSENAME_totals_bak1.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:74
+msgid ""
+"Do NOT use the file name %1, since you might accidentally overwrite that if "
+"you again export your WeBWorK homework scores. (Actually the earlier file is "
+"moved to %2 -- so you can recover using the File Manager.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:57
 msgid "Do not unassign students unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:233
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:67
 msgid "Do not uncheck a set unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:20
 msgid "Do not uncheck students, unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2193
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2209
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:656
+msgid "Do you want to grade this test?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:93
+msgid "Documentation from source code for PG modules and macro files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:95
 msgid "Don't Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2527
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:13
 msgid "Don't Unarchive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2815
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:46
 msgid "Don't Upgrade"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1712
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:15
 msgid "Don't delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1117
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:24
 msgid "Don't make changes"
 msgstr ""
 
 #. ($saveMode)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:645
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:317
 msgid "Don't recognize saveMode: |%1|. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1284
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1298
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:87
 msgid "Don't rename"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:546
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:33
 msgid "Don't use in an achievement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:711
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1314
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2440
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:491
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1595
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:766
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:57
 msgid "Done"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:159
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:8
 msgid "Download"
 msgstr ""
 
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($set->set_id)
 #. ($ver->{id} =~ s/_/ /gr)
-#. ($set->set_id =~ s/_/ /gr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:749
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:750
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:412
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:204
 msgid "Download %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:309
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:23
 msgid "Download Hardcopy"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:885
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:56
 msgid "Download PDF or TeX Hardcopy for Current Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:875
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:233
 msgid "Download PDF or TeX Hardcopy for Selected Tests"
 msgstr ""
 
-#. ($selected_set_id,			$user->first_name . " " . $user->last_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:528
+#. (tag('span', dir => 'ltr', format_set_name_display($selected_set_id =~ s/,v(\d+)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:58
 msgid "Download hardcopy of set %1 for %2?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:369
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:63
+msgid "Download/upload archived courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:46
 msgid "Download:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:118
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:93
 msgid "Drop"
 msgstr ""
 
-#. ($self->formatDateTime($set->reduced_scoring_date, undef,					$r->ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:119
-msgid "Due %1, after which reduced scoring is available until %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:100
+msgid "Drop student from the course"
 msgstr ""
 
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:488
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:310
 msgid "Due date %1 has passed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:393
-msgid ""
-"During summer 2005, a newer version of the answer checkers was implemented "
-"for answers which are functions and numbers.  The newer checkers allow more "
-"functions in student answers, and behave better in certain cases.  Some "
-"problems are specifically coded to use new (or old) answer checkers.  "
-"However, for the bulk of the problems, you can choose what the default will "
-"be here.  <p>Choosing <i>false</i> here means that the newer answer checkers "
-"will be used by default, and choosing <i>true</i> means that the old answer "
-"checkers will be used by default."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:413
+#: /opt/webwork/webwork2/conf/defaults.config:2014
 msgid "E-Mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:352
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:261
 msgid "E-mail Instructor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:431
-msgid "E-mail addresses which can receive e-mail from a pg problem"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:436
+#: /opt/webwork/webwork2/conf/defaults.config:2049
 msgid ""
 "E-mail feedback from students automatically sent to this permission level "
-"and higher:"
+"and higher"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:421
+#: /opt/webwork/webwork2/conf/defaults.config:2030
 msgid "E-mail verbosity level"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:394
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:43
 msgid "E-mail:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:35
 msgid "Earned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1471
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1472
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:71
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:158
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:362
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:391
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:460
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:558
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2382
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2689
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1599
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:291
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1186
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1203
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:257
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:479
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:6
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:53
 msgid "Edit"
 msgstr ""
 
-#. (CGI::a({ href => $basicInfoUrl }, $r->maketext('class list data')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:199
-msgid "Edit %1 for  %2 (%3) who has been assigned %4 sets."
+#. (link_to(maketext('class list data')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:47
+msgid "Edit %1 for %2 (%3) who has been assigned %4 sets."
 msgstr ""
 
-#. (CGI::a({ href => $editUsersAssignedToSetURL }, $r->maketext('individual versions')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2204
-msgid "Edit %1 of set %2."
+#. (link_to(maketext('individual user settings')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:162
+msgid "Edit %1 for set %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:420
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:6
 msgid "Edit Assigned Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:40
 msgid "Edit Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1400
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:58
 msgid "Edit Evaluator"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2378
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:253
 msgid "Edit Header"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2966
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:18
 msgid "Edit Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:111
 msgid "Edit Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:5
 msgid "Edit Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:569
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:3
 msgid "Edit Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:422
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:4
 msgid "Edit Set Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1084
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:171
+msgid "Edit Tags"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:30
 msgid "Edit Target Set"
 msgstr ""
 
-#. ($user)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:208
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:18
+msgid "Edit Users"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:127
+msgid "Edit achievement evaluator"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:90
+msgid "Edit achievement information"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:65
+msgid ""
+"Edit achivements for the course. This link is only present if achievements "
+"are enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:42
+msgid "Edit class list data"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:39
+msgid ""
+"Edit class roster data. Add students, edit student data, drop students from "
+"class, import students from a classlist, and give user professor privileges. "
+"Access to individual homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:70
 msgid "Edit data for %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1278
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:46
+msgid ""
+"Edit homework sets for entire class. Change homework set due dates, create "
+"new sets from a set definition file, create new homework sets, make sets "
+"visible/invisible, score homework sets. Assign homework sets to the class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:219
 msgid "Edit it"
 msgstr ""
 
-#. (CGI::strong($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2181
-msgid "Edit set %1 data for ALL students assigned to this set."
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:135
+msgid "Edit set %1 for ALL students assigned to this set."
 msgstr ""
 
-#. (CGI::a({href=>$editSetLink},$setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2150
+#. (link_to(						$setID => $c->systemLink(							$setDetailPage, params => { effectiveUser => $user->user_id, editForUser => $user->user_id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:106
 msgid "Edit set %1 for this user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3306
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:95
+msgid "Edit set for %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:4
 msgid ""
 "Edit the current value of the location description, if desired, then add and "
 "select addresses to delete, and then click the \"Take Action\" button to "
@@ -2313,138 +3199,215 @@ msgid ""
 "changes and return to the Manage Locations page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:808
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:2
+msgid "Edit which achievements?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:2
 msgid "Edit which sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:918
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:2
 msgid "Edit which users?"
 msgstr ""
 
-#. ($titles{$file_type}, $self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:600
-msgid "Editing %1 in file '%2'"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:31
+msgid "Editing <strong>course information</strong> file \"%1\"."
 msgstr ""
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:211
-msgid "Editing achievement in file '%1'"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:30
+msgid "Editing <strong>hardcopy header</strong> file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:28
+msgid "Editing <strong>new problem</strong> template."
+msgstr ""
+
+#. ($c->{prettyProblemNumber},				tag('span', dir => 'ltr', format_set_name_display($fullSetName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:45
+msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:29
+msgid "Editing <strong>set header</strong> file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:33
+msgid "Editing <strong>unassigned problem</strong> file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:32
+msgid "Editing <strong>unknown file type</strong> in file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:19
+msgid "Editing Modes"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:140
+msgid "Editing Problems"
+msgstr ""
+
+#. ($c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:16
+msgid "Editing achievement in file \"%1\""
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:22
+msgid "Editing for all students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:23
+msgid "Editing for one student or a proper subset of all students"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3303
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:1
 msgid "Editing location %1"
 msgstr ""
 
-#. (CGI::strong("$setID$vermsg")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2173
-msgid "Editing problem set %1 data for these individual students: %2"
+#. (tag(						'strong',						dir => 'ltr',						format_set_name_display($setID . ($editingSetVersion ? ",v$editingSetVersion" : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:123
+msgid "Editing problem set %1 for these students: %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:406
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:315
 msgid "Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:709
-msgid "Editor rows:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:570
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:712
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1651
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:489
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:229
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:53
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:68
 msgid "Email"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:32
 msgid "Email Address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:830
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:170
 msgid "Email Body:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:297
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:17
+msgid "Email Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:339
 msgid "Email Instructor On Failed Attempt"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1961
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:28
 msgid "Email Link"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:802
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:112
 msgid "Email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1736
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1761
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1786
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:311
+msgid "Email body is empty. No message sent. "
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:994
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_email.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_form.html.ep:24
 msgid "Email instructor"
 msgstr ""
 
-#. (scalar(@{ $self->{ra_send_to} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:494
+#. (scalar(@{ $c->{ra_send_to} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:27
+msgid ""
+"Email is being sent to %quant(%1,recipient). You will be notified by email "
+"when the task is completed.  This may take several minutes if the class is "
+"large."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:13
+msgid "Email:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:26
 msgid ""
-"Email is being sent to %quant(%1,recipient). You will be notified by email\n"
-"\t\t\t\twhen the task is completed.  This may take several minutes if the "
-"class is\n"
-"\t\t\t\tlarge."
+"Emails can contain personalized data, such as name, section, or status.  "
+"Click \"List of insertable macros\" for a full list available variables.  "
+"Additional personal data can be included by using a merge file.  A merge "
+"file is a CSV file located in the [Scoring] directory in which the first "
+"column is the student id, followed by additional data (such as student "
+"grades).  This data is identified by which column it is in, for instance if "
+"the scores where in the 4th column of the merge file, insert them into an "
+"email using the variable $COL[4].  The \"Scoring Tools\" page can export "
+"grades into a CSV that can be used as a merge file.  Upload customized merge "
+"files with the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:557
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:11
 msgid "Emails to be sent to the following:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:224
-msgid "Enable Achievement Items"
+#: /opt/webwork/webwork2/conf/defaults.config:1606
+msgid "Enable Achievement Rewards"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:229
+#: /opt/webwork/webwork2/conf/defaults.config:1625
 msgid "Enable Conditional Release"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:214
+#: /opt/webwork/webwork2/conf/defaults.config:1591
 msgid "Enable Course Achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:189
+#: /opt/webwork/webwork2/conf/defaults.config:1547
 msgid "Enable Progress Bar and current problem highlighting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:570
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:234
+#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Enable Reduced Scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:269
+#: /opt/webwork/webwork2/conf/defaults.config:1701
 msgid "Enable Show Me Another button"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:287
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:24
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:92
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1746
 msgid "Enable periodic re-randomization of problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:401
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:29
 msgid ""
 "Enable reduced scoring for a homework set.  This will allow you to submit "
 "answers for partial credit for 24 hours after the close date."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1467
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:20
 msgid "Enabled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:288
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:58
+msgid "Enabled:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1748
 msgid ""
 "Enables periodic re-randomization of problems after a given number of "
 "attempts. Student would have to click Request New Version to obtain new "
 "version of the problem and to continue working on the problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:230
+#: /opt/webwork/webwork2/conf/defaults.config:1627
 msgid ""
 "Enables the use of the conditional release system.  To use conditional "
 "release you need to specify a list of set names on the Problem Set Detail "
@@ -2453,550 +3416,677 @@ msgid ""
 "sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:179
-msgid ""
-"Enables the use of the date picker on the Homework Sets Editor 2 page and "
-"the Problem Set Detail page"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:270
+#: /opt/webwork/webwork2/conf/defaults.config:1703
 msgid ""
 "Enables use of the Show Me Another button, which offers the student a newly-"
 "seeded version of the current problem, complete with solution (if it exists "
 "for that problem)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:118
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:163
+msgid "End"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:93
 msgid "Enrolled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:801
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:111
 msgid "Enrolled, Drop, etc."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:813
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:842
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:871
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:900
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:128
 msgid "Enrollment Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1257
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:21
 msgid "Enter filename below"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1269
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:20
 msgid "Enter filenames below"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:19
 msgid ""
 "Enter information below for students you wish to add. Each student's "
 "password will initially be set to their student ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:297
-msgid "Entered"
+#: /opt/webwork/webwork2/conf/defaults.config:1899
+msgid ""
+"Enter one of the allowed display mode types above.  See 'display modes "
+"entry' for descriptions."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:34
+msgid ""
+"Enter the details of the course instructor to be added when the course is "
+"created.  This user will also be added to the admin course with the username "
+"\"userID_courseID\" so you can manage and email the instructors of the "
+"courses on the server."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:85
-msgid "Entered student:"
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:284
+msgid "Entered"
 msgstr ""
 
-#. ($display_sort_method_name{$primary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:643
+#. ($display_sort_method_name{$primary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:98
 msgid "Entries are sorted by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:190
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:247
 msgid "Equation Display"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:61
+msgid "Equation Editor"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1500
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1460
 msgid "Error adding set-level proctor: %1"
 msgstr ""
 
+#. ($fromPath, $toPath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:664
+msgid "Error copying %1 to %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:14
+msgid "Error details"
+msgstr ""
+
+#. ($filePath, stash('podError')
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:27
+msgid "Error generating POD for file %1: %2"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1476
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1437
 msgid ""
 "Error getting old set-proctor password from the database: %1.  No update to "
 "the password was done."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:31
 msgid "Error message:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2201
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:12
 msgid "Error messages"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1579
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:754
 msgid "Error: Answer date must come after close date in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1575
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:747
 msgid "Error: Close date must come after open date in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1597
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:778
 msgid ""
 "Error: Reduced scoring date must come between the open date and close date "
 "in set %1"
 msgstr ""
 
-#. ($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2035
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:7
 msgid "Error: The original file %1 cannot be read."
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1218
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1568
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1240
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:738
 msgid "Error: answer date cannot be more than 10 years from now in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1565
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1235
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:733
 msgid "Error: close date cannot be more than 10 years from now in set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:628
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:234
 msgid "Error: no file data was submitted!"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1210
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1562
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:728
 msgid "Error: open date cannot be more than 10 years from now in set %1"
 msgstr ""
 
-#. ($problem_desc, $problem_name, CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1347
+#. ($problem_desc, $problem_name, $c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1210
 msgid ""
 "Errors encountered while processing %1. This %2 has been omitted from the "
 "hardcopy. Error text: %3"
 msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3745
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:8
+msgid "Errors occured while generating hardcopy:"
+msgstr ""
+
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2128
 msgid ""
 "Errors occured while hiding the courses listed below when attempting to "
 "create the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3833
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2197
 msgid ""
 "Errors occured while unhiding the courses listed below when attempting "
 "delete the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1472
-msgid "Evaluator"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:28
+msgid "Evaluator File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1457
-msgid "Evaluator File"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:76
+msgid "Evaluator File:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3752
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:28
+msgid "Evaluator Variables"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2143
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
-"hidden."
+"Except for the errors listed above, all selected courses are already hidden."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3817
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2212
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
+"Except for the errors listed above, all selected courses are already "
 "unhidden."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3369
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:39
 msgid ""
 "Existing addresses for the location are given in the scrolling list below.  "
 "Select addresses from the list to delete them:"
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2258
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1460
 msgid "Existing file %1 could not be backed up and was lost."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2473
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:354
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:65
 msgid "Expand All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2484
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:364
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:78
 msgid "Expand All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2623
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:418
 msgid "Expand Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2737
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:574
 msgid "Expand Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:74
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:965
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:89
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:67
+msgid ""
+"Expand problem details that have been collapsed. Note that the details of a "
+"single problem can be expanded by clicking on the down arrow to the right of "
+"the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:71
 msgid "Export"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1018
-msgid "Export selected achievements."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:113
+msgid "Export achievement data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1249
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_export_form.html.ep:1
+msgid "Export selected achievements"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:17
 msgid "Export to what kind of file?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1227
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:2
+msgid "Export which achievements?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:5
 msgid "Export which users?"
 msgstr ""
 
 #. ($FileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1070
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:591
 msgid "Exported achievements to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1564
-msgid "Extend the close date for which Gateway?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:48
+msgid "Extend the close date for which test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1521
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:148
+msgid "Extend the number of attempts allowed a student on a given problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:28
 msgid ""
-"Extends the close date of a gateway test by 24 hours. Note: The test must "
-"still be open for this to work."
+"Extends the close date of a test by 24 hours. Note: The test must still be "
+"open for this to work."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "FIRST NAME"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Failed to add user:"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:826
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:416
 msgid "Failed to create new achievement: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:789
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:373
 msgid "Failed to create new achievement: no achievement ID specified!"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1219
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:573
 msgid "Failed to create new set: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1135
-msgid "Failed to create new set: no set name specified!"
+#. ($newSetID =~ s/_/ /gr)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:482
+msgid ""
+"Failed to create new set: Invalid characters in set name \"%1\". A set name "
+"may only contain letters, numbers, hyphens, periods, and spaces."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:474
+msgid "Failed to create new set: No set name specified."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1132
-msgid "Failed to create new set: set name cannot exceed 100 characters."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:469
+msgid "Failed to create new set: Set name cannot exceed 100 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:808
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:396
 msgid ""
 "Failed to duplicate achievement: no achievement selected for duplication!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1179
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:530
 msgid "Failed to duplicate set: no set selected for duplication!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:74
-msgid "Failed to enter student:"
+#. ($@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:67
+msgid "Failed to generate course archive: %1"
 msgstr ""
 
 #. ($scoreFilePath)
 #. ($filePath)
 #. ($FilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1045
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:882
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1584
 msgid "Failed to open %1"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:625
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:227
 msgid "Failed to save: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#. ($_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:253
+msgid "Failed to send message: %1"
+msgstr ""
+
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:23
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:36
 msgid "False"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1890
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:63
 msgid "Feature exhausted for this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:199
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:23
+msgid "Features:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:252
 msgid "Feedback"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:446
+#: /opt/webwork/webwork2/conf/defaults.config:2070
 msgid "Feedback by Section."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:234
 msgid "FeedbackMessage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2065
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4171
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2284
 msgid "Field is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2063
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4169
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2286
 msgid "Field missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1162
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2064
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4170
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
 msgid "Field missing in schema"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:598
-msgid "File '%1' exists.  File not saved.  No changes have been made."
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:266
+msgid "File \"%1\" exists.  File not saved.  No changes have been made."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1896
-msgid ""
-"File '%1' exists. File not saved. No changes have been made.  You can change "
-"the file path for this problem manually from the 'Hmwk Sets Editor' page"
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1036
+msgid "File \"%1\" exists. File not saved. No changes have been made."
 msgstr ""
 
-#. ($file,$!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:794
-msgid "File '%1' not removed: %2"
+#. ($file, $!)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:333
+msgid "File \"%1\" not removed: %2"
 msgstr ""
 
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:793
-msgid "File '%1' successfully removed"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+msgid "File \"%1\" successfully removed"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1064
-msgid "File '%1' uploaded successfully"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:522
+msgid "File \"%1\" uploaded successfully"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1024
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:476
 msgid "File <b>%1</b> already exists. Overwrite it, or rename it as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:435
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:364
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:55
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:70
 msgid "File Manager"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:626
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:17
+msgid "File Manager Help"
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:541
+msgid "File not saved. Failed to open \"%1\" for writing."
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:528
+msgid ""
+"File not saved. The file \"%1\" is not contained in the templates directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:921
+msgid ""
+"File not saved. The file name for this problem does not match the file name "
+"the editor was opened with. The problem set may have changed. Please reopen "
+"this file from the homework sets editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:228
 msgid "File saved"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:731
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:272
 msgid "File successfully copied"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:756
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:295
 msgid "File successfully renamed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1267
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:29
 msgid "Filename"
 msgstr ""
 
-#. ($extension,$location)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1294
-msgid "Files with extension '.%1' usually belong in '%2'"
+#. ($extension, $location)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:699
+msgid "Files with extension \".%1\" usually belong in \"%2\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:20
+msgid ""
+"Fill out the form below to add, edit, or delete locations.  Locations are "
+"used to restrict access to sets based on ip address.  Locations are "
+"configured here in the administration course, then used in a normal course.  "
+"When configuring a set to use a restricted ip address, the instructor can "
+"choose to either restrict access to the location or deny access from a "
+"location, which are identified by their name.  Instructors can select "
+"multiple locations to restrict access to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:78
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:47
 msgid "Filter"
 msgstr ""
 
 #. ($recitation)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1185
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1420
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:913
 msgid "Filter by recitation %1"
 msgstr ""
 
 #. ($section)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1181
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1092
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1416
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:910
 msgid "Filter by section %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:716
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:31
 msgid "Filter by what text?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:151
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:17
 msgid "Filter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:694
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:137
 msgid "First"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:593
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1959
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:810
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:839
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:868
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:897
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:87
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:21
 msgid "First Name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:797
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:107
 msgid "First name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:178
 msgid ""
 "For security reasons, you cannot specify a message file from a directory "
 "higher than the email directory (you can't use ../blah/blah for example). "
 "Please specify a different file or move the needed file to the email "
-"directory"
+"directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:30
+msgid "Force editor to RTL"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2873
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:674
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:101
 msgid "Force problems to be numbered consecutively from one"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:407
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:35
+msgid "Form Elements Present on the Page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:75
 msgid "Format"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:415
+#: /opt/webwork/webwork2/conf/defaults.config:2017
 msgid "Format for the subject line in feedback e-mails"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:172
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:133
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:10
 msgid "Format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:453
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:12
 msgid "Found no directories containing problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1135
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:43
 msgid "From This Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:318
 msgid "From field must contain one valid email address."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:377
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:661
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:20
+msgid ""
+"From this page you can <strong>add new students</strong>, <strong>edit</"
+"strong> class list data (name, email address, recitation, section, "
+"permission level, and enrollment status), <strong>change passwords</strong>, "
+"and <strong>export</strong> (save) class lists for back-up or use in another "
+"course. You can also delete students from the class roster, but this cannot "
+"be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:34
 msgid "From:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1425
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:59
 msgid "GLOBAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1463
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1566
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1671
-msgid "Gateway Name "
+#: /opt/webwork/webwork2/conf/defaults.config:1427
+msgid "General"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:208
-msgid "Gateway Quiz %2"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:201
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:30
+msgid "General Information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:845
-msgid "Gateway parameters"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:116
+msgid "General Page Information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:129
-msgid "General"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:121
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:166
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:167
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:113
+msgid "Generate Hardcopy"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2284
-msgid "General Information"
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:73
+msgid "Generate Hardcopy for Selected Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:676
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:696
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:223
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:224
-msgid "Generate Hardcopy"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:115
+msgid ""
+"Generate a hardcopy of the problem being edited. This does not change the "
+"permanent file on the disk. You can generate a hardcopy for different "
+"versions of the same problem by changing the seed. You can also change the "
+"format to \"PDF\" or \"TeX Source\". If \"PDF\" is selected, then a PDF file "
+"will be generated for download, unless there are errors. If errors occur or "
+"\"TeX Source\" is selected, then a zip file will be generated for download "
+"that contains the TeX source file and resources needed for generating the "
+"PDF file using pdflatex."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:266
-msgid "Generate Hardcopy for Selected Sets"
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:20
+msgid ""
+"Generate hardcopies of assignments in PDF or latex format. To produce a "
+"hardcopy, one selects the users on the left and the sets on the right. All "
+"users and sets are listed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:675
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:170
 msgid "Generate hardcopy for selected sets and selected users"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:185
-#: /opt/webwork/pg/macros/problemRandomize.pl:186
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:186
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:187
 msgid "Get a new version of this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:969
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:2
 msgid "Give new password to which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1031
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:27
 msgid "Gives full credit on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1146
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:27
 msgid "Gives full credit on every problem in a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:817
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:27
 msgid "Gives half credit on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:939
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:27
 msgid "Gives half credit on every problem in a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1431
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:62
 msgid "Global Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1452
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:76
 msgid "Global Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1411
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:49
 msgid "Global Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1413
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:51
 msgid ""
 "Global data on problem usage is contributed by many institutions using "
 "WeBWorK all over the world. The Usage figure is the total number of  "
@@ -3006,187 +4096,324 @@ msgid ""
 msgstr ""
 
 #. ($problemID, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1533
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1489
 msgid "Global problem %1 for set %2 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2077
+#. ($c->{prettyID}, $c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:378
+msgid "Global problem %1 not found for set %2."
+msgstr ""
+
+#. ($c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:142
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:372
+msgid "Global set %1 not found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:77
 msgid "Global set data will be shown instead of user specific data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:28
 msgid "Go"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:483
 msgid "Go back to Part 1"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:291
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
-#: /opt/webwork/pg/macros/compoundProblem.pl:491
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:293
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:498
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:512
 msgid "Go on to next part"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2607
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:544
 msgid "Grade"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2605
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:727
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:989
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:541
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:75
 msgid "Grade Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2400
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:651
 msgid "Grade Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:474
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:148
+msgid "Grade of Active Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:55
 msgid "Grade passback mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:843
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:38
 msgid "Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:246
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:236
 msgid "Grades"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:110
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:17
+msgid "Grades Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:115
 msgid "Grades have been saved for all current users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:224
-msgid "Grading assignment:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:28
+msgid "Grading Assignment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1030
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:152
+msgid "Grading Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:26
 msgid "Greater Rod of Revelation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1145
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:26
 msgid "Greater Tome of Enlightenment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:272
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:50
+msgid ""
+"Groups types of achievements. The \"level\" and \"secret\" categories are "
+"special (described above), and categories can be used to create achievement "
+"chains."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:74
 msgid "Guest Login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2217
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:86
+msgid "Guest:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:33
 msgid "HTTP Headers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:613
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:35
+msgid "Hardcopy Format"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:115
 msgid "Hardcopy Format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:264
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:273
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:285
 msgid "Hardcopy Generator"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:101
 msgid "Hardcopy Header"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:655
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:170
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:324
+msgid "Hardcopy Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:17
+msgid "Hardcopy Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:153
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:44
 msgid "Hardcopy Theme"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:409
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:427
 msgid "Hardcopy will always print the original version of the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2330
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:31
 msgid "Headers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:990
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:296
 msgid "Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:542
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:170
+msgid "Help Icon"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:30
+msgid ""
+"Here is a list of the variables the evaluator has access to. Unless "
+"indicated, changes to the variables will not be saved.  Evaluators are run "
+"in the same order they are listed on the achievement editor page and are "
+"only run if the achievement has not been earned. Keep this in mind when "
+"using persistent global data."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:507
 msgid "Here is a new version of your problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:892
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:42
 msgid "Hidden"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2467
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:347
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:62
 msgid "Hide All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3576
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3631
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:384
-msgid "Hide Courses"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:17
+msgid "Hide Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:429
-msgid "Hide Hints"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:57
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:44
+msgid "Hide Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:404
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:477
 msgid "Hide Hints from Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1596
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:63
+msgid "Hide all rendered problems on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:252
 msgid "Hide this problem"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1523
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1524
 msgid "Hint:"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1522
 msgid "Hint: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:589
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:420
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:99
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:51
 msgid "Hints"
 msgstr ""
 
 # Hmwk is short for Homework
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:356
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:327
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:44
 msgid "Hmwk Sets Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:97
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:211
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:108
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:19
 msgid "Homework Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:492
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:38
 msgid "Homework Totals"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1385
-msgid "I couldn't find the file [ACHEVDIR]/surprise_message.txt!"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:17
+msgid "Homwork Sets Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:88
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:31
+msgid "How to:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:36
+msgid "I couldn't find the file [ACHIEVEMENT_DIR]/surprise_message.txt!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1442
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:9
 msgid "Icon"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1459
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:29
 msgid "Icon File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:595
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:80
+msgid "Icon File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:24
+msgid ""
+"If \"PDF\" is selected, then a PDF file will be generated for download, "
+"unless there are errors.  If errors occur generating a PDF file or \"TeX "
+"Source\" is selected then a zip file will be generated for download that "
+"contains the TeX source file and resources needed for generating the PDF "
+"file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:37
+msgid ""
+"If \"TeX Source\" is selected, a zip file containing a TeX file and other "
+"files needed to generate a PDF hardcopy will be produced. If \"Adobe PDF\" "
+"is selected then only a PDF file will be produced."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:84
 msgid ""
 "If a password field is left blank, the student's current password will be "
 "maintained."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:431
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:42
+msgid ""
+"If selected, the file path of the problem source will be printed in the "
+"output."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:38
+msgid ""
+"If selected, this adds spaces between the fields to align the commas, which "
+"makes the columns easy to read when in text form but it can confuse some "
+"spreadsheet applications since the extra spaces violate the csv standard "
+"(although Excel handles them with no problem). This will give a visual form "
+"of the CSV file that is easy to read on the page. If you want a reliable ."
+"csv file for use in any spreadsheet application unclick the \"Pad Fields\" "
+"option. You can download the .csv file immediately by clicking on the link "
+"with the filename chosen above, or you can download it using the \"File "
+"Manager\" from the scoring directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:148
+msgid ""
+"If the original problem can not be edited than the path name must be changed "
+"in order to be allowed to save the problem. Adding \"local/\" to the "
+"beginning of the original path is the default solution. All locally created "
+"and edited files will then appear in a subdirectory named \"local\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:513
 msgid ""
 "If this flag is set then this problem will count towards the grade of its "
 "parent problem.  In general the adjusted status on a problem is the larger "
@@ -3194,28 +4421,37 @@ msgid ""
 "problems which have this flag enabled."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:303
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
 msgid ""
 "If this is enabled then instructors with the ability to receive feedback "
 "emails will be notified whenever a student runs out of attempts on a problem "
-"and its children without receiving an adjusted status of 100%."
+"and its children  without receiving an adjusted status of 100%."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:293
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:334
 msgid ""
 "If this is enabled then students will be unable to attempt a problem until "
 "they have completed all of the previous problems, and their child problems "
 "if necessary."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:469
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:57
+msgid ""
+"If this is selected, a success index is listed in each csv file. The success "
+"index is a number assigned on the basis of the number of incorrect attempts "
+"(roughly equivalent to 1/the number of attempts) which seems to correlate "
+"with the relative difficulty the student had with the problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:47
 msgid ""
 "If this is set, all users (including the instructor) must enter the WeBWorK "
 "course through the LMS. If a user reaches the regular WeBWorK login screen, "
 "they receive a message directing them back to the LMS."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:94
+#. (tag('strong', maketext('Remember Me')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:33
 msgid ""
 "If you check %1 your login information will be remembered by the browser you "
 "are using, allowing you to visit WeBWorK pages without typing your user name "
@@ -3224,269 +4460,418 @@ msgid ""
 "have direct control."
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:408
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:154
+msgid ""
+"If you click on the \"Grade Problem\" icon to the right of the problem "
+"number, then the problem will open in the manual problem grader. This page "
+"shows the rendered problem and lists all students assigned to the set and "
+"the last answer the students entered for the problem. You can then change "
+"the recorded scores for students on this problem and provide instructor "
+"feedback comments."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:148
+msgid ""
+"If you click on the \"Open in New Window\" icon to the right of the problem "
+"number, then the problem will open in the actual homework set in a new tab "
+"or window."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:425
 msgid "If you come back to it later, it may revert to its original version."
 msgstr ""
 
+#. ('<code>report_grades_data.csv</code>', '<code>report_grade.msg</code>', '<code>$COL</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:80
+msgid ""
+"If you upload your file on the web with the name: %1 and also create an "
+"email message with the name %2 with the approriate %3 variables then not "
+"only can you email the message with the embedded grades to the students, but "
+"files with those exact names are automatically appended to the \"Grades\" "
+"page seen by the students."
+msgstr ""
+
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:796
-msgid "Illegal file '%1' specified"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:337
+msgid "Illegal file \"%1\" specified"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2243
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1445
 msgid "Illegal filename contains '..'"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:73
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:63
 msgid "Import"
 msgstr ""
 
-# Context is "Import achievements from ____ assigning the achievements to ___"
-#. (CGI::popup_menu({				name    => 'action.import.source',				values  => [ '', $self->getAxpList()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:847
-msgid "Import achievements from %1 assigning the achievements to %2."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:65
+msgid ""
+"Import a single set or multiple sets from a set definition file. (Use the "
+"\"File Manager\" to upload/download set definition files.) The \"Shift "
+"Dates...\" option is useful for problem sets that were used from other "
+"courses and will shift all of the dates."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1261
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:16
 msgid "Import from where?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1240
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:5
 msgid "Import how many sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1284
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:31
 msgid "Import sets with names"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1120
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:5
 msgid "Import users from what file?"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:99
+msgid "Import/export achievements"
+msgstr ""
+
 #. ($count)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:955
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:516
 msgid "Imported %quant(%1,achievement)"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:25
+msgid ""
+"In both cases, one can select the sort field, the format of the display "
+"list, and the filter. \"Change Display Settings\" must be clicked to update "
+"the list."
+msgstr ""
+
 #. ($total_inprogress, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1004
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:28
 msgid "In progress: %1/%2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1800
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:47
 msgid "Inactive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:158
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:51
+msgid "Inactive Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1503
 msgid "Inactivity time before a user is required to login again"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:168
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:42
+msgid "Include Contrib"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:35
+msgid "Include OPL"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:32
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:55
 msgid "Include Success Index"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:201
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:62
 msgid "Include percentage grades columns for all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2081
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:471
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:302
 msgid "Incorrect"
 msgstr ""
 
 #. ($total_incorrect, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1017
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:36
 msgid "Incorrect: %1/%2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:26
+msgid ""
+"Indicates the number of problems in the set. Clicking on the link opens the "
+"set detail page which allows you to modify set parameters, edit set headers, "
+"and change parameters of problems in the set such as the number of allowed "
+"attempts or the weight (credit value). You can also add, remove, view, edit, "
+"and reorder the problems in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:141
+msgid "Individual Problem Results"
+msgstr ""
+
 # Short for Initial
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:41
 msgid "Init"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:502
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:35
 msgid "Institution"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2307
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:560
 msgid "Instructor Comment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1306
 msgid "Instructor Feedback:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:303
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:17
+msgid "Instructor Links Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:29
 msgid "Instructor Tools"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1228
-msgid "Instructor solution preview: show the student solution after due date."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:17
+msgid "Instructor Tools Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:410
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:90
+msgid "Instructor:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:326
 msgid "Invalid Reply-to address."
 msgstr ""
 
 #. ($output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:234
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:187
 msgid ""
-"Invalid file name. The file name \"%1\" does not have a \".msg\" extension "
-"All email file names must end in the extension \".msg\" choose a file name "
-"with a \".msg\" extension. The message was not saved."
+"Invalid file name \"%1\". All email file names must end with the \".msg\" "
+"extension.  Choose a file name with the \".msg\" extension. The message was "
+"not saved."
 msgstr ""
 
 #. ($headerType)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1980
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1951
 msgid "Invalid headerType %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/XMLRPC.pm:41
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:173
 msgid "Invalid user ID or password."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:84
-msgid "Item Used Successfully!"
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:34
+msgid ""
+"It is important that students enter an email address or they will not "
+"recieve any of the important emails sent by the instructor. The email "
+"address will only be present on the page if the user has permission to "
+"change the email address."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:233
-msgid "Items"
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:20
+msgid "It lists the homework problem sets available for the students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2220
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2224
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:472
 msgid "Jump to Problem:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:859
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:939
 msgid "Just-In-Time parameters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:944
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:85
+msgid "Key Map"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:14
+msgid "Key Map:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:93
 msgid "Keywords:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "LAST NAME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1507
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:119
 msgid "LOCAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:452
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:103
 msgid "LTI"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:144
-msgid "Language (refresh page after saving changes to reveal new language.)"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:25
+msgid "LTI Grade Mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:703
-msgid "Last"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:460
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:75
+msgid "LTI Grade Update"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:387
-msgid "Last Answer"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:17
+msgid "LTI Grade Update Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:604
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:231
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1960
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:811
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:840
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:869
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:898
-msgid "Last Name"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:16
+msgid "LTI grade passback is not enabled for this course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:805
-msgid "Last column of merge file"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:63
+msgid "LTI update of all users and sets queued."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:798
-msgid "Last name"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:64
+msgid "LTI update of all users queued."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:242
-msgid "Latest Answers"
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:58
+msgid "LTI update of set %1 queued."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:159
-msgid ""
+#. ($userID, $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:56
+msgid "LTI update of user %1 and set %2 queued."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:60
+msgid "LTI update of user %1 queued."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1450
+msgid "Language (refresh page after saving changes to reveal new language.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:140
+msgid "Last"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:460
+msgid "Last Answer"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:31
+msgid "Last Full Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:25
+msgid "Last Name"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:115
+msgid "Last column of merge file"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:108
+msgid "Last name"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:237
+msgid "Latest Answers"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1505
+msgid ""
 "Length of time, in seconds, a user has to be inactive before he is required "
-"to login again.<p> This value should be entered as a number, so as 3600 "
-"instead of 60*60 for one hour"
+"to login again. This value should be entered as a number, so as 3600 instead "
+"of 60*60 for one hour."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:816
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:26
 msgid "Lesser Rod of Revelation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:938
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:26
 msgid "Lesser Tome of Enlightenment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:937
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:15
+msgid "Level Progress:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:77
 msgid "Level:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2086
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:426
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:17
+msgid "Library Broswer Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:359
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:52
 msgid "Library Browser"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:361
-msgid "List of display modes made available to students"
+#. ($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:30
+msgid "Link to Edit Page for %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:432
-msgid ""
-"List of e-mail addresses to which e-mail can be sent by a problem. "
-"Professors need to be added to this list if questionaires are used, or other "
-"WeBWorK problems which send e-mail as part of their answer mechanism."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:25
+msgid "Links to pages that give information about writing problems:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1879
+msgid "List of display modes made available to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:795
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:89
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:96
 msgid "List of insertable macros"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:279
+#: /opt/webwork/webwork2/conf/defaults.config:1728
 msgid "List of options for Show Me Another button"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:449
-msgid "Local"
+#: /opt/webwork/webwork2/conf/defaults.config:1615
+msgid "List of sets excluded from achievements"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:56
+msgid "Live equation rendering"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1513
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:144
+msgid "Loading..."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:122
 msgid "Local Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1128
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:41
 msgid "Local Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1534
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:136
 msgid "Local Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1488
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:105
 msgid "Local Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1497
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:114
 msgid ""
 "Local data is generated when your systems admin runs the script update-OPL-"
 "statistics."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1490
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:107
 msgid ""
 "Local data on problem usage is generated and maintained by your institution. "
 "The Usage figure is the total number of local individuals who have attemped "
@@ -3495,42 +4880,61 @@ msgid ""
 "likely bug free."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3127
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:115
 msgid "Location"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3414
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1854
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1890
 msgid ""
 "Location %1 does not exist in the WeBWorK database.  Please check your input "
 "(perhaps you need to reload the location management page?)."
 msgstr ""
 
 #. ($locationID, join(', ', @addresses)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3233
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1742
 msgid "Location %1 has been created, with addresses %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1798
 msgid "Location deletion requires confirmation."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3019
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3322
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:43
 msgid "Location description:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3002
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:37
 msgid "Location name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:159
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:27
+msgid ""
+"Locations are a list of ip addresses.  Ip addresses can be a single address "
+"(e.g. 192.168.1.101), a range of ip address (e.g. "
+"192.168.1.101-192.168.1.150), or an ip address mask (e.g. 192.168.1.0/24). "
+"Enter one ip address per line, using as many lines as needed for each "
+"location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:32
+msgid ""
+"Locations are edited by adding new ip addresses to the location, or deleting "
+"existing address.  You must select the confirm checkbox when deleting a "
+"location, and this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:43
+msgid "Locations of files:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:18
 msgid "Log In Again"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1062
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1066
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:11
 msgid "Log Out"
 msgstr ""
 
@@ -3538,1598 +4942,2261 @@ msgstr ""
 #. ($rename_oldCourseID)
 #. ($rename_newCourseID)
 #. ($new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1421
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1504
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2586
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:913
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:704
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:780
 msgid "Log into %1"
 msgstr ""
 
-#. (HTML::Entities::encode_entities($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1060
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1064
+#. ($userName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:9
 msgid "Logged in as %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:803
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:181
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:187
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:113
 msgid "Login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:90
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:93
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:58
 msgid "Login Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:760
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1956
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:291
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:809
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:838
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:867
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:896
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:36
 msgid "Login Name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1957
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:18
 msgid "Login Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:282
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:6
+msgid "Login:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:225
 msgid "Logout"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:777
-msgid "Main Menu"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
+msgid "Macro"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:97
+msgid ""
+"Macro (\".pl\") files containing additional functionality for your course "
+"can be stored here."
+msgstr ""
+
+#. ($filePath)
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:29
+msgid "Macro file %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:367
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:46
 msgid "Make Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1123
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:27
 msgid "Make changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1112
-msgid "Make these changes in  course:"
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:15
+msgid "Make these changes in course: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:137
+msgid ""
+"Makes a new copy of the file you are editing at the location relative to the "
+"course's templates ([TMPL]) directory. You may choose to replace the current "
+"problem in the current set, append to the end to then end of the current set "
+"as a new problem, or create a problem that is not attached to a problem set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2953
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:1
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:46
 msgid "Manage Locations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:721
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:386
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:17
+msgid "Manage Locations Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:20
+msgid ""
+"Manage achievements for the course.  The actions allow one to edit, assign, "
+"import, export, score, create, or delete achievements.  The action form is "
+"at the top to select the desired action and options to perform when the "
+"submit button is pressed.  Below the action form is the list of all the "
+"achievements, ordered by their achievement \"Number\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:56
+msgid "Manage administration course files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:50
+msgid ""
+"Manage instructors.  When instructors are added to a newly created course, "
+"they are also added to the admin course with username \"userID_courseID\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:344
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:192
 msgid "Manual Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:233
-msgid "Mark All"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:17
+msgid "Manual Grader Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($c->stash->{set}->set_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:205
+msgid "Manual Grader for %1: Problem %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:77
+msgid ""
+"Manually initiate an LTI grade passback for selected sets or users. This "
+"link is only visible if LTI grade passback is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:175
+msgid ""
+"Many of these editing activities can also be done more quickly from the "
+"\"Instructor Tools\" page where students and homework sets can be selected "
+"simultaneously. The \"Instructor Tools\" page is useful for quick editing of "
+"one or two students. The initial setup of the class can be done best from "
+"this page. Importing and exporting class lists can only be done from this "
+"page. Deleting students can only be done from this page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:120
 msgid "Mark Correct"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2767
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:598
 msgid "Mark Correct?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:665
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:19
 msgid "Match on what? (separate multiple IDs with commas)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:497
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:85
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:36
 msgid "Math Objects"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:328
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:377
 msgid "Max attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:402
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:24
 msgid "Max. Shown:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:274
+#: /opt/webwork/webwork2/conf/defaults.config:1719
 msgid "Maximum times Show me Another can be used per problem (-1 => unlimited)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:646
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:4
+msgid "Merge file data:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:24
 msgid "Merge file:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:288
 msgid "Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:618
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:13
 msgid "Message file:"
 msgstr ""
 
-#. ($emailDirectory, $output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:390
-msgid "Message saved to file <code>%1/%2</code>."
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:300
+msgid "Message saved to file %1."
 msgstr ""
 
-#. ($recipient, $ur->email_address)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1006
+#. ($recipient, $user_record->email_address)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:98
 msgid "Message sent to %1 at %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2215
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2290
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:121
+msgid "Message was blank."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:48
+msgid ""
+"Messages can be saved to a message file (which must end in the \".msg\" "
+"extension).  Use the \"Message file\" drop down menu to select which message "
+"file to load, or \"None\" to use a blank message. To save a new message, use "
+"the \"Save as\" button after entering in a valid filename.  The \"Save as\" "
+"button will not overwrite currently saved messages.  To edit a currently "
+"saved message first select it using the drop down menu, then click the "
+"\"Save\" button to save any changes.  Use the \"File Manager\" to delete "
+"messages, located in the \"[TMPL]/email\" directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:22
 msgid "Method"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3197
+#: /opt/webwork/webwork2/conf/defaults.config:2003
+msgid "Method to enter problem scores in the single problem manual grader"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1668
 msgid ""
 "Missing required input data. Please check that you have filled in all of the "
 "create location fields and resubmit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:150
+#: /opt/webwork/webwork2/conf/defaults.config:1457
 msgid ""
 "Mode in which the LANG and DIR settings for a single problem are determined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2650
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:443
 msgid "Move"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2220
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:457
 msgid "Move to Page:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:452
 msgid "Move to Problem:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:26
+msgid ""
+"Multiple sets may be assigned to the users by holding down the shift key or "
+"the ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:27
+msgid ""
+"Multiple users or sets may be selected by holding down the shift key or the "
+"ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:36
 msgid "My Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1365
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:26
 msgid "Mysterious Package (with Ribbons)"
 msgstr ""
 
 # Short for Number of Fields
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:213
 msgid "NO OF FIELDS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1439
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1445
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1468
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:686
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:809
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:181
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:182
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:113
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:135
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:29
 msgid "Name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:519
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:174
 msgid "Name for new set here"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:131
+#: /opt/webwork/webwork2/conf/defaults.config:1430
 msgid "Name of course information file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1085
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:77
+msgid "Name of the evaluator file used to evaluate the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:81
+msgid "Name of the image used for the achievement icon."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:4
 msgid "Name the new set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1635
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:45
+msgid "Name:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:29
 msgid "Necromancers Charm"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:196
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:357
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:205
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:393
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:35
 msgid "Never"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:369
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:950
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:54
 msgid "New File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:971
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:55
 msgid "New Folder"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2429
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:30
 msgid "New Name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1971
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:3
 msgid "New Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:130
-msgid "New Version"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+msgid "New Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:950
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
 msgid "New file name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:971
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
 msgid "New folder name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1464
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:577
 msgid "New passwords saved"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:36
 msgid "New set name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1340
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1010
 msgid "Next Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1204
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2186
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:40
+msgid "Next Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:98
 msgid "Next page"
 msgstr ""
 
-#. ($self->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:649
+#. (% $c->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:142
 msgid "Next test will be available by %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:641
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1378
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:135
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:145
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:184
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:382
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:410
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2606
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2607
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2608
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:374
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:400
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:454
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:981
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:483
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:510
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:142
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:68
 msgid "No"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:635
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:116
 msgid "No Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2306
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:216
 msgid "No Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:361
-msgid "No achievements have been assigned yet"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:117
+msgid "No Sender specified."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:23
+msgid "No Target Set Selected"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:38
+msgid "No achievement badges have been assigned yet."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:77
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:37
 msgid "No achievements shown.  Create an achievement!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:90
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:65
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:2
+msgid "No achievements shown.  Select an achievement to edit!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:61
 msgid "No action taken"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:152
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:140
 msgid ""
 "No authentication method found for your request.  If this recurs, please "
 "speak with your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:918
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:361
 msgid "No change made to any set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1348
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
 msgid ""
 "No changes specified.  You must mark the checkbox of the item(s) to be "
 "changed and enter the change data."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1225
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1247
 msgid "No changes were saved!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2383
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:50
 msgid "No course archives found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2798
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:32
 msgid "No course id defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1524
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1821
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:932
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:67
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:76
 msgid "No courses found"
 msgstr ""
 
 #. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:591
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:675
 msgid "No data exists for set %1 and problem %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:220
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:10
+msgid "No e-mail recipients are listed for this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:169
 msgid "No filename was specified for saving!  The message was not saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:365
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:340
 msgid "No guest logins are available. Please try again in a few minutes."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3435
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1877
 msgid "No location specified to edit. Please check your input data."
 msgstr ""
 
 #. ($badID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3262
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1788
 msgid "No location with name %1 exists in the database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3119
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:149
 msgid "No locations are currently defined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:427
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:342
 msgid "No merge data file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:642
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:18
+msgid "No merge data found"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:164
+msgid "No merge data found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:8
+msgid "No merge file selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:135
 msgid "No more tests available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:600
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:270
 msgid ""
 "No new Achievement ID specified.  No new achievement created.  File not "
 "saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:584
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:63
 msgid "No problems matched the given parameters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:25
+msgid "No recipients selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:334
 msgid ""
 "No recipients selected. Please select one or more recipients from the list "
 "below."
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2028
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:49
 msgid "No record for global set %1."
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2030
-msgid "No record for user %1."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2250
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
 msgid "No record found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1143
-msgid "No set created."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:12
 msgid "No sets in this course yet"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:273
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:159
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
 msgid "No sets selected for scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2719
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:46
 msgid ""
 "No sets shown.  Choose one of the options above to list the sets in the "
 "course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1971
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1942
 msgid "No source filePath specified"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2116
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1327
 msgid "No source_file for problem in .def file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2014
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:87
 msgid ""
-"No students shown.  Choose one of the options above to list the students in "
+"No students shown. Choose one of the options above to list the students in "
 "the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:441
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:246
 msgid "No submissions. Over time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:882
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:278
 msgid "No tests taken."
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:592
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:676
 msgid "No user specific data exists for user %1"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3524
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2031
 msgid "No valid changes submitted for location %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
-msgid "No versions of this assignment have been taken."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:769
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:263
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:241
 msgid "No versions of this test have been taken."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2217
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2218
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:507
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:252
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:17
 msgid "None"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:709
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2437
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:487
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:763
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:52
 msgid "None Specified"
 msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2073
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:73
 msgid "None of the selected users are assigned to this set: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1073
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:33
 msgid "Not logged in."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1540
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:4
 msgid "Note"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:382
-#: /opt/webwork/pg/macros/problemRandomize.pl:407
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:55
+msgid ""
+"Note that if there are errors, they will be shown at the top of the page. In "
+"some cases, a hard copy is still generated and a link called \"Download "
+"Hardcopy\" appears. In addition, the latex file, log and error files are "
+"generated which can be used in troubleshooting."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:93
+msgid ""
+"Note that if you set the permission level of a user to something other than "
+"\"Student\", you may also want to set the status of the user to "
+"\"Observer\".  Users with the \"Observer\" status are not included in "
+"statistics, scoring, or instructor emails."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:28
+msgid ""
+"Note that some settings require an additional page load after \"Save "
+"Changes\" is clicked in order to take effect.  This is true for a theme "
+"change for example."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:396
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:422
 msgid "Note:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2412
+#. (tag('i', maketext('You are in the Reduced Scoring Period.  All work counts for [_1]% of the original.',					$ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#. (tag('i', $pg->{result}{msg})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:572
+msgid "Note: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:686
 msgid ""
 "Note: grading the test grades all problems, not just those on this page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1448
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1469
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:768
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:59
+msgid "Now"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:19
 msgid "Number"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:242
 msgid "Number of Graded Submissions per Test (0=infty)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:264
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
 msgid "Number of Problems per Page (0=all)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:247
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:95
+msgid "Number of Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:257
 msgid "Number of Tests per Time Interval (0=infty)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1796
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2356
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:54
+msgid "Number:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1181
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:912
 msgid "OK"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1417
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:17
+msgid "OPL Problem Levels Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:26
 msgid "Oil of Cleansing"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:112
+#. ('<code>pdflatex</code>', '<code>hardcopy.tex</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:49
+msgid ""
+"Once \"Generate Hardcopy for selected sets and selected users\" is clicked a "
+"file in the selected hardcopy format will be generated and offered for "
+"download. If PDF output was selected, a single PDF file is generated. If TeX "
+"output is selected, a zip file is generated that contains all files needed "
+"to generated the hardcopy PDF file via %1. The main TeX file is called %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:84
 msgid "One Column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:276
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:283
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:314
+msgid "Only Start"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:289
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:303
 msgid "Only after set answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:318
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:87
+msgid ""
+"Only present for JITAR sets. Collapse JITAR nesting problem groups to the "
+"top row of information about a problem. Note that the nesting of a single "
+"problem group can be collapsed by clicking on the down arrow to the right of "
+"the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:80
+msgid ""
+"Only present for JITAR sets. Expand JITAR nested problem groups that have "
+"been collapsed. Note that the nesting of a single problem group can be "
+"expanded by clicking on the right arrow to the right of the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1794
 msgid ""
 "Only this permission level and higher get buttons for sending e-mail to the "
 "instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:626
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:39
 msgid "Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:423
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:742
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:766
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:789
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:62
 msgid "Open Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1121
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:42
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:32
 msgid "Open Problem Library"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2392
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2700
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:272
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:525
 msgid "Open in New Window"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1255
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1596
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:29
 msgid "Open in new window"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:483
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:320
 msgid "Open, closes %1."
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:481
-msgid "Open, complete by %1."
-msgstr ""
-
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:478
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:300
 msgid "Open, due %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:460
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
 msgid "Open."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:458
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:268
 msgid "Open. Submitted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:31
 msgid "Open:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:111
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:115
 msgid "Opens"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:27
 msgid "Opens any homework set for 24 hours."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:212
+#: /opt/webwork/webwork2/conf/defaults.config:1588
 msgid "Optional Modules"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:257
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:265
 msgid "Order Problems Randomly"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:50
+msgid "Other Options"
+msgstr ""
+
 # Context is "7 Out Of 10"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:471
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:722
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:150
 msgid "Out Of"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1022
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1024
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:85
+msgid "Overall Results"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:93
+msgid "Overall Set Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:122
+msgid "Overall Success Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:470
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:481
 msgid "Overwrite"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:435
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:100
 msgid "Overwrite existing files silently"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1725
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:41
+msgid "PDF"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:69
 msgid "PG Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:826
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer.html.ep:1
+msgid "PG POD"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:17
+msgid "PG Problem Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:708
 msgid "PG debug messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:828
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:716
 msgid "PG internal errors"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:817
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:109
+msgid ""
+"PG markdown syntax used to format WeBWorK questions. This interactive lab "
+"can help you to learn the techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:692
 msgid "PG question failed to render"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:825
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:706
 msgid "PG question processing error messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:827
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:712
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:128
 msgid "PG warning messages"
 msgstr ""
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:509
-msgid "PGLab"
-msgstr ""
-
-# Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:515
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:98
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:47
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:58
 msgid "PGML"
 msgstr ""
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:503
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:91
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:40
 msgid "POD"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2274
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2220
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:200
+msgid "POD Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:208
+msgid "POD Viewer"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1515
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:526
 msgid "PREVIEW ONLY -- ANSWERS NOT RECORDED"
 msgstr ""
 
 # Problem Number
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:215
 msgid "PROB NUMBER"
 msgstr ""
 
 # Problem Value
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:372
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:218
 msgid "PROB VALUE"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:36
 msgid "Pad Fields"
 msgstr ""
 
-#. (timestamp($self)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1183
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:28
+msgid "Page Contents"
+msgstr ""
+
+#. ($c->timestamp)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:1
 msgid "Page generated at %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:568
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:234
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:81
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:71
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:56
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:25
 msgid "Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:953
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:13
 msgid "Password (Leave blank for regular proctoring)"
 msgstr ""
 
-#. ($studentUser, $setName, $prettyProblemNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:491
+#. ($studentUser, tag('span', dir => 'ltr', format_set_name_display($setName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:13
 msgid "Past Answers for %1, set %2, problem %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:8
 msgid "Percent"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:601
-msgid "Percentage of Active Students with Correct Answers"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:94
+msgid "Percent Ranges"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+msgid "Percent Score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:783
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:535
+msgid "Percent of Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:206
 msgid ""
 "Percentile cutoffs for number of attempts. The 50% column shows the median "
 "number of attempts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1967
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:817
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:846
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:875
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:904
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:58
+msgid ""
+"Percentile cutoffs for student's score and success index. The 50% column "
+"shows the median number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:50
 msgid "Permission Level"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:302
+#: /opt/webwork/webwork2/conf/defaults.config:1771
 msgid "Permissions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3717
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:24
+msgid "Pick a target set above to add this problem to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:54
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:21
+msgid "Pick date and time"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
 msgid ""
 "Place a file named \"hide_directory\" in a course or other directory and it "
 "will not show up in the courses list on the WeBWorK home page. It will still "
 "appear in the Course Administration listing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1079
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should be given full credit."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should have half credit added."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given full credit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:867
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given half credit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:634
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its incorrect attempt count reset."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:749
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its weight doubled."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1283
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:60
 msgid ""
 "Please choose the set, the problem you would like to copy, and the problem "
 "you would like to copy it to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:399
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:19
 msgid "Please correct the following errors and try again:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:681
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:28
 msgid "Please enter in a value to match in the filter field."
 msgstr ""
 
-#. (CGI::b($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:195
+#. (tag('b', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:28
 msgid "Please enter your username and password for %1 below:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3258
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1778
 msgid "Please provide a location name to delete."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:233
 msgid "Please select action to be performed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:183
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
 msgid "Please select at least one set and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
+msgid "Please select at least one set."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:165
 msgid "Please select at least one user and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:573
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1869
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:31
+msgid "Please select at least one user."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:28
+msgid "Please select at most one set."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:30
+msgid "Please select exactly one set."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:29
+msgid "Please select exactly one user."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1016
 msgid "Please specify a file to save to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
+msgid "Please specify a homework set name."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
+msgid ""
+"Please use only letters, digits, dashes, underscores, and periods in your "
+"set name."
+msgstr ""
+
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1184
+msgid ""
+"Please use radio buttons to choose the method for saving this file. Uknown "
+"saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:165
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:169
+msgid "Point Value"
+msgstr ""
+
+#. ($grader->{problem_value})
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:92
+msgid "Point Value (0 - %1):"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:21
 msgid "Points"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:584
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:62
+msgid "Points:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:26
 msgid "Potion of Forgetfulness"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1386
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:2
 msgid "Prepare which sets for export?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2040
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:268
 msgid "Press \"Grade Test\" now!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2035
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:244
 msgid "Press \"Grade Test\" soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:213
-msgid "Preview Comment"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:770
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:69
 msgid "Preview Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:306
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1811
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:11
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:99
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:35
 msgid "Preview My Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2395
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:646
 msgid "Preview Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1321
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1323
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:41
+msgid ""
+"Preview the message before sending using the \"Preview Message\" button.  "
+"The preview shows the email that would be sent to the first selected student "
+"or the instructor if no students were selected.  The preview will also list "
+"all of the students that would receive their own personalized message.  If a "
+"merge file was selected, the preview will also indicate which (if any) "
+"recipient's merge file data could not be found."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:991
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:995
 msgid "Previous Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1195
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:94
 msgid "Previous page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2135
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:45
+msgid "Primary Actions"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:355
 msgid "Print Test"
 msgstr ""
 
 # Short for Problem
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2074
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:287
 msgid "Prob"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:689
-msgid "Problem #"
-msgstr ""
-
-#. ($prettyProblemID)
 #. (join('.', @seq)
 #. ($problemID)
 #. ($problemNumber)
-#. ($prettyProblemIDs{$probID})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:818
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:436
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:797
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:954
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:958
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:962
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:949
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:952
+#. ($_->{prettyID})
+#. ($c->{prettyID})
+#. ($probID)
+#. ($c->{setRecord}->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)
+#. ($set->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)
+#. ($prettyProblemID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:831
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:842
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:853
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:57
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/siblings.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:40
 msgid "Problem %1"
 msgstr ""
 
-#. ($problemNumber)
-#. ($prettyID)
-#. ($versioned ? $versioned : $MergedProblem->problem_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2284
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1362
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1364
+#. ($i + 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:535
 msgid "Problem %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:359
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:75
+msgid "Problem (\".pg\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:38
+msgid "Problem Display Settings"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1876
 msgid "Problem Display/Answer Checking"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:444
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:50
 msgid "Problem Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1668
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:29
 msgid "Problem Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1327
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1329
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1002
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:999
 msgid "Problem List"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:603
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:75
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:159
 msgid "Problem Number"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1085
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:640
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:755
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:873
-msgid "Problem Number "
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:160
+msgid "Problem Paths"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:156
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:140
 msgid "Problem Score (%):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:491
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:30
 msgid "Problem Techniques"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:706
-msgid "Problem Viewer"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:239
+msgid ""
+"Problem has a different source file than the currently rendered problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:233
+msgid "Problem has an essay answer that needs to be graded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1972
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1943
 msgid "Problem source is drawn from a grouping set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:472
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2454
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:437
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:772
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:780
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:895
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:807
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:89
+msgid ""
+"Problem source is drawn from a grouping set and can not be directly rendered "
+"or edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:336
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:9
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:32
 msgid "Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:25
+msgid "Problems Added"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:54
 msgid "Problems for all students have been unassigned."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:61
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:57
 msgid "Problems for selected students have been reassigned."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:50
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:46
 msgid "Problems have been assigned to all current users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:118
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:25
+msgid ""
+"Problems with this rating should only require direct memory of a fact. "
+"Examples might be a specific value of a function, or the statement of a "
+"definition. Very few WeBWorK problems fall into this category."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:93
 msgid "Proctor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:285
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:92
 msgid "Proctor Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:261
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:71
 msgid "Proctor Username"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:196
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:3
+msgid "Proctor authorization requested for a nonexistent set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:8
 msgid "Proctor authorization required."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:228
-msgid "Proctored Gateway Quiz %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:88
+msgid "Proctor:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:237
-msgid "Proctored Gateway Quiz %2 Proctor Login"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:265
+msgid "Proctored Test %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:958
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:272
+msgid "Proctored Test %2 Proctor Login"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:318
+msgid ""
+"Proctored tests always require authorization to start the test. \"Both Start "
+"and Grade\" will require login proctor authorization to start and grade "
+"proctor authorization to grade. \"Only Start\" requires grade proctor "
+"authorization to start and no authorization to grade."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:18
 msgid ""
-"Proctored tests require proctor authorization to start and to grade.  "
 "Provide a password to have a single password for all students to start a "
 "proctored test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:56
 msgid "Publish"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:33
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:31
+msgid ""
+"Quick access to many instructor tools, including <strong>Reset passwords</"
+"strong>, <strong>Act as student</strong>, <strong>Assign individual sets</"
+"strong> and <strong>Edit individual due dates</strong>."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "RECITATION"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:199
 msgid "Randomize"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:286
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:223
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:248
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:13
+msgid "Randomize Seed"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:101
 msgid "Read only"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:855
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:67
 msgid "Really delete the items listed above?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:800
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:749
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1965
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:298
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:815
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:844
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:873
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:902
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:184
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:42
 msgid "Recitation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:179
+#. ($recitation)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:125
+msgid "Recitation %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:21
+msgid "Recitation:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:38
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:46
 msgid "Record Scores for Single Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:428
+#. ($studentID)
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:8
+msgid "Record for user %1 not found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Reduced Scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:149
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:424
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:67
 msgid "Reduced Scoring Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2484
-msgid "Reduced Scoring Disabled"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
+msgid "Reduced Scoring Enabled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:139
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2484
-msgid "Reduced Scoring Enabled"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:33
+msgid "Reduced Scoring Period"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:488
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:314
 msgid "Reduced credit can still be earned until %1."
 msgstr ""
 
 # Short for "Reduced Scoring:"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:32
 msgid "Reduced:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:153
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:371
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:56
 msgid "Refresh"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1609
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1647
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1906
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1963
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3626
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3668
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:56
 msgid "Refresh Listing"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:200
 msgid "Relax IP restrictions when?"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:88
+msgid "Reload the page to see backup files that have been made."
+msgstr ""
+
 # Context is "Attempts Remaining"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:811
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:14
 msgid "Remaining"
 msgstr ""
 
 #. ('00:00:00')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2045
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:254
 msgid "Remaining time: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:241
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:61
 msgid "Remember Me"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:546
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:514
 msgid "Remember to return to your original problem when you're finished here!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1276
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1024
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:762
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:466
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:72
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:41
 msgid "Rename"
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1265
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:62
 msgid "Rename %1 to %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1049
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:378
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:927
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:73
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:34
 msgid "Rename Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:762
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:17
+msgid "Rename Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:22
+msgid "Rename Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
 msgid "Rename file as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2677
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:463
 msgid "Render"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2465
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:344
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:59
 msgid "Render All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2675
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:461
 msgid "Render Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2461
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:60
+msgid ""
+"Render all problems on the page. This does not reload the page or save or "
+"reset changes."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:106
+msgid ""
+"Render or re-render the problem, course info file, or set header being "
+"edited. This does not change the permanent file on the disk. You can view "
+"different versions of the same problem by changing the seed. You can also "
+"change the manner in which the mathematics is typeset. If \"Open in new "
+"window\" is checked, then the problem will open in a new tab or window "
+"showing the problem as it will be rendered for students in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:132
+msgid "Rendering Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:341
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:53
 msgid "Renumber Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1636
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:55
+msgid ""
+"Renumber problems consecutively starting from 1. This renumbering is not "
+"saved until \"Save Changes\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:103
+msgid ""
+"Renumber problems in the set consecutively starting from one. In the process "
+"of deleting problems, the numbering can be made non-consecutive. This is "
+"useful to clean up the problem numbering."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:31
 msgid ""
-"Reopens any gateway test for an additional 24 hours. This allows you to take "
-"a test even if the close date has past. This item does not allow you to take "
+"Reopens any test for an additional 24 hours. This allows you to take a test "
+"even if the close date has past. This item does not allow you to take "
 "additional versions of the test."
 msgstr ""
 
-#. (CGI::strong("$fullSetID/$prettyProbNum")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1804
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:118
+msgid "Reordering Problems"
+msgstr ""
+
+#. (tag(						'strong',						c(							tag('span', dir => 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:58
 msgid "Replace current problem: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:13
 msgid "Replace which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:677
+#. ($composite_id, $oldUser->status)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:448
+msgid "Replacing old data for %1: status: %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:42
 msgid "Reply-To:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:526
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:123
 msgid "Report Bugs in this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1014
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:305
 msgid "Report bugs"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:128
+msgid ""
+"Report bugs in a WeBWorK question/problem using this link. The very first "
+"time you do this you will need to register with an email address so that "
+"information on the bug fix can be reported back to you."
+msgstr ""
+
 #. ($upgrade_courseID)
-#. ($r->maketext('Database:')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2768
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2913
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1530
 msgid "Report for course %1:"
 msgstr ""
 
-#. ($rename_oldCourseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2071
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:3
 msgid "Report on database structure for course %1:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1800
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:8
 msgid "Request New Version"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2212
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2287
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:19
 msgid "Request information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1943
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1220
 msgid "Request new version now."
 msgstr ""
 
-#. ($setName,$effectiveUserName)
-#. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:407
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:430
-msgid "Requested set '%1' could not be found in the database for user %2."
+#. ($setName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:486
+msgid ""
+"Requested set \"%1\" is a proctored test, but no valid proctor authorization "
+"has been obtained."
 msgstr ""
 
-#. ($setName,$node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:464
-msgid ""
-"Requested set '%1' is a homework assignment but the gateway/quiz content "
-"generator %2 was called.  Try re-entering the set from the problem sets "
-"listing page."
+#. ($setName, $effectiveUserName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:425
+msgid "Requested set '%1' could not be found in the database for user %2."
 msgstr ""
 
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:476
+#. ($setName, $node_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:472
 msgid ""
-"Requested set '%1' is a proctored test/quiz assignment, but no valid proctor "
-"authorization has been obtained."
+"Requested set '%1' is a homework assignment but the test content generator "
+"%2 was called.  Try re-entering the set from the problem sets listing page."
 msgstr ""
 
-#. ($setName,$node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:459
+#. ($setName, $node_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:466
 msgid ""
-"Requested set '%1' is a test/quiz assignment but the regular homework "
-"assignment content generator %2 was called.  Try re-entering the set from "
-"the problem sets listing page."
+"Requested set '%1' is a test but the regular homework assignment content "
+"generator %2 was called.  Try re-entering the set from the problem sets "
+"listing page."
 msgstr ""
 
-#. ($setName,$effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:426
+#. ($setName, $effectiveUserName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:420
 msgid "Requested set '%1' is not assigned to user %2."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:451
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:450
 msgid "Requested set '%1' is not available yet."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:441
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:444
 msgid "Requested set '%1' is not yet open."
 msgstr ""
 
-#. ($verNum,$setName,$effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:403
+#. ($verNum,				$setName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:407
+msgid "Requested version (%1) of set '%2' can not be directly accessed."
+msgstr ""
+
+#. ($verNum, $setName, $effectiveUserName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:397
 msgid "Requested version (%1) of set '%2' is not assigned to user %3."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:468
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:308
+msgid "Require Proctor Authorization to"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:45
 msgid "Require users to log in through the LMS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:350
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:420
 msgid "Rerandomize after"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:970
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:104
 msgid "Reset"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2259
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2912
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:195
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:696
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:47
 msgid "Reset Form"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:585
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:27
 msgid "Resets the number of incorrect attempts on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2374
-msgid ""
-"Restores a course from a gzipped tar archive (.tar.gz). After unarchiving, "
-"the course database is restored from a subdirectory of the course's DATA "
-"directory. Currently the archive facility is only available for mysql "
-"databases. It depends on the mysqldump application."
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:41
+msgid "Restore a .tar.gz archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:40
+msgid "Restore backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:39
+msgid "Restore backup from %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:179
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+msgid "Restored backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:188
 msgid "Restrict Access by IP"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:893
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep:11
 msgid "Restrict Locations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:287
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:324
 msgid "Restrict Problem Progression"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:185
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:194
 msgid "Restrict To"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:155
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:33
+msgid "Restrict or sort the students displayed"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:159
 msgid "Restrict release by set(s)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2076
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:299
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:291
 msgid "Result"
 msgstr ""
 
-#. (CGI::i($self->$actionHandler(\%genericParams, \%actionParams, \%tableParams)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:388
+#. ($c->tag('i', $c->$actionHandler)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:228
 msgid "Result of last action performed: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:309
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:300
 msgid "Results for this submission"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:363
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:236
 msgid "Results of last action performed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:125
 msgid "Results of last action performed: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1669
-msgid "Resurrect which Gateway?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:51
+msgid "Resurrect which test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1412
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:669
 msgid "Retitled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:323
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:17
 msgid "Return to your work"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:131
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:16
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:166
 msgid "Revert"
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2037
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:83
 msgid "Revert to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1461
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1543
+#. ($c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1220
+msgid "Reverted to original file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:168
+msgid ""
+"Reverts to the copy of the file saved on the disk or to a backup file. All "
+"unsaved editing changes will be lost. This option is only active when a "
+"temporary file or a backup file exists. You may also delete backups that "
+"have been made with this tab."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:182
+msgid "Review of column functions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:145
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:85
 msgid ""
 "Reviewing a problem and looking at both the average Attempts and  average "
 "Status should give instructors valuable information about the difficulty of "
 "the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:55
+msgid "Reward used successfully!"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:4
+msgid "Rewards"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:27
 msgid "Ring of Reduction"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:312
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:26
 msgid "Robe of Longevity"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "SECTION"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:368
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:214
 msgid "SET NAME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:479
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:321
 msgid "STATUS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "STUDENT ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:43
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:261
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:170
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:685
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:860
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:221
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:85
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:207
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:123
 msgid "Save"
 msgstr ""
 
-#. (CGI::b($self->shortPath($self->{sourceFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:449
+#. (tag('b', $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_form.html.ep:2
 msgid "Save %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:44
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:693
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:134
 msgid "Save As"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:741
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2254
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2907
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:194
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:695
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:37
 msgid "Save Changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:60
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:76
 msgid "Save Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
 msgid "Save Export"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:92
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
 msgid "Save Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:490
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:869
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:188
 msgid "Save as"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:883
-msgid "Save as Default"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:5
+msgid "Save as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1092
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1521
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:254
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1350
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1425
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_password_form.html.ep:1
 msgid "Save changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1772
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:639
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:33
 msgid "Save file to:"
 msgstr ""
 
-#. (CGI::b($self->shortPath($self->{editFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1587
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:125
+msgid ""
+"Save the contents of the editor window to the file on disk and re-render the "
+"problem. If \"Open in new window\" is checked, then the problem will open in "
+"a new tab or window showing the problem as it will be rendered for students "
+"in the set. If \"Create backup\" is checked then a backup of the current "
+"file on disk will be created before overwriting it with the contents of the "
+"editor window. If a backup already exists, then a \"Delete oldest backup\" "
+"check box will be present. If that is checked, then the oldest backup will "
+"be deleted when \"Save\" is clicked. These backups can be reverted to and "
+"managed on the \"Revert\" tab."
+msgstr ""
+
+#. (tag('b', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:6
 msgid "Save to %1 and View"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1166
-msgid "Saved to file '%1'"
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:50
+msgid "Saved answers"
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#. ($outputFilePath =~ s/$ce->{courseDirs}{templates}/[TMPL]/r)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:549
+msgid "Saved to file \"%1\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1164
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2066
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4172
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2292
 msgid "Schema and database field definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1159
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2061
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4167
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2279
 msgid "Schema and database table definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:470
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:565
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:500
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:758
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:720
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:147
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:161
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:78
 msgid "Score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:125
 msgid "Score (%)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:162
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:60
+msgid ""
+"Score one or more sets. This can also be done from the \"Hmwk Sets Editor\" "
+"or from the \"Instructor Tools\", but the \"Scoring Tools\" page allows "
+"control over parameters."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:170
 msgid "Score required for release"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:213
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:58
 msgid "Score selected set(s) and save to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2071
-msgid "Score summary for last submit:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:284
+msgid "Score summary for last submission:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:2
+msgid "Score which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:956
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:2
 msgid "Score which sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
 msgid "Scores"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:480
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:66
+msgid "Scoring (\".csv\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:396
 msgid "Scoring Download"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:166
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:115
 msgid "Scoring Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:471
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:391
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:58
 msgid "Scoring Tools"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2420
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:17
+msgid "Scoring Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:327
 msgid ""
 "Screen and Hardcopy set header information can not be overridden for "
 "individual students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:127
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:26
 msgid "Scroll of Resurrection"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:189
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:799
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:156
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:156
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:738
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1964
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:297
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:814
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:843
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:872
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:157
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:178
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:38
 msgid "Section"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:609
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:687
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:866
+#. ($section)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:122
+msgid "Section %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:30
 msgid "Section:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:362
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:436
 msgid "Seed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3127
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:114
 msgid "Select"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:494
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:20
+msgid ""
+"Select Users from the left column and sets from the right column and assign "
+"or unassign the given sets. The list of users or the list of sets can be "
+"reordered under the \"sort\" option or the format of the user or set list.  "
+"Additionally, the set lists can be filtered (by section number or "
+"recitation).  The displayed user and set lists will only be updated upon "
+"clicking \"Change Display Settings\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:11
 msgid "Select a Homework Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:14
 msgid "Select a Problem Collection"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:50
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:18
+msgid "Select a Set Definition File"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:14
 msgid "Select a Set from this Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1622
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:20
+msgid ""
+"Select a course to create a .tar.gz archive of, which contains a dump of the "
+"database and all course files (templates, configuration files, etc).  Each "
+"course can only have a single archive.  Creating an archive of a previously "
+"archived course will delete the old archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:36
 msgid "Select a course to delete."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:946
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:20
+msgid ""
+"Select a course to delete.  Warning, all data will be deleted and this "
+"cannot be undone.  This will not delete any course archives."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:14
 msgid ""
 "Select a course to rename.  The courseID is used in the url and can only "
 "contain alphanumeric characters and underscores. The course title appears on "
 "the course home page and can be any string."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2396
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:13
 msgid "Select a course to unarchive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1580
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1877
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3597
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:21
 msgid "Select a listing format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:286
-msgid "Select above then:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:18
+msgid "Select action:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:10
+msgid "Select all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2623
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:12
 msgid "Select all eligible courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:315
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:495
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:519
-msgid "Select an action to perform"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:26
+msgid "Select all sets"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:10
+msgid "Select all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2976
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:10
 msgid "Select an action to perform:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1919
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:20
+msgid ""
+"Select an archive to restore.  You cannot restore an archive into an "
+"existing course. Instead, either rename or delete the old course, or restore "
+"the archive with a new name.  When restoring a course with a new name, the "
+"name is used as the course ID, and must contain only letters, numbers, "
+"hyphens, and underscores, and may have at most 40 characters."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:36
 msgid "Select course(s) to archive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3644
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:44
 msgid "Select course(s) to hide or unhide."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:7
+msgid "Select import file"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:14
 msgid ""
 "Select one or more sets and one or more users below to assign/unassign each "
 "selected set to/from all selected users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:94
 msgid "Select sets below to assign them to the newly-created users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3579
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:20
+msgid ""
+"Select the course to change its Course ID, Course Title, or Institution.  "
+"Note that changing a course's ID will change the URL of all links to the "
+"course, and could break links from external sites such as an LMS."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:4
 msgid ""
 "Select the course(s) you want to hide (or unhide) and then click \"Hide "
 "Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
@@ -5140,114 +7207,230 @@ msgid ""
 "full URL address for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:424
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:20
+msgid ""
+"Select the course(s) you want to hide (or unhide) and then click \"Hide "
+"Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
+"does no harm (the action is skipped). Likewise unhiding a course that is "
+"already visible does no harm (the action is skipped). Hidden courses are "
+"still active but are not listed in the list of WeBWorK courses on the "
+"opening page. To access the course, an instructor or student must know the "
+"full URL address for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:93
+msgid "Select the display mode used to render the problems on this page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:11
 msgid ""
 "Select the homework sets for which to generate hardcopy versions. You may "
 "also select multiple users from the users list. You will receive hardcopy "
 "for each (set, user) pair."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:303
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:30
+msgid ""
+"Select the sets you want scored, choose the name of the export file you want "
+"to use (by default: %1), and then click the \"Score Selected Set(s) and save "
+"to\" button."
+msgstr ""
+
+#. ('<code>ful.csv</code>','<code>scr.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:49
+msgid ""
+"Select this if you want to save the scores for each set in a separate file "
+"in addition to saving all scores to a cumulative file. After clicking the "
+"\"Score Selected Set(s) and save to\" button, you will get a pair of links "
+"for each selected set. The file that ends with %1 contains the number of "
+"correct and incorrect tries about each individual problem for each student. "
+"The file that ends with %2 is a summary of each problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:19
 msgid ""
 "Select user(s) and/or set(s) below and click the action button of your "
 "choice."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:422
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:85
+msgid ""
+"Select which assignment types (homework, tests, just-in-time) the "
+"achievement is evaluated."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:20
+msgid ""
+"Select which courses to upgrade from a previous version of WeBWorK.  The "
+"upgrade process can add missing database columns, delete unused database "
+"columns, and check the course file structure.  Be sure to read over the "
+"changes before confirming the upgrade.  You may want to create an archive of "
+"the course before upgrading.  Only courses that need upgraded will be "
+"selectable."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:84
+msgid "Select your favorite theme for the large text window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:18
+msgid "Select/unselect all fields missing in schema for deletion."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:9
+msgid "Select/unselect all tables missing in schema for deletion."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:23
+msgid "Selected sets:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:57
 msgid "Send E-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:852
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:83
 msgid "Send Email"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:732
-msgid "Send to:"
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:69
+msgid "Send email to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:54
+msgid "Send emails to selected instructors."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:59
+msgid "Send to all students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:64
+msgid "Send to selected students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:468
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:7
 msgid "Set"
 msgstr ""
 
 #. ($newSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1965
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:614
 msgid "Set %1 has been created."
 msgstr ""
 
-#. ($newSetName,$userName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1970
+#. ($newSetName, $userName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:616
 msgid "Set %1 was assigned to %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:408
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:567
+msgid "Set %1 was assigned to %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:354
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:42
 msgid "Set Assigner"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:421
-msgid "Set Definition Filename"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:17
+msgid "Set Assigner Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1142
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:45
 msgid "Set Definition Files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2297
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:218
 msgid "Set Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:366
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:17
+msgid "Set Detail Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:333
 msgid "Set Detail for set %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:89
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:93
 msgid "Set Header"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:323
+msgid "Set Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:218
 msgid "Set ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:295
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:114
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:3
 msgid "Set Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2699
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:19
 msgid "Set List"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:741
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:765
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:788
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:7
 msgid "Set Name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1081
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1173
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1285
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:162
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:255
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:341
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:431
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:524
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:636
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:751
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:869
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:966
-msgid "Set Name "
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:18
+msgid "Set closes on %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:45
+msgid "Set definition (\".def\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:20
+msgid "Set is closed."
+msgstr ""
+
+#. ($c->formatDateTime($set->reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:16
+msgid "Set is due on %1."
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:14
+msgid "Set opens on %1."
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:187
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:188
 msgid "Set random seed to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:387
+#: /opt/webwork/webwork2/conf/defaults.config:1930
 msgid ""
 "Set to true for log to mean base 10 log and false for log to mean natural "
-"logarithm"
+"logarithm."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:398
+#: /opt/webwork/webwork2/conf/defaults.config:1950
 msgid ""
 "Set to true to allow students to enter Unicode versions of some characters "
 "(like U+2212 for the minus sign) in their answers.  One reason to allow this "
@@ -5256,21 +7439,16 @@ msgid ""
 "directory from the keyboard."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:377
-msgid ""
-"Set to true to display MathView equation editor icon next to each answer box"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:382
+#: /opt/webwork/webwork2/conf/defaults.config:1920
 msgid ""
 "Set to true to display the \"Entered\" column which automatically shows the "
-"evaluated student answer, e.g. 1 if student input is sin(pi/2). If this is "
-"set to false, e.g. to save space in the response area, the student can still "
-"see their evaluated answer by hovering the mouse pointer over the typeset "
-"version of their answer."
+"evaluated student answer, e.g., 1 if student input is sin(pi/2). If this is "
+"set to false, e.g., to save space in the response area, the student can "
+"still see their evaluated answer by clicking on the typeset version of their "
+"answer."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:403
+#: /opt/webwork/webwork2/conf/defaults.config:1961
 msgid ""
 "Set to true to have Full Width Unicode character (U+FF01 to U+FF5E) "
 "converted to their ASCII equivalents (U+0021 to U+007E) automatically in "
@@ -5278,23 +7456,33 @@ msgid ""
 "automatically use Full Width characters for parentheses and commas."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:146
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:421
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:173
-msgid "Sets"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:16
+msgid "Set values"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:344
-msgid "Sets Assigned to User"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/siblings.html.ep:4
+msgid "Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:335
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:322
 msgid "Sets assigned to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:475
+#. ($userName, $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:90
+msgid "Sets assigned to %1 (%2)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:17
+msgid "Sets assigned to student Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:57
 msgid ""
 "Sets how grades will be passed back from WeBWorK to the LMS.<dl><dt>course</"
 "dt><dd>Sends a single grade back to the LMS. This grade is calculated out of "
@@ -5304,188 +7492,240 @@ msgid ""
 "set (including for each quiz). To use this, the external links from the LMS "
 "must be problem set specific. For example, <code>webwork.myschool.edu/"
 "webwork2/course-name/problem_set_name</code>. If the problem set name has "
-"space characters, they should be underscores in these addresses. If the "
-"problem set is a quiz, it must have this format: <code>webwork.myschool.edu/"
-"webwork2/course-name/quiz_mode/problem_set_name</code>. Also, to initialize "
-"the communication between WeBWorK and the LMS, the user must follow each of "
-"these external learning tools at least one time. Since there must be a "
-"separate external tool link for each problem set, this option requires more "
-"maintenance of the LMS course.</dd></dl>"
+"space characters, they should be underscores in these addresses. Also, to "
+"initialize the communication between WeBWorK and the LMS, the user must "
+"follow each of these external learning tools at least one time. Since there "
+"must be a separate external tool link for each problem set, this option "
+"requires more maintenance of the LMS course.</dd></dl>"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:55
+msgid "Sets the order in which achievements are listed and evaluated."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1421
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:625
 msgid "Sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:725
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:36
 msgid "Setting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1300
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:39
 msgid "Shift dates so that the earliest is"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:32
+msgid "Show"
+msgstr ""
+
 #. ($numchild)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1330
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1331
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:32
 msgid "Show %1 more like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:318
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:107
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:39
 msgid "Show Correct Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:330
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:22
 msgid "Show Date & Size"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:488
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:86
 msgid "Show LTI parameters (for debugging)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:612
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:34
 msgid "Show Me Another"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2452
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2383
+#. ($exhausted)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:69
+msgid "Show Me Another %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1642
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:711
 msgid "Show Past Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:634
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:41
+msgid "Show Problem Source File"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:132
 msgid "Show Problem Source File:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
 msgid "Show Problems on Finished Tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:272
-msgid "Show Scores on Finished Assignments?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+msgid "Show Scores on Finished Tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2372
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:630
 msgid "Show Solutions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:183
+#: /opt/webwork/webwork2/conf/defaults.config:1538
 msgid "Show Total Homework Grade on Grades Page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1249
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:77
 msgid "Show all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1381
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:91
 msgid "Show all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2360
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:621
 msgid "Show correct answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1329
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+msgid "Show hints after"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:30
 msgid "Show less like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1870
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:387
 msgid "Show me another"
 msgstr ""
 
-#. ($exhausted)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1897
-msgid "Show me another %1"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:20
+msgid ""
+"Show past answers.  Students can only see their past answers, and they will "
+"not be able to see which parts are correct.  Instructors can use the form to "
+"select any combination of users, sets, and problems to view.  The table "
+"below will list the past answers colored according to correctness (green is "
+"correct).  Use control + click to select multiple users, sets, or problems."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2384
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:639
 msgid "Show problem graders"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:360
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:105
 msgid "Show saved answers?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:297
+#: /opt/webwork/webwork2/conf/defaults.config:1762
 msgid "Show the correct answer to the current problem before re-randomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:298
+#: /opt/webwork/webwork2/conf/defaults.config:1764
 msgid ""
 "Show the correct answer to the current problem on the last attempt before a "
 "new version is requested."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:640
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:3
 msgid "Show which sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:673
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:3
 msgid "Show which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:282
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:382
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:475
-msgid "Show/Hide Site Description"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:553
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1642
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:11
 msgid "Show:"
 msgstr ""
 
-#. (scalar @{ $self->{visibleSetIDs} },			scalar @{ $self->{allSetIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:578
+#. (scalar @{ $c->{visibleSetIDs} },			scalar @{ $c->{allSetIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:115
 msgid "Showing %1 out of %2 sets."
 msgstr ""
 
-#. (scalar @Users, scalar @{ $self->{allUserIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:593
+#. (scalar(keys %{ $c->{visibleUserIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:80
 msgid "Showing %1 out of %2 users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1227
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:70
 msgid "Showing all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1356
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:81
 msgid "Showing all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:423
-msgid "Simple"
+#. ($c->{merge_file}, $ur->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:5
+msgid "Showing data from merge file %1 for user %2:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:61
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:107
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:67
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:70
-msgid "Site Information"
+#. ($c->{merge_file})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:147
+msgid "Showing data from merge file: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2179
-msgid "Skip archiving this course"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:61
+msgid "Showing problem for:"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1556
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1557
-msgid "Solution:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:7
+msgid "Showing statistics for:"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1555
-msgid "Solution: "
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:33
+msgid ""
+"Shows how many instructors and students have been assigned this problem set, "
+"out of the total number in the class. Clicking on this link allows you to "
+"assign the set to users, unassign this set from users, and to individually "
+"edit the assignment for specific users. For changing dates for individual "
+"users there are also shortcuts from the \"Instructor Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:63
+msgid "Site Information"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:88
+msgid "Skip archiving this course"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1981
+msgid "Skip explanation essay answer fields"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:81
+msgid "Snippets of PG code illustrating specific techniques"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1514
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1515
+msgid "Solution:"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1513
+msgid "Solution: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:599
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:430
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1762
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:57
 msgid "Solutions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1380
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:20
+msgid ""
+"Some OPL problems have been rated for difficulty/educational objective. The "
+"levels are loosely inspired by Bloom's taxonomy. They are assigned numbers "
+"from 1 to 6 as follows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:185
 msgid ""
 "Some WeBWorK problems are programmed using what are called <i>Math Objects</"
 "i>. These problems are preferred by some people because they provide a more "
@@ -5493,18 +7733,30 @@ msgid ""
 "for answers which are way off base."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:379
 msgid "Some answers will be graded later."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:848
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:60
 msgid ""
 "Some of these files are directories. Only delete directories if you really "
 "know what you are doing. You can seriously damage your course if you delete "
 "the wrong thing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2208
+#: /opt/webwork/webwork2/conf/defaults.config:1983
+msgid ""
+"Some problems have an explanation essay answer field, typically following a "
+"simpler answer field. For example, find a certain derivative using the "
+"definition. An answer blank would be present for the derivative to be "
+"automatically checked, and then there would be a separate essay answer field "
+"to show the steps of actually using the definition of the derivative, to be "
+"scored manually. With this setting, the essay explanation fields are "
+"supperessed. Instructors may use the exercise without incurring the manual "
+"grading."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:83
 msgid ""
 "Some problems shown above represent multiple similar problems from the "
 "database.  If the (top) information line for a problem has a letter M for "
@@ -5514,301 +7766,396 @@ msgid ""
 "again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:164
-msgid ""
-"Some servers handle courses taking place in different timezones.  If this "
-"course is not showing the correct timezone, enter the correct value here.  "
-"The format consists of unix times, such as \"America/New_York\",\"America/"
-"Chicago\", \"America/Denver\", \"America/Phoenix\" or \"America/Los_Angeles"
-"\". Complete list: <a href=\"http://en.wikipedia.org/wiki/"
-"List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:538
-msgid ""
-"Something was wrong with your LTI parameters.  If this recurs, please speak "
-"with your instructor"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:50
 msgid "Sort"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:730
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:797
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:4
 msgid "Sort by"
 msgstr ""
 
 #. ($names{$primary}, $names{$secondary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:796
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:324
 msgid "Sort by %1 and then by %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:171
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:115
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:3
 msgid "Sort:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:314
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:51
+msgid "Sorts the lists displayed by due date, name, etc."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:363
 msgid "Source File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1570
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1596
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1630
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1555
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1593
 msgid ""
 "Source file paths cannot include .. or start with /: your source file path "
 "was modified."
 msgstr ""
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:11
 msgid ""
 "Specify an ID, title, and institution for the new course. The course ID may "
 "contain only letters, numbers, hyphens, and underscores, and may have at "
 "most %1 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:424
-msgid "Standard"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:94
+msgid ""
+"Spell check the text of the file that your are editing. Note that there will "
+"be many spelling errors in the code parts of your file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:116
+msgid "Standard Deviation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:637
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:162
+msgid "Start"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:47
+msgid "Start LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:130
 msgid "Start New Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:403
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:482
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:105
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:84
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:501
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:510
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:519
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:84
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:54
 msgid "Statistics"
 msgstr ""
 
-#. ($self->{ce}->{courseName},			$self->{setName}, $self->formatDateTime($self->{set_due_date})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:80
-msgid "Statistics for %1 set %2. Closes %3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:17
+msgid "Statistics Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:86
+msgid "Statistics for %1"
 msgstr ""
 
-#. ($self->{ce}->{courseName}, $self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:75
-msgid "Statistics for %1 student %2"
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:90
+msgid "Statistics for %1 problem %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2075
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:369
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1472
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1554
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1963
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:296
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:813
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:184
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:185
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:84
+msgid "Statistics for student %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:442
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:151
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:160
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:36
 msgid "Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1070
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:29
 msgid "Stop Acting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2172
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:85
 msgid "Stop Archiving"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2339
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1153
 msgid "Stop archiving courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:233
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:796
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1962
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:295
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:812
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:841
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:870
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:30
 msgid "Student ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:9
+msgid "Student ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:37
 msgid "Student Name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:111
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:89
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:564
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:573
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:582
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:428
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:56
 msgid "Student Progress"
 msgstr ""
 
-#. ($self->{ce}->{courseName},			$self->{setName}, $self->formatDateTime($self->{set_due_date})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:85
-msgid "Student Progress for %1 set %2. Closes %3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:17
+msgid "Student Progress Help"
 msgstr ""
 
-#. ($self->{ce}->{courseName}, $self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:80
-msgid "Student Progress for %1 student %2"
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:72
+msgid "Student Progress for %1"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:76
+msgid "Student Progress for set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:559
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:80
 msgid "Student answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:653
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:832
-msgid "Subject:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:80
+msgid ""
+"Student scores for the sets selected below will be calculated. This and "
+"other scoring operations can also be done using the \"Scoring Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:87
+msgid "Student:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:693
-msgid "Subject: "
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:124
+msgid "Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:225
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:50
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:8
+msgid "Subject:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:30
 msgid "Submission time:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:279
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:41
 msgid "Submit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1839
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:26
 msgid "Submit Answers"
 msgstr ""
 
 #. ($effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1832
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:23
 msgid "Submit Answers for %1"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:502
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:525
 msgid "Submit your answers again to go on to the next part."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:766
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:183
 msgid "Success Index"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:106
+msgid ""
+"Success index is the square of the average score divided by the average "
+"number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:73
+msgid ""
+"Success index is the square of the score divided by the number of attempts."
+msgstr ""
+
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2277
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1086
 msgid "Successfully archived the course %1."
 msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:830
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:422
 msgid "Successfully created new achievement %1"
 msgstr ""
 
-#. ($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1223
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:581
 msgid "Successfully created new set %1"
 msgstr ""
 
 #. ($add_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:465
 msgid "Successfully created the course %1"
 msgstr ""
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1781
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2322
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1131
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:900
 msgid "Successfully deleted the course %1."
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1492
+#. ($rename_oldCourseID,							$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:772
 msgid "Successfully renamed the course %1 to %2"
 msgstr ""
 
 #. ($unarchive_courseID, $new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2573
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1286
 msgid "Successfully unarchived %1 to the course %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2059
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4165
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:89
+msgid "TA:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2274
 msgid "Table defined in database but missing in schema"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1156
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2058
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4164
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2269
 msgid "Table defined in schema but missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1158
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2060
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4166
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2265
 msgid "Table is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3113
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3403
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:287
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:696
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:562
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:586
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:106
 msgid "Take Action!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1071
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Target Set:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:63
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:42
 msgid "TeX Source"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:729
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:258
+msgid "Test %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:54
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:52
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:55
+msgid "Test Name"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:156
 msgid "Test Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:214
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:224
 msgid "Test Time Limit (min; 0=Close Date)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2027
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:238
 msgid "Test Time Notification"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:682
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:156
 msgid "Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:439
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:244
 msgid "Test not yet submitted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:322
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:323
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:920
+msgid "Test parameters"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:149
 msgid "Test/quiz with time limit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:412
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:79
 msgid "Text"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:902
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:80
+msgid "Text Editor Options"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:55
 msgid "Text chapter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:921
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:66
 msgid "Text section:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:883
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:44
 msgid "Textbook:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1433
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:58
+msgid ""
+"The \"Edit Target Set\" button at the top of the page will take you to the "
+"Problem Set Editor which will allow you to edit dates, assign users and "
+"other information about the problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:115
+msgid ""
+"The \"Score\" tab will export achievement data to a CSV file that can be "
+"downloaded.  The export contains the global data including number of "
+"achievement points and current level of each student.  In addition for each "
+"selected achievement, a column for if the achievement was earned (1) or not "
+"earned (0) will be added to the CSV."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:194
+msgid ""
+"The <strong>Assigned sets</strong> column (x/y) indicates that x sets out of "
+"y sets avaiable have been assigned to this student. Click this link to "
+"assign or unassign sets to this student, to adjust due dates, or to adjust "
+"the grades on a homework set for a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:20
+msgid ""
+"The <strong>Set Detail</strong> page can be viewed in one of two distinct "
+"modes:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:189
+msgid ""
+"The <strong>login name</strong> column links allow you to \"act as\" a "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:191
+msgid ""
+"The <strong>pencil</strong> in the login column allows you to edit that "
+"student's data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:64
 msgid ""
 "The Attempts figure is the global average of the number of attempts (both "
 "correct and incorrect) individuals take on this problem.  A high figure may "
@@ -5817,7 +8164,7 @@ msgid ""
 "each part before continuing and each such  submittal counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1515
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:124
 msgid ""
 "The Attempts figure is the local average of the number of attempts (both "
 "correct and incorrect) individuals at your institution take on this problem. "
@@ -5827,14 +8174,14 @@ msgid ""
 "counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:275
+#: /opt/webwork/webwork2/conf/defaults.config:1721
 msgid ""
 "The Maximum number of times Show me Another can be used per problem by a "
 "student. If set to -1 then there is no limit to the number of times that "
 "Show Me Another can be used."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:265
+#: /opt/webwork/webwork2/conf/defaults.config:1689
 msgid ""
 "The Reduced Scoring Period is the default period before the due date during "
 "which all additional work done by the student counts at a reduced rate. When "
@@ -5847,7 +8194,7 @@ msgid ""
 "work done counts 50% of the original.\" will be displayed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1454
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:78
 msgid ""
 "The Status figure is the global average of the Status individuals have "
 "earned on this problem. The Status is the percentage correct (from 0% to "
@@ -5856,7 +8203,7 @@ msgid ""
 "a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1536
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:138
 msgid ""
 "The Status figure is the local average of the Status individuals at your "
 "institution have earned on this problem. The Status is the percentage "
@@ -5865,47 +8212,61 @@ msgid ""
 "students will work on a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1187
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:11
 msgid "The WeBWorK Project"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:828
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:25
+msgid ""
+"The WeBWorK administrators need to be added to the course in order for them "
+"to access the course.  Unchecking this option will make it so WeBWorK "
+"administrators cannot directly login to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:129
+msgid ""
+"The achievement evaluator is the perl code that is run after each submit to "
+"determine if an achievement is earned or not.  Click on the \"Edit "
+"Evaluator\" link to edit the evaluator."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:26
 msgid ""
 "The adjusted status of a problem is the larger of the problem's status "
 "andthe weighted average of the status of those problems which count towards "
 "the parent grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:207
+#: /opt/webwork/webwork2/conf/defaults.config:1579
 msgid ""
 "The amount of time (in minutes) after the due date that the Answers are "
 "available to student to view.  You can change this for individual homework, "
 "but WeBWorK will use this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:201
+#: /opt/webwork/webwork2/conf/defaults.config:1569
 msgid ""
 "The amount of time (in minutes) before the due date when the assignment is "
 "opened.  You can change this for individual homework, but WeBWorK will use "
-"this value when a set is created. "
+"this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:386
 msgid "The answer above is NOT correct."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:375
 msgid "The answer above is correct."
 msgstr ""
 
 #. ($filename, $ce->{mail}{maxAttachmentSize})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:300
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:230
 msgid ""
 "The attached file \"%1\" exceeds the allowed attachment size of %quant(%2,"
 "megabyte)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:422
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:496
 msgid ""
 "The child problems for this problem will become visible to the student when "
 "they either have more incorrect attempts than is specified here, or when "
@@ -5914,171 +8275,252 @@ msgid ""
 "attempts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:704
+#. ('href="http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files" target="Webworkdocs"',			'<code>demoCourse.lst</code>','<code>.csv</code>','<code>.lst</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:59
+msgid ""
+"The classlist files are stored in the templates directory and provide a "
+"convenient way to enter a large number of students into your class. To view "
+"the format for <strong>ClassList files</strong> see the <a %1>ClassList "
+"specification</a> or download the %2 file and use it as a model. ClassList "
+"files can be prepared using a spreadsheet and then saved as %3 (comma "
+"separated values) text files.  However, to access as a classlist file, the "
+"file suffix needs to be changed to %4, which can be done with the \"Rename\" "
+"button."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:16
 msgid ""
 "The configuration module did not find the data it needs to function.  Have "
-"your site administrator check that Constants.pm is up to date."
+"your site administrator check that site configuration files are up to date."
+msgstr ""
+
+#. ($archive_courseID,					$archive_path)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:80
+msgid ""
+"The course \"%1\" has already been archived at \"%2\". This earlier archive "
+"will be erased.  This cannot be undone."
 msgstr ""
 
-#. (CGI::b($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:151
+#. (tag('strong', stash('courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:8
 msgid ""
 "The course %1 uses an external authentication system (%2). Please go there "
 "to log in again."
 msgstr ""
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:189
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:17
 msgid ""
 "The course %1 uses an external authentication system (%2). Please return to "
 "that system to access this course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:104
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:23
 msgid ""
 "The course %1 uses an external authentication system (%2). You've "
 "authenticated through that system, but aren't allowed to log in to this "
 "course."
 msgstr ""
 
-#. ($archive_courseID, $archive_path)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2165
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:30
+msgid "The course database must be upgraded before archiving this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:30
+msgid "The course database must be upgraded before renaming this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:26
 msgid ""
-"The course '%1' has already been archived at '%2'. This earlier archive will "
-"be erased.  This cannot be undone."
+"The current mode should be made clear by the information at the top of the "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:46
+msgid ""
+"The current value of the achievement counter. Changes to this variable will "
+"be saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:369
+#: /opt/webwork/webwork2/conf/defaults.config:1897
 msgid "The default display mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:293
+#: /opt/webwork/webwork2/conf/defaults.config:1757
 msgid ""
 "The default number of attempts before the problem is re-randomized. ( 0 => "
 "never )"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:292
+#: /opt/webwork/webwork2/conf/defaults.config:1756
 msgid ""
 "The default number of attempts between re-randomization of the problems ( 0 "
 "=> never)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:251
-msgid "The directory you specified doesn't exist"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:73
+msgid ""
+"The description shown to students which states what action is needed to earn "
+"the achievement."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1853
-msgid "The display was already cleared."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:5
+msgid "The directory you specified doesn't exist"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:422
+#: /opt/webwork/webwork2/conf/defaults.config:2032
 msgid ""
 "The e-mail verbosity level controls how much information is automatically "
-"added to feedback e-mails.  Levels are<ol><li value=\"Simple\"> Simple: send "
-"only the feedback comment and context link<li value=\"Standard\"> Standard: "
-"as in Simple, plus user, set, problem, and PG data<li value=\"Debug\"> "
-"Debug: as in Standard, plus the problem environment (debugging data)</ol>"
+"added to feedback e-mails.  Levels are<ol><li> Simple: send only the "
+"feedback comment and context link</li><li> Standard: as in Simple, plus "
+"user, set, problem, and PG data</li><li> Debug: as in Standard, plus the "
+"problem environment (debugging data)</li></ol>"
 msgstr ""
 
-#. ($achievementName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:624
-msgid "The evaluator for %1 has been renamed to '%2'."
+#. ($achievementName,				$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:293
+msgid "The evaluator for %1 has been renamed to \"%2\"."
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:372
-msgid ""
-"The file %1/%2 already exists and cannot be overwritten. The message was not "
-"saved"
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:246
+msgid "The file \"%1\" cannot be found."
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:195
-msgid "The file %1/%2 cannot be found."
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:526
+msgid "The file \"%1\" cannot be read!"
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:186
-msgid "The file %1/%2 is not readable by the webserver."
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:522
+msgid "The file \"%1\" is a directory!"
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:372
-msgid "The file '%1' cannot be found."
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:259
+msgid ""
+"The file \"%1\" is a template. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1005
-msgid "The file '%1' cannot be read!"
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:250
+msgid ""
+"The file \"%1\" is protected. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:379
-msgid "The file '%1' is a blank problem!"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:19
+msgid "The file $file does not appear to be a text or image file."
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:999
-msgid "The file '%1' is a directory!"
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:277
+msgid ""
+"The file %1 already exists and cannot be overwritten. The message was not "
+"saved."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:374
-msgid "The file '%1' is protected!"
+#. ("$emailDirectory/$openfilename",				$emailDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:156
+msgid ""
+"The file %1 cannot be found. Check whether it exists and whether the "
+"directory %2 can be read by the webserver. "
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
+msgid ""
+"The file %1 is not contained in the course templates directory and can not "
+"be modified."
+msgstr ""
+
+#. ("$emailDirectory/$openfilename")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:148
+msgid ""
+"The file %1 is not readable by the webserver. Check that it's permissions "
+"are set correctly."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:596
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:203
 msgid "The file does not appear to be a text file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:88
 msgid "The file you are trying to download doesn't exist"
 msgstr ""
 
 #. ($filename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:221
 msgid "The filetype of the attached file \"%1\" is not allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3756
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2149
 msgid "The following courses were successfully hidden:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3821
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2218
 msgid "The following courses were successfully unhidden:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4056
-msgid "The following upgrades are available for your WeBWorK system:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:34
+msgid "The following describes how the checkboxes alter the scoring output"
 msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2065
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:66
 msgid ""
 "The following users are NOT assigned to this set and will be ignored: %1"
 msgstr ""
 
-#. (join('.', @{$problemSeqs[$children_counts_indexs[0]]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2033
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:288
+msgid "The given file path is not a valid location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:49
+msgid "The goal value of the achievement counter."
+msgstr ""
+
+#. (join('.', @{ $problemSeqs[ $children_counts_indexs[0] ] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1334
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the score of problem %1."
 msgstr ""
 
-#. (join(', ', map({join('.', @{$problemSeqs[$_]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2035
+#. (join(', ', map({ join('.', @{ $problemSeqs[$_] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the weighted average of the problems: %1."
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1924
-msgid "The hardcopy header for set %1 has been renamed to '%2'."
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1078
+msgid "The hardcopy header for set %1 has been renamed to \"%2\"."
+msgstr ""
+
+#. ($showHintsAfter)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:36
+msgid ""
+"The hint shown is an instructor preview and will be shown to students after "
+"%quant(%1,attempt)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:32
+msgid ""
+"The hint shown is an instructor preview and will not be shown to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:22
+msgid ""
+"The information box on the right displays information about the course. This "
+"is useful for leaving course wide messages for students. It contains text "
+"from the file templates/course_info.txt. Instructors can edit this file from "
+"the web (click on the \"Edit\" link)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:111
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:30
 msgid ""
 "The initial value is the answer sub score for the answer that is currently "
 "shown.  If this is modified, it will be used to compute the total problem "
@@ -6086,189 +8528,349 @@ msgid ""
 "shown answer if the page is reloaded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:161
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:97
+msgid ""
+"The initial value is the currently saved score as a point value computed "
+"using the percent score.  This point value is used to compute the percent "
+"score (rounded to a whole percent) that can be saved."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:145
 msgid "The initial value is the currently saved score for this student."
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1408
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
 msgid ""
 "The institution associated with the course %1 has been changed from %2 to %3"
 msgstr ""
 
-#. ($rename_newCourseID, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1461
+#. ($rename_newCourseID, $optional_arguments{courseInstitution})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:729
 msgid "The institution associated with the course %1 is now %2"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:607
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:599
+msgid ""
+"The instructor account with user id %1 does not exist.  Instructor accounts "
+"must be created manually."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:635
 msgid ""
 "The instructor account with user id %1 does not exist.  Please create the "
 "account manually via WeBWorK."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4047
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:87
+msgid ""
+"The key maps that are available are \"default\", \"emacs\", \"sublime\", and "
+"\"vim\". The \"default\" key map has the standard behavior of a browser text "
+"area. You can use Ctrl-C to copy, Ctrl-V to paste, Ctrl-F to search, etc. If "
+"you are more comfortable with the \"emacs\", \"sublime\", or \"vim\" text "
+"editors then you may choose to use one of those key maps instead."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:75
+msgid "The large text window"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:27
+msgid ""
+"The list of files include regular files, directories (ending in a \"/\") and "
+"links (ending in a \"@\")."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:52
+msgid ""
+"The login name cannot be changed. (It is the primary key for the student's "
+"data.) If you make a mistake in the login name at the beginning of the "
+"course (before any work has been done) then it is best to simply add a new "
+"student with the correct entry and drop the student with the bad login name. "
+"(See drop and delete students below.) If the login name must be changed "
+"after a user has started working assignments, then contact your system "
+"administrator, who can use the webwork2 \"bin/change_user_id\" script to "
+"change the user id."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:20
+msgid ""
+"The main page allows access to set and student statistics.  When selecting a "
+"student, their grades page is shown, which lists set totals and per problem "
+"grades for each set assigned to the student.  When selecting a set, various "
+"statistics and histograms are shown for the overall grades of students who "
+"are currently enrolled or auditing the course."
+msgstr ""
+
+#. ('href="http://webwork.maa.org/wiki" target="ww_wiki"',	'href="http://webwork.maa.org/wiki/Instructors" target="ww_wiki"')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:24
 msgid ""
-"The library index is older than the library, you need to run OPL-update."
+"The main page for WeBWorK documentation is the <a %1>webwork wiki</a> while "
+"specific help for instructors setting up a course are in the <a "
+"%2>instructors' section</a>."
 msgstr ""
 
-#. ($r->param('new_set_name')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1923
+#. ($c->param('new_set_name')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:569
 msgid ""
-"The name '%1' is not a valid set name.  Use only letters, digits, -, _, and ."
+"The name \"%1\" is not a valid set name.  Use only letters, digits, dashes, "
+"underscores, periods, and spaces."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:132
+#: /opt/webwork/webwork2/conf/defaults.config:1432
 msgid ""
 "The name of course information file (located in the templates directory). "
 "Its contents are displayed in the right panel next to the list of homework "
 "sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:455
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:26
 msgid "The name of the LMS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:456
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:28
 msgid ""
 "The name of the LMS. This is used in messages to users that direct them to "
 "go back to the LMS to access something in the WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:63
+msgid "The number of points earned for earning the achievement."
+msgstr ""
+
 #. ($openDate, $dueDate, $answerDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1935
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1104
 msgid ""
 "The open date: %1, close date: %2, and answer date: %3 must be defined and "
 "in chronological order."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:702
+#. ($path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:393
+msgid "The original path is not in a valid location. Using failsafe %1"
+msgstr ""
+
+#. ($forcedSourceFile)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:510
+msgid "The original path to the file is %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:262
 msgid "The password and password confirmation for the instructor must match."
 msgstr ""
 
-#. (CGI::b($r->maketext("[_1]'s Current Password", $user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:133
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:27
+msgid ""
+"The password can be any combination of letters, numbers and special symbols. "
+"Students are encouraged to use all three, and stay away from dictionary "
+"words. The password should not be the same as any password used elsewhere, "
+"such as for an email account. The password will only be present on the page "
+"if the user has permission to change the password."
+msgstr ""
+
+#. ($c->tag(						'b',						$c->maketext(							"[_1]'s Current Password",							$c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:95
 msgid ""
 "The password you entered in the %1 field does not match your current "
 "password. Please retype your current password and try again."
 msgstr ""
 
-#. (CGI::b($r->maketext("[_1]'s New Password",         $e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:117
+#. ($c->tag('b', $c->maketext("[_1]'s New Password",         $e_user_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:82
 msgid ""
 "The passwords you entered in the %1 and %2 fields don't match. Please retype "
 "your new password and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:790
-msgid "The path to the original file should be absolute"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:374
+msgid "The path can not be the temporary edit directory."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:686
-msgid "The percentage of active students with correct answers for each problem"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:370
+msgid "The path to the original file should be absolute."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:746
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:131
 msgid ""
 "The percentage of students receiving at least these scores. The median score "
 "is in the 50% column."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1888
-msgid "The problem set is not yet open"
+#. ($setName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:458
+msgid "The prerequisite conditions have not been met for set '%1'."
 msgstr ""
 
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1998
-msgid "The recorded score for this version is  %1/%2."
+#. (q(down menu to change which student's seed and answers are shown.  Use the "Mark Correct" checkbox to set)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:26
+msgid ""
+"The problem is shown at the top with the seed and answers of the selected "
+"student.  Use the drop "
 msgstr ""
 
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2007
-msgid "The recorded score for this version is %1/%2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:62
+msgid "The problem set is not yet open"
 msgstr ""
 
 #. ($origReducedScoringDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1948
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1121
 msgid ""
 "The reduced credit date %1 in the file probably was generated from the Unix "
 "epoch 0 value and is being treated as if it was Unix epoch 0."
 msgstr ""
 
 #. ($openDate, $dueDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1959
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1135
 msgid ""
 "The reduced credit date should be between the open date %1 and close date %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1201
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1220
 msgid ""
 "The reduced scoring date should be between the open date and close date."
 msgstr ""
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2056
+#. ($tempFile)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:298
+msgid "The requested file \"%1\" does not exist on the server."
+msgstr ""
+
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1389
 msgid "The score for this problem can count towards score of problem %1."
 msgstr ""
 
-#. ($setName, $effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:327
-msgid "The selected problem set (%1) is not a valid set for %2"
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:69
+msgid ""
+"The scoring files are stored in the scoring directory and are produced using "
+"the \"Scoring Tools\" page or the scoring command in the \"Instructor "
+"Tools\" module. These files can be downloaded, modified in a spreadsheet "
+"(for example, to add midterm scores) and then uploaded again to the scoring "
+"directory to be merged with email messages. (Use a new file name, other than "
+"%1, when uploading to prevent the scoring module from overwriting an "
+"uploaded file.)"
 msgstr ""
 
-#. ($urlpath->arg("setID")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1468
-msgid "The selected problem set (%1) is not a valid set for %2%3:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:52
+msgid ""
+"The second row of the problem collection area is for browsing directories. "
+"The OPL will be there as well as any other directories that you may set up "
+"(for example Contrib). If this is selected, all subdirectories containing "
+"problems will be listed."
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1916
-msgid "The set header for set %1 has been renamed to '%2'."
+#. (stash('setID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet.html.ep:13
+msgid "The selected problem set (%1) is not a valid set for %2."
+msgstr ""
+
+#. ($setID, $effectiveUserID, $c->{invalidVersionCreation} ? " (acted as by $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:77
+msgid "The selected problem set (%1) is not a valid set for %2: %3"
+msgstr ""
+
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1066
+msgid "The set header for set %1 has been renamed to \"%2\"."
 msgstr ""
 
-#. ($newSetName)
 #. ($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1141
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1935
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:491
+msgid ""
+"The set name \"%1\" is already in use. Pick a different name if you would "
+"like to start a new set. No set created."
+msgstr ""
+
+#. ($newSetName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:584
 msgid ""
 "The set name '%1' is already in use.  Pick a different name if you would "
 "like to start a new set."
 msgstr ""
 
-#. ($setID, $editingSetVersion, $editForUser[0])
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2093
-msgid "The set-version (%1, version %2) is not assigned to user %3."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:58
+msgid ""
+"The sets checked below will be visible to students or hidden from students. "
+"Useful for preparing sets ahead of time, but not showing them to students; "
+"or for temporarily hiding a set which has a mistake in it while it is being "
+"fixed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:54
+msgid ""
+"The sets checked below will become available for editing the due dates and "
+"visibility."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:73
+msgid ""
+"The sets checked below will written to set definition files, to be saved for "
+"future use, or to be transferred to another course. The set definition files "
+"can be uploaded/downloaded using the \"File Manager\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:29
+msgid ""
+"The simple configuration file is the name of the configuration file created "
+"when using the \"Course Configuration\" page to configure course options.  "
+"This option sets if this configuration file is copied from the old course or "
+"not and instead use the server defaults."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:551
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:521
 msgid "The solution has been removed."
 msgstr ""
 
-#. ($fullSetName, $prettyProblemNumber, $self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1945
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:33
+msgid ""
+"The solution shown is an instructor preview and will only be shown to "
+"students after the due date."
+msgstr ""
+
+#. ($c->{fullSetID},						$c->{prettyProblemNumber},						$c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1103
+msgid ""
+"The source file for \"set %1 / problem %2\" has been changed from \"%3\" to "
+"\"%4\"."
+msgstr ""
+
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1209
+msgid ""
+"The temporary file %1 is not contained in the course templates directory and "
+"can not be deleted."
+msgstr ""
+
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:689
 msgid ""
-"The source file for 'set %1 / problem %2 has been changed from '%3' to '%4'"
+"The temporary file %1 is not in the course templates directory and can not "
+"be deleted!"
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2119
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:349
 msgid "The test (which is version %1) may  no longer be submitted for a grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1897
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1042
 msgid ""
 "The text box now contains the source of the original problem. You can "
 "recover lost edits by using the Back button on your browser."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:217
+#. (			% . 'but the result will not be counted.')
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:23
 msgid ""
 "The time limit on this assignment was exceeded. The assignment may be "
-"checked, but the result will not be counted."
+"checked, "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:195
+#: /opt/webwork/webwork2/conf/defaults.config:1559
 msgid ""
 "The time of the day that the assignment is due.  This can be changed on an "
 "individual basis, but WeBWorK will use this value for default when a set is "
@@ -6276,24 +8878,39 @@ msgid ""
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1406
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:689
 msgid "The title of the course %1 has been changed from %2 to %3"
 msgstr ""
 
-#. ($rename_newCourseID, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1454
+#. ($rename_newCourseID, $optional_arguments{courseTitle})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:722
 msgid "The title of the course %1 is now %2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:167
+msgid ""
+"The top number is the percent score on the problem.  A period (.) indicates "
+"a problem has not been attempted. The bottom number is the number of "
+"incorrect attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:25
+msgid ""
+"The total grade row at the bottom shows the total score and percent average "
+"over all open assignments.  The total grade row can be shown/hidden under "
+"general course configuration settings."
+msgstr ""
+
 #. ($enableReducedScoring)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1151
 msgid ""
 "The value %1 for enableReducedScoring is not valid; it will be replaced with "
 "'N'."
 msgstr ""
 
 #. ($timeCap)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2009
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1209
 msgid ""
 "The value %1 for the capTimeLimit option is not valid; it will be replaced "
 "with '0'."
@@ -6301,165 +8918,168 @@ msgstr ""
 
 #. ($hideScore)
 #. ($hideScoreByProblem)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1995
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1178
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1189
 msgid ""
 "The value %1 for the hideScore option is not valid; it will be replaced with "
 "'N'."
 msgstr ""
 
 #. ($hideWork)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2005
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1200
 msgid ""
 "The value %1 for the hideWork option is not valid; it will be replaced with "
 "'N'."
 msgstr ""
 
 #. ($relaxRestrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2022
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1235
 msgid ""
 "The value %1 for the relaxRestrictIP option is not valid; it will be "
 "replaced with 'No'."
 msgstr ""
 
 #. ($restrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2014
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1221
 msgid ""
 "The value %1 for the restrictIP option is not valid; it will be replaced "
 "with 'No'."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:46
+msgid "The visible name/title of the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:36
 msgid ""
 "The webwork server must be able to write to these directories. Please "
 "correct the permssion errors."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:137
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:83
+msgid "Theme"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1439
 msgid "Theme (refresh page after saving changes to reveal new theme.)"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:5
+msgid "Theme:"
+msgstr ""
+
 # Context is "Sort by ____ Then by _____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:754
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:855
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:30
 msgid "Then by"
 msgstr ""
 
-#. ($count_line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:639
+#. ($listingsCount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:52
 msgid "There are %1 matching WeBWorK problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:171
+#: /opt/webwork/webwork2/conf/defaults.config:1527
 msgid ""
 "There are currently two hardcopy themes to choose from: One Column and Two "
 "Columns.  The Two Columns theme is the traditional hardcopy format.  The One "
 "Column theme uses the full page width for each column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1217
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2119
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2781
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2895
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1519
 msgid ""
-"There are extra database fields  which are not defined in the schema for at "
-"least one table.  They can only be removed manually from the database."
+"There are extra database fields which are not defined in the schema for at "
+"least one table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2116
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2778
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2892
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:23
 msgid ""
-"There are extra database tables which are not defined in the schema.  They "
-"can only be removed manually from the database."
+"There are extra database fields which are not defined in the schema for at "
+"least one table.  They can be removed when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1214
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1404
 msgid ""
-"There are extra database tables which are not defined in the schema.  They "
-"can only be removed manually from the database. They will not be renamed."
+"There are extra database fields which are not defined in the schema for at "
+"least one table. Check the checkbox by the field to delete it when upgrading "
+"the course. Warning: Deletion destroys all data contained in the field and "
+"is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:637
-msgid "There are no matching WeBWorK problems"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1508
+msgid "There are extra database tables which are not defined in the schema."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1009
-msgid "There are no set definition files in this course to look at."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1389
+msgid "There are extra database tables which are not defined in the schema. "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2125
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:15
 msgid ""
-"There are tables or fields missing from the database.  The database must be "
-"upgraded before archiving this course."
+"There are extra database tables which are not defined in the schema.  These "
+"can be deleted when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4021
-msgid "There are upgrades available for the Open Problem Library."
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:29
+msgid "There are many options available at the bottom:"
 msgstr ""
 
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3985
-msgid ""
-"There are upgrades available for your current branch of PG from branch %1 in "
-"remote %2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:49
+msgid "There are no completed versions of this test."
 msgstr ""
 
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3923
-msgid ""
-"There are upgrades available for your current branch of WeBWorK from branch "
-"%1 in remote %2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:51
+msgid "There are no matching WeBWorK problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:8
+msgid "There are no set definition files in this course to look at."
 msgstr ""
 
 #. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:271
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:87
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
 "their name, you destroy all of the data for achievement %1 for this student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:233
+#. (tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:91
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
-"their name, you destroy all of the data for homework set $setID for this "
-"student."
+"their name, you destroy all of the data for homework set %1 for this student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:207
-msgid ""
-"There is NO undo for this function.  Do not use it unless you know what you "
-"are doing!  When you unassign sets using this button, or by unchecking their "
-"set names, you destroy all of the data for those sets for this student."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:68
+msgid "There is NO undo for unassigning a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:234
-msgid "There is NO undo for unassigning a set."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:125
+msgid ""
+"There is NO undo for unassigning sets. Do not do so unless you know what you "
+"are doing!  When you unassign sets by unchecking set names and clicking "
+"save, you destroy all of the data for those sets for this student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:174
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:21
 msgid "There is NO undo for unassigning students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3982
-msgid "There is a new version of PG available."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3920
-msgid "There is a new version of WeBWorK available."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:529
-msgid "There is a written solution available."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:490
+msgid "There is a written solution available."
 msgstr ""
 
 #. ($message_file, $merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:50
 msgid ""
 "There is no additional grade information.  A message about additional grades "
 "can go in [TMPL]/email/%1. It is merged with the file [Scoring]/%2. These "
@@ -6467,183 +9087,324 @@ msgid ""
 "in the left margin."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4037
-msgid ""
-"There is no library tree file for the library, you will need to run OPL-"
-"update."
-msgstr ""
-
 #. ($continueTimeLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:512
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:25
 msgid ""
 "There is no time remaining on the currently open test. Click continue below "
 "and then click \"Grade Test\" within %1 seconds to submit the test for a "
 "grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:854
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:65
 msgid "There is no undo for deleting files or directories!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:534
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:495
 msgid ""
 "There is no written solution available for this problem, but you can still "
 "view the correct answers."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:537
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:498
 msgid "There is no written solution available for this problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:138
-msgid ""
-"There is one main theme to choose from: math4. It has two variants, math4-"
-"green and math4-red. The theme specifies a unified look and feel for the "
-"WeBWorK course web pages."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2236
+#: /opt/webwork/webwork2/conf/defaults.config:1441
 msgid ""
-"There may be something wrong with this question. Please inform your "
-"instructor including the warning messages below."
+"There is one main theme to choose from: math4. It has three variants: math4-"
+"green, math4-red, and math4-yellow. The theme specifies a unified look and "
+"feel for the WeBWorK course web pages."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:429
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:441
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator if this recurs."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:182
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:290
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:342
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:481
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:490
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:517
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:549
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:228
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:345
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:397
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:354
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:492
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:536
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:575
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:172
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:189
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:212
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:227
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:365
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:447
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:338
+#. ('href="https://webwork.maa.org/wiki/Set_Definition_Files" target="Webworkdocs"')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:48
+msgid ""
+"These are stored in the templates directory. The format of <strong>Set "
+"Definition files</strong> is described in the <a %1>Set Definition "
+"specification</a>. Set definition files are mainly useful for transferring "
+"set assignments from one course to another and are created when exporting a "
+"problem set from the \"Hmwk Sets Editor\".  Each set defintion file contains "
+"a list of problems used and the dates and times. These definitions can be "
+"imported into the current course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:77
+msgid ""
+"These are the files from which problems are generated and are located in the "
+"templates directory or in subdirectories. They can be edited directly using "
+"the \"Edit\" link on each problem page or from the \"Hmwk Sets Editor\". The "
+"File Manager allows you to upload or download these files. \tDirectories "
+"that start with \"set\" contain pg files and are generated when exporting a "
+"problem set in which there are local versions of a problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:40
+msgid ""
+"These options will only be shown if the user has the permission to change "
+"display settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:44
+msgid ""
+"These problems require some application of algorithms, but do not rise to "
+"the level of a full word problem. For example, \"Identify the local extrema "
+"for f(x) = ...\". One has to apply algorithms and interpret results."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1837
 msgid ""
 "These users and higher get the \"Show Past Answers\" button on the problem "
 "page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:17
 msgid "This action can take a long time if there are many students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:168
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:12
 msgid "This action will not overwrite existing users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:102
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:20
+msgid ""
+"This allows for the viewing, downloading, uploading and other management of "
+"files in the course.  Select a file or set of files (using CTRL or SHIFT) "
+"and click the desired button on the right.  Many actions can only be done "
+"with a single file (like view). Selecting a directory or set of files and "
+"clicking \"Make Archive\" creates a compressed tar file with the name "
+"COURSE_NAME.tgz"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:34
+msgid ""
+"This browses the Open Problem Library (OPL) in category (Subject/Chapter/"
+"Section) form. Select the desired categories (all three do not need to be "
+"selected) and click \"View Problems\". If the \"Include Contrib\" box is "
+"selected then those problems in the Contrib section of the OPL that have the "
+"categories defined are also included. Contrib problems are problem that "
+"haven't been vetted as thoroughly as OPL problems. If you want hints or "
+"solutions included while browsing select the appropriate box."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:49
+msgid ""
+"This button is also present both at top and the bottom of the page. Discards "
+"all changes, reloading the page by re-reading the database information for "
+"this set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:39
+msgid ""
+"This button is present both at top and the bottom of the page. Any and all "
+"changes made to any part of the set will be saved with one important "
+"exception: When editing the set for one or more students, you can choose to "
+"override the default value (defined for the set in general) by clicking on "
+"the checkbox and providing a value (or possibly leaving blank) and checking "
+"the override checkbox. If you do <strong>NOT</strong> check the checkbox, "
+"the override value will be discarded and the default value for the set will "
+"be used for the users currently being edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:105
+msgid ""
+"This can computed from the answer sub scores above using the weights shown "
+"if they are modified.  Alternatively, enter the point score you want saved "
+"here (the above sub scores will be ignored)."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2005
+msgid ""
+"This configures if the single problem manual grader has inputs to enter "
+"problem scores as a percent, a point value, or both. Note, the problem score "
+"is always saved as a percent, so when using a point value, the problem score "
+"will be rounded to the nearest whole percent."
+msgstr ""
+
+#. (tag('b', maketext('Guest Login')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:72
 msgid ""
 "This course supports guest logins. Click %1 to log into this course as a "
 "guest."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:861
-msgid "This homework set contains no problems."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:58
+msgid ""
+"This determines if MathQuill answer blanks are enable for the user. This "
+"option is only present if MathQuill is enabled for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1959
-msgid "This homework set is closed."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:63
+msgid ""
+"This determines if the MathView equation editor button will be appended to "
+"text answer blanks. his option is only present if MathView is enabled for "
+"the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1957
-msgid "This homework set is not yet open."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:52
+msgid ""
+"This determines whether or not saved past answers are automatically filled "
+"in to the problem form when a student returns to a problem after having left "
+"the problem. This option is only visible if the user has the permission to "
+"show old answers."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:933
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:85
 msgid ""
-"This is a blank problem template file and can not be edited directly. Use "
-"the 'NewVersion' action below to create a local copy of the file and add it "
-"to the current problem set."
+"This directory is accessible from the web. You can use it to store html "
+"documents or image documents that are used by the course. Do not store "
+"private information in this directory or in any subdirectory thereof. These "
+"documents can be linked to from within problems using the htmlLink macro."
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:407
-msgid "This is a new (re-randomized) version of the problem."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:255
+msgid "This file is a template. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:106
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:20
 msgid ""
-"This is a table showing the current Homework sets for this class.  The "
-"fields from left to right are: Edit Set Data, Edit Problems, Edit Assigned "
-"Users, Visibility to students, Reduced Credit Enabled, Date it was opened, "
-"Date it is due, and the Date during which the answers are posted.  The Edit "
-"Set Data field contains checkboxes for selection and a link to the set data "
-"editing page.  The cells in the Edit Problems fields contain links which "
-"take you to a page where you can edit the containing problems, and the cells "
-"in the edit assigned users field contains links which take you to a page "
-"where you can edit what students the set is assigned to."
+"This form can assign, unassign, and edit user data for a single "
+"achievement.  You can assign the achievement to all current users or select "
+"which users to assign the achievement to and click Save.  You can unassign "
+"the achievement by unchecking a student's name (note all data will be "
+"deleted).  To unassign the achievement from all users, first select \"Allow "
+"unassign\" and then click the \"Unassign from All Users\" button. You can "
+"also toggle the earned status with the checkbox in the \"Earned\" column and "
+"edit the achievement counter for counting achievements."
 msgstr ""
 
-#. ($hours, $minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:609
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:19
+msgid ""
+"This gives the status and dates of the main set. Indvidual students may have "
+"different settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:51
+msgid "This homework set contains no problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1231
+msgid "This homework set is closed."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1229
+msgid "This homework set is not yet open."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:423
+msgid "This is a new (re-randomized) version of the problem."
+msgstr ""
+
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:109
 msgid ""
 "This is a timed test. You will have %quant(%1,hour) and %quant(%2,minute) to "
 "complete the test."
 msgstr ""
 
-#. ($hours, $minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:620
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:119
 msgid ""
 "This is a timed test. You will have %quant(%1,hour,hours,)%quant(%2,minute,"
 "minutes,) to complete the test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:100
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:81
+msgid ""
+"This is done by first entering the user as a student and then changing the "
+"permission level of the user. First edit the user by clicking on the pencil "
+"next to their name (or using the technique above for several users), then "
+"change their permssion level -- an entry blank at the far right of the "
+"screen, you may have to scroll to see it. The permission levels are"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:156
+msgid ""
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page if you wish to assign a homework set to all students or a large group "
+"of students (e.g. a section)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:161
+msgid ""
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:171
+msgid ""
+"This is done from the \"Hmwk Sets Editor\" page or the \"Instructor tools\" "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:71
+msgid ""
+"This is most easily done by importing a class list. The class list can be "
+"uploaded from your workstation to the server using the File Manager page. "
+"The class list must be a file ending in .lst and must have a specific <a "
+"href=\"http://webwork.maa.org/wiki/"
+"Classlist_Files#Format_of_classlist_files\">format</a>. Once the file has "
+"been uploaded to the server the file will appear in the import action pop-up "
+"list (5th action). demoCourse.lst is available for most courses and adds the "
+"\"practice users\" which activate guest logins to the class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:23
 msgid ""
-"This is the Achievement Editor.  It is used to edit the achievements "
-"available to students.  Please keep in mind the following facts: Achievments "
-"are displayed, and evaluated, in the order they are listed. The \"secret\" "
-"category creates achievements which are not visible to students until they "
-"are earned.  The \"level\" category is used for the achievements associated "
-"to a users level."
+"This is the administration course which is used to manage courses on this "
+"server.  Use the \"Admin Menu\" to select the desired action."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:98
+#: /opt/webwork/webwork2/conf/defaults.config:1996
 msgid ""
-"This is the classlist editor page, where you can view and edit the records "
-"of all the students currently enrolled in this course.  The top of the page "
-"contains forms which allow you to filter which students to view, sort your "
-"students in a chosen order, edit student records, give new passwords to "
-"students, import/export student records from/to external files, or add/"
-"delete students.  To use, please select the action you would like to "
-"perform, enter in the relevant information in the fields below, and hit the "
-"\"Take Action!\" button at the bottom of the form.  The bottom of the page "
-"contains a table containing the student usernames and their information."
+"This is the default number of attempts a student must make before hints will "
+"be shown to the student. Set this to -1 to hide hints.  Note that this can "
+"be overridden with a per problem setting."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:96
+#: /opt/webwork/webwork2/conf/defaults.config:1712
 msgid ""
-"This is the homework sets editor page where you can view and edit the "
-"homework sets that exist in this course and the problems that they contain. "
-"The top of the page contains forms which allow you to filter which sets to "
-"display in the table, sort the sets in a chosen order, edit homework sets, "
-"publish homework sets, import/export sets from/to an external file, score "
-"sets, or create/delete sets.  To use, please select the action you would "
-"like to perform, enter in the relevant information in the fields below, and "
-"hit the \"Take Action!\" button at the bottom of the form.  The bottom of "
-"the page contains a table displaying the sets and several pieces of relevant "
-"information."
+"This is the default number of attempts before show me another becomes "
+"available to students.  It can be set to -1 to disable show me another by "
+"default."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:220
+#: /opt/webwork/webwork2/conf/defaults.config:1601
 msgid ""
 "This is the number of achievement points given to each user for completing a "
 "problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:166
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:150
 msgid ""
 "This is the only part of the score that is actually saved. This is computed "
 "from the answer sub scores above using the weights shown if they are "
@@ -6651,135 +9412,313 @@ msgid ""
 "scores will be ignored)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:110
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:19
+msgid "This is the standard entry point for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:92
+msgid ""
+"This is where email messages and templates are saved. You can upload or "
+"download files in this directory if you wish to save the files for later."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:77
+msgid ""
+"This is where you edit the text of the problem template. Type Ctrl-Enter "
+"while this window has focus to re-render the problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:669
+msgid ""
+"This is your last submission.  If you say yes, then your answers will be "
+"final, and you will not be able to continue to work this test version."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:673
 msgid ""
-"This is the past answer viewer.  Students can only see their answers, and "
-"they will not be able to see which parts are correct.  Instructors can view "
-"any users answers using the form below and the answers will be colored "
-"according to correctness."
+"This is your only submission.  If you say yes, then your answers will be "
+"final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3038
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:42
+msgid ""
+"This link gives details for many macros. It links to documentation embedded "
+"in the macro files themselves."
+msgstr ""
+
+#. ('PGMLLab/PGML-lab.pg')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:63
+msgid ""
+"This links to a WeBWorK \"problem\" which allows you to try out fragments of "
+"PGML code. This link will not be available if the file %1 is not located in "
+"the templates directory of the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:33
+msgid "This links to a list of problem authoring techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:39
+msgid "This links to a page describing Math Object usage."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:72
+msgid "This links to problem authoring information on the WeBWorK wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:46
+msgid ""
+"This may be Mathjax, images, or plainText. Only the options that are enabled "
+"for the course will be available to select. This option is only visible if "
+"there is more than one display mode enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:42
+msgid "This option shows all pg problems in the course directory structure."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:47
+msgid ""
+"This option shows all problems in set definition files that are located in "
+"the course directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:44
+msgid ""
+"This option shows all problems in sets that have been created in the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:20
+msgid ""
+"This page allows one to edit the contents of PG problem files as well as set "
+"headers and other files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:20
+msgid ""
+"This page allows users to change their password, email address, and display "
+"settings used in problems. Note that you can hide this page entirely for "
+"students by setting permission levels to login_proctor or higher for the "
+"permissions to change password, change e-mail address, and change display "
+"settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:20
+msgid ""
+"This page allows you to configure course settings such as permission levels, "
+"display modes allowed, default display mode, email feedback behavior, and "
+"much more."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:20
+msgid ""
+"This page displays a student's current achievement level and progress toward "
+"the next level, and lists the rewards and badges that the student has "
+"earned. If rewards have been earned, then the student may also redeem those "
+"rewards."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:26
+msgid ""
+"This page gives access to information about the student, independent of the "
+"homework sets assigned to them."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:20
+msgid ""
+"This page gives information about mass LTI grade updates, and allows you to "
+"trigger a grade update for all users and all sets, all sets for one user, "
+"all users for one set, or one user for one set.  When a user is selected, "
+"the sets drop down menu is updated to only allow selecting sets assigned the "
+"selected user.  Similarly when a set is selected, the user menu is updated "
+"to only allow selecting valid users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:20
+msgid ""
+"This page is a collection of tools to modify users and sets.  These tools "
+"are short cuts for common actions that allow selecting multiple users or "
+"sets to act on at once.  Because multiple users and sets can be acted on at "
+"the same time, it is often more efficient to use this page when modifying "
+"multiple items.  For example, after selecting several users and a set you "
+"can change the close date for all selected users for that set.  This page "
+"also gives access to \"View/Edit all sets for one user\", which can be used "
+"to access settings for all sets including test versions for that user."
+msgstr ""
+
+#. (q(table to save any changes.  Each student's name links to that student's problem and opens up the)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:20
+msgid ""
+"This page is for manually grading a problem for all assigned students.  The "
+"table of students shows their last answers, percent score, and feedback "
+"comment.  The \"Save\" button is located below the "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:20
+msgid ""
+"This page is used to browse problems that will be used to fill problem sets. "
+"The first step is to choose which set you are working on. If you need to "
+"create a new problem set fill in the blank next to the \"Create a New Set in "
+"This Course\" button and then press the button. Then choose which set you "
+"want to work on in the drop down menu."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:20
+msgid ""
+"This page is useful for monitoring student progress on assignments. Student "
+"progress can either be viewed for a single set or for a single student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:20
+msgid ""
+"This page manages all of the homework sets (including quizzes/tests). The "
+"following allow editing directly of a single problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:20
+msgid ""
+"This page shows the student's current grades for all sets they are assigned "
+"to.  Only visible sets are shown to the student, while invisible set names "
+"are italic when viewed as an instructor.  Students can only see the per "
+"problem grades on open assignments."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3169
 msgid "This problem contains a video which must be viewed online."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:602
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:631
 msgid "This problem has more than one part."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2030
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2264
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1323
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1576
 msgid ""
 "This problem has open subproblems.  You can visit them by using the links to "
 "the left or visiting the set page."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem.html.ep:66
+msgid "This problem is not valid."
+msgstr ""
+
 #. ($prettyID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2575
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:399
 msgid "This problem uses the same source file as number %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:537
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:418
 msgid "This problem will not count towards your grade."
 msgstr ""
 
-#. ($EMAIL)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1120
+#. ($ur->email_address)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:1
 msgid "This sample mail would be sent to %1"
 msgstr ""
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2059
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1399
 msgid ""
 "This score for this problem does not count for the score of problem %1 or "
 "for the set."
 msgstr ""
 
-#. ($message_file,		$merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:172
+#. ($message_file,				$merge_file)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:127
 msgid ""
 "This scoring message is generated from [TMPL]/email/%1. It is merged with "
 "the file [Scoring]/%2. These files can be edited using the \"Email\" link "
 "and the \"File Manager\" link in the left margin."
 msgstr ""
 
-#. (CGI::strong($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2196
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:155
 msgid "This set %1 is assigned to %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2877
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:678
 msgid "This set doesn't contain any problems yet."
 msgstr ""
 
-#. ($beginReducedScoringPeriod, $dueDate, $reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:368
+#. ($c->formatDateTime($reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:44
 msgid ""
 "This set had a reduced scoring period that started on %1 and ended on %2.  "
 "During that period all work counted for %3% of its value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:78
 msgid ""
 "This set has a set-level proctor password to authorize logins. Enter the "
 "password below."
 msgstr ""
 
-# Context is "This set is visible" or "This set is hidden"
-#. (CGI::span({class=>$visiblityStateClass}, $visiblityStateText)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:69
-msgid "This set is %1"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:411
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:59
+msgid "This set is hidden from students."
 msgstr ""
 
 #. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:40
 msgid ""
 "This set is in its reduced scoring period.  All work counts for %1% of its "
 "value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:190
-msgid "This set needs to be assigned to you before you can grade it."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:51
+msgid "This set is not assigned to any students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:159
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:57
+msgid "This set is visible to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:42
+msgid "This set or problem is not valid."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:164
 msgid ""
 "This set will be unavailable to students until they have earned a certain "
-"score on the sets specified in this field.  The sets should be written as a "
-"comma separated list.  The minimum score required on the sets is specified "
-"in the following field."
+"score on the sets specified in this field. The sets should be written as a "
+"comma separated list. The minimum score required on the sets is specified in "
+"the following field."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:235
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:111
 msgid ""
-"This sets whether the Reduced Scoring system will be enabled.  If enabled "
-"you will need to set the default length of the reduced scoring period and "
-"the value of work done in the reduced scoring period below.  <p> To use "
-"this, you also have to enable Reduced Scoring for individual assignments and "
-"set their Reduced Scoring Dates by editing the set data.<p> This works with "
-"the avg_problem_grader (which is the the default grader) and the  "
-"std_problem_grader (the all or nothing grader).  It will work with custom "
-"graders if they are written appropriately."
+"This should be done cautiously. Once a student is deleted from a course "
+"their data is lost forever and cannot be recovered. They can be added to the "
+"course as a new student, but all of their homework set assignments and "
+"homework has been permanently deleted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1991
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1962
 msgid "This source file does not exist!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1961
 msgid "This source file is a directory!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1992
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1963
 msgid "This source file is not a plain file!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1960
 msgid "This source file is not readable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:359
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+msgid ""
+"This specifies the number of attempts before hints are shown to students. "
+"The value of -2 uses the default from course configuration. The value of -1 "
+"disables hints. Note that this will only have an effect if the problem has a "
+"hint."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
 msgid ""
 "This specifies the rerandomization period: the number of attempts before a "
 "new version of the problem is generated by changing the Seed value. The "
@@ -6787,360 +9726,515 @@ msgid ""
 "disables rerandomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:204
-msgid ""
-"This table lists the available homework sets for this class, along with "
-"their current status. Click on the name of the homework set to view the "
-"problems in that homework set.  You can also select sets to download in PDF "
-"or TeX format by checking the checkboxes next to the problem set names, and "
-"then click on the \"Generate Hardcopy for Selected Sets\" button at the end "
-"of the table.  There is also a clear button and an Email Instructor button "
-"at the end of the table."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:677
-msgid ""
-"This table lists the current attempts for this test/quiz, along with its "
-"status, score, start date, and close date. Click on the version link to "
-"access that version. "
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:802
-msgid ""
-"This table shows the problems that are in this problem set.  The columns "
-"from left to right are: name of the problem, current number of attempts "
-"made, number of attempts remaining, the point worth, and the completion "
-"status.  Click on the link on the name of the problem to take you to the "
-"problem page."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:655
-msgid "This test is closed."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:571
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:81
 msgid "This test requires a proctor password to continue."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:628
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:126
 msgid "This test requires a proctor password to start."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2289
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:45
+msgid "This will determine if the output is in one or two columns."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:21
 msgid "Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:249
 msgid "Time Interval for New Test Versions (min; 0=infty)"
 msgstr ""
 
-#. ($elapsedTime,$allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2104
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:159
+msgid "Time Remaining"
+msgstr ""
+
+#. ($c->{elapsedTime}, sprintf('%.0f', 10 * ($c->{set}->due_date - $c->{set}->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:336
 msgid "Time taken on test: %1 min (%2 min allowed)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
 msgid "Timestamp"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:163
+#: /opt/webwork/webwork2/conf/defaults.config:1512
 msgid "Timezone for the course"
 msgstr ""
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:504
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:330
 msgid "To access this set you must score at least %1% on set %2."
 msgstr ""
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:506
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:336
 msgid ""
 "To access this set you must score at least %1% on the following sets: %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:53
 msgid ""
 "To add an additional instructor to the new course, specify user information "
 "below. The user ID may contain only numbers, letters, hyphens, periods "
 "(dots), commas,and underscores."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:42
 msgid ""
 "To add the WeBWorK administrators to the new course (as administrators) "
 "check the box below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:239
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:118
+msgid ""
+"To assign one or more sets to an individual student click in the column "
+"\"Assigned Sets\" in the student's row. This will take you to a page where "
+"you can assign and unassign homework sets and change the due dates for "
+"homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:79
 msgid ""
 "To change status (scores or grades) for this student for one set, click on "
 "the individual set link."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:621
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:106
+msgid ""
+"To copy the templates and html folders from an existing course, select the "
+"course below."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:102
 msgid ""
-"To copy problem templates from an existing course, select the course below."
+"To drop a student or students, select them for editing as described above "
+"and then set the pop-up list to enrolled,drop, or audit. Dropped students "
+"cannot log in to the course, are not assigned new homework sets and are not "
+"sent e-mail. They can be re-enrolled simply by changing their status back to "
+"enrolled. No data is lost, any homework sets assigned before they were "
+"dropped are restored unchanged."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2161
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:143
 msgid ""
 "To edit a specific student version of this set, edit (all of) her/his "
 "assigned sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:375
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:29
 msgid ""
-"To edit this text you must first make a copy of this file using the "
-"'NewVersion' action below."
+"To perform an action select the desired action tab and click the submit "
+"button."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:90
+msgid "To this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:380
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:69
 msgid ""
-"To edit this text you must use the 'NewVersion' action below to save it to "
-"another file."
+"To use the Email merge feature, upload a CSV with calculated grades to the "
+"scoring directory using the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1296
-msgid "To this Problem"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:767
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:58
+msgid "Today"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:252
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:33
+msgid "Toggle each of the options to include or not include in the output."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:522
+msgid "Top Score"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:118
+msgid "Top level of author information on the wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:114
+msgid "Total Points"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:18
+msgid "Total Points:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:90
 msgid "Totals"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:276
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:290
 msgid "Totals only (not problem scores)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:276
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:291
 msgid "Totals only, only after answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:584
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:236
 msgid "Transfer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:284
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:22
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:35
 msgid "True"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1309
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:245
 msgid "Try it"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:26
 msgid "Tunic of Extension"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:114
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:86
 msgid "Two Columns"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1461
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:30
 msgid "Type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2216
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2291
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:84
+msgid "Type:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:23
 msgid "URI"
 msgstr ""
 
 #. ($achievementName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:626
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:297
 msgid "Unable to change the evaluator for set %1. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:818
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1084
+msgid "Unable to change the hardcopy header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1070
+msgid "Unable to change the set header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{fullSetID}, $c->{prettyProblemNumber})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1110
+msgid ""
+"Unable to change the source file path for set %1, problem %2. Unknown error."
+msgstr ""
+
+#. ($c->shortPath($delFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1246
+msgid "Unable to delete backup file \"%1\"."
+msgstr ""
+
+#. ($formatBackupTime)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:571
+msgid "Unable to delete backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:888
+msgid "Unable to make \"%1\" the hardcopy header for %2."
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:860
+msgid "Unable to make \"%1\" the set header for %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:693
 msgid "Unable to obtain error messages from within the PG question."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:395
-msgid "Unable to write to '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:275
+msgid "Unable to open a temporary file at the given location."
+msgstr ""
+
+#. ($c->shortPath($backupFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1233
+msgid "Unable to read backup file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2533
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:636
+msgid "Unable to write to \"%1\": %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:15
 msgid "Unarchive"
 msgstr ""
 
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2516
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:4
 msgid "Unarchive %1 to course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2371
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2501
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:40
 msgid "Unarchive Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2595
-msgid "Unarchive Next Course"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:17
+msgid "Unarchive Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:25
+msgid "Unarchive Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:216
-msgid "Unassign All Sets"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1306
+msgid "Unarchive Next Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:279
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:241
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:97
 msgid "Unassign from All Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:178
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:61
 msgid "Unassign selected sets from selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:58
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:57
 msgid ""
-"Unassignments were not done.  You need to both click to \"Allow unassign\" "
-"and click on the Unassign button."
+"Unassignments were not done.  You need to select \"Allow unassign\" and then "
+"click on the Unassign button."
 msgstr ""
 
 #. ($unattempted, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1030
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:44
 msgid "Unattempted: %1/%2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:53
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:37
 msgid "Unclassified Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:242
 msgid "Ungraded"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3636
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3678
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:58
 msgid "Unhide Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1418
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1151
+msgid "Unkown saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:28
 msgid ""
-"Unlock an additional version of a Gateway Test.  If used before the close "
-"date of the Gateway Test this will allow you to generate a new version of "
-"the test."
+"Unlock an additional version of a test.  If used before the close date of "
+"the test this will allow you to generate a new version of the test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:164
-msgid "Unpack"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:47
+msgid "Unpack Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:456
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:113
 msgid "Unpack archives automatically"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2634
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:15
 msgid "Unselect all courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:129
-msgid "Update"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:63
+msgid "Update Display"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:616
-msgid "Update Display"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:84
+msgid "Update Grades"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:964
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:27
+msgid "Update Interval"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:102
 msgid "Update Menus"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:724
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:761
-msgid "Update settings and refresh page"
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:51
+msgid "Update aborted. Invalid set %1."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:47
+msgid "Update aborted. Invalid user %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2614
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:67
+msgid "Update set:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:8
 msgid "Update the checked directories?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3457
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:50
+msgid "Update user:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1908
 msgid "Updated location description."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2760
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2820
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:40
 msgid "Upgrade"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1290
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2199
+#. ($upgrade_courseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
+msgid "Upgrade %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:97
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:79
 msgid "Upgrade Course Tables"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2612
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2690
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:382
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:42
 msgid "Upgrade Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2923
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:17
+msgid "Upgrade Courses Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:43
+msgid "Upgrade courses from a previous version of WeBWorK."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1582
 msgid "Upgrade process completed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:386
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:65
 msgid "Upload"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:178
-msgid "Use Date Picker"
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:72
+msgid ""
+"Upload, download and delete text files, including scoring spread sheets, set "
+"definition files, class list spread sheets, and \"PG\" problems."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2408
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:292
 msgid "Use Default Header File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:386
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:413
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:127
 msgid "Use Equation Editor?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:257
-msgid "Use Item"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:20
+msgid "Use Reward"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2666
-msgid "Use System Default"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:556
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:27
 msgid "Use browser back button to return from preview mode."
 msgstr ""
 
-#. (CGI::b("$achievementID")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:510
+#. (tag('b', $c->{achievementID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:16
 msgid "Use in achievement %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:526
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:23
 msgid "Use in new achievement:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:440
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:149
 msgid "Use live equation rendering?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:386
+#: /opt/webwork/webwork2/conf/defaults.config:1929
 msgid "Use log base 10 instead of base <i>e</i>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:392
+#: /opt/webwork/webwork2/conf/defaults.config:1935
 msgid "Use older answer checkers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:302
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:123
+msgid ""
+"Use the \"Create\" and \"Delete\" actions to create or delete achievements. "
+"Note that deleting an achievement will delete all data associated to the "
+"achievement and cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:35
+msgid ""
+"Use the \"Merge file\" drop down menu to select which merge file to use, or "
+"select \"None\" to not use any merge file.  When a merge file is selected, "
+"the data for active students will be displayed above the \"Email Body\".  "
+"This will show you the structure of the merge file and the column variables "
+"associated with each column.  Data that is longer than 7 characters will be "
+"truncated, and the data can be scrolled up and down to see all rows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:28
+msgid ""
+"Use the \"Users\" and \"Sets\" forms to select which users and sets to act "
+"on.  Multiple items can be selected using ctrl-click or shift-click.  The "
+"action buttons are grouped into three categories.  The first is a set of "
+"actions that act on the selected users, the second is a set of actions that "
+"act on the selected sets, and the third is a set of actions for acting on a "
+"combination of sets and users.  If an invalid number of users or sets are "
+"selected, the action will not be preformed, and an error message will be "
+"placed on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:25
+msgid ""
+"Use the editor to edit the evaluator and the action form at the bottom to "
+"save the evaluator. You can either overwrite the current evaluator file or "
+"save as a new evaluator file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:15
 msgid ""
 "Use the interface below to quickly access commonly-used instructor tools, or "
 "select a tool from the list to the left."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:369
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:26
+msgid ""
+"Use the options in the second box to pick a collection of problems decribed "
+"below. In each case, clicking \"View Problems\" will render a fixed number "
+"of problems (default of 20). After problems are shown, there will be options "
+"to show the next/previous batch of problems, add all problems to the target "
+"set (set at the top of the page) or clear the curent batch of problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:27
 msgid ""
 "Use this form to ask your instructor a question, to report a problem with "
 "the WeBWorK system, or to report an error in a problem you are attempting. "
@@ -7148,98 +10242,136 @@ msgid ""
 "system will be included."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:29
+msgid "Use this page to change your password."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:20
+msgid ""
+"Use this page to send emails to active (enrolled or auditing) students.  "
+"Emails can be sent to all active students or selected students.  Use the "
+"\"Students\" form to sort, filter, or format how the user name is "
+"displayed.  Click \"Change Display Settings\" to apply any changes.  Use "
+"control-click or shift-click to select multiple students to email."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:67
+msgid ""
+"Used for \"counting\" achievements, which sets the value a counter must "
+"reach in order to earn the achievement. For example this is used counting "
+"the number of completed problems."
+msgstr ""
+
+#. (param('user')
+#. (param('effectiveUser')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:7
+msgid "User \"%1\" not found."
+msgstr ""
+
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:324
 msgid ""
-"User '%1' will not be copied from admin course as it is the initial "
+"User \"%1\" will not be copied from admin course as it is the initial "
 "instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:557
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
-msgid "User ID"
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:34
+msgid "User %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:291
-msgid "User Settings"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:217
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:64
+msgid "User ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:490
-msgid "User Values"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:230
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:28
+msgid "User Settings"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:52
-msgid "User has been assigned to all current sets."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:17
+msgid "User Settings Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:58
-msgid "User has been unassigned from all sets."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:576
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:13
+msgid "User overrides"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:250
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:62
 msgid "User's name is:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:68
-msgid "User's sets have been reassigned."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:60
 msgid "User's username is:"
 msgstr ""
 
 #. ($user, $setID, $j)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1045
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
 msgid ""
 "UserProblem missing for user=%1 set=%2 problem=%3. This may indicate "
 "database corruption."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:222
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:51
 msgid "Username"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1471
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:126
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:9
 msgid "Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:376
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:339
 msgid "Users Assigned to Set %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1992
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:17
+msgid "Users Assigned to Set Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:65
 msgid "Users List"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:333
+#: /opt/webwork/webwork2/conf/defaults.config:1827
+msgid ""
+"Users at this level and higher are allowed to change display settings used "
+"in pg problems.Note that if it is expected that there will be students that "
+"have vision impairments and MathQuill is enabled to assist with answer "
+"entry, then you should not set this permission to a level above student as "
+"those students may need to disable MathQuill."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1817
 msgid ""
 "Users at this level and higher are allowed to change their e-mail address. "
 "Normally guest users are not allowed to change the e-mail address since it "
 "does not make sense to send e-mail to anonymous accounts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:309
+#: /opt/webwork/webwork2/conf/defaults.config:1781
 msgid ""
 "Users at this level and higher are allowed to change their password. "
 "Normally guest users are not allowed to change their password."
 msgstr ""
 
-#. ($names{$primary}, $names{$secondary}, $names{$ternary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:907
+#. ($c->maketext(FIELD_PROPERTIES()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:316
 msgid "Users sorted by %1, then by %2, then by %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:328
+#: /opt/webwork/webwork2/conf/defaults.config:1808
 msgid ""
 "Users with at least this permission level get a link in the left panel for "
-"reporting bugs to the bug tracking system in Rochester"
+"reporting bugs to the bug tracking system at bugs.webwork.maa.org."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:437
+#: /opt/webwork/webwork2/conf/defaults.config:2051
 msgid ""
 "Users with this permssion level or greater will automatically be sent "
 "feedback from students (generated when they use the \"Contact instructor\" "
@@ -7248,147 +10380,222 @@ msgid ""
 "permission level to \"nobody\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1378
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1394
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:193
 msgid "Uses Math Objects"
 msgstr ""
 
-#. ($default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:202
-msgid "Using contents of the default message %1 instead."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1231
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:18
 msgid "Using what display mode?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:6
 msgid "Using what seed?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:239
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:19
+msgid "Using which hardcopy format?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:49
+msgid "Using which hardcopy theme?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:31
+msgid ""
+"Usually means students must demonstrate understanding of facts. This is more "
+"than regurgitating the fact. We use this category for simple and direct "
+"applications of algorithms the student has studied. There should be no "
+"judgement involved in choosing the method. This would include a simple "
+"application of a rule for differentiation (e.g., can combine rules for sums "
+"and constant multiples with one more advanced rule) or for integrals."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
+msgid "Value"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1649
 msgid "Value of work done in Reduced Scoring Period"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:687
-msgid "Variable Documentation:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config/config_help.html.ep:20
+msgid "Variable Documentation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:115
+msgid "Version"
 msgstr ""
 
 #. ($ver->{version})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:706
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:173
 msgid "Version %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2043
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:159
+msgid "Versions"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:43
 msgid "Versions of a set can only be edited for one user at a time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:361
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:127
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2394
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2702
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:528
 msgid "View"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1032
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:484
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:516
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:592
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:713
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:982
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:6
 msgid "View Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:337
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:57
+msgid "View details of student perofrmance either by individual or by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:86
 msgid "View equations as"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:239
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:18
 msgid "View statistics by set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:19
 msgid "View statistics by student"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:245
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:55
+msgid ""
+"View statistics of students' performance on homework either by individual or "
+"by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:14
 msgid "View student progress by set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:250
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:15
 msgid "View student progress by student"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:379
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:448
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:65
 msgid "View/Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2335
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:245
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:90
-msgid "Viewing temporary file:"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:104
+msgid "View/Reload"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:745
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:769
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:792
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:31
+msgid "View/access current and archived courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:146
+msgid "Viewing Problems in a New Window"
+msgstr ""
+
+#. ($c->{problem}->source_file)
+#. ($screenSetHeader)
+#. ($course_info_path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:81
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:109
+msgid "Viewing temporary file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:25
 msgid "Visibility"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:893
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:7
 msgid "Visible"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1418
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:622
 msgid "Visible sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
 msgid "Visible to Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:842
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "Warning"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:13
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:117
 msgid "Warning messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1017
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1018
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:259
+msgid "Warning messages:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:3
+msgid "Warning: Deletion destroys all set-related data and is not undoable!"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all user-related data and is not undoable!"
 msgstr ""
 
-#. ($problem_desc , CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1340
+#. ($problem_desc,				$c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1194
 msgid "Warnings encountered while processing %1. Error text: %2"
 msgstr ""
 
-#. ($copyright_years,$theme, $ww_version, $pg_version)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1185
-msgid "WeBWorK &copy; %1| theme: %2 | ww_version: %3 | pg_version %4|"
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:39
+msgid ""
+"We use this for carrying out more complicated algorithms, such as "
+"derivatives using both the product and chain rule or integrals which involve "
+"say both a substitution and parts."
+msgstr ""
+
+#. ($ce->{WW_COPYRIGHT_YEARS} || '1996-2023',		$ce->{defaultTheme}       || 'unknown -- set defaultTheme in localOverides.conf',		$ce->{WW_VERSION}         || 'unknown -- set WW_VERSION in VERSION',		$ce->{PG_VERSION}         || 'unknown -- set PG_VERSION in ../pg/VERSION')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:9
+msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2198
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:3
 msgid "WeBWorK Error"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2283
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:3
 msgid "WeBWorK Warnings"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:145
+#: /opt/webwork/webwork2/conf/defaults.config:1451
+msgid ""
+"WeBWorK currently has translations for the languages listed in the course "
+"configuration."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:20
+msgid ""
+"WeBWorK does not have a full featured scoring ability. We leave that to your "
+"favorite spreadsheet application."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:38
 msgid ""
-"WeBWorK currently has translations for four languages: \"English en\", "
-"\"Turkish tr\", \"Spanish es\", and \"French fr\" "
+"WeBWorK expects many files to be in certain locations.  The following "
+"describe this. Note that by default the File Manager shows the \"templates\" "
+"directory.  Other directories mentioned below are at the same level and need "
+"to be accessed by going up a directory by clicking the \"^\" button above "
+"the file list."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:6
 msgid ""
 "WeBWorK has encountered a software error while attempting to process this "
 "problem. It is likely that there is an error in the problem itself. If you "
@@ -7397,7 +10604,7 @@ msgid ""
 "more information."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2284
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:6
 msgid ""
 "WeBWorK has encountered warnings while processing your request. If this "
 "occured when viewing a problem, it was likely caused by an error or "
@@ -7407,19 +10614,19 @@ msgid ""
 "warning output below for more information."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:577
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:558
 msgid ""
 "WeBWorK was unable to generate a different version of this problem.  Close "
 "this tab, and return to the original problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:313
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:29
 msgid ""
 "WeBWorK was unable to generate a paper copy of this homework set.  Please "
-"inform your instructor. "
+"inform your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:483
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
 msgid ""
 "WeBWorK will automatically create users when logging in via the LMS for the "
 "first time. If this flag is enabled then it will also keep the user account "
@@ -7429,77 +10636,145 @@ msgid ""
 "next time the user logs in."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:321
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:370
 msgid "Weight"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:85
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:6
 msgid "Welcome to WeBWorK!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1366
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:24
+msgid ""
+"What WeBWorK does have is good support for summarizing the scores on WeBWorK "
+"homework sets and tests and exporting them in a form (.csv) which any "
+"spreadsheet can use. WeBWorK reports all of the homework grades with options "
+"shown below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:27
 msgid "What could be inside?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:698
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:17
 msgid "What field should filtered users match on?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:347
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
 msgid ""
 "When a student has more attempts than is specified here they will be able to "
 "view another version of this problem.  If set to -1 the feature is disabled "
 "and if set to -2 the course default is used."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:323
+#: /opt/webwork/webwork2/conf/defaults.config:1801
 msgid ""
 "When acting as a student, this permission level and higher can submit "
 "answers for that student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:416
+#: /opt/webwork/webwork2/conf/defaults.config:1972
+msgid ""
+"When numerical answers are checked, most test if the student's answer is "
+"close enough to the programmed answer be computing the error as a percentage "
+"of the correct answer.  This value controls the default for how close the "
+"student answer has to be in order to be marked correct.<p>A value such as "
+"0.1 means 0.1 percent error is allowed.</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2019
 msgid ""
 "When students click the <em>Email Instructor</em> button to send feedback, "
 "WeBWorK fills in the subject line.  Here you can set the subject line.  In "
 "it, you can have various bits of information filled in with the following "
-"escape sequences.<p><ul><li> %c = course ID<li> %u = user ID<li> %s = set "
-"ID<li> %p = problem ID<li> %x = section<li> %r = recitation<li> %% = literal "
-"percent sign</ul>"
+"escape sequences.<p><ul><li>%c = course ID</li><li>%u = user ID</li><li>%s = "
+"set ID</li><li>%p = problem ID</li><li>%x = section</li><li>%r = recitation</"
+"li><li>%% = literal percent sign</li></ul>"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:35
+msgid ""
+"When the class is very large not all students will be displayed. Using the "
+"first action on this page you can show only the students from a given "
+"recitation or from a given section, or only students whose login or last "
+"name fits a pattern match. The second action will sort the students "
+"currently being displayed. You can also sort the displayed students by "
+"clicking on the active links at the top of each column."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:56
+msgid ""
+"When the message is ready to send, click \"Send Email\". This will queue the "
+"email to be sent, which can take several minutes depending on the number of "
+"students selected.  You will be notified by email once all the emails have "
+"been sent."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1540
+msgid ""
+"When this is on students will see a line on the Grades page which has their "
+"total cumulative homework score.  This score includes all sets assigned to "
+"the student."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
+msgid ""
+"When this is true, then when a user enters WeBWorK from an external tool "
+"link in the LMS, the bottom of the screen will display the data that the LMS "
+"passed to WeBWorK. This may be useful to debug LTI, especially because "
+"different LMS systems have different parameters."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1859
+msgid ""
+"When viewing a problem, WeBWorK usually puts the previously submitted answer "
+"in the answer blank.  Below this level, old answers are never shown.  "
+"Typically, that is the desired behaviour for guest accounts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:30
+msgid ""
+"When viewing progress for a single student, their grades page is shown which "
+"lists set totals and per problem grades for each set assigned to the "
+"student.  This shows the same information as the statistics page for the "
+"student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:184
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:26
 msgid ""
-"When this is on students will see a line on the Grades page which has their "
-"total cumulative homework score.  This score includes all sets assigned to "
-"the student."
+"When viewing set statistics, the drop down menus can be used to show stats "
+"for individual sections, recitations, or problems.  The overall results "
+"include all students who are assigned to the set, while the individual "
+"problem results only include active (have attempted the problem) students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:489
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:24
 msgid ""
-"When this is true, then when a user enters WeBWorK from an external tool "
-"link in the LMS, the bottom of the screen will display the data that the LMS "
-"passed to WeBWorK. This may be useful to debug LTI, especially because "
-"different LMS systems have different parameters."
+"When viewing student progress for a set, the score for the set and the "
+"status for problems in the set are listed for all students.  The table can "
+"be sorted by clicking the links in the table header.  Click the student's "
+"name to access the student's set.  When viewing progress for a test, "
+"additional columns can be shown/hidden by updating the display at the top"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:355
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:74
 msgid ""
-"When viewing a problem, WeBWorK usually puts the previously submitted answer "
-"in the answer blank.  Below this level, old answers are never shown.  "
-"Typically, that is the desired behaviour for guest accounts."
+"When you unassign a set from students, you destroy all of the data for the "
+"set for those students. If the set is re-assigned to these students, then "
+"they will receive new versions of problems in the set.  Make sure this is "
+"what you want to do before unassigning sets from students."
 msgstr ""
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:178
+#. (tag('b', $achievementID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:21
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for achievement %1 for this student. Make sure this is what you want to "
 "do."
 msgstr ""
 
-#. (CGI::b($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:145
+#. (tag('b', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:26
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for homework set %1 for this student. You will then need to reassign "
@@ -7507,7 +10782,7 @@ msgid ""
 "problems. Make sure this is what you want to do before unchecking students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:72
 msgid ""
 "When you uncheck a homework set (and save the changes), you destroy all of "
 "the data for that set for this student.   If you reassign the set, the "
@@ -7515,1588 +10790,1678 @@ msgid ""
 "you want to do before unchecking sets."
 msgstr ""
 
-#. ($self->formatDateTime($set->open_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:348
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:87
+msgid "Wiki summary page for MathObjects"
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:444
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:167
 msgid "Will open on %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:49
+msgid "Word problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:15
 msgid "Worth"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:393
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:51
+msgid "Write a new PG problem file or edit an existing one."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:188
 msgid ""
-"Write permissions have not been enabled for '%1'.  Changes must be saved to "
+"Write permissions have not been enabled for \"%1\".  Changes must be saved "
+"to another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:630
+msgid ""
+"Write permissions have not been enabled for \"%1\". Changes must be saved to "
 "another file for viewing."
 msgstr ""
 
-#. ($self->shortPath($currentDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:391
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:182
+msgid ""
+"Write permissions have not been enabled in \"%1\".  Changes must be saved to "
+"a different directory for viewing."
+msgstr ""
+
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:624
 msgid ""
-"Write permissions have not been enabled in '%1'.  Changes must be saved to a "
+"Write permissions have not been enabled in \"%1\".Changes must be saved to a "
 "different directory for viewing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:178
 msgid ""
 "Write permissions have not been enabled in the templates directory.  No "
 "changes can be made."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:641
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1378
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:134
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:144
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2606
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2607
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2608
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:374
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:400
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:454
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:981
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:620
+msgid ""
+"Write permissions have not been enabled in the templates directory. No "
+"changes can be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:287
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:330
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:509
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:82
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:657
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:67
 msgid "Yes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:500
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:454
 msgid ""
 "You are currently checking answers to a different version of your problem - "
 "these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:511
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:470
 msgid ""
 "You are currently previewing answers to a different version of your problem "
 "- these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr ""
 
-#. ($userSet->set_id, $r->connection->remote_ip)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:257
+#. ($ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:18
+msgid ""
+"You are in the Reduced Scoring Period.  All work counts for %1% of the "
+"original."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:183
+msgid "You are not allowed to act as a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:188
+msgid "You are not allowed to assign homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:383
+msgid "You are not allowed to delete %1."
+msgstr ""
+
+#. ($userSet->set_id, $c->tx->remote_address)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:261
 msgid ""
 "You are not allowed to generate a hardcopy for %1 from your IP address, %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2033
-msgid "You are not authorized to access the Instructor tools."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:185
+msgid "You are not allowed to modify homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:191
+msgid "You are not allowed to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:4
+msgid "You are not allowed to send e-mail."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:2
+msgid "You are not authorized to access instructor tools"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:4
+msgid "You are not authorized to access instructor tools."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:271
-msgid "You are not authorized to access the instructor tools."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:9
+msgid "You are not authorized to assign homework sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:392
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:10
+msgid "You are not authorized to create or delete courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:2
+msgid "You are not authorized to edit achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:28
+msgid "You are not authorized to edit user specific information."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:37
+msgid "You are not authorized to grade homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:8
+msgid "You are not authorized to manage course files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:33
 msgid "You are not authorized to modify homework sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2037
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:35
 msgid "You are not authorized to modify problems."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:396
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:39
 msgid "You are not authorized to modify set definition files."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:15
 msgid "You are not authorized to modify student data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:11
+msgid "You are not authorized to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:3
+msgid "You are not authorized to modify the course configuration."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:230
 msgid "You are not authorized to perform this action."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:250
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:11
+msgid "You are not authorized to score sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:13
+msgid "You are not authorized to send mail to students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:11
+msgid "You are not authorized to update lti scores"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers.html.ep:8
+msgid "You are not authorized to view past answers"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:251
 msgid ""
 "You are not permitted to generate a hardcopy for a set with hidden work."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:236
 msgid "You are not permitted to generate a hardcopy for an unopened set."
 msgstr ""
 
-#. ($showMeAnother{MaxReps},					$solutionShown)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:559
+#. ($showMeAnother{MaxReps},						$solutionShown)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:532
 msgid ""
 "You are only allowed to click on Show Me Another %quant(%1,time,times) per "
 "problem. %2 Close this tab, and return to the original problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2037
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2056
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:265
 msgid "You are out of time!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:320
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:36
 msgid "You can also examine the following temporary files: "
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGanswermacros.pl:1693
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:108
+msgid ""
+"You can assign selected achievements to all users by using the \"Assign\" "
+"action action and selecting which achievements to assign.  You can select "
+"which users to assign/unassign to an achievement by clicking on the link in "
+"the \"Edit Users\" column."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1039
+msgid ""
+"You can change the file path for this problem manually from the \"Hmwk Sets "
+"Editor\" page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:27
+msgid ""
+"You can check the boxes to the right of the sets and click \"Generate "
+"Hardcopy for Selected Sets\" to generate a PDF hardcopy of the selected "
+"sets. You can generate hardcopies for multiple users including their answers "
+"as well. Note that students will only be able to generate hardcopies of a "
+"single set at a time. Students will only be able to include answers in the "
+"hardcopy after the answer date."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:127
+msgid ""
+"You can delete problems by clicking the \"Delete it?\" check box and saving. "
+"If the set is already active it is recommended that you instead use the "
+"\"Mark Correct?\" problem to mark a particular problem correct for all "
+"students."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGanswermacros.pl:1616
 msgid "You can earn partial credit on this problem."
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:383
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:142
+msgid ""
+"You can edit a problem by clicking the \"Edit Problem\" icon to the right of "
+"the problem number. This will open the problem in the PG problem editor in a "
+"new tab or window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:92
+msgid ""
+"You can edit a single achievement by clicking on the pencil icon next to the "
+"achievement ID.  You can edit multiple achievements by selecting which "
+"achievements to edit, then click the \"Edit\" button. You can edit all of "
+"the achievements by changing which achievements to edit form \"selected "
+"achievements\" to \"all achievements\", or click the checkbox next to the "
+"Achievement ID to select all achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:44
+msgid ""
+"You can edit the class list data for a single student by clicking on the "
+"pencil icon next to their login name. To edit several students at once click "
+"on the \"Select\" checkbox next to their names, click on the radio button "
+"for editing selected users and then click the \"Edit\" button. You can also "
+"edit all visible users (those students currently being displayed) or even "
+"all users in the course although this last option might take a long time to "
+"load for a large class."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:397
 msgid "You can get a new version of this problem after the due date."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1366
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:101
+msgid ""
+"You can import/export from their respective action tab.  Exporting saves "
+"information about the achievement as a .axp file which is a CSV that lists "
+"each achievements information.  You can import .axp files that have been "
+"previously exported."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:769
 msgid "You can not specify an absolute path"
 msgstr ""
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1119
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:549
 msgid "You can only %1 one file at a time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:92
 msgid "You can only download regular files."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:589
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:197
 msgid "You can only edit text files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:906
-msgid "You can only unpack files ending in '.tgz', '.tar' or '.tar.gz'"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:374
+msgid "You can only unpack files ending in \".tgz\", \".tar\" or \".tar.gz\""
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:134
+msgid ""
+"You can render a problem by clicking the \"Render Problem\" icon to the "
+"right of the problem number. The display mode used to render the problem is "
+"chosen using the drop down menu. You can render all problems using the "
+"\"Render All\" button. \"Hide All\" will hide all rendered problems. It is "
+"also useful to collapse problem details when doing this, as it makes it "
+"easier to drag problems around."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:120
+msgid ""
+"You can reorder problems by clicking on the arrow icon and dragging the "
+"problem. You will see a box showing you where the problem will be placed. "
+"When problems are reordered any holes in the numbering will be filled in."
 msgstr ""
 
 #. ($showMeAnother{MaxReps} >= $showMeAnother{Count}						? ($showMeAnother{MaxReps} - $showMeAnother{Count})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1866
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:44
 msgid ""
 "You can use this feature %quant(%1,more time,more times,as many times as you "
 "want) on this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:986
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:439
 msgid "You can't download directories"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:440
 msgid "You can't download files of that type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:582
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:192
 msgid "You can't edit a directory"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:526
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
 msgid "You can't view files of that type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1991
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:985
 msgid "You cannot archive the course you are currently using."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1675
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:850
 msgid "You cannot delete the course you are currently using."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1064
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:378
 msgid "You cannot delete yourself!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1933
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:579
 msgid "You did not specify a new set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:267
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:232
 msgid "You didn't enter any message."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:222
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:263
-msgid "You do not have permission to change email addresses."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:303
+msgid "You do not have permission to access the requested file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:167
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:159
 msgid "You do not have permission to change the hardcopy theme."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:140
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:195
-msgid "You do not have permission to change your password."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:576
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:186
 msgid "You do not have permission to edit this file."
 msgstr ""
 
 #. ($hardcopy_format)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:151
 msgid "You do not have permission to generate hardcopy in %1 format."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1610
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1161
 msgid "You do not have permission to view the details of this error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:157
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements.html.ep:13
 msgid "You don't have any Achievement data associated to you!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:290
-msgid "You don't have any items!"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:51
+msgid "You don't have any rewards!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:325
 msgid "You exceeded the allowed time."
 msgstr ""
 
-#. ($numLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2068
+#. ($c->{numAttemptsLeft})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:277
 msgid "You have %1 attempt(s) remaining on this test."
 msgstr ""
 
-#. ($attemptsLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1983
+#. ($c->{numAttemptsLeft},								$c->{numAttemptsLeft} - 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:664
+msgid ""
+"You have %1 submissions remaining for this test.  If you say yes, then you "
+"will have %quant(%2,submission) remaining. Once all submissions have been "
+"used, your answers will be final and you will not be able to continue to "
+"work this test version."
+msgstr ""
+
+#. ($problem->max_attempts - $attempts)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1270
 msgid "You have %negquant(%1,unlimited attempts,attempt,attempts) remaining."
 msgstr ""
 
 #. ($attempts_before_rr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1940
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1217
 msgid ""
 "You have %quant(%1,attempt,attempts) left before new version will be "
 "requested."
 msgstr ""
 
-#. ($hours, $minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:531
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:44
 msgid ""
 "You have %quant(%1,hour) and %quant(%2,minute) remaining to complete the "
 "currently open test."
 msgstr ""
 
-#. ($hours, $minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:542
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:54
 msgid ""
 "You have %quant(%1,hour,hours,)%quant(%2,minute,minutes,) remaining to "
 "complete the currently open test."
 msgstr ""
 
-#. ($minutes, $seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:552
+#. ($minutes,							$seconds)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:64
 msgid ""
 "You have %quant(%1,minute) and %quant(%2,second) remaining to complete the "
 "currently open test."
 msgstr ""
 
 #. ($seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:562
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:72
 msgid ""
 "You have %quant(%1,second) remaining to complete the currently open test."
 msgstr ""
 
 #. ($attempts)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1977
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1243
 msgid "You have attempted this problem %quant(%1,time,times)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:1
 msgid "You have been logged out of WeBWorK."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2051
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:260
 msgid "You have less than 1 minute to complete this test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2032
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:241
 msgid "You have less than 45 seconds left!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2029
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:240
 msgid ""
 "You have less than 90 seconds left to complete this assignment. You should "
 "finish it soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1002
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:452
 msgid "You have not chosen a file to upload."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:843
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "You have requested that the following items be deleted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1135
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:565
 msgid "You have specified an illegal file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1365
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:766
 msgid "You have specified an illegal path"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:520
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:13
+msgid "You have specified an illegal working directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:481
 msgid ""
 "You may check your answers to this problem without affecting the maximum "
 "number of tries to your original problem."
 msgstr ""
 
-#. ($perm_multiuser ? "to privileged users or" : "")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:544
+#. ($multiuser ? 'to privileged users or' : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:69
 msgid ""
 "You may choose to show any of the following data. Correct answers, hints, "
 "and solutions are only available %1 after the answer date of the homework "
 "set."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:63
+msgid "You may not change this user's password!"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:646
 msgid "You may not change your answers when going on to the next part!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1811
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:58
 msgid "You may not change your own password here!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1130
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:513
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:560
 msgid "You may not follow symbolic links"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2120
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:350
 msgid "You may still check your answers."
 msgstr ""
 
-#. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:568
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:143
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before Show Me Another "
-"is available."
+"You may want to create an unattached problem if you are using the current "
+"problem as a model for a new problem. You can add the new file to a homework "
+"set from the Library Browser or via the set detail page of the Hmwk Sets "
+"Editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:165
+msgid ""
+"You might want to do this if you want to give full credit to everyone on a "
+"particular problem that was not worded correctly, or wasn't working "
+"properly. This is done from the \"Hmwk Sets Editor\" page or the "
+"\"Instructor Tools\" page."
+msgstr ""
+
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}					? link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:8
+msgid "You must access assignments from your Course Management System (%1)."
 msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1894
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:67
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before this feature is "
+"You must attempt this problem %quant(%1,time) before this feature is "
 "available"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:699
+#. ($showMeAnother{TriesNeeded})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:545
+msgid ""
+"You must attempt this problem %quant(%1,time,times) before Show Me Another "
+"is available."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:259
 msgid "You must confirm the password for the initial instructor."
 msgstr ""
 
-#. ($ce->{LMS_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:370
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}						? $c->link_to(							$ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:195
 msgid "You must log into this set via your Learning Management System (%1)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:76
-msgid "You must provide a student ID, a set ID, and a problem number."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:979
+msgid "You must select a course to archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1324
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:585
 msgid "You must select a course to rename."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:879
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:351
 msgid "You must select at least one file for the archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:775
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:312
 msgid "You must select at least one file to delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:114
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:106
 msgid "You must select one or more sets for scoring!"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1344
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:749
 msgid "You must specify a %1 name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:682
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:242
 msgid "You must specify a course ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1989
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2481
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2711
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3700
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3778
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2086
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:848
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:983
 msgid "You must specify a course name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1368
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:775
 msgid "You must specify a file name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:705
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:586
+msgid "You must specify a file name in order to save a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:265
 msgid "You must specify a first name for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:708
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:268
 msgid "You must specify a last name for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:606
 msgid "You must specify a new institution for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1327
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:588
 msgid "You must specify a new name for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1342
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:603
 msgid "You must specify a new title for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:256
 msgid "You must specify a password for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:458
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:440
 msgid "You must specify a user ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:711
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:271
 msgid "You must specify an email address for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:342
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1052
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:138
 msgid "You must specify an file name in order to save a new file."
 msgstr ""
 
 #. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:491
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:505
 msgid ""
-"You must use your Learning Managment System (%1) to access this set.  Try "
-"logging in to the Learning Managment System and visiting the set from there."
+"You must use your Learning Management System (%1) to access this set.  Try "
+"logging in to the Learning Management System and visiting the set from there."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1754
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
 msgid "You need to select a \"Target Set\" before you can edit it."
 msgstr ""
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1124
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:554
 msgid "You need to select a file to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1905
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:555
 msgid "You need to select a set definition file to view."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1880
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:537
 msgid "You need to select a set from this course to view."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1861
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:524
 msgid "You need to select a set to view."
 msgstr ""
 
-#. (wwRound(0, $problemResult->{score} * 100)
-#. (wwRound(0, $pg->{result}->{score} * 100)
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:281
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1978
+#. (wwRound(0,						compute_reduced_score($ce, $problem, $set, $pg->{result}{score}, $c->submitTime)
+#. (% wwRound(0, $rh_result->{problem_result}{score} * 100)
+#. (wwRound(0, $rh_result->{problem_result}{score} * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1251
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:48
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:29
 msgid "You received a score of %1 for this attempt."
 msgstr ""
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2046
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1363
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem and its graded subproblems."
 msgstr ""
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2049
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1375
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem."
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1341
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:740
 msgid "Your %1 name contains illegal characters"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1342
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:743
 msgid "Your %1 name may not begin with a dot"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1343
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:746
 msgid "Your %1 name may not contain a path component"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:549
-msgid ""
-"Your LTI OAuth verification failed.  If this recurs, please speak with your "
-"instructor"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:537
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:548
-msgid "Your authentication failed.  Please return to Oncourse and login again."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:240
-msgid ""
-"Your authentication failed.  Please try again. Please speak with your "
-"instructor if you need help."
-msgstr ""
-
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3033
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3162
 msgid "Your browser does not support the video tag."
 msgstr ""
 
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3991
-msgid "Your current branch of PG is up to date with branch %1 in remote %2."
-msgstr ""
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3929
-msgid ""
-"Your current branch of WeBWorK is up to date with branch %1 in remote %2."
-msgstr ""
-
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4026
-msgid "Your current branch of the Open Problem Library is up to date."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:322
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:134
 msgid "Your display options have been saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:215
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
 msgid "Your email address has been changed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:772
 msgid "Your file name contains illegal characters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:117
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:40
 msgid "Your file name is not valid! "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:322
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:16
 msgid "Your message was sent successfully."
 msgstr ""
 
-#. ($lastScore,$notCountedMessage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1981
+#. (wwRound(0, $problem->status * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1261
 msgid "Your overall recorded score is %1.  %2"
 msgstr ""
 
-#. ($versionNumber, wwRound(2,$recordedScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2093
-msgid "Your recorded score on this test (version %1) is %2/%3."
+#. ('<span id="test-recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:179
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:197
+msgid "Your recorded score for this version is %1/%2 (%3%)."
+msgstr ""
+
+#. ($setVersionID,						'<span id="test-recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:317
+msgid "Your recorded score on this test (version %1) is %2/%3 (%4%)."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:603
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:634
 msgid "Your score for this attempt is for this part only;"
 msgstr ""
 
 # $testNounNum is either "test (#)" or "submission (#)"
 #. ($testNounNum)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1963
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:142
 msgid "Your score on this %1 WAS recorded."
 msgstr ""
 
 # $testNoun is either "test" or "submission"
-#. ($testNoun,$attemptScore,$totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1968
+#. ($testNoun, $c->{attemptScore}, $c->{totalPossible})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:148
 msgid "Your score on this %1 is %2/%3."
 msgstr ""
 
 # $testNounNum is either "test (#)" or "submission (#)
 #. ($testNounNum)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1959
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:138
 msgid "Your score on this %1 was NOT recorded."
 msgstr ""
 
-#. ($attemptScore,$totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2005
+#. ($c->{attemptScore}, $c->{totalPossible})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:192
 msgid "Your score on this (checked, not recorded) submission is %1/%2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1618
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1949
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2249
-msgid "Your score on this problem was recorded."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1620
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1027
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:172
 msgid ""
 "Your score was not recorded because there was a failure in storing the "
 "problem record to the database."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:269
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:276
 msgid "Your score was not recorded because this homework set is closed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:283
 msgid ""
 "Your score was not recorded because this problem has not been assigned to "
 "you."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1644
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1049
 msgid ""
 "Your score was not recorded because this problem set version is not open."
 msgstr ""
 
-#. ($elapsed, $allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1659
+#. ($elapsed,						# Assume the allowed time is an even number of minutes.						($set->due_date - $set->open_date)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1063
 msgid ""
 "Your score was not recorded because you have exceeded the time limit for "
 "this test. (Time taken: %1 min; allowed: %2 min.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1647
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1052
 msgid ""
 "Your score was not recorded because you have no attempts remaining on this "
 "set version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:284
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1662
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:271
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1067
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:278
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:53
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:31
 msgid "Your score was not recorded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1984
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:256
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:163
 msgid "Your score was not successfully sent to the LMS."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:166
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:170
 msgid "Your score was recorded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1983
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:254
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:260
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:162
 msgid "Your score was successfully sent to the LMS."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:558
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:540
 msgid "Your session has timed out due to inactivity. Please log in again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4061
-msgid "Your systems are up to date!"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1346
-msgid "[Edit]"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:288
-msgid "_ACHIEVEMENTS_EDITOR_DESCRIPTION"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:387
-msgid "_ANSWER_LOG_DESCRIPTION"
-msgstr ""
-
-#
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:478
-msgid "_CLASSLIST_EDITOR_DESCRIPTION"
-msgstr ""
-
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:192
-msgid "_EXTERNAL_AUTH_MESSAGE"
-msgstr ""
-
-#
-#. (CGI::b($r->maketext("Guest Login")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:268
-msgid "_GUEST_LOGIN_MESSAGE"
-msgstr ""
-
-#
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:454
-msgid "_HMWKSETS_EDITOR_DESCRIPTION"
-msgstr ""
-
-#. (CGI::b($r->maketext("Remember Me")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:197
-msgid "_LOGIN_MESSAGE"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2696
-msgid "_PROBLEM_SET_SUMMARY"
-msgstr ""
-
-#
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2199
-msgid "_REQUEST_ERROR"
-msgstr ""
-
-#
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1989
-msgid "_USER_TABLE_SUMMARY"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:17
+msgid "a duplicate of the first selected achievement"
 msgstr ""
 
 # Context is "Create set ______ as a duplicate of the first selected set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:771
-msgid "a duplicate of the first selected achievement."
-msgstr ""
-
-# Context is "Create set ______ as a duplicate of the first selected set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:17
 msgid "a duplicate of the first selected set"
 msgstr ""
 
-# Context is "Create set ______ as a new empty set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:770
-msgid "a new empty achievement."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:16
+msgid "a new empty achievement"
 msgstr ""
 
 # Context is "Create set ______ as a new empty set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1114
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:16
 msgid "a new empty set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1251
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:9
 msgid "a single set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:470
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:130
 msgid "add problems"
 msgstr ""
 
 #. ($setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1728
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
 msgid "addGlobalSet %1 in ProblemSetList:  %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:456
-msgid "added missing permission level for user"
-msgstr ""
-
 # #short for administrator
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:116
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "admin"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:739
-msgid "all"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:434
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:474
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:573
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:972
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:7
 msgid "all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1338
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:66
 msgid "all current users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:384
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:70
 msgid "all set dates for one <b>user</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:623
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1397
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:651
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:819
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:871
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:968
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1995
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:7
 msgid "all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:603
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1981
 msgid "all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1238
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:929
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:980
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:6
 msgid "all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:453
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:120
 msgid "all users for one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1601
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1898
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3618
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:23
 msgid "alphabetically"
 msgstr ""
 
-#. ($count,$numSets)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:627
+#. ($count, $numSets)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1999
 msgid "an impossible number of sets: %1 out of %2"
 msgstr ""
 
-#. ($count,$numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:607
+#. ($count, $numUsers)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1985
 msgid "an impossible number of users: %1 out of %2"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:647
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:658
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:610
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:621
 msgid "answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1171
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:30
 msgid "any users"
 msgstr ""
 
-# Context is "Create _____ as a new empty set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:763
-msgid "as"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:703
-msgid "avg attempts"
-msgstr ""
-
 # Context is "Append ____ blank problem template(s) to end of homework set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2900
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:689
 msgid "blank problem template(s) to end of homework set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1601
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1898
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3618
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:24
 msgid "by last login date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1086
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1515
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:688
 msgid "changes abandoned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1136
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1614
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:633
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:795
 msgid "changes saved"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:396
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:80
 msgid "class list data for selected <b>users</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:264
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:31
 msgid "close"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:671
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:259
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:239
 msgid "correct"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:589
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:239
 msgid "course files"
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1073
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:458
 msgid "deleted %1 sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:450
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:152
 msgid "editing all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:836
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:333
 msgid "editing all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:946
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:328
 msgid "editing all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:336
+msgid "editing listed sets"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:154
 msgid "editing selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:842
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:339
 msgid "editing selected sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:334
 msgid "editing selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:839
-msgid "editing visible sets"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:949
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:331
 msgid "editing visible users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:307
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:90
 msgid "email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:87
-msgid "email:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:550
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:42
 msgid "empty"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:10
 msgid "enter matching set IDs below"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:220
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:31
 msgid "entry rows."
 msgstr ""
 
 #. ($restrictLoc, $setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1738
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:904
 msgid "error adding set location %1 for set %2: %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1012
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1450
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:542
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:643
 msgid "export abandoned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:527
 msgid "exporting all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:991
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:530
 msgid "exporting selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:306
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:89
 msgid "first name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:775
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:72
 msgid "for"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:149
 msgid "for one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:414
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:426
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:103
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:94
 msgid "for one <b>user</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:997
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:349
 msgid "giving new passwords to all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1003
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:355
 msgid "giving new passwords to selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:352
 msgid "giving new passwords to visible users"
 msgstr ""
 
 #. ($j, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1042
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1069
 msgid "global %1 for set %2 not found."
 msgstr ""
 
-#. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1114
-msgid "global set %1 not found."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:116
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "grade_proctor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:116
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "guest"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1552
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1849
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3559
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:949
 msgid "hidden"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:912
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "hidden from"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:530
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:67
-msgid "hidden from students"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:217
+msgid "homework"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:655
-msgid "hidden sets"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:83
+msgid "html directory"
 msgstr ""
 
 # doe snot need to be translated
-#. ('j','k','_0')
-#. ('j','k')
-#: /opt/webwork/pg/lib/Parser/List/Vector.pm:35
-#: /opt/webwork/pg/lib/Value/Vector.pm:278
-#: /opt/webwork/pg/macros/contextLimitedVector.pl:94
+#. ('j', 'k', '_0')
+#. ('j', 'k')
+#: /opt/webwork/pg/lib/Parser/List/Vector.pm:39
+#: /opt/webwork/pg/lib/Value/Vector.pm:303
+#: /opt/webwork/pg/macros/contexts/contextLimitedVector.pl:95
 msgid "i"
 msgstr ""
 
 # does not need to be translated
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:774
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:840
 msgid "if"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1513
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1608
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:622
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:721
 msgid "illegal character in input: '/'"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:246
 msgid "incorrect"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:595
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:441
 msgid "index"
 msgstr ""
 
 #. ($restrictLoc, $setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1741
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:911
 msgid "input set location %1 already exists for set %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:305
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:551
+msgid "insufficient permission to edit %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:220
+msgid "just-in-time"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:88
 msgid "last name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3082
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:9
+msgid "listed sets"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:87
 msgid "locations selected below"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:59
 msgid "login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "login ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:311
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:94
 msgid "login name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:86
-msgid "login/studentID:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:116
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "login_proctor"
 msgstr ""
 
 # Context is "Set _____ made visibile for _____ users"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:912
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "made visible for"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:420
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:493
 msgid "max"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1252
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:10
 msgid "multiple sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:461
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:482
-msgid "n/a"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:515
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:171
 msgid "new set:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:438
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:109
 msgid "new users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:572
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:6
 msgid "no achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:704
-msgid "no achievements."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:464
-msgid "no attempt recorded"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3083
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:86
 msgid "no location"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:621
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1034
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:870
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:967
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1993
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:6
 msgid "no sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1979
 msgid "no students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:859
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1035
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1151
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:685
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:31
 msgid "no users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:254
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:116
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/permission.pm:26
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "nobody"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:466
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:467
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:487
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:488
-msgid "none"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:804
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:114
 msgid "nth colum of merge file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:225
-msgid "number of students not defined"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2199
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:70
 msgid "of"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:465
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:128
 msgid "one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:563
-msgid "one <b>set</b> for  <b>users</b>"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:225
+msgid "one <b>set</b> for <b>users</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:551
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:211
 msgid "one <b>user</b> (on one <b>set</b>)"
 msgstr ""
 
 # Context is Assign this set to which users?  "only ____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1339
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:67
 msgid "only"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:544
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:17
 msgid "only best scores"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:406
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:467
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:485
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:88
 msgid "or"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1164
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:59
 msgid "or Problems from"
 msgstr ""
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:777
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:843
 msgid "otherwise"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:484
-msgid "overwrite all data"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:19
+msgid "overwrite"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:664
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:627
 msgid "part"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1365
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:499
 msgid "permissions for %1 not defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2290
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1369
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1406
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "point"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2290
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1369
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1406
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "points"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:485
-msgid "preserve existing data"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:20
+msgid "preserve"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2316
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:576
 msgid "preview answers"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:653
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:616
 msgid "problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:41
 msgid "problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:116
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:219
+msgid "proctored test"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "professor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:488
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:89
 msgid "progress"
 msgstr ""
 
 #. ($line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1925
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2189
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1409
 msgid "readSetDef error, can't read the line: ||%1||"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:310
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:93
 msgid "recitation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:53
 msgid "recitation #"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1436
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:497
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:549
 msgid "record for visible user %1 not found"
 msgstr ""
 
 #. ($restrictLoc)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1744
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:918
 msgid ""
 "restriction location %1 does not exist.  IP restrictions have been ignored."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:670
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "row"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:308
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:91
 msgid "score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:309
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:92
 msgid "section"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:588
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:47
 msgid "section #"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:88
-msgid "section:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:740
-msgid "selected"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:159
 msgid "selected <b>sets</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:197
 msgid "selected <b>users</b> to selected <b>sets</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:475
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:574
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:973
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:8
 msgid "selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:705
-msgid "selected achievements."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1035
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1399
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:653
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:821
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:872
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:969
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:8
 msgid "selected sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1036
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1150
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1240
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:686
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:931
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:982
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:8
 msgid "selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:625
-msgid "set"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:12
+msgid "sets hidden from students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:629
-msgid "sets"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:11
+msgid "sets visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:699
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:281
 msgid "showing all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:746
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:277
 msgid "showing all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:714
-msgid "showing hidden sets"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:708
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:290
 msgid "showing matching sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:755
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:286
 msgid "showing matching users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:702
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:284
 msgid "showing no sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:749
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:280
 msgid "showing no users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:705
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:287
 msgid "showing selected sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:752
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:283
 msgid "showing selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:711
-msgid "showing visible sets"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:299
+msgid "showing sets that are hidden from students"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:296
+msgid "showing sets that are visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2201
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:72
 msgid "shown"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:405
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:162
 msgid "still open"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:116
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "student"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:748
-msgid "students"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1936
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
 msgid "submission"
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1938
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:133
 msgid "submission (version %1)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:655
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
 msgid "summary"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:116
+#: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "ta"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1936
-msgid "test"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:90
+msgid "templates/email directory"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:555
-msgid "test date"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:95
+msgid "templates/macros directory"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:566
-msgid "test time"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
+msgid "test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:848
-msgid "the following file"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:23
+msgid "test date"
 msgstr ""
 
-#. ($forcedSourceFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:988
-msgid "the original path to the file is %1"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:29
+msgid "test time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:467
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:119
 msgid "then delete them"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1931
-msgid "time"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:165
 msgid "time limit exceeded"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1931
-msgid "times"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:35
+msgid "time remaining"
 msgstr ""
 
 # Context is Assign ____ to _____
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:863
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:183
 msgid "to"
 msgstr ""
 
 #. ($ce->{institutionName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:569
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:399
 msgid "to %1 main web site"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:547
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:381
 msgid "to courses page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:475
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:135
 msgid "to one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:751
-msgid "top score"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:587
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:432
 msgid "total"
 msgstr ""
 
 #. ($ce->{webworkDirs}{logs})
 #. ($ce->{webworkDirs}{tmp})
 #. ($ce->{webworkDirs}{DATA})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:47
 msgid "unable to write to directory %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:334
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:49
 msgid "unlimited"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:14
 msgid "unlimited reusability"
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:618
-msgid "userID: %1 --"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:620
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:259
 msgid ""
 "username, last name, first name, section, achievement level, achievement "
 "score,"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:10
 msgid "users who match on selected field"
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1938
-msgid "version (%1)"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1554
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1851
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3561
-msgid "visible"
+#. ($set->version_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:295
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:408
+msgid "version %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1398
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:820
-msgid "visible sets"
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:134
+msgid "version (%1)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:530
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:67
-msgid "visible to students"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:820
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:951
+msgid "visible"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1149
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1239
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:981
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:7
 msgid "visible users"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:485
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:500
 msgid "when you submit your answers"
 msgstr ""
 
 #. ($dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1650
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1514
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:623
 msgid "won't be able to read from file %1/%2: does it exist? is it readable?"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:604
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:638
 msgid "your overall score is for all the parts combined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:575
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:231
 msgid "your students"
 msgstr ""
diff --git a/lib/WeBWorK/Localize/es.po b/lib/WeBWorK/Localize/es.po
index 8b0d4e5608..ebcdc95415 100644
--- a/lib/WeBWorK/Localize/es.po
+++ b/lib/WeBWorK/Localize/es.po
@@ -10,257 +10,320 @@ msgstr ""
 "Project-Id-Version: webwork2\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: 2013-01-27 17:03+0000\n"
-"Last-Translator: Andrés Forero <aguilulfo@gmail.com>, 2020\n"
-"Language-Team: Spanish (http://www.transifex.com/webwork/webwork2/language/es/)\n"
+"Last-Translator: Enrique Acosta <enriqueacostajaramillo@gmail.com>, 2020\n"
+"Language-Team: Spanish (http://app.transifex.com/webwork/webwork2/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:428
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:449
+#. ($_->{problem}->version_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:69
+msgid " (version %1)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:265
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:284
 msgid " Answers Available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:735
-msgid "# of active students"
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1148
+msgid " No changes have been made to set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:506
-msgid "#corr"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:130
+msgid "\"Act as\" a student"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:508
-msgid "#incorr"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:31
+msgid "\"Edit Assigned Users\" column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2249
-msgid "% Score:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:24
+msgid "\"Edit Problems\" column"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:187
+msgid "# of Active Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:85
+msgid "# of attempts"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:333
+msgid "#corr"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:685
-msgid "% correct"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:335
+msgid "#incorr"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:174
+msgid "% Average with Review"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:702
-msgid "% correct with review"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:66
+msgid "% Score with Review"
 msgstr ""
 
-# Percent students
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:762
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:792
-msgid "% students"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:479
+msgid "% Score:"
 msgstr ""
 
 #. ($achievement->{points})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:24
 msgid "%1 Points:"
 msgstr "%1 Puntos:"
 
-#. ($lib eq '' ? $r->maketext('Local')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:476
+#. ($lib eq '' ? maketext('Local')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:9
 msgid "%1 Problems:"
 msgstr "%1 Problemas"
 
-#. ($itemCounts{$item->id()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:189
+#. ($itemCounts->{ $item->id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:12
 msgid "%1 remaining"
 msgstr ""
 
-#. ($numAdded, $numSkipped, join(', ', @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1410
+#. ($count)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2001
+msgid "%1 sets"
+msgstr ""
+
+#. ($numAdded,                     $numSkipped,
+#. join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:608
 msgid "%1 sets added, %2 sets skipped. Skipped sets: (%3)"
 msgstr ""
 
-#. ($numExported, $numSkipped, ($numSkipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1526
+#. ($numExported, $numSkipped,                     $numSkipped ? $c->tag('ul',
+#. $c->c(map { $c->tag('li', $_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:673
 msgid "%1 sets exported, %2 sets skipped. Skipped sets: (%3)"
 msgstr ""
 
 #. ($count, $numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:608
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
 msgid "%1 students out of %2"
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle,
+#. ($rename_oldCourseID,          $rename_oldCourseTitle,
+#. $rename_newCourseTitle,
 #. $rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:675
 msgid "%1 title and institution changed from %2 to %3 and from %4 to %5"
 msgstr ""
 
-#. (scalar @userIDsToExport, $dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1338
-msgid "%1 users exported to file %2/%3"
+#. (scalar @userIDsToExport, "$dir/$fileName")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:477
+msgid "%1 users exported to file %2"
 msgstr ""
 
-#. ($numReplaced, $numAdded, $numSkipped, join (", ", @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1233
+#. ($numReplaced, $numAdded, $numSkipped, join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:443
 msgid ""
 "%1 users replaced, %2 users added, %3 users skipped. Skipped users: (%4)"
 msgstr ""
 
-#. ($levelpercentage)
 #. ($percentage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:135
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:136
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:323
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:324
+#. ($level_percentage)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:12
 msgid "%1% Complete"
 msgstr ""
 
 #. (wwRound(0, $answerScore * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:268
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:248
 msgid "%1% correct"
 msgstr ""
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:207
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:57
 msgid "%1's Current Address"
 msgstr "Correo electrónico actual de %1"
 
-#. ($user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:136
+#. ($c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:26
 msgid "%1's Current Password"
 msgstr "Contraseña actual de %1"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:225
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:65
 msgid "%1's New Address"
 msgstr "Correo electrónico nuevo de %1"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:153
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:34
 msgid "%1's New Password"
 msgstr "Nueva contraseña de %1"
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
-msgid "%1's new password cannot be blank."
-msgstr ""
-
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:76
 msgid "%1's password has been changed."
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:56
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1423
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#. ($c->tag('span', dir => 'ltr', $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1069
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:149
 msgid "%1: Problem %2"
 msgstr "%1: Problema %2"
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:374
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:357
 msgid "%1: Problem %2 Show Me Another"
 msgstr ""
 
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2231
-msgid "%1: The directory for the course not found."
-msgstr ""
-
-#. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:340
-msgid "%quant(%1,error) occured while generating hardcopy:"
+#. ($days)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:87
+msgid "%quant(%1,day)"
 msgstr ""
 
 #. ($n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:924
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:389
 msgid "%quant(%1,file) unpacked successfully"
 msgstr ""
 
+#. ($hours)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:88
+msgid "%quant(%1,hour)"
+msgstr ""
+
+#. ($minutes)
+#. (sprintf('%3.1f', $testTime)
+#. ($timeLeft)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:89
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:150
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:168
+msgid "%quant(%1,minute)"
+msgstr ""
+
 #. ($numBlanks)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:430
 msgid ""
 "%quant(%1,of the questions remains,of the questions remain) unanswered."
 msgstr "%quant(%1,de las preguntas sigue,de las preguntas siguen) sin respuesta."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:678
+#. ($seconds)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:90
+msgid "%quant(%1,second)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:505
 msgid "%score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2971
+#. ($dcount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:40
+msgid "(%quant(%1,item) total)"
+msgstr ""
+
+#. ($count)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:29
+msgid "(%quant(%1,item))"
+msgstr ""
+
+#. ($problemValue)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1081
+msgid "(%quant(%1,point))"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:697
 msgid "(Any unsaved changes will be lost.)"
 msgstr "(Todos los cambios no guardados se perderán.)"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1278
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1287
-msgid ""
-"(Instructor hint preview: show the student hint after the following number "
-"of attempts:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:102
+msgid "(If an action cannot be executed it will not appear.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2003
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1262
 msgid "(This problem will not count towards your grade.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2122
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:340
 msgid ""
 "(This test is overtime because it was not submitted in the allowed time.)"
 msgstr ""
 
-#. ($testNoun, $self->formatDateTime($set->answer_date)
+#. ($testNoun, $c->formatDateTime($c->{set}->answer_date)
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1986
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:153
 msgid "(Your score on this %1 is not available until %2.)"
 msgstr ""
 
 #. ($testNoun)
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1988
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:155
 msgid "(Your score on this %1 is not available.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1257
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1267
 msgid "(correct)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:197
-msgid "(gw/quiz) After version answer date"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:263
 msgid "(in target set)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1449
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1269
 msgid "(incorrect)"
 msgstr ""
 
 #. ($pgScore)
 #. ($recScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1461
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1271
 msgid "(score %1)"
 msgstr "(puntaje %1)"
 
-#. ($display_sort_method_name{$secondary_sort_method_name})
-#. ($display_sort_method_name{$ternary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:701
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:706
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:207
+msgid "(test) After version answer date"
+msgstr ""
+
+#. ($versionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:164
+msgid "(version %1)"
+msgstr ""
+
+#. ($display_sort_method_name{$secondary_sort_method})
+#. ($display_sort_method_name{$ternary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:103
 msgid ", then by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1297
-msgid ". If this is a class roster, rename it to have extension '.lst'"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:702
+msgid ". If this is a class roster, rename it to have extension \".lst\""
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:81
+msgid "0 seconds"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1997
+msgid "1 set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1983
 msgid "1 student"
 msgstr ""
 
 #. (wwRound(2, $weights[$part] * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:145
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:58
 msgid "<b>Weight:</b> %1%"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1749
+#: /opt/webwork/webwork2/conf/defaults.config:1651
 msgid ""
 "<p>After the Reduced Scoring Date all additional work done by the student "
 "counts at a reduced rate. Here is where you set the reduced rate which must "
@@ -275,7 +338,7 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2036
+#: /opt/webwork/webwork2/conf/defaults.config:1937
 msgid ""
 "<p>During summer 2005, a newer version of the answer checkers was "
 "implemented for answers which are functions and numbers.  The newer checkers"
@@ -287,16 +350,74 @@ msgid ""
 " the old answer checkers will be used by default.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2006
+#: /opt/webwork/webwork2/conf/defaults.config:1908
 msgid ""
 "<p>MathQuill renders students answers in real-time as they type on the "
 "keyboard.</p><p>MathView allows students to choose from a variety of common "
 "math structures (such as fractions and square roots) as they attempt to "
-"input their answers.</p><p>WIRIS provides a separate workspace for students "
-"to construct their response in a WYSIWYG environment.</p>"
+"input their answers.</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1459
+msgid ""
+"<p>Mode in which the LANG and DIR settings for a single problem are "
+"determined.</p><p>The system will set the LANGuage attribute to either a "
+"value determined from the problem, a course-wide default, or the system "
+"default, depending on the mode selected. The tag will only be added to the "
+"DIV enclosing the problem if it is different than the value which should be "
+"set in the main HTML tag set for the entire course based on the course "
+"language.</p><p>There are two options for the DIRection attribute: \"ltr\" "
+"for left-to-write scripts, and \"rtl\" for right-to-left scripts like Arabic"
+" and Hebrew.</p><p>The DIRection attribute is needed to trigger proper "
+"display of the question text when the problem text-direction is different "
+"than that used by the current language of the course. For example, English "
+"problems from the library browser would display improperly in RTL mode for a"
+" Hebrew course, unless the problen Direction is set to LTR.</p><p>The "
+"feature to set a problem language and direction was only added in 2018 to "
+"the PG language, so most problems will not declare their language, and the "
+"system needs to fall back to determining the language and direction in a "
+"different manner. The OPL itself is all English, so the system wide fallback"
+" is to en-US in LTR mode.</p><p>Since the defaults fall back to the LTR "
+"direction, most sites should be fine with the \"auto::\" mode, but may want "
+"to select the one which matches their course language. The mode "
+"\"force::ltr\" would also be an option for a course which runs into trouble "
+"with the \"auto\" modes.</p><p>Modes:</p><ul><li>\"none\" prevents any "
+"additional LANG and/or DIR tag being added. The browser will use the main "
+"setting which was applied to the entire HTML page. This is likely to cause "
+"trouble when a problem of the other direction is "
+"displayed.</li><li>\"auto::\" allows the system to make the settings based "
+"on the language and direction reported by the problem (a new feature, so not"
+" set in almost all existing problems) and falling back to the expected "
+"default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" allows the "
+"system to make the settings based on the language and direction reported by "
+"the problem (a new feature, so not set in almost all existing problems) but "
+"falling back to the language with the given LangCode and the direction Dir "
+"when problem settings are not available from PG.</li><li>\"auto::Dir\" for "
+"problems without PG settings, this will use the default en=english language,"
+" but force the direction to Dir. Problems with PG settings will get those "
+"settings.</li><li>\"auto:LangCode:\" for problems without PG settings, this "
+"will use the default LTR direction, but will set the language to "
+"LangCode.Problems with PG settings will get those "
+"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
+" by the PG code of the problem, and will force the system to set the "
+"language with the given LangCode and the direction to Dir for <b>all</b> "
+"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
+"PG code of the problem, and will force the system to set the direction to "
+"Dir for <b>all</b> problems, but will avoid setting any language attribute "
+"for individual problem.</li></ul>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1736
+#: /opt/webwork/webwork2/conf/defaults.config:1514
+msgid ""
+"<p>Some servers handle courses taking place in different timezones.  If this"
+" course is not showing the correct timezone, enter the correct value here.  "
+"The format consists of unix times, such as \"America/New_York\", "
+"\"America/Chicago\", \"America/Denver\", \"America/Phoenix\" or "
+"\"America/Los_Angeles\".</p>Complete list: <a "
+"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1638
 msgid ""
 "<p>This sets whether the Reduced Scoring system will be enabled.  If enabled"
 " you will need to set the default length of the reduced scoring period and "
@@ -308,22 +429,35 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1979
+#: /opt/webwork/webwork2/conf/defaults.config:1881
 msgid ""
 "<p>When viewing a problem, users may choose different methods of rendering "
 "formulas via an options box in the left panel. Here, you can adjust what "
 "display modes are listed.</p><p>Some display modes require other software to"
 " be installed on the server. Be sure to check that all display modes "
-"selected here work from your server.</p><p>The display modes are "
-"<ul><li>plainText: shows the raw LaTeX strings for formulas.</li><li>images:"
-" produces images using the external programs LaTeX and "
-"dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place "
-"render mathematics.</li></ul></p></p>You must use at least one display mode."
-" If you select only one, then the options box will not give a choice of "
-"modes (since there will only be one active).</p>"
+"selected here work from your server.</p><p>The display modes "
+"are</p><ul><li>plainText: shows the raw LaTeX strings for "
+"formulas.</li><li>images: produces images using the external programs LaTeX "
+"and dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place"
+" render mathematics.</li></ul><p>You must use at least one display mode. If "
+"you select only one, then the options box will not give a choice of modes "
+"(since there will only be one active).</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1476
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with a question in "
+"this test. Please inform your instructor including the warning messages "
+"below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1236
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with this question. "
+"Please inform your instructor including the warning messages below."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1828
+#: /opt/webwork/webwork2/conf/defaults.config:1730
 msgid ""
 "<ul><li><b>SMAcheckAnswers</b>: enables the Check Answers button <i>for the "
 "new problem</i> when Show Me Another is "
@@ -335,7 +469,7 @@ msgid ""
 "time</li><li><b>SMAshowHints</b>: show hints <i>for the new problem</i> "
 "(assuming they exist)</li></ul>Note: there is very little point enabling the"
 " button unless you check at least one of these options - the students would "
-"simply see a new version that they can not attempt or learn from.</p>"
+"simply see a new version that they can not attempt or learn from."
 msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:35
@@ -344,73 +478,123 @@ msgstr ""
 
 #. ($add_courseID)
 #. ($rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1376
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:688
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:600
 msgid "A course with ID %1 already exists."
 msgstr ""
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2564
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1220
 msgid ""
 "A directory already exists with the name %1. You must first delete this "
 "existing course before you can unarchive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:119
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:111
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:42
 msgid ""
 "A file name cannot begin with a dot, it cannot be empty, it cannot contain a"
 " directory path component and only the characters -_.a-zA-Z0-9 and space are"
 " allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1342
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1366
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:738
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
 msgid "A file with that name already exists"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:348
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:19
 msgid ""
 "A hardcopy file was generated, but it may not be complete or correct. Please"
 " check that no problems are missing and that they are all legible. If not, "
 "please inform your instructor."
 msgstr "Se generó una versión para imprimir, pero puede no estar correcta o completa. Por favor verifica que no falten problemas y que todos sean legibles. De lo contrario, contacta a tu instructor."
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:56
+msgid ""
+"A hash reference in which the keys are the achievement_id's assigned to the "
+"current user and the values are 0 or 1 which stores if the user has earned "
+"the associated achievement or not."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:52
+msgid ""
+"A hash reference which contains a problems metadata, such as DBsubject, "
+"DBchapter, DBsection,  and so on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:37
+msgid "A hash reference which contains the problem data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:40
+msgid "A hash reference which contains the set data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:60
+msgid ""
+"A hash reference which saves data for this user and this achievement. This "
+"hash is persistent between evaluations and changes to this variable will be "
+"saved in the database."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:64
+msgid ""
+"A hash reference which saves global data for this user. This hash is "
+"persistent between evaluations and changes to this variable will be saved in"
+" the database."
+msgstr ""
+
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3291
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1695
 msgid ""
 "A location with the name %1 already exists in the database.  Did you mean to"
 " edit that location instead?"
 msgstr ""
 
-#. ($subject, $number_of_recipients, $courseName, $failed_messages)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1007
+#. ($mail_data->{subject}, $number_of_recipients, $mail_data->{courseName},
+#. $failed_messages)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:113
 msgid ""
 "A message with the subject line \"%1\" has been sent to %quant(%2,recipient)"
 " in the class %3.  There were %4 message(s) that could not be sent."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:644
-msgid "A new file has been created at '%1'"
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:315
+msgid "A new file has been created at \"%1\""
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1146
+msgid "A new file has been created at \"%1\" with the contents below."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:154
+msgid ""
+"A new problem whose path ends in newProblem.pg should be given a new name, "
+"for example, \"myNewProblem.pg\"."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2006
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:20
 msgid ""
-"A new file has been created at '%1' with the contents below.  No changes "
-"have been made to set %2"
+"A student must be assigned a homework set in order for it to appear on their"
+" WeBWorK home page. Check the box in the left column to assign a student to "
+"that homework set. Uncheck the box to unassign a student. If a student is "
+"unassigned from a homework set, all of the student's data for that homework "
+"set is deleted and cannot be recovered. Use this action cautiously!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:681
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:20
 msgid ""
-"A period (.) indicates a problem has not been attempted, and a number from 0"
-" to 100 indicates the grade earned. The number on the second line gives the "
-"number of incorrect attempts."
+"A student needs to be assigned a set in order for them to work it. Once a "
+"student is unassigned a set, all the data for them is lost and there is no "
+"way to undo it. When unassigning be sure to change the option to \"Allow "
+"unassign\"."
 msgstr ""
 
 # Leave symbol codes in place
-#: /opt/webwork/webwork2/conf/defaults.config:1647
+#: /opt/webwork/webwork2/conf/defaults.config:1549
 msgid ""
 "A switch to govern the use of a Progress Bar for the student; this also "
 "enables/disables the highlighting of the current problem in the side bar, "
@@ -418,474 +602,665 @@ msgid ""
 "(&#x2717;), or unattempted (no symbol)."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:42
+msgid "A unique key identifying the achievement."
+msgstr ""
+
 # Short for ADJUSTED STATUS
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:500
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:712
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:535
 msgid "ADJ STATUS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2296
-msgid "ANSWERS NOT RECORDED"
-msgstr "NO SE HAN GUARDADO TUS RESPUESTAS"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2281
-msgid "ANSWERS NOT RECORDED --"
-msgstr "NO SE HAN GUARDADO TUS RESPUESTAS --"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2295
-msgid "ANSWERS ONLY CHECKED -- "
+#. ($c->{scoreRecordedMessage}[ $probOrder->[$i] ])
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:504
+msgid "ANSWERS NOT RECORDED -- %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2232
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1505
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:515
 msgid "ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"
 msgstr "LAS RESPUESTAS SOLO SE VERIFICARON -- LAS RESPUESTAS NO SE GUARDARON"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1527
 msgid ""
 "ATTEMPT NOT ACCEPTED -- Please submit answers again (or request new version "
 "if neccessary)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1534
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_password_form.html.ep:1
 msgid "Abandon changes"
 msgstr "tr: Abandon changes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1083
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_export_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_export_form.html.ep:1
 msgid "Abandon export"
 msgstr "tr: Abandon export"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:520
 msgid ""
 "Account creation is currently disabled in this course.  Please speak to your"
 " instructor or system administrator."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:153
-msgid "Achievement"
-msgstr ""
-
-#. ($targetAchievementID, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:638
-msgid "Achievement %1 created with evaluator '%2'."
+#. ($targetAchievementID,			$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:310
+msgid "Achievement %1 created with evaluator \"%2\"."
 msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:847
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:378
 msgid "Achievement %1 exists.  No achievement created"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:444
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:63
 msgid "Achievement Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:548
-msgid "Achievement Evaluator Editor"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:17
+msgid "Achievement Editor Help"
 msgstr ""
 
-#. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:170
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:17
+msgid "Achievement Evaluator Editor Help"
+msgstr ""
+
+#. ($c->stash('achievementID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:109
 msgid "Achievement Evaluator for achievement %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1446
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1454
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1482
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:13
 msgid "Achievement ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:274
 msgid "Achievement ID exists!  No new achievement created.  File not saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1698
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:41
+msgid "Achievement ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:3
+msgid "Achievement List"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1600
 msgid "Achievement Points Per Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:558
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:455
 msgid "Achievement User Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:17
+msgid "Achievement User Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:48
 msgid "Achievement has been assigned to all users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:67
 msgid "Achievement has been assigned to selected users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:60
 msgid "Achievement has been unassigned to all students."
 msgstr ""
 
-#. (CGI::a({ href => $fileManagerURL }, $scoreFileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:711
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:38
+msgid "Achievement options"
+msgstr ""
+
+#. ($c->link_to(                           $scoreFileName => $c->systemLink(
+#. $c->url_for('instructor_file_manager')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:318
 msgid "Achievement scores saved to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:260
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:241
 msgid "Achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:531
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:17
+msgid "Achievements Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:26
+msgid ""
+"Achievements are evaluated in the order shown below, with the exception of "
+"\"level\" achievements.  Achievements in the \"level\" category are "
+"evaluated first and control the XP thresholds and rewards (achievement "
+"items) for reaching each level. Achievements in the \"secret\" category are "
+"not shown to students until they earn the achievement, and is used for "
+"fun/surprise achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:32
+msgid ""
+"Achievements in the same category, with sequential numbers, and whose ID "
+"starts with the same \"prefix_\" (up to the last underscore), are treated as"
+" achievement chains.  Achievement chains are a sequence of achievements "
+"which build upon themselves, such as complete one problem, complete 10 "
+"problems, complete 25 problems, and so on. Students will only see the "
+"achievements in the chain they have completed or are currently working on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:201
 msgid "Act as"
 msgstr "Actuar como"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:207
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:26
 msgid "Act as:"
 msgstr "Actuar como:"
 
-#. (HTML::Entities::encode_entities($prettyEUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1134
+#. ($effectiveUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:26
 msgid "Acting as %1."
 msgstr "Actuando como %1"
 
 #. ($actionID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:372
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:223
 msgid "Action %1 not found"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1706
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:101
+msgid "Actions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1608
 msgid ""
 "Activating this will enable achievement rewards. This feature allows "
 "students to earn rewards by completing achievements that allow them to "
 "affect their homework in a limited way."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:45
 msgid "Active"
 msgstr "tr: Active"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1691
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:50
+msgid "Active Students"
+msgstr ""
+
+#. ($c->{prettyID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:19
+msgid "Active Students Problem %1 Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1593
 msgid ""
 "Activiating this will enable Mathchievements for webwork.  Mathchievements "
 "can be managed by using the Achievement Editor link."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2947
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1548
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:166
 msgid "Add"
 msgstr "Agregar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:89
 msgid "Add All"
 msgstr "Agregar todos"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:644
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:32
 msgid "Add Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:253
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:17
+msgid "Add Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:14
+msgid "Add Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:98
 msgid "Add Students"
 msgstr "Agregar estudiantes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:406
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:349
 msgid "Add Users"
 msgstr "Agregar usuarios"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:518
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:17
+msgid "Add Users Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:47
 msgid "Add WeBWorK administrators to new course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1509
-msgid "Add a new test for which Gateway?"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:79
+msgid "Add a TA or an instructor (change permission level of user)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:60
+msgid "Add a few students to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:50
+msgid "Add a new version for which test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1441
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:20
 msgid "Add as what filetype?"
 msgstr "Agregar como archivo de tipo:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/add_form.html.ep:3
 msgid "Add how many users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1549
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:69
+msgid "Add many students to a course from a class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:108
+msgid "Add n blank problem template(s) to the end of homework set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:164
 msgid "Add problem to target set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Add problems to"
 msgstr "Agregar problemas a"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1422
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:161
+msgid ""
+"Add this problem as the last problem of an existing set, either as a problem"
+" or as the set header (the text that appears on the home page of a homework "
+"set). You can rearrange the order of the problems later using the \"Hmwk "
+"Sets Editor\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:7
 msgid "Add to what set?"
 msgstr "Agregar a la tarea:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:20
+msgid ""
+"Add users to the course.  Select the number of students/users to add and "
+"then add any desired information.  The only mandatory information is the "
+"\"Login Name\". Any other fields may be left blank.  The \"Student ID\" will"
+" be the initial password for the user if provided."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:26
 msgid "Add which new users?"
 msgstr "¿Qué nuevos usuarios agregar?"
 
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:883
+msgid "Added \"%1\" to %2 as new hardcopy header"
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:854
+msgid "Added \"%1\" to %2 as new set header"
+msgstr ""
+
 #. ('{number}', '{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1055
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:27
 msgid "Added %1 problems to set %2."
 msgstr ""
 
-#. ($sourceFilePath, $targetSetName,($set->assignment_type eq 'jitar' ?
-#. join('.',jitar_id_to_seq($targetProblemNumber)
-#. ($new_file_name, $setName, ($set->assignment_type eq 'jitar' ?
-#. join('.',jitar_id_to_seq($targetProblemNumber)
 #. ($new_file_path, $setID, $targetProblemNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1510
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2001
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1912
+#. ($sourceFilePath,                       $targetSetName,                 (
+#. $set->assignment_type eq 'jitar'                                ? join('.',
+#. jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:825
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1837
 msgid "Added %1 to %2 as problem %3"
 msgstr ""
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1566
-msgid "Added '%1' to %2 as new hardcopy header"
-msgstr ""
-
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1540
-msgid "Added '%1' to %2 as new set header"
+#. ($new_file_name,                                $c->{setID},
+#. (                                       $set->assignment_type eq 'jitar'
+#. ? join('.', jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1139
+msgid "Added %1 to %2 as problem %3."
 msgstr ""
 
 #. (join(', ', @toAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1974
 msgid "Added addresses %1 to location %2."
 msgstr ""
 
+#. ($user->user_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:167
+msgid "Added missing permission level for user %1."
+msgstr ""
+
 #. ('{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1054
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:26
 msgid "Added one problem to set %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Added user:"
+msgstr ""
+
+#. ('<code>[Scoring]/report_grades_data.csv</code>',
+#. '<code>[TMPL]/email/report_grades.msg</code>',)
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:33
+msgid ""
+"Additional (external) grades can be shown on this page by placing them in "
+"the CSV file %1.  The first six columns must be (in order): Student ID, "
+"Username, Last Name, First Name, Section, Recitation.  The remaining columns"
+" can list any external grades.  To display the grades, the CSV file is "
+"merged with the \"Email\" message %2, which will be rendered and displayed "
+"below the grade table.  The message can be created on the \"Email\" page and"
+" the CSV file can be created/uploaded using the \"File Manager\".  External "
+"grades can only be displayed here and are not included in any totals or "
+"statistics."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2060
 msgid "Additional addresses for receiving feedback e-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:235
 msgid "Additional submissions available."
 msgstr ""
 
 #. ($badLocAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1708
 msgid ""
 "Address(es) %1 already exist in the database.  THIS SHOULD NOT HAPPEN!  "
 "Please double check the integrity of the WeBWorK database before continuing."
 msgstr ""
 
 #. (join(', ', @noAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1986
 msgid ""
 "Address(es) %1 in the add list is(are) already in the location %2, and so "
 "were skipped."
 msgstr ""
 
 #. (join(', ', @noDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3603
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2008
 msgid ""
 "Address(es) %1 in the delete list is(are) not in the location %2, and so "
 "were skipped."
 msgstr ""
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1683
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and resubmit."
 msgstr ""
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1998
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:117
 msgid "Addresses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:53
 msgid ""
 "Addresses for new location.  Enter one per line, as single IP addresses "
 "(e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP ranges "
 "(e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:27
 msgid ""
 "Addresses to add to the location.  Enter one per line, as single IP "
 "addresses (e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP"
 " ranges (e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:232
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:27
 msgid "Adds 24 hours to the close date of a homework."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:323
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:27
 msgid "Adds 48 hours to the close date of a homework."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:110
+msgid ""
+"Adds new template problems to the set when the set is saved. You can modify "
+"the template to create your own problem, by clicking on the \"Edit Problem\""
+" link and saving to some new file, e.g. \"myNewProblem.pg\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:19
 msgid "Adjusted Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:56
 msgid "Adobe PDF"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:675
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:42
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:196
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:206
 msgid "After set answer date"
 msgstr ""
 
-#. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:325
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:33
 msgid ""
-"After the reduced scoring period begins all work counts for %1% of its "
-"value."
+"After the due date this set enters a reduced scoring period until it closes "
+"on %1.  All work completed during the reduced scoring period counts for %2% "
+"of its value."
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:304
 msgid "Afterward reduced credit can be earned until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:56
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:60
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:23
 msgid "All Chapters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:57
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:34
 msgid "All Sections"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:6
 msgid "All Selected Constraints Joined by \"And\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:71
+msgid "All Sets"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:12
 msgid "All Subjects"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:48
 msgid "All Textbooks"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:54
+msgid "All Users"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:49
 msgid "All assignments were made successfully."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:953
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:386
 msgid "All listed sets were hidden from all the students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:951
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:381
 msgid "All listed sets were made visible for all the students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:407
 msgid "All of the answers above are correct."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:398
 msgid "All of the gradeable answers above are correct."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:247
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:162
+msgid ""
+"All of the paths for problem files are relative to the templates directory "
+"of the current course. You can access this directory \"directly\" using the "
+"File Manager page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:68
 msgid "All of these files will also be made available for mail merge."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:960
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:9
+msgid "All problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:5
+msgid "All sections"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2145
+msgid "All selected courses are already hidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2214
+msgid "All selected courses are already unhidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:399
 msgid "All selected sets hidden from all students"
 msgstr "Oculta para los estudiantes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:394
 msgid "All selected sets made visible for all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:946
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:373
 msgid "All sets hidden from all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:945
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:368
 msgid "All sets made visible for all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:619
 msgid "All sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:56
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:54
 msgid "All unassignments were made successfully."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2047
+#: /opt/webwork/webwork2/conf/defaults.config:1948
 msgid "Allow Unicode alternatives in student answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:74
 msgid "Allow the LMS to update user account data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:68
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:105
 msgid "Allow unassign"
 msgstr "Permitir desasignar tareas"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2069
+#: /opt/webwork/webwork2/conf/defaults.config:1970
 msgid "Allowed error, as a percentage, for numerical comparisons"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1886
+#: /opt/webwork/webwork2/conf/defaults.config:1788
 msgid "Allowed to <em>act as</em> another user"
 msgstr "Con autorización para <em>actuar como</em> otro usuario"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1923
+#: /opt/webwork/webwork2/conf/defaults.config:1825
 msgid "Allowed to change display settings used in pg problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1913
+#: /opt/webwork/webwork2/conf/defaults.config:1815
 msgid "Allowed to change their e-mail address"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1877
+#: /opt/webwork/webwork2/conf/defaults.config:1779
 msgid "Allowed to change their password"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1872
+#: /opt/webwork/webwork2/conf/defaults.config:1774
 msgid "Allowed to login to the course"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1950
+#: /opt/webwork/webwork2/conf/defaults.config:1852
 msgid "Allowed to see solutions before the answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1945
+#: /opt/webwork/webwork2/conf/defaults.config:1847
 msgid "Allowed to see the correct answers before the answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1934
+#: /opt/webwork/webwork2/conf/defaults.config:1836
 msgid "Allowed to view past answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1940
+#: /opt/webwork/webwork2/conf/defaults.config:1842
 msgid "Allowed to view problems in sets which are not open yet"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1572
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:82
+msgid ""
+"Allows configuration of certain parameters, such as permission levels, "
+"default display mode for equations, and email feedback behavior, on a course"
+" by course basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:126
+msgid "Also copy simple configuration file"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:26
 msgid "Amulet of Extension"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:20
+msgid ""
+"An achievement evaluator is a perl script that is run after each problem is "
+"submitted which returns a truth value of 0 (didn't earn) or 1 (earn). The "
+"evaluator is given access to different variables which contain data about "
+"the problem and set that is used to determine if the achievement is earned "
+"or not."
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:37
 msgid ""
 "An address that can be used to log in to the LMS. This is used in messages "
@@ -893,248 +1268,308 @@ msgid ""
 "WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:43
+msgid ""
+"An array which lists the hash reference of all the problems in the current "
+"set."
+msgstr ""
+
 #. ($archive_courseID)
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2350
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2647
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1274
 msgid "An error occured while archiving the course %1:"
 msgstr ""
 
 #. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:658
 msgid "An error occured while changing the title of the course %1."
 msgstr ""
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1795
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:878
 msgid "An error occured while deleting the course %1:"
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1521
+#. ($rename_oldCourseID,						$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:751
 msgid "An error occured while renaming the course %1 to %2:"
 msgstr ""
 
 #. ($part + 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:106
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:25
 msgid "Answer %1 Score (%):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:425
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:765
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:789
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:812
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:79
 msgid "Answer Date"
 msgstr "Fecha de publicación de respuestas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1712
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:39
 msgid "Answer Group Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:59
 msgid "Answer Hash Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:221
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:292
 msgid "Answer Log"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:17
+msgid "Answer Log Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:285
 msgid "Answer Preview"
 msgstr "Vista previa de mi respuesta"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1465
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:48
+msgid ""
+"Answer availability for tests depends on multiple settings.  This only "
+"indicates the template answer date has passed.  See set editor for actual "
+"availability."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1276
 msgid "Answer(s) submitted:"
 msgstr "Respuesta(s) enviada(s):"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
 msgid "Answer:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:224
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
 msgid "Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:122
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:37
 msgid "Answers Available"
 msgstr "Respuestas disponibles"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1202
 msgid "Answers cannot be due until on or after the open date!"
 msgstr "Disponible desde"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1204
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1197
 msgid "Answers cannot be made available until on or after the close date!"
 msgstr "¡Las respuestas no se pueden mostrar antes de la fecha de entrega de la tarea!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:313
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:21
 msgid ""
 "Any changes made below will be reflected in the achievement for ALL "
 "students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2259
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:507
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:175
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:69
 msgid "Any changes made below will be reflected in the set for ALL students."
 msgstr "Todos los cambios que se hagan a continuación aplicarán en la tarea para TODOS los estudiantes."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:173
 msgid ""
 "Any changes made below will be reflected in the set for ONLY the student(s) "
 "listed above."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:122
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:159
 msgid "Append"
 msgstr "Agregar"
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1849
+#. (tag('strong', dir => 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:71
 msgid "Append to end of %1 set"
 msgstr "Agregar al final de la tarea %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2264
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:51
+msgid "Applying definitions theoretically and proof writing"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:91
 msgid "Archive"
 msgstr ""
 
 #. ($archive, $n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:892
-msgid "Archive '%1' created successfully (%quant( %2, file))"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:361
+msgid "Archive \"%1\" created successfully (%quant( %2, file))"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1069
-msgid "Archive '%1' deleted"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:525
+msgid "Archive \"%1\" deleted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1846
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2048
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:38
 msgid "Archive Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2005
-msgid "Archive Courses"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:17
+msgid "Archive Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2423
-msgid "Archive next course"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:63
+msgid "Archive Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1056
-msgid "Archive this Course"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1158
+msgid "Archive next course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:61
 msgid "Archived Courses"
 msgstr ""
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:202
-msgid "Archiving course as %1.tar.gz. Reload FileManager to see it."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:69
+msgid "Archived course as %1.tar.gz."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:25
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to access the .tar.gz files."
 msgstr ""
 
-#. (CGI::b($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2191
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:26
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to upload additional .tar.gz "
+"files to be unarchived."
+msgstr ""
+
+#. (tag('b', $archive_courseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:57
 msgid ""
 "Are you sure that you want to delete the course %1 after archiving? This "
 "cannot be undone!"
 msgstr ""
 
-#. (CGI::b($delete_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1736
+#. (tag('b', param('delete_courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:5
 msgid ""
 "Are you sure you want to delete the course %1? All course files and data "
 "will be destroyed. There is no undo available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:72
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:511
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:64
+msgid ""
+"As the checkbox says, this includes a percentage grade column for each set."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:184
 msgid "Assign"
 msgstr "Asignar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:225
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:62
 msgid "Assign All Sets to Current User"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:171
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:106
+msgid "Assign achievements"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:43
+msgid "Assign and unassign selected exercise sets to selected users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:54
 msgid "Assign selected sets to selected users"
 msgstr "Asignar tareas seleccionadas a los usuarios seleccionados"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:919
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:154
+msgid "Assign sets to many students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:116
+msgid "Assign sets to one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:15
 msgid "Assign this achievement to which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1366
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:62
 msgid "Assign this set to which users?"
 msgstr "tr: Assign this set to which users?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:15
 msgid "Assign to All Current Users"
 msgstr "Asignar a todos los usuarios actuales"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:3
 msgid "Assign which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:35
 msgid "Assigned"
 msgstr "Asignado(s)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1984
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:19
 msgid "Assigned Sets"
 msgstr "Tareas asignadas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:580
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:218
 msgid "Assigned achievements to users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2154
-msgid "Assigned to"
+#. (link_to(						$c->setCountMessage($db->countUserSets($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:96
+msgid "Assigned to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:212
 msgid "Assignment type"
 msgstr "Tipo de asignación"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-msgid "Assignments only"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:2004
+#: /opt/webwork/webwork2/conf/defaults.config:1906
 msgid "Assist with the student answer entry process."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:417
 msgid "At least one of the answers above is NOT correct."
 msgstr "Al menos una de las respuestas arriba NO es correcta."
 
 # Short for "Attempts to Open Children"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:487
 msgid "Att. to Open Children"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:50
 msgid "Attachment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2293
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:107
 msgid "Attempt to upgrade directories"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:375
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:449
 msgid "Attempted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1416
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1498
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/attempts_row.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:73
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:13
 msgid "Attempts"
 msgstr "Intentos"
 
@@ -1142,392 +1577,586 @@ msgstr "Intentos"
 msgid "Audit"
 msgstr "tr: Enrolled"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:342
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:348
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:360
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:366
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:460
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:466
 msgid "Authentication failed.  Please speak to your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/InstructorRPCHandler.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:44
+msgid "Authentication failed. Log in again to continue."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:116
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:69
 msgid "Author Info"
 msgstr "Info. para autores"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:87
 msgid "Automatic"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2058
+#: /opt/webwork/webwork2/conf/defaults.config:1959
 msgid ""
 "Automatically convert Full Width Unicode characters to their ASCII "
 "equivalents"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2911
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:97
+msgid ""
+"Automatically render all problems in the set on this page when \"Save "
+"Changes\" or \"Reset Form\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:667
 msgid "Automatically render problems on page load"
 msgstr "Mostrar vistas previas de los problemas al cargar la página"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1727
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:95
+msgid "Automatically render problems on page load."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:49
 msgid "Auxiliary Resources"
 msgstr ""
 
-#. ($emailDirectory,$old_default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:350
-msgid "Backup file <code>%1/%2</code> created."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:179
+msgid "Average Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:255
-msgid "Badges"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:118
+msgid "Average Attempts Per Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:942
-msgid "Basic Search"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:115
+msgid "Average Percent"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
-msgid "Binary"
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:558
+msgid "Backup created on %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1271
-msgid "Box of Transmogrification"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:1
+msgid "Badges"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1093
-msgid "Browse"
-msgstr "Explorar"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:106
+msgid "Basic Search"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:512
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:991
-msgid "Browse from:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:28
+msgid "Before Open Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2161
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:31
 msgid ""
-"By default, feedback is always sent to all users specified to recieve "
+"Below the file list is a button and options for uploading files. Click the "
+"\"Choose File\" button, select the file, then click \"Upload\". A single "
+"file or a compressed tar (.tgz) file can be uploaded and if the option is "
+"selected, the archive is automatically unpacked and deleted.  Generally the "
+"\"automatic\" option on Format will correctly pick the correct type of file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:83
+msgid "Binary"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+msgid "Both Start and Grade"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:26
+msgid "Box of Transmogrification"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:40
+msgid "Browse"
+msgstr "Explorar"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:16
+msgid "Browse from:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2072
+msgid ""
+"By default, feedback is always sent to all users specified to recieve "
 "feedback.  This variable sets the system to only email feedback to users who"
 " have the same section as the user initiating the feedback.  I.e., feedback "
 "will only be sent to section leaders."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2151
+#: /opt/webwork/webwork2/conf/defaults.config:2062
 msgid ""
 "By default, feedback is sent to all users above who have permission to "
 "receive feedback. Feedback is also sent to any addresses specified in this "
 "blank. Separate email address entries by commas."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
 msgid "CLOSE DATE"
 msgstr "FECHA DE ENTREGA"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:217
 msgid "CLOSE TIME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:26
 msgid "Cake of Enlargement"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1891
+#: /opt/webwork/webwork2/conf/defaults.config:1793
 msgid "Can e-mail instructor"
 msgstr "Puede enviar correos electrónicos al instructor"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1904
+#: /opt/webwork/webwork2/conf/defaults.config:1806
 msgid "Can report bugs"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1955
+#: /opt/webwork/webwork2/conf/defaults.config:1857
 msgid "Can show old answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1897
+#: /opt/webwork/webwork2/conf/defaults.config:1799
 msgid "Can submit answers for a student"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:275
 msgid "Can't copy file: %1"
 msgstr ""
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:894
-msgid "Can't create archive '%1': command returned %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
+msgid "Can't create archive \"%1\": command returned %2"
 msgstr ""
 
 #. ($courseID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2725
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:28
 msgid "Can't create course environment for %1 because %2"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:423
 msgid "Can't create directory: %1"
 msgstr ""
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1060
-msgid "Can't create file '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+msgid "Can't create file \"%1\": %2"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:948
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:406
 msgid "Can't create file: %1"
 msgstr ""
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1070
-msgid "Can't delete archive '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:526
+msgid "Can't delete archive \"%1\": %2"
 msgstr ""
 
-#. ($eUserID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:69
-msgid "Can't get password record for effective user '%1': %2"
-msgstr ""
-
-#. ($userID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:64
-msgid "Can't get password record for user '%1': %2"
+#. ($setID, $TargetUser->user_id,)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:925
+msgid ""
+"Can't generate hardcopy for set \"%1\" for user \"%2\". The set is not "
+"visible to students."
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:445
 msgid "Can't open %1"
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1426
 msgid "Can't open file %1"
 msgstr ""
 
 #. ($merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:343
 msgid "Can't read merge file %1. No message sent"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:760
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:298
 msgid "Can't rename file: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:591
 msgid "Can't rename to the same name."
 msgstr ""
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:927
-msgid "Can't unpack '%1': command returned %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:392
+msgid "Can't unpack \"%1\": command returned %2"
 msgstr ""
 
 #. ($fullPath)
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:629
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1895
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1819
 msgid "Can't write to file %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1015
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1096
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:154
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:462
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/confirm.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:69
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:15
 msgid "Cancel"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:387
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:5
+msgid "Cancel E-Mail"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:60
 msgid "Cancel E-mail"
 msgstr "Cancelar correo"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:61
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:77
 msgid "Cancel Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:79
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
 msgid "Cancel Export"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:93
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
 msgid "Cancel Password"
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:516
+msgid "Cannot find a file path to save to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:501
+msgid ""
+"Cannot find a problem record for set $c->{setID} / problem $c->{problemID}"
+msgstr ""
+
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:240
 msgid "Cannot open %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:222
-msgid "Cap Test Time at Set Close Date?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:232
+msgid "Cap Test Time at Set Close Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1456
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1486
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:14
 msgid "Category"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:516
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:49
+msgid "Category:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:27
 msgid ""
 "Cause the selected homework set to count for twice as many points as it "
 "normally would."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1272
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:27
 msgid ""
 "Causes a homework problem to become a clone of another problem from the same"
 " set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:727
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:27
 msgid "Causes a single homework problem to be worth twice as much."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1006
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:48
 msgid "Change Course Title to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:34
 msgid "Change CourseID to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:176
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:134
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:76
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:25
 msgid "Change Display Settings"
 msgstr "Cambiar preferencias de visualización"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:53
 msgid "Change Email Address"
 msgstr "Cambiar dirección de correo (email)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1032
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:62
 msgid "Change Institution to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:374
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:18
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:169
 msgid "Change User Settings"
 msgstr "Guardar preferencias de usuario"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:35
+msgid "Change a course's ID, Title, or Institution."
+msgstr ""
+
 #. ($rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1092
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
 msgid "Change course institution from %1 to %2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:160
+msgid "Change dates for a homework set for the whole class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:123
+msgid "Change the due date for one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:26
+msgid ""
+"Change the due dates for an individual student on this page. Check the "
+"checkbox and enter the new date in order to override the date. (You can copy"
+" the date format from the date in the right hand column which indicates the "
+"date when the homework set is due for the whole class.) Note that you should"
+" ensure that the close date is before the answer date. If the close date for"
+" a student is extended until after the class answer date for the set, then "
+"the answer date for the student must also be set to a later date. "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:141
+msgid "Change the grades on a homework set for one student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:163
+msgid "Change the grading on a homework set for an entire class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:170
+msgid "Change the number of atttempts allowed on a problem."
+msgstr ""
+
 #. ($rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1089
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:508
 msgid "Change title from %1 to %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1362
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:488
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:540
 msgid "Changes abandoned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:371
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:242
 msgid "Changes in this file have not yet been permanently saved."
 msgstr "tr: Changes in this file have not yet been permanently saved."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:647
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:529
 msgid "Changes saved"
 msgstr "Los cambios se han guardado"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1822
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:38
+msgid "Changing dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:514
 msgid ""
 "Changing the problem seed for display, but there are no problems showing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:635
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:19
 msgid "Chapter:"
 msgstr "Capítulo:"
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1849
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:15
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:103
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:37
 msgid "Check Answers"
 msgstr "Verificar mis respuestas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2476
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:682
 msgid "Check Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:183
-msgid "Check that it's permissions are set correctly."
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:53
+msgid "Choose problems from a library and add them to a homework set."
 msgstr ""
 
-#. ($emailDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:195
-msgid ""
-"Check whether it exists and whether the directory %1 can be read by the "
-"webserver."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:543
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:40
 msgid "Choose the set which you would like to be worth twice as much."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:44
 msgid "Choose the set which you would like to enable partial credit for."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1206
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:992
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:44
 msgid "Choose the set which you would like to resurrect."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:259
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:350
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:40
 msgid "Choose the set whose close date you would like to extend."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:903
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:16
 msgid "Choose visibility of the sets to be affected"
 msgstr "Nuevo estado de las tareas a modificar:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:497
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:15
 msgid "Choose what to do with existing data:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:880
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:3
 msgid "Choose which sets to be affected"
 msgstr "Elige qué tareas se van a modificar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:491
-msgid "Class value"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:17
+msgid "Class List Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:55
+msgid "Class list (\".lst\") files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:334
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:316
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:37
 msgid "Classlist Editor"
 msgstr "Editor de lista de clase"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1197
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:91
 msgid "Clear Problem Display"
 msgstr "Limpiar vista de problemas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:693
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:82
 msgid ""
 "Click a student's name to see the student's homework set. Click a heading to"
 " sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:74
 msgid ""
 "Click a student's name to see the student's test summary page. Click a "
 "test's version number to see the corresponding test version. Click a heading"
 " to sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:614
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:150
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:143
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made. (The grade for each problem is listed "
+"as \"status\" on this third page)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:24
+msgid ""
+"Click on each of the tabs to view the configuration items. The question mark"
+" icon provides access to information about the behavior of the configuration"
+" settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:125
+msgid ""
+"Click on the column \"Assigned Sets\" in the student's row. This will take "
+"you to a page where you can assign and unassign homework sets and change the"
+" due dates for homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:33
+msgid ""
+"Click on the homework set links to edit the grades for this individual "
+"student on the homework set. (The grade of each problem is called the "
+"\"status\".) You can also change the number of allowed attempts and further "
+"modify the individual student's homework set.) You will also be able to "
+"change a student's seed which determines the individual values used in the "
+"individual version of the student's problem and the weight (how much a "
+"problem counts towards the grade.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:90
 msgid ""
 "Click on the login name to edit individual problem set data, (e.g. due "
 "dates) for these students."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:62
+msgid ""
+"Click the \"Add x student(s)\" radio button and then click \"Take action\". "
+"This will take you to a new page where the data can be entered for one or "
+"more students. It is also possible to assign the student to one or more "
+"problem sets as they are being entered: simply select the homework sets from"
+" the list below the data entry table. Use \"command\" or \"control\" click "
+"to select more than one homework set."
+msgstr ""
+
+#. ('<i class="fas fa-question-circle"></i>')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:88
+msgid "Click the %1 icon for page and item specific help."
+msgstr ""
+
+#. ('<a href="#"><i class="fas fa-question-circle"></i></a>')
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:20
+msgid "Click the icon %1 for page and item specific help."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:185
+msgid ""
+"Clicking on any active link at the top of the column sorts the page by that "
+"column. You can do lexigraphic sorts: click on \"First name\" then \"Last "
+"name\" to sort by last name, sorting those with the same last name by their "
+"first name."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:132
+msgid ""
+"Clicking on the login name link in a student's row allows you to view the "
+"student's version of the homework (rather than your own) so that you can "
+"more easily answer student questions about homework problems. (A \"acting as"
+" xxx\" alert will appear in the upper right corner of each window while you "
+"are acting as a student.) You can submit the answers (which will NOT be "
+"recorded) to check that the computer is grading the problem correctly. You "
+"will also be able to view past answers submitted by the student for each "
+"problem. To stop acting in the student's role click the \"Stop acting\" link"
+" in the upper right corner of the window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:199
+msgid ""
+"Clicking the <strong>e-mail address</strong> link will bring up your "
+"standard email application so that you can send email to the student. This "
+"works even if the student has been dropped from the course. To send email to"
+" an entire class or to merge grades with the email message use the \"Email\""
+" page link in the left margin."
+msgstr ""
+
 #. ($clientIP->ip()
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:541
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:547
 msgid ""
 "Client ip address %1 is not allowed to work this assignment, because the "
 "assignment has ip address restrictions and there are no allowed locations "
@@ -1535,329 +2164,337 @@ msgid ""
 "problem resolved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:713
-msgid "Close"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:424
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:764
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:788
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:811
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:316
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:39
 msgid "Close Date"
 msgstr "Disponible hasta"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:382
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:35
+msgid "Closed"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:208
 msgid "Closed, answers available."
 msgstr "No disponible. Se pueden revisar las respuestas."
 
-#. ($self->formatDateTime($set->answer_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:378
+#. ($c->formatDateTime($set->answer_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:204
 msgid "Closed, answers on %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:206
 msgid "Closed, answers recently available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:282
 msgid "Closed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:116
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:121
 msgid "Closes"
 msgstr "Cierra el "
 
-#. ($self->formatDateTime($set->due_date, undef,
-#. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:113
-msgid "Closes %1"
-msgstr "Cierra el %1"
-
-#. ($self->formatDateTime($verSet->due_date, undef,
+#. ($c->formatDateTime($verSet->due_date, undef,
 #. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:390
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:227
 msgid "Closes on %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:35
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:33
 msgid "Closes:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2518
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:357
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:71
 msgid "Collapse All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2529
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:367
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:85
 msgid "Collapse All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2668
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:419
 msgid "Collapse Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2791
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2793
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:572
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:575
 msgid "Collapse Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1715
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:73
+msgid ""
+"Collapse problem details to the top row of information about a problem. Note"
+" that the details of a single problem can be collapsed by clicking on the up"
+" arrow to the right of the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1617
 msgid ""
 "Comma separated list of set names that are excluded from all achievements. "
 "No achievement points and badges can be earned for submitting problems in "
 "these sets. Note that underscores (_) must be used for spaces in set names."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:238
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:245
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:225
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:577
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2047
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:299
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:833
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:862
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:891
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:920
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:131
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:46
 msgid "Comment"
 msgstr "Comentario"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:200
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:25
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:181
 msgid "Comment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:638
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:86
 msgid "Comments"
 msgstr ""
 
-#. ($self->formatDateTime($set->answer_date)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2175
+#. ($c->formatDateTime($c->{set}->answer_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:379
 msgid "Completed results for this assignment are not available until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:382
 msgid "Completed results for this assignment are not available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:264
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:280
 msgid "Completed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:45
 msgid "Compose Email Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3185
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:47
+msgid ""
+"Configure ip ranges (locations) that can be used to restrict set access."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:45
+msgid "Configure which course links appear on the site landing page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:97
 msgid "Confirm"
 msgstr ""
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:107
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:164
+#. ($eUserName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:41
 msgid "Confirm %1's New Password"
 msgstr "Confirmar la nueva contraseña de %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:579
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:78
 msgid "Confirm Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_export_form.html.ep:1
 msgid "Confirm which sets to export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementEvaluator.pm:288
+#: /opt/webwork/webwork2/templates/AchievementEvaluator/cheevoMessage.html.ep:15
 msgid "Congratulations, you earned a new level!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2250
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:95
 msgid "Continue"
 msgstr "Ingresar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:86
 msgid "Continue Open Test"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:59
+msgid "Controls if an achievement is evaluated or not."
+msgstr ""
+
 #. ($sourceDirectory, $outputDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1149
-msgid "Copied auxiliary files from %1 to new location at %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:671
+msgid "Copied auxiliary files from %1 to new location at %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:42
 msgid "Copy"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
 msgid "Copy file as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:528
-msgid "Copy simple configuration file to new course"
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:112
+msgid "Copy from:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:627
-msgid "Copy templates from:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1335
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:82
 msgid "Copy this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:391
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:465
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:301
 msgid "Correct"
 msgstr "Correcto"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:656
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:678
 msgid "Correct Adjusted Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:300
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:287
 msgid "Correct Answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1682
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:19
 msgid "Correct Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1506
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1317
 msgid "Correct Answers:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:693
 msgid "Correct Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:648
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:93
 msgid "Correct answers"
 msgstr ""
 
 #. ($total_correct, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1004
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:16
 msgid "Correct: %1/%2"
 msgstr ""
 
 #. ($newBlankProblems, $MAX_NEW_PROBLEMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1915
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1843
 msgid ""
 "Could not add %1 problems to this set.  The number must be between 1 and %2"
 msgstr ""
 
 #. ($e_user_name, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:83
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:94
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:74
 msgid "Couldn't change %1's password: %2"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:111
 msgid "Couldn't change your email address: %1"
 msgstr ""
 
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4111
-msgid "Couldn't find OPL Branch %1 in remote %2"
-msgstr ""
-
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4076
-msgid "Couldn't find PG Branch %1 in remote %2"
-msgstr ""
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4014
-msgid "Couldn't find WeBWorK Branch %1 in remote %2"
-msgstr ""
-
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:132
 msgid "Couldn't save your display options: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1463
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:36
 msgid "Counter"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:424
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:833
-msgid "Counts for Parent"
-msgstr ""
-
-#. ($rename_oldCourseID)
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2186
-msgid "Course %1 database is in order"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:66
+msgid "Counter:"
 msgstr ""
 
-#. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1257
-msgid "Course %1 databases must be updated before renaming this course."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:503
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:35
+msgid "Counts for Parent"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:778
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:95
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:154
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:9
 msgid "Course Administration"
 msgstr "Administrar curso"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:424
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:17
+msgid "Course Administration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:369
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:80
 msgid "Course Configuration"
 msgstr "Configuración del curso"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:480
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:17
+msgid "Course Configuration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:17
+msgid "Course Home Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:21
 msgid "Course ID"
 msgstr ""
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2566
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:691
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:594
 msgid "Course ID cannot exceed %1 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1227
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:597
 msgid "Course ID may only contain letters, numbers, hyphens, and underscores."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:956
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:21
 msgid "Course ID:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:5
 msgid "Course Info"
 msgstr "Información del curso"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1664
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1961
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3736
-msgid "Course Name:"
+#. ($c->stash('courseID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:325
+msgid "Course Information for course %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:491
-msgid "Course Title"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:30
+msgid "Course Listings"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:204
-msgid "Course archived."
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:17
+msgid "Course Name:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:28
+msgid "Course Title"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:418
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:12
 msgid "Courses"
 msgstr "Cursos"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1609
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1904
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3674
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:13
 msgid ""
 "Courses are listed either alphabetically or in order by the time of most "
 "recent login activity, oldest first. To change the listing order check the "
@@ -1866,393 +2503,536 @@ msgid ""
 "\"hidden\" or \"visible\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:7
+msgid ""
+"Courses are listed either alphabetically or in order by the time of most "
+"recent login activity, oldest first. To change the listing order check the "
+"mode you want and click \"Refresh Listing\". The listing format is: "
+"Course_Name (status :: date/time of most recent login) where status is "
+"\"hidden\" or \"visible\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:163
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:84
 msgid "Create"
 msgstr "Crear"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:41
 msgid "Create CSV"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3054
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:31
 msgid "Create Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1071
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:39
+msgid ""
+"Create a .tar.gz archive which includes the course's database and all course"
+" files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:33
 msgid "Create a New Set in This Course:"
 msgstr "Crear una nueva tarea en este curso:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:795
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:4
 msgid "Create a new achievement with ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:33
+msgid "Create a new course on this server."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:20
+msgid ""
+"Create a new course.  The \"Course ID\" is used as the course name and is "
+"used in course links.  Underscores appear as spaces when displaying the "
+"course name.  The \"Course Title\" is used as the title on the course home "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:86
+msgid ""
+"Create a new set with a given name. This can either create an empty set or a"
+" duplicate of an existing set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:12
 msgid "Create as what type of achievement?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:12
 msgid "Create as what type of set?"
 msgstr "Tipo de tarea"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1866
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:20
+msgid "Create backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:81
 msgid "Create unattached problem"
 msgstr "Crear problema sin asociación a tareas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1849
-msgid ""
-"Creates a gzipped tar archive (.tar.gz) of a course in the WeBWorK courses "
-"directory. Before archiving, the course database is dumped into a "
-"subdirectory of the course's DATA directory. Currently the archive facility "
-"is only available for mysql databases. It depends on the mysqldump "
-"application."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:121
+msgid "Create/Delete achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:726
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:26
 msgid "Cupcake of Enlargement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:728
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:38
 msgid "Current"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3042
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:2
 msgid "Currently defined locations are listed below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4352
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2365
 msgid "Database tables are ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:54
 msgid "Database tables need updating."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2753
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:52
 msgid "Database tables ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2968
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1499
 msgid "Database:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:783
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:153
 msgid "Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:727
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:355
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:96
+msgid "Dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:40
+msgid ""
+"Dates for problem sets can be edited by clicking the pencil icon in the "
+"\"Edit Set Data\" column next to the set name. To change dates for several "
+"sets at once, click the check box in the \"Select\" column and choose \"Edit"
+" selected\" from the tasks above."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:426
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:37
 msgid "Default"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1675
+#: /opt/webwork/webwork2/conf/defaults.config:1577
 msgid ""
 "Default Amount of Time (in minutes) after Due Date that Answers are Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1665
+#: /opt/webwork/webwork2/conf/defaults.config:1567
 msgid ""
 "Default Amount of Time (in minutes) before Due Date that the Assignment is "
 "Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1785
+#: /opt/webwork/webwork2/conf/defaults.config:1687
 msgid "Default Length of Reduced Scoring Period in minutes"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1655
+#: /opt/webwork/webwork2/conf/defaults.config:1557
 msgid "Default Time that the Assignment is Due"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1808
+#: /opt/webwork/webwork2/conf/defaults.config:1710
 msgid ""
 "Default number of attempts before Show Me Another can be used (-1 => Never)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1755
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:162
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:91
+#: /opt/webwork/webwork2/conf/defaults.config:1994
+msgid ""
+"Default number of attempts before hints are shown in a problem (-1 => hide "
+"hints)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:89
 msgid "Delete"
 msgstr "Eliminar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1556
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1651
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1689
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1728
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:49
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:36
 msgid "Delete Course"
 msgstr "Eliminar curso"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3480
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:17
+msgid "Delete Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:23
+msgid "Delete Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:37
+msgid "Delete a course and all associated data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:109
+msgid "Delete a student from a course"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:52
 msgid "Delete all existing addresses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1989
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:65
+msgid "Delete backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:64
+msgid "Delete backup from %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:54
 msgid "Delete course after archiving. Caution there is no undo!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:49
 msgid "Delete course:"
 msgstr "Eliminar curso:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2348
 msgid "Delete field when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2809
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:588
 msgid "Delete it?"
 msgstr "Eliminar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3055
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:78
 msgid "Delete location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:28
+msgid "Delete oldest backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2321
 msgid "Delete table when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:729
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:90
+msgid "Delete the sets checked below. Be careful, this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:6
 msgid "Delete which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1045
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:6
 msgid "Delete which sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1041
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:6
 msgid "Delete which users?"
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:394
 msgid "Deleted %1 users."
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:358
 msgid "Deleted %quant(%1,achievement)"
 msgstr ""
 
 #. (join(', ', @delLocations)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3359
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1810
 msgid "Deleted Location(s): %1"
 msgstr ""
 
 #. (join(', ', @toDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3597
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1966
 msgid "Deleted addresses %1 from location."
 msgstr ""
 
-#. ($self->shortPath($self->{tempFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1158
-msgid "Deleting temp file at %1"
+#. ($formatBackupTime)
+#. ($c->formatDateTime($delTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1243
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:569
+msgid "Deleted backup from %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3152
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:679
+msgid "Deleted temp file at %1"
+msgstr ""
+
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1219
+msgid "Deleted temporary file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:125
+msgid "Deleting Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:68
 msgid ""
 "Deletion deletes all location data and related addresses, and is not "
 "undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:723
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:3
 msgid "Deletion destroys all achievement-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:185
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
 msgid "Deny From"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1467
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:27
 msgid "Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:256
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:71
+msgid "Description:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:69
 msgid "Deselect All Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:229
 msgid "Deselect All Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:428
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:366
 msgid "Didn't recognize action"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:27
 msgid "Directory"
 msgstr ""
 
 #. ($file, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:793
-msgid "Directory '%1' not removed: %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:327
+msgid "Directory \"%1\" not removed: %2"
 msgstr ""
 
 #. ($file, $removed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:792
-msgid "Directory '%1' removed (items deleted: %2)"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:325
+msgid "Directory \"%1\" removed (items deleted: %2)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:412
-msgid "Directory permission errors "
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:33
+msgid "Directory permission errors"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2861
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2994
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1439
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1575
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:44
 msgid ""
 "Directory structure is missing directories or the webserver lacks sufficient"
 " privileges."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1267
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2210
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2857
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1434
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1570
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:41
 msgid "Directory structure is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2285
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:102
 msgid "Directory structure needs to be repaired manually before archiving."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1338
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:84
 msgid "Directory structure needs to be repaired manually before renaming."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2750
-msgid "Directory structure or permissions need to be repaired. "
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:48
+msgid "Directory structure or permissions need to be repaired."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2853
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1414
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1540
 msgid "Directory structure:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2536
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:365
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:92
+msgid "Display Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:90
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:104
 msgid "Display Mode:"
 msgstr "Modo de visualización:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:463
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:37
 msgid "Display Past Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
-msgid "Display of scores for this set is not allowed."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:44
+msgid "Display mode for equations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:589
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:311
+msgid "Display of scores for this test is not allowed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:12
 msgid "Display options: Show"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2017
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:48
+msgid ""
+"Display sets matching a selected criteria. Useful if there are many sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1918
 msgid "Display the evaluated student answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:176
+#. ('<code>COURSENAME_totals.csv</code>',
+#. '<code>COURSENAME_totals_bak1.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:74
+msgid ""
+"Do NOT use the file name %1, since you might accidentally overwrite that if "
+"you again export your WeBWorK homework scores. (Actually the earlier file is"
+" moved to %2 -- so you can recover using the File Manager.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:57
 msgid "Do not unassign students unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:233
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:67
 msgid "Do not uncheck a set unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:20
 msgid "Do not uncheck students, unless you know what you are doing."
 msgstr "No desmarques estudiantes a menos de que sepas lo que haces."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2450
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:656
 msgid "Do you want to grade this test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2272
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:93
+msgid "Documentation from source code for PG modules and macro files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:95
 msgid "Don't Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2607
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:13
 msgid "Don't Unarchive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2912
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:46
 msgid "Don't Upgrade"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1749
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:15
 msgid "Don't delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1120
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:24
 msgid "Don't make changes"
 msgstr ""
 
 #. ($saveMode)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:317
 msgid "Don't recognize saveMode: |%1|. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1307
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1321
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1335
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:87
 msgid "Don't rename"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:547
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:33
 msgid "Don't use in an achievement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:683
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1345
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2465
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1595
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:766
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:57
 msgid "Done"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:159
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:365
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:8
 msgid "Download"
 msgstr ""
 
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($set->set_id)
 #. ($ver->{id} =~ s/_/ /gr)
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($set->set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:731
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:732
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:413
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:204
 msgid "Download %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:23
 msgid "Download Hardcopy"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:865
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:56
 msgid "Download PDF or TeX Hardcopy for Current Set"
 msgstr "Descargar el PDF o archivo TeX de esta tarea"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:764
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:233
 msgid "Download PDF or TeX Hardcopy for Selected Tests"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($selected_set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:595
+#. (tag('span', dir => 'ltr', format_set_name_display($selected_set_id =~
+#. s/,v(\d+)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:58
 msgid "Download hardcopy of set %1 for %2?"
 msgstr "¿Descargar una versión para imprimir de la tarea %1 para %2?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:369
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:63
+msgid "Download/upload archived courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:46
 msgid "Download:"
 msgstr ""
 
@@ -2260,314 +3040,401 @@ msgstr ""
 msgid "Drop"
 msgstr "tr: Drop"
 
-#. ($self->formatDateTime($set->reduced_scoring_date, undef,
-#. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:107
-msgid "Due %1, after which reduced scoring is available until %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:100
+msgid "Drop student from the course"
 msgstr ""
 
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:310
 msgid "Due date %1 has passed."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2093
+#: /opt/webwork/webwork2/conf/defaults.config:2014
 msgid "E-Mail"
 msgstr "Enviar un correo"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:315
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:261
 msgid "E-mail Instructor"
 msgstr "Enviar un correo electrónico al instructor"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2128
-msgid "E-mail addresses which can receive e-mail from a pg problem"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:2138
+#: /opt/webwork/webwork2/conf/defaults.config:2049
 msgid ""
 "E-mail feedback from students automatically sent to this permission level "
 "and higher"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2109
+#: /opt/webwork/webwork2/conf/defaults.config:2030
 msgid "E-mail verbosity level"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:357
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:43
 msgid "E-mail:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:35
 msgid "Earned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:71
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:158
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:334
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:417
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:547
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2743
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1628
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1186
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1203
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:257
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:479
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:6
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:53
 msgid "Edit"
 msgstr "Editar"
 
-#. (CGI::a({ href => $basicInfoUrl }, $r->maketext('class list data')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:199
-msgid "Edit %1 for  %2 (%3) who has been assigned %4 sets."
+#. (link_to(maketext('class list data')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:47
+msgid "Edit %1 for %2 (%3) who has been assigned %4 sets."
 msgstr ""
 
-#. (CGI::a({ href => $editUsersAssignedToSetURL }, $r->maketext('individual
-#. versions')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2223
-msgid "Edit %1 of set %2."
+#. (link_to(maketext('individual user settings')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:162
+msgid "Edit %1 for set %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:6
 msgid "Edit Assigned Users"
 msgstr "Editar usuarios asignados"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:40
 msgid "Edit Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1488
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:58
 msgid "Edit Evaluator"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:253
 msgid "Edit Header"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3053
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:18
 msgid "Edit Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2741
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:111
 msgid "Edit Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:5
 msgid "Edit Problems"
 msgstr "Editar problemas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:583
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:3
 msgid "Edit Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:421
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:4
 msgid "Edit Set Data"
 msgstr "Editar información de tareas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:171
+msgid "Edit Tags"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:30
 msgid "Edit Target Set"
 msgstr "Editar esta tarea"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1487
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:18
 msgid "Edit Users"
 msgstr ""
 
-#. ($user)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:207
-msgid "Edit data for %1"
-msgstr "Editar información de %1"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:127
+msgid "Edit achievement evaluator"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1248
-msgid "Edit it"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:90
+msgid "Edit achievement information"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2192
-msgid "Edit set %1 data for ALL students assigned to this set."
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:65
+msgid ""
+"Edit achivements for the course. This link is only present if achievements "
+"are enabled for the course."
 msgstr ""
 
-#. (CGI::a({href=>$editSetLink},$setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2166
-msgid "Edit set %1 for this user."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:42
+msgid "Edit class list data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3393
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:39
 msgid ""
-"Edit the current value of the location description, if desired, then add and"
-" select addresses to delete, and then click the \"Take Action\" button to "
-"make all of your changes.  Or, click \"Manage Locations\" above to make no "
-"changes and return to the Manage Locations page."
+"Edit class roster data. Add students, edit student data, drop students from "
+"class, import students from a classlist, and give user professor privileges."
+" Access to individual homework sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:429
-msgid "Edit which achievements?"
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:70
+msgid "Edit data for %1"
+msgstr "Editar información de %1"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:46
+msgid ""
+"Edit homework sets for entire class. Change homework set due dates, create "
+"new sets from a set definition file, create new homework sets, make sets "
+"visible/invisible, score homework sets. Assign homework sets to the class."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:829
-msgid "Edit which sets?"
-msgstr "tr: Edit which sets?"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:219
+msgid "Edit it"
+msgstr ""
+
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:135
+msgid "Edit set %1 for ALL students assigned to this set."
+msgstr ""
+
+#. (link_to(                                               $setID =>
+#. $c->systemLink(
+#. $setDetailPage, params => { effectiveUser => $user->user_id, editForUser =>
+#. $user->user_id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:106
+msgid "Edit set %1 for this user."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:95
+msgid "Edit set for %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:4
+msgid ""
+"Edit the current value of the location description, if desired, then add and"
+" select addresses to delete, and then click the \"Take Action\" button to "
+"make all of your changes.  Or, click \"Manage Locations\" above to make no "
+"changes and return to the Manage Locations page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:2
+msgid "Edit which achievements?"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:935
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:2
+msgid "Edit which sets?"
+msgstr "tr: Edit which sets?"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:2
 msgid "Edit which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:592
-msgid "Editing <strong>blank problem</strong> in file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:31
+msgid "Editing <strong>course information</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:595
-msgid "Editing <strong>course information</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:30
+msgid "Editing <strong>hardcopy header</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
-msgid "Editing <strong>hardcopy header</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:28
+msgid "Editing <strong>new problem</strong> template."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:596
-msgid "Editing <strong>options information</strong> file \"%1\""
+#. ($c->{prettyProblemNumber},                             tag('span', dir =>
+#. 'ltr', format_set_name_display($fullSetName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:45
+msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\"."
 msgstr ""
 
-#. ($prettyProblemNumber,                  CGI::span({ dir => 'ltr' },
-#. format_set_name_display($fullSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:605
-msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:29
+msgid "Editing <strong>set header</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:593
-msgid "Editing <strong>set header</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:33
+msgid "Editing <strong>unassigned problem</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:598
-msgid "Editing <strong>unassigned problem</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:32
+msgid "Editing <strong>unknown file type</strong> in file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:597
-msgid "Editing <strong>unknown file type</strong> in file \"%1\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:19
+msgid "Editing Modes"
 msgstr ""
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:209
-msgid "Editing achievement in file '%1'"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:140
+msgid "Editing Problems"
+msgstr ""
+
+#. ($c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:16
+msgid "Editing achievement in file \"%1\""
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:22
+msgid "Editing for all students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:23
+msgid "Editing for one student or a proper subset of all students"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3390
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:1
 msgid "Editing location %1"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display("$setID$vermsg")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2182
-msgid "Editing problem set %1 data for these individual students: %2"
+#. (tag(                                           'strong',
+#. dir => 'ltr',
+#. format_set_name_display($setID . ($editingSetVersion ?
+#. ",v$editingSetVersion" : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:123
+msgid "Editing problem set %1 for these students: %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:315
 msgid "Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:669
-msgid "Editor rows:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1668
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:229
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:53
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:68
 msgid "Email"
 msgstr "E-mail"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:32
 msgid "Email Address"
 msgstr "tr: Email Address"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:817
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:170
 msgid "Email Body:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:17
+msgid "Email Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:339
 msgid "Email Instructor On Failed Attempt"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2003
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:28
 msgid "Email Link"
 msgstr "Enlace al correo electrónico"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:789
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:112
 msgid "Email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1807
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1832
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:311
+msgid "Email body is empty. No message sent. "
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:994
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_email.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_form.html.ep:24
 msgid "Email instructor"
 msgstr "Enviar un correo electrónico al instructor"
 
-#. (scalar(@{ $self->{ra_send_to} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:454
+#. (scalar(@{ $c->{ra_send_to} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:27
+msgid ""
+"Email is being sent to %quant(%1,recipient). You will be notified by email "
+"when the task is completed.  This may take several minutes if the class is "
+"large."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:13
+msgid "Email:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:26
 msgid ""
-"Email is being sent to %quant(%1,recipient). You will be notified by email\n"
-"\t\t\t\twhen the task is completed.  This may take several minutes if the class is\n"
-"\t\t\t\tlarge."
+"Emails can contain personalized data, such as name, section, or status.  "
+"Click \"List of insertable macros\" for a full list available variables.  "
+"Additional personal data can be included by using a merge file.  A merge "
+"file is a CSV file located in the [Scoring] directory in which the first "
+"column is the student id, followed by additional data (such as student "
+"grades).  This data is identified by which column it is in, for instance if "
+"the scores where in the 4th column of the merge file, insert them into an "
+"email using the variable $COL[4].  The \"Scoring Tools\" page can export "
+"grades into a CSV that can be used as a merge file.  Upload customized merge"
+" files with the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:11
 msgid "Emails to be sent to the following:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1704
+#: /opt/webwork/webwork2/conf/defaults.config:1606
 msgid "Enable Achievement Rewards"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1723
+#: /opt/webwork/webwork2/conf/defaults.config:1625
 msgid "Enable Conditional Release"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1689
+#: /opt/webwork/webwork2/conf/defaults.config:1591
 msgid "Enable Course Achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1645
+#: /opt/webwork/webwork2/conf/defaults.config:1547
 msgid "Enable Progress Bar and current problem highlighting"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1734
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:585
+#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Enable Reduced Scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1799
+#: /opt/webwork/webwork2/conf/defaults.config:1701
 msgid "Enable Show Me Another button"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:156
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:24
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:92
 msgid "Enable Spell Checking"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1844
+#: /opt/webwork/webwork2/conf/defaults.config:1746
 msgid "Enable periodic re-randomization of problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:416
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:29
 msgid ""
 "Enable reduced scoring for a homework set.  This will allow you to submit "
 "answers for partial credit for 24 hours after the close date."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1461
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1483
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:20
 msgid "Enabled"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1846
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:58
+msgid "Enabled:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1748
 msgid ""
 "Enables periodic re-randomization of problems after a given number of "
 "attempts. Student would have to click Request New Version to obtain new "
 "version of the problem and to continue working on the problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1725
+#: /opt/webwork/webwork2/conf/defaults.config:1627
 msgid ""
 "Enables the use of the conditional release system.  To use conditional "
 "release you need to specify a list of set names on the Problem Set Detail "
@@ -2576,14 +3443,14 @@ msgid ""
 " sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1801
+#: /opt/webwork/webwork2/conf/defaults.config:1703
 msgid ""
 "Enables use of the Show Me Another button, which offers the student a newly-"
 "seeded version of the current problem, complete with solution (if it exists "
 "for that problem)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:662
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:163
 msgid "End"
 msgstr ""
 
@@ -2591,538 +3458,662 @@ msgstr ""
 msgid "Enrolled"
 msgstr "Inscrito"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:788
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:111
 msgid "Enrolled, Drop, etc."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:830
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:859
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:888
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:917
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:128
 msgid "Enrollment Status"
 msgstr "tr: Enrollment Status"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:21
 msgid "Enter filename below"
 msgstr "tr: Enter filename below"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:20
 msgid "Enter filenames below"
 msgstr "tr: Enter filenames below"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:19
 msgid ""
 "Enter information below for students you wish to add. Each student's "
 "password will initially be set to their student ID."
 msgstr "Ingresa abajo la información de los estudiantes que quieres agregar. Inicialmente, la clave de cada estudiante es su ID de estudiante."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1997
+#: /opt/webwork/webwork2/conf/defaults.config:1899
 msgid ""
 "Enter one of the allowed display mode types above.  See 'display modes "
 "entry' for descriptions."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:297
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:34
+msgid ""
+"Enter the details of the course instructor to be added when the course is "
+"created.  This user will also be added to the admin course with the username"
+" \"userID_courseID\" so you can manage and email the instructors of the "
+"courses on the server."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:284
 msgid "Entered"
 msgstr "Mi respuesta"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:85
-msgid "Entered student:"
-msgstr ""
-
-#. ($display_sort_method_name{$primary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:698
+#. ($display_sort_method_name{$primary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:98
 msgid "Entries are sorted by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:247
 msgid "Equation Display"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:61
+msgid "Equation Editor"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1516
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1460
 msgid "Error adding set-level proctor: %1"
 msgstr ""
 
+#. ($fromPath, $toPath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:664
+msgid "Error copying %1 to %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:14
+msgid "Error details"
+msgstr ""
+
+#. ($filePath, stash('podError')
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:27
+msgid "Error generating POD for file %1: %2"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1492
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1437
 msgid ""
 "Error getting old set-proctor password from the database: %1.  No update to "
 "the password was done."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:31
 msgid "Error message:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2235
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:12
 msgid "Error messages"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1616
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:754
 msgid "Error: Answer date must come after close date in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:747
 msgid "Error: Close date must come after open date in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1634
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:778
 msgid ""
 "Error: Reduced scoring date must come between the open date and close date "
 "in set %1"
 msgstr ""
 
-#. ($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2067
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:7
 msgid "Error: The original file %1 cannot be read."
 msgstr ""
 
 #. ($setID)
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1240
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:738
 msgid "Error: answer date cannot be more than 10 years from now in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1235
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:733
 msgid "Error: close date cannot be more than 10 years from now in set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:630
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:234
 msgid "Error: no file data was submitted!"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1599
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:728
 msgid "Error: open date cannot be more than 10 years from now in set %1"
 msgstr ""
 
-#. ($problem_desc, $problem_name, CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1404
+#. ($problem_desc, $problem_name, $c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1210
 msgid ""
 "Errors encountered while processing %1. This %2 has been omitted from the "
 "hardcopy. Error text: %3"
 msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3832
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:8
+msgid "Errors occured while generating hardcopy:"
+msgstr ""
+
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2128
 msgid ""
 "Errors occured while hiding the courses listed below when attempting to "
 "create the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3920
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2197
 msgid ""
 "Errors occured while unhiding the courses listed below when attempting "
 "delete the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1468
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:28
 msgid "Evaluator File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3839
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:76
+msgid "Evaluator File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:28
+msgid "Evaluator Variables"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2143
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
-"hidden."
+"Except for the errors listed above, all selected courses are already hidden."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3904
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2212
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
+"Except for the errors listed above, all selected courses are already "
 "unhidden."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3456
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:39
 msgid ""
 "Existing addresses for the location are given in the scrolling list below.  "
 "Select addresses from the list to delete them:"
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2281
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1460
 msgid "Existing file %1 could not be backed up and was lost."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2514
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:354
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:65
 msgid "Expand All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:364
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:78
 msgid "Expand All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2667
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:418
 msgid "Expand Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2792
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:574
 msgid "Expand Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:74
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:89
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:67
+msgid ""
+"Expand problem details that have been collapsed. Note that the details of a "
+"single problem can be expanded by clicking on the down arrow to the right of"
+" the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:71
 msgid "Export"
 msgstr "Exportar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1098
-msgid "Export selected achievements."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:113
+msgid "Export achievement data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1267
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_export_form.html.ep:1
+msgid "Export selected achievements"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:17
 msgid "Export to what kind of file?"
 msgstr "¿Exportar a qué tipo de archivo?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:2
 msgid "Export which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1245
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:5
 msgid "Export which users?"
 msgstr "¿Qué usuarios exportar?"
 
 #. ($FileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1151
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:591
 msgid "Exported achievements to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1616
-msgid "Extend the close date for which Gateway?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:48
+msgid "Extend the close date for which test?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:148
+msgid "Extend the number of attempts allowed a student on a given problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1573
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:28
 msgid ""
-"Extends the close date of a gateway test by 24 hours. Note: The test must "
-"still be open for this to work."
+"Extends the close date of a test by 24 hours. Note: The test must still be "
+"open for this to work."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "FIRST NAME"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Failed to add user:"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:416
 msgid "Failed to create new achievement: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:373
 msgid "Failed to create new achievement: no achievement ID specified!"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:573
 msgid "Failed to create new set: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1158
-msgid "Failed to create new set: no set name specified!"
-msgstr "tr: Failed to create new set: no set name specified!"
+#. ($newSetID =~ s/_/ /gr)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:482
+msgid ""
+"Failed to create new set: Invalid characters in set name \"%1\". A set name "
+"may only contain letters, numbers, hyphens, periods, and spaces."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:474
+msgid "Failed to create new set: No set name specified."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1155
-msgid "Failed to create new set: set name cannot exceed 100 characters."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:469
+msgid "Failed to create new set: Set name cannot exceed 100 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:396
 msgid ""
 "Failed to duplicate achievement: no achievement selected for duplication!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:530
 msgid "Failed to duplicate set: no set selected for duplication!"
 msgstr "tr: Failed to duplicate set: no set selected for duplication!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:74
-msgid "Failed to enter student:"
+#. ($@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:67
+msgid "Failed to generate course archive: %1"
 msgstr ""
 
 #. ($scoreFilePath)
 #. ($filePath)
 #. ($FilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1125
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:649
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:955
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2402
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1584
 msgid "Failed to open %1"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:227
 msgid "Failed to save: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#. ($_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:253
+msgid "Failed to send message: %1"
+msgstr ""
+
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:23
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:36
 msgid "False"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1919
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:63
 msgid "Feature exhausted for this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:200
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:23
+msgid "Features:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:252
 msgid "Feedback"
 msgstr "Retroalimentación"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2159
+#: /opt/webwork/webwork2/conf/defaults.config:2070
 msgid "Feedback by Section."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:234
 msgid "FeedbackMessage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1177
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2113
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2284
 msgid "Field is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2109
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2286
 msgid "Field missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1175
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2111
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4290
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
 msgid "Field missing in schema"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:599
-msgid "File '%1' exists.  File not saved.  No changes have been made."
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:266
+msgid "File \"%1\" exists.  File not saved.  No changes have been made."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1926
-msgid ""
-"File '%1' exists. File not saved. No changes have been made.  You can change"
-" the file path for this problem manually from the 'Hmwk Sets Editor' page"
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1036
+msgid "File \"%1\" exists. File not saved. No changes have been made."
 msgstr ""
 
-#. ($file,$!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:796
-msgid "File '%1' not removed: %2"
+#. ($file, $!)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:333
+msgid "File \"%1\" not removed: %2"
 msgstr ""
 
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:795
-msgid "File '%1' successfully removed"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+msgid "File \"%1\" successfully removed"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1066
-msgid "File '%1' uploaded successfully"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:522
+msgid "File \"%1\" uploaded successfully"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:476
 msgid "File <b>%1</b> already exists. Overwrite it, or rename it as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:364
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:55
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:70
 msgid "File Manager"
 msgstr "Administrador de archivos"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:628
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:17
+msgid "File Manager Help"
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:541
+msgid "File not saved. Failed to open \"%1\" for writing."
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:528
+msgid ""
+"File not saved. The file \"%1\" is not contained in the templates directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:921
+msgid ""
+"File not saved. The file name for this problem does not match the file name "
+"the editor was opened with. The problem set may have changed. Please reopen "
+"this file from the homework sets editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:228
 msgid "File saved"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:733
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:272
 msgid "File successfully copied"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:758
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:295
 msgid "File successfully renamed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:29
 msgid "Filename"
 msgstr "Nombre de archivo"
 
-#. ($extension,$location)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1296
-msgid "Files with extension '.%1' usually belong in '%2'"
+#. ($extension, $location)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:699
+msgid "Files with extension \".%1\" usually belong in \"%2\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:20
+msgid ""
+"Fill out the form below to add, edit, or delete locations.  Locations are "
+"used to restrict access to sets based on ip address.  Locations are "
+"configured here in the administration course, then used in a normal course."
+"  When configuring a set to use a restricted ip address, the instructor can "
+"choose to either restrict access to the location or deny access from a "
+"location, which are identified by their name.  Instructors can select "
+"multiple locations to restrict access to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:78
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:47
 msgid "Filter"
 msgstr ""
 
 #. ($recitation)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1184
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1112
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1420
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:913
 msgid "Filter by recitation %1"
 msgstr ""
 
 #. ($section)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1180
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1416
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:910
 msgid "Filter by section %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:733
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:31
 msgid "Filter by what text?"
 msgstr "¿Qué texto usar para filtrar?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:151
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:17
 msgid "Filter:"
 msgstr "Filtrar:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:749
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:137
 msgid "First"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:593
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1992
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:827
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:856
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:885
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:914
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:87
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:21
 msgid "First Name"
 msgstr "Nombre"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:107
 msgid "First name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:178
 msgid ""
 "For security reasons, you cannot specify a message file from a directory "
 "higher than the email directory (you can't use ../blah/blah for example). "
 "Please specify a different file or move the needed file to the email "
-"directory"
+"directory."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2928
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:30
+msgid "Force editor to RTL"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:674
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:101
 msgid "Force problems to be numbered consecutively from one"
 msgstr "Hacer que los problemas queden numerados de forma consecutiva desde 1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:409
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:35
+msgid "Form Elements Present on the Page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:75
 msgid "Format"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2096
+#: /opt/webwork/webwork2/conf/defaults.config:2017
 msgid "Format for the subject line in feedback e-mails"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:172
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:133
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:10
 msgid "Format:"
 msgstr "Formato:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:12
 msgid "Found no directories containing problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1112
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:43
 msgid "From This Course"
 msgstr "De este curso"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:318
 msgid "From field must contain one valid email address."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:340
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:621
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:20
+msgid ""
+"From this page you can <strong>add new students</strong>, "
+"<strong>edit</strong> class list data (name, email address, recitation, "
+"section, permission level, and enrollment status), <strong>change "
+"passwords</strong>, and <strong>export</strong> (save) class lists for back-"
+"up or use in another course. You can also delete students from the class "
+"roster, but this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:34
 msgid "From:"
 msgstr "De:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:59
 msgid "GLOBAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1512
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1619
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1728
-msgid "Gateway Name"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:210
-msgid "Gateway Quiz %2"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:853
-msgid "Gateway parameters"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/conf/defaults.config:1427
 msgid "General"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2305
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:201
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:30
 msgid "General Information"
 msgstr "Información general"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:745
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:669
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:670
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:222
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:116
+msgid "General Page Information"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:121
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:166
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:167
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:113
 msgid "Generate Hardcopy"
 msgstr "Generar versión para imprimir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:262
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:73
 msgid "Generate Hardcopy for Selected Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:744
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:115
+msgid ""
+"Generate a hardcopy of the problem being edited. This does not change the "
+"permanent file on the disk. You can generate a hardcopy for different "
+"versions of the same problem by changing the seed. You can also change the "
+"format to \"PDF\" or \"TeX Source\". If \"PDF\" is selected, then a PDF file"
+" will be generated for download, unless there are errors. If errors occur or"
+" \"TeX Source\" is selected, then a zip file will be generated for download "
+"that contains the TeX source file and resources needed for generating the "
+"PDF file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:20
+msgid ""
+"Generate hardcopies of assignments in PDF or latex format. To produce a "
+"hardcopy, one selects the users on the left and the sets on the right. All "
+"users and sets are listed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:170
 msgid "Generate hardcopy for selected sets and selected users"
 msgstr "Generar versión para imprimir de las tareas y los estudiantes seleccionados"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:184
-#: /opt/webwork/pg/macros/problemRandomize.pl:185
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:186
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:187
 msgid "Get a new version of this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:986
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:2
 msgid "Give new password to which users?"
 msgstr "¿Dar una nueva contraseña a qué usuarios?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1063
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:27
 msgid "Gives full credit on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1180
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:27
 msgid "Gives full credit on every problem in a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:846
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:27
 msgid "Gives half credit on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:27
 msgid "Gives half credit on every problem in a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:62
 msgid "Global Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1422
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:76
 msgid "Global Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:49
 msgid "Global Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:51
 msgid ""
 "Global data on problem usage is contributed by many institutions using "
 "WeBWorK all over the world. The Usage figure is the total number of  "
@@ -3132,198 +4123,324 @@ msgid ""
 msgstr ""
 
 #. ($problemID, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1549
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1489
 msgid "Global problem %1 for set %2 not found."
 msgstr ""
 
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:334
+#. ($c->{prettyID}, $c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:378
+msgid "Global problem %1 not found for set %2."
+msgstr ""
+
+#. ($c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:142
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:372
 msgid "Global set %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2093
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:77
 msgid "Global set data will be shown instead of user specific data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:28
 msgid "Go"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:483
 msgid "Go back to Part 1"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:291
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
-#: /opt/webwork/pg/macros/compoundProblem.pl:491
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:293
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:498
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:512
 msgid "Go on to next part"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2651
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:544
 msgid "Grade"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2649
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:383
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:970
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:541
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:75
 msgid "Grade Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2446
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:651
 msgid "Grade Test"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:148
+msgid "Grade of Active Students"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:55
 msgid "Grade passback mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:837
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:38
 msgid "Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:236
 msgid "Grades"
 msgstr "Calificaciones"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:110
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:17
+msgid "Grades Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:115
 msgid "Grades have been saved for all current users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:221
-msgid "Grading assignment:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:28
+msgid "Grading Assignment"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:152
+msgid "Grading Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1062
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:26
 msgid "Greater Rod of Revelation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1179
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:26
 msgid "Greater Tome of Enlightenment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:285
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:50
+msgid ""
+"Groups types of achievements. The \"level\" and \"secret\" categories are "
+"special (described above), and categories can be used to create achievement "
+"chains."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:74
 msgid "Guest Login"
 msgstr "Iniciar como invitado"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2251
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:86
+msgid "Guest:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:33
 msgid "HTTP Headers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:682
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:35
+msgid "Hardcopy Format"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:115
 msgid "Hardcopy Format:"
 msgstr "Formato de versión para imprimir:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:270
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:285
 msgid "Hardcopy Generator"
 msgstr "Generador de versiones para imprimir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:101
 msgid "Hardcopy Header"
 msgstr "Encabezado de la versión para imprimir"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1623
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:724
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:324
+msgid "Hardcopy Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:17
+msgid "Hardcopy Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:153
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:44
 msgid "Hardcopy Theme"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:408
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:427
 msgid "Hardcopy will always print the original version of the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:31
 msgid "Headers"
 msgstr "Encabezados"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1048
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:296
 msgid "Help"
 msgstr "Ayuda"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:797
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:170
 msgid "Help Icon"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:542
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:30
+msgid ""
+"Here is a list of the variables the evaluator has access to. Unless "
+"indicated, changes to the variables will not be saved.  Evaluators are run "
+"in the same order they are listed on the achievement editor page and are "
+"only run if the achievement has not been earned. Keep this in mind when "
+"using persistent global data."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:507
 msgid "Here is a new version of your problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:914
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:42
 msgid "Hidden"
 msgstr "tr: Hidden"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:347
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:62
 msgid "Hide All"
 msgstr "Ocultar todos"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3663
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3718
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3760
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:384
-msgid "Hide Courses"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:17
+msgid "Hide Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:428
-msgid "Hide Hints"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:57
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:44
+msgid "Hide Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:477
 msgid "Hide Hints from Students"
 msgstr "No mostrar pistas a los estudiantes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1566
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:63
+msgid "Hide all rendered problems on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:252
 msgid "Hide this problem"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1523
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1524
 msgid "Hint:"
 msgstr "Pista:"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1522
 msgid "Hint: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:658
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1771
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:99
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:51
 msgid "Hints"
 msgstr "Pistas"
 
 # Hmwk is short for Homework
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:364
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:327
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:44
 msgid "Hmwk Sets Editor"
 msgstr "Editor de tareas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:779
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:80
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:108
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:19
 msgid "Homework Sets"
 msgstr "Tareas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:38
 msgid "Homework Totals"
 msgstr "Totales de la tarea"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1432
-msgid "I couldn't find the file [ACHEVDIR]/surprise_message.txt!"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:17
+msgid "Homwork Sets Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:88
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:31
+msgid "How to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1451
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:36
+msgid "I couldn't find the file [ACHIEVEMENT_DIR]/surprise_message.txt!"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:9
 msgid "Icon"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:29
 msgid "Icon File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:612
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:80
+msgid "Icon File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:24
+msgid ""
+"If \"PDF\" is selected, then a PDF file will be generated for download, "
+"unless there are errors.  If errors occur generating a PDF file or \"TeX "
+"Source\" is selected then a zip file will be generated for download that "
+"contains the TeX source file and resources needed for generating the PDF "
+"file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:37
+msgid ""
+"If \"TeX Source\" is selected, a zip file containing a TeX file and other "
+"files needed to generate a PDF hardcopy will be produced. If \"Adobe PDF\" "
+"is selected then only a PDF file will be produced."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:84
 msgid ""
 "If a password field is left blank, the student's current password will be "
 "maintained."
 msgstr "tr: If a password field is left blank, the student's current password will be maintained."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:42
+msgid ""
+"If selected, the file path of the problem source will be printed in the "
+"output."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:38
+msgid ""
+"If selected, this adds spaces between the fields to align the commas, which "
+"makes the columns easy to read when in text form but it can confuse some "
+"spreadsheet applications since the extra spaces violate the csv standard "
+"(although Excel handles them with no problem). This will give a visual form "
+"of the CSV file that is easy to read on the page. If you want a reliable "
+".csv file for use in any spreadsheet application unclick the \"Pad Fields\" "
+"option. You can download the .csv file immediately by clicking on the link "
+"with the filename chosen above, or you can download it using the \"File "
+"Manager\" from the scoring directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:148
+msgid ""
+"If the original problem can not be edited than the path name must be changed"
+" in order to be allowed to save the problem. Adding \"local/\" to the "
+"beginning of the original path is the default solution. All locally created "
+"and edited files will then appear in a subdirectory named \"local\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:513
 msgid ""
 "If this flag is set then this problem will count towards the grade of its "
 "parent problem.  In general the adjusted status on a problem is the larger "
@@ -3331,20 +4448,28 @@ msgid ""
 "problems which have this flag enabled."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
 msgid ""
 "If this is enabled then instructors with the ability to receive feedback "
 "emails will be notified whenever a student runs out of attempts on a problem"
-" and its children without receiving an adjusted status of 100%."
+" and its children  without receiving an adjusted status of 100%."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:334
 msgid ""
 "If this is enabled then students will be unable to attempt a problem until "
 "they have completed all of the previous problems, and their child problems "
 "if necessary."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:57
+msgid ""
+"If this is selected, a success index is listed in each csv file. The success"
+" index is a number assigned on the basis of the number of incorrect attempts"
+" (roughly equivalent to 1/the number of attempts) which seems to correlate "
+"with the relative difficulty the student had with the problem."
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:47
 msgid ""
 "If this is set, all users (including the instructor) must enter the WeBWorK "
@@ -3352,8 +4477,8 @@ msgid ""
 "they receive a message directing them back to the LMS."
 msgstr ""
 
-#. (CGI::b($r->maketext("Remember Me")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:201
+#. (tag('strong', maketext('Remember Me')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:33
 msgid ""
 "If you check %1 your login information will be remembered by the browser you"
 " are using, allowing you to visit WeBWorK pages without typing your user "
@@ -3362,273 +4487,419 @@ msgid ""
 " have direct control."
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:407
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:154
+msgid ""
+"If you click on the \"Grade Problem\" icon to the right of the problem "
+"number, then the problem will open in the manual problem grader. This page "
+"shows the rendered problem and lists all students assigned to the set and "
+"the last answer the students entered for the problem. You can then change "
+"the recorded scores for students on this problem and provide instructor "
+"feedback comments."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:148
+msgid ""
+"If you click on the \"Open in New Window\" icon to the right of the problem "
+"number, then the problem will open in the actual homework set in a new tab "
+"or window."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:425
 msgid "If you come back to it later, it may revert to its original version."
 msgstr ""
 
+#. ('<code>report_grades_data.csv</code>', '<code>report_grade.msg</code>',
+#. '<code>$COL</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:80
+msgid ""
+"If you upload your file on the web with the name: %1 and also create an "
+"email message with the name %2 with the approriate %3 variables then not "
+"only can you email the message with the embedded grades to the students, but"
+" files with those exact names are automatically appended to the \"Grades\" "
+"page seen by the students."
+msgstr ""
+
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:798
-msgid "Illegal file '%1' specified"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:337
+msgid "Illegal file \"%1\" specified"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1445
 msgid "Illegal filename contains '..'"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:73
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:63
 msgid "Import"
 msgstr "Importar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1291
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:65
+msgid ""
+"Import a single set or multiple sets from a set definition file. (Use the "
+"\"File Manager\" to upload/download set definition files.) The \"Shift "
+"Dates...\" option is useful for problem sets that were used from other "
+"courses and will shift all of the dates."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:16
 msgid "Import from where?"
 msgstr "tr: Import from where?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1270
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:5
 msgid "Import how many sets?"
 msgstr "tr: Import how many sets?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:31
 msgid "Import sets with names"
 msgstr "tr: Import sets with names"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:5
 msgid "Import users from what file?"
 msgstr "¿Importar usuarios de qué archivo?"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:99
+msgid "Import/export achievements"
+msgstr ""
+
 #. ($count)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:516
 msgid "Imported %quant(%1,achievement)"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:25
+msgid ""
+"In both cases, one can select the sort field, the format of the display "
+"list, and the filter. \"Change Display Settings\" must be clicked to update "
+"the list."
+msgstr ""
+
 #. ($total_inprogress, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1019
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:28
 msgid "In progress: %1/%2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:47
 msgid "Inactive"
 msgstr "tr: Inactive"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1601
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:51
+msgid "Inactive Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1503
 msgid "Inactivity time before a user is required to login again"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:42
 msgid "Include Contrib"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:35
 msgid "Include OPL"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:32
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:55
 msgid "Include Success Index"
 msgstr "Incluir índice de éxito"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:62
 msgid "Include percentage grades columns for all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:471
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:302
 msgid "Incorrect"
 msgstr "incorrecto"
 
 #. ($total_incorrect, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1033
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:36
 msgid "Incorrect: %1/%2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:26
+msgid ""
+"Indicates the number of problems in the set. Clicking on the link opens the "
+"set detail page which allows you to modify set parameters, edit set headers,"
+" and change parameters of problems in the set such as the number of allowed "
+"attempts or the weight (credit value). You can also add, remove, view, edit,"
+" and reorder the problems in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:141
+msgid "Individual Problem Results"
+msgstr ""
+
 # Short for Initial
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:41
 msgid "Init"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:502
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:35
 msgid "Institution"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2344
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:560
 msgid "Instructor Comment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1494
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1306
 msgid "Instructor Feedback:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:311
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:17
+msgid "Instructor Links Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:29
 msgid "Instructor Tools"
 msgstr "Herramientas del instructor"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1228
-msgid "Instructor solution preview: show the student solution after due date."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:17
+msgid "Instructor Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:90
+msgid "Instructor:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:377
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:326
 msgid "Invalid Reply-to address."
 msgstr ""
 
 #. ($output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:187
 msgid ""
-"Invalid file name. The file name \"%1\" does not have a \".msg\" extension "
-"All email file names must end in the extension \".msg\" choose a file name "
-"with a \".msg\" extension. The message was not saved."
+"Invalid file name \"%1\". All email file names must end with the \".msg\" "
+"extension.  Choose a file name with the \".msg\" extension. The message was "
+"not saved."
 msgstr ""
 
 #. ($headerType)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1951
 msgid "Invalid headerType %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:177
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/XMLRPC.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:173
 msgid "Invalid user ID or password."
 msgstr "Usuario o contraseña inválidos."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2244
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:34
+msgid ""
+"It is important that students enter an email address or they will not "
+"recieve any of the important emails sent by the instructor. The email "
+"address will only be present on the page if the user has permission to "
+"change the email address."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:20
+msgid "It lists the homework problem sets available for the students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:472
 msgid "Jump to Problem:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:867
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:939
 msgid "Just-In-Time parameters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:130
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:85
+msgid "Key Map"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:14
 msgid "Key Map:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:93
 msgid "Keywords:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "LAST NAME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1477
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:119
 msgid "LOCAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:100
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:103
 msgid "LTI"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1548
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:25
+msgid "LTI Grade Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:460
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:75
+msgid "LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:17
+msgid "LTI Grade Update Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:16
+msgid "LTI grade passback is not enabled for this course"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:63
+msgid "LTI update of all users and sets queued."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:64
+msgid "LTI update of all users queued."
+msgstr ""
+
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:58
+msgid "LTI update of set %1 queued."
+msgstr ""
+
+#. ($userID, $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:56
+msgid "LTI update of user %1 and set %2 queued."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:60
+msgid "LTI update of user %1 queued."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1450
 msgid "Language (refresh page after saving changes to reveal new language.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:758
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:140
 msgid "Last"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:460
 msgid "Last Answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:604
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:231
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2001
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:828
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:857
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:915
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:31
+msgid "Last Full Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:25
 msgid "Last Name"
 msgstr "Apellido"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:792
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:115
 msgid "Last column of merge file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:785
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:108
 msgid "Last name"
 msgstr "Apellido"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:242
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:237
 msgid "Latest Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1603
+#: /opt/webwork/webwork2/conf/defaults.config:1505
 msgid ""
 "Length of time, in seconds, a user has to be inactive before he is required "
-"to login again.<p>This value should be entered as a number, so as 3600 "
-"instead of 60*60 for one hour"
+"to login again. This value should be entered as a number, so as 3600 instead"
+" of 60*60 for one hour."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:845
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:26
 msgid "Lesser Rod of Revelation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:965
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:26
 msgid "Lesser Tome of Enlightenment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:141
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:15
 msgid "Level Progress:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:881
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:77
 msgid "Level:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:912
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2060
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:433
-msgid "Library Browser"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:17
+msgid "Library Broswer Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:359
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:52
+msgid "Library Browser"
 msgstr "Explorador de problemas"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1977
-msgid "List of display modes made available to students"
+#. ($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:30
+msgid "Link to Edit Page for %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2130
-msgid ""
-"List of e-mail addresses to which e-mail can be sent by a problem. "
-"Professors need to be added to this list if questionaires are used, or other"
-" WeBWorK problems which send e-mail as part of their answer mechanism."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:25
+msgid "Links to pages that give information about writing problems:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1879
+msgid "List of display modes made available to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:759
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:774
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:89
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:96
 msgid "List of insertable macros"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1826
+#: /opt/webwork/webwork2/conf/defaults.config:1728
 msgid "List of options for Show Me Another button"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1713
+#: /opt/webwork/webwork2/conf/defaults.config:1615
 msgid "List of sets excluded from achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1483
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:56
+msgid "Live equation rendering"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:144
+msgid "Loading..."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:122
 msgid "Local Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:41
 msgid "Local Problems"
 msgstr "Problemas locales"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1504
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:136
 msgid "Local Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:105
 msgid "Local Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1467
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:114
 msgid ""
 "Local data is generated when your systems admin runs the script update-OPL-"
 "statistics."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1460
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:107
 msgid ""
 "Local data on problem usage is generated and maintained by your institution."
 " The Usage figure is the total number of local individuals who have attemped"
@@ -3637,42 +4908,61 @@ msgid ""
 "likely bug free."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:115
 msgid "Location"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3501
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1854
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1890
 msgid ""
 "Location %1 does not exist in the WeBWorK database.  Please check your input"
 " (perhaps you need to reload the location management page?)."
 msgstr ""
 
 #. ($locationID, join(', ', @addresses)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1742
 msgid "Location %1 has been created, with addresses %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3353
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1798
 msgid "Location deletion requires confirmation."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3409
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:43
 msgid "Location description:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3089
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:37
 msgid "Location name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:159
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:27
+msgid ""
+"Locations are a list of ip addresses.  Ip addresses can be a single address "
+"(e.g. 192.168.1.101), a range of ip address (e.g. "
+"192.168.1.101-192.168.1.150), or an ip address mask (e.g. 192.168.1.0/24). "
+"Enter one ip address per line, using as many lines as needed for each "
+"location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:32
+msgid ""
+"Locations are edited by adding new ip addresses to the location, or deleting"
+" existing address.  You must select the confirm checkbox when deleting a "
+"location, and this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:43
+msgid "Locations of files:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:18
 msgid "Log In Again"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1124
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:11
 msgid "Log Out"
 msgstr "Salir"
 
@@ -3680,368 +4970,456 @@ msgstr "Salir"
 #. ($rename_oldCourseID)
 #. ($rename_newCourseID)
 #. ($new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1458
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1541
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2666
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:913
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:704
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:780
 msgid "Log into %1"
 msgstr ""
 
-#. (HTML::Entities::encode_entities($prettyUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1122
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1130
+#. ($userName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:9
 msgid "Logged in as %1."
 msgstr "Sesión iniciada como %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:790
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:181
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:187
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:113
 msgid "Login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:58
 msgid "Login Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:187
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:815
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1980
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:291
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:855
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:884
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:913
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:36
 msgid "Login Name"
 msgstr "Nombre de usuario"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:18
 msgid "Login Status"
 msgstr "Estado de usuario"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:6
+msgid "Login:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:225
 msgid "Logout"
 msgstr "Salir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Macro"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:763
-msgid "Main Menu"
-msgstr "Menú Principal"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:97
+msgid ""
+"Macro (\".pl\") files containing additional functionality for your course "
+"can be stored here."
+msgstr ""
+
+#. ($filePath)
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:29
+msgid "Macro file %1 not found."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:369
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:46
 msgid "Make Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:27
 msgid "Make changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1115
-msgid "Make these changes in  course:"
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:15
+msgid "Make these changes in course: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:137
+msgid ""
+"Makes a new copy of the file you are editing at the location relative to the"
+" course's templates ([TMPL]) directory. You may choose to replace the "
+"current problem in the current set, append to the end to then end of the "
+"current set as a new problem, or create a problem that is not attached to a "
+"problem set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3040
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:1
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:46
 msgid "Manage Locations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:748
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:394
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:17
+msgid "Manage Locations Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:20
+msgid ""
+"Manage achievements for the course.  The actions allow one to edit, assign, "
+"import, export, score, create, or delete achievements.  The action form is "
+"at the top to select the desired action and options to perform when the "
+"submit button is pressed.  Below the action form is the list of all the "
+"achievements, ordered by their achievement \"Number\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:56
+msgid "Manage administration course files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:50
+msgid ""
+"Manage instructors.  When instructors are added to a newly created course, "
+"they are also added to the admin course with username \"userID_courseID\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:344
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:192
 msgid "Manual Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:233
-msgid "Mark All"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:17
+msgid "Manual Grader Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr',
+#. format_set_name_display($c->stash->{set}->set_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:205
+msgid "Manual Grader for %1: Problem %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:77
+msgid ""
+"Manually initiate an LTI grade passback for selected sets or users. This "
+"link is only visible if LTI grade passback is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:175
+msgid ""
+"Many of these editing activities can also be done more quickly from the "
+"\"Instructor Tools\" page where students and homework sets can be selected "
+"simultaneously. The \"Instructor Tools\" page is useful for quick editing of"
+" one or two students. The initial setup of the class can be done best from "
+"this page. Importing and exporting class lists can only be done from this "
+"page. Deleting students can only be done from this page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:120
 msgid "Mark Correct"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2822
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:598
 msgid "Mark Correct?"
 msgstr "¿Marcar como correcta?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:681
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:19
 msgid "Match on what? (separate multiple IDs with commas)"
 msgstr "¿Qué IDs buscar? (usa comas para separar los IDs)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:499
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:85
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:36
 msgid "Math Objects"
 msgstr "MathObjects"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:327
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:377
 msgid "Max attempts"
 msgstr "Máx. número de intentos"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:380
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:24
 msgid "Max. Shown:"
 msgstr "Mostrar máximo:"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1817
+#: /opt/webwork/webwork2/conf/defaults.config:1719
 msgid ""
 "Maximum times Show me Another can be used per problem (-1 => unlimited)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:606
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:4
+msgid "Merge file data:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:24
 msgid "Merge file:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:288
 msgid "Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:578
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:13
 msgid "Message file:"
 msgstr ""
 
-#. ($emailDirectory, $output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:357
-msgid "Message saved to file <code>%1/%2</code>."
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:300
+msgid "Message saved to file %1."
 msgstr ""
 
-#. ($recipient, $ur->email_address)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:995
+#. ($recipient, $user_record->email_address)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:98
 msgid "Message sent to %1 at %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2249
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2324
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:121
+msgid "Message was blank."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:48
+msgid ""
+"Messages can be saved to a message file (which must end in the \".msg\" "
+"extension).  Use the \"Message file\" drop down menu to select which message"
+" file to load, or \"None\" to use a blank message. To save a new message, "
+"use the \"Save as\" button after entering in a valid filename.  The \"Save "
+"as\" button will not overwrite currently saved messages.  To edit a "
+"currently saved message first select it using the drop down menu, then click"
+" the \"Save\" button to save any changes.  Use the \"File Manager\" to "
+"delete messages, located in the \"[TMPL]/email\" directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:22
 msgid "Method"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3284
+#: /opt/webwork/webwork2/conf/defaults.config:2003
+msgid "Method to enter problem scores in the single problem manual grader"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1668
 msgid ""
 "Missing required input data. Please check that you have filled in all of the"
 " create location fields and resubmit."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1555
+#: /opt/webwork/webwork2/conf/defaults.config:1457
 msgid ""
 "Mode in which the LANG and DIR settings for a single problem are determined."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1557
-msgid ""
-"Mode in which the LANG and DIR settings for a single problem are "
-"determined.<p>The system will set the LANGuage attribute to either a value "
-"determined from the problem, a course-wide default, or the system default, "
-"depending on the mode selected. The tag will only be added to the DIV "
-"enclosing the problem if it is different than the value which should be set "
-"in the main HTML tag set for the entire course based on the course "
-"language.<p>There are two options for the DIRection attribute: \"ltr\" for "
-"left-to-write sripts, and \"rtl\" for right-to-left scripts like Arabic and "
-"Hebrew.<p>The DIRection attribute is needed to trigger proper display of the"
-" question text when the problem text-direction is different than that used "
-"by the current language of the course. For example, English problems from "
-"the library browser would display improperly in RTL mode for a Hebrew "
-"course, unless the problen Direction is set to LTR.<p>The feature to set a "
-"problem language and direction was only added in 2018 to the PG language, so"
-" most problems will not declare their language, and the system needs to fall"
-" back to determining the language and direction in a different manner. The "
-"OPL itself is all English, so the system wide fallback is to en-US in LTR "
-"mode.<p>Since the defaults fall back to the LTR direction, most sites should"
-" be fine with the \"auto::\" mode, but may want to select the one which "
-"matches their course language. The mode \"force::ltr\" would also be an "
-"option for a course which runs into trouble with the \"auto\" "
-"modes.<p>Modes:<br><ul><li>\"none\" prevents any additional LANG and/or DIR "
-"tag being added. The browser will use the main setting which was applied to "
-"the entire HTML page. This is likely to cause trouble when a problem of the "
-"other direction is displayed.</li><li>\"auto::\" allows the system to make "
-"the settings based on the language and direction reported by the problem (a "
-"new feature, so not set in almost all existing problems) and falling back to"
-" the expected default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" "
-"allows the system to make the settings based on the language and direction "
-"reported by the problem (a new feature, so not set in almost all existing "
-"problems) but falling back to the language with the given LangCode and the "
-"direction Dir when problem settings are not available from "
-"PG.</li><li>\"auto::Dir\" for problems without PG settings, this will use "
-"the default en=english language, but force the direction to Dir. Problems "
-"with PG settings will get those settings.</li><li>\"auto:LangCode:\" for "
-"problems without PG settings, this will use the default LTR direction, but "
-"will set the language to LangCode.Problems with PG settings will get those "
-"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
-" by the PG code of the problem, and will force the system to set the "
-"language with the given LangCode and the direction to Dir for <b>all</b> "
-"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
-"PG code of the problem, and will force the system to set the direction to "
-"Dir for <b>all</b> problems, but will avoid setting any language attribute "
-"for individual problem.</li></ul>"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2695
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:443
 msgid "Move"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2231
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:457
 msgid "Move to Page:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2226
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:452
 msgid "Move to Problem:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:26
+msgid ""
+"Multiple sets may be assigned to the users by holding down the shift key or "
+"the ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:27
+msgid ""
+"Multiple users or sets may be selected by holding down the shift key or the "
+"ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:36
 msgid "My Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1412
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:26
 msgid "Mysterious Package (with Ribbons)"
 msgstr ""
 
 # Short for Number of Fields
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:213
 msgid "NO OF FIELDS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1484
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:741
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:113
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:135
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:29
 msgid "Name"
 msgstr "Nombre"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:174
 msgid "Name for new set here"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1528
+#: /opt/webwork/webwork2/conf/defaults.config:1430
 msgid "Name of course information file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1107
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:77
+msgid "Name of the evaluator file used to evaluate the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:81
+msgid "Name of the image used for the achievement icon."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:4
 msgid "Name the new set"
 msgstr "Nombre de la nueva tarea"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1691
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:45
+msgid "Name:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:29
 msgid "Necromancers Charm"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:343
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:205
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:393
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:35
 msgid "Never"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:371
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:54
 msgid "New File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:372
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:55
 msgid "New Folder"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:30
 msgid "New Name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2067
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:3
 msgid "New Password"
 msgstr "Nueva contraseña"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:131
-msgid "New Version"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+msgid "New Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
 msgid "New file name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
 msgid "New folder name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:577
 msgid "New passwords saved"
 msgstr "tr: New passwords saved"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1078
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:36
 msgid "New set name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1357
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1010
 msgid "Next Problem"
 msgstr "Problema siguiente"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1181
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2164
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:40
+msgid "Next Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:98
 msgid "Next page"
 msgstr "Siguiente página"
 
-#. ($self->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:620
+#. (% $c->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:142
 msgid "Next test will be available by %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2452
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:134
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:144
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:183
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:483
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:510
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:142
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:68
 msgid "No"
 msgstr "No"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:635
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:116
 msgid "No Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2324
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:216
 msgid "No Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:117
+msgid "No Sender specified."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:23
 msgid "No Target Set Selected"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:335
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:38
 msgid "No achievement badges have been assigned yet."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1521
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:77
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:37
 msgid "No achievements shown.  Create an achievement!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:90
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:2
+msgid "No achievements shown.  Select an achievement to edit!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:61
 msgid "No action taken"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:141
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:140
 msgid ""
 "No authentication method found for your request.  If this recurs, please "
 "speak with your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:940
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:361
 msgid "No change made to any set"
 msgstr "tr: No change made to any set"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
 msgid ""
 "No changes specified.  You must mark the checkbox of the item(s) to be "
 "changed and enter the change data."
@@ -4051,1379 +5429,1811 @@ msgstr ""
 msgid "No changes were saved!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2462
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:50
 msgid "No course archives found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2898
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:32
 msgid "No course id defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1561
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:932
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:67
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:76
 msgid "No courses found"
 msgstr ""
 
 #. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:593
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:675
 msgid "No data exists for set %1 and problem %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:10
+msgid "No e-mail recipients are listed for this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:169
 msgid "No filename was specified for saving!  The message was not saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:340
 msgid "No guest logins are available. Please try again in a few minutes."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3522
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1877
 msgid "No location specified to edit. Please check your input data."
 msgstr ""
 
 #. ($badID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1788
 msgid "No location with name %1 exists in the database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3206
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:149
 msgid "No locations are currently defined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:342
 msgid "No merge data file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:612
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:18
+msgid "No merge data found"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:164
+msgid "No merge data found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:8
+msgid "No merge file selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:135
 msgid "No more tests available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:270
 msgid ""
 "No new Achievement ID specified.  No new achievement created.  File not "
 "saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:63
 msgid "No problems matched the given parameters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:25
+msgid "No recipients selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:334
 msgid ""
 "No recipients selected. Please select one or more recipients from the list "
 "below."
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2044
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:49
 msgid "No record for global set %1."
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2046
-msgid "No record for user %1."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
 msgid "No record found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1166
-msgid "No set created."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:12
 msgid "No sets in this course yet"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1010
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:159
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
 msgid "No sets selected for scoring"
 msgstr "tr: No sets selected for scoring"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2764
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:46
 msgid ""
 "No sets shown.  Choose one of the options above to list the sets in the "
 "course."
 msgstr "tr: No sets shown.  Choose one of the options above to list the sets in the course."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1942
 msgid "No source filePath specified"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1327
 msgid "No source_file for problem in .def file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2099
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:87
 msgid ""
-"No students shown.  Choose one of the options above to list the students in "
+"No students shown. Choose one of the options above to list the students in "
 "the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:246
 msgid "No submissions. Over time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:278
 msgid "No tests taken."
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:594
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:676
 msgid "No user specific data exists for user %1"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2031
 msgid "No valid changes submitted for location %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:275
-msgid "No versions of this assignment have been taken."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:771
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:263
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:241
 msgid "No versions of this test have been taken."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:562
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:252
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:17
 msgid "None"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:681
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2463
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:763
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:52
 msgid "None Specified"
 msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2089
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:73
 msgid "None of the selected users are assigned to this set: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:33
 msgid "Not logged in."
 msgstr "No ha iniciado sesión"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1569
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:4
 msgid "Note"
 msgstr "Nota"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:381
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:55
+msgid ""
+"Note that if there are errors, they will be shown at the top of the page. In"
+" some cases, a hard copy is still generated and a link called \"Download "
+"Hardcopy\" appears. In addition, the latex file, log and error files are "
+"generated which can be used in troubleshooting."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:93
+msgid ""
+"Note that if you set the permission level of a user to something other than "
+"\"Student\", you may also want to set the status of the user to "
+"\"Observer\".  Users with the \"Observer\" status are not included in "
+"statistics, scoring, or instructor emails."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:28
+msgid ""
+"Note that some settings require an additional page load after \"Save "
+"Changes\" is clicked in order to take effect.  This is true for a theme "
+"change for example."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:396
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:422
 msgid "Note:"
 msgstr "Nota:"
 
-#. (CGI::i($pg->{result}{msg})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2350
+#. (tag('i', maketext('You are in the Reduced Scoring Period.  All work counts
+#. for [_1]% of the original.',
+#. $ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#. (tag('i', $pg->{result}{msg})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:572
 msgid "Note: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2482
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:686
 msgid ""
 "Note: grading the test grades all problems, not just those on this page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1460
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1485
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:768
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:59
+msgid "Now"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:19
 msgid "Number"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:242
 msgid "Number of Graded Submissions per Test (0=infty)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
 msgid "Number of Problems per Page (0=all)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:95
+msgid "Number of Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:257
 msgid "Number of Tests per Time Interval (0=infty)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1833
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2435
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:54
+msgid "Number:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1181
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:912
 msgid "OK"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1464
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:17
+msgid "OPL Problem Levels Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:26
 msgid "Oil of Cleansing"
 msgstr ""
 
+#. ('<code>pdflatex</code>', '<code>hardcopy.tex</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:49
+msgid ""
+"Once \"Generate Hardcopy for selected sets and selected users\" is clicked a"
+" file in the selected hardcopy format will be generated and offered for "
+"download. If PDF output was selected, a single PDF file is generated. If TeX"
+" output is selected, a zip file is generated that contains all files needed "
+"to generated the hardcopy PDF file via %1. The main TeX file is called %2."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:84
 msgid "One Column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:314
+msgid "Only Start"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:289
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:303
 msgid "Only after set answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1892
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:87
+msgid ""
+"Only present for JITAR sets. Collapse JITAR nesting problem groups to the "
+"top row of information about a problem. Note that the nesting of a single "
+"problem group can be collapsed by clicking on the down arrow to the right of"
+" the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:80
+msgid ""
+"Only present for JITAR sets. Expand JITAR nested problem groups that have "
+"been collapsed. Note that the nesting of a single problem group can be "
+"expanded by clicking on the right arrow to the right of the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1794
 msgid ""
 "Only this permission level and higher get buttons for sending e-mail to the "
 "instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:39
 msgid "Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:422
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:763
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:810
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:62
 msgid "Open Date"
 msgstr "Fecha de disponibilidad"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1098
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:42
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:32
 msgid "Open Problem Library"
 msgstr "OpenProblemLibrary"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2417
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:272
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:525
 msgid "Open in New Window"
 msgstr "Abrir en una nueva ventana"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1263
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1617
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:29
 msgid "Open in new window"
 msgstr "Abrir en una nueva ventana"
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:491
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:320
 msgid "Open, closes %1."
 msgstr "Disponible, cierra el %1."
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:489
-msgid "Open, complete by %1."
-msgstr ""
-
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:300
 msgid "Open, due %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:433
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
 msgid "Open."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:431
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:268
 msgid "Open. Submitted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:31
 msgid "Open:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:115
 msgid "Opens"
 msgstr "Disponible el"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:27
 msgid "Opens any homework set for 24 hours."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1686
+#: /opt/webwork/webwork2/conf/defaults.config:1588
 msgid "Optional Modules"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:265
 msgid "Order Problems Randomly"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:50
+msgid "Other Options"
+msgstr ""
+
 # Context is "7 Out Of 10"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:405
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:777
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:150
 msgid "Out Of"
 msgstr "De un total de"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1024
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:85
+msgid "Overall Results"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:93
+msgid "Overall Set Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:122
+msgid "Overall Success Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:470
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:481
 msgid "Overwrite"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:437
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:100
 msgid "Overwrite existing files silently"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:41
+msgid "PDF"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:69
 msgid "PG Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:827
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer.html.ep:1
+msgid "PG POD"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:17
+msgid "PG Problem Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:708
 msgid "PG debug messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:829
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:716
 msgid "PG internal errors"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:818
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:109
+msgid ""
+"PG markdown syntax used to format WeBWorK questions. This interactive lab "
+"can help you to learn the techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:692
 msgid "PG question failed to render"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:826
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:706
 msgid "PG question processing error messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:828
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:712
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:128
 msgid "PG warning messages"
 msgstr ""
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:511
-msgid "PGLab"
-msgstr "PGLab"
-
-# Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:98
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:47
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:58
 msgid "PGML"
 msgstr "PGML"
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:91
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:40
 msgid "POD"
 msgstr "Documentación POD"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2309
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2249
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:200
+msgid "POD Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:208
+msgid "POD Viewer"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1515
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:526
 msgid "PREVIEW ONLY -- ANSWERS NOT RECORDED"
 msgstr "VISTA PREVIA -- NO SE HAN GUARDADO TUS RESPUESTAS"
 
 # Problem Number
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:215
 msgid "PROB NUMBER"
 msgstr ""
 
 # Problem Value
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:218
 msgid "PROB VALUE"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:205
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:36
 msgid "Pad Fields"
 msgstr "tr: Pad Fields"
 
-#. (timestamp($self)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1255
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:28
+msgid "Page Contents"
+msgstr ""
+
+#. ($c->timestamp)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:1
 msgid "Page generated at %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:568
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:81
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:71
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:56
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:25
 msgid "Password"
 msgstr "Contraseña"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:976
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:13
 msgid "Password (Leave blank for regular proctoring)"
 msgstr ""
 
-#. ($studentUser, CGI::span({ dir => 'ltr' },
-#. format_set_name_display($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:498
+#. ($studentUser, tag('span', dir => 'ltr', format_set_name_display($setName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:13
 msgid "Past Answers for %1, set %2, problem %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:8
 msgid "Percent"
 msgstr "Porcentaje"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:562
-msgid "Percentage of Active Students with Correct Answers"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:94
+msgid "Percent Ranges"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+msgid "Percent Score"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:535
+msgid "Percent of Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:788
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:206
 msgid ""
 "Percentile cutoffs for number of attempts. The 50% column shows the median "
 "number of attempts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2056
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:834
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:863
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:921
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:58
+msgid ""
+"Percentile cutoffs for student's score and success index. The 50% column "
+"shows the median number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:50
 msgid "Permission Level"
 msgstr "Nivel de permisos"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1869
+#: /opt/webwork/webwork2/conf/defaults.config:1771
 msgid "Permissions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1052
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:24
 msgid "Pick a target set above to add this problem to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:54
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:21
 msgid "Pick date and time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3804
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
 msgid ""
 "Place a file named \"hide_directory\" in a course or other directory and it "
 "will not show up in the courses list on the WeBWorK home page. It will still"
 " appear in the Course Administration listing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1107
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should be given full credit."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should have half credit added."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given full credit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:889
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given half credit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:654
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its incorrect attempt count reset."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its weight doubled."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1315
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:60
 msgid ""
 "Please choose the set, the problem you would like to copy, and the problem "
 "you would like to copy it to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:399
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:19
 msgid "Please correct the following errors and try again:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:698
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:28
 msgid "Please enter in a value to match in the filter field."
 msgstr ""
 
-#. (CGI::b($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:197
+#. (tag('b', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:28
 msgid "Please enter your username and password for %1 below:"
 msgstr "Por favor ingresa tu nombre de usuario y contraseña para %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1778
 msgid "Please provide a location name to delete."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:233
 msgid "Please select action to be performed."
 msgstr "Por favor selecciona la acción que quieres realizar."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:183
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
 msgid "Please select at least one set and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
 msgid "Please select at least one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:165
 msgid "Please select at least one user and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:35
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:31
 msgid "Please select at least one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:28
 msgid "Please select at most one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:30
 msgid "Please select exactly one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:29
 msgid "Please select exactly one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:574
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1016
 msgid "Please specify a file to save to."
 msgstr "tr: Please specify a file to save to."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:37
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
 msgid "Please specify a homework set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:38
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
 msgid ""
 "Please use only letters, digits, dashes, underscores, and periods in your "
 "set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1462
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1184
+msgid ""
+"Please use radio buttons to choose the method for saving this file. Uknown "
+"saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:165
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:169
+msgid "Point Value"
+msgstr ""
+
+#. ($grader->{problem_value})
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:92
+msgid "Point Value (0 - %1):"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:21
 msgid "Points"
 msgstr "Puntos"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:609
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:62
+msgid "Points:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:26
 msgid "Potion of Forgetfulness"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1423
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:2
 msgid "Prepare which sets for export?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2054
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2073
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:268
 msgid "Press \"Grade Test\" now!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2049
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:244
 msgid "Press \"Grade Test\" soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:213
-msgid "Preview Comment"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:69
 msgid "Preview Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:314
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1840
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:11
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:99
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:35
 msgid "Preview My Answers"
 msgstr "Vista previa de mis respuestas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2440
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:646
 msgid "Preview Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1340
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:41
+msgid ""
+"Preview the message before sending using the \"Preview Message\" button.  "
+"The preview shows the email that would be sent to the first selected student"
+" or the instructor if no students were selected.  The preview will also list"
+" all of the students that would receive their own personalized message.  If "
+"a merge file was selected, the preview will also indicate which (if any) "
+"recipient's merge file data could not be found."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:991
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:995
 msgid "Previous Problem"
 msgstr "Problema anterior"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2157
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:94
 msgid "Previous page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2149
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:45
+msgid "Primary Actions"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:355
 msgid "Print Test"
 msgstr ""
 
 # Short for Problem
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2088
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:287
 msgid "Prob"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:670
-msgid "Problem #"
-msgstr "Problema #"
-
-#. ($prettyProblemID)
-#. ($problemNumber)
 #. (join('.', @seq)
 #. ($problemID)
-#. ($prettyProblemIDs{$probID})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:831
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:834
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:897
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:438
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:800
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:956
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:964
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:973
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:933
+#. ($problemNumber)
+#. ($_->{prettyID})
+#. ($c->{prettyID})
+#. ($probID)
+#. ($c->{setRecord}->assignment_type eq 'jitar' ? join('.',
+#. jitar_id_to_seq($_)
+#. ($set->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)
+#. ($prettyProblemID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:831
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:842
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:853
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:57
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/siblings.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:40
 msgid "Problem %1"
 msgstr "Problema %1"
 
-#. ($problemNumber)
-#. ($prettyID)
-#. ($versioned ? $versioned : $MergedProblem->problem_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1419
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1421
+#. ($i + 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:535
 msgid "Problem %1."
 msgstr "Problema %1."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1974
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:75
+msgid "Problem (\".pg\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:38
+msgid "Problem Display Settings"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1876
 msgid "Problem Display/Answer Checking"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:451
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:50
 msgid "Problem Editor"
 msgstr "Editor de problemas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1697
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:29
 msgid "Problem Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1002
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:999
 msgid "Problem List"
 msgstr "Lista de problemas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1119
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:666
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:783
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:75
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:159
 msgid "Problem Number"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:156
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:160
+msgid "Problem Paths"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:140
 msgid "Problem Score (%):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:30
 msgid "Problem Techniques"
 msgstr "Estrategias para problemas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:705
-msgid "Problem Viewer"
-msgstr "Visualizador de problemas"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:239
+msgid ""
+"Problem has a different source file than the currently rendered problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:233
+msgid "Problem has an essay answer that needs to be graded."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1943
 msgid "Problem source is drawn from a grouping set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:406
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2494
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:445
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:827
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:835
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:896
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:801
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:89
+msgid ""
+"Problem source is drawn from a grouping set and can not be directly rendered"
+" or edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:336
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:9
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:32
 msgid "Problems"
 msgstr "Problemas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:25
 msgid "Problems Added"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:59
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:54
 msgid "Problems for all students have been unassigned."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:57
 msgid "Problems for selected students have been reassigned."
 msgstr "Se han reasignado problemas para los estudiantes seleccionados."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:51
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:46
 msgid "Problems have been assigned to all current users."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:25
+msgid ""
+"Problems with this rating should only require direct memory of a fact. "
+"Examples might be a specific value of a function, or the statement of a "
+"definition. Very few WeBWorK problems fall into this category."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:93
 msgid "Proctor"
 msgstr "tr: Proctor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:282
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:92
 msgid "Proctor Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:258
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:71
 msgid "Proctor Username"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:193
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:3
+msgid "Proctor authorization requested for a nonexistent set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:8
 msgid "Proctor authorization required."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:231
-msgid "Proctored Gateway Quiz %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:88
+msgid "Proctor:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:265
+msgid "Proctored Test %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:272
+msgid "Proctored Test %2 Proctor Login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:241
-msgid "Proctored Gateway Quiz %2 Proctor Login"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:318
+msgid ""
+"Proctored tests always require authorization to start the test. \"Both Start"
+" and Grade\" will require login proctor authorization to start and grade "
+"proctor authorization to grade. \"Only Start\" requires grade proctor "
+"authorization to start and no authorization to grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:981
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:18
 msgid ""
-"Proctored tests require proctor authorization to start and to grade.  "
 "Provide a password to have a single password for all students to start a "
 "proctored test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:56
 msgid "Publish"
 msgstr "Publicar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:31
+msgid ""
+"Quick access to many instructor tools, including <strong>Reset "
+"passwords</strong>, <strong>Act as student</strong>, <strong>Assign "
+"individual sets</strong> and <strong>Edit individual due dates</strong>."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "RECITATION"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1333
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:199
 msgid "Randomize"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:13
 msgid "Randomize Seed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:101
 msgid "Read only"
 msgstr "Solo lectura"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:67
 msgid "Really delete the items listed above?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:201
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:212
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:804
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2038
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:298
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:832
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:861
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:890
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:919
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:184
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:42
 msgid "Recitation"
 msgstr "tr: Recitation"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:194
-msgid "Record Scores for Single Sets"
+#. ($recitation)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:125
+msgid "Recitation %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:21
+msgid "Recitation:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:38
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:46
+msgid "Record Scores for Single Sets"
 msgstr "tr: Record Scores for Single Sets"
 
-#. ($studentName)
-#. ($self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:183
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:190
+#. ($studentID)
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:8
 msgid "Record for user %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Reduced Scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:67
 msgid "Reduced Scoring Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2523
-msgid "Reduced Scoring Disabled"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
+msgid "Reduced Scoring Enabled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2522
-msgid "Reduced Scoring Enabled"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:33
+msgid "Reduced Scoring Period"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:314
 msgid "Reduced credit can still be earned until %1."
 msgstr ""
 
 # Short for "Reduced Scoring:"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:32
 msgid "Reduced:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:153
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:373
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:56
 msgid "Refresh"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1646
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1943
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2000
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3713
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3755
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:56
 msgid "Refresh Listing"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:190
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:200
 msgid "Relax IP restrictions when?"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:88
+msgid "Reload the page to see backup files that have been made."
+msgstr ""
+
 # Context is "Attempts Remaining"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:14
 msgid "Remaining"
 msgstr "Restantes"
 
 #. ('00:00:00')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:254
 msgid "Remaining time: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:61
 msgid "Remember Me"
 msgstr "tr: Remember Me"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:546
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:514
 msgid "Remember to return to your original problem when you're finished here!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1020
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:466
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:72
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:41
 msgid "Rename"
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1302
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:62
 msgid "Rename %1 to %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:378
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:927
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:73
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:34
 msgid "Rename Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:17
+msgid "Rename Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:22
+msgid "Rename Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
 msgid "Rename file as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2727
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:463
 msgid "Render"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:344
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:59
 msgid "Render All"
 msgstr "Mostrar todos"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2720
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:461
 msgid "Render Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2501
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:60
+msgid ""
+"Render all problems on the page. This does not reload the page or save or "
+"reset changes."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:106
+msgid ""
+"Render or re-render the problem, course info file, or set header being "
+"edited. This does not change the permanent file on the disk. You can view "
+"different versions of the same problem by changing the seed. You can also "
+"change the manner in which the mathematics is typeset. If \"Open in new "
+"window\" is checked, then the problem will open in a new tab or window "
+"showing the problem as it will be rendered for students in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:132
+msgid "Rendering Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:341
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:53
 msgid "Renumber Problems"
 msgstr "Volver a numerar los problemas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:55
+msgid ""
+"Renumber problems consecutively starting from 1. This renumbering is not "
+"saved until \"Save Changes\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:103
+msgid ""
+"Renumber problems in the set consecutively starting from one. In the process"
+" of deleting problems, the numbering can be made non-consecutive. This is "
+"useful to clean up the problem numbering."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:31
 msgid ""
-"Reopens any gateway test for an additional 24 hours. This allows you to take"
-" a test even if the close date has past. This item does not allow you to "
-"take additional versions of the test."
+"Reopens any test for an additional 24 hours. This allows you to take a test "
+"even if the close date has past. This item does not allow you to take "
+"additional versions of the test."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:118
+msgid "Reordering Problems"
 msgstr ""
 
-#. (CGI::strong(                                                   CGI::span({
-#. dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1829
+#. (tag(                                           'strong',
+#. c(                                                      tag('span', dir =>
+#. 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:58
 msgid "Replace current problem: %1"
 msgstr "Reemplazar problema actual: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:13
 msgid "Replace which users?"
 msgstr "¿Qué usuarios reemplazar?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:637
+#. ($composite_id, $oldUser->status)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:448
+msgid "Replacing old data for %1: status: %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:42
 msgid "Reply-To:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:528
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:123
 msgid "Report Bugs in this Problem"
 msgstr "Reportar errores de código en este problema"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1073
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:305
 msgid "Report bugs"
 msgstr "Reportar problemas (bugs)"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:128
+msgid ""
+"Report bugs in a WeBWorK question/problem using this link. The very first "
+"time you do this you will need to register with an email address so that "
+"information on the bug fix can be reported back to you."
+msgstr ""
+
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2825
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1530
 msgid "Report for course %1:"
 msgstr ""
 
-#. ($rename_oldCourseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2122
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:3
 msgid "Report on database structure for course %1:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1829
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:8
 msgid "Request New Version"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2246
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2321
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:19
 msgid "Request information"
 msgstr "Solicitar información"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1972
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1220
 msgid "Request new version now."
 msgstr ""
 
+#. ($setName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:486
+msgid ""
+"Requested set \"%1\" is a proctored test, but no valid proctor authorization"
+" has been obtained."
+msgstr ""
+
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:399
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:422
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:425
 msgid "Requested set '%1' could not be found in the database for user %2."
 msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:469
-msgid ""
-"Requested set '%1' is a homework assignment but the gateway/quiz content "
-"generator %2 was called.  Try re-entering the set from the problem sets "
-"listing page."
-msgstr ""
-
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:484
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:472
 msgid ""
-"Requested set '%1' is a proctored test/quiz assignment, but no valid proctor"
-" authorization has been obtained."
+"Requested set '%1' is a homework assignment but the test content generator "
+"%2 was called.  Try re-entering the set from the problem sets listing page."
 msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:463
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:466
 msgid ""
-"Requested set '%1' is a test/quiz assignment but the regular homework "
-"assignment content generator %2 was called.  Try re-entering the set from "
-"the problem sets listing page."
+"Requested set '%1' is a test but the regular homework assignment content "
+"generator %2 was called.  Try re-entering the set from the problem sets "
+"listing page."
 msgstr ""
 
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:420
 msgid "Requested set '%1' is not assigned to user %2."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:450
 msgid "Requested set '%1' is not available yet."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:441
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:444
 msgid "Requested set '%1' is not yet open."
 msgstr ""
 
 #. ($verNum,				$setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:404
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:407
 msgid "Requested version (%1) of set '%2' can not be directly accessed."
 msgstr ""
 
 #. ($verNum, $setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:397
 msgid "Requested version (%1) of set '%2' is not assigned to user %3."
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:308
+msgid "Require Proctor Authorization to"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:45
 msgid "Require users to log in through the LMS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:420
 msgid "Rerandomize after"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:104
 msgid "Reset"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2280
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2968
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:195
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:696
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:47
 msgid "Reset Form"
 msgstr "Descartar cambios"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:610
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:27
 msgid "Resets the number of incorrect attempts on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2453
-msgid ""
-"Restores a course from a gzipped tar archive (.tar.gz). After unarchiving, "
-"the course database is restored from a subdirectory of the course's DATA "
-"directory. Currently the archive facility is only available for mysql "
-"databases. It depends on the mysqldump application."
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:41
+msgid "Restore a .tar.gz archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:40
+msgid "Restore backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:39
+msgid "Restore backup from %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:178
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+msgid "Restored backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:188
 msgid "Restrict Access by IP"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:912
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep:11
 msgid "Restrict Locations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:286
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:324
 msgid "Restrict Problem Progression"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:184
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:194
 msgid "Restrict To"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:154
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:33
+msgid "Restrict or sort the students displayed"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:159
 msgid "Restrict release by set(s)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2090
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:299
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:291
 msgid "Result"
 msgstr "Resultado"
 
-#. (CGI::i($self->$actionHandler(\%genericParams, \%actionParams,
-#. \%tableParams)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:388
+#. ($c->tag('i', $c->$actionHandler)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:228
 msgid "Result of last action performed: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:309
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:300
 msgid "Results for this submission"
 msgstr "Resultados"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:363
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:236
 msgid "Results of last action performed"
 msgstr "Resultados de la última acción realizada"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:125
 msgid "Results of last action performed: "
 msgstr "Resultados de la última acción:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1725
-msgid "Resurrect which Gateway?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:51
+msgid "Resurrect which test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1449
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:669
 msgid "Retitled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:17
 msgid "Return to your work"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:686
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:132
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:16
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:166
 msgid "Revert"
 msgstr "tr: Revert"
 
-#. (CGI::span({ dir => 'ltr' }, $self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2069
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:83
 msgid "Revert to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1431
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1513
+#. ($c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1220
+msgid "Reverted to original file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:168
+msgid ""
+"Reverts to the copy of the file saved on the disk or to a backup file. All "
+"unsaved editing changes will be lost. This option is only active when a "
+"temporary file or a backup file exists. You may also delete backups that "
+"have been made with this tab."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:182
+msgid "Review of column functions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:145
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:85
 msgid ""
 "Reviewing a problem and looking at both the average Attempts and  average "
 "Status should give instructors valuable information about the difficulty of "
 "the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:55
 msgid "Reward used successfully!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:180
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:4
 msgid "Rewards"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:27
 msgid "Ring of Reduction"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:322
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:26
 msgid "Robe of Longevity"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "SECTION"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:214
 msgid "SET NAME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:321
 msgid "STATUS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "STUDENT ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:43
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:263
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:170
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:687
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:847
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:220
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:85
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:207
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:123
 msgid "Save"
 msgstr "Guardar"
 
-#. (CGI::b($self->shortPath($self->{sourceFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:438
+#. (tag('b', $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_form.html.ep:2
 msgid "Save %1"
 msgstr "Guardar %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:44
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:695
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:134
 msgid "Save As"
 msgstr "Guardar como"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:744
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2963
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:194
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:695
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:37
 msgid "Save Changes"
 msgstr "Guardar los cambios"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:60
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:76
 msgid "Save Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
 msgid "Save Export"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:92
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
 msgid "Save Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:188
 msgid "Save as"
 msgstr "Guardar como"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:872
-msgid "Save as Default"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:481
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:5
 msgid "Save as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1558
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:254
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1443
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_password_form.html.ep:1
 msgid "Save changes"
 msgstr "Guardar los cambios"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1794
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:33
 msgid "Save file to:"
 msgstr "Guardar archivo en:"
 
-#. (CGI::b({ dir => 'ltr' }, $self->shortPath($self->{editFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1605
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:125
+msgid ""
+"Save the contents of the editor window to the file on disk and re-render the"
+" problem. If \"Open in new window\" is checked, then the problem will open "
+"in a new tab or window showing the problem as it will be rendered for "
+"students in the set. If \"Create backup\" is checked then a backup of the "
+"current file on disk will be created before overwriting it with the contents"
+" of the editor window. If a backup already exists, then a \"Delete oldest "
+"backup\" check box will be present. If that is checked, then the oldest "
+"backup will be deleted when \"Save\" is clicked. These backups can be "
+"reverted to and managed on the \"Revert\" tab."
+msgstr ""
+
+#. (tag('b', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:6
 msgid "Save to %1 and View"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:396
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1165
-msgid "Saved to file '%1'"
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:50
+msgid "Saved answers"
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#. ($outputFilePath =~ s/$ce->{courseDirs}{templates}/[TMPL]/r)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:549
+msgid "Saved to file \"%1\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1180
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2116
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2292
 msgid "Schema and database field definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4284
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2279
 msgid "Schema and database table definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:404
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:465
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:660
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:147
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:161
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:78
 msgid "Score"
 msgstr "Calificar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:125
 msgid "Score (%)"
 msgstr "Puntaje (%)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:161
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:60
+msgid ""
+"Score one or more sets. This can also be done from the \"Hmwk Sets Editor\" "
+"or from the \"Instructor Tools\", but the \"Scoring Tools\" page allows "
+"control over parameters."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:170
 msgid "Score required for release"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:228
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:58
 msgid "Score selected set(s) and save to:"
 msgstr "Calificar las tareas selccionadas y guardar en:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2085
-msgid "Score summary for last submit:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:284
+msgid "Score summary for last submission:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:2
 msgid "Score which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:978
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:2
 msgid "Score which sets?"
 msgstr "¿Qué tareas calificar?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
 msgid "Scores"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:487
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:66
+msgid "Scoring (\".csv\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:396
 msgid "Scoring Download"
 msgstr "Bajar Calificaciones"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:161
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:115
 msgid "Scoring Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:478
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:391
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:58
 msgid "Scoring Tools"
 msgstr "Herramientas de calificación"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2460
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:17
+msgid "Scoring Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:327
 msgid ""
 "Screen and Hardcopy set header information can not be overridden for "
 "individual students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:26
 msgid "Scroll of Resurrection"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:189
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:200
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:211
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:793
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2029
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:297
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:831
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:860
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:889
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:918
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:157
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:178
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:38
 msgid "Section"
 msgstr "Sección"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:653
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:802
+#. ($section)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:122
+msgid "Section %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:30
 msgid "Section:"
 msgstr "Sección:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:436
 msgid "Seed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:114
 msgid "Select"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:505
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:20
+msgid ""
+"Select Users from the left column and sets from the right column and assign "
+"or unassign the given sets. The list of users or the list of sets can be "
+"reordered under the \"sort\" option or the format of the user or set list.  "
+"Additionally, the set lists can be filtered (by section number or "
+"recitation).  The displayed user and set lists will only be updated upon "
+"clicking \"Change Display Settings\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:11
 msgid "Select a Homework Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:14
 msgid "Select a Problem Collection"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:18
 msgid "Select a Set Definition File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1028
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:14
 msgid "Select a Set from this Course"
 msgstr "Seleccionar una tarea de este curso"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1659
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:20
+msgid ""
+"Select a course to create a .tar.gz archive of, which contains a dump of the"
+" database and all course files (templates, configuration files, etc).  Each "
+"course can only have a single archive.  Creating an archive of a previously "
+"archived course will delete the old archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:36
 msgid "Select a course to delete."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:946
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:20
+msgid ""
+"Select a course to delete.  Warning, all data will be deleted and this "
+"cannot be undone.  This will not delete any course archives."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:14
 msgid ""
 "Select a course to rename.  The courseID is used in the url and can only "
 "contain alphanumeric characters and underscores. The course title appears on"
 " the course home page and can be any string."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2475
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:13
 msgid "Select a course to unarchive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1914
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3684
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:21
 msgid "Select a listing format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1442
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1478
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:18
+msgid "Select action:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:10
 msgid "Select all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2703
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:12
 msgid "Select all eligible courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2731
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:26
 msgid "Select all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1967
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:10
 msgid "Select all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:315
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:509
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:536
-msgid "Select an action to perform"
-msgstr "tr: Select an action to perform"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3063
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:10
 msgid "Select an action to perform:"
 msgstr "Selecciona una acción:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1956
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:20
+msgid ""
+"Select an archive to restore.  You cannot restore an archive into an "
+"existing course. Instead, either rename or delete the old course, or restore"
+" the archive with a new name.  When restoring a course with a new name, the "
+"name is used as the course ID, and must contain only letters, numbers, "
+"hyphens, and underscores, and may have at most 40 characters."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:36
 msgid "Select course(s) to archive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3731
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:44
 msgid "Select course(s) to hide or unhide."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:7
 msgid "Select import file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:14
 msgid ""
 "Select one or more sets and one or more users below to assign/unassign each "
 "selected set to/from all selected users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:94
 msgid "Select sets below to assign them to the newly-created users."
 msgstr "Selecciona abajo las tareas que quieres asignar a los nuevos usuarios."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3666
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:20
+msgid ""
+"Select the course to change its Course ID, Course Title, or Institution.  "
+"Note that changing a course's ID will change the URL of all links to the "
+"course, and could break links from external sites such as an LMS."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:4
 msgid ""
 "Select the course(s) you want to hide (or unhide) and then click \"Hide "
 "Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
@@ -5434,133 +7244,230 @@ msgid ""
 "full URL address for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:488
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:20
+msgid ""
+"Select the course(s) you want to hide (or unhide) and then click \"Hide "
+"Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
+"does no harm (the action is skipped). Likewise unhiding a course that is "
+"already visible does no harm (the action is skipped). Hidden courses are "
+"still active but are not listed in the list of WeBWorK courses on the "
+"opening page. To access the course, an instructor or student must know the "
+"full URL address for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:93
+msgid "Select the display mode used to render the problems on this page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:11
 msgid ""
 "Select the homework sets for which to generate hardcopy versions. You may "
 "also select multiple users from the users list. You will receive hardcopy "
 "for each (set, user) pair."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:238
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:30
+msgid ""
+"Select the sets you want scored, choose the name of the export file you want"
+" to use (by default: %1), and then click the \"Score Selected Set(s) and "
+"save to\" button."
+msgstr ""
+
+#. ('<code>ful.csv</code>','<code>scr.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:49
+msgid ""
+"Select this if you want to save the scores for each set in a separate file "
+"in addition to saving all scores to a cumulative file. After clicking the "
+"\"Score Selected Set(s) and save to\" button, you will get a pair of links "
+"for each selected set. The file that ends with %1 contains the number of "
+"correct and incorrect tries about each individual problem for each student. "
+"The file that ends with %2 is a summary of each problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:19
 msgid ""
 "Select user(s) and/or set(s) below and click the action button of your "
 "choice."
 msgstr "Selecciona usuarios y/o tareas abajo y selecciona la acción que desees ejecutar."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2885
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:85
+msgid ""
+"Select which assignment types (homework, tests, just-in-time) the "
+"achievement is evaluated."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:20
+msgid ""
+"Select which courses to upgrade from a previous version of WeBWorK.  The "
+"upgrade process can add missing database columns, delete unused database "
+"columns, and check the course file structure.  Be sure to read over the "
+"changes before confirming the upgrade.  You may want to create an archive of"
+" the course before upgrading.  Only courses that need upgraded will be "
+"selectable."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:84
+msgid "Select your favorite theme for the large text window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:18
 msgid "Select/unselect all fields missing in schema for deletion."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2873
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:9
 msgid "Select/unselect all tables missing in schema for deletion."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:23
 msgid "Selected sets:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:57
 msgid "Send E-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:839
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:83
 msgid "Send Email"
 msgstr "Enviar correo"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:702
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:69
+msgid "Send email to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:54
+msgid "Send emails to selected instructors."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:59
 msgid "Send to all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:717
-msgid "Send to the students selected below"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:64
+msgid "Send to selected students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:402
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:7
 msgid "Set"
 msgstr "Tarea"
 
 #. ($newSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:614
 msgid "Set %1 has been created."
 msgstr ""
 
-#. ($newSetName,$userName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1944
+#. ($newSetName, $userName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:616
 msgid "Set %1 was assigned to %2"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1239
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:567
 msgid "Set %1 was assigned to %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:415
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:354
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:42
 msgid "Set Assigner"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:420
-msgid "Set Definition Filename"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:17
+msgid "Set Assigner Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:45
 msgid "Set Definition Files"
 msgstr "Archivos de tareas (.def)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2318
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2329
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:218
 msgid "Set Description"
 msgstr "Descripción de la tarea"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:17
+msgid "Set Detail Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:333
 msgid "Set Detail for set %2"
 msgstr "Detalles de la tarea %2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:93
 msgid "Set Header"
 msgstr "Encabezado de la tarea"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:323
+msgid "Set Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:218
 msgid "Set ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:267
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:114
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:3
 msgid "Set Info"
 msgstr "Información sobre la tarea"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2744
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:19
 msgid "Set List"
 msgstr "Lista de tareas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1111
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1209
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1320
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:164
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:262
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:353
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:448
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:546
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:659
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:776
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:895
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:995
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:762
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:809
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:7
 msgid "Set Name"
 msgstr "tr: Set Name"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:186
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:18
+msgid "Set closes on %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:45
+msgid "Set definition (\".def\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:20
+msgid "Set is closed."
+msgstr ""
+
+#. ($c->formatDateTime($set->reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:16
+msgid "Set is due on %1."
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:14
+msgid "Set opens on %1."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:188
 msgid "Set random seed to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2029
+#: /opt/webwork/webwork2/conf/defaults.config:1930
 msgid ""
 "Set to true for log to mean base 10 log and false for log to mean natural "
 "logarithm."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2049
+#: /opt/webwork/webwork2/conf/defaults.config:1950
 msgid ""
 "Set to true to allow students to enter Unicode versions of some characters "
 "(like U+2212 for the minus sign) in their answers.  One reason to allow this"
@@ -5569,7 +7476,7 @@ msgid ""
 "directory from the keyboard."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2019
+#: /opt/webwork/webwork2/conf/defaults.config:1920
 msgid ""
 "Set to true to display the \"Entered\" column which automatically shows the "
 "evaluated student answer, e.g., 1 if student input is sin(pi/2). If this is "
@@ -5578,7 +7485,7 @@ msgid ""
 " answer."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2060
+#: /opt/webwork/webwork2/conf/defaults.config:1961
 msgid ""
 "Set to true to have Full Width Unicode character (U+FF01 to U+FF5E) "
 "converted to their ASCII equivalents (U+0021 to U+007E) automatically in "
@@ -5586,20 +7493,30 @@ msgid ""
 "automatically use Full Width characters for parentheses and commas."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:521
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:164
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:16
+msgid "Set values"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/siblings.html.ep:4
 msgid "Sets"
 msgstr "Tareas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:352
-msgid "Sets Assigned to User"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:322
+msgid "Sets assigned to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:343
-msgid "Sets assigned to %1"
+#. ($userName, $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:90
+msgid "Sets assigned to %1 (%2)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:17
+msgid "Sets assigned to student Help"
 msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:57
@@ -5613,189 +7530,241 @@ msgid ""
 "links from the LMS must be problem set specific. For example, "
 "<code>webwork.myschool.edu/webwork2/course-name/problem_set_name</code>. If "
 "the problem set name has space characters, they should be underscores in "
-"these addresses. If the problem set is a quiz, it must have this format: "
-"<code>webwork.myschool.edu/webwork2/course-"
-"name/quiz_mode/problem_set_name</code>. Also, to initialize the "
-"communication between WeBWorK and the LMS, the user must follow each of "
-"these external learning tools at least one time. Since there must be a "
-"separate external tool link for each problem set, this option requires more "
-"maintenance of the LMS course.</dd></dl>"
+"these addresses. Also, to initialize the communication between WeBWorK and "
+"the LMS, the user must follow each of these external learning tools at least"
+" one time. Since there must be a separate external tool link for each "
+"problem set, this option requires more maintenance of the LMS "
+"course.</dd></dl>"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:55
+msgid "Sets the order in which achievements are listed and evaluated."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1458
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:625
 msgid "Sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:726
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:36
 msgid "Setting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1332
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:39
 msgid "Shift dates so that the earliest is"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:32
+msgid "Show"
+msgstr ""
+
 #. ($numchild)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1301
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:32
 msgid "Show %1 more like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:326
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:107
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:39
 msgid "Show Correct Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:22
 msgid "Show Date & Size"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:86
 msgid "Show LTI parameters (for debugging)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:620
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:34
 msgid "Show Me Another"
 msgstr "Muéstrame otra versión"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2518
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2412
+#. ($exhausted)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:69
+msgid "Show Me Another %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1642
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:711
 msgid "Show Past Answers"
 msgstr "Mostrar respuestas anteriores"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:703
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:41
+msgid "Show Problem Source File"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:132
 msgid "Show Problem Source File:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
 msgid "Show Problems on Finished Tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
-msgid "Show Scores on Finished Assignments?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+msgid "Show Scores on Finished Tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2416
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:630
 msgid "Show Solutions"
 msgstr "Mostrar soluciones"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/conf/defaults.config:1538
 msgid "Show Total Homework Grade on Grades Page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1266
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:77
 msgid "Show all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1380
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:91
 msgid "Show all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2404
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:621
 msgid "Show correct answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1299
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+msgid "Show hints after"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:30
 msgid "Show less like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:337
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:387
 msgid "Show me another"
 msgstr "Muéstrame otra versión"
 
-#. ($exhausted)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1926
-msgid "Show me another %1"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:20
+msgid ""
+"Show past answers.  Students can only see their past answers, and they will "
+"not be able to see which parts are correct.  Instructors can use the form to"
+" select any combination of users, sets, and problems to view.  The table "
+"below will list the past answers colored according to correctness (green is "
+"correct).  Use control + click to select multiple users, sets, or problems."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2428
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:639
 msgid "Show problem graders"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:105
 msgid "Show saved answers?"
 msgstr "¿Mostrar respuestas guardadas?"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1860
+#: /opt/webwork/webwork2/conf/defaults.config:1762
 msgid ""
 "Show the correct answer to the current problem before re-randomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1862
+#: /opt/webwork/webwork2/conf/defaults.config:1764
 msgid ""
 "Show the correct answer to the current problem on the last attempt before a "
 "new version is requested."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:3
 msgid "Show which sets?"
 msgstr "¿Qué tareas mostrar?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:690
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:3
 msgid "Show which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:382
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:475
-msgid "Show/Hide Site Description"
-msgstr "Mostrar/Ocultar la descripción de esta página"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:622
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:11
 msgid "Show:"
 msgstr "Mostrar:"
 
-#. (scalar @{ $self->{visibleSetIDs} },			scalar @{ $self->{allSetIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:594
+#. (scalar @{ $c->{visibleSetIDs} },			scalar @{ $c->{allSetIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:115
 msgid "Showing %1 out of %2 sets."
 msgstr ""
 
-#. (scalar @Users, scalar @{ $self->{allUserIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:610
+#. (scalar(keys %{ $c->{visibleUserIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:80
 msgid "Showing %1 out of %2 users"
 msgstr "Mostrando %1 de un total de %2 usuarios."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:70
 msgid "Showing all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1355
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:81
 msgid "Showing all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:61
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:64
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:67
+#. ($c->{merge_file}, $ur->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:5
+msgid "Showing data from merge file %1 for user %2:"
+msgstr ""
+
+#. ($c->{merge_file})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:147
+msgid "Showing data from merge file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:61
+msgid "Showing problem for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:7
+msgid "Showing statistics for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:33
+msgid ""
+"Shows how many instructors and students have been assigned this problem set,"
+" out of the total number in the class. Clicking on this link allows you to "
+"assign the set to users, unassign this set from users, and to individually "
+"edit the assignment for specific users. For changing dates for individual "
+"users there are also shortcuts from the \"Instructor Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:63
 msgid "Site Information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:88
 msgid "Skip archiving this course"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2080
+#: /opt/webwork/webwork2/conf/defaults.config:1981
 msgid "Skip explanation essay answer fields"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1556
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1557
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:81
+msgid "Snippets of PG code illustrating specific techniques"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1514
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1515
 msgid "Solution:"
 msgstr "Solución:"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1555
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1513
 msgid "Solution: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:432
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:57
 msgid "Solutions"
 msgstr "Soluciones"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1350
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:20
+msgid ""
+"Some OPL problems have been rated for difficulty/educational objective. The "
+"levels are loosely inspired by Bloom's taxonomy. They are assigned numbers "
+"from 1 to 6 as follows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:185
 msgid ""
 "Some WeBWorK problems are programmed using what are called <i>Math "
 "Objects</i>. These problems are preferred by some people because they "
@@ -5803,18 +7772,18 @@ msgid ""
 "particularly for answers which are way off base."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:379
 msgid "Some answers will be graded later."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:60
 msgid ""
 "Some of these files are directories. Only delete directories if you really "
 "know what you are doing. You can seriously damage your course if you delete "
 "the wrong thing."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2082
+#: /opt/webwork/webwork2/conf/defaults.config:1983
 msgid ""
 "Some problems have an explanation essay answer field, typically following a "
 "simpler answer field. For example, find a certain derivative using the "
@@ -5826,7 +7795,7 @@ msgid ""
 "grading."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2186
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:83
 msgid ""
 "Some problems shown above represent multiple similar problems from the "
 "database.  If the (top) information line for a problem has a letter M for "
@@ -5836,300 +7805,396 @@ msgid ""
 "again."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1612
-msgid ""
-"Some servers handle courses taking place in different timezones.  If this "
-"course is not showing the correct timezone, enter the correct value here.  "
-"The format consists of unix times, such as "
-"\"America/New_York\",\"America/Chicago\", \"America/Denver\", "
-"\"America/Phoenix\" or \"America/Los_Angeles\". Complete list: <a "
-"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:529
-msgid ""
-"Something was wrong with your LTI parameters.  If this recurs, please speak "
-"with your instructor"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:50
 msgid "Sort"
 msgstr "Ordenar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:751
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:814
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:4
 msgid "Sort by"
 msgstr "Ordenar por"
 
 #. ($names{$primary}, $names{$secondary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:817
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:324
 msgid "Sort by %1 and then by %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:171
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:115
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:3
 msgid "Sort:"
 msgstr "Ordenar por:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:51
+msgid "Sorts the lists displayed by due date, name, etc."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:363
 msgid "Source File"
 msgstr "Archivo:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1586
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1612
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1555
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1593
 msgid ""
 "Source file paths cannot include .. or start with /: your source file path "
 "was modified."
 msgstr ""
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:11
 msgid ""
 "Specify an ID, title, and institution for the new course. The course ID may "
 "contain only letters, numbers, hyphens, and underscores, and may have at "
 "most %1 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:661
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:94
+msgid ""
+"Spell check the text of the file that your are editing. Note that there will"
+" be many spelling errors in the code parts of your file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:116
+msgid "Standard Deviation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:162
 msgid "Start"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:609
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:47
+msgid "Start LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:130
 msgid "Start New Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:443
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:94
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:508
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:84
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:54
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#. ($self->{ce}{courseName} =~ s/_/ /gr,                   CGI::span({ dir =>
-#. 'ltr' }, format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:73
-msgid "Statistics for %1 set %2. Closes %3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:17
+msgid "Statistics Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:86
+msgid "Statistics for %1"
 msgstr ""
 
-#. ($self->{ce}{courseName}, $self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:68
-msgid "Statistics for %1 student %2"
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:90
+msgid "Statistics for %1 problem %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2089
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1442
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1524
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2020
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:296
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:659
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:806
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:191
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:192
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:84
+msgid "Statistics for student %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:442
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:151
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:160
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:36
 msgid "Status"
 msgstr "Estado"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:29
 msgid "Stop Acting"
 msgstr "Volver al usuario original"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2251
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:85
 msgid "Stop Archiving"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2418
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1153
 msgid "Stop archiving courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:233
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:783
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2011
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:295
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:829
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:887
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:916
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:30
 msgid "Student ID"
 msgstr "ID de estudiante"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:9
+msgid "Student ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:37
 msgid "Student Name"
 msgstr "Nombre del estudiante"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:570
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:428
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:56
 msgid "Student Progress"
 msgstr "Reportes de avance"
 
-#. ($self->{ce}->{courseName},                     CGI::span({ dir => 'ltr' },
-#. format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:81
-msgid "Student Progress for %1 set %2. Closes %3"
-msgstr "Reporte de avance del estudiante %2 de %1. Cierra el %3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:17
+msgid "Student Progress Help"
+msgstr ""
+
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:72
+msgid "Student Progress for %1"
+msgstr ""
 
-#. ($self->{ce}->{courseName}, $self->{studentName})
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($c->stash('setID')
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:76
-msgid "Student Progress for %1 student %2"
-msgstr "Reporte de avance del estudiante %2 de %1"
+msgid "Student Progress for set %1"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:628
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:80
 msgid "Student answers"
 msgstr "Respuestas del estudiante"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:766
-msgid "Subject:"
-msgstr "Tema:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:80
+msgid ""
+"Student scores for the sets selected below will be calculated. This and "
+"other scoring operations can also be done using the \"Scoring Tools\" link."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:653
-msgid "Subject: "
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:87
+msgid "Student:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:124
+msgid "Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:50
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:8
+msgid "Subject:"
 msgstr "Tema:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:222
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:30
 msgid "Submission time:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:226
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:41
 msgid "Submit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:26
 msgid "Submit Answers"
 msgstr "Enviar mis respuestas"
 
 #. ($effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1861
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:23
 msgid "Submit Answers for %1"
 msgstr "Enviar mis respuestas para %1"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:502
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:525
 msgid "Submit your answers again to go on to the next part."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:775
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:183
 msgid "Success Index"
 msgstr ""
 
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2356
-msgid "Successfully archived the course %1."
-msgstr ""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:106
+msgid ""
+"Success index is the square of the average score divided by the average "
+"number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:73
+msgid ""
+"Success index is the square of the score divided by the number of attempts."
+msgstr ""
+
+#. ($archive_courseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1086
+msgid "Successfully archived the course %1."
+msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:885
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:422
 msgid "Successfully created new achievement %1"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1252
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:581
 msgid "Successfully created new set %1"
 msgstr ""
 
 #. ($add_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:465
 msgid "Successfully created the course %1"
 msgstr ""
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1818
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2401
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1131
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:900
 msgid "Successfully deleted the course %1."
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1529
+#. ($rename_oldCourseID,							$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:772
 msgid "Successfully renamed the course %1 to %2"
 msgstr ""
 
 #. ($unarchive_courseID, $new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2653
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1286
 msgid "Successfully unarchived %1 to the course %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2099
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4280
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:89
+msgid "TA:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2274
 msgid "Table defined in database but missing in schema"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2097
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2269
 msgid "Table defined in schema but missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2265
 msgid "Table is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3200
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3490
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:276
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:576
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:106
 msgid "Take Action!"
 msgstr "Ejecutar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Target Set:"
 msgstr "La Tarea:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:63
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:42
 msgid "TeX Source"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:784
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:258
+msgid "Test %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:54
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:52
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:55
+msgid "Test Name"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:156
 msgid "Test Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:224
 msgid "Test Time Limit (min; 0=Close Date)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2041
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:238
 msgid "Test Time Notification"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:156
 msgid "Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:244
 msgid "Test not yet submitted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:317
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:920
+msgid "Test parameters"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:149
 msgid "Test/quiz with time limit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:79
 msgid "Text"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:842
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:80
+msgid "Text Editor Options"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:55
 msgid "Text chapter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:864
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:66
 msgid "Text section:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:44
 msgid "Textbook:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1403
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:58
+msgid ""
+"The \"Edit Target Set\" button at the top of the page will take you to the "
+"Problem Set Editor which will allow you to edit dates, assign users and "
+"other information about the problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:115
+msgid ""
+"The \"Score\" tab will export achievement data to a CSV file that can be "
+"downloaded.  The export contains the global data including number of "
+"achievement points and current level of each student.  In addition for each "
+"selected achievement, a column for if the achievement was earned (1) or not "
+"earned (0) will be added to the CSV."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:194
+msgid ""
+"The <strong>Assigned sets</strong> column (x/y) indicates that x sets out of"
+" y sets avaiable have been assigned to this student. Click this link to "
+"assign or unassign sets to this student, to adjust due dates, or to adjust "
+"the grades on a homework set for a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:20
+msgid ""
+"The <strong>Set Detail</strong> page can be viewed in one of two distinct "
+"modes:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:189
+msgid ""
+"The <strong>login name</strong> column links allow you to \"act as\" a "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:191
+msgid ""
+"The <strong>pencil</strong> in the login column allows you to edit that "
+"student's data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:64
 msgid ""
 "The Attempts figure is the global average of the number of attempts (both "
 "correct and incorrect) individuals take on this problem.  A high figure may "
@@ -6138,7 +8203,7 @@ msgid ""
 "each part before continuing and each such  submittal counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1485
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:124
 msgid ""
 "The Attempts figure is the local average of the number of attempts (both "
 "correct and incorrect) individuals at your institution take on this problem."
@@ -6148,14 +8213,14 @@ msgid ""
 "counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1819
+#: /opt/webwork/webwork2/conf/defaults.config:1721
 msgid ""
 "The Maximum number of times Show me Another can be used per problem by a "
 "student. If set to -1 then there is no limit to the number of times that "
 "Show Me Another can be used."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1787
+#: /opt/webwork/webwork2/conf/defaults.config:1689
 msgid ""
 "The Reduced Scoring Period is the default period before the due date during "
 "which all additional work done by the student counts at a reduced rate. When"
@@ -6168,7 +8233,7 @@ msgid ""
 "work done counts 50% of the original.\" will be displayed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:78
 msgid ""
 "The Status figure is the global average of the Status individuals have "
 "earned on this problem. The Status is the percentage correct (from 0% to "
@@ -6177,7 +8242,7 @@ msgid ""
 "a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1506
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:138
 msgid ""
 "The Status figure is the local average of the Status individuals at your "
 "institution have earned on this problem. The Status is the percentage "
@@ -6186,47 +8251,61 @@ msgid ""
 "students will work on a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1262
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:11
 msgid "The WeBWorK Project"
 msgstr "tr: The WeBWorK Project"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:822
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:25
+msgid ""
+"The WeBWorK administrators need to be added to the course in order for them "
+"to access the course.  Unchecking this option will make it so WeBWorK "
+"administrators cannot directly login to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:129
+msgid ""
+"The achievement evaluator is the perl code that is run after each submit to "
+"determine if an achievement is earned or not.  Click on the \"Edit "
+"Evaluator\" link to edit the evaluator."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:26
 msgid ""
 "The adjusted status of a problem is the larger of the problem's status "
 "andthe weighted average of the status of those problems which count towards "
 "the parent grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1677
+#: /opt/webwork/webwork2/conf/defaults.config:1579
 msgid ""
 "The amount of time (in minutes) after the due date that the Answers are "
 "available to student to view.  You can change this for individual homework, "
 "but WeBWorK will use this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1667
+#: /opt/webwork/webwork2/conf/defaults.config:1569
 msgid ""
 "The amount of time (in minutes) before the due date when the assignment is "
 "opened.  You can change this for individual homework, but WeBWorK will use "
 "this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:386
 msgid "The answer above is NOT correct."
 msgstr "Tu respuesta NO es correcta."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:375
 msgid "The answer above is correct."
 msgstr "Tu respuesta es correcta."
 
 #. ($filename, $ce->{mail}{maxAttachmentSize})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:230
 msgid ""
 "The attached file \"%1\" exceeds the allowed attachment size of "
 "%quant(%2,megabyte)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:421
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:496
 msgid ""
 "The child problems for this problem will become visible to the student when "
 "they either have more incorrect attempts than is specified here, or when "
@@ -6235,173 +8314,252 @@ msgid ""
 "attempts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:704
+#. ('href="http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files"
+#. target="Webworkdocs"',
+#. '<code>demoCourse.lst</code>','<code>.csv</code>','<code>.lst</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:59
+msgid ""
+"The classlist files are stored in the templates directory and provide a "
+"convenient way to enter a large number of students into your class. To view "
+"the format for <strong>ClassList files</strong> see the <a %1>ClassList "
+"specification</a> or download the %2 file and use it as a model. ClassList "
+"files can be prepared using a spreadsheet and then saved as %3 (comma "
+"separated values) text files.  However, to access as a classlist file, the "
+"file suffix needs to be changed to %4, which can be done with the \"Rename\""
+" button."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:16
 msgid ""
 "The configuration module did not find the data it needs to function.  Have "
-"your site administrator check that Constants.pm is up to date."
+"your site administrator check that site configuration files are up to date."
+msgstr ""
+
+#. ($archive_courseID,					$archive_path)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:80
+msgid ""
+"The course \"%1\" has already been archived at \"%2\". This earlier archive "
+"will be erased.  This cannot be undone."
 msgstr ""
 
-#. (CGI::b($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:151
+#. (tag('strong', stash('courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:8
 msgid ""
 "The course %1 uses an external authentication system (%2). Please go there "
 "to log in again."
 msgstr ""
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:186
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:17
 msgid ""
 "The course %1 uses an external authentication system (%2). Please return to "
 "that system to access this course."
 msgstr ""
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:191
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:23
 msgid ""
 "The course %1 uses an external authentication system (%2). You've "
 "authenticated through that system, but aren't allowed to log in to this "
 "course."
 msgstr ""
 
-#. ($archive_courseID,						$archive_path)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2243
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:30
+msgid "The course database must be upgraded before archiving this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:30
+msgid "The course database must be upgraded before renaming this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:26
+msgid ""
+"The current mode should be made clear by the information at the top of the "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:46
 msgid ""
-"The course '%1' has already been archived at '%2'. This earlier archive will"
-" be erased.  This cannot be undone."
+"The current value of the achievement counter. Changes to this variable will "
+"be saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1995
+#: /opt/webwork/webwork2/conf/defaults.config:1897
 msgid "The default display mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1855
+#: /opt/webwork/webwork2/conf/defaults.config:1757
 msgid ""
 "The default number of attempts before the problem is re-randomized. ( 0 => "
 "never )"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1854
+#: /opt/webwork/webwork2/conf/defaults.config:1756
 msgid ""
 "The default number of attempts between re-randomization of the problems ( 0 "
 "=> never)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:251
-msgid "The directory you specified doesn't exist"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:73
+msgid ""
+"The description shown to students which states what action is needed to earn"
+" the achievement."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1829
-msgid "The display was already cleared."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:5
+msgid "The directory you specified doesn't exist"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2111
+#: /opt/webwork/webwork2/conf/defaults.config:2032
 msgid ""
 "The e-mail verbosity level controls how much information is automatically "
-"added to feedback e-mails.  Levels are<ol><li value=\"Simple\"> Simple: send"
-" only the feedback comment and context link</li><li value=\"Standard\"> "
-"Standard: as in Simple, plus user, set, problem, and PG data</li><li "
-"value=\"Debug\"> Debug: as in Standard, plus the problem environment "
-"(debugging data)</li></ol>"
+"added to feedback e-mails.  Levels are<ol><li> Simple: send only the "
+"feedback comment and context link</li><li> Standard: as in Simple, plus "
+"user, set, problem, and PG data</li><li> Debug: as in Standard, plus the "
+"problem environment (debugging data)</li></ol>"
 msgstr ""
 
-#. ($achievementName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:625
-msgid "The evaluator for %1 has been renamed to '%2'."
+#. ($achievementName,				$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:293
+msgid "The evaluator for %1 has been renamed to \"%2\"."
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:339
-msgid ""
-"The file %1/%2 already exists and cannot be overwritten. The message was not"
-" saved"
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:246
+msgid "The file \"%1\" cannot be found."
+msgstr ""
+
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:526
+msgid "The file \"%1\" cannot be read!"
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:190
-msgid "The file %1/%2 cannot be found."
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:522
+msgid "The file \"%1\" is a directory!"
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:181
-msgid "The file %1/%2 is not readable by the webserver."
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:259
+msgid "The file \"%1\" is a template. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:373
-msgid "The file '%1' cannot be found."
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:250
+msgid "The file \"%1\" is protected. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1004
-msgid "The file '%1' cannot be read!"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:19
+msgid "The file $file does not appear to be a text or image file."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:380
-msgid "The file '%1' is a blank problem!"
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:277
+msgid ""
+"The file %1 already exists and cannot be overwritten. The message was not "
+"saved."
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:998
-msgid "The file '%1' is a directory!"
+#. ("$emailDirectory/$openfilename",				$emailDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:156
+msgid ""
+"The file %1 cannot be found. Check whether it exists and whether the "
+"directory %2 can be read by the webserver. "
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:375
-msgid "The file '%1' is protected!"
-msgstr "¡El archivo %1 está protegido!"
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
+msgid ""
+"The file %1 is not contained in the course templates directory and can not "
+"be modified."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:598
+#. ("$emailDirectory/$openfilename")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:148
+msgid ""
+"The file %1 is not readable by the webserver. Check that it's permissions "
+"are set correctly."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:203
 msgid "The file does not appear to be a text file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:88
 msgid "The file you are trying to download doesn't exist"
 msgstr ""
 
 #. ($filename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:221
 msgid "The filetype of the attached file \"%1\" is not allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3843
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2149
 msgid "The following courses were successfully hidden:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3908
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2218
 msgid "The following courses were successfully unhidden:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4121
-msgid "The following upgrades are available for your WeBWorK system:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:34
+msgid "The following describes how the checkboxes alter the scoring output"
 msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2081
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:66
 msgid ""
 "The following users are NOT assigned to this set and will be ignored: %1"
 msgstr ""
 
-#. (join('.', @{$problemSeqs[$children_counts_indexs[0]]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:288
+msgid "The given file path is not a valid location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:49
+msgid "The goal value of the achievement counter."
+msgstr ""
+
+#. (join('.', @{ $problemSeqs[ $children_counts_indexs[0] ] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1334
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the score of problem %1."
 msgstr ""
 
-#. (join(', ', map({join('.', @{$problemSeqs[$_]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2064
+#. (join(', ', map({ join('.', @{ $problemSeqs[$_] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the weighted average of the problems: %1."
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1954
-msgid "The hardcopy header for set %1 has been renamed to '%2'."
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1078
+msgid "The hardcopy header for set %1 has been renamed to \"%2\"."
+msgstr ""
+
+#. ($showHintsAfter)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:36
+msgid ""
+"The hint shown is an instructor preview and will be shown to students after "
+"%quant(%1,attempt)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:32
+msgid ""
+"The hint shown is an instructor preview and will not be shown to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:22
+msgid ""
+"The information box on the right displays information about the course. This"
+" is useful for leaving course wide messages for students. It contains text "
+"from the file templates/course_info.txt. Instructors can edit this file from"
+" the web (click on the \"Edit\" link)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:111
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:30
 msgid ""
 "The initial value is the answer sub score for the answer that is currently "
 "shown.  If this is modified, it will be used to compute the total problem "
@@ -6409,37 +8567,100 @@ msgid ""
 "shown answer if the page is reloaded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:161
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:97
+msgid ""
+"The initial value is the currently saved score as a point value computed "
+"using the percent score.  This point value is used to compute the percent "
+"score (rounded to a whole percent) that can be saved."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:145
 msgid "The initial value is the currently saved score for this student."
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_oldCourseInstitution,
 #. $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
 msgid ""
 "The institution associated with the course %1 has been changed from %2 to %3"
 msgstr ""
 
-#. ($rename_newCourseID, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1498
+#. ($rename_newCourseID, $optional_arguments{courseInstitution})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:729
 msgid "The institution associated with the course %1 is now %2"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:599
+msgid ""
+"The instructor account with user id %1 does not exist.  Instructor accounts "
+"must be created manually."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:635
 msgid ""
 "The instructor account with user id %1 does not exist.  Please create the "
 "account manually via WeBWorK."
 msgstr ""
 
-#. ($r->param('new_set_name')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1897
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:87
+msgid ""
+"The key maps that are available are \"default\", \"emacs\", \"sublime\", and"
+" \"vim\". The \"default\" key map has the standard behavior of a browser "
+"text area. You can use Ctrl-C to copy, Ctrl-V to paste, Ctrl-F to search, "
+"etc. If you are more comfortable with the \"emacs\", \"sublime\", or \"vim\""
+" text editors then you may choose to use one of those key maps instead."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:75
+msgid "The large text window"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:27
+msgid ""
+"The list of files include regular files, directories (ending in a \"/\") and"
+" links (ending in a \"@\")."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:52
+msgid ""
+"The login name cannot be changed. (It is the primary key for the student's "
+"data.) If you make a mistake in the login name at the beginning of the "
+"course (before any work has been done) then it is best to simply add a new "
+"student with the correct entry and drop the student with the bad login name."
+" (See drop and delete students below.) If the login name must be changed "
+"after a user has started working assignments, then contact your system "
+"administrator, who can use the webwork2 \"bin/change_user_id\" script to "
+"change the user id."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:20
+msgid ""
+"The main page allows access to set and student statistics.  When selecting a"
+" student, their grades page is shown, which lists set totals and per problem"
+" grades for each set assigned to the student.  When selecting a set, various"
+" statistics and histograms are shown for the overall grades of students who "
+"are currently enrolled or auditing the course."
+msgstr ""
+
+#. ('href="http://webwork.maa.org/wiki" target="ww_wiki"',
+#. 'href="http://webwork.maa.org/wiki/Instructors" target="ww_wiki"')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:24
+msgid ""
+"The main page for WeBWorK documentation is the <a %1>webwork wiki</a> while "
+"specific help for instructors setting up a course are in the <a "
+"%2>instructors' section</a>."
+msgstr ""
+
+#. ($c->param('new_set_name')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:569
 msgid ""
 "The name \"%1\" is not a valid set name.  Use only letters, digits, dashes, "
 "underscores, periods, and spaces."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1530
+#: /opt/webwork/webwork2/conf/defaults.config:1432
 msgid ""
 "The name of course information file (located in the templates directory). "
 "Its contents are displayed in the right panel next to the list of homework "
@@ -6456,151 +8677,249 @@ msgid ""
 "go back to the LMS to access something in the WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:63
+msgid "The number of points earned for earning the achievement."
+msgstr ""
+
 #. ($openDate, $dueDate, $answerDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1104
 msgid ""
 "The open date: %1, close date: %2, and answer date: %3 must be defined and "
 "in chronological order."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:702
+#. ($path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:393
+msgid "The original path is not in a valid location. Using failsafe %1"
+msgstr ""
+
+#. ($forcedSourceFile)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:510
+msgid "The original path to the file is %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:262
 msgid "The password and password confirmation for the instructor must match."
 msgstr ""
 
-#. (CGI::b($r->maketext("[_1]'s Current Password", $user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:27
+msgid ""
+"The password can be any combination of letters, numbers and special symbols."
+" Students are encouraged to use all three, and stay away from dictionary "
+"words. The password should not be the same as any password used elsewhere, "
+"such as for an email account. The password will only be present on the page "
+"if the user has permission to change the password."
+msgstr ""
+
+#. ($c->tag(                                               'b',
+#. $c->maketext(                                                   "[_1]'s
+#. Current Password",
+#. $c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:95
 msgid ""
 "The password you entered in the %1 field does not match your current "
 "password. Please retype your current password and try again."
 msgstr ""
 
-#. (CGI::b($r->maketext("[_1]'s New Password",         $e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:105
+#. ($c->tag('b', $c->maketext("[_1]'s New Password",         $e_user_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:82
 msgid ""
 "The passwords you entered in the %1 and %2 fields don't match. Please retype"
 " your new password and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:789
-msgid "The path to the original file should be absolute"
-msgstr "tr: The path to the original file should be absolute"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:374
+msgid "The path can not be the temporary edit directory."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:667
-msgid ""
-"The percentage of active students with correct answers for each problem"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:370
+msgid "The path to the original file should be absolute."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:131
 msgid ""
 "The percentage of students receiving at least these scores. The median score"
 " is in the 50% column."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:458
 msgid "The prerequisite conditions have not been met for set '%1'."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1917
-msgid "The problem set is not yet open"
-msgstr ""
-
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2012
-msgid "The recorded score for this version is  %1/%2."
+#. (q(down menu to change which student's seed and answers are shown.  Use the
+#. "Mark Correct" checkbox to set)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:26
+msgid ""
+"The problem is shown at the top with the seed and answers of the selected "
+"student.  Use the drop "
 msgstr ""
 
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2021
-msgid "The recorded score for this version is %1/%2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:62
+msgid "The problem set is not yet open"
 msgstr ""
 
 #. ($origReducedScoringDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1971
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1121
 msgid ""
 "The reduced credit date %1 in the file probably was generated from the Unix "
 "epoch 0 value and is being treated as if it was Unix epoch 0."
 msgstr ""
 
 #. ($openDate, $dueDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1982
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1135
 msgid ""
 "The reduced credit date should be between the open date %1 and close date %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1220
 msgid ""
 "The reduced scoring date should be between the open date and close date."
 msgstr ""
 
 #. ($tempFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:307
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:298
 msgid "The requested file \"%1\" does not exist on the server."
 msgstr ""
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2085
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1389
 msgid "The score for this problem can count towards score of problem %1."
 msgstr ""
 
-#. ($setName, $effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:306
-msgid "The selected problem set (%1) is not a valid set for %2"
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:69
+msgid ""
+"The scoring files are stored in the scoring directory and are produced using"
+" the \"Scoring Tools\" page or the scoring command in the \"Instructor "
+"Tools\" module. These files can be downloaded, modified in a spreadsheet "
+"(for example, to add midterm scores) and then uploaded again to the scoring "
+"directory to be merged with email messages. (Use a new file name, other than"
+" %1, when uploading to prevent the scoring module from overwriting an "
+"uploaded file.)"
 msgstr ""
 
-#. ($urlpath->arg("setID")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1467
-msgid "The selected problem set (%1) is not a valid set for %2%3:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:52
+msgid ""
+"The second row of the problem collection area is for browsing directories. "
+"The OPL will be there as well as any other directories that you may set up "
+"(for example Contrib). If this is selected, all subdirectories containing "
+"problems will be listed."
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1946
-msgid "The set header for set %1 has been renamed to '%2'."
+#. (stash('setID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet.html.ep:13
+msgid "The selected problem set (%1) is not a valid set for %2."
+msgstr ""
+
+#. ($setID, $effectiveUserID, $c->{invalidVersionCreation} ? " (acted as by
+#. $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:77
+msgid "The selected problem set (%1) is not a valid set for %2: %3"
+msgstr ""
+
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1066
+msgid "The set header for set %1 has been renamed to \"%2\"."
 msgstr ""
 
-#. ($newSetName)
 #. ($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1164
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:491
+msgid ""
+"The set name \"%1\" is already in use. Pick a different name if you would "
+"like to start a new set. No set created."
+msgstr ""
+
+#. ($newSetName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:584
 msgid ""
 "The set name '%1' is already in use.  Pick a different name if you would "
 "like to start a new set."
 msgstr ""
 
-#. ($setID, $editingSetVersion, $editForUser[0])
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2109
-msgid "The set-version (%1, version %2) is not assigned to user %3."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:58
+msgid ""
+"The sets checked below will be visible to students or hidden from students. "
+"Useful for preparing sets ahead of time, but not showing them to students; "
+"or for temporarily hiding a set which has a mistake in it while it is being "
+"fixed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:54
+msgid ""
+"The sets checked below will become available for editing the due dates and "
+"visibility."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:73
+msgid ""
+"The sets checked below will written to set definition files, to be saved for"
+" future use, or to be transferred to another course. The set definition "
+"files can be uploaded/downloaded using the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:551
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:29
+msgid ""
+"The simple configuration file is the name of the configuration file created "
+"when using the \"Course Configuration\" page to configure course options.  "
+"This option sets if this configuration file is copied from the old course or"
+" not and instead use the server defaults."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:521
 msgid "The solution has been removed."
 msgstr ""
 
-#. ($fullSetName, $prettyProblemNumber, $self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1975
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:33
+msgid ""
+"The solution shown is an instructor preview and will only be shown to "
+"students after the due date."
+msgstr ""
+
+#. ($c->{fullSetID},
+#. $c->{prettyProblemNumber},
+#. $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1103
 msgid ""
-"The source file for 'set %1 / problem %2 has been changed from '%3' to '%4'"
+"The source file for \"set %1 / problem %2\" has been changed from \"%3\" to "
+"\"%4\"."
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2133
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1209
+msgid ""
+"The temporary file %1 is not contained in the course templates directory and"
+" can not be deleted."
+msgstr ""
+
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:689
+msgid ""
+"The temporary file %1 is not in the course templates directory and can not "
+"be deleted!"
+msgstr ""
+
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:349
 msgid ""
 "The test (which is version %1) may  no longer be submitted for a grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1927
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1042
 msgid ""
 "The text box now contains the source of the original problem. You can "
 "recover lost edits by using the Back button on your browser."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:214
+#. (			% . 'but the result will not be counted.')
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:23
 msgid ""
 "The time limit on this assignment was exceeded. The assignment may be "
-"checked, but the result will not be counted."
+"checked, "
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1657
+#: /opt/webwork/webwork2/conf/defaults.config:1559
 msgid ""
 "The time of the day that the assignment is due.  This can be changed on an "
 "individual basis, but WeBWorK will use this value for default when a set is "
@@ -6608,24 +8927,39 @@ msgid ""
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1443
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:689
 msgid "The title of the course %1 has been changed from %2 to %3"
 msgstr ""
 
-#. ($rename_newCourseID, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1491
+#. ($rename_newCourseID, $optional_arguments{courseTitle})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:722
 msgid "The title of the course %1 is now %2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:167
+msgid ""
+"The top number is the percent score on the problem.  A period (.) indicates "
+"a problem has not been attempted. The bottom number is the number of "
+"incorrect attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:25
+msgid ""
+"The total grade row at the bottom shows the total score and percent average "
+"over all open assignments.  The total grade row can be shown/hidden under "
+"general course configuration settings."
+msgstr ""
+
 #. ($enableReducedScoring)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1151
 msgid ""
 "The value %1 for enableReducedScoring is not valid; it will be replaced with"
 " 'N'."
 msgstr ""
 
 #. ($timeCap)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2032
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1209
 msgid ""
 "The value %1 for the capTimeLimit option is not valid; it will be replaced "
 "with '0'."
@@ -6633,81 +8967,90 @@ msgstr ""
 
 #. ($hideScore)
 #. ($hideScoreByProblem)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2023
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1178
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1189
 msgid ""
 "The value %1 for the hideScore option is not valid; it will be replaced with"
 " 'N'."
 msgstr ""
 
 #. ($hideWork)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1200
 msgid ""
 "The value %1 for the hideWork option is not valid; it will be replaced with "
 "'N'."
 msgstr ""
 
 #. ($relaxRestrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2045
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1235
 msgid ""
 "The value %1 for the relaxRestrictIP option is not valid; it will be "
 "replaced with 'No'."
 msgstr ""
 
 #. ($restrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2037
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1221
 msgid ""
 "The value %1 for the restrictIP option is not valid; it will be replaced "
 "with 'No'."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:46
+msgid "The visible name/title of the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:36
 msgid ""
 "The webwork server must be able to write to these directories. Please "
 "correct the permssion errors."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1537
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:83
+msgid "Theme"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1439
 msgid "Theme (refresh page after saving changes to reveal new theme.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:109
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:5
 msgid "Theme:"
 msgstr ""
 
 # Context is "Sort by ____ Then by _____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:843
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:872
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:30
 msgid "Then by"
 msgstr "Después por:"
 
-#. ($count_line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:603
+#. ($listingsCount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:52
 msgid "There are %1 matching WeBWorK problems"
 msgstr "%1 problemas cumplen con los criterios seleccionados"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1625
+#: /opt/webwork/webwork2/conf/defaults.config:1527
 msgid ""
 "There are currently two hardcopy themes to choose from: One Column and Two "
 "Columns.  The Two Columns theme is the traditional hardcopy format.  The One"
 " Column theme uses the full page width for each column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2979
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1519
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
 "least one table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1243
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:23
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
-"least one table.  They can only be removed when upgrading the course."
+"least one table.  They can be removed when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1404
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
 "least one table. Check the checkbox by the field to delete it when upgrading"
@@ -6715,63 +9058,48 @@ msgid ""
 "is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1508
 msgid "There are extra database tables which are not defined in the schema."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2833
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1389
 msgid "There are extra database tables which are not defined in the schema. "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:15
 msgid ""
 "There are extra database tables which are not defined in the schema.  These "
 "can be deleted when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:601
-msgid "There are no matching WeBWorK problems"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:976
-msgid "There are no set definition files in this course to look at."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2199
-msgid ""
-"There are tables or fields missing from the database.  The database must be "
-"upgraded before archiving this course."
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:29
+msgid "There are many options available at the bottom:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4108
-msgid "There are upgrades available for the Open Problem Library."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:49
+msgid "There are no completed versions of this test."
 msgstr ""
 
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4072
-msgid ""
-"There are upgrades available for your current branch of PG from branch %1 in"
-" remote %2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:51
+msgid "There are no matching WeBWorK problems"
 msgstr ""
 
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4010
-msgid ""
-"There are upgrades available for your current branch of WeBWorK from branch "
-"%1 in remote %2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:8
+msgid "There are no set definition files in this course to look at."
 msgstr ""
 
 #. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:273
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:87
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
 "their name, you destroy all of the data for achievement %1 for this student."
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:230
+#. (tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:91
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
@@ -6779,37 +9107,29 @@ msgid ""
 "student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:205
-msgid ""
-"There is NO undo for this function.  Do not use it unless you know what you "
-"are doing!  When you unassign sets using this button, or by unchecking their"
-" set names, you destroy all of the data for those sets for this student."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:68
+msgid "There is NO undo for unassigning a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:234
-msgid "There is NO undo for unassigning a set."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:125
+msgid ""
+"There is NO undo for unassigning sets. Do not do so unless you know what you"
+" are doing!  When you unassign sets by unchecking set names and clicking "
+"save, you destroy all of the data for those sets for this student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:174
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:177
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:21
 msgid "There is NO undo for unassigning students."
 msgstr "La acción \"desasignar estudiantes\" NO se puede deshacer."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4069
-msgid "There is a new version of PG available."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4007
-msgid "There is a new version of WeBWorK available."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:529
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:490
 msgid "There is a written solution available."
 msgstr ""
 
 #. ($message_file, $merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:50
 msgid ""
 "There is no additional grade information.  A message about additional grades"
 " can go in [TMPL]/email/%1. It is merged with the file [Scoring]/%2. These "
@@ -6818,185 +9138,324 @@ msgid ""
 msgstr ""
 
 #. ($continueTimeLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:486
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:25
 msgid ""
 "There is no time remaining on the currently open test. Click continue below "
 "and then click \"Grade Test\" within %1 seconds to submit the test for a "
 "grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:856
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:65
 msgid "There is no undo for deleting files or directories!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:534
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:495
 msgid ""
 "There is no written solution available for this problem, but you can still "
 "view the correct answers."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:537
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:498
 msgid "There is no written solution available for this problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1539
+#: /opt/webwork/webwork2/conf/defaults.config:1441
 msgid ""
-"There is one main theme to choose from: math4. It has two variants, "
-"math4-green and math4-red. The theme specifies a unified look and feel for "
-"the WeBWorK course web pages."
+"There is one main theme to choose from: math4. It has three variants: "
+"math4-green, math4-red, and math4-yellow. The theme specifies a unified look"
+" and feel for the WeBWorK course web pages."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2270
-msgid ""
-"There may be something wrong with this question. Please inform your "
-"instructor including the warning messages below."
-msgstr "Puede que haya problemas técnicos con esta pregunta. Por favor informa a tu instructor e incluye los mensajes de alerta que ves abajo en la página."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:441
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator if this recurs."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:284
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:307
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:475
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:484
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:511
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:543
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:219
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:354
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:492
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:536
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:575
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:172
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:189
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:212
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:227
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:365
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:447
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1935
+#. ('href="https://webwork.maa.org/wiki/Set_Definition_Files"
+#. target="Webworkdocs"')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:48
+msgid ""
+"These are stored in the templates directory. The format of <strong>Set "
+"Definition files</strong> is described in the <a %1>Set Definition "
+"specification</a>. Set definition files are mainly useful for transferring "
+"set assignments from one course to another and are created when exporting a "
+"problem set from the \"Hmwk Sets Editor\".  Each set defintion file contains"
+" a list of problems used and the dates and times. These definitions can be "
+"imported into the current course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:77
+msgid ""
+"These are the files from which problems are generated and are located in the"
+" templates directory or in subdirectories. They can be edited directly using"
+" the \"Edit\" link on each problem page or from the \"Hmwk Sets Editor\". "
+"The File Manager allows you to upload or download these files. \tDirectories"
+" that start with \"set\" contain pg files and are generated when exporting a"
+" problem set in which there are local versions of a problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:40
+msgid ""
+"These options will only be shown if the user has the permission to change "
+"display settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:44
+msgid ""
+"These problems require some application of algorithms, but do not rise to "
+"the level of a full word problem. For example, \"Identify the local extrema "
+"for f(x) = ...\". One has to apply algorithms and interpret results."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1837
 msgid ""
 "These users and higher get the \"Show Past Answers\" button on the problem "
 "page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:17
 msgid "This action can take a long time if there are many students."
 msgstr "Esta acción puede tomar bastante tiempo si hay muchos estudiantes."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:168
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:12
 msgid "This action will not overwrite existing users."
 msgstr ""
 
-#. (CGI::b($r->maketext("Guest Login")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:279
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:20
+msgid ""
+"This allows for the viewing, downloading, uploading and other management of "
+"files in the course.  Select a file or set of files (using CTRL or SHIFT) "
+"and click the desired button on the right.  Many actions can only be done "
+"with a single file (like view). Selecting a directory or set of files and "
+"clicking \"Make Archive\" creates a compressed tar file with the name "
+"COURSE_NAME.tgz"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:34
+msgid ""
+"This browses the Open Problem Library (OPL) in category "
+"(Subject/Chapter/Section) form. Select the desired categories (all three do "
+"not need to be selected) and click \"View Problems\". If the \"Include "
+"Contrib\" box is selected then those problems in the Contrib section of the "
+"OPL that have the categories defined are also included. Contrib problems are"
+" problem that haven't been vetted as thoroughly as OPL problems. If you want"
+" hints or solutions included while browsing select the appropriate box."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:49
+msgid ""
+"This button is also present both at top and the bottom of the page. Discards"
+" all changes, reloading the page by re-reading the database information for "
+"this set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:39
+msgid ""
+"This button is present both at top and the bottom of the page. Any and all "
+"changes made to any part of the set will be saved with one important "
+"exception: When editing the set for one or more students, you can choose to "
+"override the default value (defined for the set in general) by clicking on "
+"the checkbox and providing a value (or possibly leaving blank) and checking "
+"the override checkbox. If you do <strong>NOT</strong> check the checkbox, "
+"the override value will be discarded and the default value for the set will "
+"be used for the users currently being edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:105
+msgid ""
+"This can computed from the answer sub scores above using the weights shown "
+"if they are modified.  Alternatively, enter the point score you want saved "
+"here (the above sub scores will be ignored)."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2005
+msgid ""
+"This configures if the single problem manual grader has inputs to enter "
+"problem scores as a percent, a point value, or both. Note, the problem score"
+" is always saved as a percent, so when using a point value, the problem "
+"score will be rounded to the nearest whole percent."
+msgstr ""
+
+#. (tag('b', maketext('Guest Login')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:72
 msgid ""
 "This course supports guest logins. Click %1 to log into this course as a "
 "guest."
 msgstr "Este curso permite ingresar como invitado. Haz clic en %1 para ingresar a este curso como invitado."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:851
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:58
+msgid ""
+"This determines if MathQuill answer blanks are enable for the user. This "
+"option is only present if MathQuill is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:63
+msgid ""
+"This determines if the MathView equation editor button will be appended to "
+"text answer blanks. his option is only present if MathView is enabled for "
+"the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:52
+msgid ""
+"This determines whether or not saved past answers are automatically filled "
+"in to the problem form when a student returns to a problem after having left"
+" the problem. This option is only visible if the user has the permission to "
+"show old answers."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:85
+msgid ""
+"This directory is accessible from the web. You can use it to store html "
+"documents or image documents that are used by the course. Do not store "
+"private information in this directory or in any subdirectory thereof. These "
+"documents can be linked to from within problems using the htmlLink macro."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:255
+msgid "This file is a template. You may use \"Save As\" to create a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:20
+msgid ""
+"This form can assign, unassign, and edit user data for a single achievement."
+"  You can assign the achievement to all current users or select which users "
+"to assign the achievement to and click Save.  You can unassign the "
+"achievement by unchecking a student's name (note all data will be deleted)."
+"  To unassign the achievement from all users, first select \"Allow "
+"unassign\" and then click the \"Unassign from All Users\" button. You can "
+"also toggle the earned status with the checkbox in the \"Earned\" column and"
+" edit the achievement counter for counting achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:19
+msgid ""
+"This gives the status and dates of the main set. Indvidual students may have"
+" different settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:51
 msgid "This homework set contains no problems."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1231
 msgid "This homework set is closed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1986
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1229
 msgid "This homework set is not yet open."
 msgstr "Esta tarea todavía no está disponible."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:932
-msgid ""
-"This is a blank problem template file and can not be edited directly. Use "
-"the 'NewVersion' action below to create a local copy of the file and add it "
-"to the current problem set."
-msgstr ""
-
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:423
 msgid "This is a new (re-randomized) version of the problem."
 msgstr ""
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:580
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:109
 msgid ""
 "This is a timed test. You will have %quant(%1,hour) and %quant(%2,minute) to"
 " complete the test."
 msgstr ""
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:592
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:119
 msgid ""
 "This is a timed test. You will have "
 "%quant(%1,hour,hours,)%quant(%2,minute,minutes,) to complete the test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:284
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:81
 msgid ""
-"This is the Achievement Editor.  It is used to edit the achievements "
-"available to students.  Please keep in mind the following facts: Achievments"
-" are displayed, and evaluated, in the order they are listed. The \"secret\" "
-"category creates achievements which are not visible to students until they "
-"are earned.  The \"level\" category is used for the achievements associated "
-"to a users level."
+"This is done by first entering the user as a student and then changing the "
+"permission level of the user. First edit the user by clicking on the pencil "
+"next to their name (or using the technique above for several users), then "
+"change their permssion level -- an entry blank at the far right of the "
+"screen, you may have to scroll to see it. The permission levels are"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:481
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:156
 msgid ""
-"This is the classlist editor page, where you can view and edit the records "
-"of all the students currently enrolled in this course.  The top of the page "
-"contains forms which allow you to filter which students to view, sort your "
-"students in a chosen order, edit student records, give new passwords to "
-"students, import/export student records from/to external files, or "
-"add/delete students.  To use, please select the action you would like to "
-"perform, enter in the relevant information in the fields below, and hit the "
-"\"Take Action!\" button at the bottom of the form.  The bottom of the page "
-"contains a table containing the student usernames and their information. "
-"Clicking on the links in the column headers of the table will sort the table"
-" by the field it corresponds to. The Login Name fields contain checkboxes "
-"for selecting the user.  Clicking the link of the name itself will allow you"
-" to act as the selected user.  There is also an edit link following the name"
-" which will take you to a page where you can edit the selected user's "
-"information.  Clicking the emails will allow you to email the corresponding "
-"user.  Clicking the links in the entries in the assigned sets columns will "
-"take you to a page where you can view and reassign the sets for the selected"
-" user. "
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page if you wish to assign a homework set to all students or a large group "
+"of students (e.g. a section)."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1810
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:161
 msgid ""
-"This is the default number of attempts before show me another becomes "
-"available to students.  It can be set to -1 to disable show me another by "
-"default."
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:456
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:171
 msgid ""
-"This is the homework sets editor page where you can view and edit the "
-"homework sets that exist in this course and the problems that they contain. "
-"The top of the page contains forms which allow you to filter which sets to "
-"display in the table, sort the sets in a chosen order, edit homework sets, "
-"publish homework sets, import/export sets from/to an external file, score "
-"sets, or create/delete sets.  To use, please select the action you would "
-"like to perform, enter in the relevant information in the fields below, and "
-"hit the \"Take Action!\" button at the bottom of the form.  The bottom of "
-"the page contains a table displaying the sets and several pieces of relevant"
-" information. The Edit Set Data field in the table contains checkboxes for "
-"selection and a link to the set data editing page.  The cells in the Edit "
-"Problems fields contain links which take you to a page where you can edit "
-"the containing problems, and the cells in the edit assigned users field "
-"contains links which take you to a page where you can edit what students the"
-" set is assigned to."
+"This is done from the \"Hmwk Sets Editor\" page or the \"Instructor tools\" "
+"page."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1699
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:71
+msgid ""
+"This is most easily done by importing a class list. The class list can be "
+"uploaded from your workstation to the server using the File Manager page. "
+"The class list must be a file ending in .lst and must have a specific <a "
+"href=\"http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files\">format</a>."
+" Once the file has been uploaded to the server the file will appear in the "
+"import action pop-up list (5th action). demoCourse.lst is available for most"
+" courses and adds the \"practice users\" which activate guest logins to the "
+"class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:23
+msgid ""
+"This is the administration course which is used to manage courses on this "
+"server.  Use the \"Admin Menu\" to select the desired action."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1996
+msgid ""
+"This is the default number of attempts a student must make before hints will"
+" be shown to the student. Set this to -1 to hide hints.  Note that this can "
+"be overridden with a per problem setting."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1712
+msgid ""
+"This is the default number of attempts before show me another becomes "
+"available to students.  It can be set to -1 to disable show me another by "
+"default."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1601
 msgid ""
 "This is the number of achievement points given to each user for completing a"
 " problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:166
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:150
 msgid ""
 "This is the only part of the score that is actually saved. This is computed "
 "from the answer sub scores above using the weights shown if they are "
@@ -7004,142 +9463,314 @@ msgid ""
 " scores will be ignored)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:388
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:19
+msgid "This is the standard entry point for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:92
+msgid ""
+"This is where email messages and templates are saved. You can upload or "
+"download files in this directory if you wish to save the files for later."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:77
 msgid ""
-"This is the past answer viewer.  Students can only see their answers, and "
-"they will not be able to see which parts are correct.  Instructors can view "
-"any users answers using the form below and the answers will be colored "
-"according to correctness."
+"This is where you edit the text of the problem template. Type Ctrl-Enter "
+"while this window has focus to re-render the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2462
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:669
 msgid ""
 "This is your last submission.  If you say yes, then your answers will be "
 "final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2466
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:673
 msgid ""
 "This is your only submission.  If you say yes, then your answers will be "
 "final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3038
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:42
+msgid ""
+"This link gives details for many macros. It links to documentation embedded "
+"in the macro files themselves."
+msgstr ""
+
+#. ('PGMLLab/PGML-lab.pg')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:63
+msgid ""
+"This links to a WeBWorK \"problem\" which allows you to try out fragments of"
+" PGML code. This link will not be available if the file %1 is not located in"
+" the templates directory of the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:33
+msgid "This links to a list of problem authoring techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:39
+msgid "This links to a page describing Math Object usage."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:72
+msgid "This links to problem authoring information on the WeBWorK wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:46
+msgid ""
+"This may be Mathjax, images, or plainText. Only the options that are enabled"
+" for the course will be available to select. This option is only visible if "
+"there is more than one display mode enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:42
+msgid "This option shows all pg problems in the course directory structure."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:47
+msgid ""
+"This option shows all problems in set definition files that are located in "
+"the course directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:44
+msgid ""
+"This option shows all problems in sets that have been created in the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:20
+msgid ""
+"This page allows one to edit the contents of PG problem files as well as set"
+" headers and other files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:20
+msgid ""
+"This page allows users to change their password, email address, and display "
+"settings used in problems. Note that you can hide this page entirely for "
+"students by setting permission levels to login_proctor or higher for the "
+"permissions to change password, change e-mail address, and change display "
+"settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:20
+msgid ""
+"This page allows you to configure course settings such as permission levels,"
+" display modes allowed, default display mode, email feedback behavior, and "
+"much more."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:20
+msgid ""
+"This page displays a student's current achievement level and progress toward"
+" the next level, and lists the rewards and badges that the student has "
+"earned. If rewards have been earned, then the student may also redeem those "
+"rewards."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:26
+msgid ""
+"This page gives access to information about the student, independent of the "
+"homework sets assigned to them."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:20
+msgid ""
+"This page gives information about mass LTI grade updates, and allows you to "
+"trigger a grade update for all users and all sets, all sets for one user, "
+"all users for one set, or one user for one set.  When a user is selected, "
+"the sets drop down menu is updated to only allow selecting sets assigned the"
+" selected user.  Similarly when a set is selected, the user menu is updated "
+"to only allow selecting valid users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:20
+msgid ""
+"This page is a collection of tools to modify users and sets.  These tools "
+"are short cuts for common actions that allow selecting multiple users or "
+"sets to act on at once.  Because multiple users and sets can be acted on at "
+"the same time, it is often more efficient to use this page when modifying "
+"multiple items.  For example, after selecting several users and a set you "
+"can change the close date for all selected users for that set.  This page "
+"also gives access to \"View/Edit all sets for one user\", which can be used "
+"to access settings for all sets including test versions for that user."
+msgstr ""
+
+#. (q(table to save any changes.  Each student's name links to that student's
+#. problem and opens up the)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:20
+msgid ""
+"This page is for manually grading a problem for all assigned students.  The "
+"table of students shows their last answers, percent score, and feedback "
+"comment.  The \"Save\" button is located below the "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:20
+msgid ""
+"This page is used to browse problems that will be used to fill problem sets."
+" The first step is to choose which set you are working on. If you need to "
+"create a new problem set fill in the blank next to the \"Create a New Set in"
+" This Course\" button and then press the button. Then choose which set you "
+"want to work on in the drop down menu."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:20
+msgid ""
+"This page is useful for monitoring student progress on assignments. Student "
+"progress can either be viewed for a single set or for a single student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:20
+msgid ""
+"This page manages all of the homework sets (including quizzes/tests). The "
+"following allow editing directly of a single problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:20
+msgid ""
+"This page shows the student's current grades for all sets they are assigned "
+"to.  Only visible sets are shown to the student, while invisible set names "
+"are italic when viewed as an instructor.  Students can only see the per "
+"problem grades on open assignments."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3169
 msgid "This problem contains a video which must be viewed online."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:602
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:631
 msgid "This problem has more than one part."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2059
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2293
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1323
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1576
 msgid ""
 "This problem has open subproblems.  You can visit them by using the links to"
 " the left or visiting the set page."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem.html.ep:66
+msgid "This problem is not valid."
+msgstr ""
+
 #. ($prettyID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2619
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:399
 msgid "This problem uses the same source file as number %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:418
 msgid "This problem will not count towards your grade."
 msgstr ""
 
-#. ($EMAIL)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1109
+#. ($ur->email_address)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:1
 msgid "This sample mail would be sent to %1"
 msgstr ""
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2088
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1399
 msgid ""
 "This score for this problem does not count for the score of problem %1 or "
 "for the set."
 msgstr ""
 
-#. ($message_file,		$merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:167
+#. ($message_file,				$merge_file)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:127
 msgid ""
 "This scoring message is generated from [TMPL]/email/%1. It is merged with "
 "the file [Scoring]/%2. These files can be edited using the \"Email\" link "
 "and the \"File Manager\" link in the left margin."
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2215
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:155
 msgid "This set %1 is assigned to %2."
 msgstr "Esta tarea (%1) está asignada a %2."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2932
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:678
 msgid "This set doesn't contain any problems yet."
 msgstr ""
 
-#. ($beginReducedScoringPeriod, $dueDate, $reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:334
+#. ($c->formatDateTime($reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:44
 msgid ""
 "This set had a reduced scoring period that started on %1 and ended on %2.  "
 "During that period all work counted for %3% of its value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:78
 msgid ""
 "This set has a set-level proctor password to authorize logins. Enter the "
 "password below."
 msgstr ""
 
-#. (CGI::span({class=>$visiblityStateClass}, $visiblityStateText)
-# Context is "This set is visible" or "This set is hidden"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:532
-msgid "This set is %1"
-msgstr "Esta tarea está %1"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:411
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:59
 msgid "This set is hidden from students."
 msgstr ""
 
 #. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:330
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:40
 msgid ""
 "This set is in its reduced scoring period.  All work counts for %1% of its "
 "value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:65
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:51
+msgid "This set is not assigned to any students."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:57
 msgid "This set is visible to students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:190
-msgid "This set needs to be assigned to you before you can grade it."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:42
+msgid "This set or problem is not valid."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:158
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:164
 msgid ""
 "This set will be unavailable to students until they have earned a certain "
-"score on the sets specified in this field.  The sets should be written as a "
-"comma separated list.  The minimum score required on the sets is specified "
-"in the following field."
+"score on the sets specified in this field. The sets should be written as a "
+"comma separated list. The minimum score required on the sets is specified in"
+" the following field."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:111
+msgid ""
+"This should be done cautiously. Once a student is deleted from a course "
+"their data is lost forever and cannot be recovered. They can be added to the"
+" course as a new student, but all of their homework set assignments and "
+"homework has been permanently deleted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2007
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1962
 msgid "This source file does not exist!"
 msgstr "¡Este archivo no existe!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1961
 msgid "This source file is a directory!"
 msgstr "¡Este archivo es un directorio!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1963
 msgid "This source file is not a plain file!"
 msgstr "¡Este archivo no es un archivo de texto!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2005
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1960
 msgid "This source file is not readable!"
 msgstr "¡Este archivo no se pudo leer!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:358
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+msgid ""
+"This specifies the number of attempts before hints are shown to students. "
+"The value of -2 uses the default from course configuration. The value of -1 "
+"disables hints. Note that this will only have an effect if the problem has a"
+" hint."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
 msgid ""
 "This specifies the rerandomization period: the number of attempts before a "
 "new version of the problem is generated by changing the Seed value. The "
@@ -7147,134 +9778,175 @@ msgid ""
 "disables rerandomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:651
-msgid ""
-"This table lists the current attempts for this test/quiz, along with its "
-"status, score, start date, and close date. Click on the version link to "
-"access that version. "
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:626
-msgid "This test is closed."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:548
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:81
 msgid "This test requires a proctor password to continue."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:600
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:126
 msgid "This test requires a proctor password to start."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2248
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2323
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:45
+msgid "This will determine if the output is in one or two columns."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:21
 msgid "Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:249
 msgid "Time Interval for New Test Versions (min; 0=infty)"
 msgstr ""
 
-#. ($elapsedTime,$allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:159
+msgid "Time Remaining"
+msgstr ""
+
+#. ($c->{elapsedTime}, sprintf('%.0f', 10 * ($c->{set}->due_date -
+#. $c->{set}->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:336
 msgid "Time taken on test: %1 min (%2 min allowed)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
 msgid "Timestamp"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1610
+#: /opt/webwork/webwork2/conf/defaults.config:1512
 msgid "Timezone for the course"
 msgstr ""
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:512
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:330
 msgid "To access this set you must score at least %1% on set %2."
 msgstr ""
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:514
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:336
 msgid ""
 "To access this set you must score at least %1% on the following sets: %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:53
 msgid ""
 "To add an additional instructor to the new course, specify user information "
 "below. The user ID may contain only numbers, letters, hyphens, periods "
 "(dots), commas,and underscores."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:42
 msgid ""
 "To add the WeBWorK administrators to the new course (as administrators) "
 "check the box below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:239
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:118
+msgid ""
+"To assign one or more sets to an individual student click in the column "
+"\"Assigned Sets\" in the student's row. This will take you to a page where "
+"you can assign and unassign homework sets and change the due dates for "
+"homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:79
 msgid ""
 "To change status (scores or grades) for this student for one set, click on "
 "the individual set link."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:621
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:106
+msgid ""
+"To copy the templates and html folders from an existing course, select the "
+"course below."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:102
 msgid ""
-"To copy problem templates from an existing course, select the course below."
+"To drop a student or students, select them for editing as described above "
+"and then set the pop-up list to enrolled,drop, or audit. Dropped students "
+"cannot log in to the course, are not assigned new homework sets and are not "
+"sent e-mail. They can be re-enrolled simply by changing their status back to"
+" enrolled. No data is lost, any homework sets assigned before they were "
+"dropped are restored unchanged."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2200
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:143
 msgid ""
 "To edit a specific student version of this set, edit (all of) her/his "
 "assigned sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:376
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:29
 msgid ""
-"To edit this text you must first make a copy of this file using the "
-"'NewVersion' action below."
-msgstr "Para editar este texto, primero debes hacer una copia de este archivo usando la acción \"Nueva versión\" abajo."
+"To perform an action select the desired action tab and click the submit "
+"button."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:90
+msgid "To this Problem"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:381
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:69
 msgid ""
-"To edit this text you must use the 'NewVersion' action below to save it to "
-"another file."
+"To use the Email merge feature, upload a CSV with calculated grades to the "
+"scoring directory using the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1343
-msgid "To this Problem"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:767
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:58
+msgid "Today"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:33
+msgid "Toggle each of the options to include or not include in the output."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:522
+msgid "Top Score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:118
+msgid "Top level of author information on the wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:114
+msgid "Total Points"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:18
 msgid "Total Points:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:90
 msgid "Totals"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:290
 msgid "Totals only (not problem scores)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:291
 msgid "Totals only, only after answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:236
 msgid "Transfer"
 msgstr "Transferir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:284
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:22
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:35
 msgid "True"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1279
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:245
 msgid "Try it"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:26
 msgid "Tunic of Extension"
 msgstr ""
 
@@ -7282,209 +9954,340 @@ msgstr ""
 msgid "Two Columns"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1470
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:30
 msgid "Type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2325
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:84
+msgid "Type:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:23
 msgid "URI"
 msgstr ""
 
 #. ($achievementName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:297
 msgid "Unable to change the evaluator for set %1. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:819
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1084
+msgid "Unable to change the hardcopy header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1070
+msgid "Unable to change the set header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{fullSetID}, $c->{prettyProblemNumber})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1110
+msgid ""
+"Unable to change the source file path for set %1, problem %2. Unknown error."
+msgstr ""
+
+#. ($c->shortPath($delFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1246
+msgid "Unable to delete backup file \"%1\"."
+msgstr ""
+
+#. ($formatBackupTime)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:571
+msgid "Unable to delete backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:888
+msgid "Unable to make \"%1\" the hardcopy header for %2."
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:860
+msgid "Unable to make \"%1\" the set header for %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:693
 msgid "Unable to obtain error messages from within the PG question."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:384
-msgid "Unable to write to '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:275
+msgid "Unable to open a temporary file at the given location."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2613
+#. ($c->shortPath($backupFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1233
+msgid "Unable to read backup file \"%1\"."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:636
+msgid "Unable to write to \"%1\": %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:15
 msgid "Unarchive"
 msgstr ""
 
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2596
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:4
 msgid "Unarchive %1 to course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2581
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:40
 msgid "Unarchive Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2675
-msgid "Unarchive Next Course"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:17
+msgid "Unarchive Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:214
-msgid "Unassign All Sets"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:25
+msgid "Unarchive Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1306
+msgid "Unarchive Next Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:281
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:239
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:97
 msgid "Unassign from All Users"
 msgstr "Desasignar de todos los usuarios"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:61
 msgid "Unassign selected sets from selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:58
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:57
 msgid ""
-"Unassignments were not done.  You need to both click to \"Allow unassign\" "
-"and click on the Unassign button."
+"Unassignments were not done.  You need to select \"Allow unassign\" and then"
+" click on the Unassign button."
 msgstr ""
 
 #. ($unattempted, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1047
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:44
 msgid "Unattempted: %1/%2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:53
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:37
 msgid "Unclassified Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:242
 msgid "Ungraded"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3723
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3765
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:58
 msgid "Unhide Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1465
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1151
+msgid "Unkown saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:28
 msgid ""
-"Unlock an additional version of a Gateway Test.  If used before the close "
-"date of the Gateway Test this will allow you to generate a new version of "
-"the test."
+"Unlock an additional version of a test.  If used before the close date of "
+"the test this will allow you to generate a new version of the test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:164
-msgid "Unpack"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:47
+msgid "Unpack Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:113
 msgid "Unpack archives automatically"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2709
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:15
 msgid "Unselect all courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:130
-msgid "Update"
-msgstr "Actualizar"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:63
 msgid "Update Display"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:930
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:84
+msgid "Update Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:27
+msgid "Update Interval"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:102
 msgid "Update Menus"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:729
-msgid "Update settings and refresh page"
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:51
+msgid "Update aborted. Invalid set %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2695
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:47
+msgid "Update aborted. Invalid user %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:67
+msgid "Update set:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:8
 msgid "Update the checked directories?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3544
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:50
+msgid "Update user:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1908
 msgid "Updated location description."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2739
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2917
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:40
 msgid "Upgrade"
 msgstr ""
 
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
 msgid "Upgrade %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1327
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2278
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:97
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:79
 msgid "Upgrade Course Tables"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2693
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2761
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:382
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:42
 msgid "Upgrade Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3010
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:17
+msgid "Upgrade Courses Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:43
+msgid "Upgrade courses from a previous version of WeBWorK."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1582
 msgid "Upgrade process completed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:388
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:65
 msgid "Upload"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2441
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:72
+msgid ""
+"Upload, download and delete text files, including scoring spread sheets, set"
+" definition files, class list spread sheets, and \"PG\" problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:292
 msgid "Use Default Header File"
 msgstr "Usar encabezados estándar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:325
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:127
 msgid "Use Equation Editor?"
 msgstr "¿Usar editor de ecuaciones?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:204
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:20
 msgid "Use Reward"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2720
-msgid "Use System Default"
-msgstr "tr: Use System Default"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:516
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:27
 msgid "Use browser back button to return from preview mode."
 msgstr ""
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:506
+#. (tag('b', $c->{achievementID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:16
 msgid "Use in achievement %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:526
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:23
 msgid "Use in new achievement:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:149
 msgid "Use live equation rendering?"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2028
+#: /opt/webwork/webwork2/conf/defaults.config:1929
 msgid "Use log base 10 instead of base <i>e</i>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2034
+#: /opt/webwork/webwork2/conf/defaults.config:1935
 msgid "Use older answer checkers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:234
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:123
+msgid ""
+"Use the \"Create\" and \"Delete\" actions to create or delete achievements. "
+"Note that deleting an achievement will delete all data associated to the "
+"achievement and cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:35
+msgid ""
+"Use the \"Merge file\" drop down menu to select which merge file to use, or "
+"select \"None\" to not use any merge file.  When a merge file is selected, "
+"the data for active students will be displayed above the \"Email Body\".  "
+"This will show you the structure of the merge file and the column variables "
+"associated with each column.  Data that is longer than 7 characters will be "
+"truncated, and the data can be scrolled up and down to see all rows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:28
+msgid ""
+"Use the \"Users\" and \"Sets\" forms to select which users and sets to act "
+"on.  Multiple items can be selected using ctrl-click or shift-click.  The "
+"action buttons are grouped into three categories.  The first is a set of "
+"actions that act on the selected users, the second is a set of actions that "
+"act on the selected sets, and the third is a set of actions for acting on a "
+"combination of sets and users.  If an invalid number of users or sets are "
+"selected, the action will not be preformed, and an error message will be "
+"placed on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:25
+msgid ""
+"Use the editor to edit the evaluator and the action form at the bottom to "
+"save the evaluator. You can either overwrite the current evaluator file or "
+"save as a new evaluator file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:15
 msgid ""
 "Use the interface below to quickly access commonly-used instructor tools, or"
 " select a tool from the list to the left."
 msgstr "Usa la interfaz que se muestra abajo para acceder rápidamente a herramientas de uso frecuente para el instructor o selecciona una herramienta de la lista a la izquierda."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:332
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:26
+msgid ""
+"Use the options in the second box to pick a collection of problems decribed "
+"below. In each case, clicking \"View Problems\" will render a fixed number "
+"of problems (default of 20). After problems are shown, there will be options"
+" to show the next/previous batch of problems, add all problems to the target"
+" set (set at the top of the page) or clear the curent batch of problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:27
 msgid ""
 "Use this form to ask your instructor a question, to report a problem with "
 "the WeBWorK system, or to report an error in a problem you are attempting. "
@@ -7492,73 +10295,103 @@ msgid ""
 "system will be included."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:29
+msgid "Use this page to change your password."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:20
+msgid ""
+"Use this page to send emails to active (enrolled or auditing) students.  "
+"Emails can be sent to all active students or selected students.  Use the "
+"\"Students\" form to sort, filter, or format how the user name is displayed."
+"  Click \"Change Display Settings\" to apply any changes.  Use control-click"
+" or shift-click to select multiple students to email."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:67
+msgid ""
+"Used for \"counting\" achievements, which sets the value a counter must "
+"reach in order to earn the achievement. For example this is used counting "
+"the number of completed problems."
+msgstr ""
+
+#. (param('user')
+#. (param('effectiveUser')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:7
+msgid "User \"%1\" not found."
+msgstr ""
+
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:324
 msgid ""
-"User '%1' will not be copied from admin course as it is the initial "
+"User \"%1\" will not be copied from admin course as it is the initial "
 "instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:557
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:34
+msgid "User %1 not found."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:217
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:64
 msgid "User ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:298
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:230
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:28
 msgid "User Settings"
 msgstr "Preferencias de usuario"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:490
-msgid "User Value"
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:17
+msgid "User Settings Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:52
-msgid "User has been assigned to all current sets."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:576
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:13
+msgid "User overrides"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:58
-msgid "User has been unassigned from all sets."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:247
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:62
 msgid "User's name is:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:68
-msgid "User's sets have been reassigned."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:60
 msgid "User's username is:"
 msgstr ""
 
 #. ($user, $setID, $j)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1077
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
 msgid ""
 "UserProblem missing for user=%1 set=%2 problem=%3. This may indicate "
 "database corruption."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:51
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:499
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:126
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:272
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:9
 msgid "Users"
 msgstr "Usuarios"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:339
 msgid "Users Assigned to Set %2"
 msgstr "Usuarios a los que se ha asignado la tarea %2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2077
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:17
+msgid "Users Assigned to Set Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:65
 msgid "Users List"
 msgstr "Lista de usuarios"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1925
+#: /opt/webwork/webwork2/conf/defaults.config:1827
 msgid ""
 "Users at this level and higher are allowed to change display settings used "
 "in pg problems.Note that if it is expected that there will be students that "
@@ -7567,31 +10400,31 @@ msgid ""
 "those students may need to disable MathQuill."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1915
+#: /opt/webwork/webwork2/conf/defaults.config:1817
 msgid ""
 "Users at this level and higher are allowed to change their e-mail address. "
 "Normally guest users are not allowed to change the e-mail address since it "
 "does not make sense to send e-mail to anonymous accounts."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1879
+#: /opt/webwork/webwork2/conf/defaults.config:1781
 msgid ""
 "Users at this level and higher are allowed to change their password. "
 "Normally guest users are not allowed to change their password."
 msgstr ""
 
-#. ($names{$primary}, $names{$secondary}, $names{$ternary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:924
+#. ($c->maketext(FIELD_PROPERTIES()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:316
 msgid "Users sorted by %1, then by %2, then by %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1906
+#: /opt/webwork/webwork2/conf/defaults.config:1808
 msgid ""
 "Users with at least this permission level get a link in the left panel for "
 "reporting bugs to the bug tracking system at bugs.webwork.maa.org."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2140
+#: /opt/webwork/webwork2/conf/defaults.config:2051
 msgid ""
 "Users with this permssion level or greater will automatically be sent "
 "feedback from students (generated when they use the \"Contact instructor\" "
@@ -7600,157 +10433,225 @@ msgid ""
 "permission level to \"nobody\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1348
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:193
 msgid "Uses Math Objects"
 msgstr ""
 
-#. ($default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:197
-msgid "Using contents of the default message %1 instead."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1239
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:18
 msgid "Using what display mode?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:6
 msgid "Using what seed?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:19
+msgid "Using which hardcopy format?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:49
+msgid "Using which hardcopy theme?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:31
+msgid ""
+"Usually means students must demonstrate understanding of facts. This is more"
+" than regurgitating the fact. We use this category for simple and direct "
+"applications of algorithms the student has studied. There should be no "
+"judgement involved in choosing the method. This would include a simple "
+"application of a rule for differentiation (e.g., can combine rules for sums "
+"and constant multiples with one more advanced rule) or for integrals."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Value"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1747
+#: /opt/webwork/webwork2/conf/defaults.config:1649
 msgid "Value of work done in Reduced Scoring Period"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:687
-msgid "Variable Documentation:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config/config_help.html.ep:20
+msgid "Variable Documentation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:115
+msgid "Version"
 msgstr ""
 
 #. ($ver->{version})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:679
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:173
 msgid "Version %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:159
 msgid "Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:43
 msgid "Versions of a set can only be edited for one user at a time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:128
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2419
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2756
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:528
 msgid "View"
 msgstr "Ver"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1000
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:488
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:523
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:681
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:948
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:6
 msgid "View Problems"
 msgstr "Ver problemas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:276
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:57
+msgid "View details of student perofrmance either by individual or by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:86
 msgid "View equations as"
 msgstr "Ver las ecuaciones como"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:283
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:18
 msgid "View statistics by set"
 msgstr "Ver estadísticas de una tarea"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:19
 msgid "View statistics by student"
 msgstr "Ver estadísticas de un estudiante"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:55
+msgid ""
+"View statistics of students' performance on homework either by individual or"
+" by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:14
 msgid "View student progress by set"
 msgstr "Ver reporte de progreso de una tarea"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:303
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:15
 msgid "View student progress by student"
 msgstr "Ver reporte de progreso de un estudiante"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:65
 msgid "View/Edit"
 msgstr "Ver/Editar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:224
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:90
-msgid "Viewing temporary file:"
-msgstr "Viendo archivo temporal:"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:104
+msgid "View/Reload"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:766
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:790
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:31
+msgid "View/access current and archived courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:146
+msgid "Viewing Problems in a New Window"
+msgstr ""
+
+#. ($c->{problem}->source_file)
+#. ($screenSetHeader)
+#. ($course_info_path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:81
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:109
+msgid "Viewing temporary file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:25
 msgid "Visibility"
 msgstr "tr: Visibility"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:915
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:7
 msgid "Visible"
 msgstr "Visible"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:622
 msgid "Visible sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
 msgid "Visible to Students"
 msgstr "Visible para los estudiantes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2269
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:844
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "Warning"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2319
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:13
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:117
 msgid "Warning messages"
 msgstr "Mensajes de alerta"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1039
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:259
+msgid "Warning messages:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all set-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1035
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all user-related data and is not undoable!"
 msgstr "Alerta: ¡Al eliminar usuarios, destruyes toda la información de este estudiante y no la puedes recuperar!"
 
-#. ($problem_desc , CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1397
+#. ($problem_desc,				$c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1194
 msgid "Warnings encountered while processing %1. Error text: %2"
 msgstr ""
 
-#. ($copyright_years, $theme, $ww_version, $pg_version)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1261
-msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4 |"
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:39
+msgid ""
+"We use this for carrying out more complicated algorithms, such as "
+"derivatives using both the product and chain rule or integrals which involve"
+" say both a substitution and parts."
+msgstr ""
+
+#. ($ce->{WW_COPYRIGHT_YEARS} || '1996-2023',              $ce->{defaultTheme}
+#. || 'unknown -- set defaultTheme in localOverides.conf',
+#. $ce->{WW_VERSION}         || 'unknown -- set WW_VERSION in VERSION',
+#. $ce->{PG_VERSION}         || 'unknown -- set PG_VERSION in ../pg/VERSION')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:9
+msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2227
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:3
 msgid "WeBWorK Error"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:3
 msgid "WeBWorK Warnings"
 msgstr "Alertas de WeBWorK"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1549
+#: /opt/webwork/webwork2/conf/defaults.config:1451
 msgid ""
 "WeBWorK currently has translations for the languages listed in the course "
 "configuration."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:20
+msgid ""
+"WeBWorK does not have a full featured scoring ability. We leave that to your"
+" favorite spreadsheet application."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:38
+msgid ""
+"WeBWorK expects many files to be in certain locations.  The following "
+"describe this. Note that by default the File Manager shows the \"templates\""
+" directory.  Other directories mentioned below are at the same level and "
+"need to be accessed by going up a directory by clicking the \"^\" button "
+"above the file list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:6
 msgid ""
 "WeBWorK has encountered a software error while attempting to process this "
 "problem. It is likely that there is an error in the problem itself. If you "
@@ -7759,7 +10660,7 @@ msgid ""
 " more information."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:6
 msgid ""
 "WeBWorK has encountered warnings while processing your request. If this "
 "occured when viewing a problem, it was likely caused by an error or "
@@ -7769,19 +10670,19 @@ msgid ""
 " warning output below for more information."
 msgstr "WeBWorK ha generado alertas al procesar tu solucitud. Si esto ocurrió mientras veías un problema, es probable que haya sido causado por un error o ambiguedad en este problema. De lo contrario, puede que indique un problema con el sistema interno de WeBWorK. Si eres un estudiante, reporta estas alertas a tu instructor para que sean corregidas. Si eres un instructor, por favor consulta el registro de alertas que se incluye abajo."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:577
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:558
 msgid ""
 "WeBWorK was unable to generate a different version of this problem.  Close "
 "this tab, and return to the original problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:367
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:29
 msgid ""
 "WeBWorK was unable to generate a paper copy of this homework set.  Please "
 "inform your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:78
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
 msgid ""
 "WeBWorK will automatically create users when logging in via the LMS for the "
 "first time. If this flag is enabled then it will also keep the user account "
@@ -7791,36 +10692,44 @@ msgid ""
 "next time the user logs in."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:370
 msgid "Weight"
 msgstr "Peso"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:6
 msgid "Welcome to WeBWorK!"
 msgstr "¡Bienvenido a WeBWorK!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:24
+msgid ""
+"What WeBWorK does have is good support for summarizing the scores on WeBWorK"
+" homework sets and tests and exporting them in a form (.csv) which any "
+"spreadsheet can use. WeBWorK reports all of the homework grades with options"
+" shown below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:27
 msgid "What could be inside?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:715
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:17
 msgid "What field should filtered users match on?"
 msgstr "¿Qué campo utilizar para filtrar la lista de usuarios?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
 msgid ""
 "When a student has more attempts than is specified here they will be able to"
 " view another version of this problem.  If set to -1 the feature is disabled"
 " and if set to -2 the course default is used."
 msgstr "Cuando un estudiante tiene más intentos de lo que se especifica acá, podrá ver otra versión de este problema. Si se asigna -1, la opción de ver más intentos se deshabilita. Si se asigna -2, se usa la opción estándar del curso."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1899
+#: /opt/webwork/webwork2/conf/defaults.config:1801
 msgid ""
 "When acting as a student, this permission level and higher can submit "
 "answers for that student."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2071
+#: /opt/webwork/webwork2/conf/defaults.config:1972
 msgid ""
 "When numerical answers are checked, most test if the student's answer is "
 "close enough to the programmed answer be computing the error as a percentage"
@@ -7829,7 +10738,7 @@ msgid ""
 "0.1 means 0.1 percent error is allowed.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2098
+#: /opt/webwork/webwork2/conf/defaults.config:2019
 msgid ""
 "When students click the <em>Email Instructor</em> button to send feedback, "
 "WeBWorK fills in the subject line.  Here you can set the subject line.  In "
@@ -7839,14 +10748,32 @@ msgid ""
 "recitation</li><li>%% = literal percent sign</li></ul>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1638
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:35
+msgid ""
+"When the class is very large not all students will be displayed. Using the "
+"first action on this page you can show only the students from a given "
+"recitation or from a given section, or only students whose login or last "
+"name fits a pattern match. The second action will sort the students "
+"currently being displayed. You can also sort the displayed students by "
+"clicking on the active links at the top of each column."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:56
+msgid ""
+"When the message is ready to send, click \"Send Email\". This will queue the"
+" email to be sent, which can take several minutes depending on the number of"
+" students selected.  You will be notified by email once all the emails have "
+"been sent."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1540
 msgid ""
 "When this is on students will see a line on the Grades page which has their "
 "total cumulative homework score.  This score includes all sets assigned to "
 "the student."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:90
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
 msgid ""
 "When this is true, then when a user enters WeBWorK from an external tool "
 "link in the LMS, the bottom of the screen will display the data that the LMS"
@@ -7854,23 +10781,56 @@ msgid ""
 "different LMS systems have different parameters."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1957
+#: /opt/webwork/webwork2/conf/defaults.config:1859
 msgid ""
 "When viewing a problem, WeBWorK usually puts the previously submitted answer"
 " in the answer blank.  Below this level, old answers are never shown.  "
 "Typically, that is the desired behaviour for guest accounts."
 msgstr ""
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:30
+msgid ""
+"When viewing progress for a single student, their grades page is shown which"
+" lists set totals and per problem grades for each set assigned to the "
+"student.  This shows the same information as the statistics page for the "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:26
+msgid ""
+"When viewing set statistics, the drop down menus can be used to show stats "
+"for individual sections, recitations, or problems.  The overall results "
+"include all students who are assigned to the set, while the individual "
+"problem results only include active (have attempted the problem) students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:24
+msgid ""
+"When viewing student progress for a set, the score for the set and the "
+"status for problems in the set are listed for all students.  The table can "
+"be sorted by clicking the links in the table header.  Click the student's "
+"name to access the student's set.  When viewing progress for a test, "
+"additional columns can be shown/hidden by updating the display at the top"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:74
+msgid ""
+"When you unassign a set from students, you destroy all of the data for the "
+"set for those students. If the set is re-assigned to these students, then "
+"they will receive new versions of problems in the set.  Make sure this is "
+"what you want to do before unassigning sets from students."
+msgstr ""
+
+#. (tag('b', $achievementID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:21
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for achievement %1 for this student. Make sure this is what you want to"
 " do."
 msgstr "Cuando desasignas estudiantes desmarcando sus nombres, destruyes toda su información asociada a la tarea %1. Por ello, después deberás reasignar la tarea a estos estudiantes y ellos recibirán nuevas versiones de los problemas. Asegúrate de que esto es lo que quieres hacer antes de desmarcar casillas de estudiantes."
 
-#. (CGI::b({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:146
+#. (tag('b', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:26
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for homework set %1 for this student. You will then need to reassign "
@@ -7878,7 +10838,7 @@ msgid ""
 "problems. Make sure this is what you want to do before unchecking students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:72
 msgid ""
 "When you uncheck a homework set (and save the changes), you destroy all of "
 "the data for that set for this student.   If you reassign the set, the "
@@ -7886,243 +10846,461 @@ msgid ""
 "you want to do before unchecking sets."
 msgstr ""
 
-#. ($self->formatDateTime($set->open_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:343
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:87
+msgid "Wiki summary page for MathObjects"
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:444
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:167
 msgid "Will open on %1."
 msgstr "Estará disponible desde el %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:49
+msgid "Word problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:15
 msgid "Worth"
 msgstr "Valor"
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:382
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:51
+msgid "Write a new PG problem file or edit an existing one."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:188
+msgid ""
+"Write permissions have not been enabled for \"%1\".  Changes must be saved "
+"to another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:630
+msgid ""
+"Write permissions have not been enabled for \"%1\". Changes must be saved to"
+" another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:182
 msgid ""
-"Write permissions have not been enabled for '%1'.  Changes must be saved to "
-"another file for viewing."
+"Write permissions have not been enabled in \"%1\".  Changes must be saved to"
+" a different directory for viewing."
 msgstr ""
 
-#. ($self->shortPath($currentDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:380
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:624
 msgid ""
-"Write permissions have not been enabled in '%1'.  Changes must be saved to a"
+"Write permissions have not been enabled in \"%1\".Changes must be saved to a"
 " different directory for viewing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:178
 msgid ""
 "Write permissions have not been enabled in the templates directory.  No "
 "changes can be made."
 msgstr "tr: Write permissions have not been enabled in the templates directory.  No changes can be made."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:380
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:620
+msgid ""
+"Write permissions have not been enabled in the templates directory. No "
+"changes can be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:287
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:330
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:509
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:82
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:657
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:67
 msgid "Yes"
 msgstr "Sí"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:500
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:454
 msgid ""
 "You are currently checking answers to a different version of your problem - "
 "these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:511
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:470
 msgid ""
 "You are currently previewing answers to a different version of your problem "
 "- these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr ""
 
-#. ($userSet->set_id, $r->connection->remote_ip)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:270
+#. ($ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:18
+msgid ""
+"You are in the Reduced Scoring Period.  All work counts for %1% of the "
+"original."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:183
+msgid "You are not allowed to act as a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:188
+msgid "You are not allowed to assign homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:383
+msgid "You are not allowed to delete %1."
+msgstr ""
+
+#. ($userSet->set_id, $c->tx->remote_address)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:261
 msgid ""
 "You are not allowed to generate a hardcopy for %1 from your IP address, %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2049
-msgid "You are not authorized to access the Instructor tools."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:185
+msgid "You are not allowed to modify homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:191
+msgid "You are not allowed to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:4
+msgid "You are not allowed to send e-mail."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:2
+msgid "You are not authorized to access instructor tools"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:4
+msgid "You are not authorized to access instructor tools."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:271
-msgid "You are not authorized to access the instructor tools."
-msgstr "tr: You are not authorized to access the instructor tools."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:9
+msgid "You are not authorized to assign homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:10
+msgid "You are not authorized to create or delete courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:2
+msgid "You are not authorized to edit achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:28
+msgid "You are not authorized to edit user specific information."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:37
+msgid "You are not authorized to grade homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:8
+msgid "You are not authorized to manage course files"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:392
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:33
 msgid "You are not authorized to modify homework sets."
 msgstr "tr: You are not authorized to modify homework sets."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:35
 msgid "You are not authorized to modify problems."
 msgstr "tr: You are not authorized to modify problems."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:396
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:39
 msgid "You are not authorized to modify set definition files."
 msgstr "tr: You are not authorized to modify set definition files."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:15
 msgid "You are not authorized to modify student data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:11
+msgid "You are not authorized to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:3
+msgid "You are not authorized to modify the course configuration."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:230
 msgid "You are not authorized to perform this action."
 msgstr "tr: You are not authorized to perform this action."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:260
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:11
+msgid "You are not authorized to score sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:13
+msgid "You are not authorized to send mail to students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:11
+msgid "You are not authorized to update lti scores"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers.html.ep:8
+msgid "You are not authorized to view past answers"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:251
 msgid ""
 "You are not permitted to generate a hardcopy for a set with hidden work."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:236
 msgid "You are not permitted to generate a hardcopy for an unopened set."
 msgstr ""
 
-#. ($showMeAnother{MaxReps},					$solutionShown)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:559
+#. ($showMeAnother{MaxReps},						$solutionShown)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:532
 msgid ""
 "You are only allowed to click on Show Me Another %quant(%1,time,times) per "
 "problem. %2 Close this tab, and return to the original problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2051
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2070
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:265
 msgid "You are out of time!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:374
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:36
 msgid "You can also examine the following temporary files: "
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGanswermacros.pl:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:108
+msgid ""
+"You can assign selected achievements to all users by using the \"Assign\" "
+"action action and selecting which achievements to assign.  You can select "
+"which users to assign/unassign to an achievement by clicking on the link in "
+"the \"Edit Users\" column."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1039
+msgid ""
+"You can change the file path for this problem manually from the \"Hmwk Sets "
+"Editor\" page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:27
+msgid ""
+"You can check the boxes to the right of the sets and click \"Generate "
+"Hardcopy for Selected Sets\" to generate a PDF hardcopy of the selected "
+"sets. You can generate hardcopies for multiple users including their answers"
+" as well. Note that students will only be able to generate hardcopies of a "
+"single set at a time. Students will only be able to include answers in the "
+"hardcopy after the answer date."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:127
+msgid ""
+"You can delete problems by clicking the \"Delete it?\" check box and saving."
+" If the set is already active it is recommended that you instead use the "
+"\"Mark Correct?\" problem to mark a particular problem correct for all "
+"students."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGanswermacros.pl:1616
 msgid "You can earn partial credit on this problem."
 msgstr "Puedes obtener una fracción del puntaje total en este problema."
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:382
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:142
+msgid ""
+"You can edit a problem by clicking the \"Edit Problem\" icon to the right of"
+" the problem number. This will open the problem in the PG problem editor in "
+"a new tab or window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:92
+msgid ""
+"You can edit a single achievement by clicking on the pencil icon next to the"
+" achievement ID.  You can edit multiple achievements by selecting which "
+"achievements to edit, then click the \"Edit\" button. You can edit all of "
+"the achievements by changing which achievements to edit form \"selected "
+"achievements\" to \"all achievements\", or click the checkbox next to the "
+"Achievement ID to select all achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:44
+msgid ""
+"You can edit the class list data for a single student by clicking on the "
+"pencil icon next to their login name. To edit several students at once click"
+" on the \"Select\" checkbox next to their names, click on the radio button "
+"for editing selected users and then click the \"Edit\" button. You can also "
+"edit all visible users (those students currently being displayed) or even "
+"all users in the course although this last option might take a long time to "
+"load for a large class."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:397
 msgid "You can get a new version of this problem after the due date."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1368
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:101
+msgid ""
+"You can import/export from their respective action tab.  Exporting saves "
+"information about the achievement as a .axp file which is a CSV that lists "
+"each achievements information.  You can import .axp files that have been "
+"previously exported."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:769
 msgid "You can not specify an absolute path"
 msgstr ""
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1121
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:549
 msgid "You can only %1 one file at a time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:92
 msgid "You can only download regular files."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:591
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:197
 msgid "You can only edit text files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:908
-msgid "You can only unpack files ending in '.tgz', '.tar' or '.tar.gz'"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:374
+msgid "You can only unpack files ending in \".tgz\", \".tar\" or \".tar.gz\""
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:134
+msgid ""
+"You can render a problem by clicking the \"Render Problem\" icon to the "
+"right of the problem number. The display mode used to render the problem is "
+"chosen using the drop down menu. You can render all problems using the "
+"\"Render All\" button. \"Hide All\" will hide all rendered problems. It is "
+"also useful to collapse problem details when doing this, as it makes it "
+"easier to drag problems around."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:120
+msgid ""
+"You can reorder problems by clicking on the arrow icon and dragging the "
+"problem. You will see a box showing you where the problem will be placed. "
+"When problems are reordered any holes in the numbering will be filled in."
 msgstr ""
 
 #. ($showMeAnother{MaxReps} >= $showMeAnother{Count}
 #. ? ($showMeAnother{MaxReps} - $showMeAnother{Count})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1895
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:44
 msgid ""
 "You can use this feature %quant(%1,more time,more times,as many times as you"
 " want) on this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:439
 msgid "You can't download directories"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:440
 msgid "You can't download files of that type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:584
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:192
 msgid "You can't edit a directory"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:528
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
 msgid "You can't view files of that type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:985
 msgid "You cannot archive the course you are currently using."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1712
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:850
 msgid "You cannot delete the course you are currently using."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1081
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:378
 msgid "You cannot delete yourself!"
 msgstr "tr: You cannot delete yourself!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:579
 msgid "You did not specify a new set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:232
 msgid "You didn't enter any message."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:312
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:303
 msgid "You do not have permission to access the requested file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:159
 msgid "You do not have permission to change the hardcopy theme."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:578
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:186
 msgid "You do not have permission to edit this file."
 msgstr ""
 
 #. ($hardcopy_format)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:151
 msgid "You do not have permission to generate hardcopy in %1 format."
 msgstr "No tienes permiso para generar una versiones para imprimir en formato %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1639
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1161
 msgid "You do not have permission to view the details of this error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements.html.ep:13
 msgid "You don't have any Achievement data associated to you!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:237
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:51
 msgid "You don't have any rewards!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2109
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:325
 msgid "You exceeded the allowed time."
 msgstr ""
 
-#. ($numLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2082
+#. ($c->{numAttemptsLeft})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:277
 msgid "You have %1 attempt(s) remaining on this test."
 msgstr ""
 
-#. ($numLeft,						$numLeft - 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2458
+#. ($c->{numAttemptsLeft},								$c->{numAttemptsLeft} - 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:664
 msgid ""
 "You have %1 submissions remaining for this test.  If you say yes, then you "
 "will have %quant(%2,submission) remaining. Once all submissions have been "
@@ -8130,724 +11308,702 @@ msgid ""
 "work this test version."
 msgstr ""
 
-#. ($attemptsLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2012
+#. ($problem->max_attempts - $attempts)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1270
 msgid "You have %negquant(%1,unlimited attempts,attempt,attempts) remaining."
 msgstr "Tienes %negquant(%1,intentos ilimitados,intento,intentos) en este problema."
 
 #. ($attempts_before_rr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1217
 msgid ""
 "You have %quant(%1,attempt,attempts) left before new version will be "
 "requested."
 msgstr ""
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:506
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:44
 msgid ""
 "You have %quant(%1,hour) and %quant(%2,minute) remaining to complete the "
 "currently open test."
 msgstr ""
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:518
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:54
 msgid ""
 "You have %quant(%1,hour,hours,)%quant(%2,minute,minutes,) remaining to "
 "complete the currently open test."
 msgstr ""
 
-#. ($minutes,									$seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:529
+#. ($minutes,							$seconds)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:64
 msgid ""
 "You have %quant(%1,minute) and %quant(%2,second) remaining to complete the "
 "currently open test."
 msgstr ""
 
 #. ($seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:72
 msgid ""
 "You have %quant(%1,second) remaining to complete the currently open test."
 msgstr ""
 
 #. ($attempts)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1243
 msgid "You have attempted this problem %quant(%1,time,times)."
 msgstr "Has intentado este problema %quant(%1,vez,veces)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:1
 msgid "You have been logged out of WeBWorK."
 msgstr "Has salido de WeBWork"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2065
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:260
 msgid "You have less than 1 minute to complete this test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2046
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:241
 msgid "You have less than 45 seconds left!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2043
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:240
 msgid ""
 "You have less than 90 seconds left to complete this assignment. You should "
 "finish it soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1004
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:452
 msgid "You have not chosen a file to upload."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:845
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "You have requested that the following items be deleted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1137
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:565
 msgid "You have specified an illegal file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:766
 msgid "You have specified an illegal path"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:520
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:13
+msgid "You have specified an illegal working directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:481
 msgid ""
 "You may check your answers to this problem without affecting the maximum "
 "number of tries to your original problem."
 msgstr ""
 
-#. ($perm_multiuser ? "to privileged users or" : "")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:613
+#. ($multiuser ? 'to privileged users or' : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:69
 msgid ""
 "You may choose to show any of the following data. Correct answers, hints, "
 "and solutions are only available %1 after the answer date of the homework "
 "set."
 msgstr "Puedes elegir mostrar cualquiera de la siguiente información. Las respuestas correctas, pistas y soluciones solo están disponibles %1 de la fecha límite de envío de respuestas de la tarea."
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:63
+msgid "You may not change this user's password!"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:646
 msgid "You may not change your answers when going on to the next part!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1831
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:58
 msgid "You may not change your own password here!"
 msgstr "tr: You may not change your own password here!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1132
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:560
 msgid "You may not follow symbolic links"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2134
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:350
 msgid "You may still check your answers."
 msgstr ""
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:172
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:143
+msgid ""
+"You may want to create an unattached problem if you are using the current "
+"problem as a model for a new problem. You can add the new file to a homework"
+" set from the Library Browser or via the set detail page of the Hmwk Sets "
+"Editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:165
+msgid ""
+"You might want to do this if you want to give full credit to everyone on a "
+"particular problem that was not worded correctly, or wasn't working "
+"properly. This is done from the \"Hmwk Sets Editor\" page or the "
+"\"Instructor Tools\" page."
+msgstr ""
+
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:8
 msgid "You must access assignments from your Course Management System (%1)."
 msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:67
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before Show Me Another "
-"is available."
+"You must attempt this problem %quant(%1,time) before this feature is "
+"available"
 msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1923
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:545
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before this feature is "
-"available"
+"You must attempt this problem %quant(%1,time,times) before Show Me Another "
+"is available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:699
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:259
 msgid "You must confirm the password for the initial instructor."
 msgstr ""
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:368
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? $c->link_to(                                                  $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:195
 msgid "You must log into this set via your Learning Management System (%1)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:76
-msgid "You must provide a student ID, a set ID, and a problem number."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:979
+msgid "You must select a course to archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:585
 msgid "You must select a course to rename."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:351
 msgid "You must select at least one file for the archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:777
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:312
 msgid "You must select at least one file to delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:115
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:106
 msgid "You must select one or more sets for scoring!"
 msgstr "¡Debes seleccionar al menos una tarea para calificar!"
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:749
 msgid "You must specify a %1 name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:682
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:242
 msgid "You must specify a course ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2026
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2561
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2777
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3865
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2086
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:848
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:983
 msgid "You must specify a course name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:775
 msgid "You must specify a file name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:705
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:586
+msgid "You must specify a file name in order to save a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:265
 msgid "You must specify a first name for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:708
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:268
 msgid "You must specify a last name for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1382
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:606
 msgid "You must specify a new institution for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1364
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:588
 msgid "You must specify a new name for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:603
 msgid "You must specify a new title for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:256
 msgid "You must specify a password for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:448
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:440
 msgid "You must specify a user ID."
 msgstr "Debe especificar un ID de usuario."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:711
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:271
 msgid "You must specify an email address for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:331
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:138
 msgid "You must specify an file name in order to save a new file."
 msgstr "tr: You must specify an file name in order to save a new file."
 
 #. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:505
 msgid ""
-"You must use your Learning Managment System (%1) to access this set.  Try "
-"logging in to the Learning Managment System and visiting the set from there."
+"You must use your Learning Management System (%1) to access this set.  Try "
+"logging in to the Learning Management System and visiting the set from "
+"there."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1730
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
 msgid "You need to select a \"Target Set\" before you can edit it."
 msgstr ""
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1126
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:554
 msgid "You need to select a file to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1877
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:555
 msgid "You need to select a set definition file to view."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1853
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:537
 msgid "You need to select a set from this course to view."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1837
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:524
 msgid "You need to select a set to view."
 msgstr ""
 
-#. (wwRound(0, $problemResult->{score} * 100)
-#. (wwRound(0, $pg->{result}->{score} * 100)
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2007
+#. (wwRound(0,
+#. compute_reduced_score($ce, $problem, $set, $pg->{result}{score},
+#. $c->submitTime)
+#. (% wwRound(0, $rh_result->{problem_result}{score} * 100)
+#. (wwRound(0, $rh_result->{problem_result}{score} * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1251
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:48
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:29
 msgid "You received a score of %1 for this attempt."
 msgstr "Obtuviste un puntaje de %1 en este intento."
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2075
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1363
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem and its graded subproblems."
 msgstr ""
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2078
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1375
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem."
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1343
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:740
 msgid "Your %1 name contains illegal characters"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1344
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:743
 msgid "Your %1 name may not begin with a dot"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:746
 msgid "Your %1 name may not contain a path component"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:540
-msgid ""
-"Your LTI OAuth verification failed.  If this recurs, please speak with your "
-"instructor"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:528
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:539
-msgid ""
-"Your authentication failed.  Please return to Oncourse and login again."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:229
-msgid ""
-"Your authentication failed.  Please try again. Please speak with your "
-"instructor if you need help."
-msgstr "Usuario o contraseña inválidos. Intenta nuevamente. Si necesitas ayuda, comunícate con tu instructor."
-
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3033
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3162
 msgid "Your browser does not support the video tag."
 msgstr ""
 
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4078
-msgid "Your current branch of PG is up to date with branch %1 in remote %2."
-msgstr ""
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4016
-msgid ""
-"Your current branch of WeBWorK is up to date with branch %1 in remote %2."
-msgstr ""
-
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4113
-msgid "Your current branch of the Open Problem Library is up to date."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:134
 msgid "Your display options have been saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:195
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
 msgid "Your email address has been changed."
 msgstr "Su dirección de correo ha sido cambiada."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:772
 msgid "Your file name contains illegal characters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:118
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:40
 msgid "Your file name is not valid! "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:16
 msgid "Your message was sent successfully."
 msgstr ""
 
-#. ($lastScore,$notCountedMessage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2010
+#. (wwRound(0, $problem->status * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1261
 msgid "Your overall recorded score is %1.  %2"
 msgstr "Tu puntaje actual en este problema es %1. %2"
 
-#. ($versionNumber, wwRound(2,$recordedScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2107
-msgid "Your recorded score on this test (version %1) is %2/%3."
+#. ('<span id="test-recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:179
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:197
+msgid "Your recorded score for this version is %1/%2 (%3%)."
+msgstr ""
+
+#. ($setVersionID,                                         '<span id="test-
+#. recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:317
+msgid "Your recorded score on this test (version %1) is %2/%3 (%4%)."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:603
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:634
 msgid "Your score for this attempt is for this part only;"
 msgstr ""
 
 #. ($testNounNum)
 # $testNounNum is either "test (#)" or "submission (#)"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1977
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:142
 msgid "Your score on this %1 WAS recorded."
 msgstr "Tu puntaje en este %1 se ha guardado."
 
-#. ($testNoun,$attemptScore,$totPossible)
+#. ($testNoun, $c->{attemptScore}, $c->{totalPossible})
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1982
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:148
 msgid "Your score on this %1 is %2/%3."
 msgstr "Tu puntaje en este %1 es %2/%3."
 
 #. ($testNounNum)
 # $testNounNum is either "test (#)" or "submission (#)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1973
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:138
 msgid "Your score on this %1 was NOT recorded."
 msgstr "Tu puntaje en este %1 NO se ha guardado."
 
-#. ($attemptScore,$totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2019
+#. ($c->{attemptScore}, $c->{totalPossible})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:192
 msgid "Your score on this (checked, not recorded) submission is %1/%2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1963
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2277
-msgid "Your score on this problem was recorded."
-msgstr "Tu puntaje en este problema se ha guardado."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1619
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1027
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:172
 msgid ""
 "Your score was not recorded because there was a failure in storing the "
 "problem record to the database."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:272
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:276
 msgid "Your score was not recorded because this homework set is closed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:283
 msgid ""
 "Your score was not recorded because this problem has not been assigned to "
 "you."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1643
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1049
 msgid ""
 "Your score was not recorded because this problem set version is not open."
 msgstr ""
 
-#. ($elapsed, $allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1658
+#. ($elapsed,                                              # Assume the
+#. allowed time is an even number of minutes.
+#. ($set->due_date - $set->open_date)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1063
 msgid ""
 "Your score was not recorded because you have exceeded the time limit for "
 "this test. (Time taken: %1 min; allowed: %2 min.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1052
 msgid ""
 "Your score was not recorded because you have no attempts remaining on this "
 "set version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1661
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1067
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:278
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:53
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:31
 msgid "Your score was not recorded."
 msgstr "Tu puntaje NO se ha guardado."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1998
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:163
 msgid "Your score was not successfully sent to the LMS."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:166
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:170
 msgid "Your score was recorded."
 msgstr "Tu puntaje se ha guardado."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1997
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:255
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:162
 msgid "Your score was successfully sent to the LMS."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:540
 msgid "Your session has timed out due to inactivity. Please log in again."
 msgstr "Tu sesión ha terminado debido a inactividad. Por favor reinicia la sesión."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4126
-msgid "Your systems are up to date!"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1396
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1403
-msgid "[Edit]"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:824
-msgid "a duplicate of the first selected achievement."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:17
+msgid "a duplicate of the first selected achievement"
 msgstr ""
 
 # Context is "Create set ______ as a duplicate of the first selected set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:17
 msgid "a duplicate of the first selected set"
 msgstr "una copia de la primera tarea seleccionada en la lista de abajo"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:823
-msgid "a new empty achievement."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:16
+msgid "a new empty achievement"
 msgstr ""
 
 # Context is "Create set ______ as a new empty set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:16
 msgid "a new empty set"
 msgstr "una nueva tarea en blanco"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1281
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:9
 msgid "a single set"
 msgstr "tr: a single set"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:429
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:130
 msgid "add problems"
 msgstr ""
 
 #. ($setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1751
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
 msgid "addGlobalSet %1 in ProblemSetList:  %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:456
-msgid "added missing permission level for user"
-msgstr ""
-
 # #short for administrator
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "admin"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1051
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:487
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:604
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:7
 msgid "all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1377
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:66
 msgid "all current users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:327
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:70
 msgid "all set dates for one <b>user</b>"
 msgstr "todas las fechas de las tareas de un <b> usuario </b>"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:622
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1434
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:667
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:840
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1995
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:7
 msgid "all sets"
 msgstr "todas las tareas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1981
 msgid "all students"
 msgstr "todos los estudiantes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1256
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:701
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:946
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:997
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:6
 msgid "all users"
 msgstr "todos los usuarios"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:120
 msgid "all users for one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:23
 msgid "alphabetically"
 msgstr ""
 
-#. ($count,$numSets)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:626
+#. ($count, $numSets)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1999
 msgid "an impossible number of sets: %1 out of %2"
 msgstr ""
 
-#. ($count,$numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:606
+#. ($count, $numUsers)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1985
 msgid "an impossible number of users: %1 out of %2"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:647
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:658
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:610
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:621
 msgid "answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:30
 msgid "any users"
 msgstr "cualquier usuario"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:720
-msgid "avg attempts"
-msgstr ""
-
 # Context is "Append ____ blank problem template(s) to end of homework set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2956
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:689
 msgid "blank problem template(s) to end of homework set"
 msgstr "problema(s) en blanco usando la plantilla estándar al final de la tarea."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:24
 msgid "by last login date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1552
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:688
 msgid "changes abandoned"
 msgstr "tr: changes abandoned"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1216
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1651
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:633
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:795
 msgid "changes saved"
 msgstr "los cambios se han guardado"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:80
 msgid "class list data for selected <b>users</b>"
 msgstr "información de clase para los <b>usuarios</b> seleccionados"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:31
 msgid "close"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:671
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:259
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:239
 msgid "correct"
 msgstr "correcto"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:582
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:239
 msgid "course files"
 msgstr "archivos del curso"
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:458
 msgid "deleted %1 sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:152
 msgid "editing all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:333
 msgid "editing all sets"
 msgstr "editando todas las tareas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:963
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:328
 msgid "editing all users"
 msgstr "editando todos los usuarios"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:860
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:336
 msgid "editing listed sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:154
 msgid "editing selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:339
 msgid "editing selected sets"
 msgstr "editando tareas seleccionadas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:334
 msgid "editing selected users"
 msgstr "tr: editing selected users"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:331
 msgid "editing visible users"
 msgstr "tr: editing visible users"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:360
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:90
 msgid "email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:87
-msgid "email:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:42
 msgid "empty"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:672
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:10
 msgid "enter matching set IDs below"
 msgstr "Ingresa abajo los IDs de tareas que quieres buscar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:220
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:31
 msgid "entry rows."
 msgstr ""
 
 #. ($restrictLoc, $setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1761
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:904
 msgid "error adding set location %1 for set %2: %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1092
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1487
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:542
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:643
 msgid "export abandoned"
 msgstr "tr: export abandoned"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1068
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:527
 msgid "exporting all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1071
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:530
 msgid "exporting selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:359
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:89
 msgid "first name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:747
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:72
 msgid "for"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:149
 msgid "for one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:103
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:94
 msgid "for one <b>user</b>"
 msgstr "de un <b>usuario</b>"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1014
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:349
 msgid "giving new passwords to all users"
 msgstr "tr: giving new passwords to all users"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1020
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:355
 msgid "giving new passwords to selected users"
 msgstr "tr: giving new passwords to selected users"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1017
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:352
 msgid "giving new passwords to visible users"
 msgstr "tr: giving new passwords to visible users"
 
 #. ($j, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1069
 msgid "global %1 for set %2 not found."
 msgstr ""
 
-#. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1146
-msgid "global set %1 not found."
-msgstr ""
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "grade_proctor"
 msgstr ""
@@ -8856,393 +12012,375 @@ msgstr ""
 msgid "guest"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1589
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:949
 msgid "hidden"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "hidden from"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "hidden from students"
-msgstr "tr: hidden from students"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:217
+msgid "homework"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:83
+msgid "html directory"
+msgstr ""
 
-#. ('j','k','_0')
-#. ('j','k')
+#. ('j', 'k', '_0')
+#. ('j', 'k')
 # doe snot need to be translated
-#: /opt/webwork/pg/lib/Parser/List/Vector.pm:35
-#: /opt/webwork/pg/lib/Value/Vector.pm:278
-#: /opt/webwork/pg/macros/contextLimitedVector.pl:93
+#: /opt/webwork/pg/lib/Parser/List/Vector.pm:39
+#: /opt/webwork/pg/lib/Value/Vector.pm:303
+#: /opt/webwork/pg/macros/contexts/contextLimitedVector.pl:95
 msgid "i"
 msgstr ""
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:773
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:840
 msgid "if"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1626
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:622
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:721
 msgid "illegal character in input: '/'"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:246
 msgid "incorrect"
 msgstr "incorrecto"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:441
 msgid "index"
 msgstr ""
 
 #. ($restrictLoc, $setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:911
 msgid "input set location %1 already exists for set %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:358
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:551
+msgid "insufficient permission to edit %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:220
+msgid "just-in-time"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:88
 msgid "last name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:841
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:893
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:9
 msgid "listed sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3169
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:87
 msgid "locations selected below"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:665
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:59
 msgid "login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "login ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:94
 msgid "login name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:86
-msgid "login/studentID:"
-msgstr ""
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "login_proctor"
 msgstr ""
 
 # Context is "Set _____ made visibile for _____ users"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "made visible for"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:419
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:493
 msgid "max"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1282
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:10
 msgid "multiple sets"
 msgstr "tr: multiple sets"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:489
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:171
 msgid "new set:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:393
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:109
 msgid "new users"
 msgstr "nuevos usuarios"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:6
 msgid "no achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:740
-msgid "no achievements."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:519
-msgid "no attempt recorded"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:86
 msgid "no location"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:620
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1056
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1993
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:6
 msgid "no sets"
 msgstr "ninguna tarea"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:600
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1979
 msgid "no students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:931
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1190
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:702
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:31
 msgid "no users"
 msgstr "ningún usuario"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/permission.pm:26
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "nobody"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:114
 msgid "nth colum of merge file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:225
-msgid "number of students not defined"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:70
 msgid "of"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:128
 msgid "one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:556
-msgid "one <b>set</b> for  <b>users</b>"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:225
+msgid "one <b>set</b> for <b>users</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:540
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:211
 msgid "one <b>user</b> (on one <b>set</b>)"
 msgstr "un <b>usuario</b> (en una <b>tarea</b>)"
 
 # Context is Assign this set to which users?  "only ____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1378
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:67
 msgid "only"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:17
 msgid "only best scores"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3472
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:357
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:448
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:88
 msgid "or"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1141
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:59
 msgid "or Problems from"
 msgstr "o problemas del"
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:776
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:843
 msgid "otherwise"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:19
 msgid "overwrite"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:664
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:627
 msgid "part"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1383
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:499
 msgid "permissions for %1 not defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "point"
 msgstr "punto"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "points"
 msgstr "puntos"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:509
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:20
 msgid "preserve"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2360
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:576
 msgid "preview answers"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:653
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:616
 msgid "problem"
 msgstr "Problema"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:632
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:41
 msgid "problems"
 msgstr "Problemas"
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:219
+msgid "proctored test"
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "professor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:360
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:451
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:89
 msgid "progress"
 msgstr "Reporte de avance"
 
 #. ($line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2212
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1409
 msgid "readSetDef error, can't read the line: ||%1||"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:93
 msgid "recitation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:654
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:53
 msgid "recitation #"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:497
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:549
 msgid "record for visible user %1 not found"
 msgstr ""
 
 #. ($restrictLoc)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1767
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:918
 msgid ""
 "restriction location %1 does not exist.  IP restrictions have been ignored."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:670
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "row"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:91
 msgid "score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:362
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:92
 msgid "section"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:643
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:47
 msgid "section #"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:88
-msgid "section:"
-msgstr "sección:"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:159
 msgid "selected <b>sets</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:524
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:197
 msgid "selected <b>users</b> to selected <b>sets</b>"
 msgstr "<b>usuarios</b> seleccionados a <b>tareas</b> seleccionadas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:441
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:488
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:605
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:8
 msgid "selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:741
-msgid "selected achievements."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1057
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1436
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:669
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:842
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:894
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:991
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:8
 msgid "selected sets"
 msgstr "tareas seleccionadas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1053
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:703
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:999
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:8
 msgid "selected users"
 msgstr "usuarios seleccionados"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:624
-msgid "set"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:628
-msgid "sets"
-msgstr "tareas"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:12
 msgid "sets hidden from students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:670
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:11
 msgid "sets visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:716
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:281
 msgid "showing all sets"
 msgstr "mostrando todas las tareas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:763
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:277
 msgid "showing all users"
 msgstr "mostrando todos los usuarios"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:725
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:290
 msgid "showing matching sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:286
 msgid "showing matching users"
 msgstr "tr: showing matching users"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:719
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:284
 msgid "showing no sets"
 msgstr "mostrando ninguna tarea"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:766
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:280
 msgid "showing no users"
 msgstr "tr: showing no users"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:722
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:287
 msgid "showing selected sets"
 msgstr "mostrando tareas seleccionadas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:769
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:283
 msgid "showing selected users"
 msgstr "mostrando usuarios seleccionados"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:299
 msgid "showing sets that are hidden from students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:732
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:296
 msgid "showing sets that are visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:72
 msgid "shown"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:162
 msgid "still open"
 msgstr ""
 
@@ -9250,16 +12388,16 @@ msgstr ""
 msgid "student"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
 msgid "submission"
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:133
 msgid "submission (version %1)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
 msgid "summary"
 msgstr ""
 
@@ -9267,135 +12405,130 @@ msgstr ""
 msgid "ta"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
-msgid "test"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:90
+msgid "templates/email directory"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:610
-msgid "test date"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:95
+msgid "templates/macros directory"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:621
-msgid "test time"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
+msgid "test"
 msgstr ""
 
-#. ($forcedSourceFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:987
-msgid "the original path to the file is %1"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:23
+msgid "test date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:469
-msgid "then delete them"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:29
+msgid "test time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "time"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:119
+msgid "then delete them"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:165
 msgid "time limit exceeded"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "times"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:35
+msgid "time remaining"
 msgstr ""
 
 # Context is Assign ____ to _____
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:183
 msgid "to"
 msgstr ""
 
 #. ($ce->{institutionName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:399
 msgid "to %1 main web site"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:524
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:381
 msgid "to courses page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:436
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:135
 msgid "to one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:764
-msgid "top score"
-msgstr "mejor puntaje"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:432
 msgid "total"
 msgstr ""
 
 #. ($ce->{webworkDirs}{logs})
 #. ($ce->{webworkDirs}{tmp})
 #. ($ce->{webworkDirs}{DATA})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:47
 msgid "unable to write to directory %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:333
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:49
 msgid "unlimited"
 msgstr "ilimitados"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:14
 msgid "unlimited reusability"
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:609
-msgid "userID: %1 --"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:652
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:259
 msgid ""
 "username, last name, first name, section, achievement level, achievement "
 "score,"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:704
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:10
 msgid "users who match on selected field"
 msgstr "tr: users who match on selected field"
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
+#. ($set->version_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:295
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:408
+msgid "version %1"
+msgstr ""
+
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:134
 msgid "version (%1)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1591
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1888
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:820
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:951
 msgid "visible"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "visible to students"
-msgstr "visible para los estudiantes"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1257
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:947
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:998
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:7
 msgid "visible users"
 msgstr "usuarios visibles"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:485
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:500
 msgid "when you submit your answers"
 msgstr ""
 
 #. ($dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1532
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:623
 msgid "won't be able to read from file %1/%2: does it exist? is it readable?"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:604
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:638
 msgid "your overall score is for all the parts combined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:231
 msgid "your students"
 msgstr "a tus estudiantes"
diff --git a/lib/WeBWorK/Localize/fr-CA.po b/lib/WeBWorK/Localize/fr-CA.po
index 21c46bb3c0..a021856a19 100644
--- a/lib/WeBWorK/Localize/fr-CA.po
+++ b/lib/WeBWorK/Localize/fr-CA.po
@@ -11,257 +11,320 @@ msgstr ""
 "Project-Id-Version: webwork2\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: 2013-01-27 17:03+0000\n"
-"Last-Translator: Hélène Larue <helene.larue@videotron.ca>, 2017\n"
-"Language-Team: French (Canada) (http://www.transifex.com/webwork/webwork2/language/fr_CA/)\n"
+"Last-Translator: Jonathan Desaulniers <jonathan.desaulniers@cegepmontpetit.ca>, 2018-2019,2021-2022\n"
+"Language-Team: French (Canada) (http://app.transifex.com/webwork/webwork2/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr_CA\n"
 "Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:428
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:449
+#. ($_->{problem}->version_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:69
+msgid " (version %1)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:265
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:284
 msgid " Answers Available."
+msgstr "Réponses disponibles."
+
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1148
+msgid " No changes have been made to set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:130
+msgid "\"Act as\" a student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:31
+msgid "\"Edit Assigned Users\" column"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:24
+msgid "\"Edit Problems\" column"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:187
+msgid "# of Active Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:735
-msgid "# of active students"
-msgstr "# d'étudiants actifs"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:85
+msgid "# of attempts"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:506
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:333
 msgid "#corr"
 msgstr "#corr"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:508
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:335
 msgid "#incorr"
 msgstr "#erroné"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2249
-msgid "% Score:"
-msgstr "% Pointage:"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:685
-msgid "% correct"
-msgstr "% correct"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:174
+msgid "% Average with Review"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:702
-msgid "% correct with review"
-msgstr "% correct avec rectification"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:66
+msgid "% Score with Review"
+msgstr ""
 
-# Percent students
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:762
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:792
-msgid "% students"
-msgstr "% d'étudiants"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:479
+msgid "% Score:"
+msgstr "% Pointage:"
 
 #. ($achievement->{points})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:24
 msgid "%1 Points:"
 msgstr "%1 Points :"
 
-#. ($lib eq '' ? $r->maketext('Local')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:476
+#. ($lib eq '' ? maketext('Local')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:9
 msgid "%1 Problems:"
 msgstr "Problèmes dans %1 :"
 
-#. ($itemCounts{$item->id()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:189
+#. ($itemCounts->{ $item->id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:12
 msgid "%1 remaining"
 msgstr "%1 restant"
 
-#. ($numAdded, $numSkipped, join(', ', @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1410
+#. ($count)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2001
+msgid "%1 sets"
+msgstr ""
+
+#. ($numAdded,                     $numSkipped,
+#. join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:608
 msgid "%1 sets added, %2 sets skipped. Skipped sets: (%3)"
 msgstr "%1 devoirs ajoutés, %2 devoirs ignorés. Devoirs ignorés : (%3)"
 
-#. ($numExported, $numSkipped, ($numSkipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1526
+#. ($numExported, $numSkipped,                     $numSkipped ? $c->tag('ul',
+#. $c->c(map { $c->tag('li', $_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:673
 msgid "%1 sets exported, %2 sets skipped. Skipped sets: (%3)"
 msgstr "%1 devoirs exportés, %2 devoirs ignorés. Devoirs ignorés : (%3)"
 
 #. ($count, $numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:608
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
 msgid "%1 students out of %2"
 msgstr "%1 étudiants sur %2"
 
-#. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle,
+#. ($rename_oldCourseID,          $rename_oldCourseTitle,
+#. $rename_newCourseTitle,
 #. $rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:675
 msgid "%1 title and institution changed from %2 to %3 and from %4 to %5"
 msgstr "Le titre et l'institution de %1 ont été changés de %2 pour %3 et de %4 pour %5 "
 
-#. (scalar @userIDsToExport, $dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1338
-msgid "%1 users exported to file %2/%3"
-msgstr "%1 utilisateurs exportés dans le fichier %2/%3"
+#. (scalar @userIDsToExport, "$dir/$fileName")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:477
+msgid "%1 users exported to file %2"
+msgstr ""
 
-#. ($numReplaced, $numAdded, $numSkipped, join (", ", @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1233
+#. ($numReplaced, $numAdded, $numSkipped, join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:443
 msgid ""
 "%1 users replaced, %2 users added, %3 users skipped. Skipped users: (%4)"
 msgstr "%1 utilisateurs remplacés, %2 utilisateurs ajoutés, %3 utilisateurs ignorés. Utilisateurs ignorés : (%4)"
 
-#. ($levelpercentage)
 #. ($percentage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:135
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:136
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:323
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:324
+#. ($level_percentage)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:12
 msgid "%1% Complete"
 msgstr "%1% de complété"
 
 #. (wwRound(0, $answerScore * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:268
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:248
 msgid "%1% correct"
 msgstr "%1% correct"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:207
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:57
 msgid "%1's Current Address"
 msgstr "Courriel actuel de %1"
 
-#. ($user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:136
+#. ($c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:26
 msgid "%1's Current Password"
 msgstr "Mot de passe actuel de %1"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:225
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:65
 msgid "%1's New Address"
 msgstr "Nouveau courriel de %1"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:153
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:34
 msgid "%1's New Password"
 msgstr "Nouveau mot de passe de %1"
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
-msgid "%1's new password cannot be blank."
-msgstr "Le nouveau mot de passe de %1 ne peut rester vide."
-
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:76
 msgid "%1's password has been changed."
 msgstr "Le mot de passe de l'utilisateur %1 a été modifié."
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:56
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1423
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#. ($c->tag('span', dir => 'ltr', $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1069
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:149
 msgid "%1: Problem %2"
 msgstr "%1 : Problème %2"
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:374
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:357
 msgid "%1: Problem %2 Show Me Another"
 msgstr "%1 : Problème %2. Montrer un autre problème"
 
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2231
-msgid "%1: The directory for the course not found."
-msgstr "%1: Le répertoire du cours est introuvable"
-
-#. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:340
-msgid "%quant(%1,error) occured while generating hardcopy:"
-msgstr "%quant(%1, erreur s'est produite, erreurs se sont produites) pendant la création de la copie imprimable : "
+#. ($days)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:87
+msgid "%quant(%1,day)"
+msgstr ""
 
 #. ($n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:924
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:389
 msgid "%quant(%1,file) unpacked successfully"
 msgstr "%quant(%1, fichier décompressé, fichiers décompressés) avec succès."
 
+#. ($hours)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:88
+msgid "%quant(%1,hour)"
+msgstr ""
+
+#. ($minutes)
+#. (sprintf('%3.1f', $testTime)
+#. ($timeLeft)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:89
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:150
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:168
+msgid "%quant(%1,minute)"
+msgstr ""
+
 #. ($numBlanks)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:430
 msgid ""
 "%quant(%1,of the questions remains,of the questions remain) unanswered."
 msgstr "%quant(%1, question reste, questions restent) sans réponses."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:678
+#. ($seconds)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:90
+msgid "%quant(%1,second)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:505
 msgid "%score"
 msgstr "pourcentage"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2971
+#. ($dcount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:40
+msgid "(%quant(%1,item) total)"
+msgstr ""
+
+#. ($count)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:29
+msgid "(%quant(%1,item))"
+msgstr ""
+
+#. ($problemValue)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1081
+msgid "(%quant(%1,point))"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:697
 msgid "(Any unsaved changes will be lost.)"
 msgstr "(Les modifications non sauvegardées seront perdues.)"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1278
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1287
-msgid ""
-"(Instructor hint preview: show the student hint after the following number "
-"of attempts:"
-msgstr "Aperçu réservé au professeur - Afficher l'indice pour les étudiants après ce nombre de tentatives non réussies :"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:102
+msgid "(If an action cannot be executed it will not appear.)"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2003
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1262
 msgid "(This problem will not count towards your grade.)"
 msgstr "(La note obtenue à ce problème ne comptera pas dans votre résultat final.)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2122
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:340
 msgid ""
 "(This test is overtime because it was not submitted in the allowed time.)"
 msgstr "(Ce test est fermé, car il n'a pas été envoyé dans le temps alloué.)"
 
-#. ($testNoun, $self->formatDateTime($set->answer_date)
+#. ($testNoun, $c->formatDateTime($c->{set}->answer_date)
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1986
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:153
 msgid "(Your score on this %1 is not available until %2.)"
 msgstr "(Votre note pour ce %1 n'est pas disponible avant %2.)"
 
 #. ($testNoun)
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1988
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:155
 msgid "(Your score on this %1 is not available.)"
 msgstr "(Votre note pour ce %1 n'est pas disponible.)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1257
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1267
 msgid "(correct)"
 msgstr "(correct)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:197
-msgid "(gw/quiz) After version answer date"
-msgstr "(test) Après la date de disponibilité des réponses"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:263
 msgid "(in target set)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1449
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1269
 msgid "(incorrect)"
 msgstr "(erroné)"
 
 #. ($pgScore)
 #. ($recScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1461
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1271
 msgid "(score %1)"
 msgstr "(note %1)"
 
-#. ($display_sort_method_name{$secondary_sort_method_name})
-#. ($display_sort_method_name{$ternary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:701
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:706
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:207
+msgid "(test) After version answer date"
+msgstr ""
+
+#. ($versionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:164
+msgid "(version %1)"
+msgstr ""
+
+#. ($display_sort_method_name{$secondary_sort_method})
+#. ($display_sort_method_name{$ternary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:103
 msgid ", then by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1297
-msgid ". If this is a class roster, rename it to have extension '.lst'"
-msgstr ". Si ceci est une liste de classe, renommer avec l'extension '.lst'"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:702
+msgid ". If this is a class roster, rename it to have extension \".lst\""
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:81
+msgid "0 seconds"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1997
+msgid "1 set"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1983
 msgid "1 student"
 msgstr "1 étudiant"
 
 #. (wwRound(2, $weights[$part] * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:145
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:58
 msgid "<b>Weight:</b> %1%"
 msgstr "<b>Pondération:</b> %1%"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1749
+#: /opt/webwork/webwork2/conf/defaults.config:1651
 msgid ""
 "<p>After the Reduced Scoring Date all additional work done by the student "
 "counts at a reduced rate. Here is where you set the reduced rate which must "
@@ -276,7 +339,7 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr "<p>À la date de début de la période de grâce d'évaluation, tout travail supplémentaire effectué par l'élève compte à un pourcentage réduit. C'est ici que vous définissez ce pourcentage réduit. Par exemple, si ce pourcentage est de 50 % et qu'un étudiant veut solutionner un problème au cours de la période de grâce, il verra le message « Vous êtes dans la période de grâce d'évaluation : tout travail supplémentaire effectué compte pour 50 % de l'original. »</p><p>Si vous voulez utiliser une période de grâce pour un devoir, il vous faut le modifier à l'aide de l'<b>Éditeur de devoir</b> en activant la période de grâce d'évaluation et en choisissant une date de début.</p><p>Cela fonctionne avec l' <i>avg_problem_grader</i> (évaluateur par défaut) et l' <i>std_problem_grader</i> (évaluateur tout ou rien). Cela fonctionne aussi avec les évaluateurs optionnels s'ils sont paramétrés de façon appropriée.</p>"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2036
+#: /opt/webwork/webwork2/conf/defaults.config:1937
 msgid ""
 "<p>During summer 2005, a newer version of the answer checkers was "
 "implemented for answers which are functions and numbers.  The newer checkers"
@@ -288,16 +351,74 @@ msgid ""
 " the old answer checkers will be used by default.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2006
+#: /opt/webwork/webwork2/conf/defaults.config:1908
 msgid ""
 "<p>MathQuill renders students answers in real-time as they type on the "
 "keyboard.</p><p>MathView allows students to choose from a variety of common "
 "math structures (such as fractions and square roots) as they attempt to "
-"input their answers.</p><p>WIRIS provides a separate workspace for students "
-"to construct their response in a WYSIWYG environment.</p>"
+"input their answers.</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1459
+msgid ""
+"<p>Mode in which the LANG and DIR settings for a single problem are "
+"determined.</p><p>The system will set the LANGuage attribute to either a "
+"value determined from the problem, a course-wide default, or the system "
+"default, depending on the mode selected. The tag will only be added to the "
+"DIV enclosing the problem if it is different than the value which should be "
+"set in the main HTML tag set for the entire course based on the course "
+"language.</p><p>There are two options for the DIRection attribute: \"ltr\" "
+"for left-to-write scripts, and \"rtl\" for right-to-left scripts like Arabic"
+" and Hebrew.</p><p>The DIRection attribute is needed to trigger proper "
+"display of the question text when the problem text-direction is different "
+"than that used by the current language of the course. For example, English "
+"problems from the library browser would display improperly in RTL mode for a"
+" Hebrew course, unless the problen Direction is set to LTR.</p><p>The "
+"feature to set a problem language and direction was only added in 2018 to "
+"the PG language, so most problems will not declare their language, and the "
+"system needs to fall back to determining the language and direction in a "
+"different manner. The OPL itself is all English, so the system wide fallback"
+" is to en-US in LTR mode.</p><p>Since the defaults fall back to the LTR "
+"direction, most sites should be fine with the \"auto::\" mode, but may want "
+"to select the one which matches their course language. The mode "
+"\"force::ltr\" would also be an option for a course which runs into trouble "
+"with the \"auto\" modes.</p><p>Modes:</p><ul><li>\"none\" prevents any "
+"additional LANG and/or DIR tag being added. The browser will use the main "
+"setting which was applied to the entire HTML page. This is likely to cause "
+"trouble when a problem of the other direction is "
+"displayed.</li><li>\"auto::\" allows the system to make the settings based "
+"on the language and direction reported by the problem (a new feature, so not"
+" set in almost all existing problems) and falling back to the expected "
+"default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" allows the "
+"system to make the settings based on the language and direction reported by "
+"the problem (a new feature, so not set in almost all existing problems) but "
+"falling back to the language with the given LangCode and the direction Dir "
+"when problem settings are not available from PG.</li><li>\"auto::Dir\" for "
+"problems without PG settings, this will use the default en=english language,"
+" but force the direction to Dir. Problems with PG settings will get those "
+"settings.</li><li>\"auto:LangCode:\" for problems without PG settings, this "
+"will use the default LTR direction, but will set the language to "
+"LangCode.Problems with PG settings will get those "
+"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
+" by the PG code of the problem, and will force the system to set the "
+"language with the given LangCode and the direction to Dir for <b>all</b> "
+"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
+"PG code of the problem, and will force the system to set the direction to "
+"Dir for <b>all</b> problems, but will avoid setting any language attribute "
+"for individual problem.</li></ul>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1514
+msgid ""
+"<p>Some servers handle courses taking place in different timezones.  If this"
+" course is not showing the correct timezone, enter the correct value here.  "
+"The format consists of unix times, such as \"America/New_York\", "
+"\"America/Chicago\", \"America/Denver\", \"America/Phoenix\" or "
+"\"America/Los_Angeles\".</p>Complete list: <a "
+"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1736
+#: /opt/webwork/webwork2/conf/defaults.config:1638
 msgid ""
 "<p>This sets whether the Reduced Scoring system will be enabled.  If enabled"
 " you will need to set the default length of the reduced scoring period and "
@@ -309,22 +430,35 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1979
+#: /opt/webwork/webwork2/conf/defaults.config:1881
 msgid ""
 "<p>When viewing a problem, users may choose different methods of rendering "
 "formulas via an options box in the left panel. Here, you can adjust what "
 "display modes are listed.</p><p>Some display modes require other software to"
 " be installed on the server. Be sure to check that all display modes "
-"selected here work from your server.</p><p>The display modes are "
-"<ul><li>plainText: shows the raw LaTeX strings for formulas.</li><li>images:"
-" produces images using the external programs LaTeX and "
-"dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place "
-"render mathematics.</li></ul></p></p>You must use at least one display mode."
-" If you select only one, then the options box will not give a choice of "
-"modes (since there will only be one active).</p>"
+"selected here work from your server.</p><p>The display modes "
+"are</p><ul><li>plainText: shows the raw LaTeX strings for "
+"formulas.</li><li>images: produces images using the external programs LaTeX "
+"and dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place"
+" render mathematics.</li></ul><p>You must use at least one display mode. If "
+"you select only one, then the options box will not give a choice of modes "
+"(since there will only be one active).</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1476
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with a question in "
+"this test. Please inform your instructor including the warning messages "
+"below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1236
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with this question. "
+"Please inform your instructor including the warning messages below."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1828
+#: /opt/webwork/webwork2/conf/defaults.config:1730
 msgid ""
 "<ul><li><b>SMAcheckAnswers</b>: enables the Check Answers button <i>for the "
 "new problem</i> when Show Me Another is "
@@ -336,7 +470,7 @@ msgid ""
 "time</li><li><b>SMAshowHints</b>: show hints <i>for the new problem</i> "
 "(assuming they exist)</li></ul>Note: there is very little point enabling the"
 " button unless you check at least one of these options - the students would "
-"simply see a new version that they can not attempt or learn from.</p>"
+"simply see a new version that they can not attempt or learn from."
 msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:35
@@ -345,73 +479,123 @@ msgstr ""
 
 #. ($add_courseID)
 #. ($rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1376
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:688
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:600
 msgid "A course with ID %1 already exists."
 msgstr "Un cours avec l'identifiant %1 existe déjà."
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2564
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1220
 msgid ""
 "A directory already exists with the name %1. You must first delete this "
 "existing course before you can unarchive."
 msgstr "Un répertoire exist déjà avec le nom %1. Vous devez supprimer le cours existant avant d'être en mesure de désarchiver."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:119
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:111
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:42
 msgid ""
 "A file name cannot begin with a dot, it cannot be empty, it cannot contain a"
 " directory path component and only the characters -_.a-zA-Z0-9 and space are"
 " allowed."
 msgstr "Un nom de fichier ne peut commencer par un point, ne peut être vide, ne peut contenir les composantes du chemin d'accès d'un répertoire et ne peut contenir que les caractères -_.a-zA-Z0-9 et les espacements sont permis."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1342
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1366
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:738
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
 msgid "A file with that name already exists"
 msgstr "Un fichier de ce nom existe déjà."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:348
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:19
 msgid ""
 "A hardcopy file was generated, but it may not be complete or correct. Please"
 " check that no problems are missing and that they are all legible. If not, "
 "please inform your instructor."
 msgstr "Un document imprimable a été généré, mais il semble ne pas être complet ou correct. Veuillez vous assurer que tous les problèmes sont affichés et qu'ils sont tous lisibles. Sinon, veuillez en informer votre professeur."
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:56
+msgid ""
+"A hash reference in which the keys are the achievement_id's assigned to the "
+"current user and the values are 0 or 1 which stores if the user has earned "
+"the associated achievement or not."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:52
+msgid ""
+"A hash reference which contains a problems metadata, such as DBsubject, "
+"DBchapter, DBsection,  and so on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:37
+msgid "A hash reference which contains the problem data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:40
+msgid "A hash reference which contains the set data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:60
+msgid ""
+"A hash reference which saves data for this user and this achievement. This "
+"hash is persistent between evaluations and changes to this variable will be "
+"saved in the database."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:64
+msgid ""
+"A hash reference which saves global data for this user. This hash is "
+"persistent between evaluations and changes to this variable will be saved in"
+" the database."
+msgstr ""
+
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3291
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1695
 msgid ""
 "A location with the name %1 already exists in the database.  Did you mean to"
 " edit that location instead?"
 msgstr "Un emplacement avec le nom %1 existe déjà dans la base de données. Désirez-vous modifier l'emplacement?"
 
-#. ($subject, $number_of_recipients, $courseName, $failed_messages)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1007
+#. ($mail_data->{subject}, $number_of_recipients, $mail_data->{courseName},
+#. $failed_messages)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:113
 msgid ""
 "A message with the subject line \"%1\" has been sent to %quant(%2,recipient)"
 " in the class %3.  There were %4 message(s) that could not be sent."
 msgstr "Un courriel avec le sujet \"%1\" a été envoyé à %quant(%2,destinataire,destinataires) dans le cours %3. Il y %4 message(s) qui n'ont pu être envoyés à certains des destinataires."
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:644
-msgid "A new file has been created at '%1'"
-msgstr "Un nouveau fichier a été nommé '%1'."
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:315
+msgid "A new file has been created at \"%1\""
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1146
+msgid "A new file has been created at \"%1\" with the contents below."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:154
+msgid ""
+"A new problem whose path ends in newProblem.pg should be given a new name, "
+"for example, \"myNewProblem.pg\"."
+msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2006
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:20
 msgid ""
-"A new file has been created at '%1' with the contents below.  No changes "
-"have been made to set %2"
-msgstr "Un nouveau fichier nommé '%1' a été créé avec le contenu ci-dessous. Aucune modification n'a été appliquée au devoir %2."
+"A student must be assigned a homework set in order for it to appear on their"
+" WeBWorK home page. Check the box in the left column to assign a student to "
+"that homework set. Uncheck the box to unassign a student. If a student is "
+"unassigned from a homework set, all of the student's data for that homework "
+"set is deleted and cannot be recovered. Use this action cautiously!"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:681
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:20
 msgid ""
-"A period (.) indicates a problem has not been attempted, and a number from 0"
-" to 100 indicates the grade earned. The number on the second line gives the "
-"number of incorrect attempts."
-msgstr "Un point (.) indique qu'un problème n'a jamais fait l'objet d'un essai et un nombre indique le pourcentage obtenu pour ce problème. Sous le pourcentage obtenu, la valeur indique le nombre d'essais réalisés par l'étudiant avant de réussir le problème."
+"A student needs to be assigned a set in order for them to work it. Once a "
+"student is unassigned a set, all the data for them is lost and there is no "
+"way to undo it. When unassigning be sure to change the option to \"Allow "
+"unassign\"."
+msgstr ""
 
 # Leave symbol codes in place
-#: /opt/webwork/webwork2/conf/defaults.config:1647
+#: /opt/webwork/webwork2/conf/defaults.config:1549
 msgid ""
 "A switch to govern the use of a Progress Bar for the student; this also "
 "enables/disables the highlighting of the current problem in the side bar, "
@@ -419,474 +603,665 @@ msgid ""
 "(&#x2717;), or unattempted (no symbol)."
 msgstr "A switch to govern the use of a Progress Bar for the student; this also enables/disables the highlighting of the current problem in the side bar, and whether it is correct (&#x2713;), in progress (&hellip;), incorrect (&#x2717;), or unattempted (no symbol)."
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:42
+msgid "A unique key identifying the achievement."
+msgstr ""
+
 # Short for ADJUSTED STATUS
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:500
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:712
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:535
 msgid "ADJ STATUS"
 msgstr "NOTE POND AJUSTÉE"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2296
-msgid "ANSWERS NOT RECORDED"
-msgstr "LES RÉPONSES N'ONT PAS ÉTÉ ENREGISTRÉES"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2281
-msgid "ANSWERS NOT RECORDED --"
-msgstr "LES RÉPONSES N'ONT PAS ÉTÉ ENREGISTRÉES --"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2295
-msgid "ANSWERS ONLY CHECKED -- "
-msgstr "LES RÉPONSES ONT ÉTÉ VÉRIFIÉES --"
+#. ($c->{scoreRecordedMessage}[ $probOrder->[$i] ])
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:504
+msgid "ANSWERS NOT RECORDED -- %1"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2232
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1505
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:515
 msgid "ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"
 msgstr "LES RÉPONSES ONT ÉTÉ VÉRIFIÉES -- MAIS ELLES N'ONT PAS ÉTÉ ENREGISTRÉES"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1527
 msgid ""
 "ATTEMPT NOT ACCEPTED -- Please submit answers again (or request new version "
 "if neccessary)."
 msgstr "TENTATIVE INCORRECT -- Soumettre la réponse à nouveau (ou essayer une nouvelle version si nécessaire)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1534
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_password_form.html.ep:1
 msgid "Abandon changes"
 msgstr "Ne pas enregistrer les modifications"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1083
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_export_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_export_form.html.ep:1
 msgid "Abandon export"
 msgstr "Annuler l'exportation"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:520
 msgid ""
 "Account creation is currently disabled in this course.  Please speak to your"
 " instructor or system administrator."
 msgstr "La création de compte dans ce cours est désactivée. Contacter votre professeur ou l'administrateur du système."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:153
-msgid "Achievement"
-msgstr "Accomplissement"
-
-#. ($targetAchievementID, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:638
-msgid "Achievement %1 created with evaluator '%2'."
-msgstr "Accomplissement %1 créé avec l'évaluateur '%2'."
+#. ($targetAchievementID,			$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:310
+msgid "Achievement %1 created with evaluator \"%2\"."
+msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:847
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:378
 msgid "Achievement %1 exists.  No achievement created"
 msgstr "Accomplissement %1 existe. Aucun accomplissement n'a été créé."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:444
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:63
 msgid "Achievement Editor"
 msgstr "Éditeur d'accomplissement"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:548
-msgid "Achievement Evaluator Editor"
-msgstr "Éditeur d'évaluation d'accomplissement"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:17
+msgid "Achievement Editor Help"
+msgstr ""
 
-#. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:170
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:17
+msgid "Achievement Evaluator Editor Help"
+msgstr ""
+
+#. ($c->stash('achievementID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:109
 msgid "Achievement Evaluator for achievement %1"
 msgstr "Évaluation d'accomplissement pour l'accomplissement %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1446
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1454
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1482
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:13
 msgid "Achievement ID"
 msgstr "ID d'accomplissement"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:274
 msgid "Achievement ID exists!  No new achievement created.  File not saved."
 msgstr "L'ID de l'accomplissement existe! Aucun accomplissement n'a été créé. Fichier non sauvegardé."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1698
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:41
+msgid "Achievement ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:3
+msgid "Achievement List"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1600
 msgid "Achievement Points Per Problem"
 msgstr "Points d'accomplissement par problème."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:558
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:455
 msgid "Achievement User Editor"
 msgstr "Éditeur d'accomplissement pour l'utilisateur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:17
+msgid "Achievement User Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:48
 msgid "Achievement has been assigned to all users."
 msgstr "L'accomplissement a été assigné à tous les utilisateurs."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:67
 msgid "Achievement has been assigned to selected users."
 msgstr "L'accomplissement a été assigné aux utilisateurs sélectionnés. "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:60
 msgid "Achievement has been unassigned to all students."
 msgstr "L'accomplissement a été désassigné pour tous les utilisateurs."
 
-#. (CGI::a({ href => $fileManagerURL }, $scoreFileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:711
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:38
+msgid "Achievement options"
+msgstr ""
+
+#. ($c->link_to(                           $scoreFileName => $c->systemLink(
+#. $c->url_for('instructor_file_manager')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:318
 msgid "Achievement scores saved to %1"
 msgstr "Le pointage d'accomplissement a été sauvegardé à %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:260
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:241
 msgid "Achievements"
 msgstr "Accomplissements"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:531
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:17
+msgid "Achievements Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:26
+msgid ""
+"Achievements are evaluated in the order shown below, with the exception of "
+"\"level\" achievements.  Achievements in the \"level\" category are "
+"evaluated first and control the XP thresholds and rewards (achievement "
+"items) for reaching each level. Achievements in the \"secret\" category are "
+"not shown to students until they earn the achievement, and is used for "
+"fun/surprise achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:32
+msgid ""
+"Achievements in the same category, with sequential numbers, and whose ID "
+"starts with the same \"prefix_\" (up to the last underscore), are treated as"
+" achievement chains.  Achievement chains are a sequence of achievements "
+"which build upon themselves, such as complete one problem, complete 10 "
+"problems, complete 25 problems, and so on. Students will only see the "
+"achievements in the chain they have completed or are currently working on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:201
 msgid "Act as"
 msgstr "Prendre le rôle"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:207
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:26
 msgid "Act as:"
 msgstr "Prendre le rôle de :"
 
-#. (HTML::Entities::encode_entities($prettyEUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1134
+#. ($effectiveUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:26
 msgid "Acting as %1."
 msgstr "Dans le rôle de %1."
 
 #. ($actionID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:372
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:223
 msgid "Action %1 not found"
 msgstr "Action %1 introuvable"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1706
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:101
+msgid "Actions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1608
 msgid ""
 "Activating this will enable achievement rewards. This feature allows "
 "students to earn rewards by completing achievements that allow them to "
 "affect their homework in a limited way."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:45
 msgid "Active"
 msgstr "Actif"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1691
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:50
+msgid "Active Students"
+msgstr ""
+
+#. ($c->{prettyID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:19
+msgid "Active Students Problem %1 Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1593
 msgid ""
 "Activiating this will enable Mathchievements for webwork.  Mathchievements "
 "can be managed by using the Achievement Editor link."
 msgstr "Activer ceci permet d'utiliser les accomplissements de correspondance pour webwork. Les accomplissements de correspondance peuvent être gérés en utilisant le lien pour l'éditeur d'accomplissement. "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2947
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1548
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:166
 msgid "Add"
 msgstr "Ajouter"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:89
 msgid "Add All"
 msgstr "Ajouter tous les problèmes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:644
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:32
 msgid "Add Course"
 msgstr "Ajouter un cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:253
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:17
+msgid "Add Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:14
+msgid "Add Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:98
 msgid "Add Students"
 msgstr "Ajouter les utilisateurs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:406
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:349
 msgid "Add Users"
 msgstr "Ajouter des utilisateurs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:518
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:17
+msgid "Add Users Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:47
 msgid "Add WeBWorK administrators to new course"
 msgstr "Ajouter l'administrateur WeBWorK au nouveau cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1509
-msgid "Add a new test for which Gateway?"
-msgstr "Ajouter un nouveau test pour quelle passerelle?"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:79
+msgid "Add a TA or an instructor (change permission level of user)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:60
+msgid "Add a few students to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:50
+msgid "Add a new version for which test?"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1441
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:20
 msgid "Add as what filetype?"
 msgstr "Spécifier le type du fichier"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/add_form.html.ep:3
 msgid "Add how many users?"
 msgstr "Combien d'utilisateurs voulez-vous ajouter?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1549
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:69
+msgid "Add many students to a course from a class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:108
+msgid "Add n blank problem template(s) to the end of homework set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:164
 msgid "Add problem to target set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Add problems to"
 msgstr "Ajouter des problèmes au "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1422
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:161
+msgid ""
+"Add this problem as the last problem of an existing set, either as a problem"
+" or as the set header (the text that appears on the home page of a homework "
+"set). You can rearrange the order of the problems later using the \"Hmwk "
+"Sets Editor\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:7
 msgid "Add to what set?"
 msgstr "Ajouter à quel devoir?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:20
+msgid ""
+"Add users to the course.  Select the number of students/users to add and "
+"then add any desired information.  The only mandatory information is the "
+"\"Login Name\". Any other fields may be left blank.  The \"Student ID\" will"
+" be the initial password for the user if provided."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:26
 msgid "Add which new users?"
 msgstr "Ajouter quels nouveaux utilisateurs? "
 
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:883
+msgid "Added \"%1\" to %2 as new hardcopy header"
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:854
+msgid "Added \"%1\" to %2 as new set header"
+msgstr ""
+
 #. ('{number}', '{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1055
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:27
 msgid "Added %1 problems to set %2."
 msgstr ""
 
-#. ($sourceFilePath, $targetSetName,($set->assignment_type eq 'jitar' ?
-#. join('.',jitar_id_to_seq($targetProblemNumber)
-#. ($new_file_name, $setName, ($set->assignment_type eq 'jitar' ?
-#. join('.',jitar_id_to_seq($targetProblemNumber)
 #. ($new_file_path, $setID, $targetProblemNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1510
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2001
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1912
+#. ($sourceFilePath,                       $targetSetName,                 (
+#. $set->assignment_type eq 'jitar'                                ? join('.',
+#. jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:825
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1837
 msgid "Added %1 to %2 as problem %3"
 msgstr "Le problème %1 a été ajouté à %2 en tant que problème %3."
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1566
-msgid "Added '%1' to %2 as new hardcopy header"
-msgstr "L'entête '%1' a été ajouté à %2 en tant que nouvel entête de la copie imprimable."
-
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1540
-msgid "Added '%1' to %2 as new set header"
-msgstr "Ajout de '%1' à %2 en tant que nouvel entête"
+#. ($new_file_name,                                $c->{setID},
+#. (                                       $set->assignment_type eq 'jitar'
+#. ? join('.', jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1139
+msgid "Added %1 to %2 as problem %3."
+msgstr ""
 
 #. (join(', ', @toAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1974
 msgid "Added addresses %1 to location %2."
 msgstr "Ajout de l'adresse %1 à l'emplacement %2."
 
+#. ($user->user_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:167
+msgid "Added missing permission level for user %1."
+msgstr ""
+
 #. ('{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1054
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:26
 msgid "Added one problem to set %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Added user:"
+msgstr ""
+
+#. ('<code>[Scoring]/report_grades_data.csv</code>',
+#. '<code>[TMPL]/email/report_grades.msg</code>',)
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:33
+msgid ""
+"Additional (external) grades can be shown on this page by placing them in "
+"the CSV file %1.  The first six columns must be (in order): Student ID, "
+"Username, Last Name, First Name, Section, Recitation.  The remaining columns"
+" can list any external grades.  To display the grades, the CSV file is "
+"merged with the \"Email\" message %2, which will be rendered and displayed "
+"below the grade table.  The message can be created on the \"Email\" page and"
+" the CSV file can be created/uploaded using the \"File Manager\".  External "
+"grades can only be displayed here and are not included in any totals or "
+"statistics."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2060
 msgid "Additional addresses for receiving feedback e-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:235
 msgid "Additional submissions available."
 msgstr ""
 
 #. ($badLocAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1708
 msgid ""
 "Address(es) %1 already exist in the database.  THIS SHOULD NOT HAPPEN!  "
 "Please double check the integrity of the WeBWorK database before continuing."
 msgstr "Adresse(s) %1 existe(s) déjà dans la base de données. CELA NE DEVRAIT PAS SE PRODUIRE! Vérifier l'intégrité de la base de données de WeBWorK avant de poursuivre."
 
 #. (join(', ', @noAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1986
 msgid ""
 "Address(es) %1 in the add list is(are) already in the location %2, and so "
 "were skipped."
 msgstr "Adresse(s) %1 dans la liste d'ajout est(sont) déjà dans l'emplacement %2 et a(ont) été ignorée(s)."
 
 #. (join(', ', @noDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3603
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2008
 msgid ""
 "Address(es) %1 in the delete list is(are) not in the location %2, and so "
 "were skipped."
 msgstr "Adresse(s) %1 dans la liste de suppression n'est(sont) pas dans l'emplacement %2 et a(ont) été ignorée(s)."
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1683
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and resubmit."
 msgstr "Adresse(s) %1 n'est(sont) pas dans une form reconnue. Vérifier les informations et resoumettre."
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1998
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and try again."
 msgstr "Adresse(s) %1 n'est(sont) pas dans une form reconnue. Vérifier les informations et recommencer."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:117
 msgid "Addresses"
 msgstr "Adresses"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:53
 msgid ""
 "Addresses for new location.  Enter one per line, as single IP addresses "
 "(e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP ranges "
 "(e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:27
 msgid ""
 "Addresses to add to the location.  Enter one per line, as single IP "
 "addresses (e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP"
 " ranges (e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:232
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:27
 msgid "Adds 24 hours to the close date of a homework."
 msgstr "Ajoute 24 heures à la date d'échéance d'un devoir."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:323
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:27
 msgid "Adds 48 hours to the close date of a homework."
 msgstr "Ajoute 48 heures à la date d'échéance d'un devoir."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:110
+msgid ""
+"Adds new template problems to the set when the set is saved. You can modify "
+"the template to create your own problem, by clicking on the \"Edit Problem\""
+" link and saving to some new file, e.g. \"myNewProblem.pg\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:19
 msgid "Adjusted Status"
 msgstr "Note Pondérée Ajustée"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:56
 msgid "Adobe PDF"
 msgstr "Adobe PDF"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:675
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:42
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:196
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:206
 msgid "After set answer date"
 msgstr "Après que les réponses sont disponibles"
 
-#. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:325
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:33
 msgid ""
-"After the reduced scoring period begins all work counts for %1% of its "
-"value."
-msgstr "Après le début de la période de points réduit tous les travaux comptent pour %1% de leur valeur."
+"After the due date this set enters a reduced scoring period until it closes "
+"on %1.  All work completed during the reduced scoring period counts for %2% "
+"of its value."
+msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:304
 msgid "Afterward reduced credit can be earned until %1."
 msgstr "Ensuite, il est possible d'obtenir un pointage réduit jusqu'à %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:56
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:60
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:23
 msgid "All Chapters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:57
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:34
 msgid "All Sections"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:6
 msgid "All Selected Constraints Joined by \"And\""
 msgstr "Filtrer votre recherche à l'aide des menus ci-dessous"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:71
+msgid "All Sets"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:12
 msgid "All Subjects"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:48
 msgid "All Textbooks"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:54
+msgid "All Users"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:49
 msgid "All assignments were made successfully."
 msgstr "Toutes les attributions ont été réalisées avec succès."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:953
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:386
 msgid "All listed sets were hidden from all the students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:951
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:381
 msgid "All listed sets were made visible for all the students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:407
 msgid "All of the answers above are correct."
 msgstr "Toutes les réponses ci-dessus sont bonnes."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:398
 msgid "All of the gradeable answers above are correct."
 msgstr "Toutes les réponses admissibles ci-dessus sont bonnes."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:247
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:162
+msgid ""
+"All of the paths for problem files are relative to the templates directory "
+"of the current course. You can access this directory \"directly\" using the "
+"File Manager page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:68
 msgid "All of these files will also be made available for mail merge."
 msgstr "Tous ces fichiers seront également disponibles pour être joints à un message courriel."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:960
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:9
+msgid "All problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:5
+msgid "All sections"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2145
+msgid "All selected courses are already hidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2214
+msgid "All selected courses are already unhidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:399
 msgid "All selected sets hidden from all students"
 msgstr "Tous les devoirs sélectionnés sont cachés aux étudiants."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:394
 msgid "All selected sets made visible for all students"
 msgstr "Tous les devoirs sélectionnés sont visibles pour les étudiants."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:946
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:373
 msgid "All sets hidden from all students"
 msgstr "Tous les devoirs sont cachés aux étudiants."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:945
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:368
 msgid "All sets made visible for all students"
 msgstr "Tous les devoirs sont visibles pour les étudiants."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:619
 msgid "All sets were selected for export."
 msgstr "Tous les devoirs on été sélectionnés pour être exportés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:56
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:54
 msgid "All unassignments were made successfully."
 msgstr "Tous les retraits ont été réalisés avec succès."
 
-#: /opt/webwork/webwork2/conf/defaults.config:2047
+#: /opt/webwork/webwork2/conf/defaults.config:1948
 msgid "Allow Unicode alternatives in student answers"
 msgstr "Permettre les alternatives en Unicode dans la réponse de l'étudiant."
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:74
 msgid "Allow the LMS to update user account data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:68
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:105
 msgid "Allow unassign"
 msgstr "Permettre de retirer le devoir"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2069
+#: /opt/webwork/webwork2/conf/defaults.config:1970
 msgid "Allowed error, as a percentage, for numerical comparisons"
 msgstr "Marge d'erreur permise, en pourcentage, pour les comparaisons numériques"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1886
+#: /opt/webwork/webwork2/conf/defaults.config:1788
 msgid "Allowed to <em>act as</em> another user"
 msgstr "Autorisés à <em>prendre le rôle</em> d'un autre utilisateur"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1923
+#: /opt/webwork/webwork2/conf/defaults.config:1825
 msgid "Allowed to change display settings used in pg problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1913
+#: /opt/webwork/webwork2/conf/defaults.config:1815
 msgid "Allowed to change their e-mail address"
 msgstr "Autorisés à modifier leur adresse courriel"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1877
+#: /opt/webwork/webwork2/conf/defaults.config:1779
 msgid "Allowed to change their password"
 msgstr "Autorisés à modifier leur mot de passe"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1872
+#: /opt/webwork/webwork2/conf/defaults.config:1774
 msgid "Allowed to login to the course"
 msgstr "Autorisés à se connecter au cours"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1950
+#: /opt/webwork/webwork2/conf/defaults.config:1852
 msgid "Allowed to see solutions before the answer date"
 msgstr "Autorisés à voir les solutions avant la date de disponibilité des réponses"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1945
+#: /opt/webwork/webwork2/conf/defaults.config:1847
 msgid "Allowed to see the correct answers before the answer date"
 msgstr "Permettre de voir les bonnes réponses avant la date de disponibilité des réponses"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1934
+#: /opt/webwork/webwork2/conf/defaults.config:1836
 msgid "Allowed to view past answers"
 msgstr "Autorisés à voir les anciennes réponses"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1940
+#: /opt/webwork/webwork2/conf/defaults.config:1842
 msgid "Allowed to view problems in sets which are not open yet"
 msgstr "Autorisés à voir des problèmes dans des devoirs qui ne sont pas encore disponibles"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1572
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:82
+msgid ""
+"Allows configuration of certain parameters, such as permission levels, "
+"default display mode for equations, and email feedback behavior, on a course"
+" by course basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:126
+msgid "Also copy simple configuration file"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:26
 msgid "Amulet of Extension"
 msgstr "Amulette d'extension"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:20
+msgid ""
+"An achievement evaluator is a perl script that is run after each problem is "
+"submitted which returns a truth value of 0 (didn't earn) or 1 (earn). The "
+"evaluator is given access to different variables which contain data about "
+"the problem and set that is used to determine if the achievement is earned "
+"or not."
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:37
 msgid ""
 "An address that can be used to log in to the LMS. This is used in messages "
@@ -894,248 +1269,308 @@ msgid ""
 "WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:43
+msgid ""
+"An array which lists the hash reference of all the problems in the current "
+"set."
+msgstr ""
+
 #. ($archive_courseID)
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2350
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2647
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1274
 msgid "An error occured while archiving the course %1:"
 msgstr "Un erreur s'est produite lors de l'archivage du cours %1 :"
 
 #. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:658
 msgid "An error occured while changing the title of the course %1."
 msgstr "Une erreur est survenue lors du changement du titre du cours %1."
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1795
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:878
 msgid "An error occured while deleting the course %1:"
 msgstr "Une erreur est survenue lors de la suppression du cours %1:"
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1521
+#. ($rename_oldCourseID,						$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:751
 msgid "An error occured while renaming the course %1 to %2:"
 msgstr "Une erreur est survenue en renommant le cours %1 pour %2:"
 
 #. ($part + 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:106
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:25
 msgid "Answer %1 Score (%):"
 msgstr "Réponse %1 Pointage (%):"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:425
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:765
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:789
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:812
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:79
 msgid "Answer Date"
 msgstr "Date de disponibilité des réponses"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1712
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:39
 msgid "Answer Group Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:59
 msgid "Answer Hash Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:221
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:292
 msgid "Answer Log"
 msgstr "Historique des réponses"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:17
+msgid "Answer Log Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:285
 msgid "Answer Preview"
 msgstr "Aperçu des réponses"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1465
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:48
+msgid ""
+"Answer availability for tests depends on multiple settings.  This only "
+"indicates the template answer date has passed.  See set editor for actual "
+"availability."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1276
 msgid "Answer(s) submitted:"
 msgstr "Réponses enregistrées :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
 msgid "Answer:"
 msgstr "Réponse&#8239;:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:224
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
 msgid "Answers"
 msgstr "Réponses"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:122
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:37
 msgid "Answers Available"
 msgstr "Réponses disponibles"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1202
 msgid "Answers cannot be due until on or after the open date!"
 msgstr "Les réponses ne peuvent pas être dues avant la date d'ouverture!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1204
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1197
 msgid "Answers cannot be made available until on or after the close date!"
 msgstr "Les réponses ne peuvent pas être disponibles avant la date d'échéance!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:313
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:21
 msgid ""
 "Any changes made below will be reflected in the achievement for ALL "
 "students."
 msgstr "Tout changement effectué ici va affecter les achèvements pour TOUS les étudiants."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2259
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:507
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:175
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:69
 msgid "Any changes made below will be reflected in the set for ALL students."
 msgstr "Les changements effectués ci-dessous affecteront les devoirs de TOUS les étudiants désignés."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:173
 msgid ""
 "Any changes made below will be reflected in the set for ONLY the student(s) "
 "listed above."
 msgstr "Les changements effectués ci-dessous affecteront SEULEMENT le devoir du ou des étudiants énumérés."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:122
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:159
 msgid "Append"
 msgstr "Ajouter à"
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1849
+#. (tag('strong', dir => 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:71
 msgid "Append to end of %1 set"
 msgstr "Ajouter ce problème à la fin du devoir %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2264
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:51
+msgid "Applying definitions theoretically and proof writing"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:91
 msgid "Archive"
 msgstr "Archiver"
 
 #. ($archive, $n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:892
-msgid "Archive '%1' created successfully (%quant( %2, file))"
-msgstr "L'archive '%1' a été créée avec succès (%quant( %2, fichier, fichiers))."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:361
+msgid "Archive \"%1\" created successfully (%quant( %2, file))"
+msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1069
-msgid "Archive '%1' deleted"
-msgstr "L'archive '%1' a été supprimée."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:525
+msgid "Archive \"%1\" deleted"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1846
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2048
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:38
 msgid "Archive Course"
 msgstr "Archiver un cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2005
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:17
+msgid "Archive Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:63
 msgid "Archive Courses"
 msgstr "Archiver des cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2423
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1158
 msgid "Archive next course"
 msgstr "Archiver le cours suivant"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1056
-msgid "Archive this Course"
-msgstr "Archiver ce cours"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:61
 msgid "Archived Courses"
 msgstr "Archiver les cours"
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:202
-msgid "Archiving course as %1.tar.gz. Reload FileManager to see it."
-msgstr "Archiver le cours en tant que %1.tar.gz. Recharger le gestionnaire de fichier pour le voir."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:69
+msgid "Archived course as %1.tar.gz."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:25
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to access the .tar.gz files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:26
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to upload additional .tar.gz "
+"files to be unarchived."
+msgstr ""
 
-#. (CGI::b($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2191
+#. (tag('b', $archive_courseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:57
 msgid ""
 "Are you sure that you want to delete the course %1 after archiving? This "
 "cannot be undone!"
 msgstr "Êtes-vous sur de vouloir supprimer le cours %1 après l'avoir archiver? Ce processus n'est pas réversible!"
 
-#. (CGI::b($delete_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1736
+#. (tag('b', param('delete_courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:5
 msgid ""
 "Are you sure you want to delete the course %1? All course files and data "
 "will be destroyed. There is no undo available."
 msgstr "Êtes-vous sur de vouloir supprimer le cours %1? Toutes les informations et les fichiers seront perdus. Aucun retour en arrière est possible."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:72
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:511
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:64
+msgid ""
+"As the checkbox says, this includes a percentage grade column for each set."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:184
 msgid "Assign"
 msgstr "Attribuer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:225
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:62
 msgid "Assign All Sets to Current User"
 msgstr "Attribuer tous les devoirs à cet utilisateur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:171
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:106
+msgid "Assign achievements"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:43
+msgid "Assign and unassign selected exercise sets to selected users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:54
 msgid "Assign selected sets to selected users"
 msgstr "Attribuer les devoirs sélectionnés aux utilisateurs sélectionnés "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:919
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:154
+msgid "Assign sets to many students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:116
+msgid "Assign sets to one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:15
 msgid "Assign this achievement to which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1366
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:62
 msgid "Assign this set to which users?"
 msgstr "Attribuer ce devoir à quels utilisateurs? "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:15
 msgid "Assign to All Current Users"
 msgstr "Attribuer à tous les utilisateurs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:3
 msgid "Assign which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:35
 msgid "Assigned"
 msgstr "Attribué"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1984
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:19
 msgid "Assigned Sets"
 msgstr "Devoirs attribués"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:580
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:218
 msgid "Assigned achievements to users"
 msgstr "Achèvements attribués aux utilisateurs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2154
-msgid "Assigned to"
-msgstr "Attribué à "
+#. (link_to(						$c->setCountMessage($db->countUserSets($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:96
+msgid "Assigned to %1."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:212
 msgid "Assignment type"
 msgstr "Type d'évaluation"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-msgid "Assignments only"
-msgstr "Seulement les évaluations"
-
-#: /opt/webwork/webwork2/conf/defaults.config:2004
+#: /opt/webwork/webwork2/conf/defaults.config:1906
 msgid "Assist with the student answer entry process."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:417
 msgid "At least one of the answers above is NOT correct."
 msgstr "Au moins une des réponses ci-dessus N'EST PAS bonne."
 
 # Short for "Attempts to Open Children"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:487
 msgid "Att. to Open Children"
 msgstr "Ouvrir les sous-problèmes après"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:50
 msgid "Attachment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2293
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:107
 msgid "Attempt to upgrade directories"
 msgstr "Tentative de mise à jour des répertoires"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:375
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:449
 msgid "Attempted"
 msgstr "Essayé"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1416
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1498
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/attempts_row.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:73
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:13
 msgid "Attempts"
 msgstr "Essais"
 
@@ -1143,64 +1578,114 @@ msgstr "Essais"
 msgid "Audit"
 msgstr "Auditeur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:342
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:348
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:360
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:366
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:460
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:466
 msgid "Authentication failed.  Please speak to your instructor."
 msgstr "La tentative de connexion a échoué. Veuillez contacter votre professeur."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/InstructorRPCHandler.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:44
+msgid "Authentication failed. Log in again to continue."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:116
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:69
 msgid "Author Info"
 msgstr "Informations pour l'auteur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:87
 msgid "Automatic"
 msgstr "Automatique"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2058
+#: /opt/webwork/webwork2/conf/defaults.config:1959
 msgid ""
 "Automatically convert Full Width Unicode characters to their ASCII "
 "equivalents"
 msgstr "Convertir automatiquement l'ensemble des charactères Unicode en ASCII"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2911
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:97
+msgid ""
+"Automatically render all problems in the set on this page when \"Save "
+"Changes\" or \"Reset Form\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:667
 msgid "Automatically render problems on page load"
 msgstr "Afficher automatiquement les énoncés des problèmes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1727
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:95
+msgid "Automatically render problems on page load."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:49
 msgid "Auxiliary Resources"
 msgstr ""
 
-#. ($emailDirectory,$old_default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:350
-msgid "Backup file <code>%1/%2</code> created."
-msgstr "Fichier de sauvegarde  <code>%1/%2</code>  créé."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:179
+msgid "Average Attempts"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:118
+msgid "Average Attempts Per Problem"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:115
+msgid "Average Percent"
+msgstr ""
+
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:558
+msgid "Backup created on %1"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:255
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:1
 msgid "Badges"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:942
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:106
 msgid "Basic Search"
 msgstr "Recherche de base"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:28
+msgid "Before Open Date"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:31
+msgid ""
+"Below the file list is a button and options for uploading files. Click the "
+"\"Choose File\" button, select the file, then click \"Upload\". A single "
+"file or a compressed tar (.tgz) file can be uploaded and if the option is "
+"selected, the archive is automatically unpacked and deleted.  Generally the "
+"\"automatic\" option on Format will correctly pick the correct type of file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:83
 msgid "Binary"
-msgstr "Binaire"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+msgid "Both Start and Grade"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1271
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:26
 msgid "Box of Transmogrification"
 msgstr "Boîte de métamorphose"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1093
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:40
 msgid "Browse"
 msgstr "Parcourir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:512
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:991
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:16
 msgid "Browse from:"
 msgstr "Parcourir dans : "
 
-#: /opt/webwork/webwork2/conf/defaults.config:2161
+#: /opt/webwork/webwork2/conf/defaults.config:2072
 msgid ""
 "By default, feedback is always sent to all users specified to recieve "
 "feedback.  This variable sets the system to only email feedback to users who"
@@ -1208,327 +1693,471 @@ msgid ""
 "will only be sent to section leaders."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2151
+#: /opt/webwork/webwork2/conf/defaults.config:2062
 msgid ""
 "By default, feedback is sent to all users above who have permission to "
 "receive feedback. Feedback is also sent to any addresses specified in this "
 "blank. Separate email address entries by commas."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
 msgid "CLOSE DATE"
 msgstr "DATE D'ÉCHÉANCE"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:217
 msgid "CLOSE TIME"
 msgstr "HEURE D'ÉCHÉANCE"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:26
 msgid "Cake of Enlargement"
 msgstr "La grande augmentation"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1891
+#: /opt/webwork/webwork2/conf/defaults.config:1793
 msgid "Can e-mail instructor"
 msgstr "Peut envoyer un courriel au professeur"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1904
+#: /opt/webwork/webwork2/conf/defaults.config:1806
 msgid "Can report bugs"
 msgstr "Peut rapporter des bogues"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1955
+#: /opt/webwork/webwork2/conf/defaults.config:1857
 msgid "Can show old answers"
 msgstr "Peut voir les anciennes réponses"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1897
+#: /opt/webwork/webwork2/conf/defaults.config:1799
 msgid "Can submit answers for a student"
 msgstr "Peut soumettre des réponses pour un étudiant"
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:275
 msgid "Can't copy file: %1"
 msgstr "Impossible de copier le fichier&#8239;: %1"
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:894
-msgid "Can't create archive '%1': command returned %2"
-msgstr "Impossible de créer l'archive '%1' : cette action a retourné %2."
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
+msgid "Can't create archive \"%1\": command returned %2"
+msgstr ""
 
 #. ($courseID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2725
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:28
 msgid "Can't create course environment for %1 because %2"
 msgstr "Impossible de créer l'environnement du cours pour %1 car %2"
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:423
 msgid "Can't create directory: %1"
 msgstr "\tImpossible de créer le dossier&#8239;: %1"
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1060
-msgid "Can't create file '%1': %2"
-msgstr "Impossible de créer le fichier '%1'&#8239;: %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+msgid "Can't create file \"%1\": %2"
+msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:948
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:406
 msgid "Can't create file: %1"
 msgstr "Impossible de créer le fichier&#8239;: %1"
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1070
-msgid "Can't delete archive '%1': %2"
-msgstr "Impossible de supprimer l'archive '%1'&#8239;: %2"
-
-#. ($eUserID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:69
-msgid "Can't get password record for effective user '%1': %2"
-msgstr "Impossible d'accéder au mot de passe pour l'utilisateur actuel '%1'&#8239;: %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:526
+msgid "Can't delete archive \"%1\": %2"
+msgstr ""
 
-#. ($userID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:64
-msgid "Can't get password record for user '%1': %2"
-msgstr "Impossible d'accéder au mot de passe pour l'utilisateur '%1'&#8239;: %2"
+#. ($setID, $TargetUser->user_id,)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:925
+msgid ""
+"Can't generate hardcopy for set \"%1\" for user \"%2\". The set is not "
+"visible to students."
+msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:445
 msgid "Can't open %1"
 msgstr "Impossible d'ouvrir %1"
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1426
 msgid "Can't open file %1"
 msgstr "Impossible d'ouvrir le fichier %1"
 
 #. ($merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:343
 msgid "Can't read merge file %1. No message sent"
 msgstr "Impossible de lire le fichier joint %1. Aucun message n'a été envoyé."
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:760
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:298
 msgid "Can't rename file: %1"
 msgstr "Impossible de renommer le fichier : %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:591
 msgid "Can't rename to the same name."
 msgstr "Impossible de renommer avec le même nom"
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:927
-msgid "Can't unpack '%1': command returned %2"
-msgstr "Impossible de décompresser '%1' : cette action a retourné %2."
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:392
+msgid "Can't unpack \"%1\": command returned %2"
+msgstr ""
 
 #. ($fullPath)
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:629
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1895
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1819
 msgid "Can't write to file %1"
 msgstr "Impossible d'écrire dans le fichier %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1015
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1096
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:154
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:462
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/confirm.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:69
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:15
 msgid "Cancel"
 msgstr "Annuler"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:387
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:5
+msgid "Cancel E-Mail"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:60
 msgid "Cancel E-mail"
 msgstr "Annuler le courriel"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:61
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:77
 msgid "Cancel Edit"
 msgstr "Annuler l'édition"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:79
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
 msgid "Cancel Export"
 msgstr "Annuler l'exportation"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:93
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
 msgid "Cancel Password"
 msgstr "Annuler le mot de passe"
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:516
+msgid "Cannot find a file path to save to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:501
+msgid ""
+"Cannot find a problem record for set $c->{setID} / problem $c->{problemID}"
+msgstr ""
+
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:240
 msgid "Cannot open %1"
 msgstr "Impossible d'ouvrir %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:222
-msgid "Cap Test Time at Set Close Date?"
-msgstr "Mettre fin au test à la date d'échéance?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:232
+msgid "Cap Test Time at Set Close Date"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1456
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1486
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:14
 msgid "Category"
 msgstr "Catégorie"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:516
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:49
+msgid "Category:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:27
 msgid ""
 "Cause the selected homework set to count for twice as many points as it "
 "normally would."
 msgstr "Implique que le devoir sélectionné compte pour le double des points."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1272
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:27
 msgid ""
 "Causes a homework problem to become a clone of another problem from the same"
 " set."
 msgstr "Implique qu'un problème d'un devoir devient le clone d'un autre problème du même devoir."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:727
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:27
 msgid "Causes a single homework problem to be worth twice as much."
 msgstr "Implique que le problème d'un devoir compte pour le double des points."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1006
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:48
 msgid "Change Course Title to:"
 msgstr "Modifier le titre du cours pour:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:34
 msgid "Change CourseID to:"
 msgstr "Nouvel identifiant du cours :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:176
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:134
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:76
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:25
 msgid "Change Display Settings"
 msgstr "Modifier les paramètres d'affichage"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:53
 msgid "Change Email Address"
 msgstr "Modifier l'adresse de courriel"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1032
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:62
 msgid "Change Institution to:"
 msgstr "Modifier l'institution pour:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:374
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:18
 msgid "Change Password"
 msgstr "Modifier le mot de passe"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:169
 msgid "Change User Settings"
 msgstr "Modifier les paramètres de l'utilisateur"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:35
+msgid "Change a course's ID, Title, or Institution."
+msgstr ""
+
 #. ($rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1092
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
 msgid "Change course institution from %1 to %2"
 msgstr "Modifier l'institution du cours %1 pour %2"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:160
+msgid "Change dates for a homework set for the whole class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:123
+msgid "Change the due date for one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:26
+msgid ""
+"Change the due dates for an individual student on this page. Check the "
+"checkbox and enter the new date in order to override the date. (You can copy"
+" the date format from the date in the right hand column which indicates the "
+"date when the homework set is due for the whole class.) Note that you should"
+" ensure that the close date is before the answer date. If the close date for"
+" a student is extended until after the class answer date for the set, then "
+"the answer date for the student must also be set to a later date. "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:141
+msgid "Change the grades on a homework set for one student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:163
+msgid "Change the grading on a homework set for an entire class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:170
+msgid "Change the number of atttempts allowed on a problem."
+msgstr ""
+
 #. ($rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1089
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:508
 msgid "Change title from %1 to %2"
 msgstr "Modifier le titre %1 pour %2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1362
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:488
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:540
 msgid "Changes abandoned"
 msgstr "Les modifications n'ont pas été sauvegardées."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:371
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:242
 msgid "Changes in this file have not yet been permanently saved."
 msgstr "Les modifications dans ce fichier n'ont pas encore été enregistrées de façon permanente."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:647
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:529
 msgid "Changes saved"
 msgstr "Modifications sauvegardées"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1822
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:38
+msgid "Changing dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:514
 msgid ""
 "Changing the problem seed for display, but there are no problems showing."
 msgstr "Modification de la valeur d'amorce d'un problème, mais il n'y a pas de problème à afficher"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:635
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:19
 msgid "Chapter:"
 msgstr "Chapitre :"
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1849
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:15
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:103
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:37
 msgid "Check Answers"
 msgstr "Vérifier les réponses"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2476
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:682
 msgid "Check Test"
 msgstr "Vérifier le test"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:183
-msgid "Check that it's permissions are set correctly."
-msgstr "Vérifier si les permissions sont bien choisies"
-
-#. ($emailDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:195
-msgid ""
-"Check whether it exists and whether the directory %1 can be read by the "
-"webserver."
-msgstr "Vérifier soit s'il existe, soit si le répertoire %1 peut être lu par le serveur"
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:53
+msgid "Choose problems from a library and add them to a homework set."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:543
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:40
 msgid "Choose the set which you would like to be worth twice as much."
 msgstr "Choisir le devoir qui comptera pour le double des points."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:44
 msgid "Choose the set which you would like to enable partial credit for."
 msgstr "Choisir le devoir qui permettra l'obtention partiel de points."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1206
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:992
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:44
 msgid "Choose the set which you would like to resurrect."
 msgstr "Choisir le devoir à ramener."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:259
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:350
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:40
 msgid "Choose the set whose close date you would like to extend."
 msgstr "Choisir le devoir dont la date de fermeture sera prolongée."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:903
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:16
 msgid "Choose visibility of the sets to be affected"
 msgstr "Choisir si ces devoirs seront visibles ou non pour les étudiants "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:497
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:15
 msgid "Choose what to do with existing data:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:880
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:3
 msgid "Choose which sets to be affected"
 msgstr "Afficher ou cacher quels devoirs? "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:491
-msgid "Class value"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:17
+msgid "Class List Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:55
+msgid "Class list (\".lst\") files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:334
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:316
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:37
 msgid "Classlist Editor"
 msgstr "Liste des utilisateurs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1197
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:91
 msgid "Clear Problem Display"
 msgstr "Vider l'affichage des problèmes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:693
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:82
 msgid ""
 "Click a student's name to see the student's homework set. Click a heading to"
 " sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:74
 msgid ""
 "Click a student's name to see the student's test summary page. Click a "
 "test's version number to see the corresponding test version. Click a heading"
 " to sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:614
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:150
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:143
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made. (The grade for each problem is listed "
+"as \"status\" on this third page)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:24
+msgid ""
+"Click on each of the tabs to view the configuration items. The question mark"
+" icon provides access to information about the behavior of the configuration"
+" settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:125
+msgid ""
+"Click on the column \"Assigned Sets\" in the student's row. This will take "
+"you to a page where you can assign and unassign homework sets and change the"
+" due dates for homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:33
+msgid ""
+"Click on the homework set links to edit the grades for this individual "
+"student on the homework set. (The grade of each problem is called the "
+"\"status\".) You can also change the number of allowed attempts and further "
+"modify the individual student's homework set.) You will also be able to "
+"change a student's seed which determines the individual values used in the "
+"individual version of the student's problem and the weight (how much a "
+"problem counts towards the grade.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:90
 msgid ""
 "Click on the login name to edit individual problem set data, (e.g. due "
 "dates) for these students."
 msgstr "Cliquer sur le nom d'un utilisateur pour modifier les informations générales (ex. : la date d'échéance) concernant les devoirs qui lui sont attribués."
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:62
+msgid ""
+"Click the \"Add x student(s)\" radio button and then click \"Take action\". "
+"This will take you to a new page where the data can be entered for one or "
+"more students. It is also possible to assign the student to one or more "
+"problem sets as they are being entered: simply select the homework sets from"
+" the list below the data entry table. Use \"command\" or \"control\" click "
+"to select more than one homework set."
+msgstr ""
+
+#. ('<i class="fas fa-question-circle"></i>')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:88
+msgid "Click the %1 icon for page and item specific help."
+msgstr ""
+
+#. ('<a href="#"><i class="fas fa-question-circle"></i></a>')
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:20
+msgid "Click the icon %1 for page and item specific help."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:185
+msgid ""
+"Clicking on any active link at the top of the column sorts the page by that "
+"column. You can do lexigraphic sorts: click on \"First name\" then \"Last "
+"name\" to sort by last name, sorting those with the same last name by their "
+"first name."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:132
+msgid ""
+"Clicking on the login name link in a student's row allows you to view the "
+"student's version of the homework (rather than your own) so that you can "
+"more easily answer student questions about homework problems. (A \"acting as"
+" xxx\" alert will appear in the upper right corner of each window while you "
+"are acting as a student.) You can submit the answers (which will NOT be "
+"recorded) to check that the computer is grading the problem correctly. You "
+"will also be able to view past answers submitted by the student for each "
+"problem. To stop acting in the student's role click the \"Stop acting\" link"
+" in the upper right corner of the window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:199
+msgid ""
+"Clicking the <strong>e-mail address</strong> link will bring up your "
+"standard email application so that you can send email to the student. This "
+"works even if the student has been dropped from the course. To send email to"
+" an entire class or to merge grades with the email message use the \"Email\""
+" page link in the left margin."
+msgstr ""
+
 #. ($clientIP->ip()
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:541
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:547
 msgid ""
 "Client ip address %1 is not allowed to work this assignment, because the "
 "assignment has ip address restrictions and there are no allowed locations "
@@ -1536,329 +2165,337 @@ msgid ""
 "problem resolved."
 msgstr "L'adresse IP %1 n'est pas autorisé d'accès à ce devoir, car le devoir contient des restrictions d'adresses IP et aucune permission n'est associée à ces restrictions. Contacter votre enseignant pour résoudre le problème."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:713
-msgid "Close"
-msgstr "Fermer"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:424
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:764
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:788
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:811
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:316
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:39
 msgid "Close Date"
 msgstr "Date d'échéance"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:382
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:35
+msgid "Closed"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:208
 msgid "Closed, answers available."
 msgstr "Fermé, réponses disponibles."
 
-#. ($self->formatDateTime($set->answer_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:378
+#. ($c->formatDateTime($set->answer_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:204
 msgid "Closed, answers on %1."
 msgstr "Fermé, réponses disponibles %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:206
 msgid "Closed, answers recently available."
 msgstr "Fermé, réponses disponibles depuis peu."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:282
 msgid "Closed."
 msgstr "Fermé."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:116
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:121
 msgid "Closes"
 msgstr "Date d'échéance"
 
-#. ($self->formatDateTime($set->due_date, undef,
+#. ($c->formatDateTime($verSet->due_date, undef,
 #. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:113
-msgid "Closes %1"
-msgstr "Prend fin le %1"
-
-#. ($self->formatDateTime($verSet->due_date, undef,
-#. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:390
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:227
 msgid "Closes on %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:35
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:33
 msgid "Closes:"
 msgstr "Échéance&#8239;:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2518
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:357
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:71
 msgid "Collapse All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2529
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:367
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:85
 msgid "Collapse All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2668
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:419
 msgid "Collapse Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2791
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2793
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:572
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:575
 msgid "Collapse Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1715
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:73
+msgid ""
+"Collapse problem details to the top row of information about a problem. Note"
+" that the details of a single problem can be collapsed by clicking on the up"
+" arrow to the right of the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1617
 msgid ""
 "Comma separated list of set names that are excluded from all achievements. "
 "No achievement points and badges can be earned for submitting problems in "
 "these sets. Note that underscores (_) must be used for spaces in set names."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:238
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:245
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:225
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:577
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2047
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:299
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:833
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:862
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:891
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:920
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:131
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:46
 msgid "Comment"
 msgstr "Commentaire"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:200
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:25
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:181
 msgid "Comment:"
 msgstr "Commentaire:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:638
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:86
 msgid "Comments"
 msgstr ""
 
-#. ($self->formatDateTime($set->answer_date)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2175
+#. ($c->formatDateTime($c->{set}->answer_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:379
 msgid "Completed results for this assignment are not available until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:382
 msgid "Completed results for this assignment are not available."
 msgstr "Le sommaire des résultats pour ce test n'est pas disponible."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:264
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:280
 msgid "Completed."
 msgstr "Complet."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:45
 msgid "Compose Email Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3185
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:47
+msgid ""
+"Configure ip ranges (locations) that can be used to restrict set access."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:45
+msgid "Configure which course links appear on the site landing page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:97
 msgid "Confirm"
 msgstr "Confirmer"
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:107
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:164
+#. ($eUserName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:41
 msgid "Confirm %1's New Password"
 msgstr "Confirmer le nouveau mot de passe de %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:579
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:78
 msgid "Confirm Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_export_form.html.ep:1
 msgid "Confirm which sets to export."
 msgstr "Confirmer quel devoir exporter."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementEvaluator.pm:288
+#: /opt/webwork/webwork2/templates/AchievementEvaluator/cheevoMessage.html.ep:15
 msgid "Congratulations, you earned a new level!"
 msgstr "Félicitation, vous avez gagné un nouveau niveau!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2250
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:95
 msgid "Continue"
 msgstr "Se connecter"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:86
 msgid "Continue Open Test"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:59
+msgid "Controls if an achievement is evaluated or not."
+msgstr ""
+
 #. ($sourceDirectory, $outputDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1149
-msgid "Copied auxiliary files from %1 to new location at %2"
-msgstr "Les fichiers auxiliaires de %1 ont été copiés dans %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:671
+msgid "Copied auxiliary files from %1 to new location at %2."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:42
 msgid "Copy"
 msgstr "Copier"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
 msgid "Copy file as:"
 msgstr "Copier le fichier vers :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:528
-msgid "Copy simple configuration file to new course"
-msgstr "Copier le fichier de configuration dans le nouveau cours"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:627
-msgid "Copy templates from:"
-msgstr "Copier les modèles depuis:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:112
+msgid "Copy from:"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1335
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:82
 msgid "Copy this Problem"
 msgstr "Copier ce problème"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:391
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:465
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:301
 msgid "Correct"
 msgstr "Réussi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:656
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:678
 msgid "Correct Adjusted Status"
 msgstr "Note Pondérée Ajustée Réussie"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:300
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:287
 msgid "Correct Answer"
 msgstr "Bonne réponse"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1682
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:19
 msgid "Correct Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1506
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1317
 msgid "Correct Answers:"
 msgstr "Bonnes réponses :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:693
 msgid "Correct Status"
 msgstr "Statut Réussi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:648
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:93
 msgid "Correct answers"
 msgstr "Bonnes réponses"
 
 #. ($total_correct, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1004
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:16
 msgid "Correct: %1/%2"
 msgstr "Réussi : %1/%2"
 
 #. ($newBlankProblems, $MAX_NEW_PROBLEMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1915
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1843
 msgid ""
 "Could not add %1 problems to this set.  The number must be between 1 and %2"
 msgstr "Impossible d'ajouter %1 problème(s) à ce devoir. Le nombre doit être entre 1 et %2."
 
 #. ($e_user_name, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:83
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:94
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:74
 msgid "Couldn't change %1's password: %2"
 msgstr "Impossible de modifier le mot de passe '%2' de l'utilisateur %1"
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:111
 msgid "Couldn't change your email address: %1"
 msgstr "Impossible de modifier votre adresse de courriel&#8239;: %1"
 
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4111
-msgid "Couldn't find OPL Branch %1 in remote %2"
-msgstr "Impossible de trouver la branche OPL %1 dans l'emplacement en ligne %2"
-
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4076
-msgid "Couldn't find PG Branch %1 in remote %2"
-msgstr "Impossible de trouver la branche PG %1 dans l'emplacement en ligne %2"
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4014
-msgid "Couldn't find WeBWorK Branch %1 in remote %2"
-msgstr "Impossible de trouver la branche WeBWorK %1 dans l'emplacement en ligne %2"
-
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:132
 msgid "Couldn't save your display options: %1"
 msgstr "Impossible de sauvegarder vos paramètres d'affichage : %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1463
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:36
 msgid "Counter"
 msgstr "Compteur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:424
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:833
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:66
+msgid "Counter:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:503
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:35
 msgid "Counts for Parent"
 msgstr "Compte dans Parent"
 
-#. ($rename_oldCourseID)
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2186
-msgid "Course %1 database is in order"
-msgstr "La base de données du cours %1 est en ordre"
-
-#. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1257
-msgid "Course %1 databases must be updated before renaming this course."
-msgstr "La base de données du cours %1 doit être mise à jour avant de renommer le cours."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:778
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:95
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:154
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:9
 msgid "Course Administration"
 msgstr "Administration du cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:424
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:17
+msgid "Course Administration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:369
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:80
 msgid "Course Configuration"
 msgstr "Configuration du cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:480
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:17
+msgid "Course Configuration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:17
+msgid "Course Home Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:21
 msgid "Course ID"
 msgstr ""
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2566
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:691
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:594
 msgid "Course ID cannot exceed %1 characters."
 msgstr "L'ID de cours ne peut excéder %1 caractères."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1227
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:597
 msgid "Course ID may only contain letters, numbers, hyphens, and underscores."
 msgstr "L'identifiant du cours ne peut contenir que des caractères alphanumériques sans accents ni tirets."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:956
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:21
 msgid "Course ID:"
 msgstr "Identifiant du cours :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:5
 msgid "Course Info"
 msgstr "Informations sur le cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1664
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1961
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3736
+#. ($c->stash('courseID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:325
+msgid "Course Information for course %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:30
+msgid "Course Listings"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:17
 msgid "Course Name:"
 msgstr "Nom du cours :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:491
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:28
 msgid "Course Title"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:204
-msgid "Course archived."
-msgstr "Le cours a été archivé."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:418
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:12
 msgid "Courses"
 msgstr "Cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1609
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1904
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3674
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:13
 msgid ""
 "Courses are listed either alphabetically or in order by the time of most "
 "recent login activity, oldest first. To change the listing order check the "
@@ -1867,393 +2504,536 @@ msgid ""
 "\"hidden\" or \"visible\"."
 msgstr "Les cours sont listés soit par ordre alphabétique ou en fonction du dernier moment de connexion enregistré, celui ayant le plus ancien en premier. Pour modifier l'ordre de la liste vous devez déterminer le mode désiré et appuyé sur \"raffraîchir la list\". Le format de list est: Cours_Nom (état :: date/heure de la connexion la plus récente) où l'état est \"caché\" ou \"visible\"."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:7
+msgid ""
+"Courses are listed either alphabetically or in order by the time of most "
+"recent login activity, oldest first. To change the listing order check the "
+"mode you want and click \"Refresh Listing\". The listing format is: "
+"Course_Name (status :: date/time of most recent login) where status is "
+"\"hidden\" or \"visible\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:163
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:84
 msgid "Create"
 msgstr "Créer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:41
 msgid "Create CSV"
 msgstr "Créer CSV"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3054
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:31
 msgid "Create Location:"
 msgstr "Créer l'emplacement:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1071
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:39
+msgid ""
+"Create a .tar.gz archive which includes the course's database and all course"
+" files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:33
 msgid "Create a New Set in This Course:"
 msgstr "Créer un nouveau devoir vide :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:795
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:4
 msgid "Create a new achievement with ID"
 msgstr "Créer un nouvel achèvement avec l'ID"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:33
+msgid "Create a new course on this server."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:20
+msgid ""
+"Create a new course.  The \"Course ID\" is used as the course name and is "
+"used in course links.  Underscores appear as spaces when displaying the "
+"course name.  The \"Course Title\" is used as the title on the course home "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:86
+msgid ""
+"Create a new set with a given name. This can either create an empty set or a"
+" duplicate of an existing set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:12
 msgid "Create as what type of achievement?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:12
 msgid "Create as what type of set?"
 msgstr "Créer quel type de devoir? "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1866
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:20
+msgid "Create backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:81
 msgid "Create unattached problem"
 msgstr "Créer un problème relié à aucun devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1849
-msgid ""
-"Creates a gzipped tar archive (.tar.gz) of a course in the WeBWorK courses "
-"directory. Before archiving, the course database is dumped into a "
-"subdirectory of the course's DATA directory. Currently the archive facility "
-"is only available for mysql databases. It depends on the mysqldump "
-"application."
-msgstr "Créer une archive gzipped tar (.tar.gz) d'un cours dans le répertoire des cours de WeBWorK. Avant d'archiver, la base de données du cours est envoyée dans un sous-répertoire du répertoire DATA du cours. L'installation des archives n'est disponible que pour les bases de données mysql. Cela dépend de l'application mysqldump."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:121
+msgid "Create/Delete achievements"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:726
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:26
 msgid "Cupcake of Enlargement"
 msgstr "La petite augmentation"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:728
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:38
 msgid "Current"
 msgstr "Actuel"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3042
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:2
 msgid "Currently defined locations are listed below."
 msgstr "Les emplacements définies sont listées ici-bas."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4352
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2365
 msgid "Database tables are ok"
 msgstr "Les tableaux de la base de données sont correct"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:54
 msgid "Database tables need updating."
 msgstr "Les tableaux de la base de données nécessitent une mise à jour."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2753
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:52
 msgid "Database tables ok"
 msgstr "Les tableaux de la base de données sont correct"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2968
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1499
 msgid "Database:"
 msgstr "Base de données :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:783
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:153
 msgid "Date"
 msgstr "Date"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:727
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:355
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:96
+msgid "Dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:40
+msgid ""
+"Dates for problem sets can be edited by clicking the pencil icon in the "
+"\"Edit Set Data\" column next to the set name. To change dates for several "
+"sets at once, click the check box in the \"Select\" column and choose \"Edit"
+" selected\" from the tasks above."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:426
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:37
 msgid "Default"
 msgstr "Défaut"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1675
+#: /opt/webwork/webwork2/conf/defaults.config:1577
 msgid ""
 "Default Amount of Time (in minutes) after Due Date that Answers are Open"
 msgstr "Période de temps par défaut (en minutes) après la date d'échéance avant d'avoir accès aux réponses"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1665
+#: /opt/webwork/webwork2/conf/defaults.config:1567
 msgid ""
 "Default Amount of Time (in minutes) before Due Date that the Assignment is "
 "Open"
 msgstr "Période de temps par défaut (en minutes), avant la date d'échéance, durant laquelle un devoir ou un test sont disponibles pour les étudiants"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1785
+#: /opt/webwork/webwork2/conf/defaults.config:1687
 msgid "Default Length of Reduced Scoring Period in minutes"
 msgstr "Durée par défaut (en minutes) de la période de grâce d'évaluation"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1655
+#: /opt/webwork/webwork2/conf/defaults.config:1557
 msgid "Default Time that the Assignment is Due"
 msgstr "Heure d'échéance par défaut d'un devoir ou d'un test"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1808
+#: /opt/webwork/webwork2/conf/defaults.config:1710
 msgid ""
 "Default number of attempts before Show Me Another can be used (-1 => Never)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1755
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:162
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:91
+#: /opt/webwork/webwork2/conf/defaults.config:1994
+msgid ""
+"Default number of attempts before hints are shown in a problem (-1 => hide "
+"hints)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:89
 msgid "Delete"
 msgstr "Supprimer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1556
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1651
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1689
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1728
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:49
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:36
 msgid "Delete Course"
 msgstr "Supprimer un cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3480
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:17
+msgid "Delete Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:23
+msgid "Delete Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:37
+msgid "Delete a course and all associated data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:109
+msgid "Delete a student from a course"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:52
 msgid "Delete all existing addresses"
 msgstr "Supprimer toutes les adresses existantes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1989
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:65
+msgid "Delete backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:64
+msgid "Delete backup from %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:54
 msgid "Delete course after archiving. Caution there is no undo!"
 msgstr "Supprimer le cours après l'avoir archivé. Aucun retour en arrière n'est possible!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:49
 msgid "Delete course:"
 msgstr "Supprimer un cours :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2348
 msgid "Delete field when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2809
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:588
 msgid "Delete it?"
 msgstr "Supprimer?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3055
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:78
 msgid "Delete location:"
 msgstr "Supprimer l'emplacement:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:28
+msgid "Delete oldest backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2321
 msgid "Delete table when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:729
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:90
+msgid "Delete the sets checked below. Be careful, this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:6
 msgid "Delete which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1045
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:6
 msgid "Delete which sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1041
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:6
 msgid "Delete which users?"
 msgstr "Quels utilisateurs voulez-vous supprimer?"
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:394
 msgid "Deleted %1 users."
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:358
 msgid "Deleted %quant(%1,achievement)"
 msgstr "Supprimer %quant(%1,accomplissement)"
 
 #. (join(', ', @delLocations)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3359
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1810
 msgid "Deleted Location(s): %1"
 msgstr "Supprimer l'emplacement(s): %1"
 
 #. (join(', ', @toDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3597
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1966
 msgid "Deleted addresses %1 from location."
 msgstr "Supprimer les adresses %1 de l'emplacement."
 
-#. ($self->shortPath($self->{tempFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1158
-msgid "Deleting temp file at %1"
-msgstr "Suppression du fichier temporaire %1"
+#. ($formatBackupTime)
+#. ($c->formatDateTime($delTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1243
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:569
+msgid "Deleted backup from %1."
+msgstr ""
+
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:679
+msgid "Deleted temp file at %1"
+msgstr ""
+
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1219
+msgid "Deleted temporary file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:125
+msgid "Deleting Problems"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3152
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:68
 msgid ""
 "Deletion deletes all location data and related addresses, and is not "
 "undoable!"
 msgstr "La suppression supprime toutes les informations d'emplacement et les adresses associées et est irréversible!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:723
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:3
 msgid "Deletion destroys all achievement-related data and is not undoable!"
 msgstr "La suppression détruit toutes les informations d'accomplissements et est irréversible!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:185
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
 msgid "Deny From"
 msgstr "Refusé à"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1467
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:27
 msgid "Description"
 msgstr "Description"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:256
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:71
+msgid "Description:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:69
 msgid "Deselect All Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:229
 msgid "Deselect All Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:428
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:366
 msgid "Didn't recognize action"
 msgstr "Impossible de reconnaître l'action à effectuer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:27
 msgid "Directory"
 msgstr "Répertoire"
 
 #. ($file, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:793
-msgid "Directory '%1' not removed: %2"
-msgstr "Le dossier '%1' n'a pas été supprimé : %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:327
+msgid "Directory \"%1\" not removed: %2"
+msgstr ""
 
 #. ($file, $removed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:792
-msgid "Directory '%1' removed (items deleted: %2)"
-msgstr "Le dossier '%1' a été supprimé (éléments supprimés : %2)"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:325
+msgid "Directory \"%1\" removed (items deleted: %2)"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:412
-msgid "Directory permission errors "
-msgstr "Erreurs de permission du répertoire"
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:33
+msgid "Directory permission errors"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2861
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2994
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1439
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1575
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:44
 msgid ""
 "Directory structure is missing directories or the webserver lacks sufficient"
 " privileges."
 msgstr "Des répertoires sont manquant de la structure du répertoire ou le serveur web ne possède pas les privilèges suffisants."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1267
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2210
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2857
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1434
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1570
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:41
 msgid "Directory structure is ok"
 msgstr "La structure du répertoire est correct"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2285
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:102
 msgid "Directory structure needs to be repaired manually before archiving."
 msgstr "La structure du répertoire doit être réparée manuellement avant d'archiver."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1338
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:84
 msgid "Directory structure needs to be repaired manually before renaming."
 msgstr "La structure du répertoire doit être réparée manuellement avant d'être renommer."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2750
-msgid "Directory structure or permissions need to be repaired. "
-msgstr "La structure du répertoire ou les permissions doivent être réparées."
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:48
+msgid "Directory structure or permissions need to be repaired."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2853
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1414
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1540
 msgid "Directory structure:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2536
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:365
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:92
+msgid "Display Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:90
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:104
 msgid "Display Mode:"
 msgstr "Mode d'affichage :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:463
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:37
 msgid "Display Past Answers"
 msgstr "Voir les réponses précédentes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
-msgid "Display of scores for this set is not allowed."
-msgstr "L'affichage des résultats pour ce devoir n'est pas permis."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:44
+msgid "Display mode for equations"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:311
+msgid "Display of scores for this test is not allowed."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:589
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:12
 msgid "Display options: Show"
 msgstr "Options d'affichage : Voir"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2017
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:48
+msgid ""
+"Display sets matching a selected criteria. Useful if there are many sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1918
 msgid "Display the evaluated student answer"
 msgstr "Afficher la réponse évaluée de l'étudiant"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:176
+#. ('<code>COURSENAME_totals.csv</code>',
+#. '<code>COURSENAME_totals_bak1.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:74
+msgid ""
+"Do NOT use the file name %1, since you might accidentally overwrite that if "
+"you again export your WeBWorK homework scores. (Actually the earlier file is"
+" moved to %2 -- so you can recover using the File Manager.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:57
 msgid "Do not unassign students unless you know what you are doing."
 msgstr "Ne pas retirer des étudiants d'un devoir à moins de bien s'y connaître."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:233
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:67
 msgid "Do not uncheck a set unless you know what you are doing."
 msgstr "Ne pas désélectionner de devoirs à moins de bien s'y connaître."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:20
 msgid "Do not uncheck students, unless you know what you are doing."
 msgstr "Ne pas désélectionner d'étudiants à moins de bien s'y connaître."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2450
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:656
 msgid "Do you want to grade this test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2272
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:93
+msgid "Documentation from source code for PG modules and macro files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:95
 msgid "Don't Archive"
 msgstr "Ne pas archiver"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2607
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:13
 msgid "Don't Unarchive"
 msgstr "Ne pas désarchiver"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2912
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:46
 msgid "Don't Upgrade"
 msgstr "Ne pas mettre à jour"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1749
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:15
 msgid "Don't delete"
 msgstr "Ne pas supprimer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1120
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:24
 msgid "Don't make changes"
 msgstr "Ne faire aucune modification"
 
 #. ($saveMode)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:317
 msgid "Don't recognize saveMode: |%1|. Unknown error."
 msgstr "saveMode non reconnu: |%1|. Erreur inconnue."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1307
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1321
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1335
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:87
 msgid "Don't rename"
 msgstr "Ne pas renommer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:547
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:33
 msgid "Don't use in an achievement"
 msgstr "Ne pas utiliser dans un accomplissement"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:683
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1345
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2465
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1595
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:766
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:57
 msgid "Done"
 msgstr "Terminer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:159
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:365
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:8
 msgid "Download"
 msgstr "Télécharger"
 
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($set->set_id)
 #. ($ver->{id} =~ s/_/ /gr)
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($set->set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:731
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:732
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:413
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:204
 msgid "Download %1"
 msgstr "Télécharger %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:23
 msgid "Download Hardcopy"
 msgstr "Télécharger une copie imprimable"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:865
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:56
 msgid "Download PDF or TeX Hardcopy for Current Set"
 msgstr "Télécharger une copie PDF ou TeX pour ce devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:764
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:233
 msgid "Download PDF or TeX Hardcopy for Selected Tests"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($selected_set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:595
+#. (tag('span', dir => 'ltr', format_set_name_display($selected_set_id =~
+#. s/,v(\d+)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:58
 msgid "Download hardcopy of set %1 for %2?"
 msgstr "Télécharger une copie imprimable du devoir %1 pour %2?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:369
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:63
+msgid "Download/upload archived courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:46
 msgid "Download:"
 msgstr "Télécharger :"
 
@@ -2261,314 +3041,401 @@ msgstr "Télécharger :"
 msgid "Drop"
 msgstr "Abandon"
 
-#. ($self->formatDateTime($set->reduced_scoring_date, undef,
-#. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:107
-msgid "Due %1, after which reduced scoring is available until %2"
-msgstr "À remettre le %1, après quoi le pointage réduit est disponible jusqu'au %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:100
+msgid "Drop student from the course"
+msgstr ""
 
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:310
 msgid "Due date %1 has passed."
 msgstr "Date de remise %1 dépassée"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2093
+#: /opt/webwork/webwork2/conf/defaults.config:2014
 msgid "E-Mail"
 msgstr "Courriel"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:315
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:261
 msgid "E-mail Instructor"
 msgstr "Envoyer un courriel au professeur"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2128
-msgid "E-mail addresses which can receive e-mail from a pg problem"
-msgstr "Adresses de courriel pouvant recevoir des courriels envoyés à partir de la page d'un problème"
-
-#: /opt/webwork/webwork2/conf/defaults.config:2138
+#: /opt/webwork/webwork2/conf/defaults.config:2049
 msgid ""
 "E-mail feedback from students automatically sent to this permission level "
 "and higher"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2109
+#: /opt/webwork/webwork2/conf/defaults.config:2030
 msgid "E-mail verbosity level"
 msgstr "Niveau de verbosité des courriels"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:357
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:43
 msgid "E-mail:"
 msgstr "Courriel :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:35
 msgid "Earned"
 msgstr "Gagné"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:71
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:158
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:334
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:417
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:547
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2743
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1628
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1186
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1203
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:257
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:479
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:6
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:53
 msgid "Edit"
 msgstr "Modifier"
 
-#. (CGI::a({ href => $basicInfoUrl }, $r->maketext('class list data')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:199
-msgid "Edit %1 for  %2 (%3) who has been assigned %4 sets."
+#. (link_to(maketext('class list data')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:47
+msgid "Edit %1 for %2 (%3) who has been assigned %4 sets."
 msgstr ""
 
-#. (CGI::a({ href => $editUsersAssignedToSetURL }, $r->maketext('individual
-#. versions')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2223
-msgid "Edit %1 of set %2."
-msgstr "Modifier des %1 du devoir %2."
+#. (link_to(maketext('individual user settings')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:162
+msgid "Edit %1 for set %2."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:6
 msgid "Edit Assigned Users"
 msgstr "Modifier les utilisateurs désignés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:40
 msgid "Edit Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1488
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:58
 msgid "Edit Evaluator"
 msgstr "Modifier l'évaluateur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:253
 msgid "Edit Header"
 msgstr "Modifier l'entête"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3053
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:18
 msgid "Edit Location:"
 msgstr "Modifier l'emplacement:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2741
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:111
 msgid "Edit Problem"
 msgstr "Modifier le problème"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:5
 msgid "Edit Problems"
 msgstr "Modifier les problèmes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:583
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:3
 msgid "Edit Set"
 msgstr "Modifier le devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:421
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:4
 msgid "Edit Set Data"
 msgstr "Modifier les données du devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:171
+msgid "Edit Tags"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:30
 msgid "Edit Target Set"
 msgstr "Modifier ce devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1487
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:18
 msgid "Edit Users"
 msgstr ""
 
-#. ($user)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:207
-msgid "Edit data for %1"
-msgstr "Modifier les données pour %1"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:127
+msgid "Edit achievement evaluator"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1248
-msgid "Edit it"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:90
+msgid "Edit achievement information"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2192
-msgid "Edit set %1 data for ALL students assigned to this set."
-msgstr "Modifier le devoir %1 pour TOUS les étudiants désignés pour ce devoir."
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:65
+msgid ""
+"Edit achivements for the course. This link is only present if achievements "
+"are enabled for the course."
+msgstr ""
 
-#. (CGI::a({href=>$editSetLink},$setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2166
-msgid "Edit set %1 for this user."
-msgstr "Modifier le devoir %1 pour cet utilisateur."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:42
+msgid "Edit class list data"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3393
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:39
 msgid ""
-"Edit the current value of the location description, if desired, then add and"
+"Edit class roster data. Add students, edit student data, drop students from "
+"class, import students from a classlist, and give user professor privileges."
+" Access to individual homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:70
+msgid "Edit data for %1"
+msgstr "Modifier les données pour %1"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:46
+msgid ""
+"Edit homework sets for entire class. Change homework set due dates, create "
+"new sets from a set definition file, create new homework sets, make sets "
+"visible/invisible, score homework sets. Assign homework sets to the class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:219
+msgid "Edit it"
+msgstr ""
+
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:135
+msgid "Edit set %1 for ALL students assigned to this set."
+msgstr ""
+
+#. (link_to(                                               $setID =>
+#. $c->systemLink(
+#. $setDetailPage, params => { effectiveUser => $user->user_id, editForUser =>
+#. $user->user_id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:106
+msgid "Edit set %1 for this user."
+msgstr "Modifier le devoir %1 pour cet utilisateur."
+
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:95
+msgid "Edit set for %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:4
+msgid ""
+"Edit the current value of the location description, if desired, then add and"
 " select addresses to delete, and then click the \"Take Action\" button to "
 "make all of your changes.  Or, click \"Manage Locations\" above to make no "
 "changes and return to the Manage Locations page."
 msgstr "Modifier les informations de description de l'emplacement, si désiré, ensuite ajouter et sélectionner les adresses à supprimer et appuyer sur le bouton \"Exécuter\" pour confirmer les modifications. Appuyer sur \"Gérer les emplacements\" au-dessus pour ne faire aucune modification et revenir à la page de gestion des emplacements."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:429
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:2
 msgid "Edit which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:829
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:2
 msgid "Edit which sets?"
 msgstr "Modifier quels devoirs? "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:935
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:2
 msgid "Edit which users?"
 msgstr "Quels utilisateurs voulez-vous éditer?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:592
-msgid "Editing <strong>blank problem</strong> in file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:31
+msgid "Editing <strong>course information</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:595
-msgid "Editing <strong>course information</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:30
+msgid "Editing <strong>hardcopy header</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
-msgid "Editing <strong>hardcopy header</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:28
+msgid "Editing <strong>new problem</strong> template."
+msgstr ""
+
+#. ($c->{prettyProblemNumber},                             tag('span', dir =>
+#. 'ltr', format_set_name_display($fullSetName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:45
+msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:29
+msgid "Editing <strong>set header</strong> file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:33
+msgid "Editing <strong>unassigned problem</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:596
-msgid "Editing <strong>options information</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:32
+msgid "Editing <strong>unknown file type</strong> in file \"%1\"."
 msgstr ""
 
-#. ($prettyProblemNumber,                  CGI::span({ dir => 'ltr' },
-#. format_set_name_display($fullSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:605
-msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:19
+msgid "Editing Modes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:593
-msgid "Editing <strong>set header</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:140
+msgid "Editing Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:598
-msgid "Editing <strong>unassigned problem</strong> file \"%1\""
+#. ($c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:16
+msgid "Editing achievement in file \"%1\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:597
-msgid "Editing <strong>unknown file type</strong> in file \"%1\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:22
+msgid "Editing for all students"
 msgstr ""
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:209
-msgid "Editing achievement in file '%1'"
-msgstr "Modification de l'accomplissement dans le fichier '%1'"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:23
+msgid "Editing for one student or a proper subset of all students"
+msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3390
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:1
 msgid "Editing location %1"
 msgstr "Modification de l'emplacement %1"
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display("$setID$vermsg")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2182
-msgid "Editing problem set %1 data for these individual students: %2"
-msgstr "Modification des données du devoir %1 pour l'étudiant ou les étudiants suivants&#8239;: %2"
+#. (tag(                                           'strong',
+#. dir => 'ltr',
+#. format_set_name_display($setID . ($editingSetVersion ?
+#. ",v$editingSetVersion" : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:123
+msgid "Editing problem set %1 for these students: %2"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:315
 msgid "Editor"
 msgstr "Éditeur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:669
-msgid "Editor rows:"
-msgstr "Lignes dans l'éditeur :"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1668
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:229
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:53
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:68
 msgid "Email"
 msgstr "Courriel"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:32
 msgid "Email Address"
 msgstr "Adresse de courriel"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:817
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:170
 msgid "Email Body:"
 msgstr "Corps du message :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:17
+msgid "Email Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:339
 msgid "Email Instructor On Failed Attempt"
 msgstr "Envoyer un courriel au professeur après une tentative non réussie"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2003
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:28
 msgid "Email Link"
 msgstr "Courriel"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:789
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:112
 msgid "Email address"
 msgstr "Adresse de courriel"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1807
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1832
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:311
+msgid "Email body is empty. No message sent. "
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:994
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_email.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_form.html.ep:24
 msgid "Email instructor"
 msgstr "Envoyer un courriel au professeur"
 
-#. (scalar(@{ $self->{ra_send_to} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:454
+#. (scalar(@{ $c->{ra_send_to} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:27
+msgid ""
+"Email is being sent to %quant(%1,recipient). You will be notified by email "
+"when the task is completed.  This may take several minutes if the class is "
+"large."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:13
+msgid "Email:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:26
 msgid ""
-"Email is being sent to %quant(%1,recipient). You will be notified by email\n"
-"\t\t\t\twhen the task is completed.  This may take several minutes if the class is\n"
-"\t\t\t\tlarge."
+"Emails can contain personalized data, such as name, section, or status.  "
+"Click \"List of insertable macros\" for a full list available variables.  "
+"Additional personal data can be included by using a merge file.  A merge "
+"file is a CSV file located in the [Scoring] directory in which the first "
+"column is the student id, followed by additional data (such as student "
+"grades).  This data is identified by which column it is in, for instance if "
+"the scores where in the 4th column of the merge file, insert them into an "
+"email using the variable $COL[4].  The \"Scoring Tools\" page can export "
+"grades into a CSV that can be used as a merge file.  Upload customized merge"
+" files with the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:11
 msgid "Emails to be sent to the following:"
 msgstr "Les courriels seront envoyés aux destinataires suivants :"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1704
+#: /opt/webwork/webwork2/conf/defaults.config:1606
 msgid "Enable Achievement Rewards"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1723
+#: /opt/webwork/webwork2/conf/defaults.config:1625
 msgid "Enable Conditional Release"
 msgstr "Activer les restrictions d'accès"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1689
+#: /opt/webwork/webwork2/conf/defaults.config:1591
 msgid "Enable Course Achievements"
 msgstr "Activer les accomplissements dans ce cours"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1645
+#: /opt/webwork/webwork2/conf/defaults.config:1547
 msgid "Enable Progress Bar and current problem highlighting"
 msgstr "Autoriser l'affichage de la barre de progression et le surlignage du problème en cours"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1734
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:585
+#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Enable Reduced Scoring"
 msgstr "Activer la période de grâce d'évaluation"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1799
+#: /opt/webwork/webwork2/conf/defaults.config:1701
 msgid "Enable Show Me Another button"
 msgstr "Activer le bouton <b>Montrer un autre problème</b>"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:156
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:24
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:92
 msgid "Enable Spell Checking"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1844
+#: /opt/webwork/webwork2/conf/defaults.config:1746
 msgid "Enable periodic re-randomization of problems"
 msgstr "Activer la randomisation périodique des problèmes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:416
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:29
 msgid ""
 "Enable reduced scoring for a homework set.  This will allow you to submit "
 "answers for partial credit for 24 hours after the close date."
 msgstr "Activer le pointage réduit pour le devoir. Cela permettra de soumettre des réponses pour une partie des points durant une période de 24 heures après la date de fermeture."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1461
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1483
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:20
 msgid "Enabled"
 msgstr "Activé"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1846
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:58
+msgid "Enabled:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1748
 msgid ""
 "Enables periodic re-randomization of problems after a given number of "
 "attempts. Student would have to click Request New Version to obtain new "
 "version of the problem and to continue working on the problem"
 msgstr "Activer cette fonction génère aléatoirement une nouvelle version du problème après un certain nombre de tentatives non réussies. L'étudiant devra cliquer sur le bouton <b>Obtenir une nouvelle version</b> afin de l'obtenir et de pouvoir continuer son travail sur le problème."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1725
+#: /opt/webwork/webwork2/conf/defaults.config:1627
 msgid ""
 "Enables the use of the conditional release system.  To use conditional "
 "release you need to specify a list of set names on the Problem Set Detail "
@@ -2577,14 +3444,14 @@ msgid ""
 " sets."
 msgstr "Permet d'ajouter une restriction d'accès sur un devoir. Pour ajouter une restriction, vous devez spécifier sur la page des <b>Données du devoir</b> le ou les noms des devoirs que les étudiants devront avoir faits, ainsi que la note minimale qu'ils devront obtenir dans tous les devoirs spécifiés avant de pouvoir accéder au devoir."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1801
+#: /opt/webwork/webwork2/conf/defaults.config:1703
 msgid ""
 "Enables use of the Show Me Another button, which offers the student a newly-"
 "seeded version of the current problem, complete with solution (if it exists "
 "for that problem)."
 msgstr "Active l'utilisation du bouton <b>Montrer un autre problème</b>, qui permet aux étudiants de voir et d'essayer une nouvelle version de leur problème actuel ainsi que de voir la solution, si elle existe pour ce problème."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:662
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:163
 msgid "End"
 msgstr ""
 
@@ -2592,538 +3459,662 @@ msgstr ""
 msgid "Enrolled"
 msgstr "Inscrit"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:788
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:111
 msgid "Enrolled, Drop, etc."
 msgstr "Inscrit, Abandon, etc."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:830
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:859
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:888
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:917
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:128
 msgid "Enrollment Status"
 msgstr "Statut d'inscription"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:21
 msgid "Enter filename below"
 msgstr "Entrer le nom ci-dessous"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:20
 msgid "Enter filenames below"
 msgstr "Entrer la liste des noms ci-dessous"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:19
 msgid ""
 "Enter information below for students you wish to add. Each student's "
 "password will initially be set to their student ID."
 msgstr "Entrer les informations pour chaque utilisateur que vous souhaitez ajouter. Tous les utilisateurs ajoutés auront par défaut un niveau de permission d'étudiant. Il est à noter que l'identifiant étudiant sert de mot de passe à la première connexion."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1997
+#: /opt/webwork/webwork2/conf/defaults.config:1899
 msgid ""
 "Enter one of the allowed display mode types above.  See 'display modes "
 "entry' for descriptions."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:297
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:34
+msgid ""
+"Enter the details of the course instructor to be added when the course is "
+"created.  This user will also be added to the admin course with the username"
+" \"userID_courseID\" so you can manage and email the instructors of the "
+"courses on the server."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:284
 msgid "Entered"
 msgstr "Saisi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:85
-msgid "Entered student:"
-msgstr "Étudiants entrés :"
-
-#. ($display_sort_method_name{$primary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:698
+#. ($display_sort_method_name{$primary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:98
 msgid "Entries are sorted by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:247
 msgid "Equation Display"
 msgstr "Affichage d'équations"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:61
+msgid "Equation Editor"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1516
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1460
 msgid "Error adding set-level proctor: %1"
 msgstr "Une erreur s'est produite en ajoutant le test avec surveillance : %1"
 
+#. ($fromPath, $toPath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:664
+msgid "Error copying %1 to %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:14
+msgid "Error details"
+msgstr ""
+
+#. ($filePath, stash('podError')
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:27
+msgid "Error generating POD for file %1: %2"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1492
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1437
 msgid ""
 "Error getting old set-proctor password from the database: %1.  No update to "
 "the password was done."
 msgstr "Une erreur s'est produite en voulant obtenir, dans la base de données, l'ancien mot de passe fourni pour le test passerelle avec surveillance : %1. Aucune mise à jour du mot de passe n'a été effectuée."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:31
 msgid "Error message:"
 msgstr "Message d'erreur :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2235
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:12
 msgid "Error messages"
 msgstr "Messages d'erreur"
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1616
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:754
 msgid "Error: Answer date must come after close date in set %1"
 msgstr "Erreur : la date de disponibilité des réponses doit suivre la date d'échéance du devoir %1"
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:747
 msgid "Error: Close date must come after open date in set %1"
 msgstr "\tErreur : la date d'échéance doit suivre la date  d'ouverture du devoir %1"
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1634
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:778
 msgid ""
 "Error: Reduced scoring date must come between the open date and close date "
 "in set %1"
 msgstr "Erreur : la date de début de la période de grâce doit suivre la date d'ouverture, mais précéder la date d'échéance du devoir %1"
 
-#. ($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2067
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:7
 msgid "Error: The original file %1 cannot be read."
 msgstr "Erreur : le fichier original %1 ne peut pas être lu"
 
 #. ($setID)
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1240
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:738
 msgid "Error: answer date cannot be more than 10 years from now in set %1"
 msgstr "Erreur : la date de disponibilité des réponses ne peut pas dépasser 10 ans après la date d'aujourd'hui dans le devoir %1"
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1235
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:733
 msgid "Error: close date cannot be more than 10 years from now in set %1"
 msgstr "Erreur : la date d'échéance ne peut pas dépasser 10 ans après la date d'aujourd'hui dans le devoir %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:630
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:234
 msgid "Error: no file data was submitted!"
 msgstr "Erreur: aucune information du fichier n'a été soumise"
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1599
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:728
 msgid "Error: open date cannot be more than 10 years from now in set %1"
 msgstr "Erreur : la date d'ouverture ne peut pas dépasser 10 ans après la date d'aujourd'hui dans le devoir %1"
 
-#. ($problem_desc, $problem_name, CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1404
+#. ($problem_desc, $problem_name, $c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1210
 msgid ""
 "Errors encountered while processing %1. This %2 has been omitted from the "
 "hardcopy. Error text: %3"
 msgstr "Des erreurs se sont produites pendant le traitement de %1. Le %2 a été ignoré dans la création de la copie imprimable du devoir. Détail de l'erreur : %3"
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3832
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:8
+msgid "Errors occured while generating hardcopy:"
+msgstr ""
+
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2128
 msgid ""
 "Errors occured while hiding the courses listed below when attempting to "
 "create the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
-msgstr "Une erreur s'est produite en cachant le cours dans la liste ci-dessous durant la tentative de création du fichier hide_directory dans le répertoire du cours. Vérifier les permissions du répertoire du cours, ex. %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
+msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3920
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2197
 msgid ""
 "Errors occured while unhiding the courses listed below when attempting "
 "delete the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
-msgstr "Une erreur s'est produite en rendant visible le cours dans la liste ci-dessous durant la tentative de suppression du fichier hide_directory dans le répertoire du cours. Vérifier les permissions du répertoire du cours, ex. %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1468
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:28
 msgid "Evaluator File"
 msgstr "Fichier d'évaluation"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3839
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:76
+msgid "Evaluator File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:28
+msgid "Evaluator Variables"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2143
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
-"hidden."
-msgstr "À l'exception des erreurs possibles listées ci-dessus, tous les cours sélectionnés sont déjà cachés."
+"Except for the errors listed above, all selected courses are already hidden."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3904
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2212
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
+"Except for the errors listed above, all selected courses are already "
 "unhidden."
-msgstr "À l'exception des erreurs possibles listées ci-dessus, tous les cours sélectionnés sont déjà visibles."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3456
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:39
 msgid ""
 "Existing addresses for the location are given in the scrolling list below.  "
 "Select addresses from the list to delete them:"
 msgstr "Les adresses existantes pour l'emplacement sont données dans la liste déroulante ci-dessous. Sélectionner des adresses de la list pour les supprimer:"
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2281
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1460
 msgid "Existing file %1 could not be backed up and was lost."
 msgstr "Le fichier existant %1 n'a pas pu être sauvegardé et a été perdu."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2514
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:354
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:65
 msgid "Expand All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:364
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:78
 msgid "Expand All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2667
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:418
 msgid "Expand Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2792
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:574
 msgid "Expand Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:74
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:89
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:67
+msgid ""
+"Expand problem details that have been collapsed. Note that the details of a "
+"single problem can be expanded by clicking on the down arrow to the right of"
+" the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:71
 msgid "Export"
 msgstr "Exporter"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1098
-msgid "Export selected achievements."
-msgstr "Exporter les accomplissements sélectionnés."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:113
+msgid "Export achievement data"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_export_form.html.ep:1
+msgid "Export selected achievements"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1267
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:17
 msgid "Export to what kind of file?"
 msgstr "Exporter sous quel type de fichier? "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:2
 msgid "Export which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1245
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:5
 msgid "Export which users?"
 msgstr "Exporter quels utilisateurs? "
 
 #. ($FileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1151
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:591
 msgid "Exported achievements to %1"
 msgstr "Exporter les accomplissements vers %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1616
-msgid "Extend the close date for which Gateway?"
-msgstr "Délai supplémentaire pour quel test passerelle?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:48
+msgid "Extend the close date for which test?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:148
+msgid "Extend the number of attempts allowed a student on a given problem."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1573
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:28
 msgid ""
-"Extends the close date of a gateway test by 24 hours. Note: The test must "
-"still be open for this to work."
-msgstr "Délai supplémentaire de 24 heures accordé après l'échéance d'un test passerelle. Note : le test doit être encore disponible pour que ce soit possible."
+"Extends the close date of a test by 24 hours. Note: The test must still be "
+"open for this to work."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "FIRST NAME"
 msgstr "PRÉNOM"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Failed to add user:"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:416
 msgid "Failed to create new achievement: %1"
 msgstr "Impossible de créer un nouvel accomplissement: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:373
 msgid "Failed to create new achievement: no achievement ID specified!"
 msgstr "Impossible de créer un nouvel accomplissement: aucune ID d'accomplissement spécifiée!"
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:573
 msgid "Failed to create new set: %1"
 msgstr "Impossible de créer le nouveau devoir&#8239;: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1158
-msgid "Failed to create new set: no set name specified!"
-msgstr "Impossible de créer le nouveau devoir&#8239;: aucun nom n'a été spécifié!"
+#. ($newSetID =~ s/_/ /gr)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:482
+msgid ""
+"Failed to create new set: Invalid characters in set name \"%1\". A set name "
+"may only contain letters, numbers, hyphens, periods, and spaces."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:474
+msgid "Failed to create new set: No set name specified."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1155
-msgid "Failed to create new set: set name cannot exceed 100 characters."
-msgstr "Impossible de créer le nouveau devoir: le nom de celui-ci ne peut excéder 100 caractères."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:469
+msgid "Failed to create new set: Set name cannot exceed 100 characters."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:396
 msgid ""
 "Failed to duplicate achievement: no achievement selected for duplication!"
 msgstr "Impossible de dupliquer l'accomplissement: aucun accomplissement sélectionné pour une duplication!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:530
 msgid "Failed to duplicate set: no set selected for duplication!"
 msgstr "Impossible de créer une copie du devoir&#8239;: aucun devoir n'a été sélectionné pour la copie!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:74
-msgid "Failed to enter student:"
-msgstr "Impossible d'entrer l'étudiant :"
+#. ($@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:67
+msgid "Failed to generate course archive: %1"
+msgstr ""
 
 #. ($scoreFilePath)
 #. ($filePath)
 #. ($FilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1125
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:649
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:955
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2402
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1584
 msgid "Failed to open %1"
 msgstr "Impossible d'ouvrir %1"
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:227
 msgid "Failed to save: %1"
 msgstr "Impossible d'enregistrer : %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#. ($_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:253
+msgid "Failed to send message: %1"
+msgstr ""
+
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:23
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:36
 msgid "False"
 msgstr "Faux"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1919
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:63
 msgid "Feature exhausted for this problem"
 msgstr "Aucune autre fonctionnalité disponible pour ce problème"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:200
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:23
+msgid "Features:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:252
 msgid "Feedback"
 msgstr "Message courriel"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2159
+#: /opt/webwork/webwork2/conf/defaults.config:2070
 msgid "Feedback by Section."
 msgstr "Message courriel par groupe"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:234
 msgid "FeedbackMessage"
 msgstr "Message courriel"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1177
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2113
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2284
 msgid "Field is ok"
 msgstr "Le champ est correct"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2109
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2286
 msgid "Field missing in database"
 msgstr "Champ manquant dans la base de données"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1175
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2111
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4290
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
 msgid "Field missing in schema"
 msgstr "Champ manquant dans le schéma"
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:599
-msgid "File '%1' exists.  File not saved.  No changes have been made."
-msgstr "Le fichier '%1' existe déjà. Le fichier n'a pas été enregistré. Aucun changement n'a été effectué."
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:266
+msgid "File \"%1\" exists.  File not saved.  No changes have been made."
+msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1926
-msgid ""
-"File '%1' exists. File not saved. No changes have been made.  You can change"
-" the file path for this problem manually from the 'Hmwk Sets Editor' page"
-msgstr "Le fichier '%1' existe déjà. Le fichier n'a pas été enregistré. Aucun changement n'a été effectué. Il est possible de modifier manuellement le chemin de ce fichier au moyen de l'<b>Éditeur de devoirs</b>."
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1036
+msgid "File \"%1\" exists. File not saved. No changes have been made."
+msgstr ""
 
-#. ($file,$!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:796
-msgid "File '%1' not removed: %2"
-msgstr "Le fichier '%1' n'a pas été supprimé : %2"
+#. ($file, $!)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:333
+msgid "File \"%1\" not removed: %2"
+msgstr ""
 
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:795
-msgid "File '%1' successfully removed"
-msgstr "Le fichier '%1' a été supprimé avec succès"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+msgid "File \"%1\" successfully removed"
+msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1066
-msgid "File '%1' uploaded successfully"
-msgstr "Le fichier '%1' s'est téléversé avec succès"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:522
+msgid "File \"%1\" uploaded successfully"
+msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:476
 msgid "File <b>%1</b> already exists. Overwrite it, or rename it as:"
 msgstr "Le fichier <b>%1</b> existe déjà. Écraser ou renommer en&#8239;:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:364
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:55
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:70
 msgid "File Manager"
 msgstr "Gestionnaire de fichiers"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:628
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:17
+msgid "File Manager Help"
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:541
+msgid "File not saved. Failed to open \"%1\" for writing."
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:528
+msgid ""
+"File not saved. The file \"%1\" is not contained in the templates directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:921
+msgid ""
+"File not saved. The file name for this problem does not match the file name "
+"the editor was opened with. The problem set may have changed. Please reopen "
+"this file from the homework sets editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:228
 msgid "File saved"
 msgstr "Le fichier a été enregistré."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:733
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:272
 msgid "File successfully copied"
 msgstr "Le fichier a été copié avec succès"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:758
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:295
 msgid "File successfully renamed"
 msgstr "Le fichier a été renommé avec succès"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:29
 msgid "Filename"
 msgstr "Nom de fichier "
 
-#. ($extension,$location)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1296
-msgid "Files with extension '.%1' usually belong in '%2'"
-msgstr "Les fichiers avec l'extension <b>.%1</b> sont situés habituellement dans le répertoire <b>%2</b>."
+#. ($extension, $location)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:699
+msgid "Files with extension \".%1\" usually belong in \"%2\""
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:20
+msgid ""
+"Fill out the form below to add, edit, or delete locations.  Locations are "
+"used to restrict access to sets based on ip address.  Locations are "
+"configured here in the administration course, then used in a normal course."
+"  When configuring a set to use a restricted ip address, the instructor can "
+"choose to either restrict access to the location or deny access from a "
+"location, which are identified by their name.  Instructors can select "
+"multiple locations to restrict access to."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:78
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:47
 msgid "Filter"
 msgstr "Filtre"
 
 #. ($recitation)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1184
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1112
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1420
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:913
 msgid "Filter by recitation %1"
 msgstr ""
 
 #. ($section)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1180
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1416
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:910
 msgid "Filter by section %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:733
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:31
 msgid "Filter by what text?"
 msgstr "Filtrer les utilisateurs contenant "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:151
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:17
 msgid "Filter:"
 msgstr "Filtrer :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:749
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:137
 msgid "First"
 msgstr "Prénom"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:593
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1992
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:827
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:856
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:885
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:914
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:87
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:21
 msgid "First Name"
 msgstr "Prénom"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:107
 msgid "First name"
 msgstr "Prénom"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:178
 msgid ""
 "For security reasons, you cannot specify a message file from a directory "
 "higher than the email directory (you can't use ../blah/blah for example). "
 "Please specify a different file or move the needed file to the email "
-"directory"
-msgstr "Pour des raisons de sécurité, vous ne pouvez pas choisir un fichier message qui est situé dans un répertoire de niveau supérieur au répertoire courriel. Veuillez choisir un fichier différent ou déplacer votre fichier dans le répertoire courriel."
+"directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:30
+msgid "Force editor to RTL"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2928
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:674
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:101
 msgid "Force problems to be numbered consecutively from one"
 msgstr "Numéroter les problèmes de manière consécutive en débutant par 1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:409
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:35
+msgid "Form Elements Present on the Page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:75
 msgid "Format"
 msgstr "Format"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2096
+#: /opt/webwork/webwork2/conf/defaults.config:2017
 msgid "Format for the subject line in feedback e-mails"
 msgstr "Format de la ligne Sujet dans les messages envoyés par les étudiants"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:172
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:133
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:10
 msgid "Format:"
 msgstr "Format :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:12
 msgid "Found no directories containing problems"
 msgstr "Aucun répertoire trouvé contenant des problèmes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1112
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:43
 msgid "From This Course"
 msgstr "Devoirs dans ce cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:318
 msgid "From field must contain one valid email address."
 msgstr "Le champ <em>De</em> doit inclure une adresse courriel valide. "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:340
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:621
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:20
+msgid ""
+"From this page you can <strong>add new students</strong>, "
+"<strong>edit</strong> class list data (name, email address, recitation, "
+"section, permission level, and enrollment status), <strong>change "
+"passwords</strong>, and <strong>export</strong> (save) class lists for back-"
+"up or use in another course. You can also delete students from the class "
+"roster, but this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:34
 msgid "From:"
 msgstr "De :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:59
 msgid "GLOBAL Usage"
 msgstr "Usage GLOBAL"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1512
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1619
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1728
-msgid "Gateway Name"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:210
-msgid "Gateway Quiz %2"
-msgstr "Test passerelle %2"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:853
-msgid "Gateway parameters"
-msgstr "Paramètres du test passerelle"
-
-#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/conf/defaults.config:1427
 msgid "General"
 msgstr "Paramètres généraux"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2305
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:201
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:30
 msgid "General Information"
 msgstr "Informations générales"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:745
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:669
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:670
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:222
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:116
+msgid "General Page Information"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:121
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:166
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:167
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:113
 msgid "Generate Hardcopy"
 msgstr "Générer une copie imprimable"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:262
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:73
 msgid "Generate Hardcopy for Selected Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:744
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:115
+msgid ""
+"Generate a hardcopy of the problem being edited. This does not change the "
+"permanent file on the disk. You can generate a hardcopy for different "
+"versions of the same problem by changing the seed. You can also change the "
+"format to \"PDF\" or \"TeX Source\". If \"PDF\" is selected, then a PDF file"
+" will be generated for download, unless there are errors. If errors occur or"
+" \"TeX Source\" is selected, then a zip file will be generated for download "
+"that contains the TeX source file and resources needed for generating the "
+"PDF file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:20
+msgid ""
+"Generate hardcopies of assignments in PDF or latex format. To produce a "
+"hardcopy, one selects the users on the left and the sets on the right. All "
+"users and sets are listed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:170
 msgid "Generate hardcopy for selected sets and selected users"
 msgstr "Générer une copie imprimable des devoirs sélectionnés et pour les utilisateurs sélectionnés"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:184
-#: /opt/webwork/pg/macros/problemRandomize.pl:185
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:186
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:187
 msgid "Get a new version of this problem"
 msgstr "Obtenir une nouvelle version du problème"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:986
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:2
 msgid "Give new password to which users?"
 msgstr "Donner un nouveau mot de passe à quels utilisateurs? "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1063
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:27
 msgid "Gives full credit on a single homework problem."
 msgstr "Donner l'ensemble des points sur un seul problème du devoir."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1180
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:27
 msgid "Gives full credit on every problem in a set."
 msgstr "Donner l'ensemble des points pour chacun des problèmes du devoir."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:846
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:27
 msgid "Gives half credit on a single homework problem."
 msgstr "Donner la moitié des points pour un seul problème du devoir."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:27
 msgid "Gives half credit on every problem in a set."
 msgstr "Donner la moitié des points pour chacun des problèmes du devoir."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:62
 msgid "Global Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1422
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:76
 msgid "Global Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:49
 msgid "Global Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:51
 msgid ""
 "Global data on problem usage is contributed by many institutions using "
 "WeBWorK all over the world. The Usage figure is the total number of  "
@@ -3133,198 +4124,324 @@ msgid ""
 msgstr ""
 
 #. ($problemID, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1549
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1489
 msgid "Global problem %1 for set %2 not found."
 msgstr "Problème global %1 pour le devoir %2 introuvable."
 
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:334
+#. ($c->{prettyID}, $c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:378
+msgid "Global problem %1 not found for set %2."
+msgstr ""
+
+#. ($c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:142
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:372
 msgid "Global set %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2093
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:77
 msgid "Global set data will be shown instead of user specific data"
 msgstr "Les données du devoir global seront affichées au lieu de celles spécifiques de l'utilisateur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:28
 msgid "Go"
 msgstr "Continuer"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:483
 msgid "Go back to Part 1"
 msgstr "Retour à la partie 1"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:291
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
-#: /opt/webwork/pg/macros/compoundProblem.pl:491
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:293
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:498
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:512
 msgid "Go on to next part"
 msgstr "Aller à la partie suivante"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2651
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:544
 msgid "Grade"
 msgstr "Évaluer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2649
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:383
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:970
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:541
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:75
 msgid "Grade Problem"
 msgstr "Soumettre les réponses"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2446
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:651
 msgid "Grade Test"
 msgstr "Soumettre le test"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:148
+msgid "Grade of Active Students"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:55
 msgid "Grade passback mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:837
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:38
 msgid "Grader"
 msgstr "Évaluateur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:236
 msgid "Grades"
 msgstr "Résultats"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:110
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:17
+msgid "Grades Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:115
 msgid "Grades have been saved for all current users."
 msgstr "Les résultats ont été enregistrés pour tous les utilisateurs actuels."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:221
-msgid "Grading assignment:"
-msgstr "Noter le devoir:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:28
+msgid "Grading Assignment"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:152
+msgid "Grading Problems"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1062
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:26
 msgid "Greater Rod of Revelation"
 msgstr "Grand sceptre de la révélation"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1179
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:26
 msgid "Greater Tome of Enlightenment"
 msgstr "Grand livre de l'éclaircissement"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:285
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:50
+msgid ""
+"Groups types of achievements. The \"level\" and \"secret\" categories are "
+"special (described above), and categories can be used to create achievement "
+"chains."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:74
 msgid "Guest Login"
 msgstr "Accès Invités"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2251
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:86
+msgid "Guest:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:33
 msgid "HTTP Headers"
 msgstr "Entêtes HTTP"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:682
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:35
+msgid "Hardcopy Format"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:115
 msgid "Hardcopy Format:"
 msgstr "Format du document :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:270
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:285
 msgid "Hardcopy Generator"
 msgstr "Création de la copie imprimable d'un devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:101
 msgid "Hardcopy Header"
 msgstr "Entête de la copie imprimable"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1623
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:724
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:324
+msgid "Hardcopy Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:17
+msgid "Hardcopy Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:153
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:44
 msgid "Hardcopy Theme"
 msgstr "Thème du document"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:408
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:427
 msgid "Hardcopy will always print the original version of the problem."
 msgstr "Le document sera toujours imprimer avec la version originale du problème."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:31
 msgid "Headers"
 msgstr "Entêtes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1048
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:296
 msgid "Help"
 msgstr "Aide"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:797
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:170
 msgid "Help Icon"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:542
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:30
+msgid ""
+"Here is a list of the variables the evaluator has access to. Unless "
+"indicated, changes to the variables will not be saved.  Evaluators are run "
+"in the same order they are listed on the achievement editor page and are "
+"only run if the achievement has not been earned. Keep this in mind when "
+"using persistent global data."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:507
 msgid "Here is a new version of your problem."
 msgstr "Voici une nouvelle version de votre problème."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:914
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:42
 msgid "Hidden"
 msgstr "Caché"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:347
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:62
 msgid "Hide All"
 msgstr "Cacher les énoncés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3663
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3718
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3760
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:384
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:17
+msgid "Hide Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:57
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:44
 msgid "Hide Courses"
 msgstr "Cacher les cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:428
-msgid "Hide Hints"
-msgstr "Cacher les indices"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:477
 msgid "Hide Hints from Students"
 msgstr "Cacher les indices aux étudiants"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1566
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:63
+msgid "Hide all rendered problems on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:252
 msgid "Hide this problem"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1523
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1524
 msgid "Hint:"
 msgstr "Indice :"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1522
 msgid "Hint: "
 msgstr "Indice:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:658
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1771
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:99
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:51
 msgid "Hints"
 msgstr "Indices"
 
 # Hmwk is short for Homework
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:364
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:327
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:44
 msgid "Hmwk Sets Editor"
 msgstr "Éditeur de devoirs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:779
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:80
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:108
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:19
 msgid "Homework Sets"
 msgstr "Devoirs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:38
 msgid "Homework Totals"
 msgstr "Total du cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1432
-msgid "I couldn't find the file [ACHEVDIR]/surprise_message.txt!"
-msgstr "Impossible de trouver le fichier [ACHEVDIR]/surprise_message.txt!"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:17
+msgid "Homwork Sets Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:88
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:31
+msgid "How to:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:36
+msgid "I couldn't find the file [ACHIEVEMENT_DIR]/surprise_message.txt!"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1451
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:9
 msgid "Icon"
 msgstr "Icône"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:29
 msgid "Icon File"
 msgstr "Fichier de l'icône"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:612
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:80
+msgid "Icon File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:24
+msgid ""
+"If \"PDF\" is selected, then a PDF file will be generated for download, "
+"unless there are errors.  If errors occur generating a PDF file or \"TeX "
+"Source\" is selected then a zip file will be generated for download that "
+"contains the TeX source file and resources needed for generating the PDF "
+"file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:37
+msgid ""
+"If \"TeX Source\" is selected, a zip file containing a TeX file and other "
+"files needed to generate a PDF hardcopy will be produced. If \"Adobe PDF\" "
+"is selected then only a PDF file will be produced."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:84
 msgid ""
 "If a password field is left blank, the student's current password will be "
 "maintained."
 msgstr "Si le champ d'un mot de passe est vide, le mot de passe actuel sera conservé."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:42
+msgid ""
+"If selected, the file path of the problem source will be printed in the "
+"output."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:38
+msgid ""
+"If selected, this adds spaces between the fields to align the commas, which "
+"makes the columns easy to read when in text form but it can confuse some "
+"spreadsheet applications since the extra spaces violate the csv standard "
+"(although Excel handles them with no problem). This will give a visual form "
+"of the CSV file that is easy to read on the page. If you want a reliable "
+".csv file for use in any spreadsheet application unclick the \"Pad Fields\" "
+"option. You can download the .csv file immediately by clicking on the link "
+"with the filename chosen above, or you can download it using the \"File "
+"Manager\" from the scoring directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:148
+msgid ""
+"If the original problem can not be edited than the path name must be changed"
+" in order to be allowed to save the problem. Adding \"local/\" to the "
+"beginning of the original path is the default solution. All locally created "
+"and edited files will then appear in a subdirectory named \"local\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:513
 msgid ""
 "If this flag is set then this problem will count towards the grade of its "
 "parent problem.  In general the adjusted status on a problem is the larger "
@@ -3332,20 +4449,28 @@ msgid ""
 "problems which have this flag enabled."
 msgstr "Choisir « Oui » si vous désirez que ce problème compte dans le résultat du problème parent. En général, la note finale obtenue pour un problème est calculée selon la meilleure note de toutes les tentatives et selon la moyenne pondérée des notes obtenues aux sous-problèmes pour lesquels ce paramètre est activé."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
 msgid ""
 "If this is enabled then instructors with the ability to receive feedback "
 "emails will be notified whenever a student runs out of attempts on a problem"
-" and its children without receiving an adjusted status of 100%."
-msgstr "Si cette options est activée l'enseignant pouvant recevoir des rétroactions par courriels sera avisé quand un étudiant épuisera toutes les tentatives pour un problèmes et ses sous problèmes sans recevoir un ajustement de 100%."
+" and its children  without receiving an adjusted status of 100%."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:334
 msgid ""
 "If this is enabled then students will be unable to attempt a problem until "
 "they have completed all of the previous problems, and their child problems "
 "if necessary."
 msgstr "Si cette option est activée les étudiants seront incapables d'essayer un problème sans avoir réussi tous les problèmes précédents et leur sous problèmes."
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:57
+msgid ""
+"If this is selected, a success index is listed in each csv file. The success"
+" index is a number assigned on the basis of the number of incorrect attempts"
+" (roughly equivalent to 1/the number of attempts) which seems to correlate "
+"with the relative difficulty the student had with the problem."
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:47
 msgid ""
 "If this is set, all users (including the instructor) must enter the WeBWorK "
@@ -3353,8 +4478,8 @@ msgid ""
 "they receive a message directing them back to the LMS."
 msgstr ""
 
-#. (CGI::b($r->maketext("Remember Me")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:201
+#. (tag('strong', maketext('Remember Me')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:33
 msgid ""
 "If you check %1 your login information will be remembered by the browser you"
 " are using, allowing you to visit WeBWorK pages without typing your user "
@@ -3363,273 +4488,419 @@ msgid ""
 " have direct control."
 msgstr "If you check %1 your login information will be remembered by the browser you are using, allowing you to visit WeBWorK pages without typing your user name and password (until your session expires). This feature is not safe for public workstations, untrusted machines, and machines over which you do not have direct control."
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:407
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:154
+msgid ""
+"If you click on the \"Grade Problem\" icon to the right of the problem "
+"number, then the problem will open in the manual problem grader. This page "
+"shows the rendered problem and lists all students assigned to the set and "
+"the last answer the students entered for the problem. You can then change "
+"the recorded scores for students on this problem and provide instructor "
+"feedback comments."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:148
+msgid ""
+"If you click on the \"Open in New Window\" icon to the right of the problem "
+"number, then the problem will open in the actual homework set in a new tab "
+"or window."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:425
 msgid "If you come back to it later, it may revert to its original version."
 msgstr "Si vous revenez plus tard, le problème pourrait être revenu à sa version originale."
 
+#. ('<code>report_grades_data.csv</code>', '<code>report_grade.msg</code>',
+#. '<code>$COL</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:80
+msgid ""
+"If you upload your file on the web with the name: %1 and also create an "
+"email message with the name %2 with the approriate %3 variables then not "
+"only can you email the message with the embedded grades to the students, but"
+" files with those exact names are automatically appended to the \"Grades\" "
+"page seen by the students."
+msgstr ""
+
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:798
-msgid "Illegal file '%1' specified"
-msgstr "Le fichier '%1' spécifié est illégal"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:337
+msgid "Illegal file \"%1\" specified"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1445
 msgid "Illegal filename contains '..'"
 msgstr "Nom de fichier illégal, car contient '..'"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:73
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:63
 msgid "Import"
 msgstr "Importer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1291
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:65
+msgid ""
+"Import a single set or multiple sets from a set definition file. (Use the "
+"\"File Manager\" to upload/download set definition files.) The \"Shift "
+"Dates...\" option is useful for problem sets that were used from other "
+"courses and will shift all of the dates."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:16
 msgid "Import from where?"
 msgstr "Importer de quel(s) fichier(s)? "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1270
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:5
 msgid "Import how many sets?"
 msgstr "Importer combien de devoirs? "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:31
 msgid "Import sets with names"
 msgstr "Entrer les noms des devoirs "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:5
 msgid "Import users from what file?"
 msgstr "Importer les utilisateurs à partir de quel fichier? "
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:99
+msgid "Import/export achievements"
+msgstr ""
+
 #. ($count)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:516
 msgid "Imported %quant(%1,achievement)"
 msgstr "Importer %quant(%1,accomplissement)"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:25
+msgid ""
+"In both cases, one can select the sort field, the format of the display "
+"list, and the filter. \"Change Display Settings\" must be clicked to update "
+"the list."
+msgstr ""
+
 #. ($total_inprogress, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1019
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:28
 msgid "In progress: %1/%2"
 msgstr "Progression : %1/%2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:47
 msgid "Inactive"
 msgstr "Inactif"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1601
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:51
+msgid "Inactive Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1503
 msgid "Inactivity time before a user is required to login again"
 msgstr "Temps d'inactivité avant que l'utilisateur ne doive se connecter de nouveau"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:42
 msgid "Include Contrib"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:35
 msgid "Include OPL"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:32
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:55
 msgid "Include Success Index"
 msgstr "Inclure l'indice de succès"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:62
 msgid "Include percentage grades columns for all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:471
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:302
 msgid "Incorrect"
 msgstr "Erroné"
 
 #. ($total_incorrect, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1033
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:36
 msgid "Incorrect: %1/%2"
 msgstr "Erroné : %1/%2"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:26
+msgid ""
+"Indicates the number of problems in the set. Clicking on the link opens the "
+"set detail page which allows you to modify set parameters, edit set headers,"
+" and change parameters of problems in the set such as the number of allowed "
+"attempts or the weight (credit value). You can also add, remove, view, edit,"
+" and reorder the problems in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:141
+msgid "Individual Problem Results"
+msgstr ""
+
 # Short for Initial
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:41
 msgid "Init"
 msgstr "Init"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:502
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:35
 msgid "Institution"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2344
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:560
 msgid "Instructor Comment:"
 msgstr "Commentaire du professeur:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1494
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1306
 msgid "Instructor Feedback:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:311
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:17
+msgid "Instructor Links Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:29
 msgid "Instructor Tools"
 msgstr "Outils de l'enseignant"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1228
-msgid "Instructor solution preview: show the student solution after due date."
-msgstr "Aperçu de la solution réservé au professeur : afficher la solution pour les étudiants après la date d'échéance"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:17
+msgid "Instructor Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:90
+msgid "Instructor:"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:377
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:326
 msgid "Invalid Reply-to address."
 msgstr "L'adresse courriel <em>Répondre à</em> est invalide."
 
 #. ($output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:187
 msgid ""
-"Invalid file name. The file name \"%1\" does not have a \".msg\" extension "
-"All email file names must end in the extension \".msg\" choose a file name "
-"with a \".msg\" extension. The message was not saved."
-msgstr "Nom de fichier invalide. Le nom \"%1\" ne contient pas l'extension <b>.msg</b>. Tous les noms de fichiers de courriel doivent se terminer par l'extension <b>.msg</b>. Le message n'a pas été enregistré."
+"Invalid file name \"%1\". All email file names must end with the \".msg\" "
+"extension.  Choose a file name with the \".msg\" extension. The message was "
+"not saved."
+msgstr ""
 
 #. ($headerType)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1951
 msgid "Invalid headerType %1"
 msgstr "Type d'entête invalide %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:177
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/XMLRPC.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:173
 msgid "Invalid user ID or password."
 msgstr "Identifiant de l'utilisateur ou mot de passe invalide."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2244
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:34
+msgid ""
+"It is important that students enter an email address or they will not "
+"recieve any of the important emails sent by the instructor. The email "
+"address will only be present on the page if the user has permission to "
+"change the email address."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:20
+msgid "It lists the homework problem sets available for the students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:472
 msgid "Jump to Problem:"
 msgstr "Aller au problème :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:867
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:939
 msgid "Just-In-Time parameters"
 msgstr "Paramètres de l'évaluation Juste-à-temps"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:130
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:85
+msgid "Key Map"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:14
 msgid "Key Map:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:93
 msgid "Keywords:"
 msgstr "Mots clés :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "LAST NAME"
 msgstr "NOM DE FAMILLE"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1477
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:119
 msgid "LOCAL Usage"
 msgstr "Usage LOCAL"
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:100
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:103
 msgid "LTI"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1548
-msgid "Language (refresh page after saving changes to reveal new language.)"
-msgstr "Langue (actualiser la page après la sauvegarde des modifications pour révéler la nouvelle langue) "
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:25
+msgid "LTI Grade Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:460
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:75
+msgid "LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:17
+msgid "LTI Grade Update Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:16
+msgid "LTI grade passback is not enabled for this course"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:63
+msgid "LTI update of all users and sets queued."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:64
+msgid "LTI update of all users queued."
+msgstr ""
+
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:58
+msgid "LTI update of set %1 queued."
+msgstr ""
+
+#. ($userID, $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:56
+msgid "LTI update of user %1 and set %2 queued."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:60
+msgid "LTI update of user %1 queued."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1450
+msgid "Language (refresh page after saving changes to reveal new language.)"
+msgstr "Langue (actualiser la page après la sauvegarde des modifications pour révéler la nouvelle langue) "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:758
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:140
 msgid "Last"
 msgstr "Nom de famille"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:460
 msgid "Last Answer"
 msgstr "Dernière réponse"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:604
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:231
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2001
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:828
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:857
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:915
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:31
+msgid "Last Full Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:25
 msgid "Last Name"
 msgstr "Nom de famille"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:792
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:115
 msgid "Last column of merge file"
 msgstr "Dernière colonne du fichier joint"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:785
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:108
 msgid "Last name"
 msgstr "Nom de famille"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:242
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:237
 msgid "Latest Answers"
 msgstr "Réponses récentes"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1603
+#: /opt/webwork/webwork2/conf/defaults.config:1505
 msgid ""
 "Length of time, in seconds, a user has to be inactive before he is required "
-"to login again.<p>This value should be entered as a number, so as 3600 "
-"instead of 60*60 for one hour"
+"to login again. This value should be entered as a number, so as 3600 instead"
+" of 60*60 for one hour."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:845
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:26
 msgid "Lesser Rod of Revelation"
 msgstr "Petit sceptre de la révélation"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:965
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:26
 msgid "Lesser Tome of Enlightenment"
 msgstr "Petit livre de l'éclaircissement"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:141
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:15
 msgid "Level Progress:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:881
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:77
 msgid "Level:"
 msgstr "Niveau :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:912
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2060
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:433
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:17
+msgid "Library Broswer Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:359
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:52
 msgid "Library Browser"
 msgstr "Choisir des problèmes"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1977
+#. ($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:30
+msgid "Link to Edit Page for %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:25
+msgid "Links to pages that give information about writing problems:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1879
 msgid "List of display modes made available to students"
 msgstr "Liste des modes d'affichage mis à la disposition des étudiants"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2130
-msgid ""
-"List of e-mail addresses to which e-mail can be sent by a problem. "
-"Professors need to be added to this list if questionaires are used, or other"
-" WeBWorK problems which send e-mail as part of their answer mechanism."
-msgstr "Liste des adresses auxquelles un courriel peut être envoyé par un utilisateur qui se trouve sur la page d'un problème. Les professeurs doivent être ajoutés à cette liste si des questionnaires sont utilisés, ou si d'autres problèmes de WeBWorK pour lesquels l'envoi de courriel est programmé dans leur code sont utilisés."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:759
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:774
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:89
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:96
 msgid "List of insertable macros"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1826
+#: /opt/webwork/webwork2/conf/defaults.config:1728
 msgid "List of options for Show Me Another button"
 msgstr "Liste des options pour le bouton <b>Montrer un autre problème</b>"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1713
+#: /opt/webwork/webwork2/conf/defaults.config:1615
 msgid "List of sets excluded from achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1483
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:56
+msgid "Live equation rendering"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:144
+msgid "Loading..."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:122
 msgid "Local Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:41
 msgid "Local Problems"
 msgstr "Problèmes locaux"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1504
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:136
 msgid "Local Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:105
 msgid "Local Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1467
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:114
 msgid ""
 "Local data is generated when your systems admin runs the script update-OPL-"
 "statistics."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1460
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:107
 msgid ""
 "Local data on problem usage is generated and maintained by your institution."
 " The Usage figure is the total number of local individuals who have attemped"
@@ -3638,42 +4909,61 @@ msgid ""
 "likely bug free."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:115
 msgid "Location"
 msgstr "Emplacement"
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3501
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1854
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1890
 msgid ""
 "Location %1 does not exist in the WeBWorK database.  Please check your input"
 " (perhaps you need to reload the location management page?)."
 msgstr "L'emplacement %1 n'existe pas dans la base de données de WeBWorK. Vérifier votre entrée (Peut-être faudrait-il recharger la page de gestion des emplacements?)."
 
 #. ($locationID, join(', ', @addresses)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1742
 msgid "Location %1 has been created, with addresses %2."
 msgstr "L'emplacement %1 a été créé, avec les adresses %2."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3353
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1798
 msgid "Location deletion requires confirmation."
 msgstr "Confirmation de la suppression de l'emplacement exigée."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3409
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:43
 msgid "Location description:"
 msgstr "Description de l'emplacement:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3089
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:37
 msgid "Location name:"
 msgstr "Nom de l'emplacement:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:159
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:27
+msgid ""
+"Locations are a list of ip addresses.  Ip addresses can be a single address "
+"(e.g. 192.168.1.101), a range of ip address (e.g. "
+"192.168.1.101-192.168.1.150), or an ip address mask (e.g. 192.168.1.0/24). "
+"Enter one ip address per line, using as many lines as needed for each "
+"location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:32
+msgid ""
+"Locations are edited by adding new ip addresses to the location, or deleting"
+" existing address.  You must select the confirm checkbox when deleting a "
+"location, and this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:43
+msgid "Locations of files:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:18
 msgid "Log In Again"
 msgstr "Se connecter à nouveau"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1124
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:11
 msgid "Log Out"
 msgstr "Se déconnecter"
 
@@ -3681,368 +4971,456 @@ msgstr "Se déconnecter"
 #. ($rename_oldCourseID)
 #. ($rename_newCourseID)
 #. ($new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1458
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1541
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2666
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:913
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:704
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:780
 msgid "Log into %1"
 msgstr "Accéder au cours %1"
 
-#. (HTML::Entities::encode_entities($prettyUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1122
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1130
+#. ($userName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:9
 msgid "Logged in as %1."
 msgstr "Connecté sous %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:790
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:181
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:187
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:113
 msgid "Login"
 msgstr "Nom d'utilisateur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:58
 msgid "Login Info"
 msgstr "Paramètres du compte"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:187
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:815
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1980
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:291
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:855
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:884
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:913
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:36
 msgid "Login Name"
 msgstr "Nom d'utilisateur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:18
 msgid "Login Status"
 msgstr "Statut d'accès"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:6
+msgid "Login:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:225
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Macro"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:763
-msgid "Main Menu"
-msgstr "Menu principal"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:97
+msgid ""
+"Macro (\".pl\") files containing additional functionality for your course "
+"can be stored here."
+msgstr ""
+
+#. ($filePath)
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:29
+msgid "Macro file %1 not found."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:369
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:46
 msgid "Make Archive"
 msgstr "Archiver"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:27
 msgid "Make changes"
 msgstr "Effectuer les modifications"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1115
-msgid "Make these changes in  course:"
-msgstr "Effectuer ces modifications dans le cours:"
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:15
+msgid "Make these changes in course: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:137
+msgid ""
+"Makes a new copy of the file you are editing at the location relative to the"
+" course's templates ([TMPL]) directory. You may choose to replace the "
+"current problem in the current set, append to the end to then end of the "
+"current set as a new problem, or create a problem that is not attached to a "
+"problem set."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3040
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:1
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:46
 msgid "Manage Locations"
 msgstr "Gérer les emplacements"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:748
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:394
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:17
+msgid "Manage Locations Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:20
+msgid ""
+"Manage achievements for the course.  The actions allow one to edit, assign, "
+"import, export, score, create, or delete achievements.  The action form is "
+"at the top to select the desired action and options to perform when the "
+"submit button is pressed.  Below the action form is the list of all the "
+"achievements, ordered by their achievement \"Number\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:56
+msgid "Manage administration course files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:50
+msgid ""
+"Manage instructors.  When instructors are added to a newly created course, "
+"they are also added to the admin course with username \"userID_courseID\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:344
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:192
 msgid "Manual Grader"
 msgstr "Évaluateur manuel"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:233
-msgid "Mark All"
-msgstr "Corriger tout"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:17
+msgid "Manual Grader Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr',
+#. format_set_name_display($c->stash->{set}->set_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:205
+msgid "Manual Grader for %1: Problem %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:77
+msgid ""
+"Manually initiate an LTI grade passback for selected sets or users. This "
+"link is only visible if LTI grade passback is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:175
+msgid ""
+"Many of these editing activities can also be done more quickly from the "
+"\"Instructor Tools\" page where students and homework sets can be selected "
+"simultaneously. The \"Instructor Tools\" page is useful for quick editing of"
+" one or two students. The initial setup of the class can be done best from "
+"this page. Importing and exporting class lists can only be done from this "
+"page. Deleting students can only be done from this page."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:120
 msgid "Mark Correct"
 msgstr "Noter Réussi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2822
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:598
 msgid "Mark Correct?"
 msgstr "Noter Réussi?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:681
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:19
 msgid "Match on what? (separate multiple IDs with commas)"
 msgstr "Nom(s) du ou des devoirs (les séparer par des virgules) "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:499
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:85
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:36
 msgid "Math Objects"
 msgstr "Math Objects"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:327
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:377
 msgid "Max attempts"
 msgstr "N<sup>bre</sup> max. d'essais"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:380
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:24
 msgid "Max. Shown:"
 msgstr "Max. affiché :"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1817
+#: /opt/webwork/webwork2/conf/defaults.config:1719
 msgid ""
 "Maximum times Show me Another can be used per problem (-1 => unlimited)"
 msgstr "Nombre maximum de fois que le bouton <b>Montrer un autre problème</b> peut être utilisé par problème (-1 => illimité)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:606
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:4
+msgid "Merge file data:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:24
 msgid "Merge file:"
 msgstr "Joindre :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:288
 msgid "Message"
 msgstr "Message"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:578
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:13
 msgid "Message file:"
 msgstr "Message :"
 
-#. ($emailDirectory, $output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:357
-msgid "Message saved to file <code>%1/%2</code>."
-msgstr "Message enregistré sous <code>%1/%2</code>."
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:300
+msgid "Message saved to file %1."
+msgstr ""
 
-#. ($recipient, $ur->email_address)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:995
+#. ($recipient, $user_record->email_address)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:98
 msgid "Message sent to %1 at %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2249
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2324
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:121
+msgid "Message was blank."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:48
+msgid ""
+"Messages can be saved to a message file (which must end in the \".msg\" "
+"extension).  Use the \"Message file\" drop down menu to select which message"
+" file to load, or \"None\" to use a blank message. To save a new message, "
+"use the \"Save as\" button after entering in a valid filename.  The \"Save "
+"as\" button will not overwrite currently saved messages.  To edit a "
+"currently saved message first select it using the drop down menu, then click"
+" the \"Save\" button to save any changes.  Use the \"File Manager\" to "
+"delete messages, located in the \"[TMPL]/email\" directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:22
 msgid "Method"
 msgstr "Méthode"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3284
+#: /opt/webwork/webwork2/conf/defaults.config:2003
+msgid "Method to enter problem scores in the single problem manual grader"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1668
 msgid ""
 "Missing required input data. Please check that you have filled in all of the"
 " create location fields and resubmit."
 msgstr "Information manquante. Remplir chacun des emplacements et soumettre à nouveau."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1555
+#: /opt/webwork/webwork2/conf/defaults.config:1457
 msgid ""
 "Mode in which the LANG and DIR settings for a single problem are determined."
 msgstr "Mode dans lequel les paramètres de LANG et DIR sont déterminés pour un problème. "
 
-#: /opt/webwork/webwork2/conf/defaults.config:1557
-msgid ""
-"Mode in which the LANG and DIR settings for a single problem are "
-"determined.<p>The system will set the LANGuage attribute to either a value "
-"determined from the problem, a course-wide default, or the system default, "
-"depending on the mode selected. The tag will only be added to the DIV "
-"enclosing the problem if it is different than the value which should be set "
-"in the main HTML tag set for the entire course based on the course "
-"language.<p>There are two options for the DIRection attribute: \"ltr\" for "
-"left-to-write sripts, and \"rtl\" for right-to-left scripts like Arabic and "
-"Hebrew.<p>The DIRection attribute is needed to trigger proper display of the"
-" question text when the problem text-direction is different than that used "
-"by the current language of the course. For example, English problems from "
-"the library browser would display improperly in RTL mode for a Hebrew "
-"course, unless the problen Direction is set to LTR.<p>The feature to set a "
-"problem language and direction was only added in 2018 to the PG language, so"
-" most problems will not declare their language, and the system needs to fall"
-" back to determining the language and direction in a different manner. The "
-"OPL itself is all English, so the system wide fallback is to en-US in LTR "
-"mode.<p>Since the defaults fall back to the LTR direction, most sites should"
-" be fine with the \"auto::\" mode, but may want to select the one which "
-"matches their course language. The mode \"force::ltr\" would also be an "
-"option for a course which runs into trouble with the \"auto\" "
-"modes.<p>Modes:<br><ul><li>\"none\" prevents any additional LANG and/or DIR "
-"tag being added. The browser will use the main setting which was applied to "
-"the entire HTML page. This is likely to cause trouble when a problem of the "
-"other direction is displayed.</li><li>\"auto::\" allows the system to make "
-"the settings based on the language and direction reported by the problem (a "
-"new feature, so not set in almost all existing problems) and falling back to"
-" the expected default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" "
-"allows the system to make the settings based on the language and direction "
-"reported by the problem (a new feature, so not set in almost all existing "
-"problems) but falling back to the language with the given LangCode and the "
-"direction Dir when problem settings are not available from "
-"PG.</li><li>\"auto::Dir\" for problems without PG settings, this will use "
-"the default en=english language, but force the direction to Dir. Problems "
-"with PG settings will get those settings.</li><li>\"auto:LangCode:\" for "
-"problems without PG settings, this will use the default LTR direction, but "
-"will set the language to LangCode.Problems with PG settings will get those "
-"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
-" by the PG code of the problem, and will force the system to set the "
-"language with the given LangCode and the direction to Dir for <b>all</b> "
-"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
-"PG code of the problem, and will force the system to set the direction to "
-"Dir for <b>all</b> problems, but will avoid setting any language attribute "
-"for individual problem.</li></ul>"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2695
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:443
 msgid "Move"
 msgstr "Déplacer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2231
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:457
 msgid "Move to Page:"
 msgstr "Déplacer à la page:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2226
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:452
 msgid "Move to Problem:"
 msgstr "Déplacer au problème:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:26
+msgid ""
+"Multiple sets may be assigned to the users by holding down the shift key or "
+"the ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:27
+msgid ""
+"Multiple users or sets may be selected by holding down the shift key or the "
+"ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:36
 msgid "My Problems"
 msgstr "Mes problèmes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1412
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:26
 msgid "Mysterious Package (with Ribbons)"
 msgstr "Paquet mystérieux (avec rubans)"
 
 # Short for Number of Fields
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:213
 msgid "NO OF FIELDS"
 msgstr "CHAMPS"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1484
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:741
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:113
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:135
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:29
 msgid "Name"
 msgstr "Nom"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:174
 msgid "Name for new set here"
 msgstr "Nom du nouveau devoir ici"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1528
+#: /opt/webwork/webwork2/conf/defaults.config:1430
 msgid "Name of course information file"
 msgstr "Nom du fichier contenant les informations sur le cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1107
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:77
+msgid "Name of the evaluator file used to evaluate the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:81
+msgid "Name of the image used for the achievement icon."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:4
 msgid "Name the new set"
 msgstr "Nommer le nouveau devoir "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1691
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:45
+msgid "Name:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:29
 msgid "Necromancers Charm"
 msgstr "Sorts du nécromancier"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:343
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:205
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:393
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:35
 msgid "Never"
 msgstr "Jamais"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:371
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:54
 msgid "New File"
 msgstr "Nouveau fichier"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:372
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:55
 msgid "New Folder"
 msgstr "Nouveau dossier"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:30
 msgid "New Name:"
 msgstr "Nouveau nom :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2067
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:3
 msgid "New Password"
 msgstr "Nouveau mot de passe"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:131
-msgid "New Version"
-msgstr "Nouvelle Version"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+msgid "New Problem"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
 msgid "New file name:"
 msgstr "Nom du nouveau fichier :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
 msgid "New folder name:"
 msgstr "Nom du nouveau dossier :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:577
 msgid "New passwords saved"
 msgstr "Nouveaux mots de passe sauvegardés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1078
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:36
 msgid "New set name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1357
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1010
 msgid "Next Problem"
 msgstr "Problème suivant"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1181
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2164
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:40
+msgid "Next Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:98
 msgid "Next page"
 msgstr "Page suivante"
 
-#. ($self->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:620
+#. (% $c->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:142
 msgid "Next test will be available by %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2452
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:134
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:144
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:183
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:483
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:510
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:142
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:68
 msgid "No"
 msgstr "Non"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:635
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:116
 msgid "No Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2324
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:216
 msgid "No Description"
 msgstr "Aucune description"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:117
+msgid "No Sender specified."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:23
 msgid "No Target Set Selected"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:335
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:38
 msgid "No achievement badges have been assigned yet."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1521
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:77
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:37
 msgid "No achievements shown.  Create an achievement!"
 msgstr "Aucun accomplissement affiché. Créer un accomplissement!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:90
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:2
+msgid "No achievements shown.  Select an achievement to edit!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:61
 msgid "No action taken"
 msgstr "Aucune action n'a été effectuée."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:141
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:140
 msgid ""
 "No authentication method found for your request.  If this recurs, please "
 "speak with your instructor."
 msgstr "Aucune méthode de connexion trouvée pour votre demande. If this recurs, please speak with your instructor."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:940
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:361
 msgid "No change made to any set"
 msgstr "Aucun changement effectué à aucun devoir."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
 msgid ""
 "No changes specified.  You must mark the checkbox of the item(s) to be "
 "changed and enter the change data."
@@ -4052,1379 +5430,1811 @@ msgstr "Aucune modification scpécifiée. Cocher la case à modifier et inscrire
 msgid "No changes were saved!"
 msgstr "Aucun changement n'a été sauvegardé!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2462
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:50
 msgid "No course archives found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2898
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:32
 msgid "No course id defined"
 msgstr "Aucun identifiant de cours défini"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1561
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:932
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:67
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:76
 msgid "No courses found"
 msgstr ""
 
 #. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:593
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:675
 msgid "No data exists for set %1 and problem %2"
 msgstr "Aucune donnée n'existe pour le devoir %1 et le problème %2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:10
+msgid "No e-mail recipients are listed for this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:169
 msgid "No filename was specified for saving!  The message was not saved."
 msgstr "Aucun nom de fichier n'a été spécifié! Le message n'a pas été enregistré."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:340
 msgid "No guest logins are available. Please try again in a few minutes."
 msgstr "Aucun compte <em>invité</em> n'est disponible pour l'instant. Veuillez réessayer dans quelques minutes."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3522
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1877
 msgid "No location specified to edit. Please check your input data."
 msgstr ""
 
 #. ($badID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1788
 msgid "No location with name %1 exists in the database"
 msgstr "Aucun emplacement avec le nom %1 exist dans la base de données"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3206
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:149
 msgid "No locations are currently defined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:342
 msgid "No merge data file"
 msgstr "Aucune feuille de calcul <b>.csv</b> à joindre"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:612
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:18
+msgid "No merge data found"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:164
+msgid "No merge data found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:8
+msgid "No merge file selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:135
 msgid "No more tests available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:270
 msgid ""
 "No new Achievement ID specified.  No new achievement created.  File not "
 "saved."
 msgstr "Aucune ID d'accomplissement spécifiée. Aucun accomplissement créé. Fichier non sauvegardé."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:63
 msgid "No problems matched the given parameters."
 msgstr "Aucun problème ne correspond aux paramètres choisis."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:25
+msgid "No recipients selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:334
 msgid ""
 "No recipients selected. Please select one or more recipients from the list "
 "below."
 msgstr "Aucun destinataire n'a été sélectionné. Veuillez sélectionner un ou plusieurs destinataires dans la liste ci-dessous."
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2044
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:49
 msgid "No record for global set %1."
 msgstr "Aucun enregistrement pour le devoir global %1"
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2046
-msgid "No record for user %1."
-msgstr "Aucun enregistrement pour l'utilisateur %1"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
 msgid "No record found."
 msgstr "Aucun enregistrement trouvé."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1166
-msgid "No set created."
-msgstr "Aucun devoir créé."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:12
 msgid "No sets in this course yet"
 msgstr "Il n'y a aucun devoir dans ce cours présentement"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1010
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:159
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
 msgid "No sets selected for scoring"
 msgstr "Aucun devoir n'a été sélectionné"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2764
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:46
 msgid ""
 "No sets shown.  Choose one of the options above to list the sets in the "
 "course."
 msgstr "Aucun devoir affiché. Choisir l'une des options ci-dessus pour afficher les devoirs dans le cours."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1942
 msgid "No source filePath specified"
 msgstr "Aucun chemin vers un fichier source n'a été spécifié."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1327
 msgid "No source_file for problem in .def file"
 msgstr "Il n'existe aucun fichier source associé à un problème dans le fichier <b>.def</b>."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2099
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:87
 msgid ""
-"No students shown.  Choose one of the options above to list the students in "
+"No students shown. Choose one of the options above to list the students in "
 "the course."
-msgstr "Aucun étudiant affiché. Choisir l'une des options ci-dessus pour afficher les étudiants de ce cours."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:246
 msgid "No submissions. Over time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:278
 msgid "No tests taken."
 msgstr "Aucun test n'a été fait."
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:594
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:676
 msgid "No user specific data exists for user %1"
 msgstr "Aucune donnée spécifique n'existe pour l'utilisateur %1"
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2031
 msgid "No valid changes submitted for location %1."
 msgstr "Aucun chagement valide soumis pour l'emplacement %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:275
-msgid "No versions of this assignment have been taken."
-msgstr "Aucune tentative effectuer de cette version de l'accomplissement."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:771
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:263
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:241
 msgid "No versions of this test have been taken."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:562
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:252
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:17
 msgid "None"
 msgstr "Aucun"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:681
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2463
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:763
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:52
 msgid "None Specified"
 msgstr "Aucun spécifié"
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2089
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:73
 msgid "None of the selected users are assigned to this set: %1"
 msgstr "Aucun des utilisateurs n'est désigné pour ce devoir&#8239;: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:33
 msgid "Not logged in."
 msgstr "Non connecté."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1569
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:4
 msgid "Note"
 msgstr "Note"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:381
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:55
+msgid ""
+"Note that if there are errors, they will be shown at the top of the page. In"
+" some cases, a hard copy is still generated and a link called \"Download "
+"Hardcopy\" appears. In addition, the latex file, log and error files are "
+"generated which can be used in troubleshooting."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:93
+msgid ""
+"Note that if you set the permission level of a user to something other than "
+"\"Student\", you may also want to set the status of the user to "
+"\"Observer\".  Users with the \"Observer\" status are not included in "
+"statistics, scoring, or instructor emails."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:28
+msgid ""
+"Note that some settings require an additional page load after \"Save "
+"Changes\" is clicked in order to take effect.  This is true for a theme "
+"change for example."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:396
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:422
 msgid "Note:"
 msgstr "Note:"
 
-#. (CGI::i($pg->{result}{msg})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2350
+#. (tag('i', maketext('You are in the Reduced Scoring Period.  All work counts
+#. for [_1]% of the original.',
+#. $ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#. (tag('i', $pg->{result}{msg})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:572
 msgid "Note: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2482
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:686
 msgid ""
 "Note: grading the test grades all problems, not just those on this page."
 msgstr "Note : le fait de soumettre le test a pour effet d'enregistrer vos réponses pour tous les problèmes, pas seulement pour ceux affichés sur la page."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1460
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1485
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:768
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:59
+msgid "Now"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:19
 msgid "Number"
 msgstr "Numéro"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:242
 msgid "Number of Graded Submissions per Test (0=infty)"
 msgstr "Nombre de soumissions enregistrées possibles par test (0=infinité)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
 msgid "Number of Problems per Page (0=all)"
 msgstr "Nombre de problèmes par page (0=tout)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:95
+msgid "Number of Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:257
 msgid "Number of Tests per Time Interval (0=infty)"
 msgstr "Nombre de versions possibles pendant ce laps de temps (0=infinité)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1833
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2435
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:54
+msgid "Number:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1181
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:912
 msgid "OK"
 msgstr "OK"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1464
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:17
+msgid "OPL Problem Levels Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:26
 msgid "Oil of Cleansing"
 msgstr "Huile nettoyante"
 
+#. ('<code>pdflatex</code>', '<code>hardcopy.tex</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:49
+msgid ""
+"Once \"Generate Hardcopy for selected sets and selected users\" is clicked a"
+" file in the selected hardcopy format will be generated and offered for "
+"download. If PDF output was selected, a single PDF file is generated. If TeX"
+" output is selected, a zip file is generated that contains all files needed "
+"to generated the hardcopy PDF file via %1. The main TeX file is called %2."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:84
 msgid "One Column"
 msgstr "Une colonne"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:314
+msgid "Only Start"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:289
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:303
 msgid "Only after set answer date"
 msgstr "Après que les réponses sont disponibles"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1892
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:87
+msgid ""
+"Only present for JITAR sets. Collapse JITAR nesting problem groups to the "
+"top row of information about a problem. Note that the nesting of a single "
+"problem group can be collapsed by clicking on the down arrow to the right of"
+" the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:80
+msgid ""
+"Only present for JITAR sets. Expand JITAR nested problem groups that have "
+"been collapsed. Note that the nesting of a single problem group can be "
+"expanded by clicking on the right arrow to the right of the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1794
 msgid ""
 "Only this permission level and higher get buttons for sending e-mail to the "
 "instructor."
 msgstr "Le bouton pour envoyer un courriel au professeur est disponible uniquement pour les utilisateurs de ce niveau de permission ou d'un niveau supérieur à celui-ci."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:39
 msgid "Open"
 msgstr "Ouvrir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:422
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:763
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:810
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:62
 msgid "Open Date"
 msgstr "Date d'ouverture"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1098
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:42
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:32
 msgid "Open Problem Library"
 msgstr "Open Problem Library"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2417
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:272
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:525
 msgid "Open in New Window"
 msgstr "Ouvrir dans une nouvelle fenêtre"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1263
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1617
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:29
 msgid "Open in new window"
 msgstr "Ouvrir dans une nouvelle fenêtre"
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:491
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:320
 msgid "Open, closes %1."
 msgstr "Disponible, date d'échéance : %1"
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:489
-msgid "Open, complete by %1."
-msgstr "Disponible, date d'échéance : %1"
-
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:300
 msgid "Open, due %1."
 msgstr "Ouvert, à remettre le %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:433
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
 msgid "Open."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:431
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:268
 msgid "Open. Submitted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:31
 msgid "Open:"
 msgstr "Disponible&#8239;:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:115
 msgid "Opens"
 msgstr "Ouverture"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:27
 msgid "Opens any homework set for 24 hours."
 msgstr "Rendre disponible tout devoir pour 24 heures."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1686
+#: /opt/webwork/webwork2/conf/defaults.config:1588
 msgid "Optional Modules"
 msgstr "Modules optionnels"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:265
 msgid "Order Problems Randomly"
 msgstr "Ordonner les problèmes aléatoirement"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:50
+msgid "Other Options"
+msgstr ""
+
 # Context is "7 Out Of 10"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:405
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:777
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:150
 msgid "Out Of"
 msgstr "Sur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1024
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:85
+msgid "Overall Results"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:93
+msgid "Overall Set Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:122
+msgid "Overall Success Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:470
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:481
 msgid "Overwrite"
 msgstr "Écraser"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:437
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:100
 msgid "Overwrite existing files silently"
 msgstr "Écraser les fichiers existants en mode silencieux"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:41
+msgid "PDF"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:69
 msgid "PG Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:827
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer.html.ep:1
+msgid "PG POD"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:17
+msgid "PG Problem Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:708
 msgid "PG debug messages"
 msgstr "Messages de débogage PG"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:829
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:716
 msgid "PG internal errors"
 msgstr "Erreurs internes PG"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:818
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:109
+msgid ""
+"PG markdown syntax used to format WeBWorK questions. This interactive lab "
+"can help you to learn the techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:692
 msgid "PG question failed to render"
 msgstr "L'affichage de la question PG a échoué"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:826
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:706
 msgid "PG question processing error messages"
 msgstr "Détails des erreurs de traitement de la question PG"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:828
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:712
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:128
 msgid "PG warning messages"
 msgstr "Messages d'avertissement PG"
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:511
-msgid "PGLab"
-msgstr "PGLab"
-
-# Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:98
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:47
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:58
 msgid "PGML"
 msgstr "PGML"
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:91
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:40
 msgid "POD"
 msgstr "POD"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2309
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2249
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:200
+msgid "POD Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:208
+msgid "POD Viewer"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1515
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:526
 msgid "PREVIEW ONLY -- ANSWERS NOT RECORDED"
 msgstr "APERÇU SEULEMENT -- LES RÉPONSES NE SONT PAS ENCORE ENREGISTRÉES"
 
 # Problem Number
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:215
 msgid "PROB NUMBER"
 msgstr "NUMÉRO DU PROBL."
 
 # Problem Value
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:218
 msgid "PROB VALUE"
 msgstr "NOTE SUR"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:205
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:36
 msgid "Pad Fields"
 msgstr "Séparer les champs par des espaces"
 
-#. (timestamp($self)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1255
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:28
+msgid "Page Contents"
+msgstr ""
+
+#. ($c->timestamp)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:1
 msgid "Page generated at %1"
 msgstr "Page générée le %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:568
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:81
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:71
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:56
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:25
 msgid "Password"
 msgstr "Mot de passe "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:976
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:13
 msgid "Password (Leave blank for regular proctoring)"
 msgstr "Mot de passe (laisser vide pour une connexion habituelle)"
 
-#. ($studentUser, CGI::span({ dir => 'ltr' },
-#. format_set_name_display($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:498
+#. ($studentUser, tag('span', dir => 'ltr', format_set_name_display($setName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:13
 msgid "Past Answers for %1, set %2, problem %3"
 msgstr "Réponses précédentes pour %1, devoir %2, problème %3"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:8
 msgid "Percent"
 msgstr "Pourcentage"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:562
-msgid "Percentage of Active Students with Correct Answers"
-msgstr "Pourcentage d'étudiants actifs avec des bonnes réponses"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:94
+msgid "Percent Ranges"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+msgid "Percent Score"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:535
+msgid "Percent of Students"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:788
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:206
 msgid ""
 "Percentile cutoffs for number of attempts. The 50% column shows the median "
 "number of attempts."
 msgstr "Rang centile du nombre de tentatives. La colonne 50 % présente la médiane du nombre de tentatives pour réussir le problème."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2056
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:834
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:863
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:921
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:58
+msgid ""
+"Percentile cutoffs for student's score and success index. The 50% column "
+"shows the median number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:50
 msgid "Permission Level"
 msgstr "Rôle"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1869
+#: /opt/webwork/webwork2/conf/defaults.config:1771
 msgid "Permissions"
 msgstr "Permissions"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1052
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:24
 msgid "Pick a target set above to add this problem to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:54
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:21
 msgid "Pick date and time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3804
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
 msgid ""
 "Place a file named \"hide_directory\" in a course or other directory and it "
 "will not show up in the courses list on the WeBWorK home page. It will still"
 " appear in the Course Administration listing."
 msgstr "Placer un fichier nommé \"répertoire_caché\" dans un cours ou dans un autre répertoire et il n'apparaîtra pas dans la liste des cours sur la page d'accueuil de WeBWorK. Le fichier apparaîtra dans la liste de l'administration du cours."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1107
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should be given full credit."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should have half credit added."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given full credit."
 msgstr "Choisir le devoir et le numéro de la question qui recevra l'ensemble des points."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:889
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given half credit."
 msgstr "Choisir le devoir et le numéro de la question qui recevra la moitié des points."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:654
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its incorrect attempt count reset."
 msgstr "Choisir le devoir et le numéro de la question dont le nombre de tentatives incorrects sera réinitialisé.."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its weight doubled."
 msgstr "Choisir le devoir et le numéro de la question qui recevra le double des points."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1315
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:60
 msgid ""
 "Please choose the set, the problem you would like to copy, and the problem "
 "you would like to copy it to."
 msgstr "Choisir le devoir, la question à copiée et la question où faire la copie désirée."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:399
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:19
 msgid "Please correct the following errors and try again:"
 msgstr "Corriger les erreurs suivantes et recommencer:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:698
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:28
 msgid "Please enter in a value to match in the filter field."
 msgstr "Veuillez entrer une valeur qui correspond au champ du filtre."
 
-#. (CGI::b($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:197
+#. (tag('b', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:28
 msgid "Please enter your username and password for %1 below:"
 msgstr "Veuillez écrire votre nom d'utilisateur et votre mot de passe pour le cours %1&#8239;:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1778
 msgid "Please provide a location name to delete."
 msgstr "Donner un emplacement à supprimer."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:233
 msgid "Please select action to be performed."
 msgstr "Veuillez choisir une action à effectuer."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:183
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
 msgid "Please select at least one set and try again."
 msgstr "Veuillez choisir au moins un devoir et essayer de nouveau."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
 msgid "Please select at least one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:165
 msgid "Please select at least one user and try again."
 msgstr "Veuillez choisir au moins un utilisateur et essayer de nouveau."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:35
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:31
 msgid "Please select at least one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:28
 msgid "Please select at most one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:30
 msgid "Please select exactly one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:29
 msgid "Please select exactly one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:574
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1016
 msgid "Please specify a file to save to."
 msgstr "Veuillez spécifier un nom de fichier pour rendre possible l’enregistrement."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:37
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
 msgid "Please specify a homework set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:38
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
 msgid ""
 "Please use only letters, digits, dashes, underscores, and periods in your "
 "set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1462
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1184
+msgid ""
+"Please use radio buttons to choose the method for saving this file. Uknown "
+"saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:165
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:169
+msgid "Point Value"
+msgstr ""
+
+#. ($grader->{problem_value})
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:92
+msgid "Point Value (0 - %1):"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:21
 msgid "Points"
 msgstr "Points"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:609
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:62
+msgid "Points:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:26
 msgid "Potion of Forgetfulness"
 msgstr "Potion d'oublie"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1423
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:2
 msgid "Prepare which sets for export?"
 msgstr "Quels devoirs préparer pour l'exportation?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2054
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2073
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:268
 msgid "Press \"Grade Test\" now!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2049
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:244
 msgid "Press \"Grade Test\" soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:213
-msgid "Preview Comment"
-msgstr "Prévisualiser les commentaires"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:69
 msgid "Preview Message"
 msgstr "Voir un aperçu du message"
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:314
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1840
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:11
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:99
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:35
 msgid "Preview My Answers"
 msgstr "Aperçu de mes réponses"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2440
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:646
 msgid "Preview Test"
 msgstr "Aperçu du test"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1340
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:41
+msgid ""
+"Preview the message before sending using the \"Preview Message\" button.  "
+"The preview shows the email that would be sent to the first selected student"
+" or the instructor if no students were selected.  The preview will also list"
+" all of the students that would receive their own personalized message.  If "
+"a merge file was selected, the preview will also indicate which (if any) "
+"recipient's merge file data could not be found."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:991
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:995
 msgid "Previous Problem"
 msgstr "Problème précédent"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2157
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:94
 msgid "Previous page"
 msgstr "Page précédente"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2149
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:45
+msgid "Primary Actions"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:355
 msgid "Print Test"
 msgstr "Imprimer le test"
 
 # Short for Problem
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2088
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:287
 msgid "Prob"
 msgstr "Probl."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:670
-msgid "Problem #"
-msgstr "Numéro du problème"
-
-#. ($prettyProblemID)
-#. ($problemNumber)
 #. (join('.', @seq)
 #. ($problemID)
-#. ($prettyProblemIDs{$probID})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:831
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:834
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:897
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:438
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:800
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:956
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:964
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:973
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:933
+#. ($problemNumber)
+#. ($_->{prettyID})
+#. ($c->{prettyID})
+#. ($probID)
+#. ($c->{setRecord}->assignment_type eq 'jitar' ? join('.',
+#. jitar_id_to_seq($_)
+#. ($set->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)
+#. ($prettyProblemID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:831
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:842
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:853
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:57
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/siblings.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:40
 msgid "Problem %1"
 msgstr "Problème %1"
 
-#. ($problemNumber)
-#. ($prettyID)
-#. ($versioned ? $versioned : $MergedProblem->problem_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1419
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1421
+#. ($i + 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:535
 msgid "Problem %1."
 msgstr "Problème %1."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1974
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:75
+msgid "Problem (\".pg\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:38
+msgid "Problem Display Settings"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1876
 msgid "Problem Display/Answer Checking"
 msgstr "Vérification de l'affichage/réponse du problème"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:451
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:50
 msgid "Problem Editor"
 msgstr "Éditeur de problèmes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1697
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:29
 msgid "Problem Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1002
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:999
 msgid "Problem List"
 msgstr "Liste des problèmes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1119
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:666
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:783
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:75
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:159
 msgid "Problem Number"
 msgstr "Numéro du problème"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:156
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:160
+msgid "Problem Paths"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:140
 msgid "Problem Score (%):"
 msgstr "Pointage du problème (%):"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:30
 msgid "Problem Techniques"
 msgstr "Modèles de problèmes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:705
-msgid "Problem Viewer"
-msgstr "Voir le problème"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:239
+msgid ""
+"Problem has a different source file than the currently rendered problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:233
+msgid "Problem has an essay answer that needs to be graded."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1943
 msgid "Problem source is drawn from a grouping set"
 msgstr "Ce problème est tiré d'un regroupement de plusieurs problèmes."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:406
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2494
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:445
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:827
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:835
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:896
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:801
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:89
+msgid ""
+"Problem source is drawn from a grouping set and can not be directly rendered"
+" or edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:336
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:9
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:32
 msgid "Problems"
 msgstr "Problèmes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:25
 msgid "Problems Added"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:59
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:54
 msgid "Problems for all students have been unassigned."
 msgstr "Tous les problèmes de ce devoir ont été retirés pour  tous les utilisateurs."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:57
 msgid "Problems for selected students have been reassigned."
 msgstr "Tous les problèmes de ce devoir ont été attribués aux utilisateurs sélectionnés."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:51
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:46
 msgid "Problems have been assigned to all current users."
 msgstr "Tous les problèmes de ce devoir ont été attribués à tous ces utilisateurs."
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:25
+msgid ""
+"Problems with this rating should only require direct memory of a fact. "
+"Examples might be a specific value of a function, or the statement of a "
+"definition. Very few WeBWorK problems fall into this category."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:93
 msgid "Proctor"
 msgstr "Surveillant"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:282
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:92
 msgid "Proctor Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:258
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:71
 msgid "Proctor Username"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:193
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:3
+msgid "Proctor authorization requested for a nonexistent set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:8
 msgid "Proctor authorization required."
 msgstr "Connexion autorisée requise."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:231
-msgid "Proctored Gateway Quiz %2"
-msgstr "Test passerelle avec surveillance %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:88
+msgid "Proctor:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:265
+msgid "Proctored Test %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:272
+msgid "Proctored Test %2 Proctor Login"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:241
-msgid "Proctored Gateway Quiz %2 Proctor Login"
-msgstr "Test passerelle avec surveillance %2 Connexion autorisée"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:318
+msgid ""
+"Proctored tests always require authorization to start the test. \"Both Start"
+" and Grade\" will require login proctor authorization to start and grade "
+"proctor authorization to grade. \"Only Start\" requires grade proctor "
+"authorization to start and no authorization to grade."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:981
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:18
 msgid ""
-"Proctored tests require proctor authorization to start and to grade.  "
 "Provide a password to have a single password for all students to start a "
 "proctored test."
-msgstr "Les tests avec surveillance nécessitent une authentification supplémentaire avant que l'on ne  puisse commencer. Spécifiez un mot de passe afin de fournir le même mot de passe à tous les étudiants qui accéderont à ce test."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:56
 msgid "Publish"
 msgstr "Publier"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:31
+msgid ""
+"Quick access to many instructor tools, including <strong>Reset "
+"passwords</strong>, <strong>Act as student</strong>, <strong>Assign "
+"individual sets</strong> and <strong>Edit individual due dates</strong>."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "RECITATION"
 msgstr "TP"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1333
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:199
 msgid "Randomize"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:13
 msgid "Randomize Seed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:101
 msgid "Read only"
 msgstr "Lecture seule"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:67
 msgid "Really delete the items listed above?"
 msgstr "Voulez-vous vraiment supprimer les éléments énumérés ci-dessus? "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:201
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:212
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:804
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2038
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:298
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:832
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:861
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:890
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:919
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:184
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:42
 msgid "Recitation"
 msgstr "Travaux pratiques "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:194
+#. ($recitation)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:125
+msgid "Recitation %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:21
+msgid "Recitation:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:38
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:46
 msgid "Record Scores for Single Sets"
 msgstr "Créer des fichiers .csv pour chacun des devoirs sélectionnés"
 
-#. ($studentName)
-#. ($self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:183
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:190
+#. ($studentID)
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:8
 msgid "Record for user %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Reduced Scoring"
 msgstr "Période de grâce d'évaluation"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:67
 msgid "Reduced Scoring Date"
 msgstr "Date de début de la période de grâce d'évaluation"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2523
-msgid "Reduced Scoring Disabled"
-msgstr "Période de grâce d'évaluation désactivée"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2522
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
 msgid "Reduced Scoring Enabled"
 msgstr "Période de grâce d'évaluation activée"
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:33
+msgid "Reduced Scoring Period"
+msgstr ""
+
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:314
 msgid "Reduced credit can still be earned until %1."
 msgstr "Pointage réduit disponible jusqu'au %1."
 
 # Short for "Reduced Scoring:"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:32
 msgid "Reduced:"
 msgstr "Grâce :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:153
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:373
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:56
 msgid "Refresh"
 msgstr "Actualiser la page"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1646
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1943
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2000
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3713
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3755
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:56
 msgid "Refresh Listing"
 msgstr "Actualiser le contenu"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:190
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:200
 msgid "Relax IP restrictions when?"
 msgstr "Quand voulez-vous assouplir les restrictions par adresse IP?"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:88
+msgid "Reload the page to see backup files that have been made."
+msgstr ""
+
 # Context is "Attempts Remaining"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:14
 msgid "Remaining"
 msgstr "Restants"
 
 #. ('00:00:00')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:254
 msgid "Remaining time: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:61
 msgid "Remember Me"
 msgstr "Se souvenir de moi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:546
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:514
 msgid "Remember to return to your original problem when you're finished here!"
 msgstr "N'oubliez pas de revenir à votre problème original lorsque vous avez terminé!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1020
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:466
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:72
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:41
 msgid "Rename"
 msgstr "Renommer"
 
 #. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1302
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:62
 msgid "Rename %1 to %2"
 msgstr "Renommer %1 par %2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:378
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:927
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:73
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:34
 msgid "Rename Course"
 msgstr "Renommer un cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:17
+msgid "Rename Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:22
+msgid "Rename Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
 msgid "Rename file as:"
 msgstr "Renommer le fichier :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2727
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:463
 msgid "Render"
 msgstr "Afficher"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:344
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:59
 msgid "Render All"
 msgstr "Voir les énoncés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2720
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:461
 msgid "Render Problem"
 msgstr "Voir l'énoncé"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2501
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:60
+msgid ""
+"Render all problems on the page. This does not reload the page or save or "
+"reset changes."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:106
+msgid ""
+"Render or re-render the problem, course info file, or set header being "
+"edited. This does not change the permanent file on the disk. You can view "
+"different versions of the same problem by changing the seed. You can also "
+"change the manner in which the mathematics is typeset. If \"Open in new "
+"window\" is checked, then the problem will open in a new tab or window "
+"showing the problem as it will be rendered for students in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:132
+msgid "Rendering Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:341
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:53
 msgid "Renumber Problems"
 msgstr "Renuméroter les problèmes "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:55
 msgid ""
-"Reopens any gateway test for an additional 24 hours. This allows you to take"
-" a test even if the close date has past. This item does not allow you to "
-"take additional versions of the test."
-msgstr "Réouvrir toute les passerelles de test pour un 24 heures additionnelles. Cela permettra d'effectuer un test même si la date de fermeture est dépassée. Cela ne vous permet pas d'effectuer d'autre version du test."
+"Renumber problems consecutively starting from 1. This renumbering is not "
+"saved until \"Save Changes\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:103
+msgid ""
+"Renumber problems in the set consecutively starting from one. In the process"
+" of deleting problems, the numbering can be made non-consecutive. This is "
+"useful to clean up the problem numbering."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:31
+msgid ""
+"Reopens any test for an additional 24 hours. This allows you to take a test "
+"even if the close date has past. This item does not allow you to take "
+"additional versions of the test."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:118
+msgid "Reordering Problems"
+msgstr ""
 
-#. (CGI::strong(                                                   CGI::span({
-#. dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1829
+#. (tag(                                           'strong',
+#. c(                                                      tag('span', dir =>
+#. 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:58
 msgid "Replace current problem: %1"
 msgstr "Remplacer ce problème&#8239;: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:13
 msgid "Replace which users?"
 msgstr "Remplacer quels utilisateurs? "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:637
+#. ($composite_id, $oldUser->status)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:448
+msgid "Replacing old data for %1: status: %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:42
 msgid "Reply-To:"
 msgstr "Répondre à :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:528
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:123
 msgid "Report Bugs in this Problem"
 msgstr "Signaler un bogue dans ce problème"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1073
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:305
 msgid "Report bugs"
 msgstr "Signaler un bogue"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:128
+msgid ""
+"Report bugs in a WeBWorK question/problem using this link. The very first "
+"time you do this you will need to register with an email address so that "
+"information on the bug fix can be reported back to you."
+msgstr ""
+
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2825
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1530
 msgid "Report for course %1:"
 msgstr "Rapport du cours %1 :"
 
-#. ($rename_oldCourseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2122
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:3
 msgid "Report on database structure for course %1:"
 msgstr "Rapport de la base de données du cours %1 :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1829
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:8
 msgid "Request New Version"
 msgstr "Obtenir une nouvelle version"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2246
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2321
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:19
 msgid "Request information"
 msgstr "Informations demandées"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1972
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1220
 msgid "Request new version now."
 msgstr "Obtenir une nouvelle version maintenant."
 
+#. ($setName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:486
+msgid ""
+"Requested set \"%1\" is a proctored test, but no valid proctor authorization"
+" has been obtained."
+msgstr ""
+
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:399
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:422
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:425
 msgid "Requested set '%1' could not be found in the database for user %2."
 msgstr "Le devoir demandé '%1' n'a pu être trouvé dans la base de données pour l'utilisateur %2."
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:469
-msgid ""
-"Requested set '%1' is a homework assignment but the gateway/quiz content "
-"generator %2 was called.  Try re-entering the set from the problem sets "
-"listing page."
-msgstr "L'évaluation '%1' est définie comme un type <i>Devoir</i>, mais vous avez demandé d'afficher une évaluation de type <i>Quiz</i>. Veuillez modifier les paramètres de votre évaluation ou cliquer sur le devoir à partir de la page principale du cours sur WeBWorK."
-
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:484
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:472
 msgid ""
-"Requested set '%1' is a proctored test/quiz assignment, but no valid proctor"
-" authorization has been obtained."
-msgstr "Le devoir demandé '%1' est un test avec surveillance, mais aucun contrôle d'autorisation valide n'a été obtenu."
+"Requested set '%1' is a homework assignment but the test content generator "
+"%2 was called.  Try re-entering the set from the problem sets listing page."
+msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:463
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:466
 msgid ""
-"Requested set '%1' is a test/quiz assignment but the regular homework "
-"assignment content generator %2 was called.  Try re-entering the set from "
-"the problem sets listing page."
-msgstr "L'évaluation '%1' est définie comme un type <i>Quiz</i>,  mais vous avez demandé d'afficher une évaluation de type <i>Devoir</i>. Veuillez modifier les paramètres de votre évaluation ou cliquer sur le quiz à partir de la page principale du cours sur WeBWorK."
+"Requested set '%1' is a test but the regular homework assignment content "
+"generator %2 was called.  Try re-entering the set from the problem sets "
+"listing page."
+msgstr ""
 
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:420
 msgid "Requested set '%1' is not assigned to user %2."
 msgstr "Le devoir demandé '%1' n'est pas attribué à l'utilisateur %2."
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:450
 msgid "Requested set '%1' is not available yet."
 msgstr "Le devoir demandé '%1' n'est pas encore disponible."
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:441
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:444
 msgid "Requested set '%1' is not yet open."
 msgstr "Le devoir demandé '%1' n'est pas encore disponible."
 
 #. ($verNum,				$setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:404
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:407
 msgid "Requested version (%1) of set '%2' can not be directly accessed."
 msgstr ""
 
 #. ($verNum, $setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:397
 msgid "Requested version (%1) of set '%2' is not assigned to user %3."
 msgstr "La version (%1) demandée du devoir '%2' n'est pas attribuée à l'utilisateur %3. "
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:308
+msgid "Require Proctor Authorization to"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:45
 msgid "Require users to log in through the LMS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:420
 msgid "Rerandomize after"
 msgstr "Régénérer après "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:104
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2280
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2968
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:195
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:696
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:47
 msgid "Reset Form"
 msgstr "Réinitialiser le formulaire"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:610
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:27
 msgid "Resets the number of incorrect attempts on a single homework problem."
 msgstr "Réinitialise le nombre de tentatives non réussies pour un problème dans un devoir. "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2453
-msgid ""
-"Restores a course from a gzipped tar archive (.tar.gz). After unarchiving, "
-"the course database is restored from a subdirectory of the course's DATA "
-"directory. Currently the archive facility is only available for mysql "
-"databases. It depends on the mysqldump application."
-msgstr "Rétablir le cours à partir d'une rachive gzipped tar (.tar.gz). Après l'avoir désarchivé, la base de données du cours sera rétablie à partir d'un sous-répertoire du répertoire DATA du cours. présentement, le système d'archives n'est disponible que pour les bases de données mysql. Cela dépend de l'application mysqldump."
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:41
+msgid "Restore a .tar.gz archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:40
+msgid "Restore backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:39
+msgid "Restore backup from %1"
+msgstr ""
+
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+msgid "Restored backup from %1."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:178
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:188
 msgid "Restrict Access by IP"
 msgstr "Limiter l'accès par adresse IP"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:912
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep:11
 msgid "Restrict Locations"
 msgstr "Limiter les emplacements "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:286
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:324
 msgid "Restrict Problem Progression"
 msgstr "Limiter la progression des problèmes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:184
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:194
 msgid "Restrict To"
 msgstr "Limiter à"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:154
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:33
+msgid "Restrict or sort the students displayed"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:159
 msgid "Restrict release by set(s)"
 msgstr "Restriction d'accès par devoir(s) "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2090
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:299
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:291
 msgid "Result"
 msgstr "Résultat"
 
-#. (CGI::i($self->$actionHandler(\%genericParams, \%actionParams,
-#. \%tableParams)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:388
+#. ($c->tag('i', $c->$actionHandler)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:228
 msgid "Result of last action performed: %1"
 msgstr "Résultat de la dernière action effectuée : %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:309
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:300
 msgid "Results for this submission"
 msgstr "Résultats pour cette tentative"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:363
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:236
 msgid "Results of last action performed"
 msgstr "Résultats de la dernière action effectuée "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:125
 msgid "Results of last action performed: "
 msgstr "Résultats de la dernière action effectuée :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1725
-msgid "Resurrect which Gateway?"
-msgstr "Rétablir quelle passerelle?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:51
+msgid "Resurrect which test?"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1449
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:669
 msgid "Retitled"
 msgstr "Rebaptiser"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:17
 msgid "Return to your work"
 msgstr "Retournez au travail"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:686
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:132
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:16
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:166
 msgid "Revert"
 msgstr "Restaurer"
 
-#. (CGI::span({ dir => 'ltr' }, $self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2069
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:83
 msgid "Revert to %1"
 msgstr "Revenir à %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1431
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1513
+#. ($c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1220
+msgid "Reverted to original file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:168
+msgid ""
+"Reverts to the copy of the file saved on the disk or to a backup file. All "
+"unsaved editing changes will be lost. This option is only active when a "
+"temporary file or a backup file exists. You may also delete backups that "
+"have been made with this tab."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:182
+msgid "Review of column functions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:145
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:85
 msgid ""
 "Reviewing a problem and looking at both the average Attempts and  average "
 "Status should give instructors valuable information about the difficulty of "
 "the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:55
 msgid "Reward used successfully!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:180
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:4
 msgid "Rewards"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:27
 msgid "Ring of Reduction"
 msgstr "L'anneau de réduction"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:322
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:26
 msgid "Robe of Longevity"
 msgstr "La robe de longévité"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "SECTION"
 msgstr "GROUPE"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:214
 msgid "SET NAME"
 msgstr "NOM DU DEVOIR"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:321
 msgid "STATUS"
 msgstr "STATUT"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "STUDENT ID"
 msgstr "ID ÉTUDIANT"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:43
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:263
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:170
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:687
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:847
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:220
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:85
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:207
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:123
 msgid "Save"
 msgstr "Enregistrer"
 
-#. (CGI::b($self->shortPath($self->{sourceFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:438
+#. (tag('b', $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_form.html.ep:2
 msgid "Save %1"
 msgstr "Sauvegarder %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:44
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:695
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:134
 msgid "Save As"
 msgstr "Enregistrer sous"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:744
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2963
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:194
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:695
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:37
 msgid "Save Changes"
 msgstr "Sauvegarder les modifications"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:60
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:76
 msgid "Save Edit"
 msgstr "Sauvegarder l'édition"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
 msgid "Save Export"
 msgstr "Sauvegarder l'exportation"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:92
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
 msgid "Save Password"
 msgstr "Sauvegarder le mot de passe"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:188
 msgid "Save as"
 msgstr "Enregistrer sous "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:872
-msgid "Save as Default"
-msgstr "Enregistrer par défaut"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:481
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:5
 msgid "Save as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1558
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:254
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1443
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_password_form.html.ep:1
 msgid "Save changes"
 msgstr "Sauvegarder les modifications"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1794
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:33
 msgid "Save file to:"
 msgstr "Enregistrer le fichier sous :"
 
-#. (CGI::b({ dir => 'ltr' }, $self->shortPath($self->{editFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1605
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:125
+msgid ""
+"Save the contents of the editor window to the file on disk and re-render the"
+" problem. If \"Open in new window\" is checked, then the problem will open "
+"in a new tab or window showing the problem as it will be rendered for "
+"students in the set. If \"Create backup\" is checked then a backup of the "
+"current file on disk will be created before overwriting it with the contents"
+" of the editor window. If a backup already exists, then a \"Delete oldest "
+"backup\" check box will be present. If that is checked, then the oldest "
+"backup will be deleted when \"Save\" is clicked. These backups can be "
+"reverted to and managed on the \"Revert\" tab."
+msgstr ""
+
+#. (tag('b', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:6
 msgid "Save to %1 and View"
 msgstr "Enregistrer sous %1 et afficher"
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:396
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1165
-msgid "Saved to file '%1'"
-msgstr "Le fichier '%1' a été enregistré."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:50
+msgid "Saved answers"
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#. ($outputFilePath =~ s/$ce->{courseDirs}{templates}/[TMPL]/r)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:549
+msgid "Saved to file \"%1\""
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1180
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2116
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2292
 msgid "Schema and database field definitions do not agree"
 msgstr "Les définitions des champs de la base de données et les schémas ne sont pas en accord"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4284
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2279
 msgid "Schema and database table definitions do not agree"
 msgstr "Les définitions des tableaux de la base de données et les schémas ne sont pas en accord"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:404
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:465
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:660
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:147
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:161
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:78
 msgid "Score"
 msgstr "Résultats"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:125
 msgid "Score (%)"
 msgstr "Note (%)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:161
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:60
+msgid ""
+"Score one or more sets. This can also be done from the \"Hmwk Sets Editor\" "
+"or from the \"Instructor Tools\", but the \"Scoring Tools\" page allows "
+"control over parameters."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:170
 msgid "Score required for release"
 msgstr "Condition de note requise"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:228
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:58
 msgid "Score selected set(s) and save to:"
 msgstr "Enregistrer les rapports d'évaluation des devoirs sélectionnés sous :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2085
-msgid "Score summary for last submit:"
-msgstr "Sommaire des résultats à la dernière tentative&#8239;:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:284
+msgid "Score summary for last submission:"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:2
 msgid "Score which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:978
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:2
 msgid "Score which sets?"
 msgstr "Afficher les résultats de quels devoirs? "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
 msgid "Scores"
 msgstr "Notes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:487
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:66
+msgid "Scoring (\".csv\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:396
 msgid "Scoring Download"
 msgstr "Télécharger les résultats"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:161
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:115
 msgid "Scoring Message"
 msgstr "Message associé aux résultats"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:478
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:391
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:58
 msgid "Scoring Tools"
 msgstr "Exporter les résultats"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2460
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:17
+msgid "Scoring Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:327
 msgid ""
 "Screen and Hardcopy set header information can not be overridden for "
 "individual students."
 msgstr "L'entête d'un devoir pour un étudiant ne peut pas être différent de celui pour l'ensemble de la classe."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:26
 msgid "Scroll of Resurrection"
 msgstr "Parchemin de la résurection"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:189
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:200
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:211
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:793
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2029
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:297
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:831
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:860
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:889
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:918
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:157
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:178
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:38
 msgid "Section"
 msgstr "Groupe "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:653
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:802
+#. ($section)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:122
+msgid "Section %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:30
 msgid "Section:"
 msgstr "Section :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:436
 msgid "Seed"
 msgstr "Seed"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:114
 msgid "Select"
 msgstr "Sélectionner"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:505
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:20
+msgid ""
+"Select Users from the left column and sets from the right column and assign "
+"or unassign the given sets. The list of users or the list of sets can be "
+"reordered under the \"sort\" option or the format of the user or set list.  "
+"Additionally, the set lists can be filtered (by section number or "
+"recitation).  The displayed user and set lists will only be updated upon "
+"clicking \"Change Display Settings\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:11
 msgid "Select a Homework Set"
 msgstr "Choisir un devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:14
 msgid "Select a Problem Collection"
 msgstr "Choisir un répertoire de problèmes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:18
 msgid "Select a Set Definition File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1028
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:14
 msgid "Select a Set from this Course"
 msgstr "Choisir un devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1659
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:20
+msgid ""
+"Select a course to create a .tar.gz archive of, which contains a dump of the"
+" database and all course files (templates, configuration files, etc).  Each "
+"course can only have a single archive.  Creating an archive of a previously "
+"archived course will delete the old archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:36
 msgid "Select a course to delete."
 msgstr "Choisir un cours à supprimer."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:946
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:20
+msgid ""
+"Select a course to delete.  Warning, all data will be deleted and this "
+"cannot be undone.  This will not delete any course archives."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:14
 msgid ""
 "Select a course to rename.  The courseID is used in the url and can only "
 "contain alphanumeric characters and underscores. The course title appears on"
 " the course home page and can be any string."
 msgstr "Choisir un cours à renommer. L'identifiant du cours est utilisé dans l'URL et peut contenir seulement des caractères alphanumériques sans accents ni tirets. Le titre du cours, quant à lui, apparaît sur la page d'accueil du cours et peut contenir n'importe quelle chaîne de caractères."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2475
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:13
 msgid "Select a course to unarchive."
 msgstr "Choisir un cours à désarchiver."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1914
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3684
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:21
 msgid "Select a listing format:"
 msgstr "Choisir l'ordre d'affichage de la liste :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1442
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1478
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:18
+msgid "Select action:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:10
 msgid "Select all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2703
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:12
 msgid "Select all eligible courses"
 msgstr "Sélectionner tous les cours admissibles"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2731
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:26
 msgid "Select all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1967
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:10
 msgid "Select all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:315
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:509
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:536
-msgid "Select an action to perform"
-msgstr "Choisir une action à effectuer "
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3063
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:10
 msgid "Select an action to perform:"
 msgstr "Choisir une action à effectuer :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1956
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:20
+msgid ""
+"Select an archive to restore.  You cannot restore an archive into an "
+"existing course. Instead, either rename or delete the old course, or restore"
+" the archive with a new name.  When restoring a course with a new name, the "
+"name is used as the course ID, and must contain only letters, numbers, "
+"hyphens, and underscores, and may have at most 40 characters."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:36
 msgid "Select course(s) to archive."
 msgstr "Choisir le(s) cours à archiver."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3731
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:44
 msgid "Select course(s) to hide or unhide."
 msgstr "Choisir le(s) cours à cacher ou afficher."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:7
 msgid "Select import file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:14
 msgid ""
 "Select one or more sets and one or more users below to assign/unassign each "
 "selected set to/from all selected users."
 msgstr "Choisir un ou plusieurs devoirs et un ou plusieurs utilisateurs pour attribuer ou retirer chaque devoir sélectionné aux utilisateurs sélectionnés."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:94
 msgid "Select sets below to assign them to the newly-created users."
 msgstr "Choisir dans la liste de devoirs ceux qui seront attribués aux étudiants ajoutés. Pour sélectionner plusieurs devoirs, maintenir enfoncée la touche CTRL du clavier."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3666
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:20
+msgid ""
+"Select the course to change its Course ID, Course Title, or Institution.  "
+"Note that changing a course's ID will change the URL of all links to the "
+"course, and could break links from external sites such as an LMS."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:4
 msgid ""
 "Select the course(s) you want to hide (or unhide) and then click \"Hide "
 "Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
@@ -5435,133 +7245,230 @@ msgid ""
 "full URL address for the course."
 msgstr "Choisir le(s) cours à cacher (ou rendre visible) et appuyer sur \"cacher\" (ou \"visible\"). Cacher un cours déjà caché ne cause pas de problème (l'action est ignorée). Dans le même ordre d'idée, rendre visible un cours déjà visible ne cause pas de problème (l'action est ignorée). Les cours cachés sont toujours actifs mais n'apparaissent pas dans la list des cours WeBWorK sur la page d'ouverture. Pour accéder à un cours caché, l'enseignant ou l'étudiant doit connaitre le lien d'accès URL du cours."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:488
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:20
+msgid ""
+"Select the course(s) you want to hide (or unhide) and then click \"Hide "
+"Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
+"does no harm (the action is skipped). Likewise unhiding a course that is "
+"already visible does no harm (the action is skipped). Hidden courses are "
+"still active but are not listed in the list of WeBWorK courses on the "
+"opening page. To access the course, an instructor or student must know the "
+"full URL address for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:93
+msgid "Select the display mode used to render the problems on this page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:11
 msgid ""
 "Select the homework sets for which to generate hardcopy versions. You may "
 "also select multiple users from the users list. You will receive hardcopy "
 "for each (set, user) pair."
 msgstr "Choisir le ou les devoirs pour lesquels il faut générer des versions imprimables. Vous pouvez également sélectionner plusieurs utilisateurs dans la liste. Un document imprimable sera généré pour chacune des paires devoir/utilisateur."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:238
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:30
+msgid ""
+"Select the sets you want scored, choose the name of the export file you want"
+" to use (by default: %1), and then click the \"Score Selected Set(s) and "
+"save to\" button."
+msgstr ""
+
+#. ('<code>ful.csv</code>','<code>scr.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:49
+msgid ""
+"Select this if you want to save the scores for each set in a separate file "
+"in addition to saving all scores to a cumulative file. After clicking the "
+"\"Score Selected Set(s) and save to\" button, you will get a pair of links "
+"for each selected set. The file that ends with %1 contains the number of "
+"correct and incorrect tries about each individual problem for each student. "
+"The file that ends with %2 is a summary of each problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:19
 msgid ""
 "Select user(s) and/or set(s) below and click the action button of your "
 "choice."
 msgstr "Sélectionner des utilisateurs ou des devoirs ci-dessous et cliquer sur le bouton d'action de votre choix."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2885
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:85
+msgid ""
+"Select which assignment types (homework, tests, just-in-time) the "
+"achievement is evaluated."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:20
+msgid ""
+"Select which courses to upgrade from a previous version of WeBWorK.  The "
+"upgrade process can add missing database columns, delete unused database "
+"columns, and check the course file structure.  Be sure to read over the "
+"changes before confirming the upgrade.  You may want to create an archive of"
+" the course before upgrading.  Only courses that need upgraded will be "
+"selectable."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:84
+msgid "Select your favorite theme for the large text window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:18
 msgid "Select/unselect all fields missing in schema for deletion."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2873
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:9
 msgid "Select/unselect all tables missing in schema for deletion."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:23
 msgid "Selected sets:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:57
 msgid "Send E-mail"
 msgstr "\tEnvoyer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:839
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:83
 msgid "Send Email"
 msgstr "Envoyer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:702
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:69
+msgid "Send email to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:54
+msgid "Send emails to selected instructors."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:59
 msgid "Send to all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:717
-msgid "Send to the students selected below"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:64
+msgid "Send to selected students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:402
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:7
 msgid "Set"
 msgstr "Devoirs"
 
 #. ($newSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:614
 msgid "Set %1 has been created."
 msgstr "Le devoir %1 a été créé."
 
-#. ($newSetName,$userName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1944
+#. ($newSetName, $userName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:616
 msgid "Set %1 was assigned to %2"
 msgstr "Le devoir %1 a été attribué à %2."
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1239
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:567
 msgid "Set %1 was assigned to %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:415
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:354
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:42
 msgid "Set Assigner"
 msgstr "Gestionnaire de devoirs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:420
-msgid "Set Definition Filename"
-msgstr "Fichier de définition du devoir"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:17
+msgid "Set Assigner Help"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:45
 msgid "Set Definition Files"
 msgstr "Fichiers de définition des devoirs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2318
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2329
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:218
 msgid "Set Description"
 msgstr "Description du devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:17
+msgid "Set Detail Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:333
 msgid "Set Detail for set %2"
 msgstr "Données du devoir %2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:93
 msgid "Set Header"
 msgstr "Entête du devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:323
+msgid "Set Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:218
 msgid "Set ID"
 msgstr "Devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:267
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:114
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:3
 msgid "Set Info"
 msgstr "Informations sur le devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2744
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:19
 msgid "Set List"
 msgstr "Liste des devoirs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1111
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1209
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1320
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:164
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:262
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:353
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:448
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:546
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:659
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:776
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:895
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:995
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:762
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:809
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:7
 msgid "Set Name"
 msgstr "Nom du devoir"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:186
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:18
+msgid "Set closes on %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:45
+msgid "Set definition (\".def\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:20
+msgid "Set is closed."
+msgstr ""
+
+#. ($c->formatDateTime($set->reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:16
+msgid "Set is due on %1."
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:14
+msgid "Set opens on %1."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:188
 msgid "Set random seed to:"
 msgstr "Définir la source aléatoire à:"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2029
+#: /opt/webwork/webwork2/conf/defaults.config:1930
 msgid ""
 "Set to true for log to mean base 10 log and false for log to mean natural "
 "logarithm."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2049
+#: /opt/webwork/webwork2/conf/defaults.config:1950
 msgid ""
 "Set to true to allow students to enter Unicode versions of some characters "
 "(like U+2212 for the minus sign) in their answers.  One reason to allow this"
@@ -5570,7 +7477,7 @@ msgid ""
 "directory from the keyboard."
 msgstr "Mettre à vrai pour permettre à l'étudiant d'inscrire la version Unicode de certains caractères dans leur réponse (ex, U+2212 pour le signe moins). Le copier et coller de rendu par MathJax peut introduire ce type de caractères, mais cela est aussi de plus en plus simple d'introduire ces caractères par le clavier."
 
-#: /opt/webwork/webwork2/conf/defaults.config:2019
+#: /opt/webwork/webwork2/conf/defaults.config:1920
 msgid ""
 "Set to true to display the \"Entered\" column which automatically shows the "
 "evaluated student answer, e.g., 1 if student input is sin(pi/2). If this is "
@@ -5579,7 +7486,7 @@ msgid ""
 " answer."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2060
+#: /opt/webwork/webwork2/conf/defaults.config:1961
 msgid ""
 "Set to true to have Full Width Unicode character (U+FF01 to U+FF5E) "
 "converted to their ASCII equivalents (U+0021 to U+007E) automatically in "
@@ -5587,22 +7494,32 @@ msgid ""
 "automatically use Full Width characters for parentheses and commas."
 msgstr "Mettre à vrai pour obtenir la conversion complète de l'Unicode (U+FF01 à U+FF5E) en ASCII (U+0021 à U+007E) automatiquement dans MathObjects. Cela peut être pratique pour les clavier chinois, par exemple, dans l'utilisation des parenthèses et des virgules."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:521
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:164
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:16
+msgid "Set values"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/siblings.html.ep:4
 msgid "Sets"
 msgstr "Devoirs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:352
-msgid "Sets Assigned to User"
-msgstr "Devoirs attribués à un utilisateur"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:343
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:322
 msgid "Sets assigned to %1"
 msgstr "Devoirs attribués à %1"
 
+#. ($userName, $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:90
+msgid "Sets assigned to %1 (%2)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:17
+msgid "Sets assigned to student Help"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:57
 msgid ""
 "Sets how grades will be passed back from WeBWorK to the "
@@ -5614,189 +7531,241 @@ msgid ""
 "links from the LMS must be problem set specific. For example, "
 "<code>webwork.myschool.edu/webwork2/course-name/problem_set_name</code>. If "
 "the problem set name has space characters, they should be underscores in "
-"these addresses. If the problem set is a quiz, it must have this format: "
-"<code>webwork.myschool.edu/webwork2/course-"
-"name/quiz_mode/problem_set_name</code>. Also, to initialize the "
-"communication between WeBWorK and the LMS, the user must follow each of "
-"these external learning tools at least one time. Since there must be a "
-"separate external tool link for each problem set, this option requires more "
-"maintenance of the LMS course.</dd></dl>"
+"these addresses. Also, to initialize the communication between WeBWorK and "
+"the LMS, the user must follow each of these external learning tools at least"
+" one time. Since there must be a separate external tool link for each "
+"problem set, this option requires more maintenance of the LMS "
+"course.</dd></dl>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1458
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:55
+msgid "Sets the order in which achievements are listed and evaluated."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:625
 msgid "Sets were selected for export."
 msgstr "Les devoirs ont été sélectionnés pour être exportés."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:726
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:36
 msgid "Setting"
 msgstr "Paramètre"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1332
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:39
 msgid "Shift dates so that the earliest is"
 msgstr "Modifier les dates pour que la date d'ouverture soit "
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:32
+msgid "Show"
+msgstr ""
+
 #. ($numchild)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1301
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:32
 msgid "Show %1 more like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:326
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:107
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:39
 msgid "Show Correct Answers"
 msgstr "Montrer les réponses corrects"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:22
 msgid "Show Date & Size"
 msgstr "Voir la date et la taille"
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:86
 msgid "Show LTI parameters (for debugging)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:620
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:34
 msgid "Show Me Another"
 msgstr "Montrer un autre problème"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2518
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2412
+#. ($exhausted)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:69
+msgid "Show Me Another %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1642
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:711
 msgid "Show Past Answers"
 msgstr "Voir les réponses précédentes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:703
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:41
+msgid "Show Problem Source File"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:132
 msgid "Show Problem Source File:"
 msgstr "Montrer le fichier source du problème:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
 msgid "Show Problems on Finished Tests"
 msgstr "Permettre de voir les problèmes lorsque le test est terminé"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
-msgid "Show Scores on Finished Assignments?"
-msgstr "Permettre de voir son résultat lorsque le test est terminé"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+msgid "Show Scores on Finished Tests"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2416
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:630
 msgid "Show Solutions"
 msgstr "Voir les solutions"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/conf/defaults.config:1538
 msgid "Show Total Homework Grade on Grades Page"
 msgstr "Montrer le total obtenu dans le cours sur la page des résultats"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1266
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:77
 msgid "Show all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1380
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:91
 msgid "Show all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2404
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:621
 msgid "Show correct answers"
 msgstr "Voir les bonnes réponses"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1299
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+msgid "Show hints after"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:30
 msgid "Show less like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:337
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:387
 msgid "Show me another"
 msgstr "Montrer un autre problème"
 
-#. ($exhausted)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1926
-msgid "Show me another %1"
-msgstr "Montrer un autre problème %1"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:20
+msgid ""
+"Show past answers.  Students can only see their past answers, and they will "
+"not be able to see which parts are correct.  Instructors can use the form to"
+" select any combination of users, sets, and problems to view.  The table "
+"below will list the past answers colored according to correctness (green is "
+"correct).  Use control + click to select multiple users, sets, or problems."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2428
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:639
 msgid "Show problem graders"
 msgstr "Montrer le gestionnaire de pointage"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:105
 msgid "Show saved answers?"
 msgstr "Montrer les réponses enregistrées?"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1860
+#: /opt/webwork/webwork2/conf/defaults.config:1762
 msgid ""
 "Show the correct answer to the current problem before re-randomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1862
+#: /opt/webwork/webwork2/conf/defaults.config:1764
 msgid ""
 "Show the correct answer to the current problem on the last attempt before a "
 "new version is requested."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:3
 msgid "Show which sets?"
 msgstr "Afficher quels devoirs? "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:690
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:3
 msgid "Show which users?"
 msgstr "Quels utilisateurs voulez-vous afficher?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:382
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:475
-msgid "Show/Hide Site Description"
-msgstr "Afficher/cacher la description de la page"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:622
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:11
 msgid "Show:"
 msgstr "Voir :"
 
-#. (scalar @{ $self->{visibleSetIDs} },			scalar @{ $self->{allSetIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:594
+#. (scalar @{ $c->{visibleSetIDs} },			scalar @{ $c->{allSetIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:115
 msgid "Showing %1 out of %2 sets."
 msgstr "%1 devoirs affichés sur %2 devoirs."
 
-#. (scalar @Users, scalar @{ $self->{allUserIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:610
+#. (scalar(keys %{ $c->{visibleUserIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:80
 msgid "Showing %1 out of %2 users"
 msgstr "%1 utilisateurs affichés sur un total de %2."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:70
 msgid "Showing all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1355
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:81
 msgid "Showing all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:61
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:64
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:67
+#. ($c->{merge_file}, $ur->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:5
+msgid "Showing data from merge file %1 for user %2:"
+msgstr ""
+
+#. ($c->{merge_file})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:147
+msgid "Showing data from merge file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:61
+msgid "Showing problem for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:7
+msgid "Showing statistics for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:33
+msgid ""
+"Shows how many instructors and students have been assigned this problem set,"
+" out of the total number in the class. Clicking on this link allows you to "
+"assign the set to users, unassign this set from users, and to individually "
+"edit the assignment for specific users. For changing dates for individual "
+"users there are also shortcuts from the \"Instructor Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:63
 msgid "Site Information"
 msgstr "Informations sur le site"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:88
 msgid "Skip archiving this course"
 msgstr "Ignorer l'archivage du cours"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2080
+#: /opt/webwork/webwork2/conf/defaults.config:1981
 msgid "Skip explanation essay answer fields"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1556
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1557
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:81
+msgid "Snippets of PG code illustrating specific techniques"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1514
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1515
 msgid "Solution:"
 msgstr "Solution :"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1555
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1513
 msgid "Solution: "
 msgstr "Solution:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:432
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:57
 msgid "Solutions"
 msgstr "Solutions"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1350
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:20
+msgid ""
+"Some OPL problems have been rated for difficulty/educational objective. The "
+"levels are loosely inspired by Bloom's taxonomy. They are assigned numbers "
+"from 1 to 6 as follows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:185
 msgid ""
 "Some WeBWorK problems are programmed using what are called <i>Math "
 "Objects</i>. These problems are preferred by some people because they "
@@ -5804,18 +7773,18 @@ msgid ""
 "particularly for answers which are way off base."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:379
 msgid "Some answers will be graded later."
 msgstr "Certaines réponses seront enregistrées plus tard."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:60
 msgid ""
 "Some of these files are directories. Only delete directories if you really "
 "know what you are doing. You can seriously damage your course if you delete "
 "the wrong thing."
 msgstr "Certains de ces fichiers sont des répertoires. Vous pouvez supprimer des répertoires seulement si vous êtes bien conscient de ce que vous supprimez. Sinon, vous pouvez endommager votre cours."
 
-#: /opt/webwork/webwork2/conf/defaults.config:2082
+#: /opt/webwork/webwork2/conf/defaults.config:1983
 msgid ""
 "Some problems have an explanation essay answer field, typically following a "
 "simpler answer field. For example, find a certain derivative using the "
@@ -5827,7 +7796,7 @@ msgid ""
 "grading."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2186
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:83
 msgid ""
 "Some problems shown above represent multiple similar problems from the "
 "database.  If the (top) information line for a problem has a letter M for "
@@ -5837,300 +7806,396 @@ msgid ""
 "again."
 msgstr "Certains problèmes afficher plus haut représentes des problèmes similaire de la base de données. Si la première ligne d'information d'un problème affiche la lettre M pour \"plus\", survoler à l'aide du curseur le M pour visualiser combien de problèmes similaires sont cachés ou appuyer sur le M pour voir les problèmes. Si vous appuyez pour voir les problèmes, le M devient un L qui peut être appuyé pour cacher les problèmes à nouveau."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1612
-msgid ""
-"Some servers handle courses taking place in different timezones.  If this "
-"course is not showing the correct timezone, enter the correct value here.  "
-"The format consists of unix times, such as "
-"\"America/New_York\",\"America/Chicago\", \"America/Denver\", "
-"\"America/Phoenix\" or \"America/Los_Angeles\". Complete list: <a "
-"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
-msgstr "Some servers handle courses taking place in different timezones.  If this course is not showing the correct timezone, enter the correct value here.  The format consists of unix times, such as \"America/New_York\",\"America/Chicago\", \"America/Denver\", \"America/Phoenix\" or \"America/Los_Angeles\". Complete list: <a href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:50
+msgid "Sort"
+msgstr "Trier"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:529
-msgid ""
-"Something was wrong with your LTI parameters.  If this recurs, please speak "
-"with your instructor"
-msgstr "Un problème est survenu avec les paramètres LTI. Si la situation se reproduit, consulter l'enseignant"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
-msgid "Sort"
-msgstr "Trier"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:751
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:814
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:4
 msgid "Sort by"
 msgstr "Trier par  "
 
 #. ($names{$primary}, $names{$secondary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:817
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:324
 msgid "Sort by %1 and then by %2"
 msgstr "Trier par %1 et ensuite par %2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:171
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:115
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:3
 msgid "Sort:"
 msgstr "Trier :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:51
+msgid "Sorts the lists displayed by due date, name, etc."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:363
 msgid "Source File"
 msgstr "Fichier source "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1586
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1612
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1555
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1593
 msgid ""
 "Source file paths cannot include .. or start with /: your source file path "
 "was modified."
 msgstr "Le chemin vers un fichier source ne peut pas s'écrire avec les caractères .. ou commencer avec /:. Le chemin vers votre fichier source a été modifié."
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:11
 msgid ""
 "Specify an ID, title, and institution for the new course. The course ID may "
 "contain only letters, numbers, hyphens, and underscores, and may have at "
 "most %1 characters."
 msgstr "Spécifier une ID, un titre et une institution pour le nouveau cours. L'ID de cours peut contenir seulement des lettres, nombres, traits d'unions et barres de soulignement et peut avoir au plus %1 caractères."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:661
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:94
+msgid ""
+"Spell check the text of the file that your are editing. Note that there will"
+" be many spelling errors in the code parts of your file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:116
+msgid "Standard Deviation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:162
 msgid "Start"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:609
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:47
+msgid "Start LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:130
 msgid "Start New Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:443
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:94
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:508
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:84
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:54
 msgid "Statistics"
 msgstr "Statistiques"
 
-#. ($self->{ce}{courseName} =~ s/_/ /gr,                   CGI::span({ dir =>
-#. 'ltr' }, format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:73
-msgid "Statistics for %1 set %2. Closes %3"
-msgstr "Statistiques du cours %1 pour le devoir %2. Date d'échéance : %3"
-
-#. ($self->{ce}{courseName}, $self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:68
-msgid "Statistics for %1 student %2"
-msgstr "Statistiques du cours %1 pour l'étudiant %2"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2089
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1442
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1524
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2020
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:296
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:659
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:806
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:191
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:192
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:17
+msgid "Statistics Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:86
+msgid "Statistics for %1"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:90
+msgid "Statistics for %1 problem %2"
+msgstr ""
+
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:84
+msgid "Statistics for student %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:442
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:151
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:160
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:36
 msgid "Status"
 msgstr "Statut"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:29
 msgid "Stop Acting"
 msgstr "Retour à mon rôle normal"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2251
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:85
 msgid "Stop Archiving"
 msgstr "Arrêter l'archivage"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2418
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1153
 msgid "Stop archiving courses"
 msgstr "Arrêter l'archivage des cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:233
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:783
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2011
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:295
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:829
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:887
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:916
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:30
 msgid "Student ID"
 msgstr "Identifiant étudiant"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:9
+msgid "Student ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:37
 msgid "Student Name"
 msgstr "Nom"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:570
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:428
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:56
 msgid "Student Progress"
 msgstr "Progrès des étudiants"
 
-#. ($self->{ce}->{courseName},                     CGI::span({ dir => 'ltr' },
-#. format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:81
-msgid "Student Progress for %1 set %2. Closes %3"
-msgstr "Progrès des étudiants pour %1 devoir %2. Date d'échéance : %3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:17
+msgid "Student Progress Help"
+msgstr ""
+
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:72
+msgid "Student Progress for %1"
+msgstr ""
 
-#. ($self->{ce}->{courseName}, $self->{studentName})
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($c->stash('setID')
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:76
-msgid "Student Progress for %1 student %2"
-msgstr "Progrès individuel de %2 pour %1"
+msgid "Student Progress for set %1"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:628
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:80
 msgid "Student answers"
 msgstr "Réponses de l'étudiant"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:766
-msgid "Subject:"
-msgstr "Sujet :"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:80
+msgid ""
+"Student scores for the sets selected below will be calculated. This and "
+"other scoring operations can also be done using the \"Scoring Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:87
+msgid "Student:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:124
+msgid "Students"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:653
-msgid "Subject: "
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:50
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:8
+msgid "Subject:"
 msgstr "Sujet :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:222
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:30
 msgid "Submission time:"
 msgstr "Durée du test :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:226
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:41
 msgid "Submit"
 msgstr "Tentative"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:26
 msgid "Submit Answers"
 msgstr "Soumettre les réponses"
 
 #. ($effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1861
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:23
 msgid "Submit Answers for %1"
 msgstr "Soumettre les réponses pour %1"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:502
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:525
 msgid "Submit your answers again to go on to the next part."
 msgstr "Soumettre votre réponse à nouveau pour passer à la partie suivante."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:775
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:183
 msgid "Success Index"
 msgstr "Indice de succès"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:106
+msgid ""
+"Success index is the square of the average score divided by the average "
+"number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:73
+msgid ""
+"Success index is the square of the score divided by the number of attempts."
+msgstr ""
+
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1086
 msgid "Successfully archived the course %1."
 msgstr "Cours %1 archivé avec succès."
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:885
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:422
 msgid "Successfully created new achievement %1"
 msgstr "Accomplissement %1 créé avec succès"
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1252
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:581
 msgid "Successfully created new set %1"
 msgstr "Le devoir %1 a été créé avec succès."
 
 #. ($add_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:465
 msgid "Successfully created the course %1"
 msgstr "Cours %1 créé avec succès"
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1818
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2401
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1131
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:900
 msgid "Successfully deleted the course %1."
 msgstr "Cours %1 supprimé avec succès"
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1529
+#. ($rename_oldCourseID,							$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:772
 msgid "Successfully renamed the course %1 to %2"
 msgstr "Cours %1 renommeé %2 avec succès"
 
 #. ($unarchive_courseID, $new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2653
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1286
 msgid "Successfully unarchived %1 to the course %2"
 msgstr "%1 désarchivé avec succès dans le cours %2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2099
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4280
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:89
+msgid "TA:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2274
 msgid "Table defined in database but missing in schema"
 msgstr "Le tableau a été défini dans la base de données mais est manquant dans le schéma"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2097
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2269
 msgid "Table defined in schema but missing in database"
 msgstr "Le tableau a été défini dans le schéma mais est manquant dans la base de données"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2265
 msgid "Table is ok"
 msgstr "Le tableau est correct"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3200
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3490
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:276
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:576
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:106
 msgid "Take Action!"
 msgstr "Effectuer l'action!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Target Set:"
 msgstr "Devoir :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:63
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:42
 msgid "TeX Source"
 msgstr "Source TeX"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:784
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:258
+msgid "Test %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:54
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:52
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:55
+msgid "Test Name"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:156
 msgid "Test Time"
 msgstr "Durée du test"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:224
 msgid "Test Time Limit (min; 0=Close Date)"
 msgstr "Temps alloué pour le test (min; 0=Date d'échéance)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2041
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:238
 msgid "Test Time Notification"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:156
 msgid "Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:244
 msgid "Test not yet submitted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:317
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:920
+msgid "Test parameters"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:149
 msgid "Test/quiz with time limit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:79
 msgid "Text"
 msgstr "Texte"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:842
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:80
+msgid "Text Editor Options"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:55
 msgid "Text chapter:"
 msgstr "Chapitre du livre :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:864
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:66
 msgid "Text section:"
 msgstr "Section du livre :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:44
 msgid "Textbook:"
 msgstr "Livre :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1403
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:58
+msgid ""
+"The \"Edit Target Set\" button at the top of the page will take you to the "
+"Problem Set Editor which will allow you to edit dates, assign users and "
+"other information about the problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:115
+msgid ""
+"The \"Score\" tab will export achievement data to a CSV file that can be "
+"downloaded.  The export contains the global data including number of "
+"achievement points and current level of each student.  In addition for each "
+"selected achievement, a column for if the achievement was earned (1) or not "
+"earned (0) will be added to the CSV."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:194
+msgid ""
+"The <strong>Assigned sets</strong> column (x/y) indicates that x sets out of"
+" y sets avaiable have been assigned to this student. Click this link to "
+"assign or unassign sets to this student, to adjust due dates, or to adjust "
+"the grades on a homework set for a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:20
+msgid ""
+"The <strong>Set Detail</strong> page can be viewed in one of two distinct "
+"modes:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:189
+msgid ""
+"The <strong>login name</strong> column links allow you to \"act as\" a "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:191
+msgid ""
+"The <strong>pencil</strong> in the login column allows you to edit that "
+"student's data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:64
 msgid ""
 "The Attempts figure is the global average of the number of attempts (both "
 "correct and incorrect) individuals take on this problem.  A high figure may "
@@ -6139,7 +8204,7 @@ msgid ""
 "each part before continuing and each such  submittal counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1485
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:124
 msgid ""
 "The Attempts figure is the local average of the number of attempts (both "
 "correct and incorrect) individuals at your institution take on this problem."
@@ -6149,14 +8214,14 @@ msgid ""
 "counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1819
+#: /opt/webwork/webwork2/conf/defaults.config:1721
 msgid ""
 "The Maximum number of times Show me Another can be used per problem by a "
 "student. If set to -1 then there is no limit to the number of times that "
 "Show Me Another can be used."
 msgstr "Nombre maximum de fois que la fonction <b>Montrer un autre problème</b> peut être utilisée par un étudiant. Pour autoriser les étudiants à utiliser cette fonction un nombre illimité de fois, entrer la valeur -1."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1787
+#: /opt/webwork/webwork2/conf/defaults.config:1689
 msgid ""
 "The Reduced Scoring Period is the default period before the due date during "
 "which all additional work done by the student counts at a reduced rate. When"
@@ -6169,7 +8234,7 @@ msgid ""
 "work done counts 50% of the original.\" will be displayed."
 msgstr "Ce nombre représente la durée par défaut de la période de grâce d'évaluation durant laquelle tout travail supplémentaire effectué par l'étudiant compte à un pourcentage réduit. Si la période de grâce est activée pour un devoir, sa date de début est définie par la date d'échéance moins ce nombre. Cette date peut ensuite être modifiée, mais doit toujours précéder la date d'échéance du devoir. Le message  suivant s'affichera pour les étudiants : « Ce devoir possède une période de grâce d'évaluation qui débute le 11/08/2009 à 06:17pm EST et se termine à la date d'échéance, 11/10/2009 à 06:17pm EST. Pendant cette période, tout travail effectué compte pour 50 % de la note.  »"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:78
 msgid ""
 "The Status figure is the global average of the Status individuals have "
 "earned on this problem. The Status is the percentage correct (from 0% to "
@@ -6178,7 +8243,7 @@ msgid ""
 "a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1506
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:138
 msgid ""
 "The Status figure is the local average of the Status individuals at your "
 "institution have earned on this problem. The Status is the percentage "
@@ -6187,47 +8252,61 @@ msgid ""
 "students will work on a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1262
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:11
 msgid "The WeBWorK Project"
 msgstr "Le projet WeBWorK"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:822
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:25
+msgid ""
+"The WeBWorK administrators need to be added to the course in order for them "
+"to access the course.  Unchecking this option will make it so WeBWorK "
+"administrators cannot directly login to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:129
+msgid ""
+"The achievement evaluator is the perl code that is run after each submit to "
+"determine if an achievement is earned or not.  Click on the \"Edit "
+"Evaluator\" link to edit the evaluator."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:26
 msgid ""
 "The adjusted status of a problem is the larger of the problem's status "
 "andthe weighted average of the status of those problems which count towards "
 "the parent grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1677
+#: /opt/webwork/webwork2/conf/defaults.config:1579
 msgid ""
 "The amount of time (in minutes) after the due date that the Answers are "
 "available to student to view.  You can change this for individual homework, "
 "but WeBWorK will use this value when a set is created."
 msgstr "Période de temps (en minutes), après la date d'échéance, avant que les étudiants n'aient accès aux réponses d'un devoir. Vous pouvez modifier cette information pour chaque devoir, mais WeBWorK utilisera cette valeur lors de la création d'un nouveau devoir."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1667
+#: /opt/webwork/webwork2/conf/defaults.config:1569
 msgid ""
 "The amount of time (in minutes) before the due date when the assignment is "
 "opened.  You can change this for individual homework, but WeBWorK will use "
 "this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:386
 msgid "The answer above is NOT correct."
 msgstr "La réponse ci-dessus n'est PAS bonne."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:375
 msgid "The answer above is correct."
 msgstr "La réponse ci-dessus est bonne."
 
 #. ($filename, $ce->{mail}{maxAttachmentSize})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:230
 msgid ""
 "The attached file \"%1\" exceeds the allowed attachment size of "
 "%quant(%2,megabyte)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:421
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:496
 msgid ""
 "The child problems for this problem will become visible to the student when "
 "they either have more incorrect attempts than is specified here, or when "
@@ -6236,173 +8315,252 @@ msgid ""
 "attempts."
 msgstr "Le nombre d'essais dont les étudiants disposent avant de voir s'afficher les sous-problèmes associés à un problème correspond à la plus petite de ces deux valeurs : soit la valeur entrée ici, soit le nombre maximum d'essais défini pour le problème. Pour afficher les sous-problèmes seulement après que les étudiants ont épuisé le nombre maximum d'essais autorisés, entrer la valeur « max ». Si vous entrez la valeur « max » et que le nombre maximum d'essais est réglé à « illimité », le sous-problème ne sera jamais affiché."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:704
+#. ('href="http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files"
+#. target="Webworkdocs"',
+#. '<code>demoCourse.lst</code>','<code>.csv</code>','<code>.lst</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:59
+msgid ""
+"The classlist files are stored in the templates directory and provide a "
+"convenient way to enter a large number of students into your class. To view "
+"the format for <strong>ClassList files</strong> see the <a %1>ClassList "
+"specification</a> or download the %2 file and use it as a model. ClassList "
+"files can be prepared using a spreadsheet and then saved as %3 (comma "
+"separated values) text files.  However, to access as a classlist file, the "
+"file suffix needs to be changed to %4, which can be done with the \"Rename\""
+" button."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:16
 msgid ""
 "The configuration module did not find the data it needs to function.  Have "
-"your site administrator check that Constants.pm is up to date."
-msgstr "Le module de configuration n'a pas été en mesure de trouver les informations pour fonctionner. Vérifier avec l'administrateur que Constants.pm est à jour."
+"your site administrator check that site configuration files are up to date."
+msgstr ""
+
+#. ($archive_courseID,					$archive_path)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:80
+msgid ""
+"The course \"%1\" has already been archived at \"%2\". This earlier archive "
+"will be erased.  This cannot be undone."
+msgstr ""
 
-#. (CGI::b($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:151
+#. (tag('strong', stash('courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:8
 msgid ""
 "The course %1 uses an external authentication system (%2). Please go there "
 "to log in again."
 msgstr "Le cours %1 utilise un système d'authentification externe (%2). Utilisez celui-ci pour vous connecter."
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:186
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:17
 msgid ""
 "The course %1 uses an external authentication system (%2). Please return to "
 "that system to access this course."
 msgstr "Le cours %1 utilise un système d'authentification externe (%2). Utilisez celui-ci pour accéder au cours."
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:191
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:23
 msgid ""
 "The course %1 uses an external authentication system (%2). You've "
 "authenticated through that system, but aren't allowed to log in to this "
 "course."
 msgstr "Le cours %1 utilise un système d'authentification externe (%2). Vous vous êtes authentifié via celui-ci, mais la connexion à ce cours ne vous est pas permise."
 
-#. ($archive_courseID,						$archive_path)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2243
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:30
+msgid "The course database must be upgraded before archiving this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:30
+msgid "The course database must be upgraded before renaming this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:26
 msgid ""
-"The course '%1' has already been archived at '%2'. This earlier archive will"
-" be erased.  This cannot be undone."
-msgstr "Le cours '%1' a déjà été archivé dans '%2'. L'archive récente sera supprimée. Cela est irréversible."
+"The current mode should be made clear by the information at the top of the "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:46
+msgid ""
+"The current value of the achievement counter. Changes to this variable will "
+"be saved."
+msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1995
+#: /opt/webwork/webwork2/conf/defaults.config:1897
 msgid "The default display mode"
 msgstr "Mode d'affichage par défaut"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1855
+#: /opt/webwork/webwork2/conf/defaults.config:1757
 msgid ""
 "The default number of attempts before the problem is re-randomized. ( 0 => "
 "never )"
 msgstr "Valeur par défaut qui définit le nombre d'essais auquel a droit un étudiant avant de devoir continuer son travail avec une nouvelle version du problème générée aléatoirement. (0 => Jamais)"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1854
+#: /opt/webwork/webwork2/conf/defaults.config:1756
 msgid ""
 "The default number of attempts between re-randomization of the problems ( 0 "
 "=> never)"
 msgstr "Valeur par défaut qui définit le nombre d'essais auquel a droit un étudiant avant d'obtenir une nouvelle version d'un problème. (0 => Jamais)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:251
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:73
+msgid ""
+"The description shown to students which states what action is needed to earn"
+" the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:5
 msgid "The directory you specified doesn't exist"
 msgstr "Le dossier spécifié n'existe pas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1829
-msgid "The display was already cleared."
-msgstr "L'affichage des problèmes était déjà vide."
-
-#: /opt/webwork/webwork2/conf/defaults.config:2111
+#: /opt/webwork/webwork2/conf/defaults.config:2032
 msgid ""
 "The e-mail verbosity level controls how much information is automatically "
-"added to feedback e-mails.  Levels are<ol><li value=\"Simple\"> Simple: send"
-" only the feedback comment and context link</li><li value=\"Standard\"> "
-"Standard: as in Simple, plus user, set, problem, and PG data</li><li "
-"value=\"Debug\"> Debug: as in Standard, plus the problem environment "
-"(debugging data)</li></ol>"
-msgstr ""
-
-#. ($achievementName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:625
-msgid "The evaluator for %1 has been renamed to '%2'."
-msgstr "L'évaluateur pour %1 a été renommer '%2'."
-
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:339
-msgid ""
-"The file %1/%2 already exists and cannot be overwritten. The message was not"
-" saved"
-msgstr "Le fichier %1/%2 existe déjà et ne peut être écrasé. Le message n'a pas été enregistré."
-
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:190
-msgid "The file %1/%2 cannot be found."
-msgstr "Le fichier %1/%2 ne peut être trouvé."
-
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:181
-msgid "The file %1/%2 is not readable by the webserver."
-msgstr "Le fichier %1/%2 n'est pas lisible par le serveur internet."
-
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:373
-msgid "The file '%1' cannot be found."
-msgstr "Le fichier '%1' ne peut être trouvé."
-
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1004
-msgid "The file '%1' cannot be read!"
-msgstr "Impossible de lire le fichier '%1'!"
-
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:380
-msgid "The file '%1' is a blank problem!"
-msgstr "Le fichier '%1' est un problème vide!"
-
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:998
-msgid "The file '%1' is a directory!"
-msgstr "La source '%1' est un dossier!"
-
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:375
-msgid "The file '%1' is protected!"
-msgstr "Le fichier '%1' est protégé!"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:598
+"added to feedback e-mails.  Levels are<ol><li> Simple: send only the "
+"feedback comment and context link</li><li> Standard: as in Simple, plus "
+"user, set, problem, and PG data</li><li> Debug: as in Standard, plus the "
+"problem environment (debugging data)</li></ol>"
+msgstr ""
+
+#. ($achievementName,				$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:293
+msgid "The evaluator for %1 has been renamed to \"%2\"."
+msgstr ""
+
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:246
+msgid "The file \"%1\" cannot be found."
+msgstr ""
+
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:526
+msgid "The file \"%1\" cannot be read!"
+msgstr ""
+
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:522
+msgid "The file \"%1\" is a directory!"
+msgstr ""
+
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:259
+msgid "The file \"%1\" is a template. You may use \"Save As\" to create a new file."
+msgstr ""
+
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:250
+msgid "The file \"%1\" is protected. You may use \"Save As\" to create a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:19
+msgid "The file $file does not appear to be a text or image file."
+msgstr ""
+
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:277
+msgid ""
+"The file %1 already exists and cannot be overwritten. The message was not "
+"saved."
+msgstr ""
+
+#. ("$emailDirectory/$openfilename",				$emailDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:156
+msgid ""
+"The file %1 cannot be found. Check whether it exists and whether the "
+"directory %2 can be read by the webserver. "
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
+msgid ""
+"The file %1 is not contained in the course templates directory and can not "
+"be modified."
+msgstr ""
+
+#. ("$emailDirectory/$openfilename")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:148
+msgid ""
+"The file %1 is not readable by the webserver. Check that it's permissions "
+"are set correctly."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:203
 msgid "The file does not appear to be a text file"
 msgstr "Ce fichier ne semble pas être un fichier texte."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:88
 msgid "The file you are trying to download doesn't exist"
 msgstr "Le fichier que vous voulez télécharger n'existe pas."
 
 #. ($filename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:221
 msgid "The filetype of the attached file \"%1\" is not allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3843
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2149
 msgid "The following courses were successfully hidden:"
 msgstr "Les cours suivants ont été cachés avec succès:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3908
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2218
 msgid "The following courses were successfully unhidden:"
 msgstr "Les cours suivant ont été réaffichés avec succès:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4121
-msgid "The following upgrades are available for your WeBWorK system:"
-msgstr "Les mises à jour suivantes sont disponible pour votre système WeBWorK:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:34
+msgid "The following describes how the checkboxes alter the scoring output"
+msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2081
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:66
 msgid ""
 "The following users are NOT assigned to this set and will be ignored: %1"
 msgstr "Les utilisateurs suivants n'ont PAS été désignés pour ce devoir et seront ignorés&#8239;: %1"
 
-#. (join('.', @{$problemSeqs[$children_counts_indexs[0]]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:288
+msgid "The given file path is not a valid location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:49
+msgid "The goal value of the achievement counter."
+msgstr ""
+
+#. (join('.', @{ $problemSeqs[ $children_counts_indexs[0] ] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1334
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the score of problem %1."
 msgstr "The grade for this problem is the larger of the score for this problem, or the score of problem %1."
 
-#. (join(', ', map({join('.', @{$problemSeqs[$_]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2064
+#. (join(', ', map({ join('.', @{ $problemSeqs[$_] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the weighted average of the problems: %1."
 msgstr "The grade for this problem is the larger of the score for this problem, or the weighted average of the problems: %1."
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1954
-msgid "The hardcopy header for set %1 has been renamed to '%2'."
-msgstr "L'entête de la copie imprimable du devoir %1 a été renommé sous '%2'."
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1078
+msgid "The hardcopy header for set %1 has been renamed to \"%2\"."
+msgstr ""
+
+#. ($showHintsAfter)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:36
+msgid ""
+"The hint shown is an instructor preview and will be shown to students after "
+"%quant(%1,attempt)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:32
+msgid ""
+"The hint shown is an instructor preview and will not be shown to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:22
+msgid ""
+"The information box on the right displays information about the course. This"
+" is useful for leaving course wide messages for students. It contains text "
+"from the file templates/course_info.txt. Instructors can edit this file from"
+" the web (click on the \"Edit\" link)."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:111
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:30
 msgid ""
 "The initial value is the answer sub score for the answer that is currently "
 "shown.  If this is modified, it will be used to compute the total problem "
@@ -6410,37 +8568,100 @@ msgid ""
 "shown answer if the page is reloaded."
 msgstr "La valeur initiale est le sous pointage pour la réponse présentement affichée. Si elle est modifié, elle sera utilisé pour  compiler le total du pointage pour le problème. Ce pointage n'est pas enregistré et reviendra au score de la réponse en cours si la page est rechargée."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:161
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:97
+msgid ""
+"The initial value is the currently saved score as a point value computed "
+"using the percent score.  This point value is used to compute the percent "
+"score (rounded to a whole percent) that can be saved."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:145
 msgid "The initial value is the currently saved score for this student."
 msgstr "La valeur initiale est le pointage présentement enregistré pour cet étudiant. "
 
 #. ($rename_oldCourseID, $rename_oldCourseInstitution,
 #. $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
 msgid ""
 "The institution associated with the course %1 has been changed from %2 to %3"
 msgstr "L'institution associée avec le cours %1 a été changée de %2 pour %3"
 
-#. ($rename_newCourseID, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1498
+#. ($rename_newCourseID, $optional_arguments{courseInstitution})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:729
 msgid "The institution associated with the course %1 is now %2"
 msgstr "L'institution associée avec le cours %1 est maintenant %2"
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:599
+msgid ""
+"The instructor account with user id %1 does not exist.  Instructor accounts "
+"must be created manually."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:635
 msgid ""
 "The instructor account with user id %1 does not exist.  Please create the "
 "account manually via WeBWorK."
 msgstr "Le compte enseigant avec l'identifiant %1 n'exist pas. Créer le compte manuellement. "
 
-#. ($r->param('new_set_name')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1897
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:87
+msgid ""
+"The key maps that are available are \"default\", \"emacs\", \"sublime\", and"
+" \"vim\". The \"default\" key map has the standard behavior of a browser "
+"text area. You can use Ctrl-C to copy, Ctrl-V to paste, Ctrl-F to search, "
+"etc. If you are more comfortable with the \"emacs\", \"sublime\", or \"vim\""
+" text editors then you may choose to use one of those key maps instead."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:75
+msgid "The large text window"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:27
+msgid ""
+"The list of files include regular files, directories (ending in a \"/\") and"
+" links (ending in a \"@\")."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:52
+msgid ""
+"The login name cannot be changed. (It is the primary key for the student's "
+"data.) If you make a mistake in the login name at the beginning of the "
+"course (before any work has been done) then it is best to simply add a new "
+"student with the correct entry and drop the student with the bad login name."
+" (See drop and delete students below.) If the login name must be changed "
+"after a user has started working assignments, then contact your system "
+"administrator, who can use the webwork2 \"bin/change_user_id\" script to "
+"change the user id."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:20
+msgid ""
+"The main page allows access to set and student statistics.  When selecting a"
+" student, their grades page is shown, which lists set totals and per problem"
+" grades for each set assigned to the student.  When selecting a set, various"
+" statistics and histograms are shown for the overall grades of students who "
+"are currently enrolled or auditing the course."
+msgstr ""
+
+#. ('href="http://webwork.maa.org/wiki" target="ww_wiki"',
+#. 'href="http://webwork.maa.org/wiki/Instructors" target="ww_wiki"')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:24
+msgid ""
+"The main page for WeBWorK documentation is the <a %1>webwork wiki</a> while "
+"specific help for instructors setting up a course are in the <a "
+"%2>instructors' section</a>."
+msgstr ""
+
+#. ($c->param('new_set_name')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:569
 msgid ""
 "The name \"%1\" is not a valid set name.  Use only letters, digits, dashes, "
 "underscores, periods, and spaces."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1530
+#: /opt/webwork/webwork2/conf/defaults.config:1432
 msgid ""
 "The name of course information file (located in the templates directory). "
 "Its contents are displayed in the right panel next to the list of homework "
@@ -6457,151 +8678,249 @@ msgid ""
 "go back to the LMS to access something in the WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:63
+msgid "The number of points earned for earning the achievement."
+msgstr ""
+
 #. ($openDate, $dueDate, $answerDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1104
 msgid ""
 "The open date: %1, close date: %2, and answer date: %3 must be defined and "
 "in chronological order."
 msgstr "La date d'ouverture&#8239;: %1, la date d'échéance&#8239;: %2 et la date de disponibilité des réponses&#8239;: %3 doivent être en ordre chronologique."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:702
+#. ($path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:393
+msgid "The original path is not in a valid location. Using failsafe %1"
+msgstr ""
+
+#. ($forcedSourceFile)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:510
+msgid "The original path to the file is %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:262
 msgid "The password and password confirmation for the instructor must match."
 msgstr "Le mot de passe et la confirmation du mot de passe doivent concorder."
 
-#. (CGI::b($r->maketext("[_1]'s Current Password", $user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:27
+msgid ""
+"The password can be any combination of letters, numbers and special symbols."
+" Students are encouraged to use all three, and stay away from dictionary "
+"words. The password should not be the same as any password used elsewhere, "
+"such as for an email account. The password will only be present on the page "
+"if the user has permission to change the password."
+msgstr ""
+
+#. ($c->tag(                                               'b',
+#. $c->maketext(                                                   "[_1]'s
+#. Current Password",
+#. $c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:95
 msgid ""
 "The password you entered in the %1 field does not match your current "
 "password. Please retype your current password and try again."
 msgstr "Le mot de passe entré dans le champ %1 ne correspond pas à votre mot de passe actuel. Réessayez en entrant votre mot de passe actuel."
 
-#. (CGI::b($r->maketext("[_1]'s New Password",         $e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:105
+#. ($c->tag('b', $c->maketext("[_1]'s New Password",         $e_user_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:82
 msgid ""
 "The passwords you entered in the %1 and %2 fields don't match. Please retype"
 " your new password and try again."
 msgstr "Les mots de passe entrés dans les champs %1 et %2 ne concordent pas. Réessayez en entrant votre nouveau mot de passe."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:789
-msgid "The path to the original file should be absolute"
-msgstr "Le chemin du fichier original devrait être décrit de manière absolue."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:374
+msgid "The path can not be the temporary edit directory."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:667
-msgid ""
-"The percentage of active students with correct answers for each problem"
-msgstr "Pourcentage d'étudiants actifs avec de bonnes réponses pour chaque problème"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:370
+msgid "The path to the original file should be absolute."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:131
 msgid ""
 "The percentage of students receiving at least these scores. The median score"
 " is in the 50% column."
 msgstr "Pourcentage d'étudiants obtenant au moins ces résultats. La valeur médiane se situe dans la colonne 50 %."
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:458
 msgid "The prerequisite conditions have not been met for set '%1'."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1917
+#. (q(down menu to change which student's seed and answers are shown.  Use the
+#. "Mark Correct" checkbox to set)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:26
+msgid ""
+"The problem is shown at the top with the seed and answers of the selected "
+"student.  Use the drop "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:62
 msgid "The problem set is not yet open"
 msgstr "Le devoir n'est pas encore ouvert"
 
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2012
-msgid "The recorded score for this version is  %1/%2."
-msgstr "Le pointage enregistré pour cette version est %1/%2."
-
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2021
-msgid "The recorded score for this version is %1/%2."
-msgstr "Le pointage enregistré pour cette version est %1/%2."
-
 #. ($origReducedScoringDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1971
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1121
 msgid ""
 "The reduced credit date %1 in the file probably was generated from the Unix "
 "epoch 0 value and is being treated as if it was Unix epoch 0."
 msgstr "La date de pointage réduit %1 dans le fichier a probablement été générée de la valeur Unix epoch 0 et est traitée comme Unix epoch 0."
 
 #. ($openDate, $dueDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1982
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1135
 msgid ""
 "The reduced credit date should be between the open date %1 and close date %2"
 msgstr "La date de début de la période de grâce doit être postérieure à la date d'ouverture %1, mais précéder la date d'échéance %2."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1220
 msgid ""
 "The reduced scoring date should be between the open date and close date."
 msgstr "La date de début de la période de grâce doit être postérieure à la date d'ouverture, mais précéder la date d'échéance."
 
 #. ($tempFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:307
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:298
 msgid "The requested file \"%1\" does not exist on the server."
 msgstr ""
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2085
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1389
 msgid "The score for this problem can count towards score of problem %1."
 msgstr "La note obtenue à ce problème peut compter dans la note du problème %1."
 
-#. ($setName, $effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:306
-msgid "The selected problem set (%1) is not a valid set for %2"
-msgstr "Le devoir sélectionné (%1) n'est pas un devoir valide pour %2."
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:69
+msgid ""
+"The scoring files are stored in the scoring directory and are produced using"
+" the \"Scoring Tools\" page or the scoring command in the \"Instructor "
+"Tools\" module. These files can be downloaded, modified in a spreadsheet "
+"(for example, to add midterm scores) and then uploaded again to the scoring "
+"directory to be merged with email messages. (Use a new file name, other than"
+" %1, when uploading to prevent the scoring module from overwriting an "
+"uploaded file.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:52
+msgid ""
+"The second row of the problem collection area is for browsing directories. "
+"The OPL will be there as well as any other directories that you may set up "
+"(for example Contrib). If this is selected, all subdirectories containing "
+"problems will be listed."
+msgstr ""
+
+#. (stash('setID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet.html.ep:13
+msgid "The selected problem set (%1) is not a valid set for %2."
+msgstr ""
 
-#. ($urlpath->arg("setID")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1467
-msgid "The selected problem set (%1) is not a valid set for %2%3:"
+#. ($setID, $effectiveUserID, $c->{invalidVersionCreation} ? " (acted as by
+#. $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:77
+msgid "The selected problem set (%1) is not a valid set for %2: %3"
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1946
-msgid "The set header for set %1 has been renamed to '%2'."
-msgstr "L'entête pour le devoir %1 a été renommé sous '%2'."
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1066
+msgid "The set header for set %1 has been renamed to \"%2\"."
+msgstr ""
 
-#. ($newSetName)
 #. ($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1164
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:491
+msgid ""
+"The set name \"%1\" is already in use. Pick a different name if you would "
+"like to start a new set. No set created."
+msgstr ""
+
+#. ($newSetName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:584
 msgid ""
 "The set name '%1' is already in use.  Pick a different name if you would "
 "like to start a new set."
 msgstr "'%1' est un nom de devoir existant. Choisir un nom différent si vous désirez créer un nouveau devoir."
 
-#. ($setID, $editingSetVersion, $editForUser[0])
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2109
-msgid "The set-version (%1, version %2) is not assigned to user %3."
-msgstr "Ce devoir (%1, version %2) n'est pas attribué à l'utilisateur %3."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:58
+msgid ""
+"The sets checked below will be visible to students or hidden from students. "
+"Useful for preparing sets ahead of time, but not showing them to students; "
+"or for temporarily hiding a set which has a mistake in it while it is being "
+"fixed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:54
+msgid ""
+"The sets checked below will become available for editing the due dates and "
+"visibility."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:73
+msgid ""
+"The sets checked below will written to set definition files, to be saved for"
+" future use, or to be transferred to another course. The set definition "
+"files can be uploaded/downloaded using the \"File Manager\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:29
+msgid ""
+"The simple configuration file is the name of the configuration file created "
+"when using the \"Course Configuration\" page to configure course options.  "
+"This option sets if this configuration file is copied from the old course or"
+" not and instead use the server defaults."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:551
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:521
 msgid "The solution has been removed."
 msgstr "La solution a été cachée."
 
-#. ($fullSetName, $prettyProblemNumber, $self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1975
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:33
+msgid ""
+"The solution shown is an instructor preview and will only be shown to "
+"students after the due date."
+msgstr ""
+
+#. ($c->{fullSetID},
+#. $c->{prettyProblemNumber},
+#. $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1103
+msgid ""
+"The source file for \"set %1 / problem %2\" has been changed from \"%3\" to "
+"\"%4\"."
+msgstr ""
+
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1209
+msgid ""
+"The temporary file %1 is not contained in the course templates directory and"
+" can not be deleted."
+msgstr ""
+
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:689
 msgid ""
-"The source file for 'set %1 / problem %2 has been changed from '%3' to '%4'"
-msgstr "Le fichier source '%3' du devoir %1 / problème %2 a été modifié par '%4'."
+"The temporary file %1 is not in the course templates directory and can not "
+"be deleted!"
+msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2133
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:349
 msgid ""
 "The test (which is version %1) may  no longer be submitted for a grade."
 msgstr "Le test (version %1) ne peu plus être soumis pour obtenir des points. "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1927
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1042
 msgid ""
 "The text box now contains the source of the original problem. You can "
 "recover lost edits by using the Back button on your browser."
 msgstr "La boîte de texte contient maitenant la source du problème original. Vous pouvez récupérer des modifications perdues en utilisant le bouton précédent de votre fureteur web."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:214
+#. (			% . 'but the result will not be counted.')
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:23
 msgid ""
 "The time limit on this assignment was exceeded. The assignment may be "
-"checked, but the result will not be counted."
-msgstr "Le temps alloué pour effectuer ce test a été dépassé. Vous pouvez continuer à vérifier vos réponses, mais cela n'affectera pas votre résultat."
+"checked, "
+msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1657
+#: /opt/webwork/webwork2/conf/defaults.config:1559
 msgid ""
 "The time of the day that the assignment is due.  This can be changed on an "
 "individual basis, but WeBWorK will use this value for default when a set is "
@@ -6609,24 +8928,39 @@ msgid ""
 msgstr "Heure à laquelle les étudiants doivent avoir terminé un devoir. Vous pouvez modifier cette information pour chaque devoir, mais WeBWorK utilisera cette valeur lors de la création d'un nouveau devoir."
 
 #. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1443
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:689
 msgid "The title of the course %1 has been changed from %2 to %3"
 msgstr "Le titre du cours %1 a été modifié de %2 pour %3"
 
-#. ($rename_newCourseID, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1491
+#. ($rename_newCourseID, $optional_arguments{courseTitle})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:722
 msgid "The title of the course %1 is now %2"
 msgstr "Le titre du cours %1 est maintenant %2"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:167
+msgid ""
+"The top number is the percent score on the problem.  A period (.) indicates "
+"a problem has not been attempted. The bottom number is the number of "
+"incorrect attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:25
+msgid ""
+"The total grade row at the bottom shows the total score and percent average "
+"over all open assignments.  The total grade row can be shown/hidden under "
+"general course configuration settings."
+msgstr ""
+
 #. ($enableReducedScoring)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1151
 msgid ""
 "The value %1 for enableReducedScoring is not valid; it will be replaced with"
 " 'N'."
 msgstr "La valeur %1 pour l'option enableReducedScoring n'est pas valide. Elle sera remplacée par 'N'."
 
 #. ($timeCap)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2032
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1209
 msgid ""
 "The value %1 for the capTimeLimit option is not valid; it will be replaced "
 "with '0'."
@@ -6634,81 +8968,90 @@ msgstr "La valeur %1 pour l'option capTimeLimit n'est pas valide; elle sera remp
 
 #. ($hideScore)
 #. ($hideScoreByProblem)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2023
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1178
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1189
 msgid ""
 "The value %1 for the hideScore option is not valid; it will be replaced with"
 " 'N'."
 msgstr "La valeur %1 pour l'option hideScore n'est pas valide; elle sera remplacée par 'N'."
 
 #. ($hideWork)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1200
 msgid ""
 "The value %1 for the hideWork option is not valid; it will be replaced with "
 "'N'."
 msgstr "La valeur %1 pour l'option hideWork n'est pas valide; elle sera remplacée par 'N'."
 
 #. ($relaxRestrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2045
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1235
 msgid ""
 "The value %1 for the relaxRestrictIP option is not valid; it will be "
 "replaced with 'No'."
 msgstr "La valeur %1 pour l'option relaxRestrictIP n'est pas valid; elle sera remplacer par 'No'."
 
 #. ($restrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2037
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1221
 msgid ""
 "The value %1 for the restrictIP option is not valid; it will be replaced "
 "with 'No'."
 msgstr "La valeur %1 pour l'option RestrictIP n'est pas valid; elle sera remplacer par 'No'."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:46
+msgid "The visible name/title of the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:36
 msgid ""
 "The webwork server must be able to write to these directories. Please "
 "correct the permssion errors."
 msgstr "Le serveur WeBWorK doit être en mesure d'écrire dans ces répertoires. Corriger les erreurs de permissions."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1537
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:83
+msgid "Theme"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1439
 msgid "Theme (refresh page after saving changes to reveal new theme.)"
 msgstr "Thème (actualiser la page après la sauvegarde des modifications pour voir le nouveau thème)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:109
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:5
 msgid "Theme:"
 msgstr ""
 
 # Context is "Sort by ____ Then by _____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:843
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:872
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:30
 msgid "Then by"
 msgstr "Ensuite par "
 
-#. ($count_line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:603
+#. ($listingsCount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:52
 msgid "There are %1 matching WeBWorK problems"
 msgstr "Il y a %1 problèmes WeBWorK correspondants"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1625
+#: /opt/webwork/webwork2/conf/defaults.config:1527
 msgid ""
 "There are currently two hardcopy themes to choose from: One Column and Two "
 "Columns.  The Two Columns theme is the traditional hardcopy format.  The One"
 " Column theme uses the full page width for each column"
 msgstr "Il y a deux thèmes possibles pour le document imprimable d'un devoir : une colonne ou deux colonnes. Le thème <em>deux colonnes</em> est le thème traditionnellement utilisé. Le thème <em>une colonne</em> affichera toute la largeur de la page en une seule colonne."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2979
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1519
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
 "least one table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1243
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:23
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
-"least one table.  They can only be removed when upgrading the course."
+"least one table.  They can be removed when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1404
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
 "least one table. Check the checkbox by the field to delete it when upgrading"
@@ -6716,63 +9059,48 @@ msgid ""
 "is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1508
 msgid "There are extra database tables which are not defined in the schema."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2833
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1389
 msgid "There are extra database tables which are not defined in the schema. "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:15
 msgid ""
 "There are extra database tables which are not defined in the schema.  These "
 "can be deleted when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:601
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:29
+msgid "There are many options available at the bottom:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:49
+msgid "There are no completed versions of this test."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:51
 msgid "There are no matching WeBWorK problems"
 msgstr "Il n'y a aucun problème WeBWorK correspondant."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:976
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:8
 msgid "There are no set definition files in this course to look at."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2199
-msgid ""
-"There are tables or fields missing from the database.  The database must be "
-"upgraded before archiving this course."
-msgstr "Des tableaux ou champs sont manquants de la base de données. La base de données devra être mise à jour avant d'archiver le cours."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4108
-msgid "There are upgrades available for the Open Problem Library."
-msgstr "Des mises à jour sont disponibles pour la banque de problèmes libres."
-
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4072
-msgid ""
-"There are upgrades available for your current branch of PG from branch %1 in"
-" remote %2."
-msgstr "Des mises à jours sont disponible pour votre branche PG de la branche %1 dans l'emplacement %2. "
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4010
-msgid ""
-"There are upgrades available for your current branch of WeBWorK from branch "
-"%1 in remote %2."
-msgstr "Des mises à jours sont disponible pour votre branche WeBWorK de la branche %1 dans l'emplacement %2. "
-
 #. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:273
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:87
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
 "their name, you destroy all of the data for achievement %1 for this student."
 msgstr "Cette action est irréversible. Ne pas exécuter à moins d'être certain. En désassignant l'étudiant toutes les informations de l'accomplissement %1 seront perdues."
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:230
+#. (tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:91
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
@@ -6780,37 +9108,29 @@ msgid ""
 "student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:205
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:68
+msgid "There is NO undo for unassigning a set."
+msgstr "Retirer un devoir pour les utilisateurs est une action  irréversible."
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:125
 msgid ""
-"There is NO undo for this function.  Do not use it unless you know what you "
-"are doing!  When you unassign sets using this button, or by unchecking their"
-" set names, you destroy all of the data for those sets for this student."
+"There is NO undo for unassigning sets. Do not do so unless you know what you"
+" are doing!  When you unassign sets by unchecking set names and clicking "
+"save, you destroy all of the data for those sets for this student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:234
-msgid "There is NO undo for unassigning a set."
-msgstr "Retirer un devoir pour les utilisateurs est une action  irréversible."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:174
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:177
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:21
 msgid "There is NO undo for unassigning students."
 msgstr "Retirer des utilisateurs pour un devoir est une action irréversible."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4069
-msgid "There is a new version of PG available."
-msgstr "Une nouvelle version de PG est disponible."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4007
-msgid "There is a new version of WeBWorK available."
-msgstr "Une nouvelle version de WeBWorK est disponible."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:529
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:490
 msgid "There is a written solution available."
 msgstr "La solution est disponible."
 
 #. ($message_file, $merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:50
 msgid ""
 "There is no additional grade information.  A message about additional grades"
 " can go in [TMPL]/email/%1. It is merged with the file [Scoring]/%2. These "
@@ -6819,185 +9139,324 @@ msgid ""
 msgstr ""
 
 #. ($continueTimeLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:486
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:25
 msgid ""
 "There is no time remaining on the currently open test. Click continue below "
 "and then click \"Grade Test\" within %1 seconds to submit the test for a "
 "grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:856
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:65
 msgid "There is no undo for deleting files or directories!"
 msgstr "Supprimer des fichiers ou des répertoires est une action irréversible!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:534
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:495
 msgid ""
 "There is no written solution available for this problem, but you can still "
 "view the correct answers."
 msgstr "Aucune solution n'est disponible pour ce problème, mais il vous est possible de voir la réponse correct."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:537
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:498
 msgid "There is no written solution available for this problem."
 msgstr "Aucune solution écrite n'est disponible pour ce problème."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1539
-msgid ""
-"There is one main theme to choose from: math4. It has two variants, "
-"math4-green and math4-red. The theme specifies a unified look and feel for "
-"the WeBWorK course web pages."
-msgstr "Vous pouvez choisir un thème principal à partir de : math4. Celui-ci possède deux variants, math4-green et math4-red. Le thème spécifie un look unifié pour les pages de cours WeBWorK. "
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2270
+#: /opt/webwork/webwork2/conf/defaults.config:1441
 msgid ""
-"There may be something wrong with this question. Please inform your "
-"instructor including the warning messages below."
-msgstr "Il y a peut-être une erreur dans la question. Veuillez en informer votre professeur en incluant le message d'avertissement ci-dessous. "
+"There is one main theme to choose from: math4. It has three variants: "
+"math4-green, math4-red, and math4-yellow. The theme specifies a unified look"
+" and feel for the WeBWorK course web pages."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:441
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator if this recurs."
 msgstr "Il s'est produit une erreur pendant le processus de connexion. Veuillez en aviser votre professeur ou votre administrateur système si cela se reproduit."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:284
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:307
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:475
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:484
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:511
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:543
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:219
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:354
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:492
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:536
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:575
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:172
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:189
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:212
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:227
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:365
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:447
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator."
 msgstr "Il s'est produit une erreur pendant le processus de connexion. Veuillez en aviser votre professeur ou votre administrateur système."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1935
+#. ('href="https://webwork.maa.org/wiki/Set_Definition_Files"
+#. target="Webworkdocs"')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:48
+msgid ""
+"These are stored in the templates directory. The format of <strong>Set "
+"Definition files</strong> is described in the <a %1>Set Definition "
+"specification</a>. Set definition files are mainly useful for transferring "
+"set assignments from one course to another and are created when exporting a "
+"problem set from the \"Hmwk Sets Editor\".  Each set defintion file contains"
+" a list of problems used and the dates and times. These definitions can be "
+"imported into the current course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:77
+msgid ""
+"These are the files from which problems are generated and are located in the"
+" templates directory or in subdirectories. They can be edited directly using"
+" the \"Edit\" link on each problem page or from the \"Hmwk Sets Editor\". "
+"The File Manager allows you to upload or download these files. \tDirectories"
+" that start with \"set\" contain pg files and are generated when exporting a"
+" problem set in which there are local versions of a problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:40
+msgid ""
+"These options will only be shown if the user has the permission to change "
+"display settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:44
+msgid ""
+"These problems require some application of algorithms, but do not rise to "
+"the level of a full word problem. For example, \"Identify the local extrema "
+"for f(x) = ...\". One has to apply algorithms and interpret results."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1837
 msgid ""
 "These users and higher get the \"Show Past Answers\" button on the problem "
 "page."
 msgstr "Les utilisateurs possédant ce niveau de permission ou un niveau supérieur peuvent voir le bouton <b>Voir les réponses précédentes</b> sur les pages des problèmes."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:17
 msgid "This action can take a long time if there are many students."
 msgstr "Cette action peut être très longue s'il y a beaucoup d'utilisateurs."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:168
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:12
 msgid "This action will not overwrite existing users."
 msgstr "Cette action n'écrasera pas les utilisateurs existants."
 
-#. (CGI::b($r->maketext("Guest Login")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:279
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:20
+msgid ""
+"This allows for the viewing, downloading, uploading and other management of "
+"files in the course.  Select a file or set of files (using CTRL or SHIFT) "
+"and click the desired button on the right.  Many actions can only be done "
+"with a single file (like view). Selecting a directory or set of files and "
+"clicking \"Make Archive\" creates a compressed tar file with the name "
+"COURSE_NAME.tgz"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:34
+msgid ""
+"This browses the Open Problem Library (OPL) in category "
+"(Subject/Chapter/Section) form. Select the desired categories (all three do "
+"not need to be selected) and click \"View Problems\". If the \"Include "
+"Contrib\" box is selected then those problems in the Contrib section of the "
+"OPL that have the categories defined are also included. Contrib problems are"
+" problem that haven't been vetted as thoroughly as OPL problems. If you want"
+" hints or solutions included while browsing select the appropriate box."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:49
+msgid ""
+"This button is also present both at top and the bottom of the page. Discards"
+" all changes, reloading the page by re-reading the database information for "
+"this set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:39
+msgid ""
+"This button is present both at top and the bottom of the page. Any and all "
+"changes made to any part of the set will be saved with one important "
+"exception: When editing the set for one or more students, you can choose to "
+"override the default value (defined for the set in general) by clicking on "
+"the checkbox and providing a value (or possibly leaving blank) and checking "
+"the override checkbox. If you do <strong>NOT</strong> check the checkbox, "
+"the override value will be discarded and the default value for the set will "
+"be used for the users currently being edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:105
+msgid ""
+"This can computed from the answer sub scores above using the weights shown "
+"if they are modified.  Alternatively, enter the point score you want saved "
+"here (the above sub scores will be ignored)."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2005
+msgid ""
+"This configures if the single problem manual grader has inputs to enter "
+"problem scores as a percent, a point value, or both. Note, the problem score"
+" is always saved as a percent, so when using a point value, the problem "
+"score will be rounded to the nearest whole percent."
+msgstr ""
+
+#. (tag('b', maketext('Guest Login')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:72
 msgid ""
 "This course supports guest logins. Click %1 to log into this course as a "
 "guest."
 msgstr "Ce cours permet l'accès anonyme. Cliquer sur %1 pour  accéder à ce cours comme invité."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:851
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:58
+msgid ""
+"This determines if MathQuill answer blanks are enable for the user. This "
+"option is only present if MathQuill is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:63
+msgid ""
+"This determines if the MathView equation editor button will be appended to "
+"text answer blanks. his option is only present if MathView is enabled for "
+"the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:52
+msgid ""
+"This determines whether or not saved past answers are automatically filled "
+"in to the problem form when a student returns to a problem after having left"
+" the problem. This option is only visible if the user has the permission to "
+"show old answers."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:85
+msgid ""
+"This directory is accessible from the web. You can use it to store html "
+"documents or image documents that are used by the course. Do not store "
+"private information in this directory or in any subdirectory thereof. These "
+"documents can be linked to from within problems using the htmlLink macro."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:255
+msgid "This file is a template. You may use \"Save As\" to create a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:20
+msgid ""
+"This form can assign, unassign, and edit user data for a single achievement."
+"  You can assign the achievement to all current users or select which users "
+"to assign the achievement to and click Save.  You can unassign the "
+"achievement by unchecking a student's name (note all data will be deleted)."
+"  To unassign the achievement from all users, first select \"Allow "
+"unassign\" and then click the \"Unassign from All Users\" button. You can "
+"also toggle the earned status with the checkbox in the \"Earned\" column and"
+" edit the achievement counter for counting achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:19
+msgid ""
+"This gives the status and dates of the main set. Indvidual students may have"
+" different settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:51
 msgid "This homework set contains no problems."
 msgstr "Ce devoir ne contient aucun problème."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1231
 msgid "This homework set is closed."
 msgstr "Ce devoir est fermé."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1986
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1229
 msgid "This homework set is not yet open."
 msgstr "Ce devoir n'est pas encore disponible."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:932
-msgid ""
-"This is a blank problem template file and can not be edited directly. Use "
-"the 'NewVersion' action below to create a local copy of the file and add it "
-"to the current problem set."
-msgstr "Ce fichier contient un modèle vide d'un problème et ne peut pas être modifié directement. Cliquer sur <b>Nouvelle version</b> ci-dessous pour créer une copie locale du fichier et l'ajouter à la liste des problèmes du devoir."
-
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:423
 msgid "This is a new (re-randomized) version of the problem."
 msgstr "Voici une nouvelle version (à nouveau randomisée) du problème."
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:580
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:109
 msgid ""
 "This is a timed test. You will have %quant(%1,hour) and %quant(%2,minute) to"
 " complete the test."
 msgstr ""
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:592
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:119
 msgid ""
 "This is a timed test. You will have "
 "%quant(%1,hour,hours,)%quant(%2,minute,minutes,) to complete the test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:284
-msgid ""
-"This is the Achievement Editor.  It is used to edit the achievements "
-"available to students.  Please keep in mind the following facts: Achievments"
-" are displayed, and evaluated, in the order they are listed. The \"secret\" "
-"category creates achievements which are not visible to students until they "
-"are earned.  The \"level\" category is used for the achievements associated "
-"to a users level."
-msgstr "Ceci est l'éditeur d'accomplissements. Il est utilisé pour gérer les accomplissements disponibles pour les étudiants. Garder ceci en tête: Les accomplissements sont affichés, et évalué, dans l'ordre où ils sont listés. La catégorie \"secret\" crée des accomplissements qui ne seront pas visibles pour les étudiants avant d'être mérité. La catégorie \"niveau\" est utilisée pour les accomplissements associés au niveau d'un utilisateur."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:481
-msgid ""
-"This is the classlist editor page, where you can view and edit the records "
-"of all the students currently enrolled in this course.  The top of the page "
-"contains forms which allow you to filter which students to view, sort your "
-"students in a chosen order, edit student records, give new passwords to "
-"students, import/export student records from/to external files, or "
-"add/delete students.  To use, please select the action you would like to "
-"perform, enter in the relevant information in the fields below, and hit the "
-"\"Take Action!\" button at the bottom of the form.  The bottom of the page "
-"contains a table containing the student usernames and their information. "
-"Clicking on the links in the column headers of the table will sort the table"
-" by the field it corresponds to. The Login Name fields contain checkboxes "
-"for selecting the user.  Clicking the link of the name itself will allow you"
-" to act as the selected user.  There is also an edit link following the name"
-" which will take you to a page where you can edit the selected user's "
-"information.  Clicking the emails will allow you to email the corresponding "
-"user.  Clicking the links in the entries in the assigned sets columns will "
-"take you to a page where you can view and reassign the sets for the selected"
-" user. "
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:1810
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:81
 msgid ""
-"This is the default number of attempts before show me another becomes "
-"available to students.  It can be set to -1 to disable show me another by "
-"default."
+"This is done by first entering the user as a student and then changing the "
+"permission level of the user. First edit the user by clicking on the pencil "
+"next to their name (or using the technique above for several users), then "
+"change their permssion level -- an entry blank at the far right of the "
+"screen, you may have to scroll to see it. The permission levels are"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:156
+msgid ""
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page if you wish to assign a homework set to all students or a large group "
+"of students (e.g. a section)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:456
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:161
 msgid ""
-"This is the homework sets editor page where you can view and edit the "
-"homework sets that exist in this course and the problems that they contain. "
-"The top of the page contains forms which allow you to filter which sets to "
-"display in the table, sort the sets in a chosen order, edit homework sets, "
-"publish homework sets, import/export sets from/to an external file, score "
-"sets, or create/delete sets.  To use, please select the action you would "
-"like to perform, enter in the relevant information in the fields below, and "
-"hit the \"Take Action!\" button at the bottom of the form.  The bottom of "
-"the page contains a table displaying the sets and several pieces of relevant"
-" information. The Edit Set Data field in the table contains checkboxes for "
-"selection and a link to the set data editing page.  The cells in the Edit "
-"Problems fields contain links which take you to a page where you can edit "
-"the containing problems, and the cells in the edit assigned users field "
-"contains links which take you to a page where you can edit what students the"
-" set is assigned to."
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:171
+msgid ""
+"This is done from the \"Hmwk Sets Editor\" page or the \"Instructor tools\" "
+"page."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1699
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:71
+msgid ""
+"This is most easily done by importing a class list. The class list can be "
+"uploaded from your workstation to the server using the File Manager page. "
+"The class list must be a file ending in .lst and must have a specific <a "
+"href=\"http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files\">format</a>."
+" Once the file has been uploaded to the server the file will appear in the "
+"import action pop-up list (5th action). demoCourse.lst is available for most"
+" courses and adds the \"practice users\" which activate guest logins to the "
+"class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:23
+msgid ""
+"This is the administration course which is used to manage courses on this "
+"server.  Use the \"Admin Menu\" to select the desired action."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1996
+msgid ""
+"This is the default number of attempts a student must make before hints will"
+" be shown to the student. Set this to -1 to hide hints.  Note that this can "
+"be overridden with a per problem setting."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1712
+msgid ""
+"This is the default number of attempts before show me another becomes "
+"available to students.  It can be set to -1 to disable show me another by "
+"default."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1601
 msgid ""
 "This is the number of achievement points given to each user for completing a"
 " problem."
 msgstr "Ceci est le nombre de points d'accomplissements attribué à chaque utilisateur pour la complétion d'un problème."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:166
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:150
 msgid ""
 "This is the only part of the score that is actually saved. This is computed "
 "from the answer sub scores above using the weights shown if they are "
@@ -7005,142 +9464,314 @@ msgid ""
 " scores will be ignored)."
 msgstr "Ceci est la seule partie du pointage qui sera enregistré. Ceci est compiler à partir du sous pointage de la réponse après usage des pondérations si elles sont modifiées. Il vous est possible d'inscrire un pointage ici (le sous pointage sera alors ignoré)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:388
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:19
+msgid "This is the standard entry point for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:92
+msgid ""
+"This is where email messages and templates are saved. You can upload or "
+"download files in this directory if you wish to save the files for later."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:77
 msgid ""
-"This is the past answer viewer.  Students can only see their answers, and "
-"they will not be able to see which parts are correct.  Instructors can view "
-"any users answers using the form below and the answers will be colored "
-"according to correctness."
-msgstr "Ceci permet de consulter les réponses antérieures. Les étudiants pourront seulement voir leurs réponses, sans information sur ce qui est correct ou non. Le professeur peut consulter toutes les réponses en utilisant les champs plus bas et les réponses seront colorées en fonction de si elles sont correct ou non."
+"This is where you edit the text of the problem template. Type Ctrl-Enter "
+"while this window has focus to re-render the problem."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2462
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:669
 msgid ""
 "This is your last submission.  If you say yes, then your answers will be "
 "final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2466
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:673
 msgid ""
 "This is your only submission.  If you say yes, then your answers will be "
 "final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3038
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:42
+msgid ""
+"This link gives details for many macros. It links to documentation embedded "
+"in the macro files themselves."
+msgstr ""
+
+#. ('PGMLLab/PGML-lab.pg')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:63
+msgid ""
+"This links to a WeBWorK \"problem\" which allows you to try out fragments of"
+" PGML code. This link will not be available if the file %1 is not located in"
+" the templates directory of the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:33
+msgid "This links to a list of problem authoring techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:39
+msgid "This links to a page describing Math Object usage."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:72
+msgid "This links to problem authoring information on the WeBWorK wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:46
+msgid ""
+"This may be Mathjax, images, or plainText. Only the options that are enabled"
+" for the course will be available to select. This option is only visible if "
+"there is more than one display mode enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:42
+msgid "This option shows all pg problems in the course directory structure."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:47
+msgid ""
+"This option shows all problems in set definition files that are located in "
+"the course directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:44
+msgid ""
+"This option shows all problems in sets that have been created in the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:20
+msgid ""
+"This page allows one to edit the contents of PG problem files as well as set"
+" headers and other files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:20
+msgid ""
+"This page allows users to change their password, email address, and display "
+"settings used in problems. Note that you can hide this page entirely for "
+"students by setting permission levels to login_proctor or higher for the "
+"permissions to change password, change e-mail address, and change display "
+"settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:20
+msgid ""
+"This page allows you to configure course settings such as permission levels,"
+" display modes allowed, default display mode, email feedback behavior, and "
+"much more."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:20
+msgid ""
+"This page displays a student's current achievement level and progress toward"
+" the next level, and lists the rewards and badges that the student has "
+"earned. If rewards have been earned, then the student may also redeem those "
+"rewards."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:26
+msgid ""
+"This page gives access to information about the student, independent of the "
+"homework sets assigned to them."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:20
+msgid ""
+"This page gives information about mass LTI grade updates, and allows you to "
+"trigger a grade update for all users and all sets, all sets for one user, "
+"all users for one set, or one user for one set.  When a user is selected, "
+"the sets drop down menu is updated to only allow selecting sets assigned the"
+" selected user.  Similarly when a set is selected, the user menu is updated "
+"to only allow selecting valid users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:20
+msgid ""
+"This page is a collection of tools to modify users and sets.  These tools "
+"are short cuts for common actions that allow selecting multiple users or "
+"sets to act on at once.  Because multiple users and sets can be acted on at "
+"the same time, it is often more efficient to use this page when modifying "
+"multiple items.  For example, after selecting several users and a set you "
+"can change the close date for all selected users for that set.  This page "
+"also gives access to \"View/Edit all sets for one user\", which can be used "
+"to access settings for all sets including test versions for that user."
+msgstr ""
+
+#. (q(table to save any changes.  Each student's name links to that student's
+#. problem and opens up the)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:20
+msgid ""
+"This page is for manually grading a problem for all assigned students.  The "
+"table of students shows their last answers, percent score, and feedback "
+"comment.  The \"Save\" button is located below the "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:20
+msgid ""
+"This page is used to browse problems that will be used to fill problem sets."
+" The first step is to choose which set you are working on. If you need to "
+"create a new problem set fill in the blank next to the \"Create a New Set in"
+" This Course\" button and then press the button. Then choose which set you "
+"want to work on in the drop down menu."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:20
+msgid ""
+"This page is useful for monitoring student progress on assignments. Student "
+"progress can either be viewed for a single set or for a single student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:20
+msgid ""
+"This page manages all of the homework sets (including quizzes/tests). The "
+"following allow editing directly of a single problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:20
+msgid ""
+"This page shows the student's current grades for all sets they are assigned "
+"to.  Only visible sets are shown to the student, while invisible set names "
+"are italic when viewed as an instructor.  Students can only see the per "
+"problem grades on open assignments."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3169
 msgid "This problem contains a video which must be viewed online."
 msgstr "Ce problème contient une vidéo qui doit être consultée en ligne."
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:602
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:631
 msgid "This problem has more than one part."
 msgstr "Ce problème comporte plusieurs parties."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2059
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2293
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1323
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1576
 msgid ""
 "This problem has open subproblems.  You can visit them by using the links to"
 " the left or visiting the set page."
 msgstr "Ce problème est décomposé en sous-problèmes auxquels vous pouvez accéder en cliquant sur leurs liens dans le menu à gauche ou en retournant à la page principale du devoir."
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem.html.ep:66
+msgid "This problem is not valid."
+msgstr ""
+
 #. ($prettyID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2619
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:399
 msgid "This problem uses the same source file as number %1."
 msgstr "Ce problème possède le même fichier source que le problème %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:418
 msgid "This problem will not count towards your grade."
 msgstr "La note obtenue à ce problème ne comptera pas dans votre résultat final."
 
-#. ($EMAIL)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1109
+#. ($ur->email_address)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:1
 msgid "This sample mail would be sent to %1"
 msgstr "Cet exemple de courriel serait envoyé à %1"
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2088
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1399
 msgid ""
 "This score for this problem does not count for the score of problem %1 or "
 "for the set."
 msgstr "La note obtenue à ce problème ne compte pas dans le résultat du problème %1 ou dans le résultat total du devoir. "
 
-#. ($message_file,		$merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:167
+#. ($message_file,				$merge_file)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:127
 msgid ""
 "This scoring message is generated from [TMPL]/email/%1. It is merged with "
 "the file [Scoring]/%2. These files can be edited using the \"Email\" link "
 "and the \"File Manager\" link in the left margin."
 msgstr "This scoring message is generated from [TMPL]/email/%1. It is merged with the file [Scoring]/%2. These files can be edited using the \"Email\" link and the \"File Manager\" link in the left margin."
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2215
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:155
 msgid "This set %1 is assigned to %2."
 msgstr "Le devoir %1 est attribué à %2."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2932
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:678
 msgid "This set doesn't contain any problems yet."
 msgstr "Ce devoir ne contient pas encore de problèmes."
 
-#. ($beginReducedScoringPeriod, $dueDate, $reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:334
+#. ($c->formatDateTime($reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:44
 msgid ""
 "This set had a reduced scoring period that started on %1 and ended on %2.  "
 "During that period all work counted for %3% of its value."
 msgstr "Ce devoir avait une période de grâce qui débutait le %1 et se terminait le %2. Tous les points obtenus pendant cette période comptaient pour %3 % de la note."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:78
 msgid ""
 "This set has a set-level proctor password to authorize logins. Enter the "
 "password below."
 msgstr "Pour faire ce test, vous devez entrer ci-dessous le mot de passe d'authentification fourni par votre professeur ou votre surveillant."
 
-#. (CGI::span({class=>$visiblityStateClass}, $visiblityStateText)
-# Context is "This set is visible" or "This set is hidden"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:532
-msgid "This set is %1"
-msgstr "Ce devoir est %1"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:411
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:59
 msgid "This set is hidden from students."
 msgstr ""
 
 #. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:330
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:40
 msgid ""
 "This set is in its reduced scoring period.  All work counts for %1% of its "
 "value."
 msgstr "Ce devoir a une période de grâce d'évaluation. Tous les points obtenus pendant cette période comptent  pour %1 % de la note."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:65
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:51
+msgid "This set is not assigned to any students."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:57
 msgid "This set is visible to students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:190
-msgid "This set needs to be assigned to you before you can grade it."
-msgstr "Ce devoir doit d'abord vous être attribué pour que vous puissiez ensuite soumettre vos réponses."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:42
+msgid "This set or problem is not valid."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:158
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:164
 msgid ""
 "This set will be unavailable to students until they have earned a certain "
-"score on the sets specified in this field.  The sets should be written as a "
-"comma separated list.  The minimum score required on the sets is specified "
-"in the following field."
-msgstr "Ce devoir ne sera pas disponible pour les étudiants à moins qu'ils aient atteint une note minimale dans tous les devoirs spécifiés dans la case. Les devoirs, s'il y en a plusieurs, doivent être séparés par une virgule. Choisir la note minimale requise par les étudiants ci-dessous."
+"score on the sets specified in this field. The sets should be written as a "
+"comma separated list. The minimum score required on the sets is specified in"
+" the following field."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2007
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:111
+msgid ""
+"This should be done cautiously. Once a student is deleted from a course "
+"their data is lost forever and cannot be recovered. They can be added to the"
+" course as a new student, but all of their homework set assignments and "
+"homework has been permanently deleted."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1962
 msgid "This source file does not exist!"
 msgstr "Ce fichier source n'existe pas!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1961
 msgid "This source file is a directory!"
 msgstr "Cette source est un dossier!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1963
 msgid "This source file is not a plain file!"
 msgstr "Ce fichier source n'est pas un fichier brut!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2005
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1960
 msgid "This source file is not readable!"
 msgstr "Le fichier source n'est pas lisible!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:358
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+msgid ""
+"This specifies the number of attempts before hints are shown to students. "
+"The value of -2 uses the default from course configuration. The value of -1 "
+"disables hints. Note that this will only have an effect if the problem has a"
+" hint."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
 msgid ""
 "This specifies the rerandomization period: the number of attempts before a "
 "new version of the problem is generated by changing the Seed value. The "
@@ -7148,134 +9779,175 @@ msgid ""
 "disables rerandomization."
 msgstr "Cette valeur définit le nombre d'essais dont les étudiants disposent pour résoudre le problème avant de devoir continuer leur travail avec une nouvelle version générée aléatoirement, c'est-à-dire dont la valeur d'amorce (seed) a été changée. Pour utiliser la valeur par défaut définie dans la configuration du cours, entrer la valeur -1. Pour désactiver cette fonction, entrer la valeur 0."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:651
-msgid ""
-"This table lists the current attempts for this test/quiz, along with its "
-"status, score, start date, and close date. Click on the version link to "
-"access that version. "
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:626
-msgid "This test is closed."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:548
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:81
 msgid "This test requires a proctor password to continue."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:600
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:126
 msgid "This test requires a proctor password to start."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2248
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2323
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:45
+msgid "This will determine if the output is in one or two columns."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:21
 msgid "Time"
 msgstr "Heure"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:249
 msgid "Time Interval for New Test Versions (min; 0=infty)"
 msgstr "Laps de temps pour effectuer différentes versions du test  (min; 0=infinité)"
 
-#. ($elapsedTime,$allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:159
+msgid "Time Remaining"
+msgstr ""
+
+#. ($c->{elapsedTime}, sprintf('%.0f', 10 * ($c->{set}->due_date -
+#. $c->{set}->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:336
 msgid "Time taken on test: %1 min (%2 min allowed)."
 msgstr "Durée de passation du test : %1 min (%2 min alloués)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
 msgid "Timestamp"
 msgstr "Horodatage"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1610
+#: /opt/webwork/webwork2/conf/defaults.config:1512
 msgid "Timezone for the course"
 msgstr "Fuseau horaire pour le cours"
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:512
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:330
 msgid "To access this set you must score at least %1% on set %2."
 msgstr "Pour accéder à ce devoir, vous devez obtenir au moins %1 % au devoir %2."
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:514
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:336
 msgid ""
 "To access this set you must score at least %1% on the following sets: %2."
 msgstr "Pour accéder à ce devoir, vous devez obtenir au moins %1 % aux devoirs suivants : %2."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:53
 msgid ""
 "To add an additional instructor to the new course, specify user information "
 "below. The user ID may contain only numbers, letters, hyphens, periods "
 "(dots), commas,and underscores."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:42
 msgid ""
 "To add the WeBWorK administrators to the new course (as administrators) "
 "check the box below."
 msgstr "Pour ajouter l'administrateur WeBWorK à un nouveau cours (comme administrateur) cocher la case ci-dessous."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:239
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:118
+msgid ""
+"To assign one or more sets to an individual student click in the column "
+"\"Assigned Sets\" in the student's row. This will take you to a page where "
+"you can assign and unassign homework sets and change the due dates for "
+"homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:79
 msgid ""
 "To change status (scores or grades) for this student for one set, click on "
 "the individual set link."
 msgstr "Pour modifier des données relatives aux problèmes d'un devoir (notes, pondération, etc.) pour cet étudiant, cliquer sur le devoir dans le tableau."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:621
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:106
+msgid ""
+"To copy the templates and html folders from an existing course, select the "
+"course below."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:102
 msgid ""
-"To copy problem templates from an existing course, select the course below."
-msgstr "Pour copier les modèles de problèmes d'un cours existant, sélectionner le cours ici-bas."
+"To drop a student or students, select them for editing as described above "
+"and then set the pop-up list to enrolled,drop, or audit. Dropped students "
+"cannot log in to the course, are not assigned new homework sets and are not "
+"sent e-mail. They can be re-enrolled simply by changing their status back to"
+" enrolled. No data is lost, any homework sets assigned before they were "
+"dropped are restored unchanged."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2200
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:143
 msgid ""
 "To edit a specific student version of this set, edit (all of) her/his "
 "assigned sets."
 msgstr "Les changements effectués aux données de ce quiz affecteront toutes les versions de ce quiz attribuées à cet étudiant."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:376
-msgid ""
-"To edit this text you must first make a copy of this file using the "
-"'NewVersion' action below."
-msgstr "Pour modifier ce fichier, vous devez d'abord en faire une copie en cliquant sur <b>Nouvelle version</b> ci-dessous."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:381
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:29
 msgid ""
-"To edit this text you must use the 'NewVersion' action below to save it to "
-"another file."
-msgstr "Pour modifier ce fichier, vous devez cliquer sur <b>Nouvelle version</b> ci-dessous afin de l'enregistrer sous un autre fichier."
+"To perform an action select the desired action tab and click the submit "
+"button."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1343
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:90
 msgid "To this Problem"
 msgstr "À ce problème"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:143
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:69
+msgid ""
+"To use the Email merge feature, upload a CSV with calculated grades to the "
+"scoring directory using the \"File Manager\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:767
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:58
+msgid "Today"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:33
+msgid "Toggle each of the options to include or not include in the output."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:522
+msgid "Top Score"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:118
+msgid "Top level of author information on the wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:114
+msgid "Total Points"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:18
 msgid "Total Points:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:90
 msgid "Totals"
 msgstr "Total du cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:290
 msgid "Totals only (not problem scores)"
 msgstr "Que la note totale (pas celle des problèmes)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:291
 msgid "Totals only, only after answer date"
 msgstr "Que la note totale, après que les réponses sont disponibles"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:236
 msgid "Transfer"
 msgstr "Gérer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:284
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:22
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:35
 msgid "True"
 msgstr "Vrai"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1279
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:245
 msgid "Try it"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:26
 msgid "Tunic of Extension"
 msgstr "La tunique de l'extension"
 
@@ -7283,209 +9955,340 @@ msgstr "La tunique de l'extension"
 msgid "Two Columns"
 msgstr "Deux colonnes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1470
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:30
 msgid "Type"
 msgstr "Type"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2325
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:84
+msgid "Type:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:23
 msgid "URI"
 msgstr "URI"
 
 #. ($achievementName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:297
 msgid "Unable to change the evaluator for set %1. Unknown error."
 msgstr "Impossible de modifier l'évaluateur pour le devoir %1. Erreur inconnue."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:819
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1084
+msgid "Unable to change the hardcopy header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1070
+msgid "Unable to change the set header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{fullSetID}, $c->{prettyProblemNumber})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1110
+msgid ""
+"Unable to change the source file path for set %1, problem %2. Unknown error."
+msgstr ""
+
+#. ($c->shortPath($delFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1246
+msgid "Unable to delete backup file \"%1\"."
+msgstr ""
+
+#. ($formatBackupTime)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:571
+msgid "Unable to delete backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:888
+msgid "Unable to make \"%1\" the hardcopy header for %2."
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:860
+msgid "Unable to make \"%1\" the set header for %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:693
 msgid "Unable to obtain error messages from within the PG question."
 msgstr "Impossible d'obtenir les messages d'erreur associés à cette question PG."
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:384
-msgid "Unable to write to '%1': %2"
-msgstr "Impossible d'écrire sur '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:275
+msgid "Unable to open a temporary file at the given location."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2613
+#. ($c->shortPath($backupFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1233
+msgid "Unable to read backup file \"%1\"."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:636
+msgid "Unable to write to \"%1\": %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:15
 msgid "Unarchive"
 msgstr "Désarchiver"
 
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2596
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:4
 msgid "Unarchive %1 to course:"
 msgstr "Désarchiver %1 dans le cours:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2581
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:40
 msgid "Unarchive Course"
 msgstr "Désarchiver le cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2675
-msgid "Unarchive Next Course"
-msgstr "Désarchiver le cours suivant"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:17
+msgid "Unarchive Course Help"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:214
-msgid "Unassign All Sets"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:25
+msgid "Unarchive Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:281
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1306
+msgid "Unarchive Next Course"
+msgstr "Désarchiver le cours suivant"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:97
 msgid "Unassign from All Users"
 msgstr "Retirer le devoir à tous les utilisateurs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:61
 msgid "Unassign selected sets from selected users"
 msgstr "Retirer les devoirs sélectionnés à tous les utilisateurs sélectionnés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:58
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:57
 msgid ""
-"Unassignments were not done.  You need to both click to \"Allow unassign\" "
-"and click on the Unassign button."
-msgstr "Les retraits n'ont pas été effectués. Vous devez cocher <b>Permettre de retirer le devoir</b> et cliquer sur le bouton <b>Retirer le devoir à tous les utilisateurs</b>."
+"Unassignments were not done.  You need to select \"Allow unassign\" and then"
+" click on the Unassign button."
+msgstr ""
 
 #. ($unattempted, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1047
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:44
 msgid "Unattempted: %1/%2"
 msgstr "Essais restants : %1/%2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:53
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:37
 msgid "Unclassified Problems"
 msgstr "Problèmes non classés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:242
 msgid "Ungraded"
 msgstr "Non classé"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3723
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3765
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:58
 msgid "Unhide Courses"
 msgstr "Rendre le cours visible"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1465
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1151
+msgid "Unkown saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:28
 msgid ""
-"Unlock an additional version of a Gateway Test.  If used before the close "
-"date of the Gateway Test this will allow you to generate a new version of "
-"the test."
-msgstr "Déverrouiller une version additionnelle de la passerelle de test. Si elle est utilisée avant la date de fermeture de la passerelle de test cela permettra de générer une nouvelle version du test."
+"Unlock an additional version of a test.  If used before the close date of "
+"the test this will allow you to generate a new version of the test."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:164
-msgid "Unpack"
-msgstr "Décompresser"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:47
+msgid "Unpack Archive"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:113
 msgid "Unpack archives automatically"
 msgstr "Décompresser les archives automatiquement"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2709
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:15
 msgid "Unselect all courses"
 msgstr "Décocher tous les cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:130
-msgid "Update"
-msgstr "Modifier"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:63
 msgid "Update Display"
 msgstr "Actualiser l'affichage"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:930
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:84
+msgid "Update Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:27
+msgid "Update Interval"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:102
 msgid "Update Menus"
 msgstr "MAJ des menus"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:729
-msgid "Update settings and refresh page"
-msgstr "Mettre les paramètres à jour et actualiser la page"
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:51
+msgid "Update aborted. Invalid set %1."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:47
+msgid "Update aborted. Invalid user %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:67
+msgid "Update set:"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2695
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:8
 msgid "Update the checked directories?"
 msgstr "Mettre à jour les répertoires sélectionnés?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3544
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:50
+msgid "Update user:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1908
 msgid "Updated location description."
 msgstr "Mettre à jour la description de l'emplacement."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2739
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2917
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:40
 msgid "Upgrade"
 msgstr "Mettre à jour"
 
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
 msgid "Upgrade %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1327
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2278
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:97
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:79
 msgid "Upgrade Course Tables"
 msgstr "Mettre à jour les tableaux du cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2693
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2761
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:382
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:42
 msgid "Upgrade Courses"
 msgstr "Mettre à jour les cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3010
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:17
+msgid "Upgrade Courses Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:43
+msgid "Upgrade courses from a previous version of WeBWorK."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1582
 msgid "Upgrade process completed"
 msgstr "Mise à jour complétée"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:388
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:65
 msgid "Upload"
 msgstr "Téléverser"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2441
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:72
+msgid ""
+"Upload, download and delete text files, including scoring spread sheets, set"
+" definition files, class list spread sheets, and \"PG\" problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:292
 msgid "Use Default Header File"
 msgstr "Utiliser le fichier d'entête par défaut"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:325
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:127
 msgid "Use Equation Editor?"
 msgstr "Utiliser l'éditeur d'équations?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:204
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:20
 msgid "Use Reward"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2720
-msgid "Use System Default"
-msgstr "Utiliser les valeurs systèmes par défaut"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:516
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:27
 msgid "Use browser back button to return from preview mode."
 msgstr ""
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:506
+#. (tag('b', $c->{achievementID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:16
 msgid "Use in achievement %1"
 msgstr "Utiliser dans l'accomplissement %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:526
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:23
 msgid "Use in new achievement:"
 msgstr "Utiliser dans le nouvel accomplissement:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:149
 msgid "Use live equation rendering?"
 msgstr "Utilisez le rendu d'équation en direct?"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2028
+#: /opt/webwork/webwork2/conf/defaults.config:1929
 msgid "Use log base 10 instead of base <i>e</i>"
 msgstr "Utiliser la fonction log en base 10 au lieu d'en base <i>e</i>"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2034
+#: /opt/webwork/webwork2/conf/defaults.config:1935
 msgid "Use older answer checkers"
 msgstr "Utiliser l'ancien évaluateur de réponses"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:234
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:123
+msgid ""
+"Use the \"Create\" and \"Delete\" actions to create or delete achievements. "
+"Note that deleting an achievement will delete all data associated to the "
+"achievement and cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:35
+msgid ""
+"Use the \"Merge file\" drop down menu to select which merge file to use, or "
+"select \"None\" to not use any merge file.  When a merge file is selected, "
+"the data for active students will be displayed above the \"Email Body\".  "
+"This will show you the structure of the merge file and the column variables "
+"associated with each column.  Data that is longer than 7 characters will be "
+"truncated, and the data can be scrolled up and down to see all rows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:28
+msgid ""
+"Use the \"Users\" and \"Sets\" forms to select which users and sets to act "
+"on.  Multiple items can be selected using ctrl-click or shift-click.  The "
+"action buttons are grouped into three categories.  The first is a set of "
+"actions that act on the selected users, the second is a set of actions that "
+"act on the selected sets, and the third is a set of actions for acting on a "
+"combination of sets and users.  If an invalid number of users or sets are "
+"selected, the action will not be preformed, and an error message will be "
+"placed on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:25
+msgid ""
+"Use the editor to edit the evaluator and the action form at the bottom to "
+"save the evaluator. You can either overwrite the current evaluator file or "
+"save as a new evaluator file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:15
 msgid ""
 "Use the interface below to quickly access commonly-used instructor tools, or"
 " select a tool from the list to the left."
 msgstr "Utiliser l'interface ci-dessous pour accéder rapidement aux différents outils à la disposition des enseignants ou sélectionner une option dans le menu principal."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:332
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:26
+msgid ""
+"Use the options in the second box to pick a collection of problems decribed "
+"below. In each case, clicking \"View Problems\" will render a fixed number "
+"of problems (default of 20). After problems are shown, there will be options"
+" to show the next/previous batch of problems, add all problems to the target"
+" set (set at the top of the page) or clear the curent batch of problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:27
 msgid ""
 "Use this form to ask your instructor a question, to report a problem with "
 "the WeBWorK system, or to report an error in a problem you are attempting. "
@@ -7493,73 +10296,103 @@ msgid ""
 "system will be included."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:29
+msgid "Use this page to change your password."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:20
+msgid ""
+"Use this page to send emails to active (enrolled or auditing) students.  "
+"Emails can be sent to all active students or selected students.  Use the "
+"\"Students\" form to sort, filter, or format how the user name is displayed."
+"  Click \"Change Display Settings\" to apply any changes.  Use control-click"
+" or shift-click to select multiple students to email."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:67
+msgid ""
+"Used for \"counting\" achievements, which sets the value a counter must "
+"reach in order to earn the achievement. For example this is used counting "
+"the number of completed problems."
+msgstr ""
+
+#. (param('user')
+#. (param('effectiveUser')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:7
+msgid "User \"%1\" not found."
+msgstr ""
+
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:324
 msgid ""
-"User '%1' will not be copied from admin course as it is the initial "
+"User \"%1\" will not be copied from admin course as it is the initial "
 "instructor."
-msgstr "L'utilisateur '%1' ne sera pas copié à partir du cours admin car il s'agit de l'enseignant initial."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:557
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:34
+msgid "User %1 not found."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:217
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:64
 msgid "User ID"
 msgstr "Nom d'utilisateur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:298
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:230
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:28
 msgid "User Settings"
 msgstr "Paramètres de l'utilisateur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:490
-msgid "User Value"
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:17
+msgid "User Settings Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:52
-msgid "User has been assigned to all current sets."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:576
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:13
+msgid "User overrides"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:58
-msgid "User has been unassigned from all sets."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:247
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:62
 msgid "User's name is:"
 msgstr "Le nom de l'utilisateur est :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:68
-msgid "User's sets have been reassigned."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:60
 msgid "User's username is:"
 msgstr "Le nom d'utilisateur de l'utilisateur est :"
 
 #. ($user, $setID, $j)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1077
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
 msgid ""
 "UserProblem missing for user=%1 set=%2 problem=%3. This may indicate "
 "database corruption."
 msgstr "ProblèmeUsagé manquant pour utilisateur=%1 devoir=%2 problème=%3. Ceci indique peut-être que la base de données est corrompue."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:51
 msgid "Username"
 msgstr "Nom d'utilisateur "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:499
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:126
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:272
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:9
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:339
 msgid "Users Assigned to Set %2"
 msgstr "Utilisateurs désignés pour le devoir %2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2077
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:17
+msgid "Users Assigned to Set Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:65
 msgid "Users List"
 msgstr "Liste d'utilisateurs"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1925
+#: /opt/webwork/webwork2/conf/defaults.config:1827
 msgid ""
 "Users at this level and higher are allowed to change display settings used "
 "in pg problems.Note that if it is expected that there will be students that "
@@ -7568,31 +10401,31 @@ msgid ""
 "those students may need to disable MathQuill."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1915
+#: /opt/webwork/webwork2/conf/defaults.config:1817
 msgid ""
 "Users at this level and higher are allowed to change their e-mail address. "
 "Normally guest users are not allowed to change the e-mail address since it "
 "does not make sense to send e-mail to anonymous accounts."
 msgstr "Les utilisateurs de ce niveau de permission ou d'un niveau supérieur sont autorisés à modifier leur adresse courriel. De façon générale, un utilisateur <em>invité</em> n'est pas autorisé à modifier son adresse courriel, car on n'envoie évidemment pas un courriel à un compte anonyme."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1879
+#: /opt/webwork/webwork2/conf/defaults.config:1781
 msgid ""
 "Users at this level and higher are allowed to change their password. "
 "Normally guest users are not allowed to change their password."
 msgstr "Les utilisateurs de ce niveau de permission ou d'un niveau supérieur sont autorisés à modifier leur mot de passe. De façon générale, un utilisateur <em>invité</em> n'est pas autorisé à modifier son mot de passe."
 
-#. ($names{$primary}, $names{$secondary}, $names{$ternary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:924
+#. ($c->maketext(FIELD_PROPERTIES()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:316
 msgid "Users sorted by %1, then by %2, then by %3"
 msgstr "Les utilisateurs ont été triés par %1, puis par %2 et ensuite par %3."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1906
+#: /opt/webwork/webwork2/conf/defaults.config:1808
 msgid ""
 "Users with at least this permission level get a link in the left panel for "
 "reporting bugs to the bug tracking system at bugs.webwork.maa.org."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2140
+#: /opt/webwork/webwork2/conf/defaults.config:2051
 msgid ""
 "Users with this permssion level or greater will automatically be sent "
 "feedback from students (generated when they use the \"Contact instructor\" "
@@ -7601,157 +10434,225 @@ msgid ""
 "permission level to \"nobody\"."
 msgstr "Les utilisateurs de ce niveau de permission ou d'un niveau supérieur recevront automatiquement les courriels envoyés par les étudiants qui cliquent sur le bouton <b>Envoyer un courriel au professeur</b>. Il est possible, sur la ligne en dessous, de spécifier des adresses de courriel supplémentaires auxquelles les messages des étudiants seront envoyés. Si vous sélectionnez <b>aucun rôle</b> dans la liste, les messages des étudiants seront envoyés uniquement aux adresses de courriel qui figurent en dessous."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1348
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:193
 msgid "Uses Math Objects"
 msgstr ""
 
-#. ($default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:197
-msgid "Using contents of the default message %1 instead."
-msgstr "Utilisation du contenu du message par défaut %1."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1239
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:18
 msgid "Using what display mode?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1214
-msgid "Using what seed?"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:6
+msgid "Using what seed?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:19
+msgid "Using which hardcopy format?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:49
+msgid "Using which hardcopy theme?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:31
+msgid ""
+"Usually means students must demonstrate understanding of facts. This is more"
+" than regurgitating the fact. We use this category for simple and direct "
+"applications of algorithms the student has studied. There should be no "
+"judgement involved in choosing the method. This would include a simple "
+"application of a rule for differentiation (e.g., can combine rules for sums "
+"and constant multiples with one more advanced rule) or for integrals."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Value"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1747
+#: /opt/webwork/webwork2/conf/defaults.config:1649
 msgid "Value of work done in Reduced Scoring Period"
 msgstr "Pondération pendant la période de grâce d'évaluation"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:687
-msgid "Variable Documentation:"
-msgstr "Documentation pour cette variable :"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config/config_help.html.ep:20
+msgid "Variable Documentation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:115
+msgid "Version"
+msgstr ""
 
 #. ($ver->{version})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:679
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:173
 msgid "Version %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:159
 msgid "Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:43
 msgid "Versions of a set can only be edited for one user at a time."
 msgstr "Les versions d'un devoir peuvent seulement être modifiées pour un utilisateur à la fois."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:128
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2419
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2756
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:528
 msgid "View"
 msgstr "Afficher"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1000
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:488
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:523
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:681
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:948
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:6
 msgid "View Problems"
 msgstr "Voir les problèmes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:276
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:57
+msgid "View details of student perofrmance either by individual or by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:86
 msgid "View equations as"
 msgstr "Affichage des équations "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:283
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:18
 msgid "View statistics by set"
 msgstr "Voir les statistiques des étudiants par devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:19
 msgid "View statistics by student"
 msgstr "Voir les statistiques d'un étudiant"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:55
+msgid ""
+"View statistics of students' performance on homework either by individual or"
+" by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:14
 msgid "View student progress by set"
 msgstr "Voir le progrès des étudiants par devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:303
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:15
 msgid "View student progress by student"
 msgstr "Voir le progrès individuel d'un étudiant"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:65
 msgid "View/Edit"
 msgstr "Voir/Modifier"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:224
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:90
-msgid "Viewing temporary file:"
-msgstr "Affichage du problème temporaire :"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:104
+msgid "View/Reload"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:766
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:790
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:31
+msgid "View/access current and archived courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:146
+msgid "Viewing Problems in a New Window"
+msgstr ""
+
+#. ($c->{problem}->source_file)
+#. ($screenSetHeader)
+#. ($course_info_path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:81
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:109
+msgid "Viewing temporary file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:25
 msgid "Visibility"
 msgstr "Visibilité"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:915
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:7
 msgid "Visible"
 msgstr "Visible"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:622
 msgid "Visible sets were selected for export."
 msgstr "Les devoirs visibles ont été sélectionnés pour être exportés."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
 msgid "Visible to Students"
 msgstr "Visible pour les étudiants"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2269
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:844
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "Warning"
 msgstr "Avertissement"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2319
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:13
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:117
 msgid "Warning messages"
 msgstr "Messages d'avertissement"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1039
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:259
+msgid "Warning messages:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all set-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1035
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all user-related data and is not undoable!"
 msgstr "Avertissement&#8239;: l'action de supprimer détruit toutes les données relatives aux utilisateurs et est irréversible."
 
-#. ($problem_desc , CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1397
+#. ($problem_desc,				$c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1194
 msgid "Warnings encountered while processing %1. Error text: %2"
 msgstr "Avertissements rencontrés lors du traitement de %1. Détails de l'erreur : %2"
 
-#. ($copyright_years, $theme, $ww_version, $pg_version)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1261
-msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4 |"
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:39
+msgid ""
+"We use this for carrying out more complicated algorithms, such as "
+"derivatives using both the product and chain rule or integrals which involve"
+" say both a substitution and parts."
+msgstr ""
+
+#. ($ce->{WW_COPYRIGHT_YEARS} || '1996-2023',              $ce->{defaultTheme}
+#. || 'unknown -- set defaultTheme in localOverides.conf',
+#. $ce->{WW_VERSION}         || 'unknown -- set WW_VERSION in VERSION',
+#. $ce->{PG_VERSION}         || 'unknown -- set PG_VERSION in ../pg/VERSION')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:9
+msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2227
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:3
 msgid "WeBWorK Error"
 msgstr "Erreur WeBWorK"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:3
 msgid "WeBWorK Warnings"
 msgstr "Avertissements WeBWorK"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1549
+#: /opt/webwork/webwork2/conf/defaults.config:1451
 msgid ""
 "WeBWorK currently has translations for the languages listed in the course "
 "configuration."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:20
+msgid ""
+"WeBWorK does not have a full featured scoring ability. We leave that to your"
+" favorite spreadsheet application."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:38
+msgid ""
+"WeBWorK expects many files to be in certain locations.  The following "
+"describe this. Note that by default the File Manager shows the \"templates\""
+" directory.  Other directories mentioned below are at the same level and "
+"need to be accessed by going up a directory by clicking the \"^\" button "
+"above the file list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:6
 msgid ""
 "WeBWorK has encountered a software error while attempting to process this "
 "problem. It is likely that there is an error in the problem itself. If you "
@@ -7760,7 +10661,7 @@ msgid ""
 " more information."
 msgstr "WeBWorK has encountered a software error while attempting to process this problem. It is likely that there is an error in the problem itself. If you are a student, report this error message to your professor to have it corrected. If you are a professor, please consult the error output below for more information."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:6
 msgid ""
 "WeBWorK has encountered warnings while processing your request. If this "
 "occured when viewing a problem, it was likely caused by an error or "
@@ -7770,19 +10671,19 @@ msgid ""
 " warning output below for more information."
 msgstr "WeBWorK has encountered warnings while processing your request. If this occured when viewing a problem, it was likely caused by an error or ambiguity in that problem. Otherwise, it may indicate a problem with the WeBWorK system itself. If you are a student, report these warnings to your professor to have them corrected. If you are a professor, please consult the warning output below for more information."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:577
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:558
 msgid ""
 "WeBWorK was unable to generate a different version of this problem.  Close "
 "this tab, and return to the original problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:367
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:29
 msgid ""
 "WeBWorK was unable to generate a paper copy of this homework set.  Please "
 "inform your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:78
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
 msgid ""
 "WeBWorK will automatically create users when logging in via the LMS for the "
 "first time. If this flag is enabled then it will also keep the user account "
@@ -7792,36 +10693,44 @@ msgid ""
 "next time the user logs in."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:370
 msgid "Weight"
 msgstr "Pond."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:6
 msgid "Welcome to WeBWorK!"
 msgstr "Bienvenue sur WeBWorK!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:24
+msgid ""
+"What WeBWorK does have is good support for summarizing the scores on WeBWorK"
+" homework sets and tests and exporting them in a form (.csv) which any "
+"spreadsheet can use. WeBWorK reports all of the homework grades with options"
+" shown below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:27
 msgid "What could be inside?"
 msgstr "Qu'est-ce qui se trouve à l'intérieur?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:715
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:17
 msgid "What field should filtered users match on?"
 msgstr "Filtrer les utilisateurs selon ce champ "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
 msgid ""
 "When a student has more attempts than is specified here they will be able to"
 " view another version of this problem.  If set to -1 the feature is disabled"
 " and if set to -2 the course default is used."
 msgstr "S'il reste à un étudiant plus d'essais que la valeur entrée ici, il aura la possibilité de voir une autre version du problème. Pour désactiver cette fonction, entrer la valeur -1. Pour utiliser la valeur par défaut du cours, entrer la valeur -2."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1899
+#: /opt/webwork/webwork2/conf/defaults.config:1801
 msgid ""
 "When acting as a student, this permission level and higher can submit "
 "answers for that student."
 msgstr "Un utilisateur de ce niveau de permission ou d'un niveau supérieur peut soumettre des réponses lorsqu'il joue le rôle d'un étudiant."
 
-#: /opt/webwork/webwork2/conf/defaults.config:2071
+#: /opt/webwork/webwork2/conf/defaults.config:1972
 msgid ""
 "When numerical answers are checked, most test if the student's answer is "
 "close enough to the programmed answer be computing the error as a percentage"
@@ -7830,7 +10739,7 @@ msgid ""
 "0.1 means 0.1 percent error is allowed.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2098
+#: /opt/webwork/webwork2/conf/defaults.config:2019
 msgid ""
 "When students click the <em>Email Instructor</em> button to send feedback, "
 "WeBWorK fills in the subject line.  Here you can set the subject line.  In "
@@ -7840,14 +10749,32 @@ msgid ""
 "recitation</li><li>%% = literal percent sign</li></ul>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1638
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:35
+msgid ""
+"When the class is very large not all students will be displayed. Using the "
+"first action on this page you can show only the students from a given "
+"recitation or from a given section, or only students whose login or last "
+"name fits a pattern match. The second action will sort the students "
+"currently being displayed. You can also sort the displayed students by "
+"clicking on the active links at the top of each column."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:56
+msgid ""
+"When the message is ready to send, click \"Send Email\". This will queue the"
+" email to be sent, which can take several minutes depending on the number of"
+" students selected.  You will be notified by email once all the emails have "
+"been sent."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1540
 msgid ""
 "When this is on students will see a line on the Grades page which has their "
 "total cumulative homework score.  This score includes all sets assigned to "
 "the student."
 msgstr "Si cette fonction est activée, les étudiants pourront voir, sur la page de leurs résultats, leur note totale cumulative pour tous les devoirs qui leur sont attribués."
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:90
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
 msgid ""
 "When this is true, then when a user enters WeBWorK from an external tool "
 "link in the LMS, the bottom of the screen will display the data that the LMS"
@@ -7855,23 +10782,56 @@ msgid ""
 "different LMS systems have different parameters."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1957
+#: /opt/webwork/webwork2/conf/defaults.config:1859
 msgid ""
 "When viewing a problem, WeBWorK usually puts the previously submitted answer"
 " in the answer blank.  Below this level, old answers are never shown.  "
 "Typically, that is the desired behaviour for guest accounts."
 msgstr "Lorsqu'un problème est affiché, WeBWorK écrit habituellement la dernière réponse enregistrée dans la case réponse. Pour les utilisateurs de ce niveau de permission ou d'un niveau inférieur, les anciennes réponses ne sont jamais affichées. Généralement, il s'agit de la situation souhaitée pour une personne qui a le rôle d' <em>invité</em>."
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:30
+msgid ""
+"When viewing progress for a single student, their grades page is shown which"
+" lists set totals and per problem grades for each set assigned to the "
+"student.  This shows the same information as the statistics page for the "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:26
+msgid ""
+"When viewing set statistics, the drop down menus can be used to show stats "
+"for individual sections, recitations, or problems.  The overall results "
+"include all students who are assigned to the set, while the individual "
+"problem results only include active (have attempted the problem) students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:24
+msgid ""
+"When viewing student progress for a set, the score for the set and the "
+"status for problems in the set are listed for all students.  The table can "
+"be sorted by clicking the links in the table header.  Click the student's "
+"name to access the student's set.  When viewing progress for a test, "
+"additional columns can be shown/hidden by updating the display at the top"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:74
+msgid ""
+"When you unassign a set from students, you destroy all of the data for the "
+"set for those students. If the set is re-assigned to these students, then "
+"they will receive new versions of problems in the set.  Make sure this is "
+"what you want to do before unassigning sets from students."
+msgstr ""
+
+#. (tag('b', $achievementID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:21
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for achievement %1 for this student. Make sure this is what you want to"
 " do."
 msgstr "Lorsque vous retirez l'accomplissement %1 d'un utilisateur en décochant sa case, vous détruisez toutes les données relatives à cette évaluation pour cet utilisateur. Assurez-vous de savoir ce que vous faites!"
 
-#. (CGI::b({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:146
+#. (tag('b', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:26
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for homework set %1 for this student. You will then need to reassign "
@@ -7879,7 +10839,7 @@ msgid ""
 "problems. Make sure this is what you want to do before unchecking students."
 msgstr "Lorsque vous retirez le devoir d'un utilisateur en décochant sa case, vous détruisez toutes les données relatives à cet étudiant pour le devoir %1. Si vous lui attribuez de nouveau ce devoir, il recevra une version différente de chaque problème. Assurez-vous de savoir ce que vous faites en décochant des cases!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:72
 msgid ""
 "When you uncheck a homework set (and save the changes), you destroy all of "
 "the data for that set for this student.   If you reassign the set, the "
@@ -7887,243 +10847,461 @@ msgid ""
 "you want to do before unchecking sets."
 msgstr "Lorsque vous retirez un devoir à un étudiant (et sauvegardez les modifications), vous détruisez toutes les données relatives à cet étudiant. Si vous lui attribuez de nouveau ce devoir, il recevra une version différente de chaque problème. Assurez-vous de savoir ce que vous faites en décochant des cases!"
 
-#. ($self->formatDateTime($set->open_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:343
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:87
+msgid "Wiki summary page for MathObjects"
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:444
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:167
 msgid "Will open on %1."
 msgstr "Sera disponible %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:49
+msgid "Word problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:15
 msgid "Worth"
 msgstr "Pondération"
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:382
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:51
+msgid "Write a new PG problem file or edit an existing one."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:188
+msgid ""
+"Write permissions have not been enabled for \"%1\".  Changes must be saved "
+"to another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:630
+msgid ""
+"Write permissions have not been enabled for \"%1\". Changes must be saved to"
+" another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:182
 msgid ""
-"Write permissions have not been enabled for '%1'.  Changes must be saved to "
-"another file for viewing."
-msgstr "Les permissions d'écriture n'ont pas été activées pour '%1'. Les modifications doivent être enregistrées dans un fichier différent pour le visualiser. "
+"Write permissions have not been enabled in \"%1\".  Changes must be saved to"
+" a different directory for viewing."
+msgstr ""
 
-#. ($self->shortPath($currentDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:380
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:624
 msgid ""
-"Write permissions have not been enabled in '%1'.  Changes must be saved to a"
+"Write permissions have not been enabled in \"%1\".Changes must be saved to a"
 " different directory for viewing."
-msgstr "Les permissions d'écriture n'ont pas été activées dans '%1'. Les modifications doivent être enregistrées dans un répertoire différent pour le visualiser. "
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:178
 msgid ""
 "Write permissions have not been enabled in the templates directory.  No "
 "changes can be made."
 msgstr "Les permissions d'écriture n'ont pas été activées dans le répertoire des modèles. Aucune modification n'est possible."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:380
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:620
+msgid ""
+"Write permissions have not been enabled in the templates directory. No "
+"changes can be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:287
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:330
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:509
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:82
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:657
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:67
 msgid "Yes"
 msgstr "Oui"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:500
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:454
 msgid ""
 "You are currently checking answers to a different version of your problem - "
 "these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr "Vous vérifiez présentement des réponses pour une version différente de votre problème - ces réponses ne seront pas enregistrées et vous devez vous rappeler de retourner au problème original lorsque vous aurez terminé ici."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:511
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:470
 msgid ""
 "You are currently previewing answers to a different version of your problem "
 "- these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr "Vous voyez présentement un aperçu des réponses d'une version différente de votre problème - ces réponses ne seront pas enregistrées et vous devez vous rappeler de retourner au problème original lorsque vous aurez terminé ici."
 
-#. ($userSet->set_id, $r->connection->remote_ip)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:270
+#. ($ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:18
+msgid ""
+"You are in the Reduced Scoring Period.  All work counts for %1% of the "
+"original."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:183
+msgid "You are not allowed to act as a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:188
+msgid "You are not allowed to assign homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:383
+msgid "You are not allowed to delete %1."
+msgstr ""
+
+#. ($userSet->set_id, $c->tx->remote_address)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:261
 msgid ""
 "You are not allowed to generate a hardcopy for %1 from your IP address, %2."
 msgstr "Vous n'êtes pas autorisé à générer une copie imprimable du devoir %1 avec cette adresse IP : %2."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2049
-msgid "You are not authorized to access the Instructor tools."
-msgstr "Vous n'êtes pas autorisé à accéder aux outils de l'enseignant."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:185
+msgid "You are not allowed to modify homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:191
+msgid "You are not allowed to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:4
+msgid "You are not allowed to send e-mail."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:2
+msgid "You are not authorized to access instructor tools"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:4
+msgid "You are not authorized to access instructor tools."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:9
+msgid "You are not authorized to assign homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:10
+msgid "You are not authorized to create or delete courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:2
+msgid "You are not authorized to edit achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:28
+msgid "You are not authorized to edit user specific information."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:37
+msgid "You are not authorized to grade homework sets."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:271
-msgid "You are not authorized to access the instructor tools."
-msgstr "Vous n'êtes pas autorisé à accéder aux outils de l'enseignant."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:8
+msgid "You are not authorized to manage course files"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:392
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:33
 msgid "You are not authorized to modify homework sets."
 msgstr "Vous n'êtes pas autorisé à modifier des devoirs."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:35
 msgid "You are not authorized to modify problems."
 msgstr "Vous n'êtes pas autorisé à modifier des problèmes."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:396
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:39
 msgid "You are not authorized to modify set definition files."
 msgstr "Vous n'êtes pas autorisé à modifier les fichiers de définition des devoirs."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:15
 msgid "You are not authorized to modify student data"
 msgstr "Vous n'êtes pas autorisé à modifier les données générales d'un étudiant."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:11
+msgid "You are not authorized to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:3
+msgid "You are not authorized to modify the course configuration."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:230
 msgid "You are not authorized to perform this action."
 msgstr "Vous n'êtes pas autorisé à effectuer cette action."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:260
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:11
+msgid "You are not authorized to score sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:13
+msgid "You are not authorized to send mail to students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:11
+msgid "You are not authorized to update lti scores"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers.html.ep:8
+msgid "You are not authorized to view past answers"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:251
 msgid ""
 "You are not permitted to generate a hardcopy for a set with hidden work."
 msgstr "Vous n'êtes pas autorisé à générer la copie imprimable d'un devoir qui est caché aux étudiants."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:236
 msgid "You are not permitted to generate a hardcopy for an unopened set."
 msgstr "Vous n'êtes pas autorisé à générer la copie imprimable d'un devoir qui n'est pas disponible."
 
-#. ($showMeAnother{MaxReps},					$solutionShown)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:559
+#. ($showMeAnother{MaxReps},						$solutionShown)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:532
 msgid ""
 "You are only allowed to click on Show Me Another %quant(%1,time,times) per "
 "problem. %2 Close this tab, and return to the original problem."
 msgstr "Vous êtes autorisé à cliquer sur le bouton <b>Montrer un autre problème</b> seulement à %quant(%1,reprise,reprises) par problème. %2 Fermer cette page et retourner au problème original."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2051
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2070
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:265
 msgid "You are out of time!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:374
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:36
 msgid "You can also examine the following temporary files: "
 msgstr "Vous pouvez également consulter ces fichiers temporaires :"
 
-#: /opt/webwork/pg/macros/PGanswermacros.pl:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:108
+msgid ""
+"You can assign selected achievements to all users by using the \"Assign\" "
+"action action and selecting which achievements to assign.  You can select "
+"which users to assign/unassign to an achievement by clicking on the link in "
+"the \"Edit Users\" column."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1039
+msgid ""
+"You can change the file path for this problem manually from the \"Hmwk Sets "
+"Editor\" page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:27
+msgid ""
+"You can check the boxes to the right of the sets and click \"Generate "
+"Hardcopy for Selected Sets\" to generate a PDF hardcopy of the selected "
+"sets. You can generate hardcopies for multiple users including their answers"
+" as well. Note that students will only be able to generate hardcopies of a "
+"single set at a time. Students will only be able to include answers in the "
+"hardcopy after the answer date."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:127
+msgid ""
+"You can delete problems by clicking the \"Delete it?\" check box and saving."
+" If the set is already active it is recommended that you instead use the "
+"\"Mark Correct?\" problem to mark a particular problem correct for all "
+"students."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGanswermacros.pl:1616
 msgid "You can earn partial credit on this problem."
 msgstr "Vous pouvez obtenir une partie des points pour ce problème."
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:382
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:142
+msgid ""
+"You can edit a problem by clicking the \"Edit Problem\" icon to the right of"
+" the problem number. This will open the problem in the PG problem editor in "
+"a new tab or window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:92
+msgid ""
+"You can edit a single achievement by clicking on the pencil icon next to the"
+" achievement ID.  You can edit multiple achievements by selecting which "
+"achievements to edit, then click the \"Edit\" button. You can edit all of "
+"the achievements by changing which achievements to edit form \"selected "
+"achievements\" to \"all achievements\", or click the checkbox next to the "
+"Achievement ID to select all achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:44
+msgid ""
+"You can edit the class list data for a single student by clicking on the "
+"pencil icon next to their login name. To edit several students at once click"
+" on the \"Select\" checkbox next to their names, click on the radio button "
+"for editing selected users and then click the \"Edit\" button. You can also "
+"edit all visible users (those students currently being displayed) or even "
+"all users in the course although this last option might take a long time to "
+"load for a large class."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:397
 msgid "You can get a new version of this problem after the due date."
 msgstr "Vous pouvez obtenir une nouvelle version du problème après la date de remise."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1368
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:101
+msgid ""
+"You can import/export from their respective action tab.  Exporting saves "
+"information about the achievement as a .axp file which is a CSV that lists "
+"each achievements information.  You can import .axp files that have been "
+"previously exported."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:769
 msgid "You can not specify an absolute path"
 msgstr "Vous ne pouvez pas spécifier un chemin absolu pour ce fichier."
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1121
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:549
 msgid "You can only %1 one file at a time."
 msgstr "Vous pouvez %1 un seul fichier à la fois."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:92
 msgid "You can only download regular files."
 msgstr "Vous pouvez télécharger seulement des fichiers réguliers."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:591
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:197
 msgid "You can only edit text files"
 msgstr "Vous pouvez modifier seulement des fichiers textes."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:908
-msgid "You can only unpack files ending in '.tgz', '.tar' or '.tar.gz'"
-msgstr "Vous pouvez décompresser seulement les fichiers de types <b>.tgz</b>, <b>.tar</b> ou <b>.tar.gz</b>."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:374
+msgid "You can only unpack files ending in \".tgz\", \".tar\" or \".tar.gz\""
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:134
+msgid ""
+"You can render a problem by clicking the \"Render Problem\" icon to the "
+"right of the problem number. The display mode used to render the problem is "
+"chosen using the drop down menu. You can render all problems using the "
+"\"Render All\" button. \"Hide All\" will hide all rendered problems. It is "
+"also useful to collapse problem details when doing this, as it makes it "
+"easier to drag problems around."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:120
+msgid ""
+"You can reorder problems by clicking on the arrow icon and dragging the "
+"problem. You will see a box showing you where the problem will be placed. "
+"When problems are reordered any holes in the numbering will be filled in."
+msgstr ""
 
 #. ($showMeAnother{MaxReps} >= $showMeAnother{Count}
 #. ? ($showMeAnother{MaxReps} - $showMeAnother{Count})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1895
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:44
 msgid ""
 "You can use this feature %quant(%1,more time,more times,as many times as you"
 " want) on this problem"
 msgstr "Vous pouvez utiliser cette fonction dans ce problème %quant(%1,fois encore,fois encore,autant de fois que vous le voulez)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:439
 msgid "You can't download directories"
 msgstr "Vous n'êtes pas autorisé à télécharger des répertoires."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:440
 msgid "You can't download files of that type"
 msgstr "Vous n'êtes pas autorisé à télécharger les fichiers de ce type."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:584
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:192
 msgid "You can't edit a directory"
 msgstr "Vous ne pouvez pas modifier un dossier."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:528
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
 msgid "You can't view files of that type"
 msgstr "Vous n'êtes pas autorisé à voir les fichiers de ce type."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:985
 msgid "You cannot archive the course you are currently using."
 msgstr "Vous ne pouvez pas archiver le cours en utilisation."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1712
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:850
 msgid "You cannot delete the course you are currently using."
 msgstr "Vous ne pouvez pas supprimer le cours en utilisation."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1081
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:378
 msgid "You cannot delete yourself!"
 msgstr "Vous n'êtes pas autorisé à vous supprimer!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:579
 msgid "You did not specify a new set name."
 msgstr "Vous n'avez spécifié aucun nom pour le nouveau devoir."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:232
 msgid "You didn't enter any message."
 msgstr "Vous n'avez écrit aucun message."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:312
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:303
 msgid "You do not have permission to access the requested file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:159
 msgid "You do not have permission to change the hardcopy theme."
 msgstr "Vous n'êtes pas autorisé à modifier le thème d'une copie imprimable d'un devoir."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:578
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:186
 msgid "You do not have permission to edit this file."
 msgstr "Vous n'êtes pas autorisé à modifier ce fichier."
 
 #. ($hardcopy_format)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:151
 msgid "You do not have permission to generate hardcopy in %1 format."
 msgstr "Vous n'êtes pas autorisé à générer la copie imprimable d'un devoir dans le format %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1639
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1161
 msgid "You do not have permission to view the details of this error."
 msgstr "Vous n'êtes pas autorisé à voir les détails de cette erreur."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements.html.ep:13
 msgid "You don't have any Achievement data associated to you!"
 msgstr "Vous n'avez aucune information d'accomplissement associée à votre compte!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:237
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:51
 msgid "You don't have any rewards!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2109
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:325
 msgid "You exceeded the allowed time."
 msgstr "Vous avez dépassé le temps alloué."
 
-#. ($numLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2082
+#. ($c->{numAttemptsLeft})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:277
 msgid "You have %1 attempt(s) remaining on this test."
 msgstr "Il vous reste %1 essai(s) pour ce test."
 
-#. ($numLeft,						$numLeft - 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2458
+#. ($c->{numAttemptsLeft},								$c->{numAttemptsLeft} - 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:664
 msgid ""
 "You have %1 submissions remaining for this test.  If you say yes, then you "
 "will have %quant(%2,submission) remaining. Once all submissions have been "
@@ -8131,724 +11309,702 @@ msgid ""
 "work this test version."
 msgstr ""
 
-#. ($attemptsLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2012
+#. ($problem->max_attempts - $attempts)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1270
 msgid "You have %negquant(%1,unlimited attempts,attempt,attempts) remaining."
 msgstr "Il vous reste %negquant(%1,un nombre illimité d'essais,essai,essais)."
 
 #. ($attempts_before_rr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1217
 msgid ""
 "You have %quant(%1,attempt,attempts) left before new version will be "
 "requested."
 msgstr "Il vous reste %quant(%1,essai,essais) avant qu'une nouvelle version de ce problème ne vous soit donnée."
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:506
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:44
 msgid ""
 "You have %quant(%1,hour) and %quant(%2,minute) remaining to complete the "
 "currently open test."
 msgstr ""
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:518
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:54
 msgid ""
 "You have %quant(%1,hour,hours,)%quant(%2,minute,minutes,) remaining to "
 "complete the currently open test."
 msgstr ""
 
-#. ($minutes,									$seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:529
+#. ($minutes,							$seconds)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:64
 msgid ""
 "You have %quant(%1,minute) and %quant(%2,second) remaining to complete the "
 "currently open test."
 msgstr ""
 
 #. ($seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:72
 msgid ""
 "You have %quant(%1,second) remaining to complete the currently open test."
 msgstr ""
 
 #. ($attempts)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1243
 msgid "You have attempted this problem %quant(%1,time,times)."
 msgstr "Vous avez essayé ce problème à %quant(%1,reprise,reprises,0 reprise)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:1
 msgid "You have been logged out of WeBWorK."
 msgstr "Vous êtes déconnecté de WeBWorK."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2065
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:260
 msgid "You have less than 1 minute to complete this test."
 msgstr "Il vous reste moins d'une minute pour terminer ce test."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2046
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:241
 msgid "You have less than 45 seconds left!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2043
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:240
 msgid ""
 "You have less than 90 seconds left to complete this assignment. You should "
 "finish it soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1004
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:452
 msgid "You have not chosen a file to upload."
 msgstr "Vous n'avez choisi aucun fichier à téléverser."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:845
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "You have requested that the following items be deleted"
 msgstr "Vous voulez que les éléments suivants soient supprimés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1137
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:565
 msgid "You have specified an illegal file"
 msgstr "Vous avez spécifié un fichier illégal"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:766
 msgid "You have specified an illegal path"
 msgstr "Vous avez spécifié un chemin illégal"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:520
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:13
+msgid "You have specified an illegal working directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:481
 msgid ""
 "You may check your answers to this problem without affecting the maximum "
 "number of tries to your original problem."
 msgstr "Vous pouvez vérifier vos réponses pour ce problème sans affecter le nombre d'essais autorisés dans le problème d'origine."
 
-#. ($perm_multiuser ? "to privileged users or" : "")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:613
+#. ($multiuser ? 'to privileged users or' : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:69
 msgid ""
 "You may choose to show any of the following data. Correct answers, hints, "
 "and solutions are only available %1 after the answer date of the homework "
 "set."
 msgstr "Vous pouvez choisir parmi les options suivantes. Les bonnes réponses, les indices et les solutions seront seulement affichés %1 après la date de disponibilité des réponses définie pour le devoir."
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:63
+msgid "You may not change this user's password!"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:646
 msgid "You may not change your answers when going on to the next part!"
 msgstr "Vous ne pouvez pas modifier vos réponses en passant à la partie suivante!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1831
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:58
 msgid "You may not change your own password here!"
 msgstr "Vous ne pouvez pas modifier votre mot de passe ici!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1132
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:560
 msgid "You may not follow symbolic links"
 msgstr "Vous ne pouvez suivre des liens symboliques"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2134
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:350
 msgid "You may still check your answers."
 msgstr "Vous pouvez quand même vérifier vos réponses."
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:172
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:143
+msgid ""
+"You may want to create an unattached problem if you are using the current "
+"problem as a model for a new problem. You can add the new file to a homework"
+" set from the Library Browser or via the set detail page of the Hmwk Sets "
+"Editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:165
+msgid ""
+"You might want to do this if you want to give full credit to everyone on a "
+"particular problem that was not worded correctly, or wasn't working "
+"properly. This is done from the \"Hmwk Sets Editor\" page or the "
+"\"Instructor Tools\" page."
+msgstr ""
+
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:8
 msgid "You must access assignments from your Course Management System (%1)."
 msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:67
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before Show Me Another "
-"is available."
-msgstr "Vous devez avoir fait %quant(%1,tentative,tentatives) pour ce problème avant que le bouton <b>Montrer un autre problème</b> ne soit disponible."
+"You must attempt this problem %quant(%1,time) before this feature is "
+"available"
+msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1923
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:545
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before this feature is "
-"available"
-msgstr "Vous devez essayer ce problème à %quant(%1,reprise,reprises) avant que cette fonction ne soit disponible."
+"You must attempt this problem %quant(%1,time,times) before Show Me Another "
+"is available."
+msgstr "Vous devez avoir fait %quant(%1,tentative,tentatives) pour ce problème avant que le bouton <b>Montrer un autre problème</b> ne soit disponible."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:699
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:259
 msgid "You must confirm the password for the initial instructor."
 msgstr "Vous devez confirmer le mot de passe pour l'enseignant initial."
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:368
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? $c->link_to(                                                  $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:195
 msgid "You must log into this set via your Learning Management System (%1)."
 msgstr "Vus devez vous connecter à ce devoir via votre plateforme de formation (%1)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:76
-msgid "You must provide a student ID, a set ID, and a problem number."
-msgstr "Vous devez spécifier un identifiant étudiant, un nom de devoir et un numéro de problème."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:979
+msgid "You must select a course to archive"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:585
 msgid "You must select a course to rename."
 msgstr "Vous devez choisir un cours à renommer."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:351
 msgid "You must select at least one file for the archive"
 msgstr "Vous devez choisir au moins un fichier pour créer l'archive."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:777
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:312
 msgid "You must select at least one file to delete"
 msgstr "Vous devez choisir au moins un fichier à supprimer."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:115
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:106
 msgid "You must select one or more sets for scoring!"
 msgstr "Vous devez choisir au moins un devoir à noter!"
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:749
 msgid "You must specify a %1 name"
 msgstr "Vous devez spécifier un nom pour %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:682
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:242
 msgid "You must specify a course ID."
 msgstr "Vous devez spécifier l'identifiant du cours."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2026
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2561
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2777
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3865
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2086
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:848
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:983
 msgid "You must specify a course name."
 msgstr "Vous devez spécifier un nom de cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:775
 msgid "You must specify a file name"
 msgstr "Vous devez fournir un nom de fichier."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:705
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:586
+msgid "You must specify a file name in order to save a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:265
 msgid "You must specify a first name for the initial instructor."
 msgstr "Vous devez spécifier le prénom de l'enseignant initial."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:708
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:268
 msgid "You must specify a last name for the initial instructor."
 msgstr "Vous devez spécifier le nom de famille de l'enseignant initial."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1382
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:606
 msgid "You must specify a new institution for the course."
 msgstr "Vous devez spécifier une nouvelle institution pour le cours."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1364
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:588
 msgid "You must specify a new name for the course."
 msgstr "Vous devez spécifier une nouveau nom pour le cours."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:603
 msgid "You must specify a new title for the course."
 msgstr "Vous devez spécifier une nouveau titre pour le cours."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:256
 msgid "You must specify a password for the initial instructor."
 msgstr "Vous devez spécifier un mot de passe pour l'enseignant initial."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:448
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:440
 msgid "You must specify a user ID."
 msgstr "Vous devez spécifier un identifiant utilisateur."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:711
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:271
 msgid "You must specify an email address for the initial instructor."
 msgstr "Vous devez spécifier une adresse courriel pour le professeur principal du cours."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:331
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:138
 msgid "You must specify an file name in order to save a new file."
 msgstr "Vous devez fournir un nom de fichier afin de pouvoir enregistrer un nouveau fichier."
 
 #. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:505
 msgid ""
-"You must use your Learning Managment System (%1) to access this set.  Try "
-"logging in to the Learning Managment System and visiting the set from there."
-msgstr "Vous pouvez utiliser votre plateforme de formation (%1) pour accéder à ce devoir. Essayer de vous connecter à votre plateforme de formation et ensuite d'accéder au devoir via celle-ci."
+"You must use your Learning Management System (%1) to access this set.  Try "
+"logging in to the Learning Management System and visiting the set from "
+"there."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1730
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
 msgid "You need to select a \"Target Set\" before you can edit it."
 msgstr "Vous devez choisir un devoir avant de pouvoir le modifier."
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1126
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:554
 msgid "You need to select a file to %1."
 msgstr "Vous devez choisir un fichier à %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1877
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:555
 msgid "You need to select a set definition file to view."
 msgstr "Vous devez choisir un fichier de définitions pour voir les problèmes."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1853
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:537
 msgid "You need to select a set from this course to view."
 msgstr "Vous devez choisir un devoir dans ce cours pour voir les problèmes."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1837
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:524
 msgid "You need to select a set to view."
 msgstr "Vous devez choisir un répertoire pour voir les problèmes."
 
-#. (wwRound(0, $problemResult->{score} * 100)
-#. (wwRound(0, $pg->{result}->{score} * 100)
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2007
+#. (wwRound(0,
+#. compute_reduced_score($ce, $problem, $set, $pg->{result}{score},
+#. $c->submitTime)
+#. (% wwRound(0, $rh_result->{problem_result}{score} * 100)
+#. (wwRound(0, $rh_result->{problem_result}{score} * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1251
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:48
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:29
 msgid "You received a score of %1 for this attempt."
 msgstr "Votre résultat pour cette tentative est %1."
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2075
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1363
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem and its graded subproblems."
 msgstr "Vous ne pourrez poursuivre vers le problème %1 tant que vous n'aurez pas réussi ce problème et les sous-problèmes associés ou épuisé le nombre d'essais autorisés."
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2078
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1375
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem."
 msgstr "Vous ne pourrez poursuivre vers le problème %1 tant que vous n'aurez pas réussi ce problème ou épuisé le nombre d'essais autorisés."
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1343
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:740
 msgid "Your %1 name contains illegal characters"
 msgstr "Votre nom de %1 possède des caractères illégaux."
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1344
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:743
 msgid "Your %1 name may not begin with a dot"
 msgstr "Votre nom de %1 ne peut commencer avec un point."
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:746
 msgid "Your %1 name may not contain a path component"
 msgstr "Votre nom de %1 ne contient pas de chemin source."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:540
-msgid ""
-"Your LTI OAuth verification failed.  If this recurs, please speak with your "
-"instructor"
-msgstr "Votre authentification LTI OAuth a échouée. Si cette situation se reproduit, communiquez avec votre enseignant"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:528
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:539
-msgid ""
-"Your authentication failed.  Please return to Oncourse and login again."
-msgstr "Votre tentative de connexion a échoué. Veuillez retourner sur la page d'accueil de votre cours et essayer de nouveau."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:229
-msgid ""
-"Your authentication failed.  Please try again. Please speak with your "
-"instructor if you need help."
-msgstr "Votre tentative de connexion a échoué. Essayez de nouveau. N'hésitez pas à contacter votre professeur si vous avez besoin d'aide."
-
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3033
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3162
 msgid "Your browser does not support the video tag."
 msgstr "Votre navigateur ne supporte pas l'environnement vidéo."
 
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4078
-msgid "Your current branch of PG is up to date with branch %1 in remote %2."
-msgstr "Votre branche de PG est à jour avec la branche %1 dans l'emplacement %2."
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4016
-msgid ""
-"Your current branch of WeBWorK is up to date with branch %1 in remote %2."
-msgstr "Votre branche WeBWorK est à jour avec la branche %1 dans l'emplacement %2."
-
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4113
-msgid "Your current branch of the Open Problem Library is up to date."
-msgstr "Votre branche de la banque de problèmes libres est à jour."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:134
 msgid "Your display options have been saved."
 msgstr "Vos paramètres d'affichage ont été sauvegardés."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:195
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
 msgid "Your email address has been changed."
 msgstr "Votre adresse courriel a été modifiée."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:772
 msgid "Your file name contains illegal characters"
 msgstr "Votre nom de fichier contient des caractères illégaux."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:118
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:40
 msgid "Your file name is not valid! "
 msgstr "Votre nom de fichier n'est pas valide!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:16
 msgid "Your message was sent successfully."
 msgstr "Votre message a été envoyé avec succès."
 
-#. ($lastScore,$notCountedMessage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2010
+#. (wwRound(0, $problem->status * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1261
 msgid "Your overall recorded score is %1.  %2"
 msgstr "Votre résultat final est %1. %2"
 
-#. ($versionNumber, wwRound(2,$recordedScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2107
-msgid "Your recorded score on this test (version %1) is %2/%3."
-msgstr "Votre pointage pour ce test (version %1) est %2/%3."
+#. ('<span id="test-recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:179
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:197
+msgid "Your recorded score for this version is %1/%2 (%3%)."
+msgstr ""
+
+#. ($setVersionID,                                         '<span id="test-
+#. recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:317
+msgid "Your recorded score on this test (version %1) is %2/%3 (%4%)."
+msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:603
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:634
 msgid "Your score for this attempt is for this part only;"
 msgstr "Votre résultat pour cette tentative correspond à cette partie seulement;"
 
 #. ($testNounNum)
 # $testNounNum is either "test (#)" or "submission (#)"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1977
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:142
 msgid "Your score on this %1 WAS recorded."
 msgstr "Votre résultat pour ce %1 a été enregistré."
 
-#. ($testNoun,$attemptScore,$totPossible)
+#. ($testNoun, $c->{attemptScore}, $c->{totalPossible})
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1982
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:148
 msgid "Your score on this %1 is %2/%3."
 msgstr "Votre résultat pour ce %1 est %2/%3."
 
 #. ($testNounNum)
 # $testNounNum is either "test (#)" or "submission (#)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1973
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:138
 msgid "Your score on this %1 was NOT recorded."
 msgstr "Votre résultat pour ce %1 n'a PAS été enregistré."
 
-#. ($attemptScore,$totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2019
+#. ($c->{attemptScore}, $c->{totalPossible})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:192
 msgid "Your score on this (checked, not recorded) submission is %1/%2."
 msgstr "Votre note pour cette tentative (vérifiée, non enregistrée) est %1/%2."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1963
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2277
-msgid "Your score on this problem was recorded."
-msgstr "Votre résultat pour ce problème a été enregistré."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1619
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1027
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:172
 msgid ""
 "Your score was not recorded because there was a failure in storing the "
 "problem record to the database."
 msgstr "Votre résultat n'a pas été enregistré à cause d'une défaillance touchant le processus d'enregistrement dans la base de données."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:272
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:276
 msgid "Your score was not recorded because this homework set is closed."
 msgstr "Votre résultat n'a pas été enregistré, car ce devoir est fermé."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:283
 msgid ""
 "Your score was not recorded because this problem has not been assigned to "
 "you."
 msgstr "Votre résultat n'a pas été enregistré, car ce problème ne vous a pas été attribué."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1643
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1049
 msgid ""
 "Your score was not recorded because this problem set version is not open."
 msgstr "Votre résultat n'a pas été enregistré, car ce devoir n'est pas encore disponible."
 
-#. ($elapsed, $allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1658
+#. ($elapsed,                                              # Assume the
+#. allowed time is an even number of minutes.
+#. ($set->due_date - $set->open_date)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1063
 msgid ""
 "Your score was not recorded because you have exceeded the time limit for "
 "this test. (Time taken: %1 min; allowed: %2 min.)"
 msgstr "Votre résultat n'a pas été enregistré, car vous avez dépassé le temps alloué pour faire ce test. (Durée de passation&#8239;: %1 min; temps alloué&#8239;: %2 min)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1052
 msgid ""
 "Your score was not recorded because you have no attempts remaining on this "
 "set version."
 msgstr "Votre résultat n'a pas été enregistré, car il ne vous reste plus d'essais pour cette version du test."
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1661
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1067
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:278
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:53
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:31
 msgid "Your score was not recorded."
 msgstr "Votre résultat n'a pas été enregistré."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1998
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:163
 msgid "Your score was not successfully sent to the LMS."
 msgstr "Votre pointage n'a pas été envoyer à la plateforme de formation."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:166
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:170
 msgid "Your score was recorded."
 msgstr "Votre résultat a été enregistré."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1997
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:255
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:162
 msgid "Your score was successfully sent to the LMS."
 msgstr "Votre pointage a été envoyé à la plateforme de formation."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:540
 msgid "Your session has timed out due to inactivity. Please log in again."
 msgstr "Votre session a expiré pour cause d'inactivité. Veuillez vous connecter de nouveau."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4126
-msgid "Your systems are up to date!"
-msgstr "Vos systèmes sont à jour!"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1396
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1403
-msgid "[Edit]"
-msgstr "[Modifier]"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:824
-msgid "a duplicate of the first selected achievement."
-msgstr "une copie du premier accomplissement sélectionné."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:17
+msgid "a duplicate of the first selected achievement"
+msgstr ""
 
 # Context is "Create set ______ as a duplicate of the first selected set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:17
 msgid "a duplicate of the first selected set"
 msgstr "une copie du premier devoir sélectionné"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:823
-msgid "a new empty achievement."
-msgstr "un nouvel accomplissement vide."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:16
+msgid "a new empty achievement"
+msgstr ""
 
 # Context is "Create set ______ as a new empty set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:16
 msgid "a new empty set"
 msgstr "un nouveau devoir vide"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1281
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:9
 msgid "a single set"
 msgstr "un devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:429
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:130
 msgid "add problems"
 msgstr "Ajouter des problèmes"
 
 #. ($setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1751
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
 msgid "addGlobalSet %1 in ProblemSetList:  %2"
 msgstr "Données globales de la liste des problèmes du devoir %1 : %2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:456
-msgid "added missing permission level for user"
-msgstr "Le rôle manquant a été ajouté pour cet utilisateur."
-
 # #short for administrator
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "admin"
 msgstr "administrateur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1051
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:487
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:604
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:7
 msgid "all achievements"
 msgstr "Tous les accomplissements"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1377
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:66
 msgid "all current users"
 msgstr "tous les utilisateurs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:327
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:70
 msgid "all set dates for one <b>user</b>"
 msgstr "toutes les dates du devoir pour un <b>utilisateur</b>"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:622
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1434
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:667
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:840
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1995
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:7
 msgid "all sets"
 msgstr "tous les devoirs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1981
 msgid "all students"
 msgstr "tous les étudiants"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1256
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:701
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:946
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:997
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:6
 msgid "all users"
 msgstr "tous les utilisateurs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:120
 msgid "all users for one <b>set</b>"
 msgstr "tous les utilisateurs pour un <b>devoir</b>"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:23
 msgid "alphabetically"
 msgstr "ordre alphabétique"
 
-#. ($count,$numSets)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:626
+#. ($count, $numSets)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1999
 msgid "an impossible number of sets: %1 out of %2"
 msgstr "Un nombre impossible de devoirs: %1 de %2"
 
-#. ($count,$numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:606
+#. ($count, $numUsers)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1985
 msgid "an impossible number of users: %1 out of %2"
 msgstr "Un nombre impossible d'utilisateurs: %1 de %2"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:647
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:658
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:610
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:621
 msgid "answer"
 msgstr "réponse"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:30
 msgid "any users"
 msgstr "tout utilisateur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:720
-msgid "avg attempts"
-msgstr "Moy. du n<sup>bre</sup> de tentatives"
-
 # Context is "Append ____ blank problem template(s) to end of homework set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2956
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:689
 msgid "blank problem template(s) to end of homework set"
 msgstr "problème(s) vide(s) à la fin du devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:24
 msgid "by last login date"
 msgstr "par dernière date de connexion"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1552
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:688
 msgid "changes abandoned"
 msgstr "modifications annulées"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1216
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1651
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:633
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:795
 msgid "changes saved"
 msgstr "modifications sauvegardées"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:80
 msgid "class list data for selected <b>users</b>"
 msgstr "données générales pour les <b>utilisateurs</b> sélectionnés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:31
 msgid "close"
 msgstr "fermer"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:671
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "column"
 msgstr "colonne"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:259
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:239
 msgid "correct"
 msgstr "réussi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:582
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:239
 msgid "course files"
 msgstr " les fichiers du cours"
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:458
 msgid "deleted %1 sets"
 msgstr "%1 devoir(s) a (ont) été supprimé(s)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:152
 msgid "editing all achievements"
 msgstr "Modifier tous les accomplissements"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:333
 msgid "editing all sets"
 msgstr "Modification de tous les devoirs."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:963
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:328
 msgid "editing all users"
 msgstr "Modification de tous les utilisateurs."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:860
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:336
 msgid "editing listed sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:154
 msgid "editing selected achievements"
 msgstr "Modifier les accomplissements sélectionnés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:339
 msgid "editing selected sets"
 msgstr "Modification de tous les devoirs sélectionnés."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:334
 msgid "editing selected users"
 msgstr "Modification de tous les utilisateurs sélectionnés."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:331
 msgid "editing visible users"
 msgstr "Modification de tous les utilisateurs affichés."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:360
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:90
 msgid "email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:87
-msgid "email:"
-msgstr "courriel :"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:42
 msgid "empty"
 msgstr "vide"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:672
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:10
 msgid "enter matching set IDs below"
 msgstr "Entrer le nom des devoirs ci-dessous"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:220
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:31
 msgid "entry rows."
 msgstr "ligne(s) de saisie"
 
 #. ($restrictLoc, $setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1761
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:904
 msgid "error adding set location %1 for set %2: %3"
 msgstr "erreur produite en ajoutant la localisation %1 pour le devoir %2 : %3"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1092
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1487
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:542
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:643
 msgid "export abandoned"
 msgstr "Exportation annulée"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1068
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:527
 msgid "exporting all achievements"
 msgstr "Exporter tous les accomplissements"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1071
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:530
 msgid "exporting selected achievements"
 msgstr "Exporter les accomplissements sélectionnés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:359
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:89
 msgid "first name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:747
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:72
 msgid "for"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:149
 msgid "for one <b>set</b>"
 msgstr "pour un <b>devoir</b>"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:103
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:94
 msgid "for one <b>user</b>"
 msgstr "pour un <b>utilisateur</b>"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1014
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:349
 msgid "giving new passwords to all users"
 msgstr "Attribution de nouveaux mots de passe à tous les utilisateurs."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1020
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:355
 msgid "giving new passwords to selected users"
 msgstr "Attribution de nouveaux mots de passe aux utilisateurs sélectionnés."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1017
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:352
 msgid "giving new passwords to visible users"
 msgstr "Attribution de nouveaux mots de passe aux utilisateurs visibles."
 
 #. ($j, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1069
 msgid "global %1 for set %2 not found."
 msgstr "Problème global %1 pour le devoir %2 introuvable."
 
-#. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1146
-msgid "global set %1 not found."
-msgstr "devoir global %1 introuvable."
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "grade_proctor"
 msgstr "évaluateur autorisé"
@@ -8857,393 +12013,375 @@ msgstr "évaluateur autorisé"
 msgid "guest"
 msgstr "invité"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1589
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:949
 msgid "hidden"
 msgstr "caché"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "hidden from"
 msgstr "caché de"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "hidden from students"
-msgstr "caché aux étudiants"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:217
+msgid "homework"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:83
+msgid "html directory"
+msgstr ""
 
-#. ('j','k','_0')
-#. ('j','k')
+#. ('j', 'k', '_0')
+#. ('j', 'k')
 # doe snot need to be translated
-#: /opt/webwork/pg/lib/Parser/List/Vector.pm:35
-#: /opt/webwork/pg/lib/Value/Vector.pm:278
-#: /opt/webwork/pg/macros/contextLimitedVector.pl:93
+#: /opt/webwork/pg/lib/Parser/List/Vector.pm:39
+#: /opt/webwork/pg/lib/Value/Vector.pm:303
+#: /opt/webwork/pg/macros/contexts/contextLimitedVector.pl:95
 msgid "i"
 msgstr "Je"
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:773
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:840
 msgid "if"
 msgstr "Si"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1626
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:622
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:721
 msgid "illegal character in input: '/'"
 msgstr "caractère illégal entré : '/'"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:246
 msgid "incorrect"
 msgstr "erroné"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:441
 msgid "index"
 msgstr "Indice Succès"
 
 #. ($restrictLoc, $setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:911
 msgid "input set location %1 already exists for set %2."
 msgstr "La localisation entrée %1 existe déjà pour le devoir %2."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:358
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:551
+msgid "insufficient permission to edit %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:220
+msgid "just-in-time"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:88
 msgid "last name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:841
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:893
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:9
 msgid "listed sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3169
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:87
 msgid "locations selected below"
 msgstr "L'emplacement choisi ci-dessous"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:665
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:59
 msgid "login"
 msgstr "nom d'utilisateur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "login ID"
 msgstr "NOM D'UTILISATEUR"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:94
 msgid "login name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:86
-msgid "login/studentID:"
-msgstr "Nom d'utilisateur/ID étudiant :"
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "login_proctor"
 msgstr "surveillant"
 
 # Context is "Set _____ made visibile for _____ users"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "made visible for"
 msgstr "rendre visible pour"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:419
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:493
 msgid "max"
 msgstr "max"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1282
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:10
 msgid "multiple sets"
 msgstr "plusieurs devoirs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:489
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:171
 msgid "new set:"
 msgstr "un nouveau devoir :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:393
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:109
 msgid "new users"
 msgstr "de nouveaux utilisateurs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:6
 msgid "no achievements"
 msgstr "aucun accomplissement"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:740
-msgid "no achievements."
-msgstr "aucun accomplissement."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:519
-msgid "no attempt recorded"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:86
 msgid "no location"
 msgstr "aucun emplacement"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:620
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1056
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1993
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:6
 msgid "no sets"
 msgstr "aucun devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:600
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1979
 msgid "no students"
 msgstr "aucun étudiant"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:931
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1190
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:702
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:31
 msgid "no users"
 msgstr "aucun utilisateur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/permission.pm:26
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "nobody"
 msgstr "aucun rôle"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:114
 msgid "nth colum of merge file"
 msgstr "Énième colonne du fichier joint"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:225
-msgid "number of students not defined"
-msgstr "le nombre d'étudiants n'est pas défini"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:70
 msgid "of"
 msgstr "de"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:128
 msgid "one <b>set</b>"
 msgstr "un <b>devoir</b>"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:556
-msgid "one <b>set</b> for  <b>users</b>"
-msgstr "un <b>devoir</b> pour les <b>utilisateurs</b>"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:225
+msgid "one <b>set</b> for <b>users</b>"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:540
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:211
 msgid "one <b>user</b> (on one <b>set</b>)"
 msgstr "d'un <b>utilisateur</b> (pour un <b>devoir</b>)"
 
 # Context is Assign this set to which users?  "only ____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1378
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:67
 msgid "only"
 msgstr "seulement"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:17
 msgid "only best scores"
 msgstr "seulement la plus haute note obtenue"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3472
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:357
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:448
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:88
 msgid "or"
 msgstr "ou"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1141
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:59
 msgid "or Problems from"
 msgstr "ou des problèmes de"
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:776
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:843
 msgid "otherwise"
 msgstr "autrement"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:19
 msgid "overwrite"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:664
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:627
 msgid "part"
 msgstr "partie"
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1383
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:499
 msgid "permissions for %1 not defined"
 msgstr "le rôle de %1 n'est pas défini"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "point"
 msgstr "point"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "points"
 msgstr "points"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:509
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:20
 msgid "preserve"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2360
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:576
 msgid "preview answers"
 msgstr "Aperçu des réponses"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:653
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:616
 msgid "problem"
 msgstr "problème"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:632
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:41
 msgid "problems"
 msgstr "problèmes"
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:219
+msgid "proctored test"
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "professor"
 msgstr "professeur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:360
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:451
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:89
 msgid "progress"
 msgstr "Progrès"
 
 #. ($line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2212
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1409
 msgid "readSetDef error, can't read the line: ||%1||"
 msgstr "erreur readSetDef, impossible de lire la ligne : ||%1||"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:93
 msgid "recitation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:654
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:53
 msgid "recitation #"
 msgstr "numéro du tp"
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:497
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:549
 msgid "record for visible user %1 not found"
 msgstr "données de l'utilisateur visible %1 introuvables"
 
 #. ($restrictLoc)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1767
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:918
 msgid ""
 "restriction location %1 does not exist.  IP restrictions have been ignored."
 msgstr "Le lieu %1 indiqué pour la restriction n'existe pas. La restriction par adresse IP a été ignorée."
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:670
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "row"
 msgstr "ligne"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:91
 msgid "score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:362
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:92
 msgid "section"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:643
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:47
 msgid "section #"
 msgstr "numéro du groupe"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:88
-msgid "section:"
-msgstr "groupe :"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:159
 msgid "selected <b>sets</b>"
 msgstr "des <b>devoirs</b> sélectionnés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:524
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:197
 msgid "selected <b>users</b> to selected <b>sets</b>"
 msgstr "des <b>utilisateurs</b> sélectionnés aux <b>devoirs</b> sélectionnés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:441
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:488
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:605
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:8
 msgid "selected achievements"
 msgstr "Les accomplissements sélectionnés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:741
-msgid "selected achievements."
-msgstr "Les accomplissements sélectionnés."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1057
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1436
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:669
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:842
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:894
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:991
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:8
 msgid "selected sets"
 msgstr "devoirs sélectionnés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1053
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:703
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:999
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:8
 msgid "selected users"
 msgstr "utilisateurs sélectionnés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:624
-msgid "set"
-msgstr "devoir"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:628
-msgid "sets"
-msgstr "devoirs"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:12
 msgid "sets hidden from students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:670
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:11
 msgid "sets visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:716
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:281
 msgid "showing all sets"
 msgstr "Tous les devoirs sont affichés."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:763
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:277
 msgid "showing all users"
 msgstr "Tous les utilisateurs sont affichés."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:725
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:290
 msgid "showing matching sets"
 msgstr "Les devoirs correspondants sont affichés."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:286
 msgid "showing matching users"
 msgstr "Les utilisateurs correspondants sont affichés."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:719
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:284
 msgid "showing no sets"
 msgstr "Aucun devoir n'est affiché."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:766
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:280
 msgid "showing no users"
 msgstr "Aucun utilisateur n'est affiché."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:722
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:287
 msgid "showing selected sets"
 msgstr "Les devoirs sélectionnés sont affichés."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:769
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:283
 msgid "showing selected users"
 msgstr "Les utilisateurs sélectionnés sont affichés."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:299
 msgid "showing sets that are hidden from students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:732
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:296
 msgid "showing sets that are visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:72
 msgid "shown"
 msgstr "affiché"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:162
 msgid "still open"
 msgstr "toujours disponible"
 
@@ -9251,16 +12389,16 @@ msgstr "toujours disponible"
 msgid "student"
 msgstr "étudiant"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
 msgid "submission"
 msgstr "soumission"
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:133
 msgid "submission (version %1)"
 msgstr "Soumission (version %1)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
 msgid "summary"
 msgstr "sommaire"
 
@@ -9268,135 +12406,130 @@ msgstr "sommaire"
 msgid "ta"
 msgstr "assistant"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:90
+msgid "templates/email directory"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:95
+msgid "templates/macros directory"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
 msgid "test"
 msgstr "test"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:23
 msgid "test date"
 msgstr "date du test"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:621
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:29
 msgid "test time"
 msgstr "durée du test"
 
-#. ($forcedSourceFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:987
-msgid "the original path to the file is %1"
-msgstr "le chemin original de ce fichier est %1"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:119
 msgid "then delete them"
 msgstr "et les supprimer ensuite"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "time"
-msgstr "fois"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:165
 msgid "time limit exceeded"
 msgstr "temps limite dépassé"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "times"
-msgstr "fois"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:35
+msgid "time remaining"
+msgstr ""
 
 # Context is Assign ____ to _____
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:183
 msgid "to"
 msgstr "à "
 
 #. ($ce->{institutionName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:399
 msgid "to %1 main web site"
 msgstr "vers %1 site web principal"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:524
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:381
 msgid "to courses page"
 msgstr "vers les pages du cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:436
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:135
 msgid "to one <b>set</b>"
 msgstr "à un <b>devoir</b>"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:764
-msgid "top score"
-msgstr "note maximale"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:432
 msgid "total"
 msgstr "total"
 
 #. ($ce->{webworkDirs}{logs})
 #. ($ce->{webworkDirs}{tmp})
 #. ($ce->{webworkDirs}{DATA})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:47
 msgid "unable to write to directory %1"
 msgstr "Impossible d'écrire sur le répertoire %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:333
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:49
 msgid "unlimited"
 msgstr "illimité"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:14
 msgid "unlimited reusability"
 msgstr "Réutilisable sans limite"
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:609
-msgid "userID: %1 --"
-msgstr "nom d'utilisateur : %1 --"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:652
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:259
 msgid ""
 "username, last name, first name, section, achievement level, achievement "
 "score,"
 msgstr "nom d'utilisateur, nom de famille, prénom, section, niveau d'accomplissement, résutlat d'accomplissement,"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:704
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:10
 msgid "users who match on selected field"
 msgstr "utilisateurs contenant le texte dans le champ ci-dessous"
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
+#. ($set->version_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:295
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:408
+msgid "version %1"
+msgstr ""
+
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:134
 msgid "version (%1)"
 msgstr "version (%1)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1591
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1888
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:820
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:951
 msgid "visible"
 msgstr "visible"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "visible to students"
-msgstr "visible pour les étudiants"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1257
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:947
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:998
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:7
 msgid "visible users"
 msgstr "utilisateurs affichés"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:485
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:500
 msgid "when you submit your answers"
 msgstr "Quand vous soumettez vos réponses"
 
 #. ($dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1532
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:623
 msgid "won't be able to read from file %1/%2: does it exist? is it readable?"
 msgstr "Incapable de lire le fichier %1/%2 : le fichier existe-t-il? Est-il lisible?"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:604
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:638
 msgid "your overall score is for all the parts combined."
 msgstr "Votre résultat d'ensemble est pour chacune des parties combinées."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:231
 msgid "your students"
 msgstr "aux étudiants"
diff --git a/lib/WeBWorK/Localize/fr.po b/lib/WeBWorK/Localize/fr.po
index 463d6170ca..652cc5e744 100644
--- a/lib/WeBWorK/Localize/fr.po
+++ b/lib/WeBWorK/Localize/fr.po
@@ -5,265 +5,328 @@
 # Translators:
 # Jonathan Desaulniers <jonathan.desaulniers@cegepmontpetit.ca>, 2018
 # Michael E Gage <gage@math.rochester.edu>, 2014
-# Michael Gage <gage@math.rochester.edu>, 2011
+# Michael E Gage <gage@math.rochester.edu>, 2011
 # Sébastien Labbé <slabqc at gmail.com>, Université du Québec à Montréal, 2011
-# Stéphanie Lanthier <lanthier.stephanie@gmail.com>, Université du Québec à Montréal, 2011
+# Stéphanie Lanthier <lanthier.stephanie@gmail.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: webwork2\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: 2013-01-27 17:03+0000\n"
-"Last-Translator: Jonathan Desaulniers <jonathan.desaulniers@cegepmontpetit.ca>, 2018\n"
-"Language-Team: French (http://www.transifex.com/webwork/webwork2/language/fr/)\n"
+"Last-Translator: Stéphanie Lanthier <lanthier.stephanie@gmail.com>, 2011\n"
+"Language-Team: French (http://app.transifex.com/webwork/webwork2/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:428
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:449
+#. ($_->{problem}->version_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:69
+msgid " (version %1)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:265
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:284
 msgid " Answers Available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:735
-msgid "# of active students"
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1148
+msgid " No changes have been made to set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:130
+msgid "\"Act as\" a student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:31
+msgid "\"Edit Assigned Users\" column"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:24
+msgid "\"Edit Problems\" column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:506
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:187
+msgid "# of Active Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:85
+msgid "# of attempts"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:333
 msgid "#corr"
 msgstr "#corr"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:508
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:335
 msgid "#incorr"
 msgstr "#incorr"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2249
-msgid "% Score:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:174
+msgid "% Average with Review"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:685
-msgid "% correct"
-msgstr "% correct"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:702
-msgid "% correct with review"
-msgstr "% correct après révision"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:66
+msgid "% Score with Review"
+msgstr ""
 
-# Percent students
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:762
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:792
-msgid "% students"
-msgstr "% étudiants"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:479
+msgid "% Score:"
+msgstr ""
 
 #. ($achievement->{points})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:24
 msgid "%1 Points:"
 msgstr "%1 Points:"
 
-#. ($lib eq '' ? $r->maketext('Local')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:476
+#. ($lib eq '' ? maketext('Local')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:9
 msgid "%1 Problems:"
 msgstr "%1 Problèmes:"
 
-#. ($itemCounts{$item->id()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:189
+#. ($itemCounts->{ $item->id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:12
 msgid "%1 remaining"
 msgstr ""
 
-#. ($numAdded, $numSkipped, join(', ', @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1410
+#. ($count)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2001
+msgid "%1 sets"
+msgstr ""
+
+#. ($numAdded,                     $numSkipped,
+#. join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:608
 msgid "%1 sets added, %2 sets skipped. Skipped sets: (%3)"
 msgstr "%1 devoirs ajoutés, %2 devoirs ignorés. Devoirs ignorés : (%3)"
 
-#. ($numExported, $numSkipped, ($numSkipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1526
+#. ($numExported, $numSkipped,                     $numSkipped ? $c->tag('ul',
+#. $c->c(map { $c->tag('li', $_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:673
 msgid "%1 sets exported, %2 sets skipped. Skipped sets: (%3)"
 msgstr "%1 devoirs exportés, %2 devoirs ignorés. Devoirs ignorés : (%3)"
 
 #. ($count, $numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:608
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
 msgid "%1 students out of %2"
 msgstr "%1 étudiants sur %2"
 
-#. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle,
+#. ($rename_oldCourseID,          $rename_oldCourseTitle,
+#. $rename_newCourseTitle,
 #. $rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:675
 msgid "%1 title and institution changed from %2 to %3 and from %4 to %5"
 msgstr "%1 titre et institution changé de %2 à %3 et de %4 à %5"
 
-#. (scalar @userIDsToExport, $dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1338
-msgid "%1 users exported to file %2/%3"
-msgstr "%1 utilisateurs exportés vers le fichier %2/%3"
+#. (scalar @userIDsToExport, "$dir/$fileName")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:477
+msgid "%1 users exported to file %2"
+msgstr ""
 
-#. ($numReplaced, $numAdded, $numSkipped, join (", ", @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1233
+#. ($numReplaced, $numAdded, $numSkipped, join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:443
 msgid ""
 "%1 users replaced, %2 users added, %3 users skipped. Skipped users: (%4)"
 msgstr "%1 utilisateurs remplacés, %2 utilisateurs ajoutés, %3 utilisateurs ignorés. Utilisateurs ignorés: (%4)"
 
-#. ($levelpercentage)
 #. ($percentage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:135
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:136
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:323
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:324
+#. ($level_percentage)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:12
 msgid "%1% Complete"
 msgstr "%1% Complété"
 
 #. (wwRound(0, $answerScore * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:268
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:248
 msgid "%1% correct"
 msgstr "%1% correct"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:207
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:57
 msgid "%1's Current Address"
 msgstr "Courriel actuel de %1"
 
-#. ($user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:136
+#. ($c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:26
 msgid "%1's Current Password"
 msgstr "Mot de passe actuel de %1"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:225
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:65
 msgid "%1's New Address"
 msgstr "Nouveau courriel de %1"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:153
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:34
 msgid "%1's New Password"
 msgstr "Nouveau mot de passe de %1"
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
-msgid "%1's new password cannot be blank."
-msgstr "Le nouveau mot de passe de %1 ne peut rester vide."
-
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:76
 msgid "%1's password has been changed."
 msgstr "Le mot de passe de l'usager %1 a été modifié."
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:56
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1423
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#. ($c->tag('span', dir => 'ltr', $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1069
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:149
 msgid "%1: Problem %2"
 msgstr "%1: Problème %2."
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:374
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:357
 msgid "%1: Problem %2 Show Me Another"
 msgstr "%1: Problème %2 Montrez Moi un Autre"
 
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2231
-msgid "%1: The directory for the course not found."
-msgstr "%1: Le répertoire du cours n'a pas été trouvé."
-
-#. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:340
-msgid "%quant(%1,error) occured while generating hardcopy:"
-msgstr "%quant(%1, erreur) est survenu en générant une copie papier:"
+#. ($days)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:87
+msgid "%quant(%1,day)"
+msgstr ""
 
 #. ($n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:924
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:389
 msgid "%quant(%1,file) unpacked successfully"
 msgstr "%quant(%1,file) dépaqueté avec succès"
 
+#. ($hours)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:88
+msgid "%quant(%1,hour)"
+msgstr ""
+
+#. ($minutes)
+#. (sprintf('%3.1f', $testTime)
+#. ($timeLeft)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:89
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:150
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:168
+msgid "%quant(%1,minute)"
+msgstr ""
+
 #. ($numBlanks)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:430
 msgid ""
 "%quant(%1,of the questions remains,of the questions remain) unanswered."
 msgstr "%quant(%1, des questions restent, des questions reste) sans réponse."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:678
+#. ($seconds)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:90
+msgid "%quant(%1,second)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:505
 msgid "%score"
 msgstr "%s noyau"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2971
+#. ($dcount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:40
+msgid "(%quant(%1,item) total)"
+msgstr ""
+
+#. ($count)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:29
+msgid "(%quant(%1,item))"
+msgstr ""
+
+#. ($problemValue)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1081
+msgid "(%quant(%1,point))"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:697
 msgid "(Any unsaved changes will be lost.)"
 msgstr "(Les modification non sauvegardées seront perdus)"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1278
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1287
-msgid ""
-"(Instructor hint preview: show the student hint after the following number "
-"of attempts:"
-msgstr "(Aperçu de l'indice pour l'instructeur: montrer l'indice à l'étudiant après le nombre suivant de tentatives:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:102
+msgid "(If an action cannot be executed it will not appear.)"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2003
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1262
 msgid "(This problem will not count towards your grade.)"
 msgstr "(Ce problème ne sera pas noté.)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2122
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:340
 msgid ""
 "(This test is overtime because it was not submitted in the allowed time.)"
 msgstr "(Ce test est en temps supplémentaire car il n'a pas été remis durant le temps alloué.)"
 
-#. ($testNoun, $self->formatDateTime($set->answer_date)
+#. ($testNoun, $c->formatDateTime($c->{set}->answer_date)
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1986
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:153
 msgid "(Your score on this %1 is not available until %2.)"
 msgstr "(Votre note pour ce %1 ne sera pas disponible avant %2.)"
 
 #. ($testNoun)
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1988
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:155
 msgid "(Your score on this %1 is not available.)"
 msgstr "(Votre note pour ce %1 n'est pas disponible.)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1257
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1267
 msgid "(correct)"
 msgstr "(correct)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:197
-msgid "(gw/quiz) After version answer date"
-msgstr "(gw/quiz) Après la date de correction pour cette version"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:263
 msgid "(in target set)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1449
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1269
 msgid "(incorrect)"
 msgstr "(incorrect)"
 
 #. ($pgScore)
 #. ($recScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1461
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1271
 msgid "(score %1)"
 msgstr "(note %1)"
 
-#. ($display_sort_method_name{$secondary_sort_method_name})
-#. ($display_sort_method_name{$ternary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:701
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:706
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:207
+msgid "(test) After version answer date"
+msgstr ""
+
+#. ($versionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:164
+msgid "(version %1)"
+msgstr ""
+
+#. ($display_sort_method_name{$secondary_sort_method})
+#. ($display_sort_method_name{$ternary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:103
 msgid ", then by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1297
-msgid ". If this is a class roster, rename it to have extension '.lst'"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:702
+msgid ". If this is a class roster, rename it to have extension \".lst\""
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:81
+msgid "0 seconds"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1997
+msgid "1 set"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1983
 msgid "1 student"
 msgstr "1 étudiant"
 
 #. (wwRound(2, $weights[$part] * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:145
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:58
 msgid "<b>Weight:</b> %1%"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1749
+#: /opt/webwork/webwork2/conf/defaults.config:1651
 msgid ""
 "<p>After the Reduced Scoring Date all additional work done by the student "
 "counts at a reduced rate. Here is where you set the reduced rate which must "
@@ -278,7 +341,7 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr "<p>Après la date de remise, tous les travaux effectués par l'étudiant subiront une pénalité. C'est ici que vous déterminez la pénalité qui doit être en pourcentage. Par exemple, si la pénalité est de 50% et qu'un étudiant visualise un problème après la date de remise, le message suivant lui sera transmis : \"La date de remise est maintenant dépassée: Tout problème effectué subira une pénalité de 50% des points.\"</p><p>Pour utilisé cette fonctionnalité, vous devez activer l'option \"pénalité de retard\" dans la configuration du cours sous l'onglet \"modules optionnels\" et déterminer une date remise dans l'éditeur de devoirs.</p><p>Ceci fonctionne avec le avg_problem_grader (qui détermine le pointage par défaut) et le std_problem_grader (un pointage de type tout ou rien). Cette fonctionnalité peut aussi être utilisée avec des systèmes de pointage personnalisés si ils sont écris de façon approprié. "
 
-#: /opt/webwork/webwork2/conf/defaults.config:2036
+#: /opt/webwork/webwork2/conf/defaults.config:1937
 msgid ""
 "<p>During summer 2005, a newer version of the answer checkers was "
 "implemented for answers which are functions and numbers.  The newer checkers"
@@ -290,16 +353,74 @@ msgid ""
 " the old answer checkers will be used by default.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2006
+#: /opt/webwork/webwork2/conf/defaults.config:1908
 msgid ""
 "<p>MathQuill renders students answers in real-time as they type on the "
 "keyboard.</p><p>MathView allows students to choose from a variety of common "
 "math structures (such as fractions and square roots) as they attempt to "
-"input their answers.</p><p>WIRIS provides a separate workspace for students "
-"to construct their response in a WYSIWYG environment.</p>"
+"input their answers.</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1459
+msgid ""
+"<p>Mode in which the LANG and DIR settings for a single problem are "
+"determined.</p><p>The system will set the LANGuage attribute to either a "
+"value determined from the problem, a course-wide default, or the system "
+"default, depending on the mode selected. The tag will only be added to the "
+"DIV enclosing the problem if it is different than the value which should be "
+"set in the main HTML tag set for the entire course based on the course "
+"language.</p><p>There are two options for the DIRection attribute: \"ltr\" "
+"for left-to-write scripts, and \"rtl\" for right-to-left scripts like Arabic"
+" and Hebrew.</p><p>The DIRection attribute is needed to trigger proper "
+"display of the question text when the problem text-direction is different "
+"than that used by the current language of the course. For example, English "
+"problems from the library browser would display improperly in RTL mode for a"
+" Hebrew course, unless the problen Direction is set to LTR.</p><p>The "
+"feature to set a problem language and direction was only added in 2018 to "
+"the PG language, so most problems will not declare their language, and the "
+"system needs to fall back to determining the language and direction in a "
+"different manner. The OPL itself is all English, so the system wide fallback"
+" is to en-US in LTR mode.</p><p>Since the defaults fall back to the LTR "
+"direction, most sites should be fine with the \"auto::\" mode, but may want "
+"to select the one which matches their course language. The mode "
+"\"force::ltr\" would also be an option for a course which runs into trouble "
+"with the \"auto\" modes.</p><p>Modes:</p><ul><li>\"none\" prevents any "
+"additional LANG and/or DIR tag being added. The browser will use the main "
+"setting which was applied to the entire HTML page. This is likely to cause "
+"trouble when a problem of the other direction is "
+"displayed.</li><li>\"auto::\" allows the system to make the settings based "
+"on the language and direction reported by the problem (a new feature, so not"
+" set in almost all existing problems) and falling back to the expected "
+"default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" allows the "
+"system to make the settings based on the language and direction reported by "
+"the problem (a new feature, so not set in almost all existing problems) but "
+"falling back to the language with the given LangCode and the direction Dir "
+"when problem settings are not available from PG.</li><li>\"auto::Dir\" for "
+"problems without PG settings, this will use the default en=english language,"
+" but force the direction to Dir. Problems with PG settings will get those "
+"settings.</li><li>\"auto:LangCode:\" for problems without PG settings, this "
+"will use the default LTR direction, but will set the language to "
+"LangCode.Problems with PG settings will get those "
+"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
+" by the PG code of the problem, and will force the system to set the "
+"language with the given LangCode and the direction to Dir for <b>all</b> "
+"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
+"PG code of the problem, and will force the system to set the direction to "
+"Dir for <b>all</b> problems, but will avoid setting any language attribute "
+"for individual problem.</li></ul>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1514
+msgid ""
+"<p>Some servers handle courses taking place in different timezones.  If this"
+" course is not showing the correct timezone, enter the correct value here.  "
+"The format consists of unix times, such as \"America/New_York\", "
+"\"America/Chicago\", \"America/Denver\", \"America/Phoenix\" or "
+"\"America/Los_Angeles\".</p>Complete list: <a "
+"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1736
+#: /opt/webwork/webwork2/conf/defaults.config:1638
 msgid ""
 "<p>This sets whether the Reduced Scoring system will be enabled.  If enabled"
 " you will need to set the default length of the reduced scoring period and "
@@ -311,22 +432,35 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1979
+#: /opt/webwork/webwork2/conf/defaults.config:1881
 msgid ""
 "<p>When viewing a problem, users may choose different methods of rendering "
 "formulas via an options box in the left panel. Here, you can adjust what "
 "display modes are listed.</p><p>Some display modes require other software to"
 " be installed on the server. Be sure to check that all display modes "
-"selected here work from your server.</p><p>The display modes are "
-"<ul><li>plainText: shows the raw LaTeX strings for formulas.</li><li>images:"
-" produces images using the external programs LaTeX and "
-"dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place "
-"render mathematics.</li></ul></p></p>You must use at least one display mode."
-" If you select only one, then the options box will not give a choice of "
-"modes (since there will only be one active).</p>"
+"selected here work from your server.</p><p>The display modes "
+"are</p><ul><li>plainText: shows the raw LaTeX strings for "
+"formulas.</li><li>images: produces images using the external programs LaTeX "
+"and dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place"
+" render mathematics.</li></ul><p>You must use at least one display mode. If "
+"you select only one, then the options box will not give a choice of modes "
+"(since there will only be one active).</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1476
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with a question in "
+"this test. Please inform your instructor including the warning messages "
+"below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1236
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with this question. "
+"Please inform your instructor including the warning messages below."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1828
+#: /opt/webwork/webwork2/conf/defaults.config:1730
 msgid ""
 "<ul><li><b>SMAcheckAnswers</b>: enables the Check Answers button <i>for the "
 "new problem</i> when Show Me Another is "
@@ -338,7 +472,7 @@ msgid ""
 "time</li><li><b>SMAshowHints</b>: show hints <i>for the new problem</i> "
 "(assuming they exist)</li></ul>Note: there is very little point enabling the"
 " button unless you check at least one of these options - the students would "
-"simply see a new version that they can not attempt or learn from.</p>"
+"simply see a new version that they can not attempt or learn from."
 msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:35
@@ -347,73 +481,123 @@ msgstr ""
 
 #. ($add_courseID)
 #. ($rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1376
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:688
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:600
 msgid "A course with ID %1 already exists."
 msgstr "Un cours avec ID %1 existe déjà."
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2564
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1220
 msgid ""
 "A directory already exists with the name %1. You must first delete this "
 "existing course before you can unarchive."
 msgstr "Un répertoire avec le nom %1 existe déjà. Vous devez d'abord supprimer le cours avant de pouvoir le désarchiver."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:119
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:111
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:42
 msgid ""
 "A file name cannot begin with a dot, it cannot be empty, it cannot contain a"
 " directory path component and only the characters -_.a-zA-Z0-9 and space are"
 " allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1342
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1366
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:738
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
 msgid "A file with that name already exists"
 msgstr "Un fichier avec ce nom existe déjà."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:348
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:19
 msgid ""
 "A hardcopy file was generated, but it may not be complete or correct. Please"
 " check that no problems are missing and that they are all legible. If not, "
 "please inform your instructor."
 msgstr "Une copie papier a été générée, mais elle n'est peut-être pas complète ou correcte. Vous êtes priés de vérifier qu'aucun problème n'est manquant et qu'ils sont tous lisibles. Si ce n'est pas le cas, informer votre instructeur."
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:56
+msgid ""
+"A hash reference in which the keys are the achievement_id's assigned to the "
+"current user and the values are 0 or 1 which stores if the user has earned "
+"the associated achievement or not."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:52
+msgid ""
+"A hash reference which contains a problems metadata, such as DBsubject, "
+"DBchapter, DBsection,  and so on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:37
+msgid "A hash reference which contains the problem data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:40
+msgid "A hash reference which contains the set data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:60
+msgid ""
+"A hash reference which saves data for this user and this achievement. This "
+"hash is persistent between evaluations and changes to this variable will be "
+"saved in the database."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:64
+msgid ""
+"A hash reference which saves global data for this user. This hash is "
+"persistent between evaluations and changes to this variable will be saved in"
+" the database."
+msgstr ""
+
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3291
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1695
 msgid ""
 "A location with the name %1 already exists in the database.  Did you mean to"
 " edit that location instead?"
 msgstr "Un emplacement avec le nom %1 existe déjà dans la base de données. Désirez-vous modifier cette emplacement?"
 
-#. ($subject, $number_of_recipients, $courseName, $failed_messages)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1007
+#. ($mail_data->{subject}, $number_of_recipients, $mail_data->{courseName},
+#. $failed_messages)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:113
 msgid ""
 "A message with the subject line \"%1\" has been sent to %quant(%2,recipient)"
 " in the class %3.  There were %4 message(s) that could not be sent."
 msgstr "Un message ayant comme sujet \"%1\" a été envoyé à %quant(%2, destinataire) dans la catégorie %3. %4 message(s) n'a (n'ont) pu être envoyé(s)."
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:644
-msgid "A new file has been created at '%1'"
-msgstr "Un nouveau fichier a été créé à '%1'"
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:315
+msgid "A new file has been created at \"%1\""
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1146
+msgid "A new file has been created at \"%1\" with the contents below."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:154
+msgid ""
+"A new problem whose path ends in newProblem.pg should be given a new name, "
+"for example, \"myNewProblem.pg\"."
+msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2006
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:20
 msgid ""
-"A new file has been created at '%1' with the contents below.  No changes "
-"have been made to set %2"
-msgstr "Un nouveau fichier a été créé à '%1' avec le contenu suivant. Aucun changement n'a été fait au devoir %2"
+"A student must be assigned a homework set in order for it to appear on their"
+" WeBWorK home page. Check the box in the left column to assign a student to "
+"that homework set. Uncheck the box to unassign a student. If a student is "
+"unassigned from a homework set, all of the student's data for that homework "
+"set is deleted and cannot be recovered. Use this action cautiously!"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:681
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:20
 msgid ""
-"A period (.) indicates a problem has not been attempted, and a number from 0"
-" to 100 indicates the grade earned. The number on the second line gives the "
-"number of incorrect attempts."
-msgstr "Une période (.) indique qu'aucune tentative du problème n'a été effectuée et un nombre entre 0 et 100 indique la note reçu. Le nombre sur la seconde ligne indique le nombre de tentatives incorrect."
+"A student needs to be assigned a set in order for them to work it. Once a "
+"student is unassigned a set, all the data for them is lost and there is no "
+"way to undo it. When unassigning be sure to change the option to \"Allow "
+"unassign\"."
+msgstr ""
 
 # Leave symbol codes in place
-#: /opt/webwork/webwork2/conf/defaults.config:1647
+#: /opt/webwork/webwork2/conf/defaults.config:1549
 msgid ""
 "A switch to govern the use of a Progress Bar for the student; this also "
 "enables/disables the highlighting of the current problem in the side bar, "
@@ -421,474 +605,665 @@ msgid ""
 "(&#x2717;), or unattempted (no symbol)."
 msgstr "Une touche pour régir l'utilisation d'une bar de progression pour l'étudiant; celle-ci permet aussi d'activer/désactiver la surbrillance du problème en cours dans la barre latéral et de déterminer si il est correct (&#x2713;), en progression (&hellip;), incorrect (&#x2717;), ou ne comportant aucune tentative (aucun symbole). "
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:42
+msgid "A unique key identifying the achievement."
+msgstr ""
+
 # Short for ADJUSTED STATUS
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:500
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:712
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:535
 msgid "ADJ STATUS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2296
-msgid "ANSWERS NOT RECORDED"
-msgstr "RÉPONSES NON ENREGISTRÉES"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2281
-msgid "ANSWERS NOT RECORDED --"
-msgstr "RÉPONSES NON ENREGISTRÉES --"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2295
-msgid "ANSWERS ONLY CHECKED -- "
-msgstr "RÉPONSES VÉRIFIÉES SEULEMENT --"
+#. ($c->{scoreRecordedMessage}[ $probOrder->[$i] ])
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:504
+msgid "ANSWERS NOT RECORDED -- %1"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2232
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1505
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:515
 msgid "ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"
 msgstr "LES RÉPONSES ONT ÉTÉ VÉRIFIÉES -- MAIS ELLES N'ONT PAS ÉTÉ ENREGISTRÉES"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1527
 msgid ""
 "ATTEMPT NOT ACCEPTED -- Please submit answers again (or request new version "
 "if neccessary)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1534
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_password_form.html.ep:1
 msgid "Abandon changes"
 msgstr "Ne pas enregistrer les modifications"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1083
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_export_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_export_form.html.ep:1
 msgid "Abandon export"
 msgstr "Annuler l'exportation"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:520
 msgid ""
 "Account creation is currently disabled in this course.  Please speak to your"
 " instructor or system administrator."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:153
-msgid "Achievement"
-msgstr "Achèvement"
-
-#. ($targetAchievementID, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:638
-msgid "Achievement %1 created with evaluator '%2'."
-msgstr "Achèvement %1 créé avec l'évaluateur '%2'."
+#. ($targetAchievementID,			$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:310
+msgid "Achievement %1 created with evaluator \"%2\"."
+msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:847
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:378
 msgid "Achievement %1 exists.  No achievement created"
 msgstr "Achèvement %1 existe déjà. Aucun achèvement n'a été créé."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:444
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:63
 msgid "Achievement Editor"
 msgstr "Éditeur d'achèvement"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:548
-msgid "Achievement Evaluator Editor"
-msgstr "Éditeur d'évaluateur d'achèvement"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:17
+msgid "Achievement Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:17
+msgid "Achievement Evaluator Editor Help"
+msgstr ""
 
-#. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:170
+#. ($c->stash('achievementID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:109
 msgid "Achievement Evaluator for achievement %1"
 msgstr "Évaluateur d'achèvement pour l'achèvement %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1446
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1454
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1482
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:13
 msgid "Achievement ID"
 msgstr "ID d'achèvement"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:274
 msgid "Achievement ID exists!  No new achievement created.  File not saved."
 msgstr "ID d'achèvement existe déjà. Aucun achèvement n'a été créé. Fichier non sauvegardé."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1698
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:41
+msgid "Achievement ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:3
+msgid "Achievement List"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1600
 msgid "Achievement Points Per Problem"
 msgstr "Points d'achèvement par problème"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:558
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:455
 msgid "Achievement User Editor"
 msgstr "Éditeur d'achèvement pour l'utilisateur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:17
+msgid "Achievement User Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:48
 msgid "Achievement has been assigned to all users."
 msgstr "L'achèvement a été assigné pour tous les utilisateurs."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:67
 msgid "Achievement has been assigned to selected users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:60
 msgid "Achievement has been unassigned to all students."
 msgstr "L'achèvement a été désassigné pour tous les étudiants"
 
-#. (CGI::a({ href => $fileManagerURL }, $scoreFileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:711
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:38
+msgid "Achievement options"
+msgstr ""
+
+#. ($c->link_to(                           $scoreFileName => $c->systemLink(
+#. $c->url_for('instructor_file_manager')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:318
 msgid "Achievement scores saved to %1"
 msgstr "Le pointage pour l'achèvement à été sauvegardé sur %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:260
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:241
 msgid "Achievements"
 msgstr "Achèvements"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:531
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:17
+msgid "Achievements Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:26
+msgid ""
+"Achievements are evaluated in the order shown below, with the exception of "
+"\"level\" achievements.  Achievements in the \"level\" category are "
+"evaluated first and control the XP thresholds and rewards (achievement "
+"items) for reaching each level. Achievements in the \"secret\" category are "
+"not shown to students until they earn the achievement, and is used for "
+"fun/surprise achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:32
+msgid ""
+"Achievements in the same category, with sequential numbers, and whose ID "
+"starts with the same \"prefix_\" (up to the last underscore), are treated as"
+" achievement chains.  Achievement chains are a sequence of achievements "
+"which build upon themselves, such as complete one problem, complete 10 "
+"problems, complete 25 problems, and so on. Students will only see the "
+"achievements in the chain they have completed or are currently working on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:201
 msgid "Act as"
 msgstr "Agit comme"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:207
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:26
 msgid "Act as:"
 msgstr "Est:"
 
-#. (HTML::Entities::encode_entities($prettyEUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1134
+#. ($effectiveUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:26
 msgid "Acting as %1."
 msgstr "Agissant comme %1."
 
 #. ($actionID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:372
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:223
 msgid "Action %1 not found"
 msgstr "Action %1 introuvable"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1706
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:101
+msgid "Actions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1608
 msgid ""
 "Activating this will enable achievement rewards. This feature allows "
 "students to earn rewards by completing achievements that allow them to "
 "affect their homework in a limited way."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:45
 msgid "Active"
 msgstr "Actif"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1691
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:50
+msgid "Active Students"
+msgstr ""
+
+#. ($c->{prettyID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:19
+msgid "Active Students Problem %1 Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1593
 msgid ""
 "Activiating this will enable Mathchievements for webwork.  Mathchievements "
 "can be managed by using the Achievement Editor link."
 msgstr "Ceci est pour activer Mathchievements pour webwork. Mathchievements peut être géré en utilisant le lien de l'éditeur d'objectifs."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2947
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1548
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:166
 msgid "Add"
 msgstr "Ajouter"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:89
 msgid "Add All"
 msgstr "Ajouter tous"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:644
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:32
 msgid "Add Course"
 msgstr "Ajouter le cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:253
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:17
+msgid "Add Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:14
+msgid "Add Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:98
 msgid "Add Students"
 msgstr "Ajouter les étudiants"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:406
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:349
 msgid "Add Users"
 msgstr "Ajouter des usagers"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:518
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:17
+msgid "Add Users Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:47
 msgid "Add WeBWorK administrators to new course"
 msgstr "Ajouter l'administrateur WeBWorK au nouveau cours."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1509
-msgid "Add a new test for which Gateway?"
-msgstr "Ajouter un nouveau test pour quelle passerelle?"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:79
+msgid "Add a TA or an instructor (change permission level of user)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:60
+msgid "Add a few students to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:50
+msgid "Add a new version for which test?"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1441
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:20
 msgid "Add as what filetype?"
 msgstr "Spécifier le type du fichier"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/add_form.html.ep:3
 msgid "Add how many users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1549
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:69
+msgid "Add many students to a course from a class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:108
+msgid "Add n blank problem template(s) to the end of homework set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:164
 msgid "Add problem to target set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Add problems to"
 msgstr "Ajouter les problèmes à"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1422
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:161
+msgid ""
+"Add this problem as the last problem of an existing set, either as a problem"
+" or as the set header (the text that appears on the home page of a homework "
+"set). You can rearrange the order of the problems later using the \"Hmwk "
+"Sets Editor\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:7
 msgid "Add to what set?"
 msgstr "Ajouter à quel devoir?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:20
+msgid ""
+"Add users to the course.  Select the number of students/users to add and "
+"then add any desired information.  The only mandatory information is the "
+"\"Login Name\". Any other fields may be left blank.  The \"Student ID\" will"
+" be the initial password for the user if provided."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:26
 msgid "Add which new users?"
 msgstr "Ajouter quels nouveaux usagers?"
 
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:883
+msgid "Added \"%1\" to %2 as new hardcopy header"
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:854
+msgid "Added \"%1\" to %2 as new set header"
+msgstr ""
+
 #. ('{number}', '{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1055
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:27
 msgid "Added %1 problems to set %2."
 msgstr ""
 
-#. ($sourceFilePath, $targetSetName,($set->assignment_type eq 'jitar' ?
-#. join('.',jitar_id_to_seq($targetProblemNumber)
-#. ($new_file_name, $setName, ($set->assignment_type eq 'jitar' ?
-#. join('.',jitar_id_to_seq($targetProblemNumber)
 #. ($new_file_path, $setID, $targetProblemNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1510
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2001
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1912
+#. ($sourceFilePath,                       $targetSetName,                 (
+#. $set->assignment_type eq 'jitar'                                ? join('.',
+#. jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:825
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1837
 msgid "Added %1 to %2 as problem %3"
 msgstr "Ajouté %1 à %2 en problème %3"
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1566
-msgid "Added '%1' to %2 as new hardcopy header"
-msgstr "Ajouter '%1' à %2 comme nouvelle en-tête de copie papier."
-
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1540
-msgid "Added '%1' to %2 as new set header"
-msgstr "Ajouter '%1' à %2 comme nouvelle en-tête au devoir."
+#. ($new_file_name,                                $c->{setID},
+#. (                                       $set->assignment_type eq 'jitar'
+#. ? join('.', jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1139
+msgid "Added %1 to %2 as problem %3."
+msgstr ""
 
 #. (join(', ', @toAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1974
 msgid "Added addresses %1 to location %2."
 msgstr "Ajout des adresses %1 à l'emplacement %2."
 
+#. ($user->user_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:167
+msgid "Added missing permission level for user %1."
+msgstr ""
+
 #. ('{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1054
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:26
 msgid "Added one problem to set %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Added user:"
+msgstr ""
+
+#. ('<code>[Scoring]/report_grades_data.csv</code>',
+#. '<code>[TMPL]/email/report_grades.msg</code>',)
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:33
+msgid ""
+"Additional (external) grades can be shown on this page by placing them in "
+"the CSV file %1.  The first six columns must be (in order): Student ID, "
+"Username, Last Name, First Name, Section, Recitation.  The remaining columns"
+" can list any external grades.  To display the grades, the CSV file is "
+"merged with the \"Email\" message %2, which will be rendered and displayed "
+"below the grade table.  The message can be created on the \"Email\" page and"
+" the CSV file can be created/uploaded using the \"File Manager\".  External "
+"grades can only be displayed here and are not included in any totals or "
+"statistics."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2060
 msgid "Additional addresses for receiving feedback e-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:235
 msgid "Additional submissions available."
 msgstr ""
 
 #. ($badLocAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1708
 msgid ""
 "Address(es) %1 already exist in the database.  THIS SHOULD NOT HAPPEN!  "
 "Please double check the integrity of the WeBWorK database before continuing."
 msgstr "L'adresse (ou les adresses) %1 existe(nt) déjà dans la base de données. CELA NE DEVRAIT PAS SE PRODUIRE! Vérifier de nouveau l'intégrité de la base de données WeBWorK avant de continuer. "
 
 #. (join(', ', @noAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1986
 msgid ""
 "Address(es) %1 in the add list is(are) already in the location %2, and so "
 "were skipped."
 msgstr "L'emplacement contient déjà l'adresse (les adresses) %1 de la liste d'éléments à ajouter, elle a (elles ont) donc été ignorée(s)."
 
 #. (join(', ', @noDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3603
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2008
 msgid ""
 "Address(es) %1 in the delete list is(are) not in the location %2, and so "
 "were skipped."
 msgstr "L'emplacement ne contient pas l'adresse (les adresses) %1 de la liste d'éléments à supprimer, elle a (elles ont) donc été ignorée(s)."
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1683
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and resubmit."
 msgstr "La formulation de l'adresse (des adresses) %1 n'est (ne sont) pas reconnue(s). Vérifier les informations entrées et renvoyer."
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1998
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and try again."
 msgstr "La formulation de l'adresse (des adresses) %1 n'est (ne sont) pas reconnue(s). Vérifier les informations entrées et réessayer."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:117
 msgid "Addresses"
 msgstr "Les adresses"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:53
 msgid ""
 "Addresses for new location.  Enter one per line, as single IP addresses "
 "(e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP ranges "
 "(e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:27
 msgid ""
 "Addresses to add to the location.  Enter one per line, as single IP "
 "addresses (e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP"
 " ranges (e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:232
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:27
 msgid "Adds 24 hours to the close date of a homework."
 msgstr "Ajouter 24 heures à la date de remise du devoir."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:323
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:27
 msgid "Adds 48 hours to the close date of a homework."
 msgstr "Ajouter 48 heures à la date de remise du devoir."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:110
+msgid ""
+"Adds new template problems to the set when the set is saved. You can modify "
+"the template to create your own problem, by clicking on the \"Edit Problem\""
+" link and saving to some new file, e.g. \"myNewProblem.pg\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:19
 msgid "Adjusted Status"
 msgstr "Statut ajusté"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:56
 msgid "Adobe PDF"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:675
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:42
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:196
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:206
 msgid "After set answer date"
 msgstr "Après la date d'accès aux réponses du devoir"
 
-#. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:325
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:33
 msgid ""
-"After the reduced scoring period begins all work counts for %1% of its "
-"value."
-msgstr "Après la date de remise, tous les travaux compte pour %1% de leur valeur."
+"After the due date this set enters a reduced scoring period until it closes "
+"on %1.  All work completed during the reduced scoring period counts for %2% "
+"of its value."
+msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:304
 msgid "Afterward reduced credit can be earned until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:56
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:60
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:23
 msgid "All Chapters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:57
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:34
 msgid "All Sections"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:6
 msgid "All Selected Constraints Joined by \"And\""
 msgstr "Toutes les contraintes sélectionnées sont jointes par ''et''"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:71
+msgid "All Sets"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:12
 msgid "All Subjects"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:48
 msgid "All Textbooks"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:54
+msgid "All Users"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:49
 msgid "All assignments were made successfully."
 msgstr "Tous les devoirs ont été créés avec succès."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:953
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:386
 msgid "All listed sets were hidden from all the students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:951
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:381
 msgid "All listed sets were made visible for all the students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:407
 msgid "All of the answers above are correct."
 msgstr "Les réponses ci-dessus sont toutes correctes."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:398
 msgid "All of the gradeable answers above are correct."
 msgstr "Toutes les réponses graduables sont correctes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:247
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:162
+msgid ""
+"All of the paths for problem files are relative to the templates directory "
+"of the current course. You can access this directory \"directly\" using the "
+"File Manager page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:68
 msgid "All of these files will also be made available for mail merge."
 msgstr "Tous ces fichiers seront disponibles pour une fusion de courrier."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:960
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:9
+msgid "All problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:5
+msgid "All sections"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2145
+msgid "All selected courses are already hidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2214
+msgid "All selected courses are already unhidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:399
 msgid "All selected sets hidden from all students"
 msgstr "Tous les devoirs sélectionnés sont cachés pour tous les étudiants."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:394
 msgid "All selected sets made visible for all students"
 msgstr "Tous les devoirs sélectionnés sont visibles pour tous les étudiants."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:946
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:373
 msgid "All sets hidden from all students"
 msgstr "Tous les devoirs sont cachés pour tous les étudiants."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:945
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:368
 msgid "All sets made visible for all students"
 msgstr "Tous les devoirs sont visibles pour tous les étudiants."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:619
 msgid "All sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:56
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:54
 msgid "All unassignments were made successfully."
 msgstr "Toutes les désinscriptions ont été faites avec succès "
 
-#: /opt/webwork/webwork2/conf/defaults.config:2047
+#: /opt/webwork/webwork2/conf/defaults.config:1948
 msgid "Allow Unicode alternatives in student answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:74
 msgid "Allow the LMS to update user account data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:68
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:105
 msgid "Allow unassign"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2069
+#: /opt/webwork/webwork2/conf/defaults.config:1970
 msgid "Allowed error, as a percentage, for numerical comparisons"
 msgstr "Erreur permise, en pourcentage, pour les comparaisons numériques"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1886
+#: /opt/webwork/webwork2/conf/defaults.config:1788
 msgid "Allowed to <em>act as</em> another user"
 msgstr "Autorisé à <em> agir comme </ em> un autre utilisateur"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1923
+#: /opt/webwork/webwork2/conf/defaults.config:1825
 msgid "Allowed to change display settings used in pg problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1913
+#: /opt/webwork/webwork2/conf/defaults.config:1815
 msgid "Allowed to change their e-mail address"
 msgstr "Autorisés à modifier leur adresse e-mail"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1877
+#: /opt/webwork/webwork2/conf/defaults.config:1779
 msgid "Allowed to change their password"
 msgstr "Autorisés à changer leur mot de passe"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1872
+#: /opt/webwork/webwork2/conf/defaults.config:1774
 msgid "Allowed to login to the course"
 msgstr "Autorisé à se connecter au cours"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1950
+#: /opt/webwork/webwork2/conf/defaults.config:1852
 msgid "Allowed to see solutions before the answer date"
 msgstr "Autorisés à voir les solutions avant la date de disponibilité des réponses"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1945
+#: /opt/webwork/webwork2/conf/defaults.config:1847
 msgid "Allowed to see the correct answers before the answer date"
 msgstr "Autorisé à voir les bonnes réponses avant la date de disponibilité des réponses"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1934
+#: /opt/webwork/webwork2/conf/defaults.config:1836
 msgid "Allowed to view past answers"
 msgstr "Autorisés à voir les anciennes réponses"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1940
+#: /opt/webwork/webwork2/conf/defaults.config:1842
 msgid "Allowed to view problems in sets which are not open yet"
 msgstr "Autorisés à voir des problèmes dans des devoirs qui ne sont pas encore ouverts"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1572
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:82
+msgid ""
+"Allows configuration of certain parameters, such as permission levels, "
+"default display mode for equations, and email feedback behavior, on a course"
+" by course basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:126
+msgid "Also copy simple configuration file"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:26
 msgid "Amulet of Extension"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:20
+msgid ""
+"An achievement evaluator is a perl script that is run after each problem is "
+"submitted which returns a truth value of 0 (didn't earn) or 1 (earn). The "
+"evaluator is given access to different variables which contain data about "
+"the problem and set that is used to determine if the achievement is earned "
+"or not."
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:37
 msgid ""
 "An address that can be used to log in to the LMS. This is used in messages "
@@ -896,248 +1271,308 @@ msgid ""
 "WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:43
+msgid ""
+"An array which lists the hash reference of all the problems in the current "
+"set."
+msgstr ""
+
 #. ($archive_courseID)
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2350
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2647
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1274
 msgid "An error occured while archiving the course %1:"
 msgstr ""
 
 #. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:658
 msgid "An error occured while changing the title of the course %1."
 msgstr ""
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1795
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:878
 msgid "An error occured while deleting the course %1:"
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1521
+#. ($rename_oldCourseID,						$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:751
 msgid "An error occured while renaming the course %1 to %2:"
 msgstr ""
 
 #. ($part + 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:106
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:25
 msgid "Answer %1 Score (%):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:425
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:765
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:789
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:812
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:79
 msgid "Answer Date"
 msgstr "Date de disponibilité des réponses"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1712
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:39
 msgid "Answer Group Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:59
 msgid "Answer Hash Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:221
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:292
 msgid "Answer Log"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:17
+msgid "Answer Log Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:285
 msgid "Answer Preview"
 msgstr "Aperçu des réponses"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1465
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:48
+msgid ""
+"Answer availability for tests depends on multiple settings.  This only "
+"indicates the template answer date has passed.  See set editor for actual "
+"availability."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1276
 msgid "Answer(s) submitted:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
 msgid "Answer:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:224
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
 msgid "Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:122
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:37
 msgid "Answers Available"
 msgstr "Réponses disponible"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1202
 msgid "Answers cannot be due until on or after the open date!"
 msgstr "Les réponses ne peut pas être dues avant la date d'ouverture!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1204
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1197
 msgid "Answers cannot be made available until on or after the close date!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:313
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:21
 msgid ""
 "Any changes made below will be reflected in the achievement for ALL "
 "students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2259
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:507
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:175
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:69
 msgid "Any changes made below will be reflected in the set for ALL students."
 msgstr "Les changements effectués ci-bas affecteront les devoirs de TOUS les étudiants"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:173
 msgid ""
 "Any changes made below will be reflected in the set for ONLY the student(s) "
 "listed above."
 msgstr "Les changements suivants vont être reflètés dans le devoir SEULEMENT pour les étudiants dans la liste suivante."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:122
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:159
 msgid "Append"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1849
+#. (tag('strong', dir => 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:71
 msgid "Append to end of %1 set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2264
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:51
+msgid "Applying definitions theoretically and proof writing"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:91
 msgid "Archive"
 msgstr ""
 
 #. ($archive, $n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:892
-msgid "Archive '%1' created successfully (%quant( %2, file))"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:361
+msgid "Archive \"%1\" created successfully (%quant( %2, file))"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1069
-msgid "Archive '%1' deleted"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:525
+msgid "Archive \"%1\" deleted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1846
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2048
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:38
 msgid "Archive Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2005
-msgid "Archive Courses"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:17
+msgid "Archive Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2423
-msgid "Archive next course"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:63
+msgid "Archive Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1056
-msgid "Archive this Course"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1158
+msgid "Archive next course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:61
 msgid "Archived Courses"
 msgstr ""
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:202
-msgid "Archiving course as %1.tar.gz. Reload FileManager to see it."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:69
+msgid "Archived course as %1.tar.gz."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:25
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to access the .tar.gz files."
 msgstr ""
 
-#. (CGI::b($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2191
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:26
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to upload additional .tar.gz "
+"files to be unarchived."
+msgstr ""
+
+#. (tag('b', $archive_courseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:57
 msgid ""
 "Are you sure that you want to delete the course %1 after archiving? This "
 "cannot be undone!"
 msgstr ""
 
-#. (CGI::b($delete_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1736
+#. (tag('b', param('delete_courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:5
 msgid ""
 "Are you sure you want to delete the course %1? All course files and data "
 "will be destroyed. There is no undo available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:72
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:511
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:64
+msgid ""
+"As the checkbox says, this includes a percentage grade column for each set."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:184
 msgid "Assign"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:225
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:62
 msgid "Assign All Sets to Current User"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:171
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:106
+msgid "Assign achievements"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:43
+msgid "Assign and unassign selected exercise sets to selected users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:54
 msgid "Assign selected sets to selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:919
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:154
+msgid "Assign sets to many students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:116
+msgid "Assign sets to one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:15
 msgid "Assign this achievement to which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1366
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:62
 msgid "Assign this set to which users?"
 msgstr "Assigner ce devoir à quels usagers?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:15
 msgid "Assign to All Current Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:3
 msgid "Assign which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:35
 msgid "Assigned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1984
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:19
 msgid "Assigned Sets"
 msgstr "Devoirs assignés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:580
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:218
 msgid "Assigned achievements to users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2154
-msgid "Assigned to"
+#. (link_to(						$c->setCountMessage($db->countUserSets($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:96
+msgid "Assigned to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:212
 msgid "Assignment type"
 msgstr "Type de devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-msgid "Assignments only"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:2004
+#: /opt/webwork/webwork2/conf/defaults.config:1906
 msgid "Assist with the student answer entry process."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:417
 msgid "At least one of the answers above is NOT correct."
 msgstr ""
 
 # Short for "Attempts to Open Children"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:487
 msgid "Att. to Open Children"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:50
 msgid "Attachment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2293
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:107
 msgid "Attempt to upgrade directories"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:375
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:449
 msgid "Attempted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1416
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1498
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/attempts_row.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:73
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:13
 msgid "Attempts"
 msgstr "Essais"
 
@@ -1145,64 +1580,114 @@ msgstr "Essais"
 msgid "Audit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:342
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:348
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:360
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:366
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:460
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:466
 msgid "Authentication failed.  Please speak to your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/InstructorRPCHandler.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:44
+msgid "Authentication failed. Log in again to continue."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:116
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:69
 msgid "Author Info"
 msgstr "À propos de l'auteur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:87
 msgid "Automatic"
 msgstr "Automatique"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2058
+#: /opt/webwork/webwork2/conf/defaults.config:1959
 msgid ""
 "Automatically convert Full Width Unicode characters to their ASCII "
 "equivalents"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2911
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:97
+msgid ""
+"Automatically render all problems in the set on this page when \"Save "
+"Changes\" or \"Reset Form\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:667
 msgid "Automatically render problems on page load"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1727
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:95
+msgid "Automatically render problems on page load."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:49
 msgid "Auxiliary Resources"
 msgstr ""
 
-#. ($emailDirectory,$old_default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:350
-msgid "Backup file <code>%1/%2</code> created."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:179
+msgid "Average Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:255
-msgid "Badges"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:118
+msgid "Average Attempts Per Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:942
-msgid "Basic Search"
-msgstr "Recherche de base"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:115
+msgid "Average Percent"
+msgstr ""
+
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:558
+msgid "Backup created on %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:1
+msgid "Badges"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:106
+msgid "Basic Search"
+msgstr "Recherche de base"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:28
+msgid "Before Open Date"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:31
+msgid ""
+"Below the file list is a button and options for uploading files. Click the "
+"\"Choose File\" button, select the file, then click \"Upload\". A single "
+"file or a compressed tar (.tgz) file can be uploaded and if the option is "
+"selected, the archive is automatically unpacked and deleted.  Generally the "
+"\"automatic\" option on Format will correctly pick the correct type of file."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:83
 msgid "Binary"
-msgstr "Binaire"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+msgid "Both Start and Grade"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1271
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:26
 msgid "Box of Transmogrification"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1093
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:40
 msgid "Browse"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:512
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:991
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:16
 msgid "Browse from:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2161
+#: /opt/webwork/webwork2/conf/defaults.config:2072
 msgid ""
 "By default, feedback is always sent to all users specified to recieve "
 "feedback.  This variable sets the system to only email feedback to users who"
@@ -1210,327 +1695,471 @@ msgid ""
 "will only be sent to section leaders."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2151
+#: /opt/webwork/webwork2/conf/defaults.config:2062
 msgid ""
 "By default, feedback is sent to all users above who have permission to "
 "receive feedback. Feedback is also sent to any addresses specified in this "
 "blank. Separate email address entries by commas."
 msgstr "Par défaut, un feedback est envoyé à tous les utilisateurs ci-dessus qui ont la permission de recevoir des commentaires. Un feedback est également envoyé à toutes les adresses spécifiées dans ce vide. Séparer les adresses e-mail par des virgules."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
 msgid "CLOSE DATE"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:217
 msgid "CLOSE TIME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:26
 msgid "Cake of Enlargement"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1891
+#: /opt/webwork/webwork2/conf/defaults.config:1793
 msgid "Can e-mail instructor"
 msgstr "Peut envoyer des emails à un instructeur"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1904
+#: /opt/webwork/webwork2/conf/defaults.config:1806
 msgid "Can report bugs"
 msgstr "Peut rapporter des bugs"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1955
+#: /opt/webwork/webwork2/conf/defaults.config:1857
 msgid "Can show old answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1897
+#: /opt/webwork/webwork2/conf/defaults.config:1799
 msgid "Can submit answers for a student"
 msgstr "Peut soumettre les réponses pour un étudiant"
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:275
 msgid "Can't copy file: %1"
 msgstr ""
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:894
-msgid "Can't create archive '%1': command returned %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
+msgid "Can't create archive \"%1\": command returned %2"
 msgstr ""
 
 #. ($courseID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2725
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:28
 msgid "Can't create course environment for %1 because %2"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:423
 msgid "Can't create directory: %1"
 msgstr ""
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1060
-msgid "Can't create file '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+msgid "Can't create file \"%1\": %2"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:948
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:406
 msgid "Can't create file: %1"
 msgstr ""
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1070
-msgid "Can't delete archive '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:526
+msgid "Can't delete archive \"%1\": %2"
 msgstr ""
 
-#. ($eUserID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:69
-msgid "Can't get password record for effective user '%1': %2"
-msgstr "Impossible d'accéder au mot de passe pour l'usager actuel '%1': %2"
-
-#. ($userID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:64
-msgid "Can't get password record for user '%1': %2"
-msgstr "Impossible d'accéder au mot de passe pour l'usager '%1': %2"
+#. ($setID, $TargetUser->user_id,)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:925
+msgid ""
+"Can't generate hardcopy for set \"%1\" for user \"%2\". The set is not "
+"visible to students."
+msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:445
 msgid "Can't open %1"
 msgstr "Impossible d'ouvrir %1"
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1426
 msgid "Can't open file %1"
 msgstr "Impossible d'ouvrir le fichier %1"
 
 #. ($merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:343
 msgid "Can't read merge file %1. No message sent"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:760
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:298
 msgid "Can't rename file: %1"
 msgstr "Impossible de renommer le fichier: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:591
 msgid "Can't rename to the same name."
 msgstr "Impossible de renommer avec le même nom."
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:927
-msgid "Can't unpack '%1': command returned %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:392
+msgid "Can't unpack \"%1\": command returned %2"
 msgstr ""
 
 #. ($fullPath)
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:629
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1895
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1819
 msgid "Can't write to file %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1015
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1096
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:154
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:462
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/confirm.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:69
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:15
 msgid "Cancel"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:387
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:5
+msgid "Cancel E-Mail"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:60
 msgid "Cancel E-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:61
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:77
 msgid "Cancel Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:79
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
 msgid "Cancel Export"
 msgstr "Annuler l'exportation"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:93
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
 msgid "Cancel Password"
 msgstr "Annuler le mot de passe"
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:516
+msgid "Cannot find a file path to save to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:501
+msgid ""
+"Cannot find a problem record for set $c->{setID} / problem $c->{problemID}"
+msgstr ""
+
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:240
 msgid "Cannot open %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:222
-msgid "Cap Test Time at Set Close Date?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:232
+msgid "Cap Test Time at Set Close Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1456
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1486
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:14
 msgid "Category"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:516
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:49
+msgid "Category:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:27
 msgid ""
 "Cause the selected homework set to count for twice as many points as it "
 "normally would."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1272
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:27
 msgid ""
 "Causes a homework problem to become a clone of another problem from the same"
 " set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:727
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:27
 msgid "Causes a single homework problem to be worth twice as much."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1006
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:48
 msgid "Change Course Title to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:34
 msgid "Change CourseID to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:176
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:134
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:76
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:25
 msgid "Change Display Settings"
 msgstr "Changer les paramètres d'affichage"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:53
 msgid "Change Email Address"
 msgstr "Changer l'adresse courriel"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1032
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:62
 msgid "Change Institution to:"
 msgstr "Changer l'institution pour:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:374
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:18
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:169
 msgid "Change User Settings"
 msgstr "Changer les paramètres d'utilisateur"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:35
+msgid "Change a course's ID, Title, or Institution."
+msgstr ""
+
 #. ($rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1092
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
 msgid "Change course institution from %1 to %2"
 msgstr "Changer l'institution du cours %1 pour %2"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:160
+msgid "Change dates for a homework set for the whole class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:123
+msgid "Change the due date for one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:26
+msgid ""
+"Change the due dates for an individual student on this page. Check the "
+"checkbox and enter the new date in order to override the date. (You can copy"
+" the date format from the date in the right hand column which indicates the "
+"date when the homework set is due for the whole class.) Note that you should"
+" ensure that the close date is before the answer date. If the close date for"
+" a student is extended until after the class answer date for the set, then "
+"the answer date for the student must also be set to a later date. "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:141
+msgid "Change the grades on a homework set for one student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:163
+msgid "Change the grading on a homework set for an entire class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:170
+msgid "Change the number of atttempts allowed on a problem."
+msgstr ""
+
 #. ($rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1089
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:508
 msgid "Change title from %1 to %2"
 msgstr "Changer le titre %1 pour %2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1362
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:488
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:540
 msgid "Changes abandoned"
 msgstr "Les modifications n'ont pas été sauvegardées"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:371
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:242
 msgid "Changes in this file have not yet been permanently saved."
 msgstr "Les modifications dans ce fichier n'ont pas été sauvegardées."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:647
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:529
 msgid "Changes saved"
 msgstr "Les modifications ont été sauvegardées"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1822
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:38
+msgid "Changing dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:514
 msgid ""
 "Changing the problem seed for display, but there are no problems showing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:635
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:19
 msgid "Chapter:"
 msgstr "Chapitre:"
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1849
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:15
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:103
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:37
 msgid "Check Answers"
 msgstr "Vérifier les réponses"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2476
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:682
 msgid "Check Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:183
-msgid "Check that it's permissions are set correctly."
-msgstr ""
-
-#. ($emailDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:195
-msgid ""
-"Check whether it exists and whether the directory %1 can be read by the "
-"webserver."
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:53
+msgid "Choose problems from a library and add them to a homework set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:543
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:40
 msgid "Choose the set which you would like to be worth twice as much."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:44
 msgid "Choose the set which you would like to enable partial credit for."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1206
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:992
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:44
 msgid "Choose the set which you would like to resurrect."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:259
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:350
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:40
 msgid "Choose the set whose close date you would like to extend."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:903
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:16
 msgid "Choose visibility of the sets to be affected"
 msgstr "Choisir si les devoirs seront visibles ou non auprès des étudiants"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:497
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:15
 msgid "Choose what to do with existing data:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:880
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:3
 msgid "Choose which sets to be affected"
 msgstr "Choisir les devoirs à modifier"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:491
-msgid "Class value"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:17
+msgid "Class List Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:55
+msgid "Class list (\".lst\") files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:334
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:316
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:37
 msgid "Classlist Editor"
 msgstr "Liste d'usagers"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1197
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:91
 msgid "Clear Problem Display"
 msgstr "Effacer l'affichage du problème"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:693
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:82
 msgid ""
 "Click a student's name to see the student's homework set. Click a heading to"
 " sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:74
 msgid ""
 "Click a student's name to see the student's test summary page. Click a "
 "test's version number to see the corresponding test version. Click a heading"
 " to sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:614
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:150
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:143
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made. (The grade for each problem is listed "
+"as \"status\" on this third page)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:24
+msgid ""
+"Click on each of the tabs to view the configuration items. The question mark"
+" icon provides access to information about the behavior of the configuration"
+" settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:125
+msgid ""
+"Click on the column \"Assigned Sets\" in the student's row. This will take "
+"you to a page where you can assign and unassign homework sets and change the"
+" due dates for homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:33
+msgid ""
+"Click on the homework set links to edit the grades for this individual "
+"student on the homework set. (The grade of each problem is called the "
+"\"status\".) You can also change the number of allowed attempts and further "
+"modify the individual student's homework set.) You will also be able to "
+"change a student's seed which determines the individual values used in the "
+"individual version of the student's problem and the weight (how much a "
+"problem counts towards the grade.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:90
 msgid ""
 "Click on the login name to edit individual problem set data, (e.g. due "
 "dates) for these students."
 msgstr "Cliquer sur le nom d'usager pour éditer les devoirs individuellement (par ex. la date de remise) pour ces étudiants"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:62
+msgid ""
+"Click the \"Add x student(s)\" radio button and then click \"Take action\". "
+"This will take you to a new page where the data can be entered for one or "
+"more students. It is also possible to assign the student to one or more "
+"problem sets as they are being entered: simply select the homework sets from"
+" the list below the data entry table. Use \"command\" or \"control\" click "
+"to select more than one homework set."
+msgstr ""
+
+#. ('<i class="fas fa-question-circle"></i>')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:88
+msgid "Click the %1 icon for page and item specific help."
+msgstr ""
+
+#. ('<a href="#"><i class="fas fa-question-circle"></i></a>')
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:20
+msgid "Click the icon %1 for page and item specific help."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:185
+msgid ""
+"Clicking on any active link at the top of the column sorts the page by that "
+"column. You can do lexigraphic sorts: click on \"First name\" then \"Last "
+"name\" to sort by last name, sorting those with the same last name by their "
+"first name."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:132
+msgid ""
+"Clicking on the login name link in a student's row allows you to view the "
+"student's version of the homework (rather than your own) so that you can "
+"more easily answer student questions about homework problems. (A \"acting as"
+" xxx\" alert will appear in the upper right corner of each window while you "
+"are acting as a student.) You can submit the answers (which will NOT be "
+"recorded) to check that the computer is grading the problem correctly. You "
+"will also be able to view past answers submitted by the student for each "
+"problem. To stop acting in the student's role click the \"Stop acting\" link"
+" in the upper right corner of the window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:199
+msgid ""
+"Clicking the <strong>e-mail address</strong> link will bring up your "
+"standard email application so that you can send email to the student. This "
+"works even if the student has been dropped from the course. To send email to"
+" an entire class or to merge grades with the email message use the \"Email\""
+" page link in the left margin."
+msgstr ""
+
 #. ($clientIP->ip()
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:541
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:547
 msgid ""
 "Client ip address %1 is not allowed to work this assignment, because the "
 "assignment has ip address restrictions and there are no allowed locations "
@@ -1538,329 +2167,337 @@ msgid ""
 "problem resolved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:713
-msgid "Close"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:316
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:39
+msgid "Close Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:424
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:764
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:788
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:811
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
-msgid "Close Date"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:35
+msgid "Closed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:382
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:208
 msgid "Closed, answers available."
 msgstr ""
 
-#. ($self->formatDateTime($set->answer_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:378
+#. ($c->formatDateTime($set->answer_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:204
 msgid "Closed, answers on %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:206
 msgid "Closed, answers recently available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:282
 msgid "Closed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:116
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:121
 msgid "Closes"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date, undef,
-#. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:113
-msgid "Closes %1"
-msgstr ""
-
-#. ($self->formatDateTime($verSet->due_date, undef,
+#. ($c->formatDateTime($verSet->due_date, undef,
 #. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:390
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:227
 msgid "Closes on %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:35
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:33
 msgid "Closes:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2518
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:357
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:71
 msgid "Collapse All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2529
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:367
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:85
 msgid "Collapse All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2668
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:419
 msgid "Collapse Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2791
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2793
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:572
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:575
 msgid "Collapse Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1715
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:73
+msgid ""
+"Collapse problem details to the top row of information about a problem. Note"
+" that the details of a single problem can be collapsed by clicking on the up"
+" arrow to the right of the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1617
 msgid ""
 "Comma separated list of set names that are excluded from all achievements. "
 "No achievement points and badges can be earned for submitting problems in "
 "these sets. Note that underscores (_) must be used for spaces in set names."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:238
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:245
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:225
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:577
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2047
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:299
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:833
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:862
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:891
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:920
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:131
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:46
 msgid "Comment"
 msgstr "Commenter"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:200
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:25
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:181
 msgid "Comment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:638
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:86
 msgid "Comments"
 msgstr ""
 
-#. ($self->formatDateTime($set->answer_date)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2175
+#. ($c->formatDateTime($c->{set}->answer_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:379
 msgid "Completed results for this assignment are not available until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:382
 msgid "Completed results for this assignment are not available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:264
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:280
 msgid "Completed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:45
 msgid "Compose Email Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3185
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:47
+msgid ""
+"Configure ip ranges (locations) that can be used to restrict set access."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:45
+msgid "Configure which course links appear on the site landing page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:97
 msgid "Confirm"
 msgstr ""
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:107
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:164
+#. ($eUserName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:41
 msgid "Confirm %1's New Password"
 msgstr "Confirmer le nouveau mot de passe de %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:579
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:78
 msgid "Confirm Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_export_form.html.ep:1
 msgid "Confirm which sets to export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementEvaluator.pm:288
+#: /opt/webwork/webwork2/templates/AchievementEvaluator/cheevoMessage.html.ep:15
 msgid "Congratulations, you earned a new level!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2250
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:95
 msgid "Continue"
 msgstr "Continuer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:86
 msgid "Continue Open Test"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:59
+msgid "Controls if an achievement is evaluated or not."
+msgstr ""
+
 #. ($sourceDirectory, $outputDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1149
-msgid "Copied auxiliary files from %1 to new location at %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:671
+msgid "Copied auxiliary files from %1 to new location at %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:42
 msgid "Copy"
 msgstr "Copier"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
 msgid "Copy file as:"
 msgstr "Copier le fichier vers\t:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:528
-msgid "Copy simple configuration file to new course"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:627
-msgid "Copy templates from:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:112
+msgid "Copy from:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1335
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:82
 msgid "Copy this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:391
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:465
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:301
 msgid "Correct"
 msgstr "Correct"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:656
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:678
 msgid "Correct Adjusted Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:300
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:287
 msgid "Correct Answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1682
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:19
 msgid "Correct Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1506
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1317
 msgid "Correct Answers:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:693
 msgid "Correct Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:648
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:93
 msgid "Correct answers"
 msgstr "Bonnes réponses"
 
 #. ($total_correct, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1004
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:16
 msgid "Correct: %1/%2"
 msgstr ""
 
 #. ($newBlankProblems, $MAX_NEW_PROBLEMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1915
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1843
 msgid ""
 "Could not add %1 problems to this set.  The number must be between 1 and %2"
 msgstr ""
 
 #. ($e_user_name, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:83
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:94
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:74
 msgid "Couldn't change %1's password: %2"
 msgstr "Il n'a pas été possible de modifier le mot de passe : %2 de l'usager : %1"
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:111
 msgid "Couldn't change your email address: %1"
 msgstr "Il n'a pas été possible de modifier votre courriel : %1"
 
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4111
-msgid "Couldn't find OPL Branch %1 in remote %2"
-msgstr ""
-
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4076
-msgid "Couldn't find PG Branch %1 in remote %2"
-msgstr ""
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4014
-msgid "Couldn't find WeBWorK Branch %1 in remote %2"
-msgstr ""
-
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:132
 msgid "Couldn't save your display options: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1463
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:36
 msgid "Counter"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:424
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:833
-msgid "Counts for Parent"
-msgstr ""
-
-#. ($rename_oldCourseID)
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2186
-msgid "Course %1 database is in order"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:66
+msgid "Counter:"
 msgstr ""
 
-#. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1257
-msgid "Course %1 databases must be updated before renaming this course."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:503
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:35
+msgid "Counts for Parent"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:778
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:95
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:154
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:9
 msgid "Course Administration"
 msgstr "Administration du cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:424
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:17
+msgid "Course Administration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:369
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:80
 msgid "Course Configuration"
 msgstr "Configuration du cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:480
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:17
+msgid "Course Configuration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:17
+msgid "Course Home Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:21
 msgid "Course ID"
 msgstr ""
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2566
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:691
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:594
 msgid "Course ID cannot exceed %1 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1227
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:597
 msgid "Course ID may only contain letters, numbers, hyphens, and underscores."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:956
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:21
 msgid "Course ID:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:5
 msgid "Course Info"
 msgstr "Informations sur le cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1664
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1961
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3736
-msgid "Course Name:"
+#. ($c->stash('courseID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:325
+msgid "Course Information for course %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:491
-msgid "Course Title"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:30
+msgid "Course Listings"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:17
+msgid "Course Name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:204
-msgid "Course archived."
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:28
+msgid "Course Title"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:418
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:12
 msgid "Courses"
 msgstr "Cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1609
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1904
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3674
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:13
 msgid ""
 "Courses are listed either alphabetically or in order by the time of most "
 "recent login activity, oldest first. To change the listing order check the "
@@ -1869,393 +2506,536 @@ msgid ""
 "\"hidden\" or \"visible\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:7
+msgid ""
+"Courses are listed either alphabetically or in order by the time of most "
+"recent login activity, oldest first. To change the listing order check the "
+"mode you want and click \"Refresh Listing\". The listing format is: "
+"Course_Name (status :: date/time of most recent login) where status is "
+"\"hidden\" or \"visible\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:163
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:84
 msgid "Create"
 msgstr "Créer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:41
 msgid "Create CSV"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3054
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:31
 msgid "Create Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1071
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:39
+msgid ""
+"Create a .tar.gz archive which includes the course's database and all course"
+" files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:33
 msgid "Create a New Set in This Course:"
 msgstr "Créer un nouveau devoir dans ce cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:795
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:4
 msgid "Create a new achievement with ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:33
+msgid "Create a new course on this server."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:20
+msgid ""
+"Create a new course.  The \"Course ID\" is used as the course name and is "
+"used in course links.  Underscores appear as spaces when displaying the "
+"course name.  The \"Course Title\" is used as the title on the course home "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:86
+msgid ""
+"Create a new set with a given name. This can either create an empty set or a"
+" duplicate of an existing set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:12
 msgid "Create as what type of achievement?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:12
 msgid "Create as what type of set?"
 msgstr "Créer en tant que quel type de devoir?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1866
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:20
+msgid "Create backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:81
 msgid "Create unattached problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1849
-msgid ""
-"Creates a gzipped tar archive (.tar.gz) of a course in the WeBWorK courses "
-"directory. Before archiving, the course database is dumped into a "
-"subdirectory of the course's DATA directory. Currently the archive facility "
-"is only available for mysql databases. It depends on the mysqldump "
-"application."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:121
+msgid "Create/Delete achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:726
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:26
 msgid "Cupcake of Enlargement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:728
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:38
 msgid "Current"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3042
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:2
 msgid "Currently defined locations are listed below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4352
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2365
 msgid "Database tables are ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:54
 msgid "Database tables need updating."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2753
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:52
 msgid "Database tables ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2968
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1499
 msgid "Database:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:783
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:153
 msgid "Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:727
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:355
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:96
+msgid "Dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:40
+msgid ""
+"Dates for problem sets can be edited by clicking the pencil icon in the "
+"\"Edit Set Data\" column next to the set name. To change dates for several "
+"sets at once, click the check box in the \"Select\" column and choose \"Edit"
+" selected\" from the tasks above."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:426
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:37
 msgid "Default"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1675
+#: /opt/webwork/webwork2/conf/defaults.config:1577
 msgid ""
 "Default Amount of Time (in minutes) after Due Date that Answers are Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1665
+#: /opt/webwork/webwork2/conf/defaults.config:1567
 msgid ""
 "Default Amount of Time (in minutes) before Due Date that the Assignment is "
 "Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1785
+#: /opt/webwork/webwork2/conf/defaults.config:1687
 msgid "Default Length of Reduced Scoring Period in minutes"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1655
+#: /opt/webwork/webwork2/conf/defaults.config:1557
 msgid "Default Time that the Assignment is Due"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1808
+#: /opt/webwork/webwork2/conf/defaults.config:1710
 msgid ""
 "Default number of attempts before Show Me Another can be used (-1 => Never)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1755
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:162
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:91
+#: /opt/webwork/webwork2/conf/defaults.config:1994
+msgid ""
+"Default number of attempts before hints are shown in a problem (-1 => hide "
+"hints)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:89
 msgid "Delete"
 msgstr "Supprimer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1556
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1651
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1689
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1728
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:49
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:36
 msgid "Delete Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3480
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:17
+msgid "Delete Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:23
+msgid "Delete Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:37
+msgid "Delete a course and all associated data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:109
+msgid "Delete a student from a course"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:52
 msgid "Delete all existing addresses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1989
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:65
+msgid "Delete backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:64
+msgid "Delete backup from %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:54
 msgid "Delete course after archiving. Caution there is no undo!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:49
 msgid "Delete course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2348
 msgid "Delete field when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2809
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:588
 msgid "Delete it?"
 msgstr "Supprimer?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3055
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:78
 msgid "Delete location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:28
+msgid "Delete oldest backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2321
 msgid "Delete table when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:729
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:90
+msgid "Delete the sets checked below. Be careful, this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:6
 msgid "Delete which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1045
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:6
 msgid "Delete which sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1041
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:6
 msgid "Delete which users?"
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:394
 msgid "Deleted %1 users."
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:358
 msgid "Deleted %quant(%1,achievement)"
 msgstr ""
 
 #. (join(', ', @delLocations)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3359
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1810
 msgid "Deleted Location(s): %1"
 msgstr ""
 
 #. (join(', ', @toDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3597
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1966
 msgid "Deleted addresses %1 from location."
 msgstr ""
 
-#. ($self->shortPath($self->{tempFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1158
-msgid "Deleting temp file at %1"
+#. ($formatBackupTime)
+#. ($c->formatDateTime($delTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1243
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:569
+msgid "Deleted backup from %1."
+msgstr ""
+
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:679
+msgid "Deleted temp file at %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3152
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1219
+msgid "Deleted temporary file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:125
+msgid "Deleting Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:68
 msgid ""
 "Deletion deletes all location data and related addresses, and is not "
 "undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:723
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:3
 msgid "Deletion destroys all achievement-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:185
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
 msgid "Deny From"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1467
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:27
 msgid "Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:256
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:71
+msgid "Description:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:69
 msgid "Deselect All Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:229
 msgid "Deselect All Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:428
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:366
 msgid "Didn't recognize action"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:27
 msgid "Directory"
 msgstr ""
 
 #. ($file, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:793
-msgid "Directory '%1' not removed: %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:327
+msgid "Directory \"%1\" not removed: %2"
 msgstr ""
 
 #. ($file, $removed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:792
-msgid "Directory '%1' removed (items deleted: %2)"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:325
+msgid "Directory \"%1\" removed (items deleted: %2)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:412
-msgid "Directory permission errors "
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:33
+msgid "Directory permission errors"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2861
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2994
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1439
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1575
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:44
 msgid ""
 "Directory structure is missing directories or the webserver lacks sufficient"
 " privileges."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1267
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2210
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2857
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1434
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1570
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:41
 msgid "Directory structure is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2285
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:102
 msgid "Directory structure needs to be repaired manually before archiving."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1338
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:84
 msgid "Directory structure needs to be repaired manually before renaming."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2750
-msgid "Directory structure or permissions need to be repaired. "
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:48
+msgid "Directory structure or permissions need to be repaired."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2853
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1414
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1540
 msgid "Directory structure:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2536
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:365
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:92
+msgid "Display Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:90
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:104
 msgid "Display Mode:"
 msgstr "Mode d'affichage:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:463
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:37
 msgid "Display Past Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
-msgid "Display of scores for this set is not allowed."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:44
+msgid "Display mode for equations"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:311
+msgid "Display of scores for this test is not allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:589
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:12
 msgid "Display options: Show"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2017
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:48
+msgid ""
+"Display sets matching a selected criteria. Useful if there are many sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1918
 msgid "Display the evaluated student answer"
 msgstr "Afficher la réponse évalué de l'élève"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:176
+#. ('<code>COURSENAME_totals.csv</code>',
+#. '<code>COURSENAME_totals_bak1.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:74
+msgid ""
+"Do NOT use the file name %1, since you might accidentally overwrite that if "
+"you again export your WeBWorK homework scores. (Actually the earlier file is"
+" moved to %2 -- so you can recover using the File Manager.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:57
 msgid "Do not unassign students unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:233
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:67
 msgid "Do not uncheck a set unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:20
 msgid "Do not uncheck students, unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2450
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:656
 msgid "Do you want to grade this test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2272
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:93
+msgid "Documentation from source code for PG modules and macro files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:95
 msgid "Don't Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2607
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:13
 msgid "Don't Unarchive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2912
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:46
 msgid "Don't Upgrade"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1749
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:15
 msgid "Don't delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1120
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:24
 msgid "Don't make changes"
 msgstr ""
 
 #. ($saveMode)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:317
 msgid "Don't recognize saveMode: |%1|. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1307
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1321
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1335
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:87
 msgid "Don't rename"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:547
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:33
 msgid "Don't use in an achievement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:683
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1345
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2465
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1595
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:766
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:57
 msgid "Done"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:159
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:365
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:8
 msgid "Download"
 msgstr "Télécharger"
 
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($set->set_id)
 #. ($ver->{id} =~ s/_/ /gr)
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($set->set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:731
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:732
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:413
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:204
 msgid "Download %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:23
 msgid "Download Hardcopy"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:865
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:56
 msgid "Download PDF or TeX Hardcopy for Current Set"
 msgstr "Télécharger une copie PDF ou TeX pour le devoir en cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:764
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:233
 msgid "Download PDF or TeX Hardcopy for Selected Tests"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($selected_set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:595
+#. (tag('span', dir => 'ltr', format_set_name_display($selected_set_id =~
+#. s/,v(\d+)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:58
 msgid "Download hardcopy of set %1 for %2?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:369
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:63
+msgid "Download/upload archived courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:46
 msgid "Download:"
 msgstr ""
 
@@ -2263,139 +3043,181 @@ msgstr ""
 msgid "Drop"
 msgstr ""
 
-#. ($self->formatDateTime($set->reduced_scoring_date, undef,
-#. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:107
-msgid "Due %1, after which reduced scoring is available until %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:100
+msgid "Drop student from the course"
 msgstr ""
 
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:310
 msgid "Due date %1 has passed."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2093
+#: /opt/webwork/webwork2/conf/defaults.config:2014
 msgid "E-Mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:315
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:261
 msgid "E-mail Instructor"
 msgstr "Envoyer un courriel à l'enseignant"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2128
-msgid "E-mail addresses which can receive e-mail from a pg problem"
-msgstr "Adresses e-mail qui peuvent recevoir des e-mail à partir d'un problème pg"
-
-#: /opt/webwork/webwork2/conf/defaults.config:2138
+#: /opt/webwork/webwork2/conf/defaults.config:2049
 msgid ""
 "E-mail feedback from students automatically sent to this permission level "
 "and higher"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2109
+#: /opt/webwork/webwork2/conf/defaults.config:2030
 msgid "E-mail verbosity level"
 msgstr "Niveau de verbose pour les emails"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:357
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:43
 msgid "E-mail:"
 msgstr "Corps du message :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:35
 msgid "Earned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:71
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:158
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:334
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:417
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:547
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2743
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1628
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1186
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1203
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:257
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:479
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:6
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:53
 msgid "Edit"
 msgstr "Editer"
 
-#. (CGI::a({ href => $basicInfoUrl }, $r->maketext('class list data')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:199
-msgid "Edit %1 for  %2 (%3) who has been assigned %4 sets."
+#. (link_to(maketext('class list data')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:47
+msgid "Edit %1 for %2 (%3) who has been assigned %4 sets."
 msgstr ""
 
-#. (CGI::a({ href => $editUsersAssignedToSetURL }, $r->maketext('individual
-#. versions')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2223
-msgid "Edit %1 of set %2."
+#. (link_to(maketext('individual user settings')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:162
+msgid "Edit %1 for set %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:6
 msgid "Edit Assigned Users"
 msgstr "Éditer les usagers assignés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:40
 msgid "Edit Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1488
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:58
 msgid "Edit Evaluator"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:253
 msgid "Edit Header"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3053
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:18
 msgid "Edit Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2741
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:111
 msgid "Edit Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:5
 msgid "Edit Problems"
 msgstr "Éditer les problèmes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:583
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:3
 msgid "Edit Set"
 msgstr "Modifier le devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:421
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:4
 msgid "Edit Set Data"
 msgstr "Éditer les données des devoirs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:171
+msgid "Edit Tags"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:30
 msgid "Edit Target Set"
 msgstr "Modifier ce devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1487
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:18
 msgid "Edit Users"
 msgstr ""
 
-#. ($user)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:207
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:127
+msgid "Edit achievement evaluator"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:90
+msgid "Edit achievement information"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:65
+msgid ""
+"Edit achivements for the course. This link is only present if achievements "
+"are enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:42
+msgid "Edit class list data"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:39
+msgid ""
+"Edit class roster data. Add students, edit student data, drop students from "
+"class, import students from a classlist, and give user professor privileges."
+" Access to individual homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:70
 msgid "Edit data for %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1248
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:46
+msgid ""
+"Edit homework sets for entire class. Change homework set due dates, create "
+"new sets from a set definition file, create new homework sets, make sets "
+"visible/invisible, score homework sets. Assign homework sets to the class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:219
 msgid "Edit it"
 msgstr "Modifier"
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2192
-msgid "Edit set %1 data for ALL students assigned to this set."
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:135
+msgid "Edit set %1 for ALL students assigned to this set."
 msgstr ""
 
-#. (CGI::a({href=>$editSetLink},$setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2166
+#. (link_to(                                               $setID =>
+#. $c->systemLink(
+#. $setDetailPage, params => { effectiveUser => $user->user_id, editForUser =>
+#. $user->user_id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:106
 msgid "Edit set %1 for this user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3393
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:95
+msgid "Edit set for %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:4
 msgid ""
 "Edit the current value of the location description, if desired, then add and"
 " select addresses to delete, and then click the \"Take Action\" button to "
@@ -2403,174 +3225,219 @@ msgid ""
 "changes and return to the Manage Locations page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:429
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:2
 msgid "Edit which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:829
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:2
 msgid "Edit which sets?"
 msgstr "Éditer quels devoirs?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:935
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:2
 msgid "Edit which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:592
-msgid "Editing <strong>blank problem</strong> in file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:31
+msgid "Editing <strong>course information</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:595
-msgid "Editing <strong>course information</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:30
+msgid "Editing <strong>hardcopy header</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
-msgid "Editing <strong>hardcopy header</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:28
+msgid "Editing <strong>new problem</strong> template."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:596
-msgid "Editing <strong>options information</strong> file \"%1\""
+#. ($c->{prettyProblemNumber},                             tag('span', dir =>
+#. 'ltr', format_set_name_display($fullSetName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:45
+msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\"."
 msgstr ""
 
-#. ($prettyProblemNumber,                  CGI::span({ dir => 'ltr' },
-#. format_set_name_display($fullSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:605
-msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:29
+msgid "Editing <strong>set header</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:593
-msgid "Editing <strong>set header</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:33
+msgid "Editing <strong>unassigned problem</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:598
-msgid "Editing <strong>unassigned problem</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:32
+msgid "Editing <strong>unknown file type</strong> in file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:597
-msgid "Editing <strong>unknown file type</strong> in file \"%1\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:19
+msgid "Editing Modes"
 msgstr ""
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:209
-msgid "Editing achievement in file '%1'"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:140
+msgid "Editing Problems"
 msgstr ""
 
-#. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3390
-msgid "Editing location %1"
+#. ($c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:16
+msgid "Editing achievement in file \"%1\""
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display("$setID$vermsg")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2182
-msgid "Editing problem set %1 data for these individual students: %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:22
+msgid "Editing for all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:410
-msgid "Editor"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:23
+msgid "Editing for one student or a proper subset of all students"
+msgstr ""
+
+#. ($locationID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:1
+msgid "Editing location %1"
+msgstr ""
+
+#. (tag(                                           'strong',
+#. dir => 'ltr',
+#. format_set_name_display($setID . ($editingSetVersion ?
+#. ",v$editingSetVersion" : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:123
+msgid "Editing problem set %1 for these students: %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:669
-msgid "Editor rows:"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:315
+msgid "Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1668
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:229
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:53
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:68
 msgid "Email"
 msgstr "Courriel"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:32
 msgid "Email Address"
 msgstr "Adresse courriel"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:817
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:170
 msgid "Email Body:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:17
+msgid "Email Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:339
 msgid "Email Instructor On Failed Attempt"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2003
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:28
 msgid "Email Link"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:789
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:112
 msgid "Email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1807
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1832
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:311
+msgid "Email body is empty. No message sent. "
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:994
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_email.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_form.html.ep:24
 msgid "Email instructor"
 msgstr "Envoyer un courriel à l'enseignant"
 
-#. (scalar(@{ $self->{ra_send_to} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:454
+#. (scalar(@{ $c->{ra_send_to} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:27
+msgid ""
+"Email is being sent to %quant(%1,recipient). You will be notified by email "
+"when the task is completed.  This may take several minutes if the class is "
+"large."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:13
+msgid "Email:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:26
 msgid ""
-"Email is being sent to %quant(%1,recipient). You will be notified by email\n"
-"\t\t\t\twhen the task is completed.  This may take several minutes if the class is\n"
-"\t\t\t\tlarge."
+"Emails can contain personalized data, such as name, section, or status.  "
+"Click \"List of insertable macros\" for a full list available variables.  "
+"Additional personal data can be included by using a merge file.  A merge "
+"file is a CSV file located in the [Scoring] directory in which the first "
+"column is the student id, followed by additional data (such as student "
+"grades).  This data is identified by which column it is in, for instance if "
+"the scores where in the 4th column of the merge file, insert them into an "
+"email using the variable $COL[4].  The \"Scoring Tools\" page can export "
+"grades into a CSV that can be used as a merge file.  Upload customized merge"
+" files with the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:11
 msgid "Emails to be sent to the following:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1704
+#: /opt/webwork/webwork2/conf/defaults.config:1606
 msgid "Enable Achievement Rewards"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1723
+#: /opt/webwork/webwork2/conf/defaults.config:1625
 msgid "Enable Conditional Release"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1689
+#: /opt/webwork/webwork2/conf/defaults.config:1591
 msgid "Enable Course Achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1645
+#: /opt/webwork/webwork2/conf/defaults.config:1547
 msgid "Enable Progress Bar and current problem highlighting"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1734
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:585
+#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Enable Reduced Scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1799
+#: /opt/webwork/webwork2/conf/defaults.config:1701
 msgid "Enable Show Me Another button"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:156
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:24
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:92
 msgid "Enable Spell Checking"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1844
+#: /opt/webwork/webwork2/conf/defaults.config:1746
 msgid "Enable periodic re-randomization of problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:416
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:29
 msgid ""
 "Enable reduced scoring for a homework set.  This will allow you to submit "
 "answers for partial credit for 24 hours after the close date."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1461
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1483
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:20
 msgid "Enabled"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1846
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:58
+msgid "Enabled:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1748
 msgid ""
 "Enables periodic re-randomization of problems after a given number of "
 "attempts. Student would have to click Request New Version to obtain new "
 "version of the problem and to continue working on the problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1725
+#: /opt/webwork/webwork2/conf/defaults.config:1627
 msgid ""
 "Enables the use of the conditional release system.  To use conditional "
 "release you need to specify a list of set names on the Problem Set Detail "
@@ -2579,14 +3446,14 @@ msgid ""
 " sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1801
+#: /opt/webwork/webwork2/conf/defaults.config:1703
 msgid ""
 "Enables use of the Show Me Another button, which offers the student a newly-"
 "seeded version of the current problem, complete with solution (if it exists "
 "for that problem)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:662
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:163
 msgid "End"
 msgstr ""
 
@@ -2594,538 +3461,662 @@ msgstr ""
 msgid "Enrolled"
 msgstr "Inscrit"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:788
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:111
 msgid "Enrolled, Drop, etc."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:830
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:859
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:888
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:917
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:128
 msgid "Enrollment Status"
 msgstr "Statut d'inscription"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:21
 msgid "Enter filename below"
 msgstr "Entrer le nom du fichier ci-bas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:20
 msgid "Enter filenames below"
 msgstr "Entrer les noms de fichiers ci-bas"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:19
 msgid ""
 "Enter information below for students you wish to add. Each student's "
 "password will initially be set to their student ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1997
+#: /opt/webwork/webwork2/conf/defaults.config:1899
 msgid ""
 "Enter one of the allowed display mode types above.  See 'display modes "
 "entry' for descriptions."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:297
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:34
+msgid ""
+"Enter the details of the course instructor to be added when the course is "
+"created.  This user will also be added to the admin course with the username"
+" \"userID_courseID\" so you can manage and email the instructors of the "
+"courses on the server."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:284
 msgid "Entered"
 msgstr "Saisi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:85
-msgid "Entered student:"
-msgstr ""
-
-#. ($display_sort_method_name{$primary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:698
+#. ($display_sort_method_name{$primary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:98
 msgid "Entries are sorted by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:247
 msgid "Equation Display"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:61
+msgid "Equation Editor"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1516
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1460
 msgid "Error adding set-level proctor: %1"
 msgstr ""
 
+#. ($fromPath, $toPath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:664
+msgid "Error copying %1 to %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:14
+msgid "Error details"
+msgstr ""
+
+#. ($filePath, stash('podError')
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:27
+msgid "Error generating POD for file %1: %2"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1492
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1437
 msgid ""
 "Error getting old set-proctor password from the database: %1.  No update to "
 "the password was done."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:31
 msgid "Error message:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2235
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:12
 msgid "Error messages"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1616
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:754
 msgid "Error: Answer date must come after close date in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:747
 msgid "Error: Close date must come after open date in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1634
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:778
 msgid ""
 "Error: Reduced scoring date must come between the open date and close date "
 "in set %1"
 msgstr ""
 
-#. ($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2067
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:7
 msgid "Error: The original file %1 cannot be read."
 msgstr ""
 
 #. ($setID)
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1240
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:738
 msgid "Error: answer date cannot be more than 10 years from now in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1235
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:733
 msgid "Error: close date cannot be more than 10 years from now in set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:630
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:234
 msgid "Error: no file data was submitted!"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1599
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:728
 msgid "Error: open date cannot be more than 10 years from now in set %1"
 msgstr ""
 
-#. ($problem_desc, $problem_name, CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1404
+#. ($problem_desc, $problem_name, $c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1210
 msgid ""
 "Errors encountered while processing %1. This %2 has been omitted from the "
 "hardcopy. Error text: %3"
 msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3832
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:8
+msgid "Errors occured while generating hardcopy:"
+msgstr ""
+
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2128
 msgid ""
 "Errors occured while hiding the courses listed below when attempting to "
 "create the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3920
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2197
 msgid ""
 "Errors occured while unhiding the courses listed below when attempting "
 "delete the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1468
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:28
 msgid "Evaluator File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3839
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:76
+msgid "Evaluator File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:28
+msgid "Evaluator Variables"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2143
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
-"hidden."
+"Except for the errors listed above, all selected courses are already hidden."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3904
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2212
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
+"Except for the errors listed above, all selected courses are already "
 "unhidden."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3456
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:39
 msgid ""
 "Existing addresses for the location are given in the scrolling list below.  "
 "Select addresses from the list to delete them:"
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2281
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1460
 msgid "Existing file %1 could not be backed up and was lost."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2514
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:354
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:65
 msgid "Expand All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:364
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:78
 msgid "Expand All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2667
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:418
 msgid "Expand Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2792
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:574
 msgid "Expand Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:74
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:89
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:67
+msgid ""
+"Expand problem details that have been collapsed. Note that the details of a "
+"single problem can be expanded by clicking on the down arrow to the right of"
+" the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:71
 msgid "Export"
 msgstr "Exporter"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1098
-msgid "Export selected achievements."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:113
+msgid "Export achievement data"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_export_form.html.ep:1
+msgid "Export selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1267
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:17
 msgid "Export to what kind of file?"
 msgstr "Exporter sous quel type de fichier?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:2
 msgid "Export which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1245
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:5
 msgid "Export which users?"
 msgstr "Exporter quels usagers?"
 
 #. ($FileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1151
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:591
 msgid "Exported achievements to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1616
-msgid "Extend the close date for which Gateway?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:48
+msgid "Extend the close date for which test?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:148
+msgid "Extend the number of attempts allowed a student on a given problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1573
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:28
 msgid ""
-"Extends the close date of a gateway test by 24 hours. Note: The test must "
-"still be open for this to work."
+"Extends the close date of a test by 24 hours. Note: The test must still be "
+"open for this to work."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "FIRST NAME"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Failed to add user:"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:416
 msgid "Failed to create new achievement: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:373
 msgid "Failed to create new achievement: no achievement ID specified!"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:573
 msgid "Failed to create new set: %1"
 msgstr "Impossible de créer le nouveau devoir : %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1158
-msgid "Failed to create new set: no set name specified!"
-msgstr "Impossible de créer le nouveau devoir : aucun nom n'a été spécifié!"
+#. ($newSetID =~ s/_/ /gr)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:482
+msgid ""
+"Failed to create new set: Invalid characters in set name \"%1\". A set name "
+"may only contain letters, numbers, hyphens, periods, and spaces."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:474
+msgid "Failed to create new set: No set name specified."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1155
-msgid "Failed to create new set: set name cannot exceed 100 characters."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:469
+msgid "Failed to create new set: Set name cannot exceed 100 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:396
 msgid ""
 "Failed to duplicate achievement: no achievement selected for duplication!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:530
 msgid "Failed to duplicate set: no set selected for duplication!"
 msgstr "Impossible de dupliquer le devoir : aucun devoir n'a été sélectionné pour la duplication!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:74
-msgid "Failed to enter student:"
+#. ($@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:67
+msgid "Failed to generate course archive: %1"
 msgstr ""
 
 #. ($scoreFilePath)
 #. ($filePath)
 #. ($FilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1125
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:649
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:955
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2402
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1584
 msgid "Failed to open %1"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:227
 msgid "Failed to save: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#. ($_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:253
+msgid "Failed to send message: %1"
+msgstr ""
+
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:23
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:36
 msgid "False"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1919
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:63
 msgid "Feature exhausted for this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:200
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:23
+msgid "Features:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:252
 msgid "Feedback"
 msgstr "Commentaires"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2159
+#: /opt/webwork/webwork2/conf/defaults.config:2070
 msgid "Feedback by Section."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:234
 msgid "FeedbackMessage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1177
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2113
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2284
 msgid "Field is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2109
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2286
 msgid "Field missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1175
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2111
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4290
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
 msgid "Field missing in schema"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:599
-msgid "File '%1' exists.  File not saved.  No changes have been made."
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:266
+msgid "File \"%1\" exists.  File not saved.  No changes have been made."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1926
-msgid ""
-"File '%1' exists. File not saved. No changes have been made.  You can change"
-" the file path for this problem manually from the 'Hmwk Sets Editor' page"
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1036
+msgid "File \"%1\" exists. File not saved. No changes have been made."
 msgstr ""
 
-#. ($file,$!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:796
-msgid "File '%1' not removed: %2"
+#. ($file, $!)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:333
+msgid "File \"%1\" not removed: %2"
 msgstr ""
 
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:795
-msgid "File '%1' successfully removed"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+msgid "File \"%1\" successfully removed"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1066
-msgid "File '%1' uploaded successfully"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:522
+msgid "File \"%1\" uploaded successfully"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:476
 msgid "File <b>%1</b> already exists. Overwrite it, or rename it as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:364
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:55
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:70
 msgid "File Manager"
 msgstr "Gestionnaire de fichiers"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:628
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:17
+msgid "File Manager Help"
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:541
+msgid "File not saved. Failed to open \"%1\" for writing."
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:528
+msgid ""
+"File not saved. The file \"%1\" is not contained in the templates directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:921
+msgid ""
+"File not saved. The file name for this problem does not match the file name "
+"the editor was opened with. The problem set may have changed. Please reopen "
+"this file from the homework sets editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:228
 msgid "File saved"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:733
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:272
 msgid "File successfully copied"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:758
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:295
 msgid "File successfully renamed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:29
 msgid "Filename"
 msgstr "Nom de fichier"
 
-#. ($extension,$location)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1296
-msgid "Files with extension '.%1' usually belong in '%2'"
+#. ($extension, $location)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:699
+msgid "Files with extension \".%1\" usually belong in \"%2\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:20
+msgid ""
+"Fill out the form below to add, edit, or delete locations.  Locations are "
+"used to restrict access to sets based on ip address.  Locations are "
+"configured here in the administration course, then used in a normal course."
+"  When configuring a set to use a restricted ip address, the instructor can "
+"choose to either restrict access to the location or deny access from a "
+"location, which are identified by their name.  Instructors can select "
+"multiple locations to restrict access to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:78
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:47
 msgid "Filter"
 msgstr ""
 
 #. ($recitation)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1184
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1112
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1420
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:913
 msgid "Filter by recitation %1"
 msgstr ""
 
 #. ($section)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1180
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1416
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:910
 msgid "Filter by section %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:733
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:31
 msgid "Filter by what text?"
 msgstr "Filtrer avec quelle chaîne de caractères?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:151
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:17
 msgid "Filter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:749
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:137
 msgid "First"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:593
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1992
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:827
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:856
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:885
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:914
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:87
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:21
 msgid "First Name"
 msgstr "Prénom"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:107
 msgid "First name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:178
 msgid ""
 "For security reasons, you cannot specify a message file from a directory "
 "higher than the email directory (you can't use ../blah/blah for example). "
 "Please specify a different file or move the needed file to the email "
-"directory"
+"directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:30
+msgid "Force editor to RTL"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2928
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:674
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:101
 msgid "Force problems to be numbered consecutively from one"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:409
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:35
+msgid "Form Elements Present on the Page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:75
 msgid "Format"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2096
+#: /opt/webwork/webwork2/conf/defaults.config:2017
 msgid "Format for the subject line in feedback e-mails"
 msgstr "Format pour la ligne sujet dans les e-mails de feedback"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:172
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:133
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:10
 msgid "Format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:12
 msgid "Found no directories containing problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1112
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:43
 msgid "From This Course"
 msgstr "De ce cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:318
 msgid "From field must contain one valid email address."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:340
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:621
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:20
+msgid ""
+"From this page you can <strong>add new students</strong>, "
+"<strong>edit</strong> class list data (name, email address, recitation, "
+"section, permission level, and enrollment status), <strong>change "
+"passwords</strong>, and <strong>export</strong> (save) class lists for back-"
+"up or use in another course. You can also delete students from the class "
+"roster, but this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:34
 msgid "From:"
 msgstr "De :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:59
 msgid "GLOBAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1512
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1619
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1728
-msgid "Gateway Name"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:210
-msgid "Gateway Quiz %2"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:853
-msgid "Gateway parameters"
-msgstr "Paramètres passerelle"
-
-#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/conf/defaults.config:1427
 msgid "General"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2305
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:201
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:30
 msgid "General Information"
 msgstr "Information Générale"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:745
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:669
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:670
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:222
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:116
+msgid "General Page Information"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:121
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:166
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:167
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:113
 msgid "Generate Hardcopy"
 msgstr "Générer le fichier"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:262
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:73
 msgid "Generate Hardcopy for Selected Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:744
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:115
+msgid ""
+"Generate a hardcopy of the problem being edited. This does not change the "
+"permanent file on the disk. You can generate a hardcopy for different "
+"versions of the same problem by changing the seed. You can also change the "
+"format to \"PDF\" or \"TeX Source\". If \"PDF\" is selected, then a PDF file"
+" will be generated for download, unless there are errors. If errors occur or"
+" \"TeX Source\" is selected, then a zip file will be generated for download "
+"that contains the TeX source file and resources needed for generating the "
+"PDF file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:20
+msgid ""
+"Generate hardcopies of assignments in PDF or latex format. To produce a "
+"hardcopy, one selects the users on the left and the sets on the right. All "
+"users and sets are listed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:170
 msgid "Generate hardcopy for selected sets and selected users"
 msgstr "Générer une copie papier pour les devoirs sélectionnés et les utilisateurs sélectionnés"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:184
-#: /opt/webwork/pg/macros/problemRandomize.pl:185
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:186
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:187
 msgid "Get a new version of this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:986
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:2
 msgid "Give new password to which users?"
 msgstr "Donner un nouveau mot de passe à quels usagers?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1063
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:27
 msgid "Gives full credit on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1180
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:27
 msgid "Gives full credit on every problem in a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:846
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:27
 msgid "Gives half credit on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:27
 msgid "Gives half credit on every problem in a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:62
 msgid "Global Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1422
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:76
 msgid "Global Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:49
 msgid "Global Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:51
 msgid ""
 "Global data on problem usage is contributed by many institutions using "
 "WeBWorK all over the world. The Usage figure is the total number of  "
@@ -3135,198 +4126,324 @@ msgid ""
 msgstr ""
 
 #. ($problemID, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1549
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1489
 msgid "Global problem %1 for set %2 not found."
 msgstr ""
 
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:334
+#. ($c->{prettyID}, $c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:378
+msgid "Global problem %1 not found for set %2."
+msgstr ""
+
+#. ($c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:142
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:372
 msgid "Global set %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2093
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:77
 msgid "Global set data will be shown instead of user specific data"
 msgstr "Les données globals vont être affichés au lieu de ceux spécifique à l'utilisateur."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:28
 msgid "Go"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:483
 msgid "Go back to Part 1"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:291
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
-#: /opt/webwork/pg/macros/compoundProblem.pl:491
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:293
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:498
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:512
 msgid "Go on to next part"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2651
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:544
 msgid "Grade"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2649
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:383
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:970
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:541
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:75
 msgid "Grade Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2446
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:651
 msgid "Grade Test"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:148
+msgid "Grade of Active Students"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:55
 msgid "Grade passback mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:837
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:38
 msgid "Grader"
 msgstr "Étudiant"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:236
 msgid "Grades"
 msgstr "Résultats"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:110
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:17
+msgid "Grades Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:115
 msgid "Grades have been saved for all current users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:221
-msgid "Grading assignment:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:28
+msgid "Grading Assignment"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:152
+msgid "Grading Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1062
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:26
 msgid "Greater Rod of Revelation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1179
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:26
 msgid "Greater Tome of Enlightenment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:285
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:50
+msgid ""
+"Groups types of achievements. The \"level\" and \"secret\" categories are "
+"special (described above), and categories can be used to create achievement "
+"chains."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:74
 msgid "Guest Login"
 msgstr "Invité"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2251
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:86
+msgid "Guest:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:33
 msgid "HTTP Headers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:682
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:35
+msgid "Hardcopy Format"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:115
 msgid "Hardcopy Format:"
 msgstr "Format :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:270
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:285
 msgid "Hardcopy Generator"
 msgstr "Imprimer dans un fichier"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:101
 msgid "Hardcopy Header"
 msgstr "Entête d'impression"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1623
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:724
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:324
+msgid "Hardcopy Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:17
+msgid "Hardcopy Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:153
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:44
 msgid "Hardcopy Theme"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:408
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:427
 msgid "Hardcopy will always print the original version of the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:31
 msgid "Headers"
 msgstr "Entêtes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1048
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:296
 msgid "Help"
 msgstr "Aide"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:797
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:170
 msgid "Help Icon"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:542
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:30
+msgid ""
+"Here is a list of the variables the evaluator has access to. Unless "
+"indicated, changes to the variables will not be saved.  Evaluators are run "
+"in the same order they are listed on the achievement editor page and are "
+"only run if the achievement has not been earned. Keep this in mind when "
+"using persistent global data."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:507
 msgid "Here is a new version of your problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:914
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:42
 msgid "Hidden"
 msgstr "Caché"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:347
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:62
 msgid "Hide All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3663
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3718
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3760
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:384
-msgid "Hide Courses"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:17
+msgid "Hide Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:428
-msgid "Hide Hints"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:57
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:44
+msgid "Hide Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:477
 msgid "Hide Hints from Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1566
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:63
+msgid "Hide all rendered problems on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:252
 msgid "Hide this problem"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1523
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1524
 msgid "Hint:"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1522
 msgid "Hint: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:658
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1771
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:99
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:51
 msgid "Hints"
 msgstr "Indices"
 
 # Hmwk is short for Homework
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:364
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:327
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:44
 msgid "Hmwk Sets Editor"
 msgstr "Éditeur de devoirs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:779
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:80
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:108
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:19
 msgid "Homework Sets"
 msgstr "Devoirs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:38
 msgid "Homework Totals"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1432
-msgid "I couldn't find the file [ACHEVDIR]/surprise_message.txt!"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:17
+msgid "Homwork Sets Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:88
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:31
+msgid "How to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1451
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:36
+msgid "I couldn't find the file [ACHIEVEMENT_DIR]/surprise_message.txt!"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:9
 msgid "Icon"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:29
 msgid "Icon File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:612
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:80
+msgid "Icon File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:24
+msgid ""
+"If \"PDF\" is selected, then a PDF file will be generated for download, "
+"unless there are errors.  If errors occur generating a PDF file or \"TeX "
+"Source\" is selected then a zip file will be generated for download that "
+"contains the TeX source file and resources needed for generating the PDF "
+"file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:37
+msgid ""
+"If \"TeX Source\" is selected, a zip file containing a TeX file and other "
+"files needed to generate a PDF hardcopy will be produced. If \"Adobe PDF\" "
+"is selected then only a PDF file will be produced."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:84
 msgid ""
 "If a password field is left blank, the student's current password will be "
 "maintained."
 msgstr "Si le champ d'un mot de passe est vide, le mot de passe actuel sera conservé."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:42
+msgid ""
+"If selected, the file path of the problem source will be printed in the "
+"output."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:38
+msgid ""
+"If selected, this adds spaces between the fields to align the commas, which "
+"makes the columns easy to read when in text form but it can confuse some "
+"spreadsheet applications since the extra spaces violate the csv standard "
+"(although Excel handles them with no problem). This will give a visual form "
+"of the CSV file that is easy to read on the page. If you want a reliable "
+".csv file for use in any spreadsheet application unclick the \"Pad Fields\" "
+"option. You can download the .csv file immediately by clicking on the link "
+"with the filename chosen above, or you can download it using the \"File "
+"Manager\" from the scoring directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:148
+msgid ""
+"If the original problem can not be edited than the path name must be changed"
+" in order to be allowed to save the problem. Adding \"local/\" to the "
+"beginning of the original path is the default solution. All locally created "
+"and edited files will then appear in a subdirectory named \"local\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:513
 msgid ""
 "If this flag is set then this problem will count towards the grade of its "
 "parent problem.  In general the adjusted status on a problem is the larger "
@@ -3334,20 +4451,28 @@ msgid ""
 "problems which have this flag enabled."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
 msgid ""
 "If this is enabled then instructors with the ability to receive feedback "
 "emails will be notified whenever a student runs out of attempts on a problem"
-" and its children without receiving an adjusted status of 100%."
+" and its children  without receiving an adjusted status of 100%."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:334
 msgid ""
 "If this is enabled then students will be unable to attempt a problem until "
 "they have completed all of the previous problems, and their child problems "
 "if necessary."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:57
+msgid ""
+"If this is selected, a success index is listed in each csv file. The success"
+" index is a number assigned on the basis of the number of incorrect attempts"
+" (roughly equivalent to 1/the number of attempts) which seems to correlate "
+"with the relative difficulty the student had with the problem."
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:47
 msgid ""
 "If this is set, all users (including the instructor) must enter the WeBWorK "
@@ -3355,8 +4480,8 @@ msgid ""
 "they receive a message directing them back to the LMS."
 msgstr ""
 
-#. (CGI::b($r->maketext("Remember Me")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:201
+#. (tag('strong', maketext('Remember Me')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:33
 msgid ""
 "If you check %1 your login information will be remembered by the browser you"
 " are using, allowing you to visit WeBWorK pages without typing your user "
@@ -3365,273 +4490,419 @@ msgid ""
 " have direct control."
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:407
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:154
+msgid ""
+"If you click on the \"Grade Problem\" icon to the right of the problem "
+"number, then the problem will open in the manual problem grader. This page "
+"shows the rendered problem and lists all students assigned to the set and "
+"the last answer the students entered for the problem. You can then change "
+"the recorded scores for students on this problem and provide instructor "
+"feedback comments."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:148
+msgid ""
+"If you click on the \"Open in New Window\" icon to the right of the problem "
+"number, then the problem will open in the actual homework set in a new tab "
+"or window."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:425
 msgid "If you come back to it later, it may revert to its original version."
 msgstr ""
 
+#. ('<code>report_grades_data.csv</code>', '<code>report_grade.msg</code>',
+#. '<code>$COL</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:80
+msgid ""
+"If you upload your file on the web with the name: %1 and also create an "
+"email message with the name %2 with the approriate %3 variables then not "
+"only can you email the message with the embedded grades to the students, but"
+" files with those exact names are automatically appended to the \"Grades\" "
+"page seen by the students."
+msgstr ""
+
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:798
-msgid "Illegal file '%1' specified"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:337
+msgid "Illegal file \"%1\" specified"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1445
 msgid "Illegal filename contains '..'"
 msgstr "Fichier illégal contient '..'"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:73
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:63
 msgid "Import"
 msgstr "Importer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1291
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:65
+msgid ""
+"Import a single set or multiple sets from a set definition file. (Use the "
+"\"File Manager\" to upload/download set definition files.) The \"Shift "
+"Dates...\" option is useful for problem sets that were used from other "
+"courses and will shift all of the dates."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:16
 msgid "Import from where?"
 msgstr "Importer d'où?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1270
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:5
 msgid "Import how many sets?"
 msgstr "Importer combien de devoirs?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:31
 msgid "Import sets with names"
 msgstr "Importer les devoirs avec le nom"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:5
 msgid "Import users from what file?"
 msgstr "Importer les usagers à partir de quel fichier?"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:99
+msgid "Import/export achievements"
+msgstr ""
+
 #. ($count)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:516
 msgid "Imported %quant(%1,achievement)"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:25
+msgid ""
+"In both cases, one can select the sort field, the format of the display "
+"list, and the filter. \"Change Display Settings\" must be clicked to update "
+"the list."
+msgstr ""
+
 #. ($total_inprogress, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1019
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:28
 msgid "In progress: %1/%2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:47
 msgid "Inactive"
 msgstr "Inactif"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1601
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:51
+msgid "Inactive Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1503
 msgid "Inactivity time before a user is required to login again"
 msgstr "Temps d'inactivité avant que l'utilisateur doit se connecter à nouveau"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:42
 msgid "Include Contrib"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:35
 msgid "Include OPL"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:32
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:55
 msgid "Include Success Index"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:62
 msgid "Include percentage grades columns for all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:471
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:302
 msgid "Incorrect"
 msgstr ""
 
 #. ($total_incorrect, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1033
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:36
 msgid "Incorrect: %1/%2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:26
+msgid ""
+"Indicates the number of problems in the set. Clicking on the link opens the "
+"set detail page which allows you to modify set parameters, edit set headers,"
+" and change parameters of problems in the set such as the number of allowed "
+"attempts or the weight (credit value). You can also add, remove, view, edit,"
+" and reorder the problems in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:141
+msgid "Individual Problem Results"
+msgstr ""
+
 # Short for Initial
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:41
 msgid "Init"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:502
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:35
 msgid "Institution"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2344
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:560
 msgid "Instructor Comment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1494
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1306
 msgid "Instructor Feedback:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:311
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:17
+msgid "Instructor Links Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:29
 msgid "Instructor Tools"
 msgstr "Outils pour l'enseignant"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1228
-msgid "Instructor solution preview: show the student solution after due date."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:17
+msgid "Instructor Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:90
+msgid "Instructor:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:377
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:326
 msgid "Invalid Reply-to address."
 msgstr ""
 
 #. ($output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:187
 msgid ""
-"Invalid file name. The file name \"%1\" does not have a \".msg\" extension "
-"All email file names must end in the extension \".msg\" choose a file name "
-"with a \".msg\" extension. The message was not saved."
+"Invalid file name \"%1\". All email file names must end with the \".msg\" "
+"extension.  Choose a file name with the \".msg\" extension. The message was "
+"not saved."
 msgstr ""
 
 #. ($headerType)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1951
 msgid "Invalid headerType %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:177
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/XMLRPC.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:173
 msgid "Invalid user ID or password."
 msgstr "Numéro d'usager ou mot de passe invalide."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2244
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:34
+msgid ""
+"It is important that students enter an email address or they will not "
+"recieve any of the important emails sent by the instructor. The email "
+"address will only be present on the page if the user has permission to "
+"change the email address."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:20
+msgid "It lists the homework problem sets available for the students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:472
 msgid "Jump to Problem:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:867
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:939
 msgid "Just-In-Time parameters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:130
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:85
+msgid "Key Map"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:14
 msgid "Key Map:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:93
 msgid "Keywords:"
 msgstr "Mots clés:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "LAST NAME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1477
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:119
 msgid "LOCAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:100
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:103
 msgid "LTI"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1548
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:25
+msgid "LTI Grade Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:460
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:75
+msgid "LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:17
+msgid "LTI Grade Update Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:16
+msgid "LTI grade passback is not enabled for this course"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:63
+msgid "LTI update of all users and sets queued."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:64
+msgid "LTI update of all users queued."
+msgstr ""
+
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:58
+msgid "LTI update of set %1 queued."
+msgstr ""
+
+#. ($userID, $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:56
+msgid "LTI update of user %1 and set %2 queued."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:60
+msgid "LTI update of user %1 queued."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1450
 msgid "Language (refresh page after saving changes to reveal new language.)"
 msgstr "Langue (rafraîchir la page après l'enregistrement des modifications pour révéler la nouvelle langue.) "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:758
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:140
 msgid "Last"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:460
 msgid "Last Answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:604
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:231
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2001
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:828
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:857
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:915
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:31
+msgid "Last Full Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:25
 msgid "Last Name"
 msgstr "Nom de famille"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:792
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:115
 msgid "Last column of merge file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:785
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:108
 msgid "Last name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:242
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:237
 msgid "Latest Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1603
+#: /opt/webwork/webwork2/conf/defaults.config:1505
 msgid ""
 "Length of time, in seconds, a user has to be inactive before he is required "
-"to login again.<p>This value should be entered as a number, so as 3600 "
-"instead of 60*60 for one hour"
+"to login again. This value should be entered as a number, so as 3600 instead"
+" of 60*60 for one hour."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:845
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:26
 msgid "Lesser Rod of Revelation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:965
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:26
 msgid "Lesser Tome of Enlightenment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:141
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:15
 msgid "Level Progress:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:881
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:77
 msgid "Level:"
 msgstr "Niveau:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:912
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2060
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:433
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:17
+msgid "Library Broswer Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:359
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:52
 msgid "Library Browser"
 msgstr "Choisir des problèmes"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1977
+#. ($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:30
+msgid "Link to Edit Page for %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:25
+msgid "Links to pages that give information about writing problems:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1879
 msgid "List of display modes made available to students"
 msgstr "Liste des modes d'affichage mis à la disposition des étudiants"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2130
-msgid ""
-"List of e-mail addresses to which e-mail can be sent by a problem. "
-"Professors need to be added to this list if questionaires are used, or other"
-" WeBWorK problems which send e-mail as part of their answer mechanism."
-msgstr "Liste des adresses e-mail auxquelles un e-mail peut être envoyé par un problème. Les professeurs doivent être ajoutés à cette liste si les questionnaires sont utilisés, ou d'autres problèmes de Webwork qui envoient du courrier électronique dans le cadre de leur mécanisme de réponse."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:759
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:774
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:89
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:96
 msgid "List of insertable macros"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1826
+#: /opt/webwork/webwork2/conf/defaults.config:1728
 msgid "List of options for Show Me Another button"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1713
+#: /opt/webwork/webwork2/conf/defaults.config:1615
 msgid "List of sets excluded from achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1483
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:56
+msgid "Live equation rendering"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:144
+msgid "Loading..."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:122
 msgid "Local Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:41
 msgid "Local Problems"
 msgstr "Problèmes locaux"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1504
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:136
 msgid "Local Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:105
 msgid "Local Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1467
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:114
 msgid ""
 "Local data is generated when your systems admin runs the script update-OPL-"
 "statistics."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1460
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:107
 msgid ""
 "Local data on problem usage is generated and maintained by your institution."
 " The Usage figure is the total number of local individuals who have attemped"
@@ -3640,42 +4911,61 @@ msgid ""
 "likely bug free."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:115
 msgid "Location"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3501
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1854
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1890
 msgid ""
 "Location %1 does not exist in the WeBWorK database.  Please check your input"
 " (perhaps you need to reload the location management page?)."
 msgstr ""
 
 #. ($locationID, join(', ', @addresses)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1742
 msgid "Location %1 has been created, with addresses %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3353
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1798
 msgid "Location deletion requires confirmation."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3409
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:43
 msgid "Location description:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3089
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:37
 msgid "Location name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:159
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:27
+msgid ""
+"Locations are a list of ip addresses.  Ip addresses can be a single address "
+"(e.g. 192.168.1.101), a range of ip address (e.g. "
+"192.168.1.101-192.168.1.150), or an ip address mask (e.g. 192.168.1.0/24). "
+"Enter one ip address per line, using as many lines as needed for each "
+"location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:32
+msgid ""
+"Locations are edited by adding new ip addresses to the location, or deleting"
+" existing address.  You must select the confirm checkbox when deleting a "
+"location, and this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:43
+msgid "Locations of files:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:18
 msgid "Log In Again"
 msgstr "Se connecter à nouveau"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1124
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:11
 msgid "Log Out"
 msgstr "Se déconnecter"
 
@@ -3683,368 +4973,456 @@ msgstr "Se déconnecter"
 #. ($rename_oldCourseID)
 #. ($rename_newCourseID)
 #. ($new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1458
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1541
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2666
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:913
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:704
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:780
 msgid "Log into %1"
 msgstr ""
 
-#. (HTML::Entities::encode_entities($prettyUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1122
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1130
+#. ($userName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:9
 msgid "Logged in as %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:790
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:181
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:187
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:113
 msgid "Login"
 msgstr "Nom d'utilisateur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:58
 msgid "Login Info"
 msgstr "Paramètres du compte"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:187
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:815
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1980
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:291
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:855
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:884
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:913
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:36
 msgid "Login Name"
 msgstr "Nom d'usager"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:18
 msgid "Login Status"
 msgstr "Statut d'accès"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:6
+msgid "Login:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:225
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Macro"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:763
-msgid "Main Menu"
-msgstr "Menu principal"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:97
+msgid ""
+"Macro (\".pl\") files containing additional functionality for your course "
+"can be stored here."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:369
+#. ($filePath)
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:29
+msgid "Macro file %1 not found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:46
 msgid "Make Archive"
 msgstr "Archiver"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:27
 msgid "Make changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1115
-msgid "Make these changes in  course:"
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:15
+msgid "Make these changes in course: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:137
+msgid ""
+"Makes a new copy of the file you are editing at the location relative to the"
+" course's templates ([TMPL]) directory. You may choose to replace the "
+"current problem in the current set, append to the end to then end of the "
+"current set as a new problem, or create a problem that is not attached to a "
+"problem set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3040
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:1
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:46
 msgid "Manage Locations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:748
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:394
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:17
+msgid "Manage Locations Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:20
+msgid ""
+"Manage achievements for the course.  The actions allow one to edit, assign, "
+"import, export, score, create, or delete achievements.  The action form is "
+"at the top to select the desired action and options to perform when the "
+"submit button is pressed.  Below the action form is the list of all the "
+"achievements, ordered by their achievement \"Number\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:56
+msgid "Manage administration course files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:50
+msgid ""
+"Manage instructors.  When instructors are added to a newly created course, "
+"they are also added to the admin course with username \"userID_courseID\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:344
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:192
 msgid "Manual Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:233
-msgid "Mark All"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:17
+msgid "Manual Grader Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr',
+#. format_set_name_display($c->stash->{set}->set_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:205
+msgid "Manual Grader for %1: Problem %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:77
+msgid ""
+"Manually initiate an LTI grade passback for selected sets or users. This "
+"link is only visible if LTI grade passback is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:175
+msgid ""
+"Many of these editing activities can also be done more quickly from the "
+"\"Instructor Tools\" page where students and homework sets can be selected "
+"simultaneously. The \"Instructor Tools\" page is useful for quick editing of"
+" one or two students. The initial setup of the class can be done best from "
+"this page. Importing and exporting class lists can only be done from this "
+"page. Deleting students can only be done from this page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:120
 msgid "Mark Correct"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2822
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:598
 msgid "Mark Correct?"
 msgstr "Marquer correct?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:681
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:19
 msgid "Match on what? (separate multiple IDs with commas)"
 msgstr "L'associer à quoi? (Séparer les différents numéros d'identification par des virgules)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:499
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:85
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:36
 msgid "Math Objects"
 msgstr "Math Objects"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:327
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:377
 msgid "Max attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:380
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:24
 msgid "Max. Shown:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1817
+#: /opt/webwork/webwork2/conf/defaults.config:1719
 msgid ""
 "Maximum times Show me Another can be used per problem (-1 => unlimited)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:606
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:4
+msgid "Merge file data:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:24
 msgid "Merge file:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:288
 msgid "Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:578
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:13
 msgid "Message file:"
 msgstr ""
 
-#. ($emailDirectory, $output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:357
-msgid "Message saved to file <code>%1/%2</code>."
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:300
+msgid "Message saved to file %1."
 msgstr ""
 
-#. ($recipient, $ur->email_address)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:995
+#. ($recipient, $user_record->email_address)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:98
 msgid "Message sent to %1 at %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2249
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2324
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:121
+msgid "Message was blank."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:48
+msgid ""
+"Messages can be saved to a message file (which must end in the \".msg\" "
+"extension).  Use the \"Message file\" drop down menu to select which message"
+" file to load, or \"None\" to use a blank message. To save a new message, "
+"use the \"Save as\" button after entering in a valid filename.  The \"Save "
+"as\" button will not overwrite currently saved messages.  To edit a "
+"currently saved message first select it using the drop down menu, then click"
+" the \"Save\" button to save any changes.  Use the \"File Manager\" to "
+"delete messages, located in the \"[TMPL]/email\" directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:22
 msgid "Method"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3284
+#: /opt/webwork/webwork2/conf/defaults.config:2003
+msgid "Method to enter problem scores in the single problem manual grader"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1668
 msgid ""
 "Missing required input data. Please check that you have filled in all of the"
 " create location fields and resubmit."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1555
+#: /opt/webwork/webwork2/conf/defaults.config:1457
 msgid ""
 "Mode in which the LANG and DIR settings for a single problem are determined."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1557
-msgid ""
-"Mode in which the LANG and DIR settings for a single problem are "
-"determined.<p>The system will set the LANGuage attribute to either a value "
-"determined from the problem, a course-wide default, or the system default, "
-"depending on the mode selected. The tag will only be added to the DIV "
-"enclosing the problem if it is different than the value which should be set "
-"in the main HTML tag set for the entire course based on the course "
-"language.<p>There are two options for the DIRection attribute: \"ltr\" for "
-"left-to-write sripts, and \"rtl\" for right-to-left scripts like Arabic and "
-"Hebrew.<p>The DIRection attribute is needed to trigger proper display of the"
-" question text when the problem text-direction is different than that used "
-"by the current language of the course. For example, English problems from "
-"the library browser would display improperly in RTL mode for a Hebrew "
-"course, unless the problen Direction is set to LTR.<p>The feature to set a "
-"problem language and direction was only added in 2018 to the PG language, so"
-" most problems will not declare their language, and the system needs to fall"
-" back to determining the language and direction in a different manner. The "
-"OPL itself is all English, so the system wide fallback is to en-US in LTR "
-"mode.<p>Since the defaults fall back to the LTR direction, most sites should"
-" be fine with the \"auto::\" mode, but may want to select the one which "
-"matches their course language. The mode \"force::ltr\" would also be an "
-"option for a course which runs into trouble with the \"auto\" "
-"modes.<p>Modes:<br><ul><li>\"none\" prevents any additional LANG and/or DIR "
-"tag being added. The browser will use the main setting which was applied to "
-"the entire HTML page. This is likely to cause trouble when a problem of the "
-"other direction is displayed.</li><li>\"auto::\" allows the system to make "
-"the settings based on the language and direction reported by the problem (a "
-"new feature, so not set in almost all existing problems) and falling back to"
-" the expected default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" "
-"allows the system to make the settings based on the language and direction "
-"reported by the problem (a new feature, so not set in almost all existing "
-"problems) but falling back to the language with the given LangCode and the "
-"direction Dir when problem settings are not available from "
-"PG.</li><li>\"auto::Dir\" for problems without PG settings, this will use "
-"the default en=english language, but force the direction to Dir. Problems "
-"with PG settings will get those settings.</li><li>\"auto:LangCode:\" for "
-"problems without PG settings, this will use the default LTR direction, but "
-"will set the language to LangCode.Problems with PG settings will get those "
-"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
-" by the PG code of the problem, and will force the system to set the "
-"language with the given LangCode and the direction to Dir for <b>all</b> "
-"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
-"PG code of the problem, and will force the system to set the direction to "
-"Dir for <b>all</b> problems, but will avoid setting any language attribute "
-"for individual problem.</li></ul>"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2695
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:443
 msgid "Move"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2231
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:457
 msgid "Move to Page:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2226
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:452
 msgid "Move to Problem:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:26
+msgid ""
+"Multiple sets may be assigned to the users by holding down the shift key or "
+"the ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:27
+msgid ""
+"Multiple users or sets may be selected by holding down the shift key or the "
+"ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:36
 msgid "My Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1412
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:26
 msgid "Mysterious Package (with Ribbons)"
 msgstr ""
 
 # Short for Number of Fields
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:213
 msgid "NO OF FIELDS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1484
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:741
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:113
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:135
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:29
 msgid "Name"
 msgstr "Nom"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:174
 msgid "Name for new set here"
 msgstr "Nom du nouveau cours ici"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1528
+#: /opt/webwork/webwork2/conf/defaults.config:1430
 msgid "Name of course information file"
 msgstr "Nom du fichier pour les informations du cours"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1107
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:77
+msgid "Name of the evaluator file used to evaluate the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:81
+msgid "Name of the image used for the achievement icon."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:4
 msgid "Name the new set"
 msgstr "Nommer le nouveau devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1691
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:45
+msgid "Name:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:29
 msgid "Necromancers Charm"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:343
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:205
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:393
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:35
 msgid "Never"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:371
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:54
 msgid "New File"
 msgstr "Nouveau fichier"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:372
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:55
 msgid "New Folder"
 msgstr "Nouveau dossier"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:30
 msgid "New Name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2067
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:3
 msgid "New Password"
 msgstr "Nouveau mot de passe"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:131
-msgid "New Version"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+msgid "New Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
 msgid "New file name:"
 msgstr "Nom du nouveau fichier:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
 msgid "New folder name:"
 msgstr "Nom du nouveau dossier:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:577
 msgid "New passwords saved"
 msgstr "Nouveaux mots de passe sauvegardés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1078
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:36
 msgid "New set name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1357
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1010
 msgid "Next Problem"
 msgstr "Problème suivant"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1181
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2164
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:40
+msgid "Next Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:98
 msgid "Next page"
 msgstr "Page suivante"
 
-#. ($self->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:620
+#. (% $c->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:142
 msgid "Next test will be available by %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2452
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:134
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:144
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:183
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:483
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:510
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:142
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:68
 msgid "No"
 msgstr "Non"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:635
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:116
 msgid "No Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2324
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:216
 msgid "No Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:117
+msgid "No Sender specified."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:23
 msgid "No Target Set Selected"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:335
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:38
 msgid "No achievement badges have been assigned yet."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1521
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:77
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:37
 msgid "No achievements shown.  Create an achievement!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:90
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:2
+msgid "No achievements shown.  Select an achievement to edit!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:61
 msgid "No action taken"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:141
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:140
 msgid ""
 "No authentication method found for your request.  If this recurs, please "
 "speak with your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:940
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:361
 msgid "No change made to any set"
 msgstr "Aucun changement effectué à aucun devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
 msgid ""
 "No changes specified.  You must mark the checkbox of the item(s) to be "
 "changed and enter the change data."
@@ -4054,1379 +5432,1811 @@ msgstr ""
 msgid "No changes were saved!"
 msgstr "Aucun changement n'a été sauvegardé!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2462
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:50
 msgid "No course archives found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2898
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:32
 msgid "No course id defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1561
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:932
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:67
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:76
 msgid "No courses found"
 msgstr ""
 
 #. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:593
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:675
 msgid "No data exists for set %1 and problem %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:10
+msgid "No e-mail recipients are listed for this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:169
 msgid "No filename was specified for saving!  The message was not saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:340
 msgid "No guest logins are available. Please try again in a few minutes."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3522
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1877
 msgid "No location specified to edit. Please check your input data."
 msgstr ""
 
 #. ($badID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1788
 msgid "No location with name %1 exists in the database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3206
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:149
 msgid "No locations are currently defined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:342
 msgid "No merge data file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:612
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:18
+msgid "No merge data found"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:164
+msgid "No merge data found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:8
+msgid "No merge file selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:135
 msgid "No more tests available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:270
 msgid ""
 "No new Achievement ID specified.  No new achievement created.  File not "
 "saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:63
 msgid "No problems matched the given parameters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:25
+msgid "No recipients selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:334
 msgid ""
 "No recipients selected. Please select one or more recipients from the list "
 "below."
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2044
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:49
 msgid "No record for global set %1."
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2046
-msgid "No record for user %1."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
 msgid "No record found."
 msgstr "Aucun enregistrement trouvé."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1166
-msgid "No set created."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:12
 msgid "No sets in this course yet"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1010
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:159
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
 msgid "No sets selected for scoring"
 msgstr "Aucun devoir sélectionné pour la notation"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2764
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:46
 msgid ""
 "No sets shown.  Choose one of the options above to list the sets in the "
 "course."
 msgstr "Aucun devoir affiché. Choisir l'une des options ci-dessus pour afficher les devoirs de ce cours."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1942
 msgid "No source filePath specified"
 msgstr "Aucun chemin de fichier source n'a été spécifié"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1327
 msgid "No source_file for problem in .def file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2099
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:87
 msgid ""
-"No students shown.  Choose one of the options above to list the students in "
+"No students shown. Choose one of the options above to list the students in "
 "the course."
-msgstr "Aucun étudiant affichés. Choisissez l'une des options ci-dessus pour lister les étudiants dans le cours."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:246
 msgid "No submissions. Over time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:278
 msgid "No tests taken."
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:594
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:676
 msgid "No user specific data exists for user %1"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2031
 msgid "No valid changes submitted for location %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:275
-msgid "No versions of this assignment have been taken."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:771
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:263
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:241
 msgid "No versions of this test have been taken."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:562
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:252
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:17
 msgid "None"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:681
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2463
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:763
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:52
 msgid "None Specified"
 msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2089
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:73
 msgid "None of the selected users are assigned to this set: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:33
 msgid "Not logged in."
 msgstr "Non connecté."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1569
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:4
 msgid "Note"
 msgstr "Note"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:381
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:55
+msgid ""
+"Note that if there are errors, they will be shown at the top of the page. In"
+" some cases, a hard copy is still generated and a link called \"Download "
+"Hardcopy\" appears. In addition, the latex file, log and error files are "
+"generated which can be used in troubleshooting."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:93
+msgid ""
+"Note that if you set the permission level of a user to something other than "
+"\"Student\", you may also want to set the status of the user to "
+"\"Observer\".  Users with the \"Observer\" status are not included in "
+"statistics, scoring, or instructor emails."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:28
+msgid ""
+"Note that some settings require an additional page load after \"Save "
+"Changes\" is clicked in order to take effect.  This is true for a theme "
+"change for example."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:396
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:422
 msgid "Note:"
 msgstr ""
 
-#. (CGI::i($pg->{result}{msg})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2350
+#. (tag('i', maketext('You are in the Reduced Scoring Period.  All work counts
+#. for [_1]% of the original.',
+#. $ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#. (tag('i', $pg->{result}{msg})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:572
 msgid "Note: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2482
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:686
 msgid ""
 "Note: grading the test grades all problems, not just those on this page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1460
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1485
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:768
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:59
+msgid "Now"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:19
 msgid "Number"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:242
 msgid "Number of Graded Submissions per Test (0=infty)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
 msgid "Number of Problems per Page (0=all)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:95
+msgid "Number of Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:257
 msgid "Number of Tests per Time Interval (0=infty)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1833
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2435
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:54
+msgid "Number:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1181
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:912
 msgid "OK"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1464
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:17
+msgid "OPL Problem Levels Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:26
 msgid "Oil of Cleansing"
 msgstr ""
 
+#. ('<code>pdflatex</code>', '<code>hardcopy.tex</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:49
+msgid ""
+"Once \"Generate Hardcopy for selected sets and selected users\" is clicked a"
+" file in the selected hardcopy format will be generated and offered for "
+"download. If PDF output was selected, a single PDF file is generated. If TeX"
+" output is selected, a zip file is generated that contains all files needed "
+"to generated the hardcopy PDF file via %1. The main TeX file is called %2."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:84
 msgid "One Column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:314
+msgid "Only Start"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:289
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:303
 msgid "Only after set answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1892
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:87
+msgid ""
+"Only present for JITAR sets. Collapse JITAR nesting problem groups to the "
+"top row of information about a problem. Note that the nesting of a single "
+"problem group can be collapsed by clicking on the down arrow to the right of"
+" the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:80
+msgid ""
+"Only present for JITAR sets. Expand JITAR nested problem groups that have "
+"been collapsed. Note that the nesting of a single problem group can be "
+"expanded by clicking on the right arrow to the right of the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1794
 msgid ""
 "Only this permission level and higher get buttons for sending e-mail to the "
 "instructor."
 msgstr "Seul ce niveau d'autorisation et supérieur peuvent voir le bouton pour l'envoi d'e-mail à l'instructeur."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:39
 msgid "Open"
 msgstr "Ouvrir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:422
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:763
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:810
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:62
 msgid "Open Date"
 msgstr "Date d'ouverture"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1098
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:42
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:32
 msgid "Open Problem Library"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2417
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:272
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:525
 msgid "Open in New Window"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1263
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1617
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:29
 msgid "Open in new window"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:491
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:320
 msgid "Open, closes %1."
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:489
-msgid "Open, complete by %1."
-msgstr ""
-
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:300
 msgid "Open, due %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:433
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
 msgid "Open."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:431
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:268
 msgid "Open. Submitted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:31
 msgid "Open:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:115
 msgid "Opens"
 msgstr "Ouverture"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:27
 msgid "Opens any homework set for 24 hours."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1686
+#: /opt/webwork/webwork2/conf/defaults.config:1588
 msgid "Optional Modules"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:265
 msgid "Order Problems Randomly"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:50
+msgid "Other Options"
+msgstr ""
+
 # Context is "7 Out Of 10"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:405
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:777
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:150
 msgid "Out Of"
 msgstr "Indisponible"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1024
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:85
+msgid "Overall Results"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:93
+msgid "Overall Set Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:122
+msgid "Overall Success Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:470
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:481
 msgid "Overwrite"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:437
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:100
 msgid "Overwrite existing files silently"
 msgstr "Écraser les fichier existant en silence"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:41
+msgid "PDF"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:69
 msgid "PG Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:827
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer.html.ep:1
+msgid "PG POD"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:17
+msgid "PG Problem Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:708
 msgid "PG debug messages"
 msgstr "Messages de debug PG"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:829
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:716
 msgid "PG internal errors"
 msgstr "Erreur internes PG"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:818
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:109
+msgid ""
+"PG markdown syntax used to format WeBWorK questions. This interactive lab "
+"can help you to learn the techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:692
 msgid "PG question failed to render"
 msgstr "Le rendu de la question PG a échoué"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:826
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:706
 msgid "PG question processing error messages"
 msgstr "Traîtement des messages d'erreur de la question PG"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:828
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:712
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:128
 msgid "PG warning messages"
 msgstr "Messages d'avertissement PG"
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:511
-msgid "PGLab"
-msgstr ""
-
-# Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:98
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:47
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:58
 msgid "PGML"
 msgstr ""
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:91
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:40
 msgid "POD"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2309
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2249
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:200
+msgid "POD Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:208
+msgid "POD Viewer"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1515
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:526
 msgid "PREVIEW ONLY -- ANSWERS NOT RECORDED"
 msgstr "APERÇU SEULEMENT --  LES RÉPONSES NE SERONT PAS ENREGISTRÉES"
 
 # Problem Number
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:215
 msgid "PROB NUMBER"
 msgstr ""
 
 # Problem Value
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:218
 msgid "PROB VALUE"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:205
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:36
 msgid "Pad Fields"
 msgstr "Remplir les champs"
 
-#. (timestamp($self)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1255
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:28
+msgid "Page Contents"
+msgstr ""
+
+#. ($c->timestamp)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:1
 msgid "Page generated at %1"
 msgstr "Page génerée à %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:568
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:81
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:71
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:56
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:25
 msgid "Password"
 msgstr "Mot de passe"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:976
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:13
 msgid "Password (Leave blank for regular proctoring)"
 msgstr ""
 
-#. ($studentUser, CGI::span({ dir => 'ltr' },
-#. format_set_name_display($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:498
+#. ($studentUser, tag('span', dir => 'ltr', format_set_name_display($setName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:13
 msgid "Past Answers for %1, set %2, problem %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:8
 msgid "Percent"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:562
-msgid "Percentage of Active Students with Correct Answers"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:94
+msgid "Percent Ranges"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+msgid "Percent Score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:788
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:535
+msgid "Percent of Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:206
 msgid ""
 "Percentile cutoffs for number of attempts. The 50% column shows the median "
 "number of attempts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2056
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:834
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:863
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:921
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:58
+msgid ""
+"Percentile cutoffs for student's score and success index. The 50% column "
+"shows the median number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:50
 msgid "Permission Level"
 msgstr "Niveau de permission"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1869
+#: /opt/webwork/webwork2/conf/defaults.config:1771
 msgid "Permissions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1052
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:24
 msgid "Pick a target set above to add this problem to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:54
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:21
 msgid "Pick date and time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3804
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
 msgid ""
 "Place a file named \"hide_directory\" in a course or other directory and it "
 "will not show up in the courses list on the WeBWorK home page. It will still"
 " appear in the Course Administration listing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1107
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should be given full credit."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should have half credit added."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given full credit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:889
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given half credit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:654
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its incorrect attempt count reset."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its weight doubled."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1315
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:60
 msgid ""
 "Please choose the set, the problem you would like to copy, and the problem "
 "you would like to copy it to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:399
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:19
 msgid "Please correct the following errors and try again:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:698
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:28
 msgid "Please enter in a value to match in the filter field."
 msgstr "Veuillez entrer une valeur qui correspond au champ du filtre."
 
-#. (CGI::b($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:197
+#. (tag('b', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:28
 msgid "Please enter your username and password for %1 below:"
 msgstr "Veuillez écrire votre nom d'usager et votre mot de passe pour %1 ci-dessous:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1778
 msgid "Please provide a location name to delete."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:233
 msgid "Please select action to be performed."
 msgstr "Veuillez sélectionner une action à effectuer."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:183
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
 msgid "Please select at least one set and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
 msgid "Please select at least one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:165
 msgid "Please select at least one user and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:35
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:31
 msgid "Please select at least one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:28
 msgid "Please select at most one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:30
 msgid "Please select exactly one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:29
 msgid "Please select exactly one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:574
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1016
 msgid "Please specify a file to save to."
 msgstr "Prière d’attribuer un nom au fichier pour permettre l’enregistrement."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:37
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
 msgid "Please specify a homework set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:38
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
 msgid ""
 "Please use only letters, digits, dashes, underscores, and periods in your "
 "set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1462
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1184
+msgid ""
+"Please use radio buttons to choose the method for saving this file. Uknown "
+"saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:165
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:169
+msgid "Point Value"
+msgstr ""
+
+#. ($grader->{problem_value})
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:92
+msgid "Point Value (0 - %1):"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:21
 msgid "Points"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:609
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:62
+msgid "Points:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:26
 msgid "Potion of Forgetfulness"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1423
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:2
 msgid "Prepare which sets for export?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2054
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2073
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:268
 msgid "Press \"Grade Test\" now!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2049
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:244
 msgid "Press \"Grade Test\" soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:213
-msgid "Preview Comment"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:69
 msgid "Preview Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:314
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1840
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:11
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:99
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:35
 msgid "Preview My Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2440
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:646
 msgid "Preview Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1340
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:41
+msgid ""
+"Preview the message before sending using the \"Preview Message\" button.  "
+"The preview shows the email that would be sent to the first selected student"
+" or the instructor if no students were selected.  The preview will also list"
+" all of the students that would receive their own personalized message.  If "
+"a merge file was selected, the preview will also indicate which (if any) "
+"recipient's merge file data could not be found."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:991
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:995
 msgid "Previous Problem"
 msgstr "Problème précédent"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2157
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:94
 msgid "Previous page"
 msgstr "Page précédente"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2149
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:45
+msgid "Primary Actions"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:355
 msgid "Print Test"
 msgstr ""
 
 # Short for Problem
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2088
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:287
 msgid "Prob"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:670
-msgid "Problem #"
-msgstr ""
-
-#. ($prettyProblemID)
-#. ($problemNumber)
 #. (join('.', @seq)
 #. ($problemID)
-#. ($prettyProblemIDs{$probID})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:831
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:834
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:897
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:438
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:800
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:956
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:964
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:973
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:933
+#. ($problemNumber)
+#. ($_->{prettyID})
+#. ($c->{prettyID})
+#. ($probID)
+#. ($c->{setRecord}->assignment_type eq 'jitar' ? join('.',
+#. jitar_id_to_seq($_)
+#. ($set->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)
+#. ($prettyProblemID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:831
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:842
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:853
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:57
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/siblings.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:40
 msgid "Problem %1"
 msgstr "Problème %1"
 
-#. ($problemNumber)
-#. ($prettyID)
-#. ($versioned ? $versioned : $MergedProblem->problem_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1419
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1421
+#. ($i + 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:535
 msgid "Problem %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1974
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:75
+msgid "Problem (\".pg\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:38
+msgid "Problem Display Settings"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1876
 msgid "Problem Display/Answer Checking"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:451
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:50
 msgid "Problem Editor"
 msgstr "Éditeur de problèmes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1697
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:29
 msgid "Problem Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1002
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:999
 msgid "Problem List"
 msgstr "Liste des problèmes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1119
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:666
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:783
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:75
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:159
 msgid "Problem Number"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:156
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:160
+msgid "Problem Paths"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:140
 msgid "Problem Score (%):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:30
 msgid "Problem Techniques"
 msgstr "Techniques de problèmes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:705
-msgid "Problem Viewer"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:239
+msgid ""
+"Problem has a different source file than the currently rendered problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:233
+msgid "Problem has an essay answer that needs to be graded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1943
 msgid "Problem source is drawn from a grouping set"
 msgstr "La source d'un problèm est tiré d'un groupe de devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:406
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2494
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:445
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:827
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:835
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:896
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:801
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:89
+msgid ""
+"Problem source is drawn from a grouping set and can not be directly rendered"
+" or edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:336
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:9
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:32
 msgid "Problems"
 msgstr "Problèmes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:25
 msgid "Problems Added"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:59
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:54
 msgid "Problems for all students have been unassigned."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:57
 msgid "Problems for selected students have been reassigned."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:51
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:46
 msgid "Problems have been assigned to all current users."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:25
+msgid ""
+"Problems with this rating should only require direct memory of a fact. "
+"Examples might be a specific value of a function, or the statement of a "
+"definition. Very few WeBWorK problems fall into this category."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:93
 msgid "Proctor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:282
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:92
 msgid "Proctor Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:258
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:71
 msgid "Proctor Username"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:193
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:3
+msgid "Proctor authorization requested for a nonexistent set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:8
 msgid "Proctor authorization required."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:231
-msgid "Proctored Gateway Quiz %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:88
+msgid "Proctor:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:265
+msgid "Proctored Test %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:272
+msgid "Proctored Test %2 Proctor Login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:241
-msgid "Proctored Gateway Quiz %2 Proctor Login"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:318
+msgid ""
+"Proctored tests always require authorization to start the test. \"Both Start"
+" and Grade\" will require login proctor authorization to start and grade "
+"proctor authorization to grade. \"Only Start\" requires grade proctor "
+"authorization to start and no authorization to grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:981
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:18
 msgid ""
-"Proctored tests require proctor authorization to start and to grade.  "
 "Provide a password to have a single password for all students to start a "
 "proctored test."
-msgstr "Un examen requiert l'authorization d'un superviseur avant de commencer. Entrer un mot de passe pour avoir le même mot de passe pour tous les étudiants pour commencer en examen."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:56
 msgid "Publish"
 msgstr "Publier"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:31
+msgid ""
+"Quick access to many instructor tools, including <strong>Reset "
+"passwords</strong>, <strong>Act as student</strong>, <strong>Assign "
+"individual sets</strong> and <strong>Edit individual due dates</strong>."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "RECITATION"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1333
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:199
 msgid "Randomize"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:13
 msgid "Randomize Seed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:101
 msgid "Read only"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:67
 msgid "Really delete the items listed above?"
 msgstr "Vous voulez vraiment supprimer les éléments énumérés ci-dessus?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:201
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:212
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:804
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2038
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:298
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:832
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:861
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:890
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:919
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:184
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:42
 msgid "Recitation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:194
+#. ($recitation)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:125
+msgid "Recitation %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:21
+msgid "Recitation:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:38
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:46
 msgid "Record Scores for Single Sets"
 msgstr "Ajouter les résultats de chaque devoir"
 
-#. ($studentName)
-#. ($self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:183
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:190
+#. ($studentID)
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:8
 msgid "Record for user %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Reduced Scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:67
 msgid "Reduced Scoring Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2523
-msgid "Reduced Scoring Disabled"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
+msgid "Reduced Scoring Enabled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2522
-msgid "Reduced Scoring Enabled"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:33
+msgid "Reduced Scoring Period"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:314
 msgid "Reduced credit can still be earned until %1."
 msgstr ""
 
 # Short for "Reduced Scoring:"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:32
 msgid "Reduced:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:153
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:373
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:56
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1646
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1943
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2000
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3713
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3755
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:56
 msgid "Refresh Listing"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:190
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:200
 msgid "Relax IP restrictions when?"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:88
+msgid "Reload the page to see backup files that have been made."
+msgstr ""
+
 # Context is "Attempts Remaining"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:14
 msgid "Remaining"
 msgstr "Nombre d'essais restant"
 
 #. ('00:00:00')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:254
 msgid "Remaining time: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:61
 msgid "Remember Me"
 msgstr "Rester connecté"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:546
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:514
 msgid "Remember to return to your original problem when you're finished here!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1020
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:466
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:72
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:41
 msgid "Rename"
 msgstr "Renommer"
 
 #. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1302
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:62
 msgid "Rename %1 to %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:378
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:927
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:73
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:34
 msgid "Rename Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:17
+msgid "Rename Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:22
+msgid "Rename Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
 msgid "Rename file as:"
 msgstr "Renommer le fichier en:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2727
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:463
 msgid "Render"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:344
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:59
 msgid "Render All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2720
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:461
 msgid "Render Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2501
-msgid "Renumber Problems"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:60
+msgid ""
+"Render all problems on the page. This does not reload the page or save or "
+"reset changes."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:106
 msgid ""
-"Reopens any gateway test for an additional 24 hours. This allows you to take"
-" a test even if the close date has past. This item does not allow you to "
-"take additional versions of the test."
+"Render or re-render the problem, course info file, or set header being "
+"edited. This does not change the permanent file on the disk. You can view "
+"different versions of the same problem by changing the seed. You can also "
+"change the manner in which the mathematics is typeset. If \"Open in new "
+"window\" is checked, then the problem will open in a new tab or window "
+"showing the problem as it will be rendered for students in the set."
 msgstr ""
 
-#. (CGI::strong(                                                   CGI::span({
-#. dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1829
-msgid "Replace current problem: %1"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:132
+msgid "Rendering Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1155
-msgid "Replace which users?"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:341
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:53
+msgid "Renumber Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:55
+msgid ""
+"Renumber problems consecutively starting from 1. This renumbering is not "
+"saved until \"Save Changes\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:103
+msgid ""
+"Renumber problems in the set consecutively starting from one. In the process"
+" of deleting problems, the numbering can be made non-consecutive. This is "
+"useful to clean up the problem numbering."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:31
+msgid ""
+"Reopens any test for an additional 24 hours. This allows you to take a test "
+"even if the close date has past. This item does not allow you to take "
+"additional versions of the test."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:118
+msgid "Reordering Problems"
+msgstr ""
+
+#. (tag(                                           'strong',
+#. c(                                                      tag('span', dir =>
+#. 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:58
+msgid "Replace current problem: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:13
+msgid "Replace which users?"
 msgstr "Remplacer quels usagers?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:637
+#. ($composite_id, $oldUser->status)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:448
+msgid "Replacing old data for %1: status: %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:42
 msgid "Reply-To:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:528
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:123
 msgid "Report Bugs in this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1073
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:305
 msgid "Report bugs"
 msgstr "Signaler un bogue"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:128
+msgid ""
+"Report bugs in a WeBWorK question/problem using this link. The very first "
+"time you do this you will need to register with an email address so that "
+"information on the bug fix can be reported back to you."
+msgstr ""
+
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2825
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1530
 msgid "Report for course %1:"
 msgstr ""
 
-#. ($rename_oldCourseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2122
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:3
 msgid "Report on database structure for course %1:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1829
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:8
 msgid "Request New Version"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2246
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2321
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:19
 msgid "Request information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1972
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1220
 msgid "Request new version now."
 msgstr ""
 
+#. ($setName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:486
+msgid ""
+"Requested set \"%1\" is a proctored test, but no valid proctor authorization"
+" has been obtained."
+msgstr ""
+
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:399
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:422
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:425
 msgid "Requested set '%1' could not be found in the database for user %2."
 msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:469
-msgid ""
-"Requested set '%1' is a homework assignment but the gateway/quiz content "
-"generator %2 was called.  Try re-entering the set from the problem sets "
-"listing page."
-msgstr ""
-
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:484
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:472
 msgid ""
-"Requested set '%1' is a proctored test/quiz assignment, but no valid proctor"
-" authorization has been obtained."
+"Requested set '%1' is a homework assignment but the test content generator "
+"%2 was called.  Try re-entering the set from the problem sets listing page."
 msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:463
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:466
 msgid ""
-"Requested set '%1' is a test/quiz assignment but the regular homework "
-"assignment content generator %2 was called.  Try re-entering the set from "
-"the problem sets listing page."
+"Requested set '%1' is a test but the regular homework assignment content "
+"generator %2 was called.  Try re-entering the set from the problem sets "
+"listing page."
 msgstr ""
 
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:420
 msgid "Requested set '%1' is not assigned to user %2."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:450
 msgid "Requested set '%1' is not available yet."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:441
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:444
 msgid "Requested set '%1' is not yet open."
 msgstr ""
 
 #. ($verNum,				$setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:404
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:407
 msgid "Requested version (%1) of set '%2' can not be directly accessed."
 msgstr ""
 
 #. ($verNum, $setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:397
 msgid "Requested version (%1) of set '%2' is not assigned to user %3."
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:308
+msgid "Require Proctor Authorization to"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:45
 msgid "Require users to log in through the LMS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:420
 msgid "Rerandomize after"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:104
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2280
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2968
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:195
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:696
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:47
 msgid "Reset Form"
 msgstr "Réinitialiser le formulaire"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:610
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:27
 msgid "Resets the number of incorrect attempts on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2453
-msgid ""
-"Restores a course from a gzipped tar archive (.tar.gz). After unarchiving, "
-"the course database is restored from a subdirectory of the course's DATA "
-"directory. Currently the archive facility is only available for mysql "
-"databases. It depends on the mysqldump application."
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:41
+msgid "Restore a .tar.gz archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:40
+msgid "Restore backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:39
+msgid "Restore backup from %1"
+msgstr ""
+
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+msgid "Restored backup from %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:178
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:188
 msgid "Restrict Access by IP"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:912
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep:11
 msgid "Restrict Locations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:286
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:324
 msgid "Restrict Problem Progression"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:184
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:194
 msgid "Restrict To"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:154
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:33
+msgid "Restrict or sort the students displayed"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:159
 msgid "Restrict release by set(s)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2090
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:299
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:291
 msgid "Result"
 msgstr "Résultat"
 
-#. (CGI::i($self->$actionHandler(\%genericParams, \%actionParams,
-#. \%tableParams)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:388
+#. ($c->tag('i', $c->$actionHandler)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:228
 msgid "Result of last action performed: %1"
 msgstr "Résultat de la dernière action effectuée: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:309
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:300
 msgid "Results for this submission"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:363
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:236
 msgid "Results of last action performed"
 msgstr "Résultats de la dernière action effectuée"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:125
 msgid "Results of last action performed: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1725
-msgid "Resurrect which Gateway?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:51
+msgid "Resurrect which test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1449
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:669
 msgid "Retitled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:17
 msgid "Return to your work"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:686
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:132
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:16
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:166
 msgid "Revert"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, $self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2069
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:83
 msgid "Revert to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1431
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1513
+#. ($c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1220
+msgid "Reverted to original file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:168
+msgid ""
+"Reverts to the copy of the file saved on the disk or to a backup file. All "
+"unsaved editing changes will be lost. This option is only active when a "
+"temporary file or a backup file exists. You may also delete backups that "
+"have been made with this tab."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:182
+msgid "Review of column functions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:145
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:85
 msgid ""
 "Reviewing a problem and looking at both the average Attempts and  average "
 "Status should give instructors valuable information about the difficulty of "
 "the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:55
 msgid "Reward used successfully!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:180
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:4
 msgid "Rewards"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:27
 msgid "Ring of Reduction"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:322
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:26
 msgid "Robe of Longevity"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "SECTION"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:214
 msgid "SET NAME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:321
 msgid "STATUS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "STUDENT ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:43
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:263
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:170
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:687
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:847
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:220
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:85
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:207
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:123
 msgid "Save"
 msgstr "Enregistrer"
 
-#. (CGI::b($self->shortPath($self->{sourceFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:438
+#. (tag('b', $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_form.html.ep:2
 msgid "Save %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:44
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:695
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:134
 msgid "Save As"
 msgstr "Enregistrer sous [TMPL]/"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:744
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2963
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:194
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:695
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:37
 msgid "Save Changes"
 msgstr "Sauvegarder les modifications"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:60
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:76
 msgid "Save Edit"
 msgstr "Enregistrer la modification"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
 msgid "Save Export"
 msgstr "Enregistrer l'exportation"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:92
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
 msgid "Save Password"
 msgstr "Enregistrer le mot de passe"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:188
 msgid "Save as"
 msgstr "Enregistrer sous"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:872
-msgid "Save as Default"
-msgstr "Enregistrer par défaut"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:481
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:5
 msgid "Save as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1558
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:254
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1443
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_password_form.html.ep:1
 msgid "Save changes"
 msgstr "Sauvegarder les modifications"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1794
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:33
 msgid "Save file to:"
 msgstr ""
 
-#. (CGI::b({ dir => 'ltr' }, $self->shortPath($self->{editFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1605
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:125
+msgid ""
+"Save the contents of the editor window to the file on disk and re-render the"
+" problem. If \"Open in new window\" is checked, then the problem will open "
+"in a new tab or window showing the problem as it will be rendered for "
+"students in the set. If \"Create backup\" is checked then a backup of the "
+"current file on disk will be created before overwriting it with the contents"
+" of the editor window. If a backup already exists, then a \"Delete oldest "
+"backup\" check box will be present. If that is checked, then the oldest "
+"backup will be deleted when \"Save\" is clicked. These backups can be "
+"reverted to and managed on the \"Revert\" tab."
+msgstr ""
+
+#. (tag('b', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:6
 msgid "Save to %1 and View"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:396
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1165
-msgid "Saved to file '%1'"
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:50
+msgid "Saved answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1180
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2116
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4294
+#. ($c->shortPath($outputFilePath)
+#. ($outputFilePath =~ s/$ce->{courseDirs}{templates}/[TMPL]/r)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:549
+msgid "Saved to file \"%1\""
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2292
 msgid "Schema and database field definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4284
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2279
 msgid "Schema and database table definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:404
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:465
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:660
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:147
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:161
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:78
 msgid "Score"
 msgstr "Résultat"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:125
 msgid "Score (%)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:161
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:60
+msgid ""
+"Score one or more sets. This can also be done from the \"Hmwk Sets Editor\" "
+"or from the \"Instructor Tools\", but the \"Scoring Tools\" page allows "
+"control over parameters."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:170
 msgid "Score required for release"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:228
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:58
 msgid "Score selected set(s) and save to:"
 msgstr "Sauvegarder les résultats sélectionnés sous:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2085
-msgid "Score summary for last submit:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:284
+msgid "Score summary for last submission:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:2
 msgid "Score which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:978
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:2
 msgid "Score which sets?"
 msgstr "Évaluer quels devoirs?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
 msgid "Scores"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:487
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:66
+msgid "Scoring (\".csv\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:396
 msgid "Scoring Download"
 msgstr "Télécharger les résultats"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:161
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:115
 msgid "Scoring Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:478
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:391
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:58
 msgid "Scoring Tools"
 msgstr "Outils d'évaluation"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2460
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:17
+msgid "Scoring Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:327
 msgid ""
 "Screen and Hardcopy set header information can not be overridden for "
 "individual students."
 msgstr "Les informations des entêtes de devoir à l'écran et sur papier ne peuvent pas être substitués pour pour un étudiant individuel."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:26
 msgid "Scroll of Resurrection"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:189
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:200
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:211
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:793
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2029
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:297
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:831
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:860
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:889
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:918
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:157
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:178
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:38
 msgid "Section"
 msgstr "Section"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:653
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:802
+#. ($section)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:122
+msgid "Section %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:30
 msgid "Section:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:436
 msgid "Seed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:114
 msgid "Select"
 msgstr "Selectionner"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:505
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:20
+msgid ""
+"Select Users from the left column and sets from the right column and assign "
+"or unassign the given sets. The list of users or the list of sets can be "
+"reordered under the \"sort\" option or the format of the user or set list.  "
+"Additionally, the set lists can be filtered (by section number or "
+"recitation).  The displayed user and set lists will only be updated upon "
+"clicking \"Change Display Settings\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:11
 msgid "Select a Homework Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:14
 msgid "Select a Problem Collection"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:18
 msgid "Select a Set Definition File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1028
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:14
 msgid "Select a Set from this Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1659
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:20
+msgid ""
+"Select a course to create a .tar.gz archive of, which contains a dump of the"
+" database and all course files (templates, configuration files, etc).  Each "
+"course can only have a single archive.  Creating an archive of a previously "
+"archived course will delete the old archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:36
 msgid "Select a course to delete."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:946
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:20
+msgid ""
+"Select a course to delete.  Warning, all data will be deleted and this "
+"cannot be undone.  This will not delete any course archives."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:14
 msgid ""
 "Select a course to rename.  The courseID is used in the url and can only "
 "contain alphanumeric characters and underscores. The course title appears on"
 " the course home page and can be any string."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2475
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:13
 msgid "Select a course to unarchive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1914
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3684
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:21
 msgid "Select a listing format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1442
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1478
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:18
+msgid "Select action:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:10
 msgid "Select all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2703
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:12
 msgid "Select all eligible courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2731
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:26
 msgid "Select all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1967
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:10
 msgid "Select all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:315
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:509
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:536
-msgid "Select an action to perform"
-msgstr "Sélectionner une action à effectuer"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3063
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:10
 msgid "Select an action to perform:"
 msgstr "Sélectionner une action à effectuer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1956
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:20
+msgid ""
+"Select an archive to restore.  You cannot restore an archive into an "
+"existing course. Instead, either rename or delete the old course, or restore"
+" the archive with a new name.  When restoring a course with a new name, the "
+"name is used as the course ID, and must contain only letters, numbers, "
+"hyphens, and underscores, and may have at most 40 characters."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:36
 msgid "Select course(s) to archive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3731
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:44
 msgid "Select course(s) to hide or unhide."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:7
 msgid "Select import file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:14
 msgid ""
 "Select one or more sets and one or more users below to assign/unassign each "
 "selected set to/from all selected users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:94
 msgid "Select sets below to assign them to the newly-created users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3666
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:20
+msgid ""
+"Select the course to change its Course ID, Course Title, or Institution.  "
+"Note that changing a course's ID will change the URL of all links to the "
+"course, and could break links from external sites such as an LMS."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:4
 msgid ""
 "Select the course(s) you want to hide (or unhide) and then click \"Hide "
 "Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
@@ -5437,133 +7247,230 @@ msgid ""
 "full URL address for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:488
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:20
+msgid ""
+"Select the course(s) you want to hide (or unhide) and then click \"Hide "
+"Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
+"does no harm (the action is skipped). Likewise unhiding a course that is "
+"already visible does no harm (the action is skipped). Hidden courses are "
+"still active but are not listed in the list of WeBWorK courses on the "
+"opening page. To access the course, an instructor or student must know the "
+"full URL address for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:93
+msgid "Select the display mode used to render the problems on this page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:11
 msgid ""
 "Select the homework sets for which to generate hardcopy versions. You may "
 "also select multiple users from the users list. You will receive hardcopy "
 "for each (set, user) pair."
 msgstr "Sélectionnez les devoirs pour lesquels vous voulez générer une version copie papier. Vous pouvez aussi selectionner plisieurs utilisateurs dans la liste. Vous allez reçevoir une copie papier pour chaque pair (devoir, utilisateur)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:238
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:30
+msgid ""
+"Select the sets you want scored, choose the name of the export file you want"
+" to use (by default: %1), and then click the \"Score Selected Set(s) and "
+"save to\" button."
+msgstr ""
+
+#. ('<code>ful.csv</code>','<code>scr.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:49
+msgid ""
+"Select this if you want to save the scores for each set in a separate file "
+"in addition to saving all scores to a cumulative file. After clicking the "
+"\"Score Selected Set(s) and save to\" button, you will get a pair of links "
+"for each selected set. The file that ends with %1 contains the number of "
+"correct and incorrect tries about each individual problem for each student. "
+"The file that ends with %2 is a summary of each problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:19
 msgid ""
 "Select user(s) and/or set(s) below and click the action button of your "
 "choice."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2885
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:85
+msgid ""
+"Select which assignment types (homework, tests, just-in-time) the "
+"achievement is evaluated."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:20
+msgid ""
+"Select which courses to upgrade from a previous version of WeBWorK.  The "
+"upgrade process can add missing database columns, delete unused database "
+"columns, and check the course file structure.  Be sure to read over the "
+"changes before confirming the upgrade.  You may want to create an archive of"
+" the course before upgrading.  Only courses that need upgraded will be "
+"selectable."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:84
+msgid "Select your favorite theme for the large text window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:18
 msgid "Select/unselect all fields missing in schema for deletion."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2873
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:9
 msgid "Select/unselect all tables missing in schema for deletion."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:23
 msgid "Selected sets:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:57
 msgid "Send E-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:839
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:83
 msgid "Send Email"
 msgstr "Envoyer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:702
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:69
+msgid "Send email to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:54
+msgid "Send emails to selected instructors."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:59
 msgid "Send to all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:717
-msgid "Send to the students selected below"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:64
+msgid "Send to selected students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:402
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:7
 msgid "Set"
 msgstr "Devoirs"
 
 #. ($newSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:614
 msgid "Set %1 has been created."
 msgstr ""
 
-#. ($newSetName,$userName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1944
+#. ($newSetName, $userName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:616
 msgid "Set %1 was assigned to %2"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1239
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:567
 msgid "Set %1 was assigned to %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:415
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:354
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:42
 msgid "Set Assigner"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:420
-msgid "Set Definition Filename"
-msgstr "Modifier le fichier de définition"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:17
+msgid "Set Assigner Help"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:45
 msgid "Set Definition Files"
 msgstr "Fichier de définition devoirs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2318
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2329
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:218
 msgid "Set Description"
 msgstr "Description du devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:17
+msgid "Set Detail Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:333
 msgid "Set Detail for set %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:93
 msgid "Set Header"
 msgstr "Entête du devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:323
+msgid "Set Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:218
 msgid "Set ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:267
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:114
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:3
 msgid "Set Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2744
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:19
 msgid "Set List"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1111
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1209
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1320
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:164
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:262
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:353
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:448
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:546
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:659
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:776
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:895
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:995
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:762
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:809
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:7
 msgid "Set Name"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:186
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:18
+msgid "Set closes on %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:45
+msgid "Set definition (\".def\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:20
+msgid "Set is closed."
+msgstr ""
+
+#. ($c->formatDateTime($set->reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:16
+msgid "Set is due on %1."
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:14
+msgid "Set opens on %1."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:188
 msgid "Set random seed to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2029
+#: /opt/webwork/webwork2/conf/defaults.config:1930
 msgid ""
 "Set to true for log to mean base 10 log and false for log to mean natural "
 "logarithm."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2049
+#: /opt/webwork/webwork2/conf/defaults.config:1950
 msgid ""
 "Set to true to allow students to enter Unicode versions of some characters "
 "(like U+2212 for the minus sign) in their answers.  One reason to allow this"
@@ -5572,7 +7479,7 @@ msgid ""
 "directory from the keyboard."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2019
+#: /opt/webwork/webwork2/conf/defaults.config:1920
 msgid ""
 "Set to true to display the \"Entered\" column which automatically shows the "
 "evaluated student answer, e.g., 1 if student input is sin(pi/2). If this is "
@@ -5581,7 +7488,7 @@ msgid ""
 " answer."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2060
+#: /opt/webwork/webwork2/conf/defaults.config:1961
 msgid ""
 "Set to true to have Full Width Unicode character (U+FF01 to U+FF5E) "
 "converted to their ASCII equivalents (U+0021 to U+007E) automatically in "
@@ -5589,20 +7496,30 @@ msgid ""
 "automatically use Full Width characters for parentheses and commas."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:521
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:164
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:16
+msgid "Set values"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/siblings.html.ep:4
 msgid "Sets"
 msgstr "Devoirs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:352
-msgid "Sets Assigned to User"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:322
+msgid "Sets assigned to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:343
-msgid "Sets assigned to %1"
+#. ($userName, $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:90
+msgid "Sets assigned to %1 (%2)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:17
+msgid "Sets assigned to student Help"
 msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:57
@@ -5616,189 +7533,241 @@ msgid ""
 "links from the LMS must be problem set specific. For example, "
 "<code>webwork.myschool.edu/webwork2/course-name/problem_set_name</code>. If "
 "the problem set name has space characters, they should be underscores in "
-"these addresses. If the problem set is a quiz, it must have this format: "
-"<code>webwork.myschool.edu/webwork2/course-"
-"name/quiz_mode/problem_set_name</code>. Also, to initialize the "
-"communication between WeBWorK and the LMS, the user must follow each of "
-"these external learning tools at least one time. Since there must be a "
-"separate external tool link for each problem set, this option requires more "
-"maintenance of the LMS course.</dd></dl>"
+"these addresses. Also, to initialize the communication between WeBWorK and "
+"the LMS, the user must follow each of these external learning tools at least"
+" one time. Since there must be a separate external tool link for each "
+"problem set, this option requires more maintenance of the LMS "
+"course.</dd></dl>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1458
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:55
+msgid "Sets the order in which achievements are listed and evaluated."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:625
 msgid "Sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:726
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:36
 msgid "Setting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1332
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:39
 msgid "Shift dates so that the earliest is"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:32
+msgid "Show"
+msgstr ""
+
 #. ($numchild)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1301
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:32
 msgid "Show %1 more like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:326
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:107
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:39
 msgid "Show Correct Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:22
 msgid "Show Date & Size"
 msgstr "Voir la date et la taille"
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:86
 msgid "Show LTI parameters (for debugging)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:620
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:34
 msgid "Show Me Another"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2518
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2412
+#. ($exhausted)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:69
+msgid "Show Me Another %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1642
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:711
 msgid "Show Past Answers"
 msgstr "Afficher les réponses précédentes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:703
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:41
+msgid "Show Problem Source File"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:132
 msgid "Show Problem Source File:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
 msgid "Show Problems on Finished Tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
-msgid "Show Scores on Finished Assignments?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+msgid "Show Scores on Finished Tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2416
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:630
 msgid "Show Solutions"
 msgstr "Afficher les solutions"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/conf/defaults.config:1538
 msgid "Show Total Homework Grade on Grades Page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1266
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:77
 msgid "Show all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1380
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:91
 msgid "Show all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2404
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:621
 msgid "Show correct answers"
 msgstr "Afficher les bonnes réponses"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1299
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+msgid "Show hints after"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:30
 msgid "Show less like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:337
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:387
 msgid "Show me another"
 msgstr ""
 
-#. ($exhausted)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1926
-msgid "Show me another %1"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:20
+msgid ""
+"Show past answers.  Students can only see their past answers, and they will "
+"not be able to see which parts are correct.  Instructors can use the form to"
+" select any combination of users, sets, and problems to view.  The table "
+"below will list the past answers colored according to correctness (green is "
+"correct).  Use control + click to select multiple users, sets, or problems."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2428
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:639
 msgid "Show problem graders"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:105
 msgid "Show saved answers?"
 msgstr "Montrer les réponses enregistrés ?"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1860
+#: /opt/webwork/webwork2/conf/defaults.config:1762
 msgid ""
 "Show the correct answer to the current problem before re-randomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1862
+#: /opt/webwork/webwork2/conf/defaults.config:1764
 msgid ""
 "Show the correct answer to the current problem on the last attempt before a "
 "new version is requested."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:3
 msgid "Show which sets?"
 msgstr "Afficher quels devoirs?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:690
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:3
 msgid "Show which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:382
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:475
-msgid "Show/Hide Site Description"
-msgstr "Afficher/masquer la description du site web"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:622
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:11
 msgid "Show:"
 msgstr "Afficher : "
 
-#. (scalar @{ $self->{visibleSetIDs} },			scalar @{ $self->{allSetIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:594
+#. (scalar @{ $c->{visibleSetIDs} },			scalar @{ $c->{allSetIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:115
 msgid "Showing %1 out of %2 sets."
 msgstr "%1 devoirs affichés sur un total de %2."
 
-#. (scalar @Users, scalar @{ $self->{allUserIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:610
+#. (scalar(keys %{ $c->{visibleUserIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:80
 msgid "Showing %1 out of %2 users"
 msgstr "%1 usagers affichés sur un total de %2."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:70
 msgid "Showing all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1355
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:81
 msgid "Showing all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:61
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:64
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:67
+#. ($c->{merge_file}, $ur->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:5
+msgid "Showing data from merge file %1 for user %2:"
+msgstr ""
+
+#. ($c->{merge_file})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:147
+msgid "Showing data from merge file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:61
+msgid "Showing problem for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:7
+msgid "Showing statistics for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:33
+msgid ""
+"Shows how many instructors and students have been assigned this problem set,"
+" out of the total number in the class. Clicking on this link allows you to "
+"assign the set to users, unassign this set from users, and to individually "
+"edit the assignment for specific users. For changing dates for individual "
+"users there are also shortcuts from the \"Instructor Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:63
 msgid "Site Information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:88
 msgid "Skip archiving this course"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2080
+#: /opt/webwork/webwork2/conf/defaults.config:1981
 msgid "Skip explanation essay answer fields"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1556
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1557
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:81
+msgid "Snippets of PG code illustrating specific techniques"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1514
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1515
 msgid "Solution:"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1555
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1513
 msgid "Solution: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:432
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:57
 msgid "Solutions"
 msgstr "Solutions"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1350
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:20
+msgid ""
+"Some OPL problems have been rated for difficulty/educational objective. The "
+"levels are loosely inspired by Bloom's taxonomy. They are assigned numbers "
+"from 1 to 6 as follows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:185
 msgid ""
 "Some WeBWorK problems are programmed using what are called <i>Math "
 "Objects</i>. These problems are preferred by some people because they "
@@ -5806,18 +7775,18 @@ msgid ""
 "particularly for answers which are way off base."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:379
 msgid "Some answers will be graded later."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:60
 msgid ""
 "Some of these files are directories. Only delete directories if you really "
 "know what you are doing. You can seriously damage your course if you delete "
 "the wrong thing."
 msgstr "Certains de ces fichiers sont des répertoires. Supprimer seulement des répertoires si vous savez vraiment ce que vous faites. Vous pouvez endommager sérieusement votre cours si vous supprimez la mauvaise chose."
 
-#: /opt/webwork/webwork2/conf/defaults.config:2082
+#: /opt/webwork/webwork2/conf/defaults.config:1983
 msgid ""
 "Some problems have an explanation essay answer field, typically following a "
 "simpler answer field. For example, find a certain derivative using the "
@@ -5829,7 +7798,7 @@ msgid ""
 "grading."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2186
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:83
 msgid ""
 "Some problems shown above represent multiple similar problems from the "
 "database.  If the (top) information line for a problem has a letter M for "
@@ -5839,309 +7808,405 @@ msgid ""
 "again."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1612
-msgid ""
-"Some servers handle courses taking place in different timezones.  If this "
-"course is not showing the correct timezone, enter the correct value here.  "
-"The format consists of unix times, such as "
-"\"America/New_York\",\"America/Chicago\", \"America/Denver\", "
-"\"America/Phoenix\" or \"America/Los_Angeles\". Complete list: <a "
-"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:529
-msgid ""
-"Something was wrong with your LTI parameters.  If this recurs, please speak "
-"with your instructor"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:50
 msgid "Sort"
 msgstr "Trier"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:751
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:814
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:4
 msgid "Sort by"
 msgstr "Trier selon"
 
 #. ($names{$primary}, $names{$secondary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:817
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:324
 msgid "Sort by %1 and then by %2"
 msgstr "Trier selon %1 et ensuite selon %2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:171
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:115
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:3
 msgid "Sort:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:51
+msgid "Sorts the lists displayed by due date, name, etc."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:363
 msgid "Source File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1586
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1612
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1555
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1593
 msgid ""
 "Source file paths cannot include .. or start with /: your source file path "
 "was modified."
 msgstr "Le chemin de fichier source ne peut pas inclure .. ou commencer par /: le chemin a été modifié."
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:11
 msgid ""
 "Specify an ID, title, and institution for the new course. The course ID may "
 "contain only letters, numbers, hyphens, and underscores, and may have at "
 "most %1 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:661
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:94
+msgid ""
+"Spell check the text of the file that your are editing. Note that there will"
+" be many spelling errors in the code parts of your file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:116
+msgid "Standard Deviation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:162
 msgid "Start"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:609
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:47
+msgid "Start LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:130
 msgid "Start New Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:443
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:94
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:508
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:84
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:54
 msgid "Statistics"
 msgstr "Statistiques"
 
-#. ($self->{ce}{courseName} =~ s/_/ /gr,                   CGI::span({ dir =>
-#. 'ltr' }, format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:73
-msgid "Statistics for %1 set %2. Closes %3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:17
+msgid "Statistics Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:86
+msgid "Statistics for %1"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:90
+msgid "Statistics for %1 problem %2"
 msgstr ""
 
-#. ($self->{ce}{courseName}, $self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:68
-msgid "Statistics for %1 student %2"
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:84
+msgid "Statistics for student %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2089
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1442
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1524
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2020
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:296
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:659
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:806
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:191
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:192
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:442
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:151
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:160
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:36
 msgid "Status"
 msgstr "Statut"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:29
 msgid "Stop Acting"
 msgstr "Cesser de jouer le rôle"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2251
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:85
 msgid "Stop Archiving"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2418
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1153
 msgid "Stop archiving courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:233
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:783
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2011
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:295
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:829
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:887
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:916
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:30
 msgid "Student ID"
 msgstr "Numéro de l'étudiant"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:9
+msgid "Student ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:37
 msgid "Student Name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:570
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:428
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:56
 msgid "Student Progress"
 msgstr "Progrès des étudiants"
 
-#. ($self->{ce}->{courseName},                     CGI::span({ dir => 'ltr' },
-#. format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:81
-msgid "Student Progress for %1 set %2. Closes %3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:17
+msgid "Student Progress Help"
+msgstr ""
+
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:72
+msgid "Student Progress for %1"
 msgstr ""
 
-#. ($self->{ce}->{courseName}, $self->{studentName})
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($c->stash('setID')
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:76
-msgid "Student Progress for %1 student %2"
+msgid "Student Progress for set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:628
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:80
 msgid "Student answers"
 msgstr "Réponses de l'étudiant"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:766
-msgid "Subject:"
-msgstr "Sujet:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:80
+msgid ""
+"Student scores for the sets selected below will be calculated. This and "
+"other scoring operations can also be done using the \"Scoring Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:87
+msgid "Student:"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:653
-msgid "Subject: "
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:124
+msgid "Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:222
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:50
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:8
+msgid "Subject:"
+msgstr "Sujet:"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:30
 msgid "Submission time:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:226
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:41
 msgid "Submit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:26
 msgid "Submit Answers"
 msgstr "Soumettre les réponses"
 
 #. ($effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1861
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:23
 msgid "Submit Answers for %1"
 msgstr "Soumettre ses réponses de %1"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:502
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:525
 msgid "Submit your answers again to go on to the next part."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:775
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:183
 msgid "Success Index"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:106
+msgid ""
+"Success index is the square of the average score divided by the average "
+"number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:73
+msgid ""
+"Success index is the square of the score divided by the number of attempts."
+msgstr ""
+
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1086
 msgid "Successfully archived the course %1."
 msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:885
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:422
 msgid "Successfully created new achievement %1"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1252
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:581
 msgid "Successfully created new set %1"
 msgstr "Création réussie du nouveau devoir %1"
 
 #. ($add_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:465
 msgid "Successfully created the course %1"
 msgstr ""
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1818
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2401
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1131
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:900
 msgid "Successfully deleted the course %1."
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1529
+#. ($rename_oldCourseID,							$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:772
 msgid "Successfully renamed the course %1 to %2"
 msgstr ""
 
 #. ($unarchive_courseID, $new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2653
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1286
 msgid "Successfully unarchived %1 to the course %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2099
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4280
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:89
+msgid "TA:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2274
 msgid "Table defined in database but missing in schema"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2097
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2269
 msgid "Table defined in schema but missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2265
 msgid "Table is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3200
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3490
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:276
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:576
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:106
 msgid "Take Action!"
 msgstr "Effectuer l'action!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Target Set:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:63
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:42
 msgid "TeX Source"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:784
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:258
+msgid "Test %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:54
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:52
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:55
+msgid "Test Name"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:156
 msgid "Test Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:224
 msgid "Test Time Limit (min; 0=Close Date)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2041
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:238
 msgid "Test Time Notification"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:156
 msgid "Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:244
 msgid "Test not yet submitted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:317
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:920
+msgid "Test parameters"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:149
 msgid "Test/quiz with time limit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:79
 msgid "Text"
 msgstr "Texte"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:842
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:80
+msgid "Text Editor Options"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:55
 msgid "Text chapter:"
 msgstr "Chapitre du texte:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:864
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:66
 msgid "Text section:"
 msgstr "Section du texte:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:44
 msgid "Textbook:"
 msgstr "Livre:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1403
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:58
 msgid ""
-"The Attempts figure is the global average of the number of attempts (both "
-"correct and incorrect) individuals take on this problem.  A high figure may "
-"represent a difficult problem.  Note that problems with multiple parts may "
+"The \"Edit Target Set\" button at the top of the page will take you to the "
+"Problem Set Editor which will allow you to edit dates, assign users and "
+"other information about the problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:115
+msgid ""
+"The \"Score\" tab will export achievement data to a CSV file that can be "
+"downloaded.  The export contains the global data including number of "
+"achievement points and current level of each student.  In addition for each "
+"selected achievement, a column for if the achievement was earned (1) or not "
+"earned (0) will be added to the CSV."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:194
+msgid ""
+"The <strong>Assigned sets</strong> column (x/y) indicates that x sets out of"
+" y sets avaiable have been assigned to this student. Click this link to "
+"assign or unassign sets to this student, to adjust due dates, or to adjust "
+"the grades on a homework set for a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:20
+msgid ""
+"The <strong>Set Detail</strong> page can be viewed in one of two distinct "
+"modes:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:189
+msgid ""
+"The <strong>login name</strong> column links allow you to \"act as\" a "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:191
+msgid ""
+"The <strong>pencil</strong> in the login column allows you to edit that "
+"student's data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:64
+msgid ""
+"The Attempts figure is the global average of the number of attempts (both "
+"correct and incorrect) individuals take on this problem.  A high figure may "
+"represent a difficult problem.  Note that problems with multiple parts may "
 "have higher average attempts since many students  will submit an answer to "
 "each part before continuing and each such  submittal counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1485
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:124
 msgid ""
 "The Attempts figure is the local average of the number of attempts (both "
 "correct and incorrect) individuals at your institution take on this problem."
@@ -6151,14 +8216,14 @@ msgid ""
 "counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1819
+#: /opt/webwork/webwork2/conf/defaults.config:1721
 msgid ""
 "The Maximum number of times Show me Another can be used per problem by a "
 "student. If set to -1 then there is no limit to the number of times that "
 "Show Me Another can be used."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1787
+#: /opt/webwork/webwork2/conf/defaults.config:1689
 msgid ""
 "The Reduced Scoring Period is the default period before the due date during "
 "which all additional work done by the student counts at a reduced rate. When"
@@ -6171,7 +8236,7 @@ msgid ""
 "work done counts 50% of the original.\" will be displayed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:78
 msgid ""
 "The Status figure is the global average of the Status individuals have "
 "earned on this problem. The Status is the percentage correct (from 0% to "
@@ -6180,7 +8245,7 @@ msgid ""
 "a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1506
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:138
 msgid ""
 "The Status figure is the local average of the Status individuals at your "
 "institution have earned on this problem. The Status is the percentage "
@@ -6189,47 +8254,61 @@ msgid ""
 "students will work on a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1262
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:11
 msgid "The WeBWorK Project"
 msgstr "Le projet WeBWorK"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:822
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:25
+msgid ""
+"The WeBWorK administrators need to be added to the course in order for them "
+"to access the course.  Unchecking this option will make it so WeBWorK "
+"administrators cannot directly login to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:129
+msgid ""
+"The achievement evaluator is the perl code that is run after each submit to "
+"determine if an achievement is earned or not.  Click on the \"Edit "
+"Evaluator\" link to edit the evaluator."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:26
 msgid ""
 "The adjusted status of a problem is the larger of the problem's status "
 "andthe weighted average of the status of those problems which count towards "
 "the parent grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1677
+#: /opt/webwork/webwork2/conf/defaults.config:1579
 msgid ""
 "The amount of time (in minutes) after the due date that the Answers are "
 "available to student to view.  You can change this for individual homework, "
 "but WeBWorK will use this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1667
+#: /opt/webwork/webwork2/conf/defaults.config:1569
 msgid ""
 "The amount of time (in minutes) before the due date when the assignment is "
 "opened.  You can change this for individual homework, but WeBWorK will use "
 "this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:386
 msgid "The answer above is NOT correct."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:375
 msgid "The answer above is correct."
 msgstr "La réponse ci-dessus est correcte."
 
 #. ($filename, $ce->{mail}{maxAttachmentSize})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:230
 msgid ""
 "The attached file \"%1\" exceeds the allowed attachment size of "
 "%quant(%2,megabyte)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:421
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:496
 msgid ""
 "The child problems for this problem will become visible to the student when "
 "they either have more incorrect attempts than is specified here, or when "
@@ -6238,173 +8317,252 @@ msgid ""
 "attempts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:704
+#. ('href="http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files"
+#. target="Webworkdocs"',
+#. '<code>demoCourse.lst</code>','<code>.csv</code>','<code>.lst</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:59
+msgid ""
+"The classlist files are stored in the templates directory and provide a "
+"convenient way to enter a large number of students into your class. To view "
+"the format for <strong>ClassList files</strong> see the <a %1>ClassList "
+"specification</a> or download the %2 file and use it as a model. ClassList "
+"files can be prepared using a spreadsheet and then saved as %3 (comma "
+"separated values) text files.  However, to access as a classlist file, the "
+"file suffix needs to be changed to %4, which can be done with the \"Rename\""
+" button."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:16
 msgid ""
 "The configuration module did not find the data it needs to function.  Have "
-"your site administrator check that Constants.pm is up to date."
-msgstr "Le module de configuration n'a pas trouvé les données dont il a besoin pour fonctionner. Demandez à votre administrateur du site pour que Constants.pm soit à jour."
+"your site administrator check that site configuration files are up to date."
+msgstr ""
+
+#. ($archive_courseID,					$archive_path)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:80
+msgid ""
+"The course \"%1\" has already been archived at \"%2\". This earlier archive "
+"will be erased.  This cannot be undone."
+msgstr ""
 
-#. (CGI::b($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:151
+#. (tag('strong', stash('courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:8
 msgid ""
 "The course %1 uses an external authentication system (%2). Please go there "
 "to log in again."
 msgstr ""
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:186
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:17
 msgid ""
 "The course %1 uses an external authentication system (%2). Please return to "
 "that system to access this course."
 msgstr ""
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:191
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:23
 msgid ""
 "The course %1 uses an external authentication system (%2). You've "
 "authenticated through that system, but aren't allowed to log in to this "
 "course."
 msgstr ""
 
-#. ($archive_courseID,						$archive_path)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2243
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:30
+msgid "The course database must be upgraded before archiving this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:30
+msgid "The course database must be upgraded before renaming this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:26
 msgid ""
-"The course '%1' has already been archived at '%2'. This earlier archive will"
-" be erased.  This cannot be undone."
+"The current mode should be made clear by the information at the top of the "
+"page."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1995
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:46
+msgid ""
+"The current value of the achievement counter. Changes to this variable will "
+"be saved."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1897
 msgid "The default display mode"
 msgstr "Le mode d'affichage par défaut"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1855
+#: /opt/webwork/webwork2/conf/defaults.config:1757
 msgid ""
 "The default number of attempts before the problem is re-randomized. ( 0 => "
 "never )"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1854
+#: /opt/webwork/webwork2/conf/defaults.config:1756
 msgid ""
 "The default number of attempts between re-randomization of the problems ( 0 "
 "=> never)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:251
-msgid "The directory you specified doesn't exist"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:73
+msgid ""
+"The description shown to students which states what action is needed to earn"
+" the achievement."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1829
-msgid "The display was already cleared."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:5
+msgid "The directory you specified doesn't exist"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2111
+#: /opt/webwork/webwork2/conf/defaults.config:2032
 msgid ""
 "The e-mail verbosity level controls how much information is automatically "
-"added to feedback e-mails.  Levels are<ol><li value=\"Simple\"> Simple: send"
-" only the feedback comment and context link</li><li value=\"Standard\"> "
-"Standard: as in Simple, plus user, set, problem, and PG data</li><li "
-"value=\"Debug\"> Debug: as in Standard, plus the problem environment "
-"(debugging data)</li></ol>"
+"added to feedback e-mails.  Levels are<ol><li> Simple: send only the "
+"feedback comment and context link</li><li> Standard: as in Simple, plus "
+"user, set, problem, and PG data</li><li> Debug: as in Standard, plus the "
+"problem environment (debugging data)</li></ol>"
 msgstr ""
 
-#. ($achievementName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:625
-msgid "The evaluator for %1 has been renamed to '%2'."
+#. ($achievementName,				$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:293
+msgid "The evaluator for %1 has been renamed to \"%2\"."
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:339
-msgid ""
-"The file %1/%2 already exists and cannot be overwritten. The message was not"
-" saved"
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:246
+msgid "The file \"%1\" cannot be found."
+msgstr ""
+
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:526
+msgid "The file \"%1\" cannot be read!"
+msgstr ""
+
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:522
+msgid "The file \"%1\" is a directory!"
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:190
-msgid "The file %1/%2 cannot be found."
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:259
+msgid "The file \"%1\" is a template. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:181
-msgid "The file %1/%2 is not readable by the webserver."
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:250
+msgid "The file \"%1\" is protected. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:373
-msgid "The file '%1' cannot be found."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:19
+msgid "The file $file does not appear to be a text or image file."
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1004
-msgid "The file '%1' cannot be read!"
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:277
+msgid ""
+"The file %1 already exists and cannot be overwritten. The message was not "
+"saved."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:380
-msgid "The file '%1' is a blank problem!"
+#. ("$emailDirectory/$openfilename",				$emailDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:156
+msgid ""
+"The file %1 cannot be found. Check whether it exists and whether the "
+"directory %2 can be read by the webserver. "
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:998
-msgid "The file '%1' is a directory!"
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
+msgid ""
+"The file %1 is not contained in the course templates directory and can not "
+"be modified."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:375
-msgid "The file '%1' is protected!"
+#. ("$emailDirectory/$openfilename")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:148
+msgid ""
+"The file %1 is not readable by the webserver. Check that it's permissions "
+"are set correctly."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:203
 msgid "The file does not appear to be a text file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:88
 msgid "The file you are trying to download doesn't exist"
 msgstr ""
 
 #. ($filename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:221
 msgid "The filetype of the attached file \"%1\" is not allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3843
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2149
 msgid "The following courses were successfully hidden:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3908
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2218
 msgid "The following courses were successfully unhidden:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4121
-msgid "The following upgrades are available for your WeBWorK system:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:34
+msgid "The following describes how the checkboxes alter the scoring output"
 msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2081
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:66
 msgid ""
 "The following users are NOT assigned to this set and will be ignored: %1"
 msgstr ""
 
-#. (join('.', @{$problemSeqs[$children_counts_indexs[0]]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:288
+msgid "The given file path is not a valid location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:49
+msgid "The goal value of the achievement counter."
+msgstr ""
+
+#. (join('.', @{ $problemSeqs[ $children_counts_indexs[0] ] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1334
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the score of problem %1."
 msgstr ""
 
-#. (join(', ', map({join('.', @{$problemSeqs[$_]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2064
+#. (join(', ', map({ join('.', @{ $problemSeqs[$_] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the weighted average of the problems: %1."
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1954
-msgid "The hardcopy header for set %1 has been renamed to '%2'."
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1078
+msgid "The hardcopy header for set %1 has been renamed to \"%2\"."
+msgstr ""
+
+#. ($showHintsAfter)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:36
+msgid ""
+"The hint shown is an instructor preview and will be shown to students after "
+"%quant(%1,attempt)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:32
+msgid ""
+"The hint shown is an instructor preview and will not be shown to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:22
+msgid ""
+"The information box on the right displays information about the course. This"
+" is useful for leaving course wide messages for students. It contains text "
+"from the file templates/course_info.txt. Instructors can edit this file from"
+" the web (click on the \"Edit\" link)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:30
 msgid ""
 "The initial value is the answer sub score for the answer that is currently "
 "shown.  If this is modified, it will be used to compute the total problem "
@@ -6412,37 +8570,100 @@ msgid ""
 "shown answer if the page is reloaded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:161
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:97
+msgid ""
+"The initial value is the currently saved score as a point value computed "
+"using the percent score.  This point value is used to compute the percent "
+"score (rounded to a whole percent) that can be saved."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:145
 msgid "The initial value is the currently saved score for this student."
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_oldCourseInstitution,
 #. $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
 msgid ""
 "The institution associated with the course %1 has been changed from %2 to %3"
 msgstr ""
 
-#. ($rename_newCourseID, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1498
+#. ($rename_newCourseID, $optional_arguments{courseInstitution})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:729
 msgid "The institution associated with the course %1 is now %2"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:599
+msgid ""
+"The instructor account with user id %1 does not exist.  Instructor accounts "
+"must be created manually."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:635
 msgid ""
 "The instructor account with user id %1 does not exist.  Please create the "
 "account manually via WeBWorK."
 msgstr ""
 
-#. ($r->param('new_set_name')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1897
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:87
+msgid ""
+"The key maps that are available are \"default\", \"emacs\", \"sublime\", and"
+" \"vim\". The \"default\" key map has the standard behavior of a browser "
+"text area. You can use Ctrl-C to copy, Ctrl-V to paste, Ctrl-F to search, "
+"etc. If you are more comfortable with the \"emacs\", \"sublime\", or \"vim\""
+" text editors then you may choose to use one of those key maps instead."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:75
+msgid "The large text window"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:27
+msgid ""
+"The list of files include regular files, directories (ending in a \"/\") and"
+" links (ending in a \"@\")."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:52
+msgid ""
+"The login name cannot be changed. (It is the primary key for the student's "
+"data.) If you make a mistake in the login name at the beginning of the "
+"course (before any work has been done) then it is best to simply add a new "
+"student with the correct entry and drop the student with the bad login name."
+" (See drop and delete students below.) If the login name must be changed "
+"after a user has started working assignments, then contact your system "
+"administrator, who can use the webwork2 \"bin/change_user_id\" script to "
+"change the user id."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:20
+msgid ""
+"The main page allows access to set and student statistics.  When selecting a"
+" student, their grades page is shown, which lists set totals and per problem"
+" grades for each set assigned to the student.  When selecting a set, various"
+" statistics and histograms are shown for the overall grades of students who "
+"are currently enrolled or auditing the course."
+msgstr ""
+
+#. ('href="http://webwork.maa.org/wiki" target="ww_wiki"',
+#. 'href="http://webwork.maa.org/wiki/Instructors" target="ww_wiki"')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:24
+msgid ""
+"The main page for WeBWorK documentation is the <a %1>webwork wiki</a> while "
+"specific help for instructors setting up a course are in the <a "
+"%2>instructors' section</a>."
+msgstr ""
+
+#. ($c->param('new_set_name')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:569
 msgid ""
 "The name \"%1\" is not a valid set name.  Use only letters, digits, dashes, "
 "underscores, periods, and spaces."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1530
+#: /opt/webwork/webwork2/conf/defaults.config:1432
 msgid ""
 "The name of course information file (located in the templates directory). "
 "Its contents are displayed in the right panel next to the list of homework "
@@ -6459,151 +8680,249 @@ msgid ""
 "go back to the LMS to access something in the WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:63
+msgid "The number of points earned for earning the achievement."
+msgstr ""
+
 #. ($openDate, $dueDate, $answerDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1104
 msgid ""
 "The open date: %1, close date: %2, and answer date: %3 must be defined and "
 "in chronological order."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:702
+#. ($path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:393
+msgid "The original path is not in a valid location. Using failsafe %1"
+msgstr ""
+
+#. ($forcedSourceFile)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:510
+msgid "The original path to the file is %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:262
 msgid "The password and password confirmation for the instructor must match."
 msgstr ""
 
-#. (CGI::b($r->maketext("[_1]'s Current Password", $user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:27
+msgid ""
+"The password can be any combination of letters, numbers and special symbols."
+" Students are encouraged to use all three, and stay away from dictionary "
+"words. The password should not be the same as any password used elsewhere, "
+"such as for an email account. The password will only be present on the page "
+"if the user has permission to change the password."
+msgstr ""
+
+#. ($c->tag(                                               'b',
+#. $c->maketext(                                                   "[_1]'s
+#. Current Password",
+#. $c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:95
 msgid ""
 "The password you entered in the %1 field does not match your current "
 "password. Please retype your current password and try again."
 msgstr ""
 
-#. (CGI::b($r->maketext("[_1]'s New Password",         $e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:105
+#. ($c->tag('b', $c->maketext("[_1]'s New Password",         $e_user_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:82
 msgid ""
 "The passwords you entered in the %1 and %2 fields don't match. Please retype"
 " your new password and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:789
-msgid "The path to the original file should be absolute"
-msgstr "Le chemin du fichier original devrait être décrit de manière absolue"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:374
+msgid "The path can not be the temporary edit directory."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:667
-msgid ""
-"The percentage of active students with correct answers for each problem"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:370
+msgid "The path to the original file should be absolute."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:131
 msgid ""
 "The percentage of students receiving at least these scores. The median score"
 " is in the 50% column."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:458
 msgid "The prerequisite conditions have not been met for set '%1'."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1917
-msgid "The problem set is not yet open"
-msgstr ""
-
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2012
-msgid "The recorded score for this version is  %1/%2."
+#. (q(down menu to change which student's seed and answers are shown.  Use the
+#. "Mark Correct" checkbox to set)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:26
+msgid ""
+"The problem is shown at the top with the seed and answers of the selected "
+"student.  Use the drop "
 msgstr ""
 
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2021
-msgid "The recorded score for this version is %1/%2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:62
+msgid "The problem set is not yet open"
 msgstr ""
 
 #. ($origReducedScoringDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1971
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1121
 msgid ""
 "The reduced credit date %1 in the file probably was generated from the Unix "
 "epoch 0 value and is being treated as if it was Unix epoch 0."
 msgstr ""
 
 #. ($openDate, $dueDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1982
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1135
 msgid ""
 "The reduced credit date should be between the open date %1 and close date %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1220
 msgid ""
 "The reduced scoring date should be between the open date and close date."
 msgstr ""
 
 #. ($tempFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:307
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:298
 msgid "The requested file \"%1\" does not exist on the server."
 msgstr ""
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2085
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1389
 msgid "The score for this problem can count towards score of problem %1."
 msgstr ""
 
-#. ($setName, $effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:306
-msgid "The selected problem set (%1) is not a valid set for %2"
-msgstr "Le devoir sélectionné (%1) n'est pas un devoir valide pour %2"
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:69
+msgid ""
+"The scoring files are stored in the scoring directory and are produced using"
+" the \"Scoring Tools\" page or the scoring command in the \"Instructor "
+"Tools\" module. These files can be downloaded, modified in a spreadsheet "
+"(for example, to add midterm scores) and then uploaded again to the scoring "
+"directory to be merged with email messages. (Use a new file name, other than"
+" %1, when uploading to prevent the scoring module from overwriting an "
+"uploaded file.)"
+msgstr ""
 
-#. ($urlpath->arg("setID")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1467
-msgid "The selected problem set (%1) is not a valid set for %2%3:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:52
+msgid ""
+"The second row of the problem collection area is for browsing directories. "
+"The OPL will be there as well as any other directories that you may set up "
+"(for example Contrib). If this is selected, all subdirectories containing "
+"problems will be listed."
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1946
-msgid "The set header for set %1 has been renamed to '%2'."
+#. (stash('setID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet.html.ep:13
+msgid "The selected problem set (%1) is not a valid set for %2."
+msgstr ""
+
+#. ($setID, $effectiveUserID, $c->{invalidVersionCreation} ? " (acted as by
+#. $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:77
+msgid "The selected problem set (%1) is not a valid set for %2: %3"
+msgstr ""
+
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1066
+msgid "The set header for set %1 has been renamed to \"%2\"."
 msgstr ""
 
-#. ($newSetName)
 #. ($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1164
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:491
+msgid ""
+"The set name \"%1\" is already in use. Pick a different name if you would "
+"like to start a new set. No set created."
+msgstr ""
+
+#. ($newSetName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:584
 msgid ""
 "The set name '%1' is already in use.  Pick a different name if you would "
 "like to start a new set."
 msgstr ""
 
-#. ($setID, $editingSetVersion, $editForUser[0])
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2109
-msgid "The set-version (%1, version %2) is not assigned to user %3."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:58
+msgid ""
+"The sets checked below will be visible to students or hidden from students. "
+"Useful for preparing sets ahead of time, but not showing them to students; "
+"or for temporarily hiding a set which has a mistake in it while it is being "
+"fixed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:54
+msgid ""
+"The sets checked below will become available for editing the due dates and "
+"visibility."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:73
+msgid ""
+"The sets checked below will written to set definition files, to be saved for"
+" future use, or to be transferred to another course. The set definition "
+"files can be uploaded/downloaded using the \"File Manager\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:29
+msgid ""
+"The simple configuration file is the name of the configuration file created "
+"when using the \"Course Configuration\" page to configure course options.  "
+"This option sets if this configuration file is copied from the old course or"
+" not and instead use the server defaults."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:551
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:521
 msgid "The solution has been removed."
 msgstr ""
 
-#. ($fullSetName, $prettyProblemNumber, $self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1975
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:33
+msgid ""
+"The solution shown is an instructor preview and will only be shown to "
+"students after the due date."
+msgstr ""
+
+#. ($c->{fullSetID},
+#. $c->{prettyProblemNumber},
+#. $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1103
 msgid ""
-"The source file for 'set %1 / problem %2 has been changed from '%3' to '%4'"
+"The source file for \"set %1 / problem %2\" has been changed from \"%3\" to "
+"\"%4\"."
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2133
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1209
+msgid ""
+"The temporary file %1 is not contained in the course templates directory and"
+" can not be deleted."
+msgstr ""
+
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:689
+msgid ""
+"The temporary file %1 is not in the course templates directory and can not "
+"be deleted!"
+msgstr ""
+
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:349
 msgid ""
 "The test (which is version %1) may  no longer be submitted for a grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1927
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1042
 msgid ""
 "The text box now contains the source of the original problem. You can "
 "recover lost edits by using the Back button on your browser."
 msgstr "La boîte de saisie contient actuellement le code source du problème original. Les modifications perdues peuvent être récupérées en utilisant le bouton Précédent du navigateur web."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:214
+#. (			% . 'but the result will not be counted.')
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:23
 msgid ""
 "The time limit on this assignment was exceeded. The assignment may be "
-"checked, but the result will not be counted."
+"checked, "
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1657
+#: /opt/webwork/webwork2/conf/defaults.config:1559
 msgid ""
 "The time of the day that the assignment is due.  This can be changed on an "
 "individual basis, but WeBWorK will use this value for default when a set is "
@@ -6611,24 +8930,39 @@ msgid ""
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1443
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:689
 msgid "The title of the course %1 has been changed from %2 to %3"
 msgstr ""
 
-#. ($rename_newCourseID, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1491
+#. ($rename_newCourseID, $optional_arguments{courseTitle})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:722
 msgid "The title of the course %1 is now %2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:167
+msgid ""
+"The top number is the percent score on the problem.  A period (.) indicates "
+"a problem has not been attempted. The bottom number is the number of "
+"incorrect attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:25
+msgid ""
+"The total grade row at the bottom shows the total score and percent average "
+"over all open assignments.  The total grade row can be shown/hidden under "
+"general course configuration settings."
+msgstr ""
+
 #. ($enableReducedScoring)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1151
 msgid ""
 "The value %1 for enableReducedScoring is not valid; it will be replaced with"
 " 'N'."
 msgstr ""
 
 #. ($timeCap)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2032
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1209
 msgid ""
 "The value %1 for the capTimeLimit option is not valid; it will be replaced "
 "with '0'."
@@ -6636,81 +8970,90 @@ msgstr ""
 
 #. ($hideScore)
 #. ($hideScoreByProblem)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2023
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1178
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1189
 msgid ""
 "The value %1 for the hideScore option is not valid; it will be replaced with"
 " 'N'."
 msgstr ""
 
 #. ($hideWork)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1200
 msgid ""
 "The value %1 for the hideWork option is not valid; it will be replaced with "
 "'N'."
 msgstr ""
 
 #. ($relaxRestrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2045
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1235
 msgid ""
 "The value %1 for the relaxRestrictIP option is not valid; it will be "
 "replaced with 'No'."
 msgstr ""
 
 #. ($restrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2037
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1221
 msgid ""
 "The value %1 for the restrictIP option is not valid; it will be replaced "
 "with 'No'."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:46
+msgid "The visible name/title of the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:36
 msgid ""
 "The webwork server must be able to write to these directories. Please "
 "correct the permssion errors."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1537
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:83
+msgid "Theme"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1439
 msgid "Theme (refresh page after saving changes to reveal new theme.)"
 msgstr "Thème (rafraîchir la page après l'enregistrement des modifications pour révéler le nouveau thème.)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:109
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:5
 msgid "Theme:"
 msgstr ""
 
 # Context is "Sort by ____ Then by _____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:843
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:872
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:30
 msgid "Then by"
 msgstr "Ensuite selon"
 
-#. ($count_line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:603
+#. ($listingsCount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:52
 msgid "There are %1 matching WeBWorK problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1625
+#: /opt/webwork/webwork2/conf/defaults.config:1527
 msgid ""
 "There are currently two hardcopy themes to choose from: One Column and Two "
 "Columns.  The Two Columns theme is the traditional hardcopy format.  The One"
 " Column theme uses the full page width for each column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2979
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1519
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
 "least one table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1243
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:23
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
-"least one table.  They can only be removed when upgrading the course."
+"least one table.  They can be removed when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1404
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
 "least one table. Check the checkbox by the field to delete it when upgrading"
@@ -6718,63 +9061,48 @@ msgid ""
 "is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1508
 msgid "There are extra database tables which are not defined in the schema."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2833
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1389
 msgid "There are extra database tables which are not defined in the schema. "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:15
 msgid ""
 "There are extra database tables which are not defined in the schema.  These "
 "can be deleted when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:601
-msgid "There are no matching WeBWorK problems"
-msgstr "Il n'y a pas de problèmes de Webwork correspondant"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:976
-msgid "There are no set definition files in this course to look at."
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:29
+msgid "There are many options available at the bottom:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2199
-msgid ""
-"There are tables or fields missing from the database.  The database must be "
-"upgraded before archiving this course."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:49
+msgid "There are no completed versions of this test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4108
-msgid "There are upgrades available for the Open Problem Library."
-msgstr ""
-
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4072
-msgid ""
-"There are upgrades available for your current branch of PG from branch %1 in"
-" remote %2."
-msgstr ""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:51
+msgid "There are no matching WeBWorK problems"
+msgstr "Il n'y a pas de problèmes de Webwork correspondant"
 
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4010
-msgid ""
-"There are upgrades available for your current branch of WeBWorK from branch "
-"%1 in remote %2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:8
+msgid "There are no set definition files in this course to look at."
 msgstr ""
 
 #. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:273
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:87
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
 "their name, you destroy all of the data for achievement %1 for this student."
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:230
+#. (tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:91
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
@@ -6782,37 +9110,29 @@ msgid ""
 "student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:205
-msgid ""
-"There is NO undo for this function.  Do not use it unless you know what you "
-"are doing!  When you unassign sets using this button, or by unchecking their"
-" set names, you destroy all of the data for those sets for this student."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:234
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:68
 msgid "There is NO undo for unassigning a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:174
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:177
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:139
-msgid "There is NO undo for unassigning students."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4069
-msgid "There is a new version of PG available."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:125
+msgid ""
+"There is NO undo for unassigning sets. Do not do so unless you know what you"
+" are doing!  When you unassign sets by unchecking set names and clicking "
+"save, you destroy all of the data for those sets for this student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4007
-msgid "There is a new version of WeBWorK available."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:21
+msgid "There is NO undo for unassigning students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:529
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:490
 msgid "There is a written solution available."
 msgstr ""
 
 #. ($message_file, $merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:50
 msgid ""
 "There is no additional grade information.  A message about additional grades"
 " can go in [TMPL]/email/%1. It is merged with the file [Scoring]/%2. These "
@@ -6821,185 +9141,324 @@ msgid ""
 msgstr ""
 
 #. ($continueTimeLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:486
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:25
 msgid ""
 "There is no time remaining on the currently open test. Click continue below "
 "and then click \"Grade Test\" within %1 seconds to submit the test for a "
 "grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:856
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:65
 msgid "There is no undo for deleting files or directories!"
 msgstr "L'annulation n'es pas possibler pour la suppression de fichiers ou de répertoires!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:534
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:495
 msgid ""
 "There is no written solution available for this problem, but you can still "
 "view the correct answers."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:537
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:498
 msgid "There is no written solution available for this problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1539
-msgid ""
-"There is one main theme to choose from: math4. It has two variants, "
-"math4-green and math4-red. The theme specifies a unified look and feel for "
-"the WeBWorK course web pages."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2270
+#: /opt/webwork/webwork2/conf/defaults.config:1441
 msgid ""
-"There may be something wrong with this question. Please inform your "
-"instructor including the warning messages below."
+"There is one main theme to choose from: math4. It has three variants: "
+"math4-green, math4-red, and math4-yellow. The theme specifies a unified look"
+" and feel for the WeBWorK course web pages."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:441
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator if this recurs."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:284
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:307
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:475
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:484
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:511
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:543
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:219
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:354
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:492
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:536
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:575
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:172
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:189
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:212
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:227
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:365
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:447
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1935
+#. ('href="https://webwork.maa.org/wiki/Set_Definition_Files"
+#. target="Webworkdocs"')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:48
+msgid ""
+"These are stored in the templates directory. The format of <strong>Set "
+"Definition files</strong> is described in the <a %1>Set Definition "
+"specification</a>. Set definition files are mainly useful for transferring "
+"set assignments from one course to another and are created when exporting a "
+"problem set from the \"Hmwk Sets Editor\".  Each set defintion file contains"
+" a list of problems used and the dates and times. These definitions can be "
+"imported into the current course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:77
+msgid ""
+"These are the files from which problems are generated and are located in the"
+" templates directory or in subdirectories. They can be edited directly using"
+" the \"Edit\" link on each problem page or from the \"Hmwk Sets Editor\". "
+"The File Manager allows you to upload or download these files. \tDirectories"
+" that start with \"set\" contain pg files and are generated when exporting a"
+" problem set in which there are local versions of a problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:40
+msgid ""
+"These options will only be shown if the user has the permission to change "
+"display settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:44
+msgid ""
+"These problems require some application of algorithms, but do not rise to "
+"the level of a full word problem. For example, \"Identify the local extrema "
+"for f(x) = ...\". One has to apply algorithms and interpret results."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1837
 msgid ""
 "These users and higher get the \"Show Past Answers\" button on the problem "
 "page."
 msgstr "Ces utilisateurs et supérieur peuvent voir le \"Voir les anciennes réponses\" sur la page du problème."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:17
 msgid "This action can take a long time if there are many students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:168
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:12
 msgid "This action will not overwrite existing users."
 msgstr ""
 
-#. (CGI::b($r->maketext("Guest Login")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:279
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:20
+msgid ""
+"This allows for the viewing, downloading, uploading and other management of "
+"files in the course.  Select a file or set of files (using CTRL or SHIFT) "
+"and click the desired button on the right.  Many actions can only be done "
+"with a single file (like view). Selecting a directory or set of files and "
+"clicking \"Make Archive\" creates a compressed tar file with the name "
+"COURSE_NAME.tgz"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:34
+msgid ""
+"This browses the Open Problem Library (OPL) in category "
+"(Subject/Chapter/Section) form. Select the desired categories (all three do "
+"not need to be selected) and click \"View Problems\". If the \"Include "
+"Contrib\" box is selected then those problems in the Contrib section of the "
+"OPL that have the categories defined are also included. Contrib problems are"
+" problem that haven't been vetted as thoroughly as OPL problems. If you want"
+" hints or solutions included while browsing select the appropriate box."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:49
+msgid ""
+"This button is also present both at top and the bottom of the page. Discards"
+" all changes, reloading the page by re-reading the database information for "
+"this set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:39
+msgid ""
+"This button is present both at top and the bottom of the page. Any and all "
+"changes made to any part of the set will be saved with one important "
+"exception: When editing the set for one or more students, you can choose to "
+"override the default value (defined for the set in general) by clicking on "
+"the checkbox and providing a value (or possibly leaving blank) and checking "
+"the override checkbox. If you do <strong>NOT</strong> check the checkbox, "
+"the override value will be discarded and the default value for the set will "
+"be used for the users currently being edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:105
+msgid ""
+"This can computed from the answer sub scores above using the weights shown "
+"if they are modified.  Alternatively, enter the point score you want saved "
+"here (the above sub scores will be ignored)."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2005
+msgid ""
+"This configures if the single problem manual grader has inputs to enter "
+"problem scores as a percent, a point value, or both. Note, the problem score"
+" is always saved as a percent, so when using a point value, the problem "
+"score will be rounded to the nearest whole percent."
+msgstr ""
+
+#. (tag('b', maketext('Guest Login')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:72
 msgid ""
 "This course supports guest logins. Click %1 to log into this course as a "
 "guest."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:851
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:58
+msgid ""
+"This determines if MathQuill answer blanks are enable for the user. This "
+"option is only present if MathQuill is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:63
+msgid ""
+"This determines if the MathView equation editor button will be appended to "
+"text answer blanks. his option is only present if MathView is enabled for "
+"the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:52
+msgid ""
+"This determines whether or not saved past answers are automatically filled "
+"in to the problem form when a student returns to a problem after having left"
+" the problem. This option is only visible if the user has the permission to "
+"show old answers."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:85
+msgid ""
+"This directory is accessible from the web. You can use it to store html "
+"documents or image documents that are used by the course. Do not store "
+"private information in this directory or in any subdirectory thereof. These "
+"documents can be linked to from within problems using the htmlLink macro."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:255
+msgid "This file is a template. You may use \"Save As\" to create a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:20
+msgid ""
+"This form can assign, unassign, and edit user data for a single achievement."
+"  You can assign the achievement to all current users or select which users "
+"to assign the achievement to and click Save.  You can unassign the "
+"achievement by unchecking a student's name (note all data will be deleted)."
+"  To unassign the achievement from all users, first select \"Allow "
+"unassign\" and then click the \"Unassign from All Users\" button. You can "
+"also toggle the earned status with the checkbox in the \"Earned\" column and"
+" edit the achievement counter for counting achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:19
+msgid ""
+"This gives the status and dates of the main set. Indvidual students may have"
+" different settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:51
 msgid "This homework set contains no problems."
 msgstr "Ce devoir ne contient aucun problème."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1231
 msgid "This homework set is closed."
 msgstr "Ce devoir n'est plus disponible."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1986
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1229
 msgid "This homework set is not yet open."
 msgstr "Ce devoir n'est pas encore disponible."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:932
-msgid ""
-"This is a blank problem template file and can not be edited directly. Use "
-"the 'NewVersion' action below to create a local copy of the file and add it "
-"to the current problem set."
-msgstr ""
-
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:423
 msgid "This is a new (re-randomized) version of the problem."
 msgstr ""
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:580
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:109
 msgid ""
 "This is a timed test. You will have %quant(%1,hour) and %quant(%2,minute) to"
 " complete the test."
 msgstr ""
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:592
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:119
 msgid ""
 "This is a timed test. You will have "
 "%quant(%1,hour,hours,)%quant(%2,minute,minutes,) to complete the test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:284
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:81
 msgid ""
-"This is the Achievement Editor.  It is used to edit the achievements "
-"available to students.  Please keep in mind the following facts: Achievments"
-" are displayed, and evaluated, in the order they are listed. The \"secret\" "
-"category creates achievements which are not visible to students until they "
-"are earned.  The \"level\" category is used for the achievements associated "
-"to a users level."
+"This is done by first entering the user as a student and then changing the "
+"permission level of the user. First edit the user by clicking on the pencil "
+"next to their name (or using the technique above for several users), then "
+"change their permssion level -- an entry blank at the far right of the "
+"screen, you may have to scroll to see it. The permission levels are"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:481
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:156
 msgid ""
-"This is the classlist editor page, where you can view and edit the records "
-"of all the students currently enrolled in this course.  The top of the page "
-"contains forms which allow you to filter which students to view, sort your "
-"students in a chosen order, edit student records, give new passwords to "
-"students, import/export student records from/to external files, or "
-"add/delete students.  To use, please select the action you would like to "
-"perform, enter in the relevant information in the fields below, and hit the "
-"\"Take Action!\" button at the bottom of the form.  The bottom of the page "
-"contains a table containing the student usernames and their information. "
-"Clicking on the links in the column headers of the table will sort the table"
-" by the field it corresponds to. The Login Name fields contain checkboxes "
-"for selecting the user.  Clicking the link of the name itself will allow you"
-" to act as the selected user.  There is also an edit link following the name"
-" which will take you to a page where you can edit the selected user's "
-"information.  Clicking the emails will allow you to email the corresponding "
-"user.  Clicking the links in the entries in the assigned sets columns will "
-"take you to a page where you can view and reassign the sets for the selected"
-" user. "
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page if you wish to assign a homework set to all students or a large group "
+"of students (e.g. a section)."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1810
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:161
 msgid ""
-"This is the default number of attempts before show me another becomes "
-"available to students.  It can be set to -1 to disable show me another by "
-"default."
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:171
+msgid ""
+"This is done from the \"Hmwk Sets Editor\" page or the \"Instructor tools\" "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:71
+msgid ""
+"This is most easily done by importing a class list. The class list can be "
+"uploaded from your workstation to the server using the File Manager page. "
+"The class list must be a file ending in .lst and must have a specific <a "
+"href=\"http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files\">format</a>."
+" Once the file has been uploaded to the server the file will appear in the "
+"import action pop-up list (5th action). demoCourse.lst is available for most"
+" courses and adds the \"practice users\" which activate guest logins to the "
+"class list."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:456
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:23
 msgid ""
-"This is the homework sets editor page where you can view and edit the "
-"homework sets that exist in this course and the problems that they contain. "
-"The top of the page contains forms which allow you to filter which sets to "
-"display in the table, sort the sets in a chosen order, edit homework sets, "
-"publish homework sets, import/export sets from/to an external file, score "
-"sets, or create/delete sets.  To use, please select the action you would "
-"like to perform, enter in the relevant information in the fields below, and "
-"hit the \"Take Action!\" button at the bottom of the form.  The bottom of "
-"the page contains a table displaying the sets and several pieces of relevant"
-" information. The Edit Set Data field in the table contains checkboxes for "
-"selection and a link to the set data editing page.  The cells in the Edit "
-"Problems fields contain links which take you to a page where you can edit "
-"the containing problems, and the cells in the edit assigned users field "
-"contains links which take you to a page where you can edit what students the"
-" set is assigned to."
+"This is the administration course which is used to manage courses on this "
+"server.  Use the \"Admin Menu\" to select the desired action."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1699
+#: /opt/webwork/webwork2/conf/defaults.config:1996
+msgid ""
+"This is the default number of attempts a student must make before hints will"
+" be shown to the student. Set this to -1 to hide hints.  Note that this can "
+"be overridden with a per problem setting."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1712
+msgid ""
+"This is the default number of attempts before show me another becomes "
+"available to students.  It can be set to -1 to disable show me another by "
+"default."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1601
 msgid ""
 "This is the number of achievement points given to each user for completing a"
 " problem."
 msgstr "Ceci est le nombre de points pour les objectifs donnés à chaque utilisateur pour avoir rempli un problème."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:166
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:150
 msgid ""
 "This is the only part of the score that is actually saved. This is computed "
 "from the answer sub scores above using the weights shown if they are "
@@ -7007,142 +9466,314 @@ msgid ""
 " scores will be ignored)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:388
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:19
+msgid "This is the standard entry point for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:92
+msgid ""
+"This is where email messages and templates are saved. You can upload or "
+"download files in this directory if you wish to save the files for later."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:77
 msgid ""
-"This is the past answer viewer.  Students can only see their answers, and "
-"they will not be able to see which parts are correct.  Instructors can view "
-"any users answers using the form below and the answers will be colored "
-"according to correctness."
+"This is where you edit the text of the problem template. Type Ctrl-Enter "
+"while this window has focus to re-render the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2462
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:669
 msgid ""
 "This is your last submission.  If you say yes, then your answers will be "
 "final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2466
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:673
 msgid ""
 "This is your only submission.  If you say yes, then your answers will be "
 "final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3038
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:42
+msgid ""
+"This link gives details for many macros. It links to documentation embedded "
+"in the macro files themselves."
+msgstr ""
+
+#. ('PGMLLab/PGML-lab.pg')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:63
+msgid ""
+"This links to a WeBWorK \"problem\" which allows you to try out fragments of"
+" PGML code. This link will not be available if the file %1 is not located in"
+" the templates directory of the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:33
+msgid "This links to a list of problem authoring techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:39
+msgid "This links to a page describing Math Object usage."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:72
+msgid "This links to problem authoring information on the WeBWorK wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:46
+msgid ""
+"This may be Mathjax, images, or plainText. Only the options that are enabled"
+" for the course will be available to select. This option is only visible if "
+"there is more than one display mode enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:42
+msgid "This option shows all pg problems in the course directory structure."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:47
+msgid ""
+"This option shows all problems in set definition files that are located in "
+"the course directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:44
+msgid ""
+"This option shows all problems in sets that have been created in the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:20
+msgid ""
+"This page allows one to edit the contents of PG problem files as well as set"
+" headers and other files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:20
+msgid ""
+"This page allows users to change their password, email address, and display "
+"settings used in problems. Note that you can hide this page entirely for "
+"students by setting permission levels to login_proctor or higher for the "
+"permissions to change password, change e-mail address, and change display "
+"settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:20
+msgid ""
+"This page allows you to configure course settings such as permission levels,"
+" display modes allowed, default display mode, email feedback behavior, and "
+"much more."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:20
+msgid ""
+"This page displays a student's current achievement level and progress toward"
+" the next level, and lists the rewards and badges that the student has "
+"earned. If rewards have been earned, then the student may also redeem those "
+"rewards."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:26
+msgid ""
+"This page gives access to information about the student, independent of the "
+"homework sets assigned to them."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:20
+msgid ""
+"This page gives information about mass LTI grade updates, and allows you to "
+"trigger a grade update for all users and all sets, all sets for one user, "
+"all users for one set, or one user for one set.  When a user is selected, "
+"the sets drop down menu is updated to only allow selecting sets assigned the"
+" selected user.  Similarly when a set is selected, the user menu is updated "
+"to only allow selecting valid users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:20
+msgid ""
+"This page is a collection of tools to modify users and sets.  These tools "
+"are short cuts for common actions that allow selecting multiple users or "
+"sets to act on at once.  Because multiple users and sets can be acted on at "
+"the same time, it is often more efficient to use this page when modifying "
+"multiple items.  For example, after selecting several users and a set you "
+"can change the close date for all selected users for that set.  This page "
+"also gives access to \"View/Edit all sets for one user\", which can be used "
+"to access settings for all sets including test versions for that user."
+msgstr ""
+
+#. (q(table to save any changes.  Each student's name links to that student's
+#. problem and opens up the)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:20
+msgid ""
+"This page is for manually grading a problem for all assigned students.  The "
+"table of students shows their last answers, percent score, and feedback "
+"comment.  The \"Save\" button is located below the "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:20
+msgid ""
+"This page is used to browse problems that will be used to fill problem sets."
+" The first step is to choose which set you are working on. If you need to "
+"create a new problem set fill in the blank next to the \"Create a New Set in"
+" This Course\" button and then press the button. Then choose which set you "
+"want to work on in the drop down menu."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:20
+msgid ""
+"This page is useful for monitoring student progress on assignments. Student "
+"progress can either be viewed for a single set or for a single student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:20
+msgid ""
+"This page manages all of the homework sets (including quizzes/tests). The "
+"following allow editing directly of a single problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:20
+msgid ""
+"This page shows the student's current grades for all sets they are assigned "
+"to.  Only visible sets are shown to the student, while invisible set names "
+"are italic when viewed as an instructor.  Students can only see the per "
+"problem grades on open assignments."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3169
 msgid "This problem contains a video which must be viewed online."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:602
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:631
 msgid "This problem has more than one part."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2059
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2293
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1323
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1576
 msgid ""
 "This problem has open subproblems.  You can visit them by using the links to"
 " the left or visiting the set page."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem.html.ep:66
+msgid "This problem is not valid."
+msgstr ""
+
 #. ($prettyID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2619
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:399
 msgid "This problem uses the same source file as number %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:418
 msgid "This problem will not count towards your grade."
 msgstr "Ce problème ne sera pas noté."
 
-#. ($EMAIL)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1109
+#. ($ur->email_address)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:1
 msgid "This sample mail would be sent to %1"
 msgstr ""
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2088
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1399
 msgid ""
 "This score for this problem does not count for the score of problem %1 or "
 "for the set."
 msgstr ""
 
-#. ($message_file,		$merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:167
+#. ($message_file,				$merge_file)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:127
 msgid ""
 "This scoring message is generated from [TMPL]/email/%1. It is merged with "
 "the file [Scoring]/%2. These files can be edited using the \"Email\" link "
 "and the \"File Manager\" link in the left margin."
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2215
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:155
 msgid "This set %1 is assigned to %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2932
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:678
 msgid "This set doesn't contain any problems yet."
 msgstr "Ce devoir ne contient pas encore de problème."
 
-#. ($beginReducedScoringPeriod, $dueDate, $reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:334
+#. ($c->formatDateTime($reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:44
 msgid ""
 "This set had a reduced scoring period that started on %1 and ended on %2.  "
 "During that period all work counted for %3% of its value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:78
 msgid ""
 "This set has a set-level proctor password to authorize logins. Enter the "
 "password below."
 msgstr ""
 
-#. (CGI::span({class=>$visiblityStateClass}, $visiblityStateText)
-# Context is "This set is visible" or "This set is hidden"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:532
-msgid "This set is %1"
-msgstr "Ce devoir est %1"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:411
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:59
 msgid "This set is hidden from students."
 msgstr ""
 
 #. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:330
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:40
 msgid ""
 "This set is in its reduced scoring period.  All work counts for %1% of its "
 "value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:65
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:51
+msgid "This set is not assigned to any students."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:57
 msgid "This set is visible to students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:190
-msgid "This set needs to be assigned to you before you can grade it."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:42
+msgid "This set or problem is not valid."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:158
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:164
 msgid ""
 "This set will be unavailable to students until they have earned a certain "
-"score on the sets specified in this field.  The sets should be written as a "
-"comma separated list.  The minimum score required on the sets is specified "
-"in the following field."
+"score on the sets specified in this field. The sets should be written as a "
+"comma separated list. The minimum score required on the sets is specified in"
+" the following field."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2007
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:111
+msgid ""
+"This should be done cautiously. Once a student is deleted from a course "
+"their data is lost forever and cannot be recovered. They can be added to the"
+" course as a new student, but all of their homework set assignments and "
+"homework has been permanently deleted."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1962
 msgid "This source file does not exist!"
 msgstr "Ce fichier source n'existe pas!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1961
 msgid "This source file is a directory!"
 msgstr "Ce fichier source est un dossier!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1963
 msgid "This source file is not a plain file!"
 msgstr "Ce fichier source n'est pas un fichier!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2005
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1960
 msgid "This source file is not readable!"
 msgstr "Impossible de lire ce fichier source!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:358
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+msgid ""
+"This specifies the number of attempts before hints are shown to students. "
+"The value of -2 uses the default from course configuration. The value of -1 "
+"disables hints. Note that this will only have an effect if the problem has a"
+" hint."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
 msgid ""
 "This specifies the rerandomization period: the number of attempts before a "
 "new version of the problem is generated by changing the Seed value. The "
@@ -7150,134 +9781,175 @@ msgid ""
 "disables rerandomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:651
-msgid ""
-"This table lists the current attempts for this test/quiz, along with its "
-"status, score, start date, and close date. Click on the version link to "
-"access that version. "
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:626
-msgid "This test is closed."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:548
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:81
 msgid "This test requires a proctor password to continue."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:600
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:126
 msgid "This test requires a proctor password to start."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2248
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2323
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:45
+msgid "This will determine if the output is in one or two columns."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:21
 msgid "Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:249
 msgid "Time Interval for New Test Versions (min; 0=infty)"
 msgstr ""
 
-#. ($elapsedTime,$allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:159
+msgid "Time Remaining"
+msgstr ""
+
+#. ($c->{elapsedTime}, sprintf('%.0f', 10 * ($c->{set}->due_date -
+#. $c->{set}->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:336
 msgid "Time taken on test: %1 min (%2 min allowed)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
 msgid "Timestamp"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1610
+#: /opt/webwork/webwork2/conf/defaults.config:1512
 msgid "Timezone for the course"
 msgstr "Fuseau horaire pour le cours"
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:512
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:330
 msgid "To access this set you must score at least %1% on set %2."
 msgstr ""
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:514
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:336
 msgid ""
 "To access this set you must score at least %1% on the following sets: %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:53
 msgid ""
 "To add an additional instructor to the new course, specify user information "
 "below. The user ID may contain only numbers, letters, hyphens, periods "
 "(dots), commas,and underscores."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:42
 msgid ""
 "To add the WeBWorK administrators to the new course (as administrators) "
 "check the box below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:239
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:118
+msgid ""
+"To assign one or more sets to an individual student click in the column "
+"\"Assigned Sets\" in the student's row. This will take you to a page where "
+"you can assign and unassign homework sets and change the due dates for "
+"homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:79
 msgid ""
 "To change status (scores or grades) for this student for one set, click on "
 "the individual set link."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:621
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:106
+msgid ""
+"To copy the templates and html folders from an existing course, select the "
+"course below."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:102
 msgid ""
-"To copy problem templates from an existing course, select the course below."
+"To drop a student or students, select them for editing as described above "
+"and then set the pop-up list to enrolled,drop, or audit. Dropped students "
+"cannot log in to the course, are not assigned new homework sets and are not "
+"sent e-mail. They can be re-enrolled simply by changing their status back to"
+" enrolled. No data is lost, any homework sets assigned before they were "
+"dropped are restored unchanged."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2200
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:143
 msgid ""
 "To edit a specific student version of this set, edit (all of) her/his "
 "assigned sets."
 msgstr "Pour modifier une version spécifique à un étudiant de ce devoir, modifier (tous) ses devoirs assignés."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:376
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:29
 msgid ""
-"To edit this text you must first make a copy of this file using the "
-"'NewVersion' action below."
+"To perform an action select the desired action tab and click the submit "
+"button."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:381
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:90
+msgid "To this Problem"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:69
 msgid ""
-"To edit this text you must use the 'NewVersion' action below to save it to "
-"another file."
+"To use the Email merge feature, upload a CSV with calculated grades to the "
+"scoring directory using the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1343
-msgid "To this Problem"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:767
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:58
+msgid "Today"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:33
+msgid "Toggle each of the options to include or not include in the output."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:522
+msgid "Top Score"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:118
+msgid "Top level of author information on the wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:114
+msgid "Total Points"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:18
 msgid "Total Points:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:90
 msgid "Totals"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:290
 msgid "Totals only (not problem scores)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:291
 msgid "Totals only, only after answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:236
 msgid "Transfer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:284
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:22
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:35
 msgid "True"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1279
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:245
 msgid "Try it"
 msgstr "Essayer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:26
 msgid "Tunic of Extension"
 msgstr ""
 
@@ -7285,209 +9957,340 @@ msgstr ""
 msgid "Two Columns"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1470
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:30
 msgid "Type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2325
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:84
+msgid "Type:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:23
 msgid "URI"
 msgstr ""
 
 #. ($achievementName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:297
 msgid "Unable to change the evaluator for set %1. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:819
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1084
+msgid "Unable to change the hardcopy header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1070
+msgid "Unable to change the set header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{fullSetID}, $c->{prettyProblemNumber})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1110
+msgid ""
+"Unable to change the source file path for set %1, problem %2. Unknown error."
+msgstr ""
+
+#. ($c->shortPath($delFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1246
+msgid "Unable to delete backup file \"%1\"."
+msgstr ""
+
+#. ($formatBackupTime)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:571
+msgid "Unable to delete backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:888
+msgid "Unable to make \"%1\" the hardcopy header for %2."
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:860
+msgid "Unable to make \"%1\" the set header for %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:693
 msgid "Unable to obtain error messages from within the PG question."
 msgstr "Incapable d'obtenir un message d'erreur de la question PG."
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:384
-msgid "Unable to write to '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:275
+msgid "Unable to open a temporary file at the given location."
+msgstr ""
+
+#. ($c->shortPath($backupFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1233
+msgid "Unable to read backup file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2613
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:636
+msgid "Unable to write to \"%1\": %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:15
 msgid "Unarchive"
 msgstr ""
 
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2596
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:4
 msgid "Unarchive %1 to course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2581
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:40
 msgid "Unarchive Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2675
-msgid "Unarchive Next Course"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:17
+msgid "Unarchive Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:214
-msgid "Unassign All Sets"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:25
+msgid "Unarchive Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:281
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1306
+msgid "Unarchive Next Course"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:97
 msgid "Unassign from All Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:61
 msgid "Unassign selected sets from selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:58
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:57
 msgid ""
-"Unassignments were not done.  You need to both click to \"Allow unassign\" "
-"and click on the Unassign button."
+"Unassignments were not done.  You need to select \"Allow unassign\" and then"
+" click on the Unassign button."
 msgstr ""
 
 #. ($unattempted, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1047
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:44
 msgid "Unattempted: %1/%2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:53
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:37
 msgid "Unclassified Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:242
 msgid "Ungraded"
 msgstr "Mise à jour réussie"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3723
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3765
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:58
 msgid "Unhide Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1465
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1151
+msgid "Unkown saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:28
 msgid ""
-"Unlock an additional version of a Gateway Test.  If used before the close "
-"date of the Gateway Test this will allow you to generate a new version of "
-"the test."
+"Unlock an additional version of a test.  If used before the close date of "
+"the test this will allow you to generate a new version of the test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:164
-msgid "Unpack"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:47
+msgid "Unpack Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:113
 msgid "Unpack archives automatically"
 msgstr "Décompresser les archives automatiquement"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2709
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:15
 msgid "Unselect all courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:130
-msgid "Update"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:63
+msgid "Update Display"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:671
-msgid "Update Display"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:84
+msgid "Update Grades"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:930
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:27
+msgid "Update Interval"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:102
 msgid "Update Menus"
 msgstr "MAJ des menus"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:729
-msgid "Update settings and refresh page"
-msgstr "Mise à jour des paramètres et rafraîchir la page"
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:51
+msgid "Update aborted. Invalid set %1."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:47
+msgid "Update aborted. Invalid user %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:67
+msgid "Update set:"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2695
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:8
 msgid "Update the checked directories?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3544
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:50
+msgid "Update user:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1908
 msgid "Updated location description."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2739
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2917
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:40
 msgid "Upgrade"
 msgstr ""
 
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
 msgid "Upgrade %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1327
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2278
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:97
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:79
 msgid "Upgrade Course Tables"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2693
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2761
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:382
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:42
 msgid "Upgrade Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3010
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:17
+msgid "Upgrade Courses Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:43
+msgid "Upgrade courses from a previous version of WeBWorK."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1582
 msgid "Upgrade process completed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:388
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:65
 msgid "Upload"
 msgstr "Envoyer"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2441
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:72
+msgid ""
+"Upload, download and delete text files, including scoring spread sheets, set"
+" definition files, class list spread sheets, and \"PG\" problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:292
 msgid "Use Default Header File"
 msgstr "Utiliser le fichier d'entête par défaut"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:325
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:127
 msgid "Use Equation Editor?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:204
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:20
 msgid "Use Reward"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2720
-msgid "Use System Default"
-msgstr "Utiliser les paramètres par défaut"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:516
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:27
 msgid "Use browser back button to return from preview mode."
 msgstr ""
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:506
+#. (tag('b', $c->{achievementID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:16
 msgid "Use in achievement %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:526
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:23
 msgid "Use in new achievement:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:149
 msgid "Use live equation rendering?"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2028
+#: /opt/webwork/webwork2/conf/defaults.config:1929
 msgid "Use log base 10 instead of base <i>e</i>"
 msgstr "Utiliser une base log 10 au lieu de <i>e</i>"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2034
+#: /opt/webwork/webwork2/conf/defaults.config:1935
 msgid "Use older answer checkers"
 msgstr "Utiliser l'ancien vérificateur de réponses"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:234
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:123
+msgid ""
+"Use the \"Create\" and \"Delete\" actions to create or delete achievements. "
+"Note that deleting an achievement will delete all data associated to the "
+"achievement and cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:35
+msgid ""
+"Use the \"Merge file\" drop down menu to select which merge file to use, or "
+"select \"None\" to not use any merge file.  When a merge file is selected, "
+"the data for active students will be displayed above the \"Email Body\".  "
+"This will show you the structure of the merge file and the column variables "
+"associated with each column.  Data that is longer than 7 characters will be "
+"truncated, and the data can be scrolled up and down to see all rows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:28
+msgid ""
+"Use the \"Users\" and \"Sets\" forms to select which users and sets to act "
+"on.  Multiple items can be selected using ctrl-click or shift-click.  The "
+"action buttons are grouped into three categories.  The first is a set of "
+"actions that act on the selected users, the second is a set of actions that "
+"act on the selected sets, and the third is a set of actions for acting on a "
+"combination of sets and users.  If an invalid number of users or sets are "
+"selected, the action will not be preformed, and an error message will be "
+"placed on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:25
+msgid ""
+"Use the editor to edit the evaluator and the action form at the bottom to "
+"save the evaluator. You can either overwrite the current evaluator file or "
+"save as a new evaluator file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:15
 msgid ""
 "Use the interface below to quickly access commonly-used instructor tools, or"
 " select a tool from the list to the left."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:332
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:26
+msgid ""
+"Use the options in the second box to pick a collection of problems decribed "
+"below. In each case, clicking \"View Problems\" will render a fixed number "
+"of problems (default of 20). After problems are shown, there will be options"
+" to show the next/previous batch of problems, add all problems to the target"
+" set (set at the top of the page) or clear the curent batch of problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:27
 msgid ""
 "Use this form to ask your instructor a question, to report a problem with "
 "the WeBWorK system, or to report an error in a problem you are attempting. "
@@ -7495,73 +10298,103 @@ msgid ""
 "system will be included."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:29
+msgid "Use this page to change your password."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:20
+msgid ""
+"Use this page to send emails to active (enrolled or auditing) students.  "
+"Emails can be sent to all active students or selected students.  Use the "
+"\"Students\" form to sort, filter, or format how the user name is displayed."
+"  Click \"Change Display Settings\" to apply any changes.  Use control-click"
+" or shift-click to select multiple students to email."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:67
+msgid ""
+"Used for \"counting\" achievements, which sets the value a counter must "
+"reach in order to earn the achievement. For example this is used counting "
+"the number of completed problems."
+msgstr ""
+
+#. (param('user')
+#. (param('effectiveUser')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:7
+msgid "User \"%1\" not found."
+msgstr ""
+
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:324
 msgid ""
-"User '%1' will not be copied from admin course as it is the initial "
+"User \"%1\" will not be copied from admin course as it is the initial "
 "instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:557
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
-msgid "User ID"
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:34
+msgid "User %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:298
-msgid "User Settings"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:217
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:64
+msgid "User ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:490
-msgid "User Value"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:230
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:28
+msgid "User Settings"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:52
-msgid "User has been assigned to all current sets."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:17
+msgid "User Settings Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:58
-msgid "User has been unassigned from all sets."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:576
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:13
+msgid "User overrides"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:247
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:62
 msgid "User's name is:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:68
-msgid "User's sets have been reassigned."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:60
 msgid "User's username is:"
 msgstr ""
 
 #. ($user, $setID, $j)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1077
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
 msgid ""
 "UserProblem missing for user=%1 set=%2 problem=%3. This may indicate "
 "database corruption."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:51
 msgid "Username"
 msgstr "Nom d'usager"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:499
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:126
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:272
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:9
 msgid "Users"
 msgstr "Utilisateur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:339
 msgid "Users Assigned to Set %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2077
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:17
+msgid "Users Assigned to Set Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:65
 msgid "Users List"
 msgstr "Liste d'usagers"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1925
+#: /opt/webwork/webwork2/conf/defaults.config:1827
 msgid ""
 "Users at this level and higher are allowed to change display settings used "
 "in pg problems.Note that if it is expected that there will be students that "
@@ -7570,31 +10403,31 @@ msgid ""
 "those students may need to disable MathQuill."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1915
+#: /opt/webwork/webwork2/conf/defaults.config:1817
 msgid ""
 "Users at this level and higher are allowed to change their e-mail address. "
 "Normally guest users are not allowed to change the e-mail address since it "
 "does not make sense to send e-mail to anonymous accounts."
 msgstr "Les utilisateurs de ce niveau et supérieur sont autorisés à modifier leur adresse e-mail. Normalement les utilisateurs invités ne sont pas autorisés à modifier l'adresse e-mail car il n'est pas logique d'envoyer des e-mail à des comptes anonymes."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1879
+#: /opt/webwork/webwork2/conf/defaults.config:1781
 msgid ""
 "Users at this level and higher are allowed to change their password. "
 "Normally guest users are not allowed to change their password."
 msgstr "Les utilisateurs de ce niveau et supérieur sont autorisés à modifier leur mot de passe. Normalement les utilisateurs invités ne sont pas autorisés à changer leur mot de passe."
 
-#. ($names{$primary}, $names{$secondary}, $names{$ternary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:924
+#. ($c->maketext(FIELD_PROPERTIES()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:316
 msgid "Users sorted by %1, then by %2, then by %3"
 msgstr "Usagers triés selon %1, ensuite selon %2 et ensuite selon %3"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1906
+#: /opt/webwork/webwork2/conf/defaults.config:1808
 msgid ""
 "Users with at least this permission level get a link in the left panel for "
 "reporting bugs to the bug tracking system at bugs.webwork.maa.org."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2140
+#: /opt/webwork/webwork2/conf/defaults.config:2051
 msgid ""
 "Users with this permssion level or greater will automatically be sent "
 "feedback from students (generated when they use the \"Contact instructor\" "
@@ -7603,157 +10436,225 @@ msgid ""
 "permission level to \"nobody\"."
 msgstr "Les utilisateurs avec ce niveau de permssion ou supérieur recevront automatiquement les commentaires des étudiants (généré quand ils utilisent le bouton \"Contacter un instructeur\" sur n'importe quelle page de problème). Par ailleurs, le message de réponse est envoyé aux adresses ci-dessous. Pour envoyer SEULEMENT aux adresses énumérées ci-après, régler le niveau de permission à \"personne\"."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1348
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:193
 msgid "Uses Math Objects"
 msgstr ""
 
-#. ($default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:197
-msgid "Using contents of the default message %1 instead."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1239
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:18
 msgid "Using what display mode?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:6
 msgid "Using what seed?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:19
+msgid "Using which hardcopy format?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:49
+msgid "Using which hardcopy theme?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:31
+msgid ""
+"Usually means students must demonstrate understanding of facts. This is more"
+" than regurgitating the fact. We use this category for simple and direct "
+"applications of algorithms the student has studied. There should be no "
+"judgement involved in choosing the method. This would include a simple "
+"application of a rule for differentiation (e.g., can combine rules for sums "
+"and constant multiples with one more advanced rule) or for integrals."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Value"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1747
+#: /opt/webwork/webwork2/conf/defaults.config:1649
 msgid "Value of work done in Reduced Scoring Period"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:687
-msgid "Variable Documentation:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config/config_help.html.ep:20
+msgid "Variable Documentation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:115
+msgid "Version"
 msgstr ""
 
 #. ($ver->{version})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:679
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:173
 msgid "Version %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:159
 msgid "Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:43
 msgid "Versions of a set can only be edited for one user at a time."
 msgstr "La version d'un devoir peut seulement être modifier par un seul utilisateur à la fois."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:128
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2419
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2756
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:528
 msgid "View"
 msgstr "Voir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1000
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:488
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:523
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:681
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:948
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:6
 msgid "View Problems"
 msgstr "Voir les problèmes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:276
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:57
+msgid "View details of student perofrmance either by individual or by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:86
 msgid "View equations as"
 msgstr "Afficher les équations à l'aide de"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:283
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:18
 msgid "View statistics by set"
 msgstr "Statistiques par devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:19
 msgid "View statistics by student"
 msgstr "Statistiques par étudiant"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:55
+msgid ""
+"View statistics of students' performance on homework either by individual or"
+" by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:14
 msgid "View student progress by set"
 msgstr "Voir le progrès des étudiants par devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:303
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:15
 msgid "View student progress by student"
 msgstr "Voir le progrès individuel d'un étudiant"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:65
 msgid "View/Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:224
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:90
-msgid "Viewing temporary file:"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:104
+msgid "View/Reload"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:766
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:790
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:31
+msgid "View/access current and archived courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:146
+msgid "Viewing Problems in a New Window"
+msgstr ""
+
+#. ($c->{problem}->source_file)
+#. ($screenSetHeader)
+#. ($course_info_path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:81
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:109
+msgid "Viewing temporary file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:25
 msgid "Visibility"
 msgstr "Visibilité"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:915
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:7
 msgid "Visible"
 msgstr "Visible"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:622
 msgid "Visible sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
 msgid "Visible to Students"
 msgstr "Visible aux étudiants"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2269
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:844
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "Warning"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2319
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:13
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:117
 msgid "Warning messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1039
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:259
+msgid "Warning messages:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all set-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1035
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all user-related data and is not undoable!"
 msgstr "Avertissement: la suppression détruit toutes les données relatives aux usagers et est irréversible"
 
-#. ($problem_desc , CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1397
+#. ($problem_desc,				$c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1194
 msgid "Warnings encountered while processing %1. Error text: %2"
 msgstr ""
 
-#. ($copyright_years, $theme, $ww_version, $pg_version)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1261
-msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4 |"
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:39
+msgid ""
+"We use this for carrying out more complicated algorithms, such as "
+"derivatives using both the product and chain rule or integrals which involve"
+" say both a substitution and parts."
+msgstr ""
+
+#. ($ce->{WW_COPYRIGHT_YEARS} || '1996-2023',              $ce->{defaultTheme}
+#. || 'unknown -- set defaultTheme in localOverides.conf',
+#. $ce->{WW_VERSION}         || 'unknown -- set WW_VERSION in VERSION',
+#. $ce->{PG_VERSION}         || 'unknown -- set PG_VERSION in ../pg/VERSION')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:9
+msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2227
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:3
 msgid "WeBWorK Error"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:3
 msgid "WeBWorK Warnings"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1549
+#: /opt/webwork/webwork2/conf/defaults.config:1451
 msgid ""
 "WeBWorK currently has translations for the languages listed in the course "
 "configuration."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:20
+msgid ""
+"WeBWorK does not have a full featured scoring ability. We leave that to your"
+" favorite spreadsheet application."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:38
+msgid ""
+"WeBWorK expects many files to be in certain locations.  The following "
+"describe this. Note that by default the File Manager shows the \"templates\""
+" directory.  Other directories mentioned below are at the same level and "
+"need to be accessed by going up a directory by clicking the \"^\" button "
+"above the file list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:6
 msgid ""
 "WeBWorK has encountered a software error while attempting to process this "
 "problem. It is likely that there is an error in the problem itself. If you "
@@ -7762,7 +10663,7 @@ msgid ""
 " more information."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:6
 msgid ""
 "WeBWorK has encountered warnings while processing your request. If this "
 "occured when viewing a problem, it was likely caused by an error or "
@@ -7772,19 +10673,19 @@ msgid ""
 " warning output below for more information."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:577
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:558
 msgid ""
 "WeBWorK was unable to generate a different version of this problem.  Close "
 "this tab, and return to the original problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:367
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:29
 msgid ""
 "WeBWorK was unable to generate a paper copy of this homework set.  Please "
 "inform your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:78
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
 msgid ""
 "WeBWorK will automatically create users when logging in via the LMS for the "
 "first time. If this flag is enabled then it will also keep the user account "
@@ -7794,36 +10695,44 @@ msgid ""
 "next time the user logs in."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:370
 msgid "Weight"
 msgstr "Poids"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:6
 msgid "Welcome to WeBWorK!"
 msgstr "Bienvenue sur WeBWorK!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:24
+msgid ""
+"What WeBWorK does have is good support for summarizing the scores on WeBWorK"
+" homework sets and tests and exporting them in a form (.csv) which any "
+"spreadsheet can use. WeBWorK reports all of the homework grades with options"
+" shown below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:27
 msgid "What could be inside?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:715
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:17
 msgid "What field should filtered users match on?"
 msgstr "Sélectionner les usagers selon quel champs d'information?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
 msgid ""
 "When a student has more attempts than is specified here they will be able to"
 " view another version of this problem.  If set to -1 the feature is disabled"
 " and if set to -2 the course default is used."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1899
+#: /opt/webwork/webwork2/conf/defaults.config:1801
 msgid ""
 "When acting as a student, this permission level and higher can submit "
 "answers for that student."
 msgstr "En agissant comme un étudiant, ce niveau d'autorisation et supérieur peuvent soumettre des réponses pour cet élève."
 
-#: /opt/webwork/webwork2/conf/defaults.config:2071
+#: /opt/webwork/webwork2/conf/defaults.config:1972
 msgid ""
 "When numerical answers are checked, most test if the student's answer is "
 "close enough to the programmed answer be computing the error as a percentage"
@@ -7832,7 +10741,7 @@ msgid ""
 "0.1 means 0.1 percent error is allowed.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2098
+#: /opt/webwork/webwork2/conf/defaults.config:2019
 msgid ""
 "When students click the <em>Email Instructor</em> button to send feedback, "
 "WeBWorK fills in the subject line.  Here you can set the subject line.  In "
@@ -7842,14 +10751,32 @@ msgid ""
 "recitation</li><li>%% = literal percent sign</li></ul>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1638
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:35
+msgid ""
+"When the class is very large not all students will be displayed. Using the "
+"first action on this page you can show only the students from a given "
+"recitation or from a given section, or only students whose login or last "
+"name fits a pattern match. The second action will sort the students "
+"currently being displayed. You can also sort the displayed students by "
+"clicking on the active links at the top of each column."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:56
+msgid ""
+"When the message is ready to send, click \"Send Email\". This will queue the"
+" email to be sent, which can take several minutes depending on the number of"
+" students selected.  You will be notified by email once all the emails have "
+"been sent."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1540
 msgid ""
 "When this is on students will see a line on the Grades page which has their "
 "total cumulative homework score.  This score includes all sets assigned to "
 "the student."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:90
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
 msgid ""
 "When this is true, then when a user enters WeBWorK from an external tool "
 "link in the LMS, the bottom of the screen will display the data that the LMS"
@@ -7857,23 +10784,56 @@ msgid ""
 "different LMS systems have different parameters."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1957
+#: /opt/webwork/webwork2/conf/defaults.config:1859
 msgid ""
 "When viewing a problem, WeBWorK usually puts the previously submitted answer"
 " in the answer blank.  Below this level, old answers are never shown.  "
 "Typically, that is the desired behaviour for guest accounts."
 msgstr ""
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:30
+msgid ""
+"When viewing progress for a single student, their grades page is shown which"
+" lists set totals and per problem grades for each set assigned to the "
+"student.  This shows the same information as the statistics page for the "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:26
+msgid ""
+"When viewing set statistics, the drop down menus can be used to show stats "
+"for individual sections, recitations, or problems.  The overall results "
+"include all students who are assigned to the set, while the individual "
+"problem results only include active (have attempted the problem) students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:24
+msgid ""
+"When viewing student progress for a set, the score for the set and the "
+"status for problems in the set are listed for all students.  The table can "
+"be sorted by clicking the links in the table header.  Click the student's "
+"name to access the student's set.  When viewing progress for a test, "
+"additional columns can be shown/hidden by updating the display at the top"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:74
+msgid ""
+"When you unassign a set from students, you destroy all of the data for the "
+"set for those students. If the set is re-assigned to these students, then "
+"they will receive new versions of problems in the set.  Make sure this is "
+"what you want to do before unassigning sets from students."
+msgstr ""
+
+#. (tag('b', $achievementID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:21
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for achievement %1 for this student. Make sure this is what you want to"
 " do."
 msgstr ""
 
-#. (CGI::b({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:146
+#. (tag('b', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:26
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for homework set %1 for this student. You will then need to reassign "
@@ -7881,7 +10841,7 @@ msgid ""
 "problems. Make sure this is what you want to do before unchecking students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:72
 msgid ""
 "When you uncheck a homework set (and save the changes), you destroy all of "
 "the data for that set for this student.   If you reassign the set, the "
@@ -7889,243 +10849,461 @@ msgid ""
 "you want to do before unchecking sets."
 msgstr ""
 
-#. ($self->formatDateTime($set->open_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:343
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:87
+msgid "Wiki summary page for MathObjects"
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:444
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:167
 msgid "Will open on %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:49
+msgid "Word problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:15
 msgid "Worth"
 msgstr "Pondération"
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:382
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:51
+msgid "Write a new PG problem file or edit an existing one."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:188
 msgid ""
-"Write permissions have not been enabled for '%1'.  Changes must be saved to "
-"another file for viewing."
+"Write permissions have not been enabled for \"%1\".  Changes must be saved "
+"to another file for viewing."
 msgstr ""
 
-#. ($self->shortPath($currentDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:380
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:630
 msgid ""
-"Write permissions have not been enabled in '%1'.  Changes must be saved to a"
+"Write permissions have not been enabled for \"%1\". Changes must be saved to"
+" another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:182
+msgid ""
+"Write permissions have not been enabled in \"%1\".  Changes must be saved to"
+" a different directory for viewing."
+msgstr ""
+
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:624
+msgid ""
+"Write permissions have not been enabled in \"%1\".Changes must be saved to a"
 " different directory for viewing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:178
 msgid ""
 "Write permissions have not been enabled in the templates directory.  No "
 "changes can be made."
 msgstr "Les droits d'écriture n'ont pas été activés pour le répertoire templates. Aucune modification ne peut être effectuée."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:380
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:620
+msgid ""
+"Write permissions have not been enabled in the templates directory. No "
+"changes can be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:287
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:330
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:509
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:82
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:657
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:67
 msgid "Yes"
 msgstr "Oui"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:500
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:454
 msgid ""
 "You are currently checking answers to a different version of your problem - "
 "these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:511
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:470
 msgid ""
 "You are currently previewing answers to a different version of your problem "
 "- these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr ""
 
-#. ($userSet->set_id, $r->connection->remote_ip)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:270
+#. ($ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:18
+msgid ""
+"You are in the Reduced Scoring Period.  All work counts for %1% of the "
+"original."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:183
+msgid "You are not allowed to act as a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:188
+msgid "You are not allowed to assign homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:383
+msgid "You are not allowed to delete %1."
+msgstr ""
+
+#. ($userSet->set_id, $c->tx->remote_address)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:261
 msgid ""
 "You are not allowed to generate a hardcopy for %1 from your IP address, %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2049
-msgid "You are not authorized to access the Instructor tools."
-msgstr "Vous n'êtes pas autorisé à accéder aux outils de l'enseignant."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:185
+msgid "You are not allowed to modify homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:191
+msgid "You are not allowed to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:4
+msgid "You are not allowed to send e-mail."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:2
+msgid "You are not authorized to access instructor tools"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:4
+msgid "You are not authorized to access instructor tools."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:9
+msgid "You are not authorized to assign homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:10
+msgid "You are not authorized to create or delete courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:2
+msgid "You are not authorized to edit achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:28
+msgid "You are not authorized to edit user specific information."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:37
+msgid "You are not authorized to grade homework sets."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:271
-msgid "You are not authorized to access the instructor tools."
-msgstr "Vous n'êtes pas autorisé à accéder aux outils de l'enseignant."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:8
+msgid "You are not authorized to manage course files"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:392
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:33
 msgid "You are not authorized to modify homework sets."
 msgstr "Vous n'êtes pas autorisé à modifier les devoirs."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:35
 msgid "You are not authorized to modify problems."
 msgstr "Vous n'êtes pas autorisé à modifier des problèmes."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:396
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:39
 msgid "You are not authorized to modify set definition files."
 msgstr "Vous n'êtes pas autorisé à modifier les fichiers de définition."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:15
 msgid "You are not authorized to modify student data"
 msgstr "Vous n'êtes pas autorisé à modifier les données des étudiants."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:11
+msgid "You are not authorized to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:3
+msgid "You are not authorized to modify the course configuration."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:230
 msgid "You are not authorized to perform this action."
 msgstr "Vous n'êtes pas autorisé à effectuer cette action."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:260
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:11
+msgid "You are not authorized to score sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:13
+msgid "You are not authorized to send mail to students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:11
+msgid "You are not authorized to update lti scores"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers.html.ep:8
+msgid "You are not authorized to view past answers"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:251
 msgid ""
 "You are not permitted to generate a hardcopy for a set with hidden work."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:236
 msgid "You are not permitted to generate a hardcopy for an unopened set."
 msgstr ""
 
-#. ($showMeAnother{MaxReps},					$solutionShown)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:559
+#. ($showMeAnother{MaxReps},						$solutionShown)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:532
 msgid ""
 "You are only allowed to click on Show Me Another %quant(%1,time,times) per "
 "problem. %2 Close this tab, and return to the original problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2051
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2070
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:265
 msgid "You are out of time!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:374
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:36
 msgid "You can also examine the following temporary files: "
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGanswermacros.pl:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:108
+msgid ""
+"You can assign selected achievements to all users by using the \"Assign\" "
+"action action and selecting which achievements to assign.  You can select "
+"which users to assign/unassign to an achievement by clicking on the link in "
+"the \"Edit Users\" column."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1039
+msgid ""
+"You can change the file path for this problem manually from the \"Hmwk Sets "
+"Editor\" page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:27
+msgid ""
+"You can check the boxes to the right of the sets and click \"Generate "
+"Hardcopy for Selected Sets\" to generate a PDF hardcopy of the selected "
+"sets. You can generate hardcopies for multiple users including their answers"
+" as well. Note that students will only be able to generate hardcopies of a "
+"single set at a time. Students will only be able to include answers in the "
+"hardcopy after the answer date."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:127
+msgid ""
+"You can delete problems by clicking the \"Delete it?\" check box and saving."
+" If the set is already active it is recommended that you instead use the "
+"\"Mark Correct?\" problem to mark a particular problem correct for all "
+"students."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGanswermacros.pl:1616
 msgid "You can earn partial credit on this problem."
 msgstr "Vous pouvez obtenir une partie des points pour ce problème."
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:382
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:142
+msgid ""
+"You can edit a problem by clicking the \"Edit Problem\" icon to the right of"
+" the problem number. This will open the problem in the PG problem editor in "
+"a new tab or window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:92
+msgid ""
+"You can edit a single achievement by clicking on the pencil icon next to the"
+" achievement ID.  You can edit multiple achievements by selecting which "
+"achievements to edit, then click the \"Edit\" button. You can edit all of "
+"the achievements by changing which achievements to edit form \"selected "
+"achievements\" to \"all achievements\", or click the checkbox next to the "
+"Achievement ID to select all achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:44
+msgid ""
+"You can edit the class list data for a single student by clicking on the "
+"pencil icon next to their login name. To edit several students at once click"
+" on the \"Select\" checkbox next to their names, click on the radio button "
+"for editing selected users and then click the \"Edit\" button. You can also "
+"edit all visible users (those students currently being displayed) or even "
+"all users in the course although this last option might take a long time to "
+"load for a large class."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:397
 msgid "You can get a new version of this problem after the due date."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1368
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:101
+msgid ""
+"You can import/export from their respective action tab.  Exporting saves "
+"information about the achievement as a .axp file which is a CSV that lists "
+"each achievements information.  You can import .axp files that have been "
+"previously exported."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:769
 msgid "You can not specify an absolute path"
 msgstr ""
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1121
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:549
 msgid "You can only %1 one file at a time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:92
 msgid "You can only download regular files."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:591
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:197
 msgid "You can only edit text files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:908
-msgid "You can only unpack files ending in '.tgz', '.tar' or '.tar.gz'"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:374
+msgid "You can only unpack files ending in \".tgz\", \".tar\" or \".tar.gz\""
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:134
+msgid ""
+"You can render a problem by clicking the \"Render Problem\" icon to the "
+"right of the problem number. The display mode used to render the problem is "
+"chosen using the drop down menu. You can render all problems using the "
+"\"Render All\" button. \"Hide All\" will hide all rendered problems. It is "
+"also useful to collapse problem details when doing this, as it makes it "
+"easier to drag problems around."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:120
+msgid ""
+"You can reorder problems by clicking on the arrow icon and dragging the "
+"problem. You will see a box showing you where the problem will be placed. "
+"When problems are reordered any holes in the numbering will be filled in."
 msgstr ""
 
 #. ($showMeAnother{MaxReps} >= $showMeAnother{Count}
 #. ? ($showMeAnother{MaxReps} - $showMeAnother{Count})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1895
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:44
 msgid ""
 "You can use this feature %quant(%1,more time,more times,as many times as you"
 " want) on this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:439
 msgid "You can't download directories"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:440
 msgid "You can't download files of that type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:584
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:192
 msgid "You can't edit a directory"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:528
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
 msgid "You can't view files of that type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:985
 msgid "You cannot archive the course you are currently using."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1712
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:850
 msgid "You cannot delete the course you are currently using."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1081
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:378
 msgid "You cannot delete yourself!"
 msgstr "Vous ne pouvez pas vous supprimer vous-même!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:579
 msgid "You did not specify a new set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:232
 msgid "You didn't enter any message."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:312
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:303
 msgid "You do not have permission to access the requested file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:159
 msgid "You do not have permission to change the hardcopy theme."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:578
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:186
 msgid "You do not have permission to edit this file."
 msgstr ""
 
 #. ($hardcopy_format)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:151
 msgid "You do not have permission to generate hardcopy in %1 format."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1639
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1161
 msgid "You do not have permission to view the details of this error."
 msgstr "Les droits qui vous sont assignés ne permettent pas de voir les détails de cette erreur."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements.html.ep:13
 msgid "You don't have any Achievement data associated to you!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:237
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:51
 msgid "You don't have any rewards!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2109
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:325
 msgid "You exceeded the allowed time."
 msgstr ""
 
-#. ($numLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2082
+#. ($c->{numAttemptsLeft})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:277
 msgid "You have %1 attempt(s) remaining on this test."
 msgstr ""
 
-#. ($numLeft,						$numLeft - 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2458
+#. ($c->{numAttemptsLeft},								$c->{numAttemptsLeft} - 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:664
 msgid ""
 "You have %1 submissions remaining for this test.  If you say yes, then you "
 "will have %quant(%2,submission) remaining. Once all submissions have been "
@@ -8133,724 +11311,702 @@ msgid ""
 "work this test version."
 msgstr ""
 
-#. ($attemptsLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2012
+#. ($problem->max_attempts - $attempts)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1270
 msgid "You have %negquant(%1,unlimited attempts,attempt,attempts) remaining."
 msgstr ""
 
 #. ($attempts_before_rr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1217
 msgid ""
 "You have %quant(%1,attempt,attempts) left before new version will be "
 "requested."
 msgstr ""
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:506
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:44
 msgid ""
 "You have %quant(%1,hour) and %quant(%2,minute) remaining to complete the "
 "currently open test."
 msgstr ""
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:518
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:54
 msgid ""
 "You have %quant(%1,hour,hours,)%quant(%2,minute,minutes,) remaining to "
 "complete the currently open test."
 msgstr ""
 
-#. ($minutes,									$seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:529
+#. ($minutes,							$seconds)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:64
 msgid ""
 "You have %quant(%1,minute) and %quant(%2,second) remaining to complete the "
 "currently open test."
 msgstr ""
 
 #. ($seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:72
 msgid ""
 "You have %quant(%1,second) remaining to complete the currently open test."
 msgstr ""
 
 #. ($attempts)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1243
 msgid "You have attempted this problem %quant(%1,time,times)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:1
 msgid "You have been logged out of WeBWorK."
 msgstr "Vous êtes déconnecté de WeBWorK."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2065
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:260
 msgid "You have less than 1 minute to complete this test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2046
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:241
 msgid "You have less than 45 seconds left!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2043
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:240
 msgid ""
 "You have less than 90 seconds left to complete this assignment. You should "
 "finish it soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1004
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:452
 msgid "You have not chosen a file to upload."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:845
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "You have requested that the following items be deleted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1137
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:565
 msgid "You have specified an illegal file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:766
 msgid "You have specified an illegal path"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:520
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:13
+msgid "You have specified an illegal working directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:481
 msgid ""
 "You may check your answers to this problem without affecting the maximum "
 "number of tries to your original problem."
 msgstr ""
 
-#. ($perm_multiuser ? "to privileged users or" : "")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:613
+#. ($multiuser ? 'to privileged users or' : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:69
 msgid ""
 "You may choose to show any of the following data. Correct answers, hints, "
 "and solutions are only available %1 after the answer date of the homework "
 "set."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:63
+msgid "You may not change this user's password!"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:646
 msgid "You may not change your answers when going on to the next part!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1831
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:58
 msgid "You may not change your own password here!"
 msgstr "Vous ne pouvez pas modifier votre propre mot de passe ici!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1132
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:560
 msgid "You may not follow symbolic links"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2134
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:350
 msgid "You may still check your answers."
 msgstr ""
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:172
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:143
+msgid ""
+"You may want to create an unattached problem if you are using the current "
+"problem as a model for a new problem. You can add the new file to a homework"
+" set from the Library Browser or via the set detail page of the Hmwk Sets "
+"Editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:165
+msgid ""
+"You might want to do this if you want to give full credit to everyone on a "
+"particular problem that was not worded correctly, or wasn't working "
+"properly. This is done from the \"Hmwk Sets Editor\" page or the "
+"\"Instructor Tools\" page."
+msgstr ""
+
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:8
 msgid "You must access assignments from your Course Management System (%1)."
 msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:67
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before Show Me Another "
-"is available."
+"You must attempt this problem %quant(%1,time) before this feature is "
+"available"
 msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1923
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:545
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before this feature is "
-"available"
+"You must attempt this problem %quant(%1,time,times) before Show Me Another "
+"is available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:699
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:259
 msgid "You must confirm the password for the initial instructor."
 msgstr ""
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:368
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? $c->link_to(                                                  $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:195
 msgid "You must log into this set via your Learning Management System (%1)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:76
-msgid "You must provide a student ID, a set ID, and a problem number."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:979
+msgid "You must select a course to archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:585
 msgid "You must select a course to rename."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:351
 msgid "You must select at least one file for the archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:777
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:312
 msgid "You must select at least one file to delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:115
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:106
 msgid "You must select one or more sets for scoring!"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:749
 msgid "You must specify a %1 name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:682
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:242
 msgid "You must specify a course ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2026
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2561
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2777
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3865
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2086
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:848
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:983
 msgid "You must specify a course name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:775
 msgid "You must specify a file name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:705
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:586
+msgid "You must specify a file name in order to save a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:265
 msgid "You must specify a first name for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:708
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:268
 msgid "You must specify a last name for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1382
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:606
 msgid "You must specify a new institution for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1364
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:588
 msgid "You must specify a new name for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:603
 msgid "You must specify a new title for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:256
 msgid "You must specify a password for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:448
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:440
 msgid "You must specify a user ID."
 msgstr "Spécifier le numéro d'usager."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:711
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:271
 msgid "You must specify an email address for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:331
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:138
 msgid "You must specify an file name in order to save a new file."
 msgstr "Spécifier un nom au fichier pour l'enregistrer."
 
 #. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:505
 msgid ""
-"You must use your Learning Managment System (%1) to access this set.  Try "
-"logging in to the Learning Managment System and visiting the set from there."
+"You must use your Learning Management System (%1) to access this set.  Try "
+"logging in to the Learning Management System and visiting the set from "
+"there."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1730
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
 msgid "You need to select a \"Target Set\" before you can edit it."
 msgstr ""
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1126
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:554
 msgid "You need to select a file to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1877
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:555
 msgid "You need to select a set definition file to view."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1853
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:537
 msgid "You need to select a set from this course to view."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1837
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:524
 msgid "You need to select a set to view."
 msgstr ""
 
-#. (wwRound(0, $problemResult->{score} * 100)
-#. (wwRound(0, $pg->{result}->{score} * 100)
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2007
+#. (wwRound(0,
+#. compute_reduced_score($ce, $problem, $set, $pg->{result}{score},
+#. $c->submitTime)
+#. (% wwRound(0, $rh_result->{problem_result}{score} * 100)
+#. (wwRound(0, $rh_result->{problem_result}{score} * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1251
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:48
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:29
 msgid "You received a score of %1 for this attempt."
 msgstr "Résultat pour cette tentative : %1."
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2075
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1363
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem and its graded subproblems."
 msgstr ""
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2078
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1375
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem."
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1343
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:740
 msgid "Your %1 name contains illegal characters"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1344
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:743
 msgid "Your %1 name may not begin with a dot"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:746
 msgid "Your %1 name may not contain a path component"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:540
-msgid ""
-"Your LTI OAuth verification failed.  If this recurs, please speak with your "
-"instructor"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:528
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:539
-msgid ""
-"Your authentication failed.  Please return to Oncourse and login again."
-msgstr "Votre authentification a échoué. S'il vous plaît revenir à OnCourse et vous connecter à nouveau."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:229
-msgid ""
-"Your authentication failed.  Please try again. Please speak with your "
-"instructor if you need help."
-msgstr ""
-
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3033
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3162
 msgid "Your browser does not support the video tag."
 msgstr ""
 
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4078
-msgid "Your current branch of PG is up to date with branch %1 in remote %2."
-msgstr ""
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4016
-msgid ""
-"Your current branch of WeBWorK is up to date with branch %1 in remote %2."
-msgstr ""
-
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4113
-msgid "Your current branch of the Open Problem Library is up to date."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:134
 msgid "Your display options have been saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:195
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
 msgid "Your email address has been changed."
 msgstr "Votre adresse courriel a été modifiée."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:772
 msgid "Your file name contains illegal characters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:118
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:40
 msgid "Your file name is not valid! "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:16
 msgid "Your message was sent successfully."
 msgstr ""
 
-#. ($lastScore,$notCountedMessage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2010
+#. (wwRound(0, $problem->status * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1261
 msgid "Your overall recorded score is %1.  %2"
 msgstr "Le résultat final est : %1.  %2"
 
-#. ($versionNumber, wwRound(2,$recordedScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2107
-msgid "Your recorded score on this test (version %1) is %2/%3."
+#. ('<span id="test-recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:179
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:197
+msgid "Your recorded score for this version is %1/%2 (%3%)."
+msgstr ""
+
+#. ($setVersionID,                                         '<span id="test-
+#. recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:317
+msgid "Your recorded score on this test (version %1) is %2/%3 (%4%)."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:603
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:634
 msgid "Your score for this attempt is for this part only;"
 msgstr ""
 
 #. ($testNounNum)
 # $testNounNum is either "test (#)" or "submission (#)"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1977
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:142
 msgid "Your score on this %1 WAS recorded."
 msgstr ""
 
-#. ($testNoun,$attemptScore,$totPossible)
+#. ($testNoun, $c->{attemptScore}, $c->{totalPossible})
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1982
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:148
 msgid "Your score on this %1 is %2/%3."
 msgstr ""
 
 #. ($testNounNum)
 # $testNounNum is either "test (#)" or "submission (#)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1973
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:138
 msgid "Your score on this %1 was NOT recorded."
 msgstr ""
 
-#. ($attemptScore,$totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2019
+#. ($c->{attemptScore}, $c->{totalPossible})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:192
 msgid "Your score on this (checked, not recorded) submission is %1/%2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1963
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2277
-msgid "Your score on this problem was recorded."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1619
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1027
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:172
 msgid ""
 "Your score was not recorded because there was a failure in storing the "
 "problem record to the database."
 msgstr "Votre résultat n'a pas été enregistré à cause d'une défaillance dans le processus d'enregistrement dans la base de données."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:272
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:276
 msgid "Your score was not recorded because this homework set is closed."
 msgstr "Votre résultat n'a pas été enregistré car la date de remise est passée."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:283
 msgid ""
 "Your score was not recorded because this problem has not been assigned to "
 "you."
 msgstr "Votre résultat n'a pas été enregistré car ce problème ne vous a pas été assigné."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1643
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1049
 msgid ""
 "Your score was not recorded because this problem set version is not open."
 msgstr ""
 
-#. ($elapsed, $allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1658
+#. ($elapsed,                                              # Assume the
+#. allowed time is an even number of minutes.
+#. ($set->due_date - $set->open_date)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1063
 msgid ""
 "Your score was not recorded because you have exceeded the time limit for "
 "this test. (Time taken: %1 min; allowed: %2 min.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1052
 msgid ""
 "Your score was not recorded because you have no attempts remaining on this "
 "set version."
 msgstr "Votre résultat n'a pas été enregistré car vous n'avez plus aucune tentative permise pour cette version du devoir. "
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1661
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1067
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:278
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:53
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:31
 msgid "Your score was not recorded."
 msgstr "Votre résultat n'a pas été enregistré."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1998
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:163
 msgid "Your score was not successfully sent to the LMS."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:166
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:170
 msgid "Your score was recorded."
 msgstr "Votre résultat a été enregistré"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1997
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:255
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:162
 msgid "Your score was successfully sent to the LMS."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:540
 msgid "Your session has timed out due to inactivity. Please log in again."
 msgstr "Votre session est échue. Veuillez vous reconnecter"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4126
-msgid "Your systems are up to date!"
-msgstr "Vos systèmes sont à jour!"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1396
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1403
-msgid "[Edit]"
-msgstr "[Éditer]"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:824
-msgid "a duplicate of the first selected achievement."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:17
+msgid "a duplicate of the first selected achievement"
 msgstr ""
 
 # Context is "Create set ______ as a duplicate of the first selected set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:17
 msgid "a duplicate of the first selected set"
 msgstr "une copie du premier devoir sélectionné"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:823
-msgid "a new empty achievement."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:16
+msgid "a new empty achievement"
 msgstr ""
 
 # Context is "Create set ______ as a new empty set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:16
 msgid "a new empty set"
 msgstr "un nouveau devoir vide"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1281
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:9
 msgid "a single set"
 msgstr "un seul devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:429
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:130
 msgid "add problems"
 msgstr ""
 
 #. ($setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1751
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
 msgid "addGlobalSet %1 in ProblemSetList:  %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:456
-msgid "added missing permission level for user"
-msgstr "le niveau d'autorisation manquant pour l'utilisateur a été ajouté"
-
 # #short for administrator
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "admin"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1051
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:487
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:604
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:7
 msgid "all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1377
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:66
 msgid "all current users"
 msgstr "tous les utilisateurs actuels"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:327
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:70
 msgid "all set dates for one <b>user</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:622
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1434
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:667
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:840
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1995
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:7
 msgid "all sets"
 msgstr "tous les devoirs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1981
 msgid "all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1256
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:701
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:946
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:997
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:6
 msgid "all users"
 msgstr "tous les usagers"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:120
 msgid "all users for one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:23
 msgid "alphabetically"
 msgstr ""
 
-#. ($count,$numSets)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:626
+#. ($count, $numSets)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1999
 msgid "an impossible number of sets: %1 out of %2"
 msgstr ""
 
-#. ($count,$numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:606
+#. ($count, $numUsers)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1985
 msgid "an impossible number of users: %1 out of %2"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:647
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:658
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:610
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:621
 msgid "answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:30
 msgid "any users"
 msgstr "n'importe quel usager"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:720
-msgid "avg attempts"
-msgstr ""
-
 # Context is "Append ____ blank problem template(s) to end of homework set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2956
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:689
 msgid "blank problem template(s) to end of homework set"
 msgstr "Problème(s) modèle(s) vide(s) à la fin du devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:24
 msgid "by last login date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1552
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:688
 msgid "changes abandoned"
 msgstr "Les modifications n'ont pas été sauvegardées"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1216
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1651
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:633
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:795
 msgid "changes saved"
 msgstr "modifications sauvegardées"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:80
 msgid "class list data for selected <b>users</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:31
 msgid "close"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:671
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:259
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:239
 msgid "correct"
 msgstr "correct"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:582
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:239
 msgid "course files"
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:458
 msgid "deleted %1 sets"
 msgstr "suppression de %1 devoirs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:152
 msgid "editing all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:333
 msgid "editing all sets"
 msgstr "modification de tous les devoirs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:963
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:328
 msgid "editing all users"
 msgstr "modification de tous les usagers"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:860
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:336
 msgid "editing listed sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:154
 msgid "editing selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:339
 msgid "editing selected sets"
 msgstr "modification des devoirs sélectionnés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:334
 msgid "editing selected users"
 msgstr "modification des usagers sélectionnés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:331
 msgid "editing visible users"
 msgstr "modification des usagers visibles"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:360
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:90
 msgid "email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:87
-msgid "email:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:42
 msgid "empty"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:672
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:10
 msgid "enter matching set IDs below"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:220
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:31
 msgid "entry rows."
 msgstr ""
 
 #. ($restrictLoc, $setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1761
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:904
 msgid "error adding set location %1 for set %2: %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1092
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1487
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:542
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:643
 msgid "export abandoned"
 msgstr "exportation annulée"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1068
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:527
 msgid "exporting all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1071
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:530
 msgid "exporting selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:359
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:89
 msgid "first name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:747
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:72
 msgid "for"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:149
 msgid "for one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:103
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:94
 msgid "for one <b>user</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1014
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:349
 msgid "giving new passwords to all users"
 msgstr "assignation de nouveaux mots de passe à tous les usagers"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1020
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:355
 msgid "giving new passwords to selected users"
 msgstr "assignation de nouveaux mots de passe aux usagers sélectionnés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1017
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:352
 msgid "giving new passwords to visible users"
 msgstr "assignation de nouveaux mots de passe aux usagers visibles"
 
 #. ($j, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1069
 msgid "global %1 for set %2 not found."
 msgstr ""
 
-#. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1146
-msgid "global set %1 not found."
-msgstr ""
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "grade_proctor"
 msgstr ""
@@ -8859,393 +12015,375 @@ msgstr ""
 msgid "guest"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1589
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:949
 msgid "hidden"
 msgstr "caché"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "hidden from"
 msgstr "invisible pour"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "hidden from students"
-msgstr "caché pour les étudiants"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:217
+msgid "homework"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:83
+msgid "html directory"
+msgstr ""
 
-#. ('j','k','_0')
-#. ('j','k')
+#. ('j', 'k', '_0')
+#. ('j', 'k')
 # doe snot need to be translated
-#: /opt/webwork/pg/lib/Parser/List/Vector.pm:35
-#: /opt/webwork/pg/lib/Value/Vector.pm:278
-#: /opt/webwork/pg/macros/contextLimitedVector.pl:93
+#: /opt/webwork/pg/lib/Parser/List/Vector.pm:39
+#: /opt/webwork/pg/lib/Value/Vector.pm:303
+#: /opt/webwork/pg/macros/contexts/contextLimitedVector.pl:95
 msgid "i"
 msgstr ""
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:773
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:840
 msgid "if"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1626
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:622
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:721
 msgid "illegal character in input: '/'"
 msgstr "caractère illégal : '/'"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:246
 msgid "incorrect"
 msgstr "erroné"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:441
 msgid "index"
 msgstr ""
 
 #. ($restrictLoc, $setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:911
 msgid "input set location %1 already exists for set %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:358
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:551
+msgid "insufficient permission to edit %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:220
+msgid "just-in-time"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:88
 msgid "last name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:841
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:893
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:9
 msgid "listed sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3169
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:87
 msgid "locations selected below"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:665
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:59
 msgid "login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "login ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:94
 msgid "login name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:86
-msgid "login/studentID:"
-msgstr ""
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "login_proctor"
 msgstr ""
 
 # Context is "Set _____ made visibile for _____ users"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "made visible for"
 msgstr "rendue visible pour"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:419
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:493
 msgid "max"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1282
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:10
 msgid "multiple sets"
 msgstr "devoirs multiples"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:489
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:171
 msgid "new set:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:393
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:109
 msgid "new users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:6
 msgid "no achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:740
-msgid "no achievements."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:519
-msgid "no attempt recorded"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:86
 msgid "no location"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:620
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1056
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1993
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:6
 msgid "no sets"
 msgstr "aucun devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:600
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1979
 msgid "no students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:931
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1190
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:702
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:31
 msgid "no users"
 msgstr "aucun usager"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/permission.pm:26
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "nobody"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:114
 msgid "nth colum of merge file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:225
-msgid "number of students not defined"
-msgstr "Le nombre d'étudiants n'est pas définie"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:70
 msgid "of"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:128
 msgid "one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:556
-msgid "one <b>set</b> for  <b>users</b>"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:225
+msgid "one <b>set</b> for <b>users</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:540
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:211
 msgid "one <b>user</b> (on one <b>set</b>)"
 msgstr ""
 
 # Context is Assign this set to which users?  "only ____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1378
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:67
 msgid "only"
 msgstr "seulement"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:17
 msgid "only best scores"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3472
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:357
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:448
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:88
 msgid "or"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1141
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:59
 msgid "or Problems from"
 msgstr ""
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:776
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:843
 msgid "otherwise"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:19
 msgid "overwrite"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:664
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:627
 msgid "part"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1383
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:499
 msgid "permissions for %1 not defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "point"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "points"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:509
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:20
 msgid "preserve"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2360
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:576
 msgid "preview answers"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:653
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:616
 msgid "problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:632
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:41
 msgid "problems"
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:219
+msgid "proctored test"
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "professor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:360
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:451
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:89
 msgid "progress"
 msgstr ""
 
 #. ($line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2212
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1409
 msgid "readSetDef error, can't read the line: ||%1||"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:93
 msgid "recitation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:654
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:53
 msgid "recitation #"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:497
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:549
 msgid "record for visible user %1 not found"
 msgstr ""
 
 #. ($restrictLoc)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1767
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:918
 msgid ""
 "restriction location %1 does not exist.  IP restrictions have been ignored."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:670
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "row"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:91
 msgid "score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:362
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:92
 msgid "section"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:643
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:47
 msgid "section #"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:88
-msgid "section:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:159
 msgid "selected <b>sets</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:524
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:197
 msgid "selected <b>users</b> to selected <b>sets</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:441
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:488
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:605
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:8
 msgid "selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:741
-msgid "selected achievements."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1057
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1436
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:669
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:842
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:894
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:991
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:8
 msgid "selected sets"
 msgstr "devoirs sélectionnés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1053
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:703
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:999
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:8
 msgid "selected users"
 msgstr "usagers sélectionnés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:624
-msgid "set"
-msgstr "devoir"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:628
-msgid "sets"
-msgstr "devoirs"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:12
 msgid "sets hidden from students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:670
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:11
 msgid "sets visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:716
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:281
 msgid "showing all sets"
 msgstr "affichage de tous les devoirs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:763
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:277
 msgid "showing all users"
 msgstr "affichage de tous les usagers"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:725
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:290
 msgid "showing matching sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:286
 msgid "showing matching users"
 msgstr "affichage des usagers correspondant"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:719
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:284
 msgid "showing no sets"
 msgstr "affichage d'aucun devoir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:766
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:280
 msgid "showing no users"
 msgstr "affichage d'aucun usager"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:722
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:287
 msgid "showing selected sets"
 msgstr "affichage des devoirs sélectionnés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:769
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:283
 msgid "showing selected users"
 msgstr "affichage des usagers sélectionnés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:299
 msgid "showing sets that are hidden from students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:732
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:296
 msgid "showing sets that are visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:72
 msgid "shown"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:162
 msgid "still open"
 msgstr ""
 
@@ -9253,16 +12391,16 @@ msgstr ""
 msgid "student"
 msgstr "étudiant"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
 msgid "submission"
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:133
 msgid "submission (version %1)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
 msgid "summary"
 msgstr ""
 
@@ -9270,135 +12408,130 @@ msgstr ""
 msgid "ta"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:90
+msgid "templates/email directory"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:95
+msgid "templates/macros directory"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
 msgid "test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:23
 msgid "test date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:621
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:29
 msgid "test time"
 msgstr ""
 
-#. ($forcedSourceFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:987
-msgid "the original path to the file is %1"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:119
 msgid "then delete them"
 msgstr "et les effacer ensuite"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "time"
-msgstr "reprise"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:165
 msgid "time limit exceeded"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "times"
-msgstr "reprises"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:35
+msgid "time remaining"
+msgstr ""
 
 # Context is Assign ____ to _____
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:183
 msgid "to"
 msgstr "à"
 
 #. ($ce->{institutionName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:399
 msgid "to %1 main web site"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:524
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:381
 msgid "to courses page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:436
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:135
 msgid "to one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:764
-msgid "top score"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:432
 msgid "total"
 msgstr ""
 
 #. ($ce->{webworkDirs}{logs})
 #. ($ce->{webworkDirs}{tmp})
 #. ($ce->{webworkDirs}{DATA})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:47
 msgid "unable to write to directory %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:333
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:49
 msgid "unlimited"
 msgstr "illimité"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:14
 msgid "unlimited reusability"
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:609
-msgid "userID: %1 --"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:652
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:259
 msgid ""
 "username, last name, first name, section, achievement level, achievement "
 "score,"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:704
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:10
 msgid "users who match on selected field"
 msgstr "usagers qui correspondent aux champs sélectionnés"
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
+#. ($set->version_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:295
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:408
+msgid "version %1"
+msgstr ""
+
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:134
 msgid "version (%1)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1591
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1888
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:820
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:951
 msgid "visible"
 msgstr "visible"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "visible to students"
-msgstr "visible pour les étudiants"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1257
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:947
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:998
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:7
 msgid "visible users"
 msgstr "usagers visibles"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:485
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:500
 msgid "when you submit your answers"
 msgstr ""
 
 #. ($dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1532
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:623
 msgid "won't be able to read from file %1/%2: does it exist? is it readable?"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:604
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:638
 msgid "your overall score is for all the parts combined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:231
 msgid "your students"
 msgstr "vos étudiants"
diff --git a/lib/WeBWorK/Localize/he-IL.po b/lib/WeBWorK/Localize/he-IL.po
index 561245cafb..1102a0cafd 100644
--- a/lib/WeBWorK/Localize/he-IL.po
+++ b/lib/WeBWorK/Localize/he-IL.po
@@ -5,264 +5,327 @@
 # Translators:
 # Michael Oren Perlstein <michaelore@campus.technion.ac.il>, 2018
 # Nathan Wallach <tani@mathnet.technion.ac.il>, 2018
-# Nathan Wallach <taniwallach@gmail.com>, 2022
+# Nathan Wallach <taniwallach@gmail.com>, 2022-2023
 # Ran Kiri <rankiri@campus.technion.ac.il>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: webwork2\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: 2013-01-27 17:03+0000\n"
-"Last-Translator: Nathan Wallach <taniwallach@gmail.com>, 2022\n"
-"Language-Team: Hebrew (Israel) (http://www.transifex.com/webwork/webwork2/language/he_IL/)\n"
+"Last-Translator: Nathan Wallach <taniwallach@gmail.com>, 2022-2023\n"
+"Language-Team: Hebrew (Israel) (http://app.transifex.com/webwork/webwork2/language/he_IL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he_IL\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:428
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:449
+#. ($_->{problem}->version_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:69
+msgid " (version %1)"
+msgstr " (גרסה %1)"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:265
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:284
 msgid " Answers Available."
 msgstr " התשובות זמינות."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:735
-msgid "# of active students"
-msgstr "מספר סטודנטים פעילים"
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1148
+msgid " No changes have been made to set %1"
+msgstr " לא בוצעו שינויים לגיליון %1"
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:130
+msgid "\"Act as\" a student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:31
+msgid "\"Edit Assigned Users\" column"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:24
+msgid "\"Edit Problems\" column"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:187
+msgid "# of Active Students"
+msgstr "# סטודנטים פעילים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:506
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:85
+msgid "# of attempts"
+msgstr "# ניסיונות"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:333
 msgid "#corr"
 msgstr "# נכון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:508
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:335
 msgid "#incorr"
 msgstr "#שגוי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2249
-msgid "% Score:"
-msgstr "% ציון:"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:685
-msgid "% correct"
-msgstr "% נכון"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:174
+msgid "% Average with Review"
+msgstr "% ממוצע עם חומר חזרה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:702
-msgid "% correct with review"
-msgstr "% נכון עם ביקורת"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:66
+msgid "% Score with Review"
+msgstr "% ציון עם חומר חזרה"
 
-# Percent students
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:762
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:792
-msgid "% students"
-msgstr "% הסטודנטים"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:479
+msgid "% Score:"
+msgstr "% ציון:"
 
 #. ($achievement->{points})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:24
 msgid "%1 Points:"
 msgstr "%1 נקודות:"
 
-#. ($lib eq '' ? $r->maketext('Local')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:476
+#. ($lib eq '' ? maketext('Local')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:9
 msgid "%1 Problems:"
 msgstr "%1 שאלות:"
 
-#. ($itemCounts{$item->id()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:189
+#. ($itemCounts->{ $item->id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:12
 msgid "%1 remaining"
 msgstr "%1 נשארים"
 
-#. ($numAdded, $numSkipped, join(', ', @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1410
+#. ($count)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2001
+msgid "%1 sets"
+msgstr "%1 גליונות"
+
+#. ($numAdded,                     $numSkipped,
+#. join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:608
 msgid "%1 sets added, %2 sets skipped. Skipped sets: (%3)"
 msgstr "נוספו %1 גליונות, דילגו על %2 גליונות. הגליונות שעליהן דילגו: (%3)"
 
-#. ($numExported, $numSkipped, ($numSkipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1526
+#. ($numExported, $numSkipped,                     $numSkipped ? $c->tag('ul',
+#. $c->c(map { $c->tag('li', $_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:673
 msgid "%1 sets exported, %2 sets skipped. Skipped sets: (%3)"
 msgstr "%1 גליונות יוצאו, %2 גליונות שעליהם דילגו. הגליונות שעליהם דילגו: (%3)"
 
 #. ($count, $numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:608
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
 msgid "%1 students out of %2"
 msgstr "%1 סטודנטים מתוך %2"
 
-#. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle,
+#. ($rename_oldCourseID,          $rename_oldCourseTitle,
+#. $rename_newCourseTitle,
 #. $rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:675
 msgid "%1 title and institution changed from %2 to %3 and from %4 to %5"
 msgstr "%1 כותרת ומוסד שונו מ%2 ל%3 ומ%4 ל%5"
 
-#. (scalar @userIDsToExport, $dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1338
-msgid "%1 users exported to file %2/%3"
-msgstr "%1 משתמשים יוצאו לקובץ %2/%3"
+#. (scalar @userIDsToExport, "$dir/$fileName")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:477
+msgid "%1 users exported to file %2"
+msgstr "%1 משתמשים יוצעו לקובץ %2"
 
-#. ($numReplaced, $numAdded, $numSkipped, join (", ", @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1233
+#. ($numReplaced, $numAdded, $numSkipped, join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:443
 msgid ""
 "%1 users replaced, %2 users added, %3 users skipped. Skipped users: (%4)"
 msgstr "%1 משתמשים הוחלפו, %2 משתמשים הוספו, על %3 משתמשים דילגו. המשתמשים שעליהם דילגו: (%4) "
 
-#. ($levelpercentage)
 #. ($percentage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:135
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:136
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:323
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:324
+#. ($level_percentage)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:12
 msgid "%1% Complete"
 msgstr "%1% הושלמו"
 
 #. (wwRound(0, $answerScore * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:268
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:248
 msgid "%1% correct"
 msgstr "%1% נכון"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:207
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:57
 msgid "%1's Current Address"
 msgstr "הכתובת הנוכחית של %1"
 
-#. ($user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:136
+#. ($c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:26
 msgid "%1's Current Password"
 msgstr "הסיסמה הנוכחית של %1"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:225
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:65
 msgid "%1's New Address"
 msgstr "הכתובת החדשה של %1"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:153
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:34
 msgid "%1's New Password"
 msgstr "הסיסמה החדשה של %1"
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
-msgid "%1's new password cannot be blank."
-msgstr "הסיסמה החדשה של %1 לא יכולה להיות ריקה"
-
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:76
 msgid "%1's password has been changed."
 msgstr "הסיסמה של %1 שונתה"
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:56
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1423
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#. ($c->tag('span', dir => 'ltr', $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1069
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:149
 msgid "%1: Problem %2"
 msgstr "%1: שאלה %2"
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:374
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:357
 msgid "%1: Problem %2 Show Me Another"
 msgstr "%1: שאלה %2 הראה לי שאלה דומה"
 
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2231
-msgid "%1: The directory for the course not found."
-msgstr "%1: התקיה של הקורס לא נמצאה."
-
-#. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:340
-msgid "%quant(%1,error) occured while generating hardcopy:"
-msgstr "%quant(%1,שגיאה קרתה, שגיאות קרו) בזמן ההכנה להדפסה:"
+#. ($days)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:87
+msgid "%quant(%1,day)"
+msgstr "%quant(%1,יום, ימים)"
 
 #. ($n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:924
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:389
 msgid "%quant(%1,file) unpacked successfully"
 msgstr "%quant(%1,קובץ נפרק,קבצים נפרקו) נפרק בהצלחה"
 
+#. ($hours)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:88
+msgid "%quant(%1,hour)"
+msgstr "%quant(%1,שעה, שעות)"
+
+#. ($minutes)
+#. (sprintf('%3.1f', $testTime)
+#. ($timeLeft)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:89
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:150
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:168
+msgid "%quant(%1,minute)"
+msgstr "%quant(%1,דקה, דקות)"
+
 #. ($numBlanks)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:430
 msgid ""
 "%quant(%1,of the questions remains,of the questions remain) unanswered."
 msgstr "%quant(%1, מהשאלות לא נענתה, מהשאלות לא נענו)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:678
+#. ($seconds)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:90
+msgid "%quant(%1,second)"
+msgstr "%quant(%1,שניה,שניות)"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:505
 msgid "%score"
 msgstr "מתוך 100"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2971
+#. ($dcount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:40
+msgid "(%quant(%1,item) total)"
+msgstr ""
+
+#. ($count)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:29
+msgid "(%quant(%1,item))"
+msgstr "(%quant(%1,קובץ,קבצים))"
+
+#. ($problemValue)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1081
+msgid "(%quant(%1,point))"
+msgstr "(%quant(%1,נקודות,נקודה))"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:697
 msgid "(Any unsaved changes will be lost.)"
 msgstr "(כל שינויים שלא נשמרו ימחקו)"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1278
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1287
-msgid ""
-"(Instructor hint preview: show the student hint after the following number "
-"of attempts:"
-msgstr "(צפייה ברמז למורה: הראה לסטודנט את הרמז לאחר מספר זה של נסיונות:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:102
+msgid "(If an action cannot be executed it will not appear.)"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2003
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1262
 msgid "(This problem will not count towards your grade.)"
 msgstr "(שאלה זו לא תחשב בחישוב הציון לגליון.)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2122
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:340
 msgid ""
 "(This test is overtime because it was not submitted in the allowed time.)"
 msgstr "(מבחן זה הוגש באיחור מכיוון שהוא לא הוגש בזמן המוגדר.)"
 
-#. ($testNoun, $self->formatDateTime($set->answer_date)
+#. ($testNoun, $c->formatDateTime($c->{set}->answer_date)
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1986
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:153
 msgid "(Your score on this %1 is not available until %2.)"
 msgstr "(הציון שלך על %1 זה לא זמין עד %2.)"
 
 #. ($testNoun)
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1988
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:155
 msgid "(Your score on this %1 is not available.)"
 msgstr "הציון שלך על %1 זה לא זמין.)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1257
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1267
 msgid "(correct)"
 msgstr "(נכון)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:197
-msgid "(gw/quiz) After version answer date"
-msgstr "(מבחן מחסום) אחרי תאריך התשובות של הגרסה"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:263
 msgid "(in target set)"
 msgstr "(נמצא בגליון היעד)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1449
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1269
 msgid "(incorrect)"
 msgstr "(לא נכון)"
 
 #. ($pgScore)
 #. ($recScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1461
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1271
 msgid "(score %1)"
 msgstr "(ציון %1)"
 
-#. ($display_sort_method_name{$secondary_sort_method_name})
-#. ($display_sort_method_name{$ternary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:701
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:706
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:207
+msgid "(test) After version answer date"
+msgstr "(מבחן) אחרי מועד קבלת תשובות של הגרסה"
+
+#. ($versionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:164
+msgid "(version %1)"
+msgstr "(גרסה %1)"
+
+#. ($display_sort_method_name{$secondary_sort_method})
+#. ($display_sort_method_name{$ternary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:103
 msgid ", then by %1"
 msgstr ", ואז לפי %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1297
-msgid ". If this is a class roster, rename it to have extension '.lst'"
-msgstr ". אם זה קובץ רשימת סטודנטים, יש לשנות את שם הקובץ כדי לססים בסיומת '.lst'"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:702
+msgid ". If this is a class roster, rename it to have extension \".lst\""
+msgstr ". אם זה קובץ רישום, שנה את שם הקובץלסיים אם הסיומת \".lst\""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:81
+msgid "0 seconds"
+msgstr "0 שניות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1997
+msgid "1 set"
+msgstr "גליון 1"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1983
 msgid "1 student"
 msgstr "סטודנט 1"
 
 #. (wwRound(2, $weights[$part] * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:145
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:58
 msgid "<b>Weight:</b> %1%"
 msgstr "<b>משקל:</b> %1%"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1749
+#: /opt/webwork/webwork2/conf/defaults.config:1651
 msgid ""
 "<p>After the Reduced Scoring Date all additional work done by the student "
 "counts at a reduced rate. Here is where you set the reduced rate which must "
@@ -277,7 +340,7 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr "<p>לאחר תאריך התלחת תקופת הניקוד המופחת כל ,תשובות נוספות של הסטודנט יקבלו ערך מופחת. כאן ניתן למלא את הערך המופת באחוזים. לדוגמה, אם הערך הוא 50% וסטודנט צופה בשאלה בזמן תקופת הניקוד המופחת, הוא יראה את ההודעה \"אתה בתקופת ניקוד מופחת: כל הגשה נוספת תחשב כ-50% מהניקוד המקורי.\"</p><p>כדי להשתמש אפשרות זאת, יש גם לאפשר ניקוד מופחת ולבחור תאריך ניקוד מופחת לכל מטלה בנפרד, על-ידי עריכתו של הנתונים של הגליון בעזרת עורך גליונות שיעורי הבית.</p><p>זה עובד עם avg_problem_grader (שהוא המנקד לפי ברירת המחדל) ועם std_problem_grader ( מנקד לפי הכל או כלום). זה יעבוד גם עם מנקדים שנכתבו על-ידי המשתמשים, אם הם נכתבו כנדרש.</p>"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2036
+#: /opt/webwork/webwork2/conf/defaults.config:1937
 msgid ""
 "<p>During summer 2005, a newer version of the answer checkers was "
 "implemented for answers which are functions and numbers.  The newer checkers"
@@ -289,16 +352,74 @@ msgid ""
 " the old answer checkers will be used by default.</p>"
 msgstr "<p>במהלך קיץ 2005, פותחה גרסה חדשה של בודקי התשובות עבור תשובות שהן פונקציות או מספרים. הבודקים החדשים מאפשרים יותר פונקציות בתשובות הסטודנטים, ומתפקדות טוב יותר במקרים מסוימים. ישנם שאלות שתוכנתו במיוחד עבור בודקי התשובות החדשים (או הישנים). אבל עבור רוב השאלות, ניתן לקבוע כאן איזה סוג בודק תהיה ברירת המחדל.</p><p>בחירת <i>לא נכון</i> כאן קובע את הבודקים החדשים כברירת המחדל, ובחירת <i>נכון</i> קובע את הבודקים הישנים כברירת המחדל. </p>"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2006
+#: /opt/webwork/webwork2/conf/defaults.config:1908
 msgid ""
 "<p>MathQuill renders students answers in real-time as they type on the "
 "keyboard.</p><p>MathView allows students to choose from a variety of common "
 "math structures (such as fractions and square roots) as they attempt to "
-"input their answers.</p><p>WIRIS provides a separate workspace for students "
-"to construct their response in a WYSIWYG environment.</p>"
-msgstr "<p>MathQuill מייצגת תשובות של סטודנטים כנוסחה בכתיבה מתמטית בזמן אמת כאשר התשובה מוקלדת לתוך תיבת הקלט.  </p><p>MathView מאפשר לסטודנט לבחור מתוך מספר מבנים מתמטיים (כגון שברים ושורשים) בזמן הזנת התשובות. </p><p>WIRIS מספקת סביבה חזותית נפרדת לבניית תשובה בכתיב מתמטי.</p>"
+"input their answers.</p>"
+msgstr "<p>MathQuill מייצג את תשובות הסטודנטים כנוסחאות יפות בזמן אמת תוך כדי ההקלדה של התשובות.</p><p>MathView מאפשר לסטודנטים לבחור מספר מבנים מתמטיים טיפוסיים (למשל שברים ושורש ריבועי) כאשר הם מזינים את התשובות.</p>"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1459
+msgid ""
+"<p>Mode in which the LANG and DIR settings for a single problem are "
+"determined.</p><p>The system will set the LANGuage attribute to either a "
+"value determined from the problem, a course-wide default, or the system "
+"default, depending on the mode selected. The tag will only be added to the "
+"DIV enclosing the problem if it is different than the value which should be "
+"set in the main HTML tag set for the entire course based on the course "
+"language.</p><p>There are two options for the DIRection attribute: \"ltr\" "
+"for left-to-write scripts, and \"rtl\" for right-to-left scripts like Arabic"
+" and Hebrew.</p><p>The DIRection attribute is needed to trigger proper "
+"display of the question text when the problem text-direction is different "
+"than that used by the current language of the course. For example, English "
+"problems from the library browser would display improperly in RTL mode for a"
+" Hebrew course, unless the problen Direction is set to LTR.</p><p>The "
+"feature to set a problem language and direction was only added in 2018 to "
+"the PG language, so most problems will not declare their language, and the "
+"system needs to fall back to determining the language and direction in a "
+"different manner. The OPL itself is all English, so the system wide fallback"
+" is to en-US in LTR mode.</p><p>Since the defaults fall back to the LTR "
+"direction, most sites should be fine with the \"auto::\" mode, but may want "
+"to select the one which matches their course language. The mode "
+"\"force::ltr\" would also be an option for a course which runs into trouble "
+"with the \"auto\" modes.</p><p>Modes:</p><ul><li>\"none\" prevents any "
+"additional LANG and/or DIR tag being added. The browser will use the main "
+"setting which was applied to the entire HTML page. This is likely to cause "
+"trouble when a problem of the other direction is "
+"displayed.</li><li>\"auto::\" allows the system to make the settings based "
+"on the language and direction reported by the problem (a new feature, so not"
+" set in almost all existing problems) and falling back to the expected "
+"default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" allows the "
+"system to make the settings based on the language and direction reported by "
+"the problem (a new feature, so not set in almost all existing problems) but "
+"falling back to the language with the given LangCode and the direction Dir "
+"when problem settings are not available from PG.</li><li>\"auto::Dir\" for "
+"problems without PG settings, this will use the default en=english language,"
+" but force the direction to Dir. Problems with PG settings will get those "
+"settings.</li><li>\"auto:LangCode:\" for problems without PG settings, this "
+"will use the default LTR direction, but will set the language to "
+"LangCode.Problems with PG settings will get those "
+"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
+" by the PG code of the problem, and will force the system to set the "
+"language with the given LangCode and the direction to Dir for <b>all</b> "
+"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
+"PG code of the problem, and will force the system to set the direction to "
+"Dir for <b>all</b> problems, but will avoid setting any language attribute "
+"for individual problem.</li></ul>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1514
+msgid ""
+"<p>Some servers handle courses taking place in different timezones.  If this"
+" course is not showing the correct timezone, enter the correct value here.  "
+"The format consists of unix times, such as \"America/New_York\", "
+"\"America/Chicago\", \"America/Denver\", \"America/Phoenix\" or "
+"\"America/Los_Angeles\".</p>Complete list: <a "
+"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
+msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1736
+#: /opt/webwork/webwork2/conf/defaults.config:1638
 msgid ""
 "<p>This sets whether the Reduced Scoring system will be enabled.  If enabled"
 " you will need to set the default length of the reduced scoring period and "
@@ -310,22 +431,35 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr "<p>הגדרה זו קובעת האם תקופת ניקוד מופחת מופעל בקורס. במידה וזה מופעל יש להגדיר למטה אורך ברירת מחדל לתקופת הניקוד המופחת ואת ערך העבודה בתקופת הניקוד המופחת. </p><p>כדי להשתמש ביכולת זו, צריך להפעיל ניקוד מופחת בכל גליון בו זה נדרש בעורך של נתוני הגליון, ואז להגדיר את המועד של תחילת תקופת הניקוד המופחת.</p><p>ניקוד מופחת עובד יחד עם avg_problem_grader (שהוא מנקד ברירת המחדל) ו-std_problem_grader (מנקד ההכל או כלום). זה יעבוד עם מנקדים אחרים שנכתבו בצורה מתאימה.</p>"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1979
+#: /opt/webwork/webwork2/conf/defaults.config:1881
 msgid ""
 "<p>When viewing a problem, users may choose different methods of rendering "
 "formulas via an options box in the left panel. Here, you can adjust what "
 "display modes are listed.</p><p>Some display modes require other software to"
 " be installed on the server. Be sure to check that all display modes "
-"selected here work from your server.</p><p>The display modes are "
-"<ul><li>plainText: shows the raw LaTeX strings for formulas.</li><li>images:"
-" produces images using the external programs LaTeX and "
-"dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place "
-"render mathematics.</li></ul></p></p>You must use at least one display mode."
-" If you select only one, then the options box will not give a choice of "
-"modes (since there will only be one active).</p>"
-msgstr "<p>כאשר צופים בשאלה, משתמשים יכולים לבחור בין מספר אופנים בהם ניתן להציג נוסחאות. הבחירה נעשית בהגדרות המשתמש, ואולי היה גם אפשרות לשנות את ההגדרה בתפריט הראשית. ניתן לקבוע כאן אילו אפשרויות זמינות בקורס.</p><p>חלק משיטות התצוגה מחייבות התקנה נוספת של תוכנות בשרת. יש לוודא שכל שיטות תצוגה הנבחרות פועלות באופן תקין בשרת שלך.</p><p>שיטות התצוגה הן: <ul><li>plainText: מראה את קוד ה LaTeX בצורת שפוטה עבור הנוסחאות.</li><li>images: המערכת מייצרת תמונה של הנוסחאות בעזרת התוכנות LaTeX ו- dvipng. יש לוודא שהתוכנות האלו מותקנות ועובדות בצורה תקינה בשרת. </li><li>MathJax: שיטת תצוגה מבוססת javascript שמציגה נוסחאות בצורה נגישה ויפה בתוכן שמוצג בדפדפנים מודרניים. זהו תוכנה שהחליפה את jsMath הותיקה יותר.</li></ul></p></p>\nחובה לסמן לפחות שיטת תצוגה אחד. אם מסומן רק שיטה בודדת, תיבת הבחירה של השיטה הפעילה לא תאפשר שינוי (כי אין חלופות נוספות הפעילות בקורס).</p>"
+"selected here work from your server.</p><p>The display modes "
+"are</p><ul><li>plainText: shows the raw LaTeX strings for "
+"formulas.</li><li>images: produces images using the external programs LaTeX "
+"and dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place"
+" render mathematics.</li></ul><p>You must use at least one display mode. If "
+"you select only one, then the options box will not give a choice of modes "
+"(since there will only be one active).</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1476
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with a question in "
+"this test. Please inform your instructor including the warning messages "
+"below."
+msgstr "<strong>אזהרה</strong>: ייתכן שישנה בעיה בשאלה. אנא עדכן את צוות תמיכה, או את סגל ההוראה אם אין לך אפשרות להודיע לצוות התמיכה ישירות. חשוב לתת מידע מפורט על התקלה וההודעות שהופיעו כולל הודעות שמופיעות בתחתית הדף."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1828
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1236
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with this question. "
+"Please inform your instructor including the warning messages below."
+msgstr "<strong>אזהרה</strong>: ייתכן שישנה בעיה בשאלה. אנא עדכן את צוות תמיכה, או את סגל ההוראה אם אין לך אפשרות להודיע לצוות התמיכה ישירות. חשוב לתת מידע מפורט על התקלה וההודעות שהופיעו כולל הודעות שמופיעות בתחתית הדף."
+
+#: /opt/webwork/webwork2/conf/defaults.config:1730
 msgid ""
 "<ul><li><b>SMAcheckAnswers</b>: enables the Check Answers button <i>for the "
 "new problem</i> when Show Me Another is "
@@ -337,8 +471,8 @@ msgid ""
 "time</li><li><b>SMAshowHints</b>: show hints <i>for the new problem</i> "
 "(assuming they exist)</li></ul>Note: there is very little point enabling the"
 " button unless you check at least one of these options - the students would "
-"simply see a new version that they can not attempt or learn from.</p>"
-msgstr "<ul><li><b>SMAcheckAnswers</b>: מאשר את הכפתור לבדיקת תשובות <i>לשאלה החדשה</i> כאשר \"הראה לי שאלה דומה\" מופעלת</li><li><b>SMAshowSolutions</b>: מאפשר גישה לפתרון <i>של השאלה החדשה</i> כאשר \"הראה לי שאלה דומה\" מופעלת; במידה וקיים פתרון במערכת </li><li><b>SMAshowCorrect</b>: מאפשר לבקש לראות את התשובות הנכונות <i>לשאלה החדשה</i> כאשר \"הראה לי שאלה דומה\" מופעלת; נא לשים לב שאפשרות זה שימושית רק אם  האפשרות  <b>SMAcheckAnswers</b>גם מופעלת</li><li><b>SMAshowHints</b>: מאפשר לראות רמזים  <i>עבור השאלה החדשה\n</i> (בהנחה שקיימים)</li></ul>הערה: אין תועלת משמעותית בהפעלת \"הראה לי שאלה דומה\" אם לא תאפשר לפחות אחת מהאפשרויות האלו, כי מבלי לאפשר אפשרויות כלל יתן לסטודנט להציג שאלה דומה מבלי אפשרות להגיש תשובות או ללמוד ממנה.</p>"
+"simply see a new version that they can not attempt or learn from."
+msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:35
 msgid "A URL for the LMS"
@@ -346,73 +480,123 @@ msgstr "כתובת אתר מערכת הלימוד LMS"
 
 #. ($add_courseID)
 #. ($rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1376
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:688
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:600
 msgid "A course with ID %1 already exists."
 msgstr "קורס עם מזהה %1 כבר קיים."
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2564
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1220
 msgid ""
 "A directory already exists with the name %1. You must first delete this "
 "existing course before you can unarchive."
 msgstr "תקייה עם השם %1 כבר קיימת. יש למחוק את הקורס הזה לפני שניתן להוציאו מהארכיון."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:119
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:111
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:42
 msgid ""
 "A file name cannot begin with a dot, it cannot be empty, it cannot contain a"
 " directory path component and only the characters -_.a-zA-Z0-9 and space are"
 " allowed."
 msgstr "שם של קובץ לא יכול להתחיל בנקודה, לא יכול להיות ריק, לא יכול להכיל מרכיבי מסלול path, ורק התווים  -_.a-zA-Z0-9 ורווחים מותרים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1342
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1366
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:738
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
 msgid "A file with that name already exists"
 msgstr "כבר קיים קובץ עם שם זה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:348
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:19
 msgid ""
 "A hardcopy file was generated, but it may not be complete or correct. Please"
 " check that no problems are missing and that they are all legible. If not, "
 "please inform your instructor."
 msgstr "הוכן קובץ להדפסה, אבל הוא עשוי להיות חלקי או שגוי. אנא בדוק שאין שאלות חסרות ושכולן קריאות. אם לא, אנא פנה לצוות התמיכה או לסגל ההוראה."
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:56
+msgid ""
+"A hash reference in which the keys are the achievement_id's assigned to the "
+"current user and the values are 0 or 1 which stores if the user has earned "
+"the associated achievement or not."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:52
+msgid ""
+"A hash reference which contains a problems metadata, such as DBsubject, "
+"DBchapter, DBsection,  and so on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:37
+msgid "A hash reference which contains the problem data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:40
+msgid "A hash reference which contains the set data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:60
+msgid ""
+"A hash reference which saves data for this user and this achievement. This "
+"hash is persistent between evaluations and changes to this variable will be "
+"saved in the database."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:64
+msgid ""
+"A hash reference which saves global data for this user. This hash is "
+"persistent between evaluations and changes to this variable will be saved in"
+" the database."
+msgstr ""
+
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3291
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1695
 msgid ""
 "A location with the name %1 already exists in the database.  Did you mean to"
 " edit that location instead?"
 msgstr "קבר קיים מיקום בשם %1 במסד הנתונים. האם התכוונת לערוך אותו?"
 
-#. ($subject, $number_of_recipients, $courseName, $failed_messages)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1007
+#. ($mail_data->{subject}, $number_of_recipients, $mail_data->{courseName},
+#. $failed_messages)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:113
 msgid ""
 "A message with the subject line \"%1\" has been sent to %quant(%2,recipient)"
 " in the class %3.  There were %4 message(s) that could not be sent."
 msgstr "הודעה עם הנושא \"%1\" נשלחה ל-%quant(%2, נמען, נמענים) בכיתה %3.  לא היה ניתן לשלוח %4 הודעה/ות."
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:644
-msgid "A new file has been created at '%1'"
-msgstr "נוצר קובץ חדש ב-'%1'"
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:315
+msgid "A new file has been created at \"%1\""
+msgstr "נוצר קובץ חדש ב- \"%1\""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2006
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1146
+msgid "A new file has been created at \"%1\" with the contents below."
+msgstr "נוצר קובץ חדש ב- \"%1\" עם התוכן שמופיע למטה."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:154
+msgid ""
+"A new problem whose path ends in newProblem.pg should be given a new name, "
+"for example, \"myNewProblem.pg\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:20
 msgid ""
-"A new file has been created at '%1' with the contents below.  No changes "
-"have been made to set %2"
-msgstr "נוצר קובץ חדש ב-'%1' עם התוכן שמפורט למטה. לא נעשו שינויים בגליון %2"
+"A student must be assigned a homework set in order for it to appear on their"
+" WeBWorK home page. Check the box in the left column to assign a student to "
+"that homework set. Uncheck the box to unassign a student. If a student is "
+"unassigned from a homework set, all of the student's data for that homework "
+"set is deleted and cannot be recovered. Use this action cautiously!"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:681
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:20
 msgid ""
-"A period (.) indicates a problem has not been attempted, and a number from 0"
-" to 100 indicates the grade earned. The number on the second line gives the "
-"number of incorrect attempts."
-msgstr "נוקדה (.) מסמל שהשאלה לא נוסתה, והמספר מ-0 ל-100 מראה את הציון. המספר בשורה השנייה הוא מספר הניסיונות הלא נכונים."
+"A student needs to be assigned a set in order for them to work it. Once a "
+"student is unassigned a set, all the data for them is lost and there is no "
+"way to undo it. When unassigning be sure to change the option to \"Allow "
+"unassign\"."
+msgstr ""
 
 # Leave symbol codes in place
-#: /opt/webwork/webwork2/conf/defaults.config:1647
+#: /opt/webwork/webwork2/conf/defaults.config:1549
 msgid ""
 "A switch to govern the use of a Progress Bar for the student; this also "
 "enables/disables the highlighting of the current problem in the side bar, "
@@ -420,474 +604,665 @@ msgid ""
 "(&#x2717;), or unattempted (no symbol)."
 msgstr "מתג ששולט בשימוש במד ההתקדמות עבור הסטודנט; המתג גם מפעיל/מכבה את הדגשת השעלה הנוכחית בסרגל הצד, והאם היא נכונה (&#x2713;), מתבצעת (&hellip;), שגויה (&#x2717;), או לא נוסתה כלל (ללא סימון)."
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:42
+msgid "A unique key identifying the achievement."
+msgstr ""
+
 # Short for ADJUSTED STATUS
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:500
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:712
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:535
 msgid "ADJ STATUS"
 msgstr "ציון מותאם"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2296
-msgid "ANSWERS NOT RECORDED"
-msgstr "התשובות לא נשמרו"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2281
-msgid "ANSWERS NOT RECORDED --"
-msgstr "התשובות לא נשמרו --"
+#. ($c->{scoreRecordedMessage}[ $probOrder->[$i] ])
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:504
+msgid "ANSWERS NOT RECORDED -- %1"
+msgstr "התשובות לא נשמרו -- %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2295
-msgid "ANSWERS ONLY CHECKED -- "
-msgstr "התשובות נבדקו בלבד --"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2232
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1505
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:515
 msgid "ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"
 msgstr "התשובות נבדקו אך לא נשמרו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1527
 msgid ""
 "ATTEMPT NOT ACCEPTED -- Please submit answers again (or request new version "
 "if neccessary)."
 msgstr "ההגשה לא נקלטה עקב תקלה טכנית. יש להגיש שוב את התשובות, או לפי הצורך לבקש גרסה חדשה של השאלה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1534
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_password_form.html.ep:1
 msgid "Abandon changes"
 msgstr "בטל שינויים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1083
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_export_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_export_form.html.ep:1
 msgid "Abandon export"
 msgstr "בטל ייצוא"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:520
 msgid ""
 "Account creation is currently disabled in this course.  Please speak to your"
 " instructor or system administrator."
 msgstr "נחסמה האפשרות ליצור חשבונות חדשים בקורס זה. אנא פנה לצוות התמיכה או לסגל ההוראה של הקורס."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:153
-msgid "Achievement"
-msgstr "הישג"
-
-#. ($targetAchievementID, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:638
-msgid "Achievement %1 created with evaluator '%2'."
-msgstr "הישג %1 נוצר עם מעריך '%2'."
+#. ($targetAchievementID,			$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:310
+msgid "Achievement %1 created with evaluator \"%2\"."
+msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:847
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:378
 msgid "Achievement %1 exists.  No achievement created"
 msgstr "הישג %1 קיים. לא נוצר הישג"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:444
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:63
 msgid "Achievement Editor"
 msgstr "עורך ההישגים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:548
-msgid "Achievement Evaluator Editor"
-msgstr "עורך מעריכי הישגים"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:17
+msgid "Achievement Editor Help"
+msgstr ""
 
-#. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:170
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:17
+msgid "Achievement Evaluator Editor Help"
+msgstr ""
+
+#. ($c->stash('achievementID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:109
 msgid "Achievement Evaluator for achievement %1"
 msgstr "מעריך הישגים עבור הישג %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1446
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1454
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1482
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:13
 msgid "Achievement ID"
 msgstr "מזהה הישג"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:274
 msgid "Achievement ID exists!  No new achievement created.  File not saved."
 msgstr "מזהה הישג כבר קיים! לא נוצר הישג חדש. קובץ לא נשמר."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1698
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:41
+msgid "Achievement ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:3
+msgid "Achievement List"
+msgstr "רשימת הישגים"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1600
 msgid "Achievement Points Per Problem"
 msgstr "נקודות הישג עבור כל שאלה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:558
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:455
 msgid "Achievement User Editor"
 msgstr "עורך משתמש יעידים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:17
+msgid "Achievement User Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:48
 msgid "Achievement has been assigned to all users."
 msgstr "ההישג הוקצה לכל המשתמשים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:67
 msgid "Achievement has been assigned to selected users."
 msgstr "ההישג הוקצה למשתמשים שנבחרו."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:60
 msgid "Achievement has been unassigned to all students."
 msgstr "ההישג הוסר לכל המשתמשים."
 
-#. (CGI::a({ href => $fileManagerURL }, $scoreFileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:711
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:38
+msgid "Achievement options"
+msgstr ""
+
+#. ($c->link_to(                           $scoreFileName => $c->systemLink(
+#. $c->url_for('instructor_file_manager')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:318
 msgid "Achievement scores saved to %1"
 msgstr "נקודות הישגים נשמרו ל-%1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:260
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:241
 msgid "Achievements"
 msgstr "הישגים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:531
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:17
+msgid "Achievements Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:26
+msgid ""
+"Achievements are evaluated in the order shown below, with the exception of "
+"\"level\" achievements.  Achievements in the \"level\" category are "
+"evaluated first and control the XP thresholds and rewards (achievement "
+"items) for reaching each level. Achievements in the \"secret\" category are "
+"not shown to students until they earn the achievement, and is used for "
+"fun/surprise achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:32
+msgid ""
+"Achievements in the same category, with sequential numbers, and whose ID "
+"starts with the same \"prefix_\" (up to the last underscore), are treated as"
+" achievement chains.  Achievement chains are a sequence of achievements "
+"which build upon themselves, such as complete one problem, complete 10 "
+"problems, complete 25 problems, and so on. Students will only see the "
+"achievements in the chain they have completed or are currently working on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:201
 msgid "Act as"
 msgstr "התחזה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:207
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:26
 msgid "Act as:"
 msgstr "התחל להתחזות ל-:"
 
-#. (HTML::Entities::encode_entities($prettyEUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1134
+#. ($effectiveUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:26
 msgid "Acting as %1."
 msgstr "מתחזה ל- %1."
 
 #. ($actionID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:372
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:223
 msgid "Action %1 not found"
 msgstr "פעולה %1 לא נמצאה"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1706
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:101
+msgid "Actions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1608
 msgid ""
 "Activating this will enable achievement rewards. This feature allows "
 "students to earn rewards by completing achievements that allow them to "
 "affect their homework in a limited way."
 msgstr "הפעלת פרסי/חפצי הישגים. אפשרות זה מזכה סטודנטים שזכו בהישגים לזכות בפרסים/חפצים שיאפשרו להם להשפיע על שיעורי הבית שלהם באופן מוגבל."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:45
 msgid "Active"
 msgstr "פעיל"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1691
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:50
+msgid "Active Students"
+msgstr "סטודנטים פעילים"
+
+#. ($c->{prettyID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:19
+msgid "Active Students Problem %1 Grades"
+msgstr "ציוני שאלה  %1 של סטודנטים פעילים"
+
+#: /opt/webwork/webwork2/conf/defaults.config:1593
 msgid ""
 "Activiating this will enable Mathchievements for webwork.  Mathchievements "
 "can be managed by using the Achievement Editor link."
 msgstr "מפעיל הישגים עבור הקורס. ניהול ההישגים מתבצע בעורך ההישגים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2947
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1548
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:166
 msgid "Add"
 msgstr "הוסף"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:89
 msgid "Add All"
 msgstr "הוסף הכל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:644
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:32
 msgid "Add Course"
 msgstr "הוסף קורס"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:253
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:17
+msgid "Add Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:14
+msgid "Add Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:98
 msgid "Add Students"
 msgstr "הוסף סטודנטים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:406
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:349
 msgid "Add Users"
 msgstr "הוסף משתמשים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:518
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:17
+msgid "Add Users Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:47
 msgid "Add WeBWorK administrators to new course"
 msgstr "הוסף מנהלי ווב-וורק לקורס החדש"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1509
-msgid "Add a new test for which Gateway?"
-msgstr "הוסף מבחן חדש לאיזה מבחן מחסום?"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:79
+msgid "Add a TA or an instructor (change permission level of user)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:60
+msgid "Add a few students to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:50
+msgid "Add a new version for which test?"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1441
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:20
 msgid "Add as what filetype?"
 msgstr "איזה סוג קובץ להוסיף?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/add_form.html.ep:3
 msgid "Add how many users?"
 msgstr "כמה משתמשים להוסיף?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1549
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:69
+msgid "Add many students to a course from a class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:108
+msgid "Add n blank problem template(s) to the end of homework set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:164
 msgid "Add problem to target set"
 msgstr "הוסף את השאלה לגליון היעד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Add problems to"
 msgstr "הוסף שאלות ל-"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1422
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:161
+msgid ""
+"Add this problem as the last problem of an existing set, either as a problem"
+" or as the set header (the text that appears on the home page of a homework "
+"set). You can rearrange the order of the problems later using the \"Hmwk "
+"Sets Editor\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:7
 msgid "Add to what set?"
 msgstr "הוסף לאיזה גליון?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:20
+msgid ""
+"Add users to the course.  Select the number of students/users to add and "
+"then add any desired information.  The only mandatory information is the "
+"\"Login Name\". Any other fields may be left blank.  The \"Student ID\" will"
+" be the initial password for the user if provided."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:26
 msgid "Add which new users?"
 msgstr "איזה משתמשים להוסיף?"
 
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:883
+msgid "Added \"%1\" to %2 as new hardcopy header"
+msgstr "נוסף \"%1\" אל %2 כקובץ כותרת להדפסות"
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:854
+msgid "Added \"%1\" to %2 as new set header"
+msgstr "נוסף \"%1\" אל %2 כקובץ כותרת רגילה של הגיליון"
+
 #. ('{number}', '{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1055
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:27
 msgid "Added %1 problems to set %2."
 msgstr "נוספו %1 שאלות לגליון %2."
 
-#. ($sourceFilePath, $targetSetName,($set->assignment_type eq 'jitar' ?
-#. join('.',jitar_id_to_seq($targetProblemNumber)
-#. ($new_file_name, $setName, ($set->assignment_type eq 'jitar' ?
-#. join('.',jitar_id_to_seq($targetProblemNumber)
 #. ($new_file_path, $setID, $targetProblemNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1510
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2001
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1912
+#. ($sourceFilePath,                       $targetSetName,                 (
+#. $set->assignment_type eq 'jitar'                                ? join('.',
+#. jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:825
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1837
 msgid "Added %1 to %2 as problem %3"
 msgstr "נוסף %1 ל%2 בתור שאלה %3"
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1566
-msgid "Added '%1' to %2 as new hardcopy header"
-msgstr "נוסף '%1' ל%2 בתור קידומת הדפסה חדשה"
-
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1540
-msgid "Added '%1' to %2 as new set header"
-msgstr "נוסף '%1' ל%2 בתור קידומת גליון חדשה"
+#. ($new_file_name,                                $c->{setID},
+#. (                                       $set->assignment_type eq 'jitar'
+#. ? join('.', jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1139
+msgid "Added %1 to %2 as problem %3."
+msgstr "נוסף %1 אל %2 כשאלה %3."
 
 #. (join(', ', @toAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1974
 msgid "Added addresses %1 to location %2."
 msgstr "נוספו כתובות %1 למיקום %2."
 
+#. ($user->user_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:167
+msgid "Added missing permission level for user %1."
+msgstr "נוסף רמת הרשאות שהיתה חסרה עבור המשתמש %1."
+
 #. ('{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1054
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:26
 msgid "Added one problem to set %1."
 msgstr "נוספה שאלה אחת לגליון %1."
 
-#: /opt/webwork/webwork2/conf/defaults.config:2149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Added user:"
+msgstr "נוסף משתמש:"
+
+#. ('<code>[Scoring]/report_grades_data.csv</code>',
+#. '<code>[TMPL]/email/report_grades.msg</code>',)
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:33
+msgid ""
+"Additional (external) grades can be shown on this page by placing them in "
+"the CSV file %1.  The first six columns must be (in order): Student ID, "
+"Username, Last Name, First Name, Section, Recitation.  The remaining columns"
+" can list any external grades.  To display the grades, the CSV file is "
+"merged with the \"Email\" message %2, which will be rendered and displayed "
+"below the grade table.  The message can be created on the \"Email\" page and"
+" the CSV file can be created/uploaded using the \"File Manager\".  External "
+"grades can only be displayed here and are not included in any totals or "
+"statistics."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2060
 msgid "Additional addresses for receiving feedback e-mail"
 msgstr "כתובות נוספות לקבלת מכתבי משוב"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:235
 msgid "Additional submissions available."
 msgstr "קיימת אפשרות להגיש שוב."
 
 #. ($badLocAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1708
 msgid ""
 "Address(es) %1 already exist in the database.  THIS SHOULD NOT HAPPEN!  "
 "Please double check the integrity of the WeBWorK database before continuing."
 msgstr "כתובת(/ות) %1 כבר קיימת במסד הנתונים. זה לא אמור לקרות! אנא בדוק שנית את אמינות מסד הנתונים של WeBWorK לפני שאתה ממשיך."
 
 #. (join(', ', @noAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1986
 msgid ""
 "Address(es) %1 in the add list is(are) already in the location %2, and so "
 "were skipped."
 msgstr "הכתובת(/ות) %1 שברשימת ההוספה כבר במיקום %2, ולכן דולגה(/ו)."
 
 #. (join(', ', @noDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3603
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2008
 msgid ""
 "Address(es) %1 in the delete list is(are) not in the location %2, and so "
 "were skipped."
 msgstr "הכתובת(/ות) %1 שברשימת המחיקה לא במיקום %2, ולכן דולגה(/ו)."
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1683
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and resubmit."
 msgstr "הכתובת(ות) %1 היא(/הן) לא בצורה מזוהה. אנא בדוק את הנתונים שהוזנו ושלח שוב."
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1998
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and try again."
 msgstr "הכתובת(ות) %1 היא(/הן) לא בצורה מזוהה. אנא בדוק את הנתונים שהוזנו ונסה שוב."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:117
 msgid "Addresses"
 msgstr "כתובות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:53
 msgid ""
 "Addresses for new location.  Enter one per line, as single IP addresses "
 "(e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP ranges "
 "(e.g., 192.168.1.101-192.168.1.150):"
 msgstr "כתובות למיקום חדש. הזן כתובת אחת בכל שורה, בתור כתובת IP יחידה, (לדוגמה 192.168.1.101) או בתור mask - מסכת כתובות (לדוגמה 192.168.1.0/24),  או בתור טווח של כתובות (לדוגמה 192.168.1.101-192.168.1.150):"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:27
 msgid ""
 "Addresses to add to the location.  Enter one per line, as single IP "
 "addresses (e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP"
 " ranges (e.g., 192.168.1.101-192.168.1.150):"
 msgstr "כתובות להוסיף למיקום הקיים. הזן כתובת אחת בכל שורה, בתור כתובת IP יחידה, (לדוגמה 192.168.1.101) או בתור mask - מסכת כתובות (לדוגמה 192.168.1.0/24), או בתור טווח של כתובות (לדוגמה 192.168.1.101-192.168.1.150):"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:232
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:27
 msgid "Adds 24 hours to the close date of a homework."
 msgstr "הוסף 24 שעות לתאריך סגירת שיעורי הבית."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:323
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:27
 msgid "Adds 48 hours to the close date of a homework."
 msgstr "הוסף 48 שעות לתאריך סגירת שיעורי הבית."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:110
+msgid ""
+"Adds new template problems to the set when the set is saved. You can modify "
+"the template to create your own problem, by clicking on the \"Edit Problem\""
+" link and saving to some new file, e.g. \"myNewProblem.pg\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:19
 msgid "Adjusted Status"
 msgstr "ציון מותאם"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:56
 msgid "Adobe PDF"
 msgstr "קובת PDF"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:675
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:42
 msgid "Advanced Search"
 msgstr "חיפוש מתקדם"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:196
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:206
 msgid "After set answer date"
 msgstr "לאחר תאריך התשובות של הגליון"
 
-#. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:325
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:33
 msgid ""
-"After the reduced scoring period begins all work counts for %1% of its "
-"value."
-msgstr "לאחר תחילת תקופת הניקוד המופחת, כל ציון נספר כ-%1% מערכו המלא."
+"After the due date this set enters a reduced scoring period until it closes "
+"on %1.  All work completed during the reduced scoring period counts for %2% "
+"of its value."
+msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:304
 msgid "Afterward reduced credit can be earned until %1."
 msgstr "לאחר מכן ניתן לקבל ניקוד מופחת עד %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:56
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:60
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:23
 msgid "All Chapters"
 msgstr "כל הפרקים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:57
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:34
 msgid "All Sections"
 msgstr "כל תתי-הפרקים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:6
 msgid "All Selected Constraints Joined by \"And\""
 msgstr "כל ההגלות שנבחרו יחוברו על ידי \"ו-\""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:71
+msgid "All Sets"
+msgstr "כל הגליונות"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:12
 msgid "All Subjects"
 msgstr "כל הנושאים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:48
 msgid "All Textbooks"
 msgstr "כל ספרי הלימוד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:54
+msgid "All Users"
+msgstr "כל המשתמשים"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:49
 msgid "All assignments were made successfully."
 msgstr "כל המטלות בוצעו בהצלחה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:953
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:386
 msgid "All listed sets were hidden from all the students"
 msgstr "כל הגליונות הרשומות הוסתרו מכל הסטודנטים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:951
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:381
 msgid "All listed sets were made visible for all the students"
 msgstr "כל הגליונות הרשומות הוגדרו כזמינות לכל הסטודנטים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:407
 msgid "All of the answers above are correct."
 msgstr "כל התשובות נכונות."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:398
 msgid "All of the gradeable answers above are correct."
 msgstr "כל התשבות שניתנות לבדיקה הן נכונות."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:247
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:162
+msgid ""
+"All of the paths for problem files are relative to the templates directory "
+"of the current course. You can access this directory \"directly\" using the "
+"File Manager page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:68
 msgid "All of these files will also be made available for mail merge."
 msgstr "כל הקבצים הללו יהיו נגשים למיזוג בייצור הודעות דואר."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:960
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:9
+msgid "All problems"
+msgstr "כל השאלות"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:5
+msgid "All sections"
+msgstr "כל קבוצות הרישום"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2145
+msgid "All selected courses are already hidden."
+msgstr "כל הקורסים הנבחים כבר מוחבאים."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2214
+msgid "All selected courses are already unhidden."
+msgstr "כל הקורסים הנבחים כבר גלויים."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:399
 msgid "All selected sets hidden from all students"
 msgstr "כל הגליונות שנבחרו הוחבאו מכל הסטודנטים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:394
 msgid "All selected sets made visible for all students"
 msgstr "כל הגליונות שנבחרו נהפכו לזמינים לכל הסטודנטים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:946
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:373
 msgid "All sets hidden from all students"
 msgstr "כל הגליונות הוחבאו מכל הסטודנטים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:945
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:368
 msgid "All sets made visible for all students"
 msgstr "כל הגליונות נהפכו לזמינים לכל הסטודנטים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:619
 msgid "All sets were selected for export."
 msgstr "כל הגליונות נבחרו לייצוא"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:56
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:54
 msgid "All unassignments were made successfully."
 msgstr "כל ביטולי ההקצאות בוצעו בהצלחה."
 
-#: /opt/webwork/webwork2/conf/defaults.config:2047
+#: /opt/webwork/webwork2/conf/defaults.config:1948
 msgid "Allow Unicode alternatives in student answers"
 msgstr "אפשר חלופות יוניקוד Unicode בתשובות של הסטודנטים"
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:74
 msgid "Allow the LMS to update user account data"
 msgstr "אפשר למערת הלימוד LMS לעדכן את נתוני חשבונות המשתמשים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:68
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:105
 msgid "Allow unassign"
 msgstr "אפשר לבטל הקצאה"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2069
+#: /opt/webwork/webwork2/conf/defaults.config:1970
 msgid "Allowed error, as a percentage, for numerical comparisons"
 msgstr "שגיאה מותרת, באחוזים, להשוואה מספרית"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1886
+#: /opt/webwork/webwork2/conf/defaults.config:1788
 msgid "Allowed to <em>act as</em> another user"
 msgstr "מורשה <em>להתחזות</em> למשתמש אחר"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1923
+#: /opt/webwork/webwork2/conf/defaults.config:1825
 msgid "Allowed to change display settings used in pg problems"
 msgstr "יכול לשנות את הגדרות התצוגה של שאלות PG"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1913
+#: /opt/webwork/webwork2/conf/defaults.config:1815
 msgid "Allowed to change their e-mail address"
 msgstr "מורשה לשנות כתובת דוא\"ל"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1877
+#: /opt/webwork/webwork2/conf/defaults.config:1779
 msgid "Allowed to change their password"
 msgstr "מורשה לשנות סיסמה"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1872
+#: /opt/webwork/webwork2/conf/defaults.config:1774
 msgid "Allowed to login to the course"
 msgstr "מורשה להתחבר לקורס"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1950
+#: /opt/webwork/webwork2/conf/defaults.config:1852
 msgid "Allowed to see solutions before the answer date"
 msgstr "מורשה לראות תשובות לפני תאריך התשובות"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1945
+#: /opt/webwork/webwork2/conf/defaults.config:1847
 msgid "Allowed to see the correct answers before the answer date"
 msgstr "מורשה לראות תשובות נכונות לפני תאריך התשובות"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1934
+#: /opt/webwork/webwork2/conf/defaults.config:1836
 msgid "Allowed to view past answers"
 msgstr "מורשה לראות תשובות מהעבר"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1940
+#: /opt/webwork/webwork2/conf/defaults.config:1842
 msgid "Allowed to view problems in sets which are not open yet"
 msgstr "מורשה לצפות בשאלות בגליונות שעדיין לא נפתחו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1572
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:82
+msgid ""
+"Allows configuration of certain parameters, such as permission levels, "
+"default display mode for equations, and email feedback behavior, on a course"
+" by course basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:126
+msgid "Also copy simple configuration file"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:26
 msgid "Amulet of Extension"
 msgstr "תליון ההארכה"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:20
+msgid ""
+"An achievement evaluator is a perl script that is run after each problem is "
+"submitted which returns a truth value of 0 (didn't earn) or 1 (earn). The "
+"evaluator is given access to different variables which contain data about "
+"the problem and set that is used to determine if the achievement is earned "
+"or not."
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:37
 msgid ""
 "An address that can be used to log in to the LMS. This is used in messages "
@@ -895,248 +1270,308 @@ msgid ""
 "WeBWorK course."
 msgstr "כתובת הגישה לכניסה למערכת הלימוד LMS. נכלל בהודעות שמפנות משתמשים לחזור דרך מערכת הלימוד כדי לקבל גישה לתוכן בקורס הווב-וורק."
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:43
+msgid ""
+"An array which lists the hash reference of all the problems in the current "
+"set."
+msgstr ""
+
 #. ($archive_courseID)
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2350
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2647
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1274
 msgid "An error occured while archiving the course %1:"
 msgstr "שגיאה ארעה בזמן הוספת הקורס %1 לארכיון:"
 
 #. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:658
 msgid "An error occured while changing the title of the course %1."
 msgstr "שגיאה ארעה בזמן שינוי כותרתו של הקורס %1."
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1795
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:878
 msgid "An error occured while deleting the course %1:"
 msgstr "שגיאה ארעה בזמן מחיקת הקורס %1:"
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1521
+#. ($rename_oldCourseID,						$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:751
 msgid "An error occured while renaming the course %1 to %2:"
 msgstr "שגיאה ארעה בזמן שינוי השם של הקורס %1 ל-%2:"
 
 #. ($part + 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:106
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:25
 msgid "Answer %1 Score (%):"
 msgstr "תשובה %1 ציון (%):"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:425
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:765
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:789
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:812
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:79
 msgid "Answer Date"
 msgstr "תאריך תשובות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1712
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:39
 msgid "Answer Group Info"
 msgstr "הצג מידע טכני מפורט על קבוצות התשובות והבודקים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:59
 msgid "Answer Hash Info"
 msgstr "הצג מידע טכני על התשובות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:221
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:292
 msgid "Answer Log"
 msgstr "רשימת תשובות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:17
+msgid "Answer Log Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:285
 msgid "Answer Preview"
 msgstr "תצוגה מקדימה של התשובות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1465
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:48
+msgid ""
+"Answer availability for tests depends on multiple settings.  This only "
+"indicates the template answer date has passed.  See set editor for actual "
+"availability."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1276
 msgid "Answer(s) submitted:"
 msgstr "תשובה/ות שנשלחו:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
 msgid "Answer:"
 msgstr "תשובה:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:224
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
 msgid "Answers"
 msgstr "תשובות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:122
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:37
 msgid "Answers Available"
 msgstr "תשובות זמינות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1202
 msgid "Answers cannot be due until on or after the open date!"
 msgstr "תאריך התשובות לא יכול להיות לפני או בזמן תאריך הפתיחה!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1204
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1197
 msgid "Answers cannot be made available until on or after the close date!"
 msgstr "תשובות לא יכולות להפוך לזמינות עד זמן או לאחר תאריך הסגירה!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:313
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:21
 msgid ""
 "Any changes made below will be reflected in the achievement for ALL "
 "students."
 msgstr "כל שינוי שנעשה למטה יוחל על ההישגים עבור כל הסטודנטים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2259
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:507
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:175
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:69
 msgid "Any changes made below will be reflected in the set for ALL students."
 msgstr "כל שינוי שנעשה למטה יוחל על הגליון עבור כל הסטודנטים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:173
 msgid ""
 "Any changes made below will be reflected in the set for ONLY the student(s) "
 "listed above."
 msgstr "כל שינוי שנעשה למטה יופיע בגליון רק עבור הסטודנט/ים למעלה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:122
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:159
 msgid "Append"
 msgstr "צרף לגליון"
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1849
+#. (tag('strong', dir => 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:71
 msgid "Append to end of %1 set"
 msgstr "צרף בסופו של הגליון %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2264
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:51
+msgid "Applying definitions theoretically and proof writing"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:91
 msgid "Archive"
 msgstr "הוסף לארכיון"
 
 #. ($archive, $n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:892
-msgid "Archive '%1' created successfully (%quant( %2, file))"
-msgstr "ארכיון '%1\" נוצר בהצלחה  (%quant( %2, קובץ))"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:361
+msgid "Archive \"%1\" created successfully (%quant( %2, file))"
+msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1069
-msgid "Archive '%1' deleted"
-msgstr "ארכיון '%1' נמחק"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1846
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2048
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:525
+msgid "Archive \"%1\" deleted"
+msgstr "קובץ הארכיון \"%1\" נמחק"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:38
 msgid "Archive Course"
 msgstr "הוסף קורס לארכיון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2005
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:17
+msgid "Archive Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:63
 msgid "Archive Courses"
 msgstr "הוסף קורסים לארכיון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2423
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1158
 msgid "Archive next course"
 msgstr "הוסף את הקורס הבא לארכיון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1056
-msgid "Archive this Course"
-msgstr "הוסף את הקורס הזה לארכיון"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:61
 msgid "Archived Courses"
 msgstr "קרוסים בארכיון"
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:202
-msgid "Archiving course as %1.tar.gz. Reload FileManager to see it."
-msgstr "מוסיף את הקורס לארכיון בתור %1.tar.gz. רענן את מנהל הקבצים כדי לראות אותו."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:69
+msgid "Archived course as %1.tar.gz."
+msgstr "הקורס נשמר בארכיון בקובץ %1.tar.gz."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:25
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to access the .tar.gz files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:26
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to upload additional .tar.gz "
+"files to be unarchived."
+msgstr ""
 
-#. (CGI::b($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2191
+#. (tag('b', $archive_courseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:57
 msgid ""
 "Are you sure that you want to delete the course %1 after archiving? This "
 "cannot be undone!"
 msgstr "אתה בטוח שאתה רוצה למחוק את הקורס %1 אחרי שהוא נוסף לארכיון? זה בלתי הפיך!"
 
-#. (CGI::b($delete_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1736
+#. (tag('b', param('delete_courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:5
 msgid ""
 "Are you sure you want to delete the course %1? All course files and data "
 "will be destroyed. There is no undo available."
 msgstr "אתה בטוח שאתה למחוק את הקורס %1? כל המידע והקבצים של הקורס ימחקו. זה בלתי הפיך."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:72
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:511
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:64
+msgid ""
+"As the checkbox says, this includes a percentage grade column for each set."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:184
 msgid "Assign"
 msgstr "הקצה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:225
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:62
 msgid "Assign All Sets to Current User"
 msgstr "הקצה את כל הגליונות למשתמש הנוכחי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:171
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:106
+msgid "Assign achievements"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:43
+msgid "Assign and unassign selected exercise sets to selected users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:54
 msgid "Assign selected sets to selected users"
 msgstr "הקצה את הגליונות שנבחרו לסטודנטים שנבחרו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:919
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:154
+msgid "Assign sets to many students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:116
+msgid "Assign sets to one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:15
 msgid "Assign this achievement to which users?"
 msgstr "לאילו משתמשים יש להקצות את ההישג הנבחר? "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1366
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:62
 msgid "Assign this set to which users?"
 msgstr "לאיזה משתמשים להקצות גליון זה?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:15
 msgid "Assign to All Current Users"
 msgstr "הקצה לכל המשתמשים הנוכחיים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:3
 msgid "Assign which achievements?"
 msgstr "אילו הישגים יש להקצות?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:35
 msgid "Assigned"
 msgstr "הוקצה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1984
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:19
 msgid "Assigned Sets"
 msgstr "גליונות שהוקצו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:580
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:218
 msgid "Assigned achievements to users"
 msgstr "הקצה הישגים למשתמשים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2154
-msgid "Assigned to"
-msgstr "הוקצה ל-"
+#. (link_to(						$c->setCountMessage($db->countUserSets($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:96
+msgid "Assigned to %1."
+msgstr "שויך אל %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:212
 msgid "Assignment type"
 msgstr "סוג מטלה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-msgid "Assignments only"
-msgstr "רק מטלות"
-
-#: /opt/webwork/webwork2/conf/defaults.config:2004
+#: /opt/webwork/webwork2/conf/defaults.config:1906
 msgid "Assist with the student answer entry process."
 msgstr "כלי עזר פעיל להזנת תשובות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:417
 msgid "At least one of the answers above is NOT correct."
 msgstr "לפחות אחת מהתשובות איננה נכונה."
 
 # Short for "Attempts to Open Children"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:487
 msgid "Att. to Open Children"
 msgstr "נסיונות לפתיחת תתי-שאלות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:50
 msgid "Attachment:"
 msgstr "צרופה:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2293
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:107
 msgid "Attempt to upgrade directories"
 msgstr "נסה לשדרג תיקיות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:375
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:449
 msgid "Attempted"
 msgstr "בוצע נסיון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1416
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1498
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/attempts_row.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:73
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:13
 msgid "Attempts"
 msgstr "מספר ניסיונות שכבר הוגשו"
 
@@ -1144,64 +1579,114 @@ msgstr "מספר ניסיונות שכבר הוגשו"
 msgid "Audit"
 msgstr "שומע חופשי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:342
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:348
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:360
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:366
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:460
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:466
 msgid "Authentication failed.  Please speak to your instructor."
 msgstr "האימות נכשל. אנא פנה לצוות התמיכה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/InstructorRPCHandler.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:44
+msgid "Authentication failed. Log in again to continue."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:116
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:69
 msgid "Author Info"
 msgstr "מידע על הכותב"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:87
 msgid "Automatic"
 msgstr "אוטומטי"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2058
+#: /opt/webwork/webwork2/conf/defaults.config:1959
 msgid ""
 "Automatically convert Full Width Unicode characters to their ASCII "
 "equivalents"
 msgstr "החלף סימני יוניקוד Unicode רחבות לסימן ASCII השקול"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2911
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:97
+msgid ""
+"Automatically render all problems in the set on this page when \"Save "
+"Changes\" or \"Reset Form\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:667
 msgid "Automatically render problems on page load"
 msgstr "הצג את השאלות ישירות לאחר טעינת העמוד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1727
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:95
+msgid "Automatically render problems on page load."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:49
 msgid "Auxiliary Resources"
 msgstr "הצג מידע על קבצים/חומרים נוספים"
 
-#. ($emailDirectory,$old_default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:350
-msgid "Backup file <code>%1/%2</code> created."
-msgstr "גיבוי לקובץ <code>%1/%2</code> נוצר."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:179
+msgid "Average Attempts"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:118
+msgid "Average Attempts Per Problem"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:115
+msgid "Average Percent"
+msgstr ""
+
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:558
+msgid "Backup created on %1"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:255
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:1
 msgid "Badges"
 msgstr "תגים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:942
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:106
 msgid "Basic Search"
 msgstr "חיפוש בסיסי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:28
+msgid "Before Open Date"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:31
+msgid ""
+"Below the file list is a button and options for uploading files. Click the "
+"\"Choose File\" button, select the file, then click \"Upload\". A single "
+"file or a compressed tar (.tgz) file can be uploaded and if the option is "
+"selected, the archive is automatically unpacked and deleted.  Generally the "
+"\"automatic\" option on Format will correctly pick the correct type of file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:83
 msgid "Binary"
-msgstr "בינארי"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+msgid "Both Start and Grade"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1271
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:26
 msgid "Box of Transmogrification"
 msgstr "כופסת החליפין"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1093
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:40
 msgid "Browse"
 msgstr "עיין"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:512
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:991
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:16
 msgid "Browse from:"
 msgstr "עיין מתוך:"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2161
+#: /opt/webwork/webwork2/conf/defaults.config:2072
 msgid ""
 "By default, feedback is always sent to all users specified to recieve "
 "feedback.  This variable sets the system to only email feedback to users who"
@@ -1209,327 +1694,471 @@ msgid ""
 "will only be sent to section leaders."
 msgstr "כברירת מחדל, ההודעות משוב נשלחות תמיד לכל המשתמשים שמוגדרים לקבלת משוב. משתנה זה גורם למערכת לשלוח הודעות משוב רק למשתמשים חברי אותה הקבוצה כמו המשתמש ששולח את המשוב. כלומר, משוב ישלח רק למורים/אחראיים של הקבוצה."
 
-#: /opt/webwork/webwork2/conf/defaults.config:2151
+#: /opt/webwork/webwork2/conf/defaults.config:2062
 msgid ""
 "By default, feedback is sent to all users above who have permission to "
 "receive feedback. Feedback is also sent to any addresses specified in this "
 "blank. Separate email address entries by commas."
 msgstr "כברירת מחדל, משוב נשלח לכל המשתמשים לעיל שיש להם רשות לקבל משוב. המשוב נשלח לכל כתובת שמפורטת פה. הפרד כתובות דוא\"ל באמצעות פסיק."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
 msgid "CLOSE DATE"
 msgstr "תאריך הסגירה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:217
 msgid "CLOSE TIME"
 msgstr "זמן הגשה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:26
 msgid "Cake of Enlargement"
 msgstr "עוגת התפיחה"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1891
+#: /opt/webwork/webwork2/conf/defaults.config:1793
 msgid "Can e-mail instructor"
 msgstr "יכול לשלוח דוא\"ל לצוות התמיכה/סגל ההוראה"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1904
+#: /opt/webwork/webwork2/conf/defaults.config:1806
 msgid "Can report bugs"
 msgstr "יכול לדווח על באגים"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1955
+#: /opt/webwork/webwork2/conf/defaults.config:1857
 msgid "Can show old answers"
 msgstr "יכול לראות תשובות מהעבר"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1897
+#: /opt/webwork/webwork2/conf/defaults.config:1799
 msgid "Can submit answers for a student"
 msgstr "יכול לשלוח תשבות בשם סטודנט"
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:275
 msgid "Can't copy file: %1"
 msgstr "לא יכול לההעתיק את הקובץ: %1"
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:894
-msgid "Can't create archive '%1': command returned %2"
-msgstr "לא יכול ליצור את הארכיון '%1': פקודה החזירה %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
+msgid "Can't create archive \"%1\": command returned %2"
+msgstr ""
 
 #. ($courseID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2725
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:28
 msgid "Can't create course environment for %1 because %2"
 msgstr "לא יכול ליצור סביבת קורס עבור %1 בגלל ש%2"
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:423
 msgid "Can't create directory: %1"
 msgstr "לא יכול ליצור תקייה: %1"
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1060
-msgid "Can't create file '%1': %2"
-msgstr "לא יכול לצור את הקובץ '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+msgid "Can't create file \"%1\": %2"
+msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:948
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:406
 msgid "Can't create file: %1"
 msgstr "לא יכול ליצור קובץ: %1"
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1070
-msgid "Can't delete archive '%1': %2"
-msgstr "לא יכול למחוק את הארכיון '%1': %2"
-
-#. ($eUserID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:69
-msgid "Can't get password record for effective user '%1': %2"
-msgstr "לא יכול להשיג היסטורית סיסמאות עבור המשתמש בפועל '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:526
+msgid "Can't delete archive \"%1\": %2"
+msgstr ""
 
-#. ($userID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:64
-msgid "Can't get password record for user '%1': %2"
-msgstr "לא יכול להשיג היסטורית סיסמאות עבור המשתמש '%1': %2"
+#. ($setID, $TargetUser->user_id,)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:925
+msgid ""
+"Can't generate hardcopy for set \"%1\" for user \"%2\". The set is not "
+"visible to students."
+msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:445
 msgid "Can't open %1"
 msgstr "לא יכול לפתוח את %1"
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1426
 msgid "Can't open file %1"
 msgstr "לא יכול לפתוח את הקובץ %1"
 
 #. ($merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:343
 msgid "Can't read merge file %1. No message sent"
 msgstr "לא יכול לקרוא את קובץ המיזוג %1. לא נשלחה שום הודעה"
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:760
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:298
 msgid "Can't rename file: %1"
 msgstr "לא יכול לשנות את שם הקובץ: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:591
 msgid "Can't rename to the same name."
 msgstr "לא יכול לשנות שם לאותו השם."
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:927
-msgid "Can't unpack '%1': command returned %2"
-msgstr "לא יכול לפרוק '%1': פקודה החזירה %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:392
+msgid "Can't unpack \"%1\": command returned %2"
+msgstr ""
 
 #. ($fullPath)
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:629
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1895
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1819
 msgid "Can't write to file %1"
 msgstr "לא יכול לכתוב בקובץ %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1015
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1096
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:154
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:462
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/confirm.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:69
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:15
 msgid "Cancel"
 msgstr "ביטול"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:387
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:5
+msgid "Cancel E-Mail"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:60
 msgid "Cancel E-mail"
 msgstr "ביטול דוא\"ל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:61
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:77
 msgid "Cancel Edit"
 msgstr "בטל עריכה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:79
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:110
-msgid "Cancel Export"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
+msgid "Cancel Export"
 msgstr "בטל ייצוא"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:93
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
 msgid "Cancel Password"
 msgstr "בטל הגדרת סיסמה"
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:516
+msgid "Cannot find a file path to save to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:501
+msgid ""
+"Cannot find a problem record for set $c->{setID} / problem $c->{problemID}"
+msgstr ""
+
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:240
 msgid "Cannot open %1"
 msgstr "לא יכול לפתוח %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:222
-msgid "Cap Test Time at Set Close Date?"
-msgstr "הגבל את זמן המבחן לזמן הסגירה?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:232
+msgid "Cap Test Time at Set Close Date"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1456
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1486
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:14
 msgid "Category"
 msgstr "קטגוריה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:516
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:49
+msgid "Category:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:27
 msgid ""
 "Cause the selected homework set to count for twice as many points as it "
 "normally would."
 msgstr "גרום לשעורי הבית שנבחרו להניב פי-2 יותר נקודות מהערך הרגיל."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1272
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:27
 msgid ""
 "Causes a homework problem to become a clone of another problem from the same"
 " set."
 msgstr "גרום לשאלת שיעורי בית להפוך להעתק של שאלה אחרת באותו הגליון."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:727
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:27
 msgid "Causes a single homework problem to be worth twice as much."
 msgstr "גרום לשאלת שיעורי בית אחת להיות שווה פי-2."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1006
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:48
 msgid "Change Course Title to:"
 msgstr "שנה כותרת קורס ל-:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:34
 msgid "Change CourseID to:"
 msgstr "שנה מזהה קורס ל-:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:176
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:134
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:76
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:25
 msgid "Change Display Settings"
 msgstr "שנה אפשרויות תצוגה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:53
 msgid "Change Email Address"
 msgstr "שנה כתובת דוא\"ל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1032
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:62
 msgid "Change Institution to:"
 msgstr "שנה מוסד ל-:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:374
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:18
 msgid "Change Password"
 msgstr "שנה סיסמה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:169
 msgid "Change User Settings"
 msgstr "שנה הגדרות משתמש"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:35
+msgid "Change a course's ID, Title, or Institution."
+msgstr ""
+
 #. ($rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1092
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
 msgid "Change course institution from %1 to %2"
 msgstr "שנה את מוסד הקורס מ%1 ל%2"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:160
+msgid "Change dates for a homework set for the whole class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:123
+msgid "Change the due date for one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:26
+msgid ""
+"Change the due dates for an individual student on this page. Check the "
+"checkbox and enter the new date in order to override the date. (You can copy"
+" the date format from the date in the right hand column which indicates the "
+"date when the homework set is due for the whole class.) Note that you should"
+" ensure that the close date is before the answer date. If the close date for"
+" a student is extended until after the class answer date for the set, then "
+"the answer date for the student must also be set to a later date. "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:141
+msgid "Change the grades on a homework set for one student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:163
+msgid "Change the grading on a homework set for an entire class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:170
+msgid "Change the number of atttempts allowed on a problem."
+msgstr ""
+
 #. ($rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1089
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:508
 msgid "Change title from %1 to %2"
 msgstr "שנה את כתרת הקורס מ%1 ל%2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1362
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:488
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:540
 msgid "Changes abandoned"
 msgstr "שינויים בוטלו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:371
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:242
 msgid "Changes in this file have not yet been permanently saved."
 msgstr "שינויי בקובץ זה עוד לא נשמרו."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:647
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:529
 msgid "Changes saved"
 msgstr "שינויים נשמרו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1822
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:38
+msgid "Changing dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:514
 msgid ""
 "Changing the problem seed for display, but there are no problems showing."
 msgstr "משנה את גרעין השאלות עבור התצוגה, אבל לא מוצגות שום שאלות."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:635
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:19
 msgid "Chapter:"
 msgstr "פרק:"
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1849
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:15
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:103
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:37
 msgid "Check Answers"
 msgstr "בדיקת התשובות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2476
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:682
 msgid "Check Test"
 msgstr "בדיקת המבחן"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:183
-msgid "Check that it's permissions are set correctly."
-msgstr "בדוק שההרשאות מוגדרות כנדרש"
-
-#. ($emailDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:195
-msgid ""
-"Check whether it exists and whether the directory %1 can be read by the "
-"webserver."
-msgstr "בדוק אם קיים והאם התקייה %1 ניתנת לקריאה על ידי השרת."
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:53
+msgid "Choose problems from a library and add them to a homework set."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:543
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:40
 msgid "Choose the set which you would like to be worth twice as much."
 msgstr "בחר את הגליון שתרצה שיחשב פי-2."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:44
 msgid "Choose the set which you would like to enable partial credit for."
 msgstr "בחר את הגליון עבורו תרצה להפעיל ניקוד מופחת."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1206
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:992
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:44
 msgid "Choose the set which you would like to resurrect."
 msgstr "בחר את הגליון שתרצה לשחזר"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:259
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:350
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:40
 msgid "Choose the set whose close date you would like to extend."
 msgstr "בחר את הגליון שתרצה להאריך את תאריך הסגירה שלו."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:903
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:16
 msgid "Choose visibility of the sets to be affected"
 msgstr "איך לשנות את הזמנינות של הגליונות? הפוך אותן אל "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:497
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:15
 msgid "Choose what to do with existing data:"
 msgstr "יש לקבוע מה לעשות עם נתונים קיימים:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:880
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:3
 msgid "Choose which sets to be affected"
 msgstr "בחר אילו גליונות יושפעו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:491
-msgid "Class value"
-msgstr "ערך בקורס"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:17
+msgid "Class List Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:55
+msgid "Class list (\".lst\") files"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:334
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:316
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:37
 msgid "Classlist Editor"
 msgstr "עורך רשימות כיתה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1197
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:91
 msgid "Clear Problem Display"
 msgstr "רוקן את תצוגת השאלות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:693
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:82
 msgid ""
 "Click a student's name to see the student's homework set. Click a heading to"
 " sort the table."
 msgstr "לחץ על שמו של סטודנט על מנת לראות את גליון שיעורי הבית שלו. לחץ על כותרות בטבלה כדי למיין את הטבלה לפיו."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:74
 msgid ""
 "Click a student's name to see the student's test summary page. Click a "
 "test's version number to see the corresponding test version. Click a heading"
 " to sort the table."
 msgstr "לחץ על שמו של סטודנט על מנת לראות את דף סיכום המבחן שלו. לחץ על מספר גרסה של מבחן כדי לראות את הגרסה המתאימה של הסטודנט. לחץ על כותרות בטבלה כדי למיין את הטבלה לפיו."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:614
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:150
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:143
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made. (The grade for each problem is listed "
+"as \"status\" on this third page)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:24
+msgid ""
+"Click on each of the tabs to view the configuration items. The question mark"
+" icon provides access to information about the behavior of the configuration"
+" settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:125
+msgid ""
+"Click on the column \"Assigned Sets\" in the student's row. This will take "
+"you to a page where you can assign and unassign homework sets and change the"
+" due dates for homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:33
+msgid ""
+"Click on the homework set links to edit the grades for this individual "
+"student on the homework set. (The grade of each problem is called the "
+"\"status\".) You can also change the number of allowed attempts and further "
+"modify the individual student's homework set.) You will also be able to "
+"change a student's seed which determines the individual values used in the "
+"individual version of the student's problem and the weight (how much a "
+"problem counts towards the grade.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:90
 msgid ""
 "Click on the login name to edit individual problem set data, (e.g. due "
 "dates) for these students."
 msgstr "לחץ על שם המשתמש כדי לערוך נתוני הגליון עבור סטודנט מסוים, (למשל תאריך הגשה, מספר נסיונות מותרים) עבור הסטודנט הנבחר."
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:62
+msgid ""
+"Click the \"Add x student(s)\" radio button and then click \"Take action\". "
+"This will take you to a new page where the data can be entered for one or "
+"more students. It is also possible to assign the student to one or more "
+"problem sets as they are being entered: simply select the homework sets from"
+" the list below the data entry table. Use \"command\" or \"control\" click "
+"to select more than one homework set."
+msgstr ""
+
+#. ('<i class="fas fa-question-circle"></i>')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:88
+msgid "Click the %1 icon for page and item specific help."
+msgstr ""
+
+#. ('<a href="#"><i class="fas fa-question-circle"></i></a>')
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:20
+msgid "Click the icon %1 for page and item specific help."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:185
+msgid ""
+"Clicking on any active link at the top of the column sorts the page by that "
+"column. You can do lexigraphic sorts: click on \"First name\" then \"Last "
+"name\" to sort by last name, sorting those with the same last name by their "
+"first name."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:132
+msgid ""
+"Clicking on the login name link in a student's row allows you to view the "
+"student's version of the homework (rather than your own) so that you can "
+"more easily answer student questions about homework problems. (A \"acting as"
+" xxx\" alert will appear in the upper right corner of each window while you "
+"are acting as a student.) You can submit the answers (which will NOT be "
+"recorded) to check that the computer is grading the problem correctly. You "
+"will also be able to view past answers submitted by the student for each "
+"problem. To stop acting in the student's role click the \"Stop acting\" link"
+" in the upper right corner of the window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:199
+msgid ""
+"Clicking the <strong>e-mail address</strong> link will bring up your "
+"standard email application so that you can send email to the student. This "
+"works even if the student has been dropped from the course. To send email to"
+" an entire class or to merge grades with the email message use the \"Email\""
+" page link in the left margin."
+msgstr ""
+
 #. ($clientIP->ip()
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:541
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:547
 msgid ""
 "Client ip address %1 is not allowed to work this assignment, because the "
 "assignment has ip address restrictions and there are no allowed locations "
@@ -1537,329 +2166,337 @@ msgid ""
 "problem resolved."
 msgstr "כתובת ה-IP של הלקוח  %1 לא מאושרת לעבודה על מטלה זו, מכיוון שלמטלה יש הגבלות כתובת IP ואין מיקומים מותרים לפי הגבלה זו. פנה למרצה כדי לפתור בעיה זו."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:713
-msgid "Close"
-msgstr "סגור"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:424
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:764
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:788
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:811
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:316
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:39
 msgid "Close Date"
 msgstr "מועד הגשה אחרון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:382
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:35
+msgid "Closed"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:208
 msgid "Closed, answers available."
 msgstr "סגור, התשובות זמינות."
 
-#. ($self->formatDateTime($set->answer_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:378
+#. ($c->formatDateTime($set->answer_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:204
 msgid "Closed, answers on %1."
 msgstr "סגור, התשובות תהיו זמינות ב %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:206
 msgid "Closed, answers recently available."
 msgstr "סגור, תשובות זמינות לאחרונה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:282
 msgid "Closed."
 msgstr "סגור."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:116
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:121
 msgid "Closes"
 msgstr "מועד הגשה אחרון"
 
-#. ($self->formatDateTime($set->due_date, undef,
-#. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:113
-msgid "Closes %1"
-msgstr "מועד הגשה אחרון: %1"
-
-#. ($self->formatDateTime($verSet->due_date, undef,
+#. ($c->formatDateTime($verSet->due_date, undef,
 #. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:390
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:227
 msgid "Closes on %1"
 msgstr "מועד הגשה אחרון: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:35
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:33
 msgid "Closes:"
 msgstr "מועד הגשה אחרון:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2518
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:357
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:71
 msgid "Collapse All Details"
 msgstr "סגור את כל פירוט ההגדרות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2529
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:367
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:85
 msgid "Collapse All Nesting"
 msgstr "סגור נתוני משנה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2668
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:419
 msgid "Collapse Nested Problems"
 msgstr "סגור שאלות nested משולבים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2791
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2793
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:572
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:575
 msgid "Collapse Problem Details"
 msgstr "סגור את הפירוט של הגדרות השאלה"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1715
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:73
+msgid ""
+"Collapse problem details to the top row of information about a problem. Note"
+" that the details of a single problem can be collapsed by clicking on the up"
+" arrow to the right of the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1617
 msgid ""
 "Comma separated list of set names that are excluded from all achievements. "
 "No achievement points and badges can be earned for submitting problems in "
 "these sets. Note that underscores (_) must be used for spaces in set names."
 msgstr "רשימת שמות של גיליונות שיש להוציא מחוץ לטיפול של מערת ההישגים. לא ניתן לזכות בהישגים, ניקוד של הישגים, או תגים של הישגים על ידי הגשת תשובות לשאלות בגיליונות אלו. יש להזין את הרשימה כרשימה מופרדת בפסיקים, כאשר יש להזין קו_תחתון  underscore (_) במקום כל רווח שמופיע בשם של אחת הגיליונות ברשימה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:238
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:245
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:225
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:577
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2047
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:299
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:833
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:862
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:891
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:920
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:131
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:46
 msgid "Comment"
 msgstr "הערה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:200
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:25
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:181
 msgid "Comment:"
 msgstr "הערה:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:638
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:86
 msgid "Comments"
 msgstr "הערות"
 
-#. ($self->formatDateTime($set->answer_date)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2175
+#. ($c->formatDateTime($c->{set}->answer_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:379
 msgid "Completed results for this assignment are not available until %1."
 msgstr "תוצאות ותשובות לגליון זה אינם זמינות עד %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:382
 msgid "Completed results for this assignment are not available."
 msgstr "התוצאות עבור מטלה זו אינן זמינות."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:264
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:280
 msgid "Completed."
 msgstr "הושלם."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:45
 msgid "Compose Email Message"
 msgstr "כתוב הודעת דואר אלקטרוני"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3185
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:47
+msgid ""
+"Configure ip ranges (locations) that can be used to restrict set access."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:45
+msgid "Configure which course links appear on the site landing page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:97
 msgid "Confirm"
 msgstr "אישור"
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:107
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:164
+#. ($eUserName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:41
 msgid "Confirm %1's New Password"
 msgstr "אשר אתה הסיסמה החדשה של %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:579
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:78
 msgid "Confirm Password"
 msgstr "אשר את הסיסמה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_export_form.html.ep:1
 msgid "Confirm which sets to export."
 msgstr "אשר אילו גליונות לייצא"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementEvaluator.pm:288
+#: /opt/webwork/webwork2/templates/AchievementEvaluator/cheevoMessage.html.ep:15
 msgid "Congratulations, you earned a new level!"
 msgstr "מזל טוב, עלית דרגה!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2250
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:95
 msgid "Continue"
 msgstr "המשך"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:86
 msgid "Continue Open Test"
 msgstr "המשך את המבחן הפתוח"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:59
+msgid "Controls if an achievement is evaluated or not."
+msgstr ""
+
 #. ($sourceDirectory, $outputDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1149
-msgid "Copied auxiliary files from %1 to new location at %2"
-msgstr "הועתקו קבצים משניים מ%1 למיקום חדש ב%2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:671
+msgid "Copied auxiliary files from %1 to new location at %2."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:42
 msgid "Copy"
 msgstr "העתק"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
 msgid "Copy file as:"
 msgstr "העתק קובץ בשם:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:528
-msgid "Copy simple configuration file to new course"
-msgstr "העתק את הקובץ simple.conf לקורס החדש"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:627
-msgid "Copy templates from:"
-msgstr "העתק תבנית מ-:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:112
+msgid "Copy from:"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1335
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:82
 msgid "Copy this Problem"
 msgstr "העתק שאלה זו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:391
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:465
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:301
 msgid "Correct"
 msgstr "נכון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:656
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:678
 msgid "Correct Adjusted Status"
 msgstr "ציון מותאם נכון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:300
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:287
 msgid "Correct Answer"
 msgstr "תשובה נכונה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1682
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:19
 msgid "Correct Answers"
 msgstr "תשובות נכונות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1506
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1317
 msgid "Correct Answers:"
 msgstr "תשובות נכונות:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:693
 msgid "Correct Status"
 msgstr "ציון נכון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:648
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:93
 msgid "Correct answers"
 msgstr "תשובות נכונות"
 
 #. ($total_correct, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1004
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:16
 msgid "Correct: %1/%2"
 msgstr "נכון: %1/%2"
 
 #. ($newBlankProblems, $MAX_NEW_PROBLEMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1915
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1843
 msgid ""
 "Could not add %1 problems to this set.  The number must be between 1 and %2"
 msgstr "לא יכל להוסיף %1 שאלות לגליון זה. המספר חייב להיות בין %1 ל%2"
 
 #. ($e_user_name, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:83
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:94
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:74
 msgid "Couldn't change %1's password: %2"
 msgstr "לא היה ניתן לשנות את הסיסמה של %1: %2"
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:111
 msgid "Couldn't change your email address: %1"
 msgstr "לא היה ניתן לשנות את כתובת הדוא\"ל שלך: %1"
 
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4111
-msgid "Couldn't find OPL Branch %1 in remote %2"
-msgstr "לא היה ניתן למצוא את ענף ספריית השאלות הפתוחה %1 ב-remote בשם %2"
-
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4076
-msgid "Couldn't find PG Branch %1 in remote %2"
-msgstr "לא היה ניתן למצוא את ענף ה-PG ששמו %1 ב-remote בשם %2"
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4014
-msgid "Couldn't find WeBWorK Branch %1 in remote %2"
-msgstr "לא היה ניתן למצוא את ענף ה-WeBWork ששמו %1 ב-remote בשם %2"
-
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:132
 msgid "Couldn't save your display options: %1"
 msgstr "לא היה ניתן לשמור את אפשרויות התצוגה: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1463
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:36
 msgid "Counter"
 msgstr "כמות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:424
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:833
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:66
+msgid "Counter:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:503
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:35
 msgid "Counts for Parent"
 msgstr "נספר למכיל"
 
-#. ($rename_oldCourseID)
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2186
-msgid "Course %1 database is in order"
-msgstr "מסד הנתונים של הקורס %1 עובד כשורה"
-
-#. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1257
-msgid "Course %1 databases must be updated before renaming this course."
-msgstr "יש לעדכן את מסד הנתונים של הקורס %1 לפני שמשנים את שמו"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:778
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:95
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:154
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:9
 msgid "Course Administration"
 msgstr "ניהול הקורס"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:424
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:17
+msgid "Course Administration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:369
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:80
 msgid "Course Configuration"
 msgstr "הגדרות הקורס"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:480
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:17
+msgid "Course Configuration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:17
+msgid "Course Home Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:21
 msgid "Course ID"
 msgstr "מזהה הקורס Course ID"
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2566
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:691
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:594
 msgid "Course ID cannot exceed %1 characters."
 msgstr "מזהה הקורס Course ID איינו יכול להכיל יותר מ- %1 תווים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1227
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:597
 msgid "Course ID may only contain letters, numbers, hyphens, and underscores."
 msgstr "מזהה הקורס Course ID יכול להכיל רק אותיות, מספרים, מקפים, וקוים תחתונים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:956
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:21
 msgid "Course ID:"
 msgstr "מזהה קורס:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:5
 msgid "Course Info"
 msgstr "מידע על הקורס"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1664
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1961
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3736
+#. ($c->stash('courseID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:325
+msgid "Course Information for course %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:30
+msgid "Course Listings"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:17
 msgid "Course Name:"
 msgstr "שם קורס:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:491
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:28
 msgid "Course Title"
 msgstr "שם הקורס"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:204
-msgid "Course archived."
-msgstr "הקורס הוכנס לארכיון."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:418
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:12
 msgid "Courses"
 msgstr "קורסים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1609
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1904
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3674
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:13
 msgid ""
 "Courses are listed either alphabetically or in order by the time of most "
 "recent login activity, oldest first. To change the listing order check the "
@@ -1868,393 +2505,536 @@ msgid ""
 "\"hidden\" or \"visible\"."
 msgstr "הקורסים מסודרים לפי סדר אלפבתי או לפי זמן התחברות אחרונה (מאוחר למוקדם). כדי לשנון את הסדר בחר את אופן הסידור המועדף, ולחץ \"רענן רשימה\". הפורמט הוא: שם_קורס (סטטוס :: זמן של התחברות אחרונה) כש\"סטטוס\" הוא \"מוחבא\" או \"ניתן לצפייה\"."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:7
+msgid ""
+"Courses are listed either alphabetically or in order by the time of most "
+"recent login activity, oldest first. To change the listing order check the "
+"mode you want and click \"Refresh Listing\". The listing format is: "
+"Course_Name (status :: date/time of most recent login) where status is "
+"\"hidden\" or \"visible\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:163
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:84
 msgid "Create"
 msgstr "צור"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:41
 msgid "Create CSV"
 msgstr "צור CSV"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3054
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:31
 msgid "Create Location:"
 msgstr "צור מיקום:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1071
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:39
+msgid ""
+"Create a .tar.gz archive which includes the course's database and all course"
+" files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:33
 msgid "Create a New Set in This Course:"
 msgstr "צור גליון חדש בקורס הזה:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:795
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:4
 msgid "Create a new achievement with ID"
 msgstr "צור הישג חדש עם מזהה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:33
+msgid "Create a new course on this server."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:20
+msgid ""
+"Create a new course.  The \"Course ID\" is used as the course name and is "
+"used in course links.  Underscores appear as spaces when displaying the "
+"course name.  The \"Course Title\" is used as the title on the course home "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:86
+msgid ""
+"Create a new set with a given name. This can either create an empty set or a"
+" duplicate of an existing set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:12
 msgid "Create as what type of achievement?"
 msgstr "יצר כאיזה סוג של הישג?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:12
 msgid "Create as what type of set?"
 msgstr "איזה סוג של גליון ליצור?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1866
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:20
+msgid "Create backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:81
 msgid "Create unattached problem"
 msgstr "צור שאלה ללא שייכות כרגע לגליון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1849
-msgid ""
-"Creates a gzipped tar archive (.tar.gz) of a course in the WeBWorK courses "
-"directory. Before archiving, the course database is dumped into a "
-"subdirectory of the course's DATA directory. Currently the archive facility "
-"is only available for mysql databases. It depends on the mysqldump "
-"application."
-msgstr "יוצר קובץ ארכיון gzipped tar (סיומת tar.gz)  של הקורס בתקיית הקורסים של WeBWork. לפני יצירת הקורס, מסד הנתונים של הקורס מועבר לתת-תקייה של תקיית ה-DATA של הקורס. כרגע אמצעי הארכיון ניתן לשימוש רק למסדי נתונים מסוג mysql. זה תלוי באפליקציית ה-mysqldump."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:121
+msgid "Create/Delete achievements"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:726
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:26
 msgid "Cupcake of Enlargement"
 msgstr "מאפין התפיחה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:728
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:38
 msgid "Current"
 msgstr "נוכחי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3042
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:2
 msgid "Currently defined locations are listed below."
 msgstr "המיקמים שמוגדרים כרגע מפורטים למטה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4352
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2365
 msgid "Database tables are ok"
 msgstr "טבלאות מסד הנתנים הם תקינים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:54
 msgid "Database tables need updating."
 msgstr "טבלאות מסד הנתונים מתעדכנות."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2753
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:52
 msgid "Database tables ok"
 msgstr "טבלאות מסד נתונים תקינים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2968
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1499
 msgid "Database:"
 msgstr "מסד נתונים:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:783
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:153
 msgid "Date"
 msgstr "תאריך"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:727
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:355
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:96
+msgid "Dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:40
+msgid ""
+"Dates for problem sets can be edited by clicking the pencil icon in the "
+"\"Edit Set Data\" column next to the set name. To change dates for several "
+"sets at once, click the check box in the \"Select\" column and choose \"Edit"
+" selected\" from the tasks above."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:426
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:37
 msgid "Default"
 msgstr "ברירת מחדל"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1675
+#: /opt/webwork/webwork2/conf/defaults.config:1577
 msgid ""
 "Default Amount of Time (in minutes) after Due Date that Answers are Open"
 msgstr "זמן ברירת המחדל (בדקות) לאחר תאריך ההגשה שהשאולות ישארו פתוחות"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1665
+#: /opt/webwork/webwork2/conf/defaults.config:1567
 msgid ""
 "Default Amount of Time (in minutes) before Due Date that the Assignment is "
 "Open"
 msgstr "זמן ברירת המחדל (בדקות) לפני תאריך ההגשה שהמטלה פתוחה"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1785
+#: /opt/webwork/webwork2/conf/defaults.config:1687
 msgid "Default Length of Reduced Scoring Period in minutes"
 msgstr "זמן ברירת המחדל (בדקות) של תקופת הניקוד המופחת"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1655
+#: /opt/webwork/webwork2/conf/defaults.config:1557
 msgid "Default Time that the Assignment is Due"
 msgstr "זמן ברירת המחדל שבו יש להגיש את המטלה"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1808
+#: /opt/webwork/webwork2/conf/defaults.config:1710
 msgid ""
 "Default number of attempts before Show Me Another can be used (-1 => Never)"
 msgstr "ברירת המחדל למספר הנסיונות לפני שניתן לבקש מהמערכת \"הראה לי שאלה דומה\".  (יש להזין מינוס אחד -1 עבור המצב שכלל לא תוצג האפשרות הזאת כברירת המחדל.)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1755
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:162
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:91
+#: /opt/webwork/webwork2/conf/defaults.config:1994
+msgid ""
+"Default number of attempts before hints are shown in a problem (-1 => hide "
+"hints)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:89
 msgid "Delete"
 msgstr "מחק"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1556
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1651
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1689
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1728
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:49
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:36
 msgid "Delete Course"
 msgstr "מחק קורס"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3480
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:17
+msgid "Delete Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:23
+msgid "Delete Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:37
+msgid "Delete a course and all associated data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:109
+msgid "Delete a student from a course"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:52
 msgid "Delete all existing addresses"
 msgstr "מחק את כל הכתובות הקיימות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1989
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:65
+msgid "Delete backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:64
+msgid "Delete backup from %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:54
 msgid "Delete course after archiving. Caution there is no undo!"
 msgstr "מחק את הקורס לאחר הכנסתו לארכיון. זהירות אין אפשרות לחזור בך!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:49
 msgid "Delete course:"
 msgstr "מחק קורס:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2348
 msgid "Delete field when upgrading"
 msgstr "מחק שדה בתהליך העדכון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2809
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:588
 msgid "Delete it?"
 msgstr "למחוק?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3055
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:78
 msgid "Delete location:"
 msgstr "מחק מיקום:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:28
+msgid "Delete oldest backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2321
 msgid "Delete table when upgrading"
 msgstr "מחק טבלה בתהליך העדכון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:729
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:90
+msgid "Delete the sets checked below. Be careful, this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:6
 msgid "Delete which achievements?"
 msgstr "אילו הישגים למחוק?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1045
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:6
 msgid "Delete which sets?"
 msgstr "אילו גליונות למחוק?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1041
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:6
 msgid "Delete which users?"
 msgstr "אילו משתמשים יש למחוק?"
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:394
 msgid "Deleted %1 users."
 msgstr "נמחקו %1 משתמשים."
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:358
 msgid "Deleted %quant(%1,achievement)"
 msgstr "%quant(%1, נמחק הישג, נמחקו הישגים)"
 
 #. (join(', ', @delLocations)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3359
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1810
 msgid "Deleted Location(s): %1"
 msgstr "נמחקו מקום/ות: %1"
 
 #. (join(', ', @toDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3597
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1966
 msgid "Deleted addresses %1 from location."
 msgstr "נמחקו הכתובות %1 מהמיקום."
 
-#. ($self->shortPath($self->{tempFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1158
-msgid "Deleting temp file at %1"
-msgstr "מוחק קובץ זמני ב%1"
+#. ($formatBackupTime)
+#. ($c->formatDateTime($delTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1243
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:569
+msgid "Deleted backup from %1."
+msgstr ""
+
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:679
+msgid "Deleted temp file at %1"
+msgstr ""
+
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1219
+msgid "Deleted temporary file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:125
+msgid "Deleting Problems"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3152
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:68
 msgid ""
 "Deletion deletes all location data and related addresses, and is not "
 "undoable!"
 msgstr "המחיקה תמחוק את כל הנתונים על מקומות מוגדרים וכתובות שקשורות אל המקומות האלו. הפעולה בלתי הפיכה!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:723
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:3
 msgid "Deletion destroys all achievement-related data and is not undoable!"
 msgstr "המחיקה מוחקת לחלוטין את כל ההתונים שקשור להישגים והיא פעולה בלתי הפיכה!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:185
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
 msgid "Deny From"
 msgstr "תמנע מ-"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1467
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:27
 msgid "Description"
 msgstr "תיאור"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:256
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:71
+msgid "Description:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:69
 msgid "Deselect All Sets"
 msgstr "בטל את הבחירה של כל הגליונות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:229
 msgid "Deselect All Test Versions"
 msgstr "בטל את הבחירה של כל גירסאות מבחן"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:428
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:366
 msgid "Didn't recognize action"
 msgstr "פעולה לא זוהתה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:27
 msgid "Directory"
 msgstr "תיקייה"
 
 #. ($file, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:793
-msgid "Directory '%1' not removed: %2"
-msgstr "התקייה '%1' לא הוסרה: %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:327
+msgid "Directory \"%1\" not removed: %2"
+msgstr ""
 
 #. ($file, $removed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:792
-msgid "Directory '%1' removed (items deleted: %2)"
-msgstr "התיקייה '%1' הוסרה (פריטים שנמחקו: %2)"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:325
+msgid "Directory \"%1\" removed (items deleted: %2)"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:412
-msgid "Directory permission errors "
-msgstr "קיימות שגיאות בהרשאות של תיקיות חשובות"
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:33
+msgid "Directory permission errors"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2861
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2994
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1439
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1575
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:44
 msgid ""
 "Directory structure is missing directories or the webserver lacks sufficient"
 " privileges."
 msgstr "למבנה התיקייה חסרים תיקייות או שלשרת הרשת אין את היתרים הנדרשים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1267
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2210
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2857
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1434
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1570
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:41
 msgid "Directory structure is ok"
 msgstr "מבנה התקייה הוא תקין"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2285
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:102
 msgid "Directory structure needs to be repaired manually before archiving."
 msgstr "יש לתקן את מבנה התיקייה באופן ידני לפני הכנסה לארכיון."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1338
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:84
 msgid "Directory structure needs to be repaired manually before renaming."
 msgstr "יש לתקן את מבנה התיקייה באופן ידני לפני שנוי השם."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2750
-msgid "Directory structure or permissions need to be repaired. "
-msgstr "יש לתקן את מבנה התיקייה או את ההרשאות. "
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:48
+msgid "Directory structure or permissions need to be repaired."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2853
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1414
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1540
 msgid "Directory structure:"
 msgstr "מבנה תיקיות:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2536
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:365
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:92
+msgid "Display Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:90
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:104
 msgid "Display Mode:"
 msgstr "מצב תצוגה:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:463
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:37
 msgid "Display Past Answers"
 msgstr "צפייה בתשובות קודמות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
-msgid "Display of scores for this set is not allowed."
-msgstr "הצגת הציונים למטלה זו אסורה."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:44
+msgid "Display mode for equations"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:311
+msgid "Display of scores for this test is not allowed."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:589
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:12
 msgid "Display options: Show"
 msgstr "אפשריות תצוגה: הראה"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2017
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:48
+msgid ""
+"Display sets matching a selected criteria. Useful if there are many sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1918
 msgid "Display the evaluated student answer"
 msgstr "הצג את התשובה של הסטודנט לאחר פיענוח"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:176
+#. ('<code>COURSENAME_totals.csv</code>',
+#. '<code>COURSENAME_totals_bak1.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:74
+msgid ""
+"Do NOT use the file name %1, since you might accidentally overwrite that if "
+"you again export your WeBWorK homework scores. (Actually the earlier file is"
+" moved to %2 -- so you can recover using the File Manager.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:57
 msgid "Do not unassign students unless you know what you are doing."
 msgstr "אל תבטל את ההקצאה של סטודנטים אלא אם אתה יודע מה אתה עושה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:233
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:67
 msgid "Do not uncheck a set unless you know what you are doing."
 msgstr "אל תבטל גליון אם אתה לא יודע מה אתה עושה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:20
 msgid "Do not uncheck students, unless you know what you are doing."
 msgstr "אל תבטל את הסימון של סטודנטים ברשימה אם אתה לא יודע מה אתה עושה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2450
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:656
 msgid "Do you want to grade this test?"
 msgstr "האם להגיש את המבחן לבדיקה?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2272
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:93
+msgid "Documentation from source code for PG modules and macro files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:95
 msgid "Don't Archive"
 msgstr "אל תוסיף לארכיון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2607
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:13
 msgid "Don't Unarchive"
 msgstr "אל תסיר מהארכיון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2912
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:46
 msgid "Don't Upgrade"
 msgstr "אל תשדרג"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1749
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:15
 msgid "Don't delete"
 msgstr "אל תמחק"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1120
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:24
 msgid "Don't make changes"
 msgstr "אל תעשה שינויים"
 
 #. ($saveMode)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:317
 msgid "Don't recognize saveMode: |%1|. Unknown error."
 msgstr "לא מזהה את מצב השמירה: |%1|. שגיאה לא ידוע."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1307
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1321
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1335
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:87
 msgid "Don't rename"
 msgstr "אל תשנה שם"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:547
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:33
 msgid "Don't use in an achievement"
 msgstr "אל תשתמש הישג"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:683
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1345
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2465
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1595
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:766
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:57
 msgid "Done"
 msgstr "בוצע"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:159
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:365
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:8
 msgid "Download"
 msgstr "הורד"
 
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($set->set_id)
 #. ($ver->{id} =~ s/_/ /gr)
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($set->set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:731
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:732
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:413
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:204
 msgid "Download %1"
 msgstr "הורד %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:23
 msgid "Download Hardcopy"
 msgstr "הורד קובץ להדפסה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:865
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:56
 msgid "Download PDF or TeX Hardcopy for Current Set"
 msgstr "הורד גרסת הדפסה כ-PDF או TeX של הגליון הנוכחי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:764
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:233
 msgid "Download PDF or TeX Hardcopy for Selected Tests"
 msgstr "הורד קובץ PDF או TeX למבחנים שנבחרו"
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($selected_set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:595
+#. (tag('span', dir => 'ltr', format_set_name_display($selected_set_id =~
+#. s/,v(\d+)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:58
 msgid "Download hardcopy of set %1 for %2?"
 msgstr "הורד קובץ להדפסה של גליון %1 עבור %2?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:369
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:63
+msgid "Download/upload archived courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:46
 msgid "Download:"
 msgstr "הורדה:"
 
@@ -2262,139 +3042,181 @@ msgstr "הורדה:"
 msgid "Drop"
 msgstr "פרש מהקורס"
 
-#. ($self->formatDateTime($set->reduced_scoring_date, undef,
-#. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:107
-msgid "Due %1, after which reduced scoring is available until %2"
-msgstr "להגשה עד %1, לאחר מכן ניתן להגיש לניקוד מופחת עד %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:100
+msgid "Drop student from the course"
+msgstr ""
 
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:310
 msgid "Due date %1 has passed."
 msgstr "מועד ההגשה %1 כבר עבר."
 
-#: /opt/webwork/webwork2/conf/defaults.config:2093
+#: /opt/webwork/webwork2/conf/defaults.config:2014
 msgid "E-Mail"
 msgstr "דוא\"ל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:315
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:261
 msgid "E-mail Instructor"
 msgstr "שלח דוא\"ל לצוות התמיכה/סגל ההוראה"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2128
-msgid "E-mail addresses which can receive e-mail from a pg problem"
-msgstr "כתובות דוא\"ל שיכולות לקבל הודעה משאלת PG"
-
-#: /opt/webwork/webwork2/conf/defaults.config:2138
+#: /opt/webwork/webwork2/conf/defaults.config:2049
 msgid ""
 "E-mail feedback from students automatically sent to this permission level "
 "and higher"
 msgstr "הודעות משוב בדואר אלקטרוני מסטודנטים נשלח אוטומטית למשתמשים ברמת הרשאה זו ומעלה"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2109
+#: /opt/webwork/webwork2/conf/defaults.config:2030
 msgid "E-mail verbosity level"
 msgstr "אורך פורמט הדוא\"ל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:357
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:43
 msgid "E-mail:"
 msgstr "דוא\"ל:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:35
 msgid "Earned"
 msgstr "הושג"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:71
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:158
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:334
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:417
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:547
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2743
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1628
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1186
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1203
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:257
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:479
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:6
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:53
 msgid "Edit"
 msgstr "ערוך"
 
-#. (CGI::a({ href => $basicInfoUrl }, $r->maketext('class list data')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:199
-msgid "Edit %1 for  %2 (%3) who has been assigned %4 sets."
-msgstr "ערוך %1 עבור  %2 (%3) אליו הוקצאו %4 גליונות."
+#. (link_to(maketext('class list data')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:47
+msgid "Edit %1 for %2 (%3) who has been assigned %4 sets."
+msgstr ""
 
-#. (CGI::a({ href => $editUsersAssignedToSetURL }, $r->maketext('individual
-#. versions')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2223
-msgid "Edit %1 of set %2."
-msgstr "ערוך %1 מהגליון %2"
+#. (link_to(maketext('individual user settings')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:162
+msgid "Edit %1 for set %2."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:6
 msgid "Edit Assigned Users"
 msgstr "ערוך משתמשים שהוקצאו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:40
 msgid "Edit Data"
 msgstr "ערוך נתונים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1488
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:58
 msgid "Edit Evaluator"
 msgstr "ערוך מעריך"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:253
 msgid "Edit Header"
 msgstr "ערוך קידומת"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3053
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:18
 msgid "Edit Location:"
 msgstr "ערוך מיקום:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2741
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:111
 msgid "Edit Problem"
 msgstr "ערוך שאלה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:5
 msgid "Edit Problems"
 msgstr "ערוך שאלות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:583
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:3
 msgid "Edit Set"
 msgstr "ערוך גליון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:421
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:4
 msgid "Edit Set Data"
 msgstr "ערוך את הגדרות הגיליון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:171
+msgid "Edit Tags"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:30
 msgid "Edit Target Set"
 msgstr "ערוך את הגליון הנבחר"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1487
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:18
 msgid "Edit Users"
 msgstr "ערוך משתמשים"
 
-#. ($user)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:207
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:127
+msgid "Edit achievement evaluator"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:90
+msgid "Edit achievement information"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:65
+msgid ""
+"Edit achivements for the course. This link is only present if achievements "
+"are enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:42
+msgid "Edit class list data"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:39
+msgid ""
+"Edit class roster data. Add students, edit student data, drop students from "
+"class, import students from a classlist, and give user professor privileges."
+" Access to individual homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:70
 msgid "Edit data for %1"
 msgstr "ערוך את המידע של %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1248
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:46
+msgid ""
+"Edit homework sets for entire class. Change homework set due dates, create "
+"new sets from a set definition file, create new homework sets, make sets "
+"visible/invisible, score homework sets. Assign homework sets to the class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:219
 msgid "Edit it"
 msgstr "ערוך את זה"
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2192
-msgid "Edit set %1 data for ALL students assigned to this set."
-msgstr "ערוך את ההגדרות של הגליון %1 עבור כל הסטודנטים שאליהם הוקצא הגיליון הזה."
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:135
+msgid "Edit set %1 for ALL students assigned to this set."
+msgstr ""
 
-#. (CGI::a({href=>$editSetLink},$setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2166
+#. (link_to(                                               $setID =>
+#. $c->systemLink(
+#. $setDetailPage, params => { effectiveUser => $user->user_id, editForUser =>
+#. $user->user_id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:106
 msgid "Edit set %1 for this user."
 msgstr "ערוך את הגליון %1 עבור המשתמש הזה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3393
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:95
+msgid "Edit set for %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:4
 msgid ""
 "Edit the current value of the location description, if desired, then add and"
 " select addresses to delete, and then click the \"Take Action\" button to "
@@ -2402,174 +3224,219 @@ msgid ""
 "changes and return to the Manage Locations page."
 msgstr "ערוך את הערך הנוכחי של תיאור המיקום, אם אתה רוצה, ואז תוסיף כתובות למחיקה, ואז לחץ על כפתור \"בצע את הפעולה!\" כדי לבצע את כל השינויים. או, לחץ \"נהל מיקומים\" למעלה כדי לא לבצע שינויים ולחזור למנהל המיקומים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:429
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:2
 msgid "Edit which achievements?"
 msgstr "אילו הישגים לערוך?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:829
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:2
 msgid "Edit which sets?"
 msgstr "אילו גליונות לערוך?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:935
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:2
 msgid "Edit which users?"
 msgstr "אילו משתמשים לערוך?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:592
-msgid "Editing <strong>blank problem</strong> in file \"%1\""
-msgstr "כרגע עורכים <strong>שאלה ריקה/דוגמה</strong>  בקובץ \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:31
+msgid "Editing <strong>course information</strong> file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:30
+msgid "Editing <strong>hardcopy header</strong> file \"%1\"."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:595
-msgid "Editing <strong>course information</strong> file \"%1\""
-msgstr "כרגע עורכים <strong>המידע על הקורס</strong> בקובץ \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:28
+msgid "Editing <strong>new problem</strong> template."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
-msgid "Editing <strong>hardcopy header</strong> file \"%1\""
-msgstr "כרגע עורכים <strong>קובץ הכותרת להדפסה</strong> בקובץ \"%1\""
+#. ($c->{prettyProblemNumber},                             tag('span', dir =>
+#. 'ltr', format_set_name_display($fullSetName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:45
+msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:29
+msgid "Editing <strong>set header</strong> file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:33
+msgid "Editing <strong>unassigned problem</strong> file \"%1\"."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:596
-msgid "Editing <strong>options information</strong> file \"%1\""
-msgstr "כרגע עורכים <strong>קובץ מידע על אפשרויות</strong> בקובץ \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:32
+msgid "Editing <strong>unknown file type</strong> in file \"%1\"."
+msgstr ""
 
-#. ($prettyProblemNumber,                  CGI::span({ dir => 'ltr' },
-#. format_set_name_display($fullSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:605
-msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\""
-msgstr "כרגע עורכים <strong>שאלה %1 of מגיליון %2</strong> בקובץ \"%3\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:19
+msgid "Editing Modes"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:593
-msgid "Editing <strong>set header</strong> file \"%1\""
-msgstr "כרגע עורכים <strong>קובץ כותרת גיליון</strong> בקובץ \"%1\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:140
+msgid "Editing Problems"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:598
-msgid "Editing <strong>unassigned problem</strong> file \"%1\""
-msgstr "כרגע עורכים <strong>שאלה לא מוקצה</strong> בקובץ \"%1\""
+#. ($c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:16
+msgid "Editing achievement in file \"%1\""
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:597
-msgid "Editing <strong>unknown file type</strong> in file \"%1\""
-msgstr "כרגע עורכים <strong>קובת מסוג לא ידוע</strong>  בקובץ \"%1\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:22
+msgid "Editing for all students"
+msgstr ""
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:209
-msgid "Editing achievement in file '%1'"
-msgstr "כרגע עורכים את ההישג בקובץ '%1'"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:23
+msgid "Editing for one student or a proper subset of all students"
+msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3390
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:1
 msgid "Editing location %1"
 msgstr "כרגע עורכים את המיקום %1"
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display("$setID$vermsg")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2182
-msgid "Editing problem set %1 data for these individual students: %2"
-msgstr "כרגע עורכים את ההגדרות של גיליון %1 עבור הסטודנטים המסוימים  האלה: %2"
+#. (tag(                                           'strong',
+#. dir => 'ltr',
+#. format_set_name_display($setID . ($editingSetVersion ?
+#. ",v$editingSetVersion" : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:123
+msgid "Editing problem set %1 for these students: %2"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:315
 msgid "Editor"
 msgstr "עורך"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:669
-msgid "Editor rows:"
-msgstr "מספר שורות בעורך:"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1668
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:229
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:53
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:68
 msgid "Email"
 msgstr "שליחת הודעות דוא\"ל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:32
 msgid "Email Address"
 msgstr "כתובת דוא\"ל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:817
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:170
 msgid "Email Body:"
 msgstr "תוכן ההודעה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
-msgid "Email Instructor On Failed Attempt"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:17
+msgid "Email Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:339
+msgid "Email Instructor On Failed Attempt"
 msgstr "שלח דוא\"ל לצוות התמיכה/סגל ההוראה בכל ניסיון כושל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2003
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:28
 msgid "Email Link"
 msgstr "קישור דוא\"ל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:789
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:112
 msgid "Email address"
 msgstr "כתובת דוא\"ל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1807
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1832
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:311
+msgid "Email body is empty. No message sent. "
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:994
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_email.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_form.html.ep:24
 msgid "Email instructor"
 msgstr "שלח דוא\"ל לצוות התמיכה/סגל ההוראה"
 
-#. (scalar(@{ $self->{ra_send_to} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:454
+#. (scalar(@{ $c->{ra_send_to} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:27
 msgid ""
-"Email is being sent to %quant(%1,recipient). You will be notified by email\n"
-"\t\t\t\twhen the task is completed.  This may take several minutes if the class is\n"
-"\t\t\t\tlarge."
-msgstr "הודעות דואר אלקטרוני נשלחות אל  %quant(%1,נמען). תשלח אליך הודעה כאשר המערכת מסיימת את משימת השליחה. הטיפול עלול לקחת מספר דקות בקורס גדול."
+"Email is being sent to %quant(%1,recipient). You will be notified by email "
+"when the task is completed.  This may take several minutes if the class is "
+"large."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:13
+msgid "Email:"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:517
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:26
+msgid ""
+"Emails can contain personalized data, such as name, section, or status.  "
+"Click \"List of insertable macros\" for a full list available variables.  "
+"Additional personal data can be included by using a merge file.  A merge "
+"file is a CSV file located in the [Scoring] directory in which the first "
+"column is the student id, followed by additional data (such as student "
+"grades).  This data is identified by which column it is in, for instance if "
+"the scores where in the 4th column of the merge file, insert them into an "
+"email using the variable $COL[4].  The \"Scoring Tools\" page can export "
+"grades into a CSV that can be used as a merge file.  Upload customized merge"
+" files with the \"File Manager\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:11
 msgid "Emails to be sent to the following:"
 msgstr "דוא\"ל נשלח ל-:"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1704
+#: /opt/webwork/webwork2/conf/defaults.config:1606
 msgid "Enable Achievement Rewards"
 msgstr "אפשר פרסי הישגים"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1723
+#: /opt/webwork/webwork2/conf/defaults.config:1625
 msgid "Enable Conditional Release"
 msgstr "הפעל פרסום מותנה"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1689
+#: /opt/webwork/webwork2/conf/defaults.config:1591
 msgid "Enable Course Achievements"
 msgstr "הפעל הישגי קורס"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1645
+#: /opt/webwork/webwork2/conf/defaults.config:1547
 msgid "Enable Progress Bar and current problem highlighting"
 msgstr "הפעל סרגל התקדמות והדגשת השאלה הנוכחית"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1734
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:585
+#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Enable Reduced Scoring"
 msgstr "הפעל ניקוד מופחת"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1799
+#: /opt/webwork/webwork2/conf/defaults.config:1701
 msgid "Enable Show Me Another button"
 msgstr "הפעל את כפתור \"תראה לי שאלה דומה\""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:156
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:24
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:92
 msgid "Enable Spell Checking"
 msgstr "אפשר בדיקת איות"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1844
+#: /opt/webwork/webwork2/conf/defaults.config:1746
 msgid "Enable periodic re-randomization of problems"
 msgstr "הפעל רנדומיזציה מחדש של שאלות מדי לסרוגין."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:416
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:29
 msgid ""
 "Enable reduced scoring for a homework set.  This will allow you to submit "
 "answers for partial credit for 24 hours after the close date."
 msgstr "אפשר ניקוד מופחת עבור גליון שיעורי בית. יאפשר לשלוח תשובות עבור ניקוד חלקי למשך 24 שעות לאחר תאריך הסגירה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1461
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1483
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:20
 msgid "Enabled"
 msgstr "מופעל"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1846
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:58
+msgid "Enabled:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1748
 msgid ""
 "Enables periodic re-randomization of problems after a given number of "
 "attempts. Student would have to click Request New Version to obtain new "
 "version of the problem and to continue working on the problem"
 msgstr "מפעיל רנדומיזציה תקופתית מחדש של שאלות לאחר מספר מסויים של נסיונות. הסטודנט ילחץ על \"בקש גרסה חדשה\" כדי לקבל גרסה חדשה של השאלה ולהמשיך לעבוד על השאלה "
 
-#: /opt/webwork/webwork2/conf/defaults.config:1725
+#: /opt/webwork/webwork2/conf/defaults.config:1627
 msgid ""
 "Enables the use of the conditional release system.  To use conditional "
 "release you need to specify a list of set names on the Problem Set Detail "
@@ -2578,14 +3445,14 @@ msgid ""
 " sets."
 msgstr "מפעיל מערכת הפרסום המותנה. כדי להשתמש בפרסום מותנה צריך לפרט רשימה של שמות בדף פרטי גליון השאלות, ולפרט ציון מינימלי. לסטודנטים לא יהיה גישה לגליון הנתון עד שהגיעו לציון המינימלי בכל הגליונות שנרשמו."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1801
+#: /opt/webwork/webwork2/conf/defaults.config:1703
 msgid ""
 "Enables use of the Show Me Another button, which offers the student a newly-"
 "seeded version of the current problem, complete with solution (if it exists "
 "for that problem)."
 msgstr "מפעיל את השימוש בכפתור \"הראה לי שאלה דומה\", שנותן לסטודנט גרסה עם מספרים שונים של אותה השאלה, ביחד עם פתרון מתאים (אם קיים לשאלה)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:662
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:163
 msgid "End"
 msgstr "סיום"
 
@@ -2593,538 +3460,662 @@ msgstr "סיום"
 msgid "Enrolled"
 msgstr "רשום"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:788
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:111
 msgid "Enrolled, Drop, etc."
 msgstr "רשום, פרש מהקורס, וכו'."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:830
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:859
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:888
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:917
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:128
 msgid "Enrollment Status"
 msgstr "סטטוס רישום"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:21
 msgid "Enter filename below"
 msgstr "הכנס שם קובץ כאן"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:20
 msgid "Enter filenames below"
 msgstr "הכנס שמות קבצים כאן"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:19
 msgid ""
 "Enter information below for students you wish to add. Each student's "
 "password will initially be set to their student ID."
 msgstr "הכנס מידע כאן לגבי הסטודנטים שאתה רוצה להוסיף כל סיסמה של סטודנט תהיה מזהה הסטודנט שלו בהתחלה."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1997
+#: /opt/webwork/webwork2/conf/defaults.config:1899
 msgid ""
 "Enter one of the allowed display mode types above.  See 'display modes "
 "entry' for descriptions."
 msgstr "בחר באחת ממצבי התצוגה. למידע נוסף ראה בעזרה על 'רשימת מצבי התצוגה המוצגים לסטודנטים כאפשרויות'"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:297
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:34
+msgid ""
+"Enter the details of the course instructor to be added when the course is "
+"created.  This user will also be added to the admin course with the username"
+" \"userID_courseID\" so you can manage and email the instructors of the "
+"courses on the server."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:284
 msgid "Entered"
 msgstr "הוזן"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:85
-msgid "Entered student:"
-msgstr "סטודנט שהוכנס:"
-
-#. ($display_sort_method_name{$primary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:698
+#. ($display_sort_method_name{$primary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:98
 msgid "Entries are sorted by %1"
 msgstr "הרשומות ממוינות לפי %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:247
 msgid "Equation Display"
 msgstr "תצוגת משוואה"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:61
+msgid "Equation Editor"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1516
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1460
 msgid "Error adding set-level proctor: %1"
 msgstr "שגיאה בהוספת משגיח גליון: %1"
 
+#. ($fromPath, $toPath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:664
+msgid "Error copying %1 to %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:14
+msgid "Error details"
+msgstr ""
+
+#. ($filePath, stash('podError')
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:27
+msgid "Error generating POD for file %1: %2"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1492
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1437
 msgid ""
 "Error getting old set-proctor password from the database: %1.  No update to "
 "the password was done."
 msgstr "שגיאה בהשגת סיסמת משגיח גליון ישנה ממסד הנתונים: %1. לא שונתה הסיסמה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:31
 msgid "Error message:"
 msgstr "הודעת שגיאה:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2235
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:12
 msgid "Error messages"
 msgstr "הודעות שגיאה"
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1616
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:754
 msgid "Error: Answer date must come after close date in set %1"
 msgstr "שגיאה: תאריך תשובות חייב לבוא אחרי תאריך הסגירה באווסף %1"
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:747
 msgid "Error: Close date must come after open date in set %1"
 msgstr "שגיאה: תאריך הסגירה חייב לבוא אחרי תאריך הפתיחה בגליון %1"
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1634
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:778
 msgid ""
 "Error: Reduced scoring date must come between the open date and close date "
 "in set %1"
 msgstr "שגיאה: תאריך ניקוד מופחת חייב לבוא בין תאריך הפתיחה לתאריך הסגירה בגליון %1"
 
-#. ($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2067
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:7
 msgid "Error: The original file %1 cannot be read."
 msgstr "שגיאה: אי אפשר לקרוא את הקובץ המקורי %1."
 
 #. ($setID)
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1240
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:738
 msgid "Error: answer date cannot be more than 10 years from now in set %1"
 msgstr "שגיאה: תאריך תשובות לא יכולל להיות יותר מ-10 שנים מעכשיו בגליון %1"
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1235
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:733
 msgid "Error: close date cannot be more than 10 years from now in set %1"
 msgstr "שיגאה: תאריך סגירה לא יכול להיות יותר מ-10 שנים מהיום בגליון %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:630
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:234
 msgid "Error: no file data was submitted!"
 msgstr "שגיאה: לא הגיעו נתונים לשמור בקובץ!"
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1599
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:728
 msgid "Error: open date cannot be more than 10 years from now in set %1"
 msgstr "שגיאה: תאריך פתיחה לא יכול להיות יותר מ-10 שנים מהיום בגליון %1"
 
-#. ($problem_desc, $problem_name, CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1404
+#. ($problem_desc, $problem_name, $c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1210
 msgid ""
 "Errors encountered while processing %1. This %2 has been omitted from the "
 "hardcopy. Error text: %3"
 msgstr "אירעו שגיאות בזמן עיבוד %1. שאלה %2 לא נכנסה לקובץ ההדפסה. טקסט שגיאה: %3"
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3832
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:8
+msgid "Errors occured while generating hardcopy:"
+msgstr ""
+
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2128
 msgid ""
 "Errors occured while hiding the courses listed below when attempting to "
 "create the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
-msgstr "אירעו שגיאות בזמן החבאת הקורסים שנרשמו למטה בזמן הנסיון ליצור את הקובץ  hide_directory בתיקיית הקורס. בדוק את הבעלות ואת ההרשאות של תיקיות הקורסים. למשל בקורס %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
+msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3920
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2197
 msgid ""
 "Errors occured while unhiding the courses listed below when attempting "
 "delete the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
-msgstr "שגיאות אירעו בזמן הפיכת הקורסים שנרשמו למטה לגלויים בזמן הניסיון למחוק את הקובץ hide_directory בתיקיות הקורסים. בדוק את הבעלות ואת ההרשאות של תיקיות הקורסים. למשל בקורס %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1468
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:28
 msgid "Evaluator File"
 msgstr "קובץ מעריך"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3839
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:76
+msgid "Evaluator File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:28
+msgid "Evaluator Variables"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2143
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
-"hidden."
-msgstr "חוץ מאולי השגיאות לעיל, כל הקורסים שנבחרו בם כר מוחבאים."
+"Except for the errors listed above, all selected courses are already hidden."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3904
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2212
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
+"Except for the errors listed above, all selected courses are already "
 "unhidden."
-msgstr "חוץ מאולי השגיאות לעיל, כל הקורסים שנבחרו בם כר גלויים."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3456
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:39
 msgid ""
 "Existing addresses for the location are given in the scrolling list below.  "
 "Select addresses from the list to delete them:"
 msgstr "ברשימה למטה מורטים כתובות קיימות עבור המיקום . בחר כתובות מהרשימה כדי למחוק אותם:"
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2281
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1460
 msgid "Existing file %1 could not be backed up and was lost."
 msgstr "לא היה אפשרות לשמור את הקובץ %1 ולכן הוא נמחק."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2514
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:354
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:65
 msgid "Expand All Details"
 msgstr "פתח את על הפירוט"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:364
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:78
 msgid "Expand All Nesting"
 msgstr "פתח את כל שאלות nesting המשנה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2667
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:418
 msgid "Expand Nested Problems"
 msgstr "פתח שאלות nesting משנה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2792
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:574
 msgid "Expand Problem Details"
 msgstr "פתח את פירוט השאלה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:74
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:89
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:67
+msgid ""
+"Expand problem details that have been collapsed. Note that the details of a "
+"single problem can be expanded by clicking on the down arrow to the right of"
+" the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:71
 msgid "Export"
 msgstr "ייצא"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1098
-msgid "Export selected achievements."
-msgstr "ייצא הישגים שנבחרו."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:113
+msgid "Export achievement data"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_export_form.html.ep:1
+msgid "Export selected achievements"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1267
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:17
 msgid "Export to what kind of file?"
 msgstr "איזה סוג קובץ לייצא?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:2
 msgid "Export which achievements?"
 msgstr "אילו הישגים לייצא?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1245
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:5
 msgid "Export which users?"
 msgstr "איזה משתמשים לייצא?"
 
 #. ($FileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1151
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:591
 msgid "Exported achievements to %1"
 msgstr "הישגים יוצאו ל-%1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1616
-msgid "Extend the close date for which Gateway?"
-msgstr "הארך את תאריך הסגירה של איזה מבחן מחסום?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:48
+msgid "Extend the close date for which test?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:148
+msgid "Extend the number of attempts allowed a student on a given problem."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1573
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:28
 msgid ""
-"Extends the close date of a gateway test by 24 hours. Note: The test must "
-"still be open for this to work."
-msgstr "מאריך את תאריך הסגירה של מבחן מחסום ב-24 שעות. שים לב: המבחן חייב להיות פתוח כדי שזה יעבוד."
+"Extends the close date of a test by 24 hours. Note: The test must still be "
+"open for this to work."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "FIRST NAME"
 msgstr "שם פרטי"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Failed to add user:"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:416
 msgid "Failed to create new achievement: %1"
 msgstr "יצירת הישג חדש נכשלה: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:373
 msgid "Failed to create new achievement: no achievement ID specified!"
 msgstr "יצירת הישג חדש נכשלה: לא פורט מזהה הישג!"
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:573
 msgid "Failed to create new set: %1"
 msgstr "יצירת גליון חדש נכשלה: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1158
-msgid "Failed to create new set: no set name specified!"
-msgstr "יצירת גליון חדש נכשלה: לא הוכנס שם לגליון!"
+#. ($newSetID =~ s/_/ /gr)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:482
+msgid ""
+"Failed to create new set: Invalid characters in set name \"%1\". A set name "
+"may only contain letters, numbers, hyphens, periods, and spaces."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:474
+msgid "Failed to create new set: No set name specified."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1155
-msgid "Failed to create new set: set name cannot exceed 100 characters."
-msgstr "תהליך ייצור הגליון החדש נכשל: שם הגליון מוגבל ל- 100 תווים."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:469
+msgid "Failed to create new set: Set name cannot exceed 100 characters."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:396
 msgid ""
 "Failed to duplicate achievement: no achievement selected for duplication!"
 msgstr "שכפול ההישג נכשל: לא נבחר הישג לשכפול! "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:530
 msgid "Failed to duplicate set: no set selected for duplication!"
 msgstr "שכפול גליון נכשל: לא נבחר גליון לשכפול!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:74
-msgid "Failed to enter student:"
-msgstr "נכשלה הוספת הסטודנט:"
+#. ($@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:67
+msgid "Failed to generate course archive: %1"
+msgstr ""
 
 #. ($scoreFilePath)
 #. ($filePath)
 #. ($FilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1125
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:649
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:955
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2402
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1584
 msgid "Failed to open %1"
 msgstr "פתיחת %1 נכשלה"
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:227
 msgid "Failed to save: %1"
 msgstr "השמירה נכשלה: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#. ($_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:253
+msgid "Failed to send message: %1"
+msgstr ""
+
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:23
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:36
 msgid "False"
 msgstr " לא נכון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1919
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:63
 msgid "Feature exhausted for this problem"
 msgstr "האפשרותת כבר נוצלה עד תומה עבור שאלה זו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:200
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:23
+msgid "Features:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:252
 msgid "Feedback"
 msgstr "משוב"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2159
+#: /opt/webwork/webwork2/conf/defaults.config:2070
 msgid "Feedback by Section."
 msgstr "משוב לפי קבוצה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:234
 msgid "FeedbackMessage"
 msgstr "הודעת משוב"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1177
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2113
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2284
 msgid "Field is ok"
 msgstr "השדה תקין"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2109
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2286
 msgid "Field missing in database"
 msgstr "שדה חסר במסד הנתונים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1175
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2111
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4290
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
 msgid "Field missing in schema"
 msgstr "שדה חסר בתבנית"
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:599
-msgid "File '%1' exists.  File not saved.  No changes have been made."
-msgstr "הקובץ '%1' קיים. הקובץ לא נשמר. לא בוצעו ציונים."
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:266
+msgid "File \"%1\" exists.  File not saved.  No changes have been made."
+msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1926
-msgid ""
-"File '%1' exists. File not saved. No changes have been made.  You can change"
-" the file path for this problem manually from the 'Hmwk Sets Editor' page"
-msgstr "הקובץ '%1' קיים. הקובץ לא נשמר. לא בוצעו שינויים. אתה יכול לשנות את מיקום הקובץ של שאלה זו באופן ידני מדף 'עורך גליון שיעורי בית'."
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1036
+msgid "File \"%1\" exists. File not saved. No changes have been made."
+msgstr ""
 
-#. ($file,$!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:796
-msgid "File '%1' not removed: %2"
-msgstr "הקובץ '%1' לא הוסר: %2"
+#. ($file, $!)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:333
+msgid "File \"%1\" not removed: %2"
+msgstr ""
 
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:795
-msgid "File '%1' successfully removed"
-msgstr "הקובץ '%1' הוסר בהצלחה"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+msgid "File \"%1\" successfully removed"
+msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1066
-msgid "File '%1' uploaded successfully"
-msgstr "הקובץ '%1' הועלה בהצלחה"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:522
+msgid "File \"%1\" uploaded successfully"
+msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:476
 msgid "File <b>%1</b> already exists. Overwrite it, or rename it as:"
 msgstr "קובץ <b>%1</b> כבר קיים.  שמור עליו, או שנה את שמו ל-:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:364
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:55
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:70
 msgid "File Manager"
 msgstr "מנהל קבצים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:628
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:17
+msgid "File Manager Help"
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:541
+msgid "File not saved. Failed to open \"%1\" for writing."
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:528
+msgid ""
+"File not saved. The file \"%1\" is not contained in the templates directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:921
+msgid ""
+"File not saved. The file name for this problem does not match the file name "
+"the editor was opened with. The problem set may have changed. Please reopen "
+"this file from the homework sets editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:228
 msgid "File saved"
 msgstr "הקובץ נשמר"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:733
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:272
 msgid "File successfully copied"
 msgstr "הקובץ הועתק בהצלחה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:758
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:295
 msgid "File successfully renamed"
 msgstr "שם הקובץ שונה בהצלחה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:29
 msgid "Filename"
 msgstr "שם קובץ"
 
-#. ($extension,$location)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1296
-msgid "Files with extension '.%1' usually belong in '%2'"
-msgstr "קבצים עם הסיומת '.%1' בדרכ כלל שייכים ל-'%2"
+#. ($extension, $location)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:699
+msgid "Files with extension \".%1\" usually belong in \"%2\""
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:20
+msgid ""
+"Fill out the form below to add, edit, or delete locations.  Locations are "
+"used to restrict access to sets based on ip address.  Locations are "
+"configured here in the administration course, then used in a normal course."
+"  When configuring a set to use a restricted ip address, the instructor can "
+"choose to either restrict access to the location or deny access from a "
+"location, which are identified by their name.  Instructors can select "
+"multiple locations to restrict access to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:78
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:47
 msgid "Filter"
 msgstr "סנן"
 
 #. ($recitation)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1184
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1112
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1420
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:913
 msgid "Filter by recitation %1"
 msgstr "סנן לפי קבוצת תרגול %1"
 
 #. ($section)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1180
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1416
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:910
 msgid "Filter by section %1"
 msgstr "סנן לפי קבוצה %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:733
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:31
 msgid "Filter by what text?"
 msgstr "לפי אזה טקסט לסנן?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:151
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:17
 msgid "Filter:"
 msgstr "סינון:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:749
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:137
 msgid "First"
 msgstr "ראשון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:593
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1992
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:827
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:856
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:885
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:914
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:87
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:21
 msgid "First Name"
 msgstr "שם פרטי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:107
 msgid "First name"
 msgstr "שם פרטי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:178
 msgid ""
 "For security reasons, you cannot specify a message file from a directory "
 "higher than the email directory (you can't use ../blah/blah for example). "
 "Please specify a different file or move the needed file to the email "
-"directory"
-msgstr "מתוך שיכולי אבטחה, את הלא יכול לבחור קובץ מתקייה גבוהה יותר מתיקיית הדוא\"ל (אתה לא יכול להתשתמש ב .../blah/blah למשל). אנא בחר קובץ אחר או העבר את הקובץ הדרוש לתיקיית הדוא\"ל "
+"directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:30
+msgid "Force editor to RTL"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2928
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:674
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:101
 msgid "Force problems to be numbered consecutively from one"
 msgstr "אלץ מספור עוקב של של השאלות החל ממספר אחד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:409
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:35
+msgid "Form Elements Present on the Page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:75
 msgid "Format"
 msgstr "פורמט"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2096
+#: /opt/webwork/webwork2/conf/defaults.config:2017
 msgid "Format for the subject line in feedback e-mails"
 msgstr "פורמט עבור שורת הנושא בדוא\"ל משוב."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:172
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:133
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:10
 msgid "Format:"
 msgstr "פורמט:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:12
 msgid "Found no directories containing problems"
 msgstr "לא נמצאו תיקיות המכילות שאלות."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1112
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:43
 msgid "From This Course"
 msgstr "מהקורס הזה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:318
 msgid "From field must contain one valid email address."
 msgstr "שדה הנמען חייב להכיל לפחות כתובת דוא\"ל תקינה אחת."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:340
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:621
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:20
+msgid ""
+"From this page you can <strong>add new students</strong>, "
+"<strong>edit</strong> class list data (name, email address, recitation, "
+"section, permission level, and enrollment status), <strong>change "
+"passwords</strong>, and <strong>export</strong> (save) class lists for back-"
+"up or use in another course. You can also delete students from the class "
+"roster, but this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:34
 msgid "From:"
 msgstr "שולח:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:59
 msgid "GLOBAL Usage"
 msgstr "שימוש גלובאלי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1512
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1619
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1728
-msgid "Gateway Name"
-msgstr "שם מבחן המחסום"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:210
-msgid "Gateway Quiz %2"
-msgstr "מבחן מחסום %2"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:853
-msgid "Gateway parameters"
-msgstr "הגדרות של מבחן המחסום"
-
-#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/conf/defaults.config:1427
 msgid "General"
 msgstr "כללי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2305
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:201
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:30
 msgid "General Information"
 msgstr "מידע כללי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:745
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:669
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:670
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:222
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:116
+msgid "General Page Information"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:121
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:166
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:167
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:113
 msgid "Generate Hardcopy"
 msgstr "צור קובץ להדפסה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:262
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:73
 msgid "Generate Hardcopy for Selected Sets"
 msgstr "צור קבצי הדפסה לגיליונות שנבחרו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:744
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:115
+msgid ""
+"Generate a hardcopy of the problem being edited. This does not change the "
+"permanent file on the disk. You can generate a hardcopy for different "
+"versions of the same problem by changing the seed. You can also change the "
+"format to \"PDF\" or \"TeX Source\". If \"PDF\" is selected, then a PDF file"
+" will be generated for download, unless there are errors. If errors occur or"
+" \"TeX Source\" is selected, then a zip file will be generated for download "
+"that contains the TeX source file and resources needed for generating the "
+"PDF file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:20
+msgid ""
+"Generate hardcopies of assignments in PDF or latex format. To produce a "
+"hardcopy, one selects the users on the left and the sets on the right. All "
+"users and sets are listed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:170
 msgid "Generate hardcopy for selected sets and selected users"
 msgstr "צור קבצי הדפסה עבור הגליונות והמשתמשים שנבחרו."
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:184
-#: /opt/webwork/pg/macros/problemRandomize.pl:185
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:186
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:187
 msgid "Get a new version of this problem"
 msgstr "קבל גרסה חדשה של שאלה זו."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:986
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:2
 msgid "Give new password to which users?"
 msgstr "לאיזה משתמשים לתת סיסמה חדשה?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1063
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:27
 msgid "Gives full credit on a single homework problem."
 msgstr "נותן ציון מלא על שאלה בודדת בגליון שיעורי בית."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1180
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:27
 msgid "Gives full credit on every problem in a set."
 msgstr "נותן ציון מלא על כל השאלות בגליון."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:846
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:27
 msgid "Gives half credit on a single homework problem."
 msgstr "מעלה ציון של שאלה אחת בגליון שיעורי בית ב- 50 נקודות (אך לכל היותר לציון 100)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:27
 msgid "Gives half credit on every problem in a set."
 msgstr "מעלה את הציונים של כל השאלות בגליון ב- 50 נקודות (אך לכל היותר לציון 100)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:62
 msgid "Global Attempts"
 msgstr "מספר ניסיונות גלובלי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1422
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:76
 msgid "Global Status"
 msgstr "ציון גלובלי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:49
 msgid "Global Usage Data"
 msgstr "היקף שימוש גלובלי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:51
 msgid ""
 "Global data on problem usage is contributed by many institutions using "
 "WeBWorK all over the world. The Usage figure is the total number of  "
@@ -3134,198 +4125,324 @@ msgid ""
 msgstr "הנתונים הגלובליים על השימוש בשאלות נתרמה על ידי מספר מוסדות מהעולם שמשתמשים בווב-וורק. היקף שימוש גלובלי הוא מספר הכולל של משתמשים שהגישו לפחות הגשה אחד לשאלה זו. מספר גדול מהווה אינדיקציה שהשאלה הוקצה להרבה סטודנטים ולכן מצאה חם בעיני מספר מרצים וכנראה שאין בשאלה באגים."
 
 #. ($problemID, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1549
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1489
 msgid "Global problem %1 for set %2 not found."
 msgstr "שאלה גלובאלית %1 עבור גליון %2 לא נמצאה."
 
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:334
+#. ($c->{prettyID}, $c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:378
+msgid "Global problem %1 not found for set %2."
+msgstr ""
+
+#. ($c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:142
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:372
 msgid "Global set %1 not found."
 msgstr "גיליון גלובלי %1 לא נמצא."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2093
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:77
 msgid "Global set data will be shown instead of user specific data"
 msgstr "מידע ??? גלובאלי על הגליון יופיע במקום מידע משתמש ספציפי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:28
 msgid "Go"
 msgstr "התחל"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:483
 msgid "Go back to Part 1"
 msgstr "חזור לחקל 1"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:291
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
-#: /opt/webwork/pg/macros/compoundProblem.pl:491
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:293
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:498
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:512
 msgid "Go on to next part"
 msgstr "המשך לחלק הבא"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2651
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:544
 msgid "Grade"
 msgstr "נקד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2649
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:383
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:970
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:541
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:75
 msgid "Grade Problem"
 msgstr "נקד שאלה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2446
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:651
 msgid "Grade Test"
 msgstr "הגש את המבחן"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:148
+msgid "Grade of Active Students"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:55
 msgid "Grade passback mode"
 msgstr "צורת החזרת ציונים למערכת הלימוד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:837
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:38
 msgid "Grader"
 msgstr "מנקד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:236
 msgid "Grades"
 msgstr "ציונים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:110
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:17
+msgid "Grades Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:115
 msgid "Grades have been saved for all current users."
 msgstr "הציונים נשמרו עבור על כל המתמשים הנוכחיים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:221
-msgid "Grading assignment:"
-msgstr "מנקד מטלה:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:28
+msgid "Grading Assignment"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:152
+msgid "Grading Problems"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1062
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:26
 msgid "Greater Rod of Revelation"
 msgstr "מטה הגילוי הגדול"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1179
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:26
 msgid "Greater Tome of Enlightenment"
 msgstr "כרך ההארה הגדול"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:285
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:50
+msgid ""
+"Groups types of achievements. The \"level\" and \"secret\" categories are "
+"special (described above), and categories can be used to create achievement "
+"chains."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:74
 msgid "Guest Login"
 msgstr "כניסת אורח"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2251
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:86
+msgid "Guest:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:33
 msgid "HTTP Headers"
 msgstr "קידומות HTTP"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:682
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:35
+msgid "Hardcopy Format"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:115
 msgid "Hardcopy Format:"
 msgstr "פורמט קובץ להדפסה:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:270
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:285
 msgid "Hardcopy Generator"
 msgstr "יוצר קבצים להדפסה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:101
 msgid "Hardcopy Header"
 msgstr "קידומת לגירסת הדפסה"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1623
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:724
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:324
+msgid "Hardcopy Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:17
+msgid "Hardcopy Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:153
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:44
 msgid "Hardcopy Theme"
 msgstr "עיצוב גרסת הדפסה"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:408
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:427
 msgid "Hardcopy will always print the original version of the problem."
 msgstr "בקבצי הדפסה תמיד יודפס הגרסה המקורית של השאלה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:31
 msgid "Headers"
 msgstr "קידומות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1048
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:296
 msgid "Help"
 msgstr "עזרה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:797
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:170
 msgid "Help Icon"
 msgstr "צלמית עזרה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:542
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:30
+msgid ""
+"Here is a list of the variables the evaluator has access to. Unless "
+"indicated, changes to the variables will not be saved.  Evaluators are run "
+"in the same order they are listed on the achievement editor page and are "
+"only run if the achievement has not been earned. Keep this in mind when "
+"using persistent global data."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:507
 msgid "Here is a new version of your problem."
 msgstr "הנה גרסה חדשה של השאלה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:914
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:42
 msgid "Hidden"
 msgstr "מוחבא/לא זמין לסטודנטים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:347
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:62
 msgid "Hide All"
 msgstr "החבא הכל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3663
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3718
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3760
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:384
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:17
+msgid "Hide Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:57
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:44
 msgid "Hide Courses"
 msgstr "החבא קורס"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:428
-msgid "Hide Hints"
-msgstr "החבא רמזים"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:477
 msgid "Hide Hints from Students"
 msgstr "החבא רמזים מהסטודנטים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1566
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:63
+msgid "Hide all rendered problems on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:252
 msgid "Hide this problem"
 msgstr "הסתר שאלה זו"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1523
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1524
 msgid "Hint:"
 msgstr "רמז:"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1522
 msgid "Hint: "
 msgstr "רמז: "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:658
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1771
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:99
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:51
 msgid "Hints"
 msgstr "רמזים"
 
 # Hmwk is short for Homework
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:364
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:327
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:44
 msgid "Hmwk Sets Editor"
 msgstr "עורך שיעורי בית"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:779
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:80
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:108
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:19
 msgid "Homework Sets"
 msgstr "גליונות שיעורי בית"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:38
 msgid "Homework Totals"
 msgstr "סך הכל שיעורי בית"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1432
-msgid "I couldn't find the file [ACHEVDIR]/surprise_message.txt!"
-msgstr "לא יכול למצוא את הקובץ  [ACHEVDIR]/surprise_message.txt"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:17
+msgid "Homwork Sets Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:88
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:31
+msgid "How to:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:36
+msgid "I couldn't find the file [ACHIEVEMENT_DIR]/surprise_message.txt!"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1451
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:9
 msgid "Icon"
 msgstr "אייקון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:29
 msgid "Icon File"
 msgstr "קוץ אייקון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:612
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:80
+msgid "Icon File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:24
+msgid ""
+"If \"PDF\" is selected, then a PDF file will be generated for download, "
+"unless there are errors.  If errors occur generating a PDF file or \"TeX "
+"Source\" is selected then a zip file will be generated for download that "
+"contains the TeX source file and resources needed for generating the PDF "
+"file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:37
+msgid ""
+"If \"TeX Source\" is selected, a zip file containing a TeX file and other "
+"files needed to generate a PDF hardcopy will be produced. If \"Adobe PDF\" "
+"is selected then only a PDF file will be produced."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:84
 msgid ""
 "If a password field is left blank, the student's current password will be "
 "maintained."
 msgstr "אם משארים את שדה הסיסמה ריק, סיסמת הסטודנט לא תשתנה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:42
+msgid ""
+"If selected, the file path of the problem source will be printed in the "
+"output."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:38
+msgid ""
+"If selected, this adds spaces between the fields to align the commas, which "
+"makes the columns easy to read when in text form but it can confuse some "
+"spreadsheet applications since the extra spaces violate the csv standard "
+"(although Excel handles them with no problem). This will give a visual form "
+"of the CSV file that is easy to read on the page. If you want a reliable "
+".csv file for use in any spreadsheet application unclick the \"Pad Fields\" "
+"option. You can download the .csv file immediately by clicking on the link "
+"with the filename chosen above, or you can download it using the \"File "
+"Manager\" from the scoring directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:148
+msgid ""
+"If the original problem can not be edited than the path name must be changed"
+" in order to be allowed to save the problem. Adding \"local/\" to the "
+"beginning of the original path is the default solution. All locally created "
+"and edited files will then appear in a subdirectory named \"local\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:513
 msgid ""
 "If this flag is set then this problem will count towards the grade of its "
 "parent problem.  In general the adjusted status on a problem is the larger "
@@ -3333,20 +4450,28 @@ msgid ""
 "problems which have this flag enabled."
 msgstr "כשזה נבחר, שאלה זו תחשב לציון של השאלה המכילה. באופן כללי הציון המותאם של שאלה הוא הציון הגדול יותר מבין ציון השאלה עצמה והממוצע המשורלל של ציוני השאלות המוכלות שעבורם אפשרות זו הופעלה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
 msgid ""
 "If this is enabled then instructors with the ability to receive feedback "
 "emails will be notified whenever a student runs out of attempts on a problem"
-" and its children without receiving an adjusted status of 100%."
-msgstr "אם זה מופעל אז מורים שיכולים לקבל משוב יקבלו הודעה בכל פעם שלסטודנט נגמר הנסיונות על שאלה והשאלות המוכלות בלי לקבל ציון מותאם של 100%"
+" and its children  without receiving an adjusted status of 100%."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:334
 msgid ""
 "If this is enabled then students will be unable to attempt a problem until "
 "they have completed all of the previous problems, and their child problems "
 "if necessary."
 msgstr "אם זה מופעל אז סטודנטים לא יוכלו לנסות שאלה נתונה עד שהשלימו את כל השאלות הקודמות, והאשלות המוכלות (צאצאים בעץ השאלות) במידת הצורך."
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:57
+msgid ""
+"If this is selected, a success index is listed in each csv file. The success"
+" index is a number assigned on the basis of the number of incorrect attempts"
+" (roughly equivalent to 1/the number of attempts) which seems to correlate "
+"with the relative difficulty the student had with the problem."
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:47
 msgid ""
 "If this is set, all users (including the instructor) must enter the WeBWorK "
@@ -3354,8 +4479,8 @@ msgid ""
 "they receive a message directing them back to the LMS."
 msgstr "אם הגדרה  זו מופעלת, כל המשתמשים (כולל המרצים והמתרגלים) חייבים להיכנס לקורס זה בווב-וורק דרך מערכת הלימוד LMS. אם משתמש מגיע אל דף הכניסה של הקורס בווב-וורק, תופיע הודעה המפנה אותם חזרה אל מערכת הלימוד."
 
-#. (CGI::b($r->maketext("Remember Me")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:201
+#. (tag('strong', maketext('Remember Me')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:33
 msgid ""
 "If you check %1 your login information will be remembered by the browser you"
 " are using, allowing you to visit WeBWorK pages without typing your user "
@@ -3364,273 +4489,419 @@ msgid ""
 " have direct control."
 msgstr "אם אתה בוחר את %1 פרטי ההתחברות שלך ישמרו על ידי הדפדפן שלך, מה שיאפשר לך לבקר בדפי WeBWorK בלי להקליד שם משתמש וסיסמה (עד שפג תוקף הביקור). אפשרות זו לא בטוחה עבור מקומות עובודה ציבוריים, מחשבים לא בטוחים, ומחשבים שבהם אתה לא שולט באופן ישיר."
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:407
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:154
+msgid ""
+"If you click on the \"Grade Problem\" icon to the right of the problem "
+"number, then the problem will open in the manual problem grader. This page "
+"shows the rendered problem and lists all students assigned to the set and "
+"the last answer the students entered for the problem. You can then change "
+"the recorded scores for students on this problem and provide instructor "
+"feedback comments."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:148
+msgid ""
+"If you click on the \"Open in New Window\" icon to the right of the problem "
+"number, then the problem will open in the actual homework set in a new tab "
+"or window."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:425
 msgid "If you come back to it later, it may revert to its original version."
 msgstr "אם תחזור לשאלה בהמשל, ייתכן שהשאלה תחזור לגרסה המקורית."
 
+#. ('<code>report_grades_data.csv</code>', '<code>report_grade.msg</code>',
+#. '<code>$COL</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:80
+msgid ""
+"If you upload your file on the web with the name: %1 and also create an "
+"email message with the name %2 with the approriate %3 variables then not "
+"only can you email the message with the embedded grades to the students, but"
+" files with those exact names are automatically appended to the \"Grades\" "
+"page seen by the students."
+msgstr ""
+
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:798
-msgid "Illegal file '%1' specified"
-msgstr "נבחר קובץ לא חוקי '%1' "
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:337
+msgid "Illegal file \"%1\" specified"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1445
 msgid "Illegal filename contains '..'"
 msgstr "שם קובץ לא חוקי, מכיל '..'"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:73
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:63
 msgid "Import"
 msgstr "ייבא"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1291
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:65
+msgid ""
+"Import a single set or multiple sets from a set definition file. (Use the "
+"\"File Manager\" to upload/download set definition files.) The \"Shift "
+"Dates...\" option is useful for problem sets that were used from other "
+"courses and will shift all of the dates."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:16
 msgid "Import from where?"
 msgstr "מאיפה לייבא?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1270
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:5
 msgid "Import how many sets?"
 msgstr "כמה גליונות לייבא?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:31
 msgid "Import sets with names"
 msgstr "ייבא גליונות עם שמות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:5
 msgid "Import users from what file?"
 msgstr "מאיזה קובץ לייבא משתמשים?"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:99
+msgid "Import/export achievements"
+msgstr ""
+
 #. ($count)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:516
 msgid "Imported %quant(%1,achievement)"
 msgstr "יבא Imported %quant(%1,הישג, הישגים)"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:25
+msgid ""
+"In both cases, one can select the sort field, the format of the display "
+"list, and the filter. \"Change Display Settings\" must be clicked to update "
+"the list."
+msgstr ""
+
 #. ($total_inprogress, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1019
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:28
 msgid "In progress: %1/%2"
 msgstr "בתהליך: %1/%2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:47
 msgid "Inactive"
 msgstr "לא פעיל"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1601
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:51
+msgid "Inactive Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1503
 msgid "Inactivity time before a user is required to login again"
 msgstr "זמן אי-פעילות לפני שהמשתמש נדרש להתחבר שוב"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:42
 msgid "Include Contrib"
 msgstr "יש לכלול שאלות ממאגר Contrib הלא מבוקר"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:35
 msgid "Include OPL"
 msgstr "יש לכלול שאלות ממאגר OPL המבוקר"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:32
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:55
 msgid "Include Success Index"
 msgstr "הוסף תיבת הצלחה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:62
 msgid "Include percentage grades columns for all sets"
 msgstr "יש לכלול עמודת ציונים מתוך 100 לכל הגיליונות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:471
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:302
 msgid "Incorrect"
 msgstr "לא נכון"
 
 #. ($total_incorrect, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1033
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:36
 msgid "Incorrect: %1/%2"
 msgstr "לא נכון: %1/%2"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:26
+msgid ""
+"Indicates the number of problems in the set. Clicking on the link opens the "
+"set detail page which allows you to modify set parameters, edit set headers,"
+" and change parameters of problems in the set such as the number of allowed "
+"attempts or the weight (credit value). You can also add, remove, view, edit,"
+" and reorder the problems in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:141
+msgid "Individual Problem Results"
+msgstr ""
+
 # Short for Initial
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:41
 msgid "Init"
 msgstr "התחל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:502
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:35
 msgid "Institution"
 msgstr "מוסד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2344
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:560
 msgid "Instructor Comment:"
 msgstr "הערת סגל ההוראה:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1494
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1306
 msgid "Instructor Feedback:"
 msgstr "משוב מסגל ההוראה:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:311
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:17
+msgid "Instructor Links Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:29
 msgid "Instructor Tools"
 msgstr "כלי מורה"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1228
-msgid "Instructor solution preview: show the student solution after due date."
-msgstr "הצגת פתרון למורה: התפרון יוצג לסטודנטים רק לאחר מועד ההגשה."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:17
+msgid "Instructor Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:90
+msgid "Instructor:"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:377
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:326
 msgid "Invalid Reply-to address."
 msgstr "כתובת משוב לא תקינה."
 
 #. ($output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:187
 msgid ""
-"Invalid file name. The file name \"%1\" does not have a \".msg\" extension "
-"All email file names must end in the extension \".msg\" choose a file name "
-"with a \".msg\" extension. The message was not saved."
-msgstr "שם קובץ לא תקין. שם הקובץ \"%1\" לא מסתיים ב-\".msg\" כל קבצי הדוא\"ל חייבים להסתיים בסיומת זו. בחר שם קובץ עם הסיומת \".msg\". ההודעה לא נשמרה."
+"Invalid file name \"%1\". All email file names must end with the \".msg\" "
+"extension.  Choose a file name with the \".msg\" extension. The message was "
+"not saved."
+msgstr ""
 
 #. ($headerType)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1951
 msgid "Invalid headerType %1"
 msgstr "סוג קידומת לא תקין %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:177
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/XMLRPC.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:173
 msgid "Invalid user ID or password."
 msgstr "מזהה משתמש או סיסמה לא תקינים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2244
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:34
+msgid ""
+"It is important that students enter an email address or they will not "
+"recieve any of the important emails sent by the instructor. The email "
+"address will only be present on the page if the user has permission to "
+"change the email address."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:20
+msgid "It lists the homework problem sets available for the students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:472
 msgid "Jump to Problem:"
 msgstr "קפוץ לשאלה:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:867
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:939
 msgid "Just-In-Time parameters"
 msgstr "פאראמטרים \"בדיוק בזמן\""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:130
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:85
+msgid "Key Map"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:14
 msgid "Key Map:"
 msgstr "מיפוי מקלדת:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:93
 msgid "Keywords:"
 msgstr "מילות מפתח:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "LAST NAME"
 msgstr "שם משפחה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1477
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:119
 msgid "LOCAL Usage"
 msgstr "שימוש מקומי"
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:100
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:103
 msgid "LTI"
 msgstr "LTI"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1548
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:25
+msgid "LTI Grade Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:460
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:75
+msgid "LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:17
+msgid "LTI Grade Update Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:16
+msgid "LTI grade passback is not enabled for this course"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:63
+msgid "LTI update of all users and sets queued."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:64
+msgid "LTI update of all users queued."
+msgstr ""
+
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:58
+msgid "LTI update of set %1 queued."
+msgstr ""
+
+#. ($userID, $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:56
+msgid "LTI update of user %1 and set %2 queued."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:60
+msgid "LTI update of user %1 queued."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1450
 msgid "Language (refresh page after saving changes to reveal new language.)"
 msgstr "שפה (רענן דף לאחר שמירת שינויים כדי להציג את השפה החדשה.)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:758
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:140
 msgid "Last"
 msgstr "אחרון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:460
 msgid "Last Answer"
 msgstr "תשובה אחרונה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:604
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:231
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2001
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:828
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:857
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:915
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:31
+msgid "Last Full Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:25
 msgid "Last Name"
 msgstr "שם משפחה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:792
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:115
 msgid "Last column of merge file"
 msgstr "עמודה אחרונה של קובץ המיזוג"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:785
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:108
 msgid "Last name"
 msgstr "שם משפחה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:242
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:237
 msgid "Latest Answers"
 msgstr "תשובות אחרונות"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1603
+#: /opt/webwork/webwork2/conf/defaults.config:1505
 msgid ""
 "Length of time, in seconds, a user has to be inactive before he is required "
-"to login again.<p>This value should be entered as a number, so as 3600 "
-"instead of 60*60 for one hour"
-msgstr "משך הזמן, בשניות, שבו המשתמש יכול להיות לא פעיל לפני שהוא נדרש להתחבר שוב. <p>יש להזין את הערך כמספר שלם, למשל 3600 עבור שעה אחת. לא ניתן להזין ערך בצורה כמו 60*60."
+"to login again. This value should be entered as a number, so as 3600 instead"
+" of 60*60 for one hour."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:845
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:26
 msgid "Lesser Rod of Revelation"
 msgstr "מטה הגילוי הקטן"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:965
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:26
 msgid "Lesser Tome of Enlightenment"
 msgstr "כרך ההארה הקטן"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:141
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:15
 msgid "Level Progress:"
 msgstr "התקדמות ברמה הנוכחית:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:881
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:77
 msgid "Level:"
 msgstr "שלב:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:912
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2060
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:433
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:17
+msgid "Library Broswer Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:359
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:52
 msgid "Library Browser"
 msgstr "דפדפן ספרייה"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1977
+#. ($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:30
+msgid "Link to Edit Page for %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:25
+msgid "Links to pages that give information about writing problems:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1879
 msgid "List of display modes made available to students"
 msgstr "רשימת מצבי התצוגה המוצגים לסטודנטים כאפשרויות"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2130
-msgid ""
-"List of e-mail addresses to which e-mail can be sent by a problem. "
-"Professors need to be added to this list if questionaires are used, or other"
-" WeBWorK problems which send e-mail as part of their answer mechanism."
-msgstr " רשימת כתובות דוא\"ל שאליהן שאלה תוכל לשלוח הודעה. צריך להוסיף מרצים אם משתמשים בשאלונים, או שאלות WeBWorK אחרות ששולחות דוא\"ל כחלק ממנגנות התשובות שלהן."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:759
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:774
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:89
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:96
 msgid "List of insertable macros"
 msgstr "רשימת פקודות מאקרו שניתנת לשימוש"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1826
+#: /opt/webwork/webwork2/conf/defaults.config:1728
 msgid "List of options for Show Me Another button"
 msgstr "רשימת אפשרויות עבור כפתור \"הראה לי שאלה דומה\""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1713
+#: /opt/webwork/webwork2/conf/defaults.config:1615
 msgid "List of sets excluded from achievements"
 msgstr "רשימת גיליונות שמחוץ לטיפול של מערכת ההישגים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1483
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:56
+msgid "Live equation rendering"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:144
+msgid "Loading..."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:122
 msgid "Local Attempts"
 msgstr "מספר הגשות מקומי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:41
 msgid "Local Problems"
 msgstr "שאלות מקומיות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1504
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:136
 msgid "Local Status"
 msgstr "ציון מקומי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:105
 msgid "Local Usage Data"
 msgstr "היקף שימוש מקומי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1467
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:114
 msgid ""
 "Local data is generated when your systems admin runs the script update-OPL-"
 "statistics."
 msgstr "נתונים מקומיים נוצרים כאשר מנהל המערכת מפעיל את התוכנה update-OPL-statistics."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1460
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:107
 msgid ""
 "Local data on problem usage is generated and maintained by your institution."
 " The Usage figure is the total number of local individuals who have attemped"
@@ -3639,42 +4910,61 @@ msgid ""
 "likely bug free."
 msgstr "הנתונים המקומיים על השימוש בשאלות נאספת במוסד שלך. היקף שימוש גלובלי הוא מספר הכולל של משתמשים שהגישו לפחות הגשה אחד לשאלה זו. מספר גדול מהווה אינדיקציה שהשאלה הוקצה להרבה סטודנטים ולכן מצאה חם בעיני מספר מרצים וכנראה שאין בשאלה באגים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:115
 msgid "Location"
 msgstr "מיקום"
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3501
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1854
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1890
 msgid ""
 "Location %1 does not exist in the WeBWorK database.  Please check your input"
 " (perhaps you need to reload the location management page?)."
 msgstr "מיקום %1 לא קיים במסד הנתונים של WeBWorK. אנא בדוק את הקלט (אולי אתה צריך לטעון מחדש את דף ניהול המיקומים?)."
 
 #. ($locationID, join(', ', @addresses)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1742
 msgid "Location %1 has been created, with addresses %2."
 msgstr "מיקום %1 נוצר, עם כתובת %2."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3353
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1798
 msgid "Location deletion requires confirmation."
 msgstr "מחיקת מיקום דורשת אישור."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3409
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:43
 msgid "Location description:"
 msgstr "תיאור מיקום:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3089
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:37
 msgid "Location name:"
 msgstr "שם מיקום:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:159
-msgid "Log In Again"
-msgstr "התחבר שוב"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:27
+msgid ""
+"Locations are a list of ip addresses.  Ip addresses can be a single address "
+"(e.g. 192.168.1.101), a range of ip address (e.g. "
+"192.168.1.101-192.168.1.150), or an ip address mask (e.g. 192.168.1.0/24). "
+"Enter one ip address per line, using as many lines as needed for each "
+"location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:32
+msgid ""
+"Locations are edited by adding new ip addresses to the location, or deleting"
+" existing address.  You must select the confirm checkbox when deleting a "
+"location, and this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:43
+msgid "Locations of files:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:18
+msgid "Log In Again"
+msgstr "התחבר שוב"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1124
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:11
 msgid "Log Out"
 msgstr "התנתק"
 
@@ -3682,368 +4972,456 @@ msgstr "התנתק"
 #. ($rename_oldCourseID)
 #. ($rename_newCourseID)
 #. ($new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1458
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1541
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2666
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:913
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:704
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:780
 msgid "Log into %1"
 msgstr "התחבר ל-%1"
 
-#. (HTML::Entities::encode_entities($prettyUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1122
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1130
+#. ($userName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:9
 msgid "Logged in as %1."
 msgstr "מחובר בתור %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:790
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:181
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:187
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:113
 msgid "Login"
 msgstr "התחבר"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:58
 msgid "Login Info"
 msgstr "נתוני התחברות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:187
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:815
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1980
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:291
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:855
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:884
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:913
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:36
 msgid "Login Name"
 msgstr "שם התחברות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:18
 msgid "Login Status"
 msgstr "סטטוס התחברות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:6
+msgid "Login:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:225
 msgid "Logout"
 msgstr "התנתק"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Macro"
 msgstr "מאקרו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:763
-msgid "Main Menu"
-msgstr "תפריט ראשי"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:97
+msgid ""
+"Macro (\".pl\") files containing additional functionality for your course "
+"can be stored here."
+msgstr ""
+
+#. ($filePath)
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:29
+msgid "Macro file %1 not found."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:369
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:46
 msgid "Make Archive"
 msgstr " צור ארכיון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:27
 msgid "Make changes"
 msgstr "בצע שינויים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1115
-msgid "Make these changes in  course:"
-msgstr "בצע את השינויים הבאים בקורס:"
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:15
+msgid "Make these changes in course: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:137
+msgid ""
+"Makes a new copy of the file you are editing at the location relative to the"
+" course's templates ([TMPL]) directory. You may choose to replace the "
+"current problem in the current set, append to the end to then end of the "
+"current set as a new problem, or create a problem that is not attached to a "
+"problem set."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3040
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:1
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:46
 msgid "Manage Locations"
 msgstr "נהל מיקומים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:748
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:394
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:17
+msgid "Manage Locations Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:20
+msgid ""
+"Manage achievements for the course.  The actions allow one to edit, assign, "
+"import, export, score, create, or delete achievements.  The action form is "
+"at the top to select the desired action and options to perform when the "
+"submit button is pressed.  Below the action form is the list of all the "
+"achievements, ordered by their achievement \"Number\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:56
+msgid "Manage administration course files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:50
+msgid ""
+"Manage instructors.  When instructors are added to a newly created course, "
+"they are also added to the admin course with username \"userID_courseID\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:344
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:192
 msgid "Manual Grader"
 msgstr "מנקד אוטומטי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:233
-msgid "Mark All"
-msgstr "סמן הכל"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:17
+msgid "Manual Grader Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr',
+#. format_set_name_display($c->stash->{set}->set_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:205
+msgid "Manual Grader for %1: Problem %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:77
+msgid ""
+"Manually initiate an LTI grade passback for selected sets or users. This "
+"link is only visible if LTI grade passback is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:175
+msgid ""
+"Many of these editing activities can also be done more quickly from the "
+"\"Instructor Tools\" page where students and homework sets can be selected "
+"simultaneously. The \"Instructor Tools\" page is useful for quick editing of"
+" one or two students. The initial setup of the class can be done best from "
+"this page. Importing and exporting class lists can only be done from this "
+"page. Deleting students can only be done from this page."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:120
 msgid "Mark Correct"
 msgstr "סמן כנכון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2822
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:598
 msgid "Mark Correct?"
 msgstr "סמן כנכון?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:681
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:19
 msgid "Match on what? (separate multiple IDs with commas)"
 msgstr "התאמה לפי מה? (הפרד מספר מזהים שונים באמצעות פסיק)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:499
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:85
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:36
 msgid "Math Objects"
 msgstr "אובייקטים מתמטיים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:327
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:377
 msgid "Max attempts"
 msgstr "מספר מקסימאלי של נסיונות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:380
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:24
 msgid "Max. Shown:"
 msgstr "מקסימום שיוצגו:"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1817
+#: /opt/webwork/webwork2/conf/defaults.config:1719
 msgid ""
 "Maximum times Show me Another can be used per problem (-1 => unlimited)"
 msgstr "מספר מקסימאלי של פעמים שניתן להשתמש בכפתור \"הראה לי שאלה דומה\" עבור כל שאלה (-1 => לא מוגבל)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:606
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:4
+msgid "Merge file data:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:24
 msgid "Merge file:"
 msgstr "קובץ מיזוג:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:288
 msgid "Message"
 msgstr "הודעות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:578
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:13
 msgid "Message file:"
 msgstr "קובץ הודעה:"
 
-#. ($emailDirectory, $output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:357
-msgid "Message saved to file <code>%1/%2</code>."
-msgstr "הודעה נשמרה לקובץ <code>%1/%2</code>."
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:300
+msgid "Message saved to file %1."
+msgstr ""
 
-#. ($recipient, $ur->email_address)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:995
+#. ($recipient, $user_record->email_address)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:98
 msgid "Message sent to %1 at %2."
 msgstr "ההודעה נשלחה אל %1 בכתובת %2."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2249
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2324
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:121
+msgid "Message was blank."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:48
+msgid ""
+"Messages can be saved to a message file (which must end in the \".msg\" "
+"extension).  Use the \"Message file\" drop down menu to select which message"
+" file to load, or \"None\" to use a blank message. To save a new message, "
+"use the \"Save as\" button after entering in a valid filename.  The \"Save "
+"as\" button will not overwrite currently saved messages.  To edit a "
+"currently saved message first select it using the drop down menu, then click"
+" the \"Save\" button to save any changes.  Use the \"File Manager\" to "
+"delete messages, located in the \"[TMPL]/email\" directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:22
 msgid "Method"
 msgstr "Method"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3284
+#: /opt/webwork/webwork2/conf/defaults.config:2003
+msgid "Method to enter problem scores in the single problem manual grader"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1668
 msgid ""
 "Missing required input data. Please check that you have filled in all of the"
 " create location fields and resubmit."
 msgstr "חסר קלט הכרחי. אנא ודא שמלאת את כל שדות יצירת המיקום ושלח שוב."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1555
+#: /opt/webwork/webwork2/conf/defaults.config:1457
 msgid ""
 "Mode in which the LANG and DIR settings for a single problem are determined."
 msgstr "האופן בו קובעים את ערכי LANG ו- DIR לשאלה מסוימת."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1557
-msgid ""
-"Mode in which the LANG and DIR settings for a single problem are "
-"determined.<p>The system will set the LANGuage attribute to either a value "
-"determined from the problem, a course-wide default, or the system default, "
-"depending on the mode selected. The tag will only be added to the DIV "
-"enclosing the problem if it is different than the value which should be set "
-"in the main HTML tag set for the entire course based on the course "
-"language.<p>There are two options for the DIRection attribute: \"ltr\" for "
-"left-to-write sripts, and \"rtl\" for right-to-left scripts like Arabic and "
-"Hebrew.<p>The DIRection attribute is needed to trigger proper display of the"
-" question text when the problem text-direction is different than that used "
-"by the current language of the course. For example, English problems from "
-"the library browser would display improperly in RTL mode for a Hebrew "
-"course, unless the problen Direction is set to LTR.<p>The feature to set a "
-"problem language and direction was only added in 2018 to the PG language, so"
-" most problems will not declare their language, and the system needs to fall"
-" back to determining the language and direction in a different manner. The "
-"OPL itself is all English, so the system wide fallback is to en-US in LTR "
-"mode.<p>Since the defaults fall back to the LTR direction, most sites should"
-" be fine with the \"auto::\" mode, but may want to select the one which "
-"matches their course language. The mode \"force::ltr\" would also be an "
-"option for a course which runs into trouble with the \"auto\" "
-"modes.<p>Modes:<br><ul><li>\"none\" prevents any additional LANG and/or DIR "
-"tag being added. The browser will use the main setting which was applied to "
-"the entire HTML page. This is likely to cause trouble when a problem of the "
-"other direction is displayed.</li><li>\"auto::\" allows the system to make "
-"the settings based on the language and direction reported by the problem (a "
-"new feature, so not set in almost all existing problems) and falling back to"
-" the expected default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" "
-"allows the system to make the settings based on the language and direction "
-"reported by the problem (a new feature, so not set in almost all existing "
-"problems) but falling back to the language with the given LangCode and the "
-"direction Dir when problem settings are not available from "
-"PG.</li><li>\"auto::Dir\" for problems without PG settings, this will use "
-"the default en=english language, but force the direction to Dir. Problems "
-"with PG settings will get those settings.</li><li>\"auto:LangCode:\" for "
-"problems without PG settings, this will use the default LTR direction, but "
-"will set the language to LangCode.Problems with PG settings will get those "
-"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
-" by the PG code of the problem, and will force the system to set the "
-"language with the given LangCode and the direction to Dir for <b>all</b> "
-"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
-"PG code of the problem, and will force the system to set the direction to "
-"Dir for <b>all</b> problems, but will avoid setting any language attribute "
-"for individual problem.</li></ul>"
-msgstr "השיטה בה המערכת תקבע את השפה LANG ואת כיוון הכתיבה DIR עבור השאלות הבודדות.<p>המערכת תקבע את התכונה LANGuage עבור HTML לערך שנקבע בשאלה עצמה, לפי ברירת מחדל בקורס, או לפי ברירת מחדל של השרת בהתאם לשיטה הנבחרת. הגדרת התכונה תופיע בתכונות ה- DIV שעוטף את השאלה רק אם הערך שנקבע על פי השיטה שונה מהערך שהקורס מגדירה עבור תג ה- HTML הראשי של הדף על בסיס השפה שנבחרה לקורס.<p>יש שתי אפשרויות עבור התכונה DIRection: א. \"ltr\" עבור כתיבה משמאל לימין, וב. \"rtl\" עבור כתיבה מימין לשמאל עבור עברית, ערבית וכו'<p>על מנת שהתצוגה תהיה תקינה חשוב שיוגדר תכונת ה- DIRection עבור שאלות בהם כיוון הכתיבה של שפת השאלה שונה מזו של שפת הקורס. למשל שאלות OPL באנגלית יוצגו בצורה שגויה בקורס בו מוגדר שפת הקורס לעברית ללא הגדרת כיוון LTR עבור השאלה.<p>התמיכה בקביעת שפה וכיוון כתיבה לשאלות נוספת לשפת PG של המערכת רק בשנת 2018, ולכן רוב השאלות הקיימות לא יגדירו שפה. לכן, המערכת נדרשת לשיטה חלופית לקביעת שפה וכיוון כתיבה של שאלות למצבים שהמידע לא קיים בשאלה. מכיון שמאגר ה- OPL הוא באנגלית, ברירת המחדל של המערכת היא להתייחס לשאלות בהן אין הגדרה מפורשת כשאלות בשפה en-US ובכיוון כתיב LTR.<p>\nמכיון שברירת המחדל היא לכיוון כתיבה LTR, רוב האתרים/הקורסים אמורים להסתדר בשיטה \"auto::\" אך יכולים גם לבחור בשיטה המתאימה לשפה הקורס. השיטה \"force::ltr\" גם אפשרות טובה לקורסים שנתקלים בבעיות עם שיטת \"auto\".<p>השיטות האפשריות:<br><ul><li>\"none\" \nמונע מהמערכת להוסיף תכונות LANG ו/או DIR לקוד הנוצר של ה- DIV העוטף. הדפדפן ישתמש בערך שנקבע ל- HTML של הדף כולו. צפוי להיות תקלות תצוגה של שאלות מכיוון הכתיבה ההפוכה. </li><li>\"auto::\" המערכת תבצע שינויים נדרשים בהתאם למידע שמסופק על ידי השאלה (אפשרות חדשה שלא נמצאת ברוב השאלות), אך אם נסיגה לברירת המחדל של השפה en-US בכיוון כתיבה LTR. </li><li>\"auto:LangCode:Dir\" המערכת תבצע שינויים נדרשים בהתאם למידע שמסופק על ידי השאלה (אפשרות חדשה שלא נמצאת ברוב השאלות), אך אם נסיגה לשפה LangCode הנתונה בערך ולכייון הכתיבה Dir כאשר ערכים לא מספוקים על ידי השאלה.</li><li>\"auto::Dir\" עבור שאלות ללא הגדרה מפורשת, ישתמש בברירה המחדל של השפה en=english, אך יאלץ את כיוון הכתיבה לערך Dir. שאלות עם הגדרה מפורשת ישתמשו בערכים שמוגדרים בשאלה.</li><li>\"auto:LangCode:\" עבור שאלות ללא הגדרה מפורשת, ישתמש בברירה המחדל של כיוון הכתיבה LTR, אך יאלץ את השפה לערך LangCode. שאלות עם הגדרה מפורשת ישתמשו בערכים שמוגדרים בשאלה.</li><li>\"force:LangCode:Dir\" המערכת<b>תתעלם</b>מכל הגדרה שמגיע מקוד ה- PG של השאלה ויאלץ את השימוש בשפה LangCode ובכיוון הכתיבה Dir עבור <b></b> השאלות.</li><li>\"force::Dir\" המערכת <b>תתעלם</b>מכל הגדרה שמגיע מקוד ה- PG של השאלה ויאלץ את השימוש בכייון הכתיבה Dir עבור<b>כל</b> השאלות, אך תמנע מהגדרת השפה עבור שאלות בודדות.</li></ul>"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2695
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:443
 msgid "Move"
 msgstr "הזז"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2231
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:457
 msgid "Move to Page:"
 msgstr "עבור אל דף:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2226
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:452
 msgid "Move to Problem:"
 msgstr "עבור אל שאלה:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:26
+msgid ""
+"Multiple sets may be assigned to the users by holding down the shift key or "
+"the ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:27
+msgid ""
+"Multiple users or sets may be selected by holding down the shift key or the "
+"ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:36
 msgid "My Problems"
 msgstr "השאלות שלי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1412
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:26
 msgid "Mysterious Package (with Ribbons)"
 msgstr "חבילה מסתורית (עם סרט אדום)"
 
 # Short for Number of Fields
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:213
 msgid "NO OF FIELDS"
 msgstr "מספר הסדות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1484
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:741
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:113
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:135
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:29
 msgid "Name"
 msgstr "שם"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:174
 msgid "Name for new set here"
 msgstr "שם לגליון חדש "
 
-#: /opt/webwork/webwork2/conf/defaults.config:1528
+#: /opt/webwork/webwork2/conf/defaults.config:1430
 msgid "Name of course information file"
 msgstr "שם של  קובץ מידע של הקורס"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1107
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:77
+msgid "Name of the evaluator file used to evaluate the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:81
+msgid "Name of the image used for the achievement icon."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:4
 msgid "Name the new set"
 msgstr "תן שם לגליון החדש"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1691
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:45
+msgid "Name:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:29
 msgid "Necromancers Charm"
 msgstr "מדליון בעל האוב"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:343
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:205
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:393
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:35
 msgid "Never"
 msgstr "אף פעם"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:371
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:54
 msgid "New File"
 msgstr "קובץ חדש"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:372
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:55
 msgid "New Folder"
 msgstr "תיקייה חדשה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:30
 msgid "New Name:"
 msgstr "שם חדש:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2067
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:3
 msgid "New Password"
 msgstr "סיסמה חדשה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:131
-msgid "New Version"
-msgstr "גרסה חדשה"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+msgid "New Problem"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
 msgid "New file name:"
 msgstr "שם קובץ חדש:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
 msgid "New folder name:"
 msgstr "שם תיקייה חדש:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:577
 msgid "New passwords saved"
 msgstr "סיסמאות חדשות נשמרו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1078
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:36
 msgid "New set name"
 msgstr "שם לגיליון החדש"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1357
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1010
 msgid "Next Problem"
 msgstr "השאלה הבאה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1181
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2164
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:40
+msgid "Next Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:98
 msgid "Next page"
 msgstr "הדף הבא"
 
-#. ($self->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:620
+#. (% $c->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:142
 msgid "Next test will be available by %1."
 msgstr "המבחן הבא יהיה זמין החל מ- %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2452
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:134
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:144
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:183
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:483
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:510
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:142
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:68
 msgid "No"
 msgstr "לא"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:635
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:116
 msgid "No Course"
 msgstr "אף קורס"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2324
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:216
 msgid "No Description"
 msgstr "אין תיאור"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:117
+msgid "No Sender specified."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:23
 msgid "No Target Set Selected"
 msgstr "לא נבחר גיליון יעד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:335
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:38
 msgid "No achievement badges have been assigned yet."
 msgstr "בינתיים לא הוקצה אף תו הישג."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1521
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:77
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:37
 msgid "No achievements shown.  Create an achievement!"
 msgstr "לא מוצגים הישגים. צור הישג!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:90
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:2
+msgid "No achievements shown.  Select an achievement to edit!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:61
 msgid "No action taken"
 msgstr "לא נעשת פעולה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:141
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:140
 msgid ""
 "No authentication method found for your request.  If this recurs, please "
 "speak with your instructor."
 msgstr "לא נמצאה שיטת אימות לבקשה שלך. אם בעיה זו חוזרת על עצמה, אנא פנה לצוות התמיכה או לסגל ההוראה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:940
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:361
 msgid "No change made to any set"
 msgstr "לא בוצע שום שינוי לשום גליון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
 msgid ""
 "No changes specified.  You must mark the checkbox of the item(s) to be "
 "changed and enter the change data."
@@ -4053,1379 +5431,1811 @@ msgstr "לא פורטו שינויים. יש לבחור את הדברים שבר
 msgid "No changes were saved!"
 msgstr "לא נשמרו שינויים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2462
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:50
 msgid "No course archives found."
 msgstr "לא נמצא אף קובץ ארכיון של קורס."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2898
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:32
 msgid "No course id defined"
 msgstr "לא הוגדר מזהה קורס"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1561
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:932
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:67
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:76
 msgid "No courses found"
 msgstr "לא נמצאו קורסים"
 
 #. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:593
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:675
 msgid "No data exists for set %1 and problem %2"
 msgstr "לא קיימים נתונים עבור גליון %1 ושאלה %2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:10
+msgid "No e-mail recipients are listed for this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:169
 msgid "No filename was specified for saving!  The message was not saved."
 msgstr "לא פורט שם קובץ לשמירה! ההודעה לא נשמרה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:340
 msgid "No guest logins are available. Please try again in a few minutes."
 msgstr "אין חשבונות אורחים זמינים. אנא נסה מאוחר יותר."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3522
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1877
 msgid "No location specified to edit. Please check your input data."
 msgstr "לא מחר מיקום לעריכה. בדוק את הגדרות הקלט שלך."
 
 #. ($badID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1788
 msgid "No location with name %1 exists in the database"
 msgstr "לא קיים מיקום עם השם %1 במסד הנתונים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3206
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:149
 msgid "No locations are currently defined."
 msgstr "אף מיקום לא מוגדר כרגע."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:342
 msgid "No merge data file"
 msgstr "לא קיים קובץ נתונים למיזוג"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:612
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:18
+msgid "No merge data found"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:164
+msgid "No merge data found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:8
+msgid "No merge file selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:135
 msgid "No more tests available."
 msgstr "אין עוד מבחנים זמינים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:270
 msgid ""
 "No new Achievement ID specified.  No new achievement created.  File not "
 "saved."
 msgstr "לא פורט מזהה הישג חדש. לא נוצר הישג חדש. קובץ לא נשמר."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:63
 msgid "No problems matched the given parameters."
 msgstr "לא נמצאו שאלות שתואמות לפאראמטרים שנתנו."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:25
+msgid "No recipients selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:334
 msgid ""
 "No recipients selected. Please select one or more recipients from the list "
 "below."
 msgstr "לא נבחרו נמענים. אנא בחר נמען אחד או יותר מהרשימה."
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2044
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:49
 msgid "No record for global set %1."
 msgstr "אין רישום לגליון הגלובאלי %1."
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2046
-msgid "No record for user %1."
-msgstr "אין רישום למשתמש %1."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
 msgid "No record found."
 msgstr "לא נמצא רישום."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1166
-msgid "No set created."
-msgstr "לא נוצר גליון."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:12
 msgid "No sets in this course yet"
 msgstr "עדיין לא קיימים גליונות בקורס זה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1010
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:159
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
 msgid "No sets selected for scoring"
 msgstr "לא נבחרו גליונות לנקד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2764
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:46
 msgid ""
 "No sets shown.  Choose one of the options above to list the sets in the "
 "course."
 msgstr "לא מוצגים גליונות. בחר את אחת האפשרויות למעלה כדי להציג את הגליונות בקורס."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1942
 msgid "No source filePath specified"
 msgstr "לא פורט מסלול קובץ מקור"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1327
 msgid "No source_file for problem in .def file"
 msgstr "אין קובץ מקור לשאלה בקובץ ה-def."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2099
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:87
 msgid ""
-"No students shown.  Choose one of the options above to list the students in "
+"No students shown. Choose one of the options above to list the students in "
 "the course."
-msgstr "לא מוצגים סטודנטים. אנא בחר את אחד מהאפשרויות למעלה כדי לראות את הסטודנטים בקורס."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:246
 msgid "No submissions. Over time."
 msgstr "אין הגשות. מועד ההגשה כבר עבר."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:278
 msgid "No tests taken."
 msgstr "לא נעשו מבחנים."
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:594
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:676
 msgid "No user specific data exists for user %1"
 msgstr "לא קיימים נתוניי משתמש עבור משתמש %1"
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2031
 msgid "No valid changes submitted for location %1."
 msgstr "לא נשלחו שינויים תקפים עבור מיקום %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:275
-msgid "No versions of this assignment have been taken."
-msgstr "אף גירסה של מטלה זו נלקח עדיין."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:771
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:263
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:241
 msgid "No versions of this test have been taken."
 msgstr "לא נוסה אף גרסה של המבחן הזה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:562
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:252
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:17
 msgid "None"
 msgstr "כלום"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:681
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2463
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:763
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:52
 msgid "None Specified"
 msgstr "לא נבחרו פריטים"
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2089
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:73
 msgid "None of the selected users are assigned to this set: %1"
 msgstr "לאף אחד מהמשתמשים הנבחרים לא הוקצה הגליון הזה: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:33
 msgid "Not logged in."
 msgstr "לא מחובר."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1569
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:4
 msgid "Note"
 msgstr "הערה"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:381
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:55
+msgid ""
+"Note that if there are errors, they will be shown at the top of the page. In"
+" some cases, a hard copy is still generated and a link called \"Download "
+"Hardcopy\" appears. In addition, the latex file, log and error files are "
+"generated which can be used in troubleshooting."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:93
+msgid ""
+"Note that if you set the permission level of a user to something other than "
+"\"Student\", you may also want to set the status of the user to "
+"\"Observer\".  Users with the \"Observer\" status are not included in "
+"statistics, scoring, or instructor emails."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:28
+msgid ""
+"Note that some settings require an additional page load after \"Save "
+"Changes\" is clicked in order to take effect.  This is true for a theme "
+"change for example."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:396
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:422
 msgid "Note:"
 msgstr "הערה:"
 
-#. (CGI::i($pg->{result}{msg})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2350
+#. (tag('i', maketext('You are in the Reduced Scoring Period.  All work counts
+#. for [_1]% of the original.',
+#. $ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#. (tag('i', $pg->{result}{msg})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:572
 msgid "Note: %1"
 msgstr "הערה: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2482
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:686
 msgid ""
 "Note: grading the test grades all problems, not just those on this page."
 msgstr "שים לב: ניקוד המבחן מנקד את כל השאלות, לא רק מהדף הזה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1460
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1485
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:768
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:59
+msgid "Now"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:19
 msgid "Number"
 msgstr "מספר"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:242
 msgid "Number of Graded Submissions per Test (0=infty)"
 msgstr "מספר ההגשות שנוקדו עבור כל מבחן (0=אינסוף)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
 msgid "Number of Problems per Page (0=all)"
 msgstr "מספר שאלות בכל דף (0=הכל)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:95
+msgid "Number of Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:257
 msgid "Number of Tests per Time Interval (0=infty)"
 msgstr "מספר מבחנים עבור פסק זמן (0=אינסוף)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1833
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2435
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:54
+msgid "Number:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1181
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:912
 msgid "OK"
 msgstr "אישור"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1464
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:17
+msgid "OPL Problem Levels Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:26
 msgid "Oil of Cleansing"
 msgstr "שמן הטיהור"
 
+#. ('<code>pdflatex</code>', '<code>hardcopy.tex</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:49
+msgid ""
+"Once \"Generate Hardcopy for selected sets and selected users\" is clicked a"
+" file in the selected hardcopy format will be generated and offered for "
+"download. If PDF output was selected, a single PDF file is generated. If TeX"
+" output is selected, a zip file is generated that contains all files needed "
+"to generated the hardcopy PDF file via %1. The main TeX file is called %2."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:84
 msgid "One Column"
 msgstr "עמודה אחת"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:314
+msgid "Only Start"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:289
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:303
 msgid "Only after set answer date"
 msgstr "רק לאחר תאריך התשובות של הגליון"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1892
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:87
+msgid ""
+"Only present for JITAR sets. Collapse JITAR nesting problem groups to the "
+"top row of information about a problem. Note that the nesting of a single "
+"problem group can be collapsed by clicking on the down arrow to the right of"
+" the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:80
+msgid ""
+"Only present for JITAR sets. Expand JITAR nested problem groups that have "
+"been collapsed. Note that the nesting of a single problem group can be "
+"expanded by clicking on the right arrow to the right of the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1794
 msgid ""
 "Only this permission level and higher get buttons for sending e-mail to the "
 "instructor."
 msgstr "רק רמת הרשאה זאת ומעלה מקבלים גישה לכפתור לשליחת דוא\"ל לתוות התמיכה/סגל ההוראה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:39
 msgid "Open"
 msgstr "פתח"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:422
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:763
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:810
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:62
 msgid "Open Date"
 msgstr "תאריך פתיחה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1098
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:42
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:32
 msgid "Open Problem Library"
 msgstr "ספריית שאלות פתוחות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2417
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:272
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:525
 msgid "Open in New Window"
 msgstr "פתח בחלון חדש"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1263
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1617
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:29
 msgid "Open in new window"
 msgstr "פתח בחלון חדש"
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:491
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:320
 msgid "Open, closes %1."
 msgstr "פתוח, מועד הגשה אחרון: %1."
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:489
-msgid "Open, complete by %1."
-msgstr "פתוח, מועד הגשה אחרון: %1."
-
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:300
 msgid "Open, due %1."
 msgstr "פתוח, מועד הגשה אחרון: %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:433
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
 msgid "Open."
 msgstr "פתוח."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:431
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:268
 msgid "Open. Submitted."
 msgstr "פתוח. הוגש."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:31
 msgid "Open:"
 msgstr "מועד פתיחה:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:115
 msgid "Opens"
 msgstr "מועד פתיחה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:27
 msgid "Opens any homework set for 24 hours."
 msgstr "פותח גליון שיעורי בית ל-24 שעות"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1686
+#: /opt/webwork/webwork2/conf/defaults.config:1588
 msgid "Optional Modules"
 msgstr "מודולים אופציונאליים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:265
 msgid "Order Problems Randomly"
 msgstr "סדר שאלות באופן אקראי"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:50
+msgid "Other Options"
+msgstr ""
+
 # Context is "7 Out Of 10"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:405
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:777
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:150
 msgid "Out Of"
 msgstr "מתוך"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1024
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:85
+msgid "Overall Results"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:93
+msgid "Overall Set Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:122
+msgid "Overall Success Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:470
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:481
 msgid "Overwrite"
 msgstr "דרוס"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:437
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:100
 msgid "Overwrite existing files silently"
 msgstr "דרוס קבצים קיימים באופן שקט"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:41
+msgid "PDF"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:69
 msgid "PG Info"
 msgstr "מידע מ- PG"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:827
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer.html.ep:1
+msgid "PG POD"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:17
+msgid "PG Problem Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:708
 msgid "PG debug messages"
 msgstr "הודעות דיבאג של PG"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:829
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:716
 msgid "PG internal errors"
 msgstr "שגיאות PG פנימיות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:818
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:109
+msgid ""
+"PG markdown syntax used to format WeBWorK questions. This interactive lab "
+"can help you to learn the techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:692
 msgid "PG question failed to render"
 msgstr "רינדור שאלת PG נכשל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:826
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:706
 msgid "PG question processing error messages"
 msgstr "הודעות שגיאות עיבוד של שאלת PG"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:828
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:712
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:128
 msgid "PG warning messages"
 msgstr "הודעות אזהרה של PG"
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:511
-msgid "PGLab"
-msgstr "מעבדת PG"
-
-# Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:98
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:47
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:58
 msgid "PGML"
 msgstr "PGML"
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:91
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:40
 msgid "POD"
 msgstr "POD"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2309
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2249
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:200
+msgid "POD Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:208
+msgid "POD Viewer"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1515
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:526
 msgid "PREVIEW ONLY -- ANSWERS NOT RECORDED"
 msgstr "תצוגה מקדימה בלבד -- התשובות לא נשמרות"
 
 # Problem Number
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:215
 msgid "PROB NUMBER"
 msgstr "מספר השאלה"
 
 # Problem Value
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:218
 msgid "PROB VALUE"
 msgstr "ערך השאלה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:205
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:36
 msgid "Pad Fields"
 msgstr "רפד שדות"
 
-#. (timestamp($self)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1255
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:28
+msgid "Page Contents"
+msgstr ""
+
+#. ($c->timestamp)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:1
 msgid "Page generated at %1"
 msgstr "דף נוצר ב-%1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:568
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:81
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:71
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:56
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:25
 msgid "Password"
 msgstr "סיסמה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:976
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:13
 msgid "Password (Leave blank for regular proctoring)"
 msgstr "סיסמה (השאר ריק עבור משגיח רגיל)"
 
-#. ($studentUser, CGI::span({ dir => 'ltr' },
-#. format_set_name_display($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:498
+#. ($studentUser, tag('span', dir => 'ltr', format_set_name_display($setName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:13
 msgid "Past Answers for %1, set %2, problem %3"
 msgstr "תשובות מהעבר עבור %1, גליון %2, שאלה %3"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:8
 msgid "Percent"
 msgstr "אחוז"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:562
-msgid "Percentage of Active Students with Correct Answers"
-msgstr "אחוז הסטודנטים הפעילים עם תשובות נכונות"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:94
+msgid "Percent Ranges"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+msgid "Percent Score"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:535
+msgid "Percent of Students"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:788
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:206
 msgid ""
 "Percentile cutoffs for number of attempts. The 50% column shows the median "
 "number of attempts."
 msgstr "חסם באחוזים לכמות נסיונות הגשה שנוצלו. עמודת ה-50% מראה את החציון של מספר ניסיונות ההגשה שנוצלו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2056
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:834
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:863
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:921
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:58
+msgid ""
+"Percentile cutoffs for student's score and success index. The 50% column "
+"shows the median number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:50
 msgid "Permission Level"
 msgstr "רמת הרשאה"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1869
+#: /opt/webwork/webwork2/conf/defaults.config:1771
 msgid "Permissions"
 msgstr "הרשאות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1052
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:24
 msgid "Pick a target set above to add this problem to."
 msgstr "יש לבחור למעלה גיליון יעד אליו תרצה להוסיף את השאלה הזה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:54
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:21
 msgid "Pick date and time"
 msgstr "בחר תאריך ושעה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3804
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
 msgid ""
 "Place a file named \"hide_directory\" in a course or other directory and it "
 "will not show up in the courses list on the WeBWorK home page. It will still"
 " appear in the Course Administration listing."
 msgstr "צור תיקייה בשם \"hide_directory\" בקורס או בתיקייה אחרת והיא לא תופיע ברשימת הקורסים בעמוד הבית של WeBWorK. היא כן תופיע ברישום הנהלת הקורס."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1107
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should be given full credit."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should have half credit added."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given full credit."
 msgstr "אנא בחר שם גליון ומספר שאלה של השאלה שיש לתת לה ניקוד מלא."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:889
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given half credit."
 msgstr "אנא בחר שם גליון ומספר שאלה של השאלה שיש להוסיף לציון שלה 50 נקושות (השינוי לא יגדיל את הציון מעל 100)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:654
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its incorrect attempt count reset."
 msgstr "אנא בחר שם גליון ומספר שאלה של השאלה שיש לאפס לה את מונה הניסיונות הלא נכונות."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its weight doubled."
 msgstr "אנא בחר את שם הגליון ומספר השאלה של השאלה שאת משקלה יש להכפיל."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1315
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:60
 msgid ""
 "Please choose the set, the problem you would like to copy, and the problem "
 "you would like to copy it to."
 msgstr "אנא בחר את הגליון, השאלה שתרצה להעתיק, ואת השאלה אליה תרציה להעתיק אותה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:399
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:19
 msgid "Please correct the following errors and try again:"
 msgstr "אנא תקן את השגיאות הבאות ונסה שוב:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:698
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:28
 msgid "Please enter in a value to match in the filter field."
 msgstr "אנה הכנס ערך תואם בשדה הסינון."
 
-#. (CGI::b($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:197
+#. (tag('b', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:28
 msgid "Please enter your username and password for %1 below:"
 msgstr "אנא הכנס את שם המשתמש והסיסמה שלך עבור %1 למטה:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1778
 msgid "Please provide a location name to delete."
 msgstr "אנא בחר שם מיקום למחיקה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:233
 msgid "Please select action to be performed."
 msgstr "אנא בחר פעולה לבצע"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:183
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
 msgid "Please select at least one set and try again."
 msgstr "אנא בחר לפחות גליון אחד ונסה שוב."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
 msgid "Please select at least one set."
 msgstr "נא לבחור לפחות גיליון אחד."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:165
 msgid "Please select at least one user and try again."
 msgstr "אנא בחר לפחות משתמש אחד ונסה שוב."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:35
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:31
 msgid "Please select at least one user."
 msgstr "נא לבחור לפחות משתמש אחד."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:28
 msgid "Please select at most one set."
 msgstr "נא לבחור לכל היותר גיליון אחד."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:30
 msgid "Please select exactly one set."
 msgstr "נא לבחור בדיוק גיליון אחד."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:29
 msgid "Please select exactly one user."
 msgstr "נא לבחור בדיוק משתמש אחד."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:574
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1016
 msgid "Please specify a file to save to."
 msgstr "אנא בחר קובץ לשמירה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:37
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
 msgid "Please specify a homework set name."
 msgstr "יש לספק שם לגיליון."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:38
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
 msgid ""
 "Please use only letters, digits, dashes, underscores, and periods in your "
 "set name."
 msgstr "בשם הגיליון יש להשתמש רק באותיות לטיניות = אנגלית, ספרות, סימני מינוס, קו-תחתון underscore, נקודה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1462
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1184
+msgid ""
+"Please use radio buttons to choose the method for saving this file. Uknown "
+"saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:165
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:169
+msgid "Point Value"
+msgstr ""
+
+#. ($grader->{problem_value})
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:92
+msgid "Point Value (0 - %1):"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:21
 msgid "Points"
 msgstr "נקודות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:609
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:62
+msgid "Points:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:26
 msgid "Potion of Forgetfulness"
 msgstr "שיקוי השכחה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1423
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:2
 msgid "Prepare which sets for export?"
 msgstr "הכן אילו גליונות לייצוא"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2054
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2073
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:268
 msgid "Press \"Grade Test\" now!"
 msgstr "יש ללחוץ על \"הגש את המבחן\" עכשיו!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2049
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:244
 msgid "Press \"Grade Test\" soon!"
 msgstr "יש ללחוץ על \"הגש את המבחן\" בקרוב!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:213
-msgid "Preview Comment"
-msgstr "תצוגה מקדימה של ההערה"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:69
 msgid "Preview Message"
 msgstr "תצוגה מקדימה של ההודעה"
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:314
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1840
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:11
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:99
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:35
 msgid "Preview My Answers"
 msgstr "תצוגה מקדימה של התשובות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2440
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:646
 msgid "Preview Test"
 msgstr "תצוגה מקדימה של התשובות למבחן"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1340
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:41
+msgid ""
+"Preview the message before sending using the \"Preview Message\" button.  "
+"The preview shows the email that would be sent to the first selected student"
+" or the instructor if no students were selected.  The preview will also list"
+" all of the students that would receive their own personalized message.  If "
+"a merge file was selected, the preview will also indicate which (if any) "
+"recipient's merge file data could not be found."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:991
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:995
 msgid "Previous Problem"
 msgstr "השאלה הקודמת"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2157
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:94
 msgid "Previous page"
 msgstr "עמוד קודם"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2149
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:45
+msgid "Primary Actions"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:355
 msgid "Print Test"
 msgstr "הדפס מבחן"
 
 # Short for Problem
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2088
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:287
 msgid "Prob"
 msgstr "שאלה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:670
-msgid "Problem #"
-msgstr "שאלה #"
-
-#. ($prettyProblemID)
-#. ($problemNumber)
 #. (join('.', @seq)
 #. ($problemID)
-#. ($prettyProblemIDs{$probID})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:831
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:834
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:897
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:438
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:800
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:956
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:964
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:973
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:933
+#. ($problemNumber)
+#. ($_->{prettyID})
+#. ($c->{prettyID})
+#. ($probID)
+#. ($c->{setRecord}->assignment_type eq 'jitar' ? join('.',
+#. jitar_id_to_seq($_)
+#. ($set->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)
+#. ($prettyProblemID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:831
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:842
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:853
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:57
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/siblings.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:40
 msgid "Problem %1"
 msgstr "שאלה %1"
 
-#. ($problemNumber)
-#. ($prettyID)
-#. ($versioned ? $versioned : $MergedProblem->problem_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1419
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1421
+#. ($i + 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:535
 msgid "Problem %1."
 msgstr "שאלה %1."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1974
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:75
+msgid "Problem (\".pg\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:38
+msgid "Problem Display Settings"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1876
 msgid "Problem Display/Answer Checking"
 msgstr "הצגת שאלות/בדיקת תשובות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:451
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:50
 msgid "Problem Editor"
 msgstr "עורך שאלות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1697
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:29
 msgid "Problem Grader"
 msgstr "הפעל את כלי הניקוד הידני"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1002
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:999
 msgid "Problem List"
 msgstr "רשימת שאלות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1119
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:666
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:783
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:75
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:159
 msgid "Problem Number"
 msgstr "מספר שאלה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:156
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:160
+msgid "Problem Paths"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:140
 msgid "Problem Score (%):"
 msgstr "ציון השאלה (%):"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:30
 msgid "Problem Techniques"
 msgstr "טכניקות שאלה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:705
-msgid "Problem Viewer"
-msgstr "מציג השאלות"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:239
+msgid ""
+"Problem has a different source file than the currently rendered problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:233
+msgid "Problem has an essay answer that needs to be graded."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1943
 msgid "Problem source is drawn from a grouping set"
 msgstr "השאלה נבחרת באופן אקראי מתוך קבוצת שאלות ייעודיות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:406
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2494
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:445
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:827
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:835
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:896
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:801
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:89
+msgid ""
+"Problem source is drawn from a grouping set and can not be directly rendered"
+" or edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:336
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:9
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:32
 msgid "Problems"
 msgstr "שאלות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:25
 msgid "Problems Added"
 msgstr "השאלות נוספו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:59
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:54
 msgid "Problems for all students have been unassigned."
 msgstr "בוטלו הקצאות השאלות לכל הסטודנטים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:57
 msgid "Problems for selected students have been reassigned."
 msgstr "הוקצאו מחדש שאלות לסטודנטים שנבחרו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:51
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:46
 msgid "Problems have been assigned to all current users."
 msgstr "שאלות הוקצאו לכל המשתמשים הנוכחיים"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:25
+msgid ""
+"Problems with this rating should only require direct memory of a fact. "
+"Examples might be a specific value of a function, or the statement of a "
+"definition. Very few WeBWorK problems fall into this category."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:93
 msgid "Proctor"
 msgstr "משגיח"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:282
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:92
 msgid "Proctor Password"
 msgstr "סיסמת המשגיחים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:258
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:71
 msgid "Proctor Username"
 msgstr "שם חשבון של המשגיח"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:193
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:3
+msgid "Proctor authorization requested for a nonexistent set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:8
 msgid "Proctor authorization required."
 msgstr "נדרשת הרשאת משגיח."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:231
-msgid "Proctored Gateway Quiz %2"
-msgstr "מבחן מחסום מושגח %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:88
+msgid "Proctor:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:265
+msgid "Proctored Test %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:272
+msgid "Proctored Test %2 Proctor Login"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:241
-msgid "Proctored Gateway Quiz %2 Proctor Login"
-msgstr "מבחן מחסום מושגח %2 התחברות המשגיח"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:318
+msgid ""
+"Proctored tests always require authorization to start the test. \"Both Start"
+" and Grade\" will require login proctor authorization to start and grade "
+"proctor authorization to grade. \"Only Start\" requires grade proctor "
+"authorization to start and no authorization to grade."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:981
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:18
 msgid ""
-"Proctored tests require proctor authorization to start and to grade.  "
 "Provide a password to have a single password for all students to start a "
 "proctored test."
-msgstr "נדרש אישור של משגיח כדי לפתוח ולהגיש מבחן עם השגחה. ניתן לספק כאן סיסמה בודדת איתה כל הסטודנטים יוכלו להתחיל את המבחן המושגח."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:56
 msgid "Publish"
 msgstr "פרסם"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:31
+msgid ""
+"Quick access to many instructor tools, including <strong>Reset "
+"passwords</strong>, <strong>Act as student</strong>, <strong>Assign "
+"individual sets</strong> and <strong>Edit individual due dates</strong>."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "RECITATION"
 msgstr "קבוצת תרגול"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1333
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:199
 msgid "Randomize"
 msgstr "החלף פרמטרים מוגרלים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:13
 msgid "Randomize Seed"
 msgstr "הגרל זרע חדש"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:101
 msgid "Read only"
 msgstr "קריאה בלבד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:67
 msgid "Really delete the items listed above?"
 msgstr "אתה באמת רוצה למחוק את הפריטים לעיל?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:201
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:212
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:804
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2038
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:298
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:832
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:861
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:890
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:919
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:184
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:42
 msgid "Recitation"
 msgstr "קבוצת תרגול"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:194
+#. ($recitation)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:125
+msgid "Recitation %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:21
+msgid "Recitation:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:38
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:46
 msgid "Record Scores for Single Sets"
 msgstr "שמור ציונים לגליונות בודדים"
 
-#. ($studentName)
-#. ($self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:183
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:190
+#. ($studentID)
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:8
 msgid "Record for user %1 not found."
 msgstr "לא נמצאה רשומה עבור המשתמש %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Reduced Scoring"
 msgstr "ניקוד מופחת"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:67
 msgid "Reduced Scoring Date"
 msgstr "תאריך ניקוד מופחת"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2523
-msgid "Reduced Scoring Disabled"
-msgstr "ביטול ניקוד מופחת"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2522
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
 msgid "Reduced Scoring Enabled"
 msgstr "הפעלת ניקוד מופחת"
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:33
+msgid "Reduced Scoring Period"
+msgstr ""
+
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:314
 msgid "Reduced credit can still be earned until %1."
 msgstr "ניתן לקבל ניקוד מופחת עד %1."
 
 # Short for "Reduced Scoring:"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:32
 msgid "Reduced:"
 msgstr "מופחת:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:153
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:373
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:56
 msgid "Refresh"
 msgstr "רענן"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1646
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1943
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2000
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3713
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3755
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:56
 msgid "Refresh Listing"
 msgstr "רענן רשימה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:190
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:200
 msgid "Relax IP restrictions when?"
 msgstr "ממתי לשחרר את מגבלות כתובת IP?"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:88
+msgid "Reload the page to see backup files that have been made."
+msgstr ""
+
 # Context is "Attempts Remaining"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:14
 msgid "Remaining"
 msgstr "נסיונות נותרים"
 
 #. ('00:00:00')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:254
 msgid "Remaining time: %1"
 msgstr "זמן שנותר: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:61
 msgid "Remember Me"
 msgstr "זכור אותי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:546
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:514
 msgid "Remember to return to your original problem when you're finished here!"
 msgstr "זכור לחזור לשאלה המקורית כשסיימת כאן!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1020
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:466
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:72
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:41
 msgid "Rename"
 msgstr "שנה שם"
 
 #. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1302
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:62
 msgid "Rename %1 to %2"
 msgstr "שנה את שם %1 ל- %2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:378
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:927
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:73
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:34
 msgid "Rename Course"
 msgstr "שנה שם של קורס"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:17
+msgid "Rename Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:22
+msgid "Rename Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
 msgid "Rename file as:"
 msgstr "שנה שם הקובץ אל:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2727
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:463
 msgid "Render"
 msgstr "הצג"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:344
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:59
 msgid "Render All"
 msgstr "הצג הכל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2720
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:461
 msgid "Render Problem"
 msgstr "הצג שאלה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2501
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:60
+msgid ""
+"Render all problems on the page. This does not reload the page or save or "
+"reset changes."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:106
+msgid ""
+"Render or re-render the problem, course info file, or set header being "
+"edited. This does not change the permanent file on the disk. You can view "
+"different versions of the same problem by changing the seed. You can also "
+"change the manner in which the mathematics is typeset. If \"Open in new "
+"window\" is checked, then the problem will open in a new tab or window "
+"showing the problem as it will be rendered for students in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:132
+msgid "Rendering Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:341
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:53
 msgid "Renumber Problems"
 msgstr "מספר שאלות מחדש"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:55
+msgid ""
+"Renumber problems consecutively starting from 1. This renumbering is not "
+"saved until \"Save Changes\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:103
+msgid ""
+"Renumber problems in the set consecutively starting from one. In the process"
+" of deleting problems, the numbering can be made non-consecutive. This is "
+"useful to clean up the problem numbering."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:31
 msgid ""
-"Reopens any gateway test for an additional 24 hours. This allows you to take"
-" a test even if the close date has past. This item does not allow you to "
-"take additional versions of the test."
-msgstr "פותח מחדש מבחן מחסום ל-24 שעות נוספות. החפץ מאפשר לך לבצע אותו אפילו עם עבר מועד הסגירה. חפץ זה לא מאפשר לך לבצע גירסאות נוספות של המבחן."
+"Reopens any test for an additional 24 hours. This allows you to take a test "
+"even if the close date has past. This item does not allow you to take "
+"additional versions of the test."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:118
+msgid "Reordering Problems"
+msgstr ""
 
-#. (CGI::strong(                                                   CGI::span({
-#. dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1829
+#. (tag(                                           'strong',
+#. c(                                                      tag('span', dir =>
+#. 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:58
 msgid "Replace current problem: %1"
 msgstr "החלף את השאלה הנוכחית: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:13
 msgid "Replace which users?"
 msgstr "איזה משתמשים להחליף?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:637
+#. ($composite_id, $oldUser->status)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:448
+msgid "Replacing old data for %1: status: %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:42
 msgid "Reply-To:"
 msgstr "השב ל-:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:528
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:123
 msgid "Report Bugs in this Problem"
 msgstr "דווח על שגיאה בשאלה זו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1073
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:305
 msgid "Report bugs"
 msgstr "דווח על שגיאות"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:128
+msgid ""
+"Report bugs in a WeBWorK question/problem using this link. The very first "
+"time you do this you will need to register with an email address so that "
+"information on the bug fix can be reported back to you."
+msgstr ""
+
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2825
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1530
 msgid "Report for course %1:"
 msgstr "דווח עבור קורס %1:"
 
-#. ($rename_oldCourseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2122
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:3
 msgid "Report on database structure for course %1:"
 msgstr "דו\"ח על מבנה מסד הנתונים עבור הקורס %1:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1829
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:8
 msgid "Request New Version"
 msgstr "בקש גרסה חדשה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2246
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2321
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:19
 msgid "Request information"
 msgstr "בקש מידע"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1972
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1220
 msgid "Request new version now."
 msgstr "בקש גרסה חדשה כעת"
 
+#. ($setName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:486
+msgid ""
+"Requested set \"%1\" is a proctored test, but no valid proctor authorization"
+" has been obtained."
+msgstr ""
+
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:399
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:422
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:425
 msgid "Requested set '%1' could not be found in the database for user %2."
 msgstr "לא נמצא הגליון שבוקש '%1'  במסד הנתונים עבור משתמש %2."
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:469
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:472
 msgid ""
-"Requested set '%1' is a homework assignment but the gateway/quiz content "
-"generator %2 was called.  Try re-entering the set from the problem sets "
-"listing page."
-msgstr "הגיליון שבוקש '%1' הוא גיליון שיעורי בית רגיל, אבל המערכת קיבלה פנייה להציג את התוכן כמבחן מחסום: %2. יש להכניס מחדש אל הגיליון מדף רשימת הגיליונות."
-
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:484
-msgid ""
-"Requested set '%1' is a proctored test/quiz assignment, but no valid proctor"
-" authorization has been obtained."
-msgstr "הגליון שבוקש '%1' הוא מבחן מושגח, אבל לא התקבל אישור תקין ממשגיח להתחיל את המבחן."
+"Requested set '%1' is a homework assignment but the test content generator "
+"%2 was called.  Try re-entering the set from the problem sets listing page."
+msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:463
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:466
 msgid ""
-"Requested set '%1' is a test/quiz assignment but the regular homework "
-"assignment content generator %2 was called.  Try re-entering the set from "
-"the problem sets listing page."
-msgstr "הגליון שבוקש '%1' הוא מבחן, אבל המערכת קיבלה פנייה להציג את התוכן כגליון שיעורי בית רגיל %2. יש להכניס מחדש אל הגליון מדף רשימת הגליונות."
+"Requested set '%1' is a test but the regular homework assignment content "
+"generator %2 was called.  Try re-entering the set from the problem sets "
+"listing page."
+msgstr ""
 
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:420
 msgid "Requested set '%1' is not assigned to user %2."
 msgstr "הגליון שבוקש '%1' לא הוקצה למשמתמש %2."
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:450
 msgid "Requested set '%1' is not available yet."
 msgstr "הגליון שבוקש '%1' עדיין לא זמין"
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:441
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:444
 msgid "Requested set '%1' is not yet open."
 msgstr "הגליון שבוקש '%1' עדיין לא נפתח."
 
 #. ($verNum,				$setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:404
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:407
 msgid "Requested version (%1) of set '%2' can not be directly accessed."
 msgstr "לא ניתן לגשת ישירות לנתוני הגרסה שביקשת (%1) של הגיליון '%2'."
 
 #. ($verNum, $setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:397
 msgid "Requested version (%1) of set '%2' is not assigned to user %3."
 msgstr "הגרסה שביקשת (%1) של הגיליון '%2' לא הוקצאה למשתמש %3."
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:308
+msgid "Require Proctor Authorization to"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:45
 msgid "Require users to log in through the LMS"
 msgstr "אלץ משתמשים להיכנס דרך מערכת הלימוד LMS"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:420
 msgid "Rerandomize after"
 msgstr "בצע רנדומיזציה מחדש אחרי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:104
 msgid "Reset"
 msgstr "אתחל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2280
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2968
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:195
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:696
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:47
 msgid "Reset Form"
 msgstr "אתחל טופס"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:610
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:27
 msgid "Resets the number of incorrect attempts on a single homework problem."
 msgstr "מאתחל את מספר הניסיונות הלא נכונים על שאלת שיעורי בית אחת."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2453
-msgid ""
-"Restores a course from a gzipped tar archive (.tar.gz). After unarchiving, "
-"the course database is restored from a subdirectory of the course's DATA "
-"directory. Currently the archive facility is only available for mysql "
-"databases. It depends on the mysqldump application."
-msgstr "משחזר קורס מארכיון gzippe tar (סיומת .tar.gz). אחרי הסרה מהארכיון, מסד נתוני הקורס משוחזר מתת-תיקייה של תיקיית ה-DATA של הקורס. כרגע מתקן הארכיון ניתן לשימוש רק עם מסד נתונים מסוג mysql. זה תלוי באפליקציית mysqldump."
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:41
+msgid "Restore a .tar.gz archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:40
+msgid "Restore backup from"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:178
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:39
+msgid "Restore backup from %1"
+msgstr ""
+
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+msgid "Restored backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:188
 msgid "Restrict Access by IP"
 msgstr "הגבל גישה לפי כתובת IP"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:912
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep:11
 msgid "Restrict Locations"
 msgstr "הגבלות לפי מיקום"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:286
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:324
 msgid "Restrict Problem Progression"
 msgstr "הגבל התקדמות בשאלות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:184
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:194
 msgid "Restrict To"
 msgstr "הגבל ל-"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:154
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:33
+msgid "Restrict or sort the students displayed"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:159
 msgid "Restrict release by set(s)"
 msgstr "הגבל פרסום לפי גליונות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2090
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:299
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:291
 msgid "Result"
 msgstr "תוצאות"
 
-#. (CGI::i($self->$actionHandler(\%genericParams, \%actionParams,
-#. \%tableParams)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:388
+#. ($c->tag('i', $c->$actionHandler)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:228
 msgid "Result of last action performed: %1"
 msgstr "התוצאה של הפעולה האחרונה שבוצעה: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:309
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:300
 msgid "Results for this submission"
 msgstr "משוב עבור הגשה זו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:363
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:236
 msgid "Results of last action performed"
 msgstr "התוצאות של הפעולה האחרונה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:125
 msgid "Results of last action performed: "
 msgstr "התוצאות של הפעולה האחרונה שבוצעה:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1725
-msgid "Resurrect which Gateway?"
-msgstr "החזר איזה מבחן מחסום?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:51
+msgid "Resurrect which test?"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1449
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:669
 msgid "Retitled"
 msgstr "כותרת שונתה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:17
 msgid "Return to your work"
 msgstr "חזרה לאיפה שהייתי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:686
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:132
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:16
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:166
 msgid "Revert"
 msgstr "שחזר"
 
-#. (CGI::span({ dir => 'ltr' }, $self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2069
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:83
 msgid "Revert to %1"
 msgstr "שחזר ל- %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1431
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1513
+#. ($c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1220
+msgid "Reverted to original file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:168
+msgid ""
+"Reverts to the copy of the file saved on the disk or to a backup file. All "
+"unsaved editing changes will be lost. This option is only active when a "
+"temporary file or a backup file exists. You may also delete backups that "
+"have been made with this tab."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:182
+msgid "Review of column functions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:145
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:85
 msgid ""
 "Reviewing a problem and looking at both the average Attempts and  average "
 "Status should give instructors valuable information about the difficulty of "
 "the problem."
 msgstr "בחינה של סטטיסטיקה של שאלה כולל ממוצע מספר הניסיונות שנוצלו  והציון הממוצע אמורה לתת לסגל ההוראה מידע רב-ערך לגבי רמת הקושי של השאלה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:55
 msgid "Reward used successfully!"
 msgstr "הפרס הופעל בהצלחה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:180
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:4
 msgid "Rewards"
 msgstr "פרסים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:27
 msgid "Ring of Reduction"
 msgstr "טבעת ההפחתה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:322
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:26
 msgid "Robe of Longevity"
 msgstr "חלוק אריכות הימים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "SECTION"
 msgstr "קבוצה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:214
 msgid "SET NAME"
 msgstr "שם הגליון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:321
 msgid "STATUS"
 msgstr "ציון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "STUDENT ID"
 msgstr "מזהה סטודנט"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:43
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:263
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:170
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:687
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:847
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:220
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:85
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:207
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:123
 msgid "Save"
 msgstr "שמור"
 
-#. (CGI::b($self->shortPath($self->{sourceFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:438
+#. (tag('b', $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_form.html.ep:2
 msgid "Save %1"
 msgstr "שמור %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:44
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:695
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:134
 msgid "Save As"
 msgstr "שמור בשם"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:744
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2963
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:194
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:695
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:37
 msgid "Save Changes"
 msgstr "שמור שינויים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:60
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:76
 msgid "Save Edit"
 msgstr "שמור את שינווי העריכה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
 msgid "Save Export"
 msgstr "שמור את קובץ הייצוא"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:92
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
 msgid "Save Password"
 msgstr "שמור את שינויי הסיסמות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:188
 msgid "Save as"
 msgstr "שמור בשם"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:872
-msgid "Save as Default"
-msgstr "שמור כברירת מחדל"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:481
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:5
 msgid "Save as:"
 msgstr "שמירה בשם:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1558
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:254
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1443
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_password_form.html.ep:1
 msgid "Save changes"
 msgstr "שמור שינויים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1794
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:33
 msgid "Save file to:"
 msgstr "שמור קובץ בשם:"
 
-#. (CGI::b({ dir => 'ltr' }, $self->shortPath($self->{editFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1605
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:125
+msgid ""
+"Save the contents of the editor window to the file on disk and re-render the"
+" problem. If \"Open in new window\" is checked, then the problem will open "
+"in a new tab or window showing the problem as it will be rendered for "
+"students in the set. If \"Create backup\" is checked then a backup of the "
+"current file on disk will be created before overwriting it with the contents"
+" of the editor window. If a backup already exists, then a \"Delete oldest "
+"backup\" check box will be present. If that is checked, then the oldest "
+"backup will be deleted when \"Save\" is clicked. These backups can be "
+"reverted to and managed on the \"Revert\" tab."
+msgstr ""
+
+#. (tag('b', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:6
 msgid "Save to %1 and View"
 msgstr "שמור ל-%1 וצפה"
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:396
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1165
-msgid "Saved to file '%1'"
-msgstr "נשמר בקובץ '%1'"
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:50
+msgid "Saved answers"
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#. ($outputFilePath =~ s/$ce->{courseDirs}{templates}/[TMPL]/r)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:549
+msgid "Saved to file \"%1\""
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1180
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2116
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2292
 msgid "Schema and database field definitions do not agree"
 msgstr "הגדרות שדה של הסכמה ומסד הנתונים לא מתאימות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4284
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2279
 msgid "Schema and database table definitions do not agree"
 msgstr "הגדרות טבלה של הסכמה ומסד הנתונים לא מתאימות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:404
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:465
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:660
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:147
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:161
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:78
 msgid "Score"
 msgstr "ניקוד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:125
 msgid "Score (%)"
 msgstr "ציון (%)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:161
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:60
+msgid ""
+"Score one or more sets. This can also be done from the \"Hmwk Sets Editor\" "
+"or from the \"Instructor Tools\", but the \"Scoring Tools\" page allows "
+"control over parameters."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:170
 msgid "Score required for release"
 msgstr "ציון שנדרש עבור שחרור"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:228
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:58
 msgid "Score selected set(s) and save to:"
 msgstr "נקד את הגליונות שנבחרו ושמור ב-:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2085
-msgid "Score summary for last submit:"
-msgstr "סיכום הציון עבור ההגשה האחרונה:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:284
+msgid "Score summary for last submission:"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:2
 msgid "Score which achievements?"
 msgstr "נקד אילו הישגים?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:978
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:2
 msgid "Score which sets?"
 msgstr "לאיזה גליונות לאסוף ציונים?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
 msgid "Scores"
 msgstr "ציונים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:487
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:66
+msgid "Scoring (\".csv\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:396
 msgid "Scoring Download"
 msgstr "הורדת ציונים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:161
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:115
 msgid "Scoring Message"
 msgstr "הודעת ציון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:478
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:391
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:58
 msgid "Scoring Tools"
 msgstr "ציונים/כלי ניקוד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2460
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:17
+msgid "Scoring Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:327
 msgid ""
 "Screen and Hardcopy set header information can not be overridden for "
 "individual students."
 msgstr "אין אפשרות לשנות לסטודנטים מסוימים את קבצי הקידומויות - Screen and Hardcopy set header information"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:26
 msgid "Scroll of Resurrection"
 msgstr "מגילת התחייה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:189
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:200
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:211
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:793
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2029
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:297
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:831
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:860
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:889
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:918
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:157
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:178
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:38
 msgid "Section"
 msgstr "קבוצה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:653
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:802
+#. ($section)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:122
+msgid "Section %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:30
 msgid "Section:"
 msgstr "תת-פרק:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:436
 msgid "Seed"
 msgstr "זרע"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:114
 msgid "Select"
 msgstr "בחר"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:505
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:20
+msgid ""
+"Select Users from the left column and sets from the right column and assign "
+"or unassign the given sets. The list of users or the list of sets can be "
+"reordered under the \"sort\" option or the format of the user or set list.  "
+"Additionally, the set lists can be filtered (by section number or "
+"recitation).  The displayed user and set lists will only be updated upon "
+"clicking \"Change Display Settings\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:11
 msgid "Select a Homework Set"
 msgstr "בחר גליון שיעורי בית"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:14
 msgid "Select a Problem Collection"
 msgstr "בחר מקבץ שאלות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:18
 msgid "Select a Set Definition File"
 msgstr "בחר קובץ הגדרת גיליון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1028
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:14
 msgid "Select a Set from this Course"
 msgstr "בחר גליון מהקורס הזה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1659
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:20
+msgid ""
+"Select a course to create a .tar.gz archive of, which contains a dump of the"
+" database and all course files (templates, configuration files, etc).  Each "
+"course can only have a single archive.  Creating an archive of a previously "
+"archived course will delete the old archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:36
 msgid "Select a course to delete."
 msgstr "בחר קורס למחיקה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:946
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:20
+msgid ""
+"Select a course to delete.  Warning, all data will be deleted and this "
+"cannot be undone.  This will not delete any course archives."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:14
 msgid ""
 "Select a course to rename.  The courseID is used in the url and can only "
 "contain alphanumeric characters and underscores. The course title appears on"
 " the course home page and can be any string."
 msgstr "בחר קורס שתרצה לשנות את שמו. מזהה הקורס  יהיה חלק מ-URL ויכול להכיל רק מספרים אותיות וקוים תחתונים. כותרת הקורס מופיע בדף הבית של הקורס ויוכלה להיות כל מחרוזת."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2475
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:13
 msgid "Select a course to unarchive."
 msgstr "בחר קורס לחלץ מקובץ ארכיון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1914
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3684
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:21
 msgid "Select a listing format:"
 msgstr "בחר פורמט לרשימה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1442
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1478
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:18
+msgid "Select action:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:10
 msgid "Select all achievements"
 msgstr "בחר את כל ההישגים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2703
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:12
 msgid "Select all eligible courses"
 msgstr "בחר את כל הקורסים המתאימים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2731
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:26
 msgid "Select all sets"
 msgstr "בחר את כל הגיליונות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1967
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:10
 msgid "Select all users"
 msgstr "בחר את כל המשתמשים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:315
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:509
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:536
-msgid "Select an action to perform"
-msgstr "בחר בפעולה לבצע"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3063
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:10
 msgid "Select an action to perform:"
 msgstr "בחר פעולה לבצע:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1956
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:20
+msgid ""
+"Select an archive to restore.  You cannot restore an archive into an "
+"existing course. Instead, either rename or delete the old course, or restore"
+" the archive with a new name.  When restoring a course with a new name, the "
+"name is used as the course ID, and must contain only letters, numbers, "
+"hyphens, and underscores, and may have at most 40 characters."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:36
 msgid "Select course(s) to archive."
 msgstr "בחר קורס/ים להעביר לקבצי ארכיון."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3731
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:44
 msgid "Select course(s) to hide or unhide."
 msgstr "בחר קורס/ים להחביא או להפוך לגלוי/ם."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:7
 msgid "Select import file"
 msgstr "בחר קובץ לייבוא"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:14
 msgid ""
 "Select one or more sets and one or more users below to assign/unassign each "
 "selected set to/from all selected users."
 msgstr "בחר גליון אחד או יותר ומשתמש אחד או יותר כדי להקצות/לבטל הקצאות של הגליונות שנבחרו לכל המשתמשים שנבחרו."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:94
 msgid "Select sets below to assign them to the newly-created users."
 msgstr "בחר גליונות למטה כדי להקצות אותם למשתמשים החדשים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3666
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:20
+msgid ""
+"Select the course to change its Course ID, Course Title, or Institution.  "
+"Note that changing a course's ID will change the URL of all links to the "
+"course, and could break links from external sites such as an LMS."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:4
 msgid ""
 "Select the course(s) you want to hide (or unhide) and then click \"Hide "
 "Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
@@ -5436,133 +7246,230 @@ msgid ""
 "full URL address for the course."
 msgstr "בחר קורס/ים שתרצה להחביא (או להפוך לגלוי/ים) ולחץ על \"החבא קורסים\" (או \"הפוך קורסים לגלויים\"). החבאת קורס שהוא כבר חבוי לא עושה כלום. באותו אופן הפיכת קורס גלוי לגלוי גם לא עושה כלום. קורסים מוחבאים הם עדיין פעילים אבל לא רשומים ברשימת הקורסים של WeBWorK בדף השער. כדי לגשת לקורס, מורה או סטודנט חייבים לדעת את כתובת ה-URL המלאה של הקורס."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:488
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:20
+msgid ""
+"Select the course(s) you want to hide (or unhide) and then click \"Hide "
+"Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
+"does no harm (the action is skipped). Likewise unhiding a course that is "
+"already visible does no harm (the action is skipped). Hidden courses are "
+"still active but are not listed in the list of WeBWorK courses on the "
+"opening page. To access the course, an instructor or student must know the "
+"full URL address for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:93
+msgid "Select the display mode used to render the problems on this page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:11
 msgid ""
 "Select the homework sets for which to generate hardcopy versions. You may "
 "also select multiple users from the users list. You will receive hardcopy "
 "for each (set, user) pair."
 msgstr "בחר את הגליונות עבורן תרצה ליצור גרסת הדפסה. אתה גם יכול לבחור מספר משתמשים מרשימת המשתמשים. אתה תקבל גרסת הדפסה עבור כל זוג (גליון, סטודנט)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:238
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:30
+msgid ""
+"Select the sets you want scored, choose the name of the export file you want"
+" to use (by default: %1), and then click the \"Score Selected Set(s) and "
+"save to\" button."
+msgstr ""
+
+#. ('<code>ful.csv</code>','<code>scr.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:49
+msgid ""
+"Select this if you want to save the scores for each set in a separate file "
+"in addition to saving all scores to a cumulative file. After clicking the "
+"\"Score Selected Set(s) and save to\" button, you will get a pair of links "
+"for each selected set. The file that ends with %1 contains the number of "
+"correct and incorrect tries about each individual problem for each student. "
+"The file that ends with %2 is a summary of each problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:19
 msgid ""
 "Select user(s) and/or set(s) below and click the action button of your "
 "choice."
 msgstr "בחר משתמש/ים ו/או גליון/ים ולחץ על כפתור הפעולה לפי בחירתך."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2885
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:85
+msgid ""
+"Select which assignment types (homework, tests, just-in-time) the "
+"achievement is evaluated."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:20
+msgid ""
+"Select which courses to upgrade from a previous version of WeBWorK.  The "
+"upgrade process can add missing database columns, delete unused database "
+"columns, and check the course file structure.  Be sure to read over the "
+"changes before confirming the upgrade.  You may want to create an archive of"
+" the course before upgrading.  Only courses that need upgraded will be "
+"selectable."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:84
+msgid "Select your favorite theme for the large text window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:18
 msgid "Select/unselect all fields missing in schema for deletion."
 msgstr "בחר/נקה את כל השדות החסרות בתבנית schema למחיקה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2873
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:9
 msgid "Select/unselect all tables missing in schema for deletion."
 msgstr "בחר/נקה את כל הטבלאות החסרות בתבנית schema למחיקה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:23
 msgid "Selected sets:"
 msgstr "גיליונות שנבחרו:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:57
 msgid "Send E-mail"
 msgstr "שלח דוא\"ל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:839
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:83
 msgid "Send Email"
 msgstr "שלח את ההודעה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:702
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:69
+msgid "Send email to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:54
+msgid "Send emails to selected instructors."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:59
 msgid "Send to all students"
 msgstr "שלח את הודעה לכל הסטודנטים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:717
-msgid "Send to the students selected below"
-msgstr "שלח את הודעה לסטודנטים שנבחרו למטה"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:64
+msgid "Send to selected students"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:402
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:7
 msgid "Set"
 msgstr "גליון"
 
 #. ($newSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:614
 msgid "Set %1 has been created."
 msgstr "גליון %1 נוצר"
 
-#. ($newSetName,$userName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1944
+#. ($newSetName, $userName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:616
 msgid "Set %1 was assigned to %2"
 msgstr "גליון %1 הוקצה ל%2"
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1239
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:567
 msgid "Set %1 was assigned to %2."
 msgstr "גיליון %1 הוקצה אל %2."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:415
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:354
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:42
 msgid "Set Assigner"
 msgstr "מקצה הגליונות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:420
-msgid "Set Definition Filename"
-msgstr "שם קובץ הגדרת גליון"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:17
+msgid "Set Assigner Help"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:45
 msgid "Set Definition Files"
 msgstr "קבצי הגדרת גליון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2318
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2329
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:218
 msgid "Set Description"
 msgstr "תיאור גליון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:17
+msgid "Set Detail Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:333
 msgid "Set Detail for set %2"
 msgstr "פרטי גליון עבור גליון %2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:93
 msgid "Set Header"
 msgstr "קידומת לגליון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:323
+msgid "Set Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:218
 msgid "Set ID"
 msgstr "מזהה גליון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:267
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:114
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:3
 msgid "Set Info"
 msgstr "נתוני גליון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2744
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:19
 msgid "Set List"
 msgstr "רשימת הגליונות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1111
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1209
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1320
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:164
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:262
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:353
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:448
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:546
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:659
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:776
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:895
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:995
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:762
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:809
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:7
 msgid "Set Name"
 msgstr "שם הגליון"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:186
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:18
+msgid "Set closes on %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:45
+msgid "Set definition (\".def\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:20
+msgid "Set is closed."
+msgstr ""
+
+#. ($c->formatDateTime($set->reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:16
+msgid "Set is due on %1."
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:14
+msgid "Set opens on %1."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:188
 msgid "Set random seed to:"
 msgstr "החלף את זרע ההגרלות אל:"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2029
+#: /opt/webwork/webwork2/conf/defaults.config:1930
 msgid ""
 "Set to true for log to mean base 10 log and false for log to mean natural "
 "logarithm."
 msgstr "בחירת הערך כנכון יגדיר בקורס זה שפונקצית log פירושה לוגוריתם בסיס 10, ובחירת הערך לא נכון ישאיר את פירושה כלוגריתם הטבעי."
 
-#: /opt/webwork/webwork2/conf/defaults.config:2049
+#: /opt/webwork/webwork2/conf/defaults.config:1950
 msgid ""
 "Set to true to allow students to enter Unicode versions of some characters "
 "(like U+2212 for the minus sign) in their answers.  One reason to allow this"
@@ -5571,7 +7478,7 @@ msgid ""
 "directory from the keyboard."
 msgstr "הגדר כנכון על מנת לאפשר לסטודנטים להזין גרסות יוניקוד של מספר סימנים (למשל U+2212 עבור סימן מינוס) בתשובות שלהם. סיבה אחת לאפשר זאת היא שהעתקה של נוסחות מ- MathJax ואתרי אינטרנט שונים עלול להכניס תווים עאלו בקלט. כיום גם יותר קל למשתמש להזין תווים כאלו באופ ידני בעזרת המקלדת."
 
-#: /opt/webwork/webwork2/conf/defaults.config:2019
+#: /opt/webwork/webwork2/conf/defaults.config:1920
 msgid ""
 "Set to true to display the \"Entered\" column which automatically shows the "
 "evaluated student answer, e.g., 1 if student input is sin(pi/2). If this is "
@@ -5580,7 +7487,7 @@ msgid ""
 " answer."
 msgstr "כאשר מוגדר כנכון תוצג עמודת \"הוזן\" בו יופיע התשובה המפוענחת של הסטודנט, למשל 1 אם הוזן sin(pi/2). אם מוגדר כלא נכון, למשל כדי לחסוך מקום בטבלת המשוב, הסטודנט יכול לראות את הערך המפוענח בלחיצה על צורה המודפסת של התשובה ששלחו."
 
-#: /opt/webwork/webwork2/conf/defaults.config:2060
+#: /opt/webwork/webwork2/conf/defaults.config:1961
 msgid ""
 "Set to true to have Full Width Unicode character (U+FF01 to U+FF5E) "
 "converted to their ASCII equivalents (U+0021 to U+007E) automatically in "
@@ -5588,22 +7495,32 @@ msgid ""
 "automatically use Full Width characters for parentheses and commas."
 msgstr "הגדר כנכון על מנת שהמערכת תחליף תווי יוניקוד Unicode רחבות (U+FF01 עד U+FF5E) לתווי ASCII השקולים (U+0021 עד U+007E) ב- MathObjects. זה יכול לעזור למשתמשים בעלי מקלדות סיניות או של שפות אחרות ששולחים סימנים כמו סוגריים ו/או פסיקים כתווי יוניקוד רחבות."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:521
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:164
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:16
+msgid "Set values"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/siblings.html.ep:4
 msgid "Sets"
 msgstr "גליונות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:352
-msgid "Sets Assigned to User"
-msgstr "הגליונות שהוקצו למשתמש"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:343
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:322
 msgid "Sets assigned to %1"
 msgstr "הגליונות שהוקצו ל- %1"
 
+#. ($userName, $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:90
+msgid "Sets assigned to %1 (%2)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:17
+msgid "Sets assigned to student Help"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:57
 msgid ""
 "Sets how grades will be passed back from WeBWorK to the "
@@ -5615,189 +7532,241 @@ msgid ""
 "links from the LMS must be problem set specific. For example, "
 "<code>webwork.myschool.edu/webwork2/course-name/problem_set_name</code>. If "
 "the problem set name has space characters, they should be underscores in "
-"these addresses. If the problem set is a quiz, it must have this format: "
-"<code>webwork.myschool.edu/webwork2/course-"
-"name/quiz_mode/problem_set_name</code>. Also, to initialize the "
-"communication between WeBWorK and the LMS, the user must follow each of "
-"these external learning tools at least one time. Since there must be a "
-"separate external tool link for each problem set, this option requires more "
-"maintenance of the LMS course.</dd></dl>"
-msgstr "הגדרה זו קובעת איך נתונים מוחזרים משרת הווב-וורק אל מערכת הלימוד LMS. ערכים אפשריים: course</dt><dd>נשלח ציון בודד חזרה למערכת הלימוד. הציון הוא הממוצע של כל הגיליונות המוקצות למשתמש והן זמינות. לכן הערך עלול להיות קטן במהלך הסמסטר עקב גיליונות זמינות שטרם נפתחו שתורמות ציון 0 לממוצע. </dd> <dt>homework</dt><dd>\nנשלח ציון עבור כל גיליון (כולל כל מבחן). כדי להשתמש בערך זה נדרש שיהיה קישור ממירכת הלימוד אל כל גיליון בנפרד. למשל:   <code>webwork.myschool.edu/webwork2/course-name/problem_set_name</code>. אם בשם של גיליון מופיעות רווחים, יש לרשום קו_תחתון underscore בקישור במקום כל רווח. עבור מבחן יש להשתמש בתצורה:  <code>webwork.myschool.edu/webwork2/course-name/quiz_mode/problem_set_name</code>. כמו כן, כדי לאפשר החזרת ציונים מווב-וורק למערכת הלימוד, הסטודנטים נדרשים להשתמש בכל אחד מהקישורים ממערכת הלימוד אל ווב-וורק לפחות פעם אחד. \nכתוצאה מהצורך לתחזק קישור ממערכת הלימוד לכל גיליון, נדרש יותר עבודה במערכת הלימוד בהפעלת אפשרות זו.</dd></dl>"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1458
+"these addresses. Also, to initialize the communication between WeBWorK and "
+"the LMS, the user must follow each of these external learning tools at least"
+" one time. Since there must be a separate external tool link for each "
+"problem set, this option requires more maintenance of the LMS "
+"course.</dd></dl>"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:55
+msgid "Sets the order in which achievements are listed and evaluated."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:625
 msgid "Sets were selected for export."
 msgstr "נבחרו גליונות לייצוא"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:726
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:36
 msgid "Setting"
 msgstr "הגדרה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1332
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:39
 msgid "Shift dates so that the earliest is"
 msgstr "הזז תאריכים כך שהמוקדם ביותר הוא"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:32
+msgid "Show"
+msgstr ""
+
 #. ($numchild)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1301
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:32
 msgid "Show %1 more like this"
 msgstr "הצג עוד %1 שאלות דומות"
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:326
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:107
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:39
 msgid "Show Correct Answers"
 msgstr "הצג תשובות נכונות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:22
 msgid "Show Date & Size"
 msgstr "הצג תאריך וגודל"
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:86
 msgid "Show LTI parameters (for debugging)"
 msgstr "הצג נתוני LTI (לצורך איתור תקלות)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:620
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:34
 msgid "Show Me Another"
 msgstr "הראה לי שאלה דומה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2518
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2412
+#. ($exhausted)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:69
+msgid "Show Me Another %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1642
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:711
 msgid "Show Past Answers"
 msgstr "צפייה בתשובות קודמות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:703
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:41
+msgid "Show Problem Source File"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:132
 msgid "Show Problem Source File:"
 msgstr "הצג שם קובץ השאלה:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
 msgid "Show Problems on Finished Tests"
 msgstr "הראה שאלות במבחנים שבוצעו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
-msgid "Show Scores on Finished Assignments?"
-msgstr "הראה ציונים על מטלות שבוצעו?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+msgid "Show Scores on Finished Tests"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2416
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:630
 msgid "Show Solutions"
 msgstr "הראה פתרונות"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/conf/defaults.config:1538
 msgid "Show Total Homework Grade on Grades Page"
 msgstr "הראה ציון כולל (ממוצע) בעמוד הציונים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1266
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:77
 msgid "Show all students"
 msgstr "הצג את כל המשתמשים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1380
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:91
 msgid "Show all tests"
 msgstr "הצג את כל המבחנים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2404
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:621
 msgid "Show correct answers"
 msgstr "הצג תשובות נכונות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1299
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+msgid "Show hints after"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:30
 msgid "Show less like this"
 msgstr "הצג פחות שאלות דומות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:337
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:387
 msgid "Show me another"
 msgstr "הראה לי שאלה דומה"
 
-#. ($exhausted)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1926
-msgid "Show me another %1"
-msgstr "הראה לי שאלה דומה %1"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:20
+msgid ""
+"Show past answers.  Students can only see their past answers, and they will "
+"not be able to see which parts are correct.  Instructors can use the form to"
+" select any combination of users, sets, and problems to view.  The table "
+"below will list the past answers colored according to correctness (green is "
+"correct).  Use control + click to select multiple users, sets, or problems."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2428
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:639
 msgid "Show problem graders"
 msgstr "הצג את כלי הניקוד הידני לשאלות."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:105
 msgid "Show saved answers?"
 msgstr "הראה תשובות שנשמרו?"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1860
+#: /opt/webwork/webwork2/conf/defaults.config:1762
 msgid ""
 "Show the correct answer to the current problem before re-randomization."
 msgstr "הצג את התשובה הנכונה לשאלה הנוכחית בהגשה האחרונה לפני החלפת זרע ההגרלות."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1862
+#: /opt/webwork/webwork2/conf/defaults.config:1764
 msgid ""
 "Show the correct answer to the current problem on the last attempt before a "
 "new version is requested."
 msgstr "הצג את התשובה הנכונה לשאלה הנוכחית בהגשה האחרונה לפני הבקשה לעבור לגרסה חדשה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:3
 msgid "Show which sets?"
 msgstr "איזה גליונות להציג?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:690
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:3
 msgid "Show which users?"
 msgstr "איזה משתמשים להציג?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:382
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:475
-msgid "Show/Hide Site Description"
-msgstr "הצג/החבא תיאור הדף/האתר"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:622
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:11
 msgid "Show:"
 msgstr "הראה:"
 
-#. (scalar @{ $self->{visibleSetIDs} },			scalar @{ $self->{allSetIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:594
+#. (scalar @{ $c->{visibleSetIDs} },			scalar @{ $c->{allSetIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:115
 msgid "Showing %1 out of %2 sets."
 msgstr "מראה %1 מתוך %2 גליונות."
 
-#. (scalar @Users, scalar @{ $self->{allUserIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:610
+#. (scalar(keys %{ $c->{visibleUserIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:80
 msgid "Showing %1 out of %2 users"
 msgstr "מראה %1 מתוך %2 משתמשים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:70
 msgid "Showing all students"
 msgstr "מציג את כל הסטודנטים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1355
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:81
 msgid "Showing all tests"
 msgstr "מציג את כל המבחנים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:61
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:64
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:67
+#. ($c->{merge_file}, $ur->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:5
+msgid "Showing data from merge file %1 for user %2:"
+msgstr ""
+
+#. ($c->{merge_file})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:147
+msgid "Showing data from merge file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:61
+msgid "Showing problem for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:7
+msgid "Showing statistics for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:33
+msgid ""
+"Shows how many instructors and students have been assigned this problem set,"
+" out of the total number in the class. Clicking on this link allows you to "
+"assign the set to users, unassign this set from users, and to individually "
+"edit the assignment for specific users. For changing dates for individual "
+"users there are also shortcuts from the \"Instructor Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:63
 msgid "Site Information"
 msgstr "תיאור אתר"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:88
 msgid "Skip archiving this course"
 msgstr "דלג על הוספת קורס זה לארכיון"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2080
+#: /opt/webwork/webwork2/conf/defaults.config:1981
 msgid "Skip explanation essay answer fields"
 msgstr "דלג על שדות להזנת הסברים במילים"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1556
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1557
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:81
+msgid "Snippets of PG code illustrating specific techniques"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1514
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1515
 msgid "Solution:"
 msgstr "פתרון:"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1555
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1513
 msgid "Solution: "
 msgstr "פתרון: "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:432
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:57
 msgid "Solutions"
 msgstr "פתרונות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1350
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:20
+msgid ""
+"Some OPL problems have been rated for difficulty/educational objective. The "
+"levels are loosely inspired by Bloom's taxonomy. They are assigned numbers "
+"from 1 to 6 as follows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:185
 msgid ""
 "Some WeBWorK problems are programmed using what are called <i>Math "
 "Objects</i>. These problems are preferred by some people because they "
@@ -5805,18 +7774,18 @@ msgid ""
 "particularly for answers which are way off base."
 msgstr "חלק משאלות הווב-וורק מתוכנתות בעזרת <i>Math Objects</i>.\nשאלות כאלו מועדפות על חלק מהמרצים כי הם מספקות הודעות משוב עקביות לתשובות שגויות במקרים רבים, במיוחד כאשר יש שגיאות משמעותיות מאוד."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:379
 msgid "Some answers will be graded later."
 msgstr "חלק מהתשובות ינוקדו מאוחר יותר."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:60
 msgid ""
 "Some of these files are directories. Only delete directories if you really "
 "know what you are doing. You can seriously damage your course if you delete "
 "the wrong thing."
 msgstr "חלק מקבצים אלה הם תיקיות. מחק תיקיות רק אם אתה בטוח שאתה יודעה מה אתה עושה. אתה יכול לעשות נזק רציני לקורס אם אתה מוחק את הדבר הלא נכון."
 
-#: /opt/webwork/webwork2/conf/defaults.config:2082
+#: /opt/webwork/webwork2/conf/defaults.config:1983
 msgid ""
 "Some problems have an explanation essay answer field, typically following a "
 "simpler answer field. For example, find a certain derivative using the "
@@ -5828,7 +7797,7 @@ msgid ""
 "grading."
 msgstr "ישנם שאלות שמכילות שדות להזנת הסבר במילים, בדרך כלל אחרי שדה להזנת תשובה סופית רגילה שנבדק אוטומטית. למשל שדה כזאת יכולה להיות חלק משאלה שמבקש לחשב את הנגזרת בעזרת ההגדרה. השדה להזנת ההסבר המילולי מחייב בדיקה ידנית של סגל הוראה. כאשר הגדרה זאת מופעלת, המערכת לא תציג לסטודנטים את תיבות הקלט להזנת הסברים מילוליים, ובכך ניתן להשתמש בשאלות בהן מופיע שדות כאלו מבלי לחייב בדיקה ידנית."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2186
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:83
 msgid ""
 "Some problems shown above represent multiple similar problems from the "
 "database.  If the (top) information line for a problem has a letter M for "
@@ -5838,300 +7807,396 @@ msgid ""
 "again."
 msgstr "חלק מהשאלות המוצגות למעלה הם דוגמה מייצגת של קבוצה של שאלות דומות במאגר. אם בשורת המידע (העליון) מעל שאלה מופיע האות M עבור \"More\", ניתן לראות את מספר השאלות הדומות כאשר סימן העכבר נמצא מעל האות M. לחיצה על ה- M תציג את השאלות הדומות. לאחר שהוצגו השאלות הדומות, האות M מוחלף באות L שניתן ללחוץ עליו כדי להסתיר את השאלות הדומות."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1612
-msgid ""
-"Some servers handle courses taking place in different timezones.  If this "
-"course is not showing the correct timezone, enter the correct value here.  "
-"The format consists of unix times, such as "
-"\"America/New_York\",\"America/Chicago\", \"America/Denver\", "
-"\"America/Phoenix\" or \"America/Los_Angeles\". Complete list: <a "
-"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
-msgstr "ישנם שרתים המוסגלים להתמודד עם קורסים שפועלים באזורי זמן שונים. אם קורס זה לא מראה את איזור הזמן הנכון, הכנס את הערך הנכון כאן. הפורמט הוא בזמני unix, כגון \"America/New_York\",\"America/Chicago\", \"America/Denver\", \"America/Phoenix\" or \"America/Los_Angeles\".  לרשימה המלאה <a href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">קבצי אזורי זמן</a>."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:529
-msgid ""
-"Something was wrong with your LTI parameters.  If this recurs, please speak "
-"with your instructor"
-msgstr "משהו לא תקין עם נתוני התחברות ה-LTI שלך. אם בעיה זו חוזרת על עצמה, אנא פנה לתמיכה/סגל ההוראה"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:50
 msgid "Sort"
 msgstr "מיין"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:751
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:814
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:4
 msgid "Sort by"
 msgstr "מיין לפי"
 
 #. ($names{$primary}, $names{$secondary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:817
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:324
 msgid "Sort by %1 and then by %2"
 msgstr "מיין לפי %1 ואז לפי %2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:171
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:115
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:3
 msgid "Sort:"
 msgstr "מיין:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:51
+msgid "Sorts the lists displayed by due date, name, etc."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:363
 msgid "Source File"
 msgstr "קובץ קוד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1586
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1612
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1555
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1593
 msgid ""
 "Source file paths cannot include .. or start with /: your source file path "
 "was modified."
 msgstr "מסלולי קבצי קוד לא יכולים לכלול .. או להתחיל ב- /: המסלול שהזנת שונה."
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:11
 msgid ""
 "Specify an ID, title, and institution for the new course. The course ID may "
 "contain only letters, numbers, hyphens, and underscores, and may have at "
 "most %1 characters."
 msgstr "פרט מזהה, כותרת, ומוסד עבור הקורס החדש. מזהה הקורס יכול להכיל רק אותיות באנגלית, מספרים, מקפים, וקוים תחתונים. המזהה יכול להכיל עד %1 תווים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:661
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:94
+msgid ""
+"Spell check the text of the file that your are editing. Note that there will"
+" be many spelling errors in the code parts of your file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:116
+msgid "Standard Deviation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:162
 msgid "Start"
 msgstr "מועד התחלה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:609
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:47
+msgid "Start LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:130
 msgid "Start New Test"
 msgstr "התחל מבחן חדש"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:443
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:94
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:508
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:84
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:54
 msgid "Statistics"
 msgstr "סטטיסטיקות"
 
-#. ($self->{ce}{courseName} =~ s/_/ /gr,                   CGI::span({ dir =>
-#. 'ltr' }, format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:73
-msgid "Statistics for %1 set %2. Closes %3"
-msgstr "סטטיסטיקה עבור %1 גליון %2.  נסגר ב-%3"
-
-#. ($self->{ce}{courseName}, $self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:68
-msgid "Statistics for %1 student %2"
-msgstr "סטטיסטיקה עבור %1 סטודנט %2"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2089
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1442
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1524
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2020
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:296
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:659
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:806
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:191
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:192
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:17
+msgid "Statistics Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:86
+msgid "Statistics for %1"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:90
+msgid "Statistics for %1 problem %2"
+msgstr ""
+
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:84
+msgid "Statistics for student %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:442
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:151
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:160
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:36
 msgid "Status"
 msgstr "סטטוס"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:29
 msgid "Stop Acting"
 msgstr "עצור התחזות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2251
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:85
 msgid "Stop Archiving"
 msgstr "הפסק העברת קורסים לקבצי ארכיון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2418
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1153
 msgid "Stop archiving courses"
 msgstr "הפסק העברת קורסים לקבצי ארכיון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:233
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:783
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2011
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:295
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:829
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:887
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:916
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:30
 msgid "Student ID"
 msgstr "מזהה סטודנט"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:9
+msgid "Student ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:37
 msgid "Student Name"
 msgstr "שם סטודנט"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:570
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:428
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:56
 msgid "Student Progress"
 msgstr "התקדמות הסטודנטים"
 
-#. ($self->{ce}->{courseName},                     CGI::span({ dir => 'ltr' },
-#. format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:81
-msgid "Student Progress for %1 set %2. Closes %3"
-msgstr "התקדמות הסטודנטים עבור %1 גליון %2.  נסגר ב-%3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:17
+msgid "Student Progress Help"
+msgstr ""
+
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:72
+msgid "Student Progress for %1"
+msgstr ""
 
-#. ($self->{ce}->{courseName}, $self->{studentName})
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($c->stash('setID')
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:76
-msgid "Student Progress for %1 student %2"
-msgstr "התקדמות הסטודנט עבור %1 סטודנט %2"
+msgid "Student Progress for set %1"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:628
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:80
 msgid "Student answers"
 msgstr "תשובות הסטודנט"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:766
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:80
+msgid ""
+"Student scores for the sets selected below will be calculated. This and "
+"other scoring operations can also be done using the \"Scoring Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:87
+msgid "Student:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:124
+msgid "Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:50
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:8
 msgid "Subject:"
 msgstr "נושא:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:653
-msgid "Subject: "
-msgstr "נושא:"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:222
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:30
 msgid "Submission time:"
 msgstr "זמן הגשה:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:226
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:41
 msgid "Submit"
 msgstr "שלח"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:26
 msgid "Submit Answers"
 msgstr "הגשת התרגיל"
 
 #. ($effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1861
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:23
 msgid "Submit Answers for %1"
 msgstr "הגשת התרגיל עבור %1"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:502
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:525
 msgid "Submit your answers again to go on to the next part."
 msgstr "שלח את התשובות שוב כדי להתקדם לחלק הבא."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:775
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:183
 msgid "Success Index"
 msgstr "מדד הצלחה"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:106
+msgid ""
+"Success index is the square of the average score divided by the average "
+"number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:73
+msgid ""
+"Success index is the square of the score divided by the number of attempts."
+msgstr ""
+
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1086
 msgid "Successfully archived the course %1."
 msgstr "הקורס %1 הוכנס לארכיון בהצלחה."
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:885
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:422
 msgid "Successfully created new achievement %1"
 msgstr "ההישג החדש %1 נוצר בהצלחה"
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1252
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:581
 msgid "Successfully created new set %1"
 msgstr "הגליון החדש %1 נוצר בהצלחה"
 
 #. ($add_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:465
 msgid "Successfully created the course %1"
 msgstr "הקורס %1 נוצר בהצלחה"
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1818
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2401
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1131
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:900
 msgid "Successfully deleted the course %1."
 msgstr "הקורס %1 נמחק בהצלחה."
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1529
+#. ($rename_oldCourseID,							$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:772
 msgid "Successfully renamed the course %1 to %2"
 msgstr "שם הקורס שונה בהצלחה מ-%1 ל-%2"
 
 #. ($unarchive_courseID, $new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2653
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1286
 msgid "Successfully unarchived %1 to the course %2"
 msgstr "%1 חולץ בהצלחה מהארכיון אל הקורס %2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2099
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4280
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:89
+msgid "TA:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2274
 msgid "Table defined in database but missing in schema"
 msgstr "הטבלה מוגדרת במסד הנתונים אך חסרה בסכמה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2097
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2269
 msgid "Table defined in schema but missing in database"
 msgstr "הטבלה מוגדרת בסכמה אך חסרה במסד הנתונים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2265
 msgid "Table is ok"
 msgstr "הטבלה תקינה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3200
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3490
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:276
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:576
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:106
 msgid "Take Action!"
 msgstr "בצע את הפעולה!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Target Set:"
 msgstr "גליון היעד:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:63
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:42
 msgid "TeX Source"
 msgstr "קובץ TeX"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:784
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:258
+msgid "Test %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:54
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:52
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:55
+msgid "Test Name"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:156
 msgid "Test Time"
 msgstr "זמן המבחן"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:224
 msgid "Test Time Limit (min; 0=Close Date)"
 msgstr "הגבלת הזמן של המבחן (דק'; 0=תאריך הסגירה)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2041
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:238
 msgid "Test Time Notification"
 msgstr "הודעה על זמן הנותר להגשת המבחן"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:156
 msgid "Test Versions"
 msgstr "גרסות המבחן"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:244
 msgid "Test not yet submitted."
 msgstr "המבחן טרם הוגש."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:317
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:920
+msgid "Test parameters"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:149
 msgid "Test/quiz with time limit."
 msgstr "מבחן עם מגבלת זמן."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:79
 msgid "Text"
 msgstr "טקסט"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:842
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:80
+msgid "Text Editor Options"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:55
 msgid "Text chapter:"
 msgstr "פרק בספר הלימוד:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:864
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:66
 msgid "Text section:"
 msgstr "סעיף בספר הלימוד:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:44
 msgid "Textbook:"
 msgstr "ספר לימוד:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1403
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:58
+msgid ""
+"The \"Edit Target Set\" button at the top of the page will take you to the "
+"Problem Set Editor which will allow you to edit dates, assign users and "
+"other information about the problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:115
+msgid ""
+"The \"Score\" tab will export achievement data to a CSV file that can be "
+"downloaded.  The export contains the global data including number of "
+"achievement points and current level of each student.  In addition for each "
+"selected achievement, a column for if the achievement was earned (1) or not "
+"earned (0) will be added to the CSV."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:194
+msgid ""
+"The <strong>Assigned sets</strong> column (x/y) indicates that x sets out of"
+" y sets avaiable have been assigned to this student. Click this link to "
+"assign or unassign sets to this student, to adjust due dates, or to adjust "
+"the grades on a homework set for a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:20
+msgid ""
+"The <strong>Set Detail</strong> page can be viewed in one of two distinct "
+"modes:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:189
+msgid ""
+"The <strong>login name</strong> column links allow you to \"act as\" a "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:191
+msgid ""
+"The <strong>pencil</strong> in the login column allows you to edit that "
+"student's data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:64
 msgid ""
 "The Attempts figure is the global average of the number of attempts (both "
 "correct and incorrect) individuals take on this problem.  A high figure may "
@@ -6140,7 +8205,7 @@ msgid ""
 "each part before continuing and each such  submittal counts as an attempt."
 msgstr "הערך של \"מספר ההגשות\" הוא ממוצע גלובלי של מספר ההגשות (נכונות ולא נכונות) שלומדים הגישו לשאלה. מספר גבוהה יכולה להעיד שהשאלה קשה. שימו לב שמספר הנסיונות בדרך כלל גדולה יותר בשאלות עם מספר חלקים שנפחות בהדרגה עקב ההגשות לחלקים הנפרדים על מנת להתקדם בשאלה והעובדה שההגשות החלקיות כולם נספרות."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1485
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:124
 msgid ""
 "The Attempts figure is the local average of the number of attempts (both "
 "correct and incorrect) individuals at your institution take on this problem."
@@ -6150,14 +8215,14 @@ msgid ""
 "counts as an attempt."
 msgstr "הערך של \"מספר ההגשות\" הוא ממוצע מקומי של מספר ההגשות (נכונות ולא נכונות) שלומדים הגישו לשאלה במוסד שלך. מספר גבוהה יכולה להעיד שהשאלה קשה. שימו לב שמספר הנסיונות בדרך כלל גדולה יותר בשאלות עם מספר חלקים שנפחות בהדרגה עקב ההגשות לחלקים הנפרדים על מנת להתקדם בשאלה והעובדה שההגשות החלקיות כולם נספרות."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1819
+#: /opt/webwork/webwork2/conf/defaults.config:1721
 msgid ""
 "The Maximum number of times Show me Another can be used per problem by a "
 "student. If set to -1 then there is no limit to the number of times that "
 "Show Me Another can be used."
 msgstr "המספר המקסימלי של הפעמים שסטודנט יכול להשתמש ב-\"הראה לי שאלה דומה\" עבור כל שאלה. אם מוגדר מינוס אחד -1 אז אין מגבלה למספר הפעמים."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1787
+#: /opt/webwork/webwork2/conf/defaults.config:1689
 msgid ""
 "The Reduced Scoring Period is the default period before the due date during "
 "which all additional work done by the student counts at a reduced rate. When"
@@ -6170,7 +8235,7 @@ msgid ""
 "work done counts 50% of the original.\" will be displayed."
 msgstr "תקופת הניקוד המופחת היא התקופה ברירת המחדל לפני תאריך ההגשה בה כל התקדמות שמבצע הסטודנט נספרת בערך ניקוד מופחת. כשנבחרת אפשרות הניקוד מופחת עבור גליון תאריך הניקוד המופחת יהיה תאריך ההגשה פחות המספר הזה בתור ברירת מחדל. לאחר מכן, ניתן לשנות את תאריך הניקוד המופחת. אם אפשרות זו נבחרת ואם תאריך הניקוד זה עבר, אבל לא עבר תאריך ההגשה, תופיעה הודעה כגון \"למטלה זו יש תקופת ניקוד מופחת שמתחילה ב-08/11/2009 בשעה 18:17 ונגמרת בתאריך ההגשה, 10/11/2009 בשעה 18:17. בתקופה זו כל ההגשות הנוספות מקנות 50% מהניקוד המקורי\"."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:78
 msgid ""
 "The Status figure is the global average of the Status individuals have "
 "earned on this problem. The Status is the percentage correct (from 0% to "
@@ -6179,7 +8244,7 @@ msgid ""
 "a problem until they get it correct or nearly so."
 msgstr "הערך של הציון הוא ממוצע גלובלי של הציון שלומדים השיגו בשאלה. הציון הוא הערך באחוזים (מ-0 ל- 100) של נכונות התשובות שהוגשו לשאלה. ערך נמוך יכולה להעיד שהשאלה קשה. באופן כללי, הציונים די גבוהים כי האפשרות להגיש מספר הגשות לכל שאלה מעודדת לומדים רבים להתנסות עד לקבלת ציון מלא או גבוהה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1506
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:138
 msgid ""
 "The Status figure is the local average of the Status individuals at your "
 "institution have earned on this problem. The Status is the percentage "
@@ -6188,47 +8253,61 @@ msgid ""
 "students will work on a problem until they get it correct or nearly so."
 msgstr "הערך של הציון הוא ממוצע מקומי של הציון שלומדים השיגו בשאלה במוסד שלך. הציון הוא הערך באחוזים (מ-0 ל- 100) של נכונות התשובות שהוגשו לשאלה. ערך נמוך יכולה להעיד שהשאלה קשה. באופן כללי, הציונים די גבוהים כי האפשרות להגיש מספר הגשות לכל שאלה מעודדת לומדים רבים להתנסות עד לקבלת ציון מלא או גבוהה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1262
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:11
 msgid "The WeBWorK Project"
 msgstr "פרוייקט ה-WeBWorK"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:822
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:25
+msgid ""
+"The WeBWorK administrators need to be added to the course in order for them "
+"to access the course.  Unchecking this option will make it so WeBWorK "
+"administrators cannot directly login to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:129
+msgid ""
+"The achievement evaluator is the perl code that is run after each submit to "
+"determine if an achievement is earned or not.  Click on the \"Edit "
+"Evaluator\" link to edit the evaluator."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:26
 msgid ""
 "The adjusted status of a problem is the larger of the problem's status "
 "andthe weighted average of the status of those problems which count towards "
 "the parent grade."
 msgstr "הציון המתוקן של שאלה הוא הגבוהה בין הציון על השאלה עצמה והממוצע הממושקל של ציוני שאלות המשנה שתורמות לציון הכולל של השאלה הראשית."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1677
+#: /opt/webwork/webwork2/conf/defaults.config:1579
 msgid ""
 "The amount of time (in minutes) after the due date that the Answers are "
 "available to student to view.  You can change this for individual homework, "
 "but WeBWorK will use this value when a set is created."
 msgstr "כמה זמן (בדקות) אחרי תאריך ההגשה שהתשובות יהיו זמינות לסטודנט לצפייה. אתה יכול לשנות את זה עבור גליון שיעורי בית ספציפי, אבל WeBWorK ישתמש בערך זה כשהגליון נוצר."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1667
+#: /opt/webwork/webwork2/conf/defaults.config:1569
 msgid ""
 "The amount of time (in minutes) before the due date when the assignment is "
 "opened.  You can change this for individual homework, but WeBWorK will use "
 "this value when a set is created."
 msgstr "כמות בזמן (בדקות) לפני מועד ההגשה שבו נפתח הגיליון. אתה יכול לשנות את מועדי הפתיחה וההגשה באופן ידני לכל גיליון, אך בזמן יצירת גיליון חדש, ווב-וורק משתמשת בערך זה בהכנת הנתונים הראשוניים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:386
 msgid "The answer above is NOT correct."
 msgstr "התשובה איננה נכונה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:375
 msgid "The answer above is correct."
 msgstr "התשובה נכונה."
 
 #. ($filename, $ce->{mail}{maxAttachmentSize})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:230
 msgid ""
 "The attached file \"%1\" exceeds the allowed attachment size of "
 "%quant(%2,megabyte)."
 msgstr "הצרופה \"%1\" גדולה מדי (ניתן לצרף קובץ בגודל מירבי של %2 מגה-ביטים)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:421
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:496
 msgid ""
 "The child problems for this problem will become visible to the student when "
 "they either have more incorrect attempts than is specified here, or when "
@@ -6237,173 +8316,252 @@ msgid ""
 "attempts."
 msgstr "השאלות המוכלות עבור שאלה זו יהפכו לגלויות עבור הסטודנט כשהם ביצעו יותר ניסיונות שגויים מאשר מפורט כאן, או כשנגמר להם הניסיונות, הקודום מבינהם. אם נבחר כאן \"מקסימום\"  אז שאלות מוכלות יהיו זמינות רק לאחר שלתמיד נגמרו הניסיונות."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:704
+#. ('href="http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files"
+#. target="Webworkdocs"',
+#. '<code>demoCourse.lst</code>','<code>.csv</code>','<code>.lst</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:59
+msgid ""
+"The classlist files are stored in the templates directory and provide a "
+"convenient way to enter a large number of students into your class. To view "
+"the format for <strong>ClassList files</strong> see the <a %1>ClassList "
+"specification</a> or download the %2 file and use it as a model. ClassList "
+"files can be prepared using a spreadsheet and then saved as %3 (comma "
+"separated values) text files.  However, to access as a classlist file, the "
+"file suffix needs to be changed to %4, which can be done with the \"Rename\""
+" button."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:16
 msgid ""
 "The configuration module did not find the data it needs to function.  Have "
-"your site administrator check that Constants.pm is up to date."
-msgstr "מערכת ההתאמה לא מצאה את המידע שהיא צריכה כדי לתפקד. פנה למנהל האתר כדי שיבדוק שהקובץ constants.pm מעודכן."
+"your site administrator check that site configuration files are up to date."
+msgstr ""
+
+#. ($archive_courseID,					$archive_path)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:80
+msgid ""
+"The course \"%1\" has already been archived at \"%2\". This earlier archive "
+"will be erased.  This cannot be undone."
+msgstr ""
 
-#. (CGI::b($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:151
+#. (tag('strong', stash('courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:8
 msgid ""
 "The course %1 uses an external authentication system (%2). Please go there "
 "to log in again."
 msgstr "הקורס %1 משתמש במערכת אימות/הזדהות חיצונית (%2). נא לחזור לשם כדי להיכנס שוב."
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:186
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:17
 msgid ""
 "The course %1 uses an external authentication system (%2). Please return to "
 "that system to access this course."
 msgstr "הקורס %1 משתמש במערכת אימות/הזדהות חיצונית (%2). נא לחזור לשם כדי להיכנס לקורס הזה."
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:191
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:23
 msgid ""
 "The course %1 uses an external authentication system (%2). You've "
 "authenticated through that system, but aren't allowed to log in to this "
 "course."
 msgstr "הקורס %1 משתמש במערכת אימות/הזדהות חיצונית (%2). אומתת במערכת החיצונית, אבל אתה לא מורשה להתחבר לקורס הזה."
 
-#. ($archive_courseID,						$archive_path)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2243
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:30
+msgid "The course database must be upgraded before archiving this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:30
+msgid "The course database must be upgraded before renaming this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:26
+msgid ""
+"The current mode should be made clear by the information at the top of the "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:46
 msgid ""
-"The course '%1' has already been archived at '%2'. This earlier archive will"
-" be erased.  This cannot be undone."
-msgstr "הקורס '%1' כבר הוכנס לארכיון ב-'%2'. הרישום המוקדם יותר ימחק. זה בילתי הפיך."
+"The current value of the achievement counter. Changes to this variable will "
+"be saved."
+msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1995
+#: /opt/webwork/webwork2/conf/defaults.config:1897
 msgid "The default display mode"
 msgstr "ברירת המחדל של מצב התצוגה"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1855
+#: /opt/webwork/webwork2/conf/defaults.config:1757
 msgid ""
 "The default number of attempts before the problem is re-randomized. ( 0 => "
 "never )"
 msgstr "ברירת המחדל למספר הנסיונות לפני שהשאלה עוברת רמדומיזציה מחדש. ( 0 => אף פעם )"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1854
+#: /opt/webwork/webwork2/conf/defaults.config:1756
 msgid ""
 "The default number of attempts between re-randomization of the problems ( 0 "
 "=> never)"
 msgstr "ברירת המחדל למספר הנסיונות בין רנדומיזציות מחדש של השאלה ( 0 => אף פעם )"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:251
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:73
+msgid ""
+"The description shown to students which states what action is needed to earn"
+" the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:5
 msgid "The directory you specified doesn't exist"
 msgstr "התיקייה שציינת  לא קיימת"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1829
-msgid "The display was already cleared."
-msgstr "התצוגה כבר היתה ריקה"
-
-#: /opt/webwork/webwork2/conf/defaults.config:2111
+#: /opt/webwork/webwork2/conf/defaults.config:2032
 msgid ""
 "The e-mail verbosity level controls how much information is automatically "
-"added to feedback e-mails.  Levels are<ol><li value=\"Simple\"> Simple: send"
-" only the feedback comment and context link</li><li value=\"Standard\"> "
-"Standard: as in Simple, plus user, set, problem, and PG data</li><li "
-"value=\"Debug\"> Debug: as in Standard, plus the problem environment "
-"(debugging data)</li></ol>"
-msgstr "רמת הפירוט של הודעות משוב קובעת כמה מידע נוסף אוטומטית אל הודעות המשוב. הרמות הן <ol><li value=\"Simple\"> Simple: שלח רק את המכתב של הפונה ואת הקישור למיקום ממנו נפתח הקריאה</li><li value=\"Standard\"> Standard: כמו ב- Simple, בתוספת נתוני המשתמש הפונה, הגיליון, השאלה, ומידע עזר מ- PG</li><li value=\"Debug\"> Debug: כמו ב- Standard, בתוספת בסיבת השאלה = problem environment (נתונים לאיתור באגים)</li></ol>"
-
-#. ($achievementName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:625
-msgid "The evaluator for %1 has been renamed to '%2'."
-msgstr "שם המעריך עבור %1 שונה ל-'%2'."
-
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:339
-msgid ""
-"The file %1/%2 already exists and cannot be overwritten. The message was not"
-" saved"
-msgstr "הקובץ %1/%2 כבר קיים ולא ניתן לדרוס אותו. ההודע לא נשמרה"
-
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:190
-msgid "The file %1/%2 cannot be found."
-msgstr "הקובץ %1/%2 לא נמצא."
-
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:181
-msgid "The file %1/%2 is not readable by the webserver."
-msgstr "הקובץ %1/%2 לא ניתן לקריאה על ידי שרת הרשת."
-
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:373
-msgid "The file '%1' cannot be found."
-msgstr "לא היה אפשר למצוא את הקובץ '%1'."
-
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1004
-msgid "The file '%1' cannot be read!"
-msgstr "אי אפשר לקרוא את הקובץ '%1'!"
-
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:380
-msgid "The file '%1' is a blank problem!"
-msgstr "הקובץ '%1' הוא שאלה ריקה!"
-
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:998
-msgid "The file '%1' is a directory!"
-msgstr "הקובץ '%1' הוא תיקייה!"
-
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:375
-msgid "The file '%1' is protected!"
-msgstr "הקובץ '%1' הוא מוגן!"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:598
+"added to feedback e-mails.  Levels are<ol><li> Simple: send only the "
+"feedback comment and context link</li><li> Standard: as in Simple, plus "
+"user, set, problem, and PG data</li><li> Debug: as in Standard, plus the "
+"problem environment (debugging data)</li></ol>"
+msgstr ""
+
+#. ($achievementName,				$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:293
+msgid "The evaluator for %1 has been renamed to \"%2\"."
+msgstr ""
+
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:246
+msgid "The file \"%1\" cannot be found."
+msgstr ""
+
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:526
+msgid "The file \"%1\" cannot be read!"
+msgstr ""
+
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:522
+msgid "The file \"%1\" is a directory!"
+msgstr ""
+
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:259
+msgid "The file \"%1\" is a template. You may use \"Save As\" to create a new file."
+msgstr ""
+
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:250
+msgid "The file \"%1\" is protected. You may use \"Save As\" to create a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:19
+msgid "The file $file does not appear to be a text or image file."
+msgstr ""
+
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:277
+msgid ""
+"The file %1 already exists and cannot be overwritten. The message was not "
+"saved."
+msgstr ""
+
+#. ("$emailDirectory/$openfilename",				$emailDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:156
+msgid ""
+"The file %1 cannot be found. Check whether it exists and whether the "
+"directory %2 can be read by the webserver. "
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
+msgid ""
+"The file %1 is not contained in the course templates directory and can not "
+"be modified."
+msgstr ""
+
+#. ("$emailDirectory/$openfilename")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:148
+msgid ""
+"The file %1 is not readable by the webserver. Check that it's permissions "
+"are set correctly."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:203
 msgid "The file does not appear to be a text file"
 msgstr "הקובץ איננו קובץ טקסט"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:88
 msgid "The file you are trying to download doesn't exist"
 msgstr "הקובץ שאת/ה מנסה להוריד אינו קיים"
 
 #. ($filename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:221
 msgid "The filetype of the attached file \"%1\" is not allowed."
 msgstr "סוג הקובץ של \"%1\" שרצית לצרף אינו מותר כצרופה במערכת."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3843
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2149
 msgid "The following courses were successfully hidden:"
 msgstr "הקורסים הבאים הוחבאו בהצלחה:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3908
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2218
 msgid "The following courses were successfully unhidden:"
 msgstr "הקורסים הבאים נהפכו לגלויים בהצלחה:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4121
-msgid "The following upgrades are available for your WeBWorK system:"
-msgstr "העדכונים הבאים זמינים עבור מערכת הווב-וורק שלך:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:34
+msgid "The following describes how the checkboxes alter the scoring output"
+msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2081
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:66
 msgid ""
 "The following users are NOT assigned to this set and will be ignored: %1"
 msgstr "למשתמשים הבאים לא הוקצה הגליון הזה ולכן נתעלם מהם: %1"
 
-#. (join('.', @{$problemSeqs[$children_counts_indexs[0]]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:288
+msgid "The given file path is not a valid location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:49
+msgid "The goal value of the achievement counter."
+msgstr ""
+
+#. (join('.', @{ $problemSeqs[ $children_counts_indexs[0] ] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1334
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the score of problem %1."
 msgstr "הציון עבור שאלה זו זה הגדול מבין ניקוד השאלה, וניקוד השאלה %1."
 
-#. (join(', ', map({join('.', @{$problemSeqs[$_]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2064
+#. (join(', ', map({ join('.', @{ $problemSeqs[$_] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the weighted average of the problems: %1."
 msgstr "הציון עבור שאלה זו זה הגדול מבין ניקוד השאלה, והממוצע המותאם של השאלות: %1."
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1954
-msgid "The hardcopy header for set %1 has been renamed to '%2'."
-msgstr " שם קידומת גרסת ההדפסה עבור גליון %1 שונה ל-'%2'."
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1078
+msgid "The hardcopy header for set %1 has been renamed to \"%2\"."
+msgstr ""
+
+#. ($showHintsAfter)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:36
+msgid ""
+"The hint shown is an instructor preview and will be shown to students after "
+"%quant(%1,attempt)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:32
+msgid ""
+"The hint shown is an instructor preview and will not be shown to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:22
+msgid ""
+"The information box on the right displays information about the course. This"
+" is useful for leaving course wide messages for students. It contains text "
+"from the file templates/course_info.txt. Instructors can edit this file from"
+" the web (click on the \"Edit\" link)."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:111
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:30
 msgid ""
 "The initial value is the answer sub score for the answer that is currently "
 "shown.  If this is modified, it will be used to compute the total problem "
@@ -6411,37 +8569,100 @@ msgid ""
 "shown answer if the page is reloaded."
 msgstr "הערך ההתחלתי הוא הציון החלקי עבור התשובה שמוצג כרגע. אם תבצע בו שינוי, הערך החדש תתרום לחישוב מחדש של הציון הכולל שלמטה. הציון החלקי אינו נשמר במערכת ותחזור לערך של התשובה שמופיעה כאשר הדף נטען מחדש."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:161
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:97
+msgid ""
+"The initial value is the currently saved score as a point value computed "
+"using the percent score.  This point value is used to compute the percent "
+"score (rounded to a whole percent) that can be saved."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:145
 msgid "The initial value is the currently saved score for this student."
 msgstr "הערך ההתחלתי הוא הציון שנשמר כרגע במערת עבור סטודנט זה."
 
 #. ($rename_oldCourseID, $rename_oldCourseInstitution,
 #. $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
 msgid ""
 "The institution associated with the course %1 has been changed from %2 to %3"
 msgstr "המוסד שאליו קורס %1 מיוחס שונה מ-%2 ל-%3"
 
-#. ($rename_newCourseID, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1498
+#. ($rename_newCourseID, $optional_arguments{courseInstitution})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:729
 msgid "The institution associated with the course %1 is now %2"
 msgstr "המוסד שמיוחס לקורס %1 הוא כעת %2"
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:599
+msgid ""
+"The instructor account with user id %1 does not exist.  Instructor accounts "
+"must be created manually."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:635
 msgid ""
 "The instructor account with user id %1 does not exist.  Please create the "
 "account manually via WeBWorK."
 msgstr "לא קיים חשבון מורה בעל מזהה המשתמש %1. אנא צור את החשבון באופן ידני בתוך בקורס במערכת ה- WeBWorK."
 
-#. ($r->param('new_set_name')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1897
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:87
+msgid ""
+"The key maps that are available are \"default\", \"emacs\", \"sublime\", and"
+" \"vim\". The \"default\" key map has the standard behavior of a browser "
+"text area. You can use Ctrl-C to copy, Ctrl-V to paste, Ctrl-F to search, "
+"etc. If you are more comfortable with the \"emacs\", \"sublime\", or \"vim\""
+" text editors then you may choose to use one of those key maps instead."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:75
+msgid "The large text window"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:27
+msgid ""
+"The list of files include regular files, directories (ending in a \"/\") and"
+" links (ending in a \"@\")."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:52
+msgid ""
+"The login name cannot be changed. (It is the primary key for the student's "
+"data.) If you make a mistake in the login name at the beginning of the "
+"course (before any work has been done) then it is best to simply add a new "
+"student with the correct entry and drop the student with the bad login name."
+" (See drop and delete students below.) If the login name must be changed "
+"after a user has started working assignments, then contact your system "
+"administrator, who can use the webwork2 \"bin/change_user_id\" script to "
+"change the user id."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:20
+msgid ""
+"The main page allows access to set and student statistics.  When selecting a"
+" student, their grades page is shown, which lists set totals and per problem"
+" grades for each set assigned to the student.  When selecting a set, various"
+" statistics and histograms are shown for the overall grades of students who "
+"are currently enrolled or auditing the course."
+msgstr ""
+
+#. ('href="http://webwork.maa.org/wiki" target="ww_wiki"',
+#. 'href="http://webwork.maa.org/wiki/Instructors" target="ww_wiki"')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:24
+msgid ""
+"The main page for WeBWorK documentation is the <a %1>webwork wiki</a> while "
+"specific help for instructors setting up a course are in the <a "
+"%2>instructors' section</a>."
+msgstr ""
+
+#. ($c->param('new_set_name')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:569
 msgid ""
 "The name \"%1\" is not a valid set name.  Use only letters, digits, dashes, "
 "underscores, periods, and spaces."
 msgstr "השם '%1' אינו של תקין לגיליון תקין. השתמש רק באותיות באנגלית, ספרות, סימני מינוס, קו-תחתון underscore, נקודה ורווחים."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1530
+#: /opt/webwork/webwork2/conf/defaults.config:1432
 msgid ""
 "The name of course information file (located in the templates directory). "
 "Its contents are displayed in the right panel next to the list of homework "
@@ -6458,151 +8679,249 @@ msgid ""
 "go back to the LMS to access something in the WeBWorK course."
 msgstr "שם של מערכת הלימוד LMS. הטקסט שמוגדר כאן מופיע בהודעות המפנות את הסטודנטים להיכנס שוב דרך מערת הלימוד אל תוכן הקורס בווב-וורק."
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:63
+msgid "The number of points earned for earning the achievement."
+msgstr ""
+
 #. ($openDate, $dueDate, $answerDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1104
 msgid ""
 "The open date: %1, close date: %2, and answer date: %3 must be defined and "
 "in chronological order."
 msgstr "תאריך הפתיחה: %1, תאריך סגירה: %2, ותאריך תשובות: %3 חייבים ליות מוגדרים ובסדר כרונולוגי."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:702
+#. ($path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:393
+msgid "The original path is not in a valid location. Using failsafe %1"
+msgstr ""
+
+#. ($forcedSourceFile)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:510
+msgid "The original path to the file is %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:262
 msgid "The password and password confirmation for the instructor must match."
 msgstr "הסיסמה ואימות הסיסמה של המורה חייבות להתאים."
 
-#. (CGI::b($r->maketext("[_1]'s Current Password", $user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:27
+msgid ""
+"The password can be any combination of letters, numbers and special symbols."
+" Students are encouraged to use all three, and stay away from dictionary "
+"words. The password should not be the same as any password used elsewhere, "
+"such as for an email account. The password will only be present on the page "
+"if the user has permission to change the password."
+msgstr ""
+
+#. ($c->tag(                                               'b',
+#. $c->maketext(                                                   "[_1]'s
+#. Current Password",
+#. $c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:95
 msgid ""
 "The password you entered in the %1 field does not match your current "
 "password. Please retype your current password and try again."
 msgstr "הסיסמה שהזנת בשדה %1 לא מתאימה לסיסמתך הנוכחית. אנא הזן את סיסמתך הנוכחית ונסה שוב."
 
-#. (CGI::b($r->maketext("[_1]'s New Password",         $e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:105
+#. ($c->tag('b', $c->maketext("[_1]'s New Password",         $e_user_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:82
 msgid ""
 "The passwords you entered in the %1 and %2 fields don't match. Please retype"
 " your new password and try again."
 msgstr "הסיסמאות שהזנת בשדות %1 ו-%2 לא מתאימות. אנא הזן מחדש את סיסמתך החדשה ונסה שנית."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:789
-msgid "The path to the original file should be absolute"
-msgstr "המסלול לקוץ המקור צריך להיות מוחלט"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:374
+msgid "The path can not be the temporary edit directory."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:667
-msgid ""
-"The percentage of active students with correct answers for each problem"
-msgstr "אחוז הסטודנטים הפעילים עם תשובות נכונות לכל שאלה."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:370
+msgid "The path to the original file should be absolute."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:131
 msgid ""
 "The percentage of students receiving at least these scores. The median score"
 " is in the 50% column."
 msgstr "אחוז הסטודנטים עם ניקוד כזה לפחות. הציון הממוצע הוא בעמודת 50%."
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:458
 msgid "The prerequisite conditions have not been met for set '%1'."
 msgstr "התנאים המקדימים עבור הגיליון '%1' לא קוימו."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1917
+#. (q(down menu to change which student's seed and answers are shown.  Use the
+#. "Mark Correct" checkbox to set)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:26
+msgid ""
+"The problem is shown at the top with the seed and answers of the selected "
+"student.  Use the drop "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:62
 msgid "The problem set is not yet open"
 msgstr "הגליון טרם נפתח לשימוש"
 
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2012
-msgid "The recorded score for this version is  %1/%2."
-msgstr "הציון שנשמר לגרסה זו של המבחן הוא %1 מתוך %2."
-
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2021
-msgid "The recorded score for this version is %1/%2."
-msgstr "הציון שנשמר לגרסה זו של המבחן הוא %1 מתוך %2."
-
 #. ($origReducedScoringDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1971
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1121
 msgid ""
 "The reduced credit date %1 in the file probably was generated from the Unix "
 "epoch 0 value and is being treated as if it was Unix epoch 0."
 msgstr "תאריך ניקוד המופחת %1 בקובץ כנראה נוצר מזמן 0 של יונקס וכך התיחסה המערכת אל הערך שהופיע."
 
 #. ($openDate, $dueDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1982
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1135
 msgid ""
 "The reduced credit date should be between the open date %1 and close date %2"
 msgstr "תאריך הניקוד מופחת צריך להיות בין תאריך הפתיחה %1 ותאריך סגירה %2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1220
 msgid ""
 "The reduced scoring date should be between the open date and close date."
 msgstr "תאריך הניקוד המופחת צריך להיות בין תאריך הפתיחה לתאריך הסגירה."
 
 #. ($tempFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:307
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:298
 msgid "The requested file \"%1\" does not exist on the server."
 msgstr "הקובץ שביקשת \"%1\" לא קיים בשרת."
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2085
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1389
 msgid "The score for this problem can count towards score of problem %1."
 msgstr "הציון על שאלה זו יכול להחשב כחלק מהציון של שאלה %1."
 
-#. ($setName, $effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:306
-msgid "The selected problem set (%1) is not a valid set for %2"
-msgstr "גליון השאלות הנבחר (%1) הוא לא גליון חוקי עבור %2"
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:69
+msgid ""
+"The scoring files are stored in the scoring directory and are produced using"
+" the \"Scoring Tools\" page or the scoring command in the \"Instructor "
+"Tools\" module. These files can be downloaded, modified in a spreadsheet "
+"(for example, to add midterm scores) and then uploaded again to the scoring "
+"directory to be merged with email messages. (Use a new file name, other than"
+" %1, when uploading to prevent the scoring module from overwriting an "
+"uploaded file.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:52
+msgid ""
+"The second row of the problem collection area is for browsing directories. "
+"The OPL will be there as well as any other directories that you may set up "
+"(for example Contrib). If this is selected, all subdirectories containing "
+"problems will be listed."
+msgstr ""
+
+#. (stash('setID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet.html.ep:13
+msgid "The selected problem set (%1) is not a valid set for %2."
+msgstr ""
 
-#. ($urlpath->arg("setID")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1467
-msgid "The selected problem set (%1) is not a valid set for %2%3:"
-msgstr "הגיליון שנבחר (%1) אינו גיליון תקין עבור %2%3:"
+#. ($setID, $effectiveUserID, $c->{invalidVersionCreation} ? " (acted as by
+#. $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:77
+msgid "The selected problem set (%1) is not a valid set for %2: %3"
+msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1946
-msgid "The set header for set %1 has been renamed to '%2'."
-msgstr "כותרת הגליון עבור גליון %1 שונתה ל-'%2'."
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1066
+msgid "The set header for set %1 has been renamed to \"%2\"."
+msgstr ""
 
-#. ($newSetName)
 #. ($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1164
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:491
+msgid ""
+"The set name \"%1\" is already in use. Pick a different name if you would "
+"like to start a new set. No set created."
+msgstr ""
+
+#. ($newSetName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:584
 msgid ""
 "The set name '%1' is already in use.  Pick a different name if you would "
 "like to start a new set."
 msgstr "שם הגליון '%1' כבר נמצא בשימוש. בחר שם אחר אם ברצונך לפתוח גליון חדש."
 
-#. ($setID, $editingSetVersion, $editForUser[0])
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2109
-msgid "The set-version (%1, version %2) is not assigned to user %3."
-msgstr "גרסת-הגליון (%1, גרסה %2) לא משויכת למשתמש %3."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:58
+msgid ""
+"The sets checked below will be visible to students or hidden from students. "
+"Useful for preparing sets ahead of time, but not showing them to students; "
+"or for temporarily hiding a set which has a mistake in it while it is being "
+"fixed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:54
+msgid ""
+"The sets checked below will become available for editing the due dates and "
+"visibility."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:73
+msgid ""
+"The sets checked below will written to set definition files, to be saved for"
+" future use, or to be transferred to another course. The set definition "
+"files can be uploaded/downloaded using the \"File Manager\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:29
+msgid ""
+"The simple configuration file is the name of the configuration file created "
+"when using the \"Course Configuration\" page to configure course options.  "
+"This option sets if this configuration file is copied from the old course or"
+" not and instead use the server defaults."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:551
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:521
 msgid "The solution has been removed."
 msgstr "הפתרון הוסר."
 
-#. ($fullSetName, $prettyProblemNumber, $self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1975
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:33
+msgid ""
+"The solution shown is an instructor preview and will only be shown to "
+"students after the due date."
+msgstr ""
+
+#. ($c->{fullSetID},
+#. $c->{prettyProblemNumber},
+#. $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1103
+msgid ""
+"The source file for \"set %1 / problem %2\" has been changed from \"%3\" to "
+"\"%4\"."
+msgstr ""
+
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1209
 msgid ""
-"The source file for 'set %1 / problem %2 has been changed from '%3' to '%4'"
-msgstr "קוד המקור ל'גליון %1 / שאלה %2' שונה מ-'%3' ל-'%4'"
+"The temporary file %1 is not contained in the course templates directory and"
+" can not be deleted."
+msgstr ""
+
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:689
+msgid ""
+"The temporary file %1 is not in the course templates directory and can not "
+"be deleted!"
+msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2133
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:349
 msgid ""
 "The test (which is version %1) may  no longer be submitted for a grade."
 msgstr "כבר לא ניתן להגיש את המבחן (גרסה %1) לניקוד ולקבלת ציון."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1927
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1042
 msgid ""
 "The text box now contains the source of the original problem. You can "
 "recover lost edits by using the Back button on your browser."
 msgstr "tr: The text box now contains the source of the original problem. You can recover lost edits by using the Back button on your browser."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:214
+#. (			% . 'but the result will not be counted.')
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:23
 msgid ""
 "The time limit on this assignment was exceeded. The assignment may be "
-"checked, but the result will not be counted."
-msgstr "הזמן המוגבל למשימה זו נגמר. ניתן לבדוק את מטלה זו, אך התוצאות לא תספרנה."
+"checked, "
+msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1657
+#: /opt/webwork/webwork2/conf/defaults.config:1559
 msgid ""
 "The time of the day that the assignment is due.  This can be changed on an "
 "individual basis, but WeBWorK will use this value for default when a set is "
@@ -6610,24 +8929,39 @@ msgid ""
 msgstr "מועד ההגשה ביום עבור המטלה. ניתן לשינוי באופן פרטני, אבל WeBWorK ישתמש בערך זה כברירת מחדל כשנוצר גליון."
 
 #. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1443
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:689
 msgid "The title of the course %1 has been changed from %2 to %3"
 msgstr "הכותרת של קורס %1 שונתה מ-%2 ל-%3"
 
-#. ($rename_newCourseID, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1491
+#. ($rename_newCourseID, $optional_arguments{courseTitle})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:722
 msgid "The title of the course %1 is now %2"
 msgstr "הכותרת של הקורס %1 היא עכשיו %2"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:167
+msgid ""
+"The top number is the percent score on the problem.  A period (.) indicates "
+"a problem has not been attempted. The bottom number is the number of "
+"incorrect attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:25
+msgid ""
+"The total grade row at the bottom shows the total score and percent average "
+"over all open assignments.  The total grade row can be shown/hidden under "
+"general course configuration settings."
+msgstr ""
+
 #. ($enableReducedScoring)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1151
 msgid ""
 "The value %1 for enableReducedScoring is not valid; it will be replaced with"
 " 'N'."
 msgstr "הערך %1 עבור \"אפשר ניקוד מופחת\" אינו חוקי. הוא יוחלף בערך 'N'."
 
 #. ($timeCap)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2032
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1209
 msgid ""
 "The value %1 for the capTimeLimit option is not valid; it will be replaced "
 "with '0'."
@@ -6635,81 +8969,90 @@ msgstr "הערך %1 עבור האפשרות  \"זמן מבחן מקסימלי\"
 
 #. ($hideScore)
 #. ($hideScoreByProblem)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2023
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1178
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1189
 msgid ""
 "The value %1 for the hideScore option is not valid; it will be replaced with"
 " 'N'."
 msgstr "הערך %1 עבור האפשרות \"החבאת ציון\" הוא לא תקין; הוא יוחלף ב-'N'."
 
 #. ($hideWork)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1200
 msgid ""
 "The value %1 for the hideWork option is not valid; it will be replaced with "
 "'N'."
 msgstr "הערך %1 עבור האפשרות \"החבאת עבודה\" הוא לא תקין; הוא יוחלף ב-'N'."
 
 #. ($relaxRestrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2045
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1235
 msgid ""
 "The value %1 for the relaxRestrictIP option is not valid; it will be "
 "replaced with 'No'."
 msgstr "הערך %1 עבור האפשרות \"הרגע הגבלת IP\" הוא לא תקין; הוא יוחלף ב-'לא'."
 
 #. ($restrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2037
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1221
 msgid ""
 "The value %1 for the restrictIP option is not valid; it will be replaced "
 "with 'No'."
 msgstr "הערך %1 עבור האפשרות \"הגבלת IP\" הוא לא תקין; הוא יוחלף ב-'לא'."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:46
+msgid "The visible name/title of the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:36
 msgid ""
 "The webwork server must be able to write to these directories. Please "
 "correct the permssion errors."
 msgstr "שרת ה-WeBWorK חייב לאפשר רישום של התיקיות הללו. אנא תקן את שגיאות ההרשאה."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1537
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:83
+msgid "Theme"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1439
 msgid "Theme (refresh page after saving changes to reveal new theme.)"
 msgstr "עיצוב (רענן את העמוד לאחר שמירת השינויים על מנת לראות את העיצוב החדש)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:109
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:5
 msgid "Theme:"
 msgstr "תבנית עיצוב theme:"
 
 # Context is "Sort by ____ Then by _____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:843
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:872
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:30
 msgid "Then by"
 msgstr "ואז לפי"
 
-#. ($count_line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:603
+#. ($listingsCount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:52
 msgid "There are %1 matching WeBWorK problems"
 msgstr "יש %1 שאלות מתאימות"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1625
+#: /opt/webwork/webwork2/conf/defaults.config:1527
 msgid ""
 "There are currently two hardcopy themes to choose from: One Column and Two "
 "Columns.  The Two Columns theme is the traditional hardcopy format.  The One"
 " Column theme uses the full page width for each column"
 msgstr "כרגע יש שני עיצובים לגרסת ההדפסה שניתנים לבחירה: עמודה אחת, ושתי עמודות. עיצוב בשתי עמודות הוא עיציב גרסת ההדפסה המסורתי. עיצוב בעמודה האחת משתמש בכל רוחב הדף לכל עמודה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2979
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1519
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
 "least one table."
 msgstr "ישנם שדות נוספות במסד הנתונים שאינם מופיעות כיום בסכמה schema עבור לפחות טבלה אחת."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1243
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:23
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
-"least one table.  They can only be removed when upgrading the course."
-msgstr "ישנם שדות נוספות במסד הנתונים שאינם מופיעות כיום בסכמה schema עבור לפחות טבלה אחת. ניתן למחוק אותם רק בתהליך שדרוג של הקורס."
+"least one table.  They can be removed when upgrading the course."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1404
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
 "least one table. Check the checkbox by the field to delete it when upgrading"
@@ -6717,63 +9060,48 @@ msgid ""
 "is not undoable!"
 msgstr "ישנם שדות נוספות במסד הנתונים שאינם מופיעות כיום בסכמה schema עבור לפחות טבלה אחת. סמן בתיבה הייעודית ליד השדה על מנת למחוק את הדשה ממסד הנתונים בתהליך שדרוג הקורס. אזהרה: המחיקה מוחקת לגמרי את כל הנתונים שנשמרו בעבר בשדה ואין דרך לחזור אחורה אחרי המחיקה! ניתן לשמור ארכיון של הקורס לפני השדרוג על מנת לשמור בצד את הנתונים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1508
 msgid "There are extra database tables which are not defined in the schema."
 msgstr "ישנם טבלאות נוספות במסד הנתונים שאינם מופיעות כיום בסכמה schema."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2833
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1389
 msgid "There are extra database tables which are not defined in the schema. "
 msgstr "ישנם טבלאות נוספות במסד הנתונים שאינם מופיעות כיום בסכמה schema."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:15
 msgid ""
 "There are extra database tables which are not defined in the schema.  These "
 "can be deleted when upgrading the course."
 msgstr "ישנם טבלאות נוספות במסד הנתונים שאינם מופיעות כיום בסכמה schema. ניתן למחוק אותם בתהליך שדרוג הקורס."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:601
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:29
+msgid "There are many options available at the bottom:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:49
+msgid "There are no completed versions of this test."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:51
 msgid "There are no matching WeBWorK problems"
 msgstr "אין שאלות מתאימות."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:976
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:8
 msgid "There are no set definition files in this course to look at."
 msgstr "אין קבצי הגדרת גיליונות שניתן להציג בקורס זה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2199
-msgid ""
-"There are tables or fields missing from the database.  The database must be "
-"upgraded before archiving this course."
-msgstr "ישנן טבלאות או שדות שחסרות במסד הנתונים. יש לעדכן את מסד הנתונים של הקורס לפני שמכינים ארכיון של הקורס."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4108
-msgid "There are upgrades available for the Open Problem Library."
-msgstr "ישנם עדכונים זמינים לספרית השאלות הפתוחות OPL."
-
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4072
-msgid ""
-"There are upgrades available for your current branch of PG from branch %1 in"
-" remote %2."
-msgstr "יש עדכונים זמינים עבור הענף הנוכחי של PG מענף %1 במאגר המרוחק remote בשם %2."
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4010
-msgid ""
-"There are upgrades available for your current branch of WeBWorK from branch "
-"%1 in remote %2."
-msgstr "ישנם עדכונים זמינים לענף הנוכחי של ה-WeBWorK מתוך ענף %1 במאגר המרוחק remote בשם %2."
-
 #. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:273
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:87
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
 "their name, you destroy all of the data for achievement %1 for this student."
 msgstr "פעולה זו בלתי הפיכה. אל תבצע אותה אם אתה לא יודע מה אתה עושה! כשאתה מבטל הקצאה של סטודנט בעזרת כפתור זה, או על ידי בחירת השם שלו, אתה מוחק את כל הנתונים של הישג %1 של סטודנט זה."
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:230
+#. (tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:91
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
@@ -6781,37 +9109,29 @@ msgid ""
 "student."
 msgstr "פעולה זו בלתי הפיכה - אין ביטול/חזרה לאחורה אחרי ביצוע הפעולה. אין להפעיל אותה אם אתה לא מבין מה אתה הולך לבצע! כאשר מורידים הקצאה של גיליון לסטודנט בעזרת הכפתור הזה או בעזרת הורדת הסימון ליד שם הסטודנט - אתה גורם למחיקה של כל הנתונים, כולל הציונים, עבור גיליון %1 עבור הסטודנט המסוים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:205
-msgid ""
-"There is NO undo for this function.  Do not use it unless you know what you "
-"are doing!  When you unassign sets using this button, or by unchecking their"
-" set names, you destroy all of the data for those sets for this student."
-msgstr "פעולה זו בלתי הפיכה - אין ביטול/חזרה לאחורה אחרי ביצוע הפעולה. אין להפעיל אותה אם אתה לא מבין מה אתה הולך לבצע! כאשר מורידים הקצאה של גיליונות בעזרת הכפתור הזה או בעזרת הורדת הסימון ליד שם הגיליון - אתה גורם למחיקה של כל הנתונים, כולל הציונים, עבור גיליונות אלו עבור הסטודנט המסוים."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:234
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:68
 msgid "There is NO undo for unassigning a set."
 msgstr "אי אפשר לחזור בך מביטול הקצאה של גליון."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:174
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:177
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:125
+msgid ""
+"There is NO undo for unassigning sets. Do not do so unless you know what you"
+" are doing!  When you unassign sets by unchecking set names and clicking "
+"save, you destroy all of the data for those sets for this student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:21
 msgid "There is NO undo for unassigning students."
 msgstr "אי אפשר לחזור בך מביטול הקצאת סטודנטים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4069
-msgid "There is a new version of PG available."
-msgstr "יש גרסה חדשה של PG."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4007
-msgid "There is a new version of WeBWorK available."
-msgstr "יש גרסה חדשה של WeBWorK."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:529
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:490
 msgid "There is a written solution available."
 msgstr "יש פתרון זמין לשאלה."
 
 #. ($message_file, $merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:50
 msgid ""
 "There is no additional grade information.  A message about additional grades"
 " can go in [TMPL]/email/%1. It is merged with the file [Scoring]/%2. These "
@@ -6820,185 +9140,324 @@ msgid ""
 msgstr "אין מידע נוסף על הציונים. הודעה על ציונים נוספים יכולה להופיע בקובץ [TMPL]/email/%1. התוכן תמוזג יחד עם הקובץ [Scoring]/%2. קבצים אלה ניתנים לעריכה בעזרת קישור ה-\"דוא\"ל\" וה-\"עורך הקבצים\" בתפריט הראשית."
 
 #. ($continueTimeLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:486
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:25
 msgid ""
 "There is no time remaining on the currently open test. Click continue below "
 "and then click \"Grade Test\" within %1 seconds to submit the test for a "
 "grade."
 msgstr "נגמר הזמן להגשת המבחן שפתוח אצליך. יש ללחוץ המשך למטה ואז ללחוץ על \"הגש את המבחן\" תוך %1 שנויות על מנת להגיש את התשובות שלך לקבלת ציון במבחן."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:856
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:65
 msgid "There is no undo for deleting files or directories!"
 msgstr "אי אפשר לחזור בך ממחיקת קבצים או תיקייות!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:534
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:495
 msgid ""
 "There is no written solution available for this problem, but you can still "
 "view the correct answers."
 msgstr "לא קיים פתרון לשאלה זו, אבל עדיין ניתן לצפות בתשובות הנכונות."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:537
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:498
 msgid "There is no written solution available for this problem."
 msgstr "לא קיים פתרון לשאלה זו."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1539
+#: /opt/webwork/webwork2/conf/defaults.config:1441
 msgid ""
-"There is one main theme to choose from: math4. It has two variants, "
-"math4-green and math4-red. The theme specifies a unified look and feel for "
-"the WeBWorK course web pages."
-msgstr "יש תבנית עיצוב theme ראשי בודד: math4. יש שתי גרסאות משנה: math4-green ו- math4-red. תבניות העיצוב מגדירות מראה אחיד לממשק ולדפים של הקורסים במערכת."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2270
-msgid ""
-"There may be something wrong with this question. Please inform your "
-"instructor including the warning messages below."
-msgstr "ייתכן שישנה בעיה בשאלה. אנא עדכן את צוות תמיכה, או את סגל ההוראה אם אין לך אפשרות להודיע לצוות התמיכה ישירות. חשוב לתת מידע מפורט על התקלה וההודעות שהופיעו כולל הודעות שמופיעות בתחתית הדף."
+"There is one main theme to choose from: math4. It has three variants: "
+"math4-green, math4-red, and math4-yellow. The theme specifies a unified look"
+" and feel for the WeBWorK course web pages."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:441
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator if this recurs."
 msgstr "אירעה שגיאה בתהליך ההתחברות. אנה פנה לצוות התמיכה/סגל ההוראה במידה והתקלה הזאת נמשכת."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:284
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:307
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:475
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:484
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:511
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:543
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:219
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:354
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:492
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:536
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:575
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:172
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:189
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:212
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:227
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:365
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:447
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator."
 msgstr "אירעה שגיאה בתהליך ההתחברות. אנא פנה לצוות התמיכה או אל סגל ההוראה."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1935
+#. ('href="https://webwork.maa.org/wiki/Set_Definition_Files"
+#. target="Webworkdocs"')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:48
+msgid ""
+"These are stored in the templates directory. The format of <strong>Set "
+"Definition files</strong> is described in the <a %1>Set Definition "
+"specification</a>. Set definition files are mainly useful for transferring "
+"set assignments from one course to another and are created when exporting a "
+"problem set from the \"Hmwk Sets Editor\".  Each set defintion file contains"
+" a list of problems used and the dates and times. These definitions can be "
+"imported into the current course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:77
+msgid ""
+"These are the files from which problems are generated and are located in the"
+" templates directory or in subdirectories. They can be edited directly using"
+" the \"Edit\" link on each problem page or from the \"Hmwk Sets Editor\". "
+"The File Manager allows you to upload or download these files. \tDirectories"
+" that start with \"set\" contain pg files and are generated when exporting a"
+" problem set in which there are local versions of a problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:40
+msgid ""
+"These options will only be shown if the user has the permission to change "
+"display settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:44
+msgid ""
+"These problems require some application of algorithms, but do not rise to "
+"the level of a full word problem. For example, \"Identify the local extrema "
+"for f(x) = ...\". One has to apply algorithms and interpret results."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1837
 msgid ""
 "These users and higher get the \"Show Past Answers\" button on the problem "
 "page."
 msgstr "משתמשים מרמת הרשאה זו ומעלה מקבלים את כפתור \"צפייה בתשובות קודמות\" בדף השאלות."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:17
 msgid "This action can take a long time if there are many students."
 msgstr "הפעולה יכולה להמשך זמן רב אם ישנם סטודנטים רבים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:168
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:12
 msgid "This action will not overwrite existing users."
 msgstr "פעולה זו לא תדרוס משתמשים קיימים."
 
-#. (CGI::b($r->maketext("Guest Login")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:279
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:20
 msgid ""
-"This course supports guest logins. Click %1 to log into this course as a "
-"guest."
-msgstr "הקורס הזה תומך במשתמשים אורחים. לחץ %1 כדי להתחבר לקורס בתור אורח."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:851
-msgid "This homework set contains no problems."
-msgstr "גליון שיעורי הבית לא מכיל שאלות."
+"This allows for the viewing, downloading, uploading and other management of "
+"files in the course.  Select a file or set of files (using CTRL or SHIFT) "
+"and click the desired button on the right.  Many actions can only be done "
+"with a single file (like view). Selecting a directory or set of files and "
+"clicking \"Make Archive\" creates a compressed tar file with the name "
+"COURSE_NAME.tgz"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1988
-msgid "This homework set is closed."
-msgstr "גליון שיעורי הבית הוא סגור"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:34
+msgid ""
+"This browses the Open Problem Library (OPL) in category "
+"(Subject/Chapter/Section) form. Select the desired categories (all three do "
+"not need to be selected) and click \"View Problems\". If the \"Include "
+"Contrib\" box is selected then those problems in the Contrib section of the "
+"OPL that have the categories defined are also included. Contrib problems are"
+" problem that haven't been vetted as thoroughly as OPL problems. If you want"
+" hints or solutions included while browsing select the appropriate box."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1986
-msgid "This homework set is not yet open."
-msgstr "גליון שיעורי הבית הזה עדיין לא פתוח"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:49
+msgid ""
+"This button is also present both at top and the bottom of the page. Discards"
+" all changes, reloading the page by re-reading the database information for "
+"this set."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:932
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:39
 msgid ""
-"This is a blank problem template file and can not be edited directly. Use "
-"the 'NewVersion' action below to create a local copy of the file and add it "
-"to the current problem set."
-msgstr "זה קובץ תבנית שאלה ריק ואי אפשר לערוך אותו ישירות. אנא השתמש בפעולת ה-\"גרסה חדשה\" למטה כדי ליצור העתק מקומי של הקובץ ולהוסיפו לגליון השאלות הנוכחי."
+"This button is present both at top and the bottom of the page. Any and all "
+"changes made to any part of the set will be saved with one important "
+"exception: When editing the set for one or more students, you can choose to "
+"override the default value (defined for the set in general) by clicking on "
+"the checkbox and providing a value (or possibly leaving blank) and checking "
+"the override checkbox. If you do <strong>NOT</strong> check the checkbox, "
+"the override value will be discarded and the default value for the set will "
+"be used for the users currently being edited."
+msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:105
+msgid ""
+"This can computed from the answer sub scores above using the weights shown "
+"if they are modified.  Alternatively, enter the point score you want saved "
+"here (the above sub scores will be ignored)."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2005
+msgid ""
+"This configures if the single problem manual grader has inputs to enter "
+"problem scores as a percent, a point value, or both. Note, the problem score"
+" is always saved as a percent, so when using a point value, the problem "
+"score will be rounded to the nearest whole percent."
+msgstr ""
+
+#. (tag('b', maketext('Guest Login')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:72
+msgid ""
+"This course supports guest logins. Click %1 to log into this course as a "
+"guest."
+msgstr "הקורס הזה תומך במשתמשים אורחים. לחץ %1 כדי להתחבר לקורס בתור אורח."
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:58
+msgid ""
+"This determines if MathQuill answer blanks are enable for the user. This "
+"option is only present if MathQuill is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:63
+msgid ""
+"This determines if the MathView equation editor button will be appended to "
+"text answer blanks. his option is only present if MathView is enabled for "
+"the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:52
+msgid ""
+"This determines whether or not saved past answers are automatically filled "
+"in to the problem form when a student returns to a problem after having left"
+" the problem. This option is only visible if the user has the permission to "
+"show old answers."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:85
+msgid ""
+"This directory is accessible from the web. You can use it to store html "
+"documents or image documents that are used by the course. Do not store "
+"private information in this directory or in any subdirectory thereof. These "
+"documents can be linked to from within problems using the htmlLink macro."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:255
+msgid "This file is a template. You may use \"Save As\" to create a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:20
+msgid ""
+"This form can assign, unassign, and edit user data for a single achievement."
+"  You can assign the achievement to all current users or select which users "
+"to assign the achievement to and click Save.  You can unassign the "
+"achievement by unchecking a student's name (note all data will be deleted)."
+"  To unassign the achievement from all users, first select \"Allow "
+"unassign\" and then click the \"Unassign from All Users\" button. You can "
+"also toggle the earned status with the checkbox in the \"Earned\" column and"
+" edit the achievement counter for counting achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:19
+msgid ""
+"This gives the status and dates of the main set. Indvidual students may have"
+" different settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:51
+msgid "This homework set contains no problems."
+msgstr "גליון שיעורי הבית לא מכיל שאלות."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1231
+msgid "This homework set is closed."
+msgstr "גליון שיעורי הבית הוא סגור"
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1229
+msgid "This homework set is not yet open."
+msgstr "גליון שיעורי הבית הזה עדיין לא פתוח"
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:423
 msgid "This is a new (re-randomized) version of the problem."
 msgstr "הנה גרסה חדשה של השאלה."
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:580
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:109
 msgid ""
 "This is a timed test. You will have %quant(%1,hour) and %quant(%2,minute) to"
 " complete the test."
 msgstr "זה מבחן מוגבל בזמן. יש לך %quant(%1,שעה,שעות) and %quant(%2,דקה,דקות) לסיים את המבחן."
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:592
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:119
 msgid ""
 "This is a timed test. You will have "
 "%quant(%1,hour,hours,)%quant(%2,minute,minutes,) to complete the test."
 msgstr "זה מבחן מוגבל בזמן. יש לך %quant(%1,שעה,שעות) ו- %quant(%2,דקה,דקות) לסיים את המבחן."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:284
-msgid ""
-"This is the Achievement Editor.  It is used to edit the achievements "
-"available to students.  Please keep in mind the following facts: Achievments"
-" are displayed, and evaluated, in the order they are listed. The \"secret\" "
-"category creates achievements which are not visible to students until they "
-"are earned.  The \"level\" category is used for the achievements associated "
-"to a users level."
-msgstr "זהו עורך ההישגים.  הוא משמש לערוך את ההישגים שזמינים לסטודנטים. אנא זכור את העובדות הבאות: הישגים הם מוצגים, ומוערכים, בסדר שהם רשומים. הקטגוריה ה-\"סודית\" יוצרת הישגים שמוחבאים מהסטודנטים עד שהם הרוויחו אותם. הקטגורית ה-\"שלב\" משמשת להישגים שמקושרים לשלב המשתמש."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:481
-msgid ""
-"This is the classlist editor page, where you can view and edit the records "
-"of all the students currently enrolled in this course.  The top of the page "
-"contains forms which allow you to filter which students to view, sort your "
-"students in a chosen order, edit student records, give new passwords to "
-"students, import/export student records from/to external files, or "
-"add/delete students.  To use, please select the action you would like to "
-"perform, enter in the relevant information in the fields below, and hit the "
-"\"Take Action!\" button at the bottom of the form.  The bottom of the page "
-"contains a table containing the student usernames and their information. "
-"Clicking on the links in the column headers of the table will sort the table"
-" by the field it corresponds to. The Login Name fields contain checkboxes "
-"for selecting the user.  Clicking the link of the name itself will allow you"
-" to act as the selected user.  There is also an edit link following the name"
-" which will take you to a page where you can edit the selected user's "
-"information.  Clicking the emails will allow you to email the corresponding "
-"user.  Clicking the links in the entries in the assigned sets columns will "
-"take you to a page where you can view and reassign the sets for the selected"
-" user. "
-msgstr "זהו דף לעריכת רשימת הכיתה, בו ניתן לצפות ולערוך את הנתונים של כל הסטודנטים והמשתמשים שרשומים בקורס. החלק העליון של דף זה מכיל טפסים שמאפשרים לסנן את המשתמשים המוצגים, למיין את הרשימה המוצגת, לבחור אילו חשבונות לערוך, לבצע שינוי סיסמה לחשבונות נבחרות, לייבא ולייצא קבצי רישום, ולהוסיף/למחוק חשבונות מהקורס. יש לבחור את הלשונית של הפעולה הרצויה, להזין/לבחור את הנתונים הדרושים לפעולה בשדות מתחת לקו הלשוניות ואז ללחוץ על כפתור \"בצע את הפעולה!\" בתחתית הדף מופיעה טבלה שמכילה את שם ההתחברות ונתונים על כל חשבון. לחיצה על כותרת של עמודה שהיא קישורית תמיין את הטבלה לפי השדה המתאים. ליד שמות ההתחברות מופיעות תיבות סימון בעזרתן ניתן לבחור משתמשים לצורך ביצוע פעולה עבורם.\nלחיצה על שם ההתחברות שהוא קישורית תאפשר לך להתחזות כמשתמש הנבחר, למשל לראות את השאלות שלו ולשלוח תשובות לבדיקה לשאלות אלו. צלמית העפרון לאחר שם ההתחברות היא קישורית לדף בו ניתן לערוך את נתוני המשתמש. יש גם קישרות למשלוח הודעת דואר אלקטרוני למשתמש מסוים מתוך המערכת. הקישורית בעמודה של גליונות שהוקצו תפתח דף בו ניתן לערוך אילו גיליונות מוקצים למשתמש הנחבר ולשנות את מועדי ההגשה של המשתמש המסוים. "
-
-#: /opt/webwork/webwork2/conf/defaults.config:1810
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:81
+msgid ""
+"This is done by first entering the user as a student and then changing the "
+"permission level of the user. First edit the user by clicking on the pencil "
+"next to their name (or using the technique above for several users), then "
+"change their permssion level -- an entry blank at the far right of the "
+"screen, you may have to scroll to see it. The permission levels are"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:156
+msgid ""
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page if you wish to assign a homework set to all students or a large group "
+"of students (e.g. a section)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:161
+msgid ""
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:171
+msgid ""
+"This is done from the \"Hmwk Sets Editor\" page or the \"Instructor tools\" "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:71
+msgid ""
+"This is most easily done by importing a class list. The class list can be "
+"uploaded from your workstation to the server using the File Manager page. "
+"The class list must be a file ending in .lst and must have a specific <a "
+"href=\"http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files\">format</a>."
+" Once the file has been uploaded to the server the file will appear in the "
+"import action pop-up list (5th action). demoCourse.lst is available for most"
+" courses and adds the \"practice users\" which activate guest logins to the "
+"class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:23
+msgid ""
+"This is the administration course which is used to manage courses on this "
+"server.  Use the \"Admin Menu\" to select the desired action."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1996
+msgid ""
+"This is the default number of attempts a student must make before hints will"
+" be shown to the student. Set this to -1 to hide hints.  Note that this can "
+"be overridden with a per problem setting."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1712
 msgid ""
 "This is the default number of attempts before show me another becomes "
 "available to students.  It can be set to -1 to disable show me another by "
 "default."
 msgstr "ברירת המחדל למספר ההגשות שנדרשות לפני שהאפשרות ל- \"הראה לי שאלה דומה\" הופכת להיות זמינה לסטודנטים. ניתן להגדיר ערך מינוס אחד -1 על מנת שברירת המחדל תהיה לא לאפשר שימוש ב\"הראה לי שאלה דומה\"."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:456
-msgid ""
-"This is the homework sets editor page where you can view and edit the "
-"homework sets that exist in this course and the problems that they contain. "
-"The top of the page contains forms which allow you to filter which sets to "
-"display in the table, sort the sets in a chosen order, edit homework sets, "
-"publish homework sets, import/export sets from/to an external file, score "
-"sets, or create/delete sets.  To use, please select the action you would "
-"like to perform, enter in the relevant information in the fields below, and "
-"hit the \"Take Action!\" button at the bottom of the form.  The bottom of "
-"the page contains a table displaying the sets and several pieces of relevant"
-" information. The Edit Set Data field in the table contains checkboxes for "
-"selection and a link to the set data editing page.  The cells in the Edit "
-"Problems fields contain links which take you to a page where you can edit "
-"the containing problems, and the cells in the edit assigned users field "
-"contains links which take you to a page where you can edit what students the"
-" set is assigned to."
-msgstr "זהו הדף לעריכת הגיליונות, בו ניתן לצפות ולערוך את הגיליונות הקיימים בקורס ואת השאלות שהם מכילות. החלק העליון של דף מכיל טפסים שמאפשרים לסנן את הגיליונות המוצגות, למיין אותן, לערוך גיליונות, לפרסם ולהחביא גיליונות לייבא/לייצא גיליונות לקובץ הגדרות גיליון חיצוני, לנקד גיליונות, וכן לייצור ולמחוק גיליונות. לביצוע פעולה יש לבחור את הלשונית המתאימה ולמלא/לבחור את המידע הדרוש לביצוע הפעולה ואז ללחוץ על כפתור \"בצע את הפעולה!\" בתחתית הטופס. תחתית הדף מכילה טבלה שמציגה את הגיליונות ומספר נתונים חשובים לכל גיליון. בעמודה \"ערוך את הגדרות הגיליון\" מופיע תיבת סימון כדי לבחור מספר גיליונות לטובת ביצוע פעולה עליהן, וכן צלמית של עפרון שהיא קישורית לפתיחת העורך של ההגדרות הראשיות של הגיליון. הקישורית בעמודת \"ערוך שאלות\" פותחת את העורך המפורט של הגיליון בו ניתן לערוך את תכולת השאלות של הגיליון, וההגדרות המלאות של הגיליון ושל השאלות המוכלות.  הקישורית בעמודה \"ערוך משתמשים שהוקצאו\" פותחת דף בו ניתן לערוך לאילו משתמשים הגיליון מוקצה. "
-
-#: /opt/webwork/webwork2/conf/defaults.config:1699
+#: /opt/webwork/webwork2/conf/defaults.config:1601
 msgid ""
 "This is the number of achievement points given to each user for completing a"
 " problem."
 msgstr "זהו מספר נקודות ההישג שניתנות לכל משתמש עבור השלמת פתרון לשאלה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:166
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:150
 msgid ""
 "This is the only part of the score that is actually saved. This is computed "
 "from the answer sub scores above using the weights shown if they are "
@@ -7006,142 +9465,314 @@ msgid ""
 " scores will be ignored)."
 msgstr "זהו הציון היחיד שנשמר במסד הנתונים. הערך כאן מחושב על בסיס תתי-הציון שלמעלה לפי המשקלות שמופיעות אם תבצע שינוי בתת-הציון. לחילופין, ניתן לשנות את הערך כאן, ואז ערך זה תשמר (והמערכת תתעלם משינויים שבוצעו לתתי-הציונים  למעלה)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:388
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:19
+msgid "This is the standard entry point for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:92
 msgid ""
-"This is the past answer viewer.  Students can only see their answers, and "
-"they will not be able to see which parts are correct.  Instructors can view "
-"any users answers using the form below and the answers will be colored "
-"according to correctness."
-msgstr "זהו דף לתצוגת תשובות קודמות. לסטודנטים מוצג רק התשובות שלהם ללא חיווי אילו חלקים הן נכונים. המרצים יכולים לצפות בכל התשובות הקודמות שנשמרו במסד הנתונים בעזרת הטופס למטה. למרצים מופיע חיווי אילו תשובות הן נכונות. הערה: אם יש תשובות שהן רכיבי וקטורים או מטריצות אזי החיווי אינו מדויק."
+"This is where email messages and templates are saved. You can upload or "
+"download files in this directory if you wish to save the files for later."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2462
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:77
+msgid ""
+"This is where you edit the text of the problem template. Type Ctrl-Enter "
+"while this window has focus to re-render the problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:669
 msgid ""
 "This is your last submission.  If you say yes, then your answers will be "
 "final, and you will not be able to continue to work this test version."
 msgstr "זהו ההגשה האחרונה שמותר לך לשלוח למערכת. אם תאשר את ההגשה התשובות שנשלחות יהיו סופיות ולא תוכל להמשיך לעבוד על גרסה זו של המבחן."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2466
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:673
 msgid ""
 "This is your only submission.  If you say yes, then your answers will be "
 "final, and you will not be able to continue to work this test version."
 msgstr "זהו ההגשה היחידה שמותר לך לשלוח למערכת. אם תאשר את ההגשה התשובות שנשלחות יהיו סופיות ולא תוכל להמשיך לעבוד על גרסה זו של המבחן."
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3038
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:42
+msgid ""
+"This link gives details for many macros. It links to documentation embedded "
+"in the macro files themselves."
+msgstr ""
+
+#. ('PGMLLab/PGML-lab.pg')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:63
+msgid ""
+"This links to a WeBWorK \"problem\" which allows you to try out fragments of"
+" PGML code. This link will not be available if the file %1 is not located in"
+" the templates directory of the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:33
+msgid "This links to a list of problem authoring techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:39
+msgid "This links to a page describing Math Object usage."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:72
+msgid "This links to problem authoring information on the WeBWorK wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:46
+msgid ""
+"This may be Mathjax, images, or plainText. Only the options that are enabled"
+" for the course will be available to select. This option is only visible if "
+"there is more than one display mode enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:42
+msgid "This option shows all pg problems in the course directory structure."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:47
+msgid ""
+"This option shows all problems in set definition files that are located in "
+"the course directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:44
+msgid ""
+"This option shows all problems in sets that have been created in the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:20
+msgid ""
+"This page allows one to edit the contents of PG problem files as well as set"
+" headers and other files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:20
+msgid ""
+"This page allows users to change their password, email address, and display "
+"settings used in problems. Note that you can hide this page entirely for "
+"students by setting permission levels to login_proctor or higher for the "
+"permissions to change password, change e-mail address, and change display "
+"settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:20
+msgid ""
+"This page allows you to configure course settings such as permission levels,"
+" display modes allowed, default display mode, email feedback behavior, and "
+"much more."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:20
+msgid ""
+"This page displays a student's current achievement level and progress toward"
+" the next level, and lists the rewards and badges that the student has "
+"earned. If rewards have been earned, then the student may also redeem those "
+"rewards."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:26
+msgid ""
+"This page gives access to information about the student, independent of the "
+"homework sets assigned to them."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:20
+msgid ""
+"This page gives information about mass LTI grade updates, and allows you to "
+"trigger a grade update for all users and all sets, all sets for one user, "
+"all users for one set, or one user for one set.  When a user is selected, "
+"the sets drop down menu is updated to only allow selecting sets assigned the"
+" selected user.  Similarly when a set is selected, the user menu is updated "
+"to only allow selecting valid users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:20
+msgid ""
+"This page is a collection of tools to modify users and sets.  These tools "
+"are short cuts for common actions that allow selecting multiple users or "
+"sets to act on at once.  Because multiple users and sets can be acted on at "
+"the same time, it is often more efficient to use this page when modifying "
+"multiple items.  For example, after selecting several users and a set you "
+"can change the close date for all selected users for that set.  This page "
+"also gives access to \"View/Edit all sets for one user\", which can be used "
+"to access settings for all sets including test versions for that user."
+msgstr ""
+
+#. (q(table to save any changes.  Each student's name links to that student's
+#. problem and opens up the)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:20
+msgid ""
+"This page is for manually grading a problem for all assigned students.  The "
+"table of students shows their last answers, percent score, and feedback "
+"comment.  The \"Save\" button is located below the "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:20
+msgid ""
+"This page is used to browse problems that will be used to fill problem sets."
+" The first step is to choose which set you are working on. If you need to "
+"create a new problem set fill in the blank next to the \"Create a New Set in"
+" This Course\" button and then press the button. Then choose which set you "
+"want to work on in the drop down menu."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:20
+msgid ""
+"This page is useful for monitoring student progress on assignments. Student "
+"progress can either be viewed for a single set or for a single student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:20
+msgid ""
+"This page manages all of the homework sets (including quizzes/tests). The "
+"following allow editing directly of a single problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:20
+msgid ""
+"This page shows the student's current grades for all sets they are assigned "
+"to.  Only visible sets are shown to the student, while invisible set names "
+"are italic when viewed as an instructor.  Students can only see the per "
+"problem grades on open assignments."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3169
 msgid "This problem contains a video which must be viewed online."
 msgstr "השאלה מכילה וידיאו שיש לראות באופן מקוון."
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:602
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:631
 msgid "This problem has more than one part."
 msgstr "לשאלה זו יש יותר מחלק אחד."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2059
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2293
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1323
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1576
 msgid ""
 "This problem has open subproblems.  You can visit them by using the links to"
 " the left or visiting the set page."
 msgstr "לשאלה זו יש תתי שאלות פתוחות. ניתן לראותן על ידי שימוש בקישורים משמאל או על ידי ביקור בעמוד הגליון."
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem.html.ep:66
+msgid "This problem is not valid."
+msgstr ""
+
 #. ($prettyID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2619
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:399
 msgid "This problem uses the same source file as number %1."
 msgstr "שאלה זו משתמשת באותו קובץ מקור כמו שאלה %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:418
 msgid "This problem will not count towards your grade."
 msgstr "שאלה זו לא תחשב בציון שלך."
 
-#. ($EMAIL)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1109
+#. ($ur->email_address)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:1
 msgid "This sample mail would be sent to %1"
 msgstr "דוא\"ל דוגמה זה ישלח ל-%1"
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2088
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1399
 msgid ""
 "This score for this problem does not count for the score of problem %1 or "
 "for the set."
 msgstr "הציון על שאלה זו איננה תורמת לציון של שאלה %1 או לציון הגליון. "
 
-#. ($message_file,		$merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:167
+#. ($message_file,				$merge_file)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:127
 msgid ""
 "This scoring message is generated from [TMPL]/email/%1. It is merged with "
 "the file [Scoring]/%2. These files can be edited using the \"Email\" link "
 "and the \"File Manager\" link in the left margin."
 msgstr "הודעת הציונים מיוצרת מ-[TMPL]/email/%1. היא ממוזגת באמצעות הקובץ [Scoring]/%2. קבצים אלה ניתנים לעריכה בעזרת קישור ה-\"דוא\"ל\" וה-\"עורך הקבצים\" בצד שמאל."
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2215
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:155
 msgid "This set %1 is assigned to %2."
 msgstr "הגליון הזה, %1, הוקצה ל-%2."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2932
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:678
 msgid "This set doesn't contain any problems yet."
 msgstr "גליון זה עדיין לא מכיל שום שאלות."
 
-#. ($beginReducedScoringPeriod, $dueDate, $reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:334
+#. ($c->formatDateTime($reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:44
 msgid ""
 "This set had a reduced scoring period that started on %1 and ended on %2.  "
 "During that period all work counted for %3% of its value."
 msgstr "לגליון זה קיימת תקופת ניקוד מופחת שתחל ב-%1 ותסתיים ב-%2. בתקופה זו כל עבודה נספרת כ-%3%מערכה המקורי."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:78
 msgid ""
 "This set has a set-level proctor password to authorize logins. Enter the "
 "password below."
 msgstr "לגליון ישנה סיסמת משגיח ברמת-גליון, כדי לנטר הרשאות. הזמן את הסיסמה בתיבה שלעיל."
 
-#. (CGI::span({class=>$visiblityStateClass}, $visiblityStateText)
-# Context is "This set is visible" or "This set is hidden"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:532
-msgid "This set is %1"
-msgstr "הגליון הזה הוא %1"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:411
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:59
 msgid "This set is hidden from students."
 msgstr "גיליון זה מוחבא מהסטודנטים."
 
 #. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:330
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:40
 msgid ""
 "This set is in its reduced scoring period.  All work counts for %1% of its "
 "value."
 msgstr "הגליון הזה נמצא בתקופת הניקוד המופחת שלו. כל תשובה נספרת כ-%1% מהערך המקורי שלה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:65
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:51
+msgid "This set is not assigned to any students."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:57
 msgid "This set is visible to students."
 msgstr "גיליון זה זמין לסטודנטים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:190
-msgid "This set needs to be assigned to you before you can grade it."
-msgstr "יש להקצות אליך את הגליון הזה לפני שתוכל לנקד אותו."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:42
+msgid "This set or problem is not valid."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:158
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:164
 msgid ""
 "This set will be unavailable to students until they have earned a certain "
-"score on the sets specified in this field.  The sets should be written as a "
-"comma separated list.  The minimum score required on the sets is specified "
-"in the following field."
-msgstr "הגליון לא יהיה זמין לסטודנטים עד אשר הם ירוויחו ציון מסויים בגליונות שצוינו בשדה זה. הגליונות צריך להכתב כרשימה מופרדת בפסיקים. הציון המינימלי הנדרש בגליונות יצויין בשדה העוקבת."
+"score on the sets specified in this field. The sets should be written as a "
+"comma separated list. The minimum score required on the sets is specified in"
+" the following field."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:111
+msgid ""
+"This should be done cautiously. Once a student is deleted from a course "
+"their data is lost forever and cannot be recovered. They can be added to the"
+" course as a new student, but all of their homework set assignments and "
+"homework has been permanently deleted."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2007
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1962
 msgid "This source file does not exist!"
 msgstr "קובץ מקור זה לא קיים!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1961
 msgid "This source file is a directory!"
 msgstr "קובץ מקור זה הוא תיקייה!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1963
 msgid "This source file is not a plain file!"
 msgstr "קובץ המקור הוא לא קובץ ריק!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2005
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1960
 msgid "This source file is not readable!"
 msgstr "לא ניתן לקרוא קובץ מקור זה!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:358
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+msgid ""
+"This specifies the number of attempts before hints are shown to students. "
+"The value of -2 uses the default from course configuration. The value of -1 "
+"disables hints. Note that this will only have an effect if the problem has a"
+" hint."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
 msgid ""
 "This specifies the rerandomization period: the number of attempts before a "
 "new version of the problem is generated by changing the Seed value. The "
@@ -7149,134 +9780,175 @@ msgid ""
 "disables rerandomization."
 msgstr "זה מפרט את תקופת הרנדומיזציה מחדש: מספר הניסיונות לפני שנוצרת שאלה חדשה על ידי שינוי ערך הזרע. הערך -1 מסמל את ברירת המחדל של הקורס. הערך 0 מבטל את הרנדומיזציה מחדש."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:651
-msgid ""
-"This table lists the current attempts for this test/quiz, along with its "
-"status, score, start date, and close date. Click on the version link to "
-"access that version. "
-msgstr "טבלה זו מציגה את מספר ההגשות למבחן זה וגם את הציון, מועד ההתחלה והסיום. לחץ על הקישורית לגרסה מסוימת כי לפתוח אותה."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:626
-msgid "This test is closed."
-msgstr "המבחן הזה כבר נסגר."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:548
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:81
 msgid "This test requires a proctor password to continue."
 msgstr "מבחן זה מחייב הזנת סיסמת משגיח כדי להמשיך."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:600
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:126
 msgid "This test requires a proctor password to start."
 msgstr "מבחן זה מחייב הזנת סיסמת משגיח כדי להתחיל אותה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2248
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2323
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:45
+msgid "This will determine if the output is in one or two columns."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:21
 msgid "Time"
 msgstr "מועד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:249
 msgid "Time Interval for New Test Versions (min; 0=infty)"
 msgstr "מרווח זמנים לגרסאות מבחן חדשות (מינימום; 0=אינסוף)"
 
-#. ($elapsedTime,$allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:159
+msgid "Time Remaining"
+msgstr ""
+
+#. ($c->{elapsedTime}, sprintf('%.0f', 10 * ($c->{set}->due_date -
+#. $c->{set}->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:336
 msgid "Time taken on test: %1 min (%2 min allowed)."
 msgstr "זמן שנלקח לבחינה: %1 דקות (%2 דקות מורשות)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
 msgid "Timestamp"
 msgstr "חותמת זמן"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1610
+#: /opt/webwork/webwork2/conf/defaults.config:1512
 msgid "Timezone for the course"
 msgstr "איזור זמן של הקורס"
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:512
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:330
 msgid "To access this set you must score at least %1% on set %2."
 msgstr "על מנת לגשת לגליון זה, עליך לצבור ניקוד של לפחות %1% בגליון %2."
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:514
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:336
 msgid ""
 "To access this set you must score at least %1% on the following sets: %2."
 msgstr "כדי לגשת לגליון זה עליך לצבור ניקוד של לפחות %1% בגליונות הבאים: %2."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:53
 msgid ""
 "To add an additional instructor to the new course, specify user information "
 "below. The user ID may contain only numbers, letters, hyphens, periods "
 "(dots), commas,and underscores."
 msgstr "כדי להוסיף מרצה נוסף לקורס החדש, הזן את פרטי המשתמש למטה. שם ההתחברות User ID יכול  להכיל רק מספרים, אותיות באנגלית, והתווים: מקף, נקודה, פסיק, וקו תחתון (underscore)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:42
 msgid ""
 "To add the WeBWorK administrators to the new course (as administrators) "
 "check the box below."
 msgstr "על מנת להוסיף את מנהלי ה-WeBWorK לקורס החדש (כמנהלים), סמן את התיבה שלהלן."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:239
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:118
+msgid ""
+"To assign one or more sets to an individual student click in the column "
+"\"Assigned Sets\" in the student's row. This will take you to a page where "
+"you can assign and unassign homework sets and change the due dates for "
+"homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:79
 msgid ""
 "To change status (scores or grades) for this student for one set, click on "
 "the individual set link."
 msgstr "על מנת לשנות סטטוס (נקודות או ציונים) לסטודנט זה עבור גליון אחד, לחץ על הקישור לגליון הנ\"ל."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:621
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:106
+msgid ""
+"To copy the templates and html folders from an existing course, select the "
+"course below."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:102
 msgid ""
-"To copy problem templates from an existing course, select the course below."
-msgstr "על מנת להעתיק תבניות מקורס קיים, בחר בקורס להלן."
+"To drop a student or students, select them for editing as described above "
+"and then set the pop-up list to enrolled,drop, or audit. Dropped students "
+"cannot log in to the course, are not assigned new homework sets and are not "
+"sent e-mail. They can be re-enrolled simply by changing their status back to"
+" enrolled. No data is lost, any homework sets assigned before they were "
+"dropped are restored unchanged."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2200
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:143
 msgid ""
 "To edit a specific student version of this set, edit (all of) her/his "
 "assigned sets."
 msgstr "על מנת לערוך גרסה מסוימת של סטודנט לגליון הנ\"ל, ערוך (את כל) הגליונות המוקצים לו/ה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:376
-msgid ""
-"To edit this text you must first make a copy of this file using the "
-"'NewVersion' action below."
-msgstr "כדי לערוך את הטקסט עליך להכין ראשית עותק של הקובץ על ידי שימוש בפעולת 'גרסה חדשה' שלהלן."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:381
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:29
 msgid ""
-"To edit this text you must use the 'NewVersion' action below to save it to "
-"another file."
-msgstr "כדי לערוך את הטקסט הנ\"ל עליך להשתמש בפעולת 'גרסה חדשה' שלהלן כדי לשמור אותו לקובץ אחר."
+"To perform an action select the desired action tab and click the submit "
+"button."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1343
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:90
 msgid "To this Problem"
 msgstr "עבור שאלה זו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:143
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:69
+msgid ""
+"To use the Email merge feature, upload a CSV with calculated grades to the "
+"scoring directory using the \"File Manager\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:767
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:58
+msgid "Today"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:33
+msgid "Toggle each of the options to include or not include in the output."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:522
+msgid "Top Score"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:118
+msgid "Top level of author information on the wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:114
+msgid "Total Points"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:18
 msgid "Total Points:"
 msgstr "סה\"כ נקודות:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:90
 msgid "Totals"
 msgstr "סה\"כ"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:290
 msgid "Totals only (not problem scores)"
 msgstr "סה\"כ בלבד (ללא ניקודי שאלות)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:291
 msgid "Totals only, only after answer date"
 msgstr "סה\"כ בלבד, רק לאחר תאריך התשובות."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:236
 msgid "Transfer"
 msgstr "העבר"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:284
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:22
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:35
 msgid "True"
 msgstr "נכון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1279
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:245
 msgid "Try it"
 msgstr "נסה את השאלה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:26
 msgid "Tunic of Extension"
 msgstr "כתונת ההארכה"
 
@@ -7284,209 +9956,340 @@ msgstr "כתונת ההארכה"
 msgid "Two Columns"
 msgstr "שתי עמודות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1470
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:30
 msgid "Type"
 msgstr "סוג"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2325
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:84
+msgid "Type:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:23
 msgid "URI"
 msgstr "URI"
 
 #. ($achievementName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:297
 msgid "Unable to change the evaluator for set %1. Unknown error."
 msgstr "לא ניתן לשנות את המעריך של גליון %1. שגיאה לא מזוהה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:819
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1084
+msgid "Unable to change the hardcopy header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1070
+msgid "Unable to change the set header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{fullSetID}, $c->{prettyProblemNumber})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1110
+msgid ""
+"Unable to change the source file path for set %1, problem %2. Unknown error."
+msgstr ""
+
+#. ($c->shortPath($delFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1246
+msgid "Unable to delete backup file \"%1\"."
+msgstr ""
+
+#. ($formatBackupTime)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:571
+msgid "Unable to delete backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:888
+msgid "Unable to make \"%1\" the hardcopy header for %2."
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:860
+msgid "Unable to make \"%1\" the set header for %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:693
 msgid "Unable to obtain error messages from within the PG question."
 msgstr "לא צלחה השגת הודעות השגיאה מתוך שאלת ה-PG."
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:384
-msgid "Unable to write to '%1': %2"
-msgstr "לא ניתן לרשום ל'%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:275
+msgid "Unable to open a temporary file at the given location."
+msgstr ""
+
+#. ($c->shortPath($backupFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1233
+msgid "Unable to read backup file \"%1\"."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:636
+msgid "Unable to write to \"%1\": %2"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2613
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:15
 msgid "Unarchive"
 msgstr "חלץ מקבצי ארכיון"
 
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2596
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:4
 msgid "Unarchive %1 to course:"
 msgstr "חלץ %1 מהארכיון אל הקורס:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2581
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:40
 msgid "Unarchive Course"
 msgstr "חלץ את הקורס מקובץ הארכיון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2675
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:17
+msgid "Unarchive Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:25
+msgid "Unarchive Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1306
 msgid "Unarchive Next Course"
 msgstr "חלץ מקובץ ארכיון את הקורס הבא"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:214
-msgid "Unassign All Sets"
-msgstr "בטל את ההקצאה של כל הגיליונות"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:281
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:239
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:97
 msgid "Unassign from All Users"
 msgstr "בטל הקצאה מכל המשתמשים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:61
 msgid "Unassign selected sets from selected users"
 msgstr "בטל הקצאה של הגליונות הנבחרים מהמשתמשים הנבחרים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:58
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:57
 msgid ""
-"Unassignments were not done.  You need to both click to \"Allow unassign\" "
-"and click on the Unassign button."
-msgstr "ביטול הקצאות לא בוצעה. עליך ללחוץ הן על \"אפשר ביטול הקצאה\" והן על כפתור ביטול הקצאה."
+"Unassignments were not done.  You need to select \"Allow unassign\" and then"
+" click on the Unassign button."
+msgstr ""
 
 #. ($unattempted, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1047
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:44
 msgid "Unattempted: %1/%2"
 msgstr "לא נוסה: %1/%2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:53
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:37
 msgid "Unclassified Problems"
 msgstr "שאלות לא מסווגות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:242
 msgid "Ungraded"
 msgstr "לא נוקדו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3723
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3765
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:58
 msgid "Unhide Courses"
 msgstr "הפוך קורסים לגלויים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1465
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1151
+msgid "Unkown saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:28
 msgid ""
-"Unlock an additional version of a Gateway Test.  If used before the close "
-"date of the Gateway Test this will allow you to generate a new version of "
-"the test."
-msgstr "שחרר גרסה נוספת של מבחן המחסום. אם מופעל לפני מועד סגירת המבחן, יתאפשר לך ליצור גרסה חדשה של המבחן."
+"Unlock an additional version of a test.  If used before the close date of "
+"the test this will allow you to generate a new version of the test."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:164
-msgid "Unpack"
-msgstr "לפרוק"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:47
+msgid "Unpack Archive"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:113
 msgid "Unpack archives automatically"
 msgstr "לפרוק ארכיונים אוטומטית"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2709
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:15
 msgid "Unselect all courses"
 msgstr "בטל בחירה לכל הקורסים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:130
-msgid "Update"
-msgstr "עדכון"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:63
 msgid "Update Display"
 msgstr "עדכן תצוגה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:930
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:84
+msgid "Update Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:27
+msgid "Update Interval"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:102
 msgid "Update Menus"
 msgstr "עדכן תפריטים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:729
-msgid "Update settings and refresh page"
-msgstr "עדכן הגדרות ורענן את הדף"
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:51
+msgid "Update aborted. Invalid set %1."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:47
+msgid "Update aborted. Invalid user %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:67
+msgid "Update set:"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2695
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:8
 msgid "Update the checked directories?"
 msgstr "לעדכן את התיקיות המסומנות?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3544
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:50
+msgid "Update user:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1908
 msgid "Updated location description."
 msgstr "תיאור מיקום מעודכן"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2739
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2917
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:40
 msgid "Upgrade"
 msgstr "שדרוג"
 
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
 msgid "Upgrade %1"
 msgstr "שדרג את %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1327
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2278
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:97
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:79
 msgid "Upgrade Course Tables"
 msgstr "שדרג את טבלאות הקורס"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2693
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2761
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:382
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:42
 msgid "Upgrade Courses"
 msgstr "שדרג קורסים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3010
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:17
+msgid "Upgrade Courses Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:43
+msgid "Upgrade courses from a previous version of WeBWorK."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1582
 msgid "Upgrade process completed"
 msgstr "תהליך השדרוג הושלם"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:388
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:65
 msgid "Upload"
 msgstr "העלה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2441
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:72
+msgid ""
+"Upload, download and delete text files, including scoring spread sheets, set"
+" definition files, class list spread sheets, and \"PG\" problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:292
 msgid "Use Default Header File"
 msgstr "השתמש בקובץ קידומת לפי ברירת המחדל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:325
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:127
 msgid "Use Equation Editor?"
 msgstr "השתמש בעורך המשוואות?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:204
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:20
 msgid "Use Reward"
 msgstr "הפעל את הפרס"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2720
-msgid "Use System Default"
-msgstr "השתמש בברירת המחדל של המערכת"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:516
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:27
 msgid "Use browser back button to return from preview mode."
 msgstr "יש להשתמש בכפתור החזרה לאחור של הדפדפן כדי לצאת מתצוגה המקדימה."
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:506
+#. (tag('b', $c->{achievementID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:16
 msgid "Use in achievement %1"
 msgstr "השתמש בהישג %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:526
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:23
 msgid "Use in new achievement:"
 msgstr "השתמש בהישג חדש:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:149
 msgid "Use live equation rendering?"
 msgstr "הפעל תצוגת נוסחאות בזמן אמת?"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2028
+#: /opt/webwork/webwork2/conf/defaults.config:1929
 msgid "Use log base 10 instead of base <i>e</i>"
 msgstr "השתמש בלוגריתם בבסיס 10 במקום בבסיס <i>e</i>"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2034
+#: /opt/webwork/webwork2/conf/defaults.config:1935
 msgid "Use older answer checkers"
 msgstr "השתמש בבודקי תשובות הישנים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:234
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:123
+msgid ""
+"Use the \"Create\" and \"Delete\" actions to create or delete achievements. "
+"Note that deleting an achievement will delete all data associated to the "
+"achievement and cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:35
+msgid ""
+"Use the \"Merge file\" drop down menu to select which merge file to use, or "
+"select \"None\" to not use any merge file.  When a merge file is selected, "
+"the data for active students will be displayed above the \"Email Body\".  "
+"This will show you the structure of the merge file and the column variables "
+"associated with each column.  Data that is longer than 7 characters will be "
+"truncated, and the data can be scrolled up and down to see all rows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:28
+msgid ""
+"Use the \"Users\" and \"Sets\" forms to select which users and sets to act "
+"on.  Multiple items can be selected using ctrl-click or shift-click.  The "
+"action buttons are grouped into three categories.  The first is a set of "
+"actions that act on the selected users, the second is a set of actions that "
+"act on the selected sets, and the third is a set of actions for acting on a "
+"combination of sets and users.  If an invalid number of users or sets are "
+"selected, the action will not be preformed, and an error message will be "
+"placed on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:25
+msgid ""
+"Use the editor to edit the evaluator and the action form at the bottom to "
+"save the evaluator. You can either overwrite the current evaluator file or "
+"save as a new evaluator file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:15
 msgid ""
 "Use the interface below to quickly access commonly-used instructor tools, or"
 " select a tool from the list to the left."
 msgstr "השתמש בממשק שלהלן על מנת לגשת בקלות לכלי מורה נפוצים בשימוש, או בחר כלי מהרשימה שמשמאל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:332
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:26
+msgid ""
+"Use the options in the second box to pick a collection of problems decribed "
+"below. In each case, clicking \"View Problems\" will render a fixed number "
+"of problems (default of 20). After problems are shown, there will be options"
+" to show the next/previous batch of problems, add all problems to the target"
+" set (set at the top of the page) or clear the curent batch of problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:27
 msgid ""
 "Use this form to ask your instructor a question, to report a problem with "
 "the WeBWorK system, or to report an error in a problem you are attempting. "
@@ -7494,73 +10297,103 @@ msgid ""
 "system will be included."
 msgstr "ניתן להשתמש בטופס זה על מנת לשלוח שאלה אל צוות התמיכה, כדי לדווח על תקלה עם המערכת, או כדי לדווח על תקלה בשאלה הנוכחית. בנוסף למכתב שתזין לטופס נשלחים נתוני עזר נוספים על המצב של המערכת ו/או השאלה ממנה פתחת את הטופס. "
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:29
+msgid "Use this page to change your password."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:20
+msgid ""
+"Use this page to send emails to active (enrolled or auditing) students.  "
+"Emails can be sent to all active students or selected students.  Use the "
+"\"Students\" form to sort, filter, or format how the user name is displayed."
+"  Click \"Change Display Settings\" to apply any changes.  Use control-click"
+" or shift-click to select multiple students to email."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:67
+msgid ""
+"Used for \"counting\" achievements, which sets the value a counter must "
+"reach in order to earn the achievement. For example this is used counting "
+"the number of completed problems."
+msgstr ""
+
+#. (param('user')
+#. (param('effectiveUser')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:7
+msgid "User \"%1\" not found."
+msgstr ""
+
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:324
 msgid ""
-"User '%1' will not be copied from admin course as it is the initial "
+"User \"%1\" will not be copied from admin course as it is the initial "
 "instructor."
-msgstr "משתמש '%1' לא יועתק מקורס הניהול שכן זהו המורה שביקשת להוסיף."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:557
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:34
+msgid "User %1 not found."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:217
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:64
 msgid "User ID"
 msgstr "מזהה משתמש"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:298
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:230
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:28
 msgid "User Settings"
 msgstr "הגדרות משתמש"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:490
-msgid "User Value"
-msgstr "ערך למשתמש"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:52
-msgid "User has been assigned to all current sets."
-msgstr "כל הגיליונות הפעילות הוקצו אל המשתמש"
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:17
+msgid "User Settings Help"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:58
-msgid "User has been unassigned from all sets."
-msgstr "בוטלו כל ההקצאות של גיליונות אל המשתמש."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:576
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:13
+msgid "User overrides"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:247
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:62
 msgid "User's name is:"
 msgstr "שם המשתמש הוא:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:68
-msgid "User's sets have been reassigned."
-msgstr "הגיליונות של המשתמש הוקצאו מחדש."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:60
 msgid "User's username is:"
 msgstr "שם המשתמש הוא:"
 
 #. ($user, $setID, $j)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1077
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
 msgid ""
 "UserProblem missing for user=%1 set=%2 problem=%3. This may indicate "
 "database corruption."
 msgstr "שאלת משתמש חסרה עבור משתמש=%1 גליון=%2 שאלה=%3. זה עשוי להיות סימן של מסד נתונים פגום."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:51
 msgid "Username"
 msgstr "שם משתמש"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:499
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:126
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:272
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:9
 msgid "Users"
 msgstr "משתמשים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:339
 msgid "Users Assigned to Set %2"
 msgstr "משתמשים אליהם הוקצה גליון %2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2077
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:17
+msgid "Users Assigned to Set Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:65
 msgid "Users List"
 msgstr "רשימת משתמשים"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1925
+#: /opt/webwork/webwork2/conf/defaults.config:1827
 msgid ""
 "Users at this level and higher are allowed to change display settings used "
 "in pg problems.Note that if it is expected that there will be students that "
@@ -7569,31 +10402,31 @@ msgid ""
 "those students may need to disable MathQuill."
 msgstr "משתמשים מרמת הרשאה זו ומעלה יכולים לשנות את ההגדרות לתצוגת השאלות. אם MathQuill מופעל בקורס ויש סטודנטים בעלי מגבלות ראייה בקורס אין להגדיר רמה גבוהה יותר משל סטודנט student כי ייתכן שסטודנטים בעלי מגבלות ראייה ירצו לבטל את השימוש ב- MathQuill."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1915
+#: /opt/webwork/webwork2/conf/defaults.config:1817
 msgid ""
 "Users at this level and higher are allowed to change their e-mail address. "
 "Normally guest users are not allowed to change the e-mail address since it "
 "does not make sense to send e-mail to anonymous accounts."
 msgstr "משתמש ברמה זו ואילך מורשים לשנות את כתובת הדוא\"ל שלהם. בדרך כלל, משתמשים אורחים לא מורשים לשנות את כתובת הדוא\"ל שלהם שכן זה לא יהיה הגיוני לשלוח דואר למשתמשים אנונימיים."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1879
+#: /opt/webwork/webwork2/conf/defaults.config:1781
 msgid ""
 "Users at this level and higher are allowed to change their password. "
 "Normally guest users are not allowed to change their password."
 msgstr "משתמשים ברמה זו ואילך מורשים לשנות את סיסמתם. באופן כללי, משתמשים אורחים לא מורשים לשנות את סיסמתם."
 
-#. ($names{$primary}, $names{$secondary}, $names{$ternary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:924
+#. ($c->maketext(FIELD_PROPERTIES()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:316
 msgid "Users sorted by %1, then by %2, then by %3"
 msgstr "משתמשים מוינו לפי %1, לאחר מכן לפי %2, ואז לפי %3"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1906
+#: /opt/webwork/webwork2/conf/defaults.config:1808
 msgid ""
 "Users with at least this permission level get a link in the left panel for "
 "reporting bugs to the bug tracking system at bugs.webwork.maa.org."
 msgstr "משתמשים בילי רמת הרשאה זו ומעלה מקבלים קישור בתפריט הראשית המאפשר דיווח על באגים אל מערכת ניטור הבאגים באתר bugs.webwork.maa.org."
 
-#: /opt/webwork/webwork2/conf/defaults.config:2140
+#: /opt/webwork/webwork2/conf/defaults.config:2051
 msgid ""
 "Users with this permssion level or greater will automatically be sent "
 "feedback from students (generated when they use the \"Contact instructor\" "
@@ -7602,157 +10435,225 @@ msgid ""
 "permission level to \"nobody\"."
 msgstr "משתמשים עם רמת הרשאות זו או גבוהה יותר יקבלו משוב מסטודנטים באופן אוטומטי (נוצר כשהסטודנטים לוחצים על כפתור \"צור קשר עם המורה\" שנמצא בכל דף שאלה). בנוסף, הודעת המשוב תישלח לכתובות למטה. כדי לשלוח רק לכתובות למטה, בחר את רמת ההרשאות \"אף אחד\"."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1348
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:193
 msgid "Uses Math Objects"
 msgstr "השאלה משתמשת ב- MathObjects"
 
-#. ($default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:197
-msgid "Using contents of the default message %1 instead."
-msgstr "משתמש בתוכן של הודעת ברירת המחדל %1 במקום."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1239
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:18
 msgid "Using what display mode?"
 msgstr "באיזה מצב תצוגה?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:6
 msgid "Using what seed?"
 msgstr "עם איזה זרע להגרלות?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:19
+msgid "Using which hardcopy format?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:49
+msgid "Using which hardcopy theme?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:31
+msgid ""
+"Usually means students must demonstrate understanding of facts. This is more"
+" than regurgitating the fact. We use this category for simple and direct "
+"applications of algorithms the student has studied. There should be no "
+"judgement involved in choosing the method. This would include a simple "
+"application of a rule for differentiation (e.g., can combine rules for sums "
+"and constant multiples with one more advanced rule) or for integrals."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Value"
 msgstr "ערך"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1747
+#: /opt/webwork/webwork2/conf/defaults.config:1649
 msgid "Value of work done in Reduced Scoring Period"
 msgstr "ערך יחסית של ההגשות בתקופת הניקוד המופחת."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:687
-msgid "Variable Documentation:"
-msgstr "תיעוד משתנה"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config/config_help.html.ep:20
+msgid "Variable Documentation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:115
+msgid "Version"
+msgstr ""
 
 #. ($ver->{version})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:679
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:173
 msgid "Version %1"
 msgstr "גרסה %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:159
 msgid "Versions"
 msgstr "גרסאות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:43
 msgid "Versions of a set can only be edited for one user at a time."
 msgstr "גרסאות של גליון ניתנות לעריכה עבור משתמש אחד בלבד כל פעם."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:128
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2419
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2756
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:528
 msgid "View"
 msgstr "הצג"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1000
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:488
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:523
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:681
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:948
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:6
 msgid "View Problems"
 msgstr "הצג את השאלות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:276
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:57
+msgid "View details of student perofrmance either by individual or by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:86
 msgid "View equations as"
 msgstr "הצג משוואות כ"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:283
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:18
 msgid "View statistics by set"
 msgstr "הצג סטטיסטיקה לפי גליון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:19
 msgid "View statistics by student"
 msgstr "הצג סטטיסטיקה לפי סטודנט"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:55
+msgid ""
+"View statistics of students' performance on homework either by individual or"
+" by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:14
 msgid "View student progress by set"
 msgstr "הצג את ההתקדמות של כל הסטודנטים עבור גליון מסוים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:303
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:15
 msgid "View student progress by student"
 msgstr "הצג את ההתקדמות של סטודנט מסוים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:65
 msgid "View/Edit"
 msgstr "הצג/ערוך"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:224
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:90
-msgid "Viewing temporary file:"
-msgstr "מציג קובץ זמני:"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:104
+msgid "View/Reload"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:766
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:790
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:31
+msgid "View/access current and archived courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:146
+msgid "Viewing Problems in a New Window"
+msgstr ""
+
+#. ($c->{problem}->source_file)
+#. ($screenSetHeader)
+#. ($course_info_path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:81
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:109
+msgid "Viewing temporary file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:25
 msgid "Visibility"
 msgstr "זמינים לסטודנטים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:915
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:7
 msgid "Visible"
 msgstr "זמין לסטודנטים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:622
 msgid "Visible sets were selected for export."
 msgstr "הגליונות שהופיעו ברשימה נבחרו לייצוא"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
 msgid "Visible to Students"
 msgstr "זמין לסטודנטים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2269
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:844
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "Warning"
 msgstr "אזהרה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2319
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:13
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:117
 msgid "Warning messages"
 msgstr "הודעות אזהרה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1039
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:259
+msgid "Warning messages:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all set-related data and is not undoable!"
 msgstr "אזהרה: מחיקה מוחקת לגמרי את כל נתוני הגיליונות ואין דרך לחזור לאחורה לאחר ביצוע הפעולה!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1035
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all user-related data and is not undoable!"
 msgstr "זהירות: מחיקה מוחקת לחלוטין את כל המידע בנוגע למשתמשים והמשימות שלהם והיא פעולה בלתי הפיכה!"
 
-#. ($problem_desc , CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1397
+#. ($problem_desc,				$c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1194
 msgid "Warnings encountered while processing %1. Error text: %2"
 msgstr "אזהרות שעלו במהלך עיבוד %1. הודעת שגיאה: %2"
 
-#. ($copyright_years, $theme, $ww_version, $pg_version)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1261
-msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4 |"
-msgstr "WeBWorK &copy; %1 | תבנית עיצוב: %2 | גרסת ווב-וורק: %3 | גרסת PG %4 |"
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:39
+msgid ""
+"We use this for carrying out more complicated algorithms, such as "
+"derivatives using both the product and chain rule or integrals which involve"
+" say both a substitution and parts."
+msgstr ""
+
+#. ($ce->{WW_COPYRIGHT_YEARS} || '1996-2023',              $ce->{defaultTheme}
+#. || 'unknown -- set defaultTheme in localOverides.conf',
+#. $ce->{WW_VERSION}         || 'unknown -- set WW_VERSION in VERSION',
+#. $ce->{PG_VERSION}         || 'unknown -- set PG_VERSION in ../pg/VERSION')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:9
+msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2227
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:3
 msgid "WeBWorK Error"
 msgstr "שגיאת WeBWorK"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:3
 msgid "WeBWorK Warnings"
 msgstr "אזהרות WeBWorK"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1549
+#: /opt/webwork/webwork2/conf/defaults.config:1451
 msgid ""
 "WeBWorK currently has translations for the languages listed in the course "
 "configuration."
 msgstr "כיום יש לווב-וורק תרגומים, אולי חלקיים, אל השפות הרשימה שמופיעה בעורך של הגדרות הקורס."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:20
+msgid ""
+"WeBWorK does not have a full featured scoring ability. We leave that to your"
+" favorite spreadsheet application."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:38
+msgid ""
+"WeBWorK expects many files to be in certain locations.  The following "
+"describe this. Note that by default the File Manager shows the \"templates\""
+" directory.  Other directories mentioned below are at the same level and "
+"need to be accessed by going up a directory by clicking the \"^\" button "
+"above the file list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:6
 msgid ""
 "WeBWorK has encountered a software error while attempting to process this "
 "problem. It is likely that there is an error in the problem itself. If you "
@@ -7761,7 +10662,7 @@ msgid ""
 " more information."
 msgstr "WeBWorK נתקלה שגיאת תוכנה בזמן הניסיון לעבד את שאלה זו. סביר להניח שיש שגיאה בשאלה עצמה. אם אתה סטודנט, דווח על הודעת שגיאה זו למרצה שלך כדי שיתקן את השאלה. אם אתה המרצה, אנא פנה לפלט השגיאה למטה למידע נוסף."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:6
 msgid ""
 "WeBWorK has encountered warnings while processing your request. If this "
 "occured when viewing a problem, it was likely caused by an error or "
@@ -7771,19 +10672,19 @@ msgid ""
 " warning output below for more information."
 msgstr "WeBWorK נתקלה בהזהרות בזמן עיבוד הבקשה שלך. אם זה קרה בזמן צפייה בשאלה, זה כנראה נגרם בגלל שגיאה או דו-משמעות בשאלה. אם לא, זה עשוי להעיד על בעיה במערכת ה-WeBWorK עצמה. אם אתה סטודנט, דווח על הודעת שגיאה זו למרצה שלך כדי שיתקן את השאלה. אם אתה המרצה, אנא פנה לפלט השגיאה למטה למידע נוסף."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:577
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:558
 msgid ""
 "WeBWorK was unable to generate a different version of this problem.  Close "
 "this tab, and return to the original problem."
 msgstr "המערכת לא יכלה לייצר גרסה שונה של שאלה זו. יש לסגור את העמוד ולחזור לשאלה המקורית."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:367
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:29
 msgid ""
 "WeBWorK was unable to generate a paper copy of this homework set.  Please "
 "inform your instructor."
 msgstr "המערכת לא יכלה לייצר קובץ להדפסה של הגיליון הזה. יש לדווח על כך לצוות התמיכה."
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:78
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
 msgid ""
 "WeBWorK will automatically create users when logging in via the LMS for the "
 "first time. If this flag is enabled then it will also keep the user account "
@@ -7793,36 +10694,44 @@ msgid ""
 "next time the user logs in."
 msgstr "מערכת הווב-וורק תייצר אוטומטית חשבונות בקורס עבור משתמשים הנכנסים לראשונה לקורס דרך מערכת הלימוד. אם אפשרות זו מוגדרת כנכונה אז המערכת תמשיך לעדכן נתונים מסוימים של המשתמש (שם פרטי, שם משפחה, קבוצה, וקבוצה תרגול) בכל כניסה של המשתמש ממערכת הלימוד, לפי הצורך. אם תתבצע שינוי בנתונים אלו במערכת הלימוד השינויים יעודכנו בווב-וורק בכניסה הבאה של הסטודנט. אבל, במצב כזה - שינויים שמוכנסים ידנית לווב-וורק בשדות אלו ידרסו על ידי נתוני מערכת הלימוד בכניסה הבאה של הסטודנט."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:370
 msgid "Weight"
 msgstr "משקל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:6
 msgid "Welcome to WeBWorK!"
 msgstr "ברוכים הבאים ל- WeBWorK!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:24
+msgid ""
+"What WeBWorK does have is good support for summarizing the scores on WeBWorK"
+" homework sets and tests and exporting them in a form (.csv) which any "
+"spreadsheet can use. WeBWorK reports all of the homework grades with options"
+" shown below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:27
 msgid "What could be inside?"
 msgstr "מה יכול להיות בפנים?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:715
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:17
 msgid "What field should filtered users match on?"
 msgstr "לפי איזה שדה לבדוק את תיאום המשתמשים?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
 msgid ""
 "When a student has more attempts than is specified here they will be able to"
 " view another version of this problem.  If set to -1 the feature is disabled"
 " and if set to -2 the course default is used."
 msgstr "כאשר לסטודנט יש יותר נסיונות משמצויין כאן, הם יוכלו לראות גרסה אחרת של השאלה. אם מוזן מינוס אחד -1 האופציה מבוטלת, ואם מוזן מינוס שתיים -2 ייעשה שימוש בברירת המחדל של הקורס"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1899
+#: /opt/webwork/webwork2/conf/defaults.config:1801
 msgid ""
 "When acting as a student, this permission level and higher can submit "
 "answers for that student."
 msgstr "רמת ההרשאה הזאת וגבוהות ממנה רשאים להגיש תשובות עבור סטודנט כאשר הם מתחזים בשמו."
 
-#: /opt/webwork/webwork2/conf/defaults.config:2071
+#: /opt/webwork/webwork2/conf/defaults.config:1972
 msgid ""
 "When numerical answers are checked, most test if the student's answer is "
 "close enough to the programmed answer be computing the error as a percentage"
@@ -7831,7 +10740,7 @@ msgid ""
 "0.1 means 0.1 percent error is allowed.</p>"
 msgstr "בשאלות נומריות, השאלות בדרך כלל בודקות שתשובות הסטודנט מספיק קרובה לתשובה הנכונה כאשר הסטייה מחושבת באחוזים של התשובה הנכונה. ההגדרה הזאת קובעת את המרחק המקסימלי באחוזים של תשובת הסטודנט מהתשובה הנכונה כדי שעדיין תיחשב כנכונה. \n<p>למשל הערך 0.1 מאפשר סטייה של עד 0.1 אחוזים של התשובה הנכונה.</p>"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2098
+#: /opt/webwork/webwork2/conf/defaults.config:2019
 msgid ""
 "When students click the <em>Email Instructor</em> button to send feedback, "
 "WeBWorK fills in the subject line.  Here you can set the subject line.  In "
@@ -7841,14 +10750,32 @@ msgid ""
 "recitation</li><li>%% = literal percent sign</li></ul>"
 msgstr "כשסטודנטים לוחצים על כפתור  <em>למשלוח הודעה לצוות</em>, המערכת מכינה את כותרת המכתב. כאן ניתן להגדיר את תכולת הכותרת.   ניתן לבקש שהכותרת תכלול פרטי המידע הבאים בעזרת שימוש בסימונים הרשומים.<p><ul><li>%c =  course ID = שם הקורס</li><li>%u = user ID = שם ההתחברות של המשתמש</li><li>%s = set ID = שם הגיליון</li><li>%p = problem ID = מספר השאלה</li><li>%x = section = קבוצה</li><li>%r = recitation = קבוצת תרגול</li><li>%% = literal percent sign = תו האחוזים הרגיל</li></ul>"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1638
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:35
+msgid ""
+"When the class is very large not all students will be displayed. Using the "
+"first action on this page you can show only the students from a given "
+"recitation or from a given section, or only students whose login or last "
+"name fits a pattern match. The second action will sort the students "
+"currently being displayed. You can also sort the displayed students by "
+"clicking on the active links at the top of each column."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:56
+msgid ""
+"When the message is ready to send, click \"Send Email\". This will queue the"
+" email to be sent, which can take several minutes depending on the number of"
+" students selected.  You will be notified by email once all the emails have "
+"been sent."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1540
 msgid ""
 "When this is on students will see a line on the Grades page which has their "
 "total cumulative homework score.  This score includes all sets assigned to "
 "the student."
 msgstr "כאשר אפשרות זו נבחרת, הסטודנט יראה שורה בעמוד הציונים עם הציון הכולל שלהם בשיעורי הבית. הציון יכלול את כל הגליונות שמוקצים לסטודנט."
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:90
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
 msgid ""
 "When this is true, then when a user enters WeBWorK from an external tool "
 "link in the LMS, the bottom of the screen will display the data that the LMS"
@@ -7856,23 +10783,56 @@ msgid ""
 "different LMS systems have different parameters."
 msgstr "כאשר הגדרה זו מוגדרת כנכונה, אז בזמן ההתחברות בעזרת LTI אל מערכת הווב-וורק ממערכת הלימוד LMS, בדף שנוצר תוצגו הנתונים שמערכת הלימוד שלחה לשרת הווב-וורק. נתונים אלו יכולים לסייע באיתור תקלות בתהליך הזדהות LTI, כי מערכות לימוד שונות שולחות נתונים שונים."
 
-#: /opt/webwork/webwork2/conf/defaults.config:1957
+#: /opt/webwork/webwork2/conf/defaults.config:1859
 msgid ""
 "When viewing a problem, WeBWorK usually puts the previously submitted answer"
 " in the answer blank.  Below this level, old answers are never shown.  "
 "Typically, that is the desired behaviour for guest accounts."
 msgstr "כשצופים בשאלה, WeBWork בדרך כלל מראה את התשובה האחרונ שנשלחה בשדה התשובה. מתחת לרמה זו, תשובות ישנות לא מוצגות לעולם. בדרך כלל זה מיועד לחשבונות אורחים."
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:30
+msgid ""
+"When viewing progress for a single student, their grades page is shown which"
+" lists set totals and per problem grades for each set assigned to the "
+"student.  This shows the same information as the statistics page for the "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:26
+msgid ""
+"When viewing set statistics, the drop down menus can be used to show stats "
+"for individual sections, recitations, or problems.  The overall results "
+"include all students who are assigned to the set, while the individual "
+"problem results only include active (have attempted the problem) students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:24
+msgid ""
+"When viewing student progress for a set, the score for the set and the "
+"status for problems in the set are listed for all students.  The table can "
+"be sorted by clicking the links in the table header.  Click the student's "
+"name to access the student's set.  When viewing progress for a test, "
+"additional columns can be shown/hidden by updating the display at the top"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:74
+msgid ""
+"When you unassign a set from students, you destroy all of the data for the "
+"set for those students. If the set is re-assigned to these students, then "
+"they will receive new versions of problems in the set.  Make sure this is "
+"what you want to do before unassigning sets from students."
+msgstr ""
+
+#. (tag('b', $achievementID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:21
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for achievement %1 for this student. Make sure this is what you want to"
 " do."
 msgstr "כשאתה מבטל הקצאה על ידי ביטול הבחירה של השם שלו, אתה הורס את כל המידע עבור הישג %1 של סטודנט זה. תוודא שזה אכן כוונתך."
 
-#. (CGI::b({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:146
+#. (tag('b', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:26
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for homework set %1 for this student. You will then need to reassign "
@@ -7880,7 +10840,7 @@ msgid ""
 "problems. Make sure this is what you want to do before unchecking students."
 msgstr "כשאתה מבטל הקצאה על ידי ביטול הבחירה של השם שלו,  אתה הורס את כל מידע של גליון שיעורי בית %1 עבור סטודנט זה. לאחר מכן תצטרך להקצות להם את הגליון מחדש והם יקבלו גרסאות חדשות של השאלות. תוודא שזה אכן מה שאתה רוצה לעשות."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:72
 msgid ""
 "When you uncheck a homework set (and save the changes), you destroy all of "
 "the data for that set for this student.   If you reassign the set, the "
@@ -7888,243 +10848,461 @@ msgid ""
 "you want to do before unchecking sets."
 msgstr "כשאתה מבטל סימון ההקצאה של גליון (ושומר את השינויים), אתה מוחק לחלוטין את כל הנתונים של הגליון עבור הסטודנט ממסד הנתונים. אם אתה מקצה אותו מחדש, הסטודנט יקבל גרסה חדשה של כל שאלה. וודא שזה מה שאתה רוצה לעשות לפני ביטול סימון ההקצאה."
 
-#. ($self->formatDateTime($set->open_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:343
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:87
+msgid "Wiki summary page for MathObjects"
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:444
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:167
 msgid "Will open on %1."
 msgstr "ייפתח ב-%1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:49
+msgid "Word problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:15
 msgid "Worth"
 msgstr "משקל"
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:382
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:51
+msgid "Write a new PG problem file or edit an existing one."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:188
+msgid ""
+"Write permissions have not been enabled for \"%1\".  Changes must be saved "
+"to another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:630
 msgid ""
-"Write permissions have not been enabled for '%1'.  Changes must be saved to "
-"another file for viewing."
-msgstr "הרשאות כתיבה לא אופשרו ל-'%1'. יש לשמור שינויים בקובץ אחר על מנת לראותם."
+"Write permissions have not been enabled for \"%1\". Changes must be saved to"
+" another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:182
+msgid ""
+"Write permissions have not been enabled in \"%1\".  Changes must be saved to"
+" a different directory for viewing."
+msgstr ""
 
-#. ($self->shortPath($currentDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:380
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:624
 msgid ""
-"Write permissions have not been enabled in '%1'.  Changes must be saved to a"
+"Write permissions have not been enabled in \"%1\".Changes must be saved to a"
 " different directory for viewing."
-msgstr "הראשות כתיבה לא אופשרו ב-'%1'. יש לשמור שינויים בתיקיה אחרת בטרם ניתן לראותם."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:178
 msgid ""
 "Write permissions have not been enabled in the templates directory.  No "
 "changes can be made."
 msgstr "הרשאות כתיבה לא הופעלו בתיקיית templates. לא ניתן לבצע שינויים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:380
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:620
+msgid ""
+"Write permissions have not been enabled in the templates directory. No "
+"changes can be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:287
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:330
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:509
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:82
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:657
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:67
 msgid "Yes"
 msgstr "כן"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:500
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:454
 msgid ""
 "You are currently checking answers to a different version of your problem - "
 "these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr "אתה כרגע בודק תשובות לגרסה אחרת של השאלה - אלו לא יישמרו, ואתה צריך לזכור לחזור לשאלה המקורית לאחר שתסיים כאן."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:511
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:470
 msgid ""
 "You are currently previewing answers to a different version of your problem "
 "- these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr "אתה כעת צופה בתשובות לגרסאות אחרות של השאלה - הם לא ישמרו, ויש לחזור לשאלה המקורית כשתסיים כאן."
 
-#. ($userSet->set_id, $r->connection->remote_ip)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:270
+#. ($ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:18
+msgid ""
+"You are in the Reduced Scoring Period.  All work counts for %1% of the "
+"original."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:183
+msgid "You are not allowed to act as a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:188
+msgid "You are not allowed to assign homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:383
+msgid "You are not allowed to delete %1."
+msgstr ""
+
+#. ($userSet->set_id, $c->tx->remote_address)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:261
 msgid ""
 "You are not allowed to generate a hardcopy for %1 from your IP address, %2."
 msgstr "אתה לא מורשה ליצר גרסת הדפסה של %1 מכתובת ה-IP שלך, %2."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2049
-msgid "You are not authorized to access the Instructor tools."
-msgstr "אתה לא מורשה להשתמש בכלי המורה."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:185
+msgid "You are not allowed to modify homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:191
+msgid "You are not allowed to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:4
+msgid "You are not allowed to send e-mail."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:2
+msgid "You are not authorized to access instructor tools"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:4
+msgid "You are not authorized to access instructor tools."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:9
+msgid "You are not authorized to assign homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:10
+msgid "You are not authorized to create or delete courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:2
+msgid "You are not authorized to edit achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:28
+msgid "You are not authorized to edit user specific information."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:37
+msgid "You are not authorized to grade homework sets."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:271
-msgid "You are not authorized to access the instructor tools."
-msgstr "אתה לא מורשה לגשת לכלי המורה"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:8
+msgid "You are not authorized to manage course files"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:392
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:33
 msgid "You are not authorized to modify homework sets."
 msgstr "אתה לא מורשה לבצע שינויים בגליונות."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:35
 msgid "You are not authorized to modify problems."
 msgstr "אתה לא מורשה לשנות שאלות."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:396
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:39
 msgid "You are not authorized to modify set definition files."
 msgstr "אתה לא מורשה לשנות קבצי הגדרת גליונות."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:15
 msgid "You are not authorized to modify student data"
 msgstr "אתה לא מורשה לשנות נתוני סטודנטים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:11
+msgid "You are not authorized to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:3
+msgid "You are not authorized to modify the course configuration."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:230
 msgid "You are not authorized to perform this action."
 msgstr "אתה לא מורשה לבצע את הפעולה הזו."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:260
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:11
+msgid "You are not authorized to score sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:13
+msgid "You are not authorized to send mail to students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:11
+msgid "You are not authorized to update lti scores"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers.html.ep:8
+msgid "You are not authorized to view past answers"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:251
 msgid ""
 "You are not permitted to generate a hardcopy for a set with hidden work."
 msgstr "אתה לא מורשה ליצר גרסת הדפסה של גליון עם עבודה מוחבאת."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:236
 msgid "You are not permitted to generate a hardcopy for an unopened set."
 msgstr "אתה לא מורשה ליצר גרסת הדפסה של מטלה שטרם נפתחה."
 
-#. ($showMeAnother{MaxReps},					$solutionShown)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:559
+#. ($showMeAnother{MaxReps},						$solutionShown)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:532
 msgid ""
 "You are only allowed to click on Show Me Another %quant(%1,time,times) per "
 "problem. %2 Close this tab, and return to the original problem."
 msgstr "אתה רשאי ללחוץ על \"הראה לי שאלה דומה\" %quant(%1,פעם,פעמים) לכל שאלה. %2 סגור חלון זה, וחזור לשאלה המקורית."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2051
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2070
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:265
 msgid "You are out of time!"
 msgstr "נגמר הזמן!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:374
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:36
 msgid "You can also examine the following temporary files: "
 msgstr "אתה יכול לצפות גם בקבצים הזמניים הבאים:"
 
-#: /opt/webwork/pg/macros/PGanswermacros.pl:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:108
+msgid ""
+"You can assign selected achievements to all users by using the \"Assign\" "
+"action action and selecting which achievements to assign.  You can select "
+"which users to assign/unassign to an achievement by clicking on the link in "
+"the \"Edit Users\" column."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1039
+msgid ""
+"You can change the file path for this problem manually from the \"Hmwk Sets "
+"Editor\" page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:27
+msgid ""
+"You can check the boxes to the right of the sets and click \"Generate "
+"Hardcopy for Selected Sets\" to generate a PDF hardcopy of the selected "
+"sets. You can generate hardcopies for multiple users including their answers"
+" as well. Note that students will only be able to generate hardcopies of a "
+"single set at a time. Students will only be able to include answers in the "
+"hardcopy after the answer date."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:127
+msgid ""
+"You can delete problems by clicking the \"Delete it?\" check box and saving."
+" If the set is already active it is recommended that you instead use the "
+"\"Mark Correct?\" problem to mark a particular problem correct for all "
+"students."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGanswermacros.pl:1616
 msgid "You can earn partial credit on this problem."
 msgstr "ניתן לקבל ניקוד חלקי בשאלה זו"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:382
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:142
+msgid ""
+"You can edit a problem by clicking the \"Edit Problem\" icon to the right of"
+" the problem number. This will open the problem in the PG problem editor in "
+"a new tab or window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:92
+msgid ""
+"You can edit a single achievement by clicking on the pencil icon next to the"
+" achievement ID.  You can edit multiple achievements by selecting which "
+"achievements to edit, then click the \"Edit\" button. You can edit all of "
+"the achievements by changing which achievements to edit form \"selected "
+"achievements\" to \"all achievements\", or click the checkbox next to the "
+"Achievement ID to select all achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:44
+msgid ""
+"You can edit the class list data for a single student by clicking on the "
+"pencil icon next to their login name. To edit several students at once click"
+" on the \"Select\" checkbox next to their names, click on the radio button "
+"for editing selected users and then click the \"Edit\" button. You can also "
+"edit all visible users (those students currently being displayed) or even "
+"all users in the course although this last option might take a long time to "
+"load for a large class."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:397
 msgid "You can get a new version of this problem after the due date."
 msgstr "אתה יכול לבקש גרסה שונה של שאלה זו לאחר מועד ההגשה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1368
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:101
+msgid ""
+"You can import/export from their respective action tab.  Exporting saves "
+"information about the achievement as a .axp file which is a CSV that lists "
+"each achievements information.  You can import .axp files that have been "
+"previously exported."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:769
 msgid "You can not specify an absolute path"
 msgstr "אתה לא יכול לתת מסלול מוחלט"
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1121
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:549
 msgid "You can only %1 one file at a time."
 msgstr "אתה יכול %1 רק קובץ אחד בכל פעם."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:92
 msgid "You can only download regular files."
 msgstr "ניתן להוריד רק קבצים רגילים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:591
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:197
 msgid "You can only edit text files"
 msgstr "ניתן לערוך רק קבצי טקסט"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:908
-msgid "You can only unpack files ending in '.tgz', '.tar' or '.tar.gz'"
-msgstr "ניתן לפרוק רק קבצים עם הסיומות '.tgz', '.tar' או '.tar.gz'"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:374
+msgid "You can only unpack files ending in \".tgz\", \".tar\" or \".tar.gz\""
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:134
+msgid ""
+"You can render a problem by clicking the \"Render Problem\" icon to the "
+"right of the problem number. The display mode used to render the problem is "
+"chosen using the drop down menu. You can render all problems using the "
+"\"Render All\" button. \"Hide All\" will hide all rendered problems. It is "
+"also useful to collapse problem details when doing this, as it makes it "
+"easier to drag problems around."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:120
+msgid ""
+"You can reorder problems by clicking on the arrow icon and dragging the "
+"problem. You will see a box showing you where the problem will be placed. "
+"When problems are reordered any holes in the numbering will be filled in."
+msgstr ""
 
 #. ($showMeAnother{MaxReps} >= $showMeAnother{Count}
 #. ? ($showMeAnother{MaxReps} - $showMeAnother{Count})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1895
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:44
 msgid ""
 "You can use this feature %quant(%1,more time,more times,as many times as you"
 " want) on this problem"
 msgstr "אתה יכול להשתמש באפשרות זו %quant(%1,עוד פעם, עוד פעמים, כמה פעמים שתרצה) על שאלה זו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:439
 msgid "You can't download directories"
 msgstr "לא ניתן להוריד תיקייות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:440
 msgid "You can't download files of that type"
 msgstr "לא ניתן להוריד קבצים מסוג זה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:584
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:192
 msgid "You can't edit a directory"
 msgstr "לא ניתן לערוך תיקיות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:528
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
 msgid "You can't view files of that type"
 msgstr "לא ניתן לצפות בקבצים מסוג זה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:985
 msgid "You cannot archive the course you are currently using."
 msgstr "לא ניתן להוסיף לארכיון את הקורס שבו אתה משתמש כרגע."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1712
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:850
 msgid "You cannot delete the course you are currently using."
 msgstr "אתה לא יכול למחוק את הקורס בו אתה משתמש כרגע."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1081
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:378
 msgid "You cannot delete yourself!"
 msgstr "אתה לא יכול למחוק את עצמך!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:579
 msgid "You did not specify a new set name."
 msgstr "לא מלאת שם לגליון החדש."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:232
 msgid "You didn't enter any message."
 msgstr "לא מלאת את תוכן ההודעה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:312
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:303
 msgid "You do not have permission to access the requested file \"%1\"."
 msgstr "אין לך הרשאות גישה אל הקובץ שביקשת \"%1\"."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:159
 msgid "You do not have permission to change the hardcopy theme."
 msgstr "אין לך הרשאה לשנות את עיצוב גרסת ההדפסה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:578
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:186
 msgid "You do not have permission to edit this file."
 msgstr "אין לך הרשאה לערוך את הקובץ הזה."
 
 #. ($hardcopy_format)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:151
 msgid "You do not have permission to generate hardcopy in %1 format."
 msgstr "אין לך הרשאה ליצר גרסת הדפסה בפורמט %1."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1639
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1161
 msgid "You do not have permission to view the details of this error."
 msgstr "אין לך הרשאה לצפות בפרטים על השגיאה הזו."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements.html.ep:13
 msgid "You don't have any Achievement data associated to you!"
 msgstr "אין שום מידע על הישכים עבורך!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:237
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:51
 msgid "You don't have any rewards!"
 msgstr "אין לך פרסים!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2109
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:325
 msgid "You exceeded the allowed time."
 msgstr "עברת את הזמן המותר."
 
-#. ($numLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2082
+#. ($c->{numAttemptsLeft})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:277
 msgid "You have %1 attempt(s) remaining on this test."
 msgstr "נשארו לך %1 ניסיון/ות למבחן זה."
 
-#. ($numLeft,						$numLeft - 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2458
+#. ($c->{numAttemptsLeft},								$c->{numAttemptsLeft} - 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:664
 msgid ""
 "You have %1 submissions remaining for this test.  If you say yes, then you "
 "will have %quant(%2,submission) remaining. Once all submissions have been "
@@ -8132,724 +11310,702 @@ msgid ""
 "work this test version."
 msgstr "נותרו לך %1 הגשות למבחן זה. אם תאשר להמשיך אז ישארו לך %quant(%2,הגשה אחת ואחרונה, הגשות נוספות). כאשר תסיים את כל ההגשות המותרות, התשובות שלך יהיו סופיות ולא תוכל להמשיך לעבוד עם גרסה זו של המבחן."
 
-#. ($attemptsLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2012
+#. ($problem->max_attempts - $attempts)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1270
 msgid "You have %negquant(%1,unlimited attempts,attempt,attempts) remaining."
 msgstr "נותרו לך %negquant(%1,נסיונות לא מוגבלים,נסיון,ניסיונות)."
 
 #. ($attempts_before_rr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1217
 msgid ""
 "You have %quant(%1,attempt,attempts) left before new version will be "
 "requested."
 msgstr "נותרו לך %quant(%1,ניסיון,ניסיונות) לפני שתקבל גרסה חדשה."
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:506
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:44
 msgid ""
 "You have %quant(%1,hour) and %quant(%2,minute) remaining to complete the "
 "currently open test."
 msgstr "נשאר לך  %quant(%1,שעה, שעות) ו- %quant(%2,דקה,דקות) כדי לסיים את המבחן הנוכחי שפתחת."
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:518
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:54
 msgid ""
 "You have %quant(%1,hour,hours,)%quant(%2,minute,minutes,) remaining to "
 "complete the currently open test."
 msgstr "נשאר לך %quant(%1,שעה, שעות) ו- %quant(%2,דקה,דקות) כדי לסיים את המבחן הנוכחי שפתחת."
 
-#. ($minutes,									$seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:529
+#. ($minutes,							$seconds)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:64
 msgid ""
 "You have %quant(%1,minute) and %quant(%2,second) remaining to complete the "
 "currently open test."
 msgstr "נשאר לך %quant(%1,שעה, שעות) ו- %quant(%2,דקה,דקות) כדי לסיים את המבחן הנוכחי שפתחת."
 
 #. ($seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:72
 msgid ""
 "You have %quant(%1,second) remaining to complete the currently open test."
 msgstr "נשאר לך %quant(%1,שנייה, שניות) כדי לסיים את המבחן הנוכחי שפתחת."
 
 #. ($attempts)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1243
 msgid "You have attempted this problem %quant(%1,time,times)."
 msgstr "ניסית שאלה זו %quant(%1,פעם,פעמים)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:1
 msgid "You have been logged out of WeBWorK."
 msgstr "התנתקת מ-WeBWorK."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2065
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:260
 msgid "You have less than 1 minute to complete this test."
 msgstr "נותר לך פחות מדקה 1 לפתרון מבחן זה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2046
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:241
 msgid "You have less than 45 seconds left!"
 msgstr "נשאל לך פחות מ- 45 שניות!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2043
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:240
 msgid ""
 "You have less than 90 seconds left to complete this assignment. You should "
 "finish it soon!"
 msgstr "נשאר לך פחות מ- 90 שניות להשלים את הגיליון. יש להשלימו במהרה!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1004
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:452
 msgid "You have not chosen a file to upload."
 msgstr "לא בחרת קובץ להעלות."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:845
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "You have requested that the following items be deleted"
 msgstr "בקשת שהפריטים הבאים ימחקו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1137
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:565
 msgid "You have specified an illegal file"
 msgstr "בחרת קובץ לא חוקי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:766
 msgid "You have specified an illegal path"
 msgstr "בחרת מסלול לא חוקי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:520
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:13
+msgid "You have specified an illegal working directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:481
 msgid ""
 "You may check your answers to this problem without affecting the maximum "
 "number of tries to your original problem."
 msgstr "אתה יכול לבדוק את התשובות שלך לשאלה זו בלי להשפיע על מספר הניסיונות המקסימלי של השאלה המקורית."
 
-#. ($perm_multiuser ? "to privileged users or" : "")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:613
+#. ($multiuser ? 'to privileged users or' : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:69
 msgid ""
 "You may choose to show any of the following data. Correct answers, hints, "
 "and solutions are only available %1 after the answer date of the homework "
 "set."
 msgstr "אתה יכול לבחור להציג כל נתון מהנתונים הבאים. תשובות נכונות, רמזים, ופתרונות הם זמינים %1 רק לאחר תאריך התשובות של גליון שיעורי הבית."
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:63
+msgid "You may not change this user's password!"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:646
 msgid "You may not change your answers when going on to the next part!"
 msgstr "לא ניתן לשנות תשובות כאשר אתה מתקדם לחלק הבא!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1831
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:58
 msgid "You may not change your own password here!"
 msgstr "לא ניתן לשנות את הסיסמה שלך כאן!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1132
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:560
 msgid "You may not follow symbolic links"
 msgstr "לא ניתן לעקוב אחרי קישוריות סימבוליות symbolic links"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2134
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:350
 msgid "You may still check your answers."
 msgstr "אתה עדיין יכול לבדוק את התשובות שלך."
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:172
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:143
+msgid ""
+"You may want to create an unattached problem if you are using the current "
+"problem as a model for a new problem. You can add the new file to a homework"
+" set from the Library Browser or via the set detail page of the Hmwk Sets "
+"Editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:165
+msgid ""
+"You might want to do this if you want to give full credit to everyone on a "
+"particular problem that was not worded correctly, or wasn't working "
+"properly. This is done from the \"Hmwk Sets Editor\" page or the "
+"\"Instructor Tools\" page."
+msgstr ""
+
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:8
 msgid "You must access assignments from your Course Management System (%1)."
 msgstr "חייבים לגשת לגיליונות דרך מערכת הלימוד (%1) שלך."
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:67
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before Show Me Another "
-"is available."
-msgstr "יש לנסות את שאלה זו %quant(%1,פעם,פעמים) לפני שאפשר להשתמש ב-\"הראה לי שאלה דומה\"."
+"You must attempt this problem %quant(%1,time) before this feature is "
+"available"
+msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1923
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:545
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before this feature is "
-"available"
-msgstr "יש לנסות את שאלה זו %quant(%1,פעם,פעמים) לפני שאפשרות זו תהפוך לזמינה."
+"You must attempt this problem %quant(%1,time,times) before Show Me Another "
+"is available."
+msgstr "יש לנסות את שאלה זו %quant(%1,פעם,פעמים) לפני שאפשר להשתמש ב-\"הראה לי שאלה דומה\"."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:699
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:259
 msgid "You must confirm the password for the initial instructor."
 msgstr "אתה חייב לאשר את הסיסמה למורה הראשון."
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:368
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? $c->link_to(                                                  $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:195
 msgid "You must log into this set via your Learning Management System (%1)."
 msgstr "אתה חייב להתחבר לגליון הזה דרך מערכת ניהול הלמידה שלך (%1)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:76
-msgid "You must provide a student ID, a set ID, and a problem number."
-msgstr "אתה חייב למלא מזהה משתמש, מזהה גליון, ומספר שאלה."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:979
+msgid "You must select a course to archive"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:585
 msgid "You must select a course to rename."
 msgstr "אתה חייב לבחור קורס שאת שמו תרצה לשנות."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:351
 msgid "You must select at least one file for the archive"
 msgstr "אתה חייב לבחור לפחות קובץ אחד להוספה לארכיון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:777
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:312
 msgid "You must select at least one file to delete"
 msgstr "אתה חייב לבחור לפחות קובץ אחד למחיקה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:115
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:106
 msgid "You must select one or more sets for scoring!"
 msgstr "אתה חייב לבחור לפחות גליון אחד לניקוד!"
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:749
 msgid "You must specify a %1 name"
 msgstr "אתה חייב למלא שם של %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:682
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:242
 msgid "You must specify a course ID."
 msgstr "אתה חייב למלא מזהה קורס."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2026
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2561
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2777
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3865
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2086
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:848
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:983
 msgid "You must specify a course name."
 msgstr "אתה חייב למלא שם קורס"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:775
 msgid "You must specify a file name"
 msgstr "אתה חיב למלא שם קובץ"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:705
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:586
+msgid "You must specify a file name in order to save a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:265
 msgid "You must specify a first name for the initial instructor."
 msgstr "אתה חייב למלא שם פרטי למורה הראשון."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:708
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:268
 msgid "You must specify a last name for the initial instructor."
 msgstr "אתה חייב למלא שם משפחה למורה הראשון."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1382
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:606
 msgid "You must specify a new institution for the course."
 msgstr "אתה חייב למלא מוסד חדש עבור קורס זה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1364
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:588
 msgid "You must specify a new name for the course."
 msgstr "אתה חייב למלא שם חדש לקורס זה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:603
 msgid "You must specify a new title for the course."
 msgstr "אתה חייב למלא כותרת חדשה לקורס זה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:256
 msgid "You must specify a password for the initial instructor."
 msgstr "אתה חייב למלא סיסמה למורה הראשון."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:448
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:440
 msgid "You must specify a user ID."
 msgstr "אתה חייב למלא מזהה משתמש."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:711
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:271
 msgid "You must specify an email address for the initial instructor."
 msgstr "אתה חייב למלא כתובת דוא\"ל של המורה הראשון."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:331
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:138
 msgid "You must specify an file name in order to save a new file."
 msgstr "יש לפרט שם קובץ כדי לשמור בקובץ חדש"
 
 #. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:505
 msgid ""
-"You must use your Learning Managment System (%1) to access this set.  Try "
-"logging in to the Learning Managment System and visiting the set from there."
-msgstr "אתה חייב להשתמש במערכת ניהול הלמידה שלך (%1) כדי לגשת לגליון הזה. נסה להתחבר למערכת ניהול הלמידה ולגשת לגליון משם."
+"You must use your Learning Management System (%1) to access this set.  Try "
+"logging in to the Learning Management System and visiting the set from "
+"there."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1730
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
 msgid "You need to select a \"Target Set\" before you can edit it."
 msgstr "אתה צריך לבחור גליון שאותו תרצה לערוך."
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1126
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:554
 msgid "You need to select a file to %1."
 msgstr "אתה צריך לבחור קובץ כדי לבצע %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1877
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:555
 msgid "You need to select a set definition file to view."
 msgstr "אתה צריך לבחור הגדרת גליון לצפייה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1853
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:537
 msgid "You need to select a set from this course to view."
 msgstr "אתה צריך לבחור גליון מקורס זה לצפייה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1837
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:524
 msgid "You need to select a set to view."
 msgstr "אתה צריך לבחור גליון לצפייה"
 
-#. (wwRound(0, $problemResult->{score} * 100)
-#. (wwRound(0, $pg->{result}->{score} * 100)
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2007
+#. (wwRound(0,
+#. compute_reduced_score($ce, $problem, $set, $pg->{result}{score},
+#. $c->submitTime)
+#. (% wwRound(0, $rh_result->{problem_result}{score} * 100)
+#. (wwRound(0, $rh_result->{problem_result}{score} * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1251
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:48
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:29
 msgid "You received a score of %1 for this attempt."
 msgstr "קיבלת ציון %1 עבור הגשה זו."
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2075
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1363
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem and its graded subproblems."
 msgstr "לא תוכל להמשיך לשאלה %1 עד שהשלמת, או שנגמר לך הניסיונות, של שאלה זו והשאלות המוכלות שמזכות נקודות."
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2078
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1375
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem."
 msgstr "לא תוכל להמשיך לשאלה %1 עד שהשלמת, או שנגמר לך הניסיונות, של שאלה."
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1343
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:740
 msgid "Your %1 name contains illegal characters"
 msgstr "שם ה-%1 שנתת מכיל תווים שאסורים לשימוש כאן."
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1344
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:743
 msgid "Your %1 name may not begin with a dot"
 msgstr "שם ה-%1 לא יכול להתחיל בנקודה"
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:746
 msgid "Your %1 name may not contain a path component"
 msgstr "שם ה-%1 לא יכול להכיל מרכיב מסלול (path)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:540
-msgid ""
-"Your LTI OAuth verification failed.  If this recurs, please speak with your "
-"instructor"
-msgstr "אימות ה-LTI OAuth שלך נכשל. אם בעיה זו חוזרת על עצמה, אנא פנה לצוות התמיכה או לסגל ההוראה"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:528
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:539
-msgid ""
-"Your authentication failed.  Please return to Oncourse and login again."
-msgstr "האימות שלך נכשל. אנא חזור ל-Oncourse והתחבר שוב."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:229
-msgid ""
-"Your authentication failed.  Please try again. Please speak with your "
-"instructor if you need help."
-msgstr "האימות שלך נכשל. אנא נסה שוב. אנא פנה לצוות התמיכה או לסגל ההוראה לקבלת עזרה."
-
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3033
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3162
 msgid "Your browser does not support the video tag."
 msgstr "הדפדפן שלך לא תומך ב-video tag."
 
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4078
-msgid "Your current branch of PG is up to date with branch %1 in remote %2."
-msgstr "ענף ה-PG הנוכחי שלך הוא עדכני לפי ענף %1 ב-remote בשם %2."
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4016
-msgid ""
-"Your current branch of WeBWorK is up to date with branch %1 in remote %2."
-msgstr "ענף ה-WeBWorK הנוכחי שלך הוא עדכני לפי ענף %1 ב-remote בשם %2."
-
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4113
-msgid "Your current branch of the Open Problem Library is up to date."
-msgstr "הענף הנוכחי שלך שלסיפריית השאלות הפתוחה הוא עדכני."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:134
 msgid "Your display options have been saved."
 msgstr "אפשרויות התצוגה נשמרו."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:195
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
 msgid "Your email address has been changed."
 msgstr "כתובת הדוא\"ל שלך שונתה."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:772
 msgid "Your file name contains illegal characters"
 msgstr "שם הקובץ מכיל תווים לא חוקיים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:118
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:40
 msgid "Your file name is not valid! "
 msgstr "שם הקובץ שנתת אינו תקני! "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:16
 msgid "Your message was sent successfully."
 msgstr "ההודעה שלך נשלח בהצלחה."
 
-#. ($lastScore,$notCountedMessage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2010
+#. (wwRound(0, $problem->status * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1261
 msgid "Your overall recorded score is %1.  %2"
 msgstr "הציון שנשמר עבורך במערכת הוא %1. %2"
 
-#. ($versionNumber, wwRound(2,$recordedScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2107
-msgid "Your recorded score on this test (version %1) is %2/%3."
-msgstr "הציון שנשמר עבורך למבחן זה (גרסה %1) הוא %2 מתוך %3."
+#. ('<span id="test-recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:179
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:197
+msgid "Your recorded score for this version is %1/%2 (%3%)."
+msgstr ""
+
+#. ($setVersionID,                                         '<span id="test-
+#. recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:317
+msgid "Your recorded score on this test (version %1) is %2/%3 (%4%)."
+msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:603
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:634
 msgid "Your score for this attempt is for this part only;"
 msgstr "הציון שקבלת בהגשה זו הוא רק לחקל זה;"
 
 #. ($testNounNum)
 # $testNounNum is either "test (#)" or "submission (#)"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1977
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:142
 msgid "Your score on this %1 WAS recorded."
 msgstr "הציון שלך ב-%1 הזה נשמר."
 
-#. ($testNoun,$attemptScore,$totPossible)
+#. ($testNoun, $c->{attemptScore}, $c->{totalPossible})
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1982
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:148
 msgid "Your score on this %1 is %2/%3."
 msgstr "הציון שלך ב-%1 זה הוא %2 מתוך %3."
 
 #. ($testNounNum)
 # $testNounNum is either "test (#)" or "submission (#)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1973
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:138
 msgid "Your score on this %1 was NOT recorded."
 msgstr "הציון שלך ב-%1 זה לא נשמר."
 
-#. ($attemptScore,$totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2019
+#. ($c->{attemptScore}, $c->{totalPossible})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:192
 msgid "Your score on this (checked, not recorded) submission is %1/%2."
 msgstr "הציון שלך על הגשה זו (שנבדקה, ולא נשמרה) הוא %1 מתוך %2."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1963
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2277
-msgid "Your score on this problem was recorded."
-msgstr "הציון שלך בשאלה זו נשמר."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1619
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1027
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:172
 msgid ""
 "Your score was not recorded because there was a failure in storing the "
 "problem record to the database."
 msgstr "הציון שלך לא נשמר בגלל שאירעה תקלה בשמירת נתוני השאלה במסד הנתונים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:272
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:276
 msgid "Your score was not recorded because this homework set is closed."
 msgstr "הציון שלך לא נשמר בגלל שגליון שיעורי בית זה הוא סגור."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:283
 msgid ""
 "Your score was not recorded because this problem has not been assigned to "
 "you."
 msgstr "הציון שלך לא נשמר בגלל ששאלה זו לא הוקצאה אליך."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1643
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1049
 msgid ""
 "Your score was not recorded because this problem set version is not open."
 msgstr "הציון שלך לא נשמר בגלל שגירסת הגליון הזאת לא פתוחה."
 
-#. ($elapsed, $allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1658
+#. ($elapsed,                                              # Assume the
+#. allowed time is an even number of minutes.
+#. ($set->due_date - $set->open_date)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1063
 msgid ""
 "Your score was not recorded because you have exceeded the time limit for "
 "this test. (Time taken: %1 min; allowed: %2 min.)"
 msgstr "הציון שלך לא נשמר כי עברת את מגבלת הזמן של מבחן זה. (זמן שעבר: %1 דקות, מגבלת הזמן: %2 דקות.)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1052
 msgid ""
 "Your score was not recorded because you have no attempts remaining on this "
 "set version."
 msgstr "הציון שלך לא נשמר כי אין לך עוד ניסיונות לגרסת הגליון הזאת."
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1661
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1067
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:278
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:53
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:31
 msgid "Your score was not recorded."
 msgstr "הציון שלך לא נשמר."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1998
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:163
 msgid "Your score was not successfully sent to the LMS."
 msgstr "נכשלה שליחת הציון שלך אל מערכת ה-LMS."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:166
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:170
 msgid "Your score was recorded."
 msgstr "הציון שלך נשמר."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1997
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:255
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:162
 msgid "Your score was successfully sent to the LMS."
 msgstr "הציון שלך נשלח בהצלחה אל מערכת ה-LMS."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:540
 msgid "Your session has timed out due to inactivity. Please log in again."
 msgstr "נותקת עקב חוסר פעילות. אנא התחבר שוב."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4126
-msgid "Your systems are up to date!"
-msgstr "המערוכות שלך עדכניות!"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1396
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1403
-msgid "[Edit]"
-msgstr "[ערוך]"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:824
-msgid "a duplicate of the first selected achievement."
-msgstr "כשכפול של ההישג הראשון שנבחר"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:17
+msgid "a duplicate of the first selected achievement"
+msgstr ""
 
 # Context is "Create set ______ as a duplicate of the first selected set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:17
 msgid "a duplicate of the first selected set"
 msgstr "שכפול של הגליון הראשון שנבחר"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:823
-msgid "a new empty achievement."
-msgstr "הישג ריק חדש"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:16
+msgid "a new empty achievement"
+msgstr ""
 
 # Context is "Create set ______ as a new empty set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:16
 msgid "a new empty set"
 msgstr "גליון ריק חדש"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1281
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:9
 msgid "a single set"
 msgstr "גליון אחד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:429
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:130
 msgid "add problems"
 msgstr "הוסף שאלות"
 
 #. ($setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1751
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
 msgid "addGlobalSet %1 in ProblemSetList:  %2"
 msgstr "הוסף גליון גלובלי %1 ברשימת שאלות ??? האוסף: %2"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:456
-msgid "added missing permission level for user"
-msgstr "נוספה רמת הרשאה שהייתה חסרה למשתמש"
-
 # #short for administrator
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "admin"
 msgstr "מנהל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1051
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:487
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:604
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:7
 msgid "all achievements"
 msgstr "כל ההישגים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1377
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:66
 msgid "all current users"
 msgstr "כל המשתמשים שקיימים כרגע"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:327
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:70
 msgid "all set dates for one <b>user</b>"
 msgstr "כל תאריכי האוסופים של <b>משתמש</b> אחד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:622
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1434
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:667
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:840
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1995
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:7
 msgid "all sets"
 msgstr "כל הגליונות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1981
 msgid "all students"
 msgstr "כל הסטודנטים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1256
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:701
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:946
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:997
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:6
 msgid "all users"
 msgstr "כל המשתמשים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:120
 msgid "all users for one <b>set</b>"
 msgstr "כל המשתמשים עבור <b>גליון</b> אחד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:23
 msgid "alphabetically"
 msgstr "בסדר אלפבתי"
 
-#. ($count,$numSets)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:626
+#. ($count, $numSets)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1999
 msgid "an impossible number of sets: %1 out of %2"
 msgstr "מספר בלתי סביר של גליונות: %1 מתוך %2"
 
-#. ($count,$numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:606
+#. ($count, $numUsers)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1985
 msgid "an impossible number of users: %1 out of %2"
 msgstr "מספר בלתי סביר של משתמשים: %1 מתוך %2"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:647
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:658
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:610
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:621
 msgid "answer"
 msgstr "תשובה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:30
 msgid "any users"
 msgstr "כל משתמש"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:720
-msgid "avg attempts"
-msgstr "ממוצע ניסיונות"
-
 # Context is "Append ____ blank problem template(s) to end of homework set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2956
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:689
 msgid "blank problem template(s) to end of homework set"
 msgstr "תבניות שאלות ריקות בסוף הגליון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:24
 msgid "by last login date"
 msgstr "לפי תאריך ההתחברות האחרון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1552
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:688
 msgid "changes abandoned"
 msgstr "השינויים לא נשמרו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1216
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1651
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:633
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:795
 msgid "changes saved"
 msgstr "השינויים נשמרו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:80
 msgid "class list data for selected <b>users</b>"
 msgstr "נתוני רשימת המשתמשים של <b>המשתמשים</b> שנבחרו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:31
 msgid "close"
 msgstr "סגור"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:671
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "column"
 msgstr "עמודה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:259
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:239
 msgid "correct"
 msgstr "נכון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:582
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:239
 msgid "course files"
 msgstr "קבצי קורס"
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:458
 msgid "deleted %1 sets"
 msgstr "נמחקו %1 גליונות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:152
 msgid "editing all achievements"
 msgstr "כרגע עורכים את כל ההישגים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:333
 msgid "editing all sets"
 msgstr "כרגע עורכים את כל הגיליונות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:963
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:328
 msgid "editing all users"
 msgstr "כרגע עורכים את כל המשתמשים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:860
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:336
 msgid "editing listed sets"
 msgstr "כרגע עורכים את הגיליונות המופיעות ברשימה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:154
 msgid "editing selected achievements"
 msgstr "כרגע עורכים את ההישגים שנבחרו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:339
 msgid "editing selected sets"
 msgstr "כרגע עורכים את הגיליונות שנבחרו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:334
 msgid "editing selected users"
 msgstr "כרגע עורכים את המשתמשים שנבחרו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:331
 msgid "editing visible users"
 msgstr "כרגע עורכים את המשתמשים שמופיעים ברשימה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:360
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:90
 msgid "email address"
 msgstr "כתובת דואר אלקטרוני"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:87
-msgid "email:"
-msgstr "דוא\"ל:"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:42
 msgid "empty"
 msgstr "ריק"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:672
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:10
 msgid "enter matching set IDs below"
 msgstr "הכנס את מזהי הגליונות הרצויות למטה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:220
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:31
 msgid "entry rows."
 msgstr "שורות קליטה"
 
 #. ($restrictLoc, $setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1761
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:904
 msgid "error adding set location %1 for set %2: %3"
 msgstr "אירעה שגיאה בהוספת מיקום %1 עבור גליון %2: %3"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1092
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1487
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:542
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:643
 msgid "export abandoned"
 msgstr "הייצוא בוטל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1068
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:527
 msgid "exporting all achievements"
 msgstr "מייצא את כל ההישגים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1071
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:530
 msgid "exporting selected achievements"
 msgstr "מייצא את ההישגים שנבחרו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:359
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:89
 msgid "first name"
 msgstr "שם פרטי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:747
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:72
 msgid "for"
 msgstr "עבור"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:149
 msgid "for one <b>set</b>"
 msgstr "עבור <b>גליון</b> אחד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:103
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:94
 msgid "for one <b>user</b>"
 msgstr "עבור <b>משתמש</b> אחד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1014
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:349
 msgid "giving new passwords to all users"
 msgstr "נפתח טופס להגדרת סיסמה חדשה לכל המשתמשים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1020
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:355
 msgid "giving new passwords to selected users"
 msgstr "נפתח טופס להגדרת הגדרת סיסמה חדשה למשתמשים שנבחרו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1017
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:352
 msgid "giving new passwords to visible users"
 msgstr "נפתח טופס להגדרת  הגדרת סיסמה חדשה למשתמשים שהופיעו ברשימה"
 
 #. ($j, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1069
 msgid "global %1 for set %2 not found."
 msgstr "שאלה %1 הגלובלי עבור גליון %2 לא נמצא."
 
-#. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1146
-msgid "global set %1 not found."
-msgstr "גליון גלובלי %1 לא נמצא."
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "grade_proctor"
 msgstr "משגיח_ציון"
@@ -8858,393 +12014,375 @@ msgstr "משגיח_ציון"
 msgid "guest"
 msgstr "אורח"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1589
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:949
 msgid "hidden"
 msgstr "מוחבא"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "hidden from"
 msgstr "מוחבא מ-"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "hidden from students"
-msgstr "מוחבא מהסטודנטים"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:217
+msgid "homework"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:83
+msgid "html directory"
+msgstr ""
 
-#. ('j','k','_0')
-#. ('j','k')
+#. ('j', 'k', '_0')
+#. ('j', 'k')
 # doe snot need to be translated
-#: /opt/webwork/pg/lib/Parser/List/Vector.pm:35
-#: /opt/webwork/pg/lib/Value/Vector.pm:278
-#: /opt/webwork/pg/macros/contextLimitedVector.pl:93
+#: /opt/webwork/pg/lib/Parser/List/Vector.pm:39
+#: /opt/webwork/pg/lib/Value/Vector.pm:303
+#: /opt/webwork/pg/macros/contexts/contextLimitedVector.pl:95
 msgid "i"
 msgstr "i"
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:773
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:840
 msgid "if"
 msgstr "if"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1626
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:622
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:721
 msgid "illegal character in input: '/'"
 msgstr "תו לא חוקי בקלט : '/'"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:246
 msgid "incorrect"
 msgstr "לא נכון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:441
 msgid "index"
 msgstr "מדד"
 
 #. ($restrictLoc, $setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:911
 msgid "input set location %1 already exists for set %2."
 msgstr "המיקום %1 שהוזן כבר קיים עבור גליון %2."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:358
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:551
+msgid "insufficient permission to edit %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:220
+msgid "just-in-time"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:88
 msgid "last name"
 msgstr "שם משפחה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:841
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:893
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:9
 msgid "listed sets"
 msgstr "גיליונות שמופיעות בטבלה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3169
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:87
 msgid "locations selected below"
 msgstr "המיקומים שנבחרו למטה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:665
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:59
 msgid "login"
 msgstr "התחבר"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "login ID"
 msgstr "מזהה התחברות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:94
 msgid "login name"
 msgstr "שם התחברות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:86
-msgid "login/studentID:"
-msgstr "מזהה משתמש/התחברות:"
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "login_proctor"
 msgstr "משגיח_התחברות"
 
 # Context is "Set _____ made visibile for _____ users"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "made visible for"
 msgstr "נהפכו לזמינים עבור"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:419
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:493
 msgid "max"
 msgstr "מקסימום"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1282
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:10
 msgid "multiple sets"
 msgstr "מספר גליונות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:489
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:171
 msgid "new set:"
 msgstr "גליון חדש:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:393
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:109
 msgid "new users"
 msgstr "משתמשים חדשים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:6
 msgid "no achievements"
 msgstr "אף הישג"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:740
-msgid "no achievements."
-msgstr "אף הישג."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:519
-msgid "no attempt recorded"
-msgstr "אף הגשה לא נקלטה בעבר"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:86
 msgid "no location"
 msgstr "אף מיקום"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:620
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1056
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1993
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:6
 msgid "no sets"
 msgstr "אף משימה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:600
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1979
 msgid "no students"
 msgstr "אף סטודנט"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:931
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1190
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:702
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:31
 msgid "no users"
 msgstr "אף משתמש"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/permission.pm:26
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "nobody"
 msgstr "אף אחד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:114
 msgid "nth colum of merge file"
 msgstr "העמודה ה-n של קובץ המיזוג"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:225
-msgid "number of students not defined"
-msgstr "מספר הסטודנטים להוסיף לא הוגדר"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:70
 msgid "of"
 msgstr "מתוך"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:128
 msgid "one <b>set</b>"
 msgstr "<b>גליון</b> אחד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:556
-msgid "one <b>set</b> for  <b>users</b>"
-msgstr "<b>גליון</b> אחד עבור <b>משתמשים</b>"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:225
+msgid "one <b>set</b> for <b>users</b>"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:540
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:211
 msgid "one <b>user</b> (on one <b>set</b>)"
 msgstr "<b>משתמש</b> אחד (<b>בגליון</b> אחד)"
 
 # Context is Assign this set to which users?  "only ____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1378
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:67
 msgid "only"
 msgstr "רק"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:17
 msgid "only best scores"
 msgstr "רק הציונים הטובים ביותר"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3472
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:357
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:448
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:88
 msgid "or"
 msgstr "או"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1141
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:59
 msgid "or Problems from"
 msgstr "או שאלות מ-:"
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:776
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:843
 msgid "otherwise"
 msgstr "אחרת"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:19
 msgid "overwrite"
 msgstr "דרוס את הנתונים הישנים"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:664
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:627
 msgid "part"
 msgstr "חלק"
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1383
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:499
 msgid "permissions for %1 not defined"
 msgstr "רמת ההרשאה של %1 לא מוגדרת"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "point"
 msgstr "נקודה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "points"
 msgstr "קודות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:509
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:20
 msgid "preserve"
 msgstr "שמור את הנתונים הישנים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2360
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:576
 msgid "preview answers"
 msgstr "צפה בתשובות"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:653
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:616
 msgid "problem"
 msgstr "שאלה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:632
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:41
 msgid "problems"
 msgstr "שאלות"
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:219
+msgid "proctored test"
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "professor"
 msgstr "מרצה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:360
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:451
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:89
 msgid "progress"
 msgstr "התקדמות"
 
 #. ($line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2212
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1409
 msgid "readSetDef error, can't read the line: ||%1||"
 msgstr "שגיאת קריאת הגדרת גליון, לא יכול לקרוא את השורה: ||%1||"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:93
 msgid "recitation"
 msgstr "קבוצת תרגול"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:654
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:53
 msgid "recitation #"
 msgstr "קבוצת תרגול  #"
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:497
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:549
 msgid "record for visible user %1 not found"
 msgstr "לא נמצאו נתונים עבור המשתמש %1"
 
 #. ($restrictLoc)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1767
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:918
 msgid ""
 "restriction location %1 does not exist.  IP restrictions have been ignored."
 msgstr "מיקום %1 למגבלות מיקום התחברות לא קיים. הגבלות ה-IP להתחברות לא הופעלו"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:670
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "row"
 msgstr "שורה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:91
 msgid "score"
 msgstr "ציון"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:362
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:92
 msgid "section"
 msgstr "קבוצה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:643
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:47
 msgid "section #"
 msgstr "קבוצה #"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:88
-msgid "section:"
-msgstr "קבוצה:"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:159
 msgid "selected <b>sets</b>"
 msgstr "<b>הגליונות</b> שנבחרו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:524
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:197
 msgid "selected <b>users</b> to selected <b>sets</b>"
 msgstr "<b>משתמשים</b> שנבחרו <b>לגליונות</b> שנבחרו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:441
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:488
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:605
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:8
 msgid "selected achievements"
 msgstr "ההישגים שנבחרו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:741
-msgid "selected achievements."
-msgstr "ההישגים שנבחרו."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1057
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1436
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:669
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:842
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:894
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:991
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:8
 msgid "selected sets"
 msgstr "גליונות שנבחרו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1053
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:703
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:999
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:8
 msgid "selected users"
 msgstr "משתמשים שנבחרו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:624
-msgid "set"
-msgstr "גליון"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:628
-msgid "sets"
-msgstr "גליונות"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:12
 msgid "sets hidden from students"
 msgstr "גיליונות המוסתרות מהסטודנטים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:670
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:11
 msgid "sets visible to students"
 msgstr "גיליונות הזמינות לסטודנטים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:716
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:281
 msgid "showing all sets"
 msgstr "מציג את כל הגליונות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:763
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:277
 msgid "showing all users"
 msgstr "מציג את כל המשתמשים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:725
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:290
 msgid "showing matching sets"
 msgstr "מציג גליונות תואמות"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:286
 msgid "showing matching users"
 msgstr "מציג את המשתמשים התואמים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:719
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:284
 msgid "showing no sets"
 msgstr "לא מציג אף משימה"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:766
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:280
 msgid "showing no users"
 msgstr "לא מציג אף משתמש"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:722
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:287
 msgid "showing selected sets"
 msgstr "מציג גליונות שנבחרו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:769
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:283
 msgid "showing selected users"
 msgstr "מציג משתמשים שנבחרו"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:299
 msgid "showing sets that are hidden from students"
 msgstr "מציג גיליונות המוסתרות מהסטודנטים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:732
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:296
 msgid "showing sets that are visible to students"
 msgstr "מציג גיליונות הזמינות/גלויות לסטודנטים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:72
 msgid "shown"
 msgstr "מוצגים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:162
 msgid "still open"
 msgstr "עדיין פתוח"
 
@@ -9252,16 +12390,16 @@ msgstr "עדיין פתוח"
 msgid "student"
 msgstr "סטודנט"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
 msgid "submission"
 msgstr "הגשה"
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:133
 msgid "submission (version %1)"
 msgstr "הגשה (גרסה %1)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
 msgid "summary"
 msgstr "תקציר"
 
@@ -9269,135 +12407,130 @@ msgstr "תקציר"
 msgid "ta"
 msgstr "מתרגל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:90
+msgid "templates/email directory"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:95
+msgid "templates/macros directory"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
 msgid "test"
 msgstr "מבחן"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:23
 msgid "test date"
 msgstr "תאריך מבחן"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:621
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:29
 msgid "test time"
 msgstr "זמן מבחן"
 
-#. ($forcedSourceFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:987
-msgid "the original path to the file is %1"
-msgstr "המסלול המקורי לקבוץ הוא %1"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:119
 msgid "then delete them"
 msgstr "ואז מחק אותם"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "time"
-msgstr "פעם"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:165
 msgid "time limit exceeded"
 msgstr "עברה מגבלת הזמן"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "times"
-msgstr "פעמים"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:35
+msgid "time remaining"
+msgstr ""
 
 # Context is Assign ____ to _____
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:183
 msgid "to"
 msgstr "ל-"
 
 #. ($ce->{institutionName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:399
 msgid "to %1 main web site"
 msgstr "אל האתר הראשי של %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:524
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:381
 msgid "to courses page"
 msgstr "לרשימת הקורסים בשרת"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:436
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:135
 msgid "to one <b>set</b>"
 msgstr "<b>לגליון</b> אחד"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:764
-msgid "top score"
-msgstr "הציון הגבוהה ביותר"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:432
 msgid "total"
 msgstr "סה\"כ"
 
 #. ($ce->{webworkDirs}{logs})
 #. ($ce->{webworkDirs}{tmp})
 #. ($ce->{webworkDirs}{DATA})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:47
 msgid "unable to write to directory %1"
 msgstr "לא ניתן לכתוב לתיקייה %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:333
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:49
 msgid "unlimited"
 msgstr "לא מוגבל"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:14
 msgid "unlimited reusability"
 msgstr "לשימוש בלתי מוגבל"
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:609
-msgid "userID: %1 --"
-msgstr "מזהה משתמש: %1--"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:652
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:259
 msgid ""
 "username, last name, first name, section, achievement level, achievement "
 "score,"
 msgstr "שם משתמש, שם משפחה, שם פרטי, קבוצה, רמת הישגים, נקודות הישגים"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:704
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:10
 msgid "users who match on selected field"
 msgstr "משתמשים שתאמו בשדה שנבחרה"
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
+#. ($set->version_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:295
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:408
+msgid "version %1"
+msgstr ""
+
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:134
 msgid "version (%1)"
 msgstr "גרסה (%1)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1591
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1888
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:820
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:951
 msgid "visible"
 msgstr "גלוי"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "visible to students"
-msgstr "זמין לסטודנטים"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1257
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:947
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:998
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:7
 msgid "visible users"
 msgstr "משתמשים שניתנים לצפייה"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:485
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:500
 msgid "when you submit your answers"
 msgstr "כאשר אתה מגיש את תשובותיך"
 
 #. ($dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1532
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:623
 msgid "won't be able to read from file %1/%2: does it exist? is it readable?"
 msgstr "לא קריאה מקובץ %1/%2 לא תצליח: האם הוא קיים? האם הוא ניתן לקריאה?"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:604
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:638
 msgid "your overall score is for all the parts combined."
 msgstr "הציון הכולל הוא על בסיס כל החלקים."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:231
 msgid "your students"
 msgstr "הסטודנטים שלך"
diff --git a/lib/WeBWorK/Localize/hu.po b/lib/WeBWorK/Localize/hu.po
index 70949ddcc5..70602f1ada 100644
--- a/lib/WeBWorK/Localize/hu.po
+++ b/lib/WeBWorK/Localize/hu.po
@@ -10,256 +10,319 @@ msgstr ""
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: 2013-01-27 17:03+0000\n"
 "Last-Translator: pcsiba <pcsiba@gmail.com>, 2014,2016-2017\n"
-"Language-Team: Hungarian (http://www.transifex.com/webwork/webwork2/language/hu/)\n"
+"Language-Team: Hungarian (http://app.transifex.com/webwork/webwork2/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:428
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:449
+#. ($_->{problem}->version_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:69
+msgid " (version %1)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:265
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:284
 msgid " Answers Available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:735
-msgid "# of active students"
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1148
+msgid " No changes have been made to set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:130
+msgid "\"Act as\" a student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:31
+msgid "\"Edit Assigned Users\" column"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:24
+msgid "\"Edit Problems\" column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:506
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:187
+msgid "# of Active Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:85
+msgid "# of attempts"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:333
 msgid "#corr"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:508
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:335
 msgid "#incorr"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2249
-msgid "% Score:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:174
+msgid "% Average with Review"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:685
-msgid "% correct"
-msgstr "% helyes"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:702
-msgid "% correct with review"
-msgstr "% ellenőrzéssel helyes "
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:66
+msgid "% Score with Review"
+msgstr ""
 
-# Percent students
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:762
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:792
-msgid "% students"
-msgstr "% diák"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:479
+msgid "% Score:"
+msgstr ""
 
 #. ($achievement->{points})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:24
 msgid "%1 Points:"
 msgstr "%1 pont"
 
-#. ($lib eq '' ? $r->maketext('Local')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:476
+#. ($lib eq '' ? maketext('Local')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:9
 msgid "%1 Problems:"
 msgstr "%1 feladat"
 
-#. ($itemCounts{$item->id()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:189
+#. ($itemCounts->{ $item->id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:12
 msgid "%1 remaining"
 msgstr ""
 
-#. ($numAdded, $numSkipped, join(', ', @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1410
+#. ($count)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2001
+msgid "%1 sets"
+msgstr ""
+
+#. ($numAdded,                     $numSkipped,
+#. join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:608
 msgid "%1 sets added, %2 sets skipped. Skipped sets: (%3)"
 msgstr "%1 feladatsor hozzáadva, %2 feladatsor átugorva. Az átugrott feladatsorok: (%3)"
 
-#. ($numExported, $numSkipped, ($numSkipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1526
+#. ($numExported, $numSkipped,                     $numSkipped ? $c->tag('ul',
+#. $c->c(map { $c->tag('li', $_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:673
 msgid "%1 sets exported, %2 sets skipped. Skipped sets: (%3)"
 msgstr "%1 feladatsor exportálva, %2 feladatsor átugorva. Az átugrott feladatsorok: (%3) "
 
 #. ($count, $numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:608
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
 msgid "%1 students out of %2"
 msgstr "%1 diák a %2 közül"
 
-#. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle,
+#. ($rename_oldCourseID,          $rename_oldCourseTitle,
+#. $rename_newCourseTitle,
 #. $rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:675
 msgid "%1 title and institution changed from %2 to %3 and from %4 to %5"
 msgstr "A %1 kurzus címe %2 -ról(ről) %3 - ra(re) és intézménye %4 -ról(ről) %5 - ra(re) változott "
 
-#. (scalar @userIDsToExport, $dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1338
-msgid "%1 users exported to file %2/%3"
-msgstr "%1 felhasználó exportálva a %2/%3 állományba"
+#. (scalar @userIDsToExport, "$dir/$fileName")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:477
+msgid "%1 users exported to file %2"
+msgstr ""
 
-#. ($numReplaced, $numAdded, $numSkipped, join (", ", @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1233
+#. ($numReplaced, $numAdded, $numSkipped, join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:443
 msgid ""
 "%1 users replaced, %2 users added, %3 users skipped. Skipped users: (%4)"
 msgstr "%1 felhasználó cserélve, %2 hozzáadva, %3 átugorva. Az átugrott feladatsorok: (%4) "
 
-#. ($levelpercentage)
 #. ($percentage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:135
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:136
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:323
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:324
+#. ($level_percentage)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:12
 msgid "%1% Complete"
 msgstr "%1% teljesítve"
 
 #. (wwRound(0, $answerScore * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:268
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:248
 msgid "%1% correct"
 msgstr "%1% helyes"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:207
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:57
 msgid "%1's Current Address"
 msgstr "%1 jelenlegi címe"
 
-#. ($user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:136
+#. ($c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:26
 msgid "%1's Current Password"
 msgstr "%1 jelenlegi jelszava"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:225
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:65
 msgid "%1's New Address"
 msgstr "%1 új címe"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:153
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:34
 msgid "%1's New Password"
 msgstr "%1 új jelszava"
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
-msgid "%1's new password cannot be blank."
-msgstr "%1 új jelszava nem lehet üres"
-
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:76
 msgid "%1's password has been changed."
 msgstr "%1 jelszava megváltozott."
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:56
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1423
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#. ($c->tag('span', dir => 'ltr', $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1069
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:149
 msgid "%1: Problem %2"
 msgstr "%1: %2 feladata"
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:374
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:357
 msgid "%1: Problem %2 Show Me Another"
 msgstr ""
 
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2231
-msgid "%1: The directory for the course not found."
-msgstr "%1: Ennek a kurzusnak a könyvtára nem található."
-
-#. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:340
-msgid "%quant(%1,error) occured while generating hardcopy:"
+#. ($days)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:87
+msgid "%quant(%1,day)"
 msgstr ""
 
 #. ($n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:924
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:389
 msgid "%quant(%1,file) unpacked successfully"
 msgstr ""
 
+#. ($hours)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:88
+msgid "%quant(%1,hour)"
+msgstr ""
+
+#. ($minutes)
+#. (sprintf('%3.1f', $testTime)
+#. ($timeLeft)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:89
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:150
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:168
+msgid "%quant(%1,minute)"
+msgstr ""
+
 #. ($numBlanks)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:430
 msgid ""
 "%quant(%1,of the questions remains,of the questions remain) unanswered."
 msgstr "%quant(%1,kérdés maradt,kérdés maradt) megválaszolatlan."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:678
+#. ($seconds)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:90
+msgid "%quant(%1,second)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:505
 msgid "%score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2971
+#. ($dcount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:40
+msgid "(%quant(%1,item) total)"
+msgstr ""
+
+#. ($count)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:29
+msgid "(%quant(%1,item))"
+msgstr ""
+
+#. ($problemValue)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1081
+msgid "(%quant(%1,point))"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:697
 msgid "(Any unsaved changes will be lost.)"
 msgstr "(Minden nem mentett változtatás el fog veszni.)"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1278
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1287
-msgid ""
-"(Instructor hint preview: show the student hint after the following number "
-"of attempts:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:102
+msgid "(If an action cannot be executed it will not appear.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2003
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1262
 msgid "(This problem will not count towards your grade.)"
 msgstr "(Ez a feladat nem számít be az értékelésbe.)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2122
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:340
 msgid ""
 "(This test is overtime because it was not submitted in the allowed time.)"
 msgstr ""
 
-#. ($testNoun, $self->formatDateTime($set->answer_date)
+#. ($testNoun, $c->formatDateTime($c->{set}->answer_date)
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1986
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:153
 msgid "(Your score on this %1 is not available until %2.)"
 msgstr ""
 
 #. ($testNoun)
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1988
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:155
 msgid "(Your score on this %1 is not available.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1257
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1267
 msgid "(correct)"
 msgstr "(helyes)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:197
-msgid "(gw/quiz) After version answer date"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:263
 msgid "(in target set)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1449
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1269
 msgid "(incorrect)"
 msgstr "(helytelen)"
 
 #. ($pgScore)
 #. ($recScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1461
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1271
 msgid "(score %1)"
 msgstr ""
 
-#. ($display_sort_method_name{$secondary_sort_method_name})
-#. ($display_sort_method_name{$ternary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:701
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:706
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:207
+msgid "(test) After version answer date"
+msgstr ""
+
+#. ($versionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:164
+msgid "(version %1)"
+msgstr ""
+
+#. ($display_sort_method_name{$secondary_sort_method})
+#. ($display_sort_method_name{$ternary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:103
 msgid ", then by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1297
-msgid ". If this is a class roster, rename it to have extension '.lst'"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:702
+msgid ". If this is a class roster, rename it to have extension \".lst\""
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:81
+msgid "0 seconds"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1997
+msgid "1 set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1983
 msgid "1 student"
 msgstr "1 diák"
 
 #. (wwRound(2, $weights[$part] * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:145
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:58
 msgid "<b>Weight:</b> %1%"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1749
+#: /opt/webwork/webwork2/conf/defaults.config:1651
 msgid ""
 "<p>After the Reduced Scoring Date all additional work done by the student "
 "counts at a reduced rate. Here is where you set the reduced rate which must "
@@ -274,7 +337,7 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2036
+#: /opt/webwork/webwork2/conf/defaults.config:1937
 msgid ""
 "<p>During summer 2005, a newer version of the answer checkers was "
 "implemented for answers which are functions and numbers.  The newer checkers"
@@ -286,16 +349,74 @@ msgid ""
 " the old answer checkers will be used by default.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2006
+#: /opt/webwork/webwork2/conf/defaults.config:1908
 msgid ""
 "<p>MathQuill renders students answers in real-time as they type on the "
 "keyboard.</p><p>MathView allows students to choose from a variety of common "
 "math structures (such as fractions and square roots) as they attempt to "
-"input their answers.</p><p>WIRIS provides a separate workspace for students "
-"to construct their response in a WYSIWYG environment.</p>"
+"input their answers.</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1459
+msgid ""
+"<p>Mode in which the LANG and DIR settings for a single problem are "
+"determined.</p><p>The system will set the LANGuage attribute to either a "
+"value determined from the problem, a course-wide default, or the system "
+"default, depending on the mode selected. The tag will only be added to the "
+"DIV enclosing the problem if it is different than the value which should be "
+"set in the main HTML tag set for the entire course based on the course "
+"language.</p><p>There are two options for the DIRection attribute: \"ltr\" "
+"for left-to-write scripts, and \"rtl\" for right-to-left scripts like Arabic"
+" and Hebrew.</p><p>The DIRection attribute is needed to trigger proper "
+"display of the question text when the problem text-direction is different "
+"than that used by the current language of the course. For example, English "
+"problems from the library browser would display improperly in RTL mode for a"
+" Hebrew course, unless the problen Direction is set to LTR.</p><p>The "
+"feature to set a problem language and direction was only added in 2018 to "
+"the PG language, so most problems will not declare their language, and the "
+"system needs to fall back to determining the language and direction in a "
+"different manner. The OPL itself is all English, so the system wide fallback"
+" is to en-US in LTR mode.</p><p>Since the defaults fall back to the LTR "
+"direction, most sites should be fine with the \"auto::\" mode, but may want "
+"to select the one which matches their course language. The mode "
+"\"force::ltr\" would also be an option for a course which runs into trouble "
+"with the \"auto\" modes.</p><p>Modes:</p><ul><li>\"none\" prevents any "
+"additional LANG and/or DIR tag being added. The browser will use the main "
+"setting which was applied to the entire HTML page. This is likely to cause "
+"trouble when a problem of the other direction is "
+"displayed.</li><li>\"auto::\" allows the system to make the settings based "
+"on the language and direction reported by the problem (a new feature, so not"
+" set in almost all existing problems) and falling back to the expected "
+"default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" allows the "
+"system to make the settings based on the language and direction reported by "
+"the problem (a new feature, so not set in almost all existing problems) but "
+"falling back to the language with the given LangCode and the direction Dir "
+"when problem settings are not available from PG.</li><li>\"auto::Dir\" for "
+"problems without PG settings, this will use the default en=english language,"
+" but force the direction to Dir. Problems with PG settings will get those "
+"settings.</li><li>\"auto:LangCode:\" for problems without PG settings, this "
+"will use the default LTR direction, but will set the language to "
+"LangCode.Problems with PG settings will get those "
+"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
+" by the PG code of the problem, and will force the system to set the "
+"language with the given LangCode and the direction to Dir for <b>all</b> "
+"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
+"PG code of the problem, and will force the system to set the direction to "
+"Dir for <b>all</b> problems, but will avoid setting any language attribute "
+"for individual problem.</li></ul>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1736
+#: /opt/webwork/webwork2/conf/defaults.config:1514
+msgid ""
+"<p>Some servers handle courses taking place in different timezones.  If this"
+" course is not showing the correct timezone, enter the correct value here.  "
+"The format consists of unix times, such as \"America/New_York\", "
+"\"America/Chicago\", \"America/Denver\", \"America/Phoenix\" or "
+"\"America/Los_Angeles\".</p>Complete list: <a "
+"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1638
 msgid ""
 "<p>This sets whether the Reduced Scoring system will be enabled.  If enabled"
 " you will need to set the default length of the reduced scoring period and "
@@ -307,22 +428,35 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1979
+#: /opt/webwork/webwork2/conf/defaults.config:1881
 msgid ""
 "<p>When viewing a problem, users may choose different methods of rendering "
 "formulas via an options box in the left panel. Here, you can adjust what "
 "display modes are listed.</p><p>Some display modes require other software to"
 " be installed on the server. Be sure to check that all display modes "
-"selected here work from your server.</p><p>The display modes are "
-"<ul><li>plainText: shows the raw LaTeX strings for formulas.</li><li>images:"
-" produces images using the external programs LaTeX and "
-"dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place "
-"render mathematics.</li></ul></p></p>You must use at least one display mode."
-" If you select only one, then the options box will not give a choice of "
-"modes (since there will only be one active).</p>"
+"selected here work from your server.</p><p>The display modes "
+"are</p><ul><li>plainText: shows the raw LaTeX strings for "
+"formulas.</li><li>images: produces images using the external programs LaTeX "
+"and dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place"
+" render mathematics.</li></ul><p>You must use at least one display mode. If "
+"you select only one, then the options box will not give a choice of modes "
+"(since there will only be one active).</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1476
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with a question in "
+"this test. Please inform your instructor including the warning messages "
+"below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1236
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with this question. "
+"Please inform your instructor including the warning messages below."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1828
+#: /opt/webwork/webwork2/conf/defaults.config:1730
 msgid ""
 "<ul><li><b>SMAcheckAnswers</b>: enables the Check Answers button <i>for the "
 "new problem</i> when Show Me Another is "
@@ -334,7 +468,7 @@ msgid ""
 "time</li><li><b>SMAshowHints</b>: show hints <i>for the new problem</i> "
 "(assuming they exist)</li></ul>Note: there is very little point enabling the"
 " button unless you check at least one of these options - the students would "
-"simply see a new version that they can not attempt or learn from.</p>"
+"simply see a new version that they can not attempt or learn from."
 msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:35
@@ -343,73 +477,123 @@ msgstr ""
 
 #. ($add_courseID)
 #. ($rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1376
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:688
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:600
 msgid "A course with ID %1 already exists."
 msgstr "Ezzel az azonosítóvall (ID %1) már létezik kurzus!"
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2564
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1220
 msgid ""
 "A directory already exists with the name %1. You must first delete this "
 "existing course before you can unarchive."
 msgstr "Ezzel a névvel (%1) már létezik könyvtár. Önnek előbb törölnie kell ezt a létező kurzust, mielőtt vissza tudná állítani az archívumból."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:119
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:111
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:42
 msgid ""
 "A file name cannot begin with a dot, it cannot be empty, it cannot contain a"
 " directory path component and only the characters -_.a-zA-Z0-9 and space are"
 " allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1342
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1366
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:738
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
 msgid "A file with that name already exists"
 msgstr "Ilyen nevű állomány már létezik."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:348
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:19
 msgid ""
 "A hardcopy file was generated, but it may not be complete or correct. Please"
 " check that no problems are missing and that they are all legible. If not, "
 "please inform your instructor."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:56
+msgid ""
+"A hash reference in which the keys are the achievement_id's assigned to the "
+"current user and the values are 0 or 1 which stores if the user has earned "
+"the associated achievement or not."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:52
+msgid ""
+"A hash reference which contains a problems metadata, such as DBsubject, "
+"DBchapter, DBsection,  and so on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:37
+msgid "A hash reference which contains the problem data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:40
+msgid "A hash reference which contains the set data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:60
+msgid ""
+"A hash reference which saves data for this user and this achievement. This "
+"hash is persistent between evaluations and changes to this variable will be "
+"saved in the database."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:64
+msgid ""
+"A hash reference which saves global data for this user. This hash is "
+"persistent between evaluations and changes to this variable will be saved in"
+" the database."
+msgstr ""
+
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3291
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1695
 msgid ""
 "A location with the name %1 already exists in the database.  Did you mean to"
 " edit that location instead?"
 msgstr ""
 
-#. ($subject, $number_of_recipients, $courseName, $failed_messages)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1007
+#. ($mail_data->{subject}, $number_of_recipients, $mail_data->{courseName},
+#. $failed_messages)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:113
 msgid ""
 "A message with the subject line \"%1\" has been sent to %quant(%2,recipient)"
 " in the class %3.  There were %4 message(s) that could not be sent."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:644
-msgid "A new file has been created at '%1'"
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:315
+msgid "A new file has been created at \"%1\""
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1146
+msgid "A new file has been created at \"%1\" with the contents below."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:154
+msgid ""
+"A new problem whose path ends in newProblem.pg should be given a new name, "
+"for example, \"myNewProblem.pg\"."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2006
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:20
 msgid ""
-"A new file has been created at '%1' with the contents below.  No changes "
-"have been made to set %2"
+"A student must be assigned a homework set in order for it to appear on their"
+" WeBWorK home page. Check the box in the left column to assign a student to "
+"that homework set. Uncheck the box to unassign a student. If a student is "
+"unassigned from a homework set, all of the student's data for that homework "
+"set is deleted and cannot be recovered. Use this action cautiously!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:681
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:20
 msgid ""
-"A period (.) indicates a problem has not been attempted, and a number from 0"
-" to 100 indicates the grade earned. The number on the second line gives the "
-"number of incorrect attempts."
+"A student needs to be assigned a set in order for them to work it. Once a "
+"student is unassigned a set, all the data for them is lost and there is no "
+"way to undo it. When unassigning be sure to change the option to \"Allow "
+"unassign\"."
 msgstr ""
 
 # Leave symbol codes in place
-#: /opt/webwork/webwork2/conf/defaults.config:1647
+#: /opt/webwork/webwork2/conf/defaults.config:1549
 msgid ""
 "A switch to govern the use of a Progress Bar for the student; this also "
 "enables/disables the highlighting of the current problem in the side bar, "
@@ -417,474 +601,665 @@ msgid ""
 "(&#x2717;), or unattempted (no symbol)."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:42
+msgid "A unique key identifying the achievement."
+msgstr ""
+
 # Short for ADJUSTED STATUS
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:500
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:712
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:535
 msgid "ADJ STATUS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2296
-msgid "ANSWERS NOT RECORDED"
-msgstr "A VÁLASZ NINCS ELMENTVE"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2281
-msgid "ANSWERS NOT RECORDED --"
-msgstr "A VÁLASZ NINCS ELMENTVE --"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2295
-msgid "ANSWERS ONLY CHECKED -- "
-msgstr "A VÁLASZ CSAK ELLENŐRIZVE LETT --"
+#. ($c->{scoreRecordedMessage}[ $probOrder->[$i] ])
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:504
+msgid "ANSWERS NOT RECORDED -- %1"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2232
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1505
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:515
 msgid "ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"
 msgstr "A VÁLASZ CSAK ELLENŐRIZVE - A VÁLASZ NICS RÖGZÍTVE"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1527
 msgid ""
 "ATTEMPT NOT ACCEPTED -- Please submit answers again (or request new version "
 "if neccessary)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1534
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_password_form.html.ep:1
 msgid "Abandon changes"
 msgstr "A változások elhagyása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1083
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_export_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_export_form.html.ep:1
 msgid "Abandon export"
 msgstr "Az export elhagyása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:520
 msgid ""
 "Account creation is currently disabled in this course.  Please speak to your"
 " instructor or system administrator."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:153
-msgid "Achievement"
-msgstr "Eredmény"
-
-#. ($targetAchievementID, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:638
-msgid "Achievement %1 created with evaluator '%2'."
-msgstr "'%2' értékelő létrehozta a %1 eredményt."
+#. ($targetAchievementID,			$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:310
+msgid "Achievement %1 created with evaluator \"%2\"."
+msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:847
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:378
 msgid "Achievement %1 exists.  No achievement created"
 msgstr "%1 eredmény már létezik. Az eredmény-típus nem lett létrehozva"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:444
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:63
 msgid "Achievement Editor"
 msgstr "Eredmény szerkesztő"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:548
-msgid "Achievement Evaluator Editor"
-msgstr "Eredmény-értékelő szerkesztő"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:17
+msgid "Achievement Editor Help"
+msgstr ""
 
-#. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:170
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:17
+msgid "Achievement Evaluator Editor Help"
+msgstr ""
+
+#. ($c->stash('achievementID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:109
 msgid "Achievement Evaluator for achievement %1"
 msgstr "%1 eredmény értékelője"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1446
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1454
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1482
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:13
 msgid "Achievement ID"
 msgstr "Eredmény-azonosító"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:274
 msgid "Achievement ID exists!  No new achievement created.  File not saved."
 msgstr "Ez az eredmény-azonosító már létezik! Nem lett új eredmény-katégória  "
 
-#: /opt/webwork/webwork2/conf/defaults.config:1698
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:41
+msgid "Achievement ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:3
+msgid "Achievement List"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1600
 msgid "Achievement Points Per Problem"
 msgstr "Feladatonkénti eredmény-pontok"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:558
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:455
 msgid "Achievement User Editor"
 msgstr "Felhasználói eredményszerkesztő"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:17
+msgid "Achievement User Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:48
 msgid "Achievement has been assigned to all users."
 msgstr "Az eredmény hozzá lett rendelve az összes felhasználóhoz"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:67
 msgid "Achievement has been assigned to selected users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:60
 msgid "Achievement has been unassigned to all students."
 msgstr "Az eredmény-hozzárendelés vissza lett vonva az összes diáknál"
 
-#. (CGI::a({ href => $fileManagerURL }, $scoreFileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:711
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:38
+msgid "Achievement options"
+msgstr ""
+
+#. ($c->link_to(                           $scoreFileName => $c->systemLink(
+#. $c->url_for('instructor_file_manager')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:318
 msgid "Achievement scores saved to %1"
 msgstr "Az eredmények pontszáma el lett mentve ehhez: %1 "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:260
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:241
 msgid "Achievements"
 msgstr "Eredmények"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:531
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:17
+msgid "Achievements Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:26
+msgid ""
+"Achievements are evaluated in the order shown below, with the exception of "
+"\"level\" achievements.  Achievements in the \"level\" category are "
+"evaluated first and control the XP thresholds and rewards (achievement "
+"items) for reaching each level. Achievements in the \"secret\" category are "
+"not shown to students until they earn the achievement, and is used for "
+"fun/surprise achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:32
+msgid ""
+"Achievements in the same category, with sequential numbers, and whose ID "
+"starts with the same \"prefix_\" (up to the last underscore), are treated as"
+" achievement chains.  Achievement chains are a sequence of achievements "
+"which build upon themselves, such as complete one problem, complete 10 "
+"problems, complete 25 problems, and so on. Students will only see the "
+"achievements in the chain they have completed or are currently working on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:201
 msgid "Act as"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:207
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:26
 msgid "Act as:"
 msgstr ""
 
-#. (HTML::Entities::encode_entities($prettyEUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1134
+#. ($effectiveUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:26
 msgid "Acting as %1."
 msgstr ""
 
 #. ($actionID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:372
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:223
 msgid "Action %1 not found"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1706
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:101
+msgid "Actions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1608
 msgid ""
 "Activating this will enable achievement rewards. This feature allows "
 "students to earn rewards by completing achievements that allow them to "
 "affect their homework in a limited way."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:45
 msgid "Active"
 msgstr "Aktív"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1691
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:50
+msgid "Active Students"
+msgstr ""
+
+#. ($c->{prettyID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:19
+msgid "Active Students Problem %1 Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1593
 msgid ""
 "Activiating this will enable Mathchievements for webwork.  Mathchievements "
 "can be managed by using the Achievement Editor link."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2947
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1548
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:166
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:89
 msgid "Add All"
 msgstr "Mindet add hozzá"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:644
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:32
 msgid "Add Course"
 msgstr "Kurzus hozzáadása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:253
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:17
+msgid "Add Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:14
+msgid "Add Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:98
 msgid "Add Students"
 msgstr "Diák hozzáadása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:406
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:349
 msgid "Add Users"
 msgstr "Felhasználók hozzáadása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:518
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:17
+msgid "Add Users Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:47
 msgid "Add WeBWorK administrators to new course"
 msgstr "Add hozzá az új kurzushoz annak WeBWorK adminisztrátorait"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1509
-msgid "Add a new test for which Gateway?"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:79
+msgid "Add a TA or an instructor (change permission level of user)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:60
+msgid "Add a few students to the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1441
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:50
+msgid "Add a new version for which test?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:20
 msgid "Add as what filetype?"
 msgstr "Milyen állomány(fájl)típusként adja hozzá?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/add_form.html.ep:3
 msgid "Add how many users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1549
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:69
+msgid "Add many students to a course from a class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:108
+msgid "Add n blank problem template(s) to the end of homework set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:164
 msgid "Add problem to target set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Add problems to"
 msgstr "A feladat hozzáadása ehhez:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1422
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:161
+msgid ""
+"Add this problem as the last problem of an existing set, either as a problem"
+" or as the set header (the text that appears on the home page of a homework "
+"set). You can rearrange the order of the problems later using the \"Hmwk "
+"Sets Editor\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:7
 msgid "Add to what set?"
 msgstr "Melyik feladatsorhoz adja hozzá?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:20
+msgid ""
+"Add users to the course.  Select the number of students/users to add and "
+"then add any desired information.  The only mandatory information is the "
+"\"Login Name\". Any other fields may be left blank.  The \"Student ID\" will"
+" be the initial password for the user if provided."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:26
 msgid "Add which new users?"
 msgstr "Hány felhasználót adjon hozzá?"
 
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:883
+msgid "Added \"%1\" to %2 as new hardcopy header"
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:854
+msgid "Added \"%1\" to %2 as new set header"
+msgstr ""
+
 #. ('{number}', '{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1055
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:27
 msgid "Added %1 problems to set %2."
 msgstr ""
 
-#. ($sourceFilePath, $targetSetName,($set->assignment_type eq 'jitar' ?
-#. join('.',jitar_id_to_seq($targetProblemNumber)
-#. ($new_file_name, $setName, ($set->assignment_type eq 'jitar' ?
-#. join('.',jitar_id_to_seq($targetProblemNumber)
 #. ($new_file_path, $setID, $targetProblemNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1510
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2001
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1912
+#. ($sourceFilePath,                       $targetSetName,                 (
+#. $set->assignment_type eq 'jitar'                                ? join('.',
+#. jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:825
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1837
 msgid "Added %1 to %2 as problem %3"
 msgstr ""
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1566
-msgid "Added '%1' to %2 as new hardcopy header"
-msgstr ""
-
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1540
-msgid "Added '%1' to %2 as new set header"
+#. ($new_file_name,                                $c->{setID},
+#. (                                       $set->assignment_type eq 'jitar'
+#. ? join('.', jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1139
+msgid "Added %1 to %2 as problem %3."
 msgstr ""
 
 #. (join(', ', @toAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1974
 msgid "Added addresses %1 to location %2."
 msgstr ""
 
+#. ($user->user_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:167
+msgid "Added missing permission level for user %1."
+msgstr ""
+
 #. ('{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1054
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:26
 msgid "Added one problem to set %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Added user:"
+msgstr ""
+
+#. ('<code>[Scoring]/report_grades_data.csv</code>',
+#. '<code>[TMPL]/email/report_grades.msg</code>',)
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:33
+msgid ""
+"Additional (external) grades can be shown on this page by placing them in "
+"the CSV file %1.  The first six columns must be (in order): Student ID, "
+"Username, Last Name, First Name, Section, Recitation.  The remaining columns"
+" can list any external grades.  To display the grades, the CSV file is "
+"merged with the \"Email\" message %2, which will be rendered and displayed "
+"below the grade table.  The message can be created on the \"Email\" page and"
+" the CSV file can be created/uploaded using the \"File Manager\".  External "
+"grades can only be displayed here and are not included in any totals or "
+"statistics."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2060
 msgid "Additional addresses for receiving feedback e-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:235
 msgid "Additional submissions available."
 msgstr ""
 
 #. ($badLocAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1708
 msgid ""
 "Address(es) %1 already exist in the database.  THIS SHOULD NOT HAPPEN!  "
 "Please double check the integrity of the WeBWorK database before continuing."
 msgstr ""
 
 #. (join(', ', @noAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1986
 msgid ""
 "Address(es) %1 in the add list is(are) already in the location %2, and so "
 "were skipped."
 msgstr ""
 
 #. (join(', ', @noDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3603
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2008
 msgid ""
 "Address(es) %1 in the delete list is(are) not in the location %2, and so "
 "were skipped."
 msgstr ""
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1683
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and resubmit."
 msgstr ""
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1998
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:117
 msgid "Addresses"
 msgstr "Címek"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:53
 msgid ""
 "Addresses for new location.  Enter one per line, as single IP addresses "
 "(e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP ranges "
 "(e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:27
 msgid ""
 "Addresses to add to the location.  Enter one per line, as single IP "
 "addresses (e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP"
 " ranges (e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:232
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:27
 msgid "Adds 24 hours to the close date of a homework."
 msgstr "A házi feladat lezárásának meghosszabbítása 24 órával"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:323
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:27
 msgid "Adds 48 hours to the close date of a homework."
 msgstr "A házi feladat lezárásának meghosszabbítása 48 órával"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:110
+msgid ""
+"Adds new template problems to the set when the set is saved. You can modify "
+"the template to create your own problem, by clicking on the \"Edit Problem\""
+" link and saving to some new file, e.g. \"myNewProblem.pg\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:19
 msgid "Adjusted Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:56
 msgid "Adobe PDF"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:675
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:42
 msgid "Advanced Search"
 msgstr "Bővített keresés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:196
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:206
 msgid "After set answer date"
 msgstr ""
 
-#. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:325
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:33
 msgid ""
-"After the reduced scoring period begins all work counts for %1% of its "
-"value."
+"After the due date this set enters a reduced scoring period until it closes "
+"on %1.  All work completed during the reduced scoring period counts for %2% "
+"of its value."
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:304
 msgid "Afterward reduced credit can be earned until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:56
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:60
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:23
 msgid "All Chapters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:57
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:34
 msgid "All Sections"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:6
 msgid "All Selected Constraints Joined by \"And\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:71
+msgid "All Sets"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:12
 msgid "All Subjects"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:48
 msgid "All Textbooks"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:54
+msgid "All Users"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:49
 msgid "All assignments were made successfully."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:953
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:386
 msgid "All listed sets were hidden from all the students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:951
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:381
 msgid "All listed sets were made visible for all the students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:407
 msgid "All of the answers above are correct."
 msgstr "Az összes fenti válasz helyes."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:398
 msgid "All of the gradeable answers above are correct."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:247
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:162
+msgid ""
+"All of the paths for problem files are relative to the templates directory "
+"of the current course. You can access this directory \"directly\" using the "
+"File Manager page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:68
 msgid "All of these files will also be made available for mail merge."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:960
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:9
+msgid "All problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:5
+msgid "All sections"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2145
+msgid "All selected courses are already hidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2214
+msgid "All selected courses are already unhidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:399
 msgid "All selected sets hidden from all students"
 msgstr "Az összes kiválasztott feladatsor elrejtve az összes diák elől"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:394
 msgid "All selected sets made visible for all students"
 msgstr "Az összes kiválasztott feladatsor láthatóvá téve az összes diák számára"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:946
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:373
 msgid "All sets hidden from all students"
 msgstr "Az összes feladatsor elrejtve az összes diák elől"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:945
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:368
 msgid "All sets made visible for all students"
 msgstr "Az összes feladatsor láthatóvá téve az összes diák számára"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:619
 msgid "All sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:56
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:54
 msgid "All unassignments were made successfully."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2047
+#: /opt/webwork/webwork2/conf/defaults.config:1948
 msgid "Allow Unicode alternatives in student answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:74
 msgid "Allow the LMS to update user account data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:68
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:105
 msgid "Allow unassign"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2069
+#: /opt/webwork/webwork2/conf/defaults.config:1970
 msgid "Allowed error, as a percentage, for numerical comparisons"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1886
+#: /opt/webwork/webwork2/conf/defaults.config:1788
 msgid "Allowed to <em>act as</em> another user"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1923
+#: /opt/webwork/webwork2/conf/defaults.config:1825
 msgid "Allowed to change display settings used in pg problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1913
+#: /opt/webwork/webwork2/conf/defaults.config:1815
 msgid "Allowed to change their e-mail address"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1877
+#: /opt/webwork/webwork2/conf/defaults.config:1779
 msgid "Allowed to change their password"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1872
+#: /opt/webwork/webwork2/conf/defaults.config:1774
 msgid "Allowed to login to the course"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1950
+#: /opt/webwork/webwork2/conf/defaults.config:1852
 msgid "Allowed to see solutions before the answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1945
+#: /opt/webwork/webwork2/conf/defaults.config:1847
 msgid "Allowed to see the correct answers before the answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1934
+#: /opt/webwork/webwork2/conf/defaults.config:1836
 msgid "Allowed to view past answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1940
+#: /opt/webwork/webwork2/conf/defaults.config:1842
 msgid "Allowed to view problems in sets which are not open yet"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1572
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:82
+msgid ""
+"Allows configuration of certain parameters, such as permission levels, "
+"default display mode for equations, and email feedback behavior, on a course"
+" by course basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:126
+msgid "Also copy simple configuration file"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:26
 msgid "Amulet of Extension"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:20
+msgid ""
+"An achievement evaluator is a perl script that is run after each problem is "
+"submitted which returns a truth value of 0 (didn't earn) or 1 (earn). The "
+"evaluator is given access to different variables which contain data about "
+"the problem and set that is used to determine if the achievement is earned "
+"or not."
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:37
 msgid ""
 "An address that can be used to log in to the LMS. This is used in messages "
@@ -892,248 +1267,308 @@ msgid ""
 "WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:43
+msgid ""
+"An array which lists the hash reference of all the problems in the current "
+"set."
+msgstr ""
+
 #. ($archive_courseID)
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2350
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2647
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1274
 msgid "An error occured while archiving the course %1:"
 msgstr ""
 
 #. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:658
 msgid "An error occured while changing the title of the course %1."
 msgstr ""
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1795
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:878
 msgid "An error occured while deleting the course %1:"
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1521
+#. ($rename_oldCourseID,						$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:751
 msgid "An error occured while renaming the course %1 to %2:"
 msgstr ""
 
 #. ($part + 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:106
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:25
 msgid "Answer %1 Score (%):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:425
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:765
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:789
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:812
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:79
 msgid "Answer Date"
 msgstr "A válasz dátuma"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1712
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:39
 msgid "Answer Group Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:59
 msgid "Answer Hash Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:221
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:292
 msgid "Answer Log"
 msgstr "A válaszok naplója"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:17
+msgid "Answer Log Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:285
 msgid "Answer Preview"
 msgstr "A válasz megmutatása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1465
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:48
+msgid ""
+"Answer availability for tests depends on multiple settings.  This only "
+"indicates the template answer date has passed.  See set editor for actual "
+"availability."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1276
 msgid "Answer(s) submitted:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
 msgid "Answer:"
 msgstr "Válasz:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:224
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
 msgid "Answers"
 msgstr "Válaszok"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:122
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:37
 msgid "Answers Available"
 msgstr "Válaszok engedélyezve"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1202
 msgid "Answers cannot be due until on or after the open date!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1204
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1197
 msgid "Answers cannot be made available until on or after the close date!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:313
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:21
 msgid ""
 "Any changes made below will be reflected in the achievement for ALL "
 "students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2259
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:507
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:175
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:69
 msgid "Any changes made below will be reflected in the set for ALL students."
 msgstr "Bármely fenti változás a feladatsorban alkalmazódik az összes diákra."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:173
 msgid ""
 "Any changes made below will be reflected in the set for ONLY the student(s) "
 "listed above."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:122
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:159
 msgid "Append"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1849
+#. (tag('strong', dir => 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:71
 msgid "Append to end of %1 set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2264
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:51
+msgid "Applying definitions theoretically and proof writing"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:91
 msgid "Archive"
 msgstr ""
 
 #. ($archive, $n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:892
-msgid "Archive '%1' created successfully (%quant( %2, file))"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:361
+msgid "Archive \"%1\" created successfully (%quant( %2, file))"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1069
-msgid "Archive '%1' deleted"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:525
+msgid "Archive \"%1\" deleted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1846
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2048
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:38
 msgid "Archive Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2005
-msgid "Archive Courses"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:17
+msgid "Archive Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2423
-msgid "Archive next course"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:63
+msgid "Archive Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1056
-msgid "Archive this Course"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1158
+msgid "Archive next course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:61
 msgid "Archived Courses"
 msgstr ""
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:202
-msgid "Archiving course as %1.tar.gz. Reload FileManager to see it."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:69
+msgid "Archived course as %1.tar.gz."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:25
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to access the .tar.gz files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:26
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to upload additional .tar.gz "
+"files to be unarchived."
 msgstr ""
 
-#. (CGI::b($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2191
+#. (tag('b', $archive_courseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:57
 msgid ""
 "Are you sure that you want to delete the course %1 after archiving? This "
 "cannot be undone!"
 msgstr ""
 
-#. (CGI::b($delete_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1736
+#. (tag('b', param('delete_courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:5
 msgid ""
 "Are you sure you want to delete the course %1? All course files and data "
 "will be destroyed. There is no undo available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:72
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:511
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:64
+msgid ""
+"As the checkbox says, this includes a percentage grade column for each set."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:184
 msgid "Assign"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:225
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:62
 msgid "Assign All Sets to Current User"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:171
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:106
+msgid "Assign achievements"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:43
+msgid "Assign and unassign selected exercise sets to selected users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:54
 msgid "Assign selected sets to selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:919
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:154
+msgid "Assign sets to many students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:116
+msgid "Assign sets to one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:15
 msgid "Assign this achievement to which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1366
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:62
 msgid "Assign this set to which users?"
 msgstr "Mely felhasználókhoz rendelje ezt a feladatsort?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:15
 msgid "Assign to All Current Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:3
 msgid "Assign which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:35
 msgid "Assigned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1984
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:19
 msgid "Assigned Sets"
 msgstr "Hozzárendelt feladatsorok"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:580
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:218
 msgid "Assigned achievements to users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2154
-msgid "Assigned to"
+#. (link_to(						$c->setCountMessage($db->countUserSets($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:96
+msgid "Assigned to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:212
 msgid "Assignment type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-msgid "Assignments only"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:2004
+#: /opt/webwork/webwork2/conf/defaults.config:1906
 msgid "Assist with the student answer entry process."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:417
 msgid "At least one of the answers above is NOT correct."
 msgstr ""
 
 # Short for "Attempts to Open Children"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:487
 msgid "Att. to Open Children"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:50
 msgid "Attachment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2293
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:107
 msgid "Attempt to upgrade directories"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:375
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:449
 msgid "Attempted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1416
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1498
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/attempts_row.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:73
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:13
 msgid "Attempts"
 msgstr "Próbálkozások"
 
@@ -1141,64 +1576,114 @@ msgstr "Próbálkozások"
 msgid "Audit"
 msgstr "ellenőrzés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:342
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:348
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:360
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:366
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:460
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:466
 msgid "Authentication failed.  Please speak to your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/InstructorRPCHandler.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:44
+msgid "Authentication failed. Log in again to continue."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:116
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:69
 msgid "Author Info"
 msgstr "Szerző adatai"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:87
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2058
+#: /opt/webwork/webwork2/conf/defaults.config:1959
 msgid ""
 "Automatically convert Full Width Unicode characters to their ASCII "
 "equivalents"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2911
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:97
+msgid ""
+"Automatically render all problems in the set on this page when \"Save "
+"Changes\" or \"Reset Form\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:667
 msgid "Automatically render problems on page load"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1727
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:95
+msgid "Automatically render problems on page load."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:49
 msgid "Auxiliary Resources"
 msgstr ""
 
-#. ($emailDirectory,$old_default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:350
-msgid "Backup file <code>%1/%2</code> created."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:179
+msgid "Average Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:255
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:118
+msgid "Average Attempts Per Problem"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:115
+msgid "Average Percent"
+msgstr ""
+
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:558
+msgid "Backup created on %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:1
 msgid "Badges"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:942
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:106
 msgid "Basic Search"
 msgstr "Alap keresés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
-msgid "Binary"
-msgstr "Bináris"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:28
+msgid "Before Open Date"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1271
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:31
+msgid ""
+"Below the file list is a button and options for uploading files. Click the "
+"\"Choose File\" button, select the file, then click \"Upload\". A single "
+"file or a compressed tar (.tgz) file can be uploaded and if the option is "
+"selected, the archive is automatically unpacked and deleted.  Generally the "
+"\"automatic\" option on Format will correctly pick the correct type of file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:83
+msgid "Binary"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+msgid "Both Start and Grade"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:26
 msgid "Box of Transmogrification"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1093
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:40
 msgid "Browse"
 msgstr "Keres"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:512
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:991
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:16
 msgid "Browse from:"
 msgstr "Keresés innen:"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2161
+#: /opt/webwork/webwork2/conf/defaults.config:2072
 msgid ""
 "By default, feedback is always sent to all users specified to recieve "
 "feedback.  This variable sets the system to only email feedback to users who"
@@ -1206,327 +1691,471 @@ msgid ""
 "will only be sent to section leaders."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2151
+#: /opt/webwork/webwork2/conf/defaults.config:2062
 msgid ""
 "By default, feedback is sent to all users above who have permission to "
 "receive feedback. Feedback is also sent to any addresses specified in this "
 "blank. Separate email address entries by commas."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
 msgid "CLOSE DATE"
 msgstr "A lezárás dátuma"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:217
 msgid "CLOSE TIME"
 msgstr "A lezárás ideje"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:26
 msgid "Cake of Enlargement"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1891
+#: /opt/webwork/webwork2/conf/defaults.config:1793
 msgid "Can e-mail instructor"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1904
+#: /opt/webwork/webwork2/conf/defaults.config:1806
 msgid "Can report bugs"
 msgstr "Be lehet jelenteni a hibákat "
 
-#: /opt/webwork/webwork2/conf/defaults.config:1955
+#: /opt/webwork/webwork2/conf/defaults.config:1857
 msgid "Can show old answers"
 msgstr "Meg tudja mutatni a régi válaszokat"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1897
+#: /opt/webwork/webwork2/conf/defaults.config:1799
 msgid "Can submit answers for a student"
 msgstr "El tudja fogadni a válaszokat a diáknak"
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:275
 msgid "Can't copy file: %1"
 msgstr "Nem tudja a %1 állományt másolni"
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:894
-msgid "Can't create archive '%1': command returned %2"
-msgstr "Nem lehet létrehozni a '%1' archívumot: a parancs %2 hibaüzenetet adott"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
+msgid "Can't create archive \"%1\": command returned %2"
+msgstr ""
 
 #. ($courseID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2725
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:28
 msgid "Can't create course environment for %1 because %2"
 msgstr "Nem lehet létrehozni %1 számára a kurzuskörnyezetet, mert %2 "
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:423
 msgid "Can't create directory: %1"
 msgstr "Nem lehet létrehozni a %1 könvytárat"
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1060
-msgid "Can't create file '%1': %2"
-msgstr "Nem lehet létrehozni a '%1' állományt: %2 "
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+msgid "Can't create file \"%1\": %2"
+msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:948
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:406
 msgid "Can't create file: %1"
 msgstr "Nem lehet létrehozni a '%1' állományt"
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1070
-msgid "Can't delete archive '%1': %2"
-msgstr "Nem lehet törölni a '%1' archívumot: %2"
-
-#. ($eUserID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:69
-msgid "Can't get password record for effective user '%1': %2"
-msgstr "Nem kapható meg %1 aktív felhasználó jelszó rekordját: %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:526
+msgid "Can't delete archive \"%1\": %2"
+msgstr ""
 
-#. ($userID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:64
-msgid "Can't get password record for user '%1': %2"
-msgstr "Nem kapható meg %1 felhasználó jelszó rekordját: %2"
+#. ($setID, $TargetUser->user_id,)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:925
+msgid ""
+"Can't generate hardcopy for set \"%1\" for user \"%2\". The set is not "
+"visible to students."
+msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:445
 msgid "Can't open %1"
 msgstr "Nem lehet megnyitni ezt: %1"
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1426
 msgid "Can't open file %1"
 msgstr "Nem lehet megnyitni a %1 állományt"
 
 #. ($merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:343
 msgid "Can't read merge file %1. No message sent"
 msgstr "A %1 egyesített állomány nem olvasható. Nem lett üzenet küldve"
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:760
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:298
 msgid "Can't rename file: %1"
 msgstr "Nem lehet átnevezni a %1 állományt"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:591
 msgid "Can't rename to the same name."
 msgstr "Nem lehet átnevezni  ugyanarra a névre"
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:927
-msgid "Can't unpack '%1': command returned %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:392
+msgid "Can't unpack \"%1\": command returned %2"
 msgstr ""
 
 #. ($fullPath)
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:629
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1895
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1819
 msgid "Can't write to file %1"
 msgstr "Nem lehet írni a %1 állományba"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1015
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1096
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:154
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:462
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/confirm.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:69
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:15
 msgid "Cancel"
 msgstr "Mégse"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:387
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:5
+msgid "Cancel E-Mail"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:60
 msgid "Cancel E-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:61
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:77
 msgid "Cancel Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:79
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
 msgid "Cancel Export"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:93
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
 msgid "Cancel Password"
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:516
+msgid "Cannot find a file path to save to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:501
+msgid ""
+"Cannot find a problem record for set $c->{setID} / problem $c->{problemID}"
+msgstr ""
+
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:240
 msgid "Cannot open %1"
 msgstr "Nem lehet megnyitni %1 -t"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:222
-msgid "Cap Test Time at Set Close Date?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:232
+msgid "Cap Test Time at Set Close Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1456
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1486
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:14
 msgid "Category"
 msgstr "Kategória"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:516
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:49
+msgid "Category:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:27
 msgid ""
 "Cause the selected homework set to count for twice as many points as it "
 "normally would."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1272
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:27
 msgid ""
 "Causes a homework problem to become a clone of another problem from the same"
 " set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:727
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:27
 msgid "Causes a single homework problem to be worth twice as much."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1006
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:48
 msgid "Change Course Title to:"
 msgstr "A kurzus címének változtatása erre:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:34
 msgid "Change CourseID to:"
 msgstr "A kurzusazonosító megváltoztatása erre:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:176
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:134
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:76
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:25
 msgid "Change Display Settings"
 msgstr "A megjelenítési beállítások megváltoztatása "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:53
 msgid "Change Email Address"
 msgstr "Az e-mai cím változtatása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1032
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:62
 msgid "Change Institution to:"
 msgstr "Az intézmény megváltoztatása erre:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:374
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:18
 msgid "Change Password"
 msgstr "A jelszó változtatása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:169
 msgid "Change User Settings"
 msgstr "A felhasználói beállítások megváltoztatása"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:35
+msgid "Change a course's ID, Title, or Institution."
+msgstr ""
+
 #. ($rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1092
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
 msgid "Change course institution from %1 to %2"
 msgstr "Az kurzus intézményének %1 -ról(ről) %2 -ra(re) változtatása"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:160
+msgid "Change dates for a homework set for the whole class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:123
+msgid "Change the due date for one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:26
+msgid ""
+"Change the due dates for an individual student on this page. Check the "
+"checkbox and enter the new date in order to override the date. (You can copy"
+" the date format from the date in the right hand column which indicates the "
+"date when the homework set is due for the whole class.) Note that you should"
+" ensure that the close date is before the answer date. If the close date for"
+" a student is extended until after the class answer date for the set, then "
+"the answer date for the student must also be set to a later date. "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:141
+msgid "Change the grades on a homework set for one student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:163
+msgid "Change the grading on a homework set for an entire class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:170
+msgid "Change the number of atttempts allowed on a problem."
+msgstr ""
+
 #. ($rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1089
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:508
 msgid "Change title from %1 to %2"
 msgstr "A cím %1 -ról(ről) %2 -ra(re) változtatása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1362
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:488
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:540
 msgid "Changes abandoned"
 msgstr "A változtatások elhagyása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:371
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:242
 msgid "Changes in this file have not yet been permanently saved."
 msgstr "Az állomány változásait jelenleg nem menthetőek véglegesen."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:647
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:529
 msgid "Changes saved"
 msgstr "A változtatások mentve"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1822
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:38
+msgid "Changing dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:514
 msgid ""
 "Changing the problem seed for display, but there are no problems showing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:635
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:19
 msgid "Chapter:"
 msgstr "Fejezet"
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1849
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:15
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:103
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:37
 msgid "Check Answers"
 msgstr "A válaszok ellenőrzése"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2476
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:682
 msgid "Check Test"
 msgstr "A teszt ellenőrzése"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:183
-msgid "Check that it's permissions are set correctly."
-msgstr "Ellenőrizze, hogy a jogosultságai helyesen lettek beállítva"
-
-#. ($emailDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:195
-msgid ""
-"Check whether it exists and whether the directory %1 can be read by the "
-"webserver."
-msgstr "Ellenőrizze, hogy létezik-e és olvasható-e a webszerveren a %1 könyvtár."
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:53
+msgid "Choose problems from a library and add them to a homework set."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:543
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:40
 msgid "Choose the set which you would like to be worth twice as much."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:44
 msgid "Choose the set which you would like to enable partial credit for."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1206
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:992
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:44
 msgid "Choose the set which you would like to resurrect."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:259
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:350
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:40
 msgid "Choose the set whose close date you would like to extend."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:903
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:16
 msgid "Choose visibility of the sets to be affected"
 msgstr "Válassza ki az érintett feladatsorok láthatóságát"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:497
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:15
 msgid "Choose what to do with existing data:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:880
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:3
 msgid "Choose which sets to be affected"
 msgstr "Válassza ki mely feladotsorok legyenek érintettek"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:491
-msgid "Class value"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:17
+msgid "Class List Editor Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:334
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:55
+msgid "Class list (\".lst\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:316
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:37
 msgid "Classlist Editor"
 msgstr "Osztálynévsor szerkesztése"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1197
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:91
 msgid "Clear Problem Display"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:693
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:82
 msgid ""
 "Click a student's name to see the student's homework set. Click a heading to"
 " sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:74
 msgid ""
 "Click a student's name to see the student's test summary page. Click a "
 "test's version number to see the corresponding test version. Click a heading"
 " to sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:614
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:150
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:143
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made. (The grade for each problem is listed "
+"as \"status\" on this third page)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:24
+msgid ""
+"Click on each of the tabs to view the configuration items. The question mark"
+" icon provides access to information about the behavior of the configuration"
+" settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:125
+msgid ""
+"Click on the column \"Assigned Sets\" in the student's row. This will take "
+"you to a page where you can assign and unassign homework sets and change the"
+" due dates for homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:33
+msgid ""
+"Click on the homework set links to edit the grades for this individual "
+"student on the homework set. (The grade of each problem is called the "
+"\"status\".) You can also change the number of allowed attempts and further "
+"modify the individual student's homework set.) You will also be able to "
+"change a student's seed which determines the individual values used in the "
+"individual version of the student's problem and the weight (how much a "
+"problem counts towards the grade.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:90
 msgid ""
 "Click on the login name to edit individual problem set data, (e.g. due "
 "dates) for these students."
 msgstr "Kattintson a bejelentkezési névre ezen diákok feladatsorainak adatainak egyéni módosításához (pl. határidők)."
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:62
+msgid ""
+"Click the \"Add x student(s)\" radio button and then click \"Take action\". "
+"This will take you to a new page where the data can be entered for one or "
+"more students. It is also possible to assign the student to one or more "
+"problem sets as they are being entered: simply select the homework sets from"
+" the list below the data entry table. Use \"command\" or \"control\" click "
+"to select more than one homework set."
+msgstr ""
+
+#. ('<i class="fas fa-question-circle"></i>')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:88
+msgid "Click the %1 icon for page and item specific help."
+msgstr ""
+
+#. ('<a href="#"><i class="fas fa-question-circle"></i></a>')
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:20
+msgid "Click the icon %1 for page and item specific help."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:185
+msgid ""
+"Clicking on any active link at the top of the column sorts the page by that "
+"column. You can do lexigraphic sorts: click on \"First name\" then \"Last "
+"name\" to sort by last name, sorting those with the same last name by their "
+"first name."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:132
+msgid ""
+"Clicking on the login name link in a student's row allows you to view the "
+"student's version of the homework (rather than your own) so that you can "
+"more easily answer student questions about homework problems. (A \"acting as"
+" xxx\" alert will appear in the upper right corner of each window while you "
+"are acting as a student.) You can submit the answers (which will NOT be "
+"recorded) to check that the computer is grading the problem correctly. You "
+"will also be able to view past answers submitted by the student for each "
+"problem. To stop acting in the student's role click the \"Stop acting\" link"
+" in the upper right corner of the window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:199
+msgid ""
+"Clicking the <strong>e-mail address</strong> link will bring up your "
+"standard email application so that you can send email to the student. This "
+"works even if the student has been dropped from the course. To send email to"
+" an entire class or to merge grades with the email message use the \"Email\""
+" page link in the left margin."
+msgstr ""
+
 #. ($clientIP->ip()
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:541
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:547
 msgid ""
 "Client ip address %1 is not allowed to work this assignment, because the "
 "assignment has ip address restrictions and there are no allowed locations "
@@ -1534,329 +2163,337 @@ msgid ""
 "problem resolved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:713
-msgid "Close"
-msgstr "Lezárás"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:424
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:764
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:788
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:811
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:316
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:39
 msgid "Close Date"
 msgstr "Dátum lezárása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:382
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:35
+msgid "Closed"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:208
 msgid "Closed, answers available."
 msgstr "Lezárva, válaszadás lehetséges"
 
-#. ($self->formatDateTime($set->answer_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:378
+#. ($c->formatDateTime($set->answer_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:204
 msgid "Closed, answers on %1."
 msgstr "Lezárva, válaszadás eddig: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:206
 msgid "Closed, answers recently available."
 msgstr "Lezárva, válaszadás jelenleg lehetséges"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:282
 msgid "Closed."
 msgstr "Lezárva"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:116
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:121
 msgid "Closes"
 msgstr "Lezárás"
 
-#. ($self->formatDateTime($set->due_date, undef,
-#. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:113
-msgid "Closes %1"
-msgstr "Lezárás ekkor: %1"
-
-#. ($self->formatDateTime($verSet->due_date, undef,
+#. ($c->formatDateTime($verSet->due_date, undef,
 #. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:390
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:227
 msgid "Closes on %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:35
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:33
 msgid "Closes:"
 msgstr "Lezárás:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2518
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:357
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:71
 msgid "Collapse All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2529
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:367
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:85
 msgid "Collapse All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2668
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:419
 msgid "Collapse Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2791
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2793
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:572
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:575
 msgid "Collapse Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1715
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:73
+msgid ""
+"Collapse problem details to the top row of information about a problem. Note"
+" that the details of a single problem can be collapsed by clicking on the up"
+" arrow to the right of the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1617
 msgid ""
 "Comma separated list of set names that are excluded from all achievements. "
 "No achievement points and badges can be earned for submitting problems in "
 "these sets. Note that underscores (_) must be used for spaces in set names."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:238
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:245
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:225
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:577
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2047
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:299
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:833
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:862
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:891
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:920
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:131
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:46
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:200
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:25
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:181
 msgid "Comment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:638
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:86
 msgid "Comments"
 msgstr ""
 
-#. ($self->formatDateTime($set->answer_date)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2175
+#. ($c->formatDateTime($c->{set}->answer_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:379
 msgid "Completed results for this assignment are not available until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:382
 msgid "Completed results for this assignment are not available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:264
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:280
 msgid "Completed."
 msgstr "Teljesítve."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:45
 msgid "Compose Email Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3185
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:47
+msgid ""
+"Configure ip ranges (locations) that can be used to restrict set access."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:45
+msgid "Configure which course links appear on the site landing page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:97
 msgid "Confirm"
 msgstr "Megerősít"
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:107
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:164
+#. ($eUserName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:41
 msgid "Confirm %1's New Password"
 msgstr "%1 új jelszavának jóváhagyása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:579
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:78
 msgid "Confirm Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_export_form.html.ep:1
 msgid "Confirm which sets to export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementEvaluator.pm:288
+#: /opt/webwork/webwork2/templates/AchievementEvaluator/cheevoMessage.html.ep:15
 msgid "Congratulations, you earned a new level!"
 msgstr "Gratulálunk, Ön egy új szintet ért el!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2250
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:95
 msgid "Continue"
 msgstr "Folytatás"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:86
 msgid "Continue Open Test"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:59
+msgid "Controls if an achievement is evaluated or not."
+msgstr ""
+
 #. ($sourceDirectory, $outputDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1149
-msgid "Copied auxiliary files from %1 to new location at %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:671
+msgid "Copied auxiliary files from %1 to new location at %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:42
 msgid "Copy"
 msgstr "Másol"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
 msgid "Copy file as:"
 msgstr "Másolja az állományt mint:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:528
-msgid "Copy simple configuration file to new course"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:627
-msgid "Copy templates from:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:112
+msgid "Copy from:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1335
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:82
 msgid "Copy this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:391
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:465
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:301
 msgid "Correct"
 msgstr "Helyes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:656
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:678
 msgid "Correct Adjusted Status"
 msgstr "Helyes módosított állapot"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:300
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:287
 msgid "Correct Answer"
 msgstr "Helyes válasz"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1682
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:19
 msgid "Correct Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1506
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1317
 msgid "Correct Answers:"
 msgstr "Helyes válaszok:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:693
 msgid "Correct Status"
 msgstr "Helyes állapot"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:648
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:93
 msgid "Correct answers"
 msgstr "Helyes válaszok"
 
 #. ($total_correct, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1004
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:16
 msgid "Correct: %1/%2"
 msgstr "Helyes: %1/%2"
 
 #. ($newBlankProblems, $MAX_NEW_PROBLEMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1915
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1843
 msgid ""
 "Could not add %1 problems to this set.  The number must be between 1 and %2"
 msgstr "Nem lehet hozzáadni %1 feladatot ehhez a feladatsorhoz. A számnak 1 és %2 között kell lennie."
 
 #. ($e_user_name, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:83
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:94
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:74
 msgid "Couldn't change %1's password: %2"
 msgstr "Nem lehet véltoztatni %1 ezen jelszaván: %2"
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:111
 msgid "Couldn't change your email address: %1"
 msgstr "Nem lehet változtatni az Ön %1 e-mail címén"
 
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4111
-msgid "Couldn't find OPL Branch %1 in remote %2"
-msgstr ""
-
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4076
-msgid "Couldn't find PG Branch %1 in remote %2"
-msgstr ""
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4014
-msgid "Couldn't find WeBWorK Branch %1 in remote %2"
-msgstr ""
-
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:132
 msgid "Couldn't save your display options: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1463
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:36
 msgid "Counter"
 msgstr "Számláló"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:424
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:833
-msgid "Counts for Parent"
-msgstr ""
-
-#. ($rename_oldCourseID)
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2186
-msgid "Course %1 database is in order"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:66
+msgid "Counter:"
 msgstr ""
 
-#. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1257
-msgid "Course %1 databases must be updated before renaming this course."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:503
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:35
+msgid "Counts for Parent"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:778
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:95
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:154
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:9
 msgid "Course Administration"
 msgstr "Kurzus adminisztráció"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:424
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:17
+msgid "Course Administration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:369
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:80
 msgid "Course Configuration"
 msgstr "Kurzus konfiguráció"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:480
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:17
+msgid "Course Configuration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:17
+msgid "Course Home Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:21
 msgid "Course ID"
 msgstr ""
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2566
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:691
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:594
 msgid "Course ID cannot exceed %1 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1227
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:597
 msgid "Course ID may only contain letters, numbers, hyphens, and underscores."
 msgstr "A kurzusazonosító csak betűt, számot, kötőjelet és alulvonást tartalmazhat."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:956
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:21
 msgid "Course ID:"
 msgstr "Kurzus azonosító"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:5
 msgid "Course Info"
 msgstr "Kurzus infó"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1664
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1961
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3736
+#. ($c->stash('courseID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:325
+msgid "Course Information for course %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:30
+msgid "Course Listings"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:17
 msgid "Course Name:"
 msgstr "A kurzus neve:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:491
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:28
 msgid "Course Title"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:204
-msgid "Course archived."
-msgstr "A kurzus archiválva lett."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:418
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:12
 msgid "Courses"
 msgstr "Kurzusok"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1609
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1904
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3674
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:13
 msgid ""
 "Courses are listed either alphabetically or in order by the time of most "
 "recent login activity, oldest first. To change the listing order check the "
@@ -1865,393 +2502,536 @@ msgid ""
 "\"hidden\" or \"visible\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:7
+msgid ""
+"Courses are listed either alphabetically or in order by the time of most "
+"recent login activity, oldest first. To change the listing order check the "
+"mode you want and click \"Refresh Listing\". The listing format is: "
+"Course_Name (status :: date/time of most recent login) where status is "
+"\"hidden\" or \"visible\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:163
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:84
 msgid "Create"
 msgstr "Létrehozás"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:41
 msgid "Create CSV"
 msgstr "CSV létrehozása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3054
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:31
 msgid "Create Location:"
 msgstr "Elhelyezkedés létrehozása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1071
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:39
+msgid ""
+"Create a .tar.gz archive which includes the course's database and all course"
+" files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:33
 msgid "Create a New Set in This Course:"
 msgstr "Új feladatsor létrehozása ebben a kurzusban:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:795
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:4
 msgid "Create a new achievement with ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:33
+msgid "Create a new course on this server."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:20
+msgid ""
+"Create a new course.  The \"Course ID\" is used as the course name and is "
+"used in course links.  Underscores appear as spaces when displaying the "
+"course name.  The \"Course Title\" is used as the title on the course home "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:86
+msgid ""
+"Create a new set with a given name. This can either create an empty set or a"
+" duplicate of an existing set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:12
 msgid "Create as what type of achievement?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:12
 msgid "Create as what type of set?"
 msgstr "Milyen típusú feladatsort kíván létrehozni?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1866
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:20
+msgid "Create backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:81
 msgid "Create unattached problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1849
-msgid ""
-"Creates a gzipped tar archive (.tar.gz) of a course in the WeBWorK courses "
-"directory. Before archiving, the course database is dumped into a "
-"subdirectory of the course's DATA directory. Currently the archive facility "
-"is only available for mysql databases. It depends on the mysqldump "
-"application."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:121
+msgid "Create/Delete achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:726
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:26
 msgid "Cupcake of Enlargement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:728
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:38
 msgid "Current"
 msgstr "Jelenlegi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3042
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:2
 msgid "Currently defined locations are listed below."
 msgstr "A jelenleg meghatározott elhelyezkedés alább van felsorolva."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4352
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2365
 msgid "Database tables are ok"
 msgstr "Az adatbázis táblák rendben vannak"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:54
 msgid "Database tables need updating."
 msgstr "Az adatbázis táblákat frissíteni kell"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2753
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:52
 msgid "Database tables ok"
 msgstr "Az adatbázis táblák rendben vannak"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2968
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1499
 msgid "Database:"
 msgstr "Adatbázis:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:783
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:153
 msgid "Date"
 msgstr "Dátum"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:727
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:355
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:96
+msgid "Dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:40
+msgid ""
+"Dates for problem sets can be edited by clicking the pencil icon in the "
+"\"Edit Set Data\" column next to the set name. To change dates for several "
+"sets at once, click the check box in the \"Select\" column and choose \"Edit"
+" selected\" from the tasks above."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:426
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:37
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1675
+#: /opt/webwork/webwork2/conf/defaults.config:1577
 msgid ""
 "Default Amount of Time (in minutes) after Due Date that Answers are Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1665
+#: /opt/webwork/webwork2/conf/defaults.config:1567
 msgid ""
 "Default Amount of Time (in minutes) before Due Date that the Assignment is "
 "Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1785
+#: /opt/webwork/webwork2/conf/defaults.config:1687
 msgid "Default Length of Reduced Scoring Period in minutes"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1655
+#: /opt/webwork/webwork2/conf/defaults.config:1557
 msgid "Default Time that the Assignment is Due"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1808
+#: /opt/webwork/webwork2/conf/defaults.config:1710
 msgid ""
 "Default number of attempts before Show Me Another can be used (-1 => Never)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1755
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:162
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:91
+#: /opt/webwork/webwork2/conf/defaults.config:1994
+msgid ""
+"Default number of attempts before hints are shown in a problem (-1 => hide "
+"hints)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:89
 msgid "Delete"
 msgstr "Törlés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1556
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1651
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1689
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1728
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:49
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:36
 msgid "Delete Course"
 msgstr "Kurzus törlése"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3480
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:17
+msgid "Delete Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:23
+msgid "Delete Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:37
+msgid "Delete a course and all associated data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:109
+msgid "Delete a student from a course"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:52
 msgid "Delete all existing addresses"
 msgstr "Törli az összes létező címet"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1989
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:65
+msgid "Delete backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:64
+msgid "Delete backup from %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:54
 msgid "Delete course after archiving. Caution there is no undo!"
 msgstr "Az archiválás után törli a kurzust. Vigyázat nincs utólagos visszavonási lehetőség!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:49
 msgid "Delete course:"
 msgstr "Ezen kurzusok törlése"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2348
 msgid "Delete field when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2809
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:588
 msgid "Delete it?"
 msgstr "Törli?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3055
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:78
 msgid "Delete location:"
 msgstr "Törli az elhelyezkedést:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:28
+msgid "Delete oldest backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2321
 msgid "Delete table when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:729
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:90
+msgid "Delete the sets checked below. Be careful, this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:6
 msgid "Delete which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1045
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:6
 msgid "Delete which sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1041
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:6
 msgid "Delete which users?"
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:394
 msgid "Deleted %1 users."
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:358
 msgid "Deleted %quant(%1,achievement)"
 msgstr ""
 
 #. (join(', ', @delLocations)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3359
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1810
 msgid "Deleted Location(s): %1"
 msgstr "Törli az elhelyezkedés(eke)t: %1 "
 
 #. (join(', ', @toDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3597
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1966
 msgid "Deleted addresses %1 from location."
 msgstr "Törli a %1 címeket az elhelyezkedésből."
 
-#. ($self->shortPath($self->{tempFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1158
-msgid "Deleting temp file at %1"
+#. ($formatBackupTime)
+#. ($c->formatDateTime($delTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1243
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:569
+msgid "Deleted backup from %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3152
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:679
+msgid "Deleted temp file at %1"
+msgstr ""
+
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1219
+msgid "Deleted temporary file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:125
+msgid "Deleting Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:68
 msgid ""
 "Deletion deletes all location data and related addresses, and is not "
 "undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:723
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:3
 msgid "Deletion destroys all achievement-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:185
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
 msgid "Deny From"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1467
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:27
 msgid "Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:256
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:71
+msgid "Description:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:69
 msgid "Deselect All Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:229
 msgid "Deselect All Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:428
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:366
 msgid "Didn't recognize action"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:27
 msgid "Directory"
 msgstr "Könyvtár"
 
 #. ($file, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:793
-msgid "Directory '%1' not removed: %2"
-msgstr "%1 könyvtár nem lett törölve: %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:327
+msgid "Directory \"%1\" not removed: %2"
+msgstr ""
 
 #. ($file, $removed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:792
-msgid "Directory '%1' removed (items deleted: %2)"
-msgstr "%1 könyvtár törölve (a törölt elemek száma: %2)"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:325
+msgid "Directory \"%1\" removed (items deleted: %2)"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:412
-msgid "Directory permission errors "
-msgstr "Hiba a könyvtárhoz való hozzáféréssel"
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:33
+msgid "Directory permission errors"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2861
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2994
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1439
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1575
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:44
 msgid ""
 "Directory structure is missing directories or the webserver lacks sufficient"
 " privileges."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1267
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2210
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2857
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1434
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1570
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:41
 msgid "Directory structure is ok"
 msgstr "A könyvtárstruktúra OK"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2285
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:102
 msgid "Directory structure needs to be repaired manually before archiving."
 msgstr "Az archiválás előtt a könyvtárstruktúrát kézileg helyre kell állítani. "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1338
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:84
 msgid "Directory structure needs to be repaired manually before renaming."
 msgstr "Az átnevezés előtt a könyvtárstruktúrát kézileg helyre kell állítani."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2750
-msgid "Directory structure or permissions need to be repaired. "
-msgstr "A könyvtárstruktúrát vagy jogosultságait helyre kell állítani."
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:48
+msgid "Directory structure or permissions need to be repaired."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2853
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1414
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1540
 msgid "Directory structure:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2536
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:365
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:92
+msgid "Display Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:90
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:104
 msgid "Display Mode:"
 msgstr "Megjelenítési mód:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:463
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:37
 msgid "Display Past Answers"
 msgstr "Mutasd a legutóbbi választ"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
-msgid "Display of scores for this set is not allowed."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:44
+msgid "Display mode for equations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:589
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:311
+msgid "Display of scores for this test is not allowed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:12
 msgid "Display options: Show"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2017
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:48
+msgid ""
+"Display sets matching a selected criteria. Useful if there are many sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1918
 msgid "Display the evaluated student answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:176
+#. ('<code>COURSENAME_totals.csv</code>',
+#. '<code>COURSENAME_totals_bak1.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:74
+msgid ""
+"Do NOT use the file name %1, since you might accidentally overwrite that if "
+"you again export your WeBWorK homework scores. (Actually the earlier file is"
+" moved to %2 -- so you can recover using the File Manager.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:57
 msgid "Do not unassign students unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:233
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:67
 msgid "Do not uncheck a set unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:20
 msgid "Do not uncheck students, unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2450
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:656
 msgid "Do you want to grade this test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2272
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:93
+msgid "Documentation from source code for PG modules and macro files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:95
 msgid "Don't Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2607
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:13
 msgid "Don't Unarchive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2912
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:46
 msgid "Don't Upgrade"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1749
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:15
 msgid "Don't delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1120
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:24
 msgid "Don't make changes"
 msgstr ""
 
 #. ($saveMode)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:317
 msgid "Don't recognize saveMode: |%1|. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1307
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1321
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1335
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:87
 msgid "Don't rename"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:547
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:33
 msgid "Don't use in an achievement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:683
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1345
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2465
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1595
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:766
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:57
 msgid "Done"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:159
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:365
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:8
 msgid "Download"
 msgstr ""
 
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($set->set_id)
 #. ($ver->{id} =~ s/_/ /gr)
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($set->set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:731
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:732
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:413
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:204
 msgid "Download %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:23
 msgid "Download Hardcopy"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:865
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:56
 msgid "Download PDF or TeX Hardcopy for Current Set"
 msgstr "A jelenlegi sor PDF vagy TeX kimeneti állományainak mentése "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:764
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:233
 msgid "Download PDF or TeX Hardcopy for Selected Tests"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($selected_set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:595
+#. (tag('span', dir => 'ltr', format_set_name_display($selected_set_id =~
+#. s/,v(\d+)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:58
 msgid "Download hardcopy of set %1 for %2?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:369
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:63
+msgid "Download/upload archived courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:46
 msgid "Download:"
 msgstr ""
 
@@ -2259,139 +3039,181 @@ msgstr ""
 msgid "Drop"
 msgstr "Dobd"
 
-#. ($self->formatDateTime($set->reduced_scoring_date, undef,
-#. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:107
-msgid "Due %1, after which reduced scoring is available until %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:100
+msgid "Drop student from the course"
 msgstr ""
 
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:310
 msgid "Due date %1 has passed."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2093
+#: /opt/webwork/webwork2/conf/defaults.config:2014
 msgid "E-Mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:315
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:261
 msgid "E-mail Instructor"
 msgstr "e-mail a tanárnak"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2128
-msgid "E-mail addresses which can receive e-mail from a pg problem"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:2138
+#: /opt/webwork/webwork2/conf/defaults.config:2049
 msgid ""
 "E-mail feedback from students automatically sent to this permission level "
 "and higher"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2109
+#: /opt/webwork/webwork2/conf/defaults.config:2030
 msgid "E-mail verbosity level"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:357
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:43
 msgid "E-mail:"
 msgstr "e-mail:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:35
 msgid "Earned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:71
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:158
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:334
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:417
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:547
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2743
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1628
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1186
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1203
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:257
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:479
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:6
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:53
 msgid "Edit"
 msgstr "Módosít"
 
-#. (CGI::a({ href => $basicInfoUrl }, $r->maketext('class list data')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:199
-msgid "Edit %1 for  %2 (%3) who has been assigned %4 sets."
+#. (link_to(maketext('class list data')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:47
+msgid "Edit %1 for %2 (%3) who has been assigned %4 sets."
 msgstr ""
 
-#. (CGI::a({ href => $editUsersAssignedToSetURL }, $r->maketext('individual
-#. versions')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2223
-msgid "Edit %1 of set %2."
+#. (link_to(maketext('individual user settings')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:162
+msgid "Edit %1 for set %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:6
 msgid "Edit Assigned Users"
 msgstr "A hozzárendelt felhasználók módosítása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:40
 msgid "Edit Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1488
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:58
 msgid "Edit Evaluator"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:253
 msgid "Edit Header"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3053
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:18
 msgid "Edit Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2741
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:111
 msgid "Edit Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:5
 msgid "Edit Problems"
 msgstr "A feladatok módosítása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:583
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:3
 msgid "Edit Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:421
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:4
 msgid "Edit Set Data"
 msgstr "A feladotsor adatainak módosítása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:171
+msgid "Edit Tags"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:30
 msgid "Edit Target Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1487
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:18
 msgid "Edit Users"
 msgstr ""
 
-#. ($user)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:207
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:127
+msgid "Edit achievement evaluator"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:90
+msgid "Edit achievement information"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:65
+msgid ""
+"Edit achivements for the course. This link is only present if achievements "
+"are enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:42
+msgid "Edit class list data"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:39
+msgid ""
+"Edit class roster data. Add students, edit student data, drop students from "
+"class, import students from a classlist, and give user professor privileges."
+" Access to individual homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:70
 msgid "Edit data for %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1248
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:46
+msgid ""
+"Edit homework sets for entire class. Change homework set due dates, create "
+"new sets from a set definition file, create new homework sets, make sets "
+"visible/invisible, score homework sets. Assign homework sets to the class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:219
 msgid "Edit it"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2192
-msgid "Edit set %1 data for ALL students assigned to this set."
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:135
+msgid "Edit set %1 for ALL students assigned to this set."
 msgstr ""
 
-#. (CGI::a({href=>$editSetLink},$setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2166
+#. (link_to(                                               $setID =>
+#. $c->systemLink(
+#. $setDetailPage, params => { effectiveUser => $user->user_id, editForUser =>
+#. $user->user_id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:106
 msgid "Edit set %1 for this user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3393
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:95
+msgid "Edit set for %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:4
 msgid ""
 "Edit the current value of the location description, if desired, then add and"
 " select addresses to delete, and then click the \"Take Action\" button to "
@@ -2399,174 +3221,219 @@ msgid ""
 "changes and return to the Manage Locations page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:429
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:2
 msgid "Edit which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:829
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:2
 msgid "Edit which sets?"
 msgstr "Mely feladatsorokat módosítja?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:935
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:2
 msgid "Edit which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:592
-msgid "Editing <strong>blank problem</strong> in file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:31
+msgid "Editing <strong>course information</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:595
-msgid "Editing <strong>course information</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:30
+msgid "Editing <strong>hardcopy header</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
-msgid "Editing <strong>hardcopy header</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:28
+msgid "Editing <strong>new problem</strong> template."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:596
-msgid "Editing <strong>options information</strong> file \"%1\""
+#. ($c->{prettyProblemNumber},                             tag('span', dir =>
+#. 'ltr', format_set_name_display($fullSetName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:45
+msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\"."
 msgstr ""
 
-#. ($prettyProblemNumber,                  CGI::span({ dir => 'ltr' },
-#. format_set_name_display($fullSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:605
-msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:29
+msgid "Editing <strong>set header</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:593
-msgid "Editing <strong>set header</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:33
+msgid "Editing <strong>unassigned problem</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:598
-msgid "Editing <strong>unassigned problem</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:32
+msgid "Editing <strong>unknown file type</strong> in file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:597
-msgid "Editing <strong>unknown file type</strong> in file \"%1\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:19
+msgid "Editing Modes"
 msgstr ""
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:209
-msgid "Editing achievement in file '%1'"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:140
+msgid "Editing Problems"
 msgstr ""
 
-#. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3390
-msgid "Editing location %1"
+#. ($c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:16
+msgid "Editing achievement in file \"%1\""
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display("$setID$vermsg")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2182
-msgid "Editing problem set %1 data for these individual students: %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:22
+msgid "Editing for all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:410
-msgid "Editor"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:23
+msgid "Editing for one student or a proper subset of all students"
+msgstr ""
+
+#. ($locationID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:1
+msgid "Editing location %1"
+msgstr ""
+
+#. (tag(                                           'strong',
+#. dir => 'ltr',
+#. format_set_name_display($setID . ($editingSetVersion ?
+#. ",v$editingSetVersion" : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:123
+msgid "Editing problem set %1 for these students: %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:669
-msgid "Editor rows:"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:315
+msgid "Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1668
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:229
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:53
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:68
 msgid "Email"
 msgstr "e-mail"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:32
 msgid "Email Address"
 msgstr "E-mail cím"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:817
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:170
 msgid "Email Body:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:17
+msgid "Email Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:339
 msgid "Email Instructor On Failed Attempt"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2003
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:28
 msgid "Email Link"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:789
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:112
 msgid "Email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1807
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1832
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:311
+msgid "Email body is empty. No message sent. "
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:994
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_email.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_form.html.ep:24
 msgid "Email instructor"
 msgstr "e-mail a tanárnak"
 
-#. (scalar(@{ $self->{ra_send_to} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:454
+#. (scalar(@{ $c->{ra_send_to} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:27
+msgid ""
+"Email is being sent to %quant(%1,recipient). You will be notified by email "
+"when the task is completed.  This may take several minutes if the class is "
+"large."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:13
+msgid "Email:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:26
 msgid ""
-"Email is being sent to %quant(%1,recipient). You will be notified by email\n"
-"\t\t\t\twhen the task is completed.  This may take several minutes if the class is\n"
-"\t\t\t\tlarge."
+"Emails can contain personalized data, such as name, section, or status.  "
+"Click \"List of insertable macros\" for a full list available variables.  "
+"Additional personal data can be included by using a merge file.  A merge "
+"file is a CSV file located in the [Scoring] directory in which the first "
+"column is the student id, followed by additional data (such as student "
+"grades).  This data is identified by which column it is in, for instance if "
+"the scores where in the 4th column of the merge file, insert them into an "
+"email using the variable $COL[4].  The \"Scoring Tools\" page can export "
+"grades into a CSV that can be used as a merge file.  Upload customized merge"
+" files with the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:11
 msgid "Emails to be sent to the following:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1704
+#: /opt/webwork/webwork2/conf/defaults.config:1606
 msgid "Enable Achievement Rewards"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1723
+#: /opt/webwork/webwork2/conf/defaults.config:1625
 msgid "Enable Conditional Release"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1689
+#: /opt/webwork/webwork2/conf/defaults.config:1591
 msgid "Enable Course Achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1645
+#: /opt/webwork/webwork2/conf/defaults.config:1547
 msgid "Enable Progress Bar and current problem highlighting"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1734
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:585
+#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Enable Reduced Scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1799
+#: /opt/webwork/webwork2/conf/defaults.config:1701
 msgid "Enable Show Me Another button"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:156
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:24
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:92
 msgid "Enable Spell Checking"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1844
+#: /opt/webwork/webwork2/conf/defaults.config:1746
 msgid "Enable periodic re-randomization of problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:416
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:29
 msgid ""
 "Enable reduced scoring for a homework set.  This will allow you to submit "
 "answers for partial credit for 24 hours after the close date."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1461
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1483
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:20
 msgid "Enabled"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1846
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:58
+msgid "Enabled:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1748
 msgid ""
 "Enables periodic re-randomization of problems after a given number of "
 "attempts. Student would have to click Request New Version to obtain new "
 "version of the problem and to continue working on the problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1725
+#: /opt/webwork/webwork2/conf/defaults.config:1627
 msgid ""
 "Enables the use of the conditional release system.  To use conditional "
 "release you need to specify a list of set names on the Problem Set Detail "
@@ -2575,14 +3442,14 @@ msgid ""
 " sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1801
+#: /opt/webwork/webwork2/conf/defaults.config:1703
 msgid ""
 "Enables use of the Show Me Another button, which offers the student a newly-"
 "seeded version of the current problem, complete with solution (if it exists "
 "for that problem)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:662
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:163
 msgid "End"
 msgstr ""
 
@@ -2590,538 +3457,662 @@ msgstr ""
 msgid "Enrolled"
 msgstr "beiratkozott"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:788
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:111
 msgid "Enrolled, Drop, etc."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:830
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:859
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:888
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:917
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:128
 msgid "Enrollment Status"
 msgstr "Regisztrációs állapot"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:21
 msgid "Enter filename below"
 msgstr "Írja be lent a fájlnevet"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:20
 msgid "Enter filenames below"
 msgstr "Írja be lent a fájlneveket"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:19
 msgid ""
 "Enter information below for students you wish to add. Each student's "
 "password will initially be set to their student ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1997
+#: /opt/webwork/webwork2/conf/defaults.config:1899
 msgid ""
 "Enter one of the allowed display mode types above.  See 'display modes "
 "entry' for descriptions."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:297
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:34
+msgid ""
+"Enter the details of the course instructor to be added when the course is "
+"created.  This user will also be added to the admin course with the username"
+" \"userID_courseID\" so you can manage and email the instructors of the "
+"courses on the server."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:284
 msgid "Entered"
 msgstr "Belépve"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:85
-msgid "Entered student:"
-msgstr ""
-
-#. ($display_sort_method_name{$primary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:698
+#. ($display_sort_method_name{$primary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:98
 msgid "Entries are sorted by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:247
 msgid "Equation Display"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:61
+msgid "Equation Editor"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1516
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1460
 msgid "Error adding set-level proctor: %1"
 msgstr ""
 
+#. ($fromPath, $toPath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:664
+msgid "Error copying %1 to %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:14
+msgid "Error details"
+msgstr ""
+
+#. ($filePath, stash('podError')
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:27
+msgid "Error generating POD for file %1: %2"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1492
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1437
 msgid ""
 "Error getting old set-proctor password from the database: %1.  No update to "
 "the password was done."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:31
 msgid "Error message:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2235
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:12
 msgid "Error messages"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1616
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:754
 msgid "Error: Answer date must come after close date in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:747
 msgid "Error: Close date must come after open date in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1634
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:778
 msgid ""
 "Error: Reduced scoring date must come between the open date and close date "
 "in set %1"
 msgstr ""
 
-#. ($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2067
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:7
 msgid "Error: The original file %1 cannot be read."
 msgstr ""
 
 #. ($setID)
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1240
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:738
 msgid "Error: answer date cannot be more than 10 years from now in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1235
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:733
 msgid "Error: close date cannot be more than 10 years from now in set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:630
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:234
 msgid "Error: no file data was submitted!"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1599
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:728
 msgid "Error: open date cannot be more than 10 years from now in set %1"
 msgstr ""
 
-#. ($problem_desc, $problem_name, CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1404
+#. ($problem_desc, $problem_name, $c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1210
 msgid ""
 "Errors encountered while processing %1. This %2 has been omitted from the "
 "hardcopy. Error text: %3"
 msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3832
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:8
+msgid "Errors occured while generating hardcopy:"
+msgstr ""
+
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2128
 msgid ""
 "Errors occured while hiding the courses listed below when attempting to "
 "create the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3920
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2197
 msgid ""
 "Errors occured while unhiding the courses listed below when attempting "
 "delete the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1468
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:28
 msgid "Evaluator File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3839
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:76
+msgid "Evaluator File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:28
+msgid "Evaluator Variables"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2143
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
-"hidden."
+"Except for the errors listed above, all selected courses are already hidden."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3904
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2212
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
+"Except for the errors listed above, all selected courses are already "
 "unhidden."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3456
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:39
 msgid ""
 "Existing addresses for the location are given in the scrolling list below.  "
 "Select addresses from the list to delete them:"
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2281
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1460
 msgid "Existing file %1 could not be backed up and was lost."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2514
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:354
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:65
 msgid "Expand All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:364
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:78
 msgid "Expand All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2667
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:418
 msgid "Expand Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2792
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:574
 msgid "Expand Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:74
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:89
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:67
+msgid ""
+"Expand problem details that have been collapsed. Note that the details of a "
+"single problem can be expanded by clicking on the down arrow to the right of"
+" the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:71
 msgid "Export"
 msgstr "Export"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1098
-msgid "Export selected achievements."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:113
+msgid "Export achievement data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1267
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_export_form.html.ep:1
+msgid "Export selected achievements"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:17
 msgid "Export to what kind of file?"
 msgstr "Mely fájlokat akarja exportálni?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:2
 msgid "Export which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1245
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:5
 msgid "Export which users?"
 msgstr "Mely felhasználókat akarja exportálni?"
 
 #. ($FileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1151
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:591
 msgid "Exported achievements to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1616
-msgid "Extend the close date for which Gateway?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:48
+msgid "Extend the close date for which test?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:148
+msgid "Extend the number of attempts allowed a student on a given problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1573
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:28
 msgid ""
-"Extends the close date of a gateway test by 24 hours. Note: The test must "
-"still be open for this to work."
+"Extends the close date of a test by 24 hours. Note: The test must still be "
+"open for this to work."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "FIRST NAME"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Failed to add user:"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:416
 msgid "Failed to create new achievement: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:373
 msgid "Failed to create new achievement: no achievement ID specified!"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:573
 msgid "Failed to create new set: %1"
 msgstr "Nem sikerült létrehozni a %1 új feladatsort"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1158
-msgid "Failed to create new set: no set name specified!"
-msgstr "Nem sikerült létrehozni az új feladatsort: nincs megadva a feladatnév!"
+#. ($newSetID =~ s/_/ /gr)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:482
+msgid ""
+"Failed to create new set: Invalid characters in set name \"%1\". A set name "
+"may only contain letters, numbers, hyphens, periods, and spaces."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:474
+msgid "Failed to create new set: No set name specified."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1155
-msgid "Failed to create new set: set name cannot exceed 100 characters."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:469
+msgid "Failed to create new set: Set name cannot exceed 100 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:396
 msgid ""
 "Failed to duplicate achievement: no achievement selected for duplication!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:530
 msgid "Failed to duplicate set: no set selected for duplication!"
 msgstr "Nem sikerült létrehozni a feladatsor másolatát: nincs kiválaszva feladatsor!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:74
-msgid "Failed to enter student:"
+#. ($@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:67
+msgid "Failed to generate course archive: %1"
 msgstr ""
 
 #. ($scoreFilePath)
 #. ($filePath)
 #. ($FilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1125
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:649
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:955
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2402
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1584
 msgid "Failed to open %1"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:227
 msgid "Failed to save: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#. ($_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:253
+msgid "Failed to send message: %1"
+msgstr ""
+
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:23
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:36
 msgid "False"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1919
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:63
 msgid "Feature exhausted for this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:200
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:23
+msgid "Features:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:252
 msgid "Feedback"
 msgstr "Visszacsatolás"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2159
+#: /opt/webwork/webwork2/conf/defaults.config:2070
 msgid "Feedback by Section."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:234
 msgid "FeedbackMessage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1177
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2113
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2284
 msgid "Field is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2109
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2286
 msgid "Field missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1175
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2111
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4290
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
 msgid "Field missing in schema"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:599
-msgid "File '%1' exists.  File not saved.  No changes have been made."
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:266
+msgid "File \"%1\" exists.  File not saved.  No changes have been made."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1926
-msgid ""
-"File '%1' exists. File not saved. No changes have been made.  You can change"
-" the file path for this problem manually from the 'Hmwk Sets Editor' page"
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1036
+msgid "File \"%1\" exists. File not saved. No changes have been made."
 msgstr ""
 
-#. ($file,$!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:796
-msgid "File '%1' not removed: %2"
+#. ($file, $!)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:333
+msgid "File \"%1\" not removed: %2"
 msgstr ""
 
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:795
-msgid "File '%1' successfully removed"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+msgid "File \"%1\" successfully removed"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1066
-msgid "File '%1' uploaded successfully"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:522
+msgid "File \"%1\" uploaded successfully"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:476
 msgid "File <b>%1</b> already exists. Overwrite it, or rename it as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:364
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:55
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:70
 msgid "File Manager"
 msgstr "Állománykezelő"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:628
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:17
+msgid "File Manager Help"
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:541
+msgid "File not saved. Failed to open \"%1\" for writing."
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:528
+msgid ""
+"File not saved. The file \"%1\" is not contained in the templates directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:921
+msgid ""
+"File not saved. The file name for this problem does not match the file name "
+"the editor was opened with. The problem set may have changed. Please reopen "
+"this file from the homework sets editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:228
 msgid "File saved"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:733
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:272
 msgid "File successfully copied"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:758
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:295
 msgid "File successfully renamed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:29
 msgid "Filename"
 msgstr "Fájlnév"
 
-#. ($extension,$location)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1296
-msgid "Files with extension '.%1' usually belong in '%2'"
+#. ($extension, $location)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:699
+msgid "Files with extension \".%1\" usually belong in \"%2\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:20
+msgid ""
+"Fill out the form below to add, edit, or delete locations.  Locations are "
+"used to restrict access to sets based on ip address.  Locations are "
+"configured here in the administration course, then used in a normal course."
+"  When configuring a set to use a restricted ip address, the instructor can "
+"choose to either restrict access to the location or deny access from a "
+"location, which are identified by their name.  Instructors can select "
+"multiple locations to restrict access to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:78
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:47
 msgid "Filter"
 msgstr ""
 
 #. ($recitation)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1184
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1112
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1420
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:913
 msgid "Filter by recitation %1"
 msgstr ""
 
 #. ($section)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1180
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1416
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:910
 msgid "Filter by section %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:733
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:31
 msgid "Filter by what text?"
 msgstr "Melyik szöveg alapján szűrjek?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:151
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:17
 msgid "Filter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:749
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:137
 msgid "First"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:593
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1992
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:827
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:856
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:885
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:914
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:87
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:21
 msgid "First Name"
 msgstr "Keresztnév"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:107
 msgid "First name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:178
 msgid ""
 "For security reasons, you cannot specify a message file from a directory "
 "higher than the email directory (you can't use ../blah/blah for example). "
 "Please specify a different file or move the needed file to the email "
-"directory"
+"directory."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2928
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:30
+msgid "Force editor to RTL"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:674
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:101
 msgid "Force problems to be numbered consecutively from one"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:409
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:35
+msgid "Form Elements Present on the Page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:75
 msgid "Format"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2096
+#: /opt/webwork/webwork2/conf/defaults.config:2017
 msgid "Format for the subject line in feedback e-mails"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:172
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:133
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:10
 msgid "Format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:12
 msgid "Found no directories containing problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1112
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:43
 msgid "From This Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:318
 msgid "From field must contain one valid email address."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:340
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:621
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:20
+msgid ""
+"From this page you can <strong>add new students</strong>, "
+"<strong>edit</strong> class list data (name, email address, recitation, "
+"section, permission level, and enrollment status), <strong>change "
+"passwords</strong>, and <strong>export</strong> (save) class lists for back-"
+"up or use in another course. You can also delete students from the class "
+"roster, but this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:34
 msgid "From:"
 msgstr "Feladó"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:59
 msgid "GLOBAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1512
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1619
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1728
-msgid "Gateway Name"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:210
-msgid "Gateway Quiz %2"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:853
-msgid "Gateway parameters"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/conf/defaults.config:1427
 msgid "General"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2305
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:201
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:30
 msgid "General Information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:745
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:669
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:670
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:222
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:116
+msgid "General Page Information"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:121
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:166
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:167
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:113
 msgid "Generate Hardcopy"
 msgstr "Másolat generálása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:262
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:73
 msgid "Generate Hardcopy for Selected Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:744
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:115
+msgid ""
+"Generate a hardcopy of the problem being edited. This does not change the "
+"permanent file on the disk. You can generate a hardcopy for different "
+"versions of the same problem by changing the seed. You can also change the "
+"format to \"PDF\" or \"TeX Source\". If \"PDF\" is selected, then a PDF file"
+" will be generated for download, unless there are errors. If errors occur or"
+" \"TeX Source\" is selected, then a zip file will be generated for download "
+"that contains the TeX source file and resources needed for generating the "
+"PDF file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:20
+msgid ""
+"Generate hardcopies of assignments in PDF or latex format. To produce a "
+"hardcopy, one selects the users on the left and the sets on the right. All "
+"users and sets are listed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:170
 msgid "Generate hardcopy for selected sets and selected users"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:184
-#: /opt/webwork/pg/macros/problemRandomize.pl:185
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:186
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:187
 msgid "Get a new version of this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:986
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:2
 msgid "Give new password to which users?"
 msgstr "Melyik felhasználónak kér új jelszót?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1063
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:27
 msgid "Gives full credit on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1180
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:27
 msgid "Gives full credit on every problem in a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:846
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:27
 msgid "Gives half credit on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:27
 msgid "Gives half credit on every problem in a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:62
 msgid "Global Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1422
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:76
 msgid "Global Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:49
 msgid "Global Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:51
 msgid ""
 "Global data on problem usage is contributed by many institutions using "
 "WeBWorK all over the world. The Usage figure is the total number of  "
@@ -3131,198 +4122,324 @@ msgid ""
 msgstr ""
 
 #. ($problemID, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1549
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1489
 msgid "Global problem %1 for set %2 not found."
 msgstr ""
 
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:334
+#. ($c->{prettyID}, $c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:378
+msgid "Global problem %1 not found for set %2."
+msgstr ""
+
+#. ($c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:142
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:372
 msgid "Global set %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2093
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:77
 msgid "Global set data will be shown instead of user specific data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:28
 msgid "Go"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:483
 msgid "Go back to Part 1"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:291
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
-#: /opt/webwork/pg/macros/compoundProblem.pl:491
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:293
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:498
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:512
 msgid "Go on to next part"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2651
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:544
 msgid "Grade"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2649
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:383
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:970
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:541
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:75
 msgid "Grade Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2446
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:651
 msgid "Grade Test"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:148
+msgid "Grade of Active Students"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:55
 msgid "Grade passback mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:837
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:38
 msgid "Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:236
 msgid "Grades"
 msgstr "Eredményesség"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:110
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:17
+msgid "Grades Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:115
 msgid "Grades have been saved for all current users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:221
-msgid "Grading assignment:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:28
+msgid "Grading Assignment"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:152
+msgid "Grading Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1062
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:26
 msgid "Greater Rod of Revelation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1179
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:26
 msgid "Greater Tome of Enlightenment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:285
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:50
+msgid ""
+"Groups types of achievements. The \"level\" and \"secret\" categories are "
+"special (described above), and categories can be used to create achievement "
+"chains."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:74
 msgid "Guest Login"
 msgstr "Vendég felhasználó"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2251
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:86
+msgid "Guest:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:33
 msgid "HTTP Headers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:682
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:35
+msgid "Hardcopy Format"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:115
 msgid "Hardcopy Format:"
 msgstr "Kimeneti formátum:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:270
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:285
 msgid "Hardcopy Generator"
 msgstr "kimeneti generátor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:101
 msgid "Hardcopy Header"
 msgstr "Fejléc másolata"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1623
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:724
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:324
+msgid "Hardcopy Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:17
+msgid "Hardcopy Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:153
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:44
 msgid "Hardcopy Theme"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:408
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:427
 msgid "Hardcopy will always print the original version of the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:31
 msgid "Headers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1048
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:296
 msgid "Help"
 msgstr "Súgó"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:797
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:170
 msgid "Help Icon"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:542
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:30
+msgid ""
+"Here is a list of the variables the evaluator has access to. Unless "
+"indicated, changes to the variables will not be saved.  Evaluators are run "
+"in the same order they are listed on the achievement editor page and are "
+"only run if the achievement has not been earned. Keep this in mind when "
+"using persistent global data."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:507
 msgid "Here is a new version of your problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:914
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:42
 msgid "Hidden"
 msgstr "Rejtett"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:347
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:62
 msgid "Hide All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3663
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3718
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3760
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:384
-msgid "Hide Courses"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:17
+msgid "Hide Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:428
-msgid "Hide Hints"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:57
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:44
+msgid "Hide Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:477
 msgid "Hide Hints from Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1566
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:63
+msgid "Hide all rendered problems on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:252
 msgid "Hide this problem"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1523
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1524
 msgid "Hint:"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1522
 msgid "Hint: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:658
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1771
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:99
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:51
 msgid "Hints"
 msgstr "Tippek"
 
 # Hmwk is short for Homework
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:364
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:327
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:44
 msgid "Hmwk Sets Editor"
 msgstr "HF-sor szerkesztő"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:779
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:80
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:108
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:19
 msgid "Homework Sets"
 msgstr "Feladatsorok"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:38
 msgid "Homework Totals"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1432
-msgid "I couldn't find the file [ACHEVDIR]/surprise_message.txt!"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:17
+msgid "Homwork Sets Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:88
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:31
+msgid "How to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1451
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:36
+msgid "I couldn't find the file [ACHIEVEMENT_DIR]/surprise_message.txt!"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:9
 msgid "Icon"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:29
 msgid "Icon File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:612
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:80
+msgid "Icon File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:24
+msgid ""
+"If \"PDF\" is selected, then a PDF file will be generated for download, "
+"unless there are errors.  If errors occur generating a PDF file or \"TeX "
+"Source\" is selected then a zip file will be generated for download that "
+"contains the TeX source file and resources needed for generating the PDF "
+"file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:37
+msgid ""
+"If \"TeX Source\" is selected, a zip file containing a TeX file and other "
+"files needed to generate a PDF hardcopy will be produced. If \"Adobe PDF\" "
+"is selected then only a PDF file will be produced."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:84
 msgid ""
 "If a password field is left blank, the student's current password will be "
 "maintained."
 msgstr "Ha a jelszó mezőt üresen hagyja, a diák jelenlegi jelszava megmarad."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:42
+msgid ""
+"If selected, the file path of the problem source will be printed in the "
+"output."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:38
+msgid ""
+"If selected, this adds spaces between the fields to align the commas, which "
+"makes the columns easy to read when in text form but it can confuse some "
+"spreadsheet applications since the extra spaces violate the csv standard "
+"(although Excel handles them with no problem). This will give a visual form "
+"of the CSV file that is easy to read on the page. If you want a reliable "
+".csv file for use in any spreadsheet application unclick the \"Pad Fields\" "
+"option. You can download the .csv file immediately by clicking on the link "
+"with the filename chosen above, or you can download it using the \"File "
+"Manager\" from the scoring directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:148
+msgid ""
+"If the original problem can not be edited than the path name must be changed"
+" in order to be allowed to save the problem. Adding \"local/\" to the "
+"beginning of the original path is the default solution. All locally created "
+"and edited files will then appear in a subdirectory named \"local\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:513
 msgid ""
 "If this flag is set then this problem will count towards the grade of its "
 "parent problem.  In general the adjusted status on a problem is the larger "
@@ -3330,20 +4447,28 @@ msgid ""
 "problems which have this flag enabled."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
 msgid ""
 "If this is enabled then instructors with the ability to receive feedback "
 "emails will be notified whenever a student runs out of attempts on a problem"
-" and its children without receiving an adjusted status of 100%."
+" and its children  without receiving an adjusted status of 100%."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:334
 msgid ""
 "If this is enabled then students will be unable to attempt a problem until "
 "they have completed all of the previous problems, and their child problems "
 "if necessary."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:57
+msgid ""
+"If this is selected, a success index is listed in each csv file. The success"
+" index is a number assigned on the basis of the number of incorrect attempts"
+" (roughly equivalent to 1/the number of attempts) which seems to correlate "
+"with the relative difficulty the student had with the problem."
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:47
 msgid ""
 "If this is set, all users (including the instructor) must enter the WeBWorK "
@@ -3351,8 +4476,8 @@ msgid ""
 "they receive a message directing them back to the LMS."
 msgstr ""
 
-#. (CGI::b($r->maketext("Remember Me")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:201
+#. (tag('strong', maketext('Remember Me')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:33
 msgid ""
 "If you check %1 your login information will be remembered by the browser you"
 " are using, allowing you to visit WeBWorK pages without typing your user "
@@ -3361,273 +4486,419 @@ msgid ""
 " have direct control."
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:407
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:154
+msgid ""
+"If you click on the \"Grade Problem\" icon to the right of the problem "
+"number, then the problem will open in the manual problem grader. This page "
+"shows the rendered problem and lists all students assigned to the set and "
+"the last answer the students entered for the problem. You can then change "
+"the recorded scores for students on this problem and provide instructor "
+"feedback comments."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:148
+msgid ""
+"If you click on the \"Open in New Window\" icon to the right of the problem "
+"number, then the problem will open in the actual homework set in a new tab "
+"or window."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:425
 msgid "If you come back to it later, it may revert to its original version."
 msgstr ""
 
+#. ('<code>report_grades_data.csv</code>', '<code>report_grade.msg</code>',
+#. '<code>$COL</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:80
+msgid ""
+"If you upload your file on the web with the name: %1 and also create an "
+"email message with the name %2 with the approriate %3 variables then not "
+"only can you email the message with the embedded grades to the students, but"
+" files with those exact names are automatically appended to the \"Grades\" "
+"page seen by the students."
+msgstr ""
+
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:798
-msgid "Illegal file '%1' specified"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:337
+msgid "Illegal file \"%1\" specified"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1445
 msgid "Illegal filename contains '..'"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:73
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:63
 msgid "Import"
 msgstr "Import"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1291
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:65
+msgid ""
+"Import a single set or multiple sets from a set definition file. (Use the "
+"\"File Manager\" to upload/download set definition files.) The \"Shift "
+"Dates...\" option is useful for problem sets that were used from other "
+"courses and will shift all of the dates."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:16
 msgid "Import from where?"
 msgstr "Honnan importálni?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1270
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:5
 msgid "Import how many sets?"
 msgstr "Hány feladatsort importálni?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:31
 msgid "Import sets with names"
 msgstr "Ezen nevű feladatsorok importálása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:5
 msgid "Import users from what file?"
 msgstr "Mely állományból akar felhasználókat importálni?"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:99
+msgid "Import/export achievements"
+msgstr ""
+
 #. ($count)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:516
 msgid "Imported %quant(%1,achievement)"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:25
+msgid ""
+"In both cases, one can select the sort field, the format of the display "
+"list, and the filter. \"Change Display Settings\" must be clicked to update "
+"the list."
+msgstr ""
+
 #. ($total_inprogress, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1019
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:28
 msgid "In progress: %1/%2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:47
 msgid "Inactive"
 msgstr "Inaktív"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1601
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:51
+msgid "Inactive Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1503
 msgid "Inactivity time before a user is required to login again"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:42
 msgid "Include Contrib"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:35
 msgid "Include OPL"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:32
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:55
 msgid "Include Success Index"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:62
 msgid "Include percentage grades columns for all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:471
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:302
 msgid "Incorrect"
 msgstr ""
 
 #. ($total_incorrect, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1033
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:36
 msgid "Incorrect: %1/%2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:26
+msgid ""
+"Indicates the number of problems in the set. Clicking on the link opens the "
+"set detail page which allows you to modify set parameters, edit set headers,"
+" and change parameters of problems in the set such as the number of allowed "
+"attempts or the weight (credit value). You can also add, remove, view, edit,"
+" and reorder the problems in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:141
+msgid "Individual Problem Results"
+msgstr ""
+
 # Short for Initial
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:41
 msgid "Init"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:502
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:35
 msgid "Institution"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2344
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:560
 msgid "Instructor Comment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1494
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1306
 msgid "Instructor Feedback:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:311
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:17
+msgid "Instructor Links Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:29
 msgid "Instructor Tools"
 msgstr "Oktatói eszközök"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1228
-msgid "Instructor solution preview: show the student solution after due date."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:17
+msgid "Instructor Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:90
+msgid "Instructor:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:377
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:326
 msgid "Invalid Reply-to address."
 msgstr ""
 
 #. ($output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:187
 msgid ""
-"Invalid file name. The file name \"%1\" does not have a \".msg\" extension "
-"All email file names must end in the extension \".msg\" choose a file name "
-"with a \".msg\" extension. The message was not saved."
+"Invalid file name \"%1\". All email file names must end with the \".msg\" "
+"extension.  Choose a file name with the \".msg\" extension. The message was "
+"not saved."
 msgstr ""
 
 #. ($headerType)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1951
 msgid "Invalid headerType %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:177
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/XMLRPC.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:173
 msgid "Invalid user ID or password."
 msgstr "Érvénytelen felhasználói azonosító vagy jelszó."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2244
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:34
+msgid ""
+"It is important that students enter an email address or they will not "
+"recieve any of the important emails sent by the instructor. The email "
+"address will only be present on the page if the user has permission to "
+"change the email address."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:20
+msgid "It lists the homework problem sets available for the students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:472
 msgid "Jump to Problem:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:867
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:939
 msgid "Just-In-Time parameters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:130
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:85
+msgid "Key Map"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:14
 msgid "Key Map:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:93
 msgid "Keywords:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "LAST NAME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1477
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:119
 msgid "LOCAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:100
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:103
 msgid "LTI"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1548
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:25
+msgid "LTI Grade Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:460
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:75
+msgid "LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:17
+msgid "LTI Grade Update Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:16
+msgid "LTI grade passback is not enabled for this course"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:63
+msgid "LTI update of all users and sets queued."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:64
+msgid "LTI update of all users queued."
+msgstr ""
+
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:58
+msgid "LTI update of set %1 queued."
+msgstr ""
+
+#. ($userID, $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:56
+msgid "LTI update of user %1 and set %2 queued."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:60
+msgid "LTI update of user %1 queued."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1450
 msgid "Language (refresh page after saving changes to reveal new language.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:758
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:140
 msgid "Last"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:460
 msgid "Last Answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:604
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:231
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2001
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:828
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:857
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:915
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:31
+msgid "Last Full Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:25
 msgid "Last Name"
 msgstr "Vezetéknév"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:792
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:115
 msgid "Last column of merge file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:785
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:108
 msgid "Last name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:242
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:237
 msgid "Latest Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1603
+#: /opt/webwork/webwork2/conf/defaults.config:1505
 msgid ""
 "Length of time, in seconds, a user has to be inactive before he is required "
-"to login again.<p>This value should be entered as a number, so as 3600 "
-"instead of 60*60 for one hour"
+"to login again. This value should be entered as a number, so as 3600 instead"
+" of 60*60 for one hour."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:845
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:26
 msgid "Lesser Rod of Revelation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:965
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:26
 msgid "Lesser Tome of Enlightenment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:141
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:15
 msgid "Level Progress:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:881
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:77
 msgid "Level:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:912
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2060
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:433
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:17
+msgid "Library Broswer Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:359
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:52
 msgid "Library Browser"
 msgstr "Könyvtár böngésző"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1977
-msgid "List of display modes made available to students"
+#. ($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:30
+msgid "Link to Edit Page for %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2130
-msgid ""
-"List of e-mail addresses to which e-mail can be sent by a problem. "
-"Professors need to be added to this list if questionaires are used, or other"
-" WeBWorK problems which send e-mail as part of their answer mechanism."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:25
+msgid "Links to pages that give information about writing problems:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1879
+msgid "List of display modes made available to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:759
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:774
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:89
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:96
 msgid "List of insertable macros"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1826
+#: /opt/webwork/webwork2/conf/defaults.config:1728
 msgid "List of options for Show Me Another button"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1713
+#: /opt/webwork/webwork2/conf/defaults.config:1615
 msgid "List of sets excluded from achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1483
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:56
+msgid "Live equation rendering"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:144
+msgid "Loading..."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:122
 msgid "Local Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:41
 msgid "Local Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1504
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:136
 msgid "Local Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:105
 msgid "Local Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1467
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:114
 msgid ""
 "Local data is generated when your systems admin runs the script update-OPL-"
 "statistics."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1460
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:107
 msgid ""
 "Local data on problem usage is generated and maintained by your institution."
 " The Usage figure is the total number of local individuals who have attemped"
@@ -3636,42 +4907,61 @@ msgid ""
 "likely bug free."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:115
 msgid "Location"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3501
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1854
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1890
 msgid ""
 "Location %1 does not exist in the WeBWorK database.  Please check your input"
 " (perhaps you need to reload the location management page?)."
 msgstr ""
 
 #. ($locationID, join(', ', @addresses)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1742
 msgid "Location %1 has been created, with addresses %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3353
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1798
 msgid "Location deletion requires confirmation."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3409
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:43
 msgid "Location description:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3089
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:37
 msgid "Location name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:159
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:27
+msgid ""
+"Locations are a list of ip addresses.  Ip addresses can be a single address "
+"(e.g. 192.168.1.101), a range of ip address (e.g. "
+"192.168.1.101-192.168.1.150), or an ip address mask (e.g. 192.168.1.0/24). "
+"Enter one ip address per line, using as many lines as needed for each "
+"location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:32
+msgid ""
+"Locations are edited by adding new ip addresses to the location, or deleting"
+" existing address.  You must select the confirm checkbox when deleting a "
+"location, and this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:43
+msgid "Locations of files:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:18
 msgid "Log In Again"
 msgstr "Újra bejelentkezni"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1124
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:11
 msgid "Log Out"
 msgstr "Kijelentkezés"
 
@@ -3679,368 +4969,456 @@ msgstr "Kijelentkezés"
 #. ($rename_oldCourseID)
 #. ($rename_newCourseID)
 #. ($new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1458
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1541
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2666
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:913
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:704
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:780
 msgid "Log into %1"
 msgstr ""
 
-#. (HTML::Entities::encode_entities($prettyUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1122
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1130
+#. ($userName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:9
 msgid "Logged in as %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:790
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:181
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:187
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:113
 msgid "Login"
 msgstr "Bejelentkezés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:58
 msgid "Login Info"
 msgstr "Bejelentkezési információk"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:187
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:815
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1980
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:291
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:855
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:884
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:913
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:36
 msgid "Login Name"
 msgstr "Bejelentkezési név"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:18
 msgid "Login Status"
 msgstr "Bejelentkezési állapot"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:6
+msgid "Login:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:225
 msgid "Logout"
 msgstr "Kijelentkezés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Macro"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:763
-msgid "Main Menu"
-msgstr "Főmenü"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:369
-msgid "Make Archive"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:97
+msgid ""
+"Macro (\".pl\") files containing additional functionality for your course "
+"can be stored here."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1126
+#. ($filePath)
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:29
+msgid "Macro file %1 not found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:46
+msgid "Make Archive"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:27
 msgid "Make changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1115
-msgid "Make these changes in  course:"
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:15
+msgid "Make these changes in course: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:137
+msgid ""
+"Makes a new copy of the file you are editing at the location relative to the"
+" course's templates ([TMPL]) directory. You may choose to replace the "
+"current problem in the current set, append to the end to then end of the "
+"current set as a new problem, or create a problem that is not attached to a "
+"problem set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3040
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:1
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:46
 msgid "Manage Locations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:748
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:394
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:17
+msgid "Manage Locations Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:20
+msgid ""
+"Manage achievements for the course.  The actions allow one to edit, assign, "
+"import, export, score, create, or delete achievements.  The action form is "
+"at the top to select the desired action and options to perform when the "
+"submit button is pressed.  Below the action form is the list of all the "
+"achievements, ordered by their achievement \"Number\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:56
+msgid "Manage administration course files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:50
+msgid ""
+"Manage instructors.  When instructors are added to a newly created course, "
+"they are also added to the admin course with username \"userID_courseID\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:344
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:192
 msgid "Manual Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:233
-msgid "Mark All"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:17
+msgid "Manual Grader Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr',
+#. format_set_name_display($c->stash->{set}->set_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:205
+msgid "Manual Grader for %1: Problem %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:77
+msgid ""
+"Manually initiate an LTI grade passback for selected sets or users. This "
+"link is only visible if LTI grade passback is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:175
+msgid ""
+"Many of these editing activities can also be done more quickly from the "
+"\"Instructor Tools\" page where students and homework sets can be selected "
+"simultaneously. The \"Instructor Tools\" page is useful for quick editing of"
+" one or two students. The initial setup of the class can be done best from "
+"this page. Importing and exporting class lists can only be done from this "
+"page. Deleting students can only be done from this page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:120
 msgid "Mark Correct"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2822
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:598
 msgid "Mark Correct?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:681
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:19
 msgid "Match on what? (separate multiple IDs with commas)"
 msgstr "Találatok (többszörös azonosítók szétválasztása vesszővel)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:499
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:85
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:36
 msgid "Math Objects"
 msgstr "Mat. objektumok"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:327
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:377
 msgid "Max attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:380
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:24
 msgid "Max. Shown:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1817
+#: /opt/webwork/webwork2/conf/defaults.config:1719
 msgid ""
 "Maximum times Show me Another can be used per problem (-1 => unlimited)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:606
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:4
+msgid "Merge file data:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:24
 msgid "Merge file:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:288
 msgid "Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:578
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:13
 msgid "Message file:"
 msgstr ""
 
-#. ($emailDirectory, $output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:357
-msgid "Message saved to file <code>%1/%2</code>."
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:300
+msgid "Message saved to file %1."
 msgstr ""
 
-#. ($recipient, $ur->email_address)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:995
+#. ($recipient, $user_record->email_address)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:98
 msgid "Message sent to %1 at %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2249
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2324
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:121
+msgid "Message was blank."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:48
+msgid ""
+"Messages can be saved to a message file (which must end in the \".msg\" "
+"extension).  Use the \"Message file\" drop down menu to select which message"
+" file to load, or \"None\" to use a blank message. To save a new message, "
+"use the \"Save as\" button after entering in a valid filename.  The \"Save "
+"as\" button will not overwrite currently saved messages.  To edit a "
+"currently saved message first select it using the drop down menu, then click"
+" the \"Save\" button to save any changes.  Use the \"File Manager\" to "
+"delete messages, located in the \"[TMPL]/email\" directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:22
 msgid "Method"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3284
+#: /opt/webwork/webwork2/conf/defaults.config:2003
+msgid "Method to enter problem scores in the single problem manual grader"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1668
 msgid ""
 "Missing required input data. Please check that you have filled in all of the"
 " create location fields and resubmit."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1555
+#: /opt/webwork/webwork2/conf/defaults.config:1457
 msgid ""
 "Mode in which the LANG and DIR settings for a single problem are determined."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1557
-msgid ""
-"Mode in which the LANG and DIR settings for a single problem are "
-"determined.<p>The system will set the LANGuage attribute to either a value "
-"determined from the problem, a course-wide default, or the system default, "
-"depending on the mode selected. The tag will only be added to the DIV "
-"enclosing the problem if it is different than the value which should be set "
-"in the main HTML tag set for the entire course based on the course "
-"language.<p>There are two options for the DIRection attribute: \"ltr\" for "
-"left-to-write sripts, and \"rtl\" for right-to-left scripts like Arabic and "
-"Hebrew.<p>The DIRection attribute is needed to trigger proper display of the"
-" question text when the problem text-direction is different than that used "
-"by the current language of the course. For example, English problems from "
-"the library browser would display improperly in RTL mode for a Hebrew "
-"course, unless the problen Direction is set to LTR.<p>The feature to set a "
-"problem language and direction was only added in 2018 to the PG language, so"
-" most problems will not declare their language, and the system needs to fall"
-" back to determining the language and direction in a different manner. The "
-"OPL itself is all English, so the system wide fallback is to en-US in LTR "
-"mode.<p>Since the defaults fall back to the LTR direction, most sites should"
-" be fine with the \"auto::\" mode, but may want to select the one which "
-"matches their course language. The mode \"force::ltr\" would also be an "
-"option for a course which runs into trouble with the \"auto\" "
-"modes.<p>Modes:<br><ul><li>\"none\" prevents any additional LANG and/or DIR "
-"tag being added. The browser will use the main setting which was applied to "
-"the entire HTML page. This is likely to cause trouble when a problem of the "
-"other direction is displayed.</li><li>\"auto::\" allows the system to make "
-"the settings based on the language and direction reported by the problem (a "
-"new feature, so not set in almost all existing problems) and falling back to"
-" the expected default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" "
-"allows the system to make the settings based on the language and direction "
-"reported by the problem (a new feature, so not set in almost all existing "
-"problems) but falling back to the language with the given LangCode and the "
-"direction Dir when problem settings are not available from "
-"PG.</li><li>\"auto::Dir\" for problems without PG settings, this will use "
-"the default en=english language, but force the direction to Dir. Problems "
-"with PG settings will get those settings.</li><li>\"auto:LangCode:\" for "
-"problems without PG settings, this will use the default LTR direction, but "
-"will set the language to LangCode.Problems with PG settings will get those "
-"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
-" by the PG code of the problem, and will force the system to set the "
-"language with the given LangCode and the direction to Dir for <b>all</b> "
-"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
-"PG code of the problem, and will force the system to set the direction to "
-"Dir for <b>all</b> problems, but will avoid setting any language attribute "
-"for individual problem.</li></ul>"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2695
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:443
 msgid "Move"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2231
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:457
 msgid "Move to Page:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2226
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:452
 msgid "Move to Problem:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:26
+msgid ""
+"Multiple sets may be assigned to the users by holding down the shift key or "
+"the ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:27
+msgid ""
+"Multiple users or sets may be selected by holding down the shift key or the "
+"ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:36
 msgid "My Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1412
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:26
 msgid "Mysterious Package (with Ribbons)"
 msgstr ""
 
 # Short for Number of Fields
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:213
 msgid "NO OF FIELDS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1484
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:741
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:113
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:135
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:29
 msgid "Name"
 msgstr "Név"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:174
 msgid "Name for new set here"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1528
+#: /opt/webwork/webwork2/conf/defaults.config:1430
 msgid "Name of course information file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1107
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:77
+msgid "Name of the evaluator file used to evaluate the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:81
+msgid "Name of the image used for the achievement icon."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:4
 msgid "Name the new set"
 msgstr "Az új feladatsor neve"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1691
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:45
+msgid "Name:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:29
 msgid "Necromancers Charm"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:343
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:205
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:393
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:35
 msgid "Never"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:371
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:54
 msgid "New File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:372
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:55
 msgid "New Folder"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:30
 msgid "New Name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2067
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:3
 msgid "New Password"
 msgstr "Új jelszó"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:131
-msgid "New Version"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+msgid "New Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
 msgid "New file name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
 msgid "New folder name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:577
 msgid "New passwords saved"
 msgstr "Az új jelszó mentve"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1078
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:36
 msgid "New set name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1357
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1010
 msgid "Next Problem"
 msgstr "Új feladat"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1181
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2164
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:40
+msgid "Next Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:98
 msgid "Next page"
 msgstr ""
 
-#. ($self->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:620
+#. (% $c->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:142
 msgid "Next test will be available by %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2452
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:134
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:144
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:183
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:483
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:510
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:142
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:68
 msgid "No"
 msgstr "Nem"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:635
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:116
 msgid "No Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2324
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:216
 msgid "No Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:117
+msgid "No Sender specified."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:23
 msgid "No Target Set Selected"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:335
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:38
 msgid "No achievement badges have been assigned yet."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1521
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:77
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:37
 msgid "No achievements shown.  Create an achievement!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:90
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:2
+msgid "No achievements shown.  Select an achievement to edit!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:61
 msgid "No action taken"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:141
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:140
 msgid ""
 "No authentication method found for your request.  If this recurs, please "
 "speak with your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:940
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:361
 msgid "No change made to any set"
 msgstr "Egy feladatsorban sem történt változás"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
 msgid ""
 "No changes specified.  You must mark the checkbox of the item(s) to be "
 "changed and enter the change data."
@@ -4050,1379 +5428,1811 @@ msgstr ""
 msgid "No changes were saved!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2462
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:50
 msgid "No course archives found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2898
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:32
 msgid "No course id defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1561
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:932
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:67
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:76
 msgid "No courses found"
 msgstr ""
 
 #. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:593
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:675
 msgid "No data exists for set %1 and problem %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:10
+msgid "No e-mail recipients are listed for this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:169
 msgid "No filename was specified for saving!  The message was not saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:340
 msgid "No guest logins are available. Please try again in a few minutes."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3522
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1877
 msgid "No location specified to edit. Please check your input data."
 msgstr ""
 
 #. ($badID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1788
 msgid "No location with name %1 exists in the database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3206
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:149
 msgid "No locations are currently defined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:342
 msgid "No merge data file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:612
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:18
+msgid "No merge data found"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:164
+msgid "No merge data found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:8
+msgid "No merge file selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:135
 msgid "No more tests available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:270
 msgid ""
 "No new Achievement ID specified.  No new achievement created.  File not "
 "saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:63
 msgid "No problems matched the given parameters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:25
+msgid "No recipients selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:334
 msgid ""
 "No recipients selected. Please select one or more recipients from the list "
 "below."
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2044
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:49
 msgid "No record for global set %1."
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2046
-msgid "No record for user %1."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
 msgid "No record found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1166
-msgid "No set created."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:12
 msgid "No sets in this course yet"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1010
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:159
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
 msgid "No sets selected for scoring"
 msgstr "Nincsenek feladatsorok kiválasztva értékelésre"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2764
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:46
 msgid ""
 "No sets shown.  Choose one of the options above to list the sets in the "
 "course."
 msgstr "Nem jeleníthetőek meg feladatsorok. Válasszon fent egy lehetőséget a kurzus feladatsorainak jegyzékéért. "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1942
 msgid "No source filePath specified"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1327
 msgid "No source_file for problem in .def file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2099
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:87
 msgid ""
-"No students shown.  Choose one of the options above to list the students in "
+"No students shown. Choose one of the options above to list the students in "
 "the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:246
 msgid "No submissions. Over time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:278
 msgid "No tests taken."
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:594
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:676
 msgid "No user specific data exists for user %1"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2031
 msgid "No valid changes submitted for location %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:275
-msgid "No versions of this assignment have been taken."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:771
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:263
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:241
 msgid "No versions of this test have been taken."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:562
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:252
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:17
 msgid "None"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:681
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2463
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:763
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:52
 msgid "None Specified"
 msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2089
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:73
 msgid "None of the selected users are assigned to this set: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:33
 msgid "Not logged in."
 msgstr "Nincs bejelentkezve."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1569
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:4
 msgid "Note"
 msgstr "Megjegyzés"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:381
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:55
+msgid ""
+"Note that if there are errors, they will be shown at the top of the page. In"
+" some cases, a hard copy is still generated and a link called \"Download "
+"Hardcopy\" appears. In addition, the latex file, log and error files are "
+"generated which can be used in troubleshooting."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:93
+msgid ""
+"Note that if you set the permission level of a user to something other than "
+"\"Student\", you may also want to set the status of the user to "
+"\"Observer\".  Users with the \"Observer\" status are not included in "
+"statistics, scoring, or instructor emails."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:28
+msgid ""
+"Note that some settings require an additional page load after \"Save "
+"Changes\" is clicked in order to take effect.  This is true for a theme "
+"change for example."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:396
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:422
 msgid "Note:"
 msgstr ""
 
-#. (CGI::i($pg->{result}{msg})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2350
+#. (tag('i', maketext('You are in the Reduced Scoring Period.  All work counts
+#. for [_1]% of the original.',
+#. $ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#. (tag('i', $pg->{result}{msg})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:572
 msgid "Note: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2482
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:686
 msgid ""
 "Note: grading the test grades all problems, not just those on this page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1460
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1485
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:768
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:59
+msgid "Now"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:19
 msgid "Number"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:242
 msgid "Number of Graded Submissions per Test (0=infty)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
 msgid "Number of Problems per Page (0=all)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:95
+msgid "Number of Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:257
 msgid "Number of Tests per Time Interval (0=infty)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1833
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2435
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:54
+msgid "Number:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1181
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:912
 msgid "OK"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1464
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:17
+msgid "OPL Problem Levels Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:26
 msgid "Oil of Cleansing"
 msgstr ""
 
+#. ('<code>pdflatex</code>', '<code>hardcopy.tex</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:49
+msgid ""
+"Once \"Generate Hardcopy for selected sets and selected users\" is clicked a"
+" file in the selected hardcopy format will be generated and offered for "
+"download. If PDF output was selected, a single PDF file is generated. If TeX"
+" output is selected, a zip file is generated that contains all files needed "
+"to generated the hardcopy PDF file via %1. The main TeX file is called %2."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:84
 msgid "One Column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:314
+msgid "Only Start"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:289
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:303
 msgid "Only after set answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1892
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:87
+msgid ""
+"Only present for JITAR sets. Collapse JITAR nesting problem groups to the "
+"top row of information about a problem. Note that the nesting of a single "
+"problem group can be collapsed by clicking on the down arrow to the right of"
+" the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:80
+msgid ""
+"Only present for JITAR sets. Expand JITAR nested problem groups that have "
+"been collapsed. Note that the nesting of a single problem group can be "
+"expanded by clicking on the right arrow to the right of the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1794
 msgid ""
 "Only this permission level and higher get buttons for sending e-mail to the "
 "instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:39
 msgid "Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:422
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:763
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:810
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:62
 msgid "Open Date"
 msgstr "A kezdés dátuma"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1098
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:42
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:32
 msgid "Open Problem Library"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2417
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:272
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:525
 msgid "Open in New Window"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1263
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1617
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:29
 msgid "Open in new window"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:491
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:320
 msgid "Open, closes %1."
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:489
-msgid "Open, complete by %1."
-msgstr ""
-
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:300
 msgid "Open, due %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:433
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
 msgid "Open."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:431
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:268
 msgid "Open. Submitted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:31
 msgid "Open:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:115
 msgid "Opens"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:27
 msgid "Opens any homework set for 24 hours."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1686
+#: /opt/webwork/webwork2/conf/defaults.config:1588
 msgid "Optional Modules"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:265
 msgid "Order Problems Randomly"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:50
+msgid "Other Options"
+msgstr ""
+
 # Context is "7 Out Of 10"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:405
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:777
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:150
 msgid "Out Of"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1024
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:85
+msgid "Overall Results"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:93
+msgid "Overall Set Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:122
+msgid "Overall Success Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:470
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:481
 msgid "Overwrite"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:437
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:100
 msgid "Overwrite existing files silently"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:41
+msgid "PDF"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:69
 msgid "PG Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:827
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer.html.ep:1
+msgid "PG POD"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:17
+msgid "PG Problem Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:708
 msgid "PG debug messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:829
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:716
 msgid "PG internal errors"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:818
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:109
+msgid ""
+"PG markdown syntax used to format WeBWorK questions. This interactive lab "
+"can help you to learn the techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:692
 msgid "PG question failed to render"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:826
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:706
 msgid "PG question processing error messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:828
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:712
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:128
 msgid "PG warning messages"
 msgstr ""
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:511
-msgid "PGLab"
-msgstr ""
-
-# Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:98
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:47
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:58
 msgid "PGML"
 msgstr ""
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:91
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:40
 msgid "POD"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2309
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2249
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:200
+msgid "POD Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:208
+msgid "POD Viewer"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1515
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:526
 msgid "PREVIEW ONLY -- ANSWERS NOT RECORDED"
 msgstr "A kezdés dátumaCSAK MEGTEKINTÉS - A VÁLASZOK NINCSENEK MENTVE"
 
 # Problem Number
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:215
 msgid "PROB NUMBER"
 msgstr ""
 
 # Problem Value
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:218
 msgid "PROB VALUE"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:205
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:36
 msgid "Pad Fields"
 msgstr "Betét mező"
 
-#. (timestamp($self)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1255
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:28
+msgid "Page Contents"
+msgstr ""
+
+#. ($c->timestamp)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:1
 msgid "Page generated at %1"
 msgstr "Az oldal generálva: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:568
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:81
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:71
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:56
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:25
 msgid "Password"
 msgstr "Jelszó"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:976
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:13
 msgid "Password (Leave blank for regular proctoring)"
 msgstr ""
 
-#. ($studentUser, CGI::span({ dir => 'ltr' },
-#. format_set_name_display($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:498
+#. ($studentUser, tag('span', dir => 'ltr', format_set_name_display($setName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:13
 msgid "Past Answers for %1, set %2, problem %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:8
 msgid "Percent"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:562
-msgid "Percentage of Active Students with Correct Answers"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:94
+msgid "Percent Ranges"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+msgid "Percent Score"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:535
+msgid "Percent of Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:788
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:206
 msgid ""
 "Percentile cutoffs for number of attempts. The 50% column shows the median "
 "number of attempts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2056
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:834
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:863
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:921
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:58
+msgid ""
+"Percentile cutoffs for student's score and success index. The 50% column "
+"shows the median number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:50
 msgid "Permission Level"
 msgstr "Hozzáférési szint"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1869
+#: /opt/webwork/webwork2/conf/defaults.config:1771
 msgid "Permissions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1052
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:24
 msgid "Pick a target set above to add this problem to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:54
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:21
 msgid "Pick date and time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3804
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
 msgid ""
 "Place a file named \"hide_directory\" in a course or other directory and it "
 "will not show up in the courses list on the WeBWorK home page. It will still"
 " appear in the Course Administration listing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1107
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should be given full credit."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should have half credit added."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given full credit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:889
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given half credit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:654
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its incorrect attempt count reset."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its weight doubled."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1315
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:60
 msgid ""
 "Please choose the set, the problem you would like to copy, and the problem "
 "you would like to copy it to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:399
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:19
 msgid "Please correct the following errors and try again:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:698
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:28
 msgid "Please enter in a value to match in the filter field."
 msgstr ""
 
-#. (CGI::b($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:197
+#. (tag('b', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:28
 msgid "Please enter your username and password for %1 below:"
 msgstr "Kérjük adja meg alább %1 felhasználói nevét és jelszavát:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1778
 msgid "Please provide a location name to delete."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:233
 msgid "Please select action to be performed."
 msgstr "Válassza ki a végrehajtandó művelet."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:183
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
 msgid "Please select at least one set and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
 msgid "Please select at least one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:165
 msgid "Please select at least one user and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:35
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:31
 msgid "Please select at least one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:28
 msgid "Please select at most one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:30
 msgid "Please select exactly one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:29
 msgid "Please select exactly one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:574
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1016
 msgid "Please specify a file to save to."
 msgstr "Kérjük válassza ki a mentendő állományt"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:37
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
 msgid "Please specify a homework set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:38
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
 msgid ""
 "Please use only letters, digits, dashes, underscores, and periods in your "
 "set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1462
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1184
+msgid ""
+"Please use radio buttons to choose the method for saving this file. Uknown "
+"saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:165
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:169
+msgid "Point Value"
+msgstr ""
+
+#. ($grader->{problem_value})
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:92
+msgid "Point Value (0 - %1):"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:21
 msgid "Points"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:609
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:62
+msgid "Points:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:26
 msgid "Potion of Forgetfulness"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1423
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:2
 msgid "Prepare which sets for export?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2054
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2073
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:268
 msgid "Press \"Grade Test\" now!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2049
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:244
 msgid "Press \"Grade Test\" soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:213
-msgid "Preview Comment"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:69
 msgid "Preview Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:314
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1840
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:11
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:99
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:35
 msgid "Preview My Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2440
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:646
 msgid "Preview Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1340
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:41
+msgid ""
+"Preview the message before sending using the \"Preview Message\" button.  "
+"The preview shows the email that would be sent to the first selected student"
+" or the instructor if no students were selected.  The preview will also list"
+" all of the students that would receive their own personalized message.  If "
+"a merge file was selected, the preview will also indicate which (if any) "
+"recipient's merge file data could not be found."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:991
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:995
 msgid "Previous Problem"
 msgstr "Előző feladat"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2157
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:94
 msgid "Previous page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2149
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:45
+msgid "Primary Actions"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:355
 msgid "Print Test"
 msgstr ""
 
 # Short for Problem
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2088
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:287
 msgid "Prob"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:670
-msgid "Problem #"
-msgstr ""
-
-#. ($prettyProblemID)
-#. ($problemNumber)
 #. (join('.', @seq)
 #. ($problemID)
-#. ($prettyProblemIDs{$probID})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:831
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:834
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:897
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:438
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:800
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:956
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:964
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:973
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:933
+#. ($problemNumber)
+#. ($_->{prettyID})
+#. ($c->{prettyID})
+#. ($probID)
+#. ($c->{setRecord}->assignment_type eq 'jitar' ? join('.',
+#. jitar_id_to_seq($_)
+#. ($set->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)
+#. ($prettyProblemID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:831
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:842
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:853
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:57
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/siblings.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:40
 msgid "Problem %1"
 msgstr "%1. feladat"
 
-#. ($problemNumber)
-#. ($prettyID)
-#. ($versioned ? $versioned : $MergedProblem->problem_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1419
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1421
+#. ($i + 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:535
 msgid "Problem %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1974
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:75
+msgid "Problem (\".pg\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:38
+msgid "Problem Display Settings"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1876
 msgid "Problem Display/Answer Checking"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:451
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:50
 msgid "Problem Editor"
 msgstr "Feladatszerkesztő"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1697
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:29
 msgid "Problem Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1002
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:999
 msgid "Problem List"
 msgstr "Feladatlista"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1119
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:666
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:783
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:75
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:159
 msgid "Problem Number"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:156
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:160
+msgid "Problem Paths"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:140
 msgid "Problem Score (%):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:30
 msgid "Problem Techniques"
 msgstr "Feladat-technikák"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:705
-msgid "Problem Viewer"
-msgstr "Feladat-néző"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:239
+msgid ""
+"Problem has a different source file than the currently rendered problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:233
+msgid "Problem has an essay answer that needs to be graded."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1943
 msgid "Problem source is drawn from a grouping set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:406
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2494
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:445
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:827
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:835
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:896
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:801
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:89
+msgid ""
+"Problem source is drawn from a grouping set and can not be directly rendered"
+" or edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:336
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:9
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:32
 msgid "Problems"
 msgstr "Feladatok"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:25
 msgid "Problems Added"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:59
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:54
 msgid "Problems for all students have been unassigned."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:57
 msgid "Problems for selected students have been reassigned."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:51
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:46
 msgid "Problems have been assigned to all current users."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:25
+msgid ""
+"Problems with this rating should only require direct memory of a fact. "
+"Examples might be a specific value of a function, or the statement of a "
+"definition. Very few WeBWorK problems fall into this category."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:93
 msgid "Proctor"
 msgstr "Felügyelő"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:282
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:92
 msgid "Proctor Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:258
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:71
 msgid "Proctor Username"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:193
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:3
+msgid "Proctor authorization requested for a nonexistent set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:8
 msgid "Proctor authorization required."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:231
-msgid "Proctored Gateway Quiz %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:88
+msgid "Proctor:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:241
-msgid "Proctored Gateway Quiz %2 Proctor Login"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:265
+msgid "Proctored Test %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:981
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:272
+msgid "Proctored Test %2 Proctor Login"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:318
+msgid ""
+"Proctored tests always require authorization to start the test. \"Both Start"
+" and Grade\" will require login proctor authorization to start and grade "
+"proctor authorization to grade. \"Only Start\" requires grade proctor "
+"authorization to start and no authorization to grade."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:18
 msgid ""
-"Proctored tests require proctor authorization to start and to grade.  "
 "Provide a password to have a single password for all students to start a "
 "proctored test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:56
 msgid "Publish"
 msgstr "Közzététel"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:31
+msgid ""
+"Quick access to many instructor tools, including <strong>Reset "
+"passwords</strong>, <strong>Act as student</strong>, <strong>Assign "
+"individual sets</strong> and <strong>Edit individual due dates</strong>."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "RECITATION"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1333
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:199
 msgid "Randomize"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:13
 msgid "Randomize Seed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:101
 msgid "Read only"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:67
 msgid "Really delete the items listed above?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:201
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:212
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:804
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2038
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:298
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:832
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:861
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:890
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:919
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:184
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:42
 msgid "Recitation"
 msgstr "Előadás"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:194
+#. ($recitation)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:125
+msgid "Recitation %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:21
+msgid "Recitation:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:38
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:46
 msgid "Record Scores for Single Sets"
 msgstr "A pontszámok mentése az adott feladatsorhoz"
 
-#. ($studentName)
-#. ($self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:183
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:190
+#. ($studentID)
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:8
 msgid "Record for user %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Reduced Scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:67
 msgid "Reduced Scoring Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2523
-msgid "Reduced Scoring Disabled"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
+msgid "Reduced Scoring Enabled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2522
-msgid "Reduced Scoring Enabled"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:33
+msgid "Reduced Scoring Period"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:314
 msgid "Reduced credit can still be earned until %1."
 msgstr ""
 
 # Short for "Reduced Scoring:"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:32
 msgid "Reduced:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:153
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:373
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:56
 msgid "Refresh"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1646
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1943
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2000
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3713
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3755
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:56
 msgid "Refresh Listing"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:190
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:200
 msgid "Relax IP restrictions when?"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:88
+msgid "Reload the page to see backup files that have been made."
+msgstr ""
+
 # Context is "Attempts Remaining"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:14
 msgid "Remaining"
 msgstr "Maradék"
 
 #. ('00:00:00')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:254
 msgid "Remaining time: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:61
 msgid "Remember Me"
 msgstr "Emlékezz rám!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:546
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:514
 msgid "Remember to return to your original problem when you're finished here!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1020
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:466
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:72
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:41
 msgid "Rename"
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1302
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:62
 msgid "Rename %1 to %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:378
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:927
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:73
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:34
 msgid "Rename Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:17
+msgid "Rename Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:22
+msgid "Rename Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
 msgid "Rename file as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2727
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:463
 msgid "Render"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:344
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:59
 msgid "Render All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2720
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:461
 msgid "Render Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2501
-msgid "Renumber Problems"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:60
+msgid ""
+"Render all problems on the page. This does not reload the page or save or "
+"reset changes."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:106
 msgid ""
-"Reopens any gateway test for an additional 24 hours. This allows you to take"
-" a test even if the close date has past. This item does not allow you to "
-"take additional versions of the test."
+"Render or re-render the problem, course info file, or set header being "
+"edited. This does not change the permanent file on the disk. You can view "
+"different versions of the same problem by changing the seed. You can also "
+"change the manner in which the mathematics is typeset. If \"Open in new "
+"window\" is checked, then the problem will open in a new tab or window "
+"showing the problem as it will be rendered for students in the set."
 msgstr ""
 
-#. (CGI::strong(                                                   CGI::span({
-#. dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1829
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:132
+msgid "Rendering Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:341
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:53
+msgid "Renumber Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:55
+msgid ""
+"Renumber problems consecutively starting from 1. This renumbering is not "
+"saved until \"Save Changes\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:103
+msgid ""
+"Renumber problems in the set consecutively starting from one. In the process"
+" of deleting problems, the numbering can be made non-consecutive. This is "
+"useful to clean up the problem numbering."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:31
+msgid ""
+"Reopens any test for an additional 24 hours. This allows you to take a test "
+"even if the close date has past. This item does not allow you to take "
+"additional versions of the test."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:118
+msgid "Reordering Problems"
+msgstr ""
+
+#. (tag(                                           'strong',
+#. c(                                                      tag('span', dir =>
+#. 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:58
 msgid "Replace current problem: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:13
 msgid "Replace which users?"
 msgstr "Mely felhasználókat cseréli?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:637
+#. ($composite_id, $oldUser->status)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:448
+msgid "Replacing old data for %1: status: %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:42
 msgid "Reply-To:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:528
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:123
 msgid "Report Bugs in this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1073
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:305
 msgid "Report bugs"
 msgstr "Hiba bejelentése"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:128
+msgid ""
+"Report bugs in a WeBWorK question/problem using this link. The very first "
+"time you do this you will need to register with an email address so that "
+"information on the bug fix can be reported back to you."
+msgstr ""
+
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2825
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1530
 msgid "Report for course %1:"
 msgstr ""
 
-#. ($rename_oldCourseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2122
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:3
 msgid "Report on database structure for course %1:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1829
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:8
 msgid "Request New Version"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2246
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2321
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:19
 msgid "Request information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1972
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1220
 msgid "Request new version now."
 msgstr ""
 
+#. ($setName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:486
+msgid ""
+"Requested set \"%1\" is a proctored test, but no valid proctor authorization"
+" has been obtained."
+msgstr ""
+
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:399
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:422
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:425
 msgid "Requested set '%1' could not be found in the database for user %2."
 msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:469
-msgid ""
-"Requested set '%1' is a homework assignment but the gateway/quiz content "
-"generator %2 was called.  Try re-entering the set from the problem sets "
-"listing page."
-msgstr ""
-
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:484
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:472
 msgid ""
-"Requested set '%1' is a proctored test/quiz assignment, but no valid proctor"
-" authorization has been obtained."
+"Requested set '%1' is a homework assignment but the test content generator "
+"%2 was called.  Try re-entering the set from the problem sets listing page."
 msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:463
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:466
 msgid ""
-"Requested set '%1' is a test/quiz assignment but the regular homework "
-"assignment content generator %2 was called.  Try re-entering the set from "
-"the problem sets listing page."
+"Requested set '%1' is a test but the regular homework assignment content "
+"generator %2 was called.  Try re-entering the set from the problem sets "
+"listing page."
 msgstr ""
 
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:420
 msgid "Requested set '%1' is not assigned to user %2."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:450
 msgid "Requested set '%1' is not available yet."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:441
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:444
 msgid "Requested set '%1' is not yet open."
 msgstr ""
 
 #. ($verNum,				$setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:404
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:407
 msgid "Requested version (%1) of set '%2' can not be directly accessed."
 msgstr ""
 
 #. ($verNum, $setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:397
 msgid "Requested version (%1) of set '%2' is not assigned to user %3."
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:308
+msgid "Require Proctor Authorization to"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:45
 msgid "Require users to log in through the LMS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:420
 msgid "Rerandomize after"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:104
 msgid "Reset"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2280
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2968
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:195
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:696
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:47
 msgid "Reset Form"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:610
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:27
 msgid "Resets the number of incorrect attempts on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2453
-msgid ""
-"Restores a course from a gzipped tar archive (.tar.gz). After unarchiving, "
-"the course database is restored from a subdirectory of the course's DATA "
-"directory. Currently the archive facility is only available for mysql "
-"databases. It depends on the mysqldump application."
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:41
+msgid "Restore a .tar.gz archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:40
+msgid "Restore backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:39
+msgid "Restore backup from %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:178
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+msgid "Restored backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:188
 msgid "Restrict Access by IP"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:912
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep:11
 msgid "Restrict Locations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:286
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:324
 msgid "Restrict Problem Progression"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:184
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:194
 msgid "Restrict To"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:154
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:33
+msgid "Restrict or sort the students displayed"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:159
 msgid "Restrict release by set(s)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2090
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:299
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:291
 msgid "Result"
 msgstr "Eredmények"
 
-#. (CGI::i($self->$actionHandler(\%genericParams, \%actionParams,
-#. \%tableParams)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:388
+#. ($c->tag('i', $c->$actionHandler)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:228
 msgid "Result of last action performed: %1"
 msgstr "Az utolsó művelet eredményei: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:309
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:300
 msgid "Results for this submission"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:363
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:236
 msgid "Results of last action performed"
 msgstr "Az utolsó művelet eredményei"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:125
 msgid "Results of last action performed: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1725
-msgid "Resurrect which Gateway?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:51
+msgid "Resurrect which test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1449
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:669
 msgid "Retitled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:17
 msgid "Return to your work"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:686
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:132
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:16
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:166
 msgid "Revert"
 msgstr "Visszaállít"
 
-#. (CGI::span({ dir => 'ltr' }, $self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2069
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:83
 msgid "Revert to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1431
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1513
+#. ($c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1220
+msgid "Reverted to original file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:168
+msgid ""
+"Reverts to the copy of the file saved on the disk or to a backup file. All "
+"unsaved editing changes will be lost. This option is only active when a "
+"temporary file or a backup file exists. You may also delete backups that "
+"have been made with this tab."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:182
+msgid "Review of column functions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:145
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:85
 msgid ""
 "Reviewing a problem and looking at both the average Attempts and  average "
 "Status should give instructors valuable information about the difficulty of "
 "the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:55
 msgid "Reward used successfully!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:180
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:4
 msgid "Rewards"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:27
 msgid "Ring of Reduction"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:322
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:26
 msgid "Robe of Longevity"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "SECTION"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:214
 msgid "SET NAME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:321
 msgid "STATUS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "STUDENT ID"
 msgstr "Diák azonosító (ID)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:43
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:263
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:170
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:687
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:847
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:220
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:85
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:207
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:123
 msgid "Save"
 msgstr "mentés"
 
-#. (CGI::b($self->shortPath($self->{sourceFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:438
+#. (tag('b', $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_form.html.ep:2
 msgid "Save %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:44
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:695
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:134
 msgid "Save As"
 msgstr "Mentés mint"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:744
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2963
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:194
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:695
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:37
 msgid "Save Changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:60
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:76
 msgid "Save Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
 msgid "Save Export"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:92
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
 msgid "Save Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:188
 msgid "Save as"
 msgstr "mentés mint"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:872
-msgid "Save as Default"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:481
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:5
 msgid "Save as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1558
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:254
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1443
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_password_form.html.ep:1
 msgid "Save changes"
 msgstr "A változások mentése"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1794
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:33
 msgid "Save file to:"
 msgstr ""
 
-#. (CGI::b({ dir => 'ltr' }, $self->shortPath($self->{editFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1605
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:125
+msgid ""
+"Save the contents of the editor window to the file on disk and re-render the"
+" problem. If \"Open in new window\" is checked, then the problem will open "
+"in a new tab or window showing the problem as it will be rendered for "
+"students in the set. If \"Create backup\" is checked then a backup of the "
+"current file on disk will be created before overwriting it with the contents"
+" of the editor window. If a backup already exists, then a \"Delete oldest "
+"backup\" check box will be present. If that is checked, then the oldest "
+"backup will be deleted when \"Save\" is clicked. These backups can be "
+"reverted to and managed on the \"Revert\" tab."
+msgstr ""
+
+#. (tag('b', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:6
 msgid "Save to %1 and View"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:396
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1165
-msgid "Saved to file '%1'"
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:50
+msgid "Saved answers"
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#. ($outputFilePath =~ s/$ce->{courseDirs}{templates}/[TMPL]/r)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:549
+msgid "Saved to file \"%1\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1180
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2116
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2292
 msgid "Schema and database field definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4284
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2279
 msgid "Schema and database table definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:404
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:465
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:660
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:147
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:161
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:78
 msgid "Score"
 msgstr "Eredmény"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:125
 msgid "Score (%)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:161
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:60
+msgid ""
+"Score one or more sets. This can also be done from the \"Hmwk Sets Editor\" "
+"or from the \"Instructor Tools\", but the \"Scoring Tools\" page allows "
+"control over parameters."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:170
 msgid "Score required for release"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:228
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:58
 msgid "Score selected set(s) and save to:"
 msgstr "A kiválasztott feladatsor(ok) pontozása és mentése ide:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2085
-msgid "Score summary for last submit:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:284
+msgid "Score summary for last submission:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:2
 msgid "Score which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:978
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:2
 msgid "Score which sets?"
 msgstr "Mely feladatsor eredményei?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
 msgid "Scores"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:487
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:66
+msgid "Scoring (\".csv\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:396
 msgid "Scoring Download"
 msgstr "Az eredmények letöltése"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:161
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:115
 msgid "Scoring Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:478
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:391
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:58
 msgid "Scoring Tools"
 msgstr "Pontozási eszközök"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2460
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:17
+msgid "Scoring Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:327
 msgid ""
 "Screen and Hardcopy set header information can not be overridden for "
 "individual students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:26
 msgid "Scroll of Resurrection"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:189
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:200
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:211
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:793
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2029
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:297
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:831
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:860
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:889
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:918
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:157
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:178
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:38
 msgid "Section"
 msgstr "Fejezet"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:653
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:802
+#. ($section)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:122
+msgid "Section %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:30
 msgid "Section:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:436
 msgid "Seed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:114
 msgid "Select"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:505
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:20
+msgid ""
+"Select Users from the left column and sets from the right column and assign "
+"or unassign the given sets. The list of users or the list of sets can be "
+"reordered under the \"sort\" option or the format of the user or set list.  "
+"Additionally, the set lists can be filtered (by section number or "
+"recitation).  The displayed user and set lists will only be updated upon "
+"clicking \"Change Display Settings\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:11
 msgid "Select a Homework Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:14
 msgid "Select a Problem Collection"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:18
 msgid "Select a Set Definition File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1028
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:14
 msgid "Select a Set from this Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1659
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:20
+msgid ""
+"Select a course to create a .tar.gz archive of, which contains a dump of the"
+" database and all course files (templates, configuration files, etc).  Each "
+"course can only have a single archive.  Creating an archive of a previously "
+"archived course will delete the old archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:36
 msgid "Select a course to delete."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:946
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:20
+msgid ""
+"Select a course to delete.  Warning, all data will be deleted and this "
+"cannot be undone.  This will not delete any course archives."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:14
 msgid ""
 "Select a course to rename.  The courseID is used in the url and can only "
 "contain alphanumeric characters and underscores. The course title appears on"
 " the course home page and can be any string."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2475
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:13
 msgid "Select a course to unarchive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1914
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3684
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:21
 msgid "Select a listing format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1442
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1478
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:18
+msgid "Select action:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:10
 msgid "Select all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2703
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:12
 msgid "Select all eligible courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2731
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:26
 msgid "Select all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1967
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:10
 msgid "Select all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:315
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:509
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:536
-msgid "Select an action to perform"
-msgstr "Válassza ki a végrehajtandó művelet"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3063
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:10
 msgid "Select an action to perform:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1956
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:20
+msgid ""
+"Select an archive to restore.  You cannot restore an archive into an "
+"existing course. Instead, either rename or delete the old course, or restore"
+" the archive with a new name.  When restoring a course with a new name, the "
+"name is used as the course ID, and must contain only letters, numbers, "
+"hyphens, and underscores, and may have at most 40 characters."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:36
 msgid "Select course(s) to archive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3731
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:44
 msgid "Select course(s) to hide or unhide."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:7
 msgid "Select import file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:14
 msgid ""
 "Select one or more sets and one or more users below to assign/unassign each "
 "selected set to/from all selected users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:94
 msgid "Select sets below to assign them to the newly-created users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3666
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:20
+msgid ""
+"Select the course to change its Course ID, Course Title, or Institution.  "
+"Note that changing a course's ID will change the URL of all links to the "
+"course, and could break links from external sites such as an LMS."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:4
 msgid ""
 "Select the course(s) you want to hide (or unhide) and then click \"Hide "
 "Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
@@ -5433,133 +7243,230 @@ msgid ""
 "full URL address for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:488
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:20
+msgid ""
+"Select the course(s) you want to hide (or unhide) and then click \"Hide "
+"Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
+"does no harm (the action is skipped). Likewise unhiding a course that is "
+"already visible does no harm (the action is skipped). Hidden courses are "
+"still active but are not listed in the list of WeBWorK courses on the "
+"opening page. To access the course, an instructor or student must know the "
+"full URL address for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:93
+msgid "Select the display mode used to render the problems on this page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:11
 msgid ""
 "Select the homework sets for which to generate hardcopy versions. You may "
 "also select multiple users from the users list. You will receive hardcopy "
 "for each (set, user) pair."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:238
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:30
+msgid ""
+"Select the sets you want scored, choose the name of the export file you want"
+" to use (by default: %1), and then click the \"Score Selected Set(s) and "
+"save to\" button."
+msgstr ""
+
+#. ('<code>ful.csv</code>','<code>scr.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:49
+msgid ""
+"Select this if you want to save the scores for each set in a separate file "
+"in addition to saving all scores to a cumulative file. After clicking the "
+"\"Score Selected Set(s) and save to\" button, you will get a pair of links "
+"for each selected set. The file that ends with %1 contains the number of "
+"correct and incorrect tries about each individual problem for each student. "
+"The file that ends with %2 is a summary of each problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:19
 msgid ""
 "Select user(s) and/or set(s) below and click the action button of your "
 "choice."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2885
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:85
+msgid ""
+"Select which assignment types (homework, tests, just-in-time) the "
+"achievement is evaluated."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:20
+msgid ""
+"Select which courses to upgrade from a previous version of WeBWorK.  The "
+"upgrade process can add missing database columns, delete unused database "
+"columns, and check the course file structure.  Be sure to read over the "
+"changes before confirming the upgrade.  You may want to create an archive of"
+" the course before upgrading.  Only courses that need upgraded will be "
+"selectable."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:84
+msgid "Select your favorite theme for the large text window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:18
 msgid "Select/unselect all fields missing in schema for deletion."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2873
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:9
 msgid "Select/unselect all tables missing in schema for deletion."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:23
 msgid "Selected sets:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:57
 msgid "Send E-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:839
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:83
 msgid "Send Email"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:702
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:69
+msgid "Send email to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:54
+msgid "Send emails to selected instructors."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:59
 msgid "Send to all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:717
-msgid "Send to the students selected below"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:64
+msgid "Send to selected students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:402
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:7
 msgid "Set"
 msgstr "Feladatsor/Beállítás"
 
 #. ($newSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:614
 msgid "Set %1 has been created."
 msgstr ""
 
-#. ($newSetName,$userName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1944
+#. ($newSetName, $userName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:616
 msgid "Set %1 was assigned to %2"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1239
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:567
 msgid "Set %1 was assigned to %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:415
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:354
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:42
 msgid "Set Assigner"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:420
-msgid "Set Definition Filename"
-msgstr "A fájlnév definíciójának beállítása"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:17
+msgid "Set Assigner Help"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:45
 msgid "Set Definition Files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2318
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2329
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:218
 msgid "Set Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:17
+msgid "Set Detail Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:333
 msgid "Set Detail for set %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:93
 msgid "Set Header"
 msgstr "A feladatsor fejléce"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:323
+msgid "Set Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:218
 msgid "Set ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:267
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:114
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:3
 msgid "Set Info"
 msgstr "Feladatsor infó"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2744
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:19
 msgid "Set List"
 msgstr "Feladatsor lista"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1111
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1209
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1320
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:164
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:262
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:353
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:448
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:546
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:659
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:776
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:895
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:995
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:762
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:809
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:7
 msgid "Set Name"
 msgstr "A feladatsor neve"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:186
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:18
+msgid "Set closes on %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:45
+msgid "Set definition (\".def\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:20
+msgid "Set is closed."
+msgstr ""
+
+#. ($c->formatDateTime($set->reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:16
+msgid "Set is due on %1."
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:14
+msgid "Set opens on %1."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:188
 msgid "Set random seed to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2029
+#: /opt/webwork/webwork2/conf/defaults.config:1930
 msgid ""
 "Set to true for log to mean base 10 log and false for log to mean natural "
 "logarithm."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2049
+#: /opt/webwork/webwork2/conf/defaults.config:1950
 msgid ""
 "Set to true to allow students to enter Unicode versions of some characters "
 "(like U+2212 for the minus sign) in their answers.  One reason to allow this"
@@ -5568,7 +7475,7 @@ msgid ""
 "directory from the keyboard."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2019
+#: /opt/webwork/webwork2/conf/defaults.config:1920
 msgid ""
 "Set to true to display the \"Entered\" column which automatically shows the "
 "evaluated student answer, e.g., 1 if student input is sin(pi/2). If this is "
@@ -5577,7 +7484,7 @@ msgid ""
 " answer."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2060
+#: /opt/webwork/webwork2/conf/defaults.config:1961
 msgid ""
 "Set to true to have Full Width Unicode character (U+FF01 to U+FF5E) "
 "converted to their ASCII equivalents (U+0021 to U+007E) automatically in "
@@ -5585,20 +7492,30 @@ msgid ""
 "automatically use Full Width characters for parentheses and commas."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:521
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:164
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:16
+msgid "Set values"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/siblings.html.ep:4
 msgid "Sets"
 msgstr "Feladatsorok"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:352
-msgid "Sets Assigned to User"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:322
+msgid "Sets assigned to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:343
-msgid "Sets assigned to %1"
+#. ($userName, $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:90
+msgid "Sets assigned to %1 (%2)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:17
+msgid "Sets assigned to student Help"
 msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:57
@@ -5612,189 +7529,241 @@ msgid ""
 "links from the LMS must be problem set specific. For example, "
 "<code>webwork.myschool.edu/webwork2/course-name/problem_set_name</code>. If "
 "the problem set name has space characters, they should be underscores in "
-"these addresses. If the problem set is a quiz, it must have this format: "
-"<code>webwork.myschool.edu/webwork2/course-"
-"name/quiz_mode/problem_set_name</code>. Also, to initialize the "
-"communication between WeBWorK and the LMS, the user must follow each of "
-"these external learning tools at least one time. Since there must be a "
-"separate external tool link for each problem set, this option requires more "
-"maintenance of the LMS course.</dd></dl>"
+"these addresses. Also, to initialize the communication between WeBWorK and "
+"the LMS, the user must follow each of these external learning tools at least"
+" one time. Since there must be a separate external tool link for each "
+"problem set, this option requires more maintenance of the LMS "
+"course.</dd></dl>"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:55
+msgid "Sets the order in which achievements are listed and evaluated."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1458
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:625
 msgid "Sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:726
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:36
 msgid "Setting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1332
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:39
 msgid "Shift dates so that the earliest is"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:32
+msgid "Show"
+msgstr ""
+
 #. ($numchild)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1301
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:32
 msgid "Show %1 more like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:326
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:107
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:39
 msgid "Show Correct Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:22
 msgid "Show Date & Size"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:86
 msgid "Show LTI parameters (for debugging)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:620
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:34
 msgid "Show Me Another"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2518
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2412
+#. ($exhausted)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:69
+msgid "Show Me Another %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1642
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:711
 msgid "Show Past Answers"
 msgstr "Az utolsó válasz megjelenítése"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:703
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:41
+msgid "Show Problem Source File"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:132
 msgid "Show Problem Source File:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
 msgid "Show Problems on Finished Tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
-msgid "Show Scores on Finished Assignments?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+msgid "Show Scores on Finished Tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2416
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:630
 msgid "Show Solutions"
 msgstr "A megoldás megjelenítése"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/conf/defaults.config:1538
 msgid "Show Total Homework Grade on Grades Page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1266
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:77
 msgid "Show all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1380
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:91
 msgid "Show all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2404
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:621
 msgid "Show correct answers"
 msgstr "A helyes válasz megjelenítése"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1299
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+msgid "Show hints after"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:30
 msgid "Show less like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:337
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:387
 msgid "Show me another"
 msgstr ""
 
-#. ($exhausted)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1926
-msgid "Show me another %1"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:20
+msgid ""
+"Show past answers.  Students can only see their past answers, and they will "
+"not be able to see which parts are correct.  Instructors can use the form to"
+" select any combination of users, sets, and problems to view.  The table "
+"below will list the past answers colored according to correctness (green is "
+"correct).  Use control + click to select multiple users, sets, or problems."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2428
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:639
 msgid "Show problem graders"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:105
 msgid "Show saved answers?"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1860
+#: /opt/webwork/webwork2/conf/defaults.config:1762
 msgid ""
 "Show the correct answer to the current problem before re-randomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1862
+#: /opt/webwork/webwork2/conf/defaults.config:1764
 msgid ""
 "Show the correct answer to the current problem on the last attempt before a "
 "new version is requested."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:3
 msgid "Show which sets?"
 msgstr "Mely feladatsorok megjelenítése"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:690
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:3
 msgid "Show which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:382
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:475
-msgid "Show/Hide Site Description"
-msgstr "Az oldal leírásának megjelnítése/rejtése"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:622
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:11
 msgid "Show:"
 msgstr "Mutasd:"
 
-#. (scalar @{ $self->{visibleSetIDs} },			scalar @{ $self->{allSetIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:594
+#. (scalar @{ $c->{visibleSetIDs} },			scalar @{ $c->{allSetIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:115
 msgid "Showing %1 out of %2 sets."
 msgstr "%2 feladatsorból %1 megjelenítve."
 
-#. (scalar @Users, scalar @{ $self->{allUserIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:610
+#. (scalar(keys %{ $c->{visibleUserIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:80
 msgid "Showing %1 out of %2 users"
 msgstr "%2 felhasználóból %1 megjelenítve"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:70
 msgid "Showing all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1355
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:81
 msgid "Showing all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:61
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:64
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:67
+#. ($c->{merge_file}, $ur->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:5
+msgid "Showing data from merge file %1 for user %2:"
+msgstr ""
+
+#. ($c->{merge_file})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:147
+msgid "Showing data from merge file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:61
+msgid "Showing problem for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:7
+msgid "Showing statistics for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:33
+msgid ""
+"Shows how many instructors and students have been assigned this problem set,"
+" out of the total number in the class. Clicking on this link allows you to "
+"assign the set to users, unassign this set from users, and to individually "
+"edit the assignment for specific users. For changing dates for individual "
+"users there are also shortcuts from the \"Instructor Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:63
 msgid "Site Information"
 msgstr "Oldal-információ"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:88
 msgid "Skip archiving this course"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2080
+#: /opt/webwork/webwork2/conf/defaults.config:1981
 msgid "Skip explanation essay answer fields"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1556
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1557
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:81
+msgid "Snippets of PG code illustrating specific techniques"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1514
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1515
 msgid "Solution:"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1555
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1513
 msgid "Solution: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:432
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:57
 msgid "Solutions"
 msgstr "Megoldások"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1350
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:20
+msgid ""
+"Some OPL problems have been rated for difficulty/educational objective. The "
+"levels are loosely inspired by Bloom's taxonomy. They are assigned numbers "
+"from 1 to 6 as follows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:185
 msgid ""
 "Some WeBWorK problems are programmed using what are called <i>Math "
 "Objects</i>. These problems are preferred by some people because they "
@@ -5802,18 +7771,18 @@ msgid ""
 "particularly for answers which are way off base."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:379
 msgid "Some answers will be graded later."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:60
 msgid ""
 "Some of these files are directories. Only delete directories if you really "
 "know what you are doing. You can seriously damage your course if you delete "
 "the wrong thing."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2082
+#: /opt/webwork/webwork2/conf/defaults.config:1983
 msgid ""
 "Some problems have an explanation essay answer field, typically following a "
 "simpler answer field. For example, find a certain derivative using the "
@@ -5825,7 +7794,7 @@ msgid ""
 "grading."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2186
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:83
 msgid ""
 "Some problems shown above represent multiple similar problems from the "
 "database.  If the (top) information line for a problem has a letter M for "
@@ -5835,326 +7804,422 @@ msgid ""
 "again."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1612
-msgid ""
-"Some servers handle courses taking place in different timezones.  If this "
-"course is not showing the correct timezone, enter the correct value here.  "
-"The format consists of unix times, such as "
-"\"America/New_York\",\"America/Chicago\", \"America/Denver\", "
-"\"America/Phoenix\" or \"America/Los_Angeles\". Complete list: <a "
-"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:529
-msgid ""
-"Something was wrong with your LTI parameters.  If this recurs, please speak "
-"with your instructor"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:50
 msgid "Sort"
 msgstr "rendezés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:751
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:814
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:4
 msgid "Sort by"
 msgstr "E szerint rendezve"
 
 #. ($names{$primary}, $names{$secondary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:817
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:324
 msgid "Sort by %1 and then by %2"
 msgstr "%1 majd %2 szerint rendezve"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:171
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:115
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:3
 msgid "Sort:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:51
+msgid "Sorts the lists displayed by due date, name, etc."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:363
 msgid "Source File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1586
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1612
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1555
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1593
 msgid ""
 "Source file paths cannot include .. or start with /: your source file path "
 "was modified."
 msgstr ""
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:11
 msgid ""
 "Specify an ID, title, and institution for the new course. The course ID may "
 "contain only letters, numbers, hyphens, and underscores, and may have at "
 "most %1 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:661
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:94
+msgid ""
+"Spell check the text of the file that your are editing. Note that there will"
+" be many spelling errors in the code parts of your file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:116
+msgid "Standard Deviation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:162
 msgid "Start"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:609
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:47
+msgid "Start LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:130
 msgid "Start New Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:443
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:94
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:508
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:84
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:54
 msgid "Statistics"
 msgstr "Statisztikák"
 
-#. ($self->{ce}{courseName} =~ s/_/ /gr,                   CGI::span({ dir =>
-#. 'ltr' }, format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:73
-msgid "Statistics for %1 set %2. Closes %3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:17
+msgid "Statistics Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:86
+msgid "Statistics for %1"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:90
+msgid "Statistics for %1 problem %2"
 msgstr ""
 
-#. ($self->{ce}{courseName}, $self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:68
-msgid "Statistics for %1 student %2"
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:84
+msgid "Statistics for student %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2089
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1442
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1524
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2020
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:296
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:659
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:806
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:191
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:192
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:442
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:151
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:160
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:36
 msgid "Status"
 msgstr "Állapot"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:29
 msgid "Stop Acting"
 msgstr "A tevékenység befejezése"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2251
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:85
 msgid "Stop Archiving"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2418
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1153
 msgid "Stop archiving courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:233
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:783
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2011
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:295
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:829
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:887
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:916
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:30
 msgid "Student ID"
 msgstr "Diák ID"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:9
+msgid "Student ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:37
 msgid "Student Name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:570
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:428
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:56
 msgid "Student Progress"
 msgstr "Diákok előmenetele"
 
-#. ($self->{ce}->{courseName},                     CGI::span({ dir => 'ltr' },
-#. format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:81
-msgid "Student Progress for %1 set %2. Closes %3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:17
+msgid "Student Progress Help"
+msgstr ""
+
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:72
+msgid "Student Progress for %1"
 msgstr ""
 
-#. ($self->{ce}->{courseName}, $self->{studentName})
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($c->stash('setID')
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:76
-msgid "Student Progress for %1 student %2"
+msgid "Student Progress for set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:628
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:80
 msgid "Student answers"
 msgstr "Hallgató válaszai"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:766
-msgid "Subject:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:80
+msgid ""
+"Student scores for the sets selected below will be calculated. This and "
+"other scoring operations can also be done using the \"Scoring Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:87
+msgid "Student:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:124
+msgid "Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:653
-msgid "Subject: "
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:50
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:8
+msgid "Subject:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:222
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:30
 msgid "Submission time:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:226
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:41
 msgid "Submit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:26
 msgid "Submit Answers"
 msgstr "A válasz elküldése"
 
 #. ($effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1861
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:23
 msgid "Submit Answers for %1"
 msgstr "%1 válaszainak jóváhagyása"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:502
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:525
 msgid "Submit your answers again to go on to the next part."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:775
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:183
 msgid "Success Index"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:106
+msgid ""
+"Success index is the square of the average score divided by the average "
+"number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:73
+msgid ""
+"Success index is the square of the score divided by the number of attempts."
+msgstr ""
+
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1086
 msgid "Successfully archived the course %1."
 msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:885
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:422
 msgid "Successfully created new achievement %1"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1252
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:581
 msgid "Successfully created new set %1"
 msgstr "Sikeresen létrehozva a(z) %1 új feladatsor"
 
 #. ($add_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:465
 msgid "Successfully created the course %1"
 msgstr ""
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1818
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2401
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1131
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:900
 msgid "Successfully deleted the course %1."
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1529
+#. ($rename_oldCourseID,							$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:772
 msgid "Successfully renamed the course %1 to %2"
 msgstr ""
 
 #. ($unarchive_courseID, $new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2653
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1286
 msgid "Successfully unarchived %1 to the course %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2099
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4280
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:89
+msgid "TA:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2274
 msgid "Table defined in database but missing in schema"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2097
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2269
 msgid "Table defined in schema but missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2265
 msgid "Table is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3200
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3490
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:276
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:576
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:106
 msgid "Take Action!"
 msgstr "Csináld!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Target Set:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:63
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:42
 msgid "TeX Source"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:784
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:258
+msgid "Test %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:54
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:52
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:55
+msgid "Test Name"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:156
 msgid "Test Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:224
 msgid "Test Time Limit (min; 0=Close Date)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2041
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:238
 msgid "Test Time Notification"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:156
 msgid "Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:244
 msgid "Test not yet submitted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:317
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:920
+msgid "Test parameters"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:149
 msgid "Test/quiz with time limit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:79
 msgid "Text"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:842
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:80
+msgid "Text Editor Options"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:55
 msgid "Text chapter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:864
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:66
 msgid "Text section:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:44
 msgid "Textbook:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1403
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:58
 msgid ""
-"The Attempts figure is the global average of the number of attempts (both "
-"correct and incorrect) individuals take on this problem.  A high figure may "
-"represent a difficult problem.  Note that problems with multiple parts may "
-"have higher average attempts since many students  will submit an answer to "
-"each part before continuing and each such  submittal counts as an attempt."
+"The \"Edit Target Set\" button at the top of the page will take you to the "
+"Problem Set Editor which will allow you to edit dates, assign users and "
+"other information about the problem set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1485
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:115
 msgid ""
-"The Attempts figure is the local average of the number of attempts (both "
-"correct and incorrect) individuals at your institution take on this problem."
+"The \"Score\" tab will export achievement data to a CSV file that can be "
+"downloaded.  The export contains the global data including number of "
+"achievement points and current level of each student.  In addition for each "
+"selected achievement, a column for if the achievement was earned (1) or not "
+"earned (0) will be added to the CSV."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:194
+msgid ""
+"The <strong>Assigned sets</strong> column (x/y) indicates that x sets out of"
+" y sets avaiable have been assigned to this student. Click this link to "
+"assign or unassign sets to this student, to adjust due dates, or to adjust "
+"the grades on a homework set for a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:20
+msgid ""
+"The <strong>Set Detail</strong> page can be viewed in one of two distinct "
+"modes:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:189
+msgid ""
+"The <strong>login name</strong> column links allow you to \"act as\" a "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:191
+msgid ""
+"The <strong>pencil</strong> in the login column allows you to edit that "
+"student's data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:64
+msgid ""
+"The Attempts figure is the global average of the number of attempts (both "
+"correct and incorrect) individuals take on this problem.  A high figure may "
+"represent a difficult problem.  Note that problems with multiple parts may "
+"have higher average attempts since many students  will submit an answer to "
+"each part before continuing and each such  submittal counts as an attempt."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:124
+msgid ""
+"The Attempts figure is the local average of the number of attempts (both "
+"correct and incorrect) individuals at your institution take on this problem."
 " A high figure may represent a difficult problem.  Note that problems with "
 "multiple parts may have higher average attempts since many students  will "
 "submit an answer to each part before continuing and each such  submittal "
 "counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1819
+#: /opt/webwork/webwork2/conf/defaults.config:1721
 msgid ""
 "The Maximum number of times Show me Another can be used per problem by a "
 "student. If set to -1 then there is no limit to the number of times that "
 "Show Me Another can be used."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1787
+#: /opt/webwork/webwork2/conf/defaults.config:1689
 msgid ""
 "The Reduced Scoring Period is the default period before the due date during "
 "which all additional work done by the student counts at a reduced rate. When"
@@ -6167,7 +8232,7 @@ msgid ""
 "work done counts 50% of the original.\" will be displayed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:78
 msgid ""
 "The Status figure is the global average of the Status individuals have "
 "earned on this problem. The Status is the percentage correct (from 0% to "
@@ -6176,7 +8241,7 @@ msgid ""
 "a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1506
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:138
 msgid ""
 "The Status figure is the local average of the Status individuals at your "
 "institution have earned on this problem. The Status is the percentage "
@@ -6185,47 +8250,61 @@ msgid ""
 "students will work on a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1262
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:11
 msgid "The WeBWorK Project"
 msgstr "A WeBWorK projekt"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:822
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:25
+msgid ""
+"The WeBWorK administrators need to be added to the course in order for them "
+"to access the course.  Unchecking this option will make it so WeBWorK "
+"administrators cannot directly login to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:129
+msgid ""
+"The achievement evaluator is the perl code that is run after each submit to "
+"determine if an achievement is earned or not.  Click on the \"Edit "
+"Evaluator\" link to edit the evaluator."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:26
 msgid ""
 "The adjusted status of a problem is the larger of the problem's status "
 "andthe weighted average of the status of those problems which count towards "
 "the parent grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1677
+#: /opt/webwork/webwork2/conf/defaults.config:1579
 msgid ""
 "The amount of time (in minutes) after the due date that the Answers are "
 "available to student to view.  You can change this for individual homework, "
 "but WeBWorK will use this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1667
+#: /opt/webwork/webwork2/conf/defaults.config:1569
 msgid ""
 "The amount of time (in minutes) before the due date when the assignment is "
 "opened.  You can change this for individual homework, but WeBWorK will use "
 "this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:386
 msgid "The answer above is NOT correct."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:375
 msgid "The answer above is correct."
 msgstr "A fenti válasz helyes"
 
 #. ($filename, $ce->{mail}{maxAttachmentSize})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:230
 msgid ""
 "The attached file \"%1\" exceeds the allowed attachment size of "
 "%quant(%2,megabyte)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:421
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:496
 msgid ""
 "The child problems for this problem will become visible to the student when "
 "they either have more incorrect attempts than is specified here, or when "
@@ -6234,173 +8313,252 @@ msgid ""
 "attempts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:704
+#. ('href="http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files"
+#. target="Webworkdocs"',
+#. '<code>demoCourse.lst</code>','<code>.csv</code>','<code>.lst</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:59
+msgid ""
+"The classlist files are stored in the templates directory and provide a "
+"convenient way to enter a large number of students into your class. To view "
+"the format for <strong>ClassList files</strong> see the <a %1>ClassList "
+"specification</a> or download the %2 file and use it as a model. ClassList "
+"files can be prepared using a spreadsheet and then saved as %3 (comma "
+"separated values) text files.  However, to access as a classlist file, the "
+"file suffix needs to be changed to %4, which can be done with the \"Rename\""
+" button."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:16
 msgid ""
 "The configuration module did not find the data it needs to function.  Have "
-"your site administrator check that Constants.pm is up to date."
+"your site administrator check that site configuration files are up to date."
 msgstr ""
 
-#. (CGI::b($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:151
+#. ($archive_courseID,					$archive_path)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:80
+msgid ""
+"The course \"%1\" has already been archived at \"%2\". This earlier archive "
+"will be erased.  This cannot be undone."
+msgstr ""
+
+#. (tag('strong', stash('courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:8
 msgid ""
 "The course %1 uses an external authentication system (%2). Please go there "
 "to log in again."
 msgstr ""
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:186
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:17
 msgid ""
 "The course %1 uses an external authentication system (%2). Please return to "
 "that system to access this course."
 msgstr ""
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:191
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:23
 msgid ""
 "The course %1 uses an external authentication system (%2). You've "
 "authenticated through that system, but aren't allowed to log in to this "
 "course."
 msgstr ""
 
-#. ($archive_courseID,						$archive_path)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2243
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:30
+msgid "The course database must be upgraded before archiving this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:30
+msgid "The course database must be upgraded before renaming this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:26
+msgid ""
+"The current mode should be made clear by the information at the top of the "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:46
 msgid ""
-"The course '%1' has already been archived at '%2'. This earlier archive will"
-" be erased.  This cannot be undone."
+"The current value of the achievement counter. Changes to this variable will "
+"be saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1995
+#: /opt/webwork/webwork2/conf/defaults.config:1897
 msgid "The default display mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1855
+#: /opt/webwork/webwork2/conf/defaults.config:1757
 msgid ""
 "The default number of attempts before the problem is re-randomized. ( 0 => "
 "never )"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1854
+#: /opt/webwork/webwork2/conf/defaults.config:1756
 msgid ""
 "The default number of attempts between re-randomization of the problems ( 0 "
 "=> never)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:251
-msgid "The directory you specified doesn't exist"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:73
+msgid ""
+"The description shown to students which states what action is needed to earn"
+" the achievement."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1829
-msgid "The display was already cleared."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:5
+msgid "The directory you specified doesn't exist"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2111
+#: /opt/webwork/webwork2/conf/defaults.config:2032
 msgid ""
 "The e-mail verbosity level controls how much information is automatically "
-"added to feedback e-mails.  Levels are<ol><li value=\"Simple\"> Simple: send"
-" only the feedback comment and context link</li><li value=\"Standard\"> "
-"Standard: as in Simple, plus user, set, problem, and PG data</li><li "
-"value=\"Debug\"> Debug: as in Standard, plus the problem environment "
-"(debugging data)</li></ol>"
+"added to feedback e-mails.  Levels are<ol><li> Simple: send only the "
+"feedback comment and context link</li><li> Standard: as in Simple, plus "
+"user, set, problem, and PG data</li><li> Debug: as in Standard, plus the "
+"problem environment (debugging data)</li></ol>"
 msgstr ""
 
-#. ($achievementName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:625
-msgid "The evaluator for %1 has been renamed to '%2'."
+#. ($achievementName,				$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:293
+msgid "The evaluator for %1 has been renamed to \"%2\"."
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:339
-msgid ""
-"The file %1/%2 already exists and cannot be overwritten. The message was not"
-" saved"
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:246
+msgid "The file \"%1\" cannot be found."
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:190
-msgid "The file %1/%2 cannot be found."
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:526
+msgid "The file \"%1\" cannot be read!"
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:181
-msgid "The file %1/%2 is not readable by the webserver."
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:522
+msgid "The file \"%1\" is a directory!"
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:373
-msgid "The file '%1' cannot be found."
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:259
+msgid "The file \"%1\" is a template. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1004
-msgid "The file '%1' cannot be read!"
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:250
+msgid "The file \"%1\" is protected. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:380
-msgid "The file '%1' is a blank problem!"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:19
+msgid "The file $file does not appear to be a text or image file."
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:998
-msgid "The file '%1' is a directory!"
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:277
+msgid ""
+"The file %1 already exists and cannot be overwritten. The message was not "
+"saved."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:375
-msgid "The file '%1' is protected!"
+#. ("$emailDirectory/$openfilename",				$emailDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:156
+msgid ""
+"The file %1 cannot be found. Check whether it exists and whether the "
+"directory %2 can be read by the webserver. "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:598
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
+msgid ""
+"The file %1 is not contained in the course templates directory and can not "
+"be modified."
+msgstr ""
+
+#. ("$emailDirectory/$openfilename")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:148
+msgid ""
+"The file %1 is not readable by the webserver. Check that it's permissions "
+"are set correctly."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:203
 msgid "The file does not appear to be a text file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:88
 msgid "The file you are trying to download doesn't exist"
 msgstr ""
 
 #. ($filename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:221
 msgid "The filetype of the attached file \"%1\" is not allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3843
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2149
 msgid "The following courses were successfully hidden:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3908
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2218
 msgid "The following courses were successfully unhidden:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4121
-msgid "The following upgrades are available for your WeBWorK system:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:34
+msgid "The following describes how the checkboxes alter the scoring output"
 msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2081
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:66
 msgid ""
 "The following users are NOT assigned to this set and will be ignored: %1"
 msgstr ""
 
-#. (join('.', @{$problemSeqs[$children_counts_indexs[0]]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:288
+msgid "The given file path is not a valid location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:49
+msgid "The goal value of the achievement counter."
+msgstr ""
+
+#. (join('.', @{ $problemSeqs[ $children_counts_indexs[0] ] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1334
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the score of problem %1."
 msgstr ""
 
-#. (join(', ', map({join('.', @{$problemSeqs[$_]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2064
+#. (join(', ', map({ join('.', @{ $problemSeqs[$_] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the weighted average of the problems: %1."
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1954
-msgid "The hardcopy header for set %1 has been renamed to '%2'."
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1078
+msgid "The hardcopy header for set %1 has been renamed to \"%2\"."
+msgstr ""
+
+#. ($showHintsAfter)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:36
+msgid ""
+"The hint shown is an instructor preview and will be shown to students after "
+"%quant(%1,attempt)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:32
+msgid ""
+"The hint shown is an instructor preview and will not be shown to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:22
+msgid ""
+"The information box on the right displays information about the course. This"
+" is useful for leaving course wide messages for students. It contains text "
+"from the file templates/course_info.txt. Instructors can edit this file from"
+" the web (click on the \"Edit\" link)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:111
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:30
 msgid ""
 "The initial value is the answer sub score for the answer that is currently "
 "shown.  If this is modified, it will be used to compute the total problem "
@@ -6408,37 +8566,100 @@ msgid ""
 "shown answer if the page is reloaded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:161
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:97
+msgid ""
+"The initial value is the currently saved score as a point value computed "
+"using the percent score.  This point value is used to compute the percent "
+"score (rounded to a whole percent) that can be saved."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:145
 msgid "The initial value is the currently saved score for this student."
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_oldCourseInstitution,
 #. $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
 msgid ""
 "The institution associated with the course %1 has been changed from %2 to %3"
 msgstr ""
 
-#. ($rename_newCourseID, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1498
+#. ($rename_newCourseID, $optional_arguments{courseInstitution})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:729
 msgid "The institution associated with the course %1 is now %2"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:599
+msgid ""
+"The instructor account with user id %1 does not exist.  Instructor accounts "
+"must be created manually."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:635
 msgid ""
 "The instructor account with user id %1 does not exist.  Please create the "
 "account manually via WeBWorK."
 msgstr ""
 
-#. ($r->param('new_set_name')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1897
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:87
+msgid ""
+"The key maps that are available are \"default\", \"emacs\", \"sublime\", and"
+" \"vim\". The \"default\" key map has the standard behavior of a browser "
+"text area. You can use Ctrl-C to copy, Ctrl-V to paste, Ctrl-F to search, "
+"etc. If you are more comfortable with the \"emacs\", \"sublime\", or \"vim\""
+" text editors then you may choose to use one of those key maps instead."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:75
+msgid "The large text window"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:27
+msgid ""
+"The list of files include regular files, directories (ending in a \"/\") and"
+" links (ending in a \"@\")."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:52
+msgid ""
+"The login name cannot be changed. (It is the primary key for the student's "
+"data.) If you make a mistake in the login name at the beginning of the "
+"course (before any work has been done) then it is best to simply add a new "
+"student with the correct entry and drop the student with the bad login name."
+" (See drop and delete students below.) If the login name must be changed "
+"after a user has started working assignments, then contact your system "
+"administrator, who can use the webwork2 \"bin/change_user_id\" script to "
+"change the user id."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:20
+msgid ""
+"The main page allows access to set and student statistics.  When selecting a"
+" student, their grades page is shown, which lists set totals and per problem"
+" grades for each set assigned to the student.  When selecting a set, various"
+" statistics and histograms are shown for the overall grades of students who "
+"are currently enrolled or auditing the course."
+msgstr ""
+
+#. ('href="http://webwork.maa.org/wiki" target="ww_wiki"',
+#. 'href="http://webwork.maa.org/wiki/Instructors" target="ww_wiki"')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:24
+msgid ""
+"The main page for WeBWorK documentation is the <a %1>webwork wiki</a> while "
+"specific help for instructors setting up a course are in the <a "
+"%2>instructors' section</a>."
+msgstr ""
+
+#. ($c->param('new_set_name')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:569
 msgid ""
 "The name \"%1\" is not a valid set name.  Use only letters, digits, dashes, "
 "underscores, periods, and spaces."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1530
+#: /opt/webwork/webwork2/conf/defaults.config:1432
 msgid ""
 "The name of course information file (located in the templates directory). "
 "Its contents are displayed in the right panel next to the list of homework "
@@ -6455,151 +8676,249 @@ msgid ""
 "go back to the LMS to access something in the WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:63
+msgid "The number of points earned for earning the achievement."
+msgstr ""
+
 #. ($openDate, $dueDate, $answerDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1104
 msgid ""
 "The open date: %1, close date: %2, and answer date: %3 must be defined and "
 "in chronological order."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:702
+#. ($path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:393
+msgid "The original path is not in a valid location. Using failsafe %1"
+msgstr ""
+
+#. ($forcedSourceFile)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:510
+msgid "The original path to the file is %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:262
 msgid "The password and password confirmation for the instructor must match."
 msgstr ""
 
-#. (CGI::b($r->maketext("[_1]'s Current Password", $user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:27
+msgid ""
+"The password can be any combination of letters, numbers and special symbols."
+" Students are encouraged to use all three, and stay away from dictionary "
+"words. The password should not be the same as any password used elsewhere, "
+"such as for an email account. The password will only be present on the page "
+"if the user has permission to change the password."
+msgstr ""
+
+#. ($c->tag(                                               'b',
+#. $c->maketext(                                                   "[_1]'s
+#. Current Password",
+#. $c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:95
 msgid ""
 "The password you entered in the %1 field does not match your current "
 "password. Please retype your current password and try again."
 msgstr ""
 
-#. (CGI::b($r->maketext("[_1]'s New Password",         $e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:105
+#. ($c->tag('b', $c->maketext("[_1]'s New Password",         $e_user_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:82
 msgid ""
 "The passwords you entered in the %1 and %2 fields don't match. Please retype"
 " your new password and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:789
-msgid "The path to the original file should be absolute"
-msgstr "Az állomány eredeti elérési útvonala legyen abszolút"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:374
+msgid "The path can not be the temporary edit directory."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:667
-msgid ""
-"The percentage of active students with correct answers for each problem"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:370
+msgid "The path to the original file should be absolute."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:131
 msgid ""
 "The percentage of students receiving at least these scores. The median score"
 " is in the 50% column."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:458
 msgid "The prerequisite conditions have not been met for set '%1'."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1917
-msgid "The problem set is not yet open"
-msgstr ""
-
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2012
-msgid "The recorded score for this version is  %1/%2."
+#. (q(down menu to change which student's seed and answers are shown.  Use the
+#. "Mark Correct" checkbox to set)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:26
+msgid ""
+"The problem is shown at the top with the seed and answers of the selected "
+"student.  Use the drop "
 msgstr ""
 
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2021
-msgid "The recorded score for this version is %1/%2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:62
+msgid "The problem set is not yet open"
 msgstr ""
 
 #. ($origReducedScoringDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1971
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1121
 msgid ""
 "The reduced credit date %1 in the file probably was generated from the Unix "
 "epoch 0 value and is being treated as if it was Unix epoch 0."
 msgstr ""
 
 #. ($openDate, $dueDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1982
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1135
 msgid ""
 "The reduced credit date should be between the open date %1 and close date %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1220
 msgid ""
 "The reduced scoring date should be between the open date and close date."
 msgstr ""
 
 #. ($tempFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:307
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:298
 msgid "The requested file \"%1\" does not exist on the server."
 msgstr ""
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2085
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1389
 msgid "The score for this problem can count towards score of problem %1."
 msgstr ""
 
-#. ($setName, $effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:306
-msgid "The selected problem set (%1) is not a valid set for %2"
-msgstr "A kiválasztott feladatsor (%1) nem érvényes sor a  %2 -hoz(höz)"
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:69
+msgid ""
+"The scoring files are stored in the scoring directory and are produced using"
+" the \"Scoring Tools\" page or the scoring command in the \"Instructor "
+"Tools\" module. These files can be downloaded, modified in a spreadsheet "
+"(for example, to add midterm scores) and then uploaded again to the scoring "
+"directory to be merged with email messages. (Use a new file name, other than"
+" %1, when uploading to prevent the scoring module from overwriting an "
+"uploaded file.)"
+msgstr ""
 
-#. ($urlpath->arg("setID")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1467
-msgid "The selected problem set (%1) is not a valid set for %2%3:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:52
+msgid ""
+"The second row of the problem collection area is for browsing directories. "
+"The OPL will be there as well as any other directories that you may set up "
+"(for example Contrib). If this is selected, all subdirectories containing "
+"problems will be listed."
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1946
-msgid "The set header for set %1 has been renamed to '%2'."
+#. (stash('setID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet.html.ep:13
+msgid "The selected problem set (%1) is not a valid set for %2."
+msgstr ""
+
+#. ($setID, $effectiveUserID, $c->{invalidVersionCreation} ? " (acted as by
+#. $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:77
+msgid "The selected problem set (%1) is not a valid set for %2: %3"
+msgstr ""
+
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1066
+msgid "The set header for set %1 has been renamed to \"%2\"."
 msgstr ""
 
-#. ($newSetName)
 #. ($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1164
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:491
+msgid ""
+"The set name \"%1\" is already in use. Pick a different name if you would "
+"like to start a new set. No set created."
+msgstr ""
+
+#. ($newSetName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:584
 msgid ""
 "The set name '%1' is already in use.  Pick a different name if you would "
 "like to start a new set."
 msgstr ""
 
-#. ($setID, $editingSetVersion, $editForUser[0])
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2109
-msgid "The set-version (%1, version %2) is not assigned to user %3."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:58
+msgid ""
+"The sets checked below will be visible to students or hidden from students. "
+"Useful for preparing sets ahead of time, but not showing them to students; "
+"or for temporarily hiding a set which has a mistake in it while it is being "
+"fixed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:54
+msgid ""
+"The sets checked below will become available for editing the due dates and "
+"visibility."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:73
+msgid ""
+"The sets checked below will written to set definition files, to be saved for"
+" future use, or to be transferred to another course. The set definition "
+"files can be uploaded/downloaded using the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:551
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:29
+msgid ""
+"The simple configuration file is the name of the configuration file created "
+"when using the \"Course Configuration\" page to configure course options.  "
+"This option sets if this configuration file is copied from the old course or"
+" not and instead use the server defaults."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:521
 msgid "The solution has been removed."
 msgstr ""
 
-#. ($fullSetName, $prettyProblemNumber, $self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1975
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:33
+msgid ""
+"The solution shown is an instructor preview and will only be shown to "
+"students after the due date."
+msgstr ""
+
+#. ($c->{fullSetID},
+#. $c->{prettyProblemNumber},
+#. $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1103
+msgid ""
+"The source file for \"set %1 / problem %2\" has been changed from \"%3\" to "
+"\"%4\"."
+msgstr ""
+
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1209
+msgid ""
+"The temporary file %1 is not contained in the course templates directory and"
+" can not be deleted."
+msgstr ""
+
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:689
 msgid ""
-"The source file for 'set %1 / problem %2 has been changed from '%3' to '%4'"
+"The temporary file %1 is not in the course templates directory and can not "
+"be deleted!"
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2133
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:349
 msgid ""
 "The test (which is version %1) may  no longer be submitted for a grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1927
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1042
 msgid ""
 "The text box now contains the source of the original problem. You can "
 "recover lost edits by using the Back button on your browser."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:214
+#. (			% . 'but the result will not be counted.')
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:23
 msgid ""
 "The time limit on this assignment was exceeded. The assignment may be "
-"checked, but the result will not be counted."
+"checked, "
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1657
+#: /opt/webwork/webwork2/conf/defaults.config:1559
 msgid ""
 "The time of the day that the assignment is due.  This can be changed on an "
 "individual basis, but WeBWorK will use this value for default when a set is "
@@ -6607,24 +8926,39 @@ msgid ""
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1443
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:689
 msgid "The title of the course %1 has been changed from %2 to %3"
 msgstr ""
 
-#. ($rename_newCourseID, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1491
+#. ($rename_newCourseID, $optional_arguments{courseTitle})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:722
 msgid "The title of the course %1 is now %2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:167
+msgid ""
+"The top number is the percent score on the problem.  A period (.) indicates "
+"a problem has not been attempted. The bottom number is the number of "
+"incorrect attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:25
+msgid ""
+"The total grade row at the bottom shows the total score and percent average "
+"over all open assignments.  The total grade row can be shown/hidden under "
+"general course configuration settings."
+msgstr ""
+
 #. ($enableReducedScoring)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1151
 msgid ""
 "The value %1 for enableReducedScoring is not valid; it will be replaced with"
 " 'N'."
 msgstr ""
 
 #. ($timeCap)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2032
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1209
 msgid ""
 "The value %1 for the capTimeLimit option is not valid; it will be replaced "
 "with '0'."
@@ -6632,81 +8966,90 @@ msgstr ""
 
 #. ($hideScore)
 #. ($hideScoreByProblem)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2023
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1178
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1189
 msgid ""
 "The value %1 for the hideScore option is not valid; it will be replaced with"
 " 'N'."
 msgstr ""
 
 #. ($hideWork)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1200
 msgid ""
 "The value %1 for the hideWork option is not valid; it will be replaced with "
 "'N'."
 msgstr ""
 
 #. ($relaxRestrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2045
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1235
 msgid ""
 "The value %1 for the relaxRestrictIP option is not valid; it will be "
 "replaced with 'No'."
 msgstr ""
 
 #. ($restrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2037
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1221
 msgid ""
 "The value %1 for the restrictIP option is not valid; it will be replaced "
 "with 'No'."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:46
+msgid "The visible name/title of the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:36
 msgid ""
 "The webwork server must be able to write to these directories. Please "
 "correct the permssion errors."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1537
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:83
+msgid "Theme"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1439
 msgid "Theme (refresh page after saving changes to reveal new theme.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:109
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:5
 msgid "Theme:"
 msgstr ""
 
 # Context is "Sort by ____ Then by _____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:843
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:872
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:30
 msgid "Then by"
 msgstr "aztán e szerint"
 
-#. ($count_line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:603
+#. ($listingsCount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:52
 msgid "There are %1 matching WeBWorK problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1625
+#: /opt/webwork/webwork2/conf/defaults.config:1527
 msgid ""
 "There are currently two hardcopy themes to choose from: One Column and Two "
 "Columns.  The Two Columns theme is the traditional hardcopy format.  The One"
 " Column theme uses the full page width for each column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2979
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1519
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
 "least one table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1243
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:23
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
-"least one table.  They can only be removed when upgrading the course."
+"least one table.  They can be removed when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1404
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
 "least one table. Check the checkbox by the field to delete it when upgrading"
@@ -6714,63 +9057,48 @@ msgid ""
 "is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1508
 msgid "There are extra database tables which are not defined in the schema."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2833
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1389
 msgid "There are extra database tables which are not defined in the schema. "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:15
 msgid ""
 "There are extra database tables which are not defined in the schema.  These "
 "can be deleted when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:601
-msgid "There are no matching WeBWorK problems"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:976
-msgid "There are no set definition files in this course to look at."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2199
-msgid ""
-"There are tables or fields missing from the database.  The database must be "
-"upgraded before archiving this course."
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:29
+msgid "There are many options available at the bottom:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4108
-msgid "There are upgrades available for the Open Problem Library."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:49
+msgid "There are no completed versions of this test."
 msgstr ""
 
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4072
-msgid ""
-"There are upgrades available for your current branch of PG from branch %1 in"
-" remote %2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:51
+msgid "There are no matching WeBWorK problems"
 msgstr ""
 
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4010
-msgid ""
-"There are upgrades available for your current branch of WeBWorK from branch "
-"%1 in remote %2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:8
+msgid "There are no set definition files in this course to look at."
 msgstr ""
 
 #. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:273
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:87
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
 "their name, you destroy all of the data for achievement %1 for this student."
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:230
+#. (tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:91
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
@@ -6778,37 +9106,29 @@ msgid ""
 "student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:205
-msgid ""
-"There is NO undo for this function.  Do not use it unless you know what you "
-"are doing!  When you unassign sets using this button, or by unchecking their"
-" set names, you destroy all of the data for those sets for this student."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:234
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:68
 msgid "There is NO undo for unassigning a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:174
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:177
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:139
-msgid "There is NO undo for unassigning students."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4069
-msgid "There is a new version of PG available."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:125
+msgid ""
+"There is NO undo for unassigning sets. Do not do so unless you know what you"
+" are doing!  When you unassign sets by unchecking set names and clicking "
+"save, you destroy all of the data for those sets for this student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4007
-msgid "There is a new version of WeBWorK available."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:21
+msgid "There is NO undo for unassigning students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:529
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:490
 msgid "There is a written solution available."
 msgstr ""
 
 #. ($message_file, $merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:50
 msgid ""
 "There is no additional grade information.  A message about additional grades"
 " can go in [TMPL]/email/%1. It is merged with the file [Scoring]/%2. These "
@@ -6817,185 +9137,324 @@ msgid ""
 msgstr ""
 
 #. ($continueTimeLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:486
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:25
 msgid ""
 "There is no time remaining on the currently open test. Click continue below "
 "and then click \"Grade Test\" within %1 seconds to submit the test for a "
 "grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:856
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:65
 msgid "There is no undo for deleting files or directories!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:534
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:495
 msgid ""
 "There is no written solution available for this problem, but you can still "
 "view the correct answers."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:537
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:498
 msgid "There is no written solution available for this problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1539
-msgid ""
-"There is one main theme to choose from: math4. It has two variants, "
-"math4-green and math4-red. The theme specifies a unified look and feel for "
-"the WeBWorK course web pages."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2270
+#: /opt/webwork/webwork2/conf/defaults.config:1441
 msgid ""
-"There may be something wrong with this question. Please inform your "
-"instructor including the warning messages below."
+"There is one main theme to choose from: math4. It has three variants: "
+"math4-green, math4-red, and math4-yellow. The theme specifies a unified look"
+" and feel for the WeBWorK course web pages."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:441
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator if this recurs."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:284
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:307
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:475
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:484
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:511
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:543
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:219
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:354
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:492
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:536
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:575
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:172
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:189
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:212
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:227
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:365
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:447
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1935
+#. ('href="https://webwork.maa.org/wiki/Set_Definition_Files"
+#. target="Webworkdocs"')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:48
+msgid ""
+"These are stored in the templates directory. The format of <strong>Set "
+"Definition files</strong> is described in the <a %1>Set Definition "
+"specification</a>. Set definition files are mainly useful for transferring "
+"set assignments from one course to another and are created when exporting a "
+"problem set from the \"Hmwk Sets Editor\".  Each set defintion file contains"
+" a list of problems used and the dates and times. These definitions can be "
+"imported into the current course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:77
+msgid ""
+"These are the files from which problems are generated and are located in the"
+" templates directory or in subdirectories. They can be edited directly using"
+" the \"Edit\" link on each problem page or from the \"Hmwk Sets Editor\". "
+"The File Manager allows you to upload or download these files. \tDirectories"
+" that start with \"set\" contain pg files and are generated when exporting a"
+" problem set in which there are local versions of a problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:40
+msgid ""
+"These options will only be shown if the user has the permission to change "
+"display settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:44
+msgid ""
+"These problems require some application of algorithms, but do not rise to "
+"the level of a full word problem. For example, \"Identify the local extrema "
+"for f(x) = ...\". One has to apply algorithms and interpret results."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1837
 msgid ""
 "These users and higher get the \"Show Past Answers\" button on the problem "
 "page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:17
 msgid "This action can take a long time if there are many students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:168
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:12
 msgid "This action will not overwrite existing users."
 msgstr ""
 
-#. (CGI::b($r->maketext("Guest Login")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:279
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:20
+msgid ""
+"This allows for the viewing, downloading, uploading and other management of "
+"files in the course.  Select a file or set of files (using CTRL or SHIFT) "
+"and click the desired button on the right.  Many actions can only be done "
+"with a single file (like view). Selecting a directory or set of files and "
+"clicking \"Make Archive\" creates a compressed tar file with the name "
+"COURSE_NAME.tgz"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:34
+msgid ""
+"This browses the Open Problem Library (OPL) in category "
+"(Subject/Chapter/Section) form. Select the desired categories (all three do "
+"not need to be selected) and click \"View Problems\". If the \"Include "
+"Contrib\" box is selected then those problems in the Contrib section of the "
+"OPL that have the categories defined are also included. Contrib problems are"
+" problem that haven't been vetted as thoroughly as OPL problems. If you want"
+" hints or solutions included while browsing select the appropriate box."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:49
+msgid ""
+"This button is also present both at top and the bottom of the page. Discards"
+" all changes, reloading the page by re-reading the database information for "
+"this set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:39
+msgid ""
+"This button is present both at top and the bottom of the page. Any and all "
+"changes made to any part of the set will be saved with one important "
+"exception: When editing the set for one or more students, you can choose to "
+"override the default value (defined for the set in general) by clicking on "
+"the checkbox and providing a value (or possibly leaving blank) and checking "
+"the override checkbox. If you do <strong>NOT</strong> check the checkbox, "
+"the override value will be discarded and the default value for the set will "
+"be used for the users currently being edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:105
+msgid ""
+"This can computed from the answer sub scores above using the weights shown "
+"if they are modified.  Alternatively, enter the point score you want saved "
+"here (the above sub scores will be ignored)."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2005
+msgid ""
+"This configures if the single problem manual grader has inputs to enter "
+"problem scores as a percent, a point value, or both. Note, the problem score"
+" is always saved as a percent, so when using a point value, the problem "
+"score will be rounded to the nearest whole percent."
+msgstr ""
+
+#. (tag('b', maketext('Guest Login')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:72
 msgid ""
 "This course supports guest logins. Click %1 to log into this course as a "
 "guest."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:851
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:58
+msgid ""
+"This determines if MathQuill answer blanks are enable for the user. This "
+"option is only present if MathQuill is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:63
+msgid ""
+"This determines if the MathView equation editor button will be appended to "
+"text answer blanks. his option is only present if MathView is enabled for "
+"the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:52
+msgid ""
+"This determines whether or not saved past answers are automatically filled "
+"in to the problem form when a student returns to a problem after having left"
+" the problem. This option is only visible if the user has the permission to "
+"show old answers."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:85
+msgid ""
+"This directory is accessible from the web. You can use it to store html "
+"documents or image documents that are used by the course. Do not store "
+"private information in this directory or in any subdirectory thereof. These "
+"documents can be linked to from within problems using the htmlLink macro."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:255
+msgid "This file is a template. You may use \"Save As\" to create a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:20
+msgid ""
+"This form can assign, unassign, and edit user data for a single achievement."
+"  You can assign the achievement to all current users or select which users "
+"to assign the achievement to and click Save.  You can unassign the "
+"achievement by unchecking a student's name (note all data will be deleted)."
+"  To unassign the achievement from all users, first select \"Allow "
+"unassign\" and then click the \"Unassign from All Users\" button. You can "
+"also toggle the earned status with the checkbox in the \"Earned\" column and"
+" edit the achievement counter for counting achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:19
+msgid ""
+"This gives the status and dates of the main set. Indvidual students may have"
+" different settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:51
 msgid "This homework set contains no problems."
 msgstr "Ez a feladatgysor nem tartalmaz feladatokat."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1231
 msgid "This homework set is closed."
 msgstr "Ez a feladatsor zárolva van."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1986
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1229
 msgid "This homework set is not yet open."
 msgstr "Ez a feladatsor jelenleg nincs nyitva."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:932
-msgid ""
-"This is a blank problem template file and can not be edited directly. Use "
-"the 'NewVersion' action below to create a local copy of the file and add it "
-"to the current problem set."
-msgstr ""
-
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:423
 msgid "This is a new (re-randomized) version of the problem."
 msgstr ""
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:580
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:109
 msgid ""
 "This is a timed test. You will have %quant(%1,hour) and %quant(%2,minute) to"
 " complete the test."
 msgstr ""
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:592
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:119
 msgid ""
 "This is a timed test. You will have "
 "%quant(%1,hour,hours,)%quant(%2,minute,minutes,) to complete the test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:284
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:81
 msgid ""
-"This is the Achievement Editor.  It is used to edit the achievements "
-"available to students.  Please keep in mind the following facts: Achievments"
-" are displayed, and evaluated, in the order they are listed. The \"secret\" "
-"category creates achievements which are not visible to students until they "
-"are earned.  The \"level\" category is used for the achievements associated "
-"to a users level."
+"This is done by first entering the user as a student and then changing the "
+"permission level of the user. First edit the user by clicking on the pencil "
+"next to their name (or using the technique above for several users), then "
+"change their permssion level -- an entry blank at the far right of the "
+"screen, you may have to scroll to see it. The permission levels are"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:481
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:156
 msgid ""
-"This is the classlist editor page, where you can view and edit the records "
-"of all the students currently enrolled in this course.  The top of the page "
-"contains forms which allow you to filter which students to view, sort your "
-"students in a chosen order, edit student records, give new passwords to "
-"students, import/export student records from/to external files, or "
-"add/delete students.  To use, please select the action you would like to "
-"perform, enter in the relevant information in the fields below, and hit the "
-"\"Take Action!\" button at the bottom of the form.  The bottom of the page "
-"contains a table containing the student usernames and their information. "
-"Clicking on the links in the column headers of the table will sort the table"
-" by the field it corresponds to. The Login Name fields contain checkboxes "
-"for selecting the user.  Clicking the link of the name itself will allow you"
-" to act as the selected user.  There is also an edit link following the name"
-" which will take you to a page where you can edit the selected user's "
-"information.  Clicking the emails will allow you to email the corresponding "
-"user.  Clicking the links in the entries in the assigned sets columns will "
-"take you to a page where you can view and reassign the sets for the selected"
-" user. "
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page if you wish to assign a homework set to all students or a large group "
+"of students (e.g. a section)."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1810
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:161
 msgid ""
-"This is the default number of attempts before show me another becomes "
-"available to students.  It can be set to -1 to disable show me another by "
-"default."
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:171
+msgid ""
+"This is done from the \"Hmwk Sets Editor\" page or the \"Instructor tools\" "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:71
+msgid ""
+"This is most easily done by importing a class list. The class list can be "
+"uploaded from your workstation to the server using the File Manager page. "
+"The class list must be a file ending in .lst and must have a specific <a "
+"href=\"http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files\">format</a>."
+" Once the file has been uploaded to the server the file will appear in the "
+"import action pop-up list (5th action). demoCourse.lst is available for most"
+" courses and adds the \"practice users\" which activate guest logins to the "
+"class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:23
+msgid ""
+"This is the administration course which is used to manage courses on this "
+"server.  Use the \"Admin Menu\" to select the desired action."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1996
+msgid ""
+"This is the default number of attempts a student must make before hints will"
+" be shown to the student. Set this to -1 to hide hints.  Note that this can "
+"be overridden with a per problem setting."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:456
+#: /opt/webwork/webwork2/conf/defaults.config:1712
 msgid ""
-"This is the homework sets editor page where you can view and edit the "
-"homework sets that exist in this course and the problems that they contain. "
-"The top of the page contains forms which allow you to filter which sets to "
-"display in the table, sort the sets in a chosen order, edit homework sets, "
-"publish homework sets, import/export sets from/to an external file, score "
-"sets, or create/delete sets.  To use, please select the action you would "
-"like to perform, enter in the relevant information in the fields below, and "
-"hit the \"Take Action!\" button at the bottom of the form.  The bottom of "
-"the page contains a table displaying the sets and several pieces of relevant"
-" information. The Edit Set Data field in the table contains checkboxes for "
-"selection and a link to the set data editing page.  The cells in the Edit "
-"Problems fields contain links which take you to a page where you can edit "
-"the containing problems, and the cells in the edit assigned users field "
-"contains links which take you to a page where you can edit what students the"
-" set is assigned to."
+"This is the default number of attempts before show me another becomes "
+"available to students.  It can be set to -1 to disable show me another by "
+"default."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1699
+#: /opt/webwork/webwork2/conf/defaults.config:1601
 msgid ""
 "This is the number of achievement points given to each user for completing a"
 " problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:166
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:150
 msgid ""
 "This is the only part of the score that is actually saved. This is computed "
 "from the answer sub scores above using the weights shown if they are "
@@ -7003,142 +9462,314 @@ msgid ""
 " scores will be ignored)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:388
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:19
+msgid "This is the standard entry point for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:92
 msgid ""
-"This is the past answer viewer.  Students can only see their answers, and "
-"they will not be able to see which parts are correct.  Instructors can view "
-"any users answers using the form below and the answers will be colored "
-"according to correctness."
+"This is where email messages and templates are saved. You can upload or "
+"download files in this directory if you wish to save the files for later."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2462
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:77
+msgid ""
+"This is where you edit the text of the problem template. Type Ctrl-Enter "
+"while this window has focus to re-render the problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:669
 msgid ""
 "This is your last submission.  If you say yes, then your answers will be "
 "final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2466
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:673
 msgid ""
 "This is your only submission.  If you say yes, then your answers will be "
 "final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3038
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:42
+msgid ""
+"This link gives details for many macros. It links to documentation embedded "
+"in the macro files themselves."
+msgstr ""
+
+#. ('PGMLLab/PGML-lab.pg')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:63
+msgid ""
+"This links to a WeBWorK \"problem\" which allows you to try out fragments of"
+" PGML code. This link will not be available if the file %1 is not located in"
+" the templates directory of the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:33
+msgid "This links to a list of problem authoring techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:39
+msgid "This links to a page describing Math Object usage."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:72
+msgid "This links to problem authoring information on the WeBWorK wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:46
+msgid ""
+"This may be Mathjax, images, or plainText. Only the options that are enabled"
+" for the course will be available to select. This option is only visible if "
+"there is more than one display mode enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:42
+msgid "This option shows all pg problems in the course directory structure."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:47
+msgid ""
+"This option shows all problems in set definition files that are located in "
+"the course directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:44
+msgid ""
+"This option shows all problems in sets that have been created in the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:20
+msgid ""
+"This page allows one to edit the contents of PG problem files as well as set"
+" headers and other files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:20
+msgid ""
+"This page allows users to change their password, email address, and display "
+"settings used in problems. Note that you can hide this page entirely for "
+"students by setting permission levels to login_proctor or higher for the "
+"permissions to change password, change e-mail address, and change display "
+"settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:20
+msgid ""
+"This page allows you to configure course settings such as permission levels,"
+" display modes allowed, default display mode, email feedback behavior, and "
+"much more."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:20
+msgid ""
+"This page displays a student's current achievement level and progress toward"
+" the next level, and lists the rewards and badges that the student has "
+"earned. If rewards have been earned, then the student may also redeem those "
+"rewards."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:26
+msgid ""
+"This page gives access to information about the student, independent of the "
+"homework sets assigned to them."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:20
+msgid ""
+"This page gives information about mass LTI grade updates, and allows you to "
+"trigger a grade update for all users and all sets, all sets for one user, "
+"all users for one set, or one user for one set.  When a user is selected, "
+"the sets drop down menu is updated to only allow selecting sets assigned the"
+" selected user.  Similarly when a set is selected, the user menu is updated "
+"to only allow selecting valid users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:20
+msgid ""
+"This page is a collection of tools to modify users and sets.  These tools "
+"are short cuts for common actions that allow selecting multiple users or "
+"sets to act on at once.  Because multiple users and sets can be acted on at "
+"the same time, it is often more efficient to use this page when modifying "
+"multiple items.  For example, after selecting several users and a set you "
+"can change the close date for all selected users for that set.  This page "
+"also gives access to \"View/Edit all sets for one user\", which can be used "
+"to access settings for all sets including test versions for that user."
+msgstr ""
+
+#. (q(table to save any changes.  Each student's name links to that student's
+#. problem and opens up the)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:20
+msgid ""
+"This page is for manually grading a problem for all assigned students.  The "
+"table of students shows their last answers, percent score, and feedback "
+"comment.  The \"Save\" button is located below the "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:20
+msgid ""
+"This page is used to browse problems that will be used to fill problem sets."
+" The first step is to choose which set you are working on. If you need to "
+"create a new problem set fill in the blank next to the \"Create a New Set in"
+" This Course\" button and then press the button. Then choose which set you "
+"want to work on in the drop down menu."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:20
+msgid ""
+"This page is useful for monitoring student progress on assignments. Student "
+"progress can either be viewed for a single set or for a single student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:20
+msgid ""
+"This page manages all of the homework sets (including quizzes/tests). The "
+"following allow editing directly of a single problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:20
+msgid ""
+"This page shows the student's current grades for all sets they are assigned "
+"to.  Only visible sets are shown to the student, while invisible set names "
+"are italic when viewed as an instructor.  Students can only see the per "
+"problem grades on open assignments."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3169
 msgid "This problem contains a video which must be viewed online."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:602
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:631
 msgid "This problem has more than one part."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2059
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2293
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1323
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1576
 msgid ""
 "This problem has open subproblems.  You can visit them by using the links to"
 " the left or visiting the set page."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem.html.ep:66
+msgid "This problem is not valid."
+msgstr ""
+
 #. ($prettyID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2619
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:399
 msgid "This problem uses the same source file as number %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:418
 msgid "This problem will not count towards your grade."
 msgstr "Ez a feladatsor nem számít be az értékelésbe."
 
-#. ($EMAIL)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1109
+#. ($ur->email_address)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:1
 msgid "This sample mail would be sent to %1"
 msgstr ""
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2088
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1399
 msgid ""
 "This score for this problem does not count for the score of problem %1 or "
 "for the set."
 msgstr ""
 
-#. ($message_file,		$merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:167
+#. ($message_file,				$merge_file)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:127
 msgid ""
 "This scoring message is generated from [TMPL]/email/%1. It is merged with "
 "the file [Scoring]/%2. These files can be edited using the \"Email\" link "
 "and the \"File Manager\" link in the left margin."
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2215
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:155
 msgid "This set %1 is assigned to %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2932
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:678
 msgid "This set doesn't contain any problems yet."
 msgstr ""
 
-#. ($beginReducedScoringPeriod, $dueDate, $reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:334
+#. ($c->formatDateTime($reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:44
 msgid ""
 "This set had a reduced scoring period that started on %1 and ended on %2.  "
 "During that period all work counted for %3% of its value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:78
 msgid ""
 "This set has a set-level proctor password to authorize logins. Enter the "
 "password below."
 msgstr ""
 
-#. (CGI::span({class=>$visiblityStateClass}, $visiblityStateText)
-# Context is "This set is visible" or "This set is hidden"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:532
-msgid "This set is %1"
-msgstr "Ez a feladatsor %1"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:411
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:59
 msgid "This set is hidden from students."
 msgstr ""
 
 #. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:330
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:40
 msgid ""
 "This set is in its reduced scoring period.  All work counts for %1% of its "
 "value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:65
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:51
+msgid "This set is not assigned to any students."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:57
 msgid "This set is visible to students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:190
-msgid "This set needs to be assigned to you before you can grade it."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:42
+msgid "This set or problem is not valid."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:158
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:164
 msgid ""
 "This set will be unavailable to students until they have earned a certain "
-"score on the sets specified in this field.  The sets should be written as a "
-"comma separated list.  The minimum score required on the sets is specified "
-"in the following field."
+"score on the sets specified in this field. The sets should be written as a "
+"comma separated list. The minimum score required on the sets is specified in"
+" the following field."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:111
+msgid ""
+"This should be done cautiously. Once a student is deleted from a course "
+"their data is lost forever and cannot be recovered. They can be added to the"
+" course as a new student, but all of their homework set assignments and "
+"homework has been permanently deleted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2007
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1962
 msgid "This source file does not exist!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1961
 msgid "This source file is a directory!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1963
 msgid "This source file is not a plain file!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2005
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1960
 msgid "This source file is not readable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:358
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+msgid ""
+"This specifies the number of attempts before hints are shown to students. "
+"The value of -2 uses the default from course configuration. The value of -1 "
+"disables hints. Note that this will only have an effect if the problem has a"
+" hint."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
 msgid ""
 "This specifies the rerandomization period: the number of attempts before a "
 "new version of the problem is generated by changing the Seed value. The "
@@ -7146,134 +9777,175 @@ msgid ""
 "disables rerandomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:651
-msgid ""
-"This table lists the current attempts for this test/quiz, along with its "
-"status, score, start date, and close date. Click on the version link to "
-"access that version. "
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:626
-msgid "This test is closed."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:548
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:81
 msgid "This test requires a proctor password to continue."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:600
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:126
 msgid "This test requires a proctor password to start."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2248
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2323
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:45
+msgid "This will determine if the output is in one or two columns."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:21
 msgid "Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:249
 msgid "Time Interval for New Test Versions (min; 0=infty)"
 msgstr ""
 
-#. ($elapsedTime,$allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:159
+msgid "Time Remaining"
+msgstr ""
+
+#. ($c->{elapsedTime}, sprintf('%.0f', 10 * ($c->{set}->due_date -
+#. $c->{set}->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:336
 msgid "Time taken on test: %1 min (%2 min allowed)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
 msgid "Timestamp"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1610
+#: /opt/webwork/webwork2/conf/defaults.config:1512
 msgid "Timezone for the course"
 msgstr ""
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:512
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:330
 msgid "To access this set you must score at least %1% on set %2."
 msgstr ""
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:514
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:336
 msgid ""
 "To access this set you must score at least %1% on the following sets: %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:53
 msgid ""
 "To add an additional instructor to the new course, specify user information "
 "below. The user ID may contain only numbers, letters, hyphens, periods "
 "(dots), commas,and underscores."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:42
 msgid ""
 "To add the WeBWorK administrators to the new course (as administrators) "
 "check the box below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:239
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:118
+msgid ""
+"To assign one or more sets to an individual student click in the column "
+"\"Assigned Sets\" in the student's row. This will take you to a page where "
+"you can assign and unassign homework sets and change the due dates for "
+"homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:79
 msgid ""
 "To change status (scores or grades) for this student for one set, click on "
 "the individual set link."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:621
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:106
+msgid ""
+"To copy the templates and html folders from an existing course, select the "
+"course below."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:102
 msgid ""
-"To copy problem templates from an existing course, select the course below."
+"To drop a student or students, select them for editing as described above "
+"and then set the pop-up list to enrolled,drop, or audit. Dropped students "
+"cannot log in to the course, are not assigned new homework sets and are not "
+"sent e-mail. They can be re-enrolled simply by changing their status back to"
+" enrolled. No data is lost, any homework sets assigned before they were "
+"dropped are restored unchanged."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2200
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:143
 msgid ""
 "To edit a specific student version of this set, edit (all of) her/his "
 "assigned sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:376
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:29
 msgid ""
-"To edit this text you must first make a copy of this file using the "
-"'NewVersion' action below."
+"To perform an action select the desired action tab and click the submit "
+"button."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:90
+msgid "To this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:381
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:69
 msgid ""
-"To edit this text you must use the 'NewVersion' action below to save it to "
-"another file."
+"To use the Email merge feature, upload a CSV with calculated grades to the "
+"scoring directory using the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1343
-msgid "To this Problem"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:767
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:58
+msgid "Today"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:33
+msgid "Toggle each of the options to include or not include in the output."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:143
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:522
+msgid "Top Score"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:118
+msgid "Top level of author information on the wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:114
+msgid "Total Points"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:18
 msgid "Total Points:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:90
 msgid "Totals"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:290
 msgid "Totals only (not problem scores)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:291
 msgid "Totals only, only after answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:236
 msgid "Transfer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:284
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:22
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:35
 msgid "True"
 msgstr "Igaz"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1279
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:245
 msgid "Try it"
 msgstr "Próbáld ki"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:26
 msgid "Tunic of Extension"
 msgstr ""
 
@@ -7281,209 +9953,340 @@ msgstr ""
 msgid "Two Columns"
 msgstr "Két oszlop"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1470
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:30
 msgid "Type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2325
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:84
+msgid "Type:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:23
 msgid "URI"
 msgstr ""
 
 #. ($achievementName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:297
 msgid "Unable to change the evaluator for set %1. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:819
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1084
+msgid "Unable to change the hardcopy header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1070
+msgid "Unable to change the set header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{fullSetID}, $c->{prettyProblemNumber})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1110
+msgid ""
+"Unable to change the source file path for set %1, problem %2. Unknown error."
+msgstr ""
+
+#. ($c->shortPath($delFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1246
+msgid "Unable to delete backup file \"%1\"."
+msgstr ""
+
+#. ($formatBackupTime)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:571
+msgid "Unable to delete backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:888
+msgid "Unable to make \"%1\" the hardcopy header for %2."
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:860
+msgid "Unable to make \"%1\" the set header for %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:693
 msgid "Unable to obtain error messages from within the PG question."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:384
-msgid "Unable to write to '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:275
+msgid "Unable to open a temporary file at the given location."
+msgstr ""
+
+#. ($c->shortPath($backupFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1233
+msgid "Unable to read backup file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2613
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:636
+msgid "Unable to write to \"%1\": %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:15
 msgid "Unarchive"
 msgstr ""
 
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2596
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:4
 msgid "Unarchive %1 to course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2581
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:40
 msgid "Unarchive Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2675
-msgid "Unarchive Next Course"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:17
+msgid "Unarchive Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:214
-msgid "Unassign All Sets"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:25
+msgid "Unarchive Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:281
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1306
+msgid "Unarchive Next Course"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:97
 msgid "Unassign from All Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:61
 msgid "Unassign selected sets from selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:58
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:57
 msgid ""
-"Unassignments were not done.  You need to both click to \"Allow unassign\" "
-"and click on the Unassign button."
+"Unassignments were not done.  You need to select \"Allow unassign\" and then"
+" click on the Unassign button."
 msgstr ""
 
 #. ($unattempted, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1047
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:44
 msgid "Unattempted: %1/%2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:53
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:37
 msgid "Unclassified Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:242
 msgid "Ungraded"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3723
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3765
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:58
 msgid "Unhide Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1465
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1151
+msgid "Unkown saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:28
 msgid ""
-"Unlock an additional version of a Gateway Test.  If used before the close "
-"date of the Gateway Test this will allow you to generate a new version of "
-"the test."
+"Unlock an additional version of a test.  If used before the close date of "
+"the test this will allow you to generate a new version of the test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:164
-msgid "Unpack"
-msgstr "Kicsomagol"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:47
+msgid "Unpack Archive"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:113
 msgid "Unpack archives automatically"
 msgstr "Az archívumok automatikus kicsomagolása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2709
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:15
 msgid "Unselect all courses"
 msgstr "Az összes kurzus kijelölésének megszüntetése"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:130
-msgid "Update"
-msgstr "Frissítés"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:63
 msgid "Update Display"
 msgstr "A képernyő frissítése"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:930
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:84
+msgid "Update Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:27
+msgid "Update Interval"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:102
 msgid "Update Menus"
 msgstr "A menük frissítése"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:729
-msgid "Update settings and refresh page"
-msgstr "A beállítások majd az oldal frissítése "
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:51
+msgid "Update aborted. Invalid set %1."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2695
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:47
+msgid "Update aborted. Invalid user %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:67
+msgid "Update set:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:8
 msgid "Update the checked directories?"
 msgstr "A bejelölt könyvtárak frissítése"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3544
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:50
+msgid "Update user:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1908
 msgid "Updated location description."
 msgstr "A frissített elhelyezkedés leírása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2739
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2917
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:40
 msgid "Upgrade"
 msgstr "Frissítés"
 
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
 msgid "Upgrade %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1327
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2278
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:97
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:79
 msgid "Upgrade Course Tables"
 msgstr "A kurzustáblák frissítése"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2693
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2761
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:382
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:42
 msgid "Upgrade Courses"
 msgstr "A kurzusok frissítése"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3010
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:17
+msgid "Upgrade Courses Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:43
+msgid "Upgrade courses from a previous version of WeBWorK."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1582
 msgid "Upgrade process completed"
 msgstr "A frissítési folyamat befejezve"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:388
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:65
 msgid "Upload"
 msgstr "Feltöltés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2441
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:72
+msgid ""
+"Upload, download and delete text files, including scoring spread sheets, set"
+" definition files, class list spread sheets, and \"PG\" problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:292
 msgid "Use Default Header File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:325
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:127
 msgid "Use Equation Editor?"
 msgstr "Egyenletszerkesztő használata"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:204
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:20
 msgid "Use Reward"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2720
-msgid "Use System Default"
-msgstr "Rendszerbeállítások használata"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:516
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:27
 msgid "Use browser back button to return from preview mode."
 msgstr ""
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:506
+#. (tag('b', $c->{achievementID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:16
 msgid "Use in achievement %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:526
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:23
 msgid "Use in new achievement:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:149
 msgid "Use live equation rendering?"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2028
+#: /opt/webwork/webwork2/conf/defaults.config:1929
 msgid "Use log base 10 instead of base <i>e</i>"
 msgstr "10-es alapú logaritmust használj <i>e</i> alapú helyett"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2034
+#: /opt/webwork/webwork2/conf/defaults.config:1935
 msgid "Use older answer checkers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:234
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:123
+msgid ""
+"Use the \"Create\" and \"Delete\" actions to create or delete achievements. "
+"Note that deleting an achievement will delete all data associated to the "
+"achievement and cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:35
+msgid ""
+"Use the \"Merge file\" drop down menu to select which merge file to use, or "
+"select \"None\" to not use any merge file.  When a merge file is selected, "
+"the data for active students will be displayed above the \"Email Body\".  "
+"This will show you the structure of the merge file and the column variables "
+"associated with each column.  Data that is longer than 7 characters will be "
+"truncated, and the data can be scrolled up and down to see all rows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:28
+msgid ""
+"Use the \"Users\" and \"Sets\" forms to select which users and sets to act "
+"on.  Multiple items can be selected using ctrl-click or shift-click.  The "
+"action buttons are grouped into three categories.  The first is a set of "
+"actions that act on the selected users, the second is a set of actions that "
+"act on the selected sets, and the third is a set of actions for acting on a "
+"combination of sets and users.  If an invalid number of users or sets are "
+"selected, the action will not be preformed, and an error message will be "
+"placed on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:25
+msgid ""
+"Use the editor to edit the evaluator and the action form at the bottom to "
+"save the evaluator. You can either overwrite the current evaluator file or "
+"save as a new evaluator file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:15
 msgid ""
 "Use the interface below to quickly access commonly-used instructor tools, or"
 " select a tool from the list to the left."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:332
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:26
+msgid ""
+"Use the options in the second box to pick a collection of problems decribed "
+"below. In each case, clicking \"View Problems\" will render a fixed number "
+"of problems (default of 20). After problems are shown, there will be options"
+" to show the next/previous batch of problems, add all problems to the target"
+" set (set at the top of the page) or clear the curent batch of problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:27
 msgid ""
 "Use this form to ask your instructor a question, to report a problem with "
 "the WeBWorK system, or to report an error in a problem you are attempting. "
@@ -7491,73 +10294,103 @@ msgid ""
 "system will be included."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:29
+msgid "Use this page to change your password."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:20
+msgid ""
+"Use this page to send emails to active (enrolled or auditing) students.  "
+"Emails can be sent to all active students or selected students.  Use the "
+"\"Students\" form to sort, filter, or format how the user name is displayed."
+"  Click \"Change Display Settings\" to apply any changes.  Use control-click"
+" or shift-click to select multiple students to email."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:67
+msgid ""
+"Used for \"counting\" achievements, which sets the value a counter must "
+"reach in order to earn the achievement. For example this is used counting "
+"the number of completed problems."
+msgstr ""
+
+#. (param('user')
+#. (param('effectiveUser')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:7
+msgid "User \"%1\" not found."
+msgstr ""
+
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:324
 msgid ""
-"User '%1' will not be copied from admin course as it is the initial "
+"User \"%1\" will not be copied from admin course as it is the initial "
 "instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:557
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:34
+msgid "User %1 not found."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:217
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:64
 msgid "User ID"
 msgstr "Felhasználói azonosító"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:298
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:230
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:28
 msgid "User Settings"
 msgstr "Felhasználói beállíttások"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:490
-msgid "User Value"
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:17
+msgid "User Settings Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:52
-msgid "User has been assigned to all current sets."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:576
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:13
+msgid "User overrides"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:58
-msgid "User has been unassigned from all sets."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:247
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:62
 msgid "User's name is:"
 msgstr "A felhasználó neve ez:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:68
-msgid "User's sets have been reassigned."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:60
 msgid "User's username is:"
 msgstr "A felhasználó felhasználóneve ez:"
 
 #. ($user, $setID, $j)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1077
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
 msgid ""
 "UserProblem missing for user=%1 set=%2 problem=%3. This may indicate "
 "database corruption."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:51
 msgid "Username"
 msgstr "Felhasználónév"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:499
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:126
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:272
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:9
 msgid "Users"
 msgstr "Felhasználók"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:339
 msgid "Users Assigned to Set %2"
 msgstr "A felhasználó ki lett jelölve a %2 feladatsorhoz"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2077
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:17
+msgid "Users Assigned to Set Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:65
 msgid "Users List"
 msgstr "Felhasználói lista"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1925
+#: /opt/webwork/webwork2/conf/defaults.config:1827
 msgid ""
 "Users at this level and higher are allowed to change display settings used "
 "in pg problems.Note that if it is expected that there will be students that "
@@ -7566,31 +10399,31 @@ msgid ""
 "those students may need to disable MathQuill."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1915
+#: /opt/webwork/webwork2/conf/defaults.config:1817
 msgid ""
 "Users at this level and higher are allowed to change their e-mail address. "
 "Normally guest users are not allowed to change the e-mail address since it "
 "does not make sense to send e-mail to anonymous accounts."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1879
+#: /opt/webwork/webwork2/conf/defaults.config:1781
 msgid ""
 "Users at this level and higher are allowed to change their password. "
 "Normally guest users are not allowed to change their password."
 msgstr ""
 
-#. ($names{$primary}, $names{$secondary}, $names{$ternary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:924
+#. ($c->maketext(FIELD_PROPERTIES()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:316
 msgid "Users sorted by %1, then by %2, then by %3"
 msgstr "A felhasználók előbb %1, aztán %2 és végül %3 szerint rendezve"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1906
+#: /opt/webwork/webwork2/conf/defaults.config:1808
 msgid ""
 "Users with at least this permission level get a link in the left panel for "
 "reporting bugs to the bug tracking system at bugs.webwork.maa.org."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2140
+#: /opt/webwork/webwork2/conf/defaults.config:2051
 msgid ""
 "Users with this permssion level or greater will automatically be sent "
 "feedback from students (generated when they use the \"Contact instructor\" "
@@ -7599,157 +10432,225 @@ msgid ""
 "permission level to \"nobody\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1348
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:193
 msgid "Uses Math Objects"
 msgstr ""
 
-#. ($default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:197
-msgid "Using contents of the default message %1 instead."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1239
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:18
 msgid "Using what display mode?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:6
 msgid "Using what seed?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:19
+msgid "Using which hardcopy format?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:49
+msgid "Using which hardcopy theme?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:31
+msgid ""
+"Usually means students must demonstrate understanding of facts. This is more"
+" than regurgitating the fact. We use this category for simple and direct "
+"applications of algorithms the student has studied. There should be no "
+"judgement involved in choosing the method. This would include a simple "
+"application of a rule for differentiation (e.g., can combine rules for sums "
+"and constant multiples with one more advanced rule) or for integrals."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Value"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1747
+#: /opt/webwork/webwork2/conf/defaults.config:1649
 msgid "Value of work done in Reduced Scoring Period"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:687
-msgid "Variable Documentation:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config/config_help.html.ep:20
+msgid "Variable Documentation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:115
+msgid "Version"
 msgstr ""
 
 #. ($ver->{version})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:679
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:173
 msgid "Version %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:159
 msgid "Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:43
 msgid "Versions of a set can only be edited for one user at a time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:128
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2419
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2756
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:528
 msgid "View"
 msgstr "Megjelenítés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1000
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:488
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:523
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:681
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:948
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:6
 msgid "View Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:276
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:57
+msgid "View details of student perofrmance either by individual or by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:86
 msgid "View equations as"
 msgstr "Mutasd az egyenletet mint"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:283
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:18
 msgid "View statistics by set"
 msgstr "Mutasd a statisztikákat feladatsoronként"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:19
 msgid "View statistics by student"
 msgstr "A diák statisztikájának megjelenítése"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:55
+msgid ""
+"View statistics of students' performance on homework either by individual or"
+" by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:14
 msgid "View student progress by set"
 msgstr "A diákok előmenetelének megtekintése feladatsoronként."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:303
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:15
 msgid "View student progress by student"
 msgstr "A diákok előmenetelének megtekintése diákonként"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:65
 msgid "View/Edit"
 msgstr "Mutat/szerkeszt"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:224
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:90
-msgid "Viewing temporary file:"
-msgstr "Átmeneti állomány mutatása:"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:104
+msgid "View/Reload"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:766
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:790
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:31
+msgid "View/access current and archived courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:146
+msgid "Viewing Problems in a New Window"
+msgstr ""
+
+#. ($c->{problem}->source_file)
+#. ($screenSetHeader)
+#. ($course_info_path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:81
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:109
+msgid "Viewing temporary file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:25
 msgid "Visibility"
 msgstr "Láthatóság"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:915
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:7
 msgid "Visible"
 msgstr "Látható"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:622
 msgid "Visible sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
 msgid "Visible to Students"
 msgstr "Látható diákok"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2269
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:844
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2319
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:13
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:117
 msgid "Warning messages"
 msgstr "Figyelmeztető üzenet"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1039
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:259
+msgid "Warning messages:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all set-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1035
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all user-related data and is not undoable!"
 msgstr "Vigyázat: a törléssel minden felhaszálóval kapcsolatos adat visszavonhatatlanul törlődik!"
 
-#. ($problem_desc , CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1397
+#. ($problem_desc,				$c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1194
 msgid "Warnings encountered while processing %1. Error text: %2"
 msgstr ""
 
-#. ($copyright_years, $theme, $ww_version, $pg_version)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1261
-msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4 |"
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:39
+msgid ""
+"We use this for carrying out more complicated algorithms, such as "
+"derivatives using both the product and chain rule or integrals which involve"
+" say both a substitution and parts."
+msgstr ""
+
+#. ($ce->{WW_COPYRIGHT_YEARS} || '1996-2023',              $ce->{defaultTheme}
+#. || 'unknown -- set defaultTheme in localOverides.conf',
+#. $ce->{WW_VERSION}         || 'unknown -- set WW_VERSION in VERSION',
+#. $ce->{PG_VERSION}         || 'unknown -- set PG_VERSION in ../pg/VERSION')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:9
+msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2227
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:3
 msgid "WeBWorK Error"
 msgstr "WeBWorK hiba"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:3
 msgid "WeBWorK Warnings"
 msgstr "WeBWorK figyelmeztetés"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1549
+#: /opt/webwork/webwork2/conf/defaults.config:1451
 msgid ""
 "WeBWorK currently has translations for the languages listed in the course "
 "configuration."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:20
+msgid ""
+"WeBWorK does not have a full featured scoring ability. We leave that to your"
+" favorite spreadsheet application."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:38
+msgid ""
+"WeBWorK expects many files to be in certain locations.  The following "
+"describe this. Note that by default the File Manager shows the \"templates\""
+" directory.  Other directories mentioned below are at the same level and "
+"need to be accessed by going up a directory by clicking the \"^\" button "
+"above the file list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:6
 msgid ""
 "WeBWorK has encountered a software error while attempting to process this "
 "problem. It is likely that there is an error in the problem itself. If you "
@@ -7758,7 +10659,7 @@ msgid ""
 " more information."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:6
 msgid ""
 "WeBWorK has encountered warnings while processing your request. If this "
 "occured when viewing a problem, it was likely caused by an error or "
@@ -7768,19 +10669,19 @@ msgid ""
 " warning output below for more information."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:577
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:558
 msgid ""
 "WeBWorK was unable to generate a different version of this problem.  Close "
 "this tab, and return to the original problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:367
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:29
 msgid ""
 "WeBWorK was unable to generate a paper copy of this homework set.  Please "
 "inform your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:78
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
 msgid ""
 "WeBWorK will automatically create users when logging in via the LMS for the "
 "first time. If this flag is enabled then it will also keep the user account "
@@ -7790,36 +10691,44 @@ msgid ""
 "next time the user logs in."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:370
 msgid "Weight"
 msgstr "Súly"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:6
 msgid "Welcome to WeBWorK!"
 msgstr "Üdvözöl a WeBWork!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:24
+msgid ""
+"What WeBWorK does have is good support for summarizing the scores on WeBWorK"
+" homework sets and tests and exporting them in a form (.csv) which any "
+"spreadsheet can use. WeBWorK reports all of the homework grades with options"
+" shown below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:27
 msgid "What could be inside?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:715
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:17
 msgid "What field should filtered users match on?"
 msgstr "A felhasználók mely mezőjére kíván szűrési feltételt megadni? "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
 msgid ""
 "When a student has more attempts than is specified here they will be able to"
 " view another version of this problem.  If set to -1 the feature is disabled"
 " and if set to -2 the course default is used."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1899
+#: /opt/webwork/webwork2/conf/defaults.config:1801
 msgid ""
 "When acting as a student, this permission level and higher can submit "
 "answers for that student."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2071
+#: /opt/webwork/webwork2/conf/defaults.config:1972
 msgid ""
 "When numerical answers are checked, most test if the student's answer is "
 "close enough to the programmed answer be computing the error as a percentage"
@@ -7828,7 +10737,7 @@ msgid ""
 "0.1 means 0.1 percent error is allowed.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2098
+#: /opt/webwork/webwork2/conf/defaults.config:2019
 msgid ""
 "When students click the <em>Email Instructor</em> button to send feedback, "
 "WeBWorK fills in the subject line.  Here you can set the subject line.  In "
@@ -7838,14 +10747,32 @@ msgid ""
 "recitation</li><li>%% = literal percent sign</li></ul>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1638
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:35
+msgid ""
+"When the class is very large not all students will be displayed. Using the "
+"first action on this page you can show only the students from a given "
+"recitation or from a given section, or only students whose login or last "
+"name fits a pattern match. The second action will sort the students "
+"currently being displayed. You can also sort the displayed students by "
+"clicking on the active links at the top of each column."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:56
+msgid ""
+"When the message is ready to send, click \"Send Email\". This will queue the"
+" email to be sent, which can take several minutes depending on the number of"
+" students selected.  You will be notified by email once all the emails have "
+"been sent."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1540
 msgid ""
 "When this is on students will see a line on the Grades page which has their "
 "total cumulative homework score.  This score includes all sets assigned to "
 "the student."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:90
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
 msgid ""
 "When this is true, then when a user enters WeBWorK from an external tool "
 "link in the LMS, the bottom of the screen will display the data that the LMS"
@@ -7853,23 +10780,56 @@ msgid ""
 "different LMS systems have different parameters."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1957
+#: /opt/webwork/webwork2/conf/defaults.config:1859
 msgid ""
 "When viewing a problem, WeBWorK usually puts the previously submitted answer"
 " in the answer blank.  Below this level, old answers are never shown.  "
 "Typically, that is the desired behaviour for guest accounts."
 msgstr ""
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:30
+msgid ""
+"When viewing progress for a single student, their grades page is shown which"
+" lists set totals and per problem grades for each set assigned to the "
+"student.  This shows the same information as the statistics page for the "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:26
+msgid ""
+"When viewing set statistics, the drop down menus can be used to show stats "
+"for individual sections, recitations, or problems.  The overall results "
+"include all students who are assigned to the set, while the individual "
+"problem results only include active (have attempted the problem) students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:24
+msgid ""
+"When viewing student progress for a set, the score for the set and the "
+"status for problems in the set are listed for all students.  The table can "
+"be sorted by clicking the links in the table header.  Click the student's "
+"name to access the student's set.  When viewing progress for a test, "
+"additional columns can be shown/hidden by updating the display at the top"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:74
+msgid ""
+"When you unassign a set from students, you destroy all of the data for the "
+"set for those students. If the set is re-assigned to these students, then "
+"they will receive new versions of problems in the set.  Make sure this is "
+"what you want to do before unassigning sets from students."
+msgstr ""
+
+#. (tag('b', $achievementID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:21
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for achievement %1 for this student. Make sure this is what you want to"
 " do."
 msgstr ""
 
-#. (CGI::b({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:146
+#. (tag('b', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:26
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for homework set %1 for this student. You will then need to reassign "
@@ -7877,7 +10837,7 @@ msgid ""
 "problems. Make sure this is what you want to do before unchecking students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:72
 msgid ""
 "When you uncheck a homework set (and save the changes), you destroy all of "
 "the data for that set for this student.   If you reassign the set, the "
@@ -7885,243 +10845,461 @@ msgid ""
 "you want to do before unchecking sets."
 msgstr ""
 
-#. ($self->formatDateTime($set->open_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:343
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:87
+msgid "Wiki summary page for MathObjects"
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:444
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:167
 msgid "Will open on %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:49
+msgid "Word problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:15
 msgid "Worth"
 msgstr "Megéri"
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:382
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:51
+msgid "Write a new PG problem file or edit an existing one."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:188
+msgid ""
+"Write permissions have not been enabled for \"%1\".  Changes must be saved "
+"to another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:630
+msgid ""
+"Write permissions have not been enabled for \"%1\". Changes must be saved to"
+" another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:182
 msgid ""
-"Write permissions have not been enabled for '%1'.  Changes must be saved to "
-"another file for viewing."
+"Write permissions have not been enabled in \"%1\".  Changes must be saved to"
+" a different directory for viewing."
 msgstr ""
 
-#. ($self->shortPath($currentDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:380
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:624
 msgid ""
-"Write permissions have not been enabled in '%1'.  Changes must be saved to a"
+"Write permissions have not been enabled in \"%1\".Changes must be saved to a"
 " different directory for viewing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:178
 msgid ""
 "Write permissions have not been enabled in the templates directory.  No "
 "changes can be made."
 msgstr "Az átmeneti könyvtárnak nincsenek engedényezve az írási jogosultságok. Nem történik változás."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:380
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:620
+msgid ""
+"Write permissions have not been enabled in the templates directory. No "
+"changes can be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:287
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:330
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:509
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:82
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:657
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:67
 msgid "Yes"
 msgstr "Igen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:500
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:454
 msgid ""
 "You are currently checking answers to a different version of your problem - "
 "these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:511
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:470
 msgid ""
 "You are currently previewing answers to a different version of your problem "
 "- these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr ""
 
-#. ($userSet->set_id, $r->connection->remote_ip)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:270
+#. ($ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:18
+msgid ""
+"You are in the Reduced Scoring Period.  All work counts for %1% of the "
+"original."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:183
+msgid "You are not allowed to act as a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:188
+msgid "You are not allowed to assign homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:383
+msgid "You are not allowed to delete %1."
+msgstr ""
+
+#. ($userSet->set_id, $c->tx->remote_address)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:261
 msgid ""
 "You are not allowed to generate a hardcopy for %1 from your IP address, %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2049
-msgid "You are not authorized to access the Instructor tools."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:185
+msgid "You are not allowed to modify homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:191
+msgid "You are not allowed to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:4
+msgid "You are not allowed to send e-mail."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:2
+msgid "You are not authorized to access instructor tools"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:4
+msgid "You are not authorized to access instructor tools."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:271
-msgid "You are not authorized to access the instructor tools."
-msgstr "Ön nem jogosult hozzaférni az oktatói eszközökhöz."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:9
+msgid "You are not authorized to assign homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:10
+msgid "You are not authorized to create or delete courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:2
+msgid "You are not authorized to edit achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:28
+msgid "You are not authorized to edit user specific information."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:37
+msgid "You are not authorized to grade homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:8
+msgid "You are not authorized to manage course files"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:392
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:33
 msgid "You are not authorized to modify homework sets."
 msgstr "Ön nem jogosult módosítani a feladatsort."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:35
 msgid "You are not authorized to modify problems."
 msgstr "Önnek nincs jogosultsága módosítani a feladatot."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:396
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:39
 msgid "You are not authorized to modify set definition files."
 msgstr "Ön nem jogosult módosítani a feladatsor definíciós állományait."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:15
 msgid "You are not authorized to modify student data"
 msgstr "Ön nem jogosult módosítani a diák adatait"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:11
+msgid "You are not authorized to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:3
+msgid "You are not authorized to modify the course configuration."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:230
 msgid "You are not authorized to perform this action."
 msgstr "Ön nem jogosult végrehajtani ezt a műveletet."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:260
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:11
+msgid "You are not authorized to score sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:13
+msgid "You are not authorized to send mail to students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:11
+msgid "You are not authorized to update lti scores"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers.html.ep:8
+msgid "You are not authorized to view past answers"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:251
 msgid ""
 "You are not permitted to generate a hardcopy for a set with hidden work."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:236
 msgid "You are not permitted to generate a hardcopy for an unopened set."
 msgstr ""
 
-#. ($showMeAnother{MaxReps},					$solutionShown)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:559
+#. ($showMeAnother{MaxReps},						$solutionShown)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:532
 msgid ""
 "You are only allowed to click on Show Me Another %quant(%1,time,times) per "
 "problem. %2 Close this tab, and return to the original problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2051
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2070
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:265
 msgid "You are out of time!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:374
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:36
 msgid "You can also examine the following temporary files: "
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGanswermacros.pl:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:108
+msgid ""
+"You can assign selected achievements to all users by using the \"Assign\" "
+"action action and selecting which achievements to assign.  You can select "
+"which users to assign/unassign to an achievement by clicking on the link in "
+"the \"Edit Users\" column."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1039
+msgid ""
+"You can change the file path for this problem manually from the \"Hmwk Sets "
+"Editor\" page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:27
+msgid ""
+"You can check the boxes to the right of the sets and click \"Generate "
+"Hardcopy for Selected Sets\" to generate a PDF hardcopy of the selected "
+"sets. You can generate hardcopies for multiple users including their answers"
+" as well. Note that students will only be able to generate hardcopies of a "
+"single set at a time. Students will only be able to include answers in the "
+"hardcopy after the answer date."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:127
+msgid ""
+"You can delete problems by clicking the \"Delete it?\" check box and saving."
+" If the set is already active it is recommended that you instead use the "
+"\"Mark Correct?\" problem to mark a particular problem correct for all "
+"students."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGanswermacros.pl:1616
 msgid "You can earn partial credit on this problem."
 msgstr "Ezért a feladatért részpontokat kaphat. "
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:382
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:142
+msgid ""
+"You can edit a problem by clicking the \"Edit Problem\" icon to the right of"
+" the problem number. This will open the problem in the PG problem editor in "
+"a new tab or window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:92
+msgid ""
+"You can edit a single achievement by clicking on the pencil icon next to the"
+" achievement ID.  You can edit multiple achievements by selecting which "
+"achievements to edit, then click the \"Edit\" button. You can edit all of "
+"the achievements by changing which achievements to edit form \"selected "
+"achievements\" to \"all achievements\", or click the checkbox next to the "
+"Achievement ID to select all achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:44
+msgid ""
+"You can edit the class list data for a single student by clicking on the "
+"pencil icon next to their login name. To edit several students at once click"
+" on the \"Select\" checkbox next to their names, click on the radio button "
+"for editing selected users and then click the \"Edit\" button. You can also "
+"edit all visible users (those students currently being displayed) or even "
+"all users in the course although this last option might take a long time to "
+"load for a large class."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:397
 msgid "You can get a new version of this problem after the due date."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1368
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:101
+msgid ""
+"You can import/export from their respective action tab.  Exporting saves "
+"information about the achievement as a .axp file which is a CSV that lists "
+"each achievements information.  You can import .axp files that have been "
+"previously exported."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:769
 msgid "You can not specify an absolute path"
 msgstr ""
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1121
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:549
 msgid "You can only %1 one file at a time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:92
 msgid "You can only download regular files."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:591
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:197
 msgid "You can only edit text files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:908
-msgid "You can only unpack files ending in '.tgz', '.tar' or '.tar.gz'"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:374
+msgid "You can only unpack files ending in \".tgz\", \".tar\" or \".tar.gz\""
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:134
+msgid ""
+"You can render a problem by clicking the \"Render Problem\" icon to the "
+"right of the problem number. The display mode used to render the problem is "
+"chosen using the drop down menu. You can render all problems using the "
+"\"Render All\" button. \"Hide All\" will hide all rendered problems. It is "
+"also useful to collapse problem details when doing this, as it makes it "
+"easier to drag problems around."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:120
+msgid ""
+"You can reorder problems by clicking on the arrow icon and dragging the "
+"problem. You will see a box showing you where the problem will be placed. "
+"When problems are reordered any holes in the numbering will be filled in."
 msgstr ""
 
 #. ($showMeAnother{MaxReps} >= $showMeAnother{Count}
 #. ? ($showMeAnother{MaxReps} - $showMeAnother{Count})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1895
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:44
 msgid ""
 "You can use this feature %quant(%1,more time,more times,as many times as you"
 " want) on this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:439
 msgid "You can't download directories"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:440
 msgid "You can't download files of that type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:584
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:192
 msgid "You can't edit a directory"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:528
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
 msgid "You can't view files of that type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:985
 msgid "You cannot archive the course you are currently using."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1712
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:850
 msgid "You cannot delete the course you are currently using."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1081
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:378
 msgid "You cannot delete yourself!"
 msgstr "Nem törölheti önmagát!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:579
 msgid "You did not specify a new set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:232
 msgid "You didn't enter any message."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:312
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:303
 msgid "You do not have permission to access the requested file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:159
 msgid "You do not have permission to change the hardcopy theme."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:578
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:186
 msgid "You do not have permission to edit this file."
 msgstr ""
 
 #. ($hardcopy_format)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:151
 msgid "You do not have permission to generate hardcopy in %1 format."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1639
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1161
 msgid "You do not have permission to view the details of this error."
 msgstr "Nincsen engedélye a hiba részleteinek megtekintéséhez."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements.html.ep:13
 msgid "You don't have any Achievement data associated to you!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:237
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:51
 msgid "You don't have any rewards!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2109
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:325
 msgid "You exceeded the allowed time."
 msgstr ""
 
-#. ($numLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2082
+#. ($c->{numAttemptsLeft})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:277
 msgid "You have %1 attempt(s) remaining on this test."
 msgstr ""
 
-#. ($numLeft,						$numLeft - 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2458
+#. ($c->{numAttemptsLeft},								$c->{numAttemptsLeft} - 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:664
 msgid ""
 "You have %1 submissions remaining for this test.  If you say yes, then you "
 "will have %quant(%2,submission) remaining. Once all submissions have been "
@@ -8129,724 +11307,702 @@ msgid ""
 "work this test version."
 msgstr ""
 
-#. ($attemptsLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2012
+#. ($problem->max_attempts - $attempts)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1270
 msgid "You have %negquant(%1,unlimited attempts,attempt,attempts) remaining."
 msgstr "Önnek %negquant(%1,korlátlan próbálkozás,próbálkozás,próbálkozás) maradt."
 
 #. ($attempts_before_rr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1217
 msgid ""
 "You have %quant(%1,attempt,attempts) left before new version will be "
 "requested."
 msgstr ""
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:506
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:44
 msgid ""
 "You have %quant(%1,hour) and %quant(%2,minute) remaining to complete the "
 "currently open test."
 msgstr ""
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:518
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:54
 msgid ""
 "You have %quant(%1,hour,hours,)%quant(%2,minute,minutes,) remaining to "
 "complete the currently open test."
 msgstr ""
 
-#. ($minutes,									$seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:529
+#. ($minutes,							$seconds)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:64
 msgid ""
 "You have %quant(%1,minute) and %quant(%2,second) remaining to complete the "
 "currently open test."
 msgstr ""
 
 #. ($seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:72
 msgid ""
 "You have %quant(%1,second) remaining to complete the currently open test."
 msgstr ""
 
 #. ($attempts)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1243
 msgid "You have attempted this problem %quant(%1,time,times)."
 msgstr "Ön ezt a feladatot %quant(%1,-szor(ször),-szor(ször)) próbálta."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:1
 msgid "You have been logged out of WeBWorK."
 msgstr "Ön kijelentkezett WebWork-ből."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2065
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:260
 msgid "You have less than 1 minute to complete this test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2046
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:241
 msgid "You have less than 45 seconds left!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2043
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:240
 msgid ""
 "You have less than 90 seconds left to complete this assignment. You should "
 "finish it soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1004
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:452
 msgid "You have not chosen a file to upload."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:845
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "You have requested that the following items be deleted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1137
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:565
 msgid "You have specified an illegal file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:766
 msgid "You have specified an illegal path"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:520
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:13
+msgid "You have specified an illegal working directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:481
 msgid ""
 "You may check your answers to this problem without affecting the maximum "
 "number of tries to your original problem."
 msgstr ""
 
-#. ($perm_multiuser ? "to privileged users or" : "")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:613
+#. ($multiuser ? 'to privileged users or' : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:69
 msgid ""
 "You may choose to show any of the following data. Correct answers, hints, "
 "and solutions are only available %1 after the answer date of the homework "
 "set."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:63
+msgid "You may not change this user's password!"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:646
 msgid "You may not change your answers when going on to the next part!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1831
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:58
 msgid "You may not change your own password here!"
 msgstr "Ön nem tudja megváltoztatni itt a jelszavát!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1132
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:560
 msgid "You may not follow symbolic links"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2134
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:350
 msgid "You may still check your answers."
 msgstr ""
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:172
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:143
+msgid ""
+"You may want to create an unattached problem if you are using the current "
+"problem as a model for a new problem. You can add the new file to a homework"
+" set from the Library Browser or via the set detail page of the Hmwk Sets "
+"Editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:165
+msgid ""
+"You might want to do this if you want to give full credit to everyone on a "
+"particular problem that was not worded correctly, or wasn't working "
+"properly. This is done from the \"Hmwk Sets Editor\" page or the "
+"\"Instructor Tools\" page."
+msgstr ""
+
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:8
 msgid "You must access assignments from your Course Management System (%1)."
 msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:67
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before Show Me Another "
-"is available."
+"You must attempt this problem %quant(%1,time) before this feature is "
+"available"
 msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1923
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:545
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before this feature is "
-"available"
+"You must attempt this problem %quant(%1,time,times) before Show Me Another "
+"is available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:699
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:259
 msgid "You must confirm the password for the initial instructor."
 msgstr ""
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:368
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? $c->link_to(                                                  $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:195
 msgid "You must log into this set via your Learning Management System (%1)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:76
-msgid "You must provide a student ID, a set ID, and a problem number."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:979
+msgid "You must select a course to archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:585
 msgid "You must select a course to rename."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:351
 msgid "You must select at least one file for the archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:777
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:312
 msgid "You must select at least one file to delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:115
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:106
 msgid "You must select one or more sets for scoring!"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:749
 msgid "You must specify a %1 name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:682
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:242
 msgid "You must specify a course ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2026
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2561
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2777
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3865
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2086
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:848
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:983
 msgid "You must specify a course name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:775
 msgid "You must specify a file name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:705
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:586
+msgid "You must specify a file name in order to save a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:265
 msgid "You must specify a first name for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:708
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:268
 msgid "You must specify a last name for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1382
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:606
 msgid "You must specify a new institution for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1364
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:588
 msgid "You must specify a new name for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:603
 msgid "You must specify a new title for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:256
 msgid "You must specify a password for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:448
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:440
 msgid "You must specify a user ID."
 msgstr "Meg kell adni egy felhasználói azonosítót (ID)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:711
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:271
 msgid "You must specify an email address for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:331
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:138
 msgid "You must specify an file name in order to save a new file."
 msgstr "Meg kell adnia egy fájlnevet, hogy mentsen egy új fájlt."
 
 #. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:505
 msgid ""
-"You must use your Learning Managment System (%1) to access this set.  Try "
-"logging in to the Learning Managment System and visiting the set from there."
+"You must use your Learning Management System (%1) to access this set.  Try "
+"logging in to the Learning Management System and visiting the set from "
+"there."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1730
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
 msgid "You need to select a \"Target Set\" before you can edit it."
 msgstr ""
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1126
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:554
 msgid "You need to select a file to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1877
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:555
 msgid "You need to select a set definition file to view."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1853
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:537
 msgid "You need to select a set from this course to view."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1837
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:524
 msgid "You need to select a set to view."
 msgstr ""
 
-#. (wwRound(0, $problemResult->{score} * 100)
-#. (wwRound(0, $pg->{result}->{score} * 100)
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2007
+#. (wwRound(0,
+#. compute_reduced_score($ce, $problem, $set, $pg->{result}{score},
+#. $c->submitTime)
+#. (% wwRound(0, $rh_result->{problem_result}{score} * 100)
+#. (wwRound(0, $rh_result->{problem_result}{score} * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1251
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:48
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:29
 msgid "You received a score of %1 for this attempt."
 msgstr "Ön %1 pontot kapott ezért a próbálkozásért."
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2075
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1363
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem and its graded subproblems."
 msgstr ""
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2078
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1375
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem."
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1343
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:740
 msgid "Your %1 name contains illegal characters"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1344
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:743
 msgid "Your %1 name may not begin with a dot"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:746
 msgid "Your %1 name may not contain a path component"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:540
-msgid ""
-"Your LTI OAuth verification failed.  If this recurs, please speak with your "
-"instructor"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:528
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:539
-msgid ""
-"Your authentication failed.  Please return to Oncourse and login again."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:229
-msgid ""
-"Your authentication failed.  Please try again. Please speak with your "
-"instructor if you need help."
-msgstr ""
-
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3033
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3162
 msgid "Your browser does not support the video tag."
 msgstr ""
 
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4078
-msgid "Your current branch of PG is up to date with branch %1 in remote %2."
-msgstr ""
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4016
-msgid ""
-"Your current branch of WeBWorK is up to date with branch %1 in remote %2."
-msgstr ""
-
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4113
-msgid "Your current branch of the Open Problem Library is up to date."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:134
 msgid "Your display options have been saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:195
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
 msgid "Your email address has been changed."
 msgstr "Az Ön e-mail címe megváltozott."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:772
 msgid "Your file name contains illegal characters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:118
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:40
 msgid "Your file name is not valid! "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:16
 msgid "Your message was sent successfully."
 msgstr ""
 
-#. ($lastScore,$notCountedMessage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2010
+#. (wwRound(0, $problem->status * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1261
 msgid "Your overall recorded score is %1.  %2"
 msgstr "Az Ön teljes pontszáma %1. %2"
 
-#. ($versionNumber, wwRound(2,$recordedScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2107
-msgid "Your recorded score on this test (version %1) is %2/%3."
+#. ('<span id="test-recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:179
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:197
+msgid "Your recorded score for this version is %1/%2 (%3%)."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:603
+#. ($setVersionID,                                         '<span id="test-
+#. recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:317
+msgid "Your recorded score on this test (version %1) is %2/%3 (%4%)."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:634
 msgid "Your score for this attempt is for this part only;"
 msgstr ""
 
 #. ($testNounNum)
 # $testNounNum is either "test (#)" or "submission (#)"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1977
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:142
 msgid "Your score on this %1 WAS recorded."
 msgstr ""
 
-#. ($testNoun,$attemptScore,$totPossible)
+#. ($testNoun, $c->{attemptScore}, $c->{totalPossible})
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1982
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:148
 msgid "Your score on this %1 is %2/%3."
 msgstr ""
 
 #. ($testNounNum)
 # $testNounNum is either "test (#)" or "submission (#)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1973
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:138
 msgid "Your score on this %1 was NOT recorded."
 msgstr ""
 
-#. ($attemptScore,$totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2019
+#. ($c->{attemptScore}, $c->{totalPossible})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:192
 msgid "Your score on this (checked, not recorded) submission is %1/%2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1963
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2277
-msgid "Your score on this problem was recorded."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1619
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1027
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:172
 msgid ""
 "Your score was not recorded because there was a failure in storing the "
 "problem record to the database."
 msgstr "Az Ön pontszáma nem lett elmentve, mert a feladat pontszámának adatbázisba írása hibába ütközött."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:272
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:276
 msgid "Your score was not recorded because this homework set is closed."
 msgstr "Pontjai nem lettek elmentve, mivel ez a feladatsor zárva van."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:283
 msgid ""
 "Your score was not recorded because this problem has not been assigned to "
 "you."
 msgstr "Pontjai nem lettek elmentve, mivel ez a feladat nincs hozzárendelve Önhöz."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1643
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1049
 msgid ""
 "Your score was not recorded because this problem set version is not open."
 msgstr ""
 
-#. ($elapsed, $allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1658
+#. ($elapsed,                                              # Assume the
+#. allowed time is an even number of minutes.
+#. ($set->due_date - $set->open_date)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1063
 msgid ""
 "Your score was not recorded because you have exceeded the time limit for "
 "this test. (Time taken: %1 min; allowed: %2 min.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1052
 msgid ""
 "Your score was not recorded because you have no attempts remaining on this "
 "set version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1661
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1067
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:278
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:53
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:31
 msgid "Your score was not recorded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1998
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:163
 msgid "Your score was not successfully sent to the LMS."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:166
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:170
 msgid "Your score was recorded."
 msgstr "Az eredmény el lett mentve"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1997
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:255
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:162
 msgid "Your score was successfully sent to the LMS."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:540
 msgid "Your session has timed out due to inactivity. Please log in again."
 msgstr "A időkorlátja lejárt inaktivitás miatt. Kérjük, jelentkezzen be újra."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4126
-msgid "Your systems are up to date!"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1396
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1403
-msgid "[Edit]"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:824
-msgid "a duplicate of the first selected achievement."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:17
+msgid "a duplicate of the first selected achievement"
 msgstr ""
 
 # Context is "Create set ______ as a duplicate of the first selected set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:17
 msgid "a duplicate of the first selected set"
 msgstr "másolat az első kijelölt feladatsorról"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:823
-msgid "a new empty achievement."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:16
+msgid "a new empty achievement"
 msgstr ""
 
 # Context is "Create set ______ as a new empty set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:16
 msgid "a new empty set"
 msgstr "új, üres feladatsor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1281
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:9
 msgid "a single set"
 msgstr "egyetlen feladatsor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:429
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:130
 msgid "add problems"
 msgstr "feladat hozzáadása"
 
 #. ($setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1751
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
 msgid "addGlobalSet %1 in ProblemSetList:  %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:456
-msgid "added missing permission level for user"
-msgstr ""
-
 # #short for administrator
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "admin"
 msgstr "admin"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1051
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:487
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:604
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:7
 msgid "all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1377
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:66
 msgid "all current users"
 msgstr "az összes jelenlegi felhasználó"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:327
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:70
 msgid "all set dates for one <b>user</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:622
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1434
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:667
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:840
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1995
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:7
 msgid "all sets"
 msgstr "az összes feladatsor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1981
 msgid "all students"
 msgstr "minden diák"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1256
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:701
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:946
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:997
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:6
 msgid "all users"
 msgstr "az összes felhasználó"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:120
 msgid "all users for one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:23
 msgid "alphabetically"
 msgstr "abc-sorrendben"
 
-#. ($count,$numSets)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:626
+#. ($count, $numSets)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1999
 msgid "an impossible number of sets: %1 out of %2"
 msgstr ""
 
-#. ($count,$numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:606
+#. ($count, $numUsers)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1985
 msgid "an impossible number of users: %1 out of %2"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:647
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:658
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:610
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:621
 msgid "answer"
 msgstr "válasz"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:30
 msgid "any users"
 msgstr "bármely felhasználó"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:720
-msgid "avg attempts"
-msgstr ""
-
 # Context is "Append ____ blank problem template(s) to end of homework set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2956
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:689
 msgid "blank problem template(s) to end of homework set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:24
 msgid "by last login date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1552
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:688
 msgid "changes abandoned"
 msgstr "változások elhagyása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1216
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1651
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:633
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:795
 msgid "changes saved"
 msgstr "változások mentve"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:80
 msgid "class list data for selected <b>users</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:31
 msgid "close"
 msgstr "bezár"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:671
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "column"
 msgstr "oszlop"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:259
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:239
 msgid "correct"
 msgstr "helyes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:582
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:239
 msgid "course files"
 msgstr "kurzusállomány"
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:458
 msgid "deleted %1 sets"
 msgstr "törölve %1 feladatsor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:152
 msgid "editing all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:333
 msgid "editing all sets"
 msgstr "az összes feladatsor módosítása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:963
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:328
 msgid "editing all users"
 msgstr "az összes felhasználó módosítása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:860
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:336
 msgid "editing listed sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:154
 msgid "editing selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:339
 msgid "editing selected sets"
 msgstr "a kiválasztott feladatsorok módosítása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:334
 msgid "editing selected users"
 msgstr "a kiválasztott felhasználók módosítása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:331
 msgid "editing visible users"
 msgstr "a látható felhasználók módosítása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:360
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:90
 msgid "email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:87
-msgid "email:"
-msgstr "e-mail:"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:42
 msgid "empty"
 msgstr "üres"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:672
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:10
 msgid "enter matching set IDs below"
 msgstr "adja meg alább a megfelelő feladatsor azonosítóját (ID) "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:220
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:31
 msgid "entry rows."
 msgstr "üres sor"
 
 #. ($restrictLoc, $setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1761
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:904
 msgid "error adding set location %1 for set %2: %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1092
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1487
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:542
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:643
 msgid "export abandoned"
 msgstr "az export elhagyva"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1068
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:527
 msgid "exporting all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1071
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:530
 msgid "exporting selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:359
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:89
 msgid "first name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:747
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:72
 msgid "for"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:149
 msgid "for one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:103
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:94
 msgid "for one <b>user</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1014
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:349
 msgid "giving new passwords to all users"
 msgstr "új jelszót minden felhasználónak "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1020
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:355
 msgid "giving new passwords to selected users"
 msgstr "új jelszót minden kijelölt felhasználónak"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1017
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:352
 msgid "giving new passwords to visible users"
 msgstr "új jelszót minden látható felhasználónak"
 
 #. ($j, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1069
 msgid "global %1 for set %2 not found."
 msgstr ""
 
-#. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1146
-msgid "global set %1 not found."
-msgstr ""
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "grade_proctor"
 msgstr ""
@@ -8855,393 +12011,375 @@ msgstr ""
 msgid "guest"
 msgstr "vendég"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1589
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:949
 msgid "hidden"
 msgstr "rejtve"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "hidden from"
 msgstr "rejtve innen:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "hidden from students"
-msgstr "rejtve a diákoktól"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:217
+msgid "homework"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:83
+msgid "html directory"
+msgstr ""
 
-#. ('j','k','_0')
-#. ('j','k')
+#. ('j', 'k', '_0')
+#. ('j', 'k')
 # doe snot need to be translated
-#: /opt/webwork/pg/lib/Parser/List/Vector.pm:35
-#: /opt/webwork/pg/lib/Value/Vector.pm:278
-#: /opt/webwork/pg/macros/contextLimitedVector.pl:93
+#: /opt/webwork/pg/lib/Parser/List/Vector.pm:39
+#: /opt/webwork/pg/lib/Value/Vector.pm:303
+#: /opt/webwork/pg/macros/contexts/contextLimitedVector.pl:95
 msgid "i"
 msgstr ""
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:773
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:840
 msgid "if"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1626
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:622
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:721
 msgid "illegal character in input: '/'"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:246
 msgid "incorrect"
 msgstr "helytelen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:441
 msgid "index"
 msgstr ""
 
 #. ($restrictLoc, $setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:911
 msgid "input set location %1 already exists for set %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:358
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:551
+msgid "insufficient permission to edit %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:220
+msgid "just-in-time"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:88
 msgid "last name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:841
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:893
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:9
 msgid "listed sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3169
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:87
 msgid "locations selected below"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:665
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:59
 msgid "login"
 msgstr "bejelentkezés"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "login ID"
 msgstr "bejelentkezési azonosító"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:94
 msgid "login name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:86
-msgid "login/studentID:"
-msgstr "bejelentkezési/diák azonosító"
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "login_proctor"
 msgstr ""
 
 # Context is "Set _____ made visibile for _____ users"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "made visible for"
 msgstr "tedd láthatóvá"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:419
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:493
 msgid "max"
 msgstr "max."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1282
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:10
 msgid "multiple sets"
 msgstr "többszörös feladatsor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:489
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:171
 msgid "new set:"
 msgstr "új feladatsor:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:393
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:109
 msgid "new users"
 msgstr "új felhasználók"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:6
 msgid "no achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:740
-msgid "no achievements."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:519
-msgid "no attempt recorded"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:86
 msgid "no location"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:620
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1056
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1993
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:6
 msgid "no sets"
 msgstr "nincs feladatsor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:600
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1979
 msgid "no students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:931
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1190
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:702
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:31
 msgid "no users"
 msgstr "nincs felhasználó"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/permission.pm:26
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "nobody"
 msgstr "senki"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:114
 msgid "nth colum of merge file"
 msgstr "n-edik oszlopa az összevont állománynak"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:225
-msgid "number of students not defined"
-msgstr "a diákok száma nincs definiálva"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:70
 msgid "of"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:128
 msgid "one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:556
-msgid "one <b>set</b> for  <b>users</b>"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:225
+msgid "one <b>set</b> for <b>users</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:540
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:211
 msgid "one <b>user</b> (on one <b>set</b>)"
 msgstr ""
 
 # Context is Assign this set to which users?  "only ____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1378
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:67
 msgid "only"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:17
 msgid "only best scores"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3472
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:357
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:448
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:88
 msgid "or"
 msgstr "vagy"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1141
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:59
 msgid "or Problems from"
 msgstr ""
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:776
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:843
 msgid "otherwise"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:19
 msgid "overwrite"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:664
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:627
 msgid "part"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1383
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:499
 msgid "permissions for %1 not defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "point"
 msgstr "pont"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "points"
 msgstr "pontok"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:509
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:20
 msgid "preserve"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2360
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:576
 msgid "preview answers"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:653
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:616
 msgid "problem"
 msgstr "feladat"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:632
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:41
 msgid "problems"
 msgstr "feladatok"
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:219
+msgid "proctored test"
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "professor"
 msgstr "tanár"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:360
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:451
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:89
 msgid "progress"
 msgstr ""
 
 #. ($line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2212
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1409
 msgid "readSetDef error, can't read the line: ||%1||"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:93
 msgid "recitation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:654
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:53
 msgid "recitation #"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:497
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:549
 msgid "record for visible user %1 not found"
 msgstr ""
 
 #. ($restrictLoc)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1767
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:918
 msgid ""
 "restriction location %1 does not exist.  IP restrictions have been ignored."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:670
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "row"
 msgstr "sor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:91
 msgid "score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:362
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:92
 msgid "section"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:643
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:47
 msgid "section #"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:88
-msgid "section:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:159
 msgid "selected <b>sets</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:524
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:197
 msgid "selected <b>users</b> to selected <b>sets</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:441
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:488
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:605
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:8
 msgid "selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:741
-msgid "selected achievements."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1057
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1436
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:669
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:842
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:894
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:991
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:8
 msgid "selected sets"
 msgstr "kiválasztott feladatsorok"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1053
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:703
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:999
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:8
 msgid "selected users"
 msgstr "kiválasztott felhasználók"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:624
-msgid "set"
-msgstr "feladatsor"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:628
-msgid "sets"
-msgstr "feladatsorok"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:12
 msgid "sets hidden from students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:670
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:11
 msgid "sets visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:716
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:281
 msgid "showing all sets"
 msgstr "mutasd az összes feladatsort"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:763
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:277
 msgid "showing all users"
 msgstr "mutasd az összes felhasználót"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:725
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:290
 msgid "showing matching sets"
 msgstr "a megfelelő feladatsorok mutatása"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:286
 msgid "showing matching users"
 msgstr "mutasd az összes megfelelő felhasználót"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:719
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:284
 msgid "showing no sets"
 msgstr "ne mutasd a feladatsorokat"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:766
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:280
 msgid "showing no users"
 msgstr "ne mutasd a felhasználókat"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:722
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:287
 msgid "showing selected sets"
 msgstr "mutasd a kiválaszott feladatsorokat"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:769
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:283
 msgid "showing selected users"
 msgstr "mutasd a kiválasztott felhasználókat"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:299
 msgid "showing sets that are hidden from students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:732
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:296
 msgid "showing sets that are visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:72
 msgid "shown"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:162
 msgid "still open"
 msgstr ""
 
@@ -9249,16 +12387,16 @@ msgstr ""
 msgid "student"
 msgstr "diák"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
 msgid "submission"
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:133
 msgid "submission (version %1)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
 msgid "summary"
 msgstr ""
 
@@ -9266,135 +12404,130 @@ msgstr ""
 msgid "ta"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:90
+msgid "templates/email directory"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:95
+msgid "templates/macros directory"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
 msgid "test"
 msgstr "teszt"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:23
 msgid "test date"
 msgstr "a teszt dátuma"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:621
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:29
 msgid "test time"
 msgstr "a teszt időpontja "
 
-#. ($forcedSourceFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:987
-msgid "the original path to the file is %1"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:119
 msgid "then delete them"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "time"
-msgstr "idő"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:165
 msgid "time limit exceeded"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "times"
-msgstr "idők"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:35
+msgid "time remaining"
+msgstr ""
 
 # Context is Assign ____ to _____
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:183
 msgid "to"
 msgstr ""
 
 #. ($ce->{institutionName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:399
 msgid "to %1 main web site"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:524
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:381
 msgid "to courses page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:436
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:135
 msgid "to one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:764
-msgid "top score"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:432
 msgid "total"
 msgstr ""
 
 #. ($ce->{webworkDirs}{logs})
 #. ($ce->{webworkDirs}{tmp})
 #. ($ce->{webworkDirs}{DATA})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:47
 msgid "unable to write to directory %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:333
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:49
 msgid "unlimited"
 msgstr "korlátlan"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:14
 msgid "unlimited reusability"
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:609
-msgid "userID: %1 --"
-msgstr "felhasználói azonosító: %1 --"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:652
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:259
 msgid ""
 "username, last name, first name, section, achievement level, achievement "
 "score,"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:704
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:10
 msgid "users who match on selected field"
 msgstr "a kiválasztott mezőknek megfelelő felhasználók"
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
+#. ($set->version_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:295
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:408
+msgid "version %1"
+msgstr ""
+
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:134
 msgid "version (%1)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1591
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1888
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:820
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:951
 msgid "visible"
 msgstr "látható"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "visible to students"
-msgstr "látható a diákoknak"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1257
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:947
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:998
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:7
 msgid "visible users"
 msgstr "látható felhasználók"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:485
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:500
 msgid "when you submit your answers"
 msgstr ""
 
 #. ($dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1532
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:623
 msgid "won't be able to read from file %1/%2: does it exist? is it readable?"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:604
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:638
 msgid "your overall score is for all the parts combined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:231
 msgid "your students"
 msgstr ""
diff --git a/lib/WeBWorK/Localize/ko.po b/lib/WeBWorK/Localize/ko.po
index b70bdad698..cb16fd3bb3 100644
--- a/lib/WeBWorK/Localize/ko.po
+++ b/lib/WeBWorK/Localize/ko.po
@@ -10,256 +10,319 @@ msgstr ""
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: 2013-01-27 17:03+0000\n"
 "Last-Translator: Ji-Young Ham <jiyoungham1@gmail.com>, 2022\n"
-"Language-Team: Korean (http://www.transifex.com/webwork/webwork2/language/ko/)\n"
+"Language-Team: Korean (http://app.transifex.com/webwork/webwork2/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:428
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:449
+#. ($_->{problem}->version_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:69
+msgid " (version %1)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:265
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:284
 msgid " Answers Available."
 msgstr "답안을 볼 수 있습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:735
-msgid "# of active students"
-msgstr "참여한 학생 수"
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1148
+msgid " No changes have been made to set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:130
+msgid "\"Act as\" a student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:31
+msgid "\"Edit Assigned Users\" column"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:24
+msgid "\"Edit Problems\" column"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:187
+msgid "# of Active Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:85
+msgid "# of attempts"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:506
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:333
 msgid "#corr"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:508
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:335
 msgid "#incorr"
 msgstr "#incorr"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2249
-msgid "% Score:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:174
+msgid "% Average with Review"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:685
-msgid "% correct"
-msgstr "% 정답률"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:702
-msgid "% correct with review"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:66
+msgid "% Score with Review"
 msgstr ""
 
-# Percent students
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:762
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:792
-msgid "% students"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:479
+msgid "% Score:"
 msgstr ""
 
 #. ($achievement->{points})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:24
 msgid "%1 Points:"
 msgstr "%1점:"
 
-#. ($lib eq '' ? $r->maketext('Local')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:476
+#. ($lib eq '' ? maketext('Local')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:9
 msgid "%1 Problems:"
 msgstr "%1문제:"
 
-#. ($itemCounts{$item->id()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:189
+#. ($itemCounts->{ $item->id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:12
 msgid "%1 remaining"
 msgstr "%1 남음"
 
-#. ($numAdded, $numSkipped, join(', ', @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1410
+#. ($count)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2001
+msgid "%1 sets"
+msgstr ""
+
+#. ($numAdded,                     $numSkipped,
+#. join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:608
 msgid "%1 sets added, %2 sets skipped. Skipped sets: (%3)"
 msgstr "%1 문제집이 추가되었고 %2 문제집을 건너뜁니다. 건너뛴 문제집: (%3)"
 
-#. ($numExported, $numSkipped, ($numSkipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1526
+#. ($numExported, $numSkipped,                     $numSkipped ? $c->tag('ul',
+#. $c->c(map { $c->tag('li', $_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:673
 msgid "%1 sets exported, %2 sets skipped. Skipped sets: (%3)"
 msgstr "%1 문제집을 내보냈고 %2 문제집을 건너뛰었습니다. 건너뛴 문제집: (%3)"
 
 #. ($count, $numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:608
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
 msgid "%1 students out of %2"
 msgstr "%2중의 %1 학생들"
 
-#. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle,
+#. ($rename_oldCourseID,          $rename_oldCourseTitle,
+#. $rename_newCourseTitle,
 #. $rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:675
 msgid "%1 title and institution changed from %2 to %3 and from %4 to %5"
 msgstr "%1 교과목명 및 기관이 %2에서 %3으로, %4에서 %5로 변경되었습니다."
 
-#. (scalar @userIDsToExport, $dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1338
-msgid "%1 users exported to file %2/%3"
-msgstr "%1사용자를 %2/%3 파일로 내보냈습니다"
+#. (scalar @userIDsToExport, "$dir/$fileName")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:477
+msgid "%1 users exported to file %2"
+msgstr ""
 
-#. ($numReplaced, $numAdded, $numSkipped, join (", ", @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1233
+#. ($numReplaced, $numAdded, $numSkipped, join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:443
 msgid ""
 "%1 users replaced, %2 users added, %3 users skipped. Skipped users: (%4)"
 msgstr "%1 사용자가 교체되었고, %2 사용자가 추가되었으며, %3 사용자가 건너뛰었습니다. 건너뛴 사용자: (%4)"
 
-#. ($levelpercentage)
 #. ($percentage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:135
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:136
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:323
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:324
+#. ($level_percentage)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:12
 msgid "%1% Complete"
 msgstr ""
 
 #. (wwRound(0, $answerScore * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:268
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:248
 msgid "%1% correct"
 msgstr ""
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:207
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:57
 msgid "%1's Current Address"
 msgstr "%1의 현재 주소"
 
-#. ($user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:136
+#. ($c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:26
 msgid "%1's Current Password"
 msgstr "%1의 현재 비밀번호"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:225
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:65
 msgid "%1's New Address"
 msgstr "%1의 새 주소"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:153
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:34
 msgid "%1's New Password"
 msgstr "%1의 새 비밀번호"
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
-msgid "%1's new password cannot be blank."
-msgstr "%1의 새 암호는 비워둘 수 없습니다."
-
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:76
 msgid "%1's password has been changed."
 msgstr "%1님의 비밀번호가 변경되었습니다."
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:56
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1423
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#. ($c->tag('span', dir => 'ltr', $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1069
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:149
 msgid "%1: Problem %2"
 msgstr "%1: 문제 %2"
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:374
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:357
 msgid "%1: Problem %2 Show Me Another"
 msgstr ""
 
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2231
-msgid "%1: The directory for the course not found."
-msgstr "%1: 과정의 디렉터리를 찾을 수 없습니다."
-
-#. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:340
-msgid "%quant(%1,error) occured while generating hardcopy:"
-msgstr "하드카피를 생성하는 동안 %quant(%1,error)가 발생했습니다:"
+#. ($days)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:87
+msgid "%quant(%1,day)"
+msgstr ""
 
 #. ($n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:924
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:389
 msgid "%quant(%1,file) unpacked successfully"
 msgstr "%quant(%1,file)의 압축이 성공적으로 풀렸습니다"
 
+#. ($hours)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:88
+msgid "%quant(%1,hour)"
+msgstr ""
+
+#. ($minutes)
+#. (sprintf('%3.1f', $testTime)
+#. ($timeLeft)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:89
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:150
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:168
+msgid "%quant(%1,minute)"
+msgstr ""
+
 #. ($numBlanks)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:430
 msgid ""
 "%quant(%1,of the questions remains,of the questions remain) unanswered."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:678
+#. ($seconds)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:90
+msgid "%quant(%1,second)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:505
 msgid "%score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2971
+#. ($dcount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:40
+msgid "(%quant(%1,item) total)"
+msgstr ""
+
+#. ($count)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:29
+msgid "(%quant(%1,item))"
+msgstr ""
+
+#. ($problemValue)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1081
+msgid "(%quant(%1,point))"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:697
 msgid "(Any unsaved changes will be lost.)"
 msgstr "(저장하지 않은 변경 사항은 손실됩니다.)"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1278
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1287
-msgid ""
-"(Instructor hint preview: show the student hint after the following number "
-"of attempts:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:102
+msgid "(If an action cannot be executed it will not appear.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2003
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1262
 msgid "(This problem will not count towards your grade.)"
 msgstr "(이 문제는 성적에 들어가지 않습니다.)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2122
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:340
 msgid ""
 "(This test is overtime because it was not submitted in the allowed time.)"
 msgstr ""
 
-#. ($testNoun, $self->formatDateTime($set->answer_date)
+#. ($testNoun, $c->formatDateTime($c->{set}->answer_date)
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1986
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:153
 msgid "(Your score on this %1 is not available until %2.)"
 msgstr "(%1의 점수는 %2 이후에 볼 수 있습니다.)"
 
 #. ($testNoun)
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1988
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:155
 msgid "(Your score on this %1 is not available.)"
 msgstr "(이 %1에 대한 점수는 볼 수 없습니다.)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1257
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1267
 msgid "(correct)"
 msgstr "(정답)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:197
-msgid "(gw/quiz) After version answer date"
-msgstr "(gw/quiz) 버전 답변 날짜 이후"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:263
 msgid "(in target set)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1449
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1269
 msgid "(incorrect)"
 msgstr "(오답)"
 
 #. ($pgScore)
 #. ($recScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1461
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1271
 msgid "(score %1)"
 msgstr ""
 
-#. ($display_sort_method_name{$secondary_sort_method_name})
-#. ($display_sort_method_name{$ternary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:701
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:706
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:207
+msgid "(test) After version answer date"
+msgstr ""
+
+#. ($versionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:164
+msgid "(version %1)"
+msgstr ""
+
+#. ($display_sort_method_name{$secondary_sort_method})
+#. ($display_sort_method_name{$ternary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:103
 msgid ", then by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1297
-msgid ". If this is a class roster, rename it to have extension '.lst'"
-msgstr ". 이것이 수업 명단인 경우 ‘.lst’ 확장자를 갖도록 이름을 바꿉니다."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:702
+msgid ". If this is a class roster, rename it to have extension \".lst\""
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:81
+msgid "0 seconds"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1997
+msgid "1 set"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1983
 msgid "1 student"
 msgstr "학생 한 명"
 
 #. (wwRound(2, $weights[$part] * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:145
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:58
 msgid "<b>Weight:</b> %1%"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1749
+#: /opt/webwork/webwork2/conf/defaults.config:1651
 msgid ""
 "<p>After the Reduced Scoring Date all additional work done by the student "
 "counts at a reduced rate. Here is where you set the reduced rate which must "
@@ -274,7 +337,7 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr "<p>감점일 이후에 학생이 수행한 모든 추가 제출은 감점된 비율로 계산됩니다. 여기에서 백분율이어야 하는 감소된 비율을 설정합니다. 예를 들어, 이 값이 50%이고 학생이 감점 기간 동안 문제를 보는 경우 \"당신은 감점 기간에 있습니다: 완료된 모든 추가 제출은 원점수의 50%로 계산됩니다.\"라는 메시지가 표시됩니다.</p><p> 이 기능을 사용하려면 문제집 에디터를 사용하여 설정된 데이터를 편집하여 개별 과제에 대해 감소 채점(Reduced Scoring)을 활성화하고 감소 채점 날짜(Reduced Scoring Date)를 설정해야 합니다.</p><p>이것은 avg_problem_grader(기본 채점자) 및 std_problem_grader(전부 또는 무채점자). 적절하게 작성된 경우 사용자 정의 채점자와 함께 작동합니다.</p> "
 
-#: /opt/webwork/webwork2/conf/defaults.config:2036
+#: /opt/webwork/webwork2/conf/defaults.config:1937
 msgid ""
 "<p>During summer 2005, a newer version of the answer checkers was "
 "implemented for answers which are functions and numbers.  The newer checkers"
@@ -286,16 +349,74 @@ msgid ""
 " the old answer checkers will be used by default.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2006
+#: /opt/webwork/webwork2/conf/defaults.config:1908
 msgid ""
 "<p>MathQuill renders students answers in real-time as they type on the "
 "keyboard.</p><p>MathView allows students to choose from a variety of common "
 "math structures (such as fractions and square roots) as they attempt to "
-"input their answers.</p><p>WIRIS provides a separate workspace for students "
-"to construct their response in a WYSIWYG environment.</p>"
+"input their answers.</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1459
+msgid ""
+"<p>Mode in which the LANG and DIR settings for a single problem are "
+"determined.</p><p>The system will set the LANGuage attribute to either a "
+"value determined from the problem, a course-wide default, or the system "
+"default, depending on the mode selected. The tag will only be added to the "
+"DIV enclosing the problem if it is different than the value which should be "
+"set in the main HTML tag set for the entire course based on the course "
+"language.</p><p>There are two options for the DIRection attribute: \"ltr\" "
+"for left-to-write scripts, and \"rtl\" for right-to-left scripts like Arabic"
+" and Hebrew.</p><p>The DIRection attribute is needed to trigger proper "
+"display of the question text when the problem text-direction is different "
+"than that used by the current language of the course. For example, English "
+"problems from the library browser would display improperly in RTL mode for a"
+" Hebrew course, unless the problen Direction is set to LTR.</p><p>The "
+"feature to set a problem language and direction was only added in 2018 to "
+"the PG language, so most problems will not declare their language, and the "
+"system needs to fall back to determining the language and direction in a "
+"different manner. The OPL itself is all English, so the system wide fallback"
+" is to en-US in LTR mode.</p><p>Since the defaults fall back to the LTR "
+"direction, most sites should be fine with the \"auto::\" mode, but may want "
+"to select the one which matches their course language. The mode "
+"\"force::ltr\" would also be an option for a course which runs into trouble "
+"with the \"auto\" modes.</p><p>Modes:</p><ul><li>\"none\" prevents any "
+"additional LANG and/or DIR tag being added. The browser will use the main "
+"setting which was applied to the entire HTML page. This is likely to cause "
+"trouble when a problem of the other direction is "
+"displayed.</li><li>\"auto::\" allows the system to make the settings based "
+"on the language and direction reported by the problem (a new feature, so not"
+" set in almost all existing problems) and falling back to the expected "
+"default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" allows the "
+"system to make the settings based on the language and direction reported by "
+"the problem (a new feature, so not set in almost all existing problems) but "
+"falling back to the language with the given LangCode and the direction Dir "
+"when problem settings are not available from PG.</li><li>\"auto::Dir\" for "
+"problems without PG settings, this will use the default en=english language,"
+" but force the direction to Dir. Problems with PG settings will get those "
+"settings.</li><li>\"auto:LangCode:\" for problems without PG settings, this "
+"will use the default LTR direction, but will set the language to "
+"LangCode.Problems with PG settings will get those "
+"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
+" by the PG code of the problem, and will force the system to set the "
+"language with the given LangCode and the direction to Dir for <b>all</b> "
+"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
+"PG code of the problem, and will force the system to set the direction to "
+"Dir for <b>all</b> problems, but will avoid setting any language attribute "
+"for individual problem.</li></ul>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1736
+#: /opt/webwork/webwork2/conf/defaults.config:1514
+msgid ""
+"<p>Some servers handle courses taking place in different timezones.  If this"
+" course is not showing the correct timezone, enter the correct value here.  "
+"The format consists of unix times, such as \"America/New_York\", "
+"\"America/Chicago\", \"America/Denver\", \"America/Phoenix\" or "
+"\"America/Los_Angeles\".</p>Complete list: <a "
+"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1638
 msgid ""
 "<p>This sets whether the Reduced Scoring system will be enabled.  If enabled"
 " you will need to set the default length of the reduced scoring period and "
@@ -307,22 +428,35 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1979
+#: /opt/webwork/webwork2/conf/defaults.config:1881
 msgid ""
 "<p>When viewing a problem, users may choose different methods of rendering "
 "formulas via an options box in the left panel. Here, you can adjust what "
 "display modes are listed.</p><p>Some display modes require other software to"
 " be installed on the server. Be sure to check that all display modes "
-"selected here work from your server.</p><p>The display modes are "
-"<ul><li>plainText: shows the raw LaTeX strings for formulas.</li><li>images:"
-" produces images using the external programs LaTeX and "
-"dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place "
-"render mathematics.</li></ul></p></p>You must use at least one display mode."
-" If you select only one, then the options box will not give a choice of "
-"modes (since there will only be one active).</p>"
+"selected here work from your server.</p><p>The display modes "
+"are</p><ul><li>plainText: shows the raw LaTeX strings for "
+"formulas.</li><li>images: produces images using the external programs LaTeX "
+"and dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place"
+" render mathematics.</li></ul><p>You must use at least one display mode. If "
+"you select only one, then the options box will not give a choice of modes "
+"(since there will only be one active).</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1476
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with a question in "
+"this test. Please inform your instructor including the warning messages "
+"below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1236
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with this question. "
+"Please inform your instructor including the warning messages below."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1828
+#: /opt/webwork/webwork2/conf/defaults.config:1730
 msgid ""
 "<ul><li><b>SMAcheckAnswers</b>: enables the Check Answers button <i>for the "
 "new problem</i> when Show Me Another is "
@@ -334,7 +468,7 @@ msgid ""
 "time</li><li><b>SMAshowHints</b>: show hints <i>for the new problem</i> "
 "(assuming they exist)</li></ul>Note: there is very little point enabling the"
 " button unless you check at least one of these options - the students would "
-"simply see a new version that they can not attempt or learn from.</p>"
+"simply see a new version that they can not attempt or learn from."
 msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:35
@@ -343,73 +477,123 @@ msgstr ""
 
 #. ($add_courseID)
 #. ($rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1376
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:688
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:600
 msgid "A course with ID %1 already exists."
 msgstr "ID가 %1인 교과목이 이미 존재합니다."
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2564
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1220
 msgid ""
 "A directory already exists with the name %1. You must first delete this "
 "existing course before you can unarchive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:119
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:111
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:42
 msgid ""
 "A file name cannot begin with a dot, it cannot be empty, it cannot contain a"
 " directory path component and only the characters -_.a-zA-Z0-9 and space are"
 " allowed."
 msgstr "파일 이름은 점으로 시작할 수 없으며 비어 있을 수 없으며 디렉터리 경로 구성 요소를 포함할 수 없으며 문자 -_.a-zA-Z0-9 및 공백만 허용됩니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1342
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1366
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:738
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
 msgid "A file with that name already exists"
 msgstr "같은 이름의 파일이 이미 있습니다"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:348
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:19
 msgid ""
 "A hardcopy file was generated, but it may not be complete or correct. Please"
 " check that no problems are missing and that they are all legible. If not, "
 "please inform your instructor."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:56
+msgid ""
+"A hash reference in which the keys are the achievement_id's assigned to the "
+"current user and the values are 0 or 1 which stores if the user has earned "
+"the associated achievement or not."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:52
+msgid ""
+"A hash reference which contains a problems metadata, such as DBsubject, "
+"DBchapter, DBsection,  and so on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:37
+msgid "A hash reference which contains the problem data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:40
+msgid "A hash reference which contains the set data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:60
+msgid ""
+"A hash reference which saves data for this user and this achievement. This "
+"hash is persistent between evaluations and changes to this variable will be "
+"saved in the database."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:64
+msgid ""
+"A hash reference which saves global data for this user. This hash is "
+"persistent between evaluations and changes to this variable will be saved in"
+" the database."
+msgstr ""
+
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3291
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1695
 msgid ""
 "A location with the name %1 already exists in the database.  Did you mean to"
 " edit that location instead?"
 msgstr ""
 
-#. ($subject, $number_of_recipients, $courseName, $failed_messages)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1007
+#. ($mail_data->{subject}, $number_of_recipients, $mail_data->{courseName},
+#. $failed_messages)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:113
 msgid ""
 "A message with the subject line \"%1\" has been sent to %quant(%2,recipient)"
 " in the class %3.  There were %4 message(s) that could not be sent."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:644
-msgid "A new file has been created at '%1'"
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:315
+msgid "A new file has been created at \"%1\""
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1146
+msgid "A new file has been created at \"%1\" with the contents below."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:154
+msgid ""
+"A new problem whose path ends in newProblem.pg should be given a new name, "
+"for example, \"myNewProblem.pg\"."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2006
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:20
 msgid ""
-"A new file has been created at '%1' with the contents below.  No changes "
-"have been made to set %2"
+"A student must be assigned a homework set in order for it to appear on their"
+" WeBWorK home page. Check the box in the left column to assign a student to "
+"that homework set. Uncheck the box to unassign a student. If a student is "
+"unassigned from a homework set, all of the student's data for that homework "
+"set is deleted and cannot be recovered. Use this action cautiously!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:681
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:20
 msgid ""
-"A period (.) indicates a problem has not been attempted, and a number from 0"
-" to 100 indicates the grade earned. The number on the second line gives the "
-"number of incorrect attempts."
+"A student needs to be assigned a set in order for them to work it. Once a "
+"student is unassigned a set, all the data for them is lost and there is no "
+"way to undo it. When unassigning be sure to change the option to \"Allow "
+"unassign\"."
 msgstr ""
 
 # Leave symbol codes in place
-#: /opt/webwork/webwork2/conf/defaults.config:1647
+#: /opt/webwork/webwork2/conf/defaults.config:1549
 msgid ""
 "A switch to govern the use of a Progress Bar for the student; this also "
 "enables/disables the highlighting of the current problem in the side bar, "
@@ -417,474 +601,665 @@ msgid ""
 "(&#x2717;), or unattempted (no symbol)."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:42
+msgid "A unique key identifying the achievement."
+msgstr ""
+
 # Short for ADJUSTED STATUS
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:500
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:712
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:535
 msgid "ADJ STATUS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2296
-msgid "ANSWERS NOT RECORDED"
-msgstr "답안 기록되지 않음"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2281
-msgid "ANSWERS NOT RECORDED --"
-msgstr "답안 기록되지 않음—"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2295
-msgid "ANSWERS ONLY CHECKED -- "
-msgstr "답안 체크만 됨 — "
+#. ($c->{scoreRecordedMessage}[ $probOrder->[$i] ])
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:504
+msgid "ANSWERS NOT RECORDED -- %1"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2232
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1505
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:515
 msgid "ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"
 msgstr "답안 체크만 됨 -- 답안 기록되지 않음"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1527
 msgid ""
 "ATTEMPT NOT ACCEPTED -- Please submit answers again (or request new version "
 "if neccessary)."
 msgstr "ATTEMPT NOT ACCEPTED — 답변을 다시 제출하십시오(또는 필요한 새 버전을 요청하십시오)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1534
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_password_form.html.ep:1
 msgid "Abandon changes"
 msgstr "변경사항 취소"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1083
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_export_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_export_form.html.ep:1
 msgid "Abandon export"
 msgstr "저장후 내보내기 취소"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:520
 msgid ""
 "Account creation is currently disabled in this course.  Please speak to your"
 " instructor or system administrator."
 msgstr "현재 이 과정에서는 계정 생성이 비활성화되어 있습니다. 강사 또는 시스템 관리자에게 문의하십시오."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:153
-msgid "Achievement"
-msgstr ""
-
-#. ($targetAchievementID, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:638
-msgid "Achievement %1 created with evaluator '%2'."
+#. ($targetAchievementID,			$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:310
+msgid "Achievement %1 created with evaluator \"%2\"."
 msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:847
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:378
 msgid "Achievement %1 exists.  No achievement created"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:444
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:63
 msgid "Achievement Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:548
-msgid "Achievement Evaluator Editor"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:17
+msgid "Achievement Editor Help"
 msgstr ""
 
-#. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:170
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:17
+msgid "Achievement Evaluator Editor Help"
+msgstr ""
+
+#. ($c->stash('achievementID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:109
 msgid "Achievement Evaluator for achievement %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1446
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1454
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1482
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:13
 msgid "Achievement ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:274
 msgid "Achievement ID exists!  No new achievement created.  File not saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1698
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:41
+msgid "Achievement ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:3
+msgid "Achievement List"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1600
 msgid "Achievement Points Per Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:558
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:455
 msgid "Achievement User Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:17
+msgid "Achievement User Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:48
 msgid "Achievement has been assigned to all users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:67
 msgid "Achievement has been assigned to selected users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:60
 msgid "Achievement has been unassigned to all students."
 msgstr ""
 
-#. (CGI::a({ href => $fileManagerURL }, $scoreFileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:711
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:38
+msgid "Achievement options"
+msgstr ""
+
+#. ($c->link_to(                           $scoreFileName => $c->systemLink(
+#. $c->url_for('instructor_file_manager')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:318
 msgid "Achievement scores saved to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:260
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:241
 msgid "Achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:531
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:17
+msgid "Achievements Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:26
+msgid ""
+"Achievements are evaluated in the order shown below, with the exception of "
+"\"level\" achievements.  Achievements in the \"level\" category are "
+"evaluated first and control the XP thresholds and rewards (achievement "
+"items) for reaching each level. Achievements in the \"secret\" category are "
+"not shown to students until they earn the achievement, and is used for "
+"fun/surprise achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:32
+msgid ""
+"Achievements in the same category, with sequential numbers, and whose ID "
+"starts with the same \"prefix_\" (up to the last underscore), are treated as"
+" achievement chains.  Achievement chains are a sequence of achievements "
+"which build upon themselves, such as complete one problem, complete 10 "
+"problems, complete 25 problems, and so on. Students will only see the "
+"achievements in the chain they have completed or are currently working on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:201
 msgid "Act as"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:207
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:26
 msgid "Act as:"
 msgstr ""
 
-#. (HTML::Entities::encode_entities($prettyEUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1134
+#. ($effectiveUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:26
 msgid "Acting as %1."
 msgstr "%1로 작동"
 
 #. ($actionID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:372
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:223
 msgid "Action %1 not found"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1706
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:101
+msgid "Actions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1608
 msgid ""
 "Activating this will enable achievement rewards. This feature allows "
 "students to earn rewards by completing achievements that allow them to "
 "affect their homework in a limited way."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:45
 msgid "Active"
 msgstr "접속함"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1691
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:50
+msgid "Active Students"
+msgstr ""
+
+#. ($c->{prettyID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:19
+msgid "Active Students Problem %1 Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1593
 msgid ""
 "Activiating this will enable Mathchievements for webwork.  Mathchievements "
 "can be managed by using the Achievement Editor link."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2947
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1548
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:166
 msgid "Add"
 msgstr "추가"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:89
 msgid "Add All"
 msgstr "모두 추가"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:644
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:32
 msgid "Add Course"
 msgstr "교과목 추가"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:253
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:17
+msgid "Add Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:14
+msgid "Add Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:98
 msgid "Add Students"
 msgstr "학생 추가"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:406
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:349
 msgid "Add Users"
 msgstr "사용자 추가"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:518
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:17
+msgid "Add Users Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:47
 msgid "Add WeBWorK administrators to new course"
 msgstr "새 교과목에 WebWorK 관리자 추가"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1509
-msgid "Add a new test for which Gateway?"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:79
+msgid "Add a TA or an instructor (change permission level of user)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:60
+msgid "Add a few students to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:50
+msgid "Add a new version for which test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1441
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:20
 msgid "Add as what filetype?"
 msgstr "어떤 파일 형식으로 추가하시겠습니까?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/add_form.html.ep:3
 msgid "Add how many users?"
 msgstr "몇 명의 사용자를 추가하시겠습니까?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1549
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:69
+msgid "Add many students to a course from a class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:108
+msgid "Add n blank problem template(s) to the end of homework set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:164
 msgid "Add problem to target set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Add problems to"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1422
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:161
+msgid ""
+"Add this problem as the last problem of an existing set, either as a problem"
+" or as the set header (the text that appears on the home page of a homework "
+"set). You can rearrange the order of the problems later using the \"Hmwk "
+"Sets Editor\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:7
 msgid "Add to what set?"
 msgstr "어떤 문제집에 추가하시겠습니까?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:20
+msgid ""
+"Add users to the course.  Select the number of students/users to add and "
+"then add any desired information.  The only mandatory information is the "
+"\"Login Name\". Any other fields may be left blank.  The \"Student ID\" will"
+" be the initial password for the user if provided."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:26
 msgid "Add which new users?"
 msgstr "어떤 새 사용자를 추가하시겠습니까?"
 
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:883
+msgid "Added \"%1\" to %2 as new hardcopy header"
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:854
+msgid "Added \"%1\" to %2 as new set header"
+msgstr ""
+
 #. ('{number}', '{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1055
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:27
 msgid "Added %1 problems to set %2."
 msgstr ""
 
-#. ($sourceFilePath, $targetSetName,($set->assignment_type eq 'jitar' ?
-#. join('.',jitar_id_to_seq($targetProblemNumber)
-#. ($new_file_name, $setName, ($set->assignment_type eq 'jitar' ?
-#. join('.',jitar_id_to_seq($targetProblemNumber)
 #. ($new_file_path, $setID, $targetProblemNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1510
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2001
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1912
+#. ($sourceFilePath,                       $targetSetName,                 (
+#. $set->assignment_type eq 'jitar'                                ? join('.',
+#. jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:825
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1837
 msgid "Added %1 to %2 as problem %3"
 msgstr "%1을 %2에 문제 %3으로 추가"
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1566
-msgid "Added '%1' to %2 as new hardcopy header"
-msgstr "‘%1’을 새 하드카피 헤더로 %2에 추가"
-
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1540
-msgid "Added '%1' to %2 as new set header"
-msgstr "‘%1’을 새 집합 헤더로 %2에 추가"
+#. ($new_file_name,                                $c->{setID},
+#. (                                       $set->assignment_type eq 'jitar'
+#. ? join('.', jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1139
+msgid "Added %1 to %2 as problem %3."
+msgstr ""
 
 #. (join(', ', @toAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1974
 msgid "Added addresses %1 to location %2."
 msgstr "%1 주소를 %2 위치에 추가했습니다."
 
+#. ($user->user_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:167
+msgid "Added missing permission level for user %1."
+msgstr ""
+
 #. ('{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1054
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:26
 msgid "Added one problem to set %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Added user:"
+msgstr ""
+
+#. ('<code>[Scoring]/report_grades_data.csv</code>',
+#. '<code>[TMPL]/email/report_grades.msg</code>',)
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:33
+msgid ""
+"Additional (external) grades can be shown on this page by placing them in "
+"the CSV file %1.  The first six columns must be (in order): Student ID, "
+"Username, Last Name, First Name, Section, Recitation.  The remaining columns"
+" can list any external grades.  To display the grades, the CSV file is "
+"merged with the \"Email\" message %2, which will be rendered and displayed "
+"below the grade table.  The message can be created on the \"Email\" page and"
+" the CSV file can be created/uploaded using the \"File Manager\".  External "
+"grades can only be displayed here and are not included in any totals or "
+"statistics."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2060
 msgid "Additional addresses for receiving feedback e-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:235
 msgid "Additional submissions available."
 msgstr ""
 
 #. ($badLocAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1708
 msgid ""
 "Address(es) %1 already exist in the database.  THIS SHOULD NOT HAPPEN!  "
 "Please double check the integrity of the WeBWorK database before continuing."
 msgstr ""
 
 #. (join(', ', @noAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1986
 msgid ""
 "Address(es) %1 in the add list is(are) already in the location %2, and so "
 "were skipped."
 msgstr ""
 
 #. (join(', ', @noDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3603
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2008
 msgid ""
 "Address(es) %1 in the delete list is(are) not in the location %2, and so "
 "were skipped."
 msgstr ""
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1683
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and resubmit."
 msgstr ""
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1998
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:117
 msgid "Addresses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:53
 msgid ""
 "Addresses for new location.  Enter one per line, as single IP addresses "
 "(e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP ranges "
 "(e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:27
 msgid ""
 "Addresses to add to the location.  Enter one per line, as single IP "
 "addresses (e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP"
 " ranges (e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:232
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:27
 msgid "Adds 24 hours to the close date of a homework."
 msgstr "과제 종료일에 24시간을 더합니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:323
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:27
 msgid "Adds 48 hours to the close date of a homework."
 msgstr "과제 종료일에 48시간을 더합니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:110
+msgid ""
+"Adds new template problems to the set when the set is saved. You can modify "
+"the template to create your own problem, by clicking on the \"Edit Problem\""
+" link and saving to some new file, e.g. \"myNewProblem.pg\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:19
 msgid "Adjusted Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:56
 msgid "Adobe PDF"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:675
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:42
 msgid "Advanced Search"
 msgstr "고급 검색"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:196
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:206
 msgid "After set answer date"
 msgstr ""
 
-#. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:325
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:33
 msgid ""
-"After the reduced scoring period begins all work counts for %1% of its "
-"value."
+"After the due date this set enters a reduced scoring period until it closes "
+"on %1.  All work completed during the reduced scoring period counts for %2% "
+"of its value."
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:304
 msgid "Afterward reduced credit can be earned until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:56
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:60
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:23
 msgid "All Chapters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:57
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:34
 msgid "All Sections"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:6
 msgid "All Selected Constraints Joined by \"And\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:71
+msgid "All Sets"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:12
 msgid "All Subjects"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:48
 msgid "All Textbooks"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:54
+msgid "All Users"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:49
 msgid "All assignments were made successfully."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:953
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:386
 msgid "All listed sets were hidden from all the students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:951
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:381
 msgid "All listed sets were made visible for all the students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:407
 msgid "All of the answers above are correct."
 msgstr "위의 답변이 모두 정답입니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:398
 msgid "All of the gradeable answers above are correct."
 msgstr "위의 모든 채점 가능한 답변은 정답입니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:247
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:162
+msgid ""
+"All of the paths for problem files are relative to the templates directory "
+"of the current course. You can access this directory \"directly\" using the "
+"File Manager page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:68
 msgid "All of these files will also be made available for mail merge."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:960
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:9
+msgid "All problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:5
+msgid "All sections"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2145
+msgid "All selected courses are already hidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2214
+msgid "All selected courses are already unhidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:399
 msgid "All selected sets hidden from all students"
 msgstr "선택한 모든 집합이 모든 학생으로부터 숨겨짐"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:394
 msgid "All selected sets made visible for all students"
 msgstr "모든 학생이 선택한 모든 세트를 볼 수 있음"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:946
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:373
 msgid "All sets hidden from all students"
 msgstr "모든 학생으로부터 모든 문제집이 숨겨짐"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:945
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:368
 msgid "All sets made visible for all students"
 msgstr "모든 학생이 모든 문제집을 볼 수 있음"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:619
 msgid "All sets were selected for export."
 msgstr "모든 문제집을 내보내도록 선택했음"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:56
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:54
 msgid "All unassignments were made successfully."
 msgstr "모든 할당 해제가 성공적으로 수행되었습니다."
 
-#: /opt/webwork/webwork2/conf/defaults.config:2047
+#: /opt/webwork/webwork2/conf/defaults.config:1948
 msgid "Allow Unicode alternatives in student answers"
 msgstr "학생 답변에 유니코드 대안 허용"
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:74
 msgid "Allow the LMS to update user account data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:68
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:105
 msgid "Allow unassign"
 msgstr "할당 해제 허용"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2069
+#: /opt/webwork/webwork2/conf/defaults.config:1970
 msgid "Allowed error, as a percentage, for numerical comparisons"
 msgstr "숫자 비교에 허용되는 오차(백분율)"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1886
+#: /opt/webwork/webwork2/conf/defaults.config:1788
 msgid "Allowed to <em>act as</em> another user"
 msgstr "다른 사용자의 <em>역할</em>이 허용됨"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1923
+#: /opt/webwork/webwork2/conf/defaults.config:1825
 msgid "Allowed to change display settings used in pg problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1913
+#: /opt/webwork/webwork2/conf/defaults.config:1815
 msgid "Allowed to change their e-mail address"
 msgstr "이메일 주소 변경 허용"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1877
+#: /opt/webwork/webwork2/conf/defaults.config:1779
 msgid "Allowed to change their password"
 msgstr "비밀번호 변경 허용"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1872
+#: /opt/webwork/webwork2/conf/defaults.config:1774
 msgid "Allowed to login to the course"
 msgstr "교과목에 로그인 허용"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1950
+#: /opt/webwork/webwork2/conf/defaults.config:1852
 msgid "Allowed to see solutions before the answer date"
 msgstr "답변 날짜 이전에 해답을 볼 수 있음"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1945
+#: /opt/webwork/webwork2/conf/defaults.config:1847
 msgid "Allowed to see the correct answers before the answer date"
 msgstr "답변 날짜 전에 정답을 볼 수 있음"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1934
+#: /opt/webwork/webwork2/conf/defaults.config:1836
 msgid "Allowed to view past answers"
 msgstr "과거 답변을 볼 수 있음"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1940
+#: /opt/webwork/webwork2/conf/defaults.config:1842
 msgid "Allowed to view problems in sets which are not open yet"
 msgstr "아직 열리지 않은 문제집의 문제를 볼 수 있음"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1572
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:82
+msgid ""
+"Allows configuration of certain parameters, such as permission levels, "
+"default display mode for equations, and email feedback behavior, on a course"
+" by course basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:126
+msgid "Also copy simple configuration file"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:26
 msgid "Amulet of Extension"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:20
+msgid ""
+"An achievement evaluator is a perl script that is run after each problem is "
+"submitted which returns a truth value of 0 (didn't earn) or 1 (earn). The "
+"evaluator is given access to different variables which contain data about "
+"the problem and set that is used to determine if the achievement is earned "
+"or not."
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:37
 msgid ""
 "An address that can be used to log in to the LMS. This is used in messages "
@@ -892,248 +1267,308 @@ msgid ""
 "WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:43
+msgid ""
+"An array which lists the hash reference of all the problems in the current "
+"set."
+msgstr ""
+
 #. ($archive_courseID)
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2350
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2647
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1274
 msgid "An error occured while archiving the course %1:"
 msgstr "교과목 %1을 보관하는 동안 오류가 발생했습니다."
 
 #. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:658
 msgid "An error occured while changing the title of the course %1."
 msgstr "과정 %1의 교과목명을 변경하는 동안 오류가 발생했습니다."
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1795
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:878
 msgid "An error occured while deleting the course %1:"
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1521
+#. ($rename_oldCourseID,						$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:751
 msgid "An error occured while renaming the course %1 to %2:"
 msgstr ""
 
 #. ($part + 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:106
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:25
 msgid "Answer %1 Score (%):"
 msgstr "답변 %1 점수(%):"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:425
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:765
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:789
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:812
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:79
 msgid "Answer Date"
 msgstr "대답한 날짜"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1712
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:39
 msgid "Answer Group Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:59
 msgid "Answer Hash Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:221
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:292
 msgid "Answer Log"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:17
+msgid "Answer Log Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:285
 msgid "Answer Preview"
 msgstr "입력답 미리보기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1465
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:48
+msgid ""
+"Answer availability for tests depends on multiple settings.  This only "
+"indicates the template answer date has passed.  See set editor for actual "
+"availability."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1276
 msgid "Answer(s) submitted:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
 msgid "Answer:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:224
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
 msgid "Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:122
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:37
 msgid "Answers Available"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1202
 msgid "Answers cannot be due until on or after the open date!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1204
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1197
 msgid "Answers cannot be made available until on or after the close date!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:313
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:21
 msgid ""
 "Any changes made below will be reflected in the achievement for ALL "
 "students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2259
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:507
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:175
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:69
 msgid "Any changes made below will be reflected in the set for ALL students."
 msgstr "아래에 변경된 사항은 모든 학생들 문제집에 반영됩니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:173
 msgid ""
 "Any changes made below will be reflected in the set for ONLY the student(s) "
 "listed above."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:122
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:159
 msgid "Append"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1849
+#. (tag('strong', dir => 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:71
 msgid "Append to end of %1 set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2264
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:51
+msgid "Applying definitions theoretically and proof writing"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:91
 msgid "Archive"
 msgstr ""
 
 #. ($archive, $n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:892
-msgid "Archive '%1' created successfully (%quant( %2, file))"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:361
+msgid "Archive \"%1\" created successfully (%quant( %2, file))"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1069
-msgid "Archive '%1' deleted"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:525
+msgid "Archive \"%1\" deleted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1846
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2048
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:38
 msgid "Archive Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2005
-msgid "Archive Courses"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:17
+msgid "Archive Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2423
-msgid "Archive next course"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:63
+msgid "Archive Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1056
-msgid "Archive this Course"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1158
+msgid "Archive next course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:61
 msgid "Archived Courses"
 msgstr ""
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:202
-msgid "Archiving course as %1.tar.gz. Reload FileManager to see it."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:69
+msgid "Archived course as %1.tar.gz."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:25
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to access the .tar.gz files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:26
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to upload additional .tar.gz "
+"files to be unarchived."
 msgstr ""
 
-#. (CGI::b($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2191
+#. (tag('b', $archive_courseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:57
 msgid ""
 "Are you sure that you want to delete the course %1 after archiving? This "
 "cannot be undone!"
 msgstr ""
 
-#. (CGI::b($delete_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1736
+#. (tag('b', param('delete_courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:5
 msgid ""
 "Are you sure you want to delete the course %1? All course files and data "
 "will be destroyed. There is no undo available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:72
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:511
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:64
+msgid ""
+"As the checkbox says, this includes a percentage grade column for each set."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:184
 msgid "Assign"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:225
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:62
 msgid "Assign All Sets to Current User"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:171
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:106
+msgid "Assign achievements"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:43
+msgid "Assign and unassign selected exercise sets to selected users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:54
 msgid "Assign selected sets to selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:919
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:154
+msgid "Assign sets to many students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:116
+msgid "Assign sets to one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:15
 msgid "Assign this achievement to which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1366
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:62
 msgid "Assign this set to which users?"
 msgstr "이 문제집을 할당할 사용자는?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:15
 msgid "Assign to All Current Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:3
 msgid "Assign which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:35
 msgid "Assigned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1984
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:19
 msgid "Assigned Sets"
 msgstr "할당된 문제집"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:580
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:218
 msgid "Assigned achievements to users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2154
-msgid "Assigned to"
+#. (link_to(						$c->setCountMessage($db->countUserSets($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:96
+msgid "Assigned to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:212
 msgid "Assignment type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-msgid "Assignments only"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:2004
+#: /opt/webwork/webwork2/conf/defaults.config:1906
 msgid "Assist with the student answer entry process."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:417
 msgid "At least one of the answers above is NOT correct."
 msgstr ""
 
 # Short for "Attempts to Open Children"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:487
 msgid "Att. to Open Children"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:50
 msgid "Attachment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2293
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:107
 msgid "Attempt to upgrade directories"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:375
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:449
 msgid "Attempted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1416
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1498
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/attempts_row.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:73
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:13
 msgid "Attempts"
 msgstr "시도"
 
@@ -1141,392 +1576,586 @@ msgstr "시도"
 msgid "Audit"
 msgstr "감사"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:342
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:348
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:360
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:366
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:460
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:466
 msgid "Authentication failed.  Please speak to your instructor."
 msgstr "인증 실패. 교수님의 도움을 받으세요."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/InstructorRPCHandler.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:44
+msgid "Authentication failed. Log in again to continue."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:116
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:69
 msgid "Author Info"
 msgstr "작성자 정보"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:87
 msgid "Automatic"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2058
+#: /opt/webwork/webwork2/conf/defaults.config:1959
 msgid ""
 "Automatically convert Full Width Unicode characters to their ASCII "
 "equivalents"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2911
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:97
+msgid ""
+"Automatically render all problems in the set on this page when \"Save "
+"Changes\" or \"Reset Form\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:667
 msgid "Automatically render problems on page load"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1727
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:95
+msgid "Automatically render problems on page load."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:49
 msgid "Auxiliary Resources"
 msgstr ""
 
-#. ($emailDirectory,$old_default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:350
-msgid "Backup file <code>%1/%2</code> created."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:179
+msgid "Average Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:255
-msgid "Badges"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:118
+msgid "Average Attempts Per Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:942
-msgid "Basic Search"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:115
+msgid "Average Percent"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
-msgid "Binary"
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:558
+msgid "Backup created on %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1271
-msgid "Box of Transmogrification"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:1
+msgid "Badges"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1093
-msgid "Browse"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:106
+msgid "Basic Search"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:512
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:991
-msgid "Browse from:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:28
+msgid "Before Open Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2161
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:31
 msgid ""
-"By default, feedback is always sent to all users specified to recieve "
-"feedback.  This variable sets the system to only email feedback to users who"
+"Below the file list is a button and options for uploading files. Click the "
+"\"Choose File\" button, select the file, then click \"Upload\". A single "
+"file or a compressed tar (.tgz) file can be uploaded and if the option is "
+"selected, the archive is automatically unpacked and deleted.  Generally the "
+"\"automatic\" option on Format will correctly pick the correct type of file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:83
+msgid "Binary"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+msgid "Both Start and Grade"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:26
+msgid "Box of Transmogrification"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:40
+msgid "Browse"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:16
+msgid "Browse from:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2072
+msgid ""
+"By default, feedback is always sent to all users specified to recieve "
+"feedback.  This variable sets the system to only email feedback to users who"
 " have the same section as the user initiating the feedback.  I.e., feedback "
 "will only be sent to section leaders."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2151
+#: /opt/webwork/webwork2/conf/defaults.config:2062
 msgid ""
 "By default, feedback is sent to all users above who have permission to "
 "receive feedback. Feedback is also sent to any addresses specified in this "
 "blank. Separate email address entries by commas."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
 msgid "CLOSE DATE"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:217
 msgid "CLOSE TIME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:26
 msgid "Cake of Enlargement"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1891
+#: /opt/webwork/webwork2/conf/defaults.config:1793
 msgid "Can e-mail instructor"
 msgstr "교수에게 이메일 허용"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1904
+#: /opt/webwork/webwork2/conf/defaults.config:1806
 msgid "Can report bugs"
 msgstr "버그 보고 허용"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1955
+#: /opt/webwork/webwork2/conf/defaults.config:1857
 msgid "Can show old answers"
 msgstr "전에 입력된 답 모두 보기 허용"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1897
+#: /opt/webwork/webwork2/conf/defaults.config:1799
 msgid "Can submit answers for a student"
 msgstr "학생의 답변 제출 허용"
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:275
 msgid "Can't copy file: %1"
 msgstr ""
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:894
-msgid "Can't create archive '%1': command returned %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
+msgid "Can't create archive \"%1\": command returned %2"
 msgstr ""
 
 #. ($courseID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2725
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:28
 msgid "Can't create course environment for %1 because %2"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:423
 msgid "Can't create directory: %1"
 msgstr ""
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1060
-msgid "Can't create file '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+msgid "Can't create file \"%1\": %2"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:948
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:406
 msgid "Can't create file: %1"
 msgstr ""
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1070
-msgid "Can't delete archive '%1': %2"
-msgstr ""
-
-#. ($eUserID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:69
-msgid "Can't get password record for effective user '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:526
+msgid "Can't delete archive \"%1\": %2"
 msgstr ""
 
-#. ($userID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:64
-msgid "Can't get password record for user '%1': %2"
+#. ($setID, $TargetUser->user_id,)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:925
+msgid ""
+"Can't generate hardcopy for set \"%1\" for user \"%2\". The set is not "
+"visible to students."
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:445
 msgid "Can't open %1"
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1426
 msgid "Can't open file %1"
 msgstr ""
 
 #. ($merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:343
 msgid "Can't read merge file %1. No message sent"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:760
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:298
 msgid "Can't rename file: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:591
 msgid "Can't rename to the same name."
 msgstr ""
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:927
-msgid "Can't unpack '%1': command returned %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:392
+msgid "Can't unpack \"%1\": command returned %2"
 msgstr ""
 
 #. ($fullPath)
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:629
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1895
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1819
 msgid "Can't write to file %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1015
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1096
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:154
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:462
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/confirm.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:69
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:15
 msgid "Cancel"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:387
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:5
+msgid "Cancel E-Mail"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:60
 msgid "Cancel E-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:61
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:77
 msgid "Cancel Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:79
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
 msgid "Cancel Export"
 msgstr "내보내기 취소"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:93
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
 msgid "Cancel Password"
 msgstr "비밀번호 취소"
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:516
+msgid "Cannot find a file path to save to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:501
+msgid ""
+"Cannot find a problem record for set $c->{setID} / problem $c->{problemID}"
+msgstr ""
+
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:240
 msgid "Cannot open %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:222
-msgid "Cap Test Time at Set Close Date?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:232
+msgid "Cap Test Time at Set Close Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1456
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1486
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:14
 msgid "Category"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:516
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:49
+msgid "Category:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:27
 msgid ""
 "Cause the selected homework set to count for twice as many points as it "
 "normally would."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1272
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:27
 msgid ""
 "Causes a homework problem to become a clone of another problem from the same"
 " set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:727
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:27
 msgid "Causes a single homework problem to be worth twice as much."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1006
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:48
 msgid "Change Course Title to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:34
 msgid "Change CourseID to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:176
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:134
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:76
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:25
 msgid "Change Display Settings"
 msgstr "디스플레이 설정 변경"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:53
 msgid "Change Email Address"
 msgstr "이메일주소 변경"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1032
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:62
 msgid "Change Institution to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:374
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:18
 msgid "Change Password"
 msgstr "비밀번호 변경"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:169
 msgid "Change User Settings"
 msgstr "사용자 정보 변경"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:35
+msgid "Change a course's ID, Title, or Institution."
+msgstr ""
+
 #. ($rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1092
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
 msgid "Change course institution from %1 to %2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:160
+msgid "Change dates for a homework set for the whole class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:123
+msgid "Change the due date for one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:26
+msgid ""
+"Change the due dates for an individual student on this page. Check the "
+"checkbox and enter the new date in order to override the date. (You can copy"
+" the date format from the date in the right hand column which indicates the "
+"date when the homework set is due for the whole class.) Note that you should"
+" ensure that the close date is before the answer date. If the close date for"
+" a student is extended until after the class answer date for the set, then "
+"the answer date for the student must also be set to a later date. "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:141
+msgid "Change the grades on a homework set for one student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:163
+msgid "Change the grading on a homework set for an entire class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:170
+msgid "Change the number of atttempts allowed on a problem."
+msgstr ""
+
 #. ($rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1089
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:508
 msgid "Change title from %1 to %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1362
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:488
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:540
 msgid "Changes abandoned"
 msgstr "변경 취소"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:371
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:242
 msgid "Changes in this file have not yet been permanently saved."
 msgstr "이 파일의 변경사항이 영구적으로 저장되지 않았습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:647
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:529
 msgid "Changes saved"
 msgstr "변경사항 저장"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1822
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:38
+msgid "Changing dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:514
 msgid ""
 "Changing the problem seed for display, but there are no problems showing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:635
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:19
 msgid "Chapter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1849
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:15
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:103
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:37
 msgid "Check Answers"
 msgstr "정답 확인"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2476
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:682
 msgid "Check Test"
 msgstr "테스트 확인"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:183
-msgid "Check that it's permissions are set correctly."
-msgstr ""
-
-#. ($emailDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:195
-msgid ""
-"Check whether it exists and whether the directory %1 can be read by the "
-"webserver."
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:53
+msgid "Choose problems from a library and add them to a homework set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:543
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:40
 msgid "Choose the set which you would like to be worth twice as much."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:44
 msgid "Choose the set which you would like to enable partial credit for."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1206
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:992
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:44
 msgid "Choose the set which you would like to resurrect."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:259
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:350
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:40
 msgid "Choose the set whose close date you would like to extend."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:903
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:16
 msgid "Choose visibility of the sets to be affected"
 msgstr "보여질 문제집 선택"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:497
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:15
 msgid "Choose what to do with existing data:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:880
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:3
 msgid "Choose which sets to be affected"
 msgstr "적용될 문제집을 선택하세요"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:491
-msgid "Class value"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:17
+msgid "Class List Editor Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:334
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:55
+msgid "Class list (\".lst\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:316
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:37
 msgid "Classlist Editor"
 msgstr "Classlist 편집자"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1197
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:91
 msgid "Clear Problem Display"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:693
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:82
 msgid ""
 "Click a student's name to see the student's homework set. Click a heading to"
 " sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:74
 msgid ""
 "Click a student's name to see the student's test summary page. Click a "
 "test's version number to see the corresponding test version. Click a heading"
 " to sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:614
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:150
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:143
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made. (The grade for each problem is listed "
+"as \"status\" on this third page)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:24
+msgid ""
+"Click on each of the tabs to view the configuration items. The question mark"
+" icon provides access to information about the behavior of the configuration"
+" settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:125
+msgid ""
+"Click on the column \"Assigned Sets\" in the student's row. This will take "
+"you to a page where you can assign and unassign homework sets and change the"
+" due dates for homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:33
+msgid ""
+"Click on the homework set links to edit the grades for this individual "
+"student on the homework set. (The grade of each problem is called the "
+"\"status\".) You can also change the number of allowed attempts and further "
+"modify the individual student's homework set.) You will also be able to "
+"change a student's seed which determines the individual values used in the "
+"individual version of the student's problem and the weight (how much a "
+"problem counts towards the grade.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:90
 msgid ""
 "Click on the login name to edit individual problem set data, (e.g. due "
 "dates) for these students."
 msgstr "개인별 문제집 데이터(예. 마감기한)를 편집하기 위해 로그인 이름을 클릭하세요."
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:62
+msgid ""
+"Click the \"Add x student(s)\" radio button and then click \"Take action\". "
+"This will take you to a new page where the data can be entered for one or "
+"more students. It is also possible to assign the student to one or more "
+"problem sets as they are being entered: simply select the homework sets from"
+" the list below the data entry table. Use \"command\" or \"control\" click "
+"to select more than one homework set."
+msgstr ""
+
+#. ('<i class="fas fa-question-circle"></i>')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:88
+msgid "Click the %1 icon for page and item specific help."
+msgstr ""
+
+#. ('<a href="#"><i class="fas fa-question-circle"></i></a>')
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:20
+msgid "Click the icon %1 for page and item specific help."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:185
+msgid ""
+"Clicking on any active link at the top of the column sorts the page by that "
+"column. You can do lexigraphic sorts: click on \"First name\" then \"Last "
+"name\" to sort by last name, sorting those with the same last name by their "
+"first name."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:132
+msgid ""
+"Clicking on the login name link in a student's row allows you to view the "
+"student's version of the homework (rather than your own) so that you can "
+"more easily answer student questions about homework problems. (A \"acting as"
+" xxx\" alert will appear in the upper right corner of each window while you "
+"are acting as a student.) You can submit the answers (which will NOT be "
+"recorded) to check that the computer is grading the problem correctly. You "
+"will also be able to view past answers submitted by the student for each "
+"problem. To stop acting in the student's role click the \"Stop acting\" link"
+" in the upper right corner of the window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:199
+msgid ""
+"Clicking the <strong>e-mail address</strong> link will bring up your "
+"standard email application so that you can send email to the student. This "
+"works even if the student has been dropped from the course. To send email to"
+" an entire class or to merge grades with the email message use the \"Email\""
+" page link in the left margin."
+msgstr ""
+
 #. ($clientIP->ip()
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:541
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:547
 msgid ""
 "Client ip address %1 is not allowed to work this assignment, because the "
 "assignment has ip address restrictions and there are no allowed locations "
@@ -1534,329 +2163,337 @@ msgid ""
 "problem resolved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:713
-msgid "Close"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:316
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:39
+msgid "Close Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:424
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:764
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:788
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:811
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
-msgid "Close Date"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:35
+msgid "Closed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:382
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:208
 msgid "Closed, answers available."
 msgstr "종료, 정답을 볼 수 있습니다."
 
-#. ($self->formatDateTime($set->answer_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:378
+#. ($c->formatDateTime($set->answer_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:204
 msgid "Closed, answers on %1."
 msgstr "종료, %1의 정답."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:206
 msgid "Closed, answers recently available."
 msgstr "종료. 정답을 볼 수 있습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:282
 msgid "Closed."
 msgstr "종료."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:116
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:121
 msgid "Closes"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date, undef,
+#. ($c->formatDateTime($verSet->due_date, undef,
 #. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:113
-msgid "Closes %1"
-msgstr ""
-
-#. ($self->formatDateTime($verSet->due_date, undef,
-#. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:390
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:227
 msgid "Closes on %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:35
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:33
 msgid "Closes:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2518
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:357
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:71
 msgid "Collapse All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2529
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:367
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:85
 msgid "Collapse All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2668
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:419
 msgid "Collapse Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2791
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2793
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:572
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:575
 msgid "Collapse Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1715
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:73
+msgid ""
+"Collapse problem details to the top row of information about a problem. Note"
+" that the details of a single problem can be collapsed by clicking on the up"
+" arrow to the right of the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1617
 msgid ""
 "Comma separated list of set names that are excluded from all achievements. "
 "No achievement points and badges can be earned for submitting problems in "
 "these sets. Note that underscores (_) must be used for spaces in set names."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:238
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:245
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:225
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:577
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2047
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:299
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:833
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:862
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:891
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:920
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:131
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:46
 msgid "Comment"
 msgstr "코멘트"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:200
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:25
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:181
 msgid "Comment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:638
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:86
 msgid "Comments"
 msgstr ""
 
-#. ($self->formatDateTime($set->answer_date)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2175
+#. ($c->formatDateTime($c->{set}->answer_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:379
 msgid "Completed results for this assignment are not available until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:382
 msgid "Completed results for this assignment are not available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:264
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:280
 msgid "Completed."
 msgstr "제출완료"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:45
 msgid "Compose Email Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3185
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:47
+msgid ""
+"Configure ip ranges (locations) that can be used to restrict set access."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:45
+msgid "Configure which course links appear on the site landing page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:97
 msgid "Confirm"
 msgstr ""
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:107
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:164
+#. ($eUserName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:41
 msgid "Confirm %1's New Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:579
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:78
 msgid "Confirm Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_export_form.html.ep:1
 msgid "Confirm which sets to export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementEvaluator.pm:288
+#: /opt/webwork/webwork2/templates/AchievementEvaluator/cheevoMessage.html.ep:15
 msgid "Congratulations, you earned a new level!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2250
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:95
 msgid "Continue"
 msgstr "계속"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:86
 msgid "Continue Open Test"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:59
+msgid "Controls if an achievement is evaluated or not."
+msgstr ""
+
 #. ($sourceDirectory, $outputDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1149
-msgid "Copied auxiliary files from %1 to new location at %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:671
+msgid "Copied auxiliary files from %1 to new location at %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:42
 msgid "Copy"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
 msgid "Copy file as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:528
-msgid "Copy simple configuration file to new course"
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:112
+msgid "Copy from:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:627
-msgid "Copy templates from:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1335
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:82
 msgid "Copy this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:391
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:465
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:301
 msgid "Correct"
 msgstr "정답"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:656
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:678
 msgid "Correct Adjusted Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:300
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:287
 msgid "Correct Answer"
 msgstr "정답"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1682
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:19
 msgid "Correct Answers"
 msgstr "정답"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1506
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1317
 msgid "Correct Answers:"
 msgstr "정답:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:693
 msgid "Correct Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:648
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:93
 msgid "Correct answers"
 msgstr "정답"
 
 #. ($total_correct, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1004
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:16
 msgid "Correct: %1/%2"
 msgstr ""
 
 #. ($newBlankProblems, $MAX_NEW_PROBLEMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1915
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1843
 msgid ""
 "Could not add %1 problems to this set.  The number must be between 1 and %2"
 msgstr ""
 
 #. ($e_user_name, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:83
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:94
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:74
 msgid "Couldn't change %1's password: %2"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:111
 msgid "Couldn't change your email address: %1"
 msgstr ""
 
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4111
-msgid "Couldn't find OPL Branch %1 in remote %2"
-msgstr ""
-
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4076
-msgid "Couldn't find PG Branch %1 in remote %2"
-msgstr ""
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4014
-msgid "Couldn't find WeBWorK Branch %1 in remote %2"
-msgstr ""
-
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:132
 msgid "Couldn't save your display options: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1463
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:36
 msgid "Counter"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:424
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:833
-msgid "Counts for Parent"
-msgstr ""
-
-#. ($rename_oldCourseID)
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2186
-msgid "Course %1 database is in order"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:66
+msgid "Counter:"
 msgstr ""
 
-#. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1257
-msgid "Course %1 databases must be updated before renaming this course."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:503
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:35
+msgid "Counts for Parent"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:778
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:95
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:154
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:9
 msgid "Course Administration"
 msgstr "수업 관리"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:424
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:17
+msgid "Course Administration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:369
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:80
 msgid "Course Configuration"
 msgstr "환경설정"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:480
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:17
+msgid "Course Configuration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:17
+msgid "Course Home Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:21
 msgid "Course ID"
 msgstr ""
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2566
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:691
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:594
 msgid "Course ID cannot exceed %1 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1227
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:597
 msgid "Course ID may only contain letters, numbers, hyphens, and underscores."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:956
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:21
 msgid "Course ID:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:5
 msgid "Course Info"
 msgstr "수업 정보"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1664
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1961
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3736
-msgid "Course Name:"
+#. ($c->stash('courseID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:325
+msgid "Course Information for course %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:491
-msgid "Course Title"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:30
+msgid "Course Listings"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:204
-msgid "Course archived."
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:17
+msgid "Course Name:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:28
+msgid "Course Title"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:418
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:12
 msgid "Courses"
 msgstr "교과목명"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1609
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1904
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3674
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:13
 msgid ""
 "Courses are listed either alphabetically or in order by the time of most "
 "recent login activity, oldest first. To change the listing order check the "
@@ -1865,393 +2502,536 @@ msgid ""
 "\"hidden\" or \"visible\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:7
+msgid ""
+"Courses are listed either alphabetically or in order by the time of most "
+"recent login activity, oldest first. To change the listing order check the "
+"mode you want and click \"Refresh Listing\". The listing format is: "
+"Course_Name (status :: date/time of most recent login) where status is "
+"\"hidden\" or \"visible\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:163
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:84
 msgid "Create"
 msgstr "생성하기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:41
 msgid "Create CSV"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3054
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:31
 msgid "Create Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1071
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:39
+msgid ""
+"Create a .tar.gz archive which includes the course's database and all course"
+" files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:33
 msgid "Create a New Set in This Course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:795
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:4
 msgid "Create a new achievement with ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:33
+msgid "Create a new course on this server."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:20
+msgid ""
+"Create a new course.  The \"Course ID\" is used as the course name and is "
+"used in course links.  Underscores appear as spaces when displaying the "
+"course name.  The \"Course Title\" is used as the title on the course home "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:86
+msgid ""
+"Create a new set with a given name. This can either create an empty set or a"
+" duplicate of an existing set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:12
 msgid "Create as what type of achievement?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:12
 msgid "Create as what type of set?"
 msgstr "어떤 종류의 문제집으로 생성?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1866
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:20
+msgid "Create backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:81
 msgid "Create unattached problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1849
-msgid ""
-"Creates a gzipped tar archive (.tar.gz) of a course in the WeBWorK courses "
-"directory. Before archiving, the course database is dumped into a "
-"subdirectory of the course's DATA directory. Currently the archive facility "
-"is only available for mysql databases. It depends on the mysqldump "
-"application."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:121
+msgid "Create/Delete achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:726
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:26
 msgid "Cupcake of Enlargement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:728
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:38
 msgid "Current"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3042
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:2
 msgid "Currently defined locations are listed below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4352
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2365
 msgid "Database tables are ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:54
 msgid "Database tables need updating."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2753
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:52
 msgid "Database tables ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2968
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1499
 msgid "Database:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:783
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:153
 msgid "Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:727
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:355
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:96
+msgid "Dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:40
+msgid ""
+"Dates for problem sets can be edited by clicking the pencil icon in the "
+"\"Edit Set Data\" column next to the set name. To change dates for several "
+"sets at once, click the check box in the \"Select\" column and choose \"Edit"
+" selected\" from the tasks above."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:426
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:37
 msgid "Default"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1675
+#: /opt/webwork/webwork2/conf/defaults.config:1577
 msgid ""
 "Default Amount of Time (in minutes) after Due Date that Answers are Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1665
+#: /opt/webwork/webwork2/conf/defaults.config:1567
 msgid ""
 "Default Amount of Time (in minutes) before Due Date that the Assignment is "
 "Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1785
+#: /opt/webwork/webwork2/conf/defaults.config:1687
 msgid "Default Length of Reduced Scoring Period in minutes"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1655
+#: /opt/webwork/webwork2/conf/defaults.config:1557
 msgid "Default Time that the Assignment is Due"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1808
+#: /opt/webwork/webwork2/conf/defaults.config:1710
 msgid ""
 "Default number of attempts before Show Me Another can be used (-1 => Never)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1755
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:162
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:91
+#: /opt/webwork/webwork2/conf/defaults.config:1994
+msgid ""
+"Default number of attempts before hints are shown in a problem (-1 => hide "
+"hints)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:89
 msgid "Delete"
 msgstr "삭제"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1556
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1651
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1689
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1728
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:49
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:36
 msgid "Delete Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3480
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:17
+msgid "Delete Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:23
+msgid "Delete Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:37
+msgid "Delete a course and all associated data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:109
+msgid "Delete a student from a course"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:52
 msgid "Delete all existing addresses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1989
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:65
+msgid "Delete backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:64
+msgid "Delete backup from %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:54
 msgid "Delete course after archiving. Caution there is no undo!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:49
 msgid "Delete course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2348
 msgid "Delete field when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2809
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:588
 msgid "Delete it?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3055
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:78
 msgid "Delete location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:28
+msgid "Delete oldest backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2321
 msgid "Delete table when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:729
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:90
+msgid "Delete the sets checked below. Be careful, this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:6
 msgid "Delete which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1045
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:6
 msgid "Delete which sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1041
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:6
 msgid "Delete which users?"
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:394
 msgid "Deleted %1 users."
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:358
 msgid "Deleted %quant(%1,achievement)"
 msgstr ""
 
 #. (join(', ', @delLocations)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3359
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1810
 msgid "Deleted Location(s): %1"
 msgstr ""
 
 #. (join(', ', @toDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3597
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1966
 msgid "Deleted addresses %1 from location."
 msgstr ""
 
-#. ($self->shortPath($self->{tempFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1158
-msgid "Deleting temp file at %1"
+#. ($formatBackupTime)
+#. ($c->formatDateTime($delTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1243
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:569
+msgid "Deleted backup from %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3152
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:679
+msgid "Deleted temp file at %1"
+msgstr ""
+
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1219
+msgid "Deleted temporary file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:125
+msgid "Deleting Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:68
 msgid ""
 "Deletion deletes all location data and related addresses, and is not "
 "undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:723
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:3
 msgid "Deletion destroys all achievement-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:185
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
 msgid "Deny From"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1467
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:27
 msgid "Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:256
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:71
+msgid "Description:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:69
 msgid "Deselect All Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:229
 msgid "Deselect All Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:428
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:366
 msgid "Didn't recognize action"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:27
 msgid "Directory"
 msgstr ""
 
 #. ($file, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:793
-msgid "Directory '%1' not removed: %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:327
+msgid "Directory \"%1\" not removed: %2"
 msgstr ""
 
 #. ($file, $removed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:792
-msgid "Directory '%1' removed (items deleted: %2)"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:325
+msgid "Directory \"%1\" removed (items deleted: %2)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:412
-msgid "Directory permission errors "
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:33
+msgid "Directory permission errors"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2861
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2994
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1439
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1575
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:44
 msgid ""
 "Directory structure is missing directories or the webserver lacks sufficient"
 " privileges."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1267
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2210
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2857
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1434
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1570
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:41
 msgid "Directory structure is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2285
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:102
 msgid "Directory structure needs to be repaired manually before archiving."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1338
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:84
 msgid "Directory structure needs to be repaired manually before renaming."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2750
-msgid "Directory structure or permissions need to be repaired. "
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:48
+msgid "Directory structure or permissions need to be repaired."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2853
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1414
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1540
 msgid "Directory structure:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2536
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:365
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:92
+msgid "Display Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:90
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:104
 msgid "Display Mode:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:463
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:37
 msgid "Display Past Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
-msgid "Display of scores for this set is not allowed."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:44
+msgid "Display mode for equations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:589
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:311
+msgid "Display of scores for this test is not allowed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:12
 msgid "Display options: Show"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2017
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:48
+msgid ""
+"Display sets matching a selected criteria. Useful if there are many sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1918
 msgid "Display the evaluated student answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:176
+#. ('<code>COURSENAME_totals.csv</code>',
+#. '<code>COURSENAME_totals_bak1.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:74
+msgid ""
+"Do NOT use the file name %1, since you might accidentally overwrite that if "
+"you again export your WeBWorK homework scores. (Actually the earlier file is"
+" moved to %2 -- so you can recover using the File Manager.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:57
 msgid "Do not unassign students unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:233
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:67
 msgid "Do not uncheck a set unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:20
 msgid "Do not uncheck students, unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2450
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:656
 msgid "Do you want to grade this test?"
 msgstr "이 시험의 점수를 매기시겠습니까?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2272
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:93
+msgid "Documentation from source code for PG modules and macro files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:95
 msgid "Don't Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2607
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:13
 msgid "Don't Unarchive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2912
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:46
 msgid "Don't Upgrade"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1749
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:15
 msgid "Don't delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1120
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:24
 msgid "Don't make changes"
 msgstr ""
 
 #. ($saveMode)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:317
 msgid "Don't recognize saveMode: |%1|. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1307
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1321
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1335
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:87
 msgid "Don't rename"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:547
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:33
 msgid "Don't use in an achievement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:683
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1345
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2465
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1595
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:766
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:57
 msgid "Done"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:159
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:365
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:8
 msgid "Download"
 msgstr ""
 
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($set->set_id)
 #. ($ver->{id} =~ s/_/ /gr)
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($set->set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:731
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:732
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:413
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:204
 msgid "Download %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:23
 msgid "Download Hardcopy"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:865
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:56
 msgid "Download PDF or TeX Hardcopy for Current Set"
 msgstr "PDF 다운로드 혹은 현재 문제집을 TeX Hardcopy"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:764
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:233
 msgid "Download PDF or TeX Hardcopy for Selected Tests"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($selected_set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:595
+#. (tag('span', dir => 'ltr', format_set_name_display($selected_set_id =~
+#. s/,v(\d+)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:58
 msgid "Download hardcopy of set %1 for %2?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:369
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:63
+msgid "Download/upload archived courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:46
 msgid "Download:"
 msgstr ""
 
@@ -2259,314 +3039,401 @@ msgstr ""
 msgid "Drop"
 msgstr "중단"
 
-#. ($self->formatDateTime($set->reduced_scoring_date, undef,
-#. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:107
-msgid "Due %1, after which reduced scoring is available until %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:100
+msgid "Drop student from the course"
 msgstr ""
 
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:310
 msgid "Due date %1 has passed."
 msgstr "종료일 %1이 지났습니다."
 
-#: /opt/webwork/webwork2/conf/defaults.config:2093
+#: /opt/webwork/webwork2/conf/defaults.config:2014
 msgid "E-Mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:315
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:261
 msgid "E-mail Instructor"
 msgstr "강사에게 이메일 전송"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2128
-msgid "E-mail addresses which can receive e-mail from a pg problem"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:2138
+#: /opt/webwork/webwork2/conf/defaults.config:2049
 msgid ""
 "E-mail feedback from students automatically sent to this permission level "
 "and higher"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2109
+#: /opt/webwork/webwork2/conf/defaults.config:2030
 msgid "E-mail verbosity level"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:357
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:43
 msgid "E-mail:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:35
 msgid "Earned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:71
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:158
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:334
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:417
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:547
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2743
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1628
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1186
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1203
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:257
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:479
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:6
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:53
 msgid "Edit"
 msgstr "편집"
 
-#. (CGI::a({ href => $basicInfoUrl }, $r->maketext('class list data')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:199
-msgid "Edit %1 for  %2 (%3) who has been assigned %4 sets."
+#. (link_to(maketext('class list data')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:47
+msgid "Edit %1 for %2 (%3) who has been assigned %4 sets."
 msgstr ""
 
-#. (CGI::a({ href => $editUsersAssignedToSetURL }, $r->maketext('individual
-#. versions')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2223
-msgid "Edit %1 of set %2."
+#. (link_to(maketext('individual user settings')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:162
+msgid "Edit %1 for set %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:6
 msgid "Edit Assigned Users"
 msgstr "배정된 사용자 편집하기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:40
 msgid "Edit Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1488
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:58
 msgid "Edit Evaluator"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:253
 msgid "Edit Header"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3053
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:18
 msgid "Edit Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2741
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:111
 msgid "Edit Problem"
 msgstr "문제 수정하기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:5
 msgid "Edit Problems"
 msgstr "여러 문제 수정하기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:583
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:3
 msgid "Edit Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:421
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:4
 msgid "Edit Set Data"
 msgstr "문제집 데이터 편집"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:171
+msgid "Edit Tags"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:30
 msgid "Edit Target Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1487
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:18
 msgid "Edit Users"
 msgstr ""
 
-#. ($user)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:207
-msgid "Edit data for %1"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:127
+msgid "Edit achievement evaluator"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1248
-msgid "Edit it"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:90
+msgid "Edit achievement information"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2192
-msgid "Edit set %1 data for ALL students assigned to this set."
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:65
+msgid ""
+"Edit achivements for the course. This link is only present if achievements "
+"are enabled for the course."
 msgstr ""
 
-#. (CGI::a({href=>$editSetLink},$setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2166
-msgid "Edit set %1 for this user."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:42
+msgid "Edit class list data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3393
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:39
 msgid ""
-"Edit the current value of the location description, if desired, then add and"
-" select addresses to delete, and then click the \"Take Action\" button to "
-"make all of your changes.  Or, click \"Manage Locations\" above to make no "
-"changes and return to the Manage Locations page."
+"Edit class roster data. Add students, edit student data, drop students from "
+"class, import students from a classlist, and give user professor privileges."
+" Access to individual homework sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:429
-msgid "Edit which achievements?"
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:70
+msgid "Edit data for %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:829
-msgid "Edit which sets?"
-msgstr "수정할 문제집은?"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:935
-msgid "Edit which users?"
-msgstr "수정할사용자는?"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:592
-msgid "Editing <strong>blank problem</strong> in file \"%1\""
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:46
+msgid ""
+"Edit homework sets for entire class. Change homework set due dates, create "
+"new sets from a set definition file, create new homework sets, make sets "
+"visible/invisible, score homework sets. Assign homework sets to the class."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:595
-msgid "Editing <strong>course information</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:219
+msgid "Edit it"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
-msgid "Editing <strong>hardcopy header</strong> file \"%1\""
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:135
+msgid "Edit set %1 for ALL students assigned to this set."
+msgstr ""
+
+#. (link_to(                                               $setID =>
+#. $c->systemLink(
+#. $setDetailPage, params => { effectiveUser => $user->user_id, editForUser =>
+#. $user->user_id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:106
+msgid "Edit set %1 for this user."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:95
+msgid "Edit set for %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:4
+msgid ""
+"Edit the current value of the location description, if desired, then add and"
+" select addresses to delete, and then click the \"Take Action\" button to "
+"make all of your changes.  Or, click \"Manage Locations\" above to make no "
+"changes and return to the Manage Locations page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:2
+msgid "Edit which achievements?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:2
+msgid "Edit which sets?"
+msgstr "수정할 문제집은?"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:2
+msgid "Edit which users?"
+msgstr "수정할사용자는?"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:31
+msgid "Editing <strong>course information</strong> file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:30
+msgid "Editing <strong>hardcopy header</strong> file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:28
+msgid "Editing <strong>new problem</strong> template."
+msgstr ""
+
+#. ($c->{prettyProblemNumber},                             tag('span', dir =>
+#. 'ltr', format_set_name_display($fullSetName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:45
+msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:596
-msgid "Editing <strong>options information</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:29
+msgid "Editing <strong>set header</strong> file \"%1\"."
 msgstr ""
 
-#. ($prettyProblemNumber,                  CGI::span({ dir => 'ltr' },
-#. format_set_name_display($fullSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:605
-msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:33
+msgid "Editing <strong>unassigned problem</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:593
-msgid "Editing <strong>set header</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:32
+msgid "Editing <strong>unknown file type</strong> in file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:598
-msgid "Editing <strong>unassigned problem</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:19
+msgid "Editing Modes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:597
-msgid "Editing <strong>unknown file type</strong> in file \"%1\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:140
+msgid "Editing Problems"
 msgstr ""
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:209
-msgid "Editing achievement in file '%1'"
+#. ($c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:16
+msgid "Editing achievement in file \"%1\""
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:22
+msgid "Editing for all students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:23
+msgid "Editing for one student or a proper subset of all students"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3390
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:1
 msgid "Editing location %1"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display("$setID$vermsg")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2182
-msgid "Editing problem set %1 data for these individual students: %2"
+#. (tag(                                           'strong',
+#. dir => 'ltr',
+#. format_set_name_display($setID . ($editingSetVersion ?
+#. ",v$editingSetVersion" : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:123
+msgid "Editing problem set %1 for these students: %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:315
 msgid "Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:669
-msgid "Editor rows:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1668
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:229
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:53
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:68
 msgid "Email"
 msgstr "이메일"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:32
 msgid "Email Address"
 msgstr "이메일 주소"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:817
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:170
 msgid "Email Body:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:17
+msgid "Email Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:339
 msgid "Email Instructor On Failed Attempt"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2003
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:28
 msgid "Email Link"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:789
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:112
 msgid "Email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1807
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1832
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:311
+msgid "Email body is empty. No message sent. "
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:994
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_email.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_form.html.ep:24
 msgid "Email instructor"
 msgstr "강사에게 이메일 전송"
 
-#. (scalar(@{ $self->{ra_send_to} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:454
+#. (scalar(@{ $c->{ra_send_to} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:27
+msgid ""
+"Email is being sent to %quant(%1,recipient). You will be notified by email "
+"when the task is completed.  This may take several minutes if the class is "
+"large."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:13
+msgid "Email:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:26
 msgid ""
-"Email is being sent to %quant(%1,recipient). You will be notified by email\n"
-"\t\t\t\twhen the task is completed.  This may take several minutes if the class is\n"
-"\t\t\t\tlarge."
+"Emails can contain personalized data, such as name, section, or status.  "
+"Click \"List of insertable macros\" for a full list available variables.  "
+"Additional personal data can be included by using a merge file.  A merge "
+"file is a CSV file located in the [Scoring] directory in which the first "
+"column is the student id, followed by additional data (such as student "
+"grades).  This data is identified by which column it is in, for instance if "
+"the scores where in the 4th column of the merge file, insert them into an "
+"email using the variable $COL[4].  The \"Scoring Tools\" page can export "
+"grades into a CSV that can be used as a merge file.  Upload customized merge"
+" files with the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:11
 msgid "Emails to be sent to the following:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1704
+#: /opt/webwork/webwork2/conf/defaults.config:1606
 msgid "Enable Achievement Rewards"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1723
+#: /opt/webwork/webwork2/conf/defaults.config:1625
 msgid "Enable Conditional Release"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1689
+#: /opt/webwork/webwork2/conf/defaults.config:1591
 msgid "Enable Course Achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1645
+#: /opt/webwork/webwork2/conf/defaults.config:1547
 msgid "Enable Progress Bar and current problem highlighting"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1734
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:585
+#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Enable Reduced Scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1799
+#: /opt/webwork/webwork2/conf/defaults.config:1701
 msgid "Enable Show Me Another button"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:156
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:24
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:92
 msgid "Enable Spell Checking"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1844
+#: /opt/webwork/webwork2/conf/defaults.config:1746
 msgid "Enable periodic re-randomization of problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:416
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:29
 msgid ""
 "Enable reduced scoring for a homework set.  This will allow you to submit "
 "answers for partial credit for 24 hours after the close date."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1461
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1483
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:20
 msgid "Enabled"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1846
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:58
+msgid "Enabled:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1748
 msgid ""
 "Enables periodic re-randomization of problems after a given number of "
 "attempts. Student would have to click Request New Version to obtain new "
 "version of the problem and to continue working on the problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1725
+#: /opt/webwork/webwork2/conf/defaults.config:1627
 msgid ""
 "Enables the use of the conditional release system.  To use conditional "
 "release you need to specify a list of set names on the Problem Set Detail "
@@ -2575,14 +3442,14 @@ msgid ""
 " sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1801
+#: /opt/webwork/webwork2/conf/defaults.config:1703
 msgid ""
 "Enables use of the Show Me Another button, which offers the student a newly-"
 "seeded version of the current problem, complete with solution (if it exists "
 "for that problem)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:662
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:163
 msgid "End"
 msgstr ""
 
@@ -2590,538 +3457,662 @@ msgstr ""
 msgid "Enrolled"
 msgstr "등록됨"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:788
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:111
 msgid "Enrolled, Drop, etc."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:830
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:859
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:888
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:917
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:128
 msgid "Enrollment Status"
 msgstr "등록 현황"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:21
 msgid "Enter filename below"
 msgstr "아래에 파일명을 입력해주세요"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:20
 msgid "Enter filenames below"
 msgstr "아래에 파일명을 입력해주세요"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:19
 msgid ""
 "Enter information below for students you wish to add. Each student's "
 "password will initially be set to their student ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1997
+#: /opt/webwork/webwork2/conf/defaults.config:1899
 msgid ""
 "Enter one of the allowed display mode types above.  See 'display modes "
 "entry' for descriptions."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:297
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:34
+msgid ""
+"Enter the details of the course instructor to be added when the course is "
+"created.  This user will also be added to the admin course with the username"
+" \"userID_courseID\" so you can manage and email the instructors of the "
+"courses on the server."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:284
 msgid "Entered"
 msgstr "접속됨"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:85
-msgid "Entered student:"
-msgstr ""
-
-#. ($display_sort_method_name{$primary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:698
+#. ($display_sort_method_name{$primary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:98
 msgid "Entries are sorted by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:247
 msgid "Equation Display"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:61
+msgid "Equation Editor"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1516
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1460
 msgid "Error adding set-level proctor: %1"
 msgstr ""
 
+#. ($fromPath, $toPath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:664
+msgid "Error copying %1 to %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:14
+msgid "Error details"
+msgstr ""
+
+#. ($filePath, stash('podError')
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:27
+msgid "Error generating POD for file %1: %2"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1492
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1437
 msgid ""
 "Error getting old set-proctor password from the database: %1.  No update to "
 "the password was done."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:31
 msgid "Error message:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2235
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:12
 msgid "Error messages"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1616
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:754
 msgid "Error: Answer date must come after close date in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:747
 msgid "Error: Close date must come after open date in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1634
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:778
 msgid ""
 "Error: Reduced scoring date must come between the open date and close date "
 "in set %1"
 msgstr ""
 
-#. ($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2067
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:7
 msgid "Error: The original file %1 cannot be read."
 msgstr ""
 
 #. ($setID)
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1240
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:738
 msgid "Error: answer date cannot be more than 10 years from now in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1235
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:733
 msgid "Error: close date cannot be more than 10 years from now in set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:630
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:234
 msgid "Error: no file data was submitted!"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1599
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:728
 msgid "Error: open date cannot be more than 10 years from now in set %1"
 msgstr ""
 
-#. ($problem_desc, $problem_name, CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1404
+#. ($problem_desc, $problem_name, $c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1210
 msgid ""
 "Errors encountered while processing %1. This %2 has been omitted from the "
 "hardcopy. Error text: %3"
 msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3832
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:8
+msgid "Errors occured while generating hardcopy:"
+msgstr ""
+
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2128
 msgid ""
 "Errors occured while hiding the courses listed below when attempting to "
 "create the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3920
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2197
 msgid ""
 "Errors occured while unhiding the courses listed below when attempting "
 "delete the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1468
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:28
 msgid "Evaluator File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3839
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:76
+msgid "Evaluator File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:28
+msgid "Evaluator Variables"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2143
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
-"hidden."
+"Except for the errors listed above, all selected courses are already hidden."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3904
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2212
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
+"Except for the errors listed above, all selected courses are already "
 "unhidden."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3456
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:39
 msgid ""
 "Existing addresses for the location are given in the scrolling list below.  "
 "Select addresses from the list to delete them:"
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2281
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1460
 msgid "Existing file %1 could not be backed up and was lost."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2514
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:354
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:65
 msgid "Expand All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:364
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:78
 msgid "Expand All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2667
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:418
 msgid "Expand Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2792
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:574
 msgid "Expand Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:74
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:89
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:67
+msgid ""
+"Expand problem details that have been collapsed. Note that the details of a "
+"single problem can be expanded by clicking on the down arrow to the right of"
+" the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:71
 msgid "Export"
 msgstr "저장 후 내보내기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1098
-msgid "Export selected achievements."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:113
+msgid "Export achievement data"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_export_form.html.ep:1
+msgid "Export selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1267
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:17
 msgid "Export to what kind of file?"
 msgstr "저장 후 내보낼 파일 종류?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:2
 msgid "Export which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1245
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:5
 msgid "Export which users?"
 msgstr "저장 후 내보낼 사용자는?"
 
 #. ($FileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1151
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:591
 msgid "Exported achievements to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1616
-msgid "Extend the close date for which Gateway?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:48
+msgid "Extend the close date for which test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1573
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:148
+msgid "Extend the number of attempts allowed a student on a given problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:28
 msgid ""
-"Extends the close date of a gateway test by 24 hours. Note: The test must "
-"still be open for this to work."
+"Extends the close date of a test by 24 hours. Note: The test must still be "
+"open for this to work."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "FIRST NAME"
 msgstr "이름"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Failed to add user:"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:416
 msgid "Failed to create new achievement: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:373
 msgid "Failed to create new achievement: no achievement ID specified!"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:573
 msgid "Failed to create new set: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1158
-msgid "Failed to create new set: no set name specified!"
-msgstr "새로운 문제집 생성 실패: 문제집 이름 없음!"
+#. ($newSetID =~ s/_/ /gr)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:482
+msgid ""
+"Failed to create new set: Invalid characters in set name \"%1\". A set name "
+"may only contain letters, numbers, hyphens, periods, and spaces."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:474
+msgid "Failed to create new set: No set name specified."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1155
-msgid "Failed to create new set: set name cannot exceed 100 characters."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:469
+msgid "Failed to create new set: Set name cannot exceed 100 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:396
 msgid ""
 "Failed to duplicate achievement: no achievement selected for duplication!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:530
 msgid "Failed to duplicate set: no set selected for duplication!"
 msgstr "문제집 복사 실패: 복사할 문제집이 선택되지 않았습니다!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:74
-msgid "Failed to enter student:"
+#. ($@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:67
+msgid "Failed to generate course archive: %1"
 msgstr ""
 
 #. ($scoreFilePath)
 #. ($filePath)
 #. ($FilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1125
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:649
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:955
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2402
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1584
 msgid "Failed to open %1"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:227
 msgid "Failed to save: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#. ($_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:253
+msgid "Failed to send message: %1"
+msgstr ""
+
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:23
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:36
 msgid "False"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1919
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:63
 msgid "Feature exhausted for this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:200
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:23
+msgid "Features:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:252
 msgid "Feedback"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2159
+#: /opt/webwork/webwork2/conf/defaults.config:2070
 msgid "Feedback by Section."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:234
 msgid "FeedbackMessage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1177
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2113
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2284
 msgid "Field is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2109
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2286
 msgid "Field missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1175
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2111
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4290
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
 msgid "Field missing in schema"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:599
-msgid "File '%1' exists.  File not saved.  No changes have been made."
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:266
+msgid "File \"%1\" exists.  File not saved.  No changes have been made."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1926
-msgid ""
-"File '%1' exists. File not saved. No changes have been made.  You can change"
-" the file path for this problem manually from the 'Hmwk Sets Editor' page"
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1036
+msgid "File \"%1\" exists. File not saved. No changes have been made."
 msgstr ""
 
-#. ($file,$!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:796
-msgid "File '%1' not removed: %2"
-msgstr "파일 '%1'이 제거되지 않았습니다: %2"
+#. ($file, $!)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:333
+msgid "File \"%1\" not removed: %2"
+msgstr ""
 
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:795
-msgid "File '%1' successfully removed"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+msgid "File \"%1\" successfully removed"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1066
-msgid "File '%1' uploaded successfully"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:522
+msgid "File \"%1\" uploaded successfully"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:476
 msgid "File <b>%1</b> already exists. Overwrite it, or rename it as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:364
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:55
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:70
 msgid "File Manager"
 msgstr "파일 매니저"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:628
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:17
+msgid "File Manager Help"
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:541
+msgid "File not saved. Failed to open \"%1\" for writing."
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:528
+msgid ""
+"File not saved. The file \"%1\" is not contained in the templates directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:921
+msgid ""
+"File not saved. The file name for this problem does not match the file name "
+"the editor was opened with. The problem set may have changed. Please reopen "
+"this file from the homework sets editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:228
 msgid "File saved"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:733
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:272
 msgid "File successfully copied"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:758
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:295
 msgid "File successfully renamed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:29
 msgid "Filename"
 msgstr "파일명"
 
-#. ($extension,$location)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1296
-msgid "Files with extension '.%1' usually belong in '%2'"
+#. ($extension, $location)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:699
+msgid "Files with extension \".%1\" usually belong in \"%2\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:20
+msgid ""
+"Fill out the form below to add, edit, or delete locations.  Locations are "
+"used to restrict access to sets based on ip address.  Locations are "
+"configured here in the administration course, then used in a normal course."
+"  When configuring a set to use a restricted ip address, the instructor can "
+"choose to either restrict access to the location or deny access from a "
+"location, which are identified by their name.  Instructors can select "
+"multiple locations to restrict access to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:78
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:47
 msgid "Filter"
 msgstr ""
 
 #. ($recitation)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1184
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1112
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1420
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:913
 msgid "Filter by recitation %1"
 msgstr ""
 
 #. ($section)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1180
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1416
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:910
 msgid "Filter by section %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:733
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:31
 msgid "Filter by what text?"
 msgstr "어떤 문자열을 필터하시겠습니까?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:151
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:17
 msgid "Filter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:749
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:137
 msgid "First"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:593
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1992
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:827
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:856
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:885
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:914
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:87
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:21
 msgid "First Name"
 msgstr "이름"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:107
 msgid "First name"
 msgstr "이름"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:178
 msgid ""
 "For security reasons, you cannot specify a message file from a directory "
 "higher than the email directory (you can't use ../blah/blah for example). "
 "Please specify a different file or move the needed file to the email "
-"directory"
+"directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:30
+msgid "Force editor to RTL"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2928
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:674
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:101
 msgid "Force problems to be numbered consecutively from one"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:409
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:35
+msgid "Form Elements Present on the Page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:75
 msgid "Format"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2096
+#: /opt/webwork/webwork2/conf/defaults.config:2017
 msgid "Format for the subject line in feedback e-mails"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:172
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:133
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:10
 msgid "Format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:12
 msgid "Found no directories containing problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1112
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:43
 msgid "From This Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:318
 msgid "From field must contain one valid email address."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:340
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:621
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:20
+msgid ""
+"From this page you can <strong>add new students</strong>, "
+"<strong>edit</strong> class list data (name, email address, recitation, "
+"section, permission level, and enrollment status), <strong>change "
+"passwords</strong>, and <strong>export</strong> (save) class lists for back-"
+"up or use in another course. You can also delete students from the class "
+"roster, but this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:34
 msgid "From:"
 msgstr "From:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:59
 msgid "GLOBAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1512
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1619
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1728
-msgid "Gateway Name"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:210
-msgid "Gateway Quiz %2"
-msgstr "게이트웨이 퀴즈 %2"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:853
-msgid "Gateway parameters"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/conf/defaults.config:1427
 msgid "General"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2305
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:201
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:30
 msgid "General Information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:745
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:669
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:670
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:222
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:116
+msgid "General Page Information"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:121
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:166
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:167
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:113
 msgid "Generate Hardcopy"
 msgstr "Hardcopy 생성"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:262
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:73
 msgid "Generate Hardcopy for Selected Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:744
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:115
+msgid ""
+"Generate a hardcopy of the problem being edited. This does not change the "
+"permanent file on the disk. You can generate a hardcopy for different "
+"versions of the same problem by changing the seed. You can also change the "
+"format to \"PDF\" or \"TeX Source\". If \"PDF\" is selected, then a PDF file"
+" will be generated for download, unless there are errors. If errors occur or"
+" \"TeX Source\" is selected, then a zip file will be generated for download "
+"that contains the TeX source file and resources needed for generating the "
+"PDF file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:20
+msgid ""
+"Generate hardcopies of assignments in PDF or latex format. To produce a "
+"hardcopy, one selects the users on the left and the sets on the right. All "
+"users and sets are listed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:170
 msgid "Generate hardcopy for selected sets and selected users"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:184
-#: /opt/webwork/pg/macros/problemRandomize.pl:185
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:186
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:187
 msgid "Get a new version of this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:986
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:2
 msgid "Give new password to which users?"
 msgstr "새 비밀번호를 부여할 사용자는?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1063
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:27
 msgid "Gives full credit on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1180
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:27
 msgid "Gives full credit on every problem in a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:846
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:27
 msgid "Gives half credit on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:27
 msgid "Gives half credit on every problem in a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:62
 msgid "Global Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1422
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:76
 msgid "Global Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:49
 msgid "Global Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:51
 msgid ""
 "Global data on problem usage is contributed by many institutions using "
 "WeBWorK all over the world. The Usage figure is the total number of  "
@@ -3131,198 +4122,324 @@ msgid ""
 msgstr ""
 
 #. ($problemID, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1549
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1489
 msgid "Global problem %1 for set %2 not found."
 msgstr ""
 
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:334
+#. ($c->{prettyID}, $c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:378
+msgid "Global problem %1 not found for set %2."
+msgstr ""
+
+#. ($c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:142
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:372
 msgid "Global set %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2093
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:77
 msgid "Global set data will be shown instead of user specific data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:28
 msgid "Go"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:483
 msgid "Go back to Part 1"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:291
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
-#: /opt/webwork/pg/macros/compoundProblem.pl:491
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:293
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:498
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:512
 msgid "Go on to next part"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2651
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:544
 msgid "Grade"
 msgstr "채점"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2649
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:383
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:970
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:541
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:75
 msgid "Grade Problem"
 msgstr "문제 채점"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2446
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:651
 msgid "Grade Test"
 msgstr "시험지 채점"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:148
+msgid "Grade of Active Students"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:55
 msgid "Grade passback mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:837
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:38
 msgid "Grader"
 msgstr "채점자"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:236
 msgid "Grades"
 msgstr "성적"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:110
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:17
+msgid "Grades Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:115
 msgid "Grades have been saved for all current users."
 msgstr "모든 현재 사용자에 대한 점수가 저장되었습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:221
-msgid "Grading assignment:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:28
+msgid "Grading Assignment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1062
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:152
+msgid "Grading Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:26
 msgid "Greater Rod of Revelation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1179
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:26
 msgid "Greater Tome of Enlightenment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:285
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:50
+msgid ""
+"Groups types of achievements. The \"level\" and \"secret\" categories are "
+"special (described above), and categories can be used to create achievement "
+"chains."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:74
 msgid "Guest Login"
 msgstr "청강생 로그인"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2251
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:86
+msgid "Guest:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:33
 msgid "HTTP Headers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:682
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:35
+msgid "Hardcopy Format"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:115
 msgid "Hardcopy Format:"
 msgstr "Hardcopy 포맷:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:270
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:285
 msgid "Hardcopy Generator"
 msgstr "Hardcopy Generator"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:101
 msgid "Hardcopy Header"
 msgstr "Hardcopy Header"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1623
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:724
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:324
+msgid "Hardcopy Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:17
+msgid "Hardcopy Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:153
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:44
 msgid "Hardcopy Theme"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:408
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:427
 msgid "Hardcopy will always print the original version of the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:31
 msgid "Headers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1048
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:296
 msgid "Help"
 msgstr "도움말"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:797
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:170
 msgid "Help Icon"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:542
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:30
+msgid ""
+"Here is a list of the variables the evaluator has access to. Unless "
+"indicated, changes to the variables will not be saved.  Evaluators are run "
+"in the same order they are listed on the achievement editor page and are "
+"only run if the achievement has not been earned. Keep this in mind when "
+"using persistent global data."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:507
 msgid "Here is a new version of your problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:914
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:42
 msgid "Hidden"
 msgstr "숨김"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:347
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:62
 msgid "Hide All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3663
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3718
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3760
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:384
-msgid "Hide Courses"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:17
+msgid "Hide Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:428
-msgid "Hide Hints"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:57
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:44
+msgid "Hide Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:477
 msgid "Hide Hints from Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1566
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:63
+msgid "Hide all rendered problems on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:252
 msgid "Hide this problem"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1523
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1524
 msgid "Hint:"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1522
 msgid "Hint: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:658
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1771
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:99
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:51
 msgid "Hints"
 msgstr "힌트"
 
 # Hmwk is short for Homework
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:364
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:327
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:44
 msgid "Hmwk Sets Editor"
 msgstr "문제집 에디터"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:779
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:80
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:108
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:19
 msgid "Homework Sets"
 msgstr "문제집"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:38
 msgid "Homework Totals"
 msgstr "과제 총점"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1432
-msgid "I couldn't find the file [ACHEVDIR]/surprise_message.txt!"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:17
+msgid "Homwork Sets Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:88
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:31
+msgid "How to:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:36
+msgid "I couldn't find the file [ACHIEVEMENT_DIR]/surprise_message.txt!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1451
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:9
 msgid "Icon"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:29
 msgid "Icon File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:612
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:80
+msgid "Icon File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:24
+msgid ""
+"If \"PDF\" is selected, then a PDF file will be generated for download, "
+"unless there are errors.  If errors occur generating a PDF file or \"TeX "
+"Source\" is selected then a zip file will be generated for download that "
+"contains the TeX source file and resources needed for generating the PDF "
+"file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:37
+msgid ""
+"If \"TeX Source\" is selected, a zip file containing a TeX file and other "
+"files needed to generate a PDF hardcopy will be produced. If \"Adobe PDF\" "
+"is selected then only a PDF file will be produced."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:84
 msgid ""
 "If a password field is left blank, the student's current password will be "
 "maintained."
 msgstr "비밀번호를 공백으로 두면, 학생의 현재 비밀번호로 유지됩니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:42
+msgid ""
+"If selected, the file path of the problem source will be printed in the "
+"output."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:38
+msgid ""
+"If selected, this adds spaces between the fields to align the commas, which "
+"makes the columns easy to read when in text form but it can confuse some "
+"spreadsheet applications since the extra spaces violate the csv standard "
+"(although Excel handles them with no problem). This will give a visual form "
+"of the CSV file that is easy to read on the page. If you want a reliable "
+".csv file for use in any spreadsheet application unclick the \"Pad Fields\" "
+"option. You can download the .csv file immediately by clicking on the link "
+"with the filename chosen above, or you can download it using the \"File "
+"Manager\" from the scoring directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:148
+msgid ""
+"If the original problem can not be edited than the path name must be changed"
+" in order to be allowed to save the problem. Adding \"local/\" to the "
+"beginning of the original path is the default solution. All locally created "
+"and edited files will then appear in a subdirectory named \"local\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:513
 msgid ""
 "If this flag is set then this problem will count towards the grade of its "
 "parent problem.  In general the adjusted status on a problem is the larger "
@@ -3330,20 +4447,28 @@ msgid ""
 "problems which have this flag enabled."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
 msgid ""
 "If this is enabled then instructors with the ability to receive feedback "
 "emails will be notified whenever a student runs out of attempts on a problem"
-" and its children without receiving an adjusted status of 100%."
+" and its children  without receiving an adjusted status of 100%."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:334
 msgid ""
 "If this is enabled then students will be unable to attempt a problem until "
 "they have completed all of the previous problems, and their child problems "
 "if necessary."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:57
+msgid ""
+"If this is selected, a success index is listed in each csv file. The success"
+" index is a number assigned on the basis of the number of incorrect attempts"
+" (roughly equivalent to 1/the number of attempts) which seems to correlate "
+"with the relative difficulty the student had with the problem."
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:47
 msgid ""
 "If this is set, all users (including the instructor) must enter the WeBWorK "
@@ -3351,8 +4476,8 @@ msgid ""
 "they receive a message directing them back to the LMS."
 msgstr ""
 
-#. (CGI::b($r->maketext("Remember Me")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:201
+#. (tag('strong', maketext('Remember Me')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:33
 msgid ""
 "If you check %1 your login information will be remembered by the browser you"
 " are using, allowing you to visit WeBWorK pages without typing your user "
@@ -3361,273 +4486,419 @@ msgid ""
 " have direct control."
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:407
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:154
+msgid ""
+"If you click on the \"Grade Problem\" icon to the right of the problem "
+"number, then the problem will open in the manual problem grader. This page "
+"shows the rendered problem and lists all students assigned to the set and "
+"the last answer the students entered for the problem. You can then change "
+"the recorded scores for students on this problem and provide instructor "
+"feedback comments."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:148
+msgid ""
+"If you click on the \"Open in New Window\" icon to the right of the problem "
+"number, then the problem will open in the actual homework set in a new tab "
+"or window."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:425
 msgid "If you come back to it later, it may revert to its original version."
 msgstr ""
 
+#. ('<code>report_grades_data.csv</code>', '<code>report_grade.msg</code>',
+#. '<code>$COL</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:80
+msgid ""
+"If you upload your file on the web with the name: %1 and also create an "
+"email message with the name %2 with the approriate %3 variables then not "
+"only can you email the message with the embedded grades to the students, but"
+" files with those exact names are automatically appended to the \"Grades\" "
+"page seen by the students."
+msgstr ""
+
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:798
-msgid "Illegal file '%1' specified"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:337
+msgid "Illegal file \"%1\" specified"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1445
 msgid "Illegal filename contains '..'"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:73
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:63
 msgid "Import"
 msgstr "가져오기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1291
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:65
+msgid ""
+"Import a single set or multiple sets from a set definition file. (Use the "
+"\"File Manager\" to upload/download set definition files.) The \"Shift "
+"Dates...\" option is useful for problem sets that were used from other "
+"courses and will shift all of the dates."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:16
 msgid "Import from where?"
 msgstr "어디서 가져오겠습니까?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1270
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:5
 msgid "Import how many sets?"
 msgstr "가져올 문제집 개수는?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:31
 msgid "Import sets with names"
 msgstr "새로운 이름으로 문제집 가져오기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:5
 msgid "Import users from what file?"
 msgstr "어떤 파일에서 사용자를 가져오겠습니까?"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:99
+msgid "Import/export achievements"
+msgstr ""
+
 #. ($count)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:516
 msgid "Imported %quant(%1,achievement)"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:25
+msgid ""
+"In both cases, one can select the sort field, the format of the display "
+"list, and the filter. \"Change Display Settings\" must be clicked to update "
+"the list."
+msgstr ""
+
 #. ($total_inprogress, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1019
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:28
 msgid "In progress: %1/%2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:47
 msgid "Inactive"
 msgstr "비활성화"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1601
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:51
+msgid "Inactive Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1503
 msgid "Inactivity time before a user is required to login again"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:42
 msgid "Include Contrib"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:35
 msgid "Include OPL"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:32
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:55
 msgid "Include Success Index"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:62
 msgid "Include percentage grades columns for all sets"
 msgstr "모든 문제집에 대한 백분율 등급 열 포함"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:471
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:302
 msgid "Incorrect"
 msgstr "오답"
 
 #. ($total_incorrect, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1033
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:36
 msgid "Incorrect: %1/%2"
 msgstr "오답: %1/%2"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:26
+msgid ""
+"Indicates the number of problems in the set. Clicking on the link opens the "
+"set detail page which allows you to modify set parameters, edit set headers,"
+" and change parameters of problems in the set such as the number of allowed "
+"attempts or the weight (credit value). You can also add, remove, view, edit,"
+" and reorder the problems in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:141
+msgid "Individual Problem Results"
+msgstr ""
+
 # Short for Initial
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:41
 msgid "Init"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:502
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:35
 msgid "Institution"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2344
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:560
 msgid "Instructor Comment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1494
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1306
 msgid "Instructor Feedback:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:311
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:17
+msgid "Instructor Links Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:29
 msgid "Instructor Tools"
 msgstr "강사 전용 도구"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1228
-msgid "Instructor solution preview: show the student solution after due date."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:17
+msgid "Instructor Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:90
+msgid "Instructor:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:377
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:326
 msgid "Invalid Reply-to address."
 msgstr ""
 
 #. ($output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:187
 msgid ""
-"Invalid file name. The file name \"%1\" does not have a \".msg\" extension "
-"All email file names must end in the extension \".msg\" choose a file name "
-"with a \".msg\" extension. The message was not saved."
+"Invalid file name \"%1\". All email file names must end with the \".msg\" "
+"extension.  Choose a file name with the \".msg\" extension. The message was "
+"not saved."
 msgstr ""
 
 #. ($headerType)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1951
 msgid "Invalid headerType %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:177
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/XMLRPC.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:173
 msgid "Invalid user ID or password."
 msgstr "사용자 ID나 비밀번호에 오류가 있습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2244
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:34
+msgid ""
+"It is important that students enter an email address or they will not "
+"recieve any of the important emails sent by the instructor. The email "
+"address will only be present on the page if the user has permission to "
+"change the email address."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:20
+msgid "It lists the homework problem sets available for the students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:472
 msgid "Jump to Problem:"
 msgstr "다음 문제로 이동:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:867
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:939
 msgid "Just-In-Time parameters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:130
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:85
+msgid "Key Map"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:14
 msgid "Key Map:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:93
 msgid "Keywords:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "LAST NAME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1477
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:119
 msgid "LOCAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:100
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:103
 msgid "LTI"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1548
-msgid "Language (refresh page after saving changes to reveal new language.)"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:25
+msgid "LTI Grade Mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:758
-msgid "Last"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:460
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:75
+msgid "LTI Grade Update"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:386
-msgid "Last Answer"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:17
+msgid "LTI Grade Update Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:604
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:231
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2001
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:828
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:857
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:915
-msgid "Last Name"
-msgstr "성"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:792
-msgid "Last column of merge file"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:16
+msgid "LTI grade passback is not enabled for this course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:785
-msgid "Last name"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:63
+msgid "LTI update of all users and sets queued."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:242
-msgid "Latest Answers"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:64
+msgid "LTI update of all users queued."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1603
-msgid ""
-"Length of time, in seconds, a user has to be inactive before he is required "
-"to login again.<p>This value should be entered as a number, so as 3600 "
-"instead of 60*60 for one hour"
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:58
+msgid "LTI update of set %1 queued."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:845
-msgid "Lesser Rod of Revelation"
+#. ($userID, $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:56
+msgid "LTI update of user %1 and set %2 queued."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:965
-msgid "Lesser Tome of Enlightenment"
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:60
+msgid "LTI update of user %1 queued."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:141
-msgid "Level Progress:"
+#: /opt/webwork/webwork2/conf/defaults.config:1450
+msgid "Language (refresh page after saving changes to reveal new language.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:881
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:140
+msgid "Last"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:460
+msgid "Last Answer"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:31
+msgid "Last Full Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:25
+msgid "Last Name"
+msgstr "성"
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:115
+msgid "Last column of merge file"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:108
+msgid "Last name"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:237
+msgid "Latest Answers"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1505
+msgid ""
+"Length of time, in seconds, a user has to be inactive before he is required "
+"to login again. This value should be entered as a number, so as 3600 instead"
+" of 60*60 for one hour."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:26
+msgid "Lesser Rod of Revelation"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:26
+msgid "Lesser Tome of Enlightenment"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:15
+msgid "Level Progress:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:77
 msgid "Level:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:912
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2060
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:433
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:17
+msgid "Library Broswer Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:359
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:52
 msgid "Library Browser"
 msgstr "라이브러리 브라우저"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1977
-msgid "List of display modes made available to students"
+#. ($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:30
+msgid "Link to Edit Page for %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2130
-msgid ""
-"List of e-mail addresses to which e-mail can be sent by a problem. "
-"Professors need to be added to this list if questionaires are used, or other"
-" WeBWorK problems which send e-mail as part of their answer mechanism."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:25
+msgid "Links to pages that give information about writing problems:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1879
+msgid "List of display modes made available to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:759
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:774
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:89
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:96
 msgid "List of insertable macros"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1826
+#: /opt/webwork/webwork2/conf/defaults.config:1728
 msgid "List of options for Show Me Another button"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1713
+#: /opt/webwork/webwork2/conf/defaults.config:1615
 msgid "List of sets excluded from achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1483
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:56
+msgid "Live equation rendering"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:144
+msgid "Loading..."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:122
 msgid "Local Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:41
 msgid "Local Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1504
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:136
 msgid "Local Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:105
 msgid "Local Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1467
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:114
 msgid ""
 "Local data is generated when your systems admin runs the script update-OPL-"
 "statistics."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1460
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:107
 msgid ""
 "Local data on problem usage is generated and maintained by your institution."
 " The Usage figure is the total number of local individuals who have attemped"
@@ -3636,42 +4907,61 @@ msgid ""
 "likely bug free."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:115
 msgid "Location"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3501
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1854
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1890
 msgid ""
 "Location %1 does not exist in the WeBWorK database.  Please check your input"
 " (perhaps you need to reload the location management page?)."
 msgstr ""
 
 #. ($locationID, join(', ', @addresses)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1742
 msgid "Location %1 has been created, with addresses %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3353
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1798
 msgid "Location deletion requires confirmation."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3409
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:43
 msgid "Location description:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3089
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:37
 msgid "Location name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:159
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:27
+msgid ""
+"Locations are a list of ip addresses.  Ip addresses can be a single address "
+"(e.g. 192.168.1.101), a range of ip address (e.g. "
+"192.168.1.101-192.168.1.150), or an ip address mask (e.g. 192.168.1.0/24). "
+"Enter one ip address per line, using as many lines as needed for each "
+"location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:32
+msgid ""
+"Locations are edited by adding new ip addresses to the location, or deleting"
+" existing address.  You must select the confirm checkbox when deleting a "
+"location, and this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:43
+msgid "Locations of files:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:18
 msgid "Log In Again"
 msgstr "다시 로그인해주세요"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1124
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:11
 msgid "Log Out"
 msgstr "로그아웃"
 
@@ -3679,368 +4969,456 @@ msgstr "로그아웃"
 #. ($rename_oldCourseID)
 #. ($rename_newCourseID)
 #. ($new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1458
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1541
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2666
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:913
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:704
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:780
 msgid "Log into %1"
 msgstr ""
 
-#. (HTML::Entities::encode_entities($prettyUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1122
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1130
+#. ($userName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:9
 msgid "Logged in as %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:790
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:181
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:187
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:113
 msgid "Login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:58
 msgid "Login Info"
 msgstr "로그인 정보"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:187
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:815
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1980
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:291
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:855
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:884
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:913
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:36
 msgid "Login Name"
 msgstr "로그인 이름"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:18
 msgid "Login Status"
 msgstr "로그인 상태"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:6
+msgid "Login:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:225
 msgid "Logout"
 msgstr "로그아웃"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Macro"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:763
-msgid "Main Menu"
-msgstr "메뉴"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:97
+msgid ""
+"Macro (\".pl\") files containing additional functionality for your course "
+"can be stored here."
+msgstr ""
+
+#. ($filePath)
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:29
+msgid "Macro file %1 not found."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:369
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:46
 msgid "Make Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:27
 msgid "Make changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1115
-msgid "Make these changes in  course:"
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:15
+msgid "Make these changes in course: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:137
+msgid ""
+"Makes a new copy of the file you are editing at the location relative to the"
+" course's templates ([TMPL]) directory. You may choose to replace the "
+"current problem in the current set, append to the end to then end of the "
+"current set as a new problem, or create a problem that is not attached to a "
+"problem set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3040
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:1
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:46
 msgid "Manage Locations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:748
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:394
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:17
+msgid "Manage Locations Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:20
+msgid ""
+"Manage achievements for the course.  The actions allow one to edit, assign, "
+"import, export, score, create, or delete achievements.  The action form is "
+"at the top to select the desired action and options to perform when the "
+"submit button is pressed.  Below the action form is the list of all the "
+"achievements, ordered by their achievement \"Number\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:56
+msgid "Manage administration course files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:50
+msgid ""
+"Manage instructors.  When instructors are added to a newly created course, "
+"they are also added to the admin course with username \"userID_courseID\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:344
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:192
 msgid "Manual Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:233
-msgid "Mark All"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:17
+msgid "Manual Grader Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr',
+#. format_set_name_display($c->stash->{set}->set_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:205
+msgid "Manual Grader for %1: Problem %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:77
+msgid ""
+"Manually initiate an LTI grade passback for selected sets or users. This "
+"link is only visible if LTI grade passback is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:175
+msgid ""
+"Many of these editing activities can also be done more quickly from the "
+"\"Instructor Tools\" page where students and homework sets can be selected "
+"simultaneously. The \"Instructor Tools\" page is useful for quick editing of"
+" one or two students. The initial setup of the class can be done best from "
+"this page. Importing and exporting class lists can only be done from this "
+"page. Deleting students can only be done from this page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:120
 msgid "Mark Correct"
 msgstr "정답 처리"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2822
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:598
 msgid "Mark Correct?"
 msgstr "정답 처리?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:681
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:19
 msgid "Match on what? (separate multiple IDs with commas)"
 msgstr "무엇과 대응됩니까? (여러개의 ID를 콤마로 구별하십시오)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:499
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:85
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:36
 msgid "Math Objects"
 msgstr "수학 문제"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:327
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:377
 msgid "Max attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:380
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:24
 msgid "Max. Shown:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1817
+#: /opt/webwork/webwork2/conf/defaults.config:1719
 msgid ""
 "Maximum times Show me Another can be used per problem (-1 => unlimited)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:606
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:4
+msgid "Merge file data:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:24
 msgid "Merge file:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:288
 msgid "Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:578
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:13
 msgid "Message file:"
 msgstr ""
 
-#. ($emailDirectory, $output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:357
-msgid "Message saved to file <code>%1/%2</code>."
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:300
+msgid "Message saved to file %1."
 msgstr ""
 
-#. ($recipient, $ur->email_address)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:995
+#. ($recipient, $user_record->email_address)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:98
 msgid "Message sent to %1 at %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2249
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2324
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:121
+msgid "Message was blank."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:48
+msgid ""
+"Messages can be saved to a message file (which must end in the \".msg\" "
+"extension).  Use the \"Message file\" drop down menu to select which message"
+" file to load, or \"None\" to use a blank message. To save a new message, "
+"use the \"Save as\" button after entering in a valid filename.  The \"Save "
+"as\" button will not overwrite currently saved messages.  To edit a "
+"currently saved message first select it using the drop down menu, then click"
+" the \"Save\" button to save any changes.  Use the \"File Manager\" to "
+"delete messages, located in the \"[TMPL]/email\" directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:22
 msgid "Method"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3284
+#: /opt/webwork/webwork2/conf/defaults.config:2003
+msgid "Method to enter problem scores in the single problem manual grader"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1668
 msgid ""
 "Missing required input data. Please check that you have filled in all of the"
 " create location fields and resubmit."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1555
+#: /opt/webwork/webwork2/conf/defaults.config:1457
 msgid ""
 "Mode in which the LANG and DIR settings for a single problem are determined."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1557
-msgid ""
-"Mode in which the LANG and DIR settings for a single problem are "
-"determined.<p>The system will set the LANGuage attribute to either a value "
-"determined from the problem, a course-wide default, or the system default, "
-"depending on the mode selected. The tag will only be added to the DIV "
-"enclosing the problem if it is different than the value which should be set "
-"in the main HTML tag set for the entire course based on the course "
-"language.<p>There are two options for the DIRection attribute: \"ltr\" for "
-"left-to-write sripts, and \"rtl\" for right-to-left scripts like Arabic and "
-"Hebrew.<p>The DIRection attribute is needed to trigger proper display of the"
-" question text when the problem text-direction is different than that used "
-"by the current language of the course. For example, English problems from "
-"the library browser would display improperly in RTL mode for a Hebrew "
-"course, unless the problen Direction is set to LTR.<p>The feature to set a "
-"problem language and direction was only added in 2018 to the PG language, so"
-" most problems will not declare their language, and the system needs to fall"
-" back to determining the language and direction in a different manner. The "
-"OPL itself is all English, so the system wide fallback is to en-US in LTR "
-"mode.<p>Since the defaults fall back to the LTR direction, most sites should"
-" be fine with the \"auto::\" mode, but may want to select the one which "
-"matches their course language. The mode \"force::ltr\" would also be an "
-"option for a course which runs into trouble with the \"auto\" "
-"modes.<p>Modes:<br><ul><li>\"none\" prevents any additional LANG and/or DIR "
-"tag being added. The browser will use the main setting which was applied to "
-"the entire HTML page. This is likely to cause trouble when a problem of the "
-"other direction is displayed.</li><li>\"auto::\" allows the system to make "
-"the settings based on the language and direction reported by the problem (a "
-"new feature, so not set in almost all existing problems) and falling back to"
-" the expected default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" "
-"allows the system to make the settings based on the language and direction "
-"reported by the problem (a new feature, so not set in almost all existing "
-"problems) but falling back to the language with the given LangCode and the "
-"direction Dir when problem settings are not available from "
-"PG.</li><li>\"auto::Dir\" for problems without PG settings, this will use "
-"the default en=english language, but force the direction to Dir. Problems "
-"with PG settings will get those settings.</li><li>\"auto:LangCode:\" for "
-"problems without PG settings, this will use the default LTR direction, but "
-"will set the language to LangCode.Problems with PG settings will get those "
-"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
-" by the PG code of the problem, and will force the system to set the "
-"language with the given LangCode and the direction to Dir for <b>all</b> "
-"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
-"PG code of the problem, and will force the system to set the direction to "
-"Dir for <b>all</b> problems, but will avoid setting any language attribute "
-"for individual problem.</li></ul>"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2695
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:443
 msgid "Move"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2231
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:457
 msgid "Move to Page:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2226
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:452
 msgid "Move to Problem:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:26
+msgid ""
+"Multiple sets may be assigned to the users by holding down the shift key or "
+"the ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:27
+msgid ""
+"Multiple users or sets may be selected by holding down the shift key or the "
+"ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:36
 msgid "My Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1412
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:26
 msgid "Mysterious Package (with Ribbons)"
 msgstr ""
 
 # Short for Number of Fields
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:213
 msgid "NO OF FIELDS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1484
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:741
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:113
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:135
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:29
 msgid "Name"
 msgstr "이름"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:174
 msgid "Name for new set here"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1528
+#: /opt/webwork/webwork2/conf/defaults.config:1430
 msgid "Name of course information file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1107
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:77
+msgid "Name of the evaluator file used to evaluate the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:81
+msgid "Name of the image used for the achievement icon."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:4
 msgid "Name the new set"
 msgstr "새로운 문제집 이름"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1691
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:45
+msgid "Name:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:29
 msgid "Necromancers Charm"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:343
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:205
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:393
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:35
 msgid "Never"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:371
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:54
 msgid "New File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:372
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:55
 msgid "New Folder"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:30
 msgid "New Name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2067
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:3
 msgid "New Password"
 msgstr "새 비밀번호"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:131
-msgid "New Version"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+msgid "New Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
 msgid "New file name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
 msgid "New folder name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:577
 msgid "New passwords saved"
 msgstr "새 비밀번호 저장하기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1078
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:36
 msgid "New set name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1357
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1010
 msgid "Next Problem"
 msgstr "다음 문제"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1181
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2164
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:40
+msgid "Next Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:98
 msgid "Next page"
 msgstr ""
 
-#. ($self->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:620
+#. (% $c->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:142
 msgid "Next test will be available by %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2452
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:134
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:144
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:183
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:483
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:510
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:142
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:68
 msgid "No"
 msgstr "아니오"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:635
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:116
 msgid "No Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2324
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:216
 msgid "No Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:117
+msgid "No Sender specified."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:23
 msgid "No Target Set Selected"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:335
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:38
 msgid "No achievement badges have been assigned yet."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1521
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:77
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:37
 msgid "No achievements shown.  Create an achievement!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:90
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:2
+msgid "No achievements shown.  Select an achievement to edit!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:61
 msgid "No action taken"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:141
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:140
 msgid ""
 "No authentication method found for your request.  If this recurs, please "
 "speak with your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:940
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:361
 msgid "No change made to any set"
 msgstr "문제집에 변화없음"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
 msgid ""
 "No changes specified.  You must mark the checkbox of the item(s) to be "
 "changed and enter the change data."
@@ -4050,1379 +5428,1811 @@ msgstr ""
 msgid "No changes were saved!"
 msgstr "저장된 변경 사항이 없습니다!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2462
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:50
 msgid "No course archives found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2898
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:32
 msgid "No course id defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1561
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:932
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:67
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:76
 msgid "No courses found"
 msgstr ""
 
 #. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:593
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:675
 msgid "No data exists for set %1 and problem %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:10
+msgid "No e-mail recipients are listed for this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:169
 msgid "No filename was specified for saving!  The message was not saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:340
 msgid "No guest logins are available. Please try again in a few minutes."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3522
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1877
 msgid "No location specified to edit. Please check your input data."
 msgstr ""
 
 #. ($badID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1788
 msgid "No location with name %1 exists in the database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3206
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:149
 msgid "No locations are currently defined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:342
 msgid "No merge data file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:612
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:18
+msgid "No merge data found"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:164
+msgid "No merge data found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:8
+msgid "No merge file selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:135
 msgid "No more tests available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:270
 msgid ""
 "No new Achievement ID specified.  No new achievement created.  File not "
 "saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:63
 msgid "No problems matched the given parameters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:25
+msgid "No recipients selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:334
 msgid ""
 "No recipients selected. Please select one or more recipients from the list "
 "below."
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2044
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:49
 msgid "No record for global set %1."
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2046
-msgid "No record for user %1."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
 msgid "No record found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1166
-msgid "No set created."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:12
 msgid "No sets in this course yet"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1010
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:159
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
 msgid "No sets selected for scoring"
 msgstr "채점을 위해 선택된 문제집이 없습니다"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2764
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:46
 msgid ""
 "No sets shown.  Choose one of the options above to list the sets in the "
 "course."
 msgstr "문제집이 보이지 않습니다. 강좌에서 문제집들이 보이게 옵션을 선택해주세요."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1942
 msgid "No source filePath specified"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1327
 msgid "No source_file for problem in .def file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2099
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:87
 msgid ""
-"No students shown.  Choose one of the options above to list the students in "
+"No students shown. Choose one of the options above to list the students in "
 "the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:246
 msgid "No submissions. Over time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:278
 msgid "No tests taken."
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:594
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:676
 msgid "No user specific data exists for user %1"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2031
 msgid "No valid changes submitted for location %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:275
-msgid "No versions of this assignment have been taken."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:771
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:263
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:241
 msgid "No versions of this test have been taken."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:562
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:252
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:17
 msgid "None"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:681
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2463
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:763
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:52
 msgid "None Specified"
 msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2089
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:73
 msgid "None of the selected users are assigned to this set: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:33
 msgid "Not logged in."
 msgstr "로그인 실패"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1569
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:4
 msgid "Note"
 msgstr "공지"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:381
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:55
+msgid ""
+"Note that if there are errors, they will be shown at the top of the page. In"
+" some cases, a hard copy is still generated and a link called \"Download "
+"Hardcopy\" appears. In addition, the latex file, log and error files are "
+"generated which can be used in troubleshooting."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:93
+msgid ""
+"Note that if you set the permission level of a user to something other than "
+"\"Student\", you may also want to set the status of the user to "
+"\"Observer\".  Users with the \"Observer\" status are not included in "
+"statistics, scoring, or instructor emails."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:28
+msgid ""
+"Note that some settings require an additional page load after \"Save "
+"Changes\" is clicked in order to take effect.  This is true for a theme "
+"change for example."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:396
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:422
 msgid "Note:"
 msgstr ""
 
-#. (CGI::i($pg->{result}{msg})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2350
+#. (tag('i', maketext('You are in the Reduced Scoring Period.  All work counts
+#. for [_1]% of the original.',
+#. $ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#. (tag('i', $pg->{result}{msg})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:572
 msgid "Note: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2482
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:686
 msgid ""
 "Note: grading the test grades all problems, not just those on this page."
 msgstr "참고: 시험지 채점은 이 페이지의 문제뿐만 아니라 모든 문제의 점수를 매깁니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1460
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1485
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:768
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:59
+msgid "Now"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:19
 msgid "Number"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:242
 msgid "Number of Graded Submissions per Test (0=infty)"
 msgstr "한 시험지당 채점 가능 횟수 (0=무한대)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
 msgid "Number of Problems per Page (0=all)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:95
+msgid "Number of Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:257
 msgid "Number of Tests per Time Interval (0=infty)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1833
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2435
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:54
+msgid "Number:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1181
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:912
 msgid "OK"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1464
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:17
+msgid "OPL Problem Levels Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:26
 msgid "Oil of Cleansing"
 msgstr ""
 
+#. ('<code>pdflatex</code>', '<code>hardcopy.tex</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:49
+msgid ""
+"Once \"Generate Hardcopy for selected sets and selected users\" is clicked a"
+" file in the selected hardcopy format will be generated and offered for "
+"download. If PDF output was selected, a single PDF file is generated. If TeX"
+" output is selected, a zip file is generated that contains all files needed "
+"to generated the hardcopy PDF file via %1. The main TeX file is called %2."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:84
 msgid "One Column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:314
+msgid "Only Start"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:289
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:303
 msgid "Only after set answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1892
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:87
+msgid ""
+"Only present for JITAR sets. Collapse JITAR nesting problem groups to the "
+"top row of information about a problem. Note that the nesting of a single "
+"problem group can be collapsed by clicking on the down arrow to the right of"
+" the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:80
+msgid ""
+"Only present for JITAR sets. Expand JITAR nested problem groups that have "
+"been collapsed. Note that the nesting of a single problem group can be "
+"expanded by clicking on the right arrow to the right of the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1794
 msgid ""
 "Only this permission level and higher get buttons for sending e-mail to the "
 "instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:39
 msgid "Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:422
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:763
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:810
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:62
 msgid "Open Date"
 msgstr "날짜 열기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1098
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:42
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:32
 msgid "Open Problem Library"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2417
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:272
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:525
 msgid "Open in New Window"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1263
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1617
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:29
 msgid "Open in new window"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:491
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:320
 msgid "Open, closes %1."
 msgstr "진행중, %1에 종료."
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:489
-msgid "Open, complete by %1."
-msgstr ""
-
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:300
 msgid "Open, due %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:433
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
 msgid "Open."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:431
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:268
 msgid "Open. Submitted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:31
 msgid "Open:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:115
 msgid "Opens"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:27
 msgid "Opens any homework set for 24 hours."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1686
+#: /opt/webwork/webwork2/conf/defaults.config:1588
 msgid "Optional Modules"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:265
 msgid "Order Problems Randomly"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:50
+msgid "Other Options"
+msgstr ""
+
 # Context is "7 Out Of 10"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:405
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:777
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:150
 msgid "Out Of"
 msgstr "총점"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1024
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:85
+msgid "Overall Results"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:93
+msgid "Overall Set Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:122
+msgid "Overall Success Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:470
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:481
 msgid "Overwrite"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:437
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:100
 msgid "Overwrite existing files silently"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:41
+msgid "PDF"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:69
 msgid "PG Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:827
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer.html.ep:1
+msgid "PG POD"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:17
+msgid "PG Problem Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:708
 msgid "PG debug messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:829
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:716
 msgid "PG internal errors"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:818
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:109
+msgid ""
+"PG markdown syntax used to format WeBWorK questions. This interactive lab "
+"can help you to learn the techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:692
 msgid "PG question failed to render"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:826
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:706
 msgid "PG question processing error messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:828
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:712
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:128
 msgid "PG warning messages"
 msgstr ""
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:511
-msgid "PGLab"
-msgstr ""
-
-# Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:98
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:47
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:58
 msgid "PGML"
 msgstr ""
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:91
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:40
 msgid "POD"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2309
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2249
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:200
+msgid "POD Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:208
+msgid "POD Viewer"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1515
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:526
 msgid "PREVIEW ONLY -- ANSWERS NOT RECORDED"
 msgstr "미리보기만 -- 답이 기록되지 않음"
 
 # Problem Number
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:215
 msgid "PROB NUMBER"
 msgstr ""
 
 # Problem Value
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:218
 msgid "PROB VALUE"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:205
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:36
 msgid "Pad Fields"
 msgstr "필드 삽입"
 
-#. (timestamp($self)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1255
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:28
+msgid "Page Contents"
+msgstr ""
+
+#. ($c->timestamp)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:1
 msgid "Page generated at %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:568
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:81
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:71
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:56
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:25
 msgid "Password"
 msgstr "비밀번호"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:976
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:13
 msgid "Password (Leave blank for regular proctoring)"
 msgstr "비밀번호(빈칸으로 남겨두면 감독 권한자 아이디 패스워드 사용 가능)"
 
-#. ($studentUser, CGI::span({ dir => 'ltr' },
-#. format_set_name_display($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:498
+#. ($studentUser, tag('span', dir => 'ltr', format_set_name_display($setName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:13
 msgid "Past Answers for %1, set %2, problem %3"
 msgstr "세트 %2, 문제 %3의  %1에 대한 과거 답변"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:8
 msgid "Percent"
 msgstr "백분율 점수"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:562
-msgid "Percentage of Active Students with Correct Answers"
-msgstr "정답을 한 참여 학생의 비율"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:94
+msgid "Percent Ranges"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+msgid "Percent Score"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:535
+msgid "Percent of Students"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:788
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:206
 msgid ""
 "Percentile cutoffs for number of attempts. The 50% column shows the median "
 "number of attempts."
 msgstr "시도 횟수에 대한 백분위수 컷오프. 50% 열은 시도의 중앙값을 보여줍니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2056
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:834
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:863
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:921
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:58
+msgid ""
+"Percentile cutoffs for student's score and success index. The 50% column "
+"shows the median number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:50
 msgid "Permission Level"
 msgstr "허용 레벨"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1869
+#: /opt/webwork/webwork2/conf/defaults.config:1771
 msgid "Permissions"
 msgstr "권한"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1052
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:24
 msgid "Pick a target set above to add this problem to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:54
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:21
 msgid "Pick date and time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3804
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
 msgid ""
 "Place a file named \"hide_directory\" in a course or other directory and it "
 "will not show up in the courses list on the WeBWorK home page. It will still"
 " appear in the Course Administration listing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1107
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should be given full credit."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should have half credit added."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given full credit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:889
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given half credit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:654
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its incorrect attempt count reset."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its weight doubled."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1315
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:60
 msgid ""
 "Please choose the set, the problem you would like to copy, and the problem "
 "you would like to copy it to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:399
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:19
 msgid "Please correct the following errors and try again:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:698
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:28
 msgid "Please enter in a value to match in the filter field."
 msgstr ""
 
-#. (CGI::b($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:197
+#. (tag('b', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:28
 msgid "Please enter your username and password for %1 below:"
 msgstr "다음 %1에 사용자 이름과 비밀번호를 입력해주세요:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1778
 msgid "Please provide a location name to delete."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:233
 msgid "Please select action to be performed."
 msgstr "실행할 항목을 선택해주세요."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:183
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
 msgid "Please select at least one set and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
 msgid "Please select at least one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:165
 msgid "Please select at least one user and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:35
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:31
 msgid "Please select at least one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:28
 msgid "Please select at most one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:30
 msgid "Please select exactly one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:29
 msgid "Please select exactly one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:574
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1016
 msgid "Please specify a file to save to."
 msgstr "저장할 파일을 명시해주세요."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:37
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
 msgid "Please specify a homework set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:38
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
 msgid ""
 "Please use only letters, digits, dashes, underscores, and periods in your "
 "set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1462
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1184
+msgid ""
+"Please use radio buttons to choose the method for saving this file. Uknown "
+"saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:165
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:169
+msgid "Point Value"
+msgstr ""
+
+#. ($grader->{problem_value})
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:92
+msgid "Point Value (0 - %1):"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:21
 msgid "Points"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:609
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:62
+msgid "Points:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:26
 msgid "Potion of Forgetfulness"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1423
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:2
 msgid "Prepare which sets for export?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2054
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2073
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:268
 msgid "Press \"Grade Test\" now!"
 msgstr "지금 \"시험지 채점\"을 누르십시오!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2049
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:244
 msgid "Press \"Grade Test\" soon!"
 msgstr "곧 \"시험지 채점\"을 누르세요!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:213
-msgid "Preview Comment"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:69
 msgid "Preview Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:314
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1840
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:11
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:99
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:35
 msgid "Preview My Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2440
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:646
 msgid "Preview Test"
 msgstr "테스트 미리보기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1340
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:41
+msgid ""
+"Preview the message before sending using the \"Preview Message\" button.  "
+"The preview shows the email that would be sent to the first selected student"
+" or the instructor if no students were selected.  The preview will also list"
+" all of the students that would receive their own personalized message.  If "
+"a merge file was selected, the preview will also indicate which (if any) "
+"recipient's merge file data could not be found."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:991
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:995
 msgid "Previous Problem"
 msgstr "이전 문제"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2157
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:94
 msgid "Previous page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2149
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:45
+msgid "Primary Actions"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:355
 msgid "Print Test"
 msgstr "테스트 인쇄"
 
 # Short for Problem
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2088
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:287
 msgid "Prob"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:670
-msgid "Problem #"
-msgstr ""
-
-#. ($prettyProblemID)
-#. ($problemNumber)
 #. (join('.', @seq)
 #. ($problemID)
-#. ($prettyProblemIDs{$probID})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:831
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:834
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:897
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:438
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:800
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:956
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:964
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:973
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:933
+#. ($problemNumber)
+#. ($_->{prettyID})
+#. ($c->{prettyID})
+#. ($probID)
+#. ($c->{setRecord}->assignment_type eq 'jitar' ? join('.',
+#. jitar_id_to_seq($_)
+#. ($set->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)
+#. ($prettyProblemID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:831
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:842
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:853
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:57
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/siblings.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:40
 msgid "Problem %1"
 msgstr ""
 
-#. ($problemNumber)
-#. ($prettyID)
-#. ($versioned ? $versioned : $MergedProblem->problem_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1419
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1421
+#. ($i + 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:535
 msgid "Problem %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1974
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:75
+msgid "Problem (\".pg\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:38
+msgid "Problem Display Settings"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1876
 msgid "Problem Display/Answer Checking"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:451
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:50
 msgid "Problem Editor"
 msgstr "문제 편집기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1697
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:29
 msgid "Problem Grader"
 msgstr "문제 채점자"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1002
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:999
 msgid "Problem List"
 msgstr "문제 리스트"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1119
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:666
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:783
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:75
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:159
 msgid "Problem Number"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:156
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:160
+msgid "Problem Paths"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:140
 msgid "Problem Score (%):"
 msgstr "문제 점수(%):"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:30
 msgid "Problem Techniques"
 msgstr "기술적 문제"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:705
-msgid "Problem Viewer"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:239
+msgid ""
+"Problem has a different source file than the currently rendered problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:233
+msgid "Problem has an essay answer that needs to be graded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1943
 msgid "Problem source is drawn from a grouping set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:406
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2494
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:445
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:827
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:835
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:896
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:801
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:89
+msgid ""
+"Problem source is drawn from a grouping set and can not be directly rendered"
+" or edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:336
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:9
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:32
 msgid "Problems"
 msgstr "문제"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:25
 msgid "Problems Added"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:59
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:54
 msgid "Problems for all students have been unassigned."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:57
 msgid "Problems for selected students have been reassigned."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:51
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:46
 msgid "Problems have been assigned to all current users."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:25
+msgid ""
+"Problems with this rating should only require direct memory of a fact. "
+"Examples might be a specific value of a function, or the statement of a "
+"definition. Very few WeBWorK problems fall into this category."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:93
 msgid "Proctor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:282
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:92
 msgid "Proctor Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:258
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:71
 msgid "Proctor Username"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:193
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:3
+msgid "Proctor authorization requested for a nonexistent set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:8
 msgid "Proctor authorization required."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:231
-msgid "Proctored Gateway Quiz %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:88
+msgid "Proctor:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:265
+msgid "Proctored Test %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:241
-msgid "Proctored Gateway Quiz %2 Proctor Login"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:272
+msgid "Proctored Test %2 Proctor Login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:981
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:318
+msgid ""
+"Proctored tests always require authorization to start the test. \"Both Start"
+" and Grade\" will require login proctor authorization to start and grade "
+"proctor authorization to grade. \"Only Start\" requires grade proctor "
+"authorization to start and no authorization to grade."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:18
 msgid ""
-"Proctored tests require proctor authorization to start and to grade.  "
 "Provide a password to have a single password for all students to start a "
 "proctored test."
-msgstr "감독 시험을 시작하고 채점하려면 감독관의 승인이 필요합니다. 모든 학생이 감독 시험을 하나의 암호로 시작할 수 있도록 암호를 제공하십시오."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:56
 msgid "Publish"
 msgstr "출판"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:31
+msgid ""
+"Quick access to many instructor tools, including <strong>Reset "
+"passwords</strong>, <strong>Act as student</strong>, <strong>Assign "
+"individual sets</strong> and <strong>Edit individual due dates</strong>."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "RECITATION"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1333
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:199
 msgid "Randomize"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:13
 msgid "Randomize Seed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:101
 msgid "Read only"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:67
 msgid "Really delete the items listed above?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:201
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:212
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:804
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2038
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:298
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:832
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:861
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:890
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:919
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:184
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:42
 msgid "Recitation"
 msgstr "설명"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:194
+#. ($recitation)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:125
+msgid "Recitation %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:21
+msgid "Recitation:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:38
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:46
 msgid "Record Scores for Single Sets"
 msgstr "개별 문제집에 대해 점수 기록"
 
-#. ($studentName)
-#. ($self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:183
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:190
+#. ($studentID)
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:8
 msgid "Record for user %1 not found."
 msgstr "사용자 %1에 대한 기록을 찾을 수 없습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Reduced Scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:67
 msgid "Reduced Scoring Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2523
-msgid "Reduced Scoring Disabled"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
+msgid "Reduced Scoring Enabled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2522
-msgid "Reduced Scoring Enabled"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:33
+msgid "Reduced Scoring Period"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:314
 msgid "Reduced credit can still be earned until %1."
 msgstr "%1까지 감점된 점수(reduced credit)를 얻을 수 있습니다."
 
 # Short for "Reduced Scoring:"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:32
 msgid "Reduced:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:153
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:373
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:56
 msgid "Refresh"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1646
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1943
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2000
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3713
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3755
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:56
 msgid "Refresh Listing"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:190
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:200
 msgid "Relax IP restrictions when?"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:88
+msgid "Reload the page to see backup files that have been made."
+msgstr ""
+
 # Context is "Attempts Remaining"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:14
 msgid "Remaining"
 msgstr "시도 횟수"
 
 #. ('00:00:00')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:254
 msgid "Remaining time: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:61
 msgid "Remember Me"
 msgstr "나를 기억해주세요"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:546
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:514
 msgid "Remember to return to your original problem when you're finished here!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1020
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:466
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:72
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:41
 msgid "Rename"
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1302
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:62
 msgid "Rename %1 to %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:378
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:927
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:73
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:34
 msgid "Rename Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:17
+msgid "Rename Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:22
+msgid "Rename Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
 msgid "Rename file as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2727
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:463
 msgid "Render"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:344
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:59
 msgid "Render All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2720
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:461
 msgid "Render Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2501
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:60
+msgid ""
+"Render all problems on the page. This does not reload the page or save or "
+"reset changes."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:106
+msgid ""
+"Render or re-render the problem, course info file, or set header being "
+"edited. This does not change the permanent file on the disk. You can view "
+"different versions of the same problem by changing the seed. You can also "
+"change the manner in which the mathematics is typeset. If \"Open in new "
+"window\" is checked, then the problem will open in a new tab or window "
+"showing the problem as it will be rendered for students in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:132
+msgid "Rendering Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:341
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:53
 msgid "Renumber Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:55
+msgid ""
+"Renumber problems consecutively starting from 1. This renumbering is not "
+"saved until \"Save Changes\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:103
 msgid ""
-"Reopens any gateway test for an additional 24 hours. This allows you to take"
-" a test even if the close date has past. This item does not allow you to "
-"take additional versions of the test."
+"Renumber problems in the set consecutively starting from one. In the process"
+" of deleting problems, the numbering can be made non-consecutive. This is "
+"useful to clean up the problem numbering."
 msgstr ""
 
-#. (CGI::strong(                                                   CGI::span({
-#. dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1829
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:31
+msgid ""
+"Reopens any test for an additional 24 hours. This allows you to take a test "
+"even if the close date has past. This item does not allow you to take "
+"additional versions of the test."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:118
+msgid "Reordering Problems"
+msgstr ""
+
+#. (tag(                                           'strong',
+#. c(                                                      tag('span', dir =>
+#. 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:58
 msgid "Replace current problem: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:13
 msgid "Replace which users?"
 msgstr "바꿀 사용자는?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:637
+#. ($composite_id, $oldUser->status)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:448
+msgid "Replacing old data for %1: status: %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:42
 msgid "Reply-To:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:528
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:123
 msgid "Report Bugs in this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1073
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:305
 msgid "Report bugs"
 msgstr "오류 보고"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:128
+msgid ""
+"Report bugs in a WeBWorK question/problem using this link. The very first "
+"time you do this you will need to register with an email address so that "
+"information on the bug fix can be reported back to you."
+msgstr ""
+
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2825
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1530
 msgid "Report for course %1:"
 msgstr ""
 
-#. ($rename_oldCourseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2122
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:3
 msgid "Report on database structure for course %1:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1829
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:8
 msgid "Request New Version"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2246
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2321
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:19
 msgid "Request information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1972
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1220
 msgid "Request new version now."
 msgstr ""
 
+#. ($setName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:486
+msgid ""
+"Requested set \"%1\" is a proctored test, but no valid proctor authorization"
+" has been obtained."
+msgstr ""
+
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:399
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:422
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:425
 msgid "Requested set '%1' could not be found in the database for user %2."
 msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:469
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:472
 msgid ""
-"Requested set '%1' is a homework assignment but the gateway/quiz content "
-"generator %2 was called.  Try re-entering the set from the problem sets "
-"listing page."
-msgstr ""
-
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:484
-msgid ""
-"Requested set '%1' is a proctored test/quiz assignment, but no valid proctor"
-" authorization has been obtained."
+"Requested set '%1' is a homework assignment but the test content generator "
+"%2 was called.  Try re-entering the set from the problem sets listing page."
 msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:463
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:466
 msgid ""
-"Requested set '%1' is a test/quiz assignment but the regular homework "
-"assignment content generator %2 was called.  Try re-entering the set from "
-"the problem sets listing page."
+"Requested set '%1' is a test but the regular homework assignment content "
+"generator %2 was called.  Try re-entering the set from the problem sets "
+"listing page."
 msgstr ""
 
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:420
 msgid "Requested set '%1' is not assigned to user %2."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:450
 msgid "Requested set '%1' is not available yet."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:441
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:444
 msgid "Requested set '%1' is not yet open."
 msgstr ""
 
 #. ($verNum,				$setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:404
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:407
 msgid "Requested version (%1) of set '%2' can not be directly accessed."
 msgstr ""
 
 #. ($verNum, $setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:397
 msgid "Requested version (%1) of set '%2' is not assigned to user %3."
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:308
+msgid "Require Proctor Authorization to"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:45
 msgid "Require users to log in through the LMS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:420
 msgid "Rerandomize after"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:104
 msgid "Reset"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2280
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2968
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:195
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:696
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:47
 msgid "Reset Form"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:610
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:27
 msgid "Resets the number of incorrect attempts on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2453
-msgid ""
-"Restores a course from a gzipped tar archive (.tar.gz). After unarchiving, "
-"the course database is restored from a subdirectory of the course's DATA "
-"directory. Currently the archive facility is only available for mysql "
-"databases. It depends on the mysqldump application."
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:41
+msgid "Restore a .tar.gz archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:40
+msgid "Restore backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:39
+msgid "Restore backup from %1"
+msgstr ""
+
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+msgid "Restored backup from %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:178
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:188
 msgid "Restrict Access by IP"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:912
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep:11
 msgid "Restrict Locations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:286
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:324
 msgid "Restrict Problem Progression"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:184
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:194
 msgid "Restrict To"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:154
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:33
+msgid "Restrict or sort the students displayed"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:159
 msgid "Restrict release by set(s)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2090
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:299
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:291
 msgid "Result"
 msgstr "결과"
 
-#. (CGI::i($self->$actionHandler(\%genericParams, \%actionParams,
-#. \%tableParams)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:388
+#. ($c->tag('i', $c->$actionHandler)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:228
 msgid "Result of last action performed: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:309
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:300
 msgid "Results for this submission"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:363
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:236
 msgid "Results of last action performed"
 msgstr "마지막으로 실행된 결과"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:125
 msgid "Results of last action performed: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1725
-msgid "Resurrect which Gateway?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:51
+msgid "Resurrect which test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1449
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:669
 msgid "Retitled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:17
 msgid "Return to your work"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:686
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:132
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:16
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:166
 msgid "Revert"
 msgstr "되돌아가기"
 
-#. (CGI::span({ dir => 'ltr' }, $self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2069
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:83
 msgid "Revert to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1431
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1513
+#. ($c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1220
+msgid "Reverted to original file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:168
+msgid ""
+"Reverts to the copy of the file saved on the disk or to a backup file. All "
+"unsaved editing changes will be lost. This option is only active when a "
+"temporary file or a backup file exists. You may also delete backups that "
+"have been made with this tab."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:182
+msgid "Review of column functions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:145
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:85
 msgid ""
 "Reviewing a problem and looking at both the average Attempts and  average "
 "Status should give instructors valuable information about the difficulty of "
 "the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:55
 msgid "Reward used successfully!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:180
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:4
 msgid "Rewards"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:27
 msgid "Ring of Reduction"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:322
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:26
 msgid "Robe of Longevity"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "SECTION"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:214
 msgid "SET NAME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:321
 msgid "STATUS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "STUDENT ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:43
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:263
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:170
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:687
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:847
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:220
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:85
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:207
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:123
 msgid "Save"
 msgstr ""
 
-#. (CGI::b($self->shortPath($self->{sourceFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:438
+#. (tag('b', $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_form.html.ep:2
 msgid "Save %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:44
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:695
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:134
 msgid "Save As"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:744
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2963
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:194
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:695
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:37
 msgid "Save Changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:60
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:76
 msgid "Save Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
 msgid "Save Export"
 msgstr "내보낸 파일 저장하기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:92
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
 msgid "Save Password"
 msgstr "비밀번호 저장"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:188
 msgid "Save as"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:872
-msgid "Save as Default"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:481
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:5
 msgid "Save as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1558
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:254
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1443
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_password_form.html.ep:1
 msgid "Save changes"
 msgstr "변경사항 저장"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1794
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:33
 msgid "Save file to:"
 msgstr ""
 
-#. (CGI::b({ dir => 'ltr' }, $self->shortPath($self->{editFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1605
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:125
+msgid ""
+"Save the contents of the editor window to the file on disk and re-render the"
+" problem. If \"Open in new window\" is checked, then the problem will open "
+"in a new tab or window showing the problem as it will be rendered for "
+"students in the set. If \"Create backup\" is checked then a backup of the "
+"current file on disk will be created before overwriting it with the contents"
+" of the editor window. If a backup already exists, then a \"Delete oldest "
+"backup\" check box will be present. If that is checked, then the oldest "
+"backup will be deleted when \"Save\" is clicked. These backups can be "
+"reverted to and managed on the \"Revert\" tab."
+msgstr ""
+
+#. (tag('b', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:6
 msgid "Save to %1 and View"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:396
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1165
-msgid "Saved to file '%1'"
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:50
+msgid "Saved answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1180
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2116
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4294
+#. ($c->shortPath($outputFilePath)
+#. ($outputFilePath =~ s/$ce->{courseDirs}{templates}/[TMPL]/r)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:549
+msgid "Saved to file \"%1\""
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2292
 msgid "Schema and database field definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4284
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2279
 msgid "Schema and database table definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:404
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:465
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:660
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:147
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:161
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:78
 msgid "Score"
 msgstr "점수"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:125
 msgid "Score (%)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:161
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:60
+msgid ""
+"Score one or more sets. This can also be done from the \"Hmwk Sets Editor\" "
+"or from the \"Instructor Tools\", but the \"Scoring Tools\" page allows "
+"control over parameters."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:170
 msgid "Score required for release"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:228
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:58
 msgid "Score selected set(s) and save to:"
 msgstr "선택된 문제집 점수 부여하고 저장:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2085
-msgid "Score summary for last submit:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:284
+msgid "Score summary for last submission:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:2
 msgid "Score which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:978
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:2
 msgid "Score which sets?"
 msgstr "점수 매길 문제집은?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
 msgid "Scores"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:487
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:66
+msgid "Scoring (\".csv\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:396
 msgid "Scoring Download"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:161
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:115
 msgid "Scoring Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:478
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:391
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:58
 msgid "Scoring Tools"
 msgstr "채점 도구"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2460
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:17
+msgid "Scoring Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:327
 msgid ""
 "Screen and Hardcopy set header information can not be overridden for "
 "individual students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:26
 msgid "Scroll of Resurrection"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:189
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:200
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:211
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:793
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2029
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:297
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:831
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:860
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:889
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:918
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:157
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:178
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:38
 msgid "Section"
 msgstr "섹션"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:653
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:802
+#. ($section)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:122
+msgid "Section %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:30
 msgid "Section:"
 msgstr "섹션:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:436
 msgid "Seed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:114
 msgid "Select"
 msgstr "선택"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:505
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:20
+msgid ""
+"Select Users from the left column and sets from the right column and assign "
+"or unassign the given sets. The list of users or the list of sets can be "
+"reordered under the \"sort\" option or the format of the user or set list.  "
+"Additionally, the set lists can be filtered (by section number or "
+"recitation).  The displayed user and set lists will only be updated upon "
+"clicking \"Change Display Settings\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:11
 msgid "Select a Homework Set"
 msgstr "문제집을 선택하십시오"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:14
 msgid "Select a Problem Collection"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:18
 msgid "Select a Set Definition File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1028
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:14
 msgid "Select a Set from this Course"
 msgstr "이 코스에서 문제집을 선택하십시오"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1659
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:20
+msgid ""
+"Select a course to create a .tar.gz archive of, which contains a dump of the"
+" database and all course files (templates, configuration files, etc).  Each "
+"course can only have a single archive.  Creating an archive of a previously "
+"archived course will delete the old archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:36
 msgid "Select a course to delete."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:946
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:20
+msgid ""
+"Select a course to delete.  Warning, all data will be deleted and this "
+"cannot be undone.  This will not delete any course archives."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:14
 msgid ""
 "Select a course to rename.  The courseID is used in the url and can only "
 "contain alphanumeric characters and underscores. The course title appears on"
 " the course home page and can be any string."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2475
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:13
 msgid "Select a course to unarchive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1914
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3684
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:21
 msgid "Select a listing format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1442
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1478
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:18
+msgid "Select action:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:10
 msgid "Select all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2703
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:12
 msgid "Select all eligible courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2731
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:26
 msgid "Select all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1967
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:10
 msgid "Select all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:315
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:509
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:536
-msgid "Select an action to perform"
-msgstr "실행할 동작을 선택하세요"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3063
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:10
 msgid "Select an action to perform:"
 msgstr "실행할 동작을 선택하세요:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1956
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:20
+msgid ""
+"Select an archive to restore.  You cannot restore an archive into an "
+"existing course. Instead, either rename or delete the old course, or restore"
+" the archive with a new name.  When restoring a course with a new name, the "
+"name is used as the course ID, and must contain only letters, numbers, "
+"hyphens, and underscores, and may have at most 40 characters."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:36
 msgid "Select course(s) to archive."
 msgstr "보관할 교과목을 선택하세요."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3731
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:44
 msgid "Select course(s) to hide or unhide."
 msgstr "숨기거나 숨기기를 취소할 코스를 선택합니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:7
 msgid "Select import file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:14
 msgid ""
 "Select one or more sets and one or more users below to assign/unassign each "
 "selected set to/from all selected users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:94
 msgid "Select sets below to assign them to the newly-created users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3666
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:20
+msgid ""
+"Select the course to change its Course ID, Course Title, or Institution.  "
+"Note that changing a course's ID will change the URL of all links to the "
+"course, and could break links from external sites such as an LMS."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:4
 msgid ""
 "Select the course(s) you want to hide (or unhide) and then click \"Hide "
 "Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
@@ -5433,133 +7243,230 @@ msgid ""
 "full URL address for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:488
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:20
+msgid ""
+"Select the course(s) you want to hide (or unhide) and then click \"Hide "
+"Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
+"does no harm (the action is skipped). Likewise unhiding a course that is "
+"already visible does no harm (the action is skipped). Hidden courses are "
+"still active but are not listed in the list of WeBWorK courses on the "
+"opening page. To access the course, an instructor or student must know the "
+"full URL address for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:93
+msgid "Select the display mode used to render the problems on this page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:11
 msgid ""
 "Select the homework sets for which to generate hardcopy versions. You may "
 "also select multiple users from the users list. You will receive hardcopy "
 "for each (set, user) pair."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:238
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:30
+msgid ""
+"Select the sets you want scored, choose the name of the export file you want"
+" to use (by default: %1), and then click the \"Score Selected Set(s) and "
+"save to\" button."
+msgstr ""
+
+#. ('<code>ful.csv</code>','<code>scr.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:49
+msgid ""
+"Select this if you want to save the scores for each set in a separate file "
+"in addition to saving all scores to a cumulative file. After clicking the "
+"\"Score Selected Set(s) and save to\" button, you will get a pair of links "
+"for each selected set. The file that ends with %1 contains the number of "
+"correct and incorrect tries about each individual problem for each student. "
+"The file that ends with %2 is a summary of each problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:19
 msgid ""
 "Select user(s) and/or set(s) below and click the action button of your "
 "choice."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2885
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:85
+msgid ""
+"Select which assignment types (homework, tests, just-in-time) the "
+"achievement is evaluated."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:20
+msgid ""
+"Select which courses to upgrade from a previous version of WeBWorK.  The "
+"upgrade process can add missing database columns, delete unused database "
+"columns, and check the course file structure.  Be sure to read over the "
+"changes before confirming the upgrade.  You may want to create an archive of"
+" the course before upgrading.  Only courses that need upgraded will be "
+"selectable."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:84
+msgid "Select your favorite theme for the large text window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:18
 msgid "Select/unselect all fields missing in schema for deletion."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2873
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:9
 msgid "Select/unselect all tables missing in schema for deletion."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:23
 msgid "Selected sets:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:57
 msgid "Send E-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:839
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:83
 msgid "Send Email"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:702
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:69
+msgid "Send email to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:54
+msgid "Send emails to selected instructors."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:59
 msgid "Send to all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:717
-msgid "Send to the students selected below"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:64
+msgid "Send to selected students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:402
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:7
 msgid "Set"
 msgstr "문제집"
 
 #. ($newSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:614
 msgid "Set %1 has been created."
 msgstr ""
 
-#. ($newSetName,$userName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1944
+#. ($newSetName, $userName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:616
 msgid "Set %1 was assigned to %2"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1239
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:567
 msgid "Set %1 was assigned to %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:415
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:354
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:42
 msgid "Set Assigner"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:420
-msgid "Set Definition Filename"
-msgstr "문제집 정의 파일명"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:17
+msgid "Set Assigner Help"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:45
 msgid "Set Definition Files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2318
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2329
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:218
 msgid "Set Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:17
+msgid "Set Detail Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:333
 msgid "Set Detail for set %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:93
 msgid "Set Header"
 msgstr "문제집 헤더"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:323
+msgid "Set Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:218
 msgid "Set ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:267
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:114
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:3
 msgid "Set Info"
 msgstr "문제집 정보"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2744
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:19
 msgid "Set List"
 msgstr "문제집 리스트"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1111
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1209
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1320
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:164
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:262
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:353
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:448
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:546
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:659
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:776
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:895
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:995
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:762
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:809
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:7
 msgid "Set Name"
 msgstr "문제집 이름"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:186
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:18
+msgid "Set closes on %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:45
+msgid "Set definition (\".def\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:20
+msgid "Set is closed."
+msgstr ""
+
+#. ($c->formatDateTime($set->reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:16
+msgid "Set is due on %1."
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:14
+msgid "Set opens on %1."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:188
 msgid "Set random seed to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2029
+#: /opt/webwork/webwork2/conf/defaults.config:1930
 msgid ""
 "Set to true for log to mean base 10 log and false for log to mean natural "
 "logarithm."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2049
+#: /opt/webwork/webwork2/conf/defaults.config:1950
 msgid ""
 "Set to true to allow students to enter Unicode versions of some characters "
 "(like U+2212 for the minus sign) in their answers.  One reason to allow this"
@@ -5568,7 +7475,7 @@ msgid ""
 "directory from the keyboard."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2019
+#: /opt/webwork/webwork2/conf/defaults.config:1920
 msgid ""
 "Set to true to display the \"Entered\" column which automatically shows the "
 "evaluated student answer, e.g., 1 if student input is sin(pi/2). If this is "
@@ -5577,7 +7484,7 @@ msgid ""
 " answer."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2060
+#: /opt/webwork/webwork2/conf/defaults.config:1961
 msgid ""
 "Set to true to have Full Width Unicode character (U+FF01 to U+FF5E) "
 "converted to their ASCII equivalents (U+0021 to U+007E) automatically in "
@@ -5585,20 +7492,30 @@ msgid ""
 "automatically use Full Width characters for parentheses and commas."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:521
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:164
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:16
+msgid "Set values"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/siblings.html.ep:4
 msgid "Sets"
 msgstr "문제집"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:352
-msgid "Sets Assigned to User"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:322
+msgid "Sets assigned to %1"
+msgstr ""
+
+#. ($userName, $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:90
+msgid "Sets assigned to %1 (%2)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:343
-msgid "Sets assigned to %1"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:17
+msgid "Sets assigned to student Help"
 msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:57
@@ -5612,189 +7529,241 @@ msgid ""
 "links from the LMS must be problem set specific. For example, "
 "<code>webwork.myschool.edu/webwork2/course-name/problem_set_name</code>. If "
 "the problem set name has space characters, they should be underscores in "
-"these addresses. If the problem set is a quiz, it must have this format: "
-"<code>webwork.myschool.edu/webwork2/course-"
-"name/quiz_mode/problem_set_name</code>. Also, to initialize the "
-"communication between WeBWorK and the LMS, the user must follow each of "
-"these external learning tools at least one time. Since there must be a "
-"separate external tool link for each problem set, this option requires more "
-"maintenance of the LMS course.</dd></dl>"
+"these addresses. Also, to initialize the communication between WeBWorK and "
+"the LMS, the user must follow each of these external learning tools at least"
+" one time. Since there must be a separate external tool link for each "
+"problem set, this option requires more maintenance of the LMS "
+"course.</dd></dl>"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:55
+msgid "Sets the order in which achievements are listed and evaluated."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1458
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:625
 msgid "Sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:726
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:36
 msgid "Setting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1332
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:39
 msgid "Shift dates so that the earliest is"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:32
+msgid "Show"
+msgstr ""
+
 #. ($numchild)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1301
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:32
 msgid "Show %1 more like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:326
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:107
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:39
 msgid "Show Correct Answers"
 msgstr "정답 보기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:22
 msgid "Show Date & Size"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:86
 msgid "Show LTI parameters (for debugging)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:620
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:34
 msgid "Show Me Another"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2518
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2412
+#. ($exhausted)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:69
+msgid "Show Me Another %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1642
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:711
 msgid "Show Past Answers"
 msgstr "지난 정답 보기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:703
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:41
+msgid "Show Problem Source File"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:132
 msgid "Show Problem Source File:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
 msgid "Show Problems on Finished Tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
-msgid "Show Scores on Finished Assignments?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+msgid "Show Scores on Finished Tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2416
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:630
 msgid "Show Solutions"
 msgstr "풀이 보기"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/conf/defaults.config:1538
 msgid "Show Total Homework Grade on Grades Page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1266
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:77
 msgid "Show all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1380
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:91
 msgid "Show all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2404
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:621
 msgid "Show correct answers"
 msgstr "정답 보기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1299
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+msgid "Show hints after"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:30
 msgid "Show less like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:337
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:387
 msgid "Show me another"
 msgstr ""
 
-#. ($exhausted)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1926
-msgid "Show me another %1"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:20
+msgid ""
+"Show past answers.  Students can only see their past answers, and they will "
+"not be able to see which parts are correct.  Instructors can use the form to"
+" select any combination of users, sets, and problems to view.  The table "
+"below will list the past answers colored according to correctness (green is "
+"correct).  Use control + click to select multiple users, sets, or problems."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2428
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:639
 msgid "Show problem graders"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:105
 msgid "Show saved answers?"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1860
+#: /opt/webwork/webwork2/conf/defaults.config:1762
 msgid ""
 "Show the correct answer to the current problem before re-randomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1862
+#: /opt/webwork/webwork2/conf/defaults.config:1764
 msgid ""
 "Show the correct answer to the current problem on the last attempt before a "
 "new version is requested."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:3
 msgid "Show which sets?"
 msgstr "보여줄 문제집은?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:690
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:3
 msgid "Show which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:382
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:475
-msgid "Show/Hide Site Description"
-msgstr "사이트 설명 보이기/감추기"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:622
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:11
 msgid "Show:"
 msgstr "보이기:"
 
-#. (scalar @{ $self->{visibleSetIDs} },			scalar @{ $self->{allSetIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:594
+#. (scalar @{ $c->{visibleSetIDs} },			scalar @{ $c->{allSetIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:115
 msgid "Showing %1 out of %2 sets."
 msgstr ""
 
-#. (scalar @Users, scalar @{ $self->{allUserIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:610
+#. (scalar(keys %{ $c->{visibleUserIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:80
 msgid "Showing %1 out of %2 users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:70
 msgid "Showing all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1355
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:81
 msgid "Showing all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:61
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:64
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:67
+#. ($c->{merge_file}, $ur->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:5
+msgid "Showing data from merge file %1 for user %2:"
+msgstr ""
+
+#. ($c->{merge_file})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:147
+msgid "Showing data from merge file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:61
+msgid "Showing problem for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:7
+msgid "Showing statistics for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:33
+msgid ""
+"Shows how many instructors and students have been assigned this problem set,"
+" out of the total number in the class. Clicking on this link allows you to "
+"assign the set to users, unassign this set from users, and to individually "
+"edit the assignment for specific users. For changing dates for individual "
+"users there are also shortcuts from the \"Instructor Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:63
 msgid "Site Information"
 msgstr "사이트 정보"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:88
 msgid "Skip archiving this course"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2080
+#: /opt/webwork/webwork2/conf/defaults.config:1981
 msgid "Skip explanation essay answer fields"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1556
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1557
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:81
+msgid "Snippets of PG code illustrating specific techniques"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1514
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1515
 msgid "Solution:"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1555
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1513
 msgid "Solution: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:432
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:57
 msgid "Solutions"
 msgstr "풀이"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1350
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:20
+msgid ""
+"Some OPL problems have been rated for difficulty/educational objective. The "
+"levels are loosely inspired by Bloom's taxonomy. They are assigned numbers "
+"from 1 to 6 as follows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:185
 msgid ""
 "Some WeBWorK problems are programmed using what are called <i>Math "
 "Objects</i>. These problems are preferred by some people because they "
@@ -5802,18 +7771,18 @@ msgid ""
 "particularly for answers which are way off base."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:379
 msgid "Some answers will be graded later."
 msgstr "일부 답변은 나중에 채점됩니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:60
 msgid ""
 "Some of these files are directories. Only delete directories if you really "
 "know what you are doing. You can seriously damage your course if you delete "
 "the wrong thing."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2082
+#: /opt/webwork/webwork2/conf/defaults.config:1983
 msgid ""
 "Some problems have an explanation essay answer field, typically following a "
 "simpler answer field. For example, find a certain derivative using the "
@@ -5825,7 +7794,7 @@ msgid ""
 "grading."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2186
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:83
 msgid ""
 "Some problems shown above represent multiple similar problems from the "
 "database.  If the (top) information line for a problem has a letter M for "
@@ -5835,300 +7804,396 @@ msgid ""
 "again."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1612
-msgid ""
-"Some servers handle courses taking place in different timezones.  If this "
-"course is not showing the correct timezone, enter the correct value here.  "
-"The format consists of unix times, such as "
-"\"America/New_York\",\"America/Chicago\", \"America/Denver\", "
-"\"America/Phoenix\" or \"America/Los_Angeles\". Complete list: <a "
-"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:50
+msgid "Sort"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:529
-msgid ""
-"Something was wrong with your LTI parameters.  If this recurs, please speak "
-"with your instructor"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
-msgid "Sort"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:751
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:814
-msgid "Sort by"
-msgstr "분류"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:4
+msgid "Sort by"
+msgstr "분류"
 
 #. ($names{$primary}, $names{$secondary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:817
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:324
 msgid "Sort by %1 and then by %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:171
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:115
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:3
 msgid "Sort:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:51
+msgid "Sorts the lists displayed by due date, name, etc."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:363
 msgid "Source File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1586
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1612
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1555
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1593
 msgid ""
 "Source file paths cannot include .. or start with /: your source file path "
 "was modified."
 msgstr ""
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:11
 msgid ""
 "Specify an ID, title, and institution for the new course. The course ID may "
 "contain only letters, numbers, hyphens, and underscores, and may have at "
 "most %1 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:661
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:94
+msgid ""
+"Spell check the text of the file that your are editing. Note that there will"
+" be many spelling errors in the code parts of your file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:116
+msgid "Standard Deviation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:162
 msgid "Start"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:609
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:47
+msgid "Start LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:130
 msgid "Start New Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:443
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:94
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:508
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:84
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:54
 msgid "Statistics"
 msgstr "점수 통계"
 
-#. ($self->{ce}{courseName} =~ s/_/ /gr,                   CGI::span({ dir =>
-#. 'ltr' }, format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:73
-msgid "Statistics for %1 set %2. Closes %3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:17
+msgid "Statistics Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:86
+msgid "Statistics for %1"
 msgstr ""
 
-#. ($self->{ce}{courseName}, $self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:68
-msgid "Statistics for %1 student %2"
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:90
+msgid "Statistics for %1 problem %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2089
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1442
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1524
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2020
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:296
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:659
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:806
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:191
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:192
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:84
+msgid "Statistics for student %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:442
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:151
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:160
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:36
 msgid "Status"
 msgstr "상태"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:29
 msgid "Stop Acting"
 msgstr "동작 중지"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2251
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:85
 msgid "Stop Archiving"
 msgstr "보관 중지"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2418
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1153
 msgid "Stop archiving courses"
 msgstr "교과목 보관 중지"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:233
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:783
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2011
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:295
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:829
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:887
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:916
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:30
 msgid "Student ID"
 msgstr "학생 ID"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:9
+msgid "Student ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:37
 msgid "Student Name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:570
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:428
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:56
 msgid "Student Progress"
 msgstr "학생 진행상황"
 
-#. ($self->{ce}->{courseName},                     CGI::span({ dir => 'ltr' },
-#. format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:81
-msgid "Student Progress for %1 set %2. Closes %3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:17
+msgid "Student Progress Help"
 msgstr ""
 
-#. ($self->{ce}->{courseName}, $self->{studentName})
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:72
+msgid "Student Progress for %1"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($c->stash('setID')
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:76
-msgid "Student Progress for %1 student %2"
+msgid "Student Progress for set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:628
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:80
 msgid "Student answers"
 msgstr "학생 답안"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:766
-msgid "Subject:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:80
+msgid ""
+"Student scores for the sets selected below will be calculated. This and "
+"other scoring operations can also be done using the \"Scoring Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:87
+msgid "Student:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:124
+msgid "Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:653
-msgid "Subject: "
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:50
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:8
+msgid "Subject:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:222
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:30
 msgid "Submission time:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:226
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:41
 msgid "Submit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:26
 msgid "Submit Answers"
 msgstr "정답 제출하기"
 
 #. ($effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1861
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:23
 msgid "Submit Answers for %1"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:502
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:525
 msgid "Submit your answers again to go on to the next part."
 msgstr "다음 단계로 이동하려면 답변을 다시 제출하십시오."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:775
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:183
 msgid "Success Index"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:106
+msgid ""
+"Success index is the square of the average score divided by the average "
+"number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:73
+msgid ""
+"Success index is the square of the score divided by the number of attempts."
+msgstr ""
+
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1086
 msgid "Successfully archived the course %1."
 msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:885
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:422
 msgid "Successfully created new achievement %1"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1252
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:581
 msgid "Successfully created new set %1"
 msgstr ""
 
 #. ($add_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:465
 msgid "Successfully created the course %1"
 msgstr ""
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1818
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2401
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1131
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:900
 msgid "Successfully deleted the course %1."
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1529
+#. ($rename_oldCourseID,							$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:772
 msgid "Successfully renamed the course %1 to %2"
 msgstr "%1 과정의 이름을 %2(으)로 성공적으로 변경"
 
 #. ($unarchive_courseID, $new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2653
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1286
 msgid "Successfully unarchived %1 to the course %2"
 msgstr "% 1을 % 2 코스에 성공적으로 보관 취소"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2099
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4280
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:89
+msgid "TA:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2274
 msgid "Table defined in database but missing in schema"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2097
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2269
 msgid "Table defined in schema but missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2265
 msgid "Table is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3200
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3490
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:276
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:576
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:106
 msgid "Take Action!"
 msgstr "실행!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Target Set:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:63
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:42
 msgid "TeX Source"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:784
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:258
+msgid "Test %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:54
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:52
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:55
+msgid "Test Name"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:156
 msgid "Test Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:224
 msgid "Test Time Limit (min; 0=Close Date)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2041
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:238
 msgid "Test Time Notification"
 msgstr "테스트 시간 알림"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:156
 msgid "Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:244
 msgid "Test not yet submitted."
 msgstr "시험이 아직 제출되지 않았습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:317
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:920
+msgid "Test parameters"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:149
 msgid "Test/quiz with time limit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:79
 msgid "Text"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:842
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:80
+msgid "Text Editor Options"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:55
 msgid "Text chapter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:864
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:66
 msgid "Text section:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:44
 msgid "Textbook:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1403
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:58
+msgid ""
+"The \"Edit Target Set\" button at the top of the page will take you to the "
+"Problem Set Editor which will allow you to edit dates, assign users and "
+"other information about the problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:115
+msgid ""
+"The \"Score\" tab will export achievement data to a CSV file that can be "
+"downloaded.  The export contains the global data including number of "
+"achievement points and current level of each student.  In addition for each "
+"selected achievement, a column for if the achievement was earned (1) or not "
+"earned (0) will be added to the CSV."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:194
+msgid ""
+"The <strong>Assigned sets</strong> column (x/y) indicates that x sets out of"
+" y sets avaiable have been assigned to this student. Click this link to "
+"assign or unassign sets to this student, to adjust due dates, or to adjust "
+"the grades on a homework set for a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:20
+msgid ""
+"The <strong>Set Detail</strong> page can be viewed in one of two distinct "
+"modes:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:189
+msgid ""
+"The <strong>login name</strong> column links allow you to \"act as\" a "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:191
+msgid ""
+"The <strong>pencil</strong> in the login column allows you to edit that "
+"student's data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:64
 msgid ""
 "The Attempts figure is the global average of the number of attempts (both "
 "correct and incorrect) individuals take on this problem.  A high figure may "
@@ -6137,7 +8202,7 @@ msgid ""
 "each part before continuing and each such  submittal counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1485
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:124
 msgid ""
 "The Attempts figure is the local average of the number of attempts (both "
 "correct and incorrect) individuals at your institution take on this problem."
@@ -6147,14 +8212,14 @@ msgid ""
 "counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1819
+#: /opt/webwork/webwork2/conf/defaults.config:1721
 msgid ""
 "The Maximum number of times Show me Another can be used per problem by a "
 "student. If set to -1 then there is no limit to the number of times that "
 "Show Me Another can be used."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1787
+#: /opt/webwork/webwork2/conf/defaults.config:1689
 msgid ""
 "The Reduced Scoring Period is the default period before the due date during "
 "which all additional work done by the student counts at a reduced rate. When"
@@ -6167,7 +8232,7 @@ msgid ""
 "work done counts 50% of the original.\" will be displayed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:78
 msgid ""
 "The Status figure is the global average of the Status individuals have "
 "earned on this problem. The Status is the percentage correct (from 0% to "
@@ -6176,7 +8241,7 @@ msgid ""
 "a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1506
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:138
 msgid ""
 "The Status figure is the local average of the Status individuals at your "
 "institution have earned on this problem. The Status is the percentage "
@@ -6185,47 +8250,61 @@ msgid ""
 "students will work on a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1262
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:11
 msgid "The WeBWorK Project"
 msgstr "WeBWorK 프로젝트"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:822
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:25
+msgid ""
+"The WeBWorK administrators need to be added to the course in order for them "
+"to access the course.  Unchecking this option will make it so WeBWorK "
+"administrators cannot directly login to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:129
+msgid ""
+"The achievement evaluator is the perl code that is run after each submit to "
+"determine if an achievement is earned or not.  Click on the \"Edit "
+"Evaluator\" link to edit the evaluator."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:26
 msgid ""
 "The adjusted status of a problem is the larger of the problem's status "
 "andthe weighted average of the status of those problems which count towards "
 "the parent grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1677
+#: /opt/webwork/webwork2/conf/defaults.config:1579
 msgid ""
 "The amount of time (in minutes) after the due date that the Answers are "
 "available to student to view.  You can change this for individual homework, "
 "but WeBWorK will use this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1667
+#: /opt/webwork/webwork2/conf/defaults.config:1569
 msgid ""
 "The amount of time (in minutes) before the due date when the assignment is "
 "opened.  You can change this for individual homework, but WeBWorK will use "
 "this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:386
 msgid "The answer above is NOT correct."
 msgstr "오답입니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:375
 msgid "The answer above is correct."
 msgstr "정답입니다."
 
 #. ($filename, $ce->{mail}{maxAttachmentSize})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:230
 msgid ""
 "The attached file \"%1\" exceeds the allowed attachment size of "
 "%quant(%2,megabyte)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:421
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:496
 msgid ""
 "The child problems for this problem will become visible to the student when "
 "they either have more incorrect attempts than is specified here, or when "
@@ -6234,173 +8313,252 @@ msgid ""
 "attempts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:704
+#. ('href="http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files"
+#. target="Webworkdocs"',
+#. '<code>demoCourse.lst</code>','<code>.csv</code>','<code>.lst</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:59
+msgid ""
+"The classlist files are stored in the templates directory and provide a "
+"convenient way to enter a large number of students into your class. To view "
+"the format for <strong>ClassList files</strong> see the <a %1>ClassList "
+"specification</a> or download the %2 file and use it as a model. ClassList "
+"files can be prepared using a spreadsheet and then saved as %3 (comma "
+"separated values) text files.  However, to access as a classlist file, the "
+"file suffix needs to be changed to %4, which can be done with the \"Rename\""
+" button."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:16
 msgid ""
 "The configuration module did not find the data it needs to function.  Have "
-"your site administrator check that Constants.pm is up to date."
+"your site administrator check that site configuration files are up to date."
+msgstr ""
+
+#. ($archive_courseID,					$archive_path)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:80
+msgid ""
+"The course \"%1\" has already been archived at \"%2\". This earlier archive "
+"will be erased.  This cannot be undone."
 msgstr ""
 
-#. (CGI::b($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:151
+#. (tag('strong', stash('courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:8
 msgid ""
 "The course %1 uses an external authentication system (%2). Please go there "
 "to log in again."
 msgstr ""
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:186
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:17
 msgid ""
 "The course %1 uses an external authentication system (%2). Please return to "
 "that system to access this course."
 msgstr ""
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:191
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:23
 msgid ""
 "The course %1 uses an external authentication system (%2). You've "
 "authenticated through that system, but aren't allowed to log in to this "
 "course."
 msgstr ""
 
-#. ($archive_courseID,						$archive_path)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2243
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:30
+msgid "The course database must be upgraded before archiving this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:30
+msgid "The course database must be upgraded before renaming this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:26
 msgid ""
-"The course '%1' has already been archived at '%2'. This earlier archive will"
-" be erased.  This cannot be undone."
+"The current mode should be made clear by the information at the top of the "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:46
+msgid ""
+"The current value of the achievement counter. Changes to this variable will "
+"be saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1995
+#: /opt/webwork/webwork2/conf/defaults.config:1897
 msgid "The default display mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1855
+#: /opt/webwork/webwork2/conf/defaults.config:1757
 msgid ""
 "The default number of attempts before the problem is re-randomized. ( 0 => "
 "never )"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1854
+#: /opt/webwork/webwork2/conf/defaults.config:1756
 msgid ""
 "The default number of attempts between re-randomization of the problems ( 0 "
 "=> never)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:251
-msgid "The directory you specified doesn't exist"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:73
+msgid ""
+"The description shown to students which states what action is needed to earn"
+" the achievement."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1829
-msgid "The display was already cleared."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:5
+msgid "The directory you specified doesn't exist"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2111
+#: /opt/webwork/webwork2/conf/defaults.config:2032
 msgid ""
 "The e-mail verbosity level controls how much information is automatically "
-"added to feedback e-mails.  Levels are<ol><li value=\"Simple\"> Simple: send"
-" only the feedback comment and context link</li><li value=\"Standard\"> "
-"Standard: as in Simple, plus user, set, problem, and PG data</li><li "
-"value=\"Debug\"> Debug: as in Standard, plus the problem environment "
-"(debugging data)</li></ol>"
+"added to feedback e-mails.  Levels are<ol><li> Simple: send only the "
+"feedback comment and context link</li><li> Standard: as in Simple, plus "
+"user, set, problem, and PG data</li><li> Debug: as in Standard, plus the "
+"problem environment (debugging data)</li></ol>"
 msgstr ""
 
-#. ($achievementName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:625
-msgid "The evaluator for %1 has been renamed to '%2'."
+#. ($achievementName,				$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:293
+msgid "The evaluator for %1 has been renamed to \"%2\"."
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:339
-msgid ""
-"The file %1/%2 already exists and cannot be overwritten. The message was not"
-" saved"
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:246
+msgid "The file \"%1\" cannot be found."
+msgstr ""
+
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:526
+msgid "The file \"%1\" cannot be read!"
+msgstr ""
+
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:522
+msgid "The file \"%1\" is a directory!"
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:190
-msgid "The file %1/%2 cannot be found."
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:259
+msgid "The file \"%1\" is a template. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:181
-msgid "The file %1/%2 is not readable by the webserver."
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:250
+msgid "The file \"%1\" is protected. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:373
-msgid "The file '%1' cannot be found."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:19
+msgid "The file $file does not appear to be a text or image file."
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1004
-msgid "The file '%1' cannot be read!"
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:277
+msgid ""
+"The file %1 already exists and cannot be overwritten. The message was not "
+"saved."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:380
-msgid "The file '%1' is a blank problem!"
+#. ("$emailDirectory/$openfilename",				$emailDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:156
+msgid ""
+"The file %1 cannot be found. Check whether it exists and whether the "
+"directory %2 can be read by the webserver. "
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:998
-msgid "The file '%1' is a directory!"
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
+msgid ""
+"The file %1 is not contained in the course templates directory and can not "
+"be modified."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:375
-msgid "The file '%1' is protected!"
+#. ("$emailDirectory/$openfilename")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:148
+msgid ""
+"The file %1 is not readable by the webserver. Check that it's permissions "
+"are set correctly."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:203
 msgid "The file does not appear to be a text file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:88
 msgid "The file you are trying to download doesn't exist"
 msgstr ""
 
 #. ($filename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:221
 msgid "The filetype of the attached file \"%1\" is not allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3843
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2149
 msgid "The following courses were successfully hidden:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3908
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2218
 msgid "The following courses were successfully unhidden:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4121
-msgid "The following upgrades are available for your WeBWorK system:"
-msgstr "WebWorK 시스템에 대해 다음 업그레이드를 사용할 수 있습니다:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:34
+msgid "The following describes how the checkboxes alter the scoring output"
+msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2081
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:66
 msgid ""
 "The following users are NOT assigned to this set and will be ignored: %1"
 msgstr ""
 
-#. (join('.', @{$problemSeqs[$children_counts_indexs[0]]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:288
+msgid "The given file path is not a valid location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:49
+msgid "The goal value of the achievement counter."
+msgstr ""
+
+#. (join('.', @{ $problemSeqs[ $children_counts_indexs[0] ] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1334
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the score of problem %1."
 msgstr ""
 
-#. (join(', ', map({join('.', @{$problemSeqs[$_]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2064
+#. (join(', ', map({ join('.', @{ $problemSeqs[$_] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the weighted average of the problems: %1."
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1954
-msgid "The hardcopy header for set %1 has been renamed to '%2'."
-msgstr "세트 %1에 대한 인쇄본 헤더의 이름이 '%2'로 변경되었습니다."
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1078
+msgid "The hardcopy header for set %1 has been renamed to \"%2\"."
+msgstr ""
+
+#. ($showHintsAfter)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:36
+msgid ""
+"The hint shown is an instructor preview and will be shown to students after "
+"%quant(%1,attempt)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:32
+msgid ""
+"The hint shown is an instructor preview and will not be shown to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:22
+msgid ""
+"The information box on the right displays information about the course. This"
+" is useful for leaving course wide messages for students. It contains text "
+"from the file templates/course_info.txt. Instructors can edit this file from"
+" the web (click on the \"Edit\" link)."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:111
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:30
 msgid ""
 "The initial value is the answer sub score for the answer that is currently "
 "shown.  If this is modified, it will be used to compute the total problem "
@@ -6408,37 +8566,100 @@ msgid ""
 "shown answer if the page is reloaded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:161
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:97
+msgid ""
+"The initial value is the currently saved score as a point value computed "
+"using the percent score.  This point value is used to compute the percent "
+"score (rounded to a whole percent) that can be saved."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:145
 msgid "The initial value is the currently saved score for this student."
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_oldCourseInstitution,
 #. $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
 msgid ""
 "The institution associated with the course %1 has been changed from %2 to %3"
 msgstr ""
 
-#. ($rename_newCourseID, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1498
+#. ($rename_newCourseID, $optional_arguments{courseInstitution})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:729
 msgid "The institution associated with the course %1 is now %2"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:599
+msgid ""
+"The instructor account with user id %1 does not exist.  Instructor accounts "
+"must be created manually."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:635
 msgid ""
 "The instructor account with user id %1 does not exist.  Please create the "
 "account manually via WeBWorK."
 msgstr ""
 
-#. ($r->param('new_set_name')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1897
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:87
+msgid ""
+"The key maps that are available are \"default\", \"emacs\", \"sublime\", and"
+" \"vim\". The \"default\" key map has the standard behavior of a browser "
+"text area. You can use Ctrl-C to copy, Ctrl-V to paste, Ctrl-F to search, "
+"etc. If you are more comfortable with the \"emacs\", \"sublime\", or \"vim\""
+" text editors then you may choose to use one of those key maps instead."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:75
+msgid "The large text window"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:27
+msgid ""
+"The list of files include regular files, directories (ending in a \"/\") and"
+" links (ending in a \"@\")."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:52
+msgid ""
+"The login name cannot be changed. (It is the primary key for the student's "
+"data.) If you make a mistake in the login name at the beginning of the "
+"course (before any work has been done) then it is best to simply add a new "
+"student with the correct entry and drop the student with the bad login name."
+" (See drop and delete students below.) If the login name must be changed "
+"after a user has started working assignments, then contact your system "
+"administrator, who can use the webwork2 \"bin/change_user_id\" script to "
+"change the user id."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:20
+msgid ""
+"The main page allows access to set and student statistics.  When selecting a"
+" student, their grades page is shown, which lists set totals and per problem"
+" grades for each set assigned to the student.  When selecting a set, various"
+" statistics and histograms are shown for the overall grades of students who "
+"are currently enrolled or auditing the course."
+msgstr ""
+
+#. ('href="http://webwork.maa.org/wiki" target="ww_wiki"',
+#. 'href="http://webwork.maa.org/wiki/Instructors" target="ww_wiki"')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:24
+msgid ""
+"The main page for WeBWorK documentation is the <a %1>webwork wiki</a> while "
+"specific help for instructors setting up a course are in the <a "
+"%2>instructors' section</a>."
+msgstr ""
+
+#. ($c->param('new_set_name')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:569
 msgid ""
 "The name \"%1\" is not a valid set name.  Use only letters, digits, dashes, "
 "underscores, periods, and spaces."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1530
+#: /opt/webwork/webwork2/conf/defaults.config:1432
 msgid ""
 "The name of course information file (located in the templates directory). "
 "Its contents are displayed in the right panel next to the list of homework "
@@ -6455,151 +8676,249 @@ msgid ""
 "go back to the LMS to access something in the WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:63
+msgid "The number of points earned for earning the achievement."
+msgstr ""
+
 #. ($openDate, $dueDate, $answerDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1104
 msgid ""
 "The open date: %1, close date: %2, and answer date: %3 must be defined and "
 "in chronological order."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:702
+#. ($path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:393
+msgid "The original path is not in a valid location. Using failsafe %1"
+msgstr ""
+
+#. ($forcedSourceFile)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:510
+msgid "The original path to the file is %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:262
 msgid "The password and password confirmation for the instructor must match."
 msgstr ""
 
-#. (CGI::b($r->maketext("[_1]'s Current Password", $user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:27
+msgid ""
+"The password can be any combination of letters, numbers and special symbols."
+" Students are encouraged to use all three, and stay away from dictionary "
+"words. The password should not be the same as any password used elsewhere, "
+"such as for an email account. The password will only be present on the page "
+"if the user has permission to change the password."
+msgstr ""
+
+#. ($c->tag(                                               'b',
+#. $c->maketext(                                                   "[_1]'s
+#. Current Password",
+#. $c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:95
 msgid ""
 "The password you entered in the %1 field does not match your current "
 "password. Please retype your current password and try again."
 msgstr ""
 
-#. (CGI::b($r->maketext("[_1]'s New Password",         $e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:105
+#. ($c->tag('b', $c->maketext("[_1]'s New Password",         $e_user_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:82
 msgid ""
 "The passwords you entered in the %1 and %2 fields don't match. Please retype"
 " your new password and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:789
-msgid "The path to the original file should be absolute"
-msgstr "파일의 초기경로는 완전합니다"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:374
+msgid "The path can not be the temporary edit directory."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:667
-msgid ""
-"The percentage of active students with correct answers for each problem"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:370
+msgid "The path to the original file should be absolute."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:131
 msgid ""
 "The percentage of students receiving at least these scores. The median score"
 " is in the 50% column."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:458
 msgid "The prerequisite conditions have not been met for set '%1'."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1917
-msgid "The problem set is not yet open"
-msgstr "문제집이 아직 열리지 않았습니다."
-
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2012
-msgid "The recorded score for this version is  %1/%2."
+#. (q(down menu to change which student's seed and answers are shown.  Use the
+#. "Mark Correct" checkbox to set)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:26
+msgid ""
+"The problem is shown at the top with the seed and answers of the selected "
+"student.  Use the drop "
 msgstr ""
 
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2021
-msgid "The recorded score for this version is %1/%2."
-msgstr ""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:62
+msgid "The problem set is not yet open"
+msgstr "문제집이 아직 열리지 않았습니다."
 
 #. ($origReducedScoringDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1971
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1121
 msgid ""
 "The reduced credit date %1 in the file probably was generated from the Unix "
 "epoch 0 value and is being treated as if it was Unix epoch 0."
 msgstr ""
 
 #. ($openDate, $dueDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1982
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1135
 msgid ""
 "The reduced credit date should be between the open date %1 and close date %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1220
 msgid ""
 "The reduced scoring date should be between the open date and close date."
 msgstr ""
 
 #. ($tempFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:307
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:298
 msgid "The requested file \"%1\" does not exist on the server."
 msgstr ""
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2085
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1389
 msgid "The score for this problem can count towards score of problem %1."
 msgstr ""
 
-#. ($setName, $effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:306
-msgid "The selected problem set (%1) is not a valid set for %2"
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:69
+msgid ""
+"The scoring files are stored in the scoring directory and are produced using"
+" the \"Scoring Tools\" page or the scoring command in the \"Instructor "
+"Tools\" module. These files can be downloaded, modified in a spreadsheet "
+"(for example, to add midterm scores) and then uploaded again to the scoring "
+"directory to be merged with email messages. (Use a new file name, other than"
+" %1, when uploading to prevent the scoring module from overwriting an "
+"uploaded file.)"
 msgstr ""
 
-#. ($urlpath->arg("setID")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1467
-msgid "The selected problem set (%1) is not a valid set for %2%3:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:52
+msgid ""
+"The second row of the problem collection area is for browsing directories. "
+"The OPL will be there as well as any other directories that you may set up "
+"(for example Contrib). If this is selected, all subdirectories containing "
+"problems will be listed."
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1946
-msgid "The set header for set %1 has been renamed to '%2'."
+#. (stash('setID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet.html.ep:13
+msgid "The selected problem set (%1) is not a valid set for %2."
+msgstr ""
+
+#. ($setID, $effectiveUserID, $c->{invalidVersionCreation} ? " (acted as by
+#. $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:77
+msgid "The selected problem set (%1) is not a valid set for %2: %3"
+msgstr ""
+
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1066
+msgid "The set header for set %1 has been renamed to \"%2\"."
 msgstr ""
 
-#. ($newSetName)
 #. ($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1164
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:491
+msgid ""
+"The set name \"%1\" is already in use. Pick a different name if you would "
+"like to start a new set. No set created."
+msgstr ""
+
+#. ($newSetName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:584
 msgid ""
 "The set name '%1' is already in use.  Pick a different name if you would "
 "like to start a new set."
 msgstr ""
 
-#. ($setID, $editingSetVersion, $editForUser[0])
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2109
-msgid "The set-version (%1, version %2) is not assigned to user %3."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:58
+msgid ""
+"The sets checked below will be visible to students or hidden from students. "
+"Useful for preparing sets ahead of time, but not showing them to students; "
+"or for temporarily hiding a set which has a mistake in it while it is being "
+"fixed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:54
+msgid ""
+"The sets checked below will become available for editing the due dates and "
+"visibility."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:73
+msgid ""
+"The sets checked below will written to set definition files, to be saved for"
+" future use, or to be transferred to another course. The set definition "
+"files can be uploaded/downloaded using the \"File Manager\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:29
+msgid ""
+"The simple configuration file is the name of the configuration file created "
+"when using the \"Course Configuration\" page to configure course options.  "
+"This option sets if this configuration file is copied from the old course or"
+" not and instead use the server defaults."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:551
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:521
 msgid "The solution has been removed."
 msgstr ""
 
-#. ($fullSetName, $prettyProblemNumber, $self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1975
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:33
+msgid ""
+"The solution shown is an instructor preview and will only be shown to "
+"students after the due date."
+msgstr ""
+
+#. ($c->{fullSetID},
+#. $c->{prettyProblemNumber},
+#. $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1103
 msgid ""
-"The source file for 'set %1 / problem %2 has been changed from '%3' to '%4'"
+"The source file for \"set %1 / problem %2\" has been changed from \"%3\" to "
+"\"%4\"."
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2133
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1209
+msgid ""
+"The temporary file %1 is not contained in the course templates directory and"
+" can not be deleted."
+msgstr ""
+
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:689
+msgid ""
+"The temporary file %1 is not in the course templates directory and can not "
+"be deleted!"
+msgstr ""
+
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:349
 msgid ""
 "The test (which is version %1) may  no longer be submitted for a grade."
 msgstr "시험지(버전 %1)는 더 이상 점수를 받을 수 없습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1927
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1042
 msgid ""
 "The text box now contains the source of the original problem. You can "
 "recover lost edits by using the Back button on your browser."
 msgstr "테스트 박스가 초기 문제의 소스를 가지고 있습니다. 브라우저에서 뒤로가기 버튼을 눌러 잃어버린 편집본을 복구할 수 있습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:214
+#. (			% . 'but the result will not be counted.')
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:23
 msgid ""
 "The time limit on this assignment was exceeded. The assignment may be "
-"checked, but the result will not be counted."
+"checked, "
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1657
+#: /opt/webwork/webwork2/conf/defaults.config:1559
 msgid ""
 "The time of the day that the assignment is due.  This can be changed on an "
 "individual basis, but WeBWorK will use this value for default when a set is "
@@ -6607,24 +8926,39 @@ msgid ""
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1443
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:689
 msgid "The title of the course %1 has been changed from %2 to %3"
 msgstr ""
 
-#. ($rename_newCourseID, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1491
+#. ($rename_newCourseID, $optional_arguments{courseTitle})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:722
 msgid "The title of the course %1 is now %2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:167
+msgid ""
+"The top number is the percent score on the problem.  A period (.) indicates "
+"a problem has not been attempted. The bottom number is the number of "
+"incorrect attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:25
+msgid ""
+"The total grade row at the bottom shows the total score and percent average "
+"over all open assignments.  The total grade row can be shown/hidden under "
+"general course configuration settings."
+msgstr ""
+
 #. ($enableReducedScoring)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1151
 msgid ""
 "The value %1 for enableReducedScoring is not valid; it will be replaced with"
 " 'N'."
 msgstr ""
 
 #. ($timeCap)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2032
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1209
 msgid ""
 "The value %1 for the capTimeLimit option is not valid; it will be replaced "
 "with '0'."
@@ -6632,81 +8966,90 @@ msgstr ""
 
 #. ($hideScore)
 #. ($hideScoreByProblem)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2023
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1178
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1189
 msgid ""
 "The value %1 for the hideScore option is not valid; it will be replaced with"
 " 'N'."
 msgstr ""
 
 #. ($hideWork)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1200
 msgid ""
 "The value %1 for the hideWork option is not valid; it will be replaced with "
 "'N'."
 msgstr ""
 
 #. ($relaxRestrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2045
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1235
 msgid ""
 "The value %1 for the relaxRestrictIP option is not valid; it will be "
 "replaced with 'No'."
 msgstr ""
 
 #. ($restrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2037
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1221
 msgid ""
 "The value %1 for the restrictIP option is not valid; it will be replaced "
 "with 'No'."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:46
+msgid "The visible name/title of the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:36
 msgid ""
 "The webwork server must be able to write to these directories. Please "
 "correct the permssion errors."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1537
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:83
+msgid "Theme"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1439
 msgid "Theme (refresh page after saving changes to reveal new theme.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:109
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:5
 msgid "Theme:"
 msgstr ""
 
 # Context is "Sort by ____ Then by _____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:843
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:872
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:30
 msgid "Then by"
 msgstr "그러면"
 
-#. ($count_line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:603
+#. ($listingsCount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:52
 msgid "There are %1 matching WeBWorK problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1625
+#: /opt/webwork/webwork2/conf/defaults.config:1527
 msgid ""
 "There are currently two hardcopy themes to choose from: One Column and Two "
 "Columns.  The Two Columns theme is the traditional hardcopy format.  The One"
 " Column theme uses the full page width for each column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2979
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1519
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
 "least one table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1243
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:23
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
-"least one table.  They can only be removed when upgrading the course."
+"least one table.  They can be removed when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1404
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
 "least one table. Check the checkbox by the field to delete it when upgrading"
@@ -6714,63 +9057,48 @@ msgid ""
 "is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1508
 msgid "There are extra database tables which are not defined in the schema."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2833
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1389
 msgid "There are extra database tables which are not defined in the schema. "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:15
 msgid ""
 "There are extra database tables which are not defined in the schema.  These "
 "can be deleted when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:601
-msgid "There are no matching WeBWorK problems"
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:29
+msgid "There are many options available at the bottom:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:976
-msgid "There are no set definition files in this course to look at."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:49
+msgid "There are no completed versions of this test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2199
-msgid ""
-"There are tables or fields missing from the database.  The database must be "
-"upgraded before archiving this course."
-msgstr "데이터베이스에서 누락된 테이블 또는 필드가 있습니다. 이 교과목을 보관하기 전에 데이터베이스를 업그레이드해야 합니다."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4108
-msgid "There are upgrades available for the Open Problem Library."
-msgstr "Open Problem Library에 사용할 수 있는 업그레이드가 있습니다."
-
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4072
-msgid ""
-"There are upgrades available for your current branch of PG from branch %1 in"
-" remote %2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:51
+msgid "There are no matching WeBWorK problems"
 msgstr ""
 
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4010
-msgid ""
-"There are upgrades available for your current branch of WeBWorK from branch "
-"%1 in remote %2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:8
+msgid "There are no set definition files in this course to look at."
 msgstr ""
 
 #. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:273
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:87
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
 "their name, you destroy all of the data for achievement %1 for this student."
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:230
+#. (tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:91
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
@@ -6778,37 +9106,29 @@ msgid ""
 "student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:205
-msgid ""
-"There is NO undo for this function.  Do not use it unless you know what you "
-"are doing!  When you unassign sets using this button, or by unchecking their"
-" set names, you destroy all of the data for those sets for this student."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:234
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:68
 msgid "There is NO undo for unassigning a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:174
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:177
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:139
-msgid "There is NO undo for unassigning students."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4069
-msgid "There is a new version of PG available."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:125
+msgid ""
+"There is NO undo for unassigning sets. Do not do so unless you know what you"
+" are doing!  When you unassign sets by unchecking set names and clicking "
+"save, you destroy all of the data for those sets for this student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4007
-msgid "There is a new version of WeBWorK available."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:21
+msgid "There is NO undo for unassigning students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:529
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:490
 msgid "There is a written solution available."
 msgstr ""
 
 #. ($message_file, $merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:50
 msgid ""
 "There is no additional grade information.  A message about additional grades"
 " can go in [TMPL]/email/%1. It is merged with the file [Scoring]/%2. These "
@@ -6817,185 +9137,324 @@ msgid ""
 msgstr ""
 
 #. ($continueTimeLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:486
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:25
 msgid ""
 "There is no time remaining on the currently open test. Click continue below "
 "and then click \"Grade Test\" within %1 seconds to submit the test for a "
 "grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:856
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:65
 msgid "There is no undo for deleting files or directories!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:534
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:495
 msgid ""
 "There is no written solution available for this problem, but you can still "
 "view the correct answers."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:537
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:498
 msgid "There is no written solution available for this problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1539
-msgid ""
-"There is one main theme to choose from: math4. It has two variants, "
-"math4-green and math4-red. The theme specifies a unified look and feel for "
-"the WeBWorK course web pages."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2270
+#: /opt/webwork/webwork2/conf/defaults.config:1441
 msgid ""
-"There may be something wrong with this question. Please inform your "
-"instructor including the warning messages below."
+"There is one main theme to choose from: math4. It has three variants: "
+"math4-green, math4-red, and math4-yellow. The theme specifies a unified look"
+" and feel for the WeBWorK course web pages."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:441
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator if this recurs."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:284
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:307
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:475
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:484
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:511
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:543
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:219
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:354
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:492
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:536
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:575
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:172
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:189
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:212
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:227
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:365
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:447
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1935
+#. ('href="https://webwork.maa.org/wiki/Set_Definition_Files"
+#. target="Webworkdocs"')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:48
 msgid ""
-"These users and higher get the \"Show Past Answers\" button on the problem "
-"page."
+"These are stored in the templates directory. The format of <strong>Set "
+"Definition files</strong> is described in the <a %1>Set Definition "
+"specification</a>. Set definition files are mainly useful for transferring "
+"set assignments from one course to another and are created when exporting a "
+"problem set from the \"Hmwk Sets Editor\".  Each set defintion file contains"
+" a list of problems used and the dates and times. These definitions can be "
+"imported into the current course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:133
-msgid "This action can take a long time if there are many students."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:77
+msgid ""
+"These are the files from which problems are generated and are located in the"
+" templates directory or in subdirectories. They can be edited directly using"
+" the \"Edit\" link on each problem page or from the \"Hmwk Sets Editor\". "
+"The File Manager allows you to upload or download these files. \tDirectories"
+" that start with \"set\" contain pg files and are generated when exporting a"
+" problem set in which there are local versions of a problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:168
-msgid "This action will not overwrite existing users."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:40
+msgid ""
+"These options will only be shown if the user has the permission to change "
+"display settings used in pg problems."
 msgstr ""
 
-#. (CGI::b($r->maketext("Guest Login")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:279
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:44
 msgid ""
-"This course supports guest logins. Click %1 to log into this course as a "
-"guest."
+"These problems require some application of algorithms, but do not rise to "
+"the level of a full word problem. For example, \"Identify the local extrema "
+"for f(x) = ...\". One has to apply algorithms and interpret results."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:851
-msgid "This homework set contains no problems."
-msgstr "이 문제집에는 문제가 없습니다."
+#: /opt/webwork/webwork2/conf/defaults.config:1837
+msgid ""
+"These users and higher get the \"Show Past Answers\" button on the problem "
+"page."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1988
-msgid "This homework set is closed."
-msgstr "이 문제집은 마감 시간이 지났습니다."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:17
+msgid "This action can take a long time if there are many students."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1986
-msgid "This homework set is not yet open."
-msgstr "이 문제집은 아직 열리지 않습니다."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:12
+msgid "This action will not overwrite existing users."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:932
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:20
 msgid ""
-"This is a blank problem template file and can not be edited directly. Use "
-"the 'NewVersion' action below to create a local copy of the file and add it "
-"to the current problem set."
+"This allows for the viewing, downloading, uploading and other management of "
+"files in the course.  Select a file or set of files (using CTRL or SHIFT) "
+"and click the desired button on the right.  Many actions can only be done "
+"with a single file (like view). Selecting a directory or set of files and "
+"clicking \"Make Archive\" creates a compressed tar file with the name "
+"COURSE_NAME.tgz"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
-msgid "This is a new (re-randomized) version of the problem."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:34
+msgid ""
+"This browses the Open Problem Library (OPL) in category "
+"(Subject/Chapter/Section) form. Select the desired categories (all three do "
+"not need to be selected) and click \"View Problems\". If the \"Include "
+"Contrib\" box is selected then those problems in the Contrib section of the "
+"OPL that have the categories defined are also included. Contrib problems are"
+" problem that haven't been vetted as thoroughly as OPL problems. If you want"
+" hints or solutions included while browsing select the appropriate box."
 msgstr ""
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:580
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:49
+msgid ""
+"This button is also present both at top and the bottom of the page. Discards"
+" all changes, reloading the page by re-reading the database information for "
+"this set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:39
+msgid ""
+"This button is present both at top and the bottom of the page. Any and all "
+"changes made to any part of the set will be saved with one important "
+"exception: When editing the set for one or more students, you can choose to "
+"override the default value (defined for the set in general) by clicking on "
+"the checkbox and providing a value (or possibly leaving blank) and checking "
+"the override checkbox. If you do <strong>NOT</strong> check the checkbox, "
+"the override value will be discarded and the default value for the set will "
+"be used for the users currently being edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:105
+msgid ""
+"This can computed from the answer sub scores above using the weights shown "
+"if they are modified.  Alternatively, enter the point score you want saved "
+"here (the above sub scores will be ignored)."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2005
+msgid ""
+"This configures if the single problem manual grader has inputs to enter "
+"problem scores as a percent, a point value, or both. Note, the problem score"
+" is always saved as a percent, so when using a point value, the problem "
+"score will be rounded to the nearest whole percent."
+msgstr ""
+
+#. (tag('b', maketext('Guest Login')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:72
+msgid ""
+"This course supports guest logins. Click %1 to log into this course as a "
+"guest."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:58
+msgid ""
+"This determines if MathQuill answer blanks are enable for the user. This "
+"option is only present if MathQuill is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:63
+msgid ""
+"This determines if the MathView equation editor button will be appended to "
+"text answer blanks. his option is only present if MathView is enabled for "
+"the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:52
+msgid ""
+"This determines whether or not saved past answers are automatically filled "
+"in to the problem form when a student returns to a problem after having left"
+" the problem. This option is only visible if the user has the permission to "
+"show old answers."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:85
+msgid ""
+"This directory is accessible from the web. You can use it to store html "
+"documents or image documents that are used by the course. Do not store "
+"private information in this directory or in any subdirectory thereof. These "
+"documents can be linked to from within problems using the htmlLink macro."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:255
+msgid "This file is a template. You may use \"Save As\" to create a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:20
+msgid ""
+"This form can assign, unassign, and edit user data for a single achievement."
+"  You can assign the achievement to all current users or select which users "
+"to assign the achievement to and click Save.  You can unassign the "
+"achievement by unchecking a student's name (note all data will be deleted)."
+"  To unassign the achievement from all users, first select \"Allow "
+"unassign\" and then click the \"Unassign from All Users\" button. You can "
+"also toggle the earned status with the checkbox in the \"Earned\" column and"
+" edit the achievement counter for counting achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:19
+msgid ""
+"This gives the status and dates of the main set. Indvidual students may have"
+" different settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:51
+msgid "This homework set contains no problems."
+msgstr "이 문제집에는 문제가 없습니다."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1231
+msgid "This homework set is closed."
+msgstr "이 문제집은 마감 시간이 지났습니다."
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1229
+msgid "This homework set is not yet open."
+msgstr "이 문제집은 아직 열리지 않습니다."
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:423
+msgid "This is a new (re-randomized) version of the problem."
+msgstr ""
+
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:109
 msgid ""
 "This is a timed test. You will have %quant(%1,hour) and %quant(%2,minute) to"
 " complete the test."
 msgstr ""
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:592
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:119
 msgid ""
 "This is a timed test. You will have "
 "%quant(%1,hour,hours,)%quant(%2,minute,minutes,) to complete the test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:284
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:81
 msgid ""
-"This is the Achievement Editor.  It is used to edit the achievements "
-"available to students.  Please keep in mind the following facts: Achievments"
-" are displayed, and evaluated, in the order they are listed. The \"secret\" "
-"category creates achievements which are not visible to students until they "
-"are earned.  The \"level\" category is used for the achievements associated "
-"to a users level."
+"This is done by first entering the user as a student and then changing the "
+"permission level of the user. First edit the user by clicking on the pencil "
+"next to their name (or using the technique above for several users), then "
+"change their permssion level -- an entry blank at the far right of the "
+"screen, you may have to scroll to see it. The permission levels are"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:481
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:156
 msgid ""
-"This is the classlist editor page, where you can view and edit the records "
-"of all the students currently enrolled in this course.  The top of the page "
-"contains forms which allow you to filter which students to view, sort your "
-"students in a chosen order, edit student records, give new passwords to "
-"students, import/export student records from/to external files, or "
-"add/delete students.  To use, please select the action you would like to "
-"perform, enter in the relevant information in the fields below, and hit the "
-"\"Take Action!\" button at the bottom of the form.  The bottom of the page "
-"contains a table containing the student usernames and their information. "
-"Clicking on the links in the column headers of the table will sort the table"
-" by the field it corresponds to. The Login Name fields contain checkboxes "
-"for selecting the user.  Clicking the link of the name itself will allow you"
-" to act as the selected user.  There is also an edit link following the name"
-" which will take you to a page where you can edit the selected user's "
-"information.  Clicking the emails will allow you to email the corresponding "
-"user.  Clicking the links in the entries in the assigned sets columns will "
-"take you to a page where you can view and reassign the sets for the selected"
-" user. "
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page if you wish to assign a homework set to all students or a large group "
+"of students (e.g. a section)."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1810
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:161
 msgid ""
-"This is the default number of attempts before show me another becomes "
-"available to students.  It can be set to -1 to disable show me another by "
-"default."
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:456
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:171
 msgid ""
-"This is the homework sets editor page where you can view and edit the "
-"homework sets that exist in this course and the problems that they contain. "
-"The top of the page contains forms which allow you to filter which sets to "
-"display in the table, sort the sets in a chosen order, edit homework sets, "
-"publish homework sets, import/export sets from/to an external file, score "
-"sets, or create/delete sets.  To use, please select the action you would "
-"like to perform, enter in the relevant information in the fields below, and "
-"hit the \"Take Action!\" button at the bottom of the form.  The bottom of "
-"the page contains a table displaying the sets and several pieces of relevant"
-" information. The Edit Set Data field in the table contains checkboxes for "
-"selection and a link to the set data editing page.  The cells in the Edit "
-"Problems fields contain links which take you to a page where you can edit "
-"the containing problems, and the cells in the edit assigned users field "
-"contains links which take you to a page where you can edit what students the"
-" set is assigned to."
+"This is done from the \"Hmwk Sets Editor\" page or the \"Instructor tools\" "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:71
+msgid ""
+"This is most easily done by importing a class list. The class list can be "
+"uploaded from your workstation to the server using the File Manager page. "
+"The class list must be a file ending in .lst and must have a specific <a "
+"href=\"http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files\">format</a>."
+" Once the file has been uploaded to the server the file will appear in the "
+"import action pop-up list (5th action). demoCourse.lst is available for most"
+" courses and adds the \"practice users\" which activate guest logins to the "
+"class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:23
+msgid ""
+"This is the administration course which is used to manage courses on this "
+"server.  Use the \"Admin Menu\" to select the desired action."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1996
+msgid ""
+"This is the default number of attempts a student must make before hints will"
+" be shown to the student. Set this to -1 to hide hints.  Note that this can "
+"be overridden with a per problem setting."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1699
+#: /opt/webwork/webwork2/conf/defaults.config:1712
+msgid ""
+"This is the default number of attempts before show me another becomes "
+"available to students.  It can be set to -1 to disable show me another by "
+"default."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1601
 msgid ""
 "This is the number of achievement points given to each user for completing a"
 " problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:166
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:150
 msgid ""
 "This is the only part of the score that is actually saved. This is computed "
 "from the answer sub scores above using the weights shown if they are "
@@ -7003,142 +9462,314 @@ msgid ""
 " scores will be ignored)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:388
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:19
+msgid "This is the standard entry point for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:92
 msgid ""
-"This is the past answer viewer.  Students can only see their answers, and "
-"they will not be able to see which parts are correct.  Instructors can view "
-"any users answers using the form below and the answers will be colored "
-"according to correctness."
+"This is where email messages and templates are saved. You can upload or "
+"download files in this directory if you wish to save the files for later."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2462
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:77
+msgid ""
+"This is where you edit the text of the problem template. Type Ctrl-Enter "
+"while this window has focus to re-render the problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:669
 msgid ""
 "This is your last submission.  If you say yes, then your answers will be "
 "final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2466
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:673
 msgid ""
 "This is your only submission.  If you say yes, then your answers will be "
 "final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3038
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:42
+msgid ""
+"This link gives details for many macros. It links to documentation embedded "
+"in the macro files themselves."
+msgstr ""
+
+#. ('PGMLLab/PGML-lab.pg')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:63
+msgid ""
+"This links to a WeBWorK \"problem\" which allows you to try out fragments of"
+" PGML code. This link will not be available if the file %1 is not located in"
+" the templates directory of the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:33
+msgid "This links to a list of problem authoring techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:39
+msgid "This links to a page describing Math Object usage."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:72
+msgid "This links to problem authoring information on the WeBWorK wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:46
+msgid ""
+"This may be Mathjax, images, or plainText. Only the options that are enabled"
+" for the course will be available to select. This option is only visible if "
+"there is more than one display mode enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:42
+msgid "This option shows all pg problems in the course directory structure."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:47
+msgid ""
+"This option shows all problems in set definition files that are located in "
+"the course directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:44
+msgid ""
+"This option shows all problems in sets that have been created in the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:20
+msgid ""
+"This page allows one to edit the contents of PG problem files as well as set"
+" headers and other files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:20
+msgid ""
+"This page allows users to change their password, email address, and display "
+"settings used in problems. Note that you can hide this page entirely for "
+"students by setting permission levels to login_proctor or higher for the "
+"permissions to change password, change e-mail address, and change display "
+"settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:20
+msgid ""
+"This page allows you to configure course settings such as permission levels,"
+" display modes allowed, default display mode, email feedback behavior, and "
+"much more."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:20
+msgid ""
+"This page displays a student's current achievement level and progress toward"
+" the next level, and lists the rewards and badges that the student has "
+"earned. If rewards have been earned, then the student may also redeem those "
+"rewards."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:26
+msgid ""
+"This page gives access to information about the student, independent of the "
+"homework sets assigned to them."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:20
+msgid ""
+"This page gives information about mass LTI grade updates, and allows you to "
+"trigger a grade update for all users and all sets, all sets for one user, "
+"all users for one set, or one user for one set.  When a user is selected, "
+"the sets drop down menu is updated to only allow selecting sets assigned the"
+" selected user.  Similarly when a set is selected, the user menu is updated "
+"to only allow selecting valid users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:20
+msgid ""
+"This page is a collection of tools to modify users and sets.  These tools "
+"are short cuts for common actions that allow selecting multiple users or "
+"sets to act on at once.  Because multiple users and sets can be acted on at "
+"the same time, it is often more efficient to use this page when modifying "
+"multiple items.  For example, after selecting several users and a set you "
+"can change the close date for all selected users for that set.  This page "
+"also gives access to \"View/Edit all sets for one user\", which can be used "
+"to access settings for all sets including test versions for that user."
+msgstr ""
+
+#. (q(table to save any changes.  Each student's name links to that student's
+#. problem and opens up the)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:20
+msgid ""
+"This page is for manually grading a problem for all assigned students.  The "
+"table of students shows their last answers, percent score, and feedback "
+"comment.  The \"Save\" button is located below the "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:20
+msgid ""
+"This page is used to browse problems that will be used to fill problem sets."
+" The first step is to choose which set you are working on. If you need to "
+"create a new problem set fill in the blank next to the \"Create a New Set in"
+" This Course\" button and then press the button. Then choose which set you "
+"want to work on in the drop down menu."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:20
+msgid ""
+"This page is useful for monitoring student progress on assignments. Student "
+"progress can either be viewed for a single set or for a single student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:20
+msgid ""
+"This page manages all of the homework sets (including quizzes/tests). The "
+"following allow editing directly of a single problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:20
+msgid ""
+"This page shows the student's current grades for all sets they are assigned "
+"to.  Only visible sets are shown to the student, while invisible set names "
+"are italic when viewed as an instructor.  Students can only see the per "
+"problem grades on open assignments."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3169
 msgid "This problem contains a video which must be viewed online."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:602
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:631
 msgid "This problem has more than one part."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2059
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2293
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1323
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1576
 msgid ""
 "This problem has open subproblems.  You can visit them by using the links to"
 " the left or visiting the set page."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem.html.ep:66
+msgid "This problem is not valid."
+msgstr ""
+
 #. ($prettyID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2619
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:399
 msgid "This problem uses the same source file as number %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:418
 msgid "This problem will not count towards your grade."
 msgstr "이 문제는 성적에 들어가지 않습니다."
 
-#. ($EMAIL)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1109
+#. ($ur->email_address)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:1
 msgid "This sample mail would be sent to %1"
 msgstr "이 샘플 메일은 %1(으)로 전송됩니다"
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2088
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1399
 msgid ""
 "This score for this problem does not count for the score of problem %1 or "
 "for the set."
 msgstr ""
 
-#. ($message_file,		$merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:167
+#. ($message_file,				$merge_file)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:127
 msgid ""
 "This scoring message is generated from [TMPL]/email/%1. It is merged with "
 "the file [Scoring]/%2. These files can be edited using the \"Email\" link "
 "and the \"File Manager\" link in the left margin."
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2215
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:155
 msgid "This set %1 is assigned to %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2932
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:678
 msgid "This set doesn't contain any problems yet."
 msgstr ""
 
-#. ($beginReducedScoringPeriod, $dueDate, $reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:334
+#. ($c->formatDateTime($reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:44
 msgid ""
 "This set had a reduced scoring period that started on %1 and ended on %2.  "
 "During that period all work counted for %3% of its value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:78
 msgid ""
 "This set has a set-level proctor password to authorize logins. Enter the "
 "password below."
 msgstr ""
 
-#. (CGI::span({class=>$visiblityStateClass}, $visiblityStateText)
-# Context is "This set is visible" or "This set is hidden"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:532
-msgid "This set is %1"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:411
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:59
 msgid "This set is hidden from students."
 msgstr ""
 
 #. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:330
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:40
 msgid ""
 "This set is in its reduced scoring period.  All work counts for %1% of its "
 "value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:65
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:51
+msgid "This set is not assigned to any students."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:57
 msgid "This set is visible to students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:190
-msgid "This set needs to be assigned to you before you can grade it."
-msgstr "점수를 매기기 전에 이 문제집이 할당되야 합니다."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:42
+msgid "This set or problem is not valid."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:158
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:164
 msgid ""
 "This set will be unavailable to students until they have earned a certain "
-"score on the sets specified in this field.  The sets should be written as a "
-"comma separated list.  The minimum score required on the sets is specified "
-"in the following field."
+"score on the sets specified in this field. The sets should be written as a "
+"comma separated list. The minimum score required on the sets is specified in"
+" the following field."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2007
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:111
+msgid ""
+"This should be done cautiously. Once a student is deleted from a course "
+"their data is lost forever and cannot be recovered. They can be added to the"
+" course as a new student, but all of their homework set assignments and "
+"homework has been permanently deleted."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1962
 msgid "This source file does not exist!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1961
 msgid "This source file is a directory!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1963
 msgid "This source file is not a plain file!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2005
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1960
 msgid "This source file is not readable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:358
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+msgid ""
+"This specifies the number of attempts before hints are shown to students. "
+"The value of -2 uses the default from course configuration. The value of -1 "
+"disables hints. Note that this will only have an effect if the problem has a"
+" hint."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
 msgid ""
 "This specifies the rerandomization period: the number of attempts before a "
 "new version of the problem is generated by changing the Seed value. The "
@@ -7146,134 +9777,175 @@ msgid ""
 "disables rerandomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:651
-msgid ""
-"This table lists the current attempts for this test/quiz, along with its "
-"status, score, start date, and close date. Click on the version link to "
-"access that version. "
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:626
-msgid "This test is closed."
-msgstr "이 시험은 마감 시간이 지났습니다."
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:548
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:81
 msgid "This test requires a proctor password to continue."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:600
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:126
 msgid "This test requires a proctor password to start."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2248
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2323
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:45
+msgid "This will determine if the output is in one or two columns."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:21
 msgid "Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:249
 msgid "Time Interval for New Test Versions (min; 0=infty)"
 msgstr ""
 
-#. ($elapsedTime,$allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:159
+msgid "Time Remaining"
+msgstr ""
+
+#. ($c->{elapsedTime}, sprintf('%.0f', 10 * ($c->{set}->due_date -
+#. $c->{set}->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:336
 msgid "Time taken on test: %1 min (%2 min allowed)."
 msgstr "소요 시간: %1 분 (%2 분 중)."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
 msgid "Timestamp"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1610
+#: /opt/webwork/webwork2/conf/defaults.config:1512
 msgid "Timezone for the course"
 msgstr ""
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:512
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:330
 msgid "To access this set you must score at least %1% on set %2."
 msgstr ""
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:514
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:336
 msgid ""
 "To access this set you must score at least %1% on the following sets: %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:53
 msgid ""
 "To add an additional instructor to the new course, specify user information "
 "below. The user ID may contain only numbers, letters, hyphens, periods "
 "(dots), commas,and underscores."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:42
 msgid ""
 "To add the WeBWorK administrators to the new course (as administrators) "
 "check the box below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:239
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:118
+msgid ""
+"To assign one or more sets to an individual student click in the column "
+"\"Assigned Sets\" in the student's row. This will take you to a page where "
+"you can assign and unassign homework sets and change the due dates for "
+"homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:79
 msgid ""
 "To change status (scores or grades) for this student for one set, click on "
 "the individual set link."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:621
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:106
 msgid ""
-"To copy problem templates from an existing course, select the course below."
+"To copy the templates and html folders from an existing course, select the "
+"course below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2200
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:102
+msgid ""
+"To drop a student or students, select them for editing as described above "
+"and then set the pop-up list to enrolled,drop, or audit. Dropped students "
+"cannot log in to the course, are not assigned new homework sets and are not "
+"sent e-mail. They can be re-enrolled simply by changing their status back to"
+" enrolled. No data is lost, any homework sets assigned before they were "
+"dropped are restored unchanged."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:143
 msgid ""
 "To edit a specific student version of this set, edit (all of) her/his "
 "assigned sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:376
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:29
 msgid ""
-"To edit this text you must first make a copy of this file using the "
-"'NewVersion' action below."
+"To perform an action select the desired action tab and click the submit "
+"button."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:90
+msgid "To this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:381
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:69
 msgid ""
-"To edit this text you must use the 'NewVersion' action below to save it to "
-"another file."
+"To use the Email merge feature, upload a CSV with calculated grades to the "
+"scoring directory using the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1343
-msgid "To this Problem"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:767
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:58
+msgid "Today"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:33
+msgid "Toggle each of the options to include or not include in the output."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:522
+msgid "Top Score"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:118
+msgid "Top level of author information on the wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:114
+msgid "Total Points"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:18
 msgid "Total Points:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:90
 msgid "Totals"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:290
 msgid "Totals only (not problem scores)"
 msgstr "총점만 보이기(개별 문제점수는 보이지 않고)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:291
 msgid "Totals only, only after answer date"
 msgstr " 답변 날짜 이후에 총점만 보이기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:236
 msgid "Transfer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:284
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:22
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:35
 msgid "True"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1279
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:245
 msgid "Try it"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:26
 msgid "Tunic of Extension"
 msgstr ""
 
@@ -7281,209 +9953,340 @@ msgstr ""
 msgid "Two Columns"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1470
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:30
 msgid "Type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2325
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:84
+msgid "Type:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:23
 msgid "URI"
 msgstr ""
 
 #. ($achievementName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:297
 msgid "Unable to change the evaluator for set %1. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:819
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1084
+msgid "Unable to change the hardcopy header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1070
+msgid "Unable to change the set header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{fullSetID}, $c->{prettyProblemNumber})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1110
+msgid ""
+"Unable to change the source file path for set %1, problem %2. Unknown error."
+msgstr ""
+
+#. ($c->shortPath($delFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1246
+msgid "Unable to delete backup file \"%1\"."
+msgstr ""
+
+#. ($formatBackupTime)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:571
+msgid "Unable to delete backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:888
+msgid "Unable to make \"%1\" the hardcopy header for %2."
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:860
+msgid "Unable to make \"%1\" the set header for %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:693
 msgid "Unable to obtain error messages from within the PG question."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:384
-msgid "Unable to write to '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:275
+msgid "Unable to open a temporary file at the given location."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2613
+#. ($c->shortPath($backupFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1233
+msgid "Unable to read backup file \"%1\"."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:636
+msgid "Unable to write to \"%1\": %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:15
 msgid "Unarchive"
 msgstr ""
 
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2596
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:4
 msgid "Unarchive %1 to course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2581
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:40
 msgid "Unarchive Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2675
-msgid "Unarchive Next Course"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:17
+msgid "Unarchive Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:25
+msgid "Unarchive Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:214
-msgid "Unassign All Sets"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1306
+msgid "Unarchive Next Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:281
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:239
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:97
 msgid "Unassign from All Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:61
 msgid "Unassign selected sets from selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:58
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:57
 msgid ""
-"Unassignments were not done.  You need to both click to \"Allow unassign\" "
-"and click on the Unassign button."
+"Unassignments were not done.  You need to select \"Allow unassign\" and then"
+" click on the Unassign button."
 msgstr ""
 
 #. ($unattempted, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1047
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:44
 msgid "Unattempted: %1/%2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:53
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:37
 msgid "Unclassified Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:242
 msgid "Ungraded"
 msgstr "채점되지 않은"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3723
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3765
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:58
 msgid "Unhide Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1465
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1151
+msgid "Unkown saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:28
 msgid ""
-"Unlock an additional version of a Gateway Test.  If used before the close "
-"date of the Gateway Test this will allow you to generate a new version of "
-"the test."
+"Unlock an additional version of a test.  If used before the close date of "
+"the test this will allow you to generate a new version of the test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:164
-msgid "Unpack"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:47
+msgid "Unpack Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:113
 msgid "Unpack archives automatically"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2709
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:15
 msgid "Unselect all courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:130
-msgid "Update"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:63
+msgid "Update Display"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:671
-msgid "Update Display"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:84
+msgid "Update Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:27
+msgid "Update Interval"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:930
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:102
 msgid "Update Menus"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:729
-msgid "Update settings and refresh page"
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:51
+msgid "Update aborted. Invalid set %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2695
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:47
+msgid "Update aborted. Invalid user %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:67
+msgid "Update set:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:8
 msgid "Update the checked directories?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3544
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:50
+msgid "Update user:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1908
 msgid "Updated location description."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2739
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2917
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:40
 msgid "Upgrade"
 msgstr ""
 
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
 msgid "Upgrade %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1327
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2278
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:97
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:79
 msgid "Upgrade Course Tables"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2693
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2761
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:382
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:42
 msgid "Upgrade Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3010
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:17
+msgid "Upgrade Courses Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:43
+msgid "Upgrade courses from a previous version of WeBWorK."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1582
 msgid "Upgrade process completed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:388
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:65
 msgid "Upload"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2441
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:72
+msgid ""
+"Upload, download and delete text files, including scoring spread sheets, set"
+" definition files, class list spread sheets, and \"PG\" problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:292
 msgid "Use Default Header File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:325
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:127
 msgid "Use Equation Editor?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:204
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:20
 msgid "Use Reward"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2720
-msgid "Use System Default"
-msgstr "시스템 초기값 사용"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:516
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:27
 msgid "Use browser back button to return from preview mode."
 msgstr ""
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:506
+#. (tag('b', $c->{achievementID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:16
 msgid "Use in achievement %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:526
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:23
 msgid "Use in new achievement:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:149
 msgid "Use live equation rendering?"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2028
+#: /opt/webwork/webwork2/conf/defaults.config:1929
 msgid "Use log base 10 instead of base <i>e</i>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2034
+#: /opt/webwork/webwork2/conf/defaults.config:1935
 msgid "Use older answer checkers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:234
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:123
+msgid ""
+"Use the \"Create\" and \"Delete\" actions to create or delete achievements. "
+"Note that deleting an achievement will delete all data associated to the "
+"achievement and cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:35
+msgid ""
+"Use the \"Merge file\" drop down menu to select which merge file to use, or "
+"select \"None\" to not use any merge file.  When a merge file is selected, "
+"the data for active students will be displayed above the \"Email Body\".  "
+"This will show you the structure of the merge file and the column variables "
+"associated with each column.  Data that is longer than 7 characters will be "
+"truncated, and the data can be scrolled up and down to see all rows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:28
+msgid ""
+"Use the \"Users\" and \"Sets\" forms to select which users and sets to act "
+"on.  Multiple items can be selected using ctrl-click or shift-click.  The "
+"action buttons are grouped into three categories.  The first is a set of "
+"actions that act on the selected users, the second is a set of actions that "
+"act on the selected sets, and the third is a set of actions for acting on a "
+"combination of sets and users.  If an invalid number of users or sets are "
+"selected, the action will not be preformed, and an error message will be "
+"placed on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:25
+msgid ""
+"Use the editor to edit the evaluator and the action form at the bottom to "
+"save the evaluator. You can either overwrite the current evaluator file or "
+"save as a new evaluator file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:15
 msgid ""
 "Use the interface below to quickly access commonly-used instructor tools, or"
 " select a tool from the list to the left."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:332
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:26
+msgid ""
+"Use the options in the second box to pick a collection of problems decribed "
+"below. In each case, clicking \"View Problems\" will render a fixed number "
+"of problems (default of 20). After problems are shown, there will be options"
+" to show the next/previous batch of problems, add all problems to the target"
+" set (set at the top of the page) or clear the curent batch of problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:27
 msgid ""
 "Use this form to ask your instructor a question, to report a problem with "
 "the WeBWorK system, or to report an error in a problem you are attempting. "
@@ -7491,73 +10294,103 @@ msgid ""
 "system will be included."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:29
+msgid "Use this page to change your password."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:20
+msgid ""
+"Use this page to send emails to active (enrolled or auditing) students.  "
+"Emails can be sent to all active students or selected students.  Use the "
+"\"Students\" form to sort, filter, or format how the user name is displayed."
+"  Click \"Change Display Settings\" to apply any changes.  Use control-click"
+" or shift-click to select multiple students to email."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:67
+msgid ""
+"Used for \"counting\" achievements, which sets the value a counter must "
+"reach in order to earn the achievement. For example this is used counting "
+"the number of completed problems."
+msgstr ""
+
+#. (param('user')
+#. (param('effectiveUser')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:7
+msgid "User \"%1\" not found."
+msgstr ""
+
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:324
 msgid ""
-"User '%1' will not be copied from admin course as it is the initial "
+"User \"%1\" will not be copied from admin course as it is the initial "
 "instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:557
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:34
+msgid "User %1 not found."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:217
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:64
 msgid "User ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:298
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:230
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:28
 msgid "User Settings"
 msgstr "사용자 정보"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:490
-msgid "User Value"
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:17
+msgid "User Settings Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:52
-msgid "User has been assigned to all current sets."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:576
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:13
+msgid "User overrides"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:58
-msgid "User has been unassigned from all sets."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:247
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:62
 msgid "User's name is:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:68
-msgid "User's sets have been reassigned."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:60
 msgid "User's username is:"
 msgstr ""
 
 #. ($user, $setID, $j)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1077
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
 msgid ""
 "UserProblem missing for user=%1 set=%2 problem=%3. This may indicate "
 "database corruption."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:51
 msgid "Username"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:499
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:126
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:272
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:9
 msgid "Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:339
 msgid "Users Assigned to Set %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2077
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:17
+msgid "Users Assigned to Set Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:65
 msgid "Users List"
 msgstr "사용자 리스트"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1925
+#: /opt/webwork/webwork2/conf/defaults.config:1827
 msgid ""
 "Users at this level and higher are allowed to change display settings used "
 "in pg problems.Note that if it is expected that there will be students that "
@@ -7566,31 +10399,31 @@ msgid ""
 "those students may need to disable MathQuill."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1915
+#: /opt/webwork/webwork2/conf/defaults.config:1817
 msgid ""
 "Users at this level and higher are allowed to change their e-mail address. "
 "Normally guest users are not allowed to change the e-mail address since it "
 "does not make sense to send e-mail to anonymous accounts."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1879
+#: /opt/webwork/webwork2/conf/defaults.config:1781
 msgid ""
 "Users at this level and higher are allowed to change their password. "
 "Normally guest users are not allowed to change their password."
 msgstr "이 수준 이상의 사용자는 암호를 변경할 수 있습니다. 일반적으로 청강생은 비밀번호를 변경할 수 없습니다."
 
-#. ($names{$primary}, $names{$secondary}, $names{$ternary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:924
+#. ($c->maketext(FIELD_PROPERTIES()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:316
 msgid "Users sorted by %1, then by %2, then by %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1906
+#: /opt/webwork/webwork2/conf/defaults.config:1808
 msgid ""
 "Users with at least this permission level get a link in the left panel for "
 "reporting bugs to the bug tracking system at bugs.webwork.maa.org."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2140
+#: /opt/webwork/webwork2/conf/defaults.config:2051
 msgid ""
 "Users with this permssion level or greater will automatically be sent "
 "feedback from students (generated when they use the \"Contact instructor\" "
@@ -7599,157 +10432,225 @@ msgid ""
 "permission level to \"nobody\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1348
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:193
 msgid "Uses Math Objects"
 msgstr ""
 
-#. ($default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:197
-msgid "Using contents of the default message %1 instead."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1239
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:18
 msgid "Using what display mode?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:6
 msgid "Using what seed?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:19
+msgid "Using which hardcopy format?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:49
+msgid "Using which hardcopy theme?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:31
+msgid ""
+"Usually means students must demonstrate understanding of facts. This is more"
+" than regurgitating the fact. We use this category for simple and direct "
+"applications of algorithms the student has studied. There should be no "
+"judgement involved in choosing the method. This would include a simple "
+"application of a rule for differentiation (e.g., can combine rules for sums "
+"and constant multiples with one more advanced rule) or for integrals."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Value"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1747
+#: /opt/webwork/webwork2/conf/defaults.config:1649
 msgid "Value of work done in Reduced Scoring Period"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:687
-msgid "Variable Documentation:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config/config_help.html.ep:20
+msgid "Variable Documentation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:115
+msgid "Version"
 msgstr ""
 
 #. ($ver->{version})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:679
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:173
 msgid "Version %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:159
 msgid "Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:43
 msgid "Versions of a set can only be edited for one user at a time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:128
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2419
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2756
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:528
 msgid "View"
 msgstr "보기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1000
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:488
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:523
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:681
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:948
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:6
 msgid "View Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:276
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:57
+msgid "View details of student perofrmance either by individual or by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:86
 msgid "View equations as"
 msgstr "방정식은 다음 디스플레이 설정으로 본다"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:283
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:18
 msgid "View statistics by set"
 msgstr "문제집별 진행상황 통계 보기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:19
 msgid "View statistics by student"
 msgstr "학생별 진행상황 통계 보기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:55
+msgid ""
+"View statistics of students' performance on homework either by individual or"
+" by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:14
 msgid "View student progress by set"
 msgstr "문제집별 학생 진행상황 보기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:303
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:15
 msgid "View student progress by student"
 msgstr "학생별 진행상황 보기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:65
 msgid "View/Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:224
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:90
-msgid "Viewing temporary file:"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:104
+msgid "View/Reload"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:766
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:790
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:31
+msgid "View/access current and archived courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:146
+msgid "Viewing Problems in a New Window"
+msgstr ""
+
+#. ($c->{problem}->source_file)
+#. ($screenSetHeader)
+#. ($course_info_path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:81
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:109
+msgid "Viewing temporary file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:25
 msgid "Visibility"
 msgstr "보임"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:915
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:7
 msgid "Visible"
 msgstr "보임"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:622
 msgid "Visible sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
 msgid "Visible to Students"
 msgstr "학생들에게 보임"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2269
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:844
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "Warning"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2319
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:13
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:117
 msgid "Warning messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1039
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:259
+msgid "Warning messages:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all set-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1035
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all user-related data and is not undoable!"
 msgstr "경고: 삭제시 모든 사용자 관련 정보가 사라지고, 복구되지 않습니다!"
 
-#. ($problem_desc , CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1397
+#. ($problem_desc,				$c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1194
 msgid "Warnings encountered while processing %1. Error text: %2"
 msgstr ""
 
-#. ($copyright_years, $theme, $ww_version, $pg_version)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1261
-msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4 |"
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:39
+msgid ""
+"We use this for carrying out more complicated algorithms, such as "
+"derivatives using both the product and chain rule or integrals which involve"
+" say both a substitution and parts."
+msgstr ""
+
+#. ($ce->{WW_COPYRIGHT_YEARS} || '1996-2023',              $ce->{defaultTheme}
+#. || 'unknown -- set defaultTheme in localOverides.conf',
+#. $ce->{WW_VERSION}         || 'unknown -- set WW_VERSION in VERSION',
+#. $ce->{PG_VERSION}         || 'unknown -- set PG_VERSION in ../pg/VERSION')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:9
+msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2227
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:3
 msgid "WeBWorK Error"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:3
 msgid "WeBWorK Warnings"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1549
+#: /opt/webwork/webwork2/conf/defaults.config:1451
 msgid ""
 "WeBWorK currently has translations for the languages listed in the course "
 "configuration."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:20
+msgid ""
+"WeBWorK does not have a full featured scoring ability. We leave that to your"
+" favorite spreadsheet application."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:38
+msgid ""
+"WeBWorK expects many files to be in certain locations.  The following "
+"describe this. Note that by default the File Manager shows the \"templates\""
+" directory.  Other directories mentioned below are at the same level and "
+"need to be accessed by going up a directory by clicking the \"^\" button "
+"above the file list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:6
 msgid ""
 "WeBWorK has encountered a software error while attempting to process this "
 "problem. It is likely that there is an error in the problem itself. If you "
@@ -7758,7 +10659,7 @@ msgid ""
 " more information."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:6
 msgid ""
 "WeBWorK has encountered warnings while processing your request. If this "
 "occured when viewing a problem, it was likely caused by an error or "
@@ -7768,19 +10669,19 @@ msgid ""
 " warning output below for more information."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:577
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:558
 msgid ""
 "WeBWorK was unable to generate a different version of this problem.  Close "
 "this tab, and return to the original problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:367
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:29
 msgid ""
 "WeBWorK was unable to generate a paper copy of this homework set.  Please "
 "inform your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:78
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
 msgid ""
 "WeBWorK will automatically create users when logging in via the LMS for the "
 "first time. If this flag is enabled then it will also keep the user account "
@@ -7790,36 +10691,44 @@ msgid ""
 "next time the user logs in."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:370
 msgid "Weight"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:6
 msgid "Welcome to WeBWorK!"
 msgstr "WeBWorK에 오신 걸 환영합니다!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:24
+msgid ""
+"What WeBWorK does have is good support for summarizing the scores on WeBWorK"
+" homework sets and tests and exporting them in a form (.csv) which any "
+"spreadsheet can use. WeBWorK reports all of the homework grades with options"
+" shown below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:27
 msgid "What could be inside?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:715
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:17
 msgid "What field should filtered users match on?"
 msgstr "어떤 필드에 필터된 사용자가 맞습니까?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
 msgid ""
 "When a student has more attempts than is specified here they will be able to"
 " view another version of this problem.  If set to -1 the feature is disabled"
 " and if set to -2 the course default is used."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1899
+#: /opt/webwork/webwork2/conf/defaults.config:1801
 msgid ""
 "When acting as a student, this permission level and higher can submit "
 "answers for that student."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2071
+#: /opt/webwork/webwork2/conf/defaults.config:1972
 msgid ""
 "When numerical answers are checked, most test if the student's answer is "
 "close enough to the programmed answer be computing the error as a percentage"
@@ -7828,7 +10737,7 @@ msgid ""
 "0.1 means 0.1 percent error is allowed.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2098
+#: /opt/webwork/webwork2/conf/defaults.config:2019
 msgid ""
 "When students click the <em>Email Instructor</em> button to send feedback, "
 "WeBWorK fills in the subject line.  Here you can set the subject line.  In "
@@ -7838,14 +10747,32 @@ msgid ""
 "recitation</li><li>%% = literal percent sign</li></ul>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1638
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:35
+msgid ""
+"When the class is very large not all students will be displayed. Using the "
+"first action on this page you can show only the students from a given "
+"recitation or from a given section, or only students whose login or last "
+"name fits a pattern match. The second action will sort the students "
+"currently being displayed. You can also sort the displayed students by "
+"clicking on the active links at the top of each column."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:56
+msgid ""
+"When the message is ready to send, click \"Send Email\". This will queue the"
+" email to be sent, which can take several minutes depending on the number of"
+" students selected.  You will be notified by email once all the emails have "
+"been sent."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1540
 msgid ""
 "When this is on students will see a line on the Grades page which has their "
 "total cumulative homework score.  This score includes all sets assigned to "
 "the student."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:90
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
 msgid ""
 "When this is true, then when a user enters WeBWorK from an external tool "
 "link in the LMS, the bottom of the screen will display the data that the LMS"
@@ -7853,23 +10780,56 @@ msgid ""
 "different LMS systems have different parameters."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1957
+#: /opt/webwork/webwork2/conf/defaults.config:1859
 msgid ""
 "When viewing a problem, WeBWorK usually puts the previously submitted answer"
 " in the answer blank.  Below this level, old answers are never shown.  "
 "Typically, that is the desired behaviour for guest accounts."
 msgstr ""
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:30
+msgid ""
+"When viewing progress for a single student, their grades page is shown which"
+" lists set totals and per problem grades for each set assigned to the "
+"student.  This shows the same information as the statistics page for the "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:26
+msgid ""
+"When viewing set statistics, the drop down menus can be used to show stats "
+"for individual sections, recitations, or problems.  The overall results "
+"include all students who are assigned to the set, while the individual "
+"problem results only include active (have attempted the problem) students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:24
+msgid ""
+"When viewing student progress for a set, the score for the set and the "
+"status for problems in the set are listed for all students.  The table can "
+"be sorted by clicking the links in the table header.  Click the student's "
+"name to access the student's set.  When viewing progress for a test, "
+"additional columns can be shown/hidden by updating the display at the top"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:74
+msgid ""
+"When you unassign a set from students, you destroy all of the data for the "
+"set for those students. If the set is re-assigned to these students, then "
+"they will receive new versions of problems in the set.  Make sure this is "
+"what you want to do before unassigning sets from students."
+msgstr ""
+
+#. (tag('b', $achievementID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:21
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for achievement %1 for this student. Make sure this is what you want to"
 " do."
 msgstr ""
 
-#. (CGI::b({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:146
+#. (tag('b', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:26
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for homework set %1 for this student. You will then need to reassign "
@@ -7877,7 +10837,7 @@ msgid ""
 "problems. Make sure this is what you want to do before unchecking students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:72
 msgid ""
 "When you uncheck a homework set (and save the changes), you destroy all of "
 "the data for that set for this student.   If you reassign the set, the "
@@ -7885,243 +10845,461 @@ msgid ""
 "you want to do before unchecking sets."
 msgstr ""
 
-#. ($self->formatDateTime($set->open_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:343
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:87
+msgid "Wiki summary page for MathObjects"
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:444
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:167
 msgid "Will open on %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:49
+msgid "Word problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:15
 msgid "Worth"
 msgstr "점수"
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:382
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:51
+msgid "Write a new PG problem file or edit an existing one."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:188
+msgid ""
+"Write permissions have not been enabled for \"%1\".  Changes must be saved "
+"to another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:630
+msgid ""
+"Write permissions have not been enabled for \"%1\". Changes must be saved to"
+" another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:182
 msgid ""
-"Write permissions have not been enabled for '%1'.  Changes must be saved to "
-"another file for viewing."
+"Write permissions have not been enabled in \"%1\".  Changes must be saved to"
+" a different directory for viewing."
 msgstr ""
 
-#. ($self->shortPath($currentDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:380
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:624
 msgid ""
-"Write permissions have not been enabled in '%1'.  Changes must be saved to a"
+"Write permissions have not been enabled in \"%1\".Changes must be saved to a"
 " different directory for viewing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:178
 msgid ""
 "Write permissions have not been enabled in the templates directory.  No "
 "changes can be made."
 msgstr "템플릿 디렉토리에 쓸 권한이 없음. 변경할 수 없음."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:380
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:620
+msgid ""
+"Write permissions have not been enabled in the templates directory. No "
+"changes can be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:287
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:330
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:509
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:82
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:657
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:67
 msgid "Yes"
 msgstr "예"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:500
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:454
 msgid ""
 "You are currently checking answers to a different version of your problem - "
 "these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:511
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:470
 msgid ""
 "You are currently previewing answers to a different version of your problem "
 "- these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr ""
 
-#. ($userSet->set_id, $r->connection->remote_ip)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:270
+#. ($ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:18
+msgid ""
+"You are in the Reduced Scoring Period.  All work counts for %1% of the "
+"original."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:183
+msgid "You are not allowed to act as a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:188
+msgid "You are not allowed to assign homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:383
+msgid "You are not allowed to delete %1."
+msgstr ""
+
+#. ($userSet->set_id, $c->tx->remote_address)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:261
 msgid ""
 "You are not allowed to generate a hardcopy for %1 from your IP address, %2."
 msgstr "IP 주소 %2에서 %1에 대한 인쇄본을 생성할 수 없습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2049
-msgid "You are not authorized to access the Instructor tools."
-msgstr "강사 전용 도구입니다."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:185
+msgid "You are not allowed to modify homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:191
+msgid "You are not allowed to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:4
+msgid "You are not allowed to send e-mail."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:2
+msgid "You are not authorized to access instructor tools"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:4
+msgid "You are not authorized to access instructor tools."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:9
+msgid "You are not authorized to assign homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:10
+msgid "You are not authorized to create or delete courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:2
+msgid "You are not authorized to edit achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:28
+msgid "You are not authorized to edit user specific information."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:37
+msgid "You are not authorized to grade homework sets."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:271
-msgid "You are not authorized to access the instructor tools."
-msgstr "강사 전용 도구입니다."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:8
+msgid "You are not authorized to manage course files"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:392
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:33
 msgid "You are not authorized to modify homework sets."
 msgstr "문제집을 변경할 권한이 없습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:35
 msgid "You are not authorized to modify problems."
 msgstr "문제를 변경할 권한이 없습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:396
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:39
 msgid "You are not authorized to modify set definition files."
 msgstr "문제집 정의 파일을 변경할 권한이 없습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:15
 msgid "You are not authorized to modify student data"
 msgstr "학생 데이터를 수정할 권한이 없습니다"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:11
+msgid "You are not authorized to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:3
+msgid "You are not authorized to modify the course configuration."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:230
 msgid "You are not authorized to perform this action."
 msgstr "이 동작을 취할 권한이 없습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:260
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:11
+msgid "You are not authorized to score sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:13
+msgid "You are not authorized to send mail to students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:11
+msgid "You are not authorized to update lti scores"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers.html.ep:8
+msgid "You are not authorized to view past answers"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:251
 msgid ""
 "You are not permitted to generate a hardcopy for a set with hidden work."
 msgstr "숨겨진 문제집은 인쇄본을 생성할 수 없습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:236
 msgid "You are not permitted to generate a hardcopy for an unopened set."
 msgstr "시작 전 문제집의 인쇄본을 생성할 수 없습니다."
 
-#. ($showMeAnother{MaxReps},					$solutionShown)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:559
+#. ($showMeAnother{MaxReps},						$solutionShown)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:532
 msgid ""
 "You are only allowed to click on Show Me Another %quant(%1,time,times) per "
 "problem. %2 Close this tab, and return to the original problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2051
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2070
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:265
 msgid "You are out of time!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:374
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:36
 msgid "You can also examine the following temporary files: "
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGanswermacros.pl:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:108
+msgid ""
+"You can assign selected achievements to all users by using the \"Assign\" "
+"action action and selecting which achievements to assign.  You can select "
+"which users to assign/unassign to an achievement by clicking on the link in "
+"the \"Edit Users\" column."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1039
+msgid ""
+"You can change the file path for this problem manually from the \"Hmwk Sets "
+"Editor\" page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:27
+msgid ""
+"You can check the boxes to the right of the sets and click \"Generate "
+"Hardcopy for Selected Sets\" to generate a PDF hardcopy of the selected "
+"sets. You can generate hardcopies for multiple users including their answers"
+" as well. Note that students will only be able to generate hardcopies of a "
+"single set at a time. Students will only be able to include answers in the "
+"hardcopy after the answer date."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:127
+msgid ""
+"You can delete problems by clicking the \"Delete it?\" check box and saving."
+" If the set is already active it is recommended that you instead use the "
+"\"Mark Correct?\" problem to mark a particular problem correct for all "
+"students."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGanswermacros.pl:1616
 msgid "You can earn partial credit on this problem."
 msgstr "이 문제의 부분 점수를 받았습니다."
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:382
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:142
+msgid ""
+"You can edit a problem by clicking the \"Edit Problem\" icon to the right of"
+" the problem number. This will open the problem in the PG problem editor in "
+"a new tab or window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:92
+msgid ""
+"You can edit a single achievement by clicking on the pencil icon next to the"
+" achievement ID.  You can edit multiple achievements by selecting which "
+"achievements to edit, then click the \"Edit\" button. You can edit all of "
+"the achievements by changing which achievements to edit form \"selected "
+"achievements\" to \"all achievements\", or click the checkbox next to the "
+"Achievement ID to select all achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:44
+msgid ""
+"You can edit the class list data for a single student by clicking on the "
+"pencil icon next to their login name. To edit several students at once click"
+" on the \"Select\" checkbox next to their names, click on the radio button "
+"for editing selected users and then click the \"Edit\" button. You can also "
+"edit all visible users (those students currently being displayed) or even "
+"all users in the course although this last option might take a long time to "
+"load for a large class."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:397
 msgid "You can get a new version of this problem after the due date."
 msgstr "이 문제의 새 버전은 마감일 이후에 받을 수 있습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1368
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:101
+msgid ""
+"You can import/export from their respective action tab.  Exporting saves "
+"information about the achievement as a .axp file which is a CSV that lists "
+"each achievements information.  You can import .axp files that have been "
+"previously exported."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:769
 msgid "You can not specify an absolute path"
 msgstr ""
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1121
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:549
 msgid "You can only %1 one file at a time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:92
 msgid "You can only download regular files."
 msgstr "일반 파일만 다운로드할 수 있습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:591
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:197
 msgid "You can only edit text files"
 msgstr "텍스트 파일만 편집할 수 있습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:908
-msgid "You can only unpack files ending in '.tgz', '.tar' or '.tar.gz'"
-msgstr "‘.tgz’, ‘.tar’ 또는 ‘.tar.gz’로 끝나는 파일만 압축을 풀 수 있습니다."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:374
+msgid "You can only unpack files ending in \".tgz\", \".tar\" or \".tar.gz\""
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:134
+msgid ""
+"You can render a problem by clicking the \"Render Problem\" icon to the "
+"right of the problem number. The display mode used to render the problem is "
+"chosen using the drop down menu. You can render all problems using the "
+"\"Render All\" button. \"Hide All\" will hide all rendered problems. It is "
+"also useful to collapse problem details when doing this, as it makes it "
+"easier to drag problems around."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:120
+msgid ""
+"You can reorder problems by clicking on the arrow icon and dragging the "
+"problem. You will see a box showing you where the problem will be placed. "
+"When problems are reordered any holes in the numbering will be filled in."
+msgstr ""
 
 #. ($showMeAnother{MaxReps} >= $showMeAnother{Count}
 #. ? ($showMeAnother{MaxReps} - $showMeAnother{Count})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1895
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:44
 msgid ""
 "You can use this feature %quant(%1,more time,more times,as many times as you"
 " want) on this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:439
 msgid "You can't download directories"
 msgstr "디렉터리를 다운로드할 수 없습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:440
 msgid "You can't download files of that type"
 msgstr "해당 유형의 파일은 다운로드할 수 없습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:584
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:192
 msgid "You can't edit a directory"
 msgstr "디렉터리를 편집할 수 없습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:528
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
 msgid "You can't view files of that type"
 msgstr "해당 유형의 파일을 볼 수 없습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:985
 msgid "You cannot archive the course you are currently using."
 msgstr "현재 사용 중인 교과목은 보관할 수 없습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1712
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:850
 msgid "You cannot delete the course you are currently using."
 msgstr "현재 사용 중인 교과목을 삭제할 수 없습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1081
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:378
 msgid "You cannot delete yourself!"
 msgstr "본인을 삭제할 수 없습니다!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:579
 msgid "You did not specify a new set name."
 msgstr "새 문제집의 이름을 지정하지 않았습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:232
 msgid "You didn't enter any message."
 msgstr "메시지를 하나도 입력하지 않았습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:312
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:303
 msgid "You do not have permission to access the requested file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:159
 msgid "You do not have permission to change the hardcopy theme."
 msgstr "인쇄본 테마를 변경할 수 있는 권한이 없습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:578
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:186
 msgid "You do not have permission to edit this file."
 msgstr "이 파일을 편집할 수 있는 권한이 없습니다."
 
 #. ($hardcopy_format)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:151
 msgid "You do not have permission to generate hardcopy in %1 format."
 msgstr "%1 형식의 인쇄본을 생성할 권한이 없습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1639
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1161
 msgid "You do not have permission to view the details of this error."
 msgstr "자세한 오류를 볼 권한이 없습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements.html.ep:13
 msgid "You don't have any Achievement data associated to you!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:237
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:51
 msgid "You don't have any rewards!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2109
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:325
 msgid "You exceeded the allowed time."
 msgstr ""
 
-#. ($numLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2082
+#. ($c->{numAttemptsLeft})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:277
 msgid "You have %1 attempt(s) remaining on this test."
 msgstr ""
 
-#. ($numLeft,						$numLeft - 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2458
+#. ($c->{numAttemptsLeft},								$c->{numAttemptsLeft} - 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:664
 msgid ""
 "You have %1 submissions remaining for this test.  If you say yes, then you "
 "will have %quant(%2,submission) remaining. Once all submissions have been "
@@ -8129,724 +11307,702 @@ msgid ""
 "work this test version."
 msgstr ""
 
-#. ($attemptsLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2012
+#. ($problem->max_attempts - $attempts)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1270
 msgid "You have %negquant(%1,unlimited attempts,attempt,attempts) remaining."
 msgstr ""
 
 #. ($attempts_before_rr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1217
 msgid ""
 "You have %quant(%1,attempt,attempts) left before new version will be "
 "requested."
 msgstr ""
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:506
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:44
 msgid ""
 "You have %quant(%1,hour) and %quant(%2,minute) remaining to complete the "
 "currently open test."
 msgstr ""
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:518
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:54
 msgid ""
 "You have %quant(%1,hour,hours,)%quant(%2,minute,minutes,) remaining to "
 "complete the currently open test."
 msgstr ""
 
-#. ($minutes,									$seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:529
+#. ($minutes,							$seconds)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:64
 msgid ""
 "You have %quant(%1,minute) and %quant(%2,second) remaining to complete the "
 "currently open test."
 msgstr ""
 
 #. ($seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:72
 msgid ""
 "You have %quant(%1,second) remaining to complete the currently open test."
 msgstr ""
 
 #. ($attempts)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1243
 msgid "You have attempted this problem %quant(%1,time,times)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:1
 msgid "You have been logged out of WeBWorK."
 msgstr "WeBWorK에서 로그아웃되었습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2065
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:260
 msgid "You have less than 1 minute to complete this test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2046
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:241
 msgid "You have less than 45 seconds left!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2043
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:240
 msgid ""
 "You have less than 90 seconds left to complete this assignment. You should "
 "finish it soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1004
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:452
 msgid "You have not chosen a file to upload."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:845
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "You have requested that the following items be deleted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1137
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:565
 msgid "You have specified an illegal file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:766
 msgid "You have specified an illegal path"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:520
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:13
+msgid "You have specified an illegal working directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:481
 msgid ""
 "You may check your answers to this problem without affecting the maximum "
 "number of tries to your original problem."
 msgstr ""
 
-#. ($perm_multiuser ? "to privileged users or" : "")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:613
+#. ($multiuser ? 'to privileged users or' : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:69
 msgid ""
 "You may choose to show any of the following data. Correct answers, hints, "
 "and solutions are only available %1 after the answer date of the homework "
 "set."
 msgstr "다음 데이터를 표시하도록 선택할 수 있습니다. 정답과 풀이는 문제집의 answer date 후에 볼 수 있습니다."
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:63
+msgid "You may not change this user's password!"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:646
 msgid "You may not change your answers when going on to the next part!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1831
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:58
 msgid "You may not change your own password here!"
 msgstr "여기서 비밀번호를 바꿀 수 없습니다!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1132
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:560
 msgid "You may not follow symbolic links"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2134
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:350
 msgid "You may still check your answers."
 msgstr "정답은 지금도 확인할 수 있습니다."
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:172
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:143
+msgid ""
+"You may want to create an unattached problem if you are using the current "
+"problem as a model for a new problem. You can add the new file to a homework"
+" set from the Library Browser or via the set detail page of the Hmwk Sets "
+"Editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:165
+msgid ""
+"You might want to do this if you want to give full credit to everyone on a "
+"particular problem that was not worded correctly, or wasn't working "
+"properly. This is done from the \"Hmwk Sets Editor\" page or the "
+"\"Instructor Tools\" page."
+msgstr ""
+
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:8
 msgid "You must access assignments from your Course Management System (%1)."
 msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:67
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before Show Me Another "
-"is available."
+"You must attempt this problem %quant(%1,time) before this feature is "
+"available"
 msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1923
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:545
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before this feature is "
-"available"
+"You must attempt this problem %quant(%1,time,times) before Show Me Another "
+"is available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:699
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:259
 msgid "You must confirm the password for the initial instructor."
 msgstr ""
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:368
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? $c->link_to(                                                  $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:195
 msgid "You must log into this set via your Learning Management System (%1)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:76
-msgid "You must provide a student ID, a set ID, and a problem number."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:979
+msgid "You must select a course to archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:585
 msgid "You must select a course to rename."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:351
 msgid "You must select at least one file for the archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:777
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:312
 msgid "You must select at least one file to delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:115
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:106
 msgid "You must select one or more sets for scoring!"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:749
 msgid "You must specify a %1 name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:682
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:242
 msgid "You must specify a course ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2026
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2561
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2777
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3865
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2086
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:848
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:983
 msgid "You must specify a course name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:775
 msgid "You must specify a file name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:705
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:586
+msgid "You must specify a file name in order to save a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:265
 msgid "You must specify a first name for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:708
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:268
 msgid "You must specify a last name for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1382
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:606
 msgid "You must specify a new institution for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1364
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:588
 msgid "You must specify a new name for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:603
 msgid "You must specify a new title for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:256
 msgid "You must specify a password for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:448
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:440
 msgid "You must specify a user ID."
 msgstr "사용자 ID를 명시해주세요."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:711
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:271
 msgid "You must specify an email address for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:331
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:138
 msgid "You must specify an file name in order to save a new file."
 msgstr ""
 
 #. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:505
 msgid ""
-"You must use your Learning Managment System (%1) to access this set.  Try "
-"logging in to the Learning Managment System and visiting the set from there."
+"You must use your Learning Management System (%1) to access this set.  Try "
+"logging in to the Learning Management System and visiting the set from "
+"there."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1730
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
 msgid "You need to select a \"Target Set\" before you can edit it."
 msgstr ""
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1126
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:554
 msgid "You need to select a file to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1877
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:555
 msgid "You need to select a set definition file to view."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1853
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:537
 msgid "You need to select a set from this course to view."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1837
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:524
 msgid "You need to select a set to view."
 msgstr ""
 
-#. (wwRound(0, $problemResult->{score} * 100)
-#. (wwRound(0, $pg->{result}->{score} * 100)
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2007
+#. (wwRound(0,
+#. compute_reduced_score($ce, $problem, $set, $pg->{result}{score},
+#. $c->submitTime)
+#. (% wwRound(0, $rh_result->{problem_result}{score} * 100)
+#. (wwRound(0, $rh_result->{problem_result}{score} * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1251
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:48
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:29
 msgid "You received a score of %1 for this attempt."
 msgstr ""
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2075
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1363
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem and its graded subproblems."
 msgstr ""
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2078
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1375
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem."
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1343
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:740
 msgid "Your %1 name contains illegal characters"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1344
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:743
 msgid "Your %1 name may not begin with a dot"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:746
 msgid "Your %1 name may not contain a path component"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:540
-msgid ""
-"Your LTI OAuth verification failed.  If this recurs, please speak with your "
-"instructor"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:528
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:539
-msgid ""
-"Your authentication failed.  Please return to Oncourse and login again."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:229
-msgid ""
-"Your authentication failed.  Please try again. Please speak with your "
-"instructor if you need help."
-msgstr ""
-
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3033
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3162
 msgid "Your browser does not support the video tag."
 msgstr ""
 
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4078
-msgid "Your current branch of PG is up to date with branch %1 in remote %2."
-msgstr ""
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4016
-msgid ""
-"Your current branch of WeBWorK is up to date with branch %1 in remote %2."
-msgstr ""
-
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4113
-msgid "Your current branch of the Open Problem Library is up to date."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:134
 msgid "Your display options have been saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:195
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
 msgid "Your email address has been changed."
 msgstr "이메일 주소가 변경되었습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:772
 msgid "Your file name contains illegal characters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:118
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:40
 msgid "Your file name is not valid! "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:16
 msgid "Your message was sent successfully."
 msgstr ""
 
-#. ($lastScore,$notCountedMessage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2010
+#. (wwRound(0, $problem->status * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1261
 msgid "Your overall recorded score is %1.  %2"
 msgstr ""
 
-#. ($versionNumber, wwRound(2,$recordedScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2107
-msgid "Your recorded score on this test (version %1) is %2/%3."
-msgstr "기록된 시험 (버전 %1) 점수는 %2/%3입니다."
+#. ('<span id="test-recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:179
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:197
+msgid "Your recorded score for this version is %1/%2 (%3%)."
+msgstr ""
+
+#. ($setVersionID,                                         '<span id="test-
+#. recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:317
+msgid "Your recorded score on this test (version %1) is %2/%3 (%4%)."
+msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:603
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:634
 msgid "Your score for this attempt is for this part only;"
 msgstr ""
 
 #. ($testNounNum)
 # $testNounNum is either "test (#)" or "submission (#)"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1977
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:142
 msgid "Your score on this %1 WAS recorded."
 msgstr ""
 
-#. ($testNoun,$attemptScore,$totPossible)
+#. ($testNoun, $c->{attemptScore}, $c->{totalPossible})
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1982
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:148
 msgid "Your score on this %1 is %2/%3."
 msgstr ""
 
 #. ($testNounNum)
 # $testNounNum is either "test (#)" or "submission (#)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1973
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:138
 msgid "Your score on this %1 was NOT recorded."
 msgstr ""
 
-#. ($attemptScore,$totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2019
+#. ($c->{attemptScore}, $c->{totalPossible})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:192
 msgid "Your score on this (checked, not recorded) submission is %1/%2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1963
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2277
-msgid "Your score on this problem was recorded."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1619
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1027
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:172
 msgid ""
 "Your score was not recorded because there was a failure in storing the "
 "problem record to the database."
 msgstr "문제 기록을 데이터베이스에 저장하는 데 실패하여 점수가 기록되지 않았습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:272
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:276
 msgid "Your score was not recorded because this homework set is closed."
 msgstr "이 문제집은 마감 시간이 지나 점수가 기록되지 않았습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:283
 msgid ""
 "Your score was not recorded because this problem has not been assigned to "
 "you."
 msgstr "이 문제가 할당되지 않았기 때문에 점수가 기록되지 않았습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1643
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1049
 msgid ""
 "Your score was not recorded because this problem set version is not open."
 msgstr "이 문제 세트 버전이 열려 있지 않기 때문에 점수가 기록되지 않았습니다."
 
-#. ($elapsed, $allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1658
+#. ($elapsed,                                              # Assume the
+#. allowed time is an even number of minutes.
+#. ($set->due_date - $set->open_date)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1063
 msgid ""
 "Your score was not recorded because you have exceeded the time limit for "
 "this test. (Time taken: %1 min; allowed: %2 min.)"
 msgstr "이 테스트의 제한 시간을 초과했기 때문에 점수가 기록되지 않았습니다. (소요 시간: %1분, 허용 시간: %2분)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1052
 msgid ""
 "Your score was not recorded because you have no attempts remaining on this "
 "set version."
 msgstr "이 세트 버전에서 남은 시도 횟수가 없기 때문에 점수가 기록되지 않았습니다."
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1661
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1067
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:278
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:53
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:31
 msgid "Your score was not recorded."
 msgstr "점수가 기록되지 않았습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1998
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:163
 msgid "Your score was not successfully sent to the LMS."
 msgstr "점수가 LMS로 성공적으로 전송되지 않았습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:166
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:170
 msgid "Your score was recorded."
 msgstr "점수가 기록되었습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1997
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:255
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:162
 msgid "Your score was successfully sent to the LMS."
 msgstr "점수가 LMS로 성공적으로 전송되었습니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:540
 msgid "Your session has timed out due to inactivity. Please log in again."
 msgstr "로그인 시간이 지났습니다. 다시 로그인해 주세요."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4126
-msgid "Your systems are up to date!"
-msgstr "시스템이 최신 상태입니다!"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1396
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1403
-msgid "[Edit]"
-msgstr "[편집]"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:824
-msgid "a duplicate of the first selected achievement."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:17
+msgid "a duplicate of the first selected achievement"
 msgstr ""
 
 # Context is "Create set ______ as a duplicate of the first selected set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:17
 msgid "a duplicate of the first selected set"
 msgstr "첫번쨰 선택된 문제집 사본"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:823
-msgid "a new empty achievement."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:16
+msgid "a new empty achievement"
 msgstr ""
 
 # Context is "Create set ______ as a new empty set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:16
 msgid "a new empty set"
 msgstr "새로운 빈 문제집"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1281
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:9
 msgid "a single set"
 msgstr "문제집 하나"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:429
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:130
 msgid "add problems"
 msgstr ""
 
 #. ($setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1751
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
 msgid "addGlobalSet %1 in ProblemSetList:  %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:456
-msgid "added missing permission level for user"
-msgstr ""
-
 # #short for administrator
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "admin"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1051
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:487
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:604
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:7
 msgid "all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1377
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:66
 msgid "all current users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:327
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:70
 msgid "all set dates for one <b>user</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:622
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1434
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:667
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:840
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1995
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:7
 msgid "all sets"
 msgstr "모든 문제집"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1981
 msgid "all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1256
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:701
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:946
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:997
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:6
 msgid "all users"
 msgstr "모든 사용자"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:120
 msgid "all users for one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:23
 msgid "alphabetically"
 msgstr ""
 
-#. ($count,$numSets)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:626
+#. ($count, $numSets)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1999
 msgid "an impossible number of sets: %1 out of %2"
 msgstr ""
 
-#. ($count,$numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:606
+#. ($count, $numUsers)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1985
 msgid "an impossible number of users: %1 out of %2"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:647
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:658
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:610
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:621
 msgid "answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:30
 msgid "any users"
 msgstr "모든 사용자"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:720
-msgid "avg attempts"
-msgstr ""
-
 # Context is "Append ____ blank problem template(s) to end of homework set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2956
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:689
 msgid "blank problem template(s) to end of homework set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:24
 msgid "by last login date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1552
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:688
 msgid "changes abandoned"
 msgstr "변경사항 취소됨"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1216
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1651
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:633
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:795
 msgid "changes saved"
 msgstr "변경사항 저장"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:80
 msgid "class list data for selected <b>users</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:31
 msgid "close"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:671
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:259
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:239
 msgid "correct"
 msgstr "정답"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:582
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:239
 msgid "course files"
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:458
 msgid "deleted %1 sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:152
 msgid "editing all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:333
 msgid "editing all sets"
 msgstr "모든 문제집 수정"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:963
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:328
 msgid "editing all users"
 msgstr "모든 사용자 수정"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:860
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:336
 msgid "editing listed sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:154
 msgid "editing selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:339
 msgid "editing selected sets"
 msgstr "선택된 문제집 수정"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:334
 msgid "editing selected users"
 msgstr "선택된 사용자 수정"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:331
 msgid "editing visible users"
 msgstr "보이는 사용자 수정"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:360
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:90
 msgid "email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:87
-msgid "email:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:42
 msgid "empty"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:672
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:10
 msgid "enter matching set IDs below"
 msgstr "아래에 맞는 문제집 ID 입력"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:220
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:31
 msgid "entry rows."
 msgstr ""
 
 #. ($restrictLoc, $setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1761
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:904
 msgid "error adding set location %1 for set %2: %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1092
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1487
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:542
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:643
 msgid "export abandoned"
 msgstr "내보내기 취소"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1068
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:527
 msgid "exporting all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1071
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:530
 msgid "exporting selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:359
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:89
 msgid "first name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:747
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:72
 msgid "for"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:149
 msgid "for one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:103
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:94
 msgid "for one <b>user</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1014
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:349
 msgid "giving new passwords to all users"
 msgstr "모든 사용자에게 새 비밀번호 부여"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1020
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:355
 msgid "giving new passwords to selected users"
 msgstr "선택된 사용자에게 새 비밀번호 부여"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1017
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:352
 msgid "giving new passwords to visible users"
 msgstr "보이는 사용자에게 새 비밀번호 부여"
 
 #. ($j, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1069
 msgid "global %1 for set %2 not found."
 msgstr ""
 
-#. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1146
-msgid "global set %1 not found."
-msgstr ""
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "grade_proctor"
 msgstr "채점_감독관"
@@ -8855,393 +12011,375 @@ msgstr "채점_감독관"
 msgid "guest"
 msgstr "청강생"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1589
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:949
 msgid "hidden"
 msgstr "숨김"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "hidden from"
 msgstr "숨겨짐"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "hidden from students"
-msgstr "학생들로부터 숨김"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:217
+msgid "homework"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:83
+msgid "html directory"
+msgstr ""
 
-#. ('j','k','_0')
-#. ('j','k')
+#. ('j', 'k', '_0')
+#. ('j', 'k')
 # doe snot need to be translated
-#: /opt/webwork/pg/lib/Parser/List/Vector.pm:35
-#: /opt/webwork/pg/lib/Value/Vector.pm:278
-#: /opt/webwork/pg/macros/contextLimitedVector.pl:93
+#: /opt/webwork/pg/lib/Parser/List/Vector.pm:39
+#: /opt/webwork/pg/lib/Value/Vector.pm:303
+#: /opt/webwork/pg/macros/contexts/contextLimitedVector.pl:95
 msgid "i"
 msgstr ""
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:773
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:840
 msgid "if"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1626
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:622
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:721
 msgid "illegal character in input: '/'"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:246
 msgid "incorrect"
 msgstr "오답"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:441
 msgid "index"
 msgstr ""
 
 #. ($restrictLoc, $setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:911
 msgid "input set location %1 already exists for set %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:358
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:551
+msgid "insufficient permission to edit %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:220
+msgid "just-in-time"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:88
 msgid "last name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:841
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:893
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:9
 msgid "listed sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3169
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:87
 msgid "locations selected below"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:665
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:59
 msgid "login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "login ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:94
 msgid "login name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:86
-msgid "login/studentID:"
-msgstr ""
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "login_proctor"
 msgstr ""
 
 # Context is "Set _____ made visibile for _____ users"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "made visible for"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:419
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:493
 msgid "max"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1282
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:10
 msgid "multiple sets"
 msgstr "많은 문제집"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:489
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:171
 msgid "new set:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:393
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:109
 msgid "new users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:6
 msgid "no achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:740
-msgid "no achievements."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:519
-msgid "no attempt recorded"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:86
 msgid "no location"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:620
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1056
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1993
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:6
 msgid "no sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:600
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1979
 msgid "no students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:931
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1190
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:702
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:31
 msgid "no users"
 msgstr "선택된 사용자 없음"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/permission.pm:26
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "nobody"
 msgstr "허용 없음"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:114
 msgid "nth colum of merge file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:225
-msgid "number of students not defined"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:70
 msgid "of"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:128
 msgid "one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:556
-msgid "one <b>set</b> for  <b>users</b>"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:225
+msgid "one <b>set</b> for <b>users</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:540
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:211
 msgid "one <b>user</b> (on one <b>set</b>)"
 msgstr ""
 
 # Context is Assign this set to which users?  "only ____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1378
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:67
 msgid "only"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:17
 msgid "only best scores"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3472
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:357
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:448
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:88
 msgid "or"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1141
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:59
 msgid "or Problems from"
 msgstr ""
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:776
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:843
 msgid "otherwise"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:19
 msgid "overwrite"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:664
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:627
 msgid "part"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1383
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:499
 msgid "permissions for %1 not defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "point"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "points"
 msgstr "점"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:509
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:20
 msgid "preserve"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2360
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:576
 msgid "preview answers"
 msgstr "입력답 미리보기"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:653
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:616
 msgid "problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:632
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:41
 msgid "problems"
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:219
+msgid "proctored test"
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "professor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:360
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:451
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:89
 msgid "progress"
 msgstr ""
 
 #. ($line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2212
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1409
 msgid "readSetDef error, can't read the line: ||%1||"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:93
 msgid "recitation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:654
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:53
 msgid "recitation #"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:497
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:549
 msgid "record for visible user %1 not found"
 msgstr ""
 
 #. ($restrictLoc)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1767
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:918
 msgid ""
 "restriction location %1 does not exist.  IP restrictions have been ignored."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:670
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "row"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:91
 msgid "score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:362
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:92
 msgid "section"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:643
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:47
 msgid "section #"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:88
-msgid "section:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:159
 msgid "selected <b>sets</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:524
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:197
 msgid "selected <b>users</b> to selected <b>sets</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:441
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:488
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:605
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:8
 msgid "selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:741
-msgid "selected achievements."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1057
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1436
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:669
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:842
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:894
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:991
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:8
 msgid "selected sets"
 msgstr "선택된 문제집"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1053
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:703
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:999
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:8
 msgid "selected users"
 msgstr "선택된 사용자"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:624
-msgid "set"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:628
-msgid "sets"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:12
 msgid "sets hidden from students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:670
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:11
 msgid "sets visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:716
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:281
 msgid "showing all sets"
 msgstr "선택된 모든 문제집"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:763
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:277
 msgid "showing all users"
 msgstr "선택된 모든 사용자"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:725
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:290
 msgid "showing matching sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:286
 msgid "showing matching users"
 msgstr "일치하는 사용자 표시"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:719
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:284
 msgid "showing no sets"
 msgstr "어떤 문제집도 보이지않기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:766
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:280
 msgid "showing no users"
 msgstr "사용자 감추기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:722
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:287
 msgid "showing selected sets"
 msgstr "선택된 문제집 감추기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:769
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:283
 msgid "showing selected users"
 msgstr "선택된 사용자 보이기"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:299
 msgid "showing sets that are hidden from students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:732
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:296
 msgid "showing sets that are visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:72
 msgid "shown"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:162
 msgid "still open"
 msgstr ""
 
@@ -9249,16 +12387,16 @@ msgstr ""
 msgid "student"
 msgstr "학생"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
 msgid "submission"
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:133
 msgid "submission (version %1)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
 msgid "summary"
 msgstr ""
 
@@ -9266,135 +12404,130 @@ msgstr ""
 msgid "ta"
 msgstr "조교"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:90
+msgid "templates/email directory"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:95
+msgid "templates/macros directory"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
 msgid "test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:23
 msgid "test date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:621
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:29
 msgid "test time"
 msgstr ""
 
-#. ($forcedSourceFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:987
-msgid "the original path to the file is %1"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:119
 msgid "then delete them"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "time"
-msgstr "시간"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:165
 msgid "time limit exceeded"
 msgstr "시간 제한 초과"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "times"
-msgstr "번"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:35
+msgid "time remaining"
+msgstr ""
 
 # Context is Assign ____ to _____
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:183
 msgid "to"
 msgstr ""
 
 #. ($ce->{institutionName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:399
 msgid "to %1 main web site"
 msgstr "%1 기본 웹사이트로"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:524
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:381
 msgid "to courses page"
 msgstr "교과목 페이지로"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:436
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:135
 msgid "to one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:764
-msgid "top score"
-msgstr "최고 점수"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:432
 msgid "total"
 msgstr "총점"
 
 #. ($ce->{webworkDirs}{logs})
 #. ($ce->{webworkDirs}{tmp})
 #. ($ce->{webworkDirs}{DATA})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:47
 msgid "unable to write to directory %1"
 msgstr "디렉토리 %1에 쓸 수 없는"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:333
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:49
 msgid "unlimited"
 msgstr "무제한"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:14
 msgid "unlimited reusability"
 msgstr "무제한 재사용 가능"
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:609
-msgid "userID: %1 --"
-msgstr "사용자 ID: %1 —"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:652
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:259
 msgid ""
 "username, last name, first name, section, achievement level, achievement "
 "score,"
 msgstr "사용자 이름, 성, 이름, 섹션, 성취 수준, 성취 점수,"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:704
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:10
 msgid "users who match on selected field"
 msgstr "선택된 필드에 부합한 사용자"
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
+#. ($set->version_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:295
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:408
+msgid "version %1"
+msgstr ""
+
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:134
 msgid "version (%1)"
 msgstr "버전 (%1)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1591
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1888
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:820
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:951
 msgid "visible"
 msgstr "보임"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "visible to students"
-msgstr "학생들에게 보임"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1257
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:947
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:998
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:7
 msgid "visible users"
 msgstr "보이는 사용자"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:485
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:500
 msgid "when you submit your answers"
 msgstr "입력답을 제출할 때에는"
 
 #. ($dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1532
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:623
 msgid "won't be able to read from file %1/%2: does it exist? is it readable?"
 msgstr "%1/%2 파일에서 읽을 수 없습니다: 파일이 존재합니까? 읽을 수 있습니까?"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:604
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:638
 msgid "your overall score is for all the parts combined."
 msgstr "전체 점수는 모든 부분을 합한 것입니다."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:231
 msgid "your students"
 msgstr "학생들에게 이메일 보내기"
diff --git a/lib/WeBWorK/Localize/ru-RU.po b/lib/WeBWorK/Localize/ru-RU.po
index e71e42a258..36282e6ce7 100644
--- a/lib/WeBWorK/Localize/ru-RU.po
+++ b/lib/WeBWorK/Localize/ru-RU.po
@@ -9,256 +9,319 @@ msgstr ""
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: 2013-01-27 17:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Russian (Russia) (http://www.transifex.com/webwork/webwork2/language/ru_RU/)\n"
+"Language-Team: Russian (Russia) (http://app.transifex.com/webwork/webwork2/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru_RU\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:428
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:449
+#. ($_->{problem}->version_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:69
+msgid " (version %1)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:265
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:284
 msgid " Answers Available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:735
-msgid "# of active students"
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1148
+msgid " No changes have been made to set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:506
-msgid "#corr"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:130
+msgid "\"Act as\" a student"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:508
-msgid "#incorr"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:31
+msgid "\"Edit Assigned Users\" column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2249
-msgid "% Score:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:24
+msgid "\"Edit Problems\" column"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:187
+msgid "# of Active Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:85
+msgid "# of attempts"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:333
+msgid "#corr"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:685
-msgid "% correct"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:335
+msgid "#incorr"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:174
+msgid "% Average with Review"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:702
-msgid "% correct with review"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:66
+msgid "% Score with Review"
 msgstr ""
 
-# Percent students
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:762
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:792
-msgid "% students"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:479
+msgid "% Score:"
 msgstr ""
 
 #. ($achievement->{points})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:24
 msgid "%1 Points:"
 msgstr ""
 
-#. ($lib eq '' ? $r->maketext('Local')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:476
+#. ($lib eq '' ? maketext('Local')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:9
 msgid "%1 Problems:"
 msgstr ""
 
-#. ($itemCounts{$item->id()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:189
+#. ($itemCounts->{ $item->id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:12
 msgid "%1 remaining"
 msgstr ""
 
-#. ($numAdded, $numSkipped, join(', ', @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1410
+#. ($count)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2001
+msgid "%1 sets"
+msgstr ""
+
+#. ($numAdded,                     $numSkipped,
+#. join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:608
 msgid "%1 sets added, %2 sets skipped. Skipped sets: (%3)"
 msgstr ""
 
-#. ($numExported, $numSkipped, ($numSkipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1526
+#. ($numExported, $numSkipped,                     $numSkipped ? $c->tag('ul',
+#. $c->c(map { $c->tag('li', $_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:673
 msgid "%1 sets exported, %2 sets skipped. Skipped sets: (%3)"
 msgstr ""
 
 #. ($count, $numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:608
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
 msgid "%1 students out of %2"
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle,
+#. ($rename_oldCourseID,          $rename_oldCourseTitle,
+#. $rename_newCourseTitle,
 #. $rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:675
 msgid "%1 title and institution changed from %2 to %3 and from %4 to %5"
 msgstr ""
 
-#. (scalar @userIDsToExport, $dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1338
-msgid "%1 users exported to file %2/%3"
+#. (scalar @userIDsToExport, "$dir/$fileName")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:477
+msgid "%1 users exported to file %2"
 msgstr ""
 
-#. ($numReplaced, $numAdded, $numSkipped, join (", ", @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1233
+#. ($numReplaced, $numAdded, $numSkipped, join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:443
 msgid ""
 "%1 users replaced, %2 users added, %3 users skipped. Skipped users: (%4)"
 msgstr ""
 
-#. ($levelpercentage)
 #. ($percentage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:135
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:136
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:323
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:324
+#. ($level_percentage)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:12
 msgid "%1% Complete"
 msgstr ""
 
 #. (wwRound(0, $answerScore * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:268
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:248
 msgid "%1% correct"
 msgstr ""
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:207
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:57
 msgid "%1's Current Address"
 msgstr ""
 
-#. ($user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:136
+#. ($c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:26
 msgid "%1's Current Password"
 msgstr ""
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:225
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:65
 msgid "%1's New Address"
 msgstr ""
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:153
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:34
 msgid "%1's New Password"
 msgstr ""
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
-msgid "%1's new password cannot be blank."
-msgstr ""
-
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:76
 msgid "%1's password has been changed."
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:56
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1423
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#. ($c->tag('span', dir => 'ltr', $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1069
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:149
 msgid "%1: Problem %2"
 msgstr "Задание %1: Задача %2"
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:374
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:357
 msgid "%1: Problem %2 Show Me Another"
 msgstr ""
 
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2231
-msgid "%1: The directory for the course not found."
-msgstr ""
-
-#. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:340
-msgid "%quant(%1,error) occured while generating hardcopy:"
+#. ($days)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:87
+msgid "%quant(%1,day)"
 msgstr ""
 
 #. ($n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:924
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:389
 msgid "%quant(%1,file) unpacked successfully"
 msgstr ""
 
+#. ($hours)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:88
+msgid "%quant(%1,hour)"
+msgstr ""
+
+#. ($minutes)
+#. (sprintf('%3.1f', $testTime)
+#. ($timeLeft)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:89
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:150
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:168
+msgid "%quant(%1,minute)"
+msgstr ""
+
 #. ($numBlanks)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:430
 msgid ""
 "%quant(%1,of the questions remains,of the questions remain) unanswered."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:678
+#. ($seconds)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:90
+msgid "%quant(%1,second)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:505
 msgid "%score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2971
+#. ($dcount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:40
+msgid "(%quant(%1,item) total)"
+msgstr ""
+
+#. ($count)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:29
+msgid "(%quant(%1,item))"
+msgstr ""
+
+#. ($problemValue)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1081
+msgid "(%quant(%1,point))"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:697
 msgid "(Any unsaved changes will be lost.)"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1278
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1287
-msgid ""
-"(Instructor hint preview: show the student hint after the following number "
-"of attempts:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:102
+msgid "(If an action cannot be executed it will not appear.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2003
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1262
 msgid "(This problem will not count towards your grade.)"
 msgstr "(Эта задача не будет Вам засчитана.)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2122
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:340
 msgid ""
 "(This test is overtime because it was not submitted in the allowed time.)"
 msgstr ""
 
-#. ($testNoun, $self->formatDateTime($set->answer_date)
+#. ($testNoun, $c->formatDateTime($c->{set}->answer_date)
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1986
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:153
 msgid "(Your score on this %1 is not available until %2.)"
 msgstr ""
 
 #. ($testNoun)
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1988
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:155
 msgid "(Your score on this %1 is not available.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1257
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1267
 msgid "(correct)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:197
-msgid "(gw/quiz) After version answer date"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:263
 msgid "(in target set)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1449
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1269
 msgid "(incorrect)"
 msgstr ""
 
 #. ($pgScore)
 #. ($recScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1461
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1271
 msgid "(score %1)"
 msgstr ""
 
-#. ($display_sort_method_name{$secondary_sort_method_name})
-#. ($display_sort_method_name{$ternary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:701
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:706
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:207
+msgid "(test) After version answer date"
+msgstr ""
+
+#. ($versionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:164
+msgid "(version %1)"
+msgstr ""
+
+#. ($display_sort_method_name{$secondary_sort_method})
+#. ($display_sort_method_name{$ternary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:103
 msgid ", then by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1297
-msgid ". If this is a class roster, rename it to have extension '.lst'"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:702
+msgid ". If this is a class roster, rename it to have extension \".lst\""
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:81
+msgid "0 seconds"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1997
+msgid "1 set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1983
 msgid "1 student"
 msgstr ""
 
 #. (wwRound(2, $weights[$part] * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:145
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:58
 msgid "<b>Weight:</b> %1%"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1749
+#: /opt/webwork/webwork2/conf/defaults.config:1651
 msgid ""
 "<p>After the Reduced Scoring Date all additional work done by the student "
 "counts at a reduced rate. Here is where you set the reduced rate which must "
@@ -273,7 +336,7 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2036
+#: /opt/webwork/webwork2/conf/defaults.config:1937
 msgid ""
 "<p>During summer 2005, a newer version of the answer checkers was "
 "implemented for answers which are functions and numbers.  The newer checkers"
@@ -285,16 +348,74 @@ msgid ""
 " the old answer checkers will be used by default.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2006
+#: /opt/webwork/webwork2/conf/defaults.config:1908
 msgid ""
 "<p>MathQuill renders students answers in real-time as they type on the "
 "keyboard.</p><p>MathView allows students to choose from a variety of common "
 "math structures (such as fractions and square roots) as they attempt to "
-"input their answers.</p><p>WIRIS provides a separate workspace for students "
-"to construct their response in a WYSIWYG environment.</p>"
+"input their answers.</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1459
+msgid ""
+"<p>Mode in which the LANG and DIR settings for a single problem are "
+"determined.</p><p>The system will set the LANGuage attribute to either a "
+"value determined from the problem, a course-wide default, or the system "
+"default, depending on the mode selected. The tag will only be added to the "
+"DIV enclosing the problem if it is different than the value which should be "
+"set in the main HTML tag set for the entire course based on the course "
+"language.</p><p>There are two options for the DIRection attribute: \"ltr\" "
+"for left-to-write scripts, and \"rtl\" for right-to-left scripts like Arabic"
+" and Hebrew.</p><p>The DIRection attribute is needed to trigger proper "
+"display of the question text when the problem text-direction is different "
+"than that used by the current language of the course. For example, English "
+"problems from the library browser would display improperly in RTL mode for a"
+" Hebrew course, unless the problen Direction is set to LTR.</p><p>The "
+"feature to set a problem language and direction was only added in 2018 to "
+"the PG language, so most problems will not declare their language, and the "
+"system needs to fall back to determining the language and direction in a "
+"different manner. The OPL itself is all English, so the system wide fallback"
+" is to en-US in LTR mode.</p><p>Since the defaults fall back to the LTR "
+"direction, most sites should be fine with the \"auto::\" mode, but may want "
+"to select the one which matches their course language. The mode "
+"\"force::ltr\" would also be an option for a course which runs into trouble "
+"with the \"auto\" modes.</p><p>Modes:</p><ul><li>\"none\" prevents any "
+"additional LANG and/or DIR tag being added. The browser will use the main "
+"setting which was applied to the entire HTML page. This is likely to cause "
+"trouble when a problem of the other direction is "
+"displayed.</li><li>\"auto::\" allows the system to make the settings based "
+"on the language and direction reported by the problem (a new feature, so not"
+" set in almost all existing problems) and falling back to the expected "
+"default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" allows the "
+"system to make the settings based on the language and direction reported by "
+"the problem (a new feature, so not set in almost all existing problems) but "
+"falling back to the language with the given LangCode and the direction Dir "
+"when problem settings are not available from PG.</li><li>\"auto::Dir\" for "
+"problems without PG settings, this will use the default en=english language,"
+" but force the direction to Dir. Problems with PG settings will get those "
+"settings.</li><li>\"auto:LangCode:\" for problems without PG settings, this "
+"will use the default LTR direction, but will set the language to "
+"LangCode.Problems with PG settings will get those "
+"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
+" by the PG code of the problem, and will force the system to set the "
+"language with the given LangCode and the direction to Dir for <b>all</b> "
+"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
+"PG code of the problem, and will force the system to set the direction to "
+"Dir for <b>all</b> problems, but will avoid setting any language attribute "
+"for individual problem.</li></ul>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1736
+#: /opt/webwork/webwork2/conf/defaults.config:1514
+msgid ""
+"<p>Some servers handle courses taking place in different timezones.  If this"
+" course is not showing the correct timezone, enter the correct value here.  "
+"The format consists of unix times, such as \"America/New_York\", "
+"\"America/Chicago\", \"America/Denver\", \"America/Phoenix\" or "
+"\"America/Los_Angeles\".</p>Complete list: <a "
+"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1638
 msgid ""
 "<p>This sets whether the Reduced Scoring system will be enabled.  If enabled"
 " you will need to set the default length of the reduced scoring period and "
@@ -306,22 +427,35 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1979
+#: /opt/webwork/webwork2/conf/defaults.config:1881
 msgid ""
 "<p>When viewing a problem, users may choose different methods of rendering "
 "formulas via an options box in the left panel. Here, you can adjust what "
 "display modes are listed.</p><p>Some display modes require other software to"
 " be installed on the server. Be sure to check that all display modes "
-"selected here work from your server.</p><p>The display modes are "
-"<ul><li>plainText: shows the raw LaTeX strings for formulas.</li><li>images:"
-" produces images using the external programs LaTeX and "
-"dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place "
-"render mathematics.</li></ul></p></p>You must use at least one display mode."
-" If you select only one, then the options box will not give a choice of "
-"modes (since there will only be one active).</p>"
+"selected here work from your server.</p><p>The display modes "
+"are</p><ul><li>plainText: shows the raw LaTeX strings for "
+"formulas.</li><li>images: produces images using the external programs LaTeX "
+"and dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place"
+" render mathematics.</li></ul><p>You must use at least one display mode. If "
+"you select only one, then the options box will not give a choice of modes "
+"(since there will only be one active).</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1476
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with a question in "
+"this test. Please inform your instructor including the warning messages "
+"below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1236
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with this question. "
+"Please inform your instructor including the warning messages below."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1828
+#: /opt/webwork/webwork2/conf/defaults.config:1730
 msgid ""
 "<ul><li><b>SMAcheckAnswers</b>: enables the Check Answers button <i>for the "
 "new problem</i> when Show Me Another is "
@@ -333,7 +467,7 @@ msgid ""
 "time</li><li><b>SMAshowHints</b>: show hints <i>for the new problem</i> "
 "(assuming they exist)</li></ul>Note: there is very little point enabling the"
 " button unless you check at least one of these options - the students would "
-"simply see a new version that they can not attempt or learn from.</p>"
+"simply see a new version that they can not attempt or learn from."
 msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:35
@@ -342,73 +476,123 @@ msgstr ""
 
 #. ($add_courseID)
 #. ($rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1376
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:688
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:600
 msgid "A course with ID %1 already exists."
 msgstr ""
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2564
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1220
 msgid ""
 "A directory already exists with the name %1. You must first delete this "
 "existing course before you can unarchive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:119
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:111
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:42
 msgid ""
 "A file name cannot begin with a dot, it cannot be empty, it cannot contain a"
 " directory path component and only the characters -_.a-zA-Z0-9 and space are"
 " allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1342
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1366
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:738
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
 msgid "A file with that name already exists"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:348
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:19
 msgid ""
 "A hardcopy file was generated, but it may not be complete or correct. Please"
 " check that no problems are missing and that they are all legible. If not, "
 "please inform your instructor."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:56
+msgid ""
+"A hash reference in which the keys are the achievement_id's assigned to the "
+"current user and the values are 0 or 1 which stores if the user has earned "
+"the associated achievement or not."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:52
+msgid ""
+"A hash reference which contains a problems metadata, such as DBsubject, "
+"DBchapter, DBsection,  and so on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:37
+msgid "A hash reference which contains the problem data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:40
+msgid "A hash reference which contains the set data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:60
+msgid ""
+"A hash reference which saves data for this user and this achievement. This "
+"hash is persistent between evaluations and changes to this variable will be "
+"saved in the database."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:64
+msgid ""
+"A hash reference which saves global data for this user. This hash is "
+"persistent between evaluations and changes to this variable will be saved in"
+" the database."
+msgstr ""
+
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3291
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1695
 msgid ""
 "A location with the name %1 already exists in the database.  Did you mean to"
 " edit that location instead?"
 msgstr ""
 
-#. ($subject, $number_of_recipients, $courseName, $failed_messages)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1007
+#. ($mail_data->{subject}, $number_of_recipients, $mail_data->{courseName},
+#. $failed_messages)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:113
 msgid ""
 "A message with the subject line \"%1\" has been sent to %quant(%2,recipient)"
 " in the class %3.  There were %4 message(s) that could not be sent."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:644
-msgid "A new file has been created at '%1'"
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:315
+msgid "A new file has been created at \"%1\""
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1146
+msgid "A new file has been created at \"%1\" with the contents below."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:154
+msgid ""
+"A new problem whose path ends in newProblem.pg should be given a new name, "
+"for example, \"myNewProblem.pg\"."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2006
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:20
 msgid ""
-"A new file has been created at '%1' with the contents below.  No changes "
-"have been made to set %2"
+"A student must be assigned a homework set in order for it to appear on their"
+" WeBWorK home page. Check the box in the left column to assign a student to "
+"that homework set. Uncheck the box to unassign a student. If a student is "
+"unassigned from a homework set, all of the student's data for that homework "
+"set is deleted and cannot be recovered. Use this action cautiously!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:681
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:20
 msgid ""
-"A period (.) indicates a problem has not been attempted, and a number from 0"
-" to 100 indicates the grade earned. The number on the second line gives the "
-"number of incorrect attempts."
+"A student needs to be assigned a set in order for them to work it. Once a "
+"student is unassigned a set, all the data for them is lost and there is no "
+"way to undo it. When unassigning be sure to change the option to \"Allow "
+"unassign\"."
 msgstr ""
 
 # Leave symbol codes in place
-#: /opt/webwork/webwork2/conf/defaults.config:1647
+#: /opt/webwork/webwork2/conf/defaults.config:1549
 msgid ""
 "A switch to govern the use of a Progress Bar for the student; this also "
 "enables/disables the highlighting of the current problem in the side bar, "
@@ -416,474 +600,665 @@ msgid ""
 "(&#x2717;), or unattempted (no symbol)."
 msgstr ""
 
-# Short for ADJUSTED STATUS
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:500
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:712
-msgid "ADJ STATUS"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2296
-msgid "ANSWERS NOT RECORDED"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:42
+msgid "A unique key identifying the achievement."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2281
-msgid "ANSWERS NOT RECORDED --"
+# Short for ADJUSTED STATUS
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:535
+msgid "ADJ STATUS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2295
-msgid "ANSWERS ONLY CHECKED -- "
+#. ($c->{scoreRecordedMessage}[ $probOrder->[$i] ])
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:504
+msgid "ANSWERS NOT RECORDED -- %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2232
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1505
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:515
 msgid "ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"
 msgstr "ОТВЕТЫ ПРОВЕРЕНЫ, НО ОНИ НЕ ЗАПИСАНЫ"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1527
 msgid ""
 "ATTEMPT NOT ACCEPTED -- Please submit answers again (or request new version "
 "if neccessary)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1534
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_password_form.html.ep:1
 msgid "Abandon changes"
 msgstr "Не сохранять изменений"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1083
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_export_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_export_form.html.ep:1
 msgid "Abandon export"
 msgstr "Не делать экспортирование"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:520
 msgid ""
 "Account creation is currently disabled in this course.  Please speak to your"
 " instructor or system administrator."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:153
-msgid "Achievement"
-msgstr ""
-
-#. ($targetAchievementID, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:638
-msgid "Achievement %1 created with evaluator '%2'."
+#. ($targetAchievementID,			$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:310
+msgid "Achievement %1 created with evaluator \"%2\"."
 msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:847
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:378
 msgid "Achievement %1 exists.  No achievement created"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:444
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:63
 msgid "Achievement Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:548
-msgid "Achievement Evaluator Editor"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:17
+msgid "Achievement Editor Help"
 msgstr ""
 
-#. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:170
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:17
+msgid "Achievement Evaluator Editor Help"
+msgstr ""
+
+#. ($c->stash('achievementID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:109
 msgid "Achievement Evaluator for achievement %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1446
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1454
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1482
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:13
 msgid "Achievement ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:274
 msgid "Achievement ID exists!  No new achievement created.  File not saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1698
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:41
+msgid "Achievement ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:3
+msgid "Achievement List"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1600
 msgid "Achievement Points Per Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:558
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:455
 msgid "Achievement User Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:17
+msgid "Achievement User Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:48
 msgid "Achievement has been assigned to all users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:67
 msgid "Achievement has been assigned to selected users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:60
 msgid "Achievement has been unassigned to all students."
 msgstr ""
 
-#. (CGI::a({ href => $fileManagerURL }, $scoreFileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:711
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:38
+msgid "Achievement options"
+msgstr ""
+
+#. ($c->link_to(                           $scoreFileName => $c->systemLink(
+#. $c->url_for('instructor_file_manager')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:318
 msgid "Achievement scores saved to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:260
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:241
 msgid "Achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:531
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:17
+msgid "Achievements Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:26
+msgid ""
+"Achievements are evaluated in the order shown below, with the exception of "
+"\"level\" achievements.  Achievements in the \"level\" category are "
+"evaluated first and control the XP thresholds and rewards (achievement "
+"items) for reaching each level. Achievements in the \"secret\" category are "
+"not shown to students until they earn the achievement, and is used for "
+"fun/surprise achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:32
+msgid ""
+"Achievements in the same category, with sequential numbers, and whose ID "
+"starts with the same \"prefix_\" (up to the last underscore), are treated as"
+" achievement chains.  Achievement chains are a sequence of achievements "
+"which build upon themselves, such as complete one problem, complete 10 "
+"problems, complete 25 problems, and so on. Students will only see the "
+"achievements in the chain they have completed or are currently working on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:201
 msgid "Act as"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:207
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:26
 msgid "Act as:"
 msgstr ""
 
-#. (HTML::Entities::encode_entities($prettyEUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1134
+#. ($effectiveUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:26
 msgid "Acting as %1."
 msgstr ""
 
 #. ($actionID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:372
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:223
 msgid "Action %1 not found"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1706
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:101
+msgid "Actions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1608
 msgid ""
 "Activating this will enable achievement rewards. This feature allows "
 "students to earn rewards by completing achievements that allow them to "
 "affect their homework in a limited way."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:45
 msgid "Active"
 msgstr "Активен"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1691
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:50
+msgid "Active Students"
+msgstr ""
+
+#. ($c->{prettyID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:19
+msgid "Active Students Problem %1 Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1593
 msgid ""
 "Activiating this will enable Mathchievements for webwork.  Mathchievements "
 "can be managed by using the Achievement Editor link."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2947
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1548
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:166
 msgid "Add"
 msgstr "Добавить"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:89
 msgid "Add All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:644
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:32
 msgid "Add Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:253
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:17
+msgid "Add Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:14
+msgid "Add Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:98
 msgid "Add Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:406
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:349
 msgid "Add Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:518
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:17
+msgid "Add Users Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:47
 msgid "Add WeBWorK administrators to new course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1509
-msgid "Add a new test for which Gateway?"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:79
+msgid "Add a TA or an instructor (change permission level of user)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:60
+msgid "Add a few students to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:50
+msgid "Add a new version for which test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1441
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:20
 msgid "Add as what filetype?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/add_form.html.ep:3
 msgid "Add how many users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1549
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:69
+msgid "Add many students to a course from a class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:108
+msgid "Add n blank problem template(s) to the end of homework set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:164
 msgid "Add problem to target set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Add problems to"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1422
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:161
+msgid ""
+"Add this problem as the last problem of an existing set, either as a problem"
+" or as the set header (the text that appears on the home page of a homework "
+"set). You can rearrange the order of the problems later using the \"Hmwk "
+"Sets Editor\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:7
 msgid "Add to what set?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:20
+msgid ""
+"Add users to the course.  Select the number of students/users to add and "
+"then add any desired information.  The only mandatory information is the "
+"\"Login Name\". Any other fields may be left blank.  The \"Student ID\" will"
+" be the initial password for the user if provided."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:26
 msgid "Add which new users?"
 msgstr "Каких новых пользователей добавить?"
 
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:883
+msgid "Added \"%1\" to %2 as new hardcopy header"
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:854
+msgid "Added \"%1\" to %2 as new set header"
+msgstr ""
+
 #. ('{number}', '{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1055
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:27
 msgid "Added %1 problems to set %2."
 msgstr ""
 
-#. ($sourceFilePath, $targetSetName,($set->assignment_type eq 'jitar' ?
-#. join('.',jitar_id_to_seq($targetProblemNumber)
-#. ($new_file_name, $setName, ($set->assignment_type eq 'jitar' ?
-#. join('.',jitar_id_to_seq($targetProblemNumber)
 #. ($new_file_path, $setID, $targetProblemNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1510
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2001
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1912
+#. ($sourceFilePath,                       $targetSetName,                 (
+#. $set->assignment_type eq 'jitar'                                ? join('.',
+#. jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:825
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1837
 msgid "Added %1 to %2 as problem %3"
 msgstr ""
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1566
-msgid "Added '%1' to %2 as new hardcopy header"
-msgstr ""
-
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1540
-msgid "Added '%1' to %2 as new set header"
+#. ($new_file_name,                                $c->{setID},
+#. (                                       $set->assignment_type eq 'jitar'
+#. ? join('.', jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1139
+msgid "Added %1 to %2 as problem %3."
 msgstr ""
 
 #. (join(', ', @toAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1974
 msgid "Added addresses %1 to location %2."
 msgstr ""
 
+#. ($user->user_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:167
+msgid "Added missing permission level for user %1."
+msgstr ""
+
 #. ('{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1054
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:26
 msgid "Added one problem to set %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Added user:"
+msgstr ""
+
+#. ('<code>[Scoring]/report_grades_data.csv</code>',
+#. '<code>[TMPL]/email/report_grades.msg</code>',)
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:33
+msgid ""
+"Additional (external) grades can be shown on this page by placing them in "
+"the CSV file %1.  The first six columns must be (in order): Student ID, "
+"Username, Last Name, First Name, Section, Recitation.  The remaining columns"
+" can list any external grades.  To display the grades, the CSV file is "
+"merged with the \"Email\" message %2, which will be rendered and displayed "
+"below the grade table.  The message can be created on the \"Email\" page and"
+" the CSV file can be created/uploaded using the \"File Manager\".  External "
+"grades can only be displayed here and are not included in any totals or "
+"statistics."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2060
 msgid "Additional addresses for receiving feedback e-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:235
 msgid "Additional submissions available."
 msgstr ""
 
 #. ($badLocAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1708
 msgid ""
 "Address(es) %1 already exist in the database.  THIS SHOULD NOT HAPPEN!  "
 "Please double check the integrity of the WeBWorK database before continuing."
 msgstr ""
 
 #. (join(', ', @noAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1986
 msgid ""
 "Address(es) %1 in the add list is(are) already in the location %2, and so "
 "were skipped."
 msgstr ""
 
 #. (join(', ', @noDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3603
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2008
 msgid ""
 "Address(es) %1 in the delete list is(are) not in the location %2, and so "
 "were skipped."
 msgstr ""
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1683
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and resubmit."
 msgstr ""
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1998
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:117
 msgid "Addresses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:53
 msgid ""
 "Addresses for new location.  Enter one per line, as single IP addresses "
 "(e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP ranges "
 "(e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:27
 msgid ""
 "Addresses to add to the location.  Enter one per line, as single IP "
 "addresses (e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP"
 " ranges (e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:232
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:27
 msgid "Adds 24 hours to the close date of a homework."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:323
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:27
 msgid "Adds 48 hours to the close date of a homework."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:110
+msgid ""
+"Adds new template problems to the set when the set is saved. You can modify "
+"the template to create your own problem, by clicking on the \"Edit Problem\""
+" link and saving to some new file, e.g. \"myNewProblem.pg\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:19
 msgid "Adjusted Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:56
 msgid "Adobe PDF"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:675
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:42
 msgid "Advanced Search"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:196
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:206
 msgid "After set answer date"
 msgstr ""
 
-#. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:325
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:33
 msgid ""
-"After the reduced scoring period begins all work counts for %1% of its "
-"value."
+"After the due date this set enters a reduced scoring period until it closes "
+"on %1.  All work completed during the reduced scoring period counts for %2% "
+"of its value."
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:304
 msgid "Afterward reduced credit can be earned until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:56
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:60
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:23
 msgid "All Chapters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:57
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:34
 msgid "All Sections"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:6
 msgid "All Selected Constraints Joined by \"And\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:71
+msgid "All Sets"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:12
 msgid "All Subjects"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:48
 msgid "All Textbooks"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:54
+msgid "All Users"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:49
 msgid "All assignments were made successfully."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:953
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:386
 msgid "All listed sets were hidden from all the students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:951
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:381
 msgid "All listed sets were made visible for all the students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:407
 msgid "All of the answers above are correct."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:398
 msgid "All of the gradeable answers above are correct."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:247
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:162
+msgid ""
+"All of the paths for problem files are relative to the templates directory "
+"of the current course. You can access this directory \"directly\" using the "
+"File Manager page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:68
 msgid "All of these files will also be made available for mail merge."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:960
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:9
+msgid "All problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:5
+msgid "All sections"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2145
+msgid "All selected courses are already hidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2214
+msgid "All selected courses are already unhidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:399
 msgid "All selected sets hidden from all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:394
 msgid "All selected sets made visible for all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:946
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:373
 msgid "All sets hidden from all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:945
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:368
 msgid "All sets made visible for all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:619
 msgid "All sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:56
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:54
 msgid "All unassignments were made successfully."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2047
+#: /opt/webwork/webwork2/conf/defaults.config:1948
 msgid "Allow Unicode alternatives in student answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:74
 msgid "Allow the LMS to update user account data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:68
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:105
 msgid "Allow unassign"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2069
+#: /opt/webwork/webwork2/conf/defaults.config:1970
 msgid "Allowed error, as a percentage, for numerical comparisons"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1886
+#: /opt/webwork/webwork2/conf/defaults.config:1788
 msgid "Allowed to <em>act as</em> another user"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1923
+#: /opt/webwork/webwork2/conf/defaults.config:1825
 msgid "Allowed to change display settings used in pg problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1913
+#: /opt/webwork/webwork2/conf/defaults.config:1815
 msgid "Allowed to change their e-mail address"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1877
+#: /opt/webwork/webwork2/conf/defaults.config:1779
 msgid "Allowed to change their password"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1872
+#: /opt/webwork/webwork2/conf/defaults.config:1774
 msgid "Allowed to login to the course"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1950
+#: /opt/webwork/webwork2/conf/defaults.config:1852
 msgid "Allowed to see solutions before the answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1945
+#: /opt/webwork/webwork2/conf/defaults.config:1847
 msgid "Allowed to see the correct answers before the answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1934
+#: /opt/webwork/webwork2/conf/defaults.config:1836
 msgid "Allowed to view past answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1940
+#: /opt/webwork/webwork2/conf/defaults.config:1842
 msgid "Allowed to view problems in sets which are not open yet"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1572
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:82
+msgid ""
+"Allows configuration of certain parameters, such as permission levels, "
+"default display mode for equations, and email feedback behavior, on a course"
+" by course basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:126
+msgid "Also copy simple configuration file"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:26
 msgid "Amulet of Extension"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:20
+msgid ""
+"An achievement evaluator is a perl script that is run after each problem is "
+"submitted which returns a truth value of 0 (didn't earn) or 1 (earn). The "
+"evaluator is given access to different variables which contain data about "
+"the problem and set that is used to determine if the achievement is earned "
+"or not."
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:37
 msgid ""
 "An address that can be used to log in to the LMS. This is used in messages "
@@ -891,248 +1266,308 @@ msgid ""
 "WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:43
+msgid ""
+"An array which lists the hash reference of all the problems in the current "
+"set."
+msgstr ""
+
 #. ($archive_courseID)
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2350
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2647
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1274
 msgid "An error occured while archiving the course %1:"
 msgstr ""
 
 #. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:658
 msgid "An error occured while changing the title of the course %1."
 msgstr ""
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1795
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:878
 msgid "An error occured while deleting the course %1:"
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1521
+#. ($rename_oldCourseID,						$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:751
 msgid "An error occured while renaming the course %1 to %2:"
 msgstr ""
 
 #. ($part + 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:106
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:25
 msgid "Answer %1 Score (%):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:425
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:765
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:789
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:812
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:79
 msgid "Answer Date"
 msgstr "Дата ответа"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1712
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:39
 msgid "Answer Group Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:59
 msgid "Answer Hash Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:221
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:292
 msgid "Answer Log"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:17
+msgid "Answer Log Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:285
 msgid "Answer Preview"
 msgstr "Предварительный просмсотр ответа"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1465
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:48
+msgid ""
+"Answer availability for tests depends on multiple settings.  This only "
+"indicates the template answer date has passed.  See set editor for actual "
+"availability."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1276
 msgid "Answer(s) submitted:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
 msgid "Answer:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:224
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
 msgid "Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:122
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:37
 msgid "Answers Available"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1202
 msgid "Answers cannot be due until on or after the open date!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1204
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1197
 msgid "Answers cannot be made available until on or after the close date!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:313
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:21
 msgid ""
 "Any changes made below will be reflected in the achievement for ALL "
 "students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2259
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:507
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:175
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:69
 msgid "Any changes made below will be reflected in the set for ALL students."
 msgstr "Все сделанные нимже изменения будут отражаться в задании для ВСЕХ студентов."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:173
 msgid ""
 "Any changes made below will be reflected in the set for ONLY the student(s) "
 "listed above."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:122
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:159
 msgid "Append"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1849
+#. (tag('strong', dir => 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:71
 msgid "Append to end of %1 set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2264
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:51
+msgid "Applying definitions theoretically and proof writing"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:91
 msgid "Archive"
 msgstr ""
 
 #. ($archive, $n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:892
-msgid "Archive '%1' created successfully (%quant( %2, file))"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:361
+msgid "Archive \"%1\" created successfully (%quant( %2, file))"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1069
-msgid "Archive '%1' deleted"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:525
+msgid "Archive \"%1\" deleted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1846
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2048
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:38
 msgid "Archive Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2005
-msgid "Archive Courses"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:17
+msgid "Archive Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2423
-msgid "Archive next course"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:63
+msgid "Archive Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1056
-msgid "Archive this Course"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1158
+msgid "Archive next course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:61
 msgid "Archived Courses"
 msgstr ""
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:202
-msgid "Archiving course as %1.tar.gz. Reload FileManager to see it."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:69
+msgid "Archived course as %1.tar.gz."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:25
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to access the .tar.gz files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:26
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to upload additional .tar.gz "
+"files to be unarchived."
 msgstr ""
 
-#. (CGI::b($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2191
+#. (tag('b', $archive_courseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:57
 msgid ""
 "Are you sure that you want to delete the course %1 after archiving? This "
 "cannot be undone!"
 msgstr ""
 
-#. (CGI::b($delete_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1736
+#. (tag('b', param('delete_courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:5
 msgid ""
 "Are you sure you want to delete the course %1? All course files and data "
 "will be destroyed. There is no undo available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:72
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:511
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:64
+msgid ""
+"As the checkbox says, this includes a percentage grade column for each set."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:184
 msgid "Assign"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:225
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:62
 msgid "Assign All Sets to Current User"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:171
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:106
+msgid "Assign achievements"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:43
+msgid "Assign and unassign selected exercise sets to selected users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:54
 msgid "Assign selected sets to selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:919
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:154
+msgid "Assign sets to many students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:116
+msgid "Assign sets to one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:15
 msgid "Assign this achievement to which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1366
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:62
 msgid "Assign this set to which users?"
 msgstr "Кому из пользователей назначить это задание?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:15
 msgid "Assign to All Current Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:3
 msgid "Assign which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:35
 msgid "Assigned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1984
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:19
 msgid "Assigned Sets"
 msgstr "Назначенные задания"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:580
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:218
 msgid "Assigned achievements to users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2154
-msgid "Assigned to"
+#. (link_to(						$c->setCountMessage($db->countUserSets($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:96
+msgid "Assigned to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:212
 msgid "Assignment type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-msgid "Assignments only"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:2004
+#: /opt/webwork/webwork2/conf/defaults.config:1906
 msgid "Assist with the student answer entry process."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:417
 msgid "At least one of the answers above is NOT correct."
 msgstr ""
 
 # Short for "Attempts to Open Children"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:487
 msgid "Att. to Open Children"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:50
 msgid "Attachment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2293
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:107
 msgid "Attempt to upgrade directories"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:375
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:449
 msgid "Attempted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1416
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1498
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/attempts_row.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:73
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:13
 msgid "Attempts"
 msgstr "Попытки"
 
@@ -1140,392 +1575,586 @@ msgstr "Попытки"
 msgid "Audit"
 msgstr "Аудит"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:342
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:348
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:360
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:366
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:460
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:466
 msgid "Authentication failed.  Please speak to your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/InstructorRPCHandler.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:44
+msgid "Authentication failed. Log in again to continue."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:116
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:69
 msgid "Author Info"
 msgstr "Информация об авторе"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:87
 msgid "Automatic"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2058
+#: /opt/webwork/webwork2/conf/defaults.config:1959
 msgid ""
 "Automatically convert Full Width Unicode characters to their ASCII "
 "equivalents"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2911
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:97
+msgid ""
+"Automatically render all problems in the set on this page when \"Save "
+"Changes\" or \"Reset Form\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:667
 msgid "Automatically render problems on page load"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1727
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:95
+msgid "Automatically render problems on page load."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:49
 msgid "Auxiliary Resources"
 msgstr ""
 
-#. ($emailDirectory,$old_default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:350
-msgid "Backup file <code>%1/%2</code> created."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:179
+msgid "Average Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:255
-msgid "Badges"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:118
+msgid "Average Attempts Per Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:942
-msgid "Basic Search"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:115
+msgid "Average Percent"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
-msgid "Binary"
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:558
+msgid "Backup created on %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1271
-msgid "Box of Transmogrification"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:1
+msgid "Badges"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1093
-msgid "Browse"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:106
+msgid "Basic Search"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:512
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:991
-msgid "Browse from:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:28
+msgid "Before Open Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2161
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:31
 msgid ""
-"By default, feedback is always sent to all users specified to recieve "
+"Below the file list is a button and options for uploading files. Click the "
+"\"Choose File\" button, select the file, then click \"Upload\". A single "
+"file or a compressed tar (.tgz) file can be uploaded and if the option is "
+"selected, the archive is automatically unpacked and deleted.  Generally the "
+"\"automatic\" option on Format will correctly pick the correct type of file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:83
+msgid "Binary"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+msgid "Both Start and Grade"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:26
+msgid "Box of Transmogrification"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:40
+msgid "Browse"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:16
+msgid "Browse from:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2072
+msgid ""
+"By default, feedback is always sent to all users specified to recieve "
 "feedback.  This variable sets the system to only email feedback to users who"
 " have the same section as the user initiating the feedback.  I.e., feedback "
 "will only be sent to section leaders."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2151
+#: /opt/webwork/webwork2/conf/defaults.config:2062
 msgid ""
 "By default, feedback is sent to all users above who have permission to "
 "receive feedback. Feedback is also sent to any addresses specified in this "
 "blank. Separate email address entries by commas."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
 msgid "CLOSE DATE"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:217
 msgid "CLOSE TIME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:26
 msgid "Cake of Enlargement"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1891
+#: /opt/webwork/webwork2/conf/defaults.config:1793
 msgid "Can e-mail instructor"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1904
+#: /opt/webwork/webwork2/conf/defaults.config:1806
 msgid "Can report bugs"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1955
+#: /opt/webwork/webwork2/conf/defaults.config:1857
 msgid "Can show old answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1897
+#: /opt/webwork/webwork2/conf/defaults.config:1799
 msgid "Can submit answers for a student"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:275
 msgid "Can't copy file: %1"
 msgstr ""
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:894
-msgid "Can't create archive '%1': command returned %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
+msgid "Can't create archive \"%1\": command returned %2"
 msgstr ""
 
 #. ($courseID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2725
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:28
 msgid "Can't create course environment for %1 because %2"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:423
 msgid "Can't create directory: %1"
 msgstr ""
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1060
-msgid "Can't create file '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+msgid "Can't create file \"%1\": %2"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:948
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:406
 msgid "Can't create file: %1"
 msgstr ""
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1070
-msgid "Can't delete archive '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:526
+msgid "Can't delete archive \"%1\": %2"
 msgstr ""
 
-#. ($eUserID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:69
-msgid "Can't get password record for effective user '%1': %2"
-msgstr ""
-
-#. ($userID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:64
-msgid "Can't get password record for user '%1': %2"
+#. ($setID, $TargetUser->user_id,)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:925
+msgid ""
+"Can't generate hardcopy for set \"%1\" for user \"%2\". The set is not "
+"visible to students."
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:445
 msgid "Can't open %1"
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1426
 msgid "Can't open file %1"
 msgstr ""
 
 #. ($merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:343
 msgid "Can't read merge file %1. No message sent"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:760
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:298
 msgid "Can't rename file: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:591
 msgid "Can't rename to the same name."
 msgstr ""
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:927
-msgid "Can't unpack '%1': command returned %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:392
+msgid "Can't unpack \"%1\": command returned %2"
 msgstr ""
 
 #. ($fullPath)
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:629
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1895
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1819
 msgid "Can't write to file %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1015
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1096
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:154
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:462
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/confirm.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:69
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:15
 msgid "Cancel"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:387
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:5
+msgid "Cancel E-Mail"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:60
 msgid "Cancel E-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:61
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:77
 msgid "Cancel Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:79
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
 msgid "Cancel Export"
 msgstr "Отменить экспортирование"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:93
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
 msgid "Cancel Password"
 msgstr "Отменить назначение пароля"
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:516
+msgid "Cannot find a file path to save to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:501
+msgid ""
+"Cannot find a problem record for set $c->{setID} / problem $c->{problemID}"
+msgstr ""
+
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:240
 msgid "Cannot open %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:222
-msgid "Cap Test Time at Set Close Date?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:232
+msgid "Cap Test Time at Set Close Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1456
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1486
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:14
 msgid "Category"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:516
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:49
+msgid "Category:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:27
 msgid ""
 "Cause the selected homework set to count for twice as many points as it "
 "normally would."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1272
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:27
 msgid ""
 "Causes a homework problem to become a clone of another problem from the same"
 " set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:727
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:27
 msgid "Causes a single homework problem to be worth twice as much."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1006
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:48
 msgid "Change Course Title to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:34
 msgid "Change CourseID to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:176
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:134
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:76
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:25
 msgid "Change Display Settings"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:53
 msgid "Change Email Address"
 msgstr "Сменить адрес e-mail"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1032
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:62
 msgid "Change Institution to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:374
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:18
 msgid "Change Password"
 msgstr "Сменить пароль"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:169
 msgid "Change User Settings"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:35
+msgid "Change a course's ID, Title, or Institution."
+msgstr ""
+
 #. ($rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1092
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
 msgid "Change course institution from %1 to %2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:160
+msgid "Change dates for a homework set for the whole class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:123
+msgid "Change the due date for one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:26
+msgid ""
+"Change the due dates for an individual student on this page. Check the "
+"checkbox and enter the new date in order to override the date. (You can copy"
+" the date format from the date in the right hand column which indicates the "
+"date when the homework set is due for the whole class.) Note that you should"
+" ensure that the close date is before the answer date. If the close date for"
+" a student is extended until after the class answer date for the set, then "
+"the answer date for the student must also be set to a later date. "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:141
+msgid "Change the grades on a homework set for one student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:163
+msgid "Change the grading on a homework set for an entire class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:170
+msgid "Change the number of atttempts allowed on a problem."
+msgstr ""
+
 #. ($rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1089
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:508
 msgid "Change title from %1 to %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1362
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:488
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:540
 msgid "Changes abandoned"
 msgstr "Изменения отменены"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:371
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:242
 msgid "Changes in this file have not yet been permanently saved."
 msgstr "Изменения в этом файле ещё не были сохранены."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:647
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:529
 msgid "Changes saved"
 msgstr "Изменения сохранены"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1822
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:38
+msgid "Changing dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:514
 msgid ""
 "Changing the problem seed for display, but there are no problems showing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:635
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:19
 msgid "Chapter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1849
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:15
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:103
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:37
 msgid "Check Answers"
 msgstr "Проверить ответы"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2476
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:682
 msgid "Check Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:183
-msgid "Check that it's permissions are set correctly."
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:53
+msgid "Choose problems from a library and add them to a homework set."
 msgstr ""
 
-#. ($emailDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:195
-msgid ""
-"Check whether it exists and whether the directory %1 can be read by the "
-"webserver."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:543
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:40
 msgid "Choose the set which you would like to be worth twice as much."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:44
 msgid "Choose the set which you would like to enable partial credit for."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1206
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:992
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:44
 msgid "Choose the set which you would like to resurrect."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:259
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:350
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:40
 msgid "Choose the set whose close date you would like to extend."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:903
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:16
 msgid "Choose visibility of the sets to be affected"
 msgstr "Выберите опцию видимое/невидимое для отмеченных заданий"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:497
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:15
 msgid "Choose what to do with existing data:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:880
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:3
 msgid "Choose which sets to be affected"
 msgstr "Выберите задания, к которым это применяется"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:491
-msgid "Class value"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:17
+msgid "Class List Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:55
+msgid "Class list (\".lst\") files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:334
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:316
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:37
 msgid "Classlist Editor"
 msgstr "Редактор списка пользователей"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1197
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:91
 msgid "Clear Problem Display"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:693
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:82
 msgid ""
 "Click a student's name to see the student's homework set. Click a heading to"
 " sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:74
 msgid ""
 "Click a student's name to see the student's test summary page. Click a "
 "test's version number to see the corresponding test version. Click a heading"
 " to sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:614
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:150
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:143
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made. (The grade for each problem is listed "
+"as \"status\" on this third page)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:24
+msgid ""
+"Click on each of the tabs to view the configuration items. The question mark"
+" icon provides access to information about the behavior of the configuration"
+" settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:125
+msgid ""
+"Click on the column \"Assigned Sets\" in the student's row. This will take "
+"you to a page where you can assign and unassign homework sets and change the"
+" due dates for homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:33
+msgid ""
+"Click on the homework set links to edit the grades for this individual "
+"student on the homework set. (The grade of each problem is called the "
+"\"status\".) You can also change the number of allowed attempts and further "
+"modify the individual student's homework set.) You will also be able to "
+"change a student's seed which determines the individual values used in the "
+"individual version of the student's problem and the weight (how much a "
+"problem counts towards the grade.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:90
 msgid ""
 "Click on the login name to edit individual problem set data, (e.g. due "
 "dates) for these students."
 msgstr "Кликните логин студентов для того чтобы задать индивидуальные настройки для этих студентов."
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:62
+msgid ""
+"Click the \"Add x student(s)\" radio button and then click \"Take action\". "
+"This will take you to a new page where the data can be entered for one or "
+"more students. It is also possible to assign the student to one or more "
+"problem sets as they are being entered: simply select the homework sets from"
+" the list below the data entry table. Use \"command\" or \"control\" click "
+"to select more than one homework set."
+msgstr ""
+
+#. ('<i class="fas fa-question-circle"></i>')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:88
+msgid "Click the %1 icon for page and item specific help."
+msgstr ""
+
+#. ('<a href="#"><i class="fas fa-question-circle"></i></a>')
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:20
+msgid "Click the icon %1 for page and item specific help."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:185
+msgid ""
+"Clicking on any active link at the top of the column sorts the page by that "
+"column. You can do lexigraphic sorts: click on \"First name\" then \"Last "
+"name\" to sort by last name, sorting those with the same last name by their "
+"first name."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:132
+msgid ""
+"Clicking on the login name link in a student's row allows you to view the "
+"student's version of the homework (rather than your own) so that you can "
+"more easily answer student questions about homework problems. (A \"acting as"
+" xxx\" alert will appear in the upper right corner of each window while you "
+"are acting as a student.) You can submit the answers (which will NOT be "
+"recorded) to check that the computer is grading the problem correctly. You "
+"will also be able to view past answers submitted by the student for each "
+"problem. To stop acting in the student's role click the \"Stop acting\" link"
+" in the upper right corner of the window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:199
+msgid ""
+"Clicking the <strong>e-mail address</strong> link will bring up your "
+"standard email application so that you can send email to the student. This "
+"works even if the student has been dropped from the course. To send email to"
+" an entire class or to merge grades with the email message use the \"Email\""
+" page link in the left margin."
+msgstr ""
+
 #. ($clientIP->ip()
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:541
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:547
 msgid ""
 "Client ip address %1 is not allowed to work this assignment, because the "
 "assignment has ip address restrictions and there are no allowed locations "
@@ -1533,329 +2162,337 @@ msgid ""
 "problem resolved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:713
-msgid "Close"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:316
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:39
+msgid "Close Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:424
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:764
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:788
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:811
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
-msgid "Close Date"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:35
+msgid "Closed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:382
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:208
 msgid "Closed, answers available."
 msgstr ""
 
-#. ($self->formatDateTime($set->answer_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:378
+#. ($c->formatDateTime($set->answer_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:204
 msgid "Closed, answers on %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:206
 msgid "Closed, answers recently available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:282
 msgid "Closed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:116
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:121
 msgid "Closes"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date, undef,
-#. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:113
-msgid "Closes %1"
-msgstr ""
-
-#. ($self->formatDateTime($verSet->due_date, undef,
+#. ($c->formatDateTime($verSet->due_date, undef,
 #. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:390
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:227
 msgid "Closes on %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:35
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:33
 msgid "Closes:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2518
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:357
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:71
 msgid "Collapse All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2529
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:367
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:85
 msgid "Collapse All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2668
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:419
 msgid "Collapse Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2791
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2793
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:572
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:575
 msgid "Collapse Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1715
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:73
+msgid ""
+"Collapse problem details to the top row of information about a problem. Note"
+" that the details of a single problem can be collapsed by clicking on the up"
+" arrow to the right of the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1617
 msgid ""
 "Comma separated list of set names that are excluded from all achievements. "
 "No achievement points and badges can be earned for submitting problems in "
 "these sets. Note that underscores (_) must be used for spaces in set names."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:238
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:245
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:225
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:577
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2047
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:299
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:833
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:862
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:891
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:920
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:131
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:46
 msgid "Comment"
 msgstr "Комментарий"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:200
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:25
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:181
 msgid "Comment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:638
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:86
 msgid "Comments"
 msgstr ""
 
-#. ($self->formatDateTime($set->answer_date)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2175
+#. ($c->formatDateTime($c->{set}->answer_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:379
 msgid "Completed results for this assignment are not available until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:382
 msgid "Completed results for this assignment are not available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:264
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:280
 msgid "Completed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:45
 msgid "Compose Email Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3185
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:47
+msgid ""
+"Configure ip ranges (locations) that can be used to restrict set access."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:45
+msgid "Configure which course links appear on the site landing page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:97
 msgid "Confirm"
 msgstr ""
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:107
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:164
+#. ($eUserName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:41
 msgid "Confirm %1's New Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:579
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:78
 msgid "Confirm Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_export_form.html.ep:1
 msgid "Confirm which sets to export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementEvaluator.pm:288
+#: /opt/webwork/webwork2/templates/AchievementEvaluator/cheevoMessage.html.ep:15
 msgid "Congratulations, you earned a new level!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2250
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:95
 msgid "Continue"
 msgstr "Продолжить"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:86
 msgid "Continue Open Test"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:59
+msgid "Controls if an achievement is evaluated or not."
+msgstr ""
+
 #. ($sourceDirectory, $outputDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1149
-msgid "Copied auxiliary files from %1 to new location at %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:671
+msgid "Copied auxiliary files from %1 to new location at %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:42
 msgid "Copy"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
 msgid "Copy file as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:528
-msgid "Copy simple configuration file to new course"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:627
-msgid "Copy templates from:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:112
+msgid "Copy from:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1335
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:82
 msgid "Copy this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:391
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:465
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:301
 msgid "Correct"
 msgstr "Верно"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:656
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:678
 msgid "Correct Adjusted Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:300
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:287
 msgid "Correct Answer"
 msgstr "Правильные ответы"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1682
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:19
 msgid "Correct Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1506
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1317
 msgid "Correct Answers:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:693
 msgid "Correct Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:648
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:93
 msgid "Correct answers"
 msgstr "Правильные ответы"
 
 #. ($total_correct, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1004
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:16
 msgid "Correct: %1/%2"
 msgstr ""
 
 #. ($newBlankProblems, $MAX_NEW_PROBLEMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1915
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1843
 msgid ""
 "Could not add %1 problems to this set.  The number must be between 1 and %2"
 msgstr ""
 
 #. ($e_user_name, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:83
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:94
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:74
 msgid "Couldn't change %1's password: %2"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:111
 msgid "Couldn't change your email address: %1"
 msgstr ""
 
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4111
-msgid "Couldn't find OPL Branch %1 in remote %2"
-msgstr ""
-
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4076
-msgid "Couldn't find PG Branch %1 in remote %2"
-msgstr ""
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4014
-msgid "Couldn't find WeBWorK Branch %1 in remote %2"
-msgstr ""
-
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:132
 msgid "Couldn't save your display options: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1463
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:36
 msgid "Counter"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:424
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:833
-msgid "Counts for Parent"
-msgstr ""
-
-#. ($rename_oldCourseID)
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2186
-msgid "Course %1 database is in order"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:66
+msgid "Counter:"
 msgstr ""
 
-#. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1257
-msgid "Course %1 databases must be updated before renaming this course."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:503
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:35
+msgid "Counts for Parent"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:778
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:95
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:154
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:9
 msgid "Course Administration"
 msgstr "Администрирование курса"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:424
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:17
+msgid "Course Administration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:369
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:80
 msgid "Course Configuration"
 msgstr "Конфигурация курса. "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:480
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:17
+msgid "Course Configuration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:17
+msgid "Course Home Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:21
 msgid "Course ID"
 msgstr ""
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2566
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:691
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:594
 msgid "Course ID cannot exceed %1 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1227
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:597
 msgid "Course ID may only contain letters, numbers, hyphens, and underscores."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:956
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:21
 msgid "Course ID:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:5
 msgid "Course Info"
 msgstr "Сведения о курсе"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1664
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1961
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3736
-msgid "Course Name:"
+#. ($c->stash('courseID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:325
+msgid "Course Information for course %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:491
-msgid "Course Title"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:30
+msgid "Course Listings"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:17
+msgid "Course Name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:204
-msgid "Course archived."
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:28
+msgid "Course Title"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:418
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:12
 msgid "Courses"
 msgstr "Курсы"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1609
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1904
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3674
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:13
 msgid ""
 "Courses are listed either alphabetically or in order by the time of most "
 "recent login activity, oldest first. To change the listing order check the "
@@ -1864,393 +2501,536 @@ msgid ""
 "\"hidden\" or \"visible\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:7
+msgid ""
+"Courses are listed either alphabetically or in order by the time of most "
+"recent login activity, oldest first. To change the listing order check the "
+"mode you want and click \"Refresh Listing\". The listing format is: "
+"Course_Name (status :: date/time of most recent login) where status is "
+"\"hidden\" or \"visible\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:163
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:84
 msgid "Create"
 msgstr "Создать"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:41
 msgid "Create CSV"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3054
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:31
 msgid "Create Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1071
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:39
+msgid ""
+"Create a .tar.gz archive which includes the course's database and all course"
+" files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:33
 msgid "Create a New Set in This Course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:795
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:4
 msgid "Create a new achievement with ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:33
+msgid "Create a new course on this server."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:20
+msgid ""
+"Create a new course.  The \"Course ID\" is used as the course name and is "
+"used in course links.  Underscores appear as spaces when displaying the "
+"course name.  The \"Course Title\" is used as the title on the course home "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:86
+msgid ""
+"Create a new set with a given name. This can either create an empty set or a"
+" duplicate of an existing set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:12
 msgid "Create as what type of achievement?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:12
 msgid "Create as what type of set?"
 msgstr "Создать как задание какого типа?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1866
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:20
+msgid "Create backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:81
 msgid "Create unattached problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1849
-msgid ""
-"Creates a gzipped tar archive (.tar.gz) of a course in the WeBWorK courses "
-"directory. Before archiving, the course database is dumped into a "
-"subdirectory of the course's DATA directory. Currently the archive facility "
-"is only available for mysql databases. It depends on the mysqldump "
-"application."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:121
+msgid "Create/Delete achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:726
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:26
 msgid "Cupcake of Enlargement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:728
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:38
 msgid "Current"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3042
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:2
 msgid "Currently defined locations are listed below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4352
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2365
 msgid "Database tables are ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:54
 msgid "Database tables need updating."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2753
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:52
 msgid "Database tables ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2968
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1499
 msgid "Database:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:783
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:153
 msgid "Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:727
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:355
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:96
+msgid "Dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:40
+msgid ""
+"Dates for problem sets can be edited by clicking the pencil icon in the "
+"\"Edit Set Data\" column next to the set name. To change dates for several "
+"sets at once, click the check box in the \"Select\" column and choose \"Edit"
+" selected\" from the tasks above."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:426
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:37
 msgid "Default"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1675
+#: /opt/webwork/webwork2/conf/defaults.config:1577
 msgid ""
 "Default Amount of Time (in minutes) after Due Date that Answers are Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1665
+#: /opt/webwork/webwork2/conf/defaults.config:1567
 msgid ""
 "Default Amount of Time (in minutes) before Due Date that the Assignment is "
 "Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1785
+#: /opt/webwork/webwork2/conf/defaults.config:1687
 msgid "Default Length of Reduced Scoring Period in minutes"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1655
+#: /opt/webwork/webwork2/conf/defaults.config:1557
 msgid "Default Time that the Assignment is Due"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1808
+#: /opt/webwork/webwork2/conf/defaults.config:1710
 msgid ""
 "Default number of attempts before Show Me Another can be used (-1 => Never)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1755
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:162
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:91
+#: /opt/webwork/webwork2/conf/defaults.config:1994
+msgid ""
+"Default number of attempts before hints are shown in a problem (-1 => hide "
+"hints)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:89
 msgid "Delete"
 msgstr "Удалить"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1556
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1651
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1689
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1728
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:49
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:36
 msgid "Delete Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3480
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:17
+msgid "Delete Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:23
+msgid "Delete Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:37
+msgid "Delete a course and all associated data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:109
+msgid "Delete a student from a course"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:52
 msgid "Delete all existing addresses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1989
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:65
+msgid "Delete backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:64
+msgid "Delete backup from %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:54
 msgid "Delete course after archiving. Caution there is no undo!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:49
 msgid "Delete course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2348
 msgid "Delete field when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2809
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:588
 msgid "Delete it?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3055
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:78
 msgid "Delete location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:28
+msgid "Delete oldest backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2321
 msgid "Delete table when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:729
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:90
+msgid "Delete the sets checked below. Be careful, this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:6
 msgid "Delete which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1045
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:6
 msgid "Delete which sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1041
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:6
 msgid "Delete which users?"
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:394
 msgid "Deleted %1 users."
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:358
 msgid "Deleted %quant(%1,achievement)"
 msgstr ""
 
 #. (join(', ', @delLocations)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3359
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1810
 msgid "Deleted Location(s): %1"
 msgstr ""
 
 #. (join(', ', @toDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3597
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1966
 msgid "Deleted addresses %1 from location."
 msgstr ""
 
-#. ($self->shortPath($self->{tempFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1158
-msgid "Deleting temp file at %1"
+#. ($formatBackupTime)
+#. ($c->formatDateTime($delTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1243
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:569
+msgid "Deleted backup from %1."
+msgstr ""
+
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:679
+msgid "Deleted temp file at %1"
+msgstr ""
+
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1219
+msgid "Deleted temporary file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:125
+msgid "Deleting Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3152
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:68
 msgid ""
 "Deletion deletes all location data and related addresses, and is not "
 "undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:723
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:3
 msgid "Deletion destroys all achievement-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:185
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
 msgid "Deny From"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1467
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:27
 msgid "Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:256
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:71
+msgid "Description:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:69
 msgid "Deselect All Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:229
 msgid "Deselect All Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:428
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:366
 msgid "Didn't recognize action"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:27
 msgid "Directory"
 msgstr ""
 
 #. ($file, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:793
-msgid "Directory '%1' not removed: %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:327
+msgid "Directory \"%1\" not removed: %2"
 msgstr ""
 
 #. ($file, $removed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:792
-msgid "Directory '%1' removed (items deleted: %2)"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:325
+msgid "Directory \"%1\" removed (items deleted: %2)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:412
-msgid "Directory permission errors "
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:33
+msgid "Directory permission errors"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2861
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2994
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1439
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1575
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:44
 msgid ""
 "Directory structure is missing directories or the webserver lacks sufficient"
 " privileges."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1267
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2210
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2857
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1434
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1570
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:41
 msgid "Directory structure is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2285
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:102
 msgid "Directory structure needs to be repaired manually before archiving."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1338
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:84
 msgid "Directory structure needs to be repaired manually before renaming."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2750
-msgid "Directory structure or permissions need to be repaired. "
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:48
+msgid "Directory structure or permissions need to be repaired."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2853
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1414
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1540
 msgid "Directory structure:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2536
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:365
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:92
+msgid "Display Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:90
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:104
 msgid "Display Mode:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:463
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:37
 msgid "Display Past Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
-msgid "Display of scores for this set is not allowed."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:44
+msgid "Display mode for equations"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:311
+msgid "Display of scores for this test is not allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:589
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:12
 msgid "Display options: Show"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2017
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:48
+msgid ""
+"Display sets matching a selected criteria. Useful if there are many sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1918
 msgid "Display the evaluated student answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:176
+#. ('<code>COURSENAME_totals.csv</code>',
+#. '<code>COURSENAME_totals_bak1.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:74
+msgid ""
+"Do NOT use the file name %1, since you might accidentally overwrite that if "
+"you again export your WeBWorK homework scores. (Actually the earlier file is"
+" moved to %2 -- so you can recover using the File Manager.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:57
 msgid "Do not unassign students unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:233
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:67
 msgid "Do not uncheck a set unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:20
 msgid "Do not uncheck students, unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2450
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:656
 msgid "Do you want to grade this test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2272
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:93
+msgid "Documentation from source code for PG modules and macro files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:95
 msgid "Don't Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2607
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:13
 msgid "Don't Unarchive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2912
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:46
 msgid "Don't Upgrade"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1749
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:15
 msgid "Don't delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1120
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:24
 msgid "Don't make changes"
 msgstr ""
 
 #. ($saveMode)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:317
 msgid "Don't recognize saveMode: |%1|. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1307
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1321
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1335
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:87
 msgid "Don't rename"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:547
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:33
 msgid "Don't use in an achievement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:683
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1345
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2465
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1595
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:766
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:57
 msgid "Done"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:159
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:365
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:8
 msgid "Download"
 msgstr ""
 
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($set->set_id)
 #. ($ver->{id} =~ s/_/ /gr)
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($set->set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:731
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:732
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:413
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:204
 msgid "Download %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:23
 msgid "Download Hardcopy"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:865
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:56
 msgid "Download PDF or TeX Hardcopy for Current Set"
 msgstr "Скачать PDF или TeX файл для данного задания"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:764
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:233
 msgid "Download PDF or TeX Hardcopy for Selected Tests"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($selected_set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:595
+#. (tag('span', dir => 'ltr', format_set_name_display($selected_set_id =~
+#. s/,v(\d+)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:58
 msgid "Download hardcopy of set %1 for %2?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:369
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:63
+msgid "Download/upload archived courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:46
 msgid "Download:"
 msgstr ""
 
@@ -2258,139 +3038,181 @@ msgstr ""
 msgid "Drop"
 msgstr "Пропустить"
 
-#. ($self->formatDateTime($set->reduced_scoring_date, undef,
-#. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:107
-msgid "Due %1, after which reduced scoring is available until %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:100
+msgid "Drop student from the course"
 msgstr ""
 
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:310
 msgid "Due date %1 has passed."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2093
+#: /opt/webwork/webwork2/conf/defaults.config:2014
 msgid "E-Mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:315
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:261
 msgid "E-mail Instructor"
 msgstr "Написать e-mail инструктору"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2128
-msgid "E-mail addresses which can receive e-mail from a pg problem"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:2138
+#: /opt/webwork/webwork2/conf/defaults.config:2049
 msgid ""
 "E-mail feedback from students automatically sent to this permission level "
 "and higher"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2109
+#: /opt/webwork/webwork2/conf/defaults.config:2030
 msgid "E-mail verbosity level"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:357
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:43
 msgid "E-mail:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:35
 msgid "Earned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:71
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:158
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:334
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:417
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:547
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2743
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1628
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1186
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1203
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:257
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:479
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:6
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:53
 msgid "Edit"
 msgstr "Редактировать"
 
-#. (CGI::a({ href => $basicInfoUrl }, $r->maketext('class list data')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:199
-msgid "Edit %1 for  %2 (%3) who has been assigned %4 sets."
+#. (link_to(maketext('class list data')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:47
+msgid "Edit %1 for %2 (%3) who has been assigned %4 sets."
 msgstr ""
 
-#. (CGI::a({ href => $editUsersAssignedToSetURL }, $r->maketext('individual
-#. versions')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2223
-msgid "Edit %1 of set %2."
+#. (link_to(maketext('individual user settings')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:162
+msgid "Edit %1 for set %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:6
 msgid "Edit Assigned Users"
 msgstr "Редактировать список студентов, которым назначено задание"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:40
 msgid "Edit Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1488
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:58
 msgid "Edit Evaluator"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:253
 msgid "Edit Header"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3053
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:18
 msgid "Edit Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2741
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:111
 msgid "Edit Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:5
 msgid "Edit Problems"
 msgstr "Редактировать задачи"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:583
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:3
 msgid "Edit Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:421
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:4
 msgid "Edit Set Data"
 msgstr "Редактировать настройки задания"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:171
+msgid "Edit Tags"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:30
 msgid "Edit Target Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1487
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:18
 msgid "Edit Users"
 msgstr ""
 
-#. ($user)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:207
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:127
+msgid "Edit achievement evaluator"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:90
+msgid "Edit achievement information"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:65
+msgid ""
+"Edit achivements for the course. This link is only present if achievements "
+"are enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:42
+msgid "Edit class list data"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:39
+msgid ""
+"Edit class roster data. Add students, edit student data, drop students from "
+"class, import students from a classlist, and give user professor privileges."
+" Access to individual homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:70
 msgid "Edit data for %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1248
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:46
+msgid ""
+"Edit homework sets for entire class. Change homework set due dates, create "
+"new sets from a set definition file, create new homework sets, make sets "
+"visible/invisible, score homework sets. Assign homework sets to the class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:219
 msgid "Edit it"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2192
-msgid "Edit set %1 data for ALL students assigned to this set."
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:135
+msgid "Edit set %1 for ALL students assigned to this set."
 msgstr ""
 
-#. (CGI::a({href=>$editSetLink},$setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2166
+#. (link_to(                                               $setID =>
+#. $c->systemLink(
+#. $setDetailPage, params => { effectiveUser => $user->user_id, editForUser =>
+#. $user->user_id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:106
 msgid "Edit set %1 for this user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3393
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:95
+msgid "Edit set for %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:4
 msgid ""
 "Edit the current value of the location description, if desired, then add and"
 " select addresses to delete, and then click the \"Take Action\" button to "
@@ -2398,174 +3220,219 @@ msgid ""
 "changes and return to the Manage Locations page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:429
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:2
 msgid "Edit which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:829
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:2
 msgid "Edit which sets?"
 msgstr "Какие из заданий редактировать?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:935
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:2
 msgid "Edit which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:592
-msgid "Editing <strong>blank problem</strong> in file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:31
+msgid "Editing <strong>course information</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:595
-msgid "Editing <strong>course information</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:30
+msgid "Editing <strong>hardcopy header</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
-msgid "Editing <strong>hardcopy header</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:28
+msgid "Editing <strong>new problem</strong> template."
+msgstr ""
+
+#. ($c->{prettyProblemNumber},                             tag('span', dir =>
+#. 'ltr', format_set_name_display($fullSetName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:45
+msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:29
+msgid "Editing <strong>set header</strong> file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:33
+msgid "Editing <strong>unassigned problem</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:596
-msgid "Editing <strong>options information</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:32
+msgid "Editing <strong>unknown file type</strong> in file \"%1\"."
 msgstr ""
 
-#. ($prettyProblemNumber,                  CGI::span({ dir => 'ltr' },
-#. format_set_name_display($fullSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:605
-msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:19
+msgid "Editing Modes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:593
-msgid "Editing <strong>set header</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:140
+msgid "Editing Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:598
-msgid "Editing <strong>unassigned problem</strong> file \"%1\""
+#. ($c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:16
+msgid "Editing achievement in file \"%1\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:597
-msgid "Editing <strong>unknown file type</strong> in file \"%1\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:22
+msgid "Editing for all students"
 msgstr ""
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:209
-msgid "Editing achievement in file '%1'"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:23
+msgid "Editing for one student or a proper subset of all students"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3390
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:1
 msgid "Editing location %1"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display("$setID$vermsg")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2182
-msgid "Editing problem set %1 data for these individual students: %2"
+#. (tag(                                           'strong',
+#. dir => 'ltr',
+#. format_set_name_display($setID . ($editingSetVersion ?
+#. ",v$editingSetVersion" : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:123
+msgid "Editing problem set %1 for these students: %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:315
 msgid "Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:669
-msgid "Editor rows:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1668
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:229
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:53
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:68
 msgid "Email"
 msgstr "Email"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:32
 msgid "Email Address"
 msgstr "Адрес e-mail"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:817
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:170
 msgid "Email Body:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:17
+msgid "Email Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:339
 msgid "Email Instructor On Failed Attempt"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2003
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:28
 msgid "Email Link"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:789
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:112
 msgid "Email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1807
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1832
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:311
+msgid "Email body is empty. No message sent. "
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:994
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_email.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_form.html.ep:24
 msgid "Email instructor"
 msgstr "Написать e-mail инструктору"
 
-#. (scalar(@{ $self->{ra_send_to} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:454
+#. (scalar(@{ $c->{ra_send_to} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:27
+msgid ""
+"Email is being sent to %quant(%1,recipient). You will be notified by email "
+"when the task is completed.  This may take several minutes if the class is "
+"large."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:13
+msgid "Email:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:26
 msgid ""
-"Email is being sent to %quant(%1,recipient). You will be notified by email\n"
-"\t\t\t\twhen the task is completed.  This may take several minutes if the class is\n"
-"\t\t\t\tlarge."
+"Emails can contain personalized data, such as name, section, or status.  "
+"Click \"List of insertable macros\" for a full list available variables.  "
+"Additional personal data can be included by using a merge file.  A merge "
+"file is a CSV file located in the [Scoring] directory in which the first "
+"column is the student id, followed by additional data (such as student "
+"grades).  This data is identified by which column it is in, for instance if "
+"the scores where in the 4th column of the merge file, insert them into an "
+"email using the variable $COL[4].  The \"Scoring Tools\" page can export "
+"grades into a CSV that can be used as a merge file.  Upload customized merge"
+" files with the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:11
 msgid "Emails to be sent to the following:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1704
+#: /opt/webwork/webwork2/conf/defaults.config:1606
 msgid "Enable Achievement Rewards"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1723
+#: /opt/webwork/webwork2/conf/defaults.config:1625
 msgid "Enable Conditional Release"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1689
+#: /opt/webwork/webwork2/conf/defaults.config:1591
 msgid "Enable Course Achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1645
+#: /opt/webwork/webwork2/conf/defaults.config:1547
 msgid "Enable Progress Bar and current problem highlighting"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1734
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:585
+#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Enable Reduced Scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1799
+#: /opt/webwork/webwork2/conf/defaults.config:1701
 msgid "Enable Show Me Another button"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:156
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:24
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:92
 msgid "Enable Spell Checking"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1844
+#: /opt/webwork/webwork2/conf/defaults.config:1746
 msgid "Enable periodic re-randomization of problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:416
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:29
 msgid ""
 "Enable reduced scoring for a homework set.  This will allow you to submit "
 "answers for partial credit for 24 hours after the close date."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1461
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1483
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:20
 msgid "Enabled"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1846
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:58
+msgid "Enabled:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1748
 msgid ""
 "Enables periodic re-randomization of problems after a given number of "
 "attempts. Student would have to click Request New Version to obtain new "
 "version of the problem and to continue working on the problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1725
+#: /opt/webwork/webwork2/conf/defaults.config:1627
 msgid ""
 "Enables the use of the conditional release system.  To use conditional "
 "release you need to specify a list of set names on the Problem Set Detail "
@@ -2574,14 +3441,14 @@ msgid ""
 " sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1801
+#: /opt/webwork/webwork2/conf/defaults.config:1703
 msgid ""
 "Enables use of the Show Me Another button, which offers the student a newly-"
 "seeded version of the current problem, complete with solution (if it exists "
 "for that problem)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:662
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:163
 msgid "End"
 msgstr ""
 
@@ -2589,538 +3456,662 @@ msgstr ""
 msgid "Enrolled"
 msgstr "Включен в списки"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:788
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:111
 msgid "Enrolled, Drop, etc."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:830
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:859
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:888
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:917
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:128
 msgid "Enrollment Status"
 msgstr "Статус участия"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:21
 msgid "Enter filename below"
 msgstr "Напечатайте имя файла "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:20
 msgid "Enter filenames below"
 msgstr "Напечатайте имена файлов"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:19
 msgid ""
 "Enter information below for students you wish to add. Each student's "
 "password will initially be set to their student ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1997
+#: /opt/webwork/webwork2/conf/defaults.config:1899
 msgid ""
 "Enter one of the allowed display mode types above.  See 'display modes "
 "entry' for descriptions."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:297
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:34
+msgid ""
+"Enter the details of the course instructor to be added when the course is "
+"created.  This user will also be added to the admin course with the username"
+" \"userID_courseID\" so you can manage and email the instructors of the "
+"courses on the server."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:284
 msgid "Entered"
 msgstr "Введено"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:85
-msgid "Entered student:"
-msgstr ""
-
-#. ($display_sort_method_name{$primary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:698
+#. ($display_sort_method_name{$primary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:98
 msgid "Entries are sorted by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:247
 msgid "Equation Display"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:61
+msgid "Equation Editor"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1516
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1460
 msgid "Error adding set-level proctor: %1"
 msgstr ""
 
+#. ($fromPath, $toPath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:664
+msgid "Error copying %1 to %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:14
+msgid "Error details"
+msgstr ""
+
+#. ($filePath, stash('podError')
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:27
+msgid "Error generating POD for file %1: %2"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1492
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1437
 msgid ""
 "Error getting old set-proctor password from the database: %1.  No update to "
 "the password was done."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:31
 msgid "Error message:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2235
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:12
 msgid "Error messages"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1616
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:754
 msgid "Error: Answer date must come after close date in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:747
 msgid "Error: Close date must come after open date in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1634
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:778
 msgid ""
 "Error: Reduced scoring date must come between the open date and close date "
 "in set %1"
 msgstr ""
 
-#. ($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2067
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:7
 msgid "Error: The original file %1 cannot be read."
 msgstr ""
 
 #. ($setID)
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1240
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:738
 msgid "Error: answer date cannot be more than 10 years from now in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1235
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:733
 msgid "Error: close date cannot be more than 10 years from now in set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:630
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:234
 msgid "Error: no file data was submitted!"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1599
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:728
 msgid "Error: open date cannot be more than 10 years from now in set %1"
 msgstr ""
 
-#. ($problem_desc, $problem_name, CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1404
+#. ($problem_desc, $problem_name, $c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1210
 msgid ""
 "Errors encountered while processing %1. This %2 has been omitted from the "
 "hardcopy. Error text: %3"
 msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3832
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:8
+msgid "Errors occured while generating hardcopy:"
+msgstr ""
+
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2128
 msgid ""
 "Errors occured while hiding the courses listed below when attempting to "
 "create the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3920
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2197
 msgid ""
 "Errors occured while unhiding the courses listed below when attempting "
 "delete the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1468
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:28
 msgid "Evaluator File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3839
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:76
+msgid "Evaluator File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:28
+msgid "Evaluator Variables"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2143
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
-"hidden."
+"Except for the errors listed above, all selected courses are already hidden."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3904
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2212
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
+"Except for the errors listed above, all selected courses are already "
 "unhidden."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3456
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:39
 msgid ""
 "Existing addresses for the location are given in the scrolling list below.  "
 "Select addresses from the list to delete them:"
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2281
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1460
 msgid "Existing file %1 could not be backed up and was lost."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2514
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:354
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:65
 msgid "Expand All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:364
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:78
 msgid "Expand All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2667
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:418
 msgid "Expand Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2792
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:574
 msgid "Expand Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:74
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:89
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:67
+msgid ""
+"Expand problem details that have been collapsed. Note that the details of a "
+"single problem can be expanded by clicking on the down arrow to the right of"
+" the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:71
 msgid "Export"
 msgstr "Экспортировать"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1098
-msgid "Export selected achievements."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:113
+msgid "Export achievement data"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_export_form.html.ep:1
+msgid "Export selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1267
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:17
 msgid "Export to what kind of file?"
 msgstr "Экспортировать в какой файл?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:2
 msgid "Export which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1245
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:5
 msgid "Export which users?"
 msgstr "Кого из пользователей экспортировать?"
 
 #. ($FileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1151
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:591
 msgid "Exported achievements to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1616
-msgid "Extend the close date for which Gateway?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:48
+msgid "Extend the close date for which test?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:148
+msgid "Extend the number of attempts allowed a student on a given problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1573
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:28
 msgid ""
-"Extends the close date of a gateway test by 24 hours. Note: The test must "
-"still be open for this to work."
+"Extends the close date of a test by 24 hours. Note: The test must still be "
+"open for this to work."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "FIRST NAME"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Failed to add user:"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:416
 msgid "Failed to create new achievement: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:373
 msgid "Failed to create new achievement: no achievement ID specified!"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:573
 msgid "Failed to create new set: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1158
-msgid "Failed to create new set: no set name specified!"
-msgstr "Не укдаётся создать новое задание: не указано название для задания! "
+#. ($newSetID =~ s/_/ /gr)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:482
+msgid ""
+"Failed to create new set: Invalid characters in set name \"%1\". A set name "
+"may only contain letters, numbers, hyphens, periods, and spaces."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:474
+msgid "Failed to create new set: No set name specified."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1155
-msgid "Failed to create new set: set name cannot exceed 100 characters."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:469
+msgid "Failed to create new set: Set name cannot exceed 100 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:396
 msgid ""
 "Failed to duplicate achievement: no achievement selected for duplication!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:530
 msgid "Failed to duplicate set: no set selected for duplication!"
 msgstr "Не удалось создать дубликат задания: задания для дублирования не выбрано!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:74
-msgid "Failed to enter student:"
+#. ($@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:67
+msgid "Failed to generate course archive: %1"
 msgstr ""
 
 #. ($scoreFilePath)
 #. ($filePath)
 #. ($FilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1125
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:649
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:955
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2402
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1584
 msgid "Failed to open %1"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:227
 msgid "Failed to save: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#. ($_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:253
+msgid "Failed to send message: %1"
+msgstr ""
+
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:23
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:36
 msgid "False"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1919
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:63
 msgid "Feature exhausted for this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:200
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:23
+msgid "Features:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:252
 msgid "Feedback"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2159
+#: /opt/webwork/webwork2/conf/defaults.config:2070
 msgid "Feedback by Section."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:234
 msgid "FeedbackMessage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1177
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2113
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2284
 msgid "Field is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2109
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2286
 msgid "Field missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1175
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2111
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4290
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
 msgid "Field missing in schema"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:599
-msgid "File '%1' exists.  File not saved.  No changes have been made."
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:266
+msgid "File \"%1\" exists.  File not saved.  No changes have been made."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1926
-msgid ""
-"File '%1' exists. File not saved. No changes have been made.  You can change"
-" the file path for this problem manually from the 'Hmwk Sets Editor' page"
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1036
+msgid "File \"%1\" exists. File not saved. No changes have been made."
 msgstr ""
 
-#. ($file,$!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:796
-msgid "File '%1' not removed: %2"
+#. ($file, $!)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:333
+msgid "File \"%1\" not removed: %2"
 msgstr ""
 
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:795
-msgid "File '%1' successfully removed"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+msgid "File \"%1\" successfully removed"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1066
-msgid "File '%1' uploaded successfully"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:522
+msgid "File \"%1\" uploaded successfully"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:476
 msgid "File <b>%1</b> already exists. Overwrite it, or rename it as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:364
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:55
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:70
 msgid "File Manager"
 msgstr "Менеджер файлов"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:628
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:17
+msgid "File Manager Help"
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:541
+msgid "File not saved. Failed to open \"%1\" for writing."
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:528
+msgid ""
+"File not saved. The file \"%1\" is not contained in the templates directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:921
+msgid ""
+"File not saved. The file name for this problem does not match the file name "
+"the editor was opened with. The problem set may have changed. Please reopen "
+"this file from the homework sets editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:228
 msgid "File saved"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:733
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:272
 msgid "File successfully copied"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:758
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:295
 msgid "File successfully renamed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:29
 msgid "Filename"
 msgstr "Имя файла"
 
-#. ($extension,$location)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1296
-msgid "Files with extension '.%1' usually belong in '%2'"
+#. ($extension, $location)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:699
+msgid "Files with extension \".%1\" usually belong in \"%2\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:20
+msgid ""
+"Fill out the form below to add, edit, or delete locations.  Locations are "
+"used to restrict access to sets based on ip address.  Locations are "
+"configured here in the administration course, then used in a normal course."
+"  When configuring a set to use a restricted ip address, the instructor can "
+"choose to either restrict access to the location or deny access from a "
+"location, which are identified by their name.  Instructors can select "
+"multiple locations to restrict access to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:78
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:47
 msgid "Filter"
 msgstr ""
 
 #. ($recitation)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1184
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1112
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1420
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:913
 msgid "Filter by recitation %1"
 msgstr ""
 
 #. ($section)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1180
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1416
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:910
 msgid "Filter by section %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:733
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:31
 msgid "Filter by what text?"
 msgstr "По какому тексту ыильтровать?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:151
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:17
 msgid "Filter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:749
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:137
 msgid "First"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:593
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1992
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:827
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:856
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:885
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:914
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:87
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:21
 msgid "First Name"
 msgstr "Имя"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:107
 msgid "First name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:178
 msgid ""
 "For security reasons, you cannot specify a message file from a directory "
 "higher than the email directory (you can't use ../blah/blah for example). "
 "Please specify a different file or move the needed file to the email "
-"directory"
+"directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:30
+msgid "Force editor to RTL"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2928
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:674
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:101
 msgid "Force problems to be numbered consecutively from one"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:409
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:35
+msgid "Form Elements Present on the Page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:75
 msgid "Format"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2096
+#: /opt/webwork/webwork2/conf/defaults.config:2017
 msgid "Format for the subject line in feedback e-mails"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:172
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:133
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:10
 msgid "Format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:12
 msgid "Found no directories containing problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1112
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:43
 msgid "From This Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:318
 msgid "From field must contain one valid email address."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:340
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:621
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:20
+msgid ""
+"From this page you can <strong>add new students</strong>, "
+"<strong>edit</strong> class list data (name, email address, recitation, "
+"section, permission level, and enrollment status), <strong>change "
+"passwords</strong>, and <strong>export</strong> (save) class lists for back-"
+"up or use in another course. You can also delete students from the class "
+"roster, but this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:34
 msgid "From:"
 msgstr "От:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:59
 msgid "GLOBAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1512
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1619
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1728
-msgid "Gateway Name"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:210
-msgid "Gateway Quiz %2"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:853
-msgid "Gateway parameters"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/conf/defaults.config:1427
 msgid "General"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2305
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:201
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:30
 msgid "General Information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:745
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:669
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:670
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:222
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:116
+msgid "General Page Information"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:121
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:166
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:167
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:113
 msgid "Generate Hardcopy"
 msgstr "Создать печатную версию"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:262
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:73
 msgid "Generate Hardcopy for Selected Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:744
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:115
+msgid ""
+"Generate a hardcopy of the problem being edited. This does not change the "
+"permanent file on the disk. You can generate a hardcopy for different "
+"versions of the same problem by changing the seed. You can also change the "
+"format to \"PDF\" or \"TeX Source\". If \"PDF\" is selected, then a PDF file"
+" will be generated for download, unless there are errors. If errors occur or"
+" \"TeX Source\" is selected, then a zip file will be generated for download "
+"that contains the TeX source file and resources needed for generating the "
+"PDF file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:20
+msgid ""
+"Generate hardcopies of assignments in PDF or latex format. To produce a "
+"hardcopy, one selects the users on the left and the sets on the right. All "
+"users and sets are listed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:170
 msgid "Generate hardcopy for selected sets and selected users"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:184
-#: /opt/webwork/pg/macros/problemRandomize.pl:185
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:186
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:187
 msgid "Get a new version of this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:986
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:2
 msgid "Give new password to which users?"
 msgstr "Кому из пользователей назначить новый пароль?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1063
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:27
 msgid "Gives full credit on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1180
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:27
 msgid "Gives full credit on every problem in a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:846
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:27
 msgid "Gives half credit on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:27
 msgid "Gives half credit on every problem in a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:62
 msgid "Global Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1422
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:76
 msgid "Global Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:49
 msgid "Global Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:51
 msgid ""
 "Global data on problem usage is contributed by many institutions using "
 "WeBWorK all over the world. The Usage figure is the total number of  "
@@ -3130,198 +4121,324 @@ msgid ""
 msgstr ""
 
 #. ($problemID, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1549
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1489
 msgid "Global problem %1 for set %2 not found."
 msgstr ""
 
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:334
+#. ($c->{prettyID}, $c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:378
+msgid "Global problem %1 not found for set %2."
+msgstr ""
+
+#. ($c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:142
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:372
 msgid "Global set %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2093
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:77
 msgid "Global set data will be shown instead of user specific data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:28
 msgid "Go"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:483
 msgid "Go back to Part 1"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:291
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
-#: /opt/webwork/pg/macros/compoundProblem.pl:491
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:293
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:498
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:512
 msgid "Go on to next part"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2651
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:544
 msgid "Grade"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2649
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:383
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:970
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:541
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:75
 msgid "Grade Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2446
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:651
 msgid "Grade Test"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:148
+msgid "Grade of Active Students"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:55
 msgid "Grade passback mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:837
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:38
 msgid "Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:236
 msgid "Grades"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:110
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:17
+msgid "Grades Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:115
 msgid "Grades have been saved for all current users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:221
-msgid "Grading assignment:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:28
+msgid "Grading Assignment"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:152
+msgid "Grading Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1062
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:26
 msgid "Greater Rod of Revelation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1179
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:26
 msgid "Greater Tome of Enlightenment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:285
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:50
+msgid ""
+"Groups types of achievements. The \"level\" and \"secret\" categories are "
+"special (described above), and categories can be used to create achievement "
+"chains."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:74
 msgid "Guest Login"
 msgstr "Гостевой вход"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2251
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:86
+msgid "Guest:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:33
 msgid "HTTP Headers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:682
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:35
+msgid "Hardcopy Format"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:115
 msgid "Hardcopy Format:"
 msgstr "Формат печатной версии:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:270
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:285
 msgid "Hardcopy Generator"
 msgstr "Генератор печатных версий"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:101
 msgid "Hardcopy Header"
 msgstr "Заголовок печатной версии залания"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1623
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:724
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:324
+msgid "Hardcopy Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:17
+msgid "Hardcopy Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:153
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:44
 msgid "Hardcopy Theme"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:408
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:427
 msgid "Hardcopy will always print the original version of the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:31
 msgid "Headers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1048
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:296
 msgid "Help"
 msgstr "Помощь"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:797
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:170
 msgid "Help Icon"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:542
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:30
+msgid ""
+"Here is a list of the variables the evaluator has access to. Unless "
+"indicated, changes to the variables will not be saved.  Evaluators are run "
+"in the same order they are listed on the achievement editor page and are "
+"only run if the achievement has not been earned. Keep this in mind when "
+"using persistent global data."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:507
 msgid "Here is a new version of your problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:914
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:42
 msgid "Hidden"
 msgstr "Скрытое"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:347
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:62
 msgid "Hide All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3663
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3718
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3760
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:384
-msgid "Hide Courses"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:17
+msgid "Hide Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:428
-msgid "Hide Hints"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:57
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:44
+msgid "Hide Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:477
 msgid "Hide Hints from Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1566
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:63
+msgid "Hide all rendered problems on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:252
 msgid "Hide this problem"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1523
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1524
 msgid "Hint:"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1522
 msgid "Hint: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:658
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1771
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:99
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:51
 msgid "Hints"
 msgstr "Подсказки"
 
 # Hmwk is short for Homework
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:364
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:327
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:44
 msgid "Hmwk Sets Editor"
 msgstr "Редактор заданий"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:779
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:80
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:108
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:19
 msgid "Homework Sets"
 msgstr "Задания"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:38
 msgid "Homework Totals"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1432
-msgid "I couldn't find the file [ACHEVDIR]/surprise_message.txt!"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:17
+msgid "Homwork Sets Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:88
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:31
+msgid "How to:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:36
+msgid "I couldn't find the file [ACHIEVEMENT_DIR]/surprise_message.txt!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1451
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:9
 msgid "Icon"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:29
 msgid "Icon File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:612
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:80
+msgid "Icon File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:24
+msgid ""
+"If \"PDF\" is selected, then a PDF file will be generated for download, "
+"unless there are errors.  If errors occur generating a PDF file or \"TeX "
+"Source\" is selected then a zip file will be generated for download that "
+"contains the TeX source file and resources needed for generating the PDF "
+"file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:37
+msgid ""
+"If \"TeX Source\" is selected, a zip file containing a TeX file and other "
+"files needed to generate a PDF hardcopy will be produced. If \"Adobe PDF\" "
+"is selected then only a PDF file will be produced."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:84
 msgid ""
 "If a password field is left blank, the student's current password will be "
 "maintained."
 msgstr "Если поле пароля оставлено пустым, текущий пароль студента останется без изменений. "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:42
+msgid ""
+"If selected, the file path of the problem source will be printed in the "
+"output."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:38
+msgid ""
+"If selected, this adds spaces between the fields to align the commas, which "
+"makes the columns easy to read when in text form but it can confuse some "
+"spreadsheet applications since the extra spaces violate the csv standard "
+"(although Excel handles them with no problem). This will give a visual form "
+"of the CSV file that is easy to read on the page. If you want a reliable "
+".csv file for use in any spreadsheet application unclick the \"Pad Fields\" "
+"option. You can download the .csv file immediately by clicking on the link "
+"with the filename chosen above, or you can download it using the \"File "
+"Manager\" from the scoring directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:148
+msgid ""
+"If the original problem can not be edited than the path name must be changed"
+" in order to be allowed to save the problem. Adding \"local/\" to the "
+"beginning of the original path is the default solution. All locally created "
+"and edited files will then appear in a subdirectory named \"local\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:513
 msgid ""
 "If this flag is set then this problem will count towards the grade of its "
 "parent problem.  In general the adjusted status on a problem is the larger "
@@ -3329,20 +4446,28 @@ msgid ""
 "problems which have this flag enabled."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
 msgid ""
 "If this is enabled then instructors with the ability to receive feedback "
 "emails will be notified whenever a student runs out of attempts on a problem"
-" and its children without receiving an adjusted status of 100%."
+" and its children  without receiving an adjusted status of 100%."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:334
 msgid ""
 "If this is enabled then students will be unable to attempt a problem until "
 "they have completed all of the previous problems, and their child problems "
 "if necessary."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:57
+msgid ""
+"If this is selected, a success index is listed in each csv file. The success"
+" index is a number assigned on the basis of the number of incorrect attempts"
+" (roughly equivalent to 1/the number of attempts) which seems to correlate "
+"with the relative difficulty the student had with the problem."
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:47
 msgid ""
 "If this is set, all users (including the instructor) must enter the WeBWorK "
@@ -3350,8 +4475,8 @@ msgid ""
 "they receive a message directing them back to the LMS."
 msgstr ""
 
-#. (CGI::b($r->maketext("Remember Me")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:201
+#. (tag('strong', maketext('Remember Me')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:33
 msgid ""
 "If you check %1 your login information will be remembered by the browser you"
 " are using, allowing you to visit WeBWorK pages without typing your user "
@@ -3360,273 +4485,419 @@ msgid ""
 " have direct control."
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:407
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:154
+msgid ""
+"If you click on the \"Grade Problem\" icon to the right of the problem "
+"number, then the problem will open in the manual problem grader. This page "
+"shows the rendered problem and lists all students assigned to the set and "
+"the last answer the students entered for the problem. You can then change "
+"the recorded scores for students on this problem and provide instructor "
+"feedback comments."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:148
+msgid ""
+"If you click on the \"Open in New Window\" icon to the right of the problem "
+"number, then the problem will open in the actual homework set in a new tab "
+"or window."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:425
 msgid "If you come back to it later, it may revert to its original version."
 msgstr ""
 
+#. ('<code>report_grades_data.csv</code>', '<code>report_grade.msg</code>',
+#. '<code>$COL</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:80
+msgid ""
+"If you upload your file on the web with the name: %1 and also create an "
+"email message with the name %2 with the approriate %3 variables then not "
+"only can you email the message with the embedded grades to the students, but"
+" files with those exact names are automatically appended to the \"Grades\" "
+"page seen by the students."
+msgstr ""
+
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:798
-msgid "Illegal file '%1' specified"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:337
+msgid "Illegal file \"%1\" specified"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1445
 msgid "Illegal filename contains '..'"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:73
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:63
 msgid "Import"
 msgstr "Импортировать"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1291
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:65
+msgid ""
+"Import a single set or multiple sets from a set definition file. (Use the "
+"\"File Manager\" to upload/download set definition files.) The \"Shift "
+"Dates...\" option is useful for problem sets that were used from other "
+"courses and will shift all of the dates."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:16
 msgid "Import from where?"
 msgstr "Откуда импортировать?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1270
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:5
 msgid "Import how many sets?"
 msgstr "Сколько заданий импортировать?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:31
 msgid "Import sets with names"
 msgstr "Импортировать задания с именами"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:5
 msgid "Import users from what file?"
 msgstr "Из какого файла импортировать пользователей?"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:99
+msgid "Import/export achievements"
+msgstr ""
+
 #. ($count)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:516
 msgid "Imported %quant(%1,achievement)"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:25
+msgid ""
+"In both cases, one can select the sort field, the format of the display "
+"list, and the filter. \"Change Display Settings\" must be clicked to update "
+"the list."
+msgstr ""
+
 #. ($total_inprogress, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1019
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:28
 msgid "In progress: %1/%2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:47
 msgid "Inactive"
 msgstr "Не активен"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1601
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:51
+msgid "Inactive Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1503
 msgid "Inactivity time before a user is required to login again"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:42
 msgid "Include Contrib"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:35
 msgid "Include OPL"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:32
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:55
 msgid "Include Success Index"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:62
 msgid "Include percentage grades columns for all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:471
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:302
 msgid "Incorrect"
 msgstr ""
 
 #. ($total_incorrect, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1033
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:36
 msgid "Incorrect: %1/%2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:26
+msgid ""
+"Indicates the number of problems in the set. Clicking on the link opens the "
+"set detail page which allows you to modify set parameters, edit set headers,"
+" and change parameters of problems in the set such as the number of allowed "
+"attempts or the weight (credit value). You can also add, remove, view, edit,"
+" and reorder the problems in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:141
+msgid "Individual Problem Results"
+msgstr ""
+
 # Short for Initial
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:41
 msgid "Init"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:502
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:35
 msgid "Institution"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2344
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:560
 msgid "Instructor Comment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1494
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1306
 msgid "Instructor Feedback:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:311
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:17
+msgid "Instructor Links Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:29
 msgid "Instructor Tools"
 msgstr "Инструменты инструктора"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1228
-msgid "Instructor solution preview: show the student solution after due date."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:17
+msgid "Instructor Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:90
+msgid "Instructor:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:377
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:326
 msgid "Invalid Reply-to address."
 msgstr ""
 
 #. ($output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:187
 msgid ""
-"Invalid file name. The file name \"%1\" does not have a \".msg\" extension "
-"All email file names must end in the extension \".msg\" choose a file name "
-"with a \".msg\" extension. The message was not saved."
+"Invalid file name \"%1\". All email file names must end with the \".msg\" "
+"extension.  Choose a file name with the \".msg\" extension. The message was "
+"not saved."
 msgstr ""
 
 #. ($headerType)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1951
 msgid "Invalid headerType %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:177
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/XMLRPC.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:173
 msgid "Invalid user ID or password."
 msgstr "Неверный логин или пароль. "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2244
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:34
+msgid ""
+"It is important that students enter an email address or they will not "
+"recieve any of the important emails sent by the instructor. The email "
+"address will only be present on the page if the user has permission to "
+"change the email address."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:20
+msgid "It lists the homework problem sets available for the students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:472
 msgid "Jump to Problem:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:867
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:939
 msgid "Just-In-Time parameters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:130
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:85
+msgid "Key Map"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:14
 msgid "Key Map:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:93
 msgid "Keywords:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "LAST NAME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1477
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:119
 msgid "LOCAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:100
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:103
 msgid "LTI"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1548
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:25
+msgid "LTI Grade Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:460
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:75
+msgid "LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:17
+msgid "LTI Grade Update Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:16
+msgid "LTI grade passback is not enabled for this course"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:63
+msgid "LTI update of all users and sets queued."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:64
+msgid "LTI update of all users queued."
+msgstr ""
+
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:58
+msgid "LTI update of set %1 queued."
+msgstr ""
+
+#. ($userID, $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:56
+msgid "LTI update of user %1 and set %2 queued."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:60
+msgid "LTI update of user %1 queued."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1450
 msgid "Language (refresh page after saving changes to reveal new language.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:758
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:140
 msgid "Last"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:460
 msgid "Last Answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:604
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:231
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2001
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:828
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:857
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:915
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:31
+msgid "Last Full Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:25
 msgid "Last Name"
 msgstr "Фамилия"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:792
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:115
 msgid "Last column of merge file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:785
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:108
 msgid "Last name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:242
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:237
 msgid "Latest Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1603
+#: /opt/webwork/webwork2/conf/defaults.config:1505
 msgid ""
 "Length of time, in seconds, a user has to be inactive before he is required "
-"to login again.<p>This value should be entered as a number, so as 3600 "
-"instead of 60*60 for one hour"
+"to login again. This value should be entered as a number, so as 3600 instead"
+" of 60*60 for one hour."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:845
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:26
 msgid "Lesser Rod of Revelation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:965
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:26
 msgid "Lesser Tome of Enlightenment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:141
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:15
 msgid "Level Progress:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:881
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:77
 msgid "Level:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:912
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2060
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:433
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:17
+msgid "Library Broswer Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:359
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:52
 msgid "Library Browser"
 msgstr "Подбор задач"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1977
-msgid "List of display modes made available to students"
+#. ($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:30
+msgid "Link to Edit Page for %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2130
-msgid ""
-"List of e-mail addresses to which e-mail can be sent by a problem. "
-"Professors need to be added to this list if questionaires are used, or other"
-" WeBWorK problems which send e-mail as part of their answer mechanism."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:25
+msgid "Links to pages that give information about writing problems:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1879
+msgid "List of display modes made available to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:759
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:774
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:89
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:96
 msgid "List of insertable macros"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1826
+#: /opt/webwork/webwork2/conf/defaults.config:1728
 msgid "List of options for Show Me Another button"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1713
+#: /opt/webwork/webwork2/conf/defaults.config:1615
 msgid "List of sets excluded from achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1483
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:56
+msgid "Live equation rendering"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:144
+msgid "Loading..."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:122
 msgid "Local Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:41
 msgid "Local Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1504
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:136
 msgid "Local Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:105
 msgid "Local Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1467
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:114
 msgid ""
 "Local data is generated when your systems admin runs the script update-OPL-"
 "statistics."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1460
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:107
 msgid ""
 "Local data on problem usage is generated and maintained by your institution."
 " The Usage figure is the total number of local individuals who have attemped"
@@ -3635,42 +4906,61 @@ msgid ""
 "likely bug free."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:115
 msgid "Location"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3501
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1854
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1890
 msgid ""
 "Location %1 does not exist in the WeBWorK database.  Please check your input"
 " (perhaps you need to reload the location management page?)."
 msgstr ""
 
 #. ($locationID, join(', ', @addresses)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1742
 msgid "Location %1 has been created, with addresses %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3353
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1798
 msgid "Location deletion requires confirmation."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3409
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:43
 msgid "Location description:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3089
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:37
 msgid "Location name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:159
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:27
+msgid ""
+"Locations are a list of ip addresses.  Ip addresses can be a single address "
+"(e.g. 192.168.1.101), a range of ip address (e.g. "
+"192.168.1.101-192.168.1.150), or an ip address mask (e.g. 192.168.1.0/24). "
+"Enter one ip address per line, using as many lines as needed for each "
+"location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:32
+msgid ""
+"Locations are edited by adding new ip addresses to the location, or deleting"
+" existing address.  You must select the confirm checkbox when deleting a "
+"location, and this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:43
+msgid "Locations of files:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:18
 msgid "Log In Again"
 msgstr "Войти снова"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1124
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:11
 msgid "Log Out"
 msgstr "выйти"
 
@@ -3678,368 +4968,456 @@ msgstr "выйти"
 #. ($rename_oldCourseID)
 #. ($rename_newCourseID)
 #. ($new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1458
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1541
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2666
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:913
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:704
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:780
 msgid "Log into %1"
 msgstr ""
 
-#. (HTML::Entities::encode_entities($prettyUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1122
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1130
+#. ($userName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:9
 msgid "Logged in as %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:790
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:181
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:187
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:113
 msgid "Login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:58
 msgid "Login Info"
 msgstr "Информация о вошедшем"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:187
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:815
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1980
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:291
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:855
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:884
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:913
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:36
 msgid "Login Name"
 msgstr "Логин"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:18
 msgid "Login Status"
 msgstr "Статус вошедшего"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:6
+msgid "Login:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:225
 msgid "Logout"
 msgstr "Выйти"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Macro"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:763
-msgid "Main Menu"
-msgstr "Главное меню"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:97
+msgid ""
+"Macro (\".pl\") files containing additional functionality for your course "
+"can be stored here."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:369
+#. ($filePath)
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:29
+msgid "Macro file %1 not found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:46
 msgid "Make Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:27
 msgid "Make changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1115
-msgid "Make these changes in  course:"
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:15
+msgid "Make these changes in course: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:137
+msgid ""
+"Makes a new copy of the file you are editing at the location relative to the"
+" course's templates ([TMPL]) directory. You may choose to replace the "
+"current problem in the current set, append to the end to then end of the "
+"current set as a new problem, or create a problem that is not attached to a "
+"problem set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3040
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:1
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:46
 msgid "Manage Locations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:748
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:394
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:17
+msgid "Manage Locations Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:20
+msgid ""
+"Manage achievements for the course.  The actions allow one to edit, assign, "
+"import, export, score, create, or delete achievements.  The action form is "
+"at the top to select the desired action and options to perform when the "
+"submit button is pressed.  Below the action form is the list of all the "
+"achievements, ordered by their achievement \"Number\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:56
+msgid "Manage administration course files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:50
+msgid ""
+"Manage instructors.  When instructors are added to a newly created course, "
+"they are also added to the admin course with username \"userID_courseID\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:344
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:192
 msgid "Manual Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:233
-msgid "Mark All"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:17
+msgid "Manual Grader Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr',
+#. format_set_name_display($c->stash->{set}->set_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:205
+msgid "Manual Grader for %1: Problem %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:77
+msgid ""
+"Manually initiate an LTI grade passback for selected sets or users. This "
+"link is only visible if LTI grade passback is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:175
+msgid ""
+"Many of these editing activities can also be done more quickly from the "
+"\"Instructor Tools\" page where students and homework sets can be selected "
+"simultaneously. The \"Instructor Tools\" page is useful for quick editing of"
+" one or two students. The initial setup of the class can be done best from "
+"this page. Importing and exporting class lists can only be done from this "
+"page. Deleting students can only be done from this page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:120
 msgid "Mark Correct"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2822
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:598
 msgid "Mark Correct?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:681
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:19
 msgid "Match on what? (separate multiple IDs with commas)"
 msgstr "Совпадение с кем? (разделяйте идентификаторы запятыми)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:499
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:85
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:36
 msgid "Math Objects"
 msgstr "Math Objects"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:327
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:377
 msgid "Max attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:380
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:24
 msgid "Max. Shown:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1817
+#: /opt/webwork/webwork2/conf/defaults.config:1719
 msgid ""
 "Maximum times Show me Another can be used per problem (-1 => unlimited)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:606
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:4
+msgid "Merge file data:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:24
 msgid "Merge file:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:288
 msgid "Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:578
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:13
 msgid "Message file:"
 msgstr ""
 
-#. ($emailDirectory, $output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:357
-msgid "Message saved to file <code>%1/%2</code>."
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:300
+msgid "Message saved to file %1."
 msgstr ""
 
-#. ($recipient, $ur->email_address)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:995
+#. ($recipient, $user_record->email_address)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:98
 msgid "Message sent to %1 at %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2249
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2324
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:121
+msgid "Message was blank."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:48
+msgid ""
+"Messages can be saved to a message file (which must end in the \".msg\" "
+"extension).  Use the \"Message file\" drop down menu to select which message"
+" file to load, or \"None\" to use a blank message. To save a new message, "
+"use the \"Save as\" button after entering in a valid filename.  The \"Save "
+"as\" button will not overwrite currently saved messages.  To edit a "
+"currently saved message first select it using the drop down menu, then click"
+" the \"Save\" button to save any changes.  Use the \"File Manager\" to "
+"delete messages, located in the \"[TMPL]/email\" directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:22
 msgid "Method"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3284
+#: /opt/webwork/webwork2/conf/defaults.config:2003
+msgid "Method to enter problem scores in the single problem manual grader"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1668
 msgid ""
 "Missing required input data. Please check that you have filled in all of the"
 " create location fields and resubmit."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1555
+#: /opt/webwork/webwork2/conf/defaults.config:1457
 msgid ""
 "Mode in which the LANG and DIR settings for a single problem are determined."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1557
-msgid ""
-"Mode in which the LANG and DIR settings for a single problem are "
-"determined.<p>The system will set the LANGuage attribute to either a value "
-"determined from the problem, a course-wide default, or the system default, "
-"depending on the mode selected. The tag will only be added to the DIV "
-"enclosing the problem if it is different than the value which should be set "
-"in the main HTML tag set for the entire course based on the course "
-"language.<p>There are two options for the DIRection attribute: \"ltr\" for "
-"left-to-write sripts, and \"rtl\" for right-to-left scripts like Arabic and "
-"Hebrew.<p>The DIRection attribute is needed to trigger proper display of the"
-" question text when the problem text-direction is different than that used "
-"by the current language of the course. For example, English problems from "
-"the library browser would display improperly in RTL mode for a Hebrew "
-"course, unless the problen Direction is set to LTR.<p>The feature to set a "
-"problem language and direction was only added in 2018 to the PG language, so"
-" most problems will not declare their language, and the system needs to fall"
-" back to determining the language and direction in a different manner. The "
-"OPL itself is all English, so the system wide fallback is to en-US in LTR "
-"mode.<p>Since the defaults fall back to the LTR direction, most sites should"
-" be fine with the \"auto::\" mode, but may want to select the one which "
-"matches their course language. The mode \"force::ltr\" would also be an "
-"option for a course which runs into trouble with the \"auto\" "
-"modes.<p>Modes:<br><ul><li>\"none\" prevents any additional LANG and/or DIR "
-"tag being added. The browser will use the main setting which was applied to "
-"the entire HTML page. This is likely to cause trouble when a problem of the "
-"other direction is displayed.</li><li>\"auto::\" allows the system to make "
-"the settings based on the language and direction reported by the problem (a "
-"new feature, so not set in almost all existing problems) and falling back to"
-" the expected default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" "
-"allows the system to make the settings based on the language and direction "
-"reported by the problem (a new feature, so not set in almost all existing "
-"problems) but falling back to the language with the given LangCode and the "
-"direction Dir when problem settings are not available from "
-"PG.</li><li>\"auto::Dir\" for problems without PG settings, this will use "
-"the default en=english language, but force the direction to Dir. Problems "
-"with PG settings will get those settings.</li><li>\"auto:LangCode:\" for "
-"problems without PG settings, this will use the default LTR direction, but "
-"will set the language to LangCode.Problems with PG settings will get those "
-"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
-" by the PG code of the problem, and will force the system to set the "
-"language with the given LangCode and the direction to Dir for <b>all</b> "
-"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
-"PG code of the problem, and will force the system to set the direction to "
-"Dir for <b>all</b> problems, but will avoid setting any language attribute "
-"for individual problem.</li></ul>"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2695
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:443
 msgid "Move"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2231
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:457
 msgid "Move to Page:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2226
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:452
 msgid "Move to Problem:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:26
+msgid ""
+"Multiple sets may be assigned to the users by holding down the shift key or "
+"the ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:27
+msgid ""
+"Multiple users or sets may be selected by holding down the shift key or the "
+"ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:36
 msgid "My Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1412
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:26
 msgid "Mysterious Package (with Ribbons)"
 msgstr ""
 
 # Short for Number of Fields
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:213
 msgid "NO OF FIELDS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1484
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:741
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:113
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:135
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:29
 msgid "Name"
 msgstr "Имя"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:174
 msgid "Name for new set here"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1528
+#: /opt/webwork/webwork2/conf/defaults.config:1430
 msgid "Name of course information file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1107
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:77
+msgid "Name of the evaluator file used to evaluate the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:81
+msgid "Name of the image used for the achievement icon."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:4
 msgid "Name the new set"
 msgstr "Дайте имя для нового задания"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1691
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:45
+msgid "Name:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:29
 msgid "Necromancers Charm"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:343
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:205
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:393
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:35
 msgid "Never"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:371
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:54
 msgid "New File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:372
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:55
 msgid "New Folder"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:30
 msgid "New Name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2067
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:3
 msgid "New Password"
 msgstr "Новый пароль"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:131
-msgid "New Version"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+msgid "New Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
 msgid "New file name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
 msgid "New folder name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:577
 msgid "New passwords saved"
 msgstr "Новый пароль сохранён"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1078
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:36
 msgid "New set name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1357
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1010
 msgid "Next Problem"
 msgstr "Следующая задача"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1181
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2164
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:40
+msgid "Next Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:98
 msgid "Next page"
 msgstr ""
 
-#. ($self->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:620
+#. (% $c->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:142
 msgid "Next test will be available by %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2452
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:134
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:144
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:183
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:483
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:510
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:142
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:68
 msgid "No"
 msgstr "Нет"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:635
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:116
 msgid "No Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2324
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:216
 msgid "No Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:117
+msgid "No Sender specified."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:23
 msgid "No Target Set Selected"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:335
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:38
 msgid "No achievement badges have been assigned yet."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1521
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:77
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:37
 msgid "No achievements shown.  Create an achievement!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:90
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:2
+msgid "No achievements shown.  Select an achievement to edit!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:61
 msgid "No action taken"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:141
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:140
 msgid ""
 "No authentication method found for your request.  If this recurs, please "
 "speak with your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:940
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:361
 msgid "No change made to any set"
 msgstr "Ни одно из заданий не изменено"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
 msgid ""
 "No changes specified.  You must mark the checkbox of the item(s) to be "
 "changed and enter the change data."
@@ -4049,1379 +5427,1811 @@ msgstr ""
 msgid "No changes were saved!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2462
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:50
 msgid "No course archives found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2898
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:32
 msgid "No course id defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1561
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:932
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:67
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:76
 msgid "No courses found"
 msgstr ""
 
 #. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:593
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:675
 msgid "No data exists for set %1 and problem %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:10
+msgid "No e-mail recipients are listed for this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:169
 msgid "No filename was specified for saving!  The message was not saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:340
 msgid "No guest logins are available. Please try again in a few minutes."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3522
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1877
 msgid "No location specified to edit. Please check your input data."
 msgstr ""
 
 #. ($badID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1788
 msgid "No location with name %1 exists in the database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3206
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:149
 msgid "No locations are currently defined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:342
 msgid "No merge data file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:612
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:18
+msgid "No merge data found"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:164
+msgid "No merge data found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:8
+msgid "No merge file selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:135
 msgid "No more tests available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:270
 msgid ""
 "No new Achievement ID specified.  No new achievement created.  File not "
 "saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:63
 msgid "No problems matched the given parameters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:25
+msgid "No recipients selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:334
 msgid ""
 "No recipients selected. Please select one or more recipients from the list "
 "below."
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2044
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:49
 msgid "No record for global set %1."
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2046
-msgid "No record for user %1."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
 msgid "No record found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1166
-msgid "No set created."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:12
 msgid "No sets in this course yet"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1010
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:159
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
 msgid "No sets selected for scoring"
 msgstr "Не выбраны задания для подсчёта баллов по ним"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2764
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:46
 msgid ""
 "No sets shown.  Choose one of the options above to list the sets in the "
 "course."
 msgstr "Список заданий не отображён. Выберите одну из опций выше для того, чтобы отобразить список заданий в курсе."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1942
 msgid "No source filePath specified"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1327
 msgid "No source_file for problem in .def file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2099
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:87
 msgid ""
-"No students shown.  Choose one of the options above to list the students in "
+"No students shown. Choose one of the options above to list the students in "
 "the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:246
 msgid "No submissions. Over time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:278
 msgid "No tests taken."
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:594
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:676
 msgid "No user specific data exists for user %1"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2031
 msgid "No valid changes submitted for location %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:275
-msgid "No versions of this assignment have been taken."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:771
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:263
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:241
 msgid "No versions of this test have been taken."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:562
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:252
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:17
 msgid "None"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:681
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2463
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:763
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:52
 msgid "None Specified"
 msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2089
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:73
 msgid "None of the selected users are assigned to this set: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:33
 msgid "Not logged in."
 msgstr "Вы не вошли"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1569
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:4
 msgid "Note"
 msgstr "Замечание"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:381
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:55
+msgid ""
+"Note that if there are errors, they will be shown at the top of the page. In"
+" some cases, a hard copy is still generated and a link called \"Download "
+"Hardcopy\" appears. In addition, the latex file, log and error files are "
+"generated which can be used in troubleshooting."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:93
+msgid ""
+"Note that if you set the permission level of a user to something other than "
+"\"Student\", you may also want to set the status of the user to "
+"\"Observer\".  Users with the \"Observer\" status are not included in "
+"statistics, scoring, or instructor emails."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:28
+msgid ""
+"Note that some settings require an additional page load after \"Save "
+"Changes\" is clicked in order to take effect.  This is true for a theme "
+"change for example."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:396
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:422
 msgid "Note:"
 msgstr ""
 
-#. (CGI::i($pg->{result}{msg})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2350
+#. (tag('i', maketext('You are in the Reduced Scoring Period.  All work counts
+#. for [_1]% of the original.',
+#. $ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#. (tag('i', $pg->{result}{msg})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:572
 msgid "Note: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2482
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:686
 msgid ""
 "Note: grading the test grades all problems, not just those on this page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1460
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1485
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:768
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:59
+msgid "Now"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:19
 msgid "Number"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:242
 msgid "Number of Graded Submissions per Test (0=infty)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
 msgid "Number of Problems per Page (0=all)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:95
+msgid "Number of Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:257
 msgid "Number of Tests per Time Interval (0=infty)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1833
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2435
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:54
+msgid "Number:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1181
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:912
 msgid "OK"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1464
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:17
+msgid "OPL Problem Levels Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:26
 msgid "Oil of Cleansing"
 msgstr ""
 
+#. ('<code>pdflatex</code>', '<code>hardcopy.tex</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:49
+msgid ""
+"Once \"Generate Hardcopy for selected sets and selected users\" is clicked a"
+" file in the selected hardcopy format will be generated and offered for "
+"download. If PDF output was selected, a single PDF file is generated. If TeX"
+" output is selected, a zip file is generated that contains all files needed "
+"to generated the hardcopy PDF file via %1. The main TeX file is called %2."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:84
 msgid "One Column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:314
+msgid "Only Start"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:289
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:303
 msgid "Only after set answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1892
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:87
+msgid ""
+"Only present for JITAR sets. Collapse JITAR nesting problem groups to the "
+"top row of information about a problem. Note that the nesting of a single "
+"problem group can be collapsed by clicking on the down arrow to the right of"
+" the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:80
+msgid ""
+"Only present for JITAR sets. Expand JITAR nested problem groups that have "
+"been collapsed. Note that the nesting of a single problem group can be "
+"expanded by clicking on the right arrow to the right of the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1794
 msgid ""
 "Only this permission level and higher get buttons for sending e-mail to the "
 "instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:39
 msgid "Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:422
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:763
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:810
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:62
 msgid "Open Date"
 msgstr "Дата открытия"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1098
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:42
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:32
 msgid "Open Problem Library"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2417
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:272
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:525
 msgid "Open in New Window"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1263
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1617
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:29
 msgid "Open in new window"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:491
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:320
 msgid "Open, closes %1."
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:489
-msgid "Open, complete by %1."
-msgstr ""
-
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:300
 msgid "Open, due %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:433
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
 msgid "Open."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:431
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:268
 msgid "Open. Submitted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:31
 msgid "Open:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:115
 msgid "Opens"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:27
 msgid "Opens any homework set for 24 hours."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1686
+#: /opt/webwork/webwork2/conf/defaults.config:1588
 msgid "Optional Modules"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:265
 msgid "Order Problems Randomly"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:50
+msgid "Other Options"
+msgstr ""
+
 # Context is "7 Out Of 10"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:405
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:777
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:150
 msgid "Out Of"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1024
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:85
+msgid "Overall Results"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:93
+msgid "Overall Set Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:122
+msgid "Overall Success Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:470
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:481
 msgid "Overwrite"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:437
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:100
 msgid "Overwrite existing files silently"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:41
+msgid "PDF"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:69
 msgid "PG Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:827
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer.html.ep:1
+msgid "PG POD"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:17
+msgid "PG Problem Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:708
 msgid "PG debug messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:829
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:716
 msgid "PG internal errors"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:818
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:109
+msgid ""
+"PG markdown syntax used to format WeBWorK questions. This interactive lab "
+"can help you to learn the techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:692
 msgid "PG question failed to render"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:826
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:706
 msgid "PG question processing error messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:828
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:712
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:128
 msgid "PG warning messages"
 msgstr ""
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:511
-msgid "PGLab"
-msgstr ""
-
-# Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:98
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:47
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:58
 msgid "PGML"
 msgstr ""
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:91
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:40
 msgid "POD"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2309
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2249
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:200
+msgid "POD Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:208
+msgid "POD Viewer"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1515
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:526
 msgid "PREVIEW ONLY -- ANSWERS NOT RECORDED"
 msgstr "ПРЕДВАРИТЕЛЬНВЙ ПРОСМОТР -- ОТВЕТЫ НЕ ЗАПИСАНЫ"
 
 # Problem Number
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:215
 msgid "PROB NUMBER"
 msgstr ""
 
 # Problem Value
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:218
 msgid "PROB VALUE"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:205
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:36
 msgid "Pad Fields"
 msgstr "Заполненые поля"
 
-#. (timestamp($self)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1255
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:28
+msgid "Page Contents"
+msgstr ""
+
+#. ($c->timestamp)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:1
 msgid "Page generated at %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:568
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:81
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:71
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:56
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:25
 msgid "Password"
 msgstr "Пароль"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:976
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:13
 msgid "Password (Leave blank for regular proctoring)"
 msgstr ""
 
-#. ($studentUser, CGI::span({ dir => 'ltr' },
-#. format_set_name_display($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:498
+#. ($studentUser, tag('span', dir => 'ltr', format_set_name_display($setName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:13
 msgid "Past Answers for %1, set %2, problem %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:8
 msgid "Percent"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:562
-msgid "Percentage of Active Students with Correct Answers"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:94
+msgid "Percent Ranges"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+msgid "Percent Score"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:535
+msgid "Percent of Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:788
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:206
 msgid ""
 "Percentile cutoffs for number of attempts. The 50% column shows the median "
 "number of attempts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2056
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:834
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:863
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:921
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:58
+msgid ""
+"Percentile cutoffs for student's score and success index. The 50% column "
+"shows the median number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:50
 msgid "Permission Level"
 msgstr "Уровень допуска"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1869
+#: /opt/webwork/webwork2/conf/defaults.config:1771
 msgid "Permissions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1052
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:24
 msgid "Pick a target set above to add this problem to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:54
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:21
 msgid "Pick date and time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3804
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
 msgid ""
 "Place a file named \"hide_directory\" in a course or other directory and it "
 "will not show up in the courses list on the WeBWorK home page. It will still"
 " appear in the Course Administration listing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1107
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should be given full credit."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should have half credit added."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given full credit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:889
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given half credit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:654
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its incorrect attempt count reset."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its weight doubled."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1315
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:60
 msgid ""
 "Please choose the set, the problem you would like to copy, and the problem "
 "you would like to copy it to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:399
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:19
 msgid "Please correct the following errors and try again:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:698
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:28
 msgid "Please enter in a value to match in the filter field."
 msgstr ""
 
-#. (CGI::b($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:197
+#. (tag('b', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:28
 msgid "Please enter your username and password for %1 below:"
 msgstr "Введите ниже Ваш логин и  пароль для %1:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1778
 msgid "Please provide a location name to delete."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:233
 msgid "Please select action to be performed."
 msgstr "Выберите действие, которое будет выполнено."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:183
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
 msgid "Please select at least one set and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
 msgid "Please select at least one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:165
 msgid "Please select at least one user and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:35
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:31
 msgid "Please select at least one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:28
 msgid "Please select at most one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:30
 msgid "Please select exactly one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:29
 msgid "Please select exactly one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:574
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1016
 msgid "Please specify a file to save to."
 msgstr "Укажите файл, в который следует сохранитиь. "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:37
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
 msgid "Please specify a homework set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:38
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
 msgid ""
 "Please use only letters, digits, dashes, underscores, and periods in your "
 "set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1462
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1184
+msgid ""
+"Please use radio buttons to choose the method for saving this file. Uknown "
+"saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:165
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:169
+msgid "Point Value"
+msgstr ""
+
+#. ($grader->{problem_value})
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:92
+msgid "Point Value (0 - %1):"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:21
 msgid "Points"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:609
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:62
+msgid "Points:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:26
 msgid "Potion of Forgetfulness"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1423
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:2
 msgid "Prepare which sets for export?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2054
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2073
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:268
 msgid "Press \"Grade Test\" now!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2049
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:244
 msgid "Press \"Grade Test\" soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:213
-msgid "Preview Comment"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:69
 msgid "Preview Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:314
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1840
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:11
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:99
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:35
 msgid "Preview My Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2440
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:646
 msgid "Preview Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1340
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:41
+msgid ""
+"Preview the message before sending using the \"Preview Message\" button.  "
+"The preview shows the email that would be sent to the first selected student"
+" or the instructor if no students were selected.  The preview will also list"
+" all of the students that would receive their own personalized message.  If "
+"a merge file was selected, the preview will also indicate which (if any) "
+"recipient's merge file data could not be found."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:991
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:995
 msgid "Previous Problem"
 msgstr "Предыдущая задача"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2157
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:94
 msgid "Previous page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2149
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:45
+msgid "Primary Actions"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:355
 msgid "Print Test"
 msgstr ""
 
 # Short for Problem
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2088
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:287
 msgid "Prob"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:670
-msgid "Problem #"
-msgstr ""
-
-#. ($prettyProblemID)
-#. ($problemNumber)
 #. (join('.', @seq)
 #. ($problemID)
-#. ($prettyProblemIDs{$probID})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:831
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:834
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:897
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:438
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:800
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:956
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:964
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:973
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:933
+#. ($problemNumber)
+#. ($_->{prettyID})
+#. ($c->{prettyID})
+#. ($probID)
+#. ($c->{setRecord}->assignment_type eq 'jitar' ? join('.',
+#. jitar_id_to_seq($_)
+#. ($set->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)
+#. ($prettyProblemID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:831
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:842
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:853
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:57
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/siblings.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:40
 msgid "Problem %1"
 msgstr ""
 
-#. ($problemNumber)
-#. ($prettyID)
-#. ($versioned ? $versioned : $MergedProblem->problem_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1419
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1421
+#. ($i + 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:535
 msgid "Problem %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1974
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:75
+msgid "Problem (\".pg\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:38
+msgid "Problem Display Settings"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1876
 msgid "Problem Display/Answer Checking"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:451
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:50
 msgid "Problem Editor"
 msgstr "Редактор задач"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1697
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:29
 msgid "Problem Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1002
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:999
 msgid "Problem List"
 msgstr "Список задач"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1119
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:666
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:783
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:75
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:159
 msgid "Problem Number"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:156
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:160
+msgid "Problem Paths"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:140
 msgid "Problem Score (%):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:30
 msgid "Problem Techniques"
 msgstr "Техника программирования задач. "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:705
-msgid "Problem Viewer"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:239
+msgid ""
+"Problem has a different source file than the currently rendered problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:233
+msgid "Problem has an essay answer that needs to be graded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1943
 msgid "Problem source is drawn from a grouping set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:406
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2494
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:445
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:827
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:835
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:896
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:801
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:89
+msgid ""
+"Problem source is drawn from a grouping set and can not be directly rendered"
+" or edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:336
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:9
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:32
 msgid "Problems"
 msgstr "Задачи"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:25
 msgid "Problems Added"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:59
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:54
 msgid "Problems for all students have been unassigned."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:57
 msgid "Problems for selected students have been reassigned."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:51
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:46
 msgid "Problems have been assigned to all current users."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:25
+msgid ""
+"Problems with this rating should only require direct memory of a fact. "
+"Examples might be a specific value of a function, or the statement of a "
+"definition. Very few WeBWorK problems fall into this category."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:93
 msgid "Proctor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:282
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:92
 msgid "Proctor Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:258
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:71
 msgid "Proctor Username"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:193
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:3
+msgid "Proctor authorization requested for a nonexistent set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:8
 msgid "Proctor authorization required."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:231
-msgid "Proctored Gateway Quiz %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:88
+msgid "Proctor:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:265
+msgid "Proctored Test %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:272
+msgid "Proctored Test %2 Proctor Login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:241
-msgid "Proctored Gateway Quiz %2 Proctor Login"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:318
+msgid ""
+"Proctored tests always require authorization to start the test. \"Both Start"
+" and Grade\" will require login proctor authorization to start and grade "
+"proctor authorization to grade. \"Only Start\" requires grade proctor "
+"authorization to start and no authorization to grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:981
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:18
 msgid ""
-"Proctored tests require proctor authorization to start and to grade.  "
 "Provide a password to have a single password for all students to start a "
 "proctored test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:56
 msgid "Publish"
 msgstr "Опубликовать"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:31
+msgid ""
+"Quick access to many instructor tools, including <strong>Reset "
+"passwords</strong>, <strong>Act as student</strong>, <strong>Assign "
+"individual sets</strong> and <strong>Edit individual due dates</strong>."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "RECITATION"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1333
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:199
 msgid "Randomize"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:13
 msgid "Randomize Seed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:101
 msgid "Read only"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:67
 msgid "Really delete the items listed above?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:201
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:212
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:804
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2038
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:298
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:832
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:861
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:890
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:919
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:184
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:42
 msgid "Recitation"
 msgstr "Подразделение"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:194
+#. ($recitation)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:125
+msgid "Recitation %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:21
+msgid "Recitation:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:38
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:46
 msgid "Record Scores for Single Sets"
 msgstr "Записать баллы для отдельных заданий"
 
-#. ($studentName)
-#. ($self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:183
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:190
+#. ($studentID)
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:8
 msgid "Record for user %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Reduced Scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:67
 msgid "Reduced Scoring Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2523
-msgid "Reduced Scoring Disabled"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
+msgid "Reduced Scoring Enabled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2522
-msgid "Reduced Scoring Enabled"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:33
+msgid "Reduced Scoring Period"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:314
 msgid "Reduced credit can still be earned until %1."
 msgstr ""
 
 # Short for "Reduced Scoring:"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:32
 msgid "Reduced:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:153
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:373
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:56
 msgid "Refresh"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1646
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1943
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2000
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3713
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3755
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:56
 msgid "Refresh Listing"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:190
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:200
 msgid "Relax IP restrictions when?"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:88
+msgid "Reload the page to see backup files that have been made."
+msgstr ""
+
 # Context is "Attempts Remaining"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:14
 msgid "Remaining"
 msgstr "Остаётся"
 
 #. ('00:00:00')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:254
 msgid "Remaining time: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:61
 msgid "Remember Me"
 msgstr "Запомнить меня"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:546
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:514
 msgid "Remember to return to your original problem when you're finished here!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1020
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:466
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:72
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:41
 msgid "Rename"
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1302
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:62
 msgid "Rename %1 to %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:378
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:927
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:73
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:34
 msgid "Rename Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:17
+msgid "Rename Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:22
+msgid "Rename Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
 msgid "Rename file as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2727
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:463
 msgid "Render"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:344
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:59
 msgid "Render All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2720
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:461
 msgid "Render Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2501
-msgid "Renumber Problems"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:60
+msgid ""
+"Render all problems on the page. This does not reload the page or save or "
+"reset changes."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:106
 msgid ""
-"Reopens any gateway test for an additional 24 hours. This allows you to take"
-" a test even if the close date has past. This item does not allow you to "
-"take additional versions of the test."
+"Render or re-render the problem, course info file, or set header being "
+"edited. This does not change the permanent file on the disk. You can view "
+"different versions of the same problem by changing the seed. You can also "
+"change the manner in which the mathematics is typeset. If \"Open in new "
+"window\" is checked, then the problem will open in a new tab or window "
+"showing the problem as it will be rendered for students in the set."
 msgstr ""
 
-#. (CGI::strong(                                                   CGI::span({
-#. dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1829
-msgid "Replace current problem: %1"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:132
+msgid "Rendering Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1155
-msgid "Replace which users?"
-msgstr "Кого из пользователей заменить?"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:637
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:341
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:53
+msgid "Renumber Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:55
+msgid ""
+"Renumber problems consecutively starting from 1. This renumbering is not "
+"saved until \"Save Changes\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:103
+msgid ""
+"Renumber problems in the set consecutively starting from one. In the process"
+" of deleting problems, the numbering can be made non-consecutive. This is "
+"useful to clean up the problem numbering."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:31
+msgid ""
+"Reopens any test for an additional 24 hours. This allows you to take a test "
+"even if the close date has past. This item does not allow you to take "
+"additional versions of the test."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:118
+msgid "Reordering Problems"
+msgstr ""
+
+#. (tag(                                           'strong',
+#. c(                                                      tag('span', dir =>
+#. 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:58
+msgid "Replace current problem: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:13
+msgid "Replace which users?"
+msgstr "Кого из пользователей заменить?"
+
+#. ($composite_id, $oldUser->status)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:448
+msgid "Replacing old data for %1: status: %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:42
 msgid "Reply-To:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:528
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:123
 msgid "Report Bugs in this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1073
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:305
 msgid "Report bugs"
 msgstr "Сообщить об ошибках"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:128
+msgid ""
+"Report bugs in a WeBWorK question/problem using this link. The very first "
+"time you do this you will need to register with an email address so that "
+"information on the bug fix can be reported back to you."
+msgstr ""
+
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2825
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1530
 msgid "Report for course %1:"
 msgstr ""
 
-#. ($rename_oldCourseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2122
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:3
 msgid "Report on database structure for course %1:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1829
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:8
 msgid "Request New Version"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2246
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2321
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:19
 msgid "Request information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1972
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1220
 msgid "Request new version now."
 msgstr ""
 
+#. ($setName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:486
+msgid ""
+"Requested set \"%1\" is a proctored test, but no valid proctor authorization"
+" has been obtained."
+msgstr ""
+
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:399
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:422
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:425
 msgid "Requested set '%1' could not be found in the database for user %2."
 msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:469
-msgid ""
-"Requested set '%1' is a homework assignment but the gateway/quiz content "
-"generator %2 was called.  Try re-entering the set from the problem sets "
-"listing page."
-msgstr ""
-
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:484
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:472
 msgid ""
-"Requested set '%1' is a proctored test/quiz assignment, but no valid proctor"
-" authorization has been obtained."
+"Requested set '%1' is a homework assignment but the test content generator "
+"%2 was called.  Try re-entering the set from the problem sets listing page."
 msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:463
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:466
 msgid ""
-"Requested set '%1' is a test/quiz assignment but the regular homework "
-"assignment content generator %2 was called.  Try re-entering the set from "
-"the problem sets listing page."
+"Requested set '%1' is a test but the regular homework assignment content "
+"generator %2 was called.  Try re-entering the set from the problem sets "
+"listing page."
 msgstr ""
 
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:420
 msgid "Requested set '%1' is not assigned to user %2."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:450
 msgid "Requested set '%1' is not available yet."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:441
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:444
 msgid "Requested set '%1' is not yet open."
 msgstr ""
 
 #. ($verNum,				$setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:404
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:407
 msgid "Requested version (%1) of set '%2' can not be directly accessed."
 msgstr ""
 
 #. ($verNum, $setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:397
 msgid "Requested version (%1) of set '%2' is not assigned to user %3."
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:308
+msgid "Require Proctor Authorization to"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:45
 msgid "Require users to log in through the LMS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:420
 msgid "Rerandomize after"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:104
 msgid "Reset"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2280
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2968
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:195
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:696
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:47
 msgid "Reset Form"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:610
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:27
 msgid "Resets the number of incorrect attempts on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2453
-msgid ""
-"Restores a course from a gzipped tar archive (.tar.gz). After unarchiving, "
-"the course database is restored from a subdirectory of the course's DATA "
-"directory. Currently the archive facility is only available for mysql "
-"databases. It depends on the mysqldump application."
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:41
+msgid "Restore a .tar.gz archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:40
+msgid "Restore backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:39
+msgid "Restore backup from %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:178
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+msgid "Restored backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:188
 msgid "Restrict Access by IP"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:912
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep:11
 msgid "Restrict Locations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:286
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:324
 msgid "Restrict Problem Progression"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:184
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:194
 msgid "Restrict To"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:154
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:33
+msgid "Restrict or sort the students displayed"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:159
 msgid "Restrict release by set(s)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2090
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:299
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:291
 msgid "Result"
 msgstr "Результат"
 
-#. (CGI::i($self->$actionHandler(\%genericParams, \%actionParams,
-#. \%tableParams)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:388
+#. ($c->tag('i', $c->$actionHandler)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:228
 msgid "Result of last action performed: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:309
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:300
 msgid "Results for this submission"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:363
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:236
 msgid "Results of last action performed"
 msgstr "Результат последнего из выполненых действий"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:125
 msgid "Results of last action performed: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1725
-msgid "Resurrect which Gateway?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:51
+msgid "Resurrect which test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1449
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:669
 msgid "Retitled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:17
 msgid "Return to your work"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:686
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:132
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:16
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:166
 msgid "Revert"
 msgstr "Вернуть"
 
-#. (CGI::span({ dir => 'ltr' }, $self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2069
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:83
 msgid "Revert to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1431
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1513
+#. ($c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1220
+msgid "Reverted to original file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:168
+msgid ""
+"Reverts to the copy of the file saved on the disk or to a backup file. All "
+"unsaved editing changes will be lost. This option is only active when a "
+"temporary file or a backup file exists. You may also delete backups that "
+"have been made with this tab."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:182
+msgid "Review of column functions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:145
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:85
 msgid ""
 "Reviewing a problem and looking at both the average Attempts and  average "
 "Status should give instructors valuable information about the difficulty of "
 "the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:55
 msgid "Reward used successfully!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:180
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:4
 msgid "Rewards"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:27
 msgid "Ring of Reduction"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:322
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:26
 msgid "Robe of Longevity"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "SECTION"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:214
 msgid "SET NAME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:321
 msgid "STATUS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "STUDENT ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:43
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:263
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:170
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:687
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:847
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:220
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:85
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:207
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:123
 msgid "Save"
 msgstr "Сохранить"
 
-#. (CGI::b($self->shortPath($self->{sourceFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:438
+#. (tag('b', $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_form.html.ep:2
 msgid "Save %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:44
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:695
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:134
 msgid "Save As"
 msgstr "Сохранить как"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:744
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2963
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:194
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:695
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:37
 msgid "Save Changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:60
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:76
 msgid "Save Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
 msgid "Save Export"
 msgstr "Сохранить экспортируемое"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:92
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
 msgid "Save Password"
 msgstr "Сохранить пароль"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:188
 msgid "Save as"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:872
-msgid "Save as Default"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:481
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:5
 msgid "Save as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1558
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:254
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1443
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_password_form.html.ep:1
 msgid "Save changes"
 msgstr "Сохранить изменения"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1794
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:33
 msgid "Save file to:"
 msgstr ""
 
-#. (CGI::b({ dir => 'ltr' }, $self->shortPath($self->{editFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1605
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:125
+msgid ""
+"Save the contents of the editor window to the file on disk and re-render the"
+" problem. If \"Open in new window\" is checked, then the problem will open "
+"in a new tab or window showing the problem as it will be rendered for "
+"students in the set. If \"Create backup\" is checked then a backup of the "
+"current file on disk will be created before overwriting it with the contents"
+" of the editor window. If a backup already exists, then a \"Delete oldest "
+"backup\" check box will be present. If that is checked, then the oldest "
+"backup will be deleted when \"Save\" is clicked. These backups can be "
+"reverted to and managed on the \"Revert\" tab."
+msgstr ""
+
+#. (tag('b', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:6
 msgid "Save to %1 and View"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:396
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1165
-msgid "Saved to file '%1'"
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:50
+msgid "Saved answers"
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#. ($outputFilePath =~ s/$ce->{courseDirs}{templates}/[TMPL]/r)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:549
+msgid "Saved to file \"%1\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1180
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2116
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2292
 msgid "Schema and database field definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4284
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2279
 msgid "Schema and database table definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:404
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:465
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:660
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:147
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:161
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:78
 msgid "Score"
 msgstr "Баллы"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:125
 msgid "Score (%)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:161
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:60
+msgid ""
+"Score one or more sets. This can also be done from the \"Hmwk Sets Editor\" "
+"or from the \"Instructor Tools\", but the \"Scoring Tools\" page allows "
+"control over parameters."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:170
 msgid "Score required for release"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:228
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:58
 msgid "Score selected set(s) and save to:"
 msgstr "Выставить баллы по выбранным заданиям и согранить их в:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2085
-msgid "Score summary for last submit:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:284
+msgid "Score summary for last submission:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:2
 msgid "Score which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:978
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:2
 msgid "Score which sets?"
 msgstr "Посчитать баллы в отношении каких из заданий?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
 msgid "Scores"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:487
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:66
+msgid "Scoring (\".csv\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:396
 msgid "Scoring Download"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:161
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:115
 msgid "Scoring Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:478
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:391
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:58
 msgid "Scoring Tools"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2460
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:17
+msgid "Scoring Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:327
 msgid ""
 "Screen and Hardcopy set header information can not be overridden for "
 "individual students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:26
 msgid "Scroll of Resurrection"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:189
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:200
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:211
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:793
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2029
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:297
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:831
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:860
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:889
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:918
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:157
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:178
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:38
 msgid "Section"
 msgstr "Отдел"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:653
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:802
+#. ($section)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:122
+msgid "Section %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:30
 msgid "Section:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:436
 msgid "Seed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:114
 msgid "Select"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:505
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:20
+msgid ""
+"Select Users from the left column and sets from the right column and assign "
+"or unassign the given sets. The list of users or the list of sets can be "
+"reordered under the \"sort\" option or the format of the user or set list.  "
+"Additionally, the set lists can be filtered (by section number or "
+"recitation).  The displayed user and set lists will only be updated upon "
+"clicking \"Change Display Settings\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:11
 msgid "Select a Homework Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:14
 msgid "Select a Problem Collection"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:18
 msgid "Select a Set Definition File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1028
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:14
 msgid "Select a Set from this Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1659
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:20
+msgid ""
+"Select a course to create a .tar.gz archive of, which contains a dump of the"
+" database and all course files (templates, configuration files, etc).  Each "
+"course can only have a single archive.  Creating an archive of a previously "
+"archived course will delete the old archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:36
 msgid "Select a course to delete."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:946
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:20
+msgid ""
+"Select a course to delete.  Warning, all data will be deleted and this "
+"cannot be undone.  This will not delete any course archives."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:14
 msgid ""
 "Select a course to rename.  The courseID is used in the url and can only "
 "contain alphanumeric characters and underscores. The course title appears on"
 " the course home page and can be any string."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2475
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:13
 msgid "Select a course to unarchive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1914
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3684
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:21
 msgid "Select a listing format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1442
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1478
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:18
+msgid "Select action:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:10
 msgid "Select all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2703
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:12
 msgid "Select all eligible courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2731
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:26
 msgid "Select all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1967
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:10
 msgid "Select all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:315
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:509
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:536
-msgid "Select an action to perform"
-msgstr "Выбрать действите для выполнения"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3063
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:10
 msgid "Select an action to perform:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1956
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:20
+msgid ""
+"Select an archive to restore.  You cannot restore an archive into an "
+"existing course. Instead, either rename or delete the old course, or restore"
+" the archive with a new name.  When restoring a course with a new name, the "
+"name is used as the course ID, and must contain only letters, numbers, "
+"hyphens, and underscores, and may have at most 40 characters."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:36
 msgid "Select course(s) to archive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3731
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:44
 msgid "Select course(s) to hide or unhide."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:7
 msgid "Select import file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:14
 msgid ""
 "Select one or more sets and one or more users below to assign/unassign each "
 "selected set to/from all selected users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:94
 msgid "Select sets below to assign them to the newly-created users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3666
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:20
+msgid ""
+"Select the course to change its Course ID, Course Title, or Institution.  "
+"Note that changing a course's ID will change the URL of all links to the "
+"course, and could break links from external sites such as an LMS."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:4
 msgid ""
 "Select the course(s) you want to hide (or unhide) and then click \"Hide "
 "Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
@@ -5432,133 +7242,230 @@ msgid ""
 "full URL address for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:488
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:20
+msgid ""
+"Select the course(s) you want to hide (or unhide) and then click \"Hide "
+"Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
+"does no harm (the action is skipped). Likewise unhiding a course that is "
+"already visible does no harm (the action is skipped). Hidden courses are "
+"still active but are not listed in the list of WeBWorK courses on the "
+"opening page. To access the course, an instructor or student must know the "
+"full URL address for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:93
+msgid "Select the display mode used to render the problems on this page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:11
 msgid ""
 "Select the homework sets for which to generate hardcopy versions. You may "
 "also select multiple users from the users list. You will receive hardcopy "
 "for each (set, user) pair."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:238
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:30
+msgid ""
+"Select the sets you want scored, choose the name of the export file you want"
+" to use (by default: %1), and then click the \"Score Selected Set(s) and "
+"save to\" button."
+msgstr ""
+
+#. ('<code>ful.csv</code>','<code>scr.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:49
+msgid ""
+"Select this if you want to save the scores for each set in a separate file "
+"in addition to saving all scores to a cumulative file. After clicking the "
+"\"Score Selected Set(s) and save to\" button, you will get a pair of links "
+"for each selected set. The file that ends with %1 contains the number of "
+"correct and incorrect tries about each individual problem for each student. "
+"The file that ends with %2 is a summary of each problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:19
 msgid ""
 "Select user(s) and/or set(s) below and click the action button of your "
 "choice."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2885
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:85
+msgid ""
+"Select which assignment types (homework, tests, just-in-time) the "
+"achievement is evaluated."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:20
+msgid ""
+"Select which courses to upgrade from a previous version of WeBWorK.  The "
+"upgrade process can add missing database columns, delete unused database "
+"columns, and check the course file structure.  Be sure to read over the "
+"changes before confirming the upgrade.  You may want to create an archive of"
+" the course before upgrading.  Only courses that need upgraded will be "
+"selectable."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:84
+msgid "Select your favorite theme for the large text window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:18
 msgid "Select/unselect all fields missing in schema for deletion."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2873
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:9
 msgid "Select/unselect all tables missing in schema for deletion."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:23
 msgid "Selected sets:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:57
 msgid "Send E-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:839
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:83
 msgid "Send Email"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:702
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:69
+msgid "Send email to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:54
+msgid "Send emails to selected instructors."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:59
 msgid "Send to all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:717
-msgid "Send to the students selected below"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:64
+msgid "Send to selected students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:402
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:7
 msgid "Set"
 msgstr "Задание"
 
 #. ($newSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:614
 msgid "Set %1 has been created."
 msgstr ""
 
-#. ($newSetName,$userName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1944
+#. ($newSetName, $userName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:616
 msgid "Set %1 was assigned to %2"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1239
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:567
 msgid "Set %1 was assigned to %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:415
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:354
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:42
 msgid "Set Assigner"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:420
-msgid "Set Definition Filename"
-msgstr "Имя файла, определяющего задание"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:17
+msgid "Set Assigner Help"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:45
 msgid "Set Definition Files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2318
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2329
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:218
 msgid "Set Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:17
+msgid "Set Detail Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:333
 msgid "Set Detail for set %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:93
 msgid "Set Header"
 msgstr "Заголовок задания"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:323
+msgid "Set Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:218
 msgid "Set ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:267
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:114
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:3
 msgid "Set Info"
 msgstr "Информация о задании"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2744
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:19
 msgid "Set List"
 msgstr "Список заданий"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1111
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1209
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1320
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:164
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:262
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:353
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:448
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:546
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:659
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:776
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:895
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:995
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:762
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:809
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:7
 msgid "Set Name"
 msgstr "Имя задания"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:186
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:18
+msgid "Set closes on %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:45
+msgid "Set definition (\".def\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:20
+msgid "Set is closed."
+msgstr ""
+
+#. ($c->formatDateTime($set->reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:16
+msgid "Set is due on %1."
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:14
+msgid "Set opens on %1."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:188
 msgid "Set random seed to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2029
+#: /opt/webwork/webwork2/conf/defaults.config:1930
 msgid ""
 "Set to true for log to mean base 10 log and false for log to mean natural "
 "logarithm."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2049
+#: /opt/webwork/webwork2/conf/defaults.config:1950
 msgid ""
 "Set to true to allow students to enter Unicode versions of some characters "
 "(like U+2212 for the minus sign) in their answers.  One reason to allow this"
@@ -5567,7 +7474,7 @@ msgid ""
 "directory from the keyboard."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2019
+#: /opt/webwork/webwork2/conf/defaults.config:1920
 msgid ""
 "Set to true to display the \"Entered\" column which automatically shows the "
 "evaluated student answer, e.g., 1 if student input is sin(pi/2). If this is "
@@ -5576,7 +7483,7 @@ msgid ""
 " answer."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2060
+#: /opt/webwork/webwork2/conf/defaults.config:1961
 msgid ""
 "Set to true to have Full Width Unicode character (U+FF01 to U+FF5E) "
 "converted to their ASCII equivalents (U+0021 to U+007E) automatically in "
@@ -5584,20 +7491,30 @@ msgid ""
 "automatically use Full Width characters for parentheses and commas."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:521
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:164
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:16
+msgid "Set values"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/siblings.html.ep:4
 msgid "Sets"
 msgstr "Задания"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:352
-msgid "Sets Assigned to User"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:322
+msgid "Sets assigned to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:343
-msgid "Sets assigned to %1"
+#. ($userName, $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:90
+msgid "Sets assigned to %1 (%2)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:17
+msgid "Sets assigned to student Help"
 msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:57
@@ -5611,189 +7528,241 @@ msgid ""
 "links from the LMS must be problem set specific. For example, "
 "<code>webwork.myschool.edu/webwork2/course-name/problem_set_name</code>. If "
 "the problem set name has space characters, they should be underscores in "
-"these addresses. If the problem set is a quiz, it must have this format: "
-"<code>webwork.myschool.edu/webwork2/course-"
-"name/quiz_mode/problem_set_name</code>. Also, to initialize the "
-"communication between WeBWorK and the LMS, the user must follow each of "
-"these external learning tools at least one time. Since there must be a "
-"separate external tool link for each problem set, this option requires more "
-"maintenance of the LMS course.</dd></dl>"
+"these addresses. Also, to initialize the communication between WeBWorK and "
+"the LMS, the user must follow each of these external learning tools at least"
+" one time. Since there must be a separate external tool link for each "
+"problem set, this option requires more maintenance of the LMS "
+"course.</dd></dl>"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:55
+msgid "Sets the order in which achievements are listed and evaluated."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1458
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:625
 msgid "Sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:726
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:36
 msgid "Setting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1332
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:39
 msgid "Shift dates so that the earliest is"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:32
+msgid "Show"
+msgstr ""
+
 #. ($numchild)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1301
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:32
 msgid "Show %1 more like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:326
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:107
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:39
 msgid "Show Correct Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:22
 msgid "Show Date & Size"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:86
 msgid "Show LTI parameters (for debugging)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:620
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:34
 msgid "Show Me Another"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2518
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2412
+#. ($exhausted)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:69
+msgid "Show Me Another %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1642
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:711
 msgid "Show Past Answers"
 msgstr "Отобразить предыдущие ответы"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:703
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:41
+msgid "Show Problem Source File"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:132
 msgid "Show Problem Source File:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
 msgid "Show Problems on Finished Tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
-msgid "Show Scores on Finished Assignments?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+msgid "Show Scores on Finished Tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2416
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:630
 msgid "Show Solutions"
 msgstr "Показать решения"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/conf/defaults.config:1538
 msgid "Show Total Homework Grade on Grades Page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1266
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:77
 msgid "Show all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1380
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:91
 msgid "Show all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2404
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:621
 msgid "Show correct answers"
 msgstr "Показать правильные ответы"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1299
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+msgid "Show hints after"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:30
 msgid "Show less like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:337
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:387
 msgid "Show me another"
 msgstr ""
 
-#. ($exhausted)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1926
-msgid "Show me another %1"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:20
+msgid ""
+"Show past answers.  Students can only see their past answers, and they will "
+"not be able to see which parts are correct.  Instructors can use the form to"
+" select any combination of users, sets, and problems to view.  The table "
+"below will list the past answers colored according to correctness (green is "
+"correct).  Use control + click to select multiple users, sets, or problems."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2428
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:639
 msgid "Show problem graders"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:105
 msgid "Show saved answers?"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1860
+#: /opt/webwork/webwork2/conf/defaults.config:1762
 msgid ""
 "Show the correct answer to the current problem before re-randomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1862
+#: /opt/webwork/webwork2/conf/defaults.config:1764
 msgid ""
 "Show the correct answer to the current problem on the last attempt before a "
 "new version is requested."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:3
 msgid "Show which sets?"
 msgstr "Какие из заданий отобразить?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:690
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:3
 msgid "Show which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:382
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:475
-msgid "Show/Hide Site Description"
-msgstr "Показать/Скрыть описание сайта"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:622
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:11
 msgid "Show:"
 msgstr "Показать:"
 
-#. (scalar @{ $self->{visibleSetIDs} },			scalar @{ $self->{allSetIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:594
+#. (scalar @{ $c->{visibleSetIDs} },			scalar @{ $c->{allSetIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:115
 msgid "Showing %1 out of %2 sets."
 msgstr ""
 
-#. (scalar @Users, scalar @{ $self->{allUserIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:610
+#. (scalar(keys %{ $c->{visibleUserIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:80
 msgid "Showing %1 out of %2 users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:70
 msgid "Showing all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1355
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:81
 msgid "Showing all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:61
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:64
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:67
+#. ($c->{merge_file}, $ur->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:5
+msgid "Showing data from merge file %1 for user %2:"
+msgstr ""
+
+#. ($c->{merge_file})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:147
+msgid "Showing data from merge file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:61
+msgid "Showing problem for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:7
+msgid "Showing statistics for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:33
+msgid ""
+"Shows how many instructors and students have been assigned this problem set,"
+" out of the total number in the class. Clicking on this link allows you to "
+"assign the set to users, unassign this set from users, and to individually "
+"edit the assignment for specific users. For changing dates for individual "
+"users there are also shortcuts from the \"Instructor Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:63
 msgid "Site Information"
 msgstr "Информация о сайте"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:88
 msgid "Skip archiving this course"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2080
+#: /opt/webwork/webwork2/conf/defaults.config:1981
 msgid "Skip explanation essay answer fields"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1556
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1557
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:81
+msgid "Snippets of PG code illustrating specific techniques"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1514
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1515
 msgid "Solution:"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1555
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1513
 msgid "Solution: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:432
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:57
 msgid "Solutions"
 msgstr "Решения"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1350
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:20
+msgid ""
+"Some OPL problems have been rated for difficulty/educational objective. The "
+"levels are loosely inspired by Bloom's taxonomy. They are assigned numbers "
+"from 1 to 6 as follows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:185
 msgid ""
 "Some WeBWorK problems are programmed using what are called <i>Math "
 "Objects</i>. These problems are preferred by some people because they "
@@ -5801,18 +7770,18 @@ msgid ""
 "particularly for answers which are way off base."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:379
 msgid "Some answers will be graded later."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:60
 msgid ""
 "Some of these files are directories. Only delete directories if you really "
 "know what you are doing. You can seriously damage your course if you delete "
 "the wrong thing."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2082
+#: /opt/webwork/webwork2/conf/defaults.config:1983
 msgid ""
 "Some problems have an explanation essay answer field, typically following a "
 "simpler answer field. For example, find a certain derivative using the "
@@ -5824,7 +7793,7 @@ msgid ""
 "grading."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2186
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:83
 msgid ""
 "Some problems shown above represent multiple similar problems from the "
 "database.  If the (top) information line for a problem has a letter M for "
@@ -5834,309 +7803,405 @@ msgid ""
 "again."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1612
-msgid ""
-"Some servers handle courses taking place in different timezones.  If this "
-"course is not showing the correct timezone, enter the correct value here.  "
-"The format consists of unix times, such as "
-"\"America/New_York\",\"America/Chicago\", \"America/Denver\", "
-"\"America/Phoenix\" or \"America/Los_Angeles\". Complete list: <a "
-"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:529
-msgid ""
-"Something was wrong with your LTI parameters.  If this recurs, please speak "
-"with your instructor"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:50
 msgid "Sort"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:751
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:814
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:4
 msgid "Sort by"
 msgstr "Сортировать по полю"
 
 #. ($names{$primary}, $names{$secondary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:817
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:324
 msgid "Sort by %1 and then by %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:171
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:115
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:3
 msgid "Sort:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:51
+msgid "Sorts the lists displayed by due date, name, etc."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:363
 msgid "Source File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1586
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1612
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1555
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1593
 msgid ""
 "Source file paths cannot include .. or start with /: your source file path "
 "was modified."
 msgstr ""
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:11
 msgid ""
 "Specify an ID, title, and institution for the new course. The course ID may "
 "contain only letters, numbers, hyphens, and underscores, and may have at "
 "most %1 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:661
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:94
+msgid ""
+"Spell check the text of the file that your are editing. Note that there will"
+" be many spelling errors in the code parts of your file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:116
+msgid "Standard Deviation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:162
 msgid "Start"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:609
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:47
+msgid "Start LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:130
 msgid "Start New Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:443
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:94
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:508
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:84
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:54
 msgid "Statistics"
 msgstr "Статистика"
 
-#. ($self->{ce}{courseName} =~ s/_/ /gr,                   CGI::span({ dir =>
-#. 'ltr' }, format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:73
-msgid "Statistics for %1 set %2. Closes %3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:17
+msgid "Statistics Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:86
+msgid "Statistics for %1"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:90
+msgid "Statistics for %1 problem %2"
 msgstr ""
 
-#. ($self->{ce}{courseName}, $self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:68
-msgid "Statistics for %1 student %2"
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:84
+msgid "Statistics for student %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2089
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1442
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1524
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2020
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:296
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:659
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:806
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:191
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:192
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:442
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:151
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:160
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:36
 msgid "Status"
 msgstr "Статус"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:29
 msgid "Stop Acting"
 msgstr "Прекратить действие"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2251
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:85
 msgid "Stop Archiving"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2418
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1153
 msgid "Stop archiving courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:233
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:783
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2011
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:295
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:829
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:887
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:916
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:30
 msgid "Student ID"
 msgstr "ID студента"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:9
+msgid "Student ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:37
 msgid "Student Name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:570
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:428
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:56
 msgid "Student Progress"
 msgstr "Результаты студентов"
 
-#. ($self->{ce}->{courseName},                     CGI::span({ dir => 'ltr' },
-#. format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:81
-msgid "Student Progress for %1 set %2. Closes %3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:17
+msgid "Student Progress Help"
+msgstr ""
+
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:72
+msgid "Student Progress for %1"
 msgstr ""
 
-#. ($self->{ce}->{courseName}, $self->{studentName})
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($c->stash('setID')
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:76
-msgid "Student Progress for %1 student %2"
+msgid "Student Progress for set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:628
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:80
 msgid "Student answers"
 msgstr "Ответы студента"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:766
-msgid "Subject:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:80
+msgid ""
+"Student scores for the sets selected below will be calculated. This and "
+"other scoring operations can also be done using the \"Scoring Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:87
+msgid "Student:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:124
+msgid "Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:653
-msgid "Subject: "
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:50
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:8
+msgid "Subject:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:222
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:30
 msgid "Submission time:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:226
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:41
 msgid "Submit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:26
 msgid "Submit Answers"
 msgstr "Отправить ответы"
 
 #. ($effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1861
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:23
 msgid "Submit Answers for %1"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:502
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:525
 msgid "Submit your answers again to go on to the next part."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:775
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:183
 msgid "Success Index"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:106
+msgid ""
+"Success index is the square of the average score divided by the average "
+"number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:73
+msgid ""
+"Success index is the square of the score divided by the number of attempts."
+msgstr ""
+
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1086
 msgid "Successfully archived the course %1."
 msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:885
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:422
 msgid "Successfully created new achievement %1"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1252
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:581
 msgid "Successfully created new set %1"
 msgstr ""
 
 #. ($add_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:465
 msgid "Successfully created the course %1"
 msgstr ""
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1818
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2401
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1131
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:900
 msgid "Successfully deleted the course %1."
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1529
+#. ($rename_oldCourseID,							$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:772
 msgid "Successfully renamed the course %1 to %2"
 msgstr ""
 
 #. ($unarchive_courseID, $new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2653
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1286
 msgid "Successfully unarchived %1 to the course %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2099
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4280
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:89
+msgid "TA:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2274
 msgid "Table defined in database but missing in schema"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2097
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2269
 msgid "Table defined in schema but missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2265
 msgid "Table is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3200
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3490
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:276
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:576
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:106
 msgid "Take Action!"
 msgstr "Выполнить действие!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Target Set:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:63
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:42
 msgid "TeX Source"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:784
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:258
+msgid "Test %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:54
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:52
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:55
+msgid "Test Name"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:156
 msgid "Test Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:224
 msgid "Test Time Limit (min; 0=Close Date)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2041
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:238
 msgid "Test Time Notification"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:156
 msgid "Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:244
 msgid "Test not yet submitted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:317
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:920
+msgid "Test parameters"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:149
 msgid "Test/quiz with time limit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:79
 msgid "Text"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:842
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:80
+msgid "Text Editor Options"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:55
 msgid "Text chapter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:864
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:66
 msgid "Text section:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:44
 msgid "Textbook:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1403
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:58
 msgid ""
-"The Attempts figure is the global average of the number of attempts (both "
-"correct and incorrect) individuals take on this problem.  A high figure may "
-"represent a difficult problem.  Note that problems with multiple parts may "
+"The \"Edit Target Set\" button at the top of the page will take you to the "
+"Problem Set Editor which will allow you to edit dates, assign users and "
+"other information about the problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:115
+msgid ""
+"The \"Score\" tab will export achievement data to a CSV file that can be "
+"downloaded.  The export contains the global data including number of "
+"achievement points and current level of each student.  In addition for each "
+"selected achievement, a column for if the achievement was earned (1) or not "
+"earned (0) will be added to the CSV."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:194
+msgid ""
+"The <strong>Assigned sets</strong> column (x/y) indicates that x sets out of"
+" y sets avaiable have been assigned to this student. Click this link to "
+"assign or unassign sets to this student, to adjust due dates, or to adjust "
+"the grades on a homework set for a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:20
+msgid ""
+"The <strong>Set Detail</strong> page can be viewed in one of two distinct "
+"modes:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:189
+msgid ""
+"The <strong>login name</strong> column links allow you to \"act as\" a "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:191
+msgid ""
+"The <strong>pencil</strong> in the login column allows you to edit that "
+"student's data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:64
+msgid ""
+"The Attempts figure is the global average of the number of attempts (both "
+"correct and incorrect) individuals take on this problem.  A high figure may "
+"represent a difficult problem.  Note that problems with multiple parts may "
 "have higher average attempts since many students  will submit an answer to "
 "each part before continuing and each such  submittal counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1485
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:124
 msgid ""
 "The Attempts figure is the local average of the number of attempts (both "
 "correct and incorrect) individuals at your institution take on this problem."
@@ -6146,14 +8211,14 @@ msgid ""
 "counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1819
+#: /opt/webwork/webwork2/conf/defaults.config:1721
 msgid ""
 "The Maximum number of times Show me Another can be used per problem by a "
 "student. If set to -1 then there is no limit to the number of times that "
 "Show Me Another can be used."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1787
+#: /opt/webwork/webwork2/conf/defaults.config:1689
 msgid ""
 "The Reduced Scoring Period is the default period before the due date during "
 "which all additional work done by the student counts at a reduced rate. When"
@@ -6166,7 +8231,7 @@ msgid ""
 "work done counts 50% of the original.\" will be displayed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:78
 msgid ""
 "The Status figure is the global average of the Status individuals have "
 "earned on this problem. The Status is the percentage correct (from 0% to "
@@ -6175,7 +8240,7 @@ msgid ""
 "a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1506
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:138
 msgid ""
 "The Status figure is the local average of the Status individuals at your "
 "institution have earned on this problem. The Status is the percentage "
@@ -6184,47 +8249,61 @@ msgid ""
 "students will work on a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1262
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:11
 msgid "The WeBWorK Project"
 msgstr "Проект WebWork"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:822
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:25
+msgid ""
+"The WeBWorK administrators need to be added to the course in order for them "
+"to access the course.  Unchecking this option will make it so WeBWorK "
+"administrators cannot directly login to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:129
+msgid ""
+"The achievement evaluator is the perl code that is run after each submit to "
+"determine if an achievement is earned or not.  Click on the \"Edit "
+"Evaluator\" link to edit the evaluator."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:26
 msgid ""
 "The adjusted status of a problem is the larger of the problem's status "
 "andthe weighted average of the status of those problems which count towards "
 "the parent grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1677
+#: /opt/webwork/webwork2/conf/defaults.config:1579
 msgid ""
 "The amount of time (in minutes) after the due date that the Answers are "
 "available to student to view.  You can change this for individual homework, "
 "but WeBWorK will use this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1667
+#: /opt/webwork/webwork2/conf/defaults.config:1569
 msgid ""
 "The amount of time (in minutes) before the due date when the assignment is "
 "opened.  You can change this for individual homework, but WeBWorK will use "
 "this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:386
 msgid "The answer above is NOT correct."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:375
 msgid "The answer above is correct."
 msgstr "Приведённый выше ответ верен."
 
 #. ($filename, $ce->{mail}{maxAttachmentSize})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:230
 msgid ""
 "The attached file \"%1\" exceeds the allowed attachment size of "
 "%quant(%2,megabyte)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:421
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:496
 msgid ""
 "The child problems for this problem will become visible to the student when "
 "they either have more incorrect attempts than is specified here, or when "
@@ -6233,173 +8312,252 @@ msgid ""
 "attempts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:704
+#. ('href="http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files"
+#. target="Webworkdocs"',
+#. '<code>demoCourse.lst</code>','<code>.csv</code>','<code>.lst</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:59
+msgid ""
+"The classlist files are stored in the templates directory and provide a "
+"convenient way to enter a large number of students into your class. To view "
+"the format for <strong>ClassList files</strong> see the <a %1>ClassList "
+"specification</a> or download the %2 file and use it as a model. ClassList "
+"files can be prepared using a spreadsheet and then saved as %3 (comma "
+"separated values) text files.  However, to access as a classlist file, the "
+"file suffix needs to be changed to %4, which can be done with the \"Rename\""
+" button."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:16
 msgid ""
 "The configuration module did not find the data it needs to function.  Have "
-"your site administrator check that Constants.pm is up to date."
+"your site administrator check that site configuration files are up to date."
+msgstr ""
+
+#. ($archive_courseID,					$archive_path)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:80
+msgid ""
+"The course \"%1\" has already been archived at \"%2\". This earlier archive "
+"will be erased.  This cannot be undone."
 msgstr ""
 
-#. (CGI::b($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:151
+#. (tag('strong', stash('courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:8
 msgid ""
 "The course %1 uses an external authentication system (%2). Please go there "
 "to log in again."
 msgstr ""
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:186
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:17
 msgid ""
 "The course %1 uses an external authentication system (%2). Please return to "
 "that system to access this course."
 msgstr ""
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:191
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:23
 msgid ""
 "The course %1 uses an external authentication system (%2). You've "
 "authenticated through that system, but aren't allowed to log in to this "
 "course."
 msgstr ""
 
-#. ($archive_courseID,						$archive_path)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2243
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:30
+msgid "The course database must be upgraded before archiving this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:30
+msgid "The course database must be upgraded before renaming this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:26
 msgid ""
-"The course '%1' has already been archived at '%2'. This earlier archive will"
-" be erased.  This cannot be undone."
+"The current mode should be made clear by the information at the top of the "
+"page."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1995
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:46
+msgid ""
+"The current value of the achievement counter. Changes to this variable will "
+"be saved."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1897
 msgid "The default display mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1855
+#: /opt/webwork/webwork2/conf/defaults.config:1757
 msgid ""
 "The default number of attempts before the problem is re-randomized. ( 0 => "
 "never )"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1854
+#: /opt/webwork/webwork2/conf/defaults.config:1756
 msgid ""
 "The default number of attempts between re-randomization of the problems ( 0 "
 "=> never)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:251
-msgid "The directory you specified doesn't exist"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:73
+msgid ""
+"The description shown to students which states what action is needed to earn"
+" the achievement."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1829
-msgid "The display was already cleared."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:5
+msgid "The directory you specified doesn't exist"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2111
+#: /opt/webwork/webwork2/conf/defaults.config:2032
 msgid ""
 "The e-mail verbosity level controls how much information is automatically "
-"added to feedback e-mails.  Levels are<ol><li value=\"Simple\"> Simple: send"
-" only the feedback comment and context link</li><li value=\"Standard\"> "
-"Standard: as in Simple, plus user, set, problem, and PG data</li><li "
-"value=\"Debug\"> Debug: as in Standard, plus the problem environment "
-"(debugging data)</li></ol>"
+"added to feedback e-mails.  Levels are<ol><li> Simple: send only the "
+"feedback comment and context link</li><li> Standard: as in Simple, plus "
+"user, set, problem, and PG data</li><li> Debug: as in Standard, plus the "
+"problem environment (debugging data)</li></ol>"
 msgstr ""
 
-#. ($achievementName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:625
-msgid "The evaluator for %1 has been renamed to '%2'."
+#. ($achievementName,				$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:293
+msgid "The evaluator for %1 has been renamed to \"%2\"."
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:339
-msgid ""
-"The file %1/%2 already exists and cannot be overwritten. The message was not"
-" saved"
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:246
+msgid "The file \"%1\" cannot be found."
+msgstr ""
+
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:526
+msgid "The file \"%1\" cannot be read!"
+msgstr ""
+
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:522
+msgid "The file \"%1\" is a directory!"
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:190
-msgid "The file %1/%2 cannot be found."
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:259
+msgid "The file \"%1\" is a template. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:181
-msgid "The file %1/%2 is not readable by the webserver."
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:250
+msgid "The file \"%1\" is protected. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:373
-msgid "The file '%1' cannot be found."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:19
+msgid "The file $file does not appear to be a text or image file."
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1004
-msgid "The file '%1' cannot be read!"
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:277
+msgid ""
+"The file %1 already exists and cannot be overwritten. The message was not "
+"saved."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:380
-msgid "The file '%1' is a blank problem!"
+#. ("$emailDirectory/$openfilename",				$emailDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:156
+msgid ""
+"The file %1 cannot be found. Check whether it exists and whether the "
+"directory %2 can be read by the webserver. "
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:998
-msgid "The file '%1' is a directory!"
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
+msgid ""
+"The file %1 is not contained in the course templates directory and can not "
+"be modified."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:375
-msgid "The file '%1' is protected!"
+#. ("$emailDirectory/$openfilename")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:148
+msgid ""
+"The file %1 is not readable by the webserver. Check that it's permissions "
+"are set correctly."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:203
 msgid "The file does not appear to be a text file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:88
 msgid "The file you are trying to download doesn't exist"
 msgstr ""
 
 #. ($filename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:221
 msgid "The filetype of the attached file \"%1\" is not allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3843
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2149
 msgid "The following courses were successfully hidden:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3908
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2218
 msgid "The following courses were successfully unhidden:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4121
-msgid "The following upgrades are available for your WeBWorK system:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:34
+msgid "The following describes how the checkboxes alter the scoring output"
 msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2081
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:66
 msgid ""
 "The following users are NOT assigned to this set and will be ignored: %1"
 msgstr ""
 
-#. (join('.', @{$problemSeqs[$children_counts_indexs[0]]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:288
+msgid "The given file path is not a valid location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:49
+msgid "The goal value of the achievement counter."
+msgstr ""
+
+#. (join('.', @{ $problemSeqs[ $children_counts_indexs[0] ] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1334
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the score of problem %1."
 msgstr ""
 
-#. (join(', ', map({join('.', @{$problemSeqs[$_]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2064
+#. (join(', ', map({ join('.', @{ $problemSeqs[$_] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the weighted average of the problems: %1."
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1954
-msgid "The hardcopy header for set %1 has been renamed to '%2'."
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1078
+msgid "The hardcopy header for set %1 has been renamed to \"%2\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:111
+#. ($showHintsAfter)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:36
+msgid ""
+"The hint shown is an instructor preview and will be shown to students after "
+"%quant(%1,attempt)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:32
+msgid ""
+"The hint shown is an instructor preview and will not be shown to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:22
+msgid ""
+"The information box on the right displays information about the course. This"
+" is useful for leaving course wide messages for students. It contains text "
+"from the file templates/course_info.txt. Instructors can edit this file from"
+" the web (click on the \"Edit\" link)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:30
 msgid ""
 "The initial value is the answer sub score for the answer that is currently "
 "shown.  If this is modified, it will be used to compute the total problem "
@@ -6407,37 +8565,100 @@ msgid ""
 "shown answer if the page is reloaded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:161
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:97
+msgid ""
+"The initial value is the currently saved score as a point value computed "
+"using the percent score.  This point value is used to compute the percent "
+"score (rounded to a whole percent) that can be saved."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:145
 msgid "The initial value is the currently saved score for this student."
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_oldCourseInstitution,
 #. $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
 msgid ""
 "The institution associated with the course %1 has been changed from %2 to %3"
 msgstr ""
 
-#. ($rename_newCourseID, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1498
+#. ($rename_newCourseID, $optional_arguments{courseInstitution})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:729
 msgid "The institution associated with the course %1 is now %2"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:599
+msgid ""
+"The instructor account with user id %1 does not exist.  Instructor accounts "
+"must be created manually."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:635
 msgid ""
 "The instructor account with user id %1 does not exist.  Please create the "
 "account manually via WeBWorK."
 msgstr ""
 
-#. ($r->param('new_set_name')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1897
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:87
+msgid ""
+"The key maps that are available are \"default\", \"emacs\", \"sublime\", and"
+" \"vim\". The \"default\" key map has the standard behavior of a browser "
+"text area. You can use Ctrl-C to copy, Ctrl-V to paste, Ctrl-F to search, "
+"etc. If you are more comfortable with the \"emacs\", \"sublime\", or \"vim\""
+" text editors then you may choose to use one of those key maps instead."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:75
+msgid "The large text window"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:27
+msgid ""
+"The list of files include regular files, directories (ending in a \"/\") and"
+" links (ending in a \"@\")."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:52
+msgid ""
+"The login name cannot be changed. (It is the primary key for the student's "
+"data.) If you make a mistake in the login name at the beginning of the "
+"course (before any work has been done) then it is best to simply add a new "
+"student with the correct entry and drop the student with the bad login name."
+" (See drop and delete students below.) If the login name must be changed "
+"after a user has started working assignments, then contact your system "
+"administrator, who can use the webwork2 \"bin/change_user_id\" script to "
+"change the user id."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:20
+msgid ""
+"The main page allows access to set and student statistics.  When selecting a"
+" student, their grades page is shown, which lists set totals and per problem"
+" grades for each set assigned to the student.  When selecting a set, various"
+" statistics and histograms are shown for the overall grades of students who "
+"are currently enrolled or auditing the course."
+msgstr ""
+
+#. ('href="http://webwork.maa.org/wiki" target="ww_wiki"',
+#. 'href="http://webwork.maa.org/wiki/Instructors" target="ww_wiki"')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:24
+msgid ""
+"The main page for WeBWorK documentation is the <a %1>webwork wiki</a> while "
+"specific help for instructors setting up a course are in the <a "
+"%2>instructors' section</a>."
+msgstr ""
+
+#. ($c->param('new_set_name')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:569
 msgid ""
 "The name \"%1\" is not a valid set name.  Use only letters, digits, dashes, "
 "underscores, periods, and spaces."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1530
+#: /opt/webwork/webwork2/conf/defaults.config:1432
 msgid ""
 "The name of course information file (located in the templates directory). "
 "Its contents are displayed in the right panel next to the list of homework "
@@ -6454,151 +8675,249 @@ msgid ""
 "go back to the LMS to access something in the WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:63
+msgid "The number of points earned for earning the achievement."
+msgstr ""
+
 #. ($openDate, $dueDate, $answerDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1104
 msgid ""
 "The open date: %1, close date: %2, and answer date: %3 must be defined and "
 "in chronological order."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:702
+#. ($path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:393
+msgid "The original path is not in a valid location. Using failsafe %1"
+msgstr ""
+
+#. ($forcedSourceFile)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:510
+msgid "The original path to the file is %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:262
 msgid "The password and password confirmation for the instructor must match."
 msgstr ""
 
-#. (CGI::b($r->maketext("[_1]'s Current Password", $user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:27
+msgid ""
+"The password can be any combination of letters, numbers and special symbols."
+" Students are encouraged to use all three, and stay away from dictionary "
+"words. The password should not be the same as any password used elsewhere, "
+"such as for an email account. The password will only be present on the page "
+"if the user has permission to change the password."
+msgstr ""
+
+#. ($c->tag(                                               'b',
+#. $c->maketext(                                                   "[_1]'s
+#. Current Password",
+#. $c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:95
 msgid ""
 "The password you entered in the %1 field does not match your current "
 "password. Please retype your current password and try again."
 msgstr ""
 
-#. (CGI::b($r->maketext("[_1]'s New Password",         $e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:105
+#. ($c->tag('b', $c->maketext("[_1]'s New Password",         $e_user_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:82
 msgid ""
 "The passwords you entered in the %1 and %2 fields don't match. Please retype"
 " your new password and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:789
-msgid "The path to the original file should be absolute"
-msgstr "Путь к первоначальному файлу должен быть абсолютным"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:374
+msgid "The path can not be the temporary edit directory."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:667
-msgid ""
-"The percentage of active students with correct answers for each problem"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:370
+msgid "The path to the original file should be absolute."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:131
 msgid ""
 "The percentage of students receiving at least these scores. The median score"
 " is in the 50% column."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:458
 msgid "The prerequisite conditions have not been met for set '%1'."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1917
-msgid "The problem set is not yet open"
-msgstr ""
-
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2012
-msgid "The recorded score for this version is  %1/%2."
+#. (q(down menu to change which student's seed and answers are shown.  Use the
+#. "Mark Correct" checkbox to set)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:26
+msgid ""
+"The problem is shown at the top with the seed and answers of the selected "
+"student.  Use the drop "
 msgstr ""
 
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2021
-msgid "The recorded score for this version is %1/%2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:62
+msgid "The problem set is not yet open"
 msgstr ""
 
 #. ($origReducedScoringDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1971
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1121
 msgid ""
 "The reduced credit date %1 in the file probably was generated from the Unix "
 "epoch 0 value and is being treated as if it was Unix epoch 0."
 msgstr ""
 
 #. ($openDate, $dueDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1982
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1135
 msgid ""
 "The reduced credit date should be between the open date %1 and close date %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1220
 msgid ""
 "The reduced scoring date should be between the open date and close date."
 msgstr ""
 
 #. ($tempFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:307
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:298
 msgid "The requested file \"%1\" does not exist on the server."
 msgstr ""
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2085
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1389
 msgid "The score for this problem can count towards score of problem %1."
 msgstr ""
 
-#. ($setName, $effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:306
-msgid "The selected problem set (%1) is not a valid set for %2"
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:69
+msgid ""
+"The scoring files are stored in the scoring directory and are produced using"
+" the \"Scoring Tools\" page or the scoring command in the \"Instructor "
+"Tools\" module. These files can be downloaded, modified in a spreadsheet "
+"(for example, to add midterm scores) and then uploaded again to the scoring "
+"directory to be merged with email messages. (Use a new file name, other than"
+" %1, when uploading to prevent the scoring module from overwriting an "
+"uploaded file.)"
 msgstr ""
 
-#. ($urlpath->arg("setID")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1467
-msgid "The selected problem set (%1) is not a valid set for %2%3:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:52
+msgid ""
+"The second row of the problem collection area is for browsing directories. "
+"The OPL will be there as well as any other directories that you may set up "
+"(for example Contrib). If this is selected, all subdirectories containing "
+"problems will be listed."
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1946
-msgid "The set header for set %1 has been renamed to '%2'."
+#. (stash('setID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet.html.ep:13
+msgid "The selected problem set (%1) is not a valid set for %2."
+msgstr ""
+
+#. ($setID, $effectiveUserID, $c->{invalidVersionCreation} ? " (acted as by
+#. $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:77
+msgid "The selected problem set (%1) is not a valid set for %2: %3"
+msgstr ""
+
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1066
+msgid "The set header for set %1 has been renamed to \"%2\"."
 msgstr ""
 
-#. ($newSetName)
 #. ($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1164
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:491
+msgid ""
+"The set name \"%1\" is already in use. Pick a different name if you would "
+"like to start a new set. No set created."
+msgstr ""
+
+#. ($newSetName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:584
 msgid ""
 "The set name '%1' is already in use.  Pick a different name if you would "
 "like to start a new set."
 msgstr ""
 
-#. ($setID, $editingSetVersion, $editForUser[0])
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2109
-msgid "The set-version (%1, version %2) is not assigned to user %3."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:58
+msgid ""
+"The sets checked below will be visible to students or hidden from students. "
+"Useful for preparing sets ahead of time, but not showing them to students; "
+"or for temporarily hiding a set which has a mistake in it while it is being "
+"fixed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:54
+msgid ""
+"The sets checked below will become available for editing the due dates and "
+"visibility."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:73
+msgid ""
+"The sets checked below will written to set definition files, to be saved for"
+" future use, or to be transferred to another course. The set definition "
+"files can be uploaded/downloaded using the \"File Manager\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:29
+msgid ""
+"The simple configuration file is the name of the configuration file created "
+"when using the \"Course Configuration\" page to configure course options.  "
+"This option sets if this configuration file is copied from the old course or"
+" not and instead use the server defaults."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:551
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:521
 msgid "The solution has been removed."
 msgstr ""
 
-#. ($fullSetName, $prettyProblemNumber, $self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1975
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:33
+msgid ""
+"The solution shown is an instructor preview and will only be shown to "
+"students after the due date."
+msgstr ""
+
+#. ($c->{fullSetID},
+#. $c->{prettyProblemNumber},
+#. $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1103
 msgid ""
-"The source file for 'set %1 / problem %2 has been changed from '%3' to '%4'"
+"The source file for \"set %1 / problem %2\" has been changed from \"%3\" to "
+"\"%4\"."
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2133
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1209
+msgid ""
+"The temporary file %1 is not contained in the course templates directory and"
+" can not be deleted."
+msgstr ""
+
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:689
+msgid ""
+"The temporary file %1 is not in the course templates directory and can not "
+"be deleted!"
+msgstr ""
+
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:349
 msgid ""
 "The test (which is version %1) may  no longer be submitted for a grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1927
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1042
 msgid ""
 "The text box now contains the source of the original problem. You can "
 "recover lost edits by using the Back button on your browser."
 msgstr "Текстовое окно теперь содержит код исходной задачи. Вы можете восстановить сделанные ранее изменения при момощи кнопки Назад в Вашем браузере."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:214
+#. (			% . 'but the result will not be counted.')
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:23
 msgid ""
 "The time limit on this assignment was exceeded. The assignment may be "
-"checked, but the result will not be counted."
+"checked, "
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1657
+#: /opt/webwork/webwork2/conf/defaults.config:1559
 msgid ""
 "The time of the day that the assignment is due.  This can be changed on an "
 "individual basis, but WeBWorK will use this value for default when a set is "
@@ -6606,24 +8925,39 @@ msgid ""
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1443
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:689
 msgid "The title of the course %1 has been changed from %2 to %3"
 msgstr ""
 
-#. ($rename_newCourseID, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1491
+#. ($rename_newCourseID, $optional_arguments{courseTitle})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:722
 msgid "The title of the course %1 is now %2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:167
+msgid ""
+"The top number is the percent score on the problem.  A period (.) indicates "
+"a problem has not been attempted. The bottom number is the number of "
+"incorrect attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:25
+msgid ""
+"The total grade row at the bottom shows the total score and percent average "
+"over all open assignments.  The total grade row can be shown/hidden under "
+"general course configuration settings."
+msgstr ""
+
 #. ($enableReducedScoring)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1151
 msgid ""
 "The value %1 for enableReducedScoring is not valid; it will be replaced with"
 " 'N'."
 msgstr ""
 
 #. ($timeCap)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2032
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1209
 msgid ""
 "The value %1 for the capTimeLimit option is not valid; it will be replaced "
 "with '0'."
@@ -6631,81 +8965,90 @@ msgstr ""
 
 #. ($hideScore)
 #. ($hideScoreByProblem)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2023
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1178
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1189
 msgid ""
 "The value %1 for the hideScore option is not valid; it will be replaced with"
 " 'N'."
 msgstr ""
 
 #. ($hideWork)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1200
 msgid ""
 "The value %1 for the hideWork option is not valid; it will be replaced with "
 "'N'."
 msgstr ""
 
 #. ($relaxRestrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2045
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1235
 msgid ""
 "The value %1 for the relaxRestrictIP option is not valid; it will be "
 "replaced with 'No'."
 msgstr ""
 
 #. ($restrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2037
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1221
 msgid ""
 "The value %1 for the restrictIP option is not valid; it will be replaced "
 "with 'No'."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:46
+msgid "The visible name/title of the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:36
 msgid ""
 "The webwork server must be able to write to these directories. Please "
 "correct the permssion errors."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1537
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:83
+msgid "Theme"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1439
 msgid "Theme (refresh page after saving changes to reveal new theme.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:109
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:5
 msgid "Theme:"
 msgstr ""
 
 # Context is "Sort by ____ Then by _____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:843
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:872
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:30
 msgid "Then by"
 msgstr "Затем по полю"
 
-#. ($count_line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:603
+#. ($listingsCount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:52
 msgid "There are %1 matching WeBWorK problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1625
+#: /opt/webwork/webwork2/conf/defaults.config:1527
 msgid ""
 "There are currently two hardcopy themes to choose from: One Column and Two "
 "Columns.  The Two Columns theme is the traditional hardcopy format.  The One"
 " Column theme uses the full page width for each column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2979
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1519
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
 "least one table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1243
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:23
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
-"least one table.  They can only be removed when upgrading the course."
+"least one table.  They can be removed when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1404
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
 "least one table. Check the checkbox by the field to delete it when upgrading"
@@ -6713,63 +9056,48 @@ msgid ""
 "is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1508
 msgid "There are extra database tables which are not defined in the schema."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2833
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1389
 msgid "There are extra database tables which are not defined in the schema. "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:15
 msgid ""
 "There are extra database tables which are not defined in the schema.  These "
 "can be deleted when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:601
-msgid "There are no matching WeBWorK problems"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:976
-msgid "There are no set definition files in this course to look at."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2199
-msgid ""
-"There are tables or fields missing from the database.  The database must be "
-"upgraded before archiving this course."
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:29
+msgid "There are many options available at the bottom:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4108
-msgid "There are upgrades available for the Open Problem Library."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:49
+msgid "There are no completed versions of this test."
 msgstr ""
 
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4072
-msgid ""
-"There are upgrades available for your current branch of PG from branch %1 in"
-" remote %2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:51
+msgid "There are no matching WeBWorK problems"
 msgstr ""
 
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4010
-msgid ""
-"There are upgrades available for your current branch of WeBWorK from branch "
-"%1 in remote %2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:8
+msgid "There are no set definition files in this course to look at."
 msgstr ""
 
 #. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:273
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:87
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
 "their name, you destroy all of the data for achievement %1 for this student."
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:230
+#. (tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:91
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
@@ -6777,37 +9105,29 @@ msgid ""
 "student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:205
-msgid ""
-"There is NO undo for this function.  Do not use it unless you know what you "
-"are doing!  When you unassign sets using this button, or by unchecking their"
-" set names, you destroy all of the data for those sets for this student."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:234
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:68
 msgid "There is NO undo for unassigning a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:174
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:177
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:139
-msgid "There is NO undo for unassigning students."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4069
-msgid "There is a new version of PG available."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:125
+msgid ""
+"There is NO undo for unassigning sets. Do not do so unless you know what you"
+" are doing!  When you unassign sets by unchecking set names and clicking "
+"save, you destroy all of the data for those sets for this student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4007
-msgid "There is a new version of WeBWorK available."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:21
+msgid "There is NO undo for unassigning students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:529
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:490
 msgid "There is a written solution available."
 msgstr ""
 
 #. ($message_file, $merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:50
 msgid ""
 "There is no additional grade information.  A message about additional grades"
 " can go in [TMPL]/email/%1. It is merged with the file [Scoring]/%2. These "
@@ -6816,185 +9136,324 @@ msgid ""
 msgstr ""
 
 #. ($continueTimeLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:486
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:25
 msgid ""
 "There is no time remaining on the currently open test. Click continue below "
 "and then click \"Grade Test\" within %1 seconds to submit the test for a "
 "grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:856
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:65
 msgid "There is no undo for deleting files or directories!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:534
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:495
 msgid ""
 "There is no written solution available for this problem, but you can still "
 "view the correct answers."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:537
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:498
 msgid "There is no written solution available for this problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1539
-msgid ""
-"There is one main theme to choose from: math4. It has two variants, "
-"math4-green and math4-red. The theme specifies a unified look and feel for "
-"the WeBWorK course web pages."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2270
+#: /opt/webwork/webwork2/conf/defaults.config:1441
 msgid ""
-"There may be something wrong with this question. Please inform your "
-"instructor including the warning messages below."
+"There is one main theme to choose from: math4. It has three variants: "
+"math4-green, math4-red, and math4-yellow. The theme specifies a unified look"
+" and feel for the WeBWorK course web pages."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:441
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator if this recurs."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:284
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:307
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:475
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:484
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:511
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:543
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:219
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:354
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:492
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:536
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:575
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:172
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:189
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:212
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:227
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:365
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:447
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1935
+#. ('href="https://webwork.maa.org/wiki/Set_Definition_Files"
+#. target="Webworkdocs"')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:48
+msgid ""
+"These are stored in the templates directory. The format of <strong>Set "
+"Definition files</strong> is described in the <a %1>Set Definition "
+"specification</a>. Set definition files are mainly useful for transferring "
+"set assignments from one course to another and are created when exporting a "
+"problem set from the \"Hmwk Sets Editor\".  Each set defintion file contains"
+" a list of problems used and the dates and times. These definitions can be "
+"imported into the current course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:77
+msgid ""
+"These are the files from which problems are generated and are located in the"
+" templates directory or in subdirectories. They can be edited directly using"
+" the \"Edit\" link on each problem page or from the \"Hmwk Sets Editor\". "
+"The File Manager allows you to upload or download these files. \tDirectories"
+" that start with \"set\" contain pg files and are generated when exporting a"
+" problem set in which there are local versions of a problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:40
+msgid ""
+"These options will only be shown if the user has the permission to change "
+"display settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:44
+msgid ""
+"These problems require some application of algorithms, but do not rise to "
+"the level of a full word problem. For example, \"Identify the local extrema "
+"for f(x) = ...\". One has to apply algorithms and interpret results."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1837
 msgid ""
 "These users and higher get the \"Show Past Answers\" button on the problem "
 "page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:17
 msgid "This action can take a long time if there are many students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:168
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:12
 msgid "This action will not overwrite existing users."
 msgstr ""
 
-#. (CGI::b($r->maketext("Guest Login")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:279
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:20
+msgid ""
+"This allows for the viewing, downloading, uploading and other management of "
+"files in the course.  Select a file or set of files (using CTRL or SHIFT) "
+"and click the desired button on the right.  Many actions can only be done "
+"with a single file (like view). Selecting a directory or set of files and "
+"clicking \"Make Archive\" creates a compressed tar file with the name "
+"COURSE_NAME.tgz"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:34
+msgid ""
+"This browses the Open Problem Library (OPL) in category "
+"(Subject/Chapter/Section) form. Select the desired categories (all three do "
+"not need to be selected) and click \"View Problems\". If the \"Include "
+"Contrib\" box is selected then those problems in the Contrib section of the "
+"OPL that have the categories defined are also included. Contrib problems are"
+" problem that haven't been vetted as thoroughly as OPL problems. If you want"
+" hints or solutions included while browsing select the appropriate box."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:49
+msgid ""
+"This button is also present both at top and the bottom of the page. Discards"
+" all changes, reloading the page by re-reading the database information for "
+"this set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:39
+msgid ""
+"This button is present both at top and the bottom of the page. Any and all "
+"changes made to any part of the set will be saved with one important "
+"exception: When editing the set for one or more students, you can choose to "
+"override the default value (defined for the set in general) by clicking on "
+"the checkbox and providing a value (or possibly leaving blank) and checking "
+"the override checkbox. If you do <strong>NOT</strong> check the checkbox, "
+"the override value will be discarded and the default value for the set will "
+"be used for the users currently being edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:105
+msgid ""
+"This can computed from the answer sub scores above using the weights shown "
+"if they are modified.  Alternatively, enter the point score you want saved "
+"here (the above sub scores will be ignored)."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2005
+msgid ""
+"This configures if the single problem manual grader has inputs to enter "
+"problem scores as a percent, a point value, or both. Note, the problem score"
+" is always saved as a percent, so when using a point value, the problem "
+"score will be rounded to the nearest whole percent."
+msgstr ""
+
+#. (tag('b', maketext('Guest Login')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:72
 msgid ""
 "This course supports guest logins. Click %1 to log into this course as a "
 "guest."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:851
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:58
+msgid ""
+"This determines if MathQuill answer blanks are enable for the user. This "
+"option is only present if MathQuill is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:63
+msgid ""
+"This determines if the MathView equation editor button will be appended to "
+"text answer blanks. his option is only present if MathView is enabled for "
+"the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:52
+msgid ""
+"This determines whether or not saved past answers are automatically filled "
+"in to the problem form when a student returns to a problem after having left"
+" the problem. This option is only visible if the user has the permission to "
+"show old answers."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:85
+msgid ""
+"This directory is accessible from the web. You can use it to store html "
+"documents or image documents that are used by the course. Do not store "
+"private information in this directory or in any subdirectory thereof. These "
+"documents can be linked to from within problems using the htmlLink macro."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:255
+msgid "This file is a template. You may use \"Save As\" to create a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:20
+msgid ""
+"This form can assign, unassign, and edit user data for a single achievement."
+"  You can assign the achievement to all current users or select which users "
+"to assign the achievement to and click Save.  You can unassign the "
+"achievement by unchecking a student's name (note all data will be deleted)."
+"  To unassign the achievement from all users, first select \"Allow "
+"unassign\" and then click the \"Unassign from All Users\" button. You can "
+"also toggle the earned status with the checkbox in the \"Earned\" column and"
+" edit the achievement counter for counting achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:19
+msgid ""
+"This gives the status and dates of the main set. Indvidual students may have"
+" different settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:51
 msgid "This homework set contains no problems."
 msgstr "Это задане не содержит задач."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1231
 msgid "This homework set is closed."
 msgstr "Это задание закрыто. "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1986
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1229
 msgid "This homework set is not yet open."
 msgstr "Это задание пока не открыто. "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:932
-msgid ""
-"This is a blank problem template file and can not be edited directly. Use "
-"the 'NewVersion' action below to create a local copy of the file and add it "
-"to the current problem set."
-msgstr ""
-
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:423
 msgid "This is a new (re-randomized) version of the problem."
 msgstr ""
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:580
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:109
 msgid ""
 "This is a timed test. You will have %quant(%1,hour) and %quant(%2,minute) to"
 " complete the test."
 msgstr ""
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:592
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:119
 msgid ""
 "This is a timed test. You will have "
 "%quant(%1,hour,hours,)%quant(%2,minute,minutes,) to complete the test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:284
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:81
 msgid ""
-"This is the Achievement Editor.  It is used to edit the achievements "
-"available to students.  Please keep in mind the following facts: Achievments"
-" are displayed, and evaluated, in the order they are listed. The \"secret\" "
-"category creates achievements which are not visible to students until they "
-"are earned.  The \"level\" category is used for the achievements associated "
-"to a users level."
+"This is done by first entering the user as a student and then changing the "
+"permission level of the user. First edit the user by clicking on the pencil "
+"next to their name (or using the technique above for several users), then "
+"change their permssion level -- an entry blank at the far right of the "
+"screen, you may have to scroll to see it. The permission levels are"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:481
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:156
 msgid ""
-"This is the classlist editor page, where you can view and edit the records "
-"of all the students currently enrolled in this course.  The top of the page "
-"contains forms which allow you to filter which students to view, sort your "
-"students in a chosen order, edit student records, give new passwords to "
-"students, import/export student records from/to external files, or "
-"add/delete students.  To use, please select the action you would like to "
-"perform, enter in the relevant information in the fields below, and hit the "
-"\"Take Action!\" button at the bottom of the form.  The bottom of the page "
-"contains a table containing the student usernames and their information. "
-"Clicking on the links in the column headers of the table will sort the table"
-" by the field it corresponds to. The Login Name fields contain checkboxes "
-"for selecting the user.  Clicking the link of the name itself will allow you"
-" to act as the selected user.  There is also an edit link following the name"
-" which will take you to a page where you can edit the selected user's "
-"information.  Clicking the emails will allow you to email the corresponding "
-"user.  Clicking the links in the entries in the assigned sets columns will "
-"take you to a page where you can view and reassign the sets for the selected"
-" user. "
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page if you wish to assign a homework set to all students or a large group "
+"of students (e.g. a section)."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1810
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:161
 msgid ""
-"This is the default number of attempts before show me another becomes "
-"available to students.  It can be set to -1 to disable show me another by "
-"default."
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:171
+msgid ""
+"This is done from the \"Hmwk Sets Editor\" page or the \"Instructor tools\" "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:71
+msgid ""
+"This is most easily done by importing a class list. The class list can be "
+"uploaded from your workstation to the server using the File Manager page. "
+"The class list must be a file ending in .lst and must have a specific <a "
+"href=\"http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files\">format</a>."
+" Once the file has been uploaded to the server the file will appear in the "
+"import action pop-up list (5th action). demoCourse.lst is available for most"
+" courses and adds the \"practice users\" which activate guest logins to the "
+"class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:23
+msgid ""
+"This is the administration course which is used to manage courses on this "
+"server.  Use the \"Admin Menu\" to select the desired action."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1996
+msgid ""
+"This is the default number of attempts a student must make before hints will"
+" be shown to the student. Set this to -1 to hide hints.  Note that this can "
+"be overridden with a per problem setting."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:456
+#: /opt/webwork/webwork2/conf/defaults.config:1712
 msgid ""
-"This is the homework sets editor page where you can view and edit the "
-"homework sets that exist in this course and the problems that they contain. "
-"The top of the page contains forms which allow you to filter which sets to "
-"display in the table, sort the sets in a chosen order, edit homework sets, "
-"publish homework sets, import/export sets from/to an external file, score "
-"sets, or create/delete sets.  To use, please select the action you would "
-"like to perform, enter in the relevant information in the fields below, and "
-"hit the \"Take Action!\" button at the bottom of the form.  The bottom of "
-"the page contains a table displaying the sets and several pieces of relevant"
-" information. The Edit Set Data field in the table contains checkboxes for "
-"selection and a link to the set data editing page.  The cells in the Edit "
-"Problems fields contain links which take you to a page where you can edit "
-"the containing problems, and the cells in the edit assigned users field "
-"contains links which take you to a page where you can edit what students the"
-" set is assigned to."
+"This is the default number of attempts before show me another becomes "
+"available to students.  It can be set to -1 to disable show me another by "
+"default."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1699
+#: /opt/webwork/webwork2/conf/defaults.config:1601
 msgid ""
 "This is the number of achievement points given to each user for completing a"
 " problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:166
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:150
 msgid ""
 "This is the only part of the score that is actually saved. This is computed "
 "from the answer sub scores above using the weights shown if they are "
@@ -7002,142 +9461,314 @@ msgid ""
 " scores will be ignored)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:388
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:19
+msgid "This is the standard entry point for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:92
 msgid ""
-"This is the past answer viewer.  Students can only see their answers, and "
-"they will not be able to see which parts are correct.  Instructors can view "
-"any users answers using the form below and the answers will be colored "
-"according to correctness."
+"This is where email messages and templates are saved. You can upload or "
+"download files in this directory if you wish to save the files for later."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2462
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:77
+msgid ""
+"This is where you edit the text of the problem template. Type Ctrl-Enter "
+"while this window has focus to re-render the problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:669
 msgid ""
 "This is your last submission.  If you say yes, then your answers will be "
 "final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2466
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:673
 msgid ""
 "This is your only submission.  If you say yes, then your answers will be "
 "final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3038
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:42
+msgid ""
+"This link gives details for many macros. It links to documentation embedded "
+"in the macro files themselves."
+msgstr ""
+
+#. ('PGMLLab/PGML-lab.pg')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:63
+msgid ""
+"This links to a WeBWorK \"problem\" which allows you to try out fragments of"
+" PGML code. This link will not be available if the file %1 is not located in"
+" the templates directory of the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:33
+msgid "This links to a list of problem authoring techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:39
+msgid "This links to a page describing Math Object usage."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:72
+msgid "This links to problem authoring information on the WeBWorK wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:46
+msgid ""
+"This may be Mathjax, images, or plainText. Only the options that are enabled"
+" for the course will be available to select. This option is only visible if "
+"there is more than one display mode enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:42
+msgid "This option shows all pg problems in the course directory structure."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:47
+msgid ""
+"This option shows all problems in set definition files that are located in "
+"the course directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:44
+msgid ""
+"This option shows all problems in sets that have been created in the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:20
+msgid ""
+"This page allows one to edit the contents of PG problem files as well as set"
+" headers and other files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:20
+msgid ""
+"This page allows users to change their password, email address, and display "
+"settings used in problems. Note that you can hide this page entirely for "
+"students by setting permission levels to login_proctor or higher for the "
+"permissions to change password, change e-mail address, and change display "
+"settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:20
+msgid ""
+"This page allows you to configure course settings such as permission levels,"
+" display modes allowed, default display mode, email feedback behavior, and "
+"much more."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:20
+msgid ""
+"This page displays a student's current achievement level and progress toward"
+" the next level, and lists the rewards and badges that the student has "
+"earned. If rewards have been earned, then the student may also redeem those "
+"rewards."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:26
+msgid ""
+"This page gives access to information about the student, independent of the "
+"homework sets assigned to them."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:20
+msgid ""
+"This page gives information about mass LTI grade updates, and allows you to "
+"trigger a grade update for all users and all sets, all sets for one user, "
+"all users for one set, or one user for one set.  When a user is selected, "
+"the sets drop down menu is updated to only allow selecting sets assigned the"
+" selected user.  Similarly when a set is selected, the user menu is updated "
+"to only allow selecting valid users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:20
+msgid ""
+"This page is a collection of tools to modify users and sets.  These tools "
+"are short cuts for common actions that allow selecting multiple users or "
+"sets to act on at once.  Because multiple users and sets can be acted on at "
+"the same time, it is often more efficient to use this page when modifying "
+"multiple items.  For example, after selecting several users and a set you "
+"can change the close date for all selected users for that set.  This page "
+"also gives access to \"View/Edit all sets for one user\", which can be used "
+"to access settings for all sets including test versions for that user."
+msgstr ""
+
+#. (q(table to save any changes.  Each student's name links to that student's
+#. problem and opens up the)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:20
+msgid ""
+"This page is for manually grading a problem for all assigned students.  The "
+"table of students shows their last answers, percent score, and feedback "
+"comment.  The \"Save\" button is located below the "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:20
+msgid ""
+"This page is used to browse problems that will be used to fill problem sets."
+" The first step is to choose which set you are working on. If you need to "
+"create a new problem set fill in the blank next to the \"Create a New Set in"
+" This Course\" button and then press the button. Then choose which set you "
+"want to work on in the drop down menu."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:20
+msgid ""
+"This page is useful for monitoring student progress on assignments. Student "
+"progress can either be viewed for a single set or for a single student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:20
+msgid ""
+"This page manages all of the homework sets (including quizzes/tests). The "
+"following allow editing directly of a single problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:20
+msgid ""
+"This page shows the student's current grades for all sets they are assigned "
+"to.  Only visible sets are shown to the student, while invisible set names "
+"are italic when viewed as an instructor.  Students can only see the per "
+"problem grades on open assignments."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3169
 msgid "This problem contains a video which must be viewed online."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:602
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:631
 msgid "This problem has more than one part."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2059
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2293
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1323
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1576
 msgid ""
 "This problem has open subproblems.  You can visit them by using the links to"
 " the left or visiting the set page."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem.html.ep:66
+msgid "This problem is not valid."
+msgstr ""
+
 #. ($prettyID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2619
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:399
 msgid "This problem uses the same source file as number %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:418
 msgid "This problem will not count towards your grade."
 msgstr "Эта задача не будет засчитана в ваших баллах. "
 
-#. ($EMAIL)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1109
+#. ($ur->email_address)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:1
 msgid "This sample mail would be sent to %1"
 msgstr ""
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2088
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1399
 msgid ""
 "This score for this problem does not count for the score of problem %1 or "
 "for the set."
 msgstr ""
 
-#. ($message_file,		$merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:167
+#. ($message_file,				$merge_file)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:127
 msgid ""
 "This scoring message is generated from [TMPL]/email/%1. It is merged with "
 "the file [Scoring]/%2. These files can be edited using the \"Email\" link "
 "and the \"File Manager\" link in the left margin."
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2215
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:155
 msgid "This set %1 is assigned to %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2932
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:678
 msgid "This set doesn't contain any problems yet."
 msgstr ""
 
-#. ($beginReducedScoringPeriod, $dueDate, $reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:334
+#. ($c->formatDateTime($reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:44
 msgid ""
 "This set had a reduced scoring period that started on %1 and ended on %2.  "
 "During that period all work counted for %3% of its value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:78
 msgid ""
 "This set has a set-level proctor password to authorize logins. Enter the "
 "password below."
 msgstr ""
 
-#. (CGI::span({class=>$visiblityStateClass}, $visiblityStateText)
-# Context is "This set is visible" or "This set is hidden"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:532
-msgid "This set is %1"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:411
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:59
 msgid "This set is hidden from students."
 msgstr ""
 
 #. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:330
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:40
 msgid ""
 "This set is in its reduced scoring period.  All work counts for %1% of its "
 "value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:65
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:51
+msgid "This set is not assigned to any students."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:57
 msgid "This set is visible to students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:190
-msgid "This set needs to be assigned to you before you can grade it."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:42
+msgid "This set or problem is not valid."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:158
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:164
 msgid ""
 "This set will be unavailable to students until they have earned a certain "
-"score on the sets specified in this field.  The sets should be written as a "
-"comma separated list.  The minimum score required on the sets is specified "
-"in the following field."
+"score on the sets specified in this field. The sets should be written as a "
+"comma separated list. The minimum score required on the sets is specified in"
+" the following field."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:111
+msgid ""
+"This should be done cautiously. Once a student is deleted from a course "
+"their data is lost forever and cannot be recovered. They can be added to the"
+" course as a new student, but all of their homework set assignments and "
+"homework has been permanently deleted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2007
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1962
 msgid "This source file does not exist!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1961
 msgid "This source file is a directory!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1963
 msgid "This source file is not a plain file!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2005
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1960
 msgid "This source file is not readable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:358
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+msgid ""
+"This specifies the number of attempts before hints are shown to students. "
+"The value of -2 uses the default from course configuration. The value of -1 "
+"disables hints. Note that this will only have an effect if the problem has a"
+" hint."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
 msgid ""
 "This specifies the rerandomization period: the number of attempts before a "
 "new version of the problem is generated by changing the Seed value. The "
@@ -7145,134 +9776,175 @@ msgid ""
 "disables rerandomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:651
-msgid ""
-"This table lists the current attempts for this test/quiz, along with its "
-"status, score, start date, and close date. Click on the version link to "
-"access that version. "
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:626
-msgid "This test is closed."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:548
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:81
 msgid "This test requires a proctor password to continue."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:600
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:126
 msgid "This test requires a proctor password to start."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2248
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2323
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:45
+msgid "This will determine if the output is in one or two columns."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:21
 msgid "Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:249
 msgid "Time Interval for New Test Versions (min; 0=infty)"
 msgstr ""
 
-#. ($elapsedTime,$allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:159
+msgid "Time Remaining"
+msgstr ""
+
+#. ($c->{elapsedTime}, sprintf('%.0f', 10 * ($c->{set}->due_date -
+#. $c->{set}->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:336
 msgid "Time taken on test: %1 min (%2 min allowed)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
 msgid "Timestamp"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1610
+#: /opt/webwork/webwork2/conf/defaults.config:1512
 msgid "Timezone for the course"
 msgstr ""
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:512
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:330
 msgid "To access this set you must score at least %1% on set %2."
 msgstr ""
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:514
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:336
 msgid ""
 "To access this set you must score at least %1% on the following sets: %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:53
 msgid ""
 "To add an additional instructor to the new course, specify user information "
 "below. The user ID may contain only numbers, letters, hyphens, periods "
 "(dots), commas,and underscores."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:42
 msgid ""
 "To add the WeBWorK administrators to the new course (as administrators) "
 "check the box below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:239
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:118
+msgid ""
+"To assign one or more sets to an individual student click in the column "
+"\"Assigned Sets\" in the student's row. This will take you to a page where "
+"you can assign and unassign homework sets and change the due dates for "
+"homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:79
 msgid ""
 "To change status (scores or grades) for this student for one set, click on "
 "the individual set link."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:621
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:106
+msgid ""
+"To copy the templates and html folders from an existing course, select the "
+"course below."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:102
 msgid ""
-"To copy problem templates from an existing course, select the course below."
+"To drop a student or students, select them for editing as described above "
+"and then set the pop-up list to enrolled,drop, or audit. Dropped students "
+"cannot log in to the course, are not assigned new homework sets and are not "
+"sent e-mail. They can be re-enrolled simply by changing their status back to"
+" enrolled. No data is lost, any homework sets assigned before they were "
+"dropped are restored unchanged."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2200
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:143
 msgid ""
 "To edit a specific student version of this set, edit (all of) her/his "
 "assigned sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:376
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:29
 msgid ""
-"To edit this text you must first make a copy of this file using the "
-"'NewVersion' action below."
+"To perform an action select the desired action tab and click the submit "
+"button."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:381
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:90
+msgid "To this Problem"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:69
 msgid ""
-"To edit this text you must use the 'NewVersion' action below to save it to "
-"another file."
+"To use the Email merge feature, upload a CSV with calculated grades to the "
+"scoring directory using the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1343
-msgid "To this Problem"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:767
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:58
+msgid "Today"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:33
+msgid "Toggle each of the options to include or not include in the output."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:522
+msgid "Top Score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:118
+msgid "Top level of author information on the wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:114
+msgid "Total Points"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:18
 msgid "Total Points:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:90
 msgid "Totals"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:290
 msgid "Totals only (not problem scores)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:291
 msgid "Totals only, only after answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:236
 msgid "Transfer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:284
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:22
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:35
 msgid "True"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1279
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:245
 msgid "Try it"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:26
 msgid "Tunic of Extension"
 msgstr ""
 
@@ -7280,209 +9952,340 @@ msgstr ""
 msgid "Two Columns"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1470
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:30
 msgid "Type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2325
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:84
+msgid "Type:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:23
 msgid "URI"
 msgstr ""
 
 #. ($achievementName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:297
 msgid "Unable to change the evaluator for set %1. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:819
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1084
+msgid "Unable to change the hardcopy header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1070
+msgid "Unable to change the set header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{fullSetID}, $c->{prettyProblemNumber})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1110
+msgid ""
+"Unable to change the source file path for set %1, problem %2. Unknown error."
+msgstr ""
+
+#. ($c->shortPath($delFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1246
+msgid "Unable to delete backup file \"%1\"."
+msgstr ""
+
+#. ($formatBackupTime)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:571
+msgid "Unable to delete backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:888
+msgid "Unable to make \"%1\" the hardcopy header for %2."
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:860
+msgid "Unable to make \"%1\" the set header for %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:693
 msgid "Unable to obtain error messages from within the PG question."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:384
-msgid "Unable to write to '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:275
+msgid "Unable to open a temporary file at the given location."
+msgstr ""
+
+#. ($c->shortPath($backupFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1233
+msgid "Unable to read backup file \"%1\"."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:636
+msgid "Unable to write to \"%1\": %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2613
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:15
 msgid "Unarchive"
 msgstr ""
 
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2596
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:4
 msgid "Unarchive %1 to course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2581
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:40
 msgid "Unarchive Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2675
-msgid "Unarchive Next Course"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:17
+msgid "Unarchive Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:214
-msgid "Unassign All Sets"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:25
+msgid "Unarchive Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:281
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1306
+msgid "Unarchive Next Course"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:97
 msgid "Unassign from All Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:61
 msgid "Unassign selected sets from selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:58
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:57
 msgid ""
-"Unassignments were not done.  You need to both click to \"Allow unassign\" "
-"and click on the Unassign button."
+"Unassignments were not done.  You need to select \"Allow unassign\" and then"
+" click on the Unassign button."
 msgstr ""
 
 #. ($unattempted, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1047
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:44
 msgid "Unattempted: %1/%2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:53
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:37
 msgid "Unclassified Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:242
 msgid "Ungraded"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3723
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3765
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:58
 msgid "Unhide Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1465
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1151
+msgid "Unkown saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:28
 msgid ""
-"Unlock an additional version of a Gateway Test.  If used before the close "
-"date of the Gateway Test this will allow you to generate a new version of "
-"the test."
+"Unlock an additional version of a test.  If used before the close date of "
+"the test this will allow you to generate a new version of the test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:164
-msgid "Unpack"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:47
+msgid "Unpack Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:113
 msgid "Unpack archives automatically"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2709
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:15
 msgid "Unselect all courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:130
-msgid "Update"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:63
+msgid "Update Display"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:671
-msgid "Update Display"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:84
+msgid "Update Grades"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:930
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:27
+msgid "Update Interval"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:102
 msgid "Update Menus"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:729
-msgid "Update settings and refresh page"
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:51
+msgid "Update aborted. Invalid set %1."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:47
+msgid "Update aborted. Invalid user %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2695
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:67
+msgid "Update set:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:8
 msgid "Update the checked directories?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3544
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:50
+msgid "Update user:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1908
 msgid "Updated location description."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2739
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2917
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:40
 msgid "Upgrade"
 msgstr ""
 
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
 msgid "Upgrade %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1327
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2278
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:97
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:79
 msgid "Upgrade Course Tables"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2693
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2761
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:382
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:42
 msgid "Upgrade Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3010
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:17
+msgid "Upgrade Courses Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:43
+msgid "Upgrade courses from a previous version of WeBWorK."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1582
 msgid "Upgrade process completed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:388
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:65
 msgid "Upload"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2441
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:72
+msgid ""
+"Upload, download and delete text files, including scoring spread sheets, set"
+" definition files, class list spread sheets, and \"PG\" problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:292
 msgid "Use Default Header File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:325
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:127
 msgid "Use Equation Editor?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:204
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:20
 msgid "Use Reward"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2720
-msgid "Use System Default"
-msgstr "Использовать системные настройки по умолчанию"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:516
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:27
 msgid "Use browser back button to return from preview mode."
 msgstr ""
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:506
+#. (tag('b', $c->{achievementID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:16
 msgid "Use in achievement %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:526
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:23
 msgid "Use in new achievement:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:149
 msgid "Use live equation rendering?"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2028
+#: /opt/webwork/webwork2/conf/defaults.config:1929
 msgid "Use log base 10 instead of base <i>e</i>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2034
+#: /opt/webwork/webwork2/conf/defaults.config:1935
 msgid "Use older answer checkers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:234
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:123
+msgid ""
+"Use the \"Create\" and \"Delete\" actions to create or delete achievements. "
+"Note that deleting an achievement will delete all data associated to the "
+"achievement and cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:35
+msgid ""
+"Use the \"Merge file\" drop down menu to select which merge file to use, or "
+"select \"None\" to not use any merge file.  When a merge file is selected, "
+"the data for active students will be displayed above the \"Email Body\".  "
+"This will show you the structure of the merge file and the column variables "
+"associated with each column.  Data that is longer than 7 characters will be "
+"truncated, and the data can be scrolled up and down to see all rows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:28
+msgid ""
+"Use the \"Users\" and \"Sets\" forms to select which users and sets to act "
+"on.  Multiple items can be selected using ctrl-click or shift-click.  The "
+"action buttons are grouped into three categories.  The first is a set of "
+"actions that act on the selected users, the second is a set of actions that "
+"act on the selected sets, and the third is a set of actions for acting on a "
+"combination of sets and users.  If an invalid number of users or sets are "
+"selected, the action will not be preformed, and an error message will be "
+"placed on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:25
+msgid ""
+"Use the editor to edit the evaluator and the action form at the bottom to "
+"save the evaluator. You can either overwrite the current evaluator file or "
+"save as a new evaluator file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:15
 msgid ""
 "Use the interface below to quickly access commonly-used instructor tools, or"
 " select a tool from the list to the left."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:332
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:26
+msgid ""
+"Use the options in the second box to pick a collection of problems decribed "
+"below. In each case, clicking \"View Problems\" will render a fixed number "
+"of problems (default of 20). After problems are shown, there will be options"
+" to show the next/previous batch of problems, add all problems to the target"
+" set (set at the top of the page) or clear the curent batch of problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:27
 msgid ""
 "Use this form to ask your instructor a question, to report a problem with "
 "the WeBWorK system, or to report an error in a problem you are attempting. "
@@ -7490,73 +10293,103 @@ msgid ""
 "system will be included."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:29
+msgid "Use this page to change your password."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:20
+msgid ""
+"Use this page to send emails to active (enrolled or auditing) students.  "
+"Emails can be sent to all active students or selected students.  Use the "
+"\"Students\" form to sort, filter, or format how the user name is displayed."
+"  Click \"Change Display Settings\" to apply any changes.  Use control-click"
+" or shift-click to select multiple students to email."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:67
+msgid ""
+"Used for \"counting\" achievements, which sets the value a counter must "
+"reach in order to earn the achievement. For example this is used counting "
+"the number of completed problems."
+msgstr ""
+
+#. (param('user')
+#. (param('effectiveUser')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:7
+msgid "User \"%1\" not found."
+msgstr ""
+
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:324
 msgid ""
-"User '%1' will not be copied from admin course as it is the initial "
+"User \"%1\" will not be copied from admin course as it is the initial "
 "instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:557
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
-msgid "User ID"
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:34
+msgid "User %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:298
-msgid "User Settings"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:217
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:64
+msgid "User ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:490
-msgid "User Value"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:230
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:28
+msgid "User Settings"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:52
-msgid "User has been assigned to all current sets."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:17
+msgid "User Settings Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:58
-msgid "User has been unassigned from all sets."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:576
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:13
+msgid "User overrides"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:247
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:62
 msgid "User's name is:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:68
-msgid "User's sets have been reassigned."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:60
 msgid "User's username is:"
 msgstr ""
 
 #. ($user, $setID, $j)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1077
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
 msgid ""
 "UserProblem missing for user=%1 set=%2 problem=%3. This may indicate "
 "database corruption."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:51
 msgid "Username"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:499
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:126
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:272
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:9
 msgid "Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:339
 msgid "Users Assigned to Set %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2077
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:17
+msgid "Users Assigned to Set Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:65
 msgid "Users List"
 msgstr "Список пользователей"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1925
+#: /opt/webwork/webwork2/conf/defaults.config:1827
 msgid ""
 "Users at this level and higher are allowed to change display settings used "
 "in pg problems.Note that if it is expected that there will be students that "
@@ -7565,31 +10398,31 @@ msgid ""
 "those students may need to disable MathQuill."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1915
+#: /opt/webwork/webwork2/conf/defaults.config:1817
 msgid ""
 "Users at this level and higher are allowed to change their e-mail address. "
 "Normally guest users are not allowed to change the e-mail address since it "
 "does not make sense to send e-mail to anonymous accounts."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1879
+#: /opt/webwork/webwork2/conf/defaults.config:1781
 msgid ""
 "Users at this level and higher are allowed to change their password. "
 "Normally guest users are not allowed to change their password."
 msgstr ""
 
-#. ($names{$primary}, $names{$secondary}, $names{$ternary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:924
+#. ($c->maketext(FIELD_PROPERTIES()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:316
 msgid "Users sorted by %1, then by %2, then by %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1906
+#: /opt/webwork/webwork2/conf/defaults.config:1808
 msgid ""
 "Users with at least this permission level get a link in the left panel for "
 "reporting bugs to the bug tracking system at bugs.webwork.maa.org."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2140
+#: /opt/webwork/webwork2/conf/defaults.config:2051
 msgid ""
 "Users with this permssion level or greater will automatically be sent "
 "feedback from students (generated when they use the \"Contact instructor\" "
@@ -7598,157 +10431,225 @@ msgid ""
 "permission level to \"nobody\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1348
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:193
 msgid "Uses Math Objects"
 msgstr ""
 
-#. ($default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:197
-msgid "Using contents of the default message %1 instead."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1239
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:18
 msgid "Using what display mode?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:6
 msgid "Using what seed?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:19
+msgid "Using which hardcopy format?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:49
+msgid "Using which hardcopy theme?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:31
+msgid ""
+"Usually means students must demonstrate understanding of facts. This is more"
+" than regurgitating the fact. We use this category for simple and direct "
+"applications of algorithms the student has studied. There should be no "
+"judgement involved in choosing the method. This would include a simple "
+"application of a rule for differentiation (e.g., can combine rules for sums "
+"and constant multiples with one more advanced rule) or for integrals."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Value"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1747
+#: /opt/webwork/webwork2/conf/defaults.config:1649
 msgid "Value of work done in Reduced Scoring Period"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:687
-msgid "Variable Documentation:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config/config_help.html.ep:20
+msgid "Variable Documentation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:115
+msgid "Version"
 msgstr ""
 
 #. ($ver->{version})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:679
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:173
 msgid "Version %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:159
 msgid "Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:43
 msgid "Versions of a set can only be edited for one user at a time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:128
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2419
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2756
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:528
 msgid "View"
 msgstr "Просмотреть"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1000
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:488
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:523
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:681
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:948
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:6
 msgid "View Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:276
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:57
+msgid "View details of student perofrmance either by individual or by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:86
 msgid "View equations as"
 msgstr "Просматривать уравнения как"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:283
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:18
 msgid "View statistics by set"
 msgstr "Посмотреть статистику по заданию"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:19
 msgid "View statistics by student"
 msgstr "Посмотреть статистику по студентам"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:55
+msgid ""
+"View statistics of students' performance on homework either by individual or"
+" by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:14
 msgid "View student progress by set"
 msgstr "Просмотреть текущие результаты студентов по заданиям"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:303
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:15
 msgid "View student progress by student"
 msgstr "Просмотреть результаты по студентам"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:65
 msgid "View/Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:224
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:90
-msgid "Viewing temporary file:"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:104
+msgid "View/Reload"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:766
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:790
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:31
+msgid "View/access current and archived courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:146
+msgid "Viewing Problems in a New Window"
+msgstr ""
+
+#. ($c->{problem}->source_file)
+#. ($screenSetHeader)
+#. ($course_info_path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:81
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:109
+msgid "Viewing temporary file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:25
 msgid "Visibility"
 msgstr "Видимость"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:915
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:7
 msgid "Visible"
 msgstr "Видимое"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:622
 msgid "Visible sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
 msgid "Visible to Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2269
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:844
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "Warning"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2319
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:13
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:117
 msgid "Warning messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1039
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:259
+msgid "Warning messages:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all set-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1035
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all user-related data and is not undoable!"
 msgstr "Предупреждаем: Удаление уничтожит все данные пользователя и это действие необратимо!"
 
-#. ($problem_desc , CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1397
+#. ($problem_desc,				$c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1194
 msgid "Warnings encountered while processing %1. Error text: %2"
 msgstr ""
 
-#. ($copyright_years, $theme, $ww_version, $pg_version)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1261
-msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4 |"
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:39
+msgid ""
+"We use this for carrying out more complicated algorithms, such as "
+"derivatives using both the product and chain rule or integrals which involve"
+" say both a substitution and parts."
+msgstr ""
+
+#. ($ce->{WW_COPYRIGHT_YEARS} || '1996-2023',              $ce->{defaultTheme}
+#. || 'unknown -- set defaultTheme in localOverides.conf',
+#. $ce->{WW_VERSION}         || 'unknown -- set WW_VERSION in VERSION',
+#. $ce->{PG_VERSION}         || 'unknown -- set PG_VERSION in ../pg/VERSION')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:9
+msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2227
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:3
 msgid "WeBWorK Error"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:3
 msgid "WeBWorK Warnings"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1549
+#: /opt/webwork/webwork2/conf/defaults.config:1451
 msgid ""
 "WeBWorK currently has translations for the languages listed in the course "
 "configuration."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:20
+msgid ""
+"WeBWorK does not have a full featured scoring ability. We leave that to your"
+" favorite spreadsheet application."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:38
+msgid ""
+"WeBWorK expects many files to be in certain locations.  The following "
+"describe this. Note that by default the File Manager shows the \"templates\""
+" directory.  Other directories mentioned below are at the same level and "
+"need to be accessed by going up a directory by clicking the \"^\" button "
+"above the file list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:6
 msgid ""
 "WeBWorK has encountered a software error while attempting to process this "
 "problem. It is likely that there is an error in the problem itself. If you "
@@ -7757,7 +10658,7 @@ msgid ""
 " more information."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:6
 msgid ""
 "WeBWorK has encountered warnings while processing your request. If this "
 "occured when viewing a problem, it was likely caused by an error or "
@@ -7767,19 +10668,19 @@ msgid ""
 " warning output below for more information."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:577
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:558
 msgid ""
 "WeBWorK was unable to generate a different version of this problem.  Close "
 "this tab, and return to the original problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:367
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:29
 msgid ""
 "WeBWorK was unable to generate a paper copy of this homework set.  Please "
 "inform your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:78
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
 msgid ""
 "WeBWorK will automatically create users when logging in via the LMS for the "
 "first time. If this flag is enabled then it will also keep the user account "
@@ -7789,36 +10690,44 @@ msgid ""
 "next time the user logs in."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:370
 msgid "Weight"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:6
 msgid "Welcome to WeBWorK!"
 msgstr "Добро пожаловать в WebWork!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:24
+msgid ""
+"What WeBWorK does have is good support for summarizing the scores on WeBWorK"
+" homework sets and tests and exporting them in a form (.csv) which any "
+"spreadsheet can use. WeBWorK reports all of the homework grades with options"
+" shown below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:27
 msgid "What could be inside?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:715
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:17
 msgid "What field should filtered users match on?"
 msgstr "По какому из полей сделапть выборку пользователей."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
 msgid ""
 "When a student has more attempts than is specified here they will be able to"
 " view another version of this problem.  If set to -1 the feature is disabled"
 " and if set to -2 the course default is used."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1899
+#: /opt/webwork/webwork2/conf/defaults.config:1801
 msgid ""
 "When acting as a student, this permission level and higher can submit "
 "answers for that student."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2071
+#: /opt/webwork/webwork2/conf/defaults.config:1972
 msgid ""
 "When numerical answers are checked, most test if the student's answer is "
 "close enough to the programmed answer be computing the error as a percentage"
@@ -7827,7 +10736,7 @@ msgid ""
 "0.1 means 0.1 percent error is allowed.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2098
+#: /opt/webwork/webwork2/conf/defaults.config:2019
 msgid ""
 "When students click the <em>Email Instructor</em> button to send feedback, "
 "WeBWorK fills in the subject line.  Here you can set the subject line.  In "
@@ -7837,14 +10746,32 @@ msgid ""
 "recitation</li><li>%% = literal percent sign</li></ul>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1638
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:35
+msgid ""
+"When the class is very large not all students will be displayed. Using the "
+"first action on this page you can show only the students from a given "
+"recitation or from a given section, or only students whose login or last "
+"name fits a pattern match. The second action will sort the students "
+"currently being displayed. You can also sort the displayed students by "
+"clicking on the active links at the top of each column."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:56
+msgid ""
+"When the message is ready to send, click \"Send Email\". This will queue the"
+" email to be sent, which can take several minutes depending on the number of"
+" students selected.  You will be notified by email once all the emails have "
+"been sent."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1540
 msgid ""
 "When this is on students will see a line on the Grades page which has their "
 "total cumulative homework score.  This score includes all sets assigned to "
 "the student."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:90
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
 msgid ""
 "When this is true, then when a user enters WeBWorK from an external tool "
 "link in the LMS, the bottom of the screen will display the data that the LMS"
@@ -7852,23 +10779,56 @@ msgid ""
 "different LMS systems have different parameters."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1957
+#: /opt/webwork/webwork2/conf/defaults.config:1859
 msgid ""
 "When viewing a problem, WeBWorK usually puts the previously submitted answer"
 " in the answer blank.  Below this level, old answers are never shown.  "
 "Typically, that is the desired behaviour for guest accounts."
 msgstr ""
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:30
+msgid ""
+"When viewing progress for a single student, their grades page is shown which"
+" lists set totals and per problem grades for each set assigned to the "
+"student.  This shows the same information as the statistics page for the "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:26
+msgid ""
+"When viewing set statistics, the drop down menus can be used to show stats "
+"for individual sections, recitations, or problems.  The overall results "
+"include all students who are assigned to the set, while the individual "
+"problem results only include active (have attempted the problem) students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:24
+msgid ""
+"When viewing student progress for a set, the score for the set and the "
+"status for problems in the set are listed for all students.  The table can "
+"be sorted by clicking the links in the table header.  Click the student's "
+"name to access the student's set.  When viewing progress for a test, "
+"additional columns can be shown/hidden by updating the display at the top"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:74
+msgid ""
+"When you unassign a set from students, you destroy all of the data for the "
+"set for those students. If the set is re-assigned to these students, then "
+"they will receive new versions of problems in the set.  Make sure this is "
+"what you want to do before unassigning sets from students."
+msgstr ""
+
+#. (tag('b', $achievementID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:21
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for achievement %1 for this student. Make sure this is what you want to"
 " do."
 msgstr ""
 
-#. (CGI::b({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:146
+#. (tag('b', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:26
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for homework set %1 for this student. You will then need to reassign "
@@ -7876,7 +10836,7 @@ msgid ""
 "problems. Make sure this is what you want to do before unchecking students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:72
 msgid ""
 "When you uncheck a homework set (and save the changes), you destroy all of "
 "the data for that set for this student.   If you reassign the set, the "
@@ -7884,243 +10844,461 @@ msgid ""
 "you want to do before unchecking sets."
 msgstr ""
 
-#. ($self->formatDateTime($set->open_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:343
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:87
+msgid "Wiki summary page for MathObjects"
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:444
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:167
 msgid "Will open on %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:49
+msgid "Word problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:15
 msgid "Worth"
 msgstr "Ценность"
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:382
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:51
+msgid "Write a new PG problem file or edit an existing one."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:188
+msgid ""
+"Write permissions have not been enabled for \"%1\".  Changes must be saved "
+"to another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:630
+msgid ""
+"Write permissions have not been enabled for \"%1\". Changes must be saved to"
+" another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:182
 msgid ""
-"Write permissions have not been enabled for '%1'.  Changes must be saved to "
-"another file for viewing."
+"Write permissions have not been enabled in \"%1\".  Changes must be saved to"
+" a different directory for viewing."
 msgstr ""
 
-#. ($self->shortPath($currentDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:380
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:624
 msgid ""
-"Write permissions have not been enabled in '%1'.  Changes must be saved to a"
+"Write permissions have not been enabled in \"%1\".Changes must be saved to a"
 " different directory for viewing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:178
 msgid ""
 "Write permissions have not been enabled in the templates directory.  No "
 "changes can be made."
 msgstr "Папка templates закрыта для записи.  Изменения не могут быть записаны."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:380
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:620
+msgid ""
+"Write permissions have not been enabled in the templates directory. No "
+"changes can be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:287
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:330
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:509
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:82
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:657
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:67
 msgid "Yes"
 msgstr "Да"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:500
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:454
 msgid ""
 "You are currently checking answers to a different version of your problem - "
 "these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:511
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:470
 msgid ""
 "You are currently previewing answers to a different version of your problem "
 "- these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr ""
 
-#. ($userSet->set_id, $r->connection->remote_ip)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:270
+#. ($ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:18
+msgid ""
+"You are in the Reduced Scoring Period.  All work counts for %1% of the "
+"original."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:183
+msgid "You are not allowed to act as a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:188
+msgid "You are not allowed to assign homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:383
+msgid "You are not allowed to delete %1."
+msgstr ""
+
+#. ($userSet->set_id, $c->tx->remote_address)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:261
 msgid ""
 "You are not allowed to generate a hardcopy for %1 from your IP address, %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2049
-msgid "You are not authorized to access the Instructor tools."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:185
+msgid "You are not allowed to modify homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:191
+msgid "You are not allowed to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:4
+msgid "You are not allowed to send e-mail."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:2
+msgid "You are not authorized to access instructor tools"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:4
+msgid "You are not authorized to access instructor tools."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:9
+msgid "You are not authorized to assign homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:10
+msgid "You are not authorized to create or delete courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:2
+msgid "You are not authorized to edit achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:28
+msgid "You are not authorized to edit user specific information."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:37
+msgid "You are not authorized to grade homework sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:271
-msgid "You are not authorized to access the instructor tools."
-msgstr "У вас нет прав доступа к инструментам инструктора. "
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:8
+msgid "You are not authorized to manage course files"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:392
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:33
 msgid "You are not authorized to modify homework sets."
 msgstr "У вас нет прав доступа для изменения заданий."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:35
 msgid "You are not authorized to modify problems."
 msgstr "У вас нет прав доступа для изменения задач."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:396
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:39
 msgid "You are not authorized to modify set definition files."
 msgstr "У вас нет прав доступа для изменения файлов отпределения заданий. "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:15
 msgid "You are not authorized to modify student data"
 msgstr "У вас нет прав доступа для изменения данных студентов. "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:11
+msgid "You are not authorized to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:3
+msgid "You are not authorized to modify the course configuration."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:230
 msgid "You are not authorized to perform this action."
 msgstr "У вас нет прав доступа для выполнения этого действия. "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:260
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:11
+msgid "You are not authorized to score sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:13
+msgid "You are not authorized to send mail to students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:11
+msgid "You are not authorized to update lti scores"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers.html.ep:8
+msgid "You are not authorized to view past answers"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:251
 msgid ""
 "You are not permitted to generate a hardcopy for a set with hidden work."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:236
 msgid "You are not permitted to generate a hardcopy for an unopened set."
 msgstr ""
 
-#. ($showMeAnother{MaxReps},					$solutionShown)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:559
+#. ($showMeAnother{MaxReps},						$solutionShown)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:532
 msgid ""
 "You are only allowed to click on Show Me Another %quant(%1,time,times) per "
 "problem. %2 Close this tab, and return to the original problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2051
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2070
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:265
 msgid "You are out of time!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:374
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:36
 msgid "You can also examine the following temporary files: "
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGanswermacros.pl:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:108
+msgid ""
+"You can assign selected achievements to all users by using the \"Assign\" "
+"action action and selecting which achievements to assign.  You can select "
+"which users to assign/unassign to an achievement by clicking on the link in "
+"the \"Edit Users\" column."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1039
+msgid ""
+"You can change the file path for this problem manually from the \"Hmwk Sets "
+"Editor\" page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:27
+msgid ""
+"You can check the boxes to the right of the sets and click \"Generate "
+"Hardcopy for Selected Sets\" to generate a PDF hardcopy of the selected "
+"sets. You can generate hardcopies for multiple users including their answers"
+" as well. Note that students will only be able to generate hardcopies of a "
+"single set at a time. Students will only be able to include answers in the "
+"hardcopy after the answer date."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:127
+msgid ""
+"You can delete problems by clicking the \"Delete it?\" check box and saving."
+" If the set is already active it is recommended that you instead use the "
+"\"Mark Correct?\" problem to mark a particular problem correct for all "
+"students."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGanswermacros.pl:1616
 msgid "You can earn partial credit on this problem."
 msgstr "Балл за эту задачу может дробиться. "
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:382
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:142
+msgid ""
+"You can edit a problem by clicking the \"Edit Problem\" icon to the right of"
+" the problem number. This will open the problem in the PG problem editor in "
+"a new tab or window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:92
+msgid ""
+"You can edit a single achievement by clicking on the pencil icon next to the"
+" achievement ID.  You can edit multiple achievements by selecting which "
+"achievements to edit, then click the \"Edit\" button. You can edit all of "
+"the achievements by changing which achievements to edit form \"selected "
+"achievements\" to \"all achievements\", or click the checkbox next to the "
+"Achievement ID to select all achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:44
+msgid ""
+"You can edit the class list data for a single student by clicking on the "
+"pencil icon next to their login name. To edit several students at once click"
+" on the \"Select\" checkbox next to their names, click on the radio button "
+"for editing selected users and then click the \"Edit\" button. You can also "
+"edit all visible users (those students currently being displayed) or even "
+"all users in the course although this last option might take a long time to "
+"load for a large class."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:397
 msgid "You can get a new version of this problem after the due date."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1368
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:101
+msgid ""
+"You can import/export from their respective action tab.  Exporting saves "
+"information about the achievement as a .axp file which is a CSV that lists "
+"each achievements information.  You can import .axp files that have been "
+"previously exported."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:769
 msgid "You can not specify an absolute path"
 msgstr ""
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1121
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:549
 msgid "You can only %1 one file at a time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:92
 msgid "You can only download regular files."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:591
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:197
 msgid "You can only edit text files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:908
-msgid "You can only unpack files ending in '.tgz', '.tar' or '.tar.gz'"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:374
+msgid "You can only unpack files ending in \".tgz\", \".tar\" or \".tar.gz\""
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:134
+msgid ""
+"You can render a problem by clicking the \"Render Problem\" icon to the "
+"right of the problem number. The display mode used to render the problem is "
+"chosen using the drop down menu. You can render all problems using the "
+"\"Render All\" button. \"Hide All\" will hide all rendered problems. It is "
+"also useful to collapse problem details when doing this, as it makes it "
+"easier to drag problems around."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:120
+msgid ""
+"You can reorder problems by clicking on the arrow icon and dragging the "
+"problem. You will see a box showing you where the problem will be placed. "
+"When problems are reordered any holes in the numbering will be filled in."
 msgstr ""
 
 #. ($showMeAnother{MaxReps} >= $showMeAnother{Count}
 #. ? ($showMeAnother{MaxReps} - $showMeAnother{Count})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1895
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:44
 msgid ""
 "You can use this feature %quant(%1,more time,more times,as many times as you"
 " want) on this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:439
 msgid "You can't download directories"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:440
 msgid "You can't download files of that type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:584
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:192
 msgid "You can't edit a directory"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:528
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
 msgid "You can't view files of that type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:985
 msgid "You cannot archive the course you are currently using."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1712
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:850
 msgid "You cannot delete the course you are currently using."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1081
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:378
 msgid "You cannot delete yourself!"
 msgstr "Вы не можете удалить самого себя! "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:579
 msgid "You did not specify a new set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:232
 msgid "You didn't enter any message."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:312
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:303
 msgid "You do not have permission to access the requested file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:159
 msgid "You do not have permission to change the hardcopy theme."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:578
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:186
 msgid "You do not have permission to edit this file."
 msgstr ""
 
 #. ($hardcopy_format)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:151
 msgid "You do not have permission to generate hardcopy in %1 format."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1639
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1161
 msgid "You do not have permission to view the details of this error."
 msgstr "У вас нет оазрешений посмотреть детали этой ошибки."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements.html.ep:13
 msgid "You don't have any Achievement data associated to you!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:237
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:51
 msgid "You don't have any rewards!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2109
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:325
 msgid "You exceeded the allowed time."
 msgstr ""
 
-#. ($numLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2082
+#. ($c->{numAttemptsLeft})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:277
 msgid "You have %1 attempt(s) remaining on this test."
 msgstr ""
 
-#. ($numLeft,						$numLeft - 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2458
+#. ($c->{numAttemptsLeft},								$c->{numAttemptsLeft} - 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:664
 msgid ""
 "You have %1 submissions remaining for this test.  If you say yes, then you "
 "will have %quant(%2,submission) remaining. Once all submissions have been "
@@ -8128,724 +11306,702 @@ msgid ""
 "work this test version."
 msgstr ""
 
-#. ($attemptsLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2012
+#. ($problem->max_attempts - $attempts)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1270
 msgid "You have %negquant(%1,unlimited attempts,attempt,attempts) remaining."
 msgstr ""
 
 #. ($attempts_before_rr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1217
 msgid ""
 "You have %quant(%1,attempt,attempts) left before new version will be "
 "requested."
 msgstr ""
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:506
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:44
 msgid ""
 "You have %quant(%1,hour) and %quant(%2,minute) remaining to complete the "
 "currently open test."
 msgstr ""
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:518
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:54
 msgid ""
 "You have %quant(%1,hour,hours,)%quant(%2,minute,minutes,) remaining to "
 "complete the currently open test."
 msgstr ""
 
-#. ($minutes,									$seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:529
+#. ($minutes,							$seconds)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:64
 msgid ""
 "You have %quant(%1,minute) and %quant(%2,second) remaining to complete the "
 "currently open test."
 msgstr ""
 
 #. ($seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:72
 msgid ""
 "You have %quant(%1,second) remaining to complete the currently open test."
 msgstr ""
 
 #. ($attempts)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1243
 msgid "You have attempted this problem %quant(%1,time,times)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:1
 msgid "You have been logged out of WeBWorK."
 msgstr "Вы вышли из WebWork. "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2065
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:260
 msgid "You have less than 1 minute to complete this test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2046
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:241
 msgid "You have less than 45 seconds left!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2043
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:240
 msgid ""
 "You have less than 90 seconds left to complete this assignment. You should "
 "finish it soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1004
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:452
 msgid "You have not chosen a file to upload."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:845
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "You have requested that the following items be deleted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1137
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:565
 msgid "You have specified an illegal file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:766
 msgid "You have specified an illegal path"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:520
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:13
+msgid "You have specified an illegal working directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:481
 msgid ""
 "You may check your answers to this problem without affecting the maximum "
 "number of tries to your original problem."
 msgstr ""
 
-#. ($perm_multiuser ? "to privileged users or" : "")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:613
+#. ($multiuser ? 'to privileged users or' : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:69
 msgid ""
 "You may choose to show any of the following data. Correct answers, hints, "
 "and solutions are only available %1 after the answer date of the homework "
 "set."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:63
+msgid "You may not change this user's password!"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:646
 msgid "You may not change your answers when going on to the next part!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1831
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:58
 msgid "You may not change your own password here!"
 msgstr "Здесь Вы не можете поменять Ваш собственный пароль. "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1132
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:560
 msgid "You may not follow symbolic links"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2134
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:350
 msgid "You may still check your answers."
 msgstr ""
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:172
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:143
+msgid ""
+"You may want to create an unattached problem if you are using the current "
+"problem as a model for a new problem. You can add the new file to a homework"
+" set from the Library Browser or via the set detail page of the Hmwk Sets "
+"Editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:165
+msgid ""
+"You might want to do this if you want to give full credit to everyone on a "
+"particular problem that was not worded correctly, or wasn't working "
+"properly. This is done from the \"Hmwk Sets Editor\" page or the "
+"\"Instructor Tools\" page."
+msgstr ""
+
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:8
 msgid "You must access assignments from your Course Management System (%1)."
 msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:67
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before Show Me Another "
-"is available."
+"You must attempt this problem %quant(%1,time) before this feature is "
+"available"
 msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1923
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:545
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before this feature is "
-"available"
+"You must attempt this problem %quant(%1,time,times) before Show Me Another "
+"is available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:699
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:259
 msgid "You must confirm the password for the initial instructor."
 msgstr ""
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:368
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? $c->link_to(                                                  $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:195
 msgid "You must log into this set via your Learning Management System (%1)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:76
-msgid "You must provide a student ID, a set ID, and a problem number."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:979
+msgid "You must select a course to archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:585
 msgid "You must select a course to rename."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:351
 msgid "You must select at least one file for the archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:777
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:312
 msgid "You must select at least one file to delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:115
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:106
 msgid "You must select one or more sets for scoring!"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:749
 msgid "You must specify a %1 name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:682
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:242
 msgid "You must specify a course ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2026
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2561
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2777
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3865
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2086
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:848
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:983
 msgid "You must specify a course name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:775
 msgid "You must specify a file name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:705
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:586
+msgid "You must specify a file name in order to save a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:265
 msgid "You must specify a first name for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:708
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:268
 msgid "You must specify a last name for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1382
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:606
 msgid "You must specify a new institution for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1364
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:588
 msgid "You must specify a new name for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:603
 msgid "You must specify a new title for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:256
 msgid "You must specify a password for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:448
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:440
 msgid "You must specify a user ID."
 msgstr "Надо указать ID пользователя. "
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:711
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:271
 msgid "You must specify an email address for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:331
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:138
 msgid "You must specify an file name in order to save a new file."
 msgstr ""
 
 #. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:505
 msgid ""
-"You must use your Learning Managment System (%1) to access this set.  Try "
-"logging in to the Learning Managment System and visiting the set from there."
+"You must use your Learning Management System (%1) to access this set.  Try "
+"logging in to the Learning Management System and visiting the set from "
+"there."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1730
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
 msgid "You need to select a \"Target Set\" before you can edit it."
 msgstr ""
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1126
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:554
 msgid "You need to select a file to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1877
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:555
 msgid "You need to select a set definition file to view."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1853
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:537
 msgid "You need to select a set from this course to view."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1837
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:524
 msgid "You need to select a set to view."
 msgstr ""
 
-#. (wwRound(0, $problemResult->{score} * 100)
-#. (wwRound(0, $pg->{result}->{score} * 100)
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2007
+#. (wwRound(0,
+#. compute_reduced_score($ce, $problem, $set, $pg->{result}{score},
+#. $c->submitTime)
+#. (% wwRound(0, $rh_result->{problem_result}{score} * 100)
+#. (wwRound(0, $rh_result->{problem_result}{score} * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1251
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:48
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:29
 msgid "You received a score of %1 for this attempt."
 msgstr ""
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2075
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1363
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem and its graded subproblems."
 msgstr ""
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2078
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1375
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem."
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1343
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:740
 msgid "Your %1 name contains illegal characters"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1344
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:743
 msgid "Your %1 name may not begin with a dot"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:746
 msgid "Your %1 name may not contain a path component"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:540
-msgid ""
-"Your LTI OAuth verification failed.  If this recurs, please speak with your "
-"instructor"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:528
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:539
-msgid ""
-"Your authentication failed.  Please return to Oncourse and login again."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:229
-msgid ""
-"Your authentication failed.  Please try again. Please speak with your "
-"instructor if you need help."
-msgstr ""
-
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3033
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3162
 msgid "Your browser does not support the video tag."
 msgstr ""
 
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4078
-msgid "Your current branch of PG is up to date with branch %1 in remote %2."
-msgstr ""
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4016
-msgid ""
-"Your current branch of WeBWorK is up to date with branch %1 in remote %2."
-msgstr ""
-
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4113
-msgid "Your current branch of the Open Problem Library is up to date."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:134
 msgid "Your display options have been saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:195
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
 msgid "Your email address has been changed."
 msgstr "Ваш адрес e-mail изменён."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:772
 msgid "Your file name contains illegal characters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:118
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:40
 msgid "Your file name is not valid! "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:16
 msgid "Your message was sent successfully."
 msgstr ""
 
-#. ($lastScore,$notCountedMessage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2010
+#. (wwRound(0, $problem->status * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1261
 msgid "Your overall recorded score is %1.  %2"
 msgstr ""
 
-#. ($versionNumber, wwRound(2,$recordedScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2107
-msgid "Your recorded score on this test (version %1) is %2/%3."
+#. ('<span id="test-recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:179
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:197
+msgid "Your recorded score for this version is %1/%2 (%3%)."
+msgstr ""
+
+#. ($setVersionID,                                         '<span id="test-
+#. recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:317
+msgid "Your recorded score on this test (version %1) is %2/%3 (%4%)."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:603
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:634
 msgid "Your score for this attempt is for this part only;"
 msgstr ""
 
 #. ($testNounNum)
 # $testNounNum is either "test (#)" or "submission (#)"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1977
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:142
 msgid "Your score on this %1 WAS recorded."
 msgstr ""
 
-#. ($testNoun,$attemptScore,$totPossible)
+#. ($testNoun, $c->{attemptScore}, $c->{totalPossible})
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1982
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:148
 msgid "Your score on this %1 is %2/%3."
 msgstr ""
 
 #. ($testNounNum)
 # $testNounNum is either "test (#)" or "submission (#)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1973
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:138
 msgid "Your score on this %1 was NOT recorded."
 msgstr ""
 
-#. ($attemptScore,$totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2019
+#. ($c->{attemptScore}, $c->{totalPossible})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:192
 msgid "Your score on this (checked, not recorded) submission is %1/%2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1963
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2277
-msgid "Your score on this problem was recorded."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1619
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1027
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:172
 msgid ""
 "Your score was not recorded because there was a failure in storing the "
 "problem record to the database."
 msgstr "Ваши баллы не записаны, поскольку произошла ошибка при сохранении результатов по задаче в базу данных."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:272
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:276
 msgid "Your score was not recorded because this homework set is closed."
 msgstr "Ваши баллы не записаны, поскольку задание закрыто."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:283
 msgid ""
 "Your score was not recorded because this problem has not been assigned to "
 "you."
 msgstr "Ваши баллы не записаны, поскольку эта задача вам не назначена."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1643
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1049
 msgid ""
 "Your score was not recorded because this problem set version is not open."
 msgstr ""
 
-#. ($elapsed, $allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1658
+#. ($elapsed,                                              # Assume the
+#. allowed time is an even number of minutes.
+#. ($set->due_date - $set->open_date)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1063
 msgid ""
 "Your score was not recorded because you have exceeded the time limit for "
 "this test. (Time taken: %1 min; allowed: %2 min.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1052
 msgid ""
 "Your score was not recorded because you have no attempts remaining on this "
 "set version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1661
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1067
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:278
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:53
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:31
 msgid "Your score was not recorded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1998
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:163
 msgid "Your score was not successfully sent to the LMS."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:166
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:170
 msgid "Your score was recorded."
 msgstr "Ваши баллы записаны"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1997
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:255
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:162
 msgid "Your score was successfully sent to the LMS."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:540
 msgid "Your session has timed out due to inactivity. Please log in again."
 msgstr "Ваша сессия закрыта по причине длительного отсутствия обращений к серверу. Пожалуйста, авторизуйтесь повтрно."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4126
-msgid "Your systems are up to date!"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1396
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1403
-msgid "[Edit]"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:824
-msgid "a duplicate of the first selected achievement."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:17
+msgid "a duplicate of the first selected achievement"
 msgstr ""
 
 # Context is "Create set ______ as a duplicate of the first selected set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:17
 msgid "a duplicate of the first selected set"
 msgstr "дубликат первого из выбраных заданий"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:823
-msgid "a new empty achievement."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:16
+msgid "a new empty achievement"
 msgstr ""
 
 # Context is "Create set ______ as a new empty set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:16
 msgid "a new empty set"
 msgstr "новое пустое задание"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1281
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:9
 msgid "a single set"
 msgstr "одно задаие"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:429
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:130
 msgid "add problems"
 msgstr ""
 
 #. ($setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1751
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
 msgid "addGlobalSet %1 in ProblemSetList:  %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:456
-msgid "added missing permission level for user"
-msgstr ""
-
 # #short for administrator
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "admin"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1051
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:487
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:604
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:7
 msgid "all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1377
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:66
 msgid "all current users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:327
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:70
 msgid "all set dates for one <b>user</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:622
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1434
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:667
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:840
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1995
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:7
 msgid "all sets"
 msgstr "все задания"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1981
 msgid "all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1256
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:701
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:946
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:997
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:6
 msgid "all users"
 msgstr "всех пользователей"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:120
 msgid "all users for one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:23
 msgid "alphabetically"
 msgstr ""
 
-#. ($count,$numSets)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:626
+#. ($count, $numSets)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1999
 msgid "an impossible number of sets: %1 out of %2"
 msgstr ""
 
-#. ($count,$numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:606
+#. ($count, $numUsers)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1985
 msgid "an impossible number of users: %1 out of %2"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:647
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:658
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:610
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:621
 msgid "answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:30
 msgid "any users"
 msgstr "любых пользователей"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:720
-msgid "avg attempts"
-msgstr ""
-
 # Context is "Append ____ blank problem template(s) to end of homework set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2956
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:689
 msgid "blank problem template(s) to end of homework set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:24
 msgid "by last login date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1552
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:688
 msgid "changes abandoned"
 msgstr "изменение не сохранены"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1216
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1651
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:633
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:795
 msgid "changes saved"
 msgstr "изменения сохранены"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:80
 msgid "class list data for selected <b>users</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:31
 msgid "close"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:671
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:259
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:239
 msgid "correct"
 msgstr "верно"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:582
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:239
 msgid "course files"
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:458
 msgid "deleted %1 sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:152
 msgid "editing all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:333
 msgid "editing all sets"
 msgstr "редактороваать все задания"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:963
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:328
 msgid "editing all users"
 msgstr "редактировать всех пользователей"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:860
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:336
 msgid "editing listed sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:154
 msgid "editing selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:339
 msgid "editing selected sets"
 msgstr "редактировать выбранные задания"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:334
 msgid "editing selected users"
 msgstr "редактировать выбранных пользователей"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:331
 msgid "editing visible users"
 msgstr "редактировать видимых пользоваателей"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:360
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:90
 msgid "email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:87
-msgid "email:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:42
 msgid "empty"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:672
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:10
 msgid "enter matching set IDs below"
 msgstr "ниже введите ID для требуемых заданий"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:220
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:31
 msgid "entry rows."
 msgstr ""
 
 #. ($restrictLoc, $setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1761
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:904
 msgid "error adding set location %1 for set %2: %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1092
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1487
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:542
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:643
 msgid "export abandoned"
 msgstr "экспортирование отменено"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1068
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:527
 msgid "exporting all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1071
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:530
 msgid "exporting selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:359
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:89
 msgid "first name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:747
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:72
 msgid "for"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:149
 msgid "for one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:103
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:94
 msgid "for one <b>user</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1014
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:349
 msgid "giving new passwords to all users"
 msgstr "назначить новый пароль всем пользователям"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1020
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:355
 msgid "giving new passwords to selected users"
 msgstr "назначить новый пароль выбранным пользователям"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1017
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:352
 msgid "giving new passwords to visible users"
 msgstr "назначить новый пароль видимым пользователям"
 
 #. ($j, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1069
 msgid "global %1 for set %2 not found."
 msgstr ""
 
-#. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1146
-msgid "global set %1 not found."
-msgstr ""
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "grade_proctor"
 msgstr ""
@@ -8854,393 +12010,375 @@ msgstr ""
 msgid "guest"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1589
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:949
 msgid "hidden"
 msgstr "скрыто"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "hidden from"
 msgstr "скрыто от"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "hidden from students"
-msgstr "скрыто от студентов"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:217
+msgid "homework"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:83
+msgid "html directory"
+msgstr ""
 
-#. ('j','k','_0')
-#. ('j','k')
+#. ('j', 'k', '_0')
+#. ('j', 'k')
 # doe snot need to be translated
-#: /opt/webwork/pg/lib/Parser/List/Vector.pm:35
-#: /opt/webwork/pg/lib/Value/Vector.pm:278
-#: /opt/webwork/pg/macros/contextLimitedVector.pl:93
+#: /opt/webwork/pg/lib/Parser/List/Vector.pm:39
+#: /opt/webwork/pg/lib/Value/Vector.pm:303
+#: /opt/webwork/pg/macros/contexts/contextLimitedVector.pl:95
 msgid "i"
 msgstr ""
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:773
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:840
 msgid "if"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1626
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:622
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:721
 msgid "illegal character in input: '/'"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:246
 msgid "incorrect"
 msgstr "неверно"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:441
 msgid "index"
 msgstr ""
 
 #. ($restrictLoc, $setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:911
 msgid "input set location %1 already exists for set %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:358
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:551
+msgid "insufficient permission to edit %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:220
+msgid "just-in-time"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:88
 msgid "last name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:841
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:893
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:9
 msgid "listed sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3169
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:87
 msgid "locations selected below"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:665
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:59
 msgid "login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "login ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:94
 msgid "login name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:86
-msgid "login/studentID:"
-msgstr ""
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "login_proctor"
 msgstr ""
 
 # Context is "Set _____ made visibile for _____ users"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "made visible for"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:419
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:493
 msgid "max"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1282
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:10
 msgid "multiple sets"
 msgstr "множество заданий"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:489
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:171
 msgid "new set:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:393
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:109
 msgid "new users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:6
 msgid "no achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:740
-msgid "no achievements."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:519
-msgid "no attempt recorded"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:86
 msgid "no location"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:620
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1056
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1993
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:6
 msgid "no sets"
 msgstr "ни одного задания"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:600
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1979
 msgid "no students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:931
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1190
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:702
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:31
 msgid "no users"
 msgstr "никого из пользователей"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/permission.pm:26
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "nobody"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:114
 msgid "nth colum of merge file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:225
-msgid "number of students not defined"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:70
 msgid "of"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:128
 msgid "one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:556
-msgid "one <b>set</b> for  <b>users</b>"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:225
+msgid "one <b>set</b> for <b>users</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:540
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:211
 msgid "one <b>user</b> (on one <b>set</b>)"
 msgstr ""
 
 # Context is Assign this set to which users?  "only ____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1378
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:67
 msgid "only"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:17
 msgid "only best scores"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3472
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:357
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:448
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:88
 msgid "or"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1141
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:59
 msgid "or Problems from"
 msgstr ""
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:776
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:843
 msgid "otherwise"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:19
 msgid "overwrite"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:664
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:627
 msgid "part"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1383
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:499
 msgid "permissions for %1 not defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "point"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "points"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:509
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:20
 msgid "preserve"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2360
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:576
 msgid "preview answers"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:653
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:616
 msgid "problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:632
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:41
 msgid "problems"
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:219
+msgid "proctored test"
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "professor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:360
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:451
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:89
 msgid "progress"
 msgstr ""
 
 #. ($line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2212
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1409
 msgid "readSetDef error, can't read the line: ||%1||"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:93
 msgid "recitation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:654
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:53
 msgid "recitation #"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:497
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:549
 msgid "record for visible user %1 not found"
 msgstr ""
 
 #. ($restrictLoc)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1767
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:918
 msgid ""
 "restriction location %1 does not exist.  IP restrictions have been ignored."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:670
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "row"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:91
 msgid "score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:362
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:92
 msgid "section"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:643
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:47
 msgid "section #"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:88
-msgid "section:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:159
 msgid "selected <b>sets</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:524
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:197
 msgid "selected <b>users</b> to selected <b>sets</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:441
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:488
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:605
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:8
 msgid "selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:741
-msgid "selected achievements."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1057
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1436
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:669
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:842
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:894
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:991
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:8
 msgid "selected sets"
 msgstr "выбранные задания"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1053
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:703
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:999
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:8
 msgid "selected users"
 msgstr "выбранных пользователей"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:624
-msgid "set"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:628
-msgid "sets"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:12
 msgid "sets hidden from students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:670
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:11
 msgid "sets visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:716
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:281
 msgid "showing all sets"
 msgstr "оторажены все задания"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:763
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:277
 msgid "showing all users"
 msgstr "отображены все пользователи"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:725
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:290
 msgid "showing matching sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:286
 msgid "showing matching users"
 msgstr "отображены пользователи, удовлетворяющие критерию выбрки"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:719
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:284
 msgid "showing no sets"
 msgstr "ни одного задания не показано"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:766
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:280
 msgid "showing no users"
 msgstr "ни одного пользователя не показано"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:722
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:287
 msgid "showing selected sets"
 msgstr "отображены выбранные задания"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:769
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:283
 msgid "showing selected users"
 msgstr "отображены выбраные пользователи"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:299
 msgid "showing sets that are hidden from students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:732
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:296
 msgid "showing sets that are visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:72
 msgid "shown"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:162
 msgid "still open"
 msgstr ""
 
@@ -9248,16 +12386,16 @@ msgstr ""
 msgid "student"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
 msgid "submission"
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:133
 msgid "submission (version %1)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
 msgid "summary"
 msgstr ""
 
@@ -9265,135 +12403,130 @@ msgstr ""
 msgid "ta"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:90
+msgid "templates/email directory"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:95
+msgid "templates/macros directory"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
 msgid "test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:23
 msgid "test date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:621
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:29
 msgid "test time"
 msgstr ""
 
-#. ($forcedSourceFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:987
-msgid "the original path to the file is %1"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:119
 msgid "then delete them"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "time"
-msgstr "время"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:165
 msgid "time limit exceeded"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "times"
-msgstr "раз"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:35
+msgid "time remaining"
+msgstr ""
 
 # Context is Assign ____ to _____
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:183
 msgid "to"
 msgstr ""
 
 #. ($ce->{institutionName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:399
 msgid "to %1 main web site"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:524
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:381
 msgid "to courses page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:436
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:135
 msgid "to one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:764
-msgid "top score"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:432
 msgid "total"
 msgstr ""
 
 #. ($ce->{webworkDirs}{logs})
 #. ($ce->{webworkDirs}{tmp})
 #. ($ce->{webworkDirs}{DATA})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:47
 msgid "unable to write to directory %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:333
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:49
 msgid "unlimited"
 msgstr "неогр. кол-во"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:14
 msgid "unlimited reusability"
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:609
-msgid "userID: %1 --"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:652
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:259
 msgid ""
 "username, last name, first name, section, achievement level, achievement "
 "score,"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:704
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:10
 msgid "users who match on selected field"
 msgstr "пользователи, которые соответствуют условию выборки по выбранному полю"
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
+#. ($set->version_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:295
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:408
+msgid "version %1"
+msgstr ""
+
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:134
 msgid "version (%1)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1591
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1888
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:820
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:951
 msgid "visible"
 msgstr "видимый"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "visible to students"
-msgstr "выдимы студентам"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1257
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:947
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:998
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:7
 msgid "visible users"
 msgstr "видимых пользователей"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:485
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:500
 msgid "when you submit your answers"
 msgstr ""
 
 #. ($dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1532
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:623
 msgid "won't be able to read from file %1/%2: does it exist? is it readable?"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:604
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:638
 msgid "your overall score is for all the parts combined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:231
 msgid "your students"
 msgstr ""
diff --git a/lib/WeBWorK/Localize/tr.po b/lib/WeBWorK/Localize/tr.po
index 0e608a284b..1f0f78bf31 100644
--- a/lib/WeBWorK/Localize/tr.po
+++ b/lib/WeBWorK/Localize/tr.po
@@ -9,256 +9,319 @@ msgstr ""
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: 2013-01-27 17:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Turkish (http://www.transifex.com/webwork/webwork2/language/tr/)\n"
+"Language-Team: Turkish (http://app.transifex.com/webwork/webwork2/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:428
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:449
+#. ($_->{problem}->version_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:69
+msgid " (version %1)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:265
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:284
 msgid " Answers Available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:735
-msgid "# of active students"
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1148
+msgid " No changes have been made to set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:506
-msgid "#corr"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:130
+msgid "\"Act as\" a student"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:508
-msgid "#incorr"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:31
+msgid "\"Edit Assigned Users\" column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2249
-msgid "% Score:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:24
+msgid "\"Edit Problems\" column"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:187
+msgid "# of Active Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:85
+msgid "# of attempts"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:333
+msgid "#corr"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:685
-msgid "% correct"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:335
+msgid "#incorr"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:174
+msgid "% Average with Review"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:702
-msgid "% correct with review"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:66
+msgid "% Score with Review"
 msgstr ""
 
-# Percent students
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:762
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:792
-msgid "% students"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:479
+msgid "% Score:"
 msgstr ""
 
 #. ($achievement->{points})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:24
 msgid "%1 Points:"
 msgstr ""
 
-#. ($lib eq '' ? $r->maketext('Local')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:476
+#. ($lib eq '' ? maketext('Local')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:9
 msgid "%1 Problems:"
 msgstr ""
 
-#. ($itemCounts{$item->id()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:189
+#. ($itemCounts->{ $item->id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:12
 msgid "%1 remaining"
 msgstr ""
 
-#. ($numAdded, $numSkipped, join(', ', @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1410
+#. ($count)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2001
+msgid "%1 sets"
+msgstr ""
+
+#. ($numAdded,                     $numSkipped,
+#. join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:608
 msgid "%1 sets added, %2 sets skipped. Skipped sets: (%3)"
 msgstr "%1 set eklendi, %2 sets atlandı. Atlanan setler: (%3)"
 
-#. ($numExported, $numSkipped, ($numSkipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1526
+#. ($numExported, $numSkipped,                     $numSkipped ? $c->tag('ul',
+#. $c->c(map { $c->tag('li', $_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:673
 msgid "%1 sets exported, %2 sets skipped. Skipped sets: (%3)"
 msgstr "%1 set aktarıldı, %2 set atlandı. Atlanan setler: (%3)"
 
 #. ($count, $numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:608
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
 msgid "%1 students out of %2"
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle,
+#. ($rename_oldCourseID,          $rename_oldCourseTitle,
+#. $rename_newCourseTitle,
 #. $rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:675
 msgid "%1 title and institution changed from %2 to %3 and from %4 to %5"
 msgstr ""
 
-#. (scalar @userIDsToExport, $dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1338
-msgid "%1 users exported to file %2/%3"
-msgstr "%1 kullanıcı %2/%3 dosyasına aktarıldı."
+#. (scalar @userIDsToExport, "$dir/$fileName")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:477
+msgid "%1 users exported to file %2"
+msgstr ""
 
-#. ($numReplaced, $numAdded, $numSkipped, join (", ", @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1233
+#. ($numReplaced, $numAdded, $numSkipped, join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:443
 msgid ""
 "%1 users replaced, %2 users added, %3 users skipped. Skipped users: (%4)"
 msgstr "%1 kullanıcı değiştirildi, %2 kullanıcı eklendi, %3 kullanıcı atlandı. Atlanan kullanıcılar: (%4)"
 
-#. ($levelpercentage)
 #. ($percentage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:135
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:136
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:323
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:324
+#. ($level_percentage)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:12
 msgid "%1% Complete"
 msgstr ""
 
 #. (wwRound(0, $answerScore * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:268
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:248
 msgid "%1% correct"
 msgstr "%1% doğru"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:207
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:57
 msgid "%1's Current Address"
 msgstr "%1 için Mevcut Adres"
 
-#. ($user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:136
+#. ($c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:26
 msgid "%1's Current Password"
 msgstr "%1 için Mevcut Şifre"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:225
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:65
 msgid "%1's New Address"
 msgstr "%1 için Yeni Adres"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:153
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:34
 msgid "%1's New Password"
 msgstr "%1 için Yeni Şifre"
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
-msgid "%1's new password cannot be blank."
-msgstr "%1 için yeni şifre boş bırakılamaz."
-
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:76
 msgid "%1's password has been changed."
 msgstr "%1 adlı kullanıcının şifresi değiştirildi."
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:56
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1423
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#. ($c->tag('span', dir => 'ltr', $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1069
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:149
 msgid "%1: Problem %2"
 msgstr "%1: Soru %2."
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:374
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:357
 msgid "%1: Problem %2 Show Me Another"
 msgstr ""
 
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2231
-msgid "%1: The directory for the course not found."
-msgstr ""
-
-#. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:340
-msgid "%quant(%1,error) occured while generating hardcopy:"
+#. ($days)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:87
+msgid "%quant(%1,day)"
 msgstr ""
 
 #. ($n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:924
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:389
 msgid "%quant(%1,file) unpacked successfully"
 msgstr ""
 
+#. ($hours)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:88
+msgid "%quant(%1,hour)"
+msgstr ""
+
+#. ($minutes)
+#. (sprintf('%3.1f', $testTime)
+#. ($timeLeft)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:89
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:150
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:168
+msgid "%quant(%1,minute)"
+msgstr ""
+
 #. ($numBlanks)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:430
 msgid ""
 "%quant(%1,of the questions remains,of the questions remain) unanswered."
 msgstr "Soruların %1 tanesi yanıtsız bırakıldı."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:678
+#. ($seconds)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:90
+msgid "%quant(%1,second)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:505
 msgid "%score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2971
+#. ($dcount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:40
+msgid "(%quant(%1,item) total)"
+msgstr ""
+
+#. ($count)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:29
+msgid "(%quant(%1,item))"
+msgstr ""
+
+#. ($problemValue)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1081
+msgid "(%quant(%1,point))"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:697
 msgid "(Any unsaved changes will be lost.)"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1278
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1287
-msgid ""
-"(Instructor hint preview: show the student hint after the following number "
-"of attempts:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:102
+msgid "(If an action cannot be executed it will not appear.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2003
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1262
 msgid "(This problem will not count towards your grade.)"
 msgstr "(Bu soru notunuzu etkilemeyecektir.)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2122
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:340
 msgid ""
 "(This test is overtime because it was not submitted in the allowed time.)"
 msgstr ""
 
-#. ($testNoun, $self->formatDateTime($set->answer_date)
+#. ($testNoun, $c->formatDateTime($c->{set}->answer_date)
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1986
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:153
 msgid "(Your score on this %1 is not available until %2.)"
 msgstr ""
 
 #. ($testNoun)
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1988
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:155
 msgid "(Your score on this %1 is not available.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1257
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1267
 msgid "(correct)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:197
-msgid "(gw/quiz) After version answer date"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:263
 msgid "(in target set)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1449
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1269
 msgid "(incorrect)"
 msgstr ""
 
 #. ($pgScore)
 #. ($recScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1461
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1271
 msgid "(score %1)"
 msgstr ""
 
-#. ($display_sort_method_name{$secondary_sort_method_name})
-#. ($display_sort_method_name{$ternary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:701
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:706
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:207
+msgid "(test) After version answer date"
+msgstr ""
+
+#. ($versionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:164
+msgid "(version %1)"
+msgstr ""
+
+#. ($display_sort_method_name{$secondary_sort_method})
+#. ($display_sort_method_name{$ternary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:103
 msgid ", then by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1297
-msgid ". If this is a class roster, rename it to have extension '.lst'"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:702
+msgid ". If this is a class roster, rename it to have extension \".lst\""
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:81
+msgid "0 seconds"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1997
+msgid "1 set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1983
 msgid "1 student"
 msgstr ""
 
 #. (wwRound(2, $weights[$part] * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:145
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:58
 msgid "<b>Weight:</b> %1%"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1749
+#: /opt/webwork/webwork2/conf/defaults.config:1651
 msgid ""
 "<p>After the Reduced Scoring Date all additional work done by the student "
 "counts at a reduced rate. Here is where you set the reduced rate which must "
@@ -273,7 +336,7 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2036
+#: /opt/webwork/webwork2/conf/defaults.config:1937
 msgid ""
 "<p>During summer 2005, a newer version of the answer checkers was "
 "implemented for answers which are functions and numbers.  The newer checkers"
@@ -285,16 +348,74 @@ msgid ""
 " the old answer checkers will be used by default.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2006
+#: /opt/webwork/webwork2/conf/defaults.config:1908
 msgid ""
 "<p>MathQuill renders students answers in real-time as they type on the "
 "keyboard.</p><p>MathView allows students to choose from a variety of common "
 "math structures (such as fractions and square roots) as they attempt to "
-"input their answers.</p><p>WIRIS provides a separate workspace for students "
-"to construct their response in a WYSIWYG environment.</p>"
+"input their answers.</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1459
+msgid ""
+"<p>Mode in which the LANG and DIR settings for a single problem are "
+"determined.</p><p>The system will set the LANGuage attribute to either a "
+"value determined from the problem, a course-wide default, or the system "
+"default, depending on the mode selected. The tag will only be added to the "
+"DIV enclosing the problem if it is different than the value which should be "
+"set in the main HTML tag set for the entire course based on the course "
+"language.</p><p>There are two options for the DIRection attribute: \"ltr\" "
+"for left-to-write scripts, and \"rtl\" for right-to-left scripts like Arabic"
+" and Hebrew.</p><p>The DIRection attribute is needed to trigger proper "
+"display of the question text when the problem text-direction is different "
+"than that used by the current language of the course. For example, English "
+"problems from the library browser would display improperly in RTL mode for a"
+" Hebrew course, unless the problen Direction is set to LTR.</p><p>The "
+"feature to set a problem language and direction was only added in 2018 to "
+"the PG language, so most problems will not declare their language, and the "
+"system needs to fall back to determining the language and direction in a "
+"different manner. The OPL itself is all English, so the system wide fallback"
+" is to en-US in LTR mode.</p><p>Since the defaults fall back to the LTR "
+"direction, most sites should be fine with the \"auto::\" mode, but may want "
+"to select the one which matches their course language. The mode "
+"\"force::ltr\" would also be an option for a course which runs into trouble "
+"with the \"auto\" modes.</p><p>Modes:</p><ul><li>\"none\" prevents any "
+"additional LANG and/or DIR tag being added. The browser will use the main "
+"setting which was applied to the entire HTML page. This is likely to cause "
+"trouble when a problem of the other direction is "
+"displayed.</li><li>\"auto::\" allows the system to make the settings based "
+"on the language and direction reported by the problem (a new feature, so not"
+" set in almost all existing problems) and falling back to the expected "
+"default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" allows the "
+"system to make the settings based on the language and direction reported by "
+"the problem (a new feature, so not set in almost all existing problems) but "
+"falling back to the language with the given LangCode and the direction Dir "
+"when problem settings are not available from PG.</li><li>\"auto::Dir\" for "
+"problems without PG settings, this will use the default en=english language,"
+" but force the direction to Dir. Problems with PG settings will get those "
+"settings.</li><li>\"auto:LangCode:\" for problems without PG settings, this "
+"will use the default LTR direction, but will set the language to "
+"LangCode.Problems with PG settings will get those "
+"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
+" by the PG code of the problem, and will force the system to set the "
+"language with the given LangCode and the direction to Dir for <b>all</b> "
+"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
+"PG code of the problem, and will force the system to set the direction to "
+"Dir for <b>all</b> problems, but will avoid setting any language attribute "
+"for individual problem.</li></ul>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1736
+#: /opt/webwork/webwork2/conf/defaults.config:1514
+msgid ""
+"<p>Some servers handle courses taking place in different timezones.  If this"
+" course is not showing the correct timezone, enter the correct value here.  "
+"The format consists of unix times, such as \"America/New_York\", "
+"\"America/Chicago\", \"America/Denver\", \"America/Phoenix\" or "
+"\"America/Los_Angeles\".</p>Complete list: <a "
+"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1638
 msgid ""
 "<p>This sets whether the Reduced Scoring system will be enabled.  If enabled"
 " you will need to set the default length of the reduced scoring period and "
@@ -306,22 +427,35 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1979
+#: /opt/webwork/webwork2/conf/defaults.config:1881
 msgid ""
 "<p>When viewing a problem, users may choose different methods of rendering "
 "formulas via an options box in the left panel. Here, you can adjust what "
 "display modes are listed.</p><p>Some display modes require other software to"
 " be installed on the server. Be sure to check that all display modes "
-"selected here work from your server.</p><p>The display modes are "
-"<ul><li>plainText: shows the raw LaTeX strings for formulas.</li><li>images:"
-" produces images using the external programs LaTeX and "
-"dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place "
-"render mathematics.</li></ul></p></p>You must use at least one display mode."
-" If you select only one, then the options box will not give a choice of "
-"modes (since there will only be one active).</p>"
+"selected here work from your server.</p><p>The display modes "
+"are</p><ul><li>plainText: shows the raw LaTeX strings for "
+"formulas.</li><li>images: produces images using the external programs LaTeX "
+"and dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place"
+" render mathematics.</li></ul><p>You must use at least one display mode. If "
+"you select only one, then the options box will not give a choice of modes "
+"(since there will only be one active).</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1476
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with a question in "
+"this test. Please inform your instructor including the warning messages "
+"below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1236
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with this question. "
+"Please inform your instructor including the warning messages below."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1828
+#: /opt/webwork/webwork2/conf/defaults.config:1730
 msgid ""
 "<ul><li><b>SMAcheckAnswers</b>: enables the Check Answers button <i>for the "
 "new problem</i> when Show Me Another is "
@@ -333,7 +467,7 @@ msgid ""
 "time</li><li><b>SMAshowHints</b>: show hints <i>for the new problem</i> "
 "(assuming they exist)</li></ul>Note: there is very little point enabling the"
 " button unless you check at least one of these options - the students would "
-"simply see a new version that they can not attempt or learn from.</p>"
+"simply see a new version that they can not attempt or learn from."
 msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:35
@@ -342,73 +476,123 @@ msgstr ""
 
 #. ($add_courseID)
 #. ($rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1376
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:688
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:600
 msgid "A course with ID %1 already exists."
 msgstr ""
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2564
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1220
 msgid ""
 "A directory already exists with the name %1. You must first delete this "
 "existing course before you can unarchive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:119
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:111
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:42
 msgid ""
 "A file name cannot begin with a dot, it cannot be empty, it cannot contain a"
 " directory path component and only the characters -_.a-zA-Z0-9 and space are"
 " allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1342
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1366
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:738
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
 msgid "A file with that name already exists"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:348
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:19
 msgid ""
 "A hardcopy file was generated, but it may not be complete or correct. Please"
 " check that no problems are missing and that they are all legible. If not, "
 "please inform your instructor."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:56
+msgid ""
+"A hash reference in which the keys are the achievement_id's assigned to the "
+"current user and the values are 0 or 1 which stores if the user has earned "
+"the associated achievement or not."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:52
+msgid ""
+"A hash reference which contains a problems metadata, such as DBsubject, "
+"DBchapter, DBsection,  and so on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:37
+msgid "A hash reference which contains the problem data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:40
+msgid "A hash reference which contains the set data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:60
+msgid ""
+"A hash reference which saves data for this user and this achievement. This "
+"hash is persistent between evaluations and changes to this variable will be "
+"saved in the database."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:64
+msgid ""
+"A hash reference which saves global data for this user. This hash is "
+"persistent between evaluations and changes to this variable will be saved in"
+" the database."
+msgstr ""
+
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3291
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1695
 msgid ""
 "A location with the name %1 already exists in the database.  Did you mean to"
 " edit that location instead?"
 msgstr ""
 
-#. ($subject, $number_of_recipients, $courseName, $failed_messages)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1007
+#. ($mail_data->{subject}, $number_of_recipients, $mail_data->{courseName},
+#. $failed_messages)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:113
 msgid ""
 "A message with the subject line \"%1\" has been sent to %quant(%2,recipient)"
 " in the class %3.  There were %4 message(s) that could not be sent."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:644
-msgid "A new file has been created at '%1'"
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:315
+msgid "A new file has been created at \"%1\""
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1146
+msgid "A new file has been created at \"%1\" with the contents below."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:154
+msgid ""
+"A new problem whose path ends in newProblem.pg should be given a new name, "
+"for example, \"myNewProblem.pg\"."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2006
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:20
 msgid ""
-"A new file has been created at '%1' with the contents below.  No changes "
-"have been made to set %2"
+"A student must be assigned a homework set in order for it to appear on their"
+" WeBWorK home page. Check the box in the left column to assign a student to "
+"that homework set. Uncheck the box to unassign a student. If a student is "
+"unassigned from a homework set, all of the student's data for that homework "
+"set is deleted and cannot be recovered. Use this action cautiously!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:681
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:20
 msgid ""
-"A period (.) indicates a problem has not been attempted, and a number from 0"
-" to 100 indicates the grade earned. The number on the second line gives the "
-"number of incorrect attempts."
+"A student needs to be assigned a set in order for them to work it. Once a "
+"student is unassigned a set, all the data for them is lost and there is no "
+"way to undo it. When unassigning be sure to change the option to \"Allow "
+"unassign\"."
 msgstr ""
 
 # Leave symbol codes in place
-#: /opt/webwork/webwork2/conf/defaults.config:1647
+#: /opt/webwork/webwork2/conf/defaults.config:1549
 msgid ""
 "A switch to govern the use of a Progress Bar for the student; this also "
 "enables/disables the highlighting of the current problem in the side bar, "
@@ -416,474 +600,665 @@ msgid ""
 "(&#x2717;), or unattempted (no symbol)."
 msgstr ""
 
-# Short for ADJUSTED STATUS
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:500
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:712
-msgid "ADJ STATUS"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2296
-msgid "ANSWERS NOT RECORDED"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:42
+msgid "A unique key identifying the achievement."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2281
-msgid "ANSWERS NOT RECORDED --"
+# Short for ADJUSTED STATUS
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:535
+msgid "ADJ STATUS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2295
-msgid "ANSWERS ONLY CHECKED -- "
+#. ($c->{scoreRecordedMessage}[ $probOrder->[$i] ])
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:504
+msgid "ANSWERS NOT RECORDED -- %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2232
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1505
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:515
 msgid "ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"
 msgstr "YANITLAR SADECE KONTROL EDİLİYOR -- YANITLAR KAYDEDİLMEDİ"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1527
 msgid ""
 "ATTEMPT NOT ACCEPTED -- Please submit answers again (or request new version "
 "if neccessary)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1534
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_password_form.html.ep:1
 msgid "Abandon changes"
 msgstr "Değişiklikleri kaydetme"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1083
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_export_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_export_form.html.ep:1
 msgid "Abandon export"
 msgstr "Dışa aktarımı iptal et"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:520
 msgid ""
 "Account creation is currently disabled in this course.  Please speak to your"
 " instructor or system administrator."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:153
-msgid "Achievement"
-msgstr ""
-
-#. ($targetAchievementID, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:638
-msgid "Achievement %1 created with evaluator '%2'."
+#. ($targetAchievementID,			$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:310
+msgid "Achievement %1 created with evaluator \"%2\"."
 msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:847
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:378
 msgid "Achievement %1 exists.  No achievement created"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:444
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:63
 msgid "Achievement Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:548
-msgid "Achievement Evaluator Editor"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:17
+msgid "Achievement Editor Help"
 msgstr ""
 
-#. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:170
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:17
+msgid "Achievement Evaluator Editor Help"
+msgstr ""
+
+#. ($c->stash('achievementID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:109
 msgid "Achievement Evaluator for achievement %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1446
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1454
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1482
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:13
 msgid "Achievement ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:274
 msgid "Achievement ID exists!  No new achievement created.  File not saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1698
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:41
+msgid "Achievement ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:3
+msgid "Achievement List"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1600
 msgid "Achievement Points Per Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:558
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:455
 msgid "Achievement User Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:17
+msgid "Achievement User Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:48
 msgid "Achievement has been assigned to all users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:67
 msgid "Achievement has been assigned to selected users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:60
 msgid "Achievement has been unassigned to all students."
 msgstr ""
 
-#. (CGI::a({ href => $fileManagerURL }, $scoreFileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:711
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:38
+msgid "Achievement options"
+msgstr ""
+
+#. ($c->link_to(                           $scoreFileName => $c->systemLink(
+#. $c->url_for('instructor_file_manager')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:318
 msgid "Achievement scores saved to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:260
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:241
 msgid "Achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:531
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:17
+msgid "Achievements Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:26
+msgid ""
+"Achievements are evaluated in the order shown below, with the exception of "
+"\"level\" achievements.  Achievements in the \"level\" category are "
+"evaluated first and control the XP thresholds and rewards (achievement "
+"items) for reaching each level. Achievements in the \"secret\" category are "
+"not shown to students until they earn the achievement, and is used for "
+"fun/surprise achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:32
+msgid ""
+"Achievements in the same category, with sequential numbers, and whose ID "
+"starts with the same \"prefix_\" (up to the last underscore), are treated as"
+" achievement chains.  Achievement chains are a sequence of achievements "
+"which build upon themselves, such as complete one problem, complete 10 "
+"problems, complete 25 problems, and so on. Students will only see the "
+"achievements in the chain they have completed or are currently working on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:201
 msgid "Act as"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:207
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:26
 msgid "Act as:"
 msgstr ""
 
-#. (HTML::Entities::encode_entities($prettyEUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1134
+#. ($effectiveUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:26
 msgid "Acting as %1."
 msgstr ""
 
 #. ($actionID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:372
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:223
 msgid "Action %1 not found"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1706
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:101
+msgid "Actions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1608
 msgid ""
 "Activating this will enable achievement rewards. This feature allows "
 "students to earn rewards by completing achievements that allow them to "
 "affect their homework in a limited way."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:45
 msgid "Active"
 msgstr "Aktif"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1691
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:50
+msgid "Active Students"
+msgstr ""
+
+#. ($c->{prettyID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:19
+msgid "Active Students Problem %1 Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1593
 msgid ""
 "Activiating this will enable Mathchievements for webwork.  Mathchievements "
 "can be managed by using the Achievement Editor link."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2947
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1548
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:166
 msgid "Add"
 msgstr "Ekle"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:89
 msgid "Add All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:644
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:32
 msgid "Add Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:253
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:17
+msgid "Add Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:14
+msgid "Add Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:98
 msgid "Add Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:406
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:349
 msgid "Add Users"
 msgstr "Kullanıcı Ekle"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:518
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:17
+msgid "Add Users Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:47
 msgid "Add WeBWorK administrators to new course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1509
-msgid "Add a new test for which Gateway?"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:79
+msgid "Add a TA or an instructor (change permission level of user)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:60
+msgid "Add a few students to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:50
+msgid "Add a new version for which test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1441
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:20
 msgid "Add as what filetype?"
 msgstr "Hangi dosya tipi olarak eklenecek?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/add_form.html.ep:3
 msgid "Add how many users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1549
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:69
+msgid "Add many students to a course from a class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:108
+msgid "Add n blank problem template(s) to the end of homework set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:164
 msgid "Add problem to target set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Add problems to"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1422
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:161
+msgid ""
+"Add this problem as the last problem of an existing set, either as a problem"
+" or as the set header (the text that appears on the home page of a homework "
+"set). You can rearrange the order of the problems later using the \"Hmwk "
+"Sets Editor\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:7
 msgid "Add to what set?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:20
+msgid ""
+"Add users to the course.  Select the number of students/users to add and "
+"then add any desired information.  The only mandatory information is the "
+"\"Login Name\". Any other fields may be left blank.  The \"Student ID\" will"
+" be the initial password for the user if provided."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:26
 msgid "Add which new users?"
 msgstr "Hangi yeni kullanıcılar eklenecek?"
 
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:883
+msgid "Added \"%1\" to %2 as new hardcopy header"
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:854
+msgid "Added \"%1\" to %2 as new set header"
+msgstr ""
+
 #. ('{number}', '{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1055
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:27
 msgid "Added %1 problems to set %2."
 msgstr ""
 
-#. ($sourceFilePath, $targetSetName,($set->assignment_type eq 'jitar' ?
-#. join('.',jitar_id_to_seq($targetProblemNumber)
-#. ($new_file_name, $setName, ($set->assignment_type eq 'jitar' ?
-#. join('.',jitar_id_to_seq($targetProblemNumber)
 #. ($new_file_path, $setID, $targetProblemNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1510
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2001
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1912
+#. ($sourceFilePath,                       $targetSetName,                 (
+#. $set->assignment_type eq 'jitar'                                ? join('.',
+#. jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:825
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1837
 msgid "Added %1 to %2 as problem %3"
 msgstr ""
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1566
-msgid "Added '%1' to %2 as new hardcopy header"
-msgstr ""
-
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1540
-msgid "Added '%1' to %2 as new set header"
+#. ($new_file_name,                                $c->{setID},
+#. (                                       $set->assignment_type eq 'jitar'
+#. ? join('.', jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1139
+msgid "Added %1 to %2 as problem %3."
 msgstr ""
 
 #. (join(', ', @toAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1974
 msgid "Added addresses %1 to location %2."
 msgstr ""
 
+#. ($user->user_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:167
+msgid "Added missing permission level for user %1."
+msgstr ""
+
 #. ('{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1054
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:26
 msgid "Added one problem to set %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Added user:"
+msgstr ""
+
+#. ('<code>[Scoring]/report_grades_data.csv</code>',
+#. '<code>[TMPL]/email/report_grades.msg</code>',)
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:33
+msgid ""
+"Additional (external) grades can be shown on this page by placing them in "
+"the CSV file %1.  The first six columns must be (in order): Student ID, "
+"Username, Last Name, First Name, Section, Recitation.  The remaining columns"
+" can list any external grades.  To display the grades, the CSV file is "
+"merged with the \"Email\" message %2, which will be rendered and displayed "
+"below the grade table.  The message can be created on the \"Email\" page and"
+" the CSV file can be created/uploaded using the \"File Manager\".  External "
+"grades can only be displayed here and are not included in any totals or "
+"statistics."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2060
 msgid "Additional addresses for receiving feedback e-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:235
 msgid "Additional submissions available."
 msgstr ""
 
 #. ($badLocAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1708
 msgid ""
 "Address(es) %1 already exist in the database.  THIS SHOULD NOT HAPPEN!  "
 "Please double check the integrity of the WeBWorK database before continuing."
 msgstr ""
 
 #. (join(', ', @noAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1986
 msgid ""
 "Address(es) %1 in the add list is(are) already in the location %2, and so "
 "were skipped."
 msgstr ""
 
 #. (join(', ', @noDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3603
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2008
 msgid ""
 "Address(es) %1 in the delete list is(are) not in the location %2, and so "
 "were skipped."
 msgstr ""
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1683
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and resubmit."
 msgstr ""
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1998
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:117
 msgid "Addresses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:53
 msgid ""
 "Addresses for new location.  Enter one per line, as single IP addresses "
 "(e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP ranges "
 "(e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:27
 msgid ""
 "Addresses to add to the location.  Enter one per line, as single IP "
 "addresses (e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP"
 " ranges (e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:232
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:27
 msgid "Adds 24 hours to the close date of a homework."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:323
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:27
 msgid "Adds 48 hours to the close date of a homework."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:110
+msgid ""
+"Adds new template problems to the set when the set is saved. You can modify "
+"the template to create your own problem, by clicking on the \"Edit Problem\""
+" link and saving to some new file, e.g. \"myNewProblem.pg\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:19
 msgid "Adjusted Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:56
 msgid "Adobe PDF"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:675
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:42
 msgid "Advanced Search"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:196
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:206
 msgid "After set answer date"
 msgstr ""
 
-#. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:325
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:33
 msgid ""
-"After the reduced scoring period begins all work counts for %1% of its "
-"value."
+"After the due date this set enters a reduced scoring period until it closes "
+"on %1.  All work completed during the reduced scoring period counts for %2% "
+"of its value."
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:304
 msgid "Afterward reduced credit can be earned until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:56
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:60
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:23
 msgid "All Chapters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:57
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:34
 msgid "All Sections"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:6
 msgid "All Selected Constraints Joined by \"And\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:71
+msgid "All Sets"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:12
 msgid "All Subjects"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:48
 msgid "All Textbooks"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:54
+msgid "All Users"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:49
 msgid "All assignments were made successfully."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:953
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:386
 msgid "All listed sets were hidden from all the students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:951
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:381
 msgid "All listed sets were made visible for all the students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:407
 msgid "All of the answers above are correct."
 msgstr "Yanıtların tümü doğru"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:398
 msgid "All of the gradeable answers above are correct."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:247
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:162
+msgid ""
+"All of the paths for problem files are relative to the templates directory "
+"of the current course. You can access this directory \"directly\" using the "
+"File Manager page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:68
 msgid "All of these files will also be made available for mail merge."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:960
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:9
+msgid "All problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:5
+msgid "All sections"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2145
+msgid "All selected courses are already hidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2214
+msgid "All selected courses are already unhidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:399
 msgid "All selected sets hidden from all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:394
 msgid "All selected sets made visible for all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:946
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:373
 msgid "All sets hidden from all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:945
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:368
 msgid "All sets made visible for all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:619
 msgid "All sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:56
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:54
 msgid "All unassignments were made successfully."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2047
+#: /opt/webwork/webwork2/conf/defaults.config:1948
 msgid "Allow Unicode alternatives in student answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:74
 msgid "Allow the LMS to update user account data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:68
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:105
 msgid "Allow unassign"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2069
+#: /opt/webwork/webwork2/conf/defaults.config:1970
 msgid "Allowed error, as a percentage, for numerical comparisons"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1886
+#: /opt/webwork/webwork2/conf/defaults.config:1788
 msgid "Allowed to <em>act as</em> another user"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1923
+#: /opt/webwork/webwork2/conf/defaults.config:1825
 msgid "Allowed to change display settings used in pg problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1913
+#: /opt/webwork/webwork2/conf/defaults.config:1815
 msgid "Allowed to change their e-mail address"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1877
+#: /opt/webwork/webwork2/conf/defaults.config:1779
 msgid "Allowed to change their password"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1872
+#: /opt/webwork/webwork2/conf/defaults.config:1774
 msgid "Allowed to login to the course"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1950
+#: /opt/webwork/webwork2/conf/defaults.config:1852
 msgid "Allowed to see solutions before the answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1945
+#: /opt/webwork/webwork2/conf/defaults.config:1847
 msgid "Allowed to see the correct answers before the answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1934
+#: /opt/webwork/webwork2/conf/defaults.config:1836
 msgid "Allowed to view past answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1940
+#: /opt/webwork/webwork2/conf/defaults.config:1842
 msgid "Allowed to view problems in sets which are not open yet"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1572
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:82
+msgid ""
+"Allows configuration of certain parameters, such as permission levels, "
+"default display mode for equations, and email feedback behavior, on a course"
+" by course basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:126
+msgid "Also copy simple configuration file"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:26
 msgid "Amulet of Extension"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:20
+msgid ""
+"An achievement evaluator is a perl script that is run after each problem is "
+"submitted which returns a truth value of 0 (didn't earn) or 1 (earn). The "
+"evaluator is given access to different variables which contain data about "
+"the problem and set that is used to determine if the achievement is earned "
+"or not."
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:37
 msgid ""
 "An address that can be used to log in to the LMS. This is used in messages "
@@ -891,248 +1266,308 @@ msgid ""
 "WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:43
+msgid ""
+"An array which lists the hash reference of all the problems in the current "
+"set."
+msgstr ""
+
 #. ($archive_courseID)
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2350
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2647
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1274
 msgid "An error occured while archiving the course %1:"
 msgstr ""
 
 #. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:658
 msgid "An error occured while changing the title of the course %1."
 msgstr ""
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1795
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:878
 msgid "An error occured while deleting the course %1:"
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1521
+#. ($rename_oldCourseID,						$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:751
 msgid "An error occured while renaming the course %1 to %2:"
 msgstr ""
 
 #. ($part + 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:106
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:25
 msgid "Answer %1 Score (%):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:425
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:765
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:789
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:812
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:79
 msgid "Answer Date"
 msgstr "Cevap tarihi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1712
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:39
 msgid "Answer Group Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:59
 msgid "Answer Hash Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:221
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:292
 msgid "Answer Log"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:17
+msgid "Answer Log Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:285
 msgid "Answer Preview"
 msgstr "Gösterim"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1465
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:48
+msgid ""
+"Answer availability for tests depends on multiple settings.  This only "
+"indicates the template answer date has passed.  See set editor for actual "
+"availability."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1276
 msgid "Answer(s) submitted:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
 msgid "Answer:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:224
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
 msgid "Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:122
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:37
 msgid "Answers Available"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1202
 msgid "Answers cannot be due until on or after the open date!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1204
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1197
 msgid "Answers cannot be made available until on or after the close date!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:313
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:21
 msgid ""
 "Any changes made below will be reflected in the achievement for ALL "
 "students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2259
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:507
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:175
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:69
 msgid "Any changes made below will be reflected in the set for ALL students."
 msgstr "Aşağıda yapılan değişiklikler seti çözen HER öğrenci için uygulanacakç"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:173
 msgid ""
 "Any changes made below will be reflected in the set for ONLY the student(s) "
 "listed above."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:122
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:159
 msgid "Append"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1849
+#. (tag('strong', dir => 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:71
 msgid "Append to end of %1 set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2264
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:51
+msgid "Applying definitions theoretically and proof writing"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:91
 msgid "Archive"
 msgstr ""
 
 #. ($archive, $n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:892
-msgid "Archive '%1' created successfully (%quant( %2, file))"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:361
+msgid "Archive \"%1\" created successfully (%quant( %2, file))"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1069
-msgid "Archive '%1' deleted"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:525
+msgid "Archive \"%1\" deleted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1846
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2048
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:38
 msgid "Archive Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2005
-msgid "Archive Courses"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:17
+msgid "Archive Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2423
-msgid "Archive next course"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:63
+msgid "Archive Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1056
-msgid "Archive this Course"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1158
+msgid "Archive next course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:61
 msgid "Archived Courses"
 msgstr ""
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:202
-msgid "Archiving course as %1.tar.gz. Reload FileManager to see it."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:69
+msgid "Archived course as %1.tar.gz."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:25
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to access the .tar.gz files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:26
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to upload additional .tar.gz "
+"files to be unarchived."
 msgstr ""
 
-#. (CGI::b($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2191
+#. (tag('b', $archive_courseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:57
 msgid ""
 "Are you sure that you want to delete the course %1 after archiving? This "
 "cannot be undone!"
 msgstr ""
 
-#. (CGI::b($delete_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1736
+#. (tag('b', param('delete_courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:5
 msgid ""
 "Are you sure you want to delete the course %1? All course files and data "
 "will be destroyed. There is no undo available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:72
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:511
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:64
+msgid ""
+"As the checkbox says, this includes a percentage grade column for each set."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:184
 msgid "Assign"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:225
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:62
 msgid "Assign All Sets to Current User"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:171
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:106
+msgid "Assign achievements"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:43
+msgid "Assign and unassign selected exercise sets to selected users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:54
 msgid "Assign selected sets to selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:919
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:154
+msgid "Assign sets to many students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:116
+msgid "Assign sets to one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:15
 msgid "Assign this achievement to which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1366
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:62
 msgid "Assign this set to which users?"
 msgstr "Bu set hangi kullanıcılara ödev verilecek?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:15
 msgid "Assign to All Current Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:3
 msgid "Assign which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:35
 msgid "Assigned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1984
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:19
 msgid "Assigned Sets"
 msgstr "Ödev verilmiş setler"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:580
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:218
 msgid "Assigned achievements to users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2154
-msgid "Assigned to"
+#. (link_to(						$c->setCountMessage($db->countUserSets($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:96
+msgid "Assigned to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:212
 msgid "Assignment type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-msgid "Assignments only"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:2004
+#: /opt/webwork/webwork2/conf/defaults.config:1906
 msgid "Assist with the student answer entry process."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:417
 msgid "At least one of the answers above is NOT correct."
 msgstr ""
 
 # Short for "Attempts to Open Children"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:487
 msgid "Att. to Open Children"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:50
 msgid "Attachment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2293
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:107
 msgid "Attempt to upgrade directories"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:375
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:449
 msgid "Attempted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1416
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1498
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/attempts_row.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:73
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:13
 msgid "Attempts"
 msgstr "Deneme sayısı"
 
@@ -1140,392 +1575,586 @@ msgstr "Deneme sayısı"
 msgid "Audit"
 msgstr "Denetle"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:342
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:348
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:360
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:366
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:460
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:466
 msgid "Authentication failed.  Please speak to your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/InstructorRPCHandler.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:44
+msgid "Authentication failed. Log in again to continue."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:116
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:69
 msgid "Author Info"
 msgstr "Yazar Bilgileri"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:87
 msgid "Automatic"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2058
+#: /opt/webwork/webwork2/conf/defaults.config:1959
 msgid ""
 "Automatically convert Full Width Unicode characters to their ASCII "
 "equivalents"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2911
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:97
+msgid ""
+"Automatically render all problems in the set on this page when \"Save "
+"Changes\" or \"Reset Form\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:667
 msgid "Automatically render problems on page load"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1727
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:95
+msgid "Automatically render problems on page load."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:49
 msgid "Auxiliary Resources"
 msgstr ""
 
-#. ($emailDirectory,$old_default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:350
-msgid "Backup file <code>%1/%2</code> created."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:179
+msgid "Average Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:255
-msgid "Badges"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:118
+msgid "Average Attempts Per Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:942
-msgid "Basic Search"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:115
+msgid "Average Percent"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
-msgid "Binary"
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:558
+msgid "Backup created on %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1271
-msgid "Box of Transmogrification"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:1
+msgid "Badges"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1093
-msgid "Browse"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:106
+msgid "Basic Search"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:512
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:991
-msgid "Browse from:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:28
+msgid "Before Open Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2161
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:31
 msgid ""
-"By default, feedback is always sent to all users specified to recieve "
+"Below the file list is a button and options for uploading files. Click the "
+"\"Choose File\" button, select the file, then click \"Upload\". A single "
+"file or a compressed tar (.tgz) file can be uploaded and if the option is "
+"selected, the archive is automatically unpacked and deleted.  Generally the "
+"\"automatic\" option on Format will correctly pick the correct type of file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:83
+msgid "Binary"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+msgid "Both Start and Grade"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:26
+msgid "Box of Transmogrification"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:40
+msgid "Browse"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:16
+msgid "Browse from:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2072
+msgid ""
+"By default, feedback is always sent to all users specified to recieve "
 "feedback.  This variable sets the system to only email feedback to users who"
 " have the same section as the user initiating the feedback.  I.e., feedback "
 "will only be sent to section leaders."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2151
+#: /opt/webwork/webwork2/conf/defaults.config:2062
 msgid ""
 "By default, feedback is sent to all users above who have permission to "
 "receive feedback. Feedback is also sent to any addresses specified in this "
 "blank. Separate email address entries by commas."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
 msgid "CLOSE DATE"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:217
 msgid "CLOSE TIME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:26
 msgid "Cake of Enlargement"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1891
+#: /opt/webwork/webwork2/conf/defaults.config:1793
 msgid "Can e-mail instructor"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1904
+#: /opt/webwork/webwork2/conf/defaults.config:1806
 msgid "Can report bugs"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1955
+#: /opt/webwork/webwork2/conf/defaults.config:1857
 msgid "Can show old answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1897
+#: /opt/webwork/webwork2/conf/defaults.config:1799
 msgid "Can submit answers for a student"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:275
 msgid "Can't copy file: %1"
 msgstr ""
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:894
-msgid "Can't create archive '%1': command returned %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
+msgid "Can't create archive \"%1\": command returned %2"
 msgstr ""
 
 #. ($courseID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2725
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:28
 msgid "Can't create course environment for %1 because %2"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:423
 msgid "Can't create directory: %1"
 msgstr ""
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1060
-msgid "Can't create file '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+msgid "Can't create file \"%1\": %2"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:948
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:406
 msgid "Can't create file: %1"
 msgstr ""
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1070
-msgid "Can't delete archive '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:526
+msgid "Can't delete archive \"%1\": %2"
 msgstr ""
 
-#. ($eUserID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:69
-msgid "Can't get password record for effective user '%1': %2"
-msgstr "Mevcut kullanıcı için şifre bilgileri alınamadı '%1': %2"
-
-#. ($userID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:64
-msgid "Can't get password record for user '%1': %2"
-msgstr "kullanıcı için şifre bilgileri alınamadı '%1': %2"
+#. ($setID, $TargetUser->user_id,)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:925
+msgid ""
+"Can't generate hardcopy for set \"%1\" for user \"%2\". The set is not "
+"visible to students."
+msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:445
 msgid "Can't open %1"
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1426
 msgid "Can't open file %1"
 msgstr ""
 
 #. ($merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:343
 msgid "Can't read merge file %1. No message sent"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:760
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:298
 msgid "Can't rename file: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:591
 msgid "Can't rename to the same name."
 msgstr ""
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:927
-msgid "Can't unpack '%1': command returned %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:392
+msgid "Can't unpack \"%1\": command returned %2"
 msgstr ""
 
 #. ($fullPath)
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:629
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1895
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1819
 msgid "Can't write to file %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1015
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1096
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:154
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:462
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/confirm.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:69
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:15
 msgid "Cancel"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:387
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:5
+msgid "Cancel E-Mail"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:60
 msgid "Cancel E-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:61
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:77
 msgid "Cancel Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:79
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
 msgid "Cancel Export"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:93
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
 msgid "Cancel Password"
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:516
+msgid "Cannot find a file path to save to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:501
+msgid ""
+"Cannot find a problem record for set $c->{setID} / problem $c->{problemID}"
+msgstr ""
+
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:240
 msgid "Cannot open %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:222
-msgid "Cap Test Time at Set Close Date?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:232
+msgid "Cap Test Time at Set Close Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1456
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1486
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:14
 msgid "Category"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:516
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:49
+msgid "Category:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:27
 msgid ""
 "Cause the selected homework set to count for twice as many points as it "
 "normally would."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1272
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:27
 msgid ""
 "Causes a homework problem to become a clone of another problem from the same"
 " set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:727
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:27
 msgid "Causes a single homework problem to be worth twice as much."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1006
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:48
 msgid "Change Course Title to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:34
 msgid "Change CourseID to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:176
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:134
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:76
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:25
 msgid "Change Display Settings"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:53
 msgid "Change Email Address"
 msgstr "E-posta Adresi Değiştir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1032
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:62
 msgid "Change Institution to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:374
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:18
 msgid "Change Password"
 msgstr "Şifre Değiştir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:169
 msgid "Change User Settings"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:35
+msgid "Change a course's ID, Title, or Institution."
+msgstr ""
+
 #. ($rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1092
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
 msgid "Change course institution from %1 to %2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:160
+msgid "Change dates for a homework set for the whole class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:123
+msgid "Change the due date for one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:26
+msgid ""
+"Change the due dates for an individual student on this page. Check the "
+"checkbox and enter the new date in order to override the date. (You can copy"
+" the date format from the date in the right hand column which indicates the "
+"date when the homework set is due for the whole class.) Note that you should"
+" ensure that the close date is before the answer date. If the close date for"
+" a student is extended until after the class answer date for the set, then "
+"the answer date for the student must also be set to a later date. "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:141
+msgid "Change the grades on a homework set for one student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:163
+msgid "Change the grading on a homework set for an entire class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:170
+msgid "Change the number of atttempts allowed on a problem."
+msgstr ""
+
 #. ($rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1089
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:508
 msgid "Change title from %1 to %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1362
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:488
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:540
 msgid "Changes abandoned"
 msgstr "Değişiklikler kaydedilmedi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:371
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:242
 msgid "Changes in this file have not yet been permanently saved."
 msgstr "Dosyadaki değişiklikler henüz kalıcı olarak kaydedilmedi."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:647
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:529
 msgid "Changes saved"
 msgstr "Değişiklikler kaydedildi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1822
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:38
+msgid "Changing dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:514
 msgid ""
 "Changing the problem seed for display, but there are no problems showing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:635
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:19
 msgid "Chapter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1849
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:15
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:103
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:37
 msgid "Check Answers"
 msgstr "Yanıtları kontrol et"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2476
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:682
 msgid "Check Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:183
-msgid "Check that it's permissions are set correctly."
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:53
+msgid "Choose problems from a library and add them to a homework set."
 msgstr ""
 
-#. ($emailDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:195
-msgid ""
-"Check whether it exists and whether the directory %1 can be read by the "
-"webserver."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:543
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:40
 msgid "Choose the set which you would like to be worth twice as much."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:44
 msgid "Choose the set which you would like to enable partial credit for."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1206
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:992
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:44
 msgid "Choose the set which you would like to resurrect."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:259
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:350
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:40
 msgid "Choose the set whose close date you would like to extend."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:903
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:16
 msgid "Choose visibility of the sets to be affected"
 msgstr "Etkilenecek setlerin görünürlüğünü seçin"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:497
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:15
 msgid "Choose what to do with existing data:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:880
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:3
 msgid "Choose which sets to be affected"
 msgstr "Hangi setlerin etkileneceğini seçin"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:491
-msgid "Class value"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:17
+msgid "Class List Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:55
+msgid "Class list (\".lst\") files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:334
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:316
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:37
 msgid "Classlist Editor"
 msgstr "Sınıf Listesi Düzenleyici"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1197
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:91
 msgid "Clear Problem Display"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:693
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:82
 msgid ""
 "Click a student's name to see the student's homework set. Click a heading to"
 " sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:74
 msgid ""
 "Click a student's name to see the student's test summary page. Click a "
 "test's version number to see the corresponding test version. Click a heading"
 " to sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:614
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:150
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:143
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made. (The grade for each problem is listed "
+"as \"status\" on this third page)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:24
+msgid ""
+"Click on each of the tabs to view the configuration items. The question mark"
+" icon provides access to information about the behavior of the configuration"
+" settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:125
+msgid ""
+"Click on the column \"Assigned Sets\" in the student's row. This will take "
+"you to a page where you can assign and unassign homework sets and change the"
+" due dates for homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:33
+msgid ""
+"Click on the homework set links to edit the grades for this individual "
+"student on the homework set. (The grade of each problem is called the "
+"\"status\".) You can also change the number of allowed attempts and further "
+"modify the individual student's homework set.) You will also be able to "
+"change a student's seed which determines the individual values used in the "
+"individual version of the student's problem and the weight (how much a "
+"problem counts towards the grade.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:90
 msgid ""
 "Click on the login name to edit individual problem set data, (e.g. due "
 "dates) for these students."
 msgstr "Bu öğrenciler için problem setlerinde değişiklik (teslim tarihi vb.) yapmak için isimlerinin üzerine tıklayın."
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:62
+msgid ""
+"Click the \"Add x student(s)\" radio button and then click \"Take action\". "
+"This will take you to a new page where the data can be entered for one or "
+"more students. It is also possible to assign the student to one or more "
+"problem sets as they are being entered: simply select the homework sets from"
+" the list below the data entry table. Use \"command\" or \"control\" click "
+"to select more than one homework set."
+msgstr ""
+
+#. ('<i class="fas fa-question-circle"></i>')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:88
+msgid "Click the %1 icon for page and item specific help."
+msgstr ""
+
+#. ('<a href="#"><i class="fas fa-question-circle"></i></a>')
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:20
+msgid "Click the icon %1 for page and item specific help."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:185
+msgid ""
+"Clicking on any active link at the top of the column sorts the page by that "
+"column. You can do lexigraphic sorts: click on \"First name\" then \"Last "
+"name\" to sort by last name, sorting those with the same last name by their "
+"first name."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:132
+msgid ""
+"Clicking on the login name link in a student's row allows you to view the "
+"student's version of the homework (rather than your own) so that you can "
+"more easily answer student questions about homework problems. (A \"acting as"
+" xxx\" alert will appear in the upper right corner of each window while you "
+"are acting as a student.) You can submit the answers (which will NOT be "
+"recorded) to check that the computer is grading the problem correctly. You "
+"will also be able to view past answers submitted by the student for each "
+"problem. To stop acting in the student's role click the \"Stop acting\" link"
+" in the upper right corner of the window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:199
+msgid ""
+"Clicking the <strong>e-mail address</strong> link will bring up your "
+"standard email application so that you can send email to the student. This "
+"works even if the student has been dropped from the course. To send email to"
+" an entire class or to merge grades with the email message use the \"Email\""
+" page link in the left margin."
+msgstr ""
+
 #. ($clientIP->ip()
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:541
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:547
 msgid ""
 "Client ip address %1 is not allowed to work this assignment, because the "
 "assignment has ip address restrictions and there are no allowed locations "
@@ -1533,329 +2162,337 @@ msgid ""
 "problem resolved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:713
-msgid "Close"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:316
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:39
+msgid "Close Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:424
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:764
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:788
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:811
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
-msgid "Close Date"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:35
+msgid "Closed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:382
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:208
 msgid "Closed, answers available."
 msgstr ""
 
-#. ($self->formatDateTime($set->answer_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:378
+#. ($c->formatDateTime($set->answer_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:204
 msgid "Closed, answers on %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:206
 msgid "Closed, answers recently available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:282
 msgid "Closed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:116
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:121
 msgid "Closes"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date, undef,
-#. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:113
-msgid "Closes %1"
-msgstr ""
-
-#. ($self->formatDateTime($verSet->due_date, undef,
+#. ($c->formatDateTime($verSet->due_date, undef,
 #. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:390
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:227
 msgid "Closes on %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:35
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:33
 msgid "Closes:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2518
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:357
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:71
 msgid "Collapse All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2529
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:367
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:85
 msgid "Collapse All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2668
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:419
 msgid "Collapse Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2791
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2793
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:572
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:575
 msgid "Collapse Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1715
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:73
+msgid ""
+"Collapse problem details to the top row of information about a problem. Note"
+" that the details of a single problem can be collapsed by clicking on the up"
+" arrow to the right of the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1617
 msgid ""
 "Comma separated list of set names that are excluded from all achievements. "
 "No achievement points and badges can be earned for submitting problems in "
 "these sets. Note that underscores (_) must be used for spaces in set names."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:238
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:245
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:225
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:577
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2047
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:299
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:833
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:862
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:891
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:920
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:131
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:46
 msgid "Comment"
 msgstr "Yorum"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:200
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:25
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:181
 msgid "Comment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:638
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:86
 msgid "Comments"
 msgstr ""
 
-#. ($self->formatDateTime($set->answer_date)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2175
+#. ($c->formatDateTime($c->{set}->answer_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:379
 msgid "Completed results for this assignment are not available until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:382
 msgid "Completed results for this assignment are not available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:264
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:280
 msgid "Completed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:45
 msgid "Compose Email Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3185
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:47
+msgid ""
+"Configure ip ranges (locations) that can be used to restrict set access."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:45
+msgid "Configure which course links appear on the site landing page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:97
 msgid "Confirm"
 msgstr ""
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:107
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:164
+#. ($eUserName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:41
 msgid "Confirm %1's New Password"
 msgstr "%1 için Şifre Onayı"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:579
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:78
 msgid "Confirm Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_export_form.html.ep:1
 msgid "Confirm which sets to export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementEvaluator.pm:288
+#: /opt/webwork/webwork2/templates/AchievementEvaluator/cheevoMessage.html.ep:15
 msgid "Congratulations, you earned a new level!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2250
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:95
 msgid "Continue"
 msgstr "Devam"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:86
 msgid "Continue Open Test"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:59
+msgid "Controls if an achievement is evaluated or not."
+msgstr ""
+
 #. ($sourceDirectory, $outputDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1149
-msgid "Copied auxiliary files from %1 to new location at %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:671
+msgid "Copied auxiliary files from %1 to new location at %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:42
 msgid "Copy"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
 msgid "Copy file as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:528
-msgid "Copy simple configuration file to new course"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:627
-msgid "Copy templates from:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:112
+msgid "Copy from:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1335
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:82
 msgid "Copy this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:391
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:465
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:301
 msgid "Correct"
 msgstr "Doğru yanıt"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:656
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:678
 msgid "Correct Adjusted Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:300
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:287
 msgid "Correct Answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1682
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:19
 msgid "Correct Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1506
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1317
 msgid "Correct Answers:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:693
 msgid "Correct Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:648
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:93
 msgid "Correct answers"
 msgstr "Doğru yanıtları göster"
 
 #. ($total_correct, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1004
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:16
 msgid "Correct: %1/%2"
 msgstr ""
 
 #. ($newBlankProblems, $MAX_NEW_PROBLEMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1915
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1843
 msgid ""
 "Could not add %1 problems to this set.  The number must be between 1 and %2"
 msgstr ""
 
 #. ($e_user_name, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:83
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:94
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:74
 msgid "Couldn't change %1's password: %2"
 msgstr "%1 adlı kullanıcının şifresi değiştirilemedi: %2"
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:111
 msgid "Couldn't change your email address: %1"
 msgstr "E-posta adresiniz değiştirilemedi: %1"
 
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4111
-msgid "Couldn't find OPL Branch %1 in remote %2"
-msgstr ""
-
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4076
-msgid "Couldn't find PG Branch %1 in remote %2"
-msgstr ""
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4014
-msgid "Couldn't find WeBWorK Branch %1 in remote %2"
-msgstr ""
-
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:132
 msgid "Couldn't save your display options: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1463
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:36
 msgid "Counter"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:424
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:833
-msgid "Counts for Parent"
-msgstr ""
-
-#. ($rename_oldCourseID)
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2186
-msgid "Course %1 database is in order"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:66
+msgid "Counter:"
 msgstr ""
 
-#. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1257
-msgid "Course %1 databases must be updated before renaming this course."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:503
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:35
+msgid "Counts for Parent"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:778
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:95
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:154
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:9
 msgid "Course Administration"
 msgstr "Ders Yönetimi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:424
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:17
+msgid "Course Administration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:369
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:80
 msgid "Course Configuration"
 msgstr "Ders Seçenekleri"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:480
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:17
+msgid "Course Configuration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:17
+msgid "Course Home Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:21
 msgid "Course ID"
 msgstr ""
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2566
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:691
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:594
 msgid "Course ID cannot exceed %1 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1227
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:597
 msgid "Course ID may only contain letters, numbers, hyphens, and underscores."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:956
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:21
 msgid "Course ID:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:5
 msgid "Course Info"
 msgstr "Ders bilgileri"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1664
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1961
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3736
-msgid "Course Name:"
+#. ($c->stash('courseID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:325
+msgid "Course Information for course %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:491
-msgid "Course Title"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:30
+msgid "Course Listings"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:17
+msgid "Course Name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:204
-msgid "Course archived."
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:28
+msgid "Course Title"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:418
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:12
 msgid "Courses"
 msgstr "Dersler"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1609
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1904
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3674
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:13
 msgid ""
 "Courses are listed either alphabetically or in order by the time of most "
 "recent login activity, oldest first. To change the listing order check the "
@@ -1864,393 +2501,536 @@ msgid ""
 "\"hidden\" or \"visible\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:7
+msgid ""
+"Courses are listed either alphabetically or in order by the time of most "
+"recent login activity, oldest first. To change the listing order check the "
+"mode you want and click \"Refresh Listing\". The listing format is: "
+"Course_Name (status :: date/time of most recent login) where status is "
+"\"hidden\" or \"visible\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:163
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:84
 msgid "Create"
 msgstr "Oluştur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:41
 msgid "Create CSV"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3054
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:31
 msgid "Create Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1071
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:39
+msgid ""
+"Create a .tar.gz archive which includes the course's database and all course"
+" files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:33
 msgid "Create a New Set in This Course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:795
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:4
 msgid "Create a new achievement with ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:33
+msgid "Create a new course on this server."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:20
+msgid ""
+"Create a new course.  The \"Course ID\" is used as the course name and is "
+"used in course links.  Underscores appear as spaces when displaying the "
+"course name.  The \"Course Title\" is used as the title on the course home "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:86
+msgid ""
+"Create a new set with a given name. This can either create an empty set or a"
+" duplicate of an existing set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:12
 msgid "Create as what type of achievement?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:12
 msgid "Create as what type of set?"
 msgstr "Ne tip set oluşturulacak?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1866
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:20
+msgid "Create backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:81
 msgid "Create unattached problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1849
-msgid ""
-"Creates a gzipped tar archive (.tar.gz) of a course in the WeBWorK courses "
-"directory. Before archiving, the course database is dumped into a "
-"subdirectory of the course's DATA directory. Currently the archive facility "
-"is only available for mysql databases. It depends on the mysqldump "
-"application."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:121
+msgid "Create/Delete achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:726
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:26
 msgid "Cupcake of Enlargement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:728
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:38
 msgid "Current"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3042
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:2
 msgid "Currently defined locations are listed below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4352
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2365
 msgid "Database tables are ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:54
 msgid "Database tables need updating."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2753
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:52
 msgid "Database tables ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2968
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1499
 msgid "Database:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:783
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:153
 msgid "Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:727
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:355
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:96
+msgid "Dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:40
+msgid ""
+"Dates for problem sets can be edited by clicking the pencil icon in the "
+"\"Edit Set Data\" column next to the set name. To change dates for several "
+"sets at once, click the check box in the \"Select\" column and choose \"Edit"
+" selected\" from the tasks above."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:426
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:37
 msgid "Default"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1675
+#: /opt/webwork/webwork2/conf/defaults.config:1577
 msgid ""
 "Default Amount of Time (in minutes) after Due Date that Answers are Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1665
+#: /opt/webwork/webwork2/conf/defaults.config:1567
 msgid ""
 "Default Amount of Time (in minutes) before Due Date that the Assignment is "
 "Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1785
+#: /opt/webwork/webwork2/conf/defaults.config:1687
 msgid "Default Length of Reduced Scoring Period in minutes"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1655
+#: /opt/webwork/webwork2/conf/defaults.config:1557
 msgid "Default Time that the Assignment is Due"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1808
+#: /opt/webwork/webwork2/conf/defaults.config:1710
 msgid ""
 "Default number of attempts before Show Me Another can be used (-1 => Never)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1755
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:162
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:91
+#: /opt/webwork/webwork2/conf/defaults.config:1994
+msgid ""
+"Default number of attempts before hints are shown in a problem (-1 => hide "
+"hints)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:89
 msgid "Delete"
 msgstr "Sil"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1556
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1651
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1689
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1728
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:49
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:36
 msgid "Delete Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3480
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:17
+msgid "Delete Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:23
+msgid "Delete Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:37
+msgid "Delete a course and all associated data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:109
+msgid "Delete a student from a course"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:52
 msgid "Delete all existing addresses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1989
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:65
+msgid "Delete backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:64
+msgid "Delete backup from %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:54
 msgid "Delete course after archiving. Caution there is no undo!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:49
 msgid "Delete course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2348
 msgid "Delete field when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2809
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:588
 msgid "Delete it?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3055
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:78
 msgid "Delete location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:28
+msgid "Delete oldest backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2321
 msgid "Delete table when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:729
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:90
+msgid "Delete the sets checked below. Be careful, this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:6
 msgid "Delete which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1045
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:6
 msgid "Delete which sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1041
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:6
 msgid "Delete which users?"
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:394
 msgid "Deleted %1 users."
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:358
 msgid "Deleted %quant(%1,achievement)"
 msgstr ""
 
 #. (join(', ', @delLocations)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3359
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1810
 msgid "Deleted Location(s): %1"
 msgstr ""
 
 #. (join(', ', @toDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3597
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1966
 msgid "Deleted addresses %1 from location."
 msgstr ""
 
-#. ($self->shortPath($self->{tempFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1158
-msgid "Deleting temp file at %1"
+#. ($formatBackupTime)
+#. ($c->formatDateTime($delTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1243
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:569
+msgid "Deleted backup from %1."
+msgstr ""
+
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:679
+msgid "Deleted temp file at %1"
+msgstr ""
+
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1219
+msgid "Deleted temporary file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:125
+msgid "Deleting Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3152
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:68
 msgid ""
 "Deletion deletes all location data and related addresses, and is not "
 "undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:723
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:3
 msgid "Deletion destroys all achievement-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:185
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
 msgid "Deny From"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1467
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:27
 msgid "Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:256
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:71
+msgid "Description:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:69
 msgid "Deselect All Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:229
 msgid "Deselect All Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:428
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:366
 msgid "Didn't recognize action"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:27
 msgid "Directory"
 msgstr ""
 
 #. ($file, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:793
-msgid "Directory '%1' not removed: %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:327
+msgid "Directory \"%1\" not removed: %2"
 msgstr ""
 
 #. ($file, $removed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:792
-msgid "Directory '%1' removed (items deleted: %2)"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:325
+msgid "Directory \"%1\" removed (items deleted: %2)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:412
-msgid "Directory permission errors "
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:33
+msgid "Directory permission errors"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2861
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2994
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1439
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1575
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:44
 msgid ""
 "Directory structure is missing directories or the webserver lacks sufficient"
 " privileges."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1267
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2210
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2857
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1434
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1570
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:41
 msgid "Directory structure is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2285
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:102
 msgid "Directory structure needs to be repaired manually before archiving."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1338
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:84
 msgid "Directory structure needs to be repaired manually before renaming."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2750
-msgid "Directory structure or permissions need to be repaired. "
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:48
+msgid "Directory structure or permissions need to be repaired."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2853
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1414
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1540
 msgid "Directory structure:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2536
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:365
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:92
+msgid "Display Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:90
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:104
 msgid "Display Mode:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:463
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:37
 msgid "Display Past Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
-msgid "Display of scores for this set is not allowed."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:44
+msgid "Display mode for equations"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:311
+msgid "Display of scores for this test is not allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:589
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:12
 msgid "Display options: Show"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2017
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:48
+msgid ""
+"Display sets matching a selected criteria. Useful if there are many sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1918
 msgid "Display the evaluated student answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:176
+#. ('<code>COURSENAME_totals.csv</code>',
+#. '<code>COURSENAME_totals_bak1.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:74
+msgid ""
+"Do NOT use the file name %1, since you might accidentally overwrite that if "
+"you again export your WeBWorK homework scores. (Actually the earlier file is"
+" moved to %2 -- so you can recover using the File Manager.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:57
 msgid "Do not unassign students unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:233
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:67
 msgid "Do not uncheck a set unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:20
 msgid "Do not uncheck students, unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2450
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:656
 msgid "Do you want to grade this test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2272
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:93
+msgid "Documentation from source code for PG modules and macro files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:95
 msgid "Don't Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2607
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:13
 msgid "Don't Unarchive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2912
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:46
 msgid "Don't Upgrade"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1749
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:15
 msgid "Don't delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1120
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:24
 msgid "Don't make changes"
 msgstr ""
 
 #. ($saveMode)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:317
 msgid "Don't recognize saveMode: |%1|. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1307
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1321
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1335
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:87
 msgid "Don't rename"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:547
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:33
 msgid "Don't use in an achievement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:683
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1345
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2465
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1595
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:766
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:57
 msgid "Done"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:159
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:365
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:8
 msgid "Download"
 msgstr ""
 
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($set->set_id)
 #. ($ver->{id} =~ s/_/ /gr)
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($set->set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:731
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:732
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:413
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:204
 msgid "Download %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:23
 msgid "Download Hardcopy"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:865
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:56
 msgid "Download PDF or TeX Hardcopy for Current Set"
 msgstr "Mevcut seti Yazdırmak için dosya indir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:764
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:233
 msgid "Download PDF or TeX Hardcopy for Selected Tests"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($selected_set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:595
+#. (tag('span', dir => 'ltr', format_set_name_display($selected_set_id =~
+#. s/,v(\d+)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:58
 msgid "Download hardcopy of set %1 for %2?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:369
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:63
+msgid "Download/upload archived courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:46
 msgid "Download:"
 msgstr ""
 
@@ -2258,139 +3038,181 @@ msgstr ""
 msgid "Drop"
 msgstr "Bırak"
 
-#. ($self->formatDateTime($set->reduced_scoring_date, undef,
-#. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:107
-msgid "Due %1, after which reduced scoring is available until %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:100
+msgid "Drop student from the course"
 msgstr ""
 
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:310
 msgid "Due date %1 has passed."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2093
+#: /opt/webwork/webwork2/conf/defaults.config:2014
 msgid "E-Mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:315
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:261
 msgid "E-mail Instructor"
 msgstr "Eğitmene E-posta"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2128
-msgid "E-mail addresses which can receive e-mail from a pg problem"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:2138
+#: /opt/webwork/webwork2/conf/defaults.config:2049
 msgid ""
 "E-mail feedback from students automatically sent to this permission level "
 "and higher"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2109
+#: /opt/webwork/webwork2/conf/defaults.config:2030
 msgid "E-mail verbosity level"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:357
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:43
 msgid "E-mail:"
 msgstr "E-posta"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:35
 msgid "Earned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:71
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:158
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:334
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:417
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:547
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2743
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1628
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1186
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1203
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:257
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:479
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:6
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:53
 msgid "Edit"
 msgstr "Düzenle"
 
-#. (CGI::a({ href => $basicInfoUrl }, $r->maketext('class list data')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:199
-msgid "Edit %1 for  %2 (%3) who has been assigned %4 sets."
+#. (link_to(maketext('class list data')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:47
+msgid "Edit %1 for %2 (%3) who has been assigned %4 sets."
 msgstr ""
 
-#. (CGI::a({ href => $editUsersAssignedToSetURL }, $r->maketext('individual
-#. versions')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2223
-msgid "Edit %1 of set %2."
+#. (link_to(maketext('individual user settings')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:162
+msgid "Edit %1 for set %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:6
 msgid "Edit Assigned Users"
 msgstr "Ödev verilmiş kullanıcıları düzenle"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:40
 msgid "Edit Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1488
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:58
 msgid "Edit Evaluator"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:253
 msgid "Edit Header"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3053
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:18
 msgid "Edit Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2741
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:111
 msgid "Edit Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:5
 msgid "Edit Problems"
 msgstr "Soruları Düzenle"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:583
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:3
 msgid "Edit Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:421
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:4
 msgid "Edit Set Data"
 msgstr "Set Bilgilerini Düzenle"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:171
+msgid "Edit Tags"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:30
 msgid "Edit Target Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1487
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:18
 msgid "Edit Users"
 msgstr ""
 
-#. ($user)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:207
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:127
+msgid "Edit achievement evaluator"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:90
+msgid "Edit achievement information"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:65
+msgid ""
+"Edit achivements for the course. This link is only present if achievements "
+"are enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:42
+msgid "Edit class list data"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:39
+msgid ""
+"Edit class roster data. Add students, edit student data, drop students from "
+"class, import students from a classlist, and give user professor privileges."
+" Access to individual homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:70
 msgid "Edit data for %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1248
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:46
+msgid ""
+"Edit homework sets for entire class. Change homework set due dates, create "
+"new sets from a set definition file, create new homework sets, make sets "
+"visible/invisible, score homework sets. Assign homework sets to the class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:219
 msgid "Edit it"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2192
-msgid "Edit set %1 data for ALL students assigned to this set."
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:135
+msgid "Edit set %1 for ALL students assigned to this set."
 msgstr ""
 
-#. (CGI::a({href=>$editSetLink},$setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2166
+#. (link_to(                                               $setID =>
+#. $c->systemLink(
+#. $setDetailPage, params => { effectiveUser => $user->user_id, editForUser =>
+#. $user->user_id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:106
 msgid "Edit set %1 for this user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3393
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:95
+msgid "Edit set for %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:4
 msgid ""
 "Edit the current value of the location description, if desired, then add and"
 " select addresses to delete, and then click the \"Take Action\" button to "
@@ -2398,174 +3220,219 @@ msgid ""
 "changes and return to the Manage Locations page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:429
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:2
 msgid "Edit which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:829
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:2
 msgid "Edit which sets?"
 msgstr "Hangi setler düzenlecek?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:935
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:2
 msgid "Edit which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:592
-msgid "Editing <strong>blank problem</strong> in file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:31
+msgid "Editing <strong>course information</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:595
-msgid "Editing <strong>course information</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:30
+msgid "Editing <strong>hardcopy header</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
-msgid "Editing <strong>hardcopy header</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:28
+msgid "Editing <strong>new problem</strong> template."
+msgstr ""
+
+#. ($c->{prettyProblemNumber},                             tag('span', dir =>
+#. 'ltr', format_set_name_display($fullSetName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:45
+msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:29
+msgid "Editing <strong>set header</strong> file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:33
+msgid "Editing <strong>unassigned problem</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:596
-msgid "Editing <strong>options information</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:32
+msgid "Editing <strong>unknown file type</strong> in file \"%1\"."
 msgstr ""
 
-#. ($prettyProblemNumber,                  CGI::span({ dir => 'ltr' },
-#. format_set_name_display($fullSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:605
-msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:19
+msgid "Editing Modes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:593
-msgid "Editing <strong>set header</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:140
+msgid "Editing Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:598
-msgid "Editing <strong>unassigned problem</strong> file \"%1\""
+#. ($c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:16
+msgid "Editing achievement in file \"%1\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:597
-msgid "Editing <strong>unknown file type</strong> in file \"%1\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:22
+msgid "Editing for all students"
 msgstr ""
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:209
-msgid "Editing achievement in file '%1'"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:23
+msgid "Editing for one student or a proper subset of all students"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3390
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:1
 msgid "Editing location %1"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display("$setID$vermsg")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2182
-msgid "Editing problem set %1 data for these individual students: %2"
+#. (tag(                                           'strong',
+#. dir => 'ltr',
+#. format_set_name_display($setID . ($editingSetVersion ?
+#. ",v$editingSetVersion" : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:123
+msgid "Editing problem set %1 for these students: %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:315
 msgid "Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:669
-msgid "Editor rows:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1668
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:229
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:53
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:68
 msgid "Email"
 msgstr "E-posta"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:32
 msgid "Email Address"
 msgstr "E-posta Adresi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:817
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:170
 msgid "Email Body:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:17
+msgid "Email Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:339
 msgid "Email Instructor On Failed Attempt"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2003
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:28
 msgid "Email Link"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:789
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:112
 msgid "Email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1807
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1832
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:311
+msgid "Email body is empty. No message sent. "
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:994
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_email.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_form.html.ep:24
 msgid "Email instructor"
 msgstr "Eğitmene E-posta"
 
-#. (scalar(@{ $self->{ra_send_to} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:454
+#. (scalar(@{ $c->{ra_send_to} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:27
+msgid ""
+"Email is being sent to %quant(%1,recipient). You will be notified by email "
+"when the task is completed.  This may take several minutes if the class is "
+"large."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:13
+msgid "Email:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:26
 msgid ""
-"Email is being sent to %quant(%1,recipient). You will be notified by email\n"
-"\t\t\t\twhen the task is completed.  This may take several minutes if the class is\n"
-"\t\t\t\tlarge."
+"Emails can contain personalized data, such as name, section, or status.  "
+"Click \"List of insertable macros\" for a full list available variables.  "
+"Additional personal data can be included by using a merge file.  A merge "
+"file is a CSV file located in the [Scoring] directory in which the first "
+"column is the student id, followed by additional data (such as student "
+"grades).  This data is identified by which column it is in, for instance if "
+"the scores where in the 4th column of the merge file, insert them into an "
+"email using the variable $COL[4].  The \"Scoring Tools\" page can export "
+"grades into a CSV that can be used as a merge file.  Upload customized merge"
+" files with the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:11
 msgid "Emails to be sent to the following:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1704
+#: /opt/webwork/webwork2/conf/defaults.config:1606
 msgid "Enable Achievement Rewards"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1723
+#: /opt/webwork/webwork2/conf/defaults.config:1625
 msgid "Enable Conditional Release"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1689
+#: /opt/webwork/webwork2/conf/defaults.config:1591
 msgid "Enable Course Achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1645
+#: /opt/webwork/webwork2/conf/defaults.config:1547
 msgid "Enable Progress Bar and current problem highlighting"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1734
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:585
+#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Enable Reduced Scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1799
+#: /opt/webwork/webwork2/conf/defaults.config:1701
 msgid "Enable Show Me Another button"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:156
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:24
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:92
 msgid "Enable Spell Checking"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1844
+#: /opt/webwork/webwork2/conf/defaults.config:1746
 msgid "Enable periodic re-randomization of problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:416
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:29
 msgid ""
 "Enable reduced scoring for a homework set.  This will allow you to submit "
 "answers for partial credit for 24 hours after the close date."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1461
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1483
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:20
 msgid "Enabled"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1846
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:58
+msgid "Enabled:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1748
 msgid ""
 "Enables periodic re-randomization of problems after a given number of "
 "attempts. Student would have to click Request New Version to obtain new "
 "version of the problem and to continue working on the problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1725
+#: /opt/webwork/webwork2/conf/defaults.config:1627
 msgid ""
 "Enables the use of the conditional release system.  To use conditional "
 "release you need to specify a list of set names on the Problem Set Detail "
@@ -2574,14 +3441,14 @@ msgid ""
 " sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1801
+#: /opt/webwork/webwork2/conf/defaults.config:1703
 msgid ""
 "Enables use of the Show Me Another button, which offers the student a newly-"
 "seeded version of the current problem, complete with solution (if it exists "
 "for that problem)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:662
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:163
 msgid "End"
 msgstr ""
 
@@ -2589,538 +3456,662 @@ msgstr ""
 msgid "Enrolled"
 msgstr "Kayıtlı"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:788
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:111
 msgid "Enrolled, Drop, etc."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:830
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:859
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:888
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:917
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:128
 msgid "Enrollment Status"
 msgstr "Kayıt Durumu"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:21
 msgid "Enter filename below"
 msgstr "Aşağıya dosya adı girin"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:20
 msgid "Enter filenames below"
 msgstr "Aşağıya dosya isimlerini girin"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:19
 msgid ""
 "Enter information below for students you wish to add. Each student's "
 "password will initially be set to their student ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1997
+#: /opt/webwork/webwork2/conf/defaults.config:1899
 msgid ""
 "Enter one of the allowed display mode types above.  See 'display modes "
 "entry' for descriptions."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:297
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:34
+msgid ""
+"Enter the details of the course instructor to be added when the course is "
+"created.  This user will also be added to the admin course with the username"
+" \"userID_courseID\" so you can manage and email the instructors of the "
+"courses on the server."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:284
 msgid "Entered"
 msgstr "Yanıt"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:85
-msgid "Entered student:"
-msgstr ""
-
-#. ($display_sort_method_name{$primary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:698
+#. ($display_sort_method_name{$primary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:98
 msgid "Entries are sorted by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:247
 msgid "Equation Display"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:61
+msgid "Equation Editor"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1516
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1460
 msgid "Error adding set-level proctor: %1"
 msgstr ""
 
+#. ($fromPath, $toPath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:664
+msgid "Error copying %1 to %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:14
+msgid "Error details"
+msgstr ""
+
+#. ($filePath, stash('podError')
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:27
+msgid "Error generating POD for file %1: %2"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1492
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1437
 msgid ""
 "Error getting old set-proctor password from the database: %1.  No update to "
 "the password was done."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:31
 msgid "Error message:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2235
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:12
 msgid "Error messages"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1616
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:754
 msgid "Error: Answer date must come after close date in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:747
 msgid "Error: Close date must come after open date in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1634
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:778
 msgid ""
 "Error: Reduced scoring date must come between the open date and close date "
 "in set %1"
 msgstr ""
 
-#. ($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2067
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:7
 msgid "Error: The original file %1 cannot be read."
 msgstr ""
 
 #. ($setID)
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1240
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:738
 msgid "Error: answer date cannot be more than 10 years from now in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1235
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:733
 msgid "Error: close date cannot be more than 10 years from now in set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:630
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:234
 msgid "Error: no file data was submitted!"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1599
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:728
 msgid "Error: open date cannot be more than 10 years from now in set %1"
 msgstr ""
 
-#. ($problem_desc, $problem_name, CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1404
+#. ($problem_desc, $problem_name, $c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1210
 msgid ""
 "Errors encountered while processing %1. This %2 has been omitted from the "
 "hardcopy. Error text: %3"
 msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3832
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:8
+msgid "Errors occured while generating hardcopy:"
+msgstr ""
+
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2128
 msgid ""
 "Errors occured while hiding the courses listed below when attempting to "
 "create the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3920
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2197
 msgid ""
 "Errors occured while unhiding the courses listed below when attempting "
 "delete the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1468
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:28
 msgid "Evaluator File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3839
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:76
+msgid "Evaluator File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:28
+msgid "Evaluator Variables"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2143
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
-"hidden."
+"Except for the errors listed above, all selected courses are already hidden."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3904
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2212
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
+"Except for the errors listed above, all selected courses are already "
 "unhidden."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3456
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:39
 msgid ""
 "Existing addresses for the location are given in the scrolling list below.  "
 "Select addresses from the list to delete them:"
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2281
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1460
 msgid "Existing file %1 could not be backed up and was lost."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2514
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:354
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:65
 msgid "Expand All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:364
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:78
 msgid "Expand All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2667
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:418
 msgid "Expand Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2792
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:574
 msgid "Expand Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:74
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:89
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:67
+msgid ""
+"Expand problem details that have been collapsed. Note that the details of a "
+"single problem can be expanded by clicking on the down arrow to the right of"
+" the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:71
 msgid "Export"
 msgstr "Dışa aktar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1098
-msgid "Export selected achievements."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:113
+msgid "Export achievement data"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_export_form.html.ep:1
+msgid "Export selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1267
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:17
 msgid "Export to what kind of file?"
 msgstr "Ne çeşit dosyaya aktarılacak?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:2
 msgid "Export which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1245
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:5
 msgid "Export which users?"
 msgstr "Hangi kullanıcılar dışarı aktarılacak?"
 
 #. ($FileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1151
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:591
 msgid "Exported achievements to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1616
-msgid "Extend the close date for which Gateway?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:48
+msgid "Extend the close date for which test?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:148
+msgid "Extend the number of attempts allowed a student on a given problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1573
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:28
 msgid ""
-"Extends the close date of a gateway test by 24 hours. Note: The test must "
-"still be open for this to work."
+"Extends the close date of a test by 24 hours. Note: The test must still be "
+"open for this to work."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "FIRST NAME"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Failed to add user:"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:416
 msgid "Failed to create new achievement: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:373
 msgid "Failed to create new achievement: no achievement ID specified!"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:573
 msgid "Failed to create new set: %1"
 msgstr "Yeni set yaratılamadı: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1158
-msgid "Failed to create new set: no set name specified!"
-msgstr "Yeni set oluşturulamadı: set adı belirtilmemiş!"
+#. ($newSetID =~ s/_/ /gr)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:482
+msgid ""
+"Failed to create new set: Invalid characters in set name \"%1\". A set name "
+"may only contain letters, numbers, hyphens, periods, and spaces."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:474
+msgid "Failed to create new set: No set name specified."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1155
-msgid "Failed to create new set: set name cannot exceed 100 characters."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:469
+msgid "Failed to create new set: Set name cannot exceed 100 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:396
 msgid ""
 "Failed to duplicate achievement: no achievement selected for duplication!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:530
 msgid "Failed to duplicate set: no set selected for duplication!"
 msgstr "Set çoğaltılamadı: herhangi bir set seçili değil!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:74
-msgid "Failed to enter student:"
+#. ($@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:67
+msgid "Failed to generate course archive: %1"
 msgstr ""
 
 #. ($scoreFilePath)
 #. ($filePath)
 #. ($FilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1125
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:649
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:955
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2402
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1584
 msgid "Failed to open %1"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:227
 msgid "Failed to save: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#. ($_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:253
+msgid "Failed to send message: %1"
+msgstr ""
+
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:23
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:36
 msgid "False"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1919
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:63
 msgid "Feature exhausted for this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:200
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:23
+msgid "Features:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:252
 msgid "Feedback"
 msgstr "Geri Bildirim"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2159
+#: /opt/webwork/webwork2/conf/defaults.config:2070
 msgid "Feedback by Section."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:234
 msgid "FeedbackMessage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1177
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2113
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2284
 msgid "Field is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2109
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2286
 msgid "Field missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1175
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2111
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4290
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
 msgid "Field missing in schema"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:599
-msgid "File '%1' exists.  File not saved.  No changes have been made."
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:266
+msgid "File \"%1\" exists.  File not saved.  No changes have been made."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1926
-msgid ""
-"File '%1' exists. File not saved. No changes have been made.  You can change"
-" the file path for this problem manually from the 'Hmwk Sets Editor' page"
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1036
+msgid "File \"%1\" exists. File not saved. No changes have been made."
 msgstr ""
 
-#. ($file,$!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:796
-msgid "File '%1' not removed: %2"
+#. ($file, $!)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:333
+msgid "File \"%1\" not removed: %2"
 msgstr ""
 
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:795
-msgid "File '%1' successfully removed"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+msgid "File \"%1\" successfully removed"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1066
-msgid "File '%1' uploaded successfully"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:522
+msgid "File \"%1\" uploaded successfully"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:476
 msgid "File <b>%1</b> already exists. Overwrite it, or rename it as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:364
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:55
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:70
 msgid "File Manager"
 msgstr "Dosya Yöneticisi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:628
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:17
+msgid "File Manager Help"
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:541
+msgid "File not saved. Failed to open \"%1\" for writing."
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:528
+msgid ""
+"File not saved. The file \"%1\" is not contained in the templates directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:921
+msgid ""
+"File not saved. The file name for this problem does not match the file name "
+"the editor was opened with. The problem set may have changed. Please reopen "
+"this file from the homework sets editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:228
 msgid "File saved"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:733
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:272
 msgid "File successfully copied"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:758
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:295
 msgid "File successfully renamed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:29
 msgid "Filename"
 msgstr "Dosya adı"
 
-#. ($extension,$location)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1296
-msgid "Files with extension '.%1' usually belong in '%2'"
+#. ($extension, $location)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:699
+msgid "Files with extension \".%1\" usually belong in \"%2\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:20
+msgid ""
+"Fill out the form below to add, edit, or delete locations.  Locations are "
+"used to restrict access to sets based on ip address.  Locations are "
+"configured here in the administration course, then used in a normal course."
+"  When configuring a set to use a restricted ip address, the instructor can "
+"choose to either restrict access to the location or deny access from a "
+"location, which are identified by their name.  Instructors can select "
+"multiple locations to restrict access to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:78
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:47
 msgid "Filter"
 msgstr ""
 
 #. ($recitation)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1184
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1112
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1420
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:913
 msgid "Filter by recitation %1"
 msgstr ""
 
 #. ($section)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1180
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1416
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:910
 msgid "Filter by section %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:733
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:31
 msgid "Filter by what text?"
 msgstr "Hangi metin ile filtrelenecek?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:151
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:17
 msgid "Filter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:749
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:137
 msgid "First"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:593
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1992
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:827
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:856
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:885
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:914
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:87
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:21
 msgid "First Name"
 msgstr "İsim"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:107
 msgid "First name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:178
 msgid ""
 "For security reasons, you cannot specify a message file from a directory "
 "higher than the email directory (you can't use ../blah/blah for example). "
 "Please specify a different file or move the needed file to the email "
-"directory"
+"directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:30
+msgid "Force editor to RTL"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2928
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:674
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:101
 msgid "Force problems to be numbered consecutively from one"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:409
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:35
+msgid "Form Elements Present on the Page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:75
 msgid "Format"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2096
+#: /opt/webwork/webwork2/conf/defaults.config:2017
 msgid "Format for the subject line in feedback e-mails"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:172
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:133
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:10
 msgid "Format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:12
 msgid "Found no directories containing problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1112
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:43
 msgid "From This Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:318
 msgid "From field must contain one valid email address."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:340
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:621
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:20
+msgid ""
+"From this page you can <strong>add new students</strong>, "
+"<strong>edit</strong> class list data (name, email address, recitation, "
+"section, permission level, and enrollment status), <strong>change "
+"passwords</strong>, and <strong>export</strong> (save) class lists for back-"
+"up or use in another course. You can also delete students from the class "
+"roster, but this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:34
 msgid "From:"
 msgstr "Gönderen:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:59
 msgid "GLOBAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1512
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1619
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1728
-msgid "Gateway Name"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:210
-msgid "Gateway Quiz %2"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:853
-msgid "Gateway parameters"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/conf/defaults.config:1427
 msgid "General"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2305
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:201
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:30
 msgid "General Information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:745
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:669
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:670
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:222
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:116
+msgid "General Page Information"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:121
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:166
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:167
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:113
 msgid "Generate Hardcopy"
 msgstr "Yazdırılabilir dosya oluştur"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:262
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:73
 msgid "Generate Hardcopy for Selected Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:744
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:115
+msgid ""
+"Generate a hardcopy of the problem being edited. This does not change the "
+"permanent file on the disk. You can generate a hardcopy for different "
+"versions of the same problem by changing the seed. You can also change the "
+"format to \"PDF\" or \"TeX Source\". If \"PDF\" is selected, then a PDF file"
+" will be generated for download, unless there are errors. If errors occur or"
+" \"TeX Source\" is selected, then a zip file will be generated for download "
+"that contains the TeX source file and resources needed for generating the "
+"PDF file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:20
+msgid ""
+"Generate hardcopies of assignments in PDF or latex format. To produce a "
+"hardcopy, one selects the users on the left and the sets on the right. All "
+"users and sets are listed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:170
 msgid "Generate hardcopy for selected sets and selected users"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:184
-#: /opt/webwork/pg/macros/problemRandomize.pl:185
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:186
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:187
 msgid "Get a new version of this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:986
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:2
 msgid "Give new password to which users?"
 msgstr "Hangi kullanıcılara yeni şifre verilecek?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1063
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:27
 msgid "Gives full credit on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1180
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:27
 msgid "Gives full credit on every problem in a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:846
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:27
 msgid "Gives half credit on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:27
 msgid "Gives half credit on every problem in a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:62
 msgid "Global Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1422
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:76
 msgid "Global Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:49
 msgid "Global Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:51
 msgid ""
 "Global data on problem usage is contributed by many institutions using "
 "WeBWorK all over the world. The Usage figure is the total number of  "
@@ -3130,198 +4121,324 @@ msgid ""
 msgstr ""
 
 #. ($problemID, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1549
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1489
 msgid "Global problem %1 for set %2 not found."
 msgstr ""
 
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:334
+#. ($c->{prettyID}, $c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:378
+msgid "Global problem %1 not found for set %2."
+msgstr ""
+
+#. ($c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:142
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:372
 msgid "Global set %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2093
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:77
 msgid "Global set data will be shown instead of user specific data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:28
 msgid "Go"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:483
 msgid "Go back to Part 1"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:291
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
-#: /opt/webwork/pg/macros/compoundProblem.pl:491
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:293
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:498
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:512
 msgid "Go on to next part"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2651
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:544
 msgid "Grade"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2649
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:383
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:970
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:541
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:75
 msgid "Grade Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2446
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:651
 msgid "Grade Test"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:148
+msgid "Grade of Active Students"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:55
 msgid "Grade passback mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:837
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:38
 msgid "Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:236
 msgid "Grades"
 msgstr "Notlar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:110
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:17
+msgid "Grades Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:115
 msgid "Grades have been saved for all current users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:221
-msgid "Grading assignment:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:28
+msgid "Grading Assignment"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:152
+msgid "Grading Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1062
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:26
 msgid "Greater Rod of Revelation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1179
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:26
 msgid "Greater Tome of Enlightenment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:285
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:50
+msgid ""
+"Groups types of achievements. The \"level\" and \"secret\" categories are "
+"special (described above), and categories can be used to create achievement "
+"chains."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:74
 msgid "Guest Login"
 msgstr "Misafir Kullanıcı Girişi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2251
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:86
+msgid "Guest:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:33
 msgid "HTTP Headers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:682
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:35
+msgid "Hardcopy Format"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:115
 msgid "Hardcopy Format:"
 msgstr "Çıktı Dosyası Başlığı"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:270
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:285
 msgid "Hardcopy Generator"
 msgstr "Çıktı Dosyası Başlığı"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:101
 msgid "Hardcopy Header"
 msgstr "Çıktı Dosyası Başlığı"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1623
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:724
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:324
+msgid "Hardcopy Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:17
+msgid "Hardcopy Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:153
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:44
 msgid "Hardcopy Theme"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:408
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:427
 msgid "Hardcopy will always print the original version of the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:31
 msgid "Headers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1048
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:296
 msgid "Help"
 msgstr "Yardım"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:797
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:170
 msgid "Help Icon"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:542
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:30
+msgid ""
+"Here is a list of the variables the evaluator has access to. Unless "
+"indicated, changes to the variables will not be saved.  Evaluators are run "
+"in the same order they are listed on the achievement editor page and are "
+"only run if the achievement has not been earned. Keep this in mind when "
+"using persistent global data."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:507
 msgid "Here is a new version of your problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:914
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:42
 msgid "Hidden"
 msgstr "Gizli"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:347
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:62
 msgid "Hide All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3663
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3718
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3760
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:384
-msgid "Hide Courses"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:17
+msgid "Hide Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:428
-msgid "Hide Hints"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:57
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:44
+msgid "Hide Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:477
 msgid "Hide Hints from Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1566
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:63
+msgid "Hide all rendered problems on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:252
 msgid "Hide this problem"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1523
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1524
 msgid "Hint:"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1522
 msgid "Hint: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:658
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1771
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:99
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:51
 msgid "Hints"
 msgstr "İpuçlarını göster"
 
 # Hmwk is short for Homework
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:364
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:327
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:44
 msgid "Hmwk Sets Editor"
 msgstr "Ödev Setleri Düzenleyici"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:779
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:80
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:108
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:19
 msgid "Homework Sets"
 msgstr "Soru Grupları"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:38
 msgid "Homework Totals"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1432
-msgid "I couldn't find the file [ACHEVDIR]/surprise_message.txt!"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:17
+msgid "Homwork Sets Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:88
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:31
+msgid "How to:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:36
+msgid "I couldn't find the file [ACHIEVEMENT_DIR]/surprise_message.txt!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1451
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:9
 msgid "Icon"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:29
 msgid "Icon File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:612
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:80
+msgid "Icon File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:24
+msgid ""
+"If \"PDF\" is selected, then a PDF file will be generated for download, "
+"unless there are errors.  If errors occur generating a PDF file or \"TeX "
+"Source\" is selected then a zip file will be generated for download that "
+"contains the TeX source file and resources needed for generating the PDF "
+"file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:37
+msgid ""
+"If \"TeX Source\" is selected, a zip file containing a TeX file and other "
+"files needed to generate a PDF hardcopy will be produced. If \"Adobe PDF\" "
+"is selected then only a PDF file will be produced."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:84
 msgid ""
 "If a password field is left blank, the student's current password will be "
 "maintained."
 msgstr "Şifre alanı boş bırakılırsa kullanıcının mevcut şifresi kullanılır."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:42
+msgid ""
+"If selected, the file path of the problem source will be printed in the "
+"output."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:38
+msgid ""
+"If selected, this adds spaces between the fields to align the commas, which "
+"makes the columns easy to read when in text form but it can confuse some "
+"spreadsheet applications since the extra spaces violate the csv standard "
+"(although Excel handles them with no problem). This will give a visual form "
+"of the CSV file that is easy to read on the page. If you want a reliable "
+".csv file for use in any spreadsheet application unclick the \"Pad Fields\" "
+"option. You can download the .csv file immediately by clicking on the link "
+"with the filename chosen above, or you can download it using the \"File "
+"Manager\" from the scoring directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:148
+msgid ""
+"If the original problem can not be edited than the path name must be changed"
+" in order to be allowed to save the problem. Adding \"local/\" to the "
+"beginning of the original path is the default solution. All locally created "
+"and edited files will then appear in a subdirectory named \"local\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:513
 msgid ""
 "If this flag is set then this problem will count towards the grade of its "
 "parent problem.  In general the adjusted status on a problem is the larger "
@@ -3329,20 +4446,28 @@ msgid ""
 "problems which have this flag enabled."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
 msgid ""
 "If this is enabled then instructors with the ability to receive feedback "
 "emails will be notified whenever a student runs out of attempts on a problem"
-" and its children without receiving an adjusted status of 100%."
+" and its children  without receiving an adjusted status of 100%."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:334
 msgid ""
 "If this is enabled then students will be unable to attempt a problem until "
 "they have completed all of the previous problems, and their child problems "
 "if necessary."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:57
+msgid ""
+"If this is selected, a success index is listed in each csv file. The success"
+" index is a number assigned on the basis of the number of incorrect attempts"
+" (roughly equivalent to 1/the number of attempts) which seems to correlate "
+"with the relative difficulty the student had with the problem."
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:47
 msgid ""
 "If this is set, all users (including the instructor) must enter the WeBWorK "
@@ -3350,8 +4475,8 @@ msgid ""
 "they receive a message directing them back to the LMS."
 msgstr ""
 
-#. (CGI::b($r->maketext("Remember Me")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:201
+#. (tag('strong', maketext('Remember Me')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:33
 msgid ""
 "If you check %1 your login information will be remembered by the browser you"
 " are using, allowing you to visit WeBWorK pages without typing your user "
@@ -3360,273 +4485,419 @@ msgid ""
 " have direct control."
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:407
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:154
+msgid ""
+"If you click on the \"Grade Problem\" icon to the right of the problem "
+"number, then the problem will open in the manual problem grader. This page "
+"shows the rendered problem and lists all students assigned to the set and "
+"the last answer the students entered for the problem. You can then change "
+"the recorded scores for students on this problem and provide instructor "
+"feedback comments."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:148
+msgid ""
+"If you click on the \"Open in New Window\" icon to the right of the problem "
+"number, then the problem will open in the actual homework set in a new tab "
+"or window."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:425
 msgid "If you come back to it later, it may revert to its original version."
 msgstr ""
 
+#. ('<code>report_grades_data.csv</code>', '<code>report_grade.msg</code>',
+#. '<code>$COL</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:80
+msgid ""
+"If you upload your file on the web with the name: %1 and also create an "
+"email message with the name %2 with the approriate %3 variables then not "
+"only can you email the message with the embedded grades to the students, but"
+" files with those exact names are automatically appended to the \"Grades\" "
+"page seen by the students."
+msgstr ""
+
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:798
-msgid "Illegal file '%1' specified"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:337
+msgid "Illegal file \"%1\" specified"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1445
 msgid "Illegal filename contains '..'"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:73
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:63
 msgid "Import"
 msgstr "İçeri Aktar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1291
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:65
+msgid ""
+"Import a single set or multiple sets from a set definition file. (Use the "
+"\"File Manager\" to upload/download set definition files.) The \"Shift "
+"Dates...\" option is useful for problem sets that were used from other "
+"courses and will shift all of the dates."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:16
 msgid "Import from where?"
 msgstr "Nereden aktarılacak?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1270
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:5
 msgid "Import how many sets?"
 msgstr "Kaç set aktarılacak?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:31
 msgid "Import sets with names"
 msgstr "Setleri isimleriyle beraber aktar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:5
 msgid "Import users from what file?"
 msgstr "Kullanıcılar hangi dosyadan aktarılacak?"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:99
+msgid "Import/export achievements"
+msgstr ""
+
 #. ($count)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:516
 msgid "Imported %quant(%1,achievement)"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:25
+msgid ""
+"In both cases, one can select the sort field, the format of the display "
+"list, and the filter. \"Change Display Settings\" must be clicked to update "
+"the list."
+msgstr ""
+
 #. ($total_inprogress, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1019
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:28
 msgid "In progress: %1/%2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:47
 msgid "Inactive"
 msgstr "Aktif Değil"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1601
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:51
+msgid "Inactive Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1503
 msgid "Inactivity time before a user is required to login again"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:42
 msgid "Include Contrib"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:35
 msgid "Include OPL"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:32
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:55
 msgid "Include Success Index"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:62
 msgid "Include percentage grades columns for all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:471
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:302
 msgid "Incorrect"
 msgstr ""
 
 #. ($total_incorrect, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1033
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:36
 msgid "Incorrect: %1/%2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:26
+msgid ""
+"Indicates the number of problems in the set. Clicking on the link opens the "
+"set detail page which allows you to modify set parameters, edit set headers,"
+" and change parameters of problems in the set such as the number of allowed "
+"attempts or the weight (credit value). You can also add, remove, view, edit,"
+" and reorder the problems in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:141
+msgid "Individual Problem Results"
+msgstr ""
+
 # Short for Initial
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:41
 msgid "Init"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:502
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:35
 msgid "Institution"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2344
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:560
 msgid "Instructor Comment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1494
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1306
 msgid "Instructor Feedback:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:311
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:17
+msgid "Instructor Links Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:29
 msgid "Instructor Tools"
 msgstr "Eğitmen Araçları"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1228
-msgid "Instructor solution preview: show the student solution after due date."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:17
+msgid "Instructor Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:90
+msgid "Instructor:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:377
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:326
 msgid "Invalid Reply-to address."
 msgstr ""
 
 #. ($output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:187
 msgid ""
-"Invalid file name. The file name \"%1\" does not have a \".msg\" extension "
-"All email file names must end in the extension \".msg\" choose a file name "
-"with a \".msg\" extension. The message was not saved."
+"Invalid file name \"%1\". All email file names must end with the \".msg\" "
+"extension.  Choose a file name with the \".msg\" extension. The message was "
+"not saved."
 msgstr ""
 
 #. ($headerType)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1951
 msgid "Invalid headerType %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:177
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/XMLRPC.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:173
 msgid "Invalid user ID or password."
 msgstr "Yanlış kullanıcı adı ya da şifre."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2244
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:34
+msgid ""
+"It is important that students enter an email address or they will not "
+"recieve any of the important emails sent by the instructor. The email "
+"address will only be present on the page if the user has permission to "
+"change the email address."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:20
+msgid "It lists the homework problem sets available for the students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:472
 msgid "Jump to Problem:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:867
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:939
 msgid "Just-In-Time parameters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:130
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:85
+msgid "Key Map"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:14
 msgid "Key Map:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:93
 msgid "Keywords:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "LAST NAME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1477
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:119
 msgid "LOCAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:100
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:103
 msgid "LTI"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1548
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:25
+msgid "LTI Grade Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:460
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:75
+msgid "LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:17
+msgid "LTI Grade Update Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:16
+msgid "LTI grade passback is not enabled for this course"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:63
+msgid "LTI update of all users and sets queued."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:64
+msgid "LTI update of all users queued."
+msgstr ""
+
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:58
+msgid "LTI update of set %1 queued."
+msgstr ""
+
+#. ($userID, $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:56
+msgid "LTI update of user %1 and set %2 queued."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:60
+msgid "LTI update of user %1 queued."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1450
 msgid "Language (refresh page after saving changes to reveal new language.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:758
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:140
 msgid "Last"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:460
 msgid "Last Answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:604
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:231
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2001
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:828
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:857
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:915
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:31
+msgid "Last Full Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:25
 msgid "Last Name"
 msgstr "Soyadı"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:792
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:115
 msgid "Last column of merge file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:785
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:108
 msgid "Last name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:242
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:237
 msgid "Latest Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1603
+#: /opt/webwork/webwork2/conf/defaults.config:1505
 msgid ""
 "Length of time, in seconds, a user has to be inactive before he is required "
-"to login again.<p>This value should be entered as a number, so as 3600 "
-"instead of 60*60 for one hour"
+"to login again. This value should be entered as a number, so as 3600 instead"
+" of 60*60 for one hour."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:845
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:26
 msgid "Lesser Rod of Revelation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:965
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:26
 msgid "Lesser Tome of Enlightenment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:141
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:15
 msgid "Level Progress:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:881
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:77
 msgid "Level:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:912
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2060
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:433
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:17
+msgid "Library Broswer Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:359
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:52
 msgid "Library Browser"
 msgstr "Soru Kütüphaneleri"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1977
-msgid "List of display modes made available to students"
+#. ($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:30
+msgid "Link to Edit Page for %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2130
-msgid ""
-"List of e-mail addresses to which e-mail can be sent by a problem. "
-"Professors need to be added to this list if questionaires are used, or other"
-" WeBWorK problems which send e-mail as part of their answer mechanism."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:25
+msgid "Links to pages that give information about writing problems:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1879
+msgid "List of display modes made available to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:759
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:774
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:89
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:96
 msgid "List of insertable macros"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1826
+#: /opt/webwork/webwork2/conf/defaults.config:1728
 msgid "List of options for Show Me Another button"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1713
+#: /opt/webwork/webwork2/conf/defaults.config:1615
 msgid "List of sets excluded from achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1483
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:56
+msgid "Live equation rendering"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:144
+msgid "Loading..."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:122
 msgid "Local Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:41
 msgid "Local Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1504
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:136
 msgid "Local Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:105
 msgid "Local Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1467
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:114
 msgid ""
 "Local data is generated when your systems admin runs the script update-OPL-"
 "statistics."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1460
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:107
 msgid ""
 "Local data on problem usage is generated and maintained by your institution."
 " The Usage figure is the total number of local individuals who have attemped"
@@ -3635,42 +4906,61 @@ msgid ""
 "likely bug free."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:115
 msgid "Location"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3501
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1854
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1890
 msgid ""
 "Location %1 does not exist in the WeBWorK database.  Please check your input"
 " (perhaps you need to reload the location management page?)."
 msgstr ""
 
 #. ($locationID, join(', ', @addresses)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1742
 msgid "Location %1 has been created, with addresses %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3353
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1798
 msgid "Location deletion requires confirmation."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3409
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:43
 msgid "Location description:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3089
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:37
 msgid "Location name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:159
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:27
+msgid ""
+"Locations are a list of ip addresses.  Ip addresses can be a single address "
+"(e.g. 192.168.1.101), a range of ip address (e.g. "
+"192.168.1.101-192.168.1.150), or an ip address mask (e.g. 192.168.1.0/24). "
+"Enter one ip address per line, using as many lines as needed for each "
+"location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:32
+msgid ""
+"Locations are edited by adding new ip addresses to the location, or deleting"
+" existing address.  You must select the confirm checkbox when deleting a "
+"location, and this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:43
+msgid "Locations of files:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:18
 msgid "Log In Again"
 msgstr "Tekrar giriş yap"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1124
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:11
 msgid "Log Out"
 msgstr "Çıkış Yap"
 
@@ -3678,368 +4968,456 @@ msgstr "Çıkış Yap"
 #. ($rename_oldCourseID)
 #. ($rename_newCourseID)
 #. ($new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1458
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1541
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2666
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:913
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:704
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:780
 msgid "Log into %1"
 msgstr ""
 
-#. (HTML::Entities::encode_entities($prettyUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1122
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1130
+#. ($userName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:9
 msgid "Logged in as %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:790
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:181
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:187
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:113
 msgid "Login"
 msgstr "Devam et"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:58
 msgid "Login Info"
 msgstr "Giriş Bilgileri"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:187
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:815
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1980
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:291
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:855
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:884
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:913
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:36
 msgid "Login Name"
 msgstr "Kullanıcı adı"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:18
 msgid "Login Status"
 msgstr "Durumu"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:6
+msgid "Login:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:225
 msgid "Logout"
 msgstr "Çıkış"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Macro"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:763
-msgid "Main Menu"
-msgstr "Ana Menü"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:97
+msgid ""
+"Macro (\".pl\") files containing additional functionality for your course "
+"can be stored here."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:369
+#. ($filePath)
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:29
+msgid "Macro file %1 not found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:46
 msgid "Make Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:27
 msgid "Make changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1115
-msgid "Make these changes in  course:"
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:15
+msgid "Make these changes in course: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:137
+msgid ""
+"Makes a new copy of the file you are editing at the location relative to the"
+" course's templates ([TMPL]) directory. You may choose to replace the "
+"current problem in the current set, append to the end to then end of the "
+"current set as a new problem, or create a problem that is not attached to a "
+"problem set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3040
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:1
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:46
 msgid "Manage Locations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:748
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:394
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:17
+msgid "Manage Locations Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:20
+msgid ""
+"Manage achievements for the course.  The actions allow one to edit, assign, "
+"import, export, score, create, or delete achievements.  The action form is "
+"at the top to select the desired action and options to perform when the "
+"submit button is pressed.  Below the action form is the list of all the "
+"achievements, ordered by their achievement \"Number\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:56
+msgid "Manage administration course files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:50
+msgid ""
+"Manage instructors.  When instructors are added to a newly created course, "
+"they are also added to the admin course with username \"userID_courseID\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:344
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:192
 msgid "Manual Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:233
-msgid "Mark All"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:17
+msgid "Manual Grader Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr',
+#. format_set_name_display($c->stash->{set}->set_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:205
+msgid "Manual Grader for %1: Problem %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:77
+msgid ""
+"Manually initiate an LTI grade passback for selected sets or users. This "
+"link is only visible if LTI grade passback is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:175
+msgid ""
+"Many of these editing activities can also be done more quickly from the "
+"\"Instructor Tools\" page where students and homework sets can be selected "
+"simultaneously. The \"Instructor Tools\" page is useful for quick editing of"
+" one or two students. The initial setup of the class can be done best from "
+"this page. Importing and exporting class lists can only be done from this "
+"page. Deleting students can only be done from this page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:120
 msgid "Mark Correct"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2822
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:598
 msgid "Mark Correct?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:681
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:19
 msgid "Match on what? (separate multiple IDs with commas)"
 msgstr "Hangi özellikler eşleştirilecek? (birden fazla kullanıcı adını virgülle ayırın)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:499
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:85
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:36
 msgid "Math Objects"
 msgstr "Matematik Nesneleri"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:327
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:377
 msgid "Max attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:380
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:24
 msgid "Max. Shown:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1817
+#: /opt/webwork/webwork2/conf/defaults.config:1719
 msgid ""
 "Maximum times Show me Another can be used per problem (-1 => unlimited)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:606
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:4
+msgid "Merge file data:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:24
 msgid "Merge file:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:288
 msgid "Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:578
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:13
 msgid "Message file:"
 msgstr ""
 
-#. ($emailDirectory, $output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:357
-msgid "Message saved to file <code>%1/%2</code>."
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:300
+msgid "Message saved to file %1."
 msgstr ""
 
-#. ($recipient, $ur->email_address)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:995
+#. ($recipient, $user_record->email_address)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:98
 msgid "Message sent to %1 at %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2249
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2324
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:121
+msgid "Message was blank."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:48
+msgid ""
+"Messages can be saved to a message file (which must end in the \".msg\" "
+"extension).  Use the \"Message file\" drop down menu to select which message"
+" file to load, or \"None\" to use a blank message. To save a new message, "
+"use the \"Save as\" button after entering in a valid filename.  The \"Save "
+"as\" button will not overwrite currently saved messages.  To edit a "
+"currently saved message first select it using the drop down menu, then click"
+" the \"Save\" button to save any changes.  Use the \"File Manager\" to "
+"delete messages, located in the \"[TMPL]/email\" directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:22
 msgid "Method"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3284
+#: /opt/webwork/webwork2/conf/defaults.config:2003
+msgid "Method to enter problem scores in the single problem manual grader"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1668
 msgid ""
 "Missing required input data. Please check that you have filled in all of the"
 " create location fields and resubmit."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1555
+#: /opt/webwork/webwork2/conf/defaults.config:1457
 msgid ""
 "Mode in which the LANG and DIR settings for a single problem are determined."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1557
-msgid ""
-"Mode in which the LANG and DIR settings for a single problem are "
-"determined.<p>The system will set the LANGuage attribute to either a value "
-"determined from the problem, a course-wide default, or the system default, "
-"depending on the mode selected. The tag will only be added to the DIV "
-"enclosing the problem if it is different than the value which should be set "
-"in the main HTML tag set for the entire course based on the course "
-"language.<p>There are two options for the DIRection attribute: \"ltr\" for "
-"left-to-write sripts, and \"rtl\" for right-to-left scripts like Arabic and "
-"Hebrew.<p>The DIRection attribute is needed to trigger proper display of the"
-" question text when the problem text-direction is different than that used "
-"by the current language of the course. For example, English problems from "
-"the library browser would display improperly in RTL mode for a Hebrew "
-"course, unless the problen Direction is set to LTR.<p>The feature to set a "
-"problem language and direction was only added in 2018 to the PG language, so"
-" most problems will not declare their language, and the system needs to fall"
-" back to determining the language and direction in a different manner. The "
-"OPL itself is all English, so the system wide fallback is to en-US in LTR "
-"mode.<p>Since the defaults fall back to the LTR direction, most sites should"
-" be fine with the \"auto::\" mode, but may want to select the one which "
-"matches their course language. The mode \"force::ltr\" would also be an "
-"option for a course which runs into trouble with the \"auto\" "
-"modes.<p>Modes:<br><ul><li>\"none\" prevents any additional LANG and/or DIR "
-"tag being added. The browser will use the main setting which was applied to "
-"the entire HTML page. This is likely to cause trouble when a problem of the "
-"other direction is displayed.</li><li>\"auto::\" allows the system to make "
-"the settings based on the language and direction reported by the problem (a "
-"new feature, so not set in almost all existing problems) and falling back to"
-" the expected default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" "
-"allows the system to make the settings based on the language and direction "
-"reported by the problem (a new feature, so not set in almost all existing "
-"problems) but falling back to the language with the given LangCode and the "
-"direction Dir when problem settings are not available from "
-"PG.</li><li>\"auto::Dir\" for problems without PG settings, this will use "
-"the default en=english language, but force the direction to Dir. Problems "
-"with PG settings will get those settings.</li><li>\"auto:LangCode:\" for "
-"problems without PG settings, this will use the default LTR direction, but "
-"will set the language to LangCode.Problems with PG settings will get those "
-"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
-" by the PG code of the problem, and will force the system to set the "
-"language with the given LangCode and the direction to Dir for <b>all</b> "
-"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
-"PG code of the problem, and will force the system to set the direction to "
-"Dir for <b>all</b> problems, but will avoid setting any language attribute "
-"for individual problem.</li></ul>"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2695
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:443
 msgid "Move"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2231
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:457
 msgid "Move to Page:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2226
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:452
 msgid "Move to Problem:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:26
+msgid ""
+"Multiple sets may be assigned to the users by holding down the shift key or "
+"the ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:27
+msgid ""
+"Multiple users or sets may be selected by holding down the shift key or the "
+"ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:36
 msgid "My Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1412
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:26
 msgid "Mysterious Package (with Ribbons)"
 msgstr ""
 
 # Short for Number of Fields
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:213
 msgid "NO OF FIELDS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1484
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:741
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:113
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:135
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:29
 msgid "Name"
 msgstr "Grup Adı"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:174
 msgid "Name for new set here"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1528
+#: /opt/webwork/webwork2/conf/defaults.config:1430
 msgid "Name of course information file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1107
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:77
+msgid "Name of the evaluator file used to evaluate the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:81
+msgid "Name of the image used for the achievement icon."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:4
 msgid "Name the new set"
 msgstr "Yeni seti adlandırın"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1691
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:45
+msgid "Name:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:29
 msgid "Necromancers Charm"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:343
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:205
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:393
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:35
 msgid "Never"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:371
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:54
 msgid "New File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:372
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:55
 msgid "New Folder"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:30
 msgid "New Name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2067
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:3
 msgid "New Password"
 msgstr "Yeni Şifre"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:131
-msgid "New Version"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+msgid "New Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
 msgid "New file name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
 msgid "New folder name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:577
 msgid "New passwords saved"
 msgstr "Yeni şifreler kaydedildi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1078
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:36
 msgid "New set name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1357
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1010
 msgid "Next Problem"
 msgstr "Sonraki Soru"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1181
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2164
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:40
+msgid "Next Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:98
 msgid "Next page"
 msgstr ""
 
-#. ($self->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:620
+#. (% $c->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:142
 msgid "Next test will be available by %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2452
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:134
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:144
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:183
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:483
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:510
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:142
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:68
 msgid "No"
 msgstr "Hayır"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:635
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:116
 msgid "No Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2324
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:216
 msgid "No Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:117
+msgid "No Sender specified."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:23
 msgid "No Target Set Selected"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:335
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:38
 msgid "No achievement badges have been assigned yet."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1521
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:77
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:37
 msgid "No achievements shown.  Create an achievement!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:90
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:2
+msgid "No achievements shown.  Select an achievement to edit!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:61
 msgid "No action taken"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:141
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:140
 msgid ""
 "No authentication method found for your request.  If this recurs, please "
 "speak with your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:940
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:361
 msgid "No change made to any set"
 msgstr "Herhangi bir sete değişiklik yapılmadı"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
 msgid ""
 "No changes specified.  You must mark the checkbox of the item(s) to be "
 "changed and enter the change data."
@@ -4049,1379 +5427,1811 @@ msgstr ""
 msgid "No changes were saved!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2462
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:50
 msgid "No course archives found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2898
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:32
 msgid "No course id defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1561
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:932
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:67
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:76
 msgid "No courses found"
 msgstr ""
 
 #. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:593
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:675
 msgid "No data exists for set %1 and problem %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:10
+msgid "No e-mail recipients are listed for this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:169
 msgid "No filename was specified for saving!  The message was not saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:340
 msgid "No guest logins are available. Please try again in a few minutes."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3522
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1877
 msgid "No location specified to edit. Please check your input data."
 msgstr ""
 
 #. ($badID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1788
 msgid "No location with name %1 exists in the database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3206
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:149
 msgid "No locations are currently defined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:342
 msgid "No merge data file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:612
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:18
+msgid "No merge data found"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:164
+msgid "No merge data found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:8
+msgid "No merge file selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:135
 msgid "No more tests available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:270
 msgid ""
 "No new Achievement ID specified.  No new achievement created.  File not "
 "saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:63
 msgid "No problems matched the given parameters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:25
+msgid "No recipients selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:334
 msgid ""
 "No recipients selected. Please select one or more recipients from the list "
 "below."
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2044
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:49
 msgid "No record for global set %1."
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2046
-msgid "No record for user %1."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
 msgid "No record found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1166
-msgid "No set created."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:12
 msgid "No sets in this course yet"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1010
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:159
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
 msgid "No sets selected for scoring"
 msgstr "Notlamak için bir set seçili değil"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2764
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:46
 msgid ""
 "No sets shown.  Choose one of the options above to list the sets in the "
 "course."
 msgstr "Hiç set gösterilmiyor. Dersteki setleri görmek için yukarıdaki seçeneklerden birini işaretleyin."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1942
 msgid "No source filePath specified"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1327
 msgid "No source_file for problem in .def file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2099
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:87
 msgid ""
-"No students shown.  Choose one of the options above to list the students in "
+"No students shown. Choose one of the options above to list the students in "
 "the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:246
 msgid "No submissions. Over time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:278
 msgid "No tests taken."
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:594
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:676
 msgid "No user specific data exists for user %1"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2031
 msgid "No valid changes submitted for location %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:275
-msgid "No versions of this assignment have been taken."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:771
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:263
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:241
 msgid "No versions of this test have been taken."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:562
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:252
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:17
 msgid "None"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:681
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2463
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:763
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:52
 msgid "None Specified"
 msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2089
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:73
 msgid "None of the selected users are assigned to this set: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:33
 msgid "Not logged in."
 msgstr "Giriş yapmadınız."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1569
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:4
 msgid "Note"
 msgstr "Not"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:381
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:55
+msgid ""
+"Note that if there are errors, they will be shown at the top of the page. In"
+" some cases, a hard copy is still generated and a link called \"Download "
+"Hardcopy\" appears. In addition, the latex file, log and error files are "
+"generated which can be used in troubleshooting."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:93
+msgid ""
+"Note that if you set the permission level of a user to something other than "
+"\"Student\", you may also want to set the status of the user to "
+"\"Observer\".  Users with the \"Observer\" status are not included in "
+"statistics, scoring, or instructor emails."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:28
+msgid ""
+"Note that some settings require an additional page load after \"Save "
+"Changes\" is clicked in order to take effect.  This is true for a theme "
+"change for example."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:396
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:422
 msgid "Note:"
 msgstr ""
 
-#. (CGI::i($pg->{result}{msg})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2350
+#. (tag('i', maketext('You are in the Reduced Scoring Period.  All work counts
+#. for [_1]% of the original.',
+#. $ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#. (tag('i', $pg->{result}{msg})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:572
 msgid "Note: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2482
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:686
 msgid ""
 "Note: grading the test grades all problems, not just those on this page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1460
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1485
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:768
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:59
+msgid "Now"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:19
 msgid "Number"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:242
 msgid "Number of Graded Submissions per Test (0=infty)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
 msgid "Number of Problems per Page (0=all)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:95
+msgid "Number of Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:257
 msgid "Number of Tests per Time Interval (0=infty)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1833
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2435
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:54
+msgid "Number:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1181
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:912
 msgid "OK"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1464
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:17
+msgid "OPL Problem Levels Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:26
 msgid "Oil of Cleansing"
 msgstr ""
 
+#. ('<code>pdflatex</code>', '<code>hardcopy.tex</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:49
+msgid ""
+"Once \"Generate Hardcopy for selected sets and selected users\" is clicked a"
+" file in the selected hardcopy format will be generated and offered for "
+"download. If PDF output was selected, a single PDF file is generated. If TeX"
+" output is selected, a zip file is generated that contains all files needed "
+"to generated the hardcopy PDF file via %1. The main TeX file is called %2."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:84
 msgid "One Column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:314
+msgid "Only Start"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:289
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:303
 msgid "Only after set answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1892
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:87
+msgid ""
+"Only present for JITAR sets. Collapse JITAR nesting problem groups to the "
+"top row of information about a problem. Note that the nesting of a single "
+"problem group can be collapsed by clicking on the down arrow to the right of"
+" the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:80
+msgid ""
+"Only present for JITAR sets. Expand JITAR nested problem groups that have "
+"been collapsed. Note that the nesting of a single problem group can be "
+"expanded by clicking on the right arrow to the right of the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1794
 msgid ""
 "Only this permission level and higher get buttons for sending e-mail to the "
 "instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:39
 msgid "Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:422
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:763
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:810
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:62
 msgid "Open Date"
 msgstr "Açılış tarihi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1098
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:42
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:32
 msgid "Open Problem Library"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2417
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:272
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:525
 msgid "Open in New Window"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1263
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1617
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:29
 msgid "Open in new window"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:491
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:320
 msgid "Open, closes %1."
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:489
-msgid "Open, complete by %1."
-msgstr ""
-
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:300
 msgid "Open, due %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:433
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
 msgid "Open."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:431
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:268
 msgid "Open. Submitted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:31
 msgid "Open:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:115
 msgid "Opens"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:27
 msgid "Opens any homework set for 24 hours."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1686
+#: /opt/webwork/webwork2/conf/defaults.config:1588
 msgid "Optional Modules"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:265
 msgid "Order Problems Randomly"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:50
+msgid "Other Options"
+msgstr ""
+
 # Context is "7 Out Of 10"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:405
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:777
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:150
 msgid "Out Of"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1024
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:85
+msgid "Overall Results"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:93
+msgid "Overall Set Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:122
+msgid "Overall Success Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:470
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:481
 msgid "Overwrite"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:437
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:100
 msgid "Overwrite existing files silently"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:41
+msgid "PDF"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:69
 msgid "PG Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:827
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer.html.ep:1
+msgid "PG POD"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:17
+msgid "PG Problem Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:708
 msgid "PG debug messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:829
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:716
 msgid "PG internal errors"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:818
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:109
+msgid ""
+"PG markdown syntax used to format WeBWorK questions. This interactive lab "
+"can help you to learn the techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:692
 msgid "PG question failed to render"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:826
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:706
 msgid "PG question processing error messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:828
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:712
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:128
 msgid "PG warning messages"
 msgstr ""
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:511
-msgid "PGLab"
-msgstr ""
-
-# Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:98
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:47
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:58
 msgid "PGML"
 msgstr ""
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:91
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:40
 msgid "POD"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2309
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2249
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:200
+msgid "POD Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:208
+msgid "POD Viewer"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1515
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:526
 msgid "PREVIEW ONLY -- ANSWERS NOT RECORDED"
 msgstr "GÖSTERİM -- YANITLAR KAYDEDİLMEDİ "
 
 # Problem Number
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:215
 msgid "PROB NUMBER"
 msgstr ""
 
 # Problem Value
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:218
 msgid "PROB VALUE"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:205
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:36
 msgid "Pad Fields"
 msgstr "tr: Pad Fields"
 
-#. (timestamp($self)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1255
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:28
+msgid "Page Contents"
+msgstr ""
+
+#. ($c->timestamp)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:1
 msgid "Page generated at %1"
 msgstr "Sayfa %1de yaratıldı"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:568
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:81
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:71
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:56
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:25
 msgid "Password"
 msgstr "Sifre"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:976
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:13
 msgid "Password (Leave blank for regular proctoring)"
 msgstr ""
 
-#. ($studentUser, CGI::span({ dir => 'ltr' },
-#. format_set_name_display($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:498
+#. ($studentUser, tag('span', dir => 'ltr', format_set_name_display($setName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:13
 msgid "Past Answers for %1, set %2, problem %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:8
 msgid "Percent"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:562
-msgid "Percentage of Active Students with Correct Answers"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:94
+msgid "Percent Ranges"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+msgid "Percent Score"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:535
+msgid "Percent of Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:788
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:206
 msgid ""
 "Percentile cutoffs for number of attempts. The 50% column shows the median "
 "number of attempts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2056
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:834
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:863
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:921
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:58
+msgid ""
+"Percentile cutoffs for student's score and success index. The 50% column "
+"shows the median number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:50
 msgid "Permission Level"
 msgstr "Yetki seviyesi"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1869
+#: /opt/webwork/webwork2/conf/defaults.config:1771
 msgid "Permissions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1052
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:24
 msgid "Pick a target set above to add this problem to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:54
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:21
 msgid "Pick date and time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3804
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
 msgid ""
 "Place a file named \"hide_directory\" in a course or other directory and it "
 "will not show up in the courses list on the WeBWorK home page. It will still"
 " appear in the Course Administration listing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1107
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should be given full credit."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should have half credit added."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given full credit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:889
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given half credit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:654
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its incorrect attempt count reset."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its weight doubled."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1315
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:60
 msgid ""
 "Please choose the set, the problem you would like to copy, and the problem "
 "you would like to copy it to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:399
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:19
 msgid "Please correct the following errors and try again:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:698
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:28
 msgid "Please enter in a value to match in the filter field."
 msgstr ""
 
-#. (CGI::b($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:197
+#. (tag('b', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:28
 msgid "Please enter your username and password for %1 below:"
 msgstr "Lütfen %1 dersi için kullanici adi ve sifrenizi giriniz:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1778
 msgid "Please provide a location name to delete."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:233
 msgid "Please select action to be performed."
 msgstr "Lütfen gerçekleştirilecek işlemi seçin."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:183
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
 msgid "Please select at least one set and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
 msgid "Please select at least one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:165
 msgid "Please select at least one user and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:35
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:31
 msgid "Please select at least one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:28
 msgid "Please select at most one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:30
 msgid "Please select exactly one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:29
 msgid "Please select exactly one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:574
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1016
 msgid "Please specify a file to save to."
 msgstr "Lütfen kaydedilecek dosyayın belirtin."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:37
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
 msgid "Please specify a homework set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:38
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
 msgid ""
 "Please use only letters, digits, dashes, underscores, and periods in your "
 "set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1462
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1184
+msgid ""
+"Please use radio buttons to choose the method for saving this file. Uknown "
+"saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:165
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:169
+msgid "Point Value"
+msgstr ""
+
+#. ($grader->{problem_value})
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:92
+msgid "Point Value (0 - %1):"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:21
 msgid "Points"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:609
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:62
+msgid "Points:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:26
 msgid "Potion of Forgetfulness"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1423
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:2
 msgid "Prepare which sets for export?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2054
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2073
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:268
 msgid "Press \"Grade Test\" now!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2049
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:244
 msgid "Press \"Grade Test\" soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:213
-msgid "Preview Comment"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:69
 msgid "Preview Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:314
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1840
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:11
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:99
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:35
 msgid "Preview My Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2440
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:646
 msgid "Preview Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1340
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:41
+msgid ""
+"Preview the message before sending using the \"Preview Message\" button.  "
+"The preview shows the email that would be sent to the first selected student"
+" or the instructor if no students were selected.  The preview will also list"
+" all of the students that would receive their own personalized message.  If "
+"a merge file was selected, the preview will also indicate which (if any) "
+"recipient's merge file data could not be found."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:991
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:995
 msgid "Previous Problem"
 msgstr "Önceki Soru"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2157
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:94
 msgid "Previous page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2149
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:45
+msgid "Primary Actions"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:355
 msgid "Print Test"
 msgstr ""
 
 # Short for Problem
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2088
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:287
 msgid "Prob"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:670
-msgid "Problem #"
-msgstr ""
-
-#. ($prettyProblemID)
-#. ($problemNumber)
 #. (join('.', @seq)
 #. ($problemID)
-#. ($prettyProblemIDs{$probID})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:831
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:834
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:897
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:438
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:800
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:956
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:964
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:973
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:933
+#. ($problemNumber)
+#. ($_->{prettyID})
+#. ($c->{prettyID})
+#. ($probID)
+#. ($c->{setRecord}->assignment_type eq 'jitar' ? join('.',
+#. jitar_id_to_seq($_)
+#. ($set->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)
+#. ($prettyProblemID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:831
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:842
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:853
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:57
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/siblings.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:40
 msgid "Problem %1"
 msgstr "Soru %1"
 
-#. ($problemNumber)
-#. ($prettyID)
-#. ($versioned ? $versioned : $MergedProblem->problem_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1419
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1421
+#. ($i + 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:535
 msgid "Problem %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1974
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:75
+msgid "Problem (\".pg\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:38
+msgid "Problem Display Settings"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1876
 msgid "Problem Display/Answer Checking"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:451
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:50
 msgid "Problem Editor"
 msgstr "Soru Düzenleyici"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1697
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:29
 msgid "Problem Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1002
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:999
 msgid "Problem List"
 msgstr "Soru Listesi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1119
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:666
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:783
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:75
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:159
 msgid "Problem Number"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:156
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:160
+msgid "Problem Paths"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:140
 msgid "Problem Score (%):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:30
 msgid "Problem Techniques"
 msgstr "Soru Teknikleri"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:705
-msgid "Problem Viewer"
-msgstr "Soru Görüntüleyici"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:239
+msgid ""
+"Problem has a different source file than the currently rendered problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:233
+msgid "Problem has an essay answer that needs to be graded."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1943
 msgid "Problem source is drawn from a grouping set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:406
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2494
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:445
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:827
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:835
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:896
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:801
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:89
+msgid ""
+"Problem source is drawn from a grouping set and can not be directly rendered"
+" or edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:336
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:9
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:32
 msgid "Problems"
 msgstr "Sorular"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:25
 msgid "Problems Added"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:59
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:54
 msgid "Problems for all students have been unassigned."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:57
 msgid "Problems for selected students have been reassigned."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:51
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:46
 msgid "Problems have been assigned to all current users."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:25
+msgid ""
+"Problems with this rating should only require direct memory of a fact. "
+"Examples might be a specific value of a function, or the statement of a "
+"definition. Very few WeBWorK problems fall into this category."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:93
 msgid "Proctor"
 msgstr "Gözetmen"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:282
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:92
 msgid "Proctor Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:258
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:71
 msgid "Proctor Username"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:193
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:3
+msgid "Proctor authorization requested for a nonexistent set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:8
 msgid "Proctor authorization required."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:231
-msgid "Proctored Gateway Quiz %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:88
+msgid "Proctor:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:265
+msgid "Proctored Test %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:272
+msgid "Proctored Test %2 Proctor Login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:241
-msgid "Proctored Gateway Quiz %2 Proctor Login"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:318
+msgid ""
+"Proctored tests always require authorization to start the test. \"Both Start"
+" and Grade\" will require login proctor authorization to start and grade "
+"proctor authorization to grade. \"Only Start\" requires grade proctor "
+"authorization to start and no authorization to grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:981
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:18
 msgid ""
-"Proctored tests require proctor authorization to start and to grade.  "
 "Provide a password to have a single password for all students to start a "
 "proctored test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:56
 msgid "Publish"
 msgstr "Yayımla"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:31
+msgid ""
+"Quick access to many instructor tools, including <strong>Reset "
+"passwords</strong>, <strong>Act as student</strong>, <strong>Assign "
+"individual sets</strong> and <strong>Edit individual due dates</strong>."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "RECITATION"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1333
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:199
 msgid "Randomize"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:13
 msgid "Randomize Seed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:101
 msgid "Read only"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:67
 msgid "Really delete the items listed above?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:201
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:212
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:804
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2038
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:298
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:832
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:861
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:890
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:919
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:184
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:42
 msgid "Recitation"
 msgstr "Problem cozum dersi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:194
+#. ($recitation)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:125
+msgid "Recitation %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:21
+msgid "Recitation:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:38
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:46
 msgid "Record Scores for Single Sets"
 msgstr "Tek set için notları kaydet"
 
-#. ($studentName)
-#. ($self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:183
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:190
+#. ($studentID)
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:8
 msgid "Record for user %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Reduced Scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:67
 msgid "Reduced Scoring Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2523
-msgid "Reduced Scoring Disabled"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
+msgid "Reduced Scoring Enabled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2522
-msgid "Reduced Scoring Enabled"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:33
+msgid "Reduced Scoring Period"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:314
 msgid "Reduced credit can still be earned until %1."
 msgstr ""
 
 # Short for "Reduced Scoring:"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:32
 msgid "Reduced:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:153
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:373
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:56
 msgid "Refresh"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1646
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1943
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2000
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3713
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3755
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:56
 msgid "Refresh Listing"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:190
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:200
 msgid "Relax IP restrictions when?"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:88
+msgid "Reload the page to see backup files that have been made."
+msgstr ""
+
 # Context is "Attempts Remaining"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:14
 msgid "Remaining"
 msgstr "Kalan hak"
 
 #. ('00:00:00')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:254
 msgid "Remaining time: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:61
 msgid "Remember Me"
 msgstr "Beni hatırla"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:546
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:514
 msgid "Remember to return to your original problem when you're finished here!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1020
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:466
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:72
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:41
 msgid "Rename"
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1302
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:62
 msgid "Rename %1 to %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:378
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:927
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:73
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:34
 msgid "Rename Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:17
+msgid "Rename Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:22
+msgid "Rename Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
 msgid "Rename file as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2727
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:463
 msgid "Render"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:344
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:59
 msgid "Render All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2720
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:461
 msgid "Render Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2501
-msgid "Renumber Problems"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:60
+msgid ""
+"Render all problems on the page. This does not reload the page or save or "
+"reset changes."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:106
 msgid ""
-"Reopens any gateway test for an additional 24 hours. This allows you to take"
-" a test even if the close date has past. This item does not allow you to "
-"take additional versions of the test."
+"Render or re-render the problem, course info file, or set header being "
+"edited. This does not change the permanent file on the disk. You can view "
+"different versions of the same problem by changing the seed. You can also "
+"change the manner in which the mathematics is typeset. If \"Open in new "
+"window\" is checked, then the problem will open in a new tab or window "
+"showing the problem as it will be rendered for students in the set."
 msgstr ""
 
-#. (CGI::strong(                                                   CGI::span({
-#. dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1829
-msgid "Replace current problem: %1"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:132
+msgid "Rendering Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1155
-msgid "Replace which users?"
-msgstr "Hangi kullanıcılar değiştirilecek?"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:341
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:53
+msgid "Renumber Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:55
+msgid ""
+"Renumber problems consecutively starting from 1. This renumbering is not "
+"saved until \"Save Changes\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:103
+msgid ""
+"Renumber problems in the set consecutively starting from one. In the process"
+" of deleting problems, the numbering can be made non-consecutive. This is "
+"useful to clean up the problem numbering."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:31
+msgid ""
+"Reopens any test for an additional 24 hours. This allows you to take a test "
+"even if the close date has past. This item does not allow you to take "
+"additional versions of the test."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:118
+msgid "Reordering Problems"
+msgstr ""
+
+#. (tag(                                           'strong',
+#. c(                                                      tag('span', dir =>
+#. 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:58
+msgid "Replace current problem: %1"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:637
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:13
+msgid "Replace which users?"
+msgstr "Hangi kullanıcılar değiştirilecek?"
+
+#. ($composite_id, $oldUser->status)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:448
+msgid "Replacing old data for %1: status: %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:42
 msgid "Reply-To:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:528
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:123
 msgid "Report Bugs in this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1073
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:305
 msgid "Report bugs"
 msgstr "Hataları bildir"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:128
+msgid ""
+"Report bugs in a WeBWorK question/problem using this link. The very first "
+"time you do this you will need to register with an email address so that "
+"information on the bug fix can be reported back to you."
+msgstr ""
+
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2825
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1530
 msgid "Report for course %1:"
 msgstr ""
 
-#. ($rename_oldCourseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2122
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:3
 msgid "Report on database structure for course %1:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1829
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:8
 msgid "Request New Version"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2246
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2321
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:19
 msgid "Request information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1972
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1220
 msgid "Request new version now."
 msgstr ""
 
+#. ($setName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:486
+msgid ""
+"Requested set \"%1\" is a proctored test, but no valid proctor authorization"
+" has been obtained."
+msgstr ""
+
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:399
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:422
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:425
 msgid "Requested set '%1' could not be found in the database for user %2."
 msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:469
-msgid ""
-"Requested set '%1' is a homework assignment but the gateway/quiz content "
-"generator %2 was called.  Try re-entering the set from the problem sets "
-"listing page."
-msgstr ""
-
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:484
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:472
 msgid ""
-"Requested set '%1' is a proctored test/quiz assignment, but no valid proctor"
-" authorization has been obtained."
+"Requested set '%1' is a homework assignment but the test content generator "
+"%2 was called.  Try re-entering the set from the problem sets listing page."
 msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:463
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:466
 msgid ""
-"Requested set '%1' is a test/quiz assignment but the regular homework "
-"assignment content generator %2 was called.  Try re-entering the set from "
-"the problem sets listing page."
+"Requested set '%1' is a test but the regular homework assignment content "
+"generator %2 was called.  Try re-entering the set from the problem sets "
+"listing page."
 msgstr ""
 
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:420
 msgid "Requested set '%1' is not assigned to user %2."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:450
 msgid "Requested set '%1' is not available yet."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:441
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:444
 msgid "Requested set '%1' is not yet open."
 msgstr ""
 
 #. ($verNum,				$setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:404
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:407
 msgid "Requested version (%1) of set '%2' can not be directly accessed."
 msgstr ""
 
 #. ($verNum, $setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:397
 msgid "Requested version (%1) of set '%2' is not assigned to user %3."
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:308
+msgid "Require Proctor Authorization to"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:45
 msgid "Require users to log in through the LMS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:420
 msgid "Rerandomize after"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:104
 msgid "Reset"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2280
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2968
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:195
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:696
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:47
 msgid "Reset Form"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:610
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:27
 msgid "Resets the number of incorrect attempts on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2453
-msgid ""
-"Restores a course from a gzipped tar archive (.tar.gz). After unarchiving, "
-"the course database is restored from a subdirectory of the course's DATA "
-"directory. Currently the archive facility is only available for mysql "
-"databases. It depends on the mysqldump application."
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:41
+msgid "Restore a .tar.gz archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:40
+msgid "Restore backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:39
+msgid "Restore backup from %1"
+msgstr ""
+
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+msgid "Restored backup from %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:178
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:188
 msgid "Restrict Access by IP"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:912
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep:11
 msgid "Restrict Locations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:286
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:324
 msgid "Restrict Problem Progression"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:184
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:194
 msgid "Restrict To"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:154
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:33
+msgid "Restrict or sort the students displayed"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:159
 msgid "Restrict release by set(s)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2090
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:299
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:291
 msgid "Result"
 msgstr "Sonuç"
 
-#. (CGI::i($self->$actionHandler(\%genericParams, \%actionParams,
-#. \%tableParams)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:388
+#. ($c->tag('i', $c->$actionHandler)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:228
 msgid "Result of last action performed: %1"
 msgstr "En son gerçekleştilen işlemin sonucu: %1"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:309
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:300
 msgid "Results for this submission"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:363
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:236
 msgid "Results of last action performed"
 msgstr "En son gerçekleştirilen işlemin sonuçları"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:125
 msgid "Results of last action performed: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1725
-msgid "Resurrect which Gateway?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:51
+msgid "Resurrect which test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1449
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:669
 msgid "Retitled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:17
 msgid "Return to your work"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:686
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:132
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:16
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:166
 msgid "Revert"
 msgstr "Ters çevir"
 
-#. (CGI::span({ dir => 'ltr' }, $self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2069
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:83
 msgid "Revert to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1431
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1513
+#. ($c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1220
+msgid "Reverted to original file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:168
+msgid ""
+"Reverts to the copy of the file saved on the disk or to a backup file. All "
+"unsaved editing changes will be lost. This option is only active when a "
+"temporary file or a backup file exists. You may also delete backups that "
+"have been made with this tab."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:182
+msgid "Review of column functions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:145
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:85
 msgid ""
 "Reviewing a problem and looking at both the average Attempts and  average "
 "Status should give instructors valuable information about the difficulty of "
 "the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:55
 msgid "Reward used successfully!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:180
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:4
 msgid "Rewards"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:27
 msgid "Ring of Reduction"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:322
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:26
 msgid "Robe of Longevity"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "SECTION"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:214
 msgid "SET NAME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:321
 msgid "STATUS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "STUDENT ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:43
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:263
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:170
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:687
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:847
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:220
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:85
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:207
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:123
 msgid "Save"
 msgstr "Kaydet"
 
-#. (CGI::b($self->shortPath($self->{sourceFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:438
+#. (tag('b', $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_form.html.ep:2
 msgid "Save %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:44
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:695
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:134
 msgid "Save As"
 msgstr "Farklı Kaydet: [TMPL]/"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:744
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2963
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:194
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:695
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:37
 msgid "Save Changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:60
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:76
 msgid "Save Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
 msgid "Save Export"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:92
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
 msgid "Save Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:188
 msgid "Save as"
 msgstr "Farklı kaydet"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:872
-msgid "Save as Default"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:481
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:5
 msgid "Save as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1558
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:254
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1443
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_password_form.html.ep:1
 msgid "Save changes"
 msgstr "Değişiklikleri kaydet"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1794
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:33
 msgid "Save file to:"
 msgstr ""
 
-#. (CGI::b({ dir => 'ltr' }, $self->shortPath($self->{editFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1605
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:125
+msgid ""
+"Save the contents of the editor window to the file on disk and re-render the"
+" problem. If \"Open in new window\" is checked, then the problem will open "
+"in a new tab or window showing the problem as it will be rendered for "
+"students in the set. If \"Create backup\" is checked then a backup of the "
+"current file on disk will be created before overwriting it with the contents"
+" of the editor window. If a backup already exists, then a \"Delete oldest "
+"backup\" check box will be present. If that is checked, then the oldest "
+"backup will be deleted when \"Save\" is clicked. These backups can be "
+"reverted to and managed on the \"Revert\" tab."
+msgstr ""
+
+#. (tag('b', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:6
 msgid "Save to %1 and View"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:396
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1165
-msgid "Saved to file '%1'"
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:50
+msgid "Saved answers"
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#. ($outputFilePath =~ s/$ce->{courseDirs}{templates}/[TMPL]/r)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:549
+msgid "Saved to file \"%1\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1180
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2116
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2292
 msgid "Schema and database field definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4284
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2279
 msgid "Schema and database table definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:404
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:465
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:660
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:147
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:161
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:78
 msgid "Score"
 msgstr "Not"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:125
 msgid "Score (%)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:161
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:60
+msgid ""
+"Score one or more sets. This can also be done from the \"Hmwk Sets Editor\" "
+"or from the \"Instructor Tools\", but the \"Scoring Tools\" page allows "
+"control over parameters."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:170
 msgid "Score required for release"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:228
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:58
 msgid "Score selected set(s) and save to:"
 msgstr "Seçili setleri notla ve dosyaya kaydet:"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2085
-msgid "Score summary for last submit:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:284
+msgid "Score summary for last submission:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:2
 msgid "Score which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:978
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:2
 msgid "Score which sets?"
 msgstr "Hangi setler notlanacak?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
 msgid "Scores"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:487
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:66
+msgid "Scoring (\".csv\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:396
 msgid "Scoring Download"
 msgstr "Notları İndir"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:161
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:115
 msgid "Scoring Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:478
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:391
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:58
 msgid "Scoring Tools"
 msgstr "Notlama Araçları"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2460
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:17
+msgid "Scoring Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:327
 msgid ""
 "Screen and Hardcopy set header information can not be overridden for "
 "individual students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:26
 msgid "Scroll of Resurrection"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:189
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:200
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:211
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:793
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2029
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:297
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:831
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:860
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:889
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:918
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:157
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:178
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:38
 msgid "Section"
 msgstr "Bölüm"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:653
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:802
+#. ($section)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:122
+msgid "Section %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:30
 msgid "Section:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:436
 msgid "Seed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:114
 msgid "Select"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:505
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:20
+msgid ""
+"Select Users from the left column and sets from the right column and assign "
+"or unassign the given sets. The list of users or the list of sets can be "
+"reordered under the \"sort\" option or the format of the user or set list.  "
+"Additionally, the set lists can be filtered (by section number or "
+"recitation).  The displayed user and set lists will only be updated upon "
+"clicking \"Change Display Settings\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:11
 msgid "Select a Homework Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:14
 msgid "Select a Problem Collection"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:18
 msgid "Select a Set Definition File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1028
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:14
 msgid "Select a Set from this Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1659
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:20
+msgid ""
+"Select a course to create a .tar.gz archive of, which contains a dump of the"
+" database and all course files (templates, configuration files, etc).  Each "
+"course can only have a single archive.  Creating an archive of a previously "
+"archived course will delete the old archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:36
 msgid "Select a course to delete."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:946
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:20
+msgid ""
+"Select a course to delete.  Warning, all data will be deleted and this "
+"cannot be undone.  This will not delete any course archives."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:14
 msgid ""
 "Select a course to rename.  The courseID is used in the url and can only "
 "contain alphanumeric characters and underscores. The course title appears on"
 " the course home page and can be any string."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2475
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:13
 msgid "Select a course to unarchive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1914
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3684
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:21
 msgid "Select a listing format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1442
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1478
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:18
+msgid "Select action:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:10
 msgid "Select all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2703
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:12
 msgid "Select all eligible courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2731
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:26
 msgid "Select all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1967
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:10
 msgid "Select all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:315
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:509
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:536
-msgid "Select an action to perform"
-msgstr "Yapılacak işlemi seç"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3063
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:10
 msgid "Select an action to perform:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1956
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:20
+msgid ""
+"Select an archive to restore.  You cannot restore an archive into an "
+"existing course. Instead, either rename or delete the old course, or restore"
+" the archive with a new name.  When restoring a course with a new name, the "
+"name is used as the course ID, and must contain only letters, numbers, "
+"hyphens, and underscores, and may have at most 40 characters."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:36
 msgid "Select course(s) to archive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3731
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:44
 msgid "Select course(s) to hide or unhide."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:7
 msgid "Select import file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:14
 msgid ""
 "Select one or more sets and one or more users below to assign/unassign each "
 "selected set to/from all selected users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:94
 msgid "Select sets below to assign them to the newly-created users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3666
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:20
+msgid ""
+"Select the course to change its Course ID, Course Title, or Institution.  "
+"Note that changing a course's ID will change the URL of all links to the "
+"course, and could break links from external sites such as an LMS."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:4
 msgid ""
 "Select the course(s) you want to hide (or unhide) and then click \"Hide "
 "Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
@@ -5432,133 +7242,230 @@ msgid ""
 "full URL address for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:488
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:20
+msgid ""
+"Select the course(s) you want to hide (or unhide) and then click \"Hide "
+"Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
+"does no harm (the action is skipped). Likewise unhiding a course that is "
+"already visible does no harm (the action is skipped). Hidden courses are "
+"still active but are not listed in the list of WeBWorK courses on the "
+"opening page. To access the course, an instructor or student must know the "
+"full URL address for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:93
+msgid "Select the display mode used to render the problems on this page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:11
 msgid ""
 "Select the homework sets for which to generate hardcopy versions. You may "
 "also select multiple users from the users list. You will receive hardcopy "
 "for each (set, user) pair."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:238
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:30
+msgid ""
+"Select the sets you want scored, choose the name of the export file you want"
+" to use (by default: %1), and then click the \"Score Selected Set(s) and "
+"save to\" button."
+msgstr ""
+
+#. ('<code>ful.csv</code>','<code>scr.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:49
+msgid ""
+"Select this if you want to save the scores for each set in a separate file "
+"in addition to saving all scores to a cumulative file. After clicking the "
+"\"Score Selected Set(s) and save to\" button, you will get a pair of links "
+"for each selected set. The file that ends with %1 contains the number of "
+"correct and incorrect tries about each individual problem for each student. "
+"The file that ends with %2 is a summary of each problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:19
 msgid ""
 "Select user(s) and/or set(s) below and click the action button of your "
 "choice."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2885
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:85
+msgid ""
+"Select which assignment types (homework, tests, just-in-time) the "
+"achievement is evaluated."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:20
+msgid ""
+"Select which courses to upgrade from a previous version of WeBWorK.  The "
+"upgrade process can add missing database columns, delete unused database "
+"columns, and check the course file structure.  Be sure to read over the "
+"changes before confirming the upgrade.  You may want to create an archive of"
+" the course before upgrading.  Only courses that need upgraded will be "
+"selectable."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:84
+msgid "Select your favorite theme for the large text window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:18
 msgid "Select/unselect all fields missing in schema for deletion."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2873
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:9
 msgid "Select/unselect all tables missing in schema for deletion."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:23
 msgid "Selected sets:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:57
 msgid "Send E-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:839
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:83
 msgid "Send Email"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:702
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:69
+msgid "Send email to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:54
+msgid "Send emails to selected instructors."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:59
 msgid "Send to all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:717
-msgid "Send to the students selected below"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:64
+msgid "Send to selected students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:402
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:7
 msgid "Set"
 msgstr "Set"
 
 #. ($newSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:614
 msgid "Set %1 has been created."
 msgstr ""
 
-#. ($newSetName,$userName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1944
+#. ($newSetName, $userName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:616
 msgid "Set %1 was assigned to %2"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1239
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:567
 msgid "Set %1 was assigned to %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:415
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:354
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:42
 msgid "Set Assigner"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:420
-msgid "Set Definition Filename"
-msgstr "Set Tanım Dosyası Adı"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:17
+msgid "Set Assigner Help"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:45
 msgid "Set Definition Files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2318
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2329
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:218
 msgid "Set Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:17
+msgid "Set Detail Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:333
 msgid "Set Detail for set %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:93
 msgid "Set Header"
 msgstr "Set Başlığı"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:323
+msgid "Set Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:218
 msgid "Set ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:267
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:114
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:3
 msgid "Set Info"
 msgstr "Set Bilgileri"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2744
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:19
 msgid "Set List"
 msgstr "Set Listesi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1111
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1209
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1320
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:164
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:262
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:353
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:448
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:546
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:659
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:776
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:895
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:995
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:762
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:809
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:7
 msgid "Set Name"
 msgstr "Set Adı"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:186
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:18
+msgid "Set closes on %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:45
+msgid "Set definition (\".def\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:20
+msgid "Set is closed."
+msgstr ""
+
+#. ($c->formatDateTime($set->reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:16
+msgid "Set is due on %1."
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:14
+msgid "Set opens on %1."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:188
 msgid "Set random seed to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2029
+#: /opt/webwork/webwork2/conf/defaults.config:1930
 msgid ""
 "Set to true for log to mean base 10 log and false for log to mean natural "
 "logarithm."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2049
+#: /opt/webwork/webwork2/conf/defaults.config:1950
 msgid ""
 "Set to true to allow students to enter Unicode versions of some characters "
 "(like U+2212 for the minus sign) in their answers.  One reason to allow this"
@@ -5567,7 +7474,7 @@ msgid ""
 "directory from the keyboard."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2019
+#: /opt/webwork/webwork2/conf/defaults.config:1920
 msgid ""
 "Set to true to display the \"Entered\" column which automatically shows the "
 "evaluated student answer, e.g., 1 if student input is sin(pi/2). If this is "
@@ -5576,7 +7483,7 @@ msgid ""
 " answer."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2060
+#: /opt/webwork/webwork2/conf/defaults.config:1961
 msgid ""
 "Set to true to have Full Width Unicode character (U+FF01 to U+FF5E) "
 "converted to their ASCII equivalents (U+0021 to U+007E) automatically in "
@@ -5584,20 +7491,30 @@ msgid ""
 "automatically use Full Width characters for parentheses and commas."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:521
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:164
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:16
+msgid "Set values"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/siblings.html.ep:4
 msgid "Sets"
 msgstr "Setler"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:352
-msgid "Sets Assigned to User"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:322
+msgid "Sets assigned to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:343
-msgid "Sets assigned to %1"
+#. ($userName, $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:90
+msgid "Sets assigned to %1 (%2)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:17
+msgid "Sets assigned to student Help"
 msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:57
@@ -5611,189 +7528,241 @@ msgid ""
 "links from the LMS must be problem set specific. For example, "
 "<code>webwork.myschool.edu/webwork2/course-name/problem_set_name</code>. If "
 "the problem set name has space characters, they should be underscores in "
-"these addresses. If the problem set is a quiz, it must have this format: "
-"<code>webwork.myschool.edu/webwork2/course-"
-"name/quiz_mode/problem_set_name</code>. Also, to initialize the "
-"communication between WeBWorK and the LMS, the user must follow each of "
-"these external learning tools at least one time. Since there must be a "
-"separate external tool link for each problem set, this option requires more "
-"maintenance of the LMS course.</dd></dl>"
+"these addresses. Also, to initialize the communication between WeBWorK and "
+"the LMS, the user must follow each of these external learning tools at least"
+" one time. Since there must be a separate external tool link for each "
+"problem set, this option requires more maintenance of the LMS "
+"course.</dd></dl>"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:55
+msgid "Sets the order in which achievements are listed and evaluated."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1458
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:625
 msgid "Sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:726
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:36
 msgid "Setting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1332
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:39
 msgid "Shift dates so that the earliest is"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:32
+msgid "Show"
+msgstr ""
+
 #. ($numchild)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1301
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:32
 msgid "Show %1 more like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:326
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:107
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:39
 msgid "Show Correct Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:22
 msgid "Show Date & Size"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:86
 msgid "Show LTI parameters (for debugging)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:620
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:34
 msgid "Show Me Another"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2518
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2412
+#. ($exhausted)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:69
+msgid "Show Me Another %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1642
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:711
 msgid "Show Past Answers"
 msgstr "Önceki Yanıtları Göster"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:703
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:41
+msgid "Show Problem Source File"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:132
 msgid "Show Problem Source File:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
 msgid "Show Problems on Finished Tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
-msgid "Show Scores on Finished Assignments?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+msgid "Show Scores on Finished Tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2416
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:630
 msgid "Show Solutions"
 msgstr "Çözümleri göster"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/conf/defaults.config:1538
 msgid "Show Total Homework Grade on Grades Page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1266
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:77
 msgid "Show all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1380
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:91
 msgid "Show all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2404
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:621
 msgid "Show correct answers"
 msgstr "Doğru yanıtları göster"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1299
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+msgid "Show hints after"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:30
 msgid "Show less like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:337
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:387
 msgid "Show me another"
 msgstr ""
 
-#. ($exhausted)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1926
-msgid "Show me another %1"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:20
+msgid ""
+"Show past answers.  Students can only see their past answers, and they will "
+"not be able to see which parts are correct.  Instructors can use the form to"
+" select any combination of users, sets, and problems to view.  The table "
+"below will list the past answers colored according to correctness (green is "
+"correct).  Use control + click to select multiple users, sets, or problems."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2428
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:639
 msgid "Show problem graders"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:105
 msgid "Show saved answers?"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1860
+#: /opt/webwork/webwork2/conf/defaults.config:1762
 msgid ""
 "Show the correct answer to the current problem before re-randomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1862
+#: /opt/webwork/webwork2/conf/defaults.config:1764
 msgid ""
 "Show the correct answer to the current problem on the last attempt before a "
 "new version is requested."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:3
 msgid "Show which sets?"
 msgstr "Hangi setler gösterilecek?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:690
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:3
 msgid "Show which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:382
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:475
-msgid "Show/Hide Site Description"
-msgstr "Web Alanı Açıklamasını Göster/Gizle"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:622
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:11
 msgid "Show:"
 msgstr "Göster"
 
-#. (scalar @{ $self->{visibleSetIDs} },			scalar @{ $self->{allSetIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:594
+#. (scalar @{ $c->{visibleSetIDs} },			scalar @{ $c->{allSetIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:115
 msgid "Showing %1 out of %2 sets."
 msgstr "%2 setin %1 tanesi gösteriliyor."
 
-#. (scalar @Users, scalar @{ $self->{allUserIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:610
+#. (scalar(keys %{ $c->{visibleUserIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:80
 msgid "Showing %1 out of %2 users"
 msgstr "%2 kullanıcının %1 tanesi gösteriliyor."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:70
 msgid "Showing all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1355
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:81
 msgid "Showing all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:61
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:64
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:67
+#. ($c->{merge_file}, $ur->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:5
+msgid "Showing data from merge file %1 for user %2:"
+msgstr ""
+
+#. ($c->{merge_file})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:147
+msgid "Showing data from merge file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:61
+msgid "Showing problem for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:7
+msgid "Showing statistics for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:33
+msgid ""
+"Shows how many instructors and students have been assigned this problem set,"
+" out of the total number in the class. Clicking on this link allows you to "
+"assign the set to users, unassign this set from users, and to individually "
+"edit the assignment for specific users. For changing dates for individual "
+"users there are also shortcuts from the \"Instructor Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:63
 msgid "Site Information"
 msgstr "Web Alanı Bilgileri"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:88
 msgid "Skip archiving this course"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2080
+#: /opt/webwork/webwork2/conf/defaults.config:1981
 msgid "Skip explanation essay answer fields"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1556
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1557
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:81
+msgid "Snippets of PG code illustrating specific techniques"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1514
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1515
 msgid "Solution:"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1555
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1513
 msgid "Solution: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:432
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:57
 msgid "Solutions"
 msgstr "Çözümleri göster"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1350
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:20
+msgid ""
+"Some OPL problems have been rated for difficulty/educational objective. The "
+"levels are loosely inspired by Bloom's taxonomy. They are assigned numbers "
+"from 1 to 6 as follows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:185
 msgid ""
 "Some WeBWorK problems are programmed using what are called <i>Math "
 "Objects</i>. These problems are preferred by some people because they "
@@ -5801,18 +7770,18 @@ msgid ""
 "particularly for answers which are way off base."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:379
 msgid "Some answers will be graded later."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:60
 msgid ""
 "Some of these files are directories. Only delete directories if you really "
 "know what you are doing. You can seriously damage your course if you delete "
 "the wrong thing."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2082
+#: /opt/webwork/webwork2/conf/defaults.config:1983
 msgid ""
 "Some problems have an explanation essay answer field, typically following a "
 "simpler answer field. For example, find a certain derivative using the "
@@ -5824,7 +7793,7 @@ msgid ""
 "grading."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2186
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:83
 msgid ""
 "Some problems shown above represent multiple similar problems from the "
 "database.  If the (top) information line for a problem has a letter M for "
@@ -5834,309 +7803,405 @@ msgid ""
 "again."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1612
-msgid ""
-"Some servers handle courses taking place in different timezones.  If this "
-"course is not showing the correct timezone, enter the correct value here.  "
-"The format consists of unix times, such as "
-"\"America/New_York\",\"America/Chicago\", \"America/Denver\", "
-"\"America/Phoenix\" or \"America/Los_Angeles\". Complete list: <a "
-"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:529
-msgid ""
-"Something was wrong with your LTI parameters.  If this recurs, please speak "
-"with your instructor"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:50
 msgid "Sort"
 msgstr "Sırala"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:751
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:814
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:4
 msgid "Sort by"
 msgstr "Kriterlere Göre Sırala"
 
 #. ($names{$primary}, $names{$secondary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:817
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:324
 msgid "Sort by %1 and then by %2"
 msgstr "Önce %1 sonra %2 kriteriyle sırala"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:171
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:115
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:3
 msgid "Sort:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:51
+msgid "Sorts the lists displayed by due date, name, etc."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:363
 msgid "Source File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1586
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1612
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1555
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1593
 msgid ""
 "Source file paths cannot include .. or start with /: your source file path "
 "was modified."
 msgstr ""
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:11
 msgid ""
 "Specify an ID, title, and institution for the new course. The course ID may "
 "contain only letters, numbers, hyphens, and underscores, and may have at "
 "most %1 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:661
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:94
+msgid ""
+"Spell check the text of the file that your are editing. Note that there will"
+" be many spelling errors in the code parts of your file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:116
+msgid "Standard Deviation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:162
 msgid "Start"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:609
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:47
+msgid "Start LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:130
 msgid "Start New Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:443
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:94
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:508
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:84
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:54
 msgid "Statistics"
 msgstr "İstatistikler"
 
-#. ($self->{ce}{courseName} =~ s/_/ /gr,                   CGI::span({ dir =>
-#. 'ltr' }, format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:73
-msgid "Statistics for %1 set %2. Closes %3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:17
+msgid "Statistics Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:86
+msgid "Statistics for %1"
 msgstr ""
 
-#. ($self->{ce}{courseName}, $self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:68
-msgid "Statistics for %1 student %2"
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:90
+msgid "Statistics for %1 problem %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2089
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1442
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1524
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2020
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:296
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:659
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:806
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:191
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:192
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:84
+msgid "Statistics for student %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:442
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:151
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:160
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:36
 msgid "Status"
 msgstr "Durumu"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:29
 msgid "Stop Acting"
 msgstr "Rol Yapmayı bırak"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2251
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:85
 msgid "Stop Archiving"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2418
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1153
 msgid "Stop archiving courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:233
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:783
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2011
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:295
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:829
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:887
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:916
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:30
 msgid "Student ID"
 msgstr "Kullanıcı Adı"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:9
+msgid "Student ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:37
 msgid "Student Name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:570
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:428
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:56
 msgid "Student Progress"
 msgstr "Öğrenci Gelişimi"
 
-#. ($self->{ce}->{courseName},                     CGI::span({ dir => 'ltr' },
-#. format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:81
-msgid "Student Progress for %1 set %2. Closes %3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:17
+msgid "Student Progress Help"
 msgstr ""
 
-#. ($self->{ce}->{courseName}, $self->{studentName})
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:72
+msgid "Student Progress for %1"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($c->stash('setID')
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:76
-msgid "Student Progress for %1 student %2"
+msgid "Student Progress for set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:628
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:80
 msgid "Student answers"
 msgstr "Yanıtları Gönder"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:766
-msgid "Subject:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:80
+msgid ""
+"Student scores for the sets selected below will be calculated. This and "
+"other scoring operations can also be done using the \"Scoring Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:87
+msgid "Student:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:124
+msgid "Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:653
-msgid "Subject: "
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:50
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:8
+msgid "Subject:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:222
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:30
 msgid "Submission time:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:226
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:41
 msgid "Submit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:26
 msgid "Submit Answers"
 msgstr "Yanıtları Gönder"
 
 #. ($effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1861
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:23
 msgid "Submit Answers for %1"
 msgstr "%1 için Yanıtları Gönder"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:502
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:525
 msgid "Submit your answers again to go on to the next part."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:775
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:183
 msgid "Success Index"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:106
+msgid ""
+"Success index is the square of the average score divided by the average "
+"number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:73
+msgid ""
+"Success index is the square of the score divided by the number of attempts."
+msgstr ""
+
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1086
 msgid "Successfully archived the course %1."
 msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:885
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:422
 msgid "Successfully created new achievement %1"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1252
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:581
 msgid "Successfully created new set %1"
 msgstr "Yeni set %1 başarıyla yaratıldı"
 
 #. ($add_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:465
 msgid "Successfully created the course %1"
 msgstr ""
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1818
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2401
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1131
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:900
 msgid "Successfully deleted the course %1."
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1529
+#. ($rename_oldCourseID,							$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:772
 msgid "Successfully renamed the course %1 to %2"
 msgstr ""
 
 #. ($unarchive_courseID, $new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2653
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1286
 msgid "Successfully unarchived %1 to the course %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2099
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4280
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:89
+msgid "TA:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2274
 msgid "Table defined in database but missing in schema"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2097
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2269
 msgid "Table defined in schema but missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2265
 msgid "Table is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3200
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3490
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:276
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:576
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:106
 msgid "Take Action!"
 msgstr "İşlemi Gerçekleştir!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Target Set:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:63
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:42
 msgid "TeX Source"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:784
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:258
+msgid "Test %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:54
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:52
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:55
+msgid "Test Name"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:156
 msgid "Test Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:224
 msgid "Test Time Limit (min; 0=Close Date)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2041
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:238
 msgid "Test Time Notification"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:156
 msgid "Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:244
 msgid "Test not yet submitted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:317
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:920
+msgid "Test parameters"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:149
 msgid "Test/quiz with time limit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:79
 msgid "Text"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:842
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:80
+msgid "Text Editor Options"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:55
 msgid "Text chapter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:864
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:66
 msgid "Text section:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:44
 msgid "Textbook:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1403
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:58
 msgid ""
-"The Attempts figure is the global average of the number of attempts (both "
-"correct and incorrect) individuals take on this problem.  A high figure may "
-"represent a difficult problem.  Note that problems with multiple parts may "
-"have higher average attempts since many students  will submit an answer to "
+"The \"Edit Target Set\" button at the top of the page will take you to the "
+"Problem Set Editor which will allow you to edit dates, assign users and "
+"other information about the problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:115
+msgid ""
+"The \"Score\" tab will export achievement data to a CSV file that can be "
+"downloaded.  The export contains the global data including number of "
+"achievement points and current level of each student.  In addition for each "
+"selected achievement, a column for if the achievement was earned (1) or not "
+"earned (0) will be added to the CSV."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:194
+msgid ""
+"The <strong>Assigned sets</strong> column (x/y) indicates that x sets out of"
+" y sets avaiable have been assigned to this student. Click this link to "
+"assign or unassign sets to this student, to adjust due dates, or to adjust "
+"the grades on a homework set for a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:20
+msgid ""
+"The <strong>Set Detail</strong> page can be viewed in one of two distinct "
+"modes:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:189
+msgid ""
+"The <strong>login name</strong> column links allow you to \"act as\" a "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:191
+msgid ""
+"The <strong>pencil</strong> in the login column allows you to edit that "
+"student's data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:64
+msgid ""
+"The Attempts figure is the global average of the number of attempts (both "
+"correct and incorrect) individuals take on this problem.  A high figure may "
+"represent a difficult problem.  Note that problems with multiple parts may "
+"have higher average attempts since many students  will submit an answer to "
 "each part before continuing and each such  submittal counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1485
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:124
 msgid ""
 "The Attempts figure is the local average of the number of attempts (both "
 "correct and incorrect) individuals at your institution take on this problem."
@@ -6146,14 +8211,14 @@ msgid ""
 "counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1819
+#: /opt/webwork/webwork2/conf/defaults.config:1721
 msgid ""
 "The Maximum number of times Show me Another can be used per problem by a "
 "student. If set to -1 then there is no limit to the number of times that "
 "Show Me Another can be used."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1787
+#: /opt/webwork/webwork2/conf/defaults.config:1689
 msgid ""
 "The Reduced Scoring Period is the default period before the due date during "
 "which all additional work done by the student counts at a reduced rate. When"
@@ -6166,7 +8231,7 @@ msgid ""
 "work done counts 50% of the original.\" will be displayed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:78
 msgid ""
 "The Status figure is the global average of the Status individuals have "
 "earned on this problem. The Status is the percentage correct (from 0% to "
@@ -6175,7 +8240,7 @@ msgid ""
 "a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1506
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:138
 msgid ""
 "The Status figure is the local average of the Status individuals at your "
 "institution have earned on this problem. The Status is the percentage "
@@ -6184,47 +8249,61 @@ msgid ""
 "students will work on a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1262
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:11
 msgid "The WeBWorK Project"
 msgstr "WeBWorK Projesi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:822
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:25
+msgid ""
+"The WeBWorK administrators need to be added to the course in order for them "
+"to access the course.  Unchecking this option will make it so WeBWorK "
+"administrators cannot directly login to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:129
+msgid ""
+"The achievement evaluator is the perl code that is run after each submit to "
+"determine if an achievement is earned or not.  Click on the \"Edit "
+"Evaluator\" link to edit the evaluator."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:26
 msgid ""
 "The adjusted status of a problem is the larger of the problem's status "
 "andthe weighted average of the status of those problems which count towards "
 "the parent grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1677
+#: /opt/webwork/webwork2/conf/defaults.config:1579
 msgid ""
 "The amount of time (in minutes) after the due date that the Answers are "
 "available to student to view.  You can change this for individual homework, "
 "but WeBWorK will use this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1667
+#: /opt/webwork/webwork2/conf/defaults.config:1569
 msgid ""
 "The amount of time (in minutes) before the due date when the assignment is "
 "opened.  You can change this for individual homework, but WeBWorK will use "
 "this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:386
 msgid "The answer above is NOT correct."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:375
 msgid "The answer above is correct."
 msgstr "Yukarıdaki yanıt doğru."
 
 #. ($filename, $ce->{mail}{maxAttachmentSize})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:230
 msgid ""
 "The attached file \"%1\" exceeds the allowed attachment size of "
 "%quant(%2,megabyte)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:421
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:496
 msgid ""
 "The child problems for this problem will become visible to the student when "
 "they either have more incorrect attempts than is specified here, or when "
@@ -6233,173 +8312,252 @@ msgid ""
 "attempts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:704
+#. ('href="http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files"
+#. target="Webworkdocs"',
+#. '<code>demoCourse.lst</code>','<code>.csv</code>','<code>.lst</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:59
+msgid ""
+"The classlist files are stored in the templates directory and provide a "
+"convenient way to enter a large number of students into your class. To view "
+"the format for <strong>ClassList files</strong> see the <a %1>ClassList "
+"specification</a> or download the %2 file and use it as a model. ClassList "
+"files can be prepared using a spreadsheet and then saved as %3 (comma "
+"separated values) text files.  However, to access as a classlist file, the "
+"file suffix needs to be changed to %4, which can be done with the \"Rename\""
+" button."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:16
 msgid ""
 "The configuration module did not find the data it needs to function.  Have "
-"your site administrator check that Constants.pm is up to date."
+"your site administrator check that site configuration files are up to date."
+msgstr ""
+
+#. ($archive_courseID,					$archive_path)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:80
+msgid ""
+"The course \"%1\" has already been archived at \"%2\". This earlier archive "
+"will be erased.  This cannot be undone."
 msgstr ""
 
-#. (CGI::b($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:151
+#. (tag('strong', stash('courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:8
 msgid ""
 "The course %1 uses an external authentication system (%2). Please go there "
 "to log in again."
 msgstr ""
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:186
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:17
 msgid ""
 "The course %1 uses an external authentication system (%2). Please return to "
 "that system to access this course."
 msgstr ""
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:191
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:23
 msgid ""
 "The course %1 uses an external authentication system (%2). You've "
 "authenticated through that system, but aren't allowed to log in to this "
 "course."
 msgstr ""
 
-#. ($archive_courseID,						$archive_path)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2243
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:30
+msgid "The course database must be upgraded before archiving this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:30
+msgid "The course database must be upgraded before renaming this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:26
 msgid ""
-"The course '%1' has already been archived at '%2'. This earlier archive will"
-" be erased.  This cannot be undone."
+"The current mode should be made clear by the information at the top of the "
+"page."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1995
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:46
+msgid ""
+"The current value of the achievement counter. Changes to this variable will "
+"be saved."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1897
 msgid "The default display mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1855
+#: /opt/webwork/webwork2/conf/defaults.config:1757
 msgid ""
 "The default number of attempts before the problem is re-randomized. ( 0 => "
 "never )"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1854
+#: /opt/webwork/webwork2/conf/defaults.config:1756
 msgid ""
 "The default number of attempts between re-randomization of the problems ( 0 "
 "=> never)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:251
-msgid "The directory you specified doesn't exist"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:73
+msgid ""
+"The description shown to students which states what action is needed to earn"
+" the achievement."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1829
-msgid "The display was already cleared."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:5
+msgid "The directory you specified doesn't exist"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2111
+#: /opt/webwork/webwork2/conf/defaults.config:2032
 msgid ""
 "The e-mail verbosity level controls how much information is automatically "
-"added to feedback e-mails.  Levels are<ol><li value=\"Simple\"> Simple: send"
-" only the feedback comment and context link</li><li value=\"Standard\"> "
-"Standard: as in Simple, plus user, set, problem, and PG data</li><li "
-"value=\"Debug\"> Debug: as in Standard, plus the problem environment "
-"(debugging data)</li></ol>"
+"added to feedback e-mails.  Levels are<ol><li> Simple: send only the "
+"feedback comment and context link</li><li> Standard: as in Simple, plus "
+"user, set, problem, and PG data</li><li> Debug: as in Standard, plus the "
+"problem environment (debugging data)</li></ol>"
 msgstr ""
 
-#. ($achievementName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:625
-msgid "The evaluator for %1 has been renamed to '%2'."
+#. ($achievementName,				$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:293
+msgid "The evaluator for %1 has been renamed to \"%2\"."
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:339
-msgid ""
-"The file %1/%2 already exists and cannot be overwritten. The message was not"
-" saved"
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:246
+msgid "The file \"%1\" cannot be found."
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:190
-msgid "The file %1/%2 cannot be found."
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:526
+msgid "The file \"%1\" cannot be read!"
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:181
-msgid "The file %1/%2 is not readable by the webserver."
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:522
+msgid "The file \"%1\" is a directory!"
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:373
-msgid "The file '%1' cannot be found."
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:259
+msgid "The file \"%1\" is a template. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1004
-msgid "The file '%1' cannot be read!"
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:250
+msgid "The file \"%1\" is protected. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:380
-msgid "The file '%1' is a blank problem!"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:19
+msgid "The file $file does not appear to be a text or image file."
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:998
-msgid "The file '%1' is a directory!"
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:277
+msgid ""
+"The file %1 already exists and cannot be overwritten. The message was not "
+"saved."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:375
-msgid "The file '%1' is protected!"
+#. ("$emailDirectory/$openfilename",				$emailDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:156
+msgid ""
+"The file %1 cannot be found. Check whether it exists and whether the "
+"directory %2 can be read by the webserver. "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:598
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
+msgid ""
+"The file %1 is not contained in the course templates directory and can not "
+"be modified."
+msgstr ""
+
+#. ("$emailDirectory/$openfilename")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:148
+msgid ""
+"The file %1 is not readable by the webserver. Check that it's permissions "
+"are set correctly."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:203
 msgid "The file does not appear to be a text file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:88
 msgid "The file you are trying to download doesn't exist"
 msgstr ""
 
 #. ($filename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:221
 msgid "The filetype of the attached file \"%1\" is not allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3843
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2149
 msgid "The following courses were successfully hidden:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3908
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2218
 msgid "The following courses were successfully unhidden:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4121
-msgid "The following upgrades are available for your WeBWorK system:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:34
+msgid "The following describes how the checkboxes alter the scoring output"
 msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2081
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:66
 msgid ""
 "The following users are NOT assigned to this set and will be ignored: %1"
 msgstr ""
 
-#. (join('.', @{$problemSeqs[$children_counts_indexs[0]]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:288
+msgid "The given file path is not a valid location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:49
+msgid "The goal value of the achievement counter."
+msgstr ""
+
+#. (join('.', @{ $problemSeqs[ $children_counts_indexs[0] ] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1334
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the score of problem %1."
 msgstr ""
 
-#. (join(', ', map({join('.', @{$problemSeqs[$_]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2064
+#. (join(', ', map({ join('.', @{ $problemSeqs[$_] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the weighted average of the problems: %1."
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1954
-msgid "The hardcopy header for set %1 has been renamed to '%2'."
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1078
+msgid "The hardcopy header for set %1 has been renamed to \"%2\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:111
+#. ($showHintsAfter)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:36
+msgid ""
+"The hint shown is an instructor preview and will be shown to students after "
+"%quant(%1,attempt)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:32
+msgid ""
+"The hint shown is an instructor preview and will not be shown to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:22
+msgid ""
+"The information box on the right displays information about the course. This"
+" is useful for leaving course wide messages for students. It contains text "
+"from the file templates/course_info.txt. Instructors can edit this file from"
+" the web (click on the \"Edit\" link)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:30
 msgid ""
 "The initial value is the answer sub score for the answer that is currently "
 "shown.  If this is modified, it will be used to compute the total problem "
@@ -6407,37 +8565,100 @@ msgid ""
 "shown answer if the page is reloaded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:161
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:97
+msgid ""
+"The initial value is the currently saved score as a point value computed "
+"using the percent score.  This point value is used to compute the percent "
+"score (rounded to a whole percent) that can be saved."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:145
 msgid "The initial value is the currently saved score for this student."
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_oldCourseInstitution,
 #. $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
 msgid ""
 "The institution associated with the course %1 has been changed from %2 to %3"
 msgstr ""
 
-#. ($rename_newCourseID, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1498
+#. ($rename_newCourseID, $optional_arguments{courseInstitution})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:729
 msgid "The institution associated with the course %1 is now %2"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:599
+msgid ""
+"The instructor account with user id %1 does not exist.  Instructor accounts "
+"must be created manually."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:635
 msgid ""
 "The instructor account with user id %1 does not exist.  Please create the "
 "account manually via WeBWorK."
 msgstr ""
 
-#. ($r->param('new_set_name')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1897
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:87
+msgid ""
+"The key maps that are available are \"default\", \"emacs\", \"sublime\", and"
+" \"vim\". The \"default\" key map has the standard behavior of a browser "
+"text area. You can use Ctrl-C to copy, Ctrl-V to paste, Ctrl-F to search, "
+"etc. If you are more comfortable with the \"emacs\", \"sublime\", or \"vim\""
+" text editors then you may choose to use one of those key maps instead."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:75
+msgid "The large text window"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:27
+msgid ""
+"The list of files include regular files, directories (ending in a \"/\") and"
+" links (ending in a \"@\")."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:52
+msgid ""
+"The login name cannot be changed. (It is the primary key for the student's "
+"data.) If you make a mistake in the login name at the beginning of the "
+"course (before any work has been done) then it is best to simply add a new "
+"student with the correct entry and drop the student with the bad login name."
+" (See drop and delete students below.) If the login name must be changed "
+"after a user has started working assignments, then contact your system "
+"administrator, who can use the webwork2 \"bin/change_user_id\" script to "
+"change the user id."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:20
+msgid ""
+"The main page allows access to set and student statistics.  When selecting a"
+" student, their grades page is shown, which lists set totals and per problem"
+" grades for each set assigned to the student.  When selecting a set, various"
+" statistics and histograms are shown for the overall grades of students who "
+"are currently enrolled or auditing the course."
+msgstr ""
+
+#. ('href="http://webwork.maa.org/wiki" target="ww_wiki"',
+#. 'href="http://webwork.maa.org/wiki/Instructors" target="ww_wiki"')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:24
+msgid ""
+"The main page for WeBWorK documentation is the <a %1>webwork wiki</a> while "
+"specific help for instructors setting up a course are in the <a "
+"%2>instructors' section</a>."
+msgstr ""
+
+#. ($c->param('new_set_name')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:569
 msgid ""
 "The name \"%1\" is not a valid set name.  Use only letters, digits, dashes, "
 "underscores, periods, and spaces."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1530
+#: /opt/webwork/webwork2/conf/defaults.config:1432
 msgid ""
 "The name of course information file (located in the templates directory). "
 "Its contents are displayed in the right panel next to the list of homework "
@@ -6454,151 +8675,249 @@ msgid ""
 "go back to the LMS to access something in the WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:63
+msgid "The number of points earned for earning the achievement."
+msgstr ""
+
 #. ($openDate, $dueDate, $answerDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1104
 msgid ""
 "The open date: %1, close date: %2, and answer date: %3 must be defined and "
 "in chronological order."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:702
+#. ($path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:393
+msgid "The original path is not in a valid location. Using failsafe %1"
+msgstr ""
+
+#. ($forcedSourceFile)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:510
+msgid "The original path to the file is %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:262
 msgid "The password and password confirmation for the instructor must match."
 msgstr ""
 
-#. (CGI::b($r->maketext("[_1]'s Current Password", $user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:27
+msgid ""
+"The password can be any combination of letters, numbers and special symbols."
+" Students are encouraged to use all three, and stay away from dictionary "
+"words. The password should not be the same as any password used elsewhere, "
+"such as for an email account. The password will only be present on the page "
+"if the user has permission to change the password."
+msgstr ""
+
+#. ($c->tag(                                               'b',
+#. $c->maketext(                                                   "[_1]'s
+#. Current Password",
+#. $c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:95
 msgid ""
 "The password you entered in the %1 field does not match your current "
 "password. Please retype your current password and try again."
 msgstr ""
 
-#. (CGI::b($r->maketext("[_1]'s New Password",         $e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:105
+#. ($c->tag('b', $c->maketext("[_1]'s New Password",         $e_user_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:82
 msgid ""
 "The passwords you entered in the %1 and %2 fields don't match. Please retype"
 " your new password and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:789
-msgid "The path to the original file should be absolute"
-msgstr "Sorunun özgün yolu kesin olmalı"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:374
+msgid "The path can not be the temporary edit directory."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:667
-msgid ""
-"The percentage of active students with correct answers for each problem"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:370
+msgid "The path to the original file should be absolute."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:131
 msgid ""
 "The percentage of students receiving at least these scores. The median score"
 " is in the 50% column."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:458
 msgid "The prerequisite conditions have not been met for set '%1'."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1917
-msgid "The problem set is not yet open"
-msgstr ""
-
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2012
-msgid "The recorded score for this version is  %1/%2."
+#. (q(down menu to change which student's seed and answers are shown.  Use the
+#. "Mark Correct" checkbox to set)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:26
+msgid ""
+"The problem is shown at the top with the seed and answers of the selected "
+"student.  Use the drop "
 msgstr ""
 
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2021
-msgid "The recorded score for this version is %1/%2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:62
+msgid "The problem set is not yet open"
 msgstr ""
 
 #. ($origReducedScoringDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1971
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1121
 msgid ""
 "The reduced credit date %1 in the file probably was generated from the Unix "
 "epoch 0 value and is being treated as if it was Unix epoch 0."
 msgstr ""
 
 #. ($openDate, $dueDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1982
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1135
 msgid ""
 "The reduced credit date should be between the open date %1 and close date %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1220
 msgid ""
 "The reduced scoring date should be between the open date and close date."
 msgstr ""
 
 #. ($tempFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:307
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:298
 msgid "The requested file \"%1\" does not exist on the server."
 msgstr ""
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2085
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1389
 msgid "The score for this problem can count towards score of problem %1."
 msgstr ""
 
-#. ($setName, $effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:306
-msgid "The selected problem set (%1) is not a valid set for %2"
-msgstr "Seçtiğiniz soru seti (%1) set %2 için geçerli değil"
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:69
+msgid ""
+"The scoring files are stored in the scoring directory and are produced using"
+" the \"Scoring Tools\" page or the scoring command in the \"Instructor "
+"Tools\" module. These files can be downloaded, modified in a spreadsheet "
+"(for example, to add midterm scores) and then uploaded again to the scoring "
+"directory to be merged with email messages. (Use a new file name, other than"
+" %1, when uploading to prevent the scoring module from overwriting an "
+"uploaded file.)"
+msgstr ""
 
-#. ($urlpath->arg("setID")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1467
-msgid "The selected problem set (%1) is not a valid set for %2%3:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:52
+msgid ""
+"The second row of the problem collection area is for browsing directories. "
+"The OPL will be there as well as any other directories that you may set up "
+"(for example Contrib). If this is selected, all subdirectories containing "
+"problems will be listed."
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1946
-msgid "The set header for set %1 has been renamed to '%2'."
+#. (stash('setID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet.html.ep:13
+msgid "The selected problem set (%1) is not a valid set for %2."
+msgstr ""
+
+#. ($setID, $effectiveUserID, $c->{invalidVersionCreation} ? " (acted as by
+#. $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:77
+msgid "The selected problem set (%1) is not a valid set for %2: %3"
+msgstr ""
+
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1066
+msgid "The set header for set %1 has been renamed to \"%2\"."
 msgstr ""
 
-#. ($newSetName)
 #. ($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1164
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:491
+msgid ""
+"The set name \"%1\" is already in use. Pick a different name if you would "
+"like to start a new set. No set created."
+msgstr ""
+
+#. ($newSetName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:584
 msgid ""
 "The set name '%1' is already in use.  Pick a different name if you would "
 "like to start a new set."
 msgstr ""
 
-#. ($setID, $editingSetVersion, $editForUser[0])
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2109
-msgid "The set-version (%1, version %2) is not assigned to user %3."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:58
+msgid ""
+"The sets checked below will be visible to students or hidden from students. "
+"Useful for preparing sets ahead of time, but not showing them to students; "
+"or for temporarily hiding a set which has a mistake in it while it is being "
+"fixed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:54
+msgid ""
+"The sets checked below will become available for editing the due dates and "
+"visibility."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:73
+msgid ""
+"The sets checked below will written to set definition files, to be saved for"
+" future use, or to be transferred to another course. The set definition "
+"files can be uploaded/downloaded using the \"File Manager\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:29
+msgid ""
+"The simple configuration file is the name of the configuration file created "
+"when using the \"Course Configuration\" page to configure course options.  "
+"This option sets if this configuration file is copied from the old course or"
+" not and instead use the server defaults."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:551
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:521
 msgid "The solution has been removed."
 msgstr ""
 
-#. ($fullSetName, $prettyProblemNumber, $self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1975
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:33
 msgid ""
-"The source file for 'set %1 / problem %2 has been changed from '%3' to '%4'"
+"The solution shown is an instructor preview and will only be shown to "
+"students after the due date."
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2133
+#. ($c->{fullSetID},
+#. $c->{prettyProblemNumber},
+#. $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1103
+msgid ""
+"The source file for \"set %1 / problem %2\" has been changed from \"%3\" to "
+"\"%4\"."
+msgstr ""
+
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1209
+msgid ""
+"The temporary file %1 is not contained in the course templates directory and"
+" can not be deleted."
+msgstr ""
+
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:689
+msgid ""
+"The temporary file %1 is not in the course templates directory and can not "
+"be deleted!"
+msgstr ""
+
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:349
 msgid ""
 "The test (which is version %1) may  no longer be submitted for a grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1927
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1042
 msgid ""
 "The text box now contains the source of the original problem. You can "
 "recover lost edits by using the Back button on your browser."
 msgstr "Şu anda sorunun orijinal hali gösteriliyor. Kaydedilmemiş değişiklikleri kurtarmak için internet tarayıcınızın \"Geri\" tuşunu kullanın."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:214
+#. (			% . 'but the result will not be counted.')
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:23
 msgid ""
 "The time limit on this assignment was exceeded. The assignment may be "
-"checked, but the result will not be counted."
+"checked, "
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1657
+#: /opt/webwork/webwork2/conf/defaults.config:1559
 msgid ""
 "The time of the day that the assignment is due.  This can be changed on an "
 "individual basis, but WeBWorK will use this value for default when a set is "
@@ -6606,24 +8925,39 @@ msgid ""
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1443
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:689
 msgid "The title of the course %1 has been changed from %2 to %3"
 msgstr ""
 
-#. ($rename_newCourseID, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1491
+#. ($rename_newCourseID, $optional_arguments{courseTitle})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:722
 msgid "The title of the course %1 is now %2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:167
+msgid ""
+"The top number is the percent score on the problem.  A period (.) indicates "
+"a problem has not been attempted. The bottom number is the number of "
+"incorrect attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:25
+msgid ""
+"The total grade row at the bottom shows the total score and percent average "
+"over all open assignments.  The total grade row can be shown/hidden under "
+"general course configuration settings."
+msgstr ""
+
 #. ($enableReducedScoring)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1151
 msgid ""
 "The value %1 for enableReducedScoring is not valid; it will be replaced with"
 " 'N'."
 msgstr ""
 
 #. ($timeCap)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2032
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1209
 msgid ""
 "The value %1 for the capTimeLimit option is not valid; it will be replaced "
 "with '0'."
@@ -6631,81 +8965,90 @@ msgstr ""
 
 #. ($hideScore)
 #. ($hideScoreByProblem)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2023
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1178
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1189
 msgid ""
 "The value %1 for the hideScore option is not valid; it will be replaced with"
 " 'N'."
 msgstr ""
 
 #. ($hideWork)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1200
 msgid ""
 "The value %1 for the hideWork option is not valid; it will be replaced with "
 "'N'."
 msgstr ""
 
 #. ($relaxRestrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2045
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1235
 msgid ""
 "The value %1 for the relaxRestrictIP option is not valid; it will be "
 "replaced with 'No'."
 msgstr ""
 
 #. ($restrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2037
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1221
 msgid ""
 "The value %1 for the restrictIP option is not valid; it will be replaced "
 "with 'No'."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:46
+msgid "The visible name/title of the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:36
 msgid ""
 "The webwork server must be able to write to these directories. Please "
 "correct the permssion errors."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1537
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:83
+msgid "Theme"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1439
 msgid "Theme (refresh page after saving changes to reveal new theme.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:109
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:5
 msgid "Theme:"
 msgstr ""
 
 # Context is "Sort by ____ Then by _____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:843
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:872
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:30
 msgid "Then by"
 msgstr "sonra"
 
-#. ($count_line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:603
+#. ($listingsCount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:52
 msgid "There are %1 matching WeBWorK problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1625
+#: /opt/webwork/webwork2/conf/defaults.config:1527
 msgid ""
 "There are currently two hardcopy themes to choose from: One Column and Two "
 "Columns.  The Two Columns theme is the traditional hardcopy format.  The One"
 " Column theme uses the full page width for each column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2979
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1519
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
 "least one table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1243
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:23
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
-"least one table.  They can only be removed when upgrading the course."
+"least one table.  They can be removed when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1404
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
 "least one table. Check the checkbox by the field to delete it when upgrading"
@@ -6713,63 +9056,48 @@ msgid ""
 "is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1508
 msgid "There are extra database tables which are not defined in the schema."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2833
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1389
 msgid "There are extra database tables which are not defined in the schema. "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:15
 msgid ""
 "There are extra database tables which are not defined in the schema.  These "
 "can be deleted when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:601
-msgid "There are no matching WeBWorK problems"
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:29
+msgid "There are many options available at the bottom:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:976
-msgid "There are no set definition files in this course to look at."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:49
+msgid "There are no completed versions of this test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2199
-msgid ""
-"There are tables or fields missing from the database.  The database must be "
-"upgraded before archiving this course."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4108
-msgid "There are upgrades available for the Open Problem Library."
-msgstr ""
-
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4072
-msgid ""
-"There are upgrades available for your current branch of PG from branch %1 in"
-" remote %2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:51
+msgid "There are no matching WeBWorK problems"
 msgstr ""
 
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4010
-msgid ""
-"There are upgrades available for your current branch of WeBWorK from branch "
-"%1 in remote %2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:8
+msgid "There are no set definition files in this course to look at."
 msgstr ""
 
 #. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:273
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:87
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
 "their name, you destroy all of the data for achievement %1 for this student."
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:230
+#. (tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:91
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
@@ -6777,37 +9105,29 @@ msgid ""
 "student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:205
-msgid ""
-"There is NO undo for this function.  Do not use it unless you know what you "
-"are doing!  When you unassign sets using this button, or by unchecking their"
-" set names, you destroy all of the data for those sets for this student."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:234
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:68
 msgid "There is NO undo for unassigning a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:174
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:177
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:139
-msgid "There is NO undo for unassigning students."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4069
-msgid "There is a new version of PG available."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:125
+msgid ""
+"There is NO undo for unassigning sets. Do not do so unless you know what you"
+" are doing!  When you unassign sets by unchecking set names and clicking "
+"save, you destroy all of the data for those sets for this student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4007
-msgid "There is a new version of WeBWorK available."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:21
+msgid "There is NO undo for unassigning students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:529
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:490
 msgid "There is a written solution available."
 msgstr ""
 
 #. ($message_file, $merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:50
 msgid ""
 "There is no additional grade information.  A message about additional grades"
 " can go in [TMPL]/email/%1. It is merged with the file [Scoring]/%2. These "
@@ -6816,185 +9136,324 @@ msgid ""
 msgstr ""
 
 #. ($continueTimeLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:486
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:25
 msgid ""
 "There is no time remaining on the currently open test. Click continue below "
 "and then click \"Grade Test\" within %1 seconds to submit the test for a "
 "grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:856
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:65
 msgid "There is no undo for deleting files or directories!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:534
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:495
 msgid ""
 "There is no written solution available for this problem, but you can still "
 "view the correct answers."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:537
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:498
 msgid "There is no written solution available for this problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1539
+#: /opt/webwork/webwork2/conf/defaults.config:1441
 msgid ""
-"There is one main theme to choose from: math4. It has two variants, "
-"math4-green and math4-red. The theme specifies a unified look and feel for "
-"the WeBWorK course web pages."
+"There is one main theme to choose from: math4. It has three variants: "
+"math4-green, math4-red, and math4-yellow. The theme specifies a unified look"
+" and feel for the WeBWorK course web pages."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2270
-msgid ""
-"There may be something wrong with this question. Please inform your "
-"instructor including the warning messages below."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:441
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator if this recurs."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:284
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:307
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:475
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:484
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:511
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:543
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:219
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:354
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:492
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:536
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:575
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:172
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:189
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:212
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:227
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:365
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:447
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1935
+#. ('href="https://webwork.maa.org/wiki/Set_Definition_Files"
+#. target="Webworkdocs"')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:48
+msgid ""
+"These are stored in the templates directory. The format of <strong>Set "
+"Definition files</strong> is described in the <a %1>Set Definition "
+"specification</a>. Set definition files are mainly useful for transferring "
+"set assignments from one course to another and are created when exporting a "
+"problem set from the \"Hmwk Sets Editor\".  Each set defintion file contains"
+" a list of problems used and the dates and times. These definitions can be "
+"imported into the current course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:77
+msgid ""
+"These are the files from which problems are generated and are located in the"
+" templates directory or in subdirectories. They can be edited directly using"
+" the \"Edit\" link on each problem page or from the \"Hmwk Sets Editor\". "
+"The File Manager allows you to upload or download these files. \tDirectories"
+" that start with \"set\" contain pg files and are generated when exporting a"
+" problem set in which there are local versions of a problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:40
+msgid ""
+"These options will only be shown if the user has the permission to change "
+"display settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:44
+msgid ""
+"These problems require some application of algorithms, but do not rise to "
+"the level of a full word problem. For example, \"Identify the local extrema "
+"for f(x) = ...\". One has to apply algorithms and interpret results."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1837
 msgid ""
 "These users and higher get the \"Show Past Answers\" button on the problem "
 "page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:17
 msgid "This action can take a long time if there are many students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:168
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:12
 msgid "This action will not overwrite existing users."
 msgstr ""
 
-#. (CGI::b($r->maketext("Guest Login")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:279
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:20
+msgid ""
+"This allows for the viewing, downloading, uploading and other management of "
+"files in the course.  Select a file or set of files (using CTRL or SHIFT) "
+"and click the desired button on the right.  Many actions can only be done "
+"with a single file (like view). Selecting a directory or set of files and "
+"clicking \"Make Archive\" creates a compressed tar file with the name "
+"COURSE_NAME.tgz"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:34
+msgid ""
+"This browses the Open Problem Library (OPL) in category "
+"(Subject/Chapter/Section) form. Select the desired categories (all three do "
+"not need to be selected) and click \"View Problems\". If the \"Include "
+"Contrib\" box is selected then those problems in the Contrib section of the "
+"OPL that have the categories defined are also included. Contrib problems are"
+" problem that haven't been vetted as thoroughly as OPL problems. If you want"
+" hints or solutions included while browsing select the appropriate box."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:49
+msgid ""
+"This button is also present both at top and the bottom of the page. Discards"
+" all changes, reloading the page by re-reading the database information for "
+"this set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:39
+msgid ""
+"This button is present both at top and the bottom of the page. Any and all "
+"changes made to any part of the set will be saved with one important "
+"exception: When editing the set for one or more students, you can choose to "
+"override the default value (defined for the set in general) by clicking on "
+"the checkbox and providing a value (or possibly leaving blank) and checking "
+"the override checkbox. If you do <strong>NOT</strong> check the checkbox, "
+"the override value will be discarded and the default value for the set will "
+"be used for the users currently being edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:105
+msgid ""
+"This can computed from the answer sub scores above using the weights shown "
+"if they are modified.  Alternatively, enter the point score you want saved "
+"here (the above sub scores will be ignored)."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2005
+msgid ""
+"This configures if the single problem manual grader has inputs to enter "
+"problem scores as a percent, a point value, or both. Note, the problem score"
+" is always saved as a percent, so when using a point value, the problem "
+"score will be rounded to the nearest whole percent."
+msgstr ""
+
+#. (tag('b', maketext('Guest Login')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:72
 msgid ""
 "This course supports guest logins. Click %1 to log into this course as a "
 "guest."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:851
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:58
+msgid ""
+"This determines if MathQuill answer blanks are enable for the user. This "
+"option is only present if MathQuill is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:63
+msgid ""
+"This determines if the MathView equation editor button will be appended to "
+"text answer blanks. his option is only present if MathView is enabled for "
+"the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:52
+msgid ""
+"This determines whether or not saved past answers are automatically filled "
+"in to the problem form when a student returns to a problem after having left"
+" the problem. This option is only visible if the user has the permission to "
+"show old answers."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:85
+msgid ""
+"This directory is accessible from the web. You can use it to store html "
+"documents or image documents that are used by the course. Do not store "
+"private information in this directory or in any subdirectory thereof. These "
+"documents can be linked to from within problems using the htmlLink macro."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:255
+msgid "This file is a template. You may use \"Save As\" to create a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:20
+msgid ""
+"This form can assign, unassign, and edit user data for a single achievement."
+"  You can assign the achievement to all current users or select which users "
+"to assign the achievement to and click Save.  You can unassign the "
+"achievement by unchecking a student's name (note all data will be deleted)."
+"  To unassign the achievement from all users, first select \"Allow "
+"unassign\" and then click the \"Unassign from All Users\" button. You can "
+"also toggle the earned status with the checkbox in the \"Earned\" column and"
+" edit the achievement counter for counting achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:19
+msgid ""
+"This gives the status and dates of the main set. Indvidual students may have"
+" different settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:51
 msgid "This homework set contains no problems."
 msgstr "Bu soru grubunda soru bulunmamaktadır."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1231
 msgid "This homework set is closed."
 msgstr "Bu soru grubu kapalı."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1986
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1229
 msgid "This homework set is not yet open."
 msgstr "Bu soru grubu henüz açık değil."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:932
-msgid ""
-"This is a blank problem template file and can not be edited directly. Use "
-"the 'NewVersion' action below to create a local copy of the file and add it "
-"to the current problem set."
-msgstr ""
-
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:423
 msgid "This is a new (re-randomized) version of the problem."
 msgstr ""
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:580
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:109
 msgid ""
 "This is a timed test. You will have %quant(%1,hour) and %quant(%2,minute) to"
 " complete the test."
 msgstr ""
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:592
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:119
 msgid ""
 "This is a timed test. You will have "
 "%quant(%1,hour,hours,)%quant(%2,minute,minutes,) to complete the test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:284
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:81
 msgid ""
-"This is the Achievement Editor.  It is used to edit the achievements "
-"available to students.  Please keep in mind the following facts: Achievments"
-" are displayed, and evaluated, in the order they are listed. The \"secret\" "
-"category creates achievements which are not visible to students until they "
-"are earned.  The \"level\" category is used for the achievements associated "
-"to a users level."
+"This is done by first entering the user as a student and then changing the "
+"permission level of the user. First edit the user by clicking on the pencil "
+"next to their name (or using the technique above for several users), then "
+"change their permssion level -- an entry blank at the far right of the "
+"screen, you may have to scroll to see it. The permission levels are"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:481
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:156
 msgid ""
-"This is the classlist editor page, where you can view and edit the records "
-"of all the students currently enrolled in this course.  The top of the page "
-"contains forms which allow you to filter which students to view, sort your "
-"students in a chosen order, edit student records, give new passwords to "
-"students, import/export student records from/to external files, or "
-"add/delete students.  To use, please select the action you would like to "
-"perform, enter in the relevant information in the fields below, and hit the "
-"\"Take Action!\" button at the bottom of the form.  The bottom of the page "
-"contains a table containing the student usernames and their information. "
-"Clicking on the links in the column headers of the table will sort the table"
-" by the field it corresponds to. The Login Name fields contain checkboxes "
-"for selecting the user.  Clicking the link of the name itself will allow you"
-" to act as the selected user.  There is also an edit link following the name"
-" which will take you to a page where you can edit the selected user's "
-"information.  Clicking the emails will allow you to email the corresponding "
-"user.  Clicking the links in the entries in the assigned sets columns will "
-"take you to a page where you can view and reassign the sets for the selected"
-" user. "
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page if you wish to assign a homework set to all students or a large group "
+"of students (e.g. a section)."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1810
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:161
 msgid ""
-"This is the default number of attempts before show me another becomes "
-"available to students.  It can be set to -1 to disable show me another by "
-"default."
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:171
+msgid ""
+"This is done from the \"Hmwk Sets Editor\" page or the \"Instructor tools\" "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:71
+msgid ""
+"This is most easily done by importing a class list. The class list can be "
+"uploaded from your workstation to the server using the File Manager page. "
+"The class list must be a file ending in .lst and must have a specific <a "
+"href=\"http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files\">format</a>."
+" Once the file has been uploaded to the server the file will appear in the "
+"import action pop-up list (5th action). demoCourse.lst is available for most"
+" courses and adds the \"practice users\" which activate guest logins to the "
+"class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:23
+msgid ""
+"This is the administration course which is used to manage courses on this "
+"server.  Use the \"Admin Menu\" to select the desired action."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1996
+msgid ""
+"This is the default number of attempts a student must make before hints will"
+" be shown to the student. Set this to -1 to hide hints.  Note that this can "
+"be overridden with a per problem setting."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:456
+#: /opt/webwork/webwork2/conf/defaults.config:1712
 msgid ""
-"This is the homework sets editor page where you can view and edit the "
-"homework sets that exist in this course and the problems that they contain. "
-"The top of the page contains forms which allow you to filter which sets to "
-"display in the table, sort the sets in a chosen order, edit homework sets, "
-"publish homework sets, import/export sets from/to an external file, score "
-"sets, or create/delete sets.  To use, please select the action you would "
-"like to perform, enter in the relevant information in the fields below, and "
-"hit the \"Take Action!\" button at the bottom of the form.  The bottom of "
-"the page contains a table displaying the sets and several pieces of relevant"
-" information. The Edit Set Data field in the table contains checkboxes for "
-"selection and a link to the set data editing page.  The cells in the Edit "
-"Problems fields contain links which take you to a page where you can edit "
-"the containing problems, and the cells in the edit assigned users field "
-"contains links which take you to a page where you can edit what students the"
-" set is assigned to."
+"This is the default number of attempts before show me another becomes "
+"available to students.  It can be set to -1 to disable show me another by "
+"default."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1699
+#: /opt/webwork/webwork2/conf/defaults.config:1601
 msgid ""
 "This is the number of achievement points given to each user for completing a"
 " problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:166
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:150
 msgid ""
 "This is the only part of the score that is actually saved. This is computed "
 "from the answer sub scores above using the weights shown if they are "
@@ -7002,142 +9461,314 @@ msgid ""
 " scores will be ignored)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:388
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:19
+msgid "This is the standard entry point for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:92
 msgid ""
-"This is the past answer viewer.  Students can only see their answers, and "
-"they will not be able to see which parts are correct.  Instructors can view "
-"any users answers using the form below and the answers will be colored "
-"according to correctness."
+"This is where email messages and templates are saved. You can upload or "
+"download files in this directory if you wish to save the files for later."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2462
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:77
+msgid ""
+"This is where you edit the text of the problem template. Type Ctrl-Enter "
+"while this window has focus to re-render the problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:669
 msgid ""
 "This is your last submission.  If you say yes, then your answers will be "
 "final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2466
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:673
 msgid ""
 "This is your only submission.  If you say yes, then your answers will be "
 "final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3038
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:42
+msgid ""
+"This link gives details for many macros. It links to documentation embedded "
+"in the macro files themselves."
+msgstr ""
+
+#. ('PGMLLab/PGML-lab.pg')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:63
+msgid ""
+"This links to a WeBWorK \"problem\" which allows you to try out fragments of"
+" PGML code. This link will not be available if the file %1 is not located in"
+" the templates directory of the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:33
+msgid "This links to a list of problem authoring techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:39
+msgid "This links to a page describing Math Object usage."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:72
+msgid "This links to problem authoring information on the WeBWorK wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:46
+msgid ""
+"This may be Mathjax, images, or plainText. Only the options that are enabled"
+" for the course will be available to select. This option is only visible if "
+"there is more than one display mode enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:42
+msgid "This option shows all pg problems in the course directory structure."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:47
+msgid ""
+"This option shows all problems in set definition files that are located in "
+"the course directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:44
+msgid ""
+"This option shows all problems in sets that have been created in the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:20
+msgid ""
+"This page allows one to edit the contents of PG problem files as well as set"
+" headers and other files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:20
+msgid ""
+"This page allows users to change their password, email address, and display "
+"settings used in problems. Note that you can hide this page entirely for "
+"students by setting permission levels to login_proctor or higher for the "
+"permissions to change password, change e-mail address, and change display "
+"settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:20
+msgid ""
+"This page allows you to configure course settings such as permission levels,"
+" display modes allowed, default display mode, email feedback behavior, and "
+"much more."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:20
+msgid ""
+"This page displays a student's current achievement level and progress toward"
+" the next level, and lists the rewards and badges that the student has "
+"earned. If rewards have been earned, then the student may also redeem those "
+"rewards."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:26
+msgid ""
+"This page gives access to information about the student, independent of the "
+"homework sets assigned to them."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:20
+msgid ""
+"This page gives information about mass LTI grade updates, and allows you to "
+"trigger a grade update for all users and all sets, all sets for one user, "
+"all users for one set, or one user for one set.  When a user is selected, "
+"the sets drop down menu is updated to only allow selecting sets assigned the"
+" selected user.  Similarly when a set is selected, the user menu is updated "
+"to only allow selecting valid users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:20
+msgid ""
+"This page is a collection of tools to modify users and sets.  These tools "
+"are short cuts for common actions that allow selecting multiple users or "
+"sets to act on at once.  Because multiple users and sets can be acted on at "
+"the same time, it is often more efficient to use this page when modifying "
+"multiple items.  For example, after selecting several users and a set you "
+"can change the close date for all selected users for that set.  This page "
+"also gives access to \"View/Edit all sets for one user\", which can be used "
+"to access settings for all sets including test versions for that user."
+msgstr ""
+
+#. (q(table to save any changes.  Each student's name links to that student's
+#. problem and opens up the)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:20
+msgid ""
+"This page is for manually grading a problem for all assigned students.  The "
+"table of students shows their last answers, percent score, and feedback "
+"comment.  The \"Save\" button is located below the "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:20
+msgid ""
+"This page is used to browse problems that will be used to fill problem sets."
+" The first step is to choose which set you are working on. If you need to "
+"create a new problem set fill in the blank next to the \"Create a New Set in"
+" This Course\" button and then press the button. Then choose which set you "
+"want to work on in the drop down menu."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:20
+msgid ""
+"This page is useful for monitoring student progress on assignments. Student "
+"progress can either be viewed for a single set or for a single student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:20
+msgid ""
+"This page manages all of the homework sets (including quizzes/tests). The "
+"following allow editing directly of a single problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:20
+msgid ""
+"This page shows the student's current grades for all sets they are assigned "
+"to.  Only visible sets are shown to the student, while invisible set names "
+"are italic when viewed as an instructor.  Students can only see the per "
+"problem grades on open assignments."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3169
 msgid "This problem contains a video which must be viewed online."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:602
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:631
 msgid "This problem has more than one part."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2059
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2293
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1323
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1576
 msgid ""
 "This problem has open subproblems.  You can visit them by using the links to"
 " the left or visiting the set page."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem.html.ep:66
+msgid "This problem is not valid."
+msgstr ""
+
 #. ($prettyID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2619
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:399
 msgid "This problem uses the same source file as number %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:418
 msgid "This problem will not count towards your grade."
 msgstr "Bu soru, notunuzu etkilemeyecektir."
 
-#. ($EMAIL)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1109
+#. ($ur->email_address)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:1
 msgid "This sample mail would be sent to %1"
 msgstr ""
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2088
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1399
 msgid ""
 "This score for this problem does not count for the score of problem %1 or "
 "for the set."
 msgstr ""
 
-#. ($message_file,		$merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:167
+#. ($message_file,				$merge_file)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:127
 msgid ""
 "This scoring message is generated from [TMPL]/email/%1. It is merged with "
 "the file [Scoring]/%2. These files can be edited using the \"Email\" link "
 "and the \"File Manager\" link in the left margin."
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2215
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:155
 msgid "This set %1 is assigned to %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2932
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:678
 msgid "This set doesn't contain any problems yet."
 msgstr ""
 
-#. ($beginReducedScoringPeriod, $dueDate, $reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:334
+#. ($c->formatDateTime($reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:44
 msgid ""
 "This set had a reduced scoring period that started on %1 and ended on %2.  "
 "During that period all work counted for %3% of its value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:78
 msgid ""
 "This set has a set-level proctor password to authorize logins. Enter the "
 "password below."
 msgstr ""
 
-#. (CGI::span({class=>$visiblityStateClass}, $visiblityStateText)
-# Context is "This set is visible" or "This set is hidden"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:532
-msgid "This set is %1"
-msgstr "Bu set %1"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:411
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:59
 msgid "This set is hidden from students."
 msgstr ""
 
 #. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:330
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:40
 msgid ""
 "This set is in its reduced scoring period.  All work counts for %1% of its "
 "value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:65
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:51
+msgid "This set is not assigned to any students."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:57
 msgid "This set is visible to students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:190
-msgid "This set needs to be assigned to you before you can grade it."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:42
+msgid "This set or problem is not valid."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:158
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:164
 msgid ""
 "This set will be unavailable to students until they have earned a certain "
-"score on the sets specified in this field.  The sets should be written as a "
-"comma separated list.  The minimum score required on the sets is specified "
-"in the following field."
+"score on the sets specified in this field. The sets should be written as a "
+"comma separated list. The minimum score required on the sets is specified in"
+" the following field."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:111
+msgid ""
+"This should be done cautiously. Once a student is deleted from a course "
+"their data is lost forever and cannot be recovered. They can be added to the"
+" course as a new student, but all of their homework set assignments and "
+"homework has been permanently deleted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2007
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1962
 msgid "This source file does not exist!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1961
 msgid "This source file is a directory!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1963
 msgid "This source file is not a plain file!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2005
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1960
 msgid "This source file is not readable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:358
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+msgid ""
+"This specifies the number of attempts before hints are shown to students. "
+"The value of -2 uses the default from course configuration. The value of -1 "
+"disables hints. Note that this will only have an effect if the problem has a"
+" hint."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
 msgid ""
 "This specifies the rerandomization period: the number of attempts before a "
 "new version of the problem is generated by changing the Seed value. The "
@@ -7145,134 +9776,175 @@ msgid ""
 "disables rerandomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:651
-msgid ""
-"This table lists the current attempts for this test/quiz, along with its "
-"status, score, start date, and close date. Click on the version link to "
-"access that version. "
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:626
-msgid "This test is closed."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:548
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:81
 msgid "This test requires a proctor password to continue."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:600
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:126
 msgid "This test requires a proctor password to start."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2248
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2323
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:45
+msgid "This will determine if the output is in one or two columns."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:21
 msgid "Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:249
 msgid "Time Interval for New Test Versions (min; 0=infty)"
 msgstr ""
 
-#. ($elapsedTime,$allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:159
+msgid "Time Remaining"
+msgstr ""
+
+#. ($c->{elapsedTime}, sprintf('%.0f', 10 * ($c->{set}->due_date -
+#. $c->{set}->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:336
 msgid "Time taken on test: %1 min (%2 min allowed)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
 msgid "Timestamp"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1610
+#: /opt/webwork/webwork2/conf/defaults.config:1512
 msgid "Timezone for the course"
 msgstr ""
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:512
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:330
 msgid "To access this set you must score at least %1% on set %2."
 msgstr ""
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:514
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:336
 msgid ""
 "To access this set you must score at least %1% on the following sets: %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:53
 msgid ""
 "To add an additional instructor to the new course, specify user information "
 "below. The user ID may contain only numbers, letters, hyphens, periods "
 "(dots), commas,and underscores."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:42
 msgid ""
 "To add the WeBWorK administrators to the new course (as administrators) "
 "check the box below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:239
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:118
+msgid ""
+"To assign one or more sets to an individual student click in the column "
+"\"Assigned Sets\" in the student's row. This will take you to a page where "
+"you can assign and unassign homework sets and change the due dates for "
+"homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:79
 msgid ""
 "To change status (scores or grades) for this student for one set, click on "
 "the individual set link."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:621
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:106
+msgid ""
+"To copy the templates and html folders from an existing course, select the "
+"course below."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:102
 msgid ""
-"To copy problem templates from an existing course, select the course below."
+"To drop a student or students, select them for editing as described above "
+"and then set the pop-up list to enrolled,drop, or audit. Dropped students "
+"cannot log in to the course, are not assigned new homework sets and are not "
+"sent e-mail. They can be re-enrolled simply by changing their status back to"
+" enrolled. No data is lost, any homework sets assigned before they were "
+"dropped are restored unchanged."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2200
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:143
 msgid ""
 "To edit a specific student version of this set, edit (all of) her/his "
 "assigned sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:376
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:29
 msgid ""
-"To edit this text you must first make a copy of this file using the "
-"'NewVersion' action below."
+"To perform an action select the desired action tab and click the submit "
+"button."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:381
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:90
+msgid "To this Problem"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:69
 msgid ""
-"To edit this text you must use the 'NewVersion' action below to save it to "
-"another file."
+"To use the Email merge feature, upload a CSV with calculated grades to the "
+"scoring directory using the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1343
-msgid "To this Problem"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:767
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:58
+msgid "Today"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:33
+msgid "Toggle each of the options to include or not include in the output."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:522
+msgid "Top Score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:118
+msgid "Top level of author information on the wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:114
+msgid "Total Points"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:18
 msgid "Total Points:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:90
 msgid "Totals"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:290
 msgid "Totals only (not problem scores)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:291
 msgid "Totals only, only after answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:236
 msgid "Transfer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:284
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:22
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:35
 msgid "True"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1279
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:245
 msgid "Try it"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:26
 msgid "Tunic of Extension"
 msgstr ""
 
@@ -7280,209 +9952,340 @@ msgstr ""
 msgid "Two Columns"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1470
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:30
 msgid "Type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2325
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:84
+msgid "Type:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:23
 msgid "URI"
 msgstr ""
 
 #. ($achievementName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:297
 msgid "Unable to change the evaluator for set %1. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:819
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1084
+msgid "Unable to change the hardcopy header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1070
+msgid "Unable to change the set header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{fullSetID}, $c->{prettyProblemNumber})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1110
+msgid ""
+"Unable to change the source file path for set %1, problem %2. Unknown error."
+msgstr ""
+
+#. ($c->shortPath($delFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1246
+msgid "Unable to delete backup file \"%1\"."
+msgstr ""
+
+#. ($formatBackupTime)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:571
+msgid "Unable to delete backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:888
+msgid "Unable to make \"%1\" the hardcopy header for %2."
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:860
+msgid "Unable to make \"%1\" the set header for %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:693
 msgid "Unable to obtain error messages from within the PG question."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:384
-msgid "Unable to write to '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:275
+msgid "Unable to open a temporary file at the given location."
+msgstr ""
+
+#. ($c->shortPath($backupFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1233
+msgid "Unable to read backup file \"%1\"."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:636
+msgid "Unable to write to \"%1\": %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2613
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:15
 msgid "Unarchive"
 msgstr ""
 
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2596
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:4
 msgid "Unarchive %1 to course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2581
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:40
 msgid "Unarchive Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2675
-msgid "Unarchive Next Course"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:17
+msgid "Unarchive Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:214
-msgid "Unassign All Sets"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:25
+msgid "Unarchive Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:281
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1306
+msgid "Unarchive Next Course"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:97
 msgid "Unassign from All Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:61
 msgid "Unassign selected sets from selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:58
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:57
 msgid ""
-"Unassignments were not done.  You need to both click to \"Allow unassign\" "
-"and click on the Unassign button."
+"Unassignments were not done.  You need to select \"Allow unassign\" and then"
+" click on the Unassign button."
 msgstr ""
 
 #. ($unattempted, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1047
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:44
 msgid "Unattempted: %1/%2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:53
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:37
 msgid "Unclassified Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:242
 msgid "Ungraded"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3723
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3765
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:58
 msgid "Unhide Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1465
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1151
+msgid "Unkown saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:28
 msgid ""
-"Unlock an additional version of a Gateway Test.  If used before the close "
-"date of the Gateway Test this will allow you to generate a new version of "
-"the test."
+"Unlock an additional version of a test.  If used before the close date of "
+"the test this will allow you to generate a new version of the test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:164
-msgid "Unpack"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:47
+msgid "Unpack Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:113
 msgid "Unpack archives automatically"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2709
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:15
 msgid "Unselect all courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:130
-msgid "Update"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:63
+msgid "Update Display"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:671
-msgid "Update Display"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:84
+msgid "Update Grades"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:930
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:27
+msgid "Update Interval"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:102
 msgid "Update Menus"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:729
-msgid "Update settings and refresh page"
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:51
+msgid "Update aborted. Invalid set %1."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:47
+msgid "Update aborted. Invalid user %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2695
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:67
+msgid "Update set:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:8
 msgid "Update the checked directories?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3544
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:50
+msgid "Update user:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1908
 msgid "Updated location description."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2739
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2917
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:40
 msgid "Upgrade"
 msgstr ""
 
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
 msgid "Upgrade %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1327
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2278
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:97
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:79
 msgid "Upgrade Course Tables"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2693
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2761
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:382
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:42
 msgid "Upgrade Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3010
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:17
+msgid "Upgrade Courses Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:43
+msgid "Upgrade courses from a previous version of WeBWorK."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1582
 msgid "Upgrade process completed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:388
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:65
 msgid "Upload"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2441
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:72
+msgid ""
+"Upload, download and delete text files, including scoring spread sheets, set"
+" definition files, class list spread sheets, and \"PG\" problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:292
 msgid "Use Default Header File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:325
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:127
 msgid "Use Equation Editor?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:204
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:20
 msgid "Use Reward"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2720
-msgid "Use System Default"
-msgstr "Varsayılan Ayarları Kullan"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:516
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:27
 msgid "Use browser back button to return from preview mode."
 msgstr ""
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:506
+#. (tag('b', $c->{achievementID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:16
 msgid "Use in achievement %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:526
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:23
 msgid "Use in new achievement:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:149
 msgid "Use live equation rendering?"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2028
+#: /opt/webwork/webwork2/conf/defaults.config:1929
 msgid "Use log base 10 instead of base <i>e</i>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2034
+#: /opt/webwork/webwork2/conf/defaults.config:1935
 msgid "Use older answer checkers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:234
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:123
+msgid ""
+"Use the \"Create\" and \"Delete\" actions to create or delete achievements. "
+"Note that deleting an achievement will delete all data associated to the "
+"achievement and cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:35
+msgid ""
+"Use the \"Merge file\" drop down menu to select which merge file to use, or "
+"select \"None\" to not use any merge file.  When a merge file is selected, "
+"the data for active students will be displayed above the \"Email Body\".  "
+"This will show you the structure of the merge file and the column variables "
+"associated with each column.  Data that is longer than 7 characters will be "
+"truncated, and the data can be scrolled up and down to see all rows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:28
+msgid ""
+"Use the \"Users\" and \"Sets\" forms to select which users and sets to act "
+"on.  Multiple items can be selected using ctrl-click or shift-click.  The "
+"action buttons are grouped into three categories.  The first is a set of "
+"actions that act on the selected users, the second is a set of actions that "
+"act on the selected sets, and the third is a set of actions for acting on a "
+"combination of sets and users.  If an invalid number of users or sets are "
+"selected, the action will not be preformed, and an error message will be "
+"placed on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:25
+msgid ""
+"Use the editor to edit the evaluator and the action form at the bottom to "
+"save the evaluator. You can either overwrite the current evaluator file or "
+"save as a new evaluator file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:15
 msgid ""
 "Use the interface below to quickly access commonly-used instructor tools, or"
 " select a tool from the list to the left."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:332
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:26
+msgid ""
+"Use the options in the second box to pick a collection of problems decribed "
+"below. In each case, clicking \"View Problems\" will render a fixed number "
+"of problems (default of 20). After problems are shown, there will be options"
+" to show the next/previous batch of problems, add all problems to the target"
+" set (set at the top of the page) or clear the curent batch of problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:27
 msgid ""
 "Use this form to ask your instructor a question, to report a problem with "
 "the WeBWorK system, or to report an error in a problem you are attempting. "
@@ -7490,73 +10293,103 @@ msgid ""
 "system will be included."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:29
+msgid "Use this page to change your password."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:20
+msgid ""
+"Use this page to send emails to active (enrolled or auditing) students.  "
+"Emails can be sent to all active students or selected students.  Use the "
+"\"Students\" form to sort, filter, or format how the user name is displayed."
+"  Click \"Change Display Settings\" to apply any changes.  Use control-click"
+" or shift-click to select multiple students to email."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:67
+msgid ""
+"Used for \"counting\" achievements, which sets the value a counter must "
+"reach in order to earn the achievement. For example this is used counting "
+"the number of completed problems."
+msgstr ""
+
+#. (param('user')
+#. (param('effectiveUser')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:7
+msgid "User \"%1\" not found."
+msgstr ""
+
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:324
 msgid ""
-"User '%1' will not be copied from admin course as it is the initial "
+"User \"%1\" will not be copied from admin course as it is the initial "
 "instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:557
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
-msgid "User ID"
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:34
+msgid "User %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:298
-msgid "User Settings"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:217
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:64
+msgid "User ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:490
-msgid "User Value"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:230
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:28
+msgid "User Settings"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:52
-msgid "User has been assigned to all current sets."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:17
+msgid "User Settings Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:58
-msgid "User has been unassigned from all sets."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:576
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:13
+msgid "User overrides"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:247
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:62
 msgid "User's name is:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:68
-msgid "User's sets have been reassigned."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:60
 msgid "User's username is:"
 msgstr ""
 
 #. ($user, $setID, $j)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1077
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
 msgid ""
 "UserProblem missing for user=%1 set=%2 problem=%3. This may indicate "
 "database corruption."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:51
 msgid "Username"
 msgstr "Kullanici adi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:499
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:126
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:272
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:9
 msgid "Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:339
 msgid "Users Assigned to Set %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2077
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:17
+msgid "Users Assigned to Set Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:65
 msgid "Users List"
 msgstr "Kullanıcı Listesi"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1925
+#: /opt/webwork/webwork2/conf/defaults.config:1827
 msgid ""
 "Users at this level and higher are allowed to change display settings used "
 "in pg problems.Note that if it is expected that there will be students that "
@@ -7565,31 +10398,31 @@ msgid ""
 "those students may need to disable MathQuill."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1915
+#: /opt/webwork/webwork2/conf/defaults.config:1817
 msgid ""
 "Users at this level and higher are allowed to change their e-mail address. "
 "Normally guest users are not allowed to change the e-mail address since it "
 "does not make sense to send e-mail to anonymous accounts."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1879
+#: /opt/webwork/webwork2/conf/defaults.config:1781
 msgid ""
 "Users at this level and higher are allowed to change their password. "
 "Normally guest users are not allowed to change their password."
 msgstr ""
 
-#. ($names{$primary}, $names{$secondary}, $names{$ternary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:924
+#. ($c->maketext(FIELD_PROPERTIES()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:316
 msgid "Users sorted by %1, then by %2, then by %3"
 msgstr "Kullanıcılar sırasıyla %1, %2 ve %3 kriterlerine göre sıları"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1906
+#: /opt/webwork/webwork2/conf/defaults.config:1808
 msgid ""
 "Users with at least this permission level get a link in the left panel for "
 "reporting bugs to the bug tracking system at bugs.webwork.maa.org."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2140
+#: /opt/webwork/webwork2/conf/defaults.config:2051
 msgid ""
 "Users with this permssion level or greater will automatically be sent "
 "feedback from students (generated when they use the \"Contact instructor\" "
@@ -7598,157 +10431,225 @@ msgid ""
 "permission level to \"nobody\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1348
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:193
 msgid "Uses Math Objects"
 msgstr ""
 
-#. ($default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:197
-msgid "Using contents of the default message %1 instead."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1239
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:18
 msgid "Using what display mode?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:6
 msgid "Using what seed?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:19
+msgid "Using which hardcopy format?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:49
+msgid "Using which hardcopy theme?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:31
+msgid ""
+"Usually means students must demonstrate understanding of facts. This is more"
+" than regurgitating the fact. We use this category for simple and direct "
+"applications of algorithms the student has studied. There should be no "
+"judgement involved in choosing the method. This would include a simple "
+"application of a rule for differentiation (e.g., can combine rules for sums "
+"and constant multiples with one more advanced rule) or for integrals."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Value"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1747
+#: /opt/webwork/webwork2/conf/defaults.config:1649
 msgid "Value of work done in Reduced Scoring Period"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:687
-msgid "Variable Documentation:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config/config_help.html.ep:20
+msgid "Variable Documentation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:115
+msgid "Version"
 msgstr ""
 
 #. ($ver->{version})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:679
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:173
 msgid "Version %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:159
 msgid "Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:43
 msgid "Versions of a set can only be edited for one user at a time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:128
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2419
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2756
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:528
 msgid "View"
 msgstr "Göster"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1000
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:488
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:523
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:681
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:948
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:6
 msgid "View Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:276
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:57
+msgid "View details of student perofrmance either by individual or by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:86
 msgid "View equations as"
 msgstr "Eşitlikler ne şekilde gösterilecek"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:283
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:18
 msgid "View statistics by set"
 msgstr "Setlere göre istatistikleri göster"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:19
 msgid "View statistics by student"
 msgstr "İstatistikleri öğrencilere göre göster"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:55
+msgid ""
+"View statistics of students' performance on homework either by individual or"
+" by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:14
 msgid "View student progress by set"
 msgstr "Setlere göre öğrenci gelişimini göster"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:303
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:15
 msgid "View student progress by student"
 msgstr "tr: View student progress by student"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:65
 msgid "View/Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:224
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:90
-msgid "Viewing temporary file:"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:104
+msgid "View/Reload"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:766
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:790
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:31
+msgid "View/access current and archived courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:146
+msgid "Viewing Problems in a New Window"
+msgstr ""
+
+#. ($c->{problem}->source_file)
+#. ($screenSetHeader)
+#. ($course_info_path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:81
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:109
+msgid "Viewing temporary file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:25
 msgid "Visibility"
 msgstr "Görünürlük"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:915
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:7
 msgid "Visible"
 msgstr "Görünür"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:622
 msgid "Visible sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
 msgid "Visible to Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2269
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:844
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "Warning"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2319
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:13
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:117
 msgid "Warning messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1039
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:259
+msgid "Warning messages:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all set-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1035
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all user-related data and is not undoable!"
 msgstr "Dikkat: Silme işlemi kullanıcının bütün bilgilerini yok eder ve bu işlem geri döndürelemez!"
 
-#. ($problem_desc , CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1397
+#. ($problem_desc,				$c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1194
 msgid "Warnings encountered while processing %1. Error text: %2"
 msgstr ""
 
-#. ($copyright_years, $theme, $ww_version, $pg_version)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1261
-msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4 |"
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:39
+msgid ""
+"We use this for carrying out more complicated algorithms, such as "
+"derivatives using both the product and chain rule or integrals which involve"
+" say both a substitution and parts."
+msgstr ""
+
+#. ($ce->{WW_COPYRIGHT_YEARS} || '1996-2023',              $ce->{defaultTheme}
+#. || 'unknown -- set defaultTheme in localOverides.conf',
+#. $ce->{WW_VERSION}         || 'unknown -- set WW_VERSION in VERSION',
+#. $ce->{PG_VERSION}         || 'unknown -- set PG_VERSION in ../pg/VERSION')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:9
+msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2227
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:3
 msgid "WeBWorK Error"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:3
 msgid "WeBWorK Warnings"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1549
+#: /opt/webwork/webwork2/conf/defaults.config:1451
 msgid ""
 "WeBWorK currently has translations for the languages listed in the course "
 "configuration."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:20
+msgid ""
+"WeBWorK does not have a full featured scoring ability. We leave that to your"
+" favorite spreadsheet application."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:38
+msgid ""
+"WeBWorK expects many files to be in certain locations.  The following "
+"describe this. Note that by default the File Manager shows the \"templates\""
+" directory.  Other directories mentioned below are at the same level and "
+"need to be accessed by going up a directory by clicking the \"^\" button "
+"above the file list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:6
 msgid ""
 "WeBWorK has encountered a software error while attempting to process this "
 "problem. It is likely that there is an error in the problem itself. If you "
@@ -7757,7 +10658,7 @@ msgid ""
 " more information."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:6
 msgid ""
 "WeBWorK has encountered warnings while processing your request. If this "
 "occured when viewing a problem, it was likely caused by an error or "
@@ -7767,19 +10668,19 @@ msgid ""
 " warning output below for more information."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:577
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:558
 msgid ""
 "WeBWorK was unable to generate a different version of this problem.  Close "
 "this tab, and return to the original problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:367
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:29
 msgid ""
 "WeBWorK was unable to generate a paper copy of this homework set.  Please "
 "inform your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:78
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
 msgid ""
 "WeBWorK will automatically create users when logging in via the LMS for the "
 "first time. If this flag is enabled then it will also keep the user account "
@@ -7789,36 +10690,44 @@ msgid ""
 "next time the user logs in."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:370
 msgid "Weight"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:6
 msgid "Welcome to WeBWorK!"
 msgstr "WeBWorK sitemize hoşgeldiniz!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:24
+msgid ""
+"What WeBWorK does have is good support for summarizing the scores on WeBWorK"
+" homework sets and tests and exporting them in a form (.csv) which any "
+"spreadsheet can use. WeBWorK reports all of the homework grades with options"
+" shown below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:27
 msgid "What could be inside?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:715
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:17
 msgid "What field should filtered users match on?"
 msgstr "Seçili kullanıcılar hangi kriterlerde eşleşmeli?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
 msgid ""
 "When a student has more attempts than is specified here they will be able to"
 " view another version of this problem.  If set to -1 the feature is disabled"
 " and if set to -2 the course default is used."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1899
+#: /opt/webwork/webwork2/conf/defaults.config:1801
 msgid ""
 "When acting as a student, this permission level and higher can submit "
 "answers for that student."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2071
+#: /opt/webwork/webwork2/conf/defaults.config:1972
 msgid ""
 "When numerical answers are checked, most test if the student's answer is "
 "close enough to the programmed answer be computing the error as a percentage"
@@ -7827,7 +10736,7 @@ msgid ""
 "0.1 means 0.1 percent error is allowed.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2098
+#: /opt/webwork/webwork2/conf/defaults.config:2019
 msgid ""
 "When students click the <em>Email Instructor</em> button to send feedback, "
 "WeBWorK fills in the subject line.  Here you can set the subject line.  In "
@@ -7837,14 +10746,32 @@ msgid ""
 "recitation</li><li>%% = literal percent sign</li></ul>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1638
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:35
+msgid ""
+"When the class is very large not all students will be displayed. Using the "
+"first action on this page you can show only the students from a given "
+"recitation or from a given section, or only students whose login or last "
+"name fits a pattern match. The second action will sort the students "
+"currently being displayed. You can also sort the displayed students by "
+"clicking on the active links at the top of each column."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:56
+msgid ""
+"When the message is ready to send, click \"Send Email\". This will queue the"
+" email to be sent, which can take several minutes depending on the number of"
+" students selected.  You will be notified by email once all the emails have "
+"been sent."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1540
 msgid ""
 "When this is on students will see a line on the Grades page which has their "
 "total cumulative homework score.  This score includes all sets assigned to "
 "the student."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:90
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
 msgid ""
 "When this is true, then when a user enters WeBWorK from an external tool "
 "link in the LMS, the bottom of the screen will display the data that the LMS"
@@ -7852,23 +10779,56 @@ msgid ""
 "different LMS systems have different parameters."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1957
+#: /opt/webwork/webwork2/conf/defaults.config:1859
 msgid ""
 "When viewing a problem, WeBWorK usually puts the previously submitted answer"
 " in the answer blank.  Below this level, old answers are never shown.  "
 "Typically, that is the desired behaviour for guest accounts."
 msgstr ""
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:30
+msgid ""
+"When viewing progress for a single student, their grades page is shown which"
+" lists set totals and per problem grades for each set assigned to the "
+"student.  This shows the same information as the statistics page for the "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:26
+msgid ""
+"When viewing set statistics, the drop down menus can be used to show stats "
+"for individual sections, recitations, or problems.  The overall results "
+"include all students who are assigned to the set, while the individual "
+"problem results only include active (have attempted the problem) students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:24
+msgid ""
+"When viewing student progress for a set, the score for the set and the "
+"status for problems in the set are listed for all students.  The table can "
+"be sorted by clicking the links in the table header.  Click the student's "
+"name to access the student's set.  When viewing progress for a test, "
+"additional columns can be shown/hidden by updating the display at the top"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:74
+msgid ""
+"When you unassign a set from students, you destroy all of the data for the "
+"set for those students. If the set is re-assigned to these students, then "
+"they will receive new versions of problems in the set.  Make sure this is "
+"what you want to do before unassigning sets from students."
+msgstr ""
+
+#. (tag('b', $achievementID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:21
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for achievement %1 for this student. Make sure this is what you want to"
 " do."
 msgstr ""
 
-#. (CGI::b({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:146
+#. (tag('b', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:26
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for homework set %1 for this student. You will then need to reassign "
@@ -7876,7 +10836,7 @@ msgid ""
 "problems. Make sure this is what you want to do before unchecking students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:72
 msgid ""
 "When you uncheck a homework set (and save the changes), you destroy all of "
 "the data for that set for this student.   If you reassign the set, the "
@@ -7884,243 +10844,461 @@ msgid ""
 "you want to do before unchecking sets."
 msgstr ""
 
-#. ($self->formatDateTime($set->open_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:343
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:87
+msgid "Wiki summary page for MathObjects"
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:444
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:167
 msgid "Will open on %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:49
+msgid "Word problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:15
 msgid "Worth"
 msgstr "Değeri"
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:382
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:51
+msgid "Write a new PG problem file or edit an existing one."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:188
+msgid ""
+"Write permissions have not been enabled for \"%1\".  Changes must be saved "
+"to another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:630
+msgid ""
+"Write permissions have not been enabled for \"%1\". Changes must be saved to"
+" another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:182
 msgid ""
-"Write permissions have not been enabled for '%1'.  Changes must be saved to "
-"another file for viewing."
+"Write permissions have not been enabled in \"%1\".  Changes must be saved to"
+" a different directory for viewing."
 msgstr ""
 
-#. ($self->shortPath($currentDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:380
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:624
 msgid ""
-"Write permissions have not been enabled in '%1'.  Changes must be saved to a"
+"Write permissions have not been enabled in \"%1\".Changes must be saved to a"
 " different directory for viewing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:178
 msgid ""
 "Write permissions have not been enabled in the templates directory.  No "
 "changes can be made."
 msgstr "Şablon klasörü yazmaya kapalı. Değişiklik yapılamaz."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:380
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:620
+msgid ""
+"Write permissions have not been enabled in the templates directory. No "
+"changes can be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:287
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:330
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:509
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:82
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:657
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:67
 msgid "Yes"
 msgstr "Evet"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:500
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:454
 msgid ""
 "You are currently checking answers to a different version of your problem - "
 "these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:511
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:470
 msgid ""
 "You are currently previewing answers to a different version of your problem "
 "- these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr ""
 
-#. ($userSet->set_id, $r->connection->remote_ip)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:270
+#. ($ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:18
+msgid ""
+"You are in the Reduced Scoring Period.  All work counts for %1% of the "
+"original."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:183
+msgid "You are not allowed to act as a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:188
+msgid "You are not allowed to assign homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:383
+msgid "You are not allowed to delete %1."
+msgstr ""
+
+#. ($userSet->set_id, $c->tx->remote_address)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:261
 msgid ""
 "You are not allowed to generate a hardcopy for %1 from your IP address, %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2049
-msgid "You are not authorized to access the Instructor tools."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:185
+msgid "You are not allowed to modify homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:191
+msgid "You are not allowed to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:4
+msgid "You are not allowed to send e-mail."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:2
+msgid "You are not authorized to access instructor tools"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:4
+msgid "You are not authorized to access instructor tools."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:9
+msgid "You are not authorized to assign homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:10
+msgid "You are not authorized to create or delete courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:2
+msgid "You are not authorized to edit achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:28
+msgid "You are not authorized to edit user specific information."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:37
+msgid "You are not authorized to grade homework sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:271
-msgid "You are not authorized to access the instructor tools."
-msgstr "Eğitmen araçlarına erişim yetkiniz yok."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:8
+msgid "You are not authorized to manage course files"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:392
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:33
 msgid "You are not authorized to modify homework sets."
 msgstr "Ödev setlerini değiştirme yetkiniz yok."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:35
 msgid "You are not authorized to modify problems."
 msgstr "Sorularda değişklik yapma yetkiniz yok."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:396
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:39
 msgid "You are not authorized to modify set definition files."
 msgstr "Set tanım dosyalarını değiştirme yetkiniz yok."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:15
 msgid "You are not authorized to modify student data"
 msgstr "Öğrenci bilgilerini değiştirme yetkisine sahip değilsiniz."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:11
+msgid "You are not authorized to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:3
+msgid "You are not authorized to modify the course configuration."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:230
 msgid "You are not authorized to perform this action."
 msgstr "Bu işlemi gerçekleştirme yetkiniz yok."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:260
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:11
+msgid "You are not authorized to score sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:13
+msgid "You are not authorized to send mail to students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:11
+msgid "You are not authorized to update lti scores"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers.html.ep:8
+msgid "You are not authorized to view past answers"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:251
 msgid ""
 "You are not permitted to generate a hardcopy for a set with hidden work."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:236
 msgid "You are not permitted to generate a hardcopy for an unopened set."
 msgstr ""
 
-#. ($showMeAnother{MaxReps},					$solutionShown)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:559
+#. ($showMeAnother{MaxReps},						$solutionShown)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:532
 msgid ""
 "You are only allowed to click on Show Me Another %quant(%1,time,times) per "
 "problem. %2 Close this tab, and return to the original problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2051
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2070
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:265
 msgid "You are out of time!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:374
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:36
 msgid "You can also examine the following temporary files: "
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGanswermacros.pl:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:108
+msgid ""
+"You can assign selected achievements to all users by using the \"Assign\" "
+"action action and selecting which achievements to assign.  You can select "
+"which users to assign/unassign to an achievement by clicking on the link in "
+"the \"Edit Users\" column."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1039
+msgid ""
+"You can change the file path for this problem manually from the \"Hmwk Sets "
+"Editor\" page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:27
+msgid ""
+"You can check the boxes to the right of the sets and click \"Generate "
+"Hardcopy for Selected Sets\" to generate a PDF hardcopy of the selected "
+"sets. You can generate hardcopies for multiple users including their answers"
+" as well. Note that students will only be able to generate hardcopies of a "
+"single set at a time. Students will only be able to include answers in the "
+"hardcopy after the answer date."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:127
+msgid ""
+"You can delete problems by clicking the \"Delete it?\" check box and saving."
+" If the set is already active it is recommended that you instead use the "
+"\"Mark Correct?\" problem to mark a particular problem correct for all "
+"students."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGanswermacros.pl:1616
 msgid "You can earn partial credit on this problem."
 msgstr "Bu sorudan kısmi puan alabilirsiniz."
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:382
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:142
+msgid ""
+"You can edit a problem by clicking the \"Edit Problem\" icon to the right of"
+" the problem number. This will open the problem in the PG problem editor in "
+"a new tab or window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:92
+msgid ""
+"You can edit a single achievement by clicking on the pencil icon next to the"
+" achievement ID.  You can edit multiple achievements by selecting which "
+"achievements to edit, then click the \"Edit\" button. You can edit all of "
+"the achievements by changing which achievements to edit form \"selected "
+"achievements\" to \"all achievements\", or click the checkbox next to the "
+"Achievement ID to select all achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:44
+msgid ""
+"You can edit the class list data for a single student by clicking on the "
+"pencil icon next to their login name. To edit several students at once click"
+" on the \"Select\" checkbox next to their names, click on the radio button "
+"for editing selected users and then click the \"Edit\" button. You can also "
+"edit all visible users (those students currently being displayed) or even "
+"all users in the course although this last option might take a long time to "
+"load for a large class."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:397
 msgid "You can get a new version of this problem after the due date."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1368
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:101
+msgid ""
+"You can import/export from their respective action tab.  Exporting saves "
+"information about the achievement as a .axp file which is a CSV that lists "
+"each achievements information.  You can import .axp files that have been "
+"previously exported."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:769
 msgid "You can not specify an absolute path"
 msgstr ""
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1121
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:549
 msgid "You can only %1 one file at a time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:92
 msgid "You can only download regular files."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:591
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:197
 msgid "You can only edit text files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:908
-msgid "You can only unpack files ending in '.tgz', '.tar' or '.tar.gz'"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:374
+msgid "You can only unpack files ending in \".tgz\", \".tar\" or \".tar.gz\""
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:134
+msgid ""
+"You can render a problem by clicking the \"Render Problem\" icon to the "
+"right of the problem number. The display mode used to render the problem is "
+"chosen using the drop down menu. You can render all problems using the "
+"\"Render All\" button. \"Hide All\" will hide all rendered problems. It is "
+"also useful to collapse problem details when doing this, as it makes it "
+"easier to drag problems around."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:120
+msgid ""
+"You can reorder problems by clicking on the arrow icon and dragging the "
+"problem. You will see a box showing you where the problem will be placed. "
+"When problems are reordered any holes in the numbering will be filled in."
 msgstr ""
 
 #. ($showMeAnother{MaxReps} >= $showMeAnother{Count}
 #. ? ($showMeAnother{MaxReps} - $showMeAnother{Count})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1895
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:44
 msgid ""
 "You can use this feature %quant(%1,more time,more times,as many times as you"
 " want) on this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:439
 msgid "You can't download directories"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:440
 msgid "You can't download files of that type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:584
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:192
 msgid "You can't edit a directory"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:528
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
 msgid "You can't view files of that type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:985
 msgid "You cannot archive the course you are currently using."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1712
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:850
 msgid "You cannot delete the course you are currently using."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1081
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:378
 msgid "You cannot delete yourself!"
 msgstr "Kendinizi silemezsiniz!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:579
 msgid "You did not specify a new set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:232
 msgid "You didn't enter any message."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:312
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:303
 msgid "You do not have permission to access the requested file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:159
 msgid "You do not have permission to change the hardcopy theme."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:578
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:186
 msgid "You do not have permission to edit this file."
 msgstr ""
 
 #. ($hardcopy_format)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:151
 msgid "You do not have permission to generate hardcopy in %1 format."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1639
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1161
 msgid "You do not have permission to view the details of this error."
 msgstr "Bu hatanın detaylarını görmeye yetkiniz yok."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements.html.ep:13
 msgid "You don't have any Achievement data associated to you!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:237
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:51
 msgid "You don't have any rewards!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2109
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:325
 msgid "You exceeded the allowed time."
 msgstr ""
 
-#. ($numLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2082
+#. ($c->{numAttemptsLeft})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:277
 msgid "You have %1 attempt(s) remaining on this test."
 msgstr ""
 
-#. ($numLeft,						$numLeft - 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2458
+#. ($c->{numAttemptsLeft},								$c->{numAttemptsLeft} - 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:664
 msgid ""
 "You have %1 submissions remaining for this test.  If you say yes, then you "
 "will have %quant(%2,submission) remaining. Once all submissions have been "
@@ -8128,724 +11306,702 @@ msgid ""
 "work this test version."
 msgstr ""
 
-#. ($attemptsLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2012
+#. ($problem->max_attempts - $attempts)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1270
 msgid "You have %negquant(%1,unlimited attempts,attempt,attempts) remaining."
 msgstr "[negquant,_1,Sınırsız deneme hakkı,deneme hakkı,deneme hakkı] kaldı."
 
 #. ($attempts_before_rr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1217
 msgid ""
 "You have %quant(%1,attempt,attempts) left before new version will be "
 "requested."
 msgstr ""
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:506
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:44
 msgid ""
 "You have %quant(%1,hour) and %quant(%2,minute) remaining to complete the "
 "currently open test."
 msgstr ""
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:518
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:54
 msgid ""
 "You have %quant(%1,hour,hours,)%quant(%2,minute,minutes,) remaining to "
 "complete the currently open test."
 msgstr ""
 
-#. ($minutes,									$seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:529
+#. ($minutes,							$seconds)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:64
 msgid ""
 "You have %quant(%1,minute) and %quant(%2,second) remaining to complete the "
 "currently open test."
 msgstr ""
 
 #. ($seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:72
 msgid ""
 "You have %quant(%1,second) remaining to complete the currently open test."
 msgstr ""
 
 #. ($attempts)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1243
 msgid "You have attempted this problem %quant(%1,time,times)."
 msgstr "Bu soru için [quant,_1,deneme hakkı,deneme hakkı] kullandınız."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:1
 msgid "You have been logged out of WeBWorK."
 msgstr "WeBWorK sisteminden çıkış yaptınız."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2065
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:260
 msgid "You have less than 1 minute to complete this test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2046
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:241
 msgid "You have less than 45 seconds left!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2043
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:240
 msgid ""
 "You have less than 90 seconds left to complete this assignment. You should "
 "finish it soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1004
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:452
 msgid "You have not chosen a file to upload."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:845
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "You have requested that the following items be deleted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1137
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:565
 msgid "You have specified an illegal file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:766
 msgid "You have specified an illegal path"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:520
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:13
+msgid "You have specified an illegal working directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:481
 msgid ""
 "You may check your answers to this problem without affecting the maximum "
 "number of tries to your original problem."
 msgstr ""
 
-#. ($perm_multiuser ? "to privileged users or" : "")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:613
+#. ($multiuser ? 'to privileged users or' : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:69
 msgid ""
 "You may choose to show any of the following data. Correct answers, hints, "
 "and solutions are only available %1 after the answer date of the homework "
 "set."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:63
+msgid "You may not change this user's password!"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:646
 msgid "You may not change your answers when going on to the next part!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1831
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:58
 msgid "You may not change your own password here!"
 msgstr "Şifrenizi buradan değiştiremezsiniz!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1132
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:560
 msgid "You may not follow symbolic links"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2134
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:350
 msgid "You may still check your answers."
 msgstr ""
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:172
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:143
+msgid ""
+"You may want to create an unattached problem if you are using the current "
+"problem as a model for a new problem. You can add the new file to a homework"
+" set from the Library Browser or via the set detail page of the Hmwk Sets "
+"Editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:165
+msgid ""
+"You might want to do this if you want to give full credit to everyone on a "
+"particular problem that was not worded correctly, or wasn't working "
+"properly. This is done from the \"Hmwk Sets Editor\" page or the "
+"\"Instructor Tools\" page."
+msgstr ""
+
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:8
 msgid "You must access assignments from your Course Management System (%1)."
 msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:67
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before Show Me Another "
-"is available."
+"You must attempt this problem %quant(%1,time) before this feature is "
+"available"
 msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1923
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:545
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before this feature is "
-"available"
+"You must attempt this problem %quant(%1,time,times) before Show Me Another "
+"is available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:699
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:259
 msgid "You must confirm the password for the initial instructor."
 msgstr ""
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:368
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? $c->link_to(                                                  $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:195
 msgid "You must log into this set via your Learning Management System (%1)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:76
-msgid "You must provide a student ID, a set ID, and a problem number."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:979
+msgid "You must select a course to archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:585
 msgid "You must select a course to rename."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:351
 msgid "You must select at least one file for the archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:777
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:312
 msgid "You must select at least one file to delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:115
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:106
 msgid "You must select one or more sets for scoring!"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:749
 msgid "You must specify a %1 name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:682
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:242
 msgid "You must specify a course ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2026
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2561
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2777
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3865
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2086
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:848
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:983
 msgid "You must specify a course name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:775
 msgid "You must specify a file name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:705
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:586
+msgid "You must specify a file name in order to save a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:265
 msgid "You must specify a first name for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:708
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:268
 msgid "You must specify a last name for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1382
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:606
 msgid "You must specify a new institution for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1364
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:588
 msgid "You must specify a new name for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:603
 msgid "You must specify a new title for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:256
 msgid "You must specify a password for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:448
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:440
 msgid "You must specify a user ID."
 msgstr "Bir kullanıcı adı girmelisiniz."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:711
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:271
 msgid "You must specify an email address for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:331
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:138
 msgid "You must specify an file name in order to save a new file."
 msgstr "Yeni dosya kaydetmek için dosya adı belirtmelisiniz."
 
 #. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:505
 msgid ""
-"You must use your Learning Managment System (%1) to access this set.  Try "
-"logging in to the Learning Managment System and visiting the set from there."
+"You must use your Learning Management System (%1) to access this set.  Try "
+"logging in to the Learning Management System and visiting the set from "
+"there."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1730
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
 msgid "You need to select a \"Target Set\" before you can edit it."
 msgstr ""
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1126
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:554
 msgid "You need to select a file to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1877
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:555
 msgid "You need to select a set definition file to view."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1853
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:537
 msgid "You need to select a set from this course to view."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1837
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:524
 msgid "You need to select a set to view."
 msgstr ""
 
-#. (wwRound(0, $problemResult->{score} * 100)
-#. (wwRound(0, $pg->{result}->{score} * 100)
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2007
+#. (wwRound(0,
+#. compute_reduced_score($ce, $problem, $set, $pg->{result}{score},
+#. $c->submitTime)
+#. (% wwRound(0, $rh_result->{problem_result}{score} * 100)
+#. (wwRound(0, $rh_result->{problem_result}{score} * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1251
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:48
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:29
 msgid "You received a score of %1 for this attempt."
 msgstr "Bu soru için %1 puan aldınız."
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2075
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1363
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem and its graded subproblems."
 msgstr ""
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2078
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1375
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem."
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1343
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:740
 msgid "Your %1 name contains illegal characters"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1344
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:743
 msgid "Your %1 name may not begin with a dot"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:746
 msgid "Your %1 name may not contain a path component"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:540
-msgid ""
-"Your LTI OAuth verification failed.  If this recurs, please speak with your "
-"instructor"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:528
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:539
-msgid ""
-"Your authentication failed.  Please return to Oncourse and login again."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:229
-msgid ""
-"Your authentication failed.  Please try again. Please speak with your "
-"instructor if you need help."
-msgstr ""
-
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3033
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3162
 msgid "Your browser does not support the video tag."
 msgstr ""
 
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4078
-msgid "Your current branch of PG is up to date with branch %1 in remote %2."
-msgstr ""
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4016
-msgid ""
-"Your current branch of WeBWorK is up to date with branch %1 in remote %2."
-msgstr ""
-
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4113
-msgid "Your current branch of the Open Problem Library is up to date."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:134
 msgid "Your display options have been saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:195
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
 msgid "Your email address has been changed."
 msgstr "E-posta adresiniz değiştirildi."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:772
 msgid "Your file name contains illegal characters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:118
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:40
 msgid "Your file name is not valid! "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:16
 msgid "Your message was sent successfully."
 msgstr ""
 
-#. ($lastScore,$notCountedMessage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2010
+#. (wwRound(0, $problem->status * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1261
 msgid "Your overall recorded score is %1.  %2"
 msgstr "Ortalama puanınız: %1.  %2"
 
-#. ($versionNumber, wwRound(2,$recordedScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2107
-msgid "Your recorded score on this test (version %1) is %2/%3."
+#. ('<span id="test-recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:179
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:197
+msgid "Your recorded score for this version is %1/%2 (%3%)."
+msgstr ""
+
+#. ($setVersionID,                                         '<span id="test-
+#. recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:317
+msgid "Your recorded score on this test (version %1) is %2/%3 (%4%)."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:603
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:634
 msgid "Your score for this attempt is for this part only;"
 msgstr ""
 
 #. ($testNounNum)
 # $testNounNum is either "test (#)" or "submission (#)"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1977
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:142
 msgid "Your score on this %1 WAS recorded."
 msgstr ""
 
-#. ($testNoun,$attemptScore,$totPossible)
+#. ($testNoun, $c->{attemptScore}, $c->{totalPossible})
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1982
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:148
 msgid "Your score on this %1 is %2/%3."
 msgstr ""
 
 #. ($testNounNum)
 # $testNounNum is either "test (#)" or "submission (#)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1973
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:138
 msgid "Your score on this %1 was NOT recorded."
 msgstr ""
 
-#. ($attemptScore,$totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2019
+#. ($c->{attemptScore}, $c->{totalPossible})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:192
 msgid "Your score on this (checked, not recorded) submission is %1/%2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1963
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2277
-msgid "Your score on this problem was recorded."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1619
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1027
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:172
 msgid ""
 "Your score was not recorded because there was a failure in storing the "
 "problem record to the database."
 msgstr "Notunuz kaydedilemedi, çünkü notun veritabanına kaydı sırasında bir hata oluştu."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:272
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:276
 msgid "Your score was not recorded because this homework set is closed."
 msgstr "Notunuz kaydedilemedi çünkü bu soru grubu kapalı."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:283
 msgid ""
 "Your score was not recorded because this problem has not been assigned to "
 "you."
 msgstr "Notunuz kaydedilmedi çünkü bu soru size yöneltilmedi."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1643
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1049
 msgid ""
 "Your score was not recorded because this problem set version is not open."
 msgstr ""
 
-#. ($elapsed, $allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1658
+#. ($elapsed,                                              # Assume the
+#. allowed time is an even number of minutes.
+#. ($set->due_date - $set->open_date)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1063
 msgid ""
 "Your score was not recorded because you have exceeded the time limit for "
 "this test. (Time taken: %1 min; allowed: %2 min.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1052
 msgid ""
 "Your score was not recorded because you have no attempts remaining on this "
 "set version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1661
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1067
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:278
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:53
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:31
 msgid "Your score was not recorded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1998
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:163
 msgid "Your score was not successfully sent to the LMS."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:166
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:170
 msgid "Your score was recorded."
 msgstr "Notunuz kaydedildi."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1997
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:255
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:162
 msgid "Your score was successfully sent to the LMS."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:540
 msgid "Your session has timed out due to inactivity. Please log in again."
 msgstr "Oturumunuz zaman aşımına uğradı. Lütfen tekrar giriş yapınız."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4126
-msgid "Your systems are up to date!"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1396
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1403
-msgid "[Edit]"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:824
-msgid "a duplicate of the first selected achievement."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:17
+msgid "a duplicate of the first selected achievement"
 msgstr ""
 
 # Context is "Create set ______ as a duplicate of the first selected set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:17
 msgid "a duplicate of the first selected set"
 msgstr "İlk seçilen setin bir kopyası"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:823
-msgid "a new empty achievement."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:16
+msgid "a new empty achievement"
 msgstr ""
 
 # Context is "Create set ______ as a new empty set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:16
 msgid "a new empty set"
 msgstr "Boş bir yeni set"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1281
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:9
 msgid "a single set"
 msgstr "tek bir set"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:429
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:130
 msgid "add problems"
 msgstr ""
 
 #. ($setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1751
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
 msgid "addGlobalSet %1 in ProblemSetList:  %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:456
-msgid "added missing permission level for user"
-msgstr ""
-
 # #short for administrator
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "admin"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1051
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:487
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:604
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:7
 msgid "all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1377
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:66
 msgid "all current users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:327
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:70
 msgid "all set dates for one <b>user</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:622
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1434
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:667
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:840
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1995
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:7
 msgid "all sets"
 msgstr "bütün setler"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1981
 msgid "all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1256
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:701
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:946
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:997
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:6
 msgid "all users"
 msgstr "bütün kullanıcılar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:120
 msgid "all users for one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:23
 msgid "alphabetically"
 msgstr ""
 
-#. ($count,$numSets)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:626
+#. ($count, $numSets)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1999
 msgid "an impossible number of sets: %1 out of %2"
 msgstr ""
 
-#. ($count,$numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:606
+#. ($count, $numUsers)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1985
 msgid "an impossible number of users: %1 out of %2"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:647
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:658
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:610
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:621
 msgid "answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:30
 msgid "any users"
 msgstr "her kullanıcı"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:720
-msgid "avg attempts"
-msgstr ""
-
 # Context is "Append ____ blank problem template(s) to end of homework set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2956
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:689
 msgid "blank problem template(s) to end of homework set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:24
 msgid "by last login date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1552
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:688
 msgid "changes abandoned"
 msgstr "değişiklikler kaydedilmedi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1216
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1651
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:633
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:795
 msgid "changes saved"
 msgstr "değişiklikler kaydedildi"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:80
 msgid "class list data for selected <b>users</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:31
 msgid "close"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:671
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:259
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:239
 msgid "correct"
 msgstr "doğru"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:582
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:239
 msgid "course files"
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:458
 msgid "deleted %1 sets"
 msgstr "%1 set silindi."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:152
 msgid "editing all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:333
 msgid "editing all sets"
 msgstr "bütün setler düzenleniyor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:963
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:328
 msgid "editing all users"
 msgstr "bütün kullancılar düzenleniyor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:860
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:336
 msgid "editing listed sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:154
 msgid "editing selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:339
 msgid "editing selected sets"
 msgstr "seçili setler düzenleniyor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:334
 msgid "editing selected users"
 msgstr "seçili kullanıcılar düzenleniyor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:331
 msgid "editing visible users"
 msgstr "görünür kullanıcılar düzenleniyor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:360
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:90
 msgid "email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:87
-msgid "email:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:42
 msgid "empty"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:672
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:10
 msgid "enter matching set IDs below"
 msgstr "eşleşen ödev setlerini aşağıya girin"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:220
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:31
 msgid "entry rows."
 msgstr ""
 
 #. ($restrictLoc, $setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1761
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:904
 msgid "error adding set location %1 for set %2: %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1092
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1487
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:542
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:643
 msgid "export abandoned"
 msgstr "dışarı aktarım yapılmadı"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1068
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:527
 msgid "exporting all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1071
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:530
 msgid "exporting selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:359
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:89
 msgid "first name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:747
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:72
 msgid "for"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:149
 msgid "for one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:103
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:94
 msgid "for one <b>user</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1014
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:349
 msgid "giving new passwords to all users"
 msgstr "bütün kullanıcılara yeni şifre veriliyor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1020
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:355
 msgid "giving new passwords to selected users"
 msgstr "seçili kullanıcılara yeni şifre veriliyor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1017
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:352
 msgid "giving new passwords to visible users"
 msgstr "görünür kullanıcılara yeni şifre veriliyor"
 
 #. ($j, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1069
 msgid "global %1 for set %2 not found."
 msgstr ""
 
-#. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1146
-msgid "global set %1 not found."
-msgstr ""
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "grade_proctor"
 msgstr ""
@@ -8854,393 +12010,375 @@ msgstr ""
 msgid "guest"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1589
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:949
 msgid "hidden"
 msgstr "gizli"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "hidden from"
 msgstr "görüntülenmiyor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "hidden from students"
-msgstr "öğrenciler tarafından görülemez"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:217
+msgid "homework"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:83
+msgid "html directory"
+msgstr ""
 
-#. ('j','k','_0')
-#. ('j','k')
+#. ('j', 'k', '_0')
+#. ('j', 'k')
 # doe snot need to be translated
-#: /opt/webwork/pg/lib/Parser/List/Vector.pm:35
-#: /opt/webwork/pg/lib/Value/Vector.pm:278
-#: /opt/webwork/pg/macros/contextLimitedVector.pl:93
+#: /opt/webwork/pg/lib/Parser/List/Vector.pm:39
+#: /opt/webwork/pg/lib/Value/Vector.pm:303
+#: /opt/webwork/pg/macros/contexts/contextLimitedVector.pl:95
 msgid "i"
 msgstr ""
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:773
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:840
 msgid "if"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1626
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:622
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:721
 msgid "illegal character in input: '/'"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:246
 msgid "incorrect"
 msgstr "yanlış"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:441
 msgid "index"
 msgstr ""
 
 #. ($restrictLoc, $setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:911
 msgid "input set location %1 already exists for set %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:358
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:551
+msgid "insufficient permission to edit %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:220
+msgid "just-in-time"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:88
 msgid "last name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:841
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:893
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:9
 msgid "listed sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3169
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:87
 msgid "locations selected below"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:665
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:59
 msgid "login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "login ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:94
 msgid "login name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:86
-msgid "login/studentID:"
-msgstr ""
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "login_proctor"
 msgstr ""
 
 # Context is "Set _____ made visibile for _____ users"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "made visible for"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:419
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:493
 msgid "max"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1282
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:10
 msgid "multiple sets"
 msgstr "birden fazla set"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:489
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:171
 msgid "new set:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:393
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:109
 msgid "new users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:6
 msgid "no achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:740
-msgid "no achievements."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:519
-msgid "no attempt recorded"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:86
 msgid "no location"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:620
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1056
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1993
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:6
 msgid "no sets"
 msgstr "Set yok"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:600
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1979
 msgid "no students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:931
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1190
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:702
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:31
 msgid "no users"
 msgstr "kullanıcı yok"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/permission.pm:26
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "nobody"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:114
 msgid "nth colum of merge file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:225
-msgid "number of students not defined"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:70
 msgid "of"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:128
 msgid "one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:556
-msgid "one <b>set</b> for  <b>users</b>"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:225
+msgid "one <b>set</b> for <b>users</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:540
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:211
 msgid "one <b>user</b> (on one <b>set</b>)"
 msgstr ""
 
 # Context is Assign this set to which users?  "only ____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1378
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:67
 msgid "only"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:17
 msgid "only best scores"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3472
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:357
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:448
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:88
 msgid "or"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1141
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:59
 msgid "or Problems from"
 msgstr ""
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:776
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:843
 msgid "otherwise"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:19
 msgid "overwrite"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:664
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:627
 msgid "part"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1383
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:499
 msgid "permissions for %1 not defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "point"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "points"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:509
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:20
 msgid "preserve"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2360
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:576
 msgid "preview answers"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:653
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:616
 msgid "problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:632
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:41
 msgid "problems"
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:219
+msgid "proctored test"
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "professor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:360
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:451
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:89
 msgid "progress"
 msgstr ""
 
 #. ($line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2212
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1409
 msgid "readSetDef error, can't read the line: ||%1||"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:93
 msgid "recitation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:654
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:53
 msgid "recitation #"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:497
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:549
 msgid "record for visible user %1 not found"
 msgstr ""
 
 #. ($restrictLoc)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1767
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:918
 msgid ""
 "restriction location %1 does not exist.  IP restrictions have been ignored."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:670
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "row"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:91
 msgid "score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:362
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:92
 msgid "section"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:643
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:47
 msgid "section #"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:88
-msgid "section:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:159
 msgid "selected <b>sets</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:524
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:197
 msgid "selected <b>users</b> to selected <b>sets</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:441
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:488
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:605
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:8
 msgid "selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:741
-msgid "selected achievements."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1057
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1436
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:669
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:842
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:894
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:991
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:8
 msgid "selected sets"
 msgstr "seçili setler"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1053
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:703
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:999
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:8
 msgid "selected users"
 msgstr "seçili kullanıcılar"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:624
-msgid "set"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:628
-msgid "sets"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:12
 msgid "sets hidden from students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:670
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:11
 msgid "sets visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:716
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:281
 msgid "showing all sets"
 msgstr "bütün setler gösteriliyor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:763
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:277
 msgid "showing all users"
 msgstr "bütün kullanıcılar gösteriliyor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:725
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:290
 msgid "showing matching sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:286
 msgid "showing matching users"
 msgstr "eşleşen kullanıcılar gösteriliyor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:719
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:284
 msgid "showing no sets"
 msgstr "hiçbir set gösterilmiyor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:766
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:280
 msgid "showing no users"
 msgstr "hiçbir kullanıcı gösterilmiyor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:722
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:287
 msgid "showing selected sets"
 msgstr "seçili setler gösteriliyor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:769
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:283
 msgid "showing selected users"
 msgstr "seçili kullanıcılar gösteriliyor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:299
 msgid "showing sets that are hidden from students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:732
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:296
 msgid "showing sets that are visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:72
 msgid "shown"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:162
 msgid "still open"
 msgstr ""
 
@@ -9248,16 +12386,16 @@ msgstr ""
 msgid "student"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
 msgid "submission"
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:133
 msgid "submission (version %1)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
 msgid "summary"
 msgstr ""
 
@@ -9265,135 +12403,130 @@ msgstr ""
 msgid "ta"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:90
+msgid "templates/email directory"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:95
+msgid "templates/macros directory"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
 msgid "test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:23
 msgid "test date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:621
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:29
 msgid "test time"
 msgstr ""
 
-#. ($forcedSourceFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:987
-msgid "the original path to the file is %1"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:119
 msgid "then delete them"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "time"
-msgstr "deneme hakkı"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:165
 msgid "time limit exceeded"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "times"
-msgstr "deneme hakkı"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:35
+msgid "time remaining"
+msgstr ""
 
 # Context is Assign ____ to _____
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:183
 msgid "to"
 msgstr ""
 
 #. ($ce->{institutionName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:399
 msgid "to %1 main web site"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:524
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:381
 msgid "to courses page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:436
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:135
 msgid "to one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:764
-msgid "top score"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:432
 msgid "total"
 msgstr ""
 
 #. ($ce->{webworkDirs}{logs})
 #. ($ce->{webworkDirs}{tmp})
 #. ($ce->{webworkDirs}{DATA})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:47
 msgid "unable to write to directory %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:333
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:49
 msgid "unlimited"
 msgstr "sınırsız"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:14
 msgid "unlimited reusability"
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:609
-msgid "userID: %1 --"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:652
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:259
 msgid ""
 "username, last name, first name, section, achievement level, achievement "
 "score,"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:704
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:10
 msgid "users who match on selected field"
 msgstr "seçili alanla eşleşen kullanıcılar"
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
+#. ($set->version_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:295
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:408
+msgid "version %1"
+msgstr ""
+
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:134
 msgid "version (%1)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1591
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1888
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:820
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:951
 msgid "visible"
 msgstr "Görünür"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "visible to students"
-msgstr "öğrencilere görüntüleyebilir"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1257
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:947
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:998
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:7
 msgid "visible users"
 msgstr "kullanıcılar görüntüleyebilir"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:485
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:500
 msgid "when you submit your answers"
 msgstr ""
 
 #. ($dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1532
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:623
 msgid "won't be able to read from file %1/%2: does it exist? is it readable?"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:604
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:638
 msgid "your overall score is for all the parts combined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:231
 msgid "your students"
 msgstr ""
diff --git a/lib/WeBWorK/Localize/webwork2.pot b/lib/WeBWorK/Localize/webwork2.pot
index 46be347f5b..5ebfef0605 100644
--- a/lib/WeBWorK/Localize/webwork2.pot
+++ b/lib/WeBWorK/Localize/webwork2.pot
@@ -14,251 +14,328 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:428 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:449
+#. ($_->{problem}->version_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:69
+msgid " (version %1)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:265 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:284
 msgid " Answers Available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:735
-msgid "# of active students"
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1148
+msgid " No changes have been made to set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:506
-msgid "#corr"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:130
+msgid "\"Act as\" a student"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:508
-msgid "#incorr"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:31
+msgid "\"Edit Assigned Users\" column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2249
-msgid "% Score:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:24
+msgid "\"Edit Problems\" column"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:187
+msgid "# of Active Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:85
+msgid "# of attempts"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:333
+msgid "#corr"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:685
-msgid "% correct"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:335
+msgid "#incorr"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:174
+msgid "% Average with Review"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:702
-msgid "% correct with review"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:66
+msgid "% Score with Review"
 msgstr ""
 
-# Percent students
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:762 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:792
-msgid "% students"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:479
+msgid "% Score:"
 msgstr ""
 
 #. ($achievement->{points})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:24
 msgid "%1 Points:"
 msgstr ""
 
-#. ($lib eq '' ? $r->maketext('Local')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:476
+#. ($lib eq '' ? maketext('Local')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:9
 msgid "%1 Problems:"
 msgstr ""
 
-#. ($itemCounts{$item->id()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:189
+#. ($itemCounts->{ $item->id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:12
 msgid "%1 remaining"
 msgstr ""
 
-#. ($numAdded, $numSkipped, join(', ', @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1410
+#. ($count)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2001
+msgid "%1 sets"
+msgstr ""
+
+#. ($numAdded,			$numSkipped,                                                join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:608
 msgid "%1 sets added, %2 sets skipped. Skipped sets: (%3)"
 msgstr ""
 
-#. ($numExported, $numSkipped, ($numSkipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1526
+#. ($numExported, $numSkipped,			$numSkipped ? $c->tag('ul', $c->c(map { $c->tag('li', $_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:673
 msgid "%1 sets exported, %2 sets skipped. Skipped sets: (%3)"
 msgstr ""
 
 #. ($count, $numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:608
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
 msgid "%1 students out of %2"
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle, $rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1452
+#. ($rename_oldCourseID,          $rename_oldCourseTitle, $rename_newCourseTitle,					$rename_oldCourseInstitution, $rename_newCourseInstitution)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:675
 msgid "%1 title and institution changed from %2 to %3 and from %4 to %5"
 msgstr ""
 
-#. (scalar @userIDsToExport, $dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1338
-msgid "%1 users exported to file %2/%3"
+#. (scalar @userIDsToExport, "$dir/$fileName")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:477
+msgid "%1 users exported to file %2"
 msgstr ""
 
-#. ($numReplaced, $numAdded, $numSkipped, join (", ", @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1233
+#. ($numReplaced, $numAdded, $numSkipped, join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:443
 msgid "%1 users replaced, %2 users added, %3 users skipped. Skipped users: (%4)"
 msgstr ""
 
-#. ($levelpercentage)
 #. ($percentage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:135 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:136 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:323 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:324
+#. ($level_percentage)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:29 /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:30 /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:12
 msgid "%1% Complete"
 msgstr ""
 
 #. (wwRound(0, $answerScore * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:268
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:248
 msgid "%1% correct"
 msgstr ""
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:207
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:57
 msgid "%1's Current Address"
 msgstr ""
 
-#. ($user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:136
+#. ($c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:26
 msgid "%1's Current Password"
 msgstr ""
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:225
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:65
 msgid "%1's New Address"
 msgstr ""
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:153
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:34
 msgid "%1's New Password"
 msgstr ""
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
-msgid "%1's new password cannot be blank."
-msgstr ""
-
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:86 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:67 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:76
 msgid "%1's password has been changed."
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:56 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1423
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#. ($c->tag('span', dir => 'ltr', $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:40 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1069 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:149
 msgid "%1: Problem %2"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:374
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:357
 msgid "%1: Problem %2 Show Me Another"
 msgstr ""
 
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2231
-msgid "%1: The directory for the course not found."
-msgstr ""
-
-#. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:340
-msgid "%quant(%1,error) occured while generating hardcopy:"
+#. ($days)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:87
+msgid "%quant(%1,day)"
 msgstr ""
 
 #. ($n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:924
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:389
 msgid "%quant(%1,file) unpacked successfully"
 msgstr ""
 
+#. ($hours)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:88
+msgid "%quant(%1,hour)"
+msgstr ""
+
+#. ($minutes)
+#. (sprintf('%3.1f', $testTime)
+#. ($timeLeft)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:89 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:150 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:168
+msgid "%quant(%1,minute)"
+msgstr ""
+
 #. ($numBlanks)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:430
 msgid "%quant(%1,of the questions remains,of the questions remain) unanswered."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:678
+#. ($seconds)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:90
+msgid "%quant(%1,second)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:505
 msgid "%score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2971
+#. ($dcount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:40
+msgid "(%quant(%1,item) total)"
+msgstr ""
+
+#. ($count)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:29
+msgid "(%quant(%1,item))"
+msgstr ""
+
+#. ($problemValue)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1081
+msgid "(%quant(%1,point))"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:697
 msgid "(Any unsaved changes will be lost.)"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1278 /opt/webwork/pg/macros/PGbasicmacros.pl:1287
-msgid "(Instructor hint preview: show the student hint after the following number of attempts:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:102
+msgid "(If an action cannot be executed it will not appear.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2003
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1262
 msgid "(This problem will not count towards your grade.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2122
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:340
 msgid "(This test is overtime because it was not submitted in the allowed time.)"
 msgstr ""
 
 # $testNoun is either "test" or "submission"
-#. ($testNoun, $self->formatDateTime($set->answer_date)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1986
+#. ($testNoun, $c->formatDateTime($c->{set}->answer_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:153
 msgid "(Your score on this %1 is not available until %2.)"
 msgstr ""
 
 # $testNoun is either "test" or "submission"
 #. ($testNoun)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1988
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:155
 msgid "(Your score on this %1 is not available.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1447 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1257 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1267
 msgid "(correct)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:197
-msgid "(gw/quiz) After version answer date"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:263
 msgid "(in target set)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1449 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1259 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1269
 msgid "(incorrect)"
 msgstr ""
 
 #. ($pgScore)
 #. ($recScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1451 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1461
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1261 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1271
 msgid "(score %1)"
 msgstr ""
 
-#. ($display_sort_method_name{$secondary_sort_method_name})
-#. ($display_sort_method_name{$ternary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:701 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:706
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:207
+msgid "(test) After version answer date"
+msgstr ""
+
+#. ($versionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:164
+msgid "(version %1)"
+msgstr ""
+
+#. ($display_sort_method_name{$secondary_sort_method})
+#. ($display_sort_method_name{$ternary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:100 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:103
 msgid ", then by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1297
-msgid ". If this is a class roster, rename it to have extension '.lst'"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:702
+msgid ". If this is a class roster, rename it to have extension \".lst\""
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:81
+msgid "0 seconds"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1997
+msgid "1 set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1983
 msgid "1 student"
 msgstr ""
 
 #. (wwRound(2, $weights[$part] * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:145
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:58
 msgid "<b>Weight:</b> %1%"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1749
+#: /opt/webwork/webwork2/conf/defaults.config:1651
 msgid "<p>After the Reduced Scoring Date all additional work done by the student counts at a reduced rate. Here is where you set the reduced rate which must be a percentage. For example if this value is 50% and a student views a problem during the Reduced Scoring Period, they will see the message \"You are in the Reduced Scoring Period: All additional work done counts 50% of the original.\" </p><p>To use this, you also have to enable Reduced Scoring and set the Reduced Scoring Date for individual assignments by editing the set data using the Hmwk Sets Editor.</p><p>This works with the avg_problem_grader (which is the the default grader) and the std_problem_grader (the all or nothing grader). It will work with custom graders if they are written appropriately.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2036
+#: /opt/webwork/webwork2/conf/defaults.config:1937
 msgid "<p>During summer 2005, a newer version of the answer checkers was implemented for answers which are functions and numbers.  The newer checkers allow more functions in student answers, and behave better in certain cases.  Some problems are specifically coded to use new (or old) answer checkers.  However, for the bulk of the problems, you can choose what the default will be here.</p><p>Choosing <i>false</i> here means that the newer answer checkers will be used by default, and choosing <i>true</i> means that the old answer checkers will be used by default.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2006
-msgid "<p>MathQuill renders students answers in real-time as they type on the keyboard.</p><p>MathView allows students to choose from a variety of common math structures (such as fractions and square roots) as they attempt to input their answers.</p><p>WIRIS provides a separate workspace for students to construct their response in a WYSIWYG environment.</p>"
+#: /opt/webwork/webwork2/conf/defaults.config:1908
+msgid "<p>MathQuill renders students answers in real-time as they type on the keyboard.</p><p>MathView allows students to choose from a variety of common math structures (such as fractions and square roots) as they attempt to input their answers.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1736
+#: /opt/webwork/webwork2/conf/defaults.config:1459
+msgid "<p>Mode in which the LANG and DIR settings for a single problem are determined.</p><p>The system will set the LANGuage attribute to either a value determined from the problem, a course-wide default, or the system default, depending on the mode selected. The tag will only be added to the DIV enclosing the problem if it is different than the value which should be set in the main HTML tag set for the entire course based on the course language.</p><p>There are two options for the DIRection attribute: \"ltr\" for left-to-write scripts, and \"rtl\" for right-to-left scripts like Arabic and Hebrew.</p><p>The DIRection attribute is needed to trigger proper display of the question text when the problem text-direction is different than that used by the current language of the course. For example, English problems from the library browser would display improperly in RTL mode for a Hebrew course, unless the problen Direction is set to LTR.</p><p>The feature to set a problem language and direction was only added in 2018 to the PG language, so most problems will not declare their language, and the system needs to fall back to determining the language and direction in a different manner. The OPL itself is all English, so the system wide fallback is to en-US in LTR mode.</p><p>Since the defaults fall back to the LTR direction, most sites should be fine with the \"auto::\" mode, but may want to select the one which matches their course language. The mode \"force::ltr\" would also be an option for a course which runs into trouble with the \"auto\" modes.</p><p>Modes:</p><ul><li>\"none\" prevents any additional LANG and/or DIR tag being added. The browser will use the main setting which was applied to the entire HTML page. This is likely to cause trouble when a problem of the other direction is displayed.</li><li>\"auto::\" allows the system to make the settings based on the language and direction reported by the problem (a new feature, so not set in almost all existing problems) and falling back to the expected default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" allows the system to make the settings based on the language and direction reported by the problem (a new feature, so not set in almost all existing problems) but falling back to the language with the given LangCode and the direction Dir when problem settings are not available from PG.</li><li>\"auto::Dir\" for problems without PG settings, this will use the default en=english language, but force the direction to Dir. Problems with PG settings will get those settings.</li><li>\"auto:LangCode:\" for problems without PG settings, this will use the default LTR direction, but will set the language to LangCode.Problems with PG settings will get those settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made by the PG code of the problem, and will force the system to set the language with the given LangCode and the direction to Dir for <b>all</b> problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the PG code of the problem, and will force the system to set the direction to Dir for <b>all</b> problems, but will avoid setting any language attribute for individual problem.</li></ul>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1514
+msgid "<p>Some servers handle courses taking place in different timezones.  If this course is not showing the correct timezone, enter the correct value here.  The format consists of unix times, such as \"America/New_York\", \"America/Chicago\", \"America/Denver\", \"America/Phoenix\" or \"America/Los_Angeles\".</p>Complete list: <a href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1638
 msgid "<p>This sets whether the Reduced Scoring system will be enabled.  If enabled you will need to set the default length of the reduced scoring period and the value of work done in the reduced scoring period below.</p><p>To use this, you also have to enable Reduced Scoring for individual assignments and set their Reduced Scoring Dates by editing the set data.</p><p>This works with the avg_problem_grader (which is the the default grader) and the std_problem_grader (the all or nothing grader).  It will work with custom graders if they are written appropriately.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1979
-msgid "<p>When viewing a problem, users may choose different methods of rendering formulas via an options box in the left panel. Here, you can adjust what display modes are listed.</p><p>Some display modes require other software to be installed on the server. Be sure to check that all display modes selected here work from your server.</p><p>The display modes are <ul><li>plainText: shows the raw LaTeX strings for formulas.</li><li>images: produces images using the external programs LaTeX and dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place render mathematics.</li></ul></p></p>You must use at least one display mode. If you select only one, then the options box will not give a choice of modes (since there will only be one active).</p>"
+#: /opt/webwork/webwork2/conf/defaults.config:1881
+msgid "<p>When viewing a problem, users may choose different methods of rendering formulas via an options box in the left panel. Here, you can adjust what display modes are listed.</p><p>Some display modes require other software to be installed on the server. Be sure to check that all display modes selected here work from your server.</p><p>The display modes are</p><ul><li>plainText: shows the raw LaTeX strings for formulas.</li><li>images: produces images using the external programs LaTeX and dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place render mathematics.</li></ul><p>You must use at least one display mode. If you select only one, then the options box will not give a choice of modes (since there will only be one active).</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1476
+msgid "<strong>Warning</strong>: There may be something wrong with a question in this test. Please inform your instructor including the warning messages below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1236
+msgid "<strong>Warning</strong>: There may be something wrong with this question. Please inform your instructor including the warning messages below."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1828
-msgid "<ul><li><b>SMAcheckAnswers</b>: enables the Check Answers button <i>for the new problem</i> when Show Me Another is clicked</li><li><b>SMAshowSolutions</b>: shows walk-through solution <i>for the new problem</i> when Show Me Another is clicked; a check is done first to make sure that a solution exists </li><li><b>SMAshowCorrect</b>: correct answers <i>for the new problem</i> can be viewed when Show Me Another is clicked; note that <b>SMAcheckAnswers</b>needs to be enabled at the same time</li><li><b>SMAshowHints</b>: show hints <i>for the new problem</i> (assuming they exist)</li></ul>Note: there is very little point enabling the button unless you check at least one of these options - the students would simply see a new version that they can not attempt or learn from.</p>"
+#: /opt/webwork/webwork2/conf/defaults.config:1730
+msgid "<ul><li><b>SMAcheckAnswers</b>: enables the Check Answers button <i>for the new problem</i> when Show Me Another is clicked</li><li><b>SMAshowSolutions</b>: shows walk-through solution <i>for the new problem</i> when Show Me Another is clicked; a check is done first to make sure that a solution exists </li><li><b>SMAshowCorrect</b>: correct answers <i>for the new problem</i> can be viewed when Show Me Another is clicked; note that <b>SMAcheckAnswers</b>needs to be enabled at the same time</li><li><b>SMAshowHints</b>: show hints <i>for the new problem</i> (assuming they exist)</li></ul>Note: there is very little point enabling the button unless you check at least one of these options - the students would simply see a new version that they can not attempt or learn from."
 msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:35
@@ -267,697 +344,906 @@ msgstr ""
 
 #. ($add_courseID)
 #. ($rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1376 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:688
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:248 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:600
 msgid "A course with ID %1 already exists."
 msgstr ""
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2564
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1220
 msgid "A directory already exists with the name %1. You must first delete this existing course before you can unarchive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:119 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:111 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:42
 msgid "A file name cannot begin with a dot, it cannot be empty, it cannot contain a directory path component and only the characters -_.a-zA-Z0-9 and space are allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1342 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1366
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:738 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
 msgid "A file with that name already exists"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:348
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:19
 msgid "A hardcopy file was generated, but it may not be complete or correct. Please check that no problems are missing and that they are all legible. If not, please inform your instructor."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:56
+msgid "A hash reference in which the keys are the achievement_id's assigned to the current user and the values are 0 or 1 which stores if the user has earned the associated achievement or not."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:52
+msgid "A hash reference which contains a problems metadata, such as DBsubject, DBchapter, DBsection,  and so on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:37
+msgid "A hash reference which contains the problem data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:40
+msgid "A hash reference which contains the set data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:60
+msgid "A hash reference which saves data for this user and this achievement. This hash is persistent between evaluations and changes to this variable will be saved in the database."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:64
+msgid "A hash reference which saves global data for this user. This hash is persistent between evaluations and changes to this variable will be saved in the database."
+msgstr ""
+
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3291
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1695
 msgid "A location with the name %1 already exists in the database.  Did you mean to edit that location instead?"
 msgstr ""
 
-#. ($subject, $number_of_recipients, $courseName, $failed_messages)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1007
+#. ($mail_data->{subject}, $number_of_recipients, $mail_data->{courseName},		$failed_messages)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:113
 msgid "A message with the subject line \"%1\" has been sent to %quant(%2,recipient) in the class %3.  There were %4 message(s) that could not be sent."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:644
-msgid "A new file has been created at '%1'"
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:315
+msgid "A new file has been created at \"%1\""
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2006
-msgid "A new file has been created at '%1' with the contents below.  No changes have been made to set %2"
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1146
+msgid "A new file has been created at \"%1\" with the contents below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:681
-msgid "A period (.) indicates a problem has not been attempted, and a number from 0 to 100 indicates the grade earned. The number on the second line gives the number of incorrect attempts."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:154
+msgid "A new problem whose path ends in newProblem.pg should be given a new name, for example, \"myNewProblem.pg\"."
 msgstr ""
 
-# Leave symbol codes in place
-#: /opt/webwork/webwork2/conf/defaults.config:1647
-msgid "A switch to govern the use of a Progress Bar for the student; this also enables/disables the highlighting of the current problem in the side bar, and whether it is correct (&#x2713;), in progress (&hellip;), incorrect (&#x2717;), or unattempted (no symbol)."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:20
+msgid "A student must be assigned a homework set in order for it to appear on their WeBWorK home page. Check the box in the left column to assign a student to that homework set. Uncheck the box to unassign a student. If a student is unassigned from a homework set, all of the student's data for that homework set is deleted and cannot be recovered. Use this action cautiously!"
 msgstr ""
 
-# Short for ADJUSTED STATUS
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:500 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:712
-msgid "ADJ STATUS"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:20
+msgid "A student needs to be assigned a set in order for them to work it. Once a student is unassigned a set, all the data for them is lost and there is no way to undo it. When unassigning be sure to change the option to \"Allow unassign\"."
+msgstr ""
+
+# Leave symbol codes in place
+#: /opt/webwork/webwork2/conf/defaults.config:1549
+msgid "A switch to govern the use of a Progress Bar for the student; this also enables/disables the highlighting of the current problem in the side bar, and whether it is correct (&#x2713;), in progress (&hellip;), incorrect (&#x2717;), or unattempted (no symbol)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2296
-msgid "ANSWERS NOT RECORDED"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:42
+msgid "A unique key identifying the achievement."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2281
-msgid "ANSWERS NOT RECORDED --"
+# Short for ADJUSTED STATUS
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:326 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:535
+msgid "ADJ STATUS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2295
-msgid "ANSWERS ONLY CHECKED -- "
+#. ($c->{scoreRecordedMessage}[ $probOrder->[$i] ])
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:504
+msgid "ANSWERS NOT RECORDED -- %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2232
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1505 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:515
 msgid "ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1527
 msgid "ATTEMPT NOT ACCEPTED -- Please submit answers again (or request new version if neccessary)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1157 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1534 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1344 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_edit_form.html.ep:1 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_edit_form.html.ep:1 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_edit_form.html.ep:1 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_password_form.html.ep:1
 msgid "Abandon changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1083 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_export_form.html.ep:1 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_export_form.html.ep:1
 msgid "Abandon export"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:523 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:520
 msgid "Account creation is currently disabled in this course.  Please speak to your instructor or system administrator."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:153
-msgid "Achievement"
-msgstr ""
-
-#. ($targetAchievementID, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:638
-msgid "Achievement %1 created with evaluator '%2'."
+#. ($targetAchievementID,			$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:310
+msgid "Achievement %1 created with evaluator \"%2\"."
 msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:847
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:378
 msgid "Achievement %1 exists.  No achievement created"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:444 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:63
 msgid "Achievement Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:548
-msgid "Achievement Evaluator Editor"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:17
+msgid "Achievement Editor Help"
 msgstr ""
 
-#. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:170
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:17
+msgid "Achievement Evaluator Editor Help"
+msgstr ""
+
+#. ($c->stash('achievementID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:109
 msgid "Achievement Evaluator for achievement %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1446 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1454 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1482
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:13 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:12 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:13
 msgid "Achievement ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:274
 msgid "Achievement ID exists!  No new achievement created.  File not saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1698
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:41
+msgid "Achievement ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:3 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:6 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:3
+msgid "Achievement List"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1600
 msgid "Achievement Points Per Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:558
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:455
 msgid "Achievement User Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:17
+msgid "Achievement User Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:48
 msgid "Achievement has been assigned to all users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:67
 msgid "Achievement has been assigned to selected users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:60
 msgid "Achievement has been unassigned to all students."
 msgstr ""
 
-#. (CGI::a({ href => $fileManagerURL }, $scoreFileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:711
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:38
+msgid "Achievement options"
+msgstr ""
+
+#. ($c->link_to(				$scoreFileName => $c->systemLink(					$c->url_for('instructor_file_manager')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:318
 msgid "Achievement scores saved to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:260
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:241
 msgid "Achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:531
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:17
+msgid "Achievements Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:26
+msgid "Achievements are evaluated in the order shown below, with the exception of \"level\" achievements.  Achievements in the \"level\" category are evaluated first and control the XP thresholds and rewards (achievement items) for reaching each level. Achievements in the \"secret\" category are not shown to students until they earn the achievement, and is used for fun/surprise achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:32
+msgid "Achievements in the same category, with sequential numbers, and whose ID starts with the same \"prefix_\" (up to the last underscore), are treated as achievement chains.  Achievement chains are a sequence of achievements which build upon themselves, such as complete one problem, complete 10 problems, complete 25 problems, and so on. Students will only see the achievements in the chain they have completed or are currently working on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:201
 msgid "Act as"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:207 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:26
 msgid "Act as:"
 msgstr ""
 
-#. (HTML::Entities::encode_entities($prettyEUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1134
+#. ($effectiveUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:26
 msgid "Acting as %1."
 msgstr ""
 
 #. ($actionID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:352 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:372
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:231 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:223
 msgid "Action %1 not found"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1706
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:101
+msgid "Actions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1608
 msgid "Activating this will enable achievement rewards. This feature allows students to earn rewards by completing achievements that allow them to affect their homework in a limited way."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:45
 msgid "Active"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1691
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:50
+msgid "Active Students"
+msgstr ""
+
+#. ($c->{prettyID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:19
+msgid "Active Students Problem %1 Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1593
 msgid "Activiating this will enable Mathchievements for webwork.  Mathchievements can be managed by using the Achievement Editor link."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:388 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2947 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1548 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:107 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:687 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:166
 msgid "Add"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:89
 msgid "Add All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:370 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:455 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:644
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:132 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:3 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:32
 msgid "Add Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:253
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:17
+msgid "Add Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:14
+msgid "Add Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:98
 msgid "Add Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:406
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:349
 msgid "Add Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:518
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:17
+msgid "Add Users Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:47
 msgid "Add WeBWorK administrators to new course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1509
-msgid "Add a new test for which Gateway?"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:79
+msgid "Add a TA or an instructor (change permission level of user)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:60
+msgid "Add a few students to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:50
+msgid "Add a new version for which test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1441
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:20
 msgid "Add as what filetype?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/add_form.html.ep:3
 msgid "Add how many users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1549
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:69
+msgid "Add many students to a course from a class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:108
+msgid "Add n blank problem template(s) to the end of homework set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:164
 msgid "Add problem to target set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Add problems to"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1422
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:161
+msgid "Add this problem as the last problem of an existing set, either as a problem or as the set header (the text that appears on the home page of a homework set). You can rearrange the order of the problems later using the \"Hmwk Sets Editor\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:7
 msgid "Add to what set?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:20
+msgid "Add users to the course.  Select the number of students/users to add and then add any desired information.  The only mandatory information is the \"Login Name\". Any other fields may be left blank.  The \"Student ID\" will be the initial password for the user if provided."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:26
 msgid "Add which new users?"
 msgstr ""
 
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:883
+msgid "Added \"%1\" to %2 as new hardcopy header"
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:854
+msgid "Added \"%1\" to %2 as new set header"
+msgstr ""
+
 #. ('{number}', '{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1055
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:27
 msgid "Added %1 problems to set %2."
 msgstr ""
 
-#. ($sourceFilePath, $targetSetName,($set->assignment_type eq 'jitar' ? join('.',jitar_id_to_seq($targetProblemNumber)
-#. ($new_file_name, $setName, ($set->assignment_type eq 'jitar' ? join('.',jitar_id_to_seq($targetProblemNumber)
 #. ($new_file_path, $setID, $targetProblemNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1510 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2001 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1912
+#. ($sourceFilePath,			$targetSetName,			(				$set->assignment_type eq 'jitar'				? join('.', jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:825 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1837
 msgid "Added %1 to %2 as problem %3"
 msgstr ""
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1566
-msgid "Added '%1' to %2 as new hardcopy header"
-msgstr ""
-
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1540
-msgid "Added '%1' to %2 as new set header"
+#. ($new_file_name,				$c->{setID},				(					$set->assignment_type eq 'jitar'					? join('.', jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1139
+msgid "Added %1 to %2 as problem %3."
 msgstr ""
 
 #. (join(', ', @toAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1974
 msgid "Added addresses %1 to location %2."
 msgstr ""
 
+#. ($user->user_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:167
+msgid "Added missing permission level for user %1."
+msgstr ""
+
 #. ('{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1054
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:26
 msgid "Added one problem to set %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Added user:"
+msgstr ""
+
+#. ('<code>[Scoring]/report_grades_data.csv</code>',		'<code>[TMPL]/email/report_grades.msg</code>',)
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:33
+msgid "Additional (external) grades can be shown on this page by placing them in the CSV file %1.  The first six columns must be (in order): Student ID, Username, Last Name, First Name, Section, Recitation.  The remaining columns can list any external grades.  To display the grades, the CSV file is merged with the \"Email\" message %2, which will be rendered and displayed below the grade table.  The message can be created on the \"Email\" page and the CSV file can be created/uploaded using the \"File Manager\".  External grades can only be displayed here and are not included in any totals or statistics."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2060
 msgid "Additional addresses for receiving feedback e-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:235
 msgid "Additional submissions available."
 msgstr ""
 
 #. ($badLocAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1708
 msgid "Address(es) %1 already exist in the database.  THIS SHOULD NOT HAPPEN!  Please double check the integrity of the WeBWorK database before continuing."
 msgstr ""
 
 #. (join(', ', @noAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1986
 msgid "Address(es) %1 in the add list is(are) already in the location %2, and so were skipped."
 msgstr ""
 
 #. (join(', ', @noDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3603
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2008
 msgid "Address(es) %1 in the delete list is(are) not in the location %2, and so were skipped."
 msgstr ""
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1683
 msgid "Address(es) %1 is(are) not in a recognized form.  Please check your data entry and resubmit."
 msgstr ""
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1998
 msgid "Address(es) %1 is(are) not in a recognized form.  Please check your data entry and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:117
 msgid "Addresses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:53
 msgid "Addresses for new location.  Enter one per line, as single IP addresses (e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP ranges (e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:27
 msgid "Addresses to add to the location.  Enter one per line, as single IP addresses (e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP ranges (e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:232
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:27
 msgid "Adds 24 hours to the close date of a homework."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:323
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:27
 msgid "Adds 48 hours to the close date of a homework."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:110
+msgid "Adds new template problems to the set when the set is saved. You can modify the template to create your own problem, by clicking on the \"Edit Problem\" link and saving to some new file, e.g. \"myNewProblem.pg\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:19
 msgid "Adjusted Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:56
 msgid "Adobe PDF"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:675
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:42
 msgid "Advanced Search"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:196
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:206
 msgid "After set answer date"
 msgstr ""
 
-#. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:325
-msgid "After the reduced scoring period begins all work counts for %1% of its value."
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:33
+msgid "After the due date this set enters a reduced scoring period until it closes on %1.  All work completed during the reduced scoring period counts for %2% of its value."
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:304
 msgid "Afterward reduced credit can be earned until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:56 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:60
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:26 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:59 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:23
 msgid "All Chapters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:57 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:37 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:70 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:34
 msgid "All Sections"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:6
 msgid "All Selected Constraints Joined by \"And\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:71
+msgid "All Sets"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:15 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:12
 msgid "All Subjects"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:48
 msgid "All Textbooks"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:54
+msgid "All Users"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:49
 msgid "All assignments were made successfully."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:953
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:386
 msgid "All listed sets were hidden from all the students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:951
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:381
 msgid "All listed sets were made visible for all the students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:407
 msgid "All of the answers above are correct."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:398
 msgid "All of the gradeable answers above are correct."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:247
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:162
+msgid "All of the paths for problem files are relative to the templates directory of the current course. You can access this directory \"directly\" using the File Manager page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:68
 msgid "All of these files will also be made available for mail merge."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:960
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:9
+msgid "All problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:5
+msgid "All sections"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2145
+msgid "All selected courses are already hidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2214
+msgid "All selected courses are already unhidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:399
 msgid "All selected sets hidden from all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:394
 msgid "All selected sets made visible for all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:946
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:373
 msgid "All sets hidden from all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:945
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:368
 msgid "All sets made visible for all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:619
 msgid "All sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:56
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:54
 msgid "All unassignments were made successfully."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2047
+#: /opt/webwork/webwork2/conf/defaults.config:1948
 msgid "Allow Unicode alternatives in student answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:74
 msgid "Allow the LMS to update user account data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:100 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:68 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:105
 msgid "Allow unassign"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2069
+#: /opt/webwork/webwork2/conf/defaults.config:1970
 msgid "Allowed error, as a percentage, for numerical comparisons"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1886
+#: /opt/webwork/webwork2/conf/defaults.config:1788
 msgid "Allowed to <em>act as</em> another user"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1923
+#: /opt/webwork/webwork2/conf/defaults.config:1825
 msgid "Allowed to change display settings used in pg problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1913
+#: /opt/webwork/webwork2/conf/defaults.config:1815
 msgid "Allowed to change their e-mail address"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1877
+#: /opt/webwork/webwork2/conf/defaults.config:1779
 msgid "Allowed to change their password"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1872
+#: /opt/webwork/webwork2/conf/defaults.config:1774
 msgid "Allowed to login to the course"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1950
+#: /opt/webwork/webwork2/conf/defaults.config:1852
 msgid "Allowed to see solutions before the answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1945
+#: /opt/webwork/webwork2/conf/defaults.config:1847
 msgid "Allowed to see the correct answers before the answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1934
+#: /opt/webwork/webwork2/conf/defaults.config:1836
 msgid "Allowed to view past answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1940
+#: /opt/webwork/webwork2/conf/defaults.config:1842
 msgid "Allowed to view problems in sets which are not open yet"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1572
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:82
+msgid "Allows configuration of certain parameters, such as permission levels, default display mode for equations, and email feedback behavior, on a course by course basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:126
+msgid "Also copy simple configuration file"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:26
 msgid "Amulet of Extension"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:20
+msgid "An achievement evaluator is a perl script that is run after each problem is submitted which returns a truth value of 0 (didn't earn) or 1 (earn). The evaluator is given access to different variables which contain data about the problem and set that is used to determine if the achievement is earned or not."
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:37
 msgid "An address that can be used to log in to the LMS. This is used in messages to users that direct them to go back to the LMS to access something in the WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:43
+msgid "An array which lists the hash reference of all the problems in the current set."
+msgstr ""
+
 #. ($archive_courseID)
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2350 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2647
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1074 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1274
 msgid "An error occured while archiving the course %1:"
 msgstr ""
 
 #. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:658
 msgid "An error occured while changing the title of the course %1."
 msgstr ""
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1795 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1104 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:878
 msgid "An error occured while deleting the course %1:"
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1521
+#. ($rename_oldCourseID,						$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:751
 msgid "An error occured while renaming the course %1 to %2:"
 msgstr ""
 
 #. ($part + 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:106
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:25
 msgid "Answer %1 Score (%):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:425 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:765 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:789 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:812
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:317 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:12 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:24 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:79
 msgid "Answer Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1712
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:39
 msgid "Answer Group Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:59
 msgid "Answer Hash Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:221
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:292
 msgid "Answer Log"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:17
+msgid "Answer Log Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:285
 msgid "Answer Preview"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1465
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:48
+msgid "Answer availability for tests depends on multiple settings.  This only indicates the template answer date has passed.  See set editor for actual availability."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1276
 msgid "Answer(s) submitted:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
 msgid "Answer:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:224
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
 msgid "Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:122
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:127 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:37
 msgid "Answers Available"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1202
 msgid "Answers cannot be due until on or after the open date!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1204
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1197
 msgid "Answers cannot be made available until on or after the close date!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:313
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:21
 msgid "Any changes made below will be reflected in the achievement for ALL students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2259 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:507
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:175 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:69
 msgid "Any changes made below will be reflected in the set for ALL students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:173
 msgid "Any changes made below will be reflected in the set for ONLY the student(s) listed above."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:122 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:159
 msgid "Append"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1849
+#. (tag('strong', dir => 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:71
 msgid "Append to end of %1 set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2264
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:51
+msgid "Applying definitions theoretically and proof writing"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:91
 msgid "Archive"
 msgstr ""
 
 #. ($archive, $n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:892
-msgid "Archive '%1' created successfully (%quant( %2, file))"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:361
+msgid "Archive \"%1\" created successfully (%quant( %2, file))"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1069
-msgid "Archive '%1' deleted"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:525
+msgid "Archive \"%1\" deleted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1846 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2048 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:55 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:1 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:1 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:46 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:51 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:38
 msgid "Archive Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1948 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2005
-msgid "Archive Courses"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:17
+msgid "Archive Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2423
-msgid "Archive next course"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:24 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:32 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:63
+msgid "Archive Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1056
-msgid "Archive this Course"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1158
+msgid "Archive next course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:61
 msgid "Archived Courses"
 msgstr ""
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:202
-msgid "Archiving course as %1.tar.gz. Reload FileManager to see it."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:69
+msgid "Archived course as %1.tar.gz."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:25
+msgid "Archived courses are located inside the \"archives\" directory of the \"admin\" course.  Use the \"File Manager\" to access the .tar.gz files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:26
+msgid "Archived courses are located inside the \"archives\" directory of the \"admin\" course.  Use the \"File Manager\" to upload additional .tar.gz files to be unarchived."
 msgstr ""
 
-#. (CGI::b($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2191
+#. (tag('b', $archive_courseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:57
 msgid "Are you sure that you want to delete the course %1 after archiving? This cannot be undone!"
 msgstr ""
 
-#. (CGI::b($delete_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1736
+#. (tag('b', param('delete_courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:5
 msgid "Are you sure you want to delete the course %1? All course files and data will be destroyed. There is no undo available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:72 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:511
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:64
+msgid "As the checkbox says, this includes a percentage grade column for each set."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:63 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:184
 msgid "Assign"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:225
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:62
 msgid "Assign All Sets to Current User"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:171
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:106
+msgid "Assign achievements"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:43
+msgid "Assign and unassign selected exercise sets to selected users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:54
 msgid "Assign selected sets to selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:919
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:154
+msgid "Assign sets to many students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:116
+msgid "Assign sets to one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:15
 msgid "Assign this achievement to which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1366
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:62
 msgid "Assign this set to which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:165 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:15
 msgid "Assign to All Current Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:3
 msgid "Assign which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:186 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:31 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:94 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:35
 msgid "Assigned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1984
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:19
 msgid "Assigned Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:580
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:218
 msgid "Assigned achievements to users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2154
-msgid "Assigned to"
+#. (link_to(						$c->setCountMessage($db->countUserSets($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:96
+msgid "Assigned to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:212
 msgid "Assignment type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-msgid "Assignments only"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:2004
+#: /opt/webwork/webwork2/conf/defaults.config:1906
 msgid "Assist with the student answer entry process."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:417
 msgid "At least one of the answers above is NOT correct."
 msgstr ""
 
 # Short for "Attempts to Open Children"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:487
 msgid "Att. to Open Children"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:50
 msgid "Attachment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2293
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:107
 msgid "Attempt to upgrade directories"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:375
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:449
 msgid "Attempted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:563 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1416 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1498 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/attempts_row.html.ep:3 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:133 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:73 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:13
 msgid "Attempts"
 msgstr ""
 
@@ -965,970 +1251,1210 @@ msgstr ""
 msgid "Audit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:342 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:348
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:360 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:366 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:460 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:466
 msgid "Authentication failed.  Please speak to your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/InstructorRPCHandler.pm:44 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:43 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:44
+msgid "Authentication failed. Log in again to continue."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:116 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:69
 msgid "Author Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:87
 msgid "Automatic"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2058
+#: /opt/webwork/webwork2/conf/defaults.config:1959
 msgid "Automatically convert Full Width Unicode characters to their ASCII equivalents"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2911
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:97
+msgid "Automatically render all problems in the set on this page when \"Save Changes\" or \"Reset Form\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:667
 msgid "Automatically render problems on page load"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1727
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:95
+msgid "Automatically render problems on page load."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:49
 msgid "Auxiliary Resources"
 msgstr ""
 
-#. ($emailDirectory,$old_default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:350
-msgid "Backup file <code>%1/%2</code> created."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:36 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:179
+msgid "Average Attempts"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:118
+msgid "Average Attempts Per Problem"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:34 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:115
+msgid "Average Percent"
+msgstr ""
+
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:558
+msgid "Backup created on %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:255
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:1
 msgid "Badges"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:942
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:106
 msgid "Basic Search"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:28
+msgid "Before Open Date"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:31
+msgid "Below the file list is a button and options for uploading files. Click the \"Choose File\" button, select the file, then click \"Upload\". A single file or a compressed tar (.tgz) file can be uploaded and if the option is selected, the archive is automatically unpacked and deleted.  Generally the \"automatic\" option on Format will correctly pick the correct type of file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:83
 msgid "Binary"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1271
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+msgid "Both Start and Grade"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:26
 msgid "Box of Transmogrification"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1093
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:40
 msgid "Browse"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:512 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:991
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:7 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:16
 msgid "Browse from:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2161
+#: /opt/webwork/webwork2/conf/defaults.config:2072
 msgid "By default, feedback is always sent to all users specified to recieve feedback.  This variable sets the system to only email feedback to users who have the same section as the user initiating the feedback.  I.e., feedback will only be sent to section leaders."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2151
+#: /opt/webwork/webwork2/conf/defaults.config:2062
 msgid "By default, feedback is sent to all users above who have permission to receive feedback. Feedback is also sent to any addresses specified in this blank. Separate email address entries by commas."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
 msgid "CLOSE DATE"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:217
 msgid "CLOSE TIME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:26
 msgid "Cake of Enlargement"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1891
+#: /opt/webwork/webwork2/conf/defaults.config:1793
 msgid "Can e-mail instructor"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1904
+#: /opt/webwork/webwork2/conf/defaults.config:1806
 msgid "Can report bugs"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1955
+#: /opt/webwork/webwork2/conf/defaults.config:1857
 msgid "Can show old answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1897
+#: /opt/webwork/webwork2/conf/defaults.config:1799
 msgid "Can submit answers for a student"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:275
 msgid "Can't copy file: %1"
 msgstr ""
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:894
-msgid "Can't create archive '%1': command returned %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
+msgid "Can't create archive \"%1\": command returned %2"
 msgstr ""
 
 #. ($courseID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2725
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:28
 msgid "Can't create course environment for %1 because %2"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:423
 msgid "Can't create directory: %1"
 msgstr ""
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1060
-msgid "Can't create file '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+msgid "Can't create file \"%1\": %2"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:948
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:406
 msgid "Can't create file: %1"
 msgstr ""
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1070
-msgid "Can't delete archive '%1': %2"
-msgstr ""
-
-#. ($eUserID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:69
-msgid "Can't get password record for effective user '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:526
+msgid "Can't delete archive \"%1\": %2"
 msgstr ""
 
-#. ($userID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:64
-msgid "Can't get password record for user '%1': %2"
+#. ($setID, $TargetUser->user_id,)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:925
+msgid "Can't generate hardcopy for set \"%1\" for user \"%2\". The set is not visible to students."
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:445
 msgid "Can't open %1"
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1426
 msgid "Can't open file %1"
 msgstr ""
 
 #. ($merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:343
 msgid "Can't read merge file %1. No message sent"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:760
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:298
 msgid "Can't rename file: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:591
 msgid "Can't rename to the same name."
 msgstr ""
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:927
-msgid "Can't unpack '%1': command returned %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:392
+msgid "Can't unpack \"%1\": command returned %2"
 msgstr ""
 
 #. ($fullPath)
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:629 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1895
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:230 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1819
 msgid "Can't write to file %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1015 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1096 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:154 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:462 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:26 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/confirm.html.ep:6 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:69 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:15
 msgid "Cancel"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:387
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:5
+msgid "Cancel E-Mail"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:60
 msgid "Cancel E-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:61 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:97 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:77
 msgid "Cancel Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:79 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
 msgid "Cancel Export"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:93
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
 msgid "Cancel Password"
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:516
+msgid "Cannot find a file path to save to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:501
+msgid "Cannot find a problem record for set $c->{setID} / problem $c->{problemID}"
+msgstr ""
+
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:240
 msgid "Cannot open %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:222
-msgid "Cap Test Time at Set Close Date?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:232
+msgid "Cap Test Time at Set Close Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1456 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1486
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:17 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:14
 msgid "Category"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:516
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:49
+msgid "Category:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:27
 msgid "Cause the selected homework set to count for twice as many points as it normally would."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1272
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:27
 msgid "Causes a homework problem to become a clone of another problem from the same set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:727
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:27
 msgid "Causes a single homework problem to be worth twice as much."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1006
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:48
 msgid "Change Course Title to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:34
 msgid "Change CourseID to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:237 /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:176 /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:134 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:76 /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:25
 msgid "Change Display Settings"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:53
 msgid "Change Email Address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1032
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:62
 msgid "Change Institution to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:374 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:98 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:18
 msgid "Change Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:169
 msgid "Change User Settings"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:35
+msgid "Change a course's ID, Title, or Institution."
+msgstr ""
+
 #. ($rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1092
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
 msgid "Change course institution from %1 to %2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:160
+msgid "Change dates for a homework set for the whole class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:123
+msgid "Change the due date for one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:26
+msgid "Change the due dates for an individual student on this page. Check the checkbox and enter the new date in order to override the date. (You can copy the date format from the date in the right hand column which indicates the date when the homework set is due for the whole class.) Note that you should ensure that the close date is before the answer date. If the close date for a student is extended until after the class answer date for the set, then the answer date for the student must also be set to a later date. "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:141
+msgid "Change the grades on a homework set for one student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:163
+msgid "Change the grading on a homework set for an entire class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:170
+msgid "Change the number of atttempts allowed on a problem."
+msgstr ""
+
 #. ($rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1089
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:508
 msgid "Change title from %1 to %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1362 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:488 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:540
 msgid "Changes abandoned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:371
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:242
 msgid "Changes in this file have not yet been permanently saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:647 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:191 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:529
 msgid "Changes saved"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1822
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:38
+msgid "Changing dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:514
 msgid "Changing the problem seed for display, but there are no problems showing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:635 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:22 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:19
 msgid "Chapter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:320 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1849
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:15 /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:103 /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:37
 msgid "Check Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2476
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:682
 msgid "Check Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:183
-msgid "Check that it's permissions are set correctly."
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:53
+msgid "Choose problems from a library and add them to a homework set."
 msgstr ""
 
-#. ($emailDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:195
-msgid "Check whether it exists and whether the directory %1 can be read by the webserver."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:543
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:40
 msgid "Choose the set which you would like to be worth twice as much."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:44
 msgid "Choose the set which you would like to enable partial credit for."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1206 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:161 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:992
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:44
 msgid "Choose the set which you would like to resurrect."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:259 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:350
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:40 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:40
 msgid "Choose the set whose close date you would like to extend."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:903
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:16
 msgid "Choose visibility of the sets to be affected"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:497
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:15
 msgid "Choose what to do with existing data:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:880
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:3
 msgid "Choose which sets to be affected"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:491
-msgid "Class value"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:17
+msgid "Class List Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:55
+msgid "Class list (\".lst\") files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:334
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:316 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:48 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:37
 msgid "Classlist Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1197
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:91
 msgid "Clear Problem Display"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:693
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:82
 msgid "Click a student's name to see the student's homework set. Click a heading to sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:74
 msgid "Click a student's name to see the student's test summary page. Click a test's version number to see the corresponding test version. Click a heading to sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:614
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:150
+msgid "Click first in the \"Assigned Sets\" column in the student's row. This will take you to a new page where you will click on the link to the homework set where the grade change is to be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:143
+msgid "Click first in the \"Assigned Sets\" column in the student's row. This will take you to a new page where you will click on the link to the homework set where the grade change is to be made. (The grade for each problem is listed as \"status\" on this third page)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:24
+msgid "Click on each of the tabs to view the configuration items. The question mark icon provides access to information about the behavior of the configuration settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:125
+msgid "Click on the column \"Assigned Sets\" in the student's row. This will take you to a page where you can assign and unassign homework sets and change the due dates for homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:33
+msgid "Click on the homework set links to edit the grades for this individual student on the homework set. (The grade of each problem is called the \"status\".) You can also change the number of allowed attempts and further modify the individual student's homework set.) You will also be able to change a student's seed which determines the individual values used in the individual version of the student's problem and the weight (how much a problem counts towards the grade.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:90
 msgid "Click on the login name to edit individual problem set data, (e.g. due dates) for these students."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:62
+msgid "Click the \"Add x student(s)\" radio button and then click \"Take action\". This will take you to a new page where the data can be entered for one or more students. It is also possible to assign the student to one or more problem sets as they are being entered: simply select the homework sets from the list below the data entry table. Use \"command\" or \"control\" click to select more than one homework set."
+msgstr ""
+
+#. ('<i class="fas fa-question-circle"></i>')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:20 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:88
+msgid "Click the %1 icon for page and item specific help."
+msgstr ""
+
+#. ('<a href="#"><i class="fas fa-question-circle"></i></a>')
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:20
+msgid "Click the icon %1 for page and item specific help."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:185
+msgid "Clicking on any active link at the top of the column sorts the page by that column. You can do lexigraphic sorts: click on \"First name\" then \"Last name\" to sort by last name, sorting those with the same last name by their first name."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:132
+msgid "Clicking on the login name link in a student's row allows you to view the student's version of the homework (rather than your own) so that you can more easily answer student questions about homework problems. (A \"acting as xxx\" alert will appear in the upper right corner of each window while you are acting as a student.) You can submit the answers (which will NOT be recorded) to check that the computer is grading the problem correctly. You will also be able to view past answers submitted by the student for each problem. To stop acting in the student's role click the \"Stop acting\" link in the upper right corner of the window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:199
+msgid "Clicking the <strong>e-mail address</strong> link will bring up your standard email application so that you can send email to the student. This works even if the student has been dropped from the course. To send email to an entire class or to merge grades with the email message use the \"Email\" page link in the left margin."
+msgstr ""
+
 #. ($clientIP->ip()
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:541
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:547
 msgid "Client ip address %1 is not allowed to work this assignment, because the assignment has ip address restrictions and there are no allowed locations associated with the restriction.  Contact your professor to have this problem resolved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:713
-msgid "Close"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:316 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:23 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:9 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:75 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:39
+msgid "Close Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:424 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:764 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:788 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:811 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
-msgid "Close Date"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:35
+msgid "Closed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:382
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:208
 msgid "Closed, answers available."
 msgstr ""
 
-#. ($self->formatDateTime($set->answer_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:378
+#. ($c->formatDateTime($set->answer_date, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:204
 msgid "Closed, answers on %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:206
 msgid "Closed, answers recently available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:282
 msgid "Closed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:116
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:121
 msgid "Closes"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date, undef, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:113
-msgid "Closes %1"
-msgstr ""
-
-#. ($self->formatDateTime($verSet->due_date, undef, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:390
+#. ($c->formatDateTime($verSet->due_date, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:227
 msgid "Closes on %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:35 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33 /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:33
 msgid "Closes:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2518
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:357 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:71
 msgid "Collapse All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2529
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:367 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:85
 msgid "Collapse All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2668
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:419
 msgid "Collapse Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2791 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2793
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:572 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:575
 msgid "Collapse Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1715
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:73
+msgid "Collapse problem details to the top row of information about a problem. Note that the details of a single problem can be collapsed by clicking on the up arrow to the right of the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1617
 msgid "Comma separated list of set names that are excluded from all achievements. No achievement points and badges can be earned for submitting problems in these sets. Note that underscores (_) must be used for spaces in set names."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:238 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:245 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:225 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:577 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2047 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:299 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:833 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:862 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:891 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:920
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:131 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:48 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:126 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:49 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:46
 msgid "Comment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:200
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:25 /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:181
 msgid "Comment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:638
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:86
 msgid "Comments"
 msgstr ""
 
-#. ($self->formatDateTime($set->answer_date)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2175
+#. ($c->formatDateTime($c->{set}->answer_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:379
 msgid "Completed results for this assignment are not available until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:382
 msgid "Completed results for this assignment are not available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:427 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:264 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:280
 msgid "Completed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:45
 msgid "Compose Email Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3185
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:47
+msgid "Configure ip ranges (locations) that can be used to restrict set access."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:45
+msgid "Configure which course links appear on the site landing page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:97
 msgid "Confirm"
 msgstr ""
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:107 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:164
+#. ($eUserName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:84 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:41
 msgid "Confirm %1's New Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:579
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:78
 msgid "Confirm Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_export_form.html.ep:1
 msgid "Confirm which sets to export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementEvaluator.pm:288
+#: /opt/webwork/webwork2/templates/AchievementEvaluator/cheevoMessage.html.ep:15
 msgid "Congratulations, you earned a new level!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:258 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2250 /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:64 /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:95
 msgid "Continue"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:86
 msgid "Continue Open Test"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:59
+msgid "Controls if an achievement is evaluated or not."
+msgstr ""
+
 #. ($sourceDirectory, $outputDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1149
-msgid "Copied auxiliary files from %1 to new location at %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:671
+msgid "Copied auxiliary files from %1 to new location at %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:367 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:32 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:42
 msgid "Copy"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
 msgid "Copy file as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:528
-msgid "Copy simple configuration file to new course"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:627
-msgid "Copy templates from:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:112
+msgid "Copy from:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1335
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:82
 msgid "Copy this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:391
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:465 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:301
 msgid "Correct"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:656
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:678
 msgid "Correct Adjusted Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:300
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:287
 msgid "Correct Answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1682
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:19
 msgid "Correct Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1506
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:239 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1317
 msgid "Correct Answers:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:693
 msgid "Correct Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:648
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:93
 msgid "Correct answers"
 msgstr ""
 
 #. ($total_correct, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1004
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:16
 msgid "Correct: %1/%2"
 msgstr ""
 
 #. ($newBlankProblems, $MAX_NEW_PROBLEMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1915
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1843
 msgid "Could not add %1 problems to this set.  The number must be between 1 and %2"
 msgstr ""
 
 #. ($e_user_name, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:83 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:94
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:65 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:74
 msgid "Couldn't change %1's password: %2"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:111
 msgid "Couldn't change your email address: %1"
 msgstr ""
 
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4111
-msgid "Couldn't find OPL Branch %1 in remote %2"
-msgstr ""
-
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4076
-msgid "Couldn't find PG Branch %1 in remote %2"
-msgstr ""
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4014
-msgid "Couldn't find WeBWorK Branch %1 in remote %2"
-msgstr ""
-
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:132
 msgid "Couldn't save your display options: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1463 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:22 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:36
 msgid "Counter"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:424 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:833
-msgid "Counts for Parent"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:66
+msgid "Counter:"
 msgstr ""
 
-#. ($rename_oldCourseID)
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1250 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2186
-msgid "Course %1 database is in order"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:503 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:35
+msgid "Counts for Parent"
 msgstr ""
 
-#. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1257
-msgid "Course %1 databases must be updated before renaming this course."
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:154 /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:9
+msgid "Course Administration"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:778 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:95 /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:138
-msgid "Course Administration"
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:17
+msgid "Course Administration Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:424
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:369 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:80
 msgid "Course Configuration"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:480
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:17
+msgid "Course Configuration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:17
+msgid "Course Home Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:21
 msgid "Course ID"
 msgstr ""
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1370 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2566 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:691
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1223 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:251 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:594
 msgid "Course ID cannot exceed %1 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1227 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:245 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:597
 msgid "Course ID may only contain letters, numbers, hyphens, and underscores."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:956
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:21
 msgid "Course ID:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:100 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:14 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:5
 msgid "Course Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1664 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1961 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2483 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3736
-msgid "Course Name:"
+#. ($c->stash('courseID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:325
+msgid "Course Information for course %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:491
-msgid "Course Title"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:7 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:30
+msgid "Course Listings"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:38 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:38 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:46 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:17
+msgid "Course Name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:204
-msgid "Course archived."
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:28
+msgid "Course Title"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:767 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:418 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:52 /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:12
 msgid "Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1609 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1904 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3674
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:6 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:13
 msgid "Courses are listed either alphabetically or in order by the time of most recent login activity, oldest first. To change the listing order check the mode you want and click \"Refresh Listing\".  The listing format is: Course_Name (status :: date/time of most recent login) where status is \"hidden\" or \"visible\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:76 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:213 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:483 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:7
+msgid "Courses are listed either alphabetically or in order by the time of most recent login activity, oldest first. To change the listing order check the mode you want and click \"Refresh Listing\". The listing format is: Course_Name (status :: date/time of most recent login) where status is \"hidden\" or \"visible\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:67 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:29 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:163 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:84
 msgid "Create"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:41
 msgid "Create CSV"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3054
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:31
 msgid "Create Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1071
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:39
+msgid "Create a .tar.gz archive which includes the course's database and all course files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:33
 msgid "Create a New Set in This Course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:795
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:4
 msgid "Create a new achievement with ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:33
+msgid "Create a new course on this server."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:20
+msgid "Create a new course.  The \"Course ID\" is used as the course name and is used in course links.  Underscores appear as spaces when displaying the course name.  The \"Course Title\" is used as the title on the course home page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:86
+msgid "Create a new set with a given name. This can either create an empty set or a duplicate of an existing set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:12
 msgid "Create as what type of achievement?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:12
 msgid "Create as what type of set?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1866
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:20
+msgid "Create backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:81
 msgid "Create unattached problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1849
-msgid "Creates a gzipped tar archive (.tar.gz) of a course in the WeBWorK courses directory. Before archiving, the course database is dumped into a subdirectory of the course's DATA directory. Currently the archive facility is only available for mysql databases. It depends on the mysqldump application."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:121
+msgid "Create/Delete achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:726
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:26
 msgid "Cupcake of Enlargement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:728
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:38
 msgid "Current"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3042
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:2
 msgid "Currently defined locations are listed below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4352
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2365
 msgid "Database tables are ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:54
 msgid "Database tables need updating."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2753
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:52
 msgid "Database tables ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2826 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2968
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1499
 msgid "Database:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:783
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:153
 msgid "Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:727 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:344 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:355
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:96
+msgid "Dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:40
+msgid "Dates for problem sets can be edited by clicking the pencil icon in the \"Edit Set Data\" column next to the set name. To change dates for several sets at once, click the check box in the \"Select\" column and choose \"Edit selected\" from the tasks above."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:394 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:426 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:37
 msgid "Default"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1675
+#: /opt/webwork/webwork2/conf/defaults.config:1577
 msgid "Default Amount of Time (in minutes) after Due Date that Answers are Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1665
+#: /opt/webwork/webwork2/conf/defaults.config:1567
 msgid "Default Amount of Time (in minutes) before Due Date that the Assignment is Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1785
+#: /opt/webwork/webwork2/conf/defaults.config:1687
 msgid "Default Length of Reduced Scoring Period in minutes"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1655
+#: /opt/webwork/webwork2/conf/defaults.config:1557
 msgid "Default Time that the Assignment is Due"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1808
+#: /opt/webwork/webwork2/conf/defaults.config:1710
 msgid "Default number of attempts before Show Me Another can be used (-1 => Never)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1755 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:77 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:162 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:368 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:91
+#: /opt/webwork/webwork2/conf/defaults.config:1994
+msgid "Default number of attempts before hints are shown in a problem (-1 => hide hints)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:68 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:16 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:34 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:70 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:43 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:89
 msgid "Delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1556 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1651 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1689 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1728 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:1 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:1 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:32 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:49 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:36
 msgid "Delete Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3480
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:17
+msgid "Delete Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:23
+msgid "Delete Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:37
+msgid "Delete a course and all associated data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:109
+msgid "Delete a student from a course"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:52
 msgid "Delete all existing addresses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1989
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:65
+msgid "Delete backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:64
+msgid "Delete backup from %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:54
 msgid "Delete course after archiving. Caution there is no undo!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:49
 msgid "Delete course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2348
 msgid "Delete field when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2809
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:588
 msgid "Delete it?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3055
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:78
 msgid "Delete location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:28
+msgid "Delete oldest backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2321
 msgid "Delete table when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:729
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:90
+msgid "Delete the sets checked below. Be careful, this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:6
 msgid "Delete which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1045
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:6
 msgid "Delete which sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1041
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:6
 msgid "Delete which users?"
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:370 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:394
 msgid "Deleted %1 users."
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:358
 msgid "Deleted %quant(%1,achievement)"
 msgstr ""
 
 #. (join(', ', @delLocations)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3359
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1810
 msgid "Deleted Location(s): %1"
 msgstr ""
 
 #. (join(', ', @toDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3597
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1966
 msgid "Deleted addresses %1 from location."
 msgstr ""
 
-#. ($self->shortPath($self->{tempFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1158
-msgid "Deleting temp file at %1"
+#. ($formatBackupTime)
+#. ($c->formatDateTime($delTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1243 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:569
+msgid "Deleted backup from %1."
+msgstr ""
+
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:679
+msgid "Deleted temp file at %1"
+msgstr ""
+
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1219
+msgid "Deleted temporary file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:125
+msgid "Deleting Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3152
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:68
 msgid "Deletion deletes all location data and related addresses, and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:723
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:3
 msgid "Deletion destroys all achievement-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:185
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
 msgid "Deny From"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1467 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:109 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:116 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:27
 msgid "Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:256
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:71
+msgid "Description:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:69
 msgid "Deselect All Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:229
 msgid "Deselect All Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:428
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:366
 msgid "Didn't recognize action"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:27
 msgid "Directory"
 msgstr ""
 
 #. ($file, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:793
-msgid "Directory '%1' not removed: %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:327
+msgid "Directory \"%1\" not removed: %2"
 msgstr ""
 
 #. ($file, $removed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:792
-msgid "Directory '%1' removed (items deleted: %2)"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:325
+msgid "Directory \"%1\" removed (items deleted: %2)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:412
-msgid "Directory permission errors "
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:33
+msgid "Directory permission errors"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1270 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2213 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2861 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2994
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1439 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1575 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:49 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:44
 msgid "Directory structure is missing directories or the webserver lacks sufficient privileges."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1267 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2210 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2857 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1434 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1570 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:46 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:41
 msgid "Directory structure is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2285
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:102
 msgid "Directory structure needs to be repaired manually before archiving."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1338
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:84
 msgid "Directory structure needs to be repaired manually before renaming."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2750
-msgid "Directory structure or permissions need to be repaired. "
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:48
+msgid "Directory structure or permissions need to be repaired."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2853 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1414 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1540
 msgid "Directory structure:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2536 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:365
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:92
+msgid "Display Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:90 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:372 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:9 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:104
 msgid "Display Mode:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:463
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:37
 msgid "Display Past Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
-msgid "Display of scores for this set is not allowed."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:44
+msgid "Display mode for equations"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:311
+msgid "Display of scores for this test is not allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:589
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:12
 msgid "Display options: Show"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2017
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:48
+msgid "Display sets matching a selected criteria. Useful if there are many sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1918
 msgid "Display the evaluated student answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:176
+#. ('<code>COURSENAME_totals.csv</code>', '<code>COURSENAME_totals_bak1.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:74
+msgid "Do NOT use the file name %1, since you might accidentally overwrite that if you again export your WeBWorK homework scores. (Actually the earlier file is moved to %2 -- so you can recover using the File Manager.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:57
 msgid "Do not unassign students unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:233
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:67
 msgid "Do not uncheck a set unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:173 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:15 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:20
 msgid "Do not uncheck students, unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2450
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:656
 msgid "Do you want to grade this test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2272 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:93
+msgid "Documentation from source code for PG modules and macro files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:105 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:95
 msgid "Don't Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2607
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:13
 msgid "Don't Unarchive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2912
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:46
 msgid "Don't Upgrade"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1749
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:15
 msgid "Don't delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1120
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:24
 msgid "Don't make changes"
 msgstr ""
 
 #. ($saveMode)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:317
 msgid "Don't recognize saveMode: |%1|. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1307 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1321 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1335
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:70 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:78 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:87
 msgid "Don't rename"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:547
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:33
 msgid "Don't use in an achievement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3018 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:683 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1345 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2465 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1595 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:766 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:47 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:13 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:57
 msgid "Done"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:159 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:365 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:51 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:31 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:40 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:8
 msgid "Download"
 msgstr ""
 
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($set->set_id)
 #. ($ver->{id} =~ s/_/ /gr)
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($set->set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:731 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:732 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:413 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:226 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:231 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:203 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:204
 msgid "Download %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:23
 msgid "Download Hardcopy"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:865
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:56
 msgid "Download PDF or TeX Hardcopy for Current Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:764
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:233
 msgid "Download PDF or TeX Hardcopy for Selected Tests"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($selected_set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:595
+#. (tag('span', dir => 'ltr', format_set_name_display($selected_set_id =~ s/,v(\d+)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:58
 msgid "Download hardcopy of set %1 for %2?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:369
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:63
+msgid "Download/upload archived courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:46
 msgid "Download:"
 msgstr ""
 
@@ -1936,286 +2462,339 @@ msgstr ""
 msgid "Drop"
 msgstr ""
 
-#. ($self->formatDateTime($set->reduced_scoring_date, undef, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:107
-msgid "Due %1, after which reduced scoring is available until %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:100
+msgid "Drop student from the course"
 msgstr ""
 
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:310
 msgid "Due date %1 has passed."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2093
+#: /opt/webwork/webwork2/conf/defaults.config:2014
 msgid "E-Mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:315
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:261
 msgid "E-mail Instructor"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2128
-msgid "E-mail addresses which can receive e-mail from a pg problem"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:2138
+#: /opt/webwork/webwork2/conf/defaults.config:2049
 msgid "E-mail feedback from students automatically sent to this permission level and higher"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2109
+#: /opt/webwork/webwork2/conf/defaults.config:2030
 msgid "E-mail verbosity level"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:357
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:43
 msgid "E-mail:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:35
 msgid "Earned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:71 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:158 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:334 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:417 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:547 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2407 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2743 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1628 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1186 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1203 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:62 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:80 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1101 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:30 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:39 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:124 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:215 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:74 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:257 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:479 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:4 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:6 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:53
 msgid "Edit"
 msgstr ""
 
-#. (CGI::a({ href => $basicInfoUrl }, $r->maketext('class list data')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:199
-msgid "Edit %1 for  %2 (%3) who has been assigned %4 sets."
+#. (link_to(maketext('class list data')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:47
+msgid "Edit %1 for %2 (%3) who has been assigned %4 sets."
 msgstr ""
 
-#. (CGI::a({ href => $editUsersAssignedToSetURL }, $r->maketext('individual versions')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2223
-msgid "Edit %1 of set %2."
+#. (link_to(maketext('individual user settings')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:162
+msgid "Edit %1 for set %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:6
 msgid "Edit Assigned Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:40
 msgid "Edit Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1407 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1488
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:19 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:58
 msgid "Edit Evaluator"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:253
 msgid "Edit Header"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3053
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:18
 msgid "Edit Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2741
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:476 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:111
 msgid "Edit Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:5
 msgid "Edit Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:583
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:3
 msgid "Edit Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:421
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:4
 msgid "Edit Set Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1129 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:171
+msgid "Edit Tags"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:30
 msgid "Edit Target Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1487
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:18
 msgid "Edit Users"
 msgstr ""
 
-#. ($user)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:207
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:127
+msgid "Edit achievement evaluator"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:90
+msgid "Edit achievement information"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:65
+msgid "Edit achivements for the course. This link is only present if achievements are enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:42
+msgid "Edit class list data"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:39
+msgid "Edit class roster data. Add students, edit student data, drop students from class, import students from a classlist, and give user professor privileges. Access to individual homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:70
 msgid "Edit data for %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1248
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:46
+msgid "Edit homework sets for entire class. Change homework set due dates, create new sets from a set definition file, create new homework sets, make sets visible/invisible, score homework sets. Assign homework sets to the class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:219
 msgid "Edit it"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2192
-msgid "Edit set %1 data for ALL students assigned to this set."
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:135
+msgid "Edit set %1 for ALL students assigned to this set."
 msgstr ""
 
-#. (CGI::a({href=>$editSetLink},$setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2166
+#. (link_to(						$setID => $c->systemLink(							$setDetailPage, params => { effectiveUser => $user->user_id, editForUser => $user->user_id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:106
 msgid "Edit set %1 for this user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3393
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:95
+msgid "Edit set for %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:4
 msgid "Edit the current value of the location description, if desired, then add and select addresses to delete, and then click the \"Take Action\" button to make all of your changes.  Or, click \"Manage Locations\" above to make no changes and return to the Manage Locations page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:429
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:2
 msgid "Edit which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:829
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:2
 msgid "Edit which sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:935
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:2
 msgid "Edit which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:592
-msgid "Editing <strong>blank problem</strong> in file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:31
+msgid "Editing <strong>course information</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:595
-msgid "Editing <strong>course information</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:30
+msgid "Editing <strong>hardcopy header</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
-msgid "Editing <strong>hardcopy header</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:28
+msgid "Editing <strong>new problem</strong> template."
+msgstr ""
+
+#. ($c->{prettyProblemNumber},				tag('span', dir => 'ltr', format_set_name_display($fullSetName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:45
+msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:29
+msgid "Editing <strong>set header</strong> file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:33
+msgid "Editing <strong>unassigned problem</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:596
-msgid "Editing <strong>options information</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:32
+msgid "Editing <strong>unknown file type</strong> in file \"%1\"."
 msgstr ""
 
-#. ($prettyProblemNumber,			CGI::span({ dir => 'ltr' }, format_set_name_display($fullSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:605
-msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:19
+msgid "Editing Modes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:593
-msgid "Editing <strong>set header</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:140
+msgid "Editing Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:598
-msgid "Editing <strong>unassigned problem</strong> file \"%1\""
+#. ($c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:16
+msgid "Editing achievement in file \"%1\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:597
-msgid "Editing <strong>unknown file type</strong> in file \"%1\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:22
+msgid "Editing for all students"
 msgstr ""
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:209
-msgid "Editing achievement in file '%1'"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:23
+msgid "Editing for one student or a proper subset of all students"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3390
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:1
 msgid "Editing location %1"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display("$setID$vermsg")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2182
-msgid "Editing problem set %1 data for these individual students: %2"
+#. (tag(						'strong',						dir => 'ltr',						format_set_name_display($setID . ($editingSetVersion ? ",v$editingSetVersion" : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:123
+msgid "Editing problem set %1 for these students: %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:315
 msgid "Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:669
-msgid "Editor rows:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:563 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:767 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1668 /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:401 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:229 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:143 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep:13 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:53 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:68
 msgid "Email"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:235 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:126 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:101 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:45 /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:32
 msgid "Email Address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:817
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:170
 msgid "Email Body:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:17
+msgid "Email Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:339
 msgid "Email Instructor On Failed Attempt"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2003
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:28
 msgid "Email Link"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:789
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:112
 msgid "Email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1807 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1832 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:311
+msgid "Email body is empty. No message sent. "
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:994 /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_email.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_form.html.ep:24
 msgid "Email instructor"
 msgstr ""
 
-#. (scalar(@{ $self->{ra_send_to} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:454
-msgid ""
-"Email is being sent to %quant(%1,recipient). You will be notified by email\n"
-"\t\t\t\twhen the task is completed.  This may take several minutes if the class is\n"
-"\t\t\t\tlarge."
+#. (scalar(@{ $c->{ra_send_to} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:27
+msgid "Email is being sent to %quant(%1,recipient). You will be notified by email when the task is completed.  This may take several minutes if the class is large."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:13
+msgid "Email:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:26
+msgid "Emails can contain personalized data, such as name, section, or status.  Click \"List of insertable macros\" for a full list available variables.  Additional personal data can be included by using a merge file.  A merge file is a CSV file located in the [Scoring] directory in which the first column is the student id, followed by additional data (such as student grades).  This data is identified by which column it is in, for instance if the scores where in the 4th column of the merge file, insert them into an email using the variable $COL[4].  The \"Scoring Tools\" page can export grades into a CSV that can be used as a merge file.  Upload customized merge files with the \"File Manager\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:11
 msgid "Emails to be sent to the following:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1704
+#: /opt/webwork/webwork2/conf/defaults.config:1606
 msgid "Enable Achievement Rewards"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1723
+#: /opt/webwork/webwork2/conf/defaults.config:1625
 msgid "Enable Conditional Release"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1689
+#: /opt/webwork/webwork2/conf/defaults.config:1591
 msgid "Enable Course Achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1645
+#: /opt/webwork/webwork2/conf/defaults.config:1547
 msgid "Enable Progress Bar and current problem highlighting"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1734 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:585
+#: /opt/webwork/webwork2/conf/defaults.config:1636 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Enable Reduced Scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1799
+#: /opt/webwork/webwork2/conf/defaults.config:1701
 msgid "Enable Show Me Another button"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:156
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:24 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:92
 msgid "Enable Spell Checking"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1844
+#: /opt/webwork/webwork2/conf/defaults.config:1746
 msgid "Enable periodic re-randomization of problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:416
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:29
 msgid "Enable reduced scoring for a homework set.  This will allow you to submit answers for partial credit for 24 hours after the close date."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1461 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1483
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:14 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:20
 msgid "Enabled"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1846
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:58
+msgid "Enabled:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1748
 msgid "Enables periodic re-randomization of problems after a given number of attempts. Student would have to click Request New Version to obtain new version of the problem and to continue working on the problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1725
+#: /opt/webwork/webwork2/conf/defaults.config:1627
 msgid "Enables the use of the conditional release system.  To use conditional release you need to specify a list of set names on the Problem Set Detail Page, along with a minimum score.  Students will not be able to access that homework set until they have achieved the minimum score on all of the listed sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1801
+#: /opt/webwork/webwork2/conf/defaults.config:1703
 msgid "Enables use of the Show Me Another button, which offers the student a newly-seeded version of the current problem, complete with solution (if it exists for that problem)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:662
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:163
 msgid "End"
 msgstr ""
 
@@ -2223,942 +2802,1248 @@ msgstr ""
 msgid "Enrolled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:788
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:111
 msgid "Enrolled, Drop, etc."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:830 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:859 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:888 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:917
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:128
 msgid "Enrollment Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:21
 msgid "Enter filename below"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:20
 msgid "Enter filenames below"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:19
 msgid "Enter information below for students you wish to add. Each student's password will initially be set to their student ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1997
+#: /opt/webwork/webwork2/conf/defaults.config:1899
 msgid "Enter one of the allowed display mode types above.  See 'display modes entry' for descriptions."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:297
-msgid "Entered"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:34
+msgid "Enter the details of the course instructor to be added when the course is created.  This user will also be added to the admin course with the username \"userID_courseID\" so you can manage and email the instructors of the courses on the server."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:85
-msgid "Entered student:"
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:284
+msgid "Entered"
 msgstr ""
 
-#. ($display_sort_method_name{$primary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:698
+#. ($display_sort_method_name{$primary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:98
 msgid "Entries are sorted by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:247
 msgid "Equation Display"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:61
+msgid "Equation Editor"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1516
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1460
 msgid "Error adding set-level proctor: %1"
 msgstr ""
 
+#. ($fromPath, $toPath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:664
+msgid "Error copying %1 to %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:14
+msgid "Error details"
+msgstr ""
+
+#. ($filePath, stash('podError')
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:27
+msgid "Error generating POD for file %1: %2"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1492
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1437
 msgid "Error getting old set-proctor password from the database: %1.  No update to the password was done."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:31
 msgid "Error message:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2235
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:12
 msgid "Error messages"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1616
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:754
 msgid "Error: Answer date must come after close date in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:747
 msgid "Error: Close date must come after open date in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1634
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:778
 msgid "Error: Reduced scoring date must come between the open date and close date in set %1"
 msgstr ""
 
-#. ($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2067
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:7
 msgid "Error: The original file %1 cannot be read."
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1240 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1240 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:738
 msgid "Error: answer date cannot be more than 10 years from now in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1236 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1235 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:733
 msgid "Error: close date cannot be more than 10 years from now in set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:630
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:234
 msgid "Error: no file data was submitted!"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1232 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1599
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1230 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:728
 msgid "Error: open date cannot be more than 10 years from now in set %1"
 msgstr ""
 
-#. ($problem_desc, $problem_name, CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1404
+#. ($problem_desc, $problem_name, $c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1210
 msgid "Errors encountered while processing %1. This %2 has been omitted from the hardcopy. Error text: %3"
 msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3832
-msgid "Errors occured while hiding the courses listed below when attempting to create the file hide_directory in the course's directory. Check the ownership and permissions of the course's directory, e.g %1"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:8
+msgid "Errors occured while generating hardcopy:"
+msgstr ""
+
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2128
+msgid "Errors occured while hiding the courses listed below when attempting to create the file hide_directory in the course's directory. Check the ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3920
-msgid "Errors occured while unhiding the courses listed below when attempting delete the file hide_directory in the course's directory. Check the ownership and permissions of the course's directory, e.g %1"
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2197
+msgid "Errors occured while unhiding the courses listed below when attempting delete the file hide_directory in the course's directory. Check the ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1468
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:28
 msgid "Evaluator File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3839
-msgid "Except for possible errors listed above, all selected courses are already hidden."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:76
+msgid "Evaluator File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:28
+msgid "Evaluator Variables"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2143
+msgid "Except for the errors listed above, all selected courses are already hidden."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3904
-msgid "Except for possible errors listed above, all selected courses are already unhidden."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2212
+msgid "Except for the errors listed above, all selected courses are already unhidden."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3456
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:39
 msgid "Existing addresses for the location are given in the scrolling list below.  Select addresses from the list to delete them:"
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2281
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1460
 msgid "Existing file %1 could not be backed up and was lost."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2514
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:354 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:65
 msgid "Expand All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:364 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:78
 msgid "Expand All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2667
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:418
 msgid "Expand Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2792
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:574
 msgid "Expand Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:74 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:89
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:67
+msgid "Expand problem details that have been collapsed. Note that the details of a single problem can be expanded by clicking on the down arrow to the right of the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:65 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:71
 msgid "Export"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1098
-msgid "Export selected achievements."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:113
+msgid "Export achievement data"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_export_form.html.ep:1
+msgid "Export selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1267
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:17
 msgid "Export to what kind of file?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:2
 msgid "Export which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1245
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:5
 msgid "Export which users?"
 msgstr ""
 
 #. ($FileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1151
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:591
 msgid "Exported achievements to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1616
-msgid "Extend the close date for which Gateway?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:48
+msgid "Extend the close date for which test?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:148
+msgid "Extend the number of attempts allowed a student on a given problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1573
-msgid "Extends the close date of a gateway test by 24 hours. Note: The test must still be open for this to work."
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:28
+msgid "Extends the close date of a test by 24 hours. Note: The test must still be open for this to work."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "FIRST NAME"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Failed to add user:"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:416
 msgid "Failed to create new achievement: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:373
 msgid "Failed to create new achievement: no achievement ID specified!"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:573
 msgid "Failed to create new set: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1158
-msgid "Failed to create new set: no set name specified!"
+#. ($newSetID =~ s/_/ /gr)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:482
+msgid "Failed to create new set: Invalid characters in set name \"%1\". A set name may only contain letters, numbers, hyphens, periods, and spaces."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:474
+msgid "Failed to create new set: No set name specified."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1155
-msgid "Failed to create new set: set name cannot exceed 100 characters."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:469
+msgid "Failed to create new set: Set name cannot exceed 100 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:396
 msgid "Failed to duplicate achievement: no achievement selected for duplication!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:530
 msgid "Failed to duplicate set: no set selected for duplication!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:74
-msgid "Failed to enter student:"
+#. ($@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:67
+msgid "Failed to generate course archive: %1"
 msgstr ""
 
 #. ($scoreFilePath)
 #. ($filePath)
 #. ($FilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1125 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:649 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:955 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2402
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:255 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:567 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1584
 msgid "Failed to open %1"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:227
 msgid "Failed to save: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:214 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#. ($_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:253
+msgid "Failed to send message: %1"
+msgstr ""
+
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:285 /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:23 /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:36
 msgid "False"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1919
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:63
 msgid "Feature exhausted for this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:200
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:23
+msgid "Features:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:252
 msgid "Feedback"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2159
+#: /opt/webwork/webwork2/conf/defaults.config:2070
 msgid "Feedback by Section."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:234
 msgid "FeedbackMessage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1177 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2113 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2284
 msgid "Field is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1173 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2109 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2286
 msgid "Field missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1175 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2111 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4290
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
 msgid "Field missing in schema"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:599
-msgid "File '%1' exists.  File not saved.  No changes have been made."
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:266
+msgid "File \"%1\" exists.  File not saved.  No changes have been made."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1926
-msgid "File '%1' exists. File not saved. No changes have been made.  You can change the file path for this problem manually from the 'Hmwk Sets Editor' page"
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1036
+msgid "File \"%1\" exists. File not saved. No changes have been made."
 msgstr ""
 
-#. ($file,$!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:796
-msgid "File '%1' not removed: %2"
+#. ($file, $!)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:333
+msgid "File \"%1\" not removed: %2"
 msgstr ""
 
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:795
-msgid "File '%1' successfully removed"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+msgid "File \"%1\" successfully removed"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1066
-msgid "File '%1' uploaded successfully"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:522
+msgid "File \"%1\" uploaded successfully"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:476
 msgid "File <b>%1</b> already exists. Overwrite it, or rename it as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:364 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:55 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:70
 msgid "File Manager"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:628
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:17
+msgid "File Manager Help"
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:541
+msgid "File not saved. Failed to open \"%1\" for writing."
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:528
+msgid "File not saved. The file \"%1\" is not contained in the templates directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:921
+msgid "File not saved. The file name for this problem does not match the file name the editor was opened with. The problem set may have changed. Please reopen this file from the homework sets editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:228
 msgid "File saved"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:733
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:272
 msgid "File successfully copied"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:758
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:295
 msgid "File successfully renamed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:29
 msgid "Filename"
 msgstr ""
 
-#. ($extension,$location)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1296
-msgid "Files with extension '.%1' usually belong in '%2'"
+#. ($extension, $location)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:699
+msgid "Files with extension \".%1\" usually belong in \"%2\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:20
+msgid "Fill out the form below to add, edit, or delete locations.  Locations are used to restrict access to sets based on ip address.  Locations are configured here in the administration course, then used in a normal course.  When configuring a set to use a restricted ip address, the instructor can choose to either restrict access to the location or deny access from a location, which are identified by their name.  Instructors can select multiple locations to restrict access to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:78 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:47
 msgid "Filter"
 msgstr ""
 
 #. ($recitation)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1184 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1112
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1420 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:913
 msgid "Filter by recitation %1"
 msgstr ""
 
 #. ($section)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1180 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1416 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:910
 msgid "Filter by section %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:733
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:31
 msgid "Filter by what text?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:173 /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:151
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:17
 msgid "Filter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:749
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:137
 msgid "First"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:593 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:232 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1992 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:292 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:827 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:856 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:885 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:914
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:124 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:87 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:42 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:21
 msgid "First Name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:107
 msgid "First name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:226
-msgid "For security reasons, you cannot specify a message file from a directory higher than the email directory (you can't use ../blah/blah for example). Please specify a different file or move the needed file to the email directory"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:178
+msgid "For security reasons, you cannot specify a message file from a directory higher than the email directory (you can't use ../blah/blah for example). Please specify a different file or move the needed file to the email directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:30
+msgid "Force editor to RTL"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2928
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:674 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:101
 msgid "Force problems to be numbered consecutively from one"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:409
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:35
+msgid "Form Elements Present on the Page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:75
 msgid "Format"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2096
+#: /opt/webwork/webwork2/conf/defaults.config:2017
 msgid "Format for the subject line in feedback e-mails"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:172 /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:133
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:10
 msgid "Format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:12
 msgid "Found no directories containing problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1112
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:48 /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:43
 msgid "From This Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:318
 msgid "From field must contain one valid email address."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:340 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:621
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:20
+msgid "From this page you can <strong>add new students</strong>, <strong>edit</strong> class list data (name, email address, recitation, section, permission level, and enrollment status), <strong>change passwords</strong>, and <strong>export</strong> (save) class lists for back-up or use in another course. You can also delete students from the class roster, but this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:33 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:34
 msgid "From:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:59
 msgid "GLOBAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1512 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1619 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1728
-msgid "Gateway Name"
+#: /opt/webwork/webwork2/conf/defaults.config:1427
+msgid "General"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:210
-msgid "Gateway Quiz %2"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:201 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:30
+msgid "General Information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:853
-msgid "Gateway parameters"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:116
+msgid "General Page Information"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1525
-msgid "General"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:121 /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:171 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:166 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:167 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:42 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:43 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:113
+msgid "Generate Hardcopy"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2305
-msgid "General Information"
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:73
+msgid "Generate Hardcopy for Selected Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:745 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:669 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:670 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:221 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:222
-msgid "Generate Hardcopy"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:115
+msgid "Generate a hardcopy of the problem being edited. This does not change the permanent file on the disk. You can generate a hardcopy for different versions of the same problem by changing the seed. You can also change the format to \"PDF\" or \"TeX Source\". If \"PDF\" is selected, then a PDF file will be generated for download, unless there are errors. If errors occur or \"TeX Source\" is selected, then a zip file will be generated for download that contains the TeX source file and resources needed for generating the PDF file using pdflatex."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:262
-msgid "Generate Hardcopy for Selected Sets"
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:20
+msgid "Generate hardcopies of assignments in PDF or latex format. To produce a hardcopy, one selects the users on the left and the sets on the right. All users and sets are listed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:744
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:170
 msgid "Generate hardcopy for selected sets and selected users"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:184 /opt/webwork/pg/macros/problemRandomize.pl:185
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:186 /opt/webwork/pg/macros/deprecated/problemRandomize.pl:187
 msgid "Get a new version of this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:986
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:2
 msgid "Give new password to which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1063
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:27
 msgid "Gives full credit on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1180
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:27
 msgid "Gives full credit on every problem in a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:846
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:27
 msgid "Gives half credit on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:27
 msgid "Gives half credit on every problem in a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:62
 msgid "Global Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1422
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:76
 msgid "Global Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:49
 msgid "Global Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:51
 msgid "Global data on problem usage is contributed by many institutions using WeBWorK all over the world. The Usage figure is the total number of  individuals who have attemped this problem at least once. A high figure represents a problem which has been assigned to many students and is  both popular with instructors and likely bug free."
 msgstr ""
 
 #. ($problemID, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1549
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1489
 msgid "Global problem %1 for set %2 not found."
 msgstr ""
 
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:334
+#. ($c->{prettyID}, $c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:378
+msgid "Global problem %1 not found for set %2."
+msgstr ""
+
+#. ($c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:142 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:372
 msgid "Global set %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2093
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:77
 msgid "Global set data will be shown instead of user specific data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:28
 msgid "Go"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:483
 msgid "Go back to Part 1"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:291 /opt/webwork/pg/macros/compoundProblem.pl:480 /opt/webwork/pg/macros/compoundProblem.pl:491
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:293 /opt/webwork/pg/macros/core/compoundProblem.pl:498 /opt/webwork/pg/macros/core/compoundProblem.pl:512
 msgid "Go on to next part"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2651
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:544
 msgid "Grade"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2649 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:383 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:970
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:541 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:75
 msgid "Grade Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2446
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:651
 msgid "Grade Test"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:148
+msgid "Grade of Active Students"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:55
 msgid "Grade passback mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:837
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:38
 msgid "Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:236
 msgid "Grades"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:110
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:17
+msgid "Grades Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:115
 msgid "Grades have been saved for all current users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:221
-msgid "Grading assignment:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:28
+msgid "Grading Assignment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1062
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:152
+msgid "Grading Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:26
 msgid "Greater Rod of Revelation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1179
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:26
 msgid "Greater Tome of Enlightenment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:285
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:50
+msgid "Groups types of achievements. The \"level\" and \"secret\" categories are special (described above), and categories can be used to create achievement chains."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:74
 msgid "Guest Login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2251
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:86
+msgid "Guest:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:33
 msgid "HTTP Headers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:682
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:35
+msgid "Hardcopy Format"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:115
 msgid "Hardcopy Format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:270 /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:279 /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:285
 msgid "Hardcopy Generator"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:101
 msgid "Hardcopy Header"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1623 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:724
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:324
+msgid "Hardcopy Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:17
+msgid "Hardcopy Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1525 /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:153 /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:44
 msgid "Hardcopy Theme"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:408
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:427
 msgid "Hardcopy will always print the original version of the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:229 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:31
 msgid "Headers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1048
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:49 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:296
 msgid "Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:797 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:868 /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:19 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:35 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:20 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:44 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:74 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:107 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:22 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:51 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:170
 msgid "Help Icon"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:542
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:30
+msgid "Here is a list of the variables the evaluator has access to. Unless indicated, changes to the variables will not be saved.  Evaluators are run in the same order they are listed on the achievement editor page and are only run if the achievement has not been earned. Keep this in mind when using persistent global data."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:507
 msgid "Here is a new version of your problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:914
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:20 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:42
 msgid "Hidden"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:347 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:62
 msgid "Hide All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3663 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3718 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3760 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:384
-msgid "Hide Courses"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:17
+msgid "Hide Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:428
-msgid "Hide Hints"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:27 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:1 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:38 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:57 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:44
+msgid "Hide Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:477
 msgid "Hide Hints from Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1566
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:63
+msgid "Hide all rendered problems on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:252
 msgid "Hide this problem"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1523 /opt/webwork/pg/macros/core/PGbasicmacros.pl:1524
 msgid "Hint:"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1522
 msgid "Hint: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:658 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1771
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:99 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:51
 msgid "Hints"
 msgstr ""
 
 # Hmwk is short for Homework
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:364
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:327 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:44
 msgid "Hmwk Sets Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:775 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:779 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:80 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:106 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:108 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:12 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:14 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:19
 msgid "Homework Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:38
 msgid "Homework Totals"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1432
-msgid "I couldn't find the file [ACHEVDIR]/surprise_message.txt!"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:17
+msgid "Homwork Sets Editor Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1451
-msgid "Icon"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:88 /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:31
+msgid "How to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1469
-msgid "Icon File"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:36
+msgid "I couldn't find the file [ACHIEVEMENT_DIR]/surprise_message.txt!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:612
-msgid "If a password field is left blank, the student's current password will be maintained."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:9
+msgid "Icon"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
-msgid "If this flag is set then this problem will count towards the grade of its parent problem.  In general the adjusted status on a problem is the larger of the problem's status and the weighted average of the status of its child problems which have this flag enabled."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:29
+msgid "Icon File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
-msgid "If this is enabled then instructors with the ability to receive feedback emails will be notified whenever a student runs out of attempts on a problem and its children without receiving an adjusted status of 100%."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:80
+msgid "Icon File:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:292
-msgid "If this is enabled then students will be unable to attempt a problem until they have completed all of the previous problems, and their child problems if necessary."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:24
+msgid "If \"PDF\" is selected, then a PDF file will be generated for download, unless there are errors.  If errors occur generating a PDF file or \"TeX Source\" is selected then a zip file will be generated for download that contains the TeX source file and resources needed for generating the PDF file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:37
+msgid "If \"TeX Source\" is selected, a zip file containing a TeX file and other files needed to generate a PDF hardcopy will be produced. If \"Adobe PDF\" is selected then only a PDF file will be produced."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:84
+msgid "If a password field is left blank, the student's current password will be maintained."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:42
+msgid "If selected, the file path of the problem source will be printed in the output."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:38
+msgid "If selected, this adds spaces between the fields to align the commas, which makes the columns easy to read when in text form but it can confuse some spreadsheet applications since the extra spaces violate the csv standard (although Excel handles them with no problem). This will give a visual form of the CSV file that is easy to read on the page. If you want a reliable .csv file for use in any spreadsheet application unclick the \"Pad Fields\" option. You can download the .csv file immediately by clicking on the link with the filename chosen above, or you can download it using the \"File Manager\" from the scoring directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:148
+msgid "If the original problem can not be edited than the path name must be changed in order to be allowed to save the problem. Adding \"local/\" to the beginning of the original path is the default solution. All locally created and edited files will then appear in a subdirectory named \"local\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:513
+msgid "If this flag is set then this problem will count towards the grade of its parent problem.  In general the adjusted status on a problem is the larger of the problem's status and the weighted average of the status of its child problems which have this flag enabled."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
+msgid "If this is enabled then instructors with the ability to receive feedback emails will be notified whenever a student runs out of attempts on a problem and its children  without receiving an adjusted status of 100%."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:334
+msgid "If this is enabled then students will be unable to attempt a problem until they have completed all of the previous problems, and their child problems if necessary."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:57
+msgid "If this is selected, a success index is listed in each csv file. The success index is a number assigned on the basis of the number of incorrect attempts (roughly equivalent to 1/the number of attempts) which seems to correlate with the relative difficulty the student had with the problem."
 msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:47
 msgid "If this is set, all users (including the instructor) must enter the WeBWorK course through the LMS. If a user reaches the regular WeBWorK login screen, they receive a message directing them back to the LMS."
 msgstr ""
 
-#. (CGI::b($r->maketext("Remember Me")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:201
+#. (tag('strong', maketext('Remember Me')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:33
 msgid "If you check %1 your login information will be remembered by the browser you are using, allowing you to visit WeBWorK pages without typing your user name and password (until your session expires). This feature is not safe for public workstations, untrusted machines, and machines over which you do not have direct control."
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:407
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:154
+msgid "If you click on the \"Grade Problem\" icon to the right of the problem number, then the problem will open in the manual problem grader. This page shows the rendered problem and lists all students assigned to the set and the last answer the students entered for the problem. You can then change the recorded scores for students on this problem and provide instructor feedback comments."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:148
+msgid "If you click on the \"Open in New Window\" icon to the right of the problem number, then the problem will open in the actual homework set in a new tab or window."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:425
 msgid "If you come back to it later, it may revert to its original version."
 msgstr ""
 
+#. ('<code>report_grades_data.csv</code>', '<code>report_grade.msg</code>', '<code>$COL</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:80
+msgid "If you upload your file on the web with the name: %1 and also create an email message with the name %2 with the approriate %3 variables then not only can you email the message with the embedded grades to the students, but files with those exact names are automatically appended to the \"Grades\" page seen by the students."
+msgstr ""
+
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:798
-msgid "Illegal file '%1' specified"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:337
+msgid "Illegal file \"%1\" specified"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1445
 msgid "Illegal filename contains '..'"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:73 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:64 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:63
 msgid "Import"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:901 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1291
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:65
+msgid "Import a single set or multiple sets from a set definition file. (Use the \"File Manager\" to upload/download set definition files.) The \"Shift Dates...\" option is useful for problem sets that were used from other courses and will shift all of the dates."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:3 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:16
 msgid "Import from where?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1270
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:5
 msgid "Import how many sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:31
 msgid "Import sets with names"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:5
 msgid "Import users from what file?"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:99
+msgid "Import/export achievements"
+msgstr ""
+
 #. ($count)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:516
 msgid "Imported %quant(%1,achievement)"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:25
+msgid "In both cases, one can select the sort field, the format of the display list, and the filter. \"Change Display Settings\" must be clicked to update the list."
+msgstr ""
+
 #. ($total_inprogress, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1019
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:28
 msgid "In progress: %1/%2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:47
 msgid "Inactive"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1601
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:51
+msgid "Inactive Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1503
 msgid "Inactivity time before a user is required to login again"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:42
 msgid "Include Contrib"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:35
 msgid "Include OPL"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:32 /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:55
 msgid "Include Success Index"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:52 /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:62
 msgid "Include percentage grades columns for all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:471 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:302
 msgid "Incorrect"
 msgstr ""
 
 #. ($total_incorrect, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1033
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:36
 msgid "Incorrect: %1/%2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:26
+msgid "Indicates the number of problems in the set. Clicking on the link opens the set detail page which allows you to modify set parameters, edit set headers, and change parameters of problems in the set such as the number of allowed attempts or the weight (credit value). You can also add, remove, view, edit, and reorder the problems in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:141
+msgid "Individual Problem Results"
+msgstr ""
+
 # Short for Initial
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:41
 msgid "Init"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:502
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:35
 msgid "Institution"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2344
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:560
 msgid "Instructor Comment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1494
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1306
 msgid "Instructor Feedback:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:311
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:17
+msgid "Instructor Links Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:298 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:29
 msgid "Instructor Tools"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1228
-msgid "Instructor solution preview: show the student solution after due date."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:17
+msgid "Instructor Tools Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:377
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:90
+msgid "Instructor:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:326
 msgid "Invalid Reply-to address."
 msgstr ""
 
 #. ($output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:229
-msgid "Invalid file name. The file name \"%1\" does not have a \".msg\" extension All email file names must end in the extension \".msg\" choose a file name with a \".msg\" extension. The message was not saved."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:187
+msgid "Invalid file name \"%1\". All email file names must end with the \".msg\" extension.  Choose a file name with the \".msg\" extension. The message was not saved."
 msgstr ""
 
 #. ($headerType)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1951
 msgid "Invalid headerType %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:177 /opt/webwork/webwork2/lib/WeBWorK/Authen/XMLRPC.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:173
 msgid "Invalid user ID or password."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2234 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2244
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:34
+msgid "It is important that students enter an email address or they will not recieve any of the important emails sent by the instructor. The email address will only be present on the page if the user has permission to change the email address."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:20
+msgid "It lists the homework problem sets available for the students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:461 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:472
 msgid "Jump to Problem:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:867
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:939
 msgid "Just-In-Time parameters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:130
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:85
+msgid "Key Map"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:14
 msgid "Key Map:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:93
 msgid "Keywords:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "LAST NAME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1477
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:119
 msgid "LOCAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:100
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:103
 msgid "LTI"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1548
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:25
+msgid "LTI Grade Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:460 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:75
+msgid "LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:17
+msgid "LTI Grade Update Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:16
+msgid "LTI grade passback is not enabled for this course"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:63
+msgid "LTI update of all users and sets queued."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:64
+msgid "LTI update of all users queued."
+msgstr ""
+
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:58
+msgid "LTI update of set %1 queued."
+msgstr ""
+
+#. ($userID, $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:56
+msgid "LTI update of user %1 and set %2 queued."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:60
+msgid "LTI update of user %1 queued."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1450
 msgid "Language (refresh page after saving changes to reveal new language.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:758
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:140
 msgid "Last"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:460
 msgid "Last Answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:604 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:231 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2001 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:293 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:828 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:857 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:886 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:915
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:31
+msgid "Last Full Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:125 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:94 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:41 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:25
 msgid "Last Name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:792
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:115
 msgid "Last column of merge file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:785
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:108
 msgid "Last name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:242
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:118 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:237
 msgid "Latest Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1603
-msgid "Length of time, in seconds, a user has to be inactive before he is required to login again.<p>This value should be entered as a number, so as 3600 instead of 60*60 for one hour"
+#: /opt/webwork/webwork2/conf/defaults.config:1505
+msgid "Length of time, in seconds, a user has to be inactive before he is required to login again. This value should be entered as a number, so as 3600 instead of 60*60 for one hour."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:845
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:26
 msgid "Lesser Rod of Revelation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:965
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:26
 msgid "Lesser Tome of Enlightenment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:141
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:15
 msgid "Level Progress:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:881
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:77
 msgid "Level:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:912 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2060 /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:433
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:17
+msgid "Library Broswer Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:359 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:52
 msgid "Library Browser"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1977
-msgid "List of display modes made available to students"
+#. ($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:30
+msgid "Link to Edit Page for %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2130
-msgid "List of e-mail addresses to which e-mail can be sent by a problem. Professors need to be added to this list if questionaires are used, or other WeBWorK problems which send e-mail as part of their answer mechanism."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:25
+msgid "Links to pages that give information about writing problems:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1879
+msgid "List of display modes made available to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:759 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:774
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:89 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:96
 msgid "List of insertable macros"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1826
+#: /opt/webwork/webwork2/conf/defaults.config:1728
 msgid "List of options for Show Me Another button"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1713
+#: /opt/webwork/webwork2/conf/defaults.config:1615
 msgid "List of sets excluded from achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1483
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:56
+msgid "Live equation rendering"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:144
+msgid "Loading..."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:122
 msgid "Local Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:45 /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:41
 msgid "Local Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1504
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:136
 msgid "Local Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:105
 msgid "Local Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1467
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:114
 msgid "Local data is generated when your systems admin runs the script update-OPL-statistics."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1460
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:107
 msgid "Local data on problem usage is generated and maintained by your institution. The Usage figure is the total number of local individuals who have attemped this problem at least once. A high figure represents a problem which has been assigned to many students and is  both popular with instructors and likely bug free."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:115
 msgid "Location"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3501 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1854 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1890
 msgid "Location %1 does not exist in the WeBWorK database.  Please check your input (perhaps you need to reload the location management page?)."
 msgstr ""
 
 #. ($locationID, join(', ', @addresses)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1742
 msgid "Location %1 has been created, with addresses %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3353
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1798
 msgid "Location deletion requires confirmation."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3106 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3409
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:17 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:43
 msgid "Location description:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3089
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:37
 msgid "Location name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:159
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:27
+msgid "Locations are a list of ip addresses.  Ip addresses can be a single address (e.g. 192.168.1.101), a range of ip address (e.g. 192.168.1.101-192.168.1.150), or an ip address mask (e.g. 192.168.1.0/24). Enter one ip address per line, using as many lines as needed for each location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:32
+msgid "Locations are edited by adding new ip addresses to the location, or deleting existing address.  You must select the confirm checkbox when deleting a location, and this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:43
+msgid "Locations of files:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:18
 msgid "Log In Again"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1124 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:11
 msgid "Log Out"
 msgstr ""
 
@@ -3166,268 +4051,355 @@ msgstr ""
 #. ($rename_oldCourseID)
 #. ($rename_newCourseID)
 #. ($new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1458 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1541 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2666 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:913
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1292 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:474 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:704 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:780
 msgid "Log into %1"
 msgstr ""
 
-#. (HTML::Entities::encode_entities($prettyUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1122 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1130
+#. ($userName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:9
 msgid "Logged in as %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:790
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:181 /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:187 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:113
 msgid "Login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:87 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:58
 msgid "Login Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:187 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:234 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:815 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1980 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:291 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:826 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:855 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:884 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:913 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:123 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:32 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:44 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:190 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:15 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:36
 msgid "Login Name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:18
 msgid "Login Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:6
+msgid "Login:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:225
 msgid "Logout"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Macro"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:763
-msgid "Main Menu"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:97
+msgid "Macro (\".pl\") files containing additional functionality for your course can be stored here."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:163 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:369
+#. ($filePath)
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:29
+msgid "Macro file %1 not found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:44 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:44 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:46
 msgid "Make Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:27
 msgid "Make changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1115
-msgid "Make these changes in  course:"
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:15
+msgid "Make these changes in course: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:137
+msgid "Makes a new copy of the file you are editing at the location relative to the course's templates ([TMPL]) directory. You may choose to replace the current problem in the current set, append to the end to then end of the current set as a new problem, or create a problem that is not attached to a problem set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3040 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:28 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:1 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:46
 msgid "Manage Locations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:748 /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:394
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:17
+msgid "Manage Locations Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:20
+msgid "Manage achievements for the course.  The actions allow one to edit, assign, import, export, score, create, or delete achievements.  The action form is at the top to select the desired action and options to perform when the submit button is pressed.  Below the action form is the list of all the achievements, ordered by their achievement \"Number\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:56
+msgid "Manage administration course files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:50
+msgid "Manage instructors.  When instructors are added to a newly created course, they are also added to the admin course with username \"userID_courseID\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:344 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:192
 msgid "Manual Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:233
-msgid "Mark All"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:17
+msgid "Manual Grader Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($c->stash->{set}->set_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:205
+msgid "Manual Grader for %1: Problem %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:77
+msgid "Manually initiate an LTI grade passback for selected sets or users. This link is only visible if LTI grade passback is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:175
+msgid "Many of these editing activities can also be done more quickly from the \"Instructor Tools\" page where students and homework sets can be selected simultaneously. The \"Instructor Tools\" page is useful for quick editing of one or two students. The initial setup of the class can be done best from this page. Importing and exporting class lists can only be done from this page. Deleting students can only be done from this page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:120
 msgid "Mark Correct"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2822
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:598
 msgid "Mark Correct?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:681
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:19
 msgid "Match on what? (separate multiple IDs with commas)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:499
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:85 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:36
 msgid "Math Objects"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:327
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:377
 msgid "Max attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:380
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:24
 msgid "Max. Shown:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1817
+#: /opt/webwork/webwork2/conf/defaults.config:1719
 msgid "Maximum times Show me Another can be used per problem (-1 => unlimited)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:606
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:4
+msgid "Merge file data:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:24
 msgid "Merge file:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:288
 msgid "Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:578
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:13
 msgid "Message file:"
 msgstr ""
 
-#. ($emailDirectory, $output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:357
-msgid "Message saved to file <code>%1/%2</code>."
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:300
+msgid "Message saved to file %1."
 msgstr ""
 
-#. ($recipient, $ur->email_address)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:995
+#. ($recipient, $user_record->email_address)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:98
 msgid "Message sent to %1 at %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2249 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2324
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:121
+msgid "Message was blank."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:48
+msgid "Messages can be saved to a message file (which must end in the \".msg\" extension).  Use the \"Message file\" drop down menu to select which message file to load, or \"None\" to use a blank message. To save a new message, use the \"Save as\" button after entering in a valid filename.  The \"Save as\" button will not overwrite currently saved messages.  To edit a currently saved message first select it using the drop down menu, then click the \"Save\" button to save any changes.  Use the \"File Manager\" to delete messages, located in the \"[TMPL]/email\" directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:25 /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:22
 msgid "Method"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3284
-msgid "Missing required input data. Please check that you have filled in all of the create location fields and resubmit."
+#: /opt/webwork/webwork2/conf/defaults.config:2003
+msgid "Method to enter problem scores in the single problem manual grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1555
-msgid "Mode in which the LANG and DIR settings for a single problem are determined."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1668
+msgid "Missing required input data. Please check that you have filled in all of the create location fields and resubmit."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1557
-msgid "Mode in which the LANG and DIR settings for a single problem are determined.<p>The system will set the LANGuage attribute to either a value determined from the problem, a course-wide default, or the system default, depending on the mode selected. The tag will only be added to the DIV enclosing the problem if it is different than the value which should be set in the main HTML tag set for the entire course based on the course language.<p>There are two options for the DIRection attribute: \"ltr\" for left-to-write sripts, and \"rtl\" for right-to-left scripts like Arabic and Hebrew.<p>The DIRection attribute is needed to trigger proper display of the question text when the problem text-direction is different than that used by the current language of the course. For example, English problems from the library browser would display improperly in RTL mode for a Hebrew course, unless the problen Direction is set to LTR.<p>The feature to set a problem language and direction was only added in 2018 to the PG language, so most problems will not declare their language, and the system needs to fall back to determining the language and direction in a different manner. The OPL itself is all English, so the system wide fallback is to en-US in LTR mode.<p>Since the defaults fall back to the LTR direction, most sites should be fine with the \"auto::\" mode, but may want to select the one which matches their course language. The mode \"force::ltr\" would also be an option for a course which runs into trouble with the \"auto\" modes.<p>Modes:<br><ul><li>\"none\" prevents any additional LANG and/or DIR tag being added. The browser will use the main setting which was applied to the entire HTML page. This is likely to cause trouble when a problem of the other direction is displayed.</li><li>\"auto::\" allows the system to make the settings based on the language and direction reported by the problem (a new feature, so not set in almost all existing problems) and falling back to the expected default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" allows the system to make the settings based on the language and direction reported by the problem (a new feature, so not set in almost all existing problems) but falling back to the language with the given LangCode and the direction Dir when problem settings are not available from PG.</li><li>\"auto::Dir\" for problems without PG settings, this will use the default en=english language, but force the direction to Dir. Problems with PG settings will get those settings.</li><li>\"auto:LangCode:\" for problems without PG settings, this will use the default LTR direction, but will set the language to LangCode.Problems with PG settings will get those settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made by the PG code of the problem, and will force the system to set the language with the given LangCode and the direction to Dir for <b>all</b> problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the PG code of the problem, and will force the system to set the direction to Dir for <b>all</b> problems, but will avoid setting any language attribute for individual problem.</li></ul>"
+#: /opt/webwork/webwork2/conf/defaults.config:1457
+msgid "Mode in which the LANG and DIR settings for a single problem are determined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2695
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:443
 msgid "Move"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2231
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:457
 msgid "Move to Page:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2226
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:452
 msgid "Move to Problem:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:26
+msgid "Multiple sets may be assigned to the users by holding down the shift key or the ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:27
+msgid "Multiple users or sets may be selected by holding down the shift key or the ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:36
 msgid "My Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1412
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:26
 msgid "Mysterious Package (with Ribbons)"
 msgstr ""
 
 # Short for Number of Fields
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:213
 msgid "NO OF FIELDS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1447 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1455 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1484 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:741 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:188 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:15 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:13 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:14 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:113 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:231 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:135 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:12 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:27 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:29
 msgid "Name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:174
 msgid "Name for new set here"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1528
+#: /opt/webwork/webwork2/conf/defaults.config:1430
 msgid "Name of course information file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1107
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:77
+msgid "Name of the evaluator file used to evaluate the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:81
+msgid "Name of the image used for the achievement icon."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:4
 msgid "Name the new set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1691
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:45
+msgid "Name:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:29
 msgid "Necromancers Charm"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:343 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:205 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:393 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:410 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:427 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:28 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:35
 msgid "Never"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:166 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:371 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:36 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:54
 msgid "New File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:165 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:372 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:35 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:55
 msgid "New Folder"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:30
 msgid "New Name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2067
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:3
 msgid "New Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:131
-msgid "New Version"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+msgid "New Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
 msgid "New file name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
 msgid "New folder name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:577
 msgid "New passwords saved"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1078
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:36
 msgid "New set name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1355 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1357
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1006 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1008 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1010
 msgid "Next Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1181 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2164
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:40
+msgid "Next Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:78 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:98
 msgid "Next page"
 msgstr ""
 
-#. ($self->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:620
+#. (% $c->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:142
 msgid "Next test will be available by %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2452 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:134 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:144 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:183 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:381 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:139 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:149 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:193 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:270 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:288 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:331 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:455 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:483 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:510 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:83 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:658 /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:142 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:68
 msgid "No"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:635
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:116
 msgid "No Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2324
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:216
 msgid "No Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:117
+msgid "No Sender specified."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:23
 msgid "No Target Set Selected"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:335
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:38
 msgid "No achievement badges have been assigned yet."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1521
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:70 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:77 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:37
 msgid "No achievements shown.  Create an achievement!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:78 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:90 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:2
+msgid "No achievements shown.  Select an achievement to edit!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:61
 msgid "No action taken"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:141
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:140
 msgid "No authentication method found for your request.  If this recurs, please speak with your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:940
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:361
 msgid "No change made to any set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
 msgid "No changes specified.  You must mark the checkbox of the item(s) to be changed and enter the change data."
 msgstr ""
 
@@ -3435,1946 +4407,2547 @@ msgstr ""
 msgid "No changes were saved!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2462
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:50
 msgid "No course archives found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2898
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:32
 msgid "No course id defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1561 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1858 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:932
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:67 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:53 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:76
 msgid "No courses found"
 msgstr ""
 
 #. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:593
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:675
 msgid "No data exists for set %1 and problem %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:10
+msgid "No e-mail recipients are listed for this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:169
 msgid "No filename was specified for saving!  The message was not saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:340
 msgid "No guest logins are available. Please try again in a few minutes."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3522
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1877
 msgid "No location specified to edit. Please check your input data."
 msgstr ""
 
 #. ($badID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1788
 msgid "No location with name %1 exists in the database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3206
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:149
 msgid "No locations are currently defined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:342
 msgid "No merge data file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:612
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:18
+msgid "No merge data found"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:164
+msgid "No merge data found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:8
+msgid "No merge file selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:135
 msgid "No more tests available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:270
 msgid "No new Achievement ID specified.  No new achievement created.  File not saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:63
 msgid "No problems matched the given parameters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:25
+msgid "No recipients selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:334
 msgid "No recipients selected. Please select one or more recipients from the list below."
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2044
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:49
 msgid "No record for global set %1."
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2046
-msgid "No record for user %1."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
 msgid "No record found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1166
-msgid "No set created."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:9 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:12
 msgid "No sets in this course yet"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1010 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:159 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
 msgid "No sets selected for scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2764
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:46
 msgid "No sets shown.  Choose one of the options above to list the sets in the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1942
 msgid "No source filePath specified"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1327
 msgid "No source_file for problem in .def file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2099
-msgid "No students shown.  Choose one of the options above to list the students in the course."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:87
+msgid "No students shown. Choose one of the options above to list the students in the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:246
 msgid "No submissions. Over time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:278
 msgid "No tests taken."
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:594
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:676
 msgid "No user specific data exists for user %1"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2031
 msgid "No valid changes submitted for location %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:275
-msgid "No versions of this assignment have been taken."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:771
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:263 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:241
 msgid "No versions of this test have been taken."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2235 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2236 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:562
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:252 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:17
 msgid "None"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:681 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2463 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:763 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:8 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:52
 msgid "None Specified"
 msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2089
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:73
 msgid "None of the selected users are assigned to this set: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:33
 msgid "Not logged in."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1569
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:13 /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:29 /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:4 /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:43 /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:15 /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:31 /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:4
 msgid "Note"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:381 /opt/webwork/pg/macros/problemRandomize.pl:406
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:55
+msgid "Note that if there are errors, they will be shown at the top of the page. In some cases, a hard copy is still generated and a link called \"Download Hardcopy\" appears. In addition, the latex file, log and error files are generated which can be used in troubleshooting."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:93
+msgid "Note that if you set the permission level of a user to something other than \"Student\", you may also want to set the status of the user to \"Observer\".  Users with the \"Observer\" status are not included in statistics, scoring, or instructor emails."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:28
+msgid "Note that some settings require an additional page load after \"Save Changes\" is clicked in order to take effect.  This is true for a theme change for example."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:396 /opt/webwork/pg/macros/deprecated/problemRandomize.pl:422
 msgid "Note:"
 msgstr ""
 
-#. (CGI::i($pg->{result}{msg})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2350
+#. (tag('i', maketext('You are in the Reduced Scoring Period.  All work counts for [_1]% of the original.',					$ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#. (tag('i', $pg->{result}{msg})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:218 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:572
 msgid "Note: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2482
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:686
 msgid "Note: grading the test grades all problems, not just those on this page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1460 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1485
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:768 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:49 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:15 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:59
+msgid "Now"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:16 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:19
 msgid "Number"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:242
 msgid "Number of Graded Submissions per Test (0=infty)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
 msgid "Number of Problems per Page (0=all)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:21 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:59 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:95
+msgid "Number of Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:257
 msgid "Number of Tests per Time Interval (0=infty)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1833 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2435
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:54
+msgid "Number:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1181 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:912
 msgid "OK"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1464
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:17
+msgid "OPL Problem Levels Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:26
 msgid "Oil of Cleansing"
 msgstr ""
 
+#. ('<code>pdflatex</code>', '<code>hardcopy.tex</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:49
+msgid "Once \"Generate Hardcopy for selected sets and selected users\" is clicked a file in the selected hardcopy format will be generated and offered for download. If PDF output was selected, a single PDF file is generated. If TeX output is selected, a zip file is generated that contains all files needed to generated the hardcopy PDF file via %1. The main TeX file is called %2."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:84
 msgid "One Column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:314
+msgid "Only Start"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:289 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:303
 msgid "Only after set answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1892
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:87
+msgid "Only present for JITAR sets. Collapse JITAR nesting problem groups to the top row of information about a problem. Note that the nesting of a single problem group can be collapsed by clicking on the down arrow to the right of the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:80
+msgid "Only present for JITAR sets. Expand JITAR nested problem groups that have been collapsed. Note that the nesting of a single problem group can be expanded by clicking on the right arrow to the right of the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1794
 msgid "Only this permission level and higher get buttons for sending e-mail to the instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:39
 msgid "Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:422 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:763 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:787 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:810
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:315 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:9 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:22 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:8 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:62
 msgid "Open Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1098
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:42 /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:32
 msgid "Open Problem Library"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2417 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:272 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:525
 msgid "Open in New Window"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1263 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1617
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:29
 msgid "Open in new window"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:491
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:320
 msgid "Open, closes %1."
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:489
-msgid "Open, complete by %1."
-msgstr ""
-
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:300
 msgid "Open, due %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:433
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
 msgid "Open."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:431
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:268
 msgid "Open. Submitted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:31
 msgid "Open:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:115
 msgid "Opens"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:27
 msgid "Opens any homework set for 24 hours."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1686
+#: /opt/webwork/webwork2/conf/defaults.config:1588
 msgid "Optional Modules"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:265
 msgid "Order Problems Randomly"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:50
+msgid "Other Options"
+msgstr ""
+
 # Context is "7 Out Of 10" 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:405 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:777
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:150
 msgid "Out Of"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1024 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:85
+msgid "Overall Results"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:93
+msgid "Overall Set Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:122
+msgid "Overall Success Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:470 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:481
 msgid "Overwrite"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:437
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:100
 msgid "Overwrite existing files silently"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:41
+msgid "PDF"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:69
 msgid "PG Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:827
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer.html.ep:1
+msgid "PG POD"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:17
+msgid "PG Problem Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:708
 msgid "PG debug messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:829
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:716
 msgid "PG internal errors"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:818
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:109
+msgid "PG markdown syntax used to format WeBWorK questions. This interactive lab can help you to learn the techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:692
 msgid "PG question failed to render"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:826
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:706
 msgid "PG question processing error messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:828
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:712 /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:128
 msgid "PG warning messages"
 msgstr ""
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:511
-msgid "PGLab"
-msgstr ""
-
-# Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:98 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:47 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:58
 msgid "PGML"
 msgstr ""
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:91 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:40
 msgid "POD"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2309 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2249
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:200
+msgid "POD Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:208
+msgid "POD Viewer"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1515 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:526
 msgid "PREVIEW ONLY -- ANSWERS NOT RECORDED"
 msgstr ""
 
 # Problem Number
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:215
 msgid "PROB NUMBER"
 msgstr ""
 
 # Problem Value
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:218
 msgid "PROB VALUE"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:205
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:45 /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:36
 msgid "Pad Fields"
 msgstr ""
 
-#. (timestamp($self)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1255
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:28
+msgid "Page Contents"
+msgstr ""
+
+#. ($c->timestamp)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:1
 msgid "Page generated at %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:568 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:81 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:71 /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:56 /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:25
 msgid "Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:976
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:13
 msgid "Password (Leave blank for regular proctoring)"
 msgstr ""
 
-#. ($studentUser, CGI::span({ dir => 'ltr' }, format_set_name_display($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:498
+#. ($studentUser, tag('span', dir => 'ltr', format_set_name_display($setName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:13
 msgid "Past Answers for %1, set %2, problem %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:8
 msgid "Percent"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:562
-msgid "Percentage of Active Students with Correct Answers"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:20 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:94
+msgid "Percent Ranges"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:63 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+msgid "Percent Score"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:535
+msgid "Percent of Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:788
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:83 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:206
 msgid "Percentile cutoffs for number of attempts. The 50% column shows the median number of attempts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2056 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:300 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:834 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:863 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:892 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:921
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:58
+msgid "Percentile cutoffs for student's score and success index. The 50% column shows the median number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:132 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:50
 msgid "Permission Level"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1869
+#: /opt/webwork/webwork2/conf/defaults.config:1771
 msgid "Permissions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1052
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:24
 msgid "Pick a target set above to add this problem to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:695 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1355 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:781 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:54 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:21
 msgid "Pick date and time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3804
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
 msgid "Place a file named \"hide_directory\" in a course or other directory and it will not show up in the courses list on the WeBWorK home page. It will still appear in the Course Administration listing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1107
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:40
+msgid "Please choose the set for which all problems should be given full credit."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:40
+msgid "Please choose the set for which all problems should have half credit added."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:61
 msgid "Please choose the set name and problem number of the question which should be given full credit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:889
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:61
 msgid "Please choose the set name and problem number of the question which should be given half credit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:654
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:61
 msgid "Please choose the set name and problem number of the question which should have its incorrect attempt count reset."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:61
 msgid "Please choose the set name and problem number of the question which should have its weight doubled."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1315
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:60
 msgid "Please choose the set, the problem you would like to copy, and the problem you would like to copy it to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:399
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:19
 msgid "Please correct the following errors and try again:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:698
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:28
 msgid "Please enter in a value to match in the filter field."
 msgstr ""
 
-#. (CGI::b($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:197
+#. (tag('b', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:28
 msgid "Please enter your username and password for %1 below:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1778
 msgid "Please provide a location name to delete."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:232 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:128 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:242 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:233
 msgid "Please select action to be performed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:183
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
 msgid "Please select at least one set and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
 msgid "Please select at least one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:165
 msgid "Please select at least one user and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:35
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:31
 msgid "Please select at least one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:28
 msgid "Please select at most one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:30
 msgid "Please select exactly one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:29
 msgid "Please select exactly one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:574 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:248 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1016
 msgid "Please specify a file to save to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:37
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
 msgid "Please specify a homework set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:38
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
 msgid "Please use only letters, digits, dashes, underscores, and periods in your set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1462
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1184
+msgid "Please use radio buttons to choose the method for saving this file. Uknown saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:33 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:165 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:169
+msgid "Point Value"
+msgstr ""
+
+#. ($grader->{problem_value})
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:92
+msgid "Point Value (0 - %1):"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:21
 msgid "Points"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:609
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:62
+msgid "Points:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:26
 msgid "Potion of Forgetfulness"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1423
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:2
 msgid "Prepare which sets for export?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2054 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2073
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:249 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:268
 msgid "Press \"Grade Test\" now!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2049
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:244
 msgid "Press \"Grade Test\" soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:213
-msgid "Preview Comment"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:69
 msgid "Preview Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:314 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1840
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:11 /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:99 /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:35
 msgid "Preview My Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2440
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:646
 msgid "Preview Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1338 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1340
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:41
+msgid "Preview the message before sending using the \"Preview Message\" button.  The preview shows the email that would be sent to the first selected student or the instructor if no students were selected.  The preview will also list all of the students that would receive their own personalized message.  If a merge file was selected, the preview will also indicate which (if any) recipient's merge file data could not be found."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:991 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:993 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:995
 msgid "Previous Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1172 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2157
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:74 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:94
 msgid "Previous page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2149
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:45
+msgid "Primary Actions"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:355
 msgid "Print Test"
 msgstr ""
 
 # Short for Problem
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2088
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:287
 msgid "Prob"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:670
-msgid "Problem #"
-msgstr ""
-
-#. ($prettyProblemID)
-#. ($problemNumber)
 #. (join('.', @seq)
 #. ($problemID)
-#. ($prettyProblemIDs{$probID})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:831 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:834 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:897 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:438 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:800 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:956 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:964 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:973 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:930 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:933
+#. ($problemNumber)
+#. ($_->{prettyID})
+#. ($c->{prettyID})
+#. ($probID)
+#. ($c->{setRecord}->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)
+#. ($set->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)
+#. ($prettyProblemID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:831 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:842 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:853 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:203 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:57 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:61 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:19 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:21 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:211 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/siblings.html.ep:42 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:36 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:40
 msgid "Problem %1"
 msgstr ""
 
-#. ($problemNumber)
-#. ($prettyID)
-#. ($versioned ? $versioned : $MergedProblem->problem_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2320 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1419 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1421
+#. ($i + 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:535
 msgid "Problem %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1974
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:75
+msgid "Problem (\".pg\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:38
+msgid "Problem Display Settings"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1876
 msgid "Problem Display/Answer Checking"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:451
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:374 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:50
 msgid "Problem Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1697
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:29
 msgid "Problem Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1000 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1002 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:999
 msgid "Problem List"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1119 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:666 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:783 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:901 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:73 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:73 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:74 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:75 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:149 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:159
 msgid "Problem Number"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:156
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:160
+msgid "Problem Paths"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:140
 msgid "Problem Score (%):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:79 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:30
 msgid "Problem Techniques"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:705
-msgid "Problem Viewer"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:239
+msgid "Problem has a different source file than the currently rendered problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1988
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:233
+msgid "Problem has an essay answer that needs to be graded."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1943
 msgid "Problem source is drawn from a grouping set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:406 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2494 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:445 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:827 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:835 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:896 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:801
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:89
+msgid "Problem source is drawn from a grouping set and can not be directly rendered or edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:12 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:336 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:30 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:163 /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:2 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:9 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:32
 msgid "Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:25
 msgid "Problems Added"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:59
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:54
 msgid "Problems for all students have been unassigned."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:57
 msgid "Problems for selected students have been reassigned."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:51
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:46
 msgid "Problems have been assigned to all current users."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:25
+msgid "Problems with this rating should only require direct memory of a fact. Examples might be a specific value of a function, or the statement of a definition. Very few WeBWorK problems fall into this category."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:93
 msgid "Proctor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:282
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:92
 msgid "Proctor Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:258
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:71
 msgid "Proctor Username"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:193
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:3
+msgid "Proctor authorization requested for a nonexistent set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:8
 msgid "Proctor authorization required."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:231
-msgid "Proctored Gateway Quiz %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:88
+msgid "Proctor:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:241
-msgid "Proctored Gateway Quiz %2 Proctor Login"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:265
+msgid "Proctored Test %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:981
-msgid "Proctored tests require proctor authorization to start and to grade.  Provide a password to have a single password for all students to start a proctored test."
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:272
+msgid "Proctored Test %2 Proctor Login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:318
+msgid "Proctored tests always require authorization to start the test. \"Both Start and Grade\" will require login proctor authorization to start and grade proctor authorization to grade. \"Only Start\" requires grade proctor authorization to start and no authorization to grade."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:18
+msgid "Provide a password to have a single password for all students to start a proctored test."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:56
 msgid "Publish"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:31
+msgid "Quick access to many instructor tools, including <strong>Reset passwords</strong>, <strong>Act as student</strong>, <strong>Assign individual sets</strong> and <strong>Edit individual due dates</strong>."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "RECITATION"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1333
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:199
 msgid "Randomize"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:13 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:13
 msgid "Randomize Seed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:96 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:64 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:101
 msgid "Read only"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:67
 msgid "Really delete the items listed above?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:237 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:787 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:201 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:212 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:804 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2038 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:298 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:832 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:861 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:890 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:919
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:130 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:47 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:110 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:22 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:184 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:42
 msgid "Recitation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:194
+#. ($recitation)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:125
+msgid "Recitation %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:21
+msgid "Recitation:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:38 /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:46
 msgid "Record Scores for Single Sets"
 msgstr ""
 
-#. ($studentName)
-#. ($self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:183 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:190
+#. ($studentID)
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:143 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:8
 msgid "Record for user %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Reduced Scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:153 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:67
 msgid "Reduced Scoring Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2523
-msgid "Reduced Scoring Disabled"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
+msgid "Reduced Scoring Enabled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2522
-msgid "Reduced Scoring Enabled"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:33
+msgid "Reduced Scoring Period"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:314
 msgid "Reduced credit can still be earned until %1."
 msgstr ""
 
 # Short for "Reduced Scoring:"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:32
 msgid "Reduced:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:153 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:373
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:25 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:56
 msgid "Refresh"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1646 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1684 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1943 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2000 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3713 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3755
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:30 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:61 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:30 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:47 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:37 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:56
 msgid "Refresh Listing"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:190
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:200
 msgid "Relax IP restrictions when?"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:88
+msgid "Reload the page to see backup files that have been made."
+msgstr ""
+
 # Context is "Attempts Remaining"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:14
 msgid "Remaining"
 msgstr ""
 
 #. ('00:00:00')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:254
 msgid "Remaining time: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:61
 msgid "Remember Me"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:546
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:514
 msgid "Remember to return to your original problem when you're finished here!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1313 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1020 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:161 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:366 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:466 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:480 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:72 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:33 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:41
 msgid "Rename"
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1302
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:62
 msgid "Rename %1 to %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1052 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:378 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:927
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:1 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:1 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:3 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:73 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:34
 msgid "Rename Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:17
+msgid "Rename Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:22
+msgid "Rename Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
 msgid "Rename file as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2727
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:463
 msgid "Render"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:344 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:59
 msgid "Render All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2720
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:461
 msgid "Render Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2501
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:60
+msgid "Render all problems on the page. This does not reload the page or save or reset changes."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:106
+msgid "Render or re-render the problem, course info file, or set header being edited. This does not change the permanent file on the disk. You can view different versions of the same problem by changing the seed. You can also change the manner in which the mathematics is typeset. If \"Open in new window\" is checked, then the problem will open in a new tab or window showing the problem as it will be rendered for students in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:132
+msgid "Rendering Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:341 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:53
 msgid "Renumber Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1692
-msgid "Reopens any gateway test for an additional 24 hours. This allows you to take a test even if the close date has past. This item does not allow you to take additional versions of the test."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:55
+msgid "Renumber problems consecutively starting from 1. This renumbering is not saved until \"Save Changes\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:103
+msgid "Renumber problems in the set consecutively starting from one. In the process of deleting problems, the numbering can be made non-consecutive. This is useful to clean up the problem numbering."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:31
+msgid "Reopens any test for an additional 24 hours. This allows you to take a test even if the close date has past. This item does not allow you to take additional versions of the test."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:118
+msgid "Reordering Problems"
 msgstr ""
 
-#. (CGI::strong(							CGI::span({ dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1829
+#. (tag(						'strong',						c(							tag('span', dir => 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:58
 msgid "Replace current problem: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:13
 msgid "Replace which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:637
+#. ($composite_id, $oldUser->status)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:448
+msgid "Replacing old data for %1: status: %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:42
 msgid "Reply-To:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:528
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:123
 msgid "Report Bugs in this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1073
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:52 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:305
 msgid "Report bugs"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:128
+msgid "Report bugs in a WeBWorK question/problem using this link. The very first time you do this you will need to register with an email address so that information on the bug fix can be reported back to you."
+msgstr ""
+
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2825 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1378 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1530
 msgid "Report for course %1:"
 msgstr ""
 
-#. ($rename_oldCourseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1186 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2122
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:3 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:3
 msgid "Report on database structure for course %1:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1829
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:8
 msgid "Request New Version"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2246 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2321
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:18 /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:19
 msgid "Request information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1972
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1220
 msgid "Request new version now."
 msgstr ""
 
+#. ($setName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:486
+msgid "Requested set \"%1\" is a proctored test, but no valid proctor authorization has been obtained."
+msgstr ""
+
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:399 /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:422
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:402 /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:425
 msgid "Requested set '%1' could not be found in the database for user %2."
 msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:469
-msgid "Requested set '%1' is a homework assignment but the gateway/quiz content generator %2 was called.  Try re-entering the set from the problem sets listing page."
-msgstr ""
-
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:484
-msgid "Requested set '%1' is a proctored test/quiz assignment, but no valid proctor authorization has been obtained."
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:472
+msgid "Requested set '%1' is a homework assignment but the test content generator %2 was called.  Try re-entering the set from the problem sets listing page."
 msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:463
-msgid "Requested set '%1' is a test/quiz assignment but the regular homework assignment content generator %2 was called.  Try re-entering the set from the problem sets listing page."
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:466
+msgid "Requested set '%1' is a test but the regular homework assignment content generator %2 was called.  Try re-entering the set from the problem sets listing page."
 msgstr ""
 
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:420
 msgid "Requested set '%1' is not assigned to user %2."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:450
 msgid "Requested set '%1' is not available yet."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:441
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:444
 msgid "Requested set '%1' is not yet open."
 msgstr ""
 
 #. ($verNum,				$setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:404
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:407
 msgid "Requested version (%1) of set '%2' can not be directly accessed."
 msgstr ""
 
 #. ($verNum, $setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:397
 msgid "Requested version (%1) of set '%2' is not assigned to user %3."
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:308
+msgid "Require Proctor Authorization to"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:45
 msgid "Require users to log in through the LMS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:420
 msgid "Rerandomize after"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:104
 msgid "Reset"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2280 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2968
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:195 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:696 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:47
 msgid "Reset Form"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:610
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:27
 msgid "Resets the number of incorrect attempts on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2453
-msgid "Restores a course from a gzipped tar archive (.tar.gz). After unarchiving, the course database is restored from a subdirectory of the course's DATA directory. Currently the archive facility is only available for mysql databases. It depends on the mysqldump application."
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:41
+msgid "Restore a .tar.gz archive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:178
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:40
+msgid "Restore backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:39
+msgid "Restore backup from %1"
+msgstr ""
+
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+msgid "Restored backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:188
 msgid "Restrict Access by IP"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:912
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep:11
 msgid "Restrict Locations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:286
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:324
 msgid "Restrict Problem Progression"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:184
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:194
 msgid "Restrict To"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:154
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:33
+msgid "Restrict or sort the students displayed"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:159
 msgid "Restrict release by set(s)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2090 /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:299
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:286 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:291
 msgid "Result"
 msgstr ""
 
-#. (CGI::i($self->$actionHandler(\%genericParams, \%actionParams, \%tableParams)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:388
+#. ($c->tag('i', $c->$actionHandler)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:228
 msgid "Result of last action performed: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:309
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:300
 msgid "Results for this submission"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:363
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:236
 msgid "Results of last action performed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:125
 msgid "Results of last action performed: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1725
-msgid "Resurrect which Gateway?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:51
+msgid "Resurrect which test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1449
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:669
 msgid "Retitled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:17
 msgid "Return to your work"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:168 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:686 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:132
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:125 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:38 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:16 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:166
 msgid "Revert"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, $self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2069
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:25 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:83
 msgid "Revert to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1431 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1513
+#. ($c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1220
+msgid "Reverted to original file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:168
+msgid "Reverts to the copy of the file saved on the disk or to a backup file. All unsaved editing changes will be lost. This option is only active when a temporary file or a backup file exists. You may also delete backups that have been made with this tab."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:182
+msgid "Review of column functions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:145 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:85
 msgid "Reviewing a problem and looking at both the average Attempts and  average Status should give instructors valuable information about the difficulty of the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:55
 msgid "Reward used successfully!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:180
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:4
 msgid "Rewards"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:27
 msgid "Ring of Reduction"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:322
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:26
 msgid "Robe of Longevity"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "SECTION"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:214
 msgid "SET NAME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:321
 msgid "STATUS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "STUDENT ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:43 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:263 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:170 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:687 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:409 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:847 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:220
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:32 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:123 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:78 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:40 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:17 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:243 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:181 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:85 /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:207 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:123
 msgid "Save"
 msgstr ""
 
-#. (CGI::b($self->shortPath($self->{sourceFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:438
+#. (tag('b', $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_form.html.ep:2
 msgid "Save %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:44 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:169 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:695
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:33 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:124 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:39 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:20 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:134
 msgid "Save As"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:744 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2275 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2963
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:53 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:194 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:695 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:37
 msgid "Save Changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:60 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:96 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:76
 msgid "Save Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:78 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
 msgid "Save Export"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:92
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
 msgid "Save Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:188
 msgid "Save as"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:872
-msgid "Save as Default"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:481
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:5
 msgid "Save as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1172 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1558 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:254 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:289 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1368 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1443
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_edit_form.html.ep:1 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_edit_form.html.ep:1 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:119 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:83 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_edit_form.html.ep:1 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_password_form.html.ep:1
 msgid "Save changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1794 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:33
 msgid "Save file to:"
 msgstr ""
 
-#. (CGI::b({ dir => 'ltr' }, $self->shortPath($self->{editFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1605
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:125
+msgid "Save the contents of the editor window to the file on disk and re-render the problem. If \"Open in new window\" is checked, then the problem will open in a new tab or window showing the problem as it will be rendered for students in the set. If \"Create backup\" is checked then a backup of the current file on disk will be created before overwriting it with the contents of the editor window. If a backup already exists, then a \"Delete oldest backup\" check box will be present. If that is checked, then the oldest backup will be deleted when \"Save\" is clicked. These backups can be reverted to and managed on the \"Revert\" tab."
+msgstr ""
+
+#. (tag('b', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:6
 msgid "Save to %1 and View"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:396 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1165
-msgid "Saved to file '%1'"
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:50
+msgid "Saved answers"
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#. ($outputFilePath =~ s/$ce->{courseDirs}{templates}/[TMPL]/r)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:201 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695 /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:549
+msgid "Saved to file \"%1\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1180 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2116 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2292
 msgid "Schema and database field definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1168 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4284
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2279
 msgid "Schema and database table definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:404 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:75 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:465 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:767 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:775 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:660
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:66 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104 /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:9 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:153 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:147 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:161 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:78
 msgid "Score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:125
 msgid "Score (%)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:161
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:60
+msgid "Score one or more sets. This can also be done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\", but the \"Scoring Tools\" page allows control over parameters."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:170
 msgid "Score required for release"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:228
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:58
 msgid "Score selected set(s) and save to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2085
-msgid "Score summary for last submit:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:284
+msgid "Score summary for last submission:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:2
 msgid "Score which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:978
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:2
 msgid "Score which sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
 msgid "Scores"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:487
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:66
+msgid "Scoring (\".csv\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:396
 msgid "Scoring Download"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:161
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:115
 msgid "Scoring Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:478
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:391 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:58
 msgid "Scoring Tools"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2460
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:17
+msgid "Scoring Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:327
 msgid "Screen and Hardcopy set header information can not be overridden for individual students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:26
 msgid "Scroll of Resurrection"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:189 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:236 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:786 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:200 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:211 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:793 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2029 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:297 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:831 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:860 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:889 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:918 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:157
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:129 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:34 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:46 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:110 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:109 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:18 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:178 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:38 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:38
 msgid "Section"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:653 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:802
+#. ($section)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:122
+msgid "Section %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:17 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:33 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:30
 msgid "Section:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:436
 msgid "Seed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:114
 msgid "Select"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:505
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:20
+msgid "Select Users from the left column and sets from the right column and assign or unassign the given sets. The list of users or the list of sets can be reordered under the \"sort\" option or the format of the user or set list.  Additionally, the set lists can be filtered (by section number or recitation).  The displayed user and set lists will only be updated upon clicking \"Change Display Settings\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:11
 msgid "Select a Homework Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:14
 msgid "Select a Problem Collection"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:18
 msgid "Select a Set Definition File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1028
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:14
 msgid "Select a Set from this Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1659
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:20
+msgid "Select a course to create a .tar.gz archive of, which contains a dump of the database and all course files (templates, configuration files, etc).  Each course can only have a single archive.  Creating an archive of a previously archived course will delete the old archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:36
 msgid "Select a course to delete."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:946
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:20
+msgid "Select a course to delete.  Warning, all data will be deleted and this cannot be undone.  This will not delete any course archives."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:14
 msgid "Select a course to rename.  The courseID is used in the url and can only contain alphanumeric characters and underscores. The course title appears on the course home page and can be any string."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2475
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:13
 msgid "Select a course to unarchive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1617 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1914 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3684
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:14 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:14 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:21
 msgid "Select a listing format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1442 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1478
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:18
+msgid "Select action:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:10
 msgid "Select all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2703
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:12
 msgid "Select all eligible courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2731
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:26
 msgid "Select all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1967
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:10
 msgid "Select all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:315 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:509 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:536
-msgid "Select an action to perform"
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:10
+msgid "Select an action to perform:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3063
-msgid "Select an action to perform:"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:20
+msgid "Select an archive to restore.  You cannot restore an archive into an existing course. Instead, either rename or delete the old course, or restore the archive with a new name.  When restoring a course with a new name, the name is used as the course ID, and must contain only letters, numbers, hyphens, and underscores, and may have at most 40 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1956
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:36
 msgid "Select course(s) to archive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3731
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:44
 msgid "Select course(s) to hide or unhide."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:7
 msgid "Select import file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:14
 msgid "Select one or more sets and one or more users below to assign/unassign each selected set to/from all selected users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:94
 msgid "Select sets below to assign them to the newly-created users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3666
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:20
+msgid "Select the course to change its Course ID, Course Title, or Institution.  Note that changing a course's ID will change the URL of all links to the course, and could break links from external sites such as an LMS."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:4
 msgid "Select the course(s) you want to hide (or unhide) and then click \"Hide Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden does no harm (the action is skipped). Likewise unhiding a course that is already visible does no harm (the action is skipped).  Hidden courses are still active but are not listed in the list of WeBWorK courses on the opening page.  To access the course, an instructor or student must know the full URL address for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:488
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:20
+msgid "Select the course(s) you want to hide (or unhide) and then click \"Hide Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden does no harm (the action is skipped). Likewise unhiding a course that is already visible does no harm (the action is skipped). Hidden courses are still active but are not listed in the list of WeBWorK courses on the opening page. To access the course, an instructor or student must know the full URL address for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:93
+msgid "Select the display mode used to render the problems on this page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:11
 msgid "Select the homework sets for which to generate hardcopy versions. You may also select multiple users from the users list. You will receive hardcopy for each (set, user) pair."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:238
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:30
+msgid "Select the sets you want scored, choose the name of the export file you want to use (by default: %1), and then click the \"Score Selected Set(s) and save to\" button."
+msgstr ""
+
+#. ('<code>ful.csv</code>','<code>scr.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:49
+msgid "Select this if you want to save the scores for each set in a separate file in addition to saving all scores to a cumulative file. After clicking the \"Score Selected Set(s) and save to\" button, you will get a pair of links for each selected set. The file that ends with %1 contains the number of correct and incorrect tries about each individual problem for each student. The file that ends with %2 is a summary of each problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:19
 msgid "Select user(s) and/or set(s) below and click the action button of your choice."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2885
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:85
+msgid "Select which assignment types (homework, tests, just-in-time) the achievement is evaluated."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:20
+msgid "Select which courses to upgrade from a previous version of WeBWorK.  The upgrade process can add missing database columns, delete unused database columns, and check the course file structure.  Be sure to read over the changes before confirming the upgrade.  You may want to create an archive of the course before upgrading.  Only courses that need upgraded will be selectable."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:84
+msgid "Select your favorite theme for the large text window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:18
 msgid "Select/unselect all fields missing in schema for deletion."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2873
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:9
 msgid "Select/unselect all tables missing in schema for deletion."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:23
 msgid "Selected sets:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:57
 msgid "Send E-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:839
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:83
 msgid "Send Email"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:702
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:69
+msgid "Send email to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:54
+msgid "Send emails to selected instructors."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:59
 msgid "Send to all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:717
-msgid "Send to the students selected below"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:64
+msgid "Send to selected students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:402
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:7
 msgid "Set"
 msgstr ""
 
 #. ($newSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:614
 msgid "Set %1 has been created."
 msgstr ""
 
-#. ($newSetName,$userName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1944
+#. ($newSetName, $userName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:616
 msgid "Set %1 was assigned to %2"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1239
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:567
 msgid "Set %1 was assigned to %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:415
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:354 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:42
 msgid "Set Assigner"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:420
-msgid "Set Definition Filename"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:17
+msgid "Set Assigner Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:51 /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:45
 msgid "Set Definition Files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2318 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2329
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:214 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:218
 msgid "Set Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:17
+msgid "Set Detail Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:333
 msgid "Set Detail for set %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:93
 msgid "Set Header"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:323
+msgid "Set Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:218
 msgid "Set ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:267 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:114 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:3
 msgid "Set Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2744
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:19
 msgid "Set List"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1111 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1209 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1320 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:164 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:262 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:353 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:448 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:546 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:659 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:776 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:895 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:995 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:762 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:786 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:809
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:66 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:44 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:67 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:44 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:66 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:44 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:66 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:44 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:48 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:68 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:48 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:44 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:314 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:21 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:7
 msgid "Set Name"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:186
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:18
+msgid "Set closes on %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:45
+msgid "Set definition (\".def\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:20
+msgid "Set is closed."
+msgstr ""
+
+#. ($c->formatDateTime($set->reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:16
+msgid "Set is due on %1."
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:14
+msgid "Set opens on %1."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:188
 msgid "Set random seed to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2029
+#: /opt/webwork/webwork2/conf/defaults.config:1930
 msgid "Set to true for log to mean base 10 log and false for log to mean natural logarithm."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2049
+#: /opt/webwork/webwork2/conf/defaults.config:1950
 msgid "Set to true to allow students to enter Unicode versions of some characters (like U+2212 for the minus sign) in their answers.  One reason to allow this is that copying and pasting output from MathJax can introduce these characters, but it is also getting easier to enter these characters directory from the keyboard."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2019
+#: /opt/webwork/webwork2/conf/defaults.config:1920
 msgid "Set to true to display the \"Entered\" column which automatically shows the evaluated student answer, e.g., 1 if student input is sin(pi/2). If this is set to false, e.g., to save space in the response area, the student can still see their evaluated answer by clicking on the typeset version of their answer."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2060
+#: /opt/webwork/webwork2/conf/defaults.config:1961
 msgid "Set to true to have Full Width Unicode character (U+FF01 to U+FF5E) converted to their ASCII equivalents (U+0021 to U+007E) automatically in MathObjects.  This may be valuable for Chinese keyboards, for example, that automatically use Full Width characters for parentheses and commas."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:521 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:148 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:293 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:427 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:164
-msgid "Sets"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:577 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:16
+msgid "Set values"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:352
-msgid "Sets Assigned to User"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:35 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:38 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:44 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:24 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/siblings.html.ep:4
+msgid "Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:343
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:322
 msgid "Sets assigned to %1"
 msgstr ""
 
+#. ($userName, $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:90
+msgid "Sets assigned to %1 (%2)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:17
+msgid "Sets assigned to student Help"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:57
-msgid "Sets how grades will be passed back from WeBWorK to the LMS.<dl><dt>course</dt><dd>Sends a single grade back to the LMS. This grade is calculated out of the total question set that has been assigned to a user and made open. Therefore it can appear low, since it counts problem sets with future due dates as zero.</dd> <dt>homework</dt><dd>Sends back a score for each problem set (including for each quiz). To use this, the external links from the LMS must be problem set specific. For example, <code>webwork.myschool.edu/webwork2/course-name/problem_set_name</code>. If the problem set name has space characters, they should be underscores in these addresses. If the problem set is a quiz, it must have this format: <code>webwork.myschool.edu/webwork2/course-name/quiz_mode/problem_set_name</code>. Also, to initialize the communication between WeBWorK and the LMS, the user must follow each of these external learning tools at least one time. Since there must be a separate external tool link for each problem set, this option requires more maintenance of the LMS course.</dd></dl>"
+msgid "Sets how grades will be passed back from WeBWorK to the LMS.<dl><dt>course</dt><dd>Sends a single grade back to the LMS. This grade is calculated out of the total question set that has been assigned to a user and made open. Therefore it can appear low, since it counts problem sets with future due dates as zero.</dd> <dt>homework</dt><dd>Sends back a score for each problem set (including for each quiz). To use this, the external links from the LMS must be problem set specific. For example, <code>webwork.myschool.edu/webwork2/course-name/problem_set_name</code>. If the problem set name has space characters, they should be underscores in these addresses. Also, to initialize the communication between WeBWorK and the LMS, the user must follow each of these external learning tools at least one time. Since there must be a separate external tool link for each problem set, this option requires more maintenance of the LMS course.</dd></dl>"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:55
+msgid "Sets the order in which achievements are listed and evaluated."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1458
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:625
 msgid "Sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:726
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:36
 msgid "Setting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1332
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:39
 msgid "Shift dates so that the earliest is"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:32
+msgid "Show"
+msgstr ""
+
 #. ($numchild)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1300 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1301
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:31 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:32
 msgid "Show %1 more like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:326
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:107 /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:39
 msgid "Show Correct Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:22
 msgid "Show Date & Size"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:86
 msgid "Show LTI parameters (for debugging)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:620
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:480 /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:34
 msgid "Show Me Another"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2518 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2412
+#. ($exhausted)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:69
+msgid "Show Me Another %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1642 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:711
 msgid "Show Past Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:703
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:41
+msgid "Show Problem Source File"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:132
 msgid "Show Problem Source File:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
 msgid "Show Problems on Finished Tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
-msgid "Show Scores on Finished Assignments?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+msgid "Show Scores on Finished Tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2416
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:630
 msgid "Show Solutions"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/conf/defaults.config:1538
 msgid "Show Total Homework Grade on Grades Page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1266
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:77
 msgid "Show all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1380
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:91
 msgid "Show all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2404
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:621
 msgid "Show correct answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1299
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+msgid "Show hints after"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:30
 msgid "Show less like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:337 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:387
 msgid "Show me another"
 msgstr ""
 
-#. ($exhausted)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1926
-msgid "Show me another %1"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:20
+msgid "Show past answers.  Students can only see their past answers, and they will not be able to see which parts are correct.  Instructors can use the form to select any combination of users, sets, and problems to view.  The table below will list the past answers colored according to correctness (green is correct).  Use control + click to select multiple users, sets, or problems."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2428
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:639
 msgid "Show problem graders"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:105
 msgid "Show saved answers?"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1860
+#: /opt/webwork/webwork2/conf/defaults.config:1762
 msgid "Show the correct answer to the current problem before re-randomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1862
+#: /opt/webwork/webwork2/conf/defaults.config:1764
 msgid "Show the correct answer to the current problem on the last attempt before a new version is requested."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:3
 msgid "Show which sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:690
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:3
 msgid "Show which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:275 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:450 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:382 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:475
-msgid "Show/Hide Site Description"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:622 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:75 /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:11
 msgid "Show:"
 msgstr ""
 
-#. (scalar @{ $self->{visibleSetIDs} },			scalar @{ $self->{allSetIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:594
+#. (scalar @{ $c->{visibleSetIDs} },			scalar @{ $c->{allSetIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:115
 msgid "Showing %1 out of %2 sets."
 msgstr ""
 
-#. (scalar @Users, scalar @{ $self->{allUserIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:610
+#. (scalar(keys %{ $c->{visibleUserIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:80
 msgid "Showing %1 out of %2 users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:70
 msgid "Showing all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1355
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:81
 msgid "Showing all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:61 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:101 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:104 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:64 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:67
+#. ($c->{merge_file}, $ur->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:5
+msgid "Showing data from merge file %1 for user %2:"
+msgstr ""
+
+#. ($c->{merge_file})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:147
+msgid "Showing data from merge file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:61
+msgid "Showing problem for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:8 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:7
+msgid "Showing statistics for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:33
+msgid "Shows how many instructors and students have been assigned this problem set, out of the total number in the class. Clicking on this link allows you to assign the set to users, unassign this set from users, and to individually edit the assignment for specific users. For changing dates for individual users there are also shortcuts from the \"Instructor Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:43 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:63
 msgid "Site Information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:88
 msgid "Skip archiving this course"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2080
+#: /opt/webwork/webwork2/conf/defaults.config:1981
 msgid "Skip explanation essay answer fields"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1556 /opt/webwork/pg/macros/PGbasicmacros.pl:1557
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:81
+msgid "Snippets of PG code illustrating specific techniques"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1514 /opt/webwork/pg/macros/core/PGbasicmacros.pl:1515
 msgid "Solution:"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1555
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1513
 msgid "Solution: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:668 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:432 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:105 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:57
 msgid "Solutions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1350
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:20
+msgid "Some OPL problems have been rated for difficulty/educational objective. The levels are loosely inspired by Bloom's taxonomy. They are assigned numbers from 1 to 6 as follows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:185
 msgid "Some WeBWorK problems are programmed using what are called <i>Math Objects</i>. These problems are preferred by some people because they provide a more consistent collection of messages to faulty student answers, particularly for answers which are way off base."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:379
 msgid "Some answers will be graded later."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:60
 msgid "Some of these files are directories. Only delete directories if you really know what you are doing. You can seriously damage your course if you delete the wrong thing."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2082
+#: /opt/webwork/webwork2/conf/defaults.config:1983
 msgid "Some problems have an explanation essay answer field, typically following a simpler answer field. For example, find a certain derivative using the definition. An answer blank would be present for the derivative to be automatically checked, and then there would be a separate essay answer field to show the steps of actually using the definition of the derivative, to be scored manually. With this setting, the essay explanation fields are supperessed. Instructors may use the exercise without incurring the manual grading."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2186
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:83
 msgid "Some problems shown above represent multiple similar problems from the database.  If the (top) information line for a problem has a letter M for \"More\", hover your mouse over the M  to see how many similar problems are hidden, or click on the M to see the problems.  If you click to view these problems, the M becomes an L, which can be clicked on to hide the problems again."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1612
-msgid "Some servers handle courses taking place in different timezones.  If this course is not showing the correct timezone, enter the correct value here.  The format consists of unix times, such as \"America/New_York\",\"America/Chicago\", \"America/Denver\", \"America/Phoenix\" or \"America/Los_Angeles\". Complete list: <a href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:529
-msgid "Something was wrong with your LTI parameters.  If this recurs, please speak with your instructor"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:79 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:50
 msgid "Sort"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:751 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:814
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:3 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:4
 msgid "Sort by"
 msgstr ""
 
 #. ($names{$primary}, $names{$secondary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:817
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:324
 msgid "Sort by %1 and then by %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:171 /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:115
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:3
 msgid "Sort:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:51
+msgid "Sorts the lists displayed by due date, name, etc."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:363
 msgid "Source File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1586 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1612 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1527 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1555 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1593
 msgid "Source file paths cannot include .. or start with /: your source file path was modified."
 msgstr ""
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:11
 msgid "Specify an ID, title, and institution for the new course. The course ID may contain only letters, numbers, hyphens, and underscores, and may have at most %1 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:661
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:94
+msgid "Spell check the text of the file that your are editing. Note that there will be many spelling errors in the code parts of your file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:35 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:116
+msgid "Standard Deviation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:162
 msgid "Start"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:609
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:47
+msgid "Start LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:130
 msgid "Start New Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:352 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:443 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:78 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:94 /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:508
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:100 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:95 /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:406 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:139 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:84 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:54
 msgid "Statistics"
 msgstr ""
 
-#. ($self->{ce}{courseName} =~ s/_/ /gr,			CGI::span({ dir => 'ltr' }, format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:73
-msgid "Statistics for %1 set %2. Closes %3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:17
+msgid "Statistics Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:86
+msgid "Statistics for %1"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:90
+msgid "Statistics for %1 problem %2"
 msgstr ""
 
-#. ($self->{ce}{courseName}, $self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:68
-msgid "Statistics for %1 student %2"
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:84
+msgid "Statistics for student %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2089 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:368 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1442 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1524 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2020 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:296 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:659 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:806 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:191 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:192
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:442 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:289 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:151 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:91 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:16 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:34 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:16 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:160 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:34 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:36
 msgid "Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:29
 msgid "Stop Acting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2251
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:85
 msgid "Stop Archiving"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2418
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1153
 msgid "Stop archiving courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:233 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:783 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2011 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:295 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:829 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:858 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:887 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:916
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:127 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:43 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:106 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:30
 msgid "Student ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:188 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:9
+msgid "Student ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:33 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:37
 msgid "Student Name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:102 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:86 /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:570
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:80 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:85 /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:428 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:56
 msgid "Student Progress"
 msgstr ""
 
-#. ($self->{ce}->{courseName},			CGI::span({ dir => 'ltr' }, format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:81
-msgid "Student Progress for %1 set %2. Closes %3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:17
+msgid "Student Progress Help"
+msgstr ""
+
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:72
+msgid "Student Progress for %1"
 msgstr ""
 
-#. ($self->{ce}->{courseName}, $self->{studentName})
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($c->stash('setID')
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:76
-msgid "Student Progress for %1 student %2"
+msgid "Student Progress for set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:628
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:80
 msgid "Student answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:617 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:766
-msgid "Subject:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:80
+msgid "Student scores for the sets selected below will be calculated. This and other scoring operations can also be done using the \"Scoring Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:87
+msgid "Student:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:124
+msgid "Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:653
-msgid "Subject: "
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:50 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:8
+msgid "Subject:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:222
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:30
 msgid "Submission time:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:226
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:41
 msgid "Submit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:26
 msgid "Submit Answers"
 msgstr ""
 
 #. ($effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1861
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:23
 msgid "Submit Answers for %1"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:502
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:525
 msgid "Submit your answers again to go on to the next part."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:775
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:39 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:70 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:183
 msgid "Success Index"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:42 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:106
+msgid "Success index is the square of the average score divided by the average number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:73
+msgid "Success index is the square of the score divided by the number of attempts."
+msgstr ""
+
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1086
 msgid "Successfully archived the course %1."
 msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:885
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:422
 msgid "Successfully created new achievement %1"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1252
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:581
 msgid "Successfully created new set %1"
 msgstr ""
 
 #. ($add_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:465
 msgid "Successfully created the course %1"
 msgstr ""
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1818 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2401
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1131 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:900
 msgid "Successfully deleted the course %1."
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1529
+#. ($rename_oldCourseID,							$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:772
 msgid "Successfully renamed the course %1 to %2"
 msgstr ""
 
 #. ($unarchive_courseID, $new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2653
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1286
 msgid "Successfully unarchived %1 to the course %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1163 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2099 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4280
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:89
+msgid "TA:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2274
 msgid "Table defined in database but missing in schema"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1161 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2097 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2269
 msgid "Table defined in schema but missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1165 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2101 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2265
 msgid "Table is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3200 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3490 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:276 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:363 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:576 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:59 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:106
 msgid "Take Action!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Target Set:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:63
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:55 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:42
 msgid "TeX Source"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:784
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:258
+msgid "Test %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:54 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:52 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:55
+msgid "Test Name"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:156
 msgid "Test Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:224
 msgid "Test Time Limit (min; 0=Close Date)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2041
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:238
 msgid "Test Time Notification"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:156
 msgid "Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:244
 msgid "Test not yet submitted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:317 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:920
+msgid "Test parameters"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:148 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:149
 msgid "Test/quiz with time limit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:79
 msgid "Text"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:842
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:80
+msgid "Text Editor Options"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:55
 msgid "Text chapter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:864
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:66
 msgid "Text section:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:44
 msgid "Textbook:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1403
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:58
+msgid "The \"Edit Target Set\" button at the top of the page will take you to the Problem Set Editor which will allow you to edit dates, assign users and other information about the problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:115
+msgid "The \"Score\" tab will export achievement data to a CSV file that can be downloaded.  The export contains the global data including number of achievement points and current level of each student.  In addition for each selected achievement, a column for if the achievement was earned (1) or not earned (0) will be added to the CSV."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:194
+msgid "The <strong>Assigned sets</strong> column (x/y) indicates that x sets out of y sets avaiable have been assigned to this student. Click this link to assign or unassign sets to this student, to adjust due dates, or to adjust the grades on a homework set for a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:20
+msgid "The <strong>Set Detail</strong> page can be viewed in one of two distinct modes:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:189
+msgid "The <strong>login name</strong> column links allow you to \"act as\" a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:191
+msgid "The <strong>pencil</strong> in the login column allows you to edit that student's data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:64
 msgid "The Attempts figure is the global average of the number of attempts (both correct and incorrect) individuals take on this problem.  A high figure may represent a difficult problem.  Note that problems with multiple parts may have higher average attempts since many students  will submit an answer to each part before continuing and each such  submittal counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1485
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:124
 msgid "The Attempts figure is the local average of the number of attempts (both correct and incorrect) individuals at your institution take on this problem. A high figure may represent a difficult problem.  Note that problems with multiple parts may have higher average attempts since many students  will submit an answer to each part before continuing and each such  submittal counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1819
+#: /opt/webwork/webwork2/conf/defaults.config:1721
 msgid "The Maximum number of times Show me Another can be used per problem by a student. If set to -1 then there is no limit to the number of times that Show Me Another can be used."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1787
+#: /opt/webwork/webwork2/conf/defaults.config:1689
 msgid "The Reduced Scoring Period is the default period before the due date during which all additional work done by the student counts at a reduced rate. When enabling reduced scoring for a set the reduced scoring date will be set to the due date minus this number. The reduced scoring date can then be changed. If the Reduced Scoring is enabled and if it is after the reduced scoring date, but before the due date, a message like \"This assignment has a Reduced Scoring Period that begins 11/08/2009 at 06:17pm EST and ends on the due date, 11/10/2009 at 06:17pm EST. During this period all additional work done counts 50% of the original.\" will be displayed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:78
 msgid "The Status figure is the global average of the Status individuals have earned on this problem. The Status is the percentage correct (from 0% to 100%) recorded for the problem.  A low figure may  represent a difficult problem.  The Status is often fairly high since  many students will work on a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1506
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:138
 msgid "The Status figure is the local average of the Status individuals at your institution have earned on this problem. The Status is the percentage correct (from 0% to 100%) recorded for the problem.  A low figure may  represent a difficult problem.  The Status is often fairly high since  many students will work on a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1262
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:11
 msgid "The WeBWorK Project"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:822
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:25
+msgid "The WeBWorK administrators need to be added to the course in order for them to access the course.  Unchecking this option will make it so WeBWorK administrators cannot directly login to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:129
+msgid "The achievement evaluator is the perl code that is run after each submit to determine if an achievement is earned or not.  Click on the \"Edit Evaluator\" link to edit the evaluator."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:26
 msgid "The adjusted status of a problem is the larger of the problem's status andthe weighted average of the status of those problems which count towards the parent grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1677
+#: /opt/webwork/webwork2/conf/defaults.config:1579
 msgid "The amount of time (in minutes) after the due date that the Answers are available to student to view.  You can change this for individual homework, but WeBWorK will use this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1667
+#: /opt/webwork/webwork2/conf/defaults.config:1569
 msgid "The amount of time (in minutes) before the due date when the assignment is opened.  You can change this for individual homework, but WeBWorK will use this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:386
 msgid "The answer above is NOT correct."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:375
 msgid "The answer above is correct."
 msgstr ""
 
 #. ($filename, $ce->{mail}{maxAttachmentSize})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:230
 msgid "The attached file \"%1\" exceeds the allowed attachment size of %quant(%2,megabyte)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:421
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:496
 msgid "The child problems for this problem will become visible to the student when they either have more incorrect attempts than is specified here, or when they run out of attempts, whichever comes first.  If \"max\" is specified here then child problems will only be available after a student runs out of attempts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:704
-msgid "The configuration module did not find the data it needs to function.  Have your site administrator check that Constants.pm is up to date."
+#. ('href="http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files" target="Webworkdocs"',			'<code>demoCourse.lst</code>','<code>.csv</code>','<code>.lst</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:59
+msgid "The classlist files are stored in the templates directory and provide a convenient way to enter a large number of students into your class. To view the format for <strong>ClassList files</strong> see the <a %1>ClassList specification</a> or download the %2 file and use it as a model. ClassList files can be prepared using a spreadsheet and then saved as %3 (comma separated values) text files.  However, to access as a classlist file, the file suffix needs to be changed to %4, which can be done with the \"Rename\" button."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:16
+msgid "The configuration module did not find the data it needs to function.  Have your site administrator check that site configuration files are up to date."
 msgstr ""
 
-#. (CGI::b($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:151
+#. ($archive_courseID,					$archive_path)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:80
+msgid "The course \"%1\" has already been archived at \"%2\". This earlier archive will be erased.  This cannot be undone."
+msgstr ""
+
+#. (tag('strong', stash('courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:8
 msgid "The course %1 uses an external authentication system (%2). Please go there to log in again."
 msgstr ""
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:186
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:17
 msgid "The course %1 uses an external authentication system (%2). Please return to that system to access this course."
 msgstr ""
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:191
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:23
 msgid "The course %1 uses an external authentication system (%2). You've authenticated through that system, but aren't allowed to log in to this course."
 msgstr ""
 
-#. ($archive_courseID,						$archive_path)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2243
-msgid "The course '%1' has already been archived at '%2'. This earlier archive will be erased.  This cannot be undone."
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:30
+msgid "The course database must be upgraded before archiving this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:30
+msgid "The course database must be upgraded before renaming this course."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1995
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:26
+msgid "The current mode should be made clear by the information at the top of the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:46
+msgid "The current value of the achievement counter. Changes to this variable will be saved."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1897
 msgid "The default display mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1855
+#: /opt/webwork/webwork2/conf/defaults.config:1757
 msgid "The default number of attempts before the problem is re-randomized. ( 0 => never )"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1854
+#: /opt/webwork/webwork2/conf/defaults.config:1756
 msgid "The default number of attempts between re-randomization of the problems ( 0 => never)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:251
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:73
+msgid "The description shown to students which states what action is needed to earn the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:5
 msgid "The directory you specified doesn't exist"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1829
-msgid "The display was already cleared."
+#: /opt/webwork/webwork2/conf/defaults.config:2032
+msgid "The e-mail verbosity level controls how much information is automatically added to feedback e-mails.  Levels are<ol><li> Simple: send only the feedback comment and context link</li><li> Standard: as in Simple, plus user, set, problem, and PG data</li><li> Debug: as in Standard, plus the problem environment (debugging data)</li></ol>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2111
-msgid "The e-mail verbosity level controls how much information is automatically added to feedback e-mails.  Levels are<ol><li value=\"Simple\"> Simple: send only the feedback comment and context link</li><li value=\"Standard\"> Standard: as in Simple, plus user, set, problem, and PG data</li><li value=\"Debug\"> Debug: as in Standard, plus the problem environment (debugging data)</li></ol>"
+#. ($achievementName,				$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:293
+msgid "The evaluator for %1 has been renamed to \"%2\"."
 msgstr ""
 
-#. ($achievementName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:625
-msgid "The evaluator for %1 has been renamed to '%2'."
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:246
+msgid "The file \"%1\" cannot be found."
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:339
-msgid "The file %1/%2 already exists and cannot be overwritten. The message was not saved"
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:526
+msgid "The file \"%1\" cannot be read!"
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:190
-msgid "The file %1/%2 cannot be found."
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:522
+msgid "The file \"%1\" is a directory!"
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:181
-msgid "The file %1/%2 is not readable by the webserver."
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:259
+msgid "The file \"%1\" is a template. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:373
-msgid "The file '%1' cannot be found."
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:250
+msgid "The file \"%1\" is protected. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1004
-msgid "The file '%1' cannot be read!"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:19
+msgid "The file $file does not appear to be a text or image file."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:380
-msgid "The file '%1' is a blank problem!"
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:277
+msgid "The file %1 already exists and cannot be overwritten. The message was not saved."
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:998
-msgid "The file '%1' is a directory!"
+#. ("$emailDirectory/$openfilename",				$emailDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:156
+msgid "The file %1 cannot be found. Check whether it exists and whether the directory %2 can be read by the webserver. "
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:375
-msgid "The file '%1' is protected!"
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
+msgid "The file %1 is not contained in the course templates directory and can not be modified."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:598
+#. ("$emailDirectory/$openfilename")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:148
+msgid "The file %1 is not readable by the webserver. Check that it's permissions are set correctly."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:203
 msgid "The file does not appear to be a text file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:88
 msgid "The file you are trying to download doesn't exist"
 msgstr ""
 
 #. ($filename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:221
 msgid "The filetype of the attached file \"%1\" is not allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3843
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2149
 msgid "The following courses were successfully hidden:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3908
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2218
 msgid "The following courses were successfully unhidden:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4121
-msgid "The following upgrades are available for your WeBWorK system:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:34
+msgid "The following describes how the checkboxes alter the scoring output"
 msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2081
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:66
 msgid "The following users are NOT assigned to this set and will be ignored: %1"
 msgstr ""
 
-#. (join('.', @{$problemSeqs[$children_counts_indexs[0]]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:288
+msgid "The given file path is not a valid location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:49
+msgid "The goal value of the achievement counter."
+msgstr ""
+
+#. (join('.', @{ $problemSeqs[ $children_counts_indexs[0] ] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1334
 msgid "The grade for this problem is the larger of the score for this problem, or the score of problem %1."
 msgstr ""
 
-#. (join(', ', map({join('.', @{$problemSeqs[$_]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2064
+#. (join(', ', map({ join('.', @{ $problemSeqs[$_] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
 msgid "The grade for this problem is the larger of the score for this problem, or the weighted average of the problems: %1."
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1954
-msgid "The hardcopy header for set %1 has been renamed to '%2'."
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1078
+msgid "The hardcopy header for set %1 has been renamed to \"%2\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:111
+#. ($showHintsAfter)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:36
+msgid "The hint shown is an instructor preview and will be shown to students after %quant(%1,attempt)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:32
+msgid "The hint shown is an instructor preview and will not be shown to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:22
+msgid "The information box on the right displays information about the course. This is useful for leaving course wide messages for students. It contains text from the file templates/course_info.txt. Instructors can edit this file from the web (click on the \"Edit\" link)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:30
 msgid "The initial value is the answer sub score for the answer that is currently shown.  If this is modified, it will be used to compute the total problem score below.  This score is not saved, and will reset to the score for the shown answer if the page is reloaded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:161
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:97
+msgid "The initial value is the currently saved score as a point value computed using the percent score.  This point value is used to compute the percent score (rounded to a whole percent) that can be saved."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:145
 msgid "The initial value is the currently saved score for this student."
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
 msgid "The institution associated with the course %1 has been changed from %2 to %3"
 msgstr ""
 
-#. ($rename_newCourseID, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1498
+#. ($rename_newCourseID, $optional_arguments{courseInstitution})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:729
 msgid "The institution associated with the course %1 is now %2"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:599
+msgid "The instructor account with user id %1 does not exist.  Instructor accounts must be created manually."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:635
 msgid "The instructor account with user id %1 does not exist.  Please create the account manually via WeBWorK."
 msgstr ""
 
-#. ($r->param('new_set_name')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1897
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:87
+msgid "The key maps that are available are \"default\", \"emacs\", \"sublime\", and \"vim\". The \"default\" key map has the standard behavior of a browser text area. You can use Ctrl-C to copy, Ctrl-V to paste, Ctrl-F to search, etc. If you are more comfortable with the \"emacs\", \"sublime\", or \"vim\" text editors then you may choose to use one of those key maps instead."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:75
+msgid "The large text window"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:27
+msgid "The list of files include regular files, directories (ending in a \"/\") and links (ending in a \"@\")."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:52
+msgid "The login name cannot be changed. (It is the primary key for the student's data.) If you make a mistake in the login name at the beginning of the course (before any work has been done) then it is best to simply add a new student with the correct entry and drop the student with the bad login name. (See drop and delete students below.) If the login name must be changed after a user has started working assignments, then contact your system administrator, who can use the webwork2 \"bin/change_user_id\" script to change the user id."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:20
+msgid "The main page allows access to set and student statistics.  When selecting a student, their grades page is shown, which lists set totals and per problem grades for each set assigned to the student.  When selecting a set, various statistics and histograms are shown for the overall grades of students who are currently enrolled or auditing the course."
+msgstr ""
+
+#. ('href="http://webwork.maa.org/wiki" target="ww_wiki"',	'href="http://webwork.maa.org/wiki/Instructors" target="ww_wiki"')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:24
+msgid "The main page for WeBWorK documentation is the <a %1>webwork wiki</a> while specific help for instructors setting up a course are in the <a %2>instructors' section</a>."
+msgstr ""
+
+#. ($c->param('new_set_name')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:569
 msgid "The name \"%1\" is not a valid set name.  Use only letters, digits, dashes, underscores, periods, and spaces."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1530
+#: /opt/webwork/webwork2/conf/defaults.config:1432
 msgid "The name of course information file (located in the templates directory). Its contents are displayed in the right panel next to the list of homework sets."
 msgstr ""
 
@@ -5386,613 +6959,872 @@ msgstr ""
 msgid "The name of the LMS. This is used in messages to users that direct them to go back to the LMS to access something in the WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:63
+msgid "The number of points earned for earning the achievement."
+msgstr ""
+
 #. ($openDate, $dueDate, $answerDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1104
 msgid "The open date: %1, close date: %2, and answer date: %3 must be defined and in chronological order."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:702
+#. ($path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:393
+msgid "The original path is not in a valid location. Using failsafe %1"
+msgstr ""
+
+#. ($forcedSourceFile)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:510
+msgid "The original path to the file is %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:262
 msgid "The password and password confirmation for the instructor must match."
 msgstr ""
 
-#. (CGI::b($r->maketext("[_1]'s Current Password", $user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:27
+msgid "The password can be any combination of letters, numbers and special symbols. Students are encouraged to use all three, and stay away from dictionary words. The password should not be the same as any password used elsewhere, such as for an email account. The password will only be present on the page if the user has permission to change the password."
+msgstr ""
+
+#. ($c->tag(						'b',						$c->maketext(							"[_1]'s Current Password",							$c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:95
 msgid "The password you entered in the %1 field does not match your current password. Please retype your current password and try again."
 msgstr ""
 
-#. (CGI::b($r->maketext("[_1]'s New Password",         $e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:105
+#. ($c->tag('b', $c->maketext("[_1]'s New Password",         $e_user_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:82
 msgid "The passwords you entered in the %1 and %2 fields don't match. Please retype your new password and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:789
-msgid "The path to the original file should be absolute"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:374
+msgid "The path can not be the temporary edit directory."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:667
-msgid "The percentage of active students with correct answers for each problem"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:370
+msgid "The path to the original file should be absolute."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:131
 msgid "The percentage of students receiving at least these scores. The median score is in the 50% column."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:458
 msgid "The prerequisite conditions have not been met for set '%1'."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1917
-msgid "The problem set is not yet open"
-msgstr ""
-
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2012
-msgid "The recorded score for this version is  %1/%2."
+#. (q(down menu to change which student's seed and answers are shown.  Use the "Mark Correct" checkbox to set)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:26
+msgid "The problem is shown at the top with the seed and answers of the selected student.  Use the drop "
 msgstr ""
 
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2021
-msgid "The recorded score for this version is %1/%2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:62
+msgid "The problem set is not yet open"
 msgstr ""
 
 #. ($origReducedScoringDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1971
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1121
 msgid "The reduced credit date %1 in the file probably was generated from the Unix epoch 0 value and is being treated as if it was Unix epoch 0."
 msgstr ""
 
 #. ($openDate, $dueDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1982
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1135
 msgid "The reduced credit date should be between the open date %1 and close date %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1220
 msgid "The reduced scoring date should be between the open date and close date."
 msgstr ""
 
 #. ($tempFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:307
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:298
 msgid "The requested file \"%1\" does not exist on the server."
 msgstr ""
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2085
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1389
 msgid "The score for this problem can count towards score of problem %1."
 msgstr ""
 
-#. ($setName, $effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:306
-msgid "The selected problem set (%1) is not a valid set for %2"
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:69
+msgid "The scoring files are stored in the scoring directory and are produced using the \"Scoring Tools\" page or the scoring command in the \"Instructor Tools\" module. These files can be downloaded, modified in a spreadsheet (for example, to add midterm scores) and then uploaded again to the scoring directory to be merged with email messages. (Use a new file name, other than %1, when uploading to prevent the scoring module from overwriting an uploaded file.)"
 msgstr ""
 
-#. ($urlpath->arg("setID")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1467
-msgid "The selected problem set (%1) is not a valid set for %2%3:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:52
+msgid "The second row of the problem collection area is for browsing directories. The OPL will be there as well as any other directories that you may set up (for example Contrib). If this is selected, all subdirectories containing problems will be listed."
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1946
-msgid "The set header for set %1 has been renamed to '%2'."
+#. (stash('setID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet.html.ep:13
+msgid "The selected problem set (%1) is not a valid set for %2."
+msgstr ""
+
+#. ($setID, $effectiveUserID, $c->{invalidVersionCreation} ? " (acted as by $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:77
+msgid "The selected problem set (%1) is not a valid set for %2: %3"
+msgstr ""
+
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1066
+msgid "The set header for set %1 has been renamed to \"%2\"."
 msgstr ""
 
-#. ($newSetName)
 #. ($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1164 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:491
+msgid "The set name \"%1\" is already in use. Pick a different name if you would like to start a new set. No set created."
+msgstr ""
+
+#. ($newSetName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:584
 msgid "The set name '%1' is already in use.  Pick a different name if you would like to start a new set."
 msgstr ""
 
-#. ($setID, $editingSetVersion, $editForUser[0])
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2109
-msgid "The set-version (%1, version %2) is not assigned to user %3."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:58
+msgid "The sets checked below will be visible to students or hidden from students. Useful for preparing sets ahead of time, but not showing them to students; or for temporarily hiding a set which has a mistake in it while it is being fixed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:54
+msgid "The sets checked below will become available for editing the due dates and visibility."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:73
+msgid "The sets checked below will written to set definition files, to be saved for future use, or to be transferred to another course. The set definition files can be uploaded/downloaded using the \"File Manager\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:29
+msgid "The simple configuration file is the name of the configuration file created when using the \"Course Configuration\" page to configure course options.  This option sets if this configuration file is copied from the old course or not and instead use the server defaults."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:551
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:521
 msgid "The solution has been removed."
 msgstr ""
 
-#. ($fullSetName, $prettyProblemNumber, $self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1975
-msgid "The source file for 'set %1 / problem %2 has been changed from '%3' to '%4'"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:45 /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:33
+msgid "The solution shown is an instructor preview and will only be shown to students after the due date."
+msgstr ""
+
+#. ($c->{fullSetID},						$c->{prettyProblemNumber},						$c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1103
+msgid "The source file for \"set %1 / problem %2\" has been changed from \"%3\" to \"%4\"."
+msgstr ""
+
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1209
+msgid "The temporary file %1 is not contained in the course templates directory and can not be deleted."
+msgstr ""
+
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:689
+msgid "The temporary file %1 is not in the course templates directory and can not be deleted!"
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2133
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:349
 msgid "The test (which is version %1) may  no longer be submitted for a grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1927
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1042
 msgid "The text box now contains the source of the original problem. You can recover lost edits by using the Back button on your browser."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:214
-msgid "The time limit on this assignment was exceeded. The assignment may be checked, but the result will not be counted."
+#. (			% . 'but the result will not be counted.')
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:23
+msgid "The time limit on this assignment was exceeded. The assignment may be checked, "
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1657
+#: /opt/webwork/webwork2/conf/defaults.config:1559
 msgid "The time of the day that the assignment is due.  This can be changed on an individual basis, but WeBWorK will use this value for default when a set is created."
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1443
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:689
 msgid "The title of the course %1 has been changed from %2 to %3"
 msgstr ""
 
-#. ($rename_newCourseID, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1491
+#. ($rename_newCourseID, $optional_arguments{courseTitle})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:722
 msgid "The title of the course %1 is now %2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:16 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:167
+msgid "The top number is the percent score on the problem.  A period (.) indicates a problem has not been attempted. The bottom number is the number of incorrect attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:25
+msgid "The total grade row at the bottom shows the total score and percent average over all open assignments.  The total grade row can be shown/hidden under general course configuration settings."
+msgstr ""
+
 #. ($enableReducedScoring)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1151
 msgid "The value %1 for enableReducedScoring is not valid; it will be replaced with 'N'."
 msgstr ""
 
 #. ($timeCap)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2032
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1209
 msgid "The value %1 for the capTimeLimit option is not valid; it will be replaced with '0'."
 msgstr ""
 
 #. ($hideScore)
 #. ($hideScoreByProblem)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2018 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2023
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1178 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1189
 msgid "The value %1 for the hideScore option is not valid; it will be replaced with 'N'."
 msgstr ""
 
 #. ($hideWork)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1200
 msgid "The value %1 for the hideWork option is not valid; it will be replaced with 'N'."
 msgstr ""
 
 #. ($relaxRestrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2045
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1235
 msgid "The value %1 for the relaxRestrictIP option is not valid; it will be replaced with 'No'."
 msgstr ""
 
 #. ($restrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2037
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1221
 msgid "The value %1 for the restrictIP option is not valid; it will be replaced with 'No'."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:46
+msgid "The visible name/title of the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:36
 msgid "The webwork server must be able to write to these directories. Please correct the permssion errors."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1537
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:83
+msgid "Theme"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1439
 msgid "Theme (refresh page after saving changes to reveal new theme.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:109
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:5
 msgid "Theme:"
 msgstr ""
 
 # Context is "Sort by ____ Then by _____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:775 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:843 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:872
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:17 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:17 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:30
 msgid "Then by"
 msgstr ""
 
-#. ($count_line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:603
+#. ($listingsCount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:116 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:52
 msgid "There are %1 matching WeBWorK problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1625
+#: /opt/webwork/webwork2/conf/defaults.config:1527
 msgid "There are currently two hardcopy themes to choose from: One Column and Two Columns.  The Two Columns theme is the traditional hardcopy format.  The One Column theme uses the full page width for each column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2979
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1519
 msgid "There are extra database fields which are not defined in the schema for at least one table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1243 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2179
-msgid "There are extra database fields which are not defined in the schema for at least one table.  They can only be removed when upgrading the course."
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:23 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:23
+msgid "There are extra database fields which are not defined in the schema for at least one table.  They can be removed when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1404
 msgid "There are extra database fields which are not defined in the schema for at least one table. Check the checkbox by the field to delete it when upgrading the course. Warning: Deletion destroys all data contained in the field and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1508
 msgid "There are extra database tables which are not defined in the schema."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2833
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1389
 msgid "There are extra database tables which are not defined in the schema. "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1234 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:15 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:15
 msgid "There are extra database tables which are not defined in the schema.  These can be deleted when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:601
-msgid "There are no matching WeBWorK problems"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:976
-msgid "There are no set definition files in this course to look at."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2199
-msgid "There are tables or fields missing from the database.  The database must be upgraded before archiving this course."
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:29
+msgid "There are many options available at the bottom:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4108
-msgid "There are upgrades available for the Open Problem Library."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:49
+msgid "There are no completed versions of this test."
 msgstr ""
 
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4072
-msgid "There are upgrades available for your current branch of PG from branch %1 in remote %2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:115 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:51
+msgid "There are no matching WeBWorK problems"
 msgstr ""
 
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4010
-msgid "There are upgrades available for your current branch of WeBWorK from branch %1 in remote %2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:8
+msgid "There are no set definition files in this course to look at."
 msgstr ""
 
 #. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:273
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:87
 msgid "There is NO undo for this function.  Do not use it unless you know what you are doing!  When you unassign a student using this button, or by unchecking their name, you destroy all of the data for achievement %1 for this student."
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:230
+#. (tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:91
 msgid "There is NO undo for this function.  Do not use it unless you know what you are doing!  When you unassign a student using this button, or by unchecking their name, you destroy all of the data for homework set %1 for this student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:205
-msgid "There is NO undo for this function.  Do not use it unless you know what you are doing!  When you unassign sets using this button, or by unchecking their set names, you destroy all of the data for those sets for this student."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:234
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:68
 msgid "There is NO undo for unassigning a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:174 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:177 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:139
-msgid "There is NO undo for unassigning students."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4069
-msgid "There is a new version of PG available."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:125
+msgid "There is NO undo for unassigning sets. Do not do so unless you know what you are doing!  When you unassign sets by unchecking set names and clicking save, you destroy all of the data for those sets for this student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4007
-msgid "There is a new version of WeBWorK available."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:16 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:58 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:21
+msgid "There is NO undo for unassigning students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:529
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:490
 msgid "There is a written solution available."
 msgstr ""
 
 #. ($message_file, $merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:50
 msgid "There is no additional grade information.  A message about additional grades can go in [TMPL]/email/%1. It is merged with the file [Scoring]/%2. These files can be edited using the \"Email\" link and the \"File Manager\" link in the left margin."
 msgstr ""
 
 #. ($continueTimeLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:486
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:25
 msgid "There is no time remaining on the currently open test. Click continue below and then click \"Grade Test\" within %1 seconds to submit the test for a grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:856
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:65
 msgid "There is no undo for deleting files or directories!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:534
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:495
 msgid "There is no written solution available for this problem, but you can still view the correct answers."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:537
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:498
 msgid "There is no written solution available for this problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1539
-msgid "There is one main theme to choose from: math4. It has two variants, math4-green and math4-red. The theme specifies a unified look and feel for the WeBWorK course web pages."
+#: /opt/webwork/webwork2/conf/defaults.config:1441
+msgid "There is one main theme to choose from: math4. It has three variants: math4-green, math4-red, and math4-yellow. The theme specifies a unified look and feel for the WeBWorK course web pages."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2270
-msgid "There may be something wrong with this question. Please inform your instructor including the warning messages below."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:441
 msgid "There was an error during the login process.  Please speak to your instructor or system administrator if this recurs."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:173 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:284 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:307 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:336 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:475 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:484 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:511 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:543 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:219 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:336 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:174 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:294 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:318 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:354 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:492 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:536 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:575 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:172 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:189 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:201 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:212 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:227 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:238 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:331 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:355 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:365 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:402 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:447
 msgid "There was an error during the login process.  Please speak to your instructor or system administrator."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1935
+#. ('href="https://webwork.maa.org/wiki/Set_Definition_Files" target="Webworkdocs"')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:48
+msgid "These are stored in the templates directory. The format of <strong>Set Definition files</strong> is described in the <a %1>Set Definition specification</a>. Set definition files are mainly useful for transferring set assignments from one course to another and are created when exporting a problem set from the \"Hmwk Sets Editor\".  Each set defintion file contains a list of problems used and the dates and times. These definitions can be imported into the current course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:77
+msgid "These are the files from which problems are generated and are located in the templates directory or in subdirectories. They can be edited directly using the \"Edit\" link on each problem page or from the \"Hmwk Sets Editor\". The File Manager allows you to upload or download these files. \tDirectories that start with \"set\" contain pg files and are generated when exporting a problem set in which there are local versions of a problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:40
+msgid "These options will only be shown if the user has the permission to change display settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:44
+msgid "These problems require some application of algorithms, but do not rise to the level of a full word problem. For example, \"Identify the local extrema for f(x) = ...\". One has to apply algorithms and interpret results."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1837
 msgid "These users and higher get the \"Show Past Answers\" button on the problem page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:17
 msgid "This action can take a long time if there are many students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:168
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:12
 msgid "This action will not overwrite existing users."
 msgstr ""
 
-#. (CGI::b($r->maketext("Guest Login")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:279
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:20
+msgid "This allows for the viewing, downloading, uploading and other management of files in the course.  Select a file or set of files (using CTRL or SHIFT) and click the desired button on the right.  Many actions can only be done with a single file (like view). Selecting a directory or set of files and clicking \"Make Archive\" creates a compressed tar file with the name COURSE_NAME.tgz"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:34
+msgid "This browses the Open Problem Library (OPL) in category (Subject/Chapter/Section) form. Select the desired categories (all three do not need to be selected) and click \"View Problems\". If the \"Include Contrib\" box is selected then those problems in the Contrib section of the OPL that have the categories defined are also included. Contrib problems are problem that haven't been vetted as thoroughly as OPL problems. If you want hints or solutions included while browsing select the appropriate box."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:49
+msgid "This button is also present both at top and the bottom of the page. Discards all changes, reloading the page by re-reading the database information for this set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:39
+msgid "This button is present both at top and the bottom of the page. Any and all changes made to any part of the set will be saved with one important exception: When editing the set for one or more students, you can choose to override the default value (defined for the set in general) by clicking on the checkbox and providing a value (or possibly leaving blank) and checking the override checkbox. If you do <strong>NOT</strong> check the checkbox, the override value will be discarded and the default value for the set will be used for the users currently being edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:105
+msgid "This can computed from the answer sub scores above using the weights shown if they are modified.  Alternatively, enter the point score you want saved here (the above sub scores will be ignored)."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2005
+msgid "This configures if the single problem manual grader has inputs to enter problem scores as a percent, a point value, or both. Note, the problem score is always saved as a percent, so when using a point value, the problem score will be rounded to the nearest whole percent."
+msgstr ""
+
+#. (tag('b', maketext('Guest Login')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:72
 msgid "This course supports guest logins. Click %1 to log into this course as a guest."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:851
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:58
+msgid "This determines if MathQuill answer blanks are enable for the user. This option is only present if MathQuill is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:63
+msgid "This determines if the MathView equation editor button will be appended to text answer blanks. his option is only present if MathView is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:52
+msgid "This determines whether or not saved past answers are automatically filled in to the problem form when a student returns to a problem after having left the problem. This option is only visible if the user has the permission to show old answers."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:85
+msgid "This directory is accessible from the web. You can use it to store html documents or image documents that are used by the course. Do not store private information in this directory or in any subdirectory thereof. These documents can be linked to from within problems using the htmlLink macro."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:255
+msgid "This file is a template. You may use \"Save As\" to create a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:20
+msgid "This form can assign, unassign, and edit user data for a single achievement.  You can assign the achievement to all current users or select which users to assign the achievement to and click Save.  You can unassign the achievement by unchecking a student's name (note all data will be deleted).  To unassign the achievement from all users, first select \"Allow unassign\" and then click the \"Unassign from All Users\" button. You can also toggle the earned status with the checkbox in the \"Earned\" column and edit the achievement counter for counting achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:19
+msgid "This gives the status and dates of the main set. Indvidual students may have different settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:51
 msgid "This homework set contains no problems."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1231
 msgid "This homework set is closed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1986
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1229
 msgid "This homework set is not yet open."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:932
-msgid "This is a blank problem template file and can not be edited directly. Use the 'NewVersion' action below to create a local copy of the file and add it to the current problem set."
-msgstr ""
-
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:423
 msgid "This is a new (re-randomized) version of the problem."
 msgstr ""
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:580
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:109
 msgid "This is a timed test. You will have %quant(%1,hour) and %quant(%2,minute) to complete the test."
 msgstr ""
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:592
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:119
 msgid "This is a timed test. You will have %quant(%1,hour,hours,)%quant(%2,minute,minutes,) to complete the test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:284
-msgid "This is the Achievement Editor.  It is used to edit the achievements available to students.  Please keep in mind the following facts: Achievments are displayed, and evaluated, in the order they are listed. The \"secret\" category creates achievements which are not visible to students until they are earned.  The \"level\" category is used for the achievements associated to a users level."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:81
+msgid "This is done by first entering the user as a student and then changing the permission level of the user. First edit the user by clicking on the pencil next to their name (or using the technique above for several users), then change their permssion level -- an entry blank at the far right of the screen, you may have to scroll to see it. The permission levels are"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:481
-msgid "This is the classlist editor page, where you can view and edit the records of all the students currently enrolled in this course.  The top of the page contains forms which allow you to filter which students to view, sort your students in a chosen order, edit student records, give new passwords to students, import/export student records from/to external files, or add/delete students.  To use, please select the action you would like to perform, enter in the relevant information in the fields below, and hit the \"Take Action!\" button at the bottom of the form.  The bottom of the page contains a table containing the student usernames and their information. Clicking on the links in the column headers of the table will sort the table by the field it corresponds to. The Login Name fields contain checkboxes for selecting the user.  Clicking the link of the name itself will allow you to act as the selected user.  There is also an edit link following the name which will take you to a page where you can edit the selected user's information.  Clicking the emails will allow you to email the corresponding user.  Clicking the links in the entries in the assigned sets columns will take you to a page where you can view and reassign the sets for the selected user. "
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:156
+msgid "This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" page if you wish to assign a homework set to all students or a large group of students (e.g. a section)."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1810
-msgid "This is the default number of attempts before show me another becomes available to students.  It can be set to -1 to disable show me another by default."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:161
+msgid "This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:456
-msgid "This is the homework sets editor page where you can view and edit the homework sets that exist in this course and the problems that they contain. The top of the page contains forms which allow you to filter which sets to display in the table, sort the sets in a chosen order, edit homework sets, publish homework sets, import/export sets from/to an external file, score sets, or create/delete sets.  To use, please select the action you would like to perform, enter in the relevant information in the fields below, and hit the \"Take Action!\" button at the bottom of the form.  The bottom of the page contains a table displaying the sets and several pieces of relevant information. The Edit Set Data field in the table contains checkboxes for selection and a link to the set data editing page.  The cells in the Edit Problems fields contain links which take you to a page where you can edit the containing problems, and the cells in the edit assigned users field contains links which take you to a page where you can edit what students the set is assigned to."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:171
+msgid "This is done from the \"Hmwk Sets Editor\" page or the \"Instructor tools\" page."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1699
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:71
+msgid "This is most easily done by importing a class list. The class list can be uploaded from your workstation to the server using the File Manager page. The class list must be a file ending in .lst and must have a specific <a href=\"http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files\">format</a>. Once the file has been uploaded to the server the file will appear in the import action pop-up list (5th action). demoCourse.lst is available for most courses and adds the \"practice users\" which activate guest logins to the class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:23
+msgid "This is the administration course which is used to manage courses on this server.  Use the \"Admin Menu\" to select the desired action."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1996
+msgid "This is the default number of attempts a student must make before hints will be shown to the student. Set this to -1 to hide hints.  Note that this can be overridden with a per problem setting."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1712
+msgid "This is the default number of attempts before show me another becomes available to students.  It can be set to -1 to disable show me another by default."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1601
 msgid "This is the number of achievement points given to each user for completing a problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:166
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:150
 msgid "This is the only part of the score that is actually saved. This is computed from the answer sub scores above using the weights shown if they are modified.  Alternatively, enter the score you want saved here (the above sub scores will be ignored)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:388
-msgid "This is the past answer viewer.  Students can only see their answers, and they will not be able to see which parts are correct.  Instructors can view any users answers using the form below and the answers will be colored according to correctness."
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:19
+msgid "This is the standard entry point for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:92
+msgid "This is where email messages and templates are saved. You can upload or download files in this directory if you wish to save the files for later."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:77
+msgid "This is where you edit the text of the problem template. Type Ctrl-Enter while this window has focus to re-render the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2462
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:669
 msgid "This is your last submission.  If you say yes, then your answers will be final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2466
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:673
 msgid "This is your only submission.  If you say yes, then your answers will be final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3038
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:42
+msgid "This link gives details for many macros. It links to documentation embedded in the macro files themselves."
+msgstr ""
+
+#. ('PGMLLab/PGML-lab.pg')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:63
+msgid "This links to a WeBWorK \"problem\" which allows you to try out fragments of PGML code. This link will not be available if the file %1 is not located in the templates directory of the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:33
+msgid "This links to a list of problem authoring techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:39
+msgid "This links to a page describing Math Object usage."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:72
+msgid "This links to problem authoring information on the WeBWorK wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:46
+msgid "This may be Mathjax, images, or plainText. Only the options that are enabled for the course will be available to select. This option is only visible if there is more than one display mode enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:42
+msgid "This option shows all pg problems in the course directory structure."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:47
+msgid "This option shows all problems in set definition files that are located in the course directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:44
+msgid "This option shows all problems in sets that have been created in the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:20
+msgid "This page allows one to edit the contents of PG problem files as well as set headers and other files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:20
+msgid "This page allows users to change their password, email address, and display settings used in problems. Note that you can hide this page entirely for students by setting permission levels to login_proctor or higher for the permissions to change password, change e-mail address, and change display settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:20
+msgid "This page allows you to configure course settings such as permission levels, display modes allowed, default display mode, email feedback behavior, and much more."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:20
+msgid "This page displays a student's current achievement level and progress toward the next level, and lists the rewards and badges that the student has earned. If rewards have been earned, then the student may also redeem those rewards."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:26
+msgid "This page gives access to information about the student, independent of the homework sets assigned to them."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:20
+msgid "This page gives information about mass LTI grade updates, and allows you to trigger a grade update for all users and all sets, all sets for one user, all users for one set, or one user for one set.  When a user is selected, the sets drop down menu is updated to only allow selecting sets assigned the selected user.  Similarly when a set is selected, the user menu is updated to only allow selecting valid users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:20
+msgid "This page is a collection of tools to modify users and sets.  These tools are short cuts for common actions that allow selecting multiple users or sets to act on at once.  Because multiple users and sets can be acted on at the same time, it is often more efficient to use this page when modifying multiple items.  For example, after selecting several users and a set you can change the close date for all selected users for that set.  This page also gives access to \"View/Edit all sets for one user\", which can be used to access settings for all sets including test versions for that user."
+msgstr ""
+
+#. (q(table to save any changes.  Each student's name links to that student's problem and opens up the)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:20
+msgid "This page is for manually grading a problem for all assigned students.  The table of students shows their last answers, percent score, and feedback comment.  The \"Save\" button is located below the "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:20
+msgid "This page is used to browse problems that will be used to fill problem sets. The first step is to choose which set you are working on. If you need to create a new problem set fill in the blank next to the \"Create a New Set in This Course\" button and then press the button. Then choose which set you want to work on in the drop down menu."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:20
+msgid "This page is useful for monitoring student progress on assignments. Student progress can either be viewed for a single set or for a single student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:20
+msgid "This page manages all of the homework sets (including quizzes/tests). The following allow editing directly of a single problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:20
+msgid "This page shows the student's current grades for all sets they are assigned to.  Only visible sets are shown to the student, while invisible set names are italic when viewed as an instructor.  Students can only see the per problem grades on open assignments."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3169
 msgid "This problem contains a video which must be viewed online."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:602
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:631
 msgid "This problem has more than one part."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2059 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2293
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1323 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1576
 msgid "This problem has open subproblems.  You can visit them by using the links to the left or visiting the set page."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem.html.ep:66
+msgid "This problem is not valid."
+msgstr ""
+
 #. ($prettyID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2619
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:399
 msgid "This problem uses the same source file as number %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:418
 msgid "This problem will not count towards your grade."
 msgstr ""
 
-#. ($EMAIL)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1109
+#. ($ur->email_address)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:1
 msgid "This sample mail would be sent to %1"
 msgstr ""
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2088
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1399
 msgid "This score for this problem does not count for the score of problem %1 or for the set."
 msgstr ""
 
-#. ($message_file,		$merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:167
+#. ($message_file,				$merge_file)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:127
 msgid "This scoring message is generated from [TMPL]/email/%1. It is merged with the file [Scoring]/%2. These files can be edited using the \"Email\" link and the \"File Manager\" link in the left margin."
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2215
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:155
 msgid "This set %1 is assigned to %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2932
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:678
 msgid "This set doesn't contain any problems yet."
 msgstr ""
 
-#. ($beginReducedScoringPeriod, $dueDate, $reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:334
+#. ($c->formatDateTime($reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:44
 msgid "This set had a reduced scoring period that started on %1 and ended on %2.  During that period all work counted for %3% of its value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:78
 msgid "This set has a set-level proctor password to authorize logins. Enter the password below."
 msgstr ""
 
-# Context is "This set is visible" or "This set is hidden"
-#. (CGI::span({class=>$visiblityStateClass}, $visiblityStateText)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:532
-msgid "This set is %1"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:411 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:59
 msgid "This set is hidden from students."
 msgstr ""
 
 #. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:330
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:40
 msgid "This set is in its reduced scoring period.  All work counts for %1% of its value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:65
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:51
+msgid "This set is not assigned to any students."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:410 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:57
 msgid "This set is visible to students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:190
-msgid "This set needs to be assigned to you before you can grade it."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:42
+msgid "This set or problem is not valid."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:158
-msgid "This set will be unavailable to students until they have earned a certain score on the sets specified in this field.  The sets should be written as a comma separated list.  The minimum score required on the sets is specified in the following field."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:164
+msgid "This set will be unavailable to students until they have earned a certain score on the sets specified in this field. The sets should be written as a comma separated list. The minimum score required on the sets is specified in the following field."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2007
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:111
+msgid "This should be done cautiously. Once a student is deleted from a course their data is lost forever and cannot be recovered. They can be added to the course as a new student, but all of their homework set assignments and homework has been permanently deleted."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1962
 msgid "This source file does not exist!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1961
 msgid "This source file is a directory!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1963
 msgid "This source file is not a plain file!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2005
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1960
 msgid "This source file is not readable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:358
-msgid "This specifies the rerandomization period: the number of attempts before a new version of the problem is generated by changing the Seed value. The value of -1 uses the default from course configuration. The value of 0 disables rerandomization."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:651
-msgid "This table lists the current attempts for this test/quiz, along with its status, score, start date, and close date. Click on the version link to access that version. "
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+msgid "This specifies the number of attempts before hints are shown to students. The value of -2 uses the default from course configuration. The value of -1 disables hints. Note that this will only have an effect if the problem has a hint."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:626
-msgid "This test is closed."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
+msgid "This specifies the rerandomization period: the number of attempts before a new version of the problem is generated by changing the Seed value. The value of -1 uses the default from course configuration. The value of 0 disables rerandomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:548
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:81
 msgid "This test requires a proctor password to continue."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:600
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:126
 msgid "This test requires a proctor password to start."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2248 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2323
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:45
+msgid "This will determine if the output is in one or two columns."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:21 /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:21
 msgid "Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:249
 msgid "Time Interval for New Test Versions (min; 0=infty)"
 msgstr ""
 
-#. ($elapsedTime,$allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:159
+msgid "Time Remaining"
+msgstr ""
+
+#. ($c->{elapsedTime}, sprintf('%.0f', 10 * ($c->{set}->due_date - $c->{set}->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:336
 msgid "Time taken on test: %1 min (%2 min allowed)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
 msgid "Timestamp"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1610
+#: /opt/webwork/webwork2/conf/defaults.config:1512
 msgid "Timezone for the course"
 msgstr ""
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:512
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:330
 msgid "To access this set you must score at least %1% on set %2."
 msgstr ""
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:514
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:336
 msgid "To access this set you must score at least %1% on the following sets: %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:53
 msgid "To add an additional instructor to the new course, specify user information below. The user ID may contain only numbers, letters, hyphens, periods (dots), commas,and underscores."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:42
 msgid "To add the WeBWorK administrators to the new course (as administrators) check the box below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:239
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:118
+msgid "To assign one or more sets to an individual student click in the column \"Assigned Sets\" in the student's row. This will take you to a page where you can assign and unassign homework sets and change the due dates for homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:79
 msgid "To change status (scores or grades) for this student for one set, click on the individual set link."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:621
-msgid "To copy problem templates from an existing course, select the course below."
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:106
+msgid "To copy the templates and html folders from an existing course, select the course below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2200
-msgid "To edit a specific student version of this set, edit (all of) her/his assigned sets."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:102
+msgid "To drop a student or students, select them for editing as described above and then set the pop-up list to enrolled,drop, or audit. Dropped students cannot log in to the course, are not assigned new homework sets and are not sent e-mail. They can be re-enrolled simply by changing their status back to enrolled. No data is lost, any homework sets assigned before they were dropped are restored unchanged."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:376
-msgid "To edit this text you must first make a copy of this file using the 'NewVersion' action below."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:143
+msgid "To edit a specific student version of this set, edit (all of) her/his assigned sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:381
-msgid "To edit this text you must use the 'NewVersion' action below to save it to another file."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:29
+msgid "To perform an action select the desired action tab and click the submit button."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1343
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:90
 msgid "To this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:143
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:69
+msgid "To use the Email merge feature, upload a CSV with calculated grades to the scoring directory using the \"File Manager\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:767 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:48 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:14 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:58
+msgid "Today"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:33
+msgid "Toggle each of the options to include or not include in the output."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:522
+msgid "Top Score"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:118
+msgid "Top level of author information on the wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:114
+msgid "Total Points"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:18
 msgid "Total Points:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:90
 msgid "Totals"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:290
 msgid "Totals only (not problem scores)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:291
 msgid "Totals only, only after answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:236
 msgid "Transfer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:213 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:284 /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:22 /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:35
 msgid "True"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1279
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:245
 msgid "Try it"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:26
 msgid "Tunic of Extension"
 msgstr ""
 
@@ -6000,1321 +7832,1634 @@ msgstr ""
 msgid "Two Columns"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1470
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:30
 msgid "Type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2250 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2325
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:84
+msgid "Type:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:29 /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:23
 msgid "URI"
 msgstr ""
 
 #. ($achievementName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:297
 msgid "Unable to change the evaluator for set %1. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:819
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1084
+msgid "Unable to change the hardcopy header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1070
+msgid "Unable to change the set header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{fullSetID}, $c->{prettyProblemNumber})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1110
+msgid "Unable to change the source file path for set %1, problem %2. Unknown error."
+msgstr ""
+
+#. ($c->shortPath($delFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1246
+msgid "Unable to delete backup file \"%1\"."
+msgstr ""
+
+#. ($formatBackupTime)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:571
+msgid "Unable to delete backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:888
+msgid "Unable to make \"%1\" the hardcopy header for %2."
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:860
+msgid "Unable to make \"%1\" the set header for %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:693
 msgid "Unable to obtain error messages from within the PG question."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:384
-msgid "Unable to write to '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:275
+msgid "Unable to open a temporary file at the given location."
+msgstr ""
+
+#. ($c->shortPath($backupFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1233
+msgid "Unable to read backup file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2613
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:193 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:636
+msgid "Unable to write to \"%1\": %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:15
 msgid "Unarchive"
 msgstr ""
 
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2596
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:4
 msgid "Unarchive %1 to course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2450 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2531 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2581 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:1 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:3 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:46 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:40
 msgid "Unarchive Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2675
-msgid "Unarchive Next Course"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:17
+msgid "Unarchive Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:214
-msgid "Unassign All Sets"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:25
+msgid "Unarchive Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:281 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1306
+msgid "Unarchive Next Course"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:92 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:97
 msgid "Unassign from All Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:61
 msgid "Unassign selected sets from selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:58
-msgid "Unassignments were not done.  You need to both click to \"Allow unassign\" and click on the Unassign button."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:57
+msgid "Unassignments were not done.  You need to select \"Allow unassign\" and then click on the Unassign button."
 msgstr ""
 
 #. ($unattempted, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1047
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:44
 msgid "Unattempted: %1/%2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:53
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:37
 msgid "Unclassified Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:242
 msgid "Ungraded"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3723 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3765
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:39 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:58
 msgid "Unhide Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1465
-msgid "Unlock an additional version of a Gateway Test.  If used before the close date of the Gateway Test this will allow you to generate a new version of the test."
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1151
+msgid "Unkown saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:28
+msgid "Unlock an additional version of a test.  If used before the close date of the test this will allow you to generate a new version of the test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:164
-msgid "Unpack"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:45 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:47
+msgid "Unpack Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:113
 msgid "Unpack archives automatically"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2709
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:15
 msgid "Unselect all courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:130
-msgid "Update"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:63
+msgid "Update Display"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:84
+msgid "Update Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:27
+msgid "Update Interval"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:102
+msgid "Update Menus"
+msgstr ""
+
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:51
+msgid "Update aborted. Invalid set %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:671
-msgid "Update Display"
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:47
+msgid "Update aborted. Invalid user %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:930
-msgid "Update Menus"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:67
+msgid "Update set:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:684 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:729
-msgid "Update settings and refresh page"
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:8
+msgid "Update the checked directories?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2695
-msgid "Update the checked directories?"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:50
+msgid "Update user:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3544
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1908
 msgid "Updated location description."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2739 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2917
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:47 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:40
 msgid "Upgrade"
 msgstr ""
 
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
 msgid "Upgrade %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1327 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2278
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:97 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:79
 msgid "Upgrade Course Tables"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2693 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2761 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:382
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:26 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:1 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:59 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:7 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:42
 msgid "Upgrade Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3010
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:17
+msgid "Upgrade Courses Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:43
+msgid "Upgrade courses from a previous version of WeBWorK."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1582
 msgid "Upgrade process completed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:167 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:388
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:37 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:65
 msgid "Upload"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2441
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:72
+msgid "Upload, download and delete text files, including scoring spread sheets, set definition files, class list spread sheets, and \"PG\" problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:292
 msgid "Use Default Header File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:325 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:127
 msgid "Use Equation Editor?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:204
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:20
 msgid "Use Reward"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2720
-msgid "Use System Default"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:516
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:27
 msgid "Use browser back button to return from preview mode."
 msgstr ""
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:506
+#. (tag('b', $c->{achievementID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:16
 msgid "Use in achievement %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:526
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:23
 msgid "Use in new achievement:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:149
 msgid "Use live equation rendering?"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2028
+#: /opt/webwork/webwork2/conf/defaults.config:1929
 msgid "Use log base 10 instead of base <i>e</i>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2034
+#: /opt/webwork/webwork2/conf/defaults.config:1935
 msgid "Use older answer checkers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:234
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:123
+msgid "Use the \"Create\" and \"Delete\" actions to create or delete achievements. Note that deleting an achievement will delete all data associated to the achievement and cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:35
+msgid "Use the \"Merge file\" drop down menu to select which merge file to use, or select \"None\" to not use any merge file.  When a merge file is selected, the data for active students will be displayed above the \"Email Body\".  This will show you the structure of the merge file and the column variables associated with each column.  Data that is longer than 7 characters will be truncated, and the data can be scrolled up and down to see all rows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:28
+msgid "Use the \"Users\" and \"Sets\" forms to select which users and sets to act on.  Multiple items can be selected using ctrl-click or shift-click.  The action buttons are grouped into three categories.  The first is a set of actions that act on the selected users, the second is a set of actions that act on the selected sets, and the third is a set of actions for acting on a combination of sets and users.  If an invalid number of users or sets are selected, the action will not be preformed, and an error message will be placed on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:25
+msgid "Use the editor to edit the evaluator and the action form at the bottom to save the evaluator. You can either overwrite the current evaluator file or save as a new evaluator file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:15
 msgid "Use the interface below to quickly access commonly-used instructor tools, or select a tool from the list to the left."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:332
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:26
+msgid "Use the options in the second box to pick a collection of problems decribed below. In each case, clicking \"View Problems\" will render a fixed number of problems (default of 20). After problems are shown, there will be options to show the next/previous batch of problems, add all problems to the target set (set at the top of the page) or clear the curent batch of problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:27
 msgid "Use this form to ask your instructor a question, to report a problem with the WeBWorK system, or to report an error in a problem you are attempting. Along with your message, additional information about the state of the system will be included."
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:781
-msgid "User '%1' will not be copied from admin course as it is the initial instructor."
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:29
+msgid "Use this page to change your password."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:557 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
-msgid "User ID"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:20
+msgid "Use this page to send emails to active (enrolled or auditing) students.  Emails can be sent to all active students or selected students.  Use the \"Students\" form to sort, filter, or format how the user name is displayed.  Click \"Change Display Settings\" to apply any changes.  Use control-click or shift-click to select multiple students to email."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:298
-msgid "User Settings"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:67
+msgid "Used for \"counting\" achievements, which sets the value a counter must reach in order to earn the achievement. For example this is used counting the number of completed problems."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:490
-msgid "User Value"
+#. (param('user')
+#. (param('effectiveUser')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:2 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:7
+msgid "User \"%1\" not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:52
-msgid "User has been assigned to all current sets."
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:324
+msgid "User \"%1\" will not be copied from admin course as it is the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:58
-msgid "User has been unassigned from all sets."
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:34
+msgid "User %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:247
-msgid "User's name is:"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:217 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:64
+msgid "User ID"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:230 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:28
+msgid "User Settings"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:17
+msgid "User Settings Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:68
-msgid "User's sets have been reassigned."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:576 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:13
+msgid "User overrides"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:62
+msgid "User's name is:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:60
 msgid "User's username is:"
 msgstr ""
 
 #. ($user, $setID, $j)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1077
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
 msgid "UserProblem missing for user=%1 set=%2 problem=%3. This may indicate database corruption."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:51
 msgid "Username"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:499 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:126 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:272 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:18 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:23 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:27 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:9
 msgid "Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:339
 msgid "Users Assigned to Set %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2077
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:17
+msgid "Users Assigned to Set Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:65
 msgid "Users List"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1925
+#: /opt/webwork/webwork2/conf/defaults.config:1827
 msgid "Users at this level and higher are allowed to change display settings used in pg problems.Note that if it is expected that there will be students that have vision impairments and MathQuill is enabled to assist with answer entry, then you should not set this permission to a level above student as those students may need to disable MathQuill."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1915
+#: /opt/webwork/webwork2/conf/defaults.config:1817
 msgid "Users at this level and higher are allowed to change their e-mail address. Normally guest users are not allowed to change the e-mail address since it does not make sense to send e-mail to anonymous accounts."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1879
+#: /opt/webwork/webwork2/conf/defaults.config:1781
 msgid "Users at this level and higher are allowed to change their password. Normally guest users are not allowed to change their password."
 msgstr ""
 
-#. ($names{$primary}, $names{$secondary}, $names{$ternary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:924
+#. ($c->maketext(FIELD_PROPERTIES()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:316
 msgid "Users sorted by %1, then by %2, then by %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1906
+#: /opt/webwork/webwork2/conf/defaults.config:1808
 msgid "Users with at least this permission level get a link in the left panel for reporting bugs to the bug tracking system at bugs.webwork.maa.org."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2140
+#: /opt/webwork/webwork2/conf/defaults.config:2051
 msgid "Users with this permssion level or greater will automatically be sent feedback from students (generated when they use the \"Contact instructor\" button on any problem page).  In addition the feedback message will be sent to addresses listed below.  To send ONLY to addresses listed below set permission level to \"nobody\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1348 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:183 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:193
 msgid "Uses Math Objects"
 msgstr ""
 
-#. ($default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:197
-msgid "Using contents of the default message %1 instead."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1239
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:18
 msgid "Using what display mode?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:5 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:6
 msgid "Using what seed?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:19
+msgid "Using which hardcopy format?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:49
+msgid "Using which hardcopy theme?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:31
+msgid "Usually means students must demonstrate understanding of facts. This is more than regurgitating the fact. We use this category for simple and direct applications of algorithms the student has studied. There should be no judgement involved in choosing the method. This would include a simple application of a rule for differentiation (e.g., can combine rules for sums and constant multiples with one more advanced rule) or for integrals."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Value"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1747
+#: /opt/webwork/webwork2/conf/defaults.config:1649
 msgid "Value of work done in Reduced Scoring Period"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:687
-msgid "Variable Documentation:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config/config_help.html.ep:20
+msgid "Variable Documentation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:115
+msgid "Version"
 msgstr ""
 
 #. ($ver->{version})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:679
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:173
 msgid "Version %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:159
 msgid "Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:43
 msgid "Versions of a set can only be edited for one user at a time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:157 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:363 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:128 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2419 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2756
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:29 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:38 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:275 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:528
 msgid "View"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1000 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:488 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:523 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:681 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:948
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:6
 msgid "View Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:276
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:57
+msgid "View details of student perofrmance either by individual or by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:86
 msgid "View equations as"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:283
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:18
 msgid "View statistics by set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:19
 msgid "View statistics by student"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:55
+msgid "View statistics of students' performance on homework either by individual or by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:14
 msgid "View student progress by set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:303
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:15
 msgid "View student progress by student"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:320 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:115 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:65
 msgid "View/Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2364 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:224 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:90
-msgid "Viewing temporary file:"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:120 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:104
+msgid "View/Reload"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:31
+msgid "View/access current and archived courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:146
+msgid "Viewing Problems in a New Window"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:766 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:790 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#. ($c->{problem}->source_file)
+#. ($screenSetHeader)
+#. ($course_info_path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1611 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:81 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:109
+msgid "Viewing temporary file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:318 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:25
 msgid "Visibility"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:426 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:915
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:21 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:7
 msgid "Visible"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:622
 msgid "Visible sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
 msgid "Visible to Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2269 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:844
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "Warning"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2319
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:13 /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:117
 msgid "Warning messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1039
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:259
+msgid "Warning messages:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all set-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1035
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all user-related data and is not undoable!"
 msgstr ""
 
-#. ($problem_desc , CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1397
+#. ($problem_desc,				$c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1194
 msgid "Warnings encountered while processing %1. Error text: %2"
 msgstr ""
 
-#. ($copyright_years, $theme, $ww_version, $pg_version)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1261
-msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4 |"
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:39
+msgid "We use this for carrying out more complicated algorithms, such as derivatives using both the product and chain rule or integrals which involve say both a substitution and parts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2227
+#. ($ce->{WW_COPYRIGHT_YEARS} || '1996-2023',		$ce->{defaultTheme}       || 'unknown -- set defaultTheme in localOverides.conf',		$ce->{WW_VERSION}         || 'unknown -- set WW_VERSION in VERSION',		$ce->{PG_VERSION}         || 'unknown -- set PG_VERSION in ../pg/VERSION')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:9
+msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:3
 msgid "WeBWorK Error"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:3
 msgid "WeBWorK Warnings"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1549
+#: /opt/webwork/webwork2/conf/defaults.config:1451
 msgid "WeBWorK currently has translations for the languages listed in the course configuration."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:20
+msgid "WeBWorK does not have a full featured scoring ability. We leave that to your favorite spreadsheet application."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:38
+msgid "WeBWorK expects many files to be in certain locations.  The following describe this. Note that by default the File Manager shows the \"templates\" directory.  Other directories mentioned below are at the same level and need to be accessed by going up a directory by clicking the \"^\" button above the file list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:6
 msgid "WeBWorK has encountered a software error while attempting to process this problem. It is likely that there is an error in the problem itself. If you are a student, report this error message to your professor to have it corrected. If you are a professor, please consult the error output below for more information."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:6
 msgid "WeBWorK has encountered warnings while processing your request. If this occured when viewing a problem, it was likely caused by an error or ambiguity in that problem. Otherwise, it may indicate a problem with the WeBWorK system itself. If you are a student, report these warnings to your professor to have them corrected. If you are a professor, please consult the warning output below for more information."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:577
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:558
 msgid "WeBWorK was unable to generate a different version of this problem.  Close this tab, and return to the original problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:367
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:29
 msgid "WeBWorK was unable to generate a paper copy of this homework set.  Please inform your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:78
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
 msgid "WeBWorK will automatically create users when logging in via the LMS for the first time. If this flag is enabled then it will also keep the user account data (first name, last name, section, recitation) up to date with the LMS. If a user's information changes in the LMS then it will change in WeBWorK. However, any changes to the user data via WeBWorK will be overwritten the next time the user logs in."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:370
 msgid "Weight"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:6
 msgid "Welcome to WeBWorK!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:24
+msgid "What WeBWorK does have is good support for summarizing the scores on WeBWorK homework sets and tests and exporting them in a form (.csv) which any spreadsheet can use. WeBWorK reports all of the homework grades with options shown below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:27
 msgid "What could be inside?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:715
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:17
 msgid "What field should filtered users match on?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
 msgid "When a student has more attempts than is specified here they will be able to view another version of this problem.  If set to -1 the feature is disabled and if set to -2 the course default is used."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1899
+#: /opt/webwork/webwork2/conf/defaults.config:1801
 msgid "When acting as a student, this permission level and higher can submit answers for that student."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2071
+#: /opt/webwork/webwork2/conf/defaults.config:1972
 msgid "When numerical answers are checked, most test if the student's answer is close enough to the programmed answer be computing the error as a percentage of the correct answer.  This value controls the default for how close the student answer has to be in order to be marked correct.<p>A value such as 0.1 means 0.1 percent error is allowed.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2098
+#: /opt/webwork/webwork2/conf/defaults.config:2019
 msgid "When students click the <em>Email Instructor</em> button to send feedback, WeBWorK fills in the subject line.  Here you can set the subject line.  In it, you can have various bits of information filled in with the following escape sequences.<p><ul><li>%c = course ID</li><li>%u = user ID</li><li>%s = set ID</li><li>%p = problem ID</li><li>%x = section</li><li>%r = recitation</li><li>%% = literal percent sign</li></ul>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1638
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:35
+msgid "When the class is very large not all students will be displayed. Using the first action on this page you can show only the students from a given recitation or from a given section, or only students whose login or last name fits a pattern match. The second action will sort the students currently being displayed. You can also sort the displayed students by clicking on the active links at the top of each column."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:56
+msgid "When the message is ready to send, click \"Send Email\". This will queue the email to be sent, which can take several minutes depending on the number of students selected.  You will be notified by email once all the emails have been sent."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1540
 msgid "When this is on students will see a line on the Grades page which has their total cumulative homework score.  This score includes all sets assigned to the student."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:90
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
 msgid "When this is true, then when a user enters WeBWorK from an external tool link in the LMS, the bottom of the screen will display the data that the LMS passed to WeBWorK. This may be useful to debug LTI, especially because different LMS systems have different parameters."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1957
+#: /opt/webwork/webwork2/conf/defaults.config:1859
 msgid "When viewing a problem, WeBWorK usually puts the previously submitted answer in the answer blank.  Below this level, old answers are never shown.  Typically, that is the desired behaviour for guest accounts."
 msgstr ""
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:30
+msgid "When viewing progress for a single student, their grades page is shown which lists set totals and per problem grades for each set assigned to the student.  This shows the same information as the statistics page for the student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:26
+msgid "When viewing set statistics, the drop down menus can be used to show stats for individual sections, recitations, or problems.  The overall results include all students who are assigned to the set, while the individual problem results only include active (have attempted the problem) students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:24
+msgid "When viewing student progress for a set, the score for the set and the status for problems in the set are listed for all students.  The table can be sorted by clicking the links in the table header.  Click the student's name to access the student's set.  When viewing progress for a test, additional columns can be shown/hidden by updating the display at the top"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:74
+msgid "When you unassign a set from students, you destroy all of the data for the set for those students. If the set is re-assigned to these students, then they will receive new versions of problems in the set.  Make sure this is what you want to do before unassigning sets from students."
+msgstr ""
+
+#. (tag('b', $achievementID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:21
 msgid "When you unassign by unchecking a student's name, you destroy all of the data for achievement %1 for this student. Make sure this is what you want to do."
 msgstr ""
 
-#. (CGI::b({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:146
+#. (tag('b', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:26
 msgid "When you unassign by unchecking a student's name, you destroy all of the data for homework set %1 for this student. You will then need to reassign the set to these students and they will receive new versions of the problems. Make sure this is what you want to do before unchecking students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:72
 msgid "When you uncheck a homework set (and save the changes), you destroy all of the data for that set for this student.   If you reassign the set, the student will receive a new version of each problem. Make sure this is what you want to do before unchecking sets."
 msgstr ""
 
-#. ($self->formatDateTime($set->open_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:343
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:87
+msgid "Wiki summary page for MathObjects"
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:266 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:444 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:167
 msgid "Will open on %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:49
+msgid "Word problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:15
 msgid "Worth"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:382
-msgid "Write permissions have not been enabled for '%1'.  Changes must be saved to another file for viewing."
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:51
+msgid "Write a new PG problem file or edit an existing one."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:188
+msgid "Write permissions have not been enabled for \"%1\".  Changes must be saved to another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:630
+msgid "Write permissions have not been enabled for \"%1\". Changes must be saved to another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:182
+msgid "Write permissions have not been enabled in \"%1\".  Changes must be saved to a different directory for viewing."
 msgstr ""
 
-#. ($self->shortPath($currentDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:380
-msgid "Write permissions have not been enabled in '%1'.  Changes must be saved to a different directory for viewing."
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:624
+msgid "Write permissions have not been enabled in \"%1\".Changes must be saved to a different directory for viewing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:178
 msgid "Write permissions have not been enabled in the templates directory.  No changes can be made."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2451 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:380 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:408 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:620
+msgid "Write permissions have not been enabled in the templates directory. No changes can be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:238 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:287 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:301 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:330 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:345 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:454 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:482 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:509 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:82 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:657 /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:137 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:67
 msgid "Yes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:500
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:454
 msgid "You are currently checking answers to a different version of your problem - these will not be recorded, and you should remember to return to your original problem once you are done here."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:511
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:470
 msgid "You are currently previewing answers to a different version of your problem - these will not be recorded, and you should remember to return to your original problem once you are done here."
 msgstr ""
 
-#. ($userSet->set_id, $r->connection->remote_ip)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:270
+#. ($ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:18
+msgid "You are in the Reduced Scoring Period.  All work counts for %1% of the original."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:183
+msgid "You are not allowed to act as a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:188
+msgid "You are not allowed to assign homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:383
+msgid "You are not allowed to delete %1."
+msgstr ""
+
+#. ($userSet->set_id, $c->tx->remote_address)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:261
 msgid "You are not allowed to generate a hardcopy for %1 from your IP address, %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:673 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2049
-msgid "You are not authorized to access the Instructor tools."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:185
+msgid "You are not allowed to modify homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:191
+msgid "You are not allowed to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:4
+msgid "You are not allowed to send e-mail."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:8 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:4 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:2
+msgid "You are not authorized to access instructor tools"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:5 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:4 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:9 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:13 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:31 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:30 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:28 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:5 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:15 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:4
+msgid "You are not authorized to access instructor tools."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:9 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:9
+msgid "You are not authorized to assign homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:10
+msgid "You are not authorized to create or delete courses."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:388 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:271
-msgid "You are not authorized to access the instructor tools."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:2
+msgid "You are not authorized to edit achievements."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:392
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:28
+msgid "You are not authorized to edit user specific information."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:37
+msgid "You are not authorized to grade homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:8
+msgid "You are not authorized to manage course files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:33
 msgid "You are not authorized to modify homework sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:18 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:35
 msgid "You are not authorized to modify problems."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:396
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:39
 msgid "You are not authorized to modify set definition files."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:338 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:15
 msgid "You are not authorized to modify student data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:367 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:11
+msgid "You are not authorized to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:3
+msgid "You are not authorized to modify the course configuration."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:239 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:230
 msgid "You are not authorized to perform this action."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:260
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:11
+msgid "You are not authorized to score sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:13
+msgid "You are not authorized to send mail to students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:11
+msgid "You are not authorized to update lti scores"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers.html.ep:8
+msgid "You are not authorized to view past answers"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:251
 msgid "You are not permitted to generate a hardcopy for a set with hidden work."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:236
 msgid "You are not permitted to generate a hardcopy for an unopened set."
 msgstr ""
 
-#. ($showMeAnother{MaxReps},					$solutionShown)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:559
+#. ($showMeAnother{MaxReps},						$solutionShown)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:532
 msgid "You are only allowed to click on Show Me Another %quant(%1,time,times) per problem. %2 Close this tab, and return to the original problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2051 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2070
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:246 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:265
 msgid "You are out of time!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:374
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:36
 msgid "You can also examine the following temporary files: "
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGanswermacros.pl:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:108
+msgid "You can assign selected achievements to all users by using the \"Assign\" action action and selecting which achievements to assign.  You can select which users to assign/unassign to an achievement by clicking on the link in the \"Edit Users\" column."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1039
+msgid "You can change the file path for this problem manually from the \"Hmwk Sets Editor\" page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:27
+msgid "You can check the boxes to the right of the sets and click \"Generate Hardcopy for Selected Sets\" to generate a PDF hardcopy of the selected sets. You can generate hardcopies for multiple users including their answers as well. Note that students will only be able to generate hardcopies of a single set at a time. Students will only be able to include answers in the hardcopy after the answer date."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:127
+msgid "You can delete problems by clicking the \"Delete it?\" check box and saving. If the set is already active it is recommended that you instead use the \"Mark Correct?\" problem to mark a particular problem correct for all students."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGanswermacros.pl:1616
 msgid "You can earn partial credit on this problem."
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:382
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:142
+msgid "You can edit a problem by clicking the \"Edit Problem\" icon to the right of the problem number. This will open the problem in the PG problem editor in a new tab or window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:92
+msgid "You can edit a single achievement by clicking on the pencil icon next to the achievement ID.  You can edit multiple achievements by selecting which achievements to edit, then click the \"Edit\" button. You can edit all of the achievements by changing which achievements to edit form \"selected achievements\" to \"all achievements\", or click the checkbox next to the Achievement ID to select all achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:44
+msgid "You can edit the class list data for a single student by clicking on the pencil icon next to their login name. To edit several students at once click on the \"Select\" checkbox next to their names, click on the radio button for editing selected users and then click the \"Edit\" button. You can also edit all visible users (those students currently being displayed) or even all users in the course although this last option might take a long time to load for a large class."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:397
 msgid "You can get a new version of this problem after the due date."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1368
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:101
+msgid "You can import/export from their respective action tab.  Exporting saves information about the achievement as a .axp file which is a CSV that lists each achievements information.  You can import .axp files that have been previously exported."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:769
 msgid "You can not specify an absolute path"
 msgstr ""
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1121
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:549
 msgid "You can only %1 one file at a time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:92
 msgid "You can only download regular files."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:591
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:197
 msgid "You can only edit text files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:908
-msgid "You can only unpack files ending in '.tgz', '.tar' or '.tar.gz'"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:374
+msgid "You can only unpack files ending in \".tgz\", \".tar\" or \".tar.gz\""
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:134
+msgid "You can render a problem by clicking the \"Render Problem\" icon to the right of the problem number. The display mode used to render the problem is chosen using the drop down menu. You can render all problems using the \"Render All\" button. \"Hide All\" will hide all rendered problems. It is also useful to collapse problem details when doing this, as it makes it easier to drag problems around."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:120
+msgid "You can reorder problems by clicking on the arrow icon and dragging the problem. You will see a box showing you where the problem will be placed. When problems are reordered any holes in the numbering will be filled in."
 msgstr ""
 
 #. ($showMeAnother{MaxReps} >= $showMeAnother{Count}						? ($showMeAnother{MaxReps} - $showMeAnother{Count})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1895
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:44
 msgid "You can use this feature %quant(%1,more time,more times,as many times as you want) on this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:439
 msgid "You can't download directories"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:440
 msgid "You can't download files of that type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:584
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:192
 msgid "You can't edit a directory"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:528
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
 msgid "You can't view files of that type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:985
 msgid "You cannot archive the course you are currently using."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1712
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:850
 msgid "You cannot delete the course you are currently using."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1081
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:378
 msgid "You cannot delete yourself!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:579
 msgid "You did not specify a new set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:232
 msgid "You didn't enter any message."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:312
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:303
 msgid "You do not have permission to access the requested file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:159
 msgid "You do not have permission to change the hardcopy theme."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:578
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:186
 msgid "You do not have permission to edit this file."
 msgstr ""
 
 #. ($hardcopy_format)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:151
 msgid "You do not have permission to generate hardcopy in %1 format."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1639
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1161
 msgid "You do not have permission to view the details of this error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements.html.ep:13
 msgid "You don't have any Achievement data associated to you!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:237
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:51
 msgid "You don't have any rewards!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2109
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:325
 msgid "You exceeded the allowed time."
 msgstr ""
 
-#. ($numLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2082
+#. ($c->{numAttemptsLeft})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:277
 msgid "You have %1 attempt(s) remaining on this test."
 msgstr ""
 
-#. ($numLeft,						$numLeft - 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2458
+#. ($c->{numAttemptsLeft},								$c->{numAttemptsLeft} - 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:664
 msgid "You have %1 submissions remaining for this test.  If you say yes, then you will have %quant(%2,submission) remaining. Once all submissions have been used, your answers will be final and you will not be able to continue to work this test version."
 msgstr ""
 
-#. ($attemptsLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2012
+#. ($problem->max_attempts - $attempts)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1270
 msgid "You have %negquant(%1,unlimited attempts,attempt,attempts) remaining."
 msgstr ""
 
 #. ($attempts_before_rr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1217
 msgid "You have %quant(%1,attempt,attempts) left before new version will be requested."
 msgstr ""
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:506
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:44
 msgid "You have %quant(%1,hour) and %quant(%2,minute) remaining to complete the currently open test."
 msgstr ""
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:518
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:54
 msgid "You have %quant(%1,hour,hours,)%quant(%2,minute,minutes,) remaining to complete the currently open test."
 msgstr ""
 
-#. ($minutes,									$seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:529
+#. ($minutes,							$seconds)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:64
 msgid "You have %quant(%1,minute) and %quant(%2,second) remaining to complete the currently open test."
 msgstr ""
 
 #. ($seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:72
 msgid "You have %quant(%1,second) remaining to complete the currently open test."
 msgstr ""
 
 #. ($attempts)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1243
 msgid "You have attempted this problem %quant(%1,time,times)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:1
 msgid "You have been logged out of WeBWorK."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2065
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:260
 msgid "You have less than 1 minute to complete this test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2046
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:241
 msgid "You have less than 45 seconds left!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2043
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:240
 msgid "You have less than 90 seconds left to complete this assignment. You should finish it soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1004
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:452
 msgid "You have not chosen a file to upload."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:845
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "You have requested that the following items be deleted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1137
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:565
 msgid "You have specified an illegal file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:766
 msgid "You have specified an illegal path"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:520
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:13
+msgid "You have specified an illegal working directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:481
 msgid "You may check your answers to this problem without affecting the maximum number of tries to your original problem."
 msgstr ""
 
-#. ($perm_multiuser ? "to privileged users or" : "")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:613
+#. ($multiuser ? 'to privileged users or' : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:69
 msgid "You may choose to show any of the following data. Correct answers, hints, and solutions are only available %1 after the answer date of the homework set."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:63
+msgid "You may not change this user's password!"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:646
 msgid "You may not change your answers when going on to the next part!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1831
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:58
 msgid "You may not change your own password here!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1132 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:149 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:560
 msgid "You may not follow symbolic links"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2134
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:350
 msgid "You may still check your answers."
 msgstr ""
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:172
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:143
+msgid "You may want to create an unattached problem if you are using the current problem as a model for a new problem. You can add the new file to a homework set from the Library Browser or via the set detail page of the Hmwk Sets Editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:165
+msgid "You might want to do this if you want to give full credit to everyone on a particular problem that was not worded correctly, or wasn't working properly. This is done from the \"Hmwk Sets Editor\" page or the \"Instructor Tools\" page."
+msgstr ""
+
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}					? link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:8
 msgid "You must access assignments from your Course Management System (%1)."
 msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:568
-msgid "You must attempt this problem %quant(%1,time,times) before Show Me Another is available."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:67
+msgid "You must attempt this problem %quant(%1,time) before this feature is available"
 msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1923
-msgid "You must attempt this problem %quant(%1,time,times) before this feature is available"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:545
+msgid "You must attempt this problem %quant(%1,time,times) before Show Me Another is available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:699
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:259
 msgid "You must confirm the password for the initial instructor."
 msgstr ""
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:368
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}						? $c->link_to(							$ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:195
 msgid "You must log into this set via your Learning Management System (%1)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:76
-msgid "You must provide a student ID, a set ID, and a problem number."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:979
+msgid "You must select a course to archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:585
 msgid "You must select a course to rename."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:351
 msgid "You must select at least one file for the archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:777
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:312
 msgid "You must select at least one file to delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:115
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:106
 msgid "You must select one or more sets for scoring!"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:749
 msgid "You must specify a %1 name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:682
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:242
 msgid "You must specify a course ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1710 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2026 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2561 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2777 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3787 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3865
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1213 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1255 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1326 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2086 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2160 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:848 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:983
 msgid "You must specify a course name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:775
 msgid "You must specify a file name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:705
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:586
+msgid "You must specify a file name in order to save a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:265
 msgid "You must specify a first name for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:708
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:268
 msgid "You must specify a last name for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1382
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:606
 msgid "You must specify a new institution for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1364
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:588
 msgid "You must specify a new name for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:603
 msgid "You must specify a new title for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:256
 msgid "You must specify a password for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:448
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:440
 msgid "You must specify a user ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:711
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:271
 msgid "You must specify an email address for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:331 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:138
 msgid "You must specify an file name in order to save a new file."
 msgstr ""
 
 #. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:501
-msgid "You must use your Learning Managment System (%1) to access this set.  Try logging in to the Learning Managment System and visiting the set from there."
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:505
+msgid "You must use your Learning Management System (%1) to access this set.  Try logging in to the Learning Management System and visiting the set from there."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1730
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
 msgid "You need to select a \"Target Set\" before you can edit it."
 msgstr ""
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1126
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:554
 msgid "You need to select a file to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1877
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:555
 msgid "You need to select a set definition file to view."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1853
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:537
 msgid "You need to select a set from this course to view."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1837
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:524
 msgid "You need to select a set to view."
 msgstr ""
 
-#. (wwRound(0, $problemResult->{score} * 100)
-#. (wwRound(0, $pg->{result}->{score} * 100)
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:289 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2007
+#. (wwRound(0,						compute_reduced_score($ce, $problem, $set, $pg->{result}{score}, $c->submitTime)
+#. (% wwRound(0, $rh_result->{problem_result}{score} * 100)
+#. (wwRound(0, $rh_result->{problem_result}{score} * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1251 /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:48 /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:29
 msgid "You received a score of %1 for this attempt."
 msgstr ""
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2075
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1363
 msgid "You will not be able to proceed to problem %1 until you have completed, or run out of attempts, for this problem and its graded subproblems."
 msgstr ""
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2078
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1375
 msgid "You will not be able to proceed to problem %1 until you have completed, or run out of attempts, for this problem."
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1343
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:740
 msgid "Your %1 name contains illegal characters"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1344
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:743
 msgid "Your %1 name may not begin with a dot"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:746
 msgid "Your %1 name may not contain a path component"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:540
-msgid "Your LTI OAuth verification failed.  If this recurs, please speak with your instructor"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:528 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:539
-msgid "Your authentication failed.  Please return to Oncourse and login again."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:229
-msgid "Your authentication failed.  Please try again. Please speak with your instructor if you need help."
-msgstr ""
-
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3033
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3162
 msgid "Your browser does not support the video tag."
 msgstr ""
 
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4078
-msgid "Your current branch of PG is up to date with branch %1 in remote %2."
-msgstr ""
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4016
-msgid "Your current branch of WeBWorK is up to date with branch %1 in remote %2."
-msgstr ""
-
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4113
-msgid "Your current branch of the Open Problem Library is up to date."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:134
 msgid "Your display options have been saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:195
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
 msgid "Your email address has been changed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:772
 msgid "Your file name contains illegal characters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:118 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:109 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:40
 msgid "Your file name is not valid! "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:16
 msgid "Your message was sent successfully."
 msgstr ""
 
-#. ($lastScore,$notCountedMessage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2010
+#. (wwRound(0, $problem->status * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1261
 msgid "Your overall recorded score is %1.  %2"
 msgstr ""
 
-#. ($versionNumber, wwRound(2,$recordedScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2107
-msgid "Your recorded score on this test (version %1) is %2/%3."
+#. ('<span id="test-recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:179 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:197
+msgid "Your recorded score for this version is %1/%2 (%3%)."
+msgstr ""
+
+#. ($setVersionID,						'<span id="test-recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:317
+msgid "Your recorded score on this test (version %1) is %2/%3 (%4%)."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:603
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:634
 msgid "Your score for this attempt is for this part only;"
 msgstr ""
 
 # $testNounNum is either "test (#)" or "submission (#)"
 #. ($testNounNum)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1977
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:142
 msgid "Your score on this %1 WAS recorded."
 msgstr ""
 
 # $testNoun is either "test" or "submission"
-#. ($testNoun,$attemptScore,$totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1982
+#. ($testNoun, $c->{attemptScore}, $c->{totalPossible})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:148
 msgid "Your score on this %1 is %2/%3."
 msgstr ""
 
 # $testNounNum is either "test (#)" or "submission (#)
 #. ($testNounNum)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1973
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:138
 msgid "Your score on this %1 was NOT recorded."
 msgstr ""
 
-#. ($attemptScore,$totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2019
+#. ($c->{attemptScore}, $c->{totalPossible})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:192
 msgid "Your score on this (checked, not recorded) submission is %1/%2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1617 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1963 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2277
-msgid "Your score on this problem was recorded."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1619 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1027 /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:172
 msgid "Your score was not recorded because there was a failure in storing the problem record to the database."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:272
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:276
 msgid "Your score was not recorded because this homework set is closed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:283
 msgid "Your score was not recorded because this problem has not been assigned to you."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1643
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1049
 msgid "Your score was not recorded because this problem set version is not open."
 msgstr ""
 
-#. ($elapsed, $allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1658
+#. ($elapsed,						# Assume the allowed time is an even number of minutes.						($set->due_date - $set->open_date)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1063
 msgid "Your score was not recorded because you have exceeded the time limit for this test. (Time taken: %1 min; allowed: %2 min.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1052
 msgid "Your score was not recorded because you have no attempts remaining on this set version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:292 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1661 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1067 /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:278 /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:53 /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:31
 msgid "Your score was not recorded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1998 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:258 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:266 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:163
 msgid "Your score was not successfully sent to the LMS."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:166
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:170
 msgid "Your score was recorded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1997 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:255 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:269 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:162
 msgid "Your score was successfully sent to the LMS."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:540
 msgid "Your session has timed out due to inactivity. Please log in again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4126
-msgid "Your systems are up to date!"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1396 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1403
-msgid "[Edit]"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:824
-msgid "a duplicate of the first selected achievement."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:17
+msgid "a duplicate of the first selected achievement"
 msgstr ""
 
 # Context is "Create set ______ as a duplicate of the first selected set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:17
 msgid "a duplicate of the first selected set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:823
-msgid "a new empty achievement."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:16
+msgid "a new empty achievement"
 msgstr ""
 
 # Context is "Create set ______ as a new empty set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:16
 msgid "a new empty set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1281
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:9
 msgid "a single set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:429
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:130
 msgid "add problems"
 msgstr ""
 
 #. ($setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1751
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
 msgid "addGlobalSet %1 in ProblemSetList:  %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:456
-msgid "added missing permission level for user"
-msgstr ""
-
 # #short for administrator
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "admin"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1051 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:487 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:604
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:7 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:6 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:6 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:7
 msgid "all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:930 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1377
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:19 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:66
 msgid "all current users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:327
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:70
 msgid "all set dates for one <b>user</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:622 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1434 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:667 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:840 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:892 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1995 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:5 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:6 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:7 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:8 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:7
 msgid "all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1981
 msgid "all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1256 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:701 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:946 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:997
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:5 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:9 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:7 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:6
 msgid "all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:120
 msgid "all users for one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:16 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:16 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:23
 msgid "alphabetically"
 msgstr ""
 
-#. ($count,$numSets)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:626
+#. ($count, $numSets)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1999
 msgid "an impossible number of sets: %1 out of %2"
 msgstr ""
 
-#. ($count,$numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:606
+#. ($count, $numUsers)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1985
 msgid "an impossible number of users: %1 out of %2"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:647 /opt/webwork/pg/macros/PGbasicmacros.pl:658
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:610 /opt/webwork/pg/macros/core/PGbasicmacros.pl:621
 msgid "answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1166 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:17 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:30
 msgid "any users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:720
-msgid "avg attempts"
-msgstr ""
-
 # Context is "Append ____ blank problem template(s) to end of homework set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2956
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:689
 msgid "blank problem template(s) to end of homework set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:17 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:17 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:24
 msgid "by last login date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1166 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1552
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:598 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:688
 msgid "changes abandoned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1216 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1651
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:633 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:795
 msgid "changes saved"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:80
 msgid "class list data for selected <b>users</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:31
 msgid "close"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:671
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:259
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:239
 msgid "correct"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:582
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:239
 msgid "course files"
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:458
 msgid "deleted %1 sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:152
 msgid "editing all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:333
 msgid "editing all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:963
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:328
 msgid "editing all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:860
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:336
 msgid "editing listed sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:154
 msgid "editing selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:339
 msgid "editing selected sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:334
 msgid "editing selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:331
 msgid "editing visible users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:360
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:90
 msgid "email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:76 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:87
-msgid "email:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:42
 msgid "empty"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:672
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:10
 msgid "enter matching set IDs below"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:220
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:31
 msgid "entry rows."
 msgstr ""
 
 #. ($restrictLoc, $setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1761
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:904
 msgid "error adding set location %1 for set %2: %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1092 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1487
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:542 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:643
 msgid "export abandoned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1068
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:527
 msgid "exporting all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1071
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:530
 msgid "exporting selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:359
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:89
 msgid "first name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:747
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:72
 msgid "for"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:149
 msgid "for one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:367 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:103 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:94
 msgid "for one <b>user</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1014
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:349
 msgid "giving new passwords to all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1020
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:355
 msgid "giving new passwords to selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1017
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:352
 msgid "giving new passwords to visible users"
 msgstr ""
 
 #. ($j, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1069
 msgid "global %1 for set %2 not found."
 msgstr ""
 
-#. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1146
-msgid "global set %1 not found."
-msgstr ""
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "grade_proctor"
 msgstr ""
@@ -7323,349 +9468,334 @@ msgstr ""
 msgid "guest"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1589 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1886 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2060 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:818 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:949
 msgid "hidden"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "hidden from"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "hidden from students"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:217
+msgid "homework"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:83
+msgid "html directory"
 msgstr ""
 
 # doe snot need to be translated
-#. ('j','k','_0')
-#. ('j','k')
-#: /opt/webwork/pg/lib/Parser/List/Vector.pm:35 /opt/webwork/pg/lib/Value/Vector.pm:278 /opt/webwork/pg/macros/contextLimitedVector.pl:93
+#. ('j', 'k', '_0')
+#. ('j', 'k')
+#: /opt/webwork/pg/lib/Parser/List/Vector.pm:39 /opt/webwork/pg/lib/Value/Vector.pm:303 /opt/webwork/pg/macros/contexts/contextLimitedVector.pl:95
 msgid "i"
 msgstr ""
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:773
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:840
 msgid "if"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1531 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1626
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:622 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:721
 msgid "illegal character in input: '/'"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:246
 msgid "incorrect"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:441
 msgid "index"
 msgstr ""
 
 #. ($restrictLoc, $setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:911
 msgid "input set location %1 already exists for set %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:358
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:501 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:551
+msgid "insufficient permission to edit %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:220
+msgid "just-in-time"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:88
 msgid "last name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1435 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:841 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:893
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:6 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:7 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:9
 msgid "listed sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3169
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:87
 msgid "locations selected below"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:665
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:59
 msgid "login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "login ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:94
 msgid "login name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:75 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:86
-msgid "login/studentID:"
-msgstr ""
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "login_proctor"
 msgstr ""
 
 # Context is "Set _____ made visibile for _____ users"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "made visible for"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:419
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:493
 msgid "max"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1282
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:10
 msgid "multiple sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:489
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:171
 msgid "new set:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:393
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:109
 msgid "new users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:6
 msgid "no achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:740
-msgid "no achievements."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:519
-msgid "no attempt recorded"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:86
 msgid "no location"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:620 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1056 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:668 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1993 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:8 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:7 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:6
 msgid "no sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:600
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1979
 msgid "no students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:931 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1052 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1169 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1190 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:702
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:20 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:8 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:20 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:31
 msgid "no users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:254 /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/permission.pm:26 /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "nobody"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:114
 msgid "nth colum of merge file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:225
-msgid "number of students not defined"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:70
 msgid "of"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:128
 msgid "one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:556
-msgid "one <b>set</b> for  <b>users</b>"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:225
+msgid "one <b>set</b> for <b>users</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:540
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:211
 msgid "one <b>user</b> (on one <b>set</b>)"
 msgstr ""
 
 # Context is Assign this set to which users?  "only ____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1378
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:67
 msgid "only"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:17
 msgid "only best scores"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3472 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:357 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:426 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:448
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:47 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:129 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:143 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:88
 msgid "or"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1141
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:59
 msgid "or Problems from"
 msgstr ""
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:776
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:843
 msgid "otherwise"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:19
 msgid "overwrite"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:664
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:627
 msgid "part"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1383
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:499
 msgid "permissions for %1 not defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "point"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "points"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:509
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:20
 msgid "preserve"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2360
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:576
 msgid "preview answers"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:653
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:616
 msgid "problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:632
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:41
 msgid "problems"
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:219
+msgid "proctored test"
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "professor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:360 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:451
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:144 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:89
 msgid "progress"
 msgstr ""
 
 #. ($line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1948 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2212
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1409
 msgid "readSetDef error, can't read the line: ||%1||"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:93
 msgid "recitation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:654
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:53
 msgid "recitation #"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1381 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:497 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:549
 msgid "record for visible user %1 not found"
 msgstr ""
 
 #. ($restrictLoc)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1767
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:918
 msgid "restriction location %1 does not exist.  IP restrictions have been ignored."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:670
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "row"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:91
 msgid "score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:362
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:92
 msgid "section"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:643
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:47
 msgid "section #"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:77 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:88
-msgid "section:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:159
 msgid "selected <b>sets</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:524
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:197
 msgid "selected <b>users</b> to selected <b>sets</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1052 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:441 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:488 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:605
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:8 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:7 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:7 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:8
 msgid "selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:741
-msgid "selected achievements."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1057 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1436 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:669 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:842 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:894 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:991
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:7 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:8 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:9 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:8
 msgid "selected sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1053 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1168 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1258 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:703 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:948 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:999
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:7 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:9 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:19 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:8
 msgid "selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:624
-msgid "set"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:628
-msgid "sets"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:12
 msgid "sets hidden from students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:670
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:11
 msgid "sets visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:716
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:281
 msgid "showing all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:763
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:277
 msgid "showing all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:725
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:290
 msgid "showing matching sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:286
 msgid "showing matching users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:719
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:284
 msgid "showing no sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:766
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:280
 msgid "showing no users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:722
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:287
 msgid "showing selected sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:769
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:283
 msgid "showing selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:299
 msgid "showing sets that are hidden from students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:732
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:296
 msgid "showing sets that are visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:72
 msgid "shown"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:162
 msgid "still open"
 msgstr ""
 
@@ -7673,16 +9803,16 @@ msgstr ""
 msgid "student"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
 msgid "submission"
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:133
 msgid "submission (version %1)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
 msgid "summary"
 msgstr ""
 
@@ -7690,123 +9820,114 @@ msgstr ""
 msgid "ta"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
-msgid "test"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:90
+msgid "templates/email directory"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:610
-msgid "test date"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:95
+msgid "templates/macros directory"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:621
-msgid "test time"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:218 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
+msgid "test"
 msgstr ""
 
-#. ($forcedSourceFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:987
-msgid "the original path to the file is %1"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:23
+msgid "test date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:469
-msgid "then delete them"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:29
+msgid "test time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "time"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:119
+msgid "then delete them"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:165
 msgid "time limit exceeded"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "times"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:35
+msgid "time remaining"
 msgstr ""
 
 # Context is Assign ____ to _____
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:183
 msgid "to"
 msgstr ""
 
 #. ($ce->{institutionName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:399
 msgid "to %1 main web site"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:524
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:381
 msgid "to courses page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:436
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:135
 msgid "to one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:764
-msgid "top score"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:432
 msgid "total"
 msgstr ""
 
 #. ($ce->{webworkDirs}{logs})
 #. ($ce->{webworkDirs}{tmp})
 #. ($ce->{webworkDirs}{DATA})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:408 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:409 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:41 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:44 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:47
 msgid "unable to write to directory %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:333 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:383 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:49
 msgid "unlimited"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:14
 msgid "unlimited reusability"
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:609
-msgid "userID: %1 --"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:652
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:259
 msgid "username, last name, first name, section, achievement level, achievement score,"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:704
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:10
 msgid "users who match on selected field"
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
-msgid "version (%1)"
+#. ($set->version_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:295 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:407 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:408
+msgid "version %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1591 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1888 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3648
-msgid "visible"
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:134
+msgid "version (%1)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "visible to students"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2062 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:820 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:951
+msgid "visible"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1167 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1257 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:947 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:998
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:6 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:18 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:7
 msgid "visible users"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470 /opt/webwork/pg/macros/compoundProblem.pl:480
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:485 /opt/webwork/pg/macros/core/compoundProblem.pl:500
 msgid "when you submit your answers"
 msgstr ""
 
 #. ($dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1673 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1532
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:623
 msgid "won't be able to read from file %1/%2: does it exist? is it readable?"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:604
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:638
 msgid "your overall score is for all the parts combined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:231
 msgid "your students"
 msgstr ""
diff --git a/lib/WeBWorK/Localize/zh-HK.po b/lib/WeBWorK/Localize/zh-HK.po
index 41a2e4dc3b..cfba4081b2 100644
--- a/lib/WeBWorK/Localize/zh-HK.po
+++ b/lib/WeBWorK/Localize/zh-HK.po
@@ -10,256 +10,319 @@ msgstr ""
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: 2013-01-27 17:03+0000\n"
 "Last-Translator: Liping Chen <chenlipi@msu.edu>, 2013\n"
-"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/webwork/webwork2/language/zh_HK/)\n"
+"Language-Team: Chinese (Hong Kong) (http://app.transifex.com/webwork/webwork2/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:428
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:449
+#. ($_->{problem}->version_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:69
+msgid " (version %1)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:265
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:284
 msgid " Answers Available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:735
-msgid "# of active students"
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1148
+msgid " No changes have been made to set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:506
-msgid "#corr"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:130
+msgid "\"Act as\" a student"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:508
-msgid "#incorr"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:31
+msgid "\"Edit Assigned Users\" column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2249
-msgid "% Score:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:24
+msgid "\"Edit Problems\" column"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:187
+msgid "# of Active Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:85
+msgid "# of attempts"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:333
+msgid "#corr"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:685
-msgid "% correct"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:335
+msgid "#incorr"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:174
+msgid "% Average with Review"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:702
-msgid "% correct with review"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:66
+msgid "% Score with Review"
 msgstr ""
 
-# Percent students
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:762
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:792
-msgid "% students"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:479
+msgid "% Score:"
 msgstr ""
 
 #. ($achievement->{points})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:24
 msgid "%1 Points:"
 msgstr ""
 
-#. ($lib eq '' ? $r->maketext('Local')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:476
+#. ($lib eq '' ? maketext('Local')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:9
 msgid "%1 Problems:"
 msgstr ""
 
-#. ($itemCounts{$item->id()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:189
+#. ($itemCounts->{ $item->id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:12
 msgid "%1 remaining"
 msgstr ""
 
-#. ($numAdded, $numSkipped, join(', ', @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1410
+#. ($count)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2001
+msgid "%1 sets"
+msgstr ""
+
+#. ($numAdded,                     $numSkipped,
+#. join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:608
 msgid "%1 sets added, %2 sets skipped. Skipped sets: (%3)"
 msgstr ""
 
-#. ($numExported, $numSkipped, ($numSkipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1526
+#. ($numExported, $numSkipped,                     $numSkipped ? $c->tag('ul',
+#. $c->c(map { $c->tag('li', $_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:673
 msgid "%1 sets exported, %2 sets skipped. Skipped sets: (%3)"
 msgstr ""
 
 #. ($count, $numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:608
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
 msgid "%1 students out of %2"
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle,
+#. ($rename_oldCourseID,          $rename_oldCourseTitle,
+#. $rename_newCourseTitle,
 #. $rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:675
 msgid "%1 title and institution changed from %2 to %3 and from %4 to %5"
 msgstr ""
 
-#. (scalar @userIDsToExport, $dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1338
-msgid "%1 users exported to file %2/%3"
-msgstr "%1 个用户导出到文件 %2/%3"
+#. (scalar @userIDsToExport, "$dir/$fileName")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:477
+msgid "%1 users exported to file %2"
+msgstr ""
 
-#. ($numReplaced, $numAdded, $numSkipped, join (", ", @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1233
+#. ($numReplaced, $numAdded, $numSkipped, join(', ', @$skipped)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:443
 msgid ""
 "%1 users replaced, %2 users added, %3 users skipped. Skipped users: (%4)"
 msgstr ""
 
-#. ($levelpercentage)
 #. ($percentage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:135
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:136
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:323
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:324
+#. ($level_percentage)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:12
 msgid "%1% Complete"
 msgstr ""
 
 #. (wwRound(0, $answerScore * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:268
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:248
 msgid "%1% correct"
 msgstr "%1% 正确"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:207
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:57
 msgid "%1's Current Address"
 msgstr "%1 的当前地址"
 
-#. ($user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:136
+#. ($c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:26
 msgid "%1's Current Password"
 msgstr "%1 的当前密码"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:225
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:65
 msgid "%1's New Address"
 msgstr "%1 的新地址"
 
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:153
+#. ($eUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:34
 msgid "%1's New Password"
 msgstr "%1 的新密码"
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
-msgid "%1's new password cannot be blank."
-msgstr ""
-
-#. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:76
 msgid "%1's password has been changed."
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:56
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1423
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#. ($c->tag('span', dir => 'ltr', $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1069
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:149
 msgid "%1: Problem %2"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:374
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:357
 msgid "%1: Problem %2 Show Me Another"
 msgstr ""
 
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2231
-msgid "%1: The directory for the course not found."
-msgstr ""
-
-#. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:340
-msgid "%quant(%1,error) occured while generating hardcopy:"
+#. ($days)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:87
+msgid "%quant(%1,day)"
 msgstr ""
 
 #. ($n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:924
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:389
 msgid "%quant(%1,file) unpacked successfully"
 msgstr ""
 
+#. ($hours)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:88
+msgid "%quant(%1,hour)"
+msgstr ""
+
+#. ($minutes)
+#. (sprintf('%3.1f', $testTime)
+#. ($timeLeft)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:89
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:150
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:168
+msgid "%quant(%1,minute)"
+msgstr ""
+
 #. ($numBlanks)
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:430
 msgid ""
 "%quant(%1,of the questions remains,of the questions remain) unanswered."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:678
+#. ($seconds)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:90
+msgid "%quant(%1,second)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:505
 msgid "%score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2971
+#. ($dcount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:40
+msgid "(%quant(%1,item) total)"
+msgstr ""
+
+#. ($count)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:29
+msgid "(%quant(%1,item))"
+msgstr ""
+
+#. ($problemValue)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1081
+msgid "(%quant(%1,point))"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:697
 msgid "(Any unsaved changes will be lost.)"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1278
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1287
-msgid ""
-"(Instructor hint preview: show the student hint after the following number "
-"of attempts:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:102
+msgid "(If an action cannot be executed it will not appear.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2003
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1262
 msgid "(This problem will not count towards your grade.)"
 msgstr "(这道题将不会计算成绩.)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2122
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:340
 msgid ""
 "(This test is overtime because it was not submitted in the allowed time.)"
 msgstr ""
 
-#. ($testNoun, $self->formatDateTime($set->answer_date)
+#. ($testNoun, $c->formatDateTime($c->{set}->answer_date)
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1986
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:153
 msgid "(Your score on this %1 is not available until %2.)"
 msgstr ""
 
 #. ($testNoun)
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1988
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:155
 msgid "(Your score on this %1 is not available.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1257
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1267
 msgid "(correct)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:197
-msgid "(gw/quiz) After version answer date"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:263
 msgid "(in target set)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1449
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1269
 msgid "(incorrect)"
 msgstr ""
 
 #. ($pgScore)
 #. ($recScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1461
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1271
 msgid "(score %1)"
 msgstr ""
 
-#. ($display_sort_method_name{$secondary_sort_method_name})
-#. ($display_sort_method_name{$ternary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:701
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:706
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:207
+msgid "(test) After version answer date"
+msgstr ""
+
+#. ($versionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:164
+msgid "(version %1)"
+msgstr ""
+
+#. ($display_sort_method_name{$secondary_sort_method})
+#. ($display_sort_method_name{$ternary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:103
 msgid ", then by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1297
-msgid ". If this is a class roster, rename it to have extension '.lst'"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:702
+msgid ". If this is a class roster, rename it to have extension \".lst\""
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:81
+msgid "0 seconds"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1997
+msgid "1 set"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1983
 msgid "1 student"
 msgstr ""
 
 #. (wwRound(2, $weights[$part] * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:145
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:58
 msgid "<b>Weight:</b> %1%"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1749
+#: /opt/webwork/webwork2/conf/defaults.config:1651
 msgid ""
 "<p>After the Reduced Scoring Date all additional work done by the student "
 "counts at a reduced rate. Here is where you set the reduced rate which must "
@@ -274,7 +337,7 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2036
+#: /opt/webwork/webwork2/conf/defaults.config:1937
 msgid ""
 "<p>During summer 2005, a newer version of the answer checkers was "
 "implemented for answers which are functions and numbers.  The newer checkers"
@@ -286,16 +349,74 @@ msgid ""
 " the old answer checkers will be used by default.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2006
+#: /opt/webwork/webwork2/conf/defaults.config:1908
 msgid ""
 "<p>MathQuill renders students answers in real-time as they type on the "
 "keyboard.</p><p>MathView allows students to choose from a variety of common "
 "math structures (such as fractions and square roots) as they attempt to "
-"input their answers.</p><p>WIRIS provides a separate workspace for students "
-"to construct their response in a WYSIWYG environment.</p>"
+"input their answers.</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1459
+msgid ""
+"<p>Mode in which the LANG and DIR settings for a single problem are "
+"determined.</p><p>The system will set the LANGuage attribute to either a "
+"value determined from the problem, a course-wide default, or the system "
+"default, depending on the mode selected. The tag will only be added to the "
+"DIV enclosing the problem if it is different than the value which should be "
+"set in the main HTML tag set for the entire course based on the course "
+"language.</p><p>There are two options for the DIRection attribute: \"ltr\" "
+"for left-to-write scripts, and \"rtl\" for right-to-left scripts like Arabic"
+" and Hebrew.</p><p>The DIRection attribute is needed to trigger proper "
+"display of the question text when the problem text-direction is different "
+"than that used by the current language of the course. For example, English "
+"problems from the library browser would display improperly in RTL mode for a"
+" Hebrew course, unless the problen Direction is set to LTR.</p><p>The "
+"feature to set a problem language and direction was only added in 2018 to "
+"the PG language, so most problems will not declare their language, and the "
+"system needs to fall back to determining the language and direction in a "
+"different manner. The OPL itself is all English, so the system wide fallback"
+" is to en-US in LTR mode.</p><p>Since the defaults fall back to the LTR "
+"direction, most sites should be fine with the \"auto::\" mode, but may want "
+"to select the one which matches their course language. The mode "
+"\"force::ltr\" would also be an option for a course which runs into trouble "
+"with the \"auto\" modes.</p><p>Modes:</p><ul><li>\"none\" prevents any "
+"additional LANG and/or DIR tag being added. The browser will use the main "
+"setting which was applied to the entire HTML page. This is likely to cause "
+"trouble when a problem of the other direction is "
+"displayed.</li><li>\"auto::\" allows the system to make the settings based "
+"on the language and direction reported by the problem (a new feature, so not"
+" set in almost all existing problems) and falling back to the expected "
+"default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" allows the "
+"system to make the settings based on the language and direction reported by "
+"the problem (a new feature, so not set in almost all existing problems) but "
+"falling back to the language with the given LangCode and the direction Dir "
+"when problem settings are not available from PG.</li><li>\"auto::Dir\" for "
+"problems without PG settings, this will use the default en=english language,"
+" but force the direction to Dir. Problems with PG settings will get those "
+"settings.</li><li>\"auto:LangCode:\" for problems without PG settings, this "
+"will use the default LTR direction, but will set the language to "
+"LangCode.Problems with PG settings will get those "
+"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
+" by the PG code of the problem, and will force the system to set the "
+"language with the given LangCode and the direction to Dir for <b>all</b> "
+"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
+"PG code of the problem, and will force the system to set the direction to "
+"Dir for <b>all</b> problems, but will avoid setting any language attribute "
+"for individual problem.</li></ul>"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1514
+msgid ""
+"<p>Some servers handle courses taking place in different timezones.  If this"
+" course is not showing the correct timezone, enter the correct value here.  "
+"The format consists of unix times, such as \"America/New_York\", "
+"\"America/Chicago\", \"America/Denver\", \"America/Phoenix\" or "
+"\"America/Los_Angeles\".</p>Complete list: <a "
+"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1736
+#: /opt/webwork/webwork2/conf/defaults.config:1638
 msgid ""
 "<p>This sets whether the Reduced Scoring system will be enabled.  If enabled"
 " you will need to set the default length of the reduced scoring period and "
@@ -307,22 +428,35 @@ msgid ""
 "graders if they are written appropriately.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1979
+#: /opt/webwork/webwork2/conf/defaults.config:1881
 msgid ""
 "<p>When viewing a problem, users may choose different methods of rendering "
 "formulas via an options box in the left panel. Here, you can adjust what "
 "display modes are listed.</p><p>Some display modes require other software to"
 " be installed on the server. Be sure to check that all display modes "
-"selected here work from your server.</p><p>The display modes are "
-"<ul><li>plainText: shows the raw LaTeX strings for formulas.</li><li>images:"
-" produces images using the external programs LaTeX and "
-"dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place "
-"render mathematics.</li></ul></p></p>You must use at least one display mode."
-" If you select only one, then the options box will not give a choice of "
-"modes (since there will only be one active).</p>"
+"selected here work from your server.</p><p>The display modes "
+"are</p><ul><li>plainText: shows the raw LaTeX strings for "
+"formulas.</li><li>images: produces images using the external programs LaTeX "
+"and dvipng.</li><li>MathJax: a successor to jsMath, uses javascript to place"
+" render mathematics.</li></ul><p>You must use at least one display mode. If "
+"you select only one, then the options box will not give a choice of modes "
+"(since there will only be one active).</p>"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1476
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with a question in "
+"this test. Please inform your instructor including the warning messages "
+"below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1236
+msgid ""
+"<strong>Warning</strong>: There may be something wrong with this question. "
+"Please inform your instructor including the warning messages below."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1828
+#: /opt/webwork/webwork2/conf/defaults.config:1730
 msgid ""
 "<ul><li><b>SMAcheckAnswers</b>: enables the Check Answers button <i>for the "
 "new problem</i> when Show Me Another is "
@@ -334,7 +468,7 @@ msgid ""
 "time</li><li><b>SMAshowHints</b>: show hints <i>for the new problem</i> "
 "(assuming they exist)</li></ul>Note: there is very little point enabling the"
 " button unless you check at least one of these options - the students would "
-"simply see a new version that they can not attempt or learn from.</p>"
+"simply see a new version that they can not attempt or learn from."
 msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:35
@@ -343,73 +477,123 @@ msgstr ""
 
 #. ($add_courseID)
 #. ($rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1376
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:688
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:600
 msgid "A course with ID %1 already exists."
 msgstr ""
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2564
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1220
 msgid ""
 "A directory already exists with the name %1. You must first delete this "
 "existing course before you can unarchive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:119
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:111
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:42
 msgid ""
 "A file name cannot begin with a dot, it cannot be empty, it cannot contain a"
 " directory path component and only the characters -_.a-zA-Z0-9 and space are"
 " allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1342
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1366
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:738
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
 msgid "A file with that name already exists"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:348
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:19
 msgid ""
 "A hardcopy file was generated, but it may not be complete or correct. Please"
 " check that no problems are missing and that they are all legible. If not, "
 "please inform your instructor."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:56
+msgid ""
+"A hash reference in which the keys are the achievement_id's assigned to the "
+"current user and the values are 0 or 1 which stores if the user has earned "
+"the associated achievement or not."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:52
+msgid ""
+"A hash reference which contains a problems metadata, such as DBsubject, "
+"DBchapter, DBsection,  and so on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:37
+msgid "A hash reference which contains the problem data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:40
+msgid "A hash reference which contains the set data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:60
+msgid ""
+"A hash reference which saves data for this user and this achievement. This "
+"hash is persistent between evaluations and changes to this variable will be "
+"saved in the database."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:64
+msgid ""
+"A hash reference which saves global data for this user. This hash is "
+"persistent between evaluations and changes to this variable will be saved in"
+" the database."
+msgstr ""
+
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3291
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1695
 msgid ""
 "A location with the name %1 already exists in the database.  Did you mean to"
 " edit that location instead?"
 msgstr ""
 
-#. ($subject, $number_of_recipients, $courseName, $failed_messages)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1007
+#. ($mail_data->{subject}, $number_of_recipients, $mail_data->{courseName},
+#. $failed_messages)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:113
 msgid ""
 "A message with the subject line \"%1\" has been sent to %quant(%2,recipient)"
 " in the class %3.  There were %4 message(s) that could not be sent."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:644
-msgid "A new file has been created at '%1'"
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:315
+msgid "A new file has been created at \"%1\""
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1146
+msgid "A new file has been created at \"%1\" with the contents below."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2006
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:154
 msgid ""
-"A new file has been created at '%1' with the contents below.  No changes "
-"have been made to set %2"
+"A new problem whose path ends in newProblem.pg should be given a new name, "
+"for example, \"myNewProblem.pg\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:681
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:20
 msgid ""
-"A period (.) indicates a problem has not been attempted, and a number from 0"
-" to 100 indicates the grade earned. The number on the second line gives the "
-"number of incorrect attempts."
+"A student must be assigned a homework set in order for it to appear on their"
+" WeBWorK home page. Check the box in the left column to assign a student to "
+"that homework set. Uncheck the box to unassign a student. If a student is "
+"unassigned from a homework set, all of the student's data for that homework "
+"set is deleted and cannot be recovered. Use this action cautiously!"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:20
+msgid ""
+"A student needs to be assigned a set in order for them to work it. Once a "
+"student is unassigned a set, all the data for them is lost and there is no "
+"way to undo it. When unassigning be sure to change the option to \"Allow "
+"unassign\"."
 msgstr ""
 
 # Leave symbol codes in place
-#: /opt/webwork/webwork2/conf/defaults.config:1647
+#: /opt/webwork/webwork2/conf/defaults.config:1549
 msgid ""
 "A switch to govern the use of a Progress Bar for the student; this also "
 "enables/disables the highlighting of the current problem in the side bar, "
@@ -417,474 +601,665 @@ msgid ""
 "(&#x2717;), or unattempted (no symbol)."
 msgstr ""
 
-# Short for ADJUSTED STATUS
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:500
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:712
-msgid "ADJ STATUS"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2296
-msgid "ANSWERS NOT RECORDED"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:42
+msgid "A unique key identifying the achievement."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2281
-msgid "ANSWERS NOT RECORDED --"
+# Short for ADJUSTED STATUS
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:535
+msgid "ADJ STATUS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2295
-msgid "ANSWERS ONLY CHECKED -- "
+#. ($c->{scoreRecordedMessage}[ $probOrder->[$i] ])
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:504
+msgid "ANSWERS NOT RECORDED -- %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2232
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1505
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:515
 msgid "ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"
 msgstr "答案仅为检查 -- 答案没有被记录"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2259
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1527
 msgid ""
 "ATTEMPT NOT ACCEPTED -- Please submit answers again (or request new version "
 "if neccessary)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1534
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_password_form.html.ep:1
 msgid "Abandon changes"
 msgstr "放弃更改"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1083
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_export_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_export_form.html.ep:1
 msgid "Abandon export"
 msgstr "放弃输出"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:520
 msgid ""
 "Account creation is currently disabled in this course.  Please speak to your"
 " instructor or system administrator."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:153
-msgid "Achievement"
-msgstr ""
-
-#. ($targetAchievementID, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:638
-msgid "Achievement %1 created with evaluator '%2'."
+#. ($targetAchievementID,			$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:310
+msgid "Achievement %1 created with evaluator \"%2\"."
 msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:847
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:378
 msgid "Achievement %1 exists.  No achievement created"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:444
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:63
 msgid "Achievement Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:548
-msgid "Achievement Evaluator Editor"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:17
+msgid "Achievement Editor Help"
 msgstr ""
 
-#. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:170
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:17
+msgid "Achievement Evaluator Editor Help"
+msgstr ""
+
+#. ($c->stash('achievementID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:109
 msgid "Achievement Evaluator for achievement %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1446
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1454
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1482
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:13
 msgid "Achievement ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:274
 msgid "Achievement ID exists!  No new achievement created.  File not saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1698
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:41
+msgid "Achievement ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:3
+msgid "Achievement List"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1600
 msgid "Achievement Points Per Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:558
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:455
 msgid "Achievement User Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:17
+msgid "Achievement User Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:48
 msgid "Achievement has been assigned to all users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:67
 msgid "Achievement has been assigned to selected users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:60
 msgid "Achievement has been unassigned to all students."
 msgstr ""
 
-#. (CGI::a({ href => $fileManagerURL }, $scoreFileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:711
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:38
+msgid "Achievement options"
+msgstr ""
+
+#. ($c->link_to(                           $scoreFileName => $c->systemLink(
+#. $c->url_for('instructor_file_manager')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:318
 msgid "Achievement scores saved to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:260
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:241
 msgid "Achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:531
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:17
+msgid "Achievements Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:26
+msgid ""
+"Achievements are evaluated in the order shown below, with the exception of "
+"\"level\" achievements.  Achievements in the \"level\" category are "
+"evaluated first and control the XP thresholds and rewards (achievement "
+"items) for reaching each level. Achievements in the \"secret\" category are "
+"not shown to students until they earn the achievement, and is used for "
+"fun/surprise achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:32
+msgid ""
+"Achievements in the same category, with sequential numbers, and whose ID "
+"starts with the same \"prefix_\" (up to the last underscore), are treated as"
+" achievement chains.  Achievement chains are a sequence of achievements "
+"which build upon themselves, such as complete one problem, complete 10 "
+"problems, complete 25 problems, and so on. Students will only see the "
+"achievements in the chain they have completed or are currently working on."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:201
 msgid "Act as"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:207
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:26
 msgid "Act as:"
 msgstr ""
 
-#. (HTML::Entities::encode_entities($prettyEUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1134
+#. ($effectiveUserName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:26
 msgid "Acting as %1."
 msgstr ""
 
 #. ($actionID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:372
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:223
 msgid "Action %1 not found"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1706
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:101
+msgid "Actions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1608
 msgid ""
 "Activating this will enable achievement rewards. This feature allows "
 "students to earn rewards by completing achievements that allow them to "
 "affect their homework in a limited way."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:45
 msgid "Active"
 msgstr "活跃的"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1691
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:50
+msgid "Active Students"
+msgstr ""
+
+#. ($c->{prettyID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:19
+msgid "Active Students Problem %1 Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1593
 msgid ""
 "Activiating this will enable Mathchievements for webwork.  Mathchievements "
 "can be managed by using the Achievement Editor link."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2947
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1548
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:166
 msgid "Add"
 msgstr "添加"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:89
 msgid "Add All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:644
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:32
 msgid "Add Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:253
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:17
+msgid "Add Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:14
+msgid "Add Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:98
 msgid "Add Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:406
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:349
 msgid "Add Users"
 msgstr "添加用户"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:518
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:17
+msgid "Add Users Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:47
 msgid "Add WeBWorK administrators to new course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1509
-msgid "Add a new test for which Gateway?"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:79
+msgid "Add a TA or an instructor (change permission level of user)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:60
+msgid "Add a few students to the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1441
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:50
+msgid "Add a new version for which test?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:20
 msgid "Add as what filetype?"
 msgstr "tr: Add as what filetype?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/add_form.html.ep:3
 msgid "Add how many users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1549
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:69
+msgid "Add many students to a course from a class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:108
+msgid "Add n blank problem template(s) to the end of homework set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:164
 msgid "Add problem to target set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Add problems to"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1422
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:161
+msgid ""
+"Add this problem as the last problem of an existing set, either as a problem"
+" or as the set header (the text that appears on the home page of a homework "
+"set). You can rearrange the order of the problems later using the \"Hmwk "
+"Sets Editor\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep:7
 msgid "Add to what set?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:20
+msgid ""
+"Add users to the course.  Select the number of students/users to add and "
+"then add any desired information.  The only mandatory information is the "
+"\"Login Name\". Any other fields may be left blank.  The \"Student ID\" will"
+" be the initial password for the user if provided."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:26
 msgid "Add which new users?"
 msgstr "增加哪种新用户?"
 
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:883
+msgid "Added \"%1\" to %2 as new hardcopy header"
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:854
+msgid "Added \"%1\" to %2 as new set header"
+msgstr ""
+
 #. ('{number}', '{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1055
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:27
 msgid "Added %1 problems to set %2."
 msgstr ""
 
-#. ($sourceFilePath, $targetSetName,($set->assignment_type eq 'jitar' ?
-#. join('.',jitar_id_to_seq($targetProblemNumber)
-#. ($new_file_name, $setName, ($set->assignment_type eq 'jitar' ?
-#. join('.',jitar_id_to_seq($targetProblemNumber)
 #. ($new_file_path, $setID, $targetProblemNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1510
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2001
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1912
+#. ($sourceFilePath,                       $targetSetName,                 (
+#. $set->assignment_type eq 'jitar'                                ? join('.',
+#. jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:825
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1837
 msgid "Added %1 to %2 as problem %3"
 msgstr ""
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1566
-msgid "Added '%1' to %2 as new hardcopy header"
-msgstr ""
-
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1540
-msgid "Added '%1' to %2 as new set header"
+#. ($new_file_name,                                $c->{setID},
+#. (                                       $set->assignment_type eq 'jitar'
+#. ? join('.', jitar_id_to_seq($targetProblemNumber)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1139
+msgid "Added %1 to %2 as problem %3."
 msgstr ""
 
 #. (join(', ', @toAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1974
 msgid "Added addresses %1 to location %2."
 msgstr ""
 
+#. ($user->user_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:167
+msgid "Added missing permission level for user %1."
+msgstr ""
+
 #. ('{set}')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1054
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:26
 msgid "Added one problem to set %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Added user:"
+msgstr ""
+
+#. ('<code>[Scoring]/report_grades_data.csv</code>',
+#. '<code>[TMPL]/email/report_grades.msg</code>',)
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:33
+msgid ""
+"Additional (external) grades can be shown on this page by placing them in "
+"the CSV file %1.  The first six columns must be (in order): Student ID, "
+"Username, Last Name, First Name, Section, Recitation.  The remaining columns"
+" can list any external grades.  To display the grades, the CSV file is "
+"merged with the \"Email\" message %2, which will be rendered and displayed "
+"below the grade table.  The message can be created on the \"Email\" page and"
+" the CSV file can be created/uploaded using the \"File Manager\".  External "
+"grades can only be displayed here and are not included in any totals or "
+"statistics."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2060
 msgid "Additional addresses for receiving feedback e-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:235
 msgid "Additional submissions available."
 msgstr ""
 
 #. ($badLocAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1708
 msgid ""
 "Address(es) %1 already exist in the database.  THIS SHOULD NOT HAPPEN!  "
 "Please double check the integrity of the WeBWorK database before continuing."
 msgstr ""
 
 #. (join(', ', @noAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1986
 msgid ""
 "Address(es) %1 in the add list is(are) already in the location %2, and so "
 "were skipped."
 msgstr ""
 
 #. (join(', ', @noDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3603
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2008
 msgid ""
 "Address(es) %1 in the delete list is(are) not in the location %2, and so "
 "were skipped."
 msgstr ""
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1683
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and resubmit."
 msgstr ""
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1998
 msgid ""
 "Address(es) %1 is(are) not in a recognized form.  Please check your data "
 "entry and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:117
 msgid "Addresses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:53
 msgid ""
 "Addresses for new location.  Enter one per line, as single IP addresses "
 "(e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP ranges "
 "(e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:27
 msgid ""
 "Addresses to add to the location.  Enter one per line, as single IP "
 "addresses (e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP"
 " ranges (e.g., 192.168.1.101-192.168.1.150):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:232
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:27
 msgid "Adds 24 hours to the close date of a homework."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:323
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:27
 msgid "Adds 48 hours to the close date of a homework."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:110
+msgid ""
+"Adds new template problems to the set when the set is saved. You can modify "
+"the template to create your own problem, by clicking on the \"Edit Problem\""
+" link and saving to some new file, e.g. \"myNewProblem.pg\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:19
 msgid "Adjusted Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:56
 msgid "Adobe PDF"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:675
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:42
 msgid "Advanced Search"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:196
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:206
 msgid "After set answer date"
 msgstr ""
 
-#. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:325
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:33
 msgid ""
-"After the reduced scoring period begins all work counts for %1% of its "
-"value."
+"After the due date this set enters a reduced scoring period until it closes "
+"on %1.  All work completed during the reduced scoring period counts for %2% "
+"of its value."
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:304
 msgid "Afterward reduced credit can be earned until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:56
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:60
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:23
 msgid "All Chapters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:57
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:34
 msgid "All Sections"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:6
 msgid "All Selected Constraints Joined by \"And\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:71
+msgid "All Sets"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:12
 msgid "All Subjects"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:48
 msgid "All Textbooks"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:54
+msgid "All Users"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:49
 msgid "All assignments were made successfully."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:953
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:386
 msgid "All listed sets were hidden from all the students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:951
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:381
 msgid "All listed sets were made visible for all the students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:398
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:407
 msgid "All of the answers above are correct."
 msgstr "上面的所有答案都是正确的."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:398
 msgid "All of the gradeable answers above are correct."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:247
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:162
+msgid ""
+"All of the paths for problem files are relative to the templates directory "
+"of the current course. You can access this directory \"directly\" using the "
+"File Manager page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:68
 msgid "All of these files will also be made available for mail merge."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:960
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:9
+msgid "All problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep:5
+msgid "All sections"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2145
+msgid "All selected courses are already hidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2214
+msgid "All selected courses are already unhidden."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:399
 msgid "All selected sets hidden from all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:394
 msgid "All selected sets made visible for all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:946
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:373
 msgid "All sets hidden from all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:945
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:368
 msgid "All sets made visible for all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:619
 msgid "All sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:56
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:54
 msgid "All unassignments were made successfully."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2047
+#: /opt/webwork/webwork2/conf/defaults.config:1948
 msgid "Allow Unicode alternatives in student answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:74
 msgid "Allow the LMS to update user account data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:68
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:105
 msgid "Allow unassign"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2069
+#: /opt/webwork/webwork2/conf/defaults.config:1970
 msgid "Allowed error, as a percentage, for numerical comparisons"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1886
+#: /opt/webwork/webwork2/conf/defaults.config:1788
 msgid "Allowed to <em>act as</em> another user"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1923
+#: /opt/webwork/webwork2/conf/defaults.config:1825
 msgid "Allowed to change display settings used in pg problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1913
+#: /opt/webwork/webwork2/conf/defaults.config:1815
 msgid "Allowed to change their e-mail address"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1877
+#: /opt/webwork/webwork2/conf/defaults.config:1779
 msgid "Allowed to change their password"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1872
+#: /opt/webwork/webwork2/conf/defaults.config:1774
 msgid "Allowed to login to the course"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1950
+#: /opt/webwork/webwork2/conf/defaults.config:1852
 msgid "Allowed to see solutions before the answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1945
+#: /opt/webwork/webwork2/conf/defaults.config:1847
 msgid "Allowed to see the correct answers before the answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1934
+#: /opt/webwork/webwork2/conf/defaults.config:1836
 msgid "Allowed to view past answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1940
+#: /opt/webwork/webwork2/conf/defaults.config:1842
 msgid "Allowed to view problems in sets which are not open yet"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1572
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:82
+msgid ""
+"Allows configuration of certain parameters, such as permission levels, "
+"default display mode for equations, and email feedback behavior, on a course"
+" by course basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:126
+msgid "Also copy simple configuration file"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:26
 msgid "Amulet of Extension"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:20
+msgid ""
+"An achievement evaluator is a perl script that is run after each problem is "
+"submitted which returns a truth value of 0 (didn't earn) or 1 (earn). The "
+"evaluator is given access to different variables which contain data about "
+"the problem and set that is used to determine if the achievement is earned "
+"or not."
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:37
 msgid ""
 "An address that can be used to log in to the LMS. This is used in messages "
@@ -892,248 +1267,308 @@ msgid ""
 "WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:43
+msgid ""
+"An array which lists the hash reference of all the problems in the current "
+"set."
+msgstr ""
+
 #. ($archive_courseID)
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2350
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2647
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1274
 msgid "An error occured while archiving the course %1:"
 msgstr ""
 
 #. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:658
 msgid "An error occured while changing the title of the course %1."
 msgstr ""
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1795
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:878
 msgid "An error occured while deleting the course %1:"
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1521
+#. ($rename_oldCourseID,						$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:751
 msgid "An error occured while renaming the course %1 to %2:"
 msgstr ""
 
 #. ($part + 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:106
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:25
 msgid "Answer %1 Score (%):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:425
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:765
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:789
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:812
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:79
 msgid "Answer Date"
 msgstr "答案日期"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1712
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:39
 msgid "Answer Group Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:59
 msgid "Answer Hash Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:221
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:292
 msgid "Answer Log"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:17
+msgid "Answer Log Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:285
 msgid "Answer Preview"
 msgstr "答案预览"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1465
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:48
+msgid ""
+"Answer availability for tests depends on multiple settings.  This only "
+"indicates the template answer date has passed.  See set editor for actual "
+"availability."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1276
 msgid "Answer(s) submitted:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
 msgid "Answer:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:224
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
 msgid "Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:122
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:37
 msgid "Answers Available"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1202
 msgid "Answers cannot be due until on or after the open date!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1204
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1197
 msgid "Answers cannot be made available until on or after the close date!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:313
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:21
 msgid ""
 "Any changes made below will be reflected in the achievement for ALL "
 "students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2259
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:507
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:175
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:69
 msgid "Any changes made below will be reflected in the set for ALL students."
 msgstr "tr: Any changes made below will be reflected in the set for ALL students."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:173
 msgid ""
 "Any changes made below will be reflected in the set for ONLY the student(s) "
 "listed above."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:122
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:159
 msgid "Append"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1849
+#. (tag('strong', dir => 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:71
 msgid "Append to end of %1 set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2264
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:51
+msgid "Applying definitions theoretically and proof writing"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:91
 msgid "Archive"
 msgstr ""
 
 #. ($archive, $n)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:892
-msgid "Archive '%1' created successfully (%quant( %2, file))"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:361
+msgid "Archive \"%1\" created successfully (%quant( %2, file))"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1069
-msgid "Archive '%1' deleted"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:525
+msgid "Archive \"%1\" deleted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1846
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2048
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:38
 msgid "Archive Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2005
-msgid "Archive Courses"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:17
+msgid "Archive Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2423
-msgid "Archive next course"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:63
+msgid "Archive Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1056
-msgid "Archive this Course"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1158
+msgid "Archive next course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:432
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:61
 msgid "Archived Courses"
 msgstr ""
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:202
-msgid "Archiving course as %1.tar.gz. Reload FileManager to see it."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:69
+msgid "Archived course as %1.tar.gz."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:25
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to access the .tar.gz files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:26
+msgid ""
+"Archived courses are located inside the \"archives\" directory of the "
+"\"admin\" course.  Use the \"File Manager\" to upload additional .tar.gz "
+"files to be unarchived."
 msgstr ""
 
-#. (CGI::b($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2191
+#. (tag('b', $archive_courseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:57
 msgid ""
 "Are you sure that you want to delete the course %1 after archiving? This "
 "cannot be undone!"
 msgstr ""
 
-#. (CGI::b($delete_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1736
+#. (tag('b', param('delete_courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:5
 msgid ""
 "Are you sure you want to delete the course %1? All course files and data "
 "will be destroyed. There is no undo available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:72
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:511
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:64
+msgid ""
+"As the checkbox says, this includes a percentage grade column for each set."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:184
 msgid "Assign"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:225
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:62
 msgid "Assign All Sets to Current User"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:171
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:106
+msgid "Assign achievements"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:43
+msgid "Assign and unassign selected exercise sets to selected users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:54
 msgid "Assign selected sets to selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:919
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:154
+msgid "Assign sets to many students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:116
+msgid "Assign sets to one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:15
 msgid "Assign this achievement to which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1366
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:62
 msgid "Assign this set to which users?"
 msgstr "这次作业留给哪些用户?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:15
 msgid "Assign to All Current Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:3
 msgid "Assign which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:35
 msgid "Assigned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1984
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:19
 msgid "Assigned Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:580
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:218
 msgid "Assigned achievements to users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2154
-msgid "Assigned to"
+#. (link_to(						$c->setCountMessage($db->countUserSets($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:96
+msgid "Assigned to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:212
 msgid "Assignment type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:190
-msgid "Assignments only"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:2004
+#: /opt/webwork/webwork2/conf/defaults.config:1906
 msgid "Assist with the student answer entry process."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:417
 msgid "At least one of the answers above is NOT correct."
 msgstr ""
 
 # Short for "Attempts to Open Children"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:487
 msgid "Att. to Open Children"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:50
 msgid "Attachment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2293
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:107
 msgid "Attempt to upgrade directories"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:375
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:449
 msgid "Attempted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1416
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1498
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/attempts_row.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:73
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:13
 msgid "Attempts"
 msgstr ""
 
@@ -1141,64 +1576,114 @@ msgstr ""
 msgid "Audit"
 msgstr "tr: Enrolled"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:342
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:348
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:360
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:366
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:460
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:466
 msgid "Authentication failed.  Please speak to your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:523
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/InstructorRPCHandler.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:44
+msgid "Authentication failed. Log in again to continue."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:116
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:69
 msgid "Author Info"
 msgstr "tr: Author Info"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:87
 msgid "Automatic"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2058
+#: /opt/webwork/webwork2/conf/defaults.config:1959
 msgid ""
 "Automatically convert Full Width Unicode characters to their ASCII "
 "equivalents"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2911
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:97
+msgid ""
+"Automatically render all problems in the set on this page when \"Save "
+"Changes\" or \"Reset Form\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:667
 msgid "Automatically render problems on page load"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1727
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:95
+msgid "Automatically render problems on page load."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:49
 msgid "Auxiliary Resources"
 msgstr ""
 
-#. ($emailDirectory,$old_default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:350
-msgid "Backup file <code>%1/%2</code> created."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:179
+msgid "Average Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:255
-msgid "Badges"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:118
+msgid "Average Attempts Per Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:942
-msgid "Basic Search"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:115
+msgid "Average Percent"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
-msgid "Binary"
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:558
+msgid "Backup created on %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1271
-msgid "Box of Transmogrification"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:1
+msgid "Badges"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1093
-msgid "Browse"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:106
+msgid "Basic Search"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:512
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:991
-msgid "Browse from:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:28
+msgid "Before Open Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2161
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:31
+msgid ""
+"Below the file list is a button and options for uploading files. Click the "
+"\"Choose File\" button, select the file, then click \"Upload\". A single "
+"file or a compressed tar (.tgz) file can be uploaded and if the option is "
+"selected, the archive is automatically unpacked and deleted.  Generally the "
+"\"automatic\" option on Format will correctly pick the correct type of file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:83
+msgid "Binary"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+msgid "Both Start and Grade"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:26
+msgid "Box of Transmogrification"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:40
+msgid "Browse"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:16
+msgid "Browse from:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2072
 msgid ""
 "By default, feedback is always sent to all users specified to recieve "
 "feedback.  This variable sets the system to only email feedback to users who"
@@ -1206,327 +1691,471 @@ msgid ""
 "will only be sent to section leaders."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2151
+#: /opt/webwork/webwork2/conf/defaults.config:2062
 msgid ""
 "By default, feedback is sent to all users above who have permission to "
 "receive feedback. Feedback is also sent to any addresses specified in this "
 "blank. Separate email address entries by commas."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
 msgid "CLOSE DATE"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:217
 msgid "CLOSE TIME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:26
 msgid "Cake of Enlargement"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1891
+#: /opt/webwork/webwork2/conf/defaults.config:1793
 msgid "Can e-mail instructor"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1904
+#: /opt/webwork/webwork2/conf/defaults.config:1806
 msgid "Can report bugs"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1955
+#: /opt/webwork/webwork2/conf/defaults.config:1857
 msgid "Can show old answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1897
+#: /opt/webwork/webwork2/conf/defaults.config:1799
 msgid "Can submit answers for a student"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:275
 msgid "Can't copy file: %1"
 msgstr ""
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:894
-msgid "Can't create archive '%1': command returned %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
+msgid "Can't create archive \"%1\": command returned %2"
 msgstr ""
 
 #. ($courseID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2725
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:28
 msgid "Can't create course environment for %1 because %2"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:423
 msgid "Can't create directory: %1"
 msgstr ""
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1060
-msgid "Can't create file '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+msgid "Can't create file \"%1\": %2"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:948
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:406
 msgid "Can't create file: %1"
 msgstr ""
 
 #. ($name, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1070
-msgid "Can't delete archive '%1': %2"
-msgstr ""
-
-#. ($eUserID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:69
-msgid "Can't get password record for effective user '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:526
+msgid "Can't delete archive \"%1\": %2"
 msgstr ""
 
-#. ($userID, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:64
-msgid "Can't get password record for user '%1': %2"
+#. ($setID, $TargetUser->user_id,)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:925
+msgid ""
+"Can't generate hardcopy for set \"%1\" for user \"%2\". The set is not "
+"visible to students."
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:445
 msgid "Can't open %1"
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1426
 msgid "Can't open file %1"
 msgstr ""
 
 #. ($merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:343
 msgid "Can't read merge file %1. No message sent"
 msgstr ""
 
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:760
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:298
 msgid "Can't rename file: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:591
 msgid "Can't rename to the same name."
 msgstr ""
 
-#. ($archive,systemError($?)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:927
-msgid "Can't unpack '%1': command returned %2"
+#. ($archive, systemError($?)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:392
+msgid "Can't unpack \"%1\": command returned %2"
 msgstr ""
 
 #. ($fullPath)
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:629
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1895
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1819
 msgid "Can't write to file %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1015
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1096
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:154
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:462
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/confirm.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:69
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:15
 msgid "Cancel"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:387
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:5
+msgid "Cancel E-Mail"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:60
 msgid "Cancel E-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:61
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:77
 msgid "Cancel Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:79
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
 msgid "Cancel Export"
 msgstr "tr: Cancel Export"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:93
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
 msgid "Cancel Password"
 msgstr "tr: Cancel Password"
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:516
+msgid "Cannot find a file path to save to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:501
+msgid ""
+"Cannot find a problem record for set $c->{setID} / problem $c->{problemID}"
+msgstr ""
+
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:240
 msgid "Cannot open %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:222
-msgid "Cap Test Time at Set Close Date?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:232
+msgid "Cap Test Time at Set Close Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1456
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1486
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:14
 msgid "Category"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:516
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:49
+msgid "Category:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:27
 msgid ""
 "Cause the selected homework set to count for twice as many points as it "
 "normally would."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1272
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:27
 msgid ""
 "Causes a homework problem to become a clone of another problem from the same"
 " set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:727
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:27
 msgid "Causes a single homework problem to be worth twice as much."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1006
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:48
 msgid "Change Course Title to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:34
 msgid "Change CourseID to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:176
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:134
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:76
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:25
 msgid "Change Display Settings"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:53
 msgid "Change Email Address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1032
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:62
 msgid "Change Institution to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:374
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:18
 msgid "Change Password"
 msgstr "更改密码"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:169
 msgid "Change User Settings"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:35
+msgid "Change a course's ID, Title, or Institution."
+msgstr ""
+
 #. ($rename_oldCourseInstitution, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1092
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
 msgid "Change course institution from %1 to %2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:160
+msgid "Change dates for a homework set for the whole class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:123
+msgid "Change the due date for one student"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:26
+msgid ""
+"Change the due dates for an individual student on this page. Check the "
+"checkbox and enter the new date in order to override the date. (You can copy"
+" the date format from the date in the right hand column which indicates the "
+"date when the homework set is due for the whole class.) Note that you should"
+" ensure that the close date is before the answer date. If the close date for"
+" a student is extended until after the class answer date for the set, then "
+"the answer date for the student must also be set to a later date. "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:141
+msgid "Change the grades on a homework set for one student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:163
+msgid "Change the grading on a homework set for an entire class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:170
+msgid "Change the number of atttempts allowed on a problem."
+msgstr ""
+
 #. ($rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1089
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:508
 msgid "Change title from %1 to %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1362
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1437
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:488
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:540
 msgid "Changes abandoned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:371
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:242
 msgid "Changes in this file have not yet been permanently saved."
 msgstr "tr: Changes in this file have not yet been permanently saved."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:647
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:529
 msgid "Changes saved"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1822
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:38
+msgid "Changing dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:514
 msgid ""
 "Changing the problem seed for display, but there are no problems showing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:635
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:19
 msgid "Chapter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1849
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:15
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:103
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:37
 msgid "Check Answers"
 msgstr "检查答案"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2476
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:682
 msgid "Check Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:183
-msgid "Check that it's permissions are set correctly."
-msgstr ""
-
-#. ($emailDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:195
-msgid ""
-"Check whether it exists and whether the directory %1 can be read by the "
-"webserver."
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:53
+msgid "Choose problems from a library and add them to a homework set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:543
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:40
 msgid "Choose the set which you would like to be worth twice as much."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:44
 msgid "Choose the set which you would like to enable partial credit for."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1206
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:992
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:44
 msgid "Choose the set which you would like to resurrect."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:259
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:350
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:40
 msgid "Choose the set whose close date you would like to extend."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:903
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:16
 msgid "Choose visibility of the sets to be affected"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:497
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:15
 msgid "Choose what to do with existing data:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:880
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:3
 msgid "Choose which sets to be affected"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:491
-msgid "Class value"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:17
+msgid "Class List Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:55
+msgid "Class list (\".lst\") files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:334
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:316
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:37
 msgid "Classlist Editor"
 msgstr "课程名单编辑"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1197
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:91
 msgid "Clear Problem Display"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:693
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:82
 msgid ""
 "Click a student's name to see the student's homework set. Click a heading to"
 " sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:687
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:74
 msgid ""
 "Click a student's name to see the student's test summary page. Click a "
 "test's version number to see the corresponding test version. Click a heading"
 " to sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:614
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:150
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:143
+msgid ""
+"Click first in the \"Assigned Sets\" column in the student's row. This will "
+"take you to a new page where you will click on the link to the homework set "
+"where the grade change is to be made. (The grade for each problem is listed "
+"as \"status\" on this third page)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:24
+msgid ""
+"Click on each of the tabs to view the configuration items. The question mark"
+" icon provides access to information about the behavior of the configuration"
+" settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:125
+msgid ""
+"Click on the column \"Assigned Sets\" in the student's row. This will take "
+"you to a page where you can assign and unassign homework sets and change the"
+" due dates for homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:33
+msgid ""
+"Click on the homework set links to edit the grades for this individual "
+"student on the homework set. (The grade of each problem is called the "
+"\"status\".) You can also change the number of allowed attempts and further "
+"modify the individual student's homework set.) You will also be able to "
+"change a student's seed which determines the individual values used in the "
+"individual version of the student's problem and the weight (how much a "
+"problem counts towards the grade.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:90
 msgid ""
 "Click on the login name to edit individual problem set data, (e.g. due "
 "dates) for these students."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:62
+msgid ""
+"Click the \"Add x student(s)\" radio button and then click \"Take action\". "
+"This will take you to a new page where the data can be entered for one or "
+"more students. It is also possible to assign the student to one or more "
+"problem sets as they are being entered: simply select the homework sets from"
+" the list below the data entry table. Use \"command\" or \"control\" click "
+"to select more than one homework set."
+msgstr ""
+
+#. ('<i class="fas fa-question-circle"></i>')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:88
+msgid "Click the %1 icon for page and item specific help."
+msgstr ""
+
+#. ('<a href="#"><i class="fas fa-question-circle"></i></a>')
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:20
+msgid "Click the icon %1 for page and item specific help."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:185
+msgid ""
+"Clicking on any active link at the top of the column sorts the page by that "
+"column. You can do lexigraphic sorts: click on \"First name\" then \"Last "
+"name\" to sort by last name, sorting those with the same last name by their "
+"first name."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:132
+msgid ""
+"Clicking on the login name link in a student's row allows you to view the "
+"student's version of the homework (rather than your own) so that you can "
+"more easily answer student questions about homework problems. (A \"acting as"
+" xxx\" alert will appear in the upper right corner of each window while you "
+"are acting as a student.) You can submit the answers (which will NOT be "
+"recorded) to check that the computer is grading the problem correctly. You "
+"will also be able to view past answers submitted by the student for each "
+"problem. To stop acting in the student's role click the \"Stop acting\" link"
+" in the upper right corner of the window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:199
+msgid ""
+"Clicking the <strong>e-mail address</strong> link will bring up your "
+"standard email application so that you can send email to the student. This "
+"works even if the student has been dropped from the course. To send email to"
+" an entire class or to merge grades with the email message use the \"Email\""
+" page link in the left margin."
+msgstr ""
+
 #. ($clientIP->ip()
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:541
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:547
 msgid ""
 "Client ip address %1 is not allowed to work this assignment, because the "
 "assignment has ip address restrictions and there are no allowed locations "
@@ -1534,329 +2163,337 @@ msgid ""
 "problem resolved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:713
-msgid "Close"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:316
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:39
+msgid "Close Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:424
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:764
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:788
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:811
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
-msgid "Close Date"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:35
+msgid "Closed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:382
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:208
 msgid "Closed, answers available."
 msgstr ""
 
-#. ($self->formatDateTime($set->answer_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:378
+#. ($c->formatDateTime($set->answer_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:204
 msgid "Closed, answers on %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:206
 msgid "Closed, answers recently available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:282
 msgid "Closed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:116
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:121
 msgid "Closes"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date, undef,
-#. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:113
-msgid "Closes %1"
-msgstr ""
-
-#. ($self->formatDateTime($verSet->due_date, undef,
+#. ($c->formatDateTime($verSet->due_date, undef,
 #. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:390
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:227
 msgid "Closes on %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:35
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:33
 msgid "Closes:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2518
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:357
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:71
 msgid "Collapse All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2529
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:367
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:85
 msgid "Collapse All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2668
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:419
 msgid "Collapse Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2791
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2793
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:572
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:575
 msgid "Collapse Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1715
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:73
+msgid ""
+"Collapse problem details to the top row of information about a problem. Note"
+" that the details of a single problem can be collapsed by clicking on the up"
+" arrow to the right of the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1617
 msgid ""
 "Comma separated list of set names that are excluded from all achievements. "
 "No achievement points and badges can be earned for submitting problems in "
 "these sets. Note that underscores (_) must be used for spaces in set names."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:238
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:245
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:225
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:577
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2047
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:299
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:833
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:862
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:891
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:920
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:131
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:46
 msgid "Comment"
 msgstr "评论"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:200
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:25
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:181
 msgid "Comment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:638
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:86
 msgid "Comments"
 msgstr ""
 
-#. ($self->formatDateTime($set->answer_date)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2175
+#. ($c->formatDateTime($c->{set}->answer_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:379
 msgid "Completed results for this assignment are not available until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:382
 msgid "Completed results for this assignment are not available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:264
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:280
 msgid "Completed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:45
 msgid "Compose Email Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3185
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:47
+msgid ""
+"Configure ip ranges (locations) that can be used to restrict set access."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:45
+msgid "Configure which course links appear on the site landing page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:97
 msgid "Confirm"
 msgstr ""
 
 #. ($e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:107
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:164
+#. ($eUserName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:41
 msgid "Confirm %1's New Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:579
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:78
 msgid "Confirm Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_export_form.html.ep:1
 msgid "Confirm which sets to export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementEvaluator.pm:288
+#: /opt/webwork/webwork2/templates/AchievementEvaluator/cheevoMessage.html.ep:15
 msgid "Congratulations, you earned a new level!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2250
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:95
 msgid "Continue"
 msgstr "继续"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:86
 msgid "Continue Open Test"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:59
+msgid "Controls if an achievement is evaluated or not."
+msgstr ""
+
 #. ($sourceDirectory, $outputDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1149
-msgid "Copied auxiliary files from %1 to new location at %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:671
+msgid "Copied auxiliary files from %1 to new location at %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:42
 msgid "Copy"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:739
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:280
 msgid "Copy file as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:528
-msgid "Copy simple configuration file to new course"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:627
-msgid "Copy templates from:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:112
+msgid "Copy from:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1335
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:82
 msgid "Copy this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:391
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:465
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:301
 msgid "Correct"
 msgstr "正确"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:656
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:678
 msgid "Correct Adjusted Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:300
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:287
 msgid "Correct Answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1682
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:19
 msgid "Correct Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1506
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1317
 msgid "Correct Answers:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:693
 msgid "Correct Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:648
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:93
 msgid "Correct answers"
 msgstr "正确答案"
 
 #. ($total_correct, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1004
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:16
 msgid "Correct: %1/%2"
 msgstr ""
 
 #. ($newBlankProblems, $MAX_NEW_PROBLEMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1915
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1843
 msgid ""
 "Could not add %1 problems to this set.  The number must be between 1 and %2"
 msgstr ""
 
 #. ($e_user_name, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:83
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:94
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:74
 msgid "Couldn't change %1's password: %2"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:111
 msgid "Couldn't change your email address: %1"
 msgstr ""
 
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4111
-msgid "Couldn't find OPL Branch %1 in remote %2"
-msgstr ""
-
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4076
-msgid "Couldn't find PG Branch %1 in remote %2"
-msgstr ""
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4014
-msgid "Couldn't find WeBWorK Branch %1 in remote %2"
-msgstr ""
-
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:132
 msgid "Couldn't save your display options: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1463
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:36
 msgid "Counter"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:424
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:833
-msgid "Counts for Parent"
-msgstr ""
-
-#. ($rename_oldCourseID)
-#. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2186
-msgid "Course %1 database is in order"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:66
+msgid "Counter:"
 msgstr ""
 
-#. ($rename_oldCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1257
-msgid "Course %1 databases must be updated before renaming this course."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:503
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:35
+msgid "Counts for Parent"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:778
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:95
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:154
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:9
 msgid "Course Administration"
 msgstr "课程管理"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:424
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:17
+msgid "Course Administration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:369
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:80
 msgid "Course Configuration"
 msgstr "课程结构"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:480
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:17
+msgid "Course Configuration Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:17
+msgid "Course Home Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:21
 msgid "Course ID"
 msgstr ""
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1370
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2566
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:691
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:594
 msgid "Course ID cannot exceed %1 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1227
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:597
 msgid "Course ID may only contain letters, numbers, hyphens, and underscores."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:956
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:21
 msgid "Course ID:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:5
 msgid "Course Info"
 msgstr "课程信息"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1664
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1961
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3736
-msgid "Course Name:"
+#. ($c->stash('courseID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:325
+msgid "Course Information for course %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:491
-msgid "Course Title"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:30
+msgid "Course Listings"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:17
+msgid "Course Name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:204
-msgid "Course archived."
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:28
+msgid "Course Title"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:418
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:12
 msgid "Courses"
 msgstr "课程"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1609
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1904
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3674
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:13
 msgid ""
 "Courses are listed either alphabetically or in order by the time of most "
 "recent login activity, oldest first. To change the listing order check the "
@@ -1865,393 +2502,536 @@ msgid ""
 "\"hidden\" or \"visible\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:483
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:7
+msgid ""
+"Courses are listed either alphabetically or in order by the time of most "
+"recent login activity, oldest first. To change the listing order check the "
+"mode you want and click \"Refresh Listing\". The listing format is: "
+"Course_Name (status :: date/time of most recent login) where status is "
+"\"hidden\" or \"visible\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:163
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:84
 msgid "Create"
 msgstr "tr: Create"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:41
 msgid "Create CSV"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3054
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:31
 msgid "Create Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1071
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:39
+msgid ""
+"Create a .tar.gz archive which includes the course's database and all course"
+" files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:33
 msgid "Create a New Set in This Course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:795
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:4
 msgid "Create a new achievement with ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:812
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:33
+msgid "Create a new course on this server."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:20
+msgid ""
+"Create a new course.  The \"Course ID\" is used as the course name and is "
+"used in course links.  Underscores appear as spaces when displaying the "
+"course name.  The \"Course Title\" is used as the title on the course home "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:86
+msgid ""
+"Create a new set with a given name. This can either create an empty set or a"
+" duplicate of an existing set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:12
 msgid "Create as what type of achievement?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:12
 msgid "Create as what type of set?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1866
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:20
+msgid "Create backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:81
 msgid "Create unattached problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1849
-msgid ""
-"Creates a gzipped tar archive (.tar.gz) of a course in the WeBWorK courses "
-"directory. Before archiving, the course database is dumped into a "
-"subdirectory of the course's DATA directory. Currently the archive facility "
-"is only available for mysql databases. It depends on the mysqldump "
-"application."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:121
+msgid "Create/Delete achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:726
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:26
 msgid "Cupcake of Enlargement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:728
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:38
 msgid "Current"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3042
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:2
 msgid "Currently defined locations are listed below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4352
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2365
 msgid "Database tables are ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:54
 msgid "Database tables need updating."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2753
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:52
 msgid "Database tables ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2968
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1499
 msgid "Database:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:783
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:153
 msgid "Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:727
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:355
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:96
+msgid "Dates"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:40
+msgid ""
+"Dates for problem sets can be edited by clicking the pencil icon in the "
+"\"Edit Set Data\" column next to the set name. To change dates for several "
+"sets at once, click the check box in the \"Select\" column and choose \"Edit"
+" selected\" from the tasks above."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:426
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:37
 msgid "Default"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1675
+#: /opt/webwork/webwork2/conf/defaults.config:1577
 msgid ""
 "Default Amount of Time (in minutes) after Due Date that Answers are Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1665
+#: /opt/webwork/webwork2/conf/defaults.config:1567
 msgid ""
 "Default Amount of Time (in minutes) before Due Date that the Assignment is "
 "Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1785
+#: /opt/webwork/webwork2/conf/defaults.config:1687
 msgid "Default Length of Reduced Scoring Period in minutes"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1655
+#: /opt/webwork/webwork2/conf/defaults.config:1557
 msgid "Default Time that the Assignment is Due"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1808
+#: /opt/webwork/webwork2/conf/defaults.config:1710
 msgid ""
 "Default number of attempts before Show Me Another can be used (-1 => Never)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1755
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:162
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:108
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:91
+#: /opt/webwork/webwork2/conf/defaults.config:1994
+msgid ""
+"Default number of attempts before hints are shown in a problem (-1 => hide "
+"hints)"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:89
 msgid "Delete"
 msgstr "tr: Delete"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1556
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1651
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1689
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1728
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:49
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:36
 msgid "Delete Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3480
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:17
+msgid "Delete Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:23
+msgid "Delete Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:37
+msgid "Delete a course and all associated data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:109
+msgid "Delete a student from a course"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:52
 msgid "Delete all existing addresses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1989
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:65
+msgid "Delete backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:64
+msgid "Delete backup from %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:54
 msgid "Delete course after archiving. Caution there is no undo!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1980
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:49
 msgid "Delete course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2348
 msgid "Delete field when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2809
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:588
 msgid "Delete it?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3055
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:78
 msgid "Delete location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:28
+msgid "Delete oldest backup"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2321
 msgid "Delete table when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:729
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:90
+msgid "Delete the sets checked below. Be careful, this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:6
 msgid "Delete which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1045
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:6
 msgid "Delete which sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1041
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:6
 msgid "Delete which users?"
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:394
 msgid "Deleted %1 users."
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:358
 msgid "Deleted %quant(%1,achievement)"
 msgstr ""
 
 #. (join(', ', @delLocations)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3359
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1810
 msgid "Deleted Location(s): %1"
 msgstr ""
 
 #. (join(', ', @toDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3597
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1966
 msgid "Deleted addresses %1 from location."
 msgstr ""
 
-#. ($self->shortPath($self->{tempFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1158
-msgid "Deleting temp file at %1"
+#. ($formatBackupTime)
+#. ($c->formatDateTime($delTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1243
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:569
+msgid "Deleted backup from %1."
+msgstr ""
+
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:679
+msgid "Deleted temp file at %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3152
+#. ($c->shortPath($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1219
+msgid "Deleted temporary file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:125
+msgid "Deleting Problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:68
 msgid ""
 "Deletion deletes all location data and related addresses, and is not "
 "undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:723
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:3
 msgid "Deletion destroys all achievement-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:185
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
 msgid "Deny From"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1467
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:104
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:27
 msgid "Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:256
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:71
+msgid "Description:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:69
 msgid "Deselect All Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:229
 msgid "Deselect All Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:428
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:366
 msgid "Didn't recognize action"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:27
 msgid "Directory"
 msgstr ""
 
 #. ($file, $!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:793
-msgid "Directory '%1' not removed: %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:327
+msgid "Directory \"%1\" not removed: %2"
 msgstr ""
 
 #. ($file, $removed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:792
-msgid "Directory '%1' removed (items deleted: %2)"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:325
+msgid "Directory \"%1\" removed (items deleted: %2)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:412
-msgid "Directory permission errors "
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:33
+msgid "Directory permission errors"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2861
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2994
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1439
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1575
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:44
 msgid ""
 "Directory structure is missing directories or the webserver lacks sufficient"
 " privileges."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1267
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2210
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2857
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1434
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1570
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:41
 msgid "Directory structure is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2285
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:102
 msgid "Directory structure needs to be repaired manually before archiving."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1338
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:84
 msgid "Directory structure needs to be repaired manually before renaming."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2750
-msgid "Directory structure or permissions need to be repaired. "
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:48
+msgid "Directory structure or permissions need to be repaired."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2853
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1414
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1540
 msgid "Directory structure:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2536
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:365
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:92
+msgid "Display Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:90
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:372
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:104
 msgid "Display Mode:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:463
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:37
 msgid "Display Past Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
-msgid "Display of scores for this set is not allowed."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:44
+msgid "Display mode for equations"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:311
+msgid "Display of scores for this test is not allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:589
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:12
 msgid "Display options: Show"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2017
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:48
+msgid ""
+"Display sets matching a selected criteria. Useful if there are many sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1918
 msgid "Display the evaluated student answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:176
+#. ('<code>COURSENAME_totals.csv</code>',
+#. '<code>COURSENAME_totals_bak1.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:74
+msgid ""
+"Do NOT use the file name %1, since you might accidentally overwrite that if "
+"you again export your WeBWorK homework scores. (Actually the earlier file is"
+" moved to %2 -- so you can recover using the File Manager.)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:57
 msgid "Do not unassign students unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:233
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:67
 msgid "Do not uncheck a set unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:20
 msgid "Do not uncheck students, unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2450
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:656
 msgid "Do you want to grade this test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2272
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:93
+msgid "Documentation from source code for PG modules and macro files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:95
 msgid "Don't Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2607
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:13
 msgid "Don't Unarchive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2912
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:46
 msgid "Don't Upgrade"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1749
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep:15
 msgid "Don't delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1120
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:24
 msgid "Don't make changes"
 msgstr ""
 
 #. ($saveMode)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:317
 msgid "Don't recognize saveMode: |%1|. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1307
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1321
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1335
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:87
 msgid "Don't rename"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:547
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:33
 msgid "Don't use in an achievement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:683
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1345
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2465
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1595
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:766
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:57
 msgid "Done"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:159
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:365
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:8
 msgid "Download"
 msgstr ""
 
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($set->set_id)
 #. ($ver->{id} =~ s/_/ /gr)
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($set->set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:731
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:732
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:413
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:204
 msgid "Download %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:23
 msgid "Download Hardcopy"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:865
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:56
 msgid "Download PDF or TeX Hardcopy for Current Set"
 msgstr "下载当前作业的PDF或者TeX文件"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:764
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:233
 msgid "Download PDF or TeX Hardcopy for Selected Tests"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($selected_set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:595
+#. (tag('span', dir => 'ltr', format_set_name_display($selected_set_id =~
+#. s/,v(\d+)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:58
 msgid "Download hardcopy of set %1 for %2?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:369
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:63
+msgid "Download/upload archived courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:46
 msgid "Download:"
 msgstr ""
 
@@ -2259,139 +3039,181 @@ msgstr ""
 msgid "Drop"
 msgstr "tr: Drop"
 
-#. ($self->formatDateTime($set->reduced_scoring_date, undef,
-#. $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:107
-msgid "Due %1, after which reduced scoring is available until %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:100
+msgid "Drop student from the course"
 msgstr ""
 
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:310
 msgid "Due date %1 has passed."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2093
+#: /opt/webwork/webwork2/conf/defaults.config:2014
 msgid "E-Mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:315
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:261
 msgid "E-mail Instructor"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2128
-msgid "E-mail addresses which can receive e-mail from a pg problem"
-msgstr ""
-
-#: /opt/webwork/webwork2/conf/defaults.config:2138
+#: /opt/webwork/webwork2/conf/defaults.config:2049
 msgid ""
 "E-mail feedback from students automatically sent to this permission level "
 "and higher"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2109
+#: /opt/webwork/webwork2/conf/defaults.config:2030
 msgid "E-mail verbosity level"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:357
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:43
 msgid "E-mail:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:35
 msgid "Earned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:71
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:158
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:334
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:417
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:547
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2743
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1628
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1186
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1203
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:257
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:479
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:6
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:53
 msgid "Edit"
 msgstr "编辑"
 
-#. (CGI::a({ href => $basicInfoUrl }, $r->maketext('class list data')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:199
-msgid "Edit %1 for  %2 (%3) who has been assigned %4 sets."
+#. (link_to(maketext('class list data')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:47
+msgid "Edit %1 for %2 (%3) who has been assigned %4 sets."
 msgstr ""
 
-#. (CGI::a({ href => $editUsersAssignedToSetURL }, $r->maketext('individual
-#. versions')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2223
-msgid "Edit %1 of set %2."
+#. (link_to(maketext('individual user settings')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:162
+msgid "Edit %1 for set %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:419
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:6
 msgid "Edit Assigned Users"
 msgstr "tr: Edit Assigned Users"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:158
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:40
 msgid "Edit Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1407
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1488
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:58
 msgid "Edit Evaluator"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:253
 msgid "Edit Header"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3053
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:18
 msgid "Edit Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2741
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:111
 msgid "Edit Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:5
 msgid "Edit Problems"
 msgstr "编辑题目"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:583
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:3
 msgid "Edit Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:421
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:4
 msgid "Edit Set Data"
 msgstr "tr: Edit Set Data"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:171
+msgid "Edit Tags"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:30
 msgid "Edit Target Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1487
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:18
 msgid "Edit Users"
 msgstr ""
 
-#. ($user)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:207
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:127
+msgid "Edit achievement evaluator"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:90
+msgid "Edit achievement information"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:65
+msgid ""
+"Edit achivements for the course. This link is only present if achievements "
+"are enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:42
+msgid "Edit class list data"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:39
+msgid ""
+"Edit class roster data. Add students, edit student data, drop students from "
+"class, import students from a classlist, and give user professor privileges."
+" Access to individual homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:70
 msgid "Edit data for %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1248
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:46
+msgid ""
+"Edit homework sets for entire class. Change homework set due dates, create "
+"new sets from a set definition file, create new homework sets, make sets "
+"visible/invisible, score homework sets. Assign homework sets to the class."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:219
 msgid "Edit it"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2192
-msgid "Edit set %1 data for ALL students assigned to this set."
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:135
+msgid "Edit set %1 for ALL students assigned to this set."
 msgstr ""
 
-#. (CGI::a({href=>$editSetLink},$setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2166
+#. (link_to(                                               $setID =>
+#. $c->systemLink(
+#. $setDetailPage, params => { effectiveUser => $user->user_id, editForUser =>
+#. $user->user_id })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:106
 msgid "Edit set %1 for this user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3393
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:95
+msgid "Edit set for %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:4
 msgid ""
 "Edit the current value of the location description, if desired, then add and"
 " select addresses to delete, and then click the \"Take Action\" button to "
@@ -2399,174 +3221,219 @@ msgid ""
 "changes and return to the Manage Locations page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:429
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:2
 msgid "Edit which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:829
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:2
 msgid "Edit which sets?"
 msgstr "tr: Edit which sets?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:935
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:2
 msgid "Edit which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:592
-msgid "Editing <strong>blank problem</strong> in file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:31
+msgid "Editing <strong>course information</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:595
-msgid "Editing <strong>course information</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:30
+msgid "Editing <strong>hardcopy header</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
-msgid "Editing <strong>hardcopy header</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:28
+msgid "Editing <strong>new problem</strong> template."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:596
-msgid "Editing <strong>options information</strong> file \"%1\""
+#. ($c->{prettyProblemNumber},                             tag('span', dir =>
+#. 'ltr', format_set_name_display($fullSetName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:45
+msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\"."
 msgstr ""
 
-#. ($prettyProblemNumber,                  CGI::span({ dir => 'ltr' },
-#. format_set_name_display($fullSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:605
-msgid "Editing <strong>problem %1 of set %2</strong> in file \"%3\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:29
+msgid "Editing <strong>set header</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:593
-msgid "Editing <strong>set header</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:33
+msgid "Editing <strong>unassigned problem</strong> file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:598
-msgid "Editing <strong>unassigned problem</strong> file \"%1\""
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:32
+msgid "Editing <strong>unknown file type</strong> in file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:597
-msgid "Editing <strong>unknown file type</strong> in file \"%1\""
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:19
+msgid "Editing Modes"
 msgstr ""
 
-#. ($self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:209
-msgid "Editing achievement in file '%1'"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:140
+msgid "Editing Problems"
+msgstr ""
+
+#. ($c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:16
+msgid "Editing achievement in file \"%1\""
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:22
+msgid "Editing for all students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:23
+msgid "Editing for one student or a proper subset of all students"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3390
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:1
 msgid "Editing location %1"
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display("$setID$vermsg")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2182
-msgid "Editing problem set %1 data for these individual students: %2"
+#. (tag(                                           'strong',
+#. dir => 'ltr',
+#. format_set_name_display($setID . ($editingSetVersion ?
+#. ",v$editingSetVersion" : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:123
+msgid "Editing problem set %1 for these students: %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:315
 msgid "Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:669
-msgid "Editor rows:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:563
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1668
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:229
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep:13
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:53
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:68
 msgid "Email"
 msgstr "电子邮件"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:101
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:32
 msgid "Email Address"
 msgstr "Email地址"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:817
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:170
 msgid "Email Body:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:17
+msgid "Email Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:339
 msgid "Email Instructor On Failed Attempt"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2003
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:28
 msgid "Email Link"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:789
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:112
 msgid "Email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1807
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1832
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:311
+msgid "Email body is empty. No message sent. "
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:994
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_email.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/feedback_macro_form.html.ep:24
 msgid "Email instructor"
 msgstr "发电子邮件给授课人"
 
-#. (scalar(@{ $self->{ra_send_to} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:454
+#. (scalar(@{ $c->{ra_send_to} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:27
+msgid ""
+"Email is being sent to %quant(%1,recipient). You will be notified by email "
+"when the task is completed.  This may take several minutes if the class is "
+"large."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:13
+msgid "Email:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:26
 msgid ""
-"Email is being sent to %quant(%1,recipient). You will be notified by email\n"
-"\t\t\t\twhen the task is completed.  This may take several minutes if the class is\n"
-"\t\t\t\tlarge."
+"Emails can contain personalized data, such as name, section, or status.  "
+"Click \"List of insertable macros\" for a full list available variables.  "
+"Additional personal data can be included by using a merge file.  A merge "
+"file is a CSV file located in the [Scoring] directory in which the first "
+"column is the student id, followed by additional data (such as student "
+"grades).  This data is identified by which column it is in, for instance if "
+"the scores where in the 4th column of the merge file, insert them into an "
+"email using the variable $COL[4].  The \"Scoring Tools\" page can export "
+"grades into a CSV that can be used as a merge file.  Upload customized merge"
+" files with the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:11
 msgid "Emails to be sent to the following:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1704
+#: /opt/webwork/webwork2/conf/defaults.config:1606
 msgid "Enable Achievement Rewards"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1723
+#: /opt/webwork/webwork2/conf/defaults.config:1625
 msgid "Enable Conditional Release"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1689
+#: /opt/webwork/webwork2/conf/defaults.config:1591
 msgid "Enable Course Achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1645
+#: /opt/webwork/webwork2/conf/defaults.config:1547
 msgid "Enable Progress Bar and current problem highlighting"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1734
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:585
+#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Enable Reduced Scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1799
+#: /opt/webwork/webwork2/conf/defaults.config:1701
 msgid "Enable Show Me Another button"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:156
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:24
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:92
 msgid "Enable Spell Checking"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1844
+#: /opt/webwork/webwork2/conf/defaults.config:1746
 msgid "Enable periodic re-randomization of problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:416
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:29
 msgid ""
 "Enable reduced scoring for a homework set.  This will allow you to submit "
 "answers for partial credit for 24 hours after the close date."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1461
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1483
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:20
 msgid "Enabled"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1846
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:58
+msgid "Enabled:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1748
 msgid ""
 "Enables periodic re-randomization of problems after a given number of "
 "attempts. Student would have to click Request New Version to obtain new "
 "version of the problem and to continue working on the problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1725
+#: /opt/webwork/webwork2/conf/defaults.config:1627
 msgid ""
 "Enables the use of the conditional release system.  To use conditional "
 "release you need to specify a list of set names on the Problem Set Detail "
@@ -2575,14 +3442,14 @@ msgid ""
 " sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1801
+#: /opt/webwork/webwork2/conf/defaults.config:1703
 msgid ""
 "Enables use of the Show Me Another button, which offers the student a newly-"
 "seeded version of the current problem, complete with solution (if it exists "
 "for that problem)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:662
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:163
 msgid "End"
 msgstr ""
 
@@ -2590,538 +3457,662 @@ msgstr ""
 msgid "Enrolled"
 msgstr "tr: Enrolled"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:788
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:111
 msgid "Enrolled, Drop, etc."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:830
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:859
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:888
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:917
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:128
 msgid "Enrollment Status"
 msgstr "注册状态"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:21
 msgid "Enter filename below"
 msgstr "输入文件名"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:20
 msgid "Enter filenames below"
 msgstr "输入文件名"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:19
 msgid ""
 "Enter information below for students you wish to add. Each student's "
 "password will initially be set to their student ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1997
+#: /opt/webwork/webwork2/conf/defaults.config:1899
 msgid ""
 "Enter one of the allowed display mode types above.  See 'display modes "
 "entry' for descriptions."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:297
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:34
+msgid ""
+"Enter the details of the course instructor to be added when the course is "
+"created.  This user will also be added to the admin course with the username"
+" \"userID_courseID\" so you can manage and email the instructors of the "
+"courses on the server."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:284
 msgid "Entered"
 msgstr "Yan谋t"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:85
-msgid "Entered student:"
-msgstr ""
-
-#. ($display_sort_method_name{$primary_sort_method_name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:698
+#. ($display_sort_method_name{$primary_sort_method})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:98
 msgid "Entries are sorted by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:191
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:247
 msgid "Equation Display"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:61
+msgid "Equation Editor"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1516
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1460
 msgid "Error adding set-level proctor: %1"
 msgstr ""
 
+#. ($fromPath, $toPath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:664
+msgid "Error copying %1 to %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:14
+msgid "Error details"
+msgstr ""
+
+#. ($filePath, stash('podError')
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:27
+msgid "Error generating POD for file %1: %2"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1492
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1437
 msgid ""
 "Error getting old set-proctor password from the database: %1.  No update to "
 "the password was done."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:31
 msgid "Error message:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2235
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:12
 msgid "Error messages"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1616
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:754
 msgid "Error: Answer date must come after close date in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:747
 msgid "Error: Close date must come after open date in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1634
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:778
 msgid ""
 "Error: Reduced scoring date must come between the open date and close date "
 "in set %1"
 msgstr ""
 
-#. ($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2067
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:7
 msgid "Error: The original file %1 cannot be read."
 msgstr ""
 
 #. ($setID)
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1240
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:738
 msgid "Error: answer date cannot be more than 10 years from now in set %1"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1235
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:733
 msgid "Error: close date cannot be more than 10 years from now in set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:630
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:234
 msgid "Error: no file data was submitted!"
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1599
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1230
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:728
 msgid "Error: open date cannot be more than 10 years from now in set %1"
 msgstr ""
 
-#. ($problem_desc, $problem_name, CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1404
+#. ($problem_desc, $problem_name, $c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1210
 msgid ""
 "Errors encountered while processing %1. This %2 has been omitted from the "
 "hardcopy. Error text: %3"
 msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3832
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:8
+msgid "Errors occured while generating hardcopy:"
+msgstr ""
+
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2128
 msgid ""
 "Errors occured while hiding the courses listed below when attempting to "
 "create the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
-#. ("$coursesDir/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3920
+#. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2197
 msgid ""
 "Errors occured while unhiding the courses listed below when attempting "
 "delete the file hide_directory in the course's directory. Check the "
-"ownership and permissions of the course's directory, e.g %1"
+"ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1468
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:28
 msgid "Evaluator File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3839
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:76
+msgid "Evaluator File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:28
+msgid "Evaluator Variables"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2143
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
-"hidden."
+"Except for the errors listed above, all selected courses are already hidden."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3904
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2212
 msgid ""
-"Except for possible errors listed above, all selected courses are already "
+"Except for the errors listed above, all selected courses are already "
 "unhidden."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3456
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:39
 msgid ""
 "Existing addresses for the location are given in the scrolling list below.  "
 "Select addresses from the list to delete them:"
 msgstr ""
 
 #. ($filePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2281
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1460
 msgid "Existing file %1 could not be backed up and was lost."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2514
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:354
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:65
 msgid "Expand All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:364
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:78
 msgid "Expand All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2667
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:418
 msgid "Expand Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2792
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:574
 msgid "Expand Problem Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:74
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:105
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:89
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:67
+msgid ""
+"Expand problem details that have been collapsed. Note that the details of a "
+"single problem can be expanded by clicking on the down arrow to the right of"
+" the problem source file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:65
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:83
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:71
 msgid "Export"
 msgstr "tr: Export"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1098
-msgid "Export selected achievements."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:113
+msgid "Export achievement data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1267
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_export_form.html.ep:1
+msgid "Export selected achievements"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:17
 msgid "Export to what kind of file?"
 msgstr "输出哪种文件"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:2
 msgid "Export which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1245
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:5
 msgid "Export which users?"
 msgstr "tr: Export which users?"
 
 #. ($FileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1151
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:591
 msgid "Exported achievements to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1616
-msgid "Extend the close date for which Gateway?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:48
+msgid "Extend the close date for which test?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:148
+msgid "Extend the number of attempts allowed a student on a given problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1573
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:28
 msgid ""
-"Extends the close date of a gateway test by 24 hours. Note: The test must "
-"still be open for this to work."
+"Extends the close date of a test by 24 hours. Note: The test must still be "
+"open for this to work."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "FIRST NAME"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:3
+msgid "Failed to add user:"
+msgstr ""
+
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:416
 msgid "Failed to create new achievement: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:373
 msgid "Failed to create new achievement: no achievement ID specified!"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:573
 msgid "Failed to create new set: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1158
-msgid "Failed to create new set: no set name specified!"
-msgstr "tr: Failed to create new set: no set name specified!"
+#. ($newSetID =~ s/_/ /gr)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:482
+msgid ""
+"Failed to create new set: Invalid characters in set name \"%1\". A set name "
+"may only contain letters, numbers, hyphens, periods, and spaces."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:474
+msgid "Failed to create new set: No set name specified."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1155
-msgid "Failed to create new set: set name cannot exceed 100 characters."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:469
+msgid "Failed to create new set: Set name cannot exceed 100 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:396
 msgid ""
 "Failed to duplicate achievement: no achievement selected for duplication!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:530
 msgid "Failed to duplicate set: no set selected for duplication!"
 msgstr "tr: Failed to duplicate set: no set selected for duplication!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:74
-msgid "Failed to enter student:"
+#. ($@)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:67
+msgid "Failed to generate course archive: %1"
 msgstr ""
 
 #. ($scoreFilePath)
 #. ($filePath)
 #. ($FilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1125
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:649
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:955
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2402
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1584
 msgid "Failed to open %1"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:227
 msgid "Failed to save: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:214
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#. ($_)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:253
+msgid "Failed to send message: %1"
+msgstr ""
+
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:285
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:23
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:36
 msgid "False"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1919
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:63
 msgid "Feature exhausted for this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:200
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:23
+msgid "Features:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:252
 msgid "Feedback"
 msgstr "反馈信息"
 
-#: /opt/webwork/webwork2/conf/defaults.config:2159
+#: /opt/webwork/webwork2/conf/defaults.config:2070
 msgid "Feedback by Section."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:234
 msgid "FeedbackMessage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1177
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2113
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2284
 msgid "Field is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1173
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2109
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2286
 msgid "Field missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1175
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2111
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4290
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2288
 msgid "Field missing in schema"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:599
-msgid "File '%1' exists.  File not saved.  No changes have been made."
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:266
+msgid "File \"%1\" exists.  File not saved.  No changes have been made."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1926
-msgid ""
-"File '%1' exists. File not saved. No changes have been made.  You can change"
-" the file path for this problem manually from the 'Hmwk Sets Editor' page"
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1036
+msgid "File \"%1\" exists. File not saved. No changes have been made."
 msgstr ""
 
-#. ($file,$!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:796
-msgid "File '%1' not removed: %2"
+#. ($file, $!)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:333
+msgid "File \"%1\" not removed: %2"
 msgstr ""
 
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:795
-msgid "File '%1' successfully removed"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+msgid "File \"%1\" successfully removed"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1066
-msgid "File '%1' uploaded successfully"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:522
+msgid "File \"%1\" uploaded successfully"
 msgstr ""
 
 #. ($name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:476
 msgid "File <b>%1</b> already exists. Overwrite it, or rename it as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:364
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:55
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:70
 msgid "File Manager"
 msgstr "文件管理"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:628
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:17
+msgid "File Manager Help"
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:541
+msgid "File not saved. Failed to open \"%1\" for writing."
+msgstr ""
+
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:528
+msgid ""
+"File not saved. The file \"%1\" is not contained in the templates directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:921
+msgid ""
+"File not saved. The file name for this problem does not match the file name "
+"the editor was opened with. The problem set may have changed. Please reopen "
+"this file from the homework sets editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:228
 msgid "File saved"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:733
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:272
 msgid "File successfully copied"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:758
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:295
 msgid "File successfully renamed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:29
 msgid "Filename"
 msgstr "文件名"
 
-#. ($extension,$location)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1296
-msgid "Files with extension '.%1' usually belong in '%2'"
+#. ($extension, $location)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:699
+msgid "Files with extension \".%1\" usually belong in \"%2\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:100
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:84
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:20
+msgid ""
+"Fill out the form below to add, edit, or delete locations.  Locations are "
+"used to restrict access to sets based on ip address.  Locations are "
+"configured here in the administration course, then used in a normal course."
+"  When configuring a set to use a restricted ip address, the instructor can "
+"choose to either restrict access to the location or deny access from a "
+"location, which are identified by their name.  Instructors can select "
+"multiple locations to restrict access to."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:78
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:47
 msgid "Filter"
 msgstr ""
 
 #. ($recitation)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1184
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1112
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1420
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:913
 msgid "Filter by recitation %1"
 msgstr ""
 
 #. ($section)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1180
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1416
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:910
 msgid "Filter by section %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:733
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:31
 msgid "Filter by what text?"
 msgstr "tr: Filter by what text?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:151
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:17
 msgid "Filter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:749
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:137
 msgid "First"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:593
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1992
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:827
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:856
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:885
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:914
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:87
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:21
 msgid "First Name"
 msgstr "名"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:784
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:107
 msgid "First name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:178
 msgid ""
 "For security reasons, you cannot specify a message file from a directory "
 "higher than the email directory (you can't use ../blah/blah for example). "
 "Please specify a different file or move the needed file to the email "
-"directory"
+"directory."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2928
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:30
+msgid "Force editor to RTL"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:674
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:101
 msgid "Force problems to be numbered consecutively from one"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:409
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:35
+msgid "Form Elements Present on the Page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:75
 msgid "Format"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2096
+#: /opt/webwork/webwork2/conf/defaults.config:2017
 msgid "Format for the subject line in feedback e-mails"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:172
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:133
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:10
 msgid "Format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:12
 msgid "Found no directories containing problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1112
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:48
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:43
 msgid "From This Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:318
 msgid "From field must contain one valid email address."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:340
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:621
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:20
+msgid ""
+"From this page you can <strong>add new students</strong>, "
+"<strong>edit</strong> class list data (name, email address, recitation, "
+"section, permission level, and enrollment status), <strong>change "
+"passwords</strong>, and <strong>export</strong> (save) class lists for back-"
+"up or use in another course. You can also delete students from the class "
+"roster, but this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:34
 msgid "From:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:59
 msgid "GLOBAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1512
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1619
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1728
-msgid "Gateway Name"
+#: /opt/webwork/webwork2/conf/defaults.config:1427
+msgid "General"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:210
-msgid "Gateway Quiz %2"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:201
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:30
+msgid "General Information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:853
-msgid "Gateway parameters"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:116
+msgid "General Page Information"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1525
-msgid "General"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:121
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:166
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:167
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:43
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:113
+msgid "Generate Hardcopy"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2305
-msgid "General Information"
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:73
+msgid "Generate Hardcopy for Selected Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:745
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:669
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:670
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:222
-msgid "Generate Hardcopy"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:115
+msgid ""
+"Generate a hardcopy of the problem being edited. This does not change the "
+"permanent file on the disk. You can generate a hardcopy for different "
+"versions of the same problem by changing the seed. You can also change the "
+"format to \"PDF\" or \"TeX Source\". If \"PDF\" is selected, then a PDF file"
+" will be generated for download, unless there are errors. If errors occur or"
+" \"TeX Source\" is selected, then a zip file will be generated for download "
+"that contains the TeX source file and resources needed for generating the "
+"PDF file using pdflatex."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:262
-msgid "Generate Hardcopy for Selected Sets"
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:20
+msgid ""
+"Generate hardcopies of assignments in PDF or latex format. To produce a "
+"hardcopy, one selects the users on the left and the sets on the right. All "
+"users and sets are listed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:744
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:170
 msgid "Generate hardcopy for selected sets and selected users"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:184
-#: /opt/webwork/pg/macros/problemRandomize.pl:185
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:186
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:187
 msgid "Get a new version of this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:986
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:2
 msgid "Give new password to which users?"
 msgstr "tr: Give new password to which users?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1063
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:27
 msgid "Gives full credit on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1180
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:27
 msgid "Gives full credit on every problem in a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:846
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:27
 msgid "Gives half credit on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:27
 msgid "Gives half credit on every problem in a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1401
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:62
 msgid "Global Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1422
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:76
 msgid "Global Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:49
 msgid "Global Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1383
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:51
 msgid ""
 "Global data on problem usage is contributed by many institutions using "
 "WeBWorK all over the world. The Usage figure is the total number of  "
@@ -3131,198 +4122,324 @@ msgid ""
 msgstr ""
 
 #. ($problemID, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1549
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1489
 msgid "Global problem %1 for set %2 not found."
 msgstr ""
 
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:334
+#. ($c->{prettyID}, $c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:378
+msgid "Global problem %1 not found for set %2."
+msgstr ""
+
+#. ($c->stash('setID')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:142
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:372
 msgid "Global set %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2093
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:77
 msgid "Global set data will be shown instead of user specific data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:28
 msgid "Go"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:483
 msgid "Go back to Part 1"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:291
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
-#: /opt/webwork/pg/macros/compoundProblem.pl:491
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:293
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:498
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:512
 msgid "Go on to next part"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2651
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:544
 msgid "Grade"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2649
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:383
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:970
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:541
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:75
 msgid "Grade Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2446
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:651
 msgid "Grade Test"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:148
+msgid "Grade of Active Students"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:55
 msgid "Grade passback mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:837
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:38
 msgid "Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:236
 msgid "Grades"
 msgstr "成绩"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:110
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:17
+msgid "Grades Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:115
 msgid "Grades have been saved for all current users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:221
-msgid "Grading assignment:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:28
+msgid "Grading Assignment"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:152
+msgid "Grading Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1062
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:26
 msgid "Greater Rod of Revelation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1179
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:26
 msgid "Greater Tome of Enlightenment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:285
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:50
+msgid ""
+"Groups types of achievements. The \"level\" and \"secret\" categories are "
+"special (described above), and categories can be used to create achievement "
+"chains."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:74
 msgid "Guest Login"
 msgstr "游客登录"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2251
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:86
+msgid "Guest:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:33
 msgid "HTTP Headers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:682
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:35
+msgid "Hardcopy Format"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:115
 msgid "Hardcopy Format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:270
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:285
 msgid "Hardcopy Generator"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:101
 msgid "Hardcopy Header"
 msgstr "tr: Hardcopy Header"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1623
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:724
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:324
+msgid "Hardcopy Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:17
+msgid "Hardcopy Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1525
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:153
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:44
 msgid "Hardcopy Theme"
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:408
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:427
 msgid "Hardcopy will always print the original version of the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:31
 msgid "Headers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1048
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:296
 msgid "Help"
 msgstr "帮助"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:797
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:107
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:170
 msgid "Help Icon"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:542
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:30
+msgid ""
+"Here is a list of the variables the evaluator has access to. Unless "
+"indicated, changes to the variables will not be saved.  Evaluators are run "
+"in the same order they are listed on the achievement editor page and are "
+"only run if the achievement has not been earned. Keep this in mind when "
+"using persistent global data."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:507
 msgid "Here is a new version of your problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:914
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:42
 msgid "Hidden"
 msgstr "隐藏的"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:347
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:62
 msgid "Hide All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3663
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3718
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3760
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:384
-msgid "Hide Courses"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:17
+msgid "Hide Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:428
-msgid "Hide Hints"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:57
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:44
+msgid "Hide Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:477
 msgid "Hide Hints from Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1566
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:63
+msgid "Hide all rendered problems on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:252
 msgid "Hide this problem"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1523
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1524
 msgid "Hint:"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1560
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1522
 msgid "Hint: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:658
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1771
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:99
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:51
 msgid "Hints"
 msgstr "提示"
 
 # Hmwk is short for Homework
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:364
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:327
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:44
 msgid "Hmwk Sets Editor"
 msgstr "作业编辑"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:779
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:80
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:209
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:106
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:108
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:19
 msgid "Homework Sets"
 msgstr "Soru Gruplar谋"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:418
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:38
 msgid "Homework Totals"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1432
-msgid "I couldn't find the file [ACHEVDIR]/surprise_message.txt!"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:17
+msgid "Homwork Sets Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:88
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:31
+msgid "How to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1451
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:36
+msgid "I couldn't find the file [ACHIEVEMENT_DIR]/surprise_message.txt!"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:9
 msgid "Icon"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:29
 msgid "Icon File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:612
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:80
+msgid "Icon File:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:24
+msgid ""
+"If \"PDF\" is selected, then a PDF file will be generated for download, "
+"unless there are errors.  If errors occur generating a PDF file or \"TeX "
+"Source\" is selected then a zip file will be generated for download that "
+"contains the TeX source file and resources needed for generating the PDF "
+"file using pdflatex."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:37
+msgid ""
+"If \"TeX Source\" is selected, a zip file containing a TeX file and other "
+"files needed to generate a PDF hardcopy will be produced. If \"Adobe PDF\" "
+"is selected then only a PDF file will be produced."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:84
 msgid ""
 "If a password field is left blank, the student's current password will be "
 "maintained."
 msgstr "tr: If a password field is left blank, the student's current password will be maintained."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:42
+msgid ""
+"If selected, the file path of the problem source will be printed in the "
+"output."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:38
+msgid ""
+"If selected, this adds spaces between the fields to align the commas, which "
+"makes the columns easy to read when in text form but it can confuse some "
+"spreadsheet applications since the extra spaces violate the csv standard "
+"(although Excel handles them with no problem). This will give a visual form "
+"of the CSV file that is easy to read on the page. If you want a reliable "
+".csv file for use in any spreadsheet application unclick the \"Pad Fields\" "
+"option. You can download the .csv file immediately by clicking on the link "
+"with the filename chosen above, or you can download it using the \"File "
+"Manager\" from the scoring directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:148
+msgid ""
+"If the original problem can not be edited than the path name must be changed"
+" in order to be allowed to save the problem. Adding \"local/\" to the "
+"beginning of the original path is the default solution. All locally created "
+"and edited files will then appear in a subdirectory named \"local\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:513
 msgid ""
 "If this flag is set then this problem will count towards the grade of its "
 "parent problem.  In general the adjusted status on a problem is the larger "
@@ -3330,20 +4447,28 @@ msgid ""
 "problems which have this flag enabled."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
 msgid ""
 "If this is enabled then instructors with the ability to receive feedback "
 "emails will be notified whenever a student runs out of attempts on a problem"
-" and its children without receiving an adjusted status of 100%."
+" and its children  without receiving an adjusted status of 100%."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:334
 msgid ""
 "If this is enabled then students will be unable to attempt a problem until "
 "they have completed all of the previous problems, and their child problems "
 "if necessary."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:57
+msgid ""
+"If this is selected, a success index is listed in each csv file. The success"
+" index is a number assigned on the basis of the number of incorrect attempts"
+" (roughly equivalent to 1/the number of attempts) which seems to correlate "
+"with the relative difficulty the student had with the problem."
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:47
 msgid ""
 "If this is set, all users (including the instructor) must enter the WeBWorK "
@@ -3351,8 +4476,8 @@ msgid ""
 "they receive a message directing them back to the LMS."
 msgstr ""
 
-#. (CGI::b($r->maketext("Remember Me")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:201
+#. (tag('strong', maketext('Remember Me')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:33
 msgid ""
 "If you check %1 your login information will be remembered by the browser you"
 " are using, allowing you to visit WeBWorK pages without typing your user "
@@ -3361,273 +4486,419 @@ msgid ""
 " have direct control."
 msgstr ""
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:407
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:154
+msgid ""
+"If you click on the \"Grade Problem\" icon to the right of the problem "
+"number, then the problem will open in the manual problem grader. This page "
+"shows the rendered problem and lists all students assigned to the set and "
+"the last answer the students entered for the problem. You can then change "
+"the recorded scores for students on this problem and provide instructor "
+"feedback comments."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:148
+msgid ""
+"If you click on the \"Open in New Window\" icon to the right of the problem "
+"number, then the problem will open in the actual homework set in a new tab "
+"or window."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:425
 msgid "If you come back to it later, it may revert to its original version."
 msgstr ""
 
+#. ('<code>report_grades_data.csv</code>', '<code>report_grade.msg</code>',
+#. '<code>$COL</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:80
+msgid ""
+"If you upload your file on the web with the name: %1 and also create an "
+"email message with the name %2 with the approriate %3 variables then not "
+"only can you email the message with the embedded grades to the students, but"
+" files with those exact names are automatically appended to the \"Grades\" "
+"page seen by the students."
+msgstr ""
+
 #. ($file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:798
-msgid "Illegal file '%1' specified"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:337
+msgid "Illegal file \"%1\" specified"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1445
 msgid "Illegal filename contains '..'"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:73
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:102
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:63
 msgid "Import"
 msgstr "tr: Import"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1291
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:65
+msgid ""
+"Import a single set or multiple sets from a set definition file. (Use the "
+"\"File Manager\" to upload/download set definition files.) The \"Shift "
+"Dates...\" option is useful for problem sets that were used from other "
+"courses and will shift all of the dates."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:16
 msgid "Import from where?"
 msgstr "tr: Import from where?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1270
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:5
 msgid "Import how many sets?"
 msgstr "tr: Import how many sets?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:31
 msgid "Import sets with names"
 msgstr "tr: Import sets with names"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:5
 msgid "Import users from what file?"
 msgstr "tr: Import users from what file?"
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:99
+msgid "Import/export achievements"
+msgstr ""
+
 #. ($count)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:516
 msgid "Imported %quant(%1,achievement)"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:25
+msgid ""
+"In both cases, one can select the sort field, the format of the display "
+"list, and the filter. \"Change Display Settings\" must be clicked to update "
+"the list."
+msgstr ""
+
 #. ($total_inprogress, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1019
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:28
 msgid "In progress: %1/%2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:47
 msgid "Inactive"
 msgstr "tr: Inactive"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1601
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:51
+msgid "Inactive Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1503
 msgid "Inactivity time before a user is required to login again"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:42
 msgid "Include Contrib"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:35
 msgid "Include OPL"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:32
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:55
 msgid "Include Success Index"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:216
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:62
 msgid "Include percentage grades columns for all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2095
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:471
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:302
 msgid "Incorrect"
 msgstr ""
 
 #. ($total_incorrect, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1033
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:36
 msgid "Incorrect: %1/%2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:26
+msgid ""
+"Indicates the number of problems in the set. Clicking on the link opens the "
+"set detail page which allows you to modify set parameters, edit set headers,"
+" and change parameters of problems in the set such as the number of allowed "
+"attempts or the weight (credit value). You can also add, remove, view, edit,"
+" and reorder the problems in the set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:141
+msgid "Individual Problem Results"
+msgstr ""
+
 # Short for Initial
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:171
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:41
 msgid "Init"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:502
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:35
 msgid "Institution"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2344
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:560
 msgid "Instructor Comment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1494
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1306
 msgid "Instructor Feedback:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:311
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:17
+msgid "Instructor Links Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:29
 msgid "Instructor Tools"
 msgstr "授课人工具"
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1228
-msgid "Instructor solution preview: show the student solution after due date."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:17
+msgid "Instructor Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:90
+msgid "Instructor:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:377
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:326
 msgid "Invalid Reply-to address."
 msgstr ""
 
 #. ($output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:187
 msgid ""
-"Invalid file name. The file name \"%1\" does not have a \".msg\" extension "
-"All email file names must end in the extension \".msg\" choose a file name "
-"with a \".msg\" extension. The message was not saved."
+"Invalid file name \"%1\". All email file names must end with the \".msg\" "
+"extension.  Choose a file name with the \".msg\" extension. The message was "
+"not saved."
 msgstr ""
 
 #. ($headerType)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1951
 msgid "Invalid headerType %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:177
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/XMLRPC.pm:40
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:173
 msgid "Invalid user ID or password."
 msgstr "无效的用户名或者密码."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2244
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:34
+msgid ""
+"It is important that students enter an email address or they will not "
+"recieve any of the important emails sent by the instructor. The email "
+"address will only be present on the page if the user has permission to "
+"change the email address."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:20
+msgid "It lists the homework problem sets available for the students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:461
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:472
 msgid "Jump to Problem:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:867
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:939
 msgid "Just-In-Time parameters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:130
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:85
+msgid "Key Map"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:14
 msgid "Key Map:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:93
 msgid "Keywords:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "LAST NAME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1477
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:119
 msgid "LOCAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:100
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:103
 msgid "LTI"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1548
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:25
+msgid "LTI Grade Mode"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:460
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:75
+msgid "LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:17
+msgid "LTI Grade Update Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:16
+msgid "LTI grade passback is not enabled for this course"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:63
+msgid "LTI update of all users and sets queued."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:64
+msgid "LTI update of all users queued."
+msgstr ""
+
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:58
+msgid "LTI update of set %1 queued."
+msgstr ""
+
+#. ($userID, $prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:56
+msgid "LTI update of user %1 and set %2 queued."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:60
+msgid "LTI update of user %1 queued."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1450
 msgid "Language (refresh page after saving changes to reveal new language.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:758
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:140
 msgid "Last"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:460
 msgid "Last Answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:604
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:231
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2001
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:828
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:857
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:915
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:31
+msgid "Last Full Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:25
 msgid "Last Name"
 msgstr "姓"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:792
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:115
 msgid "Last column of merge file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:785
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:108
 msgid "Last name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:242
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:237
 msgid "Latest Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1603
+#: /opt/webwork/webwork2/conf/defaults.config:1505
 msgid ""
 "Length of time, in seconds, a user has to be inactive before he is required "
-"to login again.<p>This value should be entered as a number, so as 3600 "
-"instead of 60*60 for one hour"
+"to login again. This value should be entered as a number, so as 3600 instead"
+" of 60*60 for one hour."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:845
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:26
 msgid "Lesser Rod of Revelation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:965
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:26
 msgid "Lesser Tome of Enlightenment"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:141
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:15
 msgid "Level Progress:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:881
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:77
 msgid "Level:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:912
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2060
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:433
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:17
+msgid "Library Broswer Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:359
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:52
 msgid "Library Browser"
 msgstr "K眉t眉phane Taray谋c谋"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1977
-msgid "List of display modes made available to students"
+#. ($user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:30
+msgid "Link to Edit Page for %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2130
-msgid ""
-"List of e-mail addresses to which e-mail can be sent by a problem. "
-"Professors need to be added to this list if questionaires are used, or other"
-" WeBWorK problems which send e-mail as part of their answer mechanism."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:25
+msgid "Links to pages that give information about writing problems:"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1879
+msgid "List of display modes made available to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:759
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:774
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:89
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:96
 msgid "List of insertable macros"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1826
+#: /opt/webwork/webwork2/conf/defaults.config:1728
 msgid "List of options for Show Me Another button"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1713
+#: /opt/webwork/webwork2/conf/defaults.config:1615
 msgid "List of sets excluded from achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1483
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:56
+msgid "Live equation rendering"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:144
+msgid "Loading..."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:122
 msgid "Local Attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:41
 msgid "Local Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1504
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:136
 msgid "Local Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:105
 msgid "Local Usage Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1467
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:114
 msgid ""
 "Local data is generated when your systems admin runs the script update-OPL-"
 "statistics."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1460
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:107
 msgid ""
 "Local data on problem usage is generated and maintained by your institution."
 " The Usage figure is the total number of local individuals who have attemped"
@@ -3636,42 +4907,61 @@ msgid ""
 "likely bug free."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:115
 msgid "Location"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3501
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1854
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1890
 msgid ""
 "Location %1 does not exist in the WeBWorK database.  Please check your input"
 " (perhaps you need to reload the location management page?)."
 msgstr ""
 
 #. ($locationID, join(', ', @addresses)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1742
 msgid "Location %1 has been created, with addresses %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3353
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1798
 msgid "Location deletion requires confirmation."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3409
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:43
 msgid "Location description:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3089
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:37
 msgid "Location name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:159
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:27
+msgid ""
+"Locations are a list of ip addresses.  Ip addresses can be a single address "
+"(e.g. 192.168.1.101), a range of ip address (e.g. "
+"192.168.1.101-192.168.1.150), or an ip address mask (e.g. 192.168.1.0/24). "
+"Enter one ip address per line, using as many lines as needed for each "
+"location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:32
+msgid ""
+"Locations are edited by adding new ip addresses to the location, or deleting"
+" existing address.  You must select the confirm checkbox when deleting a "
+"location, and this cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:43
+msgid "Locations of files:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:18
 msgid "Log In Again"
 msgstr "再次登录"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1124
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:11
 msgid "Log Out"
 msgstr "登出"
 
@@ -3679,368 +4969,456 @@ msgstr "登出"
 #. ($rename_oldCourseID)
 #. ($rename_newCourseID)
 #. ($new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1458
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1541
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2666
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:913
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:704
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:780
 msgid "Log into %1"
 msgstr ""
 
-#. (HTML::Entities::encode_entities($prettyUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1122
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1130
+#. ($userName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:9
 msgid "Logged in as %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:790
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:181
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:187
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:113
 msgid "Login"
 msgstr "登入"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:58
 msgid "Login Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:187
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:815
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1980
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:291
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:826
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:855
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:884
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:913
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:190
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:36
 msgid "Login Name"
 msgstr "登录名"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:18
 msgid "Login Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:6
+msgid "Login:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:225
 msgid "Logout"
 msgstr "登出"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Macro"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:763
-msgid "Main Menu"
-msgstr "Ana Menü"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:97
+msgid ""
+"Macro (\".pl\") files containing additional functionality for your course "
+"can be stored here."
+msgstr ""
+
+#. ($filePath)
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer/POD.html.ep:29
+msgid "Macro file %1 not found."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:369
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:46
 msgid "Make Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1126
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:27
 msgid "Make changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1115
-msgid "Make these changes in  course:"
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:15
+msgid "Make these changes in course: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3040
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:383
-msgid "Manage Locations"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:137
+msgid ""
+"Makes a new copy of the file you are editing at the location relative to the"
+" course's templates ([TMPL]) directory. You may choose to replace the "
+"current problem in the current set, append to the end to then end of the "
+"current set as a new problem, or create a problem that is not attached to a "
+"problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:1
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:46
+msgid "Manage Locations"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminManageLocations.html.ep:17
+msgid "Manage Locations Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:20
+msgid ""
+"Manage achievements for the course.  The actions allow one to edit, assign, "
+"import, export, score, create, or delete achievements.  The action form is "
+"at the top to select the desired action and options to perform when the "
+"submit button is pressed.  Below the action form is the list of all the "
+"achievements, ordered by their achievement \"Number\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:56
+msgid "Manage administration course files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:50
+msgid ""
+"Manage instructors.  When instructors are added to a newly created course, "
+"they are also added to the admin course with username \"userID_courseID\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:748
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:344
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:192
 msgid "Manual Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:233
-msgid "Mark All"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:17
+msgid "Manual Grader Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr',
+#. format_set_name_display($c->stash->{set}->set_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:205
+msgid "Manual Grader for %1: Problem %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:243
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:77
+msgid ""
+"Manually initiate an LTI grade passback for selected sets or users. This "
+"link is only visible if LTI grade passback is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:175
+msgid ""
+"Many of these editing activities can also be done more quickly from the "
+"\"Instructor Tools\" page where students and homework sets can be selected "
+"simultaneously. The \"Instructor Tools\" page is useful for quick editing of"
+" one or two students. The initial setup of the class can be done best from "
+"this page. Importing and exporting class lists can only be done from this "
+"page. Deleting students can only be done from this page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:120
 msgid "Mark Correct"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2822
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:598
 msgid "Mark Correct?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:681
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:19
 msgid "Match on what? (separate multiple IDs with commas)"
 msgstr "tr: Match on what? (separate multiple IDs with commas)"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:499
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:85
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:36
 msgid "Math Objects"
 msgstr "tr: Math Objects"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:327
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:377
 msgid "Max attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:380
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:24
 msgid "Max. Shown:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1817
+#: /opt/webwork/webwork2/conf/defaults.config:1719
 msgid ""
 "Maximum times Show me Another can be used per problem (-1 => unlimited)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:606
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:4
+msgid "Merge file data:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:24
 msgid "Merge file:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:288
 msgid "Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:578
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:13
 msgid "Message file:"
 msgstr ""
 
-#. ($emailDirectory, $output_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:357
-msgid "Message saved to file <code>%1/%2</code>."
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:300
+msgid "Message saved to file %1."
 msgstr ""
 
-#. ($recipient, $ur->email_address)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:995
+#. ($recipient, $user_record->email_address)
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:98
 msgid "Message sent to %1 at %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2249
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2324
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:121
+msgid "Message was blank."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:48
+msgid ""
+"Messages can be saved to a message file (which must end in the \".msg\" "
+"extension).  Use the \"Message file\" drop down menu to select which message"
+" file to load, or \"None\" to use a blank message. To save a new message, "
+"use the \"Save as\" button after entering in a valid filename.  The \"Save "
+"as\" button will not overwrite currently saved messages.  To edit a "
+"currently saved message first select it using the drop down menu, then click"
+" the \"Save\" button to save any changes.  Use the \"File Manager\" to "
+"delete messages, located in the \"[TMPL]/email\" directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:22
 msgid "Method"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3284
+#: /opt/webwork/webwork2/conf/defaults.config:2003
+msgid "Method to enter problem scores in the single problem manual grader"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1668
 msgid ""
 "Missing required input data. Please check that you have filled in all of the"
 " create location fields and resubmit."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1555
+#: /opt/webwork/webwork2/conf/defaults.config:1457
 msgid ""
 "Mode in which the LANG and DIR settings for a single problem are determined."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1557
-msgid ""
-"Mode in which the LANG and DIR settings for a single problem are "
-"determined.<p>The system will set the LANGuage attribute to either a value "
-"determined from the problem, a course-wide default, or the system default, "
-"depending on the mode selected. The tag will only be added to the DIV "
-"enclosing the problem if it is different than the value which should be set "
-"in the main HTML tag set for the entire course based on the course "
-"language.<p>There are two options for the DIRection attribute: \"ltr\" for "
-"left-to-write sripts, and \"rtl\" for right-to-left scripts like Arabic and "
-"Hebrew.<p>The DIRection attribute is needed to trigger proper display of the"
-" question text when the problem text-direction is different than that used "
-"by the current language of the course. For example, English problems from "
-"the library browser would display improperly in RTL mode for a Hebrew "
-"course, unless the problen Direction is set to LTR.<p>The feature to set a "
-"problem language and direction was only added in 2018 to the PG language, so"
-" most problems will not declare their language, and the system needs to fall"
-" back to determining the language and direction in a different manner. The "
-"OPL itself is all English, so the system wide fallback is to en-US in LTR "
-"mode.<p>Since the defaults fall back to the LTR direction, most sites should"
-" be fine with the \"auto::\" mode, but may want to select the one which "
-"matches their course language. The mode \"force::ltr\" would also be an "
-"option for a course which runs into trouble with the \"auto\" "
-"modes.<p>Modes:<br><ul><li>\"none\" prevents any additional LANG and/or DIR "
-"tag being added. The browser will use the main setting which was applied to "
-"the entire HTML page. This is likely to cause trouble when a problem of the "
-"other direction is displayed.</li><li>\"auto::\" allows the system to make "
-"the settings based on the language and direction reported by the problem (a "
-"new feature, so not set in almost all existing problems) and falling back to"
-" the expected default of en-US in LTR mode. </li><li>\"auto:LangCode:Dir\" "
-"allows the system to make the settings based on the language and direction "
-"reported by the problem (a new feature, so not set in almost all existing "
-"problems) but falling back to the language with the given LangCode and the "
-"direction Dir when problem settings are not available from "
-"PG.</li><li>\"auto::Dir\" for problems without PG settings, this will use "
-"the default en=english language, but force the direction to Dir. Problems "
-"with PG settings will get those settings.</li><li>\"auto:LangCode:\" for "
-"problems without PG settings, this will use the default LTR direction, but "
-"will set the language to LangCode.Problems with PG settings will get those "
-"settings.</li><li>\"force:LangCode:Dir\" will <b>ignore</b> any setting made"
-" by the PG code of the problem, and will force the system to set the "
-"language with the given LangCode and the direction to Dir for <b>all</b> "
-"problems.</li><li>\"force::Dir\" will <b>ignore</b> any setting made by the "
-"PG code of the problem, and will force the system to set the direction to "
-"Dir for <b>all</b> problems, but will avoid setting any language attribute "
-"for individual problem.</li></ul>"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2695
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:443
 msgid "Move"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2231
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:457
 msgid "Move to Page:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2226
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:452
 msgid "Move to Problem:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:52
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAddUsers.html.ep:26
+msgid ""
+"Multiple sets may be assigned to the users by holding down the shift key or "
+"the ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:27
+msgid ""
+"Multiple users or sets may be selected by holding down the shift key or the "
+"ctrl key while selecting from the list."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:36
 msgid "My Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1412
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:26
 msgid "Mysterious Package (with Ribbons)"
 msgstr ""
 
 # Short for Number of Fields
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:213
 msgid "NO OF FIELDS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1447
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1455
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1484
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:741
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:804
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:113
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:231
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:135
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:29
 msgid "Name"
 msgstr "Grup Ad谋"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:174
 msgid "Name for new set here"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1528
+#: /opt/webwork/webwork2/conf/defaults.config:1430
 msgid "Name of course information file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1107
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:77
+msgid "Name of the evaluator file used to evaluate the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:81
+msgid "Name of the image used for the achievement icon."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:4
 msgid "Name the new set"
 msgstr "tr: Name the new set"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1691
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:45
+msgid "Name:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:29
 msgid "Necromancers Charm"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:343
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:205
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:393
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:35
 msgid "Never"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:371
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:54
 msgid "New File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:372
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:55
 msgid "New Folder"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2508
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:30
 msgid "New Name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2067
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:3
 msgid "New Password"
 msgstr "新密码"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:131
-msgid "New Version"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+msgid "New Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:952
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:411
 msgid "New file name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:428
 msgid "New folder name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:577
 msgid "New passwords saved"
 msgstr "新密码已保存"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1078
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:36
 msgid "New set name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1357
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1010
 msgid "Next Problem"
 msgstr "下一题"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1181
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2164
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:40
+msgid "Next Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:98
 msgid "Next page"
 msgstr ""
 
-#. ($self->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:620
+#. (% $c->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:142
 msgid "Next test will be available by %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2452
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:134
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:144
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:183
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:270
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:483
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:510
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:142
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:68
 msgid "No"
 msgstr "tr: No"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:635
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:116
 msgid "No Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2324
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:216
 msgid "No Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:117
+msgid "No Sender specified."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:23
 msgid "No Target Set Selected"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:335
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_badges.html.ep:38
 msgid "No achievement badges have been assigned yet."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1521
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:77
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:37
 msgid "No achievements shown.  Create an achievement!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:90
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:2
+msgid "No achievements shown.  Select an achievement to edit!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:61
 msgid "No action taken"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:141
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:140
 msgid ""
 "No authentication method found for your request.  If this recurs, please "
 "speak with your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:940
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:361
 msgid "No change made to any set"
 msgstr "tr: No change made to any set"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:615
 msgid ""
 "No changes specified.  You must mark the checkbox of the item(s) to be "
 "changed and enter the change data."
@@ -4050,1379 +5428,1811 @@ msgstr ""
 msgid "No changes were saved!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2462
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:50
 msgid "No course archives found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2898
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:32
 msgid "No course id defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1561
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:932
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:67
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:76
 msgid "No courses found"
 msgstr ""
 
 #. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:593
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:675
 msgid "No data exists for set %1 and problem %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:215
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:10
+msgid "No e-mail recipients are listed for this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:169
 msgid "No filename was specified for saving!  The message was not saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:340
 msgid "No guest logins are available. Please try again in a few minutes."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3522
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1877
 msgid "No location specified to edit. Please check your input data."
 msgstr ""
 
 #. ($badID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1788
 msgid "No location with name %1 exists in the database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3206
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:149
 msgid "No locations are currently defined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:342
 msgid "No merge data file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:612
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:18
+msgid "No merge data found"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:164
+msgid "No merge data found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:8
+msgid "No merge file selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:135
 msgid "No more tests available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:270
 msgid ""
 "No new Achievement ID specified.  No new achievement created.  File not "
 "saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:63
 msgid "No problems matched the given parameters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:25
+msgid "No recipients selected."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:334
 msgid ""
 "No recipients selected. Please select one or more recipients from the list "
 "below."
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2044
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:49
 msgid "No record for global set %1."
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2046
-msgid "No record for user %1."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1452
 msgid "No record found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1166
-msgid "No set created."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:12
 msgid "No sets in this course yet"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1010
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:273
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:159
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:418
 msgid "No sets selected for scoring"
 msgstr "tr: No sets selected for scoring"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2764
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:46
 msgid ""
 "No sets shown.  Choose one of the options above to list the sets in the "
 "course."
 msgstr "tr: No sets shown.  Choose one of the options above to list the sets in the course."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1987
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1942
 msgid "No source filePath specified"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1327
 msgid "No source_file for problem in .def file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2099
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:87
 msgid ""
-"No students shown.  Choose one of the options above to list the students in "
+"No students shown. Choose one of the options above to list the students in "
 "the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:409
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:246
 msgid "No submissions. Over time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:278
 msgid "No tests taken."
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:594
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:676
 msgid "No user specific data exists for user %1"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2031
 msgid "No valid changes submitted for location %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:275
-msgid "No versions of this assignment have been taken."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:771
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:263
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:241
 msgid "No versions of this test have been taken."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2235
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:562
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:252
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:17
 msgid "None"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:681
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2463
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:474
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:763
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:52
 msgid "None Specified"
 msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2089
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:73
 msgid "None of the selected users are assigned to this set: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:33
 msgid "Not logged in."
 msgstr "Giri艧 yapmad谋n谋z."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1569
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:4
 msgid "Note"
 msgstr "tr: Note"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:381
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:55
+msgid ""
+"Note that if there are errors, they will be shown at the top of the page. In"
+" some cases, a hard copy is still generated and a link called \"Download "
+"Hardcopy\" appears. In addition, the latex file, log and error files are "
+"generated which can be used in troubleshooting."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:93
+msgid ""
+"Note that if you set the permission level of a user to something other than "
+"\"Student\", you may also want to set the status of the user to "
+"\"Observer\".  Users with the \"Observer\" status are not included in "
+"statistics, scoring, or instructor emails."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:28
+msgid ""
+"Note that some settings require an additional page load after \"Save "
+"Changes\" is clicked in order to take effect.  This is true for a theme "
+"change for example."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:396
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:422
 msgid "Note:"
 msgstr ""
 
-#. (CGI::i($pg->{result}{msg})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2350
+#. (tag('i', maketext('You are in the Reduced Scoring Period.  All work counts
+#. for [_1]% of the original.',
+#. $ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#. (tag('i', $pg->{result}{msg})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:572
 msgid "Note: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2482
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:686
 msgid ""
 "Note: grading the test grades all problems, not just those on this page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1460
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1485
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:768
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:59
+msgid "Now"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:19
 msgid "Number"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:242
 msgid "Number of Graded Submissions per Test (0=infty)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
 msgid "Number of Problems per Page (0=all)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:95
+msgid "Number of Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:257
 msgid "Number of Tests per Time Interval (0=infty)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1833
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2435
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:54
+msgid "Number:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1181
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:912
 msgid "OK"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1464
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:17
+msgid "OPL Problem Levels Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:26
 msgid "Oil of Cleansing"
 msgstr ""
 
+#. ('<code>pdflatex</code>', '<code>hardcopy.tex</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:49
+msgid ""
+"Once \"Generate Hardcopy for selected sets and selected users\" is clicked a"
+" file in the selected hardcopy format will be generated and offered for "
+"download. If PDF output was selected, a single PDF file is generated. If TeX"
+" output is selected, a zip file is generated that contains all files needed "
+"to generated the hardcopy PDF file via %1. The main TeX file is called %2."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:84
 msgid "One Column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:314
+msgid "Only Start"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:289
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:303
 msgid "Only after set answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1892
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:87
+msgid ""
+"Only present for JITAR sets. Collapse JITAR nesting problem groups to the "
+"top row of information about a problem. Note that the nesting of a single "
+"problem group can be collapsed by clicking on the down arrow to the right of"
+" the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:80
+msgid ""
+"Only present for JITAR sets. Expand JITAR nested problem groups that have "
+"been collapsed. Note that the nesting of a single problem group can be "
+"expanded by clicking on the right arrow to the right of the problem number."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1794
 msgid ""
 "Only this permission level and higher get buttons for sending e-mail to the "
 "instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:586
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:39
 msgid "Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:422
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:763
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:810
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:315
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:62
 msgid "Open Date"
 msgstr "tr: Open Date"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1098
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:42
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:32
 msgid "Open Problem Library"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2417
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:272
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:525
 msgid "Open in New Window"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1263
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1617
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:29
 msgid "Open in new window"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:491
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:320
 msgid "Open, closes %1."
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:489
-msgid "Open, complete by %1."
-msgstr ""
-
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:486
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:300
 msgid "Open, due %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:433
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:270
 msgid "Open."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:431
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:268
 msgid "Open. Submitted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:31
 msgid "Open:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:115
 msgid "Opens"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:27
 msgid "Opens any homework set for 24 hours."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1686
+#: /opt/webwork/webwork2/conf/defaults.config:1588
 msgid "Optional Modules"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:265
 msgid "Order Problems Randomly"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:50
+msgid "Other Options"
+msgstr ""
+
 # Context is "7 Out Of 10"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:405
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:777
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:150
 msgid "Out Of"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1024
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:85
+msgid "Overall Results"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:93
+msgid "Overall Set Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:122
+msgid "Overall Success Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:470
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:481
 msgid "Overwrite"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:437
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:100
 msgid "Overwrite existing files silently"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1754
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:41
+msgid "PDF"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:69
 msgid "PG Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:827
+#: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer.html.ep:1
+msgid "PG POD"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:17
+msgid "PG Problem Editor Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:708
 msgid "PG debug messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:829
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:716
 msgid "PG internal errors"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:818
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:109
+msgid ""
+"PG markdown syntax used to format WeBWorK questions. This interactive lab "
+"can help you to learn the techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:692
 msgid "PG question failed to render"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:826
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:706
 msgid "PG question processing error messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:828
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:712
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:128
 msgid "PG warning messages"
 msgstr ""
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:511
-msgid "PGLab"
-msgstr ""
-
-# Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:517
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:98
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:47
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:58
 msgid "PGML"
 msgstr ""
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:91
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:40
 msgid "POD"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2309
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2249
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:200
+msgid "POD Index"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:208
+msgid "POD Viewer"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1515
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:526
 msgid "PREVIEW ONLY -- ANSWERS NOT RECORDED"
 msgstr "G脰STER陌M -- YANITLAR KAYDED陌LMED陌 "
 
 # Problem Number
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:215
 msgid "PROB NUMBER"
 msgstr ""
 
 # Problem Value
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:218
 msgid "PROB VALUE"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:205
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:45
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:36
 msgid "Pad Fields"
 msgstr "Remplir les champs"
 
-#. (timestamp($self)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1255
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:28
+msgid "Page Contents"
+msgstr ""
+
+#. ($c->timestamp)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:1
 msgid "Page generated at %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:568
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:87
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:81
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:71
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:56
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:25
 msgid "Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:976
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:13
 msgid "Password (Leave blank for regular proctoring)"
 msgstr ""
 
-#. ($studentUser, CGI::span({ dir => 'ltr' },
-#. format_set_name_display($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:498
+#. ($studentUser, tag('span', dir => 'ltr', format_set_name_display($setName)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:13
 msgid "Past Answers for %1, set %2, problem %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:8
 msgid "Percent"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:562
-msgid "Percentage of Active Students with Correct Answers"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:94
+msgid "Percent Ranges"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+msgid "Percent Score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:788
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:535
+msgid "Percent of Students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:206
 msgid ""
 "Percentile cutoffs for number of attempts. The 50% column shows the median "
 "number of attempts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2056
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:834
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:863
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:921
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:58
+msgid ""
+"Percentile cutoffs for student's score and success index. The 50% column "
+"shows the median number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:50
 msgid "Permission Level"
 msgstr "tr: Permission Level"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1869
+#: /opt/webwork/webwork2/conf/defaults.config:1771
 msgid "Permissions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1052
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:24
 msgid "Pick a target set above to add this problem to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1355
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:54
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:21
 msgid "Pick date and time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3804
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
 msgid ""
 "Place a file named \"hide_directory\" in a course or other directory and it "
 "will not show up in the courses list on the WeBWorK home page. It will still"
 " appear in the Course Administration listing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1107
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should be given full credit."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:40
+msgid ""
+"Please choose the set for which all problems should have half credit added."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given full credit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:889
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "be given half credit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:654
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its incorrect attempt count reset."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:61
 msgid ""
 "Please choose the set name and problem number of the question which should "
 "have its weight doubled."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1315
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:60
 msgid ""
 "Please choose the set, the problem you would like to copy, and the problem "
 "you would like to copy it to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:399
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:19
 msgid "Please correct the following errors and try again:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:698
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:28
 msgid "Please enter in a value to match in the filter field."
 msgstr ""
 
-#. (CGI::b($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:197
+#. (tag('b', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:28
 msgid "Please enter your username and password for %1 below:"
 msgstr "请在下面[_1]处输入你的用户名和密码 :"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1778
 msgid "Please provide a location name to delete."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:232
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:242
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:233
 msgid "Please select action to be performed."
 msgstr "tr: Please select action to be performed."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:183
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
 msgid "Please select at least one set and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
 msgid "Please select at least one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:165
 msgid "Please select at least one user and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:35
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:31
 msgid "Please select at least one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:28
 msgid "Please select at most one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:30
 msgid "Please select exactly one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:29
 msgid "Please select exactly one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:574
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1016
 msgid "Please specify a file to save to."
 msgstr "tr: Please specify a file to save to."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:37
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:33
 msgid "Please specify a homework set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:38
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:34
 msgid ""
 "Please use only letters, digits, dashes, underscores, and periods in your "
 "set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1462
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1184
+msgid ""
+"Please use radio buttons to choose the method for saving this file. Uknown "
+"saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:165
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:169
+msgid "Point Value"
+msgstr ""
+
+#. ($grader->{problem_value})
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:92
+msgid "Point Value (0 - %1):"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:21
 msgid "Points"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:609
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:62
+msgid "Points:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:26
 msgid "Potion of Forgetfulness"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1423
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:2
 msgid "Prepare which sets for export?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2054
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2073
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:268
 msgid "Press \"Grade Test\" now!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2049
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:244
 msgid "Press \"Grade Test\" soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:213
-msgid "Preview Comment"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:742
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:69
 msgid "Preview Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:314
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1840
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:11
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:99
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:35
 msgid "Preview My Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2440
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:646
 msgid "Preview Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1340
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:41
+msgid ""
+"Preview the message before sending using the \"Preview Message\" button.  "
+"The preview shows the email that would be sent to the first selected student"
+" or the instructor if no students were selected.  The preview will also list"
+" all of the students that would receive their own personalized message.  If "
+"a merge file was selected, the preview will also indicate which (if any) "
+"recipient's merge file data could not be found."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:991
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:993
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:995
 msgid "Previous Problem"
 msgstr "上一题"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2157
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:94
 msgid "Previous page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2149
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:45
+msgid "Primary Actions"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:355
 msgid "Print Test"
 msgstr ""
 
 # Short for Problem
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2088
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:287
 msgid "Prob"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:670
-msgid "Problem #"
-msgstr ""
-
-#. ($prettyProblemID)
-#. ($problemNumber)
 #. (join('.', @seq)
 #. ($problemID)
-#. ($prettyProblemIDs{$probID})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:831
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:834
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:897
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:438
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:800
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:956
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:964
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:973
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:933
+#. ($problemNumber)
+#. ($_->{prettyID})
+#. ($c->{prettyID})
+#. ($probID)
+#. ($c->{setRecord}->assignment_type eq 'jitar' ? join('.',
+#. jitar_id_to_seq($_)
+#. ($set->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)
+#. ($prettyProblemID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:336
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:831
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:842
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:853
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:57
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/siblings.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:40
 msgid "Problem %1"
 msgstr ""
 
-#. ($problemNumber)
-#. ($prettyID)
-#. ($versioned ? $versioned : $MergedProblem->problem_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1419
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1421
+#. ($i + 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:535
 msgid "Problem %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1974
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:75
+msgid "Problem (\".pg\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:38
+msgid "Problem Display Settings"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1876
 msgid "Problem Display/Answer Checking"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:451
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:50
 msgid "Problem Editor"
 msgstr "题目编辑"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1697
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:29
 msgid "Problem Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1002
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:999
 msgid "Problem List"
 msgstr "题目列表"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1119
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:666
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:783
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:901
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:567
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:75
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:149
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:159
 msgid "Problem Number"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:156
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:160
+msgid "Problem Paths"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:140
 msgid "Problem Score (%):"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:493
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:30
 msgid "Problem Techniques"
 msgstr "tr: Problem Techniques"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:705
-msgid "Problem Viewer"
-msgstr "tr: Problem Viewer"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:239
+msgid ""
+"Problem has a different source file than the currently rendered problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:233
+msgid "Problem has an essay answer that needs to be graded."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1943
 msgid "Problem source is drawn from a grouping set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:406
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2494
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:445
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:827
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:835
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:896
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:801
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:89
+msgid ""
+"Problem source is drawn from a grouping set and can not be directly rendered"
+" or edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:336
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:9
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:32
 msgid "Problems"
 msgstr "题目"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:25
 msgid "Problems Added"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:59
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:54
 msgid "Problems for all students have been unassigned."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:62
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:57
 msgid "Problems for selected students have been reassigned."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:51
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:46
 msgid "Problems have been assigned to all current users."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:25
+msgid ""
+"Problems with this rating should only require direct memory of a fact. "
+"Examples might be a specific value of a function, or the statement of a "
+"definition. Very few WeBWorK problems fall into this category."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:93
 msgid "Proctor"
 msgstr "tr: Proctor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:282
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:92
 msgid "Proctor Password"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:258
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:71
 msgid "Proctor Username"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:193
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:3
+msgid "Proctor authorization requested for a nonexistent set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:8
 msgid "Proctor authorization required."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:231
-msgid "Proctored Gateway Quiz %2"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:88
+msgid "Proctor:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:265
+msgid "Proctored Test %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:241
-msgid "Proctored Gateway Quiz %2 Proctor Login"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:272
+msgid "Proctored Test %2 Proctor Login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:981
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:318
+msgid ""
+"Proctored tests always require authorization to start the test. \"Both Start"
+" and Grade\" will require login proctor authorization to start and grade "
+"proctor authorization to grade. \"Only Start\" requires grade proctor "
+"authorization to start and no authorization to grade."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:18
 msgid ""
-"Proctored tests require proctor authorization to start and to grade.  "
 "Provide a password to have a single password for all students to start a "
 "proctored test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:56
 msgid "Publish"
 msgstr "tr: Publish"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:31
+msgid ""
+"Quick access to many instructor tools, including <strong>Reset "
+"passwords</strong>, <strong>Act as student</strong>, <strong>Assign "
+"individual sets</strong> and <strong>Edit individual due dates</strong>."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "RECITATION"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1333
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:199
 msgid "Randomize"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:13
 msgid "Randomize Seed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:288
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:221
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:101
 msgid "Read only"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:67
 msgid "Really delete the items listed above?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:237
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:201
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:212
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:804
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2038
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:298
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:832
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:861
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:890
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:919
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:184
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:42
 msgid "Recitation"
 msgstr "tr: Recitation"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:194
+#. ($recitation)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:125
+msgid "Recitation %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:21
+msgid "Recitation:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:38
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:46
 msgid "Record Scores for Single Sets"
 msgstr "Ajouter les résultats de chaque devoir"
 
-#. ($studentName)
-#. ($self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:183
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:190
+#. ($studentID)
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:8
 msgid "Record for user %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:427
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8
 msgid "Reduced Scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:67
 msgid "Reduced Scoring Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2523
-msgid "Reduced Scoring Disabled"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
+msgid "Reduced Scoring Enabled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2522
-msgid "Reduced Scoring Enabled"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:33
+msgid "Reduced Scoring Period"
 msgstr ""
 
-#. ($self->formatDateTime($set->due_date()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:496
+#. ($c->formatDateTime($set->due_date()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:314
 msgid "Reduced credit can still be earned until %1."
 msgstr ""
 
 # Short for "Reduced Scoring:"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:32
 msgid "Reduced:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:153
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:373
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:56
 msgid "Refresh"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1646
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1943
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2000
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3713
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3755
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:56
 msgid "Refresh Listing"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:190
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:200
 msgid "Relax IP restrictions when?"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:88
+msgid "Reload the page to see backup files that have been made."
+msgstr ""
+
 # Context is "Attempts Remaining"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:14
 msgid "Remaining"
 msgstr "Kalan hak"
 
 #. ('00:00:00')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:254
 msgid "Remaining time: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:61
 msgid "Remember Me"
 msgstr "tr: Remember Me"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:546
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:514
 msgid "Remember to return to your original problem when you're finished here!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1020
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1026
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:466
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:72
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:41
 msgid "Rename"
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1302
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:62
 msgid "Rename %1 to %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:378
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:927
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:73
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:34
 msgid "Rename Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:764
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:17
+msgid "Rename Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:22
+msgid "Rename Courses"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:303
 msgid "Rename file as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2727
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:463
 msgid "Render"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2505
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:344
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:59
 msgid "Render All"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2720
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:461
 msgid "Render Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2501
-msgid "Renumber Problems"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:60
+msgid ""
+"Render all problems on the page. This does not reload the page or save or "
+"reset changes."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:106
 msgid ""
-"Reopens any gateway test for an additional 24 hours. This allows you to take"
-" a test even if the close date has past. This item does not allow you to "
-"take additional versions of the test."
+"Render or re-render the problem, course info file, or set header being "
+"edited. This does not change the permanent file on the disk. You can view "
+"different versions of the same problem by changing the seed. You can also "
+"change the manner in which the mathematics is typeset. If \"Open in new "
+"window\" is checked, then the problem will open in a new tab or window "
+"showing the problem as it will be rendered for students in the set."
 msgstr ""
 
-#. (CGI::strong(                                                   CGI::span({
-#. dir => 'ltr' }, format_set_name_display($fullSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1829
-msgid "Replace current problem: %1"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:132
+msgid "Rendering Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1155
-msgid "Replace which users?"
-msgstr "tr: Replace which users?"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:637
-msgid "Reply-To:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:341
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:53
+msgid "Renumber Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:528
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:55
+msgid ""
+"Renumber problems consecutively starting from 1. This renumbering is not "
+"saved until \"Save Changes\" is clicked."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:103
+msgid ""
+"Renumber problems in the set consecutively starting from one. In the process"
+" of deleting problems, the numbering can be made non-consecutive. This is "
+"useful to clean up the problem numbering."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:31
+msgid ""
+"Reopens any test for an additional 24 hours. This allows you to take a test "
+"even if the close date has past. This item does not allow you to take "
+"additional versions of the test."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:118
+msgid "Reordering Problems"
+msgstr ""
+
+#. (tag(                                           'strong',
+#. c(                                                      tag('span', dir =>
+#. 'ltr', format_set_name_display($c->{fullSetID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:58
+msgid "Replace current problem: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:13
+msgid "Replace which users?"
+msgstr "tr: Replace which users?"
+
+#. ($composite_id, $oldUser->status)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:448
+msgid "Replacing old data for %1: status: %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:42
+msgid "Reply-To:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:123
 msgid "Report Bugs in this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1073
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:305
 msgid "Report bugs"
 msgstr "Hataları bildir"
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:128
+msgid ""
+"Report bugs in a WeBWorK question/problem using this link. The very first "
+"time you do this you will need to register with an email address so that "
+"information on the bug fix can be reported back to you."
+msgstr ""
+
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2825
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3000
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1530
 msgid "Report for course %1:"
 msgstr ""
 
-#. ($rename_oldCourseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1186
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2122
+#. ($rename_oldCourseID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:3
 msgid "Report on database structure for course %1:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1829
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:8
 msgid "Request New Version"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2246
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2321
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:19
 msgid "Request information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1972
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1220
 msgid "Request new version now."
 msgstr ""
 
+#. ($setName)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:486
+msgid ""
+"Requested set \"%1\" is a proctored test, but no valid proctor authorization"
+" has been obtained."
+msgstr ""
+
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:399
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:422
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:425
 msgid "Requested set '%1' could not be found in the database for user %2."
 msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:469
-msgid ""
-"Requested set '%1' is a homework assignment but the gateway/quiz content "
-"generator %2 was called.  Try re-entering the set from the problem sets "
-"listing page."
-msgstr ""
-
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:484
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:472
 msgid ""
-"Requested set '%1' is a proctored test/quiz assignment, but no valid proctor"
-" authorization has been obtained."
+"Requested set '%1' is a homework assignment but the test content generator "
+"%2 was called.  Try re-entering the set from the problem sets listing page."
 msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:463
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:466
 msgid ""
-"Requested set '%1' is a test/quiz assignment but the regular homework "
-"assignment content generator %2 was called.  Try re-entering the set from "
-"the problem sets listing page."
+"Requested set '%1' is a test but the regular homework assignment content "
+"generator %2 was called.  Try re-entering the set from the problem sets "
+"listing page."
 msgstr ""
 
 #. ($setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:417
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:420
 msgid "Requested set '%1' is not assigned to user %2."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:447
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:450
 msgid "Requested set '%1' is not available yet."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:441
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:444
 msgid "Requested set '%1' is not yet open."
 msgstr ""
 
 #. ($verNum,				$setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:404
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:407
 msgid "Requested version (%1) of set '%2' can not be directly accessed."
 msgstr ""
 
 #. ($verNum, $setName, $effectiveUserName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:394
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:397
 msgid "Requested version (%1) of set '%2' is not assigned to user %3."
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:308
+msgid "Require Proctor Authorization to"
+msgstr ""
+
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:45
 msgid "Require users to log in through the LMS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:420
 msgid "Rerandomize after"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:936
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:104
 msgid "Reset"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2280
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2968
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:195
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:696
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:47
 msgid "Reset Form"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:610
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:27
 msgid "Resets the number of incorrect attempts on a single homework problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2453
-msgid ""
-"Restores a course from a gzipped tar archive (.tar.gz). After unarchiving, "
-"the course database is restored from a subdirectory of the course's DATA "
-"directory. Currently the archive facility is only available for mysql "
-"databases. It depends on the mysqldump application."
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:41
+msgid "Restore a .tar.gz archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:40
+msgid "Restore backup from"
+msgstr ""
+
+#. ($c->formatDateTime($backupTimes[0], undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:39
+msgid "Restore backup from %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:178
+#. ($c->formatDateTime($backupTime, undef, $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1230
+msgid "Restored backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:188
 msgid "Restrict Access by IP"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:912
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep:11
 msgid "Restrict Locations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:286
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:324
 msgid "Restrict Problem Progression"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:184
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:194
 msgid "Restrict To"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:154
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:33
+msgid "Restrict or sort the students displayed"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:159
 msgid "Restrict release by set(s)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2090
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:299
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:291
 msgid "Result"
 msgstr "结果"
 
-#. (CGI::i($self->$actionHandler(\%genericParams, \%actionParams,
-#. \%tableParams)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:388
+#. ($c->tag('i', $c->$actionHandler)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:228
 msgid "Result of last action performed: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:309
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:300
 msgid "Results for this submission"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:363
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:236
 msgid "Results of last action performed"
 msgstr "tr: Results of last action performed"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:125
 msgid "Results of last action performed: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1725
-msgid "Resurrect which Gateway?"
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:51
+msgid "Resurrect which test?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1449
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:669
 msgid "Retitled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:286
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:17
 msgid "Return to your work"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:686
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:132
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:16
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:166
 msgid "Revert"
 msgstr "tr: Revert"
 
-#. (CGI::span({ dir => 'ltr' }, $self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:2069
+#. (tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:83
 msgid "Revert to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1431
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1513
+#. ($c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1220
+msgid "Reverted to original file \"%1\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:168
+msgid ""
+"Reverts to the copy of the file saved on the disk or to a backup file. All "
+"unsaved editing changes will be lost. This option is only active when a "
+"temporary file or a backup file exists. You may also delete backups that "
+"have been made with this tab."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:182
+msgid "Review of column functions:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:145
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:85
 msgid ""
 "Reviewing a problem and looking at both the average Attempts and  average "
 "Status should give instructors valuable information about the difficulty of "
 "the problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:74
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:55
 msgid "Reward used successfully!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:180
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:4
 msgid "Rewards"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:27
 msgid "Ring of Reduction"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:322
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:26
 msgid "Robe of Longevity"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "SECTION"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:385
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:214
 msgid "SET NAME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:496
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:321
 msgid "STATUS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "STUDENT ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:43
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:263
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:170
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:687
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:847
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:220
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:32
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:243
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:181
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:85
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:207
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:123
 msgid "Save"
 msgstr "保存"
 
-#. (CGI::b($self->shortPath($self->{sourceFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:438
+#. (tag('b', $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_form.html.ep:2
 msgid "Save %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:44
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:695
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:33
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:124
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:20
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:134
 msgid "Save As"
 msgstr "另存为"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:744
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2963
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:194
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:695
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:37
 msgid "Save Changes"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:98
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:82
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:60
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:76
 msgid "Save Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:69
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:107
 msgid "Save Export"
 msgstr "tr: Save Export"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:92
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:86
 msgid "Save Password"
 msgstr "保存密码"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:857
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:188
 msgid "Save as"
 msgstr "另存为"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:872
-msgid "Save as Default"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:481
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:5
 msgid "Save as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1172
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1558
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:254
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1443
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:83
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_password_form.html.ep:1
 msgid "Save changes"
 msgstr "保存改变"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1794
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep:33
 msgid "Save file to:"
 msgstr ""
 
-#. (CGI::b({ dir => 'ltr' }, $self->shortPath($self->{editFilePath})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1605
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:125
+msgid ""
+"Save the contents of the editor window to the file on disk and re-render the"
+" problem. If \"Open in new window\" is checked, then the problem will open "
+"in a new tab or window showing the problem as it will be rendered for "
+"students in the set. If \"Create backup\" is checked then a backup of the "
+"current file on disk will be created before overwriting it with the contents"
+" of the editor window. If a backup already exists, then a \"Delete oldest "
+"backup\" check box will be present. If that is checked, then the oldest "
+"backup will be deleted when \"Save\" is clicked. These backups can be "
+"reverted to and managed on the \"Revert\" tab."
+msgstr ""
+
+#. (tag('b', dir => 'ltr', $c->shortPath($c->{editFilePath})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep:6
 msgid "Save to %1 and View"
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:396
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1165
-msgid "Saved to file '%1'"
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:50
+msgid "Saved answers"
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#. ($outputFilePath =~ s/$ce->{courseDirs}{templates}/[TMPL]/r)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
+#: /opt/webwork/webwork2/lib/WebworkWebservice/CourseActions.pm:549
+msgid "Saved to file \"%1\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1180
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2116
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4294
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2292
 msgid "Schema and database field definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4284
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2279
 msgid "Schema and database table definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:404
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:465
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:106
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:767
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:660
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:104
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:153
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:147
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:161
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:78
 msgid "Score"
 msgstr "成绩"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:125
 msgid "Score (%)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:161
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:60
+msgid ""
+"Score one or more sets. This can also be done from the \"Hmwk Sets Editor\" "
+"or from the \"Instructor Tools\", but the \"Scoring Tools\" page allows "
+"control over parameters."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:170
 msgid "Score required for release"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:228
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:58
 msgid "Score selected set(s) and save to:"
 msgstr "Sauvegarder les résultats sélectionnés sous"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2085
-msgid "Score summary for last submit:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:284
+msgid "Score summary for last submission:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:592
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:2
 msgid "Score which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:978
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:2
 msgid "Score which sets?"
 msgstr "tr: Score which sets?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:221
 msgid "Scores"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:487
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:66
+msgid "Scoring (\".csv\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:396
 msgid "Scoring Download"
 msgstr "成绩下载"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:161
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:115
 msgid "Scoring Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:478
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:391
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:58
 msgid "Scoring Tools"
 msgstr "成绩编辑工具"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2460
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:17
+msgid "Scoring Tools Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:327
 msgid ""
 "Screen and Hardcopy set header information can not be overridden for "
 "individual students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:26
 msgid "Scroll of Resurrection"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:189
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:236
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:241
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:200
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:211
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:793
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2029
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:297
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:831
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:860
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:889
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:918
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:157
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:178
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:38
 msgid "Section"
 msgstr "tr: Section"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:653
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:802
+#. ($section)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:122
+msgid "Section %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:30
 msgid "Section:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:436
 msgid "Seed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3214
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:114
 msgid "Select"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:505
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:20
+msgid ""
+"Select Users from the left column and sets from the right column and assign "
+"or unassign the given sets. The list of users or the list of sets can be "
+"reordered under the \"sort\" option or the format of the user or set list.  "
+"Additionally, the set lists can be filtered (by section number or "
+"recitation).  The displayed user and set lists will only be updated upon "
+"clicking \"Change Display Settings\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep:11
 msgid "Select a Homework Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep:14
 msgid "Select a Problem Collection"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:983
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:18
 msgid "Select a Set Definition File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1028
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:14
 msgid "Select a Set from this Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1659
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:20
+msgid ""
+"Select a course to create a .tar.gz archive of, which contains a dump of the"
+" database and all course files (templates, configuration files, etc).  Each "
+"course can only have a single archive.  Creating an archive of a previously "
+"archived course will delete the old archive."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:36
 msgid "Select a course to delete."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:946
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminDeleteCourse.html.ep:20
+msgid ""
+"Select a course to delete.  Warning, all data will be deleted and this "
+"cannot be undone.  This will not delete any course archives."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep:14
 msgid ""
 "Select a course to rename.  The courseID is used in the url and can only "
 "contain alphanumeric characters and underscores. The course title appears on"
 " the course home page and can be any string."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2475
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:13
 msgid "Select a course to unarchive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1914
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3684
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:21
 msgid "Select a listing format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1442
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1478
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep:18
+msgid "Select action:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:10
 msgid "Select all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2703
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:12
 msgid "Select all eligible courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2731
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:26
 msgid "Select all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1967
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:10
 msgid "Select all users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:315
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:509
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:536
-msgid "Select an action to perform"
-msgstr "tr: Select an action to perform"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3063
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:10
 msgid "Select an action to perform:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1956
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:20
+msgid ""
+"Select an archive to restore.  You cannot restore an archive into an "
+"existing course. Instead, either rename or delete the old course, or restore"
+" the archive with a new name.  When restoring a course with a new name, the "
+"name is used as the course ID, and must contain only letters, numbers, "
+"hyphens, and underscores, and may have at most 40 characters."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:36
 msgid "Select course(s) to archive."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3731
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:44
 msgid "Select course(s) to hide or unhide."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:909
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:7
 msgid "Select import file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:96
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:14
 msgid ""
 "Select one or more sets and one or more users below to assign/unassign each "
 "selected set to/from all selected users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:94
 msgid "Select sets below to assign them to the newly-created users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3666
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminRenameCourse.html.ep:20
+msgid ""
+"Select the course to change its Course ID, Course Title, or Institution.  "
+"Note that changing a course's ID will change the URL of all links to the "
+"course, and could break links from external sites such as an LMS."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:4
 msgid ""
 "Select the course(s) you want to hide (or unhide) and then click \"Hide "
 "Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
@@ -5433,133 +7243,230 @@ msgid ""
 "full URL address for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:488
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminHideCourses.html.ep:20
+msgid ""
+"Select the course(s) you want to hide (or unhide) and then click \"Hide "
+"Courses\" (or \"Unhide Courses\"). Hiding a course that is already hidden "
+"does no harm (the action is skipped). Likewise unhiding a course that is "
+"already visible does no harm (the action is skipped). Hidden courses are "
+"still active but are not listed in the list of WeBWorK courses on the "
+"opening page. To access the course, an instructor or student must know the "
+"full URL address for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:93
+msgid "Select the display mode used to render the problems on this page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:11
 msgid ""
 "Select the homework sets for which to generate hardcopy versions. You may "
 "also select multiple users from the users list. You will receive hardcopy "
 "for each (set, user) pair."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:238
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:30
+msgid ""
+"Select the sets you want scored, choose the name of the export file you want"
+" to use (by default: %1), and then click the \"Score Selected Set(s) and "
+"save to\" button."
+msgstr ""
+
+#. ('<code>ful.csv</code>','<code>scr.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:49
+msgid ""
+"Select this if you want to save the scores for each set in a separate file "
+"in addition to saving all scores to a cumulative file. After clicking the "
+"\"Score Selected Set(s) and save to\" button, you will get a pair of links "
+"for each selected set. The file that ends with %1 contains the number of "
+"correct and incorrect tries about each individual problem for each student. "
+"The file that ends with %2 is a summary of each problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:19
 msgid ""
 "Select user(s) and/or set(s) below and click the action button of your "
 "choice."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2885
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:85
+msgid ""
+"Select which assignment types (homework, tests, just-in-time) the "
+"achievement is evaluated."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:20
+msgid ""
+"Select which courses to upgrade from a previous version of WeBWorK.  The "
+"upgrade process can add missing database columns, delete unused database "
+"columns, and check the course file structure.  Be sure to read over the "
+"changes before confirming the upgrade.  You may want to create an archive of"
+" the course before upgrading.  Only courses that need upgraded will be "
+"selectable."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:84
+msgid "Select your favorite theme for the large text window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:18
 msgid "Select/unselect all fields missing in schema for deletion."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2873
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:9
 msgid "Select/unselect all tables missing in schema for deletion."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:163
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:23
 msgid "Selected sets:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:385
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:57
 msgid "Send E-mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:839
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:83
 msgid "Send Email"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:702
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:69
+msgid "Send email to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:54
+msgid "Send emails to selected instructors."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:59
 msgid "Send to all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:717
-msgid "Send to the students selected below"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:64
+msgid "Send to selected students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:402
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:7
 msgid "Set"
 msgstr "Soru Grubu"
 
 #. ($newSetName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:614
 msgid "Set %1 has been created."
 msgstr ""
 
-#. ($newSetName,$userName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1944
+#. ($newSetName, $userName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:616
 msgid "Set %1 was assigned to %2"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1239
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:567
 msgid "Set %1 was assigned to %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:415
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:354
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:42
 msgid "Set Assigner"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:420
-msgid "Set Definition Filename"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAssigner.html.ep:17
+msgid "Set Assigner Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1119
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:51
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:45
 msgid "Set Definition Files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2318
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2329
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:218
 msgid "Set Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:374
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:17
+msgid "Set Detail Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:333
 msgid "Set Detail for set %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:93
 msgid "Set Header"
 msgstr "tr: Set Header"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
+#. ($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:323
+msgid "Set Header for set %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:218
 msgid "Set ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:267
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:114
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:3
 msgid "Set Info"
 msgstr "Informations"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2744
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:19
 msgid "Set List"
 msgstr "tr: Set List"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1111
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1209
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1320
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:164
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:262
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:353
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:448
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:546
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:659
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:776
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:895
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:995
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:762
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:786
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:809
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DoubleSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditProb.pm:66
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/HalfCreditSet.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectHW.pm:48
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm:44
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:314
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:7
 msgid "Set Name"
 msgstr "tr: Set Name"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:186
+#. ($c->formatDateTime($set->due_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:18
+msgid "Set closes on %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:45
+msgid "Set definition (\".def\") files"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:20
+msgid "Set is closed."
+msgstr ""
+
+#. ($c->formatDateTime($set->reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:16
+msgid "Set is due on %1."
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:14
+msgid "Set opens on %1."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:188
 msgid "Set random seed to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2029
+#: /opt/webwork/webwork2/conf/defaults.config:1930
 msgid ""
 "Set to true for log to mean base 10 log and false for log to mean natural "
 "logarithm."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2049
+#: /opt/webwork/webwork2/conf/defaults.config:1950
 msgid ""
 "Set to true to allow students to enter Unicode versions of some characters "
 "(like U+2212 for the minus sign) in their answers.  One reason to allow this"
@@ -5568,7 +7475,7 @@ msgid ""
 "directory from the keyboard."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2019
+#: /opt/webwork/webwork2/conf/defaults.config:1920
 msgid ""
 "Set to true to display the \"Entered\" column which automatically shows the "
 "evaluated student answer, e.g., 1 if student input is sin(pi/2). If this is "
@@ -5577,7 +7484,7 @@ msgid ""
 " answer."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2060
+#: /opt/webwork/webwork2/conf/defaults.config:1961
 msgid ""
 "Set to true to have Full Width Unicode character (U+FF01 to U+FF5E) "
 "converted to their ASCII equivalents (U+0021 to U+007E) automatically in "
@@ -5585,20 +7492,30 @@ msgid ""
 "automatically use Full Width characters for parentheses and commas."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:521
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:148
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:293
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:427
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:164
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:16
+msgid "Set values"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:24
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/siblings.html.ep:4
 msgid "Sets"
 msgstr "Devoirs"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:352
-msgid "Sets Assigned to User"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:322
+msgid "Sets assigned to %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:343
-msgid "Sets assigned to %1"
+#. ($userName, $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:90
+msgid "Sets assigned to %1 (%2)"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserDetail.html.ep:17
+msgid "Sets assigned to student Help"
 msgstr ""
 
 #: /opt/webwork/webwork2/conf/LTIConfigValues.config:57
@@ -5612,189 +7529,241 @@ msgid ""
 "links from the LMS must be problem set specific. For example, "
 "<code>webwork.myschool.edu/webwork2/course-name/problem_set_name</code>. If "
 "the problem set name has space characters, they should be underscores in "
-"these addresses. If the problem set is a quiz, it must have this format: "
-"<code>webwork.myschool.edu/webwork2/course-"
-"name/quiz_mode/problem_set_name</code>. Also, to initialize the "
-"communication between WeBWorK and the LMS, the user must follow each of "
-"these external learning tools at least one time. Since there must be a "
-"separate external tool link for each problem set, this option requires more "
-"maintenance of the LMS course.</dd></dl>"
+"these addresses. Also, to initialize the communication between WeBWorK and "
+"the LMS, the user must follow each of these external learning tools at least"
+" one time. Since there must be a separate external tool link for each "
+"problem set, this option requires more maintenance of the LMS "
+"course.</dd></dl>"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:55
+msgid "Sets the order in which achievements are listed and evaluated."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1458
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:625
 msgid "Sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:726
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:36
 msgid "Setting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1332
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:39
 msgid "Shift dates so that the earliest is"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:32
+msgid "Show"
+msgstr ""
+
 #. ($numchild)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1300
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1301
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:32
 msgid "Show %1 more like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:326
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:107
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:39
 msgid "Show Correct Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:331
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:22
 msgid "Show Date & Size"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:86
 msgid "Show LTI parameters (for debugging)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:620
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:480
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:34
 msgid "Show Me Another"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2518
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2412
+#. ($exhausted)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:69
+msgid "Show Me Another %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1642
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:711
 msgid "Show Past Answers"
 msgstr "脰nceki Yan谋tlar谋 G枚ster"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:703
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:41
+msgid "Show Problem Source File"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:132
 msgid "Show Problem Source File:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:296
 msgid "Show Problems on Finished Tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
-msgid "Show Scores on Finished Assignments?"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:282
+msgid "Show Scores on Finished Tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2416
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:630
 msgid "Show Solutions"
 msgstr "展示答案"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1636
+#: /opt/webwork/webwork2/conf/defaults.config:1538
 msgid "Show Total Homework Grade on Grades Page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1266
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:77
 msgid "Show all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1380
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:91
 msgid "Show all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2404
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:621
 msgid "Show correct answers"
 msgstr "Do臒ru yan谋tlar谋 g枚ster"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1299
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+msgid "Show hints after"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:30
 msgid "Show less like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:337
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:387
 msgid "Show me another"
 msgstr ""
 
-#. ($exhausted)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1926
-msgid "Show me another %1"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorShowAnswers.html.ep:20
+msgid ""
+"Show past answers.  Students can only see their past answers, and they will "
+"not be able to see which parts are correct.  Instructors can use the form to"
+" select any combination of users, sets, and problems to view.  The table "
+"below will list the past answers colored according to correctness (green is "
+"correct).  Use control + click to select multiple users, sets, or problems."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2428
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:639
 msgid "Show problem graders"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:299
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:105
 msgid "Show saved answers?"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1860
+#: /opt/webwork/webwork2/conf/defaults.config:1762
 msgid ""
 "Show the correct answer to the current problem before re-randomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1862
+#: /opt/webwork/webwork2/conf/defaults.config:1764
 msgid ""
 "Show the correct answer to the current problem on the last attempt before a "
 "new version is requested."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:3
 msgid "Show which sets?"
 msgstr "tr: Show which sets?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:690
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:3
 msgid "Show which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:275
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:382
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:475
-msgid "Show/Hide Site Description"
-msgstr "tr: Show/Hide Site Description"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:622
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:11
 msgid "Show:"
 msgstr ""
 
-#. (scalar @{ $self->{visibleSetIDs} },			scalar @{ $self->{allSetIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:594
+#. (scalar @{ $c->{visibleSetIDs} },			scalar @{ $c->{allSetIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:115
 msgid "Showing %1 out of %2 sets."
 msgstr ""
 
-#. (scalar @Users, scalar @{ $self->{allUserIDs} })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:610
+#. (scalar(keys %{ $c->{visibleUserIDs} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:80
 msgid "Showing %1 out of %2 users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:70
 msgid "Showing all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1355
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:81
 msgid "Showing all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:61
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:104
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:64
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:67
+#. ($c->{merge_file}, $ur->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:5
+msgid "Showing data from merge file %1 for user %2:"
+msgstr ""
+
+#. ($c->{merge_file})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:147
+msgid "Showing data from merge file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:61
+msgid "Showing problem for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:7
+msgid "Showing statistics for:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:33
+msgid ""
+"Shows how many instructors and students have been assigned this problem set,"
+" out of the total number in the class. Clicking on this link allows you to "
+"assign the set to users, unassign this set from users, and to individually "
+"edit the assignment for specific users. For changing dates for individual "
+"users there are also shortcuts from the \"Instructor Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:63
 msgid "Site Information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2258
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:88
 msgid "Skip archiving this course"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2080
+#: /opt/webwork/webwork2/conf/defaults.config:1981
 msgid "Skip explanation essay answer fields"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1556
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1557
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:81
+msgid "Snippets of PG code illustrating specific techniques"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1514
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1515
 msgid "Solution:"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:1555
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:1513
 msgid "Solution: "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:432
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:105
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:57
 msgid "Solutions"
 msgstr "答案"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1350
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:20
+msgid ""
+"Some OPL problems have been rated for difficulty/educational objective. The "
+"levels are loosely inspired by Bloom's taxonomy. They are assigned numbers "
+"from 1 to 6 as follows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:185
 msgid ""
 "Some WeBWorK problems are programmed using what are called <i>Math "
 "Objects</i>. These problems are preferred by some people because they "
@@ -5802,18 +7771,18 @@ msgid ""
 "particularly for answers which are way off base."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:386
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:379
 msgid "Some answers will be graded later."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:60
 msgid ""
 "Some of these files are directories. Only delete directories if you really "
 "know what you are doing. You can seriously damage your course if you delete "
 "the wrong thing."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2082
+#: /opt/webwork/webwork2/conf/defaults.config:1983
 msgid ""
 "Some problems have an explanation essay answer field, typically following a "
 "simpler answer field. For example, find a certain derivative using the "
@@ -5825,7 +7794,7 @@ msgid ""
 "grading."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2186
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:83
 msgid ""
 "Some problems shown above represent multiple similar problems from the "
 "database.  If the (top) information line for a problem has a letter M for "
@@ -5835,309 +7804,405 @@ msgid ""
 "again."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1612
-msgid ""
-"Some servers handle courses taking place in different timezones.  If this "
-"course is not showing the correct timezone, enter the correct value here.  "
-"The format consists of unix times, such as "
-"\"America/New_York\",\"America/Chicago\", \"America/Denver\", "
-"\"America/Phoenix\" or \"America/Los_Angeles\". Complete list: <a "
-"href=\"http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones\">TimeZoneFiles</a>"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:529
-msgid ""
-"Something was wrong with your LTI parameters.  If this recurs, please speak "
-"with your instructor"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:79
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:50
 msgid "Sort"
 msgstr "tr: Sort"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:751
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:814
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:4
 msgid "Sort by"
 msgstr "tr: Sort by"
 
 #. ($names{$primary}, $names{$secondary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:817
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:324
 msgid "Sort by %1 and then by %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/DropdownList.pm:171
-#: /opt/webwork/webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm:115
+#: /opt/webwork/webwork2/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep:3
 msgid "Sort:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:51
+msgid "Sorts the lists displayed by due date, name, etc."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:363
 msgid "Source File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1586
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1612
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1555
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1593
 msgid ""
 "Source file paths cannot include .. or start with /: your source file path "
 "was modified."
 msgstr ""
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:464
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:11
 msgid ""
 "Specify an ID, title, and institution for the new course. The course ID may "
 "contain only letters, numbers, hyphens, and underscores, and may have at "
 "most %1 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:661
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:94
+msgid ""
+"Spell check the text of the file that your are editing. Note that there will"
+" be many spelling errors in the code parts of your file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:116
+msgid "Standard Deviation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:162
 msgid "Start"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:609
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:47
+msgid "Start LTI Grade Update"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:130
 msgid "Start New Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:352
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:443
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:78
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:94
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:508
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:406
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:84
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:54
 msgid "Statistics"
 msgstr "统计数据"
 
-#. ($self->{ce}{courseName} =~ s/_/ /gr,                   CGI::span({ dir =>
-#. 'ltr' }, format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:73
-msgid "Statistics for %1 set %2. Closes %3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:17
+msgid "Statistics Help"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:86
+msgid "Statistics for %1"
 msgstr ""
 
-#. ($self->{ce}{courseName}, $self->{studentName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:68
-msgid "Statistics for %1 student %2"
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:90
+msgid "Statistics for %1 problem %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2089
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:368
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1442
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1524
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2020
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:296
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:659
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:806
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:191
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:192
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:84
+msgid "Statistics for student %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:442
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:289
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:151
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:160
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:36
 msgid "Status"
 msgstr "Durumu"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:29
 msgid "Stop Acting"
 msgstr "Rol Yapmay谋 b谋rak"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2251
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:85
 msgid "Stop Archiving"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2418
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1153
 msgid "Stop archiving courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:233
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:783
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2011
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:295
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:829
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:858
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:887
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:916
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:106
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:30
 msgid "Student ID"
 msgstr "学生ID"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:188
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:156
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:9
+msgid "Student ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:37
 msgid "Student Name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:102
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:86
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:570
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:80
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:85
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:428
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:56
 msgid "Student Progress"
 msgstr "Progrès des étudiants"
 
-#. ($self->{ce}->{courseName},                     CGI::span({ dir => 'ltr' },
-#. format_set_name_display($self->{setName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:81
-msgid "Student Progress for %1 set %2. Closes %3"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:17
+msgid "Student Progress Help"
 msgstr ""
 
-#. ($self->{ce}->{courseName}, $self->{studentName})
+#. ($c->{studentID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:72
+msgid "Student Progress for %1"
+msgstr ""
+
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($c->stash('setID')
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:76
-msgid "Student Progress for %1 student %2"
+msgid "Student Progress for set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:628
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:80
 msgid "Student answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:766
-msgid "Subject:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:80
+msgid ""
+"Student scores for the sets selected below will be calculated. This and "
+"other scoring operations can also be done using the \"Scoring Tools\" link."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:87
+msgid "Student:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:124
+msgid "Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:653
-msgid "Subject: "
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:50
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:8
+msgid "Subject:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:222
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:30
 msgid "Submission time:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:226
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:41
 msgid "Submit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1868
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:26
 msgid "Submit Answers"
 msgstr "提交答案"
 
 #. ($effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1861
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:23
 msgid "Submit Answers for %1"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:502
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:525
 msgid "Submit your answers again to go on to the next part."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:775
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:136
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:183
 msgid "Success Index"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:106
+msgid ""
+"Success index is the square of the average score divided by the average "
+"number of attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:73
+msgid ""
+"Success index is the square of the score divided by the number of attempts."
+msgstr ""
+
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2356
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1086
 msgid "Successfully archived the course %1."
 msgstr ""
 
 #. ($newAchievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:885
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:422
 msgid "Successfully created new achievement %1"
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1252
+#. ($c->tag('span', dir => 'ltr', format_set_name_display($newSetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:581
 msgid "Successfully created new set %1"
 msgstr ""
 
 #. ($add_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:465
 msgid "Successfully created the course %1"
 msgstr ""
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1818
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2401
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1131
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:900
 msgid "Successfully deleted the course %1."
 msgstr ""
 
-#. ($rename_oldCourseID, $rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1529
+#. ($rename_oldCourseID,							$rename_newCourseID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:772
 msgid "Successfully renamed the course %1 to %2"
 msgstr ""
 
 #. ($unarchive_courseID, $new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2653
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1286
 msgid "Successfully unarchived %1 to the course %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1163
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2099
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4280
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:89
+msgid "TA:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2274
 msgid "Table defined in database but missing in schema"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1161
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2097
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2269
 msgid "Table defined in schema but missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1165
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2101
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2265
 msgid "Table is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3200
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3490
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:276
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:695
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:576
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:106
 msgid "Take Action!"
 msgstr "tr: Take Action!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1040
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:9
 msgid "Target Set:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:63
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:42
 msgid "TeX Source"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:784
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:258
+msgid "Test %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:54
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm:52
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ResurrectGW.pm:55
+msgid "Test Name"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:156
 msgid "Test Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:224
 msgid "Test Time Limit (min; 0=Close Date)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2041
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:238
 msgid "Test Time Notification"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:656
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:156
 msgid "Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:244
 msgid "Test not yet submitted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:317
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:920
+msgid "Test parameters"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:149
 msgid "Test/quiz with time limit."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:414
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:79
 msgid "Text"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:842
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:80
+msgid "Text Editor Options"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:55
 msgid "Text chapter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:864
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:66
 msgid "Text section:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:820
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:44
 msgid "Textbook:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1403
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:58
 msgid ""
-"The Attempts figure is the global average of the number of attempts (both "
-"correct and incorrect) individuals take on this problem.  A high figure may "
-"represent a difficult problem.  Note that problems with multiple parts may "
-"have higher average attempts since many students  will submit an answer to "
+"The \"Edit Target Set\" button at the top of the page will take you to the "
+"Problem Set Editor which will allow you to edit dates, assign users and "
+"other information about the problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:115
+msgid ""
+"The \"Score\" tab will export achievement data to a CSV file that can be "
+"downloaded.  The export contains the global data including number of "
+"achievement points and current level of each student.  In addition for each "
+"selected achievement, a column for if the achievement was earned (1) or not "
+"earned (0) will be added to the CSV."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:194
+msgid ""
+"The <strong>Assigned sets</strong> column (x/y) indicates that x sets out of"
+" y sets avaiable have been assigned to this student. Click this link to "
+"assign or unassign sets to this student, to adjust due dates, or to adjust "
+"the grades on a homework set for a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:20
+msgid ""
+"The <strong>Set Detail</strong> page can be viewed in one of two distinct "
+"modes:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:189
+msgid ""
+"The <strong>login name</strong> column links allow you to \"act as\" a "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:191
+msgid ""
+"The <strong>pencil</strong> in the login column allows you to edit that "
+"student's data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:64
+msgid ""
+"The Attempts figure is the global average of the number of attempts (both "
+"correct and incorrect) individuals take on this problem.  A high figure may "
+"represent a difficult problem.  Note that problems with multiple parts may "
+"have higher average attempts since many students  will submit an answer to "
 "each part before continuing and each such  submittal counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1485
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:124
 msgid ""
 "The Attempts figure is the local average of the number of attempts (both "
 "correct and incorrect) individuals at your institution take on this problem."
@@ -6147,14 +8212,14 @@ msgid ""
 "counts as an attempt."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1819
+#: /opt/webwork/webwork2/conf/defaults.config:1721
 msgid ""
 "The Maximum number of times Show me Another can be used per problem by a "
 "student. If set to -1 then there is no limit to the number of times that "
 "Show Me Another can be used."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1787
+#: /opt/webwork/webwork2/conf/defaults.config:1689
 msgid ""
 "The Reduced Scoring Period is the default period before the due date during "
 "which all additional work done by the student counts at a reduced rate. When"
@@ -6167,7 +8232,7 @@ msgid ""
 "work done counts 50% of the original.\" will be displayed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:78
 msgid ""
 "The Status figure is the global average of the Status individuals have "
 "earned on this problem. The Status is the percentage correct (from 0% to "
@@ -6176,7 +8241,7 @@ msgid ""
 "a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1506
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:138
 msgid ""
 "The Status figure is the local average of the Status individuals at your "
 "institution have earned on this problem. The Status is the percentage "
@@ -6185,47 +8250,61 @@ msgid ""
 "students will work on a problem until they get it correct or nearly so."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1262
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:11
 msgid "The WeBWorK Project"
 msgstr "tr: The WeBWorK Project"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:822
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:25
+msgid ""
+"The WeBWorK administrators need to be added to the course in order for them "
+"to access the course.  Unchecking this option will make it so WeBWorK "
+"administrators cannot directly login to the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:129
+msgid ""
+"The achievement evaluator is the perl code that is run after each submit to "
+"determine if an achievement is earned or not.  Click on the \"Edit "
+"Evaluator\" link to edit the evaluator."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:26
 msgid ""
 "The adjusted status of a problem is the larger of the problem's status "
 "andthe weighted average of the status of those problems which count towards "
 "the parent grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1677
+#: /opt/webwork/webwork2/conf/defaults.config:1579
 msgid ""
 "The amount of time (in minutes) after the due date that the Answers are "
 "available to student to view.  You can change this for individual homework, "
 "but WeBWorK will use this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1667
+#: /opt/webwork/webwork2/conf/defaults.config:1569
 msgid ""
 "The amount of time (in minutes) before the due date when the assignment is "
 "opened.  You can change this for individual homework, but WeBWorK will use "
 "this value when a set is created."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:389
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:386
 msgid "The answer above is NOT correct."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:375
 msgid "The answer above is correct."
 msgstr "上面的答案是正确的."
 
 #. ($filename, $ce->{mail}{maxAttachmentSize})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:230
 msgid ""
 "The attached file \"%1\" exceeds the allowed attachment size of "
 "%quant(%2,megabyte)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:421
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:496
 msgid ""
 "The child problems for this problem will become visible to the student when "
 "they either have more incorrect attempts than is specified here, or when "
@@ -6234,173 +8313,252 @@ msgid ""
 "attempts."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:704
+#. ('href="http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files"
+#. target="Webworkdocs"',
+#. '<code>demoCourse.lst</code>','<code>.csv</code>','<code>.lst</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:59
+msgid ""
+"The classlist files are stored in the templates directory and provide a "
+"convenient way to enter a large number of students into your class. To view "
+"the format for <strong>ClassList files</strong> see the <a %1>ClassList "
+"specification</a> or download the %2 file and use it as a model. ClassList "
+"files can be prepared using a spreadsheet and then saved as %3 (comma "
+"separated values) text files.  However, to access as a classlist file, the "
+"file suffix needs to be changed to %4, which can be done with the \"Rename\""
+" button."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:16
 msgid ""
 "The configuration module did not find the data it needs to function.  Have "
-"your site administrator check that Constants.pm is up to date."
+"your site administrator check that site configuration files are up to date."
+msgstr ""
+
+#. ($archive_courseID,					$archive_path)
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:80
+msgid ""
+"The course \"%1\" has already been archived at \"%2\". This earlier archive "
+"will be erased.  This cannot be undone."
 msgstr ""
 
-#. (CGI::b($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:151
+#. (tag('strong', stash('courseID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:8
 msgid ""
 "The course %1 uses an external authentication system (%2). Please go there "
 "to log in again."
 msgstr ""
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:186
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:17
 msgid ""
 "The course %1 uses an external authentication system (%2). Please return to "
 "that system to access this course."
 msgstr ""
 
-#. (CGI::strong($course)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:191
+#. (tag('strong', $course)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:23
 msgid ""
 "The course %1 uses an external authentication system (%2). You've "
 "authenticated through that system, but aren't allowed to log in to this "
 "course."
 msgstr ""
 
-#. ($archive_courseID,						$archive_path)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2243
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:30
+msgid "The course database must be upgraded before archiving this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:30
+msgid "The course database must be upgraded before renaming this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:26
 msgid ""
-"The course '%1' has already been archived at '%2'. This earlier archive will"
-" be erased.  This cannot be undone."
+"The current mode should be made clear by the information at the top of the "
+"page."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1995
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:46
+msgid ""
+"The current value of the achievement counter. Changes to this variable will "
+"be saved."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1897
 msgid "The default display mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1855
+#: /opt/webwork/webwork2/conf/defaults.config:1757
 msgid ""
 "The default number of attempts before the problem is re-randomized. ( 0 => "
 "never )"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1854
+#: /opt/webwork/webwork2/conf/defaults.config:1756
 msgid ""
 "The default number of attempts between re-randomization of the problems ( 0 "
 "=> never)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:251
-msgid "The directory you specified doesn't exist"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:73
+msgid ""
+"The description shown to students which states what action is needed to earn"
+" the achievement."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1829
-msgid "The display was already cleared."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:5
+msgid "The directory you specified doesn't exist"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2111
+#: /opt/webwork/webwork2/conf/defaults.config:2032
 msgid ""
 "The e-mail verbosity level controls how much information is automatically "
-"added to feedback e-mails.  Levels are<ol><li value=\"Simple\"> Simple: send"
-" only the feedback comment and context link</li><li value=\"Standard\"> "
-"Standard: as in Simple, plus user, set, problem, and PG data</li><li "
-"value=\"Debug\"> Debug: as in Standard, plus the problem environment "
-"(debugging data)</li></ol>"
+"added to feedback e-mails.  Levels are<ol><li> Simple: send only the "
+"feedback comment and context link</li><li> Standard: as in Simple, plus "
+"user, set, problem, and PG data</li><li> Debug: as in Standard, plus the "
+"problem environment (debugging data)</li></ol>"
 msgstr ""
 
-#. ($achievementName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:625
-msgid "The evaluator for %1 has been renamed to '%2'."
+#. ($achievementName,				$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:293
+msgid "The evaluator for %1 has been renamed to \"%2\"."
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:339
-msgid ""
-"The file %1/%2 already exists and cannot be overwritten. The message was not"
-" saved"
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:246
+msgid "The file \"%1\" cannot be found."
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:190
-msgid "The file %1/%2 cannot be found."
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:526
+msgid "The file \"%1\" cannot be read!"
 msgstr ""
 
-#. ($emailDirectory, $openfilename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:181
-msgid "The file %1/%2 is not readable by the webserver."
+#. ($c->shortPath($editFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:522
+msgid "The file \"%1\" is a directory!"
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:373
-msgid "The file '%1' cannot be found."
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:259
+msgid "The file \"%1\" is a template. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1004
-msgid "The file '%1' cannot be read!"
+#. ($c->shortPath($c->{inputFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:250
+msgid "The file \"%1\" is protected. You may use \"Save As\" to create a new file."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:380
-msgid "The file '%1' is a blank problem!"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:19
+msgid "The file $file does not appear to be a text or image file."
 msgstr ""
 
-#. ($self->shortPath($editFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:998
-msgid "The file '%1' is a directory!"
+#. ("$emailDirectory/$output_file")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:277
+msgid ""
+"The file %1 already exists and cannot be overwritten. The message was not "
+"saved."
 msgstr ""
 
-#. ($self->shortPath($inputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:375
-msgid "The file '%1' is protected!"
+#. ("$emailDirectory/$openfilename",				$emailDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:156
+msgid ""
+"The file %1 cannot be found. Check whether it exists and whether the "
+"directory %2 can be read by the webserver. "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:598
+#. ($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:594
+msgid ""
+"The file %1 is not contained in the course templates directory and can not "
+"be modified."
+msgstr ""
+
+#. ("$emailDirectory/$openfilename")
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:148
+msgid ""
+"The file %1 is not readable by the webserver. Check that it's permissions "
+"are set correctly."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:203
 msgid "The file does not appear to be a text file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:95
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:88
 msgid "The file you are trying to download doesn't exist"
 msgstr ""
 
 #. ($filename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:251
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:221
 msgid "The filetype of the attached file \"%1\" is not allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3843
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2149
 msgid "The following courses were successfully hidden:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3908
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2218
 msgid "The following courses were successfully unhidden:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4121
-msgid "The following upgrades are available for your WeBWorK system:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:34
+msgid "The following describes how the checkboxes alter the scoring output"
 msgstr ""
 
-#. (CGI::b(join(", ", @unassignedUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2081
+#. (tag('b', join(', ', @$unassignedUsers)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:66
 msgid ""
 "The following users are NOT assigned to this set and will be ignored: %1"
 msgstr ""
 
-#. (join('.', @{$problemSeqs[$children_counts_indexs[0]]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:288
+msgid "The given file path is not a valid location."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:49
+msgid "The goal value of the achievement counter."
+msgstr ""
+
+#. (join('.', @{ $problemSeqs[ $children_counts_indexs[0] ] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1334
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the score of problem %1."
 msgstr ""
 
-#. (join(', ', map({join('.', @{$problemSeqs[$_]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2064
+#. (join(', ', map({ join('.', @{ $problemSeqs[$_] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1344
 msgid ""
 "The grade for this problem is the larger of the score for this problem, or "
 "the weighted average of the problems: %1."
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1954
-msgid "The hardcopy header for set %1 has been renamed to '%2'."
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1078
+msgid "The hardcopy header for set %1 has been renamed to \"%2\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:111
+#. ($showHintsAfter)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:36
+msgid ""
+"The hint shown is an instructor preview and will be shown to students after "
+"%quant(%1,attempt)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:32
+msgid ""
+"The hint shown is an instructor preview and will not be shown to students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:22
+msgid ""
+"The information box on the right displays information about the course. This"
+" is useful for leaving course wide messages for students. It contains text "
+"from the file templates/course_info.txt. Instructors can edit this file from"
+" the web (click on the \"Edit\" link)."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:30
 msgid ""
 "The initial value is the answer sub score for the answer that is currently "
 "shown.  If this is modified, it will be used to compute the total problem "
@@ -6408,37 +8566,100 @@ msgid ""
 "shown answer if the page is reloaded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:161
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:97
+msgid ""
+"The initial value is the currently saved score as a point value computed "
+"using the percent score.  This point value is used to compute the percent "
+"score (rounded to a whole percent) that can be saved."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:145
 msgid "The initial value is the currently saved score for this student."
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_oldCourseInstitution,
 #. $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1445
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
 msgid ""
 "The institution associated with the course %1 has been changed from %2 to %3"
 msgstr ""
 
-#. ($rename_newCourseID, $rename_newCourseInstitution)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1498
+#. ($rename_newCourseID, $optional_arguments{courseInstitution})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:729
 msgid "The institution associated with the course %1 is now %2"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:601
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:599
+msgid ""
+"The instructor account with user id %1 does not exist.  Instructor accounts "
+"must be created manually."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:635
 msgid ""
 "The instructor account with user id %1 does not exist.  Please create the "
 "account manually via WeBWorK."
 msgstr ""
 
-#. ($r->param('new_set_name')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1897
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:87
+msgid ""
+"The key maps that are available are \"default\", \"emacs\", \"sublime\", and"
+" \"vim\". The \"default\" key map has the standard behavior of a browser "
+"text area. You can use Ctrl-C to copy, Ctrl-V to paste, Ctrl-F to search, "
+"etc. If you are more comfortable with the \"emacs\", \"sublime\", or \"vim\""
+" text editors then you may choose to use one of those key maps instead."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:75
+msgid "The large text window"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:27
+msgid ""
+"The list of files include regular files, directories (ending in a \"/\") and"
+" links (ending in a \"@\")."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:52
+msgid ""
+"The login name cannot be changed. (It is the primary key for the student's "
+"data.) If you make a mistake in the login name at the beginning of the "
+"course (before any work has been done) then it is best to simply add a new "
+"student with the correct entry and drop the student with the bad login name."
+" (See drop and delete students below.) If the login name must be changed "
+"after a user has started working assignments, then contact your system "
+"administrator, who can use the webwork2 \"bin/change_user_id\" script to "
+"change the user id."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:20
+msgid ""
+"The main page allows access to set and student statistics.  When selecting a"
+" student, their grades page is shown, which lists set totals and per problem"
+" grades for each set assigned to the student.  When selecting a set, various"
+" statistics and histograms are shown for the overall grades of students who "
+"are currently enrolled or auditing the course."
+msgstr ""
+
+#. ('href="http://webwork.maa.org/wiki" target="ww_wiki"',
+#. 'href="http://webwork.maa.org/wiki/Instructors" target="ww_wiki"')
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:24
+msgid ""
+"The main page for WeBWorK documentation is the <a %1>webwork wiki</a> while "
+"specific help for instructors setting up a course are in the <a "
+"%2>instructors' section</a>."
+msgstr ""
+
+#. ($c->param('new_set_name')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:569
 msgid ""
 "The name \"%1\" is not a valid set name.  Use only letters, digits, dashes, "
 "underscores, periods, and spaces."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1530
+#: /opt/webwork/webwork2/conf/defaults.config:1432
 msgid ""
 "The name of course information file (located in the templates directory). "
 "Its contents are displayed in the right panel next to the list of homework "
@@ -6455,151 +8676,249 @@ msgid ""
 "go back to the LMS to access something in the WeBWorK course."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:63
+msgid "The number of points earned for earning the achievement."
+msgstr ""
+
 #. ($openDate, $dueDate, $answerDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1958
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1104
 msgid ""
 "The open date: %1, close date: %2, and answer date: %3 must be defined and "
 "in chronological order."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:702
+#. ($path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:393
+msgid "The original path is not in a valid location. Using failsafe %1"
+msgstr ""
+
+#. ($forcedSourceFile)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:510
+msgid "The original path to the file is %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:262
 msgid "The password and password confirmation for the instructor must match."
 msgstr ""
 
-#. (CGI::b($r->maketext("[_1]'s Current Password", $user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:27
+msgid ""
+"The password can be any combination of letters, numbers and special symbols."
+" Students are encouraged to use all three, and stay away from dictionary "
+"words. The password should not be the same as any password used elsewhere, "
+"such as for an email account. The password will only be present on the page "
+"if the user has permission to change the password."
+msgstr ""
+
+#. ($c->tag(                                               'b',
+#. $c->maketext(                                                   "[_1]'s
+#. Current Password",
+#. $c->{user}->first_name . ' ' . $c->{user}->last_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:95
 msgid ""
 "The password you entered in the %1 field does not match your current "
 "password. Please retype your current password and try again."
 msgstr ""
 
-#. (CGI::b($r->maketext("[_1]'s New Password",         $e_user_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:105
+#. ($c->tag('b', $c->maketext("[_1]'s New Password",         $e_user_name)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:82
 msgid ""
 "The passwords you entered in the %1 and %2 fields don't match. Please retype"
 " your new password and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:789
-msgid "The path to the original file should be absolute"
-msgstr "tr: The path to the original file should be absolute"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:374
+msgid "The path can not be the temporary edit directory."
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:667
-msgid ""
-"The percentage of active students with correct answers for each problem"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:370
+msgid "The path to the original file should be absolute."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:755
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:131
 msgid ""
 "The percentage of students receiving at least these scores. The median score"
 " is in the 50% column."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:455
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:458
 msgid "The prerequisite conditions have not been met for set '%1'."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1917
-msgid "The problem set is not yet open"
-msgstr ""
-
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2012
-msgid "The recorded score for this version is  %1/%2."
+#. (q(down menu to change which student's seed and answers are shown.  Use the
+#. "Mark Correct" checkbox to set)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:26
+msgid ""
+"The problem is shown at the top with the seed and answers of the selected "
+"student.  Use the drop "
 msgstr ""
 
-#. ($recScore, $totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2021
-msgid "The recorded score for this version is %1/%2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:62
+msgid "The problem set is not yet open"
 msgstr ""
 
 #. ($origReducedScoringDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1971
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1121
 msgid ""
 "The reduced credit date %1 in the file probably was generated from the Unix "
 "epoch 0 value and is being treated as if it was Unix epoch 0."
 msgstr ""
 
 #. ($openDate, $dueDate)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1982
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1135
 msgid ""
 "The reduced credit date should be between the open date %1 and close date %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1220
 msgid ""
 "The reduced scoring date should be between the open date and close date."
 msgstr ""
 
 #. ($tempFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:307
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:298
 msgid "The requested file \"%1\" does not exist on the server."
 msgstr ""
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2085
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1389
 msgid "The score for this problem can count towards score of problem %1."
 msgstr ""
 
-#. ($setName, $effectiveUser)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:306
-msgid "The selected problem set (%1) is not a valid set for %2"
+#. ('<code>courseName_totals.csv</code>')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:69
+msgid ""
+"The scoring files are stored in the scoring directory and are produced using"
+" the \"Scoring Tools\" page or the scoring command in the \"Instructor "
+"Tools\" module. These files can be downloaded, modified in a spreadsheet "
+"(for example, to add midterm scores) and then uploaded again to the scoring "
+"directory to be merged with email messages. (Use a new file name, other than"
+" %1, when uploading to prevent the scoring module from overwriting an "
+"uploaded file.)"
 msgstr ""
 
-#. ($urlpath->arg("setID")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1467
-msgid "The selected problem set (%1) is not a valid set for %2%3:"
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:52
+msgid ""
+"The second row of the problem collection area is for browsing directories. "
+"The OPL will be there as well as any other directories that you may set up "
+"(for example Contrib). If this is selected, all subdirectories containing "
+"problems will be listed."
 msgstr ""
 
-#. ($setName, $self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1946
-msgid "The set header for set %1 has been renamed to '%2'."
+#. (stash('setID')
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet.html.ep:13
+msgid "The selected problem set (%1) is not a valid set for %2."
+msgstr ""
+
+#. ($setID, $effectiveUserID, $c->{invalidVersionCreation} ? " (acted as by
+#. $userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:77
+msgid "The selected problem set (%1) is not a valid set for %2: %3"
+msgstr ""
+
+#. ($c->{setID},						$c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1066
+msgid "The set header for set %1 has been renamed to \"%2\"."
 msgstr ""
 
-#. ($newSetName)
 #. ($newSetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1164
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:491
+msgid ""
+"The set name \"%1\" is already in use. Pick a different name if you would "
+"like to start a new set. No set created."
+msgstr ""
+
+#. ($newSetName)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:584
 msgid ""
 "The set name '%1' is already in use.  Pick a different name if you would "
 "like to start a new set."
 msgstr ""
 
-#. ($setID, $editingSetVersion, $editForUser[0])
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2109
-msgid "The set-version (%1, version %2) is not assigned to user %3."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:58
+msgid ""
+"The sets checked below will be visible to students or hidden from students. "
+"Useful for preparing sets ahead of time, but not showing them to students; "
+"or for temporarily hiding a set which has a mistake in it while it is being "
+"fixed."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:54
+msgid ""
+"The sets checked below will become available for editing the due dates and "
+"visibility."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:73
+msgid ""
+"The sets checked below will written to set definition files, to be saved for"
+" future use, or to be transferred to another course. The set definition "
+"files can be uploaded/downloaded using the \"File Manager\"."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminAddCourse.html.ep:29
+msgid ""
+"The simple configuration file is the name of the configuration file created "
+"when using the \"Course Configuration\" page to configure course options.  "
+"This option sets if this configuration file is copied from the old course or"
+" not and instead use the server defaults."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:551
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:521
 msgid "The solution has been removed."
 msgstr ""
 
-#. ($fullSetName, $prettyProblemNumber, $self->shortPath($sourceFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1975
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:33
+msgid ""
+"The solution shown is an instructor preview and will only be shown to "
+"students after the due date."
+msgstr ""
+
+#. ($c->{fullSetID},
+#. $c->{prettyProblemNumber},
+#. $c->shortPath($c->{sourceFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1103
 msgid ""
-"The source file for 'set %1 / problem %2 has been changed from '%3' to '%4'"
+"The source file for \"set %1 / problem %2\" has been changed from \"%3\" to "
+"\"%4\"."
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2133
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1209
+msgid ""
+"The temporary file %1 is not contained in the course templates directory and"
+" can not be deleted."
+msgstr ""
+
+#. ($c->{tempFilePath})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:689
+msgid ""
+"The temporary file %1 is not in the course templates directory and can not "
+"be deleted!"
+msgstr ""
+
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:349
 msgid ""
 "The test (which is version %1) may  no longer be submitted for a grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1927
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1042
 msgid ""
 "The text box now contains the source of the original problem. You can "
 "recover lost edits by using the Back button on your browser."
 msgstr "tr: The text box now contains the source of the original problem. You can recover lost edits by using the Back button on your browser."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:214
+#. (			% . 'but the result will not be counted.')
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:23
 msgid ""
 "The time limit on this assignment was exceeded. The assignment may be "
-"checked, but the result will not be counted."
+"checked, "
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1657
+#: /opt/webwork/webwork2/conf/defaults.config:1559
 msgid ""
 "The time of the day that the assignment is due.  This can be changed on an "
 "individual basis, but WeBWorK will use this value for default when a set is "
@@ -6607,24 +8926,39 @@ msgid ""
 msgstr ""
 
 #. ($rename_oldCourseID, $rename_oldCourseTitle, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1443
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:689
 msgid "The title of the course %1 has been changed from %2 to %3"
 msgstr ""
 
-#. ($rename_newCourseID, $rename_newCourseTitle)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1491
+#. ($rename_newCourseID, $optional_arguments{courseTitle})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:722
 msgid "The title of the course %1 is now %2"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:167
+msgid ""
+"The top number is the percent score on the problem.  A period (.) indicates "
+"a problem has not been attempted. The bottom number is the number of "
+"incorrect attempts."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:25
+msgid ""
+"The total grade row at the bottom shows the total score and percent average "
+"over all open assignments.  The total grade row can be shown/hidden under "
+"general course configuration settings."
+msgstr ""
+
 #. ($enableReducedScoring)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1996
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1151
 msgid ""
 "The value %1 for enableReducedScoring is not valid; it will be replaced with"
 " 'N'."
 msgstr ""
 
 #. ($timeCap)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2032
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1209
 msgid ""
 "The value %1 for the capTimeLimit option is not valid; it will be replaced "
 "with '0'."
@@ -6632,81 +8966,90 @@ msgstr ""
 
 #. ($hideScore)
 #. ($hideScoreByProblem)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2018
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2023
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1178
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1189
 msgid ""
 "The value %1 for the hideScore option is not valid; it will be replaced with"
 " 'N'."
 msgstr ""
 
 #. ($hideWork)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1200
 msgid ""
 "The value %1 for the hideWork option is not valid; it will be replaced with "
 "'N'."
 msgstr ""
 
 #. ($relaxRestrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2045
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1235
 msgid ""
 "The value %1 for the relaxRestrictIP option is not valid; it will be "
 "replaced with 'No'."
 msgstr ""
 
 #. ($restrictIP)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2037
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1221
 msgid ""
 "The value %1 for the restrictIP option is not valid; it will be replaced "
 "with 'No'."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:46
+msgid "The visible name/title of the achievement."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:36
 msgid ""
 "The webwork server must be able to write to these directories. Please "
 "correct the permssion errors."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1537
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:83
+msgid "Theme"
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1439
 msgid "Theme (refresh page after saving changes to reveal new theme.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/CodeMirrorEditor.pm:109
+#: /opt/webwork/webwork2/templates/HTML/CodeMirrorEditor/controls.html.ep:5
 msgid "Theme:"
 msgstr ""
 
 # Context is "Sort by ____ Then by _____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:775
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:843
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:872
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep:30
 msgid "Then by"
 msgstr "tr: Then by"
 
-#. ($count_line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:603
+#. ($listingsCount)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:116
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:52
 msgid "There are %1 matching WeBWorK problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1625
+#: /opt/webwork/webwork2/conf/defaults.config:1527
 msgid ""
 "There are currently two hardcopy themes to choose from: One Column and Two "
 "Columns.  The Two Columns theme is the traditional hardcopy format.  The One"
 " Column theme uses the full page width for each column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2979
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1519
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
 "least one table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1243
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:23
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
-"least one table.  They can only be removed when upgrading the course."
+"least one table.  They can be removed when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2844
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1404
 msgid ""
 "There are extra database fields which are not defined in the schema for at "
 "least one table. Check the checkbox by the field to delete it when upgrading"
@@ -6714,63 +9057,48 @@ msgid ""
 "is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2973
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1508
 msgid "There are extra database tables which are not defined in the schema."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2833
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1389
 msgid "There are extra database tables which are not defined in the schema. "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1234
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:15
 msgid ""
 "There are extra database tables which are not defined in the schema.  These "
 "can be deleted when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:601
-msgid "There are no matching WeBWorK problems"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:976
-msgid "There are no set definition files in this course to look at."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2199
-msgid ""
-"There are tables or fields missing from the database.  The database must be "
-"upgraded before archiving this course."
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:29
+msgid "There are many options available at the bottom:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4108
-msgid "There are upgrades available for the Open Problem Library."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:49
+msgid "There are no completed versions of this test."
 msgstr ""
 
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4072
-msgid ""
-"There are upgrades available for your current branch of PG from branch %1 in"
-" remote %2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:51
+msgid "There are no matching WeBWorK problems"
 msgstr ""
 
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4010
-msgid ""
-"There are upgrades available for your current branch of WeBWorK from branch "
-"%1 in remote %2."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep:8
+msgid "There are no set definition files in this course to look at."
 msgstr ""
 
 #. ($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:273
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:87
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
 "their name, you destroy all of the data for achievement %1 for this student."
 msgstr ""
 
-#. (CGI::span({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:230
+#. (tag('span', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:91
 msgid ""
 "There is NO undo for this function.  Do not use it unless you know what you "
 "are doing!  When you unassign a student using this button, or by unchecking "
@@ -6778,37 +9106,29 @@ msgid ""
 "student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:205
-msgid ""
-"There is NO undo for this function.  Do not use it unless you know what you "
-"are doing!  When you unassign sets using this button, or by unchecking their"
-" set names, you destroy all of the data for those sets for this student."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:234
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:68
 msgid "There is NO undo for unassigning a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:174
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:177
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:139
-msgid "There is NO undo for unassigning students."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4069
-msgid "There is a new version of PG available."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:125
+msgid ""
+"There is NO undo for unassigning sets. Do not do so unless you know what you"
+" are doing!  When you unassign sets by unchecking set names and clicking "
+"save, you destroy all of the data for those sets for this student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4007
-msgid "There is a new version of WeBWorK available."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:21
+msgid "There is NO undo for unassigning students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:529
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:490
 msgid "There is a written solution available."
 msgstr ""
 
 #. ($message_file, $merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:50
 msgid ""
 "There is no additional grade information.  A message about additional grades"
 " can go in [TMPL]/email/%1. It is merged with the file [Scoring]/%2. These "
@@ -6817,185 +9137,324 @@ msgid ""
 msgstr ""
 
 #. ($continueTimeLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:486
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:25
 msgid ""
 "There is no time remaining on the currently open test. Click continue below "
 "and then click \"Grade Test\" within %1 seconds to submit the test for a "
 "grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:856
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:65
 msgid "There is no undo for deleting files or directories!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:534
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:495
 msgid ""
 "There is no written solution available for this problem, but you can still "
 "view the correct answers."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:537
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:498
 msgid "There is no written solution available for this problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1539
-msgid ""
-"There is one main theme to choose from: math4. It has two variants, "
-"math4-green and math4-red. The theme specifies a unified look and feel for "
-"the WeBWorK course web pages."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2270
+#: /opt/webwork/webwork2/conf/defaults.config:1441
 msgid ""
-"There may be something wrong with this question. Please inform your "
-"instructor including the warning messages below."
+"There is one main theme to choose from: math4. It has three variants: "
+"math4-green, math4-red, and math4-yellow. The theme specifies a unified look"
+" and feel for the WeBWorK course web pages."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:441
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator if this recurs."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:173
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:284
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:307
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:475
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:484
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:511
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:543
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:219
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:336
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:388
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:174
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:294
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:318
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:354
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:492
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:536
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:575
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:172
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:189
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:201
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:212
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:227
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:355
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:365
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:402
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:447
 msgid ""
 "There was an error during the login process.  Please speak to your "
 "instructor or system administrator."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1935
+#. ('href="https://webwork.maa.org/wiki/Set_Definition_Files"
+#. target="Webworkdocs"')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:48
+msgid ""
+"These are stored in the templates directory. The format of <strong>Set "
+"Definition files</strong> is described in the <a %1>Set Definition "
+"specification</a>. Set definition files are mainly useful for transferring "
+"set assignments from one course to another and are created when exporting a "
+"problem set from the \"Hmwk Sets Editor\".  Each set defintion file contains"
+" a list of problems used and the dates and times. These definitions can be "
+"imported into the current course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:77
+msgid ""
+"These are the files from which problems are generated and are located in the"
+" templates directory or in subdirectories. They can be edited directly using"
+" the \"Edit\" link on each problem page or from the \"Hmwk Sets Editor\". "
+"The File Manager allows you to upload or download these files. \tDirectories"
+" that start with \"set\" contain pg files and are generated when exporting a"
+" problem set in which there are local versions of a problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:40
+msgid ""
+"These options will only be shown if the user has the permission to change "
+"display settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:44
+msgid ""
+"These problems require some application of algorithms, but do not rise to "
+"the level of a full word problem. For example, \"Identify the local extrema "
+"for f(x) = ...\". One has to apply algorithms and interpret results."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1837
 msgid ""
 "These users and higher get the \"Show Past Answers\" button on the problem "
 "page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:17
 msgid "This action can take a long time if there are many students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:168
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:12
 msgid "This action will not overwrite existing users."
 msgstr ""
 
-#. (CGI::b($r->maketext("Guest Login")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:279
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:20
+msgid ""
+"This allows for the viewing, downloading, uploading and other management of "
+"files in the course.  Select a file or set of files (using CTRL or SHIFT) "
+"and click the desired button on the right.  Many actions can only be done "
+"with a single file (like view). Selecting a directory or set of files and "
+"clicking \"Make Archive\" creates a compressed tar file with the name "
+"COURSE_NAME.tgz"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:34
+msgid ""
+"This browses the Open Problem Library (OPL) in category "
+"(Subject/Chapter/Section) form. Select the desired categories (all three do "
+"not need to be selected) and click \"View Problems\". If the \"Include "
+"Contrib\" box is selected then those problems in the Contrib section of the "
+"OPL that have the categories defined are also included. Contrib problems are"
+" problem that haven't been vetted as thoroughly as OPL problems. If you want"
+" hints or solutions included while browsing select the appropriate box."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:49
+msgid ""
+"This button is also present both at top and the bottom of the page. Discards"
+" all changes, reloading the page by re-reading the database information for "
+"this set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:39
+msgid ""
+"This button is present both at top and the bottom of the page. Any and all "
+"changes made to any part of the set will be saved with one important "
+"exception: When editing the set for one or more students, you can choose to "
+"override the default value (defined for the set in general) by clicking on "
+"the checkbox and providing a value (or possibly leaving blank) and checking "
+"the override checkbox. If you do <strong>NOT</strong> check the checkbox, "
+"the override value will be discarded and the default value for the set will "
+"be used for the users currently being edited."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:105
+msgid ""
+"This can computed from the answer sub scores above using the weights shown "
+"if they are modified.  Alternatively, enter the point score you want saved "
+"here (the above sub scores will be ignored)."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:2005
+msgid ""
+"This configures if the single problem manual grader has inputs to enter "
+"problem scores as a percent, a point value, or both. Note, the problem score"
+" is always saved as a percent, so when using a point value, the problem "
+"score will be rounded to the nearest whole percent."
+msgstr ""
+
+#. (tag('b', maketext('Guest Login')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:72
 msgid ""
 "This course supports guest logins. Click %1 to log into this course as a "
 "guest."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:851
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:58
+msgid ""
+"This determines if MathQuill answer blanks are enable for the user. This "
+"option is only present if MathQuill is enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:63
+msgid ""
+"This determines if the MathView equation editor button will be appended to "
+"text answer blanks. his option is only present if MathView is enabled for "
+"the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:52
+msgid ""
+"This determines whether or not saved past answers are automatically filled "
+"in to the problem form when a student returns to a problem after having left"
+" the problem. This option is only visible if the user has the permission to "
+"show old answers."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:85
+msgid ""
+"This directory is accessible from the web. You can use it to store html "
+"documents or image documents that are used by the course. Do not store "
+"private information in this directory or in any subdirectory thereof. These "
+"documents can be linked to from within problems using the htmlLink macro."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:255
+msgid "This file is a template. You may use \"Save As\" to create a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementUserEditor.html.ep:20
+msgid ""
+"This form can assign, unassign, and edit user data for a single achievement."
+"  You can assign the achievement to all current users or select which users "
+"to assign the achievement to and click Save.  You can unassign the "
+"achievement by unchecking a student's name (note all data will be deleted)."
+"  To unassign the achievement from all users, first select \"Allow "
+"unassign\" and then click the \"Unassign from All Users\" button. You can "
+"also toggle the earned status with the checkbox in the \"Earned\" column and"
+" edit the achievement counter for counting achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:19
+msgid ""
+"This gives the status and dates of the main set. Indvidual students may have"
+" different settings."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:51
 msgid "This homework set contains no problems."
 msgstr "Bu soru grubunda soru bulunmamaktad谋r."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1231
 msgid "This homework set is closed."
 msgstr "Bu soru grubu kapal谋."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1986
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1229
 msgid "This homework set is not yet open."
 msgstr "Bu soru grubu hen眉z a莽谋k de臒il."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:932
-msgid ""
-"This is a blank problem template file and can not be edited directly. Use "
-"the 'NewVersion' action below to create a local copy of the file and add it "
-"to the current problem set."
-msgstr ""
-
-#: /opt/webwork/pg/macros/problemRandomize.pl:406
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:423
 msgid "This is a new (re-randomized) version of the problem."
 msgstr ""
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:580
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:109
 msgid ""
 "This is a timed test. You will have %quant(%1,hour) and %quant(%2,minute) to"
 " complete the test."
 msgstr ""
 
-#. ($hours,							$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:592
+#. ($hours,					$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:119
 msgid ""
 "This is a timed test. You will have "
 "%quant(%1,hour,hours,)%quant(%2,minute,minutes,) to complete the test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:284
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:81
 msgid ""
-"This is the Achievement Editor.  It is used to edit the achievements "
-"available to students.  Please keep in mind the following facts: Achievments"
-" are displayed, and evaluated, in the order they are listed. The \"secret\" "
-"category creates achievements which are not visible to students until they "
-"are earned.  The \"level\" category is used for the achievements associated "
-"to a users level."
+"This is done by first entering the user as a student and then changing the "
+"permission level of the user. First edit the user by clicking on the pencil "
+"next to their name (or using the technique above for several users), then "
+"change their permssion level -- an entry blank at the far right of the "
+"screen, you may have to scroll to see it. The permission levels are"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:481
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:156
 msgid ""
-"This is the classlist editor page, where you can view and edit the records "
-"of all the students currently enrolled in this course.  The top of the page "
-"contains forms which allow you to filter which students to view, sort your "
-"students in a chosen order, edit student records, give new passwords to "
-"students, import/export student records from/to external files, or "
-"add/delete students.  To use, please select the action you would like to "
-"perform, enter in the relevant information in the fields below, and hit the "
-"\"Take Action!\" button at the bottom of the form.  The bottom of the page "
-"contains a table containing the student usernames and their information. "
-"Clicking on the links in the column headers of the table will sort the table"
-" by the field it corresponds to. The Login Name fields contain checkboxes "
-"for selecting the user.  Clicking the link of the name itself will allow you"
-" to act as the selected user.  There is also an edit link following the name"
-" which will take you to a page where you can edit the selected user's "
-"information.  Clicking the emails will allow you to email the corresponding "
-"user.  Clicking the links in the entries in the assigned sets columns will "
-"take you to a page where you can view and reassign the sets for the selected"
-" user. "
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page if you wish to assign a homework set to all students or a large group "
+"of students (e.g. a section)."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1810
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:161
 msgid ""
-"This is the default number of attempts before show me another becomes "
-"available to students.  It can be set to -1 to disable show me another by "
-"default."
+"This is done from the \"Hmwk Sets Editor\" or from the \"Instructor Tools\" "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:171
+msgid ""
+"This is done from the \"Hmwk Sets Editor\" page or the \"Instructor tools\" "
+"page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:71
+msgid ""
+"This is most easily done by importing a class list. The class list can be "
+"uploaded from your workstation to the server using the File Manager page. "
+"The class list must be a file ending in .lst and must have a specific <a "
+"href=\"http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files\">format</a>."
+" Once the file has been uploaded to the server the file will appear in the "
+"import action pop-up list (5th action). demoCourse.lst is available for most"
+" courses and adds the \"practice users\" which activate guest logins to the "
+"class list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:23
+msgid ""
+"This is the administration course which is used to manage courses on this "
+"server.  Use the \"Admin Menu\" to select the desired action."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1996
+msgid ""
+"This is the default number of attempts a student must make before hints will"
+" be shown to the student. Set this to -1 to hide hints.  Note that this can "
+"be overridden with a per problem setting."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:456
+#: /opt/webwork/webwork2/conf/defaults.config:1712
 msgid ""
-"This is the homework sets editor page where you can view and edit the "
-"homework sets that exist in this course and the problems that they contain. "
-"The top of the page contains forms which allow you to filter which sets to "
-"display in the table, sort the sets in a chosen order, edit homework sets, "
-"publish homework sets, import/export sets from/to an external file, score "
-"sets, or create/delete sets.  To use, please select the action you would "
-"like to perform, enter in the relevant information in the fields below, and "
-"hit the \"Take Action!\" button at the bottom of the form.  The bottom of "
-"the page contains a table displaying the sets and several pieces of relevant"
-" information. The Edit Set Data field in the table contains checkboxes for "
-"selection and a link to the set data editing page.  The cells in the Edit "
-"Problems fields contain links which take you to a page where you can edit "
-"the containing problems, and the cells in the edit assigned users field "
-"contains links which take you to a page where you can edit what students the"
-" set is assigned to."
+"This is the default number of attempts before show me another becomes "
+"available to students.  It can be set to -1 to disable show me another by "
+"default."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1699
+#: /opt/webwork/webwork2/conf/defaults.config:1601
 msgid ""
 "This is the number of achievement points given to each user for completing a"
 " problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SingleProblemGrader.pm:166
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:150
 msgid ""
 "This is the only part of the score that is actually saved. This is computed "
 "from the answer sub scores above using the weights shown if they are "
@@ -7003,142 +9462,314 @@ msgid ""
 " scores will be ignored)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:388
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:19
+msgid "This is the standard entry point for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:92
 msgid ""
-"This is the past answer viewer.  Students can only see their answers, and "
-"they will not be able to see which parts are correct.  Instructors can view "
-"any users answers using the form below and the answers will be colored "
-"according to correctness."
+"This is where email messages and templates are saved. You can upload or "
+"download files in this directory if you wish to save the files for later."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2462
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:77
+msgid ""
+"This is where you edit the text of the problem template. Type Ctrl-Enter "
+"while this window has focus to re-render the problem."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:669
 msgid ""
 "This is your last submission.  If you say yes, then your answers will be "
 "final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2466
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:673
 msgid ""
 "This is your only submission.  If you say yes, then your answers will be "
 "final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3038
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:42
+msgid ""
+"This link gives details for many macros. It links to documentation embedded "
+"in the macro files themselves."
+msgstr ""
+
+#. ('PGMLLab/PGML-lab.pg')
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:63
+msgid ""
+"This links to a WeBWorK \"problem\" which allows you to try out fragments of"
+" PGML code. This link will not be available if the file %1 is not located in"
+" the templates directory of the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:33
+msgid "This links to a list of problem authoring techniques."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:39
+msgid "This links to a page describing Math Object usage."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:72
+msgid "This links to problem authoring information on the WeBWorK wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:46
+msgid ""
+"This may be Mathjax, images, or plainText. Only the options that are enabled"
+" for the course will be available to select. This option is only visible if "
+"there is more than one display mode enabled for the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:42
+msgid "This option shows all pg problems in the course directory structure."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:47
+msgid ""
+"This option shows all problems in set definition files that are located in "
+"the course directory."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:44
+msgid ""
+"This option shows all problems in sets that have been created in the course."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:20
+msgid ""
+"This page allows one to edit the contents of PG problem files as well as set"
+" headers and other files."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:20
+msgid ""
+"This page allows users to change their password, email address, and display "
+"settings used in problems. Note that you can hide this page entirely for "
+"students by setting permission levels to login_proctor or higher for the "
+"permissions to change password, change e-mail address, and change display "
+"settings used in pg problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorConfig.html.ep:20
+msgid ""
+"This page allows you to configure course settings such as permission levels,"
+" display modes allowed, default display mode, email feedback behavior, and "
+"much more."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Achievements.html.ep:20
+msgid ""
+"This page displays a student's current achievement level and progress toward"
+" the next level, and lists the rewards and badges that the student has "
+"earned. If rewards have been earned, then the student may also redeem those "
+"rewards."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:26
+msgid ""
+"This page gives access to information about the student, independent of the "
+"homework sets assigned to them."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorLTIUpdate.html.ep:20
+msgid ""
+"This page gives information about mass LTI grade updates, and allows you to "
+"trigger a grade update for all users and all sets, all sets for one user, "
+"all users for one set, or one user for one set.  When a user is selected, "
+"the sets drop down menu is updated to only allow selecting sets assigned the"
+" selected user.  Similarly when a set is selected, the user menu is updated "
+"to only allow selecting valid users."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:20
+msgid ""
+"This page is a collection of tools to modify users and sets.  These tools "
+"are short cuts for common actions that allow selecting multiple users or "
+"sets to act on at once.  Because multiple users and sets can be acted on at "
+"the same time, it is often more efficient to use this page when modifying "
+"multiple items.  For example, after selecting several users and a set you "
+"can change the close date for all selected users for that set.  This page "
+"also gives access to \"View/Edit all sets for one user\", which can be used "
+"to access settings for all sets including test versions for that user."
+msgstr ""
+
+#. (q(table to save any changes.  Each student's name links to that student's
+#. problem and opens up the)
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:20
+msgid ""
+"This page is for manually grading a problem for all assigned students.  The "
+"table of students shows their last answers, percent score, and feedback "
+"comment.  The \"Save\" button is located below the "
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:20
+msgid ""
+"This page is used to browse problems that will be used to fill problem sets."
+" The first step is to choose which set you are working on. If you need to "
+"create a new problem set fill in the blank next to the \"Create a New Set in"
+" This Course\" button and then press the button. Then choose which set you "
+"want to work on in the drop down menu."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:20
+msgid ""
+"This page is useful for monitoring student progress on assignments. Student "
+"progress can either be viewed for a single set or for a single student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:20
+msgid ""
+"This page manages all of the homework sets (including quizzes/tests). The "
+"following allow editing directly of a single problem set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Grades.html.ep:20
+msgid ""
+"This page shows the student's current grades for all sets they are assigned "
+"to.  Only visible sets are shown to the student, while invisible set names "
+"are italic when viewed as an instructor.  Students can only see the per "
+"problem grades on open assignments."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3169
 msgid "This problem contains a video which must be viewed online."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:602
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:631
 msgid "This problem has more than one part."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2059
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2293
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1323
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1576
 msgid ""
 "This problem has open subproblems.  You can visit them by using the links to"
 " the left or visiting the set page."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem.html.ep:66
+msgid "This problem is not valid."
+msgstr ""
+
 #. ($prettyID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2619
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:399
 msgid "This problem uses the same source file as number %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:538
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:418
 msgid "This problem will not count towards your grade."
 msgstr "这道题目不算成绩"
 
-#. ($EMAIL)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:1109
+#. ($ur->email_address)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:1
 msgid "This sample mail would be sent to %1"
 msgstr ""
 
-#. (join('.',@seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2088
+#. (join('.', @seq)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1399
 msgid ""
 "This score for this problem does not count for the score of problem %1 or "
 "for the set."
 msgstr ""
 
-#. ($message_file,		$merge_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:167
+#. ($message_file,				$merge_file)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:127
 msgid ""
 "This scoring message is generated from [TMPL]/email/%1. It is merged with "
 "the file [Scoring]/%2. These files can be edited using the \"Email\" link "
 "and the \"File Manager\" link in the left margin."
 msgstr ""
 
-#. (CGI::strong({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2215
+#. (tag('strong', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:155
 msgid "This set %1 is assigned to %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2932
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:678
 msgid "This set doesn't contain any problems yet."
 msgstr ""
 
-#. ($beginReducedScoringPeriod, $dueDate, $reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:334
+#. ($c->formatDateTime($reduced_scoring_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:44
 msgid ""
 "This set had a reduced scoring period that started on %1 and ended on %2.  "
 "During that period all work counted for %3% of its value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:78
 msgid ""
 "This set has a set-level proctor password to authorize logins. Enter the "
 "password below."
 msgstr ""
 
-#. (CGI::span({class=>$visiblityStateClass}, $visiblityStateText)
-# Context is "This set is visible" or "This set is hidden"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:532
-msgid "This set is %1"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:411
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:59
 msgid "This set is hidden from students."
 msgstr ""
 
 #. ($reducedScoringPerCent)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:330
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:40
 msgid ""
 "This set is in its reduced scoring period.  All work counts for %1% of its "
 "value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:65
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:51
+msgid "This set is not assigned to any students."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:57
 msgid "This set is visible to students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:190
-msgid "This set needs to be assigned to you before you can grade it."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:42
+msgid "This set or problem is not valid."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:158
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:164
 msgid ""
 "This set will be unavailable to students until they have earned a certain "
-"score on the sets specified in this field.  The sets should be written as a "
-"comma separated list.  The minimum score required on the sets is specified "
-"in the following field."
+"score on the sets specified in this field. The sets should be written as a "
+"comma separated list. The minimum score required on the sets is specified in"
+" the following field."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:111
+msgid ""
+"This should be done cautiously. Once a student is deleted from a course "
+"their data is lost forever and cannot be recovered. They can be added to the"
+" course as a new student, but all of their homework set assignments and "
+"homework has been permanently deleted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2007
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1962
 msgid "This source file does not exist!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1961
 msgid "This source file is a directory!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2008
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1963
 msgid "This source file is not a plain file!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2005
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1960
 msgid "This source file is not readable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:358
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+msgid ""
+"This specifies the number of attempts before hints are shown to students. "
+"The value of -2 uses the default from course configuration. The value of -1 "
+"disables hints. Note that this will only have an effect if the problem has a"
+" hint."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:430
 msgid ""
 "This specifies the rerandomization period: the number of attempts before a "
 "new version of the problem is generated by changing the Seed value. The "
@@ -7146,134 +9777,175 @@ msgid ""
 "disables rerandomization."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:651
-msgid ""
-"This table lists the current attempts for this test/quiz, along with its "
-"status, score, start date, and close date. Click on the version link to "
-"access that version. "
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:626
-msgid "This test is closed."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:548
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:81
 msgid "This test requires a proctor password to continue."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:600
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:126
 msgid "This test requires a proctor password to start."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2248
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2323
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:45
+msgid "This will determine if the output is in one or two columns."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:21
 msgid "Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:249
 msgid "Time Interval for New Test Versions (min; 0=infty)"
 msgstr ""
 
-#. ($elapsedTime,$allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:159
+msgid "Time Remaining"
+msgstr ""
+
+#. ($c->{elapsedTime}, sprintf('%.0f', 10 * ($c->{set}->due_date -
+#. $c->{set}->open_date)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:336
 msgid "Time taken on test: %1 min (%2 min allowed)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:222
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:220
 msgid "Timestamp"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1610
+#: /opt/webwork/webwork2/conf/defaults.config:1512
 msgid "Timezone for the course"
 msgstr ""
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:512
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:330
 msgid "To access this set you must score at least %1% on set %2."
 msgstr ""
 
-#. (sprintf("%.0f",$restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:514
+#. (sprintf('%.0f', $restriction)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:336
 msgid ""
 "To access this set you must score at least %1% on the following sets: %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:53
 msgid ""
 "To add an additional instructor to the new course, specify user information "
 "below. The user ID may contain only numbers, letters, hyphens, periods "
 "(dots), commas,and underscores."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:512
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:42
 msgid ""
 "To add the WeBWorK administrators to the new course (as administrators) "
 "check the box below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:239
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:118
+msgid ""
+"To assign one or more sets to an individual student click in the column "
+"\"Assigned Sets\" in the student's row. This will take you to a page where "
+"you can assign and unassign homework sets and change the due dates for "
+"homework on an individual basis."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:79
 msgid ""
 "To change status (scores or grades) for this student for one set, click on "
 "the individual set link."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:621
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:106
 msgid ""
-"To copy problem templates from an existing course, select the course below."
+"To copy the templates and html folders from an existing course, select the "
+"course below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2200
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:102
+msgid ""
+"To drop a student or students, select them for editing as described above "
+"and then set the pop-up list to enrolled,drop, or audit. Dropped students "
+"cannot log in to the course, are not assigned new homework sets and are not "
+"sent e-mail. They can be re-enrolled simply by changing their status back to"
+" enrolled. No data is lost, any homework sets assigned before they were "
+"dropped are restored unchanged."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:143
 msgid ""
 "To edit a specific student version of this set, edit (all of) her/his "
 "assigned sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:376
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:29
 msgid ""
-"To edit this text you must first make a copy of this file using the "
-"'NewVersion' action below."
+"To perform an action select the desired action tab and click the submit "
+"button."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:381
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:90
+msgid "To this Problem"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:69
 msgid ""
-"To edit this text you must use the 'NewVersion' action below to save it to "
-"another file."
+"To use the Email merge feature, upload a CSV with calculated grades to the "
+"scoring directory using the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1343
-msgid "To this Problem"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:767
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:58
+msgid "Today"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:33
+msgid "Toggle each of the options to include or not include in the output."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:522
+msgid "Top Score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:118
+msgid "Top level of author information on the wiki."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:114
+msgid "Total Points"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/cheevobigbox.html.ep:18
 msgid "Total Points:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:90
 msgid "Totals"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:290
 msgid "Totals only (not problem scores)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:275
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:291
 msgid "Totals only, only after answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:577
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:236
 msgid "Transfer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:213
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:234
+#: /opt/webwork/pg/macros/parsers/parserPopUp.pl:284
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:22
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/boolean.pm:35
 msgid "True"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1279
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:245
 msgid "Try it"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:26
 msgid "Tunic of Extension"
 msgstr ""
 
@@ -7281,209 +9953,340 @@ msgstr ""
 msgid "Two Columns"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1470
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:30
 msgid "Type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2250
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2325
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:84
+msgid "Type:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:23
 msgid "URI"
 msgstr ""
 
 #. ($achievementName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:627
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:297
 msgid "Unable to change the evaluator for set %1. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:819
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1084
+msgid "Unable to change the hardcopy header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{setID})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1070
+msgid "Unable to change the set header for set %1. Unknown error."
+msgstr ""
+
+#. ($c->{fullSetID}, $c->{prettyProblemNumber})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1110
+msgid ""
+"Unable to change the source file path for set %1, problem %2. Unknown error."
+msgstr ""
+
+#. ($c->shortPath($delFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1246
+msgid "Unable to delete backup file \"%1\"."
+msgstr ""
+
+#. ($formatBackupTime)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:571
+msgid "Unable to delete backup from %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:888
+msgid "Unable to make \"%1\" the hardcopy header for %2."
+msgstr ""
+
+#. ($c->shortPath($sourceFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:860
+msgid "Unable to make \"%1\" the set header for %2."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:693
 msgid "Unable to obtain error messages from within the PG question."
 msgstr ""
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:384
-msgid "Unable to write to '%1': %2"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:275
+msgid "Unable to open a temporary file at the given location."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2613
+#. ($c->shortPath($backupFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1233
+msgid "Unable to read backup file \"%1\"."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:193
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:636
+msgid "Unable to write to \"%1\": %2"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:15
 msgid "Unarchive"
 msgstr ""
 
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2596
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:4
 msgid "Unarchive %1 to course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2450
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2581
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep:46
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:40
 msgid "Unarchive Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2675
-msgid "Unarchive Next Course"
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:17
+msgid "Unarchive Course Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:25
+msgid "Unarchive Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:214
-msgid "Unassign All Sets"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1306
+msgid "Unarchive Next Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:281
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:239
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:97
 msgid "Unassign from All Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:61
 msgid "Unassign selected sets from selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:58
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:57
 msgid ""
-"Unassignments were not done.  You need to both click to \"Allow unassign\" "
-"and click on the Unassign button."
+"Unassignments were not done.  You need to select \"Allow unassign\" and then"
+" click on the Unassign button."
 msgstr ""
 
 #. ($unattempted, $num_of_problems)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1047
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:44
 msgid "Unattempted: %1/%2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:53
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:37
 msgid "Unclassified Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:242
 msgid "Ungraded"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3723
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3765
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:58
 msgid "Unhide Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1465
+#. ($saveMode)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1151
+msgid "Unkown saveMode: %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/AddNewTestGW.pm:28
 msgid ""
-"Unlock an additional version of a Gateway Test.  If used before the close "
-"date of the Gateway Test this will allow you to generate a new version of "
-"the test."
+"Unlock an additional version of a test.  If used before the close date of "
+"the test this will allow you to generate a new version of the test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:164
-msgid "Unpack"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:47
+msgid "Unpack Archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:113
 msgid "Unpack archives automatically"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2709
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:15
 msgid "Unselect all courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:130
-msgid "Update"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:63
+msgid "Update Display"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:671
-msgid "Update Display"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:84
+msgid "Update Grades"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:27
+msgid "Update Interval"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:930
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:102
 msgid "Update Menus"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:684
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:729
-msgid "Update settings and refresh page"
+#. ($prettySetID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:51
+msgid "Update aborted. Invalid set %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2695
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:47
+msgid "Update aborted. Invalid user %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:67
+msgid "Update set:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:8
 msgid "Update the checked directories?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3544
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:50
+msgid "Update user:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1908
 msgid "Updated location description."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2739
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2917
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:40
 msgid "Upgrade"
 msgstr ""
 
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1373
 msgid "Upgrade %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1327
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2278
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:97
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:79
 msgid "Upgrade Course Tables"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2693
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2761
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:382
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:59
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep:7
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:42
 msgid "Upgrade Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3010
+#: /opt/webwork/webwork2/templates/HelpFiles/AdminUpgradeCourses.html.ep:17
+msgid "Upgrade Courses Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:43
+msgid "Upgrade courses from a previous version of WeBWorK."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1582
 msgid "Upgrade process completed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:388
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:65
 msgid "Upload"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2441
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:72
+msgid ""
+"Upload, download and delete text files, including scoring spread sheets, set"
+" definition files, class list spread sheets, and \"PG\" problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:292
 msgid "Use Default Header File"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:325
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:352
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:127
 msgid "Use Equation Editor?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:204
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:20
 msgid "Use Reward"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2720
-msgid "Use System Default"
-msgstr "tr: Use System Default"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:516
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/preview.html.ep:27
 msgid "Use browser back button to return from preview mode."
 msgstr ""
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:506
+#. (tag('b', $c->{achievementID})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:16
 msgid "Use in achievement %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:526
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep:23
 msgid "Use in new achievement:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:379
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:149
 msgid "Use live equation rendering?"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2028
+#: /opt/webwork/webwork2/conf/defaults.config:1929
 msgid "Use log base 10 instead of base <i>e</i>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2034
+#: /opt/webwork/webwork2/conf/defaults.config:1935
 msgid "Use older answer checkers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:234
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:123
+msgid ""
+"Use the \"Create\" and \"Delete\" actions to create or delete achievements. "
+"Note that deleting an achievement will delete all data associated to the "
+"achievement and cannot be undone."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:35
+msgid ""
+"Use the \"Merge file\" drop down menu to select which merge file to use, or "
+"select \"None\" to not use any merge file.  When a merge file is selected, "
+"the data for active students will be displayed above the \"Email Body\".  "
+"This will show you the structure of the merge file and the column variables "
+"associated with each column.  Data that is longer than 7 characters will be "
+"truncated, and the data can be scrolled up and down to see all rows."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorIndex.html.ep:28
+msgid ""
+"Use the \"Users\" and \"Sets\" forms to select which users and sets to act "
+"on.  Multiple items can be selected using ctrl-click or shift-click.  The "
+"action buttons are grouped into three categories.  The first is a set of "
+"actions that act on the selected users, the second is a set of actions that "
+"act on the selected sets, and the third is a set of actions for acting on a "
+"combination of sets and users.  If an invalid number of users or sets are "
+"selected, the action will not be preformed, and an error message will be "
+"placed on the page."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementEditor.html.ep:25
+msgid ""
+"Use the editor to edit the evaluator and the action form at the bottom to "
+"save the evaluator. You can either overwrite the current evaluator file or "
+"save as a new evaluator file."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:15
 msgid ""
 "Use the interface below to quickly access commonly-used instructor tools, or"
 " select a tool from the list to the left."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:332
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSetMaker.html.ep:26
+msgid ""
+"Use the options in the second box to pick a collection of problems decribed "
+"below. In each case, clicking \"View Problems\" will render a fixed number "
+"of problems (default of 20). After problems are shown, there will be options"
+" to show the next/previous batch of problems, add all problems to the target"
+" set (set at the top of the page) or clear the curent batch of problems."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:27
 msgid ""
 "Use this form to ask your instructor a question, to report a problem with "
 "the WeBWorK system, or to report an error in a problem you are attempting. "
@@ -7491,73 +10294,103 @@ msgid ""
 "system will be included."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:29
+msgid "Use this page to change your password."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:20
+msgid ""
+"Use this page to send emails to active (enrolled or auditing) students.  "
+"Emails can be sent to all active students or selected students.  Use the "
+"\"Students\" form to sort, filter, or format how the user name is displayed."
+"  Click \"Change Display Settings\" to apply any changes.  Use control-click"
+" or shift-click to select multiple students to email."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:67
+msgid ""
+"Used for \"counting\" achievements, which sets the value a counter must "
+"reach in order to earn the achievement. For example this is used counting "
+"the number of completed problems."
+msgstr ""
+
+#. (param('user')
+#. (param('effectiveUser')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:7
+msgid "User \"%1\" not found."
+msgstr ""
+
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:781
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:324
 msgid ""
-"User '%1' will not be copied from admin course as it is the initial "
+"User \"%1\" will not be copied from admin course as it is the initial "
 "instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:557
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:219
-msgid "User ID"
+#. ($userID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:34
+msgid "User %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:298
-msgid "User Settings"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:217
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:64
+msgid "User ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:490
-msgid "User Value"
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:230
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:28
+msgid "User Settings"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:52
-msgid "User has been assigned to all current sets."
+#: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:17
+msgid "User Settings Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:58
-msgid "User has been unassigned from all sets."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:576
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:13
+msgid "User overrides"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:247
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:62
 msgid "User's name is:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm:68
-msgid "User's sets have been reassigned."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:60
 msgid "User's username is:"
 msgstr ""
 
 #. ($user, $setID, $j)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1077
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
 msgid ""
 "UserProblem missing for user=%1 set=%2 problem=%3. This may indicate "
 "database corruption."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:230
+#: /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:51
 msgid "Username"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:499
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm:126
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:272
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:405
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:9
 msgid "Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/URLPath.pm:384
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:339
 msgid "Users Assigned to Set %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:2077
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep:17
+msgid "Users Assigned to Set Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:65
 msgid "Users List"
 msgstr "用户列表"
 
-#: /opt/webwork/webwork2/conf/defaults.config:1925
+#: /opt/webwork/webwork2/conf/defaults.config:1827
 msgid ""
 "Users at this level and higher are allowed to change display settings used "
 "in pg problems.Note that if it is expected that there will be students that "
@@ -7566,31 +10399,31 @@ msgid ""
 "those students may need to disable MathQuill."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1915
+#: /opt/webwork/webwork2/conf/defaults.config:1817
 msgid ""
 "Users at this level and higher are allowed to change their e-mail address. "
 "Normally guest users are not allowed to change the e-mail address since it "
 "does not make sense to send e-mail to anonymous accounts."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1879
+#: /opt/webwork/webwork2/conf/defaults.config:1781
 msgid ""
 "Users at this level and higher are allowed to change their password. "
 "Normally guest users are not allowed to change their password."
 msgstr ""
 
-#. ($names{$primary}, $names{$secondary}, $names{$ternary})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:924
+#. ($c->maketext(FIELD_PROPERTIES()
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:316
 msgid "Users sorted by %1, then by %2, then by %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1906
+#: /opt/webwork/webwork2/conf/defaults.config:1808
 msgid ""
 "Users with at least this permission level get a link in the left panel for "
 "reporting bugs to the bug tracking system at bugs.webwork.maa.org."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2140
+#: /opt/webwork/webwork2/conf/defaults.config:2051
 msgid ""
 "Users with this permssion level or greater will automatically be sent "
 "feedback from students (generated when they use the \"Contact instructor\" "
@@ -7599,157 +10432,225 @@ msgid ""
 "permission level to \"nobody\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1348
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:193
 msgid "Uses Math Objects"
 msgstr ""
 
-#. ($default_msg_file)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:197
-msgid "Using contents of the default message %1 instead."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1239
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:18
 msgid "Using what display mode?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1214
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep:6
 msgid "Using what seed?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:781
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:19
+msgid "Using which hardcopy format?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:49
+msgid "Using which hardcopy theme?"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:31
+msgid ""
+"Usually means students must demonstrate understanding of facts. This is more"
+" than regurgitating the fact. We use this category for simple and direct "
+"applications of algorithms the student has studied. There should be no "
+"judgement involved in choosing the method. This would include a simple "
+"application of a rule for differentiation (e.g., can combine rules for sums "
+"and constant multiples with one more advanced rule) or for integrals."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:103
 msgid "Value"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1747
+#: /opt/webwork/webwork2/conf/defaults.config:1649
 msgid "Value of work done in Reduced Scoring Period"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:687
-msgid "Variable Documentation:"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config/config_help.html.ep:20
+msgid "Variable Documentation"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:115
+msgid "Version"
 msgstr ""
 
 #. ($ver->{version})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:679
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:173
 msgid "Version %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:658
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:159
 msgid "Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2059
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:43
 msgid "Versions of a set can only be edited for one user at a time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:157
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:363
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:128
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2419
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2756
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:275
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:528
 msgid "View"
 msgstr "tr: View"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1000
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:488
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:523
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:681
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:948
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:6
 msgid "View Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:276
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:57
+msgid "View details of student perofrmance either by individual or by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:86
 msgid "View equations as"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:283
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:18
 msgid "View statistics by set"
 msgstr "tr: View statistics by set"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:288
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:19
 msgid "View statistics by student"
 msgstr "tr: View statistics by student"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:298
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:55
+msgid ""
+"View statistics of students' performance on homework either by individual or"
+" by set."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:14
 msgid "View student progress by set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:303
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:15
 msgid "View student progress by student"
 msgstr "tr: View student progress by student"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:320
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:403
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:65
 msgid "View/Edit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2364
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:224
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:90
-msgid "Viewing temporary file:"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:120
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:104
+msgid "View/Reload"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:766
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:790
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:31
+msgid "View/access current and archived courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:146
+msgid "Viewing Problems in a New Window"
+msgstr ""
+
+#. ($c->{problem}->source_file)
+#. ($screenSetHeader)
+#. ($course_info_path)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1611
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:81
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:109
+msgid "Viewing temporary file: %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:25
 msgid "Visibility"
 msgstr "tr: Visibility"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:915
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:7
 msgid "Visible"
 msgstr "tr: Visible"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1455
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:622
 msgid "Visible sets were selected for export."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:128
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
 msgid "Visible to Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2269
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:844
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "Warning"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2319
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:13
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:117
 msgid "Warning messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1039
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:259
+msgid "Warning messages:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all set-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1035
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:3
 msgid "Warning: Deletion destroys all user-related data and is not undoable!"
 msgstr "tr: Warning: Deletion destroys all user-related data and is not undoable!"
 
-#. ($problem_desc , CGI::br()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1397
+#. ($problem_desc,				$c->tag('br')
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1194
 msgid "Warnings encountered while processing %1. Error text: %2"
 msgstr ""
 
-#. ($copyright_years, $theme, $ww_version, $pg_version)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:1261
-msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4 |"
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:39
+msgid ""
+"We use this for carrying out more complicated algorithms, such as "
+"derivatives using both the product and chain rule or integrals which involve"
+" say both a substitution and parts."
+msgstr ""
+
+#. ($ce->{WW_COPYRIGHT_YEARS} || '1996-2023',              $ce->{defaultTheme}
+#. || 'unknown -- set defaultTheme in localOverides.conf',
+#. $ce->{WW_VERSION}         || 'unknown -- set WW_VERSION in VERSION',
+#. $ce->{PG_VERSION}         || 'unknown -- set PG_VERSION in ../pg/VERSION')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/footer.html.ep:9
+msgid "WeBWorK &copy; %1 | theme: %2 | ww_version: %3 | pg_version %4"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2227
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:3
 msgid "WeBWorK Error"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2317
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:3
 msgid "WeBWorK Warnings"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1549
+#: /opt/webwork/webwork2/conf/defaults.config:1451
 msgid ""
 "WeBWorK currently has translations for the languages listed in the course "
 "configuration."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2229
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:20
+msgid ""
+"WeBWorK does not have a full featured scoring ability. We leave that to your"
+" favorite spreadsheet application."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:38
+msgid ""
+"WeBWorK expects many files to be in certain locations.  The following "
+"describe this. Note that by default the File Manager shows the \"templates\""
+" directory.  Other directories mentioned below are at the same level and "
+"need to be accessed by going up a directory by clicking the \"^\" button "
+"above the file list."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:6
 msgid ""
 "WeBWorK has encountered a software error while attempting to process this "
 "problem. It is likely that there is an error in the problem itself. If you "
@@ -7758,7 +10659,7 @@ msgid ""
 " more information."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:2318
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:6
 msgid ""
 "WeBWorK has encountered warnings while processing your request. If this "
 "occured when viewing a problem, it was likely caused by an error or "
@@ -7768,19 +10669,19 @@ msgid ""
 " warning output below for more information."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:577
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:558
 msgid ""
 "WeBWorK was unable to generate a different version of this problem.  Close "
 "this tab, and return to the original problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:367
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:29
 msgid ""
 "WeBWorK was unable to generate a paper copy of this homework set.  Please "
 "inform your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:78
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:76
 msgid ""
 "WeBWorK will automatically create users when logging in via the LMS for the "
 "first time. If this flag is enabled then it will also keep the user account "
@@ -7790,36 +10691,44 @@ msgid ""
 "next time the user logs in."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:320
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:370
 msgid "Weight"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Home.pm:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:6
 msgid "Welcome to WeBWorK!"
 msgstr "欢迎来到WebWorK!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:1413
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:24
+msgid ""
+"What WeBWorK does have is good support for summarizing the scores on WeBWorK"
+" homework sets and tests and exporting them in a form (.csv) which any "
+"spreadsheet can use. WeBWorK reports all of the homework grades with options"
+" shown below."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/Surprise.pm:27
 msgid "What could be inside?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:715
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:17
 msgid "What field should filtered users match on?"
 msgstr "tr: What field should filtered users match on?"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397
 msgid ""
 "When a student has more attempts than is specified here they will be able to"
 " view another version of this problem.  If set to -1 the feature is disabled"
 " and if set to -2 the course default is used."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1899
+#: /opt/webwork/webwork2/conf/defaults.config:1801
 msgid ""
 "When acting as a student, this permission level and higher can submit "
 "answers for that student."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2071
+#: /opt/webwork/webwork2/conf/defaults.config:1972
 msgid ""
 "When numerical answers are checked, most test if the student's answer is "
 "close enough to the programmed answer be computing the error as a percentage"
@@ -7828,7 +10737,7 @@ msgid ""
 "0.1 means 0.1 percent error is allowed.</p>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:2098
+#: /opt/webwork/webwork2/conf/defaults.config:2019
 msgid ""
 "When students click the <em>Email Instructor</em> button to send feedback, "
 "WeBWorK fills in the subject line.  Here you can set the subject line.  In "
@@ -7838,14 +10747,32 @@ msgid ""
 "recitation</li><li>%% = literal percent sign</li></ul>"
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1638
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:35
+msgid ""
+"When the class is very large not all students will be displayed. Using the "
+"first action on this page you can show only the students from a given "
+"recitation or from a given section, or only students whose login or last "
+"name fits a pattern match. The second action will sort the students "
+"currently being displayed. You can also sort the displayed students by "
+"clicking on the active links at the top of each column."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorSendMail.html.ep:56
+msgid ""
+"When the message is ready to send, click \"Send Email\". This will queue the"
+" email to be sent, which can take several minutes depending on the number of"
+" students selected.  You will be notified by email once all the emails have "
+"been sent."
+msgstr ""
+
+#: /opt/webwork/webwork2/conf/defaults.config:1540
 msgid ""
 "When this is on students will see a line on the Grades page which has their "
 "total cumulative homework score.  This score includes all sets assigned to "
 "the student."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/LTIConfigValues.config:90
+#: /opt/webwork/webwork2/conf/LTIConfigValues.config:88
 msgid ""
 "When this is true, then when a user enters WeBWorK from an external tool "
 "link in the LMS, the bottom of the screen will display the data that the LMS"
@@ -7853,23 +10780,56 @@ msgid ""
 "different LMS systems have different parameters."
 msgstr ""
 
-#: /opt/webwork/webwork2/conf/defaults.config:1957
+#: /opt/webwork/webwork2/conf/defaults.config:1859
 msgid ""
 "When viewing a problem, WeBWorK usually puts the previously submitted answer"
 " in the answer blank.  Below this level, old answers are never shown.  "
 "Typically, that is the desired behaviour for guest accounts."
 msgstr ""
 
-#. (CGI::b($achievementID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm:178
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:30
+msgid ""
+"When viewing progress for a single student, their grades page is shown which"
+" lists set totals and per problem grades for each set assigned to the "
+"student.  This shows the same information as the statistics page for the "
+"student."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:26
+msgid ""
+"When viewing set statistics, the drop down menus can be used to show stats "
+"for individual sections, recitations, or problems.  The overall results "
+"include all students who are assigned to the set, while the individual "
+"problem results only include active (have attempted the problem) students."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:24
+msgid ""
+"When viewing student progress for a set, the score for the set and the "
+"status for problems in the set are listed for all students.  The table can "
+"be sorted by clicking the links in the table header.  Click the student's "
+"name to access the student's set.  When viewing progress for a test, "
+"additional columns can be shown/hidden by updating the display at the top"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:74
+msgid ""
+"When you unassign a set from students, you destroy all of the data for the "
+"set for those students. If the set is re-assigned to these students, then "
+"they will receive new versions of problems in the set.  Make sure this is "
+"what you want to do before unassigning sets from students."
+msgstr ""
+
+#. (tag('b', $achievementID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:21
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for achievement %1 for this student. Make sure this is what you want to"
 " do."
 msgstr ""
 
-#. (CGI::b({ dir => 'ltr' }, format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm:146
+#. (tag('b', dir => 'ltr', format_set_name_display($setID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:26
 msgid ""
 "When you unassign by unchecking a student's name, you destroy all of the "
 "data for homework set %1 for this student. You will then need to reassign "
@@ -7877,7 +10837,7 @@ msgid ""
 "problems. Make sure this is what you want to do before unchecking students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:244
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:72
 msgid ""
 "When you uncheck a homework set (and save the changes), you destroy all of "
 "the data for that set for this student.   If you reassign the set, the "
@@ -7885,243 +10845,461 @@ msgid ""
 "you want to do before unchecking sets."
 msgstr ""
 
-#. ($self->formatDateTime($set->open_date,undef,$ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:343
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:87
+msgid "Wiki summary page for MathObjects"
+msgstr ""
+
+#. ($c->formatDateTime($set->open_date, undef,
+#. $ce->{studentDateDisplayFormat})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:444
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:167
 msgid "Will open on %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:805
+#: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:49
+msgid "Word problems"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:15
 msgid "Worth"
 msgstr "De臒eri"
 
-#. ($self->shortPath($outputFilePath)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:382
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:51
+msgid "Write a new PG problem file or edit an existing one."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:188
+msgid ""
+"Write permissions have not been enabled for \"%1\".  Changes must be saved "
+"to another file for viewing."
+msgstr ""
+
+#. ($c->shortPath($outputFilePath)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:630
 msgid ""
-"Write permissions have not been enabled for '%1'.  Changes must be saved to "
-"another file for viewing."
+"Write permissions have not been enabled for \"%1\". Changes must be saved to"
+" another file for viewing."
 msgstr ""
 
-#. ($self->shortPath($currentDirectory)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:380
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:182
 msgid ""
-"Write permissions have not been enabled in '%1'.  Changes must be saved to a"
+"Write permissions have not been enabled in \"%1\".  Changes must be saved to"
+" a different directory for viewing."
+msgstr ""
+
+#. ($c->shortPath($currentDirectory)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:624
+msgid ""
+"Write permissions have not been enabled in \"%1\".Changes must be saved to a"
 " different directory for viewing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:178
 msgid ""
 "Write permissions have not been enabled in the templates directory.  No "
 "changes can be made."
 msgstr "tr: Write permissions have not been enabled in the templates directory.  No changes can be made."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2451
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1385
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:143
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:380
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2652
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2654
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2656
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:313
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:339
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:366
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:393
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:962
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:620
+msgid ""
+"Write permissions have not been enabled in the templates directory. No "
+"changes can be made."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:271
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:287
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:301
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:330
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:509
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:82
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:657
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:111
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:67
 msgid "Yes"
 msgstr "tr: Yes"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:500
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:454
 msgid ""
 "You are currently checking answers to a different version of your problem - "
 "these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:511
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:470
 msgid ""
 "You are currently previewing answers to a different version of your problem "
 "- these will not be recorded, and you should remember to return to your "
 "original problem once you are done here."
 msgstr ""
 
-#. ($userSet->set_id, $r->connection->remote_ip)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:270
+#. ($ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:18
+msgid ""
+"You are in the Reduced Scoring Period.  All work counts for %1% of the "
+"original."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:183
+msgid "You are not allowed to act as a student."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:188
+msgid "You are not allowed to assign homework sets."
+msgstr ""
+
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:383
+msgid "You are not allowed to delete %1."
+msgstr ""
+
+#. ($userSet->set_id, $c->tx->remote_address)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:261
 msgid ""
 "You are not allowed to generate a hardcopy for %1 from your IP address, %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2049
-msgid "You are not authorized to access the Instructor tools."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:185
+msgid "You are not allowed to modify homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:191
+msgid "You are not allowed to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:4
+msgid "You are not allowed to send e-mail."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:2
+msgid "You are not authorized to access instructor tools"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:4
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:4
+msgid "You are not authorized to access instructor tools."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:9
+msgid "You are not authorized to assign homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:10
+msgid "You are not authorized to create or delete courses."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementEditor.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:2
+msgid "You are not authorized to edit achievements."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:388
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:271
-msgid "You are not authorized to access the instructor tools."
-msgstr "tr: You are not authorized to access the instructor tools."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:28
+msgid "You are not authorized to edit user specific information."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:37
+msgid "You are not authorized to grade homework sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:8
+msgid "You are not authorized to manage course files"
+msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:392
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:33
 msgid "You are not authorized to modify homework sets."
 msgstr "tr: You are not authorized to modify homework sets."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2053
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:35
 msgid "You are not authorized to modify problems."
 msgstr "tr: You are not authorized to modify problems."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:396
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:39
 msgid "You are not authorized to modify set definition files."
 msgstr "tr: You are not authorized to modify set definition files."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:338
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:15
 msgid "You are not authorized to modify student data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:395
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:11
+msgid "You are not authorized to modify student data."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:3
+msgid "You are not authorized to modify the course configuration."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:230
 msgid "You are not authorized to perform this action."
 msgstr "tr: You are not authorized to perform this action."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:260
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:11
+msgid "You are not authorized to score sets."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:13
+msgid "You are not authorized to send mail to students"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:11
+msgid "You are not authorized to update lti scores"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers.html.ep:8
+msgid "You are not authorized to view past answers"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:251
 msgid ""
 "You are not permitted to generate a hardcopy for a set with hidden work."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:245
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:236
 msgid "You are not permitted to generate a hardcopy for an unopened set."
 msgstr ""
 
-#. ($showMeAnother{MaxReps},					$solutionShown)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:559
+#. ($showMeAnother{MaxReps},						$solutionShown)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:532
 msgid ""
 "You are only allowed to click on Show Me Another %quant(%1,time,times) per "
 "problem. %2 Close this tab, and return to the original problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2051
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2070
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:246
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:265
 msgid "You are out of time!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:374
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:36
 msgid "You can also examine the following temporary files: "
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGanswermacros.pl:1692
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:108
+msgid ""
+"You can assign selected achievements to all users by using the \"Assign\" "
+"action action and selecting which achievements to assign.  You can select "
+"which users to assign/unassign to an achievement by clicking on the link in "
+"the \"Edit Users\" column."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1039
+msgid ""
+"You can change the file path for this problem manually from the \"Hmwk Sets "
+"Editor\" page"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/ProblemSets.html.ep:27
+msgid ""
+"You can check the boxes to the right of the sets and click \"Generate "
+"Hardcopy for Selected Sets\" to generate a PDF hardcopy of the selected "
+"sets. You can generate hardcopies for multiple users including their answers"
+" as well. Note that students will only be able to generate hardcopies of a "
+"single set at a time. Students will only be able to include answers in the "
+"hardcopy after the answer date."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:127
+msgid ""
+"You can delete problems by clicking the \"Delete it?\" check box and saving."
+" If the set is already active it is recommended that you instead use the "
+"\"Mark Correct?\" problem to mark a particular problem correct for all "
+"students."
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/PGanswermacros.pl:1616
 msgid "You can earn partial credit on this problem."
 msgstr "这一题你可以得到部分成绩"
 
-#: /opt/webwork/pg/macros/problemRandomize.pl:382
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:142
+msgid ""
+"You can edit a problem by clicking the \"Edit Problem\" icon to the right of"
+" the problem number. This will open the problem in the PG problem editor in "
+"a new tab or window."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:92
+msgid ""
+"You can edit a single achievement by clicking on the pencil icon next to the"
+" achievement ID.  You can edit multiple achievements by selecting which "
+"achievements to edit, then click the \"Edit\" button. You can edit all of "
+"the achievements by changing which achievements to edit form \"selected "
+"achievements\" to \"all achievements\", or click the checkbox next to the "
+"Achievement ID to select all achievements."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:44
+msgid ""
+"You can edit the class list data for a single student by clicking on the "
+"pencil icon next to their login name. To edit several students at once click"
+" on the \"Select\" checkbox next to their names, click on the radio button "
+"for editing selected users and then click the \"Edit\" button. You can also "
+"edit all visible users (those students currently being displayed) or even "
+"all users in the course although this last option might take a long time to "
+"load for a large class."
+msgstr ""
+
+#: /opt/webwork/pg/macros/deprecated/problemRandomize.pl:397
 msgid "You can get a new version of this problem after the due date."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1368
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:101
+msgid ""
+"You can import/export from their respective action tab.  Exporting saves "
+"information about the achievement as a .axp file which is a CSV that lists "
+"each achievements information.  You can import .axp files that have been "
+"previously exported."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:769
 msgid "You can not specify an absolute path"
 msgstr ""
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1121
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:549
 msgid "You can only %1 one file at a time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:92
 msgid "You can only download regular files."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:591
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:197
 msgid "You can only edit text files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:908
-msgid "You can only unpack files ending in '.tgz', '.tar' or '.tar.gz'"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:374
+msgid "You can only unpack files ending in \".tgz\", \".tar\" or \".tar.gz\""
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:134
+msgid ""
+"You can render a problem by clicking the \"Render Problem\" icon to the "
+"right of the problem number. The display mode used to render the problem is "
+"chosen using the drop down menu. You can render all problems using the "
+"\"Render All\" button. \"Hide All\" will hide all rendered problems. It is "
+"also useful to collapse problem details when doing this, as it makes it "
+"easier to drag problems around."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:120
+msgid ""
+"You can reorder problems by clicking on the arrow icon and dragging the "
+"problem. You will see a box showing you where the problem will be placed. "
+"When problems are reordered any holes in the numbering will be filled in."
 msgstr ""
 
 #. ($showMeAnother{MaxReps} >= $showMeAnother{Count}
 #. ? ($showMeAnother{MaxReps} - $showMeAnother{Count})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1895
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:44
 msgid ""
 "You can use this feature %quant(%1,more time,more times,as many times as you"
 " want) on this problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:439
 msgid "You can't download directories"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:440
 msgid "You can't download files of that type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:584
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:192
 msgid "You can't edit a directory"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:528
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:160
 msgid "You can't view files of that type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2028
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:985
 msgid "You cannot archive the course you are currently using."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1712
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:850
 msgid "You cannot delete the course you are currently using."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1081
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:378
 msgid "You cannot delete yourself!"
 msgstr "你不能删除自己!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:579
 msgid "You did not specify a new set name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:262
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:232
 msgid "You didn't enter any message."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:312
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:303
 msgid "You do not have permission to access the requested file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:159
 msgid "You do not have permission to change the hardcopy theme."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:578
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:186
 msgid "You do not have permission to edit this file."
 msgstr ""
 
 #. ($hardcopy_format)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:151
 msgid "You do not have permission to generate hardcopy in %1 format."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1639
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1161
 msgid "You do not have permission to view the details of this error."
 msgstr "Bu hatan谋n detaylar谋n谋 g枚rmeye yetkiniz yok."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:92
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements.html.ep:13
 msgid "You don't have any Achievement data associated to you!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:237
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:51
 msgid "You don't have any rewards!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2109
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:325
 msgid "You exceeded the allowed time."
 msgstr ""
 
-#. ($numLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2082
+#. ($c->{numAttemptsLeft})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:277
 msgid "You have %1 attempt(s) remaining on this test."
 msgstr ""
 
-#. ($numLeft,						$numLeft - 1)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2458
+#. ($c->{numAttemptsLeft},								$c->{numAttemptsLeft} - 1)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:664
 msgid ""
 "You have %1 submissions remaining for this test.  If you say yes, then you "
 "will have %quant(%2,submission) remaining. Once all submissions have been "
@@ -8129,724 +11307,702 @@ msgid ""
 "work this test version."
 msgstr ""
 
-#. ($attemptsLeft)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2012
+#. ($problem->max_attempts - $attempts)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1270
 msgid "You have %negquant(%1,unlimited attempts,attempt,attempts) remaining."
 msgstr ""
 
 #. ($attempts_before_rr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1217
 msgid ""
 "You have %quant(%1,attempt,attempts) left before new version will be "
 "requested."
 msgstr ""
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:506
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:44
 msgid ""
 "You have %quant(%1,hour) and %quant(%2,minute) remaining to complete the "
 "currently open test."
 msgstr ""
 
-#. ($hours,								$minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:518
+#. ($hours,						$minutes)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:54
 msgid ""
 "You have %quant(%1,hour,hours,)%quant(%2,minute,minutes,) remaining to "
 "complete the currently open test."
 msgstr ""
 
-#. ($minutes,									$seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:529
+#. ($minutes,							$seconds)
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:64
 msgid ""
 "You have %quant(%1,minute) and %quant(%2,second) remaining to complete the "
 "currently open test."
 msgstr ""
 
 #. ($seconds)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:539
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:72
 msgid ""
 "You have %quant(%1,second) remaining to complete the currently open test."
 msgstr ""
 
 #. ($attempts)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2006
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1243
 msgid "You have attempted this problem %quant(%1,time,times)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Logout.pm:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Logout.html.ep:1
 msgid "You have been logged out of WeBWorK."
 msgstr "你已经登出WeBWorK."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2065
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:260
 msgid "You have less than 1 minute to complete this test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2046
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:241
 msgid "You have less than 45 seconds left!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2043
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:240
 msgid ""
 "You have less than 90 seconds left to complete this assignment. You should "
 "finish it soon!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1004
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:452
 msgid "You have not chosen a file to upload."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:845
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:7
 msgid "You have requested that the following items be deleted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1137
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:565
 msgid "You have specified an illegal file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1367
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:766
 msgid "You have specified an illegal path"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:520
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:13
+msgid "You have specified an illegal working directory!"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:481
 msgid ""
 "You may check your answers to this problem without affecting the maximum "
 "number of tries to your original problem."
 msgstr ""
 
-#. ($perm_multiuser ? "to privileged users or" : "")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:613
+#. ($multiuser ? 'to privileged users or' : '')
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:69
 msgid ""
 "You may choose to show any of the following data. Correct answers, hints, "
 "and solutions are only available %1 after the answer date of the homework "
 "set."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:63
+msgid "You may not change this user's password!"
+msgstr ""
+
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:646
 msgid "You may not change your answers when going on to the next part!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1831
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_row.html.ep:58
 msgid "You may not change your own password here!"
 msgstr "tr: You may not change your own password here!"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1132
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:515
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:560
 msgid "You may not follow symbolic links"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2134
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:350
 msgid "You may still check your answers."
 msgstr ""
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:172
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:143
+msgid ""
+"You may want to create an unattached problem if you are using the current "
+"problem as a model for a new problem. You can add the new file to a homework"
+" set from the Library Browser or via the set detail page of the Hmwk Sets "
+"Editor."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:165
+msgid ""
+"You might want to do this if you want to give full credit to everyone on a "
+"particular problem that was not worded correctly, or wasn't working "
+"properly. This is done from the \"Hmwk Sets Editor\" page or the "
+"\"Instructor Tools\" page."
+msgstr ""
+
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:8
 msgid "You must access assignments from your Course Management System (%1)."
 msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:67
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before Show Me Another "
-"is available."
+"You must attempt this problem %quant(%1,time) before this feature is "
+"available"
 msgstr ""
 
 #. ($showMeAnother{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1923
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:545
 msgid ""
-"You must attempt this problem %quant(%1,time,times) before this feature is "
-"available"
+"You must attempt this problem %quant(%1,time,times) before Show Me Another "
+"is available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:699
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:259
 msgid "You must confirm the password for the initial instructor."
 msgstr ""
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:368
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+#. ? $c->link_to(                                                  $ce->{LTI}{
+#. $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:195
 msgid "You must log into this set via your Learning Management System (%1)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:76
-msgid "You must provide a student ID, a set ID, and a problem number."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:979
+msgid "You must select a course to archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1361
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:585
 msgid "You must select a course to rename."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:351
 msgid "You must select at least one file for the archive"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:777
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:312
 msgid "You must select at least one file to delete"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:115
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:106
 msgid "You must select one or more sets for scoring!"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:749
 msgid "You must specify a %1 name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:682
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:242
 msgid "You must specify a course ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1710
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2026
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2561
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2777
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3787
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3865
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1213
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1255
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1326
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2086
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:848
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:983
 msgid "You must specify a course name."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:775
 msgid "You must specify a file name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:705
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:586
+msgid "You must specify a file name in order to save a new file."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:265
 msgid "You must specify a first name for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:708
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:268
 msgid "You must specify a last name for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1382
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:606
 msgid "You must specify a new institution for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1364
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:588
 msgid "You must specify a new name for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1379
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:603
 msgid "You must specify a new title for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:696
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:256
 msgid "You must specify a password for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:448
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:440
 msgid "You must specify a user ID."
 msgstr "Bir kullan谋c谋 ad谋 girmelisiniz."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:711
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:271
 msgid "You must specify an email address for the initial instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:331
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:138
 msgid "You must specify an file name in order to save a new file."
 msgstr "tr: You must specify an file name in order to save a new file."
 
 #. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:505
 msgid ""
-"You must use your Learning Managment System (%1) to access this set.  Try "
-"logging in to the Learning Managment System and visiting the set from there."
+"You must use your Learning Management System (%1) to access this set.  Try "
+"logging in to the Learning Management System and visiting the set from "
+"there."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1730
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:422
 msgid "You need to select a \"Target Set\" before you can edit it."
 msgstr ""
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1126
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:554
 msgid "You need to select a file to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1877
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:555
 msgid "You need to select a set definition file to view."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1853
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:537
 msgid "You need to select a set from this course to view."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1837
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:524
 msgid "You need to select a set to view."
 msgstr ""
 
-#. (wwRound(0, $problemResult->{score} * 100)
-#. (wwRound(0, $pg->{result}->{score} * 100)
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:289
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2007
+#. (wwRound(0,
+#. compute_reduced_score($ce, $problem, $set, $pg->{result}{score},
+#. $c->submitTime)
+#. (% wwRound(0, $rh_result->{problem_result}{score} * 100)
+#. (wwRound(0, $rh_result->{problem_result}{score} * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1251
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:48
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:29
 msgid "You received a score of %1 for this attempt."
 msgstr ""
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2075
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1363
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem and its graded subproblems."
 msgstr ""
 
-#. (join('.',@{$problemSeqs[$next_id]})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2078
+#. (join('.', @{ $problemSeqs[$next_id] })
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1375
 msgid ""
 "You will not be able to proceed to problem %1 until you have completed, or "
 "run out of attempts, for this problem."
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1343
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:740
 msgid "Your %1 name contains illegal characters"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1344
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:743
 msgid "Your %1 name may not begin with a dot"
 msgstr ""
 
 #. ($object)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1345
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:746
 msgid "Your %1 name may not contain a path component"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:540
-msgid ""
-"Your LTI OAuth verification failed.  If this recurs, please speak with your "
-"instructor"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:528
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:539
-msgid ""
-"Your authentication failed.  Please return to Oncourse and login again."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:229
-msgid ""
-"Your authentication failed.  Please try again. Please speak with your "
-"instructor if you need help."
-msgstr ""
-
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:3033
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:3162
 msgid "Your browser does not support the video tag."
 msgstr ""
 
-#. ($PGBranch, $PGRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4078
-msgid "Your current branch of PG is up to date with branch %1 in remote %2."
-msgstr ""
-
-#. ($WeBWorKBranch, $WeBWorKRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4016
-msgid ""
-"Your current branch of WeBWorK is up to date with branch %1 in remote %2."
-msgstr ""
-
-#. ($LibraryBranch, $LibraryRemote)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4113
-msgid "Your current branch of the Open Problem Library is up to date."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:134
 msgid "Your display options have been saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:195
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Options.pm:113
 msgid "Your email address has been changed."
 msgstr "你的电子邮件地址已经改变."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:1369
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:772
 msgid "Your file name contains illegal characters"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:118
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm:40
 msgid "Your file name is not valid! "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:285
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:16
 msgid "Your message was sent successfully."
 msgstr ""
 
-#. ($lastScore,$notCountedMessage)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:2010
+#. (wwRound(0, $problem->status * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1261
 msgid "Your overall recorded score is %1.  %2"
 msgstr ""
 
-#. ($versionNumber, wwRound(2,$recordedScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2107
-msgid "Your recorded score on this test (version %1) is %2/%3."
+#. ('<span id="test-recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:179
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:197
+msgid "Your recorded score for this version is %1/%2 (%3%)."
+msgstr ""
+
+#. ($setVersionID,                                         '<span id="test-
+#. recorded-score">' . wwRound(2, $c->{recordedScore})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:317
+msgid "Your recorded score on this test (version %1) is %2/%3 (%4%)."
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:603
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:634
 msgid "Your score for this attempt is for this part only;"
 msgstr ""
 
 #. ($testNounNum)
 # $testNounNum is either "test (#)" or "submission (#)"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1977
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:142
 msgid "Your score on this %1 WAS recorded."
 msgstr ""
 
-#. ($testNoun,$attemptScore,$totPossible)
+#. ($testNoun, $c->{attemptScore}, $c->{totalPossible})
 # $testNoun is either "test" or "submission"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1982
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:148
 msgid "Your score on this %1 is %2/%3."
 msgstr ""
 
 #. ($testNounNum)
 # $testNounNum is either "test (#)" or "submission (#)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1973
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:138
 msgid "Your score on this %1 was NOT recorded."
 msgstr ""
 
-#. ($attemptScore,$totPossible)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2019
+#. ($c->{attemptScore}, $c->{totalPossible})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:192
 msgid "Your score on this (checked, not recorded) submission is %1/%2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1617
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1963
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2277
-msgid "Your score on this problem was recorded."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1619
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1027
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:172
 msgid ""
 "Your score was not recorded because there was a failure in storing the "
 "problem record to the database."
 msgstr "Notunuz kaydedilemedi, 莽眉nk眉 notun veritaban谋na kayd谋 s谋ras谋nda bir hata olu艧tu."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:272
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:276
 msgid "Your score was not recorded because this homework set is closed."
 msgstr "Notunuz kaydedilemedi 莽眉nk眉 bu soru grubu kapal谋."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:283
 msgid ""
 "Your score was not recorded because this problem has not been assigned to "
 "you."
 msgstr "Notunuz kaydedilmedi 莽眉nk眉 bu soru size y枚neltilmedi."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1643
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1049
 msgid ""
 "Your score was not recorded because this problem set version is not open."
 msgstr ""
 
-#. ($elapsed, $allowed)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1658
+#. ($elapsed,                                              # Assume the
+#. allowed time is an even number of minutes.
+#. ($set->due_date - $set->open_date)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1063
 msgid ""
 "Your score was not recorded because you have exceeded the time limit for "
 "this test. (Time taken: %1 min; allowed: %2 min.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1052
 msgid ""
 "Your score was not recorded because you have no attempts remaining on this "
 "set version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:292
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1661
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1067
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:278
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:53
+#: /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:31
 msgid "Your score was not recorded."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1998
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:266
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:163
 msgid "Your score was not successfully sent to the LMS."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:166
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:170
 msgid "Your score was recorded."
 msgstr "Notunuz kaydedildi."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1997
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:255
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm:263
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:269
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:162
 msgid "Your score was successfully sent to the LMS."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:540
 msgid "Your session has timed out due to inactivity. Please log in again."
 msgstr "Oturumunuz zaman a艧谋m谋na u臒rad谋. L眉tfen tekrar giri艧 yap谋n谋z."
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:4126
-msgid "Your systems are up to date!"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1396
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1403
-msgid "[Edit]"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:824
-msgid "a duplicate of the first selected achievement."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:17
+msgid "a duplicate of the first selected achievement"
 msgstr ""
 
 # Context is "Create set ______ as a duplicate of the first selected set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:17
 msgid "a duplicate of the first selected set"
 msgstr "tr: a duplicate of the first selected set"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:823
-msgid "a new empty achievement."
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep:16
+msgid "a new empty achievement"
 msgstr ""
 
 # Context is "Create set ______ as a new empty set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1137
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep:16
 msgid "a new empty set"
 msgstr "tr: a new empty set"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1281
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:9
 msgid "a single set"
 msgstr "tr: a single set"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:429
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:130
 msgid "add problems"
 msgstr ""
 
 #. ($setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1751
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
 msgid "addGlobalSet %1 in ProblemSetList:  %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:456
-msgid "added missing permission level for user"
-msgstr ""
-
 # #short for administrator
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "admin"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1051
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:440
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:487
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:604
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:7
 msgid "all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:930
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1377
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:66
 msgid "all current users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:327
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:70
 msgid "all set dates for one <b>user</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:622
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1434
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:667
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:840
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:892
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:990
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1995
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:7
 msgid "all sets"
 msgstr "tr: all sets"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1981
 msgid "all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1256
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:701
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:946
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:997
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:5
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:6
 msgid "all users"
 msgstr "tr: all users"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:120
 msgid "all users for one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:23
 msgid "alphabetically"
 msgstr ""
 
-#. ($count,$numSets)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:626
+#. ($count, $numSets)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1999
 msgid "an impossible number of sets: %1 out of %2"
 msgstr ""
 
-#. ($count,$numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:606
+#. ($count, $numUsers)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1985
 msgid "an impossible number of users: %1 out of %2"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:647
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:658
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:610
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:621
 msgid "answer"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1189
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:30
 msgid "any users"
 msgstr "tr: any users"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:720
-msgid "avg attempts"
-msgstr ""
-
 # Context is "Append ____ blank problem template(s) to end of homework set"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2956
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:689
 msgid "blank problem template(s) to end of homework set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1638
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1935
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3705
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep:24
 msgid "by last login date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1166
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1552
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:598
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:688
 msgid "changes abandoned"
 msgstr "tr: changes abandoned"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1216
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1651
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:633
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:795
 msgid "changes saved"
 msgstr "tr: changes saved"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:345
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:80
 msgid "class list data for selected <b>users</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:211
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:31
 msgid "close"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:671
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "column"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:259
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:239
 msgid "correct"
 msgstr "正确"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:582
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:239
 msgid "course files"
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:458
 msgid "deleted %1 sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:457
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:152
 msgid "editing all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:857
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:333
 msgid "editing all sets"
 msgstr "tr: editing all sets"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:963
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:328
 msgid "editing all users"
 msgstr "编辑所有用户"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:860
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:336
 msgid "editing listed sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:459
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:154
 msgid "editing selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:339
 msgid "editing selected sets"
 msgstr "tr: editing selected sets"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:969
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:334
 msgid "editing selected users"
 msgstr "tr: editing selected users"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:966
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:331
 msgid "editing visible users"
 msgstr "tr: editing visible users"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:360
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:90
 msgid "email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:76
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:87
-msgid "email:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:558
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:42
 msgid "empty"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:672
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:10
 msgid "enter matching set IDs below"
 msgstr "tr: enter matching set IDs below"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:220
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:31
 msgid "entry rows."
 msgstr ""
 
 #. ($restrictLoc, $setName, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1761
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:904
 msgid "error adding set location %1 for set %2: %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1092
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1487
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:542
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:643
 msgid "export abandoned"
 msgstr "tr: export abandoned"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1068
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:527
 msgid "exporting all achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1071
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:530
 msgid "exporting selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:359
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:89
 msgid "first name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:747
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:72
 msgid "for"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:458
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:149
 msgid "for one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:367
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:381
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:103
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:94
 msgid "for one <b>user</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1014
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:349
 msgid "giving new passwords to all users"
 msgstr "tr: giving new passwords to all users"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1020
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:355
 msgid "giving new passwords to selected users"
 msgstr "tr: giving new passwords to selected users"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1017
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:352
 msgid "giving new passwords to visible users"
 msgstr "tr: giving new passwords to visible users"
 
 #. ($j, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1069
 msgid "global %1 for set %2 not found."
 msgstr ""
 
-#. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1146
-msgid "global set %1 not found."
-msgstr ""
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "grade_proctor"
 msgstr ""
@@ -8855,393 +12011,375 @@ msgstr ""
 msgid "guest"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1589
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1886
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2060
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:818
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:949
 msgid "hidden"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "hidden from"
 msgstr "g枚r眉nt眉lenmiyor"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "hidden from students"
-msgstr "tr: hidden from students"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:217
+msgid "homework"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:83
+msgid "html directory"
+msgstr ""
 
-#. ('j','k','_0')
-#. ('j','k')
+#. ('j', 'k', '_0')
+#. ('j', 'k')
 # doe snot need to be translated
-#: /opt/webwork/pg/lib/Parser/List/Vector.pm:35
-#: /opt/webwork/pg/lib/Value/Vector.pm:278
-#: /opt/webwork/pg/macros/contextLimitedVector.pl:93
+#: /opt/webwork/pg/lib/Parser/List/Vector.pm:39
+#: /opt/webwork/pg/lib/Value/Vector.pm:303
+#: /opt/webwork/pg/macros/contexts/contextLimitedVector.pl:95
 msgid "i"
 msgstr ""
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:773
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:840
 msgid "if"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1531
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1626
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:622
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:721
 msgid "illegal character in input: '/'"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/AttemptsTable.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/HTML/AttemptsTable.pm:246
 msgid "incorrect"
 msgstr "错误"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:441
 msgid "index"
 msgstr ""
 
 #. ($restrictLoc, $setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1764
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:911
 msgid "input set location %1 already exists for set %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:358
+#. ($userID)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:501
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:551
+msgid "insufficient permission to edit %1"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:220
+msgid "just-in-time"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:88
 msgid "last name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:841
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:893
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:9
 msgid "listed sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3169
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:87
 msgid "locations selected below"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:665
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:59
 msgid "login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:30
 msgid "login ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:364
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:94
 msgid "login name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:75
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:86
-msgid "login/studentID:"
-msgstr ""
-
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:89
 msgid "login_proctor"
 msgstr ""
 
 # Context is "Set _____ made visibile for _____ users"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:934
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:355
 msgid "made visible for"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:419
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:493
 msgid "max"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1282
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:10
 msgid "multiple sets"
 msgstr "tr: multiple sets"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:489
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:171
 msgid "new set:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:393
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:109
 msgid "new users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:603
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:6
 msgid "no achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:740
-msgid "no achievements."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:519
-msgid "no attempt recorded"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3170
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:86
 msgid "no location"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:620
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1056
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:668
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:891
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:989
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1993
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:6
 msgid "no sets"
 msgstr "tr: no sets"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:600
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1979
 msgid "no students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:931
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1169
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1190
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:702
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:31
 msgid "no users"
 msgstr "tr: no users"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:254
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject/permission.pm:26
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "nobody"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:791
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:114
 msgid "nth colum of merge file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:225
-msgid "number of students not defined"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2177
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:70
 msgid "of"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:424
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:128
 msgid "one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:556
-msgid "one <b>set</b> for  <b>users</b>"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:225
+msgid "one <b>set</b> for <b>users</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:540
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:211
 msgid "one <b>user</b> (on one <b>set</b>)"
 msgstr ""
 
 # Context is Assign this set to which users?  "only ____"
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1378
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:67
 msgid "only"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:599
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:17
 msgid "only best scores"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3472
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:357
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:448
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:88
 msgid "or"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:1141
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep:59
 msgid "or Problems from"
 msgstr ""
 
-#: /opt/webwork/pg/macros/contextPiecewiseFunction.pl:776
+#: /opt/webwork/pg/macros/contexts/contextPiecewiseFunction.pl:843
 msgid "otherwise"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:508
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:19
 msgid "overwrite"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:664
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:627
 msgid "part"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1383
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:499
 msgid "permissions for %1 not defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "point"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2326
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1426
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1435
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:370
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:539
 msgid "points"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:509
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:20
 msgid "preserve"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:2360
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:576
 msgid "preview answers"
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:653
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:616
 msgid "problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:632
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:41
 msgid "problems"
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:219
+msgid "proctored test"
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:90
 msgid "professor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:360
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:451
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:89
 msgid "progress"
 msgstr ""
 
 #. ($line)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:2212
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1095
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1409
 msgid "readSetDef error, can't read the line: ||%1||"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:363
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:93
 msgid "recitation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:654
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:53
 msgid "recitation #"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1381
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1454
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:497
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:549
 msgid "record for visible user %1 not found"
 msgstr ""
 
 #. ($restrictLoc)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1767
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:918
 msgid ""
 "restriction location %1 does not exist.  IP restrictions have been ignored."
 msgstr ""
 
-#: /opt/webwork/pg/macros/PGbasicmacros.pl:670
+#: /opt/webwork/pg/macros/core/PGbasicmacros.pl:633
 msgid "row"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:91
 msgid "score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:362
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:92
 msgid "section"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:643
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:47
 msgid "section #"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:77
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm:88
-msgid "section:"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:476
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:159
 msgid "selected <b>sets</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:524
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:197
 msgid "selected <b>users</b> to selected <b>sets</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:1052
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:441
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:488
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:605
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep:8
 msgid "selected achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:741
-msgid "selected achievements."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1057
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1436
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:669
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:842
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:894
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:991
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep:8
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep:8
 msgid "selected sets"
 msgstr "tr: selected sets"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1053
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1168
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1258
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:703
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:948
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:999
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:8
 msgid "selected users"
 msgstr "tr: selected users"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:624
-msgid "set"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm:628
-msgid "sets"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:671
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:12
 msgid "sets hidden from students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:670
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep:11
 msgid "sets visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:716
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:281
 msgid "showing all sets"
 msgstr "tr: showing all sets"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:763
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:277
 msgid "showing all users"
 msgstr "tr: showing all users"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:725
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:290
 msgid "showing matching sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:772
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:286
 msgid "showing matching users"
 msgstr "tr: showing matching users"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:719
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:284
 msgid "showing no sets"
 msgstr "tr: showing no sets"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:766
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:280
 msgid "showing no users"
 msgstr "tr: showing no users"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:722
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:287
 msgid "showing selected sets"
 msgstr "tr: showing selected sets"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:769
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:283
 msgid "showing selected users"
 msgstr "tr: showing selected users"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:735
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:299
 msgid "showing sets that are hidden from students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:732
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:296
 msgid "showing sets that are visible to students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:2179
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:72
 msgid "shown"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:162
 msgid "still open"
 msgstr ""
 
@@ -9249,16 +12387,16 @@ msgstr ""
 msgid "student"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
 msgid "submission"
 msgstr ""
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:133
 msgid "submission (version %1)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:672
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:499
 msgid "summary"
 msgstr ""
 
@@ -9266,135 +12404,130 @@ msgstr ""
 msgid "ta"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1950
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:90
+msgid "templates/email directory"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:95
+msgid "templates/macros directory"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:130
 msgid "test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:610
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:23
 msgid "test date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:621
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:29
 msgid "test time"
 msgstr ""
 
-#. ($forcedSourceFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:987
-msgid "the original path to the file is %1"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:469
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:119
 msgid "then delete them"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "time"
-msgstr "次"
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:442
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:165
 msgid "time limit exceeded"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1960
-msgid "times"
-msgstr "次"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:35
+msgid "time remaining"
+msgstr ""
 
 # Context is Assign ____ to _____
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:850
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:183
 msgid "to"
 msgstr ""
 
 #. ($ce->{institutionName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:548
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:399
 msgid "to %1 main web site"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:524
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:381
 msgid "to courses page"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:436
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:135
 msgid "to one <b>set</b>"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:764
-msgid "top score"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm:432
 msgid "total"
 msgstr ""
 
 #. ($ce->{webworkDirs}{logs})
 #. ($ce->{webworkDirs}{tmp})
 #. ($ce->{webworkDirs}{DATA})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:408
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:409
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:410
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin.html.ep:47
 msgid "unable to write to directory %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:333
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:939
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:383
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:49
 msgid "unlimited"
 msgstr "无限"
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Achievements.pm:191
+#: /opt/webwork/webwork2/templates/ContentGenerator/Achievements/achievement_items.html.ep:14
 msgid "unlimited reusability"
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIBasic.pm:609
-msgid "userID: %1 --"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:652
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:259
 msgid ""
 "username, last name, first name, section, achievement level, achievement "
 "score,"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:704
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep:10
 msgid "users who match on selected field"
 msgstr "tr: users who match on selected field"
 
-#. ($versionNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1952
-msgid "version (%1)"
+#. ($set->version_id)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:295
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:296
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:408
+msgid "version %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1591
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1888
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:3648
-msgid "visible"
+#. ($setVersionID)
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:134
+msgid "version (%1)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:531
-msgid "visible to students"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2062
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:820
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:951
+msgid "visible"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1167
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1257
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:947
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:998
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/export_form.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/password_form.html.ep:7
 msgid "visible users"
 msgstr "tr: visible users"
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:470
-#: /opt/webwork/pg/macros/compoundProblem.pl:480
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:485
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:500
 msgid "when you submit your answers"
 msgstr ""
 
 #. ($dir, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:1673
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:1532
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:813
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:623
 msgid "won't be able to read from file %1/%2: does it exist? is it readable?"
 msgstr ""
 
-#: /opt/webwork/pg/macros/compoundProblem.pl:604
+#: /opt/webwork/pg/macros/core/compoundProblem.pl:638
 msgid "your overall score is for all the parts combined."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:231
 msgid "your students"
 msgstr ""
diff --git a/lib/WeBWorK/NPL.pm b/lib/WeBWorK/NPL.pm
deleted file mode 100644
index 607386c5c7..0000000000
--- a/lib/WeBWorK/NPL.pm
+++ /dev/null
@@ -1,620 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-# 
-# Contributed by W.H. Freeman; Bedford, Freeman, and Worth Publishing Group.
-################################################################################
-
-package WeBWorK::NPL;
-use base 'Exporter';
-
-=head1 NAME
-
-WeBWorK::NPL - Parse formats used by the National Problem Library.
-
-=head1 SYNOPSIS
-
-	use WeBWorK::NPL qw/read_textbooks read_tags format_tags gen_find_tags/;
-	
-	open TEXTS, "<", "Textbooks";
-	my $textbooks = [];
-	read_textbooks(\*TEXTS, $textbooks);
-	
-	open PGFILE, "<", "file.pg";
-	my $tags = {};
-	read_tags(\*PGFILE, $tags);
-	
-	foreach my $string (format_tags($tags)) {
-		$string =~ s/^/## /gm;
-		print "TAG: $string\n";
-	}
-	
-	use File::Find;
-	my $process = sub { print "Found: $_[0]\n" };
-	my $wanted = gen_find_tags({author=>'Rogawski'}, $process);
-	find({wanted=>$wanted}, @ARGV);
-
-=head1 DESCRIPTION
-
-This package contains parsing routines for the various data formats associated
-with the National Problem Library.
-
-=cut
-
-use strict;
-use warnings;
-use Data::Dumper;
-
-our @EXPORT_OK = qw(
-	read_textbooks
-	read_tags
-	format_tags
-	gen_find_tags
-);
-
-our @global_fields = qw(DESCRIPTION KEYWORDS DBsubject DBchapter DBsection Date
-Institution Author UsesAuxiliaryFiles);
-our @textbook_fields = qw(title edition author chapter section problem);
-
-our %tag2field = ( TitleText => "title", EditionText => "edition",
-AuthorText => "author", Section => "section", Problem => "problem", );
-our %field2tag = reverse %tag2field;
-
-=head1 FUNCTIONS
-
-=head2 read_textbooks
-
-	read_textbooks($fh, $arrayref)
-
-Reads a Textbooks file opened for reading on $fh and appends its contents to
-$arrayref. Each item appended to $arrayref is a reference to a hash containing
-the following keys:
-
-	_title      The title of the textbook
-	_edition    The edition of the textbook
-	_author     The author of the textbook
-	1           The name of chapter 1
-	1.1         The name of section 1.1
-	1.2         The name of section 1.2
-	...
-	2           The name of chapter 2
-	2.1         The name of section 2.1
-	...
-
-Since the number of sections in a textbook is typically small, it is not terribly
-inefficient to pull chapters or sections out:
-
-	@chapters = grep { /^\d+$/ } keys %textbook;
-	@sections = grep { /^\d+\.\d+$/ } keys %textbook;
-
-=cut
-
-sub read_textbooks {
-	my ($fh, $result) = @_;
-	
-	my %curr_textbook;
-	
-	while (<$fh>) {
-		s/#.*$//g;
-		next unless /\S/;
-		s/^\s*//;
-		s/\s*$//;
-		
-		if (/^(TitleText|EditionText|AuthorText)\(\s*'(.*?)'\s*\)/) {
-			my $field = $tag2field{$1};
-			my $value = $2;
-			if (exists $curr_textbook{"_$field"}) {
-				# repeated tag -- this is a new textbook
-				push @$result, {%curr_textbook};
-				%curr_textbook = ();
-			}
-			$curr_textbook{"_$field"} = $value;
-		} elsif (/^(\d+)(?:\.(\d+))?\s*>>>\s*(.*)$/) {
-			my $chapter = $1;
-			my $section = $2;
-			my $name = $3;
-			if (defined $section and length $section > 0) {
-				$curr_textbook{"$chapter.$section"} = $name;
-			} else {
-				$curr_textbook{$chapter} = $name;
-			}
-		}
-	}
-	push @$result, {%curr_textbook};
-}
-
-=head2 read_tags
-
-	read_tags($fh, $hashref, $extra_editing_info);
-
-Reads the NPL tags from a PG file opened for reading on $fh and stores the tags
-in %$hashref. The following keys may be added to %$hashref:
-
-	DESCRIPTION
-	KEYWORDS
-	DBsubject
-	DBchapter
-	DBsection
-	Date
-	Institution
-	Author
-	UsesAuxiliaryFiles      (experimental, subject to change)
-	textbooks               (arrayref)
-
-The value for the C<textbooks> key will be a reference to an array of textbook
-hashes containing the textbook tags from the source file. In each textbook hash,
-entries with empty values (e.g. C<TitleText1('')>) will be omitted. This is to
-deal with the large number of empty-valued tags in the NPL. The keys of each
-textbook hash will be among:
-
-	title
-	edition
-	author
-	chapter
-	section
-	problem        (arrayref)
-
-The value for the C<problem> key will be a reference to an array of problem
-numbers.
-
-If $extra_editing_info is true, special hash items _pos, _rest, and _maxtextbook
-will also be added to %$hashref.
-
-_pos will contain the position of the first byte of the next line after the last
-tag in the file. _rest will contain the bytes of the "rest" of the file, after
-all tags, starting at _pos. _maxtextbook will contain the highest number used to
-identify a textbook in the file. (e.g. If TitleText1 and TitleText3 appear in
-the  file, there will only be two items in the textbooks array, but _maxtextbook
-will be 3.)
-
-This is useful for appending tags to a file which contains existing tags, where
-the new tags should appear immediately after the existing tags:
-
-	open PGFILE, "+<", "file.pg";
-	my $tags = {};
-	read_tags(\*PGFILE, $tags, 1);
-	my $pos = $tags{_pos};
-	my $rest = $tags{_rest};
-	seek PGFILE, $pos, 0;
-	print PGFILE "## SomeNewTag('foo','bar')\n";
-	print PGFILE $rest;
-	close PGFILE;
-
-=cut
-
-sub read_tags {
-	my ($file, $result, $extra_editing_info) = @_;
-	
-	my $fh;
-	if (ref $file) {
-		$fh = $file;
-	} elsif (defined $file and not ref $file) {
-		$fh = new IO::File($file, 'r');
-	}
-	
-	my $pos;
-	my $rest = '';
-	my $maxtextbook;
-	while (<$fh>) {
-		#if (0) {
-		if (/^(.*?\#.*?)(\s*)DESCRIPTION/) {
-			my $prefix = $1;
-			my $whitespace = $2;
-			my $description = '';
-			while (<$fh>) {
-				if (/\#.*ENDDESCRIPTION/) {
-					chomp $description;
-					$result->{DESCRIPTION} = $description if length $description > 0;
-					last;
-				} else {
-					# handle prefix and whitespace separately so that we can still
-					# chop the prefix off even if people are being careless about
-					# whitespace. :P
-					s/^$prefix//;
-					s/^$whitespace//;
-					$description .= $_;
-				}
-			}
-			if ($extra_editing_info) {
-				$pos = tell $fh;
-				$rest = '';
-			}
-		} elsif (/\#.*KEYWORDS\((.*)\)/) {
-			my $keywords = $1;
-			push @{$result->{KEYWORDS}}, parse_keywords($keywords);
-			if ($extra_editing_info) {
-				$pos = tell $fh;
-				$rest = '';
-			}
-		} elsif (/\#.*(DBsubject|DBchapter|DBsection|Date|Institution|Author)\(\s*(.*?)\s*\)/) {
-			my $field = $1;
-			my $value = $2;
-			my ($parsed_value, $parse_errors) = parse_normal_value($field, $value);
-			if (@$parse_errors) {
-				warn "error while parsing value \"$value\" in field $field:\n"
-					. join('', @$parse_errors)
-					. "value may be incomplete. use with caution.\n"
-					. "(line $. of file $file)\n";
-			}
-			$result->{$field} = $parsed_value;
-			if ($extra_editing_info) {
-				$pos = tell $fh;
-				$rest = '';
-			}
-		} elsif (/\#.*(TitleText|EditionText|AuthorText|Section|Problem)(\d+)\(\s*'(.*?)'\s*\)/) {
-			my $field = $tag2field{$1};
-			my $num = $2;
-			my $value = $3;
-			next unless $value =~ /\S/;
-			$value = [ parse_problems($value) ] if $field eq "problem";
-			if ($field eq "section") {
-				my ($ch, $sec) = split /\./, $value;
-				$result->{textbooks}[$num]{chapter} = $ch;
-				$result->{textbooks}[$num]{section} = $sec if defined $sec and length $sec > 0;
-			} else {
-				$result->{textbooks}[$num]{$field} = $value;
-			}
-			if ($extra_editing_info) {
-				$pos = tell $fh;
-				$rest = '';
-				$maxtextbook = $num if not defined $maxtextbook or $num > $maxtextbook;
-			}
-		} elsif (/\#.*(UsesAuxiliaryFiles)\(\s*(.*?)\s*\)/) {
-			my $field = $1;
-			my $value = $2;
-			my ($parsed_value, $parse_errors) = parse_normal_list($field, $value);
-			if (@$parse_errors) {
-				warn "error while parsing list value \"$value\" in field $field:\n"
-					. join('', @$parse_errors)
-					. "value may be incomplete. use with caution.\n"
-					. "(line $. of file $file)\n";
-			}
-			$result->{$field} = $parsed_value;
-			if ($extra_editing_info) {
-				$pos = tell $fh;
-				$rest = '';
-			}
-		} else {
-			if ($extra_editing_info) {
-				$rest .= $_;
-			}
-		}
-	}
-	
-	# remove holes in textbook numbering
-	@{$result->{textbooks}} = grep { defined } @{$result->{textbooks}};
-	delete $result->{textbooks} unless @{$result->{textbooks}};
-	
-	if ($extra_editing_info) {
-		$result->{_pos} = $pos;
-		$result->{_rest} = $rest;
-		$result->{_maxtextbook} = $maxtextbook;
-	}
-}
-
-sub parse_normal_list {
-	my ($name, $string) = @_;
-	
-	use constant NRM=>0;
-	use constant STR=>1;
-	use constant ESC=>2;
-	use constant STP=>3;
-	my $state = NRM;
-	my @errors;
-	my @items;
-	my $curr_item = '';
-	my $next_item = 0;
-	foreach my $i (0 .. length($string)-1) {
-		my $c = substr($string,$i,1);
-		#print "i=$i c=$c state=$state curr_item=$curr_item next_item=$next_item\n";
-		# state changes
-		if ($state == NRM) {
-			if ($c eq "'") {
-				$state = STR;
-			} elsif ($c eq ',' or $c eq ' ') {
-				# do nothing -- closequote already consumed curr_item
-			} else {
-				push @errors, 
-					"illegal char '$c' in state NRM while parsing value for $name.\n"
-					. "    $string\n"
-					. '    ' . ' 'x$i . "^\n";
-				$next_item = 1;
-				$state = STP;
-			}
-		} elsif ($state == STR) {
-			if ($c eq "'") {
-				$state = NRM;
-				$next_item = 1;
-			} elsif ($c eq '\\') {
-				$state = ESC;
-			} else {
-				$curr_item .= $c;
-			}
-		} elsif ($state == ESC) {
-			$curr_item .= $c;
-			$state = STR;
-		} elsif ($state == STP) {
-			last;
-		} else {
-			die "unexpected state $state while parsing value for $name.\n";
-		}
-		#print "i=$i c=$c state=$state curr_item=$curr_item next_item=$next_item\n";
-		# actions
-		if ($next_item) {
-			push @items, $curr_item;
-			$curr_item = '';
-			$next_item = 0;
-			#print "stored item to list\n";
-		}
-	}
-	
-	return \@items, \@errors;
-}
-
-sub parse_normal_value {
-	my ($name, $string) = @_;
-	my ($items, $errors) = parse_normal_list($name, $string);
-	push @$errors, "only one item allowed in value for $name.\n" if @$items > 1;
-	return shift @$items, $errors;
-}
-
-# this now works for keywords is embedded spaces (which are later stripped out
-# by kwtidy) but now it doesn't work for values with double quotes or no quotes!
-sub parse_keywords {
-	my $string = shift;
-	my ($items, $errors) = parse_normal_list('KEYWORDS', $string);
-	if (@$errors) {
-		warn "errors while parsing KEYWORDS list:\n@$errors\n"
-			. "Partially-parsed KEYWORDS: @$items\n"
-			. "Resorting to old-style KEYWORDS parsing...\n";
-		@$items = split /(?:,|\s)+/, $string;
-		warn "Old-style parse result: ", join('|', @$items), "\n";
-	}
-	return map { kwtidy($_) } @$items;
-}
-
-sub kwtidy {
-	my $keyword = shift;
-	$keyword =~ s/\W//g;
-	$keyword =~ s/_//g;
-	return lc $keyword;
-}
-
-sub parse_problems {
-	my $string = shift;
-	$string =~ s/\D/ /g;
-	return grep { /\S/ } split /\s+/, $string;
-}
-
-=head2 format_tags
-
-	format_tags($tags, $mintextbook);
-
-Given a reference to a hash of tags, return a list of strings representing said
-tags. The strings do not begin with the standard NPL comment prefix ("## ") or
-end with newlines. These must be added by the caller if the strings are to be
-inserted into a PG source file.
-
-One complication is the DESCRIPTION field, which contains embedded newlines. If
-a DESCRIPTION tag occurs in %$tags, it will be formatted with embedded newlines
-but without a trailing newline. For example, after this code executes,
-
-	$tags = { DESCRIPTION => "line one\nline two\nline three" };
-	($desc) = format_tags($tags);
-
-$desc will contain the string:
-
-	"DESCRIPTION\nline one\nline two\nline three\nENDDESCRIPTION"
-
-To account for this when writing to a PG file, you could use:
-
-	foreach my $string (format_tags($tags)) {
-		$string =~ s/^/## /gm;
-		print PGFILE "$string\n";
-	}
-
-=cut
-
-sub format_tags {
-	my ($tags, $mintextbook) = @_;
-	$mintextbook ||= 1;
-	my @result;
-	my @ordered_fields = grep { exists $tags->{$_} } @global_fields, "textbooks";
-	foreach my $field (@ordered_fields) {
-		my $value = $tags->{$field};
-		if ($field eq "DESCRIPTION") {
-			push @result, format_description($value);
-		} elsif ($field eq "textbooks") {
-			push @result, format_textbooks($value, $mintextbook);
-		} else {
-			push @result, format_tag($field, $value);
-		}
-	}
-	return @result;
-}
-
-sub format_tag {
-	my ($field, $value, $n) = @_;
-	my $tag = $field2tag{$field} || $field;
-	
-	# problems are always listed in a single string in the tag.
-	if ($field eq "problem") {
-		$value = format_problems($value);
-	}
-	
-	# if we have an arrayref, we represent it as multiple strings in one tag.
-	if (ref $value) {
-		$value = join(',', map { "'$_'" } @$value);
-	} elsif (defined $value) {
-		$value = "'$value'";
-	} else {
-		warn "value is not defined for field $field!\n";
-		$value = "''";
-	}
-	
-	if (defined $n) {
-		return "$tag$n($value)";
-	} else {
-		return "$tag($value)";
-	}
-}
-
-sub format_description {
-	my $value = shift;
-	return "DESCRIPTION\n$value\nENDDESCRIPTION";
-}
-
-sub format_textbooks {
-	my ($textbook, $n) = @_;
-	my @textbooks = @$textbook;
-	my @result;
-	foreach my $textbook (@textbooks) {
-		push @result, format_textbook($textbook, $n);
-		$n++;
-	}
-	return @result;
-}
-
-sub format_textbook {
-	my ($textbook, $n) = @_;
-	
-	# combine chapter/section into single section tag
-	my $chapter = $textbook->{chapter};
-	my $section = $textbook->{section};
-	if (defined $chapter or defined $section) {
-		$section = ".$section" if defined $section;
-		$section = "$chapter$section" if defined $chapter;
-		delete $textbook->{chapter};
-		$textbook->{section} = $section;
-	}
-	
-	my @result;
-	my @ordered_fields = grep { exists $textbook->{$_} } @textbook_fields;
-	foreach my $field (@ordered_fields) {
-		my $value = $textbook->{$field};
-		push @result, format_tag($field, $value, $n);
-	}
-	return @result;
-}
-
-sub format_problems {
-	my $first = shift;
-	my @problems;
-	if (ref $first) {
-		@problems = @$first;
-	} else {
-		@problems = ($first, @_);
-	}
-	
-	return join(',', @problems);
-}
-
-=head2 gen_find_tags
-
-	gen_find_tags($pattern, $action, $extra_editing_info);
-
-Generates an anonymous subroutine suitable for passing the the find() function
-of the File::Find module. The no_chdir=>1 option must be passed to find() for
-the generated subroutine to operate properly.
-
-$pattern is a reference to a hash describing the fields that must match. $action
-is a reference to a subroutine that will be called if all fields match. 
-$extra_editing_info is passed to read_tags().
-
-Legal fields for $pattern are as follows:
-
-B<Global fields:> DESCRIPTION, KEYWORDS, DBsubject, DBchapter, DBsection, Date,
-Institution, Author. (The experimental UsesAuxiliaryFiles field may be supported
-in the future.)
-
-B<Text-specific fields:> title, edition, author, chapter, section, problem.
-
-If multiple text-specific keys are given, then all must match for a single
-textbook.
-
-$action is called as follows:
-
-	$action->($path, $tags, $text_index)
-
-There $path the path to the matching file, $tags a reference to the tag hash for
-the matching file, and $text_index the index into the @{$tags->{textbooks}} array
-if $pattern included textbook-specific tags.
-
-=cut
-
-sub gen_find_tags {
-	my ($pattern, $action, $extra_editing_info) = @_;
-	return sub {
-		return unless /\.pg$/ and -f $File::Find::name;
-		
-		my $name = $File::Find::name;
-		#my $relpath = $name;
-		#$relpath =~ s/^$src\///;
-		
-		my %tags;
-		
-		open my $fh, "<", $name or do {
-			warn "skipping $name: $!\n";
-			return;
-		};
-		read_tags($fh, \%tags, $extra_editing_info);
-		close $fh;
-		
-		my (%global_pattern, %textbook_pattern);
-		foreach my $field (@global_fields) {
-			$global_pattern{$field} = $pattern->{$field} if exists $pattern->{$field};
-		}
-		foreach my $field (@textbook_fields) {
-			$textbook_pattern{$field} = $pattern->{$field} if exists $pattern->{$field};
-		}
-		
-		if (%global_pattern) {
-			return unless match_global(\%tags, \%global_pattern);
-		}
-		my $text_index;
-		if (%textbook_pattern) {
-			$text_index = match_textbook(\%tags, \%textbook_pattern);
-			return unless $text_index >= 0;
-		}
-		
-		$action->($name, \%tags, $text_index);
-	};
-}
-
-sub match_global {
-	my ($tags, $matches) = @_;
-	foreach my $field (keys %$matches) {
-		return 0 unless $tags->{$field} eq $matches->{$field};
-	}
-	return 1;
-}
-
-sub match_textbook {
-	my ($tags, $matches) = @_;
-	return -1 unless defined $tags->{textbooks};
-	my @textbooks = @{$tags->{textbooks}};
-	
-	#textbook: foreach my $textbook (@{$tags->{textbooks}}) {
-	textbook: foreach my $i (0 .. $#{$tags->{textbooks}}) {
-		my $textbook = $tags->{textbooks}[$i];
-		foreach my $field (keys %$matches) {
-			next if $field !~ /^(title|edition|author|chapter|section|problem)$/;
-			next textbook unless $textbook->{$field} eq $matches->{$field};
-		}
-		#warn "matched text i=$i: ", Dumper($textbook);
-		return $i;
-	}
-	return -1;
-}
-
-1;
diff --git a/lib/WeBWorK/PG.pm b/lib/WeBWorK/PG.pm
deleted file mode 100644
index 6f1ecc2004..0000000000
--- a/lib/WeBWorK/PG.pm
+++ /dev/null
@@ -1,528 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::PG;
-
-=head1 NAME
-
-WeBWorK::PG - Invoke one of several PG rendering methods using an easy-to-use
-API.
-
-=cut
-
-use strict;
-use warnings;
-use WeBWorK::Debug;
-use WeBWorK::PG::ImageGenerator;
-use WeBWorK::Utils qw(runtime_use formatDateTime makeTempDirectory);
-use WeBWorK::Utils::RestrictedClosureClass;
-
-use constant DISPLAY_MODES => {
-	# display name   # mode name
-	tex           => "TeX",
-	plainText     => "HTML",
-	images        => "HTML_dpng",
-	MathJax	      => "HTML_MathJax",
-	PTX           => "PTX",
-};
-
-sub new {
-	shift; # throw away invocant -- we don't need it
-	my ($ce, $user, $key, $set, $problem, $psvn, $formFields,
-		$translationOptions) = @_;
-
-	my $renderer = $ce->{pg}->{renderer};
-
-	runtime_use $renderer;
-
-	return $renderer->new(@_);
-}
-
-sub free {
-	my $self = shift;
-	#
-	#  If certain MathObjects (e.g. LimitedPolynomials) are left in the PG structure, then
-	#  freeing them later can cause "Can't locate package ..." errors in the log during
-	#  perl garbage collection.  So free them here.
-	#
-	$self->{pgcore}{OUTPUT_ARRAY} = [];
-	$self->{answers} = {};
-	undef $self->{translator};
-	foreach (keys %{$self->{pgcore}{PG_ANSWERS_HASH}}) {undef $self->{pgcore}{PG_ANSWERS_HASH}{$_}}
-}
-
-sub defineProblemEnvir {
-	my (
-		$self,
-		$ce,
-		$user,
-		$key,
-		$set,
-		$problem,
-		$psvn,
-		$formFields,
-		$translationOptions,
-		$extras,
-	) = @_;
-
-	my %envir;
-
-	debug("in WEBWORK::PG");
-
-	# ----------------------------------------------------------------------
-
-	# PG environment variables
-	# from docs/pglanguage/pgreference/environmentvariables as of 06/25/2002
-	# any changes are noted by "ADDED:" or "REMOVED:"
-
-	# Vital state information
-	# ADDED: displayModeFailover, displayHintsQ, displaySolutionsQ,
-	#        refreshMath2img, texDisposition
-
-	$envir{psvn}                = $psvn;  #'problem set version number' (associated with homework set)
-	$envir{psvn}                = $envir{psvn}//$set->psvn; # use set value of psvn unless there is an explicit override.
-	# update problemUUID from submitted form, and fall back to the earlier name problemIdentifierPrefix if necessary
-	$envir{problemUUID}         =  	   $formFields->{problemUUID} //
-	                                   $formFields->{problemIdentifierPrefix} //
-	                                   $envir{problemUUID}//
-	                                   0;
-	$envir{psvnNumber}          = "psvnNumber-is-deprecated-Please-use-psvn-Instead"; #FIXME
-	$envir{probNum}             = $problem->problem_id;
-	$envir{questionNumber}      = $envir{probNum};
-	$envir{fileName}            = $problem->source_file;
-	$envir{probFileName}        = $envir{fileName};
-	$envir{problemSeed}         = $problem->problem_seed;
-	$envir{displayMode}         = translateDisplayModeNames($translationOptions->{displayMode});
-#	$envir{languageMode}        = $envir{displayMode};	# don't believe this is ever used.
-	$envir{outputMode}          = $envir{displayMode};
-	$envir{displayHintsQ}       = $translationOptions->{showHints};
-	$envir{displaySolutionsQ}   = $translationOptions->{showSolutions};
-	$envir{texDisposition}      = "pdf"; # in webwork2, we use pdflatex
-
-	# Problem Information
-	# ADDED: courseName, formatedDueDate, enable_reduced_scoring
-
-	$envir{openDate}            = $set->open_date;
-	$envir{formattedOpenDate}   = formatDateTime($envir{openDate}, $ce->{siteDefaults}{timezone});
-	$envir{OpenDateDayOfWeek}   = formatDateTime($envir{openDate}, $ce->{siteDefaults}{timezone}, "%A", $ce->{siteDefaults}{locale});
-	$envir{OpenDateDayOfWeekAbbrev} = formatDateTime($envir{openDate}, $ce->{siteDefaults}{timezone}, "%a", $ce->{siteDefaults}{locale});
-	$envir{OpenDateDay}         = formatDateTime($envir{openDate}, $ce->{siteDefaults}{timezone}, "%d", $ce->{siteDefaults}{locale});
-	$envir{OpenDateMonthNumber} = formatDateTime($envir{openDate}, $ce->{siteDefaults}{timezone}, "%m", $ce->{siteDefaults}{locale});
-	$envir{OpenDateMonthWord}   = formatDateTime($envir{openDate}, $ce->{siteDefaults}{timezone}, "%B", $ce->{siteDefaults}{locale});
-	$envir{OpenDateMonthAbbrev} = formatDateTime($envir{openDate}, $ce->{siteDefaults}{timezone}, "%b", $ce->{siteDefaults}{locale});
-	$envir{OpenDateYear2Digit}  = formatDateTime($envir{openDate}, $ce->{siteDefaults}{timezone}, "%y", $ce->{siteDefaults}{locale});
-	$envir{OpenDateYear4Digit}  = formatDateTime($envir{openDate}, $ce->{siteDefaults}{timezone}, "%Y", $ce->{siteDefaults}{locale});
-	$envir{OpenDateHour12}      = formatDateTime($envir{openDate}, $ce->{siteDefaults}{timezone}, "%I", $ce->{siteDefaults}{locale});
-	$envir{OpenDateHour24}      = formatDateTime($envir{openDate}, $ce->{siteDefaults}{timezone}, "%H", $ce->{siteDefaults}{locale});
-	$envir{OpenDateMinute}      = formatDateTime($envir{openDate}, $ce->{siteDefaults}{timezone}, "%M", $ce->{siteDefaults}{locale});
-	$envir{OpenDateAMPM}        = formatDateTime($envir{openDate}, $ce->{siteDefaults}{timezone}, "%P", $ce->{siteDefaults}{locale});
-	$envir{OpenDateTimeZone}    = formatDateTime($envir{openDate}, $ce->{siteDefaults}{timezone}, "%Z", $ce->{siteDefaults}{locale});
-	$envir{OpenDateTime12}      = formatDateTime($envir{openDate}, $ce->{siteDefaults}{timezone}, "%I:%M%P", $ce->{siteDefaults}{locale});
-	$envir{OpenDateTime24}      = formatDateTime($envir{openDate}, $ce->{siteDefaults}{timezone}, "%R", $ce->{siteDefaults}{locale});
-	$envir{dueDate}             = $set->due_date;
-	$envir{formattedDueDate}    = formatDateTime($envir{dueDate}, $ce->{siteDefaults}{timezone});
-	$envir{formatedDueDate}     = $envir{formattedDueDate}; # typo in many header files
-	$envir{DueDateDayOfWeek}    = formatDateTime($envir{dueDate}, $ce->{siteDefaults}{timezone}, "%A", $ce->{siteDefaults}{locale});
-	$envir{DueDateDayOfWeekAbbrev} = formatDateTime($envir{dueDate}, $ce->{siteDefaults}{timezone}, "%a", $ce->{siteDefaults}{locale});
-	$envir{DueDateDay}          = formatDateTime($envir{dueDate}, $ce->{siteDefaults}{timezone}, "%d", $ce->{siteDefaults}{locale});
-	$envir{DueDateMonthNumber}  = formatDateTime($envir{dueDate}, $ce->{siteDefaults}{timezone}, "%m", $ce->{siteDefaults}{locale});
-	$envir{DueDateMonthWord}    = formatDateTime($envir{dueDate}, $ce->{siteDefaults}{timezone}, "%B", $ce->{siteDefaults}{locale});
-	$envir{DueDateMonthAbbrev}  = formatDateTime($envir{dueDate}, $ce->{siteDefaults}{timezone}, "%b", $ce->{siteDefaults}{locale});
-	$envir{DueDateYear2Digit}   = formatDateTime($envir{dueDate}, $ce->{siteDefaults}{timezone}, "%y", $ce->{siteDefaults}{locale});
-	$envir{DueDateYear4Digit}   = formatDateTime($envir{dueDate}, $ce->{siteDefaults}{timezone}, "%Y", $ce->{siteDefaults}{locale});
-	$envir{DueDateHour12}       = formatDateTime($envir{dueDate}, $ce->{siteDefaults}{timezone}, "%I", $ce->{siteDefaults}{locale});
-	$envir{DueDateHour24}       = formatDateTime($envir{dueDate}, $ce->{siteDefaults}{timezone}, "%H", $ce->{siteDefaults}{locale});
-	$envir{DueDateMinute}       = formatDateTime($envir{dueDate}, $ce->{siteDefaults}{timezone}, "%M", $ce->{siteDefaults}{locale});
-	$envir{DueDateAMPM}         = formatDateTime($envir{dueDate}, $ce->{siteDefaults}{timezone}, "%P", $ce->{siteDefaults}{locale});
-	$envir{DueDateTimeZone}     = formatDateTime($envir{dueDate}, $ce->{siteDefaults}{timezone}, "%Z", $ce->{siteDefaults}{locale});
-	$envir{DueDateTime12}       = formatDateTime($envir{dueDate}, $ce->{siteDefaults}{timezone}, "%I:%M%P", $ce->{siteDefaults}{locale});
-	$envir{DueDateTime24}       = formatDateTime($envir{dueDate}, $ce->{siteDefaults}{timezone}, "%R", $ce->{siteDefaults}{locale});
-	$envir{answerDate}          = $set->answer_date;
-	$envir{formattedAnswerDate} = formatDateTime($envir{answerDate}, $ce->{siteDefaults}{timezone});
-	$envir{AnsDateDayOfWeek}    = formatDateTime($envir{answerDate}, $ce->{siteDefaults}{timezone}, "%A", $ce->{siteDefaults}{locale});
-	$envir{AnsDateDayOfWeekAbbrev} = formatDateTime($envir{answerDate}, $ce->{siteDefaults}{timezone}, "%a", $ce->{siteDefaults}{locale});
-	$envir{AnsDateDay}          = formatDateTime($envir{answerDate}, $ce->{siteDefaults}{timezone}, "%d", $ce->{siteDefaults}{locale});
-	$envir{AnsDateMonthNumber}  = formatDateTime($envir{answerDate}, $ce->{siteDefaults}{timezone}, "%m", $ce->{siteDefaults}{locale});
-	$envir{AnsDateMonthWord}    = formatDateTime($envir{answerDate}, $ce->{siteDefaults}{timezone}, "%B", $ce->{siteDefaults}{locale});
-	$envir{AnsDateMonthAbbrev}  = formatDateTime($envir{answerDate}, $ce->{siteDefaults}{timezone}, "%b", $ce->{siteDefaults}{locale});
-	$envir{AnsDateYear2Digit}   = formatDateTime($envir{answerDate}, $ce->{siteDefaults}{timezone}, "%y", $ce->{siteDefaults}{locale});
-	$envir{AnsDateYear4Digit}   = formatDateTime($envir{answerDate}, $ce->{siteDefaults}{timezone}, "%Y", $ce->{siteDefaults}{locale});
-	$envir{AnsDateHour12}       = formatDateTime($envir{answerDate}, $ce->{siteDefaults}{timezone}, "%I", $ce->{siteDefaults}{locale});
-	$envir{AnsDateHour24}       = formatDateTime($envir{answerDate}, $ce->{siteDefaults}{timezone}, "%H", $ce->{siteDefaults}{locale});
-	$envir{AnsDateMinute}       = formatDateTime($envir{answerDate}, $ce->{siteDefaults}{timezone}, "%M", $ce->{siteDefaults}{locale});
-	$envir{AnsDateAMPM}         = formatDateTime($envir{answerDate}, $ce->{siteDefaults}{timezone}, "%P", $ce->{siteDefaults}{locale});
-	$envir{AnsDateTimeZone}     = formatDateTime($envir{answerDate}, $ce->{siteDefaults}{timezone}, "%Z", $ce->{siteDefaults}{locale});
-	$envir{AnsDateTime12}       = formatDateTime($envir{answerDate}, $ce->{siteDefaults}{timezone}, "%I:%M%P", $ce->{siteDefaults}{locale});
-	$envir{AnsDateTime24}       = formatDateTime($envir{answerDate}, $ce->{siteDefaults}{timezone}, "%R", $ce->{siteDefaults}{locale});
-	my $ungradedAttempts        = ($formFields->{submitAnswers})?1:0; # is an attempt about to be graded?
-	$envir{numOfAttempts}       = ($problem->num_correct || 0) + ($problem->num_incorrect || 0) +$ungradedAttempts;
-	$envir{problemValue}        = $problem->value;
-	$envir{sessionKey}          = $key;
-	$envir{courseName}          = $ce->{courseName};
-	$envir{enable_reduced_scoring} = $ce->{pg}{ansEvalDefaults}{enableReducedScoring} && $set->enable_reduced_scoring;
-
-	$envir{language}            = $ce->{language};
-	$envir{language_subroutine} = WeBWorK::Localize::getLoc($envir{language});
-	$envir{reducedScoringDate} = $set->reduced_scoring_date;
-	$envir{formattedReducedScoringDate} = formatDateTime($envir{reducedScoringDate}, $ce->{siteDefaults}{timezone});
-
-	# Student Information
-	# ADDED: studentID
-
-	$envir{sectionName}      = $user->section;
-	$envir{sectionNumber}    = $envir{sectionName};
-	$envir{recitationName}   = $user->recitation;
-	$envir{recitationNumber} = $envir{recitationName};
-	$envir{setNumber}        = $set->set_id;
-	$envir{studentLogin}     = $user->user_id;
-	$envir{studentName}      = $user->first_name . " " . $user->last_name;
-	$envir{studentID}        = $user->student_id;
-	$envir{permissionLevel}  = $translationOptions->{permissionLevel};  # permission level of actual user
-	$envir{effectivePermissionLevel}  = $translationOptions->{effectivePermissionLevel}; # permission level of user assigned to this question
-
-
-	# Answer Information
-	# REMOVED: refSubmittedAnswers
-
-	$envir{inputs_ref} = $formFields;
-
-	# External Programs
-	# ADDED: externalLaTeXPath, externalDvipngPath,
-	#        externalGif2EpsPath, externalPng2EpsPath
-
-	$envir{externalLaTeXPath}    = $ce->{externalPrograms}->{latex};
-	$envir{externalDvipngPath}   = $ce->{externalPrograms}->{dvipng};
-	$envir{externalGif2EpsPath}  = $ce->{externalPrograms}->{gif2eps};
-	$envir{externalPng2EpsPath}  = $ce->{externalPrograms}->{png2eps};
-	$envir{externalGif2PngPath}  = $ce->{externalPrograms}->{gif2png};
-	$envir{externalCheckUrl}     = $ce->{externalPrograms}->{checkurl};
-	#$envir{externalCurlCommand}  = $ce->{externalPrograms}->{curl};
-	# Directories and URLs
-	# REMOVED: courseName
-	# ADDED: dvipngTempDir
-	# ADDED: jsMathURL
-	# ADDED: MathJaxURL
-	# ADDED: asciimathURL
-	# ADDED: macrosPath
-	# REMOVED: macrosDirectory, courseScriptsDirectory
-	# ADDED: LaTeXMathML
-
-	$envir{cgiDirectory}           = undef;
-	$envir{cgiURL}                 = undef;
-	$envir{classDirectory}         = undef;
-    $envir{macrosPath}             = $ce->{pg}->{directories}{macrosPath};
-    $envir{appletPath}             = $ce->{pg}->{directories}{appletPath};
-    $envir{macrosPath}             = $ce->{pg}->{directories}{macrosPath};
-    $envir{htmlPath}               = $ce->{pg}->{directories}{htmlPath};
-    $envir{imagesPath}             = $ce->{pg}->{directories}{imagesPath};
-    $envir{pdfPath}                = $ce->{pg}->{directories}{pdfPath};
-    $envir{pgDirectories}          = $ce->{pg}->{directories};
-	$envir{webworkHtmlDirectory}   = $ce->{webworkDirs}->{htdocs}."/";
-	$envir{webworkHtmlURL}         = $ce->{webworkURLs}->{htdocs}."/";
-	$envir{htmlDirectory}          = $ce->{courseDirs}->{html}."/";
-	$envir{htmlURL}                = $ce->{courseURLs}->{html}."/";
-	$envir{templateDirectory}      = $ce->{courseDirs}->{templates}."/";
-	$envir{tempDirectory}          = $ce->{courseDirs}->{html_temp}."/";
-	$envir{tempURL}                = $ce->{courseURLs}->{html_temp}."/";
-	$envir{scriptDirectory}        = undef;
-	$envir{webworkDocsURL}         = $ce->{webworkURLs}->{docs}."/";
-	$envir{localHelpURL}           = $ce->{webworkURLs}->{local_help}."/";
-	$envir{MathJaxURL}             = $ce->{webworkURLs}->{MathJax};
-	$envir{server_root_url}        = $ce->{server_root_url}|| '';
-
-	# Information for sending mail
-
-	$envir{mailSmtpServer} = $ce->{mail}->{smtpServer};
-	$envir{mailSmtpSender} = $ce->{mail}->{smtpSender};
-	$envir{ALLOW_MAIL_TO}  = $ce->{mail}->{allowedRecipients};
-
-	# Default values for evaluating answers
-
-	my $ansEvalDefaults = $ce->{pg}->{ansEvalDefaults};
-	$envir{$_} = $ansEvalDefaults->{$_} foreach (keys %$ansEvalDefaults);
-
-	# ----------------------------------------------------------------------
-
-	# ADDED: ImageGenerator for images mode
-	if (defined $extras->{image_generator}) {
-		#$envir{imagegen} = $extras->{image_generator};
-		# only allow access to the add() method
-		$envir{imagegen} = new WeBWorK::Utils::RestrictedClosureClass($extras->{image_generator}, 'add','addToTeXPreamble', 'refresh');
-	}
-
-	if (defined $extras->{mailer}) {
-		#my $rmailer = new WeBWorK::Utils::RestrictedClosureClass($extras->{mailer},
-		#	qw/Open SendEnc Close Cancel skipped_recipients error error_msg/);
-		#my $safe_hole = new Safe::Hole {};
-		#$envir{mailer} = $safe_hole->wrap($rmailer);
-		$envir{mailer} = new WeBWorK::Utils::RestrictedClosureClass($extras->{mailer}, "add_message");
-	}
-	# ADDED use_opaque_prefix and use_site_prefix
-
-	$envir{use_site_prefix}     = $translationOptions->{use_site_prefix};
-	$envir{use_opaque_prefix}   = $translationOptions->{use_opaque_prefix};
-
-	# Other things...
-	$envir{QUIZ_PREFIX}              = $translationOptions->{QUIZ_PREFIX}//''; # used by quizzes
-	$envir{PROBLEM_GRADER_TO_USE}    = $ce->{pg}->{options}->{grader};
-	$envir{PRINT_FILE_NAMES_FOR}     = $ce->{pg}->{specialPGEnvironmentVars}->{PRINT_FILE_NAMES_FOR};
-	$envir{useMathQuill}             = $translationOptions->{useMathQuill};
-	$envir{useMathView}              = $translationOptions->{useMathView};
-	$envir{mathViewLocale}           = $ce->{pg}{options}{mathViewLocale};
-	$envir{useWirisEditor}           = $translationOptions->{useWirisEditor};
-
-        #  ADDED: __files__
-        #    an array for mapping (eval nnn) to filenames in error messages
-	$envir{__files__} = {
-	  root => $ce->{webworkDirs}{root},     # used to shorten filenames
-	  pg   => $ce->{pg}{directories}{root}, # ditto
-	  tmpl => $ce->{courseDirs}{templates}, # ditto
-	};
-
-	# variables for interpreting capa problems and other things to be
-        # seen in a pg file
-	my $specialPGEnvironmentVarHash = $ce->{pg}->{specialPGEnvironmentVars};
-	for my $SPGEV (keys %{$specialPGEnvironmentVarHash}) {
-		$envir{$SPGEV} = $specialPGEnvironmentVarHash->{$SPGEV};
-	}
-
-	return \%envir;
-}
-
-sub translateDisplayModeNames($) {
-	my $name = shift;
-	return DISPLAY_MODES()->{$name};
-}
-
-sub oldSafetyFilter {
-	my $answer = shift; # accepts one answer and checks it
-	my $submittedAnswer = $answer;
-	$answer = '' unless defined $answer;
-	my ($errorno);
-	$answer =~ tr/\000-\037/ /;
-	# Return if answer field is empty
-	unless ($answer =~ /\S/) {
-		#$errorno = "<BR>No answer was submitted.";
-		$errorno = 0;  ## don't report blank answer as error
-		return ($answer,$errorno);
-	}
-	# replace ^ with **    (for exponentiation)
-	# $answer =~ s/\^/**/g;
-	# Return if forbidden characters are found
-	unless ($answer =~ /^[a-zA-Z0-9_\-\+ \t\/@%\*\.\n^\[\]\(\)\,\|]+$/ )  {
-		$answer =~ tr/a-zA-Z0-9_\-\+ \t\/@%\*\.\n^\(\)/#/c;
-		$errorno = "<BR>There are forbidden characters in your answer: $submittedAnswer<BR>";
-		return ($answer,$errorno);
-	}
-	$errorno = 0;
-	return($answer, $errorno);
-}
-
-sub nullSafetyFilter {
-	return shift, 0; # no errors
-}
-
-1;
-
-__END__
-
-=head1 SYNOPSIS
-
- $pg = WeBWorK::PG->new(
-	 $ce,         # a WeBWorK::CourseEnvironment object
-	 $user,       # a WeBWorK::DB::Record::User object
-	 $sessionKey,
-	 $set,        # a WeBWorK::DB::Record::UserSet object
-	 $problem,    # a WeBWorK::DB::Record::UserProblem object
-	 $psvn,
-	 $formFields  # in &WeBWorK::Form::Vars format
-	 { # translation options
-		 displayMode     => "images", # (plainText|formattedText|images|MathJax)
-		 showHints       => 1,        # (0|1)
-		 showSolutions   => 0,        # (0|1)
-		 refreshMath2img => 0,        # (0|1)
-		 processAnswers  => 1,        # (0|1)
-	 },
- );
-
- $translator = $pg->{translator}; # WeBWorK::PG::Translator
- $body       = $pg->{body_text};  # text string
- $header     = $pg->{head_text};  # text string
- $post_header_text = $pg->{post_header_text};  # text string
- $answerHash = $pg->{answers};    # WeBWorK::PG::AnswerHash
- $result     = $pg->{result};     # hash reference
- $state      = $pg->{state};      # hash reference
- $errors     = $pg->{errors};     # text string
- $warnings   = $pg->{warnings};   # text string
- $flags      = $pg->{flags};      # hash reference
-
-=head1 DESCRIPTION
-
-WeBWorK::PG is a factory for modules which use the WeBWorK::PG API. Notable
-modules which use this API (and exist) are WeBWorK::PG::Local and
-WeBWorK::PG::Remote. The course environment key $pg{renderer} is consulted to
-determine which render to use.
-
-=head1 THE WEBWORK::PG API
-
-Modules which support this API must implement the following method:
-
-=over
-
-=item new ENVIRONMENT, USER, KEY, SET, PROBLEM, PSVN, FIELDS, OPTIONS
-
-The C<new> method creates a translator, initializes it using the parameters
-specified, translates a PG file, and processes answers. It returns a reference
-to a blessed hash containing the results of the translation process.
-
-=back
-
-=head2 Parameters
-
-=over
-
-=item ENVIRONMENT
-
-a WeBWorK::CourseEnvironment object
-
-=item USER
-
-a WeBWorK::User object
-
-=item KEY
-
-the session key of the current session
-
-=item SET
-
-a WeBWorK::Set object
-
-=item PROBLEM
-
-a WeBWorK::DB::Record::UserProblem object. The contents of the source_file
-field can specify a PG file either by absolute path or path relative to the
-"templates" directory. I<The caller should remove taint from this value before
-passing!>
-
-=item PSVN
-
-the problem set version number: use variable $psvn
-
-=item FIELDS
-
-a reference to a hash (as returned by &WeBWorK::Form::Vars) containing form
-fields submitted by a problem processor. The translator will look for fields
-like "AnSwEr[0-9]" containing submitted student answers.
-
-=item OPTIONS
-
-a reference to a hash containing the following data:
-
-=over
-
-=item displayMode
-
-one of "plainText", "formattedText", "MathJax" or "images"
-
-=item showHints
-
-boolean, render hints
-
-=item showSolutions
-
-boolean, render solutions
-
-=item refreshMath2img
-
-boolean, force images created by math2img (in "images" mode) to be recreated,
-even if the PG source has not been updated. FIXME: remove this option.
-
-=item processAnswers
-
-boolean, call answer evaluators and graders
-
-=back
-
-=back
-
-=head2 RETURN VALUE
-
-The C<new> method returns a blessed hash reference containing the following
-fields. More information can be found in the documentation for
-WeBWorK::PG::Translator.
-
-=over
-
-=item translator
-
-The WeBWorK::PG::Translator object used to render the problem.
-
-=item head_text
-
-HTML code for the E<lt>headE<gt> block of an resulting web page. Used for
-JavaScript features.
-
-=item body_text
-
-HTML code for the E<lt>bodyE<gt> block of an resulting web page.
-
-=item answers
-
-An C<AnswerHash> object containing submitted answers, and results of answer
-evaluation.
-
-=item result
-
-A hash containing the results of grading the problem.
-
-=item state
-
-A hash containing the new problem state.
-
-=item errors
-
-A string containing any errors encountered while rendering the problem.
-
-=item warnings
-
-A string containing any warnings encountered while rendering the problem.
-
-=item flags
-
-A hash containing PG_flags (see the Translator docs).
-
-=back
-
-=head1 METHODS PROVIDED BY THE BASE CLASS
-
-The following methods are provided for use by subclasses of WeBWorK::PG.
-
-=over
-
-=item defineProblemEnvir ENVIRONMENT, USER, KEY, SET, PROBLEM, PSVN, FIELDS, OPTIONS
-
-Generate a problem environment hash to pass to the renderer.
-
-=item translateDisplayModeNames NAME
-
-NAME contains
-
-=back
-
-=head1 AUTHOR
-
-Written by Sam Hathaway, sh002i (at) math.rochester.edu.
-
-=cut
diff --git a/lib/WeBWorK/PG/Local.pm b/lib/WeBWorK/PG/Local.pm
deleted file mode 100644
index 162c51ac5f..0000000000
--- a/lib/WeBWorK/PG/Local.pm
+++ /dev/null
@@ -1,557 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::PG::Local;
-use base qw(WeBWorK::PG);
-
-=head1 NAME
-
-WeBWorK::PG::Local - Use the WeBWorK::PG API to invoke a local
-WeBWorK::PG::Translator object.
-
-=head1 DESCRIPTION
-
-WeBWorK::PG::Local encapsulates the PG translation process, making multiple
-calls to WeBWorK::PG::Translator. Much of the flexibility of the Translator is
-hidden, instead making choices that are appropriate for the webwork2
-system
-
-It implements the WeBWorK::PG interface and uses a local
-WeBWorK::PG::Translator to perform problem rendering. See the documentation for
-the WeBWorK::PG module for information about the API.
-
-=cut
-
-use strict;
-use warnings;
-use WeBWorK::Constants;
-use File::Path qw(rmtree);
-use WeBWorK::PG::Translator;
-use WeBWorK::Utils qw(readFile writeTimingLogEntry);
-#use WeBWorK::Utils::RestrictedMailer;
-use WeBWorK::Utils::DelayedMailer;
-
-# Problem processing will time out after this number of seconds.
-use constant TIMEOUT => $WeBWorK::PG::Local::TIMEOUT || 10;
-
-BEGIN {
-	# This safe compartment is used to read the large macro files such as
-	# PG.pl, PGbasicmacros.pl and PGanswermacros and cache the results so that
-	# future calls have preloaded versions of these large files. This saves a
-	# significant amount of time.
-	$WeBWorK::PG::Local::safeCache = new WWSafe;
-}
-
-sub alarm_handler {
-	my $msg = "Timeout after processing this problem for ". TIMEOUT. " seconds. Check for infinite loops in problem source.\n";
-	warn $msg;
-	CORE::die $msg;
-}
-
-sub new {
-	my $invocant = shift;
-	local $SIG{ALRM} = \&alarm_handler;
-	alarm TIMEOUT;
-	my $result = eval { $invocant->new_helper(@_) };
-	alarm 0;
-	die $@ if $@;
-	return $result;
-}
-
-
-sub new_helper {
-	my $invocant = shift;
-	my $class = ref($invocant) || $invocant;
-	my (
-		$ce,
-		$user,
-		$key,
-		$set,
-		$problem,
-		$psvn, #FIXME -- not used
-		$formFields, # in CGI::Vars format
-		$translationOptions, # hashref containing options for the
-		                     # translator, such as whether to show
-		                     # hints and the display mode to use
-	) = @_;
-
-	# write timing log entry
-# 	writeTimingLogEntry($ce, "WeBWorK::PG::new",
-# 		"user=".$user->user_id.",problem=".$ce->{courseName}."/".$set->set_id."/".$problem->problem_id.",mode=".$translationOptions->{displayMode},
-# 		"begin");
-
-	# install a local warn handler to collect warnings  FIXME -- figure out what I meant to do here.
-	my $warnings = "";
-	#local $SIG{__WARN__} = sub { $warnings .= shift()."<br/>\n"};
-		#if $ce->{pg}->{options}->{catchWarnings};
-
-	# create a Translator
-	#warn "PG: creating a Translator\n";
-	my $translator = WeBWorK::PG::Translator->new;
-
-	# set the directory hash
-	#warn "PG: setting the directory hash\n";
-	# FIXME rh_directories does not appear to be used. ever.
-#	$translator->rh_directories({
-#		macrosPath             => $ce->{courseDirs}->{macrosPath},
-#		templateDirectory      => $ce->{courseDirs}->{templates},
-#		tempDirectory          => $ce->{courseDirs}->{html_temp},
-#	});
-
-	############################################################################
-	# evaluate modules and "extra packages"
-	############################################################################
-
-	#warn "PG: evaluating modules and \"extra packages\"\n";
-	my @modules = @{ $ce->{pg}->{modules} };
-	# HACK for apache2
-	push @modules, ["Apache2::Log"], ["APR::Table"];
-
-	foreach my $module_packages_ref (@modules) {
-		my ($module, @extra_packages) = @$module_packages_ref;
-		# the first item is the main package
-		$translator->evaluate_modules($module);
-		# the remaining items are "extra" packages
-		$translator->load_extra_packages(@extra_packages);
-	}
-
-	############################################################################
-	# prepare an imagegenerator object (if we're in "images" mode)
-	############################################################################
-	my $image_generator;
-	my $site_prefix = ( $translationOptions->{use_site_prefix} )//'';
-	if ($translationOptions->{displayMode} eq "images" || $translationOptions->{displayMode} eq "opaque_image") {
-		my %imagesModeOptions = %{$ce->{pg}{displayModeOptions}{images}};
-		$image_generator = WeBWorK::PG::ImageGenerator->new(
-			tempDir         => $ce->{webworkDirs}->{tmp}, # global temp dir
-			latex	        => $ce->{externalPrograms}->{latex},
-			dvipng          => $ce->{externalPrograms}->{dvipng},
-			useCache        => 1,
-			cacheDir        => $ce->{webworkDirs}{equationCache},
-			cacheURL        => $site_prefix . $ce->{webworkURLs}{equationCache},
-			cacheDB         => $ce->{webworkFiles}{equationCacheDB},
-			useMarkers      => ($imagesModeOptions{dvipng_align} && $imagesModeOptions{dvipng_align} eq 'mysql'),
-			dvipng_align    => $imagesModeOptions{dvipng_align},
-			dvipng_depth_db => $imagesModeOptions{dvipng_depth_db},
-		);
-	}
-
-	############################################################################
-	# create a "delayed mailer" object that will send emails after the page is finished.
-	############################################################################
-
-	my $mailer = new WeBWorK::Utils::DelayedMailer(
-		smtp_server => $ce->{mail}{smtpServer},
-		smtp_sender => $ce->{mail}{smtpSender},
-		smtp_timeout => $ce->{mail}{smtpTimeout},
-		# FIXME I'd like to have an X-Remote-Host header, but before I do that I have to
-		# factor out the remote host/remote port code from Feedback.pm and Authen.pm and
-		# put it in Utils! (or maybe in WW::Request?)
-		headers => "X-WeBWorK-Module: " . __PACKAGE__ . "\n"
-			. "X-WeBWorK-Course: " . $ce->{courseName} . "\n"
-			# can't add user-related information because this is used for anonymous questionnaires
-			#. "X-WeBWorK-User: " . $user->user_id . "\n"
-			#. "X-WeBWorK-Section: " . $user->section . "\n"
-			#. "X-WeBWorK-Recitation: " . $user->recitation . "\n"
-			. "X-WeBWorK-Set: " . $set->set_id . "\n"
-			. "X-WeBWorK-Problem: " . $problem->problem_id . "\n"
-			. "X-WeBWorK-PGSourceFile: " . $problem->source_file . "\n",
-		allowed_recipients => $ce->{mail}{allowedRecipients},
-		on_illegal_rcpt => "carp",
-	);
-
-
-	############################################################################
-	# set the environment (from defineProblemEnvir)
-	############################################################################
-
-	#warn "PG: setting the environment (from defineProblemEnvir)\n";
-	my $envir = $class->defineProblemEnvir(
-		$ce,
-		$user,
-		$key,
-		$set,
-		$problem,
-		$psvn, #FIXME -- not used
-		$formFields,
-		$translationOptions,
-		{ #extras (this is kind of a hack, but not a serious one)
-			image_generator => $image_generator,
-			mailer => $mailer,
-			problemUUID => 0,
-		},
-	);
-	$translator->environment($envir);
-
-	############################################################################
-	# initialize the Translator
-	############################################################################
-	#warn "PG: initializing the Translator\n";
-	$translator->initialize();
-
-
-	############################################################################
-	# preload macros
-	############################################################################
-	# This is in transition.  here are the old instructions
-
-	# Preload the macros files which are used routinely: PG.pl,
-	# dangerousMacros.pl, IO.pl, PGbasicmacros.pl, and PGanswermacros.pl
-	# (Preloading the last two files safes a significant amount of time.)
-	#
-	# IO.pl, PG.pl, and dangerousMacros.pl are loaded using
-	# unrestricted_load This is hard wired into the
-	# Translator::pre_load_macro_files subroutine. I'd like to change this
-	# at some point to have the same sort of interface to defaults.config that
-	# the module loading does -- have a list of macros to load
-	# unrestrictedly.
-	#
-	# This has been replaced by the pre_load_macro_files subroutine.  It
-	# loads AND caches the files. While PG.pl and dangerousMacros are not
-	# large, they are referred to by PGbasicmacros and PGanswermacros.
-	# Because these are loaded into the cached name space (e.g.
-	# Safe::Root1::) all calls to, say NEW_ANSWER_NAME are actually calls
-	# to Safe::Root1::NEW_ANSWER_NAME.  It is useful to have these names
-	# inside the Safe::Root1: cached safe compartment.  (NEW_ANSWER_NAME
-	# and all other subroutine names are also automatically exported into
-	# the current safe compartment Safe::Rootx::
-	#
-	# The headers of both PGbasicmacros and PGanswermacros has code that
-	# insures that the constants used are imported into the current safe
-	# compartment.  This involves evaluating references to, say
-	# $main::displayMode, at runtime to insure that main refers to
-	# Safe::Rootx:: and NOT to Safe::Root1::, which is the value of main::
-	# at compile time.
-	#
-	# TO ENABLE CACHEING UNCOMMENT THE FOLLOWING:  -- this has not been used in some time
-# 	eval{$translator->pre_load_macro_files(
-# 		$WeBWorK::PG::Local::safeCache,
-# 		$ce->{pg}->{directories}->{macros},
-# 		#'PG.pl', 'dangerousMacros.pl','IO.pl','PGbasicmacros.pl','PGanswermacros.pl'
-# 	)};
-#   warn "Error while preloading macro files: $@" if $@;
-
-    ############################################################################
-    # Here are the new instructions for preloading the macros
-    ############################################################################
-
-	# STANDARD LOADING CODE: for cached script files, this merely
-	# initializes the constants.
-	#2010 -- in the new scheme PG.pl is the only file guaranteed
-	# initialization -- it reads in everything that dangerous macros
-	# and IO.pl
-	# did before.  Mostly it just defines access to the PGcore object
-
-	# 2010 the loop is overkill since there is just one file, we'll leave it for now in case there are more.
-	foreach (qw(PG.pl )) {   # dangerousMacros.pl IO.pl
-		my $macroPath = $ce->{pg}->{directories}->{macros} . "/$_";
-		my $err = $translator->unrestricted_load($macroPath);
-		warn "Error while loading $macroPath: $err" if $err;
-	}
-
-	############################################################################
-	# set the opcode mask (using default values)
-	############################################################################
-	#warn "PG: setting the opcode mask (using default values)\n";
-	$translator->set_mask();
-
-	############################################################################
-	# get the problem source
-	# FIXME -- this operation can be moved out of the translator.
-	############################################################################
-	#warn "PG: storing the problem source\n";
-	my $source ='';
-	my $sourceFilePath = '';
-	my $readErrors = undef;
-	if (ref($translationOptions->{r_source}) ) {
-		# the source for the problem is already given to us as a reference to a string
-		$source = ${$translationOptions->{r_source}};
-	} else {
-	    # the source isn't given to us so we need to read it
-	    # from a file defined by the problem
-
-		# we  grab the sourceFilePath from the problem
-		$sourceFilePath = $problem->source_file;
-
-	    # the path to the source file is usually given relative to the
-	    # the templates directory. Unless the path starts with / assume
-	    # that it is relative to the templates directory
-
-	    $sourceFilePath = $ce->{courseDirs}->{templates}."/"
-	    	         .$sourceFilePath unless ($sourceFilePath =~ /^\//);
-	    #now grab the source
-		eval {$source = readFile($sourceFilePath) };
-		$readErrors = $@ if $@;
-	 }
-
-	############################################################################
-    # put the source into the translator object
-    ############################################################################
-
-	eval { $translator->source_string( $source ) } unless $readErrors;
-	$readErrors .="\n  $@ " if $@;
-	if ($readErrors) {
-		# well, we couldn't get the problem source, for some reason.
-		return bless {
-			translator => $translator,
-			head_text  => "",
-			post_header_text => "",
-			body_text  => <<EOF,
-WeBWorK::Utils::readFile($sourceFilePath) says:
-$@
-EOF
-			answers    => {},
-			result     => {},
-			state      => {},
-			errors     => "Failed to read the problem source file.",
-			warnings   => "$warnings",
-			flags      => {error_flag => 1},
-			pgcore     => $translator->{rh_pgcore},
-		}, $class;
-	}
-
-	############################################################################
-	# install a safety filter
-	# FIXME -- I believe that since MathObjects this is no longer operational
-	############################################################################
-	#warn "PG: installing a safety filter\n";
-	#$translator->rf_safety_filter(\&oldSafetyFilter);
-	$translator->rf_safety_filter(\&WeBWorK::PG::nullSafetyFilter);
-
-	############################################################################
-	# write timing log entry -- the translator is now all set up
-	############################################################################
-# 	writeTimingLogEntry($ce, "WeBWorK::PG::new",
-# 		"initialized",
-# 		"intermediate");
-
-	############################################################################
-	# translate the PG source into text
-	############################################################################
-
-	#warn "PG: translating the PG source into text\n";
-	$translator->translate();
-
-	############################################################################
-	# !!!!!!!! IMPORTANT: $envir shouldn't be trusted after problem code runs!
-	############################################################################
-
-	my ($result, $state); # we'll need these on the other side of the if block!
-	if ($translationOptions->{processAnswers}) {
-
-		############################################################################
-		# process student answers
-		############################################################################
-
-		#warn "PG: processing student answers\n";
-		$translator->process_answers($formFields);
-
-        ############################################################################
-		# retrieve the problem state and give it to the translator
-		############################################################################
-		#warn "PG: retrieving the problem state and giving it to the translator\n";
-
-		$translator->rh_problem_state({
-			recorded_score =>       $problem->status,
-			sub_recorded_score =>   $problem->sub_status,
-			num_of_correct_ans =>   $problem->num_correct,
-			num_of_incorrect_ans => $problem->num_incorrect,
-		});
-
-        ############################################################################
-		# determine an entry order -- the ANSWER_ENTRY_ORDER flag is built by
-		# the PG macro package (PG.pl)
-		############################################################################
-		#warn "PG: determining an entry order\n";
-
-		my @answerOrder =
-			$translator->rh_flags->{ANSWER_ENTRY_ORDER}
-				? @{ $translator->rh_flags->{ANSWER_ENTRY_ORDER} }
-				: keys %{ $translator->rh_evaluated_answers };
-
-        ############################################################################
-		# install a grader -- use the one specified in the problem,
-		# or fall back on the default from the course environment.
-		# (two magic strings are accepted, to avoid having to
-		# reference code when it would be difficult.)
-		############################################################################
-		#warn "PG: installing a grader\n";
-
-		my $grader = $translator->rh_flags->{PROBLEM_GRADER_TO_USE}
-			|| $ce->{pg}->{options}->{grader};
-		$grader = $translator->rf_std_problem_grader
-			if $grader eq "std_problem_grader";
-		$grader = $translator->rf_avg_problem_grader
-			if $grader eq "avg_problem_grader";
-		die "Problem grader $grader is not a CODE reference."
-			unless ref $grader eq "CODE";
-		$translator->rf_problem_grader($grader);
-
-        ############################################################################
-		# grade the problem
-		############################################################################
-		#warn "PG: grading the problem\n";
-
-		($result, $state) = $translator->grade_problem(
-			answers_submitted  => $translationOptions->{processAnswers},
-			ANSWER_ENTRY_ORDER => \@answerOrder,
-			%{$formFields},  #FIXME?  this is used by sequentialGrader is there a better way
-		);
-
-	}
-
-	############################################################################
-	# after we're done translating, we may have to clean up after the
-	# translator:
-	############################################################################
-
-	############################################################################
-	# HTML_dpng uses an ImageGenerator. We have to render the queued equations.
-	############################################################################
-	my $body_text_ref  = $translator->r_text;
-	if ($image_generator) {
-		my $sourceFile = $ce->{courseDirs}->{templates} . "/" . $problem->source_file;
-		my %mtimeOption = -e $sourceFile ? (mtime => (stat $sourceFile)[9]) : ();
-
-		$image_generator->render(
-			refresh => $translationOptions->{refreshMath2img},
-			%mtimeOption,
-			body_text => $body_text_ref,
-		);
-	}
-
-	############################################################################
-	# send any queued mail messages
-	############################################################################
-
-	if ($mailer) {
-		$mailer->send_messages;
-	}
-
-	############################################################################
-	# end of cleanup phase
-	############################################################################
-
-	############################################################################
-	# write timing log entry
-	############################################################################
-# 	writeTimingLogEntry($ce, "WeBWorK::PG::new", "", "end");
-
-	############################################################################
-	# return an object which contains the translator and the results of
-	# the translation process.
-	############################################################################
-
-	return bless {
-		translator => $translator,
-		head_text  => ${ $translator->r_header },
-		post_header_text => ${ $translator->r_post_header},
-		body_text  => ${ $body_text_ref } , # from $translator->r_text
-		answers    => $translator->rh_evaluated_answers,
-		result     => $result,
-		state      => $state,
-		errors     => $translator->errors,
-		warnings   => $warnings,
-		flags      => $translator->rh_flags,
-		pgcore     => $translator->{rh_pgcore},
-	}, $class;
-}
-
-1;
-
-__END__
-
-=head1 OPERATION
-
-WeBWorK::PG::Local goes through the following operations when constructed:
-
-=over
-
-=item Create a translator
-
-Instantiate a WeBWorK::PG::Translator object.
-
-=item Set the directory hash
-
-Set the translator's directory hash (courseScripts, macros, templates, and temp
-directories) from the course environment.
-
-=item Evaluate PG modules
-
-Using the module list from the course environment (pg->modules), perform a
-"use"-like operation to evaluate modules at runtime.
-
-=item Set the problem environment
-
-Use data from the user, set, and problem, as well as the course
-environemnt and translation options, to set the problem environment. The
-default subroutine, &WeBWorK::PG::defineProblemEnvir, is used.
-
-=item Initialize the translator
-
-Call &WeBWorK::PG::Translator::initialize. What more do you want?
-
-=item Load IO.pl, PG.pl and dangerousMacros.pl
-
-These macros must be loaded without opcode masking, so they are loaded here.
-
-=item Set the opcode mask
-
-Set the opcode mask to the default specified by WeBWorK::PG::Translator.
-
-=item Load the problem source
-
-Give the problem source to the translator.
-
-=item Install a safety filter
-
-The safety filter is used to preprocess student input before evaluation. The
-default safety filter, &WeBWorK::PG::safetyFilter, is used.
-
-=item Translate the problem source
-
-Call &WeBWorK::PG::Translator::translate to render the problem source into the
-format given by the display mode.
-
-=item Process student answers
-
-Use form field inputs to evaluate student answers.
-
-=item Load the problem state
-
-Use values from the database to initialize the problem state, so that the
-grader will have a point of reference.
-
-=item Determine an entry order
-
-Use the ANSWER_ENTRY_ORDER flag to determine the order of answers in the
-problem. This is important for problems with dependancies among parts.
-
-=item Install a grader
-
-Use the PROBLEM_GRADER_TO_USE flag, or a default from the course environment,
-to install a grader.
-
-=item Grade the problem
-
-Use the selected grader to grade the problem.
-
-=back
-
-=head1 AUTHOR
-
-Written by Sam Hathaway, sh002i (at) math.rochester.edu.
-
-=cut
diff --git a/lib/WeBWorK/PG/Remote.pm b/lib/WeBWorK/PG/Remote.pm
deleted file mode 100644
index 014cc240df..0000000000
--- a/lib/WeBWorK/PG/Remote.pm
+++ /dev/null
@@ -1,176 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::PG::Remote;
-use base qw(WeBWorK::PG);
-
-=head1 NAME
-
-WeBWorK::PG::Remote - Use the WeBWorK::PG API to invoke a remote problem
-renderer via SOAP.
-
-=cut
-
-use strict;
-use warnings;
-use SOAP::Lite;
-use WeBWorK::Utils qw(readFile);
-
-sub new {
-	my $invocant = shift;
-	my $class = ref($invocant) || $invocant;
-	my (
-		$ce,
-		$user,
-		$key,
-		$set,
-		$problem,
-		$psvn, #FIXME -- not used
-		$formFields, # in CGI::Vars format
-		$translationOptions, # hashref containing options for the
-		                     # translator, such as whether to show
-		                     # hints and the display mode to use
-	) = @_;
-	
-	##### READ SOURCE FILE #####
-	
-	my $sourceFile = $problem->source_file;
-	$sourceFile = $ce->{courseDirs}->{templates}."/".$sourceFile
-		unless ($sourceFile =~ /^\//);
-	my $source = eval { readFile($sourceFile) };
-	if ($@) {
-		# well, we couldn't get the problem source, for some reason.
-		return bless {
-			translator => undef,
-			head_text  => "",
-			body_text  => <<EOF,
-WeBWorK::Utils::readFile($sourceFile) says:
-$@
-EOF
-			answers    => {},
-			result     => {},
-			state      => {},
-			errors     => "Failed to read the problem source file.",
-			warnings   => "",
-			flags      => {error_flag => 1},
-		}, $class;
-	}
-	
-	##### DEFINE REQUEST #####
-	
-	my $envir = $class->defineProblemEnvir(
-		$ce,
-		$user,
-		$key,
-		$set,
-		$problem,
-		$psvn, #FIXME -- not used
-		$formFields,
-		$translationOptions,
-	);
-	
-	my (@modules_to_load, @extra_packages_to_load);
-	my @modules = @{ $ce->{pg}->{modules} };
-	foreach my $module_packages_ref (@modules) {
-		my ($module, @extra_packages) = @$module_packages_ref;
-		# the first item is the main package
-		push @modules_to_load, $module;
-		# the remaining items are "extra" packages
-		push @extra_packages_to_load, @extra_packages;
-	}
-	
-	my $request = {
-		course                 => $ce->{courseName},
-		source                 => $source,
-		modules_to_evaluate    => [ @modules_to_load ],
-		extra_packages_to_load => [ @extra_packages_to_load ],
-		envir                  => $envir,
-		problem_state          => {
-			recorded_score       => $problem->status,
-			sub_recorded_score =>   $problem->sub_status,
-			num_of_correct_ans   => $problem->num_correct,
-			num_of_incorrect_ans => $problem->num_incorrect,
-		},
-		options                => $translationOptions,
-	};
-	
-	##### CALL REMOTE RENDERER #####
-	
-	my $package = __PACKAGE__;
-	my $proxy = $ce->{pg}->{renderers}->{$package}->{proxy};
-	
-	my $soap = SOAP::Lite
-		->uri("urn:RenderD")
-		->proxy($proxy);
-	my $query = $soap->render($request);
-	
-	##### HANDLE ERRORS #####
-	
-	if ($query->fault) {
-		return bless {
-			translator => undef,
-			head_text  => "",
-			body_text  => $query->faultstring,
-			answers    => {},
-			result     => {},
-			state      => {},
-			errors     => "Failed to call the remote renderer."
-				. " (error " . $query->faultcode . ")",
-			warnings   => "",
-			flags      => {error_flag => 1},
-		}, $class;
-	}
-	
-	##### RETURN RESULTS #####
-	
-	return $query->result;
-}
-
-1;
-
-__END__
-
-=head1 OPERATION
-
-WeBWorK::PG::Remote goes through the following operations when constructed:
-
-=over
-
-=item Read the problem source file
-
-Reads the contents of the problem source file from disk.
-
-=item Compile a problem environment
-
-Use data from the user, set, and problem, as well as the course
-environemnt and translation options, to compile a problem environment.
-The default subroutine, &WeBWorK::PG::defineProblemEnvir, is used.
-
-=item Compile a list of modules to load
-
-Use the course environment to compile a list of modules to load and
-extra packages to import.
-
-=item Call the remote renderer
-
-Use SOAP::Lite to call the C<renderd> remote rendering daemon.
-
-=back
-
-=head1 AUTHOR
-
-Written by Sam Hathaway, sh002i (at) math.rochester.edu.
-
-=cut
diff --git a/lib/WeBWorK/RPC.pm b/lib/WeBWorK/RPC.pm
deleted file mode 100644
index 8bf9f67736..0000000000
--- a/lib/WeBWorK/RPC.pm
+++ /dev/null
@@ -1,108 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::RPC;
-
-=head1 NAME
-
-WeBWorK::RPC - Remote Procedure Calls for WeBWorK.
-
-=cut
-
-use strict;
-use warnings;
-
-use Data::Dumper;
-use WeBWorK::Authen;
-use WeBWorK::Authz;
-use WeBWorK::CourseEnvironment;
-use WeBWorK::DB;
-use WeBWorK::RPC::Request;
-use WeBWorK::Utils qw/runtime_use/;
-
-sub bootstrap {
-	my ($invocant, %params) = @_;
-	my $class = ref $invocant || $invocant;
-	my $self = bless {}, $class;
-	
-	my $r = $self->{r} = new WeBWorK::RPC::Request;
-	
-	my $ce = eval { new WeBWorK::CourseEnvironment(\%WeBWorK::SeedCE) };
-	$@ and die "Failed to initialize course environment: $@\n";
-	$r->ce($ce);
-	
-	my $authz = new WeBWorK::Authz($r);
-	$r->authz($authz);
-	
-	my $authen_module = WeBWorK::Authen::class($ce, "user_module");
-	runtime_use $authen_module;
-	my $authen = $authen_module->new($r);
-	$r->authen($authen);
-	
-	if (defined $ce->{courseName} and $ce->{courseName} ne "") {
-		my $db = new WeBWorK::DB($ce->{dbLayout});
-		$r->db($db);
-	}
-	
-	return $self, %params;
-}
-
-sub hi {
-	print STDERR __PACKAGE__."::hi(@_) called\n";
-	return "hello, world";
-}
-
-sub bye {
-	print STDERR __PACKAGE__."::bye(@_) called\n";
-	return "goodbye, cruel world";
-}
-
-sub dumper {
-	print STDERR __PACKAGE__."::dumper(@_) called\n";
-	return Dumper(\@_);
-}
-
-sub get_course_environment {
-	my ($self, %params) = bootstrap(@_);
-	return $self->{r}->ce;
-}
-
-################################################################################
-
-package WeBWorK::RPC::CourseManagement;
-
-use WeBWorK::Utils::CourseManagement;
-
-sub listCourses {
-	my ($self) = WeBWorK::RPC::bootstrap(@_);
-	return WeBWorK::Utils::CourseManagement::listCourses($self->{r}->ce);
-}
-
-sub listArchivedCourses {
-	my ($self) = WeBWorK::RPC::bootstrap(@_);
-	return WeBWorK::Utils::CourseManagement::listArchivedCourses($self->{r}->ce);
-}
-
-sub addCourse {
-	my ($self, %options) = WeBWorK::RPC::bootstrap(@_);
-	die "missing courseID in \%options" unless defined $options{courseID};
-	$options{ce} = new WeBWorK::CourseEnvironment({
-		webwork_dir => $self->{r}->ce->{webwork_dir},
-		courseName => $options{courseID},
-	});
-	return WeBWorK::Utils::CourseManagement::addCourse(%options);
-}
-
-1;
diff --git a/lib/WeBWorK/Request.pm b/lib/WeBWorK/Request.pm
deleted file mode 100644
index c6fefd8b86..0000000000
--- a/lib/WeBWorK/Request.pm
+++ /dev/null
@@ -1,198 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::Request;
-
-=head1 NAME
-
-WeBWorK::Request - a request to the WeBWorK system, a subclass of
-Apache::Request with additional WeBWorK-specific fields.
-
-=cut
-
-use strict;
-use warnings;
-
-use base qw(WeBWorK::Localize Apache2::Request);
-
-use Encode;
-
-use WeBWorK::Localize;
-
-# Apache2::Request's param method doesn't support setting parameters, so we need to provide the
-# behavior in this class when running under mod_perl2.
-*param = *mutable_param;
-
-sub mutable_param {
-	my $self = shift;
-
-	if (not defined $self->{paramcache}) {
-	    my @names = $self->SUPER::param();
-	    foreach my $name (@names) {
-		my @params = $self->SUPER::param($name);
-		@params = map {Encode::decode("UTF-8",$_)} @params;
-		$self->{paramcache}{$name} = [@params];
-	    }
-	}
-
-	@_ or return keys %{$self->{paramcache}};
-
-	my $name = shift;
-	if (@_) {
-		my $val = shift;
-		if (ref $val eq "ARRAY") {
-			$self->{paramcache}{$name} = [@$val]; # make a copy
-		} else {
-			$self->{paramcache}{$name} = [$val];
-		}
-	}
-	return unless exists $self->{paramcache}{$name};
-	return wantarray ? @{$self->{paramcache}{$name}} : $self->{paramcache}{$name}->[0];
-}
-
-=head1 CONSTRUCTOR
-
-=over
-
-=item new(@args)
-
-Creates an new WeBWorK::Request. All arguments are passed to Apache::Request's
-constructor. You must specify at least an Apache request_rec object.
-
-=for comment
-
-From: http://search.cpan.org/~joesuf/libapreq-1.3/Request/Request.pm#SUBCLASSING_Apache::Request
-
-If the instances of your subclass are hash references then you can actually
-inherit from Apache::Request as long as the Apache::Request object is stored in
-an attribute called "r" or "_r". (The Apache::Request class effectively does the
-delegation for you automagically, as long as it knows where to find the
-Apache::Request object to delegate to.)
-
-=cut
-
-sub new {
-	my ($invocant, @args) = @_;
-	my $class = ref $invocant || $invocant;
-	# construct the superclass instance
-	return bless { r => Apache2::Request->new(@args) }, $class;
-}
-
-=back
-
-=cut
-
-=head1 METHODS
-
-=over
-
-=item ce([$new])
-
-Return the course environment (WeBWorK::CourseEnvironment) associated with this
-request. If $new is specified, set the course environment to $new before
-returning the value.
-
-=cut
-
-sub ce {
-	my $self = shift;
-	$self->{ce} = shift if @_;
-	return $self->{ce};
-}
-
-=item db([$new])
-
-Return the database (WeBWorK::DB) associated with this request. If $new is
-specified, set the database to $new before returning the value.
-
-=cut
-
-sub db {
-	my $self = shift;
-	$self->{db} = shift if @_;
-	return $self->{db};
-}
-
-=item authen([$new])
-
-Return the authenticator (WeBWorK::Authen) associated with this request. If $new
-is specified, set the authenticator to $new before returning the value.
-
-=cut
-
-sub authen {
-	my $self = shift;
-	$self->{authen} = shift if @_;
-	return $self->{authen};
-}
-
-=item authz([$new])
-
-Return the authorizer (WeBWorK::Authz) associated with this request. If $new is
-specified, set the authorizer to $new before returning the value.
-
-=cut
-
-sub authz {
-	my $self = shift;
-	$self->{authz} = shift if @_;
-	return $self->{authz};
-}
-
-=item urlpath([$new])
-
-Return the URL path (WeBWorK::URLPath) associated with this request. If $new is
-specified, set the URL path to $new before returning the value.
-
-=cut
-
-sub urlpath {
-	my $self = shift;
-	$self->{urlpath} = shift if @_;
-	return $self->{urlpath};
-}
-
-sub language_handle {
-	my $self = shift;
-	$self->{language_handle} = shift if @_;
-	return $self->{language_handle};
-}
-
-sub maketext {
-	my $self = shift;
-	&{ $self->{language_handle} }(@_);
-	# uncomment to check that your strings are run through maketext
-	# return 'xXx'.&{ $self->{language_handle} }(@_).'xXx';
-}
-
-=item location()
-
-Overrides the location() method in Apache::Request (or Apache2::Request) so that
-if the location is "/", the empty string is returned.
-
-=cut
-
-sub location {
-	my $self = shift;
-	my $location = $self->SUPER::location;
-	return $location eq "/" ? "" : $location;
-}
-
-=back
-
-=cut
-
-1;
-
diff --git a/lib/WeBWorK/Template.pm b/lib/WeBWorK/Template.pm
deleted file mode 100644
index 9aa3de5b95..0000000000
--- a/lib/WeBWorK/Template.pm
+++ /dev/null
@@ -1,225 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::Template;
-use base qw(Exporter);
-
-=head1 NAME
-
-WeBWorK::Template - apply a template to a ContentGenerator.
-
-=head1 SYNOPSIS
-
- use WeBWorK::Template qw/template/;
- 
- my $templateFile = "default.template";
- my $cg = WeBWorK::ContentGenerator::SomeSubclass->new($r);
- 
- template($templateFile, $cg);
-
-=head1 DESCRIPTION
-
-WeBWorK uses templates to customize the presentation of pages. A template is a
-complete HTML document, containing normal HTML code and special escape
-sequences.
-
-=head2 ESCAPE SEQUENCES
-
-Escape sequences have a format similar to that of server-side includes (SSI).
-The format is as follows:
-
- <!--#NAME ARG1="VALUE1" ARG2="VALUE2" ...-->
-
-An escape's C<NAME> and arguments (C<ARG1>, C<ARG2>, etc.) are case-sensitive,
-the argument values may or may not be depending on the particular escape. Most
-escapes have case-sensitive values.
-
-Escape equences are replaced by dynamically generated content from WeBWorK's
-content generation system, WeBWorK::ContentGenerator. When a template escape
-C<NAME> is encountered in the document, the template processor checks for a
-method of the same name in the current content generator. If found, that method
-is invoked as follows:
-
- @result = $contentGenerator->NAME(\%escapeArguments);
-
-where %escapeArguments contains the key/value pairs of arguments in the escape
-sequence (like C<ARG1="VALUE1" ARG2="VALUE2">). The method may print() output
-directly to the client or return a result. If the method returns a non-empty
-value, it is sent to the client.
-
-=head2 CONDITIONAL PROCESSING
-
-In addition to the normal escape sequences above, the escape sequences C<#if>,
-C<#else>, and C<#endif> are reserved and used to conditionally include portions
-of the template in the output.
-
-The C<#if> escape sequence has the following form:
-
- <!--#if PRED1="VALUE1" PRED2="VALUE2" ...->
-
-When an C<#if> escape is evaluated, each predicate (C<PRED1>, C<PRED2>, etc.) is
-evaluated by calling a method named C<if_PRED> in the current content generator
-with the predicate's value as the sole argument. If no such method exists, the
-predicate is false. If the method returns a true value, the predicate is true.
-
-If any predicate is true, the code between the C<#if> escape and a matching
-C<#else> or C<#endif> escape is included in the output. C<#if> statements can be
-nested.
-
-For example:
-
- <!--#if loggedin="1"-->
- <!--#if can="loginstatus"-->
- <div class="LoginStatus">
- 	<!--#loginstatus-->
- </div>
- <!--#endif-->
- <!--#endif-->
- <!--#if can="path"-->
- <div class="Path">
- 	<!--#path style="text" image="<!--#url type="webwork" name="htdocs"-->/images/right_arrow.png" text=" > "-->
- </div>
- <!--#endif-->
-
-Several predicate functions are defined in WeBWorK::ContentGenerator.
-
-=cut
-
-use strict;
-use warnings;
-use WeBWorK::Utils qw(readFile);
-
-our @EXPORT    = ();
-our @EXPORT_OK = qw(
-	template
-);
-
-=head1 FUNCTIONS
-
-=over
-
-=item template($templatePath, $cg)
-
-Process the template file $templatePath. Methods from $cg, an instance of
-WeBWorK::ContentGenerator, are called to handle escape sequences in the
-template.
-
-=cut
-
-sub template {
-	my ($templatePath, $cg) = @_;
-	
-	# the truth value of the top of this stack determines if we're printing output or not.
-	# we want to start off in printing mode.
-	# say $ifstack[-1] to get the result of the last <#!--if-->
-	my @ifstack = (1);
-	
-	my @template = split /\n/, readFile($templatePath);
-	
-	foreach my $line (@template) {
-		# This is incremental regex processing.
-		# the /c is so that pos($line) doesn't die when the regex fails.
-		while ($line =~ m/\G(.*?)<!--#(\w*)((?:\s+.*?)?)-->/gc) {
-			my ($before, $function, $raw_args) = ($1, $2, $3);
-			my @args = ($raw_args =~ /\S/) ? cook_args($raw_args) : ();
-			
-			if ($ifstack[-1]) {
-				print $before;
-			}
-			
-			if ($function eq "if") {
-				# a predicate can only be true if everything else on the ifstack is already true, for ANDing
-				push @ifstack, (if_handler($cg, [@args]) && $ifstack[-1]);
-				#Need to deal with the case where there are nested elses.  So an else should only become true if its inside a block that was printing.  
-			} elsif ($function eq "else" and @ifstack > 2) {
-				$ifstack[-1] = (not $ifstack[-1]) && $ifstack[-2];
-			} elsif ($function eq "else" and @ifstack > 1) {
-				$ifstack[-1] = not $ifstack[-1];
-			} elsif ($function eq "endif" and @ifstack > 1) {
-				pop @ifstack;
-			} elsif ($ifstack[-1]) {
-				if ($cg->can($function)) {
-					my @result = $cg->$function({@args});
-					if (@result && defined($result[0])) {
-						print @result;
-					} else {
-						warn "Template escape $function returned an empty list.";
-					}
-				}
-			}
-		}
-		
-		if ($ifstack[-1]) {
-			print substr($line, (defined pos $line) ? pos $line : 0), "\n";
-		}
-	}
-}
-
-# cook_args(STRING) - parses a string of the form ARG1="FOO" ARG2="BAR". Returns
-# a list which pairs into key/values and fits nicely in {}s.
-# 
-sub cook_args($) { # ... also used by bin/wwdb, so watch out
-	my ($raw_args) = @_;
-	my @args = ();
-	
-	# Boy I love m//g in scalar context!  Go read the camel book, heathen.
-	# First, get the whole token with the quotes on both ends...
-	while ($raw_args =~ m/\G\s*(\w*)="((?:[^"\\]|\\.)*)"/g) {
-		my ($key, $value) = ($1, $2);
-		# ... then, rip out all the protecty backspaces
-		$value =~ s/\\(.)/$1/g;
-		push @args, $key => $value;
-	}
-	
-	return @args;
-}
-
-# This is different.  It probably shouldn't print anything (except in debugging cases)
-# and it should return a boolean, not a string.  &if is called in a nonstandard way
-# by &template, with $args as an arrayref instead of a hashref.  this is a hack!  yay!
-# 
-# OK, this is a pluggin architecture.  it iterates through attributes of the "if" tag,
-# and for each predicate $p, it calls &if_$p in an object-oriented way, continuing the
-# grand templating theme of an object-oriented pluggable architecture using ->can($).
-# 
-sub if_handler {
-	my ($cg, $args) = @_;
-	# A single if "or"s it's components.  Nesting produces "and".
-	
-	my @args = @$args; # Hahahahaha, get it?!
-	
-	if (@args % 2 != 0) {
-		# flip out and kill people, but do not commit seppuku
-		print '<!--&if recieved an uneven number of arguments.  This shouldn\'t happen, but I\'ll let it slide.-->\n';
-	}
-	
-	while (@args > 1) {
-		my ($key, $value) = (shift @args, shift @args);
-		
-		# a non-existent &if_$key is the same as a false result, but we're ORing, so it's OK
-		my $sub = "if_$key"; # perl doesn't like it when you try to construct a string right in a method invocation
-		if ($cg->can("if_$key") and $cg->$sub("$value")) {
-			return 1;
-		}
-	}
-	
-	return 0;
-}
-
-=back
-
-=cut
-
-1;
diff --git a/lib/WeBWorK/URLPath.pm b/lib/WeBWorK/URLPath.pm
deleted file mode 100644
index 4ff9b82503..0000000000
--- a/lib/WeBWorK/URLPath.pm
+++ /dev/null
@@ -1,1147 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::URLPath;
-
-=head1 NAME
-
-WeBWorK::URLPath - the WeBWorK virtual URL heirarchy.
-
-=cut
-
-use strict;
-use warnings;
-use Carp;
-use WeBWorK::Debug;
-use WeBWorK::Localize;
-use WeBWorK::DB qw(validateKeyfieldValue);
-use WeBWorK::Utils qw(x format_set_name_display);
-
-use Scalar::Util qw(weaken);
-{
-	no warnings "redefine";
-
-	sub debug {
-		my ($label, $indent, @message) = @_;
-		my $header = " "x$indent;
-		$header .= "$label: " if $label ne "";
-		WeBWorK::Debug::debug($header, @message);
-	}
-}
-
-=head1 VIRTUAL HEIRARCHY
-
-PLEASE FOR THE LOVE OF GOD UPDATE THIS IF YOU CHANGE THE HEIRARCHY BELOW!!!
-
-Note:  Only database keyfield values can be used as path parameters.
-
- root                                /
-
- course_admin                        /admin/ -> logout, options, instructor_tools
- html2xml                            /html2xml/
- pgtotex                             /pgtotex/
- instructorXMLHandler                /instructorXMLHandler/
- set_list                            /$courseID/
-
- equation_display                    /$courseID/equation/
- feedback                            /$courseID/feedback/
- gateway_quiz                        /$courseID/quiz_mode/$setID/
- proctored_gateway_quiz              /$courseID/proctored_quiz_mode/$setID/
- proctored_gateway_proctor_login     /$courseID/proctored_quiz_mode/$setID/proctor_login/
- grades                              /$courseID/grades/
- hardcopy                            /$courseID/hardcopy/
- hardcopy_preselect_set              /$courseID/hardcopy/$setID/
- logout                              /$courseID/logout/
- options                             /$courseID/options/
-
- instructor_tools                    /$courseID/instructor/
-
- instructor_user_list                /$courseID/instructor/users/
- instructor_user_detail              /$courseID/instructor/users/$userID/
- instructor_sets_assigned_to_user    /$courseID/instructor/users/$userID/sets/
-
- instructor_set_list                 /$courseID/instructor/sets/
- instructor_set_detail               /$courseID/instructor/sets/$setID/
- instructor_users_assigned_to_set    /$courseID/instructor/sets/$setID/users/
-
- instructor_problem_grader           /$courseID/instructor/grader/$setID/$problemID
-
- instructor_add_users                /$courseID/instructor/add_users/
- instructor_set_assigner             /$courseID/instructor/assigner/
- instructor_file_transfer            /$courseID/instructor/files/
- instructor_file_manager             /$courseID/instructor/file_manager/
- instructor_set_maker                /$courseID/instructor/setmaker/
- instructor_config                   /$courseID/instructor/config/
-
- instructor_problem_editor           /$courseID/instructor/pgProblemEditor/
- instructor_problem_editor_withset   /$courseID/instructor/pgProblemEditor/$setID/
- instructor_problem_editor_withset_withproblem
-                                     /$courseID/instructor/pgProblemEditor/$setID/$problemID/
-
- instructor_scoring                  /$courseID/instructor/scoring/
- instructor_scoring_download         /$courseID/instructor/scoringDownload/
- instructor_mail_merge               /$courseID/instructor/send_mail/
-
- instructor_statistics               /$courseID/instructor/stats/
- instructor_set_statistics           /$courseID/instructor/stats/set/$setID/
- instructor_user_statistics          /$courseID/instructor/stats/student/$userID/
-
- instructor_progress                 /$courseID/instructor/StudentProgress/
- instructor_set_progress             /$courseID/instructor/StudentProgress/set/$setID/
- instructor_user_progress            /$courseID/instructor/StudentProgress/student/$userID/
-
- problem_list                        /$courseID/$setID/
- problem_detail                      /$courseID/$setID/$problemID/
- show_me_another                     /$courseID/$setID/$problemID/show_me_another
- answer_log                          /$courseID/show_answers/
- achievements                        /$courseID/achievements
- instructor_achievement_list         /$courseID/instructor/achievement_list
- instructor_achievement_editor       /$courseID/instructor/achievement_list/$achievementID/editor
- instructor_achievement_user_editor  /$courseID/instructor/achievement_list/$achievementID/users
-
-=cut
-
-################################################################################
-# tree of path types
-################################################################################
-
-# we use the x function to mark strings for localization
-# Note for the localization
-# [_1] = $userID
-# [_2] = $setID
-# [_3] = $problemID
-# [_4] = $courseID
-
-our %pathTypes = (
-	root => {
-		name    => 'WeBWorK',
-		parent  => '',
-		kids    => [ qw/course_admin  html2xml pgtotex instructorXMLHandler set_list / ],
-		match   => qr|^/|,
-		capture => [ qw// ],
-		produce => '/',
-		display => 'WeBWorK::ContentGenerator::Home',
-	},
-	course_admin => {
-		name    => x('Course Administration'),
-		parent  => 'root',
-		kids    => [ qw/logout options instructor_tools/ ],
-		match   => qr|^(admin)/|,
-		capture => [ qw/courseID/ ],
-		produce => 'admin/',
-		display => 'WeBWorK::ContentGenerator::CourseAdmin',
-	},
-
-	################################################################################
-
-	html2xml => {
-		name    => 'html2xml',
-		parent  => 'root', #    'set_list',
-		kids    => [ qw// ],
-		match   => qr|^html2xml/|,
-		capture => [ qw// ],
-		produce => 'html2xml/',
-		display => 'WeBWorK::ContentGenerator::renderViaXMLRPC',
-	},
-	pgtotex => {
-		name    => 'PG to Tex translator',
-		parent  => 'root',
-		kids    => [ qw// ],
-		match   => qr|^pgtotex.+|,
-		capture => [ qw// ],
-		produce => 'pgtotex/',
-		display => 'WeBWorK::ContentGenerator::PGtoTexRenderer',
-	},
-	instructorXMLHandler => {
-		name => 'instructorXMLHandler',
-		parent => 'root',
-		kids => [ qw// ],
-		match   => qr|^instructorXMLHandler/|,
-		capture => [ qw// ],
-		produce => 'instructorXMLHandler/',
-		display => 'WeBWorK::ContentGenerator::instructorXMLHandler',
-	},
-	set_list => {
-		name    => '[_4]',
-		parent  => 'root',
-		kids    => [ qw/equation_display feedback gateway_quiz proctored_gateway_quiz answer_log grades hardcopy achievements
-			logout options instructor_tools problem_list
-			/ ],
-		match   => qr|^([^/]+)/|,
-		capture => [ qw/courseID/ ],
-		produce => '$courseID/',
-		display => 'WeBWorK::ContentGenerator::ProblemSets',
-	},
-
-	################################################################################
-
-	equation_display => {
-		name    => x('Equation Display'),
-		parent  => 'set_list',
-		kids    => [ qw// ],
-		match   => qr|^equation/|,
-		capture => [ qw// ],
-		produce => 'equation/',
-		display => 'WeBWorK::ContentGenerator::EquationDisplay',
-	},
-	feedback => {
-		name    => x('Feedback'),
-		parent  => 'set_list',
-		kids    => [ qw// ],
-		match   => qr|^feedback/|,
-		capture => [ qw// ],
-		produce => 'feedback/',
-		display => 'WeBWorK::ContentGenerator::Feedback',
-		unrestricted => 1
-	},
-	gateway_quiz => {
-		name    => x('Gateway Quiz [_2]'),
-		parent  => 'set_list',
-		kids    => [ qw// ],
-		match   => qr|^quiz_mode/([^/]+)/|,
-		capture => [ qw/setID/ ],
-		produce => 'quiz_mode/$setID/',
-		display => 'WeBWorK::ContentGenerator::GatewayQuiz',
-		unrestricted => 1
-	},
-
-	answer_log => {
-		name    => x('Answer Log'),
-		parent  => 'set_list',
-		kids    => [ qw// ],
-		match   => qr|^show_answers/|,
-		capture => [ qw// ],
-		produce => 'show_answers/',
-		display => 'WeBWorK::ContentGenerator::Instructor::ShowAnswers',
-	},
-
-	proctored_gateway_quiz => {
-		name    => x('Proctored Gateway Quiz [_2]'),
-		parent  => 'set_list',
-		kids    => [ qw/proctored_gateway_proctor_login/ ],
-		match   => qr|^proctored_quiz_mode/([^/]+)/|,
-		capture => [ qw/setID/ ],
-		produce => 'proctored_quiz_mode/$setID/',
-		display => 'WeBWorK::ContentGenerator::ProctoredGatewayQuiz',
-		unrestricted => 1
-	},
-	proctored_gateway_proctor_login => {
-		name    => x('Proctored Gateway Quiz [_2] Proctor Login'),
-		parent  => 'proctored_gateway_quiz',
-		kids    => [ qw// ],
-		match   => qr|^proctored_quiz_mode/([^/]+)/|,
-		capture => [ qw/setID/ ],
-		produce => 'proctored_quiz_mode/$setID/proctor_login',
-		display => 'WeBWorK::ContentGenerator::LoginProctor',
-		unrestricted => 1
-	},
-	grades => {
-		name    => x('Grades'),
-		parent  => 'set_list',
-		kids    => [ qw// ],
-		match   => qr|^grades/|,
-		capture => [ qw// ],
-		produce => 'grades/',
-		display => 'WeBWorK::ContentGenerator::Grades',
-	},
-	achievements  => {
-		name    => x('Achievements'),
-		parent  => 'set_list',
-		kids    => [ qw// ],
-		match   => qr|^achievements/|,
-		capture => [ qw// ],
-		produce => 'achievements/',
-		display => 'WeBWorK::ContentGenerator::Achievements',
-		unrestricted => 1
-	},
-	hardcopy => {
-		name    => x('Hardcopy Generator'),
-		parent  => 'set_list',
-		kids    => [ qw/hardcopy_preselect_set/ ],
-		match   => qr|^hardcopy/|,
-		capture => [ qw// ],
-		produce => 'hardcopy/',
-		display => 'WeBWorK::ContentGenerator::Hardcopy',
-	},
-	hardcopy_preselect_set => {
-		name    => x('Hardcopy Generator'),
-		parent  => 'hardcopy',
-		kids    => [ qw// ],
-		match   => qr|^([^/]+)/|,
-		capture => [ qw/setID/ ],
-		produce => '$setID/',
-		display => 'WeBWorK::ContentGenerator::Hardcopy',
-		unrestricted => 1
-	},
-	logout => {
-		name    => x('Logout'),
-		parent  => 'set_list',
-		kids    => [ qw// ],
-		match   => qr|^logout/|,
-		capture => [ qw// ],
-		produce => 'logout/',
-		display => 'WeBWorK::ContentGenerator::Logout',
-	},
-	options => {
-		name    => x('User Settings'),
-		parent  => 'set_list',
-		kids    => [ qw// ],
-		match   => qr|^options/|,
-		capture => [ qw// ],
-		produce => 'options/',
-		display => 'WeBWorK::ContentGenerator::Options',
-		unrestricted => 1
-	},
-
-	################################################################################
-
-	instructor_tools => {
-		name    => x('Instructor Tools'),
-		parent  => 'set_list',
-		kids    => [ qw/
-			instructor_user_list instructor_set_list
-			instructor_add_users instructor_achievement_list
-			instructor_set_assigner instructor_file_manager
-			instructor_problem_editor
-			instructor_set_maker
-			instructor_config
-			instructor_scoring instructor_scoring_download instructor_mail_merge
-			instructor_statistics
-			instructor_progress
-			instructor_problem_grader
-			/ ],
-		match   => qr|^instructor/|,
-		capture => [ qw// ],
-		produce => 'instructor/',
-		display => 'WeBWorK::ContentGenerator::Instructor::Index',
-	},
-
-	################################################################################
-
-	instructor_user_list => {
-		name    => x('Classlist Editor'),
-		parent  => 'instructor_tools',
-		kids    => [ qw/instructor_user_detail/ ],
-		match   => qr|^users/|,
-		capture => [ qw// ],
-		produce => 'users/',
-		display => 'WeBWorK::ContentGenerator::Instructor::UserList',
-	},
-	instructor_user_detail => {
-		name    => x('Sets assigned to [_1]'),
-		parent  => 'instructor_user_list',
-		kids    => [ qw/instructor_sets_assigned_to_user/ ],
-		match   => qr|^([^/]+)/|,
-		capture => [ qw/userID/ ],
-		produce => '$userID/',
-		display => 'WeBWorK::ContentGenerator::Instructor::UserDetail',
-	},
-	instructor_sets_assigned_to_user => {
-		name    => x('Sets Assigned to User'),
-		parent  => 'instructor_user_detail',
-		kids    => [ qw// ],
-		match   => qr|^sets/|,
-		capture => [ qw// ],
-		produce => 'sets/',
-		display => 'WeBWorK::ContentGenerator::Instructor::SetsAssignedToUser',
-	},
-
-	################################################################################
-
-	instructor_set_list => {
-		name    => x('Hmwk Sets Editor'),
-		parent  => 'instructor_tools',
-		kids    => [ qw/instructor_set_detail/ ],
-		match   => qr|^sets/|,
-		capture => [ qw// ],
-		produce => 'sets/',
-		display => 'WeBWorK::ContentGenerator::Instructor::ProblemSetList',
-	},
-
-	instructor_set_detail => {
-		name    => x('Set Detail for set [_2]'),
-		parent  => 'instructor_set_list',
-		kids    => [ qw/instructor_users_assigned_to_set/ ],
-		match   => qr|^([^/]+)/|,
-		capture => [ qw/setID/ ],
-		produce => '$setID/',
-		display => 'WeBWorK::ContentGenerator::Instructor::ProblemSetDetail',
-	},
-
-	instructor_users_assigned_to_set => {
-		name    => x('Users Assigned to Set [_2]'),
-		parent  => 'instructor_set_detail',
-		kids    => [ qw// ],
-		match   => qr|^users/|,
-		capture => [ qw// ],
-		produce => 'users/',
-		display => 'WeBWorK::ContentGenerator::Instructor::UsersAssignedToSet',
-	},
-
-	instructor_problem_grader => {
-		name    => x('Manual Grader'),
-		parent  => 'instructor_tools',
-		kids    => [ qw// ],
-		match   => qr|^grader/([^/]+)/([^/]+)/|,
-		capture => [ qw/setID problemID/ ],
-		produce => 'grader/$setID/$problemID',
-		display => 'WeBWorK::ContentGenerator::Instructor::ProblemGrader',
-	},
-
-	################################################################################
-
-	instructor_add_users => {
-		name    => x('Add Users'),
-		parent  => 'instructor_tools',
-		kids    => [ qw// ],
-		match   => qr|^add_users/|,
-		capture => [ qw// ],
-		produce => 'add_users/',
-		display => 'WeBWorK::ContentGenerator::Instructor::AddUsers',
-	},
-	instructor_set_assigner => {
-		name    => x('Set Assigner'),
-		parent  => 'instructor_tools',
-		kids    => [ qw// ],
-		match   => qr|^assigner/|,
-		capture => [ qw// ],
-		produce => 'assigner/',
-		display => 'WeBWorK::ContentGenerator::Instructor::Assigner',
-	},
-	instructor_config => {
-		name    => x('Course Configuration'),
-		parent  => 'instructor_tools',
-		kids    => [ qw// ],
-		match   => qr|^config/|,
-		capture => [ qw// ],
-		produce => 'config/',
-		display => 'WeBWorK::ContentGenerator::Instructor::Config',
-	},
-	instructor_set_maker => {
-		name    => x('Library Browser'),
-		parent  => 'instructor_tools',
-		kids    => [ qw// ],
-		match   => qr|^setmaker/|,
-		capture => [ qw// ],
-		produce => 'setmaker/',
-		display => 'WeBWorK::ContentGenerator::Instructor::SetMaker',
-	},
-	instructor_file_manager => {
-		name    => x('File Manager'),
-		parent  => 'instructor_tools',
-		kids    => [ qw// ],
-		match   => qr|^file_manager/|,
-		capture => [ qw// ],
-		produce => 'file_manager/',
-		display => 'WeBWorK::ContentGenerator::Instructor::FileManager',
-	},
-	instructor_problem_editor => {
-		name    => x('Problem Editor'),
-		parent  => 'instructor_tools',
-		kids    => [ qw/instructor_problem_editor_withset/ ],
-		match   => qr|^pgProblemEditor/|,
-		capture => [ qw// ],
-		produce => 'pgProblemEditor/',
-		display => 'WeBWorK::ContentGenerator::Instructor::PGProblemEditor',
-	},
-	instructor_problem_editor_withset => {
-		name    => '[_2]',
-		parent  => 'instructor_problem_editor',
-		kids    => [ qw/instructor_problem_editor_withset_withproblem/ ],
-		match   => qr|^([^/]+)/|,
-		capture => [ qw/setID/ ],
-		produce => '$setID/',
-		display => undef,
-	},
-	instructor_problem_editor_withset_withproblem => {
-		name    => '[_3]',
-		parent  => 'instructor_problem_editor_withset',
-		kids    => [ qw// ],
-		match   => qr|^([^/]+)/|,
-		capture => [ qw/problemID/ ],
-		produce => '$problemID/',
-		display => 'WeBWorK::ContentGenerator::Instructor::PGProblemEditor',
-	},
-	instructor_scoring => {
-		name    => x('Scoring Tools'),
-		parent  => 'instructor_tools',
-		kids    => [ qw// ],
-		match   => qr|^scoring/|,
-		capture => [ qw// ],
-		produce => 'scoring/',
-		display => 'WeBWorK::ContentGenerator::Instructor::Scoring',
-	},
-	instructor_scoring_download => {
-		name    => x('Scoring Download'),
-		parent  => 'instructor_tools',
-		kids    => [ qw// ],
-		match   => qr|^scoringDownload/|,
-		capture => [ qw// ],
-		produce => 'scoringDownload/',
-		display => 'WeBWorK::ContentGenerator::Instructor::ScoringDownload',
-	},
-	instructor_mail_merge => {
-		name    => x('Email'),
-		parent  => 'instructor_tools',
-		kids    => [ qw// ],
-		match   => qr|^send_mail/|,
-		capture => [ qw// ],
-		produce => 'send_mail/',
-		display => 'WeBWorK::ContentGenerator::Instructor::SendMail',
-	},
-
-	################################################################################
-
-	instructor_statistics => {
-		name    => x('Statistics'),
-		parent  => 'instructor_tools',
-		kids    => [ qw/instructor_set_statistics instructor_user_statistics/ ],
-		match   => qr|^stats/|,
-		capture => [ qw// ],
-		produce => 'stats/',
-		display => 'WeBWorK::ContentGenerator::Instructor::Stats',
-	},
-	instructor_set_statistics => {
-		name    => '[_2]',
-		parent  => 'instructor_statistics',
-		kids    => [ qw// ],
-		match   => qr|^(set)/([^/]+)/|,
-		capture => [ qw/statType setID/ ],
-		produce => 'set/$setID/',
-		display => 'WeBWorK::ContentGenerator::Instructor::Stats',
-	},
-	instructor_user_statistics => {
-		name    => '[_1]',
-		parent  => 'instructor_statistics',
-		kids    => [ qw// ],
-		match   => qr|^(student)/([^/]+)/|,
-		capture => [ qw/statType userID/ ],
-		produce => 'student/$userID/',
-		display => 'WeBWorK::ContentGenerator::Instructor::Stats',
-	},
-
-	################################################################################
-
-	instructor_achievement_list => {
-		name    =>  x('Achievement Editor'),
-		parent  =>  'instructor_tools',
-		kids    =>  [ qw/instructor_achievement_editor instructor_achievement_user_editor/ ],
-		match   =>  qr|^achievement_list/|,
-		capture =>  [ qw// ],
-		produce =>  'achievement_list/',
-		display =>  'WeBWorK::ContentGenerator::Instructor::AchievementList',
-	},
-
-	instructor_achievement_editor => {
-		name    => x('Achievement Evaluator Editor'),
-		parent  => 'instructor_achievement_list',
-		kids => [ qw// ],
-		match => qr|^([^/]+)/editor/|,
-		capture => [ qw/achievementID/ ],
-		produce => '$achievementID/editor/',
-		display => 'WeBWorK::ContentGenerator::Instructor::AchievementEditor',
-	},
-
-	instructor_achievement_user_editor => {
-		name    => x('Achievement User Editor'),
-		parent  => 'instructor_achievement_list',
-		kids => [ qw// ],
-		match   => qr|^([^/]+)/users/|,
-		capture => [ qw/achievementID/ ],
-		produce => '$achievementID/users/',
-		display => 'WeBWorK::ContentGenerator::Instructor::AchievementUserEditor',
-	},
-
-	################################################################################
-
-	instructor_progress => {
-		name    => x('Student Progress'),
-		parent  => 'instructor_tools',
-		kids    => [ qw/instructor_set_progress instructor_user_progress/ ],
-		match   => qr|^progress/|,
-		capture => [ qw// ],
-		produce => 'progress/',
-		display => 'WeBWorK::ContentGenerator::Instructor::StudentProgress',
-	},
-	instructor_set_progress => {
-		name    => '[_2]',
-		parent  => 'instructor_progress',
-		kids    => [ qw// ],
-		match   => qr|^(set)/([^/]+)/|,
-		capture => [ qw/statType setID/ ],
-		produce => 'set/$setID/',
-		display => 'WeBWorK::ContentGenerator::Instructor::StudentProgress',
-	},
-	instructor_user_progress => {
-		name    => '[_1]',
-		parent  => 'instructor_progress',
-		kids    => [ qw// ],
-		match   => qr|^(student)/([^/]+)/|,
-		capture => [ qw/statType userID/ ],
-		produce => 'student/$userID/',
-		display => 'WeBWorK::ContentGenerator::Instructor::StudentProgress',
-	},
-
-	################################################################################
-
-	problem_list => {
-		name    => '[_2]',
-		parent  => 'set_list',
-		kids    => [ qw/problem_detail/ ],
-		match   => qr|^([^/]+)/|,
-		capture => [ qw/setID/ ],
-		produce => '$setID/',
-		display => 'WeBWorK::ContentGenerator::ProblemSet',
-		unrestricted => 1
-	},
-	problem_detail => {
-		name    => '[_3]',
-		parent  => 'problem_list',
-		kids    => [ qw/show_me_another/ ],
-		match   => qr|^([^/]+)/|,
-		capture => [ qw/problemID/ ],
-		produce => '$problemID/',
-		display => 'WeBWorK::ContentGenerator::Problem',
-		unrestricted => 1
-	},
-	show_me_another => {
-		name    => x('Show Me Another'),
-		parent  => 'problem_detail',
-		kids    => [ qw// ],
-		match   => qr|^show_me_another/|,
-		capture => [ qw// ],
-		produce => 'show_me_another/',
-		display => 'WeBWorK::ContentGenerator::ShowMeAnother',
-		unrestricted => 1
-	},
-);
-
-=for comment
-
-a handy template:
-
-	id => {
-		name    => '',
-		parent  => '',
-		kids    => [ qw// ],
-		match   => qr|^/|,
-		capture => [ qw// ],
-		produce => '',
-		display => '',
-	},
-
-=cut
-
-################################################################################
-
-=head1 CONSTRUCTORS
-
-=over
-
-=item new(%fields)
-
-Creates a new WeBWorK::URLPath. %fields may contain the following:
-
- type => the internal path type associated with this
- args => a reference to a hash associating path arguments with values
-
-This constructor is used internally. Refer to newFromPath() and newFromModule()
-for more useful constructors.
-
-=cut
-
-sub new {
-	my ($invocant, %fields) = @_;
-	my $class = ref $invocant || $invocant;
-	my $self = {
-		type => undef,
-		r    => undef,             # will point to the parent request object (for access to the $ce)
-		args => {},
-		%fields,
-	};
- 	weaken $self -> {r};
-	return bless $self, $class;
-}
-
-=item newFromPath($path)
-
-Creates a new WeBWorK::URLPath by parsing the path given in $path. It the path
-is invalid, an exception is thrown.
-
-=cut
-
-sub newFromPath {
-	my ($invocant,  $path, $r) = @_;
-
-	my ($type, %args) = getPathType($path);
-	croak "no type matches path $path" unless $type;
-	croak "URLPath requires a request object parent as second element" unless (ref($r) =~/WeBWorK::Request/);
-
-	return $invocant->new(
-		type => $type,
-		r    => $r,             # will point to the parent request object (for access to the $ce)
-		args => \%args,
-	);
-}
-
-=item newFromModule($module,  $r, %args)
-
-Creates a new WeBWorK::URLPath by finding a path type which matches the module
-and path arguments given. If no type matches, an exception is thrown.
-
-=cut
-
-sub newFromModule {
-	my ($invocant, $module, $r, %args) = @_;
-
-	my $type = getModuleType($module, keys %args);
-	croak "URLPath requires a request object parent as second element" unless (ref($r) =~/WeBWorK::Request/);
-	croak "no type matches module $module with args", map { " $_=>$args{$_}" } keys %args unless $type;
-
-	return $invocant->new(
-		type => $type,
-		r    => $r,
-		args => \%args
-	);
-}
-
-=back
-
-=cut
-
-################################################################################
-
-=head1 METHODS
-
-=head2 Methods that return information from the object itself
-
-=over
-
-=item type()
-
-Returns the path type of the WeBWorK::URLPath.
-
-=cut
-
-sub type {
-	my ($self) = @_;
-	my $type = $self->{type};
-
-	return $type;
-}
-
-=item args()
-
-Returns a hash of arguments derived from the WeBWorK::URLPath.
-
-=cut
-
-sub args {
-	my ($self) = @_;
-	my %args = %{ $self->{args} };
-
-	return %args;
-}
-
-=item arg($name)
-
-Returns the named argument, as derived from the WeBWorK::URLPath.
-
-=cut
-
-sub arg {
-	my ($self, $name) = @_;
-	my %args = %{ $self->{args} };
-
-	return $args{$name};
-}
-
-=back
-
-=cut
-
-# ------------------------------------------------------------------------------
-
-=head2 Methods that return information from path node associated with the object
-
-=over
-
-=item name()
-
-Returns the human-readable name of this WeBWorK::URLPath.
-This displays set ids and course ids with spaces instead of underscores, and if
-C<$displayHTML> is true, it places the set id into an ltr span so that it is
-displayed ltr even for rtl languages.  Note that the return value of this method
-should never be used to determine what type of path this is or for any sort of
-further processing.  It is a translated string.
-
-=cut
-
-sub name {
-	my ($self, $displayHTML) = @_;
-	my %args = $self->args;
-
-	# Translate the display name.
-	my $name = $self->{r}->maketext(
-		$pathTypes{ $self->{type} }{name},
-		$args{userID} // '',
-		$displayHTML
-		? CGI::span({ dir => 'ltr' }, format_set_name_display($args{setID} // ''))
-		: format_set_name_display($args{setID} // ''),
-		$args{problemID} // '',
-		($args{courseID} // '') =~ s/_/ /gr
-	);
-
-	return $name;
-}
-
-=item module()
-
-Returns the name of the module that will handle this WeBWorK::URLPath.
-
-=cut
-
-sub module {
-	my ($self) = @_;
-	my $type = $self->{type};
-
-	return $pathTypes{$type}->{display};
-}
-
-=item navigation_restricted()
-
-Returns 1 if the path is restricted from being viewed by a user that does not
-have the navigation_allowed permission, and 0 otherwise.  The allowed paths for
-restricted users are marked with the unrestricted flag.
-
-=cut
-
-sub navigation_restricted {
-	my $self = shift;
-	return defined $pathTypes{$self->{type}}{unrestricted} ? 0 : 1;
-}
-
-=back
-
-=cut
-
-# ------------------------------------------------------------------------------
-
-=head2 Methods that search the virtual heirarchy
-
-=over
-
-=item parent()
-
-Returns a new WeBWorK::URLPath representing the parent of the current URLPath.
-Returns an undefined value if the URLPath has no parent.
-
-=cut
-
-sub parent {
-	my ($self) = @_;
-	my $type = $self->{type};
-
-	my $newType = $pathTypes{$self->{type}}->{parent};
-	return undef unless $newType;
-
-	# remove any arguments added by the current node (and therefore not needed by the parent)
-	my @currArgs = @{ $pathTypes{$type}->{capture} };
-	my %newArgs = %{ $self->{args} };
-	delete @newArgs{@currArgs} if @currArgs;
-	# use the same request object "parent" for parent URLPath as for the child
-	return $self->new(type => $newType, r => $self->{r}, args => \%newArgs);
-}
-
-=item child($module, %newArgs)
-
-Returns a new WeBWorK::URLPath representing the child of the current URLPath
-whose module is C<$module>. If no child matches, an undefined value is returned.
-Pass additional arguments needed by the child in C<%newArgs>.
-
-=cut
-
-sub child {
-	my ($self, $module, %newArgs) = @_;
-	my $type = $self->{type};
-
-	my @kids = @{ $pathTypes{$type}->{kids} };
-	my $newType;
-	foreach my $kid (@kids) {
-		if ($pathTypes{$kid}->{module} eq $module) {
-			$newType = $kid;
-			last;
-		}
-	}
-
-	if ($newType) {
-		return $self->new(type => $newType, args => \%newArgs);
-	} else {
-		return undef;
-	}
-}
-
-=item path()
-
-Reconstructs the path string from a WeBWorK::URLPath.
-
-=cut
-
-sub path {
-	my ($self) = @_;
-	my $type = $self->type;
-	my %args = %{ $self->{args} };
-
-	my $path = buildPathFromType($type);
-	$path = interpolate($path, %args);
-
-	return $path;
-}
-
-=back
-
-=cut
-
-
-
-################################################################################
-
-=head1 UTILITY FUNCTIONS
-
-=over
-
-=item all_modules()
-
-Return a list of the display modules associated with all possible path types.
-
-=cut
-
-sub all_modules {
-	my @modules = grep { defined } map { $pathTypes{$_}{display} } keys %pathTypes;
-	my %modules; @modules{@modules} = (); # remove duplicates
-	return keys %modules;
-}
-
-=item interpolate($string, %symbols)
-
-Replaces simple scalars (\$\w+) in $string with values in %symbols. If a scalar
-does not exist in %symbols, it is left alone.
-
-=cut
-
-sub interpolate {
-	my ($string, %symbols) = @_;
-
-	$string =~ s/\$(\w+)/exists $symbols{$1} ? $symbols{$1} : "\$$1"/eg;
-
-	return $string;
-}
-
-=back
-
-=cut
-
-# ------------------------------------------------------------------------------
-
-=over
-
-=item getPathType($path)
-
-Parse the string $path, determining the path type. Returns ($type, %args), where
-$type is the type of the path and %args contains any extracted path arguments.
-If conversion fails, a false value is returned.
-
-=cut
-
-sub getPathType($) {
-	my ($path) = @_;
-
-	my %args;
-	my $context = visitPathTypeNode("root", $path, \%args, 0);
-
-	return $context, %args;
-}
-
-=item getModuleType($module, @args)
-
-Returns the path type matching the given module and argument names, or a false
-value if no type matches.
-
-=cut
-
-sub getModuleType {
-	my ($module, @args) = @_;
-	@args = sort @args;
-	my %args;
-	@args{@args} = ();
-
-	NODE: foreach my $nodeID (keys %pathTypes) {
-		my $node = $pathTypes{$nodeID};
-
-		# module name matches?
-		next NODE unless defined $node->{display} and $node->{display} eq $module;
-
-		# collect all captures from here to root
-		my @captures;
-		my $tmpNodeID = $nodeID;
-		while ($tmpNodeID) {
-			my $tmpNode = $pathTypes{$tmpNodeID};
-			push @captures, @{ $tmpNode->{capture} };
-			$tmpNodeID = $tmpNode->{parent};
-		}
-
-		# same number of captures?
-		next NODE unless @captures == @args;
-
-		# same captures?
-		@captures = sort @captures;
-		for (my $i = 0; $i < @args; $i++) {
-			next NODE unless $args[$i] eq $captures[$i];
-		}
-
-		# if we got here, this node matches
-		return $nodeID;
-	}
-
-	return 0; # no node matches
-}
-
-=item buildPathFromType($type)
-
-Returns a string path for the given path type. Since arguments are not supplied,
-the string may contain scalar variables ripe for interpolation.
-
-=cut
-
-sub buildPathFromType($) {
-	my ($type) = @_;
-
-	my $path = "";
-
-	while ($type) {
-		$path = $pathTypes{$type}->{produce} . $path;
-		$type = $pathTypes{$type}->{parent};
-	};
-
-	return $path;
-}
-
-=item visitPathTypeNode($nodeID, $path, $argsRef, $indent)
-
-Internal search function. See getPathType().
-
-Returns the nodeID of the node that consumed the final characters in $path, or
-the following failure conditions:
-
-Returns 0 if $nodeID doesn't match $path.
-
-Returns -1 if $nodeID matched $path, but no children of $nodeID consumed the
-remaining path. In this case, the stack is unwound immediately.
-
-=cut
-
-sub visitPathTypeNode($$$$);
-
-sub visitPathTypeNode($$$$) {
-	my ($nodeID, $path, $argsRef, $indent) = @_;
-	debug("visitPathTypeNode", $indent, "visiting node $nodeID with path $path");
-
-	unless (exists $pathTypes{$nodeID}) {
-		debug("visitPathTypeNode", $indent, "node $nodeID doesn't exist in node list: failed");
-		die "node $nodeID doesn't exist in node list: failed";
-	}
-
-	my %node = %{ $pathTypes{$nodeID} };
-	my $match = $node{match};
-	my @capture_names = @{ $node{capture} };
-
-	# attempt to match $path against $match.
-	debug("visitPathTypeNode", $indent, "trying to match $match: ");
-	if ($path =~ s/($match)//) {
-		# it matches! store captured strings in $argsRef and remove the matched
-		# characters from $path. waste a lot of lines on sanity checking... ;)
-		debug("", 0, "success!");
-		my @capture_values = $1 =~ m/$match/;
-		if (@capture_names) {
-			my $nexpected = @capture_names;
-			my $ncaptured = @capture_values;
-			my $max = $nexpected > $ncaptured ? $nexpected : $ncaptured;
-			warn "captured $ncaptured arguments, expected $nexpected." unless $ncaptured == $nexpected;
-			for (my $i = 0; $i < $max; $i++) {
-				my $name = $capture_names[$i];
-				my $value = $capture_values[$i];
-
-				# check to see if the url path parameter is a valid keyfield for the DB.
-				WeBWorK::DB::validateKeyfieldValue($name,$value,1);
-
-				if ($i > $nexpected) {
-					warn "captured an unexpected argument: $value -- ignoring it.";
-					next;
-				}
-				if ($i > $ncaptured) {
-					warn "expected an uncaptured argument named: $name -- ignoring it.";
-					next;
-				}
-				if (exists $argsRef->{$name}) {
-					my $old = $argsRef->{$name};
-					warn "encountered argument $name again, old value: $old new value: $value -- replacing.";
-				}
-				debug("visitPathTypeNode", $indent, "setting argument $name => $value.");
-				$argsRef->{$name} = $value;
-			}
-		}
-	} else {
-		# it doesn't match. bail out now with return value 0
-		debug("", 0, "failed.");
-		return 0;
-	}
-
-	##### if we're here we matched #####
-
-	# if there's no more path left, then this node is the one! return $nodeID
-	if ($path eq "") {
-		debug("visitPathTypeNode", $indent, "no path left, type is $nodeID");
-		return $nodeID;
-	}
-
-	# otherwise, we have to send the remaining path to the node's children
-	debug("visitPathTypeNode", $indent, "but path remains: $path");
-	my @kids = @{ $node{kids} };
-	if (@kids) {
-		foreach my $kid (@kids) {
-			debug("visitPathTypeNode", $indent, "trying child $kid:");
-			my $result = visitPathTypeNode($kid, $path, $argsRef, $indent+1);
-			# we return in two situations:
-			# if $result is -1, then the kid matched but couldn't consume the rest of the path
-			# if $result is the ID of a node, then the kid matched and consumed the rest of the path
-			# these are all true values (assuming that "0" isn't a valid node ID), so we say:
-			return $result if $result;
-		}
-		debug("visitPathTypeNode", $indent, "no children claimed the remaining path: failed.");
-	} else {
-		debug("visitPathTypeNode", $indent, "no children to claim the remaining path: failed.");
-	}
-
-	# in both of the above cases, we matched but couldn't provide children that
-	# would consume the rest of the path. so we return -1, causing the whole
-	# stack to unwind. WHEEEEEEE!
-	return -1;
-}
-
-=back
-
-=cut
-
-1;
diff --git a/lib/WeBWorK/Upload.pm b/lib/WeBWorK/Upload.pm
index 7549340292..7006fb8067 100644
--- a/lib/WeBWorK/Upload.pm
+++ b/lib/WeBWorK/Upload.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -21,7 +21,7 @@ WeBWorK::Upload - store uploads securely across requests.
 
 =head1 SYNOPSIS
 
-Given C<$u>, an Apache::Upload object
+Given C<$u>, an Mojo::Upload object
 
  my $upload = WeBWorK::Upload->store($u,
  	dir => $ce->{webworkDirs}->{DATA}
@@ -36,10 +36,10 @@ Later...
  );
  my $fh = $upload->fileHandle;
  my $path = $upload->filePath;
- 
+
  # get rid of the upload -- $upload is useless after this!
  $upload->dispose;
- 
+
  # ...or move it somewhere before disposal
  $upload->disposeTo($path);
 
@@ -59,23 +59,25 @@ file.
 use strict;
 use warnings;
 use Carp qw(croak);
-use Data::UUID; # this is probably overkill ;)
+use Data::UUID;    # this is probably overkill ;)
 use Digest::MD5 qw(md5_hex);
 use File::Copy qw(copy move);
 
 =head1 STORING UPLOADS
 
-Uploads represented as Apache::Uploads objects can be stored in an upload cache
+Uploads can be stored in an upload cache
 and later retrieved, given the proper ID and hash. The hash is used to confirm
 the authenticity of the ID.
 
+Uploads are Mojo::Upload objects under.
+
 =head2 CONSTRUCTOR
 
 =over
 
 =item store($u, %options)
 
-Stores the Apache::Upload C<$u> securely. The following keys must be defined in
+Stores the Mojo::Upload C<$u> securely. The following keys must be defined in
 %options:
 
  dir => the directory in which to store the uploaded file
@@ -83,45 +85,45 @@ Stores the Apache::Upload C<$u> securely. The following keys must be defined in
 =cut
 
 sub store {
-	my ($invocant, $apacheUpload, %options) = @_;
-	
-	croak "no Apache::Upload specified" unless $apacheUpload;
-	
+	my ($invocant, $upload, %options) = @_;
+
+	croak "no upload specified" unless $upload;
+
 	# generate UUID
-	my $ug = new Data::UUID;
+	my $ug   = new Data::UUID;
 	my $uuid = $ug->create_str;
-	
+
 	# generate one-time secret
-	my $secret = sprintf("%X"x4, map { int rand 2**32 } 1..4);
-	
+	my $secret = sprintf("%X" x 4, map { int rand 2**32 } 1 .. 4);
+
 	# generate hash from $uuid and $secret
 	my $hash = md5_hex($uuid, $secret);
-	
-	# get information about uploaded file
-	my $realFileName = $apacheUpload->filename;
-	my $fh = $apacheUpload->fh;
-	
+
 	my $infoName = "$uuid.info";
 	my $infoPath = "$options{dir}/$infoName";
-	
+
 	my $fileName = "$uuid.file";
 	my $filePath = "$options{dir}/$fileName";
-	
+
+	# get information about uploaded file
+	my $realFileName = $upload->filename;
+
+	# Copy uploaded file
+	$upload->move_to($filePath);
+
 	# write info file
 	open my $infoFH, ">", $infoPath
 		or die "failed to write upload info file $infoPath: $!";
 	print $infoFH "$realFileName\n$secret\n";
 	close $infoFH;
-	
-	# copy uploaded file
-	copy($fh, $filePath); # the file name is a secret!
-	
+
 	return bless {
-		uuid => $uuid,
-		dir  => $options{dir},
-		hash => $hash,
+		uuid         => $uuid,
+		dir          => $options{dir},
+		hash         => $hash,
 		realFileName => $realFileName,
-	}, ref($invocant) || $invocant;
+		},
+		ref($invocant) || $invocant;
 }
 
 =item id
@@ -132,15 +134,15 @@ Return the upload's unique ID, or an undefiend value if the upload is not valid.
 
 sub id {
 	my ($self) = @_;
-	my $uuid = $self->{uuid};
-	my $dir = $self->{dir};
-	
+	my $uuid   = $self->{uuid};
+	my $dir    = $self->{dir};
+
 	my $infoName = "$uuid.info";
 	my $infoPath = "$dir/$infoName";
-	
+
 	# make sure info file still exists (i.e. the file hasn't been disposed of)
 	return unless -e $infoPath;
-	
+
 	return $uuid;
 }
 
@@ -152,16 +154,16 @@ Return the upload's hash, or an undefiend value if the upload is not valid.
 
 sub hash {
 	my ($self) = @_;
-	my $uuid = $self->{uuid};
-	my $dir = $self->{dir};
-	my $hash = $self->{hash};
-	
+	my $uuid   = $self->{uuid};
+	my $dir    = $self->{dir};
+	my $hash   = $self->{hash};
+
 	my $infoName = "$uuid.info";
 	my $infoPath = "$dir/$infoName";
-	
+
 	# make sure info file still exists (i.e. the file hasn't been disposed of)
 	return unless -e $infoPath;
-	
+
 	return $hash;
 }
 
@@ -179,7 +181,7 @@ can then be accessed by name or file handle, moved, and disposed of.
 
 =item retrieve($id, $hash, %options)
 
-Retrieves the Apache::Upload referenced by C<$id> and C<$hash>. The following
+Retrieves the Mojo::Upload referenced by C<$id> and C<$hash>. The following
 keys must be defined in %options:
 
  dir => the directory in which to store the uploaded file
@@ -188,44 +190,45 @@ keys must be defined in %options:
 
 sub retrieve {
 	my ($invocant, $uuid, $hash, %options) = @_;
-	
-	croak "no upload ID specified" unless $uuid;
+
+	croak "no upload ID specified"   unless $uuid;
 	croak "no upload hash specified" unless $hash;
-	
+
 	my $infoName = "$uuid.info";
 	my $infoPath = "$options{dir}/$infoName";
-	
+
 	my $fileName = "$uuid.file";
 	my $filePath = "$options{dir}/$fileName";
-	
+
 	croak "no upload matches the ID specified" unless -e $infoPath;
-	
+
 	# get real file name and secret from info file
 	open my $infoFH, "<", $infoPath
 		or die "failed to read upload info file $infoPath: $!";
 	my ($realFileName, $secret) = <$infoFH>;
 	close $infoFH;
-	
+
 	# jesus christ
 	chomp $realFileName;
 	chomp $secret;
-	
+
 	# generate correct hash from $uuid and $secret
 	my $correctHash = md5_hex($uuid, $secret);
-	
+
 	#warn __PACKAGE__, ": secret is $secret\n";
 	#warn __PACKAGE__, ": correctHash is $correctHash\n";
-	
+
 	croak "upload hash incorrect!" unless $hash eq $correctHash;
-	
+
 	# -- you passed the test... --
-	
+
 	return bless {
-		uuid => $uuid,
-		dir => $options{dir},
-		hash => $hash,
+		uuid         => $uuid,
+		dir          => $options{dir},
+		hash         => $hash,
 		realFileName => $realFileName,
-	}, ref($invocant) || $invocant;
+		},
+		ref($invocant) || $invocant;
 }
 
 =back
@@ -241,20 +244,20 @@ Returns the original name of the uploaded file.
 =cut
 
 sub filename {
-	my ($self) = @_;
-	my $uuid = $self->{uuid};
-	my $dir = $self->{dir};
+	my ($self)       = @_;
+	my $uuid         = $self->{uuid};
+	my $dir          = $self->{dir};
 	my $realFileName = $self->{realFileName};
-	
+
 	my $infoName = "$uuid.info";
 	my $infoPath = "$dir/$infoName";
-	
+
 	my $fileName = "$uuid.file";
 	my $filePath = "$dir/$fileName";
-	
+
 	# make sure info file still exists (i.e. the file hasn't been disposed of)
 	return unless -e $infoPath;
-	
+
 	return $realFileName;
 }
 
@@ -267,18 +270,18 @@ upload is not valid. Suitable for reading.
 
 sub fileHandle {
 	my ($self) = @_;
-	my $uuid = $self->{uuid};
-	my $dir = $self->{dir};
-	
+	my $uuid   = $self->{uuid};
+	my $dir    = $self->{dir};
+
 	my $infoName = "$uuid.info";
 	my $infoPath = "$dir/$infoName";
-	
+
 	my $fileName = "$uuid.file";
 	my $filePath = "$dir/$fileName";
-	
+
 	# make sure info file still exists (i.e. the file hasn't been disposed of)
 	return unless -e $infoPath;
-	
+
 	open my $fh, "<", $filePath
 		or die "failed to open upload $filePath for reading: $!";
 	return $fh;
@@ -297,18 +300,18 @@ wish to move the file, use the C<disposeTo> method instead.
 
 sub filePath {
 	my ($self) = @_;
-	my $uuid = $self->{uuid};
-	my $dir = $self->{dir};
-	
+	my $uuid   = $self->{uuid};
+	my $dir    = $self->{dir};
+
 	my $infoName = "$uuid.info";
 	my $infoPath = "$dir/$infoName";
-	
+
 	my $fileName = "$uuid.file";
 	my $filePath = "$dir/$fileName";
-	
+
 	# make sure info file still exists (i.e. the file hasn't been disposed of)
 	return unless -e $infoPath;
-	
+
 	return $filePath;
 }
 
@@ -321,21 +324,21 @@ successfully destroyed, or an undefiend value if the upload is not valid.
 
 sub dispose {
 	my ($self) = @_;
-	my $uuid = $self->{uuid};
-	my $dir = $self->{dir};
-	
+	my $uuid   = $self->{uuid};
+	my $dir    = $self->{dir};
+
 	my $infoName = "$uuid.info";
 	my $infoPath = "$dir/$infoName";
-	
+
 	my $fileName = "$uuid.file";
 	my $filePath = "$dir/$fileName";
-	
+
 	# make sure info file still exists (i.e. the file hasn't been disposed of)
 	return unless -e $infoPath;
-	
+
 	unlink $infoPath;
 	unlink $filePath;
-	
+
 	return 1;
 }
 
@@ -350,19 +353,19 @@ valid.
 sub disposeTo {
 	my ($self, $newPath) = @_;
 	my $uuid = $self->{uuid};
-	my $dir = $self->{dir};
-	
+	my $dir  = $self->{dir};
+
 	croak "no path specified" unless $newPath;
-	
+
 	my $infoName = "$uuid.info";
 	my $infoPath = "$dir/$infoName";
-	
+
 	my $fileName = "$uuid.file";
 	my $filePath = "$dir/$fileName";
-	
+
 	# make sure info file still exists (i.e. the file hasn't been disposed of)
 	return unless -e $infoPath;
-	
+
 	unlink $infoPath;
 	move($filePath, $newPath);
 }
diff --git a/lib/WeBWorK/Utils.pm b/lib/WeBWorK/Utils.pm
index 78f7c3e896..9c242312e7 100644
--- a/lib/WeBWorK/Utils.pm
+++ b/lib/WeBWorK/Utils.pm
@@ -1,7 +1,7 @@
 
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -25,22 +25,23 @@ WeBWorK::Utils - useful utilities used by other WeBWorK modules.
 
 use strict;
 use warnings;
-#use Apache::DB;
+
 use DateTime;
 use DateTime::TimeZone;
 use Date::Parse;
 use Date::Format;
 use File::Copy;
 use File::Spec::Functions qw(canonpath);
+use Fcntl qw(:flock);
 use Time::Zone;
 use MIME::Base64 qw(encode_base64 decode_base64);
 use Errno;
 use File::Path qw(rmtree);
 use Storable;
 use Carp;
-#use Mail::Sender;
 use Storable qw(nfreeze thaw);
 use JSON;
+use Email::Sender::Transport::SMTP;
 
 use open IO => ':encoding(UTF-8)';
 
@@ -58,11 +59,9 @@ use constant MKDIR_ATTEMPTS => 10;
 #     %Z = timezone name
 use constant DATE_FORMAT => "%m/%d/%Y at %I:%M%P %Z";
 
-use constant JITAR_MASK => [hex 'FF000000', hex '00FC0000',
-			   hex '0003F000', hex '00000F00',
-			   hex '000000F0', hex '0000000F'];
-use constant JITAR_SHIFT => [24,18,12,8,4,0];
-
+use constant JITAR_MASK =>
+	[ hex 'FF000000', hex '00FC0000', hex '0003F000', hex '00000F00', hex '000000F0', hex '0000000F' ];
+use constant JITAR_SHIFT => [ 24, 18, 12, 8, 4, 0 ];
 
 our @EXPORT    = ();
 our @EXPORT_OK = qw(
@@ -78,7 +77,6 @@ our @EXPORT_OK = qw(
 	encode_utf8_base64
 	fisher_yates_shuffle
 	formatDateTime
-	has_aux_files
 	intDateTime
 	list2hash
 	listFilesRecursive
@@ -90,6 +88,7 @@ our @EXPORT_OK = qw(
 	path_is_subdir
 	pretty_print_rh
 	readDirectory
+	createDirectory
 	readFile
 	ref2string
 	removeTempDirectory
@@ -105,9 +104,11 @@ our @EXPORT_OK = qw(
 	thaw_base64
 	undefstr
 	writeCourseLog
+	writeCourseLogGivenTime
 	writeLog
 	writeTimingLogEntry
 	wwRound
+	getTestProblemPosition
 	is_restricted
 	grade_set
 	grade_gateway
@@ -118,7 +119,10 @@ our @EXPORT_OK = qw(
 	is_jitar_problem_closed
 	jitar_problem_adjusted_status
 	jitar_problem_finished
+	role_and_above
 	fetchEmailRecipients
+	processEmailMessage
+	createEmailSenderTransportSMTP
 	generateURLs
 	getAssetURL
 	x
@@ -142,14 +146,14 @@ our @EXPORT_OK = qw(
 
 sub runtime_use($;@) {
 	my ($module, @import_list) = @_;
-	my $package = (caller)[0]; # import into caller's namespace
+	my $package = (caller)[0];    # import into caller's namespace
 
 	my $import_string;
-	if (@import_list == 1 and ref $import_list[0] eq "ARRAY" and @{$import_list[0]} == 0) {
+	if (@import_list == 1 and ref $import_list[0] eq "ARRAY" and @{ $import_list[0] } == 0) {
 		$import_string = "";
 	} else {
 		# \Q = quote metachars \E = end quoting
-		$import_string = "import $module " . join(",", map { qq|"\Q$_\E"| } @import_list);
+		$import_string = "import $module " . join(",", map {qq|"\Q$_\E"|} @import_list);
 	}
 	eval "package $package; require $module; $import_string";
 	die $@ if $@;
@@ -185,7 +189,7 @@ sub runtime_use($;@) {
 # Windows uses CRLF, Mac uses CR, UNIX uses LF. (CR is ASCII 15, LF if ASCII 12)
 sub force_eoln($) {
 	my ($string) = @_;
-	$string = $string//'';
+	$string = $string // '';
 	$string =~ s/\015\012?/\012/g;
 	return $string;
 }
@@ -193,34 +197,35 @@ sub force_eoln($) {
 sub readFile($) {
 	my $fileName = shift;
 	# debugging code: found error in CourseEnvironment.pm with this
-# 	if ($fileName =~ /___/ or $fileName =~ /the-course-should-be-determined-at-run-time/) {
-# 		print STDERR "File $fileName not found.\n Usually an unnecessary call to readFile from\n",
-# 		join("\t ", caller()), "\n";
-# 		return();
-# 	}
-	local $/ = undef; # slurp the whole thing into one string
-	my $result='';  # need this initialized because the file (e.g. simple.conf) may not exist
+	# 	if ($fileName =~ /___/ or $fileName =~ /the-course-should-be-determined-at-run-time/) {
+	# 		print STDERR "File $fileName not found.\n Usually an unnecessary call to readFile from\n",
+	# 		join("\t ", caller()), "\n";
+	# 		return();
+	# 	}
+	local $/ = undef;    # slurp the whole thing into one string
+	my $result = '';     # need this initialized because the file (e.g. simple.conf) may not exist
 	if (-r $fileName) {
-		eval{
+		eval {
 			# CODING WARNING:
 			# if (open my $dh, "<", $fileName){
 			# will cause a utf8 "\xA9" does not map to Unicode warning if © is in latin-1 file
 			# use the following instead
-			if (open my $dh, "<:raw", $fileName){
+			if (open my $dh, "<:raw", $fileName) {
 				$result = <$dh>;
-				Encode::decode("UTF-8",$result) or die "failed to decode $fileName";
+				Encode::decode("UTF-8", $result) or die "failed to decode $fileName";
 				close $dh;
 			} else {
-				print STDERR "File $fileName cannot be read."; # this is not a fatal error.
+				print STDERR "File $fileName cannot be read.";    # this is not a fatal error.
 			}
 		};
 		if ($@) {
 			print STDERR "reading $fileName:  error in Utils::readFile: $@\n";
 		}
-		my $prevent_error_message = utf8::decode($result) or warn join("",
-			"Non-fatal warning: file $fileName contains at least one character code which ",
-			"is not valid in UTF-8. (The copyright sign is often a culprit -- use '&amp;copy;' instead.)\n",
-			"While this is not fatal you should fix it\n");
+		my $prevent_error_message = utf8::decode($result)
+			or warn join("",
+				"Non-fatal warning: file $fileName contains at least one character code which ",
+				"is not valid in UTF-8. (The copyright sign is often a culprit -- use '&amp;copy;' instead.)\n",
+				"While this is not fatal you should fix it\n");
 		# FIXME
 		# utf8::decode($result) raises an error about the copyright sign
 		# decode_utf8 and Encode::decode_utf8 do not -- which is doing the right thing?
@@ -238,6 +243,33 @@ sub readDirectory($) {
 	return @result;
 }
 
+=item createDirectory($dirName, $permission, $numgid)
+
+Creates a directory with the given name, permission bits, and group ID.
+
+=cut
+
+sub createDirectory {
+	my ($dirName, $permission, $numgid) = @_;
+
+	$permission = (defined($permission)) ? $permission : '0770';
+	my $errors = '';
+	mkdir($dirName, $permission)
+		or $errors .= "Can't do mkdir($dirName, $permission): $!\n" . caller(3);
+	chmod($permission, $dirName)
+		or $errors .= "Can't do chmod($permission, $dirName): $!\n" . caller(3);
+	unless ($numgid == -1) {
+		chown(-1, $numgid, $dirName)
+			or $errors .= "Can't do chown(-1,$numgid,$dirName): $!\n" . caller(3);
+	}
+	if ($errors) {
+		warn $errors;
+		return 0;
+	} else {
+		return 1;
+	}
+}
+
 =item @matches = listFilesRecusive($dir, $match_qr, $prune_qr, $match_full, $prune_full)
 
 Traverses the directory tree rooted at $dir, returning a list of files, named
@@ -253,6 +285,7 @@ and $prune_qr, respectively, should be applied to the bare directory entry
 =cut
 
 sub listFilesRecursiveHelper($$$$$$);
+
 sub listFilesRecursive($;$$$$) {
 	my ($dir, $match_qr, $prune_qr, $match_full, $prune_full) = @_;
 	return listFilesRecursiveHelper($dir, "", $match_qr, $prune_qr, $match_full, $prune_full);
@@ -276,13 +309,13 @@ sub listFilesRecursiveHelper($$$$$$) {
 		if (-l $full_path) {
 			my $link_target = "$full_dir/" . readlink $full_path;
 			if ($link_target) {
-				$is_dir = -d $link_target;
+				$is_dir  = -d $link_target;
 				$is_file = !$is_dir && -f $link_target || -p $link_target || -S $link_target;
 			} else {
 				warn "Couldn't resolve symlink $full_path: $!";
 			}
 		} else {
-			$is_dir = -d $full_path;
+			$is_dir  = -d $full_path;
 			$is_file = !$is_dir && -f $full_path || -p $full_path || -S $full_path;
 		}
 
@@ -307,8 +340,8 @@ sub listFilesRecursiveHelper($$$$$$) {
 			# everything looks good, time to recurse!
 			push @matches, listFilesRecursiveHelper($base_dir, $subdir, $match_qr, $prune_qr, $match_full, $prune_full);
 		} elsif ($is_file) {
-			my $file = ($curr_dir eq "") ? $dir_entry : "$curr_dir/$dir_entry";
-			my $match_string = $match_full ? $file : $dir_entry;
+			my $file         = ($curr_dir eq "") ? $dir_entry : "$curr_dir/$dir_entry";
+			my $match_string = $match_full       ? $file      : $dir_entry;
 			if (not defined $match_string or $match_string =~ m/$match_qr/) {
 				push @matches, $file;
 			}
@@ -327,29 +360,28 @@ sub surePathToFile($$) {
 	# constructs intermediate directories enroute to the file
 	# the input path must be the path relative to this starting directory
 	my $start_directory = shift;
-	my $path = shift;
-	my $delim = "/";
-	unless ($start_directory and $path ) {
+	my $path            = shift;
+	my $delim           = "/";
+	unless ($start_directory and $path) {
 		warn "missing directory<br> surePathToFile  start_directory   path ";
 		return '';
 	}
 	# use the permissions/group on the start directory itself as a template
-	my ($perms, $groupID) = (stat $start_directory)[2,5];
+	my ($perms, $groupID) = (stat $start_directory)[ 2, 5 ];
 	# warn "&urePathToTmpFile: perms=$perms groupID=$groupID\n";
 
 	# if the path starts with $start_directory (which is permitted but optional) remove this initial segment
 	$path =~ s|^$start_directory|| if $path =~ m|^$start_directory|;
 
-
 	# find the nodes on the given path
-        my @nodes = split("$delim",$path);
+	my @nodes = split("$delim", $path);
 
 	# create new path
-	$path = $start_directory; #convertPath("$tmpDirectory");
+	$path = $start_directory;    #convertPath("$tmpDirectory");
 
-	while (@nodes>1) {  # the last node is the file name
-		$path = $path . shift (@nodes) . "/"; #convertPath($path . shift (@nodes) . "/");
-		#FIXME  this make directory command may not be fool proof.
+	while (@nodes > 1) {         # the last node is the file name
+		$path = $path . shift(@nodes) . "/";    #convertPath($path . shift (@nodes) . "/");
+												#FIXME  this make directory command may not be fool proof.
 		unless (-e $path) {
 			mkdir($path, $perms)
 				or warn "Failed to create directory $path with start directory $start_directory ";
@@ -357,7 +389,7 @@ sub surePathToFile($$) {
 
 	}
 
-	$path = $path . shift(@nodes); #convertPath($path . shift(@nodes));
+	$path = $path . shift(@nodes);    #convertPath($path . shift(@nodes));
 	return $path;
 }
 
@@ -368,9 +400,9 @@ sub makeTempDirectory($$) {
 	my $triesRemaining = MKDIR_ATTEMPTS;
 	my ($fullPath, $success);
 	do {
-		my $suffix = join "", map { ('A'..'Z','a'..'z','0'..'9')[int rand 62] } 1 .. 8;
+		my $suffix = join "", map { ('A' .. 'Z', 'a' .. 'z', '0' .. '9')[ int rand 62 ] } 1 .. 8;
 		$fullPath = "$parent/$basename.$suffix";
-		$success = mkdir $fullPath;
+		$success  = mkdir $fullPath;
 	} until ($success or not $!{EEXIST});
 	die "Failed to create directory $fullPath: $!"
 		unless $success;
@@ -459,10 +491,10 @@ sub unformatDateAndTime {
 
 	$string =~ s|^\s+||;
 	$string =~ s|\s+$||;
-	$string =~ s|at| at |i; ## OK if forget to enter spaces or use wrong case
-	$string =~ s|AM| AM|i;	## OK if forget to enter spaces or use wrong case
-	$string =~ s|PM| PM|i;	## OK if forget to enter spaces or use wrong case
-	$string =~ s|,| at |;	## start translating old form of date/time to new form
+	$string =~ s|at| at |i;    ## OK if forget to enter spaces or use wrong case
+	$string =~ s|AM| AM|i;     ## OK if forget to enter spaces or use wrong case
+	$string =~ s|PM| PM|i;     ## OK if forget to enter spaces or use wrong case
+	$string =~ s|,| at |;      ## start translating old form of date/time to new form
 
 	# case where the at is missing: MM/DD/YYYY at HH:MM AMPM ZONE
 	unformatDateAndTime_error($orgString, "The 'at' appears to be missing.")
@@ -471,23 +503,25 @@ sub unformatDateAndTime {
 	my ($date, $at, $time, $AMPM, $TZ) = split /\s+/, $string;
 
 	unformatDateAndTime_error($orgString, "The date and/or time appear to be missing.", $date, $time, $AMPM, $TZ)
-		unless defined $date and defined $at and defined $time;
+		unless defined $date
+		and defined $at
+		and defined $time;
 
 	# deal with military time
 	unless ($time =~ /:/) {
-		{  ##bare block for 'case" structure
+		{    ##bare block for 'case" structure
 			$time =~ /(\d\d)(\d\d)/;
 			my $tmp_hour = $1;
-			my $tmp_min = $2;
-			if ($tmp_hour eq '00') {$time = "12:$tmp_min"; $AMPM = 'AM';last;}
-			if ($tmp_hour eq '12') {$time = "12:$tmp_min"; $AMPM = 'PM';last;}
-			if ($tmp_hour < 12) {$time = "$tmp_hour:$tmp_min"; $AMPM = 'AM';last;}
+			my $tmp_min  = $2;
+			if ($tmp_hour eq '00') { $time = "12:$tmp_min";        $AMPM = 'AM'; last; }
+			if ($tmp_hour eq '12') { $time = "12:$tmp_min";        $AMPM = 'PM'; last; }
+			if ($tmp_hour < 12)    { $time = "$tmp_hour:$tmp_min"; $AMPM = 'AM'; last; }
 			if ($tmp_hour < 24) {
 				$tmp_hour = $tmp_hour - 12;
-				$time = "$tmp_hour:$tmp_min";
-				$AMPM = 'PM';
+				$time     = "$tmp_hour:$tmp_min";
+				$AMPM     = 'PM';
 			}
-		}  ##end of bare block for 'case" structure
+		}    ##end of bare block for 'case" structure
 
 	}
 
@@ -495,28 +529,28 @@ sub unformatDateAndTime {
 	$AMPM = "AM" unless defined $AMPM;
 
 	my ($mday, $mon, $year, $wday, $yday, $sec, $pm, $min, $hour);
-	$sec=0;
+	$sec = 0;
 	$time =~ /^([0-9]+)\s*\:\s*([0-9]*)/;
-	$min=$2;
+	$min  = $2;
 	$hour = $1;
 	unformatDateAndTime_error($orgString, "Hour must be in the range [1,12].", $date, $time, $AMPM, $TZ)
 		if $hour < 1 or $hour > 12;
 	unformatDateAndTime_error($orgString, "Minute must be in the range [0-59].", $date, $time, $AMPM, $TZ)
 		if $min < 0 or $min > 59;
 	$pm = 0;
-	$pm = 12 if ($AMPM =~/PM/ and $hour < 12);
+	$pm = 12 if ($AMPM =~ /PM/ and $hour < 12);
 	$hour += $pm;
-	$hour = 0 if ($AMPM =~/AM/ and $hour == 12);
-	$date =~  m|([0-9]+)\s*/\s*([0-9]+)/\s*([0-9]+)|;
-	$mday =$2;
-	$mon=($1-1);
+	$hour = 0 if ($AMPM =~ /AM/ and $hour == 12);
+	$date =~ m|([0-9]+)\s*/\s*([0-9]+)/\s*([0-9]+)|;
+	$mday = $2;
+	$mon  = ($1 - 1);
 	unformatDateAndTime_error($orgString, "Day must be in the range [1,31].", $date, $time, $AMPM, $TZ)
 		if $mday < 1 or $mday > 31;
 	unformatDateAndTime_error($orgString, "Month must be in the range [1,12].", $date, $time, $AMPM, $TZ)
 		if $mon < 0 or $mon > 11;
-	$year=$3;
-	$wday="";
-	$yday="";
+	$year = $3;
+	$wday = "";
+	$yday = "";
 	return ($sec, $min, $hour, $mday, $mon, $year, $TZ);
 }
 
@@ -536,18 +570,16 @@ sub unformatDateAndTime_error {
 			"\tzone = $TZ\n";
 	} else {
 		my ($orgString, $error) = @_;
-		die "Incorrect date/time format \"$orgString\": $error\n",
-			"Correct format is MM/DD/YY at HH:MM AMPM ZONE\n";
+		die "Incorrect date/time format \"$orgString\": $error\n", "Correct format is MM/DD/YY at HH:MM AMPM ZONE\n";
 	}
 }
 
 sub parseDateTime($;$) {
 	my ($string, $display_tz) = @_;
-	warn "time zone not defined".caller() unless defined($display_tz);
+	warn "time zone not defined" . caller() unless defined($display_tz);
 	$display_tz ||= "local";
 	$display_tz = verify_timezone($display_tz);
 
-
 	# use WeBWorK 1 date parsing routine
 	my ($second, $minute, $hour, $day, $month, $year, $zone) = unformatDateAndTime($string);
 	my $zone_str = defined $zone ? $zone : "UNDEF";
@@ -558,12 +590,12 @@ sub parseDateTime($;$) {
 
 	# Do what Time::Local does to ambiguous years
 	{
-		my $ThisYear     = (localtime())[5]; # FIXME: should be relative to $string's timezone
-		my $Breakpoint   = ($ThisYear + 50) % 100;
-		my $NextCentury  = $ThisYear - $ThisYear % 100;
-		   $NextCentury += 100 if $Breakpoint < 50;
-		my $Century      = $NextCentury - 100;
-		my $SecOff       = 0;
+		my $ThisYear    = (localtime())[5];              # FIXME: should be relative to $string's timezone
+		my $Breakpoint  = ($ThisYear + 50) % 100;
+		my $NextCentury = $ThisYear - $ThisYear % 100;
+		$NextCentury += 100 if $Breakpoint < 50;
+		my $Century = $NextCentury - 100;
+		my $SecOff  = 0;
 
 		if ($year >= 1000) {
 			# leave alone
@@ -575,20 +607,20 @@ sub parseDateTime($;$) {
 		}
 	}
 
-	my $epoch; # The value we need to calculate and return
+	my $epoch;    # The value we need to calculate and return
 
 	# Determine the best possible time-zone string to use in the (first) call to DateTime()
-	my $tz_to_use = $display_tz;
-	my $is_valid_zone_name = 1; # when later set to 0, we will try the "offset" approach
+	my $tz_to_use          = $display_tz;
+	my $is_valid_zone_name = 1;             # when later set to 0, we will try the "offset" approach
 	if (defined $zone and $zone ne "") {
 		$is_valid_zone_name = DateTime::TimeZone->is_valid_name($zone);
-		if ( $is_valid_zone_name ) {
+		if ($is_valid_zone_name) {
 			#warn "\t\$zone=$zone is valid according to DateTime::TimeZone\n";
 			$tz_to_use = $zone;
 		} else {
-			#warn "\t\$zone=$zone is invalid according to DateTime::TimeZone, so we will attempt to treat the date/time as UTC and then apply an offset for the zone $zone.\n";
+#warn "\t\$zone=$zone is invalid according to DateTime::TimeZone, so we will attempt to treat the date/time as UTC and then apply an offset for the zone $zone.\n";
 			$tz_to_use = "UTC";
-			# When the offset approach fails, we will overriden again and use $display_tz instead
+			# When the offset approach fails, we will override again and use $display_tz instead
 		}
 	} else {
 		#warn "\t\$zone not supplied, using \$display_tz\n";
@@ -604,29 +636,30 @@ sub parseDateTime($;$) {
 		second    => $second,
 		time_zone => $tz_to_use,
 	);
-	my @offset_approach_msg = (); # Will be non-empty and collect parts for warn message when needed
-	if ( ! $is_valid_zone_name ) {
+	my @offset_approach_msg = ();    # Will be non-empty and collect parts for warn message when needed
+	if (!$is_valid_zone_name) {
 		# We used "UTC" and need to do an offset, or fail to a different approach
 
 		# convert to an epoch value
 		my $utc_epoch = $dt->epoch
 			or die "Date/time '$string' not representable as an epoch. Get more bits!\n";
-		push( @offset_approach_msg, "\t\$utc_epoch = $utc_epoch\n" );
+		push(@offset_approach_msg, "\t\$utc_epoch = $utc_epoch\n");
 
 		# get offset for supplied timezone and utc_epoch
 		# fall back to $display_tz if that fails
 		my $offset;
-		if( $offset = tz_offset($zone, $utc_epoch) ) {
-			push( @offset_approach_msg, "\t\$zone is valid according to Time::Zone (\$offset = $offset)\n");
+		if ($offset = tz_offset($zone, $utc_epoch)) {
+			push(@offset_approach_msg, "\t\$zone is valid according to Time::Zone (\$offset = $offset)\n");
 
 			$epoch = $utc_epoch + $offset;
-			push( @offset_approach_msg, "\t\$epoch = \$utc_epoch + \$offset = $epoch\n");
+			push(@offset_approach_msg, "\t\$epoch = \$utc_epoch + \$offset = $epoch\n");
 
 			$dt->subtract(seconds => $offset);
-			push( @offset_approach_msg, "\t\$dt - \$offset = " . $dt->strftime(DATE_FORMAT) . "\n");
+			push(@offset_approach_msg, "\t\$dt - \$offset = " . $dt->strftime(DATE_FORMAT) . "\n");
 		} else {
-			@offset_approach_msg = (); # Offset approach failed
-			warn "Time zone '$zone' not recognized, falling back to parsing using $display_tz instead of applying an offset from UTC.\n";
+			@offset_approach_msg = ();    # Offset approach failed
+			warn
+				"Time zone '$zone' not recognized, falling back to parsing using $display_tz instead of applying an offset from UTC.\n";
 			$dt = new DateTime(
 				year      => $year,
 				month     => $month,
@@ -640,7 +673,7 @@ sub parseDateTime($;$) {
 	}
 	$epoch = $dt->epoch;
 
-	if ( @offset_approach_msg ) {
+	if (@offset_approach_msg) {
 		#warn join("", @offset_approach_msg);
 	} else {
 		#warn "\t\$dt = ", $dt->strftime(DATE_FORMAT), "\n\t\$dt->epoch = $epoch\n";
@@ -649,7 +682,6 @@ sub parseDateTime($;$) {
 	return $epoch;
 }
 
-
 =item $string = formatDateTime($dateTime, $display_tz, $format_string, $locale)
 
 Formats the UNIX datetime $dateTime in the custom format provided by $format_string.
@@ -676,8 +708,8 @@ sub formatDateTime {
 		if ref($dateTime);    # catch bad calls to Utils::formatDateTime
 	warn "not defined formatDateTime('$dateTime', '$display_tz') ", join(" ", caller(2)) unless $display_tz;
 
-	$dateTime = $dateTime || 0;    # do our best to provide default values
-	$display_tz ||= "local";       # do our best to provide default vaules
+	$dateTime = $dateTime || 0;        # do our best to provide default values
+	$display_tz ||= "local";           # do our best to provide default vaules
 	$display_tz = verify_timezone($display_tz);
 	$format_string ||= DATE_FORMAT;    # If a format is not provided, use the default WeBWorK date format
 
@@ -692,7 +724,6 @@ sub formatDateTime {
 	}
 }
 
-
 =item $string = textDateTime($string_or_dateTime)
 
 Accepts a UNIX datetime or a formatted string, returns a formatted string.
@@ -710,7 +741,7 @@ Accepts a UNIX datetime or a formatted string, returns a UNIX datetime.
 =cut
 
 sub intDateTime($) {
-	return ($_[0] =~ m/^\d*$/) ?  $_[0] : parseDateTime($_[0]);
+	return ($_[0] =~ m/^\d*$/) ? $_[0] : parseDateTime($_[0]);
 }
 
 =item verify_timezone($display_tz)
@@ -722,14 +753,13 @@ If $display_tz is not a legal time zone then replace it with America/New_York an
 =cut
 
 sub verify_timezone($) {
-		my $display_tz = shift;
-	    return $display_tz if (DateTime::TimeZone->is_valid_name($display_tz) );
-	    warn qq! $display_tz is not a legal time zone name. Fix it on the Course Configuration page.
+	my $display_tz = shift;
+	return $display_tz if (DateTime::TimeZone->is_valid_name($display_tz));
+	warn qq! $display_tz is not a legal time zone name. Fix it on the Course Configuration page.
 	      <a href="http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones">View list of time zones.</a> \n!;
-	    return "America/New_York";
+	return "America/New_York";
 }
 
-
 =item $timeinsec = timeToSec($time)
 
 Makes a stab at converting a time (with a possible unit) into a number of
@@ -738,31 +768,31 @@ seconds.
 =cut
 
 sub timeToSec($) {
-    my $t = shift();
-    if ( $t =~ /^(\d+)\s+(\S+)\s*$/ ) {
-	my ( $val, $unit ) = ( $1, $2 );
-	if ( $unit =~ /month/i || $unit =~ /mon/i ) {
-	    $val *= 18144000;  # this assumes 30 days/month
-	} elsif ( $unit =~ /week/i || $unit =~ /wk/i ) {
-	    $val *= 604800;
-	} elsif ( $unit =~ /day/i || $unit =~ /dy/i ) {
-	    $val *= 86400;
-	} elsif ( $unit =~ /hour/i || $unit =~ /hr/i ) {
-	    $val *= 3600;
-	} elsif ( $unit =~ /minute/i || $unit =~ /min/i ) {
-	    $val *= 60;
-	} elsif ( $unit =~ /second/i || $unit =~ /sec/i || $unit =~ /^s$/i ) {
-	    # do nothing
+	my $t = shift();
+	if ($t =~ /^(\d+)\s+(\S+)\s*$/) {
+		my ($val, $unit) = ($1, $2);
+		if ($unit =~ /month/i || $unit =~ /mon/i) {
+			$val *= 18144000;    # this assumes 30 days/month
+		} elsif ($unit =~ /week/i || $unit =~ /wk/i) {
+			$val *= 604800;
+		} elsif ($unit =~ /day/i || $unit =~ /dy/i) {
+			$val *= 86400;
+		} elsif ($unit =~ /hour/i || $unit =~ /hr/i) {
+			$val *= 3600;
+		} elsif ($unit =~ /minute/i || $unit =~ /min/i) {
+			$val *= 60;
+		} elsif ($unit =~ /second/i || $unit =~ /sec/i || $unit =~ /^s$/i) {
+			# do nothing
+		} else {
+			warn("Unrecognized time unit $unit.\nAssuming seconds.\n");
+		}
+		return $val;
+	} elsif ($t =~ /^(\d+)$/) {
+		return $t;
 	} else {
-	    warn("Unrecognized time unit $unit.\nAssuming seconds.\n");
+		warn("Unrecognized time interval: $t\n");
+		return 0;
 	}
-	return $val;
-    } elsif ( $t =~ /^(\d+)$/ ) {
-	return $t;
-    } else {
-	warn("Unrecognized time interval: $t\n");
-	return 0;
-    }
 }
 
 =item before($time, $now)
@@ -772,7 +802,7 @@ is used.
 
 =cut
 
-sub before  { return (@_==2) ? $_[1] < $_[0] : time < $_[0] }
+sub before { return (@_ == 2) ? $_[1] < $_[0] : time < $_[0] }
 
 =item after($time, $now)
 
@@ -781,7 +811,7 @@ is used.
 
 =cut
 
-sub after   { return (@_==2) ? $_[1] > $_[0] : time > $_[0] }
+sub after { return (@_ == 2) ? $_[1] > $_[0] : time > $_[0] }
 
 =item between($start, $end, $now)
 
@@ -790,7 +820,7 @@ If $now is not specified, the value of time() is used.
 
 =cut
 
-sub between { my $t = (@_==3) ? $_[2] : time; return $t >= $_[0] && $t <= $_[1] }
+sub between { my $t = (@_ == 3) ? $_[2] : time; return $t >= $_[0] && $t <= $_[1] }
 
 =back
 
@@ -800,38 +830,46 @@ sub between { my $t = (@_==3) ? $_[2] : time; return $t >= $_[0] && $t <= $_[1]
 # Logging
 ################################################################################
 
-sub writeLog($$@) {
+sub writeLog {
 	my ($ce, $facility, @message) = @_;
-	unless ($ce->{webworkFiles}->{logs}->{$facility}) {
+	unless ($ce->{webworkFiles}{logs}{$facility}) {
 		warn "There is no log file for the $facility facility defined.\n";
 		return;
 	}
-	my $logFile = $ce->{webworkFiles}->{logs}->{$facility};
-	surePathToFile($ce->{webworkDirs}->{root}, $logFile);
-	local *LOG;
-	if (open LOG, ">>", $logFile) {
-		print LOG "[", time2str("%a %b %d %H:%M:%S %Y", time), "] @message\n";
-		close LOG;
+	my $logFile = $ce->{webworkFiles}{logs}{$facility};
+	surePathToFile($ce->{webworkDirs}{root}, $logFile);
+	if (open my $LOG, '>>:encoding(UTF-8)', $logFile) {
+		flock $LOG, LOCK_EX;
+		print $LOG "[", time2str("%a %b %d %H:%M:%S %Y", time), "] @message\n";
+		close $LOG;
 	} else {
 		warn "failed to open $logFile for writing: $!";
 	}
+	return;
 }
 
-sub writeCourseLog($$@) {
+sub writeCourseLog {
 	my ($ce, $facility, @message) = @_;
-	unless ($ce->{courseFiles}->{logs}->{$facility}) {
+	writeCourseLogGivenTime($ce, $facility, time, @message);
+	return;
+}
+
+sub writeCourseLogGivenTime {
+	my ($ce, $facility, $myTime, @message) = @_;
+	unless ($ce->{courseFiles}{logs}{$facility}) {
 		warn "There is no course log file for the $facility facility defined.\n";
 		return;
 	}
-	my $logFile = $ce->{courseFiles}->{logs}->{$facility};
-	surePathToFile($ce->{courseDirs}->{root}, $logFile);
-	local *LOG;
-	if (open LOG, ">>:utf8", $logFile) {
-		print LOG "[", time2str("%a %b %d %H:%M:%S %Y", time), "] @message\n";
-		close LOG;
+	my $logFile = $ce->{courseFiles}{logs}{$facility};
+	surePathToFile($ce->{courseDirs}{root}, $logFile);
+	if (open my $LOG, '>>:encoding(UTF-8)', $logFile) {
+		flock $LOG, LOCK_EX;
+		print $LOG "[", time2str("%a %b %d %H:%M:%S %Y", $myTime), "] @message\n";
+		close $LOG;
 	} else {
 		warn "failed to open $logFile for writing: $!";
 	}
+	return;
 }
 
 # $ce - a WeBWork::CourseEnvironment object
@@ -842,10 +880,11 @@ sub writeCourseLog($$@) {
 # use an empty string for $details when calling for END
 # Information printed in format:
 # [formatted date & time ] processID unixTime BeginEnd $function  $details
-sub writeTimingLogEntry($$$$) {
+sub writeTimingLogEntry {
 	my ($ce, $function, $details, $beginEnd) = @_;
 	$beginEnd = ($beginEnd eq "begin") ? ">" : ($beginEnd eq "end") ? "<" : "-";
-	writeLog($ce, "timing", "$$ ".time." $beginEnd $function [$details]");
+	writeLog($ce, "timing", "$$ " . time . " $beginEnd $function [$details]");
+	return;
 }
 
 ################################################################################
@@ -854,9 +893,9 @@ sub writeTimingLogEntry($$$$) {
 ## Utility function to trim whitespace off the start and end of its input
 sub trim_spaces {
 	my $in = shift;
-	return '' unless $in;  # skip blank spaces
+	return '' unless $in;    # skip blank spaces
 	$in =~ s/^\s*|\s*$//g;
-	return($in);
+	return ($in);
 }
 
 # This is for formatting set names input via text inputs in the user interface for internal use.  Set names are allowed
@@ -871,20 +910,21 @@ sub format_set_name_display {
 }
 
 sub list2hash(@) {
-	map {$_ => "0"} @_;
+	map { $_ => "0" } @_;
 }
 
 sub refBaseType($) {
 	my $ref = shift;
-	$ref =~ m/(\w+)\(/; # this might not be robust...
+	$ref =~ m/(\w+)\(/;    # this might not be robust...
 	return $1;
 }
 
 sub ref2string($;$);
+
 sub ref2string($;$) {
-	my $ref = shift;
+	my $ref        = shift;
 	my $dontExpand = shift || {};
-	my $refType = ref $ref;
+	my $refType    = ref $ref;
 	my $result;
 	if ($refType and not $dontExpand->{$refType}) {
 		my $baseType = refBaseType($ref);
@@ -905,13 +945,13 @@ sub ref2string($;$) {
 			# special case for Problem, Set, and User objects, which are defined
 			# using lists and contain a @FIELDS package variable:
 			no strict 'refs';
-			my @FIELDS = eval { @{$refType."::FIELDS"} };
+			my @FIELDS = eval { @{ $refType . "::FIELDS" } };
 			use strict 'refs';
 			undef @FIELDS unless scalar @FIELDS == scalar @array and not $@;
 			foreach (0 .. $#array) {
 				$result .= '<tr valign="top">';
 				$result .= "<td>$_</td>";
-				$result .= "<td>".$FIELDS[$_]."</td>" if @FIELDS;
+				$result .= "<td>" . $FIELDS[$_] . "</td>" if @FIELDS;
 				$result .= "<td>" . ref2string($array[$_], $dontExpand) . "</td>";
 				$result .= "</tr>";
 			}
@@ -926,7 +966,7 @@ sub ref2string($;$) {
 			$result .= "<td>$ref</td>";
 			$result .= "</tr>";
 		}
-		$result .= "</table>"
+		$result .= "</table>";
 	} else {
 		$result .= defined $ref ? $ref : '<font color="red">undef</font>';
 	}
@@ -936,25 +976,25 @@ our $BASE64_ENCODED = 'base64_encoded:';
 #  was not evaluated in the matching and substitution
 #  statements
 
-
 sub OLDdecodeAnswers($) {
 	my $serialized = shift;
 	return unless defined $serialized and $serialized;
-	my $array_ref = eval{ Storable::thaw($serialized) };
+	my $array_ref = eval { Storable::thaw($serialized) };
 	if ($@ or !defined $array_ref) {
-		# My hope is that this next warning is no longer needed since there are few legacy base64 days and the fix seems transparent.
-		# warn "problem fetching answers -- possibly left over from base64 days. Not to worry -- press preview or submit and this will go away  permanently for this question.   $@";
+# My hope is that this next warning is no longer needed since there are few legacy base64 days and the fix seems transparent.
+# warn "problem fetching answers -- possibly left over from base64 days. Not to worry -- press preview or submit and this will go away  permanently for this question.   $@";
 		return ();
 	} else {
 		return @{$array_ref};
 	}
 }
+
 sub decodeAnswers($) {
 	my $serialized = shift;
 	return unless defined $serialized and $serialized;
-	if ( $serialized =~ /^\[/ && $serialized =~ /\]$/) {
+	if ($serialized =~ /^\[/ && $serialized =~ /\]$/) {
 		# Assuming this is JSON encoded
-		my @array_data = @{from_json($serialized)};
+		my @array_data = @{ from_json($serialized) };
 		return @array_data;
 	} else {
 		# Fall back to old Storable::thaw based code
@@ -963,21 +1003,22 @@ sub decodeAnswers($) {
 }
 
 sub decode_utf8_base64 {
-    return Encode::decode("UTF-8",decode_base64(shift));
+	return Encode::decode("UTF-8", decode_base64(shift));
 }
 
 sub OLD_encodeAnswers(\%\@) {
-	my %hash = %{shift()};
-	my @order = @{shift()};
+	my %hash         = %{ shift() };
+	my @order        = @{ shift() };
 	my @ordered_hash = ();
 	foreach my $key (@order) {
 		push @ordered_hash, $key, $hash{$key};
 	}
-	return Storable::nfreeze( \@ordered_hash);
+	return Storable::nfreeze(\@ordered_hash);
 }
+
 sub encodeAnswers(\%\@) {
-	my %hash = %{shift()};
-	my @order = @{shift()};
+	my %hash         = %{ shift() };
+	my @order        = @{ shift() };
 	my @ordered_hash = ();
 	foreach my $key (@order) {
 		push @ordered_hash, $key, $hash{$key};
@@ -986,29 +1027,28 @@ sub encodeAnswers(\%\@) {
 }
 
 sub encode_utf8_base64 {
-    return encode_base64(Encode::encode("UTF-8",shift));
+	return encode_base64(Encode::encode("UTF-8", shift));
 }
 
 sub nfreeze_base64 {
-    return encode_base64(nfreeze(shift));
+	return encode_base64(nfreeze(shift));
 }
 
 sub thaw_base64 {
-    my $string = shift;
-    my $result;
+	my $string = shift;
+	my $result;
 
-    eval {
-	$result = thaw(decode_base64($string));
-    };
+	eval { $result = thaw(decode_base64($string)); };
 
-    if ($@) {
-	warn("Deleting corrupted achievement data.");
-	return {};
-    } else {
-	return $result;
-    }
+	if ($@) {
+		warn("Deleting corrupted achievement data.");
+		return {};
+	} else {
+		return $result;
+	}
 
 }
+
 sub max(@) {
 	my $soFar;
 	foreach my $item (@_) {
@@ -1021,18 +1061,18 @@ sub max(@) {
 }
 
 sub wwRound(@) {
-# usage wwRound($places,$float)
-# return $float rounded up to number of decimal places given by $places
+	# usage wwRound($places,$float)
+	# return $float rounded up to number of decimal places given by $places
 	my $places = shift;
-	my $float = shift;
+	my $float  = shift;
 	my $factor = 10**$places;
-	return int($float*$factor+0.5)/$factor;
+	return int($float * $factor + 0.5) / $factor;
 }
 
 sub pretty_print_rh($) {
 	my $rh = shift;
-	foreach my $key (sort keys %{$rh})  {
-		warn "  $key => ",$rh->{$key},"\n";
+	foreach my $key (sort keys %{$rh}) {
+		warn "  $key => ", $rh->{$key}, "\n";
 	}
 }
 
@@ -1044,8 +1084,8 @@ sub cryptPassword($) {
 	my ($clearPassword) = @_;
 	#Use an SHA512 salt with 16 digits
 	my $salt = '$6$';
-	for (my $i=0; $i<16; $i++) {
-	    $salt .= ('.','/','0'..'9','A'..'Z','a'..'z')[rand 64];
+	for (my $i = 0; $i < 16; $i++) {
+		$salt .= ('.', '/', '0' .. '9', 'A' .. 'Z', 'a' .. 'z')[ rand 64 ];
 	}
 
 	my $cryptPassword = crypt(trim_spaces($clearPassword), $salt);
@@ -1055,7 +1095,7 @@ sub cryptPassword($) {
 # from the Perl Cookbook, first edition, page 25:
 sub dequote($) {
 	local $_ = shift;
-	my ($white, $leader); # common whitespace and common leading string
+	my ($white, $leader);    # common whitespace and common leading string
 	if (/^\s*(?:([^\w\s]+)(\s*).*\n)(?:\s*\1\2?.*\n)+$/) {
 		($white, $leader) = ($2, quotemeta($1));
 	} else {
@@ -1066,19 +1106,18 @@ sub dequote($) {
 }
 
 sub undefstr($@) {
-	map { defined $_ ? $_ : $_[0] } @_[1..$#_];
+	map { defined $_ ? $_ : $_[0] } @_[ 1 .. $#_ ];
 }
 
-
 # shuffle an array in place
 # Perl Cookbook, Recipe 4.17. Randomizing an Array
 sub fisher_yates_shuffle {
 	my $array = shift;
 	my $i;
-	for ($i = @$array; --$i; ) {
-		my $j = int rand ($i+1);
+	for ($i = @$array; --$i;) {
+		my $j = int rand($i + 1);
 		next if $i == $j;
-		@$array[$i,$j] = @$array[$j,$i];
+		@$array[ $i, $j ] = @$array[ $j, $i ];
 	}
 }
 
@@ -1133,16 +1172,16 @@ sub sortByName($@) {
 	my ($field, @items) = @_;
 
 	my %itemsByIndex = ();
-	if ( ref( $field ) eq 'ARRAY' ) {
-		foreach my $item ( @items ) {
+	if (ref($field) eq 'ARRAY') {
+		foreach my $item (@items) {
 			my $key = '';
-			foreach ( @$field ) {
-		    		$key .= $item->$_;  # in this case we assume
-			}                           #    all entries in @$field
-			$itemsByIndex{$key} = $item;  #  are defined.
-	    	}
+			foreach (@$field) {
+				$key .= $item->$_;    # in this case we assume
+			}    #    all entries in @$field
+			$itemsByIndex{$key} = $item;    #  are defined.
+		}
 	} else {
-	    %itemsByIndex = map {(defined $field)?$_->$field:$_ => $_} @items;
+		%itemsByIndex = map { (defined $field) ? $_->$field : $_ => $_ } @items;
 	}
 
 	my @sKeys = sort {
@@ -1150,61 +1189,60 @@ sub sortByName($@) {
 		my @bParts = split m/(?<=\D)(?=\d)|(?<=\d)(?=\D)/, $b;
 
 		while (@aParts and @bParts) {
-			my $aPart = shift @aParts;
-			my $bPart = shift @bParts;
+			my $aPart    = shift @aParts;
+			my $bPart    = shift @bParts;
 			my $aNumeric = $aPart =~ m/^\d*$/;
 			my $bNumeric = $bPart =~ m/^\d*$/;
 
 			# numbers should come before words
-			return -1 if     $aNumeric and not $bNumeric;
-			return +1 if not $aNumeric and     $bNumeric;
+			return -1 if $aNumeric     and not $bNumeric;
+			return +1 if not $aNumeric and $bNumeric;
 
 			# both have the same type
 			if ($aNumeric and $bNumeric) {
-				next if $aPart == $bPart; # check next pair
-				return $aPart <=> $bPart; # compare numerically
+				next if $aPart == $bPart;    # check next pair
+				return $aPart <=> $bPart;    # compare numerically
 			} else {
-				next if $aPart eq $bPart; # check next pair
-				return $aPart cmp $bPart; # compare lexicographically
+				next if $aPart eq $bPart;    # check next pair
+				return $aPart cmp $bPart;    # compare lexicographically
 			}
 		}
-		return +1 if @aParts; # a has more sections, should go second
-		return -1 if @bParts; # a had fewer sections, should go first
+		return +1 if @aParts;    # a has more sections, should go second
+		return -1 if @bParts;    # a had fewer sections, should go first
 	} (keys %itemsByIndex);
 
-	return map{$itemsByIndex{$_}} @sKeys;
+	return map { $itemsByIndex{$_} } @sKeys;
 }
 
-
 ################################################################################
 # Sort Achievements by number and then by id
 ################################################################################
 
-
 sub sortAchievements {
 	my @Achievements = @_;
 
 	# First sort by achievement id
 
-	@Achievements = sort {uc($a->{achievement_id}) cmp uc($b->{achievement_id})}  @Achievements;
+	@Achievements = sort { uc($a->{achievement_id}) cmp uc($b->{achievement_id}) } @Achievements;
 
 	# Next sort by number if there are numbers, otherwise sort by
 	# category.
 
-	@Achievements = sort {($a->number || 0) <=> ($b->number || 0)} @Achievements;
+	@Achievements = sort { ($a->number || 0) <=> ($b->number || 0) } @Achievements;
 
 	@Achievements = sort {
-	  if ($a->number && $b->number) {
-	    return $a->number <=> $b->number;
-	  } elsif ($a->{category} eq $b->{category}) {
-	    return 0;
-	  } elsif ($a->{category} eq "secret" or $b->{category} eq "level") {
-	    return -1;
-	  } elsif ($a->{category} eq "level" or $b->{category} eq "secret") {
-	    return 1;
-	  } else {
-	    return $a->{category} cmp $b->{category};
-	  } } @Achievements;
+		if ($a->number && $b->number) {
+			return $a->number <=> $b->number;
+		} elsif ($a->{category} eq $b->{category}) {
+			return 0;
+		} elsif ($a->{category} eq "secret" or $b->{category} eq "level") {
+			return -1;
+		} elsif ($a->{category} eq "level" or $b->{category} eq "secret") {
+			return 1;
+		} else {
+			return $a->{category} cmp $b->{category};
+		}
+	} @Achievements;
 
 	return @Achievements;
 
@@ -1214,26 +1252,50 @@ sub sortAchievements {
 # Validate strings and labels
 ################################################################################
 
-sub not_blank ($) {     # check that a string exists and is not blank
+sub not_blank ($) {    # check that a string exists and is not blank
 	my $str = shift;
-	return( defined($str) and $str =~/\S/ );
+	return (defined($str) and $str =~ /\S/);
 }
 
-###########################################################
-    # If things have worked so far determine if the file might be accompanied by auxiliary files
+# Given $problem which should be a problem version, getTestProblemPosition returns the 0 based problem number for the
+# problem on the test, and the 1 based page number for the page on the test that the problem is on.
+sub getTestProblemPosition {
+	my ($db, $problem) = @_;
+
+	my $set            = $db->getMergedSetVersion($problem->user_id, $problem->set_id, $problem->version_id);
+	my @problemNumbers = $db->listProblemVersions($set->user_id, $set->set_id, $set->version_id);
+
+	my $problemNumber = 0;
+
+	if ($set->problem_randorder) {
+		# Find the test problem order using the set psvn for the seed in the same way that the GatewayQuiz module does.
+		my @problemOrder = (0 .. $#problemNumbers);
+		my $pgrand       = PGrandom->new;
+		$pgrand->srand($set->psvn);
+		my $count = 0;
+		while (@problemOrder) {
+			my $index = splice(@problemOrder, int($pgrand->rand(scalar(@problemOrder))), 1);
+			if ($problemNumbers[$index] == $problem->problem_id) {
+				$problemNumber = $count;
+				last;
+			}
+			++$count;
+		}
+	} else {
+		($problemNumber) = grep { $problemNumbers[$_] == $problem->problem_id } 0 .. $#problemNumbers;
+	}
 
-    #
-sub has_aux_files ($) { #  determine whether a question has auxiliary files
-                        # a path ending in    foo/foo.pg  is assumed to contain auxilliary files
-    my $path = shift;
-    if ( not_blank($path) ) {
-    	    my ($dir, $prob) = $path =~ m|([^/]+)/([^/]+)\.pg$|;  # must be a problem file ending in .pg
-			return 1 if (defined($dir) and defined ($prob) and $dir eq $prob);
-    } else {
-    	warn "This subroutine cannot handle empty paths: |$path|",caller();
-    }
-    return 0;    # no aux files with this .pg file
+	my $pageNumber;
 
+	# Update startProb and endProb for multipage tests
+	if ($set->problems_per_page) {
+		$pageNumber = ($problemNumber + 1) / $set->problems_per_page;
+		$pageNumber = int($pageNumber) + 1 if int($pageNumber) != $pageNumber;
+	} else {
+		$pageNumber = 1;
+	}
+
+	return ($problemNumber, $pageNumber);
 }
 
 sub is_restricted {
@@ -1245,17 +1307,17 @@ sub is_restricted {
 	my $setID = $set->set_id();
 	my @needed;
 
-	if ($set->restricted_release ) {
-		my @proposed_sets  = split(/\s*,\s*/,$set->restricted_release);
+	if ($set->restricted_release) {
+		my @proposed_sets  = split(/\s*,\s*/, $set->restricted_release);
 		my $required_score = sprintf("%.2f", $set->restricted_status || 0);
 
 		my @good_sets;
-		foreach(@proposed_sets) {
-			push @good_sets,$_ if $db->existsGlobalSet($_);
+		foreach (@proposed_sets) {
+			push @good_sets, $_ if $db->existsGlobalSet($_);
 		}
 
 		foreach my $restrictor (@good_sets) {
-			my $r_score = 0;
+			my $r_score        = 0;
 			my $restrictor_set = $db->getGlobalSet($restrictor);
 
 			if ($restrictor_set->assignment_type =~ /gateway/) {
@@ -1272,7 +1334,7 @@ sub is_restricted {
 
 			# round to evade machine rounding error
 			$r_score = sprintf("%.2f", $r_score);
-			if($r_score < $required_score) {
+			if ($r_score < $required_score) {
 				push @needed, $restrictor;
 			}
 		}
@@ -1345,7 +1407,7 @@ sub grade_set {
 		$status = 1 if $status > 1;
 
 		if ($wantProblemDetails) {
-			push(@$problem_scores, $problemRecord->attempted ? 100 * wwRound(2, $status) : '&nbsp;.&nbsp;');
+			push(@$problem_scores,             $problemRecord->attempted ? 100 * wwRound(2, $status) : '&nbsp;.&nbsp;');
 			push(@$problem_incorrect_attempts, $problemRecord->num_incorrect || 0);
 		}
 
@@ -1367,31 +1429,31 @@ sub grade_set {
 # for the highest scoring gateway
 
 sub grade_gateway {
-  my ($db,$set,$setName,$studentName) = @_;
+	my ($db, $set, $setName, $studentName) = @_;
 
-  my @versionNums = $db->listSetVersions($studentName,$setName);
+	my @versionNums = $db->listSetVersions($studentName, $setName);
 
-  my $bestTotalRight = 0;
-  my $bestTotal = 0;
+	my $bestTotalRight = 0;
+	my $bestTotal      = 0;
 
-  if ( @versionNums ) {
-    for my $i ( @versionNums ) {
-      my $versionedSet = $db->getSetVersion($studentName,$setName,$i);
+	if (@versionNums) {
+		for my $i (@versionNums) {
+			my $versionedSet = $db->getSetVersion($studentName, $setName, $i);
 
-      my ($totalRight, $total) = grade_set($db, $versionedSet, $studentName, 1);
-      if ($totalRight > $bestTotalRight) {
-	$bestTotalRight = $totalRight;
-	$bestTotal = $total;
-      }
-    }
-  }
+			my ($totalRight, $total) = grade_set($db, $versionedSet, $studentName, 1);
+			if ($totalRight > $bestTotalRight) {
+				$bestTotalRight = $totalRight;
+				$bestTotal      = $total;
+			}
+		}
+	}
 
-  if (wantarray) {
-    return ($bestTotalRight,$bestTotal);
-  } else {
-    return 0 unless $bestTotal;
-    return $bestTotalRight/$bestTotal;
-  }
+	if (wantarray) {
+		return ($bestTotalRight, $bestTotal);
+	} else {
+		return 0 unless $bestTotal;
+		return $bestTotalRight / $bestTotal;
+	}
 }
 
 # Takes in $db, $studentName,
@@ -1399,41 +1461,39 @@ sub grade_gateway {
 # for all sets in the course
 
 sub grade_all_sets {
-  my ($db, $studentName) = @_;
+	my ($db, $studentName) = @_;
 
-  my @setIDs = $db->listUserSets($studentName);
-  my @userSetIDs = map {[$studentName,$_]} @setIDs;
-  my @userSets = $db->getMergedSets(@userSetIDs);
+	my @setIDs     = $db->listUserSets($studentName);
+	my @userSetIDs = map { [ $studentName, $_ ] } @setIDs;
+	my @userSets   = $db->getMergedSets(@userSetIDs);
 
-  my $courseTotal = 0;
-  my $courseTotalRight = 0;
+	my $courseTotal      = 0;
+	my $courseTotalRight = 0;
 
-  foreach my $userSet (@userSets) {
-    next unless (after ($userSet->open_date()));
-    if ($userSet->assignment_type() =~ /gateway/) {
+	foreach my $userSet (@userSets) {
+		next unless (after($userSet->open_date()));
+		if ($userSet->assignment_type() =~ /gateway/) {
 
-      my ($totalRight,$total) = grade_gateway($db,$userSet,$userSet->set_id,$studentName);
-      $courseTotalRight += $totalRight;
-      $courseTotal += $total;
-    } else {
-      my ($totalRight, $total) = grade_set($db, $userSet, $studentName, 0);
+			my ($totalRight, $total) = grade_gateway($db, $userSet, $userSet->set_id, $studentName);
+			$courseTotalRight += $totalRight;
+			$courseTotal      += $total;
+		} else {
+			my ($totalRight, $total) = grade_set($db, $userSet, $studentName, 0);
 
-      $courseTotalRight += $totalRight;
-      $courseTotal += $total;
-    }
-  }
+			$courseTotalRight += $totalRight;
+			$courseTotal      += $total;
+		}
+	}
 
-  if (wantarray) {
-    return ($courseTotalRight,$courseTotal);
-  } else {
-    return 0 unless $courseTotal;
-    return $courseTotalRight/$courseTotal;
-  }
+	if (wantarray) {
+		return ($courseTotalRight, $courseTotal);
+	} else {
+		return 0 unless $courseTotal;
+		return $courseTotalRight / $courseTotal;
+	}
 
 }
 
-
-
 #takes a tree sequence and returns the jitar id
 #  This id is specially crafted signed 32 bit integer of the form, in binary
 #  SAAAAAAABBBBBBCCCCCCDDDDEEEEFFFF
@@ -1445,72 +1505,72 @@ sub grade_all_sets {
 #         six you are limited to 15.
 
 sub seq_to_jitar_id {
-    my @seq = @_;
+	my @seq = @_;
 
-    die("Jitar index 1 must be between 1 and 125") unless
-	(defined($seq[0]) && $seq[0] < 126);
+	die("Jitar index 1 must be between 1 and 125")
+		unless (defined($seq[0]) && $seq[0] < 126);
 
-    my $id = $seq[0];
-    my $ind;
+	my $id = $seq[0];
+	my $ind;
 
-    my @JITAR_SHIFT = @{JITAR_SHIFT()};
+	my @JITAR_SHIFT = @{ JITAR_SHIFT() };
 
-    #shift first index to first two bytes
-    $id = $id << $JITAR_SHIFT[0];
+	#shift first index to first two bytes
+	$id = $id << $JITAR_SHIFT[0];
 
-    #look for second and third index
-    for (my $i=1; $i<3; $i++) {
-	if (defined($seq[$i])) {
-	    $ind = $seq[$i];
-	    die("Jitar index ".($i+1)." must be less than 63")
-		unless $ind < 63;
+	#look for second and third index
+	for (my $i = 1; $i < 3; $i++) {
+		if (defined($seq[$i])) {
+			$ind = $seq[$i];
+			die("Jitar index " . ($i + 1) . " must be less than 63")
+				unless $ind < 63;
 
-	    #shift index and or it with id to put it in right place
-	    $ind = $ind << $JITAR_SHIFT[$i];
-	    $id = $id | $ind;
+			#shift index and or it with id to put it in right place
+			$ind = $ind << $JITAR_SHIFT[$i];
+			$id  = $id | $ind;
+		}
 	}
-    }
 
-    #look for remaining 3 index's
-    for (my $i=3; $i<6; $i++) {
-	if (defined($seq[$i])) {
-	    $ind = $seq[$i];
-	    die("Jitar index ".($i+1)." must be less than 16")
-		unless $ind < 16;
+	#look for remaining 3 index's
+	for (my $i = 3; $i < 6; $i++) {
+		if (defined($seq[$i])) {
+			$ind = $seq[$i];
+			die("Jitar index " . ($i + 1) . " must be less than 16")
+				unless $ind < 16;
 
-	    #shift index and or it with id to put it in right place
-	    $ind = $ind << $JITAR_SHIFT[$i];
-	    $id = $id | $ind;
+			#shift index and or it with id to put it in right place
+			$ind = $ind << $JITAR_SHIFT[$i];
+			$id  = $id | $ind;
+		}
 	}
-    }
 
-    return $id;
+	return $id;
 }
 
 # Takes a jitar_id and returns the tree sequence
 #  Jitar id's have the format described above.
 sub jitar_id_to_seq {
-    my $id = shift;
-    my $ind;
-    my @seq;
+	my $id = shift;
+	my $ind;
+	my @seq;
 
-    my @JITAR_SHIFT = @{JITAR_SHIFT()};
-    my @JITAR_MASK = @{JITAR_MASK()};
+	my @JITAR_SHIFT = @{ JITAR_SHIFT() };
+	my @JITAR_MASK  = @{ JITAR_MASK() };
 
-    for (my $i=0; $i<6; $i++) {
-	$ind = $id;
-	#use a mask to isolate only the bits we want for this index
-	# and shift them to get the index
-	$ind = $ind & $JITAR_MASK[$i];
-	$ind = $ind >> $JITAR_SHIFT[$i];
+	for (my $i = 0; $i < 6; $i++) {
+		$ind = $id;
+		#use a mask to isolate only the bits we want for this index
+		# and shift them to get the index
+		$ind = $ind & $JITAR_MASK[$i];
+		$ind = $ind >> $JITAR_SHIFT[$i];
 
-	#quit if we dont have a nonzero index
-	last unless $ind;
+		#quit if we dont have a nonzero index
+		last unless $ind;
 
-	$seq[$i] = $ind;
-    }
+		$seq[$i] = $ind;
+	}
 
-    return @seq;
+	return @seq;
 }
 
 # Takes in ($db, $userID, $setID, $problemID) and returns 1 if the
@@ -1519,138 +1579,145 @@ sub jitar_id_to_seq {
 # has run out of attempts.  Everything is opened up after the due date
 
 sub is_jitar_problem_hidden {
-    my ($db, $userID, $setID, $problemID) = @_;
+	my ($db, $userID, $setID, $problemID) = @_;
 
-    die "Not enough arguments.  Use is_jitar_problem_hidden(db,userID,setID,problemID)" unless ($db && $userID && $setID && $problemID);
+	die "Not enough arguments.  Use is_jitar_problem_hidden(db,userID,setID,problemID)"
+		unless ($db && $userID && $setID && $problemID);
 
-    my $mergedSet = $db->getMergedSet($userID,$setID);
+	my $mergedSet = $db->getMergedSet($userID, $setID);
 
-    unless ($mergedSet) {
-	warn "Couldn't get set $setID for user $userID from the database";
-	return 0;
-    }
+	unless ($mergedSet) {
+		warn "Couldn't get set $setID for user $userID from the database";
+		return 0;
+	}
 
-    # only makes sense for jitar sets
-    return 0 unless ($mergedSet->assignment_type eq 'jitar');
+	# only makes sense for jitar sets
+	return 0 unless ($mergedSet->assignment_type eq 'jitar');
 
-    # the set opens everything up after the due date.
-    return 0 if (after($mergedSet->due_date));
+	# the set opens everything up after the due date.
+	return 0 if (after($mergedSet->due_date));
 
-    my @idSeq = jitar_id_to_seq($problemID);
-    my @parentIDSeq = @idSeq;
+	my @idSeq       = jitar_id_to_seq($problemID);
+	my @parentIDSeq = @idSeq;
 
-    unless( $#parentIDSeq != 0 ) {
-	#this means we are at a top level problem and this check doesnt make sense
-	return 0;
-    }
+	unless ($#parentIDSeq != 0) {
+		#this means we are at a top level problem and this check doesnt make sense
+		return 0;
+	}
 
-    pop @parentIDSeq;
-    while (@parentIDSeq) {
+	pop @parentIDSeq;
+	while (@parentIDSeq) {
 
-	my $parentProbID = seq_to_jitar_id(@parentIDSeq);
+		my $parentProbID = seq_to_jitar_id(@parentIDSeq);
 
-	my $userParentProb = $db->getMergedProblem($userID,$setID,$parentProbID);
+		my $userParentProb = $db->getMergedProblem($userID, $setID, $parentProbID);
 
-	unless ($userParentProb) {
-	    warn "Couldn't get problem $parentProbID for user $userID and set $setID from the database";
-	    return 0;
-	}
+		unless ($userParentProb) {
+			warn "Couldn't get problem $parentProbID for user $userID and set $setID from the database";
+			return 0;
+		}
 
-	# the child problems are closed unless the number of incorrect attempts is above the
-	# attempts to open children, or if they have exausted their max_attempts
-	# if att_to_open_children is -1 we just use max attempts
-	# if max_attempts is -1 then they are always less than max attempts
-	if (($userParentProb->att_to_open_children == -1 ||
-	      $userParentProb->num_incorrect() < $userParentProb->att_to_open_children()) &&
-	    ($userParentProb->max_attempts == -1 || $userParentProb->num_incorrect() < $userParentProb->max_attempts())) {
-	    return 1;
+		# the child problems are closed unless the number of incorrect attempts is above the
+		# attempts to open children, or if they have exausted their max_attempts
+		# if att_to_open_children is -1 we just use max attempts
+		# if max_attempts is -1 then they are always less than max attempts
+		if (
+			(
+				$userParentProb->att_to_open_children == -1
+				|| $userParentProb->num_incorrect() < $userParentProb->att_to_open_children()
+			)
+			&& ($userParentProb->max_attempts == -1
+				|| $userParentProb->num_incorrect() < $userParentProb->max_attempts())
+			)
+		{
+			return 1;
+		}
+		pop @parentIDSeq;
 	}
-	pop @parentIDSeq;
-    }
 
-    # if we get here then all of the parents are open so the problem is open.
-    return 0;
+	# if we get here then all of the parents are open so the problem is open.
+	return 0;
 }
 
-
 # takes in ($db, $ce, $userID, $setID, $problemID) and returns 1 if the jitar problem is closed
 # jitar problems are closed if the restrict_prob_progression variable is set on the set
 # and if the previous problem is closed, or hasn't been finished yet.
 # The first problem in a level is always open.
 
 sub is_jitar_problem_closed {
-    my ($db, $ce, $userID, $setID, $problemID) = @_;
+	my ($db, $ce, $userID, $setID, $problemID) = @_;
 
-    die "Not enough arguments.  Use is_jitar_problem_closed(db,userID,setID,problemID)" unless ($db && $ce && $userID && $setID && $problemID);
+	die "Not enough arguments.  Use is_jitar_problem_closed(db,userID,setID,problemID)"
+		unless ($db && $ce && $userID && $setID && $problemID);
 
-    my $mergedSet = $db->getMergedSet($userID,$setID);
-
-    unless ($mergedSet) {
-	warn "Couldn't get set $setID for user $userID from the database";
-	return 0;
-    }
+	my $mergedSet = $db->getMergedSet($userID, $setID);
 
-    # return 0 unless we are a restricted jitar set
-    return 0 unless ($mergedSet->assignment_type eq 'jitar' && $
-		     mergedSet->restrict_prob_progression());
+	unless ($mergedSet) {
+		warn "Couldn't get set $setID for user $userID from the database";
+		return 0;
+	}
 
-    # the set opens everything up after the due date.
-    return 0 if (after($mergedSet->due_date));
+	# return 0 unless we are a restricted jitar set
+	return 0 unless ($mergedSet->assignment_type eq 'jitar' && $mergedSet->restrict_prob_progression());
 
+	# the set opens everything up after the due date.
+	return 0 if (after($mergedSet->due_date));
 
-    my $prob;
-    my $id;
-    my @idSeq = jitar_id_to_seq($problemID);
-    my @parentSeq = @idSeq;
+	my $prob;
+	my $id;
+	my @idSeq     = jitar_id_to_seq($problemID);
+	my @parentSeq = @idSeq;
 
-    # problems are automatically closed if their parents are closed
-    #this means we cant find a previous problem to test against so we are open as long as the parent is open
-    pop(@parentSeq);
+	# problems are automatically closed if their parents are closed
+	#this means we cant find a previous problem to test against so we are open as long as the parent is open
+	pop(@parentSeq);
 
-    #if we can't get a parent problem then this is a top level problem and we
-    # we just check the previous.
-    if (@parentSeq) {
-	$id = seq_to_jitar_id(@parentSeq);
-	if (is_jitar_problem_closed($db,$ce,$userID,$setID,$id)) {
-	    return 1;
+	#if we can't get a parent problem then this is a top level problem and we
+	# we just check the previous.
+	if (@parentSeq) {
+		$id = seq_to_jitar_id(@parentSeq);
+		if (is_jitar_problem_closed($db, $ce, $userID, $setID, $id)) {
+			return 1;
+		}
 	}
-    }
 
-    # if the parent is open then we are open if the previous
-    # problem has been "completed" or, if we are the first problem in this level
+	# if the parent is open then we are open if the previous
+	# problem has been "completed" or, if we are the first problem in this level
 
-    do {
-	$idSeq[$#idSeq]--;
+	do {
+		$idSeq[$#idSeq]--;
 
-	# in this case we are the first problem in the level
-	if ($idSeq[$#idSeq] == 0) {
-	    return 0;
-	}
+		# in this case we are the first problem in the level
+		if ($idSeq[$#idSeq] == 0) {
+			return 0;
+		}
 
-	$id = seq_to_jitar_id(@idSeq);
-    } until ($db->existsUserProblem($userID,$setID,$id));
+		$id = seq_to_jitar_id(@idSeq);
+	} until ($db->existsUserProblem($userID, $setID, $id));
 
-    $prob = $db->getMergedProblem($userID,$setID,$id);
+	$prob = $db->getMergedProblem($userID, $setID, $id);
 
-    # we have to test against the target status in case the student
-    # is working in the reduced scoring period
-    my $targetStatus = 1;
-    if ($ce->{pg}{ansEvalDefaults}{enableReducedScoring} &&
-	$mergedSet->enable_reduced_scoring &&
-	after($mergedSet->reduced_scoring_date)) {
-	$targetStatus = $ce->{pg}{ansEvalDefaults}{reducedScoringValue};
-    }
+	# we have to test against the target status in case the student
+	# is working in the reduced scoring period
+	my $targetStatus = 1;
+	if ($ce->{pg}{ansEvalDefaults}{enableReducedScoring}
+		&& $mergedSet->enable_reduced_scoring
+		&& after($mergedSet->reduced_scoring_date))
+	{
+		$targetStatus = $ce->{pg}{ansEvalDefaults}{reducedScoringValue};
+	}
 
-    if (abs(jitar_problem_adjusted_status($prob,$db) - $targetStatus) < .001 ||
-	jitar_problem_finished($prob,$db)) {
+	if (abs(jitar_problem_adjusted_status($prob, $db) - $targetStatus) < .001
+		|| jitar_problem_finished($prob, $db))
+	{
 
-	# either the previous problem is 100% or is finished
-	return 0;
-    } else {
+		# either the previous problem is 100% or is finished
+		return 0;
+	} else {
 
-	#in this case the previous problem is hidden
-	return 1
-    }
+		#in this case the previous problem is hidden
+		return 1;
+	}
 
 }
 
@@ -1660,128 +1727,220 @@ sub is_jitar_problem_closed {
 # child problems that have the "counts_parent_grade" flag set
 
 sub jitar_problem_adjusted_status {
-    my ($userProblem,  $db) = @_;
+	my ($userProblem, $db) = @_;
 
-    #this is goign to happen often enough that the check saves time
-    return 1 if $userProblem->status == 1;
+	#this is goign to happen often enough that the check saves time
+	return 1 if $userProblem->status == 1;
 
-    my @problemSeq = jitar_id_to_seq($userProblem->problem_id);
+	my @problemSeq = jitar_id_to_seq($userProblem->problem_id);
 
-    my @problemIDs = $db->listUserProblems($userProblem->user_id,$userProblem->set_id);
+	my @problemIDs = $db->listUserProblems($userProblem->user_id, $userProblem->set_id);
 
-    my @weights;
-    my @scores;
+	my @weights;
+	my @scores;
 
-    ID: foreach my $id (@problemIDs) {
-	my @seq = jitar_id_to_seq($id);
+ID: foreach my $id (@problemIDs) {
+		my @seq = jitar_id_to_seq($id);
 
-	#check and see if this is a child
-	# it has to be one level deper
-	next unless $#seq == $#problemSeq+1;
+		#check and see if this is a child
+		# it has to be one level deper
+		next unless $#seq == $#problemSeq + 1;
 
-	# and it has to equal @seq up to the penultimate index
-	for (my $i = 0; $i<=$#problemSeq; $i++) {
-	    next ID unless $seq[$i] == $problemSeq[$i];
-	}
+		# and it has to equal @seq up to the penultimate index
+		for (my $i = 0; $i <= $#problemSeq; $i++) {
+			next ID unless $seq[$i] == $problemSeq[$i];
+		}
 
-	#check to see if this counts towards the parent grade
-	my $problem = $db->getMergedProblem($userProblem->user_id, $userProblem->set_id, $id);
+		#check to see if this counts towards the parent grade
+		my $problem = $db->getMergedProblem($userProblem->user_id, $userProblem->set_id, $id);
 
-	die "Couldn't get problem $id for user ". $userProblem->user_id." and set ".$userProblem->set_id." from the database" unless $problem;
+		die "Couldn't get problem $id for user "
+			. $userProblem->user_id
+			. " and set "
+			. $userProblem->set_id
+			. " from the database"
+			unless $problem;
 
-	# skip if it doesnt
-	next unless $problem->counts_parent_grade();
+		# skip if it doesnt
+		next unless $problem->counts_parent_grade();
 
-	# if it does count then add its adjusted status to the grading array
-	push @weights, $problem->value;
-	push @scores, jitar_problem_adjusted_status($problem,$db);
-    }
+		# if it does count then add its adjusted status to the grading array
+		push @weights, $problem->value;
+		push @scores,  jitar_problem_adjusted_status($problem, $db);
+	}
 
-    # if no children count towards the problem grade return status
-    return $userProblem->status unless (@weights && @scores);
+	# if no children count towards the problem grade return status
+	return $userProblem->status unless (@weights && @scores);
 
-    # if children do count then return the larger of the two (?)
-    my $childScore = 0;
-    my $totalWeight = 0;
-    for (my $i=0; $i<=$#scores; $i++) {
-	$childScore += $scores[$i]*$weights[$i];
-	$totalWeight += $weights[$i];
-    }
+	# if children do count then return the larger of the two (?)
+	my $childScore  = 0;
+	my $totalWeight = 0;
+	for (my $i = 0; $i <= $#scores; $i++) {
+		$childScore  += $scores[$i] * $weights[$i];
+		$totalWeight += $weights[$i];
+	}
 
-    $childScore = $childScore/$totalWeight;
+	$childScore = $childScore / $totalWeight;
 
-    if ($childScore > $userProblem->status) {
-	return $childScore;
-    } else {
-	return $userProblem->status;
-    }
+	if ($childScore > $userProblem->status) {
+		return $childScore;
+	} else {
+		return $userProblem->status;
+	}
 }
 
-
 # returns 1 if the given problem is "finished"  This happens when the problem attempts have
 # been maxed out, and the attempts of any children with the "counts_to_parent_grade" also
 # have their attemtps maxed out.  (In other words if the grade can't be raised any more)
 
 sub jitar_problem_finished {
-    my ($userProblem,  $db) = @_;
-
-    # the problem is open if you can still make attempts and you dont have a 100%
-    return 0 if ($userProblem->status < 1 &&
-		 ($userProblem->max_attempts == -1 ||
-	$userProblem->max_attempts > ($userProblem->num_correct +
-				      $userProblem->num_incorrect)));
+	my ($userProblem, $db) = @_;
+
+	# the problem is open if you can still make attempts and you dont have a 100%
+	return 0
+		if (
+			$userProblem->status < 1
+			&& ($userProblem->max_attempts == -1
+				|| $userProblem->max_attempts > ($userProblem->num_correct + $userProblem->num_incorrect))
+		);
 
-    # find children
-    my @problemSeq = jitar_id_to_seq($userProblem->problem_id);
+	# find children
+	my @problemSeq = jitar_id_to_seq($userProblem->problem_id);
 
-    my @problemIDs = $db->listUserProblems($userProblem->user_id,$userProblem->set_id);
+	my @problemIDs = $db->listUserProblems($userProblem->user_id, $userProblem->set_id);
 
-    ID: foreach my $id (@problemIDs) {
-	my @seq = jitar_id_to_seq($id);
+ID: foreach my $id (@problemIDs) {
+		my @seq = jitar_id_to_seq($id);
 
-	#check and see if this is a child
-	next unless $#seq == $#problemSeq+1;
-	for (my $i = 0; $i<=$#problemSeq; $i++) {
-	    next ID unless $seq[$i] == $problemSeq[$i];
-	}
+		#check and see if this is a child
+		next unless $#seq == $#problemSeq + 1;
+		for (my $i = 0; $i <= $#problemSeq; $i++) {
+			next ID unless $seq[$i] == $problemSeq[$i];
+		}
 
-	#check to see if this counts towards the parent grade
-	my $problem = $db->getMergedProblem($userProblem->user_id, $userProblem->set_id, $id);
+		#check to see if this counts towards the parent grade
+		my $problem = $db->getMergedProblem($userProblem->user_id, $userProblem->set_id, $id);
 
-	die "Couldn't get problem $id for user ".$userProblem->user_id." and set ".$userProblem->set_id." from the database" unless $problem;
+		die "Couldn't get problem $id for user "
+			. $userProblem->user_id
+			. " and set "
+			. $userProblem->set_id
+			. " from the database"
+			unless $problem;
 
-	# if this doesn't count then we dont need to worry about it
-	next unless $problem->counts_parent_grade();
+		# if this doesn't count then we dont need to worry about it
+		next unless $problem->counts_parent_grade();
 
-	#if it does then see if the problem is finished
-	# if it isn't then the parent isnt finished either.
-	return 0 unless jitar_problem_finished($problem,$db);
+		#if it does then see if the problem is finished
+		# if it isn't then the parent isnt finished either.
+		return 0 unless jitar_problem_finished($problem, $db);
 
-    }
+	}
 
-    # if we got here then the problem is finished
-    return 1;
+	# if we got here then the problem is finished
+	return 1;
 }
 
-# requires a CG object, and a permission type
-# a user may also be submitted, in case we need to filter by section
+# Get the array of all permission levels at or above a given level
+sub role_and_above {
+	my ($userRoles, $role) = @_;
+	my $role_array = [$role];
+	for my $userRole (keys %$userRoles) {
+		push @$role_array, $userRole if ($userRoles->{$userRole} > $userRoles->{$role});
+	}
+	return $role_array;
+}
 
+# Requires a ContentGenerator object, and a permission type.
+# If the optional sender argument is provided, then filter on the section of the given sender.
 sub fetchEmailRecipients {
-	my ($self, $permissionType, $sender) = @_;    # sender argument is optional
-	my $r     = $self->r;
-	my $db    = $r->db;
-	my $ce    = $r->ce;
-	my $authz = $r->authz;
+	my ($c, $permissionType, $sender) = @_;
+	my $db    = $c->db;
+	my $ce    = $c->ce;
+	my $authz = $c->authz;
+
+	return unless $permissionType && defined $ce->{permissionLevels}{$permissionType};
+
+	my $roles =
+		ref $ce->{permissionLevels}{$permissionType} eq 'ARRAY'
+		? $ce->{permissionLevels}{$permissionType}
+		: role_and_above($ce->{userRoles}, $ce->{permissionLevels}{$permissionType});
+	my @rolePermissionLevels = map { $ce->{userRoles}{$_} } grep { defined $ce->{userRoles}{$_} } @$roles;
+	return unless @rolePermissionLevels;
 
-	return unless $permissionType;
+	my $user_ids = [ map { $_->user_id } $db->getPermissionLevelsWhere({ permission => \@rolePermissionLevels }) ];
 
-	return
-		map { $_->rfc822_mailbox } grep { $authz->hasPermissions($_->user_id, $permissionType) } $db->getUsersWhere({
+	my @recipients =
+		map { $_->rfc822_mailbox } $db->getUsersWhere({
+			user_id       => $user_ids,
 			email_address => { '!=', undef },
 			$ce->{feedback_by_section}
 			&& defined $sender
 			&& defined $sender->section ? (section => $sender->section) : (),
 		});
+
+	push @recipients, @{ $ce->{mail}{feedbackRecipients} } if ref($ce->{mail}{feedbackRecipients}) eq 'ARRAY';
+
+	return @recipients;
+}
+
+sub processEmailMessage {
+	my ($text, $user_record, $STATUS, $merge_data, $for_preview) = @_;
+
+	# User macros that can be used in the email message
+	my $SID        = $user_record->student_id;
+	my $FN         = $user_record->first_name;
+	my $LN         = $user_record->last_name;
+	my $SECTION    = $user_record->section;
+	my $RECITATION = $user_record->recitation;
+	my $EMAIL      = $user_record->email_address;
+	my $LOGIN      = $user_record->user_id;
+
+	# Get record from merge data.
+	my @COL = defined($merge_data->{$SID}) ? @{ $merge_data->{$SID} } : ();
+	unshift(@COL, '');    # This makes COL[1] the first column.
+
+	# For safety, only evaluate special variables.
+	my $msg = $text;
+	$msg =~ s/\$SID/$SID/g;
+	$msg =~ s/\$LN/$LN/g;
+	$msg =~ s/\$FN/$FN/g;
+	$msg =~ s/\$STATUS/$STATUS/g;
+	$msg =~ s/\$SECTION/$SECTION/g;
+	$msg =~ s/\$RECITATION/$RECITATION/g;
+	$msg =~ s/\$EMAIL/$EMAIL/g;
+	$msg =~ s/\$LOGIN/$LOGIN/g;
+
+	if (defined $COL[1]) {
+		$msg =~ s/\$COL\[(\-?\d+)\]/$COL[$1]/g;
+	} else {
+		$msg =~ s/\$COL\[(\-?\d+)\]//g;
+	}
+
+	$msg =~ s/\r//g;
+
+	if ($for_preview) {
+		my @preview_COL = @COL;
+		shift @preview_COL;    # Shift of the added empty string for preview.
+		return $msg,
+			join(' ',
+				'', (map { "COL[$_]" . '&nbsp;' x (3 - length $_) } 1 .. $#COL),
+				'<br>', (map { $_ =~ s/\s/&nbsp;/gr } map { sprintf('%-8.8s', $_); } @preview_COL));
+	} else {
+		return $msg;
+	}
+}
+
+# This function abstracts the process of creating a transport layer for SendMail.
+# It is used in Feedback.pm, SendMail.pm and Utils/ProblemProcessing.pm (for JITAR messages).
+sub createEmailSenderTransportSMTP {
+	my $ce = shift;
+	return Email::Sender::Transport::SMTP->new({
+		host => $ce->{mail}{smtpServer},
+		ssl  => $ce->{mail}{tls_allowed} // 0,
+		defined $ce->{mail}->{smtpPort} ? (port => $ce->{mail}{smtpPort}) : (),
+		timeout => $ce->{mail}{smtpTimeout},
+	});
 }
 
 # Requires a CG object.
@@ -1793,157 +1952,183 @@ sub fetchEmailRecipients {
 # this subroutine could be expanded to.
 
 sub generateURLs {
-	my $self = shift;
-	my %params = @_;
-	my $r = $self->r;
-	my $db = $r->db;
-	my $urlpath = $r->urlpath;
-	my $userName = $r->param("user");
+	my $c        = shift;
+	my %params   = @_;
+	my $db       = $c->db;
+	my $userName = $c->param('user');
 
 	# generate context URLs
 	my $emailableURL;
 	my $returnURL;
 	if ($userName) {
-		my $modulePath;
+		my $routePath;
 		my @args;
-		if (defined $params{set_id} && $params{set_id} ne "") {
+		if (defined $params{set_id} && $params{set_id} ne '') {
 			if ($params{problem_id}) {
-				$modulePath = $r->urlpath->newFromModule("WeBWorK::ContentGenerator::Problem", $r,
-					courseID => $r->urlpath->arg("courseID"),
-					setID => $params{set_id},
-					problemID => $params{problem_id},
-				);
-				@args = qw/displayMode showOldAnswers showCorrectAnswers showHints showSolutions/;
+				$routePath = $c->url_for('problem_detail', setID => $params{set_id}, problemID => $params{problem_id});
+				@args      = qw/displayMode showOldAnswers showCorrectAnswers showHints showSolutions/;
 			} else {
-				$modulePath = $r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSet", $r,
-					courseID => $r->urlpath->arg("courseID"),
-					setID => $params{set_id},
-				);
-				@args = ();
+				$routePath = $c->url_for('problem_list', setID => $params{set_id});
 			}
 		} else {
-			$modulePath = $r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets", $r,
-				courseID => $r->urlpath->arg("courseID"),
-			);
-			@args = ();
+			$routePath = $c->url_for('set_list');
 		}
-		$emailableURL = $self->systemLink($modulePath,
-			authen => 0,
-			params => [ "effectiveUser", @args ],
+		$emailableURL = $c->systemLink(
+			$routePath,
+			authen      => 0,
+			params      => [ 'effectiveUser', @args ],
 			use_abs_url => 1,
 		);
-		$returnURL = $self->systemLink($modulePath,
-			authen => 1,
-			params => [ @args ],
-		);
+		$returnURL = $c->systemLink($routePath, params => [@args]);
 	} else {
-		$emailableURL = "(not available)";
-		$returnURL = "";
+		$emailableURL = '(not available)';
+		$returnURL    = '';
 	}
 	if ($params{url_type}) {
 		if ($params{url_type} eq 'relative') {
 			return $returnURL;
 		} else {
-			return $emailableURL; # could include other types of URL here...
+			return $emailableURL;    # could include other types of URL here...
 		}
 	} else {
 		return ($emailableURL, $returnURL);
 	}
-	return;
 }
 
 my $staticWWAssets;
 my $staticPGAssets;
+my $thirdPartyWWDependencies;
+my $thirdPartyPGDependencies;
+
+sub readJSON {
+	my $fileName = shift;
+
+	return unless -r $fileName;
+
+	open(my $fh, "<:encoding(UTF-8)", $fileName) or die "FATAL: Unable to open '$fileName'!";
+	local $/;
+	my $data = <$fh>;
+	close $fh;
+
+	return JSON->new->decode($data);
+}
+
+sub getThirdPartyAssetURL {
+	my ($file, $dependencies, $baseURL, $useCDN) = @_;
+
+	for (keys %$dependencies) {
+		if ($file =~ /^node_modules\/$_\/(.*)$/) {
+			if ($useCDN && $1 !~ /mathquill/) {
+				return
+					"https://cdn.jsdelivr.net/npm/$_\@"
+					. substr($dependencies->{$_}, 1) . '/'
+					. ($1 =~ s/(?:\.min)?\.(js|css)$/.min.$1/gr);
+			} else {
+				return "$baseURL/$file?version=" . ($dependencies->{$_} =~ s/#/@/gr);
+			}
+		}
+	}
+	return;
+}
 
-# Get the url for static assets.
+# Get the URL for static assets.
 sub getAssetURL {
 	my ($ce, $file, $isThemeFile) = @_;
 
 	# Load the static files list generated by `npm install` the first time this method is called.
-	if (!$staticWWAssets) {
+	unless ($staticWWAssets) {
 		my $staticAssetsList = "$ce->{webworkDirs}{htdocs}/static-assets.json";
-		if (-r $staticAssetsList) {
-			my $data = do {
-				open(my $fh, "<:encoding(UTF-8)", $staticAssetsList)
-					or die "FATAL: Unable to open '$staticAssetsList'!";
-				local $/;
-				<$fh>;
-			};
-
-			$staticWWAssets = JSON->new->decode($data);
-		} else {
-			warn "ERROR: '$staticAssetsList' not found!\n"
+		$staticWWAssets = readJSON($staticAssetsList);
+		unless ($staticWWAssets) {
+			warn "ERROR: '$staticAssetsList' not found or not readable!\n"
 				. "You may need to run 'npm install' from '$ce->{webworkDirs}{htdocs}'.";
+			$staticWWAssets = {};
 		}
 	}
 
-	if (!$staticPGAssets) {
-		my $staticAssetsList = "$WeBWorK::Constants::PG_DIRECTORY/htdocs/static-assets.json";
-		if (-r $staticAssetsList) {
-			my $data = do {
-				open(my $fh, "<:encoding(UTF-8)", $staticAssetsList)
-					or die "FATAL: Unable to open '$staticAssetsList'!";
-				local $/;
-				<$fh>;
-			};
-
-			$staticPGAssets = JSON->new->decode($data);
-		} else {
-			warn "ERROR: '$staticAssetsList' not found!\n"
-				. "You may need to run 'npm install' from '$WeBWorK::Constants::PG_DIRECTORY/htdocs'.";
+	unless ($staticPGAssets) {
+		my $staticAssetsList = "$ce->{pg_dir}/htdocs/static-assets.json";
+		$staticPGAssets = readJSON($staticAssetsList);
+		unless ($staticPGAssets) {
+			warn "ERROR: '$staticAssetsList' not found or not readable!\n"
+				. "You may need to run 'npm install' from '$ce->{pg_dir}/htdocs'.";
+			$staticPGAssets = {};
 		}
 	}
 
+	# Load the package.json files the first time this method is called.
+	unless ($thirdPartyWWDependencies) {
+		my $packageJSON = "$ce->{webworkDirs}{htdocs}/package.json";
+		my $data        = readJSON($packageJSON);
+		warn "ERROR: '$packageJSON' not found or not readable!\n" unless $data && defined $data->{dependencies};
+		$thirdPartyWWDependencies = $data->{dependencies} // {};
+	}
+
+	unless ($thirdPartyPGDependencies) {
+		my $packageJSON = "$ce->{pg_dir}/htdocs/package.json";
+		my $data        = readJSON($packageJSON);
+		warn "ERROR: '$packageJSON' not found or not readable!\n" unless $data && defined $data->{dependencies};
+		$thirdPartyPGDependencies = $data->{dependencies} // {};
+	}
+
+	# Check to see if this is a third party asset file in node_modules (either in webwork2/htdocs or pg/htdocs).
+	# If so, then either serve it from a CDN if requested, or serve it directly with the library version
+	# appended as a URL parameter.
+	if ($file =~ /^node_modules/) {
+		my $wwFile = getThirdPartyAssetURL(
+			$file, $thirdPartyWWDependencies,
+			$ce->{webworkURLs}{htdocs},
+			$ce->{options}{thirdPartyAssetsUseCDN}
+		);
+		return $wwFile if $wwFile;
+
+		my $pgFile =
+			getThirdPartyAssetURL($file, $thirdPartyPGDependencies, $ce->{pg_htdocs_url},
+				$ce->{options}{thirdPartyAssetsUseCDN});
+		return $pgFile if $pgFile;
+	}
+
 	# If a right-to-left language is enabled (Hebrew or Arabic) and this is a css file that is not a third party asset,
-	# then determine the rtl varaint file name.  This will be looked for first in the asset lists.
-	my $rtlfile = $file =~ s/\.css$/.rtl.css/r
-		if ($ce->{language} =~ /^(he|ar)/ && $file !~ /node_modules/ && $file =~ /\.css$/);
+	# then determine the rtl variant file name.  This will be looked for first in the asset lists.
+	my $rtlfile =
+		($ce->{language} =~ /^(he|ar)/ && $file !~ /node_modules/ && $file =~ /\.css$/)
+		? $file =~ s/\.css$/.rtl.css/r
+		: undef;
 
 	if ($isThemeFile) {
 		# If the theme directory is the default location, then the file is in the static assets list.
 		# Otherwise just use the given file name.
 		if ($ce->{webworkDirs}{themes} =~ /^$ce->{webworkDirs}{htdocs}\/themes$/) {
 			$rtlfile = "themes/$ce->{defaultTheme}/$rtlfile" if defined $rtlfile;
-			$file = "themes/$ce->{defaultTheme}/$file";
+			$file    = "themes/$ce->{defaultTheme}/$file";
 		} else {
 			return "$ce->{webworkURLs}{themes}/$ce->{defaultTheme}/$file";
 		}
 	}
 
 	# First check to see if this is a file in the webwork htdocs location with a rtl variant.
-	# These can only be local files.
 	return "$ce->{webworkURLs}{htdocs}/$staticWWAssets->{$rtlfile}"
 		if defined $rtlfile && defined $staticWWAssets->{$rtlfile};
 
 	# Next check to see if this is a file in the webwork htdocs location.
-	if (defined $staticWWAssets->{$file}) {
-		# File served by cdn.
-		return $staticWWAssets->{$file} if $staticWWAssets->{$file} =~ /^https?:\/\//;
-		# File served locally.
-		return "$ce->{webworkURLs}{htdocs}/$staticWWAssets->{$file}";
-	}
+	return "$ce->{webworkURLs}{htdocs}/$staticWWAssets->{$file}" if defined $staticWWAssets->{$file};
 
 	# Now check to see if this is a file in the pg htdocs location with a rtl variant.
-	# These also can only be local files.
-	return "/pg_files/$staticPGAssets->{$rtlfile}" if defined $rtlfile && defined $staticPGAssets->{$rtlfile};
+	return "$ce->{pg_htdocs_url}/$staticPGAssets->{$rtlfile}"
+		if defined $rtlfile && defined $staticPGAssets->{$rtlfile};
 
 	# Next check to see if this is a file in the pg htdocs location.
-	if (defined $staticPGAssets->{$file}) {
-		# File served by cdn.
-		return $staticPGAssets->{$file} if $staticPGAssets->{$file} =~ /^https?:\/\//;
-		# File served locally.
-		return "/pg_files/$staticPGAssets->{$file}";
-	}
+	return "$ce->{pg_htdocs_url}/$staticPGAssets->{$file}" if defined $staticPGAssets->{$file};
 
 	# If the file was not found in the lists, then assume it is in the webwork htdocs location, and use the given file
-	# name.  If it is actually in the pg htdocs location, then the apache rewrite will send it there.
+	# name.  If it is actually in the pg htdocs location, then the Mojolicious rewrite will send it there.
 	return "$ce->{webworkURLs}{htdocs}/$file";
 }
 
 # This is a dummy function used to mark strings for localization
 
 sub x {
-  return @_;
+	return @_;
 }
 
 1;
diff --git a/lib/WeBWorK/Utils/AttemptsTable.pm b/lib/WeBWorK/Utils/AttemptsTable.pm
deleted file mode 100644
index 77618b3548..0000000000
--- a/lib/WeBWorK/Utils/AttemptsTable.pm
+++ /dev/null
@@ -1,447 +0,0 @@
-#!/usr/bin/perl -w
-use 5.010;
-
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-=head1 NAME
-
-	AttemptsTable
-
-=head1 SYNPOSIS
-
-	my $tbl = WeBWorK::Utils::AttemptsTable->new(
-		$answers,
-		answersSubmitted       => 1,
-		answerOrder            => $pg->{flags}->{ANSWER_ENTRY_ORDER},
-		displayMode            => 'MathJax',
-		showAnswerNumbers      => 0,
-		showAttemptAnswers     => $showAttemptAnswers && $showEvaluatedAnswers,
-		showAttemptPreviews    => $showAttemptPreview,
-		showAttemptResults     => $showAttemptResults,
-		showCorrectAnswers     => $showCorrectAnswers,
-		showMessages           => $showAttemptAnswers, # internally checks for messages
-		showSummary            => $showSummary,
-		imgGen                 => $imgGen, # not needed if ce is present ,
-		ce                     => '',	   # not needed if $imgGen is present
-		maketext               => WeBWorK::Localize::getLoc("en"),
-	);
-	$tbl->{imgGen}->render(refresh => 1) if $tbl->displayMode eq 'images';
-	my $answerTemplate = $tbl->answerTemplate;
-
-
-=head1 DESCRIPTION
-This module handles the formatting of the table which presents the results of analyzing a student's
-answer to a WeBWorK problem.  It is used in Problem.pm, OpaqueServer.pm, standAlonePGproblemRender
-
-=head2 new
-
-	my $tbl = WeBWorK::Utils::AttemptsTable->new(
-		$answers,
-		answersSubmitted       => 1,
-		answerOrder            => $pg->{flags}->{ANSWER_ENTRY_ORDER},
-		displayMode            => 'MathJax',
-		showHeadline           => 1,
-		showAnswerNumbers      => 0,
-		showAttemptAnswers     => $showAttemptAnswers && $showEvaluatedAnswers,
-		showAttemptPreviews    => $showAttemptPreview,
-		showAttemptResults     => $showAttemptResults,
-		showCorrectAnswers     => $showCorrectAnswers,
-		showMessages           => $showAttemptAnswers, # internally checks for messages
-		showSummary            => $showSummary,
-		imgGen                 => $imgGen, # not needed if ce is present ,
-		ce                     => '',	   # not needed if $imgGen is present
-		maketext               => WeBWorK::Localize::getLoc("en"),
-		summary                =>'',
-	);
-
-	$answers -- a hash of student answers e.g. $pg->{answers}
-	answersSubmitted     if 0 then then the attemptsTable is not displayed (???)
-	answerOrder       -- an array indicating the order the answers appear on the page.
-	displayMode       'MathJax' and 'images' are the most common
-
-	showHeadline       Show the header line 'Results for this submission'
-
-	showAnswerNumbers, showAttemptAnswers, showAttemptPreviews,showAttemptResults,
-	showCorrectAnswers and showMessages control the display of each column in the table.
-
-	attemptAnswers     the student's typed in answer (possibly simplified numerically)
-	attemptPreview     the student's answer after typesetting
-	attemptResults     "correct", "_% correct",  "incorrect" or "ungraded"- links to the answer blank
-	correctAnswers     typeset version (untypeset versions are available via popups)
-	messages           warns of formatting typos in the answer, or
-	                    more detailed messages about a wrong answer
-	summary            is obtained from $pg->{result}->{summary}.
-	                   If this is empty then a (localized)
-	                   version of "all answers are correct"
-	                   or "at least one answer is not coorrect"
-	imgGen             points to a prebuilt image generator objectfor "images" mode
-	ce                 points to the CourseEnvironment -- it is needed if AttemptsTable
-	                    is required to build its own imgGen object
-	maketext           points to a localization subroutine
-
-
-
-
-=head2 Methods
-
-=over 4
-
-=item answerTemplate
-
-Returns HTML which formats the analysis of the student's answers to the problem.
-
-=back
-
-=head2 Read/Write Properties
-
-=over 4
-
-=item showMessages,
-
-This can be switched on or off before exporting the answerTemplate, perhaps under instructions
-	from the PG problem.
-
-=item summary
-
-The contents of the summary can be defined when the attemptsTable object is created.
-
-The summary can be defined by the PG problem grader
-usually returned as $pg->{result}->{summary}.
-
-If the summary is not explicitly defined then (localized) versions
-of the default summaries are created:
-
-	"The answer above is correct.",
-	"Some answers will be graded later.",
-	"All of the [gradeable] answers above are correct.",
-	"[N] of the questions remain unanswered.",
-	"At least one of the answers above is NOT [fully] correct.',
-
-=back
-
-=cut
-
-package WeBWorK::Utils::AttemptsTable;
-use base qw(Class::Accessor);
-
-use strict;
-use warnings;
-use Scalar::Util 'blessed';
-use WeBWorK::Utils 'wwRound';
-use CGI;
-
-# Object contains hash of answer results
-# Object contains display mode
-# Object contains or creates Image generator
-# object returns table
-
-sub new {
-	my $class = shift;
-	$class = (ref($class))? ref($class) : $class; # create a new object of the same class
-	my $rh_answers = shift;
-	ref($rh_answers) =~/HASH/ or die "The first entry to AttemptsTable must be a hash of answers";
-	my %options = @_; # optional:  displayMode=>, submitted=>, imgGen=>, ce=>
-	my $self = {
-		answers             => $rh_answers // {},
-		answerOrder         => $options{answerOrder} // [],
-		answersSubmitted    => $options{answersSubmitted} // 0,
-		summary             => $options{summary} // '',  # summary provided by problem grader
-		displayMode         => $options{displayMode} || "MathJax",
-		showHeadline        => $options{showHeadline} // 1,
-		showAnswerNumbers   => $options{showAnswerNumbers} // 1,
-		showAttemptAnswers  =>  $options{showAttemptAnswers} // 1,    # show student answer as entered and simplified
-	                                                                      #  (e.g numerical formulas are calculated to produce numbers)
-		showAttemptPreviews => $options{showAttemptPreviews} // 1,    # show preview of student answer
-		showAttemptResults  => $options{showAttemptResults} // 1,     # show whether student answer is correct
-		showMessages        => $options{showMessages} // 1,           # show any messages generated by evaluation
-		showCorrectAnswers  => $options{showCorrectAnswers} // 1,     # show the correct answers
-		showSummary         => $options{showSummary} // 1,            # show summary to students
-		maketext            => $options{maketext} // sub {return @_}, # pointer to the maketext subroutine
-		imgGen              => undef,                                 # created in _init method
-	};
-	bless $self, $class;
-	# create read only accessors/mutators
-	$self->mk_ro_accessors(qw(answers answerOrder answersSubmitted displayMode imgGen maketext));
-	$self->mk_ro_accessors(qw(showAnswerNumbers showAttemptAnswers showHeadline
-	                          showAttemptPreviews showAttemptResults
-	                          showCorrectAnswers showSummary));
-	$self->mk_accessors(qw(showMessages  summary));
-	# sanity check and initialize imgGenerator.
-	_init($self, %options);
-	return $self;
-}
-
-sub _init {
-	# verify display mode
-	# build imgGen if it is not supplied
-	my $self = shift;
-	my %options = @_;
-	$self->{submitted}=$options{submitted}//0;
-	$self->{displayMode} = $options{displayMode} || "MathJax";
-	# only show message column if there is at least one message:
-	my @reallyShowMessages =  grep { $self->answers->{$_}->{ans_message} } @{$self->answerOrder};
-	$self->showMessages( $self->showMessages && !!@reallyShowMessages );
-	                               #           (!! forces boolean scalar environment on list)
-	# only used internally -- don't need accessors.
-	$self->{numCorrect}=0;
-	$self->{numBlanks}=0;
-	$self->{numEssay}=0;
-
-	if ( $self->displayMode eq 'images') {
-		if ( blessed( $options{imgGen} ) ) {
-			$self->{imgGen} = $options{imgGen};
-		} elsif ( blessed( $options{ce} ) ) {
-			warn "building imgGen";
-			my $ce = $options{ce};
-			my $site_url = $ce->{server_root_url};
-			my %imagesModeOptions = %{$ce->{pg}->{displayModeOptions}->{images}};
-
-			my $imgGen = WeBWorK::PG::ImageGenerator->new(
-				tempDir         => $ce->{webworkDirs}->{tmp},
-				latex	        => $ce->{externalPrograms}->{latex},
-				dvipng          => $ce->{externalPrograms}->{dvipng},
-				useCache        => 1,
-				cacheDir        => $ce->{webworkDirs}->{equationCache},
-				cacheURL        => $site_url.$ce->{webworkURLs}->{equationCache},
-				cacheDB         => $ce->{webworkFiles}->{equationCacheDB},
-				dvipng_align    => $imagesModeOptions{dvipng_align},
-				dvipng_depth_db => $imagesModeOptions{dvipng_depth_db},
-			);
-	        $self->{imgGen} = $imgGen;
-		} else {
-			warn "Must provide image Generator (imgGen) or a course environment (ce) to build attempts table.";
-		}
-	}
-}
-
-sub maketext {
-        my $self = shift;
-#       Uncomment to check that strings are run through maketext
-#	return 'xXx'.&{$self->{maketext}}(@_).'xXx';
-	return &{$self->{maketext}}(@_);
-}
-sub formatAnswerRow {
-	my $self          = shift;
-	my $rh_answer     = shift;
-	my $ans_id        = shift;
-	my $answerNumber  = shift;
-	my $answerString         = $rh_answer->{student_ans}//'';
-	# use student_ans and not original_student_ans above.  student_ans has had HTML entities translated to prevent XSS.
-	my $answerPreview        = $self->previewAnswer($rh_answer)//'&nbsp;';
-	my $correctAnswer        = $rh_answer->{correct_ans}//'';
-	my $correctAnswerPreview = $self->previewCorrectAnswer($rh_answer)//'&nbsp;';
-
-	my $answerMessage   = $rh_answer->{ans_message}//'';
-	$answerMessage =~ s/\n/<BR>/g;
-	my $answerScore      = $rh_answer->{score}//0;
-	$self->{numCorrect}  += $answerScore >=1;
-	$self->{numEssay}    += ($rh_answer->{type}//'') eq 'essay';
-	$self->{numBlanks}++ unless $answerString =~/\S/ || $answerScore >= 1;
-
-	my $feedbackMessageClass = ($answerMessage eq "") ? "" : $self->maketext("FeedbackMessage");
-
-	my $resultString;
-	my $resultStringClass;
-	if ($answerScore >= 1) {
-		$resultString      = $self->maketext("correct");
-		$resultStringClass = "ResultsWithoutError";
-	} elsif (($rh_answer->{type} // '') eq 'essay') {
-		$resultString = $self->maketext("Ungraded");
-		$self->{essayFlag} = 1;
-	} elsif ($answerScore == 0) {
-		$resultStringClass = "ResultsWithError";
-		$resultString      = $self->maketext("incorrect");
-	} else {
-		$resultString = $self->maketext("[_1]% correct", wwRound(0, $answerScore * 100));
-	}
-	my $attemptResults = CGI::td({ class => $resultStringClass },
-		CGI::a({ href => '#', data_answer_id => $ans_id }, $self->nbsp($resultString)));
-
-	my $row = join('',
-			  ($self->showAnswerNumbers) ? CGI::td({},$answerNumber):'',
-			  ($self->showAttemptAnswers) ? CGI::td({dir=>"auto"},$self->nbsp($answerString)):'' ,   # student original answer
-			  ($self->showAttemptPreviews)?  $self->formatToolTip($answerString, $answerPreview):"" ,
-			  ($self->showAttemptResults)?   $attemptResults : '' ,
-			  ($self->showCorrectAnswers)?  $self->formatToolTip($correctAnswer,$correctAnswerPreview):"" ,
-			  ($self->showMessages)?        CGI::td({class=>$feedbackMessageClass},$self->nbsp($answerMessage)):"",
-			  "\n"
-			  );
-	$row;
-}
-
-#####################################################
-# determine whether any answers were submitted
-# and create answer template if they have been
-#####################################################
-
-sub answerTemplate {
-	my $self = shift;
-	my $rh_answers = $self->{answers};
-	my @tableRows;
-
-	push @tableRows,CGI::Tr(
-			($self->showAnswerNumbers) ? CGI::th("#"):'',
-			($self->showAttemptAnswers)? CGI::th($self->maketext("Entered")):'',  # student original answer
-			($self->showAttemptPreviews)? CGI::th($self->maketext("Answer Preview")):'',
-			($self->showAttemptResults)?  CGI::th($self->maketext("Result")):'',
-			($self->showCorrectAnswers)?  CGI::th($self->maketext("Correct Answer")):'',
-			($self->showMessages)?        CGI::th($self->maketext("Message")):'',
-		);
-
-	my $answerNumber     = 1;
-    foreach my $ans_id (@{ $self->answerOrder() }) {
-    	push @tableRows, CGI::Tr($self->formatAnswerRow($rh_answers->{$ans_id}, $ans_id, $answerNumber++));
-    }
-	my $answerTemplate = "";
-	$answerTemplate .= CGI::h2({ class => 'attemptResultsHeader' }, $self->maketext("Results for this submission"))
-		if $self->showHeadline;
-	$answerTemplate .= CGI::table({ class => 'attemptResults table table-sm table-bordered' }, @tableRows);
-    ### "results for this submission" is better than "attempt results" for a headline
-    $answerTemplate .= ($self->showSummary)? $self->createSummary() : '';
-    $answerTemplate = "" unless $self->answersSubmitted; # only print if there is at least one non-blank answer
-    $answerTemplate;
-}
-#################################################
-
-sub previewAnswer {
-	my $self =shift;
-	my $answerResult = shift;
-	my $displayMode = $self->displayMode;
-	my $imgGen      = $self->imgGen;
-
-	# note: right now, we have to do things completely differently when we are
-	# rendering math from INSIDE the translator and from OUTSIDE the translator.
-	# so we'll just deal with each case explicitly here. there's some code
-	# duplication that can be dealt with later by abstracting out dvipng/etc.
-
-	my $tex = $answerResult->{preview_latex_string};
-
-	return "" unless defined $tex and $tex ne "";
-
-	return $tex if $answerResult->{non_tex_preview};
-
-	if ($displayMode eq "plainText") {
-		return $tex;
-	} elsif (($answerResult->{type}//'') eq 'essay') {
-	    return $tex;
-	} elsif ($displayMode eq "images") {
-		$imgGen->add($tex);
-	} elsif ($displayMode eq "MathJax") {
-		return '<script type="math/tex; mode=display">' . $tex . '</script>';
-	}
-}
-
-sub previewCorrectAnswer {
-	my $self =shift;
-	my $answerResult = shift;
-	my $displayMode = $self->displayMode;
-	my $imgGen      = $self->imgGen;
-
-	my $tex = $answerResult->{correct_ans_latex_string};
-	return $answerResult->{correct_ans} unless defined $tex and $tex=~/\S/;   # some answers don't have latex strings defined
-	# return "" unless defined $tex and $tex ne "";
-
-	return $tex if $answerResult->{non_tex_preview};
-
-	if ($displayMode eq "plainText") {
-		return $tex;
-	} elsif ($displayMode eq "images") {
-		$imgGen->add($tex);
-		# warn "adding $tex";
-	} elsif ($displayMode eq "MathJax") {
-		return '<script type="math/tex; mode=display">' . $tex . '</script>';
-	}
-}
-
-###########################################
-# Create summary
-###########################################
-sub createSummary {
-	my $self = shift;
-	my $summary = "";
-	my $numCorrect = $self->{numCorrect};
-	my $numBlanks  = $self->{numBlanks};
-	my $numEssay   = $self->{numEssay};
-
-	unless (defined($self->summary) and $self->summary =~ /\S/) {
-		my @answerNames = @{ $self->answerOrder() };
-		if (scalar @answerNames == 1) {    #default messages
-			if ($numCorrect == scalar @answerNames) {
-				$summary .=
-					CGI::div({ class => 'ResultsWithoutError mb-2' }, $self->maketext('The answer above is correct.'));
-			} elsif ($self->{essayFlag}) {
-				$summary .= CGI::div($self->maketext('Some answers will be graded later.'));
-			} else {
-				$summary .=
-					CGI::div({ class => 'ResultsWithError mb-2' }, $self->maketext('The answer above is NOT correct.'));
-			}
-		} else {
-			if ($numCorrect + $numEssay == scalar @answerNames) {
-				if ($numEssay) {
-					$summary .= CGI::div({ class => 'ResultsWithoutError mb-2' },
-						$self->maketext('All of the gradeable answers above are correct.'));
-				} else {
-					$summary .= CGI::div({ class => 'ResultsWithoutError mb-2' },
-						$self->maketext('All of the answers above are correct.'));
-				}
-			} elsif ($numBlanks + $numEssay != scalar(@answerNames)) {
-				$summary .= CGI::div({ class => 'ResultsWithError mb-2' },
-					$self->maketext('At least one of the answers above is NOT correct.'));
-			}
-			if ($numBlanks > $numEssay) {
-				my $s = ($numBlanks > 1) ? '' : 's';
-				$summary .= CGI::div(
-					{ class => 'ResultsAlert mb-2' },
-					$self->maketext(
-						'[quant,_1,of the questions remains,of the questions remain] unanswered.', $numBlanks
-					)
-				);
-			}
-		}
-	} else {
-		$summary = $self->summary;    # summary has been defined by grader
-	}
-	$summary = CGI::div({role=>"alert", class=>"attemptResultsSummary"},
-			  $summary);
-	$self->summary($summary);
-	return $summary;   # return formatted version of summary in class "attemptResultsSummary" div
-}
-################################################
-
-############################################
-# utility subroutine -- prevents unwanted line breaks
-############################################
-sub nbsp {
-	my ($self, $str) = @_;
-	return (defined $str && $str =~/\S/) ? $str : "&nbsp;";
-}
-
-# note that formatToolTip output includes CGI::td wrapper
-sub formatToolTip {
-	my $self = shift;
-	my $answer = shift;
-	my $formattedAnswer = shift;
-	return CGI::td(CGI::span({
-				class => "answer-preview",
-				data_bs_toggle => "popover",
-				data_bs_content => $answer,
-				data_bs_placement => "bottom",
-			},
-			$self->nbsp($formattedAnswer))
-	);
-}
-
-1;
diff --git a/lib/WeBWorK/Utils/CourseIntegrityCheck.pm b/lib/WeBWorK/Utils/CourseIntegrityCheck.pm
index 9985b92d45..98fe07c071 100644
--- a/lib/WeBWorK/Utils/CourseIntegrityCheck.pm
+++ b/lib/WeBWorK/Utils/CourseIntegrityCheck.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -17,31 +17,35 @@ package WeBWorK::Utils::CourseIntegrityCheck;
 
 =head1 NAME
 
-WeBWorK::Utils::CourseIntegrityCheck - check that course  database tables agree with database schema and
-that course directory structure is correct.
+WeBWorK::Utils::CourseIntegrityCheck - check that course  database tables agree
+with database schema and that course directory structure is correct.
 
 =cut
 
 use strict;
 use warnings;
+
 use WeBWorK::Debug;
+use WeBWorK::Utils qw/createDirectory/;
 use WeBWorK::Utils::CourseManagement qw/listCourses/;
-use WeBWorK::PG::IO;
-use WeBWorK::CGI;
-
-use constant {             # constants describing the comparison of two hashes.
-           ONLY_IN_A=>0,
-           ONLY_IN_B=>1,
-           DIFFER_IN_A_AND_B=>2,
-           SAME_IN_A_AND_B=>3
+
+# Developer note:  This file should not format messages in html.  Instead return an array of tuples.  Each tuple should
+# contain the message components, and the last element of the tuple should be 0 or 1 to indicate failure or success
+# respectively.  See the updateCourseTables, updateTableFields, and updateCourseDirectories methods.
+
+use constant {    # constants describing the comparison of two hashes.
+	ONLY_IN_A         => 0,
+	ONLY_IN_B         => 1,
+	DIFFER_IN_A_AND_B => 2,
+	SAME_IN_A_AND_B   => 3
 };
 ################################################################################
 
 sub new {
-	my $invocant = shift;
+	my ($invocant, %options) = @_;
 	my $class = ref $invocant || $invocant;
-	my $self = bless {}, $class;
-	$self->init(@_);
+	my $self  = bless {}, $class;
+	$self->init(%options);
 	return $self;
 }
 
@@ -60,21 +64,24 @@ sub init {
 
 	$self->{verbose_sub} = $options{verbose_sub} || \&debug;
 	$self->{confirm_sub} = $options{confirm_sub} || \&ask_permission_stdio;
-	$self->{ce} = $options{ce};
-    my $dbLayoutName = $self->{ce}->{dbLayoutName};
-	$self->{db} =new WeBWorK::DB($self->{ce}->{dbLayouts}->{$dbLayoutName});
+	$self->{ce}          = $options{ce};
+	my $dbLayoutName = $self->{ce}->{dbLayoutName};
+	$self->{db} = WeBWorK::DB->new($self->{ce}{dbLayouts}->{$dbLayoutName});
+
+	return;
 }
 
-sub ce { return shift->{ce} }
-sub db { return shift->{db} }
-sub dbh { return shift->{dbh} }
-sub verbose { my $sub = shift->{verbose_sub}; return &$sub(@_) }
-sub confirm { my $sub = shift->{confirm_sub}; return &$sub(@_) }
+sub ce      { return shift->{ce} }
+sub db      { return shift->{db} }
+sub dbh     { return shift->{dbh} }
+sub verbose { my ($self, @args) = @_; my $sub = $self->{verbose_sub}; return &$sub(@args) }
+sub confirm { my ($self, @args) = @_; my $sub = $self->{confirm_sub}; return &$sub(@args) }
 
 sub DESTROY {
 	my ($self) = @_;
 	$self->unlock_database;
 	$self->SUPER::DESTROY if $self->can("SUPER::DESTROY");
+	return;
 }
 
 ##################################################################
@@ -90,70 +97,67 @@ same as the ones specified by the databaseLayout
 
 sub checkCourseTables {
 	my ($self, $courseName) = @_;
-	my $str='';
-    my $tables_ok = 1;
-    my %dbStatus = ();
-    #################################
-	# fetch schema from course environment and search database
-	# for corresponding tables.
-	##########################################################
+	my $str       = '';
+	my $tables_ok = 1;
+	my %dbStatus  = ();
+
+	# Fetch schema from course environment and search database for corresponding tables.
 	my $db = $self->db;
 	my $ce = $self->{ce};
 	$self->lock_database;
 	foreach my $table (sort keys %$db) {
-	    next if $db->{$table}{params}{non_native}; # skip non-native tables
-	    my $table_name = (exists $db->{$table}->{params}->{tableOverride})? $db->{$table}->{params}->{tableOverride}:$table;
-	    my $database_table_exists = ($db->{$table}->tableExists) ? 1:0;
-	    if ($database_table_exists ) { # exists means the table can be described;
-	       my( $fields_ok, $fieldStatus) = $self->checkTableFields($courseName, $table);
-	       if ($fields_ok) {
-	       	     $dbStatus{$table} = [SAME_IN_A_AND_B()];
-	       } else {
-	       		$dbStatus{$table} = [DIFFER_IN_A_AND_B(),$fieldStatus];
-	       		$tables_ok=0;
-	       }
-	    } else {
-	    	$tables_ok=0;
-	    	$dbStatus{$table}=[ONLY_IN_A(),];
-	    }
+		next if $db->{$table}{params}{non_native};    # Skip non-native tables
+		my $table_name =
+			(exists $db->{$table}->{params}->{tableOverride}) ? $db->{$table}->{params}->{tableOverride} : $table;
+		my $database_table_exists = ($db->{$table}->tableExists) ? 1 : 0;
+		if ($database_table_exists) {                 # Exists means the table can be described
+			my ($fields_ok, $fieldStatus) = $self->checkTableFields($courseName, $table);
+			if ($fields_ok) {
+				$dbStatus{$table} = [ SAME_IN_A_AND_B() ];
+			} else {
+				$dbStatus{$table} = [ DIFFER_IN_A_AND_B(), $fieldStatus ];
+				$tables_ok = 0;
+			}
+		} else {
+			$tables_ok = 0;
+			$dbStatus{$table} = [ ONLY_IN_A(), ];
+		}
 	}
-	##########################################################
-	# fetch fetch corresponding tables in the database and
-	# search for corresponding schema entries.
-	##########################################################
 
+	# Fetch fetch corresponding tables in the database and search for corresponding schema entries.
 	my $dbh = $self->dbh;
-	my $tablePrefix = "${courseName}\\_";   # _ represents any single character in the MySQL like statement so we escape it
-	my $stmt = "show tables like '${tablePrefix}%'";    # mysql request
-	my $result = $dbh->selectall_arrayref($stmt) ;
-	my @tableNames = map {@$_} @$result;             # drill down in the result to the table name level
+	# _ represents any single character in the MySQL like statement so we escape it
+	my $tablePrefix = "${courseName}\\_";
+	my $stmt        = "show tables like '${tablePrefix}%'";    # mysql request
+	my $result      = $dbh->selectall_arrayref($stmt);
+	my @tableNames  = map {@$_} @$result;                      # Drill down in the result to the table name level
 
 	# Table names are of the form courseID_table (with an underscore). So if we have two courses mth101 and
 	# mth101_fall09 when we check the tables for mth101 we will inadvertantly pick up the tables for mth101_fall09.
 	# Thus we find all courseID's and exclude the extraneous tables.
-
-	my @courseIDs = listCourses($ce);
-	my @similarIDs =();
+	my @courseIDs  = listCourses($ce);
+	my @similarIDs = ();
 	foreach my $courseID (@courseIDs) {
-	    next unless $courseID =~/^${courseName}\_(.*)/;
-	    push(@similarIDs, $courseID);
+		next unless $courseID =~ /^${courseName}\_(.*)/;
+		push(@similarIDs, $courseID);
 	}
 
-	OUTER_LOOP:
+OUTER_LOOP:
 	foreach my $table (sort @tableNames) {
-	    next unless $table =~/^${courseName}\_(.*)/;  #double check that we only have our course tables and similar ones
+		# Double check that we only have our course tables and similar ones.
+		next unless $table =~ /^${courseName}\_(.*)/;
 
-	    foreach my $courseID (@similarIDs) {          #exclude tables with similar but wrong names
-		next OUTER_LOOP if $table =~/^${courseID}\_(.*)/;
-	    }
+		foreach my $courseID (@similarIDs) {    # Exclude tables with similar but wrong names.
+			next OUTER_LOOP if $table =~ /^${courseID}\_(.*)/;
+		}
 
-	    my $schema_name = $1;
-		my $exists = exists($db->{$schema_name});
-        $tables_ok = 0 unless exists($db->{$schema_name});
-		$dbStatus{$schema_name} =[ONLY_IN_B] unless $exists;
+		my $schema_name = $1;
+		my $exists      = exists($db->{$schema_name});
+		$tables_ok              = 0           unless exists($db->{$schema_name});
+		$dbStatus{$schema_name} = [ONLY_IN_B] unless $exists;
 	}
 	$self->unlock_database;
-	return ($tables_ok,\%dbStatus); # table in both schema & database; found in schema only; found in database only
+	return ($tables_ok, \%dbStatus);
 }
 
 =item $CIchecker-> updateCourseTables($courseName,  $table_names);
@@ -166,24 +170,22 @@ sub updateCourseTables {
 	my ($self, $courseName, $schema_table_names, $delete_table_names) = @_;
 	my $db = $self->db;
 	$self->lock_database;
-	warn 'Programmers: Pass reference to the array of table names to be updated.'
-		unless ref($schema_table_names) eq 'ARRAY';
+	warn 'Pass reference to the array of table names to be updated.' unless ref($schema_table_names) eq 'ARRAY';
 
-	my $msg = '';
+	my @messages;
 
 	# Add tables
 	for my $schema_table_name (sort @$schema_table_names) {
-		next if $db->{$schema_table_name}{params}{non_native};    # skip non-native tables
+		next if $db->{$schema_table_name}{params}{non_native};    # Skip non-native tables
 		my $schema_obj = $db->{$schema_table_name};
 		my $database_table_name =
 			exists $schema_obj->{params}{tableOverride} ? $schema_obj->{params}{tableOverride} : $schema_table_name;
 
 		if ($schema_obj->can('create_table')) {
 			$schema_obj->create_table;
-			$msg .= "Table $schema_table_name created as $database_table_name in database." . CGI::br();
+			push(@messages, [ "Table $schema_table_name created as $database_table_name in database.", 1 ]);
 		} else {
-			$msg .= CGI::span({ class => 'text-danger' },
-				"Skipping creation of '$schema_table_name' table: no create_table method");
+			push(@messages, [ "Skipping creation of '$schema_table_name' table: no create_table method", 0 ]);
 		}
 	}
 
@@ -193,16 +195,14 @@ sub updateCourseTables {
 		# from the table when the database was checked in checkCourseTables and try that.
 		eval { $self->dbh->do("DROP TABLE `${courseName}_$delete_table_name`") };
 		if ($@) {
-			$msg .= CGI::span({ class => 'text-danger' },
-				"Unable to delete table '$delete_table_name' from database: $@")
-				. CGI::br();
+			push(@messages, [ "Unable to delete table '$delete_table_name' from database: $@", 0 ]);
 		} else {
-			$msg .= "Table '$delete_table_name' deleted from database." . CGI::br();
+			push(@messages, [ "Table '$delete_table_name' deleted from database.", 1 ]);
 		}
 	}
 
 	$self->unlock_database;
-	return $msg;
+	return @messages;
 }
 
 =item  $CIchecker->checkTableFields($courseName, $table);
@@ -213,47 +213,45 @@ same as the ones specified by the databaseLayout
 =cut
 
 sub checkTableFields {
-	my ($self,$courseName, $table) = @_;
-	my $fields_ok = 1;
+	my ($self, $courseName, $table) = @_;
+	my $fields_ok   = 1;
 	my %fieldStatus = ();
-	##########################################################
-	# fetch schema from course environment and search database
-	# for corresponding tables.
-	##########################################################
+
+	# Fetch schema from course environment and search database for corresponding tables.
 	my $db = $self->db;
-	my $table_name = (exists $db->{$table}->{params}->{tableOverride})? $db->{$table}->{params}->{tableOverride}:$table;
-	warn "$table_name is a non native table" if $db->{$table}{params}{non_native}; # skip non-native tables
-	my @schema_field_names =  $db->{$table}->{record}->FIELDS;
-	my %schema_override_field_names=();
+	my $table_name =
+		(exists $db->{$table}->{params}->{tableOverride}) ? $db->{$table}->{params}->{tableOverride} : $table;
+	warn "$table_name is a non native table" if $db->{$table}{params}{non_native};    # skip non-native tables
+	my @schema_field_names          = $db->{$table}->{record}->FIELDS;
+	my %schema_override_field_names = ();
 	foreach my $field (sort @schema_field_names) {
-	    my $field_name  = $db->{$table}->{params}->{fieldOverride}->{$field} ||$field;
-	    $schema_override_field_names{$field_name}=$field;
-	    my $database_field_exists = $db->{$table}->tableFieldExists($field_name);
-	    if ($database_field_exists) {
-	    	$fieldStatus{$field} =[SAME_IN_A_AND_B]
-	    } else {
-            $fields_ok = 0;
-	    	$fieldStatus{$field} =[ONLY_IN_A];
-	    }
+		my $field_name = $db->{$table}->{params}->{fieldOverride}->{$field} || $field;
+		$schema_override_field_names{$field_name} = $field;
+		my $database_field_exists = $db->{$table}->tableFieldExists($field_name);
+		if ($database_field_exists) {
+			$fieldStatus{$field} = [SAME_IN_A_AND_B];
+		} else {
+			$fields_ok = 0;
+			$fieldStatus{$field} = [ONLY_IN_A];
+		}
 
 	}
-	##########################################################
-	# fetch fetch corresponding tables in the database and
-	# search for corresponding schema entries.
-	##########################################################
-
-    my $dbh =$self->dbh;                        # grab any database handle
- 	my $stmt = "SHOW COLUMNS FROM `$table_name`";    # mysql request
- 	my $result = $dbh->selectall_arrayref($stmt) ;
- 	my %database_field_names =  map {${$_}[0]=>[$_]} @$result;             # drill down in the result to the field name level
-                                                           #  result is array:  Field      | Type     | Null | Key | Default | Extra
- 	foreach my $field_name (sort keys %database_field_names) {
- 		my $exists = exists($schema_override_field_names{$field_name} );
- 		$fields_ok=0 unless $exists;
- 		$fieldStatus{$field_name} = [ONLY_IN_B] unless $exists;
- 	}
-
- 	return ($fields_ok, \%fieldStatus); # table in both schema & database; found in schema only; found in database only
+
+	# Fetch corresponding tables in the database and search for corresponding schema entries.
+	my $dbh  = $self->dbh;                           # Get a database handle
+	my $stmt = "SHOW COLUMNS FROM `$table_name`";    # mysql request
+
+	# result is array:  Field | Type | Null | Key | Default | Extra
+	my $result               = $dbh->selectall_arrayref($stmt);
+	my %database_field_names = map { ${$_}[0] => [$_] } @$result;    # Drill down in the result to the field name level
+
+	foreach my $field_name (sort keys %database_field_names) {
+		my $exists = exists($schema_override_field_names{$field_name});
+		$fields_ok                = 0           unless $exists;
+		$fieldStatus{$field_name} = [ONLY_IN_B] unless $exists;
+	}
+
+	return ($fields_ok, \%fieldStatus);
 }
 
 =item  $CIchecker->updateTableFields($courseName, $table);
@@ -265,7 +263,7 @@ the same as the ones specified by the databaseLayout
 
 sub updateTableFields {
 	my ($self, $courseName, $table, $delete_field_names) = @_;
-	my $msg = '';
+	my @messages;
 
 	# Fetch schema from course environment and search database for corresponding tables.
 	my $db         = $self->db;
@@ -278,7 +276,7 @@ sub updateTableFields {
 		if ($fieldStatus->{$field_name}[0] == ONLY_IN_A) {
 			my $schema_obj = $db->{$table};
 			if ($schema_obj->can('add_column_field') && $schema_obj->add_column_field($field_name)) {
-				$msg .= "Added column '$field_name' to table '$table'" . CGI::br();
+				push(@messages, [ "Added column '$field_name' to table '$table'", 1 ]);
 			}
 		}
 	}
@@ -288,12 +286,12 @@ sub updateTableFields {
 		if ($fieldStatus->{$field_name} && $fieldStatus->{$field_name}[0] == ONLY_IN_B) {
 			my $schema_obj = $db->{$table};
 			if ($schema_obj->can('drop_column_field') && $schema_obj->drop_column_field($field_name)) {
-				$msg .= "Dropped column '$field_name' from table '$table'" . CGI::br();
+				push(@messages, [ "Dropped column '$field_name' from table '$table'", 1 ]);
 			}
 		}
 	}
 
-	return $msg;
+	return @messages;
 }
 
 =item $CIchecker->checkCourseDirectories($courseName);
@@ -306,31 +304,22 @@ permissions.
 sub checkCourseDirectories {
 	my ($self) = @_;
 	my $ce = $self->{ce};
-	my @webworkDirectories = keys %{$ce->{webworkDirs}};
-    my @courseDirectories = keys %{$ce->{courseDirs}};
-    my $str = '';
-    my @results;
-    my $directories_ok =1;
-    foreach my $dir (sort @courseDirectories) {
-        my $path = $ce->{courseDirs}->{$dir};
-        my $status = (-e $path) ?
-          ((-r $path)?'r':'-') .
-    	  ((-w _ )?'w':'-'   ) .
-    	  ((-x _ )?'x':'-'   )    : "missing";
-
-    	#all directories should be readable, writable and executable
-    	my $class;
-	    if ($status eq 'rwx') {
-	    	$class = 'text-success';
-	    } else {
-	    	$directories_ok = 0;
-	    	$class = 'text-danger';
-	    }
-
-		push @results, CGI::li("$dir =>" . CGI::span({ class => $class }, " $path $status <br/>"));
-    }
-    $str = CGI::start_ul(). join(" ",@results) .  CGI::end_ul();
-    return ( $directories_ok, $str);
+
+	my @results;
+	my $directories_ok = 1;
+
+	for my $dir (sort keys %{ $ce->{courseDirs} }) {
+		my $path   = $ce->{courseDirs}{$dir};
+		my $status = -e $path ? (-r $path ? 'r' : '-') . (-w _ ? 'w' : '-') . (-x _ ? 'x' : '-') : 'missing';
+
+		# All directories should be readable, writable and executable.
+		my $good = $status eq 'rwx';
+		$directories_ok = 0 if !$good;
+
+		push @results, [ $dir, $path, $good ];
+	}
+
+	return ($directories_ok, \@results);
 }
 
 =item $CIchecker->updateCourseDirectories($courseName);
@@ -339,130 +328,151 @@ Creates some course directories automatically.
 
 =cut
 
+# FIXME: This method needs work.  It should give better messages, and should at least attempt to fix permissions if
+# possible.  It also should deal with some of the other course directories that it skips.
+
 sub updateCourseDirectories {
 	my $self = shift;
-	my $ce = $self->{ce};
-	my @webworkDirectories = keys %{$ce->{webworkDirs}};
-    my @courseDirectories = keys %{$ce->{courseDirs}};
-    my %updateable_directories = (html_temp=>1,mailmerge=>1,tmpEditFileDir=>1);  #FIXME this is hardwired for the time being.
-    foreach my $dir (sort @courseDirectories) {
-    	#HACK for upgrading the achievements directory
-    	if ($dir eq "achievements") {
-    		my $modelCourseAchievementsDir = $ce->{webworkDirs}{courses}."/modelCourse/templates/achievements";
-    		my $modelCourseAchievementsHtmlDir = $ce->{webworkDirs}{courses}."/modelCourse/html/achievements";
-    		my $courseAchievementsDir = $ce->{courseDirs}{achievements};
-    		my $courseAchievementsHtmlDir = $ce->{courseDirs}{achievements_html};
-    		my $courseTemplatesDir = $ce->{courseDirs}{templates};
-    		my $courseHtmlDir = $ce->{courseDirs}{html};
-			unless (-e $modelCourseAchievementsDir and -e $modelCourseAchievementsHtmlDir) {
-				print CGI::p(
-					{ class => 'text-danger' },
-					"Your modelCourse in the 'courses' directory is out of date or missing. Please update it from "
-						. "webwork/webwork2/courses.dist directory before upgrading the other courses. Cannot find "
-						. "MathAchievements directory $modelCourseAchievementsDir nor MathAchievements picture "
-						. "directory $modelCourseAchievementsHtmlDir"
+	my $ce   = $self->{ce};
+
+	my @courseDirectories = keys %{ $ce->{courseDirs} };
+
+	#FIXME this is hardwired for the time being.
+	my %updateable_directories = (html_temp => 1, mailmerge => 1, tmpEditFileDir => 1);
+
+	my @messages;
+
+	for my $dir (sort @courseDirectories) {
+		# Hack for upgrading the achievements directory.
+		if ($dir eq 'achievements') {
+			my $modelCourseAchievementsDir     = "$ce->{webworkDirs}{courses}/modelCourse/templates/achievements";
+			my $modelCourseAchievementsHtmlDir = "$ce->{webworkDirs}{courses}/modelCourse/html/achievements";
+			my $courseAchievementsDir          = $ce->{courseDirs}{achievements};
+			my $courseAchievementsHtmlDir      = $ce->{courseDirs}{achievements_html};
+			my $courseTemplatesDir             = $ce->{courseDirs}{templates};
+			my $courseHtmlDir                  = $ce->{courseDirs}{html};
+			unless (-e $modelCourseAchievementsDir && -e $modelCourseAchievementsHtmlDir) {
+				push(
+					@messages,
+					[
+						'Your modelCourse in the "courses" directory is out of date or missing. Please update it from '
+							. 'webwork/webwork2/courses.dist directory before upgrading the other courses. Cannot find '
+							. "MathAchievements directory $modelCourseAchievementsDir nor MathAchievements picture "
+							. "directory $modelCourseAchievementsHtmlDir",
+						0
+					]
 				);
 			} else {
-				unless (-e $courseAchievementsDir and -e $courseAchievementsHtmlDir) {
-					print CGI::p({ class => 'text-success' },
-						"We'll try to update the achievements directory for $ce->{courseDirs}{root}");
+				unless (-e $courseAchievementsDir && -e $courseAchievementsHtmlDir) {
+					push(@messages,
+						[ "Attempting to update the achievements directory for $ce->{courseDirs}{root}", 1 ]);
 					if (-e $courseAchievementsDir) {
-						print CGI::p({ class => 'text-success' }, 'Achievements directory is already present');
+						push(@messages, [ 'Achievements directory is already present', 1 ]);
 					} else {
-						system 'cp -RPpi $modelCourseAchievementsDir $courseTemplatesDir ';
-						print CGI::p({ class => 'text-success' }, 'Achievements directory created');
+						system "cp -RPpi $modelCourseAchievementsDir $courseTemplatesDir";
+						push(@messages, [ 'Achievements directory created', 1 ]);
 					}
 					if (-e $courseAchievementsHtmlDir) {
-						print CGI::p({ class => 'text-success' }, 'Achievements html directory is already present');
+						push(@messages, [ 'Achievements html directory is already present', 1 ]);
 					} else {
 						system "cp -RPpi $modelCourseAchievementsHtmlDir $courseHtmlDir ";
-						print CGI::p({ class => 'text-success' }, 'Achievements html directory created');
+						push(@messages, [ 'Achievements html directory created', 1 ]);
 					}
 				}
 			}
-			#print "done with achievements for ",$ce->{courseDirs}{root},"<br/>";
-     	} # end HACK for upgrading achivements
-        next unless exists $updateable_directories{$dir};
-        my $path = $ce->{courseDirs}->{$dir};
-        unless ( -e $path) {   # if by some unlucky chance the tmpDirectory hasn't been created, create it.
-			my $parentDirectory =  $path;
-			$parentDirectory =~s|/$||;  # remove a trailing /
-			$parentDirectory =~s|/[^/]*$||; # remove last node
-			my ($perms, $groupID) = (stat $parentDirectory)[2,5];
+		}
+
+		next unless exists $updateable_directories{$dir};
+		my $path = $ce->{courseDirs}->{$dir};
+		unless (-e $path) {    # If the directory does not exist, create it.
+			my $parentDirectory = $path;
+			$parentDirectory =~ s|/$||;         # Remove a trailing forward slash
+			$parentDirectory =~ s|/[^/]*$||;    # Remove last node
+			my ($perms, $groupID) = (stat $parentDirectory)[ 2, 5 ];
 			if (-w $parentDirectory) {
-				WeBWorK::PG::IO::createDirectory($path, $perms, $groupID)
-					or warn "Failed to create directory at $path.\n";
+				createDirectory($path, $perms, $groupID)
+					or push(@messages, [ "Failed to create directory at $path.", 0 ]);
 			} else {
-				warn "Permissions error. Can't create directory at $path. Lack write permission on $parentDirectory.\n"
+				push(
+					@messages,
+					[
+						"Permissions error. Can't create directory at $path. "
+							. "Lack write permission on $parentDirectory.",
+						0
+					]
+				);
 			}
-
 		}
 	}
 
-    return ( );
+	return \@messages;
 }
 
 ##############################################################################
 # Database utilities -- borrowed from DBUpgrade.pm ??use or modify??? --MEG
 ##############################################################################
 
-sub lock_database {   # lock named 'webwork.dbugrade' times out after 10 seconds
-	my $self =shift;
-	my $dbh = $self->dbh;
+sub lock_database {    # lock named 'webwork.dbugrade' times out after 10 seconds
+	my $self          = shift;
+	my $dbh           = $self->dbh;
 	my ($lock_status) = $dbh->selectrow_array("SELECT GET_LOCK('webwork.dbupgrade', 10)");
 	if (not defined $lock_status) {
 		die "Couldn't obtain lock because an error occurred.\n";
 	}
-	if ($lock_status) {
-	} else {
+	if (!$lock_status) {
 		die "Timed out while waiting for lock.\n";
 	}
+	return;
 }
 
 sub unlock_database {
-	my $self =shift;
-	my $dbh = $self->dbh;
+	my $self          = shift;
+	my $dbh           = $self->dbh;
 	my ($lock_status) = $dbh->selectrow_array("SELECT RELEASE_LOCK('webwork.dbupgrade')");
 	if (not defined $lock_status) {
 		# die "Couldn't release lock because the lock does not exist.\n";
-	}elsif ($lock_status) {
-	    return;
+	} elsif ($lock_status) {
+		return;
 	} else {
 		die "Couldn't release lock because the lock is not held by this thread.\n";
 	}
+	return;
 }
 
 ##############################################################################
 
 sub load_sql_table_list {
-	my $self =shift;
-	my $dbh = $self->dbh;
+	my $self           = shift;
+	my $dbh            = $self->dbh;
 	my $sql_tables_ref = $dbh->selectcol_arrayref("SHOW TABLES");
-	$self->{sql_tables} = {}; @{$self->{sql_tables}}{@$sql_tables_ref} = ();
+	$self->{sql_tables} = {};
+	@{ $self->{sql_tables} }{@$sql_tables_ref} = ();
+	return;
 }
 
 sub register_sql_table {
-	my $self =shift;
+	my $self  = shift;
 	my $table = shift;
-	my $dbh = $self->dbh;
+	my $dbh   = $self->dbh;
 	$self->{sql_tables}{$table} = ();
+	return;
 }
 
 sub unregister_sql_table {
-	my $self =shift;
+	my $self  = shift;
 	my $table = shift;
-	my $dbh = $self->dbh;
+	my $dbh   = $self->dbh;
 	delete $self->{sql_tables}{$table};
+	return;
 }
 
 sub sql_table_exists {
-	my $self =shift;
-	my $table=shift;
-	my $dbh = $self->dbh;
+	my $self  = shift;
+	my $table = shift;
+	my $dbh   = $self->dbh;
 	return exists $self->{sql_tables}{$table};
 }
 
-
 ################################################################################
 
 sub ask_permission_stdio {
@@ -473,13 +483,14 @@ sub ask_permission_stdio {
 
 	while (1) {
 		print "$prompt $options ";
-		my $resp = <STDIN>;
+		my $resp = <ARGV>;
 		chomp $resp;
 		return $default if $resp eq "";
-		return 1 if lc $resp eq "y";
-		return 0 if lc $resp eq "n";
+		return 1        if lc $resp eq "y";
+		return 0        if lc $resp eq "n";
 		$prompt = 'Please enter "y" or "n".';
 	}
+	return 0;
 }
 
 =back
diff --git a/lib/WeBWorK/Utils/CourseManagement.pm b/lib/WeBWorK/Utils/CourseManagement.pm
index 378e87444d..3c53c862ee 100644
--- a/lib/WeBWorK/Utils/CourseManagement.pm
+++ b/lib/WeBWorK/Utils/CourseManagement.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -24,21 +24,21 @@ WeBWorK::Utils::CourseManagement - create, rename, and delete courses.
 
 use strict;
 use warnings;
+
 use Carp;
 use DBI;
+use String::ShellQuote;
+use UUID::Tiny qw(create_uuid_as_string);
+
 use WeBWorK::Debug;
 use File::Path qw(rmtree);
 use File::Copy qw(move);
 use File::Spec;
-use String::ShellQuote;
 use WeBWorK::CourseEnvironment;
+use WeBWorK::DB;
 use WeBWorK::Debug;
-use WeBWorK::Utils qw(runtime_use readDirectory pretty_print_rh);
-use UUID::Tiny qw(create_uuid_as_string);
-#use WeBWorK::Utils::DBUpgrade;
-use PGUtil; # for not_null() macro
+use WeBWorK::Utils qw(runtime_use readDirectory surePathToFile);
 
-our @EXPORT    = ();
 our @EXPORT_OK = qw(
 	listCourses
 	listArchivedCourses
@@ -53,15 +53,14 @@ our @EXPORT_OK = qw(
 
 );
 
-use constant {             # constants describing the comparison of two hashes.
-           ONLY_IN_A=>0,
-           ONLY_IN_B=>1,
-           DIFFER_IN_A_AND_B=>2,
-           SAME_IN_A_AND_B=>3
+use constant {    # constants describing the comparison of two hashes.
+	ONLY_IN_A         => 0,
+	ONLY_IN_B         => 1,
+	DIFFER_IN_A_AND_B => 2,
+	SAME_IN_A_AND_B   => 3
 };
 ################################################################################
 
-
 # 	checkCourseTables
 # 	updateCourseTables
 # 	checkCourseDirectories
@@ -93,17 +92,17 @@ sub listCourses {
 			PrintError => 0,
 			RaiseError => 1,
 		},
-        );
+	);
 
-	my $dbname = ${ce}->{database_name};
+	my $dbname   = ${ce}->{database_name};
 	my $stmt_bad = 0;
-	my $stmt = $dbh->prepare("show tables") or ( $stmt_bad = 1 );
-	my %user_tables_seen; # Will also include problem_user, set_user, achievement_user, set_locations_user
-	if ( ! $stmt_bad ) {
-		$stmt->execute() or ( $stmt_bad = 1 );
+	my $stmt     = $dbh->prepare("show tables") or ($stmt_bad = 1);
+	my %user_tables_seen;    # Will also include problem_user, set_user, achievement_user, set_locations_user
+	if (!$stmt_bad) {
+		$stmt->execute() or ($stmt_bad = 1);
 		my @row;
 		while (@row = $stmt->fetchrow_array) {
-			if ( $row[0] =~  /_user$/ ) {
+			if ($row[0] =~ /_user$/) {
 				$user_tables_seen{ $row[0] } = 1;
 			}
 		}
@@ -112,14 +111,14 @@ sub listCourses {
 	$dbh->disconnect();
 
 	# Collect directories which may be course directories
-	my @cdirs = grep { not (m/^\./ or m/^CVS$/) and -d "$coursesDir/$_" } readDirectory($coursesDir);
-	if ( $stmt_bad ) {
+	my @cdirs = grep { not(m/^\./ or m/^CVS$/) and -d "$coursesDir/$_" } readDirectory($coursesDir);
+	if ($stmt_bad) {
 		# Fall back to old method listing all directories.
 		return @cdirs;
 	} else {
 		my @courses;
-		foreach my $cname ( @cdirs ) {
-			push(@courses,$cname) if $user_tables_seen{"${cname}_user"};
+		foreach my $cname (@cdirs) {
+			push(@courses, $cname) if $user_tables_seen{"${cname}_user"};
 		}
 		return @courses;
 	}
@@ -133,8 +132,9 @@ Lists the courses which have been archived (end in .tar.gz).
 
 sub listArchivedCourses {
 	my ($ce) = @_;
-	my $coursesDir = $ce->{webworkDirs}->{courses};
-	return grep { m/\.tar\.gz$/ } readDirectory($coursesDir);
+	my $archivesDir = "$ce->{webworkDirs}{courses}/admin/archives";
+	surePathToFile($ce->{webworkDirs}{courses}, "$archivesDir/test");    # Ensure archives directory exists.
+	return grep {m/\.tar\.gz$/} readDirectory($archivesDir);
 }
 
 ################################################################################
@@ -143,11 +143,10 @@ sub listArchivedCourses {
 
 %options must contain:
 
- courseID => $courseID,
- ce => $ce,
+ courseID      => $courseID,
+ ce            => $ce,
  courseOptions => $courseOptions,
- dbOptions => $dbOptions,
- users => $users
+ users         => $users
 
 %options may contain:
 
@@ -163,18 +162,9 @@ environment.
 $courseOptions is a reference to a hash containing the following options:
 
  dbLayoutName         => $dbLayoutName
- allowedRecipients    => $mail{allowedRecipients}
- feedbackRecipients   => $mail{feedbackRecipients}
  PRINT_FILE_NAMES_FOR => $pg{specialPGEnvironmentVars}->{PRINT_FILE_NAMES_FOR}
 
-C<dbLayoutName> is required. C<allowedRecipients>, C<feedbackRecipients>, and
-C<PRINT_FILE_NAMES_FOR> are references to arrays.
-
-$dbOptions is a reference to a hash containing information required to create a
-database for the course. Current database layouts do not require additional
-information, so specify a reference to an empty hash. If $dbOptions is
-undefined, addCourse() assumes that the database has already been created, and
-skips that step in the course creation process.
+C<dbLayoutName> is required. C<PRINT_FILE_NAMES_FOR> is a reference to an array.
 
 $users is a list of arrayrefs, each containing a User, Password, and
 PermissionLevel record for a single user:
@@ -191,18 +181,16 @@ templates directory will be copied to the new course.
 sub addCourse {
 	my (%options) = @_;
 
-	for my $key (keys(%options)){
-		  	my $value = '####UNDEF###';
-		  	$value = $options{$key} if (defined($options{$key}));
-		  	debug("$key  : $value");
-		  }
-
+	for my $key (keys(%options)) {
+		my $value = '####UNDEF###';
+		$value = $options{$key} if (defined($options{$key}));
+		debug("$key  : $value");
+	}
 
-	my $courseID = $options{courseID};
-	my $ce = $options{ce};
+	my $courseID      = $options{courseID};
+	my $ce            = $options{ce};
 	my %courseOptions = %{ $options{courseOptions} };
-	my %dbOptions = defined $options{dbOptions} ? %{ $options{dbOptions} } : ();
-	my @users = exists $options{users} ? @{ $options{users} } : ();
+	my @users         = exists $options{users} ? @{ $options{users} } : ();
 
 	debug \@users;
 
@@ -211,7 +199,7 @@ sub addCourse {
 
 	# collect some data
 	my $coursesDir = $ce->{webworkDirs}->{courses};
-	my $courseDir = "$coursesDir/$courseID";
+	my $courseDir  = "$coursesDir/$courseID";
 
 	# fail if the course already exists
 	# IMPORTANT: this must be the first check! if any check other than this one
@@ -230,7 +218,7 @@ sub addCourse {
 
 	# fail if requested course ID is too long
 	croak "Course ID cannot exceed " . $ce->{maxCourseIdLength} . " characters."
-		if ( length($courseID) > $ce->{maxCourseIdLength} );
+		if (length($courseID) > $ce->{maxCourseIdLength});
 
 	# if we didn't get a database layout, use the default one
 	if (not defined $dbLayoutName) {
@@ -244,11 +232,13 @@ sub addCourse {
 
 	##### step 1: create course directory structure #####
 
-	my %courseDirs = %{$ce->{courseDirs}};
+	my %courseDirs = %{ $ce->{courseDirs} };
 
 	# deal with root directory first -- if we can't create it, we have to give up.
 
-	exists $courseDirs{root} or croak "Can't create the course '$courseID' because no root directory is specified in the '%courseDirs' hash.";
+	exists $courseDirs{root}
+		or croak
+		"Can't create the course '$courseID' because no root directory is specified in the '%courseDirs' hash.";
 	my $root = $courseDirs{root};
 	delete $courseDirs{root};
 	{
@@ -258,9 +248,12 @@ sub addCourse {
 		my @rootElements = File::Spec->splitdir($root);
 		pop @rootElements;
 		my $rootParent = File::Spec->catdir(@rootElements);
-		-w $rootParent or croak "Can't create the course '$courseID' because the courses directory '$rootParent' is not writeable.";
+		-w $rootParent
+			or croak
+			"Can't create the course '$courseID' because the courses directory '$rootParent' is not writeable.";
 		# try to create it
-		mkdir $root or croak "Can't create the course '$courseID' becasue the root directory '$root' could not be created: $!.";
+		mkdir $root
+			or croak "Can't create the course '$courseID' becasue the root directory '$root' could not be created: $!.";
 	}
 
 	# deal with the rest of the directories
@@ -271,7 +264,8 @@ sub addCourse {
 
 		# does the directory already exist?
 		if (-e $courseDir) {
-			warn "Can't create $courseDirName directory '$courseDir', since it already exists. Using existing directory.\n";
+			warn
+				"Can't create $courseDirName directory '$courseDir', since it already exists. Using existing directory.\n";
 			next;
 		}
 
@@ -280,17 +274,20 @@ sub addCourse {
 		pop @courseDirElements;
 		my $courseDirParent = File::Spec->catdir(@courseDirElements);
 		unless (-w $courseDirParent) {
-			warn "Can't create $courseDirName directory '$courseDir', since the parent directory is not writeable. You will have to create this directory manually.\n";
+			warn
+				"Can't create $courseDirName directory '$courseDir', since the parent directory is not writeable. You will have to create this directory manually.\n";
 			next;
 		}
 
 		# try to create it
-		mkdir $courseDir or warn "Failed to create $courseDirName directory '$courseDir': $!. You will have to create this directory manually.\n";
+		mkdir $courseDir
+			or warn
+			"Failed to create $courseDirName directory '$courseDir': $!. You will have to create this directory manually.\n";
 	}
 
 	##### step 2: create course database #####
 
-	my $db = new WeBWorK::DB($ce->{dbLayouts}->{$dbLayoutName});
+	my $db               = new WeBWorK::DB($ce->{dbLayouts}->{$dbLayoutName});
 	my $create_db_result = $db->create_tables;
 	die "$courseID: course database creation failed.\n" unless $create_db_result;
 
@@ -305,20 +302,22 @@ sub addCourse {
 		foreach my $userTriple (@users) {
 			my ($User, $Password, $PermissionLevel) = @$userTriple;
 
-			eval { $db->addUser($User)                       }; warn $@ if $@;
-			eval { $db->addPassword($Password)               }; warn $@ if $@;
-			eval { $db->addPermissionLevel($PermissionLevel) }; warn $@ if $@;
+			eval { $db->addUser($User) };
+			warn $@ if $@;
+			eval { $db->addPassword($Password) };
+			warn $@ if $@;
+			eval { $db->addPermissionLevel($PermissionLevel) };
+			warn $@ if $@;
 		}
 	}
 
 	if (exists $options{courseTitle}) {
-	    $db->setSettingValue('courseTitle',$options{courseTitle});
+		$db->setSettingValue('courseTitle', $options{courseTitle});
 	}
 	if (exists $options{courseInstitution}) {
-	    $db->setSettingValue('courseInstitution',$options{courseInstitution});
+		$db->setSettingValue('courseInstitution', $options{courseInstitution});
 	}
 
-
 	##### step 4: write course.conf file #####
 
 	my $courseEnvFile = $ce->{courseFiles}->{environment};
@@ -327,41 +326,47 @@ sub addCourse {
 	writeCourseConf($fh, $ce, %courseOptions);
 	close $fh;
 
-	##### step 5: copy templates and html #####
+	##### step 5: copy templates, html, and simple.conf if desired #####
 
 	if (exists $options{templatesFrom}) {
 		my $sourceCourse = $options{templatesFrom};
-		my $sourceCE = new WeBWorK::CourseEnvironment({
-			get_SeedCE($ce),
-			courseName => $sourceCourse,        # override courseName
-		});
-		my $sourceDir = $sourceCE->{courseDirs}->{templates};
+		my $sourceCE     = WeBWorK::CourseEnvironment->new({ get_SeedCE($ce), courseName => $sourceCourse });
+		my $sourceDir    = $sourceCE->{courseDirs}->{templates};
 		## copy templates ##
 		if (-d $sourceDir) {
 			my $destDir = $ce->{courseDirs}{templates};
-			my $cp_cmd = "2>&1 " . $ce->{externalPrograms}{cp} . " -R " . shell_quote($sourceDir) . "/* " . shell_quote($destDir);
+			my $cp_cmd  = "2>&1 "
+				. $ce->{externalPrograms}{cp} . " -R "
+				. shell_quote($sourceDir) . "/* "
+				. shell_quote($destDir);
 			my $cp_out = readpipe $cp_cmd;
 			if ($?) {
-				my $exit = $? >> 8;
+				my $exit   = $? >> 8;
 				my $signal = $? & 127;
-				my $core = $? & 128;
-				warn "Failed to copy templates from course '$sourceCourse' with command '$cp_cmd' (exit=$exit signal=$signal core=$core): $cp_out\n";
+				my $core   = $? & 128;
+				warn
+					"Failed to copy templates from course '$sourceCourse' with command '$cp_cmd' (exit=$exit signal=$signal core=$core): $cp_out\n";
 			}
 		} else {
-			warn "Failed to copy templates from course '$sourceCourse': templates directory '$sourceDir' does not exist.\n";
+			warn
+				"Failed to copy templates from course '$sourceCourse': templates directory '$sourceDir' does not exist.\n";
 		}
 		## copy html ##
 		## this copies the html/tmp directory as well which is not optimal
 		$sourceDir = $sourceCE->{courseDirs}->{html};
 		if (-d $sourceDir) {
 			my $destDir = $ce->{courseDirs}{html};
-			my $cp_cmd = "2>&1 " . $ce->{externalPrograms}{cp} . " -R " . shell_quote($sourceDir) . "/* " . shell_quote($destDir);
+			my $cp_cmd  = "2>&1 "
+				. $ce->{externalPrograms}{cp} . " -R "
+				. shell_quote($sourceDir) . "/* "
+				. shell_quote($destDir);
 			my $cp_out = readpipe $cp_cmd;
 			if ($?) {
-				my $exit = $? >> 8;
+				my $exit   = $? >> 8;
 				my $signal = $? & 127;
-				my $core = $? & 128;
-				warn "Failed to copy html from course '$sourceCourse' with command '$cp_cmd' (exit=$exit signal=$signal core=$core): $cp_out\n";
+				my $core   = $? & 128;
+				warn
+					"Failed to copy html from course '$sourceCourse' with command '$cp_cmd' (exit=$exit signal=$signal core=$core): $cp_out\n";
 			}
 		} else {
 			warn "Failed to copy html from course '$sourceCourse': html directory '$sourceDir' does not exist.\n";
@@ -372,19 +377,20 @@ sub addCourse {
 			my $sourceFile = $sourceCE->{courseFiles}->{simpleConfig};
 			if (-e $sourceFile) {
 				my $destFile = $ce->{courseFiles}{simpleConfig};
-				my $cp_cmd = join(" ", ("2>&1", $ce->{externalPrograms}{cp}, shell_quote($sourceFile), shell_quote($destFile)));
+				my $cp_cmd =
+					join(" ", ("2>&1", $ce->{externalPrograms}{cp}, shell_quote($sourceFile), shell_quote($destFile)));
 				my $cp_out = readpipe $cp_cmd;
 				if ($?) {
-					my $exit = $? >> 8;
+					my $exit   = $? >> 8;
 					my $signal = $? & 127;
-					my $core = $? & 128;
-					warn "Failed to copy simple.conf from course '$sourceCourse' with command '$cp_cmd' (exit=$exit signal=$signal core=$core): $cp_out\n";
+					my $core   = $? & 128;
+					warn
+						"Failed to copy simple.conf from course '$sourceCourse' with command '$cp_cmd' (exit=$exit signal=$signal core=$core): $cp_out\n";
 				}
 			}
 		}
 
 	}
-	######## set 6: copy html/achievements contents ##############
 }
 
 ################################################################################
@@ -395,7 +401,6 @@ sub addCourse {
 
  courseID => $courseID,
  ce => $ce,
- dbOptions => $dbOptions,
  newCourseID => $newCourseID,
 
 %options may also contain:
@@ -410,11 +415,6 @@ Rename the course named $courseID to $newCourseID.
 $ce is a WeBWorK::CourseEnvironment object that describes the existing course's
 environment.
 
-$dbOptions is a reference to a hash containing information required to create
-the course's new database and delete the course's old database. Current database
-layouts do not require additional information, so specify a reference to an
-empty hash.
-
 The name of the course's directory is changed to $newCourseID.
 
 If the course's database layout is C<sql_single> or C<sql_moodle>, new tables
@@ -440,19 +440,17 @@ sub renameCourse {
 	#    $toCourseID ($newCourseID)
 	#    $toCE (construct from $oldCE)
 	#    $dbLayoutName ($oldCE->{dbLayoutName})
-	#    %options ($dbOptions)
 
-	my $oldCourseID = $options{courseID};
-	my $oldCE = $options{ce};
-	my %dbOptions = defined $options{dbOptions} ? %{ $options{dbOptions} } : ();
-	my $newCourseID = $options{newCourseID};
+	my $oldCourseID  = $options{courseID};
+	my $oldCE        = $options{ce};
+	my $newCourseID  = $options{newCourseID};
 	my $skipDBRename = $options{skipDBRename} || 0;
 
 	# get the database layout out of the options hash
 	my $dbLayoutName = $oldCE->{dbLayoutName};
 
 	# collect some data
-	my $coursesDir = $oldCE->{webworkDirs}->{courses};
+	my $coursesDir   = $oldCE->{webworkDirs}->{courses};
 	my $oldCourseDir = "$coursesDir/$oldCourseID";
 	my $newCourseDir = "$coursesDir/$newCourseID";
 
@@ -463,7 +461,7 @@ sub renameCourse {
 
 	# fail if the target courseID is too long
 	croak "New course ID cannot exceed " . $oldCE->{maxCourseIdLength} . " characters."
-		if ( length($newCourseID) > $oldCE->{maxCourseIdLength} );
+		if (length($newCourseID) > $oldCE->{maxCourseIdLength});
 
 	# fail if the source course does not exist
 	unless (-e $oldCourseDir) {
@@ -473,28 +471,27 @@ sub renameCourse {
 	##### step 1: move course directory #####
 
 	# move top-level course directory
-	my $mv_cmd = "2>&1"." ".$oldCE->{externalPrograms}{mv}." ".shell_quote($oldCourseDir)." ".shell_quote($newCourseDir);
+	my $mv_cmd =
+		"2>&1" . " "
+		. $oldCE->{externalPrograms}{mv} . " "
+		. shell_quote($oldCourseDir) . " "
+		. shell_quote($newCourseDir);
 	debug("moving course dir: $mv_cmd");
 	my $mv_out = readpipe $mv_cmd;
 	if ($?) {
-		my $exit = $? >> 8;
+		my $exit   = $? >> 8;
 		my $signal = $? & 127;
-		my $core = $? & 128;
+		my $core   = $? & 128;
 		die "Failed to move course directory with command '$mv_cmd' (exit=$exit signal=$signal core=$core): $mv_out\n";
 	}
 
 	# get new course environment
-	my $newCE = $oldCE->new(
-		$oldCE->{webworkDirs}->{root},
-		$oldCE->{webworkURLs}->{root},
-		$oldCE->{pg}->{directories}->{root},
-		$newCourseID,
-	);
+	my $newCE = $oldCE->new({ courseName => $newCourseID });
 
 	# find the course dirs that still exist in their original locations
 	# (i.e. are not subdirs of $courseDir)
-	my %oldCourseDirs = %{ $oldCE->{courseDirs} };
-	my %newCourseDirs = %{ $newCE->{courseDirs} };
+	my %oldCourseDirs  = %{ $oldCE->{courseDirs} };
+	my %newCourseDirs  = %{ $newCE->{courseDirs} };
 	my @courseDirNames = sort { $oldCourseDirs{$a} cmp $oldCourseDirs{$b} } keys %oldCourseDirs;
 	foreach my $courseDirName (@courseDirNames) {
 		my $oldDir = File::Spec->canonpath($oldCourseDirs{$courseDirName});
@@ -506,14 +503,16 @@ sub renameCourse {
 
 			# is the source really a directory
 			unless (-d $oldDir) {
-				warn "$courseDirName: Can't move '$oldDir' to '$newDir', since the source is not a directory. You will have to move this directory manually.\n";
+				warn
+					"$courseDirName: Can't move '$oldDir' to '$newDir', since the source is not a directory. You will have to move this directory manually.\n";
 				next;
 			}
 
-			# does the destination already exist?
-			# (this should only happen on extra-coursedir directories, since we make sure the root dir doesn't exist above.)
+		# does the destination already exist?
+		# (this should only happen on extra-coursedir directories, since we make sure the root dir doesn't exist above.)
 			if (-e $newDir) {
-				warn "$courseDirName: Can't move '$oldDir' to '$newDir', since the target already exists. You will have to move this directory manually.\n";
+				warn
+					"$courseDirName: Can't move '$oldDir' to '$newDir', since the target already exists. You will have to move this directory manually.\n";
 				next;
 			}
 
@@ -522,7 +521,8 @@ sub renameCourse {
 			pop @oldDirElements;
 			my $oldDirParent = File::Spec->catdir(@oldDirElements);
 			unless (-w $oldDirParent) {
-				warn "$courseDirName: Can't move '$oldDir' to '$newDir', since the source parent directory is not writeable. You will have to move this directory manually.\n";
+				warn
+					"$courseDirName: Can't move '$oldDir' to '$newDir', since the source parent directory is not writeable. You will have to move this directory manually.\n";
 				next;
 			}
 
@@ -531,19 +531,22 @@ sub renameCourse {
 			pop @newDirElements;
 			my $newDirParent = File::Spec->catdir(@newDirElements);
 			unless (-w $newDirParent) {
-				warn "$courseDirName: Can't move '$oldDir' to '$newDir', since the destination parent directory is not writeable. You will have to move this directory manually.\n";
+				warn
+					"$courseDirName: Can't move '$oldDir' to '$newDir', since the destination parent directory is not writeable. You will have to move this directory manually.\n";
 				next;
 			}
 
 			# try to move the directory
 			debug("Going to move $oldDir to $newDir...\n");
-			my $mv_cmd = "2>&1"." ".$oldCE->{externalPrograms}{mv}." ".shell_quote($oldDir)." ".shell_quote($newDir);
+			my $mv_cmd =
+				"2>&1" . " " . $oldCE->{externalPrograms}{mv} . " " . shell_quote($oldDir) . " " . shell_quote($newDir);
 			my $mv_out = readpipe $mv_cmd;
 			if ($?) {
-				my $exit = $? >> 8;
+				my $exit   = $? >> 8;
 				my $signal = $? & 127;
-				my $core = $? & 128;
-				warn "Failed to move directory with command '$mv_cmd' (exit=$exit signal=$signal core=$core): $mv_out\n";
+				my $core   = $? & 128;
+				warn
+					"Failed to move directory with command '$mv_cmd' (exit=$exit signal=$signal core=$core): $mv_out\n";
 			}
 		} else {
 			debug("oldDir $oldDir was already moved.\n");
@@ -560,17 +563,19 @@ sub renameCourse {
 		#update title and institution
 		my $newDB = new WeBWorK::DB($newCE->{dbLayouts}{$dbLayoutName});
 		eval {
-			if (exists( $options{courseTitle}) and $options{courseTitle}) {
-				$newDB->setSettingValue('courseTitle',$options{courseTitle});
+			if (exists($options{courseTitle}) and $options{courseTitle}) {
+				$newDB->setSettingValue('courseTitle', $options{courseTitle});
 			}
-			if (exists( $options{courseInstitution}) and $options{courseInstitution}) {
-				$newDB->setSettingValue('courseInstitution',$options{courseInstitution});
+			if (exists($options{courseInstitution}) and $options{courseInstitution}) {
+				$newDB->setSettingValue('courseInstitution', $options{courseInstitution});
 			}
-		};  warn "Problems from resetting course title and institution = $@" if $@;
+		};
+		warn "Problems from resetting course title and institution = $@" if $@;
 	}
 }
 
 ################################################################################
+
 =item retitleCourse
 
 	Simply changes the title and institution of the course.
@@ -579,14 +584,11 @@ Options must contain:
 
  courseID => $courseID,
  ce => $ce,
- dbOptions => $dbOptions,
-
 
 Options may contain
  newCourseTitle => $courseTitle,
  newCourseInstitution => $courseInstitution,
 
-
 =cut
 
 sub retitleCourse {
@@ -595,27 +597,23 @@ sub retitleCourse {
 	#    $courseID ($oldCourseID)
 	#    $ce ($oldCE)
 	#    $dbLayoutName ($ce->{dbLayoutName})
-	#    %options ($dbOptions)
 	#    courseTitle
 	#    courseInstitution
 	my $courseID = $options{courseID};
 	my $ce       = $options{ce};
-	my %dbOptions = defined $options{dbOptions} ? %{ $options{dbOptions} } : ();
 
 	# get the database layout out of the options hash
 	my $dbLayoutName = $ce->{dbLayoutName};
-	my $db = new WeBWorK::DB($ce->{dbLayouts}{$dbLayoutName});
-		eval {
-			if (exists( $options{courseTitle}) and $options{courseTitle}) {
-				$db->setSettingValue('courseTitle',$options{courseTitle});
-			}
-			if (exists( $options{courseInstitution}) and $options{courseInstitution}) {
-				$db->setSettingValue('courseInstitution',$options{courseInstitution});
-			}
-		};  warn "Problems from resetting course title and institution = $@" if $@;
-
-
-
+	my $db           = new WeBWorK::DB($ce->{dbLayouts}{$dbLayoutName});
+	eval {
+		if (exists($options{courseTitle}) and $options{courseTitle}) {
+			$db->setSettingValue('courseTitle', $options{courseTitle});
+		}
+		if (exists($options{courseInstitution}) and $options{courseInstitution}) {
+			$db->setSettingValue('courseInstitution', $options{courseInstitution});
+		}
+	};
+	warn "Problems from resetting course title and institution = $@" if $@;
 
 }
 
@@ -625,7 +623,6 @@ Options must contain:
 
  courseID => $courseID,
  ce => $ce,
- dbOptions => $dbOptions,
 
 $ce is a WeBWorK::CourseEnvironment object that describes the course's
 environment. It is your responsability to pass a course environment object that
@@ -633,12 +630,6 @@ describes the course to be deleted. Do not pass the course environment object
 associated with the request, unless you are deleting the course you're currently
 using.
 
-$dbOptions is a reference to a hash containing information required to delete
-the database for the course. Current database layouts do not require additional
-information, so specify a reference to an empty hash. If $dbOptions is
-undefined, addCourse() assumes that the database has already been deleted, and
-skips that step in the course deletion process.
-
 Deletes the course named $courseID. The course directory is removed.
 
 Any errors encountered while deleting the course are returned.
@@ -649,35 +640,39 @@ sub deleteCourse {
 	my (%options) = @_;
 
 	my $courseID = $options{courseID};
-	my $ce = $options{ce};
-	my %dbOptions = defined $options{dbOptions} ? %{ $options{dbOptions} } : ();
+	my $ce       = $options{ce};
 
 	# make sure the user isn't brain damaged
 	die "the course environment supplied doesn't appear to describe the course $courseID. can't proceed."
 		unless $ce->{courseName} eq $courseID;
 
-	my %courseDirs = %{$ce->{courseDirs}};
+	my %courseDirs = %{ $ce->{courseDirs} };
 
 	##### step 0: make sure course directory is deleteable #####
 
 	# deal with root directory first -- if we won't be able to delete it, we have to give up.
 
-	exists $courseDirs{root} or croak "Can't delete the course '$courseID' because no root directory is specified in the '%courseDirs' hash.";
+	exists $courseDirs{root}
+		or croak
+		"Can't delete the course '$courseID' because no root directory is specified in the '%courseDirs' hash.";
 	my $root = $courseDirs{root};
 	if (-e $root) {
 		# is the parent directory writeable?
 		my @rootElements = File::Spec->splitdir($root);
 		pop @rootElements;
 		my $rootParent = File::Spec->catdir(@rootElements);
-		-w $rootParent or croak "Can't delete the course '$courseID' because the courses directory '$rootParent' is not writeable.";
+		-w $rootParent
+			or croak
+			"Can't delete the course '$courseID' because the courses directory '$rootParent' is not writeable.";
 	} else {
-		warn "Warning: the course root directory '$root' does not exist. Attempting to delete the course database and other course directories...\n";
+		warn
+			"Warning: the course root directory '$root' does not exist. Attempting to delete the course database and other course directories...\n";
 	}
 
 	##### step 1: delete course database (if necessary) #####
 
-	my $dbLayoutName = $ce->{dbLayoutName};
-	my $db = new WeBWorK::DB($ce->{dbLayouts}->{$dbLayoutName});
+	my $dbLayoutName     = $ce->{dbLayoutName};
+	my $db               = new WeBWorK::DB($ce->{dbLayouts}->{$dbLayoutName});
 	my $create_db_result = $db->delete_tables;
 	die "$courseID: course database deletion failed.\n" unless $create_db_result;
 
@@ -693,7 +688,8 @@ sub deleteCourse {
 
 			# is it really a directory
 			unless (-d $courseDir) {
-				warn "Can't delete $courseDirName directory '$courseDir', since is not a directory. If it is not wanted, you will have to delete it manually.\n";
+				warn
+					"Can't delete $courseDirName directory '$courseDir', since is not a directory. If it is not wanted, you will have to delete it manually.\n";
 				next;
 			}
 
@@ -702,7 +698,8 @@ sub deleteCourse {
 			pop @courseDirElements;
 			my $courseDirParent = File::Spec->catdir(@courseDirElements);
 			unless (-w $courseDirParent) {
-				warn "Can't delete $courseDirName directory '$courseDir', since its parent directory is not writeable. If it is not wanted, you will have to delete it manually.\n";
+				warn
+					"Can't delete $courseDirName directory '$courseDir', since its parent directory is not writeable. If it is not wanted, you will have to delete it manually.\n";
 				next;
 			}
 
@@ -724,9 +721,10 @@ sub deleteCourse {
  courseID  => $courseID,
  ce        => $ce,
 
-Creates a gzipped tar archive (.tar.gz) of the course $courseID in the WeBWorK
-courses directory. Before archiving, the course database is dumped into a
-subdirectory of the course's DATA directory.
+Creates a gzipped tar archive (.tar.gz) of the course $courseID and places it in the
+archives directory of the admin course or in the location given in the optional archive_path
+option.  Before archiving, the course database is dumped into a subdirectory of the course's
+DATA directory.
 
 Only files and directories stored directly in the course directory are archived.
 The contents of linked files is not archived although the symbolic links
@@ -744,8 +742,8 @@ If an error occurs, an exception is thrown.
 
 sub archiveCourse {
 	my (%options) = @_;
-	my $courseID = $options{courseID};
-	my $ce = $options{ce};
+	my $courseID  = $options{courseID};
+	my $ce        = $options{ce};
 
 	# make sure the user isn't brain damaged
 	croak "The course environment supplied doesn't appear to match the course $courseID. Can't proceed"
@@ -754,33 +752,35 @@ sub archiveCourse {
 	# grab some values we'll need
 	my $course_dir = $ce->{courseDirs}{root};
 
-	# tmp_archive_path is used as the target of the tar.gz operation
-	# After this is done the final tar.gz file is moved either to the course directory
-	# or the course/myCourse/templates   directory (when saving individual courses)
-	# this prevents us from tarring a directory to which we have just added a file
+	# tmp_archive_path is used as the target of the tar.gz operation.
+	# After this is done the final tar.gz file is moved either to the admin course archives directory
+	# course/admin/archives or the supplied archive_path option if it is present.
+	# This prevents us from tarring a directory to which we have just added a file
 	# see bug #2022 -- for error messages on some operating systems
-	my $uuidStub = create_uuid_as_string();
+	my $uuidStub         = create_uuid_as_string();
 	my $tmp_archive_path = $ce->{webworkDirs}{courses} . "/${uuidStub}_$courseID.tar.gz";
-	my $data_dir = $ce->{courseDirs}{DATA};
-	my $dump_dir = "$data_dir/mysqldump";
+	my $data_dir         = $ce->{courseDirs}{DATA};
+	my $dump_dir         = "$data_dir/mysqldump";
 	my $archive_path;
-	if ( PGUtil::not_null( $options{archive_path} ) ) {
+	if (defined $options{archive_path} && $options{archive_path} =~ /S/) {
 		$archive_path = $options{archive_path};
 	} else {
-		$archive_path = $ce->{webworkDirs}{courses} . "/$courseID.tar.gz";
+		$archive_path = "$ce->{webworkDirs}{courses}/admin/archives/$courseID.tar.gz";
+		surePathToFile($ce->{webworkDirs}{courses}, $archive_path);
 	}
 
-
 	# fail if the source course does not exist
 	unless (-e $course_dir) {
 		croak "$courseID: course not found";
 	}
 
-    # replace previous archived file if it exists.
+	my $message = '';
+
+	# replace previous archived file if it exists.
 	if (-e $archive_path) {
 		unlink($archive_path) if (-w $archive_path);
 		unless (-e $archive_path) {
-			print CGI::p({-style=>'color:red; font-weight:bold'}, "The archival version of '$courseID' has been replaced'.\n");
+			$message .= "The archival version of '$courseID' has been replaced'.";
 		} else {
 			croak "Unable to replace the archival version of '$courseID'";
 		}
@@ -792,7 +792,7 @@ sub archiveCourse {
 		mkdir $dump_dir or croak "Failed to create course database dump directory '$dump_dir': $!";
 	}
 
-	my $db = new WeBWorK::DB($ce->{dbLayout});
+	my $db             = new WeBWorK::DB($ce->{dbLayout});
 	my $dump_db_result = $db->dump_tables($dump_dir);
 	unless ($dump_db_result) {
 		_archiveCourse_remove_dump_dir($ce, $dump_dir);
@@ -804,43 +804,48 @@ sub archiveCourse {
 	# we want tar to run from the parent directory of the course directory
 	my $chdir_to = "$course_dir/..";
 
-	my $tar_cmd = "2>&1 " . $ce->{externalPrograms}{tar}
-		. " -C " . shell_quote($chdir_to)
-		. " -czf " . shell_quote($tmp_archive_path)
-		. " " . shell_quote($courseID);
+	my $tar_cmd = "2>&1 "
+		. $ce->{externalPrograms}{tar} . " -C "
+		. shell_quote($chdir_to)
+		. " -czf "
+		. shell_quote($tmp_archive_path) . " "
+		. shell_quote($courseID);
 	my $tar_out = readpipe $tar_cmd;
 	if ($?) {
-		my $exit = $? >> 8;
+		my $exit   = $? >> 8;
 		my $signal = $? & 127;
-		my $core = $? & 128;
+		my $core   = $? & 128;
 		_archiveCourse_remove_dump_dir($ce, $dump_dir);
-		croak "Failed to archive course directory '$course_dir' with command '$tar_cmd' (exit=$exit signal=$signal core=$core): $tar_out\n";
+		croak
+			"Failed to archive course directory '$course_dir' with command '$tar_cmd' (exit=$exit signal=$signal core=$core): $tar_out\n";
 	}
 
 	##### step 3: cleanup -- remove database dump files from course directory #####
 
 	unless (-e $archive_path) {
 		unless (move($tmp_archive_path, $archive_path)) {
-			unlink($tmp_archive_path);  #clean up
+			unlink($tmp_archive_path);    #clean up
 			croak "Failed to rename archived file to '$archive_path': $!";
 		}
 	} else {
-		unlink($tmp_archive_path);  #clean up
+		unlink($tmp_archive_path);        #clean up
 		croak "Failed to create archived file at '$archive_path'. File already exists.";
 	}
 	_archiveCourse_remove_dump_dir($ce, $dump_dir);
+
+	return $message;
 }
 
 sub _archiveCourse_remove_dump_dir {
 	my ($ce, $dump_dir) = @_;
-	my $rm_cmd = "2>&1 " . $ce->{externalPrograms}{rm}
-		. " -rf " . shell_quote($dump_dir);
+	my $rm_cmd = "2>&1 " . $ce->{externalPrograms}{rm} . " -rf " . shell_quote($dump_dir);
 	my $rm_out = readpipe $rm_cmd;
 	if ($?) {
-		my $exit = $? >> 8;
+		my $exit   = $? >> 8;
 		my $signal = $? & 127;
-		my $core = $? & 128;
-		carp "Failed to remove course database dump directory '$dump_dir' with command '$rm_cmd' (exit=$exit signal=$signal core=$core): $rm_out\n";
+		my $core   = $? & 128;
+		carp
+			"Failed to remove course database dump directory '$dump_dir' with command '$rm_cmd' (exit=$exit signal=$signal core=$core): $rm_out\n";
 	}
 }
 
@@ -876,12 +881,12 @@ If an error occurs, an exception is thrown.
 sub unarchiveCourse {
 	my (%options) = @_;
 
-	my $newCourseID = $options{newCourseID};
+	my $newCourseID  = $options{newCourseID};
 	my $currCourseID = $options{oldCourseID};
-	my $archivePath = $options{archivePath};
-	my $ce = $options{ce};
+	my $archivePath  = $options{archivePath};
+	my $ce           = $options{ce};
 
-	my $coursesDir  = $ce->{webworkDirs}{courses};
+	my $coursesDir = $ce->{webworkDirs}{courses};
 
 	# Double check that the new course does not exist
 	if (-e "$coursesDir/$newCourseID") {
@@ -890,8 +895,7 @@ sub unarchiveCourse {
 
 	# fail if the target courseID is too long
 	croak "New course ID cannot exceed " . $ce->{maxCourseIdLength} . " characters."
-		if ( length($newCourseID) > $ce->{maxCourseIdLength} );
-
+		if (length($newCourseID) > $ce->{maxCourseIdLength});
 
 	##### step 1: move a conflicting course away #####
 
@@ -900,29 +904,29 @@ sub unarchiveCourse {
 
 	##### step 2: crack open the tarball #####
 
-	my $tar_cmd = "2>&1 " . $ce->{externalPrograms}{tar}
-		. " -C " . shell_quote($coursesDir)
-		. " -xzf " . shell_quote($archivePath);
+	my $tar_cmd = "2>&1 "
+		. $ce->{externalPrograms}{tar} . " -C "
+		. shell_quote($coursesDir)
+		. " -xzf "
+		. shell_quote($archivePath);
 	my $tar_out = readpipe $tar_cmd;
 	if ($?) {
-		my $exit = $? >> 8;
+		my $exit   = $? >> 8;
 		my $signal = $? & 127;
-		my $core = $? & 128;
+		my $core   = $? & 128;
 		_unarchiveCourse_move_back($restoreCourseData);
-		die "Failed to unarchive course directory with command '$tar_cmd' (exit=$exit signal=$signal core=$core): $tar_out\n";
+		die
+			"Failed to unarchive course directory with command '$tar_cmd' (exit=$exit signal=$signal core=$core): $tar_out\n";
 	}
 
 	##### step 3: read the course environment for this course #####
 
-	my $ce2 = new WeBWorK::CourseEnvironment({
-		get_SeedCE($ce),
-		courseName => $currCourseID,
-	});
+	my $ce2 = WeBWorK::CourseEnvironment->new({ get_SeedCE($ce), courseName => $currCourseID });
 
 	# pull out some useful stuff
-	my $course_dir = $ce2->{courseDirs}{root};
-	my $data_dir = $ce2->{courseDirs}{DATA};
-	my $dump_dir = "$data_dir/mysqldump";
+	my $course_dir    = $ce2->{courseDirs}{root};
+	my $data_dir      = $ce2->{courseDirs}{DATA};
+	my $dump_dir      = "$data_dir/mysqldump";
 	my $old_dump_file = "$data_dir/${currCourseID}_mysql.database";
 
 	##### step 4: restore the database tables #####
@@ -936,18 +940,20 @@ sub unarchiveCourse {
 		my $dbLayoutName = $ce2->{dbLayoutName};
 		if (ref getHelperRef("unarchiveCourseHelper", $dbLayoutName)) {
 			eval {
-				$restore_db_result = unarchiveCourseHelper($currCourseID, $ce2, $dbLayoutName,
-					unarchiveDatabasePath=>$old_dump_file);
+				$restore_db_result =
+					unarchiveCourseHelper($currCourseID, $ce2, $dbLayoutName, unarchiveDatabasePath => $old_dump_file);
 			};
 			if ($@) {
 				warn "failed to unarchive course database from dump file '$old_dump_file: $@\n";
 			}
 		} else {
-			warn "course '$currCourseID' uses dbLayout '$dbLayoutName', which doesn't support restoring database tables. database tables will not be restored.\n";
+			warn
+				"course '$currCourseID' uses dbLayout '$dbLayoutName', which doesn't support restoring database tables. database tables will not be restored.\n";
 			$no_database = 1;
 		}
 	} else {
-		warn "course '$currCourseID' has no database dump in its data directory (checked for $dump_dir and $old_dump_file). database tables will not be restored.\n";
+		warn
+			"course '$currCourseID' has no database dump in its data directory (checked for $dump_dir and $old_dump_file). database tables will not be restored.\n";
 		$no_database = 1;
 	}
 
@@ -967,8 +973,10 @@ sub unarchiveCourse {
 	# Create the html_temp folder (since it isn't included in the
 	# tarball
 	my $tmpDir = $ce2->{courseDirs}->{html_temp};
-	if (! -e $tmpDir) {
-	  mkdir $tmpDir or warn "Failed to create html_temp directory '$tmpDir': $!. You will have to create this directory manually.\n";
+	if (!-e $tmpDir) {
+		mkdir $tmpDir
+			or warn
+			"Failed to create html_temp directory '$tmpDir': $!. You will have to create this directory manually.\n";
 	}
 
 	##### step 6: rename course #####
@@ -991,10 +999,7 @@ sub _unarchiveCourse_move_away {
 	my ($ce, $courseID) = @_;
 
 	# course environment for before the course is moved
-	my $ce2 = new WeBWorK::CourseEnvironment({
-		get_SeedCE($ce),
-		courseName => $courseID,
-	});
+	my $ce2 = WeBWorK::CourseEnvironment->new({ get_SeedCE($ce), courseName => $courseID });
 
 	# if course directory doesn't exist, we don't have to do anything
 	return unless -e $ce2->{courseDirs}{root};
@@ -1010,15 +1015,12 @@ sub _unarchiveCourse_move_away {
 	);
 
 	# course environment for after the course is moved
-	my $ce3 = new WeBWorK::CourseEnvironment({
-		get_SeedCE($ce),
-		courseName => $tmpCourseID,
-	});
+	my $ce3 = WeBWorK::CourseEnvironment->new({ get_SeedCE($ce), courseName => $tmpCourseID });
 
 	# data to pass to renameCourse when moving the course back to it's original name
 	my $restore_course_data = {
 		courseID    => $tmpCourseID,
-		ce          => $ce3, # course environment for moved course
+		ce          => $ce3,           # course environment for moved course
 		newCourseID => $courseID,
 	};
 
@@ -1055,12 +1057,12 @@ sub dbLayoutSQLSources {
 	my ($dbLayout) = @_;
 
 	my %dbLayout = %$dbLayout;
-	my @tables = keys %dbLayout;
+	my @tables   = keys %dbLayout;
 
 	my %sources;
 
 	foreach my $table (@tables) {
-		my %table = %{ $dbLayout{$table} };
+		my %table  = %{ $dbLayout{$table} };
 		my %params = %{ $table{params} };
 
 		if ($params{non_native}) {
@@ -1068,16 +1070,15 @@ sub dbLayoutSQLSources {
 			next;
 		}
 
-		my $source = $table{source};
+		my $source   = $table{source};
 		my $username = $params{username};
 		my $password = $params{password};
 
-		push @{$sources{$source}{tables}}, $table;
+		push @{ $sources{$source}{tables} }, $table;
 
 		if (defined $sources{$source}{username}) {
 			if ($sources{$source}{username} ne $username) {
-				warn "conflicting usernames for source '$source':",
-					" '$sources{$source}{username}', '$username'\n";
+				warn "conflicting usernames for source '$source':", " '$sources{$source}{username}', '$username'\n";
 			} else {
 				# it's all good
 			}
@@ -1087,8 +1088,7 @@ sub dbLayoutSQLSources {
 
 		if (defined $sources{$source}{password}) {
 			if ($sources{$source}{password} ne $password) {
-				warn "conflicting passwords for source '$source':",
-					" '$sources{$source}{password}', '$password'\n";
+				warn "conflicting passwords for source '$source':", " '$sources{$source}{password}', '$password'\n";
 			} else {
 				# it's all good
 			}
@@ -1153,77 +1153,73 @@ that are not associated with a particular course
 =cut
 
 sub initNonNativeTables {
-	my($ce, $dbLayoutName, %options) = @_;
-	my $str = '';
+	my ($ce, $dbLayoutName, %options) = @_;
+	my @messages;
 	# Create a database handler
 	my $db = new WeBWorK::DB($ce->{dbLayouts}->{$dbLayoutName});
 
-	 # lock database
+	# lock database
 
 	# Find the names of the non-native database tables
 	foreach my $table (sort keys %$db) {
-	    next unless $db->{$table}{params}{non_native}; # only look at non-native tables
-	    # hack: these two tables are virtual and don't need to be created
-	    # for the admin course or in the database in general
-	    # if they were created in earlier versions for the admin course
-	    # you can use mysql to drop the field version_id manually
-	    # this will get rid of a spurious error
-	    next if $table eq 'problem_version' or $table eq 'set_version';
-
-	    my $database_table_name = (exists $db->{$table}->{params}->{tableOverride})? $db->{$table}->{params}->{tableOverride}:$table;
-	    #warn "table is $table";
-	    #warn "checking $database_table_name";
-	    my $database_table_exists = ($db->{$table}->tableExists) ? 1:0;
-	    if  (!$database_table_exists ) { # exists means the table can be described;
-	    	my $schema_obj = $db->{$table};
-	    	if ($schema_obj->can("create_table")) {
-			    #warn "creating table $database_table_name  with object $schema_obj";
+		next unless $db->{$table}{params}{non_native}; # only look at non-native tables
+													   # hack: these two tables are virtual and don't need to be created
+													   # for the admin course or in the database in general
+													   # if they were created in earlier versions for the admin course
+													   # you can use mysql to drop the field version_id manually
+													   # this will get rid of a spurious error
+		next if $table eq 'problem_version' or $table eq 'set_version';
+
+		my $database_table_name =
+			(exists $db->{$table}->{params}->{tableOverride}) ? $db->{$table}->{params}->{tableOverride} : $table;
+		#warn "table is $table";
+		#warn "checking $database_table_name";
+		my $database_table_exists = ($db->{$table}->tableExists) ? 1 : 0;
+		if (!$database_table_exists) {    # exists means the table can be described;
+			my $schema_obj = $db->{$table};
+			if ($schema_obj->can("create_table")) {
+				#warn "creating table $database_table_name  with object $schema_obj";
 				$schema_obj->create_table;
-				$str .= "Table '$table' created as '$database_table_name' in database.".CGI::br();
+				push(@messages, "Table '$table' created as '$database_table_name' in database.");
 			} else {
 				# warn "Skipping creation of '$table' table: no create_table method\n";
 			}
-	    #if table exists then we need to check its fields, we only check if it is missing
-	    #fields in the schema.  Its not a huge issue if the database table has extra columns.
-	    } else {
-		my %fieldStatus;
-		my $fields_ok=1;
-		my @schema_field_names =  $db->{$table}->{record}->FIELDS;
-		my %schema_override_field_names=();
-		foreach my $field (sort @schema_field_names) {
-		    my $field_name  = $db->{$table}->{params}->{fieldOverride}->{$field} ||$field;
-		    $schema_override_field_names{$field_name}=$field;
-		    my $database_field_exists = $db->{$table}->tableFieldExists($field_name);
-		    #if the field doesn't exist then try to add it...
-		    if (!$database_field_exists) {
-			$fields_ok = 0;
-			$fieldStatus{$field} =[ONLY_IN_A];
-			warn "$field from $database_table_name (aka |$table|) is only in schema, not in database, so adding it ... ";
-			if ( $db->{$table}->can("add_column_field") ) {
-			    if ($db->{$table}->add_column_field($field_name)) {
-				warn "added column $field_name to table $database_table_name";
-			    } else {
-				warn "couldn't add column $field_name to table $database_table_name";
-			    }
-		    }
-
-		}
+			#if table exists then we need to check its fields, we only check if it is missing
+			#fields in the schema.  Its not a huge issue if the database table has extra columns.
+		} else {
+			my %fieldStatus;
+			my $fields_ok                   = 1;
+			my @schema_field_names          = $db->{$table}->{record}->FIELDS;
+			my %schema_override_field_names = ();
+			foreach my $field (sort @schema_field_names) {
+				my $field_name = $db->{$table}->{params}->{fieldOverride}->{$field} || $field;
+				$schema_override_field_names{$field_name} = $field;
+				my $database_field_exists = $db->{$table}->tableFieldExists($field_name);
+				#if the field doesn't exist then try to add it...
+				if (!$database_field_exists) {
+					$fields_ok = 0;
+					$fieldStatus{$field} = [ONLY_IN_A];
+					warn
+						"$field from $database_table_name (aka |$table|) is only in schema, not in database, so adding it ... ";
+					if ($db->{$table}->can("add_column_field")) {
+						if ($db->{$table}->add_column_field($field_name)) {
+							warn "added column $field_name to table $database_table_name";
+						} else {
+							warn "couldn't add column $field_name to table $database_table_name";
+						}
+					}
 
-		}
+				}
 
-	    }
+			}
 
+		}
 
 	}
 
-	# unlock database
-	$str;
-
-
+	return @messages;
 }
 
-
-
 ################################################################################
 # utilities
 ################################################################################
@@ -1277,9 +1273,9 @@ sub getHelperRef {
 			$result = 0;
 		}
 	} else {
-		my %syms = do { no strict 'refs'; %{$package."::"} };
+		my %syms = do { no strict 'refs'; %{ $package . "::" } };
 		if (exists $syms{$helperName}) {
-			$result = do { no strict 'refs'; \&{$package."::".$helperName} };
+			$result = do { no strict 'refs'; \&{ $package . "::" . $helperName } };
 		} else {
 			debug("No helper defined for operation '$helperName'.\n");
 			$result = 1;
@@ -1320,148 +1316,59 @@ sub writeCourseConf {
 
 	print $fh <<'EOF';
 #!perl
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright 2000-2016 The WeBWorK Project, http://openwebwork.sf.net/
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
 
-# This file is used to override the global WeBWorK course environment for
-# requests to this course. All package variables set in this file are added to
-# the course environment. If you wish to set a variable here but omit it from
-# the course environment,  use the "my" keyword. Commonly changed configuration
-# options are noted below.
+# This file is used to override the global WeBWorK course environment for this course.
 
 EOF
 
 	print $fh <<'EOF';
 # Database Layout (global value typically defined in defaults.config)
-#
 # Several database are defined in the file conf/database.conf and stored in the
 # hash %dbLayouts.
-#
 # The database layout is always set here, since one should be able to change the
 # default value in localOverrides.conf without disrupting existing courses.
-#
 # defaults.config values:
 EOF
 
 	print $fh "# \t", '$dbLayoutName = \'', protectQString($ce->{dbLayoutName}), '\';', "\n";
 	print $fh "# \t", '*dbLayout = $dbLayouts{$dbLayoutName};', "\n";
-	print $fh "\n";
 
 	if (defined $options{dbLayoutName}) {
 		print $fh '$dbLayoutName = \'', protectQString($options{dbLayoutName}), '\';', "\n";
 		print $fh '*dbLayout = $dbLayouts{$dbLayoutName};', "\n";
-		print $fh "\n";
-	} else {
-		print $fh "\n\n\n";
-	}
-
-	print $fh <<'EOF';
-# Allowed Mail Recipients (global value typically not defined)
-#
-# Defines addresses to which the PG system is allowed to send mail. This should
-# probably be set to the addresses of professors of this course. Sending mail
-# from the PG system (i.e. questionaires, essay questions) will fail if this is
-# not set.
-#
-# defaults.config values:
-EOF
-
-	if (defined $ce->{mail}->{allowedRecipients}) {
-		print $fh "# \t", '$mail{allowedRecipients} = [',
-				join(", ", map { "'" . protectQString($_) . "'" } @{ $ce->{mail}->{allowedRecipients} }), '];', "\n";
-	} else {
-		print $fh "# \t", '$mail{allowedRecipients} = [  ];', "\n";
 	}
 	print $fh "\n";
 
-	if (defined $options{allowedRecipients}) {
-		print $fh '$mail{allowedRecipients} = [',
-				join(", ", map { "'" . protectQString($_) . "'" } @{ $options{allowedRecipients} }), '];', "\n";
-		print $fh "\n";
-	} else {
-		print $fh "\n\n\n";
-	}
-
-	print $fh <<'EOF';
-# By default, feedback is sent to all users who have permission to
-# receive_feedback. If this list is non-empty, feedback is also sent to the
-# addresses specified here.
-#
-# * If you want to disable feedback altogether, leave this empty and set
-#   $permissionLevels{submit_feedback} = undef;
-#   This will cause the
-#   feedback button to go away as well.
-#
-# * If you want to send email ONLY to addresses in this list, set
-#   $permissionLevels{receive_feedback} = undef;
-#
-# It's often useful to set this in the course.conf to change the behavior of
-# feedback for a specific course.
-# defaults.config values:
-EOF
-
-	if (defined $ce->{mail}->{feedbackRecipients}) {
-		print $fh "# \t", '$mail{feedbackRecipients} = [',
-				join(", ", map { "'" . protectQString($_) . "'" } @{ $ce->{mail}->{feedbackRecipients} }), '];', "\n";
-	} else {
-		print $fh "# \t", '$mail{feedbackRecipients} = [  ];', "\n";
-	}
-	print $fh "\n";
-
-	if (defined $options{feedbackRecipients}) {
-		print $fh '$mail{feedbackRecipients} = [',
-				join(", ", map { "'" . protectQString($_) . "'" } @{ $options{feedbackRecipients} }), '];', "\n";
-		print $fh "\n";
-	} else {
-		print $fh "\n\n\n";
-	}
-
 	print $fh <<'EOF';
 # Users for whom to label problems with the PG file name (global value typically "professor")
-#
 # For users in this list, PG will display the source file name when rendering a problem.
-#
 # defaults.config values:
 EOF
 
 	if (defined $ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR}) {
 		print $fh "# \t", '$pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} = [',
-				join(", ", map { "'" . protectQString($_) . "'" } @{ $ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} }), '];', "\n";
+			join(", ",
+			map { "'" . protectQString($_) . "'" } @{ $ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} }),
+			'];', "\n";
 	} else {
-		print $fh "# \t", '$pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} = [  ];', "\n";
+		print $fh "# \t", '$pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} = [ ];', "\n";
 	}
-	print $fh "\n";
 
 	if (defined $options{PRINT_FILE_NAMES_FOR}) {
 		print $fh '$pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} = [',
-				join(", ", map { "'" . protectQString($_) . "'" } @{ $options{PRINT_FILE_NAMES_FOR} }), '];', "\n";
-		print $fh "\n";
-	} else {
-		print $fh "\n\n\n";
+			join(", ", map { "'" . protectQString($_) . "'" } @{ $options{PRINT_FILE_NAMES_FOR} }), '];', "\n";
 	}
 }
 
-
-sub get_SeedCE {     # helper subroutine to produce a stripped down seed Course Environment from an arbitrary course environment
+sub get_SeedCE
+{    # helper subroutine to produce a stripped down seed Course Environment from an arbitrary course environment
 	my $ce = shift;
-	warn "get_SeedCE needs current Course environment to create seed CE" unless ref($ce) ;
-	my %seedCE=();
-	my @conf_items = qw( webwork_dir webwork_url pg_dir courseName)   ;  # items to transfer. courseName is often overridden
+	warn "get_SeedCE needs current Course environment to create seed CE" unless ref($ce);
+	my %seedCE     = ();
+	my @conf_items = qw( webwork_dir webwork_url pg_dir courseName); # items to transfer. courseName is often overridden
 	foreach my $item (@conf_items) {
-			$seedCE{$item} = $ce->{$item};
+		$seedCE{$item} = $ce->{$item};
 	}
-    return( %seedCE);
+	return (%seedCE);
 }
 1;
diff --git a/lib/WeBWorK/Utils/CourseManagement/sql_moodle.pm b/lib/WeBWorK/Utils/CourseManagement/sql_moodle.pm
index 9a7217eec8..007a35a1e0 100644
--- a/lib/WeBWorK/Utils/CourseManagement/sql_moodle.pm
+++ b/lib/WeBWorK/Utils/CourseManagement/sql_moodle.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -27,7 +27,7 @@ use strict;
 use warnings;
 use WeBWorK::Utils::CourseManagement::sql_single;
 
-*archiveCourseHelper = \&WeBWorK::Utils::CourseManagement::sql_single::archiveCourseHelper;
+*archiveCourseHelper   = \&WeBWorK::Utils::CourseManagement::sql_single::archiveCourseHelper;
 *unarchiveCourseHelper = \&WeBWorK::Utils::CourseManagement::sql_single::unarchiveCourseHelper;
 
 1;
diff --git a/lib/WeBWorK/Utils/CourseManagement/sql_single.pm b/lib/WeBWorK/Utils/CourseManagement/sql_single.pm
index 5a19ba95de..f79b8071e0 100644
--- a/lib/WeBWorK/Utils/CourseManagement/sql_single.pm
+++ b/lib/WeBWorK/Utils/CourseManagement/sql_single.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -167,31 +167,34 @@ sub unarchiveCourseHelper {
 
 # TOTALLY STOLEN FROM NewSQL::Std.
 sub unarchiveCourseHelper {
-	my ($courseID, $ce,  $dbLayoutName, %options) = @_;
+	my ($courseID, $ce, $dbLayoutName, %options) = @_;
 	my $dumpfile_path = $options{unarchiveDatabasePath};
-	
+
 	my ($my_cnf, $database) = _get_db_info($ce);
 	my $mysql = $ce->{externalPrograms}{mysql};
-	
-	my $restore_cmd = "2>&1 " . shell_quote($mysql)
-		. " --defaults-extra-file=" . shell_quote($my_cnf->filename)
-		. " " . shell_quote($database)
-		. " < " . shell_quote($dumpfile_path);
+
+	my $restore_cmd = "2>&1 "
+		. shell_quote($mysql)
+		. " --defaults-extra-file="
+		. shell_quote($my_cnf->filename) . " "
+		. shell_quote($database) . " < "
+		. shell_quote($dumpfile_path);
 	my $restore_out = readpipe $restore_cmd;
 	if ($?) {
-		my $exit = $? >> 8;
+		my $exit   = $? >> 8;
 		my $signal = $? & 127;
-		my $core = $? & 128;
-		die "Failed to restore database for course '$courseID' with command '$restore_cmd' (exit=$exit signal=$signal core=$core): $restore_out\n";
+		my $core   = $? & 128;
+		die
+			"Failed to restore database for course '$courseID' with command '$restore_cmd' (exit=$exit signal=$signal core=$core): $restore_out\n";
 	}
-	
+
 	return 1;
 }
 
 # TOTALLY STOLEN FROM NewSQL::Std.
 sub _get_db_info {
-	my ($ce) = @_;
-	my $dsn = $ce->{database_dsn};
+	my ($ce)     = @_;
+	my $dsn      = $ce->{database_dsn};
 	my $username = $ce->{database_username};
 	my $password = $ce->{database_password};
 
@@ -214,17 +217,17 @@ sub _get_db_info {
 	} else {
 		die "Can't call dump_table or restore_table on a table with a non-MySQL/MariaDB source";
 	}
-	
+
 	die "no database specified in DSN!" unless defined $dsn{database};
 
 	my $mysqldump = $self->{params}{mysqldump_path};
-	# Conditionally add column-statistics=0 as MariaDB databases do not support it
-	# see: https://serverfault.com/questions/912162/mysqldump-throws-unknown-table-column-statistics-in-information-schema-1109
-	#      https://github.com/drush-ops/drush/issues/4410
+# Conditionally add column-statistics=0 as MariaDB databases do not support it
+# see: https://serverfault.com/questions/912162/mysqldump-throws-unknown-table-column-statistics-in-information-schema-1109
+#      https://github.com/drush-ops/drush/issues/4410
 
-	my $column_statistics_off = "";
+	my $column_statistics_off      = "";
 	my $test_for_column_statistics = `$mysqldump_command --help | grep 'column-statistics'`;
-	if ( $test_for_column_statistics ) {
+	if ($test_for_column_statistics) {
 		$column_statistics_off = "[mysqldump]\ncolumn-statistics=0\n";
 		#warn "Setting in the temporary mysql config file for table dump/restore:\n$column_statistics_off\n\n";
 	}
@@ -232,12 +235,12 @@ sub _get_db_info {
 	# doing this securely is kind of a hassle...
 	my $my_cnf = new File::Temp;
 	$my_cnf->unlink_on_destroy(1);
-	chmod 0600, $my_cnf or die "failed to chmod 0600 $my_cnf: $!"; # File::Temp objects stringify with ->filename
+	chmod 0600, $my_cnf or die "failed to chmod 0600 $my_cnf: $!";    # File::Temp objects stringify with ->filename
 	print $my_cnf "[client]\n";
-	print $my_cnf "user=$username\n" if defined $username and length($username) > 0;
-	print $my_cnf "password=$password\n" if defined $password and length($password) > 0;
-	print $my_cnf "host=$dsn{host}\n" if defined $dsn{host} and length($dsn{host}) > 0;
-	print $my_cnf "port=$dsn{port}\n" if defined $dsn{port} and length($dsn{port}) > 0;
+	print $my_cnf "user=$username\n"       if defined $username  and length($username) > 0;
+	print $my_cnf "password=$password\n"   if defined $password  and length($password) > 0;
+	print $my_cnf "host=$dsn{host}\n"      if defined $dsn{host} and length($dsn{host}) > 0;
+	print $my_cnf "port=$dsn{port}\n"      if defined $dsn{port} and length($dsn{port}) > 0;
 	print $my_cnf "$column_statistics_off" if $test_for_column_statistics;
 
 	return ($my_cnf, $dsn{database});
diff --git a/lib/WeBWorK/Utils/DBImportExport.pm b/lib/WeBWorK/Utils/DBImportExport.pm
index 6ac53a0e4f..b563ff7512 100644
--- a/lib/WeBWorK/Utils/DBImportExport.pm
+++ b/lib/WeBWorK/Utils/DBImportExport.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -26,7 +26,8 @@ use strict;
 use warnings;
 use Carp;
 use XML::Parser;
-use XML::Parser::EasyTree; $XML::Parser::EasyTree::Noempty = 1;
+use XML::Parser::EasyTree;
+$XML::Parser::EasyTree::Noempty = 1;
 use XML::Writer;
 use WeBWorK::Utils qw();
 
@@ -145,9 +146,9 @@ sub dbExport {
 	my (%options) = @_;
 
 	croak "options: 'xml' required.\n" unless exists $options{xml};
-	croak "options: 'db' required.\n" unless exists $options{db};
+	croak "options: 'db' required.\n"  unless exists $options{db};
 
-	my @tables = exists $options{tables} ? @{$options{tables}} : ();
+	my @tables = exists $options{tables} ? @{ $options{tables} } : ();
 	@tables = @TABLE_ORDER unless @tables;
 	my %tables;
 	@tables{@tables} = ();
@@ -182,10 +183,10 @@ sub dbExport {
 			foreach my $field ($Record->FIELDS) {
 				$writer->dataElement($field, $Record->$field);
 			}
-			$writer->endTag; # user
+			$writer->endTag;    # user
 		}
-		$writer->endTag; # users
-		delete $tables{user}; # finished with that table
+		$writer->endTag;         # users
+		delete $tables{user};    # finished with that table
 	}
 
 	if (exists $tables{password}) {
@@ -198,10 +199,10 @@ sub dbExport {
 			foreach my $field ($Record->FIELDS) {
 				$writer->dataElement($field, $Record->$field);
 			}
-			$writer->endTag; # password
+			$writer->endTag;    # password
 		}
-		$writer->endTag; # passwords
-		delete $tables{password}; # finished with that table
+		$writer->endTag;             # passwords
+		delete $tables{password};    # finished with that table
 	}
 
 	if (exists $tables{permission}) {
@@ -214,10 +215,10 @@ sub dbExport {
 			foreach my $field ($Record->FIELDS) {
 				$writer->dataElement($field, $Record->$field);
 			}
-			$writer->endTag; # permission
+			$writer->endTag;    # permission
 		}
-		$writer->endTag; # permissions
-		delete $tables{permission}; # finished with that table
+		$writer->endTag;               # permissions
+		delete $tables{permission};    # finished with that table
 	}
 
 	if (exists $tables{key}) {
@@ -230,10 +231,10 @@ sub dbExport {
 			foreach my $field ($Record->FIELDS) {
 				$writer->dataElement($field, $Record->$field);
 			}
-			$writer->endTag; # key
+			$writer->endTag;    # key
 		}
-		$writer->endTag; # keys
-		delete $tables{key}; # finished with that table
+		$writer->endTag;        # keys
+		delete $tables{key};    # finished with that table
 	}
 
 	if (exists $tables{set}) {
@@ -246,10 +247,10 @@ sub dbExport {
 			foreach my $field ($Record->FIELDS) {
 				$writer->dataElement($field, $Record->$field);
 			}
-			$writer->endTag; # set
+			$writer->endTag;    # set
 		}
-		$writer->endTag; # sets
-		delete $tables{set}; # finished with that table
+		$writer->endTag;        # sets
+		delete $tables{set};    # finished with that table
 	}
 
 	if (exists $tables{problem}) {
@@ -264,17 +265,17 @@ sub dbExport {
 			# BEGIN new
 			my @Problems = $db->getAllGlobalProblems($setID);
 			foreach my $Record (@Problems) {
-			# END new
+				# END new
 				next unless $Record;
 				$writer->startTag("problem");
 				foreach my $field ($Record->FIELDS) {
 					$writer->dataElement($field, $Record->$field);
 				}
-				$writer->endTag; # problem
+				$writer->endTag;    # problem
 			}
 		}
-		$writer->endTag; # problems
-		delete $tables{problem}; # finished with that table
+		$writer->endTag;            # problems
+		delete $tables{problem};    # finished with that table
 	}
 
 	if (exists $tables{set_user}) {
@@ -289,11 +290,11 @@ sub dbExport {
 				foreach my $field ($Record->FIELDS) {
 					$writer->dataElement($field, $Record->$field);
 				}
-				$writer->endTag; # set_user
+				$writer->endTag;    # set_user
 			}
 		}
-		$writer->endTag; # set_users
-		delete $tables{set_user}; # finished with that table
+		$writer->endTag;             # set_users
+		delete $tables{set_user};    # finished with that table
 	}
 
 	if (exists $tables{problem_user}) {
@@ -310,24 +311,24 @@ sub dbExport {
 				# BEGIN new
 				my @Problems = $db->getAllUserProblems($userID, $setID);
 				foreach my $Record (@Problems) {
-				# END new
+					# END new
 					next unless $Record;
 					$writer->startTag("problem_user");
 					foreach my $field ($Record->FIELDS) {
-                        # filter out the characters xml don't like
-                        my $t = $Record->$field;
-                        $t =~ s/([\x00-\x08\x0B-\x0C\x0E-\x1F])//g;
+						# filter out the characters xml don't like
+						my $t = $Record->$field;
+						$t =~ s/([\x00-\x08\x0B-\x0C\x0E-\x1F])//g;
 						$writer->dataElement($field, $t);
 					}
-					$writer->endTag; # problem_user
+					$writer->endTag;    # problem_user
 				}
 			}
 		}
-		$writer->endTag; # problem_users
-		delete $tables{problem_user}; # finished with that table
+		$writer->endTag;                 # problem_users
+		delete $tables{problem_user};    # finished with that table
 	}
 
-	$writer->endTag; # webwork
+	$writer->endTag;                     # webwork
 	$writer->end;
 
 	foreach my $table (keys %tables) {
@@ -379,11 +380,11 @@ sub dbImport {
 	my (%options) = @_;
 
 	croak "options: 'xml' required.\n" unless exists $options{xml};
-	croak "options: 'db' required.\n" unless exists $options{db};
+	croak "options: 'db' required.\n"  unless exists $options{db};
 
 	my $replace = exists $options{conflict} && $options{conflict} eq "replace";
 
-	my @tables = exists $options{tables} ? @{$options{tables}} : ();
+	my @tables = exists $options{tables} ? @{ $options{tables} } : ();
 	@tables = @TABLE_ORDER unless @tables;
 	my %tables;
 	@tables{@tables} = ();
@@ -391,7 +392,7 @@ sub dbImport {
 	my ($parser, $tree);
 	eval {
 		$parser = new XML::Parser(Style => "EasyTree");
-		$tree = $parser->parse($options{xml});
+		$tree   = $parser->parse($options{xml});
 	};
 	if ($@) {
 		return "Failed to parse XML document: $@";
@@ -408,16 +409,18 @@ sub dbImport {
 		return "Version mismatch: XML document has no version attribute.";
 	}
 	unless ($root_element->{attrib}->{version} eq $DB_VERSION) {
-		return "Version mismatch: XML document has version \""
-			. $root_element->{attrib}->{version} . "\" (expected $DB_VERSION).";
+		return
+			"Version mismatch: XML document has version \""
+			. $root_element->{attrib}->{version}
+			. "\" (expected $DB_VERSION).";
 	}
 
 	my @nonfatal_errors;
 
-	TABLE: foreach my $table (@TABLE_ORDER) {
-		next TABLE unless exists $tables{$table}; # skip unrequested tables
+TABLE: foreach my $table (@TABLE_ORDER) {
+		next TABLE unless exists $tables{$table};    # skip unrequested tables
 
-		my ($table_element) = findNodes($root_element->{content}, "e", $table."s");
+		my ($table_element) = findNodes($root_element->{content}, "e", $table . "s");
 		unless ($table_element) {
 			push @nonfatal_errors, "Format error: '${table}s' element not found.";
 			next TABLE;
@@ -437,7 +440,8 @@ sub dbImport {
 					if ($replace) {
 						eval { $options{db}->$put_sub($Record) };
 						if ($@) {
-							push @nonfatal_errors, "$table record with @{[$Record->idsToString]} exists, failed to replace: $@";
+							push @nonfatal_errors,
+								"$table record with @{[$Record->idsToString]} exists, failed to replace: $@";
 						}
 					} else {
 						push @nonfatal_errors, "$table record with @{[$Record->idsToString]} exists, skipping";
@@ -457,7 +461,8 @@ sub findNodes {
 	my @found;
 	foreach my $node (@$tree) {
 		if ((not defined $type or $node->{type} eq $type)
-				and (not defined $name or $node->{name} eq $name)) {
+			and (not defined $name or $node->{name} eq $name))
+		{
 			push @found, $node;
 		}
 	}
@@ -467,9 +472,9 @@ sub findNodes {
 sub element2record {
 	my ($element, $Record) = @_;
 	my %fields;
-	@fields{$Record->FIELDS} = ();
+	@fields{ $Record->FIELDS } = ();
 
-	foreach my $field_element (@{$element->{content}}) {
+	foreach my $field_element (@{ $element->{content} }) {
 		my $type = $field_element->{type};
 		my $name = $field_element->{name};
 		unless ($type eq "e") {
diff --git a/lib/WeBWorK/Utils/DBUpgrade.pm b/lib/WeBWorK/Utils/DBUpgrade.pm
index 1a65dcefb3..0f4441bef5 100644
--- a/lib/WeBWorK/Utils/DBUpgrade.pm
+++ b/lib/WeBWorK/Utils/DBUpgrade.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -34,17 +34,17 @@ our $self;
 my $i = -1;
 our @DB_VERSIONS;
 
-$DB_VERSIONS[++$i]{desc} = "is the initial version of database, identical to database structure in WeBWorK 2.2.x.";
+$DB_VERSIONS[ ++$i ]{desc} = "is the initial version of database, identical to database structure in WeBWorK 2.2.x.";
 
-$DB_VERSIONS[++$i]{desc} = "adds dbupgrade table to facilitate automatic database upgrades.";
-$DB_VERSIONS[  $i]{global_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} = "adds dbupgrade table to facilitate automatic database upgrades.";
+$DB_VERSIONS[$i]{global_code} = sub {
 	$self->dbh->do("CREATE TABLE `dbupgrade` (`name` VARCHAR(255) NOT NULL PRIMARY KEY, `value` TEXT)");
 	$self->dbh->do("INSERT INTO `dbupgrade` (`name`, `value`) VALUES (?, ?)", {}, "db_version", 1);
 	$self->register_sql_table("dbupgrade");
 };
 
-$DB_VERSIONS[++$i]{desc} = "adds problems_per_page field to set and set_user tables of each course.";
-$DB_VERSIONS[  $i]{course_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} = "adds problems_per_page field to set and set_user tables of each course.";
+$DB_VERSIONS[$i]{course_code} = sub {
 	my $course = shift;
 	$self->dbh->do("ALTER TABLE `${course}_set` ADD COLUMN `problems_per_page` INT")
 		if $self->sql_table_exists("${course}_set");
@@ -52,29 +52,29 @@ $DB_VERSIONS[  $i]{course_code} = sub {
 		if $self->sql_table_exists("${course}_set_user");
 };
 
-$DB_VERSIONS[++$i]{desc} = "adds depths table to keep track of dvipng depth information.";
-$DB_VERSIONS[  $i]{global_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} = "adds depths table to keep track of dvipng depth information.";
+$DB_VERSIONS[$i]{global_code} = sub {
 	$self->dbh->do("CREATE TABLE depths (md5 CHAR(33) NOT NULL, depth SMALLINT, PRIMARY KEY (md5))");
 	$self->register_sql_table("depths");
 };
 
-$DB_VERSIONS[++$i]{desc} = "changes type of key timestamp field to BIGINT";
-$DB_VERSIONS[  $i]{course_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} = "changes type of key timestamp field to BIGINT";
+$DB_VERSIONS[$i]{course_code} = sub {
 	my $course = shift;
 	return unless $self->sql_table_exists("${course}_key");
 	$self->dbh->do("ALTER TABLE `${course}_key` CHANGE COLUMN `timestamp` `timestamp` BIGINT");
 };
 
-$DB_VERSIONS[++$i]{desc} = "changes type of problem_user status field to FLOAT";
-$DB_VERSIONS[  $i]{course_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} = "changes type of problem_user status field to FLOAT";
+$DB_VERSIONS[$i]{course_code} = sub {
 	my $course = shift;
 	return unless $self->sql_table_exists("${course}_problem_user");
 	$self->dbh->do("UPDATE `${course}_problem_user` SET `status`=NULL WHERE `status`=''");
 	$self->dbh->do("ALTER TABLE `${course}_problem_user` CHANGE COLUMN `status` `status` FLOAT");
 };
 
-$DB_VERSIONS[++$i]{desc} = "changes types of alphanumeric keyfields to TINYBLOB NOT NULL";
-$DB_VERSIONS[  $i]{course_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} = "changes types of alphanumeric keyfields to TINYBLOB NOT NULL";
+$DB_VERSIONS[$i]{course_code} = sub {
 	my $course = shift;
 	$self->dbh->do("ALTER TABLE `${course}_user` CHANGE COLUMN `user_id` `user_id` TINYBLOB NOT NULL")
 		if $self->sql_table_exists("${course}_user");
@@ -98,48 +98,48 @@ $DB_VERSIONS[  $i]{course_code} = sub {
 		if $self->sql_table_exists("${course}_problem_user");
 };
 
-$DB_VERSIONS[++$i]{desc} = "fixes KEY length, adds UNIQUE KEY for user table";
-$DB_VERSIONS[  $i]{course_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} = "fixes KEY length, adds UNIQUE KEY for user table";
+$DB_VERSIONS[$i]{course_code} = sub {
 	my $course = shift;
 	return unless $self->sql_table_eixsts("${course}_user");
 	$self->dbh->do("ALTER TABLE `${course}_user` DROP KEY `user_id`");
 	$self->dbh->do("ALTER TABLE `${course}_user` ADD UNIQUE KEY (`user_id`(255))");
 };
 
-$DB_VERSIONS[++$i]{desc} = "fixes KEY length, adds UNIQUE KEY for password table";
-$DB_VERSIONS[  $i]{course_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} = "fixes KEY length, adds UNIQUE KEY for password table";
+$DB_VERSIONS[$i]{course_code} = sub {
 	my $course = shift;
 	return unless $self->sql_table_exists("${course}_password");
 	$self->dbh->do("ALTER TABLE `${course}_password` DROP KEY `user_id`");
 	$self->dbh->do("ALTER TABLE `${course}_password` ADD UNIQUE KEY (`user_id`(255))");
 };
 
-$DB_VERSIONS[++$i]{desc} = "fixes KEY length, adds UNIQUE KEY for permission table";
-$DB_VERSIONS[  $i]{course_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} = "fixes KEY length, adds UNIQUE KEY for permission table";
+$DB_VERSIONS[$i]{course_code} = sub {
 	my $course = shift;
 	return unless $self->sql_table_exists("${course}_permission");
 	$self->dbh->do("ALTER TABLE `${course}_permission` DROP KEY `user_id`");
 	$self->dbh->do("ALTER TABLE `${course}_permission` ADD UNIQUE KEY (`user_id`(255))");
 };
 
-$DB_VERSIONS[++$i]{desc} = "fixes KEY length, adds UNIQUE KEY for key table";
-$DB_VERSIONS[  $i]{course_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} = "fixes KEY length, adds UNIQUE KEY for key table";
+$DB_VERSIONS[$i]{course_code} = sub {
 	my $course = shift;
 	return unless $self->sql_table_exists("${course}_key");
 	$self->dbh->do("ALTER TABLE `${course}_key` DROP KEY `user_id`");
 	$self->dbh->do("ALTER TABLE `${course}_key` ADD UNIQUE KEY (`user_id`(255))");
 };
 
-$DB_VERSIONS[++$i]{desc} = "fixes KEY length, adds UNIQUE KEY for set table";
-$DB_VERSIONS[  $i]{course_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} = "fixes KEY length, adds UNIQUE KEY for set table";
+$DB_VERSIONS[$i]{course_code} = sub {
 	my $course = shift;
 	return unless $self->sql_table_exists("${course}_set");
 	$self->dbh->do("ALTER TABLE `${course}_set` DROP KEY `set_id`");
 	$self->dbh->do("ALTER TABLE `${course}_set` ADD UNIQUE KEY (`set_id`(255))");
 };
 
-$DB_VERSIONS[++$i]{desc} = "fixes KEY length, adds UNIQUE KEY for problem table";
-$DB_VERSIONS[  $i]{course_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} = "fixes KEY length, adds UNIQUE KEY for problem table";
+$DB_VERSIONS[$i]{course_code} = sub {
 	my $course = shift;
 	return unless $self->sql_table_exists("${course}_problem");
 	$self->dbh->do("ALTER TABLE `${course}_problem` DROP KEY `set_id`");
@@ -148,8 +148,8 @@ $DB_VERSIONS[  $i]{course_code} = sub {
 	$self->dbh->do("ALTER TABLE `${course}_problem` ADD KEY (`problem_id`)");
 };
 
-$DB_VERSIONS[++$i]{desc} = "fixes KEY length, adds UNIQUE KEY for set_user table";
-$DB_VERSIONS[  $i]{course_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} = "fixes KEY length, adds UNIQUE KEY for set_user table";
+$DB_VERSIONS[$i]{course_code} = sub {
 	my $course = shift;
 	return unless $self->sql_table_exists("${course}_set_user");
 	$self->dbh->do("ALTER TABLE `${course}_set_user` DROP KEY `user_id`");
@@ -158,135 +158,161 @@ $DB_VERSIONS[  $i]{course_code} = sub {
 	$self->dbh->do("ALTER TABLE `${course}_set_user` ADD KEY (`set_id`(255))");
 };
 
-$DB_VERSIONS[++$i]{desc} = "fixes KEY length, adds UNIQUE KEY for problem_user table";
-$DB_VERSIONS[  $i]{course_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} = "fixes KEY length, adds UNIQUE KEY for problem_user table";
+$DB_VERSIONS[$i]{course_code} = sub {
 	my $course = shift;
 	return unless $self->sql_table_exists("${course}_problem_user");
 	$self->dbh->do("ALTER TABLE `${course}_problem_user` DROP KEY `user_id`");
-	$self->dbh->do("ALTER TABLE `${course}_problem_user` ADD UNIQUE KEY (`user_id`(255), `set_id`(255), `problem_id`)");
+	$self->dbh->do(
+		"ALTER TABLE `${course}_problem_user` ADD UNIQUE KEY (`user_id`(255), `set_id`(255), `problem_id`)");
 	$self->dbh->do("ALTER TABLE `${course}_problem_user` DROP KEY `set_id`");
 	$self->dbh->do("ALTER TABLE `${course}_problem_user` ADD KEY (`set_id`(255), `problem_id`)");
 	$self->dbh->do("ALTER TABLE `${course}_problem_user` DROP KEY `problem_id`");
 	$self->dbh->do("ALTER TABLE `${course}_problem_user` ADD KEY (`problem_id`)");
 };
 
-$DB_VERSIONS[++$i]{desc} = "changes psvn index from PRIMARY KEY to UNIQUE KEY";
-$DB_VERSIONS[  $i]{course_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} = "changes psvn index from PRIMARY KEY to UNIQUE KEY";
+$DB_VERSIONS[$i]{course_code} = sub {
 	my $course = shift;
 	return unless $self->sql_table_exists("${course}_set_user");
 	$self->dbh->do("ALTER TABLE `${course}_set_user` ADD UNIQUE KEY (`psvn`)");
 	$self->dbh->do("ALTER TABLE `${course}_set_user` DROP PRIMARY KEY");
 };
 
-$DB_VERSIONS[++$i]{desc} = "adds hide_score and hide_work fields to set and set_user";
-$DB_VERSIONS[  $i]{course_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} = "adds hide_score and hide_work fields to set and set_user";
+$DB_VERSIONS[$i]{course_code} = sub {
 	my $course = shift;
-	if ( $self->sql_table_exists("${course}_set") ) {
+	if ($self->sql_table_exists("${course}_set")) {
 		$self->dbh->do("ALTER TABLE `${course}_set` ADD COLUMN `hide_score` ENUM('0','1')");
 		$self->dbh->do("ALTER TABLE `${course}_set` ADD COLUMN `hide_work` ENUM('0','1')");
 	}
-	if ( $self->sql_table_exists("${course}_set_user") ) {
+	if ($self->sql_table_exists("${course}_set_user")) {
 		$self->dbh->do("ALTER TABLE `${course}_set_user` ADD COLUMN `hide_score` ENUM('0','1')");
 		$self->dbh->do("ALTER TABLE `${course}_set_user` ADD COLUMN `hide_work` ENUM('0','1')");
 	}
 };
 
-$DB_VERSIONS[++$i]{desc} = "updates hide_score and hide_work in set and set_user tables to allow more (and more descriptive) possible values";
-$DB_VERSIONS[  $i]{course_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} =
+	"updates hide_score and hide_work in set and set_user tables to allow more (and more descriptive) possible values";
+$DB_VERSIONS[$i]{course_code} = sub {
 	my $course = shift;
-	if ( $self->sql_table_exists("${course}_set") ) {
+	if ($self->sql_table_exists("${course}_set")) {
 		$self->dbh->do("ALTER TABLE `${course}_set` MODIFY COLUMN `hide_score` ENUM('0','1','2')");
 		$self->dbh->do("ALTER TABLE `${course}_set` MODIFY COLUMN `hide_work` ENUM('0','1','2')");
 	}
-	if ( $self->sql_table_exists("${course}_set_user") ) {
+	if ($self->sql_table_exists("${course}_set_user")) {
 		$self->dbh->do("ALTER TABLE `${course}_set_user` MODIFY COLUMN `hide_score` ENUM('0','1','2')");
 		$self->dbh->do("ALTER TABLE `${course}_set_user` MODIFY COLUMN `hide_work` ENUM('0','1','2')");
 	}
 };
 
-$DB_VERSIONS[++$i]{desc} = "adds time_limit_cap field to set and set_user tables";
-$DB_VERSIONS[  $i]{course_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} = "adds time_limit_cap field to set and set_user tables";
+$DB_VERSIONS[$i]{course_code} = sub {
 	my $course = shift;
-	if ( $self->sql_table_exists("${course}_set") ) {
+	if ($self->sql_table_exists("${course}_set")) {
 		$self->dbh->do("ALTER TABLE `${course}_set` ADD COLUMN `time_limit_cap` ENUM('0','1')");
 	}
-	if ( $self->sql_table_exists("${course}_set_user") ) {
+	if ($self->sql_table_exists("${course}_set_user")) {
 		$self->dbh->do("ALTER TABLE `${course}_set_user` ADD COLUMN `time_limit_cap` ENUM('0','1')");
 	}
 };
 
-$DB_VERSIONS[++$i]{desc} = "updates hide_score and hide_work in set and set_user tables to have more descriptive values, set default values";
-$DB_VERSIONS[  $i]{course_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} =
+	"updates hide_score and hide_work in set and set_user tables to have more descriptive values, set default values";
+$DB_VERSIONS[$i]{course_code} = sub {
 	my $course = shift;
-	if ( $self->sql_table_exists("${course}_set") ) {
-		$self->dbh->do("ALTER TABLE `${course}_set` MODIFY COLUMN `hide_score` ENUM('N','Y','BeforeAnswerDate') DEFAULT 'N'");
-		$self->dbh->do("ALTER TABLE `${course}_set` MODIFY COLUMN `hide_work` ENUM('N','Y','BeforeAnswerDate') DEFAULT 'N'");
+	if ($self->sql_table_exists("${course}_set")) {
+		$self->dbh->do(
+			"ALTER TABLE `${course}_set` MODIFY COLUMN `hide_score` ENUM('N','Y','BeforeAnswerDate') DEFAULT 'N'");
+		$self->dbh->do(
+			"ALTER TABLE `${course}_set` MODIFY COLUMN `hide_work` ENUM('N','Y','BeforeAnswerDate') DEFAULT 'N'");
 	}
-	if ( $self->sql_table_exists("${course}_set_user") ) {
-		$self->dbh->do("ALTER TABLE `${course}_set_user` MODIFY COLUMN `hide_score` ENUM('N','Y','BeforeAnswerDate') DEFAULT 'N'");
-		$self->dbh->do("ALTER TABLE `${course}_set_user` MODIFY COLUMN `hide_work` ENUM('N','Y','BeforeAnswerDate') DEFAULT 'N'");
+	if ($self->sql_table_exists("${course}_set_user")) {
+		$self->dbh->do(
+			"ALTER TABLE `${course}_set_user` MODIFY COLUMN `hide_score` ENUM('N','Y','BeforeAnswerDate') DEFAULT 'N'");
+		$self->dbh->do(
+			"ALTER TABLE `${course}_set_user` MODIFY COLUMN `hide_work` ENUM('N','Y','BeforeAnswerDate') DEFAULT 'N'");
 	}
 };
 
-$DB_VERSIONS[++$i]{desc} = "adds locations, location_addresses, set_locations and set_locations_user tables to database, and add restrict_ip to set and set_user.";
-$DB_VERSIONS[  $i]{global_code} = sub {
-	$self->dbh->do("CREATE TABLE locations (location_id TINYBLOB NOT NULL, description TEXT, PRIMARY KEY (location_id(1000)))");
-	$self->dbh->do("CREATE TABLE location_addresses (location_id TINYBLOB NOT NULL, ip_mask TINYBLOB NOT NULL, PRIMARY KEY (location_id(500),ip_mask(500)))");
+$DB_VERSIONS[ ++$i ]{desc} =
+	"adds locations, location_addresses, set_locations and set_locations_user tables to database, and add restrict_ip to set and set_user.";
+$DB_VERSIONS[$i]{global_code} = sub {
+	$self->dbh->do(
+		"CREATE TABLE locations (location_id TINYBLOB NOT NULL, description TEXT, PRIMARY KEY (location_id(1000)))"
+	);
+	$self->dbh->do(
+		"CREATE TABLE location_addresses (location_id TINYBLOB NOT NULL, ip_mask TINYBLOB NOT NULL, PRIMARY KEY (location_id(500),ip_mask(500)))"
+	);
 };
-$DB_VERSIONS[  $i]{course_code} = sub {
+$DB_VERSIONS[$i]{course_code} = sub {
 	my $course = shift;
-	
-	$self->dbh->do("CREATE TABLE `${course}_set_locations` (set_id TINYBLOB NOT NULL, location_id TINYBLOB NOT NULL, PRIMARY KEY (set_id(500),location_id(500)))");
-	$self->dbh->do("CREATE TABLE `${course}_set_locations_user` (set_id TINYBLOB NOT NULL, user_id TINYBLOB NOT NULL, location_id TINYBLOB NOT NULL, PRIMARY KEY (set_id(300),user_id(300),location_id(300)))");
 
-	if ( $self->sql_table_exists("${course}_set") ) {
-		$self->dbh->do("ALTER TABLE `${course}_set` ADD COLUMN `restrict_ip` enum('No','RestrictTo','DenyFrom') DEFAULT 'No'");
+	$self->dbh->do(
+		"CREATE TABLE `${course}_set_locations` (set_id TINYBLOB NOT NULL, location_id TINYBLOB NOT NULL, PRIMARY KEY (set_id(500),location_id(500)))"
+	);
+	$self->dbh->do(
+		"CREATE TABLE `${course}_set_locations_user` (set_id TINYBLOB NOT NULL, user_id TINYBLOB NOT NULL, location_id TINYBLOB NOT NULL, PRIMARY KEY (set_id(300),user_id(300),location_id(300)))"
+	);
+
+	if ($self->sql_table_exists("${course}_set")) {
+		$self->dbh->do(
+			"ALTER TABLE `${course}_set` ADD COLUMN `restrict_ip` enum('No','RestrictTo','DenyFrom') DEFAULT 'No'");
 	}
-	if ( $self->sql_table_exists("${course}_set_user") ) {
-		$self->dbh->do("ALTER TABLE `${course}_set_user` ADD COLUMN `restrict_ip` enum('No','RestrictTo','DenyFrom')");
+	if ($self->sql_table_exists("${course}_set_user")) {
+		$self->dbh->do(
+			"ALTER TABLE `${course}_set_user` ADD COLUMN `restrict_ip` enum('No','RestrictTo','DenyFrom')");
 	}
 };
 
-$DB_VERSIONS[++$i]{desc} = "updates defaults for hide_work and hide_score in set_user tables.";
-$DB_VERSIONS[  $i]{course_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} = "updates defaults for hide_work and hide_score in set_user tables.";
+$DB_VERSIONS[$i]{course_code} = sub {
 	my $course = shift;
 
-	if ( $self->sql_table_exists("${course}_set_user") ) {
-		$self->dbh->do("ALTER TABLE `${course}_set_user` MODIFY COLUMN `hide_score` ENUM('N','Y','BeforeAnswerDate')");
-		$self->dbh->do("ALTER TABLE `${course}_set_user` MODIFY COLUMN `hide_work` ENUM('N','Y','BeforeAnswerDate')");
+	if ($self->sql_table_exists("${course}_set_user")) {
+		$self->dbh->do(
+			"ALTER TABLE `${course}_set_user` MODIFY COLUMN `hide_score` ENUM('N','Y','BeforeAnswerDate')");
+		$self->dbh->do(
+			"ALTER TABLE `${course}_set_user` MODIFY COLUMN `hide_work` ENUM('N','Y','BeforeAnswerDate')");
 	}
 };
 
-$DB_VERSIONS[++$i]{desc} = "adds relax_restrict_ip, hide_problem_score columns to set and set_user tables.";
-$DB_VERSIONS[  $i]{course_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} = "adds relax_restrict_ip, hide_problem_score columns to set and set_user tables.";
+$DB_VERSIONS[$i]{course_code} = sub {
 	my $course = shift;
 
-	if ( $self->sql_table_exists("${course}_set") ) {
-		$self->dbh->do("ALTER TABLE `${course}_set` ADD COLUMN `relax_restrict_ip` ENUM('No','AfterAnswerDate','AfterVersionAnswerDate') DEFAULT 'No'");
+	if ($self->sql_table_exists("${course}_set")) {
+		$self->dbh->do(
+			"ALTER TABLE `${course}_set` ADD COLUMN `relax_restrict_ip` ENUM('No','AfterAnswerDate','AfterVersionAnswerDate') DEFAULT 'No'"
+		);
 		$self->dbh->do("ALTER TABLE `${course}_set` ADD COLUMN `hide_score_by_problem` ENUM('N','Y') DEFAULT 'N'");
 	}
-	if ( $self->sql_table_exists("${course}_set_user") ) {
-		$self->dbh->do("ALTER TABLE `${course}_set_user` ADD COLUMN `relax_restrict_ip` ENUM('No','AfterAnswerDate','AfterVersionAnswerDate')");
+	if ($self->sql_table_exists("${course}_set_user")) {
+		$self->dbh->do(
+			"ALTER TABLE `${course}_set_user` ADD COLUMN `relax_restrict_ip` ENUM('No','AfterAnswerDate','AfterVersionAnswerDate')"
+		);
 		$self->dbh->do("ALTER TABLE `${course}_set_user` ADD COLUMN `hide_score_by_problem` ENUM('N','Y')");
 	}
 };
 
-$DB_VERSIONS[++$i]{desc} = "adds set and set_user fields to allow set-level proctor, updates permissions to allow finer-grained regulation of proctoring.";
-$DB_VERSIONS[  $i]{course_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} =
+	"adds set and set_user fields to allow set-level proctor, updates permissions to allow finer-grained regulation of proctoring.";
+$DB_VERSIONS[$i]{course_code} = sub {
 	my $course = shift;
-	if ( $self->sql_table_exists("${course}_permission") ) {
+	if ($self->sql_table_exists("${course}_permission")) {
 		$self->dbh->do("UPDATE `${course}_permission` SET `permission`=3 where `permission`=2");
 	}
-	if ( $self->sql_table_exists("${course}_set") ) {
-		$self->dbh->do("ALTER TABLE `${course}_set` ADD COLUMN `restricted_login_proctor` ENUM('No','Yes') DEFAULT 'No'");
+	if ($self->sql_table_exists("${course}_set")) {
+		$self->dbh->do(
+			"ALTER TABLE `${course}_set` ADD COLUMN `restricted_login_proctor` ENUM('No','Yes') DEFAULT 'No'");
 	}
-	if ( $self->sql_table_exists("${course}_set_user") ) {
+	if ($self->sql_table_exists("${course}_set_user")) {
 		$self->dbh->do("ALTER TABLE `${course}_set_user` ADD COLUMN `restricted_login_proctor` ENUM('No','Yes')");
 	}
 };
 
-$DB_VERSIONS[++$i]{desc} = "adds per-course setting table";
-$DB_VERSIONS[  $i]{course_code} = sub {
+$DB_VERSIONS[ ++$i ]{desc} = "adds per-course setting table";
+$DB_VERSIONS[$i]{course_code} = sub {
 	my $course = shift;
 	$self->dbh->do("CREATE TABLE `${course}_setting` (`name` VARCHAR(255) NOT NULL PRIMARY KEY, `value` TEXT)");
 	$self->register_sql_table("${course}_setting");
@@ -300,15 +326,15 @@ our $THIS_DB_VERSION = $i;
 
 sub new {
 	my $invocant = shift;
-	my $class = ref $invocant || $invocant;
-	my $self = bless {}, $class;
+	my $class    = ref $invocant || $invocant;
+	my $self     = bless {}, $class;
 	$self->init(@_);
 	return $self;
 }
 
 sub init {
 	my ($self, %options) = @_;
-	
+
 	$self->{dbh} = DBI->connect(
 		$options{ce}{database_dsn},
 		$options{ce}{database_username},
@@ -318,14 +344,14 @@ sub init {
 			RaiseError => 1,
 		},
 	);
-	$self->{verbose_sub} = $options{verbose_sub} || \&debug;
-	$self->{confirm_sub} = $options{confirm_sub} || \&ask_permission_stdio;
-	$self->{ce} = $options{ce};
+	$self->{verbose_sub}        = $options{verbose_sub} || \&debug;
+	$self->{confirm_sub}        = $options{confirm_sub} || \&ask_permission_stdio;
+	$self->{ce}                 = $options{ce};
 	$self->{course_db_versions} = {};
 }
 
-sub ce { return shift->{ce} }
-sub dbh { return shift->{dbh} }
+sub ce      { return shift->{ce} }
+sub dbh     { return shift->{dbh} }
 sub verbose { my $sub = shift->{verbose_sub}; return &$sub(@_) }
 sub confirm { my $sub = shift->{confirm_sub}; return &$sub(@_) }
 
@@ -339,7 +365,7 @@ sub DESTROY {
 
 sub lock_database {
 	my ($self) = @_;
-	
+
 	$self->verbose("Obtaining dbupgrade lock...\n");
 	my ($lock_status) = $self->dbh->selectrow_array("SELECT GET_LOCK('dbupgrade', 10)");
 	if (not defined $lock_status) {
@@ -354,7 +380,7 @@ sub lock_database {
 
 sub unlock_database {
 	my ($self) = @_;
-	
+
 	$self->verbose("Releasing dbupgrade lock...\n");
 	my ($lock_status) = $self->dbh->selectrow_array("SELECT RELEASE_LOCK('dbupgrade')");
 	if (not defined $lock_status) {
@@ -372,7 +398,8 @@ sub unlock_database {
 sub load_sql_table_list {
 	my ($self) = @_;
 	my $sql_tables_ref = $self->dbh->selectcol_arrayref("SHOW TABLES");
-	$self->{sql_tables} = {}; @{$self->{sql_tables}}{@$sql_tables_ref} = ();
+	$self->{sql_tables} = {};
+	@{ $self->{sql_tables} }{@$sql_tables_ref} = ();
 }
 
 sub register_sql_table {
@@ -400,7 +427,7 @@ sub get_db_version {
 	my $table = defined $course ? "${course}_setting" : "dbupgrade";
 	if ($self->sql_table_exists($table)) {
 		my $table_quoted = $self->dbh->quote_identifier($table);
-		my @record = $self->dbh->selectrow_array("SELECT `value` FROM $table_quoted WHERE `name`='db_version'");
+		my @record       = $self->dbh->selectrow_array("SELECT `value` FROM $table_quoted WHERE `name`='db_version'");
 		if (@record) {
 			return $record[0];
 		} else {
@@ -412,6 +439,7 @@ sub get_db_version {
 }
 
 my $vers_value_should_be = "The value should always be a positive integer.";
+
 sub check_db_version_format {
 	my ($self, $db_version) = @_;
 	if (not defined $db_version) {
@@ -421,7 +449,8 @@ sub check_db_version_format {
 	} elsif ($db_version < 0) {
 		return "'db_version' is set to the negative value '$db_version'. $vers_value_should_be";
 	} elsif ($db_version == 0) {
-		return "'db_version' is set to 0, which is reserved to indicate a pre-automatic-upgrade version. $vers_value_should_be";
+		return
+			"'db_version' is set to 0, which is reserved to indicate a pre-automatic-upgrade version. $vers_value_should_be";
 	} else {
 		# db_version is a positive integer! yay!
 		return;
@@ -430,7 +459,7 @@ sub check_db_version_format {
 
 sub set_db_version {
 	my ($self, $vers, $course) = @_;
-	my $table = defined $course ? "${course}_setting" : "dbupgrade";
+	my $table        = defined $course ? "${course}_setting" : "dbupgrade";
 	my $table_quoted = $self->dbh->quote_identifier($table);
 	$self->dbh->do("UPDATE $table_quoted SET `value`=? WHERE `name`='db_version'", {}, $vers);
 }
@@ -439,14 +468,14 @@ sub set_db_version {
 
 sub do_upgrade {
 	my ($self) = @_;
-	
+
 	$self->lock_database;
 	$self->load_sql_table_list;
-	
+
 	#### Get system's database version
-	
+
 	my $system_db_version = $self->get_db_version();
-	
+
 	if ($system_db_version == DB_TABLE_MISSING) {
 		warn "No 'upgrade' table exists: assuming system database version is 0.\n";
 		$system_db_version = 0;
@@ -455,16 +484,17 @@ sub do_upgrade {
 	} elsif (my $error = $self->check_db_version_format($system_db_version)) {
 		die "$error Can't continue.\n";
 	} elsif ($system_db_version > $THIS_DB_VERSION) {
-		die "This database's system db_version value is $system_db_version, but the current database version is only $THIS_DB_VERSION. This database was probably used with a newer version of WeBWorK. Can't continue.\n";
+		die
+			"This database's system db_version value is $system_db_version, but the current database version is only $THIS_DB_VERSION. This database was probably used with a newer version of WeBWorK. Can't continue.\n";
 	}
-	
+
 	$self->verbose("Initial system db_version is $system_db_version\n");
-	
+
 	#### Get database version for each course
 	# If $system_db_version < $FIRST_COURSE_DB_VERSION, most courses will not have
 	# a db_version, but some might. (Say, if they were imported from a newer
 	# version of WeBWorK.)
-	
+
 	my @ww_courses = listCourses($self->ce);
 	$self->{ww_courses} = \@ww_courses;
 
@@ -472,78 +502,82 @@ sub do_upgrade {
 
 	foreach my $course (@ww_courses) {
 		my $course_db_version = $self->get_db_version($course);
-		
+
 		if ($system_db_version < $FIRST_COURSE_DB_VERSION) {
-			
+
 			if ($course_db_version == DB_TABLE_MISSING) {
 				# this is to be expected -- we assume the course is at the current system version
-				$self->verbose("Course '$course' has no db_version of it's own, assuming system db_version $system_db_version.\n");
+				$self->verbose(
+					"Course '$course' has no db_version of it's own, assuming system db_version $system_db_version.\n");
 				$course_db_versions->{$course} = $system_db_version;
 			} else {
 				# there is a settings table -- the course is probably from a later version of WW
 				warn "The course '$course' already contains a '${course}_setting' table."
-					." Settings tables were introduced at db_version $FIRST_COURSE_DB_VERSION,"
-					." but the current system db_version is only $system_db_version."
-					." We'll assume that this course is from a later version of WeBWorK"
-					." and try to determine the course's version...\n";
+					. " Settings tables were introduced at db_version $FIRST_COURSE_DB_VERSION,"
+					. " but the current system db_version is only $system_db_version."
+					. " We'll assume that this course is from a later version of WeBWorK"
+					. " and try to determine the course's version...\n";
 				if ($course_db_version == DB_RECORD_MISSING) {
 					warn "There is no 'db_version' record in the course's settings table,"
-						." so we can't determine the version. This course will be excluded from upgrades."
-						." If you know the version of this course,"
-						." add a 'db_version' record with the appropriate value to the '${course}_setting' table.\n";
+						. " so we can't determine the version. This course will be excluded from upgrades."
+						. " If you know the version of this course,"
+						. " add a 'db_version' record with the appropriate value to the '${course}_setting' table.\n";
 				} elsif (my $error = check_db_version_format($course_db_version)) {
 					warn "$error\n";
 					warn "There is a 'db_version' record in the course's settings table,"
-						." but it has an invalid value , so we can't determine the version."
-						." This course will be excluded from upgrades."
-						." If you know the version of this course,"
-						." update 'db_version' record in the '${course}_setting' table with the appropriate value.\n";
+						. " but it has an invalid value , so we can't determine the version."
+						. " This course will be excluded from upgrades."
+						. " If you know the version of this course,"
+						. " update 'db_version' record in the '${course}_setting' table with the appropriate value.\n";
 				} elsif ($course_db_version < $FIRST_COURSE_DB_VERSION) {
-					warn "This course's version is $course_db_version, which is before per-course versioning was introduced."
-						." Therefore, a course at version $course_db_version should have neither a '${course}_setting' table"
-						." nor a 'db_version' record in that table. Regardless, we will assume the recorded version is correct.\n";
+					warn
+						"This course's version is $course_db_version, which is before per-course versioning was introduced."
+						. " Therefore, a course at version $course_db_version should have neither a '${course}_setting' table"
+						. " nor a 'db_version' record in that table. Regardless, we will assume the recorded version is correct.\n";
 					$course_db_versions->{$course} = $system_db_version;
 				} else {
 					warn "This course's version is $course_db_version, which makes sense.\n";
 					$course_db_versions->{$course} = $course_db_version;
 				}
 			}
-			
+
 		} else {
-			
+
 			if ($course_db_version == DB_TABLE_MISSING) {
 				warn "The course '$course' is missing a '${course}_setting' table, so we can't determine the version."
-					." This course will be ignored."
-					." If you know the version of this course, add a '${course}_setting' table"
-					." and add a 'db_version' record with the appropriate value to the table.\n";
+					. " This course will be ignored."
+					. " If you know the version of this course, add a '${course}_setting' table"
+					. " and add a 'db_version' record with the appropriate value to the table.\n";
 			} else {
 				# there is a settings table -- good
 				if ($course_db_version == DB_RECORD_MISSING) {
 					warn "The course '$course' is missing a 'db_version' record in its '${course}_setting' table,"
-						." so we can't determine the version. This course will be ignored."
-						." If you know the version of this course,"
-						." add a 'db_version' record with the appropriate value to the '${course}_setting' table.\n";
+						. " so we can't determine the version. This course will be ignored."
+						. " If you know the version of this course,"
+						. " add a 'db_version' record with the appropriate value to the '${course}_setting' table.\n";
 				} elsif (my $error = check_db_version_format($course_db_version)) {
 					warn "$error\n";
-					warn "The course '$course' has an invalid value in the 'db_version' record in its '${course}_setting' table,"
-						." so we can't determine the version. This course will be ignored."
-						." If you know the version of this course,"
-						." update the 'db_version' record in the '${course}_setting' table with the appropriate value.\n";
+					warn
+						"The course '$course' has an invalid value in the 'db_version' record in its '${course}_setting' table,"
+						. " so we can't determine the version. This course will be ignored."
+						. " If you know the version of this course,"
+						. " update the 'db_version' record in the '${course}_setting' table with the appropriate value.\n";
 				} elsif ($course_db_version < $FIRST_COURSE_DB_VERSION) {
-					warn "This course's version is $course_db_version, which is before per-course versioning was introduced."
-						." Therefore, a course at version $course_db_version should have neither a '${course}_setting' table"
-						." nor a 'db_version' record in that table. Regardless, we will assume the recorded version is correct.\n";
+					warn
+						"This course's version is $course_db_version, which is before per-course versioning was introduced."
+						. " Therefore, a course at version $course_db_version should have neither a '${course}_setting' table"
+						. " nor a 'db_version' record in that table. Regardless, we will assume the recorded version is correct.\n";
 					$course_db_versions->{$course} = $course_db_version;
 				} else {
 					$self->verbose("Course '$course' has valid db_version $course_db_version.\n");
 					$course_db_versions->{$course} = $system_db_version;
 				}
 			}
-			
+
 		}
 	}
 
-	$self->verbose(map { "$_ => $$course_db_versions{$_}\n" } keys %$course_db_versions);
+	$self->verbose(map {"$_ => $$course_db_versions{$_}\n"} keys %$course_db_versions);
 
 	#### Determine lowest version
 
@@ -558,37 +592,37 @@ sub do_upgrade {
 
 	# upgrade_to_version uses this
 	$self->{system_db_version} = $system_db_version;
-	
+
 	my $vers = $lowest_db_version;
 	while ($vers < $THIS_DB_VERSION) {
 		$vers++;
 		unless ($self->upgrade_to_version($vers)) {
-			print "\nUpgrading from version ".($vers-1)." to $vers failed.\n\n";
+			print "\nUpgrading from version " . ($vers - 1) . " to $vers failed.\n\n";
 			unless ($self->ask_permission("Ignore this error and go on to the next version?", 0)) {
 				exit 3;
 			}
 		}
 	}
-	
+
 	#### All done!
-	
+
 	print "\nDatabase is up-to-date at version $vers.\n";
 }
 
 ################################################################################
 
-use constant OK => 0;
+use constant OK      => 0;
 use constant SKIPPED => 1;
-use constant ERROR => 2;
+use constant ERROR   => 2;
 
 sub upgrade_to_version {
 	my ($self, $vers) = @_;
-	my %info = %{$DB_VERSIONS[$vers]};
-	
-	print "\nUpgrading database from version " . ($vers-1) . " to $vers...\n";
+	my %info = %{ $DB_VERSIONS[$vers] };
+
+	print "\nUpgrading database from version " . ($vers - 1) . " to $vers...\n";
 	my $desc = $info{desc} || "has no description.";
 	print "(Version $vers $desc)\n";
-	
+
 	if ($self->{system_db_version} < $vers and exists $info{global_code}) {
 		eval {
 			local $WeBWorK::Utils::DBUpgrade::self = $self;
@@ -601,9 +635,9 @@ sub upgrade_to_version {
 		}
 	}
 	$self->set_db_version($vers);
-	
+
 	my $do_upgrade = 1;
-	foreach my $course (@{$self->{ww_courses}}) {
+	foreach my $course (@{ $self->{ww_courses} }) {
 		if ($do_upgrade) {
 			my $result = $self->upgrade_course_to_version($course, $vers);
 			if ($result == ERROR) {
@@ -617,7 +651,11 @@ sub upgrade_to_version {
 					print "OK, going on to the next course...\n";
 				} else {
 					print "OK, we'll skip upgrading the rest of the courses to version $vers.\n";
-					if ($self->ask_permission("Update the stored db_version for the courses we're skipping, as if we had upgraded them?", 1)) {
+					if ($self->ask_permission(
+						"Update the stored db_version for the courses we're skipping, as if we had upgraded them?",
+						1
+					))
+					{
 						$do_upgrade = 0;
 					} else {
 						return 0;
@@ -632,15 +670,15 @@ sub upgrade_to_version {
 			$self->set_db_version($vers, $course);
 		}
 	}
-	
+
 	return 1;
 }
 
 sub upgrade_course_to_version {
 	my ($self, $course, $vers) = @_;
 	my $course_db_versions = $self->{course_db_versions};
-	my %info = %{$DB_VERSIONS[$vers]};
-	
+	my %info               = %{ $DB_VERSIONS[$vers] };
+
 	my $course_vers = $course_db_versions->{$course};
 	#$self->verbose("course=$course course_vers=$course_vers vers=$vers\n");
 	if (not defined $course_vers) {
@@ -652,11 +690,12 @@ sub upgrade_course_to_version {
 	} elsif ($course_vers > $vers) {
 		$self->verbose("Course '$course' version $course_vers > target version $vers -- skipping.\n");
 		return SKIPPED;
-	} elsif ($course_vers < $vers-1) {
-		warn "Course '$course' at version $course_vers, which is too old to upgrade to $vers. This should never happen. Not upgrading.\n";
+	} elsif ($course_vers < $vers - 1) {
+		warn
+			"Course '$course' at version $course_vers, which is too old to upgrade to $vers. This should never happen. Not upgrading.\n";
 		return SKIPPED;
 	}
-	
+
 	$self->verbose("Upgrading course '$course' to version $vers...\n");
 	eval {
 		local $WeBWorK::Utils::DBUpgrade::self = $self;
@@ -675,17 +714,17 @@ sub upgrade_course_to_version {
 
 sub ask_permission_stdio {
 	my ($prompt, $default) = @_;
-	
+
 	$default = 1 if not defined $default;
 	my $options = $default ? "[Y/n]" : "[y/N]";
-	
+
 	while (1) {
 		print "$prompt $options ";
 		my $resp = <STDIN>;
 		chomp $resp;
 		return $default if $resp eq "";
-		return 1 if lc $resp eq "y";
-		return 0 if lc $resp eq "n";
+		return 1        if lc $resp eq "y";
+		return 0        if lc $resp eq "n";
 		$prompt = 'Please enter "y" or "n".';
 	}
 }
diff --git a/lib/WeBWorK/Utils/DelayedMailer.pm b/lib/WeBWorK/Utils/DelayedMailer.pm
deleted file mode 100644
index 76f7c7938f..0000000000
--- a/lib/WeBWorK/Utils/DelayedMailer.pm
+++ /dev/null
@@ -1,164 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::Utils::DelayedMailer;
-
-use strict;
-use warnings;
-use Carp;
-use Net::SMTP;
-use WeBWorK::Utils qw/constituency_hash/;
-
-sub new {
-	my ($invocant, %options) = @_;
-	my $class = ref $invocant || $invocant;
-	my $self = bless {}, $class;
-	
-	# messages get queued here. format: hashref, safe arguments to MailMsg
-	$$self{msgs} = [];
-	
-	# SMTP settings
-	$$self{smtp_server} = $options{smtp_server};
-	$$self{smtp_sender} = $options{smtp_sender};
-	$$self{smtp_timeout} = $options{smtp_timeout};
-	
-	# extra headers
-	$$self{headers} = $options{headers};
-	
-	# recipients are checked against this list before sending
-	# these should be bare rfc822 addresses, not "Name <email@addr>"
-	$$self{allowed_recipients} = constituency_hash(@{$options{allowed_recipients}});
-	
-	# what to do if an illegal recipient is specified
-	# "croak" (default), "carp", or "ignore"
-	$$self{on_illegal_rcpt} = $options{on_illegal_rcpt};
-	
-	return $self;
-}
-
-# %msg format:
-#   $msg{to}      = either a single address or an arrayref containing multiple addresses
-#   $msg{subject} = string subject
-#   $msg{msg}     = string body of email (this is what Email::Sender::MailMsg uses)
-sub add_message {
-	my ($self, %msg) = @_;
-	
-	# make sure recipients are allowed
-	$msg{to} = $self->_check_recipients($msg{to});
-	
-	push @{$$self{msgs}}, \%msg;
-}
-
-sub _check_recipients {
-	my ($self, $rcpts) = @_;
-	my @rcpts = ref $rcpts eq "ARRAY" ? @$rcpts : $rcpts;
-	
-	my @legal;
-	foreach my $rcpt (@rcpts) {
-		my ($base) = $rcpt =~ /<([^<>]*)>\s*$/; # works for addresses generated by Record::User
-		$base ||= $rcpt; # if it doesn't match, it's a plain address
-		if (exists $$self{allowed_recipients}{$base}) {
-			push @legal, $rcpt;
-		} else {
-			if (not defined $$self{on_illegal_rcpt} or $$self{on_illegal_rcpt} eq "croak") {
-				die "can't address message to illegal recipient '$rcpt'";
-			} elsif ($$self{on_illegal_rcpt} eq "carp") {
-				warn "can't address message to illegal recipient '$rcpt'";
-			}
-		}
-	}
-	
-	return \@legal;
-}
-
-sub send_messages {
-	my ($self) = @_;
-	
-	return unless @{$$self{msgs}};
-	
-	my $smtp = new Net::SMTP($$self{smtp_server}, Timeout=>$$self{smtp_timeout})
-		or die "failed to create Net::SMTP object";
-	
-	my @results;
-	foreach my $msg (@{$$self{msgs}}) {
-		push @results, $self->_send_msg($smtp, $msg);
-	}
-	
-	return @results;
-}
-
-sub _send_msg {
-	my ($self, $smtp, $msg) = @_;
-	
-	my $sender = $$self{smtp_sender};
-	my @recipients = @{$$msg{to}};
-	my $message = $self->_format_msg($msg);
-	
-	# reduce "Foo <bar@bar>" to "bar@bar"
-	foreach my $rcpt (@recipients) {
-		my ($base) = $rcpt =~ /<([^<>]*)>\s*$/;
-		$rcpt = $base if defined $base;
-	}
-	
-	my %result;
-	
-	$smtp->mail($sender);
-	my @good_rcpts = $smtp->recipient(@recipients, {SkipBad=>1});
-	if (@good_rcpts) {
-		my $data_sent = $smtp->data($message);
-		unless ($data_sent) {
-			$result{error} = "(Error number not available with Net::SMTP)";
-			$result{error_msg} = "Unknown error sending message data to SMTP server";
-		}
-	} else {
-		$result{error} = "(Error number not available with Net::SMTP)";
-		$result{error_msg} = "No recipient addresses were accepted by SMTP server";
-	}
-	
-	# figure out which recipients were rejected
-	my %bad_rcpts;
-	@bad_rcpts{@recipients} = ();
-	delete @bad_rcpts{@good_rcpts};
-	my @bad_rcpts = keys %bad_rcpts;
-	if (@bad_rcpts) {
-		$result{skipped_recipients} =
-			{ map { $_ => "(Server message not available with Net::SMTP)" } @bad_rcpts };
-	}
-	
-	return \%result;
-}
-
-sub _format_msg {
-	my ($self, $msg) = @_;
-	
-	my $from = $$self{smtp_sender};
-	my $to = join(", ", @{$$msg{to}});
-	my $subject = $$msg{subject};
-	my $headers = $$self{headers};
-	my $body = $$msg{msg};
-	
-	my $formatted_msg = "From: $from\n"
-		. "To: $to\n"
-		. "Subject: $subject\n";
-	if (defined $headers) {
-		$formatted_msg .= $headers;
-		$formatted_msg .= "\n" unless $formatted_msg =~ /\n$/;
-	}
-	$formatted_msg .= "\n$body";
-	
-	return $formatted_msg;
-}
-
-1;
diff --git a/lib/WeBWorK/Utils/FilterRecords.pm b/lib/WeBWorK/Utils/FilterRecords.pm
index 503a3bf6c6..02beb4fd43 100644
--- a/lib/WeBWorK/Utils/FilterRecords.pm
+++ b/lib/WeBWorK/Utils/FilterRecords.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,186 +14,130 @@
 ################################################################################
 
 package WeBWorK::Utils::FilterRecords;
-use base qw(Exporter);
-
-use WeBWorK::Utils qw(sortByName);
+use parent qw(Exporter);
 
 =head1 NAME
 
-WeBWorK::Utils::FilterRecords - utilities for sorting database records.
+WeBWorK::Utils::FilterRecords - utilities for filtering database records.
 
 =head1 SYNOPSIS
 
- use WeBWorK::Utils::FilterRecords qw/getFiltersForClass/;
- 
- # get a list of sorts
- my ($FiltersRef, $FilterLabelsRef) = getFiltersForClass(@Users);
- my @filters      = @$filtersRef;      # filter names
- my %FilterLabels = %$FilterLabelsRef; # suitable for CGI's "-labels" parameter
-
- use WeBWorK::Utils::FilterRecords qw/FilterRecords/;
- 
- # start with a list of records
- my @Users = $db->getUsers($db->listUsers);
- 
- # sort the records using a preset
- @FilteredUsers = FilterRecords({preset=>"none"}, @Users);
- 
- # or provide a custom sort
- @FilteredUsers = FilterRecords({fields=>[qw/section /]}, @Users);
+    use WeBWorK::Utils::FilterRecords qw/getFiltersForClass/;
+
+    # Get a list of filters
+    my $filters = getFiltersForClass(@users);
+
+    use WeBWorK::Utils::FilterRecords qw/filterRecords/;
+
+    # Start with a list of records
+    my @users = $db->getUsers($db->listUsers);
+
+    # Filter the records using a list of provided filters.
+    @filteredUsers = filterRecords([ 'section:1', 'recitation:2' ], @nsers);
+
+	# Get all records (This isn't useful and just returns the passed in
+	# array of records.  So don't actually do this.)
+    @filteredUsers = filterRecords(undef, @users);
 
 =head1 DESCRIPTION
 
-This module provides record filtering functions, and a collection of preset filters
-for the standard WeBWorK record classes. Filters are specified by a list
-of field names. Records that match the current user in the specified field will be 
-allowed through
+This module provides functions for filtering records from the database.
 
 =cut
 
 use strict;
 use warnings;
+
 use Carp;
-our @EXPORT    = ();
+
+use WeBWorK::Utils qw(sortByName);
+
 our @EXPORT_OK = qw(
 	getFiltersForClass
 	filterRecords
 );
 
-#use constant PRESET_FILTERS => {
-#	"WeBWorK::DB::Record::User" => {
-#		"all" => {
-#			name => "List all available students",
-#			fields => [ qw// ],
-#		},
-#	},
-#};
-
-
 =head1 FUNCTIONS
 
 =over
 
 =item getFiltersForClass($class)
 
-Given the name of a record class, returns the preset filters available for that
-class.
-
-The return value consists of a two-element list. The first element is a
-reference to a list of filter names. The second element is a reference to a hash
-mapping filter names to string descriptions.
+Given a list of database records, returns the filters available for those
+records.  For all database records from the WeBWorK::DB::Record::User class
+the filters are by section or recitation or no filter at all.  For all other
+classes the only filter is no filter at all.
 
-Together, these two lists are suitable for passing to the C<-values> and
-C<-labels> parameters of several CGI module methods, i.e. popup_menu(),
-scrolling_list(), checkbox_group(), and radio_group().
+The return value is a reference to a list of two element lists. The first
+element in each list is a a string description of the filter and the second
+element is the filter name.  The return value is suitable for passing as the
+second value argument to the Mojolicious select_field tag helper method.
 
 =cut
 
 sub getFiltersForClass {
-	my (@Records) = @_;
-
-	my (%sections, %recitations);
-	my (@names,%labels);
-	push @names, "all";
-	$labels{all} = "Display all possible records";
-	
-	if (ref $Records[0] eq "WeBWorK::DB::Record::User"){
-		foreach my $user (@Records){
-			$sections{$user->section}++;
-			$recitations{$user->recitation}++;
+	my (@records) = @_;
+
+	my @filters;
+	push @filters, [ 'Display all possible records' => 'all', selected => undef ];
+
+	if (ref $records[0] eq 'WeBWorK::DB::Record::User') {
+		my (%sections, %recitations);
+
+		for my $user (@records) {
+			++$sections{ $user->section };
+			++$recitations{ $user->recitation };
 		}
-	
-		if (scalar(keys %sections) > 1) {
-		  foreach my $sec (sortByName(undef, keys %sections)){
-			push @names, "section:$sec";
-			if ($sec ne ""){
-				$labels{"section:$sec"} = "Display section $sec";
-			} else {
-				$labels{"section:$sec"} = "Display section <blank>";
+
+		if (keys %sections > 1) {
+			for my $sec (sortByName(undef, keys %sections)) {
+				push @filters, [ ($sec ne '' ? "Display section $sec" : 'Display section <blank>') => "section:$sec" ];
 			}
-		  }
 		}
 
-		if (scalar(keys %recitations) > 1) {
-		  foreach my $rec (sortByName(undef, keys %recitations)){
-			push @names, "recitation:$rec";
-			if ($rec ne ""){
-				$labels{"recitation:$rec"} = "Display recitation $rec";
-			} else {
-			        $labels{"recitation:$rec"} = "Display recitation <blank>";
+		if (keys %recitations > 1) {
+			for my $rec (sortByName(undef, keys %recitations)) {
+				push @filters,
+					[ ($rec ne '' ? "Display recitation $rec" : 'Display recitation <blank>') => "recitation:$rec" ];
 			}
-		  }
 		}
 	}
-	return ( \@names, \%labels );
+	return \@filters;
 }
 
-=item sortRecords(\%options, @Records)
+=item filterRecords($filters, @records)
 
-Given a sort specification (or the name of a preset format) and a list of
-records, returns a list of the same records in order according to the sort.
+Given a list of filters and a list of records, returns a list of the records
+after the selected filters are applied.
 
-%options can consist of either:
+C<$filters> should be a reference to an array of filters or be undefined.
 
- preset => the name of a preset format listed by getFormatsForClass()
-
-or:
-
- fields => a reference to a list of fields in the records' class
-
-If C<preset> is given, and its value does not match any known preset but I<is>
-the name of a field in the record class, the records will be sorted by that
-field.
-
-If C<fields> is given, the records are sorted according to the specified fields.
-If multiple fields are specified, the second field is is consulted if two
-records are found to have identical first fields, and so on.
+=back
 
 =cut
 
-# DBFIXME filtering should happen in the database (WHERE clauses)
 sub filterRecords {
-	my ($options, @Records) = @_;
-	
-	# nothing to do
-	return () unless @Records;
-	
-	# get class info (we assume that the records are all of the same type)
-	
-	my %options = %$options;
-	
-	my @filtersToUse = @{$options{filter}};
-
-	if (grep {$_ eq "all"} @filtersToUse) {return @Records;}
-	
-	my @GoodRecords = ();
-	foreach my $record (@Records){
-	foreach my $fil (@filtersToUse){
-		my ($name, $value) = split(/:/, $fil);
-		#warn "filter = $fil";
-		#warn "name = $name";
-		#warn "value = $value";
-		#warn "section = $record->section";
-#		my @data = split(/::/, $record);
-		if ($record->$name eq $value) {push @GoodRecords, $record}
-	}
-	}
-	return @GoodRecords;
-}
+	my ($filters, @records) = @_;
 
-=back
+	return unless @records;
 
-=head1 BUGS
+	my @filtersToUse = @{ $filters // ['all'] };
 
-No provision for case-insensitive, descending, or numeric sorting.
-
-No provision for programmatic sorts. While a one-time programmatic sort can be
-done easily without using this module, programmatic preset sorts would be
-useful, i.e. for intelligent sorting of set IDs.
-
-The fields being compared cannot contain nulls, because of the way packed keys
-are being generated.
+	if (grep { $_ eq 'all' } @filtersToUse) {
+		return @records;
+	}
 
-=cut
+	my @filteredRecords;
+	for my $record (@records) {
+		for my $filter (@filtersToUse) {
+			my ($name, $value) = split(/:/, $filter);
+			if ($record->$name eq $value) {
+				push @filteredRecords, $record;
+				last;    # Only add a record once.
+			}
+		}
+	}
+	return @filteredRecords;
+}
 
 1;
diff --git a/lib/WeBWorK/Utils/FormatRecords.pm b/lib/WeBWorK/Utils/FormatRecords.pm
index c616d5c19e..d2371342a8 100644
--- a/lib/WeBWorK/Utils/FormatRecords.pm
+++ b/lib/WeBWorK/Utils/FormatRecords.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::Utils::FormatRecords;
-use base qw(Exporter);
+use parent qw(Exporter);
 
 =head1 NAME
 
@@ -23,29 +23,21 @@ strings.
 
 =head1 SYNOPSIS
 
- use WeBWorK::Utils::FormatRecords qw/getFormatsForClass/;
+    use WeBWorK::Utils::FormatRecords qw/getFormatsForClass/;
 
- # get a list of formats
- my ($formatsRef, $formatLabelsRef) = getFormatsForClass(ref $Users[0]);
- my @formats      = @$formatsRef;      # format names
- my %formatLabels = %$formatLabelsRef; # suitable for CGI's "-labels" parameter
+	# Get a list of label => format pairs.  The $default_format will be marked
+	# as the format that will be selected by default if provided.  Otherwise the
+	# first format will be marked as selected by default.
+    my $formats = getFormatsForClass(ref $Users[0], $default_formats);
 
- use WeBWorK::Utils::FormatRecords qw/formatRecords/;
+    use WeBWorK::Utils::FormatRecords qw/formatRecords/;
 
- # start with a hash mapping identifiers to records
- my %Records = map { $_->user_id => $_ } $db->getUsers($db->listUsers);
+    # Start with an array of database records
+    my @records = $db->getUsers($db->listUsers);
 
- # format the records using a preset
- my %recordLabels = formatRecords({preset=>"lnfn_uid"}, %Records);
-
- # or provide a custom format
- my %options = {
- 	field_order   => [ qw/user_id section recitation/ ],
- 	format_string => "%s %s/%s", # suitable for sprintf
- };
- my %recordLabels = formatRecords(\%options, %Records);
-
- # %recordLabels is suitable for CGI's "-labels" parameter
+	# Get a list of label => id pairs.  The labels are formatted according to
+	# the provided $preset_format.
+    my $formattedRecords = formatRecords('lnfn_uid', @records);
 
 =head1 DESCRIPTION
 
@@ -53,210 +45,192 @@ This module provides record formatting functions, and a collection of preset
 formats for the standard WeBWorK record classes. Formats are specified by a list
 of field names and an sprintf format string.
 
+The return values of these methods are suitable for passing as the second value
+argument to the Mojolicious select_field tag helper method.
+
 =cut
 
 use strict;
 use warnings;
+
 use Carp;
+
 use WeBWorK::Utils qw/format_set_name_display/;
 
-our @EXPORT    = ();
 our @EXPORT_OK = qw(
 	getFormatsForClass
 	formatRecords
 );
 
 use constant PRESET_FORMATS => {
-	"WeBWorK::DB::Record::User" => {
-		"uid_lnfn" => {
-			name => "user_id - last_name, first_name",
-			field_order => [ qw/user_id last_name first_name/ ],
-			format_string => "%s - %s, %s",
-		},
-		"lnfn_uid" => {
-			name => "last_name, first_name (user_id)",
-			field_order => [ qw/last_name first_name user_id/ ],
-			format_string => "%s, %s (%s)",
-		},
-		"lnfn_section" => {
-			name => "last_name, first_name (section)",
-			field_order => [ qw/last_name first_name section/ ],
-			format_string => "%s, %s (%s)",
-		},
-		"lnfn_recitation" => {
-			name => "last_name, first_name (recitation)",
-			field_order => [ qw/last_name first_name recitation/ ],
-			format_string => "%s, %s (%s)",
-		},
-		"lnfn_secrec" => {
-			name => "last_name, first_name (section/recitation)",
-			field_order => [ qw/last_name first_name section recitation/ ],
-			format_string => "%s, %s (%s/%s)",
-		},
-		"lnfn_email" => {
-			name => "last_name, first_name (email_address)",
-			field_order => [ qw/last_name first_name email_address/ ],
-			format_string => "%s, %s (%s)",
-		},
-	},
-	"WeBWorK::DB::Record::Set" => {
-		"sid" => {
-			name            => "set_id",
-			field_order     => [qw/set_id/],
-			format_function => \&format_set_name_display
-		},
-	},
-	"WeBWorK::DB::Record::SetVersion" => {
-		"sid" => {
-			name        => "set_id",
-			field_order => [qw/set_id/],
-			format_function => \&format_set_name_display
-		},
-	},
+	'WeBWorK::DB::Record::User' => [
+		[
+			'uid_lnfn' => {
+				name          => 'user_id - last_name, first_name',
+				field_order   => [qw/user_id last_name first_name/],
+				format_string => '%s - %s, %s',
+			}
+		],
+		[
+			'lnfn_uid' => {
+				name          => 'last_name, first_name (user_id)',
+				field_order   => [qw/last_name first_name user_id/],
+				format_string => '%s, %s (%s)',
+			}
+		],
+		[
+			'lnfn_section' => {
+				name          => 'last_name, first_name (section)',
+				field_order   => [qw/last_name first_name section/],
+				format_string => '%s, %s (%s)',
+			}
+		],
+		[
+			'lnfn_recitation' => {
+				name          => 'last_name, first_name (recitation)',
+				field_order   => [qw/last_name first_name recitation/],
+				format_string => '%s, %s (%s)',
+			}
+		],
+		[
+			'lnfn_secrec' => {
+				name          => 'last_name, first_name (section/recitation)',
+				field_order   => [qw/last_name first_name section recitation/],
+				format_string => '%s, %s (%s/%s)',
+			}
+		],
+		[
+			'lnfn_email' => {
+				name          => 'last_name, first_name (email_address)',
+				field_order   => [qw/last_name first_name email_address/],
+				format_string => '%s, %s (%s)',
+			}
+		],
+	],
+	'WeBWorK::DB::Record::Set' => [
+		[
+			'sid' => {
+				name            => 'set_id',
+				field_order     => [qw/set_id/],
+				format_function => \&format_set_name_display
+			}
+		],
+	],
 };
 
 =head1 FUNCTIONS
 
 =over
 
-=item getFormatsForClass($class)
+=item getFormatsForClass($class, $default_format)
 
 Given the name of a record class, returns the preset formats available for that
 class.
 
-The return value consists of a two-element list. The first element is a
-reference to a list of format names. The second element is a reference to a hash
-mapping format names to string descriptions.
+The return value is a reference to a list of two element lists. The first
+element in each list is a a string description of a format name and the second
+element is the format name.  The return value is suitable for passing as the
+second value argument to the Mojolicious select_field tag helper method.
 
-Together, these two lists are suitable for passing to the C<-values> and
-C<-labels> parameters of several CGI module methods, i.e. popup_menu(),
-scrolling_list(), checkbox_group(), and radio_group().
+If the C<$default_format> is provided then that format will be marked as the
+default selected format.  Otherwise the first format will be marked as the
+default selected format.
 
 =cut
 
 sub getFormatsForClass {
-	my ($class) = @_;
+	my ($class, $default_format) = @_;
 
-	my %class_presets = exists PRESET_FORMATS->{$class} ? %{ PRESET_FORMATS->{$class} } : ();
+	my @class_presets = exists PRESET_FORMATS->{$class} ? @{ PRESET_FORMATS->{$class} } : ();
 
-	# i don't think we want formats consisting of a single field, so these are disabled
-	#my @field_order = $class->FIELDS;
-	my @preset_order = sort { $class_presets{$a}{name} cmp $class_presets{$b}{name} } keys %class_presets;
+	$default_format ||= $class_presets[0][0];
 
-	#my %fields = map { $_ => "Field: $_" } @field_order;
-	#my %presets = map { $_ => "Preset: $class_presets{$_}{name}" } @preset_order;
-	my %presets = map { $_ => $class_presets{$_}{name} } @preset_order;
+	my @presets =
+		map { [ $_->[1]{name} => $_->[0], $_->[0] eq $default_format ? (selected => undef) : () ] } @class_presets;
 
-	#return ( [@field_order, @preset_order], {%fields, %presets} );
-	return ( \@preset_order, \%presets );
+	return \@presets;
 }
 
-=item formatRecords(\%options, %Records)
-
-Given a format specification (or the name of a preset format) and a hash mapping
-record identifiers to records, returns a hash mapping identifiers to formatted
-strings.
-
-The keys of the %Records hash are not used by formatRecords() They are a
-convenience for you.
-
-%options can consist of:
-
- preset => the name of a preset format listed by getFormatsForClass()
-
-or:
-
- field_order   => a reference to a list of fields in the records' class
- format_string => an sprintf format string corresponding to the fields listed above
-
-or:
+=item formatRecords($preset_format, @records)
 
- field_order     => a reference to a list of fields in the records' class
- format_function => a coderef to which to pass the contents of the fields in field_order
+Given the name of a preset format and an array of database records, returns a
+reference to a list of two element lists. The first element in each list is a
+formatted string representing the record, and the second element is a string
+that is obtained by joining the key fields of the database record with
+exclamation marks.
 
-If C<preset> is given, and its value does not match any known preset but I<is>
-the name of a field in the record class, the format is assumed to consist of
-that single field.
+The C<$preset_format> must be provided.  It must either be one of the presets
+defined above, or the name of a field in the database record class.
 
-If C<format_function> is given, the subroutine referenced is passed to contents
-of each field listed in C<field_order>. The subroutine should return a formatted
-string.
-
-The return value is suitable for passing to the C<-labels> parameter of several
-CGI module methods, i.e. popup_menu(), scrolling_list(), checkbox_group(), and
-radio_group().
+=back
 
 =cut
 
 sub formatRecords {
-	my ($options, %Records) = @_;
+	my ($preset_format, @records) = @_;
 
-	# nothing to do
-	return () unless %Records;
+	return unless @records;
 
-	# get class info (we assume that the records are all of the same type)
-	my ($tempKey, $tempValue) = each %Records;
-	my $class = ref $tempValue;
-	my %class_fields = map { $_ => 1 } $class->FIELDS;
+	# Get class info.  It is assumed that the records are all of the same class after the "Version" suffix is removed.
+	my $class = (ref $records[0]) =~ s/Version$//r;
 
-	my %options = %$options;
+	my %options;
 
-	if (exists $options{"preset"}) {
-		my $preset = $options{preset};
-
-		if (exists PRESET_FORMATS->{$class} and exists PRESET_FORMATS->{$class}->{$preset}) {
-			# an explicit preset exists
-			# replace the contents of %options with the values from the preset
-			%options = %{ PRESET_FORMATS->{$class}->{$preset} };
-		} elsif (exists $class_fields{$preset}) {
-			# it's the name of a field in the current class, in which case we treat it as
-			# a "fields" sort with a single field
-			%options = ( field_order => [ $preset ] );
+	if ($preset_format) {
+		if (exists PRESET_FORMATS->{$class}
+			&& (my $preset = (grep { $_->[0] eq $preset_format } @{ PRESET_FORMATS->{$class} })[0]))
+		{
+			# An explicit preset exists.
+			%options = %{ $preset->[1] };
+		} elsif (grep { $_ eq $preset_format } $class->FIELDS) {
+			# The preset is the name of a field in the current class, in which
+			# case treat it as a "fields" sort with a single field.
+			%options = (field_order => [$preset_format]);
 		} else {
-			croak "preset \"$preset\" not found for class \"$class\"";
+			croak qq{preset format "$preset_format" not found for class "$class"};
 		}
+	} else {
+		croak 'A preset format must be provided.';
 	}
 
-	croak "field_order not found in options list" unless exists $options{field_order};
-	croak "field_order is not an arrayref" unless ref $options{field_order} eq "ARRAY";
+	croak 'field_order not found in options list' unless exists $options{field_order};
+	croak 'field_order is not an arrayref'        unless ref $options{field_order} eq 'ARRAY';
 	my @field_order = @{ $options{field_order} };
-	croak "field_order is empty -- no fields to display" unless @field_order;
+	croak 'field_order is empty -- no fields to display' unless @field_order;
 
 	my $format_function;
 	if (exists $options{format_function}) {
-		croak "format_function is not a coderef" unless ref $options{format_function} eq "CODE";
+		croak 'format_function is not a coderef' unless ref $options{format_function} eq 'CODE';
 		$format_function = $options{format_function};
 	}
 
-	# default format_string is "%s %s %s ... %s".
-	my $format_string = $options{format_string} || "%s " x (@field_order-1) . "%s";
+	my @keyfields = $class->KEYFIELDS;
+
+	my @formattedRecords;
 
 	if ($format_function) {
-		# if we were passed format_function, call it on each record
-		foreach my $value (values %Records) {
-			# $value is initially a record, and is then replaced with a formatted string
-			$value = $format_function->(map { $value->$_ } @field_order);
+		# If a format_function was passed, then call it on each record.
+		for my $value (@records) {
+			push(@formattedRecords,
+				[ $format_function->(map { $value->$_ } @field_order), join('!', map { $value->$_ } @keyfields) ]);
 		}
 	} else {
-		# otherwise, use sprintf and format_string
-		foreach my $value (values %Records) {
-			# $value is initially a record, and is then replaced with a formatted string
-			$value = sprintf($format_string, map { $value->$_ } @field_order);
+		# Otherwise, use sprintf and format_string.
+		for my $value (@records) {
+			push(
+				@formattedRecords,
+				[
+					sprintf(
+						$options{format_string} || '%s ' x (@field_order - 1) . '%s',
+						map { $value->$_ } @field_order
+					),
+					join('!', map { $value->$_ } @keyfields)
+				]
+			);
 		}
 	}
 
-	return %Records;
+	return \@formattedRecords;
 }
 
-=back
-
-=cut
-
-=head1 BUGS
-
-The calling semantics of formatRecords is somewhat inflexible. We shouldn't make
-the user pass a hash if a list is sufficient for their use.
-
-=cut
-
 1;
diff --git a/lib/WeBWorK/Utils/Grades.pm b/lib/WeBWorK/Utils/Grades.pm
index 131e43f0bc..eea6afb792 100644
--- a/lib/WeBWorK/Utils/Grades.pm
+++ b/lib/WeBWorK/Utils/Grades.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,52 +14,40 @@
 ################################################################################
 
 package WeBWorK::Utils::Grades;
-use base qw(Exporter);
+use parent qw(Exporter);
 
 use strict;
 use warnings;
-use Carp;
 
-our @EXPORT    = ();
-our @EXPORT_OK = qw(
-	list_set_versions
-);
+use Carp;
 
-###########################
-# Utils::Grades
-#
-# Provides common grading methods for grading a set  or a versioned set
-###########################
+our @EXPORT_OK = qw(list_set_versions);
 
-######################################################
-# build list of versioned sets for this student user
-# inputs:  $studentID, $setID
-# returns;    ref to array of names of set versions OR (if not versioned) the $setID
-#              notAssignedSet
-######################################################
+# FIXME: This module is misnamed.  It doesn't actually do anything related to grades.  The grading methods in
+# WeBWorK::Utils should be moved here.
 
+# Construct a list of versioned sets for this student user.  This returns a reference to an array of names of set
+# versions and whether or not the user is assigned to the set.  The list of names will be a list of set versions if the
+# set is versioned, and a list containing only the original set id otherwise.
 sub list_set_versions {
 	my ($db, $studentName, $setName, $setIsVersioned) = @_;
-	return ("list_set_versions requires a database reference as the first element") unless ref($db)=~/DB/;
-	my @allSetNames = ();
+	croak 'list_set_versions requires a database reference as the first element' unless ref($db) =~ /DB/;
+
+	my @allSetNames;
 	my $notAssignedSet = 0;
-	if ( $setIsVersioned ) {
-		my @setVersions = $db->listSetVersions($studentName, $setName);
-		@allSetNames = map { "$setName,v$_" } @setVersions;
-		# if there aren't any set versions, is it because
-		#    the user isn't assigned the set (e.g., is a 
-		#    proctor), or because the user hasn't completed
-		#    any versions?
-		if ( ! @setVersions ) {
-			$notAssignedSet = 1 if (! $db->existsUserSet($studentName,$setName));
-		}
 
+	if ($setIsVersioned) {
+		my @setVersions = $db->listSetVersions($studentName, $setName);
+		@allSetNames = map {"$setName,v$_"} @setVersions;
+		# If there are not any set versions, it may be because the user is not assigned the set,
+		# or because the user hasn't completed any versions.
+		$notAssignedSet = 1 if !@setVersions && !$db->existsUserSet($studentName, $setName);
 	} else {
-		@allSetNames = ( "$setName" );
+		@allSetNames    = ($setName);
+		$notAssignedSet = 1 if !$db->existsUserSet($studentName, $setName);
 	}
-	(\@allSetNames, $notAssignedSet);
-}
-
 
+	return (\@allSetNames, $notAssignedSet);
+}
 
 1;
diff --git a/lib/WeBWorK/Utils/Instructor.pm b/lib/WeBWorK/Utils/Instructor.pm
new file mode 100644
index 0000000000..0aee241fd0
--- /dev/null
+++ b/lib/WeBWorK/Utils/Instructor.pm
@@ -0,0 +1,737 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Utils::Instructor;
+use parent qw(Exporter);
+
+=head1 NAME
+
+WeBWorK::Utils::Instructor - Useful instructor utility tools.
+
+=cut
+
+use strict;
+use warnings;
+
+use File::Find;
+
+use WeBWorK::DB::Utils qw(initializeUserProblem);
+use WeBWorK::Debug;
+use WeBWorK::Utils qw(jitar_id_to_seq seq_to_jitar_id);
+
+our @EXPORT_OK = qw(
+	assignSetToUser
+	assignSetVersionToUser
+	assignProblemToUser
+	assignProblemToUserSetVersion
+	assignSetToAllUsers
+	unassignSetFromAllUsers
+	assignAllSetsToUser
+	unassignAllSetsFromUser
+	assignSetsToUsers
+	assignSetToGivenUsers
+	unassignSetsFromUsers
+	assignProblemToAllSetUsers
+	assignMultipleProblemsToGivenUsers
+	addProblemToSet
+	read_dir
+	getCSVList
+	getDefList
+);
+
+=head1 METHODS
+
+=cut
+
+################################################################################
+# Primary assignment methods
+################################################################################
+
+=head2 Primary assignment methods
+
+=over
+
+=item assignSetToUser($db, $userID, $GlobalSet)
+
+Assigns the given set and all problems contained therein to the given user. If
+the set (or any problems in the set) are already assigned to the user, a list of
+failure messages is returned.
+
+=cut
+
+sub assignSetToUser {
+	my ($db, $userID, $GlobalSet) = @_;
+	my $setID = $GlobalSet->set_id;
+
+	my $UserSet = $db->newUserSet;
+	$UserSet->user_id($userID);
+	$UserSet->set_id($setID);
+
+	my @results;
+	my $set_assigned = 0;
+
+	eval { $db->addUserSet($UserSet) };
+	if ($@) {
+		if ($@ =~ m/user set exists/) {
+			push @results, "set $setID is already assigned to user $userID.";
+			$set_assigned = 1;
+		} else {
+			die $@;
+		}
+	}
+
+	my @globalProblemIDs = $db->listGlobalProblems($setID);
+
+	my $result;
+	# Make the next operation as close to a transaction as possible
+	eval {
+		$db->start_transaction;
+		$result = assignMultipleProblemsToGivenUsers($db, [$userID], $setID, @globalProblemIDs);
+		$db->end_transaction;
+	};
+	if ($@) {
+		my $msg = "assignSetToUser: error during asignMultipleProblemsToGivenUsers: $@";
+		$db->abort_transaction;
+		die $msg;
+	}
+
+	push @results, $result if $result and not $set_assigned;
+
+	return @results;
+}
+
+sub assignSetVersionToUser {
+	my ($db, $userID, $GlobalSet) = @_;
+	# in:  $db = a database connection
+	#      $userID = the userID of the user to which to assign the set,
+	#      $GlobalSet = the global set object.
+	# out: a new set version is assigned to the user.
+	# note: we assume that the global set and user are well defined.  I think this
+	#    is a safe assumption.  it would be nice to just call assignSetToUser,
+	#    but we run into trouble doing that because of the distinction between
+	#    the setID and the setVersionID
+
+	my $setID = $GlobalSet->set_id;
+
+	# figure out what version we're on, reset setID, get a new user set
+	# FIXME: old version; new call follows
+	#    my $setVersionNum = $db->getUserSetVersionNumber( $userID, $setID );
+	my @allVersionIDs = $db->listSetVersions($userID, $setID);
+	my $setVersionNum = (@allVersionIDs) ? $allVersionIDs[-1] : 0;
+	$setVersionNum++;
+	my $userSet = $db->newSetVersion;
+	$userSet->user_id($userID);
+	$userSet->set_id($setID);
+	$userSet->version_id($setVersionNum);
+
+	my @results      = ();
+	my $set_assigned = 0;
+
+	# add the set to the database
+	eval { $db->addSetVersion($userSet) };
+	if ($@) {
+		if ($@ =~ m/user set exists/) {
+			push(@results, "set $setID,v$setVersionNum is already assigned" . "to user $userID");
+			$set_assigned = 1;
+		} else {
+			die $@;
+		}
+	}
+
+	# populate set with problems
+	my @GlobalProblems = grep { defined $_ } $db->getAllGlobalProblems($setID);
+
+	# keep track of problems assigned from groups so that we can have multiple
+	#    problems from a given group, without duplicates
+	my %groupProblems = ();
+
+	foreach my $GlobalProblem (@GlobalProblems) {
+		$GlobalProblem->set_id($setID);
+		my @result = assignProblemToUserSetVersion($db, $userID, $userSet, $GlobalProblem, \%groupProblems);
+		push(@results, @result) if (@result && !$set_assigned);
+	}
+
+	return @results;
+}
+
+=item assignMultipleProblemsToGivenUsers($db, $userIDsRef, $set_id, @globalProblemIDs)
+
+Assigns all the problems of the given $set_id to the given users.
+The list of users are sent as an array reference
+If any assignments fail, an error message is returned.
+
+=cut
+
+sub assignMultipleProblemsToGivenUsers {
+	my ($db, $userIDsRef, $set_id, @globalProblemIDs) = @_;
+
+	if (!@globalProblemIDs) {    # When the set is empty there is nothing to do
+		return;
+	}
+
+	my @allRecords;
+	for my $userID (@{$userIDsRef}) {
+		my @records;
+		for my $problem_id (@globalProblemIDs) {
+			my $userProblem = $db->newUserProblem;
+			$userProblem->user_id($userID);
+			$userProblem->set_id($set_id);
+			$userProblem->problem_id($problem_id);
+			initializeUserProblem($userProblem, undef);    # No $seed
+			push(@records, $userProblem);
+		}
+		push(@allRecords, [@records]);
+	}
+
+	eval { $db->addUserMultipleProblems(@allRecords) };
+	if ($@) {
+		if ($@ =~ m/user problems existed/) {
+			return "some problem in the set $set_id were already assigned to one of the users being processed.\n $@";
+		} else {
+			die $@;
+		}
+	}
+
+	return;
+}
+
+=item assignProblemToUser($db, $userID, $GlobalProblem, $seed)
+
+Assigns the given problem to the given user. If the problem is already assigned
+to the user, an error string is returned. If $seed is defined, the UserProblem
+will be given that seed.
+
+=cut
+
+sub assignProblemToUser {
+	my ($db, $userID, $GlobalProblem, $seed) = @_;
+
+	my $UserProblem = $db->newUserProblem;
+	$UserProblem->user_id($userID);
+	$UserProblem->set_id($GlobalProblem->set_id);
+	$UserProblem->problem_id($GlobalProblem->problem_id);
+	initializeUserProblem($UserProblem, $seed);
+
+	eval { $db->addUserProblem($UserProblem) };
+	if ($@) {
+		if ($@ =~ m/user problem exists/) {
+			return
+				"problem "
+				. $GlobalProblem->problem_id
+				. " in set "
+				. $GlobalProblem->set_id
+				. " is already assigned to user $userID.";
+		} else {
+			die $@;
+		}
+	}
+
+	return ();
+}
+
+# $seed is optional -- if set, the UserProblem will be given that seed
+sub assignProblemToUserSetVersion {
+	my ($db, $userID, $userSet, $GlobalProblem, $groupProbRef, $seed) = @_;
+
+	# conditional to allow selection of problems from a group of problems,
+	# defined in a set.
+
+	# problem groups are indicated by source files "group:problemGroupName"
+	if ($GlobalProblem->source_file() =~ /^group:(.+)$/) {
+		my $problemGroupName = $1;
+
+		# get list of problems in group
+		my @problemList = $db->listGlobalProblems($problemGroupName);
+		# sanity check: if the group set hasn't been defined or doesn't
+		# actually contain problems (oops), then we can't very well assign
+		# this problem to the user.  we could go on and assign all other
+		# problems, but that results in a partial set.  so we die here if
+		# this happens.  philosophically we're requiring that the instructor
+		# set up the sets correctly or have to deal with the carnage after-
+		# wards.  I'm not sure that this is the best long-term solution.
+		# FIXME: this means that we may have created a set version that
+		# doesn't have any problems.  this is bad.  but it's hard to see
+		# where else to deal with it---fixing the problem requires checking
+		# at the set version-creation level that all the problems in the
+		# set are well defined.  FIXME
+		die("Error in set version creation: no problems are available "
+				. "in problem group $problemGroupName.  Set "
+				. $userSet->set_id
+				. " has been created for $userID, but "
+				. "does not contain the right problems.\n")
+			if (!@problemList);
+
+		my $nProb        = @problemList;
+		my $whichProblem = int(rand($nProb));
+
+		# we allow selection of multiple problems from a group, but want them to
+		#   be different.  there's probably a better way to do this
+		if (defined($groupProbRef->{$problemGroupName})
+			&& $groupProbRef->{$problemGroupName} =~ /\b$whichProblem\b/)
+		{
+			my $nAvail = $nProb - ($groupProbRef->{$problemGroupName} =~ tr/,//) - 1;
+
+			die("Too many problems selected from group.") if (!$nAvail);
+
+			$whichProblem = int(rand($nProb));
+			while ($groupProbRef->{$problemGroupName} =~ /\b$whichProblem\b/) {
+				$whichProblem = ($whichProblem + 1) % $nProb;
+			}
+		}
+		if (defined($groupProbRef->{$problemGroupName})) {
+			$groupProbRef->{$problemGroupName} .= ",$whichProblem";
+		} else {
+			$groupProbRef->{$problemGroupName} = "$whichProblem";
+		}
+
+		my $prob = $db->getGlobalProblem($problemGroupName, $problemList[$whichProblem]);
+		$GlobalProblem->source_file($prob->source_file());
+	}
+
+	# all set; do problem assignment
+	my $UserProblem = $db->newProblemVersion;
+	$UserProblem->user_id($userID);
+	$UserProblem->set_id($userSet->set_id);
+	$UserProblem->version_id($userSet->version_id);
+	$UserProblem->problem_id($GlobalProblem->problem_id);
+	$UserProblem->source_file($GlobalProblem->source_file);
+	initializeUserProblem($UserProblem, $seed);
+
+	eval { $db->addProblemVersion($UserProblem) };
+	if ($@) {
+		if ($@ =~ m/user problem exists/) {
+			return
+				"problem "
+				. $GlobalProblem->problem_id
+				. " in set "
+				. $GlobalProblem->set_id
+				. " is already assigned to user $userID.";
+		} else {
+			die $@;
+		}
+	}
+
+	return ();
+}
+
+=back
+
+=cut
+
+################################################################################
+# Secondary set assignment methods
+################################################################################
+
+=head2 Secondary assignment methods
+
+=over
+
+=item assignSetToAllUsers($db, $ce, $setID)
+
+Assigns the set specified and all problems contained therein to all users
+in the course. This skips users whose status does not have the behavior
+include_in_assignment.
+This is more efficient than repeatedly calling assignSetToUser().
+If any assignments fail, a list of failure messages is returned.
+
+=cut
+
+sub assignSetToAllUsers {
+	my ($db, $ce, $setID) = @_;
+
+	debug("$setID: getting user list");
+	my @userRecords = $db->getUsersWhere({ user_id => { not_like => 'set_id:%' } });
+	debug("$setID: (done with that)");
+
+	return assignSetToGivenUsers($db, $ce, $setID, 0, @userRecords);
+}
+
+=item assignSetToGivenUsers($db, $ce, $setID, $alwaysInclude, @userRecords)
+
+Assigns the set specified and all problems contained therein to all users
+in the list provided.
+When $alwaysInclude is false, it will skip users whose status does not
+have the behavior include_in_assignment.
+This is more efficient than repeatedly calling assignSetToUser().
+If any assignments fail, an error message is returned.
+
+=cut
+
+sub assignSetToGivenUsers {
+	my ($db, $ce, $setID, $alwaysInclude, @userRecords) = @_;
+
+	debug("$setID: getting problem list");
+	my @globalProblemIDs = $db->listGlobalProblems($setID);
+	debug("$setID: (done with that)");
+
+	my @results;
+
+	my @userSetsToAdd;
+	my @usersToProcess;
+	foreach my $User (@userRecords) {
+		next unless ($alwaysInclude || $ce->status_abbrev_has_behavior($User->status, "include_in_assignment"));
+		my $userID = $User->user_id;
+		next if $db->existsUserSet($userID, $setID);
+
+		my $userSet = $db->newUserSet;
+		$userSet->user_id($userID);
+		$userSet->set_id($setID);
+		debug("Scheduled $setID: adding UserSet for $userID");
+		push(@userSetsToAdd,  $userSet);
+		push(@usersToProcess, $userID);
+	}
+	return unless @usersToProcess;    # nothing to do
+
+	# Insert them all at once
+	eval {
+		$db->start_transaction;
+		$db->addMultipleUserSets(@userSetsToAdd);
+	};
+	if ($@) {
+		my $msg = "assignSetToGivenUsers: error during addMultipleUserSets: $@";
+		$db->abort_transaction;
+		die $msg;
+	}
+	# Now add the problem records - as a batch
+	my $result;
+	eval {
+		$result = assignMultipleProblemsToGivenUsers($db, [@usersToProcess], $setID, @globalProblemIDs);
+		$db->end_transaction;
+	};
+	if ($@) {
+		my $msg = "assignSetToGivenUsers: error during assignMultipleProblemsToGivenUsers: $@";
+		$db->abort_transaction;
+		die $msg;
+	}
+	return $result;
+}
+
+=item unassignSetFromAllUsers($db, $setID)
+
+Unassigns the specified sets and all problems contained therein from all users.
+
+=cut
+
+sub unassignSetFromAllUsers {
+	my ($db, $setID) = @_;
+
+	my @userIDs = $db->listSetUsers($setID);
+
+	foreach my $userID (@userIDs) {
+		$db->deleteUserSet($userID, $setID);
+	}
+
+	return;
+}
+
+=item assignAllSetsToUser($db, $userID)
+
+Assigns all sets in the course and all problems contained therein to the
+specified user. If any assignments fail, a list of failure messages is
+returned.
+
+=cut
+
+sub assignAllSetsToUser {
+	my ($db, $userID) = @_;
+
+	my @GlobalSets = $db->getGlobalSetsWhere();
+
+	my @results;
+
+	for my $GlobalSet (@GlobalSets) {
+		my @result = assignSetToUser($db, $userID, $GlobalSet);
+		push @results, @result if @result;
+	}
+
+	return @results;
+}
+
+=item unassignAllSetsFromUser($db, $userID)
+
+Unassigns all sets and all problems contained therein from the specified user.
+
+=cut
+
+sub unassignAllSetsFromUser {
+	my ($db, $userID) = @_;
+
+	my @setIDs = $db->listUserSets($userID);
+
+	foreach my $setID (@setIDs) {
+		$db->deleteUserSet($userID, $setID);
+	}
+
+	return;
+}
+
+=back
+
+=cut
+
+################################################################################
+# Utility assignment methods
+################################################################################
+
+=head2 Utility assignment methods
+
+=over
+
+=item assignSetsToUsers($db, $ce, $setIDsRef, $userIDsRef)
+
+Assign each of the given sets to each of the given users. If any assignments
+fail, a list of failure messages is returned.
+
+=cut
+
+sub assignSetsToUsers {
+	my ($db, $ce, $setIDsRef, $userIDsRef) = @_;
+
+	my @userRecords = $db->getUsers(@$userIDsRef);
+	my @results;
+
+	foreach my $setID (@$setIDsRef) {
+		my $result = assignSetToGivenUsers($db, $ce, $setID, 1, @userRecords);
+		push @results, $result if $result;
+	}
+
+	return @results;
+}
+
+=item unassignSetsFromUsers($db, $setIDsRef, $userIDsRef)
+
+Unassign each of the given sets from each of the given users.
+
+=cut
+
+sub unassignSetsFromUsers {
+	my ($db, $setIDsRef, $userIDsRef) = @_;
+	my @setIDs  = @$setIDsRef;
+	my @userIDs = @$userIDsRef;
+
+	foreach my $setID (@setIDs) {
+		foreach my $userID (@userIDs) {
+			$db->deleteUserSet($userID, $setID);
+		}
+	}
+
+	return;
+}
+
+=item assignProblemToAllSetUsers($GlobalProblem)
+
+Assigns the problem specified to all users to whom the problem's set is
+assigned. If any assignments fail, a list of failure messages is returned.
+
+=cut
+
+sub assignProblemToAllSetUsers {
+	my ($db, $GlobalProblem) = @_;
+	my $setID   = $GlobalProblem->set_id;
+	my @userIDs = $db->listSetUsers($setID);
+
+	my @results;
+
+	foreach my $userID (@userIDs) {
+		my @result = assignProblemToUser($db, $userID, $GlobalProblem);
+		push @results, @result if @result;
+	}
+
+	return @results;
+}
+
+=back
+
+=cut
+
+################################################################################
+# Utility method for adding problems to a set
+################################################################################
+
+=head2 Utility method for adding problems to a set
+
+=over
+
+=cut
+
+sub addProblemToSet {
+	my ($db, $problemDefaults, %args) = @_;
+	my $value_default                = $problemDefaults->{value};
+	my $max_attempts_default         = $problemDefaults->{max_attempts};
+	my $showMeAnother_default        = $problemDefaults->{showMeAnother};
+	my $att_to_open_children_default = $problemDefaults->{att_to_open_children};
+	my $counts_parent_grade_default  = $problemDefaults->{counts_parent_grade};
+	my $showHintsAfter_default       = $problemDefaults->{showHintsAfter};
+	my $prPeriod_default             = $problemDefaults->{prPeriod};
+	# showMeAnotherCount is the number of times that showMeAnother has been clicked; initially 0
+	my $showMeAnotherCount = 0;
+
+	die "addProblemToSet called without specifying the set name." if $args{setName} eq "";
+	my $setName = $args{setName};
+
+	my $sourceFile = $args{sourceFile}
+		or die "addProblemToSet called without specifying the sourceFile.";
+
+	my $problemID = $args{problemID};
+
+	# The rest of the arguments are optional
+	my $value             = $args{value} // $value_default;
+	my $maxAttempts       = $args{maxAttempts} || $max_attempts_default;
+	my $showMeAnother     = $args{showMeAnother}     // $showMeAnother_default;
+	my $showHintsAfter    = $args{showHintsAfter}    // $showHintsAfter_default;
+	my $prPeriod          = $args{prPeriod}          // $prPeriod_default;
+	my $countsParentGrade = $args{countsParentGrade} // $counts_parent_grade_default;
+	my $attToOpenChildren = $args{attToOpenChildren} // $att_to_open_children_default;
+
+	unless ($problemID) {
+
+		my $set = $db->getGlobalSet($setName);
+		# for jitar sets the new problem id is the one that
+		# makes it a new top level problem
+		if ($set && $set->assignment_type eq 'jitar') {
+			my @problemIDs = $db->listGlobalProblems($setName);
+			if (@problemIDs) {
+				my @seq = jitar_id_to_seq($problemIDs[-1]);
+				$problemID = seq_to_jitar_id($seq[0] + 1);
+			} else {
+				$problemID = seq_to_jitar_id(1);
+			}
+		} else {
+			$problemID = WeBWorK::Utils::max($db->listGlobalProblems($setName)) + 1;
+		}
+	}
+
+	my $problemRecord = $db->newGlobalProblem;
+	$problemRecord->problem_id($problemID);
+	$problemRecord->set_id($setName);
+	$problemRecord->source_file($sourceFile);
+	$problemRecord->value($value);
+	$problemRecord->max_attempts($maxAttempts);
+	$problemRecord->att_to_open_children($attToOpenChildren);
+	$problemRecord->counts_parent_grade($countsParentGrade);
+	$problemRecord->showMeAnother($showMeAnother);
+	$problemRecord->{showMeAnotherCount} = $showMeAnotherCount;
+	$problemRecord->showHintsAfter($showHintsAfter);
+	$problemRecord->prPeriod($prPeriod);
+	$problemRecord->prCount(0);
+	$db->addGlobalProblem($problemRecord);
+
+	return $problemRecord;
+}
+
+=back
+
+=cut
+
+################################################################################
+# Utility methods
+################################################################################
+
+=head2 Utility methods
+
+=over
+
+=cut
+
+sub read_dir {    # read a directory
+	my $directory = shift;
+	my $pattern   = shift;
+	my @files     = sort grep {/$pattern/} WeBWorK::Utils::readDirectory($directory);
+	return @files;
+}
+
+=back
+
+=cut
+
+################################################################################
+# Methods for listing various types of files
+################################################################################
+
+=head2 Methods for listing various types of files
+
+=over
+
+=cut
+
+# list classlist files
+sub getCSVList {
+	my ($ce) = @_;
+	my $dir = $ce->{courseDirs}{templates};
+	return grep { not m/^\./ and m/\.lst$/ and -f "$dir/$_" } WeBWorK::Utils::readDirectory($dir);
+}
+
+sub loadSetDefListFile {
+	my $file = shift;
+
+	if (-r $file) {
+		my $data = do {
+			open(my $fh, "<:encoding(UTF-8)", $file)
+				or die "FATAL: Unable to open '$file'!";
+			local $/;
+			my $contents = <$fh>;
+			close $fh;
+			$contents;
+		};
+
+		return @{ JSON->new->decode($data) };
+	}
+
+	return;
+}
+
+sub getDefList {
+	my $ce     = shift;
+	my $topdir = $ce->{courseDirs}{templates};
+
+	# Search to a depth of the setDefSearchDepth value plus the depth of the templates directory.
+	my $max_depth = $ce->{options}{setDefSearchDepth} + @{ [ $topdir =~ /\//g ] };
+
+	my @found_set_defs;
+
+	# get_set_defs_wanted is a closure over @found_set_defs
+	my $get_set_defs_wanted = sub {
+		if ($File::Find::dir =~ /^$topdir\/Library/ || $File::Find::dir =~ /^$topdir\/Contrib/) {
+			$File::Find::prune = 1;
+			return;
+		}
+		if (@{ [ $File::Find::dir =~ /\//g ] } > $max_depth) { $File::Find::prune = 1; return; }
+		push @found_set_defs, $_ =~ s|^$topdir/?||r if m|/set[^/]*\.def$|;
+	};
+
+	find({ wanted => $get_set_defs_wanted, follow_fast => 1, no_chdir => 1 }, $topdir);
+
+	# Load the OPL set definition files from the list file.
+	push(@found_set_defs, loadSetDefListFile("$ce->{webworkDirs}{htdocs}/DATA/library-set-defs.json"))
+		if ($ce->{options}{useOPLdefFiles});
+
+	# Load the Contrib set definition files from the list file.
+	push(@found_set_defs, loadSetDefListFile("$ce->{webworkDirs}{htdocs}/DATA/contrib-set-defs.json"))
+		if ($ce->{options}{useContribDefFiles});
+
+	my @depths;
+	my @caps;
+	for (@found_set_defs) {
+		push @depths, scalar(@{ [ $_ =~ /\//g ] });
+		push @caps,   uc($_);
+	}
+	return @found_set_defs[ sort { $depths[$a] <=> $depths[$b] || $caps[$a] cmp $caps[$b] } 0 .. $#found_set_defs ];
+}
+
+=back
+
+=cut
+
+1;
diff --git a/lib/WeBWorK/Utils/LanguageAndDirection.pm b/lib/WeBWorK/Utils/LanguageAndDirection.pm
index 9926530c67..301080b219 100644
--- a/lib/WeBWorK/Utils/LanguageAndDirection.pm
+++ b/lib/WeBWorK/Utils/LanguageAndDirection.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -42,7 +42,7 @@ use Carp;
 use WeBWorK::PG;
 use WeBWorK::Debug;
 
-our @EXPORT = qw(get_lang_and_dir get_problem_lang_and_dir);
+our @EXPORT    = qw(get_lang_and_dir get_problem_lang_and_dir);
 our @EXPORT_OK = ();
 
 =head1 FUNCTIONS
@@ -63,20 +63,20 @@ Arabic ("ar") trigger the RTL direction setting.
 =cut
 
 sub get_lang_and_dir {
-	my $lang = shift;
-	my $master_lang_setting = "lang=\"en-US\""; # default setting
-	my $master_dir_setting  = "";               # default is NOT set
+	my $lang                = shift;
+	my $master_lang_setting = "lang=\"en-US\"";    # default setting
+	my $master_dir_setting  = "";                  # default is NOT set
 
 	if ($lang eq "en") {
-		$master_lang_setting = "lang=\"en-US\""; # as in default
-	} elsif ($lang =~ /^he/i) { # supports also the current "heb" option
-		# Hebrew - requires RTL direction
-		$master_lang_setting = "lang=\"he\""; # Hebrew
-		$master_dir_setting  = "dir=\"rtl\""; # RTL
+		$master_lang_setting = "lang=\"en-US\"";    # as in default
+	} elsif ($lang =~ /^he/i) {    # supports also the current "heb" option
+								   # Hebrew - requires RTL direction
+		$master_lang_setting = "lang=\"he\"";    # Hebrew
+		$master_dir_setting  = "dir=\"rtl\"";    # RTL
 	} elsif ($lang =~ /^ar/i) {
 		# Hebrew - requires RTL direction
-		$master_lang_setting = "lang=\"ar\""; # Arabic
-		$master_dir_setting  = "dir=\"rtl\""; # RTL
+		$master_lang_setting = "lang=\"ar\"";    # Arabic
+		$master_dir_setting  = "dir=\"rtl\"";    # RTL
 	} else {
 		# use the language setting of the course, with NO direction setting
 		$master_lang_setting = "lang=\"${lang}\"";
@@ -110,9 +110,9 @@ In some cases, the return result is empty.
 =cut
 
 sub get_problem_lang_and_dir {
-	my $pg_flags = shift;
+	my $pg_flags       = shift;
 	my $requested_mode = shift;
-	my $lang = shift;
+	my $lang           = shift;
 
 	my %result;
 
@@ -121,19 +121,19 @@ sub get_problem_lang_and_dir {
 
 	$lang = "en" unless defined($lang);
 
-	my $dir = "ltr"; # default
+	my $dir = "ltr";    # default
 
-	if ($lang =~ /^he/i) { # supports also the current "heb" option
-		# Hebrew - requires RTL direction
-		$lang = "he";  # Hebrew - standard form
-		$dir  = "rtl"; # RTL
+	if ($lang =~ /^he/i) {    # supports also the current "heb" option
+							  # Hebrew - requires RTL direction
+		$lang = "he";         # Hebrew - standard form
+		$dir  = "rtl";        # RTL
 	} elsif ($lang =~ /^ar/i) {
 		# Arabic - requires RTL direction
-		$lang = "ar";  # Arabic
-		$dir  = "rtl"; # RTL
+		$lang = "ar";         # Arabic
+		$dir  = "rtl";        # RTL
 	}
 
-	my @tmp1 = split(':', $requested_mode);
+	my @tmp1    = split(':', $requested_mode);
 	my $reqMode = $tmp1[0];
 	my $reqLang = $tmp1[1];
 	my $reqDir  = $tmp1[2];
@@ -145,10 +145,10 @@ sub get_problem_lang_and_dir {
 	if ($reqMode eq "force") {
 		# Requested mode is to force the LANG and DIR attributes regardless of lang data from problem PG code.
 		if ($reqLang ne "") {
-			$result{lang} = $reqLang; # forced setting
+			$result{lang} = $reqLang;    # forced setting
 		}
-		$result{dir} = $reqDir; # forced setting
-		return wantarray ? %result : join("", map { qq{ $_="$result{$_}"} } keys %result);
+		$result{dir} = $reqDir;          # forced setting
+		return wantarray ? %result : join("", map {qq{ $_="$result{$_}"}} keys %result);
 	}
 
 	if ($reqMode ne "auto") {
@@ -158,8 +158,8 @@ sub get_problem_lang_and_dir {
 
 	# We are now handling an "auto" setting, so want to handle data from PG
 
-	my $pg_lang = "en-US"; # system default
-	my $pg_dir  = "ltr";   # system default
+	my $pg_lang = "en-US";    # system default
+	my $pg_dir  = "ltr";      # system default
 
 	# Determine the language code to use
 	if (defined($pg_flags->{language})) {
@@ -176,15 +176,16 @@ sub get_problem_lang_and_dir {
 	# we changed the order of precedence here.
 	if (defined($pg_flags->{textdirection})) {
 		# Direction set by PG
-		$pg_dir =  $pg_flags->{textdirection};
+		$pg_dir = $pg_flags->{textdirection};
 	} elsif (defined($pg_flags->{language})) {
 		# Direction not set by PG,
 		# but PG did set the language.
 		# Fallback is to use LTR, except for Hebrew and Arabic.
-		$pg_dir  = "ltr"; # correct for most languages
-		if (($pg_flags->{language} =~ /^he/i) ||
-			($pg_flags->{language} =~ /^ar/i)) {
-			$pg_dir  = "rtl"; # should be correct for these languages
+		$pg_dir = "ltr";    # correct for most languages
+		if (($pg_flags->{language} =~ /^he/i)
+			|| ($pg_flags->{language} =~ /^ar/i))
+		{
+			$pg_dir = "rtl";    # should be correct for these languages
 		}
 	} elsif ($reqDir ne "") {
 		# We have a request for a direction when PG did not set it
@@ -194,7 +195,7 @@ sub get_problem_lang_and_dir {
 		# and PG did NOT set the language.
 		# For SetMaker, we are assuming that a problem without a PG direction
 		# setting should be in LTR mode.
-		$pg_dir  = "ltr"; # correct for most languages
+		$pg_dir = "ltr";    # correct for most languages
 
 		# Even for Arabic and Hebrew do NOT change to RTL.
 		# The teacher should add the language and direction setting to
@@ -204,20 +205,24 @@ sub get_problem_lang_and_dir {
 	# Make these string all lowercase (just in case)
 	$pg_lang = lc($pg_lang);
 	$pg_dir  = lc($pg_dir);
-	$lang = lc($lang);
-	$dir  = lc($dir);
+	$lang    = lc($lang);
+	$dir     = lc($dir);
 
 	# We are ALWAYS setting this for this mode.
-	$result{lang} = $pg_lang; # send the problem language that was selected
-
-	if (($dir eq "rtl") && # Possible hack for RTL direction courses and OPL problems
-		($reqDir eq "rtl") &&
-		! defined($pg_flags->{textdirection}) && # problem does not set the language or
-		! defined($pg_flags->{language})) { # the text direction
-		# In a RTL language course, we may really want to force LTR use for unknown problems.
-		# that would best be handled by always including the language setting in RTL language
-		# problems, and using a setting which falls back to LTR when there is no setting from
-		# the problem (expected on OPL problems).
+	$result{lang} = $pg_lang;    # send the problem language that was selected
+
+	if (
+		($dir eq "rtl") &&       # Possible hack for RTL direction courses and OPL problems
+		($reqDir eq "rtl")
+		&& !defined($pg_flags->{textdirection})
+		&&                       # problem does not set the language or
+		!defined($pg_flags->{language})
+		)
+	{                            # the text direction
+								 # In a RTL language course, we may really want to force LTR use for unknown problems.
+								 # that would best be handled by always including the language setting in RTL language
+								 # problems, and using a setting which falls back to LTR when there is no setting from
+								 # the problem (expected on OPL problems).
 
 		# May want to issue a warning
 
@@ -226,12 +231,11 @@ sub get_problem_lang_and_dir {
 	}
 
 	# We are ALWAYS setting this for this mode.
-	$result{dir} = $pg_dir; # override to $pg_dir
+	$result{dir} = $pg_dir;    # override to $pg_dir
 
-	return wantarray ? %result : join("", map { qq{ $_="$result{$_}"} } keys %result);
+	return wantarray ? %result : join("", map {qq{ $_="$result{$_}"}} keys %result);
 }
 
-
 =back
 
 =cut
diff --git a/lib/WeBWorK/Utils/LibraryStats.pm b/lib/WeBWorK/Utils/LibraryStats.pm
index b8c4f253c8..186935de2a 100644
--- a/lib/WeBWorK/Utils/LibraryStats.pm
+++ b/lib/WeBWorK/Utils/LibraryStats.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -13,12 +13,11 @@
 # Artistic License for more details.
 ################################################################################
 
-
 ###########################
 # Utils::LibraryLocalStats
 #
 # This is an interface for getting local statistics about library problems
-# for display 
+# for display
 ###########################
 
 package WeBWorK::Utils::LibraryStats;
@@ -32,82 +31,87 @@ our @EXPORT    = ();
 our @EXPORT_OK = qw();
 
 sub new {
-    my $class = shift;
-    my $ce = shift;
-
-    my $dbh = DBI->connect(
-	$ce->{problemLibrary_db}->{dbsource},
-	$ce->{problemLibrary_db}->{user},
-	$ce->{problemLibrary_db}->{passwd},
-	    {
-		PrintError => 0,
-		RaiseError => 0,
-	    },
+	my $class = shift;
+	my $ce    = shift;
+
+	my $dbh = DBI->connect(
+		$ce->{problemLibrary_db}->{dbsource},
+		$ce->{problemLibrary_db}->{user},
+		$ce->{problemLibrary_db}->{passwd},
+		{
+			PrintError => 0,
+			RaiseError => 0,
+		},
 	);
 
-    my $localselectstm = $dbh->prepare("SELECT * FROM OPL_local_statistics WHERE source_file = ?");
+	my $localselectstm = $dbh->prepare("SELECT * FROM OPL_local_statistics WHERE source_file = ?");
+
+	my $globalselectstm = $dbh->prepare("SELECT * FROM OPL_global_statistics WHERE source_file = ?");
 
-    my $globalselectstm = $dbh->prepare("SELECT * FROM OPL_global_statistics WHERE source_file = ?");
-    
-    my $self = { dbh => $dbh,
-		 localselectstm => $localselectstm,
-		 globalselectstm => $globalselectstm,
-    };
+	my $self = {
+		dbh             => $dbh,
+		localselectstm  => $localselectstm,
+		globalselectstm => $globalselectstm,
+	};
 
-    bless($self,$class);
-    return $self;
+	bless($self, $class);
+	return $self;
 }
 
 sub getLocalStats {
-    my $self = shift;
-    my $source_file = shift;
-
-    my $selectstm = $self->{localselectstm};
-
-    unless ($selectstm->execute($source_file)) {
-      if ($selectstm->errstr =~ /Table .* doesn't exist/) {
-	warn "Couldn't find the OPL local statistics table.  Did you download the latest OPL and run update-OPL-statistics.pl?"
-      }
-      die $selectstm->errstr;
-    }
-
-    my $result = $selectstm->fetchrow_arrayref();
-
-    if ($result) {
-	return {source_file => $source_file,
-		students_attempted => $$result[1],
-		average_attempts => $$result[2],
-		average_status => $$result[3],
-	};
-    } else {
-	return {source_file => $source_file};
-    }
+	my $self        = shift;
+	my $source_file = shift;
+
+	my $selectstm = $self->{localselectstm};
+
+	unless ($selectstm->execute($source_file)) {
+		if ($selectstm->errstr =~ /Table .* doesn't exist/) {
+			warn
+				"Couldn't find the OPL local statistics table.  Did you download the latest OPL and run update-OPL-statistics.pl?";
+		}
+		die $selectstm->errstr;
+	}
+
+	my $result = $selectstm->fetchrow_arrayref();
+
+	if ($result) {
+		return {
+			source_file        => $source_file,
+			students_attempted => $$result[1],
+			average_attempts   => $$result[2],
+			average_status     => $$result[3],
+		};
+	} else {
+		return { source_file => $source_file };
+	}
 }
 
 sub getGlobalStats {
-    my $self = shift;
-    my $source_file = shift;
-
-    my $selectstm = $self->{globalselectstm};
-
-    unless ($selectstm->execute($source_file)) {
-      if ($selectstm->errstr =~ /Table .* doesn't exist/) {
-	warn "Couldn't find the OPL global statistics table.  Did you download the latest OPL and run load-OPL-global-statistics.pl?"
-      }
-      die $selectstm->errstr;
-    }
-
-    my $result = $selectstm->fetchrow_arrayref();
-
-    if ($result) {
-	return {source_file => $source_file,
-		students_attempted => $$result[1],
-		average_attempts => $$result[2],
-		average_status => $$result[3],
-	};
-    } else {
-	return {source_file => $source_file};
-    }
+	my $self        = shift;
+	my $source_file = shift;
+
+	my $selectstm = $self->{globalselectstm};
+
+	unless ($selectstm->execute($source_file)) {
+		if ($selectstm->errstr =~ /Table .* doesn't exist/) {
+			warn
+				"Couldn't find the OPL global statistics table.  Did you download the latest OPL and run load-OPL-global-statistics.pl?";
+		}
+		die $selectstm->errstr;
+	}
+
+	my $result = $selectstm->fetchrow_arrayref();
+
+	if ($result) {
+		return {
+			source_file        => $source_file,
+			students_attempted => $$result[1],
+			average_attempts   => $$result[2],
+			average_status     => $$result[3],
+		};
+	} else {
+		return { source_file => $source_file };
+	}
 }
 
 1;
diff --git a/lib/WeBWorK/Utils/ListingDB.pm b/lib/WeBWorK/Utils/ListingDB.pm
index c973a6deac..7bcce145fd 100644
--- a/lib/WeBWorK/Utils/ListingDB.pm
+++ b/lib/WeBWorK/Utils/ListingDB.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -23,91 +23,88 @@ use File::Basename;
 use WeBWorK::Debug;
 
 use constant LIBRARY_STRUCTURE => {
-	textbook => { 
+	textbook => {
 		select => 'tbk.textbook_id,tbk.title,tbk.author,tbk.edition',
-		name => 'library_textbook', 
-		where => 'tbk.textbook_id'
+		name   => 'library_textbook',
+		where  => 'tbk.textbook_id'
 	},
-	textchapter => { 
-		select => 'tc.number,tc.name', 
-		name=>'library_textchapter',
-		where => 'tc.name'
+	textchapter => {
+		select => 'tc.number,tc.name',
+		name   => 'library_textchapter',
+		where  => 'tc.name'
 	},
-	textsection => { 
-		select => 'ts.number,ts.name', 
-		name=>'library_textsection',
-		where => 'ts.name'
+	textsection => {
+		select => 'ts.number,ts.name',
+		name   => 'library_textsection',
+		where  => 'ts.name'
 	},
 	problem => { select => 'prob.name' },
-	};
+};
 
-BEGIN
-{
+BEGIN {
 	require Exporter;
 	use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
-	$VERSION		=1.0;
-	@ISA		=qw(Exporter);
-	@EXPORT = qw(
+	$VERSION = 1.0;
+	@ISA     = qw(Exporter);
+	@EXPORT  = qw(
 		&deleteListing &getSectionListings &getAllDBsubjects &getAllDBchapters &getAllDBsections &getDBTextbooks
 		&getDBListings &countDBListings &getTables &getDBextras
 	);
-	%EXPORT_TAGS		=();
-	@EXPORT_OK		=qw();
+	%EXPORT_TAGS = ();
+	@EXPORT_OK   = qw();
 }
 use vars @EXPORT_OK;
 
 my %OPLtables = (
- dbsubject => 'OPL_DBsubject',
- dbchapter => 'OPL_DBchapter',
- dbsection => 'OPL_DBsection',
- author => 'OPL_author',
- path => 'OPL_path',
- pgfile => 'OPL_pgfile',
- keyword => 'OPL_keyword',
- pgfile_keyword => 'OPL_pgfile_keyword',
- textbook => 'OPL_textbook',
- chapter => 'OPL_chapter',
- section => 'OPL_section',
- problem => 'OPL_problem',
- morelt => 'OPL_morelt',
- pgfile_problem => 'OPL_pgfile_problem',
+	dbsubject      => 'OPL_DBsubject',
+	dbchapter      => 'OPL_DBchapter',
+	dbsection      => 'OPL_DBsection',
+	author         => 'OPL_author',
+	path           => 'OPL_path',
+	pgfile         => 'OPL_pgfile',
+	keyword        => 'OPL_keyword',
+	pgfile_keyword => 'OPL_pgfile_keyword',
+	textbook       => 'OPL_textbook',
+	chapter        => 'OPL_chapter',
+	section        => 'OPL_section',
+	problem        => 'OPL_problem',
+	morelt         => 'OPL_morelt',
+	pgfile_problem => 'OPL_pgfile_problem',
 );
 
-
 my %NPLtables = (
- dbsubject => 'NPL-DBsubject',
- dbchapter => 'NPL-DBchapter',
- dbsection => 'NPL-DBsection',
- author => 'NPL-author',
- path => 'NPL-path',
- pgfile => 'NPL-pgfile',
- keyword => 'NPL-keyword',
- pgfile_keyword => 'NPL-pgfile-keyword',
- textbook => 'NPL-textbook',
- chapter => 'NPL-chapter',
- section => 'NPL-section',
- problem => 'NPL-problem',
- morelt => 'NPL-morelt',
- pgfile_problem => 'NPL-pgfile-problem',
+	dbsubject      => 'NPL-DBsubject',
+	dbchapter      => 'NPL-DBchapter',
+	dbsection      => 'NPL-DBsection',
+	author         => 'NPL-author',
+	path           => 'NPL-path',
+	pgfile         => 'NPL-pgfile',
+	keyword        => 'NPL-keyword',
+	pgfile_keyword => 'NPL-pgfile-keyword',
+	textbook       => 'NPL-textbook',
+	chapter        => 'NPL-chapter',
+	section        => 'NPL-section',
+	problem        => 'NPL-problem',
+	morelt         => 'NPL-morelt',
+	pgfile_problem => 'NPL-pgfile-problem',
 );
 
-
 sub getTables {
-	my $ce = shift;
+	my $ce          = shift;
 	my $libraryRoot = $ce->{problemLibrary}->{root};
 	my %tables;
 
-       if($ce->{problemLibrary}->{version} == 2.5) {
+	if ($ce->{problemLibrary}->{version} == 2.5) {
 		%tables = %OPLtables;
-	  } else {
+	} else {
 		%tables = %NPLtables;
-	  }
+	}
 	return %tables;
 }
 
 sub getDB {
-	my $ce = shift;
+	my $ce  = shift;
 	my $dbh = DBI->connect(
 		$ce->{problemLibrary_db}->{dbsource},
 		$ce->{problemLibrary_db}->{user},
@@ -118,7 +115,7 @@ sub getDB {
 		},
 	);
 	die "Cannot connect to problem library database" unless $dbh;
-	return($dbh);
+	return ($dbh);
 }
 
 =over
@@ -129,8 +126,8 @@ Get and set tags using full path and Tagging module
 =cut
 
 sub getProblemTags {
-	my $path = shift;
-	my $tags = WeBWorK::Utils::Tags->new($path);
+	my $path  = shift;
+	my $tags  = WeBWorK::Utils::Tags->new($path);
 	my %thash = ();
 	for my $j ('DBchapter', 'DBsection', 'DBsubject', 'Level', 'Status') {
 		$thash{$j} = $tags->{$j};
@@ -140,27 +137,27 @@ sub getProblemTags {
 
 sub setProblemTags {
 	my $path = shift;
-        if (-w $path) {
-		my $subj= shift;
-		my $chap = shift;
-		my $sect = shift;
-		my $level = shift;
+	if (-w $path) {
+		my $subj   = shift;
+		my $chap   = shift;
+		my $sect   = shift;
+		my $level  = shift;
 		my $status = shift || 0;
-		my $tags = WeBWorK::Utils::Tags->new($path);
-		$tags->settag('DBsubject', $subj, 1);
-		$tags->settag('DBchapter', $chap, 1);
-		$tags->settag('DBsection', $sect, 1);
-		$tags->settag('Level', $level, 1);
-		$tags->settag('Status', $status, 1);
+		my $tags   = WeBWorK::Utils::Tags->new($path);
+		$tags->settag('DBsubject', $subj,   1);
+		$tags->settag('DBchapter', $chap,   1);
+		$tags->settag('DBsection', $sect,   1);
+		$tags->settag('Level',     $level,  1);
+		$tags->settag('Status',    $status, 1);
 		eval {
 			$tags->write();
 			1;
 		} or do {
-			return [0, "Problem writing file"];
+			return [ 0, "Problem writing file" ];
 		};
-		return [1, "Tags written"];
-        } else {
-		return [0, "Do not have permission to write to the problem file"];
+		return [ 1, "Tags written" ];
+	} else {
+		return [ 0, "Do not have permission to write to the problem file" ];
 	}
 }
 
@@ -176,29 +173,29 @@ sub kwtidy {
 	$s =~ s/\W//g;
 	$s =~ s/_//g;
 	$s = lc($s);
-	return($s);
+	return ($s);
 }
 
 sub keywordCleaner {
 	my $string = shift;
-	my @spl1 = split /\s*,\s*/, $string;
-	my @spl2 = map(kwtidy($_), @spl1);
-	return(@spl2);
+	my @spl1   = split /\s*,\s*/, $string;
+	my @spl2   = map(kwtidy($_), @spl1);
+	return (@spl2);
 }
 
 sub makeKeywordWhere {
 	my $kwstring = shift;
-	my @kwlist = keywordCleaner($kwstring);
-#	@kwlist = map { "kw.keyword = \"$_\"" } @kwlist;
-	my @kwlistqm = map { "kw.keyword = ? " } @kwlist;
-	my $where = join(" OR ", @kwlistqm);
+	my @kwlist   = keywordCleaner($kwstring);
+	#	@kwlist = map { "kw.keyword = \"$_\"" } @kwlist;
+	my @kwlistqm = map {"kw.keyword = ? "} @kwlist;
+	my $where    = join(" OR ", @kwlistqm);
 	return "AND ( $where )", @kwlist;
 }
 
 =item getDBextras($path)
 Get flags for whether a pg file uses Math Objects, and if it is static
 
-$r is a Apache request object so we can get the right table names
+$c is a WeBWorK::Controller object so we can get the right table names
 
 $path is the path to the file
 
@@ -207,29 +204,30 @@ Output is an array reference: [MO, static]
 =cut
 
 sub getDBextras {
-	my $r = shift;
-	my $path = shift;
-	my %tables = getTables($r->ce);
-	my $dbh = getDB($r->ce);
-	my ($mo, $static)=(0,0);
+	my $c      = shift;
+	my $path   = shift;
+	my %tables = getTables($c->ce);
+	my $dbh    = getDB($c->ce);
+	my ($mo, $static) = (0, 0);
 
 	$path =~ s|^Library/||;
 	my $filename = basename $path;
 	$path = dirname $path;
-	my $query = "SELECT pgfile.MO, pgfile.static FROM `$tables{pgfile}` pgfile, `$tables{path}` p WHERE p.path=\"$path\" AND pgfile.path_id=p.path_id AND pgfile.filename=\"$filename\"";
+	my $query =
+		"SELECT pgfile.MO, pgfile.static FROM `$tables{pgfile}` pgfile, `$tables{path}` p WHERE p.path=\"$path\" AND pgfile.path_id=p.path_id AND pgfile.filename=\"$filename\"";
 	my @res = $dbh->selectrow_array($query);
-	if(@res) {
-		$mo = $res[0];
+	if (@res) {
+		$mo     = $res[0];
 		$static = $res[1];
 	}
 
-	return [$mo, $static];
+	return [ $mo, $static ];
 }
 
-=item getDBTextbooks($r)
+=item getDBTextbooks($c)
 Returns textbook dependent entries.
 
-$r is a Apache request object so we can extract whatever parameters we want
+$c is a WeBWorK::Controller object so we can extract whatever parameters we want
 
 $thing is a string of either 'textbook', 'textchapter', or 'textsection' to
 specify what to return.
@@ -240,65 +238,65 @@ consistent with the DB subject, chapter, section selected.
 =cut
 
 sub getDBTextbooks {
-	my $r = shift;
-	my $thing = shift || 'textbook';
-	my $dbh = getDB($r->ce);
-	my %tables = getTables($r->ce);
+	my $c          = shift;
+	my $thing      = shift || 'textbook';
+	my $dbh        = getDB($c->ce);
+	my %tables     = getTables($c->ce);
 	my $extrawhere = '';
 	# Handle DB* restrictions
-	my @search_params=();
-	my $subj = $r->param('library_subjects') || "";
-	my $chap = $r->param('library_chapters') || "";
-	my $sec = $r->param('library_sections') || "";
-	if($subj) {
+	my @search_params = ();
+	my $subj          = $c->param('library_subjects') || "";
+	my $chap          = $c->param('library_chapters') || "";
+	my $sec           = $c->param('library_sections') || "";
+	if ($subj) {
 		$subj =~ s/'/\\'/g;
 		$extrawhere .= " AND t.name = ?\n";
 		push @search_params, $subj;
 	}
-	if($chap) {
+	if ($chap) {
 		$chap =~ s/'/\\'/g;
 		$extrawhere .= " AND c.name = ? AND c.DBsubject_id=t.DBsubject_id\n";
 		push @search_params, $chap;
 	}
-	if($sec) {
+	if ($sec) {
 		$sec =~ s/'/\\'/g;
 		$extrawhere .= " AND s.name = ? AND s.DBchapter_id = c.DBchapter_id AND s.DBsection_id=pgf.DBsection_id";
 		push @search_params, $sec;
 	}
 	my $textextrawhere = '';
-	my $textid = $r->param('library_textbook') || '';
-	if($textid and $thing ne 'textbook') {
+	my $textid         = $c->param('library_textbook') || '';
+	if ($textid and $thing ne 'textbook') {
 		$textextrawhere .= " AND tbk.textbook_id= ? ";
 		push @search_params, $textid;
 	} else {
-		return([]) if($thing ne 'textbook');
+		return ([]) if ($thing ne 'textbook');
 	}
 
-	my $textchap = $r->param('library_textchapter') || '';
+	my $textchap = $c->param('library_textchapter') || '';
 	$textchap =~ s/^\s*\d+\.\s*//;
-	if($textchap and $thing eq 'textsection') {
+	if ($textchap and $thing eq 'textsection') {
 		$textextrawhere .= " AND tc.name= ? ";
 		push @search_params, $textchap;
 	} else {
-		return([]) if($thing eq 'textsection');
+		return ([]) if ($thing eq 'textsection');
 	}
 
 	my $selectwhat = LIBRARY_STRUCTURE->{$thing}{select};
 
-# 	my $query = "SELECT DISTINCT $selectwhat
-#           FROM `$tables{textbook}` tbk, `$tables{problem}` prob,
-# 			`$tables{pgfile_problem}` pg, `$tables{pgfile}` pgf,
-#             `$tables{dbsection}` s, `$tables{dbchapter}` c, `$tables{dbsubject}` t,
-# 			`$tables{chapter}` tc, `$tables{section}` ts
-#           WHERE ts.section_id=prob.section_id AND
-#             prob.problem_id=pg.problem_id AND
-#             s.DBchapter_id=c.DBchapter_id AND
-#             c.DBsubject_id=t.DBsubject_id AND
-#             pgf.DBsection_id=s.DBsection_id AND
-#             pgf.pgfile_id=pg.pgfile_id AND
-#             ts.chapter_id=tc.chapter_id AND
-#             tc.textbook_id=tbk.textbook_id
-#             $extrawhere $textextrawhere ";
+	# 	my $query = "SELECT DISTINCT $selectwhat
+	#           FROM `$tables{textbook}` tbk, `$tables{problem}` prob,
+	# 			`$tables{pgfile_problem}` pg, `$tables{pgfile}` pgf,
+	#             `$tables{dbsection}` s, `$tables{dbchapter}` c, `$tables{dbsubject}` t,
+	# 			`$tables{chapter}` tc, `$tables{section}` ts
+	#           WHERE ts.section_id=prob.section_id AND
+	#             prob.problem_id=pg.problem_id AND
+	#             s.DBchapter_id=c.DBchapter_id AND
+	#             c.DBsubject_id=t.DBsubject_id AND
+	#             pgf.DBsection_id=s.DBsection_id AND
+	#             pgf.pgfile_id=pg.pgfile_id AND
+	#             ts.chapter_id=tc.chapter_id AND
+	#             tc.textbook_id=tbk.textbook_id
+	#             $extrawhere $textextrawhere ";
 	my $query = "SELECT DISTINCT $selectwhat
           FROM `$tables{textbook}` tbk, `$tables{problem}` prob,
 			`$tables{pgfile_problem}` pg, `$tables{pgfile}` pgf,
@@ -314,42 +312,42 @@ sub getDBTextbooks {
             tc.textbook_id=tbk.textbook_id
             $extrawhere $textextrawhere  ";
 
-#$query =~ s/\n/ /g;
-#warn "query:", $query;
-#warn "params:", join(" | ", @search_params);
-#	my $text_ref = $dbh->selectall_arrayref($query);
-    my $text_ref = $dbh->selectall_arrayref($query,{},@search_params);  #FIXME
+	#$query =~ s/\n/ /g;
+	#warn "query:", $query;
+	#warn "params:", join(" | ", @search_params);
+	#	my $text_ref = $dbh->selectall_arrayref($query);
+	my $text_ref = $dbh->selectall_arrayref($query, {}, @search_params);    #FIXME
 
 	my @texts = @{$text_ref};
-	if( $thing eq 'textbook') {
+	if ($thing eq 'textbook') {
 		@texts = grep { $_->[1] =~ /\S/ } @texts;
 		my @sortarray = map { $_->[1] . $_->[2] . $_->[3] } @texts;
-		@texts = indirectSortByName( \@sortarray, @texts );
-		return(\@texts);
+		@texts = indirectSortByName(\@sortarray, @texts);
+		return (\@texts);
 	} else {
 		@texts = grep { $_->[1] =~ /\S/ } @texts;
-		my @sortarray = map { $_->[0] .". " . $_->[1] } @texts;
-		@texts = map { [ $_ ] } @sortarray;
+		my @sortarray = map { $_->[0] . ". " . $_->[1] } @texts;
+		@texts = map { [$_] } @sortarray;
 		@texts = indirectSortByName(\@sortarray, @texts);
-		return(\@texts);
+		return (\@texts);
 	}
 }
 
-=item getAllDBsubjects($r)
+=item getAllDBsubjects($c)
 Returns an array of DBsubject names
 
-$r is the Apache request object
+$c is the WeBWorK::Controller object
 
 =cut
 
 sub getAllDBsubjects {
-	my $r = shift;
-	my %tables = getTables($r->ce);
-	my @results=();
+	my $c       = shift;
+	my %tables  = getTables($c->ce);
+	my @results = ();
 	my @row;
 	my $query = "SELECT DISTINCT name, DBsubject_id FROM `$tables{dbsubject}` ORDER BY DBsubject_id";
-	my $dbh = getDB($r->ce);
-	my $sth = $dbh->prepare($query);
+	my $dbh   = getDB($c->ce);
+	my $sth   = $dbh->prepare($query);
 	$sth->execute();
 
 	while (@row = $sth->fetchrow_array()) {
@@ -359,46 +357,45 @@ sub getAllDBsubjects {
 	return @results;
 }
 
-
-=item getAllDBchapters($r)
+=item getAllDBchapters($c)
 Returns an array of DBchapter names
 
-$r is the Apache request object
+$c is the WeBWorK::Controller object
 
 =cut
 
 sub getAllDBchapters {
-	my $r = shift;
-	my %tables = getTables($r->ce);
-	my $subject = $r->param('library_subjects');
-	return () unless($subject);
-	my $dbh = getDB($r->ce);
+	my $c       = shift;
+	my %tables  = getTables($c->ce);
+	my $subject = $c->param('library_subjects');
+	return () unless ($subject);
+	my $dbh = getDB($c->ce);
 
-	my $query = "SELECT DISTINCT c.name, c.DBchapter_id       
+	my $query = "SELECT DISTINCT c.name, c.DBchapter_id
 				FROM `$tables{dbchapter}` c,
 				`$tables{dbsubject}` t
                  WHERE c.DBsubject_id = t.DBsubject_id AND
                  t.name = ? ORDER BY c.DBchapter_id";
 	my $all_chaps_ref = $dbh->selectall_arrayref($query, {}, $subject);
- 	my @results = map { $_->[0] } @{$all_chaps_ref};
+	my @results       = map { $_->[0] } @{$all_chaps_ref};
 	return @results;
 }
 
-=item getAllDBsections($r)
+=item getAllDBsections($c)
 Returns an array of DBsection names
 
-$r is the Apache request object
+$c is the WeBWorK::Controller object
 
 =cut
 
 sub getAllDBsections {
-	my $r = shift;
-	my %tables = getTables($r->ce);
-	my $subject = $r->param('library_subjects');
-	return () unless($subject);
-	my $chapter = $r->param('library_chapters');
-	return () unless($chapter);
-	my $dbh = getDB($r->ce);
+	my $c       = shift;
+	my %tables  = getTables($c->ce);
+	my $subject = $c->param('library_subjects');
+	return () unless ($subject);
+	my $chapter = $c->param('library_chapters');
+	return () unless ($chapter);
+	my $dbh = getDB($c->ce);
 
 	my $query = "SELECT DISTINCT s.name, s.DBsection_id
                  FROM `$tables{dbsection}` s,
@@ -407,47 +404,47 @@ sub getAllDBsections {
                  c.DBsubject_id = t.DBsubject_id AND
                  t.name = ? AND c.name = ? ORDER BY s.DBsection_id";
 	my $all_sections_ref = $dbh->selectall_arrayref($query, {}, $subject, $chapter);
-	my @results = map { $_->[0] } @{$all_sections_ref};
+	my @results          = map { $_->[0] } @{$all_sections_ref};
 	return @results;
 }
 
-=item getDBListings($r)
+=item getDBListings($c)
 Returns an array of hash references with the keys: path, filename.
 
-$r is an Apache request object that has all needed data inside of it
+$c is a WeBWorK::Controller object that has all needed data inside of it
 
 Here, we search on all known fields out of r
 
 =cut
 
 sub getDBListings {
-	my $r = shift;
-	my $amcounter = shift;  # 0-1 if I am a counter.
-	my $ce = $r->ce;
-	my %tables = getTables($ce);
-	my $subj = $r->param('library_subjects') || "";
-	my $chap = $r->param('library_chapters') || "";
-	my $sec = $r->param('library_sections') || "";
-	my $include_opl = $r->param('includeOPL') // 1;
-	my $include_contrib = $r->param('includeContrib') // 0;
+	my $c               = shift;
+	my $amcounter       = shift;            # 0-1 if I am a counter.
+	my $ce              = $c->ce;
+	my %tables          = getTables($ce);
+	my $subj            = $c->param('library_subjects') || "";
+	my $chap            = $c->param('library_chapters') || "";
+	my $sec             = $c->param('library_sections') || "";
+	my $include_opl     = $c->param('includeOPL')     // 1;
+	my $include_contrib = $c->param('includeContrib') // 0;
 
 	# Make sure these strings are internally encoded in UTF-8
 	utf8::upgrade($subj);
 	utf8::upgrade($chap);
 	utf8::upgrade($sec);
 
-	my $keywords = $r->param('library_keywords') || "";
+	my $keywords = $c->param('library_keywords') || "";
 	# Next could be an array, an array reference, or nothing
-	my @levels = $r->param('level');
-	if(scalar(@levels) == 1 and ref($levels[0]) eq 'ARRAY') {
-		@levels = @{$levels[0]};
+	my @levels = $c->param('level');
+	if (scalar(@levels) == 1 and ref($levels[0]) eq 'ARRAY') {
+		@levels = @{ $levels[0] };
 	}
 	@levels = grep { defined($_) && m/\S/ } @levels;
-	my ($kw1, $kw2) = ('','');
+	my ($kw1, $kw2) = ('', '');
 	my $keywordstring;
 	my @keyword_params;
-	if($keywords) {
-		($keywordstring, @keyword_params) = makeKeywordWhere($keywords) ;
+	if ($keywords) {
+		($keywordstring, @keyword_params) = makeKeywordWhere($keywords);
 		$kw1 = ", `$tables{keyword}` kw, `$tables{pgfile_keyword}` pgkey";
 		$kw2 = " AND kw.keyword_id=pgkey.keyword_id AND
 			 pgkey.pgfile_id=pgf.pgfile_id $keywordstring";
@@ -455,8 +452,8 @@ sub getDBListings {
 
 	my $dbh = getDB($ce);
 
-	my $extrawhere = '';
-	my @select_parameters=();
+	my $extrawhere        = '';
+	my @select_parameters = ();
 	if ($subj) {
 		$extrawhere .= " AND dbsj.name= ? ";
 		push @select_parameters, $subj;
@@ -475,16 +472,16 @@ sub getDBListings {
 	}
 	$extrawhere .= " AND pgf.libraryroot = 'Library' " unless $include_contrib;
 	$extrawhere .= " AND pgf.libraryroot = 'Contrib' " unless $include_opl;
-	my $textextrawhere = '';
-    my $haveTextInfo=0;
-    my @textInfo_parameters=();
+	my $textextrawhere      = '';
+	my $haveTextInfo        = 0;
+	my @textInfo_parameters = ();
 	for my $j (qw( textbook textchapter textsection )) {
-		my $foo = $r->param(LIBRARY_STRUCTURE->{$j}{name}) || '';
+		my $foo = $c->param(LIBRARY_STRUCTURE->{$j}{name}) || '';
 		$foo =~ s/^\s*\d+\.\s*//;
-		if($foo) {
-            $haveTextInfo=1;
+		if ($foo) {
+			$haveTextInfo = 1;
 			$foo =~ s/'/\\'/g;
-			$textextrawhere .= " AND ".LIBRARY_STRUCTURE->{$j}{where}."= ? ";
+			$textextrawhere .= " AND " . LIBRARY_STRUCTURE->{$j}{where} . "= ? ";
 			push @textInfo_parameters, $foo;
 		}
 	}
@@ -495,7 +492,7 @@ sub getDBListings {
 	my $pg_id_ref;
 
 	$dbh->do(qq{SET NAMES 'utf8mb4';}) if $ce->{ENABLE_UTF8MB4};
-	if($haveTextInfo) {
+	if ($haveTextInfo) {
 		my $query = "SELECT $selectwhat from `$tables{pgfile}` pgf,
 			`$tables{dbsection}` dbsc, `$tables{dbchapter}` dbc, `$tables{dbsubject}` dbsj,
 			`$tables{pgfile_problem}` pgp, `$tables{problem}` prob, `$tables{textbook}` tbk ,
@@ -511,7 +508,7 @@ sub getDBListings {
 				  $extrawhere $textextrawhere $kw2";
 
 		$pg_id_ref = $dbh->selectall_arrayref($query, {}, @select_parameters, @textInfo_parameters, @keyword_params);
-     } else {
+	} else {
 		my $query = "SELECT $selectwhat from `$tables{pgfile}` pgf,
 			 `$tables{dbsection}` dbsc, `$tables{dbchapter}` dbc, `$tables{dbsubject}` dbsj $kw1
 			WHERE dbsj.DBsubject_id = dbc.DBsubject_id AND
@@ -519,44 +516,46 @@ sub getDBListings {
 				  dbsc.DBsection_id = pgf.DBsection_id
 				  $extrawhere $kw2";
 
-     	$pg_id_ref = $dbh->selectall_arrayref($query, {}, @select_parameters, @keyword_params);
-     }
+		$pg_id_ref = $dbh->selectall_arrayref($query, {}, @select_parameters, @keyword_params);
+	}
 
 	my @pg_ids = map { $_->[0] } @{$pg_id_ref};
-	return(@pg_ids[0]) if ($amcounter);
+	return (@pg_ids[0]) if ($amcounter);
 
 	my @results = ();
 	for my $pgid (@pg_ids) {
-		my $query = "SELECT libraryroot, path, filename, morelt_id, pgfile_id, static, MO FROM `$tables{pgfile}` pgf, `$tables{path}` p
+		my $query =
+			"SELECT libraryroot, path, filename, morelt_id, pgfile_id, static, MO FROM `$tables{pgfile}` pgf, `$tables{path}` p
           WHERE p.path_id = pgf.path_id AND pgf.pgfile_id= ? ";
 		my $row = $dbh->selectrow_arrayref($query, {}, $pgid);
 
-		push @results, {
-			'libraryroot' => $row->[0],
-			'path'        => $row->[1],
-			'filename'    => $row->[2],
-			'morelt'      => $row->[3],
-			'pgid'        => $row->[4],
-			'static'      => $row->[5],
-			'MO'          => $row->[6],
-		};
+		push @results,
+			{
+				'libraryroot' => $row->[0],
+				'path'        => $row->[1],
+				'filename'    => $row->[2],
+				'morelt'      => $row->[3],
+				'pgid'        => $row->[4],
+				'static'      => $row->[5],
+				'MO'          => $row->[6],
+			};
 
 	}
 	return @results;
 }
 
 sub countDBListings {
-	my $r = shift;
-	return (getDBListings($r,1));
+	my $c = shift;
+	return (getDBListings($c, 1));
 }
 
 sub getMLTleader {
-	my $r = shift;
-	my $mltid = shift;
-	my %tables = getTables($r->ce);
-	my $dbh = getDB($r->ce);
-	my $query = "SELECT leader FROM `$tables{morelt}` WHERE morelt_id=\"$mltid\"";
-	my $row = $dbh->selectrow_arrayref($query);
+	my $c      = shift;
+	my $mltid  = shift;
+	my %tables = getTables($c->ce);
+	my $dbh    = getDB($c->ce);
+	my $query  = "SELECT leader FROM `$tables{morelt}` WHERE morelt_id=\"$mltid\"";
+	my $row    = $dbh->selectrow_arrayref($query);
 	return $row->[0];
 }
 
@@ -564,36 +563,36 @@ sub getMLTleader {
 # input chapter, section
 # returns an array of hash references.
 # if section is omitted, get all from the chapter
-sub getSectionListings	{
+sub getSectionListings {
 	# TODO: eliminate this subroutine after deprecating OPLv1
-	my $r = shift;
-	my $ce = $r->ce;
+	my $c       = shift;
+	my $ce      = $c->ce;
 	my $version = $ce->{problemLibrary}->{version} || 1;
-	if($version => 2) { return(getDBListings($r, 0))}
-	my $subj = $r->param('library_subjects') || "";
-	my $chap = $r->param('library_chapters') || "";
-	my $sec = $r->param('library_sections') || "";
+	if ($version => 2) { return (getDBListings($c, 0)) }
+	my $subj = $c->param('library_subjects') || "";
+	my $chap = $c->param('library_chapters') || "";
+	my $sec  = $c->param('library_sections') || "";
 
 	my $chapstring = '';
-	if($chap) {
+	if ($chap) {
 		$chap =~ s/'/\\'/g;
 		$chapstring = " c.chapter = \'$chap\' AND ";
 	}
 	my $secstring = '';
-	if($sec) {
+	if ($sec) {
 		$sec =~ s/'/\\'/g;
 		$secstring = " c.section = \'$sec\' AND ";
 	}
 
-	my @results; #returned
-    my $query = "SELECT c.*, p.path
+	my @results;    #returned
+	my $query = "SELECT c.*, p.path
 	FROM classify c, pgfiles p
 	WHERE ? ? c.pgfiles_id = p.pgfiles_id";
-	my $dbh = getDB($ce);
+	my $dbh    = getDB($ce);
 	my %tables = getTables($ce);
-	my $sth = $dbh->prepare($query);
+	my $sth    = $dbh->prepare($query);
 
-	$sth->execute($chapstring,$secstring);
+	$sth->execute($chapstring, $secstring);
 
 	while (my $row = $sth->fetchrow_hashref) {
 		push @results, $row;
@@ -609,35 +608,32 @@ sub getSectionListings	{
 #
 # not implemented yet
 sub deleteListing {
-	my $ce = shift;
+	my $ce         = shift;
 	my $listing_id = shift;
 	#print STDERR "ListingDB::deleteListing(): listing == '$listing_id'\n";
 
-	my $dbh = getDB($ce);
+	my $dbh    = getDB($ce);
 	my %tables = getTables($ce);
 
 	return undef;
 }
 
-
 # Use sortByName($aref, @b) to sort list @b using parallel list @a.
 # Here, $aref is a reference to the array @a
 
 sub indirectSortByName {
-	my $aref = shift ;
-	my @a = @$aref;
-	my @b = @_;
-	my %pairs ;
-	for my $j (1..scalar(@a)) {
-		$pairs{$a[$j-1]} = $b[$j-1];
+	my $aref = shift;
+	my @a    = @$aref;
+	my @b    = @_;
+	my %pairs;
+	for my $j (1 .. scalar(@a)) {
+		$pairs{ $a[ $j - 1 ] } = $b[ $j - 1 ];
 	}
 	my @list = sortByName(undef, @a);
 	@list = map { $pairs{$_} } @list;
-	return(@list);
+	return (@list);
 }
 
-
-
 ##############################################################################
 1;
 
diff --git a/lib/WeBWorK/Utils/PODParser.pm b/lib/WeBWorK/Utils/PODParser.pm
new file mode 100644
index 0000000000..f6c3885097
--- /dev/null
+++ b/lib/WeBWorK/Utils/PODParser.pm
@@ -0,0 +1,81 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Utils::PODParser;
+use parent qw(Pod::Simple::XHTML);
+
+use strict;
+use warnings;
+
+use Pod::Simple::XHTML;
+use File::Basename qw(basename);
+
+# $podFiles must be provided in order for pod links to local files to work.  It should be the
+# first return value of the POD::Simple::Search survey method.
+sub new {
+	my ($invocant, $podFiles) = @_;
+	my $class = ref $invocant || $invocant;
+	my $self  = $class->SUPER::new(@_);
+	$self->perldoc_url_prefix("https://metacpan.org/pod/");
+	$self->index(1);
+	$self->backlink(1);
+	$self->html_charset('UTF-8');
+	$self->{podFiles} = $podFiles // {};
+	return bless $self, $class;
+}
+
+# Attempt to resolve links to local files.  If a local file is not found, then
+# let Pod::Simple::XHTML resolve to a cpan link.
+sub resolve_pod_page_link {
+	my ($self, $target, $section) = @_;
+
+	unless (defined $target) {
+		print "Using internal page link.\n" if $self->{verbose} > 2;
+		return $self->SUPER::resolve_pod_page_link($target, $section);
+	}
+
+	my $podFound;
+	for (keys %{ $self->{podFiles} }) {
+		if ($target eq $_ =~ s/lib:://r || $target eq basename($self->{podFiles}{$_}) =~ s/\.pod$//r) {
+			$podFound =
+				$self->{assert_html_ext} ? ($self->{podFiles}{$_} =~ s/\.(pm|pl|pod)$/.html/r) : $self->{podFiles}{$_};
+			last;
+		}
+	}
+
+	if ($podFound) {
+		my $pod_url = $self->encode_entities($podFound =~ s/^$self->{source_root}/$self->{base_url}/r)
+			. ($section ? '#' . $self->idify($self->encode_entities($section), 1) : '');
+		print "Resolved local pod link for $target" . ($section ? "/$section" : '') . " to $pod_url\n"
+			if $self->{verbose} > 2;
+		return $pod_url;
+	}
+
+	print "Using cpan pod link for $target" . ($section ? "/$section" : '') . "\n" if $self->{verbose} > 2;
+	return $self->SUPER::resolve_pod_page_link($target, $section);
+}
+
+# Trim spaces from the beginning of each line in code blocks.  This attempts to
+# trim spaces from all lines in the code block in the same amount as there are
+# spaces at the beginning of the first line. Note that Pod::Simple::XHTML has
+# already converted tab characters into 8 spaces.
+sub handle_code {
+	my ($self, $code) = @_;
+	my $start_spaces = length(($code =~ /^( *)/)[0]) || '';
+	$self->SUPER::handle_code($code =~ s/^( {1,$start_spaces})//gmr);
+	return;
+}
+
+1;
diff --git a/lib/WeBWorK/Utils/ProblemProcessing.pm b/lib/WeBWorK/Utils/ProblemProcessing.pm
new file mode 100644
index 0000000000..7f6fe132ed
--- /dev/null
+++ b/lib/WeBWorK/Utils/ProblemProcessing.pm
@@ -0,0 +1,498 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Utils::ProblemProcessing;
+use Mojo::Base 'Exporter', -signatures, -async_await;
+
+=head1 NAME
+
+WeBWorK::Utils::ProblemProcessing - contains subroutines for generating output
+for the problem pages, especially those generated by Problem.pm.
+
+=cut
+
+use Mojo::JSON qw(encode_json);
+use Email::Stuffer;
+use Try::Tiny;
+use Mojo::JSON qw(encode_json decode_json);
+
+use WeBWorK::Debug;
+use WeBWorK::Utils qw(writeLog writeCourseLogGivenTime encodeAnswers before after jitar_problem_adjusted_status
+	jitar_id_to_seq createEmailSenderTransportSMTP);
+use WeBWorK::Authen::LTIAdvanced::SubmitGrade;
+use WeBWorK::Authen::LTIAdvantage::SubmitGrade;
+
+use Caliper::Sensor;
+use Caliper::Entity;
+
+our @EXPORT_OK = qw(
+	process_and_log_answer
+	compute_reduced_score
+	create_ans_str_from_responses
+	jitar_send_warning_email
+);
+
+# Performs functions of processing and recording the answer given in the page.
+# Returns the appropriate scoreRecordedMessage.
+# Note that $c must be a WeBWorK::ContentGenerator object whose associated route is parented by the set_list route.
+# In addition $c must have the neccessary hash data values set for this method.
+# Those are 'will', 'problem', 'pg', and 'set'.
+async sub process_and_log_answer ($c) {
+	my $ce            = $c->ce;
+	my $db            = $c->db;
+	my $effectiveUser = $c->param('effectiveUser');
+	my $authz         = $c->authz;
+
+	my %will          = %{ $c->{will} };
+	my $submitAnswers = $c->{submitAnswers};
+	my $problem       = $c->{problem};
+	my $pg            = $c->{pg};
+	my $set           = $c->{set};
+	my $courseID      = $c->stash('courseID');
+
+	# logging student answers
+	my $pureProblem = $db->getUserProblem($problem->user_id, $problem->set_id, $problem->problem_id);
+	my $answer_log  = $ce->{courseFiles}{logs}{answer_log};
+
+	# Transfer persistent problem data from the PERSISTENCE_HASH:
+	# - Get keys to update first, to avoid extra work when no updates
+	#   are needed. When none, we avoid the need to decode/encode JSON,
+	#   or to save the pureProblem.
+	# - We are assuming that there is no need to DELETE old
+	#   persistent data if the hash is empty, even if in
+	#   potential there may be some data already in the database.
+	if (defined($pureProblem)) {
+		my @persistent_data_keys = keys %{ $pg->{PERSISTENCE_HASH_UPDATED} };
+		if (@persistent_data_keys) {
+			my $json_data = decode_json($pureProblem->{problem_data} || '{}');
+			for my $key (@persistent_data_keys) {
+				$json_data->{$key} = $pg->{PERSISTENCE_HASH}{$key};
+			}
+			$pureProblem->problem_data(encode_json($json_data));
+			if (!$submitAnswers) {    # would not be saved below
+				$db->putUserProblem($pureProblem);
+			}
+		}
+	}
+
+	my ($encoded_last_answer_string, $scores2, $answer_types_string);
+	my $scoreRecordedMessage = '';
+
+	if (defined($answer_log) && defined($pureProblem) && $submitAnswers) {
+		my $past_answers_string;
+		($past_answers_string, $encoded_last_answer_string, $scores2, $answer_types_string) =
+			create_ans_str_from_responses($c, $pg);
+
+		if (!$authz->hasPermissions($effectiveUser, 'dont_log_past_answers')) {
+			# Use the time the submission processing began, but must convert the
+			# floating point value from Time::HiRes to an integer for use below.
+			# Truncate towards 0 intentionally, so the integer value set is never
+			# larger than the original floating point value.
+			my $timestamp = int($c->submitTime);
+
+			# store in answer_log
+			writeCourseLogGivenTime(
+				$ce,
+				'answer_log',
+				$timestamp,
+				join('',
+					'|', $problem->user_id, '|',  $problem->set_id, '|',  $problem->problem_id,
+					'|', $scores2,          "\t", $timestamp,       "\t", $past_answers_string,
+				),
+			);
+
+			# add to PastAnswer db
+			my $pastAnswer = $db->newPastAnswer();
+			$pastAnswer->course_id($courseID);
+			$pastAnswer->user_id($problem->user_id);
+			$pastAnswer->set_id($problem->set_id);
+			$pastAnswer->problem_id($problem->problem_id);
+			$pastAnswer->timestamp($timestamp);
+			$pastAnswer->scores($scores2);
+			$pastAnswer->answer_string($past_answers_string);
+			$pastAnswer->source_file($problem->source_file);
+			$db->addPastAnswer($pastAnswer);
+		}
+	}
+
+	# Process any writing of external data
+	process_external_data($c);
+
+	# this stores previous answers to the problem to provide "sticky answers"
+	if ($submitAnswers) {
+		if (defined $pureProblem) {
+			# store answers in DB for sticky answers
+			my %answersToStore;
+
+			# store last answer to database for use in "sticky" answers
+			$problem->last_answer($encoded_last_answer_string);
+			$pureProblem->last_answer($encoded_last_answer_string);
+
+			# store state in DB if it makes sense
+			if ($will{recordAnswers}) {
+				my $score =
+					compute_reduced_score($ce, $problem, $set, $pg->{state}{recorded_score}, $c->submitTime);
+				$problem->status($score) if $score > $problem->status;
+
+				$problem->sub_status($problem->status)
+					if (!$c->ce->{pg}{ansEvalDefaults}{enableReducedScoring}
+						|| !$set->enable_reduced_scoring
+						|| before($set->reduced_scoring_date, $c->submitTime));
+
+				$problem->attempted(1);
+				$problem->num_correct($pg->{state}{num_of_correct_ans});
+				$problem->num_incorrect($pg->{state}{num_of_incorrect_ans});
+
+				$pureProblem->status($problem->status);
+				$pureProblem->sub_status($problem->sub_status);
+				$pureProblem->attempted(1);
+				$pureProblem->num_correct($pg->{state}{num_of_correct_ans});
+				$pureProblem->num_incorrect($pg->{state}{num_of_incorrect_ans});
+
+				# Add flags which are really a comma separated list of answer types.  If its an essay question and the
+				# user is submitting an answer then there could be potential changes. So the problem is also flagged as
+				# needing grading by appending ":needs_grading" to the answer types.
+				$pureProblem->flags($answer_types_string . ($answer_types_string =~ /essay/ ? ':needs_grading' : ''));
+
+				if ($db->putUserProblem($pureProblem)) {
+					$scoreRecordedMessage = $c->maketext('Your score was recorded.');
+				} else {
+					$scoreRecordedMessage = $c->maketext('Your score was not recorded because there was a failure '
+							. 'in storing the problem record to the database.');
+				}
+				# write to the transaction log, just to make sure
+				writeLog($ce, 'transaction',
+					$problem->problem_id . "\t"
+						. $problem->set_id . "\t"
+						. $problem->user_id . "\t"
+						. $problem->source_file . "\t"
+						. $problem->value . "\t"
+						. $problem->max_attempts . "\t"
+						. $problem->problem_seed . "\t"
+						. $pureProblem->status . "\t"
+						. $pureProblem->attempted . "\t"
+						. $pureProblem->last_answer . "\t"
+						. $pureProblem->num_correct . "\t"
+						. $pureProblem->num_incorrect);
+
+				if ($ce->{caliper}{enabled}
+					&& defined($answer_log)
+					&& !$authz->hasPermissions($effectiveUser, 'dont_log_past_answers'))
+				{
+					my $caliper_sensor = Caliper::Sensor->new($ce);
+					my $startTime      = $c->param('startTime');
+					my $endTime        = time();
+
+					my $completed_question_event = {
+						type    => 'AssessmentItemEvent',
+						action  => 'Completed',
+						profile => 'AssessmentProfile',
+						object  => Caliper::Entity::problem_user(
+							$ce,
+							$db,
+							$problem->set_id(),
+							0,    #version is 0 for non-gateway problems
+							$problem->problem_id(),
+							$problem->user_id(),
+							$pg
+						),
+						generated => Caliper::Entity::answer(
+							$ce,
+							$db,
+							$problem->set_id(),
+							0,    #version is 0 for non-gateway problems
+							$problem->problem_id(),
+							$problem->user_id(),
+							$pg,
+							$startTime,
+							$endTime
+						),
+					};
+					my $submitted_set_event = {
+						type      => 'AssessmentEvent',
+						action    => 'Submitted',
+						profile   => 'AssessmentProfile',
+						object    => Caliper::Entity::problem_set($ce, $db, $problem->set_id()),
+						generated => Caliper::Entity::problem_set_attempt(
+							$ce,
+							$db,
+							$problem->set_id(),
+							0,    #version is 0 for non-gateway problems
+							$problem->user_id(),
+							$startTime,
+							$endTime
+						),
+					};
+					my $tool_use_event = {
+						type    => 'ToolUseEvent',
+						action  => 'Used',
+						profile => 'ToolUseProfile',
+						object  => Caliper::Entity::webwork_app(),
+					};
+					$caliper_sensor->sendEvents($c,
+						[ $completed_question_event, $submitted_set_event, $tool_use_event ]);
+
+					# reset start time
+					$c->param('startTime', '');
+				}
+
+				my $LTIGradeResult = -1;
+
+				# Try to update the student score on the LMS if that option is enabled.
+				if ($ce->{LTIGradeMode} && $ce->{LTIGradeOnSubmit}) {
+					$LTIGradeResult = 0;
+					my $grader = $ce->{LTI}{ $ce->{LTIVersion} }{grader}->new($c);
+					if ($ce->{LTIGradeMode} eq 'course') {
+						$LTIGradeResult = await $grader->submit_course_grade($problem->user_id);
+					} elsif ($ce->{LTIGradeMode} eq 'homework') {
+						$LTIGradeResult = await $grader->submit_set_grade($problem->user_id, $problem->set_id);
+					}
+				}
+
+				if ($LTIGradeResult == 0) {
+					$scoreRecordedMessage .=
+						$c->tag('br') . $c->maketext('Your score was not successfully sent to the LMS.');
+				} elsif ($LTIGradeResult > 0) {
+					$scoreRecordedMessage .=
+						$c->tag('br') . $c->maketext('Your score was successfully sent to the LMS.');
+				}
+			} else {
+				# The "sticky" answers get saved here when $will{recordAnswers} is false
+				$db->putUserProblem($pureProblem);
+				if (before($set->open_date, $c->submitTime) || after($set->due_date, $c->submitTime)) {
+					$scoreRecordedMessage .=
+						$c->maketext('Your score was not recorded because this homework set is closed.');
+				} else {
+					$scoreRecordedMessage .= $c->maketext('Your score was not recorded.');
+				}
+			}
+		} else {
+			$scoreRecordedMessage =
+				$c->maketext('Your score was not recorded because this problem has not been assigned to you.');
+		}
+	}
+
+	$c->{scoreRecordedMessage} = $scoreRecordedMessage;
+	return $scoreRecordedMessage;
+}
+
+# Determines if a set is in the reduced scoring period, and if so returns the reduced score.
+# Otherwise it returns the unadjusted score.
+sub compute_reduced_score ($ce, $problem, $set, $score, $submitTime) {
+	# If no adjustments need to be applied, return the full score.
+	if (!$ce->{pg}{ansEvalDefaults}{enableReducedScoring}
+		|| !$set->enable_reduced_scoring
+		|| !$set->reduced_scoring_date
+		|| $set->reduced_scoring_date == $set->due_date
+		|| before($set->reduced_scoring_date, $submitTime)
+		|| $score <= $problem->sub_status)
+	{
+		return $score;
+	}
+
+	# Return the reduced score.
+	return $problem->sub_status + $ce->{pg}{ansEvalDefaults}{reducedScoringValue} * ($score - $problem->sub_status);
+}
+
+# create answer string from responses hash
+# ($past_answers_string, $encoded_last_answer_string, $scores, $answer_types_string)
+#     = create_ans_str_from_responses($problem, $pg)
+#
+# input: $problem - a 'WeBWorK::ContentGenerator::Problem object that has $problem->{formFields} set to a hash
+#                   containing the appropriate data.
+#        $pg      - a 'WeBWorK::PG' object
+# output:  (str, str, str, bool)
+#
+# The extra persistence objects do need to be included in problem->last_answer
+# in order to keep those objects persistent -- as long as RECORD_FORM_ANSWER
+# is used to preserve objects by piggy backing on the persistence mechanism for answers.
+sub create_ans_str_from_responses ($problem, $pg) {
+	my $scores2 = '';
+	my @answerTypes;
+	my %answers_to_store;
+	my @past_answers_order;
+	my @last_answer_order;
+
+	my %pg_answers_hash = %{ $pg->{PG_ANSWERS_HASH} };
+	foreach my $ans_id (@{ $pg->{flags}{ANSWER_ENTRY_ORDER} // [] }) {
+		$scores2 .= ($pg_answers_hash{$ans_id}{rh_ans}{score} // 0) >= 1 ? "1" : "0";
+		push @answerTypes, $pg_answers_hash{$ans_id}{rh_ans}{type} // '';
+		foreach my $response_id (@{ $pg_answers_hash{$ans_id}{response_obj}{response_order} }) {
+			$answers_to_store{$response_id} = $problem->{formFields}{$response_id};
+			push @past_answers_order, $response_id;
+			push @last_answer_order,  $response_id;
+		}
+	}
+	# KEPT_EXTRA_ANSWERS needs to be stored in last_answer in order to preserve persistence items.
+	# The persistence items do not need to be stored in past_answers_string.
+	# Don't add _ext_data items.  Those are stored elsewhere.
+	foreach my $entry_id (@{ $pg->{flags}{KEPT_EXTRA_ANSWERS} }) {
+		next if exists($answers_to_store{$entry_id}) || $entry_id =~ /^_ext_data/;
+		$answers_to_store{$entry_id} = $problem->{formFields}{$entry_id};
+		push @last_answer_order, $entry_id;
+	}
+
+	my $past_answers_string = join(
+		"\t",
+		map {
+			ref($answers_to_store{$_}) eq 'ARRAY'
+				? join('&#9070;', @{ $answers_to_store{$_} })
+				: ($answers_to_store{$_} // '')
+		} @past_answers_order
+	);
+
+	my $encoded_last_answer_string = encodeAnswers(%answers_to_store, @last_answer_order);
+	# past_answers_string is stored in past_answer table.
+	# encoded_last_answer_string is used in `last_answer` entry of the problem_user table.
+	return ($past_answers_string, $encoded_last_answer_string, $scores2, join(',', @answerTypes));
+}
+
+# If you provide this subroutine with a userProblem it will notify the instructors of the course that the student has
+# finished the problem, and its children, and did not get 100%.
+# Note that $c must be a WeBWorK::ContentGenerator object whose associated route is parented by the set_list route.
+sub jitar_send_warning_email ($c, $userProblem) {
+	my $ce        = $c->ce;
+	my $db        = $c->db;
+	my $authz     = $c->authz;
+	my $courseID  = $c->stash('courseID');
+	my $userID    = $userProblem->user_id;
+	my $setID     = $userProblem->set_id;
+	my $problemID = $userProblem->problem_id;
+
+	my $status = jitar_problem_adjusted_status($userProblem, $c->db);
+	$status = eval { sprintf('%.0f%%', $status * 100) };    # round to whole number
+
+	my $user = $db->getUser($userID);
+
+	debug("Couldn't get user $userID from database") unless $user;
+
+	my $emailableURL =
+		$c->systemLink($c->url_for, params => { effectiveUser => $userID }, use_abs_url => 1, authen => 0);
+
+	my @recipients = $c->fetchEmailRecipients('score_sets', $user);
+	# send to all users with permission to score_sets and an email address
+
+	my $sender;
+	if ($user->email_address) {
+		$sender = $user->rfc822_mailbox;
+	} elsif ($user->full_name) {
+		$sender = $user->full_name;
+	} else {
+		$sender = $userID;
+	}
+
+	$problemID = join('.', jitar_id_to_seq($problemID));
+
+	my %subject_map = (
+		'c' => $courseID,
+		'u' => $userID,
+		's' => $setID,
+		'p' => $problemID,
+		'x' => $user->section,
+		'r' => $user->recitation,
+		'%' => '%',
+	);
+	my $chars   = join('', keys %subject_map);
+	my $subject = $ce->{mail}{feedbackSubjectFormat}
+		|| 'WeBWorK question from %c: %u set %s/prob %p';    # default if not entered
+	$subject =~ s/%([$chars])/defined $subject_map{$1} ? $subject_map{$1} : ""/eg;
+
+	my $full_name     = $user->full_name;
+	my $email_address = $user->email_address;
+	my $student_id    = $user->student_id;
+	my $section       = $user->section;
+	my $recitation    = $user->recitation;
+	my $comment       = $user->comment;
+
+	# print message
+	my $msg = qq/
+This  message was automatically generated by WeBWorK.
+
+User $full_name ($userID) has not sucessfully completed the review for problem $problemID in set $setID.
+Their final adjusted score on the problem is $status.
+
+Click this link to visit the problem: $emailableURL
+
+User ID:    $userID
+Name:       $full_name
+Email:      $email_address
+Student ID: $student_id
+Section:    $section
+Recitation: $recitation
+Comment:    $comment
+/;
+
+	my $email = Email::Stuffer->to(join(',', @recipients))->from($sender)->subject($subject)->text_body($msg);
+
+	# Extra headers
+	$email->header('X-WeBWorK-Course: ', $courseID) if defined $courseID;
+	if ($user) {
+		$email->header('X-WeBWorK-User: ',       $user->user_id);
+		$email->header('X-WeBWorK-Section: ',    $user->section);
+		$email->header('X-WeBWorK-Recitation: ', $user->recitation);
+	}
+	$email->header('X-WeBWorK-Set: ',     $setID)     if defined $setID;
+	$email->header('X-WeBWorK-Problem: ', $problemID) if defined $problemID;
+
+	# $ce->{mail}{set_return_path} is the address used to report returned email if defined and non empty.  It is an
+	# argument used in sendmail() (aka Email::Stuffer::send_or_die).  For arcane historical reasons sendmail actually
+	# sets the field "MAIL FROM" and the smtp server then uses that to set "Return-Path".
+	# references:
+	#  https://stackoverflow.com/questions/1235534/what-is-the-behavior-difference-between-return-path-reply-to-and-from
+	#  https://metacpan.org/pod/Email::Sender::Manual::QuickStart#envelope-information
+	try {
+		$email->send_or_die({
+			transport => createEmailSenderTransportSMTP($ce),
+			$ce->{mail}{set_return_path} ? (from => $ce->{mail}{set_return_path}) : ()
+		});
+		debug('Successfully sent JITAR alert message');
+	} catch {
+		$c->log->error("Failed to send JITAR alert message: $_");
+	};
+
+	return '';
+}
+
+# If a problem uses external data, save it to the database.
+sub process_external_data {
+	my $c       = shift;
+	my $db      = $c->db;
+	my $pg      = $c->{pg};
+	my $problem = $c->{problem};
+
+	return unless $c->{submitAnswers};
+
+	# Find the _ext_data answers.  If there aren't any, then return.
+	my @ext_data = grep {/^_ext_data/} @{ $pg->{flags}{KEPT_EXTRA_ANSWERS} };
+	return unless @ext_data;
+
+	my $user_set  = $db->getUserSet($problem->user_id, $problem->set_id);
+	my $json_data = decode_json($user_set->{external_data} || '{}');
+
+	for (@ext_data) {
+		my ($t, $ans_name, $key) = split(/:/, $_);
+
+		next if $pg->{PG_ANSWERS_HASH}{$ans_name}{rh_ans}{score} == 0;
+
+		$json_data->{$key} = $pg->{PG_ANSWERS_HASH}{$ans_name}{rh_ans}{student_value};
+	}
+
+	$user_set->external_data(encode_json($json_data));
+	$db->putUserSet($user_set);
+
+	return;
+}
+
+1;
diff --git a/lib/WeBWorK/Utils/Rendering.pm b/lib/WeBWorK/Utils/Rendering.pm
new file mode 100644
index 0000000000..b80c6c96c4
--- /dev/null
+++ b/lib/WeBWorK/Utils/Rendering.pm
@@ -0,0 +1,279 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Utils::Rendering;
+use Mojo::Base 'Exporter', -signatures;
+
+=head1 NAME
+
+WeBWorK::Utils::Rendering - utilities for rendering problems.
+
+=cut
+
+use Mojo::IOLoop;
+use Mojo::JSON qw(decode_json);
+use Data::Structure::Util qw(unbless);
+
+use WeBWorK::Utils qw(formatDateTime);
+
+our @EXPORT_OK = qw(constructPGOptions getTranslatorDebuggingOptions renderPG);
+
+=head1 constructPGOptions
+
+This method requires a course environment, user, set, problem, psvn, form
+fields, and translation options. It constructs the options to pass to the
+WeBWorK::PG constructor in the new format.  The options are roughly in
+correspondence to the PG translator environment variables.
+
+=cut
+
+sub constructPGOptions ($ce, $user, $set, $problem, $psvn, $formFields, $translationOptions) {
+	my %options;
+
+	# Problem information
+	$options{psvn} = $psvn // $set->psvn;
+
+	# If a problemUUID is provided in the form fields, then that is used.  Otherwise we create one that depends on
+	# the course, user, set, and problem.  Note that it is not a true UUID, but will be converted into one by PG.
+	$options{problemUUID} = $formFields->{problemUUID}
+		|| join('-', $user->user_id, $ce->{courseName}, 'set' . $set->set_id, 'prob' . $problem->problem_id);
+
+	$options{probNum}        = $problem->problem_id;
+	$options{questionNumber} = $options{probNum};
+	$options{r_source}       = $translationOptions->{r_source};
+	$options{sourceFilePath} = $problem->source_file;
+	$options{problemSeed}    = $problem->problem_seed;
+
+	# Display information
+	$options{displayMode}        = $translationOptions->{displayMode};
+	$options{showHints}          = $translationOptions->{showHints};
+	$options{showSolutions}      = $translationOptions->{showSolutions};
+	$options{forceScaffoldsOpen} = $translationOptions->{forceScaffoldsOpen};
+	$options{setOpen}            = time > $set->open_date;
+	$options{pastDue}            = time > $set->due_date;
+	$options{answersAvailable}   = time > $set->answer_date;
+	$options{refreshMath2img}    = $translationOptions->{refreshMath2img};
+
+	# Default values for evaluating answers
+	$options{ansEvalDefaults} = $ce->{pg}{ansEvalDefaults};
+
+	# Dates are passed in for set headers.
+	for my $date (qw(openDate dueDate answerDate)) {
+		my $db_date = $date =~ s/D/_d/r;
+		$options{$date} = $set->$db_date;
+		$options{ 'formatted' . ucfirst($date) } = formatDateTime($options{$date}, $ce->{siteDefaults}{timezone});
+		my $uc_date = ucfirst($date);
+		for (
+			[ 'DayOfWeek',       '%A' ],
+			[ 'DayOfWeekAbbrev', '%a' ],
+			[ 'Day',             '%d' ],
+			[ 'MonthNumber',     '%m' ],
+			[ 'MonthWord',       '%B' ],
+			[ 'MonthAbbrev',     '%b' ],
+			[ 'Year2Digit',      '%y' ],
+			[ 'Year4Digit',      '%Y' ],
+			[ 'Hour12',          '%I' ],
+			[ 'Hour24',          '%H' ],
+			[ 'Minute',          '%M' ],
+			[ 'AMPM',            '%P' ],
+			[ 'TimeZone',        '%Z' ],
+			[ 'Time12',          '%I:%M%P' ],
+			[ 'Time24',          '%R' ],
+			)
+		{
+			$options{"$uc_date$_->[0]"} =
+				formatDateTime($options{$date}, $ce->{siteDefaults}{timezone}, $_->[1], $ce->{siteDefaults}{locale});
+		}
+	}
+	$options{reducedScoringDate}          = $set->reduced_scoring_date;
+	$options{formattedReducedScoringDate} = formatDateTime($options{reducedScoringDate}, $ce->{siteDefaults}{timezone});
+
+	# State Information
+	$options{numOfAttempts} =
+		($problem->num_correct || 0) + ($problem->num_incorrect || 0) + ($formFields->{submitAnswers} ? 1 : 0);
+	$options{problemValue} = $problem->value;
+	# If reduced scoring is enabled for the set and the sub_status is less than the status, then the status is the
+	# reduced score.  In that case compute the unreduced score that resulted in that reduced score to submit as the
+	# currently recorded score.
+	$options{recorded_score} =
+		($set->enable_reduced_scoring
+			&& $ce->{pg}{ansEvalDefaults}{reducedScoringValue}
+			&& defined $problem->sub_status
+			&& $problem->sub_status < $problem->status)
+		? (($problem->status - $problem->sub_status) / $ce->{pg}{ansEvalDefaults}{reducedScoringValue} +
+			$problem->sub_status)
+		: $problem->status;
+	$options{num_of_correct_ans}   = $problem->num_correct;
+	$options{num_of_incorrect_ans} = $problem->num_incorrect;
+
+	# Persistent problem data
+	$options{PERSISTENCE_HASH} = decode_json($problem->problem_data || '{}');
+
+	# Language
+	$options{language}            = $ce->{language};
+	$options{language_subroutine} = WeBWorK::Localize::getLoc($options{language});
+
+	# Student and course Information
+	$options{courseName}       = $ce->{courseName};
+	$options{sectionName}      = $user->section;
+	$options{sectionNumber}    = $options{sectionName};
+	$options{recitationName}   = $user->recitation;
+	$options{recitationNumber} = $options{recitationName};
+	$options{setDescription}   = $set->description;
+	$options{setNumber}        = $set->set_id;
+	$options{studentLogin}     = $user->user_id;
+	$options{studentName}      = $user->first_name . ' ' . $user->last_name;
+	$options{studentID}        = $user->student_id;
+
+	# Permission level of actual user (deprecated)
+	$options{permissionLevel} = $translationOptions->{permissionLevel};
+	# permission level of user assigned to this question (deprecated)
+	$options{effectivePermissionLevel} = $translationOptions->{effectivePermissionLevel};
+
+	# Replacement for permission level.  This is really all PG needs in addition to the debugging options below.
+	$options{isInstructor} = $translationOptions->{isInstructor};
+
+	# Debugging options that determine if various pieces of PG information can be shown.
+	$options{debuggingOptions} = $translationOptions->{debuggingOptions} // {};
+
+	# Answer Information
+	$options{inputs_ref}     = $formFields;
+	$options{processAnswers} = $translationOptions->{processAnswers};
+
+	# External Data
+	$options{external_data} = decode_json($set->{external_data} || '{}');
+
+	# Directories and URLs
+	$options{macrosPath}        = $ce->{pg}{directories}{macrosPath};
+	$options{htmlPath}          = $ce->{pg}{directories}{htmlPath};
+	$options{imagesPath}        = $ce->{pg}{directories}{imagesPath};
+	$options{htmlDirectory}     = "$ce->{courseDirs}{html}/";
+	$options{htmlURL}           = "$ce->{courseURLs}{html}/";
+	$options{templateDirectory} = "$ce->{courseDirs}{templates}/";
+	$options{tempDirectory}     = "$ce->{courseDirs}{html_temp}/";
+	$options{tempURL}           = "$ce->{courseURLs}{html_temp}/";
+	$options{webworkDocsURL}    = "$ce->{webworkURLs}{docs}/";
+	$options{localHelpURL}      = "$ce->{pg}{URLs}{localHelpURL}/";
+	$options{MathJaxURL}        = $ce->{webworkURLs}{MathJax};
+	$options{server_root_url}   = $ce->{server_root_url} || '';
+
+	$options{use_site_prefix}   = $translationOptions->{use_site_prefix};
+	$options{use_opaque_prefix} = $translationOptions->{use_opaque_prefix};
+
+	$options{answerPrefix}   = $translationOptions->{QUIZ_PREFIX} // '';    # used by quizzes
+	$options{grader}         = $ce->{pg}{options}{grader};
+	$options{useMathQuill}   = $translationOptions->{useMathQuill};
+	$options{useMathView}    = $translationOptions->{useMathView};
+	$options{mathViewLocale} = $ce->{pg}{options}{mathViewLocale};
+
+	$options{__files__} = {
+		root => $ce->{webworkDirs}{root},        # used to shorten filenames
+		pg   => $ce->{pg}{directories}{root},    # ditto
+		tmpl => $ce->{courseDirs}{templates},    # ditto
+	};
+
+	# Variables for interpreting capa problems and other things to be seen in a pg file.
+	$options{specialPGEnvironmentVars} = $ce->{pg}{specialPGEnvironmentVars};
+
+	return %options;
+}
+
+=head1 getTranslatorDebuggingOptions
+
+This method requires an $authz and a $userName, and converts permissions into
+the corresponding PG debugging environment variable.
+
+=cut
+
+# Set translator debugging options for the user.
+sub getTranslatorDebuggingOptions ($authz, $userName) {
+	return {
+		map { $_ => $authz->hasPermissions($userName, $_) }
+			qw(
+			show_resource_info
+			view_problem_debugging_info
+			show_pg_info
+			show_answer_hash_info
+			show_answer_group_info
+			)
+	};
+}
+
+=head1 renderPG
+
+This method requires a course environment, user, set, problem, psvn, form
+fields, and translation options.  These are passed to the WeBWorK::PG
+constructor inside of a subprocess.  The created object is then parsed into a
+hash that containing all of the data webwork2 needs for rendering and processing
+the problem.  Note that this hash can not contain any blessed references.  Those
+will all be lost in the return value from the process.
+
+The return value of the method is a Mojo::Promise that will resolve to the above
+hash when awaited.
+
+=cut
+
+sub renderPG ($c, $effectiveUser, $set, $problem, $psvn, $formFields, $translationOptions) {
+	# Set the inactivity timeout to be 5 seconds more than the PG timeout.
+	$c->inactivity_timeout($WeBWorK::PG::TIMEOUT + 5);
+
+	return Mojo::IOLoop->subprocess->run_p(sub {
+		my $pg = WeBWorK::PG->new(constructPGOptions(
+			$c->ce, $effectiveUser, $set, $problem, $psvn, $formFields, $translationOptions));
+
+		my $ret = {
+			body_text        => $pg->{body_text},
+			head_text        => $pg->{head_text},
+			post_header_text => $pg->{post_header_text},
+			answers          => unbless($pg->{answers}),
+			errors           => $pg->{errors},
+			warnings         => $pg->{warnings},
+			result           => $pg->{result},
+			state            => $pg->{state},
+			flags            => $pg->{flags},
+		};
+
+		if (ref $pg->{pgcore}) {
+			$ret->{internal_debug_messages} = $pg->{pgcore}->get_internal_debug_messages;
+			$ret->{warning_messages}        = $pg->{pgcore}->get_warning_messages();
+			$ret->{debug_messages}          = $pg->{pgcore}->get_debug_messages();
+			$ret->{PG_ANSWERS_HASH}         = {
+				map {
+					$_ => {
+						response_obj => unbless($pg->{pgcore}{PG_ANSWERS_HASH}{$_}->response_obj),
+						rh_ans       => $pg->{pgcore}{PG_ANSWERS_HASH}{$_}{ans_eval}{rh_ans}
+					}
+				}
+					keys %{ $pg->{pgcore}{PG_ANSWERS_HASH} }
+			};
+			$ret->{resource_list} = {
+				map { $_ => $pg->{pgcore}{PG_alias}{resource_list}{$_}{uri}{content} }
+					keys %{ $pg->{pgcore}{PG_alias}{resource_list} }
+			};
+			$ret->{PERSISTENCE_HASH_UPDATED} = $pg->{pgcore}{PERSISTENCE_HASH_UPDATED};
+			$ret->{PERSISTENCE_HASH}         = $pg->{pgcore}{PERSISTENCE_HASH};
+		}
+
+		# Save the problem source. This is used by Caliper::Entity. Why?
+		$ret->{problem_source_code} = $pg->{translator}{source} if ref $pg->{translator};
+
+		$pg->free;
+		return $ret;
+	})->catch(sub ($err) {
+		return { body_text => '', answers => {}, flags => { error_flag => 1 }, errors => $err };
+	});
+}
+
+1;
diff --git a/lib/WeBWorK/Utils/RestrictedClosureClass.pm b/lib/WeBWorK/Utils/RestrictedClosureClass.pm
deleted file mode 100644
index 317b375dee..0000000000
--- a/lib/WeBWorK/Utils/RestrictedClosureClass.pm
+++ /dev/null
@@ -1,116 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::Utils::RestrictedClosureClass;
-
-=head1 NAME
-
-WeBWorK::Utils::RestrictedClosureClass - Protect instance data and only allow
-calling of specified methods.
-
-=head1 SYNPOSIS
-
- package MyScaryClass;
- 
- sub new { return bless { @_[1..$#_] }, ref $_[0] || $_[0] }
- sub get_secret { return $_[0]->{secret_data} }
- sub set_secret { $_[0]->{secret_data} = $_[1] }
- sub use_secret { print "Secret length is ".length($_[0]->get_secret) }
- sub call_for_help { print "HELP!!" }
- 
- package main;
- use WeBWorK::Utils::RestrictedClosureClass;
- 
- my $unlocked = new MyScaryClass(secret_data => "pErL iS gReAt");
- my $locked = new WeBWorK::Utils::RestrictedClosureClass($obj, qw/use_secret call_for_help/);
- 
- $unlocked->get_secret;                # OK
- $unlocked->set_secret("fOoBaR");      # OK
- $unlocked->use_secret;                # OK
- $unlocked->call_for_help;             # OK
- print $unlocked->{secret_data};       # OK
- $unlocked->{secret_data} = "WySiWyG"; # OK
- 
- $locked->get_secret;                  # NG (not in method list)
- $locked->set_secret("fOoBaR");        # NG (not in method list)
- $locked->use_secret;                  # OK
- $locked->call_for_help;               # OK
- print $locked->{secret_data};         # NG (not a hash reference)
- $locked->{secret_data} = "WySiWyG";   # NG (not a hash reference)
-
-=head1 DESCRIPTION
-
-RestrictedClosureClass generates a wrapper object for a given object that
-prevents access to the objects instance data and only allows specified method
-calls. The wrapper object is a closure that calls methods of the underlying
-object, if permitted.
-
-This is great for exposing a limited API to an untrusted environment, i.e. the
-PG Safe compartment.
-
-=head1 CONSTRUCTOR
-
-=over
-
-=item $wrapper_object = CLASS->new($object, @methods)
-
-Generate a wrapper object for the given $object. Only calls to the methods
-listed in @methods will be permitted.
-
-=back
-
-=head1 LIMITATIONS
-
-You can't call SUPER methods, or methods with an explicit class given:
-
- $locked->SUPER::call_for_help         # NG, would be superclass of RestrictedClosureClass
-
-=head1 SEE ALSO
-
-L<perltoot/Closures-as-Objects>
-
-=cut
-
-use strict;
-use warnings;
-use Carp;
-use Scalar::Util qw/blessed/;
-
-sub new {
-	my ($invocant, $object, @methods) = @_;
-	croak "wrapper class with no methods is dumb" unless @methods;
-	my $class = ref $invocant || $invocant;
-	croak "object is not a blessed reference" unless blessed $object;
-	my %methods; @methods{@methods} = ();
-	my $self = sub { # CLOSURE over $object, %methods;
-		my $method = shift;
-		if (not exists $methods{$method}) {
-			croak "Can't locate object method \"$method\" via package \"".ref($object)."\" fnord";
-		}
-		return $object->$method(@_);
-	};
-	return bless $self, $class;
-}
-
-sub AUTOLOAD {
-	my $self = shift;
-	my $name = our $AUTOLOAD;
-	$name =~ s/.*:://;
-	return if $name eq "DESTROY"; # real obj's DESTROY method called when closure goes out of scope
-	return $self->($name, @_);
-}
-
-1;
-
diff --git a/lib/WeBWorK/Utils/RestrictedMailer.pm b/lib/WeBWorK/Utils/RestrictedMailer.pm
deleted file mode 100644
index 3a49f0201d..0000000000
--- a/lib/WeBWorK/Utils/RestrictedMailer.pm
+++ /dev/null
@@ -1,305 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::Utils::RestrictedMailer;
-use base "Email::Sender";
-
-=for comment
-
-PLEASE NOTE
-
-This class does not impose any restrictions on its own, it simply provides
-restricted versions of Email::Sender's Open, OpenMultipart, MailMsg, and
-MailFile methods.
-
-The restricted methods prevent the caller from overriding parameters that
-have already been specified to the constructor. For example, if the "smtp"
-parameter is specified in new(), it cannot be re-specified in Open(). To lock
-a parameter without specifying a value, set it to undef.
-
-To avoid having to list all possible parameters to lock them, specify
-lock_by_default=>1. To allow a locked parameter to be changed, list it in
-allow_change.
-
-To restrict the recipients that are allowed, list those recipients in
-allowed_recipients.
-
-By wrapping an instance of this class with RestrictedClosureClass, you can
-prevent the user from changing the SMTP server settings and sending mail to
-or from unauthorized addresses.
-
-Method summary:
- - new (wrapped) - safe
- - Open (wrapped) - safe
- - OpenMultipart (wrapped) - safe
- - MailMsg (wrapped) - safe
- - MailFile (wrapped) - unsafe, allows read access to filesystem
- - Send - unsafe, can be used to issue SMTP commands
- - SendLine - unsafe, can be used to issue SMTP commands
- - print/SendEnc - safe
- - SendLineEnc - safe
- - SendEx - unsafe, can be used to issue SMTP commands
- - SendLineEx - unsafe, can be used to issue SMTP commands
- - Part - safe, but params cannot be locked
- - Body - safe, but params cannot be locked
- - SendFile/Attach - unsafe, allows read access to filesystem
- - EndPart - safe
- - Close - safe, but allows overriding the keepconnection parameter
- - Cancel - safe
- - QueryAuthProtocols - unsafe, allows connection to arbitrary SMTP server
- - GetHandle - safe
-
-FIXME MailFile needs restriction on what files can be specified.
-
-FIXME There's currently no way to restrict the arguments to Part, Body, or
-SendFile/Attach, but the only time this is actually a problem is with the "file"
-parameter to SendFile/Attach.
-
-FIXME What about ctype and charset, which appear as params to new and also
-appear separately as params to MailFile, Part, Body, and SendFile/Attach?
-
-FIXME Close should check if keepconnection is locked.
-
-FIXME QueryAuthProtocols could be made safe by prohibiting the $smtpserver
-argument.
-
-=cut
-
-use strict;
-use warnings;
-use Carp;
-use Scalar::Util qw/refaddr/;
-use Storable qw/dclone/;
-use WeBWorK::Utils qw/constituency_hash/;
-
-# params that all methods accept
-our @COMMON_PARAMS = qw/from fake_from reply replyto to fake_to cc fake_cc bcc
-smtp subject headers boundary multipart ctype charset client priority confirm
-debug debug_level auth authid authdomain auth_encoded keepconnection
-skip_bad_recipients createmessageid onerrors/;
-
-# params accepted by each method we're restricting
-our %LEGAL_PARAMS = (
-	new => constituency_hash(@COMMON_PARAMS),
-	Open => constituency_hash(@COMMON_PARAMS),
-	OpenMultipart => constituency_hash(@COMMON_PARAMS),
-	MailMsg => constituency_hash(@COMMON_PARAMS, qw/msg/),
-	MailFile => constituency_hash(@COMMON_PARAMS, qw/msg file description ctype charset encoding/),
-	#Part => constituency_hash(qw/description ctype encoding disposition content_id msg charset/),
-	Body => constituency_hash(qw/charset encoding ctype msg/),
-	Attach => constituency_hash(qw/description ctype encoding disposition file content_id/),
-);
-
-# order of positional params
-our %POSITIONAL_PARAMS = (
-	new => [qw/from reply to smtp subject headers boundary/],
-	Open => [qw/from reply to smtp subject headers/],
-	OpenMultipart => [qw/from reply to smtp subject headers boundary/],
-	MailMsg => [qw/from reply to smtp subject headers msg/],
-	MailFile => [qw/from reply to smtp subject headers msg file description/],
-	#Part => [qw/description ctype encoding disposition content_id msg/],
-	#Body => [qw/charset encoding ctype/],
-	#Attach => [qw/description ctype encoding disposition file/],
-);
-
-# legal opts:
-#   - params (parameters to pass to SUPER::new, either as an arrayref of positional params or as hashref)
-#   - lock_by_default (if true, params not listed in params or allow_change will be locked)
-#   - allow_change (params listed here will always be changeable)
-#   - allowed_recipients (if non-empty, recipient addresses must be in this list)
-#   - fatal_errors (if true, attempts to modify locked params will cause an exception)
-# 
-sub new {
-	my ($invocant, %opts) = @_;
-	
-	my $params = $opts{params};
-	$params = munge_params("new", @$params) if ref $params eq "ARRAY";
-	
-	# make a deep copy of the params that will be passed to new
-	# Email::Sender might delete some elements, and we need the whole thing for later comparison
-	my $initial_params = dclone $params;
-	
-	# create the object, passing the params in
-	my $self = $invocant->SUPER::new($params);
-	
-	# handle errors
-	die $Email::Sender::Error unless ref $self;
-	
-	# store the set of initial params for later perusal
-	$self->initial_params = $initial_params;
-	
-	# lock_by_default states that params listed neither in params nor in allow_change should be locked
-	$self->lock_by_default = $opts{lock_by_default};
-	
-	# allow_change lists params that can be changed even if they appear in params OR lock_by_default is true
-	# (this is stored as a HASH with undefined values for easy constituency testing)
-	$self->allow_change = constituency_hash(@{$opts{allow_change}});
-	
-	# allowed_recipients can't be handled by setting an initial param
-	$self->allowed_recipients = constituency_hash(@{$opts{allowed_recipients}});
-	
-	# fatal_errors will generate exceptions when locked params are changed
-	# (otherwise, the changes are ignored and a warning is issued)
-	$self->fatal_errors = $opts{fatal_errors};
-	
-	return $self;
-}
-
-sub Open {
-	my $self = shift;
-	my $params = munge_params("Open", @_);
-	$self->filter_params("Open", $params);
-	warn "this is Open: self=$self ISA=@WeBWorK::Utils::RestrictedMailer::ISA";
-	return $self->SUPER::Open($params);
-}
-
-sub OpenMultipart {
-	my $self = shift;
-	my $params = munge_params("OpenMultipart", @_);
-	$self->filter_params("OpenMultipart", $params);
-	return $self->SUPER::Open($params);
-}
-
-sub MailMsg {
-	my $self = shift;
-	my $params = munge_params("MailMsg", @_);
-	$self->filter_params("MailMsg", $params);
-	return $self->SUPER::MailMsg($params);
-}
-
-sub MailFile {
-	my $self = shift;
-	my $params = munge_params("MailFile", @_);
-	$self->filter_params("MailFile", $params);
-	return $self->SUPER::MailFile($params);
-}
-
-sub _prepare_addresses {
-	my ($self, $type) = @_;
-	$self->SUPER::_prepare_addresses($type);
-	foreach my $address (@{$self->{'to_list'}}, @{$self->{'cc_list'}}, @{$self->{'bcc_list'}}) {
-		$address = $1 if $address =~ /<(.*)>/;
-		croak "mail not permitted to '$address'" unless exists $self->allowed_recipients->{$address};
-	}
-}
-
-################################################################################
-
-# prefix for the keys we're adding to $self
-our $PREFIX = "WeBWorK_Utils_RestrictedMailer_";
-
-sub initial_params     : lvalue { shift->{$PREFIX."initial_params"} }
-sub lock_by_default    : lvalue { shift->{$PREFIX."lock_by_default"} }
-sub allow_change       : lvalue { shift->{$PREFIX."allow_change"} }
-sub allowed_recipients : lvalue { shift->{$PREFIX."allowed_recipients"} }
-sub fatal_errors       : lvalue { shift->{$PREFIX."fatal_errors"} }
-
-sub skipped_recipients { return shift->{skipped_recipients} }
-sub error              { return shift->{error} }
-sub error_msg          { return shift->{error_msg} }
-
-sub carp_or_croak { shift->fatal_errors ? croak @_ : carp @_ }
-
-sub munge_params {
-	my ($sub, @params) = @_;
-	
-	my $hash;
-	if (@params) {
-		if (ref $params[0] eq "HASH") {
-			$hash = $params[0];
-		} else {
-			my @names = @{$POSITIONAL_PARAMS{$sub}};
-			my $max = $#names < $#params ? $#names : $#params;
-			@$hash{@names[0..$max]} = @params[0..$max];
-		}
-	}
-	return $hash || {};
-}
-
-sub filter_params {
-	my ($self, $sub, $params) = @_;
-	
-	foreach my $param (keys %$params) {
-		if (exists $LEGAL_PARAMS{$sub}{$param}) {
-			next if exists $self->{$PREFIX."allow_change"}{$param};
-			if (exists $self->{$PREFIX."initial_params"}{$param}) {
-				my $oldval = $self->{$PREFIX."initial_params"}{$param};
-				my $newval = $params->{$param};
-				next if deq($oldval, $newval);
-				$self->carp_or_croak("failed to set param '$param' in method '$sub': param is locked");
-				delete $params->{$param};
-			} elsif ($self->{$PREFIX."lock_by_default"}) {
-				$self->carp_or_croak("failed to change param '$param' in method '$sub': param is locked");
-				delete $params->{$param};
-			}
-		} else {
-			$self->carp_or_croak("invalid param '$param' in method '$sub'");
-			delete $params->{$param};
-		}
-	}
-}
-
-sub deq {
-	my ($oldval, $newval) = @_;
-	
-	#print "oldval=$oldval newval=$newval\n";
-	if (ref $oldval and ref $newval) {
-		if (ref $oldval eq ref $newval) {
-			my $reftype = ref $oldval;
-			if ($reftype eq "HASH") {
-				my @oldkeys = sort keys %$oldval;
-				my @newkeys = sort keys %$newval;
-				#print "oldkeys=@oldkeys\n";
-				#print "newkeys=@newkeys\n";
-				return 0 unless deq(\@oldkeys, \@newkeys);
-				my @oldvals = @$oldval{@oldkeys};
-				my @newvals = @$newval{@newkeys};
-				#print "oldvals=@oldvals\n";
-				#print "newvals=@newvals\n";
-				return deq(\@oldvals, \@newvals);
-			} elsif ($reftype eq "ARRAY") {
-				return 0 unless @$oldval == @$newval;
-				for (my $i = 0; $i < @$oldval; $i++) {
-					return 0 unless deq($oldval->[$i], $newval->[$i]);
-				}
-				return 1;
-			} elsif ($reftype eq "SCALAR") {
-				return deq($$oldval, $$newval);
-			} elsif ($reftype eq "CODE") {
-				# the best we can do here is compare the addresses
-				return refaddr $oldval == refaddr $newval;
-			} else {
-				warn "unsupported reftype '$reftype' in deq()";
-				return 0;
-			}
-		} else {
-			return 0;
-		}
-	} elsif (ref $oldval) {
-		return 0;
-	} elsif (ref $newval) {
-		return 0;
-	} else {
-		if (defined $oldval and defined $newval) {
-			return $oldval eq $newval;
-		} elsif (not defined $oldval and not defined $newval) {
-			return 1;
-		} else {
-			return 0;
-		}
-	}
-}
-
-1;
diff --git a/lib/WeBWorK/Utils/Routes.pm b/lib/WeBWorK/Utils/Routes.pm
new file mode 100644
index 0000000000..ce94a6b039
--- /dev/null
+++ b/lib/WeBWorK/Utils/Routes.pm
@@ -0,0 +1,602 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Utils::Routes;
+use parent qw(Exporter);
+
+=head1 NAME
+
+WeBWorK::Utils::Routes - webwork2 route parameters and route utility methods.
+
+=head1 ROUTES
+
+PLEASE FOR THE LOVE OF GOD UPDATE THIS IF YOU CHANGE THE ROUTES BELOW!!!
+
+ root                                /
+
+ course_admin                        /admin -> logout, options, instructor_tools
+
+ render_rpc                          /render_rpc
+ instructor_rpc                      /instructor_rpc
+ html2xml                            /html2xml
+
+ ltiadvantage_login                  /ltiadvantage/login
+ ltiadvantage_launch                 /ltiadvantage/launch
+ ltiadvantage_keys                   /ltiadvantage/keys
+
+ pod_index                           /pod
+ pod_viewer                          /pod/$filePath
+
+ sample_problem_index                /sampleproblems
+ sample_problem_viewer               /sampleproblems/$filePath
+
+ set_list                            /$courseID
+
+ logout                              /$courseID/logout
+ options                             /$courseID/options
+ grades                              /$courseID/grades
+ achievements                        /$courseID/achievements
+ equation_display                    /$courseID/equation
+ feedback                            /$courseID/feedback
+ gateway_quiz                        /$courseID/test_mode/$setID
+
+ proctored_gateway_quiz              /$courseID/proctored_test_mode/$setID
+ proctored_gateway_proctor_login     /$courseID/proctored_test_mode/$setID/proctor_login
+
+ hardcopy                            /$courseID/hardcopy
+ hardcopy_preselect_set              /$courseID/hardcopy/$setID
+
+ answer_log                          /$courseID/show_answers
+
+ instructor_tools                    /$courseID/instructor
+
+ instructor_user_list                /$courseID/instructor/users
+ instructor_user_detail              /$courseID/instructor/users/$userID
+
+ instructor_set_list                 /$courseID/instructor/sets
+
+ instructor_set_detail               /$courseID/instructor/sets/$setID
+ instructor_users_assigned_to_set    /$courseID/instructor/sets/$setID/users
+
+ instructor_problem_grader           /$courseID/instructor/grader/$setID/$problemID
+
+ instructor_add_users                /$courseID/instructor/add_users
+ instructor_set_assigner             /$courseID/instructor/assigner
+
+ instructor_set_maker                /$courseID/instructor/setmaker
+ instructor_file_manager             /$courseID/instructor/file_manager
+ instructor_config                   /$courseID/instructor/config
+
+ instructor_problem_editor           /$courseID/instructor/pgProblemEditor
+ instructor_problem_editor_withset   /$courseID/instructor/pgProblemEditor/$setID
+ instructor_problem_editor_withset_withproblem
+                                     /$courseID/instructor/pgProblemEditor/$setID/$problemID
+
+ instructor_scoring                  /$courseID/instructor/scoring
+ instructor_scoring_download         /$courseID/instructor/scoringDownload
+ instructor_mail_merge               /$courseID/instructor/send_mail
+
+ instructor_statistics               /$courseID/instructor/stats
+ instructor_set_statistics           /$courseID/instructor/stats/set/$setID
+ instructor_problem_statistics       /$courseID/instructor/stats/set/$setID/$problemID
+ instructor_user_statistics          /$courseID/instructor/stats/student/$userID
+
+ instructor_progress                 /$courseID/instructor/progress
+ instructor_set_progress             /$courseID/instructor/progress/set/$setID
+ instructor_user_progress            /$courseID/instructor/progress/student/$userID
+
+ instructor_achievement_list         /$courseID/instructor/achievement_list
+ instructor_achievement_editor       /$courseID/instructor/achievement_list/$achievementID/editor
+ instructor_achievement_user_editor  /$courseID/instructor/achievement_list/$achievementID/users
+
+ instructor_lti_update               /$courseID/instructor/lti_update
+
+ problem_list                        /$courseID/$setID
+ problem_detail                      /$courseID/$setID/$problemID
+ show_me_another                     /$courseID/$setID/$problemID/show_me_another
+
+=cut
+
+use strict;
+use warnings;
+
+use WeBWorK::Localize;
+use WeBWorK::Utils qw(x format_set_name_display);
+
+our @EXPORT_OK = qw(setup_content_generator_routes route_title route_navigation_is_restricted);
+
+# Tree of route parameters.
+# Parameters:
+#   title:        Used to construct a title for the page the route generates. This is required.
+#   children:     Child routes. These must have a url path below the parent. A route that does not have children should
+#                 not have this parameter.
+#   module:       The content generator controller module that contains the action for the route. This is required.
+#   path:         The path of the route relative to the parent route.  This includes route capture parameters.
+#                 This is required.
+#   unrestricted: If a route has the "unrestricted" flag, then all users can visit that route. Users that do not have
+#                 the "navigation_allowed" permission may not visit routes that do not have the "unrestricted" flag.
+
+# Note for the localization
+# [_1] = $userID
+# [_2] = $setID
+# [_3] = $problemID
+# [_4] = $courseID
+# [_5] = $achievementID
+
+my %routeParameters = (
+	root => {
+		title => 'WeBWorK',
+		# 'course_admin' is also a child of 'root' but that is a special case that is setup separately.
+		children => [ qw(
+			render_rpc
+			html2xml
+			instructor_rpc
+			ltiadvantage_login
+			ltiadvantage_launch
+			ltiadvantage_keys
+			pod_index
+			sample_problem_index
+			set_list
+		) ],
+		module => 'Home',
+		path   => '/'
+	},
+
+	course_admin => {
+		title  => x('Course Administration'),
+		module => 'CourseAdmin',
+		path   => '/admin'
+	},
+
+	render_rpc => {
+		title  => 'render_rpc',
+		module => 'RenderViaRPC',
+		path   => '/render_rpc'
+	},
+	instructor_rpc => {
+		title  => 'instructor_rpc',
+		module => 'InstructorRPCHandler',
+		path   => '/instructor_rpc'
+	},
+
+	# The html2xml route is an deprecated alias to the render_rpc route above.
+	# It no longer has anything to do with xml, and so the route title does not make sense anymore.
+	html2xml => {
+		title  => 'html2xml',
+		module => 'RenderViaRPC',
+		path   => '/html2xml'
+	},
+
+	# Both of these routes end up at the login screen on failure, and the title is not used anywhere else.
+	# Hence the title 'Login'.
+	ltiadvantage_login => {
+		title  => x('Login'),
+		module => 'LTIAdvantage',
+		path   => '/ltiadvantage/login',
+		action => 'login'
+	},
+	ltiadvantage_launch => {
+		title  => x('Login'),
+		module => 'LTIAdvantage',
+		path   => '/ltiadvantage/launch',
+		action => 'launch'
+	},
+	ltiadvantage_keys => {
+		title  => 'keys',
+		module => 'LTIAdvantage',
+		path   => '/ltiadvantage/keys',
+		action => 'keys'
+	},
+
+	pod_index => {
+		title    => x('POD Index'),
+		children => [qw(pod_viewer)],
+		module   => 'PODViewer',
+		path     => '/pod',
+		action   => 'PODindex'
+	},
+
+	pod_viewer => {
+		title  => x('POD Viewer'),
+		module => 'PODViewer',
+		path   => '/*filePath',
+		action => 'renderPOD'
+	},
+
+	sample_problem_index => {
+		title    => x('Sample Problem Index'),
+		children => [qw(sample_problem_viewer)],
+		module   => 'SampleProblemViewer',
+		path     => '/sampleproblems',
+		action   => 'sampleProblemIndex'
+	},
+
+	sample_problem_viewer => {
+		title  => x('Sample Problem Viewer'),
+		module => 'SampleProblemViewer',
+		path   => '/*filePath',
+		action => 'renderSampleProblem'
+	},
+
+	set_list => {
+		title    => '[_4]',
+		children => [
+			qw(equation_display feedback gateway_quiz proctored_gateway_quiz answer_log grades hardcopy achievements
+				logout options instructor_tools problem_list)
+		],
+		module => 'ProblemSets',
+		path   => '/#courseID'
+	},
+
+	logout => {
+		title  => x('Logout'),
+		module => 'Logout',
+		path   => '/logout'
+	},
+	options => {
+		title        => x('User Settings'),
+		module       => 'Options',
+		path         => '/options',
+		unrestricted => 1
+	},
+	grades => {
+		title  => x('Grades'),
+		module => 'Grades',
+		path   => '/grades'
+	},
+	achievements => {
+		title        => x('Achievements'),
+		module       => 'Achievements',
+		path         => '/achievements',
+		unrestricted => 1
+	},
+	equation_display => {
+		title  => x('Equation Display'),
+		module => 'EquationDisplay',
+		path   => '/equation'
+	},
+	feedback => {
+		title        => x('Feedback'),
+		module       => 'Feedback',
+		path         => '/feedback',
+		unrestricted => 1
+	},
+	gateway_quiz => {
+		title        => x('Test [_2]'),
+		module       => 'GatewayQuiz',
+		path         => '/test_mode/#setID',
+		unrestricted => 1
+	},
+
+	proctored_gateway_quiz => {
+		title        => x('Proctored Test [_2]'),
+		children     => [qw(proctored_gateway_proctor_login)],
+		module       => 'ProctoredGatewayQuiz',
+		path         => '/proctored_test_mode/#setID',
+		unrestricted => 1
+	},
+	proctored_gateway_proctor_login => {
+		title        => x('Proctored Test [_2] Proctor Login'),
+		module       => 'LoginProctor',
+		path         => '/proctor_login',
+		unrestricted => 1
+	},
+
+	hardcopy => {
+		title    => x('Hardcopy Generator'),
+		children => [qw(hardcopy_preselect_set)],
+		module   => 'Hardcopy',
+		path     => '/hardcopy'
+	},
+	hardcopy_preselect_set => {
+		title        => x('Hardcopy Generator'),
+		module       => 'Hardcopy',
+		path         => '/#setID',
+		unrestricted => 1
+	},
+
+	answer_log => {
+		title  => x('Answer Log'),
+		module => 'Instructor::ShowAnswers',
+		path   => '/show_answers'
+	},
+
+	instructor_tools => {
+		title    => x('Instructor Tools'),
+		children => [ qw(
+			instructor_user_list instructor_set_list
+			instructor_add_users instructor_achievement_list
+			instructor_set_assigner instructor_file_manager
+			instructor_problem_editor
+			instructor_set_maker
+			instructor_config
+			instructor_scoring instructor_scoring_download instructor_mail_merge
+			instructor_statistics
+			instructor_progress
+			instructor_problem_grader
+			instructor_lti_update
+		) ],
+		module => 'Instructor::Index',
+		path   => '/instructor'
+	},
+	instructor_user_list => {
+		title    => x('Classlist Editor'),
+		children => [qw(instructor_user_detail)],
+		module   => 'Instructor::UserList',
+		path     => '/users'
+	},
+	instructor_user_detail => {
+		title  => x('Sets assigned to [_1]'),
+		module => 'Instructor::UserDetail',
+		path   => '/#userID'
+	},
+	instructor_set_list => {
+		title    => x('Hmwk Sets Editor'),
+		children => [qw(instructor_set_detail)],
+		module   => 'Instructor::ProblemSetList',
+		path     => '/sets'
+	},
+	instructor_set_detail => {
+		title    => x('Set Detail for set [_2]'),
+		children => [qw(instructor_users_assigned_to_set)],
+		module   => 'Instructor::ProblemSetDetail',
+		path     => '/#setID'
+	},
+	instructor_users_assigned_to_set => {
+		title  => x('Users Assigned to Set [_2]'),
+		module => 'Instructor::UsersAssignedToSet',
+		path   => '/users'
+	},
+	instructor_problem_grader => {
+		title  => x('Manual Grader'),
+		module => 'Instructor::ProblemGrader',
+		path   => '/grader/#setID/#problemID'
+	},
+	instructor_add_users => {
+		title  => x('Add Users'),
+		module => 'Instructor::AddUsers',
+		path   => '/add_users'
+	},
+	instructor_set_assigner => {
+		title  => x('Set Assigner'),
+		module => 'Instructor::Assigner',
+		path   => '/assigner'
+	},
+	instructor_set_maker => {
+		title  => x('Library Browser'),
+		module => 'Instructor::SetMaker',
+		path   => '/setmaker'
+	},
+	instructor_file_manager => {
+		title  => x('File Manager'),
+		module => 'Instructor::FileManager',
+		path   => '/file_manager'
+	},
+	instructor_config => {
+		title  => x('Course Configuration'),
+		module => 'Instructor::Config',
+		path   => '/config'
+	},
+	instructor_problem_editor => {
+		title    => x('Problem Editor'),
+		children => [qw(instructor_problem_editor_withset)],
+		module   => 'Instructor::PGProblemEditor',
+		path     => '/pgProblemEditor'
+	},
+	instructor_problem_editor_withset => {
+		title    => '[_2]',
+		children => [qw(instructor_problem_editor_withset_withproblem)],
+		module   => 'Instructor::PGProblemEditor',
+		path     => '/#setID'
+	},
+	instructor_problem_editor_withset_withproblem => {
+		title  => '[_3]',
+		module => 'Instructor::PGProblemEditor',
+		path   => '/#problemID'
+	},
+	instructor_scoring => {
+		title  => x('Scoring Tools'),
+		module => 'Instructor::Scoring',
+		path   => '/scoring'
+	},
+	instructor_scoring_download => {
+		title  => x('Scoring Download'),
+		module => 'Instructor::ScoringDownload',
+		path   => '/scoringDownload'
+	},
+	instructor_mail_merge => {
+		title  => x('Email'),
+		module => 'Instructor::SendMail',
+		path   => '/send_mail'
+	},
+	instructor_statistics => {
+		title    => x('Statistics'),
+		children => [qw(instructor_set_statistics instructor_user_statistics)],
+		module   => 'Instructor::Stats',
+		path     => '/stats'
+	},
+	instructor_set_statistics => {
+		title    => '[_2]',
+		children => [qw(instructor_problem_statistics)],
+		module   => 'Instructor::Stats',
+		path     => '/set/#setID'
+	},
+	instructor_problem_statistics => {
+		title  => '[_3]',
+		module => 'Instructor::Stats',
+		path   => '/#problemID'
+	},
+	instructor_user_statistics => {
+		title  => '[_1]',
+		module => 'Instructor::Stats',
+		path   => '/student/#userID'
+	},
+	instructor_progress => {
+		title    => x('Student Progress'),
+		children => [qw(instructor_set_progress instructor_user_progress)],
+		module   => 'Instructor::StudentProgress',
+		path     => '/progress'
+	},
+	instructor_set_progress => {
+		title  => '[_2]',
+		module => 'Instructor::StudentProgress',
+		path   => '/set/#setID'
+	},
+	instructor_user_progress => {
+		title  => '[_1]',
+		module => 'Instructor::StudentProgress',
+		path   => '/student/#userID'
+	},
+	instructor_achievement_list => {
+		title    => x('Achievement Editor'),
+		children => [qw(instructor_achievement_editor instructor_achievement_user_editor)],
+		module   => 'Instructor::AchievementList',
+		path     => '/achievement_list'
+	},
+	instructor_achievement_editor => {
+		title  => '[_5]',
+		module => 'Instructor::AchievementEditor',
+		path   => '/#achievementID/editor'
+	},
+	instructor_achievement_user_editor => {
+		title  => x('Achievement User Editor'),
+		module => 'Instructor::AchievementUserEditor',
+		path   => '/#achievementID/users'
+	},
+	instructor_lti_update => {
+		title  => x('LTI Grade Update'),
+		module => 'Instructor::LTIUpdate',
+		path   => '/lti_update'
+	},
+
+	problem_list => {
+		title        => '[_2]',
+		children     => [qw(problem_detail)],
+		module       => 'ProblemSet',
+		path         => '/#setID',
+		unrestricted => 1
+	},
+	problem_detail => {
+		title        => '[_3]',
+		children     => [qw(show_me_another)],
+		module       => 'Problem',
+		path         => '/#problemID',
+		unrestricted => 1
+	},
+	show_me_another => {
+		title        => x('Show Me Another'),
+		module       => 'ShowMeAnother',
+		path         => '/show_me_another',
+		unrestricted => 1
+	}
+);
+
+=head1 METHODS
+
+=head2 Route setup methods
+
+These methods initialize the webwork2 app Mojolicious router for content
+generator routes.
+
+=over
+
+=item setup_content_generator_routes
+
+This is the actual method called by Mojolicious::WeBWorK.
+
+=item setup_content_generator_routes_recursive
+
+This is an internal utility method called by the above method.
+It is not exported.  It recursively sets up all routes.
+
+=back
+
+=cut
+
+sub setup_content_generator_routes {
+	my $route = shift;
+	for (@{ $routeParameters{root}{children} }) {
+		setup_content_generator_routes_recursive($route, $_);
+	}
+	return;
+}
+
+sub setup_content_generator_routes_recursive {
+	my ($route, $child) = @_;
+
+	my $action = $routeParameters{$child}{action} // 'go';
+
+	if ($routeParameters{$child}{children}) {
+		my $child_route = $route->under($routeParameters{$child}{path})->name($child);
+		$child_route->any('/')->to("$routeParameters{$child}{module}#$action")->name($child);
+		for (@{ $routeParameters{$child}{children} }) {
+			setup_content_generator_routes_recursive($child_route, $_);
+		}
+	} else {
+		$route->any($routeParameters{$child}{path})->to("$routeParameters{$child}{module}#$action")->name($child);
+	}
+
+	return;
+}
+
+=head2 Methods that return information about a route.
+
+=over
+
+=item route_title
+
+Returns the human-readable name of the route given by name.  This displays set
+ids and course ids with spaces instead of underscores, and if C<$displayHTML> is
+true, it places the set id into an ltr span so that it is displayed ltr even for
+rtl languages.  Note that the return value of this method should never be used
+to determine what type of path this is or for any sort of further processing.
+It is a translated string.
+
+=cut
+
+sub route_title {
+	my ($c, $route_name, $displayHTML) = @_;
+
+	# Translate the display name.
+	my $name = $c->maketext(
+		$routeParameters{$route_name}{title},
+		$c->stash('userID') // '',
+		$displayHTML
+		? $c->tag('span', dir => 'ltr', format_set_name_display($c->stash('setID') // ''))
+		: format_set_name_display($c->stash('setID') // ''),
+		$c->stash('problemID') // '',
+		($c->stash('courseID') // '') =~ s/_/ /gr,
+		$c->stash('achievementID') // ''
+	);
+
+	return $name;
+}
+
+=item route_navigation_is_restricted
+
+Returns 1 if the route is restricted from being viewed by a user that does not
+have the navigation_allowed permission, and 0 otherwise.  The allowed paths for
+restricted users are marked with the unrestricted flag.
+
+=back
+
+=cut
+
+sub route_navigation_is_restricted {
+	my $route = shift;
+	return defined $routeParameters{ $route->name }{unrestricted} ? 0 : 1;
+}
+
+1;
diff --git a/lib/WeBWorK/Utils/SortRecords.pm b/lib/WeBWorK/Utils/SortRecords.pm
index 72730221a4..53e3e15e00 100644
--- a/lib/WeBWorK/Utils/SortRecords.pm
+++ b/lib/WeBWorK/Utils/SortRecords.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,7 +14,7 @@
 ################################################################################
 
 package WeBWorK::Utils::SortRecords;
-use base qw(Exporter);
+use parent qw(Exporter);
 
 =head1 NAME
 
@@ -22,23 +22,21 @@ WeBWorK::Utils::SortRecords - utilities for sorting database records.
 
 =head1 SYNOPSIS
 
- use WeBWorK::Utils::SortRecords qw/getSortsForClass/;
- 
- # get a list of sorts
- my ($sortsRef, $sortLabelsRef) = getSortsForClass(ref $Users[0]);
- my @sorts      = @$sortsRef;      # sort names
- my %sortLabels = %$sortLabelsRef; # suitable for CGI's "-labels" parameter
-
- use WeBWorK::Utils::SortRecords qw/sortRecords/;
- 
- # start with a list of records
- my @Users = $db->getUsers($db->listUsers);
- 
- # sort the records using a preset
- @SortedUsers = sortRecords({preset=>"lnfn"}, @Users);
- 
- # or provide a custom sort
- @SortedUsers = sortRecords({fields=>[qw/section student_id/]}, @Users);
+    use WeBWorK::Utils::SortRecords qw/getSortsForClass/;
+
+    # Get a list of sorts
+    my $sorts = getSortsForClass(ref $users[0], $default_sort);
+
+    use WeBWorK::Utils::SortRecords qw/sortRecords/;
+
+    # Start with a list of records
+    my @users = $db->getUsers($db->listUsers);
+
+    # Sort the records using a preset.
+    @sortedUsers = sortRecords('lnfn', @users);
+
+    # Sort on a database field for the records.
+    @sortedUsers = sortRecords('section', @users);
 
 =head1 DESCRIPTION
 
@@ -50,144 +48,102 @@ of field names. Sorts are performed lexicographically.
 
 use strict;
 use warnings;
+
 use Carp;
 
-our @EXPORT    = ();
-our @EXPORT_OK = qw(
-	getSortsForClass
-	sortRecords
-);
+our @EXPORT_OK = qw(getSortsForClass sortRecords);
 
 use constant PRESET_SORTS => {
-	"WeBWorK::DB::Record::User" => {
-		"lnfn" => {
-			name => "last name, first name",
-			fields => [ qw/last_name first_name/ ],
-		},
-	},
+	'WeBWorK::DB::Record::User' => [
+		[
+			'lnfn' => {
+				name   => 'last name, first name',
+				fields => [qw/last_name first_name/],
+			}
+		],
+	],
 };
 
 =head1 FUNCTIONS
 
 =over
 
-=item getSortsForClass($class)
+=item getSortsForClass($class, $default_sort)
 
-Given the name of a record class, returns the preset sorts available for that
+Given the name of a record class, returns the sort methods available for that
 class.
 
-The return value consists of a two-element list. The first element is a
-reference to a list of sort names. The second element is a reference to a hash
-mapping sort names to string descriptions.
+The return value is a reference to a list of two element lists. The first
+element in each list is a a string description of the sort method and the second
+element is the sort name.  The return value is suitable for passing as the
+second value argument to the Mojolicious select_field tag helper method.
 
-Together, these two lists are suitable for passing to the C<-values> and
-C<-labels> parameters of several CGI module methods, i.e. popup_menu(),
-scrolling_list(), checkbox_group(), and radio_group().
+If the C<$default_sort> is provided then that sort will be marked as the
+default selected sort.  Otherwise the first sort will be marked as the
+default selected sort.
 
 =cut
 
 sub getSortsForClass {
-	my ($class) = @_;
-	
-	my %class_presets = exists PRESET_SORTS->{$class} ? %{ PRESET_SORTS->{$class} } : ();
-	
-	my @field_order = $class->FIELDS;
-	my @preset_order = sort { $class_presets{$a}{name} cmp $class_presets{$b}{name} } keys %class_presets;
-	
-	my %fields = map { $_ => "Field: $_" } @field_order;
-	my %presets = map { $_ => "Preset: $class_presets{$_}{name}" } @preset_order;
-	
-	return ( [@field_order, @preset_order], {%fields, %presets} );
+	my ($class, $default_sort) = @_;
+
+	my @class_presets = exists PRESET_SORTS->{$class} ? @{ PRESET_SORTS->{$class} } : ();
+
+	my @fields  = map { [ "Field: $_" => $_, $_ eq $default_sort ? (selected => undef) : () ] } $class->FIELDS;
+	my @presets = map { [ "Preset: $_->[1]{name}" => $_->[0], $_->[0] eq $default_sort ? (selected => undef) : () ] }
+		@class_presets;
+
+	return [ @fields, @presets ];
 }
 
-=item sortRecords(\%options, @Records)
+=item sortRecords($preset_sort, @records)
 
-Given a sort specification (or the name of a preset format) and a list of
+Given a preset format or a field from a database record class, and a list of
 records, returns a list of the same records in order according to the sort.
 
-%options can consist of either:
+The C<$preset_sort> must be provided.  It must either be one of the presets
+defined above, or the name of a field in the database record class.
 
- preset => the name of a preset format listed by getFormatsForClass()
+=back
 
-or:
+=cut
 
- fields => a reference to a list of fields in the records' class
+sub sortRecords {
+	my ($preset_sort, @records) = @_;
 
-If C<preset> is given, and its value does not match any known preset but I<is>
-the name of a field in the record class, the records will be sorted by that
-field.
+	return unless @records;
 
-If C<fields> is given, the records are sorted according to the specified fields.
-If multiple fields are specified, the second field is is consulted if two
-records are found to have identical first fields, and so on.
+	# Get class info.  It is assumed that the records are all of the same class after the "Version" suffix is removed.
+	my $class = (ref $records[0]) =~ s/Version$//r;
 
-=cut
+	my @fields;
 
-# DBFIXME sorting should happen in database (ORDER BY clause)
-# DBFIXME (but what about programmatic sorting, like intelligent setID sorting � la sortByName?)
-sub sortRecords {
-	my ($options, @Records) = @_;
-	
-	# nothing to do
-	return () unless @Records;
-	
-	# get class info (we assume that the records are all of the same type)
-	my $class = ref $Records[0];
-	my %class_fields = map { $_ => 1 } $class->FIELDS;
-	
-	my %options = %$options;
-	
-	if (exists $options{"preset"}) {
-		my $preset = $options{preset};
-		
-		if (exists PRESET_SORTS->{$class} and exists PRESET_SORTS->{$class}->{$preset}) {
-			# an explicit preset exists
-			# replace the contents of %options with the values from the preset
-			%options = %{ PRESET_SORTS->{$class}->{$preset} };
-		} elsif (exists $class_fields{$preset}) {
-			# it's the name of a field in the current class, in which case we treat it as
-			# a "fields" sort with a single field
-			%options = ( fields => [ $preset ] );
+	if ($preset_sort) {
+		if (exists PRESET_SORTS->{$class}
+			&& (my $preset = (grep { $_->[0] eq $preset_sort } @{ PRESET_SORTS->{$class} })[0]))
+		{
+			# An explicit preset exists.
+			@fields = @{ $preset->[1]{fields} };
+		} elsif (grep { $_ eq $preset_sort } $class->FIELDS) {
+			# The preset is the name of a field in the current class, in which
+			# case treat it as a "fields" sort with a single field.
+			@fields = ($preset_sort);
 		} else {
-			croak "preset \"$preset\" not found for class \"$class\"";
-		}
-	}
-	
-	if (exists $options{fields}) {
-		my @fields = @{ $options{fields} };
-		
-		# test for existence of fields in class
-		foreach my $field (@fields) {
-			croak "field \"$field\" is not a field in class \"$class\"" unless exists $class_fields{$field};
+			croak qq{preset sort "$preset_sort" not found for class "$class"};
 		}
-		my $pack_key = sub { join "\0", map { lc $_[0]->$_ } @fields };
-		
-		# use the Orcish Maneuver to pack_key only once per record
-		keys my %or_cache = @Records; # set number of hash buckets
-		
-		return sort {
-			($or_cache{$a} ||= &$pack_key($a))
-				cmp
-			($or_cache{$b} ||= &$pack_key($b))
-		} @Records;
 	} else {
-		croak "sort type missing from options. specify one of: preset, fields";
+		croak 'A preset sort must be provided.';
 	}
-}
 
-=back
+	my $pack_key = sub {
+		join("\0", map { lc $_[0]->$_ } @fields);
+	};
 
-=head1 BUGS
+	# Use the Orcish Maneuver to pack_key only once per record
+	keys my %or_cache = @records;    # Set the number of hash buckets.
 
-No provision for case-insensitive, descending, or numeric sorting.
-
-No provision for programmatic sorts. While a one-time programmatic sort can be
-done easily without using this module, programmatic preset sorts would be
-useful, i.e. for intelligent sorting of set IDs.
-
-The fields being compared cannot contain nulls, because of the way packed keys
-are being generated.
-
-=cut
+	@records = sort { ($or_cache{$a} ||= $pack_key->($a)) cmp($or_cache{$b} ||= $pack_key->($b)) } @records;
+	return @records;
+}
 
 1;
diff --git a/lib/WeBWorK/Utils/Tags.pm b/lib/WeBWorK/Utils/Tags.pm
index 52cde8ded1..df6b1e368b 100644
--- a/lib/WeBWorK/Utils/Tags.pm
+++ b/lib/WeBWorK/Utils/Tags.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -13,7 +13,6 @@
 # Artistic License for more details.
 ################################################################################
 
-
 ###########################
 # Utils::Tags
 #
@@ -31,403 +30,410 @@ use IO::File;
 our @EXPORT    = ();
 our @EXPORT_OK = qw();
 
-use constant BASIC => qw( DBsubject DBchapter DBsection Date Institution Author MLT MLTleader Level Language Static MO Status );
+use constant BASIC =>
+	qw( DBsubject DBchapter DBsection Date Institution Author MLT MLTleader Level Language Static MO Status );
 use constant NUMBERED => qw( TitleText AuthorText EditionText Section Problem );
 
 # KEYWORDS and RESOURCES are treated specially since each takes a list of values
 
-my $basics = join('|', BASIC);
+my $basics   = join('|', BASIC);
 my $numbered = join('|', NUMBERED);
-my $re = qr/#\s*\b($basics)\s*\(\s*'?(.*?)'?\s*\)\s*$/;
+my $re       = qr/#\s*\b($basics)\s*\(\s*'?(.*?)'?\s*\)\s*$/;
 
 sub istagline {
-  my $line = shift;
-  return 1 if($line =~ /$re/);
-  return 1 if($line =~ /#\s*\bKEYWORDS?\s*\(\s*'?(.*?)'?\s*\)/);
-  return 1 if($line =~ /#\s*\bRESOURCES?\s*\(\s*'?(.*?)'?\s*\)/);
-  return 1 if($line =~ /#\s*\b($numbered)\d+\s*\(\s*'?(.*?)'?\s*\)/);
-  return 0;
+	my $line = shift;
+	return 1 if ($line =~ /$re/);
+	return 1 if ($line =~ /#\s*\bKEYWORDS?\s*\(\s*'?(.*?)'?\s*\)/);
+	return 1 if ($line =~ /#\s*\bRESOURCES?\s*\(\s*'?(.*?)'?\s*\)/);
+	return 1 if ($line =~ /#\s*\b($numbered)\d+\s*\(\s*'?(.*?)'?\s*\)/);
+	return 0;
 }
 
 sub kwtidy {
-  my $s = shift;
-  $s =~ s/\W//g;
-  $s =~ s/_//g;
-  $s = lc($s);
-  return($s);
+	my $s = shift;
+	$s =~ s/\W//g;
+	$s =~ s/_//g;
+	$s = lc($s);
+	return ($s);
 }
 
 sub keywordcleaner {
-  my $string = shift;
-  my @spl1 = split /,/, $string;
-#  my @spl2 = map(kwtidy($_), @spl1);
-  return(@spl1);
+	my $string = shift;
+	my @spl1   = split /,/, $string;
+	#  my @spl2 = map(kwtidy($_), @spl1);
+	return (@spl1);
 }
 
 sub mergekeywords {
-  my $self=shift;
-  my $kws=shift;
-  if(not defined($self->{keywords})) {
-    $self->{keywords} = $kws;
-    return;
-  }
-  if(not defined($kws)) {
-    return;
-  }
-  my @kw = @{$self->{keywords}};
-  for my $j (@{$kws}) {
-     my $old = 0;
-     for my $k (@kw) {
-       if(lc($k) eq lc($j)) {
-         $old = 1;
-         last;
-       }
-     }
-     push @kw, $j unless ($old);
-  }
-  $self->{keywords} = \@kw;
+	my $self = shift;
+	my $kws  = shift;
+	if (not defined($self->{keywords})) {
+		$self->{keywords} = $kws;
+		return;
+	}
+	if (not defined($kws)) {
+		return;
+	}
+	my @kw = @{ $self->{keywords} };
+	for my $j (@{$kws}) {
+		my $old = 0;
+		for my $k (@kw) {
+			if (lc($k) eq lc($j)) {
+				$old = 1;
+				last;
+			}
+		}
+		push @kw, $j unless ($old);
+	}
+	$self->{keywords} = \@kw;
 }
 
 # Note on texts, we store them in an array, but the index is one less than on
 #    the corresponding tag.
 sub isnewtext {
-  my $self = shift;
-  my $ti = shift;
-  for my $j (@{$self->{textinfo}}) {
-    my $ok = 1;
-    for my $k ('TitleText', 'EditionText', 'AuthorText') {
-      if($ti->{$k} ne $j->{$k}) {
-        $ok = 0;
-        last;
-      }
-    }
-    return 0 if($ok);
-  }
-  return 1;
+	my $self = shift;
+	my $ti   = shift;
+	for my $j (@{ $self->{textinfo} }) {
+		my $ok = 1;
+		for my $k ('TitleText', 'EditionText', 'AuthorText') {
+			if ($ti->{$k} ne $j->{$k}) {
+				$ok = 0;
+				last;
+			}
+		}
+		return 0 if ($ok);
+	}
+	return 1;
 }
 
 sub mergetexts {
-  my $self=shift;
-  my $newti=shift;
-  for my $ti (@$newti) {
-    if($self->isnewtext($ti)) {
-      my @tia = @{$self->{textinfo}};
-      push @tia, $ti;
-      $self->{textinfo} = \@tia;
-    }
-  }
+	my $self  = shift;
+	my $newti = shift;
+	for my $ti (@$newti) {
+		if ($self->isnewtext($ti)) {
+			my @tia = @{ $self->{textinfo} };
+			push @tia, $ti;
+			$self->{textinfo} = \@tia;
+		}
+	}
 }
 
 # Set a tag with a value
 sub settag {
-  my $self = shift;
-  my $tagname = shift;
-  my $newval = shift;
-  my $force = shift;
-
-  if(defined($newval) and ((defined($force) and $force) or $newval) and ((not defined($self->{$tagname})) or ($newval ne $self->{$tagname}))) {
-    $self->{modified}=1;
-    $self->{$tagname} = $newval;
-  }
+	my $self    = shift;
+	my $tagname = shift;
+	my $newval  = shift;
+	my $force   = shift;
+
+	if (defined($newval)
+		and ((defined($force) and $force) or $newval)
+		and ((not defined($self->{$tagname})) or ($newval ne $self->{$tagname})))
+	{
+		$self->{modified} = 1;
+		$self->{$tagname} = $newval;
+	}
 }
 
 # Similar, but add a resource to the list
 sub addresource {
-  my $self = shift;
-  my $resc = shift;
-
-  if(not defined($self->{resources})) {
-    $self->{resources} = [$resc];
-  } else {
-    unless(grep(/^$resc$/, @{$self->{resources}} )) {
-      push @{$self->{resources}}, $resc;
-    }
-  }
+	my $self = shift;
+	my $resc = shift;
+
+	if (not defined($self->{resources})) {
+		$self->{resources} = [$resc];
+	} else {
+		unless (grep(/^$resc$/, @{ $self->{resources} })) {
+			push @{ $self->{resources} }, $resc;
+		}
+	}
 }
 
 sub printtextinfo {
-  my $textref = shift;
-  print "{";
-  for my $k (keys %{$textref}){
-    print "$k -> ".$textref->{$k}.", ";
-  }
-  print "}\n";
+	my $textref = shift;
+	print "{";
+	for my $k (keys %{$textref}) {
+		print "$k -> " . $textref->{$k} . ", ";
+	}
+	print "}\n";
 }
 
 sub printalltextinfo {
-  my $self = shift;
-  for my $j (@{$self->{textinfo}}) {
-    printtextinfo $j;
-  }
+	my $self = shift;
+	for my $j (@{ $self->{textinfo} }) {
+		printtextinfo $j;
+	}
 }
 
 sub maybenewtext {
-  my $textno = shift;
-  my $textinfo = shift ;
-  return $textinfo if defined($textinfo->[$textno-1]);
-  # So, not defined yet
-  $textinfo->[$textno-1] = { TitleText => '', AuthorText =>'', EditionText =>'',
-             section => '', chapter =>'', problems => [] };
-  return $textinfo;
+	my $textno   = shift;
+	my $textinfo = shift;
+	return $textinfo if defined($textinfo->[ $textno - 1 ]);
+	# So, not defined yet
+	$textinfo->[ $textno - 1 ] = {
+		TitleText   => '',
+		AuthorText  => '',
+		EditionText => '',
+		section     => '',
+		chapter     => '',
+		problems    => []
+	};
+	return $textinfo;
 }
 
 sub gettextnos {
-  my $textinfo = shift;
-  return grep { defined $textinfo->[$_] } (0..(scalar(@{$textinfo})-1));
+	my $textinfo = shift;
+	return grep { defined $textinfo->[$_] } (0 .. (scalar(@{$textinfo}) - 1));
 }
 
 sub tidytextinfo {
-  my $self = shift;
-  my @textnos = gettextnos($self->{textinfo});
-  my $ntxts = scalar(@textnos);
-  if($ntxts and ($ntxts-1) != $textnos[-1]) {
-    $self->{modified} = 1;
-    my @tmptexts = grep{ defined $_ } @{$self->{textinfo}};
-    $self->{textinfo} = \@tmptexts;
-  }
+	my $self    = shift;
+	my @textnos = gettextnos($self->{textinfo});
+	my $ntxts   = scalar(@textnos);
+	if ($ntxts and ($ntxts - 1) != $textnos[-1]) {
+		$self->{modified} = 1;
+		my @tmptexts = grep { defined $_ } @{ $self->{textinfo} };
+		$self->{textinfo} = \@tmptexts;
+	}
 }
 
-
 # name is a path
 
 sub new {
-  my $class = shift;
-  my $name = shift;
-  my $self = {};
-
-  $self->{isplaceholder} = 0;
-  $self->{modified} = 0;
-  my $lasttag = 1;
-
-  my ($text, $edition, $textauthor, $textsection, $textproblem);
-  my $textno;
-  my $textinfo=[];
-
-  open(IN,'<:encoding(UTF-8)',"$name") or die "can not open $name: $!";
-  if ($name !~ /pg$/ && $name !~ /\.pg\.[-a-zA-Z0-9_.@]*\.tmp$/) {
-    warn "Not a pg file";  #print caused trouble with XMLRPC 
-    $self->{file}= undef;
-    bless($self, $class);
-    return $self;
-  }
-  my $lineno = 0;
-  $self->{file} = $name;
-
-  # Initialize some values
-  for my $tagname ( BASIC ) {
-    $self->{$tagname} = '';
-  }
-  $self->{keywords} = [];
-  $self->{resources} = [];
-  #$self->{Language} = 'eng'; # Default to English
-
-
-  while (<IN>) {
-  $lineno++;
-  eval {
-  SWITCH: {
-      if (/#\s*\bKEYWORDS\((.*)\)/i) {
-
-			my @keyword = keywordcleaner($1);
-			@keyword = grep { not /^\s*'?\s*'?\s*$/ } @keyword;
-			$self->{keywords} = [@keyword];
-			$lasttag = $lineno;
-        last SWITCH;
-      }
-      if (/#\s*\bRESOURCES\((.*)\)/i) {
-        my @resc = keywordcleaner($1); # splits on comma
-		s/["'\s]*$//g for (@resc);
-		s/^["'\s]*//g for (@resc);
-		@resc = grep { not /^\s*'?\s*'?\s*$/ } @resc;
-        $self->{resources} = [@resc];
-        $lasttag = $lineno;
-        last SWITCH;
-      }
-      if (/$re/) { # Checks all other un-numbered tags
-        my $tmp1 = $1;
-        my $tmp = $2;
-        #$tmp =~ s/'/\'/g;
-        $tmp =~ s/\s+$//;
-        $tmp =~ s/^\s+//;
-        $self->{$tmp1} = $tmp;
-        $lasttag = $lineno;
-        last SWITCH;
-      }
-
-      if (/#\s*\bTitleText(\d+)\(\s*'?(.*?)'?\s*\)/) {
-        $textno = $1;
-        $text = $2;
-        $text =~ s/'/\'/g;
-        if ($text =~ /\S/) {
-          $textinfo = maybenewtext($textno, $textinfo);
-          $textinfo->[$textno-1]->{TitleText} = $text;
-        }
-        $lasttag = $lineno;
-        last SWITCH;
-      }
-      if (/#\s*\bEditionText(\d+)\(\s*'?(.*?)'?\s*\)/) {
-        $textno = $1;
-        $edition = $2;
-        $edition =~ s/'/\'/g;
-        if ($edition =~ /\S/) {
-          $textinfo = maybenewtext($textno, $textinfo);
-          $textinfo->[$textno-1]->{EditionText} = $edition;
-        }
-        $lasttag = $lineno;
-        last SWITCH;
-      }
-      if (/#\s*\bAuthorText(\d+)\(\s*'?(.*?)'?\s*\)/) {
-        $textno = $1;
-        $textauthor = $2;
-        $textauthor =~ s/'/\'/g;
-        if ($textauthor =~ /\S/) {
-          $textinfo = maybenewtext($textno, $textinfo);
-          $textinfo->[$textno-1]->{AuthorText} = $textauthor;
-        }
-        $lasttag = $lineno;
-        last SWITCH;
-      }
-      if (/#\s*\bSection(\d+)\(\s*'?(.*?)'?\s*\)/) {
-        $textno = $1;
-        $textsection = $2;
-        $textsection =~ s/'/\'/g;
-		$textsection =~ s/[^\d\.]//g;
-		#print "|$textsection|\n";
-        if ($textsection =~ /\S/) {
-          $textinfo = maybenewtext($textno, $textinfo);
-          if ($textsection =~ /(\d*?)\.(\d*)/) {
-            $textinfo->[$textno-1]->{chapter} = $1;
-            $textinfo->[$textno-1]->{section} = $2;
-          } else {
-            $textinfo->[$textno-1]->{chapter} = $textsection;
-            $textinfo->[$textno-1]->{section} = -1;
-          }
-        }
-        $lasttag = $lineno;
-        last SWITCH;
-      }
-      if (/#\s*\bProblem(\d+)\(\s*(.*?)\s*\)/) {
-        $textno = $1;
-        $textproblem = $2;
-        $textproblem =~ s/\D/ /g;
-				my @textproblems = (-1);
-        @textproblems = split /\s+/, $textproblem;
-        @textproblems = grep { $_ =~ /\S/ } @textproblems;
-        if (scalar(@textproblems) or defined($textinfo->[$textno])) {
-          @textproblems = (-1) unless(scalar(@textproblems));
-          $textinfo = maybenewtext($textno, $textinfo);
-          $textinfo->[$textno-1]->{problems} = \@textproblems;
-        }
-        $lasttag = $lineno;
-        last SWITCH;
-      }
-    }  # end of SWITCH
-    }; # end of eval error trap
-	warn "error reading problem $name $!, $@ " if $@;
-    
-    }                                               #end of while
-  $self->{textinfo} = $textinfo;
-
-  if (defined($self->{DBchapter}) and $self->{DBchapter} eq 'ZZZ-Inserted Text') {
-    $self->{isplaceholder} = 1;
-  }
-
-
-  $self->{lasttagline}=$lasttag;
-  bless($self, $class);
-  $self->tidytextinfo();
-#  $self->printalltextinfo();
-  return $self;
+	my $class = shift;
+	my $name  = shift;
+	my $self  = {};
+
+	$self->{isplaceholder} = 0;
+	$self->{modified}      = 0;
+	my $lasttag = 1;
+
+	my ($text, $edition, $textauthor, $textsection, $textproblem);
+	my $textno;
+	my $textinfo = [];
+
+	open(IN, '<:encoding(UTF-8)', "$name") or die "can not open $name: $!";
+	if ($name !~ /pg$/ && $name !~ /\.pg\.[-a-zA-Z0-9_.@]*\.tmp$/) {
+		warn "Not a pg file";    #print caused trouble with XMLRPC
+		$self->{file} = undef;
+		bless($self, $class);
+		return $self;
+	}
+	my $lineno = 0;
+	$self->{file} = $name;
+
+	# Initialize some values
+	for my $tagname (BASIC) {
+		$self->{$tagname} = '';
+	}
+	$self->{keywords}  = [];
+	$self->{resources} = [];
+	#$self->{Language} = 'eng'; # Default to English
+
+	while (<IN>) {
+		$lineno++;
+		eval {
+		SWITCH: {
+				if (/#\s*\bKEYWORDS\((.*)\)/i) {
+
+					my @keyword = keywordcleaner($1);
+					@keyword          = grep { not /^\s*'?\s*'?\s*$/ } @keyword;
+					$self->{keywords} = [@keyword];
+					$lasttag          = $lineno;
+					last SWITCH;
+				}
+				if (/#\s*\bRESOURCES\((.*)\)/i) {
+					my @resc = keywordcleaner($1);    # splits on comma
+					s/["'\s]*$//g for (@resc);
+					s/^["'\s]*//g for (@resc);
+					@resc              = grep { not /^\s*'?\s*'?\s*$/ } @resc;
+					$self->{resources} = [@resc];
+					$lasttag           = $lineno;
+					last SWITCH;
+				}
+				if (/$re/) {    # Checks all other un-numbered tags
+					my $tmp1 = $1;
+					my $tmp  = $2;
+					#$tmp =~ s/'/\'/g;
+					$tmp =~ s/\s+$//;
+					$tmp =~ s/^\s+//;
+					$self->{$tmp1} = $tmp;
+					$lasttag = $lineno;
+					last SWITCH;
+				}
+
+				if (/#\s*\bTitleText(\d+)\(\s*'?(.*?)'?\s*\)/) {
+					$textno = $1;
+					$text   = $2;
+					$text =~ s/'/\'/g;
+					if ($text =~ /\S/) {
+						$textinfo = maybenewtext($textno, $textinfo);
+						$textinfo->[ $textno - 1 ]->{TitleText} = $text;
+					}
+					$lasttag = $lineno;
+					last SWITCH;
+				}
+				if (/#\s*\bEditionText(\d+)\(\s*'?(.*?)'?\s*\)/) {
+					$textno  = $1;
+					$edition = $2;
+					$edition =~ s/'/\'/g;
+					if ($edition =~ /\S/) {
+						$textinfo = maybenewtext($textno, $textinfo);
+						$textinfo->[ $textno - 1 ]->{EditionText} = $edition;
+					}
+					$lasttag = $lineno;
+					last SWITCH;
+				}
+				if (/#\s*\bAuthorText(\d+)\(\s*'?(.*?)'?\s*\)/) {
+					$textno     = $1;
+					$textauthor = $2;
+					$textauthor =~ s/'/\'/g;
+					if ($textauthor =~ /\S/) {
+						$textinfo = maybenewtext($textno, $textinfo);
+						$textinfo->[ $textno - 1 ]->{AuthorText} = $textauthor;
+					}
+					$lasttag = $lineno;
+					last SWITCH;
+				}
+				if (/#\s*\bSection(\d+)\(\s*'?(.*?)'?\s*\)/) {
+					$textno      = $1;
+					$textsection = $2;
+					$textsection =~ s/'/\'/g;
+					$textsection =~ s/[^\d\.]//g;
+					#print "|$textsection|\n";
+					if ($textsection =~ /\S/) {
+						$textinfo = maybenewtext($textno, $textinfo);
+						if ($textsection =~ /(\d*?)\.(\d*)/) {
+							$textinfo->[ $textno - 1 ]->{chapter} = $1;
+							$textinfo->[ $textno - 1 ]->{section} = $2;
+						} else {
+							$textinfo->[ $textno - 1 ]->{chapter} = $textsection;
+							$textinfo->[ $textno - 1 ]->{section} = -1;
+						}
+					}
+					$lasttag = $lineno;
+					last SWITCH;
+				}
+				if (/#\s*\bProblem(\d+)\(\s*(.*?)\s*\)/) {
+					$textno      = $1;
+					$textproblem = $2;
+					$textproblem =~ s/\D/ /g;
+					my @textproblems = (-1);
+					@textproblems = split /\s+/, $textproblem;
+					@textproblems = grep { $_ =~ /\S/ } @textproblems;
+					if (scalar(@textproblems) or defined($textinfo->[$textno])) {
+						@textproblems                          = (-1) unless (scalar(@textproblems));
+						$textinfo                              = maybenewtext($textno, $textinfo);
+						$textinfo->[ $textno - 1 ]->{problems} = \@textproblems;
+					}
+					$lasttag = $lineno;
+					last SWITCH;
+				}
+			}    # end of SWITCH
+		};    # end of eval error trap
+		warn "error reading problem $name $!, $@ " if $@;
+
+	}    #end of while
+	$self->{textinfo} = $textinfo;
+
+	if (defined($self->{DBchapter}) and $self->{DBchapter} eq 'ZZZ-Inserted Text') {
+		$self->{isplaceholder} = 1;
+	}
+
+	$self->{lasttagline} = $lasttag;
+	bless($self, $class);
+	$self->tidytextinfo();
+	#  $self->printalltextinfo();
+	return $self;
 }
 
 sub isplaceholder {
-  my $self = shift;
-  return $self->{isplaceholder};
+	my $self = shift;
+	return $self->{isplaceholder};
 }
 
 sub istagged {
-  my $self = shift;
-  #return 1 if (defined($self->{DBchapter}) and $self->{DBchapter} and (not $self->{isplaceholder}));
-  return 1 if (defined($self->{DBsubject}) and $self->{DBsubject} and (not $self->{isplaceholder}));
+	my $self = shift;
+	#return 1 if (defined($self->{DBchapter}) and $self->{DBchapter} and (not $self->{isplaceholder}));
+	return 1 if (defined($self->{DBsubject}) and $self->{DBsubject} and (not $self->{isplaceholder}));
 	return 0;
 }
 
 # Try to copy in the contents of another Tag object.
 # Return 1 if ok, 0 if not compatible
 sub copyin {
-  my $self = shift;
-  my $ob = shift;
-#  for my $j (qw( DBsubject DBchapter DBsection )) {
-#    if($self->{$j} =~ /\S/ and $ob->{$j} =~ /\S/ and $self->{$j} ne $ob->{$j}) {
-#    #  print "Incompatible $j: ".$self->{$j}." vs ".$ob->{$j} ."\n";
-#      return 0;
-#    }
-#  }
-  # Just copy in all basic tags
-  for my $j (qw( DBsubject DBchapter DBsection MLT MLTleader Level )) {
-    $self->settag($j, $ob->{$j}) if(defined($ob->{$j}));
-  }
-  # Now copy in keywords
-  $self->mergekeywords($ob->{keywords});
-  # Finally, textbooks
-  $self->mergetexts($ob->{textinfo});
-  return 1;
+	my $self = shift;
+	my $ob   = shift;
+	#  for my $j (qw( DBsubject DBchapter DBsection )) {
+	#    if($self->{$j} =~ /\S/ and $ob->{$j} =~ /\S/ and $self->{$j} ne $ob->{$j}) {
+	#    #  print "Incompatible $j: ".$self->{$j}." vs ".$ob->{$j} ."\n";
+	#      return 0;
+	#    }
+	#  }
+	# Just copy in all basic tags
+	for my $j (qw( DBsubject DBchapter DBsection MLT MLTleader Level )) {
+		$self->settag($j, $ob->{$j}) if (defined($ob->{$j}));
+	}
+	# Now copy in keywords
+	$self->mergekeywords($ob->{keywords});
+	# Finally, textbooks
+	$self->mergetexts($ob->{textinfo});
+	return 1;
 }
 
 sub dumptags {
-  my $self = shift;
-  my $fh = shift;
-
-  for my $tagname ( BASIC ) {
-    print $fh "## $tagname(".$self->{$tagname}.")\n" if($self->{$tagname});
-  }
-  my @textinfo = @{$self->{textinfo}};
-  my $textno = 0;
-  for my $ti (@textinfo) {
-    $textno++;
-    for my $nw ( NUMBERED ) {
-      if($nw eq 'Problem') {
-        print $fh "## $nw$textno('".join(' ', @{$ti->{problems}})."')\n";
-        next;
-      }
-      if($nw eq 'Section') {
-        if($ti->{section} eq '-1') {
-          print $fh "## Section$textno('".$ti->{chapter}."')\n";
-        } else {
-          print $fh "## Section$textno('".$ti->{chapter}.".".$ti->{section}."')\n";
-        }
-        next;
-      }
-      print $fh "## $nw$textno('".$ti->{$nw}."')\n";
-    }
-  }
-  print $fh "## KEYWORDS(".join(',', @{$self->{keywords}}).")\n" if(scalar(@{$self->{keywords}}));
-  my @resc;
-  if(scalar(@{$self->{resources}})) {
-	@resc = @{$self->{resources}};
-	s/^/'/g for (@resc);
-	s/$/'/g for (@resc);
-    print $fh "## RESOURCES(".join(',', @resc).")\n";
-  }
+	my $self = shift;
+	my $fh   = shift;
+
+	for my $tagname (BASIC) {
+		print $fh "## $tagname(" . $self->{$tagname} . ")\n" if ($self->{$tagname});
+	}
+	my @textinfo = @{ $self->{textinfo} };
+	my $textno   = 0;
+	for my $ti (@textinfo) {
+		$textno++;
+		for my $nw (NUMBERED) {
+			if ($nw eq 'Problem') {
+				print $fh "## $nw$textno('" . join(' ', @{ $ti->{problems} }) . "')\n";
+				next;
+			}
+			if ($nw eq 'Section') {
+				if ($ti->{section} eq '-1') {
+					print $fh "## Section$textno('" . $ti->{chapter} . "')\n";
+				} else {
+					print $fh "## Section$textno('" . $ti->{chapter} . "." . $ti->{section} . "')\n";
+				}
+				next;
+			}
+			print $fh "## $nw$textno('" . $ti->{$nw} . "')\n";
+		}
+	}
+	print $fh "## KEYWORDS(" . join(',', @{ $self->{keywords} }) . ")\n" if (scalar(@{ $self->{keywords} }));
+	my @resc;
+	if (scalar(@{ $self->{resources} })) {
+		@resc = @{ $self->{resources} };
+		s/^/'/g for (@resc);
+		s/$/'/g for (@resc);
+		print $fh "## RESOURCES(" . join(',', @resc) . ")\n";
+	}
 }
 
 # Write the file
 sub write {
-  my $self=shift;
-  # First read it into an array
-  open(IN,$self->{file}) or die "can not open $self->{file}: $!";
-  my @lines = <IN>;
-  close(IN);
-  my $fh = IO::File->new(">".$self->{file}) or die "can not open $self->{file}: $!";
-  my ($line, $lineno)=('', 0); 
-  while($line = shift @lines) {
-    $lineno++; 
-    $self->dumptags($fh) if($lineno == $self->{lasttagline});
-    next if istagline($line);
-    print $fh $line;
-  }
-
-  $fh->close();
+	my $self = shift;
+	# First read it into an array
+	open(IN, $self->{file}) or die "can not open $self->{file}: $!";
+	my @lines = <IN>;
+	close(IN);
+	my $fh = IO::File->new(">" . $self->{file}) or die "can not open $self->{file}: $!";
+	my ($line, $lineno) = ('', 0);
+	while ($line = shift @lines) {
+		$lineno++;
+		$self->dumptags($fh) if ($lineno == $self->{lasttagline});
+		next                 if istagline($line);
+		print $fh $line;
+	}
+
+	$fh->close();
 }
 
 1;
diff --git a/lib/WeBWorK/Utils/Tasks.pm b/lib/WeBWorK/Utils/Tasks.pm
index 633e2dcd87..1a27cd5a50 100644
--- a/lib/WeBWorK/Utils/Tasks.pm
+++ b/lib/WeBWorK/Utils/Tasks.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -14,49 +14,46 @@
 ################################################################################
 
 package WeBWorK::Utils::Tasks;
-use base qw(Exporter);
+use parent qw(Exporter);
 
 =head1 NAME
 
-WeBWorK::Utils::Tasks - utilities for doing single tasks, like rendering a
-problem by itself.
+WeBWorK::Utils::Tasks - This is an inappropriately named package.  It used to
+render problems which is not really a task.  Now the only this it provides are
+utilities for creating fake database records.
 
 =head1 SYNOPSIS
 
- use WeBWorK::Utils::Tasks qw(renderProblems);
+    use WeBWorK::Utils::Tasks qw(
+        fake_set
+        fake_set_version
+        fake_problem
+        fake_user
+    );
 
 =head1 DESCRIPTION
 
-This module provides functions for rendering html from files outside the normal
-context of being for a particular user in an existing problem set.
-
-It also provides functions which are useful for taking problems which are not
-part of any set and making live versions of them, or loading them into the
+This module provides functions which are useful for taking problems which are
+not part of any set and making live versions of them, or loading them into the
 editor.
 
 =cut
 
-# Ultimately, this may provide functions for turning problems into hardcopy or
-# other tasks that can be separated out of specific content managers.
-
 use strict;
 use warnings;
+
 use Carp;
-use WeBWorK::PG; 
-use WeBWorK::DB::Utils qw(global2user); 
-use WeBWorK::Form;
-use WeBWorK::Debug;
 
-our @EXPORT    = ();
+use WeBWorK::DB::Utils qw(global2user);
+
 our @EXPORT_OK = qw(
-	renderProblems
 	fake_set
 	fake_set_version
 	fake_problem
 	fake_user
 );
 
-use constant fakeSetName => "Undefined_Set";
+use constant fakeSetName  => "Undefined_Set";
 use constant fakeUserName => "Undefined_User";
 
 =head1 FUNCTIONS
@@ -71,34 +68,33 @@ Given a database, make a temporary problem set for that database.
 
 =cut
 
-sub fake_set { 
-	my $db = shift; 
- 
-	my $set = $db->newGlobalSet(); 
-	$set = global2user($db->{set_user}->{record}, $set); 
-	$set->psvn(123); 
-	$set->set_id(fakeSetName); 
+sub fake_set {
+	my $db = shift;
+
+	my $set = $db->newGlobalSet();
+	$set = global2user($db->{set_user}->{record}, $set);
+	$set->psvn(123);
+	$set->set_id(fakeSetName);
 	$set->open_date(time());
 	$set->due_date(time());
 	$set->answer_date(time());
 	$set->visible(0);
 	$set->enable_reduced_scoring(0);
 	$set->hardcopy_header("defaultHeader");
-	return($set); 
-} 
-
-sub fake_set_version { 
-	my $db = shift; 
- 
-	my $set = $db->newSetVersion(); 
-	# $set = global2user($db->{set_user}->{record}, $set); 
-	$set->psvn(123); 
-	$set->set_id(fakeSetName); 
+	return ($set);
+}
+
+sub fake_set_version {
+	my $db = shift;
+
+	my $set = $db->newSetVersion();
+	$set->psvn(123);
+	$set->set_id(fakeSetName);
 	$set->open_date(time());
 	$set->due_date(time());
 	$set->answer_date(time());
 	$set->visible(0);
-	$set->enable_reduced_scoring(); 
+	$set->enable_reduced_scoring();
 	$set->hardcopy_header("defaultHeader");
 	$set->version_id(1);
 	$set->attempts_per_version(0);
@@ -109,9 +105,8 @@ sub fake_set_version {
 	$set->hide_work('N');
 	$set->restrict_ip('No');
 
-	return($set); 
-} 
-
+	return ($set);
+}
 
 =item fake_problem
 
@@ -123,42 +118,31 @@ specified, 0 is used.
 
 =cut
 
-sub fake_problem { 
-	my $db = shift; 
-	my %options = @_;
-	my $problem = $db->newGlobalProblem(); 
-	#debug("In fake_problem");
-
-	$problem = global2user($db->{problem_user}->{record}, $problem); 
-	$problem->set_id(fakeSetName); 
-	$problem->value(""); 
-	$problem->max_attempts("-1"); 
-	$problem->showMeAnother("-1"); 
-	$problem->showMeAnotherCount("0"); 
- 
-	$problem->problem_seed(0); 
-	$problem->problem_seed($options{'problem_seed'})
-		 if(defined($options{'problem_seed'}));
-
-	$problem->status(0);
-	$problem->sub_status(0); 
-	$problem->attempted(2000);  # Large so hints won't be blocked
-	$problem->last_answer(""); 
-	$problem->num_correct(1000); 
-	$problem->num_incorrect(1000); 
-	$problem->prCount(-10); # Negative to detect fake problems and disable problem randomization.
-
-	#for my $key (keys(%{$problem})){
-	#	my $value = '####UNDEF###';
-	#	if ($problem->{$key}) {
-	#		$value = $problem->{$key};
-	#	}
-	#	debug($key . " : " . $value);
-	#}
+sub fake_problem {
+	my ($db, %options) = @_;
+	my $problem = $db->newGlobalProblem();
 
+	$problem = global2user($db->{problem_user}->{record}, $problem);
+	$problem->set_id(fakeSetName);
+	$problem->value("");
+	$problem->max_attempts("-1");
+	$problem->showMeAnother("-1");
+	$problem->showMeAnotherCount("0");
+	$problem->showHintsAfter(2);
 
+	$problem->problem_seed(0);
+	$problem->problem_seed($options{'problem_seed'})
+		if (defined($options{'problem_seed'}));
 
-	return($problem); 
+	$problem->status(0);
+	$problem->sub_status(0);
+	$problem->attempted(2000);    # Large so hints won't be blocked
+	$problem->last_answer("");
+	$problem->num_correct(1000);
+	$problem->num_incorrect(1000);
+	$problem->prCount(-10);       # Negative to detect fake problems and disable problem randomization.
+
+	return ($problem);
 }
 
 =item fake_user
@@ -172,169 +156,19 @@ Make a temporary user for the given database.
 sub fake_user {
 	my ($db) = @_;
 	return $db->newUser(
-		user_id => fakeUserName,
-		first_name=>'',
-		last_name=>'',
-		email_address=>'',
-		student_id=>'',
-		section=>'',
-		recitation=>'',
-		comment=>'',
+		user_id       => fakeUserName,
+		first_name    => '',
+		last_name     => '',
+		email_address => '',
+		student_id    => '',
+		section       => '',
+		recitation    => '',
+		comment       => '',
 	);
 }
 
-=item renderProblems
-
- renderProblems({ r => $r, user => $User, problem_list => \@problem_list });
-
-Given a hash that contains an Apache request object, the current user, and a
-list of problem files, return a list of WeBWorK::PG objects which contain
-rendered versions of the problems.
-
-
-Options:
-
-=over
-
-=item r
-
-A WeBWorK::Request object. Required.
-
-=item problem_list
-
-A reference to an array of items render. Required. Each item can either be a
-string, which is interpreted as a path to a PG file, or a reference to a string,
-which is interpreted as a complete PG program.
-
-=item user
-
-A User record (e.g. a WeBWorK::DB::Record::User object). Optional. If not
-specified, fake_user() will be used to generate a temporary user record.
-
-=item this_set
-
-A Set record (e.g. a WeBWorK::DB::Record::UserSet object). Optional. If not
-specified, fake_set() will be used to generate a temporary set record.
-
-=item problem_seed
-
-The seed to use for randomization. Optional. If not specified, the Request
-object will be checked for a problem_seed parameter. If found, that value is
-used. Otherwise, 0 is used.
-
-=item displayMode
-
-The display mode to use. Optional. If not specified, the Request object will be
-checked for a displayMode parameter. If found, that value is used. Otherwise,
-the default display mode is used.
-
-If the value is 'None', then problems will not be rendered and "fake"
-WeBWorK::PG objects will be returned. Each "fake" WeBWorK::PG object will look
-like:
-
- {body_text=>''}
-
-=item showHints
-
-Whether to show hints in the problem. Optional. If not specified, hints are not
-shown.
-
-=item showSolutions
-
-Whether to show solutions in the problem. Optional. If not specified, solutions
-are not shown.
-
-=item problemNumber
-
-Each problem in @problem_list is given a problem ID starting with this value.
-Optional. If not specified the problems are numbered from 1.
-
 =back
 
 =cut
 
-sub renderProblems {
-	my %args = @_;
-	my $r = $args{r};
-	my $db = $r->db;
-	my $ce = $r->ce; 
-
-	# Don't print file names as part of the problem to avoid redundant 
-	# paths in Library Browser and Homework Sets editor
-	$ce->{pg}->{specialPGEnvironmentVars}->{PRINT_FILE_NAMES_FOR}=[];
-
-	my @problem_list = @{$args{problem_list}};
-	my $displayMode = $args{displayMode}
-    	|| $r->param('displayMode')
-		|| $ce->{pg}{options}{displayMode};
-	
-	# special case for display mode 'None' -- we don't have to do anything
-	# FIXME i think this should be handled in SetMaker.pm
-	# SetMaker is not the only user of 'None'
-	if ($displayMode eq 'None') {
-		return map { {body_text=>''} } @problem_list;
-	}
-	
-	my $user = $args{user} || fake_user($db);
-	my $set = $args{'this_set'} || fake_set($db);
-	my $problem_seed = $args{'problem_seed'} || $r->param('problem_seed') || 0;
-	my $showHints = $args{showHints} || 0;
-	my $showSolutions = $args{showSolutions} || 0;
-	my $problemNumber = $args{'problem_number'} || 1;
-	
-	my $key = $r->param('key');
-	
-	# remove any pretty garbage around the problem
-	local $ce->{pg}{specialPGEnvironmentVars}{problemPreamble} = {TeX=>'',HTML=>''};
-	local $ce->{pg}{specialPGEnvironmentVars}{problemPostamble} = {TeX=>'',HTML=>''};
-	my $problem = fake_problem($db, 'problem_seed'=>$problem_seed);
-	$problem->{value} = -1;
-	my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars };
-	
-	my @output;
-
-	foreach my $onefile (@problem_list) {
-		my $translationOptions = {
-			displayMode     => $displayMode,
-			showHints       => $showHints,
-			showSolutions   => $showSolutions,
-			refreshMath2img => 0,
-			processAnswers  => 0,
-		};
-		
-		$problem->problem_id($problemNumber++);
-		if (ref $onefile) {
-			$problem->source_file('');
-			$translationOptions->{r_source} = $onefile;
-		} else {
-			$problem->source_file($onefile);
-		}
-		
-		my $pg = new WeBWorK::PG(
-			$ce,
-			$user,
-			$key,
-			$set,
-			$problem,
-			123,
-			$formFields,
-			$translationOptions,
-        );
-
-		push @output, $pg;
-	}
-	
-	return @output;
-}
-
-=back
-
-=cut
-
-=head1 AUTHOR
-
-Written by John Jones, jj (at) asu.edu.
-
-=cut
-
 1;
diff --git a/lib/WebworkClient.pm b/lib/WebworkClient.pm
deleted file mode 100644
index 8cbddd8418..0000000000
--- a/lib/WebworkClient.pm
+++ /dev/null
@@ -1,799 +0,0 @@
-#!/usr/bin/perl -w
-
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-=head1 NAME
-
-WebworkClient.pm
-
-
-=head1 SYNPOSIS
-
-	our $xmlrpc_client = new WebworkClient (
-		url                    => $ce->{server_site_url}, 
-		form_action_url        => $FORM_ACTION_URL,
-		site_password          =>  $XML_PASSWORD//'',
-		courseID               =>  $credentials{courseID},
-		userID                 =>  $credentials{userID},
-		session_key            =>  $credentials{session_key}//'',
-		sourceFilePath         =>  $fileName,
-	);
-
-Remember to configure the local output file and display command !!!!!!!!
-
-
-
-=head1 DESCRIPTION
-
-This script will take a file and send it to a WeBWorK daemon webservice
-to have it rendered.  
-
-The result returned is split into the basic HTML rendering
-and evaluation of answers and then passed to a browser for printing.
-
-The formatting allows the browser presentation to be interactive with the 
-daemon running the script webwork2/lib/renderViaXMLRPC.pm  
-and with instructorXMLRPChandler.
-
-See WebworkWebservice.pm  for related modules which operate on the server side
-
-	WebworkXMLRPC (contained in WebworkWebservice.pm)
-	renderViaXMLRPC
-	instructorXMLRPChandler
-
-=cut
-
-use strict;
-use warnings;
-
-
-# To configure the target webwork server
-# two URLs are required
-# 1. $SITE_URL   http://test.webwork.maa.org/mod_xmlrpc
-#    points to the Webservice.pm and Webservice/RenderProblem modules
-#    Is used by the client to send the original XML request to the webservice
-#    Note: This is not the same as the webworkClient->url which should NOT have
-#          the mod_xmlrpc segment. 
-#
-# 2. $FORM_ACTION_URL      http:http://test.webwork.maa.org/webwork2/html2xml
-#    points to the renderViaXMLRPC.pm module.
-#
-#     This url is placed as form action url when the rendered HTML from the original
-#     request is returned to the client from Webservice/RenderProblem. The client
-#     reorganizes the XML it receives into an HTML page (with a WeBWorK form) and 
-#     pipes it through a local browser.
-#
-#     The browser uses this url to resubmit the problem (with answers) via the standard
-#     HTML webform used by WeBWorK to the renderViaXMLRPC.pm handler.  
-#
-#     This renderViaXMLRPC.pm handler acts as an intermediary between the browser 
-#     and the webservice.  It interprets the HTML form sent by the browser, 
-#     rewrites the form data in XML format, submits it to the WebworkWebservice.pm 
-#     which processes it and sends the the resulting HTML back to renderViaXMLRPC.pm
-#     which in turn passes it back to the browser.
-# 3.  The second time a problem is submitted renderViaXMLRPC.pm receives the WeBWorK form 
-#     submitted directly by the browser.  
-#     The renderViaXMLRPC.pm translates the WeBWorK form, has it processes by the webservice
-#     and returns the result to the browser. 
-#     The The client renderProblem.pl script is no longer involved.
-# 4.  Summary: The WebworkWebservice (with command renderProblem) is called directly in the first round trip
-#     of  submitting the problem via the https://mysite.edu/mod_xmlrpc route.  After that the communication is  
-#     between the browser and renderViaXMLRPC using HTML forms and the route https://mysite.edu/webwork2/html2xml
-#     and from there renderViaXMLRPC calls the WebworkWebservice using the route https://mysite.edu/mod_xmlrpc with the
-#     renderProblem command.
-
-
-our @COMMANDS = qw( listLibraries    renderProblem  ); #listLib  readFile tex2pdf 
-
-
-
-##################################################
-# XMLRPC client -- 
-# this code is identical between renderProblem.pl and renderViaXMLRPC.pm????
-##################################################
-
-package WebworkClient;
-use LWP::Protocol::https;
-use lib "$WeBWorK::Constants::WEBWORK_DIRECTORY/lib";
-use lib "$WeBWorK::Constants::PG_DIRECTORY/lib";
-use XMLRPC::Lite;
-use WeBWorK::Utils qw( wwRound encode_utf8_base64 decode_utf8_base64);
-use WeBWorK::Utils::AttemptsTable;
-use WeBWorK::CourseEnvironment;
-use WeBWorK::PG::ImageGenerator;
-use HTML::Entities;
-use WeBWorK::Localize;
-use WeBWorK::PG::ImageGenerator;
-use IO::Socket::SSL;
-use Digest::SHA qw(sha1_base64);
-use XML::Simple qw(XMLout);
-use JSON;
-use FormatRenderedProblem;
-
-use constant  TRANSPORT_METHOD => 'XMLRPC::Lite';
-use constant  REQUEST_CLASS    => 'WebworkXMLRPC';  # WebworkXMLRPC is used for soap also!!
-use constant  REQUEST_URI      => 'mod_xmlrpc';
-
-our $UNIT_TESTS_ON             = 0;
-
-##################
-# static variables
-
-# create seed_ce
-# then create imgGen
-our $seed_ce;
-
-eval {
-	$seed_ce = WeBWorK::CourseEnvironment->new( 
-				{webwork_dir		=>		$WeBWorK::Constants::WEBWORK_DIRECTORY, 
-				 courseName         =>      '',
-				 webworkURL         =>      '',
-				 pg_dir             =>      $WeBWorK::Constants::PG_DIRECTORY,
-				 });
-};
-	if ($@ or not ref($seed_ce)){
-		warn "Unable to find environment for WebworkClient: 
-			 webwork_dir => $WeBWorK::Constants::WEBWORK_DIRECTORY 
-			 pg_dir      => $WeBWorK::Constants::PG_DIRECTORY";
-	}
-
-
-
-our %imagesModeOptions = %{$seed_ce->{pg}->{displayModeOptions}->{images}};
-our $site_url = $seed_ce->{server_root_url}//'';
-our $imgGen = WeBWorK::PG::ImageGenerator->new(
-		tempDir         => $seed_ce->{webworkDirs}->{tmp},
-		latex	        => $seed_ce->{externalPrograms}->{latex},
-		dvipng          => $seed_ce->{externalPrograms}->{dvipng},
-		useCache        => 1,
-		cacheDir        => $seed_ce->{webworkDirs}->{equationCache},
-		cacheURL        => $site_url . $seed_ce->{webworkURLs}->{equationCache},
-		cacheDB         => $seed_ce->{webworkFiles}->{equationCacheDB},
-		dvipng_align    => $imagesModeOptions{dvipng_align},
-		dvipng_depth_db => $imagesModeOptions{dvipng_depth_db},
-);
-
-
-sub new {   #WebworkClient constructor
-    my $invocant = shift;
-    my $class = ref $invocant || $invocant;
-	my $self = {
-		return_object   => {},
-		request_object  => {},
-		error_string    => '',
-		encoded_source 	=> '',
-		url             => '',
-		course_password => '',
-		site_password   => '',
-		courseID        => '',
-		userID          => '',
-		inputs_ref      => {
-			AnSwEr0001 => '',
-			AnSwEr0002 => '',
-			AnSwEr0003 => '',
-			displayMode     => 'no displayMode defined',
-			forcePortNumber => '',
-			internal_WW2_secret => 'BAD',
-		},
-		@_,               # options and overloads
-	};
-
-	bless $self, $class;
-}
-
-
-our $result;
-
-##################################################
-# Utilities -- 
-#    this code is identical between renderProblem.pl and renderViaXMLRPC.pm
-##################################################
-
-=head2 xmlrpcCall
-
-
-	
-    $xmlrpc_client->encodeSource($source);
-    $xmlrpc_client->{sourceFilePath}  = $fileName;
-    
- my $input = { 
-        userID                  => $credentials{userID}//'',
-        session_key             => $credentials{session_key}//'',
-        courseID                => $credentials{courseID}//'',
-        courseName              => $credentials{courseID}//'',
-        course_password         => $credentials{course_password}//'',   
-        site_password           => $XML_PASSWORD//'',
-        envir                   => $xmlrpc_client->environment(
-                                       fileName       => $fileName,
-                                       sourceFilePath => $fileName
-                                    ),
- };                          
-    our($output, $return_string, $result);    
-    
-
-    if ( $result = $xmlrpc_client->xmlrpcCall('renderProblem', $input) )    {
-        $output = $xmlrpc_client->formatRenderedProblem;
-    } else {
-    	$output = $xmlrpc_client->return_object;  # error report
-    }
-
-	Keys in $result or in  $xmlrpc_client->return_object for the command "renderProblem"
-	 session_key
-	 flags
-	 errors
-	 internal_debug_messages
-	 WARNINGS
-	 problem_state
-	 debug_messages
-	 userID
-	 compute_time
-	 warning_messages
-	 courseID
-	 text
-	 problem_result
-	 header_text
-	 answers
-
-
-=cut
-
-
-
-
-sub xmlrpcCall {
-	my $self = shift;
-	my $command = shift;
-	my $input   = shift||{};
-	my $requestObject;
-	$command   = 'listLibraries' unless defined $command;
-	my $default_inputs = $self->default_inputs();
-	$requestObject = {%$default_inputs, %$input};  #input values can override default inputs
-
-	$self->request_object($requestObject);   # store the request object for later
-	
-	my $requestResult; 
-	my $transporter = TRANSPORT_METHOD->new;
-    #FIXME -- transitional error fix to remove mod_xmlrpc from end of url call
-    my $site_url = $self->site_url;
-    if ($site_url =~ /mod_xmlrpc$/ ){
-    	$site_url =~ s|/mod_xmlrpc/?||; # mod_xmlrpc from  https://my.site.edu/mod_xmlrpc
-    	$self->site_url($site_url);
-    	# complain
-    	print STDERR "\n\n\$self->site_url() should not end in /mod_xmlrpc \n\n";
-    }
-	eval {
-	    $requestResult= $transporter
-	        #->uri('http://'.HOSTURL.':'.HOSTPORT.'/'.REQUEST_CLASS)
-		#-> proxy(PROTOCOL.'://'.HOSTURL.':'.HOSTPORT.'/'.REQUEST_URI);
-		-> proxy(($site_url).'/'.REQUEST_URI);
-	};
-	# END of FIXME section
-	
-	print STDERR "WebworkClient: Initiating xmlrpc request to url ",($self->site_url).'/'.REQUEST_URI, " \n Error: $@\n" if $@;
-	# turn off verification of the ssl cert 
-	$transporter->transport->ssl_opts(verify_hostname=>0,
-	    SSL_verify_mode => IO::Socket::SSL::SSL_VERIFY_NONE);
-			
-    if ($UNIT_TESTS_ON) {
-        print STDERR  "\n\tWebworkClient.pm ".__LINE__." xmlrpcCall sent to site ", $self->site_url,"\n";
-        print STDERR  "\tWebworkClient.pm ".__LINE__." full xmlrpcCall path ", ($self->site_url).'/'.REQUEST_URI,"\n";
-    	print STDERR  "\tWebworkClient.pm ".__LINE__." xmlrpcCall issued with command $command\n";
-    	print STDERR  "\tWebworkClient.pm ".__LINE__." input is: ",join(" ", map {$_//'--'} %{$self->request_object}),"\n";
-    	print STDERR  "\tWebworkClient.pm ".__LINE__." xmlrpcCall $command initiated webwork webservice object $requestResult\n";
-    }
- 		
-	local( $result);
-	# use eval to catch errors
-	#print STDERR "WebworkClient: issue command ", REQUEST_CLASS.'.'.$command, " ",join(" ", %$input),"\n";
-	eval { $result = $requestResult->call(REQUEST_CLASS.'.'.$command, $self->request_object ) };
-	# result is of type XMLRPC::SOM
-	if ( $@ ) {
-		print STDERR (
-			"There were a lot of errors\n",
-			"Errors: \n $@\n End Errors\n" );
-		print CGI::h2("WebworkClient Errors");
-		print CGI::p("Errors:",CGI::br(),CGI::blockquote({style=>"color:red"},CGI::code($@)),CGI::br(),"End Errors");
-	}
-	  
-	if (not ref($result) ) {
-		my $error_string = "xmlrpcCall to $command returned no result for ".
-			($self->{sourceFilePath}//'')."\n";
-		print STDERR $error_string;
-		$self->error_string($error_string);
-		$self->fault(1);
-		return $self;
-	} elsif ( $result->fault  ) { # report errors
-		my $error_string = 'Error message for '.
-		join( ' ',
-			"command:",
-			$command,
-			"\n<br/>faultcode:",
-			$result->faultcode,
-			"\n<br/>faultstring:",
-			$result->faultstring, "\n<br/>End error message<br/>\n"
-		);
-
-		$result->{score} = 0; # Set score to 0 when a fault occurred.
-		print STDERR $error_string;
-		$self->return_object($result->result());
-		$self->error_string($error_string);
-		$self->fault(1); # set fault flag to true
-		return $self;
-	} else {
-		# Do UTF-8 + base64 "decoding"
-		my $final_result = {}; # init as an empty hash reference
-		if ( ref($result->result())=~/HASH/ ) {
-			$final_result = $result->result(); # Gets the Perl structure from the XMLRPC::SOM object
-			if ( defined($final_result->{text}) ) {
-				$final_result->{text} = decode_utf8_base64($final_result->{text});
-			}
-			if ( defined($final_result->{header_text}) ) {
-				$final_result->{header_text} = decode_utf8_base64($final_result->{header_text});
-			}
-			if ( defined($final_result->{post_header_text}) ) {
-				$final_result->{post_header_text} = decode_utf8_base64($final_result->{post_header_text});
-			}
-			# Need to parse the entire object to apply UTF-8 decoding to strings which were encoded
-			$final_result = xml_utf_decode($final_result);
-		}
-
-		$self->return_object( $final_result );
-		# print "\n retrieve result ",  keys %{$self->return_object};
-		return $self->return_object;
-	}
-}
-
-
-=head2 jsXmlrpcCall
-
-=cut
-
-sub jsXmlrpcCall {
-	my $self = shift;
-	my $command = shift;
-	my $input = shift;
-	$command   = 'listLibraries' unless $command;
-	if ($UNIT_TESTS_ON) {
-    	print STDERR  "WebworkClient.pm ".__LINE__." jsXmlrpcCall issued with command $command\n";
-    }
-
-	print "the command was $command";
-
-	my $transporter = TRANSPORT_METHOD->new;
-	
-	my $requestResult = $transporter
-	    -> proxy(($self->site_url).'/'.REQUEST_URI);
-	$transporter->transport->ssl_opts(verify_hostname=>0,
-	     SSL_verify_mode => 'SSL_VERIFY_NONE');
-	
-	  local( $result);
-	  # use eval to catch errors
-	  eval { $result = $requestResult->call(REQUEST_CLASS.'.'.$command,$input) };
-	  if ($@) {
-	  	print STDERR "There were a lot of errors for $command\n" ;
-	  	print STDERR "Errors: \n $@\n End Errors\n" ;
-	  	return 0 #failure
-	  }
-	print "hmm $result";
-	  unless (ref($result) and $result->fault) {
-	  	my $rh_result = $result->result();
-	  	print "\n success \n";
-	    print pretty_print($rh_result->{'ra_out'});
-		$self->return_object( $rh_result ); 
-		return 1; # success
-
-	  } else {
-		$self->return_object( 'Error from server: '. join( ",\n ",
-		  $result->faultcode,
-		  $result->faultstring)
-		);
-		return 0; #failure
-	  }
-}
-
-
-=head2 xml_utf_decode
-
-	Parse the structure to UTF-8 decode where needed.
-
-=cut
-
-sub xml_utf_decode { # Do UTF-8 decoding where xml_filter applied encoding
-	my $input = shift;
-	my $level = shift || 0;
-	my $space="  ";
-	my $type = ref($input);
-
-	if (!defined($type) or !$type ) {
-		# scalars get returned as is
-	} elsif( $type =~/HASH/i or "$input"=~/HASH/i) {
-		$level++;
-		foreach my $item (keys %{$input}) {
-			# We need to decode the values which were encoded by xml_filter().
-			# Explantaion from xml_filter():
-			#
-			# Until 2020 - ALL scalar values were left unchanged.
-			# However, since the release of WeBWorK 2.15 (late 2019) there
-			# can be Unicode values of hash entires, and they trigger failures
-			# of the XMLRPC system. For now, based on current experience
-			# we are ONLY handling the values stored in the hashes, under the
-			# assumption that key names will be ASCII, and that arrays are not
-			# going to contain Unicode values. When a hash value is encoded,
-			# we prefix the key name with "xmlrpc_UTF8_encoded_" so it can
-			# be detected for the decode on the other side.
-
-			my $item_type = ref( $input->{$item} );
-			my $filtered_value = xml_utf_decode($input->{$item},$level);
-
-			if (!defined($item_type) or !$item_type ) {
-				# This is a scalar object
-				if ( $item =~ /^xmlrpc_UTF8_encoded_/ ) {
-					# Get the original name back
-					my $new_item = $item;
-					$new_item =~ s/^xmlrpc_UTF8_encoded_//;
-					$input->{$new_item} = Encode::decode("UTF-8", $filtered_value);
-					delete( $input->{$item} ); # remove the temporary encoded value with the modified key
-				} else {
-					$input->{$item} = $filtered_value; # No decoding needed
-				}
-				# This is a scalar object
-			} else {
-				# Not a scalar object - default recursive handling
-				$input->{$item} = $filtered_value;
-			}
-		}
-		$level--;
-	} elsif( $type=~/ARRAY/i or "$input"=~/ARRAY/i) {
-		# arrays get processed recursively, just as by xml_filter().
-		$level++;
-		my $tmp = [];
-		foreach my $item (@{$input}) {
-			$item = xml_utf_decode($item,$level);
-			push @$tmp, $item;
-		}
-		$input = $tmp;
-		$level--;
-	} elsif($type =~ /CODE/i or "$input" =~/CODE/i) {
-		# code get returned as is (probably just says "CODE reference" from the call to xml_filter().
-	} else {
-		# leave this case alone also - would have been made into a string in xml_filter().
-		#      "$type reference";
-	}
-	$input;
-}
-
-=head2  Accessor methods
-
-	encodeSource  # encode source string with utf8 and base64 and store in encoded_source
-	encoded_source
-	request_object
-	return_object
-	error_string
-	fault
-	site_url  (https://mysite.edu)
-	form_data
-	
-=cut 
-
-sub encodeSource {
-	my $self = shift;
-	my $source = shift||'';
-	$self->{encoded_source} =encode_utf8_base64($source);
-}
-
-sub encoded_source {
-	my $self = shift;
-	my $source = shift;
-	$self->{encoded_source} =$source if defined $source and $source =~/\S/; # source is non-empty
-	$self->{encoded_source};
-}
-sub request_object {   # in or input
-	my $self = shift;
-	my $object = shift;
-	$self->{request_object} =$object if defined $object and ref($object); # source is non-empty
-	$self->{request_object};
-}
-sub return_object {   # out
-	my $self = shift;
-	my $object = shift;
-	$self->{return_object} =$object if defined $object and ref($object); # source is non-empty
-	$self->{return_object};
-}
-sub error_string {   
-	my $self = shift;
-	my $string = shift;
-	$self->{error_string} =$string if defined $string and $string =~/\S/; # source is non-empty
-	$self->{error_string};
-}
-sub fault {   
-	my $self = shift;
-	my $fault_flag = shift;
-	$self->{fault_flag} =$fault_flag if defined $fault_flag and $fault_flag =~/\S/; # source is non-empty
-	$self->{fault_flag};
-}
-sub site_url {  #site_url  https://mysite.edu
-	my $self = shift;
-	my $new_url = shift;
-	$self->{site_url} = $new_url if defined($new_url) and $new_url =~ /\S/;
-	$self->{site_url};
-}
-
-sub url {  #site_url  https://mysite.edu
-	my $self = shift;
-	my $new_url = shift;
-	die "use webworkClient->site_url instead of webworkClient->url";
-	$self->{url} = $new_url if defined($new_url) and $new_url =~ /\S/;
-	$self->{url};
-}
-
-sub form_data {
-	my $self = shift;
-	my $form_data = shift;
-	$self->{inputs_ref} = $form_data if defined($form_data) and $form_data =~ /\S/;
-	$self->{inputs_ref};
-}
-
-=head2 initiate default values
-
-=cut
-sub setInputTable_for_listLib {
-	my $self = shift;
-	my $out = {
-		set         =>   'set0',
-		library_name =>  'Library',
-		command      =>  'all',
-	};
-
-	$out;
-}
-
-sub default_inputs {
-	my $self = shift;
-	my $webwork_dir = $WeBWorK::Constants::WEBWORK_DIRECTORY; #'/opt/webwork/webwork2';
-	my $seed_ce = new WeBWorK::CourseEnvironment({ webwork_dir => $webwork_dir});
- 	die "Can't create seed course environment for webwork in $webwork_dir" unless ref($seed_ce);
-
-	$self->{seed_ce} = $seed_ce;
-	
-	my @modules_to_evaluate;
-	my @extra_packages_to_load;
-	my @modules = @{ $seed_ce->{pg}->{modules} };
-
-	foreach my $module_packages_ref (@modules) {
-		my ($module, @extra_packages) = @$module_packages_ref;
-		# the first item is the main package
-		push @modules_to_evaluate, $module;
-		# the remaining items are "extra" packages
-		push @extra_packages_to_load, @extra_packages;
-	}
-
-	my $out = {
-		library_name =>  'Library',
-		command      =>  'renderProblem',
-		answer_form_submitted   => 1,
-		course                  => $self->{course},
-		extra_packages_to_load  => [@extra_packages_to_load],
-		mode                    => $self->{displayMode},
-		displayMode             => $self->{displayMode},
-		modules_to_evaluate     => [@modules_to_evaluate],
-		envir                   => $self->environment(),
-		problem_state           => {
-		
-			num_of_correct_ans  => 0,
-			num_of_incorrect_ans => 4,
-			recorded_score       => 1.0,
-		},
-		source                   => $self->encoded_source,  #base64 encoded		
-	};
-
-	$out;
-}
-
-=over
-
-=item environment
-
-=cut
-
-sub environment {
-	my $self = shift;
-	my $envir = {
-		answerDate  => '4014438528',
-		CAPA_Graphics_URL=>'/webwork2_files/CAPA_Graphics/',
-		CAPA_GraphicsDirectory =>'/opt/webwork/libraries/webwork-open-problem-library/Contrib/CAPA/',
-		CAPA_MCTools=>'/opt/webwork/libraries/webwork-open-problem-library/Contrib/CAPA/macros/CAPA_MCTools/',
-		CAPA_Tools=>'/opt/webwork/libraries/webwork-open-problem-library/Contrib/CAPA/macros/CAPA_Tools/',
-		cgiDirectory=>'Not defined',
-		cgiURL => 'foobarNot defined',
-		classDirectory=> 'Not defined',
-		courseName=>'Not defined',
-		courseScriptsDirectory=>'not defined',
-		displayMode => $self->{inputs_ref}{displayMode} // "MathJax",
-		dueDate => '4014438528',
-		effectivePermissionLevel => 10,
-		externalGif2EpsPath=>'not defined',
-		externalPng2EpsPath=>'not defined',
-		externalTTHPath=>'/usr/local/bin/tth',
-		fileName=>'WebworkClient.pm:: define fileName in environment',
-		formattedAnswerDate=>'6/19/00',
-		formattedDueDate=>'6/19/00',
-		formattedOpenDate=>'6/19/00',
-		functAbsTolDefault=> 0.0000001,
-		functLLimitDefault=>0,
-		functMaxConstantOfIntegration=> 1000000000000.0,
-		functNumOfPoints=> 5,
-		functRelPercentTolDefault=> 0.000001,
-		functULimitDefault=>1,
-		functVarDefault=> 'x',
-		functZeroLevelDefault=> 0.000001,
-		functZeroLevelTolDefault=>0.000001,
-		htmlDirectory =>'not defined',
-		htmlURL =>'not defined',
-		inputs_ref => $self->{inputs_ref},
-		macroDirectory=>'not defined',
-		numAbsTolDefault=>0.0000001,
-		numFormatDefault=>'%0.13g',
-		numOfAttempts=> 0,
-		numRelPercentTolDefault => 0.0001,
-		numZeroLevelDefault =>0.000001,
-		numZeroLevelTolDefault =>0.000001,
-		openDate=> '3014438528',
-		permissionLevel => $self->{inputs_ref}{permissionLevel} // 0,
-		PRINT_FILE_NAMES_FOR => [],
-		probFileName => 'WebworkClient.pm:: define probFileName in environment',
-		problemSeed  => $self->{inputs_ref}{problemSeed} // 3333,
-		problemUUID  => $self->{inputs_ref}{problemUUID} // 0,
-		problemValue =>1,
-		probNum => $self->{inputs_ref}{probNum} // 1,
-		psvn => $self->{inputs_ref}{psvn} // 54321,
-		questionNumber => 1,
-		scriptDirectory => 'Not defined',
-		sectionName => '',
-		sectionNumber => 1,
-		server_root_url =>"foobarfoobar", 
-		sessionKey=> 'Not defined',
-		setNumber => $self->{inputs_ref}{setNumber} // 'not defined',
-		studentLogin =>'',
-		studentName => '',
-		tempDirectory => 'not defined',
-		templateDirectory=>'not defined',
-		tempURL=>'not defined',
-		webworkDocsURL => 'not defined',
-		showHints => $self->{inputs_ref}{showHints} // 0, # extra options -- usually passed from the input form
-		showSolutions => $self->{inputs_ref}{showSolutions} // 0,
-		@_,
-	};
-	$envir;
-};
-
-=item formatRenderedLibraries
-
-=cut
-	
-sub formatRenderedLibraries {
-	my $self 			  = shift;
-	#my @rh_result         = @{$self->return_object};  # wrap problem in formats
-	my %rh_result         = %{$self->return_object};
-	my $result = "";
-	foreach my $key (sort  keys %rh_result) {
-		$result .= "$key";
-		$result .= $rh_result{$key};
-	}
-	return $result;
-}
-
-=item formatRenderedProblem
-
-=cut
-
-sub formatRenderedProblem {
-	FormatRenderedProblem::formatRenderedProblem(@_);
-}
-
-=back
-
-=cut
-######################################################
-# Utilities
-######################################################
-
-
-=head2 Utility functions:
-
-=over 4 
-
-=item writeRenderLogEntry()
-
- $ce - a WeBWork::CourseEnvironment object
- $function - fully qualified function name
- $details - any information, do not use the characters '[' or ']'
- $beginEnd - the string "begin", "intermediate", or "end"
- use the intermediate step begun or completed for INTERMEDIATE
- use an empty string for $details when calling for END
- Information printed in format:
- [formatted date & time ] processID unixTime BeginEnd $function  $details
-
-=cut 
-
-sub writeRenderLogEntry($$$) {
-	my ($function, $details, $beginEnd) = @_;
-	$beginEnd = ($beginEnd eq "begin") ? ">" : ($beginEnd eq "end") ? "<" : "-";
-	WeBWorK::Utils::writeLog($seed_ce, "render_timing", "$$ ".time." $beginEnd $function [$details]");
-}
-
-=item pretty_print_self
-
-=cut
-
-
-sub pretty_print {    # provides html output -- NOT a method
-    my $r_input = shift;
-    my $level = shift;
-    $level = 4 unless defined($level);
-    $level--;
-    return '' unless $level > 0;  # only print three levels of hashes (safety feature)
-    my $out = '';
-    if ( not ref($r_input) ) {
-    	$out = $r_input if defined $r_input;    # not a reference
-    	$out =~ s/</&lt;/g  ;  # protect for HTML output
-    } elsif ("$r_input" =~/hash/i) {  # this will pick up objects whose '$self' is hash and so works better than ref($r_iput).
-	    local($^W) = 0;
-	    
-		$out .= "$r_input " ."<TABLE border = \"2\" cellpadding = \"3\" BGCOLOR = \"#FFFFFF\">";
-		
-		
-		foreach my $key ( sort ( keys %$r_input )) {
-			# Safety feature - we do not want to display the contents of "%seed_ce" which
-			# contains the database password and lots of other things, and explicitly hide
-			# certain internals of the CourseEnvironment in case one slips in.
-			next if ( ( $key =~ /database/ ) ||
-				  ( $key =~ /dbLayout/ ) ||
-				  ( $key eq "ConfigValues" ) ||
-				  ( $key eq "ENV" ) ||
-				  ( $key eq "externalPrograms" ) ||
-				  ( $key eq "permissionLevels" ) ||
-				  ( $key eq "seed_ce" )
-			);
-			$out .= "<tr><TD> $key</TD><TD>=&gt;</td><td>&nbsp;".pretty_print($r_input->{$key}) . "</td></tr>";
-		}
-		$out .="</table>";
-	} elsif (ref($r_input) eq 'ARRAY' ) {
-		my @array = @$r_input;
-		$out .= "( " ;
-		while (@array) {
-			$out .= pretty_print(shift @array, $level) . " , ";
-		}
-		$out .= " )";
-	} elsif (ref($r_input) eq 'CODE') {
-		$out = "$r_input";
-	} else {
-		$out = $r_input;
-		$out =~ s/</&lt;/g; # protect for HTML output
-	}
-	
-	return $out." ";
-}
-
-sub format_hash_ref {
-	my $hash = shift;
-	warn "Use a hash reference" unless ref($hash) =~/HASH/;
-	return join(" ", map {$_="--" unless defined($_);$_ } %$hash),"\n";
-}
-
-=back
-
-=cut
-1;
diff --git a/lib/WebworkClient/body_text_format.pl b/lib/WebworkClient/body_text_format.pl
deleted file mode 100644
index 9b02ff7421..0000000000
--- a/lib/WebworkClient/body_text_format.pl
+++ /dev/null
@@ -1,7 +0,0 @@
-$body_text_format = q{
-
-
-$problemText
-};
-
-$body_text_format;
\ No newline at end of file
diff --git a/lib/WebworkClient/debug_format.pl b/lib/WebworkClient/debug_format.pl
deleted file mode 100644
index c1dc63e23b..0000000000
--- a/lib/WebworkClient/debug_format.pl
+++ /dev/null
@@ -1,76 +0,0 @@
-$debug_format = <<'ENDPROBLEMTEMPLATE';
-<!DOCTYPE html>
-<html $COURSE_LANG_AND_DIR>
-<head>
-<meta charset='utf-8'>
-<base href="$SITE_URL">
-$favicon
-
-$problemHeadText
-
-<title>WeBWorK using host: $SITE_URL, format: debug, seed: $problemSeed, course: $courseID</title>
-</head>
-<body>
-<div class="container-fluid">
-<h2> WeBWorK using host: $SITE_URL, course: $courseID, format: debug</h2>
-<hr>
-<div class="row g-0">
-<div class="col-12 problem">
-$answerTemplate
-$color_input_blanks_script
-<form id="problemMainForm" class="problem-main-form" name="problemMainForm" action="$FORM_ACTION_URL" method="post">
-<div id="problem_body" class="problem-content" $PROBLEM_LANG_AND_DIR>
-$problemText
-</div>
-$scoreSummary
-$LTIGradeMessage
-
-<input type="hidden" name="answersSubmitted" value="1">
-<input type="hidden" name="sourceFilePath" value = "$sourceFilePath">
-<input type="hidden" name="problemSource" value="$encoded_source">
-<input type="hidden" name="problemSeed" value="$problemSeed">
-<input type="hidden" name="problemUUID" value="$problemUUID">
-<input type="hidden" name="psvn" value="$psvn">
-<input type="hidden" name="pathToProblemFile" value="$fileName">
-<input type="hidden" name="courseName" value="$courseID">
-<input type="hidden" name="courseID" value="$courseID">
-<input type="hidden" name="userID" value="$userID">
-<input type="hidden" name="course_password" value="$course_password">
-<input type="hidden" name="displayMode" value="$displayMode">
-<input type="hidden" name="session_key" value="$session_key">
-<input type="hidden" name="outputformat" value="debug">
-<input type="hidden" name="theme" value="$theme">
-<input type="hidden" name="language" value="$formLanguage">
-<input type="hidden" name="showSummary" value="$showSummary">
-<input type="hidden" name="showHints" value="$showHints">
-<input type="hidden" name="showSolutions" value="$showSolutions">
-<input type="hidden" name="showAnswerNumbers" value="$showAnswerNumbers">
-<input type="hidden" name="showPreviewButton" value="$showPreviewButton">
-<input type="hidden" name="showCheckAnswersButton" value="$showCheckAnswersButton">
-<input type="hidden" name="showCorrectAnswersButton" value="$showCorrectAnswersButton">
-<input type="hidden" name="clientDebug" value="$clientDebug">
-<input type="hidden" name="showFooter" value="$showFooter">
-<input type="hidden" name="forcePortNumber" value="$forcePortNumber">
-<input type="hidden" name="extra_header_text" value="$extra_header_text">
-
-<div class="submit-buttons-container col-12 mb-2"><!--
--->$previewButton<!-- -->$checkAnswersButton<!-- -->$correctAnswersButton</div>
-</form>
-</div></div>
-<HR>
-
-$warnings
-<h3> PG Warning section </h3>
-$PG_warning_messages
-<h3> Debug message section </h3>
-$debug_messages
-<h3> internal errors </h3>
-$internal_debug_messages
-$client_debug_data
-</div>
-$footer
-</body>
-</html>
-ENDPROBLEMTEMPLATE
-
-$debug_format;
diff --git a/lib/WebworkClient/json_format.pl b/lib/WebworkClient/json_format.pl
deleted file mode 100644
index 6be5f07f00..0000000000
--- a/lib/WebworkClient/json_format.pl
+++ /dev/null
@@ -1,103 +0,0 @@
-# The json output format needs to collect the data differently than the other
-# formats. It will return a hash, and each relevant value will later undergo
-# variable interpolation.
-
-# Most parts which need variable interpolation end in "_VI".
-# Parts ending in "_AVI" are references to anonymous arrays whose entries need variable interpolation.
-# Other parts which need variable interpolation are:
-#	hidden_input_field}{*
-#	real_webwork_*
-
-# NOTE: When a variable needs to be interpolated later, the string should be in single quotes not in double quotes.
-
-$json_output = { head_part001_VI => '<!DOCTYPE html><html $COURSE_LANG_AND_DIR>' };
-
-$json_output->{head_part010_VI} = <<'ENDPROBLEMTEMPLATE';
-<head>
-<meta charset='utf-8'>
-<base href="TO_SET_LATER_SITE_URL">
-$favicon
-ENDPROBLEMTEMPLATE
-
-# CSS loads - as an array of href values
-# This is added in formatRenderedProblem
-# $json_output->{head_part100}
-
-# JS loads - as an array of arrays.  The first element of each subarray is the href value, and the second (if present)
-# is a hash containing any needed attributes for the script tag.
-# This is added in formatRenderedProblem
-# $json_output->{head_part200}
-
-$json_output->{head_part300_VI} = '$problemHeadText';
-
-$json_output->{head_part400} = '<title>WeBWorK problem</title>';
-
-$json_output->{head_part999} = "</head>";
-$json_output->{body_part001} = "<body>";
-
-$json_output->{body_part100} = <<'ENDPROBLEMTEMPLATE';
-<div class="container-fluid">
-<div class="row">
-<div class="col-12 problem">
-ENDPROBLEMTEMPLATE
-
-$json_output->{body_part300_VI} = '$answerTemplate';
-
-$json_output->{body_part500} = '<form id="problemMainForm" class="problem-main-form" name="problemMainForm" action="TO_SET_LATER_FORM_ACTION_URL" method="post">';
-
-$json_output->{body_part530_VI} = '<div id="problem_body" class="problem-content" $PROBLEM_LANG_AND_DIR>';
-
-$json_output->{body_part550_VI} = '$problemText';
-
-$json_output->{body_part590} = "</div>";
-
-$json_output->{body_part650_VI} = '$scoreSummary';
-
-$json_output->{body_part700_VI} = '<p>$previewButton $checkAnswersButton $correctAnswersButton</p>';
-
-$json_output->{body_part999_VI} = <<'ENDPROBLEMTEMPLATE';
-</form></div></div></div>
-$footer
-</body></html>
-ENDPROBLEMTEMPLATE
-
-$json_output->{hidden_input_field} = {};
-
-
-$json_output->{hidden_input_field}{answersSubmitted} = '1';
-$json_output->{hidden_input_field}{sourceFilePath} = '$sourceFilePath';
-$json_output->{hidden_input_field}{problemSource} = '$encoded_source';
-$json_output->{hidden_input_field}{problemSeed} = '$problemSeed';
-$json_output->{hidden_input_field}{problemUUID} = '$problemUUID';
-$json_output->{hidden_input_field}{psvn} = '$psvn';
-$json_output->{hidden_input_field}{pathToProblemFile} = '$fileName';
-$json_output->{hidden_input_field}{courseName} = '$courseID';
-$json_output->{hidden_input_field}{courseID} = '$courseID';
-$json_output->{hidden_input_field}{userID} = '$userID';
-$json_output->{hidden_input_field}{course_password} = '$course_password';
-$json_output->{hidden_input_field}{displayMode} = '$displayMode';
-$json_output->{hidden_input_field}{session_key} = '$session_key';
-$json_output->{hidden_input_field}{outputformat} = 'json';
-$json_output->{hidden_input_field}{theme} = '$theme';
-$json_output->{hidden_input_field}{language} = '$formLanguage';
-$json_output->{hidden_input_field}{showSummary} = '$showSummary';
-$json_output->{hidden_input_field}{showHints} = '$showHints';
-$json_output->{hidden_input_field}{showSolution} = '$showSolution';
-$json_output->{hidden_input_field}{showAnswerNumbers} = '$showAnswerNumbers';
-$json_output->{hidden_input_field}{showPreviewButton} = '$showPreviewButton';
-$json_output->{hidden_input_field}{showCheckAnswersButton} = '$showCheckAnswersButton';
-$json_output->{hidden_input_field}{showCorrectAnswersButton} = '$showCorrectAnswersButton';
-$json_output->{hidden_input_field}{showFooter} = '$showFooter';
-$json_output->{hidden_input_field}{forcePortNumber} = '$forcePortNumber';
-$json_output->{hidden_input_field}{extraHeaderText} = '$extra_header_text';
-
-# These are the real WeBWorK server URLs which the intermediate needs to use
-# to communicate with WW, while the distant client must use URLs of the
-# intermediate server (the man in the middle).
-
-$json_output->{real_webwork_SITE_URL} = '$SITE_URL';
-$json_output->{real_webwork_FORM_ACTION_URL} = '$FORM_ACTION_URL';
-$json_output->{internal_problem_lang_and_dir} = '$PROBLEM_LANG_AND_DIR';
-
-# Output back to WebworkClient.pm is the reference to the hash:
-$json_output;
diff --git a/lib/WebworkClient/ptx_format.pl b/lib/WebworkClient/ptx_format.pl
deleted file mode 100644
index 359f1d6179..0000000000
--- a/lib/WebworkClient/ptx_format.pl
+++ /dev/null
@@ -1,11 +0,0 @@
-$ptx_static_format = <<'ENDPROBLEMTEMPLATE';
-<!--$SITE_URL WeBWorK Editor using host: $SITE_URL, course: $courseID format: ptx -->
-<!--BEGIN PROBLEM-->
-<webwork>
-$problemText
-$answerhashXML
-</webwork>
-<!--END PROBLEM-->
-ENDPROBLEMTEMPLATE
-
-$ptx_static_format;
diff --git a/lib/WebworkClient/simple_format.pl b/lib/WebworkClient/simple_format.pl
deleted file mode 100644
index 096249c9a5..0000000000
--- a/lib/WebworkClient/simple_format.pl
+++ /dev/null
@@ -1,62 +0,0 @@
-$simple_format = <<'ENDPROBLEMTEMPLATE';
-<!DOCTYPE html>
-<html $COURSE_LANG_AND_DIR>
-<head>
-<meta charset='utf-8'>
-<base href="$SITE_URL">
-$favicon
-
-$problemHeadText
-
-<title>WeBWorK using host: $SITE_URL, format: simple seed: $problemSeed</title>
-</head>
-<body>
-<div class="container-fluid">
-<div class="row g-0">
-<div class="col-12 problem">
-$answerTemplate
-$color_input_blanks_script
-<form id="problemMainForm" class="problem-main-form" name="problemMainForm" action="$FORM_ACTION_URL" method="post">
-<div id="problem_body" class="problem-content" $PROBLEM_LANG_AND_DIR>
-$problemText
-</div>
-$scoreSummary
-$LTIGradeMessage
-
-<input type="hidden" name="answersSubmitted" value="1">
-<input type="hidden" name="sourceFilePath" value = "$sourceFilePath">
-<input type="hidden" name="problemSource" value="$encoded_source">
-<input type="hidden" name="problemSeed" value="$problemSeed">
-<input type="hidden" name="problemUUID" value="$problemUUID">
-<input type="hidden" name="psvn" value="$psvn">
-<input type="hidden" name="pathToProblemFile" value="$fileName">
-<input type="hidden" name="courseName" value="$courseID">
-<input type="hidden" name="courseID" value="$courseID">
-<input type="hidden" name="userID" value="$userID">
-<input type="hidden" name="course_password" value="$course_password">
-<input type="hidden" name="displayMode" value="$displayMode">
-<input type="hidden" name="session_key" value="$session_key">
-<input type="hidden" name="outputformat" value="simple">
-<input type="hidden" name="theme" value="$theme">
-<input type="hidden" name="language" value="$formLanguage">
-<input type="hidden" name="showSummary" value="$showSummary">
-<input type="hidden" name="showHints" value="$showHints">
-<input type="hidden" name="showSolutions" value="$showSolutions">
-<input type="hidden" name="showAnswerNumbers" value="$showAnswerNumbers">
-<input type="hidden" name="showPreviewButton" value="$showPreviewButton">
-<input type="hidden" name="showCheckAnswersButton" value="$showCheckAnswersButton">
-<input type="hidden" name="showCorrectAnswersButton" value="$showCorrectAnswersButton">
-<input type="hidden" name="showFooter" value="$showFooter">
-<input type="hidden" name="forcePortNumber" value="$forcePortNumber">
-<input type="hidden" name="extra_header_text" value="$extra_header_text">
-<div class="submit-buttons-container col-12 mb-2"><!--
--->$previewButton<!-- -->$checkAnswersButton<!-- -->$correctAnswersButton</div>
-</form>
-</div>
-</div></div>
-$footer
-</body>
-</html>
-ENDPROBLEMTEMPLATE
-
-$simple_format;
diff --git a/lib/WebworkClient/sticky_format.pl b/lib/WebworkClient/sticky_format.pl
deleted file mode 100644
index 6cccb2a628..0000000000
--- a/lib/WebworkClient/sticky_format.pl
+++ /dev/null
@@ -1,74 +0,0 @@
-$sticky_format = <<'ENDPROBLEMTEMPLATE';
-
-<!DOCTYPE html>
-<html $COURSE_LANG_AND_DIR>
-<head>
-<meta charset='utf-8'>
-<base href="$SITE_URL">
-$favicon
-
-$problemHeadText
-
-<title>WeBWorK using host: $SITE_URL, format: sticky seed: $problemSeed</title>
-</head>
-<body>
-<div class="container-fluid">
-<div class="row g-0">
-<div class="col-12 problem">
-<hr/>
-$answerTemplate
-$color_input_blanks_script
-<hr/>
-<form id="problemMainForm" class="problem-main-form" name="problemMainForm" action="$FORM_ACTION_URL" method="post">
-<div id="problem_body" class="problem-content" $PROBLEM_LANG_AND_DIR>
-$problemText
-</div>
-<p>
-$scoreSummary
-</p>
-
-<p>
-$localStorageMessages
-</p>
-
-$LTIGradeMessage
-
-<input type="hidden" name="answersSubmitted" value="1">
-<input type="hidden" name="sourceFilePath" value = "$sourceFilePath">
-<input type="hidden" name="problemSource" value="$encoded_source">
-<input type="hidden" name="problemSeed" value="$problemSeed">
-<input type="hidden" name="problemUUID" value="$problemUUID">
-<input type="hidden" name="psvn" value="$psvn">
-<input type="hidden" name="pathToProblemFile" value="$fileName">
-<input type="hidden" name="courseName" value="$courseID">
-<input type="hidden" name="courseID" value="$courseID">
-<input type="hidden" name="userID" value="$userID">
-<input type="hidden" name="course_password" value="$course_password">
-<input type="hidden" name="displayMode" value="$displayMode">
-<input type="hidden" name="session_key" value="$session_key">
-<input type="hidden" name="outputformat" value="sticky">
-<input type="hidden" name="theme" value="$theme">
-<input type="hidden" name="language" value="$formLanguage">
-<input type="hidden" name="showSummary" value="$showSummary">
-<input type="hidden" name="showHints" value="$showHints">
-<input type="hidden" name="showSolutions" value="$showSolutions">
-<input type="hidden" name="showAnswerNumbers" value="$showAnswerNumbers">
-<input type="hidden" name="showPreviewButton" value="$showPreviewButton">
-<input type="hidden" name="showCheckAnswersButton" value="$showCheckAnswersButton">
-<input type="hidden" name="showCorrectAnswersButton" value="$showCorrectAnswersButton">
-<input type="hidden" name="showFooter" value="$showFooter">
-<input type="hidden" name="forcePortNumber" value="$forcePortNumber">
-
-<div class="submit-buttons-container col-12 mb-2"><!--
--->$previewButton<!-- -->$checkAnswersButton<!-- -->$correctAnswersButton</div>
-</form>
-</div>
-</div>
-</div>
-$footer
-</body>
-</html>
-
-ENDPROBLEMTEMPLATE
-
-$sticky_format;
diff --git a/lib/WebworkClient/tex_format.pl b/lib/WebworkClient/tex_format.pl
deleted file mode 100644
index 6e417f1096..0000000000
--- a/lib/WebworkClient/tex_format.pl
+++ /dev/null
@@ -1,32 +0,0 @@
-$tex_format = q{
-
-\documentclass[11pt]{amsart}
-\usepackage{geometry}                % See geometry.pdf to learn the layout options. There are lots.
-\geometry{letterpaper}                   % ... or a4paper or a5paper or ... 
-%\geometry{landscape}                % Activate for for rotated page geometry
-%\usepackage[parfill]{parskip}    % Activate to begin paragraphs with an empty line rather than an indent
-\usepackage{graphicx}
-\usepackage{amssymb}
-\usepackage{epstopdf}
-\usepackage{path}
-\usepackage{eulervm}   %knuth concrete math style fonts
-%\usepackage{concmath} % knuth concrete math   tex font
-
-\DeclareGraphicsRule{.tif}{png}{.png}{`convert #1 `dirname #1`/`basename #1 .tif`.png}
-
-\title{PG problem}
-%\author{The Author}
-%\date{}                                           % Activate to display a given date or no date
-
-\begin{document}
-\maketitle
-%\section{}
-%\subsection{}
-
-$problemText
-
-\end{document}  
-
-};
-
-$tex_format;
\ No newline at end of file
diff --git a/lib/WebworkSOAP.pm b/lib/WebworkSOAP.pm
index 454b421bee..289c55f0b0 100644
--- a/lib/WebworkSOAP.pm
+++ b/lib/WebworkSOAP.pm
@@ -3,11 +3,11 @@ package WebworkSOAP;
 use strict;
 
 use WeBWorK::Utils qw(pretty_print_rh);
-use WeBWorK::Utils::CourseManagement qw(addCourse renameCourse deleteCourse listCourses archiveCourse listArchivedCourses unarchiveCourse);
+use WeBWorK::Utils::CourseManagement
+	qw(addCourse renameCourse deleteCourse listCourses archiveCourse listArchivedCourses unarchiveCourse);
 use WeBWorK::DB;
 use WeBWorK::DB::Utils qw(initializeUserProblem);
 use WeBWorK::CourseEnvironment;
-use WeBWorK::ContentGenerator::Instructor;
 
 use WebworkSOAP::Classes::GlobalSet;
 use WebworkSOAP::Classes::UserSet;
@@ -21,58 +21,56 @@ use WebworkSOAP::Classes::Permission;
 #init
 
 use constant {
-        SOAPERROR_MAJOR             => 1,
-        SOAPERROR_MINOR             => 2,
-        SOAPERROR_CLASS_NOT_FOUND   => 3,
-        SOAPERROR_USER_NOT_FOUND    => 4,
-        SOAPERROR_SET_NOT_FOUND     => 5,
-        SOAPERROR_PROBLEM_NOT_FOUND => 6,
-        SOAPERROR_KEY_NOT_FOUND     => 7,
-        SOAPERROR_AUTHEN_FAILED     => 8
+	SOAPERROR_MAJOR             => 1,
+	SOAPERROR_MINOR             => 2,
+	SOAPERROR_CLASS_NOT_FOUND   => 3,
+	SOAPERROR_USER_NOT_FOUND    => 4,
+	SOAPERROR_SET_NOT_FOUND     => 5,
+	SOAPERROR_PROBLEM_NOT_FOUND => 6,
+	SOAPERROR_KEY_NOT_FOUND     => 7,
+	SOAPERROR_AUTHEN_FAILED     => 8
 };
 
 our %SeedCE;
 %WebworkSOAP::SeedCE = %WeBWorK::SeedCE;
 
 sub new {
-    my($self,$authenKey,$courseName) = @_;
-    $self = {};
-    #Construct Course
-    my $ce = eval { new WeBWorK::CourseEnvironment({%SeedCE, courseName => $courseName }) };
-    $@ and soap_fault_major("Course Environment cannot be constructed.<br>$@");
-    #Authentication Check
-    if($ce->{soap_authen_key} != $authenKey) {
-        soap_fault_authen();
-    }
-    #Construct DB handle
-    my $db = eval { new WeBWorK::DB($ce->{dbLayout}); };
-    $@ and soap_fault_major("Failed to initialize database handle.<br>$@");
-    $self->{db} = $db;
-    $self->{ce} = $ce;
-    bless $self;
-    return $self;
+	my ($self, $authenKey, $courseName) = @_;
+	$self = {};
+	#Construct Course
+	my $ce = eval { WeBWorK::CourseEnvironment->new({ %SeedCE, courseName => $courseName }) };
+	$@ and soap_fault_major("Course Environment cannot be constructed.<br>$@");
+	#Authentication Check
+	if ($ce->{soap_authen_key} != $authenKey) {
+		soap_fault_authen();
+	}
+	#Construct DB handle
+	my $db = eval { new WeBWorK::DB($ce->{dbLayout}); };
+	$@ and soap_fault_major("Failed to initialize database handle.<br>$@");
+	$self->{db} = $db;
+	$self->{ce} = $ce;
+	bless $self;
+	return $self;
 }
 
 sub array_to_soap_string {
 	my @array = @_;
-	@array = map { SOAP::Data->type( 'string', $_ ) } @array;
+	@array = map { SOAP::Data->type('string', $_) } @array;
 	return \@array;
 }
 
 sub soap_fault_authen {
-    die SOAP::Fault->faultcode(SOAPERROR_AUTHEN_FAILED)
-                    ->faultstring("SOAP Webservice Authentication Failed!");
+	die SOAP::Fault->faultcode(SOAPERROR_AUTHEN_FAILED)->faultstring("SOAP Webservice Authentication Failed!");
 }
 
 sub soap_fault {
-    my ($errorCode,$errorMsg) = @_;
-    die SOAP::Fault->faultcode($errorCode)
-                   ->faultstring($errorMsg);
+	my ($errorCode, $errorMsg) = @_;
+	die SOAP::Fault->faultcode($errorCode)->faultstring($errorMsg);
 }
 
 sub soap_fault_major {
-    my ($errorMsg) = @_;
-    soap_fault(SOAPERROR_MAJOR,$errorMsg);
+	my ($errorMsg) = @_;
+	soap_fault(SOAPERROR_MAJOR, $errorMsg);
 }
 ####################################################################################
 #SOAP CALLABLE FUNCTIONS
@@ -87,7 +85,7 @@ sub soap_fault_major {
 =cut
 
 sub hello {
-    return "Hello world!";
+	return "Hello world!";
 }
 
 #################################################
@@ -104,15 +102,15 @@ sub hello {
 =cut
 
 sub list_courses {
-    my ($self,$authenKey) = @_;
-    my $ce = eval { new WeBWorK::CourseEnvironment({%WeBWorK::SeedCE })};
-    $@ and soap_fault_major("Internal Course Environment cannot be constructed.");
-    if($authenKey != $WebworkSOAP::SeedCE{soap_authen_key}) {
-        soap_fault_authen;
-    }
-    $@ and soap_fault_major("Course Environment cannot be constructed.");
-    my @test = listCourses($ce);
-    return array_to_soap_string( @test );
+	my ($self, $authenKey) = @_;
+	my $ce = eval { WeBWorK::CourseEnvironment->new };
+	$@ and soap_fault_major("Internal Course Environment cannot be constructed.");
+	if ($authenKey != $WebworkSOAP::SeedCE{soap_authen_key}) {
+		soap_fault_authen;
+	}
+	$@ and soap_fault_major("Course Environment cannot be constructed.");
+	my @test = listCourses($ce);
+	return array_to_soap_string(@test);
 }
 
 =pod
@@ -127,19 +125,19 @@ sub list_courses {
 =cut
 
 sub login_user {
-    my ($self,$authenKey,$courseName,$userID) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my $newKey;
-    my $timestamp = time;
-    my @chars = @{ $soapEnv->{ce}->{sessionKeyChars} };
-    my $length = $soapEnv->{ce}->{sessionKeyLength};
-    srand;
-    $newKey = join ("", @chars[map rand(@chars), 1 .. $length]);
-    my $Key = $soapEnv->{db}->newKey(user_id=>$userID, key=>$newKey, timestamp=>$timestamp);
-    eval { $soapEnv->{db}->deleteKey($userID) };
-    eval { $soapEnv->{db}->addKey($Key) };
-    $@ and soap_fault(SOAPERROR_USER_NOT_FOUND,"User not found.");
-    return SOAP::Data->type( 'string', $newKey );
+	my ($self, $authenKey, $courseName, $userID) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	my $newKey;
+	my $timestamp = time;
+	my @chars     = @{ $soapEnv->{ce}->{sessionKeyChars} };
+	my $length    = $soapEnv->{ce}->{sessionKeyLength};
+	srand;
+	$newKey = join("", @chars[ map rand(@chars), 1 .. $length ]);
+	my $Key = $soapEnv->{db}->newKey(user_id => $userID, key => $newKey, timestamp => $timestamp);
+	eval { $soapEnv->{db}->deleteKey($userID) };
+	eval { $soapEnv->{db}->addKey($Key) };
+	$@ and soap_fault(SOAPERROR_USER_NOT_FOUND, "User not found.");
+	return SOAP::Data->type('string', $newKey);
 }
 
 =pod
@@ -155,38 +153,39 @@ sub login_user {
 =cut
 
 sub assign_set_to_user {
-    my ($self,$authenKey,$courseName,$userID,$setID) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my $GlobalSet = eval {$soapEnv->{db}->getGlobalSet($setID)};
-    $@ and soap_fault(SOAPERROR_SET_NOT_FOUND,"Set not found.");
-    my $setID = $GlobalSet->set_id;
-    my $db = $soapEnv->{db};
-    my $UserSet = $db->newUserSet;
-    $UserSet->user_id($userID);
-    $UserSet->set_id($setID);
-    my @results;
-    my $set_assigned = 0;
-    eval { $db->addUserSet($UserSet) };
-    if ($@) {
-    	if ($@ =~ m/user set exists/) {
-	    	push @results, "set $setID is already assigned to user $userID.";
-	    	$set_assigned = 1;
-    	} else {
-        	die $@;
-        }
-    }
-
-    my @GlobalProblems = grep { defined $_ } $db->getAllGlobalProblems($setID);
-    foreach my $GlobalProblem (@GlobalProblems) {
-        my $seed = int( rand( 2423) ) + 36;
-        my $UserProblem = $db->newUserProblem;
-	$UserProblem->user_id($userID);
-	$UserProblem->set_id($GlobalProblem->set_id);
-	$UserProblem->problem_id($GlobalProblem->problem_id);
-	initializeUserProblem($UserProblem, $seed);
-	eval { $db->addUserProblem($UserProblem) };
-    }
-    return array_to_soap_string( @results ); #FIXME WSDL says $string, not @string?
+	my ($self, $authenKey, $courseName, $userID, $setID) = @_;
+	my $soapEnv   = new WebworkSOAP($authenKey, $courseName);
+	my $GlobalSet = eval { $soapEnv->{db}->getGlobalSet($setID) };
+	$@ and soap_fault(SOAPERROR_SET_NOT_FOUND, "Set not found.");
+	my $setID   = $GlobalSet->set_id;
+	my $db      = $soapEnv->{db};
+	my $UserSet = $db->newUserSet;
+	$UserSet->user_id($userID);
+	$UserSet->set_id($setID);
+	my @results;
+	my $set_assigned = 0;
+	eval { $db->addUserSet($UserSet) };
+
+	if ($@) {
+		if ($@ =~ m/user set exists/) {
+			push @results, "set $setID is already assigned to user $userID.";
+			$set_assigned = 1;
+		} else {
+			die $@;
+		}
+	}
+
+	my @GlobalProblems = grep { defined $_ } $db->getAllGlobalProblems($setID);
+	foreach my $GlobalProblem (@GlobalProblems) {
+		my $seed        = int(rand(2423)) + 36;
+		my $UserProblem = $db->newUserProblem;
+		$UserProblem->user_id($userID);
+		$UserProblem->set_id($GlobalProblem->set_id);
+		$UserProblem->problem_id($GlobalProblem->problem_id);
+		initializeUserProblem($UserProblem, $seed);
+		eval { $db->addUserProblem($UserProblem) };
+	}
+	return array_to_soap_string(@results);    #FIXME WSDL says $string, not @string?
 }
 
 =pod
@@ -202,29 +201,29 @@ sub assign_set_to_user {
 =cut
 
 sub grade_users_sets {
-    my ($self,$authenKey,$courseName,$userIDs,$setID) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my @grades;
-    #open (LOG, ">>/opt/webwork/tmp_log") or die "Can't open log file";
-    #print LOG "\n\nhi there\n\n";
-
-    my $db = $soapEnv->{db};
-    foreach my $userID (@{$userIDs}) {
-#         my @problemData = $soapEnv->{db}->getAllMergedUserProblems($userID,$setID);
-#         
-#         my $grade = 0;
-#         for(my $i=0;$i<@problemData;$i++) {
-#                 #print LOG "$userID problem Data",join(" ", %{$problemData[$i]}),"\n\n";
-#                 $grade += ($problemData[$i]->status)*($problemData[$i]->value);
-#                 #print LOG "grade is $grade\n";
-#         }
-            #print LOG "grade_users_sets: get user $userID set $setID\n";
-         	my $grade = get_wwassignment_grade_for_one_user($db, $userID,$setID );
-         	#print LOG " grade is $grade \n\n";
-        push(@grades,$grade);
-    }
-    #close(LOG);
-    return array_to_soap_string( @grades );
+	my ($self, $authenKey, $courseName, $userIDs, $setID) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	my @grades;
+	#open (LOG, ">>/opt/webwork/tmp_log") or die "Can't open log file";
+	#print LOG "\n\nhi there\n\n";
+
+	my $db = $soapEnv->{db};
+	foreach my $userID (@{$userIDs}) {
+		#         my @problemData = $soapEnv->{db}->getAllMergedUserProblems($userID,$setID);
+		#
+		#         my $grade = 0;
+		#         for(my $i=0;$i<@problemData;$i++) {
+		#                 #print LOG "$userID problem Data",join(" ", %{$problemData[$i]}),"\n\n";
+		#                 $grade += ($problemData[$i]->status)*($problemData[$i]->value);
+		#                 #print LOG "grade is $grade\n";
+		#         }
+		#print LOG "grade_users_sets: get user $userID set $setID\n";
+		my $grade = get_wwassignment_grade_for_one_user($db, $userID, $setID);
+		#print LOG " grade is $grade \n\n";
+		push(@grades, $grade);
+	}
+	#close(LOG);
+	return array_to_soap_string(@grades);
 }
 
 =pod
@@ -239,14 +238,14 @@ sub grade_users_sets {
 =cut
 
 sub get_set_data {
-    my ($self,$authenKey,$courseName,$setID) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my $setData = $soapEnv->{db}->getGlobalSet($setID);
-    if(not defined $setData) {
-        return -1;
-    }
-    my $set = new WebworkSOAP::Classes::GlobalSet($setData);
-    return $set;
+	my ($self, $authenKey, $courseName, $setID) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	my $setData = $soapEnv->{db}->getGlobalSet($setID);
+	if (not defined $setData) {
+		return -1;
+	}
+	my $set = new WebworkSOAP::Classes::GlobalSet($setData);
+	return $set;
 }
 
 ####################################################################
@@ -268,11 +267,11 @@ sub get_set_data {
 =cut
 
 sub add_password {
-    my ($self,$authenKey,$courseName,$record) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my $newPassword = $soapEnv->{db}->newPassword;
-    %$newPassword = %$record;
-    return SOAP::Data->type( 'string', $soapEnv->{db}->addPassword($newPassword) );
+	my ($self, $authenKey, $courseName, $record) = @_;
+	my $soapEnv     = new WebworkSOAP($authenKey, $courseName);
+	my $newPassword = $soapEnv->{db}->newPassword;
+	%$newPassword = %$record;
+	return SOAP::Data->type('string', $soapEnv->{db}->addPassword($newPassword));
 }
 
 =pod
@@ -287,9 +286,9 @@ sub add_password {
 =cut
 
 sub put_password {
-    my ($self,$authenKey,$courseName,$record) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    return SOAP::Data->type( 'string', $soapEnv->{db}->putPassword($record) );
+	my ($self, $authenKey, $courseName, $record) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	return SOAP::Data->type('string', $soapEnv->{db}->putPassword($record));
 }
 
 =pod
@@ -303,10 +302,10 @@ sub put_password {
 =cut
 
 sub list_password {
-    my ($self,$authenKey,$courseName) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my @tempArray = $soapEnv->{db}->listPasswords;
-    return array_to_soap_string( @tempArray );
+	my ($self, $authenKey, $courseName) = @_;
+	my $soapEnv   = new WebworkSOAP($authenKey, $courseName);
+	my @tempArray = $soapEnv->{db}->listPasswords;
+	return array_to_soap_string(@tempArray);
 }
 
 =pod
@@ -321,14 +320,14 @@ sub list_password {
 =cut
 
 sub get_passwords {
-    my ($self,$authenKey,$courseName,$userIDs) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my @passwordData = $soapEnv->{db}->getPasswords(@$userIDs);
-    my @passwords;
-    for(my $i=0;$i<@passwordData;$i++) {
-        push(@passwords,new WebworkSOAP::Classes::Password(@passwordData[$i]));
-    }
-    return \@passwords;
+	my ($self, $authenKey, $courseName, $userIDs) = @_;
+	my $soapEnv      = new WebworkSOAP($authenKey, $courseName);
+	my @passwordData = $soapEnv->{db}->getPasswords(@$userIDs);
+	my @passwords;
+	for (my $i = 0; $i < @passwordData; $i++) {
+		push(@passwords, new WebworkSOAP::Classes::Password(@passwordData[$i]));
+	}
+	return \@passwords;
 }
 
 =pod
@@ -343,14 +342,14 @@ sub get_passwords {
 =cut
 
 sub get_password {
-    my ($self,$authenKey,$courseName,$userID) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my $passwordData = $soapEnv->{db}->getPassword($userID);
-    if(not defined $passwordData) {
-        return -1;
-    }
-    my $password = new WebworkSOAP::Classes::Password($passwordData);
-    return ($password);
+	my ($self, $authenKey, $courseName, $userID) = @_;
+	my $soapEnv      = new WebworkSOAP($authenKey, $courseName);
+	my $passwordData = $soapEnv->{db}->getPassword($userID);
+	if (not defined $passwordData) {
+		return -1;
+	}
+	my $password = new WebworkSOAP::Classes::Password($passwordData);
+	return ($password);
 }
 
 ##################################################
@@ -369,11 +368,11 @@ sub get_password {
 =cut
 
 sub add_permission {
-    my ($self,$authenKey,$courseName,$record) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my $newPermissionLevel = $soapEnv->{db}->newPermissionLevel;
-    %$newPermissionLevel = %$record;
-    return SOAP::Data->type( 'string', $soapEnv->{db}->addPermissionLevel($newPermissionLevel) );
+	my ($self, $authenKey, $courseName, $record) = @_;
+	my $soapEnv            = new WebworkSOAP($authenKey, $courseName);
+	my $newPermissionLevel = $soapEnv->{db}->newPermissionLevel;
+	%$newPermissionLevel = %$record;
+	return SOAP::Data->type('string', $soapEnv->{db}->addPermissionLevel($newPermissionLevel));
 }
 
 =pod
@@ -388,12 +387,11 @@ sub add_permission {
 =cut
 
 sub put_permission {
-    my ($self,$authenKey,$courseName,$record) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my $newPermissionLevel = $soapEnv->{db}->newPermissionLevel;
-    %$newPermissionLevel = %$record;
-    return SOAP::Data->type( 'string',
-        $soapEnv->{db}->putPermissionLevel($newPermissionLevel) );
+	my ($self, $authenKey, $courseName, $record) = @_;
+	my $soapEnv            = new WebworkSOAP($authenKey, $courseName);
+	my $newPermissionLevel = $soapEnv->{db}->newPermissionLevel;
+	%$newPermissionLevel = %$record;
+	return SOAP::Data->type('string', $soapEnv->{db}->putPermissionLevel($newPermissionLevel));
 }
 
 =pod
@@ -407,10 +405,10 @@ sub put_permission {
 =cut
 
 sub list_permissions {
-    my ($self,$authenKey,$courseName) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my @tempArray = $soapEnv->{db}->listPermissionLevels;
-    return array_to_soap_string( @tempArray );
+	my ($self, $authenKey, $courseName) = @_;
+	my $soapEnv   = new WebworkSOAP($authenKey, $courseName);
+	my @tempArray = $soapEnv->{db}->listPermissionLevels;
+	return array_to_soap_string(@tempArray);
 }
 
 =pod
@@ -425,14 +423,14 @@ sub list_permissions {
 =cut
 
 sub get_permissions {
-    my ($self,$authenKey,$courseName,$userIDs) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my @permissionData = $soapEnv->{db}->getPermissionLevels(@$userIDs);
-    my @permissions;
-    for(my $i=0;$i<@permissionData;$i++) {
-        push(@permissions,new WebworkSOAP::Classes::Permission(@permissionData[$i]));
-    }
-    return \@permissions;
+	my ($self, $authenKey, $courseName, $userIDs) = @_;
+	my $soapEnv        = new WebworkSOAP($authenKey, $courseName);
+	my @permissionData = $soapEnv->{db}->getPermissionLevels(@$userIDs);
+	my @permissions;
+	for (my $i = 0; $i < @permissionData; $i++) {
+		push(@permissions, new WebworkSOAP::Classes::Permission(@permissionData[$i]));
+	}
+	return \@permissions;
 }
 
 =pod
@@ -447,14 +445,14 @@ sub get_permissions {
 =cut
 
 sub get_permission {
-    my ($self,$authenKey,$courseName,$userID) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my $permissionData = $soapEnv->{db}->getPermissionLevel($userID);
-    if(not defined $permissionData) {
-        return -1;
-    }
-    my $permission = new WebworkSOAP::Classes::Permission($permissionData);
-    return ($permission);
+	my ($self, $authenKey, $courseName, $userID) = @_;
+	my $soapEnv        = new WebworkSOAP($authenKey, $courseName);
+	my $permissionData = $soapEnv->{db}->getPermissionLevel($userID);
+	if (not defined $permissionData) {
+		return -1;
+	}
+	my $permission = new WebworkSOAP::Classes::Permission($permissionData);
+	return ($permission);
 }
 
 ##################################################
@@ -473,11 +471,11 @@ sub get_permission {
 =cut
 
 sub add_key {
-    my ($self,$authenKey,$courseName,$record) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my $newKey = $soapEnv->{db}->newKey;
-    %$newKey = %$record;
-    return SOAP::Data->type( 'string', $soapEnv->{db}->addKey($newKey) );
+	my ($self, $authenKey, $courseName, $record) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	my $newKey  = $soapEnv->{db}->newKey;
+	%$newKey = %$record;
+	return SOAP::Data->type('string', $soapEnv->{db}->addKey($newKey));
 }
 
 =pod
@@ -492,9 +490,9 @@ sub add_key {
 =cut
 
 sub put_key {
-    my ($self,$authenKey,$courseName,$record) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    return SOAP::Data->type( 'string', $soapEnv->{db}->putKey($record) );
+	my ($self, $authenKey, $courseName, $record) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	return SOAP::Data->type('string', $soapEnv->{db}->putKey($record));
 }
 
 =pod
@@ -508,10 +506,10 @@ sub put_key {
 =cut
 
 sub list_keys {
-    my ($self,$authenKey,$courseName) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my @tempArray = $soapEnv->{db}->listKeys;
-    return array_to_soap_string( @tempArray );
+	my ($self, $authenKey, $courseName) = @_;
+	my $soapEnv   = new WebworkSOAP($authenKey, $courseName);
+	my @tempArray = $soapEnv->{db}->listKeys;
+	return array_to_soap_string(@tempArray);
 }
 
 =pod
@@ -526,14 +524,14 @@ sub list_keys {
 =cut
 
 sub get_keys {
-    my ($self,$authenKey,$courseName,$userIDs) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my @keyData = $soapEnv->{db}->getKeys(@$userIDs);
-    my @keys;
-    for(my $i=0;$i<@keyData;$i++) {
-        push(@keys,new WebworkSOAP::Classes::Key(@keyData[$i]));
-    }
-    return \@keys;
+	my ($self, $authenKey, $courseName, $userIDs) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	my @keyData = $soapEnv->{db}->getKeys(@$userIDs);
+	my @keys;
+	for (my $i = 0; $i < @keyData; $i++) {
+		push(@keys, new WebworkSOAP::Classes::Key(@keyData[$i]));
+	}
+	return \@keys;
 }
 
 =pod
@@ -548,14 +546,14 @@ sub get_keys {
 =cut
 
 sub get_key {
-    my ($self,$authenKey,$courseName,$userID) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my $keyData = $soapEnv->{db}->getKey($userID);
-    if(not defined $keyData) {
-        return -1;
-    }
-    my $key = new WebworkSOAP::Classes::Key($keyData);
-    return ($key);
+	my ($self, $authenKey, $courseName, $userID) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	my $keyData = $soapEnv->{db}->getKey($userID);
+	if (not defined $keyData) {
+		return -1;
+	}
+	my $key = new WebworkSOAP::Classes::Key($keyData);
+	return ($key);
 }
 
 ##################################################
@@ -574,11 +572,11 @@ sub get_key {
 =cut
 
 sub add_user {
-    my ($self,$authenKey,$courseName,$record) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my $newUser = $soapEnv->{db}->newUser;
-    %$newUser = %$record;
-    return SOAP::Data->type( 'string', $soapEnv->{db}->addUser($newUser) );
+	my ($self, $authenKey, $courseName, $record) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	my $newUser = $soapEnv->{db}->newUser;
+	%$newUser = %$record;
+	return SOAP::Data->type('string', $soapEnv->{db}->addUser($newUser));
 }
 
 =pod
@@ -593,9 +591,9 @@ sub add_user {
 =cut
 
 sub put_user {
-    my ($self,$authenKey,$courseName,$record) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    return SOAP::Data->type( 'string', $soapEnv->{db}->putUser($record) );
+	my ($self, $authenKey, $courseName, $record) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	return SOAP::Data->type('string', $soapEnv->{db}->putUser($record));
 }
 
 =pod
@@ -609,10 +607,10 @@ sub put_user {
 =cut
 
 sub list_users {
-    my ($self,$authenKey,$courseName) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my @tempArray = $soapEnv->{db}->listUsers;
-    return array_to_soap_string( @tempArray );
+	my ($self, $authenKey, $courseName) = @_;
+	my $soapEnv   = new WebworkSOAP($authenKey, $courseName);
+	my @tempArray = $soapEnv->{db}->listUsers;
+	return array_to_soap_string(@tempArray);
 }
 
 =pod
@@ -627,14 +625,14 @@ sub list_users {
 =cut
 
 sub get_user {
-    my ($self,$authenKey,$courseName,$userID) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my $userData = $soapEnv->{db}->getUser($userID);
-    if(not defined $userData) {
-        return -1;
-    }
-    my $user = new WebworkSOAP::Classes::User($userData);
-    return ($user);
+	my ($self, $authenKey, $courseName, $userID) = @_;
+	my $soapEnv  = new WebworkSOAP($authenKey, $courseName);
+	my $userData = $soapEnv->{db}->getUser($userID);
+	if (not defined $userData) {
+		return -1;
+	}
+	my $user = new WebworkSOAP::Classes::User($userData);
+	return ($user);
 }
 
 =pod
@@ -649,14 +647,14 @@ sub get_user {
 =cut
 
 sub get_users {
-    my ($self,$authenKey,$courseName,$userIDs) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my @userData = $soapEnv->{db}->getUsers(@$userIDs);
-    my @users;
-    for(my $i=0;$i<@userData;$i++) {
-        push(@users,new WebworkSOAP::Classes::User(@userData[$i]));
-    }
-    return \@users;
+	my ($self, $authenKey, $courseName, $userIDs) = @_;
+	my $soapEnv  = new WebworkSOAP($authenKey, $courseName);
+	my @userData = $soapEnv->{db}->getUsers(@$userIDs);
+	my @users;
+	for (my $i = 0; $i < @userData; $i++) {
+		push(@users, new WebworkSOAP::Classes::User(@userData[$i]));
+	}
+	return \@users;
 }
 
 =pod
@@ -671,9 +669,9 @@ sub get_users {
 =cut
 
 sub delete_user {
-    my ($self,$authenKey,$courseName,$userID) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    return SOAP::Data->type( 'string', $soapEnv->{db}->deleteUser($userID) );
+	my ($self, $authenKey, $courseName, $userID) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	return SOAP::Data->type('string', $soapEnv->{db}->deleteUser($userID));
 }
 
 ##################################################
@@ -692,11 +690,11 @@ sub delete_user {
 =cut
 
 sub add_global_set {
-    my ($self,$authenKey,$courseName,$record) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my $newGlobalSet = $soapEnv->{db}->newGlobalSet;
-    %$newGlobalSet = %$record;
-    return SOAP::Data->type( 'string', $soapEnv->{db}->addGlobalSet($newGlobalSet) );
+	my ($self, $authenKey, $courseName, $record) = @_;
+	my $soapEnv      = new WebworkSOAP($authenKey, $courseName);
+	my $newGlobalSet = $soapEnv->{db}->newGlobalSet;
+	%$newGlobalSet = %$record;
+	return SOAP::Data->type('string', $soapEnv->{db}->addGlobalSet($newGlobalSet));
 }
 
 =pod
@@ -711,9 +709,9 @@ sub add_global_set {
 =cut
 
 sub put_global_set {
-    my ($self,$authenKey,$courseName,$record) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    return SOAP::Data->type( 'string', $soapEnv->{db}->putGlobalSet($record) );
+	my ($self, $authenKey, $courseName, $record) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	return SOAP::Data->type('string', $soapEnv->{db}->putGlobalSet($record));
 }
 
 =pod
@@ -727,10 +725,10 @@ sub put_global_set {
 =cut
 
 sub list_global_sets {
-    my ($self,$authenKey,$courseName) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my @tempArray = $soapEnv->{db}->listGlobalSets;
-    return array_to_soap_string( @tempArray );
+	my ($self, $authenKey, $courseName) = @_;
+	my $soapEnv   = new WebworkSOAP($authenKey, $courseName);
+	my @tempArray = $soapEnv->{db}->listGlobalSets;
+	return array_to_soap_string(@tempArray);
 }
 
 =pod
@@ -744,15 +742,15 @@ sub list_global_sets {
 =cut
 
 sub get_all_global_sets {
-    my ($self,$authenKey,$courseName) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my @tempArray = $soapEnv->{db}->listGlobalSets;
-    my @setData = $soapEnv->{db}->getGlobalSets(@tempArray);
-    my @sets;
-    for(my $i=0;$i<@setData;$i++) {
-        push(@sets,new WebworkSOAP::Classes::GlobalSet(@setData[$i]));
-    }
-    return \@sets;
+	my ($self, $authenKey, $courseName) = @_;
+	my $soapEnv   = new WebworkSOAP($authenKey, $courseName);
+	my @tempArray = $soapEnv->{db}->listGlobalSets;
+	my @setData   = $soapEnv->{db}->getGlobalSets(@tempArray);
+	my @sets;
+	for (my $i = 0; $i < @setData; $i++) {
+		push(@sets, new WebworkSOAP::Classes::GlobalSet(@setData[$i]));
+	}
+	return \@sets;
 }
 
 =pod
@@ -767,14 +765,14 @@ sub get_all_global_sets {
 =cut
 
 sub get_global_sets {
-    my ($self,$authenKey,$courseName,$setIDs) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my @setData = $soapEnv->{db}->getGlobalSets(@$setIDs);
-    my @sets;
-    for(my $i=0;$i<@setData;$i++) {
-        push(@sets,new WebworkSOAP::Classes::GlobalSet(@setData[$i]));
-    }
-    return \@sets;
+	my ($self, $authenKey, $courseName, $setIDs) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	my @setData = $soapEnv->{db}->getGlobalSets(@$setIDs);
+	my @sets;
+	for (my $i = 0; $i < @setData; $i++) {
+		push(@sets, new WebworkSOAP::Classes::GlobalSet(@setData[$i]));
+	}
+	return \@sets;
 }
 
 =pod
@@ -789,14 +787,14 @@ sub get_global_sets {
 =cut
 
 sub get_global_set {
-    my ($self,$authenKey,$courseName,$setID) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my $setData = $soapEnv->{db}->getGlobalSet($setID);
-    if(not defined $setData) {
-        return -1;
-    }
-    my $set = new WebworkSOAP::Classes::GlobalSet($setData);
-    return ($set);
+	my ($self, $authenKey, $courseName, $setID) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	my $setData = $soapEnv->{db}->getGlobalSet($setID);
+	if (not defined $setData) {
+		return -1;
+	}
+	my $set = new WebworkSOAP::Classes::GlobalSet($setData);
+	return ($set);
 }
 
 =pod
@@ -811,9 +809,9 @@ sub get_global_set {
 =cut
 
 sub delete_global_set {
-    my ($self,$authenKey,$courseName,$setID) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    return SOAP::Data->type( 'string', $soapEnv->{db}->deleteGlobalSet($setID) );
+	my ($self, $authenKey, $courseName, $setID) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	return SOAP::Data->type('string', $soapEnv->{db}->deleteGlobalSet($setID));
 }
 
 ##################################################
@@ -832,11 +830,11 @@ sub delete_global_set {
 =cut
 
 sub add_global_problem {
-    my ($self,$authenKey,$courseName,$record) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my $newGlobalProblem = $soapEnv->{db}->newGlobalProblem;
-    %$newGlobalProblem = %$record;
-    return SOAP::Data->type( 'string', $soapEnv->{db}->addGlobalProblem($newGlobalProblem) );
+	my ($self, $authenKey, $courseName, $record) = @_;
+	my $soapEnv          = new WebworkSOAP($authenKey, $courseName);
+	my $newGlobalProblem = $soapEnv->{db}->newGlobalProblem;
+	%$newGlobalProblem = %$record;
+	return SOAP::Data->type('string', $soapEnv->{db}->addGlobalProblem($newGlobalProblem));
 }
 
 =pod
@@ -851,9 +849,9 @@ sub add_global_problem {
 =cut
 
 sub put_global_problem {
-    my ($self,$authenKey,$courseName,$record) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    return SOAP::Data->type( 'string', $soapEnv->{db}->putGlobalProblem($record) );
+	my ($self, $authenKey, $courseName, $record) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	return SOAP::Data->type('string', $soapEnv->{db}->putGlobalProblem($record));
 }
 
 =pod
@@ -868,10 +866,10 @@ sub put_global_problem {
 =cut
 
 sub list_global_problems {
-    my ($self,$authenKey,$courseName,$setID) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my @tempArray = $soapEnv->{db}->listGlobalProblems($setID);
-    return array_to_soap_string( @tempArray );
+	my ($self, $authenKey, $courseName, $setID) = @_;
+	my $soapEnv   = new WebworkSOAP($authenKey, $courseName);
+	my @tempArray = $soapEnv->{db}->listGlobalProblems($setID);
+	return array_to_soap_string(@tempArray);
 }
 
 =pod
@@ -886,14 +884,14 @@ sub list_global_problems {
 =cut
 
 sub get_all_global_problems {
-    my ($self,$authenKey,$courseName,$setID) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my @problemData = $soapEnv->{db}->getAllGlobalProblems($setID);
-    my @problems;
-    for(my $i=0;$i<@problemData;$i++) {
-        push(@problems,new WebworkSOAP::Classes::GlobalProblem(@problemData[$i]));
-    }
-    return \@problems;
+	my ($self, $authenKey, $courseName, $setID) = @_;
+	my $soapEnv     = new WebworkSOAP($authenKey, $courseName);
+	my @problemData = $soapEnv->{db}->getAllGlobalProblems($setID);
+	my @problems;
+	for (my $i = 0; $i < @problemData; $i++) {
+		push(@problems, new WebworkSOAP::Classes::GlobalProblem(@problemData[$i]));
+	}
+	return \@problems;
 }
 
 =pod
@@ -907,14 +905,14 @@ sub get_all_global_problems {
 =cut
 
 sub get_global_problems {
-    my ($self,$authenKey,$courseName,$problemIDs) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my @problemData = $soapEnv->{db}->getGlobalProblems(@$problemIDs);
-    my @problems;
-    for(my $i=0;$i<@problemData;$i++) {
-        push(@problems,new WebworkSOAP::Classes::GlobalProblem(@problemData[$i])); #FIXME $problemData[$i]? 
-    }
-    return \@problems;
+	my ($self, $authenKey, $courseName, $problemIDs) = @_;
+	my $soapEnv     = new WebworkSOAP($authenKey, $courseName);
+	my @problemData = $soapEnv->{db}->getGlobalProblems(@$problemIDs);
+	my @problems;
+	for (my $i = 0; $i < @problemData; $i++) {
+		push(@problems, new WebworkSOAP::Classes::GlobalProblem(@problemData[$i]));    #FIXME $problemData[$i]?
+	}
+	return \@problems;
 }
 
 =pod
@@ -930,14 +928,14 @@ sub get_global_problems {
 =cut
 
 sub get_global_problem {
-    my ($self,$authenKey,$courseName,$setID,$problemID) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my $problemData = $soapEnv->{db}->getGlobalProblem($setID,$problemID);
-    if(not defined $problemData) {
-        return -1;
-    }
-    my $problem = new WebworkSOAP::Classes::GlobalProblem($problemData);
-    return ($problem);
+	my ($self, $authenKey, $courseName, $setID, $problemID) = @_;
+	my $soapEnv     = new WebworkSOAP($authenKey, $courseName);
+	my $problemData = $soapEnv->{db}->getGlobalProblem($setID, $problemID);
+	if (not defined $problemData) {
+		return -1;
+	}
+	my $problem = new WebworkSOAP::Classes::GlobalProblem($problemData);
+	return ($problem);
 }
 
 =pod
@@ -953,9 +951,9 @@ sub get_global_problem {
 =cut
 
 sub delete_global_problem {
-    my ($self,$authenKey,$courseName,$setID,$problemID) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    return SOAP::Data->type( 'string', $soapEnv->{db}->deleteGlobalProblem($setID,$problemID) );
+	my ($self, $authenKey, $courseName, $setID, $problemID) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	return SOAP::Data->type('string', $soapEnv->{db}->deleteGlobalProblem($setID, $problemID));
 }
 
 ##################################################
@@ -974,11 +972,11 @@ sub delete_global_problem {
 =cut
 
 sub add_user_problem {
-    my ($self,$authenKey,$courseName,$record) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my $newUserProblem = $soapEnv->{db}->newUserProblem;
-    %$newUserProblem = %$record;
-    return SOAP::Data->type( 'string', $soapEnv->{db}->addUserProblem($newUserProblem) );
+	my ($self, $authenKey, $courseName, $record) = @_;
+	my $soapEnv        = new WebworkSOAP($authenKey, $courseName);
+	my $newUserProblem = $soapEnv->{db}->newUserProblem;
+	%$newUserProblem = %$record;
+	return SOAP::Data->type('string', $soapEnv->{db}->addUserProblem($newUserProblem));
 }
 
 =pod
@@ -993,9 +991,9 @@ sub add_user_problem {
 =cut
 
 sub put_user_problem {
-    my ($self,$authenKey,$courseName,$record) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    return SOAP::Data->type( 'string', $soapEnv->{db}->putUserProblem($record) );
+	my ($self, $authenKey, $courseName, $record) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	return SOAP::Data->type('string', $soapEnv->{db}->putUserProblem($record));
 }
 
 =pod
@@ -1011,10 +1009,10 @@ sub put_user_problem {
 =cut
 
 sub list_user_problems {
-    my ($self,$authenKey,$courseName,$userID,$setID) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my @tempArray = $soapEnv->{db}->listUserProblems($userID,$setID);
-    return array_to_soap_string( @tempArray );
+	my ($self, $authenKey, $courseName, $userID, $setID) = @_;
+	my $soapEnv   = new WebworkSOAP($authenKey, $courseName);
+	my @tempArray = $soapEnv->{db}->listUserProblems($userID, $setID);
+	return array_to_soap_string(@tempArray);
 }
 
 =pod
@@ -1030,14 +1028,14 @@ sub list_user_problems {
 =cut
 
 sub get_all_user_problems {
-    my ($self,$authenKey,$courseName,$userID,$setID) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my @problemData = $soapEnv->{db}->getAllUserProblems($userID,$setID);
-    my @problems;
-    for(my $i=0;$i<@problemData;$i++) {
-        push(@problems,new WebworkSOAP::Classes::UserProblem(@problemData[$i]));
-    }
-    return \@problems;
+	my ($self, $authenKey, $courseName, $userID, $setID) = @_;
+	my $soapEnv     = new WebworkSOAP($authenKey, $courseName);
+	my @problemData = $soapEnv->{db}->getAllUserProblems($userID, $setID);
+	my @problems;
+	for (my $i = 0; $i < @problemData; $i++) {
+		push(@problems, new WebworkSOAP::Classes::UserProblem(@problemData[$i]));
+	}
+	return \@problems;
 }
 
 =pod
@@ -1052,14 +1050,14 @@ sub get_all_user_problems {
 =cut
 
 sub get_user_problems {
-    my ($self,$authenKey,$courseName,$userProblemIDs) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my @problemData = $soapEnv->{db}->getUserProblems(@$userProblemIDs);
-    my @problems;
-    for(my $i=0;$i<@problemData;$i++) {
-        push(@problems,new WebworkSOAP::Classes::UserProblem(@problemData[$i]));
-    }
-    return \@problems;
+	my ($self, $authenKey, $courseName, $userProblemIDs) = @_;
+	my $soapEnv     = new WebworkSOAP($authenKey, $courseName);
+	my @problemData = $soapEnv->{db}->getUserProblems(@$userProblemIDs);
+	my @problems;
+	for (my $i = 0; $i < @problemData; $i++) {
+		push(@problems, new WebworkSOAP::Classes::UserProblem(@problemData[$i]));
+	}
+	return \@problems;
 }
 
 =pod
@@ -1076,14 +1074,14 @@ sub get_user_problems {
 =cut
 
 sub get_user_problem {
-    my ($self,$authenKey,$courseName,$userID,$setID,$problemID) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my $problemData = $soapEnv->{db}->getUserProblem($userID,$setID,$problemID);
-    if(not defined $problemData) {
-        return -1;
-    }
-    my $problem = new WebworkSOAP::Classes::UserProblem($problemData);
-    return ($problem);
+	my ($self, $authenKey, $courseName, $userID, $setID, $problemID) = @_;
+	my $soapEnv     = new WebworkSOAP($authenKey, $courseName);
+	my $problemData = $soapEnv->{db}->getUserProblem($userID, $setID, $problemID);
+	if (not defined $problemData) {
+		return -1;
+	}
+	my $problem = new WebworkSOAP::Classes::UserProblem($problemData);
+	return ($problem);
 }
 
 =pod
@@ -1100,9 +1098,9 @@ sub get_user_problem {
 =cut
 
 sub delete_user_problem {
-    my ($self,$authenKey,$courseName,$userID,$setID,$problemID) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    return SOAP::Data->type( 'string', $soapEnv->{db}->deleteUserProblem($userID,$setID,$problemID) );
+	my ($self, $authenKey, $courseName, $userID, $setID, $problemID) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	return SOAP::Data->type('string', $soapEnv->{db}->deleteUserProblem($userID, $setID, $problemID));
 }
 
 ##################################################
@@ -1121,11 +1119,11 @@ sub delete_user_problem {
 =cut
 
 sub add_user_set {
-    my ($self,$authenKey,$courseName,$record) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my $newUserSet = $soapEnv->{db}->newUserSet;
-    %$newUserSet = %$record;
-    return SOAP::Data->type( 'string', $soapEnv->{db}->addUserSet($newUserSet) );
+	my ($self, $authenKey, $courseName, $record) = @_;
+	my $soapEnv    = new WebworkSOAP($authenKey, $courseName);
+	my $newUserSet = $soapEnv->{db}->newUserSet;
+	%$newUserSet = %$record;
+	return SOAP::Data->type('string', $soapEnv->{db}->addUserSet($newUserSet));
 }
 
 =pod
@@ -1140,9 +1138,9 @@ sub add_user_set {
 =cut
 
 sub put_user_set {
-    my ($self,$authenKey,$courseName,$record) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    return SOAP::Data->type( 'string', $soapEnv->{db}->addUserSet($record) );
+	my ($self, $authenKey, $courseName, $record) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	return SOAP::Data->type('string', $soapEnv->{db}->addUserSet($record));
 }
 
 =pod
@@ -1157,10 +1155,10 @@ sub put_user_set {
 =cut
 
 sub list_user_sets {
-    my ($self,$authenKey,$courseName,$userID) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my @tempArray = $soapEnv->{db}->listUserSets($userID);
-    return array_to_soap_string( @tempArray );
+	my ($self, $authenKey, $courseName, $userID) = @_;
+	my $soapEnv   = new WebworkSOAP($authenKey, $courseName);
+	my @tempArray = $soapEnv->{db}->listUserSets($userID);
+	return array_to_soap_string(@tempArray);
 }
 
 =pod
@@ -1174,14 +1172,14 @@ sub list_user_sets {
 =cut
 
 sub get_all_user_sets {
-    my ($self,$authenKey,$courseName) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my @setData = $soapEnv->{db}->getAllUserSets();
-    my @sets;
-    for(my $i=0;$i<@setData;$i++) {
-        push(@sets,new WebworkSOAP::Classes::UserSet(@setData[$i]));
-    }
-    return \@sets;
+	my ($self, $authenKey, $courseName) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	my @setData = $soapEnv->{db}->getAllUserSets();
+	my @sets;
+	for (my $i = 0; $i < @setData; $i++) {
+		push(@sets, new WebworkSOAP::Classes::UserSet(@setData[$i]));
+	}
+	return \@sets;
 }
 
 =pod
@@ -1196,14 +1194,14 @@ sub get_all_user_sets {
 =cut
 
 sub get_user_sets {
-    my ($self,$authenKey,$courseName,$userSetIDs) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my @setData = $soapEnv->{db}->getUserSets(@$userSetIDs);
-    my @sets;
-    for(my $i=0;$i<@setData;$i++) {
-        push(@sets,new WebworkSOAP::Classes::UserSet(@setData[$i]));
-    }
-    return \@sets;
+	my ($self, $authenKey, $courseName, $userSetIDs) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	my @setData = $soapEnv->{db}->getUserSets(@$userSetIDs);
+	my @sets;
+	for (my $i = 0; $i < @setData; $i++) {
+		push(@sets, new WebworkSOAP::Classes::UserSet(@setData[$i]));
+	}
+	return \@sets;
 }
 
 =pod
@@ -1219,14 +1217,14 @@ sub get_user_sets {
 =cut
 
 sub get_user_set {
-    my ($self,$authenKey,$courseName,$userID,$setID) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    my $setData = $soapEnv->{db}->getUserSet($userID,$setID);
-    if(not defined $setData) {
-        return -1;
-    }
-    my $set = new WebworkSOAP::Classes::UserSet($setData);
-    return $set;
+	my ($self, $authenKey, $courseName, $userID, $setID) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	my $setData = $soapEnv->{db}->getUserSet($userID, $setID);
+	if (not defined $setData) {
+		return -1;
+	}
+	my $set = new WebworkSOAP::Classes::UserSet($setData);
+	return $set;
 }
 
 =pod
@@ -1242,9 +1240,9 @@ sub get_user_set {
 =cut
 
 sub delete_user_set {
-    my ($self,$authenKey,$courseName,$userID,$setID) = @_;
-    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
-    return SOAP::Data->type( 'string', $soapEnv->{db}->deleteUserSet($userID,$setID) );
+	my ($self, $authenKey, $courseName, $userID, $setID) = @_;
+	my $soapEnv = new WebworkSOAP($authenKey, $courseName);
+	return SOAP::Data->type('string', $soapEnv->{db}->deleteUserSet($userID, $setID));
 }
 
 ###########################################
@@ -1256,82 +1254,83 @@ sub delete_user_set {
 #input  $userID, $setID (or a UserSet record)?
 #output set grade for a homework problem or maximum grade for a gateway problem with several set versions
 ############################################
-sub get_wwassignment_grade_for_one_user{
-	my($db, $userID, $setID) = @_;
-	my $user_set = $db->getMergedSet($userID,$setID);
-	print LOG "user $userID set $setID user_set ".ref($user_set)."\n";
-	return " " unless ref($user_set);  # return a blank grade if there is no user_set
-	warn " user $userID $setID ".ref($user_set)."\n";
-	my $setIsVersioned = ( defined($user_set->assignment_type) && $user_set->assignment_type =~ /gateway/)?1:0;
-	my @setVersions=();
-	if ( $setIsVersioned ) { 
-		my @vList = $db->listSetVersions($userID,$setID);
-		# we have to have the merged set versions to 
-		#    know what each of their assignment types 
+sub get_wwassignment_grade_for_one_user {
+	my ($db, $userID, $setID) = @_;
+	my $user_set = $db->getMergedSet($userID, $setID);
+	print LOG "user $userID set $setID user_set " . ref($user_set) . "\n";
+	return " " unless ref($user_set);    # return a blank grade if there is no user_set
+	warn " user $userID $setID " . ref($user_set) . "\n";
+	my $setIsVersioned = (defined($user_set->assignment_type) && $user_set->assignment_type =~ /gateway/) ? 1 : 0;
+	my @setVersions    = ();
+	if ($setIsVersioned) {
+		my @vList = $db->listSetVersions($userID, $setID);
+		# we have to have the merged set versions to
+		#    know what each of their assignment types
 		#    are (because proctoring can change)
-		@setVersions = $db->getMergedSetVersions( map {[$userID, $setID, $_]} @vList );
+		@setVersions = $db->getMergedSetVersions(map { [ $userID, $setID, $_ ] } @vList);
 
 		# add the set versions to our list of sets
-# 		foreach ( @setVersions ) { 
-# 			$setsByID{$_->set_id . ",v" . $_->version_id} = $_; 
-# 		}
-# 		# flag the existence of set versions for this set
-# 		$setVersionsByID{$setName} = [ @vList ];
-# 		# and save the set names for display
-# 		push( @allSetIDs, $setName );
-# 		push( @allSetIDs, map { "$setName,v$_" } @vList );
+		# 		foreach ( @setVersions ) {
+		# 			$setsByID{$_->set_id . ",v" . $_->version_id} = $_;
+		# 		}
+		# 		# flag the existence of set versions for this set
+		# 		$setVersionsByID{$setName} = [ @vList ];
+		# 		# and save the set names for display
+		# 		push( @allSetIDs, $setName );
+		# 		push( @allSetIDs, map { "$setName,v$_" } @vList );
 
 	} else {
-# 		push( @allSetIDs, $setName );
-# 		$setVersionsByID{$setName} = "None";
+		# 		push( @allSetIDs, $setName );
+		# 		$setVersionsByID{$setName} = "None";
 	}
 	my $grade;
 	if ($setIsVersioned) {
 		if (@setVersions) {
-		    $grade =0;
-		    foreach my $setVersion (@setVersions) {  # get highest grade among versions
-				#print LOG "getting set $userID $setID version:".ref($setVersion)."\n";
+			$grade = 0;
+			foreach my $setVersion (@setVersions) {    # get highest grade among versions
+					#print LOG "getting set $userID $setID version:".ref($setVersion)."\n";
 				my $current_grade = get_set_grade_for_UserSet($db, $setVersion);
 				$grade = $current_grade if $current_grade > $grade;
-				
+
 			}
-				
+
 		} else {
 			$grade = " ";
 		}
-	} else {  # not versioned
-	    $grade = get_set_grade_for_UserSet($db, $user_set);	
+	} else {    # not versioned
+		$grade = get_set_grade_for_UserSet($db, $user_set);
 	}
-	$grade;   # return grade
+	$grade;     # return grade
 }
-	
+
 ############################################
 # get_set_grade_for_UserSet ($db, $user_set);
 #input  $userID, $setID (UserSet record);
 #output set grade for a homework problem or a single  set version of a gateway quiz
 ############################################
 
-sub get_set_grade_for_UserSet{
-	my $db = shift;
+sub get_set_grade_for_UserSet {
+	my $db       = shift;
 	my $user_set = shift;
-	warn "get_set_grade_for_UserSet(db, user_set); an argument is missing db: $db user_set $user_set" 
-	    unless ref($db) =~ /DB/  and ref($user_set) =~/Set/;
-	my $setIsVersioned = ( defined( $user_set->assignment_type() ) 
-	     && $user_set->assignment_type() =~ /gateway/ )? 1:0;
-	my @problemData=();
-	print LOG "get_set_grade_for_UserSet: getting set ".$user_set->set_id." "." for ".$user_set->user_id."\n";
-	if ($setIsVersioned) {	
-		@problemData = $db->getAllMergedProblemVersions( $user_set->user_id, $user_set->set_id, $user_set->version_id ) if $user_set->can('version_id');
+	warn "get_set_grade_for_UserSet(db, user_set); an argument is missing db: $db user_set $user_set"
+		unless ref($db) =~ /DB/ and ref($user_set) =~ /Set/;
+	my $setIsVersioned =
+		(defined($user_set->assignment_type()) && $user_set->assignment_type() =~ /gateway/) ? 1 : 0;
+	my @problemData = ();
+	print LOG "get_set_grade_for_UserSet: getting set " . $user_set->set_id . " " . " for " . $user_set->user_id . "\n";
+	if ($setIsVersioned) {
+		@problemData = $db->getAllMergedProblemVersions($user_set->user_id, $user_set->set_id, $user_set->version_id)
+			if $user_set->can('version_id');
 	} else {
 		@problemData = $db->getAllMergedUserProblems($user_set->user_id, $user_set->set_id);
 	}
-        
-        my $grade = 0;
-        for(my $i=0;$i<@problemData;$i++) {
-                #print LOG "$userID problem Data",join(" ", %{$problemData[$i]}),"\n\n";
-                $grade += ($problemData[$i]->status)*($problemData[$i]->value);
-                #print LOG "grade is $grade\n";
-        }
+
+	my $grade = 0;
+	for (my $i = 0; $i < @problemData; $i++) {
+		#print LOG "$userID problem Data",join(" ", %{$problemData[$i]}),"\n\n";
+		$grade += ($problemData[$i]->status) * ($problemData[$i]->value);
+		#print LOG "grade is $grade\n";
+	}
 	return $grade;
 }
 1;
diff --git a/lib/WebworkSOAP/Classes/GlobalProblem.pm b/lib/WebworkSOAP/Classes/GlobalProblem.pm
index 6296ba65c6..23c8ca8f41 100644
--- a/lib/WebworkSOAP/Classes/GlobalProblem.pm
+++ b/lib/WebworkSOAP/Classes/GlobalProblem.pm
@@ -15,18 +15,18 @@ package WebworkSOAP::Classes::GlobalProblem;
 =cut
 
 sub new {
-    my $self = shift;
-    my $data = shift;
-    $self = {};
-    $self->{set_id} = SOAP::Data->type( 'string', $data->set_id );
-    $self->{problem_id} = SOAP::Data->type( 'string', $data->problem_id );
-    $self->{source_file} = SOAP::Data->type( 'string', $data->source_file );
-    $self->{value} = SOAP::Data->type( 'string', $data->value );
-    $self->{max_attempts} = SOAP::Data->type( 'string', $data->max_attempts );
-    $self->{showMeAnother} = SOAP::Data->type( 'string', $data->showMeAnother );
-    $self->{showMeAnotherCount} = SOAP::Data->type( 'string', $data->showMeAnotherCount );
-    bless $self;
-    return $self;
+	my $self = shift;
+	my $data = shift;
+	$self                       = {};
+	$self->{set_id}             = SOAP::Data->type('string', $data->set_id);
+	$self->{problem_id}         = SOAP::Data->type('string', $data->problem_id);
+	$self->{source_file}        = SOAP::Data->type('string', $data->source_file);
+	$self->{value}              = SOAP::Data->type('string', $data->value);
+	$self->{max_attempts}       = SOAP::Data->type('string', $data->max_attempts);
+	$self->{showMeAnother}      = SOAP::Data->type('string', $data->showMeAnother);
+	$self->{showMeAnotherCount} = SOAP::Data->type('string', $data->showMeAnotherCount);
+	bless $self;
+	return $self;
 }
 
 1;
diff --git a/lib/WebworkSOAP/Classes/GlobalSet.pm b/lib/WebworkSOAP/Classes/GlobalSet.pm
index 228760f421..8c241c6683 100644
--- a/lib/WebworkSOAP/Classes/GlobalSet.pm
+++ b/lib/WebworkSOAP/Classes/GlobalSet.pm
@@ -25,28 +25,28 @@ package WebworkSOAP::Classes::GlobalSet;
 =cut
 
 sub new() {
-        my $self = shift;
-        my $data = shift;
-        $self = {};
-        $self->{set_id} = SOAP::Data->type( 'string', $data->set_id );
-        $self->{set_header} = SOAP::Data->type( 'string', $data->set_header );
-        $self->{hardcopy_header} = SOAP::Data->type( 'string', $data->hardcopy_header );
-        $self->{open_date} = SOAP::Data->type( 'string', $data->open_date );
-        $self->{due_date} = SOAP::Data->type( 'string', $data->due_date );
-        $self->{answer_date} = SOAP::Data->type( 'string', $data->answer_date );
-        $self->{visible} = SOAP::Data->type( 'string', $data->visible );
-        $self->{enable_reduced_scoring} = SOAP::Data->type( 'string', $data->enable_reduced_scoring );
-        $self->{assignment_type} = SOAP::Data->type( 'string', $data->assignment_type );
-        $self->{attempts_per_version} = SOAP::Data->type( 'string', $data->attempts_per_version );
-        $self->{time_interval} = SOAP::Data->type( 'string', $data->time_interval );
-        $self->{versions_per_interval} = SOAP::Data->type( 'string', $data->versions_per_interval );
-        $self->{version_time_limit} = SOAP::Data->type( 'string', $data->version_time_limit );
-        $self->{version_creation_time} = SOAP::Data->type( 'string', $data->version_creation_time );
-        $self->{problem_randorder} = SOAP::Data->type( 'string', $data->problem_randorder );
-        $self->{version_last_attempt_time} = SOAP::Data->type( 'string', $data->version_last_attempt_time );
-        $self->{problems_per_page} = SOAP::Data->type( 'string', $data->problems_per_page );
-        bless $self;
-        return $self;
+	my $self = shift;
+	my $data = shift;
+	$self                              = {};
+	$self->{set_id}                    = SOAP::Data->type('string', $data->set_id);
+	$self->{set_header}                = SOAP::Data->type('string', $data->set_header);
+	$self->{hardcopy_header}           = SOAP::Data->type('string', $data->hardcopy_header);
+	$self->{open_date}                 = SOAP::Data->type('string', $data->open_date);
+	$self->{due_date}                  = SOAP::Data->type('string', $data->due_date);
+	$self->{answer_date}               = SOAP::Data->type('string', $data->answer_date);
+	$self->{visible}                   = SOAP::Data->type('string', $data->visible);
+	$self->{enable_reduced_scoring}    = SOAP::Data->type('string', $data->enable_reduced_scoring);
+	$self->{assignment_type}           = SOAP::Data->type('string', $data->assignment_type);
+	$self->{attempts_per_version}      = SOAP::Data->type('string', $data->attempts_per_version);
+	$self->{time_interval}             = SOAP::Data->type('string', $data->time_interval);
+	$self->{versions_per_interval}     = SOAP::Data->type('string', $data->versions_per_interval);
+	$self->{version_time_limit}        = SOAP::Data->type('string', $data->version_time_limit);
+	$self->{version_creation_time}     = SOAP::Data->type('string', $data->version_creation_time);
+	$self->{problem_randorder}         = SOAP::Data->type('string', $data->problem_randorder);
+	$self->{version_last_attempt_time} = SOAP::Data->type('string', $data->version_last_attempt_time);
+	$self->{problems_per_page}         = SOAP::Data->type('string', $data->problems_per_page);
+	bless $self;
+	return $self;
 }
 
 1;
diff --git a/lib/WebworkSOAP/Classes/Key.pm b/lib/WebworkSOAP/Classes/Key.pm
index 22f271db30..4f85e7633a 100644
--- a/lib/WebworkSOAP/Classes/Key.pm
+++ b/lib/WebworkSOAP/Classes/Key.pm
@@ -11,14 +11,14 @@ package WebworkSOAP::Classes::Key;
 =cut
 
 sub new {
-    my $self = shift;
-    my $data = shift;
-    $self = {};
-    $self->{user_id} = SOAP::Data->type( 'string', $data->user_id );
-    $self->{key_not_a_keyboard} = SOAP::Data->type( 'string', $data->key_not_a_keyboard );
-    $self->{timestamp} = SOAP::Data->type( 'string', $data->timestamp );
-    bless $self;
-    return $self;
+	my $self = shift;
+	my $data = shift;
+	$self                       = {};
+	$self->{user_id}            = SOAP::Data->type('string', $data->user_id);
+	$self->{key_not_a_keyboard} = SOAP::Data->type('string', $data->key_not_a_keyboard);
+	$self->{timestamp}          = SOAP::Data->type('string', $data->timestamp);
+	bless $self;
+	return $self;
 }
 
 1;
diff --git a/lib/WebworkSOAP/Classes/Password.pm b/lib/WebworkSOAP/Classes/Password.pm
index 3f2f36c80d..353e9d04b9 100644
--- a/lib/WebworkSOAP/Classes/Password.pm
+++ b/lib/WebworkSOAP/Classes/Password.pm
@@ -10,14 +10,13 @@ package WebworkSOAP::Classes::Password;
 =cut
 
 sub new {
-    my $self = shift;
-    my $data = shift;
-    $self = {};
-    $self->{user_id} = SOAP::Data->type( 'string', $data->user_id );
-    $self->{password} = SOAP::Data->type( 'string', $data->password );
-    bless $self;
-    return $self;
+	my $self = shift;
+	my $data = shift;
+	$self             = {};
+	$self->{user_id}  = SOAP::Data->type('string', $data->user_id);
+	$self->{password} = SOAP::Data->type('string', $data->password);
+	bless $self;
+	return $self;
 }
 
-
 1;
diff --git a/lib/WebworkSOAP/Classes/Permission.pm b/lib/WebworkSOAP/Classes/Permission.pm
index a5bd103d79..07d7a8cb84 100644
--- a/lib/WebworkSOAP/Classes/Permission.pm
+++ b/lib/WebworkSOAP/Classes/Permission.pm
@@ -10,14 +10,13 @@ package WebworkSOAP::Classes::Permission;
 =cut
 
 sub new {
-    my $self = shift;
-    my $data = shift;
-    $self = {};
-    $self->{user_id} = SOAP::Data->type( 'string', $data->user_id );
-    $self->{permission} = SOAP::Data->type( 'string', $data->permission );
-    bless $self;
-    return $self;
+	my $self = shift;
+	my $data = shift;
+	$self               = {};
+	$self->{user_id}    = SOAP::Data->type('string', $data->user_id);
+	$self->{permission} = SOAP::Data->type('string', $data->permission);
+	bless $self;
+	return $self;
 }
 
-
 1;
diff --git a/lib/WebworkSOAP/Classes/User.pm b/lib/WebworkSOAP/Classes/User.pm
index 47a5444770..358470d44d 100644
--- a/lib/WebworkSOAP/Classes/User.pm
+++ b/lib/WebworkSOAP/Classes/User.pm
@@ -17,20 +17,20 @@ package WebworkSOAP::Classes::User;
 =cut
 
 sub new {
-    my $self = shift;
-    my $data = shift;
-    $self = {};
-	$self->{user_id} = SOAP::Data->type( 'string', $data->user_id );
-    $self->{first_name} = SOAP::Data->type( 'string', $data->first_name );
-    $self->{last_name} = SOAP::Data->type( 'string', $data->last_name );
-    $self->{email_address} = SOAP::Data->type( 'string', $data->email_address );
-    $self->{student_id} = SOAP::Data->type( 'string', $data->student_id );
-    $self->{status} = SOAP::Data->type( 'string', $data->status );
-    $self->{section} = SOAP::Data->type( 'string', $data->section );
-    $self->{recitation} = SOAP::Data->type( 'string', $data->recitation );
-    $self->{comment} = SOAP::Data->type( 'string', $data->comment );
-    bless $self;
-    return $self;
+	my $self = shift;
+	my $data = shift;
+	$self                  = {};
+	$self->{user_id}       = SOAP::Data->type('string', $data->user_id);
+	$self->{first_name}    = SOAP::Data->type('string', $data->first_name);
+	$self->{last_name}     = SOAP::Data->type('string', $data->last_name);
+	$self->{email_address} = SOAP::Data->type('string', $data->email_address);
+	$self->{student_id}    = SOAP::Data->type('string', $data->student_id);
+	$self->{status}        = SOAP::Data->type('string', $data->status);
+	$self->{section}       = SOAP::Data->type('string', $data->section);
+	$self->{recitation}    = SOAP::Data->type('string', $data->recitation);
+	$self->{comment}       = SOAP::Data->type('string', $data->comment);
+	bless $self;
+	return $self;
 }
 
 1;
diff --git a/lib/WebworkSOAP/Classes/UserProblem.pm b/lib/WebworkSOAP/Classes/UserProblem.pm
index 5f06ae181e..576916e952 100644
--- a/lib/WebworkSOAP/Classes/UserProblem.pm
+++ b/lib/WebworkSOAP/Classes/UserProblem.pm
@@ -22,25 +22,25 @@ package WebworkSOAP::Classes::UserProblem;
 =cut
 
 sub new {
-    my $self = shift;
-    my $data = shift;
-    $self = {};
-    $self->{user_id} = SOAP::Data->type( 'string', $data->user_id );
-    $self->{set_id} = SOAP::Data->type( 'string', $data->set_id );
-    $self->{problem_id} = SOAP::Data->type( 'string', $data->problem_id );
-    $self->{source_file} = SOAP::Data->type( 'string', $data->source_file );
-    $self->{value} = SOAP::Data->type( 'string', $data->value );
-    $self->{max_attempts} = SOAP::Data->type( 'string', $data->max_attempts );
-    $self->{showMeAnother} = SOAP::Data->type( 'string', $data->showMeAnother );
-    $self->{showMeAnotherCount} = SOAP::Data->type( 'string', $data->showMeAnotherCount );
-    $self->{problem_seed} = SOAP::Data->type( 'string', $data->problem_seed );
-    $self->{status} = SOAP::Data->type( 'string', $data->status );
-    $self->{attempted} = SOAP::Data->type( 'string', $data->attempted );
-    $self->{last_answer} = SOAP::Data->type( 'string', $data->last_answer );
-    $self->{num_correct} = SOAP::Data->type( 'string', $data->num_correct );
-    $self->{num_incorrect} = SOAP::Data->type( 'string', $data->num_incorrect );
-    bless $self;
-    return $self;
+	my $self = shift;
+	my $data = shift;
+	$self                       = {};
+	$self->{user_id}            = SOAP::Data->type('string', $data->user_id);
+	$self->{set_id}             = SOAP::Data->type('string', $data->set_id);
+	$self->{problem_id}         = SOAP::Data->type('string', $data->problem_id);
+	$self->{source_file}        = SOAP::Data->type('string', $data->source_file);
+	$self->{value}              = SOAP::Data->type('string', $data->value);
+	$self->{max_attempts}       = SOAP::Data->type('string', $data->max_attempts);
+	$self->{showMeAnother}      = SOAP::Data->type('string', $data->showMeAnother);
+	$self->{showMeAnotherCount} = SOAP::Data->type('string', $data->showMeAnotherCount);
+	$self->{problem_seed}       = SOAP::Data->type('string', $data->problem_seed);
+	$self->{status}             = SOAP::Data->type('string', $data->status);
+	$self->{attempted}          = SOAP::Data->type('string', $data->attempted);
+	$self->{last_answer}        = SOAP::Data->type('string', $data->last_answer);
+	$self->{num_correct}        = SOAP::Data->type('string', $data->num_correct);
+	$self->{num_incorrect}      = SOAP::Data->type('string', $data->num_incorrect);
+	bless $self;
+	return $self;
 }
 
 1;
diff --git a/lib/WebworkSOAP/Classes/UserSet.pm b/lib/WebworkSOAP/Classes/UserSet.pm
index 4cc719e6bb..6c314ecb7a 100644
--- a/lib/WebworkSOAP/Classes/UserSet.pm
+++ b/lib/WebworkSOAP/Classes/UserSet.pm
@@ -27,30 +27,30 @@ package WebworkSOAP::Classes::UserSet;
 =cut
 
 sub new() {
-        my $self = shift;
-        my $data = shift;
-        $self = {};
-        $self->{user_id} = SOAP::Data->type( 'string', $data->user_id );
-        $self->{set_id} = SOAP::Data->type( 'string', $data->set_id );
-        $self->{psvn} = SOAP::Data->type( 'string', $data->psvn );
-        $self->{set_header} = SOAP::Data->type( 'string', $data->set_header );
-        $self->{hardcopy_header} = SOAP::Data->type( 'string', $data->hardcopy_header );
-        $self->{open_date} = SOAP::Data->type( 'string', $data->open_date );
-        $self->{due_date} = SOAP::Data->type( 'string', $data->due_date );
-        $self->{answer_date} = SOAP::Data->type( 'string', $data->answer_date );
-        $self->{visible} = SOAP::Data->type( 'string', $data->visible );
-        $self->{enable_reduced_scoring} = SOAP::Data->type( 'string', $data->enable_reduced_scoring );
-        $self->{assignment_type} = SOAP::Data->type( 'string', $data->assignment_type );
-        $self->{attempts_per_version} = SOAP::Data->type( 'string', $data->attempts_per_version );
-        $self->{time_interval} = SOAP::Data->type( 'string', $data->time_interval );
-        $self->{versions_per_interval} = SOAP::Data->type( 'string', $data->versions_per_interval );
-        $self->{version_time_limit} = SOAP::Data->type( 'string', $data->version_time_limit );
-        $self->{version_creation_time} = SOAP::Data->type( 'string', $data->version_creation_time );
-        $self->{problem_randorder} = SOAP::Data->type( 'string', $data->problem_randorder );
-        $self->{version_last_attempt_time} = SOAP::Data->type( 'string', $data->version_last_attempt_time );
-        $self->{problems_per_page} = SOAP::Data->type( 'string', $data->problems_per_page );
-        bless $self;
-        return $self;
+	my $self = shift;
+	my $data = shift;
+	$self                              = {};
+	$self->{user_id}                   = SOAP::Data->type('string', $data->user_id);
+	$self->{set_id}                    = SOAP::Data->type('string', $data->set_id);
+	$self->{psvn}                      = SOAP::Data->type('string', $data->psvn);
+	$self->{set_header}                = SOAP::Data->type('string', $data->set_header);
+	$self->{hardcopy_header}           = SOAP::Data->type('string', $data->hardcopy_header);
+	$self->{open_date}                 = SOAP::Data->type('string', $data->open_date);
+	$self->{due_date}                  = SOAP::Data->type('string', $data->due_date);
+	$self->{answer_date}               = SOAP::Data->type('string', $data->answer_date);
+	$self->{visible}                   = SOAP::Data->type('string', $data->visible);
+	$self->{enable_reduced_scoring}    = SOAP::Data->type('string', $data->enable_reduced_scoring);
+	$self->{assignment_type}           = SOAP::Data->type('string', $data->assignment_type);
+	$self->{attempts_per_version}      = SOAP::Data->type('string', $data->attempts_per_version);
+	$self->{time_interval}             = SOAP::Data->type('string', $data->time_interval);
+	$self->{versions_per_interval}     = SOAP::Data->type('string', $data->versions_per_interval);
+	$self->{version_time_limit}        = SOAP::Data->type('string', $data->version_time_limit);
+	$self->{version_creation_time}     = SOAP::Data->type('string', $data->version_creation_time);
+	$self->{problem_randorder}         = SOAP::Data->type('string', $data->problem_randorder);
+	$self->{version_last_attempt_time} = SOAP::Data->type('string', $data->version_last_attempt_time);
+	$self->{problems_per_page}         = SOAP::Data->type('string', $data->problems_per_page);
+	bless $self;
+	return $self;
 }
 
 1;
diff --git a/lib/WebworkSOAP/SOAP.pm b/lib/WebworkSOAP/SOAP.pm
new file mode 100644
index 0000000000..f547191b2b
--- /dev/null
+++ b/lib/WebworkSOAP/SOAP.pm
@@ -0,0 +1,59 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WebworkSOAP::SOAP;
+use Mojo::Base 'Mojolicious::Controller', -signatures;
+
+use Pod::WSDL;
+use SOAP::Lite;
+
+use WebworkSOAP;
+
+sub wsdl ($c) {
+	my $pod = Pod::WSDL->new(
+		source            => 'WebworkSOAP',
+		location          => $c->server_root_url . '/webwork2_rpc',
+		withDocumentation => 0
+	);
+
+	return $c->render(data => $pod->WSDL);
+}
+
+sub dispatch ($c) {
+	my $som = SOAP::Deserializer->deserialize($c->req->body);
+
+	my $som_body = $som->body;
+	my $method   = (keys %$som_body)[0];
+	my @params   = $som->paramsin;
+
+	my $serializer = SOAP::Serializer->new;
+
+	my $result = eval { WebworkSOAP->$method(@params); };
+
+	# This is rather minimal error handling.
+	if ($@) {
+		if (ref $@ eq 'SOAP::Fault') {
+			return $c->render(
+				data   => $serializer->envelope(fault => $@->faultcode),
+				status => $@->faultcode == 8 ? 401 : 500
+			);
+		}
+		return $c->render(data => $serializer->envelope(fault => 1), status => 500);
+	}
+
+	return $c->render(data => $serializer->envelope(freeform => \$result));
+}
+
+1;
diff --git a/lib/WebworkSOAP/WSDL.pm b/lib/WebworkSOAP/WSDL.pm
deleted file mode 100644
index 773dcd0867..0000000000
--- a/lib/WebworkSOAP/WSDL.pm
+++ /dev/null
@@ -1,39 +0,0 @@
-package WebworkSOAP::WSDL;
-
-use lib '/opt/webwork/webwork2/lib';
-use Pod::WSDL;
-use WebworkSOAP;
-
-BEGIN {
-###############################################################################
-# Configuration -- set to top webwork directory (webwork2) (set in webwork.apache2-config)
-# Configuration -- set server url automatically for this file
-###############################################################################
-
-    our $webwork_directory = $WeBWorK::Constants::WEBWORK_DIRECTORY; #'/opt/webwork/webwork2';
-	print "WebworkSOAP::WSDL: webwork_directory set to ", $WeBWorK::Constants::WEBWORK_DIRECTORY,
-	      " via \$WeBWorK::Constants::WEBWORK_DIRECTORY set in webwork.apache2-config\n";
- 	my $seed_ce = new WeBWorK::CourseEnvironment({ webwork_dir => $webwork_directory });
- 	die "Can't create seed course environment for webwork in $webwork_directory" unless ref($seed_ce);
-	my $server_root_url   = $seed_ce->{server_root_url}; #"http://localhost";
-	our $RPC_URL          = "$server_root_url/webwork2_rpc";
-	print "WebworkSOAP::WSDL: rpc_url set to $RPC_URL \n";
-
-}
-
-
-
-sub handler($) {
-    my ($r) = @_;
-    my $pod = new Pod::WSDL(
-        source => 'WebworkSOAP',
-        location => $RPC_URL,
-        pretty => 1,
-        withDocumentation => 0
-        );
-
-    print($pod->WSDL);
-    return 0;
-}
-
-1;
diff --git a/lib/WebworkWebservice.pm b/lib/WebworkWebservice.pm
index 49ce20cfee..d6e6f68a23 100644
--- a/lib/WebworkWebservice.pm
+++ b/lib/WebworkWebservice.pm
@@ -1,1134 +1,298 @@
-#!/user/bin/perl -w
-
-# initialize SOAP interface as well
-
-use JSON;
-use WebworkSOAP;
-use WebworkSOAP::WSDL;
-use WeBWorK::FakeRequest;
-
-BEGIN {
-    $main::VERSION = "2.4.9";
-    use Cwd;
-	use WeBWorK::PG::Local;
-
-###############################################################################
-# Configuration -- set to top webwork directory (webwork2) (set in webwork.apache2-config)
-# Configuration -- set server name
-###############################################################################
-
-    our $webwork_directory = $WeBWorK::Constants::WEBWORK_DIRECTORY; #'/opt/webwork/webwork2';
-	print "WebworkWebservice: webwork_directory set to ", $WeBWorK::Constants::WEBWORK_DIRECTORY,
-	      " via \$WeBWorK::Constants::WEBWORK_DIRECTORY set in webwork.apache2-config\n";
-
-	$WebworkWebservice::HOST_NAME     = 'localhost'; # Apache->server->server_hostname;
-	$WebworkWebservice::HOST_PORT     = '80';        # Apache->server->port;
-
-###############################################################################
-
-	eval "use lib '$webwork_directory/lib'"; die $@ if $@;
-	eval "use WeBWorK::CourseEnvironment"; die $@ if $@;
- 	my $seed_ce = new WeBWorK::CourseEnvironment({ webwork_dir => $webwork_directory });
- 	die "Can't create seed course environment for webwork in $webwork_directory" unless ref($seed_ce);
- 	my $webwork_url = $seed_ce->{webwork_url};
- 	my $pg_dir = $seed_ce->{pg_dir};
- 	eval "use lib '$pg_dir/lib'"; die $@ if $@;
-
-	$WebworkWebservice::WW_DIRECTORY = $webwork_directory;
-	$WebworkWebservice::PG_DIRECTORY = $pg_dir;
-	$WebworkWebservice::SeedCE       = $seed_ce;
-
-###############################################################################
-
-	$WebworkWebservice::SITE_PASSWORD      = 'xmluser';     # default password
-	$WebworkWebservice::COURSENAME         = 'the-course-should-be-determined-at-run-time';       # default course
-}
-
-
-use strict;
-use warnings;
-use WeBWorK::Localize;
-
-
-our  $UNIT_TESTS_ON    = 0;
-
-# error formatting
-
-
-###############################################################################
-###############################################################################
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
 
 package WebworkWebservice;
+
 =head1 NAME
 
-	WebworkWebservice
+WebworkWebservice
 
 =head1 SYNPOSIS
 
-	This is an umbrella namespace.  There is no WebworkService object
-
-=head1 DESCRIPTION
-
-	WebworkXMLRPC  FakeRequest
+    my $rpc_service = WebworkWebservice->new($c);
+    await $rpc_service->rpc_execute('command_to_execute');
 
-The WebworkXMLRPC object receives a webservice request.  With the help of FakeRequest it
-authenticates and authorizes the request
-and then dispatches it to the appropriate WebworkWebservice subroutine to respond.
+After that, if the command is 'renderProblem', use
 
-	WebworkClient
+	my $result = $rpc_service->formatRenderedProblem;
 
-The WebworkClient object contains methods that format a webservice request to be sent to a server running
-webworkXMLRPC.  WebworkClient also contains methods for formatting the reply returned by webservice.
+to obtain the result in the requested 'outputformat'.
 
-	WebworkWebservice::RenderProblem;
-	WebworkWebservice::LibraryActions;
-	WebworkWebservice::MathTranslators;
-	WebworkWebservice::SetActions;
-	WebworkWebservice::CourseActions;
-
-Each of these files contains subroutines that respond to the specific request commands sent to the webservice.
+=head1 DESCRIPTION
 
-	renderViaXMLRPC
-	instructorXMLHandler
+The WebworkWebservice executes a requested command and returns with the result.
+The webservice command methods are available are in the following modules:
 
-These passthrough handlers receive HTML requests generated by HTML forms or javaScripts,
-translate them into xmlrpc requests and
-send them to a (local) webservice running webworkXMLRPC.
+    WebworkWebservice::RenderProblem;
+    WebworkWebservice::LibraryActions;
+    WebworkWebservice::SetActions;
+    WebworkWebservice::CourseActions;
+    WebworkWebservice::ProblemActions
 
-=cut
+Note that WebworkWebservice contains the formatRenderedProblem method for
+formatting the reply returned by the renderProblem command.
 
-=head2 WebworkWebservice Utility methods
-
-	pretty_print_rh($rh)   # returns text (not HTML) describing the structure of $rh
+Also note that the WeBWorK::ContentGenerator::RenderViaRPC module implements the
+renderProblem command, and the WeBWorK::ContentGenerator::InstructorPRCHandler
+module has implements all other commands.
 
 =cut
 
-sub pretty_print_rh {
-    shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
-	my $rh = shift;
-	return "" unless defined $rh;
-	my $indent = shift || 0;
-
-	my $out = "";
-	return $out if $indent>10;
-	my $type = ref($rh);
-
-	if (defined($type) and $type) {
-		$out .= " type = $type; ";
-	} elsif (not defined($rh) ) {
-		$out .= " type = scalar; ";
-	}
-	if ( ref($rh) =~/HASH/ or "$rh" =~/HASH/ ) {
-	    $out .= "{\n";
-	    $indent++;
- 		foreach my $key (sort keys %{$rh})  {
- 			$out .= "  "x$indent."$key => " . pretty_print_rh( $rh->{$key}, $indent ) . "\n";
- 		}
- 		$indent--;
- 		$out .= "\n"."  "x$indent."}\n";
-
- 	} elsif (ref($rh)  =~  /ARRAY/ or "$rh" =~/ARRAY/) {
- 	    $out .= " ( ";
- 		foreach my $elem ( @{$rh} )  {
- 		 	$out .= pretty_print_rh($elem, $indent);
-
- 		}
- 		$out .=  " ) \n";
-	} elsif ( ref($rh) =~ /SCALAR/ ) {
-		$out .= "scalar reference ". ${$rh};
-	} elsif ( ref($rh) =~/Base64/ ) {
-		$out .= "base64 reference " .$$rh;
-	} else {
-		$out .=  $rh;
-	}
-
-	return $out." ";
-}
+use strict;
+use warnings;
 
+use Future::AsyncAwait;
 
+use WeBWorK::Localize;
+use WeBWorK::CourseEnvironment;
 use WebworkWebservice::RenderProblem;
 use WebworkWebservice::LibraryActions;
-use WebworkWebservice::MathTranslators;
 use WebworkWebservice::SetActions;
 use WebworkWebservice::CourseActions;
 use WebworkWebservice::ProblemActions;
+use FormatRenderedProblem;
+use HardcopyRenderedProblem;
 
-###############################################################################
-
-=head1 NAME
-
-	WebworkXMLRPC
-
-=head1 SYNPOSIS
-
- 	$self = $class->initiate_session($request_input, $permission_level);
-
- 	$class is "WebworkXMLRPC".
-
-Both $class and $request_input are determined by the Apache::XMLRPC::Lite module which dispatches the original
-webservice request.  The Apache::XMLRPC::Lite module in turn is called from Apache according to the dictates
-of the <xmlrpc> snippet in webwork.apache2-config.
-
-The $request_input hash includes a command which the WebworkXMLRPC object uses to dispatch the
-request to WebworkWebservice routines which do the actual work.
-
-The $permisson_level argument is an optional string that defaults to "proctor_quiz_login".  Methods
-that require higher permission levels should set this appropriately.  This permission level will be
-checked against the user's permission level in the course.
-
-=head1 DESCRIPTION
-
-WebworkXMLRPC is the workhorse dispatcher for the WeBWorK webservice.  It was originally written
-before object orientation was available in perl.  While it has been rewritten several times since
-then its structure is still a little unusual in an effort to maintain backwards compatibility
-as long as that is necessary.
-
-=head2 initiate_session   (constructor equivalent to new)
-
-	$webworkXMLRPC = WebworkXMLRPC->initiate_session($request_input, $permission_level)
-
-This is equivalent to a "new" command for WebworkXMLRPC.  It checks authentication and authorization of the
-webservice request using information provided by the $request_input.  It does this using
-the specialized authentication module Authen::XMLRPC.
-
-=head2 do
-
-	$webworkXMLRPC->do
-
-This command receives the output returned by the various WebworkWebservice subroutines and
-insures that the formatting is appropriate to pass on to Apache::XMLRPC::Lite which creates
-the XMLRPC response to the webservice call.
-
-=head2 r
-
-	$webworkXMLRPC->r
-
-Returns the FakeRequest object contained in $webworkXMLRPC.
+=head2 new (constructor)
 
 =cut
 
-
-package WebworkXMLRPC;
-use base qw(WebworkWebservice);
-use WeBWorK::Utils qw(runtime_use writeTimingLogEntry);
-use WeBWorK::Debug;
-use JSON;
-
-
-###########################################################################
-#  authentication and authorization
-###########################################################################
-
-# close to being a "new" subroutine
-sub initiate_session {
-	my ($invocant, @args) = @_;
+sub new {
+	my ($invocant, $c, %options) = @_;
 	my $class = ref $invocant || $invocant;
-
-	######### trace commands ######
-	my @caller = caller(1);  # caller data
-	my $calling_function = $caller[3];
-	#print STDERR  "\n\nWebworkWebservice.pm ".__LINE__." initiate_session called from $calling_function\n";
-	###############################
-
-	my $rh_input     = $args[0];
-	my $permission = $args[1] // "proctor_quiz_login"; # usually level 2
-
-	# identify course
-	if ($UNIT_TESTS_ON) {
-		print STDERR  "WebworkWebservice.pl ".__LINE__." site_password  is " , $rh_input->{site_password},"\n";
-		print STDERR  "WebworkWebservice.pl ".__LINE__." course_password  is " , $rh_input->{course_password},"\n";
-		print STDERR  "WebworkWebservice.pl ".__LINE__." courseID  is " , $rh_input->{courseID},"\n";
-		print STDERR  "WebworkWebservice.pl ".__LINE__." userID  is " , $rh_input->{userID},"\n";
-		print STDERR  "WebworkWebservice.pl ".__LINE__." session_key  is " , $rh_input->{session_key},"\n";
-	}
-
-
-	# create fake version of Apache::Request object
-	# This abstracts some of the work that used to be done by the webworkXMLRPC object
-	# It also allows WeBWorK::FakeRequest to inherit cleanly from WeBWorK::Request
-	# The $fake_r value returned actually contains subroutines that the WebworkWebservice packages
-	# need to operate.  It may be possible to pass $fake_r instead of $self in those routines.
-
-	my $fake_r = WeBWorK::FakeRequest->new($rh_input, 'xmlrpc_module'); # need to specify authentication module
-	my $authen = $fake_r->authen;
-	my $authz  = $fake_r->authz;
-
-	# Create WebworkXMLRPC object
-	my $self = {
-		courseName	=>  $rh_input ->{courseID},
-		user_id		=>  $rh_input ->{userID},
-		password    =>  $rh_input ->{course_password},  #should this be course_password?
-		session_key =>  $rh_input ->{session_key},
-		fake_r      =>  $fake_r,
-	};
-	$self = bless $self, $class;
-	if ($UNIT_TESTS_ON) {
-		print STDERR  "WebworkWebservice.pm ".__LINE__." initiate data:\n  ";
-		print STDERR  "class type is ", $class, "\n";
-		print STDERR  "Self has type ", ref($self), "\n";
-		print STDERR   "self has data: \n", format_hash_ref($self), "\n";
-		print STDERR   "authen has type ", ref($authen), "\n";
-		print STDERR   "authz  has type ", ref($authz), "\n";
-	}
-
-	die "Please use 'course_password' instead of 'password' as the key for submitting
-	passwords to this webservice\n"
-	if exists($rh_input ->{password}) and not exists($rh_input ->{course_password});
-	#   we need to trick some of the methods within the webwork framework
-	#   since we are not coming in with a standard apache request
-	#   FIXME:  can/should we change this????
-	#
-	#   We are borrowing tricks from the AuthenWeBWorK.pm module
-
-	# now, here's the problem... WeBWorK::Authen looks at $r->params directly, whereas we
-	# need to look at $user and $sent_pw. this is a perfect opportunity for a mixin, i think.
-	my $authenOK;
-	my $courseName 	= $rh_input->{courseID};
-	my $user_id     = $rh_input->{user_id};
-	my $session_key = $rh_input->{session_key};
-	eval {
-		no warnings 'redefine';
-		$authenOK = $authen->verify;
-	} or do {
-		my $e;
-		if (Exception::Class->caught('WeBWorK::DB::Ex::TableMissing')) {
-			# was asked to authenticate into a non-existent course
-			die SOAP::Fault
-			->faultcode('404')
-			->faultstring("WebworkWebservice: Course |$courseName| not found.")
-		}
-		# this next bit is a Hack to catch errors when the session key has timed out
-		# and an error message which is approximately
-		# "invoked with WeBWorK::FakeRequest object with no `r' key"
-		if ($e = Exception::Class->caught() and $e =~/object\s+with\s+no\s+.r.\s+key/ ) {
-			# was asked to authenticate into a non-existent course
-			die SOAP::Fault
-			->faultcode('404')
-			->faultstring("WebworkWebservice: Can't authenticate -- session may have timed out.")
-		}
-		die "Webservice.pm: Error when trying to authenticate. $e\n";
-	};
-	###########################################################################
-	# security check -- check that the user is in fact at least a proctor in the course
-	###########################################################################
-
-	$self->{authenOK}  = $authenOK;
-	$self->{authzOK}   = $authz->hasPermissions($self->{user_id}, $permission);
-
-	# Update the credentials -- in particular the session_key may have changed.
-	$self->{session_key} = $authen->{session_key};
-
-	if ($UNIT_TESTS_ON) {
-		print STDERR  "WebworkWebservice.pm ".__LINE__." authentication for ",$self->{user_id}, " in course ", $self->{courseName}, " is = ", $self->{authenOK},"\n";
-		print STDERR  "WebworkWebservice.pm ".__LINE__."authorization as instructor for ", $self->{user_id}, " is ", $self->{authzOK},"\n";
-		print STDERR  "WebworkWebservice.pm ".__LINE__." authentication contains ", format_hash_ref($authen),"\n";
-		print STDERR   "self has new data \n", format_hash_ref($self), "\n";
-	}
-
-	# Is there a way to transmit a number as well as a message?
-	# Could be useful for handling errors.
-	debug("initialize webworkXMLRPC object in: ", format_hash_ref($rh_input),"\n") if $UNIT_TESTS_ON;
-	debug("fake_r :", format_hash_ref($fake_r),"\n") if $UNIT_TESTS_ON;
-	die "Could not authenticate user $user_id with key $session_key"  unless $self->{authenOK};
-	die "User $user_id does not have sufficient privileges in this course $courseName" unless $self->{authzOK};
-	return $self;
+	return bless {
+		c             => $c,
+		inputs_ref    => $c->req->params->to_hash,
+		return_object => {},
+		error_string  => '',
+		%options
+	}, $class;
 }
 
-# process and return result
-# make sure that credentials are returned
-# for every call
-# $result -> xmlrpcCall(command, in);
-# $result->return_object->{foo} is defined for foo = courseID userID and session_key
-sub do {
-	my $self = shift;
-	my $result = shift;
+=head2 Accessor methods
 
-	$result->{session_key}  = $self->{session_key};
-	$result->{userID}       = $self->{user_id};
-	$result->{courseID}     = $self->{courseName};
-	debug("output is ", format_hash_ref($result), "\n" ) if $UNIT_TESTS_ON;
-	return($result);
-}
-
-sub r {
-	my $self = shift;
-	return $self->{fake_r};
-}
-
-#  Main section
-#  respond to xmlrpc requests
-#  Add routines for handling errors if the authentication fails
-#  or if the authorization is not appropriate.
-
-=head2 WebworkWebservice commands
-
-These subroutines are called directly by Apache::XMLRPC::Lite which provides
-the arguments
-
-	$class   (always "WebworkXMLRPC" for this dispatcher)
-	$in      a hash containing arguments needed for
-		authentication, authorization and for processing the request.
-
-Each subroutine creates a webworkXMLRPC object  which performs authentication
-and authorization checks.  It then calls the eponymous WebworkWebservice subroutine
-to process the request.  The output of the WebworkWebservice subroutine is
-passed through the WebworkXMLRPC::do() method and
-returned to Apache::XMLRPC::Lite which
-sends a response to the original webservice request.
-
-
-These are the commands that the WebworkWebservice will respond to.
-
-
-=over 4
-
-=cut
-
-=item searchLib
-
-=cut
-
-sub searchLib {
-    my $class = shift;
-    my $in = shift;
-	my $self = $class->initiate_session($in, "access_instructor_tools");
-    #warn "\n incoming request to listLib:  class is ",ref($self) if $UNIT_TESTS_ON ;
-  	return $self->do( WebworkWebservice::LibraryActions::searchLib($self, $in) );
-}
-
-=item listLib
-
-=cut
-
-sub listLib {
-    my $class = shift;
-    my $in = shift;
-	my $self = $class->initiate_session($in, "access_instructor_tools");
-    #warn "\n incoming request to listLib:  class is ",ref($self) if $UNIT_TESTS_ON ;
-  	return $self->do( WebworkWebservice::LibraryActions::listLib($self, $in) );
-}
-
-=item listLibraries
-
-=cut
-
-sub listLibraries {     # returns a list of libraries for the default course
-	my $class = shift;
-    my $in = shift;
-	my $self = $class->initiate_session($in, "access_instructor_tools");
-    #warn "incoming request to listLibraries:  class is ",ref($self) if $UNIT_TESTS_ON ;
-  	return $self->do( WebworkWebservice::LibraryActions::listLibraries($self, $in) );
-}
-
-=item getProblemDirectories
-
-=cut
-
-sub getProblemDirectories {
-	my $class = shift;
-	my $in = shift;
-	my $self = $class->initiate_session($in, "access_instructor_tools");
-	return $self->do(WebworkWebservice::LibraryActions::getProblemDirectories($self,$in));
-}
-
-=item buildBrowseTree
-
-=cut
-
-sub buildBrowseTree {
-	my $class = shift;
-	my $in = shift;
-	my $self = $class->initiate_session($in, "access_instructor_tools");
-	return $self->do(WebworkWebservice::LibraryActions::buildBrowseTree($self,$in));
-}
-
-=item loadBrowseTree
-
-=cut
-
-sub loadBrowseTree {
-	my $class = shift;
-	my $in = shift;
-	my $self = $class->initiate_session($in, "access_instructor_tools");
-	return $self->do(WebworkWebservice::LibraryActions::loadBrowseTree($self,$in));
-}
-
-=item loadLocalLibraryTree
-
-=cut
-
-sub loadLocalLibraryTree {
-	my $class = shift;
-	my $in = shift;
-	my $self = $class->initiate_session($in, "access_instructor_tools");
-	return $self->do(WebworkWebservice::LibraryActions::loadLocalLibraryTree($self,$in));
-}
-
-=item getLocalProblems
-
-=cut
-
-sub getLocalProblems {
-	my $class = shift;
-	my $in = shift;
-	my $self = $class->initiate_session($in, "access_instructor_tools");
-	return $self->do(WebworkWebservice::LibraryActions::getLocalProblems($self,$in));
-}
-
-=item getProblemTags
-
-=cut
-
-sub getProblemTags {
-	my $class = shift;
-	my $in = shift;
-	my $self = $class->initiate_session($in, "access_instructor_tools");
-		return $self->do( WebworkWebservice::LibraryActions::getProblemTags($self, $in) );
-}
-
-=item setProblemTags
-
-=cut
-
-sub setProblemTags {
-	my $class = shift;
-	my $in = shift;
-	my $self = $class->initiate_session($in, "modify_tags");
-		return $self->do( WebworkWebservice::LibraryActions::setProblemTags($self, $in) );
-}
-
-=item assignSetToUsers
+    return_object
+    error_string
 
 =cut
 
-sub assignSetToUsers {
-  my $class = shift;
-  my $in = shift;
-  my $self = $class->initiate_session($in, "assign_problem_sets");
-  	return $self->do(WebworkWebservice::SetActions::assignSetToUsers($self,$in));
+sub return_object {
+	my ($self, $object) = @_;
+	$self->{return_object} = $object if defined $object && ref $object;
+	return $self->{return_object};
 }
 
-=item listSets
-
-=cut
-
-sub listSets {
-  my $class = shift;
-  my $in = shift;
-  my $self = $class->initiate_session($in, "access_instructor_tools");
-  	return $self->do(WebworkWebservice::SetActions::listLocalSets($self));
+sub error_string {
+	my ($self, $string) = @_;
+	$self->{error_string} = $string if defined $string && $string =~ /\S/;
+	return $self->{error_string};
 }
 
-=item listSetProblems
+=head2 rpc_execute
 
-=cut
-
-sub listSetProblems {
-	my $class = shift;
-  	my $in = shift;
-	my $self = $class->initiate_session($in, "access_instructor_tools");
-  	return $self->do(WebworkWebservice::SetActions::listLocalSetProblems($self, $in));
-}
-
-=item createNewSet
+This method executes a WebworkWebservice command, and makes sure that
+credentials are returned in the result on success.  The result will be stored in
+the result_object of the instance.  An error_string will be set on failure.
 
 =cut
 
-sub createNewSet{
-	my $class = shift;
-  	my $in = shift;
-	my $self = $class->initiate_session($in, "modify_problem_sets");
-  	return $self->do(WebworkWebservice::SetActions::createNewSet($self, $in));
-}
+async sub rpc_execute {
+	my ($self, $command) = @_;
+	my $c       = $self->c;
+	my $user_id = $c->param('user');
 
-=item deleteProblemSet
+	$command //= 'renderProblem';
 
-=cut
-
-sub deleteProblemSet{
-	my $class = shift;
-  	my $in = shift;
-	my $self = $class->initiate_session($in, "modify_problem_sets");
-  	return $self->do(WebworkWebservice::SetActions::deleteProblemSet($self, $in));
-}
-
-=item reorderProblems
-
-=cut
+	my $permission = command_permission($command);
 
-sub reorderProblems{
-	my $class = shift;
-  	my $in = shift;
-	my $self = $class->initiate_session($in, "modify_problem_sets");
-   	return $self->do(WebworkWebservice::SetActions::reorderProblems($self, $in));
-}
+	return $self->error_string(__PACKAGE__ . ": Invalid command $command") if $permission eq 'invalid';
 
-=item addProblem
+	# Check that the user has permission to perform this command.
+	return $self->error_string(__PACKAGE__ . ": User $user_id does not have permission for the command $command")
+		unless $c->authz->hasPermissions($user_id, $permission);
 
-=cut
-
-sub addProblem {
-	my $class = shift;
-  	my $in = shift;
-	my $self = $class->initiate_session($in, "modify_problem_sets");
-  	return $self->do(WebworkWebservice::SetActions::addProblem($self, $in));
-}
-
-=item deleteProblem
-
-=cut
-
-sub deleteProblem{
-	my $class = shift;
-  	my $in = shift;
-	my $self = $class->initiate_session($in, "modify_problem_sets");
-  	return $self->do(WebworkWebservice::SetActions::deleteProblem($self, $in));
-}
-
-=item renderProblem
-
-=cut
-
-sub renderProblem {
-    my $class = shift;
-    my $in = shift;
-    my $self = $class->initiate_session($in);
-
-    return $self->do( WebworkWebservice::RenderProblem::renderProblem($self,$in) );
-}
-
-=item updateProblem
-
-=cut
-
-sub updateProblem {
-	my ($class,$in) = @_;
-	my $self = $class->initiate_session($in, "modify_problem_sets");
-	return $self->do(WebworkWebservice::SetActions::updateProblem($self,$in));
-}
-
-=item saveProblem
-
-=cut
-
-sub saveProblem {
-	my ($class,$in) = @_;
-	my $self = $class->initiate_session($in, "modify_problem_sets");
-	return $self->do(WebworkWebservice::LibraryActions::saveProblem($self,$in));
-}
-
-=item readFile
-
-=cut
-
-sub readFile {
-    my $class = shift;
-    my $in   = shift;
-	my $self = $class->initiate_session($in, "access_instructor_tools");
-  	return $self->do( WebworkWebservice::LibraryActions::readFile($self,$in) );
-}
-
-=item tex2pdf
-
-=cut
-
-sub tex2pdf {
-    my $class = shift;
-    my $in    = shift;
-    my $self  = $class->initiate_session($in);
-  	return $self->do( WebworkWebservice::MathTranslators::tex2pdf($self,$in) );
-}
-
-=item createCourse
-
-=cut
-
-# Expecting a hash $in composed of the usual auth credentials
-# plus the params specific to this function
-#{
-#	'userID' => 'admin',	# these are the usual
-#	'password' => 'admin',	# auth credentials
-#	'courseID' => 'admin',	# used to initiate a
-#	'session_key' => 'key',	# session.
-#	"name": "TEST100-100",  # This will be the new course's id
-#}
-# Note that we log into the admin course to create courses.
-sub createCourse {
-	my $class = shift;
-	my $in = shift;
-	my $self = $class->initiate_session($in, "create_and_delete_courses");
-	return $self->do(WebworkWebservice::CourseActions::create($self, $in));
-}
-
-=item listUsers
-
-=cut
-
-sub listUsers{
-    my $class = shift;
-	my $in = shift;
-	my $self = $class->initiate_session($in, "access_instructor_tools");
-	return $self->do(WebworkWebservice::CourseActions::listUsers($self, $in));
-
-}
-
-=item addUser
-
-=cut
-
-# Expecting a hash $in composed of
-#{
-#	'userID' => 'admin',		# these are the usual
-#	'password' => 'admin',		# auth credentials
-#	'courseID' => 'Math',		# used to initiate a
-#	'session_key' => 'key',		# session.
-#	"firstname": "John",
-#	"lastname": "Smith",
-#	"id": "The Doctor",			# required
-#	"email": "doctor@tardis",
-#	"studentid": 87492466,
-#	"userpassword": "password",	# defaults to studentid if empty
-#								# if studentid also empty, then no password
-#	"permission": "professor",	# valid values from %userRoles in defaults.config
-#								# defaults to student if empty
-#}
-# This user will be added to courseID
-sub addUser {
-	my $class = shift;
-	my $in = shift;
-	my $self = $class->initiate_session($in, "modify_student_data");
-	return $self->do(WebworkWebservice::CourseActions::addUser($self, $in));
-}
-
-=item dropUser
-
-=cut
-
-# Expecting a hash $in composed of
-#{
-#	'userID' => 'admin',		# these are the usual
-#	'password' => 'admin',		# auth credentials
-#	'courseID' => 'Math',		# used to initiate a
-#	'session_key' => 'key',		# session.
-#	"id": "BFYM942",
-#}
-sub dropUser {
-	my $class = shift;
-	my $in = shift;
-	my $self = $class->initiate_session($in, "modify_student_data");
-	return $self->do(WebworkWebservice::CourseActions::dropUser($self, $in));
-}
-
-=item deleteUser
-
-=cut
-
-# Expecting a hash $in composed of
-#{
-#	'userID' => 'admin',		# these are the usual
-#	'password' => 'admin',		# auth credentials
-#	'courseID' => 'Math',		# used to initiate a
-#	'session_key' => 'key',		# session.
-#	"id": "BFYM942",
-#}
-sub deleteUser {
-	my $class = shift;
-	my $in = shift;
-	my $self = $class->initiate_session($in, "modify_student_data");
-	return $self->do(WebworkWebservice::CourseActions::deleteUser($self, $in));
-}
-
-=item editUser
-
-=cut
-
-# Expecting a hash $in composed of
-#{
-#	'userID' => 'admin',		# these are the usual
-#	'password' => 'admin',		# auth credentials
-#	'courseID' => 'Math',		# used to initiate a
-#	'session_key' => 'key',		# session.
-#	"studentid": 87492466,
-#	"firstname": "John",
-#	"lastname": "Smith",
-#	"id": "The Doctor",			# required
-#	"email": "doctor@tardis",
-#
-#	"permission": "professor",	# valid values from %userRoles in defaults.config
-#								# defaults to student if empty
-#   status: 'Enrolled, audit, proctor, drop
-#   section
-#   recitation
-#   comment
-#}
-sub editUser {
-    my $class = shift;
-    my $in = shift;
-	my $self = $class->initiate_session($in, "modify_student_data");
-    return $self->do(WebworkWebservice::CourseActions::editUser($self, $in));
-}
-
-=item changeUserPassword
-
-=cut
-# Expecting a hash $in composed of
-#{
-#	'userID' => 'admin',		# these are the usual
-#	'password' => 'admin',		# auth credentials
-#	'courseID' => 'Math',		# used to initiate a
-#	'session_key' => 'key',		# session.
-#	"studentid": 87492466,
-#	"new_password": "password"
-#}
-
-
-
-sub changeUserPassword{
-    my $class = shift;
-    my $in = shift;
-	my $self = $class->initiate_session($in, "modify_student_data");
-    return $self->do(WebworkWebservice::CourseActions::changeUserPassword($self, $in));
-}
-
-=item sendEmail
-
-=cut
-
-# Expecting a hash $in composed of
-#{
-#	'userID' => 'admin',		# these are the usual
-#	'password' => 'admin',		# auth credentials
-#	'courseID' => 'Math',		# used to initiate a
-#	'session_key' => 'key',		# session.
-#	"studentid": 87492466,
-#	"effectiveUser": "eUser"
-#}
-
-
-
-sub sendEmail{
-    my $class = shift;
-    my $in = shift;
-    my $self = $class->initiate_session($in, "send_mail");
-    return $self->do(WebworkWebservice::CourseActions::sendEmail($self, $in));
-}
-
-=item getSets
-
-=cut
-
-sub getSets {
-    my $class = shift;
-    my $in = shift;
-    my $self = $class->initiate_session($in, "access_instructor_tools");
-    return $self->do(WebworkWebservice::SetActions::getSets($self, $in));
-}
-
-=item getUserSets
-
-=cut
-
-sub getUserSets {
-    my $class = shift;
-    my $in = shift;
-    my $self = $class->initiate_session($in, "access_instructor_tools");
-    return $self->do(WebworkWebservice::SetActions::getUserSets($self, $in));
-}
-
-=item saveUserSets
-
-=cut
-
-sub saveUserSets {
-    my $class = shift;
-    my $in = shift;
-    my $self = $class->initiate_session($in, "modify_student_data");
-    return $self->do(WebworkWebservice::SetActions::saveUserSets($self, $in));
-}
-
-=item getSet
-
-=cut
-
-sub getSet {
-    my $class = shift;
-    my $in = shift;
-    my $self = $class->initiate_session($in, "access_instructor_tools");
-    return $self->do(WebworkWebservice::SetActions::getSet($self, $in));
-}
-
-=item updateSetProperties
-
-=cut
-
-sub updateSetProperties{
-    my $class = shift;
-    my $in = shift;
-    my $self = $class->initiate_session($in, "modify_problem_sets");
-    return $self->do(WebworkWebservice::SetActions::updateSetProperties($self, $in));
-}
-
-=item updateUserSet
-
-=cut
-
-sub updateUserSet {
-	my $class = shift;
-	my $in = shift;
-	my $self = $class->initiate_session($in, "modify_student_data");
-	return $self->do(WebworkWebservice::SetActions::updateUserSet($self,$in));
-}
-
-=item unassignSetFromUsers
-
-=cut
-
-sub unassignSetFromUsers {
-	my $class = shift;
-	my $in = shift;
-	my $self = $class->initiate_session($in, "modify_student_data");
-	return $self->do(WebworkWebservice::SetActions::unassignSetFromUsers($self,$in));
-}
-
-=item listSetUsers
-
-=cut
-
-sub listSetUsers {
-	my $class = shift;
-	my $in = shift;
-	my $self = $class->initiate_session($in, "access_instructor_tools");
-	return $self->do(WebworkWebservice::SetActions::listSetUsers($self,$in));
-}
-
-=item getCourseSettings
-
-=cut
+	# Determine the package that contains the method for this command.
+	my $command_package = '';
+	for my $package (
+		'WebworkWebservice::RenderProblem', 'WebworkWebservice::LibraryActions',
+		'WebworkWebservice::SetActions',    'WebworkWebservice::CourseActions',
+		'WebworkWebservice::ProblemActions'
+		)
+	{
+		if ($package->can($command)) {
+			$command_package = $package;
+			last;
+		}
+	}
 
-sub getCourseSettings {
-	my $class = shift;
-	my $in = shift;
-	my $self = $class->initiate_session($in, "modify_course_files");
-	return $self->do(WebworkWebservice::CourseActions::getCourseSettings($self,$in));
-}
+	return $self->error_string(
+		__PACKAGE__ . ": Unable to find a method for $command.  This shouldn't happen.  Report this error.")
+		unless $command_package;
 
-=item updateSetting
+	my $result = eval {
+		my $out = $command_package->$command($self, $self->{inputs_ref});
+		return await $out if ref $out eq 'Future' || ref $out eq 'Mojo::Promise';
+		return $out;
+	};
 
-=cut
+	if ($@) {
+		my $error = $@;
+		chomp $error;
+		return $self->error_string(__PACKAGE__ . " call to $command resulted in the following errors: $error");
+	}
+	return $self->error_string(__PACKAGE__ . " call to $command returned no result") if !ref $result;
 
-sub updateSetting {
-	my $class = shift;
-	my $in = shift;
-	my $self = $class->initiate_session($in, "access_instructor_tools");
-	return $self->do(WebworkWebservice::CourseActions::updateSetting($self,$in));
+	return $self->return_object($result);
 }
 
-=item getUserProblem
+=over
 
-=cut
+=item formatRenderedProblem
 
-sub getUserProblem {
-	my $class = shift;
-	my $in = shift;
-	my $self = $class->initiate_session($in, "access_instructor_tools");
-	return $self->do(WebworkWebservice::ProblemActions::getUserProblem($self, $in));
-}
+This is called by WeBWorK::ContentGenerator::RenderViaRPC::pre_header_initialize
+to format the return result of the WebworkWebservice::renderProblem method.
+This method calls HardcopyRenderedProblem::hardcopyRenderedProblem if the
+outputformat is tex or pdf, and calls FormatRenderedProblem::formatRenderedProblem
+otherwise.
 
-=item putUserProblem
+=back
 
 =cut
 
-sub putUserProblem {
-	my $class = shift;
-	my $in = shift;
-	my $self = $class->initiate_session($in, "modify_student_data");
-	return $self->do(WebworkWebservice::ProblemActions::putUserProblem($self, $in));
+sub formatRenderedProblem {
+	my $self = shift;
+	return HardcopyRenderedProblem::hardcopyRenderedProblem($self)
+		if $self->{inputs_ref}{outputformat} eq 'tex' || $self->{inputs_ref}{outputformat} eq 'pdf';
+	return FormatRenderedProblem::formatRenderedProblem($self);
 }
 
-=item putProblemVersion
-
-=cut
-
-sub putProblemVersion {
-	my $class = shift;
-	my $in = shift;
-	my $self = $class->initiate_session($in, "modify_student_data");
-	return $self->do(WebworkWebservice::ProblemActions::putProblemVersion($self, $in));
-}
+=head2 c
 
-=item putPastAnswer
+Returns the WeBWorK::Controller object contained in $webworkRPC.
 
 =cut
 
-sub putPastAnswer {
-	my $class = shift;
-	my $in = shift;
-	my $self = $class->initiate_session($in, "modify_student_data");
-	return $self->do(WebworkWebservice::ProblemActions::putPastAnswer($self, $in));
+sub c {
+	my $self = shift;
+	return $self->{c};
 }
 
-=back
-
-=head2 Pass through methods which access the data in the FakeRequest object
+=head2 Pass through methods which access the data in the WeBWorK::Controller object
 
-	ce
-	db
-	params
-	authz
-	authen
-	maketext
+    ce
+    db
+    params
+    authz
+    authen
+    maketext
 
 =cut
 
 sub ce {
 	my $self = shift;
-	debug("use ce") if $UNIT_TESTS_ON;
-	$self->{fake_r}->{ce};
+	return $self->{c}->ce;
 }
+
 sub db {
 	my $self = shift;
-	$self->{fake_r}->{db};
+	return $self->{c}->db;
 }
-sub param {    # imitate get behavior of the request object params method
-	my $self =shift;
-	my $param = shift;
-	my $out = $self->{fake_r}->param($param);
-	debug("use param $param => $out") if $UNIT_TESTS_ON;
-	$out;
+
+sub param {
+	my ($self, $param) = @_;
+	return $self->{c}->param($param);
 }
+
 sub authz {
 	my $self = shift;
-	debug("use authz ")  if $UNIT_TESTS_ON;
-	$self->{fake_r}->{authz};
+	return $self->{c}->authz;
 }
+
 sub authen {
 	my $self = shift;
-	debug("use authen ")  if $UNIT_TESTS_ON;
-	$self->{fake_r}->{authen};
+	return $self->{c}->authen;
 }
+
 sub maketext {
 	my $self = shift;
-	#$self->{language_handle}->maketext(@_);
-	debug("use maketext")  if $UNIT_TESTS_ON;
-	&{ $self->{fake_r}->{language_handle} }(@_);
-}
-
-
-=head2 WebworkXMLRPC Utility methods
-
-	format_hash_ref
-
-=cut
-
-
-sub format_hash_ref {
-	my $hash = shift;
-	my $out_str="";
-	my $count =4;
-	foreach my $key ( sort keys %$hash) {
-		my $value = defined($hash->{$key})? $hash->{$key}:"--";
-		$out_str.= " $key=>$value ";
-		$count--;
-		unless($count) { $out_str.="\n  ";$count =4;}
-	}
-	$out_str;
+	return $self->{c}->language_handle->(@_);
+}
+
+=head2 command_permission
+
+This returns the permission required to perform the commands offered by the
+WebworkWebservice.  Note that all available commands must be listed here or the
+command will not be allowed.
+
+=cut
+
+sub command_permission {
+	my ($command) = @_;
+	return {
+		# WebworkWebservice::CourseActions
+		createCourse       => 'create_and_delete_courses',
+		listUsers          => 'access_instructor_tools',
+		addUser            => 'modify_student_data',
+		dropUser           => 'modify_student_data',
+		deleteUser         => 'modify_student_data',
+		editUser           => 'modify_student_data',
+		changeUserPassword => 'modify_student_data',
+		getCourseSettings  => 'access_instructor_tools',
+		updateSetting      => 'manage_course_files',
+		saveFile           => 'modify_problem_sets',
+
+		# WebworkWebservice::LibraryActions
+		listLibraries         => 'access_instructor_tools',
+		readFile              => 'access_instructor_tools',
+		listLib               => 'access_instructor_tools',
+		searchLib             => 'access_instructor_tools',
+		getProblemDirectories => 'access_instructor_tools',
+		buildBrowseTree       => 'access_instructor_tools',
+		getProblemTags        => 'access_instructor_tools',
+		setProblemTags        => 'modify_tags',
+
+		# WebworkWebservice::ProblemActions
+		getUserProblem    => 'access_instructor_tools',
+		putUserProblem    => 'modify_student_data',
+		putProblemVersion => 'modify_student_data',
+		putPastAnswer     => 'modify_student_data',
+		tidyPGCode        => 'access_instructor_tools',
+
+		# WebworkWebservice::RenderProblem
+		renderProblem => 'proctor_quiz_login',
+
+		# WebworkWebservice::SetActions
+		listGlobalSets        => 'access_instructor_tools',
+		listGlobalSetProblems => 'access_instructor_tools',
+		getSets               => 'access_instructor_tools',
+		getUserSets           => 'access_instructor_tools',
+		getSet                => 'access_instructor_tools',
+		updateSetProperties   => 'modify_problem_sets',
+		listSetUsers          => 'access_instructor_tools',
+		createNewSet          => 'modify_problem_sets',
+		assignSetToUsers      => 'assign_problem_sets',
+		deleteProblemSet      => 'modify_problem_sets',
+		reorderProblems       => 'modify_problem_sets',
+		updateProblem         => 'modify_problem_sets',
+		updateUserSet         => 'modify_student_data',
+		getSetUserSets        => 'access_instructor_tools',
+		saveUserSets          => 'modify_student_data',
+		unassignSetFromUsers  => 'modify_student_data',
+		addProblem            => 'modify_problem_sets',
+		deleteProblem         => 'modify_problem_sets',
+	}->{$command} // 'invalid';
 }
 
-
-# -- SOAP::Lite -- guide.soaplite.com -- Copyright (C) 2001 Paul Kulchenko --
-# test responses
-
-# sub hi {   shift if UNIVERSAL::isa($_[0] => __PACKAGE__); # grabs class reference
-#   return "hello, world";
-# }
-# sub hello2 { shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
-# 	#print "Receiving request for hello world\n";
-# 	return "Hello world2";
-# }
-# sub bye {shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
-# 	return "goodbye, sad cruel world";
-# }
-#
-# sub languages {shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
-# 	return ["Perl", "C", "sh"];
-# }
-#
-# sub echo_self {
-# 	my $self = shift;
-# }
-#
-# sub echo {
-#     return join("|",("begin ", WebworkWebservice::pretty_print_rh(\@_), " end") );
-# }
-#
-# sub pretty_print_rh {
-# 	WebworkWebservice::pretty_print_rh(@_);
-# }
-#
-
-#
-# package Filter;
-# # I believe that this used to handle the processing of xmlrpc message
-# # possibly replaced by SOAP?
-#
-# sub is_hash_ref {
-# 	my $in =shift;
-# 	my $save_SIG_die_trap = $SIG{__DIE__};
-#     $SIG{__DIE__} = sub {CORE::die(@_) };
-# 	my $out = eval{  %{   $in  }  };
-# 	$out = ($@ eq '') ? 1 : 0;
-# 	$@='';
-# 	$SIG{__DIE__} = $save_SIG_die_trap;
-# 	$out;
-# }
-# sub is_array_ref {
-# 	my $in =shift;
-# 	my $save_SIG_die_trap = $SIG{__DIE__};
-#     $SIG{__DIE__} = sub {CORE::die(@_) };
-# 	my $out = eval{  @{   $in  }  };
-# 	$out = ($@ eq '') ? 1 : 0;
-# 	$@='';
-# 	$SIG{__DIE__} = $save_SIG_die_trap;
-# 	$out;
-# }
-# sub filterObject {
-#
-#     my $is_hash = 0;
-#     my $is_array =0;
-# 	my $obj = shift;
-# 	#print "Enter filterObject ", ref($obj), "\n";
-# 	my $type = ref($obj);
-# 	unless ($type) {
-# 		#print "leave filterObject with nothing\n";
-# 		return($obj);
-# 	}
-#
-#
-# 	if ( is_hash_ref($obj)  ) {
-# 	    #print "enter hash ", %{$obj},"\n";
-# 	    my %obj_container= %{$obj};
-# 		foreach my $key (keys %obj_container) {
-# 			$obj_container{$key} = filterObject( $obj_container{$key} );
-# 			#print $key, "  ",  ref($obj_container{$key}),"   ", $obj_container{$key}, "\n";
-# 		}
-# 		#print "leave filterObject with HASH\n";
-# 		return( bless(\%obj_container,'HASH'));
-# 	};
-#
-#
-#
-# 	if ( is_array_ref($obj)  ) {
-# 		#print "enter array ( ", @{$obj}," )\n";
-# 		my @obj_container= @{$obj};
-# 		foreach my $i (0..$#obj_container) {
-# 			$obj_container[$i] = filterObject( $obj_container[$i] );
-# 			#print "\[$i\]  ",  ref($obj_container[$i]),"   ", $obj_container[$i], "\n";
-# 		}
-# 		#print "leave filterObject with ARRAY\n";
-# 		return( bless(\@obj_container,'ARRAY'));
-# 	};
-#
-# }
-#
-
 1;
diff --git a/lib/WebworkWebservice/CourseActions.pm b/lib/WebworkWebservice/CourseActions.pm
index 0d2bbfa59c..3616e23b73 100644
--- a/lib/WebworkWebservice/CourseActions.pm
+++ b/lib/WebworkWebservice/CourseActions.pm
@@ -1,10 +1,6 @@
-#!/usr/local/bin/perl -w
-use strict;
-use warnings;
-
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -18,482 +14,343 @@ use warnings;
 ################################################################################
 
 # Course manipulation functions for webwork webservices
-
 package WebworkWebservice::CourseActions;
 
-use WebworkWebservice;
+use strict;
+use warnings;
+
+use Time::HiRes qw/gettimeofday/;
+use Date::Format;
+use Data::Structure::Util qw(unbless);
 
-use base qw(WebworkWebservice);
 use WeBWorK::DB;
 use WeBWorK::DB::Utils qw(initializeUserProblem);
-use WeBWorK::Utils qw(runtime_use cryptPassword encode_utf8_base64 decode_utf8_base64);
+use WeBWorK::Utils qw(cryptPassword path_is_subdir surePathToFile);
 use WeBWorK::Utils::CourseManagement qw(addCourse);
 use WeBWorK::Debug;
-use WeBWorK::ContentGenerator::Instructor::SendMail;
-use JSON;
-
-use Time::HiRes qw/gettimeofday/; # for log timestamp
-use Date::Format; # for log timestamp
-
-sub create {
-	my ($self, $params) = @_;
-	my $newcourse = $params->{'name'};
-	# note this ce is different from $self->ce!
-	# FIXME!!!!
-	my $ce = WeBWorK::CourseEnvironment->new({
-			webwork_dir => $self->ce->{webwork_dir},
-			courseName => $newcourse
-		});
-	my $db = $self->db;
-	my $authz = $self->{authz};
-	my $out = {};
-
-	debug("Webservices course creation request.");
-	# make sure course actions are enabled
-	if (!$ce->{webservices}{enableCourseActions}) {
-		debug("Course actions disabled by configuration.");
-		$out->{status} = "failure";
-		$out->{message} = "Course actions disabled by configuration.";
-		return $out
-	}
-	# only users from the admin course with appropriate permissions allowed
-	if (!($ce->{courseName} eq 'admin')) {
-		debug("Course creation attempt when not logged into admin course.");
-		$out->{status} = "failure";
-		$out->{message} = "Course creation allowed only for admin course users.";
-		return $out
-	}
-	# prof check is actually done when initiating session, this is just in case
-	if (!$self->{authz}->hasPermissions($params->{'userID'},
-			'create_and_delete_courses')) {
-		debug("Course creation attempt with insufficient permission level.");
-		$out->{status} = "failure";
-		$out->{message} = "Insufficient permission level.";
-		return $out
-	}
-	if ( length($newcourse) > $ce->{maxCourseIdLength} ) {
-		debug("Course creation attempt failed: course ID was too long.");
-		$out->{status} = "failure";
-		$out->{message} = "Course ID cannot exceed " . $ce->{maxCourseIdLength} . " characters.";
-		return $out
-	}
 
-	# declare params
-	my @professors = ();
-	my $dbLayout = $ce->{dbLayoutName};
-	my %courseOptions = ( dbLayoutName => $dbLayout );
-	my %dbOptions;
+sub createCourse {
+	my ($invocant, $self, $params) = @_;
+
+	my $admin_ce = $self->ce;
+	my $db       = $self->db;
+	my $authz    = $self->authz;
+
+	# Make sure course actions are enabled
+	die "Course actions disabled by configuration.\n" unless $admin_ce->{webservices}{enableCourseActions};
+
+	# Only users from the admin course with appropriate permissions are allowed to create a course.
+	die "Course creation allowed only for admin course users.\n" unless $admin_ce->{courseName} eq 'admin';
+
+	die "Course ID cannot exceed $admin_ce->{maxCourseIdLength} characters.\n"
+		if length($params->{name}) > $admin_ce->{maxCourseIdLength};
+
+	# Bring up a minimal course environment for the new course.
+	my $ce = WeBWorK::CourseEnvironment->new({ courseName => $params->{name} });
+
+	# Copy user from admin course.
+	# Modified from do_add_course in WeBWorK::ContentGenerator::CourseAdmin.
 	my @users;
-	my %optional_arguments;
-
-	my $userClass = $ce->{dbLayouts}->{$dbLayout}->{user}->{record};
-	my $passwordClass = $ce->{dbLayouts}->{$dbLayout}->{password}->{record};
-	my $permissionClass = $ce->{dbLayouts}->{$dbLayout}->{permission}->{record};
-
-	# copy instructors from admin course
-	# modified from do_add_course in WeBWorK::ContentGenerator::CourseAdmin
-	foreach my $userID ($db->listUsers) {
-		my $User            = $db->getUser($userID);
-		my $Password        = $db->getPassword($userID);
-		my $PermissionLevel = $db->getPermissionLevel($userID);
-		push @users, [ $User, $Password, $PermissionLevel ]
-			if $authz->hasPermissions($userID,"create_and_delete_courses");
+	for my $userID ($db->listUsers) {
+		push @users, [ $db->getUser($userID), $db->getPassword($userID), $db->getPermissionLevel($userID) ]
+			if $authz->hasPermissions($userID, 'create_and_delete_courses');
 	}
 
-	# all data prepped, try to actually add the course
+	# Try to actually create the course.
 	eval {
 		addCourse(
-			courseID => $newcourse,
-			ce => $ce,
-			courseOptions => \%courseOptions,
-			dbOptions => \%dbOptions,
-			users => \@users,
-			%optional_arguments,
+			courseID      => $params->{name},
+			ce            => $ce,
+			courseOptions => { dbLayoutName => $ce->{dbLayoutName} },
+			users         => \@users
 		);
-		addLog($ce, "New course created: " . $newcourse);
-		$out->{status} = "success";
-	} or do {
-		$out->{status} = "failure";
-		$out->{message} = $@;
-	};
+		addLog($ce, "New course created: $params->{name}");
+		return 1;
+	} or die "$@\n";
 
-	return $out;
+	return { text => "New course $params->{name} created." };
 }
 
 sub listUsers {
-    my ($self, $params) = @_;
-    my $out = {};
-    my $db = $self->db;
-    my $ce = $self->ce;
-
-
-    # make sure course actions are enabled
-    #if (!$ce->{webservices}{enableCourseActions}) {
-    #	$out->{status} = "failure";
-    #	$out->{message} = "Course actions disabled by configuration.";
-    #	return $out
-    #}
-
-    my @tempArray = $db->listUsers;
-    my @userInfo = $db->getUsers(@tempArray);
-    my $numGlobalSets = $db->countGlobalSets;
-
-    #%permissionsHash = reverse %permissionsHash;
-    #for(@userInfo){
-    #    @userInfo[i]->{'permission'} = $db->getPermissionLevel(@userInfo[i]->{'user_id'});
-    #}
-    my %permissionsHash = reverse %{$ce->{userRoles}};
-    foreach my $u (@userInfo)
-    {
-        my $PermissionLevel = $db->getPermissionLevel($u->{'user_id'});
-        $u->{'permission'} = $PermissionLevel->{'permission'};
-        #$u->{'permission'}{'name'} = $permissionsHash{$PermissionLevel->{'permission'}};
-
+	my ($invocant, $self, $params) = @_;
+	my $db = $self->db;
+	my $ce = $self->ce;
 
-		my $studid= $u->{'student_id'};
-		$u->{'student_id'} = "$studid";  # make sure that the student_id is returned as a string.
-        $u->{'num_user_sets'} = $db->listUserSets($studid) . "/" . $numGlobalSets;
+	my @userInfo      = map { unbless($_) } $db->getUsersWhere({ user_id => { not_like => 'set_id:%' } });
+	my $numGlobalSets = $db->countGlobalSets;
 
-		my $Key = $db->getKey($u->{'user_id'});
-		$u->{'login_status'} =  ($Key and time <= $Key->timestamp()+$ce->{sessionKeyTimeout}); # cribbed from check_session
+	for my $user (@userInfo) {
+		my $permissionLevel = $db->getPermissionLevel($user->{user_id});
+		$user->{permission} = $permissionLevel->{permission};
 
-    }
+		$user->{num_user_sets} = $db->countUserSets($user->{user_id}) . '/' . $numGlobalSets;
 
+		my $Key = $db->getKey($user->{user_id});
+		$user->{login_status} = $Key && time <= $Key->timestamp + $ce->{sessionKeyTimeout} ? 'active' : 'inactive';
+	}
 
-    $out->{ra_out} = \@userInfo;
-    $out->{text} = encode_utf8_base64("Users for course: ".$self->{courseName});
-    return $out;
+	return {
+		ra_out => \@userInfo,
+		text   => "Users for course: $ce->{courseName}"
+	};
 }
 
 sub addUser {
-	my ($self, $params) = @_;
-	my $out = {};
-	$out->{text} = encode_utf8_base64("");
+	my ($invocant, $self, $params) = @_;
 	my $db = $self->db;
 	my $ce = $self->ce;
 
-	# make sure course actions are enabled
-	#if (!$ce->{webservices}{enableCourseActions}) {
-	#	$out->{status} = "failure";
-	#	$out->{message} = "Course actions disabled by configuration.";
-	#	return $out
-	#}
+	# Make sure course actions are enabled
+	die "Course actions disabled by configuration.\n" unless $ce->{webservices}{enableCourseActions};
+
+	# Check parameters.
+	die "The user_id parameter is required\n" unless $params->{user_id} && $params->{user_id} =~ /\S/;
+
+	my $user_id = $params->{user_id} =~ s/^\s*|\s*$//g;
 
-	# Two scenarios
-	# 1. New user
-	# 2. Dropped user deciding to re-enrol
+	my $out = { ra_out => {} };
 
-	my $olduser = $db->getUser($params->{id});
-	my $id = $params->{'id'};
-	my $permission; # stores user's permission level
+	my $olduser = $db->getUser($params->{user_id});
+	my $permission;
 	if ($olduser) {
-		# a dropped user decided to re-enrol
-		my $enrolled = $self->ce->{statuses}->{Enrolled}->{abbrevs}->[0];
-		$olduser->status($enrolled);
-		$db->putUser($olduser);
-		addLog($ce, "User ". $id . " re-enrolled in " .
-			$ce->{courseName});
-		$out->{status} = 'success';
-		$permission = $db->getPermissionLevel($id);
-	}
-	else {
-		# a new user showed up
+		if ($olduser->status != $ce->{statuses}{Enrolled}{abbrevs}[0]) {
+			# Re-enroll the existing user.
+			$olduser->status($ce->{statuses}{Enrolled}{abbrevs}[0]);
+			$db->putUser($olduser);
+			addLog($ce, "User $params->{user_id} re-enrolled in $ce->{courseName}");
+
+			$permission = $db->getPermissionLevel($params->{user_id});
+
+			$out->{ra_out}{user_added} = \1;
+			$out->{text} = "User $params->{user_id} re-enrolled in $ce->{courseName}.";
+		} else {
+			$out->{text} = "User $params->{user_id} already enrolled in $ce->{courseName}.";
+		}
+	} else {
+		# Add a new user.
 		my $ce = $self->ce;
 
 		# student record
-		my $enrolled = $ce->{statuses}->{Enrolled}->{abbrevs}->[0];
+		my $enrolled    = $ce->{statuses}->{Enrolled}->{abbrevs}->[0];
 		my $new_student = $db->{user}->{record}->new();
-		$new_student->user_id($id);
-		$new_student->first_name($params->{'first_name'});
-		$new_student->last_name($params->{'last_name'});
+		$new_student->user_id($params->{user_id});
+		$new_student->first_name($params->{first_name}) if $params->{first_name};
+		$new_student->last_name($params->{last_name})   if $params->{last_name};
 		$new_student->status($enrolled);
-		$new_student->student_id($params->{'student_id'});
-		$new_student->email_address($params->{'email_address'});
-		$new_student->recitation($params->{'recitation'});
-		$new_student->section($params->{'section'});
-		$new_student->comment($params->{'comment'});
-
-		# password record
-		my $cryptedpassword = "";
-		if ($params->{'password'}) {
-			$cryptedpassword = cryptPassword($params->{'password'});
+		$new_student->student_id($params->{student_id})       if defined $params->{student_id};
+		$new_student->email_address($params->{email_address}) if $params->{email_address};
+		$new_student->recitation($params->{recitation})       if defined $params->{recitation};
+		$new_student->section($params->{section})             if defined $params->{section};
+		$new_student->comment($params->{comment})             if $params->{comment};
+
+		# Password record
+		my $cryptedpassword = '';
+		if ($params->{password}) {
+			$cryptedpassword = cryptPassword($params->{password} =~ s/^\s*|\s*$//gr);
+		} elsif ($new_student->student_id) {
+			$cryptedpassword = cryptPassword($new_student->student_id);
 		}
-		elsif ($new_student->student_id()) {
-			$cryptedpassword = cryptPassword($new_student->student_id());
-		}
-		my $password = $db->newPassword(user_id => $id);
+		my $password = $db->newPassword(user_id => $params->{user_id});
 		$password->password($cryptedpassword);
 
-		# permission record
-		$permission = $params->{'permission'};
+		# Permission record
+		$permission = $params->{permission} // 0;
 		if (defined($ce->{userRoles}{$permission})) {
 			$permission = $db->newPermissionLevel(
-				user_id => $id,
-				permission => $ce->{userRoles}{$permission});
-		}
-		else {
-			$permission = $db->newPermissionLevel(user_id => $id,
-				permission => $ce->{userRoles}{student});
+				user_id    => $params->{user_id},
+				permission => $ce->{userRoles}{$permission}
+			);
+		} else {
+			$permission = $db->newPermissionLevel(
+				user_id    => $params->{user_id},
+				permission => $ce->{userRoles}{student}
+			);
 		}
 
-		# commit changes to db
-		$out->{status} = 'success';
-		eval{ $db->addUser($new_student); };
-		if ($@) {
-			$out->{status} = 'failure';
-			$out->{message} = "Add user for $id failed!\n";
-		}
-		eval { $db->addPassword($password); };
-		if ($@) {
-			$out->{status} = 'failure';
-			$out->{message} = "Add password for $id failed!\n";
-		}
+		# Commit changes to db
+		$db->addUser($new_student);
+		$db->addPassword($password);
 		eval { $db->addPermissionLevel($permission); };
-		if ($@) {
-			$out->{status} = 'failure';
-			$out->{message} = "Add permission for $id failed!\n";
-		}
 
-		addLog($ce, "User ". $id . " newly added in " .
-			$ce->{courseName});
+		$out->{ra_out}{user_added} = \1;
+		$out->{text} = "User $params->{user_id} added to $ce->{courseName}.";
+		addLog($ce, "User $params->{user_id} added to $ce->{courseName}");
 	}
 
-	# only students are assigned homework
-	if ($ce->{webservices}{courseActionsAssignHomework} &&
-		$permission->{permission} == $ce->{userRoles}{student}) {
-		debug("Assigning homework.");
-		my $ret = assignVisibleSets($db, $id);
-		if ($ret) {
-			$out->{status} = 'failure';
-			$out->{message} = "User created but unable to assign sets. $ret";
-		}
+	# Assign all visible sets to the user if requested.
+	if ($params->{assign_visible_sets}) {
+		$out->{ra_out}{sets_assigned} = assignVisibleSets($db, $params->{user_id}) ? \0 : \1;
+		$out->{text} .= " Visible sets assigned to $params->{user_id}.";
 	}
 
 	return $out;
 }
 
 sub dropUser {
-	my ($self, $params) = @_;
+	my ($invocant, $self, $params) = @_;
 	my $db = $self->db;
 	my $ce = $self->ce;
-	my $out = {};
-	debug("Webservices drop user request.");
-
-	# make sure course actions are enabled
-	if (!$ce->{webservices}{enableCourseActions}) {
-		$out->{status} = "failure";
-		$out->{message} = "Course actions disabled by configuration.";
-		return $out
-	}
+
+	# Make sure course actions are enabled
+	die "Course actions disabled by configuration.\n" unless $ce->{webservices}{enableCourseActions};
+
+	# Check parameters.
+	die "The user_id parameter is required\n" unless $params->{user_id} && $params->{user_id} =~ /\S/;
 
 	# Mark user as dropped
-	my $drop = $self->ce->{statuses}->{Drop}->{abbrevs}->[0];
-	my $person = $db->getUser($params->{'id'});
-	if ($person) {
-		$person->status($drop);
-		$db->putUser($person);
-		addLog($ce, "User ". $person->user_id() . " dropped from " .
-			$ce->{courseName});
-		$out->{status} = 'success';
-	}
-	else {
-		$out->{status} = 'failure';
-		$out->{message} = 'Could not find user';
-	}
+	my $user = $db->getUser($params->{user_id});
 
-	return $out;
+	die "Could not find $params->{user_id} in $ce->{courseName}\n" unless $user;
+
+	$user->status($ce->{statuses}{Drop}{abbrevs}[0]);
+	$db->putUser($user);
+	addLog($ce, "User $params->{user_id} dropped from $ce->{courseName}");
+	return { text => "User $params->{user_id} dropped from $ce->{courseName}" };
 }
 
 sub deleteUser {
-	my ($self, $params) = @_;
-	my $out = {};
+	my ($invocant, $self, $params) = @_;
 	my $db = $self->db;
 	my $ce = $self->ce;
-	$out->{text} = encode_utf8_base64("");
 
-	my $user = $params->{'id'};
+	# Make sure course actions are enabled
+	die "Course actions disabled by configuration.\n" unless $ce->{webservices}{enableCourseActions};
 
+	die "The user_id parameter is required\n" unless $params->{user_id} && $params->{user_id} =~ /\S/;
 
-	debug("Webservices delete user request.");
-        debug("Attempting to delete user: " . $user );
+	my $User = $db->getUser($params->{user_id});
+	die "Record for user $params->{user_id} not found\n" unless $User;
 
+	die q{You can't delete yourself from the course.} if ($params->{user_id} eq $params->{user});
 
-	my $User = $db->getUser($params->{'id'}); # checked
-	die ("record for visible user [_1] not found" . $params->{'id'}) unless $User;
+	my $del = $db->deleteUser($params->{user_id});
+	die "User $params->{user_id} could not be deleted\n" unless $del;
 
+	addLog($ce, "User $params->{user_id} deleted from $ce->{courseName}");
+	return { text => "User $params->{user_id} deleted from $ce->{courseName}" };
+}
 
-	# Why is the following commented out?
+sub editUser {
+	my ($invocant, $self, $params) = @_;
+	my $db = $self->db;
+	my $ce = $self->ce;
 
-	# make sure course actions are enabled
+	# Make sure course actions are enabled
+	die "Course actions disabled by configuration.\n" unless $ce->{webservices}{enableCourseActions};
 
-	#if (!$ce->{webservices}{enableCourseActions}) {
-	#	$out->{status} = "failure";
-	#	$out->{message} = "Course actions disabled by configuration.";
-	#	$out->{text} = encode_base64("Course actions disabled by configuration");
-	#	return $out
-	#}
+	die "The user_id parameter is required\n" unless ($params->{user_id} && $params->{user_id} =~ /\S/);
 
-	if ($params->{'id'} eq $params->{'user'} )
-	{
-		$out->{status} = "failure";
-		$out->{message} = "You can't delete yourself from the course.";
-	} else {
-		my $del = $db->deleteUser($user);
-
-		if($del)
-		{
-			my $result;
-			$result->{delete} = "success";
-			$out->{text} .=encode_utf8_base64("User " . $user . " successfully deleted");
-			$out->{ra_out} .= "delete: success";
-		}
-		else
-		{
-			$out->{text}=encode_utf8_base64("User " . $user . " could not be deleted");
-			$out->{ra_out} .= "delete : failed";
-		}
+	my $User = $db->getUser($params->{user_id});
+	die "User $params->{user_id} not found.\n" unless ($User);
 
-	}
+	# It has already been checked that the user has permission to modify user data.  Get the permission level here, so
+	# that it can be verified that the permission level of the user being edited is less than or equal to that of the
+	# one doing the editing.
+	my $callerPermission = $db->getPermissionLevel($params->{user});
+	my $permissionLevel  = $db->getPermissionLevel($params->{user_id});
 
-	return $out;
+	die "You do not have permission to edit $params->{user_id}\n"
+		unless $callerPermission && $permissionLevel && $callerPermission->permission >= $permissionLevel->permission;
 
-}
+	my $out = { text => '', ra_out => {} };
 
+	for my $field ($User->NONKEYFIELDS()) {
+		$User->$field($params->{$field}) if defined $params->{$field};
+	}
+	$db->putUser($User);
+	$out->{text} = 'User data updated.';
+	$out->{ra_out}{user} = unbless($User);
+
+	if (defined $params->{permission} && $params->{permission} =~ /\d*/) {
+		if ($params->{user_id} eq $params->{user}) {
+			$out->{text} .= ' You cannot change your own permissions.';
+			$out->{ra_out}{permission_changed} = \0;
+		} else {
+			$permissionLevel->permission($params->{permission});
+			$db->putPermissionLevel($permissionLevel);
+			$out->{text} .= ' Permissions updated.';
+			$out->{ra_out}{user}{permission} = $permissionLevel->{permission};
+		}
+	} else {
+		$out->{ra_out}{permission_changed} = \0;
+	}
 
-sub editUser {
-	my ($self, $params) = @_;
-    my $db = $self->db;
-    my $ce = $self->ce;
-    my $out = {};
-    debug("Webservices edit user request.");
-    $out->{text} = encode_utf8_base64("");
-    # make sure course actions are enabled
-    #if (!$ce->{webservices}{enableCourseActions}) {
-    #	$out->{status} = "failure";
-    #	$out->{message} = "Course actions disabled by configuration.";
-    #	return $out
-    #}
-
-	my $User = $db->getUser($params->{'id'}); # checked
-    die ("record for visible user [_1] not found" . $params->{'id'}) unless $User;
-    my $PermissionLevel = $db->getPermissionLevel($params->{'id'}); # checked
-    die "permissions for [_1] not defined". $params->{'id'} unless defined $PermissionLevel;
-    foreach my $field ($User->NONKEYFIELDS()) {
-    	my $param = "${field}";
-    	if (defined $params->{$param}) {
-    		$User->$field($params->{$param});
-    	}
-    }
-    if($params->{'id'} eq $params->{'user'}){
-        $out->{text} .= encode_utf8_base64("You cannot change your own permissions.");
-    } else {
-        foreach my $field ($PermissionLevel->NONKEYFIELDS()) {
-    	    my $param = "${field}";
-    	    if (defined $params->{$param}) {
-   	    	    $PermissionLevel->$field($params->{$param});
-    	    }
-        }
-    }
-
-    $db->putUser($User);
-    $db->putPermissionLevel($PermissionLevel);
-    $User = $db->getUser($params->{'id'}); # checked
-
-    my %permissionsHash = reverse %{$ce->{userRoles}};
-    $PermissionLevel = $db->getPermissionLevel($User->{'user_id'});
-    $User->{'permission'} = $PermissionLevel->{'permission'};
-    #$User->{'permission'}{'name'} = $permissionsHash{$PermissionLevel->{'permission'}};
-
-
-    # If the new_password param is set and not equal to the empty string, change the password.
-
-    if((defined $params->{new_password}) and ($params->{new_password} ne "" ) ) {
-	return changeUserPassword($self,$params);
-    }
-
-
-    $out->{ra_out} = $User;
-    $out->{text} .= encode_utf8_base64("Changes saved");
+	$out->{ra_out}{password_changed} = \0;
+
+	# If the new_password param is set and not equal to the empty string and not all spaces,
+	# then change the password or set the password if it is not set.
+	if (defined $params->{new_password} && $params->{new_password} =~ /\S/) {
+		my $password   = cryptPassword($params->{new_password} =~ s/^\s*|\s*$//gr);
+		my $dbPassword = $db->getPassword($params->{user_id});
+		if ($dbPassword) {
+			$dbPassword->password($password);
+			$db->putPassword($dbPassword);
+		} else {
+			$dbPassword = $db->newPassword(user_id => $params->{user_id}, password => $password);
+			$db->addPassword($dbPassword);
+		}
+		$out->{text} .= ' Password changed.';
+		$out->{ra_out}{password_changed} = \1;
+	}
 
+	addLog($ce, "User edited: $out->{text}");
 	return $out;
 }
 
-#  id :  is the user_id of the user to be changed.
-#  new_password : the
-
-
 sub changeUserPassword {
-
-	my ($self, $params) = @_;
-	my $out = {};
+	my ($invocant, $self, $params) = @_;
 	my $db = $self->db;
 	my $ce = $self->ce;
-	$out->{text} = encode_utf8_base64("");
-
-	my $userid = $params->{'id'};
-
-	# check to see if you have sufficient privileges.
-	# Note: this is not implemented.  It seems like we should verify that the user has appropriate privileges to change
-	# a password or that the user sending the request is the same as the person whose password is being changed.
-	#  my $PermissionLevel = $db->getPermissionLevel($params->{'user'}); # checked
-
 
-	debug("Webservices change user password request.");
-        debug("Attempting to change the password of user: " . $userid );
-	debug("The new password:" . $params->{new_password});
-
-
-	my $User = $db->getUser($userid); # checked
-	die ("record for visible user [_1] not found" . $params->{'id'}) unless $User;
-
-
-    # make sure course actions are enabled
-   #     if (!$ce->{webservices}{enableCourseActions}) {
-    #    	$out->{text} = "failure";
-     #   	$out->{ra_out} = "Course actions disabled by configuration.";
-     #   	return $out
-     #   }
-
-    #my $User = $db->getUser($params->{'id'}); # checked
-    if(!(defined $User)){
-	$out->{text}=encode_utf8_base64("No record found for user: ". $params->{'id'});
-	return $out;
-    }
-
-    # In the next few lines I (pls) changed $params->{$param}->[0] to $params->{$param} to fix a bug.  Not sure why ->[0] was there.
-	my $param = "new_password";
-	if ((defined $params->{$param}) and ($params->{$param})) {
-		my $newP = $params->{$param};
-		my $Password = eval {$db->getPassword($User->user_id)}; # checked
-		my $cryptPassword = cryptPassword($newP);
-		$Password->password(cryptPassword($newP));
-		eval { $db->putPassword($Password) };
+	# Make sure course actions are enabled
+	die "Course actions disabled by configuration.\n" unless $ce->{webservices}{enableCourseActions};
+
+	# Check parameters.
+	die "The user_id parameter is required\n" unless ($params->{user_id} && $params->{user_id} =~ /\S/);
+	die "The new_password parameter is required\n"
+		unless defined $params->{new_password} && $params->{new_password} =~ /\S/;
+
+	my $User = $db->getUser($params->{user_id});
+	die "User $params->{user_id} not found.\n" unless $User;
+
+	# It has already been checked that the user has permission to modify user data.  Get the permission level here, so
+	# that it can be verified that the permission level of the user being edited is less than or equal to that of the
+	# one doing the editing.
+	my $callerPermission = $db->getPermissionLevel($params->{user});
+	my $permissionLevel  = $db->getPermissionLevel($params->{user_id});
+	die "You do not have permission to change the password for $params->{user_id}\n"
+		unless ($callerPermission
+			&& $permissionLevel
+			&& $callerPermission->{permission} >= $permissionLevel->{permission});
+
+	my $password = cryptPassword($params->{new_password} =~ s/^\s*|\s*$//gr);
+
+	# Change the password or set the password if it is not set.
+	my $dbPassword = $db->getPassword($User->user_id);
+	if ($dbPassword) {
+		$dbPassword->password($password);
+		$db->putPassword($dbPassword);
+	} else {
+		$dbPassword = $db->newPassword(user_id => $params->{user_id}, password => $password);
+		$db->addPassword($dbPassword);
 	}
 
-	$self->{passwordMode} = 0;
-	$out->{text} = encode_utf8_base64("New passwords saved");
-	$out->{ra_out}= "password_change: success";
-	return $out;
+	addLog($ce, "New password set for $params->{user_id}");
+	return { text => "New password set for $params->{user_id}" };
 }
 
 sub addLog {
 	my ($ce, $msg) = @_;
-	if (!$ce->{webservices}{enableCourseActionsLog}) {
-		return;
-	}
+	return unless $ce->{webservices}{enableCourseActionsLog};
+
 	my ($sec, $msec) = gettimeofday;
 	my $date = time2str("%a %b %d %H:%M:%S.$msec %Y", $sec);
 
-	$msg = "[$date] $msg\n";
-
-	my $logfile = $ce->{webservices}{courseActionsLogfile};
-	if (open my $f, ">>", $logfile) {
-		print $f $msg;
+	if (open my $f, '>>', $ce->{webservices}{courseActionsLogfile}) {
+		print $f "[$date] $msg\n";
 		close $f;
-	}
-	else {
-		debug("Error, unable to open student updates log file '$logfile' in".
-			"append mode: $!");
+	} else {
+		debug(qq{Error: Unable to open web services log file "$ce->{webservices}{courseActionsLogfile}": $!});
 	}
 	return;
 }
@@ -501,10 +358,10 @@ sub addLog {
 sub assignVisibleSets {
 	my ($db, $userID) = @_;
 	my @globalSetIDs = $db->listGlobalSets;
-	my @GlobalSets = $db->getGlobalSets(@globalSetIDs);
+	my @GlobalSets   = $db->getGlobalSets(@globalSetIDs);
 
 	my $i = -1;
-	foreach my $GlobalSet (@GlobalSets) {
+	for my $GlobalSet (@GlobalSets) {
 		$i++;
 		if (not defined $GlobalSet) {
 			debug("Record not found for global set $globalSetIDs[$i]");
@@ -515,21 +372,22 @@ sub assignVisibleSets {
 		}
 
 		# assign set to user
-		my $setID = $GlobalSet->set_id;
+		my $setID   = $GlobalSet->set_id;
 		my $UserSet = $db->newUserSet;
 		$UserSet->user_id($userID);
 		$UserSet->set_id($setID);
 		my @results;
 		my $set_assigned = 0;
 		eval { $db->addUserSet($UserSet) };
-		if ( $@ && !($@ =~ m/user set exists/)) {
-			return "Failed to assign set to user $userID";
+
+		if ($@ && !($@ =~ m/user set exists/)) {
+			return 0;
 		}
 
 		# assign problem
 		my @GlobalProblems = grep { defined $_ } $db->getAllGlobalProblems($setID);
-		foreach my $GlobalProblem (@GlobalProblems) {
-			my $seed = int( rand( 2423) ) + 36;
+		for my $GlobalProblem (@GlobalProblems) {
+			my $seed        = int(rand(2423)) + 36;
 			my $UserProblem = $db->newUserProblem;
 			$UserProblem->user_id($userID);
 			$UserProblem->set_id($GlobalProblem->set_id);
@@ -537,7 +395,7 @@ sub assignVisibleSets {
 			initializeUserProblem($UserProblem, $seed);
 			eval { $db->addUserProblem($UserProblem) };
 			if ($@ && !($@ =~ m/user problem exists/)) {
-				return "Failed to assign problems to user $userID";
+				return 0;
 			}
 		}
 	}
@@ -545,186 +403,151 @@ sub assignVisibleSets {
 	return 0;
 }
 
-
-
 sub getConfigValues {
-	my $ce = shift;
+	my $ce           = shift;
 	my $ConfigValues = $ce->{ConfigValues};
 
-	foreach my $oneConfig (@$ConfigValues) {
-		foreach my $hash (@$oneConfig) {
-			if (ref($hash) eq "HASH"){
-				my $str = '$ce->' . $hash->{hashVar};
-				$hash->{value} = eval($str);
+	for my $oneConfig (@$ConfigValues) {
+		for my $hash (@$oneConfig) {
+			if (ref($hash) eq 'HASH') {
+				if (defined $hash->{hashVar}) {
+					my $var = $hash->{hashVar};
+					$hash->{value} = eval { $ce->$var };
+				} else {
+					$hash->{value} = undef;
+				}
 			} else {
 				debug($hash);
 			}
 		}
 	}
 
-	# get the list of theme folders in the theme directory and remove . and ..
+	# Get the list of theme folders in the theme directory and remove . and ..
 	my $themeDir = $ce->{webworkDirs}{themes};
-	opendir(my $dh, $themeDir) || die "can't opendir $themeDir: $!";
-	my $themes =[grep {!/^\.{1,2}$/} sort readdir($dh)];
+	opendir(my $dh, $themeDir) or die "Can't open directory $themeDir: $!\n";
+	my $themes = [ grep { !/^\.{1,2}$/ } sort readdir($dh) ];
 
-	# insert the anonymous array of theme folder names into ConfigValues
-	my $modifyThemes = sub { my $item=shift; if (ref($item)=~/HASH/ and $item->{var} eq 'defaultTheme' ) { $item->{values} =$themes } };
+	# Insert the anonymous array of theme folder names into ConfigValues.
+	my $modifyThemes = sub {
+		my $item = shift;
+		if (ref($item) =~ /HASH/ and $item->{var} eq 'defaultTheme') { $item->{values} = $themes }
+	};
 
-	foreach my $oneConfig (@$ConfigValues) {
-		foreach my $hash (@$oneConfig) {
+	for my $oneConfig (@$ConfigValues) {
+		for my $hash (@$oneConfig) {
 			&$modifyThemes($hash);
 		}
 	}
 
-	$ConfigValues;
+	return $ConfigValues;
 }
 
 sub getCourseSettings {
-	my ($self, $params) = @_;
-	my $ce = $self->ce;		# course environment
-	my $db = $self->db;		# database
+	my ($invocant, $self, $params) = @_;
+	my $ce           = $self->ce;
+	my $db           = $self->db;
 	my $ConfigValues = getConfigValues($ce);
 
-	my $tz = DateTime::TimeZone->new( name => $ce->{siteDefaults}->{timezone});
-	my $dt = DateTime->now();
-
-	my @tzabbr = ("tz_abbr", $tz->short_name_for_datetime( $dt ));
-
-
-	#debug($tz->short_name_for_datetime($dt));
-
-	push(@$ConfigValues, \@tzabbr);
-
-	my $out = {};
-	$out->{ra_out} = $ConfigValues;
-	$out->{text} = encode_utf8_base64("Successfully found the course settings");
-    return $out;
+	my $tz = DateTime::TimeZone->new(name => $ce->{siteDefaults}->{timezone});
+	push(@$ConfigValues, [ 'tz_abbr', $tz->short_name_for_datetime(DateTime->now) ]);
 
+	return {
+		ra_out => $ConfigValues,
+		text   => 'Successfully found the course settings'
+	};
 }
 
 sub updateSetting {
-	my ($self, $params) = @_;
-	my $ce = $self->ce;		# course environment
-	my $db = $self->db;		# database
+	my ($invocant, $self, $params) = @_;
+	my $ce = $self->ce;
 
-	my $setVar = $params->{var};
+	# FIXME: There is no check in this method that the var and value passed in are valid.
+	my $setVar   = $params->{var};
 	my $setValue = $params->{value};
 
-	# this shouldn't be needed, but it seems like it's not get parsed correctly.
-	#if($params->{sendViaJSON}){
-	#	$setValue = decode_json($setValue);
-	#}
-	debug("in updateSetting");
-	debug("var:  " . $setVar);
-	debug("value: " . $setValue);
-
-	my $filename = $ce->{courseDirs}->{root} . "/simple.conf";
-	debug("Write to file: " . $filename);
+	my $filename = "$ce->{courseDirs}{root}/simple.conf";
 
-		my $fileoutput = "#!perl
+	my $fileoutput = "#!perl
 # This file is automatically generated by WeBWorK's web-based
 # configuration module.  Do not make changes directly to this
 # file.  It will be overwritten the next time configuration
 # changes are saved.\n\n";
 
+	# Read in the file
+	open(my $DAT, '<', $filename)
+		or die "Unable to read $filename. "
+		. "Ensure that the file exists and the server has write permission for this file.\n";
+	my @raw_data = <$DAT>;
+	close($DAT);
 
-	# read in the file
-
-	open(DAT, $filename) || die("Could not open file!");
-	my @raw_data=<DAT>;
-	close(DAT);
-
-
-
-
-	my $var;
-	my $line;
-	my $value;
 	my $varFound = 0;
 
-	foreach $line (@raw_data)
-	{
+	for my $line (@raw_data) {
 		chomp $line;
-	 	if ($line =~ /^\$/) {
-	 		my @tmp = split(/\$/,$line);
-	 		($var,$value) = split(/\s+=\s+/,$tmp[1]);
-	 		if ($var eq $setVar){
-	 			$fileoutput .= "\$" . $var . " = " . $setValue . "\n";
-	 			$varFound = 1;
-	 		} else {
-	 			$fileoutput .= "\$" . $var . " = " . $value . "\n";
-	 		}
+		if ($line =~ /^\$/) {
+			my @tmp = split(/\$/, $line);
+			my ($var, $value) = split(/\s+=\s+/, $tmp[1]);
+			if ($var eq $setVar) {
+				$fileoutput .= "\$$var = $setValue;\n";
+				$varFound = 1;
+			} else {
+				# The value includes the semicolon that hopefully was in the file.
+				$fileoutput .= "\$$var = $value\n";
+			}
 		}
 	}
 
-	if (! $varFound) {
-		$fileoutput .= "\$" . $setVar . " = " . $setValue . ";\n";
+	if (!$varFound) {
+		$fileoutput .= "\$$setVar = $setValue;\n";
 	}
 
-	debug ($fileoutput);
-
-
-	my $writeFileErrors;
-	eval {
-		local *OUTPUTFILE;
-		if( open OUTPUTFILE, ">", $filename) {
-			print OUTPUTFILE $fileoutput;
-			close OUTPUTFILE;
-		} else {
-			$writeFileErrors = "I could not open $fileoutput".
-				"We will not be able to make configuration changes unless the permissions are set so that the web server can write to this file.";
-		}
-	};  # any errors are caught in the next block
+	open(my $OUTPUTFILE, '>', $filename)
+		or die "Unable to write to $filename. Ensure that the server has write permission for this file.\n";
+	print $OUTPUTFILE $fileoutput;
+	close $OUTPUTFILE;
 
-	$writeFileErrors = $@ if $@;
+	return { text => 'Successfully updated course setting' };
+}
 
-	debug("errors: ". $writeFileErrors);
+# This saves a file to the course's templates directory.
+sub saveFile {
+	my ($invocant, $self, $params) = @_;
 
+	my $c  = $self->c;
+	my $ce = $self->ce;
 
-	my $out = {};
-	$out->{ra_out} = "";
-	$out->{text} = encode_utf8_base64("Successfully updated the course settings");
-    return $out;
-}
+	my $outputFilePath = $params->{outputFilePath};
 
+	my $writeFileErrors;
+	if ($outputFilePath && $outputFilePath =~ /\S/) {
+		return {
+			ra_out => 0,
+			text   => $c->maketext(
+				'File not saved. The file "[_1]" is not contained in the templates directory!',
+				$outputFilePath
+			)
+			}
+			unless path_is_subdir($outputFilePath, $ce->{courseDirs}{templates}, 1);
 
-##  pstaabp: This is currently not working.  We need to look into a nice robust way to send email.  It looks like the current
-## way that WW sends mail is a bit archaic.  The MIME::Lite looks fairly straightforward, but we may need to look into smtp settings a
-## bit more.
+		$outputFilePath = "$ce->{courseDirs}{templates}/$outputFilePath" unless $outputFilePath =~ m|^/|;
 
+		# Make sure any missing directories are created.
+		surePathToFile($ce->{courseDirs}{templates}, $outputFilePath);
 
-sub sendEmail {
-	my ($self, $params) = @_;
-	my $ce = $self->ce;
+		# Save the file.
+		open(my $outfile, '>:encoding(UTF-8)', $outputFilePath)
+			or return {
+				ra_out => 0,
+				text   => $c->maketext('File not saved. Failed to open "[_1]" for writing.', $outputFilePath)
+			};
+		print $outfile $params->{fileContents};
+		close $outfile;
+	}
 
-# Should we build in the merge_file?
-#  get merge file
-#		my $merge_file      = ( defined($self->{merge_file}) ) ? $self->{merge_file} : 'None';
-#		my $delimiter       = ',';
-#		my $rh_merge_data   = $self->read_scoring_file("$merge_file", "$delimiter");
-#		unless (ref($rh_merge_data) ) {
-#			$self->addbadmessage(CGI::p("No merge data file"));
-#			$self->addbadmessage(CGI::p("Can't read merge file $merge_file. No message sent"));
-#			return;
-#		} ;
-#		$self->{rh_merge_data} = $rh_merge_data;
-
-		# we don't set the response until we're sure that email can be sent
-#		$self->{response}         = 'send_email';
-
-	my $smtpServer = $ce->{mail}->{smtpServer};
-
-	debug("smtpServer: " . $smtpServer);
-
-
-	my $mailer = Email::Sender->new({
-				tls_allowed => $ce->{tls_allowed}//1, # the default for this for  Mail::Sender is 1
-				from      => $smtpServer,
-				fake_from => "pstaab\@fitchburgstate.edu",
-				to        => "pstaab\@fitchburgstate.edu",
-				smtp      => $smtpServer,
-				subject   => "Test"
-			});
+	return {
+		ra_out => 1,
+		text   => $c->maketext('Saved to file "[_1]"', $outputFilePath =~ s/$ce->{courseDirs}{templates}/[TMPL]/r)
+	};
 }
 
 1;
diff --git a/lib/WebworkWebservice/LibraryActions.pm b/lib/WebworkWebservice/LibraryActions.pm
index cbb021e118..58f241e2aa 100644
--- a/lib/WebworkWebservice/LibraryActions.pm
+++ b/lib/WebworkWebservice/LibraryActions.pm
@@ -1,8 +1,6 @@
-#!/usr/local/bin/perl -w
-
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -15,195 +13,154 @@
 # Artistic License for more details.
 ################################################################################
 
-###############################################################################
 # Web service which fetches WeBWorK problems from a library.
-###############################################################################
-
+package WebworkWebservice::LibraryActions;
 
-#use lib '/home/gage/webwork/pg/lib';
-#use lib '/home/gage/webwork/webwork-modperl/lib';
+use strict;
+use warnings;
 
-package WebworkWebservice::LibraryActions;
+use Carp;
+use JSON;
+use File::stat;
+use File::Find;
 
-use WebworkWebservice;
 use WeBWorK::Utils::ListingDB;
-use base qw(WebworkWebservice);
 use WeBWorK::Debug;
-use JSON;
-
-use strict;
-use sigtrap;
-use Carp;
-use WWSafe;
-#use Apache;
-use WeBWorK::Utils qw(readDirectory sortByName encode_utf8_base64 decode_utf8_base64);
+use WeBWorK::Utils qw(readDirectory sortByName);
 use WeBWorK::CourseEnvironment;
-use WeBWorK::PG::Translator;
-use WeBWorK::PG::IO;
-use Benchmark;
-
-##############################################
-#   Obtain basic information about directories, course name and host
-##############################################
-our $WW_DIRECTORY = $WebworkWebservice::WW_DIRECTORY;
-our $PG_DIRECTORY = $WebworkWebservice::PG_DIRECTORY;
-our $COURSENAME   = $WebworkWebservice::COURSENAME;
-our $HOST_NAME    = $WebworkWebservice::HOST_NAME;
-our $PASSWORD     = "we-don't-need-no-stinking-passowrd";
-
 
-use constant MY_PROBLEMS => '  My Problems  ';
+use constant MY_PROBLEMS   => '  My Problems  ';
 use constant MAIN_PROBLEMS => '  Unclassified Problems  ';
 
-my %problib;	## This is configured in defaults.config
-
-# list of directories to ignore while search through the libraries.
+my %problib;    # This is configured in defaults.config -- no, it's really not.
 
+# List of directories to ignore while search through the libraries.
 my %ignoredir = (
-	'.' => 1, '..' => 1, 'Library' => 1, 'CVS' => 1, 'tmpEdit' => 1,
-	'headers' => 1, 'macros' => 1, 'email' => 1, 'graphics'=>1, '.svn' => 1,
+	'.'        => 1,
+	'..'       => 1,
+	'Library'  => 1,
+	'CVS'      => 1,
+	'tmpEdit'  => 1,
+	'headers'  => 1,
+	'macros'   => 1,
+	'email'    => 1,
+	'graphics' => 1,
+	'.svn'     => 1,
 );
 
+# List the problem libraries that are available.
+sub listLibraries {
+	my ($invocant, $self, $rh) = @_;
 
-#our $ce           = WeBWorK::CourseEnvironment->new($WW_DIRECTORY, "", "", $COURSENAME);
-# warn "library ce \n ", WebworkWebservice::pretty_print_rh($ce);
-# warn "LibraryActions is ready";
-
-##############################################
-#   Obtain basic information about local libraries
-##############################################
-# my %prob_libs	= %{$ce->{courseFiles}->{problibs} };
-
- #warn pretty_print_rh(\%prob_libs);
- # replace library names with full paths
-
-# my $templateDir    = $ce->{courseDirs}->{templates};
-# warn "template Directory is $templateDir";
-# foreach my $key (keys %prob_libs) {
-# 	$prob_libs{$key} = "$templateDir/$key";
-# }
- #warn "prob libraries", WebworkWebservice::pretty_print_rh(\%prob_libs);
-
-sub listLibraries {  # list the problem libraries that are available.
-	my $self = shift;
-	my $rh = shift;
-	#my $my_ce = $self->ce;
-	my %libraries = %{$self->ce->{courseFiles}->{problibs}};
+	my %libraries = %{ $self->ce->{courseFiles}{problibs} };
 
 	my $templateDirectory = $self->ce->{courseDirs}{templates};
 
 	foreach my $key (keys %libraries) {
- 		$libraries{$key} = "$templateDirectory/$key";
- 	}
+		$libraries{$key} = "$templateDirectory/$key";
+	}
 
 	my @outListLib = sort keys %libraries;
-	my $out = {};
-	$out->{ra_out} = \@outListLib;
-	$out->{text} = encode_utf8_base64("success");
-	return $out;
+	return { ra_out => \@outListLib, text => 'success' };
 }
 
-use File::stat;
 sub readFile {
-    my $self = shift;
-	my $rh   = shift;
-	local($|)=1;
-	my $out = {};
+	my ($invocant, $self, $rh) = @_;
+
+	local $| = 1;
+	my $out      = {};
 	my $filePath = $rh->{filePath};
 
-	my %libraries = %{$self->ce->{courseFiles}->{problibs}};
+	my %libraries = %{ $self->ce->{courseFiles}->{problibs} };
 
 	my $templateDirectory = $self->ce->{courseDirs}{templates};
 
-	foreach my $key (keys %libraries) {
- 		$libraries{$key} = "$templateDirectory/$key";
- 	}
-
-
+	for my $key (keys %libraries) {
+		$libraries{$key} = "$templateDirectory/$key";
+	}
 
-	if (  defined($libraries{$rh->{library_name}} )   ) {
-		$filePath = $libraries{$rh->{library_name}} .'/'. $filePath;
+	if (defined $libraries{ $rh->{library_name} }) {
+		$filePath = $libraries{ $rh->{library_name} } . '/' . $filePath;
 	} else {
-		$out->{error} = "Could not find library:".$rh->{library_name}.":";
-		return($out);
+		$out->{text} = "Could not find library: $rh->{library_name}.";
+		return $out;
 	}
-	warn "searching for file at $filePath";
 	if (-r $filePath) {
-		open IN, "<$filePath";
-		local($/)=undef;
-		my $text = <IN>;
-		$out->{text}= encode_utf8_base64($text);
-		my $sb=stat($filePath);
-		$out->{size}=$sb->size;
-		$out->{path}=$filePath;
-		$out->{permissions}=$sb->mode&07777;
-		$out->{modTime}=scalar localtime $sb->mtime;
-		close(IN);
+		open my $in, '<', $filePath;
+		local $/ = undef;
+		my $text = <$in>;
+		close $in;
+		my $sb = stat($filePath);
+		$out->{text}   = 'success';
+		$out->{ra_out} = {
+			text        => $text,
+			size        => $sb->size,
+			path        => $filePath,
+			permissions => $sb->mode & 777,
+			modTime     => scalar localtime $sb->mtime
+		};
 	} else {
-	    warn "Could not read file at |$filePath|";
-		$out->{error} = "Could not read file at |$filePath|";
+		$out->{text} = "Could not read file at |$filePath|";
 	}
-	return($out);
+	return $out;
 }
 
-use File::Find;
-#idea from http://www.perlmonks.org/index.pl?node=How%20to%20map%20a%20directory%20tree%20to%20a%20perl%20hash%20tree
+# Idea from http://www.perlmonks.org/index.pl?node=How%20to%20map%20a%20directory%20tree%20to%20a%20perl%20hash%20tree
 sub build_tree {
-    warn "entering build_tree with ",join(" ", @_);
-    my $node = $_[0] = {};
-    my @s;
-    find({wanted=>sub {
-      # fixed 'if' => 'while' -- thanks Rudif
-      unless ($File::Find::dir =~/.svn/ || $File::Find::name =~/.svn/) {
-      	$node = (pop @s)->[1] while @s and $File::Find::dir ne $s[-1][0];
-     	return $node->{$_} = -s if -f;
-      	push @s, [ $File::Find::name, $node ];
-      	$node = $node->{$_} = {};
-      }
-    }, follow_fast=>1}, $_[1]);
-    $_[0]{$_[1]} = delete $_[0]{'.'};
+	my ($dirPath) = @_;
+	my $tree      = {};
+	my $node      = $tree;
+	my @s;
+	find(
+		{
+			wanted => sub {
+				unless ($File::Find::dir =~ /.svn/ || $File::Find::name =~ /.svn/) {
+					$node = (pop @s)->[1] while @s and $File::Find::dir ne $s[-1][0];
+					return $node->{$_} = -s if -f;
+					push @s, [ $File::Find::name, $node ];
+					$node = $node->{$_} = {};
+				}
+			},
+			follow_fast => 1
+		},
+		$dirPath
+	);
+	return { $dirPath => $tree->{'.'} };
 }
 
 sub listLib {
-	my $self = shift;
-	my $rh = shift;
+	my ($invocant, $self, $rh) = @_;
 	my $out = {};
-	if ($rh->{library_name}=~ m|^/|) {
-		warn "double slash in library_name ", $rh->{library_name};
-		$rh->{library_name} =~ s|^/||;
-	}
-	my $dirPath = $self->ce->{courseDirs}{templates}."/".$rh->{library_name};
-	my $maxdepth= $rh->{maxdepth};
-	my $dirPath2 = $dirPath . ( ($rh->{dirPath}) ?  '/'.$rh->{dirPath}  : '' ) ;
-
+	$rh->{library_name} =~ s|^/||;
+	my $dirPath  = $self->ce->{courseDirs}{templates} . '/' . $rh->{library_name};
+	my $maxdepth = $rh->{maxdepth};
+	my $dirPath2 = $dirPath . (($rh->{dirPath}) ? '/' . $rh->{dirPath} : '');
 
-	my @tare = $dirPath2=~m|/|g;
-	my $tare = @tare;     # counts number of "/" in dirPath prefix
+	my @tare = $dirPath2 =~ m|/|g;
+	my $tare = @tare;                # counts number of '/' in dirPath prefix
 	my @outListLib;
 	my %libDirectoryList;
-	my $depthfinder = sub {   # counts depth below the current directory
-		my $path = shift;
-		my @count = $path=~m|/|g;
+	my $depthfinder = sub {          # counts depth below the current directory
+		my $path  = shift;
+		my @count = $path =~ m|/|g;
 		my $depth = @count;
 		return $depth - $tare;
 	};
-	my $wanted = sub {  # find .pg files
-		unless ($File::Find::dir =~/.svn/ ) {
+	my $wanted = sub {               # find .pg files
+		unless ($File::Find::dir =~ /.svn/) {
 			my $name = $File::Find::name;
-			if ($name =~/\S/ ) {
-				#$name =~ s|^$dirPath2/*||;  # cut the first directory
-				push(@outListLib, "$name") if $name =~/\.pg/;
-
+			if ($name =~ /\S/) {
+				push(@outListLib, $name) if $name =~ /\.pg/;
 			}
 		}
 	};
 
 	my $wanted_directory = sub {
-	    $File::Find::prune =1 if &$depthfinder($File::Find::dir) > $maxdepth;
-		unless ($File::Find::dir =~/.svn/ ) {
+		$File::Find::prune = 1 if &$depthfinder($File::Find::dir) > $maxdepth;
+		unless ($File::Find::dir =~ /.svn/) {
 			my $dir = $File::Find::dir;
-			if ($dir =~/\S/ ) {
-				$dir =~ s|^$dirPath2/*||;  # cut the first directory
+			if ($dir =~ /\S/) {
+				$dir =~ s|^$dirPath2/*||;    # cut the first directory
 
 				$libDirectoryList{$dir} = {};
 			}
@@ -212,128 +169,102 @@ sub listLib {
 
 	my $command = $rh->{command};
 
-	#warn "the command being executed is ' $command '";
 	$command = 'all' unless defined($command);
 
-		$command eq 'all' &&    do {
-									$out->{command}="all -- list all pg files in $dirPath";
-									find({wanted=>$wanted,follow_fast=>1 }, $dirPath);
-									@outListLib = sort @outListLib;
-									$out->{ra_out} = \@outListLib;
-									$out->{text} = encode_utf8_base64( join("\n", @outListLib) );
-									return($out);
-		};
-		$command eq 'dirOnly' &&   do {
-									if ( -e $dirPath2 and $dirPath2 !~ m|//|) {
-									    # it turns out that when // occur in path -e will work
-									    # but find will not :-(
-									    warn "begin find for $dirPath2";
-										find({wanted=>$wanted_directory,follow_fast=>1 }, $dirPath2);
-										#@outListLib = grep {/\S/} sort keys %libDirectoryList; #omit blanks
-										#foreach my $key (grep {/\S/} sort keys %libDirectoryList) {
-										#	push @outListLib, "$key"; # number of subnodes
-										#}
-										warn "find completed ";
-										warn "result: ", join(" ", %libDirectoryList);
-										delete $libDirectoryList{""};
-										$out->{ra_out} = \%libDirectoryList;
-										$out->{text} = encode_utf8_base64("Loaded libraries");
-										return($out);
-									} else {
-									   warn "Can't open directory  $dirPath2";
-									   $out->{error} = "Can't open directory  $dirPath2";
-									}
-		};
-#			 use File::Find::Rule;
-  			# find all the subdirectories of a given directory
-#   			my @subdirs = File::Find::Rule->directory->in( $dirPath );
-# 			$command eq 'dirOnly' && do {
-# 				my @subdirs = File::Find::Rule->directory->in( ($dirPath) );
-# 				$out->{ra_out} = \@subdirs;
-# 				$out->{text} = encode_utf8_base64("Loaded libraries".$dirPath);
-# 				return($out);
-# 			};
-		$command eq 'buildtree' &&   do {
-									#find({wanted=>$wanted_directory,follow_fast=>1 }, $dirPath);
-									warn "using build_tree with dirPath $dirPath";
-									build_tree(my $tree, $dirPath);
-									#@outListLib = sort keys %libDirectoryList;
-									$out->{ra_out} = $tree;
-									warn "output of build_tree is ", %$tree;
-									$out->{text} = encode_utf8_base64("Loaded libraries");
-									return($out);
-		};
+	$command eq 'all' && do {
+		$out->{command} = "all -- list all pg files in $dirPath";
+		find({ wanted => $wanted, follow_fast => 1 }, $dirPath);
+		@outListLib    = sort @outListLib;
+		$out->{ra_out} = \@outListLib;
+		$out->{text}   = join("\n", @outListLib);
+		return $out;
+	};
+	$command eq 'dirOnly' && do {
+		if (-e $dirPath2 && $dirPath2 !~ m|//|) {
+			# it turns out that when // occur in path -e will work
+			# but find will not :-(
+			find({ wanted => $wanted_directory, follow_fast => 1 }, $dirPath2);
+			delete $libDirectoryList{''};
+			$out->{ra_out} = \%libDirectoryList;
+			$out->{text}   = 'Loaded libraries';
+			return $out;
+		} else {
+			$out->{error} = "Can't open directory  $dirPath2";
+		}
+	};
+	$command eq 'buildtree' && do {
+		my $tree = build_tree($dirPath);
+		$out->{ra_out} = $tree;
+		$out->{text}   = 'Loaded libraries';
+		return $out;
+	};
 
-		$command eq 'files' && do {  @outListLib=();
-									 #my $separator = ($dirPath =~m|/$|) ?'' : '/';
-									 #my $dirPath2 = $dirPath . $separator . $rh->{dirPath};
-
-									 warn( "dirPath2 in files is: ", $dirPath2);
-									 if ( -e $dirPath2 and $dirPath2 !~ m|//| ) {
-										 find($wanted, $dirPath2);
-										 @outListLib = sort @outListLib;
-										 #$out ->{text} = encode_utf8_base64( join("", @outListLib ) );
-										 $out ->{text} = encode_utf8_base64( "Problems loaded" );
-										 $out->{ra_out} = \@outListLib;
-									 } else {
-									   warn "Can't open directory  $dirPath2 in listLib files";
-									   $out->{error} = "Can't open directory  $dirPath2";
-									 }
-									 return($out);
+	$command eq 'files' && do {
+		@outListLib = ();
 
-		};
-		# else
-	$out->{error}="Unrecognized command $command";
-	return( $out );
+		if (-e $dirPath2 and $dirPath2 !~ m|//|) {
+			find({ wanted => $wanted, follow_fast => 1 }, $dirPath2);
+			@outListLib    = sort @outListLib;
+			$out->{text}   = 'Problems loaded';
+			$out->{ra_out} = \@outListLib;
+		} else {
+			$out->{error} = "Can't open directory  $dirPath2";
+		}
+		return $out;
+	};
+
+	$out->{error} = "Unrecognized command $command";
+	return $out;
 }
 
-sub searchLib {    #API for searching the NPL database
-	my $self = shift;
-	my $rh = shift;
-	my $out = {};
-	my $ce = $self->ce;
+# API for searching the OPL database
+sub searchLib {
+	my ($invocant, $self, $rh) = @_;
+	my $out        = {};
+	my $ce         = $self->ce;
 	my $subcommand = $rh->{command};
-	if($rh->{library_levels}) {
-		$self->{level} = [split(//, $rh->{library_levels})];
+	if ($rh->{library_levels}) {
+		$self->{level} = [ split(//, $rh->{library_levels}) ];
 	}
 	'getDBTextbooks' eq $subcommand && do {
-		$self->{library_subjects} = $rh->{library_subjects};
-		$self->{library_chapters} = $rh->{library_chapters};
-		$self->{library_sections} = $rh->{library_sections};
+		$self->{library_subjects}    = $rh->{library_subjects};
+		$self->{library_chapters}    = $rh->{library_chapters};
+		$self->{library_sections}    = $rh->{library_sections};
 		$self->{library_textchapter} = $rh->{library_textchapter};
 		my @textbooks = WeBWorK::Utils::ListingDB::getDBTextbooks($self);
 		$out->{ra_out} = \@textbooks;
-		return($out);
+		return $out;
 	};
 	'getAllDBsubjects' eq $subcommand && do {
 		my @subjects = WeBWorK::Utils::ListingDB::getAllDBsubjects($self);
 		$out->{ra_out} = \@subjects;
-		$out->{text} = encode_utf8_base64("Subjects loaded.");
-		return($out);
+		$out->{text}   = 'Subjects loaded.';
+		return $out;
 	};
 	'getAllDBchapters' eq $subcommand && do {
 		$self->{library_subjects} = $rh->{library_subjects};
 		my @chaps = WeBWorK::Utils::ListingDB::getAllDBchapters($self);
 		$out->{ra_out} = \@chaps;
-        $out->{text} = encode_utf8_base64("Chapters loaded.");
+		$out->{text}   = 'Chapters loaded.';
 
-		return($out);
+		return $out;
 	};
 	'getDBListings' eq $subcommand && do {
 
 		my $templateDir = $self->ce->{courseDirs}->{templates};
-		$self->{library_subjects} = $rh->{library_subjects};
-		$self->{library_chapters} = $rh->{library_chapters};
-		$self->{library_sections} = $rh->{library_sections};
-		$self->{library_keywords} = $rh->{library_keywords};
-		$self->{library_textbook} = $rh->{library_textbook};
+		$self->{library_subjects}    = $rh->{library_subjects};
+		$self->{library_chapters}    = $rh->{library_chapters};
+		$self->{library_sections}    = $rh->{library_sections};
+		$self->{library_keywords}    = $rh->{library_keywords};
+		$self->{library_textbook}    = $rh->{library_textbook};
 		$self->{library_textchapter} = $rh->{library_textchapter};
 		$self->{library_textsection} = $rh->{library_textsection};
 		debug(to_json($rh));
 		my @listings = WeBWorK::Utils::ListingDB::getDBListings($self);
-		my @output = map {"$templateDir/".$_->{libraryroot}."/".$_->{path}."/".$_->{filename}} @listings;
+		my @output =
+			map { "$templateDir/" . $_->{libraryroot} . '/' . $_->{path} . '/' . $_->{filename} } @listings;
 		$out->{ra_out} = \@output;
-		return($out);
+		return $out;
 	};
 	'getSectionListings' eq $subcommand && do {
 		$self->{library_subjects} = $rh->{library_subjects};
@@ -342,168 +273,143 @@ sub searchLib {    #API for searching the NPL database
 
 		my @section_listings = WeBWorK::Utils::ListingDB::getAllDBsections($self);
 		$out->{ra_out} = \@section_listings;
-        $out->{text} = encode_utf8_base64("Sections loaded.");
+		$out->{text}   = 'Sections loaded.';
 
-		return($out);
+		return $out;
 	};
 
 	'countDBListings' eq $subcommand && do {
-		$self->{library_subjects} = $rh->{library_subjects};
-		$self->{library_chapters} = $rh->{library_chapters};
-		$self->{library_sections} = $rh->{library_sections};
-		$self->{library_keywords} = $rh->{library_keywords};
-		$self->{library_textbook} = $rh->{library_textbook};
+		$self->{library_subjects}    = $rh->{library_subjects};
+		$self->{library_chapters}    = $rh->{library_chapters};
+		$self->{library_sections}    = $rh->{library_sections};
+		$self->{library_keywords}    = $rh->{library_keywords};
+		$self->{library_textbook}    = $rh->{library_textbook};
 		$self->{library_textchapter} = $rh->{library_textchapter};
 		$self->{library_textsection} = $rh->{library_textsection};
+		$self->{includeOPL}          = $rh->{includeOPL};
+		$self->{includeContrib}      = $rh->{includeContrib};
 		my $count = WeBWorK::Utils::ListingDB::countDBListings($self);
-					$out->{text} = encode_utf8_base64("Count done.");
+		$out->{text}   = 'Count done.';
 		$out->{ra_out} = [$count];
-		return($out);
+		return $out;
 	};
 
-	#else (no match )
-	$out->{error}="Unrecognized command $subcommand";
-	return( $out );
+	$out->{error} = "Unrecognized command $subcommand";
+	return $out;
 }
 
 sub get_library_sets {
-	my $top = shift; my $dir = shift;
+	my ($top, $dir) = @_;
 	# ignore directories that give us an error
 	my @lis = eval { readDirectory($dir) };
 	if ($@) {
-		warn $@;
 		return (0);
 	}
-	return (0) if grep /^=library-ignore$/, @lis;
+	return 0 if grep {/^=library-ignore$/} @lis;
 
-	my @pgfiles = grep { m/\.pg$/ and (not m/(Header|-text)\.pg$/) and -f "$dir/$_"} @lis;
+	my @pgfiles = grep { m/\.pg$/ && !m/(Header|-text)\.pg$/ && -f "$dir/$_" } @lis;
 	my $pgcount = scalar(@pgfiles);
-	my $pgname = $dir; $pgname =~ s!.*/!!; $pgname .= '.pg';
-	my $combineUp = ($pgcount == 1 && $pgname eq $pgfiles[0] && !(grep /^=library-no-combine$/, @lis));
+	my $pgname  = $dir;
+	$pgname =~ s!.*/!!;
+	$pgname .= '.pg';
+	my $combineUp = ($pgcount == 1 && $pgname eq $pgfiles[0] && !(grep {/^=library-no-combine$/} @lis));
 
 	my @pgdirs;
-	my @dirs = grep {!$ignoredir{$_} and -d "$dir/$_"} @lis;
-	if ($top == 1) {@dirs = grep {!$problib{$_}} @dirs}
+	my @dirs = grep { !$ignoredir{$_} && -d "$dir/$_" } @lis;
+	if ($top == 1) {
+		@dirs = grep { !$problib{$_} } @dirs;
+	}
 	foreach my $subdir (@dirs) {
 		my @results = get_library_sets(0, "$dir/$subdir");
-		$pgcount += shift @results; push(@pgdirs,@results);
+		$pgcount += shift @results;
+		push(@pgdirs, @results);
 	}
 
-	return ($pgcount, @pgdirs) if $top || $combineUp || grep /^=library-combine-up$/, @lis;
-	return (0,@pgdirs,$dir);
+	return ($pgcount, @pgdirs) if $top || $combineUp || grep {/^=library-combine-up$/} @lis;
+	return (0, @pgdirs, $dir);
 }
 
-
 sub getProblemDirectories {
-
-	my $self = shift;
-	my $rh = shift;
+	my ($invocant, $self, $rh) = @_;
 	my $out = {};
-	my $ce = $self->ce;
+	my $ce  = $self->ce;
 
-	my %libraries = %{$self->ce->{courseFiles}->{problibs}};
+	my %libraries = %{ $self->ce->{courseFiles}{problibs} };
 
-	my $lib = "Library";
+	my $lib    = "Library";
 	my $source = $ce->{courseDirs}{templates};
-	my $main = MY_PROBLEMS; my $isTop = 1;
-	if ($lib) {$source .= "/$lib"; $main = MAIN_PROBLEMS; $isTop = 2}
+	my $main   = MY_PROBLEMS;
+	my $isTop  = 1;
+	if ($lib) { $source .= "/$lib"; $main = MAIN_PROBLEMS; $isTop = 2 }
 
 	my @all_problem_directories = get_library_sets($isTop, $source);
-	my $includetop = shift @all_problem_directories;
+	my $includetop              = shift @all_problem_directories;
 	my $j;
-	for ($j=0; $j<scalar(@all_problem_directories); $j++) {
+	for ($j = 0; $j < scalar(@all_problem_directories); $j++) {
 		$all_problem_directories[$j] =~ s|^$ce->{courseDirs}->{templates}/?||;
 	}
 	@all_problem_directories = sortByName(undef, @all_problem_directories);
-	unshift @all_problem_directories, $main if($includetop);
+	unshift @all_problem_directories, $main if ($includetop);
 
 	$out->{ra_out} = \@all_problem_directories;
-    $out->{text} = encode_utf8_base64("Problem Directories loaded.");
+	$out->{text}   = 'Problem Directories loaded.';
 
-	return($out);
+	return $out;
 }
 
-##
 #  This subroutines outputs the entire library based on Subjects, chapters and sections.
-#
 #  The output is an array in the form "Subject/Chapter/Section"
-##
-
 sub buildBrowseTree {
-	my $self = shift;
-	my $rh = shift;
-	my $out = {};
-	my $ce = $self->ce;
-	my @tree = ();
+	my ($invocant, $self, $rh) = @_;
+	my $out      = {};
+	my $ce       = $self->ce;
+	my @tree     = ();
 	my @subjects = WeBWorK::Utils::ListingDB::getAllDBsubjects($self);
 	foreach my $sub (@subjects) {
 		$self->{library_subjects} = $sub;
-		push(@tree,"Subjects/" . $sub);
+		push(@tree, "Subjects/" . $sub);
 		my @chapters = WeBWorK::Utils::ListingDB::getAllDBchapters($self);
-		foreach my $chap (@chapters){
+		foreach my $chap (@chapters) {
 			$self->{library_chapters} = $chap;
-			push(@tree, "Subjects/" .$sub . "/" . $chap);
+			push(@tree, "Subjects/" . $sub . "/" . $chap);
 			my @sections = WeBWorK::Utils::ListingDB::getAllDBsections($self);
-			foreach my $sect (@sections){
-				push(@tree, "Subjects/" .$sub . "/" . $chap . "/" . $sect);
+			foreach my $sect (@sections) {
+				push(@tree, "Subjects/" . $sub . "/" . $chap . "/" . $sect);
 			}
 		}
 	}
 	$out->{ra_out} = \@tree;
-	$out->{text} = encode_utf8_base64("Subjects, Chapters and Sections loaded.");
-	return($out);
+	$out->{text}   = 'Subjects, Chapters and Sections loaded.';
+	return $out;
 }
 
 sub getProblemTags {
-	my $self = shift;
-	my $rh = shift;
-	my $out = {};
+	my ($invocant, $self, $rh) = @_;
+	my $out  = {};
 	my $path = $rh->{command};
-        # Get a pointer to a hash of DBchapter, ..., DBsection
+	# Get a pointer to a hash of DBchapter, ..., DBsection
 	my $tags = WeBWorK::Utils::ListingDB::getProblemTags($path);
 	$out->{ra_out} = $tags;
-	$out->{text} = encode_utf8_base64("Tags loaded.");
+	$out->{text}   = 'Tags loaded.';
 
-	return($out);
+	return $out;
 }
 
+# FIXME: Why are library_subjects, library_chapters, library_sections plural?  Each has a value that is a single
+# subject, chapter, or section.  This is also done in many places above.
 sub setProblemTags {
-	my $self = shift;
-	my $rh = shift;
-	my $path = $rh->{command};
+	my ($invocant, $self, $rh) = @_;
+	my $path   = $rh->{command};
 	my $dbsubj = $rh->{library_subjects};
 	my $dbchap = $rh->{library_chapters};
 	my $dbsect = $rh->{library_sections};
-	my $level = $rh->{library_levels};
-	my $stat = $rh->{library_status};
+	my $level  = $rh->{library_levels};
+	my $stat   = $rh->{library_status};
 	# result is [success, message] with success = 0 or 1
 	my $result = WeBWorK::Utils::ListingDB::setProblemTags($path, $dbsubj, $dbchap, $dbsect, $level, $stat);
-	my $out = {};
-	$out->{text} = encode_utf8_base64($result->[1]);
-	return($out);
-}
-
-
-sub pretty_print_rh {
-	my $rh = shift;
-	my $out = "";
-	my $type = ref($rh);
-	if ( ref($rh) =~/HASH/ ) {
- 		foreach my $key (sort keys %{$rh})  {
- 			$out .= "  $key => " . pretty_print_rh( $rh->{$key} ) . "\n";
- 		}
-	} elsif ( ref($rh) =~ /SCALAR/ ) {
-		$out = "scalar reference ". ${$rh};
-	} elsif ( ref($rh) =~/Base64/ ) {
-		$out .= "base64 reference " .$$rh;
-	} else {
-		$out =  $rh;
-	}
-	if (defined($type) ) {
-		$out .= "type = $type \n";
-	}
+	my $out    = {};
+	$out->{text} = $result->[1];
 	return $out;
 }
 
-
 1;
diff --git a/lib/WebworkWebservice/MathTranslators.pm b/lib/WebworkWebservice/MathTranslators.pm
deleted file mode 100644
index ad4889a4dc..0000000000
--- a/lib/WebworkWebservice/MathTranslators.pm
+++ /dev/null
@@ -1,207 +0,0 @@
-#!/usr/local/bin/perl -w
-
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-###############################################################################
-# Web service which translates TeX to pdf or to HTML
-###############################################################################
-
-#use lib '/home/gage/webwork/pg/lib';
-#use lib '/home/gage/webwork/webwork-modperl/lib';
-
-package WebworkWebservice::MathTranslators;
-use WebworkWebservice;
-use base qw(WebworkWebservice);
-
-use strict;
-use sigtrap;
-use Carp;
-use WWSafe;
-#use Apache;
-use WeBWorK::PG::Translator;
-use WeBWorK::PG::IO;
-use Benchmark;
-use MIME::Base64 qw( encode_base64 decode_base64);
-
-
-
-our $WW_DIRECTORY = $WebworkWebservice::WW_DIRECTORY;
-our $PG_DIRECTORY = $WebworkWebservice::PG_DIRECTORY;
-our $COURSENAME   = $WebworkWebservice::COURSENAME;
-our $HOST_NAME    = $WebworkWebservice::HOST_NAME;
-
-our $ce           =$WebworkWebservice::SeedCE;
-# create a local course environment for some course
-    $ce           = WeBWorK::CourseEnvironment->new({webwork_dir=>$WW_DIRECTORY, courseName=> $COURSENAME});
-
-
-
-my $debugOn 	=	1;
-my $PASSWORD 	= 	$WebworkWebservice::PASSWORD;
-
-
-my $TEMPDIRECTORY 				= 	$ce->{webworkDirs}->{htdocs_temp};
-my $TEMP_BASE_URL 				= 	$ce->{webworkURLs}->{htdocs_temp};
-my $externalLatexPath 			= 	$ce->{externalPrograms}->{latex};
-# my $externalDvipsPath 			= 	$Global::externalDvipsPath;
-my $externalpdflatexPath 		= 	$ce->{externalPrograms}->{pdflatex};;
-# my $externalGsPath 				= 	$Global::externalGsPath;
-
-
-# variables formerly set in Global
-	$Global::tmp_directory_permission = 0775;
-	$Global::numericalGroupID='100';  # group ID for wwdev
-
-my $tmp_directory_permission 	= 	$Global::tmp_directory_permission;
-my $numericalGroupID			=	$Global::numericalGroupID;  # group ID for webadmin
-
-sub tex2pdf {
-	my $self    =   shift;
-	my $rh 		= 	shift;
-	local($|)	=	1;
-	my $out 	= 	{};
-	unless ($rh->{pw} eq $PASSWORD ) { #FIXME pw is deprecated  use site_password instead?
-		$out->{error}	=	404;
-		return($out);
-	}
-	#obtain the path to the file
-	my $filePath 		= 	$rh->{fileName};
-	my @pathElements 	= 	split("/", $filePath);
-
-	# grab the last element as the fileName
-	#remove the extension from the file name
-	my $fileName 	= 	pop @pathElements;
- 	$fileName 		=~ 	s/\.pg$//;
-
- 	#Create the full url and the full directory path -- If pathElements is empty this can give an extra //? Should I worry? maybe
-	my $url 			 = 	$TEMP_BASE_URL. join("/",@pathElements);
-	$url				.= 	'/' unless $url =~ m|/$|;   # only add / if it is needed.
-	$url				.= 	"$fileName.pdf";
-	my $texFileBasePath  = 	$TEMPDIRECTORY.join("/",@pathElements);
-	$texFileBasePath 	.=	'/' unless $texFileBasePath =~ m|/$|;
-	$texFileBasePath 	.= "$fileName";
-
-	# create the intermediate directories if they don't exists
-	# create a dummy .pdf file
-	surePathToTmpFile2($texFileBasePath.'.pdf');
-#	my $filePermission = '0775';
-#	chmod("$filePermission","$texFileBasePath.pdf")
-#	     or die "Can't change file permissions on $texFileBasePath.pdf to $filePermission";
-
-	# Decode and cleanup the tex string
-	my $texString = decode_base64(  $rh->{'texString'});
-	#Make sure the line endings are correct
-	$texString=~s/\r\n/\n/g;
-	$texString=~s/\r/\n/g;
-
-	# Make sure that TeX is run in batchmode so that the tex program doesn't hang on errors
-	$texString = "\\batchmode\n".$texString;  # force errors to log.
-
-	# Remove any old files
-	unlink("$texFileBasePath.tex","$texFileBasePath.dvi","$texFileBasePath.log","$texFileBasePath.aux",
-	       "$texFileBasePath.ps","$texFileBasePath.pdf");
-	# Create the texfile of the problem.
-	local(*TEX);
-	open(TEX,"> $texFileBasePath.tex") or die "Can't open $texFileBasePath.tex to store tex code";
-	local($/)=undef;
-	print TEX $texString;
-	close(TEX);
-
-
-	# my $dviCommandLine = "$externalLatexPath $texFileBasePath.tex";# >/dev/null 2>/dev/null";
-	# my $psCommandLine = "$externalDvipsPath -o $texFileBasePath.ps $texFileBasePath.dvi >/dev/null";# 2>/dev/null";
-	# my $pdfCommandLine = "$externalGsPath -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$texFileBasePath.pdf -c save pop -f $texFileBasePath.ps";
-	# print "dviCommandLine:  $dviCommandLine\n";
-	# print "psCommandLine:   $psCommandLine\n";
-	# print "pdfCommandLine:  $pdfCommandLine\n";
-    #print "execute pdflatex", `$externalpdflatexPath $texFileBasePath.tex`, "\n";
-    #print "done $externalpdflatexPath   $texFileBasePath.tex\n";
-	# Change to the working directory and create the pdf files.
-	my $wd = $TEMPDIRECTORY.join("/",@pathElements); # working directory
-	# print "---cd $wd &&  $externalpdflatexPath $fileName.tex\n";
-
-	system "cd $wd &&  $externalpdflatexPath $fileName.tex >>$fileName.log";
-	chmod 0777, "$texFileBasePath.pdf";
-	unless ($debugOn) {
-		unlink("$texFileBasePath.tex","$texFileBasePath.log","$texFileBasePath.aux",
-	       );
-	}
- 	return({pdfURL => $url});
-
-
-
-
-}
-
-sub surePathToTmpFile2 {  # constructs intermediate directories if needed beginning at ${Global::htmlDirectory}tmp/
-               # the input path must be either the full path, or the path relative to this tmp sub directory
-         my $path      = shift;
-         my $delim    = getDirDelim();
-         my $tmpDirectory = $TEMPDIRECTORY;
-    # if the path starts with $tmpDirectory (which is permitted but optional) remove this initial segment
-    print "Original path $path\n";
-        $path =~ s|^$tmpDirectory|| if $path =~ m|^$tmpDirectory|;
-        $path = convertPath($path);
-        print "Creating path to $path using $delim\n";
-    # find the nodes on the given path
-        my @nodes     = split("$delim",$path);
-    # create new path
-        $path   = convertPath("$tmpDirectory");
-		print  "Creating path: $path\n ";
-        while (@nodes>1 ) {
-
-            $path = convertPath($path . shift (@nodes) ."/");
-            print  "Creating path: $path\n ";
-            unless (-e $path) {
-            #   system("mkdir $path");
-                createDirectory($path,$tmp_directory_permission, $numericalGroupID) ||
-                die "Failed to create directory $path";
-
-            }
-
-        }
-        $path = convertPath($path . shift(@nodes));
-        print  "Creating path: $path\n ";
-       # system(qq!echo "" > $path! );
-
-$path;
-
-}
-
-
-sub pretty_print_rh {
-	my $rh = shift;
-	my $out = "";
-	my $type = ref($rh);
-	if ( ref($rh) =~/HASH/ ) {
- 		foreach my $key (sort keys %{$rh})  {
- 			$out .= "  $key => " . pretty_print_rh( $rh->{$key} ) . "\n";
- 		}
-	} elsif ( ref($rh) =~ /SCALAR/ ) {
-		$out = "scalar reference ". ${$rh};
-	} elsif ( ref($rh) =~/Base64/ ) {
-		$out .= "base64 reference " .$$rh;
-	} else {
-		$out =  $rh;
-	}
-	if (defined($type) ) {
-		$out .= "type = $type \n";
-	}
-	return $out;
-}
-
-
-1;
diff --git a/lib/WebworkWebservice/ProblemActions.pm b/lib/WebworkWebservice/ProblemActions.pm
index 003defd791..8f80e35782 100644
--- a/lib/WebworkWebservice/ProblemActions.pm
+++ b/lib/WebworkWebservice/ProblemActions.pm
@@ -1,8 +1,6 @@
-#!/usr/local/bin/perl -w
-
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -15,135 +13,132 @@
 # Artistic License for more details.
 ################################################################################
 
-
-###############################################################################
 # Web service which manipulates problems and user problems.
-###############################################################################
-
 package WebworkWebservice::ProblemActions;
-use WebworkWebservice;
-use base qw(WebworkWebservice);
 
 use strict;
 use warnings;
-use sigtrap;
 
-use WeBWorK::Utils qw(encode_utf8_base64);
-use WeBWorK::Debug qw(debug);
-use WeBWorK::CourseEnvironment;
+use Data::Structure::Util qw(unbless);
 
-###############################################################################
-# Obtain basic information about directories, course name and host
-###############################################################################
-our $WW_DIRECTORY = $WebworkWebservice::WW_DIRECTORY;
-our $PG_DIRECTORY = $WebworkWebservice::PG_DIRECTORY;
-our $COURSENAME   = $WebworkWebservice::COURSENAME;
-our $HOST_NAME    = $WebworkWebservice::HOST_NAME;
-our $PASSWORD     = $WebworkWebservice::PASSWORD;
-our $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $WW_DIRECTORY, courseName => $COURSENAME });
-
-our $UNIT_TESTS_ON = 0;
+use WeBWorK::PG::Tidy qw(pgtidy);
 
 sub getUserProblem {
-	debug("in getUserProblem");
-	my ($self, $params) = @_;
-	my $db = $self->db;
+	my ($invocant, $self, $params) = @_;
 
-	my $userID = $params->{id};
-	my $setID = $params->{set_id};
-	my $problemID = $params->{problem_id};
+	my $db = $self->db;
 
-	my $userProblem = $db->getUserProblem($userID, $setID, $problemID);
+	my $userProblem = $db->getUserProblem($params->{user_id}, $params->{set_id}, $params->{problem_id});
 
 	return {
-		ra_out => $userProblem,
-		text => encode_utf8_base64(
-			"Loaded problem $problemID of set $setID for user $userID in course $self->{courseName}.")
+		ra_out => unbless($userProblem),
+		text   => "Loaded problem $params->{problem_id} of set $params->{set_id} for "
+			. "user $params->{user_id} in course "
+			. $self->ce->{courseName} . '.'
 	};
 }
 
 sub putUserProblem {
-	debug("in putUserProblem");
-	my ($self, $params) = @_;
-	my $db = $self->db;
-
-	my $userID = $params->{id};
-	my $setID = $params->{set_id};
-	my $problemID = $params->{problem_id};
+	my ($invocant, $self, $params) = @_;
 
-	my $userProblem;
-	$userProblem = $db->getUserProblem($userID, $setID, $problemID);
-	if (!$userProblem) { return { text => encode_utf8_base64("User problem not found.") }; }
+	my $db = $self->db;
 
-	for ('source_file', 'value', 'max_attempts', 'showMeAnother', 'showMeAnotherCount', 'prPeriod',
-		'prCount', 'problem_seed', 'status', 'attempted', 'last_answer', 'num_correct', 'num_incorrect',
-		'att_to_open_children', 'counts_parent_grade', 'sub_status', 'flags') {
+	my $userProblem = $db->getUserProblem($params->{user_id}, $params->{set_id}, $params->{problem_id});
+	if (!$userProblem) { return { text => 'User problem not found.' }; }
+
+	for (
+		'source_file',        'value',                'max_attempts',        'showMeAnother',
+		'showMeAnotherCount', 'prPeriod',             'prCount',             'problem_seed',
+		'status',             'attempted',            'last_answer',         'num_correct',
+		'num_incorrect',      'att_to_open_children', 'counts_parent_grade', 'sub_status',
+		'flags'
+		)
+	{
 		$userProblem->{$_} = $params->{$_} if defined($params->{$_});
 	}
 
 	eval { $db->putUserProblem($userProblem) };
-	if ($@) { return { text => encode_utf8_base64("putUserProblem: " . $@) }; }
+	if ($@) { return { text => "putUserProblem: $@" }; }
 
 	return {
-		ra_out => $userProblem,
-		text => encode_utf8_base64(
-			"Updated problem $problemID of $setID for user $userID in course $self->{courseName}.")
+		ra_out => unbless($userProblem),
+		text   => "Updated problem $params->{problem_id} of $params->{set_id} for "
+			. "user $params->{user_id} in course "
+			. $self->ce->{courseName} . '.'
 	};
 }
 
 sub putProblemVersion {
-	debug("in putProblemVersion");
-	my ($self, $params) = @_;
-	my $db = $self->db;
-
-	my $userID = $params->{id};
-	my $setID = $params->{set_id};
-	my $versionID = $params->{version_id};
-	my $problemID = $params->{problem_id};
+	my ($invocant, $self, $params) = @_;
 
-	my $problemVersion = $db->getProblemVersion($userID, $setID, $versionID, $problemID);
-	if (!$problemVersion) { return { text => encode_utf8_base64("Problem version not found.") }; }
+	my $db = $self->db;
 
-	for ('source_file', 'value', 'max_attempts', 'showMeAnother', 'showMeAnotherCount', 'prPeriod',
-		'prCount', 'problem_seed', 'status', 'attempted', 'last_answer', 'num_correct', 'num_incorrect',
-		'att_to_open_children', 'counts_parent_grade', 'sub_status', 'flags') {
+	my $problemVersion =
+		$db->getProblemVersion($params->{user_id}, $params->{set_id}, $params->{version_id}, $params->{problem_id});
+	if (!$problemVersion) { return { text => 'Problem version not found.' }; }
+
+	for (
+		'source_file',        'value',                'max_attempts',        'showMeAnother',
+		'showMeAnotherCount', 'prPeriod',             'prCount',             'problem_seed',
+		'status',             'attempted',            'last_answer',         'num_correct',
+		'num_incorrect',      'att_to_open_children', 'counts_parent_grade', 'sub_status',
+		'flags'
+		)
+	{
 		$problemVersion->{$_} = $params->{$_} if defined($params->{$_});
 	}
 
 	eval { $db->putProblemVersion($problemVersion) };
-	if ($@) { return { text => encode_utf8_base64("putProblemVersion: " . $@) }; }
+	if ($@) { return { text => "putProblemVersion: $@" }; }
 
 	return {
-		ra_out => $problemVersion,
-		text => encode_utf8_base64(
-			"Updated problem $problemID of $setID,v$versionID for user $userID in course $self->{courseName}.")
+		ra_out => unbless($problemVersion),
+		text   => "Updated problem $params->{problem_id} of $params->{set_id},v$params->{version_id} "
+			. "for user $params->{user_id} in course "
+			. $self->ce->{courseName} . '.'
 	};
 }
 
 sub putPastAnswer {
-	debug("in putPastAnswer");
-	my ($self, $params) = @_;
-	my $db = $self->db;
+	my ($invocant, $self, $params) = @_;
 
-	my $answerID = $params->{answer_id};
+	my $db = $self->db;
 
-	my $pastAnswer = $db->getPastAnswer($answerID);
-	if (!$pastAnswer) { return { text => encode_utf8_base64("Past answer not found.") }; }
+	my $pastAnswer = $db->getPastAnswer($params->{answer_id});
+	if (!$pastAnswer) { return { text => 'Past answer not found.' }; }
 
-	$pastAnswer->{user_id} = $params->{id} if $params->{id};
+	$pastAnswer->{user_id} = $params->{user_id} if $params->{user_id};
 
 	for ('set_id', 'problem_id', 'source_file', 'timestamp', 'scores', 'answer_string', 'comment_string') {
 		$pastAnswer->{$_} = $params->{$_} if defined($params->{$_});
 	}
 
 	eval { $db->putPastAnswer($pastAnswer) };
-	if ($@) { return { text => encode_utf8_base64("putPastAnswer " . $@) }; }
+	if ($@) { return { text => "putPastAnswer $@" }; }
+
+	return {
+		ra_out => unbless($pastAnswer),
+		text   =>
+			"Updated answer $params->{answer_id} for problem $pastAnswer->{problem_id} of $pastAnswer->{set_id} "
+			. "for user $pastAnswer->{user_id} in course "
+			. $self->ce->{courseName} . '.'
+	};
+}
+
+sub tidyPGCode {
+	my ($invocant, $self, $params) = @_;
+
+	local @ARGV = ();
+
+	my $code = $params->{pgCode};
+	my $tidiedPGCode;
+	my $errors;
+
+	my $result = pgtidy(source => \$code, destination => \$tidiedPGCode, errorfile => \$errors);
 
 	return {
-		ra_out => $pastAnswer,
-		text => encode_utf8_base64(
-			"Updated answer $answerID for problem $pastAnswer->{problem_id} of $pastAnswer->{set_id} " .
-			"for user $pastAnswer->{user_id} in course $self->{courseName}.")
+		ra_out => { tidiedPGCode => $tidiedPGCode, status => $result, errors => $errors },
+		text   => 'Tidied code'
 	};
 }
 
diff --git a/lib/WebworkWebservice/RenderProblem.pm b/lib/WebworkWebservice/RenderProblem.pm
index a75f5aa522..ac2f5ef6ab 100644
--- a/lib/WebworkWebservice/RenderProblem.pm
+++ b/lib/WebworkWebservice/RenderProblem.pm
@@ -1,8 +1,6 @@
-#!/usr/local/bin/perl -w
-
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -16,179 +14,65 @@
 ################################################################################
 
 package WebworkWebservice::RenderProblem;
-use WebworkWebservice;
-use base qw(WebworkWebservice);
-
-my $debugXmlCode=0;  # turns on the filter for debugging XMLRPC and SOAP code
-local(*DEBUGCODE);
 
 use strict;
-use sigtrap;
-use Carp;
-use WWSafe;
+use warnings;
+
+use Future::AsyncAwait;
+use Benchmark;
+use Mojo::Util qw(url_unescape);
+
 use WeBWorK::Debug;
 use WeBWorK::CourseEnvironment;
-use WeBWorK::PG::Translator;
-use WeBWorK::PG::Local;
+use WeBWorK::PG;
 use WeBWorK::DB;
-use WeBWorK::Constants;
-use WeBWorK::Utils qw(runtime_use formatDateTime makeTempDirectory encode_utf8_base64 decode_utf8_base64);
-use WeBWorK::DB::Utils qw(global2user user2global);
+use WeBWorK::Utils qw(decode_utf8_base64);
+use WeBWorK::Utils::Rendering qw(renderPG);
+use WeBWorK::DB::Utils qw(global2user);
 use WeBWorK::Utils::Tasks qw(fake_set fake_problem);
-use WeBWorK::PG::IO;
-use WeBWorK::PG::ImageGenerator;
-use Encode qw(encode);
-use Benchmark;
 
-#print "rereading Webwork\n";
+our $UNIT_TESTS_ON = 0;
 
+async sub renderProblem {
+	my ($invocant, $ws) = @_;
 
-our $WW_DIRECTORY = $WebworkWebservice::WW_DIRECTORY;
-our $PG_DIRECTORY = $WebworkWebservice::PG_DIRECTORY;
-our $COURSENAME   = $WebworkWebservice::COURSENAME;
-our $PROTOCOL     = $WebworkWebservice::PROTOCOL;
-our $HOST_NAME    = $WebworkWebservice::HOST_NAME;
-our $PORT         = $WebworkWebservice::HOST_PORT;
-our $HOSTURL      = "$PROTOCOL://$HOST_NAME:$PORT";
+	my $rh = $ws->{inputs_ref};
 
+	# $WeBWorK::Debug::Enabled needs to be checked, otherwise pretty_print_rh($rh) is called regardless of if debgging
+	# is enabled.  That is an expensive method to always call here.
+	debug(pretty_print_rh($rh)) if $WeBWorK::Debug::Enabled;
 
-our $UNIT_TESTS_ON =0;
-#
-# #our $ce           = $WebworkWebservice::SeedCE;
-# # create a local course environment for some course
-# our $ce           = WeBWorK::CourseEnvironment->new(
-#                 {webwork_dir=> $WW_DIRECTORY,  courseName=>$COURSENAME}
-#     );
-#     $ce->{apache_root_url} = $HOSTURL;
-# #print "\$ce = \n", WeBWorK::Utils::pretty_print_rh($ce);
-#
-#
-# #other services
-# # File variables
-# #our $WARNINGS='';
-#
-#
-# # imported constants
-#
-# my $COURSE_TEMP_DIRECTORY 	= 	$ce->{courseDirs}->{html_tmp};
-# my $COURSE_TEMP_URL 		= 	$HOSTURL.$ce->{courseURLs}->{html_tmp};
-#
-# my $pgMacrosDirectory 		= 	$ce->{pg_dir}.'/macros/';
-# my $macroDirectory			=	$ce->{courseDirs}->{macros}.'/';
-# my $templateDirectory		= 	$ce->{courseDirs}->{templates};
-#
-# my %PG_environment          =   $ce->{pg}->{specialPGEnvironmentVars};
-#
+	my $problemSeed = $rh->{problemSeed} // '1234';
 
-use constant DISPLAY_MODES => {
-	# display name   # mode name
-	tex           => "TeX",
-	plainText     => "HTML",
-	images        => "HTML_dpng",
-	MathJax	      => "HTML_MathJax",
-	PTX           => "PTX",
-};
-
-use constant DISPLAY_MODE_FAILOVER => {
-		TeX            => [],
-		HTML           => [],
-		HTML_dpng      => [ "HTML", ],
-		HTML_MathJax   => [ "HTML_dpng", "HTML", ],
-		PTX            => [ "HTML" ],
-		# legacy modes -- these are not supported, but some problems might try to
-		# set the display mode to one of these values manually and some macros may
-		# provide rendered versions for these modes but not the one we want.
-		HTML_img    => [ "HTML_dpng", "HTML", ],
-};
-
-sub renderProblem {
-	my $self = shift;
-	my $rh = shift;
+	my $beginTime = Benchmark->new;
 
-	# sanity check
-	my $user_id      = $self->{user_id};
-	my $courseName   = $self->{courseName};
-	my $displayMode  = $rh->{envir}->{displayMode};
-	my $problemSeed  = $rh->{envir}->{problemSeed};
-	debug(WebworkWebservice::pretty_print_rh($rh));
-
-	unless ($user_id && $courseName && $displayMode && defined($problemSeed)) {
-		die( "\n\n\nMissing essential data entering WebworkWebservice::RenderProblem::renderProblem:
-			userID: |$user_id|, courseName: |$courseName|,
-			displayMode: |$displayMode|, problemSeed: |$problemSeed|");
-		return;
-	}
+	my $ce = $ws->ce;
+	my $db = $ws->db;
 
-	# Grab the course name, if this request is going to depend on
-	# some course other than the default course
-	my $ce;
-	my $db;
-	my $beginTime = new Benchmark;
-
-	# It's better not to get the course in too many places. :-)
-	# High level information about the course should come from $self
-	# Lower level information should come from $rh (i.e. passed by $in at WebworkWebservice)
-
-	#FIXME  put in check to make sure the course exists.
-	eval {
-		$ce = WeBWorK::CourseEnvironment->new({webwork_dir=>$WW_DIRECTORY, courseName=> $courseName});
-		$ce->{apache_root_url}= $HOSTURL;
-		# Create database object for this course
-		$db = WeBWorK::DB->new($ce->{dbLayout});
-	};
-
-	warn "Unable to create course $courseName. Error: $@" if $@;
-
-	my $user;
-	if (defined $self->{user_id}) {
-		$user = $self->{user_id};
-	} else {
-		warn "RenderProblem.pm:  user_id is not defined userID is = ", $self->{userID};
-	}
-
-	# Authentication of this request and permission level determination is done by initiate in WebworkWebservice.
-
-	# set up warning handler
-	my $warning_messages = "";
-
-	my $warning_handler = sub {
-		my ($warning) = @_;
-		CORE::warn $warning;
-		chomp $warning;
-		$warning_messages .= "$warning\n";
-	};
-
-	local $SIG{__WARN__} = $warning_handler;
-
-	# Determine an effective user for this interaction
-	# or create one if it is not given
-	# In order: use effectiveUserName, studentLogin, or user  or 'foobar'
+	# Determine an effective user for this interaction or create one if it is not given.
+	# Use effectiveUser if given, and $rh->{user} otherwise.
 	my $effectiveUserName;
-	if (defined($rh->{effectiveUser}) and $rh->{effectiveUser} =~ /\S/) {
+	if (defined $rh->{effectiveUser} && $rh->{effectiveUser} =~ /\S/) {
 		$effectiveUserName = $rh->{effectiveUser};
-	} elsif (defined($rh->{envir}->{studentLogin}) and $rh->{envir}->{studentLogin} =~ /\S/ ) {
-		$effectiveUserName = $rh->{envir}->{studentLogin};
-	} elsif (defined($user) and $user =~ /\S/ ) {
-		$effectiveUserName = $user;
 	} else {
-		$effectiveUserName = 'foobar';
+		$effectiveUserName = $rh->{user};
 	}
 
 	if ($UNIT_TESTS_ON) {
-		print STDERR "RenderProblem.pm:  user = $user\n";
-		print STDERR "RenderProblem.pm:  courseName = $courseName\n";
+		print STDERR "RenderProblem.pm:  user = $rh->{user}\n";
+		print STDERR "RenderProblem.pm:  courseName = $rh->{courseID}\n";
 		print STDERR "RenderProblem.pm:  effectiveUserName = $effectiveUserName\n";
-		print STDERR "environment fileName", $rh->{envir}->{fileName},"\n";
+		print STDERR 'environment fileName', $rh->{fileName}, "\n";
 	}
 
 	# The effectiveUser is the student this problem version was written for
 	# The user might also be the effective user but it could be
 	# an instructor checking out how well the problem is working.
 
-	my $effectiveUser = $db->getUser($effectiveUserName); # checked
+	my $effectiveUser = $db->getUser($effectiveUserName);
 	my $effectiveUserPermissionLevel;
 	my $effectiveUserPassword;
-	unless (defined $effectiveUser ) {
+	unless (defined $effectiveUser) {
 		$effectiveUser                = $db->newUser;
 		$effectiveUserPermissionLevel = $db->newPermissionLevel;
 		$effectiveUserPassword        = $db->newPassword;
@@ -196,49 +80,42 @@ sub renderProblem {
 		$effectiveUserPermissionLevel->user_id($effectiveUserName);
 		$effectiveUserPassword->user_id($effectiveUserName);
 		$effectiveUserPassword->password('');
-		$effectiveUser->last_name($rh->{envir}->{studentName}|| 'foobar');
+		$effectiveUser->last_name($rh->{studentName} || 'foobar');
 		$effectiveUser->first_name('');
-		$effectiveUser->student_id($rh->{envir}->{studentID}|| 'foobar');
-		$effectiveUser->email_address($rh->{envir}->{email}|| '');
-		$effectiveUser->section($rh->{envir}->{section} ||'');
-		$effectiveUser->recitation($rh->{envir}->{recitation} ||'');
+		$effectiveUser->student_id($rh->{studentID}  || 'foobar');
+		$effectiveUser->email_address($rh->{email}   || '');
+		$effectiveUser->section($rh->{section}       || '');
+		$effectiveUser->recitation($rh->{recitation} || '');
 		$effectiveUser->comment('');
 		$effectiveUser->status('C');
 		$effectiveUserPermissionLevel->permission(0);
 	}
-	#FIXME  these will fail if the keys are not defined within the environment.
 
-	# Insure that set and problem are defined
-	# Define the set and problem information from
-	# data in the environment if necessary
-	my $setName = (defined($rh->{set_id})) ? $rh->{set_id} :
-		(defined($rh->{envir}->{setNumber}) ? $rh->{envir}->{setNumber}  : '');
+	# Insure that set and problem are defined.  Define the set and problem information from data in the environment if
+	# necessary.
+	my $setName = $rh->{set_id} // $rh->{setNumber} // '';
 
 	my $setVersionId = $rh->{version_id} || 0;
 
-	my $problemNumber =  (defined($rh->{envir}->{probNum})   )    ? $rh->{envir}->{probNum}      : 1 ;
-	my $psvn          =  (defined($rh->{envir}->{psvn})      )    ? $rh->{envir}->{psvn}         : 1234 ;
-	my $problemStatus =  $rh->{problem_state}->{recorded_score}|| 0 ;
-	my $problemValue  =  (defined($rh->{envir}->{problemValue}))   ? $rh->{envir}->{problemValue}  : 1 ;
-	my $num_correct   =  $rh->{problem_state}->{num_correct}   || 0 ;
-	my $num_incorrect =  $rh->{problem_state}->{num_incorrect} || 0 ;
-	my $problemAttempted = ($num_correct || $num_incorrect);
+	my $problemNumber = $rh->{probNum}      // 0;
+	my $psvn          = $rh->{psvn}         // 1234;
+	my $problemValue  = $rh->{problemValue} // 1;
 	my $lastAnswer    = '';
 
-	debug("effectiveUserName: " . $effectiveUserName);
-	debug("setName: " . $setName);
-	debug("setVersionId: " . $setVersionId);
-	debug("problemNumber: ". $problemNumber);
-	debug("problemSeed:" . $problemSeed);
-	debug("psvn: " . $psvn);
-	debug("problemStatus:" . $problemStatus);
-	debug("problemValue: " . $problemValue);
+	debug('effectiveUserName: ' . $effectiveUserName);
+	debug('setName: ' . $setName);
+	debug('setVersionId: ' . $setVersionId);
+	debug('problemNumber: ' . $problemNumber);
+	debug('problemSeed:' . $problemSeed);
+	debug('psvn: ' . $psvn);
+	debug('problemValue: ' . $problemValue);
 
-	my $setRecord = $setVersionId
+	my $setRecord =
+		$setVersionId
 		? $db->getMergedSetVersion($effectiveUserName, $setName, $setVersionId)
 		: $db->getMergedSet($effectiveUserName, $setName);
 
-	if (defined($setRecord) and ref($setRecord)) {
+	if (defined $setRecord && ref $setRecord) {
 		# If an actual set from the database is used, the passed in psvn is ignored.
 		# So save the actual psvn used and pass that on to the renderer.
 		$psvn = $setRecord->psvn;
@@ -247,28 +124,30 @@ sub renderProblem {
 		# then we check the Global Set
 		# if that does not exist we create a fake set
 		# if it does, we add fake user data
-		my $userSetClass = $db->{set_user}->{record};
-		my $globalSet = $db->getGlobalSet($setName); # checked
+		my $userSetClass = $db->{set_user}{record};
+		my $globalSet    = $db->getGlobalSet($setName);
 
-		if (not defined $globalSet) {
+		if (!defined $globalSet) {
 			$setRecord = fake_set($db);
 		} else {
 			$setRecord = global2user($userSetClass, $globalSet);
 		}
-		# initializations
+
+		# Initializations
 		$setRecord->set_id($setName);
-		$setRecord->set_header("");
-		$setRecord->hardcopy_header("defaultHeader");
-		$setRecord->open_date(time()-60*60*24*7); #  one week ago
-		$setRecord->due_date(time()+60*60*24*7*2); # in two weeks
-		$setRecord->answer_date(time()+60*60*24*7*3); # in three weeks
-		$setRecord->psvn($rh->{envir}->{psvn}||0);
+		$setRecord->set_header('');
+		$setRecord->hardcopy_header('defaultHeader');
+		$setRecord->open_date(time - 60 * 60 * 24 * 7);          #  one week ago
+		$setRecord->due_date(time + 60 * 60 * 24 * 7 * 2);       # in two weeks
+		$setRecord->answer_date(time + 60 * 60 * 24 * 7 * 3);    # in three weeks
+		$setRecord->psvn($rh->{psvn} // 1234);
 	}
 
 	# obtain the merged problem for $effectiveUser
-	my $problemRecord = $setVersionId
-		? $db->getMergedProblemVersion($effectiveUserName, $setName, $setVersionId, $problemNumber)
-		: $db->getMergedProblem($effectiveUserName, $setName, $problemNumber);
+	my $problemRecord =
+		!$problemNumber ? undef
+		: $setVersionId ? $db->getMergedProblemVersion($effectiveUserName, $setName, $setVersionId, $problemNumber)
+		:                 $db->getMergedProblem($effectiveUserName, $setName, $problemNumber);
 
 	if (defined $problemRecord) {
 		# If a problem from the database is used, the passed in problem seed is ignored.
@@ -277,10 +156,10 @@ sub renderProblem {
 	} else {
 		# If that is not yet defined obtain the global problem,
 		# convert it to a user problem, and add fake user data
-		my $userProblemClass = $db->{problem_user}->{record};
-		my $globalProblem = $db->getGlobalProblem($setName, $problemNumber); # checked
+		my $userProblemClass = $db->{problem_user}{record};
+		my $globalProblem    = $db->getGlobalProblem($setName, $problemNumber);
 		# if the global problem doesn't exist either, bail!
-		if(not defined $globalProblem) {
+		if (not defined $globalProblem) {
 			$problemRecord = fake_problem($db);
 		} else {
 			$problemRecord = global2user($userProblemClass, $globalProblem);
@@ -290,7 +169,7 @@ sub renderProblem {
 		$problemRecord->problem_id($problemNumber);
 		$problemRecord->set_id($setName);
 		$problemRecord->problem_seed($problemSeed);
-		$problemRecord->status($problemStatus);
+		$problemRecord->status(0);
 		$problemRecord->value($problemValue);
 		# We are faking it
 		$problemRecord->attempted(2000);
@@ -299,271 +178,140 @@ sub renderProblem {
 		$problemRecord->last_answer($lastAnswer);
 	}
 
-	# initialize problem source
-	$rh->{sourceFilePath} = $rh->{path} unless defined $rh->{sourceFilePath};
-
 	if ($UNIT_TESTS_ON) {
-		print STDERR "setRecord is ", WebworkWebservice::pretty_print_rh($setRecord);
-
-		print STDERR "template directory path ", $ce->{courseDirs}->{templates},"\n";
-		print STDERR "RenderProblem.pm: source file is ", $rh->{sourceFilePath},"\n";
-		print STDERR "RenderProblem.pm: problem source is included in the request \n" if defined($rh->{source}) and $rh->{source};
+		print STDERR 'setRecord is ',                     pretty_print_rh($setRecord);
+		print STDERR 'template directory path ',          $ce->{courseDirs}{templates}, "\n";
+		print STDERR 'RenderProblem.pm: source file is ', $rh->{sourceFilePath},        "\n";
+		print STDERR "RenderProblem.pm: problem source is included in the request \n"
+			if defined($rh->{problemSource}) && $rh->{problemSource};
 	}
 
-	my $problem_source;
-	my $r_problem_source =undef;
-	if (defined($rh->{source}) and $rh->{source}) {
-		$problem_source = decode_utf8_base64($rh->{source});
-		$problem_source =~ tr /\r/\n/;
-		$r_problem_source = \$problem_source;
-		if (defined $rh->{envir}->{fileName} and not $rh->{envir}->{fileName}=~/WebworkClient.pm/)  {
-			$problemRecord->source_file($rh->{envir}->{fileName});
-		} else {
-			$problemRecord->source_file($rh->{sourceFilePath});
-		}
-	} elsif (defined($rh->{sourceFilePath}) and $rh->{sourceFilePath} =~/\S/)  {
+	# Initialize problem source
+	my $r_problem_source;
+	if ($rh->{problemSource}) {
+		$r_problem_source = \(decode_utf8_base64($rh->{problemSource}) =~ tr/\r/\n/r);
+		$problemRecord->source_file(defined $rh->{fileName} ? $rh->{fileName} : $rh->{sourceFilePath});
+	} elsif (defined $rh->{rawProblemSource}) {
+		$r_problem_source = \$rh->{rawProblemSource};
+		$problemRecord->source_file(defined $rh->{fileName} ? $rh->{fileName} : $rh->{sourceFilePath});
+	} elsif ($rh->{uriEncodedProblemSource}) {
+		$r_problem_source = \(url_unescape($rh->{uriEncodedProblemSource}));
+		$problemRecord->source_file(defined $rh->{fileName} ? $rh->{fileName} : $rh->{sourceFilePath});
+	} elsif (defined $rh->{sourceFilePath} && $rh->{sourceFilePath} =~ /\S/) {
 		$problemRecord->source_file($rh->{sourceFilePath});
-		warn "reading source from ", $rh->{sourceFilePath} if $UNIT_TESTS_ON;
-		$problem_source = WeBWorK::PG::IO::read_whole_file($ce->{courseDirs}->{templates}.'/'.$rh->{sourceFilePath});
-		$r_problem_source = \$problem_source;
+		$r_problem_source =
+			\(WeBWorK::PG::IO::read_whole_file($ce->{courseDirs}{templates} . '/' . $rh->{sourceFilePath}));
 		$problemRecord->source_file('RenderProblemFooBar') unless defined($problemRecord->source_file);
 	}
-	if ($UNIT_TESTS_ON){
-		print STDERR "template directory path ", $ce->{courseDirs}->{templates},"\n";
-		print STDERR "RenderProblem.pm: source file is ", $problemRecord->source_file,"\n";
-		print STDERR "RenderProblem.pm: problem source is included in the request \n" if defined($rh->{source});
+
+	if ($UNIT_TESTS_ON) {
+		print STDERR 'template directory path ',          $ce->{courseDirs}{templates}, "\n";
+		print STDERR 'RenderProblem.pm: source file is ', $problemRecord->source_file,  "\n";
+		print STDERR "RenderProblem.pm: problem source is included in the request \n" if defined($rh->{problemSource});
 	}
 	# now we're sure we have valid UserSet and UserProblem objects
 
 	# Other initializations
 	my $translationOptions = {
-		displayMode     => $rh->{envir}{displayMode} // "display mode not defined at RenderProblem.pm 388",
-		showHints       => $rh->{envir}{showHints},
-		showSolutions   => $rh->{envir}{showSolutions},
-		refreshMath2img => $rh->{envir}{showHints} || $rh->{envir}{showSolutions},
-		processAnswers  => defined($rh->{processAnswers}) ? $rh->{processAnswers} : 1,
-		catchWarnings   => 1,
-		# methods for supplying the source,
-		r_source                 => $r_problem_source,    # reference to a source file string.
-														  # if reference is not defined then the path is obtained
-														  # from the problem object.
-		permissionLevel          => $rh->{envir}{permissionLevel} || 0,
-		effectivePermissionLevel => $rh->{envir}{effectivePermissionLevel} || $rh->{envir}{permissionLevel} || 0,
+		displayMode              => $rh->{displayMode} // 'MathJax',
+		showHints                => $rh->{showHints},
+		showSolutions            => $rh->{showSolutions},
+		refreshMath2img          => $rh->{showHints} || $rh->{showSolutions},
+		processAnswers           => $rh->{processAnswers} // 1,
+		catchWarnings            => 1,
+		r_source                 => $r_problem_source,
+		problemUUID              => $rh->{problemUUID} // 0,
+		permissionLevel          => $rh->{permissionLevel} || 0,
+		effectivePermissionLevel => $rh->{effectivePermissionLevel} || $rh->{permissionLevel} || 0,
 		useMathQuill             => $ce->{pg}{specialPGEnvironmentVars}{entryAssist} eq 'MathQuill',
 		useMathView              => $ce->{pg}{specialPGEnvironmentVars}{entryAssist} eq 'MathView',
-		useWiris                 => $ce->{pg}{specialPGEnvironmentVars}{entryAssist} eq 'WIRIS',
-	};
-
-	my $formFields = $rh->{envir}->{inputs_ref};
-	my $key        = $rh->{envir}->{key} || '';
-
-	local $ce->{pg}{specialPGEnvironmentVars}{problemPreamble} = {TeX=>'',HTML=>''} if($rh->{noprepostambles});
-	local $ce->{pg}{specialPGEnvironmentVars}{problemPostamble} = {TeX=>'',HTML=>''} if($rh->{noprepostambles});
-
-	# Other options can be over ridden by modifying $ce->{pg}
-
-	# Most of the configuration will take place in the fake course associated
-	# with XMLRPC responses
-	#   problem needs to be loaded with the following:
-	#   	source_file
-	#       status
-	#       num_correct
-	#       num_incorrect
-	#   except that it is passed on to defineProblemEnvironment
-
-	my $pg = WebworkWebservice::RenderProblem->new(
-		$ce,
-		$effectiveUser,
-		$key,
-		$setRecord,
-		$problemRecord,
-		$setRecord->psvn,
-		$formFields,
-		$translationOptions,
-		{ # extras
-			problemUUID => $rh->{envir}->{inputs_ref}->{problemUUID}//0,
+		isInstructor             => $rh->{isInstructor}       // 0,
+		forceScaffoldsOpen       => $rh->{forceScaffoldsOpen} // 0,
+		QUIZ_PREFIX              => $rh->{answerPrefix},
+		debuggingOptions         => {
+			show_resource_info          => $rh->{show_resource_info}          // 0,
+			view_problem_debugging_info => $rh->{view_problem_debugging_info} // 0,
+			show_pg_info                => $rh->{show_pg_info}                // 0,
+			show_answer_hash_info       => $rh->{show_answer_hash_info}       // 0,
+			show_answer_group_info      => $rh->{show_answer_group_info}      // 0
 		}
-
-	);
-
-	$self->{formFields} = $formFields;
-
-	my ($internal_debug_messages, $pgwarning_messages, $pgdebug_messages);
-	if (ref($pg->{pgcore}) eq 'PGcore') {
-		$internal_debug_messages   = $pg->{pgcore}->get_internal_debug_messages;
-		$pgwarning_messages        = $pg->{pgcore}->get_warning_messages();
-		$pgdebug_messages          = $pg->{pgcore}->get_debug_messages();
-	} else {
-		$internal_debug_messages = ['Error in obtaining debug messages from PGcore'];
-	}
-	# new version of output:
-	my $out2   = {
-		text 						=> encode_utf8_base64( $pg->{body_text}  ),
-		header_text 				=> encode_utf8_base64( $pg->{head_text} ),
-		post_header_text            => encode_utf8_base64( $pg->{post_header_text} ),
-		answers 					=> $pg->{answers},
-		errors         				=> $pg->{errors},
-		translator_warnings         => encode_utf8_base64($pg->{warnings}),
-		pg_warnings                 => encode_utf8_base64($warning_messages),
-		PG_ANSWERS_HASH             => $pg->{pgcore}->{PG_ANSWERS_HASH},
-		problem_result 				=> $pg->{result},
-		problem_state				=> $pg->{state},
-		flags						=> $pg->{flags},
-		# Pass the psvn and seed that were actually used to the renderer.
-		psvn                        => $psvn,
-		problem_seed                => $problemSeed,
-		warning_messages            => $pgwarning_messages,
-		debug_messages              => $pgdebug_messages,
-		internal_debug_messages     => $internal_debug_messages,
 	};
 
-	# Filter out bad reference types
-
-	# START XML DEBUGGING CODE
-	if ($debugXmlCode) {
-		my $logDirectory =$ce->{courseDirs}->{logs};
-		my $xmlDebugLog  = "$logDirectory/xml_debug.txt";
-		warn "RenderProblem.pm: Opening debug log $xmlDebugLog\n" ;
-		open (DEBUGCODE, ">>$xmlDebugLog") || die "Can't open debug log $xmlDebugLog";
-		print DEBUGCODE "\n\nStart xml encoding\n";
-	}
+	$ce->{pg}{specialPGEnvironmentVars}{problemPreamble}  = { TeX => '', HTML => '' } if $rh->{noprepostambles};
+	$ce->{pg}{specialPGEnvironmentVars}{problemPostamble} = { TeX => '', HTML => '' } if $rh->{noprepostambles};
+
+	my $pg =
+		await renderPG($ws->c, $effectiveUser, $setRecord, $problemRecord, $setRecord->psvn, $rh, $translationOptions);
+
+	# New version of output:
+	return {
+		text                    => $pg->{body_text},
+		header_text             => $pg->{head_text},
+		post_header_text        => $pg->{post_header_text},
+		answers                 => $pg->{answers},
+		errors                  => $pg->{errors},
+		pg_warnings             => $pg->{warnings},
+		PG_ANSWERS_HASH         => $pg->{PG_ANSWERS_HASH},
+		problem_result          => $pg->{result},
+		problem_state           => $pg->{state},
+		flags                   => $pg->{flags},
+		psvn                    => $psvn,
+		problem_seed            => $problemSeed,
+		resource_list           => $pg->{resource_list},
+		warning_messages        => ref $pg->{warning_messages} eq 'ARRAY' ? $pg->{warning_messages} : [],
+		debug_messages          => ref $pg->{debug_messages} eq 'ARRAY'   ? $pg->{debug_messages}   : [],
+		internal_debug_messages => ref $pg->{internal_debug_messages} eq 'ARRAY'
+		? $pg->{internal_debug_messages}
+		: [],
+		compute_time => logTimingInfo($beginTime, Benchmark->new),
+	};
+}
 
-	$out2 = xml_filter($out2); # check this -- it might not be working correctly
+sub logTimingInfo {
+	my ($beginTime, $endTime) = @_;
+	return Benchmark::timestr(Benchmark::timediff($endTime, $beginTime));
+}
 
-	$out2->{flags}{PROBLEM_GRADER_TO_USE} = undef;
+sub pretty_print_rh {
+	shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
+	my $rh = shift;
+	return '' unless defined $rh;
+	my $indent = shift || 0;
 
-	my $endTime = new Benchmark;
-	$out2->{compute_time} = logTimingInfo($beginTime, $endTime);
+	my $out = '';
+	return $out if $indent > 10;
+	my $type = ref($rh);
 
-	if ($debugXmlCode) {
-		print DEBUGCODE "\n\nStop xml encoding\n";
-		close(DEBUGCODE);
-		warn "flags are", WebworkWebservice::pretty_print_rh($pg->{flags});
+	if (defined($type) && $type) {
+		$out .= " type = $type; ";
+	} elsif (not defined($rh)) {
+		$out .= ' type = scalar; ';
 	}
-	# END XML DEBUGGING CODE
+	if (ref $rh eq 'HASH' || eval { %$rh && 1 }) {
+		$out .= "{\n";
+		$indent++;
+		foreach my $key (sort keys %{$rh}) {
+			$out .= '  ' x $indent . "$key => " . pretty_print_rh($rh->{$key}, $indent) . "\n";
+		}
+		$indent--;
+		$out .= "\n" . '  ' x $indent . "}\n";
 
-	return $out2;
-}
+	} elsif (ref($rh) =~ /ARRAY/ || "$rh" =~ /ARRAY/) {
+		$out .= ' ( ';
+		foreach my $elem (@{$rh}) {
+			$out .= pretty_print_rh($elem, $indent);
 
-#  insures proper conversion to xml structure.
-sub xml_filter {
-	my $input = shift;
-	my $level = shift || 0;
-	my $space="  ";
-	# protect against modules defined in Safe which can't find their stringify procedure.
-	my $dummy = eval { "$input"  };
-	if ($@ ) {
-		if ($debugXmlCode) {
-			print DEBUGCODE "Unable to determine stringify for this item\n";
-			print DEBUGCODE $@, "\n";
-		}
-		return "";
-	}
-	my $type = ref($input);
-
-	# Hack to filter out CODE references??
-	if (!defined($type) or !$type ) {
-		print DEBUGCODE $space x $level." : scalar -- not converted\n" if $debugXmlCode;
-	} elsif( $type =~/HASH/i or "$input"=~/HASH/i) {
-		eval { my %test = %{$input}; };
-		if ($@) {
-			print DEBUGCODE "($input) misunderstood as a HASH reference but is not (type is $type)\n" if $debugXmlCode;
-			$input = "HASH reference";
-		} else {
-			print DEBUGCODE "HASH reference ($input) with ".%{$input}." elements will be investigated\n" if $debugXmlCode;
-			$level++;
-			my @keys_to_process = keys %{$input};
-			foreach my $item ( @keys_to_process ) {
-				print DEBUGCODE "  "x$level."$item is " if $debugXmlCode;
-
-				next if ( $item =~ /^xmlrpc_UTF8_encoded_/ ); # avoid double processing
-				next unless defined $input->{$item};
-
-				# Until 2020 - ALL scalar values were left unchanged.
-				# However, since the release of WeBWorK 2.15 (late 2019) there
-				# can be Unicode values of hash entires, and they trigger failures
-				# of the XMLRPC system. For now, based on current experience
-				# we are ONLY handling the values stored in the hashes, under the
-				# assumption that key names will be ASCII, and that arrays are not
-				# going to contain Unicode values. When a hash value is encoded,
-				# we prefix the key name with "xmlrpc_UTF8_encoded_" so it can
-				# be detected for the decode on the other side.
-
-				my $filtered_value = xml_filter($input->{$item},$level);
-				my $item_type = ref( $input->{$item} );
-				if (!defined($item_type) or !$item_type ) {
-					# This is a scalar object
-					# Values which are string containing Unicode wide-characters make problems
-					if ( ! Scalar::Util::looks_like_number( $filtered_value ) &&
-						$filtered_value =~ /[^\x00-\x7f]/ # Some non 7-bit character included
-					) {
-						# UTF-8 encoding needed
-						$input->{"xmlrpc_UTF8_encoded_$item"} = encode("UTF-8", $filtered_value );
-						delete( $input->{$item} ); # remove the original value
-					} else {
-						$input->{$item} = $filtered_value; # No encoding needed
-					}
-				} else {
-					# Not a scalar object - default handling
-					$input->{$item} = $filtered_value;
-				}
-			}
-			$level--;
-			print DEBUGCODE "  "x$level."HASH reference completed \n" if $debugXmlCode;
-		}
-	} elsif( $type=~/ARRAY/i or "$input"=~/ARRAY/i) {
-		eval { my @test = @{$input}; };
-		if ($@) {
-			print DEBUGCODE "($input) misunderstood as an ARRAY reference but is not (type is $type)\n" if $debugXmlCode;
-			$input = "ARRAY reference";
-		} else {
-			print DEBUGCODE "  "x$level."ARRAY reference with ".@{$input}." elements will be investigated\n" if $debugXmlCode;
-			$level++;
-			my $tmp = [];
-			foreach my $item (@{$input}) {
-				# print DEBUGCODE "-----checking $item of type\n",ref($item) if $debugXmlCode;
-				$item = xml_filter($item,$level);
-				push @$tmp, $item;
-				# print DEBUGCODE "-----end checking $item\n" if $debugXmlCode;
-			}
-			$input = $tmp;
-			$level--;
-			print DEBUGCODE "  "x$level."ARRAY reference completed: ",join(" ",@$input),"\n" if $debugXmlCode;
 		}
-	} elsif($type =~ /CODE/i or "$input" =~/CODE/i) {
-		$input = "CODE reference";
-		print DEBUGCODE "  "x$level."CODE reference, converted $input\n" if $debugXmlCode;
+		$out .= " ) \n";
+	} elsif (ref($rh) =~ /SCALAR/) {
+		$out .= 'scalar reference ' . ${$rh};
+	} elsif (ref($rh) =~ /Base64/) {
+		$out .= 'base64 reference ' . $$rh;
 	} else {
-		print DEBUGCODE  "  "x$level." type |$type| and was  converted to string\n" if $debugXmlCode;
-		$input = "$type reference";
+		$out .= $rh;
 	}
-	$input;
-
-}
-
-sub logTimingInfo{
-    my ($beginTime,$endTime,) = @_;
-    my $out = "";
-    $out .= Benchmark::timestr( Benchmark::timediff($endTime , $beginTime) );
-    $out;
-}
-
 
-######################################################################
-sub new {
-	shift; # throw away invocant -- we don't need it
-	my ($ce, $user, $key, $set, $problem, $psvn, $formFields,
-		$translationOptions) = @_;
-
-	#my $renderer = 'WeBWorK::PG::Local';
-	my $renderer = $ce->{pg}->{renderer};
-
-	runtime_use $renderer;
-	# the idea is to have Local call back to the defineProblemEnvir below.
-	#return WeBWorK::PG::Local::new($renderer,@_);
-	return $renderer->new(@_);
+	return $out . ' ';
 }
 
-
-
 1;
diff --git a/lib/WebworkWebservice/SetActions.pm b/lib/WebworkWebservice/SetActions.pm
index adbc9b8109..afdcde2c4f 100644
--- a/lib/WebworkWebservice/SetActions.pm
+++ b/lib/WebworkWebservice/SetActions.pm
@@ -1,8 +1,6 @@
-#!/usr/local/bin/perl -w
-
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
+# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -15,179 +13,113 @@
 # Artistic License for more details.
 ################################################################################
 
-###############################################################################
 # Web service which fetches, adds, removes and moves WeBWorK problems when working with a Set.
-###############################################################################
-
-
-#use lib '/home/gage/webwork/pg/lib';
-#use lib '/home/gage/webwork/webwork-modperl/lib';
-
 package WebworkWebservice::SetActions;
-use WebworkWebservice;
-use base qw(WebworkWebservice);
-use WeBWorK::Utils qw(readDirectory max sortByName formatDateTime jitar_id_to_seq seq_to_jitar_id);
-use WeBWorK::Utils::Tasks qw(renderProblems);
 
 use strict;
-use sigtrap;
+use warnings;
+
 use Carp;
-use WWSafe;
-#use Apache;
-use WeBWorK::Utils qw( encode_utf8_base64 decode_utf8_base64 );
-use WeBWorK::Debug qw(debug);
 use JSON;
-use WeBWorK::CourseEnvironment;
-use WeBWorK::PG::Translator;
-use WeBWorK::DB::Utils qw(initializeUserProblem);
-use WeBWorK::PG::IO;
-use Benchmark;
-
-##############################################
-#   Some of this may have to be moved, to allow for flexability
-#   Obtain basic information about directories, course name and host
-##############################################
-our $WW_DIRECTORY = $WebworkWebservice::WW_DIRECTORY;
-our $PG_DIRECTORY = $WebworkWebservice::PG_DIRECTORY;
-our $COURSENAME   = $WebworkWebservice::COURSENAME;
-our $HOST_NAME    = $WebworkWebservice::HOST_NAME;
-our $PASSWORD     = $WebworkWebservice::PASSWORD;
-our $ce           = WeBWorK::CourseEnvironment->new({webwork_dir=>$WW_DIRECTORY, courseName=> $COURSENAME});
-
-our $UNIT_TESTS_ON =0;
-
-sub listLocalSets{
-  debug("in listLocalSets");
-  my $self = shift;
-  my $db = $self->db;
-  my @found_sets;
-  @found_sets = $db->listGlobalSets;
-  my $out = {};
-  $out->{ra_out} = \@found_sets;
-  $out->{text} = encode_utf8_base64("Loaded sets for course: ".$self->{courseName});
-  return $out;
-}
-
-###
-#
-#  This returns an array of problems (path,value,problem_id, which is weight)
+use Data::Structure::Util qw(unbless);
 
+use WeBWorK::Utils qw(max formatDateTime jitar_id_to_seq seq_to_jitar_id);
+use WeBWorK::Utils::Instructor qw(assignSetToGivenUsers assignMultipleProblemsToGivenUsers);
+use WeBWorK::Debug;
+use WeBWorK::DB::Utils qw(initializeUserProblem);
 
-sub listLocalSetProblems{
-	my ($self, $params) = @_;
-
-  	my $db = $self->db;
-  	my @found_problems;
-
-  	my $setName = $params->{set_id};
-
-  	debug("Loading problems for " . $setName);
+sub listGlobalSets {
+	my ($invocant, $self) = @_;
 
-  	my $templateDir = $self->ce->{courseDirs}->{templates}."/";
+	debug('in listGlobalSets');
 
-        # If a command is passed, then we want relative paths rather than
-        # absolute paths.  Do that by setting templateDir to the empty
-        # string.
+	my @found_sets = $self->db->listGlobalSets;
+	return { ra_out => \@found_sets, text => 'Loaded sets for course: ' . $self->ce->{courseName} };
+}
 
- 	my $relativePaths = $params->{command};
- 	$templateDir = '' if $relativePaths;
+# This returns an array of problems (path,value,problem_id, which is weight)
+sub listGlobalSetProblems {
+	my ($invocant, $self, $params) = @_;
 
-  	@found_problems = $db->listGlobalProblems($setName);
+	debug('listGlobalSetProblems loading problems for ' . $params->{set_id});
 
-  	my @problems=();
-  	for my $problem (@found_problems) {
-		my $problemRecord = $db->getGlobalProblem($setName, $problem); # checked
-		die "global $problem for set $setName not found." unless $problemRecord;
-		my $problem = {};
-		$problem->{path} = $templateDir.$problemRecord->source_file;
-		$problem->{problem_id} = $problemRecord->{problem_id};
-		$problem->{value} = $problemRecord->{value};
-		push @problems, $problem;
+	my $db = $self->db;
 
+	# If a command is passed, then we want relative paths rather than absolute paths.
+	# Do that by setting templateDir to the empty string.
+	my $templateDir = $params->{command} ? '' : ($self->ce->{courseDirs}{templates} . '/');
+
+	my @found_problems = $db->listGlobalProblems($params->{set_id});
+
+	my @problems;
+	for my $problem (@found_problems) {
+		my $problemRecord = $db->getGlobalProblem($params->{set_id}, $problem);
+		return { text => "global $problem for set $params->{set_id} not found." } unless $problemRecord;
+		push @problems,
+			{
+				path       => $templateDir . $problemRecord->source_file,
+				problem_id => $problemRecord->{problem_id},
+				value      => $problemRecord->{value}
+			};
 	}
 
-  	my $out = {};
-  	$out->{ra_out} = \@problems;
-  	$out->{text} = encode_utf8_base64("Loaded Problems for set: " . $setName);
-  	return $out;
+	return { ra_out => \@problems, text => "Loaded Problems for set: $params->{set_id}" };
 }
 
 # This returns all problem sets of a course.
+sub getSets {
+	my ($invocant, $self, $params) = @_;
 
-sub getSets{
-  my ($self,$params) = @_;
-  my $db = $self->db;
-  my @found_sets = $db->listGlobalSets;
+	debug('in getSets');
 
-  my @all_sets = $db->getGlobalSets(@found_sets);
+	my $db = $self->db;
 
-  # fix the timeDate
- foreach my $set (@all_sets){
-	#$set->{due_date} = formatDateTime($set->{due_date},'local');
-	#$set->{open_date} = formatDateTime($set->{open_date},'local');
-	#$set->{answer_date} = formatDateTime($set->{answer_date},'local');
+	my @found_sets = $db->listGlobalSets;
+	my @all_sets   = map { unbless($_) } $db->getGlobalSets(@found_sets);
 
-	my @users = $db->listSetUsers($set->{set_id});
-	$set->{assigned_users} = \@users;
-  }
+	# Add a list of set users to the return data.
+	for my $set (@all_sets) {
+		my @users = $db->listSetUsers($set->{set_id});
+		$set->{assigned_users} = \@users;
+	}
 
-  my $out = {};
-  $out->{ra_out} = \@all_sets;
-  $out->{text} = encode_utf8_base64("Sets for course: ".$self->{courseName});
-  return $out;
+	return { ra_out => \@all_sets, text => 'Sets for course: ' . $self->ce->{courseName} };
 }
 
 # This returns all problem sets of a course for a given user.
-# the set is stored in the set_id and the user in user_id
-
-
-sub getUserSets{
-  my ($self,$params) = @_;
-  my $db = $self->db;
-
-  my @userSetNames = $db->listUserSets($params->{user});
-  debug(@userSetNames);
-  my @userSets = $db->getGlobalSets(@userSetNames);
-
-  # fix the timeDate
- # foreach my $set (@userSets){
-	# $set->{due_date} = formatDateTime($set->{due_date},'local');
-	# $set->{open_date} = formatDateTime($set->{open_date},'local');
-	# $set->{answer_date} = formatDateTime($set->{answer_date},'local');
- #  }
+# The set is stored in the set_id and the user in user_id
+sub getUserSets {
+	my ($invocant, $self, $params) = @_;
 
+	debug('in getUserSets');
 
+	my $db           = $self->db;
+	my @userSetNames = $db->listUserSets($params->{user_id});
+	my @userSets     = map { unbless($_) } $db->getGlobalSets(@userSetNames);
 
-  my $out = {};
-  $out->{ra_out} = \@userSets;
-  $out->{text} = encode_utf8_base64("Sets for course: ".$self->{courseName});
-  return $out;
+	return {
+		ra_out => \@userSets,
+		text   => "User sets for user $params->{user_id} in course " . $self->ce->{courseName}
+	};
 }
 
-
-
 # This returns a single problem set with name stored in set_id
-
 sub getSet {
-  my ($self, $params) = @_;
-  my $db = $self->db;
-  my $setName = $params->{set_id};
-  my $set = $db->getGlobalSet($setName);
+	my ($invocant, $self, $params) = @_;
 
-  # change the date/times to user readable strings.
+	my $db  = $self->db;
+	my $set = unbless($db->getGlobalSet($params->{set_id}));
 
-  $set->{due_date} = formatDateTime($set->{due_date},'local');
-  $set->{open_date} = formatDateTime($set->{open_date},'local');
-  $set->{answer_date} = formatDateTime($set->{answer_date},'local');
+	# Change the date/times to user readable strings (why?).
+	$set->{due_date}    = formatDateTime($set->{due_date},    'local');
+	$set->{open_date}   = formatDateTime($set->{open_date},   'local');
+	$set->{answer_date} = formatDateTime($set->{answer_date}, 'local');
 
-  my $out = {};
-  $out->{ra_out} = $set;
-  $out->{text} = encode_utf8_base64("Sets for course: ".$self->{courseName});
-  return $out;
-  }
+	return { ra_out => $set, text => "Loaded set $params->{set_id} in " . $self->ce->{courseName} };
+}
 
 sub updateSetProperties {
-	my ($self, $params) = @_;
+	my ($invocant, $self, $params) = @_;
 	my $db = $self->db;
 
 	my $set = $db->getGlobalSet($params->{set_id});
@@ -227,8 +159,7 @@ sub updateSetProperties {
 
 	# then determine those currently in the list.
 
-	my @usersForTheSetNow = split(/,/,$params->{assigned_users});
-
+	my @usersForTheSetNow = split(/,/, $params->{assigned_users});
 
 	# The following seems to work if there are only additions or subtractions from the assigned_users field.
 	# Perhaps a better way to do this is to check users that are new or missing and add or delete them.
@@ -239,8 +170,8 @@ sub updateSetProperties {
 
 	# determine users to be added
 
-	foreach my $user (@usersForTheSetNow) {
-		if (! grep( /^$user$/, @usersForTheSetBefore)) {
+	for my $user (@usersForTheSetNow) {
+		if (!(grep {/^$user$/} @usersForTheSetBefore)) {
 			my $userSet = $db->newUserSet;
 			$userSet->user_id($user);
 			$userSet->set_id($params->{set_id});
@@ -250,405 +181,272 @@ sub updateSetProperties {
 
 	# delete users that are in the set before but not now.
 
-	foreach my $user (@usersForTheSetBefore){
-		if (! grep(/^$user$/,@usersForTheSetNow)){
+	for my $user (@usersForTheSetBefore) {
+		if (!(grep {/^$user$/} @usersForTheSetNow)) {
 			$db->deleteUserSet($user, $params->{set_id});
 		}
 	}
 
-
-	my $out = {};
-	$out->{ra_out} = $set;
-	$out->{text} = encode_utf8_base64("Successfully updated set " . $params->{set_id});
-	return $out;
+	return { ra_out => unbless($set), text => "Successfully updated set $params->{set_id}" };
 }
 
 sub listSetUsers {
-	my ($self,$params) = @_;
+	my ($invocant, $self, $params) = @_;
 	my $db = $self->db;
 
-    my $out = {};
-    my @users = $db->listSetUsers($params->{set_id});
-    $out->{ra_out} = \@users;
-    $out->{text} = encode_utf8_base64("Successfully returned the users for set " . $params->{set_id});
-    return $out;
-
+	my @users = $db->listSetUsers($params->{set_id});
+	return { ra_out => \@users, text => "Successfully returned the users for set $params->{set_id}" };
 }
 
-sub createNewSet{
-	my ($self,$params) = @_;
-  	my $db = $self->db;
-  	my $out;
-
-  	debug("in createNewSet");
-  	#debug(to_json($params));
+sub createNewSet {
+	my ($invocant, $self, $params) = @_;
+	my $db  = $self->db;
+	my $out = {};
 
+	debug('in createNewSet');
 
-	if ($params->{new_set_name} !~ /^[\w .-]*$/) {
-		$out->{text} = "need a different name";#not sure the best way to handle and error
+	if ($params->{set_id} !~ /^[\w .-]*$/) {
+		$out->{text}   = 'Invalid set name';
+		$out->{ra_out} = { success => \0 };
 	} else {
 		my $newSetName = $params->{set_id};
-		# if we want to munge the input set name, do it here
 		$newSetName =~ s/\s/_/g;
 
-
-		my $newSetRecord = $db->getGlobalSet($newSetName);
-		if (defined($newSetRecord)) {
-            $out->{out}=encode_utf8_base64("Failed to create set, you may need to try another name."),
-            $out->{ra_out} = {'success' => 'false'};
-		} else {			# Do it!
-			$newSetRecord = $db->newGlobalSet;
+		if (defined($db->getGlobalSet($newSetName))) {
+			$out->{text} = "The set name '$newSetName' is already in use. "
+				. 'Pick a different name if you would like to start a new set.';
+			$out->{ra_out} = { success => \0 };
+		} else {
+			my $now          = time;
+			my $newSetRecord = $db->newGlobalSet;
 			$newSetRecord->set_id($newSetName);
-			$newSetRecord->set_header("defaultHeader");
-			$newSetRecord->hardcopy_header("defaultHeader");
-			$newSetRecord->open_date($params->{open_date});
-			$newSetRecord->due_date($params->{due_date});
-			$newSetRecord->answer_date($params->{answer_date});
-			$newSetRecord->reduced_scoring_date($params->{reduced_scoring_date});
-			$newSetRecord->visible($params->{visible});
-			$newSetRecord->enable_reduced_scoring($params->{enable_reduced_scoring});
-			$newSetRecord->assignment_type($params->{assignment_type});
+			$newSetRecord->set_header('defaultHeader');
+			$newSetRecord->hardcopy_header('defaultHeader');
+			$newSetRecord->open_date($params->{open_date}                           // $now);
+			$newSetRecord->due_date($params->{due_date}                             // ($now + 1209600));
+			$newSetRecord->answer_date($params->{answer_date}                       // ($now + 1209600));
+			$newSetRecord->reduced_scoring_date($params->{reduced_scoring_date}     // ($now + 1209600));
+			$newSetRecord->visible($params->{visible}                               // 1);
+			$newSetRecord->enable_reduced_scoring($params->{enable_reduced_scoring} // 0);
+			$newSetRecord->assignment_type($params->{assignment_type}               // 'default');
 			$newSetRecord->description($params->{description});
 			$newSetRecord->restricted_release($params->{restricted_release});
-			$newSetRecord->restricted_status($params->{restricted_status});
-			$newSetRecord->attempts_per_version($params->{attempts_per_version});
-			$newSetRecord->time_interval($params->{time_interval});
-			$newSetRecord->versions_per_interval($params->{versions_per_interval});
-			$newSetRecord->version_time_limit($params->{version_time_limit});
+			$newSetRecord->restricted_status($params->{restricted_status}         // 1);
+			$newSetRecord->attempts_per_version($params->{attempts_per_version}   // 0);
+			$newSetRecord->time_interval($params->{time_interval}                 // 0);
+			$newSetRecord->versions_per_interval($params->{versions_per_interval} // 0);
+			$newSetRecord->version_time_limit($params->{version_time_limit}       // 0);
 			$newSetRecord->version_creation_time($params->{version_creation_time});
 			$newSetRecord->problem_randorder($params->{problem_randorder});
 			$newSetRecord->version_last_attempt_time($params->{version_last_attempt_time});
-			$newSetRecord->problems_per_page($params->{problems_per_page});
+			$newSetRecord->problems_per_page($params->{problems_per_page} // 0);
 			$newSetRecord->hide_score($params->{hide_score});
 			$newSetRecord->hide_score_by_problem($params->{hide_score_by_problem});
 			$newSetRecord->hide_work($params->{hide_work});
 			$newSetRecord->time_limit_cap($params->{time_limit_cap});
-			$newSetRecord->restrict_ip($params->{restrict_ip});
-			$newSetRecord->relax_restrict_ip($params->{relax_restrict_ip});
-			$newSetRecord->hide_hint($params->{hide_hint});
-			$newSetRecord->restrict_prob_progression($params->{restrict_prob_progression});
-			$newSetRecord->email_instructor($params->{email_instructor});
+			$newSetRecord->restrict_ip($params->{restrict_ip}                             // 'No');
+			$newSetRecord->relax_restrict_ip($params->{relax_restrict_ip}                 // 'No');
+			$newSetRecord->hide_hint($params->{hide_hint}                                 // 0);
+			$newSetRecord->restrict_prob_progression($params->{restrict_prob_progression} // 0);
+			$newSetRecord->email_instructor($params->{email_instructor}                   // 0);
 
 			$db->addGlobalSet($newSetRecord);
-			if ($@) {
-				$out->{text} = encode_utf8_base64("Failed to create set, you may need to try another name.");
-				#$self->addbadmessage("Problem creating set $newSetName<br> $@");
-			} else {
-				my $selfassign = $params->{selfassign};
-				debug("selfassign: " . $selfassign);
-				$selfassign = "" if($selfassign =~ /false/i); # deal with javascript false
-				if($selfassign) {
-					debug("Assigning to user: " . $params->{user});
-					my $userSet = $db->newUserSet;
-					$userSet->user_id($params->{user});
-					$userSet->set_id($newSetName);
-					$db->addUserSet($userSet);
-				}
+			$out->{text}   = "Successfully created new set $newSetName";
+			$out->{ra_out} = { success => \1 };
+
+			my $selfassign = $params->{selfassign} // '';
+			debug("selfassign: $selfassign");
+			$selfassign = '' if ($selfassign =~ /false/i);    # deal with javascript false
+			if ($selfassign) {
+				debug("Assigning to user: $params->{user}");
+				my $userSet = $db->newUserSet;
+				$userSet->user_id($params->{user});
+				$userSet->set_id($newSetName);
+				$db->addUserSet($userSet);
+				$out->{text} .= " Set was assigned to $params->{user}.";
 			}
 		}
 	}
+	return $out;
 }
 
 sub assignSetToUsers {
-	my ($self,$params) = @_;
+	my ($invocant, $self, $params) = @_;
 	my $db = $self->db;
 
-    my $setID = $params->{set_id};
-    my $GlobalSet = $db->getGlobalSet($params->{set_id});
-
-    debug("users: " . $params->{users});
-    my @users = split(',',$params->{users});
-    #my @users = decode_json($params->{users});
-
-    my @results;
-    foreach my $userID (@users) {
-		my $UserSet = $db->newUserSet;
-		$UserSet->user_id($userID);
-		$UserSet->set_id($setID);
+	my $setID     = $params->{set_id};
+	my $GlobalSet = $db->getGlobalSet($params->{set_id});
 
+	my %setUsers = map { $_ => 1 } $db->listSetUsers($setID);
 
+	debug("users: " . $params->{users});
+	my @users = split(',', $params->{users});
+	my @usersToAdd;
+	my @results;
+	for my $user (@users) {
+		if ($setUsers{$user}) {
+			push @results, "set $setID is already assigned to user $user.";
 
-		my $set_assigned = 0;
-
-		eval { $db->addUserSet($UserSet) };
-		if ($@) {
-			if ($@ =~ m/user set exists/) {
-				push @results, "set $setID is already assigned to user $userID.";
-				$set_assigned = 1;
-			} else {
-				die $@;
-			}
-		}
-
-		my @GlobalProblems = grep { defined $_ } $db->getAllGlobalProblems($setID);
-		foreach my $GlobalProblem (@GlobalProblems) {
-			my @result = assignProblemToUser($self,$userID, $GlobalProblem);
-			push @results, @result if @result and not $set_assigned;
-		}
-    }
-
-	my $out = {};
-	$out->{ra_out} = \@results;
-	$out->{text} = encode_utf8_base64("Successfully assigned users to set " . $params->{set_id});
-	return $out;
-}
-
-#problem utils from Instructor.pm
-sub assignProblemToUser {
-	my ($self,$userID,$GlobalProblem,$seed) = @_;
-	my $db = $self->db;
-
-	my $UserProblem = $db->newUserProblem;
-	$UserProblem->user_id($userID);
-	$UserProblem->set_id($GlobalProblem->set_id);
-	$UserProblem->problem_id($GlobalProblem->problem_id);
-	initializeUserProblem($UserProblem, $seed);
-
-	eval { $db->addUserProblem($UserProblem) };
-	if ($@) {
-		if ($@ =~ m/user problem exists/) {
-			return "problem " . $GlobalProblem->problem_id
-				. " in set " . $GlobalProblem->set_id
-				. " is already assigned to user $userID.";
 		} else {
-			die $@;
+			push @usersToAdd, $user;
 		}
 	}
+	push @results, assignSetToGivenUsers($db, $self->ce, $setID, 1, $db->getUsers(@usersToAdd));
 
-	return ();
+	return { ra_out => \@results, text => "Successfully assigned users to set $params->{set_id}" };
 }
 
-
 sub deleteProblemSet {
-	my ($self,$params) = @_;
-	my $db = $self->db;
-	my $setID = $params->{set_id};
+	my ($invocant, $self, $params) = @_;
+	my $db     = $self->db;
+	my $setID  = $params->{set_id};
 	my $result = $db->deleteGlobalSet($setID);
 
-		# check the result
+	# check the result
 	debug("in deleteProblemSet");
 	debug("deleted set:  $setID");
 	debug($result);
 
-	my $out->{text} = encode_utf8_base64("Deleted Problem Set " . $setID);
-
-
-
-	return $out;
-
+	return { text => "Deleted Problem Set $setID" };
 }
 
-
 sub reorderProblems {
-	my ($self,$params) =  @_;
+	my ($invocant, $self, $params) = @_;
 
-	my $db = $self->db;
-	my $setID = $params->{set_id};
+	my $db          = $self->db;
+	my $setID       = $params->{set_id};
 	my @problemList = split(/,/, $params->{probList});
-	my $topdir = $self->ce->{courseDirs}{templates};
-
+	my $topdir      = $self->ce->{courseDirs}{templates};
 
 	# get all the problems
 	my @allProblems = $db->getAllGlobalProblems($setID);
 
 	my @probOrder = ();
 
-	foreach my $problem (@allProblems) {
+	for my $problem (@allProblems) {
 		my $recordFound = 0;
 
-		for (my $i = 0; $i < scalar(@problemList); $i++){
+		for (my $i = 0; $i < scalar(@problemList); $i++) {
 			$problemList[$i] =~ s|^$topdir/*||;
 
-			if($problem->{source_file} eq $problemList[$i]){
-				push(@probOrder,$i+1);
-			   	if ($db->existsGlobalProblem($setID,$i+1)){
-			   		$problem->problem_id($i+1);
-			   		$db->putGlobalProblem($problem);
-			   		debug("updating problem " . $problemList[$i] . " and setting the index to " . ($i+1));
-
-			   	} else {
-			   		# delete the problem with the old problem_id and create a new one
-			   		$db->deleteGlobalProblem($setID,$problem->{problem_id});
-			   		$problem->problem_id($i+1);
-			   		$db->addGlobalProblem($problem);
-
-			   		debug("adding new problem " . $problemList[$i]. " and setting the index to " . ($i+1));
-		   		}
-		 	}
-		 	$recordFound = 1;
-		}
-		die "global " . $problem->{source_file} ." for set $setID not found." unless $recordFound;
+			if ($problem->{source_file} eq $problemList[$i]) {
+				push(@probOrder, $i + 1);
+				if ($db->existsGlobalProblem($setID, $i + 1)) {
+					$problem->problem_id($i + 1);
+					$db->putGlobalProblem($problem);
+					debug("updating problem " . $problemList[$i] . " and setting the index to " . ($i + 1));
 
+				} else {
+					# delete the problem with the old problem_id and create a new one
+					$db->deleteGlobalProblem($setID, $problem->{problem_id});
+					$problem->problem_id($i + 1);
+					$db->addGlobalProblem($problem);
 
-	}
+					debug("adding new problem " . $problemList[$i] . " and setting the index to " . ($i + 1));
+				}
+			}
+			$recordFound = 1;
+		}
+		die "global " . $problem->{source_file} . " for set $setID not found." unless $recordFound;
 
-	my $out;
+	}
 
-	$out->{text} = encode_utf8_base64("Successfully reordered problems");
-	return $out;
+	return { text => 'Successfully reordered problems' };
 }
 
-sub updateProblem{
-	my ($self,$params) = @_;
-	my $db = $self->db;
-	my $setID = $params->{set_id};
-	my $path = $params->{path};
+sub updateProblem {
+	my ($invocant, $self, $params) = @_;
+	my $db     = $self->db;
+	my $setID  = $params->{set_id};
+	my $path   = $params->{problemPath};
 	my $topdir = $self->ce->{courseDirs}{templates};
 	$path =~ s|^$topdir/*||;
 
 	my @problems = $db->getAllGlobalProblems($setID);
-	foreach my $problem (@problems){
-		if($problem->{source_file} eq $path ){
+	for my $problem (@problems) {
+		if ($problem->{source_file} eq $path) {
 			debug($params->{value});
 			$problem->value($params->{value});
 			$db->putGlobalProblem($problem);
 		}
 	}
 
-
-	my $out->{text} = encode_utf8_base64("Updated Problem Set " . $setID);
-
-
-
-	return $out;
-
+	return { text => "Updated Problem Set $setID" };
 }
 
-
 # This updates the userSet for a problem set (just the open, due and answer dates)
-
-
 sub updateUserSet {
-  	my ($self, $params) = @_;
-  	my $db = $self->db;
-  	my @users = split(',',$params->{users});
-
-  	debug($params->{open_date});
-  	debug($params->{due_date});
-  	debug($params->{answer_date});
-
-  	foreach my $userID (@users) {
-		my $set = $db->getUserSet($userID,$params->{set_id});
-		if ($set){
-		    $set->open_date($params->{open_date});
+	my ($invocant, $self, $params) = @_;
+	my $db    = $self->db;
+	my @users = split(',', $params->{users});
+
+	debug($params->{open_date});
+	debug($params->{due_date});
+	debug($params->{answer_date});
+
+	for my $userID (@users) {
+		my $set = $db->getUserSet($userID, $params->{set_id});
+		if ($set) {
+			$set->open_date($params->{open_date});
 			$set->due_date($params->{due_date});
 			$set->answer_date($params->{answer_date});
-		  	$db->putUserSet($set);
+			$db->putUserSet($set);
 		} else {
 			my $newSet = $db->newUserSet;
 			$newSet->user_id($userID);
 			$newSet->set_id($params->{set_id});
-		    $newSet->open_date($params->{open_date});
-		    $newSet->due_date($params->{due_date});
-		    $newSet->answer_date($params->{answer_date});
+			$newSet->open_date($params->{open_date});
+			$newSet->due_date($params->{due_date});
+			$newSet->answer_date($params->{answer_date});
 
 			$newSet = $db->addUserSet($newSet);
 		}
 	}
 
-
-  my $out = {};
-  #$out->{ra_out} = $set;
-  $out->{text} = encode_utf8_base64("Successfully updated set " . $params->{set_id} . " for users " . $params->{users});
-  return $out;
+	return {
+		#ra_out => $set,
+		text => "Successfully updated set $params->{set_id} for users $params->{users}"
+	};
 }
 
-=over
-
-=item getUserSets($setID)
-
-gets all user sets for set $setID
-
-=cut
-
-sub getUserSets {
-	my ($self,$params) = @_;
+sub getSetUserSets {
+	my ($invocant, $self, $params) = @_;
 	my $db = $self->db;
 
 	my @setUserIDs = $db->listSetUsers($params->{set_id});
 
 	my @userData = ();
 
-	foreach my $user_id (@setUserIDs){
-		push(@userData,$db->getUserSet($user_id,$params->{set_id}))
+	for my $user_id (@setUserIDs) {
+		push(@userData, unbless($db->getUserSet($user_id, $params->{set_id})));
 	}
 
-	my $out = {};
-	$out->{ra_out} = \@userData;
-	$out->{text} = encode_utf8_base64("Returning all users sets for set " . $params->{set_id});
-
-	return $out;
+	return { ra_out => \@userData, text => "Returning all users sets for set $params->{set_id}" };
 }
 
-
 sub saveUserSets {
-	my ($self,$params) = @_;
+	my ($invocant, $self, $params) = @_;
 	my $db = $self->db;
 	debug($params->{overrides});
 
-	my @overrides = @{from_json($params->{overrides})};
-	foreach my $override (@overrides){
-		my $set = $db->getUserSet($override->{user_id},$params->{set_id});
-		if ($override->{open_date}) {$set->{open_date} = $override->{open_date};}
-		if ($override->{due_date}) {$set->{due_date} = $override->{due_date};}
-		if ($override->{answer_date}) {$set->{answer_date} = $override->{answer_date};}
+	my @overrides = @{ from_json($params->{overrides}) };
+	for my $override (@overrides) {
+		my $set = $db->getUserSet($override->{user_id}, $params->{set_id});
+		if ($override->{open_date})   { $set->{open_date}   = $override->{open_date}; }
+		if ($override->{due_date})    { $set->{due_date}    = $override->{due_date}; }
+		if ($override->{answer_date}) { $set->{answer_date} = $override->{answer_date}; }
 		$db->putUserSet($set);
 	}
 
-	my $out = {};
-	$out->{ra_out} = "";
-	$out->{text} = encode_utf8_base64("Updating the overrides for set " . $params->{set_id});
-
-	return $out;
-}
-
-=item unassignSetFromUser($userID, $setID, $problemID)
-
-Unassigns the given set and all problems therein from the given user.
-
-=cut
-
-sub unassignSetFromUsers {
-  	my ($self, $params) = @_;
-  	my $db = $self->db;
-  	my @users = split(',',$params->{users});
-    # should we check if the user is assigned before trying to unassign?
-  	foreach my $user (@users) {
-		my $result = $db->deleteUserSet($user, $params->{set_id});
-	}
-	my $out = {};
-	$out->{text} = encode_utf8_base64("Successfully unassigned users: " + $params->{users} + " from set " + $params->{set_id});
-}
-
-=item assignAllSetsToUser($userID)
-
-Assigns all sets in the course and all problems contained therein to the
-specified user. This is more efficient than repeatedly calling
-assignSetToUser(). If any assignments fail, a list of failure messages is
-returned.
-
-=cut
-
-sub assignAllSetsToUser {
-	my ($self, $userID) = @_;
-	my $db = $self->db;
-
-	my @results;
-	for my $GlobalSet (@{ [ $db->getGlobalSetsWhere() ] }) {
-		my @result = $self->assignSetToUser($userID, $GlobalSet);
-		push @results, @result if @result;
-	}
-
-	return @results;
+	return { ra_out => '', text => "Updating the overrides for set $params->{set_id}" };
 }
 
-
 sub addProblem {
-	my ($self,$params) = @_;
-	my $db = $self->db;
+	my ($invocant, $self, $params) = @_;
+	my $db      = $self->db;
 	my $setName = $params->{set_id};
 
-	my $file = $params->{path};
+	my $file   = $params->{problemPath};
 	my $topdir = $self->ce->{courseDirs}{templates};
 	$file =~ s|^$topdir/*||;
 
@@ -658,38 +456,42 @@ sub addProblem {
 
 	# for jitar sets the next problem id is the next top level problem
 	if ($set->assignment_type eq 'jitar') {
-	  my @problemIDs = $db->listGlobalProblems($setName);
-	  my @seq = (0);
-	  if ($#problemIDs != -1) {
-	    @seq = jitar_id_to_seq($problemIDs[$#problemIDs]);
-	  }
+		my @problemIDs = $db->listGlobalProblems($setName);
+		my @seq        = (0);
+		if ($#problemIDs != -1) {
+			@seq = jitar_id_to_seq($problemIDs[-1]);
+		}
 
-	  $freeProblemID = seq_to_jitar_id($seq[0]+1);
+		$freeProblemID = seq_to_jitar_id($seq[0] + 1);
 	} else {
-	    $freeProblemID = max($db->listGlobalProblems($setName)) + 1;
+		$freeProblemID = max($db->listGlobalProblems($setName)) + 1;
 	}
 
-	my $value_default = $self->ce->{problemDefaults}->{value};
-	my $max_attempts_default = $self->ce->{problemDefaults}->{max_attempts};
-	my $showMeAnother_default = $self->ce->{problemDefaults}->{showMeAnother};
+	my $value_default                = $self->ce->{problemDefaults}->{value};
+	my $max_attempts_default         = $self->ce->{problemDefaults}->{max_attempts};
+	my $showMeAnother_default        = $self->ce->{problemDefaults}->{showMeAnother};
+	my $showHintsAfter_default       = $self->ce->{problemDefaults}{showHintsAfter};
 	my $att_to_open_children_default = $self->ce->{problemDefaults}->{att_to_open_children};
-	my $counts_parent_grade_default = $self->ce->{problemDefaults}->{counts_parent_grade};
-    # showMeAnotherCount is the number of times that showMeAnother has been clicked; initially 0
+	my $counts_parent_grade_default  = $self->ce->{problemDefaults}->{counts_parent_grade};
+	# showMeAnotherCount is the number of times that showMeAnother has been clicked; initially 0
 	my $showMeAnotherCount = 0;
 
 	my $prPeriod_default = $self->ce->{problemDefaults}->{prPeriod};
 
 	my $value = $value_default;
-	if (defined($params->{value}) and length($params->{value})){$value = $params->{value};}  # 0 is a valid value for $params{value} but we don't want emptystring
-
-	my $maxAttempts = $params->{maxAttempts} || $max_attempts_default;
-	my $showMeAnother = $params->{showMeAnother} || $showMeAnother_default;
-	my $problemID = $params->{problemID};
-	my $countsParentGrade = $params->{counts_parent_grade} || $counts_parent_grade_default;
+	if (defined($params->{value}) and length($params->{value})) {
+		$value = $params->{value};
+	}    # 0 is a valid value for $params{value} but we don't want emptystring
+
+	my $maxAttempts       = $params->{maxAttempts}    || $max_attempts_default;
+	my $showMeAnother     = $params->{showMeAnother}  || $showMeAnother_default;
+	my $showHintsAfter    = $params->{showHintsAfter} || $showHintsAfter_default;
+	my $problemID         = $params->{problemID};
+	my $countsParentGrade = $params->{counts_parent_grade}  || $counts_parent_grade_default;
 	my $attToOpenChildren = $params->{att_to_open_children} || $att_to_open_children_default;
 
 	my $prPeriod = $prPeriod_default;
-	if (defined($params->{prPeriod})){
+	if (defined($params->{prPeriod})) {
 		$prPeriod = $params->{prPeriod};
 	}
 
@@ -704,127 +506,39 @@ sub addProblem {
 	$problemRecord->value($value);
 	$problemRecord->max_attempts($maxAttempts);
 	$problemRecord->showMeAnother($showMeAnother);
-	$problemRecord->{showMeAnotherCount}=$showMeAnotherCount;
+	$problemRecord->showHintsAfter($showHintsAfter);
+	$problemRecord->{showMeAnotherCount}   = $showMeAnotherCount;
 	$problemRecord->{att_to_open_children} = $attToOpenChildren;
-	$problemRecord->{counts_parent_grade} = $countsParentGrade;
+	$problemRecord->{counts_parent_grade}  = $countsParentGrade;
 	$problemRecord->prPeriod($prPeriod);
 	$problemRecord->prCount(0);
 	$db->addGlobalProblem($problemRecord);
 
 	my @results;
 	my @userIDs = $db->listSetUsers($setName);
-	foreach my $userID (@userIDs) {
-		my @result = assignProblemToUser($self, $userID, $problemRecord);
-		push @results, @result if @result;
-	}
-
+	my $result  = assignMultipleProblemsToGivenUsers($db, \@userIDs, $setName, ($problemID));
+	push @results, $result if $result;
 
-	#assignProblemToAllSetUsers($self, $problemRecord);
-	my $out->{text} = encode_utf8_base64("Problem added to ".$setName);
-	return $out;
+	return { text => "Problem added to $setName" };
 }
 
 sub deleteProblem {
-	my ($self,$params) = @_;
+	my ($invocant, $self, $params) = @_;
 
-	my $db = $self->db;
+	my $db      = $self->db;
 	my $setName = $params->{set_id};
 
-	my $file = $params->{path};
+	my $file   = $params->{problemPath};
 	my $topdir = $self->ce->{courseDirs}{templates};
 	$file =~ s|^$topdir/*||;
 
 	my @setGlobalProblems = $db->getGlobalProblemsWhere({ set_id => $setName });
 	for my $problemRecord (@setGlobalProblems) {
-		if($problemRecord->source_file eq $file){
+		if ($problemRecord->source_file eq $file) {
 			$db->deleteGlobalProblem($setName, $problemRecord->problem_id);
 		}
 	}
-	my $out->{text} = encode_utf8_base64("Problem removed from ".$setName);
-	return $out;
-}
-
-
-## Search for set definition files
-use File::Find;
-sub get_set_defs {
-	my $self = shift;
-	my $topdir = $self->ce->{courseDirs}{templates};#shift #sort of hard coded for now;
-	my @found_set_defs;
-	# get_set_defs_wanted is a closure over @found_set_defs
-	my $get_set_defs_wanted = sub {
-		#my $fn = $_;
-		#my $fdir = $File::Find::dir;
-		#return() if($fn !~ /^set.*\.def$/);
-		##return() if(not -T $fn);
-		#push @found_set_defs, "$fdir/$fn";
-		push @found_set_defs, $_ if m|/set[^/]*\.def$|;
-	};
-	find({ wanted => $get_set_defs_wanted, follow_fast=>1, no_chdir=>1}, $topdir);
-	map { $_ =~ s|^$topdir/?|| } @found_set_defs;
-	my $out = {};
-	$out->{ra_out} = \@found_set_defs;
-	return $out;
-}
-
-## Try to make reading of set defs more flexible.  Additional strategies
-## for fixing a path can be added here.
-
-sub munge_pg_file_path {
-	my $self = shift;
-	my $pg_path = shift;
-	my $path_to_set_def = shift;
-	my $end_path = $pg_path;
-	# if the path is ok, don't fix it
-	return($pg_path) if(-e $self->r->ce->{courseDirs}{templates}."/$pg_path");
-	# if we have followed a link into a self contained course to get
-	# to the set.def file, we need to insert the start of the path to
-	# the set.def file
-	$end_path = "$path_to_set_def/$pg_path";
-	return($end_path) if(-e $self->r->ce->{courseDirs}{templates}."/$end_path");
-	# if we got this far, this path is bad, but we let it produce
-	# an error so the user knows there is a troublesome path in the
-	# set.def file.
-	return($pg_path);
+	return { text => "Problem removed from $setName" };
 }
 
-## Read a set definition file.  This could be abstracted since it happens
-## elsewhere.  Here we don't have to process so much of the file.
-
-sub read_set_def {
-	my $self = shift;
-	my $r = $self->r;
-	my $filePathOrig = shift;
-	my $filePath = $r->ce->{courseDirs}{templates}."/$filePathOrig";
-	$filePathOrig =~ s/set.*\.def$//;
-	$filePathOrig =~ s|/$||;
-	$filePathOrig = "." if ($filePathOrig !~ /\S/);
-	my @pg_files = ();
-	my ($line, $got_to_pgs, $name, @rest) = ("", 0, "");
-	if ( open (SETFILENAME, "$filePath") )    {
-		while($line = <SETFILENAME>) {
-			chomp($line);
-			$line =~ s|(#.*)||; # don't read past comments
-			if($got_to_pgs) {
-				unless ($line =~ /\S/) {next;} # skip blank lines
-				($name,@rest) = split (/\s*,\s*/,$line);
-				$name =~ s/\s*//g;
-				push @pg_files, $name;
-			} else {
-				$got_to_pgs = 1 if ($line =~ /problemList\s*=/);
-			}
-		}
-	} else {
-		$self->addbadmessage("Cannot open $filePath");
-	}
-	# This is where we would potentially munge the pg file paths
-	# One possibility
-	@pg_files = map { $self->munge_pg_file_path($_, $filePathOrig) } @pg_files;
-	return(@pg_files);
-}
-
-=back
-
-=cut
-
 1;
diff --git a/t/TestWW.html.dist b/t/TestWW.html.dist
deleted file mode 100644
index 9016edb971..0000000000
--- a/t/TestWW.html.dist
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="utf-8" />
-	<title>Embed WW in HTML page</title>
-	<meta name="generator" content="BBEdit 11.0" />
-	<link href="https://demo.webwork.rochester.edu/webwork2_files/css/knowlstyle.css" rel="stylesheet" type="text/css" />
-	<link href="https://demo.webwork.rochester.edu/webwork2_files/js/apps/MathView/mathview.css" rel="stylesheet" />
-
-	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-	<script>
-	$(document).ready(function(){
-		$( ".clickme" ).click(function() {
-		  $( this).next().slideToggle( "slow", function() {
-			// Animation complete.
-		  });
-		});
-
-	   // jQuery methods go here...
-	});
-	</script>
-	<style>
-		.clickme {background-color: #ccccFF ;}
-		iframe {
-			margin-left: 20px;
-			padding-left: 10px;
-		}
-	</style>
-</head>
-<body>
-<h1>Example of embedding WeBWorK problems in HTML pages. </h1>
-<h2>Problem 1</h2>
-<p>
-This problem will help you to understand averages. 
-</p>
-<div class="clickme">
-  Click here to show problem1
-</div>
-<div class="wwproblem" style="display: none;">
-<hr>
-<iframe  width="800" height="600" 
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=Library/LoyolaChicago/Precalc/Chap1Sec2/Q03.pg
-	&problemSeed=123567
-	&courseID=daemon_course
-	&userID=daemon
-	&displayMode=images
-	&course_password=daemon
-	&outputformat=simple">
-</iframe>
-<hr>
-</div>
-
-<h2>Problem 2</h2>
-<p>
-This problem gives you practice finding tangents to curves in the plane.
-</p>
-
-<div class="clickme">
-  Click here to show problem 2
-</div>
-<div class="wwproblem" style="display: none;">
-<hr>
-<iframe  width="800" height="600" 
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=Library/Utah/Calculus_I/set5_The_Derivative/1210s5p17/1210s5p17.pg
-	&problemSeed=123567
-	&courseID=daemon_course
-	&userID=daemon
-	&displayMode=MathJax
-	&course_password=daemon
-	&outputformat=simple">
-</iframe>
-<hr>
-</div>
-
-<h2>Problem 3</h2>
-<p>
-This is for debugging and shows all the details of the hash returned by PG.
-</p>
-
-<div class="clickme">
-  Click here to show problem 3
-</div>
-<div class="wwproblem" style="display: none;">
-<hr>
-<iframe  width="800" height="600" 
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?
-	&answersSubmitted=0
-	&sourceFilePath=Library/Utah/Calculus_I/set5_The_Derivative/1210s5p17/1210s5p17.pg
-	&problemSeed=123567890
-	&displayMode=MathJax
-	&courseID=daemon_course
-	&userID=daemon	
-	&course_password=daemon
-	&outputformat=debug">
-</iframe>
-<hr>
-</div>
-
-<h2>Problem 4</h2>
-<p>
-This contains embedded PG code in base64 format.
-</p>
-<div class="clickme">
-  Click here to show problem 4 
-</div>
-<div class="wwproblem" style="display: none;">
-<hr>
-<iframe  width="800" height="600" 
-src="https://demo.webwork.rochester.edu/webwork2/html2xml?
-	&answersSubmitted=0
-	&problemSeed=123567890
-	&displayMode=MathJax
-	&courseID=daemon_course
-	&userID=daemon	
-	&course_password=daemon
-	&outputformat=simple
-	&problemSource=
-	IyBERVNDUklQVElPTgojIFByb2JsZW0gZnJvbSBDYWxjdWx1cywgc2luZ2xlIHZhcmlhYmxlLCBI%0AdWdoZXMtSGFsbGV0dCBldCBhbC4sIDR0aCBlZC4KIyBXZUJXb3JLIHByb2JsZW0gd3JpdHRlbiBi%0AeSBHYXZpbiBMYVJvc2UsIDxnbGFyb3NlQHVtaWNoLmVkdT4KIyBFTkRERVNDUklQVElPTgoKIyMg%0AVGFnZ2VkIGJ5IGdsciAwMi8wOC8wOQoKIyMgREJzdWJqZWN0KENhbGN1bHVzIC0gc2luZ2xlIHZh%0AcmlhYmxlKQojIyBEQmNoYXB0ZXIoSW50ZWdyYWxzKQojIyBEQnNlY3Rpb24oUmllbWFubiBzdW1z%0AKQojIyBJbnN0aXR1dGlvbihVbml2ZXJzaXR5IG9mIE1pY2hpZ2FuLCBGb3J0IExld2lzIENvbGxl%0AZ2UpCiMjIEF1dGhvcihHYXZpbiBMYVJvc2UsIFBhdWwgUGVhcnNvbikKIyMgTUxUKHRhYmxlcykK%0AIyMgTGV2ZWwoMikKIyMgTU8oMSkKIyMgVGl0bGVUZXh0MSgnQ2FsY3VsdXMnKQojIyBBdXRob3JU%0AZXh0MSgnSHVnaGVzLUhhbGxldHQnKQojIyBFZGl0aW9uVGV4dDEoJzQnKQojIyBTZWN0aW9uMSgn%0ANS4yJykKIyMgUHJvYmxlbTEoJzcnKQojIyBUaXRsZVRleHQyKCdDYWxjdWx1cycpCiMjIEF1dGhv%0AclRleHQyKCdIdWdoZXMtSGFsbGV0dCcpCiMjIEVkaXRpb25UZXh0MignNScpCiMjIFNlY3Rpb24y%0AKCc1LjInKQojIyBQcm9ibGVtMignOCcpCiMjIEtFWVdPUkRTKCdjYWxjdWx1cycsICdpbnRlZ3Jh%0AbCcsICdkZWZpbml0ZSBpbnRlZ3JhbCcsICdhcmVhJykKCiMjIFRleHRib29rIHRhZ3MKIyMgSEhD%0AaGFwdGVyMSgnS2V5IENvbmNlcHQ6IFRoZSBEZWZpbml0ZSBJbnRlZ3JhbCcpCiMjIEhIQ2hhcHRl%0AcjIoJ0tleSBDb25jZXB0OiBUaGUgRGVmaW5pdGUgSW50ZWdyYWwnKQoKRE9DVU1FTlQoKTsKbG9h%0AZE1hY3JvcygKIlBHc3RhbmRhcmQucGwiLAojIlBHYmFzaWNtYWNyb3MucGwiLAojIlBHY2hvaWNl%0AbWFjcm9zLnBsIiwKIyJQR2Fuc3dlcm1hY3Jvcy5wbCIsCiMiUEdhdXhpbGlhcnlGdW5jdGlvbnMu%0AcGwiLAojIlBHYXN1LnBsIiwgICAgICAgICAgICAgICAjIGdldCBwY19ldmFsdWF0b3IKIk1hdGhP%0AYmplY3RzLnBsIiwKKTsKIApDb250ZXh0KCJOdW1lcmljIik7CgpURVhUKGJlZ2lucHJvYmxlbSgp%0AKTsKJHNob3dQYXJ0aWFsQ29ycmVjdEFuc3dlcnMgPSAxOwoKIyBnZW5lcmF0ZSBhIHRhYmxlIG9m%0AIGRhdGEgZm9yIGYoeCkKQGZkYXRhID0gKCk7CiRmZGF0YVs1XSA9IHJhbmRvbSgxLDEwLDEpOwok%0AZHkgPSByYW5kb20oMTYsMjgsMSk7CmZvciAoIG15ICRpPTQ7ICRpPj0wOyAkaS0tICkgewogICAg%0AJGZkYXRhWyRpXSA9ICRmZGF0YVskaSsxXSArICRkeTsKICAgICRkeSA9IGludCgkZHkvMik7Cn0K%0ACiMgd2UgcHV0IHRoZXNlIGFzIHRoZSBkYXRhIGZvciB4IHZhbHVlcyB3aXRoCiRkeCA9IHJhbmRv%0AbSgyLDQsMSk7CkB4ZGF0YSA9ICggMCwgJGR4LCAyKiRkeCwgMyokZHgsIDQqJGR4LCA1KiRkeCAp%0AOwoKIyB0aGVuIHBvc3NpYmxlIGVzdGltYXRlcyBmb3IgdGhlIGludGVncmFsIGFyZQokbGhzID0g%0AJGR4KigkZmRhdGFbMF0gKyAkZmRhdGFbMV0gKyAkZmRhdGFbMl0gKyAkZmRhdGFbM10gKyAkZmRh%0AdGFbNF0pOwokcmhzID0gJGR4KigkZmRhdGFbMV0gKyAkZmRhdGFbMl0gKyAkZmRhdGFbM10gKyAk%0AZmRhdGFbNF0gKyAkZmRhdGFbNV0pOwokYXZnID0gKCRsaHMgKyAkcmhzKS8yOwoKQ29udGV4dCgp%0ALT50ZXhTdHJpbmdzOwpCRUdJTl9URVhUCgpDb25zaWRlciB0aGUgZm9sbG93aW5nIHRhYmxlOgok%0AUEFSCiRCQ0VOVEVSClx7IGJlZ2ludGFibGUoNykgXH0KXHsgcm93KCAiXCh4XCkiLCBAeGRhdGEg%0AKSBcfQpceyByb3coICJcKGYoeClcKSIsIEBmZGF0YSApIFx9Clx7IGVuZHRhYmxlKCkgXH0KJEVD%0ARU5URVIKJFBBUgooYSkgVXNlIHRoaXMgZGF0YSBhbmQgYSBsZWZ0LWVuZHBvaW50IFJpZW1hbm4g%0Ac3VtIHRvIGVzdGltYXRlIHRoZSBpbnRlZ3JhbDoKJEJSClwoIFxpbnRfMF57JHhkYXRhWzVdfSBm%0AKHgpIFwsIGR4IFxhcHByb3ggXCkgXHsgYW5zX3J1bGUoNDUpIFx9CiRQQVIKKGIpIFVzZSB0aGlz%0AIGRhdGEgYW5kIGEgcmlnaHQtZW5kcG9pbnQgUmllbWFubiBzdW0gdG8gZXN0aW1hdGUgdGhlIGlu%0AdGVncmFsOgokQlIKXCggXGludF8wXnskeGRhdGFbNV19IGYoeCkgXCwgZHggXGFwcHJveCBcKSBc%0AeyBhbnNfcnVsZSg0NSkgXH0KJFBBUgooYykgRmluZCB0aGUgYXZlcmFnZSBvZiB0aGUgbGVmdC0g%0AYW5kIHJpZ2h0LWVuZHBvaW50IFJpZW1hbm4gc3VtcyB0byBlc3RpbWF0ZSB0aGUgaW50ZWdyYWw6%0ACiRCUgpcKCBcaW50XzBeeyR4ZGF0YVs1XX0gZih4KSBcLCBkeCBcYXBwcm94IFwpIFx7IGFuc19y%0AdWxlKDQ1KSBcfQoKCkVORF9URVhUCkNvbnRleHQoKS0%2Bbm9ybWFsU3RyaW5nczsKCkFOUyggQ29t%0AcHV0ZSgiJGxocyIpLT5jbXAodG9sVHlwZT0%2BJ2Fic29sdXRlJyx0b2xlcmFuY2U9PjAuMDEpICk7%0ACkFOUyggQ29tcHV0ZSgiJHJocyIpLT5jbXAodG9sVHlwZT0%2BJ2Fic29sdXRlJyx0b2xlcmFuY2U9%0APjAuMDEpICk7CkFOUyggQ29tcHV0ZSgiJGF2ZyIpLT5jbXAodG9sVHlwZT0%2BJ2Fic29sdXRlJyx0%0Ab2xlcmFuY2U9PjAuMDEpICk7CgojQU5TKHBjX2V2YWx1YXRvciggWyBudW1fY21wKCRsaHMpLCAx%0ALCAnJyBdLAojCQkgICBbIG51bV9jbXAoJHJocyksIDEsICcnIF0sCiMJCSAgIFsgbnVtX2NtcCgk%0AYXZnKSwgMSwgJycgXSApICk7CgoKCkNvbnRleHQoKS0%2BdGV4U3RyaW5nczsKU09MVVRJT04oRVYz%0AKDw8J0VORF9TT0xVVElPTicpKTsKJFBBUiBTT0xVVElPTiAkUEFSCgpXZSBjYW4gZXN0aW1hdGUg%0AdGhlIGludGVncmFsIHdpdGggYSBsZWZ0IG9yIHJpZ2h0IFJpZW1hbm4gc3VtLCBvciB3aXRoIHRo%0AZQphdmVyYWdlIG9mIHRoZSB0d28uICBUaGUgbGVmdCBSaWVtYW5uIHN1bSBpcyAKXFsKXGludF8w%0AXnskeGRhdGFbNV19IGYoeCkgZHggXGFwcHJveAogICgkZHgpKCRmZGF0YVswXSArICRmZGF0YVsx%0AXSArICRmZGF0YVsyXSArICRmZGF0YVszXSArICRmZGF0YVs0XSkgPSAKICAkbGhzLgpcXQpUaGUg%0AcmlnaHQgUmllbWFubiBzdW0gaXMgClxbClxpbnRfMF57JHhkYXRhWzVdfSBmKHgpIGR4IFxhcHBy%0Ab3gKICAoJGR4KSgkZmRhdGFbMV0gKyAkZmRhdGFbMl0gKyAkZmRhdGFbM10gKyAkZmRhdGFbNF0g%0AKyAkZmRhdGFbNV0pID0gCiAgJHJocy4KXF0KVGh1cyB0aGUgYXZlcmFnZSBvZiB0aGUgdHdvIGlz%0AIFwoIFxmcmFjMTIgKCRsaHMgKyAkcmhzKSA9ICRhdmcgXCkuCgpFTkRfU09MVVRJT04KQ29udGV4%0AdCgpLT5ub3JtYWxTdHJpbmdzOwoKCkNPTU1FTlQoJ01hdGhPYmplY3QgdmVyc2lvbicpOwpFTkRE%0AT0NVTUVOVCgpOwoK%0A
-" base64="1" uri="1">
-	
-<hr>
-</div>
-</body>
-</html>
diff --git a/t/alternate_templates.html.dist b/t/alternate_templates.html.dist
deleted file mode 100644
index 9363dfe37e..0000000000
--- a/t/alternate_templates.html.dist
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="utf-8" />
-	<title>test alternate templates</title>
-	<meta name="generator" content="BBEdit 11.1" />
-</head>
-<body>
-<p>
-This illustrates the possibility of using the "simple" template when calling
-a webwork2 site.  This template hides much of the frame including the navigation
-buttons which usually surround the rendered problem.  The expected use case
-is when embedding a PG problem or homework set in an html page or LMS.
-<p>
-You will need to customize this file to access the website you are testing.
-</p>
-
-<p>
-If you use it to test demo.webwork.rochester.edu (the default) you will need to login
-as guest the first time you access the site.  After that the cookie stored
-on your computer will give you access to the pages.
-</p>
-
-
-<h3>Links to a single problem</h3>
-<p>
-<a href="http://localhost/webwork2/maa101/Demo/2">regular template</a>
-</p>
-
-<p>
-<a href="http://localhost/webwork2/maa101/Demo/2?templateName=simple">simple template</a>
-
-</p>
-<h3>Embedddings</h3>
-<h4>
-Regular (system) template for a single problem
-</h4>
-<p>
-<iframe src= "http://localhost/webwork2/maa101/Demo/2" height="600" width="800"> 
-iframe here
-</iframe>
-</p>
-
-<h4>
-Simple  template for a single problem
-</h4>
-
-<p>
-<iframe src= "http://localhost/webwork2/maa101/Demo/2?templateName=simple" height="600" width="800"> 
-iframe here
-</iframe>
-</p>
-
-<h3> Alternate templates for Homework set page (ProblemSet.pm)</h3>
-
-<p>
-Versions embedded in iframes are illustrated below.  One can also simply use direct links to bring the WeBWorK page
-in a new window or tab or to replace the current browser page.
-</p>
-
-<p>
-The internal links on the homework set homepage and the course homepage revert to the standard "system" template.
-The "simple" template is not (currently) sticky in this case as it is when viewing a single problem. We're awaiting further
-use cases to see if these internal links should be sticky (this hides navigational links) or whether a more complicated 
-algorithm is required for determining which template to use.
-</p>
-<h4>
-Regular  template -- for a homework set page (Demo)
-</h4>
-
-<p>
-<iframe src= "http://localhost/webwork2/maa101/Demo" height="600" width="800"> 
-iframe here
-</iframe>
-</p>
-<h4>
-Simple  template -- for a homework set page (Demo)
-</h4>
-
-<p>
-<iframe src= "http://localhost/webwork2/maa101/Demo?templateName=simple" height="600" width="800"> 
-iframe here
-</iframe>
-</p>
-
-<h3> Alternate templates for Course homepage page (ProblemSets.pm)</h3>
-
-<h4>
-regular  template -- for course home page 
-</h4>
-
-<p>
-<iframe src= "http://localhost/webwork2/maa101" height="600" width="800"> 
-iframe here
-</iframe>
-</p>
-<h4>
-Simple  template -- for course home page 
-</h4>
-
-<p>
-<iframe src= "http://localhost/webwork2/maa101?templateName=simple" height="600" width="800"> 
-iframe here
-</iframe>
-</p>
-</body>
-</html>
diff --git a/t/grab_course_environment.pl b/t/grab_course_environment.pl
deleted file mode 100755
index 3034533379..0000000000
--- a/t/grab_course_environment.pl
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/Volumes/WW_test/opt/local/bin/perl -w
-
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 2000-2022 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-
-=head1 NAME
-
-
-=head1 SYNOPSIS
-
-
-
-=head1 DESCRIPTION
-
-Include this in other programs that need to know the location of the WeBWorK root directory
-and basic WeBWorK environment variables.
-
-=cut
-
-use strict;
-use warnings;
-use Carp;
-$Carp::Verbose = 1;
-
-#######################################################
-# Find the webwork2 root directory
-#######################################################
-BEGIN {
-	die "WEBWORK_ROOT not found in environment. \n
-             WEBWORK_ROOT can be defined in your .cshrc or .bashrc file\n
-             It should be set to the webwork2 directory (e.g. /opt/webwork/webwork2)"
-		unless exists $ENV{WEBWORK_ROOT};
-
-	# Unused variable, but define it twice to avoid an error message.
-	$WeBWorK::Constants::WEBWORK_DIRECTORY = $ENV{WEBWORK_ROOT};
-
-	print "Webwork root directory is $WeBWorK::Constants::WEBWORK_DIRECTORY\n\n";
-}
-
-BEGIN {
-	my $hostname = 'http://localhost';
-	my $courseName = 'daemon_course';
-
-	#Define the OpaqueServer static variables
-	my $topDir = $WeBWorK::Constants::WEBWORK_DIRECTORY;
-	$topDir =~ s|webwork2?$||;   # remove webwork2 link
-	my $root_dir = "$topDir/ww_opaque_server";
-	my $root_pg_dir = "$topDir/pg";
-	my $root_webwork2_dir = "$topDir/webwork2";
-
-	my $rpc_url = '/opaqueserver_rpc';
-	my $files_url = '/opaqueserver_files';
-	my $wsdl_url = '/opaqueserver_wsdl';
-
-
-	# Find the library directories for
-	# ww_opaque_server, pg and webwork2
-	# and place them in the search path for modules
-
-	eval "use lib '$root_dir/lib'"; die $@ if $@;
-	eval "use lib '$root_pg_dir/lib'"; die $@ if $@;
-	eval "use lib '$root_webwork2_dir/lib'"; die $@ if $@;
-
-	############################################
-	# Define base urls and the paths to base directories,
-	############################################
-	$WebworkBase::TopDir = $topDir;   #/opt/webwork/
-	$WebworkBase::Host = $hostname;
-	$WebworkBase::RootDir = $root_dir;
-	$WebworkBase::RootPGDir = $root_pg_dir;
-	$WebworkBase::RootWebwork2Dir = $root_webwork2_dir;
-	$WebworkBase::RPCURL = $rpc_url;
-	$WebworkBase::WSDLURL = $wsdl_url;
-
-	$WebworkBase::FilesURL = $files_url;
-	$WebworkBase::courseName = $courseName;
-
-	# suppress warning messages
-	my $foo = $WebworkBase::TopDir;
-	$foo = $WebworkBase::RootDir;
-	$foo = $WebworkBase::Host;
-	$foo = $WebworkBase::WSDLURL;
-	$foo = $WebworkBase::FilesURL;
-	$foo ='';
-} # END BEGIN
-
-
-
-
-use WeBWorK::CourseEnvironment;
-use WeBWorK::DB;
-
-
-##############################
-# Create the course environment $ce and the database object $db
-##############################
-$WebworkBase::ce = create_course_environment();
-my $dbLayout = $WebworkBase::ce->{dbLayout};
-$WebworkBase::db = WeBWorK::DB->new($dbLayout);
-my $foo = $WebworkBase::db;
-$foo = '';
-####################################################################################
-# Create_course_environment -- utility function
-# requires webwork_dir
-# requires courseName to keep warning messages from being reported
-# Remaining inputs are required for most use cases of $ce but not for all of them.
-####################################################################################
-
-
-
-sub create_course_environment {
-	my $ce = WeBWorK::CourseEnvironment->new(
-				{webwork_dir		=>		$WebworkBase::RootWebwork2Dir,
-				 courseName         =>      $WebworkBase::courseName,
-				 webworkURL         =>      $WebworkBase::RPCURL,
-				 pg_dir             =>      $WebworkBase::RootPGDir,
-				 });
-	warn "Unable to find environment for course: |$WebworkBase::courseName|" unless ref($ce);
-	return ($ce);
-}
-
-
-1;
diff --git a/t/testAttemptsTable.pl b/t/testAttemptsTable.pl
deleted file mode 100755
index 4d67c00c50..0000000000
--- a/t/testAttemptsTable.pl
+++ /dev/null
@@ -1,287 +0,0 @@
-#!/Volumes/WW_test/opt/local/bin/perl -w
-use 5.010;
-
-# Test AttemptsTable.pm
-BEGIN {
-	require "./grab_course_environment.pl";
-	eval "use lib '$WebworkBase::RootPGDir/lib'"; die $@ if $@;
-	eval "use lib '$WebworkBase::RootWebwork2Dir/lib'"; die $@ if $@;
-}
-use WeBWorK::Utils::AttemptsTable;
-use WeBWorK::PG::ImageGenerator;
-use WeBWorK::Localize;
-
-use HTML::Entities;
-
-# create fake DATA
-my $answers = {
-	AnSwEr0001	=>	{
-		_filter_name	=>	 "dereference_array_ans",
-		ans_label	=>	 "AnSwEr0001",
-		ans_message	=>	"", 
-		ans_name	=>	 "AnSwEr0001",
-		correct_ans	=>	 "8 * e^(2 * (x - 4))",
-		correct_ans_latex_string	=>	 "8e^{2\\!\\left(x-4\\right)}",		
-		correct_value	=>	 "(8*e^[2*(x-4)])",
-		debug	=>	 0,
-		diagnostics	=>	"", 
-		done	=>	 1,
-		error_flag	=>	 "",
-		error_message	=>	 "",
-		ignoreInfinity	=>	 1,
-		ignoreStrings	=>	 1,
-		original_student_ans	=> "8 * e^(2 * (x - 4))",	 
-		preview_latex_string	=> "8e^{2\\!\\left(x-4\\right)}",	 
-		preview_text_string	=>	 "8 * e^(2 * (x - 4))",
-		score	=>	 0,
-		showDomainErrors	=>	 1,
-		showEqualErrors	=>	 1,
-		showTypeWarnings	=>	 1,
-		showUnionReduceWarnings	=>	 1,
-		student_ans	=>	 "",
-		studentsMustReduceUnions	=>	 1,
-		type	=>	 "Value (Formula)",
-		upToConstant	=>	 0,
-	},
-	AnSwEr0002	=>	 {
-		_filter_name	=>	 "dereference_array_ans",
-		ans_label	=>	 "AnSwEr0002",
-		ans_message	=>	 "",
-		ans_name	=>	 "AnSwEr0002",
-		correct_ans	=>	 16,
-		correct_ans_latex_string	=>	 16,
-		correct_value	=>	 16,
-		debug	=>	 0,
-		done	=>	 1,
-		error_flag	=>"",	 
-		error_message	=>"",	 
-		ignoreInfinity	=>	 1,
-		ignoreStrings	=>	 1,
-		original_student_ans	=>"16",	 
-		preview_latex_string	=>	 "16",
-		preview_text_string	=>	 "16",
-		score	=>	 1,
-		showEqualErrors	=>	 1,
-		showTypeWarnings	=>	 1,
-		showUnionReduceWarnings	=>	 1,
-		student_ans	=>	 "",
-		studentsMustReduceUnions	=>	 1,
-		type	=>	 "Value (Real)",
-	},
-	AnSwEr0003	=>	 {
-		_filter_name	=>	 "dereference_array_ans",
-		ans_label	=>	 "AnSwEr0003",
-		ans_message	=>	 "",
-		ans_name	=>	 "AnSwEr0003",
-		correct_ans	=>	 "-0.0625",
-		correct_ans_latex_string	=>	 "-0.0625",
-		correct_value	=>	 "-0.0625",
-		debug	=>	 0,
-		done	=>	 1,
-		error_flag	=> "",	 
-		error_message	=> "",	 
-		ignoreInfinity	=>	 1,
-		ignoreStrings	=>	 1,
-		original_student_ans	=> "-0.0625", 
-		preview_latex_string	=> "-0.0625",	 
-		preview_text_string	    => "-0.0625",	 
-		score	=>	 1,
-		showEqualErrors	=>	 1,
-		showTypeWarnings	=>	 1,
-		showUnionReduceWarnings	=>	 1,
-		student_ans	=>	 "",
-		studentsMustReduceUnions	=>	 1,
-		type	=>	 "Value (Real)",
-	},
-	AnSwEr0004	=>	 {
-		_filter_name	=>	 "dereference_array_ans",
-		ans_label	=>	 "AnSwEr0004",
-		ans_message	=>	 "answer message",
-		ans_name	=>	 "AnSwEr0004",
-		correct_ans	=>	 "2 * y",
-		correct_ans_latex_string	=>	 "2y",
-		correct_value	=>	 "(2*y)",
-		debug	=>	 0,
-		diagnostics	=> "",	 
-		done	=>	 1,
-		error_flag	=> "",	 
-		error_message	=>	"", 
-		ignoreInfinity	=>	 1,
-		ignoreStrings	=>	 1,
-		original_student_ans	=> "2y",	 
-		preview_latex_string	=> "2y",
-		preview_text_string	=>	 "2y",
-		score	=>	 0,
-		showDomainErrors	=>	 1,
-		showEqualErrors	=>	 1,
-		showTypeWarnings	=>	 1,
-		showUnionReduceWarnings	=>	 1,
-		student_ans	=>	 "",
-		studentsMustReduceUnions	=>	 1,
-		type	=>	 "Value (Formula)",
-		upToConstant	=>	 0,
-	},
-	AnSwEr0005	=>	 {
-		_filter_name	=>	 "dereference_array_ans",
-		ans_label	=>	 "AnSwEr0005",
-		ans_message	=>	 "answer message",
-		ans_name	=>	 "AnSwEr0005",
-		correct_ans	=>	 "4 + (2 /2)*((8 *8 ) - y*y)",
-		correct_ans_latex_string	=>	 "4+1\\!\\left(64-yy\\right)",
-		correct_value	=>	 "(4+1*(64-y*y))",
-		debug	=>	 0,
-		diagnostics	=>"",	 
-		done	=>	 1,
-		error_flag	=>"",	 
-		error_message	=> "error message",	 
-		ignoreInfinity	=>	 1,
-		ignoreStrings	=>	 1,
-		original_student_ans	=> "4 + (2 /2)*((8 *8 ) - y*y)",	 
-		preview_latex_string	=> "4+1\\!\\left(64-yy\\right)",	 
-		preview_text_string	=>	 "",
-		score	=>	 0,
-		showDomainErrors	=>	 1,
-		showEqualErrors	=>	 1,
-		showTypeWarnings	=>	 1,
-		showUnionReduceWarnings	=>	 1,
-		student_ans	=>	 "",
-		studentsMustReduceUnions	=>	 1,
-		type	=>	 "Value (Formula)",
-		upToConstant	=>	 0,
-	}
-};
-
-my $ce = $WebworkBase::ce;
-my $answerOrder = [sort keys %{ $answers }];
-my $site_url = "http://localhost";
-my $moodle_prefix = "%%";
-######################################################
-	my %imagesModeOptions = %{$ce->{pg}->{displayModeOptions}->{images}};
-	
-	my $imgGen = WeBWorK::PG::ImageGenerator->new(
-		tempDir         => $ce->{webworkDirs}->{tmp},
-		latex	        => $ce->{externalPrograms}->{latex},
-		dvipng          => $ce->{externalPrograms}->{dvipng},
-		useCache        => 1,
-		cacheDir        => $ce->{webworkDirs}->{equationCache},
-		cacheURL        => $site_url . $ce->{webworkURLs}->{equationCache},
-		cacheDB         => $ce->{webworkFiles}->{equationCacheDB},
-		dvipng_align    => $imagesModeOptions{dvipng_align},
-		dvipng_depth_db => $imagesModeOptions{dvipng_depth_db},
-	);
-	
-
-
-
-######################################################
-#print "add strings to table\n";
-
-my $tbl = WeBWorK::Utils::AttemptsTable->new(
-	$answers,
-	answersSubmitted       => 1,
-	answerOrder            => $answerOrder,
-	displayMode            => 'MathJax',
-	showAttemptPreviews    => 1,
-	showAttemptResults     => 1,
-	showCorrectAnswers     => 1,
-	showMessages           => 1,
-	showSummary            => 1,
-	imgGen                 => $imgGen,	
-	ce                     => undef, # need this if no imgGen,
-	maketext               => WeBWorK::Localize::getLoc("en"),
-);
-@dataString=();
-push @dataString, "answers ", $tbl->answers,"<br/>\n";
-push @dataString, "answersSubmitted ", $tbl->answersSubmitted,"<br/>\n";
-push @dataString, "displayMode ", $tbl->displayMode,"<br/>\n";
-push @dataString, "imgGen ", ($tbl->imgGen)//'undefined',"<br/>\n";
-push @dataString, "answerOrder ", join(" ", @{$tbl->answerOrder}),"<br/>\n";
-push @dataString, "correct_ids ", $tbl->correct_ids//'',"<br/>\n";
-push @dataString, "incorrect_ids ", $tbl->incorrect_ids//'',"<br/>\n";
-
-push @dataString, "showAttemptPreviews ", $tbl->showAttemptPreviews,"<br/>\n";
-push @dataString, "showAttemptResults ", $tbl->showAttemptResults,"<br/>\n";
-push @dataString, "showCorrectAnswers ", $tbl->showCorrectAnswers,"<br/>\n";
-push @dataString, "showMessages ", $tbl->showMessages,"<br/>\n";
-push @dataString, "<br/>\n<br/>\n<br/>\n";
-$dataString = join('',@dataString);
-# 
-# 
-# print "processed strings ", join(" ", @{$tbl->imgGen->{strings}}), "\n\n";
-# print "next is render\n";
-
-
-	
-# say "tbl is of type ", ref($tbl);
-# say $tbl;
-# say "displayMode ", $tbl->displayMode;
-# say "answers ", $tbl->answers;
-# say "answersSubmitted = ", $tbl->answersSubmitted;
-
-my $answerTemplate = $tbl->answerTemplate;
-my $color_input_blanks_script = $tbl->color_answer_blanks;
-
-# print "processed strings ", join(" ", @{$tbl->imgGen->{strings}}), "\n\n";
-# print "next is render\n";
-
-
-# render equation images
-$tbl->imgGen->render(refresh => 1) if $tbl->displayMode eq 'images';
-
-# say "imgGen cacheURL", $imgGen->{cacheURL};
-# say "imgGen cacheDir", $imgGen->{cacheDir};
-# say "imgGen cacheDB", $imgGen->{cacheDB};
-# say "ce     cacheDB", $ce->{webworkFiles}->{equationCacheDB};
-# say "imgGen tempDir", $imgGen->{tempDir};
-
-print <<EOF
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="utf-8" />
-	<title>attempts table</title>
-	<script src="https://demo.webwork.rochester.edu/webwork2_files/js/apps/InputColor/color.js" type="text/javascript"></script>
-	<link rel="stylesheet" type="text/css" href="https://demo.webwork.rochester.edu/webwork2_files/themes/math4/math4.css"/>
-	<script type="text/javascript" src="https://demo.webwork.rochester.edu/webwork2_files/mathjax/MathJax.js?config=TeX-MML-AM_HTMLorMML-full"></script>
-	<script src="https://demo.webwork.rochester.edu/webwork2_files/js/apps/AddOnLoad/addOnLoadEvent.js" type="text/javascript"></script>
-	$color_input_blanks_script
-	<script type="text/javascript" src="https://demo.webwork.rochester.edu/webwork2_files/js/vendor/jquery/jquery.js"></script>
-	<script type="text/javascript" src="https://demo.webwork.rochester.edu/webwork2_files/js/jquery-ui-1.9.0.js"></script>
-	<script type="text/javascript" src="https://demo.webwork.rochester.edu/webwork2_files/js/vendor/bootstrap/js/bootstrap.js"></script>
-	<script type="text/javascript" src="/webwork2_files/js/vendor/bootstrap/js/bootstrap.js"></script>
-
-	<script  type="text/javascript"
-		$(function(){
-			$("table.attemptResults td[onmouseover*='Tip']").each(function () {
-			var data = $(this).attr('onmouseover').match(/Tip\('(.*)'/);
-			if (data) { data = data[1] }; // not sure I understand this, but sometimes the match fails 
-			//on the presentation of a matrix  and then causes errors throughout the rest of the script
-			$(this).attr('onmouseover','');
-			if (data) {
-				$(this).wrapInner('<div class="results-popover" />');
-
-				var popdiv = $('div', this);
-				popdiv.popover({placement:'bottom', html:'true', trigger:'click',content:data});	
-			} 
-		
-			});
-		}
-    </script>
-	<meta name="generator" content="BBEdit 11.1" />
-</head>
-<body>
-<script src="https://demo.webwork.rochester.edu/webwork2_files/js/legacy/vendor/wz_tooltip.js" type="text/javascript"></script>
-$answerTemplate
-<p>
-<input type="text" name="AnSwEr0002" id = "AnSwEr0002" size=40 value="16 right answer"><br/>
-<input type="text" name="AnSwEr0004" id = "AnSwEr0004" size=40 value="wrong answer">
-</p>
-<h4>DATA</h4>
-<p>
-$dataString
-</p>
-
-</body>
-</html>
-EOF
-
diff --git a/t/test_fileManager.pl b/t/test_fileManager.pl
deleted file mode 100644
index 01c9cd50c4..0000000000
--- a/t/test_fileManager.pl
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/Volumes/WW_test/opt/local/bin/perl -w
-use 5.010;
-use warnings;
-
-BEGIN {
-        require "./grab_course_environment.pl";
-        eval "use lib '$WebworkBase::RootPGDir/lib'"; die $@ if $@;
-        eval "use lib '$WebworkBase::RootWebwork2Dir/lib'"; die $@ if $@;
-}
-
-use Test::More tests => 14;
-use WeBWorK::ContentGenerator::Instructor::FileManager qw/isText/;
-
-ok WeBWorK::ContentGenerator::Instructor::FileManager::isText("abcdghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"), 'ordinary string is text';
-ok WeBWorK::ContentGenerator::Instructor::FileManager::isText("abc\ndef"), 'string with newline is text';
-ok WeBWorK::ContentGenerator::Instructor::FileManager::isText("abc\r\ndef"), 'string with CRLF (windows style) is text';
-ok !WeBWorK::ContentGenerator::Instructor::FileManager::isText("abcdef\x01\x02abcdef"), 'string with 2 consecutive control characters it not text';
-ok !WeBWorK::ContentGenerator::Instructor::FileManager::isText("\x01\x1F\x7FHD08U23NV\x00\x08"), 'string with multiple blocks of 2+ control characters is not text';
-ok WeBWorK::ContentGenerator::Instructor::FileManager::isText("abcdef\x0Aasdfd"), 'text with 1 control character is still considered text';
-ok WeBWorK::ContentGenerator::Instructor::FileManager::isText("\x00abcdef\x1Fghijklm"), 'text with multiple instances of single isolated control characters is still considered text';
-ok WeBWorK::ContentGenerator::Instructor::FileManager::isText("abc\n\ndef\n\n\n\nghijklm"), 'text with multiple consecutive newlines is text';
-ok WeBWorK::ContentGenerator::Instructor::FileManager::isText("abc\r\n\r\ndef\r\n\r\n\r\n\r\nghijklm"), 'text with multiple consecutive CRLF\'s (windows style) is text';
-ok WeBWorK::ContentGenerator::Instructor::FileManager::isText("                 "), 'string of all spaces is text';
-ok WeBWorK::ContentGenerator::Instructor::FileManager::isText("      \r\n\t\r\n\t        "), 'string of all spaces, tabs, CRs and newlines is text';
-ok WeBWorK::ContentGenerator::Instructor::FileManager::isText("abcdef\t\t\t\tasdfjka"), 'string with multiple consecutive tabs is text';
-ok WeBWorK::ContentGenerator::Instructor::FileManager::isText("abc\x00\ndef"), 'control character before newline surrounded by ASCII chars is text';
-ok WeBWorK::ContentGenerator::Instructor::FileManager::isText("abc\n\x00def"), 'newline before control character surrounded by ASCII chars is text';
diff --git a/t/test_formats.pl b/t/test_formats.pl
deleted file mode 100644
index c45d9b94d5..0000000000
--- a/t/test_formats.pl
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-use 5.10.0;
-my $SITE_URL = "foobar";
-my $template = do("standard_format.pl");
-my %replacement_key_value_pairs =(
-	 SITE_URL      	 =>   $SITE_URL,
-	 FORM_ACTION_URL  =>  "FORM_ACTION_URL",
-	 courseID         =>  "courseID",
-	 userID           =>  "userID",
-	 course_password  =>  "course_password",
-	 problemSeed      =>  "problemSeed",
-	 session_key      =>  "session_key",
-	 displayMode      =>  "displayMode",
-	 previewMode      =>  "previewMode",
-	 submitMode       =>  "submitMode",
-	 showCorrectMode  =>  "showCorrectMode",
-			# Can be added to the request as a parameter.  Adds a prefix to the 
-			# identifier used by the sticky format.  
-	 problemUUID => "problemUUID",
-	 problemResult    =>  "problemResult",
-	 problemState     =>  "problemState",
-	 showSummary      => " showSummary", #default to show summary for the moment
-	 formLanguage     => "formLanguage",
-	 scoreSummary     =>  "scoreSummary",
-);
-foreach my $key (keys %replacement_key_value_pairs) {
-	say $key ," => ", $replacement_key_value_pairs{$key};
-	$template =~ s/\$$key/$replacement_key_value_pairs{$key}/g;
-}
-print $template;
-1;
-
diff --git a/t/test_library.t b/t/test_library.t
deleted file mode 100644
index ec3a8cbaca..0000000000
--- a/t/test_library.t
+++ /dev/null
@@ -1,76 +0,0 @@
-use strict;
-use warnings;
-
-
-use HTTP::Request::Common;
-use LWP::UserAgent;
-use HTTP::Cookies;
-use Test::More;
-use JSON;
-
-use Data::Dump qw/dd/;
-
-my $ua = LWP::UserAgent->new;
-my $jar  = HTTP::Cookies->new();
-my $key;
-
-##
-#
-# the following needs an existing course (often for testing) with a user
-#
-###
-
-subtest 'Login to an existing course' => sub {
-  my $req = POST 'http://localhost/webwork2/test',
-  Content_Type => 'form-data',
-  Content      => [
-    user => 'peter',
-    passwd => 'peter'
-  ];
-  my $res = $ua->request($req);
-  ok($res->content !~ /Your authentication failed./,
-      'Successfully logged into course');
-
-  if($res->content =~ /key=(\w*)/){
-    $key = $1;
-  }
-};
-
-subtest 'Test some library subroutines via instructorXMLHandler' => sub {
-  my $content = [
-   xml_command => 'searchLib',
-   session_key => $key,
-   user => 'peter',
-   library_name => 'Library',
-   courseID => 'test',
-   command => 'countDBListings',
-   library_subjects => 'Calculus - single variable'
-];
-
-
-
-  my $req = POST 'http://localhost/webwork2/instructorXMLHandler',
-       Content_Type => 'form-data',
-       Content      => $content;
-  my $res = $ua->request($req);
-
-  my $result = decode_json($res->content);
-  ok(($result->{server_response} eq 'Count done.') && ($result->{result_data}[0] > 0),
-    'returned a nonzero number of problems in the library.');
-
-  pop(@{$content});
-  push(@{$content},'Trigonometry" and dbsj.name="Geometry"');
-
-  $req = POST 'http://localhost/webwork2/instructorXMLHandler',
-       Content_Type => 'form-data',
-       Content      => $content;
-
-  $res = $ua->request($req);
-
-  $result = decode_json($res->content);
-  ok(($result->{server_response} eq 'Count done.') && ($result->{result_data}[0] == 0),
-    'Successfully checked a simple SQL injection.');
-
-};
-
-done_testing();
diff --git a/templates/AchievementEvaluator/cheevoMessage.html.ep b/templates/AchievementEvaluator/cheevoMessage.html.ep
new file mode 100644
index 0000000000..6ebe38a375
--- /dev/null
+++ b/templates/AchievementEvaluator/cheevoMessage.html.ep
@@ -0,0 +1,24 @@
+<div class="cheevo-toast toast hide" role ="alert" aria-live="polite" aria-atomic="true">
+	<div class="toast-body d-flex align-items-center">
+		<%= image $ce->{server_root_url} . (
+				$achievement->{icon}
+				? "$ce->{courseURLs}{achievements}/$achievement->{icon}"
+				: "$ce->{webworkURLs}{htdocs}/images/defaulticon.png"
+			),
+			alt => 'Achievement Icon' =%>
+		<div class="cheevopopuptext">
+			% if ($achievement->category eq 'level') {
+				<h2><%= $achievement->{name} %></h2>
+				<div>
+					<%= $ce->{achievementItemsEnabled}
+						? $achievement->{description}
+						: maketext('Congratulations, you earned a new level!') =%>
+				</div>
+			% } else {
+				<h2><%= $achievement->{name} %></h2>
+				<div><i><%= $achievement->{points} %> Points</i>: <%= $achievement->{description} %></div>
+			% }
+		</div>
+		<button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Achievements.html.ep b/templates/ContentGenerator/Achievements.html.ep
new file mode 100644
index 0000000000..46345c1c93
--- /dev/null
+++ b/templates/ContentGenerator/Achievements.html.ep
@@ -0,0 +1,19 @@
+% use WeBWorK::Utils qw(getAssetURL);
+%
+% content_for css => begin
+	<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'achievements.css' }) =%>
+% end
+%
+% content_for js => begin
+	<%= javascript getAssetURL($ce, 'js/AchievementItems/achievementitems.js'), defer => undef =%>
+% end
+%
+% # Exit if there is no global achievement data for this user.
+% unless (defined $c->{globalData}) {
+	<p><%= maketext(q{You don't have any Achievement data associated to you!}) =%></p>
+	% last;
+% }
+%
+<%= include 'ContentGenerator/Achievements/cheevobigbox', $c->getAchievementLevelData =%>
+<%= include 'ContentGenerator/Achievements/achievement_items', $c->getAchievementItemsData =%>
+<%= include 'ContentGenerator/Achievements/achievement_badges', $c->getAchievementsData =%>
diff --git a/templates/ContentGenerator/Achievements/achievement_badges.html.ep b/templates/ContentGenerator/Achievements/achievement_badges.html.ep
new file mode 100644
index 0000000000..21c9c8cb54
--- /dev/null
+++ b/templates/ContentGenerator/Achievements/achievement_badges.html.ep
@@ -0,0 +1,39 @@
+<h2 class="my-3"><%= maketext('Badges') %></h2>
+%
+% if (@$achievements) {
+	% my $previousCategory = $achievements->[0]->category;
+	% for my $achievement (@$achievements) {
+		% # Separate categories with whitespace.
+		% if ($achievement->category ne $previousCategory) {
+			<br>
+		% }
+		% $previousCategory = $achievement->category;
+		%
+		% my $userAchievement = $userAchievements->{$achievement->achievement_id};
+		<div class="cheevoouterbox d-flex justify-content-start align-items-center mb-3 <%=
+			$userAchievement->earned ? 'unlocked' : 'locked' %>">
+			<div>
+				<%= image $achievement->{icon}
+					? "$ce->{courseURLs}{achievements}/$achievement->{icon}"
+					: "$ce->{webworkURLs}{htdocs}/images/defaulticon.png",
+					alt => $userAchievement->earned ? 'Achievement Earned' : 'Achievement Unearned' =%>
+			</div>
+			<div class="ms-3">
+				<h3 class="fs-5 mb-1 fw-bold"><%= $achievement->name %></h3>
+				<div>
+					<i><%= maketext('[_1] Points:', $achievement->{points}) %></i> <%= $achievement->{description} %>
+				</div>
+				% if ($achievement->max_counter && !$userAchievement->earned) {
+					% my $percentage = int(100 * ($userAchievement->counter || 0) / $achievement->max_counter);
+					% $percentage = 100 if $percentage > 100;
+					<div class="cheevoouterbar mt-1" title="<%= maketext('[_1]% Complete', $percentage) %>"
+						aria-label="<%= maketext('[_1]% Complete', $percentage) %>" role="figure" =%>
+						<div class="cheevoinnerbar" style="width:<%= $percentage %>%;"></div>
+					</div>
+				% }
+			</div>
+		</div>
+	% }
+% } else {
+	<p><%= maketext('No achievement badges have been assigned yet.') %></p>
+% }
diff --git a/templates/ContentGenerator/Achievements/achievement_items.html.ep b/templates/ContentGenerator/Achievements/achievement_items.html.ep
new file mode 100644
index 0000000000..b224d90b9f
--- /dev/null
+++ b/templates/ContentGenerator/Achievements/achievement_items.html.ep
@@ -0,0 +1,52 @@
+% last unless $ce->{achievementItemsEnabled} && $c->{achievementItems};
+%
+% # Show any items the user may have.
+<h2 class="my-3"><%= maketext('Rewards') %></h2>
+% if (@$items) {
+	% my $itemNumber = 0;
+	% for my $item (@$items) {
+		<div class="achievement-item">
+			% # Show each item's name, count, and description
+			% if ($itemCounts->{ $item->id } > 1) {
+				<h3><%= maketext($item->name)
+					. ' (' . maketext('[_1] remaining', $itemCounts->{ $item->id }) . ')' %></h3>
+			% } elsif ($itemCounts->{ $item->id } < 0) {
+				<h3><%= maketext($item->name) . ' (' . maketext('unlimited reusability') . ')' %></h3>
+			% } else {
+				<h3><%= maketext($item->name) %></h3>
+			% }
+			<p><%= maketext($item->description) %></p>
+			% # Print a modal popup for each item which contains the form necessary to get the data to use the item.
+			<%= link_to maketext('Use Reward') => '#modal_' . $item->id,
+					role  => 'button',
+					class => 'btn btn-secondary',
+					id    => 'popup_' . $item->id,
+					data  => { bs_toggle => 'modal' } =%>
+			<div id="<%= 'modal_' . $item->id %>" class="modal hide fade" tabindex="-1">
+				<div class="modal-dialog modal-dialog-centered">
+					<div class="modal-content">
+						<div class="modal-header">
+							<h4 class="modal-title"><%= maketext($item->name) %></h4>
+							<button type="button" class="btn-close" data-bs-dismiss="modal"
+								aria-label="<%= maketext('close') %>"></button>
+						</div>
+						<%= form_for current_route, method => 'POST', name => "itemform_$itemNumber",
+							class => 'achievementitemform', begin =%>
+							<div class="modal-body">
+								<%= $item->print_form($sets, $setProblemCount, $c) =%>
+								<%= hidden_field useditem => $itemNumber =%>
+								<%= $c->hidden_authen_fields("achievement_${itemNumber}_") =%>
+							</div>
+							<div class="modal-footer">
+								<%= submit_button maketext('Submit'), class => 'btn btn-primary' =%>
+							</div>
+						<%= end =%>
+					</div>
+				</div>
+			</div>
+		</div>
+		% $itemNumber++;
+	% }
+% } else {
+	<p><%= maketext(q{You don't have any rewards!}) %></p>
+% }
diff --git a/templates/ContentGenerator/Achievements/cheevobigbox.html.ep b/templates/ContentGenerator/Achievements/cheevobigbox.html.ep
new file mode 100644
index 0000000000..ac8bf99d69
--- /dev/null
+++ b/templates/ContentGenerator/Achievements/cheevobigbox.html.ep
@@ -0,0 +1,22 @@
+% last unless $achievement;
+%
+<div class="cheevobigbox mt-3">
+	<div class="d-flex align-items-center gap-3">
+		<%= image $achievement->{icon}
+			? "$ce->{courseURLs}{achievements}/$achievement->{icon}"
+			: "$ce->{webworkURLs}{htdocs}/images/defaulticon.png", alt => 'Level Icon' =%>
+		<div>
+			<h1><%= $achievement->name %></h1>
+			% if ($c->{globalData}->next_level_points) {
+				<div class="levelouterbar" title="<%= maketext('[_1]% Complete', $level_percentage) %>"
+					aria-label="<%= maketext('[_1]% Complete', $level_percentage) %>" role="figure">
+					<div class="levelinnerbar" style="width:<%= $level_percentage %>%"></div>
+				</div>
+				<div><strong><%= maketext('Level Progress:') %></strong> <%= "$level_progress/$level_goal" %></div>
+			% }
+			<div>
+				<strong><%= maketext('Total Points:') %></strong> <%= $c->{globalData}->achievement_points %>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Base/admin_links.html.ep b/templates/ContentGenerator/Base/admin_links.html.ep
new file mode 100644
index 0000000000..d9cb313188
--- /dev/null
+++ b/templates/ContentGenerator/Base/admin_links.html.ep
@@ -0,0 +1,55 @@
+<ul class="nav flex-column">
+	<li class="list-group-item list-group-item-primary nav-item"><%= $makelink->('options') %></li>
+	% if ($authz->hasPermissions($userID, 'create_and_delete_courses')) {
+		<li class="list-group-item nav-item">
+			<%= $makelink->(
+				'set_list',
+				text   => maketext('Course Listings'),
+				active => !param('subDisplay') && $c->url_for =~ /admin$/ ? 1 : 0
+			) %>
+		</li>
+		% for (
+			% [
+			% 	'add_course',
+			% 	maketext('Add Courses'),
+			% 	{
+			% 		add_admin_users      => 1,
+			% 		add_config_file      => 1,
+			% 		add_dbLayout         => 'sql_single',
+			% 		add_templates_course => $ce->{siteDefaults}{default_templates_course} || ''
+			% 	}
+			% ],
+			% [ 'rename_course',        maketext('Rename Courses') ],
+			% [ 'delete_course',        maketext('Delete Courses') ],
+			% [ 'archive_course',       maketext('Archive Courses') ],
+			% [ 'unarchive_course',     maketext('Unarchive Courses') ],
+			% [ 'upgrade_course',       maketext('Upgrade Courses') ],
+			% [ 'hide_inactive_course', maketext('Hide Courses') ],
+			% [ 'manage_locations',     maketext('Manage Locations') ],
+		% )
+		% {
+			<li class="list-group-item nav-item">
+				<%= $makelink->(
+					'set_list',
+					text              => $_->[1],
+					systemlink_params => { subDisplay => $_->[0], %{ $_->[2] // {} } },
+					active            => (param('subDisplay') // '') eq $_->[0],
+				) %>
+			</li>
+		% }
+		<li class="list-group-item nav-item"><%= $makelink->('instructor_user_list') %></li>
+		<li class="list-group-item nav-item"><%= $makelink->('instructor_mail_merge') %></li>
+		<li class="list-group-item nav-item">
+			<%= $makelink->(
+				'instructor_file_manager',
+				systemlink_params => { pwd => '.', unpack => 0, autodelete => 0 }
+			) %>
+		</li>
+		<li class="list-group-item nav-item">
+			<%= $c->helpMacro('admin_links', { label => maketext('Help'), class => 'nav-link' }) =%>
+		</li>
+		<li class="list-group-item nav-item">
+			<%= link_to maketext('Report bugs') => $ce->{webworkURLs}{bugReporter}, class => 'nav-link' =%>
+		</li>
+	% }
+</ul>
diff --git a/templates/ContentGenerator/Base/error_output.html.ep b/templates/ContentGenerator/Base/error_output.html.ep
new file mode 100644
index 0000000000..b6960ba065
--- /dev/null
+++ b/templates/ContentGenerator/Base/error_output.html.ep
@@ -0,0 +1,46 @@
+% use Date::Format;
+%
+<h2><%= maketext('WeBWorK Error') %></h2>
+<p>
+	<%= maketext(
+		'WeBWorK has encountered a software error while attempting to process this problem. It is likely that '
+		. 'there is an error in the problem itself. If you are a student, report this error message to your '
+		. 'professor to have it corrected. If you are a professor, please consult the error output below for '
+		. 'more information.'
+		) %>
+</p>
+<h3><%= maketext('Error messages') %></h3>
+<div class="error-output"><%== $error %></div>
+<h3 class="mt-2"><%= maketext('Error details') %></h3>
+<div class="error-output">
+	<%== ref $details =~ /SCALAR/i ? $$details : ref $details =~ /ARRAY/i ? join('', @$details) : $details %>
+</div>
+<h3><%= maketext('Request information') %></h3>
+<table class="table-bordered mb-2">
+	<tr>
+		<td class="p-1"><%= maketext('Time') %></td>
+		<td class="p-1"><%= time2str('%a %b %d %H:%M:%S %Y', time) %></td>
+	</tr>
+	<tr>
+		<td class="p-1"><%= maketext('Method') %></td>
+		<td class="p-1"><%= $c->req->method %></td>
+	</tr>
+	<tr>
+		<td class="p-1"><%= maketext('URI') %></td>
+		<td class="p-1"><%= url_for %></td>
+	</tr>
+	<tr>
+		<td class="p-1"><%= maketext('HTTP Headers') %></td>
+		<td class="p-0">
+			<table>
+				% my %headers = %{ $c->req->headers->to_hash };
+				% for (keys %headers) {
+					<tr>
+						<td class="p-1 border"><small><%= $_ %></small></td>
+						<td class="p-1 border"><small><%= $headers{$_} %></small></td>
+					</tr>
+				% }
+			</table>
+		</td>
+	</tr>
+</table>
diff --git a/templates/ContentGenerator/Base/feedback_macro_email.html.ep b/templates/ContentGenerator/Base/feedback_macro_email.html.ep
new file mode 100644
index 0000000000..fe66c3588d
--- /dev/null
+++ b/templates/ContentGenerator/Base/feedback_macro_email.html.ep
@@ -0,0 +1,13 @@
+<%= form_for 'feedback', method => 'POST', begin %>
+	% # This is used in forms with hidden_authen_fields already included on many pages.
+	% # So we need to change the hidden fields to be email-hidden.
+	<%= $c->hidden_authen_fields('email-') =%>
+	% while (my ($key, $value) = each %$params) {
+		% next if $key eq 'pg_object';    # Not used in internal feedback mechanism
+		<%= hidden_field $key => $value =%>
+	% }
+	<p>
+		<%= submit_button maketext($ce->{feedback_button_name}) || maketext('Email instructor'),
+			name => 'feedbackForm', class => 'btn btn-primary' =%>
+	</p>
+% end
diff --git a/templates/ContentGenerator/Base/feedback_macro_form.html.ep b/templates/ContentGenerator/Base/feedback_macro_form.html.ep
new file mode 100644
index 0000000000..1c95ebafc9
--- /dev/null
+++ b/templates/ContentGenerator/Base/feedback_macro_form.html.ep
@@ -0,0 +1,27 @@
+% use MIME::Base64;
+% use Encode;
+%
+% # enctype="multipart/form-data"
+<%= form_for $feedbackFormURL, method => 'POST', target => 'WW_info', begin =%>
+	<%= $c->hidden_authen_fields =%>
+	%
+	% while (my ($key, $value) = each %$params) {
+		% if ($key eq 'pg_object') {
+			<%= hidden_field $key => encode_base64(
+			 	Encode::encode(
+			 		'UTF-8',
+			 		$value->{body_text}
+			 			. ($value->{result}{msg} ? tag('p', tag('b', 'Note: ') . tag('i', $value->{result}{msg})) : '')
+			 	),
+			 	''
+			) =%>
+		% } else {
+			<%= hidden_field $key => $value =%>
+		% }
+	% }
+	%
+	<p>
+		<%= submit_button maketext($ce->{feedback_button_name}) || maketext('Email instructor'),
+			name  => 'feedbackForm', class => 'btn btn-primary' =%>
+	</p>
+<% end =%>
diff --git a/templates/ContentGenerator/Base/footer.html.ep b/templates/ContentGenerator/Base/footer.html.ep
new file mode 100644
index 0000000000..7c156771cf
--- /dev/null
+++ b/templates/ContentGenerator/Base/footer.html.ep
@@ -0,0 +1,11 @@
+<div id="last-modified"><%= maketext('Page generated at [_1]', $c->timestamp) %></div>
+<div id="copyright">
+	<%== maketext(
+		'WeBWorK &copy; [_1] | theme: [_2] | ww_version: [_3] | pg_version [_4]',
+		$ce->{WW_COPYRIGHT_YEARS} || '1996-2023',
+		$ce->{defaultTheme}       || 'unknown -- set defaultTheme in localOverides.conf',
+		$ce->{WW_VERSION}         || 'unknown -- set WW_VERSION in VERSION',
+		$ce->{PG_VERSION}         || 'unknown -- set PG_VERSION in ../pg/VERSION'
+	) %>
+</div>
+<a href="https://openwebwork.org/"><%= maketext('The WeBWorK Project') %></a>
diff --git a/templates/ContentGenerator/Base/links.html.ep b/templates/ContentGenerator/Base/links.html.ep
new file mode 100644
index 0000000000..2071f91d18
--- /dev/null
+++ b/templates/ContentGenerator/Base/links.html.ep
@@ -0,0 +1,358 @@
+% use WeBWorK::Utils qw(jitar_id_to_seq);
+%
+% if ($ce->{courseName} eq 'admin') {
+	<%= include 'ContentGenerator/Base/admin_links' =%>
+	% next;
+% }
+<ul class="nav flex-column">
+	% if (defined $courseID && $authen->was_verified) {
+		% # Homework Sets or Course Administration
+		<li class="list-group-item list-group-item-primary nav-item">
+			% if ($restricted_navigation) {
+				<span class="nav-link disabled"><%= maketext('Homework Sets') %></span>
+			% } else {
+				<%= $makelink->('set_list', text => maketext('Homework Sets')) %>
+			% }
+		</li>
+		%
+		% if (defined $setID) {
+			<li class="list-group-item list-group-item-primary nav-item">
+				<ul class="nav flex-column">
+					% # Set link. The set record is needed to determine the assignment type.
+					% my $setRecord = $db->getGlobalSet($setID =~ s/,v\d+$//r);
+					% if ($setRecord->assignment_type eq 'jitar' && defined $problemID) {
+						% $prettyProblemID = join('.', jitar_id_to_seq($problemID));
+					% }
+					%
+					<li class="list-group-item nav-item">
+						% if ($setRecord->assignment_type =~ /proctor/ && $setID =~ /,v(\d)+$/) {
+							<%= $makelink->(
+								'proctored_gateway_quiz',
+								text       => $prettySetID,
+								captures   => { setID => $setID },
+								link_attrs => { dir => 'ltr' }
+							) %>
+						% } elsif ($setRecord->assignment_type =~ /gateway/ && $setID =~ /,v(\d)+$/) {
+							<%= $makelink->(
+								'gateway_quiz',
+								text       => $prettySetID,
+								captures   => { setID => $setID },
+								link_attrs => { dir => 'ltr' }
+							) %>
+						% } else {
+							<%= $makelink->(
+								'problem_list',
+								text       => $prettySetID,
+								captures   => { setID => $setID },
+								link_attrs => { dir => 'ltr' }
+							) %>
+						% }
+					</li>
+					% # Problem link.
+					% if (defined $problemID) {
+						<li class="list-group-item nav-item">
+							<ul class="nav flex-column">
+								<li class="list-group-item nav-item">
+									% if ($setRecord->assignment_type =~ /gateway/) {
+										<a class="nav-link"><%= maketext('Problem [_1]', $prettyProblemID) %></a>
+									% } else {
+										<%= $makelink->(
+											'problem_detail',
+											text     => maketext('Problem [_1]', $prettyProblemID),
+											captures => { setID => $setID, problemID => $problemID },
+										) %>
+									% }
+								</li>
+							</ul>
+						</li>
+					% }
+				</ul>
+			</li>
+		% }
+		%
+		% if ($authz->hasPermissions($userID, 'change_password')
+			% || $authz->hasPermissions($userID, 'change_email_address')
+			% || $authz->hasPermissions($userID, 'change_pg_display_settings'))
+		% {
+			<li class="list-group-item list-group-item-primary nav-item"><%= $makelink->('options') %></li>
+		% }
+		%
+		% unless ($restricted_navigation || $courseID eq 'admin') {
+			<li class="list-group-item list-group-item-primary nav-item"><%= $makelink->('grades') %></li>
+		% }
+		%
+		% if ($ce->{achievementsEnabled}) {
+			<li class="list-group-item list-group-item-primary nav-item"><%= $makelink->('achievements') %></li>
+		% }
+		%
+		% if ($authz->hasPermissions($userID, 'access_instructor_tools')) {
+			<li class="list-group-item nav-item"><%= $makelink->('instructor_tools') %></li>
+			% # Class list editor
+			<li class="list-group-item nav-item"><%= $makelink->('instructor_user_list') %></li>
+			% # User Assignments
+			% if (defined $eUserID && $eUserID ne $userID || defined $urlUserID) {
+				<li class="list-group-item nav-item">
+					<ul class="nav flex-column">
+						% if (defined $urlUserID) {
+							<li class="nav-item">
+								<%= $makelink->(
+									'instructor_user_detail',
+									text       => $urlUserID,
+									captures   => { userID => $urlUserID },
+									link_attrs => { dir => 'ltr' }
+								); %>
+							</li>
+						% }
+						% if ($userID ne $eUserID && (!defined $urlUserID || $urlUserID ne $eUserID)) {
+							<li class="nav-item">
+								<%= $makelink->(
+									'instructor_user_detail',
+									text       => $eUserID,
+									captures   => { userID => $eUserID },
+									link_attrs => { dir => 'ltr' }
+								); %>
+							</li>
+						% }
+					</ul>
+				</li>
+			% }
+			% # Set assigner
+			<li class="list-group-item nav-item"><%= $makelink->('instructor_set_assigner') %></li>
+			% # Homework Set Editor
+			<li class="list-group-item nav-item"><%= $makelink->('instructor_set_list') %></li>
+			% # Editor link.  Only shown for non-versioned sets
+			% if (defined $setID && $setID !~ /,v\d+$/) {
+				<li class="list-group-item nav-item">
+					<ul class="nav flex-column">
+						<li class="nav-item">
+							<%= $makelink->(
+								'instructor_set_detail',
+								text       => $prettySetID,
+								captures   => { setID => $setID },
+								link_attrs => { dir => 'ltr' }
+							); %>
+						</li>
+					</ul>
+				</li>
+			% }
+			% # Problem Editor
+			<li class="list-group-item nav-item">
+				<%= $makelink->('instructor_problem_editor',
+					param('file_type') && (param('file_type') eq 'course_info' || param('file_type') eq 'hardcopy_theme') ? (active => 0) : ()) %>
+			</li>
+			% if (defined $prettySetID && defined $problemID) {
+				<li class="nav-item">
+					<ul class="nav flex-column">
+						<li class="nav-item">
+							<%= $makelink->(
+								'instructor_problem_editor_withset_withproblem',
+								text => b(maketext(
+									'[_1]: Problem [_2]',
+									$c->tag('span', dir => 'ltr', $prettySetID),
+									$prettyProblemID
+								)),
+								captures => { setID => $setID, problemID => $problemID },
+								target   => 'WW_Editor'
+							) %>
+						</li>
+					</ul>
+				</li>
+			% } elsif (defined $prettySetID && param('file_type') && param('file_type') =~ /^(set|hardcopy)_header$/) {
+				<li class="nav-item">
+					<ul class="nav flex-column">
+						<li class="nav-item">
+							<%= $makelink->(
+								'instructor_problem_editor_withset_withproblem',
+								text => param('file_type') eq 'set_header'
+									? b(maketext('[_1]: Set Header',      $c->tag('span', dir => 'ltr', $prettySetID)))
+									: b(maketext('[_1]: Hardcopy Header', $c->tag('span', dir => 'ltr', $prettySetID))),
+								captures          => { setID => $setID, problemID => 0 },
+								systemlink_params => { file_type => param('file_type') },
+								target            => 'WW_Editor'
+							) %>
+						</li>
+					</ul>
+				</li>
+			% } elsif (param('file_type') && param('file_type') eq 'course_info') {
+				<li class="nav-item">
+					<ul class="nav flex-column">
+						<li class="nav-item">
+							<%= $makelink->(
+								'instructor_problem_editor',
+								text              => maketext('Course Information'),
+								systemlink_params => { file_type => 'course_info' },
+								active            => 1,
+								target            => 'WW_Editor'
+							) %>
+						</li>
+					</ul>
+				</li>
+			% } elsif (param('file_type') && param('file_type') eq 'hardcopy_theme') {
+				<li class="nav-item">
+					<ul class="nav flex-column">
+						<li class="nav-item">
+							<%= $makelink->(
+								'instructor_problem_editor',
+								text              => maketext('Hardcopy Theme'),
+								systemlink_params => {
+									file_type      => 'hardcopy_theme',
+									hardcopy_theme => param('hardcopy_theme')
+								},
+								active            => 1,
+								target            => 'WW_Editor'
+							) %>
+						</li>
+					</ul>
+				</li>
+			% }
+			% # Library Browser
+			<li class="list-group-item nav-item"><%= $makelink->('instructor_set_maker') %></li>
+			% # Statistics
+			<li class="list-group-item nav-item">
+				<%= $makelink->('instructor_statistics') %>
+				% if ($userID ne $eUserID || defined $setID || defined $urlUserID) {
+				<ul class="nav flex-column">
+					% if (defined $urlUserID) {
+						<li class="nav-item">
+							<%= $makelink->(
+								'instructor_user_statistics',
+								text     => $urlUserID,
+								captures => { userID => $urlUserID },
+								link_attrs => { dir => 'ltr' }
+							) %>
+						</li>
+					% }
+					% if ($userID ne $eUserID && (!defined $urlUserID || $urlUserID ne $eUserID)) {
+						<li class="nav-item">
+							<%=	$makelink->(
+								'instructor_user_statistics',
+								text     => $eUserID,
+								captures => { userID => $eUserID },
+								active   => current_route eq 'instructor_user_statistics'
+									&& !defined $urlUserID,
+								link_attrs => { dir => 'ltr' }
+							) %>
+						</li>
+					% }
+					% if (defined $setID) {
+						<li class="nav-item" dir="ltr">
+							<%= $makelink->(
+								'instructor_set_statistics',
+								# Make sure a versioned set id is not used for the statistics link.
+								text     => $prettySetID =~ s/,v\d+$//r,
+								captures => { setID => $setID =~ s/,v\d+$//r }
+							) %>
+						</li>
+						% if (defined $problemID) {
+							<li class="nav-item">
+								<ul class="nav flex-column">
+									<li class="nav-item">
+										<%= $makelink->(
+											'instructor_problem_statistics',
+											text     => maketext('Problem [_1]', $prettyProblemID),
+											captures => {
+												setID     => $setID =~ s/,v\d+$//r,
+												problemID => $problemID
+											}
+										) =%>
+									</li>
+								</ul>
+							</li>
+						% }
+					% }
+				</ul>
+				% }
+			</li>
+			% # Student Progress
+			<li class="list-group-item nav-item"><%= $makelink->('instructor_progress') %>
+				% if ($userID ne $eUserID || defined $setID || defined $urlUserID) {
+					<ul class="nav flex-column">
+						% if (defined $urlUserID) {
+							<li class="nav-item">
+								<%= $makelink->(
+									'instructor_user_progress',
+									text     => $urlUserID,
+									captures => { userID => $urlUserID },
+									link_attrs => { dir => 'ltr' }
+								) %>
+							</li>
+						% }
+						% if ($userID ne $eUserID && (!defined $urlUserID || $urlUserID ne $eUserID)) {
+							<li class="nav-item">
+								<%= $makelink->(
+									'instructor_user_progress',
+									text     => $eUserID,
+									captures => { userID => $eUserID },
+									active   => current_route eq 'instructor_user_progress'
+										&& !defined $urlUserID,
+									link_attrs => { dir => 'ltr' }
+								) %>
+							</li>
+						% }
+						% if (defined $setID) {
+							<li class="nav-item" dir="ltr">
+								<%= $makelink->(
+									'instructor_set_progress',
+									# Make sure a versioned set id is not used for the progress link.
+									text     => $prettySetID =~ s/,v\d+$//r,
+									captures => { setID => $setID =~ s/,v\d+$//r },
+								) %>
+							</li>
+						% }
+					</ul>
+				% }
+			</li>
+			% # Scoring
+			% if ($authz->hasPermissions($userID, 'score_sets')) {
+				<li class="list-group-item nav-item"><%= $makelink->('instructor_scoring') %></li>
+			% }
+			% # LTI Grade Update
+			% if ($ce->{LTIGradeMode} && $authz->hasPermissions($userID, 'score_sets')) {
+				<li class="list-group-item nav-item"><%= $makelink->('instructor_lti_update') %></li>
+			% }
+			% # Achievment Editor
+			% if ($ce->{achievementsEnabled} && $authz->hasPermissions($userID, 'edit_achievements')) {
+				<li class="list-group-item nav-item"><%= $makelink->('instructor_achievement_list') %></li>
+				% if (defined $achievementID) {
+					<li class="nav-item">
+						<ul class="nav flex-column">
+							<li class="nav-item">
+								<%= $makelink->(
+									'instructor_achievement_editor',
+									text     => $achievementID =~ s/_/ /gr,
+									captures => { achievementID => $achievementID },
+								) %>
+							</li>
+						</ul>
+					</li>
+				% }
+			% }
+			% # Email
+			% if ($authz->hasPermissions($userID, 'send_mail')) {
+				<li class="list-group-item nav-item"><%= $makelink->('instructor_mail_merge') %></li>
+			% }
+			% # File Manager
+			% if ($authz->hasPermissions($userID, 'manage_course_files')) {
+				<li class="list-group-item nav-item"><%= $makelink->('instructor_file_manager') %></li>
+			% }
+			% # Course Configuration
+			% if ($authz->hasPermissions($userID, "manage_course_files")) {
+				<li class="list-group-item nav-item"><%= $makelink->('instructor_config') %></li>
+			% }
+			% # Instructor links help
+			<li class="list-group-item nav-item">
+				<%= $c->helpMacro('instructor_links',
+					{ label => maketext('Help'), class => 'nav-link' }) %>
+			</li>
+		% }
+		%
+		% if (exists $ce->{webworkURLs}{bugReporter}
+			% && $ce->{webworkURLs}{bugReporter} ne ''
+			% && $authz->hasPermissions($userID, 'report_bugs'))
+		% {
+			<li class="list-group-item nav-item">
+				<%= link_to maketext('Report bugs') => $ce->{webworkURLs}{bugReporter}, class => 'nav-link' =%>
+			</li>
+		% }
+	% }
+</ul>
diff --git a/templates/ContentGenerator/Base/login_status.html.ep b/templates/ContentGenerator/Base/login_status.html.ep
new file mode 100644
index 0000000000..cbbf851f15
--- /dev/null
+++ b/templates/ContentGenerator/Base/login_status.html.ep
@@ -0,0 +1,34 @@
+% if ($authen && $authen->was_verified) {
+	% my $db = stash('db');
+	%
+	% my $userID          = param('user');
+	% my $user            = $db->getUser($userID);
+	% my $effectiveUserID = param('effectiveUser');
+	% my $userName        = $user->full_name || $user->user_id;
+	%
+	<%= maketext('Logged in as [_1].', $userName) %>
+	<%= link_to $c->systemLink(url_for 'logout'), class => 'btn btn-light btn-sm ms-2', begin %>
+	<%= maketext('Log Out') %> <i class="icon fas fa-sign-out-alt" aria-hidden="true" data-alt="signout"></i>
+	<% end %>
+	%
+	% if ($effectiveUserID ne $userID) {
+		% my $effectiveUser = $db->getUser($effectiveUserID);
+		% unless ($effectiveUser) {
+			% param('effectiveUser', $userID);
+			% next;
+		% }
+		% my $effectiveUserName =
+			% $effectiveUser->full_name
+			% ? join(' ', $effectiveUser->full_name, '(' . $effectiveUser->user_id . ')')
+			% : $effectiveUser->user_id;
+		%
+		<br>
+		<%= maketext('Acting as [_1].', $effectiveUserName) %>
+		<%= link_to $c->systemLink(url_for, params => { effectiveUser => $userID }),
+			class => 'btn btn-light btn-sm ms-2', begin %>
+		<%= maketext('Stop Acting') %> <i class="icon fas fa-sign-out-alt" aria-hidden="true" data-alt="signout"></i>
+		<% end %>
+	% }
+% } else {
+	<%= maketext('Not logged in.') =%>
+% }
diff --git a/templates/ContentGenerator/Base/set_status.html.ep b/templates/ContentGenerator/Base/set_status.html.ep
new file mode 100644
index 0000000000..7cfca578fb
--- /dev/null
+++ b/templates/ContentGenerator/Base/set_status.html.ep
@@ -0,0 +1,52 @@
+% use WeBWorK::Utils qw(after before between);
+%
+% my $useReducedScoring = ($ce->{pg}{ansEvalDefaults}{enableReducedScoring}
+	% && after($set->open_date)
+	% && $set->enable_reduced_scoring
+	% && $set->reduced_scoring_date
+	% && $set->reduced_scoring_date != $set->due_date
+% );
+% 
+<div class="alert alert-info mb-3">
+	<%== $useReducedScoring ? '<p>' : '<p class="mb-0">' =%> 
+		<strong>
+			% if (before($set->open_date)) {
+				<%= maketext('Set opens on [_1].', $c->formatDateTime($set->open_date)) %>
+			% } elsif ($useReducedScoring && before($set->reduced_scoring_date)) {
+				<%= maketext('Set is due on [_1].', $c->formatDateTime($set->reduced_scoring_date)) %>
+			% } elsif (before($set->due_date)) {
+				<%= maketext('Set closes on [_1].', $c->formatDateTime($set->due_date)) %>
+			% } else {
+				<%= maketext('Set is closed.') %>
+			% }
+		</strong>
+	</p>
+	%
+	% if ($useReducedScoring) {
+		% my $reduced_scoring_date  = $set->reduced_scoring_date;
+		% my $reducedScoringPerCent = int(100 * $ce->{pg}{ansEvalDefaults}{reducedScoringValue} + .5);
+		%
+		<p class="mb-0">
+			% if (before($reduced_scoring_date)) {
+				<%= maketext(
+					'After the due date this set enters a reduced scoring period until it closes on [_1].  All work '
+						. 'completed during the reduced scoring period counts for [_2]% of its value.',
+					$c->formatDateTime($set->due_date), $reducedScoringPerCent
+				) =%>
+			% } elsif (between($reduced_scoring_date, $set->due_date)) {
+				<%= maketext(
+					'This set is in its reduced scoring period.  All work counts for [_1]% of its value.',
+					$reducedScoringPerCent
+				) =%>
+			% } else {
+				<%= maketext(
+					'This set had a reduced scoring period that started on [_1] and ended on [_2].  '
+						. 'During that period all work counted for [_3]% of its value.',
+					$c->formatDateTime($reduced_scoring_date),
+					$c->formatDateTime($set->due_date),
+					$reducedScoringPerCent
+				) =%>
+			% }
+		</p>
+	% }
+</div>
diff --git a/templates/ContentGenerator/Base/warning_output.html.ep b/templates/ContentGenerator/Base/warning_output.html.ep
new file mode 100644
index 0000000000..2eb46dd24d
--- /dev/null
+++ b/templates/ContentGenerator/Base/warning_output.html.ep
@@ -0,0 +1,24 @@
+% use Date::Format;
+%
+<h2><%= maketext('WeBWorK Warnings') %></h2>
+<p>
+	<%= maketext(
+		'WeBWorK has encountered warnings while processing your request. If this occured when viewing '
+			. 'a problem, it was likely caused by an error or ambiguity in that problem. Otherwise, it may indicate '
+			. 'a problem with the WeBWorK system itself. If you are a student, report these warnings to your '
+			. 'professor to have them corrected. If you are a professor, please consult the warning output below '
+			. 'for more information.'
+	) %>
+</p>
+<h3><%= maketext('Warning messages') %></h3>
+<ul>
+	% for (@$warnings) {
+		<li><code><%= $_ %></code></li>
+	% }
+</ul>
+<h3><%= maketext('Request information') %></h3>
+<table class="table-bordered">
+	<tr><td><%= maketext('Time') %><td><%= time2str('%a %b %d %H:%M:%S %Y', time) %></td></tr>
+	<tr><td><%= maketext('Method') %><td><%= $c->req->method %></td></tr>
+	<tr><td><%= maketext('URI') %><td><%= url_for %></td></tr>
+</table>
diff --git a/templates/ContentGenerator/CourseAdmin.html.ep b/templates/ContentGenerator/CourseAdmin.html.ep
new file mode 100644
index 0000000000..633e21de7d
--- /dev/null
+++ b/templates/ContentGenerator/CourseAdmin.html.ep
@@ -0,0 +1,73 @@
+% use WeBWorK::Utils::CourseManagement qw(listCourses listArchivedCourses);
+% use WeBWorK::Utils qw(getAssetURL);
+%
+% content_for js => begin
+	<%= javascript getAssetURL($ce, 'js/SelectAll/selectall.js'), defer => undef =%>
+% end
+%
+% unless ($authz->hasPermissions(param('user'), 'create_and_delete_courses')) {
+	<div class="alert alert-danger p-1 mb-0">
+		<%= maketext('You are not authorized to create or delete courses.') %>
+	</div>
+	% last;
+% }
+%
+<%= include 'ContentGenerator/CourseAdmin/registration_form' %>
+%
+% if (@{ $c->{errors} }) {
+	<div class="alert alert-danger p-1 mb-2">
+		<div class="mb-1"><%= maketext('Please correct the following errors and try again:') %></div>
+		<ul class="mb-1">
+			% for (@{ $c->{errors} }) {
+				<li><%= $_ %></li>
+			% }
+		</ul>
+	</div>
+% }
+%
+% if ($c->{method_to_call}) {
+	% my $method_to_call = $c->{method_to_call};
+	<%= $c->$method_to_call =%>
+% } else {
+	% unless (-w $ce->{webworkDirs}{logs} && -w $ce->{webworkDirs}{tmp} && -w $ce->{webworkDirs}{DATA}) {
+		<h2><%= maketext('Directory permission errors') %></h2>
+		<p>
+			<%= maketext(
+				'The webwork server must be able to write to these directories. Please correct the permssion errors.'
+			) =%>
+		</p>
+		<ul>
+			% unless (-w $ce->{webworkDirs}{logs}) {
+				<li><%= maketext('unable to write to directory [_1]', $ce->{webworkDirs}{logs}) %></li>
+			% }
+			% unless (-w $ce->{webworkDirs}{tmp}) {
+				<li><%= maketext('unable to write to directory [_1]', $ce->{webworkDirs}{tmp}) %></li>
+			% }
+			% unless (-w $ce->{webworkDirs}{DATA}) {
+				<li><%= maketext('unable to write to directory [_1]', $ce->{webworkDirs}{DATA}) %></li>
+			% }
+		</ul>
+	% }
+	%
+	<h2><%= maketext('Courses') %></h2>
+	% my @courseIDs = listCourses($ce);
+	<ol>
+		% for (sort { lc($a) cmp lc($b) } listCourses($ce)) {
+			% next if $_ eq 'admin' || $_ eq 'modelCourse';
+			<li><%= link_to $_ => 'set_list' => { courseID => $_ } =%></li>
+		% }
+	</ol>
+	%
+	<h2><%= maketext('Archived Courses') =%></h2>
+	<p>
+		<%= link_to maketext('Download/upload archived courses') => $c->systemLink(
+			url_for('instructor_file_manager'),
+			params => { pwd => 'archives', unpack => 0, autodelete => 0 },
+		) =%>
+	</p>
+	<ol>
+		% for (sort { lc($a) cmp lc($b) } listArchivedCourses($ce)) {
+			<li><%= $_ %></li>
+		% }
+	</ol>
+% }
diff --git a/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep b/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep
new file mode 100644
index 0000000000..a6ab1fa728
--- /dev/null
+++ b/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep
@@ -0,0 +1,133 @@
+% use WeBWorK::Utils::CourseManagement qw(listCourses);
+%
+<h2><%= maketext('Add Course') %> <%= $c->helpMacro('AdminAddCourse') %></h2>
+%
+<%= form_for current_route, method => 'POST', begin =%>
+	<%= $c->hidden_authen_fields =%>
+	<%= $c->hidden_fields('subDisplay') =%>
+	%
+	<p><%= maketext(
+		'Specify an ID, title, and institution for the new course. The course ID may contain only letters, '
+			. 'numbers, hyphens, and underscores, and may have at most [_1] characters.',
+		$ce->{maxCourseIdLength}) %>
+	</p>
+	<div class="row mb-2">
+		<div class="col-lg-8 col-md-10">
+			<div class="form-floating mb-1">
+				<%= text_field add_courseID => '',
+					id          => 'add_courseID',
+					placeholder => '',
+					class       => 'form-control' =%>
+				<%= label_for add_courseID => maketext('Course ID') =%>
+			</div>
+			<div class="form-floating mb-1">
+				<%= text_field add_courseTitle => '',
+					id          => 'add_courseTitle',
+					placeholder => '',
+					class       => 'form-control' =%>
+				<%= label_for add_courseTitle => maketext('Course Title') =%>
+			</div>
+			<div class="form-floating mb-1">
+				<%= text_field add_courseInstitution => '',
+					id          => 'add_courseInstitution',
+					placeholder => '',
+					class       => 'form-control' =%>
+				<%= label_for add_courseInstitution => maketext('Institution') =%>
+			</div>
+		</div>
+	</div>
+	<div class="mb-3">
+		<div class="mb-1">
+			<%= maketext(
+				'To add the WeBWorK administrators to the new course (as administrators) check the box below.') =%>
+		</div>
+		<div class="form-check mb-2">
+			<label class="form-check-label">
+				<%= check_box 'add_admin_users' => 1, class => 'form-check-input' =%>
+				<%= maketext('Add WeBWorK administrators to new course') =%>
+			</label>
+		</div>
+	</div>
+	<div class="mb-2">
+		<%= maketext(
+			'To add an additional instructor to the new course, specify user information below. '
+				. 'The user ID may contain only numbers, letters, hyphens, periods (dots), commas,and underscores.'
+		) =%>
+	</div>
+	<div class="row mb-2">
+		<div class="col-lg-4 col-md-5 col-sm-6">
+			<div class="form-floating mb-1">
+				<%= text_field add_initial_userID => '',
+					id          => 'add_initial_userID',
+					placeholder => '',
+					class       => 'form-control' =%>
+				<%= label_for add_initial_userID => maketext('User ID') =%>
+			</div>
+			<div class="form-floating mb-1">
+				<%= password_field 'add_initial_password',
+					id          => 'add_initial_password',
+					placeholder => '',
+					class       => 'form-control' =%>
+				<%= label_for add_initial_password => maketext('Password') =%>
+			</div>
+			<div class="form-floating mb-1">
+				<%= password_field 'add_initial_confirmPassword',
+					id          => 'add_initial_confirmPassword',
+					placeholder => '',
+					class       => 'form-control' =%>
+				<%= label_for add_initial_confirmPassword => maketext('Confirm Password') =%>
+			</div>
+		</div>
+		<div class="col-lg-4 col-md-5 col-sm-6">
+			<div class="form-floating mb-1">
+				<%= text_field add_initial_firstName => '',
+					id          => 'add_initial_firstName',
+					placeholder => '',
+					class       => 'form-control' =%>
+				<%= label_for add_initial_firstName => maketext('First Name') =%>
+			</div>
+			<div class="form-floating mb-1">
+				<%= text_field add_initial_lastName => '',
+					id          => 'add_initial_lastName',
+					placeholder => '',
+					class       => 'form-control' =%>
+				<%= label_for add_initial_lastName => maketext('Last Name') %>
+			</div>
+			<div class="form-floating mb-1">
+				<%= text_field add_initial_email => '',
+					id          => 'add_initial_email',
+					placeholder => '',
+					class       => 'form-control' =%>
+				<%= label_for add_initial_email => maketext('Email Address') =%>
+			</div>
+		</div>
+	</div>
+	<div class="mb-1">
+		<%= maketext('To copy the templates and html folders from an existing course, select the course below.') =%>
+	</div>
+	<div class="row mb-3">
+		% my @existingCourses = sort { lc($a) cmp lc($b) } grep { $_ ne stash('courseID') } listCourses($ce);
+		% unshift(@existingCourses, sort { lc($a) cmp lc($b) } @{ $ce->{modelCoursesForCopy} });
+		%
+		<%= label_for add_templates_course => maketext('Copy from:'),
+			class => 'col-auto col-form-label fw-bold' =%>
+		<div class="col-auto">
+			<%= select_field add_templates_course => [
+					[ maketext('No Course') => '' ],
+					map { [ $_ => $_] } @existingCourses
+				],
+				id      => 'add_templates_course',
+				class   => 'form-select' =%>
+		</div>
+		<div class="mb-3">
+			<div class="form-check">
+				<label class="form-check-label">
+					<%= check_box 'add_config_file' => 1, class => 'form-check-input' =%>
+					<%= maketext('Also copy simple configuration file') =%>
+				</label>
+			</div>
+		</div>
+	</div>
+	<%= hidden_field add_dbLayout => 'sql_single' =%>
+	<%= submit_button maketext('Add Course'), name => 'add_course', class => 'btn btn-primary' =%>
+<% end =%>
diff --git a/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep b/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep
new file mode 100644
index 0000000000..a5597adfd8
--- /dev/null
+++ b/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep
@@ -0,0 +1,111 @@
+<h2><%= maketext('Archive Course') %> <%= $c->helpMacro('AdminArchiveCourse') %></h2>
+% # Report on databases
+<h3 class="my-3"><%= maketext('Report on database structure for course [_1]:', $archive_courseID) %></h3>
+% if (@$upgrade_report) {
+	% for (@$upgrade_report) {
+		<p class="<%= $_->[1] ? 'text-success' : 'text-danger' %> fw-bold my-0"><%= $_->[0] %></p>
+	% }
+% }
+% my ($all_tables_ok, $extra_database_tables, $extra_database_fields, $db_report) =
+	% $c->formatReportOnDatabaseTables($dbStatus);
+<%= $db_report %>
+% if ($extra_database_tables) {
+	<p class="text-danger fw-bold">
+		<%= maketext(
+			'There are extra database tables which are not defined in the schema.  '
+				. 'These can be deleted when upgrading the course.'
+		) =%>
+	</p>
+% }
+% if ($extra_database_fields) {
+	<p class="text-danger fw-bold">
+		<%= maketext(
+			'There are extra database fields which are not defined in the schema for at least one table.  '
+				. 'They can be removed when upgrading the course.'
+		) =%>
+	</p>
+% }
+% if (!$all_tables_ok) {
+	<p class="text-danger fw-bold">
+		<%= maketext('The course database must be upgraded before archiving this course.') =%>
+	</p>
+% }
+% # Report on directories
+<h3>Directory structure</h3>
+<ul>
+	% for (@$directory_report) {
+		<li><%= $_->[0] %>: <span class="<%= $_->[2] ? 'text-success' : 'text-danger' %>"><%= $_->[1] %></span></li>
+	% }
+</ul>
+<ul>
+	% for (@$dir_update_messages) {
+		<li><span class="<%= $_->[2] ? 'text-success' : 'text-danger' %>"><%= $_->[1] %></span></li>
+	% }
+</ul>
+% if ($directories_ok) {
+	<p class="text-success"><%= maketext('Directory structure is ok') %></p>
+% } else {
+	<p class="text-danger fw-bold">
+		<%= maketext('Directory structure is missing directories or the webserver lacks sufficient privileges.') =%>
+	</p>
+% }
+<hr>
+% if ($all_tables_ok && param('delete_course')) {
+	<p class="text-danger fw-bold">
+		<%== maketext(
+			'Are you sure that you want to delete the course [_1] after archiving? This cannot be undone!',
+			tag('b', $archive_courseID)
+		) =%>
+	</p>
+% }
+% # Print form for choosing next action.
+<%= form_for current_route, method => 'POST', begin =%>
+	<%= $c->hidden_authen_fields =%>
+	<%= $c->hidden_fields(qw(subDisplay delete_course)) =%>
+	<%= hidden_field archive_courseID => $archive_courseID =%>
+	% for (@$archive_courseIDs) {
+		<%= hidden_field archive_courseIDs => $_ =%>
+	% }
+	%
+	% if ($all_tables_ok && $directories_ok) {
+		% # No missing tables, missing fields, or directories
+		% # Warn about overwriting an existing archive
+		% my $archive_path = "$ce2->{webworkDirs}{courses}/admin/archives/$archive_courseID.tar.gz";
+		% if (-e $archive_path && -w $archive_path) {
+			<p class="text-danger fw-bold">
+				<%= maketext(
+					'The course "[_1]" has already been archived at "[_2]". '
+						. 'This earlier archive will be erased.  This cannot be undone.',
+					$archive_courseID,
+					$archive_path
+				) =%>
+			</p>
+		% }
+		<div class="d-flex justify-content-center gap-2">
+			<%= submit_button maketext('Stop Archiving'),
+				name => 'decline_archive_course', class => 'btn btn-primary' =%>
+			% if (scalar(@$archive_courseIDs) > 1) {
+				<%= submit_button maketext('Skip archiving this course'),
+					name => 'skip_archive_course', class => 'btn btn-primary' =%>
+			% }
+			<%= submit_button maketext('Archive'), name => 'confirm_archive_course', class => 'btn btn-primary' =%>
+		</div>
+	% } elsif ($directories_ok) {
+		<div class="d-flex justify-content-center gap-2">
+			<%= submit_button maketext(q{Don't Archive}),
+				name => 'decline_archive_course', class => 'btn btn-primary' =%>
+			<%= submit_button maketext('Upgrade Course Tables'),
+				name => 'upgrade_course_tables', class => 'btn btn-primary' =%>
+		</div>
+	% } else {
+		<div class="text-center alert alert-danger p-1 mb-2">
+			<%= maketext('Directory structure needs to be repaired manually before archiving.') =%>
+		</div>
+		<div class="d-flex justify-content-center gap-2">
+			<%= submit_button maketext(q{Don't Archive}),
+				name => 'decline_archive_course', class => 'btn btn-primary' =%>
+			<%= submit_button maketext('Attempt to upgrade directories'),
+				name => 'upgrade_course_tables', class => 'btn btn-primary' =%>
+		</div>
+	% }
+<% end =%>
diff --git a/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep b/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep
new file mode 100644
index 0000000000..39106e4990
--- /dev/null
+++ b/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep
@@ -0,0 +1,68 @@
+<h2><%= maketext('Archive Course') %> <%= $c->helpMacro('AdminArchiveCourse') %></h2>
+%
+% if (@$courseIDs) {
+	<p>
+		<%= maketext(
+			'Courses are listed either alphabetically or in order by the time of most recent login activity, oldest '
+				. 'first. To change the listing order check the mode you want and click "Refresh Listing".  The '
+				. 'listing format is: Course_Name (status :: date/time of most recent login) where status is "hidden" '
+				. 'or "visible".'
+		) =%>
+	</p>
+	<%= form_for current_route, method => 'POST', begin =%>
+		<div class="mb-3">
+			<div class="mb-2"><%= maketext('Select a listing format:') %></div>
+			% for (
+				% [ alphabetically => maketext('alphabetically') ],
+				% [ last_login     => maketext('by last login date') ]
+			% )
+			% {
+				<div class="form-check">
+					<%= radio_button archive_listing_format => $_->[0],
+						id    => "archive_listing_format_$_->[0]",
+						class => 'form-check-input',
+						$_->[0] eq 'alphabetically' ? (checked => undef) : () =%>
+					<%= label_for "archive_listing_format_$_->[0]" => $_->[1], class => 'form-check-label' =%>
+				</div>
+			% }
+		</div>
+		<div class="d-flex justify-content-start gap-2">
+			<%= submit_button maketext('Refresh Listing'),
+				name => 'archive_course_refresh', class => 'btn btn-primary' =%>
+			<%= submit_button maketext('Archive Courses'), name => 'archive_course', class => 'btn btn-primary' =%>
+		</div>
+		<%= $c->hidden_authen_fields =%>
+		<%= $c->hidden_fields('subDisplay') =%>
+		<div class="mb-2"><%= maketext('Select course(s) to archive.') %></div>
+		<div class="row mb-2">
+			<%= label_for archive_courseIDs => maketext('Course Name:'), class => 'col-auto col-form-label fw-bold' =%>
+			<div class="col-auto">
+				<%= select_field archive_courseIDs => [ map { [ $courseLabels->{$_} => $_ ] } @$courseIDs ],
+					id       => 'archive_courseIDs',
+					class    => 'form-select',
+					multiple => undef,
+					size     => 15 =%>
+			</div>
+		</div>
+		%
+		<div class="row align-items-center mb-2">
+			<div class="col-auto fw-bold"><%= maketext('Delete course:') %></div>
+			<div class="col-auto">
+				<div class="form-check mb-0">
+					<label class="form-check-label alert alert-danger py-0 px-1 mb-0">
+						<%= check_box delete_course => 1, class => 'form-check-input' =%>
+						<%= maketext('Delete course after archiving. Caution there is no undo!') %>
+					</label>
+				</div>
+			</div>
+		</div>
+		%
+		<div class="d-flex justify-content-start gap-2">
+			<%= submit_button maketext('Refresh Listing'),
+				name => 'archive_course_refresh', class => 'btn btn-primary' =%>
+			<%= submit_button maketext('Archive Courses'), name => 'archive_course', class => 'btn btn-primary' =%>
+		</div>
+	<%= end =%>
+% } else {
+	<p><%= maketext('No courses found') %></p>
+% }
diff --git a/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep b/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep
new file mode 100644
index 0000000000..90e6653e8f
--- /dev/null
+++ b/templates/ContentGenerator/CourseAdmin/delete_course_confirm.html.ep
@@ -0,0 +1,18 @@
+<h2><%= maketext('Delete Course') %> <%= $c->helpMacro('AdminDeleteCourse') %></h2>
+<p>
+	<%== maketext(
+		'Are you sure you want to delete the course [_1]? All course files and data will be destroyed. '
+			. 'There is no undo available.',
+		tag('b', param('delete_courseID') || '')
+	) =%>
+</p>
+<%= form_for current_route, method => 'POST', begin =%>
+	<%= $c->hidden_authen_fields =%>
+	<%= $c->hidden_fields('subDisplay') =%>
+	<%= $c->hidden_fields('delete_courseID') =%>
+	%
+	<div class="d-flex justify-content-center gap-2">
+		<%= submit_button maketext("Don't delete"), name => 'decline_delete_course', class => 'btn btn-primary' =%>
+		<%= submit_button maketext('Delete'), name => 'confirm_delete_course', class => 'btn btn-primary' =%>
+	</div>
+<% end =%>
diff --git a/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep b/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep
new file mode 100644
index 0000000000..0306c31f29
--- /dev/null
+++ b/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep
@@ -0,0 +1,54 @@
+<h2><%= maketext('Delete Course') %> <%= $c->helpMacro('AdminDeleteCourse') %></h2>
+%
+% if (@$courseIDs) {
+	<%= form_for current_route, method => 'POST', begin =%>
+		<p>
+			<%= maketext(
+				'Courses are listed either alphabetically or in order by the time of most recent login activity, '
+					. 'oldest first. To change the listing order check the mode you want and click "Refresh Listing". '
+					. 'The listing format is: Course_Name (status :: date/time of most recent login) where status is '
+					. '"hidden" or "visible".'
+			) =%>
+		</p>
+		<div class="mb-3">
+			<div class="mb-2"><%= maketext('Select a listing format:')=%></div>
+			% for (
+				% [ alphabetically => maketext('alphabetically') ],
+				% [ last_login     => maketext('by last login date') ]
+			% )
+			% {
+				<div class="form-check">
+					<%= radio_button delete_listing_format => $_->[0],
+						id    => "delete_listing_format_$_->[0]",
+						class => 'form-check-input',
+						$_->[0] eq 'alphabetically' ? (checked => undef) : () =%>
+					<%= label_for "delete_listing_format_$_->[0]" => $_->[1], class => 'form-check-label' =%>
+				</div>
+			% }
+		</div>
+		<div class="d-flex gap-2 mb-2">
+			<%= submit_button maketext('Refresh Listing'),
+				name  => 'delete_course_refresh', class => 'btn btn-primary' =%>
+			<%= submit_button maketext('Delete Course'), name => 'delete_course', class => 'btn btn-primary' =%>
+		</div>
+		<%= $c->hidden_authen_fields =%>
+		<%= $c->hidden_fields('subDisplay') =%>
+		<div class="mb-2"><%= maketext('Select a course to delete.') %></div>
+		<div class="row mb-2">
+			<%= label_for delete_courseID => maketext('Course Name:'), class => 'col-auto col-form-label fw-bold' =%>
+			<div class="col-auto">
+				<%= select_field delete_courseID => [ map { [ $courseLabels->{$_} => $_ ] } @$courseIDs ],
+					id       => 'delete_courseID',
+					size     => 15,
+					class    => 'form-select' =%>
+			</div>
+		</div>
+		<div class="d-flex gap-2">
+			<%= submit_button maketext('Refresh Listing'),
+				name => 'delete_course_refresh', class => 'btn btn-primary' =%>
+			<%= submit_button maketext('Delete Course'), name => 'delete_course', class => 'btn btn-primary' =%>
+		</div>
+	<%= end =%>
+% } else {
+	<p><%= maketext('No courses found') %></p>
+% }
diff --git a/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep b/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep
new file mode 100644
index 0000000000..2bd8a8eca5
--- /dev/null
+++ b/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep
@@ -0,0 +1,61 @@
+<h2><%= maketext('Editing location [_1]', $locationID) %> <%= $c->helpMacro('AdminManageLocations') %></h2>
+<p>
+	<%= maketext(
+		'Edit the current value of the location description, if desired, then add and select addresses to delete, '
+			. q{and then click the "Take Action" button to make all of your changes.  Or, click }
+			. q{"Manage Locations" above to make no changes and return to the Manage Locations page.}
+	) =%>
+</p>
+%
+<%= form_for current_route, method => 'POST', begin =%>
+	<%= $c->hidden_authen_fields =%>
+	<%= $c->hidden_fields('subDisplay') =%>
+	<%= hidden_field edit_location => $locationID =%>
+	<%= hidden_field manage_location_action => 'edit_location_handler' =%>
+	%
+	<div class="row mb-2">
+		<%= label_for location_description => maketext('Location description:'), class => 'col-auto col-form-label' =%>
+		<div class="col-auto">
+			<%= text_field location_description => $location->description,
+				id => 'location_description', class => 'form-control', size => '50' =%>
+		</div>
+	</div>
+	<div class="row">
+		<div class="col-md-6">
+			<div class="mb-2">
+				<%= label_for new_location_addresses => maketext(
+					'Addresses to add to the location.  Enter one per line, as single IP addresses '
+						. '(e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP ranges '
+						. '(e.g., 192.168.1.101-192.168.1.150):') =%>
+			</div>
+			<div class="mb-2">
+				<textarea name="new_location_addresses" id="new_location_addresses" class="form-control"
+				   	rows="5" columns="28"></textarea>
+			</div>
+		</div>
+		<div class="col-md-6">
+			<div class="mb-2">
+				<%= label_for delete_location_addresses => maketext(
+					'Existing addresses for the location are given in the scrolling list below.  '
+						. 'Select addresses from the list to delete them:'
+				) =%>
+			</div>
+			<div class="mb-2">
+				<%= select_field delete_location_addresses => $locAddresses,
+					id => 'delete_location_addresses', size => 8, multiple => undef, class => 'form-select' =%>
+			</div>
+			<div class="mb-2"><%= maketext('or') %></div>
+			<div class="mb-2">
+				<div class="form-check">
+					<label class="form-check-label">
+						<%= check_box delete_all_addresses => 'true', class => 'form-check-input' %>
+						<%= maketext('Delete all existing addresses') %>
+					</label>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div>
+		<%= submit_button maketext('Take Action!'), class => 'btn btn-primary' =%>
+	</div>
+<% end =%>
diff --git a/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep b/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep
new file mode 100644
index 0000000000..152bb1cbf2
--- /dev/null
+++ b/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep
@@ -0,0 +1,60 @@
+<h2><%= maketext('Hide Courses') %> <%= $c->helpMacro('AdminHideCourses') %></h2>
+<p>
+	<%= maketext(
+		'Select the course(s) you want to hide (or unhide) and then click "Hide Courses" (or "Unhide Courses"). '
+			. 'Hiding a course that is already hidden does no harm (the action is skipped). Likewise unhiding a '
+			. 'course that is already visible does no harm (the action is skipped).  Hidden courses are still active '
+			. 'but are not listed in the list of WeBWorK courses on the opening page.  To access the course, an '
+			. 'instructor or student must know the full URL address for the course.'
+	) =%>
+</p>
+<p>
+	<%= maketext(
+		'Courses are listed either alphabetically or in order by the time of most recent login activity, '
+			. 'oldest first. To change the listing order check the mode you want and click "Refresh Listing".  '
+			. 'The listing format is: Course_Name (status :: date/time of most recent login) where status is "hidden" '
+			. 'or "visible".'
+	) =%>
+</p>
+<%= form_for current_route, method => 'POST', begin =%>
+	<div class="mb-3">
+		<div class="mb-2"><%= maketext('Select a listing format:') =%></div>
+		% for (
+			% [ alphabetically => maketext('alphabetically') ],
+			% [ last_login     => maketext('by last login date') ]
+		% )
+		% {
+			<div class="form-check">
+				<%= radio_button hide_listing_format => $_->[0],
+					id    => "hide_listing_format_$_->[0]",
+					class => 'form-check-input',
+					$_->[0] eq 'alphabetically' ? (checked => undef) : () =%>
+				<%= label_for "hide_listing_format_$_->[0]" => $_->[1], class => 'form-check-label' =%>
+			</div>
+		% }
+	</div>
+	<div class="d-flex gap-2 mb-2">
+		<%= submit_button maketext('Refresh Listing'), name => 'hide_course_refresh', class => 'btn btn-primary' =%>
+		<%= submit_button maketext('Hide Courses'), name => 'hide_course', class => 'btn btn-primary' =%>
+		<%= submit_button maketext('Unhide Courses'), name => 'unhide_course', class => 'btn btn-primary' =%>
+	</div>
+	<%= $c->hidden_authen_fields =%>
+	<%= $c->hidden_fields('subDisplay') =%>
+	%
+	<div class="mb-2"><%= maketext('Select course(s) to hide or unhide.') %></div>
+	<div class="row mb-2">
+		<%= label_for hide_courseIDs => maketext('Course Name:'), class => 'col-auto col-form-label fw-bold' =%>
+		<div class="col-auto">
+			<%= select_field hide_courseIDs => [ map { [ $courseLabels->{$_} => $_ ] } @$hideCourseIDs ],
+				id       => 'hide_courseIDs',
+				class    => 'form-select',
+				multiple => undef,
+				size     => 15 =%>
+		</div>
+	</div>
+	<div class="d-flex gap-2">
+		<%= submit_button maketext('Refresh Listing'), name => 'hide_course_refresh', class => 'btn btn-primary' =%>
+		<%= submit_button maketext('Hide Courses'), name => 'hide_course', class => 'btn btn-primary' =%>
+		<%= submit_button maketext('Unhide Courses'), name => 'unhide_course', class => 'btn btn-primary' =%>
+	</div>
+<% end =%>
diff --git a/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep b/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep
new file mode 100644
index 0000000000..f1e5f25f76
--- /dev/null
+++ b/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep
@@ -0,0 +1,152 @@
+<h2><%= maketext('Manage Locations') %> <%= $c->helpMacro('AdminManageLocations') %></h2>
+<p><strong><%= maketext('Currently defined locations are listed below.') %></strong></p>
+<%= form_for current_route, method => 'POST', begin =%>
+	% my @locationIDs = map  { $_->location_id } @$locations;
+	%
+	<%= $c->hidden_authen_fields =%>
+	<%= $c->hidden_fields('subDisplay') =%>
+	%
+	<div class="col-lg-8 col-md-9">
+		<div class="mb-2 fw-bold"><%= maketext('Select an action to perform:') =%></div>
+		% # Edit action
+		<div class="row align-items-center mb-2">
+			<div class="col-sm-4">
+				<div class="form-check">
+					<label class="form-check-label">
+						<%= radio_button manage_location_action => 'edit_location_form',
+							class => 'form-check-input' %>
+						<%= maketext('Edit Location:') %>
+					</label>
+				</div>
+			</div>
+			<div class="col-sm-8"><%= select_field edit_location => [@locationIDs], class => 'form-select' =%></div>
+		</div>
+		% # Create action
+		<div class="row align-items-center mb-2">
+			<div class="col-auto">
+				<div class="form-check">
+					<label class="form-check-label">
+						<%= radio_button manage_location_action => 'add_location_handler',
+							class => 'form-check-input' %>
+						<%= maketext('Create Location:') %>
+					</label>
+				</div>
+			</div>
+		</div>
+		<div class="row ms-sm-3 mb-2">
+			<%= label_for new_location_name => maketext('Location name:'), class => 'col-sm-4 col-form-label' =%>
+			<div class="col-sm-8">
+				<%= text_field new_location_name => '', id => 'new_location_name', class => 'form-control' =%>
+			</div>
+		</div>
+		<div class="row ms-sm-3 mb-2">
+			<%= label_for new_location_description => maketext('Location description:'),
+				class => 'col-sm-4 col-form-label' =%>
+			<div class="col-sm-8">
+				<%= text_field new_location_description => '',
+					id => 'new_location_description', class => 'form-control' =%>
+			</div>
+		</div>
+		<div class="row ms-sm-3 mb-2">
+			<div class="col">
+				<%= label_for new_location_addresses => maketext(
+					'Addresses for new location.  Enter one per line, as single IP addresses (e.g., 192.168.1.101), '
+						. 'address masks (e.g., 192.168.1.0/24), or IP ranges (e.g., 192.168.1.101-192.168.1.150):'
+				) =%>
+			</div>
+		</div>
+		<div class="row ms-sm-3 mb-2">
+			<div class="col-7 col-xs-12">
+				<%= text_area new_location_addresses => '', id => 'new_location_addresses',
+					columns => 40, class => 'form-control' =%>
+			</div>
+		</div>
+		% # Delete action
+		<div class="row mb-2">
+			<div class="text-danger">
+				<em>
+					<%= maketext('Deletion deletes all location data and related addresses, and is not undoable!') %>
+				</em>
+			</div>
+		</div>
+		<div class="row align-items-center mb-2">
+			<div class="col-sm-4">
+				<div class="form-check">
+					<label class="form-check-label">
+						<%= radio_button manage_location_action => 'delete_location_handler',
+							class => 'form-check-input' %>
+						<%= maketext('Delete location:') %>
+					</label>
+				</div>
+			</div>
+			<div class="col-sm-8">
+				<div class="row mb-1">
+					<div class="col-auto">
+						<%= select_field delete_location => [
+								[ maketext('no location') => '' ],
+								[ maketext('locations selected below') => 'selected_locations' ],
+								@locationIDs
+							], class => 'form-select' =%>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-auto">
+						<div class="form-check">
+							<label class="form-check-label">
+								<%= check_box delete_confirm => 'true', class => 'form-check-input' %>
+								<%= maketext('Confirm') %>
+							</label>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	%
+	<div><%= submit_button maketext('Take Action!'), name => 'manage_locations', class => 'btn btn-primary' =%></div>
+	%
+	% # Existing location table
+	% if (@$locations) {
+		<div class="table-responsive mt-3">
+			<table class="table table-sm font-sm table-bordered table-striped">
+				<thead>
+					<tr>
+						<th><%= maketext('Select') %></th>
+						<th><%= maketext('Location') %></th>
+						<th><%= maketext('Description') %></th>
+						<th><%= maketext('Addresses') %></th>
+					</tr>
+				</thead>
+				<tbody class="table-group-divider">
+					% for (@$locations) {
+						<tr>
+							<td>
+								<%= check_box delete_selected => $_->location_id,
+									name  => 'delete_selected',
+									id    => $_->location_id . '_id',
+									class => 'form-check-input' =%>
+							</td>
+							<td>
+								<%= label_for $_->location_id . '_id' =>
+									link_to $_->location_id => $c->systemLink(
+										url_for,
+										params => {
+											subDisplay             => 'manage_locations',
+											manage_location_action => 'edit_location_form',
+											edit_location          => $_->location_id
+										}
+									) =%>
+							</td>
+							<td><%= $_->description %></td>
+							<td><%= join(', ', @{ $locAddr->{ $_->location_id } }) %></td>
+						</tr>
+					% }
+				</tbody>
+			</table>
+		</div>
+	% } else {
+		<div class="row mt-3">
+			<div class="col-lg-8 col-md-9 fw-bold"><%= maketext('No locations are currently defined.') %></div>
+		</div>
+	% }
+<% end =%>
diff --git a/templates/ContentGenerator/CourseAdmin/registration_form.html.ep b/templates/ContentGenerator/CourseAdmin/registration_form.html.ep
new file mode 100644
index 0000000000..8eb473eed7
--- /dev/null
+++ b/templates/ContentGenerator/CourseAdmin/registration_form.html.ep
@@ -0,0 +1,76 @@
+% if (
+	% -e "$ce->{courseDirs}{root}/registered_$ce->{WW_VERSION}"
+	% || param('register_site')
+	% || (defined param('subDisplay') && param('subDisplay') eq 'registration')
+% )
+% {
+	% # Show registered note.
+	<div class="d-flex justify-content-center mb-2">REGISTERED for WeBWorK <%= $ce->{WW_VERSION} %></div>
+% } else {
+	% # Otherwise show the registration form.
+	<div class="d-flex justify-content-center mb-2">
+		<div class="admin-messagebox">
+			<p>
+				<strong>Please consider registering for the WW-security-announce Google group / mailing list</strong>
+				using the join group link on the
+				<%= link_to 'group page' => $ce->{webworkURLs}{wwSecurityAnnounce}, target => '_blank' %>
+				which appears when you are logged in to a Google account <strong>or</strong> by sending an email using
+				<%= link_to 'this mailto link' =>
+						join('',
+							"mailto:$ce->{webworkSecListManagers}?subject=",
+							'Joining ww-security-announce',
+							'&body=',
+							"Server URL: $ce->{server_root_url}\n",
+							"WeBWorK version: $ce->{WW_VERSION}\n",
+							"Institution name: \n") %>
+				This list will help us keep you updated about security issues and patches, and important related
+				announcements.
+			</p>
+			<hr>
+			<p>
+				Please consider contributing to WeBWorK development either with a one time contribution or monthly
+				support. The WeBWorK Project is a registered 501(c)(3) organization and contributions are tax deductible
+				in the United States.
+			</p>
+			<div class="text-center">
+				<%= link_to 'https://github.com/sponsors/openwebwork',
+					class  => 'btn btn-secondary', target => '_blank', begin =%>
+					<i class="fa-regular fa-heart"></i> Sponsor
+				<%= end =%>
+			</div>
+			<hr>
+			<p>This site is not registered for WeBWorK version <%= $ce->{WW_VERSION} %>.</p>
+			<p>
+				We are often asked how many institutions are using WeBWorK and how many students are using WeBWorK.
+				Since WeBWorK is open source and can be freely downloaded from
+				<%= link_to $ce->{webworkURLs}{GitHub} => $ce->{webworkURLs}{GitHub}, target => '_blank' %>,
+				it is frequently difficult for us to give a reasonable answer to this question.
+			</p>
+			<p>
+				You can help by
+				<%= link_to 'registering your current version of WeBWorK' => $ce->{webworkURLs}{serverRegForm},
+					target => '_blank' %>.
+				Please complete the Google form as best you can and submit your answers to the WeBWorK Project team. It
+				takes just 2-3 minutes.  Thank you! The WeBWorK Project
+			</p>
+			<p>
+				Eventually your site will be listed along with all of the others on the
+				<%= link_to 'site map' => $ce->{webworkURLs}{SiteMap}, target => '_blank' %>
+				on the main
+				<%= link_to 'WeBWorK Wiki' => $ce->{webworkURLs}{WikiMain}, target => '_blank' %>.
+			</p>
+			<hr>
+			<p>You can hide this "registration" banner for the future by clicking the button below.</p>
+			<%= form_for current_route, method => 'POST', id => 'return_to_main_page', begin =%>
+				<%= $c->hidden_authen_fields =%>
+				<%= hidden_field subDisplay => 'registration' =%>
+				<div class="text-center">
+					<%= submit_button 'Hide the banner.',
+						id    => 'register_site',
+						name  => 'register_site',
+						class => 'btn btn-primary' =%>
+				</div>
+			<%= end =%>
+		</div>
+	</div>
+% }
diff --git a/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep b/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep
new file mode 100644
index 0000000000..c36f4a3116
--- /dev/null
+++ b/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep
@@ -0,0 +1,90 @@
+<h2><%= maketext('Rename Course') %> <%= $c->helpMacro('AdminRenameCourse') %></h2>
+% # Report on databases
+<h3 class="my-3"><%= maketext('Report on database structure for course [_1]:', $rename_oldCourseID) %></h3>
+% if (@$upgrade_report) {
+	% for (@$upgrade_report) {
+		<p class="<%= $_->[1] ? 'text-success' : 'text-danger' %> fw-bold my-0"><%= $_->[0] %></p>
+	% }
+% }
+% my ($all_tables_ok, $extra_database_tables, $extra_database_fields, $db_report) =
+	% $c->formatReportOnDatabaseTables($dbStatus);
+<%= $db_report =%>
+% if ($extra_database_tables) {
+	<p class="text-danger fw-bold">
+		<%= maketext(
+			'There are extra database tables which are not defined in the schema.  '
+				. 'These can be deleted when upgrading the course.'
+		) =%>
+	</p>
+% }
+% if ($extra_database_fields) {
+	<p class="text-danger fw-bold">
+		<%= maketext(
+			'There are extra database fields which are not defined in the schema for at least one table.  '
+				. 'They can be removed when upgrading the course.'
+		) =%>
+	</p>
+% }
+% if (!$all_tables_ok) {
+	<p class="text-danger fw-bold">
+		<%= maketext('The course database must be upgraded before renaming this course.') =%>
+	</p>
+% }
+% # Report on directories
+<h3>Directory structure</h3>
+<ul>
+	% for (@$directory_report) {
+		<li><%= $_->[0] %>: <span class="<%= $_->[2] ? 'text-success' : 'text-danger' %>"><%= $_->[1] %></span></li>
+	% }
+</ul>
+% if ($directories_ok) {
+	<p class="text-success"><%= maketext('Directory structure is ok') %></p>
+% } else {
+	<p class="text-danger fw-bold">
+		<%= maketext('Directory structure is missing directories or the webserver lacks sufficient privileges.') =%>
+	</p>
+% }
+<hr>
+% # Print form for choosing next action.
+<%= form_for current_route, method => 'POST', begin =%>
+	<%= $c->hidden_authen_fields =%>
+	<%= $c->hidden_fields(
+		qw(subDisplay rename_oldCourseID rename_newCourseID rename_newCourseTitle rename_newCourseInstitution
+			rename_newCourseID_checkbox rename_newCourseInstitution_checkbox rename_newCourseTitle_checkbox)
+	) =%>
+	<%= hidden_field rename_oldCourseTitle => $rename_oldCourseTitle, id => 'hidden_rename_oldCourseTitle' =%>
+	<%= hidden_field rename_oldCourseInstitution => $rename_oldCourseInstitution,
+		id => 'hidden_rename_oldCourseInstitution' =%>
+	%
+	% if ($all_tables_ok && $directories_ok) {
+		% # No missing tables, missing fields, or directories
+		<div class="text-start">
+			<h3><%= maketext('Rename [_1] to [_2]', $rename_oldCourseID, $rename_newCourseID) %></h3>
+			% if ($change_course_title_str) {
+				<div class="my-3"><%= $change_course_title_str %></div>
+			% }
+			% if ($change_course_institution_str) {
+				<div class="mb-3"><%= $change_course_institution_str %></div>
+			% }
+			<div class="d-flex justify-content-center gap-2">
+				<%= submit_button maketext(q{Don't rename}),
+					name => 'decline_rename_course', class => 'btn btn-primary' =%>
+				<%= submit_button maketext('Rename'),
+					name => 'confirm_rename_course', class => 'btn btn-primary' =%>
+			</div>
+		</div>
+	% } elsif ($directories_ok) {
+		<div class="d-flex justify-content-center gap-2">
+			<%= submit_button maketext(q{Don't rename}), name => 'decline_rename_course', class => 'btn btn-primary' =%>
+			<%= submit_button maketext('Upgrade Course Tables'),
+				name => 'upgrade_course_tables', class => 'btn btn-primary' =%>
+		</div>
+	% } else {
+		<div class="text-center alert alert-danger p-1 mb-2">
+			<%= maketext('Directory structure needs to be repaired manually before renaming.') =%>
+		</div>
+		<div class="text-center">
+			<%= submit_button maketext(q{Don't rename}), name => 'decline_rename_course', class => 'btn btn-primary' =%>
+		</div>
+	% }
+<% end =%>
diff --git a/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep b/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep
new file mode 100644
index 0000000000..c498ccf0f1
--- /dev/null
+++ b/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep
@@ -0,0 +1,30 @@
+<h2><%= maketext('Rename Course') %> <%= $c->helpMacro('AdminRenameCourse') %></h2>
+<%= form_for current_route, method => 'POST', begin =%>
+	<%= $c->hidden_authen_fields =%>
+	<%= $c->hidden_fields('subDisplay') =%>
+	<%= $c->hidden_fields(
+		qw/rename_oldCourseID rename_newCourseID rename_newCourseTitle rename_newCourseInstitution
+			rename_newCourseID_checkbox rename_newCourseInstitution_checkbox rename_newCourseTitle_checkbox/
+	) =%>
+	<%= hidden_field rename_oldCourseTitle => $rename_oldCourseTitle, id => 'hidden_rename_oldCourseTitle' =%>
+	<%= hidden_field rename_oldCourseInstitution => $rename_oldCourseInstitution,
+		id => 'hidden_rename_oldCourseInstitution' =%>
+	%
+	<div class="text-start">
+		<hr>
+		<h3 class="mb-3"><%= maketext('Make these changes in course: [_1]', $rename_oldCourseID) %></h3>
+		% if ($change_course_title_str) {
+			<p><%= $change_course_title_str %></p>
+		% }
+		% if ($change_course_institution_str) {
+			<p><%= $change_course_institution_str %></p>
+		% }
+		<hr>
+		<div class="d-flex justify-content-center gap-2">
+			<%= submit_button maketext(q{Don't make changes}),
+					name  => 'decline_retitle_course',
+					class => 'btn btn-primary' =%>
+			<%= submit_button maketext('Make changes'), name => 'confirm_retitle_course', class => 'btn btn-primary' =%>
+		</div>
+	</div>
+<% end =%>
diff --git a/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep b/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep
new file mode 100644
index 0000000000..9cb34b3546
--- /dev/null
+++ b/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep
@@ -0,0 +1,77 @@
+% use WeBWorK::Utils::CourseManagement qw(listCourses);
+%
+<h2><%= maketext('Rename Course') %> <%= $c->helpMacro('AdminRenameCourse') %></h2>
+%
+% my @courseIDs = sort { lc($a) cmp lc($b) } grep { $_ ne stash('courseID') } listCourses($ce);
+%
+% if (@courseIDs) {
+	<%= form_for current_route, method => 'POST', begin =%>
+		<%= $c->hidden_authen_fields =%>
+		<%= $c->hidden_fields('subDisplay') =%>
+		%
+		<p>
+			<%= maketext(
+				'Select a course to rename.  The courseID is used in the url and can only contain alphanumeric '
+					. 'characters and underscores. The course title appears on the course home page and can be any '
+					. 'string.'
+			) =%>
+		</p>
+		<div class="col-lg-7 col-md-8">
+			<div class="row mb-2">
+				<%= label_for rename_oldCourseID => maketext('Course ID:'),
+					class => 'col-sm-6 col-form-label fw-bold' =%>
+				<div class="col-sm-6">
+					<%= select_field rename_oldCourseID => [ map { [ $_ => $_ ] } @courseIDs ],
+						class    => 'form-select',
+						size     => 10,
+						id       => 'rename_oldCourseID' =%>
+				</div>
+			</div>
+			<div class="row mb-2 align-items-center">
+				<div class="col-sm-6">
+					<div class="form-check">
+						<label class="form-check-label" id="rename_newCourseID_label">
+							<%= maketext('Change CourseID to:') %>
+							<%= check_box rename_newCourseID_checkbox => 'on', class => 'form-check-input' %>
+						</label>
+					</div>
+				</div>
+				<div class="col-sm-6">
+					<%= text_field rename_newCourseID => '',
+						class => 'form-control', 'aria-labelledby' => 'rename_newCourseID_label' =%>
+				</div>
+			</div>
+			<div class="row mb-2 align-items-center">
+				<div class="col-sm-6">
+					<div class="form-check">
+						<label class="form-check-label" id="rename_newCourseTitle_label">
+							<%= maketext('Change Course Title to:') %>
+							<%= check_box rename_newCourseTitle_checkbox => 'on', class => 'form-check-input' %>
+						</label>
+					</div>
+				</div>
+				<div class="col-sm-6">
+					<%= text_field rename_newCourseTitle => '',
+						class => 'form-control', 'aria-labelledby' => 'rename_newCourseTitle_label' =%>
+				</div>
+			</div>
+			<div class="row mb-2 align-items-center">
+				<div class="col-sm-6">
+					<div class="form-check">
+						<label class="form-check-label" id="rename_newCourseInstitution_label">
+							<%= maketext('Change Institution to:') %>
+							<%= check_box rename_newCourseInstitution_checkbox => 'on', class => 'form-check-input' %>
+						</label>
+					</div>
+				</div>
+				<div class="col-sm-6">
+					<%= text_field rename_newCourseInstitution => '',
+						class => 'form-control', 'aria-labelledby' => 'rename_newCourseInstitution_label' =%>
+				</div>
+			</div>
+		</div>
+		<%= submit_button maketext('Rename Course'), name => 'rename_course', class => 'btn btn-primary' =%>
+	<% end =%>
+% } else {
+	<p><%= maketext('No courses found') %></p>
+% }
diff --git a/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep b/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep
new file mode 100644
index 0000000000..99b03d5e3a
--- /dev/null
+++ b/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep
@@ -0,0 +1,17 @@
+<h2><%= maketext('Unarchive Course') %> <%= $c->helpMacro('AdminUnarchiveCourse') %></h2>
+<%= form_for current_route, method => 'POST', begin =%>
+	<div class="row mb-2">
+		<%= label_for new_courseID => maketext('Unarchive [_1] to course:', $unarchive_courseID),
+			class => 'col-auto col-form-label' =%>
+		<div class="col-auto">
+			<input type="text" name="new_courseID" id="new_courseID" value="<%= $courseID %>" class="form-control">
+		</div>
+	</div>
+	<%= $c->hidden_authen_fields =%>
+	<%= $c->hidden_fields(qw(subDisplay unarchive_courseID create_newCourseID)) =%>
+	<div class="d-flex justify-content-center gap-2">
+		<%= submit_button maketext(q{Don't Unarchive}),
+			name => 'decline_unarchive_course', class => 'btn btn-primary' =%>
+		<%= submit_button maketext('Unarchive'), name => 'confirm_unarchive_course', class => 'btn btn-primary' =%>
+	</div>
+<% end =%>
diff --git a/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep b/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep
new file mode 100644
index 0000000000..68c303b3ed
--- /dev/null
+++ b/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep
@@ -0,0 +1,51 @@
+% use WeBWorK::Utils::CourseManagement qw(listArchivedCourses);
+%
+<h2><%= maketext('Unarchive Course') %> <%= $c->helpMacro('AdminUnarchiveCourse') %></h2>
+%
+% # Find courses which have been archived.
+% my @courseIDs = sort { lc($a) cmp lc($b) } listArchivedCourses($ce);
+%
+% if (@courseIDs) {
+	<%= form_for current_route, method => 'POST', begin =%>
+		<%= $c->hidden_authen_fields =%>
+		<%= $c->hidden_fields('subDisplay') =%>
+		%
+		<div class="mb-2"><%= maketext('Select a course to unarchive.') =%></div>
+		%
+		<div class="col-lg-7 col-md-8">
+			<div class="row mb-2">
+				<%= label_for 'unarchive_courseID' => maketext('Course Name:'), class => 'col-sm-4 col-form-label' =%>
+				<div class="col-sm-8">
+					<%= select_field unarchive_courseID => \@courseIDs,
+						id       => 'unarchive_courseID',
+						class    => 'form-select',
+						size     => 10
+					=%>
+				</div>
+			</div>
+			<div class="row mb-2 align-items-center">
+				<div class="col-sm-4">
+					<div class="form-check">
+						<label class="form-check-label" id="create_newCourseID_label">
+							<%= maketext('New Name:') %>
+							<%= check_box create_newCourseID => 1, class => 'form-check-input' %>
+						</label>
+					</div>
+				</div>
+				<div class="col-sm-8">
+					<%= text_field new_courseID => '',
+						size              => 25,
+						maxlength         => $ce->{maxCourseIdLength},
+						class             => 'form-control',
+						'aria-labelledby' => 'create_newCourseID_label'
+					=%>
+				</div>
+			</div>
+		</div>
+		<div>
+			<%= submit_button maketext('Unarchive Course'), name => 'unarchive_course', class => 'btn btn-primary' =%>
+		</div>
+	<% end =%>
+% } else {
+	<p><%= maketext('No course archives found.') %></p>
+% }
diff --git a/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep b/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep
new file mode 100644
index 0000000000..3d5e4ca7d0
--- /dev/null
+++ b/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep
@@ -0,0 +1,49 @@
+<h2><%= maketext('Upgrade Courses') %> <%= $c->helpMacro('AdminUpgradeCourses') %></h2>
+<%= form_for current_route, method => 'POST', begin =%>
+	<% my $checkALLs = begin =%>
+		% if ($extra_database_tables_exist) {
+			<div class="form-check">
+				<label class="form-check-label">
+					<input type="checkbox" value="on" class="select-all form-check-input"
+						data-select-group="delete_tableIDs">
+					<%= maketext('Select/unselect all tables missing in schema for deletion.') %>
+				</label>
+			</div>
+		% }
+		% if ($extra_database_fields_exist) {
+			<div class="form-check">
+				<label class="form-check-label">
+					<input type="checkbox" value="on" class="select-all form-check-input"
+						data-select-group="delete_fieldIDs">
+					<%= maketext('Select/unselect all fields missing in schema for deletion.') %>
+				</label>
+			</div>
+		% }
+	<% end =%>
+	%
+	<div class="my-3">
+		<%= $checkALLs->() %>
+	</div>
+	%
+	<%= $status_output %>
+	%
+	% # Print form for choosing next action.
+	% unless (@$upgrade_courseIDs) {
+		<h3><%= maketext('No course id defined') %></h3>
+	% }
+	%
+	<%= $c->hidden_authen_fields =%>
+	<%= $c->hidden_fields('subDisplay') =%>
+	%
+	<div class="mb-3">
+		<%= $checkALLs->() %>
+	</div>
+	%
+	% # Submit buttons.
+	% # After presenting a detailed summary of status of selected courses the choice is made to upgrade the selected
+	% # courses (confirm_upgrade_course is set or return to the beginning (decline_upgrade_course is set)
+	<div class="submit-buttons-container">
+		<%= submit_button maketext(q{Don't Upgrade}), name => 'decline_upgrade_course', class => 'btn btn-primary' =%>
+		<%= submit_button maketext('Upgrade'), name => 'confirm_upgrade_course', class => 'btn btn-primary' =%>
+	</div>
+<% end =%>
diff --git a/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep b/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep
new file mode 100644
index 0000000000..6b9df08fbc
--- /dev/null
+++ b/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep
@@ -0,0 +1,60 @@
+% use WeBWorK::Utils::CourseManagement qw(listCourses);
+% use WeBWorK::Utils::CourseIntegrityCheck;
+% use WeBWorK::CourseEnvironment;
+%
+% my @courseIDs = sort { lc($a) cmp lc($b) } listCourses($ce);
+%
+<h2><%= maketext('Upgrade Courses') %> <%= $c->helpMacro('AdminUpgradeCourses') %></h2>
+<div class="mb-2"><%= maketext('Update the checked directories?') %></div>
+<%= form_for current_route, method => 'POST', id => 'courselist', name => 'courselist', begin =%>
+	<div class="mb-2">
+		<button type="button" class="select-all btn btn-sm btn-secondary" data-select-group="upgrade_courseIDs">
+			<%= maketext('Select all eligible courses') =%>
+		</button>
+		<button type="button" class="select-none btn btn-sm btn-secondary" data-select-group="upgrade_courseIDs">
+			<%= maketext('Unselect all courses') =%>
+		</button>
+	</div>
+	<%= $c->hidden_authen_fields =%>
+	<%= $c->hidden_fields('subDisplay') =%>
+	%
+	<ul>
+		% for my $courseID (@courseIDs) {
+			% next if $courseID eq 'modelCourse';    # modelCourse isn't a real course so it can't be upgraded.
+			% next unless $courseID =~ /\S/;         # Skip empty courseIDs (there shouldn't be any)
+			%
+			% my $tempCE = eval { WeBWorK::CourseEnvironment->new({ courseName => $courseID }) };
+			% if ($@) {
+				<%= maketext(q{Can't create course environment for [_1] because [_2]}, $courseID, $@) =%>
+			% }
+			% my $CIchecker = WeBWorK::Utils::CourseIntegrityCheck->new(ce => $tempCE);
+			% my ($tables_ok)      = $CIchecker->checkCourseTables($courseID);
+			% my ($directories_ok) = $CIchecker->checkCourseDirectories();
+			%
+			<li class="align-items-center">
+				% if (!$tables_ok || !$directories_ok) {
+					<div class="form-check form-check-inline me-1">
+						<label class="form-check-label">
+							<%= check_box upgrade_courseIDs => $courseID,
+								name => 'upgrade_courseIDs', checked => undef, class => 'form-check-input' %>
+							<%= maketext('Upgrade') %>
+						</label>
+					</div>
+				% }
+				<%= link_to $courseID => 'set_list' => { courseID => $courseID } =%>
+				<code><%= $tempCE->{dbLayoutName} %></code>
+				% if (!$directories_ok) {
+					<span class="alert alert-danger p-1 mb-0">
+						<%= maketext('Directory structure or permissions need to be repaired.') =%>
+					</span>
+				% }
+				% if ($tables_ok) {
+					<span class="text-success"><%= maketext('Database tables ok') %></span>
+				% } else {
+					<span class="text-danger"><%= maketext('Database tables need updating.') %></span>
+				% }
+			</li>
+		% }
+	</ul>
+	<%= submit_button maketext('Upgrade Courses'), name => 'upgrade_course', class => 'btn btn-primary' =%>
+<% end =%>
diff --git a/templates/ContentGenerator/EquationDisplay.html.ep b/templates/ContentGenerator/EquationDisplay.html.ep
new file mode 100644
index 0000000000..21d09e37b4
--- /dev/null
+++ b/templates/ContentGenerator/EquationDisplay.html.ep
@@ -0,0 +1,9 @@
+<div class="my-3">Copy the location of this image (or drag and drop) into your editing area:</div>
+<p><%= $typesetStr %></p>
+<p><%== $typesetStr %></p>
+<%= form_for current_route, method => 'POST', begin =%>
+	<%= $c->hidden_authen_fields =%>
+	<%= text_area eq => '', class => 'form-control mb-3', placeholder => 'Enter equation here',
+		cols => 40, rows => 5 =%>
+	<%= submit_button 'typeset', class => 'btn btn-primary' =%>
+<% end =%>
diff --git a/templates/ContentGenerator/Feedback.html.ep b/templates/ContentGenerator/Feedback.html.ep
new file mode 100644
index 0000000000..ca31c70e77
--- /dev/null
+++ b/templates/ContentGenerator/Feedback.html.ep
@@ -0,0 +1,62 @@
+% use Text::Wrap qw(wrap);
+%
+% unless ($authz->hasPermissions(param('user'), 'submit_feedback')) {
+	<p><%= maketext('You are not allowed to send e-mail.') %></p>
+	<p><%= link_to maketext('Cancel E-Mail') => $returnURL %></p>
+	% last;
+% }
+%
+% unless ($numRecipients) {
+	<p><%= maketext('No e-mail recipients are listed for this course.') %></p>
+	<p><%= link_to maketext('Cancel E-Mail') => $returnURL %></p>
+	% last;
+% }
+%
+% if (defined param('sendFeedback') && !stash('send_error')) {
+	<p><%= maketext('Your message was sent successfully.') %></p>
+	<p><%= link_to maketext('Return to your work') => $returnURL =%></p>
+	<pre><%= wrap('', '', param('feedback')) =%></pre>
+% } else {
+	<%= form_for current_route, method => 'POST', enctype => 'multipart/form-data', begin =%>
+		<%= $c->hidden_authen_fields =%>
+		<%= $c->hidden_fields(qw(route set problem displayMode showOldAnswers
+			showCorrectAnswers showHints showSolutions)) =%>
+		%
+		<div class="mb-3">
+			<%= maketext(
+				'Use this form to ask your instructor a question, to report a problem with the WeBWorK system, or '
+					. 'to report an error in a problem you are attempting. Along with your message, additional '
+					. 'information about the state of the system will be included.'
+			) =%>
+		</div>
+		<div class="row mb-3">
+			<%= label_for 'from', class => 'col-form-label col-auto', begin =%><b><%= maketext('From:') %></b><% end =%>
+			<div class="col-auto">
+				<%= text_field from => $user_email_address, class => 'form-control', size => 40, id => 'from',
+					$user_email_address ? (disabled => undef, readonly => undef) : (required => undef) =%>
+			</div>
+		</div>
+		% if (stash 'send_error') {
+			<div class="alert alert-danger mb-3"><%= stash 'send_error' %></div>
+		% }
+		<div class="mb-3">
+			<%= label_for 'feedback', class => 'form-label', begin =%><b><%= maketext('E-mail:') %></b><% end =%>
+			<%= text_area feedback => '', id => 'feedback', rows => '20', class => 'form-control',
+				placeholder => maketext('Compose Email Message'), required => undef =%>
+		</div>
+		% # Attachment
+		<div class="row mb-3">
+			<%= label_for 'attachment', class => 'col-form-label col-auto', begin =%>
+				<b><%= maketext('Attachment:') %></b>
+			<%= end %>
+			<div class="col-auto">
+				<%= file_field 'attachment', id => 'attachment', class => 'form-control',
+					accept => 'image/*,application/pdf,application/zip,text/plain,text/csv' =%>
+			</div>
+		</div>
+		<%= submit_button maketext('Send E-mail'), name => 'sendFeedback', class => 'btn btn-primary mb-1' =%>
+	<% end =%>
+	% if ($returnURL) {
+		<div><%= link_to maketext('Cancel E-mail') => $returnURL, class => 'btn btn-primary mt-2' =%></div>
+	% }
+% }
diff --git a/templates/ContentGenerator/GatewayQuiz.html.ep b/templates/ContentGenerator/GatewayQuiz.html.ep
new file mode 100644
index 0000000000..4b35ff4100
--- /dev/null
+++ b/templates/ContentGenerator/GatewayQuiz.html.ep
@@ -0,0 +1,719 @@
+% use WeBWorK::Utils qw(before after wwRound getAssetURL);
+% use WeBWorK::Utils::LanguageAndDirection qw(get_problem_lang_and_dir);
+% use WeBWorK::HTML::SingleProblemGrader;
+% use WeBWorK::AchievementEvaluator qw(checkForAchievements);
+%
+% content_for css => begin
+	<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'achievements.css' }) =%>
+	<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'gateway.css' }) =%>
+	% # Output css for jquery-ui for problems to use.
+	<%= stylesheet getAssetURL($ce, 'node_modules/jquery-ui-dist/jquery-ui.min.css') =%>
+	%
+	% # Add CSS files requested by problems via ADD_CSS_FILE() in the PG file
+	% # or via a setting of $ce->{pg}{specialPGEnvironmentVars}{extra_css_files}
+	% # which can be set in course.conf (the value should be an anonomous array).
+	% my @cssFiles;
+	% if (ref($ce->{pg}{specialPGEnvironmentVars}{extra_css_files}) eq 'ARRAY') {
+		% push(@cssFiles, { file => $_, external => 0 }) for @{ $ce->{pg}{specialPGEnvironmentVars}{extra_css_files} };
+	% }
+	% for my $pg (@$pg_results) {
+		% next unless ref($pg);
+		% if (ref($pg->{flags}{extra_css_files}) eq 'ARRAY') {
+			% push @cssFiles, @{ $pg->{flags}{extra_css_files} };
+		% }
+	% }
+	% my %cssFilesAdded;    # Used to avoid duplicates
+	% for (@cssFiles) {
+		% next if $cssFilesAdded{ $_->{file} };
+		% $cssFilesAdded{ $_->{file} } = 1;
+		% if ($_->{external}) {
+			<%= stylesheet $_->{file} =%>
+		% } else {
+			<%= stylesheet getAssetURL($ce, $_->{file}) =%>
+		% }
+	% }
+% end
+%
+% content_for js => begin
+	% if ($c->{will}{showProblemGrader}) {
+		<%= javascript getAssetURL($ce, 'js/ProblemGrader/problemgrader.js'), defer => undef =%>
+	% }
+	%
+	% # Page specfific javascript
+	<%= javascript getAssetURL($ce, 'js/GatewayQuiz/gateway.js'), defer => undef =%>
+	%
+	% # Output javascript for jquery-ui for problems to use.
+	<%= javascript getAssetURL($ce, 'node_modules/jquery-ui-dist/jquery-ui.min.js') =%>
+	%
+	% # Add JS files requested by problems via ADD_JS_FILE() in the PG file.
+	% my %jsFiles;
+	% for my $pg (@$pg_results) {
+		% next unless ref($pg);
+		% if (ref($pg->{flags}{extra_js_files}) eq 'ARRAY') {
+			% for (@{ $pg->{flags}{extra_js_files} }) {
+				% next if $jsFiles{ $_->{file} };
+				% $jsFiles{ $_->{file} } = 1;
+				%
+				% my %attributes = ref($_->{attributes}) eq 'HASH' ? %{ $_->{attributes} } : ();
+				% if ($_->{external}) {
+					<%= javascript $_->{file}, %attributes =%>
+				% } else {
+					<%= javascript getAssetURL($ce, $_->{file}), %attributes =%>
+				% }
+			% }
+		% }
+	% }
+% end
+%
+% my $userID          = param('user');
+% my $effectiveUserID = param('effectiveUser');
+%
+% # If the set or problem is invalid, then show that information and exit.
+% if ($c->{invalidSet} || $c->{invalidProblem}) {
+	<div class="alert alert-danger mb-2">
+		<div class="mb-2">
+			<%= maketext(
+				'The selected problem set ([_1]) is not a valid set for [_2]: [_3]',
+				$setID, $effectiveUserID, $c->{invalidVersionCreation} ? " (acted as by $userID)" : ''
+			) =%>
+		</div>
+		<div><%== $c->{invalidSet} %></div>
+		% if ($c->{invalidVersionCreation} && $c->{invalidVersionCreation} == 1) {
+			<p>
+				<%= link_to 'Create new set version.' => $c->systemLink(
+					url_for,
+					params => { effectiveUser => $effectiveUserID, user => $userID, createnew_ok => 1 }
+				) =%>
+			</p>
+		% }
+	</div>
+	%
+	% last;
+% }
+%
+% # If there were translation errors, then show those and exit.
+% if (@{ $c->{errors} }) {
+	% my $errorNum = 1;
+	% my ($message, $context) = (c, c);
+	% for (@{ $c->{errors} }) {
+		% push(@$message, "$errorNum. ") if (@{ $c->{errors} } > 1);
+		% push(@$message, $_->{message}, tag('br'));
+		%
+		% my $line = begin
+			<p><%= (@{ $c->{errors} } > 1 ? "$errorNum." : '') %><%== $_->{context} %></p>
+			<div class="gwDivider"></div>
+		% end
+		% push @$context, $line->();
+	% }
+	<%= include 'ContentGenerator/Base/error_output', error => $message->join(''), details => $context->join('') =%>
+	%
+	% last;
+% }
+%
+% my $setID          = $c->{set}->set_id;
+% my $setVersionID   = $c->{set}->version_id;
+% my $numProbPerPage = $c->{set}->problems_per_page;
+%
+% if ($c->{will}{recordAnswers}) {
+	% my $divClass = 'ResultsWithoutError';
+	% my $recdMsg  = '';
+	% for (@{ $c->{scoreRecordedMessage} }) {
+		% if ($_ ne 'recorded') {
+			% $recdMsg  = $_;
+			% $divClass = 'ResultsWithError';
+			% last;
+		% }
+	% }
+	%
+	<div class="<%= $divClass . ' mb-3' %>">
+		% # A handy noun for when referring to a test.
+		% my $testNoun = ($c->{set}->attempts_per_version || 0) > 1 ? maketext('submission') : maketext('test');
+		% my $testNounNum =
+			% (($c->{set}->attempts_per_version || 0) > 1)
+			% ? maketext('submission (version [_1])', $setVersionID)
+			% : maketext('version ([_1])',            $setVersionID);
+		%
+		% if ($recdMsg) {
+			% # There was an error when saving the results
+			<strong><%= maketext('Your score on this [_1] was NOT recorded.', $testNounNum) %> <%= $recdMsg %></strong>
+			<br>
+		% } else {
+			% # No error. Output recorded message.
+			<strong><%= maketext('Your score on this [_1] WAS recorded.', $testNounNum) %></strong>
+			<br>
+			% # Show the score if that is allowed.
+			% if ($c->{can}{showScore}) {
+				<strong>
+					<%= maketext('Your score on this [_1] is [_2]/[_3].',
+						$testNoun, $c->{attemptScore}, $c->{totalPossible}) =%>
+				</strong>
+			% } else {
+				% if ($c->{set}->hide_score eq 'BeforeAnswerDate') {
+					<%= maketext('(Your score on this [_1] is not available until [_2].)',
+						$testNoun, $c->formatDateTime($c->{set}->answer_date)) =%>
+				% } else {
+					<%= maketext('(Your score on this [_1] is not available.)', $testNoun) =%>
+				% }
+			% }
+			% # Print a message when submitting the score to an LMS.
+			% if ($c->{LTIGradeResult} != -1) {
+				<br>
+				<%= $c->{LTIGradeResult}
+					? maketext('Your score was successfully sent to the LMS.')
+					: maketext('Your score was not successfully sent to the LMS.') =%>
+			% }
+		% }
+	</div>
+	%
+	% # Finally, if there is another recorded message, output that too.
+	% if (
+		% $c->{set}->attempts_per_version > 1
+		% && $c->{attemptNumber} > 0
+		% && $c->{recordedScore} != $c->{attemptScore}
+		% && $c->{can}{showScore}
+	% )
+	% {
+		<div class="gwMessage">
+			<%== maketext(
+				'Your recorded score for this version is [_1]/[_2] ([_3]%).',
+				'<span id="test-recorded-score">' . wwRound(2, $c->{recordedScore}) . '</span>',
+				'<span id="test-total-possible">' . $c->{totalPossible} . '</span>',
+				'<span id="test-recorded-percent">'
+					. wwRound(0, 100 * $c->{recordedScore} / $c->{totalPossible})
+					. '</span>'
+			) =%>
+		</div>
+	% }
+% } elsif ($c->{will}{checkAnswers}) {
+	% if ($c->{can}{showScore}) {
+		<div class="gwMessage">
+			<strong>
+				<%= maketext('Your score on this (checked, not recorded) submission is [_1]/[_2].',
+					$c->{attemptScore}, $c->{totalPossible}) =%>
+			</strong>
+			<br>
+			<%== maketext(
+				'Your recorded score for this version is [_1]/[_2] ([_3]%).',
+				'<span id="test-recorded-score">' . wwRound(2, $c->{recordedScore}) . '</span>',
+				'<span id="test-total-possible">' . $c->{totalPossible} . '</span>',
+				'<span id="test-recorded-percent">'
+					. wwRound(0, 100 * $c->{recordedScore} / $c->{totalPossible})
+					. '</span>'
+			) =%>
+		</div>
+	% }
+% }
+%
+% # Display the reduced scoring message if reduced scoring is enabled and the set is in the reduced scoring period.
+% if ($ce->{pg}{ansEvalDefaults}{enableReducedScoring}
+	% && $c->{set}->enable_reduced_scoring
+	% && after($c->{set}->reduced_scoring_date, $submitTime)
+	% && before($c->{set}->due_date, $submitTime)
+	% && ($c->{can}{recordAnswersNextTime} || $c->{submitAnswers}))
+% {
+	<div class="gwMessage">
+		<strong>
+			<%== maketext('Note: [_1]',
+				tag('i', maketext('You are in the Reduced Scoring Period.  All work counts for [_1]% of the original.',
+					$ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100))) =%>
+		</strong>
+	</div>
+% }
+%
+% # Remaining output of test headers.
+% # Display timer or information about elapsed time, output link, and information about any recorded score if not
+% # submitAnswers or checkAnswers.
+% if ($c->{can}{recordAnswersNextTime}) {
+	% my $timeLeft = $c->{set}->due_date - int($submitTime);    # This is in seconds
+	%
+	% # Print the timer if there is less than 24 hours left.
+	% if ($timeLeft < 86400) {
+		<%= tag('div',
+			id    => 'gwTimer',
+			class => 'alert alert-warning p-1',
+			data  => {
+				server_time     => int($submitTime),
+				server_due_time => $c->{set}->due_date,
+				grace_period    => $ce->{gatewayGracePeriod},
+				alert_title     => maketext('Test Time Notification'),
+				alert_three     => maketext(
+					'You have less than 90 seconds left to complete this assignment. You should finish it soon!'),
+				alert_two => ('<div>' . maketext('You have less than 45 seconds left!') . '</div>')
+					. (
+						($c->{set}->attempts_per_version > 1 && $c->{attemptNumber} > 0) ? ''
+						: '<div>' . maketext('Press "Grade Test" soon!') . '</div>'
+					),
+				alert_one => ('<div>' . maketext('You are out of time!') . '</div>')
+					. (
+						($c->{set}->attempts_per_version > 1 && $c->{attemptNumber} > 0) ? ''
+						: '<div>' . maketext('Press "Grade Test" now!') . '</div>'
+					),
+				$userID ne $effectiveUserID ? (acting => 1) : ()
+			},
+			# '00:00:00' is a placeholder that is replaced by the actual time remaining via javascript.
+			maketext('Remaining time: [_1]', '00:00:00')
+		) =%>
+	% }
+	%
+	% if ($timeLeft < 60 && $timeLeft > 0 && !$authz->hasPermissions($userID, 'record_answers_when_acting_as_student')) {
+		<div class="ResultsWithError d-inline-block mb-2">
+			<strong><%= maketext('You have less than 1 minute to complete this test.') %></strong>
+		</div>
+	% } elsif ($timeLeft <= 0 && !$authz->hasPermissions($userID, 'record_answers_when_acting_as_student')) {
+		<div class="ResultsWithError d-inline-block mb-2">
+			<strong>
+				<%= maketext('You are out of time!')
+					. (
+						$c->{set}->attempts_per_version > 1
+						&& $c->{attemptNumber} > 0 ? '' : ' ' . maketext('Press "Grade Test" now!')
+					) =%>
+			</strong>
+		</div>
+	% }
+	% # If there are multiple attempts per version, then indicate the number remaining.  If a multiple attempt
+	% # multi-page test has been submitted, then show the score on the previous submission.
+	% if ($c->{set}->attempts_per_version > 1) {
+		<div class="alert alert-info p-1">
+			<em><%= maketext('You have [_1] attempt(s) remaining on this test.', $c->{numAttemptsLeft}) %></em>
+		</div>
+		% if ($c->{numAttemptsLeft} < $c->{set}->attempts_per_version
+			% && $numPages > 1
+			% && $c->{can}{showScore})
+		% {
+			<div id="gwScoreSummary">
+				<strong><%= maketext('Score summary for last submission:') %></strong>
+				<table>
+					<tr>
+						<th class="text-start"><%= maketext('Prob') %></th>
+						<td></td>
+						<th><%= maketext('Status') %></th>
+						<td></td>
+						<th><%= maketext('Result') %></th>
+					</tr>
+					% for (0 .. $#{ $c->{probStatus} }) {
+						<tr>
+							<td><%= $_ + 1 %></td>
+							<td></td>
+							<td><%= int(100 * $c->{probStatus}[ $probOrder->[$_] ] + 0.5) . '%' %></td>
+							<td></td>
+							<td>
+								<%= $c->{probStatus}[ $probOrder->[$_] ] == 1
+									? maketext('Correct')
+									: maketext('Incorrect') %>
+							</td>
+						</tr>
+					% }
+				</table>
+			</div>
+		% }
+	% }
+% } else {
+	% if (!$c->{checkAnswers} && !$c->{submitAnswers} && $c->{can}{showScore}) {
+		<div class="gwMessage">
+			<strong>
+				<%== maketext(
+						'Your recorded score on this test (version [_1]) is [_2]/[_3] ([_4]%).',
+						$setVersionID,
+						'<span id="test-recorded-score">' . wwRound(2, $c->{recordedScore}) . '</span>',
+						'<span id="test-total-possible">' . $c->{totalPossible} . '</span>',
+						'<span id="test-recorded-percent">'
+							. wwRound(0, 100 * $c->{recordedScore} / $c->{totalPossible})
+							. '</span>'
+					)
+					. (
+						$c->{exceededAllowedTime} && $c->{recordedScore} == 0
+						? ' ' . maketext('You exceeded the allowed time.')
+						: ''
+					) =%>
+			</strong>
+			<br>
+		</div>
+	% }
+	%
+	% if ($c->{set}->version_last_attempt_time) {
+		<div class="gwMessage">
+			<%= maketext('Time taken on test: [_1] min ([_2] min allowed).',
+				$c->{elapsedTime}, sprintf('%.0f', 10 * ($c->{set}->due_date - $c->{set}->open_date) / 6) / 100) %>
+		</div>
+	% } elsif ($c->{exceededAllowedTime} && $c->{recordedScore} != 0) {
+		<div class="gwMessage">
+			<%= maketext('(This test is overtime because it was not submitted in the allowed time.)') %>
+		</div>
+	% }
+	%
+	% if ($c->{can}{showWork} && $setID ne 'Undefined_Set') {
+		<div class="row">
+			<div class="col-md-10 mb-1">
+				<div class="alert alert-info p-1 mb-0">
+					<%= maketext('The test (which is version [_1]) may  no longer be submitted for a grade.',
+							$setVersionID)
+						. ($c->{can}{showScore} ? (' ' . maketext('You may still check your answers.')) : '') %>
+				</div>
+			</div>
+			% # Display a print test link if the user is allowed to see work.
+			<div class="col-md-2 text-end mb-1">
+				<%= link_to maketext('Print Test') =>
+					$c->systemLink(url_for('hardcopy_preselect_set', setID => "$setID,v$setVersionID")),
+					class => 'btn btn-info' =%>
+			</div>
+		</div>
+	% }
+% }
+%
+% my $action = url_for;
+%
+% # This is a hack to get a URL that will not require a proctor login if a proctored test has been submitted for the
+% # last time.  The assignment type has already been reset in this case, so use that to decide if we should give a path
+% # to an unproctored test.
+% $action =~ s/proctored_test_mode/test_mode/ if $c->{set}->assignment_type eq 'gateway';
+%
+% # Make sure that if this is a set, then the 'action' in the form points to the same set.
+% $action =~ s/(test_mode\/$setID)\/?$/$1,v$setVersionID\//;
+%
+% if (!$c->{can}{recordAnswersNextTime} && !$c->{can}{showWork}) {
+	% # Problems can not be shown.
+	<div class="gwProblem">
+		% if ($c->{set}->hide_work eq 'BeforeAnswerDate') {
+			<strong>
+				<%= maketext('Completed results for this assignment are not available until [_1].',
+					$c->formatDateTime($c->{set}->answer_date)) %>
+			</strong>
+		% } else {
+			<strong><%= maketext('Completed results for this assignment are not available.') %></strong>
+		% }
+	</div>
+% } else {
+	% # Problems can be shown, so output the main form and the problems.
+	% my $startTime = param('startTime') || time;
+	%
+	<%= form_for $action, name => 'gwquiz', method => 'POST', class => 'problem-main-form', begin =%>
+		<%= $c->hidden_authen_fields =%>
+		<%= $c->hidden_proctor_authen_fields =%>
+		%
+		% # Hacks to use a javascript link to trigger previews and jump to subsequent pages of a multipage test.
+		<%= hidden_field pageChangeHack => '' =%>
+		<%= hidden_field startTime => $startTime =%>
+		% if ($numProbPerPage && $numPages > 1) {
+			<%= hidden_field newPage => '' =%>
+			<%= hidden_field currentPage => $pageNumber =%>
+		% }
+		%
+		% # Set up links between problems and, for multi-page tests, pages.
+		% for my $i (0 .. $#$pg_results) {
+			% my $pn = $i + 1;
+			% content_for 'gw-navigation-problem-row' => begin
+				<td class="problem">
+					% if ($i >= $startProb && $i <= $endProb) {
+						<%= link_to $pn => '#', class => 'problem-jump-link', data => { problem_number => $pn } =%>
+					% } else {
+						<%= $pn =%>
+					% }
+				</td>
+			% end
+			% content_for 'gw-navigation-score-row' => begin
+				<td class="score" data-problem-id="<%= $problems->[ $probOrder->[$i] ]->problem_id %>"
+					data-problem-value="<%= $problems->[ $probOrder->[$i] ]->value %>">
+					% if ($c->{probStatus}[ $probOrder->[$i] ] == 1) {
+						&#128175;
+					% } else {
+						<%= wwRound(0, 100 * $c->{probStatus}[ $probOrder->[$i] ]) =%>
+					% }
+				</td>
+			% end
+		% }
+		% content_for 'gw-navigation-cols' => begin
+			<colgroup><col class="header"></colgroup>
+		% end
+		% if ($numProbPerPage && $numPages > 1) {
+			% content_for 'gw-navigation-cols' => begin
+				% for (1 .. $numPages) {
+					<colgroup class="page">
+						% for (1 .. $numProbPerPage) {
+							<col class="problem">
+						% }
+					</colgroup>
+				% }
+			% end
+			% for my $i (1 .. $numPages) {
+				% content_for 'gw-navigation-pages' => begin
+					<td colspan="<%= $numProbPerPage %>"
+						class="<%= $i == $pageNumber ? 'page active' : 'page' %>">
+						% if ($i == $pageNumber) {
+							<%= $i =%>
+						% } else {
+							<%= link_to $i => '#', class => 'page-change-link', data => { page_number => $i } =%>
+						% }
+					</td>
+				% end
+			% }
+			% content_for 'gw-navigation-table-rows' => begin
+				% if ($numProbPerPage == 1) {
+					<tr>
+						<th scope="row"><%= maketext('Move to Problem:') %></th>
+						<%= content 'gw-navigation-pages' =%>
+					</tr>
+				% } else {
+					<tr>
+						<th scope="row" class="text-nowrap"><%= maketext('Move to Page:') %></th>
+						<%= content 'gw-navigation-pages' =%>
+					</tr>
+					<tr>
+						<th class="text-nowrap"><%= maketext('Jump to Problem:') %></th>
+						<%= content 'gw-navigation-problem-row' =%>
+					</tr>
+				% }
+			% end
+		% } else {
+			% content_for 'gw-navigation-cols' => begin
+				<colgroup class="page"><% for (0 .. $#$pg_results) { =%><col class="problem"><% } =%></colgroup>
+			% end
+			% content_for 'gw-navigation-table-rows' => begin
+				<tr>
+					<th class="text-nowrap"><%= maketext('Jump to Problem:') %></th>
+					<%= content 'gw-navigation-problem-row' =%>
+				</tr>
+			% end
+		% }
+		% if ($c->{can}{showProblemScores} && $c->{set}->version_last_attempt_time) {
+			% content_for 'gw-navigation-table-rows' => begin
+				<tr><th><%= maketext('% Score:') %></th><%= content 'gw-navigation-score-row' =%></tr>
+			% end
+		% }
+		% my $jumpLinks = begin
+			<div class="table-responsive">
+				<table class="gwNavigation" role="navigation" aria-label="problem navigation">
+					<%= content 'gw-navigation-cols' =%>
+					<%= content 'gw-navigation-table-rows' =%>
+				</table>
+			</div>
+		% end
+		<%= $jumpLinks->() =%>
+		%
+		% # Print out problems and attempt results, as appropriate.
+		% # Note: Usage is $c->attemptResults($pg, $showCorrectAnswers, $showAttemptResults, $showSummary)
+		% for my $i (0 .. $#$pg_results) {
+			% my $pg = $pg_results->[ $probOrder->[$i] ];
+			%
+			% if ($i >= $startProb && $i <= $endProb) {
+				% my $recordMessage = '';
+				% my $resultsTable  = '';
+				%
+				% if ($pg->{flags}{showPartialCorrectAnswers} >= 0 && $c->{submitAnswers}) {
+					% if ($c->{scoreRecordedMessage}[ $probOrder->[$i] ] ne 'recorded') {
+						% $recordMessage = tag('div', class => 'ResultsWithError d-inline-block mb-2',
+							% maketext('ANSWERS NOT RECORDED -- [_1]', $c->{scoreRecordedMessage}[ $probOrder->[$i] ])
+						% );
+					% }
+					% $resultsTable = $c->attemptResults(
+						% $pg,
+						% $c->{will}{showCorrectAnswers},
+						% $pg->{flags}{showPartialCorrectAnswers} && $c->{can}{showProblemScores},
+						% $c->{can}{showProblemScores}
+					% );
+				% } elsif ($c->{will}{checkAnswers} || $c->{will}{showProblemGrader}) {
+					% $recordMessage = tag('div', class => 'ResultsWithError d-inline-block mb-2',
+						% maketext('ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED')
+					% );
+					%
+					% $resultsTable = $c->attemptResults(
+						% $pg,
+						% $c->{will}{showCorrectAnswers},
+						% $pg->{flags}{showPartialCorrectAnswers} && $c->{can}{showProblemScores},
+						% $c->{can}{showProblemScores}
+					% );
+				% } elsif ($c->{previewAnswers}) {
+					% $recordMessage = tag('div', class => 'ResultsWithError d-inline-block mb-2',
+						% maketext('PREVIEW ONLY -- ANSWERS NOT RECORDED')
+					% );
+					% $resultsTable = $c->attemptResults($pg, 0, 0, 0);
+				% }
+				%
+				<div class="gwProblem">
+					% # Show the jump to anchor.
+					<div id="<%= "prob$i" %>" tabindex="-1"><%= $recordMessage %></div>
+					% # Output the problem header.
+					<h2><%= maketext('Problem [_1].', $i + 1) %></h2>
+					<span class="problem-sub-header">
+						% my $problemValue = $problems->[ $probOrder->[$i] ]->value;
+						% if (defined $problemValue) {
+							% my $points = $problemValue == 1 ? maketext('point') : maketext('points');
+							<%= "($problemValue $points)" %>
+						% }
+						%
+						% # This uses the permission level and user id of the user assigned to the set.
+						% if (
+							% $db->getPermissionLevel($effectiveUserID)->permission >=
+								% $ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_PERMISSION_LEVEL}
+							% || (
+								% grep { $_ eq $effectiveUserID }
+									% @{ $ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} }
+							% )
+						% )
+						% {
+							<%= $problems->[ $probOrder->[$i] ]->source_file %>
+						% }
+					</span>
+					%
+					% my $instructor_comment = $c->get_instructor_comment($problems->[ $probOrder->[$i] ]);
+					% if ($instructor_comment) {
+						<div id="answerComment" class="answerComments">
+							<b><%= maketext('Instructor Comment:') %></b>
+							<br>
+							<%= $instructor_comment %>
+						</div>
+					% }
+					%
+					<div class="problem-content col-lg-10" <%== get_problem_lang_and_dir(
+							$pg->{flags}, $ce->{perProblemLangAndDirSettingMode}, $ce->{language}
+						) %>>
+						<%== $pg->{body_text} =%>
+					</div>
+					% if ($pg->{result}{msg}) {
+						<div class="mb-2"><b><%== maketext('Note: [_1]', tag('i', $pg->{result}{msg})) %></b></div>
+					% }
+					%
+					<div class="text-end mb-2">
+						<%= link_to maketext('preview answers') => '#',
+							class => 'gateway-preview-btn btn btn-secondary',
+							($numProbPerPage && $numPages > 1) ? (data_page_number => $pageNumber) : () =%>
+					</div>
+					%
+					% if ($resultsTable) {
+						<%= $resultsTable =%>
+					% }
+					%
+					% # Initialize the problem graders for the problem.
+					% if ($c->{will}{showProblemGrader}) {
+						<%= WeBWorK::HTML::SingleProblemGrader->new($c, $pg, $problems->[ $probOrder->[$i] ])
+							->insertGrader =%>
+					% }
+				</div>
+				% # Store the problem status for continued attempts recording.
+				<%= hidden_field 'probstatus' . ($probOrder->[$i] + 1) => $c->{probStatus}[ $probOrder->[$i] ] =%>
+				%
+				<div class="gwDivider"></div>
+			% } else {
+				% # Print out hidden fields with the current last answers.
+				% my $curr_prefix = 'Q' . sprintf('%04d', $problem_numbers->[ $probOrder->[$i] ]) . '_';
+				% for my $curr_field (grep {/^(?!previous).*$curr_prefix/} keys %{ $c->{formFields} }) {
+					% if (ref($c->{formFields}{$curr_field}) eq 'ARRAY') {
+						% for (@{ $c->{formFields}{$curr_field} }) {
+							<%= hidden_field $curr_field => $_ =%>
+						% }
+					% } else {
+						<%= hidden_field $curr_field => $c->{formFields}{$curr_field} // '' =%>
+					% }
+				% }
+				% # Store the problem status for continued attempts recording.
+				<%= hidden_field 'probstatus' . ($probOrder->[$i] + 1) => $c->{probStatus}[ $probOrder->[$i] ] %>
+			% }
+		% }
+		%
+		<%= $jumpLinks->() =%>
+		<div class="gwDivider"></div>
+		%
+		<div class="checkboxes-container col-12 my-2">
+			% if ($c->{can}{showCorrectAnswers}) {
+				<div class="form-check">
+					<label class="form-check-label">
+						<input name="showCorrectAnswers" type="checkbox" class="form-check-input"
+							<%= $c->{want}{showCorrectAnswers} || $c->{want}{showProblemGrader} ? 'checked' : '' %>>
+						<%= maketext('Show correct answers') %>
+					</label>
+				</div>
+			% }
+			% if ($c->{can}{showSolutions}) {
+				<div class="form-check">
+					<label class="form-check-label">
+						<input name="showSolutions" type="checkbox" class="form-check-input"
+							<%= $c->{will}{showSolutions} || $c->{want}{showProblemGrader} ? 'checked' : '' %>>
+						<%= maketext('Show Solutions') %>
+					</label>
+				</div>
+			% }
+			% if ($c->{can}{showProblemGrader}) {
+				<div class="form-check">
+					<label class="form-check-label">
+						<input name="showProblemGrader" type="checkbox" class="form-check-input"
+							<%= $c->{want}{showProblemGrader} ? 'checked' : '' %>>
+						<%= maketext('Show problem graders') %>
+					</label>
+				</div>
+			% }
+		</div>
+		%
+		<div class="submit-buttons-container col-12 mb-2">
+			<%= submit_button maketext('Preview Test'), name => 'previewAnswers', class => 'btn btn-primary mb-1' =%>
+			% if ($c->{can}{recordAnswersNextTime}) {
+				<%= tag('input',
+					type  => 'submit',
+					name  => 'submitAnswers',
+					value => maketext('Grade Test'),
+					class => 'btn btn-primary mb-1',
+					$c->{set}->attempts_per_version
+					? (
+						data => {
+							confirm_dialog_title   => maketext('Do you want to grade this test?'),
+							confirm_btn_text       => maketext('Yes'),
+							cancel_btn_text        => maketext('No'),
+							confirm_dialog_message => $c->{numAttemptsLeft} > 1
+							? maketext(
+								'You have [_1] submissions remaining for this test.  If you say yes, then you will '
+									. 'have [quant,_2,submission] remaining. Once all submissions have been used, your '
+									. 'answers will be final and you will not be able to continue to work this test '
+									. 'version.',
+								$c->{numAttemptsLeft},
+								$c->{numAttemptsLeft} - 1
+								)
+							: $c->{set}->attempts_per_version > 1 ? maketext(
+								'This is your last submission.  If you say yes, then your answers will be final, '
+									. 'and you will not be able to continue to work this test version.'
+								)
+							: maketext(
+							'This is your only submission.  If you say yes, then your answers will be final, '
+								. 'and you will not be able to continue to work this test version.'
+							)
+						}
+						)
+					: ()
+				) =%>
+			% }
+			% if ($c->{can}{checkAnswersNextTime} && !$c->{can}{recordAnswersNextTime}) {
+				<%= submit_button maketext('Check Test'), name => 'checkAnswers', class => 'btn btn-primary mb-1' =%>
+			% }
+		</div>
+		% if ($numProbPerPage && $numPages > 1 && $c->{can}{recordAnswersNextTime}) {
+			<p><em><%= maketext('Note: grading the test grades all problems, not just those on this page.') %></em></p>
+		% }
+		% if (defined param('sourceFilePath')) {
+			<%= hidden_field sourceFilePath => param('sourceFilePath') =%>
+		% }
+		% if (defined param('problemSeed')) {
+			<%= hidden_field problemSeed => param('problemSeed') =%>
+		% }
+		% # Make sure the student nav filter setting is preserved when the problem form is submitted.
+		% if (param('studentNavFilter')) {
+			<%= hidden_field studentNavFilter => param('studentNavFilter') =%>
+		% }
+	<% end =%>
+% }
+%
+% # Add a show answers option if appropriate.
+% if ($authz->hasPermissions($userID, 'view_answers')) {
+	<%= form_for 'answer_log', method => 'POST', target => 'WW_Info', begin =%>
+		<%= $c->hidden_authen_fields('pastans-') =%>
+		<%= hidden_field courseID => $ce->{courseName} =%>
+		<%= hidden_field selected_sets => "$setID,v$setVersionID" =%>
+		<%= hidden_field selected_users => $effectiveUserID =%>
+		% for ($startProb + 1 .. $endProb + 1) {
+			<%= hidden_field selected_problems => $_ =%>
+		% }
+		<%= submit_button maketext('Show Past Answers'), name => 'action', class => 'btn btn-primary' =%>
+	<% end =%>
+% }
+%
+% # If achievements enabled, check to see if there are new ones and output them.  Use the first
+% # problem to seed the data. However, all of the problems will be provided to the achievement evaluator.
+% if ($ce->{achievementsEnabled} && $c->{will}{recordAnswers} && $c->{submitAnswers} && $setID ne 'Undefined_Set') {
+	<%= checkForAchievements($problems->[0], $pg_results->[0], $c, setVersion => $setVersionID) =%>
+% }
diff --git a/templates/ContentGenerator/GatewayQuiz/nav.html.ep b/templates/ContentGenerator/GatewayQuiz/nav.html.ep
new file mode 100644
index 0000000000..eac068b3bc
--- /dev/null
+++ b/templates/ContentGenerator/GatewayQuiz/nav.html.ep
@@ -0,0 +1,121 @@
+% # Cap the number of tests shown to at most 200.
+% my $numAfter     = $#$userRecords - $currentTestIndex;
+% my $numBefore    = 200 - ($numAfter < 100 ? $numAfter : 100);
+% my $minTestIndex = $currentTestIndex < $numBefore      ? 0                   : $currentTestIndex - $numBefore;
+% my $maxTestIndex = $minTestIndex + 200 < $#$userRecords ? $minTestIndex + 200 : $#$userRecords;
+%
+% my $setID = $c->{set}->set_id;
+%
+<div class="row sticky-nav" role="navigation" aria-label="user navigation">
+	<div class="user-nav">
+		<div class="btn-group" role="group" aria-label="student selector">
+			% if ($prevTest) {
+				<%= link_to $c->systemLink(
+						url_for('gateway_quiz', setID => "$setID,v$prevTest->{setVersion}"),
+						params => {
+							effectiveUser     => $prevTest->user_id,
+							currentPage       => $pageNumber,
+							showProblemGrader => $c->{will}{showProblemGrader},
+							$filter ? (studentNavFilter => $filter) : ()
+						}
+					),
+					data  => { bs_toggle => 'tooltip', bs_placement => 'top' },
+					title => "$prevTest->{displayName} (version $prevTest->{setVersion})",
+					class => 'btn btn-primary student-nav-button',
+					begin =%>
+					<i class="fas fa-chevron-left"></i>
+				<% end =%>
+			% } else {
+				<span class="btn btn-primary disabled"><i class="fas fa-chevron-left"></i></span>
+			% }
+			<div class="btn-group student-nav-selector">
+				<%= link_to $userRecords->[$currentTestIndex]{displayName}
+						. " (version $userRecords->[$currentTestIndex]{setVersion})" => '#',
+					id              => 'studentSelector',
+					class           => 'btn btn-primary dropdown-toggle',
+					role            => 'button',
+					data            => { bs_toggle => 'dropdown' },
+					'aria-expanded' => 'false' =%>
+				<ul class="dropdown-menu" role ="menu" aria-labelledby="studentSelector">
+					% for (@$userRecords[ $minTestIndex .. $maxTestIndex ]) {
+						<li>
+							<%= link_to "$_->{displayName} (version $_->{setVersion})" => $c->systemLink(
+									url_for('gateway_quiz', setID => "$setID,v$_->{setVersion}"),
+									params => {
+										effectiveUser     => $_->user_id,
+										currentPage       => $pageNumber,
+										showProblemGrader => $c->{will}{showProblemGrader},
+										$filter ? (studentNavFilter => $filter) : ()
+									}
+								),
+								tabindex => '-1',
+								style    => $_->{currentTest} ? 'background-color: #8F8' : '',
+								class    => 'dropdown-item' =%>
+						</li>
+					% }
+				</ul>
+			</div>
+			% if ($nextTest) {
+				<%= link_to $c->systemLink(
+						url_for('gateway_quiz', setID => "$setID,v$nextTest->{setVersion}"),
+						params => {
+							effectiveUser     => $nextTest->user_id,
+							currentPage       => $pageNumber,
+							showProblemGrader => $c->{will}{showProblemGrader},
+							$filter ? (studentNavFilter => $filter) : ()
+						}
+					),
+					data  => { bs_toggle    => 'tooltip', bs_placement => 'top' },
+					title => "$nextTest->{displayName} (version $nextTest->{setVersion})",
+					class => 'btn btn-primary student-nav-button',
+					begin =%>
+					<i class="fas fa-chevron-right"></i>
+				<% end =%>
+			% } else {
+				<span class="btn btn-primary disabled"><i class="fas fa-chevron-right"></i></span>
+			% }
+		</div>
+		% # Create a section/recitation filter by dropdown if there are sections or recitaitons.
+		% if (scalar keys %$filters) {
+			<div class="btn-group student-nav-filter-selector">
+				<%= link_to $filter ? $filters->{$filter}[0] : maketext('Showing all tests') => '#',
+						id              => 'testSelectorFilter',
+						class           => 'btn btn-primary dropdown-toggle dropdown-toggle-split',
+						role            => 'button',
+						data            => { bs_toggle => 'dropdown' },
+						'aria-expanded' => 'false' =%>
+				<ul class="dropdown-menu" role="menu" aria-labelledby="testSelectorFilter">
+					% # If a filter is currently in use, then add an item that will remove that filter.
+					% if ($filter) {
+						<li>
+							<%= link_to maketext('Show all tests') => $c->systemLink(
+									url_for('gateway_quiz', setID => "$setID,v$setVersion"),
+									params => {
+										effectiveUser     => param('effectiveUser'),
+										currentPage       => $pageNumber,
+										showProblemGrader => $c->{will}{showProblemGrader}
+									}
+								),
+								class => 'dropdown-item' =%>
+						</li>
+					% }
+					% for (sort keys %$filters) {
+						<li>
+							<%= link_to $filters->{$_}[0] => $c->systemLink(
+									url_for('gateway_quiz', setID => "$setID,v$filters->{$_}[2]"),
+									params => {
+										effectiveUser     => $filters->{$_}[1],
+										currentPage       => $pageNumber,
+										showProblemGrader => $c->{will}{showProblemGrader},
+										studentNavFilter  => $_
+									}
+								),
+								class => 'dropdown-item',
+								style => ($filter || '') eq $_ ? 'background-color: #8F8' : '' =%>
+						</li>
+					% }
+				</ul>
+			</div>
+		% }
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Grades.html.ep b/templates/ContentGenerator/Grades.html.ep
new file mode 100644
index 0000000000..4983bacbf0
--- /dev/null
+++ b/templates/ContentGenerator/Grades.html.ep
@@ -0,0 +1,2 @@
+<%= $c->displayStudentStats($c->{studentID}) =%>
+<%= $c->scoring_info =%>
diff --git a/templates/ContentGenerator/Grades/student_stats.html.ep b/templates/ContentGenerator/Grades/student_stats.html.ep
new file mode 100644
index 0000000000..9c2bc62ced
--- /dev/null
+++ b/templates/ContentGenerator/Grades/student_stats.html.ep
@@ -0,0 +1,51 @@
+% use WeBWorK::Utils qw(wwRound);
+%
+<h2><%= $fullName %></h2>
+<div class="table-responsive">
+	<table class="grade-table table table-bordered table-sm font-xs" id="grades_table">
+		<tr>
+			<th rowspan="2" scope="col"><%= maketext('Set') %></th>
+			<th rowspan="2" scope="col"><%= maketext('Percent') %></th>
+			<th rowspan="2" scope="col"><%= maketext('Score') %></th>
+			<th rowspan="2" scope="col"><%= maketext('Out Of') %></th>
+			<th colspan="<%= $max_problems %>" scope="col">
+				<%= maketext('Problems') %>
+				<a class="help-popup" role="button" tabindex="0" data-bs-placement="top"
+					data-bs-toggle="popover"
+					data-bs-content="<%= maketext(
+						'The top number is the percent score on the problem.  A period (.) indicates a problem '
+						. 'has not been attempted. The bottom number is the number of incorrect attempts.'
+					) =%>">
+					<i class="icon fas fa-question-circle" data-alt="<%= maketext('Help Icon') =%>"
+						aria-hidden="true">
+					</i>
+				</a>
+			</th>
+		</tr>
+		<tr>
+			% for (1 .. $max_problems) {
+				<th scope="col" class="problem-data"><%= $_ %></th>
+			% }
+		</tr>
+		%
+		<%= $rows =%>
+		%
+		% # Compute the percentage correct.
+		% my $totalRightPercent = 100 * wwRound(2, $courseTotal ? $courseTotalRight / $courseTotal : 0);
+		%
+		% if ($ce->{showCourseHomeworkTotals}) {
+			<tr class="grades-course-total">
+				<th scope="row"><%= maketext('Homework Totals') %></th>
+				<td>
+					<span class="<%=
+						$totalRightPercent == 0 ? 'unattempted' : $totalRightPercent == 100 ? 'correct' : '' %>">
+						<%= $totalRightPercent . '%' %>
+					</span>
+				</td>
+				<td><%= $courseTotalRight %></td>
+				<td><%= $courseTotal %></td>
+				<td colspan="<%= $max_problems %>">&nbsp;</td>
+			</tr>
+		% }
+	</table>
+</div>
diff --git a/templates/ContentGenerator/Hardcopy.html.ep b/templates/ContentGenerator/Hardcopy.html.ep
new file mode 100644
index 0000000000..24eacb7986
--- /dev/null
+++ b/templates/ContentGenerator/Hardcopy.html.ep
@@ -0,0 +1,50 @@
+% my $perm_view_errors = $authz->hasPermissions(param('user'), 'download_hardcopy_view_errors');
+%
+% if ($c->has_errors) {
+	% my $file_path     = $c->{file_path};
+	% my %temp_file_map = %{ $c->{temp_file_map} // {} };
+	%
+	% if ($perm_view_errors) {
+		<p><%= maketext('Errors occured while generating hardcopy:') %></p>
+		<ul>
+			% for (@{ $c->get_errors }) {
+				<li><%= $_ %></li>
+			% }
+		</ul>
+	% }
+	%
+	% if ($file_path) {
+		<p>
+			<%= maketext(
+				'A hardcopy file was generated, but it may not be complete or correct. Please check that no problems '
+					. 'are missing and that they are all legible. If not, please inform your instructor.') =%>
+			<br>
+			<%= link_to(
+				maketext('Download Hardcopy') => $c->systemLink(url_for, params => { tempFilePath => $file_path })
+			) =%>
+		</p>
+	% } else {
+		<p>
+			<%= maketext(
+				'WeBWorK was unable to generate a paper copy of this homework set.  Please inform your instructor.'
+			) =%>
+		</p>
+	% }
+	%
+	% if ($perm_view_errors && keys %temp_file_map) {
+		<p>
+			<%= maketext('You can also examine the following temporary files: ') =%>
+			<%= c(
+				map {
+					link_to $_ => $c->systemLink(url_for, params => { tempFilePath => $temp_file_map{$_} })
+				} keys %temp_file_map
+			)->join(', ') =%>
+		</p>
+	% }
+	<hr>
+% }
+%
+% # don't display the retry form if there are errors and the user doesn't have permission to view the errors.
+% unless ($c->has_errors && !$perm_view_errors) {
+	<%= $c->display_form =%>
+% }
diff --git a/templates/ContentGenerator/Hardcopy/form.html.ep b/templates/ContentGenerator/Hardcopy/form.html.ep
new file mode 100644
index 0000000000..ce42ad58dc
--- /dev/null
+++ b/templates/ContentGenerator/Hardcopy/form.html.ep
@@ -0,0 +1,187 @@
+% use WeBWorK::Utils qw(format_set_name_display);
+% use WeBWorK::HTML::ScrollingRecordList qw/scrollingRecordList/;
+%
+%= form_for current_route, name => 'hardcopy-form', id => 'hardcopy-form', method => 'POST', begin
+	<%= $c->hidden_authen_fields =%>
+	<%= hidden_field in_hc_form => 1 =%>
+	%
+	% if ($multiuser) {
+		<p>
+			<%= maketext(
+				'Select the homework sets for which to generate hardcopy versions. You may'
+					. ' also select multiple users from the users list. You will receive hardcopy'
+					. ' for each (set, user) pair.') =%>
+		</p>
+		<div class="row gx-3">
+			<div class="col-xl-5 col-md-6 mb-2">
+				<div class="fw-bold text-center">
+					<%= label_for selected_users => maketext('Users') =%>
+				</div>
+				<%= scrollingRecordList(
+					{
+						name            => 'selected_users',
+						id              => 'selected_users',
+						controller      => $c,
+						default_sort    => 'lnfn',
+						default_format  => 'lnfn_uid',
+						default_filters => ['all'],
+						attrs           => { size => 20, multiple => undef }
+					},
+					@$users
+				) =%>
+			</div>
+			<div class="col-xl-5 col-md-6 mb-2">
+				<div class="fw-bold text-center">
+					<%= label_for selected_sets => maketext('Sets') =%>
+				</div>
+				<%= scrollingRecordList(
+					{
+						name            => 'selected_sets',
+						id              => 'selected_sets',
+						controller      => $c,
+						default_sort    => 'set_id',
+						default_format  => 'sid',
+						default_filters => ['all'],
+						attrs           => { size => 20, multiple => undef, dir => 'ltr' }
+					},
+					@$wantedSets,
+					@$setVersions
+				) =%>
+			</div>
+		</div>
+	% } else {
+		<%= hidden_field selected_sets => $selected_set_id =%>
+		<%= hidden_field selected_users => $user_id =%>
+		<p>
+			<%== maketext(
+				'Download hardcopy of set [_1] for [_2]?',
+				tag('span', dir => 'ltr', format_set_name_display($selected_set_id =~ s/,v(\d+)$/ (version $1)/r)),
+				join(' ', $user->first_name, $user->last_name)
+			) =%>
+		</p>
+	% }
+	%
+	<div class="row">
+		<div class="col-md-8 font-sm mb-2">
+			<%= maketext(
+				'You may choose to show any of the following data. Correct answers, hints, and solutions '
+					. 'are only available [_1] after the answer date of the homework set.',
+				$multiuser ? 'to privileged users or' : ''
+			) =%>
+		</div>
+		<div class="row">
+			<div class="col-md-8">
+				<div class="input-group input-group-sm mb-2">
+					<span class="input-group-text"><b><%= maketext('Show:') %></b></span>
+					<div class="input-group-text">
+						<label class="form-check-label">
+							<%= check_box printStudentAnswers => 1, class => 'form-check-input me-2' =%>
+							<%= maketext('Student answers') =%>
+						</label>
+					</div>
+					<div class="input-group-text">
+						<label class="form-check-label">
+							<%= check_box showComments => 1, class => 'form-check-input me-2' =%>
+							<%= maketext('Comments') =%>
+						</label>
+					</div>
+					% if ($canShowCorrectAnswers) {
+						<div class="input-group-text">
+							<label class="form-check-label">
+								<%= check_box showCorrectAnswers => 1, class => 'form-check-input me-2' =%>
+								<%= maketext('Correct answers') =%>
+							</label>
+						</div>
+						<div class="input-group-text">
+							<label class="form-check-label">
+								<%= check_box showHints => 1, class => 'form-check-input me-2' =%>
+								<%= maketext('Hints') =%>
+							</label>
+						</div>
+						<div class="input-group-text">
+							<label class="form-check-label">
+								<%= check_box showSolutions => 1, class => 'form-check-input me-2' =%>
+								<%= maketext('Solutions') =%>
+							</label>
+						</div>
+					% }
+				</div>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-md-8">
+				<div class="input-group input-group-sm mb-2">
+					<span class="input-group-text"><b><%= maketext('Hardcopy Format:') %></b></span>
+					<div class="input-group-text">
+						% for (@$formats) {
+							<label class="form-check-label me-3">
+								<%= radio_button hardcopy_format => $_, class => 'form-check-input me-2',
+									$_ eq $default_format ? (checked => undef) : () =%>
+								<%= $format_labels->{$_} =%>
+							</label>
+						% }
+					</div>
+				</div>
+			</div>
+		</div>
+		% if ($c->{can_show_source_file}) {
+			<div class="row">
+				<div class="col-md-8">
+					<div class="input-group input-group-sm mb-2">
+						<span class="input-group-text"><b><%= maketext('Show Problem Source File:') %></b></span>
+						<div class="input-group-text">
+							<label class="form-check-label me-3">
+								<%= radio_button show_source_file => 'Yes', class => 'form-check-input me-2',
+									checked => undef =%>
+								<%= maketext('Yes') =%>
+							</label>
+							<label class="form-check-label me-3">
+								<%= radio_button show_source_file => 'No', class => 'form-check-input me-2',
+									checked => undef =%>
+								<%= maketext('No') =%>
+							</label>
+						</div>
+					</div>
+				</div>
+			</div>
+		% }
+		% if ($can_change_theme) {
+			<div class="row">
+				<div class="col-md-8">
+					<div class="input-group input-group-sm mb-2">
+						<span class="input-group-text"><b><%= maketext('Hardcopy Theme:') %></b></span>
+						% if (@{ $hardcopyThemesAvailable } <= 3) {
+							<div class="input-group-text">
+								% for (@{ $hardcopyThemesAvailable }) {
+									<label class="form-check-label me-3">
+										<%= radio_button hardcopy_theme => $_, class => 'form-check-input me-2',
+											$_ eq $ce->{hardcopyTheme} ? (checked => undef) : () =%>
+										<%= $hardcopyLabels->{$_} =%>
+									</label>
+								% }
+							</div>
+						% } else {
+							<div class="input-group-text p-0">
+								<%= select_field 'hardcopy_theme' => [
+										map { [
+											$hardcopyLabels->{$_} => $_,
+											$_ eq $ce->{hardcopyTheme} ? (selected => undef) : ()
+										] } @{ $hardcopyThemesAvailable }
+									],
+									id    => 'action_hardcopy_theme_id',
+									class => 'form-select form-select-sm d-inline w-auto' =%>
+							</div>
+						% }
+					</div>
+				</div>
+			</div>
+		% }
+		<div>
+			<%= submit_button
+				$multiuser
+				? maketext('Generate hardcopy for selected sets and selected users')
+				: maketext('Generate Hardcopy'),
+				name => 'generate_hardcopy', class => 'btn btn-primary' =%>
+		</div>
+	</div>
+% end
diff --git a/templates/ContentGenerator/Home.html.ep b/templates/ContentGenerator/Home.html.ep
new file mode 100644
index 0000000000..45a2c36292
--- /dev/null
+++ b/templates/ContentGenerator/Home.html.ep
@@ -0,0 +1,22 @@
+% use WeBWorK::Utils::CourseManagement qw(listCourses);
+%
+% my $coursesDir = $ce->{webworkDirs}{courses};
+% my @courseIDs = listCourses($ce);
+%
+<p><%= maketext('Welcome to WeBWorK!') %></p>
+%
+% if ((grep { $_ eq 'admin' } @courseIDs) && !-f "$coursesDir/admin/hide_directory") {
+	<p><%=	link_to maketext('Course Administration') => url_for('course_admin') =%></p>
+% }
+%
+<h2><%= maketext('Courses') %></h2>
+%
+<ul class="courses-list">
+	% for my $courseID (sort { lc($a) cmp lc($b) } @courseIDs) {
+		% next if $courseID eq 'admin';                        # Already shown above.
+		% next if -f "$coursesDir/$courseID/hide_directory";
+		<li>
+			<%= link_to $courseID =~ s/_/ /gr => url_for('set_list', courseID => $courseID) =%>
+		</li>
+	% }
+</ul>
diff --git a/templates/ContentGenerator/Instructor/AchievementEditor.html.ep b/templates/ContentGenerator/Instructor/AchievementEditor.html.ep
new file mode 100644
index 0000000000..28c4097172
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/AchievementEditor.html.ep
@@ -0,0 +1,68 @@
+% use WeBWorK::Utils qw(not_blank getAssetURL);
+% use WeBWorK::HTML::CodeMirrorEditor
+	% qw(generate_codemirror_html generate_codemirror_controls_html output_codemirror_static_files);
+%
+% content_for js => begin
+	<%= output_codemirror_static_files($c, 'perl') =%>
+	<%= javascript getAssetURL($ce, 'js/ActionTabs/actiontabs.js'), defer => undef =%>
+% end
+%
+% unless ($authz->hasPermissions(param('user'), 'edit_achievements')) {
+	<div class="alert alert-danger p-1"><%= maketext('You are not authorized to edit achievements.') %></div>
+	% last;
+% }
+%
+<div class="mb-2">
+	<i><%= maketext('Editing achievement in file "[_1]"', $c->shortPath($c->{sourceFilePath})) =%></i>
+</div>
+<%= form_for current_route, method => 'POST', id => 'editor', name => 'editor',
+	enctype => 'application/x-www-form-urlencoded',
+	begin =%>
+	<%= $c->hidden_authen_fields =%>
+	% if (not_blank($c->{sourceFilePath})) {
+		<%= hidden_field sourceFilePath => $c->{sourceFilePath} =%>
+	% }
+	%
+	<div class="mb-2"><%= generate_codemirror_html($c, 'achievementContents', $achievementContents, 'perl') =%></div>
+	<%= generate_codemirror_controls_html($c) =%>
+	%
+	% # Output action forms
+	% my $default_choice;
+	%
+	% for my $actionID (@$formsToShow) {
+		% my $line_contents = include("ContentGenerator/Instructor/AchievementEditor/${actionID}_form");
+		% my $active        = '';
+		%
+		% if ($line_contents ne '') {
+			% unless ($default_choice) { $active = ' active'; $default_choice = $actionID; }
+			%
+			% content_for 'tab-list' => begin
+				<li class="nav-item" role="presentation">
+					<%= link_to maketext($actionFormTitles->{$actionID}) => "#$actionID",
+						class           => "nav-link action-link$active",
+						id              => "$actionID-tab",
+						data            => { action => $actionID, bs_toggle => 'tab', bs_target => "#$actionID" },
+						role            => 'tab',
+						'aria-controls' => $actionID,
+						'aria-selected' => $active ? 'true' : 'false' =%>
+				</li>
+			% end
+			% content_for 'tab-content' => begin
+				<div class="tab-pane fade mb-2 <%= $active ? "show$active" : '' %>" id="<%= $actionID %>"
+					role="tabpanel" aria-labelledby="<%= $actionID %>-tab">
+					<%= $line_contents =%>
+				</div>
+			% end
+		% }
+	% }
+	%
+	<%= hidden_field action => $default_choice, id => 'current_action' =%>
+	<div>
+		<ul class="nav nav-tabs mb-2" role="tablist"><%= content 'tab-list' =%></ul>
+		<div class="tab-content"><%= content 'tab-content' %></div>
+	</div>
+	<div>
+		<%= submit_button maketext($actionFormTitles->{$default_choice}),
+			name => 'submit', id => 'take_action', class => 'btn btn-primary' %>
+	</div>
+<% end =%>
diff --git a/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep b/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep
new file mode 100644
index 0000000000..ae821d64eb
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep
@@ -0,0 +1,36 @@
+% # There are three things you can do with a new achievement editor.
+% # You can replace the current achievement, use it in a new achievement, or not use it at all.
+<div>
+	<div class="row align-items-center mb-2">
+		<%= label_for 'action.save_as.target_file_id' => maketext('Save as:'), class => 'col-form-label col-auto' =%>
+		<div class="col-auto">
+			<%= text_field 'action.save_as.target_file' => $c->getRelativeSourceFilePath($c->{sourceFilePath}),
+				id => 'action.save_as.target_file_id', size => 40, class => 'form-control form-control-sm' =%>
+		</div>
+		<%=  hidden_field 'action.save_as.source_file' => $c->{sourceFilePath} =%>
+	</div>
+	<div class="form-check mb-2">
+		<%= radio_button 'action.save_as.saveMode' => 'use_in_current',
+			id => 'action.save_as.saveMode.use_in_current', class => 'form-check-input' =%>
+		<%= label_for 'action.save_as.saveMode.use_in_current', class => 'form-check-label', begin =%>
+			<%== maketext('Use in achievement [_1]', tag('b', $c->{achievementID})) =%>
+		<% end =%>
+	</div>
+	<div class="mb-2">
+		<div class="form-check d-inline-block">
+			<%= radio_button 'action.save_as.saveMode' => 'use_in_new',
+				id => 'action.save_as.saveMode.use_in_new', class => 'form-check-input' =%>
+			<%= label_for 'action.save_as.saveMode.use_in_new' => maketext('Use in new achievement:'),
+				class => 'form-check-label me-1', id => 'action.save_as.saveMode.use_in_new.label' =%>
+		</div>
+		<%= text_field 'action.save_as.id' => '',
+			'aria-labelledby' => 'action.save_as.saveMode.use_in_new.label',
+			class             => 'form-control form-control-sm d-inline w-auto' =%>
+	</div>
+	<div class="form-check">
+		<%= radio_button 'action.save_as.saveMode' => 'dont_use',
+			id => 'action.save_as.saveMode.dont_use', class => 'form-check-input' =%>
+		<%= label_for 'action.save_as.saveMode.dont_use' => maketext(q{Don't use in an achievement}),
+			class => 'form-check-label' =%>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/AchievementEditor/save_form.html.ep b/templates/ContentGenerator/Instructor/AchievementEditor/save_form.html.ep
new file mode 100644
index 0000000000..9305e09ed2
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/AchievementEditor/save_form.html.ep
@@ -0,0 +1,3 @@
+% if (-w $c->{sourceFilePath}) {
+	<%== maketext('Save [_1]', tag('b', $c->shortPath($c->{sourceFilePath}))) %>
+% }
diff --git a/templates/ContentGenerator/Instructor/AchievementList.html.ep b/templates/ContentGenerator/Instructor/AchievementList.html.ep
new file mode 100644
index 0000000000..e058d9b466
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/AchievementList.html.ep
@@ -0,0 +1,57 @@
+% use WeBWorK::Utils qw(getAssetURL);
+%
+% content_for js => begin
+	<%= javascript getAssetURL($ce, 'js/ShowHide/show_hide.js'),    defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/ActionTabs/actiontabs.js'), defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/SelectAll/selectall.js'),   defer => undef =%>
+% end
+%
+% unless ($authz->hasPermissions(param('user'), 'edit_achievements')) {
+	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to edit achievements.') %></div>
+	% last;
+% }
+%
+<%= form_for current_route, method => 'post', id => 'achievement-list', name => 'achievementlist', class => 'font-sm',
+	begin =%>
+	<%= $c->hidden_authen_fields =%>
+	<%= hidden_field editMode => $c->{editMode} =%>
+	<%= hidden_field exportMode => $c->{exportMode} =%>
+	%
+	% if ($c->{editMode}) {
+		<p><b><%= maketext('Any changes made below will be reflected in the achievement for ALL students.') %></b></p>
+	% }
+	%
+	<%= hidden_field action => $formsToShow->[0], id => 'current_action' =%>
+	<div>
+		<ul class="nav nav-tabs mb-2" role="tablist">
+			% for my $actionID (@$formsToShow) {
+				<li class="nav-item" role="presentation">
+					<%= link_to maketext($formTitles->{$actionID}) => "#$actionID",
+						class           => 'nav-link action-link' . ($actionID eq $formsToShow->[0] ? ' active' : ''),
+						id              => "$actionID-tab",
+						data            => { action => $actionID, bs_toggle => 'tab', bs_target => "#$actionID" },
+						role            => 'tab',
+						'aria-controls' => $actionID,
+						'aria-selected' => $actionID eq $formsToShow->[0] ? 'true' : 'false' =%>
+				</li>
+			% }
+		</ul>
+		<div class="tab-content">
+			% for my $actionID (@$formsToShow) {
+				<div class="tab-pane fade mb-2 <%= $actionID eq $formsToShow->[0] ? 'show active' : '' %>"
+					id="<%= $actionID %>" role="tabpanel" aria-labelledby="<%= $actionID %>-tab">
+					<%= include "ContentGenerator/Instructor/AchievementList/${actionID}_form" =%>
+				</div>
+			% }
+		</div>
+	</div>
+	<%= submit_button maketext($formTitles->{ $formsToShow->[0] }),
+		id => 'take_action', class => 'btn btn-primary mb-3' =%>
+	% if ($c->{exportMode}) {
+		<%= include 'ContentGenerator/Instructor/AchievementList/export_table' =%>
+	% } elsif ($c->{editMode}) {
+		<%= include 'ContentGenerator/Instructor/AchievementList/edit_table' =%>
+	% } else {
+		<%= include 'ContentGenerator/Instructor/AchievementList/default_table' =%>
+	% }
+<% end =%>
diff --git a/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep b/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep
new file mode 100644
index 0000000000..8182c2369b
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep
@@ -0,0 +1,26 @@
+<div>
+	<div class="row mb-2">
+		<%= label_for assign_select => maketext('Assign which achievements?'),
+			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.assign.scope' => [
+					[ maketext('all achievements')      => 'all' ],
+					[ maketext('selected achievements') => 'selected', selected => undef ]
+				],
+				id    => 'assign_select',
+				class => 'form-select form-select-sm' =%>
+		</div>
+	</div>
+	<div class="row mb-2">
+		<%= label_for 'assign_data_select' => maketext('Choose what to do with existing data:'),
+			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.assign.overwrite' => [
+					[ maketext('overwrite') => 'everything' ],
+					[ maketext('preserve')  => 'new_only', selected => undef ]
+				],
+				id    => 'assign_data_select',
+				class => 'form-select form-select-sm' =%>
+		</div>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/AchievementList/cancel_edit_form.html.ep b/templates/ContentGenerator/Instructor/AchievementList/cancel_edit_form.html.ep
new file mode 100644
index 0000000000..04d9646c9c
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/AchievementList/cancel_edit_form.html.ep
@@ -0,0 +1 @@
+<span><%= maketext('Abandon changes') =%></span>
diff --git a/templates/ContentGenerator/Instructor/AchievementList/cancel_export_form.html.ep b/templates/ContentGenerator/Instructor/AchievementList/cancel_export_form.html.ep
new file mode 100644
index 0000000000..4f3b5f4847
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/AchievementList/cancel_export_form.html.ep
@@ -0,0 +1 @@
+<span><%= maketext('Abandon export') =%></span>
diff --git a/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep b/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep
new file mode 100644
index 0000000000..9ecec6f6aa
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep
@@ -0,0 +1,23 @@
+<div>
+	<div class="row mb-2">
+		<%= label_for 'create_text', class => 'col-form-label col-form-label-sm col-auto', begin =%>
+			<%= maketext('Create a new achievement with ID') =%><span class="required-field">*</span>:
+		<% end =%>
+		<div class="col-auto">
+			<%= text_field 'action.create.id' => '', id => 'create_text',
+				class => 'form-control form-control-sm d-inline w-auto' =%>
+		</div>
+	</div>
+	<div class="row mb-2">
+		<%= label_for create_select => maketext("Create as what type of achievement?"),
+			class => 'col-form-label col-form-label-sm col-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.create.type' => [
+					[ maketext('a new empty achievement')                       => 'empty', selected => undef ],
+					[ maketext('a duplicate of the first selected achievement') => 'copy' ],
+				],
+				id    => 'create_select',
+				class => 'form-select form-select-sm d-inline w-auto' =%>
+		</div>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep b/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep
new file mode 100644
index 0000000000..240ff15932
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep
@@ -0,0 +1,71 @@
+<div class="table-responsive">
+	<table class="table table-sm table-bordered font-sm caption-top" id="achievement-table">
+		<caption><%= maketext('Achievement List') %></caption>
+		<thead class="table-group-divider">
+			<tr>
+				<th>
+					<%= check_box select_all => '',
+						id           => 'select-all',
+						class        => 'select-all form-check-input',
+						'aria-label' => maketext('Select all achievements'),
+						data         => { select_group => 'selected_achievements' } =%>
+				</th>
+				<th><%= label_for 'select-all' => maketext('Achievement ID') %></th>
+				<th><%= maketext('Enabled') %></th>
+				<th><%= maketext('Name') %></th>
+				<th><%= maketext('Number') %></th>
+				<th><%= maketext('Category') %></th>
+				<th class="text-nowrap"><%= maketext('Edit Users') %></th>
+				<th class="text-nowrap"><%= maketext('Edit Evaluator') %></th>
+			</tr>
+		</thead>
+		<tbody class="table-group-divider">
+			% my %selectedAchievementIDs = map { $_ => 1 } @{ $c->{selectedAchievementIDs} };
+			% for (@$achievements) {
+				% my $achievement_id = $_->achievement_id;
+				<tr>
+					<td>
+						<%= check_box selected_achievements => $achievement_id,
+							id    => "${achievement_id}_id",
+							class => 'form-check-input',
+							$selectedAchievementIDs{ $_->achievement_id } ? (checked => undef) : () =%>
+					</td>
+					<td>
+						<div class="label-with-edit-icon">
+							<%= label_for "${achievement_id}_id", begin =%>
+								<%= $_->achievement_id %>
+								<%= link_to $c->systemLink(
+										url_for('instructor_achievement_list'),
+										params => { editMode => 1, selected_achievements => $achievement_id }
+									),
+									begin %>
+									<i class="icon fas fa-pencil-alt" data-alt="edit" aria-hidden="true"></i>
+								<% end %>
+							<% end =%>
+						</div>
+					</td>
+					<td><%= $_->enabled ? maketext('Yes') : maketext('No') %></td>
+					<td class="text-nowrap"><%= $_->name %></td>
+					<td><%= $_->number %></td>
+					<td><%= $_->category %></td>
+					<td>
+						% my $num_users = $db->countAchievementUsers($_->achievement_id);
+						<%= link_to "$num_users/$c->{totalUsers}" => $c->systemLink(
+							url_for('instructor_achievement_user_editor', achievementID => $achievement_id)
+						) =%>
+					</td>
+					<td class="text-nowrap">
+						<%= link_to maketext('Edit Evaluator') => $c->systemLink(
+							url_for('instructor_achievement_editor', achievementID => $achievement_id),
+							params => { sourceFilePath => $ce->{courseDirs}{achievements}. '/' . $_->test }
+						) =%>
+					</td>
+				</tr>
+			% }
+		</tbody>
+	</table>
+</div>
+%
+% unless (@$achievements) {
+	<p><i><%= maketext('No achievements shown.  Create an achievement!') %></i></p>
+% }
diff --git a/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep b/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep
new file mode 100644
index 0000000000..1ad96e4bf4
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep
@@ -0,0 +1,17 @@
+<div>
+	<div class="d-inline-block alert alert-danger p-1 mb-2">
+		<em><%= maketext('Deletion destroys all achievement-related data and is not undoable!') =%></em>
+	</div>
+	<div class="row mb-2">
+		<%= label_for delete_select => maketext('Delete which achievements?'),
+			class => 'col-form-label col-form-label-sm col-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.delete.scope' => [
+					[ maketext('no achievements')       => 'none', selected => undef ],
+					[ maketext('selected achievements') => 'selected' ],
+				],
+				id    => 'delete_select',
+				class => 'form-select form-select-sm d-inline w-auto me-3' =%>
+		</div>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep b/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep
new file mode 100644
index 0000000000..517373543a
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep
@@ -0,0 +1,12 @@
+<div class="row mb-2">
+	<%= label_for edit_select => maketext('Edit which achievements?'),
+		class => 'col-form-label col-form-label-sm col-auto' =%>
+	<div class="col-auto">
+		<%= select_field 'action.edit.scope' => [
+				[ maketext('all achievements')      => 'all' ],
+				[ maketext('selected achievements') => 'selected', selected => undef ],
+			],
+			id    => 'edit_select',
+			class => 'form-select form-select-sm' =%>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep b/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep
new file mode 100644
index 0000000000..587b47a29f
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep
@@ -0,0 +1,79 @@
+% if (!@{ $c->{selectedAchievementIDs} }) {
+	<p><i><%= maketext('No achievements shown.  Select an achievement to edit!') =%></i></p>
+% } else {
+	<div class="table-responsive">
+		<table class="table table-sm table-bordered font-sm caption-top" id="achievement-table">
+			<caption><%= maketext('Achievement List') %></caption>
+			<thead class="table-group-divider">
+				<tr>
+					<th class="align-top"><%= maketext('Icon') %></th>
+					<th class="align-top">
+						<div class="d-flex flex-column">
+							<%= maketext('Achievement ID') =%>
+							<span id="name_header"><%= maketext('Name') %></span>
+							<span id="category_header"><%= maketext('Category') %></span>
+						</div>
+					</th>
+					<th class="align-top">
+						<div class="d-flex flex-column">
+							<span id="number_header"><%= maketext('Number') %></span>
+							<span id="enabled_header"><%= maketext('Enabled') %></span>
+							<span id="points_header"><%= maketext('Points') %></span>
+							<span id="max_counter_header"><%= maketext('Counter') %></span>
+						</div>
+					</th>
+					<th class="align-top">
+						<div class="d-flex flex-column">
+							<span id="description_header"><%= maketext('Description') %></span>
+							<span id="test_header"><%= maketext('Evaluator File') %></span>
+							<span id="icon_header"><%= maketext('Icon File') %></span>
+							<%= maketext('Type') =%>
+						</div>
+					</th>
+				</tr>
+			</thead>
+			<tbody class="table-group-divider">
+				% my %selectedAchievementIDs = map { $_ => 1 } @{ $c->{selectedAchievementIDs} };
+				% for my $achievement (@$achievements) {
+					% my $achievement_id = $achievement->achievement_id;
+					% if ($selectedAchievementIDs{$achievement_id}) {
+						<tr>
+							<td>
+								<%= hidden_field selected_achievements => $achievement_id =%>
+								<%= image
+									$ce->{courseURLs}{achievements}
+										. '/'
+										. ($achievement->icon // 'defaulticon.png'),
+									alt => 'Achievement Icon', height => 60, class => 'm-1' =%>
+							</td>
+							% for (
+								% { size => 30, fields => [ 'achievement_id', 'name',    'category' ] },
+								% { size => 8,  fields => [ 'number',         'enabled', 'points', 'max_counter' ] },
+								% { size => 85, fields => [ 'description',    'test',    'icon',   'assignment_type' ] }
+								% )
+							% {
+								<td>
+									<div class="d-flex flex-column gap-1">
+										% for my $field (@{ $_->{fields} }) {
+											<span class="text-nowrap" style="height:28px">
+												<%= include
+													'ContentGenerator/Instructor/AchievementList/edit_table_row',
+													fieldName => "achievement.$achievement_id.$field",
+													value => $achievement->$field,
+													size => $_->{size} =%>
+											</span>
+										% }
+									</div>
+								</td>
+							% }
+						</tr>
+					% }
+				% }
+			</tbody>
+		</table>
+	</div>
+	%
+	% unless (@$achievements) {
+		<p><i><%= maketext('No achievements shown.  Create an achievement!') %></i></p>
+	% }
+% }
diff --git a/templates/ContentGenerator/Instructor/AchievementList/edit_table_row.html.ep b/templates/ContentGenerator/Instructor/AchievementList/edit_table_row.html.ep
new file mode 100644
index 0000000000..c9e6d681fd
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/AchievementList/edit_table_row.html.ep
@@ -0,0 +1,25 @@
+% if ($fieldName =~ /\.enabled$/) {
+	% # If the "enabled" checkbox is checked it returns a 1, if it is unchecked it returns nothing
+	% # in which case the hidden field overrides the parameter with a 0.
+	<%= check_box $fieldName => 1,
+		'aria-labelledby' => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header',
+		class             => 'form-check-input',
+		$value ? (checked => undef) : () =%>
+	<%= hidden_field $fieldName => 0 =%>
+% } elsif ($fieldName =~ /\.assignment_type$/) {
+	% my @allowedTypes = split(',', $value);
+	% for my $type ([ default => 'homework' ], [ gateway => 'tests' ], [ jitar => 'just-in-time' ]) {
+		<label class="form-check-label me-1">
+			<%= $type->[1] =%>
+			<%= check_box $fieldName => $type->[0], class => 'form-check-input me-1',
+				(grep { $type->[0] eq $_ } @allowedTypes) ? (checked => undef) : () =%>
+		</label>
+	% }
+% } elsif ($fieldName =~ /\.achievement_id$/) {
+	<%= $value =%>
+% } else {
+	<%= text_field $fieldName => $value,
+		'aria-labelledby' => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header',
+		size              => $size,
+		class             => 'form-control form-control-sm' =%>
+% }
diff --git a/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep b/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep
new file mode 100644
index 0000000000..071f35df14
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep
@@ -0,0 +1,12 @@
+<div class="row mb-2">
+	<%= label_for export_select => maketext('Export which achievements?'),
+		class => 'col-form-label col-form-label-sm col-auto' =%>
+	<div class="col-auto">
+		<%= select_field 'action.export.scope' => [
+				[ maketext('all achievements')      => 'all' ],
+				[ maketext('selected achievements') => 'selected', selected => undef ],
+			],
+			id    => 'export_select',
+			class => 'form-select form-select-sm d-inline w-auto' =%>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep b/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep
new file mode 100644
index 0000000000..59adad9f60
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep
@@ -0,0 +1,38 @@
+<div class="table-responsive">
+	<table class="table table-sm table-bordered font-sm caption-top" id="achievement-table">
+		<caption><%= maketext('Achievement List') %></caption>
+		<thead class="table-group-divider">
+			<tr>
+				<th>
+					<%= check_box select_all => '',
+						id           => 'select-all',
+						class        => 'select-all form-check-input',
+						'aria-label' => maketext('Select all achievements'),
+						data         => { select_group => 'selected_achievements' } =%>
+				</th>
+				<th class="text-nowrap"><%= label_for 'select-all' => maketext('Achievement ID') %></th>
+				<th><%= maketext('Name') %></th>
+			</tr>
+		</thead>
+		<tbody class="table-group-divider">
+			% my %selectedAchievementIDs = map { $_ => 1 } @{ $c->{selectedAchievementIDs} };
+			% for (@$achievements) {
+				% my $achievement_id = $_->achievement_id;
+				<tr>
+					<td>
+						<%= check_box selected_achievements => $_->achievement_id,
+							id    => "${achievement_id}_id",
+							class => 'form-check-input',
+							$selectedAchievementIDs{ $_->achievement_id } ? (checked => undef) : () =%>
+					</td>
+					<td><%= label_for "${achievement_id}_id" => $_->achievement_id %></td>
+					<td class="text-nowrap"><%= $_->name %></td>
+				</tr>
+			% }
+		</tbody>
+	</table>
+</div>
+%
+% unless (@$achievements) {
+	<p><i><%= maketext('No achievements shown.  Create an achievement!') %></i></p>
+% }
diff --git a/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep b/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep
new file mode 100644
index 0000000000..0ced1ad474
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep
@@ -0,0 +1,26 @@
+<div>
+	<div class="row mb-2">
+		<%= label_for import_file_select => maketext('Import from where?'),
+			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.import.source' => [
+					[ maketext('Select import file') => '', selected => undef ],
+					$c->getAxpList
+				],
+				id    => 'import_file_select',
+				class => 'form-select form-select-sm d-inline w-auto' =%>
+		</div>
+	</div>
+	<div class="row mb-2">
+		<%= label_for import_users_select => maketext('Assign this achievement to which users?'),
+			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.import.assign' => [
+					[ maketext('all current users') => 'all' ],
+					[ maketext('no users')          => 'none', selected => undef ],
+				],
+				id    => 'import_users_select',
+				class => 'form-select form-select-sm d-inline w-auto' =%>
+		</div>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/AchievementList/save_edit_form.html.ep b/templates/ContentGenerator/Instructor/AchievementList/save_edit_form.html.ep
new file mode 100644
index 0000000000..82fb7b3d08
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/AchievementList/save_edit_form.html.ep
@@ -0,0 +1 @@
+<span><%= maketext('Save changes') =%></span>
diff --git a/templates/ContentGenerator/Instructor/AchievementList/save_export_form.html.ep b/templates/ContentGenerator/Instructor/AchievementList/save_export_form.html.ep
new file mode 100644
index 0000000000..5f96a8f6c3
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/AchievementList/save_export_form.html.ep
@@ -0,0 +1 @@
+<span><%= maketext('Export selected achievements') =%></span>
diff --git a/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep b/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep
new file mode 100644
index 0000000000..e2ae010274
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep
@@ -0,0 +1,13 @@
+<div class="row mb-2">
+	<%= label_for score_select => maketext('Score which achievements?'),
+		class => 'col-form-label col-form-label-sm col-auto' =%>
+	<div class="col-auto">
+		<%= select_field 'action.score.scope' => [
+				[ maketext('no achievements')       => 'none', selected => undef ],
+				[ maketext('all achievements')      => 'all' ],
+				[ maketext('selected achievements') => 'selected' ],
+			],
+			id    => 'score_select',
+			class => 'form-select form-select-sm d-inline w-auto' =%>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep b/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep
new file mode 100644
index 0000000000..de609f50c9
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep
@@ -0,0 +1,105 @@
+% unless ($authz->hasPermissions(param('user'), 'edit_achievements')) {
+	<div class="alert alert-danger p-1"><%= maketext('You are not authorized to edit achievements.') %></div>
+	% last;
+% }
+%
+% my $achievementID = stash('achievementID');
+%
+<%= form_for current_route, method => 'post', name => 'user-achievement-form', id => 'user-achievement-form', begin =%>
+	% # Assign to everyone message
+	<div class="my-2">
+		<%= submit_button maketext('Assign to All Current Users'), name => 'assignToAll', class => 'btn btn-primary' =%>
+		<i><%= maketext('This action will not overwrite existing users.') %></i>
+	</div>
+	<div class="alert alert-danger p-1 mb-2">
+		<div class="mb-1"><%= maketext('Do not uncheck students, unless you know what you are doing.') =%></div>
+		<div><%= maketext('There is NO undo for unassigning students.') %></div>
+	</div>
+	<p>
+		<%== maketext(
+			q{When you unassign by unchecking a student's name, you destroy all of the data for achievement [_1] }
+				. 'for this student. Make sure this is what you want to do.',
+			tag('b', $achievementID)
+		) =%>
+	</p>
+	%
+	% # Output table
+	<div class="table-responsive">
+		<table class="table table-sm table-bordered font-sm align-middle w-auto">
+			<thead>
+				<tr>
+					<th class="text-center"><%= maketext('Assigned') %></th>
+					<th><%= maketext('Login Name') %></th>
+					<th><%= maketext('Student Name') %></th>
+					<th class="text-center"><%= maketext('Section') %></th>
+					<th class="text-center" id="earned_header"><%= maketext('Earned') %></th>
+					<th class="text-center" id="counter_header"><%= maketext('Counter') %></th>
+				</tr>
+			</thead>
+			<tbody class="table-group-divider">
+				% # Output row for user
+				% for my $userRecord (@$userRecords) {
+					% my $statusClass     = $ce->status_abbrev_to_name($userRecord->status) || '';
+					% my $user            = $userRecord->user_id;
+					% my $userAchievement = $db->getUserAchievement($user, $achievementID);
+					% my $prettyName      = $userRecord->last_name . ', ' . $userRecord->first_name;
+					%
+					<tr>
+						<td class="text-center">
+							<input type="checkbox" name="selected" id="<%= $user %>.assigned" value="<%= $user %>"
+								class="form-check-input" <%= defined $userAchievement ? 'checked' : '' %>>
+						</td>
+						<td><%= label_for "$user.assigned" => $user %></td>
+						<td><%= $prettyName %></td>
+						<td class="text-center"><%= $userRecord->section %></td>
+						% if (defined $userAchievement) {
+							<td class="text-center">
+								<%= check_box "$user.earned" => '1',
+									'aria-labelledby' => 'earned_header',
+									class             => 'form-check-input',
+									(ref $userAchievement ? $userAchievement->earned : 0) ? (checked => undef) : () =%>
+							</td>
+							<td class="text-center">
+								<%= text_field "$user.counter" => ref $userAchievement ? $userAchievement->counter : 0,
+										'aria-labelledby' => 'counter_header',
+										size              => 6,
+										class             => 'form-control form-control-sm' =%>
+							</td>
+						% } else {
+							<td></td><td></td>
+						% }
+					</tr>
+				% }
+			</tbody>
+		</table>
+	</div>
+	%
+	<%= $c->hidden_authen_fields =%>
+	<%= submit_button maketext('Save'), name => 'assignToSelected', class => 'btn btn-primary' =%>
+	%
+	% # Output unassign from all button.
+	<hr>
+	<div>
+		<div class="alert alert-danger p-1 mb-3">
+			<%= maketext(
+				'There is NO undo for this function.  Do not use it unless you know what you are doing!  '
+					. 'When you unassign a student using this button, or by unchecking their name, you destroy all '
+					. 'of the data for achievement [_1] for this student.',
+				$achievementID
+			) =%>
+		</div>
+		<div class="d-flex align-items-center">
+			<%= submit_button maketext('Unassign from All Users'),
+				name => 'unassignFromAll', class => 'btn btn-primary' =%>
+			<label class="form-check-label">
+				<%= radio_button unassignFromAllSafety => 0, checked => undef, class => 'form-check-input mx-1' =%>
+				<%= maketext('Read only') =%>
+			</label>
+			<label class="form-check-label">
+				<%= radio_button unassignFromAllSafety => 1, class => 'form-check-input mx-1' =%>
+				<%= maketext('Allow unassign') =%>
+			</label>
+		</div>
+	</div>
+	<hr>
+<% end =%>
diff --git a/templates/ContentGenerator/Instructor/AddUsers.html.ep b/templates/ContentGenerator/Instructor/AddUsers.html.ep
new file mode 100644
index 0000000000..f0206a7098
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/AddUsers.html.ep
@@ -0,0 +1,99 @@
+% use WeBWorK::Utils qw(format_set_name_display);
+%
+% unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
+	<div class="alert alert-danger p-1 mb-0">
+		<%= maketext('You are not authorized to access instructor tools.') =%>
+	</div>
+	% last;
+% }
+%
+% unless ($authz->hasPermissions(param('user'), 'modify_student_data')) {
+	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to modify student data.') =%></div>
+	% last;
+% }
+%
+<hr>
+<p><%= defined $c->{studentEntryReport} ? $c->{studentEntryReport}->join('') : '' %></p>
+<p>
+	<%= maketext(
+		'Enter information below for students you wish to add. '
+			. q{Each student's password will initially be set to their student ID.}
+	) =%>
+</p>
+%
+% my $numberOfStudents = param('number_of_students') // 5;
+%
+<%= form_for current_route, method => 'POST', begin =%>
+	<%= $c->hidden_authen_fields('create_') =%>
+	<div class="input-group d-inline-flex w-auto">
+		<%= submit_button maketext('Create'), class => 'btn btn-primary' =%>
+		<%= text_field number_of_students => $numberOfStudents, size => 3, class => 'form-control' =%>
+		<span class="input-group-text"><%= maketext('entry rows.') %></span>
+	</div>
+<% end =%>
+<hr>
+<%= form_for current_route, method => 'POST', begin =%>
+	<%= $c->hidden_authen_fields =%>
+	<%= hidden_field number_of_students => $numberOfStudents =%>
+	<div class="table-responsive">
+		<table class="table table-sm table-bordered">
+			<tr>
+				<th><%= maketext('Last Name') %></th>
+				<th><%= maketext('First Name') %></th>
+				<th><%= maketext('Student ID') %></th>
+				<th><%= maketext('Login Name') %><span class="required-field">*</span></th>
+				<th><%= maketext('Email Address') %></th>
+				<th><%= maketext('Section') %></th>
+				<th><%= maketext('Recitation') %></th>
+				<th><%= maketext('Comment') %></th>
+			</tr>
+			% for (1 .. $numberOfStudents) {
+				<tr>
+					<td>
+						% param("last_name_$_", undef);
+						<%= text_field "last_name_$_" => '', size => '10',
+							class => 'form-control form-control-sm w-auto' =%>
+					</td>
+					<td>
+						% param("first_name_$_", undef);
+						<%= text_field "first_name_$_" => '', size => '10',
+							class => 'form-control form-control-sm w-auto' =%>
+					</td>
+					<td>
+						% param("student_id_$_", undef);
+						<%= text_field "student_id_$_" => '', size => '16',
+							class => 'form-control form-control-sm w-auto' =%>
+					</td>
+					<td>
+						% param("new_user_id_$_", undef);
+						<%= text_field "new_user_id_$_" => '', size => '10',
+							class => 'form-control form-control-sm w-auto' =%>
+					</td>
+					<td>
+						% param("email_address_$_", undef);
+						<%= text_field "email_address_$_" => '', class => 'form-control form-control-sm w-auto' =%>
+					</td>
+					<td>
+						% param("section_$_", undef);
+						<%= text_field "section_$_" => '', size => '4',
+							class => 'form-control form-control-sm w-auto' =%>
+					</td>
+					<td>
+						% param("recitation_$_", undef);
+						<%= text_field "recitation_$_" => '', size => '4',
+							class => 'form-control form-control-sm w-auto' =%>
+					</td>
+					<td>
+						% param("comment_$_", undef);
+						<%= text_field "comment_$_" => '', class => 'form-control form-control-sm w-auto' =%>
+					</td>
+				</tr>
+			% }
+		</table>
+	</div>
+	<p class="my-2"><%= maketext('Select sets below to assign them to the newly-created users.') %></p>
+	% param('assignSets', undef);
+	<%= select_field assignSets => [ map { [ format_set_name_display($_) => $_ ] } $db->listGlobalSets ],
+		size => 10, multiple => undef, class => 'form-select w-auto mb-2' =%>
+	<p><%= submit_button maketext('Add Students'), name => 'addStudents', class => 'btn btn-primary' =%></p>
+<% end =%>
diff --git a/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep b/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep
new file mode 100644
index 0000000000..e70ffdc8e0
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep
@@ -0,0 +1,33 @@
+<div class="input-group input-group-sm mb-2">
+	<span class="input-group-text">
+		<b><%= $addError ? maketext('Failed to add user:') : maketext('Added user:') %></b>
+	</span>
+	<span class="input-group-text"><%= $newUser->last_name %>, <%= $newUser->first_name %></span>
+	<span class="input-group-text"><b><%= maketext('Login:') %></b></span>
+	<span class="input-group-text"><%= $newUser->user_id %></span>
+	% if ($newUser->student_id) {
+		<span class="input-group-text"><b><%= maketext('Student ID:') %></b></span>
+		<span class="input-group-text"><%= $newUser->student_id %></span>
+	% }
+	% if ($newUser->email_address) {
+		<span class="input-group-text"><b><%= maketext('Email:') %></b></span>
+		<span class="input-group-text"><%= $newUser->email_address %></span>
+	% }
+	% if ($newUser->section ne '') {
+		<span class="input-group-text"><b><%= maketext('Section:') %></b></span>
+		<span class="input-group-text"><%= $newUser->section %></span>
+	% }
+	% if ($newUser->recitation ne '') {
+		<span class="input-group-text"><b><%= maketext('Recitation:') %></b></span>
+		<span class="input-group-text"><%= $newUser->recitation %></span>
+	% }
+	% if ($newUser->comment) {
+		<span class="input-group-text"><b><%= maketext('Comment:') %></b></span>
+		<span class="input-group-text"><%= $newUser->comment %></span>
+	% }
+</div>
+% if ($addError) {
+	<div class="alert alert-danger mb-2 p-1" role="alert">
+		<b><%= maketext('Error message:') %></b> <span class="mb-0"><%= $addError %></span>
+	</div>
+% }
diff --git a/templates/ContentGenerator/Instructor/Assigner.html.ep b/templates/ContentGenerator/Instructor/Assigner.html.ep
new file mode 100644
index 0000000000..36ea175c0f
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/Assigner.html.ep
@@ -0,0 +1,82 @@
+% use WeBWorK::HTML::ScrollingRecordList qw/scrollingRecordList/;
+%
+% unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
+	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to access instructor tools.') %></div>
+	% last;
+% }
+%
+% unless ($authz->hasPermissions(param('user'), 'assign_problem_sets')) {
+	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to assign homework sets.') %></div>
+	% last;
+% }
+%
+<p>
+	<%= maketext('Select one or more sets and one or more users below to assign/unassign '
+		. 'each selected set to/from all selected users.') =%>
+</p>
+<%= form_for current_route, method => 'post', begin =%>
+	<%= $c->hidden_authen_fields =%>
+	%
+	<div>
+		<div class="row gx-3">
+			<div class="col-xl-5 col-md-6 mb-2">
+				<div class="fw-bold text-center"><%= label_for selected_users => maketext('Users') =%></div>
+				<%= scrollingRecordList(
+					{
+						name            => 'selected_users',
+						id              => 'selected_users',
+						controller      => $c,
+						default_sort    => 'lnfn',
+						default_format  => 'lnfn_uid',
+						default_filters => ['all'],
+						attrs           => { size => 20, multiple => undef }
+					},
+					@$users
+				) =%>
+			</div>
+			<div class="col-xl-5 col-md-6 mb-2">
+				<div class="fw-bold text-center"><%= label_for selected_sets => maketext('Sets') =%></div>
+				<%= scrollingRecordList(
+					{
+						name            => 'selected_sets',
+						id              => 'selected_sets',
+						controller      => $c,
+						default_sort    => 'set_id',
+						default_format  => 'sid',
+						default_filters => ['all'],
+						attrs           => { size => 20, multiple => undef, dir => 'ltr' }
+					},
+					@$globalSets
+				) =%>
+			</div>
+		</div>
+		<div>
+			<%= submit_button maketext('Assign selected sets to selected users'),
+				name => 'assign', class => 'btn btn-primary mb-2' =%>
+			<div class="alert alert-danger p-1 mb-2">
+				<div class="mb-1"><%= maketext('Do not unassign students unless you know what you are doing.') =%></div>
+				<div><%= maketext('There is NO undo for unassigning students.') =%></div>
+			</div>
+			<div class="d-flex align-items-center">
+				<%= submit_button maketext('Unassign selected sets from selected users'),
+					name => 'unassign', class => 'btn btn-primary me-2' =%>
+				<label class="form-check-label">
+					<%= maketext('Read only') =%>
+					<%= radio_button unassignFromAllSafety => 0, checked => undef, class => 'form-check-input mx-1' =%>
+				</label>
+				<label class="form-check-label">
+					<%= maketext('Allow unassign') =%>
+					<%= radio_button unassignFromAllSafety => 1, class => 'form-check-input mx-1' =%>
+				</label>
+			</div>
+			<div class="mt-2">
+				<%= maketext(
+					'When you unassign a set from students, you destroy all of the data for the set for those '
+						. 'students. If the set is re-assigned to these students, then they will receive new versions '
+						. 'of problems in the set.  Make sure this is what you want to do before unassigning sets '
+						. 'from students.'
+				) =%>
+			</div>
+		</div>
+	</div>
+<% end =%>
diff --git a/templates/ContentGenerator/Instructor/Config.html.ep b/templates/ContentGenerator/Instructor/Config.html.ep
new file mode 100644
index 0000000000..4183e17869
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/Config.html.ep
@@ -0,0 +1,55 @@
+% unless ($authz->hasPermissions(param('user'), 'modify_problem_sets')) {
+	<div class="alert alert-danger p-1 mb-0">
+		<em><%= maketext('You are not authorized to modify the course configuration.') %></em>
+	</div>
+	% last;
+% }
+%
+% my $configValues = $c->getConfigValues($ce);
+%
+% # Get the current course environment again in case changes were just saved.
+% my $ce4 = WeBWorK::CourseEnvironment->new({ courseName => $ce->{courseName}, });
+%
+% if (@$configValues == 0) {
+	<p>
+		<%= maketext(
+			'The configuration module did not find the data it needs to function.  '
+				. 'Have your site administrator check that site configuration files are up to date.'
+		) =%>
+	</p>
+% } else {
+	% my $current_tab = param('section_tab') || 'tab0';
+	<%= $c->generate_navigation_tabs($current_tab, map { $_->[0] } @$configValues) =%>
+	%
+	<%= form_for current_route, method => 'POST', id => 'config-form', name => 'config-form', begin =%>
+		<%= $c->hidden_authen_fields =%>
+		<%= hidden_field section_tab => $current_tab =%>
+		%
+		% my $tabnumber = $current_tab =~ s/tab//r;
+		% my @configSectionArray = @{ $configValues->[$tabnumber] };
+		%
+		<h2><b><%= maketext(shift @configSectionArray) %></b></h2>
+		%
+		<div class="table-responsive">
+			<table class="table table-bordered align-middle">
+				<tr>
+					<th><%= maketext('Setting') %></th>
+					<th class="text-center"><%= maketext('Default') %></th>
+					<th class="text-center"><%= maketext('Current') %></th>
+				</tr>
+				% for my $con (@configSectionArray) {
+					% my $conobject = $c->objectify($con);
+					% my $name      = ($conobject->{var} =~ s/[{]/-/gr) =~ s/[}]//gr;
+					<tr>
+						<td><%= $conobject->what_string %></td>
+						<td class="text-center">
+							<%= $conobject->display_value($con->get_value($c->{default_ce})) %>
+						</td>
+						<td><%= $conobject->entry_widget($con->get_value($ce4)) =%></td>
+					</tr>
+				% }
+			</table>
+		</div>
+		<p><%= submit_button maketext('Save Changes'), name => 'make_changes',  class => 'btn btn-primary' =%></p>
+	<% end =%>
+% }
diff --git a/templates/ContentGenerator/Instructor/Config/config_help.html.ep b/templates/ContentGenerator/Instructor/Config/config_help.html.ep
new file mode 100644
index 0000000000..62c0037b79
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/Config/config_help.html.ep
@@ -0,0 +1,33 @@
+<div class="d-flex justify-content-between align-items-center">
+	<div>
+		% if (ref $configObject eq 'WeBWorK::ConfigObject::checkboxlist') {
+			<%== maketext($configObject->{doc}) =%>
+		% } else {
+			<%= label_for $configObject->{name}, begin =%><%== maketext($configObject->{doc}) =%><% end =%>
+		% }
+	</div>
+	<div>
+		<%= link_to '#', data => { bs_toggle => 'modal', bs_target => "#$configObject->{name}_help_modal" }, begin =%>
+			<i class="icon fas fa-question-circle" aria-hidden="true" data-alt="help"></i>
+		<% end =%>
+		<% content_for 'modal-dialog-area', begin =%>
+			<div class="modal fade" id="<%= "$configObject->{name}_help_modal" %>" tabindex="-1"
+				aria-labelledby="<%= "$configObject->{name}_help_title" %>" aria-hidden="true">
+				<div class="modal-dialog modal-lg modal-dialog-centered modal-dialog-scrollable">
+					<div class="modal-content">
+						<div class="modal-header">
+							<h1 class="modal-title fs-4" id="<%= "$configObject->{name}_help_title" %>">
+								<%= maketext('Variable Documentation') %>
+							</h1>
+							<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+						</div>
+						<div class="modal-body">
+							<h2 class="fs-4"><code>$<%= $configObject->{var} %></code></h2>
+							<div><%== $configObject->{doc2} || $configObject->{doc} %></div>
+						</div>
+					</div>
+				</div>
+			</div>
+		<% end =%>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/FileManager.html.ep b/templates/ContentGenerator/Instructor/FileManager.html.ep
new file mode 100644
index 0000000000..e10aa557be
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/FileManager.html.ep
@@ -0,0 +1,63 @@
+% use WeBWorK::Utils qw(x getAssetURL);
+%
+% content_for js => begin
+	<%= javascript getAssetURL($ce, 'js/FileManager/filemanager.js'), defer => undef =%>
+% end
+%
+% unless ($authz->hasPermissions(param('user'), 'manage_course_files')) {
+	<em><%= maketext('You are not authorized to manage course files') %></em>
+	% last;
+% }
+%
+% unless (defined $c->{pwd}) {
+	<em><%= maketext('You have specified an illegal working directory!') %></em>
+	% last;
+% }
+%
+<%= form_for current_route, method => 'POST', enctype => 'multipart/form-data',
+	id => 'FileManager', name => 'FileManager', begin =%>
+	<%= $c->hidden_authen_fields =%>
+	%
+	% my $action = param('action') || param('formAction') || param('confirmed') || 'Init';
+	%
+	% # Map of actions to methods.
+	% my %methods = (
+		% x('Refresh')        => 'Refresh',
+		% x('Cancel')         => 'Refresh',
+		% x('Directory')      => 'Go',
+		% x('Go')             => 'Go',
+		% x('View')           => 'View',
+		% x('Edit')           => 'Edit',
+		% x('Download')       => 'Refresh',
+		% x('Copy')           => 'Copy',
+		% x('Rename')         => 'Rename',
+		% x('Delete')         => 'Delete',
+		% x('New Folder')     => 'NewFolder',
+		% x('New File')       => 'NewFile',
+		% x('Upload')         => 'Upload',
+		% x('Revert')         => 'Edit',
+		% x('Save As')        => 'SaveAs',
+		% x('Save')           => 'Save',
+		% x('Init')           => 'Init',
+		% '^'                 => 'ParentDir',
+		% "\\"                => 'ParentDir',
+		% x('Make Archive')   => 'MakeArchive',
+		% x('Unpack Archive') => 'UnpackArchive',
+		% x('Archive Course') => 'Refresh',
+	% );
+	%
+	% # Add translated action names to the method map.
+	% $methods{ maketext($_) } = $methods{$_} for keys %methods;
+	%
+	% # Look up the current action and perform it.
+	% my $method = $methods{$action};
+	% if ($method) {
+		<%= $c->$method =%>
+	% } else {
+		% $c->addbadmessage('Unknown action');
+		<%= $c->Refresh =%>
+	% }
+	%
+	<%= hidden_field pwd => $c->{pwd} =%>
+	<%= hidden_field formAction => '' =%>
+<% end =%>
diff --git a/templates/ContentGenerator/Instructor/FileManager/confirm.html.ep b/templates/ContentGenerator/Instructor/FileManager/confirm.html.ep
new file mode 100644
index 0000000000..f58e2f414d
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/FileManager/confirm.html.ep
@@ -0,0 +1,15 @@
+<div class="card w-75 mx-auto">
+	<div class="card-body">
+		<%= $message =%>
+		<%= text_field name => $value, size => 50, class => 'form-control mt-3' =%>
+		<div class="d-flex justify-content-evenly mt-3">
+			<%= submit_button maketext('Cancel'), name => 'formAction', class => 'btn btn-sm btn-secondary' =%>
+			<%= submit_button $button, name => 'formAction', class => 'btn btn-sm btn-secondary' =%>
+			% if ($button2) {
+				<%= submit_button $button2, name => 'formAction', class => 'btn btn-sm btn-secondary' =%>
+			% }
+		</div>
+	</div>
+</div>
+<%= hidden_field confirmed => $button =%>
+<%= $c->HiddenFlags =%>
diff --git a/templates/ContentGenerator/Instructor/FileManager/delete.html.ep b/templates/ContentGenerator/Instructor/FileManager/delete.html.ep
new file mode 100644
index 0000000000..40b56cc4ed
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/FileManager/delete.html.ep
@@ -0,0 +1,78 @@
+% use WeBWorK::Utils qw(readDirectory listFilesRecursive);
+%
+% # Show the confirmation dialog box
+<div class="card w-75 mx-auto">
+	<div class="card-body">
+		<div class="mb-3">
+			<b><%= maketext('Warning') %>:</b> <%= maketext('You have requested that the following items be deleted') %>
+		</div>
+		% # Look up the files to be deleted, and for directories add a trailing slash and the contents of the directory.
+		<ul>
+			% for my $file (@$files) {
+				% if (defined $c->checkPWD("$c->{pwd}/$file", 1)) {
+					<li>
+						% if (-l "$dir/$file") {
+							<%= $file %>@
+						% } elsif (-d "$dir/$file") {
+							% my @contents;
+							% my $dcount = 0;
+							% for my $item (readDirectory("$dir/$file")) {
+								% next if $item eq '.' || $item eq '..';
+								% push @contents, begin
+									% if (-l "$dir/$file/$item") {
+										<div class="ms-3"><%= $item %>@</div>
+									% } elsif (-d "$dir/$file/$item") {
+										% my $count = scalar(listFilesRecursive("$dir/$file/$item", '.*'));
+										% $dcount += $count;
+										<div class="d-flex justify-content-between ms-3 me-5">
+											<%= $item %>/
+											<small><i><%= maketext('([quant,_1,item])', $count) %></i></small>
+										</div>
+									% } else {
+										<div class="ms-3"><%= $item %></div>
+									% }
+								% end
+								% $dcount += 1;
+							% }
+							%
+							<div class="d-flex justify-content-between me-4">
+								<%= $file %>/
+								<small><i><%= maketext('([quant,_1,item] total)', $dcount) %></i></small>
+							</div>
+							% if (@contents > 15) {
+								<%= c(map { $_->() } @contents[ 0 .. 10 ])->join('') =%>
+								<div class="ms-3">&nbsp; .</div>
+								<div class="ms-3">&nbsp; .</div>
+								<div class="ms-3">&nbsp; .</div>
+							% } else {
+								<%= c(map { $_->() } @contents)->join('') =%>
+							% }
+						% } else {
+							<%= $file %>
+						% }
+					</li>
+				% }
+			% }
+		</ul>
+		% if (grep { -d "$dir/$_" } @$files) {
+			<p>
+				<%= maketext(
+					'Some of these files are directories. Only delete directories if you really know what you are '
+						. 'doing. You can seriously damage your course if you delete the wrong thing.') =%>
+			</p>
+		% }
+		<p class="alert alert-danger p-1 mb-3">
+			<%= maketext('There is no undo for deleting files or directories!') =%>
+		</p>
+		<p><%= maketext('Really delete the items listed above?') %></p>
+		<div class="d-flex justify-content-evenly">
+			<%= submit_button maketext('Cancel'), name => 'action', class => 'btn btn-sm btn-secondary' =%>
+			<%= submit_button maketext('Delete'), name => 'action', class => 'btn btn-sm btn-secondary' =%>
+		</div>
+	</div>
+</div>
+<%= hidden_field confirmed => 'Delete' =%>
+% for (@$files) {
+	<%= hidden_field files => $_ =%>
+% }
+<%= $c->HiddenFlags =%>
diff --git a/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep b/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep
new file mode 100644
index 0000000000..e7c5db0ac6
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep
@@ -0,0 +1,124 @@
+% my $pwd   = $c->{pwd};
+% my $files = $c->directoryListing($pwd);
+%
+% unless ($files) {
+	% $c->addbadmessage(maketext(q{The directory you specified doesn't exist}));
+	% $files = [];
+% }
+%
+% # Directory menu and date/size checkbox
+<div class="row">
+	<div class="col-md-8 mb-2">
+		<div class="input-group input-group-sm">
+			<%= submit_button '^', name  => 'action', $pwd eq '.' || $pwd eq '' ? (disabled => undef) : (),
+				class => 'btn btn-sm btn-secondary' =%>
+			<%= select_field directory => $c->directoryMenu($pwd), class => 'form-select', dir => 'ltr' =%>
+		</div>
+	</div>
+	<div class="col-md-4 mb-2">
+		<div class="form-check font-sm">
+			<label class="form-check-label">
+				<%= check_box dates => 1, class => 'form-check-input' =%>
+				<%= maketext('Show Date & Size') =%>
+			</label>
+		</div>
+	</div>
+</div>
+%
+% # Directory Listing and column of buttons
+% my %button = (name => 'action', style => 'width:10em', class => 'file-manager-btn btn btn btn-sm btn-secondary');
+% my $width  = ($c->getFlag('dates') && scalar(@{$files}) > 0) ? '' : ' width:30em';
+<div class="row">
+	<div class="col-md-8 mb-2">
+		<%= select_field files => $files, id => 'files', class => 'form-select font-monospace h-100',
+			dir => 'ltr', size => 17, multiple => undef =%>
+	</div>
+	<div class="col-md-4 mb-2">
+		<div class="d-md-flex flex-column justify-content-evenly">
+			<%= submit_button maketext('View'), id => 'View', %button =%>
+			<%= submit_button maketext('Edit'), id => 'Edit', %button =%>
+			<%= submit_button maketext('Download'), id => 'Download', %button =%>
+			<%= submit_button maketext('Rename'), id => 'Rename', %button =%>
+			<%= submit_button maketext('Copy'), id => 'Copy', %button =%>
+			<%= submit_button maketext('Delete'), id => 'Delete', %button =%>\
+			<%= submit_button maketext('Make Archive'), id => 'MakeArchive',
+				data => {
+					archive_text   => maketext('Make Archive'),
+					unarchive_text => maketext('Unpack Archive')
+				},
+				%button =%>
+			% unless ($c->{courseName} eq 'admin') {
+				<%= submit_button maketext('Archive Course'), id => 'ArchiveCourse', %button =%>
+			% }
+			<div style="height: 10px"></div>
+			<%= submit_button maketext('New File'), id => 'NewFile', %button =%>
+			<%= submit_button maketext('New Folder'), id => 'NewFolder', %button =%>
+			<%= submit_button maketext('Refresh'), id => 'Refresh', %button =%>
+		</div>
+	</div>
+</div>
+%
+% # Upload button and checkboxes
+<div class="row">
+	<div class="col-md-8">
+		<div class="input-group input-group-sm mb-2">
+			<%= submit_button maketext('Upload'), name => 'action', style => 'width:7em', id => 'Upload',
+				class => 'btn btn-sm btn-primary' =%>
+			<%= file_field 'file', id => 'file', class => 'form-control form-control-sm' =%>
+		</div>
+	</div>
+</div>
+%
+<div class="row">
+	<div class="col-md-8">
+		<div class="input-group input-group-sm mb-2">
+			<span class="input-group-text"><%= maketext('Format') %>:</span>
+			<div class="input-group-text flex-grow-1">
+				<label class="form-check-label me-4">
+					<%= radio_button format => 'Text', class => 'form-check-input me-2' =%>
+					<%= maketext('Text') =%>
+				</label>
+				<label class="form-check-label me-4">
+					<%= radio_button format => 'Binary', class => 'form-check-input me-2' =%>
+					<%= maketext('Binary') =%>
+				</label>
+				<label class="form-check-label me-4">
+					<%= radio_button format => 'Automatic', class => 'form-check-input me-2', checked => undef =%>
+					<%= maketext('Automatic') =%>
+				</label>
+			</div>
+		</div>
+	</div>
+</div>
+%
+<div class="row">
+	<div class="col-md-8">
+		<div class="input-group input-group-sm mb-2">
+			<div class="input-group-text flex-grow-1">
+				<label class="form-check-label">
+					<%= check_box overwrite => 1, class => 'form-check-input me-2' =%>
+					<%= maketext('Overwrite existing files silently') =%>
+				</label>
+			</div>
+		</div>
+	</div>
+</div>
+%
+<div class="row">
+	<div class="col-md-8">
+		<div class="input-group input-group-sm">
+			<div class="input-group-text">
+				<label class="form-check-label">
+					<%= check_box unpack => 1, class => 'form-check-input me-2' =%>
+					<%= maketext('Unpack archives automatically') =%>
+				</label>
+			</div>
+			<div class="input-group-text flex-grow-1">
+				<label class="form-check-label">
+					<%= check_box autodelete => 1, class => 'form-check-input me-2' =%>
+					<%= maketext('then delete them') =%>
+				</label>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep b/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep
new file mode 100644
index 0000000000..d54c3e0f53
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep
@@ -0,0 +1,27 @@
+% my $name   = "$c->{pwd}/$file" =~ s!^\./?!!r;
+% my %button = (name => 'action', class => 'btn btn-sm btn-secondary w-100');
+%
+<div class="d-flex">
+	<div align="center" class="col-12 bg-dark text-white"><b><%= $name %></b></div>
+</div>
+<div class="d-flex">
+	<div class="col-12">
+		% param('data', $contents);
+		<%= text_area data => '', rows => 30, columns => 80, dir => 'auto',
+			class => 'file-manager-editor form-control' =%>
+	</div>
+</div>
+<div class="row">
+	<div class="col-md-2 col-4 my-2"><%= submit_button maketext('Cancel'), %button %></div>
+	<div class="col-md-2 col-4 my-2"><%= submit_button maketext('Revert'), %button %></div>
+	<div class="col-md-2 col-4 my-2"><%= submit_button maketext('Save'), %button %></div>
+	<div class="col-md-6 col-12 my-2">
+		<div class="input-group">
+			<%= submit_button maketext('Save As'), name => 'action', class => 'btn btn-sm btn-secondary' =%>
+			<%= text_field name => '', size => 20, class => 'form-control form-control-sm' =%>
+		</div>
+	</div>
+</div>
+%
+<%= hidden_field files => $file =%>
+<%= $c->HiddenFlags =%>
diff --git a/templates/ContentGenerator/Instructor/FileManager/view.html.ep b/templates/ContentGenerator/Instructor/FileManager/view.html.ep
new file mode 100644
index 0000000000..6aba8c90f8
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/FileManager/view.html.ep
@@ -0,0 +1,21 @@
+% use WeBWorK::Utils qw(readFile);
+%
+% my $fileManagerURL = $c->systemLink(url_for, params => { download => $filename, pwd => $c->{pwd} } );
+%
+% # Include a download link
+<div class="d-flex justify-content-between">
+	<b><%= $name %></b>
+	<%= link_to maketext('Download') => $fileManagerURL =%>
+</div>
+<hr>
+%
+% # For files display the file, if possible.  If the file is an image, display it as an image.
+% if (-T $file) {    # Check that it is a text file
+	<div dir="auto"><pre><%= readFile($file) =%></pre></div>
+% } elsif ($file =~ m/\.(gif|jpg|png)$/i) {
+	<%= image $fileManagerURL, style => 'border:0;', alt => $name =%>
+% } else {
+	<div class="alert alert-danger p-1 mb-0">
+		<%= maketext('The file $file does not appear to be a text or image file.') =%>
+	</div>
+% }
diff --git a/templates/ContentGenerator/Instructor/Index.html.ep b/templates/ContentGenerator/Instructor/Index.html.ep
new file mode 100644
index 0000000000..835c4a6c0d
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/Index.html.ep
@@ -0,0 +1,245 @@
+% use WeBWorK::Utils qw(getAssetURL);
+% use WeBWorK::HTML::ScrollingRecordList qw(scrollingRecordList);
+%
+% content_for js => begin
+	<%= javascript getAssetURL($ce, 'js/InstructorTools/instructortools.js'), defer => undef =%>
+% end
+%
+% unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
+	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to access instructor tools.') %></div>
+	% last;
+% }
+%
+<p>
+	<%= maketext(
+		'Use the interface below to quickly access commonly-used instructor tools, '
+			. 'or select a tool from the list to the left.'
+	) =%>
+	<br>
+	<%= maketext('Select user(s) and/or set(s) below and click the action button of your choice.') =%>
+</p>
+%
+<%= form_for current_route, method => 'POST', id => 'instructor-tools-form', begin =%>
+	<%= $c->hidden_authen_fields =%>
+	%
+	<div class="row gx-3">
+		<div class="col-xl-5 col-md-6 mb-2">
+			<div class="fw-bold text-center"><%= label_for selected_users => maketext('Users') %></div>
+			<%= scrollingRecordList(
+				{
+					name            => 'selected_users',
+					controller      => $c,
+					default_sort    => 'lnfn',
+					default_format  => 'lnfn_uid',
+					default_filters => ['all'],
+					attrs           => {
+						size     => 10,
+						multiple => undef
+					}
+				},
+				@$users
+			) =%>
+		</div>
+		<div class="col-xl-5 col-md-6 mb-2">
+			<div class="fw-bold text-center"><%= label_for selected_sets => maketext('Sets') %></div>
+			<%= scrollingRecordList(
+				{
+					name            => 'selected_sets',
+					controller      => $c,
+					default_sort    => 'set_id',
+					default_format  => 'sid',
+					default_filters => ['all'],
+					attrs           => {
+						size     => 10,
+						multiple => undef,
+						dir      => 'ltr'
+					}
+				},
+				@$globalSets
+			) =%>
+		</div>
+	</div>
+	<div class="row gx-3">
+		<div class="col-xl-5 col-md-6 mb-2">
+			<div class="input-group input-group-sm mb-2">
+				<%= submit_button maketext('View/Edit'),
+					name  => 'sets_assigned_to_user',
+					class => 'btn btn-sm btn-secondary',
+					data  => { users_needed => 'exactly one', error_users  => maketext($E_ONE_USER) } =%>
+				<span class="input-group-text flex-grow-1" style="white-space:pre;">\
+					<%== maketext('all set dates for one <b>user</b>') =%>\
+				</span>
+			</div>
+			<div class="input-group input-group-sm mb-2">
+				<%= submit_button maketext('Edit'),
+					name       => 'edit_users',
+					class      => 'btn btn-sm btn-secondary',
+					formaction => $c->systemLink(url_for 'instructor_user_list'),
+					data => { users_needed => 'at least one', error_users => maketext($E_MIN_ONE_USER) } =%>
+				<span class="input-group-text flex-grow-1" style="white-space:pre;">\
+					<%== maketext('class list data for selected <b>users</b>') =%>\
+				</span>
+			</div>
+			<div class="input-group input-group-sm mb-2">
+				<%= submit_button maketext('Statistics'),
+					name  => 'user_stats',
+					class => 'btn btn-sm btn-secondary',
+					data  => { users_needed => 'exactly one', error_users => maketext($E_ONE_USER) } =%>
+				<span class="input-group-text"><%= maketext('or') %></span>
+				<%= submit_button maketext('progress'),
+					name  => 'user_progress',
+					class => 'btn btn-sm btn-secondary',
+					data  => { users_needed => 'exactly one', error_users => maketext($E_ONE_USER) } =%>
+				<span class="input-group-text flex-grow-1" style="white-space:pre;">\
+					<%== maketext('for one <b>user</b>') =%>\
+				</span>
+			</div>
+			<div class="input-group input-group-sm mb-2">
+				<%= submit_button maketext('Change Password'),
+					name  => 'user_options',
+					class => 'btn btn-sm btn-secondary',
+					data  => { users_needed => 'exactly one', error_users => maketext($E_ONE_USER) } =%>
+				<span class="input-group-text flex-grow-1" style="white-space:pre;">\
+					<%== maketext('for one <b>user</b>') =%>\
+				</span>
+			</div>
+			<div class="input-group input-group-sm mb-2">
+				<%= submit_button maketext('Add'), name => 'add_users', class => 'btn btn-sm btn-secondary' =%>
+				<span class="input-group-text flex-grow-1" style="white-space:pre;">\
+					<%= maketext('new users') =%>\
+				</span>
+			</div>
+		</div>
+		<div class="col-xl-5 col-md-6 mb-2 font-sm">
+			<div class="input-group input-group-sm mb-2">
+				<%= submit_button maketext('View/Edit'),
+					name  => 'users_assigned_to_set',
+					class => 'btn btn-sm btn-secondary',
+					data  => { sets_needed => 'exactly one', error_sets => maketext($E_ONE_SET) } =%>
+				<span class="input-group-text flex-grow-1" style="white-space:pre;">\
+					<%== maketext('all users for one <b>set</b>') =%>
+				</span>
+			</div>
+			<div class="input-group input-group-sm mb-2">
+				<%= submit_button maketext('Edit'),
+					name  => 'edit_sets',
+					class => 'btn btn-sm btn-secondary',
+					data  => { sets_needed => 'exactly one', error_sets => maketext($E_ONE_SET) } =%>
+				<span class="input-group-text" style="white-space:pre;"><%== maketext('one <b>set</b>') =%></span>
+				<span class="input-group-text"><%= maketext('or') %></span>
+				<%= submit_button maketext('add problems'),
+					name  => 'prob_lib',
+					class => 'btn btn-sm btn-secondary',
+					data  => { sets_needed => 'exactly one', error_sets => maketext($E_ONE_SET) } =%>
+				<span class="input-group-text flex-grow-1" style="white-space:pre;">\
+					<%== maketext('to one <b>set</b>') =%>\
+				</span>
+			</div>
+			<div class="input-group input-group-sm mb-2">
+				<%= submit_button maketext('Statistics'),
+					name  => 'set_stats',
+					class => 'btn btn-sm btn-secondary',
+					data  => { sets_needed => 'exactly one', error_sets => maketext($E_ONE_SET) } =%>
+				<span class="input-group-text"><%= maketext('or') %></span>
+				<%= submit_button maketext('progress'),
+					name  => 'set_progress',
+					class => 'btn btn-sm btn-secondary',
+					data  => { sets_needed => 'exactly one', error_sets => maketext($E_ONE_SET) } =%>
+				<span class="input-group-text flex-grow-1" style="white-space:pre;">\
+					<%== maketext('for one <b>set</b>') =%>\
+				</span>
+			</div>
+			<div class="input-group input-group-sm mb-2">
+				<%= submit_button maketext('Score'),
+					name       => 'score_sets',
+					class      => 'btn btn-sm btn-secondary',
+					formaction => $c->systemLink(url_for 'instructor_scoring'),
+					data => { sets_needed => 'at least one', error_sets => maketext($E_MIN_ONE_SET) } =%>
+				<span class="input-group-text flex-grow-1" style="white-space:pre;">\
+					<%== maketext('selected <b>sets</b>') =%>\
+				</span>
+			</div>
+			<div class="input-group input-group-sm mb-2">
+				<%= submit_button maketext('Create'),
+					name  => 'create_set',
+					class => 'btn btn-sm btn-secondary',
+					data  => {
+						set_name_needed        => 'true',
+						error_set_name         => maketext($E_SET_NAME),
+						error_invalid_set_name => maketext($E_BAD_NAME)
+				   	} =%>
+				<%= label_for new_set_name => maketext('new set:'), class => 'input-group-text' =%>
+				<%= text_field new_set_name => '',
+					id          => 'new_set_name',
+					placeholder => maketext('Name for new set here'),
+					size        => 20,
+					class       => 'form-control form-control-sm',
+					dir         => 'ltr' =%>
+			</div>
+		</div>
+	</div>
+	<div class="row gx-3">
+		<div class="col-xl-4 col-md-6 offset-md-3">
+			<div class="input-group input-group-sm mb-2">
+				<%= submit_button maketext('Assign'),
+					# This name is the same as the name of the submit button in Assigner.pm and the form is
+					# directly submitted to that module without modification.
+					name       => 'assign',
+					class      => 'btn btn-sm btn-secondary',
+					formaction => $c->systemLink(url_for 'instructor_set_assigner'),
+					data => {
+						users_needed => 'at least one',
+						error_users  => maketext($E_MIN_ONE_USER),
+						sets_needed  => 'at least one',
+						error_sets   => maketext($E_MIN_ONE_SET)
+					} =%>
+				<span class="input-group-text flex-grow-1" style="white-space:pre;">\
+					<%== maketext('selected <b>users</b> to selected <b>sets</b>') =%>\
+				</span>
+			</div>
+			<div class="input-group input-group-sm mb-2">
+				<%= submit_button maketext('Act as'),
+					name  => 'act_as_user',
+					class => 'btn btn-sm btn-secondary',
+					data  => {
+						users_needed => 'exactly one',
+						error_users  => maketext($E_ONE_USER),
+						sets_needed  => 'at most one',
+						error_sets   => maketext($E_MAX_ONE_SET)
+					} =%>
+				<span class="input-group-text flex-grow-1" style="white-space:pre;">\
+					<%== maketext('one <b>user</b> (on one <b>set</b>)') =%>\
+				</span>
+			</div>
+			<div class="input-group input-group-sm mb-2">
+				<%= submit_button maketext('Edit'),
+					name  => 'edit_set_for_users',
+					class => 'btn btn-sm btn-secondary',
+					data  => {
+						users_needed => 'at least one',
+						error_users  => maketext($E_MIN_ONE_USER),
+						sets_needed  => 'exactly one',
+						error_sets   => maketext($E_ONE_SET)
+					} =%>
+				<span class="input-group-text flex-grow-1" style="white-space:pre;">\
+					<%== maketext('one <b>set</b> for <b>users</b>') =%>\
+				</span>
+			</div>
+			<div class="input-group input-group-sm mb-2">
+				<%= submit_button maketext('Email'), name => 'email_users', class => 'btn btn-sm btn-secondary' =%>
+				<span class="input-group-text flex-grow-1" style="white-space:pre;">\
+					<%= maketext('your students') =%>\
+				</span>
+			</div>
+			% if ($authz->hasPermissions(param('user'), 'manage_course_files')) {
+				<div class="input-group input-group-sm mb-2">
+					<%= submit_button maketext('Transfer'), name => 'transfer_files',
+						class => 'btn btn-sm btn-secondary' =%>
+					<span class="input-group-text flex-grow-1" style="white-space:pre;">\
+						<%= maketext('course files') =%>\
+					</span>
+				</div>
+			% }
+		</div>
+	</div>
+<% end =%>
diff --git a/templates/ContentGenerator/Instructor/LTIUpdate.html.ep b/templates/ContentGenerator/Instructor/LTIUpdate.html.ep
new file mode 100644
index 0000000000..c58bc6a677
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/LTIUpdate.html.ep
@@ -0,0 +1,86 @@
+% use WeBWorK::Utils(qw(format_set_name_display getAssetURL));
+%
+% # Only use javascript to update menus if using homework grade mode.
+% if ($ce->{LTIGradeMode} eq 'homework') {
+	% content_for js => begin
+		<%= javascript getAssetURL($ce, 'js/LTIUpdate/ltiupdate.js'), defer => undef =%>
+	% end
+% }
+%
+% unless ($authz->hasPermissions(param('user'), 'score_sets')) {
+	<div class="alert alert-danger p-1"><%= maketext('You are not authorized to update lti scores') %></div>
+	% last;
+% }
+%
+% unless ($ce->{LTIGradeMode}) {
+	<div class="alert alert-danger p-1"><%= maketext('LTI grade passback is not enabled for this course') %></div>
+	% last;
+% }
+%
+% my $updateInterval = $ce->{LTIMassUpdateInterval} // -1;
+%
+% # Status table
+<div class="table-responsive">
+	<table class="table table-bordered w-auto">
+		<tr><th><%= maketext('LTI Grade Mode') %></th><td><%= $ce->{LTIGradeMode} %></td></tr>
+		<tr>
+			<th><%= maketext('Update Interval') %></th>
+			<td><%= $updateInterval > -1 ? $c->format_interval($updateInterval) : maketext('Never') %></td>
+		</tr>
+		<tr>
+			<th><%= maketext('Last Full Update') %></th>
+			<td>
+				<%= $lastUpdate
+					? $c->formatDateTime($lastUpdate, 0, $ce->{studentDateDisplayFormat})
+					: maketext('Never') =%>
+			</td>
+		</tr>
+		% if ($updateInterval > -1) {
+			<tr>
+				<th><%= maketext('Next Update') %></th>
+				<td><%= $c->formatDateTime($lastUpdate + $updateInterval, 0, $ce->{studentDateDisplayFormat}) =%></td>
+			</tr>
+		% }
+	</table>
+</div>
+%
+<h2><%= maketext('Start LTI Grade Update') %></h2>
+<%= form_for current_route, method => 'POST', id => 'updateLTIForm', name => 'updateLTIForm', begin =%>
+	<div class="row mb-3">
+		<%= label_for updateUserID => maketext('Update user:'), class => 'col-auto col-form-label fw-bold' =%>
+		<div class="col-auto">
+			<%= select_field updateUserID => [
+					[
+						maketext('All Users') => '',
+						selected             => undef,
+						$ce->{LTIGradeMode} eq 'homework' ? (data => { sets => join(':', @$sets) }) : (),
+					],
+					$ce->{LTIGradeMode} eq 'homework'
+					? (map { [ $_ => $_, data => { sets => join(':', sort $db->listUserSets($_)) } ] } @$users)
+					: (@$users)
+				],
+				id => 'updateUserID', class => 'form-select' =%>
+		</div>
+	</div>
+	% if ($ce->{LTIGradeMode} eq 'homework') {
+		<div class="row mb-3">
+			<%= label_for updateSetID => maketext('Update set:'), class => 'col-auto col-form-label fw-bold' =%>
+			<div class="col-auto">
+				<%= select_field updateSetID => [
+						[
+							maketext('All Sets') => '',
+							selected             => undef,
+							data                 => { users => join(':', @$users) }
+						],
+						map { [
+							format_set_name_display($_) => $_,
+							data => { users => join(':', sort $db->listSetUsers($_)) }
+						] } @$sets
+					],
+					id => 'updateSetID', class => 'form-select' =%>
+			</div>
+		</div>
+	% }
+	<%= submit_button maketext('Update Grades'), id => 'updateLTI', name => 'updateLTI',
+		class => 'btn btn-primary mb-3' =%>
+<% end =%>
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep
new file mode 100644
index 0000000000..da3a010035
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep
@@ -0,0 +1,211 @@
+% use WeBWorK::Utils qw(not_blank x format_set_name_display getAssetURL);
+% use WeBWorK::HTML::CodeMirrorEditor
+	% qw(generate_codemirror_html generate_codemirror_controls_html output_codemirror_static_files);
+%
+% my $codemirrorMode = 'PG';
+% if ($c->{file_type}) {
+%	$codemirrorMode = 'htmlmixed' if ($c->{file_type} eq 'course_info');
+%	$codemirrorMode = 'xml'       if ($c->{file_type} eq 'hardcopy_theme');
+% }
+% content_for js => begin
+	<%= output_codemirror_static_files($c, $codemirrorMode) =%>
+	<%= javascript getAssetURL($ce, 'js/ActionTabs/actiontabs.js'),           defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/PGProblemEditor/pgproblemeditor.js'), defer => undef =%>
+% end
+%
+% unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
+	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to access instructor tools.') %></div>
+	% last;
+% }
+%
+% unless ($authz->hasPermissions(param('user'), 'modify_student_data')) {
+	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to modify problems.') %></div>
+	% last;
+% }
+%
+% if (stash('file_error')) {
+	<div class="alert alert-danger p-1 mb-0"><%= stash('file_error') %></div>
+	% last;
+% }
+%
+% my %titles = (
+	% blank_problem                => x('Editing <strong>new problem</strong> template "[_1]".'),
+	% set_header                   => x('Editing <strong>set header</strong> file "[_1]".'),
+	% hardcopy_header              => x('Editing <strong>hardcopy header</strong> file "[_1]".'),
+	% hardcopy_theme               => x('Editing <strong>hardcopy theme</strong> file "[_1]".'),
+	% course_info                  => x('Editing <strong>course information</strong> file "[_1]".'),
+	% ''                           => x('Editing <strong>unknown file type</strong> in file "[_1]".'),
+	% source_path_for_problem_file => x('Editing <strong>unassigned problem</strong> file "[_1]".')
+% );
+%
+% my $setName     = stash('setID')  // '';
+% my $fullSetName = $c->{fullSetID} // $setName;
+%
+% my $fileInfo = begin
+	<div class="mb-2">
+		<%= tag 'div', class => 'set-file-info' . ($c->isTempEditFilePath($c->{inputFilePath}) ? ' temporaryFile' : ''),
+			begin =%>
+			<i>
+				<%== $c->{file_type} eq 'problem'
+					? maketext(
+						'Editing <strong>problem [_1] of set [_2]</strong> in file "[_3]".',
+						$c->{prettyProblemNumber},
+						tag('span', dir => 'ltr', format_set_name_display($fullSetName)),
+						tag('span', dir => 'ltr', class => 'current-file',
+							data => { tmp_file => $c->shortPath($c->{tempFilePath}) },
+							$c->shortPath($c->{inputFilePath}))
+						)
+					: maketext(
+						$titles{ $c->{file_type} },
+						tag('span', dir => 'ltr', class => 'current-file',
+							data => { tmp_file => $c->shortPath($c->{tempFilePath}) },
+							$c->shortPath($c->{inputFilePath}))
+					) =%>
+			</i>
+		<% end =%>
+	</div>
+% end
+<%= $fileInfo->() %>
+%
+<%= form_for current_route, method => 'POST', id => 'editor', name => 'editor',
+   	enctype => 'application/x-www-form-urlencoded', class => 'col-12', begin =%>
+	<%= $c->hidden_authen_fields =%>
+	<%= hidden_field file_type => $c->{file_type} =%>
+	<%= hidden_field courseID => $c->{courseID} =%>
+	% if (defined $setName) {
+		<%= hidden_field hidden_set_id => $setName =%>
+	% }
+	% if (not_blank($c->{sourceFilePath})) {
+		<%= hidden_field sourceFilePath => $c->{sourceFilePath} =%>
+	% }
+	% if (($c->{file_type} eq 'problem' || $c->{file_type} eq 'source_path_for_problem_file')
+		% && not_blank($c->{editFilePath}))
+	% {
+		<%= hidden_field edit_file_path => $c->getRelativeSourceFilePath($c->{editFilePath}) =%>
+	% }
+	% if (not_blank($c->{tempFilePath})) {
+		<%= hidden_field temp_file_path => $c->{tempFilePath} =%>
+	% }
+	% if ($c->{file_type} eq 'hardcopy_theme') {
+		<%= hidden_field hardcopy_theme => param('hardcopy_theme') =%>
+	% }
+	%
+	% # PG problem authoring resource links
+	<div class="mb-2">
+		<%= link_to maketext('Sample Problems') => url_for('sample_problem_index'),
+			target => 'techniques_window',
+			title  => maketext('POD for macros and sample problem code and snippets'),
+			class  => 'reference-link btn btn-sm btn-info',
+			data   => { bs_toggle => 'tooltip', bs_placement => 'top' } =%>
+		% # http://webwork.maa.org/wiki/Category:MathObjects
+		<%= link_to maketext('Math Objects') => $ce->{webworkURLs}{MathObjectsHelpURL},
+			target => 'math_objects',
+			title  => maketext('Wiki summary page for MathObjects'),
+			class  => 'reference-link btn btn-sm btn-info',
+			data   => { bs_toggle => 'tooltip', bs_placement => 'top' } =%>
+		% # PG POD served locally
+		<%= link_to maketext('POD') => url_for('pod_index'),
+			target => 'pod_docs',
+			title  => maketext('Documentation from source code for PG modules and macro files.'),
+			class  => 'reference-link btn btn-sm btn-info',
+			data   => { bs_toggle => 'tooltip', bs_placement => 'top' } =%>
+		% # PGML lab problem rendered as an unattached problem in a new window.
+		% if (-e "$ce->{courseDirs}{templates}/PGMLLab/PGML-lab.pg") {
+			<%= link_to maketext('PGML') => $c->systemLink(
+					url_for('problem_detail', setID => 'Undefined_Set', problemID => 1),
+					params => {
+						displayMode    => $ce->{pg}{options}{displayMode},
+						problemSeed    => 1234,
+						editMode       => 'temporaryFile',
+						sourceFilePath => 'PGMLLab/PGML-lab.pg'
+					}
+				),
+				target => 'PGML',
+				title  => maketext(
+					'PG markdown syntax used to format WeBWorK questions. '
+					. 'This interactive lab can help you to learn the techniques.'
+				),
+				class  => 'reference-link btn btn-sm btn-info',
+				data   => { bs_toggle => 'tooltip', bs_placement => 'top' } =%>
+			% # http://webwork.maa.org/wiki/Category:Authors
+			<%= link_to maketext('Author Info') => $ce->{webworkURLs}{AuthorHelpURL},
+				target => 'author_info',
+				title  => maketext('Top level of author information on the wiki.'),
+				class  => 'reference-link btn btn-sm btn-info',
+				data   => { bs_toggle => 'tooltip', bs_placement => 'top' } =%>
+			% # Only show the report bugs in problem button if editing an OPL or Contrib problem.
+			% if ($c->{editFilePath} =~ m|^$ce->{courseDirs}{templates}/([^/]*)/| && ($1 eq 'Library' || $1 eq 'Contrib')) {
+				<%= link_to maketext('Report Bugs in this Problem') =>
+						"$ce->{webworkURLs}{bugReporter}?product=Problem%20libraries"
+						. "&component=$1&bug_file_loc=$c->{editFilePath}_with_problemSeed=$c->{problemSeed}",
+					target => 'bug_report',
+					title  => maketext(
+						'Report bugs in a WeBWorK question/problem using this link. '
+						. 'The very first time you do this you will need to register with an email address so that '
+						. 'information on the bug fix can be reported back to you.'
+					),
+					class  => 'reference-link btn btn-sm btn-info',
+					data   => { bs_toggle => 'tooltip', bs_placement => 'top' } =%>
+			% }
+		</div>
+	% }
+	<div class="row mb-2">
+		<div class="col-lg-6 col-md-12 order-last order-lg-first">
+			<%= generate_codemirror_html($c, 'problemContents', $problemContents, $codemirrorMode) =%>
+		</div>
+		<div class="col-lg-6 col-md-12 mb-lg-0 mb-2 order-first order-lg-last">
+			<div class="p-0" id="pgedit-render-area">
+				<div class="placeholder d-flex flex-column justify-content-center
+					 align-items-center bg-secondary h-100">
+					<div class="fs-1"><%= maketext('Loading...') %></div>
+					<i class="fa-solid fa-spinner fa-spin fa-2x"></i>
+				</div>
+			</div>
+		</div>
+	</div>
+	<%= generate_codemirror_controls_html($c) =%>
+	<%= $fileInfo->() %>
+	%
+	% # Output action forms
+	% my $default_choice;
+	%
+	% for my $actionID (@$formsToShow) {
+		% my $line_contents = include("ContentGenerator/Instructor/PGProblemEditor/${actionID}_form");
+		% my $active        = '';
+		% my $disabled =
+			% $actionID eq 'revert'
+			% && (!defined($c->{tempFilePath}) || !-e $c->{tempFilePath})
+			% && !$c->getBackupTimes ? ' disabled' : '';
+		%
+		% if (($line_contents && $line_contents ne '') || $actionID eq 'revert') {
+			% unless ($default_choice) { $active = ' active'; $default_choice = $actionID; }
+			% content_for 'tab-list' => begin
+				<li class="nav-item" role="presentation">
+					<%= link_to maketext($actionFormTitles->{$actionID}) => "#$actionID",
+						class           => "nav-link action-link$active$disabled",
+						id              => "$actionID-tab",
+						data            => { action => $actionID, bs_toggle => 'tab', bs_target => "#$actionID" },
+						role            => 'tab',
+						'aria-controls' => $actionID,
+						'aria-selected' => $active ? 'true' : 'false' =%>
+				</li>
+			% end
+			% content_for 'tab-content' => begin
+				<div class="tab-pane fade <%= $active ? "show$active" : '' %>"
+					id="<%= $actionID %>" role="tabpanel" aria-labelledby="<%= $actionID %>-tab">
+					<%= $line_contents %>
+				</div>
+			% end
+		% }
+	% }
+	%
+	<%= hidden_field action => $default_choice, id => 'current_action' =%>
+	<div>
+		<ul class="nav nav-tabs mb-2" role="tablist"><%= content 'tab-list' =%></ul>
+		<div class="tab-content"><%= content 'tab-content' %></div>
+	</div>
+	<div>
+		<%= submit_button maketext($actionFormTitles->{$default_choice}), name => 'submit', id => 'take_action',
+			class => 'btn btn-primary mb-2' =%>
+	</div>
+<% end =%>
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep
new file mode 100644
index 0000000000..b7cfc01d53
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep
@@ -0,0 +1,30 @@
+% last unless $c->{is_pg};
+%
+% my $allSetNames = [ map { $_->[0] =~ s/^set|\.def$//gr } $db->listGlobalSetsWhere({}, 'set_id') ];
+%
+<div>
+	<div class="row align-items-center mb-2">
+		<%= label_for action_add_problem_target_set_id => maketext('Add to what set?'),
+			class => 'col-form-label col-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.add_problem.target_set' => [
+					map { [
+						format_set_name_display($_) => $_, $_ eq ($c->{setID} // '') ? (selected => undef) : ()
+					] } @$allSetNames
+				],
+				id => 'action_add_problem_target_set_id', class => 'form-select form-select-sm d-inline w-auto',
+				dir => 'ltr' =%>
+		</div>
+	</div>
+	<div class="row align-items-center mb-2">
+		<%= label_for action_add_problem_file_type_id => maketext('Add as what filetype?'),
+			class => 'col-form-label col-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.add_problem.file_type' => [
+					map { [ $_ =~ s/_/ /gr => $_, $c->{file_type} eq $_ ? (selected => undef) : () ] }
+					('problem', 'set_header', 'hardcopy_header')
+				],
+				id => 'action_add_problem_file_type_id', class => 'form-select form-select-sm d-inline w-auto' =%>
+		</div>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep
new file mode 100644
index 0000000000..1caae96e65
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep
@@ -0,0 +1,67 @@
+% last unless $c->{is_pg};
+%
+<div>
+	<div class="row align-items-center">
+		<%= label_for action_hardcopy_seed_id => maketext('Using what seed?'),
+			class => 'col-form-label col-auto mb-2' =%>
+		<div class="col-auto mb-2">
+			<%= text_field 'action.hardcopy.seed' => value => $c->{problemSeed},
+				id => 'action_hardcopy_seed_id', class => 'form-control form-control-sm' =%>
+		</div>
+		<div class="col-auto mb-2">
+			<button id="randomize_hardcopy_seed_id" class="btn btn-info btn-sm" type="button">
+				<%= maketext('Randomize Seed') =%>
+			</button>
+		</div>
+	</div>
+	<div class="row align-items-center mb-2">
+		<%= label_for 'action_hardcopy_format_id' , class => 'col-form-label col-auto', begin =%>
+			<%= maketext('Using which hardcopy format?') =%>
+			<%= link_to '#',
+				class => 'help-popup',
+				data  => {
+					bs_content => maketext(
+						'If "PDF" is selected, then a PDF file will be generated for download, unless there are '
+							. 'errors.  If errors occur generating a PDF file or "TeX Source" is selected then a '
+							. 'zip file will be generated for download that contains the TeX source file and '
+							. 'resources needed for generating the PDF file using pdflatex.'
+					),
+					bs_placement => 'top',
+					bs_toggle    => 'popover'
+				},
+				role     => 'button',
+				tabindex => 0,
+				begin =%>
+				<i class="icon fas fa-question-circle" data-alt="<%= maketext('Help Icon') %>" aria-hidden="true">
+				</i>
+			<% end =%>
+		<% end =%>
+		<div class="col-auto">
+			<%= select_field 'action.hardcopy.format' => [
+					[ maketext('PDF') => 'pdf', selected => undef ],
+					[ maketext('TeX Source') => 'tex' ]
+				],
+				id    => 'action_hardcopy_format_id',
+				class => 'form-select form-select-sm d-inline w-auto' =%>
+		</div>
+	</div>
+	<div class="row align-items-center mb-2">
+		<%= label_for action_hardcopy_theme_id => maketext('Using which hardcopy theme?'),
+			class => 'col-form-label col-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.hardcopy.theme' => [
+					map { [
+						$hardcopyLabels->{$_} => $_,
+						$_ eq $c->ce->{hardcopyThemePGEditor} ? (selected => undef) : ()
+					] } @$hardcopyThemesAvailable
+				],
+				id    => 'action_hardcopy_theme_id',
+				class => 'form-select form-select-sm d-inline w-auto' =%>
+		</div>
+		<div class="col-auto">
+			<button id="edit_hardcopy_theme" class="btn btn-secondary p-1" type="submit">
+				<%= maketext('Edit Selected Theme') =%>
+			</button>
+		</div>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/pgtidy_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/pgtidy_form.html.ep
new file mode 100644
index 0000000000..66398f9e6a
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/pgtidy_form.html.ep
@@ -0,0 +1,5 @@
+% last unless $c->{is_pg};
+%
+<div class="row">
+	<p><%= maketext('Reformat the code using perltidy.') =%></p>
+</div>
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep
new file mode 100644
index 0000000000..e96f1f7d89
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep
@@ -0,0 +1,88 @@
+% if (!-r $c->{editFilePath}) {
+	<%== maketext(
+		'Error: The original file [_1] cannot be read.',
+		tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath}))
+	) =%>
+	% next;
+% }
+%
+% # Build list of backup files.
+% my $foundTempFile = defined($c->{tempFilePath}) && -e $c->{tempFilePath};
+% my @backupTimes   = $c->getBackupTimes;
+% if (@backupTimes) {
+	<div>
+		<div class="mb-2">
+			<%= maketext('Select action:') %>
+		</div>
+
+		<div class="form-check mb-2<%= $foundTempFile ? '' : ' d-none' %>" id="revert-to-tmp-container">
+			<%= radio_button 'action.revert.type' => 'revert', id => 'action_revert_type_revert_id',
+				checked => undef, class => 'form-check-input', $foundTempFile ? () : (disabled => undef) =%>
+			<%= label_for 'action_revert_type_revert_id', class => 'form-check-label', begin =%>
+				<%== maketext('Revert to [_1]', tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath}))) =%>
+			<% end =%>
+		</div>
+
+		<div class="row align-items-center mb-2">
+			<div class="col-auto">
+				% param('action.revert.type', 'backup')
+					% if !$foundTempFile && (!param('action.revert.type') || param('action.revert.type') eq 'revert');
+				<%= radio_button 'action.revert.type' => 'backup', id => 'action_revert_type_backup_id',
+					class => 'form-check-input' =%>
+				<%= label_for 'action_revert_type_backup_id', class => 'form-check-label ms-2', begin =%>
+					<%= scalar(@backupTimes) == 1
+						? maketext(
+							'Restore backup from [_1]',
+							$c->formatDateTime($backupTimes[0], undef, $ce->{studentDateDisplayFormat})
+						) : maketext('Restore backup from') =%>
+				<% end =%>
+			</div>
+			% if (scalar(@backupTimes) == 1) {
+				<%= hidden_field 'action.revert.backup.time' => $backupTimes[0] =%>
+			% } else {
+				<div class="col-auto">
+					<%= select_field 'action.revert.backup.time' => [
+						map { [ $c->formatDateTime($_, undef, $ce->{studentDateDisplayFormat}) => $_ ] } @backupTimes
+					],
+					id    => 'action_revert_backup_time_id',
+					class => 'form-select form-select-sm d-inline w-auto' =%>
+				</div>
+			% }
+		</div>
+
+		<div class="row align-items-center mb-2">
+			<div class="col-auto">
+				<%= radio_button 'action.revert.type' => 'delete', id => 'action_revert_type_delete_id',
+					class => 'form-check-input' =%>
+				<%= label_for "action_revert_type_delete_id", class => 'form-check-label ms-2', begin =%>
+					<%= scalar(@backupTimes) == 1
+						? maketext(
+							'Delete backup from [_1]',
+							$c->formatDateTime($backupTimes[0], undef, $ce->{studentDateDisplayFormat})
+						) : maketext('Delete backup from') =%>
+				<% end =%>
+			</div>
+			% if (scalar(@backupTimes) == 1) {
+				<%= hidden_field 'action.revert.delete.time' => $backupTimes[0] =%>
+			% } else {
+				<div class="col-auto">
+					<%= select_field 'action.revert.delete.time' => [
+						map { [ $c->formatDateTime($_, undef, $ce->{studentDateDisplayFormat}) => $_ ] } @backupTimes
+					],
+					id    => 'action_revert_delete_number_id',
+					class => 'form-select form-select-sm d-inline w-auto' =%>
+				</div>
+			% }
+		</div>
+	</div>
+% } else {
+	<div class="mb-2<%= $foundTempFile ? '' : ' d-none' %>" id="revert-to-tmp-container">
+		<%== maketext('Revert to [_1]', tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath}))) =%>
+		<%= hidden_field 'action.revert.type' => 'revert', id => 'action_revert_type_revert_id',
+			$foundTempFile ? () : (disabled => undef) =%>
+	</div>
+	<div class="mb-2 d-none" id="show-backups-comment">
+		<%== maketext('Reload the page to see backup files that have been made.') =%>
+	</div>
+
+% }
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep
new file mode 100644
index 0000000000..1124a54f58
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep
@@ -0,0 +1,87 @@
+% use File::Basename qw(dirname);
+%
+% use WeBWorK::Utils qw(jitar_id_to_seq not_blank format_set_name_display);
+%
+% # Don't show the save as form when editing an existing course info file.
+% last if $c->{file_type} eq 'course_info' && -e $c->{editFilePath};
+%
+% my $isBlank         = $c->{file_type} eq 'blank_problem';
+% my $isHardcopyTheme = $c->{file_type} eq 'hardcopy_theme';
+% my $templatesDir    = $ce->{courseDirs}{templates};
+% my $shortFilePath   = $isBlank         ? 'newProblem.pg' : $c->{editFilePath} =~ s|^$templatesDir/||r;
+% $shortFilePath      = $isHardcopyTheme ? 'hardcopyThemes/' . ($c->{editFilePath} =~ s|^.*\/||r) : $shortFilePath;
+%
+% # Suggest that modifications be saved to the "local" subdirectory if its not in a writeable directory
+% $shortFilePath = "local/$shortFilePath" unless $isBlank || $isHardcopyTheme || -w dirname($c->{editFilePath});
+%
+% # If it is an absolute path make it relative.
+% $shortFilePath =~ s|^/*|| if $shortFilePath =~ m|^/|;
+%
+% my $probNum = $c->{file_type} eq 'problem' ? $c->{problemID} : 'header';
+%
+% # Don't add or replace problems to sets if the set is the Undefined_Set or if the problem is the blank_problem.
+% my $can_add_problem_to_set =
+	% not_blank($c->{setID}) && $c->{setID} ne 'Undefined_Set' && $c->{file_type} ne 'blank_problem';
+%
+% my $prettyProbNum = $probNum;
+% if ($c->{setID}) {
+	% my $set = $db->getGlobalSet($c->{setID});
+	% $prettyProbNum = join('.', jitar_id_to_seq($probNum))
+		% if ($c->{file_type} eq 'problem' && $set && $set->assignment_type eq 'jitar');
+% }
+%
+<div>
+	<div class="row align-items-center mb-2">
+		<%= label_for action_save_as_target_file_id => maketext('Save file to:'),
+			class => 'col-form-label col-auto' =%>
+		<div class="col-auto d-inline-flex" dir="ltr">
+			<div class="editor-save-path input-group input-group-sm">
+				<%= label_for action_save_as_target_file_id => '[TMPL]/', class => 'input-group-text' =%>
+				<%= text_field 'action.save_as.target_file' => $shortFilePath,
+					id => 'action_save_as_target_file_id', class => 'form-control form-control-sm',
+					size => 60, dir  => 'ltr',
+					# Don't allow changing the file name for course info files.
+					# The filename needs to be what is set in the course environment.
+					$c->{file_type} eq 'course_info' ? (readonly => undef) : () =%>
+			</div>
+		</div>
+		<%= hidden_field 'action.save_as.source_file' => $c->{editFilePath} =%>
+		<%= hidden_field 'action.save_as.file_type' => $c->{file_type} =%>
+	</div>
+	% if ($can_add_problem_to_set) {
+		<div class="form-check">
+			<%= radio_button 'action.save_as.saveMode' => 'rename', id => 'action_save_as_saveMode_rename_id',
+				checked => undef, class   => 'form-check-input' =%>
+			<%= label_for 'action_save_as_saveMode_rename_id', class => 'form-check-label', begin =%>
+				<%== maketext('Replace current problem: [_1]',
+					tag(
+						'strong',
+						c(
+							tag('span', dir => 'ltr', format_set_name_display($c->{fullSetID})),
+							"/$prettyProbNum"
+						)->join('')
+					)
+				) =%>
+			<% end =%>
+		</div>
+		<div class="form-check">
+			<%= radio_button 'action.save_as.saveMode' => 'add_to_set_as_new_problem',
+				id => 'action_save_as_saveMode_new_problem_id', class => 'form-check-input' =%>
+			<%= label_for 'action_save_as_saveMode_new_problem_id', class => 'form-check-label', begin =%>
+				<%== maketext(
+					'Append to end of [_1] set',
+					tag('strong', dir => 'ltr', format_set_name_display($c->{fullSetID}))
+				) =%>
+			<% end =%>
+		</div>
+	% }
+	% if ($c->{is_pg}) {
+		<div class="form-check">
+			<%= radio_button 'action.save_as.saveMode' => 'new_independent_problem',
+				id => 'action_save_as_saveMode_independent_problem_id', class => 'form-check-input',
+				$can_add_problem_to_set ? () : (checked => undef) =%>
+			<%= label_for action_save_as_saveMode_independent_problem_id => maketext('Create unattached problem'),
+				class => 'form-check-label' =%>
+		</div>
+	% }
+</div>
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep
new file mode 100644
index 0000000000..19040d3fac
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep
@@ -0,0 +1,33 @@
+% # Can't save blank problems without changing names, and can't save if lacking write permissions.
+% last unless $c->{file_type} ne 'blank_problem' && $c->{editFilePath} !~ /newProblem\.pg$/ && -w $c->{editFilePath};
+%
+<div>
+	<div class="mb-2">
+		<%== maketext('Save to [_1] and View', tag('b', dir => 'ltr', $c->shortPath($c->{editFilePath}))) =%>
+	</div>
+	% unless ($c->{file_type} eq 'hardcopy_theme') {
+		<div class="form-check mb-2">
+			<%= check_box newWindowSave => 1, id => 'newWindowSave', class => 'form-check-input',
+				$c->{file_type} eq 'hardcopy_header' ? (checked => undef) : () =%>
+			<%= label_for newWindowSave => maketext('Open in new window'), class => 'form-check-label' =%>
+		</div>
+	% }
+	<%= hidden_field 'action.save.source_file' => $c->{editFilePath} =%>
+
+	% # Backup options
+	<div class="form-check mb-2">
+		% param('backupFile', 1) unless defined param('backupFile');
+		<%= check_box backupFile => 1, id => 'backupFile', class => 'form-check-input' =%>
+		<%= hidden_field backupFile => 0 =%>
+		<%= label_for backupFile => maketext('Create backup'), class => 'form-check-label' =%>
+	</div>
+
+	% # Show option to delete oldest backup if it exists.
+	% my @backupTimes = $c->getBackupTimes;
+	% if (@backupTimes) {
+		<div class="form-check mb-2">
+			<%= check_box deleteBackup => 1, id => 'deleteBackup', class => 'form-check-input' =%>
+			<%= label_for deleteBackup => maketext('Delete oldest backup'), class => 'form-check-label' =%>
+		</div>
+	% }
+</div>
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep
new file mode 100644
index 0000000000..3af03f728c
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep
@@ -0,0 +1,37 @@
+% # Hardcopy headers are previewed from the hardcopy generation tab.
+% last if $c->{file_type} eq 'hardcopy_header';
+%
+<div>
+	% if ($c->{is_pg}) {
+		<div class="row align-items-center">
+			<%= label_for action_view_seed_id => maketext('Using what seed?'), class => 'col-form-label col-auto mb-2' =%>
+			<div class="col-auto mb-2">
+				<%= text_field 'action.view.seed' => $c->{problemSeed},
+					id => 'action_view_seed_id', class => 'form-control form-control-sm' =%>
+			</div>
+			<div class="col-auto mb-2">
+				<button id="randomize_view_seed_id" class="btn btn-info btn-sm" type="button">
+					<%= maketext('Randomize Seed') =%>
+				</button>
+			</div>
+		</div>
+		<div class="row align-items-center mb-2">
+			<%= label_for action_view_displayMode_id => maketext('Using what display mode?'),
+				class => 'col-form-label col-auto' =%>
+			<div class="col-auto">
+				<%= select_field 'action.view.displayMode' => [
+					map { [ $_ => $_, $_ eq $c->{displayMode} ? (selected => undef) : () ] }
+						@{ $ce->{pg}{displayModes}}, @{ $ce->{pg}{additionalPGEditorDisplayModes}}
+				], id => 'action_view_displayMode_id', class => 'form-select form-select-sm d-inline w-auto' =%>
+			</div>
+		</div>
+	% }
+	% unless ($c->{file_type} eq 'hardcopy_theme') {
+		<div class="row g-0 mb-2">
+			<div class="form-check mb-2">
+				<%= check_box 'newWindowView' => 1, id => 'newWindowView', class => 'form-check-input' =%>
+				<%= label_for newWindowView => maketext('Open in new window'), class => 'form-check-label' =%>
+			</div>
+		</div>
+	% }
+</div>
diff --git a/templates/ContentGenerator/Instructor/ProblemGrader.html.ep b/templates/ContentGenerator/Instructor/ProblemGrader.html.ep
new file mode 100644
index 0000000000..02bb350096
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemGrader.html.ep
@@ -0,0 +1,244 @@
+% use WeBWorK::Utils qw(sortByName wwRound getAssetURL);
+% use WeBWorK::PG;
+%
+% content_for js => begin
+	<%= javascript getAssetURL($ce, 'js/SelectAll/selectall.js'), defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/RenderProblem/renderproblem.js'), defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/ProblemGrader/problemgrader.js'), defer => undef =%>
+	<%= javascript getAssetURL($ce, 'node_modules/iframe-resizer/js/iframeResizer.min.js') =%>
+	<%= javascript getAssetURL($ce, 'js/Essay/essay.js'), defer => undef =%>
+	% if ($ce->{pg}{specialPGEnvironmentVars}{entryAssist} eq 'MathQuill') {
+		<%= javascript getAssetURL($ce, 'node_modules/mathquill/dist/mathquill.js'), defer => undef =%>
+		<%= javascript getAssetURL($ce, 'js/MathQuill/mqeditor.js'), defer => undef =%>
+	% } elsif ($ce->{pg}{specialPGEnvironmentVars}{entryAssist} eq 'MathView') {
+		<%= javascript getAssetURL($ce, "js/MathView/$ce->{pg}{options}{mathViewLocale}"), defer => undef =%>
+		<%= javascript getAssetURL($ce, 'js/MathView/mathview.js'), defer => undef =%>
+	% }
+% end
+%
+% content_for css => begin
+	<%= stylesheet getAssetURL($ce, 'js/Problem/problem.css') =%>
+	% if ($ce->{pg}{specialPGEnvironmentVars}{entryAssist} eq 'MathQuill') {
+		<%= stylesheet getAssetURL($ce, 'node_modules/mathquill/dist/mathquill.css') =%>
+		<%= stylesheet getAssetURL($ce, 'js/MathQuill/mqeditor.css') =%>
+	% } elsif ($ce->{pg}{specialPGEnvironmentVars}{entryAssist} eq 'MathView') {
+		<%= stylesheet getAssetURL($ce, 'js/MathView/mathview.css') =%>
+	% }
+% end
+%
+% unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
+	<div class="alert alert-danger p-1 mb-0">
+		<%= maketext('You are not authorized to access instructor tools.') =%>
+	</div>
+	% last;
+% }
+%
+% unless ($authz->hasPermissions(param('user'), 'score_sets')) {
+	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to grade homework sets.') %></div>
+	% last;
+% }
+%
+% unless ($set && $problem) {
+	<div class="alert alert-danger p-1 mb-0"><%= maketext('This set or problem is not valid.') =%></div>
+	% last;
+% }
+%
+% unless (@$users) {
+	<div class="alert alert-danger p-1 mb-0">
+		% if ($set->assignment_type =~ /gateway/) {
+			<%= maketext('There are no completed versions of this test.') =%>
+		% } else {
+			<%= maketext('This set is not assigned to any students.') =%>
+		% }
+	</div>
+	% last;
+% }
+%
+<div class="rpc_render_area_container my-3 p-2 border rounded">
+	<div id="problem_render_area" class="rpc_render_area"></div>
+	<div class="col-12 flex-wrap">
+		<div class="input-group d-inline-flex flex-nowrap w-auto py-1 me-sm-3">
+			<%= label_for selected_student => maketext('Showing problem for:'), class => 'input-group-text' =%>
+			<%= select_field student_selector => [
+					map {
+						my $user = $_;
+						map { [
+							($user->{displayName}
+								. (
+									ref($_->{problem}) =~ /::ProblemVersion/
+									? maketext(' (version [_1])', $_->{problem}->version_id)
+									: ''
+								)
+							) => $user->user_id,
+							data => {
+								source_file  => $_->{problem}->source_file || $problem->source_file,
+								problem_seed => $_->{problem}->problem_seed,
+								last_answer  => $_->{problem}->last_answer,
+								ref($_->{problem}) =~ /::ProblemVersion/
+									? (
+										version_id    => $_->{problem}->version_id,
+										answer_prefix => sprintf('Q%04d_', $_->{problemNumber} + 1)
+									)
+									: (),
+							}
+						] } @{ $user->{data} }
+					} @$users
+				],
+				id => 'student_selector', class => 'form-select' =%>
+		</div>
+		<div class="input-group d-inline-flex flex-nowrap w-auto py-1">
+			<%= label_for problem_displaymode => maketext('Display Mode:'), class => 'input-group-text' =%>
+			<%= select_field 'problem_displaymode' => [
+					grep { exists WeBWorK::PG::DISPLAY_MODES()->{$_} } @{ $ce->{pg}{displayModes} }
+				],
+				id => 'problem_displaymode', class => 'form-select' =%>
+		</div>
+	</div>
+</div>
+%
+<%= form_for current_route, method => 'POST', id => 'problem-grader-form', name => 'problem-grader-form', begin =%>
+	<%= hidden_field hidden_course_id => $courseID =%>
+	<%= hidden_field hidden_set_id => $set->set_id =%>
+	<%= hidden_field hidden_problem_id => $problem->problem_id =%>
+	<%= hidden_field hidden_language => $ce->{language} =%>
+	<div class="table-responsive">
+		% my $problemNeedsGrading = 0;
+		<table class="table table-sm table-bordered caption-top">
+			<thead>
+				<tr>
+					% if ($haveSections) {
+						<th><%= maketext('Section') %></th>
+					% }
+					<th>
+						<div><%= maketext('Name') %></div>
+						% if ($set->assignment_type =~ /gateway/) {
+							<div><%= maketext('Version') %></div>
+						% }
+					</th>
+					<th><%= maketext('Latest Answers') %></th>
+					<th id="mark-all-correct-header" class="text-center">
+						<%= label_for 'select-all' => maketext('Mark Correct') =%>
+						<br>
+						<%= check_box 'select-all' => 'on', id => 'select-all', class => 'select-all form-check-input',
+							data => { select_group => 'mark_correct' } =%>
+					</th>
+					<th id="score-header"><%= maketext('Score (%)') %></th>
+					<th id="comment-header"><%= maketext('Comment') %></th>
+				</tr>
+			</thead>
+			<tbody>
+				% for my $user (@$users) {
+					% my $userID = $user->user_id;
+					%
+					% for (@{ $user->{data} }) {
+						% next unless defined $_->{problem};
+						% my $versionID = ref($_->{problem}) =~ /::ProblemVersion/ ? $_->{problem}->version_id : 0;
+						% my @answerTypes = split(',', $_->{problem}->flags =~ s/:needs_grading$//r);
+						% my $problemLink;
+						% if ($versionID) {
+							% $problemLink = $c->systemLink(
+								% url_for('gateway_quiz', setID => "$setID,v$versionID"),
+								% params => {
+									% effectiveUser     => $userID,
+									% currentPage       => $_->{pageNumber},
+									% showProblemGrader => 1
+								% }
+							% )->fragment("prob$_->{problemNumber}");
+						% } else {
+							% $problemLink = $c->systemLink(
+								% url_for('problem_detail'),
+								% params => { effectiveUser => $userID, showProblemGrader => 1 }
+							% )->fragment('problem_body');
+						% }
+						<tr>
+							% if ($haveSections) {
+								<td class="text-center restricted-width-col"><%= $user->section %></td>
+							% }
+							% $problemNeedsGrading = 1 if $_->{problem}->flags =~ /:needs_grading$/;
+							<td class="<%= $_->{problem}->flags =~ /:needs_grading$/ ? 'needs-grading' : ''%>">
+								<%= link_to $problemLink, target => 'WW_View', begin =%>
+									<div class="<%= $ce->status_abbrev_to_name($user->status) || '' %>">
+										<%= $user->{displayName} =%>
+									</div>
+									% if ($versionID) {
+										<div><%= maketext('(version [_1])', $versionID) =%></div>
+									% }
+								<% end =%>
+							</td>
+							<td class="problem-answers"
+								data-source-file="<%= $_->{problem}->source_file || $problem->source_file %>">
+								% if (defined $_->{past_answer} ) {
+									% my @scores  = split(//,   $_->{past_answer}->scores);
+									% my @answers = split(/\t/, $_->{past_answer}->answer_string);
+									%
+									% for (my $i = 0; $i <= $#answers; $i++) {
+										% # Color the answer if it is not an essay answer.
+										<div class="past-answer"
+											 style="<%= $answerTypes[$i] && $answerTypes[$i] eq 'essay'
+													? ''
+													: $scores[$i] ? 'color:#060' : 'color:#600' %>">
+											% if ($answerTypes[$i] && $answerTypes[$i] eq 'essay') {
+												% # If the answer is an essay answer then display it line by line.
+												<div class="past-answer">
+													<%= c(split /\n/, $answers[$i])->join('<br>') =%>
+												</div>
+											% } elsif ($answerTypes[$i] && $answerTypes[$i] eq 'Value (Formula)') {
+												% # If its a formula then mark it as tex for MathJax.
+												`<%= $answers[$i] %>`
+												</div>
+											% } else {
+												% # If it isn't an essay or a formula then show it as text.
+												<%= $answers[$i] %>
+											% }
+										</div>
+									% }
+								% } else {
+									<%= 'There are no answers for this student.' =%>
+								% }
+							</td>
+							<td class="text-center restricted-width-col">
+								% param("$userID.$versionID.mark_correct", undef);
+								<%= check_box "$userID.$versionID.mark_correct" => '1',
+									class             => 'mark_correct form-check-input',
+									'aria-labelledby' => 'mark-all-correct-header' =%>
+							</td>
+							<td class="restricted-width-col">
+								% param("$userID.$versionID.score", undef);
+								<%= number_field "$userID.$versionID.score" =>
+										wwRound(0, $_->{problem}->status * 100),
+									class => 'score-selector form-control form-control-sm restricted-width-col',
+									style => 'width:6.5rem;', min => 0, max => 100, autocomplete => 'off',
+									'aria-labelledby' => 'score-header' =%>
+							</td>
+							<td class="grader-comment-column">
+								% if (defined $_->{past_answer}) {
+									<%= text_area "$userID.$versionID.comment" => $_->{past_answer}->comment_string,
+										id => "${userID}_${versionID}_comment",
+										rows  => 3, class => 'form-control latexentryfield',
+										'aria-labelledby' => 'comment-header' =%>
+									<%= hidden_field "MaThQuIlL_${userID}_${versionID}_comment" => '',
+										id => "MaThQuIlL_${userID}_${versionID}_comment",
+										data => { eqn_editor_btn_after => 'true' } =%>
+								% }
+							</td>
+						</tr>
+					% }
+				% }
+			</tbody>
+		</table>
+		% if ($problemNeedsGrading) {
+			<div class='mb-3'>
+				<span class='needs-grading fw-bold p-2'><%= maketext('Name') %></span>
+				\( = \)
+				<%= maketext('Problem has an essay answer that needs to be graded.') =%>
+			</div>
+		% }
+		<div id="alt-source-key" class='mb-3 d-none'>
+			<span class='alt-source p-2'><%= maketext('Latest Answers') %></span>
+			\( = \)
+			<%= maketext('Problem has a different source file than the currently rendered problem.') =%>
+		</div>
+	</div>
+	<%= $c->hidden_authen_fields =%>
+	<%= submit_button maketext('Save'), name => 'assignGrades', class => 'btn btn-primary mb-2' =%>
+<% end =%>
diff --git a/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep b/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep
new file mode 100644
index 0000000000..07564beee5
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep
@@ -0,0 +1,24 @@
+% use WeBWorK::Utils qw(jitar_id_to_seq);
+%
+% unless ($set
+	% && $authz->hasPermissions(param('user'), 'access_instructor_tools')
+   	% && $authz->hasPermissions(param('user'), 'score_sets'))
+% {
+	% last;
+% }
+%
+<div class="info-box" id="fisheye">
+	<h2><%= maketext('Problems') %></h2>
+	<ul class="nav flex-column problem-list">
+		% for (map { $_->[1] } $db->listGlobalProblemsWhere({ set_id => $set->set_id }, 'problem_id')) {
+			<li class="nav-item">
+				<%= tag 'a',
+					$_ eq $problem->problem_id
+					? (class => 'nav-link active')
+					: (href => $c->systemLink(url_for(current_route, problemID => $_)), class => 'nav-link'),
+					maketext('Problem [_1]', $set->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)) : $_)
+				=%>
+			</li>
+		% }
+	</ul>
+</div>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep b/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep
new file mode 100644
index 0000000000..fab3fcc01c
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep
@@ -0,0 +1,699 @@
+% use WeBWorK::Utils
+	% qw(sortByName listFilesRecursive jitar_id_to_seq seq_to_jitar_id format_set_name_display getAssetURL),
+	% qw(getTestProblemPosition);
+%
+% content_for css => begin
+	<%= stylesheet getAssetURL($ce, 'node_modules/flatpickr/dist/flatpickr.min.css') =%>
+	<%= stylesheet getAssetURL($ce, 'node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.css') =%>
+% end
+%
+% content_for js => begin
+	<%= javascript getAssetURL($ce, 'node_modules/luxon/build/global/luxon.min.js'), defer => undef =%>
+	<%= javascript getAssetURL($ce, 'node_modules/flatpickr/dist/flatpickr.min.js'), defer => undef =%>
+	% if ($ce->{language} !~ /^en/) {
+		<%= javascript
+			getAssetURL($ce, 'node_modules/flatpickr/dist/l10n/' . ($ce->{language} =~ s/^(..).*/$1/gr) . '.js'),
+			defer => undef =%>
+	% }
+	<%= javascript getAssetURL($ce, 'node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.js'),
+		defer => undef =%>
+	<%= javascript getAssetURL($ce, 'node_modules/shortcut-buttons-flatpickr/dist/shortcut-buttons-flatpickr.min.js'),
+		defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/DatePicker/datepicker.js'), defer => undef =%>
+	<%= javascript getAssetURL($ce, 'node_modules/sortablejs/Sortable.min.js'), defer => undef =%>
+	<%= javascript getAssetURL($ce, 'node_modules/iframe-resizer/js/iframeResizer.min.js') =%>
+	<%= javascript getAssetURL($ce, 'js/RenderProblem/renderproblem.js'), defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/ProblemSetDetail/problemsetdetail.js'), defer => undef =%>
+% end
+%
+% unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
+	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to access instructor tools.') %></div>
+	% last;
+% }
+%
+% unless ($authz->hasPermissions(param('user'), 'modify_problem_sets')) {
+	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to modify problems.') %></div>
+	% last;
+% }
+%
+% my @editForUser = param('editForUser');
+%
+% if ($editingSetVersion && @editForUser != 1) {
+	<div class="alert alert-danger p-1 mb-0">
+		<%= maketext('Versions of a set can only be edited for one user at a time.') =%>
+	</div>
+	% last;
+% }
+%
+% unless ($setRecord) {
+	<div class="alert alert-danger p-1 mb-0"><%= maketext('No record for global set [_1].', $setID) =%></div>
+	% last;
+% }
+%
+% # Creates two separate tables, first of the headers, and then of the problems in a given set.
+% # If one or more users are specified in the "editForUser" param, only the data for those users
+% # becomes editable, not all the data.
+%
+% my $isGatewaySet = $setRecord->assignment_type =~ /gateway/;
+% my $isJitarSet   = $setRecord->assignment_type eq 'jitar';
+% my $userToShow   = @editForUser ? $editForUser[0] : param('user');
+%
+% if (stash('forUsers')) {
+	% if (@editForUser && @$unassignedUsers) {
+		<div class="alert alert-danger p-1 mb-2">
+			<%== maketext(
+				'The following users are NOT assigned to this set and will be ignored: [_1]',
+				tag('b', join(', ', @$unassignedUsers))
+			) =%>
+		</div>
+	% } elsif (!@editForUser) {
+		<div class="alert alert-danger p-1 mb-2">
+			<%== maketext(
+				'None of the selected users are assigned to this set: [_1]',
+				tag('b', join(', ', @$unassignedUsers))
+			) =%>
+		</div>
+		<div class="alert alert-danger p-1 mb-2">
+			<%= maketext('Global set data will be shown instead of user specific data') =%>
+		</div>
+	% }
+	%
+	% my $setDetailPage = url_for(setID => $setID);
+	%
+	% # Calculate links for the users being edited.
+	% my $userLinks = c;
+	% for my $userID (@editForUser) {
+		% my $user = $db->getUser($userID);
+		% my $line = begin
+			<span>
+				<%= $user->last_name %>, <%= $user->first_name %>
+				(<%= link_to $user->user_id => 'mailto:' . $user->email_address %>).
+			</span>
+			% if (!$editingSetVersion) {
+				<%== maketext(
+					'Assigned to [_1].',
+					link_to(
+						$c->setCountMessage($db->countUserSets($user->user_id), $db->countGlobalSets) =>
+							$c->systemLink(url_for('instructor_user_detail', userID => $user->user_id))
+					)
+				) =%>
+			% } else {
+				<%== maketext(
+					'Edit set [_1] for this user.',
+					link_to(
+						$setID => $c->systemLink(
+							$setDetailPage, params => { effectiveUser => $user->user_id, editForUser => $user->user_id }
+						)
+					)
+				) =%>
+			% }
+		% end
+		% push @$userLinks, $line->();
+	% }
+	% @$userLinks = sort @$userLinks;
+	%
+	<div class="border border-dark mb-2 rounded">
+		<div class="row p-2 align-items-center">
+			<div class="col-md-6">
+				<%== maketext(
+					'Editing problem set [_1] for these students: [_2]',
+					tag(
+						'strong',
+						dir => 'ltr',
+						format_set_name_display($setID . ($editingSetVersion ? ",v$editingSetVersion" : ''))
+					),
+					c(
+						tag('br'),
+						tag('strong', $userLinks->join(tag('br')))
+					)->join('')
+				) =%>
+			</div>
+			<div class="col-md-6 mt-md-0 mt-2">
+				<%= link_to $c->systemLink($setDetailPage), begin =%>
+					<%== maketext(
+							'Edit set [_1] for ALL students assigned to this set.',
+							tag('strong', dir => 'ltr', format_set_name_display($setID))
+						) => $c->systemLink($setDetailPage) =%>
+				<% end =%>
+				% # Handy messages when editing gateway sets.
+				% if ($isGatewaySet && !$editingSetVersion) {
+					<br>
+					<em>
+						<%= maketext(
+							'To edit a specific student version of this set, edit (all of) her/his assigned sets.') =%>
+					</em>
+				% }
+			</div>
+		</div>
+	</div>
+% } else {
+	<div class="border border-dark mb-2 rounded">
+		<div class="row p-2 align-items-center">
+			<div class="col-md-6">
+				<%== maketext(
+					'This set [_1] is assigned to [_2].',
+					tag('strong', dir => 'ltr', format_set_name_display($setID)),
+					$c->userCountMessage($db->countSetUsers($setID), $db->countUsers)
+				) =%>
+			</div>
+			<div class="col-md-6 mt-md-0 mt-2">
+				<%== maketext(
+					'Edit [_1] for set [_2].',
+					link_to(maketext('individual user settings') =>
+						$c->systemLink(url_for 'instructor_users_assigned_to_set')),
+					tag('span', dir => 'ltr', format_set_name_display($setID))
+				) =%>
+			</div>
+		</div>
+	</div>
+% }
+%
+<div class="mb-2 fw-bold">
+	% if (@editForUser) {
+		<%= maketext('Any changes made below will be reflected in the set for ONLY the student(s) listed above.') =%>
+	% } else {
+		<%= maketext('Any changes made below will be reflected in the set for ALL students.') =%>
+	% }
+</div>
+%
+<%= form_for current_route, method => 'POST', id => 'problem_set_form', name => 'problem_set_form', begin =%>
+	%
+	% for (@editForUser) {
+		<%= hidden_field editForUser => $_ =%>
+	% }
+	<%= $c->hidden_authen_fields =%>
+	<%= hidden_field hidden_course_id => $courseID =%>
+	<%= hidden_field setID => $setID, id => 'hidden_set_id' =%>
+	% if ($editingSetVersion) {
+		<%= hidden_field versionID => $editingSetVersion, id => 'hidden_version_id' =%>
+	% }
+	% # Add the course language in a hidden input so that the javascript can get this information.
+	<%= hidden_field hidden_language => $ce->{language} =%>
+	%
+	<div class="my-3 submit-buttons-container">
+		<%= submit_button maketext('Save Changes'), name => 'submit_changes', class => 'btn btn-primary' =%>
+		<%= submit_button maketext('Reset Form'), name => 'undo_changes', class => 'btn btn-primary' =%>
+	</div>
+	%
+	% # General set information
+	<div class="card mb-2 border border-dark" style="width:fit-content">
+		<div class="card-body p-2">
+			<div class="card-title fw-bold"><%= maketext('Set Parameters') %></div>
+			<div class="card-text">
+				<%= $c->fieldTable($userToShow, $setID, undef, $setRecord,
+				   	$editingSetVersion
+					? $db->getSetVersion($userToShow, $setID, $editingSetVersion)
+					: $db->getUserSet($userToShow, $setID)) =%>
+			</div>
+		</div>
+	</div>
+	%
+	% # Set description
+	<div class="mb-2">
+		% if (@editForUser == 1) {
+			<h2 class="fw-bold fs-4"><%= maketext('Set Description') %></h2>
+			<%= hidden_field "set.$setID.description" => $setRecord->description, id => "set.$setID.description" =%>
+			<%= $setRecord->description || maketext('No Description') =%>
+		% } else {
+			<%= label_for "set.$setID.description" => maketext('Set Description'),
+				class => 'form-label fw-bold fs-4' =%>
+			<%= text_area "set.$setID.description" => $setRecord->description,
+				id => "set.$setID.description", rows => 5, cols => 62, class => 'form-control' =%>
+		% }
+	</div>
+	%
+	% # Display header information
+	% if (!@editForUser) {
+		<div class="card mb-2 border border-dark" style="width:fit-content">
+			<div class="card-body p-2">
+				<div class="card-title fw-bold"><%= maketext("Headers") %></div>
+				% for my $headerType (@$headers) {
+					<div class="card-text p-1">
+						<div class="row align-items-center">
+							<div class="col-4">
+								<table>
+									<tr>
+										<td>
+											<%= label_for "set.$setID.$headerType" =>
+												maketext($field_properties->{$headerType}{name}),
+												class => 'form-label' =%>
+										</td>
+									</tr>
+									<tr>
+										<td>
+											<%= link_to $c->systemLink(
+													url_for('instructor_problem_editor_withset_withproblem',
+														setID => $setID, problemID => 0),
+													params => { file_type => $headerType }
+												),
+												class  => 'psd_edit btn btn-secondary btn-sm',
+												target => 'WW_Editor',
+												data   => {
+													bs_toggle    => 'tooltip',
+													bs_title     => maketext('Edit Header'),
+													bs_placement => 'top'
+												},
+												begin =%>
+												<i class="icon fas fa-pencil-alt" data-alt="<%= maketext('Edit') =%>">
+												</i>
+											<% end =%>
+											<%= link_to $c->systemLink(url_for(
+													{
+														set_header      => 'problem_list',
+														hardcopy_header => 'hardcopy_preselect_set'
+													}->{$headerType},
+													setID => $setID
+												)),
+												class  => 'psd_view btn btn-secondary btn-sm',
+												target => 'WW_View',
+												data   => {
+													bs_toggle    => 'tooltip',
+													bs_placement => 'top',
+													bs_title     => maketext('Open in New Window')
+												},
+												begin =%>
+												<i class="icon far fa-eye" data-alt="<%= maketext('View') %>"></i>
+											<% end =%>
+										</td>
+									</tr>
+								</table>
+							</div>
+							<div class="col-8">
+								<div class="combo-box">
+									% # Browse available header/problem files
+									<div>
+										% my $skip = join("|", keys %{ $ce->{courseFiles}{problibs} });
+										<%= text_field "set.$setID.$headerType" =>
+												$setRecord->{$headerType} || 'defaultHeader',
+											id    => "set.$setID.$headerType",
+											class => 'combo-box-text form-control mb-1' =%>
+										<%= select_field "set.$setID.$headerType" => [
+												[
+													maketext('Use Default Header File') => 'defaultHeader',
+													($setRecord->{$headerType} || 'defaultHeader') eq 'defaultHeader'
+													? (selected => undef)
+													: ()
+												],
+												map { [
+													$_ => $_,
+													$setRecord->{$headerType} && $setRecord->{$headerType} eq $_
+													? (selected => undef)
+													: ()
+												] } sortByName(
+													undef,
+													listFilesRecursive(
+														$ce->{courseDirs}{templates},
+														qr/header.*\.pg$/i,
+														qr/^(?:$skip)$/,
+														0,
+														1
+													)
+												)
+											],
+											class             => 'combo-box-select form-select',
+											'aria-labelledby' => "set.$setID.$headerType" =%>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				% }
+			</div>
+		</div>
+	% } else {
+		<p>
+			<b>
+				<%= maketext(
+					'Screen and Hardcopy set header information can not be overridden for individual students.') =%>
+			</b>
+		</p>
+	% }
+	%
+	% # Display problem information
+	%
+	% if (%$globalProblems) {
+		% # Create rows for problems.
+		<h2><%= maketext('Problems') %></h2>
+		<div id="psd_toolbar" class="col-12 d-flex flex-wrap mb-3">
+			% if (@editForUser != 1) {
+				<div class="btn-group w-auto me-3 py-1">
+					<button id="psd_renumber" class="btn btn-secondary" type="button">
+						<%= maketext('Renumber Problems') =%>
+					</button>
+					<button id="psd_render_all" class="btn btn-secondary" type="button">
+						<%= maketext('Render All') =%>
+					</button>
+					<button id="psd_hide_all" class="btn btn-secondary" type="button">
+						<%= maketext('Hide All') =%>
+					</button>
+				</div>
+			% }
+			% if (!@editForUser) {
+				<div class="btn-group w-auto me-3 py-1">
+					<button id="psd_expand_details" class="btn btn-secondary" type="button">
+						<%= maketext('Expand All Details') =%>
+					</button>
+					<button id="psd_collapse_details" class="btn btn-secondary" type="button">
+						<%= maketext('Collapse All Details') =%>
+					</button>
+				</div>
+			% }
+			% if ($isJitarSet) {
+				<div class="btn-group w-auto me-3 py-1">
+					<button id="psd_expand_all" class="btn btn-secondary" type="button">
+						<%= maketext('Expand All Nesting') =%>
+					</button>
+					<button id="psd_collapse_all" class="btn btn-secondary" type="button">
+						<%= maketext('Collapse All Nesting') =%>
+					</button>
+				</div>
+			% }
+			<div class="input-group d-inline-flex flex-nowrap w-auto py-1">
+				<%= label_for problem_displaymode => maketext('Display Mode:'), class => 'input-group-text' =%>
+				<%= select_field 'problem_displaymode' => [
+						grep { exists $display_modes->{$_} } @{ $ce->{pg}{displayModes} }
+					],
+					id => 'problem_displaymode', class => 'form-select w-auto flex-grow-0' =%>
+			</div>
+		</div>
+		%
+		<div id="problemset_detail_list" class="container-fluid p-0">
+			% my %shownYet;
+			% my $repeatFile;
+			% my @problemRows;
+			%
+			% for my $problemID (@$problemIDList) {
+				% my $problemRecord =
+					% @editForUser == 1
+					% ? $mergedProblems->{$problemID}
+					% : $globalProblems->{$problemID};
+				%
+				% my $problemFile =
+					% ((param("problem.$problemID.source_file") || $problemRecord->source_file) =~ s|^/||r) =~
+					% s|\.\.||gr;
+				%
+				% # Warn of repeat problems
+				% if (defined $shownYet{$problemFile}) {
+					% my $prettyID = $shownYet{$problemFile};
+					% $prettyID   = join('.', jitar_id_to_seq($prettyID)) if $isJitarSet;
+					% $repeatFile = maketext('This problem uses the same source file as number [_1].', $prettyID);
+				% } else {
+					% $shownYet{$problemFile} = $problemID;
+					% $repeatFile = '';
+				% }
+				%
+				% my $error = $c->checkFile($problemFile, undef);
+				%
+				% my $problemNumber     = $problemID;
+				% my $lastProblemNumber = $problemID;
+				% my $parentID          = '';
+				% my $collapseButton    = '';
+				% if ($isJitarSet) {
+					% my @seq = jitar_id_to_seq($problemNumber);
+					% $problemNumber     = join('.', @seq);
+					% $lastProblemNumber = pop @seq;
+					% $parentID          = seq_to_jitar_id(@seq) if @seq;
+					% my $button = begin
+						<button class="pdr_collapse me-2 collapsed btn btn-sm p-0"
+							data-expand-text="<%= maketext('Expand Nested Problems') %>"
+							data-collapse-text="<%= maketext('Collapse Nested Problems') %>"
+							data-bs-toggle="collapse"
+							aria-expanded="false" type="button">
+							<i class="fas fa-chevron-right" data-bs-toggle="tooltip"></i>
+						</button>
+					% end
+					% $collapseButton = $button->();
+				% }
+				%
+				% # When editing a set version, make sure to use the merged problem in the edit, as problem groups could
+				% # be in use for which the problem is generated and then stored in the problem version.
+				% my $problemToShow = $editingSetVersion ? $mergedProblems->{$problemID} : $userProblems->{$problemID};
+				%
+				% my @source_file_parts = $c->fieldHTML($userToShow, $setID, $problemID, $globalProblems->{$problemID},
+					% $problemToShow, 'source_file');
+				%
+				% my $problemRow = begin
+					<div class="problem_detail_row card d-flex flex-column p-2 mb-3 g-0">
+						<div class="pdr_block_1 row align-items-center">
+							<div class="col-md-4 col-10 order-1 d-flex align-items-center">
+								<div class="pdr_handle me-2 text-nowrap" id="pdr_handle_<%= $problemID %>">
+									<span class="pdr_problem_number"><%= $problemNumber %></span>
+									% if (!@editForUser) {
+										<i class="<%= $isJitarSet ? 'fas fa-arrows-alt' : 'fas fa-arrows-alt-v' %>"
+											data-bs-title="<%= maketext('Move') %>" data-bs-toggle="tooltip">
+										</i>
+									% }
+								</div>
+								<%= $collapseButton =%>
+								<%= hidden_field "prob_num_$problemID" => $lastProblemNumber,
+									id => "prob_num_$problemID" =%>
+								<%= hidden_field "prob_parent_id_$problemID" => $parentID,
+									id => "prob_parent_id_$problemID" =%>
+								%
+								% # Show the "Render Problem", "Edit Problem", and "Open in New Window" links if there
+								% # is a well defined problem to view. This is when editing a homework set, editing a
+								% # gateway set version, or editing a gateway set and the problem is not drawing from
+								% # grouping set.  Really the only case needed here is that of a group problem.
+								% if (!$isGatewaySet || $editingSetVersion || $problemFile !~ /^group/) {
+									<button id="pdr_render_<%= $problemID %>"
+										class="pdr_render btn btn-secondary btn-sm"
+										data-bs-toggle="tooltip" data-bs-placement="top"
+										data-bs-title="<%= maketext('Render Problem') %>"
+										type="button">
+										<i class="icon far fa-image" data-alt="<%= maketext('Render') %>"
+											aria-hidden="true">
+										</i>
+									</button>
+									<%= link_to $c->systemLink(url_for(
+											'instructor_problem_editor_withset_withproblem',
+											setID => $fullSetID, problemID => $problemID
+										)),
+										class  => 'psd_edit btn btn-secondary btn-sm',
+										target => 'WW_Editor',
+										data   => {
+											bs_toggle    => 'tooltip',
+										   	bs_placement => 'top',
+										   	bs_title     => maketext('Edit Problem')
+										},
+										begin =%>
+										<i class="icon fas fa-pencil-alt" data-alt="<%= maketext('Edit') %>"></i>
+									<% end =%>
+									% my $problemLink;
+									% if ($isGatewaySet) {
+										% # If editing a set version, then open the actual set version.
+										% # Otherwise, the best that can be done is to use an undefined set.
+										% if ($editingSetVersion) {
+											% my ($problemNumber, $pageNumber) =
+												% getTestProblemPosition($db, $problemToShow);
+											% $problemLink = $c->systemLink(url_for('gateway_quiz',
+													% setID => $problemToShow->set_id
+														% . ',v' . $problemToShow->version_id,
+													% problemID => $problemToShow->problem_id
+												%),
+												% params => {
+													% effectiveUser => $editForUser[0],
+													% currentPage   => $pageNumber
+												% }
+											% )->fragment("prob$problemNumber");
+										% } else {
+											% $problemLink = $c->systemLink(
+												% url_for('gateway_quiz', setID => 'Undefined_Set', problemID => '1'),
+												% params => {
+													% effectiveUser  =>
+														% @editForUser == 1 ? $editForUser[0] : param('user'),
+													% problemSeed => $problemToShow ? $problemToShow->problem_seed : '',
+													% sourceFilePath => $problemToShow && $problemToShow->source_file
+														% ? $problemToShow->source_file
+														% : $globalProblems->{$problemID}->source_file
+												% }
+											% )
+										% }
+									% } else {
+										% $problemLink = $c->systemLink(
+											% url_for('problem_detail', setID => $setID, problemID => $problemID),
+											% params => {
+												% effectiveUser => @editForUser == 1 ? $editForUser[0] : param('user')
+											% }
+										% )
+									% }
+									<%= link_to $problemLink,
+										class  => 'psd_view btn btn-secondary btn-sm',
+										target => 'WW_View',
+										data   => {
+											bs_toggle    => 'tooltip',
+											bs_placement => 'top',
+											bs_title     => maketext('Open in New Window')
+										},
+										begin =%>
+										<i class="icon far fa-eye" data-alt="<%= maketext('View') %>"></i>
+									<% end =%>
+								% }
+								% if ($authz->hasPermissions(param('user'), 'score_sets')) {
+									<%= link_to $c->systemLink(url_for(
+											'instructor_problem_grader',
+										   	setID     => $setID,
+										   	problemID => $problemID
+										)),
+										class => "pdr_grader btn btn-secondary btn-sm",
+										data  => {
+											bs_toggle    => "tooltip",
+											bs_placement => "top",
+											bs_title     => maketext("Grade Problem")
+										},
+										begin =%>
+										<i class="icon fas fa-edit" data-alt="<%= maketext("Grade") %>"></i>
+									<% end =%>
+								% }
+							</div>
+							<div class="col-md-2 col-3 order-md-2 order-3">
+								% if (@editForUser) {
+									<div class="form-check form-check-inline col-form-label col-form-label-sm
+										text-nowrap">
+										<%= $source_file_parts[0] =%>
+										<%= $source_file_parts[1] =%>
+									</div>
+								% } else {
+									<div class="col-auto col-form-label col-form-label-sm text-nowrap">
+										<%= $source_file_parts[0] =%>
+									</div>
+								% }
+							</div>
+							<div class="<%= @editForUser ? 'col-md-6' : 'col-md-5' %> col-9 order-md-3 order-4">
+								<%= $source_file_parts[ @editForUser ? 3 : 2 ] =%>
+								<%= hidden_field "problem_${problemID}_default_source_file" =>
+									$globalProblems->{$problemID}->source_file,
+									id => "problem_${problemID}_default_source_file" =%>
+							</div>
+							% if (!@editForUser) {
+								<div class="accordion col-md-1 col-2 d-flex align-items-center justify-content-end
+									order-md-last order-2">
+									<button href="#" class="accordion-button pdr_detail_collapse ps-0 w-auto"
+										type="button" aria-expanded="true" aria-controls="pdr_details_<%= $problemID %>"
+										aria-label="<%= maketext('Collapse Problem Details') %>"
+										data-bs-toggle="collapse" data-bs-target="#pdr_details_<%= $problemID %>"
+										data-expand-text="<%= maketext('Expand Problem Details') %>"
+										data-collapse-text="<%= maketext('Collapse Problem Details') %>">
+									</button>
+								</div>
+							% }
+						</div>
+						<div id="pdr_details_<%= $problemID %>" class="collapse show mt-1">
+							<div class="row">
+								<div class="col-md-6 d-flex flex-row order-md-first order-last">
+									% if (!@editForUser) {
+										<div class="form-check form-check-inline form-control-sm">
+											<label class="form-check-label">
+												<%= check_box deleteProblem => $problemID,
+													class => 'form-check-input' =%>
+												<%= maketext('Delete it?') =%>
+											</label>
+										</div>
+									% }
+									% if (@editForUser != 1) {
+										<div class="form-check form-check-inline form-control-sm">
+											<label class="form-check-label">
+												<%= check_box markCorrect => $problemID,
+													id    => "problem.${problemID}.mark_correct",
+													class => 'form-check-input' =%>
+												<%= maketext('Mark Correct?') =%>
+											</label>
+										</div>
+									% }
+								</div>
+								% if (@editForUser) {
+									<div class="col-md-6 offset-md-0 col-9 offset-3 font-sm order-md-last order-first">
+										<%= $source_file_parts[4] =%>
+									</div>
+								% }
+							</div>
+							<div class="row">
+								<div class="col-md-5">
+									<%= $c->fieldTable(
+										$userToShow,                   $setID,         $problemID,
+										$globalProblems->{$problemID}, $problemToShow, $setRecord->assignment_type
+									) =%>
+								</div>
+								<div class="font-sm col-md-7">
+									% if ($repeatFile) {
+										<div class="alert alert-danger p-1 mb-2 fw-bold"><%= $repeatFile %></div>
+									% }
+									<div class="rpc_render_area" id="psr_render_area_<%= $problemID %>">\
+										<% if ($error) { =%>\
+											<div class="alert alert-danger p-1 mb-0 fw-bold"><%= $error %></div>
+										<% } =%>\
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				% end
+				% push @problemRows, $problemRow->();
+			% }
+			%
+			<ol id="psd_list" class="sortable-branch <%= @editForUser ? 'disable_renumber' : '' %>">
+				% if ($isJitarSet) {
+					% # If this is a jitar set then print nested lists.
+					% my $nestedIDHash = {};
+					%
+					% for (my $i = 0; $i <= $#$problemIDList; $i++) {
+						% my @id_seq = jitar_id_to_seq($problemIDList->[$i]);
+						% my $hashref = $nestedIDHash;
+						% for my $num (@id_seq) {
+							% $hashref->{$num} = {} unless defined $hashref->{$num};
+							% $hashref = $hashref->{$num};
+						% }
+						% $hashref->{'row'} = $problemRows[$i];
+						% $hashref->{'id'}  = $problemIDList->[$i];
+					% }
+					%
+					% # Use recursion to print the nested lists.
+					% for (sort { $a <=> $b } keys %$nestedIDHash) {
+						<%= $c->print_nested_list($nestedIDHash->{$_}) =%>
+					% }
+				% } else {
+					% for (0 .. $#$problemIDList) {
+						<li class="psd_list_item" id="psd_list_item_<%= $problemIDList->[$_] %>">
+							<%= $problemRows[$_] %>
+						</li>
+					% }
+				% }
+			</ol>
+		</div>
+		%
+		<div class="input-group mb-2">
+			<div class="input-group-text">
+				<%= check_box auto_render => 1, id => 'auto_render', class => 'form-check-input mt-0' =%>
+			</div>
+			<%= label_for auto_render => maketext('Automatically render problems on page load'),
+				class => 'input-group-text' =%>
+		</div>
+		<div class="input-group mb-2">
+			<div class="input-group-text">
+				<%= check_box force_renumber => '1', id => 'force_renumber', class => 'form-check-input mt-0' =%>
+			</div>
+			<%= label_for force_renumber => maketext('Force problems to be numbered consecutively from one'),
+				class => 'input-group-text' =%>
+		</div>
+	% } else {
+		<p><b><%= maketext("This set doesn't contain any problems yet.") %></b></p>
+	% }
+	%
+	% # Always allow one to add a new problem, unless a set version is being edited.
+	% if (!$editingSetVersion) {
+		<div class="input-group">
+			<div class="input-group-text">
+				<%= check_box add_blank_problem => '1', id => 'add_blank_problem', class => 'form-check-input mt-0' =%>
+			</div>
+			<%= label_for add_blank_problem => maketext('Add'), class => 'input-group-text' =%>
+			<%= text_field add_n_problems => 1, id => 'add_n_problems', class => 'form-control flex-grow-0' =%>
+			<%= label_for add_n_problems => maketext('blank problem template(s) to end of homework set'),
+				class => 'input-group-text' =%>
+		</div>
+	% }
+	%
+	<div class="mt-3 submit-buttons-container align-items-center">
+		<%= submit_button maketext('Save Changes'), name => 'submit_changes', class => 'btn btn-primary' =%>
+		<%= submit_button maketext('Reset Form'), name => 'undo_changes', class => 'btn btn-primary' =%>
+		<%= maketext('(Any unsaved changes will be lost.)') =%>
+	</div>
+<% end =%>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetDetail/attempts_row.html.ep b/templates/ContentGenerator/Instructor/ProblemSetDetail/attempts_row.html.ep
new file mode 100644
index 0000000000..a21a2f3a17
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemSetDetail/attempts_row.html.ep
@@ -0,0 +1,12 @@
+<tr>
+	<td></td>
+	<td><%= label_for "problem.$problemID.attempts.id" => maketext('Attempts') =%></td>
+	<td></td>
+	<td>
+		<%= text_field "problem.$problemID.attempts",
+			($problemRecord->num_correct || 0) + ($problemRecord->num_incorrect || 0),
+			id => "problem.$problemID.attempts.id", class => 'form-control form-control-sm',
+			readonly => undef, size => 5 =%>
+	</td>
+	<td></td>
+</tr>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep b/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep
new file mode 100644
index 0000000000..09fe95291e
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep
@@ -0,0 +1,30 @@
+<tr class="align-top">
+	% if ($forUsers) {
+		<td>
+			<%= check_box "set.$setID.selected_ip_locations.override",
+				id => "set.$setID.selected_ip_locations.override_id", class => 'form-check-input',
+				$ipOverride ? (checked => undef) : () =%>
+		</td>
+	% }
+	<td>
+		<%= label_for $forUsers ? "set.$setID.selected_ip_locations.override_id"
+			: "set.$setID.selected_ip_locations_id" => maketext('Restrict Locations'),
+			$forUsers ? (id => "set.$setID.selected_ip_locations.label", class => 'form-check-label')
+			: (class => 'form-label') =%>
+	</td>
+	<td></td>
+	<td>
+		<%= select_field "set.$setID.selected_ip_locations" =>
+			[ map { [ $_ => $_, $defaultLocations->{$_} ? (selected => undef) : () ] } @$locations ],
+			id => "set.$setID.selected_ip_locations_id", size => 5, multiple => undef,
+			class => 'form-select form-select-sm',
+			$forUsers ? ('aria-labelledby' => "set.$setID.selected_ip_locations.label") : () =%>
+	</td>
+	% if ($forUsers) {
+		<td>
+			<%= text_area "set.$setID.selected_ip_locations.class_value" => join("\n", @$globalLocations),
+				readonly => undef, rows => 5, class => 'form-control form-control-sm',
+				'aria-labelledby' => "set.$setID.selected_ip_locations.label" =%>
+		</td>
+	% }
+</tr>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep b/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep
new file mode 100644
index 0000000000..e4f671d774
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep
@@ -0,0 +1,30 @@
+% # This assumes that the login proctor password is something that can only be changed for the global set.
+%
+% # If the set doesn't require a login proctor, then we can assume that one doesn't exist.
+% # Otherwise, we need to check the database to find if there's an already defined password.
+% # In that case set the form parameter so it is picked up by the tag helper below.
+% if ($globalRecord->restricted_login_proctor eq 'Yes' && $db->existsPassword("set_id:$setID")) {
+	% param("set.$setID.restricted_login_proctor_password", '********');
+% }
+%
+<tr>
+	<td>
+		<%= label_for "set.$setID.restricted_login_proctor_password" =>
+			maketext('Password') =%>
+	</td>
+	<td>
+		<a class="help-popup" role="button" tabindex="0" data-bs-placement="top" data-bs-toggle="popover"
+			data-bs-content="<%= maketext(
+				'Provide a password to have a single password for all students to start a proctored test. '
+					. 'Alternatively, leave this blank if you would like to have a proctor level user enter '
+					. 'their username and password on the student\'s screen for authentication.'
+			) =%>">
+			<i class="icon fas fa-question-circle" aria-hidden="true" data-alt="<%= maketext('Help Icon') %>"></i>
+		</a>
+	</td>
+	<td>
+		<%= text_field "set.$setID.restricted_login_proctor_password" => '',
+			id => "set.$setID.restricted_login_proctor_password", size => 10,
+			class => 'form-control form-control-sm' =%>
+	</td>
+</tr>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList.html.ep
new file mode 100644
index 0000000000..2175be00c8
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemSetList.html.ep
@@ -0,0 +1,119 @@
+% use WeBWorK::Utils qw(getAssetURL);
+%
+% content_for css => begin
+	<%= stylesheet getAssetURL($ce, 'node_modules/flatpickr/dist/flatpickr.min.css') =%>
+	<%= stylesheet getAssetURL($ce, 'node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.css') =%>
+% end
+%
+% content_for js => begin
+	<%= javascript getAssetURL($ce, 'node_modules/luxon/build/global/luxon.min.js'), defer => undef =%>
+	<%= javascript getAssetURL($ce, 'node_modules/flatpickr/dist/flatpickr.min.js'), defer => undef =%>
+	% if ($ce->{language} !~ /^en/) {
+		<%= javascript
+			getAssetURL($ce, 'node_modules/flatpickr/dist/l10n/' . ($ce->{language} =~ s/^(..).*/$1/gr) . '.js'),
+			defer => undef =%>
+	% }
+	<%= javascript getAssetURL($ce, 'node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.js'),
+		defer => undef =%>
+	<%= javascript getAssetURL($ce, 'node_modules/shortcut-buttons-flatpickr/dist/shortcut-buttons-flatpickr.min.js'),
+		defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/DatePicker/datepicker.js'),         defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/ActionTabs/actiontabs.js'),         defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/ProblemSetList/problemsetlist.js'), defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/ShowHide/show_hide.js'),            defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/SelectAll/selectall.js'),           defer => undef =%>
+% end
+%
+% unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
+	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to access instructor tools.') %></div>
+	% last;
+% }
+%
+% if ($c->{editMode} && !$authz->hasPermissions(param('user'), 'modify_problem_sets')) {
+	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to modify homework sets.') %></div>
+	% last;
+% }
+%
+% if ($c->{exportMode} && !$authz->hasPermissions(param('user'), 'modify_set_def_files')) {
+	<div class="alert alert-danger p-1 mb-0">
+		<%= maketext('You are not authorized to modify set definition files.') =%>
+	</div>
+	% last;
+% }
+%
+<%= form_for current_route, method => 'post', id => 'problemsetlist', name => 'problemsetlist', class  => 'font-sm',
+	begin =%>
+	<%= $c->hidden_authen_fields =%>
+	%
+	% # Show state data
+	% if (@{ $c->{visibleSetIDs} }) {
+		% for (@{ $c->{visibleSetIDs} }) {
+			<%= hidden_field visible_sets => $_ =%>
+		% }
+	% } else {
+		<%= hidden_field no_visible_sets => '1' =%>
+	% }
+	% if (@{ $c->{prevVisibleSetIDs} }) {
+		% for (@{ $c->{prevVisibleSetIDs} }) {
+			<%= hidden_field prev_visible_sets => $_ =%>
+		% }
+	% } else {
+		<%= hidden_field no_prev_visible_sets => '1' =%>
+	% }
+	<%= hidden_field editMode => $c->{editMode} =%>
+	<%= hidden_field exportMode => $c->{exportMode} =%>
+	<%= hidden_field primarySortField => $c->{primarySortField} =%>
+	<%= hidden_field secondarySortField => $c->{secondarySortField} =%>
+	%
+	% if ($c->{editMode}) {
+		<p><b><%= maketext('Any changes made below will be reflected in the set for ALL students.') =%></b></p>
+	% }
+	%
+	% # Output action forms
+	% my $default_choice;
+	%
+	% for my $actionID (@$formsToShow) {
+		% # Check permissions
+		% next if $formPerms->{$actionID} && !$authz->hasPermissions(param('user'), $formPerms->{$actionID});
+		%
+		% my $active        = '';
+		% unless ($default_choice) { $active = ' active'; $default_choice = $actionID; }
+		%
+		% content_for 'tab-list' => begin
+			<li class="nav-item" role="presentation">
+				<%= link_to maketext($formTitles->{$actionID}) => "#$actionID",
+					class           => "nav-link action-link$active",
+					id              => "$actionID-tab",
+					role            => 'tab',
+					data            => { action => $actionID, bs_toggle => 'tab', bs_target => "#$actionID" },
+					'aria-controls' => $actionID,
+					'aria-selected' => $active ? 'true' : 'false' =%>
+			</li>
+		% end
+		% content_for 'tab-content' => begin
+			<div class="tab-pane fade mb-2 <%= $active ? " show$active" : '' %>" id="<%= $actionID %>"
+				role="tabpanel" aria-labelledby="<%= $actionID %>-tab">
+				<%= include "ContentGenerator/Instructor/ProblemSetList/${actionID}_form" =%>
+			</div>
+		% end
+	% }
+	%
+	<%= hidden_field action => $default_choice, id => 'current_action' =%>
+	<div>
+		<ul class="nav nav-tabs mb-2" role="tablist"><%= content 'tab-list' =%></ul>
+		<div class="tab-content"><%= content 'tab-content' %></div>
+	</div>
+	<div>
+		<%= submit_button maketext($formTitles->{$default_choice}),
+			id => 'take_action', class => 'btn btn-primary mb-3' =%>
+	</div>
+	%
+	<p class="mb-2">
+		<%= maketext('Showing [_1] out of [_2] sets.',
+			scalar @{ $c->{visibleSetIDs} },
+			scalar @{ $c->{allSetIDs} }
+		) =%>
+	</p>
+	%
+	<%= include 'ContentGenerator/Instructor/ProblemSetList/set_list_table' =%>
+<% end =%>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/cancel_edit_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/cancel_edit_form.html.ep
new file mode 100644
index 0000000000..3c1965a19c
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/cancel_edit_form.html.ep
@@ -0,0 +1 @@
+<span><%= maketext('Abandon changes') %></span>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/cancel_export_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/cancel_export_form.html.ep
new file mode 100644
index 0000000000..1c548a24d3
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/cancel_export_form.html.ep
@@ -0,0 +1 @@
+<span><%= maketext('Abandon export') %></span>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep
new file mode 100644
index 0000000000..a48aa3609d
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep
@@ -0,0 +1,22 @@
+<div>
+	<div class="row mb-2">
+		<%= label_for 'create_text', class => 'col-form-label col-form-label-sm col-auto', begin =%>
+			<%= maketext('Name the new set') =%><span class="required-field">*</span>:
+		<% end =%>
+		<div class="col-auto">
+			<%= text_field 'action.create.name' => '', id => 'create_text', maxlength => '100',
+				'aria-required' => 'true', class => 'form-control form-control-sm', dir => 'ltr' =%>
+		</div>
+	</div>
+	<div class="row mb-2">
+		<%= label_for create_select => maketext("Create as what type of set?"),
+			class => 'col-form-label col-form-label-sm col-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.create.type' => [
+					[ maketext('a new empty set')                       => 'empty', selected => undef ],
+					[ maketext('a duplicate of the first selected set') => 'copy' ]
+				],
+				id => 'create_select', class => 'form-select form-select-sm' =%>
+		</div>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep
new file mode 100644
index 0000000000..4963026c2b
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep
@@ -0,0 +1,16 @@
+<div>
+	<div class="d-inline-block alert alert-danger p-1 mb-2">
+		<em><%= maketext('Warning: Deletion destroys all set-related data and is not undoable!') =%></em>
+	</div>
+	<div class="row mb-2">
+		<%= label_for delete_select => maketext('Delete which sets?'),
+			class => 'col-form-label col-form-label-sm col-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.delete.scope' => [
+					[ maketext('no sets')       => 'none', selected => undef ],
+					[ maketext('selected sets') => 'selected' ]
+				],
+				id => 'delete_select', class => 'form-select form-select-sm' =%>
+		</div>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep
new file mode 100644
index 0000000000..56a2c066f1
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep
@@ -0,0 +1,11 @@
+<div class="row mb-2">
+	<%= label_for edit_select => maketext('Edit which sets?'), class => 'col-form-label col-form-label-sm col-auto' =%>
+	<div class="col-auto">
+		<%= select_field 'action.edit.scope' => [
+				[ maketext('all sets')      => 'all' ],
+				[ maketext('listed sets')   => 'visible' ],
+				[ maketext('selected sets') => 'selected', selected => undef ]
+			],
+			id => 'edit_select', class => 'form-select form-select-sm' =%>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep
new file mode 100644
index 0000000000..80571efd21
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep
@@ -0,0 +1,13 @@
+<div class="row mb-2">
+	<%= label_for export_select => maketext('Prepare which sets for export?'),
+		class => 'col-form-label col-form-label-sm col-auto' =%>
+	<div class="col-auto">
+		<%= select_field 'action.export.scope' => [
+				[ maketext('all sets')      => 'all' ],
+				[ maketext('listed sets')   => 'visible', selected => undef ],
+				[ maketext('selected sets') => 'selected' ],
+
+			],
+			id => 'export_select', class => 'form-select form-select-sm' =%>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep
new file mode 100644
index 0000000000..41770834c2
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep
@@ -0,0 +1,30 @@
+<div>
+	<div class="row mb-2">
+		<%= label_for filter_select => maketext('Show which sets?'),
+			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.filter.scope' => [
+					[ maketext('all sets')                     => 'all' ],
+					[ maketext('no sets')                      => 'none' ],
+					[ maketext('selected sets')                => 'selected' ],
+					[ maketext('enter matching set IDs below') => 'match_ids', selected => undef ],
+					[ maketext('sets visible to students')     => 'visible' ],
+					[ maketext('sets hidden from students')    => 'unvisible' ]
+				],
+				id => 'filter_select', class => 'form-select form-select-sm' =%>
+		</div>
+	</div>
+	<div id="filter_elements" class="row mb-2">
+		<%= label_for 'filter_text', class => 'col-form-label col-form-label-sm col-sm-auto', begin =%>
+			<%= maketext('Match on what? (separate multiple IDs with commas)') =%>
+			<span class="required-field">*</span>
+		<% end =%>
+		<div class="col-auto">
+			<%= text_field 'action.filter.set_ids' => '', id => 'filter_text', 'aria-required' => 'true',
+				class => 'form-control form-control-sm', dir => 'ltr' =%>
+		</div>
+	</div>
+	<div id="filter_err_msg" class="alert alert-danger p-1 mb-2 d-inline-flex d-none">
+		<%= maketext('Please enter in a value to match in the filter field.') =%>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep
new file mode 100644
index 0000000000..c0a6ec31fb
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep
@@ -0,0 +1,73 @@
+% use WeBWorK::Utils::Instructor qw(getDefList);
+%
+<div>
+	<div class="row mb-2">
+		<%= label_for import_amt_select => maketext('Import how many sets?'),
+			class => 'col-form-label col-form-label-sm col-md-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.import.number' => [
+					[ maketext('a single set') => 1, selected => undef ],
+					[maketext('multiple sets') => 8 ]
+				],
+				id => 'import_amt_select', class => 'form-select form-select-sm' =%>
+		</div>
+	</div>
+	<div class="row align-items-center mb-2">
+		<%= label_for import_source_select => maketext('Import from where?'),
+			class => 'col-form-label col-form-label-sm col-md-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.import.source' => [
+					[ maketext('Enter filenames below') => '', selected => undef ],
+					getDefList($ce)
+				],
+				id => 'import_source_select', class => 'form-select form-select-sm', dir => 'ltr',
+				size => param('action.import.number') || 1,
+				defined param('action.import.number') && param('action.import.number') ne '1'
+				? (multiple => undef)
+				: () =%>
+		</div>
+	</div>
+	<div class="row mb-2">
+		<%= label_for import_text => maketext('Import sets with names') . ':',
+			class => 'col-form-label col-form-label-sm col-md-auto' =%>
+		<div class="col-auto">
+			<%= text_field 'action.import.name' => '', id => 'import_text', class => 'form-control form-control-sm',
+				dir => 'ltr' =%>
+		</div>
+	</div>
+	<div class="row mb-2">
+		<%= label_for import_date_shift => maketext('Shift dates so that the earliest is') . ':',
+			class => 'col-form-label col-form-label-sm col-md-auto' =%>
+		<div class="col-auto">
+			<div class="input-group input-group-sm flatpickr">
+				<%= text_field 'action.import.start.date' => '',
+					id => 'import_date_shift', size => '27', class => 'form-control',
+					data => {
+						input => undef,
+					   	done_text  => maketext('Done'),
+						today_text => maketext('Today'),
+						now_text   => maketext('Now'),
+						locale     => $ce->{language},
+						timezone   => $ce->{siteDefaults}{timezone}
+					} =%>
+				<a class="btn btn-secondary btn-sm" data-toggle role="button" tabindex="0"
+					aria-label="<%= maketext('Pick date and time') =%>">
+					<i class="fas fa-calendar-alt"></i>
+				</a>
+			</div>
+		</div>
+	</div>
+	% if ($authz->hasPermissions(param('user'), 'assign_problem_sets')) {
+		<div class="row mb-2">
+			<%= label_for import_users_select => maketext('Assign this set to which users?'),
+				class => 'col-form-label col-form-label-sm col-md-auto' =%>
+			<div class="col-auto">
+				<%= select_field 'action.import.assign' => [
+						[ maketext('all current users')          => 'all' ],
+						[ maketext('only') . ' ' . param('user') => 'user', selected => undef ]
+					],
+					id => 'import_users_select', class => 'form-select form-select-sm' =%>
+			</div>
+		</div>
+	% }
+</div>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep
new file mode 100644
index 0000000000..b2c02139b1
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep
@@ -0,0 +1,26 @@
+<div>
+	<div class="row mb-2">
+		<%= label_for publish_filter_select => maketext('Choose which sets to be affected') . ':',
+			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.publish.scope' => [
+					[ maketext('no sets')       => 'none' ],
+					[ maketext('all sets')      => 'all' ],
+					[ maketext('listed sets')   => 'visible' ],
+					[ maketext('selected sets') => 'selected', selected => undef ]
+				],
+				id => 'publish_filter_select', class => 'form-select form-select-sm' =%>
+		</div>
+	</div>
+	<div class="row mb-2">
+		<%= label_for publish_visibility_select => maketext('Choose visibility of the sets to be affected') . ':',
+			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.publish.value' => [
+					[ maketext('Hidden')  => 0 ],
+					[ maketext('Visible') => 1, selected => undef ]
+			],
+			id => 'publish_visibility_select', class => 'form-select form-select-sm d-inline w-auto' =%>
+		</div>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/save_edit_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/save_edit_form.html.ep
new file mode 100644
index 0000000000..6a8054a030
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/save_edit_form.html.ep
@@ -0,0 +1 @@
+<span><%= maketext('Save changes') %></span>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/save_export_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/save_export_form.html.ep
new file mode 100644
index 0000000000..6338c0daed
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/save_export_form.html.ep
@@ -0,0 +1 @@
+<span><%= maketext('Confirm which sets to export.') %></span>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep
new file mode 100644
index 0000000000..e2161b502b
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep
@@ -0,0 +1,12 @@
+<div class="row mb-2">
+	<%= label_for score_select => maketext('Score which sets?'),
+		class => 'col-form-label col-form-label-sm col-auto' =%>
+	<div class="col-auto">
+		<%= select_field 'action.score.scope' => [
+				[ maketext('no sets')       => 'none', selected => undef ],
+				[ maketext('all sets')      => 'all' ],
+				[ maketext('selected sets') => 'selected' ]
+			],
+			id => 'score_select', class => 'form-select form-select-sm' =%>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep
new file mode 100644
index 0000000000..e35233cb5b
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep
@@ -0,0 +1,53 @@
+% if ($type eq 'date') {
+	% if ($c->{editMode}) {
+		<div class="input-group input-group-sm flex-nowrap flatpickr">
+			<%= text_field $name => $value,
+				id          => "${name}_id",
+				class       => 'form-control w-auto ' . ($name =~ /\.open_date/ ? ' datepicker-group' : ''),
+				size        => 22,
+				placeholder => maketext('None Specified'),
+				role        => 'button',
+				tabindex    => 0,
+				data        => {
+					input      => undef,
+					done_text  => maketext('Done'),
+					today_text => maketext('Today'),
+					now_text   => maketext('Now'),
+					locale     => $ce->{language},
+					timezone   => $ce->{siteDefaults}{timezone}
+				},
+				'aria-labelledby' => ($name =~ s/^.*\.([^.]*)$/$1/r) . '_header' =%>
+			<a class="btn btn-secondary btn-sm" data-toggle role="button" tabindex="0"
+				aria-label="<%= maketext('Pick date and time') %>">
+				<i class="fas fa-calendar-alt"></i>
+			</a>
+		</div>
+	% } else {
+		<span dir="ltr">
+			<%= $c->formatDateTime($value, '', 'datetime_format_short', $ce->{language}) =%>
+		</span>
+	% }
+% } elsif ($type eq 'check') {
+	% if ($c->{editMode}) {
+		% # If the checkbox is checked it returns a 1, if it is unchecked it returns nothing
+		% # in which case the hidden field overrides the parameter with a 0.
+		<%= check_box $name => 1, id => "${name}_id", class => 'form-check-input',
+			'aria-labelledby' => ($name =~ s/^.*\.([^.]*)$/$1/r) . '_header',
+			$value ? (checked => undef) : () =%>
+		<%= hidden_field $name => 0 =%>
+	% } else {
+		<%= $value ? maketext('Yes') : maketext('No') =%>
+	% }
+% } else {
+	% # This case is not actually needed as only the "date" and "check" types occur.
+	% # This is a fallback in case someone tries add a type without learning this system.
+	% if ($c->{editMode}) {
+		<div class="input-group input-group-sm flex-nowrap">
+			<%= text_field $name => $value, id => "${name}_id", class  => 'form-control w-auto',
+				'aria-labelledby' => ($name =~ s/^.*\.([^.]*)$/$1/r) . '_header',
+				size => 10 =%>
+		</div>
+	% } else {
+		<%= $value =%>
+	% }
+% }
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/set_list_row.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/set_list_row.html.ep
new file mode 100644
index 0000000000..c97c381de6
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/set_list_row.html.ep
@@ -0,0 +1,56 @@
+% use WeBWorK::Utils qw(format_set_name_display);
+%
+% my $visibleClass   = $set->visible ? 'font-visible' : 'font-hidden';
+% my $set_id         = $set->set_id;
+% my $prettySetID    = format_set_name_display($set_id);
+%
+<tr>
+%
+% if ($c->{editMode}) {
+	<td dir="ltr">
+		<%= link_to $prettySetID => $c->systemLink(url_for('instructor_set_detail', setID => $set_id)) %>
+	</td>
+% } else {
+	<td>
+		% param(selected_sets => [ param('selected_sets'), $set_id ]) if $setSelected;
+		<%= check_box selected_sets => $set_id, id => "${set_id}_id", class => 'form-check-input' =%>
+	</td>
+	<td>
+		<div class="label-with-edit-icon" dir="ltr">
+			<%= label_for "${set_id}_id", begin =%>
+				<span class="set-label set-id-tooltip <%= $visibleClass %>" data-bs-toggle="tooltip"
+					data-bs-placement="right" data-bs-title="<%= $set->description %>">
+					<%= $prettySetID =%>
+				</span>
+				% if ($authz->hasPermissions(param('user'), 'modify_problem_sets')) {
+					<%= link_to $c->systemLink(
+						url_for('instructor_set_list', setID => $set_id),
+						params => { editMode => 1, visible_sets => $set_id }
+					), begin =%>
+						<i class="icon fas fa-pencil-alt" data-alt="edit" aria-hidden="true"></i>
+					<% end =%>
+				% }
+			<% end =%>
+		</div>
+	</td>
+	%# Problems link
+	<td>
+		<%= link_to $db->countGlobalProblems($set_id) =>
+			$c->systemLink(url_for('instructor_set_detail', setID => $set_id)) %>
+	</td>
+	% # Users link
+	<td>
+		<%= link_to $db->countSetUsers($set_id) . "/$c->{totalUsers}" =>
+			$c->systemLink(url_for('instructor_users_assigned_to_set', setID => $set_id)) =%>
+	</td>
+% }
+%
+% for my $field (@$fieldNames) {
+	% next unless defined $fieldTypes->{$field};
+	<td>
+		<span class="d-inline-block w-100 text-center text-nowrap <%= $visibleClass %>">
+			<%= include 'ContentGenerator/Instructor/ProblemSetList/set_list_field',
+				name => "set.$set_id.$field", value => $set->$field, type => $fieldTypes->{$field} =%>
+		</span>
+	</td>
+% }
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep
new file mode 100644
index 0000000000..978ce6c1ab
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep
@@ -0,0 +1,47 @@
+% my %fieldHeaders = (
+	% set_id                 => $c->{editMode}
+								% ? maketext('Edit Set')
+								% : label_for('select-all' => maketext('Edit Set Data')),
+	% problems               => maketext('Edit Problems'),
+	% users                  => maketext('Edit Assigned Users'),
+	% visible                => maketext('Visible'),
+	% enable_reduced_scoring => $c->{editMode} ? maketext('Enable Reduced Scoring') : maketext('Reduced Scoring'),
+	% open_date              => maketext('Open Date'),
+	% reduced_scoring_date   => maketext('Reduced Scoring Date'),
+	% due_date               => maketext('Close Date'),
+	% answer_date            => maketext('Answer Date')
+% );
+%
+<div class="table-responsive">
+	<table id="set_table_id" class="set_table table table-sm table-bordered caption-top font-sm <%=
+		$c->{editMode} ? 'align-middle' : '' %>">
+		%
+		<caption><%= maketext('Set List') %></caption>
+		%
+		<thead class="table-group-divider">
+			<tr>
+				% if (!$c->{editMode}) {
+					<th>
+						<%= check_box 'select-all' => '', id => 'select-all', class => 'select-all form-check-input',
+							'aria-label' => maketext('Select all sets'), data => { select_group => 'selected_sets' } =%>
+					</th>
+				% }
+				% for (@$fieldNames) {
+					<th id="<%= $_ %>_header"><%= $fieldHeaders{$_} =%></th>
+				% }
+			</tr>
+		</thead>
+		%
+		<tbody class="table-group-divider">
+			% my %selectedSetIDs = (map { $_ => 1 } @{ $c->{selectedSetIDs} });
+			% for (@$sets) {
+				<%= include 'ContentGenerator/Instructor/ProblemSetList/set_list_row',
+					set => $_, setSelected => $selectedSetIDs{ $_->set_id } =%>
+			% }
+		</tbody>
+	</table>
+</div>
+% # If there are no sets shown, print message.
+% unless (@$sets) {
+	<p><i><%= maketext('No sets shown.  Choose one of the options above to list the sets in the course.') %></i></p>
+% }
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep
new file mode 100644
index 0000000000..2a96703db9
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep
@@ -0,0 +1,30 @@
+<div>
+	<div class="row mb-2">
+		<%= label_for sort_select_1 => maketext('Sort by') . ':', class => 'col-form-label col-form-label-sm',
+			style => 'width:4.5rem' =%>
+		<div class="col-auto">
+			<%= select_field 'action.sort.primary' => [
+					[ maketext('Set Name')    => 'set_id' ],
+					[ maketext('Open Date')   => 'open_date' ],
+					[ maketext('Close Date')  => 'due_date', selected => undef ],
+					[ maketext('Answer Date') => 'answer_date' ],
+					[ maketext('Visibility')  => 'visible' ]
+				],
+				id => 'sort_select_1', class   => 'form-select form-select-sm' =%>
+		</div>
+	</div>
+	<div class="row mb-2">
+		<%= label_for sort_select_2 => maketext('Then by') . ':', class => 'col-form-label col-form-label-sm',
+			style => 'width:4.5rem' =%>
+		<div class="col-auto">
+			<%= select_field 'action.sort.secondary' => [
+					[ maketext('Set Name')    => 'set_id' ],
+					[ maketext('Open Date')   => 'open_date', selected => undef],
+					[ maketext('Close Date')  => 'due_date' ],
+					[ maketext('Answer Date') => 'answer_date' ],
+					[ maketext('Visibility')  => 'visible' ]
+				],
+				id => 'sort_select_2', class => 'form-select form-select-sm' =%>
+		</div>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/Scoring.html.ep b/templates/ContentGenerator/Instructor/Scoring.html.ep
new file mode 100644
index 0000000000..60257a77e7
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/Scoring.html.ep
@@ -0,0 +1,95 @@
+% use WeBWorK::Utils qw(readFile format_set_name_display);
+%
+% unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
+	<div class="alert alert-danger p-1 mb-0">
+		<%= maketext('You are not authorized to access instructor tools.') =%>
+	</div>
+	% last;
+% }
+%
+% unless ($authz->hasPermissions(param('user'), 'score_sets')) {
+	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to score sets.') %></div>
+	% last;
+% }
+%
+% my $scoringDir = $ce->{courseDirs}{scoring};
+%
+<div class="border border-dark p-2" style="max-width:700px">
+	<%= form_for current_route, name => 'scoring-form', id => 'scoring-form', method => 'POST', begin =%>
+		<%= $c->hidden_authen_fields =%>
+		<%= hidden_field returning => 1 =%>
+		<div class="row">
+			<div class="col-sm-5 mb-2">
+				<%= label_for selectedSet => maketext('Selected sets:'), class => 'form-label' =%>
+				<%= select_field selectedSet =>
+						[ map { [ format_set_name_display($_) => $_ ] } @{ $c->{ra_set_ids} } ],
+					id => 'selectedSet', class => 'form-select', size => 10, multiple => undef, dir => 'ltr' =%>
+			</div>
+			<div class="col-sm-7 my-sm-auto mb-2">
+				<div class="form-check">
+					<label class="form-check-label">
+						<%= check_box includeIndex => 1, class => 'form-check-input' =%>
+						<%= maketext('Include Success Index') =%>
+					</label>
+				</div>
+				<div class="form-check">
+					<label class="form-check-label">
+						<%= check_box recordSingleSetScores => 1, class => 'form-check-input' =%>
+						<%= maketext('Record Scores for Single Sets') =%>
+					</label>
+				</div>
+				<div class="form-check">
+					<label class="form-check-label">
+						% param('padFields', 1) unless param('returning');
+						<%= check_box padFields => 1, class => 'form-check-input' =%>
+						<%= maketext('Pad Fields') =%>
+					</label>
+				</div>
+				<div class="form-check">
+					<label class="form-check-label">
+						% param('includePercentEachSet', 1) unless param('returning');
+						<%= check_box includePercentEachSet => 1, class => 'form-check-input' =%>
+						<%= maketext('Include percentage grades columns for all sets') =%>
+					</label>
+				</div>
+			</div>
+		</div>
+		<div class="d-flex flex-sm-nowrap flex-wrap">
+			<%= submit_button maketext('Score selected set(s) and save to:'), name => 'score-sets',
+				id => 'score-sets', class => 'btn btn-primary btn-sm me-2 mb-sm-0 mb-2' =%>
+			<%= text_field scoringFileName => $c->{scoringFileName}, class => 'form-control form-control-sm',
+				size => '40', 'aria-labelledby' => 'score-sets' =%>
+		</div>
+	<% end =%>
+</div>
+%
+% my @selected = param('selectedSet');
+% if (@selected) {
+	<p><%= maketext('All of these files will also be made available for mail merge.') %></p>
+% }
+%
+% for my $setID (@selected) {
+	% my @validFiles;
+	% for my $type ('scr', 'ful') {
+		% my $filename = "s$setID$type.csv";
+		% my $path     = "$scoringDir/$filename";
+		% push @validFiles, $filename if -f $path;
+	% }
+	% if (@validFiles) {
+		<h2 dir="ltr"><%= format_set_name_display($setID) %></h2>
+		% for my $filename (@validFiles) {
+			<div class="mb-3">
+				<%= link_to $filename =>
+					$c->systemLink(url_for('instructor_scoring_download'), params => { getFile => $filename }) =%>
+			</div>
+		% }
+		<hr>
+	% }
+% }
+% if (-f "$scoringDir/$c->{scoringFileName}") {
+	<h2><%= maketext('Totals') %></h2>
+	<%= link_to $c->{scoringFileName} =>
+		$c->systemLink(url_for('instructor_scoring_download'), params => { getFile => $c->{scoringFileName} }) =%>
+	<hr>
+	<pre style="font-size:smaller"><%== WeBWorK::Utils::readFile("$scoringDir/$c->{scoringFileName}") =%></pre>
+% }
diff --git a/templates/ContentGenerator/Instructor/SendMail.html.ep b/templates/ContentGenerator/Instructor/SendMail.html.ep
new file mode 100644
index 0000000000..55f8819c74
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/SendMail.html.ep
@@ -0,0 +1,36 @@
+% use WeBWorK::Utils qw(getAssetURL);
+%
+% content_for js => begin
+	<%= javascript getAssetURL($ce, 'js/SendMail/sendmail.js'), defer => undef =%>
+% end
+%
+% unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
+	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to access instructor tools') %></div>
+	% last;
+% }
+%
+% unless ($authz->hasPermissions(param('user'), 'send_mail')) {
+	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to send mail to students') %></div>
+	% last;
+% }
+%
+% my $response = $c->{response} // '';
+%
+% if ($response eq 'preview') {
+	<%= $c->print_preview =%>
+% } else {
+	% if ($response eq 'send_email' && $c->{ra_send_to} && @{ $c->{ra_send_to} }) {
+		% my $message = begin
+			<i>
+				<%= maketext(
+					'Email is being sent to [quant,_1,recipient]. You will be notified by email '
+						. 'when the task is completed.  This may take several minutes if the class is large.',
+					scalar(@{ $c->{ra_send_to} })
+				) =%>
+			</i>
+		% end
+		% $c->addgoodmessage($message->());
+	% }
+	%
+	<%= include('ContentGenerator/Instructor/SendMail/main_form') =%>
+% }
diff --git a/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep b/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep
new file mode 100644
index 0000000000..719d408da8
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep
@@ -0,0 +1,195 @@
+% use WeBWorK::HTML::ScrollingRecordList qw/scrollingRecordList/;
+%
+<%= form_for current_route, id => 'mail-main-form', method => 'post', begin =%>
+	<%= $c->hidden_authen_fields =%>
+	%
+	% # Email settings
+	<div class="card mb-3">
+		<div class="card-body p-2">
+			<div class="row">
+				<div class="col-md-6 mb-2">
+					<div class="input-group input-group-sm mb-2">
+						<%= label_for 'openfilename', class => 'input-group-text', begin =%>
+							<strong><%= maketext('Message file:') %></strong>
+						<% end =%>
+						<%= select_field openfilename => [
+								[ None => '' ],
+								map { [ $_ => $_, $_ eq $c->{input_file} ? (selected => undef) : () ] }
+								$c->get_message_file_names
+							],
+							id => 'openfilename', class => 'form-select form-select-sm' =%>
+					</div>
+					<div class="input-group input-group-sm mb-2">
+						<%= label_for 'merge_file', class => 'input-group-text', begin =%>
+							<strong><%= maketext('Merge file:') %></strong>
+						<% end =%>
+						<%= select_field merge_file => [
+								[ None => '' ],
+								map { [ $_ => $_, $_ eq $c->{merge_file} ? (selected => undef) : () ] }
+								$c->get_merge_file_names
+							],
+							id => 'merge_file', class => 'form-select form-select-sm' =%>
+					</div>
+					<div class="row mb-1">
+						<%= label_for from => maketext('From:'),
+							class => 'col-sm-3 col-form-label col-form-label-sm' =%>
+						<div class="col-sm-9">
+							<%= text_field from => $c->{from}, id => 'from',
+								class => 'form-control form-control-sm' =%>
+						</div>
+					</div>
+					<div class="row mb-1">
+						<%= label_for replyTo => maketext('Reply-To:'),
+							class => 'col-sm-3 col-form-label col-form-label-sm' =%>
+						<div class="col-sm-9">
+							<%= text_field replyTo => $c->{replyTo}, id => 'replyTo',
+								class => 'form-control form-control-sm' =%>
+						</div>
+					</div>
+					<div class="row mb-2">
+						<%= label_for subject => maketext('Subject:'),
+							class => 'col-sm-3 col-form-label col-form-label-sm' =%>
+						<div class="col-sm-9">
+							<%= text_field subject => $c->{subject}, id => 'subject',
+								class => 'form-control form-control-sm' =%>
+						</div>
+					</div>
+					<div class="form-check">
+						<%= radio_button send_to => 'all_students', id => 'send_to_all', class => 'form-check-input' =%>
+						<%= label_for send_to_all => maketext('Send to all students'), class => 'form-check-label' =%>
+					</div>
+					<div class="form-check mb-2">
+						<%= radio_button send_to => 'studentID', id => 'send_to_selected', class => 'form-check-input',
+							checked => undef =%>
+							<%= label_for send_to_selected => maketext('Send to selected students'),
+								class => 'form-check-label' =%>
+					</div>
+					% if ($c->{preview_user}) {
+						<div class="input-group input-group-sm mb-2">
+							<%= submit_button maketext('Preview Message'),
+								name => 'previewMessage', class => 'btn btn-secondary btn-sm' =%>
+							<span class="input-group-text text-nowrap">
+								<strong><%= maketext('for') %></strong>&nbsp;
+								<span id="preview-user" data-default="<%=
+									$c->{defaultPreviewUser}->last_name . ', ' . $c->{defaultPreviewUser}->first_name
+									. ' (' . $c->{defaultPreviewUser}->user_id . ')' %>">
+									<%= $c->{preview_user}->last_name . ', ' . $c->{preview_user}->first_name
+										. ' (' . $c->{preview_user}->user_id . ')' =%>
+								</span>
+							</span>
+						</div>
+					% }
+					<div class="mb-2">
+						<%= submit_button maketext('Send Email'), name => 'sendEmail',
+							class => 'btn btn-secondary btn-sm d-inline w-auto' =%>
+					</div>
+					% # Insert a toast containing a list of available macros.
+					<div class="mb-0">
+						<button id="insertable-macros-btn" class="btn btn-secondary btn-sm" type="button">
+							<%= maketext('List of insertable macros') =%>
+						</button>
+					</div>
+					<div class="position-fixed top-0 end-0 p-3" style="z-index: 21">
+						<div id="insertable-macros" class="toast bg-white" role="alert" aria-live="polite"
+								aria-atomic="true">
+							<div class="toast-header">
+								<strong class="me-auto"><%= maketext('List of insertable macros') %></strong>
+								<button type="button" class="btn-close" data-bs-dismiss="toast" aria-label="Close">
+								</button>
+							</div>
+							<div class="toast-body">
+								<table class="table table-bordered table-sm align-middle w-auto mb-0 mx-auto">
+									<thead>
+										<tr><th><%= maketext('Macro') %></th><th><%= maketext('Value') %></th></tr>
+									</thead>
+									<tbody class="table-group-divider">
+										<tr><td>$SID</td><td><%= maketext('Student ID') %></td></tr>
+										<tr><td>$FN</td><td><%= maketext('First name') %></td></tr>
+										<tr><td>$LN</td><td><%= maketext('Last name') %></td></tr>
+										<tr><td>$SECTION</td><td><%= maketext('Section') %></td></tr>
+										<tr><td>$RECITATION</td><td><%= maketext('Recitation') %></td></tr>
+										<tr><td>$STATUS</td><td><%= maketext('Enrolled, Drop, etc.') %></td></tr>
+										<tr><td>$EMAIL</td><td><%= maketext('Email address') %></td></tr>
+										<tr><td>$LOGIN</td><td><%= maketext('Login') %></td></tr>
+										<tr><td>$COL[n]</td><td><%= maketext('nth column of merge file') %></td></tr>
+										<tr><td>$COL[-1]</td><td><%= maketext('Last column of merge file') %></td></tr>
+									</tbody>
+								</table>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="col-md-6 mb-0">
+					<div class="mb-2">
+						<strong><%= maketext('Students') %></strong>
+					</div>
+					<div class="mb-2">
+						<%= scrollingRecordList(
+							{
+								name                => 'classList',
+								controller          => $c,
+								default_sort        => 'lnfn',
+								default_format      => 'lnfn_uid',
+								default_filters     => ['all'],
+								refresh_button_name => maketext('Change Display Settings'),
+								attrs               => { size => 5, multiple => undef }
+							},
+							@{ $c->{ra_user_records} }
+						) =%>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	%
+	% # Show valid rows of selected merge file.
+	% if ($c->{merge_file}) {
+		<div class="mb-2"><%= maketext('Showing data from merge file: [_1]', $c->{merge_file}) =%></div>
+		% my $rh_merge_data = $c->read_scoring_file($c->{merge_file});
+		% my @rows;
+		% my $cols = 0;
+		% for my $user (@{ $c->{ra_user_records} }) {
+			% if ($rh_merge_data->{$user->student_id}) {
+				% my $this_row = $rh_merge_data->{$user->student_id};
+				% push(@rows, $this_row);
+				% $cols = scalar(@$this_row) if scalar(@$this_row) > $cols;
+			% }
+		% }
+		% if (@rows) {
+			<pre class="overflow-scroll" style="max-height: 100px;"><% =%>\
+				<%== join('', ' ', $c->data_format(1 .. $cols)) =%><br><% =%>\
+				<%== join('<br>', map { join('', ' ', $c->data_format2(@$_)) } @rows) =%>\
+			</pre>
+		% } else {
+			<div class="mb-3"><%= maketext('No merge data found.') =%></div>
+		% }
+	% }
+	%
+	<div class="mb-2">
+		<%= label_for 'email-body', class => 'form-label', begin =%>
+			<%= maketext("Email Body:") %><span class="required-field">*</span>
+		<% end =%>
+		<%= text_area body => $c->{r_text},
+			id => 'email-body', rows => $ce->{mail}{editor_window_rows}, class => 'form-control' %>
+	</div>
+	%
+	% # Save buttons
+	<div class="card">
+		<div class="card-body p-1 d-md-flex flex-wrap justify-content-evenly">
+			% if ($c->{input_file}) {
+				<div class="input-group input-group-sm w-auto m-1">
+					<%= submit_button maketext('Save'), name => 'saveMessage', class => 'btn btn-secondary btn-sm' =%>
+					<span class="input-group-text">
+						<strong><%= maketext('to') %></strong>&nbsp;<%= $c->{output_file} %>
+					</span>
+				</div>
+			% }
+			<div class="input-group input-group-sm w-auto m-1">
+				<%= submit_button maketext('Save as') . ':', name => 'saveAs', id => 'saveAs',
+					class => 'btn btn-secondary btn-sm' =%>
+				<%= text_field savefilename => $c->{output_file} ? $c->{output_file} : 'default.msg',
+					size => 20, class => 'form-control form-control-sm', 'aria-labelledby' => 'saveAs' =%>
+			</div>
+		</div>
+	</div>
+<% end =%>
diff --git a/templates/ContentGenerator/Instructor/SendMail/preview.html.ep b/templates/ContentGenerator/Instructor/SendMail/preview.html.ep
new file mode 100644
index 0000000000..d354a20756
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/SendMail/preview.html.ep
@@ -0,0 +1,27 @@
+<h2 class="fs-3"><%= maketext('This sample mail would be sent to [_1]', $ur->email_address) %></h2>
+<div class="mb-3" dir="ltr"><pre><%= $msg %></pre></div>
+% if ($c->{merge_file}) {
+	<h2 class="fs-3"><%= maketext('Merge file data:') %></h2>
+	<p><%= maketext('Showing data from merge file [_1] for user [_2]:', $c->{merge_file}, $ur->user_id) %></p>
+	<div class="mb-3" dir="ltr"><pre><%== $preview_header %></pre></div>
+% } else {
+	<h2 class="fs-3"><%= maketext('No merge file selected.') %></h2>
+% }
+% if (@{ $c->{ra_send_to} }) {
+	<h2 class="fs-3"><%= maketext('Emails to be sent to the following:') %></h2>
+	<div class="mb-3">
+		<ul>
+			% for (@{ $c->{ra_send_to} }) {
+				<li>
+					<%= $_ %>
+					% if ($c->{merge_file} && !$merge_data->{$student_ids->{$_}}) {
+						<span class="text-danger">(<%= maketext('No merge data found') %>)</span>
+					% }
+				</li>
+			% }
+		</ul>
+	</div>
+% } else {
+	<h2 class="fs-3"><%= maketext('No recipients selected.') %></h2>
+% }
+<div class="alert alert-info p-1 mt-3"><%= maketext('Use browser back button to return from preview mode.') %></div>
diff --git a/templates/ContentGenerator/Instructor/SetMaker.html.ep b/templates/ContentGenerator/Instructor/SetMaker.html.ep
new file mode 100644
index 0000000000..ef068c3d3f
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/SetMaker.html.ep
@@ -0,0 +1,90 @@
+% use WeBWorK::Utils qw(getAssetURL);
+%
+% content_for js => begin
+	<%= javascript getAssetURL($ce, 'node_modules/iframe-resizer/js/iframeResizer.min.js') =%>
+	<%= javascript getAssetURL($ce, 'js/RenderProblem/renderproblem.js'), defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/SetMaker/setmaker.js'), defer => undef =%>
+	%
+	% if ($authz->hasPermissions(scalar(param('user')), 'modify_tags')) {
+		<%= javascript "$ce->{webworkURLs}{htdocs}/js/TagWidget/tagwidget.js", id => 'tag-widget-script',
+			defer => undef, data => { taxonomy => "$ce->{webworkURLs}{htdocs}/DATA/tagging-taxonomy.json" } =%>
+	% }
+% end
+%
+% unless ($authz->hasPermissions(param('user'), 'modify_problem_sets')) {
+	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to access instructor tools.') %></div>
+	% last;
+% }
+%
+<%= form_for current_route, method => 'POST', name => 'library_browser_form', begin =%>
+	<%= $c->hidden_authen_fields =%>
+	<%= hidden_field hidden_course_id => $courseID =%>
+	<%= hidden_field hidden_language => $ce->{language} =%>
+	<%= hidden_field browse_which => $c->{browse_which} =%>
+	<%= hidden_field problem_seed => $c->{problem_seed} =%>
+	% for (my $i = 0; $i < @$pg_files; ++$i) {
+		<%= hidden_field "all_past_list$i" => $pg_files->[$i]{filepath} =%>
+		<%= hidden_field "all_past_mlt$i", => $pg_files->[$i]{morelt} || 0 =%>
+	% }
+	<%= hidden_field first_shown => $c->{first_shown} =%>
+	<%= hidden_field last_shown => $c->{last_shown} =%>
+	<%= hidden_field first_index => $c->{first_index} =%>
+	<%= hidden_field last_index => $c->{last_index} =%>
+	<%= hidden_field total_probs => $c->{total_probs} =%>
+	%
+	<div class="library-browser-table">
+		<%= include('ContentGenerator/Instructor/SetMaker/top_row',
+			local_sets => $c->{all_db_sets}, browse_which => $c->{browse_which}) =%>
+	</div>
+	%
+	% # Show problems
+	% for (my $i = 0; $i < @$plist; ++$i) {
+		% $pg_files->[ $i + $c->{first_index} ]{filepath} =~ s|^$ce->{courseDirs}{templates}/?||;
+		% my $sourceFileData = $pg_files->[ $i + $c->{first_index} ];
+		% if ($sourceFileData->{children}) {
+			% # If this problem has children, then show the problem and all children.
+			<div id="mlt-table<%= $i + 1 %>" class="lb-mlt-group">
+				<%= include 'ContentGenerator/Instructor/SetMaker/problem_row',
+					sourceFileData => $sourceFileData, pg_file => $plist->[$i], cnt => $i + 1 =%>
+				% for (@{ $sourceFileData->{children} }) {
+					% ++$i;
+					% last if $i == @$plist;    # Protection in case of malformed data.
+					% $pg_files->[ $i + $c->{first_index} ]{filepath} =~ s|^$ce->{courseDirs}{templates}/?||;
+					<%= include 'ContentGenerator/Instructor/SetMaker/problem_row',
+						sourceFileData => $pg_files->[ $i + $c->{first_index} ],
+						pg_file => $plist->[$i], cnt => $i + 1 =%>
+				% }
+			</div>
+		% } else {
+			<%= include 'ContentGenerator/Instructor/SetMaker/problem_row',
+				sourceFileData => $sourceFileData, pg_file => $plist->[$i], cnt => $i + 1 =%>
+		% }
+	% }
+	%
+	% if (@$pg_files) {
+		<div class="my-2">
+			<span id="what_shown">
+				<span id="firstshown"><%= $c->{first_shown} + 1 %></span>-<span id="lastshown"><%=
+					$c->{last_shown} + 1 %></span>
+			</span>
+			<%= maketext('of') %>
+			<span id="totalshown"><%= $c->{total_probs} %></span>
+			<%= maketext('shown') %>
+			% if ($c->{first_index} > 0) {
+				<%= submit_button maketext('Previous page'), name => 'prev_page',
+					class => 'btn btn-secondary btn-sm' =%>
+			% }
+			% if (1 + $c->{last_index} < @$pg_files) {
+				<%= submit_button maketext('Next page'), name => 'next_page', class => 'btn btn-secondary btn-sm' =%>
+			% }
+		</div>
+		<p>
+			<%= maketext(
+				'Some problems shown above represent multiple similar problems from the database.  If the (top) '
+					. 'information line for a problem has a letter M for "More", hover your mouse over the M  to '
+					. 'see how many similar problems are hidden, or click on the M to see the problems.  If you click '
+					. 'to view these problems, the M becomes an L, which can be clicked on to hide the problems again.'
+			) =%>
+		</p>
+	% }
+<% end =%>
diff --git a/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep b/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep
new file mode 100644
index 0000000000..525d03db07
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep
@@ -0,0 +1,19 @@
+% use WeBWorK::Utils qw(format_set_name_display);
+%
+% $selected_library //= '';
+%
+<div class="InfoPanel">
+	<div class="mb-2">
+		<%= label_for library_sets => maketext('Browse from:'), class => 'col-form-label-sm' =%>
+		<%= select_field library_sets => [
+				@$local_sets == 0 ? [ maketext('No sets in this course yet') => '' ]
+				: (
+					$selected_library eq '' ? [ maketext('Select a Homework Set') => '', selected => undef, disabled => 'disabled' ] : (),
+					map { [ format_set_name_display($_) => $_, $_ eq $selected_library ? (selected => undef) : () ] }
+					@$local_sets
+				)
+			],
+			id => 'library_sets', class => 'form-select form-select-sm d-inline w-auto', dir => 'ltr' =%>
+	</div>
+	<%= include 'ContentGenerator/Instructor/SetMaker/view_problems_line', internal_name => 'view_course_set' =%>
+</div>
diff --git a/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel.html.ep b/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel.html.ep
new file mode 100644
index 0000000000..6327c0a1eb
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel.html.ep
@@ -0,0 +1,32 @@
+% # See if the problem library is installed.
+% my $libraryRoot = $ce->{problemLibrary}{root};
+% unless ($libraryRoot) {
+	<div class="alert alert-danger p-1 mb-2 text-center">The problem library has not been installed.</div>
+	% last;
+% }
+% # Test if the Library directory link exists.  If not, try to make it.
+% unless (-d "$ce->{courseDirs}{templates}/Library"
+	% || symlink($libraryRoot, "$ce->{courseDirs}{templates}/Library"))
+% {
+	% my $msg = begin
+	You are missing the directory <code>templates/Library</code>, which is needed for the Problem Library to function.
+	It should be a link pointing to <code><%= $libraryRoot %></code>, which you set in <code>conf/site.conf</code>.  An
+	attempt was made to create the link, but that failed. Check the permissions in your <code>templates</code>
+	directory.
+	% end
+	% $c->addbadmessage($msg->());
+% }
+%
+% # Now check which version to use.
+% my $libraryVersion = $ce->{problemLibrary}{version} || 2;
+% if ($libraryVersion == 1) {
+ 	<div class="alert alert-danger p-1 mb-2 text-center">Problem library version 1 is no longer supported.</div>
+% } elsif ($libraryVersion >= 2) {
+	% if ($c->{library_basic} == 1) {
+		<%= include 'ContentGenerator/Instructor/SetMaker/browse_library_panel_simple' =%>
+	% } else {
+		<%= include 'ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced' =%>
+	% }
+% } else {
+	<div class="alert alert-danger p-1 mb-2 text-center">The problem library version is set to an illegal value.</div>
+% }
diff --git a/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep b/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep
new file mode 100644
index 0000000000..ccbc120d71
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep
@@ -0,0 +1,119 @@
+% use WeBWorK::Utils::ListingDB qw(getAllDBsubjects getAllDBchapters getAllDBsections getDBTextbooks countDBListings);
+%
+<div>
+	<%= hidden_field library_is_basic => 2 =%>
+	<div class="text-center">
+		<label class="col-form-label-sm pt-0"><%= maketext('All Selected Constraints Joined by "And"') =%></label>
+	</div>
+	<div class="row mb-1">
+		<div class="col-md-6 col-sm-8 mb-1 offset-md-3">
+			<div class="row mb-1">
+				<%= label_for library_subjects => maketext('Subject:'),
+					class => 'col-3 col-form-label col-form-label-sm' =%>
+				<div class="col-9">
+					<%= select_field library_subjects => [
+							[ maketext('All Subjects') => '', selected => undef ],
+							getAllDBsubjects($c)
+						],
+						id => 'library_subjects', class => 'form-select form-select-sm' =%>
+				</div>
+			</div>
+			<div class="row mb-1">
+				<%= label_for library_chapters => maketext('Chapter:'),
+					class => 'col-3 col-form-label col-form-label-sm' =%>
+				<div class="col-9">
+					<%= select_field library_chapters => [
+							[ maketext('All Chapters') => '', selected => undef ],
+							getAllDBchapters($c)
+						],
+						id => 'library_chapters', class => 'form-select form-select-sm' =%>
+				</div>
+			</div>
+			<div class="row mb-1">
+				<%= label_for library_sections => maketext('Section:'),
+					class => 'col-3 col-form-label col-form-label-sm' =%>
+				<div class="col-9">
+					<%= select_field library_sections => [
+							[ maketext('All Sections') => '', selected => undef ],
+							getAllDBsections($c)
+						],
+						id => 'library_sections', class => 'form-select form-select-sm' =%>
+				</div>
+			</div>
+			<div class="row mb-1">
+				<%= label_for library_textbook => maketext('Textbook:'),
+					class => 'col-3 col-form-label col-form-label-sm' =%>
+				<div class="col-9">
+					<%= select_field library_textbook => [
+							[ maketext('All Textbooks') => '', selected => undef ],
+							map { [ "$_->[1] by $_->[2] (edition $_->[3])" => $_->[0] ] } @{ getDBTextbooks($c) }
+						],
+						id => 'library_textbook', class => 'form-select form-select-sm' =%>
+				</div>
+			</div>
+			<div class="row mb-1">
+				<%= label_for library_textchapter => maketext('Text chapter:'),
+					class => 'col-3 col-form-label col-form-label-sm text-nowrap' =%>
+				<div class="col-9">
+					<%= select_field library_textchapter => [
+							[ maketext('All Chapters') => '', selected => undef ],
+							map { $_->[0] } @{ getDBTextbooks($c, 'textchapter') }
+						],
+						id => 'library_textchapter', class => 'form-select form-select-sm' =%>
+				</div>
+			</div>
+			<div class="row mb-1">
+				<%= label_for library_textsection => maketext('Text section:'),
+					class => 'col-3 col-form-label col-form-label-sm text-nowrap' =%>
+				<div class="col-9">
+					<%= select_field library_textsection => [
+							[ maketext('All Sections') => '', selected => undef ],
+							map { $_->[0] } @{ getDBTextbooks($c, 'textsection') }
+						],
+						id => 'library_textsection', class => 'form-select form-select-sm' =%>
+				</div>
+			</div>
+			<div class="row mb-1">
+				<label class="col-3 col-form-label col-form-label-sm"><%= maketext('Level:') %></label>
+				<div class="col-9">
+					<div class="d-flex justify-content-between align-items-center">
+						% for (1 .. 6) {
+							<div class="form-check form-check-inline">
+								<label class="form-check-label col-form-label-sm">
+									<%= check_box level => $_, class => 'form-check-input' =%>
+									<%= $_ =%>
+								</label>
+							</div>
+						% }
+						<%= $c->helpMacro('Levels') =%>
+					</div>
+				</div>
+			</div>
+			<div class="row mb-1">
+				<%= label_for library_keywords => maketext('Keywords:'),
+					class => 'col-3 col-form-label col-form-label-sm' =%>
+				<div class="col-9">
+					<%= text_field library_keywords => '',
+						id => 'library_keywords', class => 'form-control form-control-sm' =%>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-3 col-sm-4 mb-1 d-flex flex-sm-column justify-content-sm-start justify-content-center">
+			<%= submit_button maketext('Update Menus'), name => 'lib_select_subject',
+				class => 'btn btn-secondary btn-sm mb-1 library-panel-btn' =%>
+			<%= submit_button maketext('Reset'), name => 'library_reset',
+				class => 'btn btn-secondary btn-sm mb-1 ms-sm-0 ms-2 library-panel-btn' =%>
+			<%= submit_button maketext('Basic Search'), name => 'library_basic',
+				class => 'btn btn-secondary btn-sm mb-1 ms-sm-0 ms-2 library-panel-btn' =%>
+		</div>
+	</div>
+	<%= include 'ContentGenerator/Instructor/SetMaker/view_problems_line', internal_name => 'lib_view' =%>
+	<div class="text-center" id="library_count_line">
+		<label class="col-form-label-sm">
+			% my $listingsCount = countDBListings($c);
+			<%= $listingsCount == 0
+				? maketext('There are no matching WeBWorK problems')
+				: maketext('There are [_1] matching WeBWorK problems', $listingsCount) =%>
+		</label>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep b/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep
new file mode 100644
index 0000000000..7da61a3303
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep
@@ -0,0 +1,55 @@
+% use WeBWorK::Utils::ListingDB qw(getAllDBsubjects getAllDBchapters getAllDBsections countDBListings);
+%
+<div>
+	<%= hidden_field library_is_basic => 1 =%>
+	<div class="row mb-2">
+		<div class="col-md-6 col-sm-8 offset-md-3">
+			<div class="row mb-1">
+				<%= label_for library_subjects => maketext('Subject:'),
+					class => 'col-2 col-form-label col-form-label-sm' =%>
+				<div class="col-10">
+					<%= select_field library_subjects => [
+							[ maketext('All Subjects') => '', selected => undef ],
+							getAllDBsubjects($c)
+						],
+						id => 'library_subjects', class => 'form-select form-select-sm' =%>
+				</div>
+			</div>
+			<div class="row mb-1">
+				<%= label_for library_chapters => maketext('Chapter:'),
+					class => 'col-2 col-form-label col-form-label-sm' =%>
+				<div class="col-10">
+					<%= select_field library_chapters => [
+							[ maketext('All Chapters') => '', selected => undef ],
+							getAllDBchapters($c)
+						],
+						id => 'library_chapters', class => 'form-select form-select-sm' =%>
+				</div>
+			</div>
+			<div class="row mb-1">
+				<%= label_for library_sections => maketext('Section:'),
+					class => 'col-2 col-form-label col-form-label-sm' =%>
+				<div class="col-10">
+					<%= select_field library_sections => [
+							[ maketext('All Sections') => '', selected => undef ],
+							getAllDBsections($c)
+						],
+						id => 'library_sections', class => 'form-select form-select-sm' =%>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-3 col-sm-4 mb-1 d-flex flex-sm-column justify-content-sm-start justify-content-center">
+			<%= submit_button maketext('Advanced Search'), name => 'library_advanced',
+				class => 'btn btn-secondary btn-sm library-panel-btn' =%>
+		</div>
+	</div>
+	<%= include 'ContentGenerator/Instructor/SetMaker/view_problems_line', internal_name => 'lib_view' =%>
+	<div class="text-center" id="library_count_line">
+		<label class="col-form-label-sm">
+			% my $listingsCount = countDBListings($c);
+			<%= $listingsCount == 0
+				? maketext('There are no matching WeBWorK problems')
+				: maketext('There are [_1] matching WeBWorK problems', $listingsCount) =%>
+		</label>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep b/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep
new file mode 100644
index 0000000000..b3e827cdb1
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep
@@ -0,0 +1,27 @@
+% $selected_library //= '';
+% my $lib = (stash('lib') || '') =~ s/^browse_//r;
+%
+% my $prob_dirs = $c->get_problem_directories($lib);
+%
+<div class="InfoPanel">
+	<div class="mb-2">
+		<%= label_for library_sets =>
+				maketext('[_1] Problems:', $lib eq '' ? maketext('File Manager') : $c->{problibs}{$lib}),
+			class => 'col-form-label-sm' =%>
+		<%= select_field library_sets => [
+				@$prob_dirs == 0 ? [ maketext('Found no directories containing problems') => '' ]
+				: (
+					$selected_library eq '' ? [ maketext('Select a Folder') => '', selected => undef, disabled => 'disabled' ] : (),
+					$lib ? (
+						map { [ $_ =~ s/^$lib\/(.*)$/$1/r => $_, $_ eq $selected_library ? (selected => undef) : () ] }
+						@$prob_dirs
+					) : (
+						map { [ $_ =~ s/^My Problems$/[templates folder]/r => $_, $_ eq $selected_library ? (selected => undef) : () ] }
+						@$prob_dirs
+					)
+				)
+			],
+			id => 'library_sets', class => 'form-select form-select-sm d-inline w-auto' =%>
+	</div>
+	<%= include 'ContentGenerator/Instructor/SetMaker/view_problems_line', internal_name => 'view_local_set' =%>
+</div>
diff --git a/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep b/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep
new file mode 100644
index 0000000000..76b83d3c5a
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep
@@ -0,0 +1,24 @@
+% use WeBWorK::Utils::Instructor qw(getDefList);
+%
+% my @list_of_set_defs = getDefList($ce);
+%
+% if (!@list_of_set_defs) {
+	<div class="InfoPanel">
+		<label class="col-form-label-sm">
+			<%= maketext('There are no set definition files in this course to look at.') =%>
+		</label>
+	</div>
+	% last;
+% }
+%
+<div class="InfoPanel">
+	<div class="mb-2">
+		<label class="col-form-label-sm"><%= maketext('Browse from:') %></label>
+		<%= select_field library_sets => [
+				$selected_library eq '' ? [ maketext('Select a Set Definition File') => '', selected => undef, disabled => 'disabled' ] : (),
+				@list_of_set_defs
+			],
+			class => 'form-select form-select-sm d-inline w-auto' =%>
+	</div>
+	<%= include 'ContentGenerator/Instructor/SetMaker/view_problems_line', internal_name => 'view_setdef_set' =%>
+</div>
diff --git a/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep b/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep
new file mode 100644
index 0000000000..4d131a188c
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep
@@ -0,0 +1,271 @@
+% use WeBWorK::Utils qw(wwRound);
+%
+% my $sourceFileName = $sourceFileData->{filepath} =~ s|^\./||r;
+% my $isstatic       = $sourceFileData->{static};
+% my $isMO           = $sourceFileData->{MO};
+%
+% if (!defined $isMO) {
+	% ($isMO, $isstatic) = $c->getDBextras($sourceFileName);
+% }
+%
+% # Determine if the target set is a gateway assignment.
+% my $setRecord =
+	% (defined param('local_sets') && param('local_sets') ne '')
+	% ? $db->getGlobalSet(param('local_sets'))
+	% : undef;
+% my $isGatewaySet = defined $setRecord && $setRecord->assignment_type =~ /gateway/;
+%
+% my $noshowclass = $sourceFileData->{morelt} ? "MLT$sourceFileData->{morelt}" : "NS$cnt";
+% if ($sourceFileData->{children}) {
+	% my $numchild = @{ $sourceFileData->{children} };
+	% content_for "mlt-$cnt" => begin
+		<%= tag('span',
+			class    => 'lb-mlt-parent btn btn-sm btn-secondary',
+			id       => "mlt$cnt",
+			tabindex => 0,
+			role     => 'button',
+			data     => {
+				mlt_cnt          => $cnt,
+				mlt_noshow_class => $noshowclass,
+				less_text        => maketext('Show less like this'),
+				more_text        => maketext('Show [_1] more like this', $numchild),
+				bs_title         => maketext('Show [_1] more like this', $numchild),
+				bs_toggle        => 'tooltip',
+				bs_placement     => 'top'
+			},
+			'M'
+		) =%>
+	% end
+	% $noshowclass = "NS$cnt";
+% }
+%
+% # Get statistics to display
+%
+% if ($ce->{problemLibrary}{showLibraryGlobalStats}) {
+	% my $stats = $c->{library_stats_handler}->getGlobalStats($sourceFileName);
+	% if ($stats->{students_attempted}) {
+		% content_for "global-problem-stats-$cnt" => begin
+			<div class="d-inline-block font-sm text-nowrap">
+				<span class="info-button text-primary" title="<%= maketext('Global Usage Data') %>"
+					data-bs-content="<%= maketext(
+						'Global data on problem usage is contributed by many institutions using '
+							. 'WeBWorK all over the world. The Usage figure is the total number of  '
+							. 'individuals who have attemped this problem at least once. A high figure '
+							. 'represents a problem which has been assigned to many students and is  '
+							. 'both popular with instructors and likely bug free.'
+					) %>"
+					data-bs-toggle="popover" data-bs-placement="top" data-bs-trigger="hover focus" tabindex="0"
+					role="button">
+					<%= maketext('GLOBAL Usage') . ': ' =%>
+				</span>
+				<%= $stats->{students_attempted} . ', ' =%>
+				<span class="info-button text-primary" title="<%= maketext('Global Attempts') %>"
+					data-bs-content="<%= maketext(
+						'The Attempts figure is the global average of the number of attempts '
+							. '(both correct and incorrect) individuals take on this problem.  '
+							. 'A high figure may represent a difficult problem.  Note that problems '
+							. 'with multiple parts may have higher average attempts since many students  '
+							. 'will submit an answer to each part before continuing and each such  '
+							. 'submittal counts as an attempt.'
+					) %>"
+					data-bs-toggle="popover" data-bs-placement="top" data-bs-trigger="hover focus" tabindex="0"
+					role="button">
+					<%= maketext('Attempts') . ': ' =%>
+				</span>
+				<%= wwRound(2, $stats->{average_attempts}) . ', ' =%>
+				<span class="info-button text-primary" title="<%= maketext('Global Status') %>"
+					data-bs-content="<%= tag('p', maketext(
+						'The Status figure is the global average of the Status '
+							. 'individuals have earned on this problem. The Status is the percentage '
+							. 'correct (from 0% to 100%) recorded for the problem.  A low figure may  '
+							. 'represent a difficult problem.  The Status is often fairly high since  '
+							. 'many students will work on a problem until they get it correct or nearly so.'
+					))
+					. tag('p', class => 'mb-0', maketext(
+						'Reviewing a problem and looking at both the average Attempts and  '
+							. 'average Status should give instructors valuable information about '
+							. 'the difficulty of the problem.'
+					)) %>"
+					data-bs-toggle="popover" data-bs-placement="top" data-bs-html="true"
+					data-bs-trigger="hover focus" tabindex="0" role="button">
+					<%= maketext('Status') . ': ' =%>
+				</span>
+				<%= wwRound(0, 100 * $stats->{average_status}) =%>
+			</div>
+		% end
+	% }
+% }
+%
+% my $local_problem_stats = '';
+% if ($ce->{problemLibrary}{showLibraryLocalStats}) {
+	% my $stats = $c->{library_stats_handler}->getLocalStats($sourceFileName);
+	% if ($stats->{students_attempted}) {
+		% content_for "local-problem-stats-$cnt" => begin
+			<div class="d-inline-block font-sm text-nowrap">
+				<span class="info-button text-primary" title="<%= maketext('Local Usage Data') %>"
+					data-bs-content="<%= tag('p', maketext(
+						'Local data on problem usage is generated and maintained by your institution. '
+							. 'The Usage figure is the total number of local '
+							. 'individuals who have attemped this problem at least once. A high figure '
+							. 'represents a problem which has been assigned to many students and is  '
+							. 'both popular with instructors and likely bug free.'
+					))
+					. tag('p', class => 'mb-0', maketext(
+						'Local data is generated when your systems admin runs the script '
+							. 'update-OPL-statistics.'
+					)) %>"
+					data-bs-toggle="popover" data-bs-placement="top" data-bs-trigger="hover focus" data-bs-html="true"
+					tabindex="0" role="button">
+					<%= maketext('LOCAL Usage') . ': ' =%>
+				</span>
+				<%= $stats->{students_attempted} . ', ' =%>
+				<span class="info-button text-primary" title="<%= maketext('Local Attempts') %>"
+					data-bs-content="<%= maketext(
+						'The Attempts figure is the local average of the number of attempts '
+							. '(both correct and incorrect) individuals at your institution take on this problem. '
+							. 'A high figure may represent a difficult problem.  Note that problems '
+							. 'with multiple parts may have higher average attempts since many students  '
+							. 'will submit an answer to each part before continuing and each such  '
+							. 'submittal counts as an attempt.'
+					) %>"
+					data-bs-toggle="popover" data-bs-placement="top" data-bs-trigger="hover focus" tabindex="0"
+					role="button">
+					<%= maketext('Attempts') . ': ' =%>
+				</span>
+				<%= wwRound(2, $stats->{average_attempts}) . ', ' =%>
+				<span class="info-button text-primary" title="<%= maketext('Local Status') %>"
+					data-bs-content="<%= tag('p', maketext(
+						'The Status figure is the local average of the Status '
+							. 'individuals at your institution have earned on this problem. The Status is the '
+							. 'percentage correct (from 0% to 100%) recorded for the problem.  A low figure may  '
+							. 'represent a difficult problem.  The Status is often fairly high since  '
+							. 'many students will work on a problem until they get it correct or nearly so.'
+					))
+					. tag('p', class => 'mb-0', maketext(
+						'Reviewing a problem and looking at both the average Attempts and  '
+							. 'average Status should give instructors valuable information about '
+							. 'the difficulty of the problem.'
+					)) %>"
+					data-bs-toggle="popover" data-bs-placement="top" data-bs-html="true" data-bs-trigger="hover focus"
+					tabindex="0" role="button">
+					<%= maketext('Status') . ': ' =%>
+				</span>
+				<%= wwRound(0, 100 * $stats->{average_status}) =%>
+			</div>
+		% end
+	% }
+% }
+%
+<div id="pgrow<%= $cnt %>" class="lb-problem-row <%= $noshowclass %> <%= $sourceFileData->{noshow} ? 'd-none' : '' %>">
+	<div class="card p-2">
+		<div class="lb-problem-header d-flex flex-wrap justify-content-between">
+			<div class="lb-problem-add d-flex align-items-center mb-1">
+				<button class="add_me btn btn-primary btn-sm" type="button"
+					data-bs-title="<%= maketext('Add problem to target set') %>"
+					data-source-file="<%= $sourceFileName %>" data-bs-toggle="tooltip" data-bs-placement="top">
+					<%= maketext('Add') %>
+				</button>
+				% if ($authz->hasPermissions(param('user'), 'modify_tags')) {
+					<button id="tagger<%= $cnt %>" class="tag-edit-btn btn btn-secondary btn-sm ms-2" type="button"
+						data-source-file="<%= "$ce->{courseDirs}{templates}/$sourceFileName" %>">
+						<%= maketext('Edit Tags') =%>
+					</button>
+				% }
+			</div>
+			<div class="d-flex flex-wrap align-items-center mb-1 gap-2">
+				<%= content "global-problem-stats-$cnt" =%>
+				<%= content "local-problem-stats-$cnt" =%>
+			</div>
+			<div class="lb-problem-icons mb-1 d-flex align-items-center">
+				<%= content "mlt-$cnt" =%>
+				<span class="motag">
+					% if ($isMO) {
+						<span class="info-button btn btn-sm btn-secondary" title="<%= maketext('Uses Math Objects') %>"
+							data-bs-content="<%= maketext(
+								'Some WeBWorK problems are programmed using what are called <i>Math Objects</i>. '
+									. 'These problems are preferred by some people because they '
+									. 'provide a more consistent collection of messages to faulty student '
+									. 'answers, particularly for answers which are way off base.'
+							) %>"
+							data-bs-toggle="popover" data-bs-placement="top" data-bs-html="true"
+							data-bs-trigger="hover focus" tabindex="0" role="button">
+							<%= image "$ce->{webworkURLs}{htdocs}/images/pi.svg",
+								alt => maketext('Uses Math Objects') =%>
+						</span>
+					% }
+				</span>
+				% if (!$isstatic) {
+					<span class="rerandomize_problem_button btn btn-sm btn-secondary"
+						data-target-problem="<%= $cnt %>" data-bs-title="<%= maketext('Randomize') %>"
+						data-bs-toggle="tooltip" data-bs-placement="top" tabindex="0"
+						role="button" aria-label="rerandomize problem">
+						<i class="fas fa-random" aria-hidden="true"></i>
+					</span>
+				% }
+				<%= link_to $c->systemLink(
+						url_for('instructor_problem_editor_withset_withproblem',
+							setID     => 'Undefined_Set',
+						   	problemID => '1'
+						),
+						params => {
+							sourceFilePath => $sourceFileName,
+							problemSeed    => $c->{problem_seed}
+						}
+					),
+					id     => "editit$cnt",
+					class  => 'btn btn-sm btn-secondary',
+					target => 'WW_Editor',
+					data   => {
+						bs_title     => maketext('Edit it'),
+						bs_toggle    => 'tooltip',
+						bs_placement => 'top'
+					},
+					begin =%>
+					<i class="icon fas fa-pencil-alt" data-alt="edit" aria-hidden="true"></i>
+				<% end =%>
+				<%= link_to $c->systemLink(
+						url_for($isGatewaySet ? 'gateway_quiz' : 'problem_detail',
+							setID => 'Undefined_Set',
+							$isGatewaySet ? () : (problemID => '1')
+						),
+						params => {
+							effectiveUser  => scalar(param('user')),
+							editMode       => 'SetMaker',
+							problemSeed    => $c->{problem_seed},
+							sourceFilePath => $sourceFileName,
+							displayMode    => (
+								!defined param('problem_displaymode') || param('problem_displaymode') eq 'None'
+							) ? $ce->{pg}{options}{displayMode} : param('problem_displaymode'),
+						}
+					),
+					id     => "tryit$cnt",
+					class  => 'text-decoration-none btn btn-sm btn-secondary',
+					target => 'WW_View',
+					data   => {
+						bs_title     => maketext('Try it'),
+						bs_toggle    => 'tooltip',
+						bs_placement => 'top'
+					},
+					begin =%>
+					<i class="far fa-eye"></i>
+				<% end =%>
+				<span class="dont-show btn btn-sm btn-secondary" data-bs-title="<%= maketext('Hide this problem') %>"
+					data-row-cnt="<%= $cnt %>" data-bs-toggle="tooltip" data-bs-placement="top" tabindex="0"
+					role="button" aria-label="hide this problem">
+					<i class="fas fa-times" aria-hidden="true"></i>
+				</span>
+			</div>
+		</div>
+		<div class="lb-problem-sub-header d-flex">
+			<div class="lb-problem-path font-sm flex-grow-1 flex-shrink-1"><%= $sourceFileName %></div>
+			<div class="lb-inset text-nowrap <%= $c->{isInSet}{$sourceFileName} ? '' : ' d-none' %>"
+				id="inset<%= $cnt %>">
+				<i><b><%= maketext('(in target set)') %></b></i>
+			</div>
+		</div>
+		<%= hidden_field "filetrial$cnt" => $sourceFileName =%>
+		<div>
+			<div class="rpc_render_area" id="problem_render_area_<%= $cnt %>" data-pg-file="<%= $pg_file %>"></div>
+		</div>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep b/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep
new file mode 100644
index 0000000000..d5cec32c01
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep
@@ -0,0 +1,101 @@
+% use WeBWorK::Utils qw(format_set_name_display);
+%
+% my $selected_set = param('local_sets') // '';
+%
+<hr class="mt-0 mb-2">
+<div class="d-flex flex-wrap justify-content-center">
+	<div class="d-flex flex-wrap justify-content-center mb-2">
+		<%= label_for 'local_sets', class => 'col-form-label-sm', begin =%>
+			<%= maketext('Add problems to') %> <b><%= maketext('Target Set:') %></b>
+		<% end =%>
+		<%= select_field local_sets => [
+				@$local_sets == 0 ? [ maketext('No sets in this course yet') => '' ]
+				: (
+					$selected_set eq '' ? [ maketext('Select a Set from this Course') => '', selected => undef ] : (),
+					map { [ format_set_name_display($_) => $_, $_ eq $selected_set ? (selected => undef) : () ] }
+					@$local_sets
+				)
+			],
+			id    => 'local_sets',
+			class => 'form-select form-select-sm d-inline w-auto mx-2',
+			dir   => 'ltr',
+			data  => {
+				no_set_selected => maketext('No Target Set Selected'),
+				pick_target_set => maketext('Pick a target set above to add this problem to.'),
+				problems_added  => maketext('Problems Added'),
+				added_to_single => maketext('Added one problem to set [_1].',   '{set}'),
+				added_to_plural => maketext('Added [_1] problems to set [_2].', '{number}', '{set}')
+			} =%>
+	</div>
+	<%= submit_button maketext('Edit Target Set'), name => 'edit_local', class => 'btn btn-primary btn-sm mb-2' =%>
+</div>
+<div class="d-flex flex-wrap justify-content-center">
+	<%= submit_button maketext('Create a New Set in This Course:'), name => 'new_local_set', id => 'new_local_set',
+		class => 'btn btn-primary btn-sm mb-2 mx-2' =%>
+	<%= text_field new_set_name => '', class => 'form-control form-control-sm d-inline w-auto mb-2',
+		'aria-labelledby' => 'new_local_set', placeholder => maketext('New set name'), size => 30, dir => 'ltr' =%>
+</div>
+<hr class="mt-0 mb-2">
+<div class="d-flex justify-content-center">
+	<label class="col-form-label-sm mb-2 me-1"><%= maketext('Browse') %></label>
+	<div class="d-flex flex-wrap justify-content-center">
+		<%= submit_button maketext('Open Problem Library'), name => 'browse_npl_library',
+			class => 'browse-lib-btn btn btn-secondary btn-sm mb-2 mx-1',
+			$browse_which eq 'browse_npl_library' ? (disabled => undef) : () =%>
+		<%= submit_button maketext('File Manager'), name => 'browse_local',
+			class => 'browse-lib-btn btn btn-secondary btn-sm mb-2 mx-1',
+			$browse_which eq 'browse_local' ? (disabled => undef) : () =%>
+		<%= submit_button maketext('Course Sets'), name => 'browse_course_sets',
+			class => 'browse-lib-btn btn btn-secondary btn-sm mb-2 mx-1',
+			$browse_which eq 'browse_course_sets' ? (disabled => undef) : () =%>
+		<%= submit_button maketext('Set Definition Files'), name => 'browse_setdefs',
+			class => 'browse-lib-btn btn btn-secondary btn-sm mb-2 mx-1',
+			$browse_which eq 'browse_setdefs' ? (disabled => undef) : () =%>
+	</div>
+</div>
+% # Add buttons for additional problem libraries
+% if (%{ $c->{problibs} }) {
+	<div class="d-flex justify-content-center">
+		<label class="col-form-label-sm mb-2"><%= maketext('or Problems from') %></label>
+		<div class="d-flex flex-wrap justify-content-center">
+			% for (sort grep { -d "$ce->{courseDirs}{templates}/$_" } keys %{ $c->{problibs} }) {
+				<%= submit_button $c->{problibs}{$_},
+					name => "browse_$_", class => 'btn btn-secondary btn-sm ms-2 mb-2',
+					($browse_which eq "browse_$_") ? (disabled => undef) : () =%>
+			% }
+		</div>
+	</div>
+% }
+<hr class="mt-0 mb-2">
+% if ($browse_which eq 'browse_local') {
+	<%= include 'ContentGenerator/Instructor/SetMaker/browse_local_panel',
+		selected_library => $c->{current_library_set} =%>
+% } elsif ($browse_which eq 'browse_course_sets') {
+	<%= include 'ContentGenerator/Instructor/SetMaker/browse_course_sets_panel',
+		selected_library => $c->{current_library_set} =%>
+% } elsif ($browse_which eq 'browse_npl_library') {
+	<%= include 'ContentGenerator/Instructor/SetMaker/browse_library_panel' =%>
+% } elsif ($browse_which eq 'browse_setdefs') {
+	<%= include 'ContentGenerator/Instructor/SetMaker/browse_setdef_panel',
+		selected_library => $c->{current_library_set} =%>
+% } else {
+	% # Other problem libraries
+	<%= include 'ContentGenerator/Instructor/SetMaker/browse_local_panel',
+		selected_library => $c->{current_library_set}, lib => $browse_which =%>
+% }
+<hr class="mt-0 mb-2">
+<div class="d-flex flex-wrap justify-content-center">
+	<button class="library-action-btn add-all-btn btn btn-primary btn-sm mx-1 mb-2" type="button">
+		<%= maketext('Add All') =%>
+	</button>
+	<%= submit_button maketext('Clear Problem Display'), name => 'cleardisplay',
+		class => 'library-action-btn btn btn-secondary btn-sm mx-1 mb-2' =%>
+	% if ($c->{first_index} > 0) {
+		<%= submit_button maketext('Previous page'), name => 'prev_page',
+			class => 'library-action-btn btn btn-secondary btn-sm mx-1 mb-2' =%>
+	% }
+	% if (1 + $c->{last_index} < @$pg_files) {
+		<%= submit_button maketext('Next page'), name => 'next_page',
+			class => 'library-action-btn btn btn-secondary btn-sm mx-1 mb-2' =%>
+	% }
+</div>
diff --git a/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep b/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep
new file mode 100644
index 0000000000..6a477bda0e
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep
@@ -0,0 +1,61 @@
+% use WeBWorK::PG;
+%
+% my $contrib_exists = -r $ce->{courseDirs}{templates} . '/Contrib';
+%
+<div class="d-flex flex-wrap justify-content-center">
+	<%= submit_button maketext('View Problems'), name => $internal_name, class => 'btn btn-secondary btn-sm mb-2' =%>
+	%
+	<div class="d-inline-block ms-2 mb-2">
+		<%= label_for 'problem_displaymode' => maketext('Display Mode:'), class => 'col-form-label col-form-label-sm' =%>
+		<%= select_field 'problem_displaymode' => [
+				(
+					map { [ $_ => $_, $_ eq $ce->{pg}{options}{displayMode} ? (selected => undef) : () ] }
+					grep { exists WeBWorK::PG::DISPLAY_MODES()->{$_} } @{ $ce->{pg}{displayModes} }
+				),
+				# Special display mode "None". This is illegal in other modules,
+				# but means don't render the problem in this module.
+				[ maketext('None') => 'None' ]
+			],
+			id => 'problem_displaymode', class => 'form-select form-select-sm d-inline w-auto' =%>
+		<%= hidden_field original_displayMode => param('problem_displaymode') || $ce->{pg}{options}{displayMode} =%>
+	</div>
+	% # Give a choice of the number of problems to show.
+	<div class="d-inline-block ms-2 mb-2">
+		<%= label_for max_shown => maketext('Max. Shown:'), class => 'col-form-label col-form-label-sm' =%>
+		<%= select_field max_shown => [ 5, 10, 15, [ 20 => 20, selected => undef ], 25, 30, 50, 'All' ],
+			id => 'max_shown', class => 'form-select form-select-sm d-inline w-auto' =%>
+	</div>
+	% # Option of whether to show hints and solutions
+	<div class="d-inline-block ms-2 mb-2">
+		% if ($contrib_exists) {
+			<div class="form-check form-check-inline ms-2">
+				<label class="form-check-label col-form-label-sm">
+					% param('includeOPL', 'on') unless defined param('includeOPL');
+					<%= check_box includeOPL => 'on', class => 'form-check-input me-1' =%>
+					<%= maketext('Include OPL') =%>
+					<%= hidden_field includeOPL => 0 =%>
+				</label>
+			</div>
+			<div class="form-check form-check-inline ms-2">
+				<label class="form-check-label col-form-label-sm">
+					<%= check_box includeContrib => 'on', class => 'form-check-input me-1' =%>
+					<%= maketext('Include Contrib') =%>
+				</label>
+			</div>
+		% } else {
+			<%= hidden_field includeOPL => 1 =%>
+		% }
+		<div class="form-check form-check-inline ms-2">
+			<label class="form-check-label col-form-label-sm">
+				<%= check_box showHints => 'on', class => 'form-check-input me-1' =%>
+				<%= maketext('Hints') =%>
+			</label>
+		</div>
+		<div class="form-check form-check-inline ms-2">
+			<label class="form-check-label col-form-label-sm">
+				<%= check_box showSolutions => 'on', class => 'form-check-input me-1' =%>
+				<%= maketext('Solutions') =%>
+			</label>
+		</div>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/ShowAnswers.html.ep b/templates/ContentGenerator/Instructor/ShowAnswers.html.ep
new file mode 100644
index 0000000000..299757987f
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ShowAnswers.html.ep
@@ -0,0 +1,19 @@
+% use WeBWorK::Utils qw(getAssetURL);
+%
+% content_for js => begin
+	<%= javascript getAssetURL($ce, 'js/ShowHide/show_hide.js'), defer => undef =%>
+% end
+%
+% unless ($authz->hasPermissions(param('user'), 'view_answers')) {
+	<div class="alert alert-danger p-1 mb-0"><%= maketext('You are not authorized to view past answers') %></div>
+	% last;
+% }
+%
+% # Only instructors should be able to veiw other people's answers.
+% my $isInstructor = $authz->hasPermissions(param('user'), 'access_instructor_tools');
+%
+% if ($isInstructor) {
+	<%= include 'ContentGenerator/Instructor/ShowAnswers/instructor-selectors', $c->getInstructorData =%>
+% }
+%
+<%= include 'ContentGenerator/Instructor/ShowAnswers/past-answers-table', isInstructor => $isInstructor =%>
diff --git a/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep b/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep
new file mode 100644
index 0000000000..e47bc928d3
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep
@@ -0,0 +1,54 @@
+% use WeBWorK::HTML::ScrollingRecordList qw(scrollingRecordList);
+% use WeBWorK::Utils qw(format_set_name_display);
+%
+<%= form_for current_route, target => 'WW_Info', id => 'past-answer-form', method => 'POST', begin =%>
+	<%= $c->hidden_authen_fields =%>
+	%
+	<div class="row gx-3">
+		<div class="col-sm-5 mb-2">
+			<div class="fw-bold text-center"><%= label_for selected_users => maketext('Users') %></div>
+			<%= scrollingRecordList(
+				{
+					name            => 'selected_users',
+					id              => 'selected_users',
+					controller      => $c,
+					default_sort    => 'lnfn',
+					default_format  => 'lnfn_uid',
+					default_filters => ['all'],
+					attrs           => { size => 10, multiple => undef }
+				},
+				@$users
+			) =%>
+		</div>
+		<div class="col-sm-4 mb-2">
+			<div class="fw-bold text-center"><%= label_for selected_sets => maketext('Sets') %></div>
+			<%= select_field selected_sets => [ map { [ format_set_name_display($_) => $_ ] } @$expandedGlobalSetIDs ],
+				id => 'selected_sets', size => 23, multiple => undef, class => 'form-select form-select-sm',
+				dir => 'ltr' =%>
+		</div>
+		<div class="col-sm-2 mb-2">
+			<div class="fw-bold text-center"><%= label_for selected_problems => maketext('Problems') %></div>
+			<%= select_field selected_problems => $globalProblemIDs, id => 'selected_problems', size => 23,
+				multiple => undef, class => 'form-select form-select-sm' =%>
+		</div>
+	</div>
+	%
+	<div class="d-flex flex-wrap justify-content-start align-items-center">
+		<%= submit_button maketext('Display Past Answers'), name => 'action', class => 'btn btn-primary mb-2' =%>
+		<div class="form-check form-check-inline ms-2 mb-2">
+			<label class="form-check-label">
+				<%= check_box createCSV => 'on', id => 'createCSV', class => 'form-check-input' =%>
+				<%= maketext('Create CSV') =%>
+			</label>
+		</div>
+		% if (param('createCSV') && -e "$ce->{courseDirs}{scoring}/$filename") {
+			<span class="fw-bold fs-5 mb-2">
+				<%= maketext('Download:') =%>
+				<%= link_to $filename => $c->systemLink(
+					url_for('instructor_scoring_download'),
+					params => { getFile => $filename }
+				) =%>
+			</span>
+		% }
+	</div>
+<% end =%>
diff --git a/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep b/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep
new file mode 100644
index 0000000000..c0abdb91f8
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep
@@ -0,0 +1,64 @@
+% use WeBWorK::Utils qw(format_set_name_display);
+%
+% my $records      = stash->{records};
+% my $foundMatches = 0;
+%
+% for my $studentUser (sort keys %$records) {
+	% for my $setName (sort keys %{ $records->{$studentUser} }) {
+		% for my $problemNumber (sort { $a <=> $b } keys %{ $records->{$studentUser}{$setName} }) {
+			% my @pastAnswerIDs = sort { $a <=> $b } keys %{ $records->{$studentUser}{$setName}{$problemNumber} };
+			% my $prettyProblemNumber = stash->{prettyProblemNumbers}{$setName}{$problemNumber};
+			<h3>
+				<%== maketext('Past Answers for [_1], set [_2], problem [_3]',
+					$studentUser, tag('span', dir => 'ltr', format_set_name_display($setName)), $prettyProblemNumber
+				) =%>
+			</h3>
+			<div class="table-responsive">
+				<table class="past-answer-table table table-striped" dir="ltr">
+					% my $previousTime = -1;
+					% for my $answerID (@pastAnswerIDs) {
+						% $foundMatches = 1;
+						%
+						% my %record  = %{ $records->{$studentUser}{$setName}{$problemNumber}{$answerID} };
+						% my @answers = @{ $record{answers} };
+						% my @scores  = @{ $record{scores} };
+						% $previousTime = $record{time} if $previousTime < 0;
+						% my $upper_limit = $#scores > $#answers ? $#scores : $#answers;
+						%
+						<tr <%== $record{time} - $previousTime > $ce->{sessionKeyTimeout}
+							? 'class="table-rule"' : '' %>>
+							<td class="px-3"><small><%= $c->formatDateTime($record{time}) %></small></td>
+							% for (my $i = 0; $i <= $upper_limit; $i++) {
+								% my $answer     = $answers[$i]             // '';
+								% my $answerType = $record{answerTypes}[$i] // '';
+								% my $score      = shift(@scores);
+								%
+								% # Color the answer if the user is an instructor, there is an answer,
+								% # there is a score, and it is not an essay question.
+								<td <%== $isInstructor && $answer ne '' && defined $score && $answerType ne 'essay'
+									? ($score ? 'style="color:#006600"' : 'style="color:#660000"')
+									: '' %> class="px-3 <%== $answerType eq 'essay' ? 'essay' : '' %>">
+									% if ($answer eq '') {
+										<small><i><%= maketext('empty') %></i></small>
+									% } else {
+										<%== $answer =%>
+									% }
+								</td>
+							% }
+							% if ($record{comment}) {
+								<td class="comment px-3"><%= maketext('Comment') . ': ' . $record{comment} %></td>
+							% } else {
+								<td class="comment px-3"></td>
+							% }
+						</tr>
+						% $previousTime = $record{time};
+					% }
+				</table>
+			</div>
+		% }
+	% }
+% }
+%
+% unless ($foundMatches) {
+	<h2><%= maketext('No problems matched the given parameters.') %></h2>
+% }
diff --git a/templates/ContentGenerator/Instructor/Stats.html.ep b/templates/ContentGenerator/Instructor/Stats.html.ep
new file mode 100644
index 0000000000..19c234d292
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/Stats.html.ep
@@ -0,0 +1,20 @@
+% use WeBWorK::Utils qw(getAssetURL);
+%
+% unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
+	<div class="alert alert-danger p-1"><%= maketext('You are not authorized to access instructor tools') %></div>
+	% last;
+% }
+%
+% if (current_route eq 'instructor_user_statistics') {
+	% # Stats and StudentProgress share this template.
+	<%= include 'ContentGenerator/Instructor/Stats/student_stats' =%>
+% } elsif (current_route eq 'instructor_set_statistics') {
+	<%= $c->set_stats =%>
+% } elsif (current_route eq 'instructor_problem_statistics') {
+	<%= $c->problem_stats =%>
+% } else {
+	% # Stats and StudentProgress share this template also.
+	<%= include 'ContentGenerator/Instructor/Stats/index',
+		set_header     => maketext('View statistics by set'),
+		student_header => maketext('View statistics by student') =%>
+% }
diff --git a/templates/ContentGenerator/Instructor/Stats/index.html.ep b/templates/ContentGenerator/Instructor/Stats/index.html.ep
new file mode 100644
index 0000000000..d94e95724e
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/Stats/index.html.ep
@@ -0,0 +1,39 @@
+% # Note that this template is used by both WeBWorK::ContentGenerator::Instructor::Stats and
+% # WeBWorK::ContentGenerator::Instructor::StudentProgress.
+%
+% use WeBWorK::Utils qw(format_set_name_display);
+%
+% my $type = current_route =~ s/instructor_//r;
+%
+<div class="row">
+	<div class="col-lg-5 col-sm-6 mb-2">
+		<div class="card h-100">
+			<div class="card-body p-2">
+				<h2 class="card-title text-center fs-3"><%= $set_header %></h2>
+				<ul dir="ltr">
+					% for ($db->listGlobalSetsWhere({}, 'set_id')) {
+						<li>
+							<%= link_to format_set_name_display($_->[0]) =>
+								$c->systemLink(url_for("instructor_set_$type", setID => $_->[0])) =%>
+						</li>
+					% }
+				</ul>
+			</div>
+		</div>
+	</div>
+	<div class="col-lg-5 col-sm-6 mb-2">
+		<div class="card h-100">
+			<div class="card-body p-2">
+				<h2 class="card-title text-center fs-3"><%= $student_header %></h2>
+				<ul>
+					% for (@{ $c->{student_records} }) {
+						<li>
+							<%= link_to $_->last_name . ', ' . $_->first_name . ' (' . $_->user_id . ')' =>
+								$c->systemLink(url_for("instructor_user_$type", userID   => $_->user_id)) =%>
+						</li>
+					% }
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep b/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep
new file mode 100644
index 0000000000..33ffc611c2
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep
@@ -0,0 +1,30 @@
+% use WeBWorK::Utils qw(jitar_id_to_seq);
+%
+<div class="btn-group student-nav-filter-selector mx-2">
+	<%= link_to $c->{prettyID} ? maketext('Problem [_1]', $c->{prettyID}) : maketext('All problems') => '#',
+		id => 'problemMenu', class => 'btn btn-primary dropdown-toggle', role => 'button', 'aria-expanded' => 'false',
+		data => { bs_toggle => 'dropdown' } =%>
+	<ul class="dropdown-menu" role="menu" aria-labelledby="problemMenu">
+		<li>
+			<%= link_to maketext('All problems') => $c->systemLink(
+					url_for('instructor_set_statistics'),
+					params => param('filter') ? { filter => param('filter') } : {}
+				),
+				class => 'dropdown-item', $c->{prettyID} ? () : (style => 'background-color: #8F8') =%>
+		</li>
+		% for (@$problems) {
+			% my $probID =
+				% $c->{setRecord}->assignment_type eq 'jitar'
+				% ? join('.', jitar_id_to_seq($_->problem_id))
+				% : $_->problem_id;
+			<li>
+				<%= link_to maketext('Problem [_1]', $probID) => $c->systemLink(
+						url_for('instructor_problem_statistics', problemID => $_->problem_id),
+						params => param('filter') ? { filter => param('filter') } : {}
+					),
+					class => 'dropdown-item',
+					$probID eq ($c->{prettyID} // '') ? (style => 'background-color: #8F8') : () =%>
+			</li>
+		% }
+	</ul>
+</div>\
diff --git a/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep b/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep
new file mode 100644
index 0000000000..7ff784594b
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep
@@ -0,0 +1,117 @@
+% content_for js => begin
+	<%= javascript getAssetURL($ce, 'js/RenderProblem/renderproblem.js'), defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/Stats/stats.js'), defer => undef =%>
+	<%= javascript getAssetURL($ce, 'node_modules/iframe-resizer/js/iframeResizer.min.js') =%>
+% end
+%
+<div class="mb-3">
+	<%= maketext('Showing statistics for:') =%>
+	<%= include 'ContentGenerator/Instructor/Stats/student_filter_menu', filters => $filters =%>
+	<%= include 'ContentGenerator/Instructor/Stats/problem_menu', problems => $problems =%>
+</div>
+%
+% # Histogram of total scores.
+<%= $c->build_bar_chart(
+	[ @$buckets ],
+	xAxisLabels => [ '90-100', '80-89', '70-79', '60-69', '50-59', '40-49', '30-39', '20-29', '10-19', '0-9' ],
+	yMax        => 5 * $maxCount,
+	yAxisLabels => [ map { $_ * $maxCount } 0 .. 5 ],
+	mainTitle   => maketext('Active Students Problem [_1] Grades', $c->{prettyID}),
+	xTitle      => maketext('Percent Ranges'),
+	yTitle      => maketext('Number of Students'),
+	barWidth    => 35,
+	barSep      => 5,
+	isPercent   => 0,
+	leftMargin  => 40 + 5 * length(5 * $maxCount),
+	isJitarSet  => ($isJitarSet && $topLevelJitar),
+	jitarBars   => [ reverse(@$jitarBars) ],
+) =%>
+%
+% # Display overall statistics
+<div class="table-responsive">
+	<table class="table table-bordered w-auto">
+		<tr><th><%= maketext('Point Value') %></th><td><%= $c->{problemRecord}->value =%></tr>
+		<tr><th><%= maketext('Average Percent') %></th><td><%= sprintf('%0.1f', 100 * $mean) %></tr>
+		<tr><th><%= maketext('Standard Deviation') %></th><td><%= sprintf('%0.1f', 100 * $stddev) %></td></tr>
+		<tr><th><%= maketext('Average Attempts') %></th><td><%= sprintf('%0.1f', $mean2) %></td></tr>
+		<tr>
+			<th>
+				<%= maketext('Success Index') =%>
+				<a class="help-popup ms-2" role="button" tabindex="0" data-bs-placement="top" data-bs-toggle="popover"
+					data-bs-content="<%= maketext(
+						'Success index is the square of the average score divided by the average number of attempts.'
+					) %>">
+					<i class="icon fas fa-question-circle" data-alt="<%= maketext('Help Icon') %>" aria-hidden="true">
+					</i>
+				</a>
+			</th>
+			<td><%= sprintf('%0.1f', 100 * $successIndex) %></td>
+		</tr>
+		<tr><th><%= maketext('Active Students') %></th><td><%= $activeStudents %></td></tr>
+		<tr><th><%= maketext('Inactive Students') %></th><td><%= $inactiveStudents %></tr>
+	</table>
+</div>
+%
+% # Table showing percentile statistics for scores.
+<p>
+	<%= maketext(
+		'Percentile cutoffs for student\'s score and success index. '
+		. 'The 50% column shows the median number of attempts.'
+	) =%>
+</p>
+%
+% my @tableHeaders = (maketext('Percent Score'));
+% my @tableData    = ($problemScores);
+% if ($isJitarSet && $topLevelJitar) {
+	% push(@tableHeaders, maketext('% Score with Review'));
+	% push(@tableData,    [ map { sprintf('%0.0f', 100 * $_) } @$adjustedScores ]);
+% }
+% my $successIndexHeader = begin
+	<%= maketext('Success Index') =%>
+	<a class="help-popup ms-2" role="button" tabindex="0" data-bs-placement="top" data-bs-toggle="popover"
+		data-bs-content="<%=
+			maketext('Success index is the square of the score divided by the number of attempts.') =%>">
+		<i class="icon fas fa-question-circle" data-alt="<%= maketext('Help Icon') %>" aria-hidden="true"></i>
+	</a>
+% end
+% push @tableHeaders, $successIndexHeader->();
+% push(@tableData, [ map { sprintf('%0.0f', 100 * $_) } @$successList ]);
+<%= $c->bracket_table([ 90, 80, 70, 60, 50, 40, 30, 20, 10 ], \@tableData, \@tableHeaders, showMax => 1) =%>
+%
+% # Table showing attempts percentiles
+<p>
+	<%= maketext('Percentile cutoffs for number of attempts. The 50% column shows the median number of attempts.') =%>
+</p>
+<%= $c->bracket_table([ 95, 75, 50, 25, 5, 1 ], [ $problemAttempts ], [ maketext('# of attempts') ], reverse => 1) =%>
+%
+% if ($c->{problemRecord}->source_file =~ /^group:/) {
+	<div class="alert alert-info">
+		<%= maketext('Problem source is drawn from a grouping set and can not be directly rendered or edited.') %>
+	</div>
+	% last;
+% }
+%
+% # Render Problem
+<div class="rpc_render_area_container mt-2 p-2 border rounded">
+	<%= $c->hidden_authen_fields =%>
+	<%= hidden_field hidden_course_id => $courseID =%>
+	<%= hidden_field hidden_language => $ce->{language} =%>
+	<%= hidden_field setID => $setID, id => 'hidden_set_id' =%>
+	<%= hidden_field problemID => $problemID, id => 'hidden_problem_id' =%>
+	<%= hidden_field sourceFilePath => $c->{problemRecord}->source_file, id => 'hidden_source_file' =%>
+	<div class="btn-toolbar gap-3">
+		<div class="input-group pt-1">
+			<%= label_for problem_displaymode => maketext('Display Mode:'), class => 'input-group-text' =%>
+			<%= select_field 'problem_displaymode' => [
+					grep { exists WeBWorK::PG::DISPLAY_MODES()->{$_} } @{ $ce->{pg}{displayModes} }
+				],
+				id => 'problem_displaymode', class => 'form-select' =%>
+		</div>
+		<div class="btn-group pt-1">
+			<%= link_to maketext('Edit Problem') =>
+					$c->systemLink(url_for('instructor_problem_editor_withset_withproblem')),
+				class => 'btn btn-primary', target => 'WW_Editor' =%>
+		</div>
+	</div>
+	<div id="problem_render_area" class="rpc_render_area mt-2"></div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep b/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep
new file mode 100644
index 0000000000..3c55a1fb40
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep
@@ -0,0 +1,213 @@
+% content_for js => begin
+	<%= javascript getAssetURL($ce, 'js/Stats/stats.js'), defer => undef =%>
+% end
+%
+% # Filter and problem selectors.
+<div class="d-flex align-items-center mt-1 mb-3">
+	<%= maketext('Showing statistics for:') =%>
+	<%= include 'ContentGenerator/Instructor/Stats/student_filter_menu', filters => $filters =%>
+	<%= include 'ContentGenerator/Instructor/Stats/problem_menu', problems => $problems =%>
+</div>
+% # Set information
+<div class="table-responsive">
+	<table class="table table-bordered w-auto">
+		<tr>
+			<th>
+				<%= maketext('Status') =%>
+				<a class="help-popup ms-2" role="button" tabindex="0" data-bs-placement="top" data-bs-toggle="popover"
+					data-bs-content="<%= maketext(
+						'This gives the status and dates of the main set. '
+							. 'Indvidual students may have different settings.'
+					) %>">
+					<i class="icon fas fa-question-circle" data-alt="<%= maketext('Help Icon') %>" aria-hidden="true">
+					</i>
+				</a>
+			</th>
+			<td>
+				% if (time < $c->{setRecord}->open_date) {
+					<%= maketext('Before Open Date') =%>
+				% } elsif ($c->{setRecord}->enable_reduced_scoring
+					% && time > $c->{setRecord}->reduced_scoring_date
+					% && time < $c->{setRecord}->due_date)
+				% {
+					<%= maketext('Reduced Scoring Period') =%>
+				% } elsif (time > $c->{setRecord}->due_date && time < $c->{setRecord}->answer_date) {
+					<%= maketext('Closed') =%>
+				% } elsif (time > $c->{setRecord}->answer_date) {
+					<%= maketext('Answers Available') =%>
+				% } else {
+					<%= maketext('Open') =%>
+				% }
+				% if (!$c->{setRecord}->visible) {
+					(<%= maketext('Hidden') =%>)
+				% }
+				% if ($c->{setRecord}->assignment_type =~ /gateway/ && time > $c->{setRecord}->answer_date) {
+					<a class="help-popup ms-2" role="button" tabindex="0" data-bs-placement="top"
+						data-bs-toggle="popover"
+						data-bs-content="<%= maketext(
+							'Answer availability for tests depends on multiple settings.  This only indicates the '
+								. 'template answer date has passed.  See set editor for actual availability.'
+						) =%>">
+						<i class="icon fas fa-question-circle" data-alt="<%= maketext('Help Icon') =%>"
+							aria-hidden="true">
+						</i>
+					</a>
+				% }
+			</td>
+		</tr>
+		<tr>
+			<th><%= maketext('Number of Students') %></th>
+			<td><%= scalar(@$score_list) %></td></tr>
+		<tr>
+			<th><%= maketext('Open Date') %></th>
+			<td><%= $c->formatDateTime($c->{setRecord}->open_date, undef, $ce->{studentDateDisplayFormat}) %></td>
+		</tr>
+		% if ($c->{setRecord}->enable_reduced_scoring) {
+			<tr>
+				<th><%= maketext('Reduced Scoring Date') %></th>
+				<td>
+					<%= $c->formatDateTime($c->{setRecord}->reduced_scoring_date,
+						undef, $ce->{studentDateDisplayFormat}) %>
+				</td>
+			</tr>
+		% }
+		<tr>
+			<th><%= maketext('Close Date') %></th>
+			<td><%= $c->formatDateTime($c->{setRecord}->due_date, undef, $ce->{studentDateDisplayFormat}) %></td>
+		</tr>
+		<tr>
+			<th><%= maketext('Answer Date') %></th>
+			<td><%= $c->formatDateTime($c->{setRecord}->answer_date, undef, $ce->{studentDateDisplayFormat}) %></td>
+		</tr>
+	</table>
+</div>
+%
+<h2><%= maketext('Overall Results') %></h2>
+%
+% # Histogram of total scores.
+<%= $c->build_bar_chart(
+	$buckets,
+	xAxisLabels => [ '90-100', '80-89', '70-79', '60-69', '50-59', '40-49', '30-39', '20-29', '10-19', '0-9' ],
+	yMax        => 5 * $maxCount,
+	yAxisLabels => [ map { $_ * $maxCount } 0 .. 5 ],
+	mainTitle   => maketext('Overall Set Grades'),
+	xTitle      => maketext('Percent Ranges'),
+	yTitle      => maketext('Number of Students'),
+	barWidth    => 35,
+	barSep      => 5,
+	isPercent   => 0,
+	leftMargin  => 40 + 5 * length(5 * $maxCount),
+) =%>
+%
+% # Success index help icon.
+% my $successHelp = begin
+	<a class="help-popup ms-2" role="button" tabindex="0" data-bs-placement="top" data-bs-toggle="popover"
+		data-bs-content="<%= maketext(
+			'Success index is the square of the average score divided by the average number of attempts.') %>">
+		<i class="icon fas fa-question-circle" data-alt="<%= maketext('Help Icon') %>" aria-hidden="true"></i>
+	</a>
+% end
+%
+% # Display the overall average
+<div class="table-responsive">
+	<table class="table table-bordered w-auto">
+		<tr><th><%= maketext('Total Points') %></th><td><%= $totalValue %></td></tr>
+		<tr><th><%= maketext('Average Percent') %></th><td><%= sprintf('%0.1f', 100 * $mean) %></td></tr>
+		<tr><th><%= maketext('Standard Deviation') %></th><td><%= sprintf('%0.1f', 100 * $stddev) %></td></tr>
+		<tr>
+			<th><%= maketext('Average Attempts Per Problem') %></th>
+			<td><%= sprintf('%0.1f', $overallAvgAttempts) %></td>
+		</tr>
+		<tr>
+			<th><%= maketext('Overall Success Index') =%><%= $successHelp->() %></th>
+			<td><%= sprintf('%0.1f', 100 * $overallSuccess) %></td>
+		</tr>
+	</table>
+</div>
+%
+% # Table showing percentile statistics for scores and success indices.
+<p>
+	<%= maketext(
+		'The percentage of students receiving at least these scores. The median score is in the 50% column.') =%>
+</p>
+<%= $c->bracket_table(
+	[ 90, 80, 70, 60, 50, 40, 30, 20, 10 ],
+	[ $score_list, $index_list ],
+	[ maketext('Percent Score'), b(maketext('Success Index') . $successHelp->()) ],
+	showMax => 1,
+) =%>
+%
+% # Individual problem stats.
+<h2><%= maketext('Individual Problem Results') %></h2>
+%
+% # SVG bar graph showing the percentage of students with correct answers for each problem.
+<%= $c->build_bar_chart(
+	$svgProblemData,
+	yAxisLabels => [ '0%', '20%', '40%', '60%', '80%', '100%' ],
+	xAxisLabels => $svgProblemLabels,
+	mainTitle   => maketext('Grade of Active Students'),
+	xTitle      => maketext('Problem Number'),
+	isJitarSet  => $isJitarSet,
+	jitarBars   => $isJitarSet ? $jitarBars : [],
+	barLinks    => [ map { $_->{statsLink} } @$problems ],
+) =%>
+%
+% # Table showing indvidual problem stats.
+<div class="table-responsive">
+	<table class="table table-bordered">
+		<tr>
+			<th><%= maketext('Problem Number') %></th>
+			% for (@$problems) {
+				<td class="text-center"><%= link_to $_->{prettyID} => $_->{statsLink} =%></td>
+			% }
+		</tr>
+		<tr>
+			<th><%= maketext('Point Value') %></th>
+			<% for (@$problems) { %><td class="text-center"><%= $_->value %></td><% } =%>
+		</tr>
+		<tr>
+			<th><%= maketext('Point Value') %></th>
+			<% for (@$avgScore) { %><td class="text-center"><%= $_ %></td><% } =%>
+		</tr>
+		% if ($isJitarSet) {
+			<tr>
+				<th><%= maketext('% Average with Review') %></th>
+				<% for (@$adjScore) { %><td class="text-center"><%= $_ %></td><% } =%>
+			</tr>
+		% }
+		<tr>
+			<th><%= maketext('Average Attempts') %></th>
+			<% for (@$avgAttempts) { %><td class="text-center"><%= $_ %></td><% } =%>
+		</tr>
+		<tr>
+			<th><%= maketext('Success Index') %><%= $successHelp->() %></th>
+			<% for (@$successList) { %><td class="text-center"><%= $_ %></td><% } =%>
+		</tr>
+		<tr>
+			<th><%= maketext('# of Active Students') %></th>
+			<% for (@$numActive) { %><td class="text-center"><%= $_ %></td><% } =%>
+		</tr>
+		% if ($authz->hasPermissions(param('user'), 'score_sets')) {
+			<tr>
+				<th><%= maketext('Manual Grader') %></th>
+				% for (@$problems) {
+					<td class="text-center">
+						<%= link_to $_->{prettyID} =>
+							$c->systemLink(url_for('instructor_problem_grader', problemID => $_->problem_id)) %>
+					</td>
+				% }
+			</tr>
+		% }
+	</table>
+</div>
+%
+% # Table showing percentile statistics for scores and success indices.
+<p>
+	<%= maketext('Percentile cutoffs for number of attempts. The 50% column shows the median number of attempts.') =%>
+</p>
+<%= $c->bracket_table(
+	[ 95, 75, 50, 25, 5, 1 ],
+	$attemptsList,
+	[ map { link_to maketext('Problem [_1]', $_->{prettyID}) => $_->{statsLink} } @$problems ],
+   	reverse => 1
+) =%>
diff --git a/templates/ContentGenerator/Instructor/Stats/siblings.html.ep b/templates/ContentGenerator/Instructor/Stats/siblings.html.ep
new file mode 100644
index 0000000000..711837f200
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/Stats/siblings.html.ep
@@ -0,0 +1,66 @@
+% # Note that this template is used by both WeBWorK::ContentGenerator::Instructor::Stats and
+% # WeBWorK::ContentGenerator::Instructor::StudentProgress.
+%
+% use WeBWorK::Utils qw(format_set_name_display jitar_id_to_seq);
+%
+% unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
+	% last;
+% }
+%
+<div class="info-box bg-light">
+	<h2><%= $header %></h2>
+	% if (current_route =~ /^instructor_user_/) {
+		<ul class="nav flex-column problem-list">
+			% for (@{ $c->{student_records} }) {
+				<li class="nav-item">
+					<%= tag 'a',
+						$_->user_id eq $c->{studentID}
+						? (class => 'nav-link active')
+						: (
+							href => $c->systemLink(url_for(current_route, userID => $_->user_id)),
+							class => 'nav-link'
+						), begin =%>
+						<%= $_->last_name =%>, <%= $_->first_name %> (<%= $_->user_id %>)
+					<% end =%>
+				</li>
+			% }
+		</ul>
+	% } elsif (current_route eq 'instructor_problem_statistics') {
+		<ul class="nav flex-column problem-list">
+			% for (map { $_->[1] } $db->listGlobalProblemsWhere({ set_id => stash->{setID} }, 'problem_id')) {
+				<li class="nav-item">
+					<%= tag 'a',
+						$_ eq stash('problemID') ? (class => 'nav-link active')
+						: (
+							href => $c->systemLink(
+								url_for(current_route, problemID => $_),
+								params => param('filter') ? { filter => param('filter') } : {}
+							),
+							class => 'nav-link'
+						),
+						maketext('Problem [_1]',
+							$c->{setRecord}->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)) : $_)
+					=%>
+				</li>
+			% }
+		</ul>
+	% } else {
+		<ul class="nav flex-column problem-list" dir="ltr">
+			% for (map { $_->[0] } $db->listGlobalSetsWhere({}, 'set_id')) {
+				<li class="nav-item">
+					<%= tag 'a',
+						defined stash('setID') && $_ eq stash('setID') ? (class => 'nav-link active')
+						: (
+							href => $c->systemLink(
+								url_for(current_route =~ s/instructor_(progress|statistics)/instructor_set_$1/r,
+									setID => $_),
+								params => param('filter') ? { filter => param('filter') } : {}
+							),
+							class => 'nav-link'
+						),
+						format_set_name_display($_) =%>
+				</li>
+			% }
+		</ul>
+	% }
+</div>
diff --git a/templates/ContentGenerator/Instructor/Stats/stats_table.html.ep b/templates/ContentGenerator/Instructor/Stats/stats_table.html.ep
new file mode 100644
index 0000000000..d7ef2d5c73
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/Stats/stats_table.html.ep
@@ -0,0 +1,12 @@
+<div class="table-responsive">
+	<table class="table table-bordered">
+		% while (@$tableHeaders && @$tableData) {
+			<tr>
+				<th><%= shift @$tableHeaders %></th>
+				% for (@{ shift @$tableData }) {
+					<td class="text-center"><%= $_ %></td>
+				% }
+			</tr>
+		% }
+	</table>
+</div>
diff --git a/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep b/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep
new file mode 100644
index 0000000000..a0fa3c0674
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep
@@ -0,0 +1,21 @@
+% last unless %$filters;
+%
+% # Create a section/recitation "filter by" dropdown if there are sections or recitations.
+<div class="btn-group student-nav-filter-selector mx-2">
+	<%= link_to param('filter') ? $filters->{param('filter')} : maketext('All sections') => '#',
+		id => 'filter', class => 'btn btn-primary dropdown-toggle', role => 'button', 'aria-expanded' => 'false',
+		data => { bs_toggle => 'dropdown' } =%>
+	<ul class="dropdown-menu" role="menu" aria-labelledby="filter">
+		<li>
+			<%= link_to maketext('All sections') => $c->systemLink(url_for),
+				class => 'dropdown-item', param('filter') ? () : (style => 'background-color:#8F8') =%>
+		</li>
+		% for (sort keys %$filters) {
+			<li>
+				<%= link_to $filters->{$_} => $c->systemLink(url_for, params => { filter => $_ }),
+					(param('filter') || '') eq $_ ? (style => 'background-color: #8F8') : (),
+					class => 'dropdown-item' =%>
+			</li>
+		% }
+	</ul>
+</div>\
diff --git a/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep b/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep
new file mode 100644
index 0000000000..6f50080c39
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep
@@ -0,0 +1,30 @@
+% # Note that this template is used by both WeBWorK::ContentGenerator::Instructor::Stats and
+% # WeBWorK::ContentGenerator::Instructor::StudentProgress.
+%
+% use WeBWorK::ContentGenerator::Grades;
+%
+% my $studentRecord = $db->getUser($c->{studentID});
+% unless ($studentRecord) {
+	<div class="alert alert-danger p-1"><%= maketext('Record for user [_1] not found.', $c->{studentID}) %></div>
+	% last;
+% }
+%
+% my $email  = $studentRecord->email_address;
+% if ($email) {
+	<%= link_to $email => "mailto:$email" =%>
+	<br>
+% }
+% if ($studentRecord->section ne '') {
+	<%= maketext('Section') =%>: <%= $studentRecord->section %>
+	<br>
+% }
+% if ($studentRecord->recitation ne '') {
+	<%= maketext('Recitation') =%>: <%= $studentRecord->recitation %>
+	<br>
+% }
+% if ($authz->hasPermissions(param('user'), 'become_student')) {
+	<%= maketext('Act as:') =%>
+	<%= link_to $studentRecord->user_id =>
+		$c->systemLink(url_for('set_list'), params => { effectiveUser => $c->{studentID} }) =%>
+% }
+<%= WeBWorK::ContentGenerator::Grades::displayStudentStats($c, $c->{studentID}) =%>
diff --git a/templates/ContentGenerator/Instructor/StudentProgress.html.ep b/templates/ContentGenerator/Instructor/StudentProgress.html.ep
new file mode 100644
index 0000000000..d135d8e5c5
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/StudentProgress.html.ep
@@ -0,0 +1,16 @@
+% unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
+	<div class="alert alert-danger p-1"><%= maketext('You are not authorized to access instructor tools') %></div>
+	% last;
+% }
+%
+% if (current_route eq 'instructor_user_progress') {
+	% # Stats and StudentProgress share this template.
+	<%= include 'ContentGenerator/Instructor/Stats/student_stats' =%>
+% } elsif (current_route eq 'instructor_set_progress') {
+	<%= $c->displaySets =%>
+% } else {
+	% # Stats and StudentProgress share this template also.
+	<%= include 'ContentGenerator/Instructor/Stats/index',
+		set_header     => maketext('View student progress by set'),
+		student_header => maketext('View student progress by student') =%>
+% }
diff --git a/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep b/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep
new file mode 100644
index 0000000000..0bf142219b
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep
@@ -0,0 +1,329 @@
+<%= include 'ContentGenerator/Base/set_status', set => $c->{setRecord} =%>
+%
+% # In the case of gateway tests, add a form with checkboxes that allow customization of what is included in the
+% # display.
+% if ($setIsVersioned) {
+	<div class="card bg-light mb-3">
+		<%= form_for current_route, method => 'post',
+			id => 'sp-gateway-form', name => 'StudentProgress', begin =%>
+			<%= $c->hidden_authen_fields =%>
+			<%= hidden_field returning => 1 =%>
+			<div class="card-body">
+				<h5 class="card-title"><%= maketext("Display options: Show") %></h5>
+				<div class="mb-2">
+					<div class="form-check form-check-inline">
+						<label class="form-check-label">
+							<%= check_box show_best_only => 1, class => 'form-check-input' =%>
+							<%= maketext('only best scores') =%>
+						</label>
+					</div>
+					<div class="form-check form-check-inline">
+						<label class="form-check-label">
+							<%= check_box show_date => 1, class => 'form-check-input' =%>
+							<%= maketext('test date') =%>
+						</label>
+					</div>
+					<div class="form-check form-check-inline">
+						<label class="form-check-label">
+							<%= check_box show_testtime => 1, class => 'form-check-input' =%>
+							<%= maketext('test time') =%>
+						</label>
+					</div>
+					<div class="form-check form-check-inline">
+						<label class="form-check-label">
+							<%= check_box show_timeleft => 1, class => 'form-check-input' =%>
+							<%= maketext('time remaining') =%>
+						</label>
+					</div>
+					<div class="form-check form-check-inline">
+						<label class="form-check-label">
+							<%= check_box show_problems => 1, class => 'form-check-input' =%>
+							<%= maketext('problems') =%>
+						</label>
+					</div>
+					<div class="form-check form-check-inline">
+						<label class="form-check-label">
+							<%= check_box show_section => '1', class => 'form-check-input' =%>
+							<%= maketext('section #') =%>
+						</label>
+					</div>
+					<div class="form-check form-check-inline">
+						<label class="form-check-label">
+							<%= check_box show_recitation => '1', class => 'form-check-input' =%>
+							<%= maketext('recitation #') =%>
+						</label>
+					</div>
+					<div class="form-check form-check-inline">
+						<label class="form-check-label">
+							<%= check_box show_login => '1', class => 'form-check-input' =%>
+							<%= maketext('login') =%>
+						</label>
+					</div>
+				</div>
+				<%= submit_button maketext('Update Display'), class => 'btn btn-primary' =%>
+			</div>
+		<% end =%>
+	</div>
+% }
+%
+% # Table description. Only show the problem description if the problems column is shown.
+<div>
+	% if ($setIsVersioned) {
+		<p>
+			<%= maketext(
+				q{Click a student's name to see the student's test summary page. }
+					. q{Click a test's version number to see the corresponding test version. }
+					. 'Click a heading to sort the table.'
+			) =%>
+		</p>
+	% } else {
+		<p>
+			<%= maketext(
+				q{Click a student's name to see the student's homework set. Click a heading to sort the table.}
+			) =%>
+		</p>
+	% }
+	%
+	% my %display_sort_method_name = (
+		% last_name     => maketext('last name'),
+		% first_name    => maketext('first name'),
+		% email_address => maketext('email address'),
+		% score         => maketext('score'),
+		% section       => maketext('section'),
+		% recitation    => maketext('recitation'),
+		% user_id       => maketext('login name'),
+	% );
+	% if (defined $primary_sort_method) {
+		<p>
+			<%= maketext('Entries are sorted by [_1]', $display_sort_method_name{$primary_sort_method}) =%>
+			% if (defined $secondary_sort_method) {
+				<%= maketext(', then by [_1]', $display_sort_method_name{$secondary_sort_method}) =%>
+			% }
+			% if (defined $ternary_sort_method) {
+				<%= maketext(', then by [_1]', $display_sort_method_name{$ternary_sort_method}) =%>
+			% }
+		</p>
+	% }
+</div>
+%
+% my %params = (
+	% # Shift past sort methods down in priority.
+	% defined $primary_sort_method ? (secondary_sort => $primary_sort_method) : (),
+	% defined $secondary_sort_method ? (ternary_sort => $secondary_sort_method) : (),
+	% # Preserve display options when the sort headers are clicked for gateway quizzes.
+	% $setIsVersioned
+	% ? (
+		% show_best_only  => $showBestOnly,
+		% show_date       => $showColumns->{date},
+		% show_testtime   => $showColumns->{testtime},
+		% show_timeleft   => $showColumns->{timeleft},
+		% show_problems   => $showColumns->{problems},
+		% show_section    => $showColumns->{section},
+		% show_recitation => $showColumns->{recit},
+		% show_login      => $showColumns->{login},
+		% )
+	% : ()
+% );
+%
+% # Start table output
+<div class="table-responsive">
+	<table class="grade-table table table-bordered table-sm font-xs">
+		<thead>
+			% my $rowspan = $showColumns->{problems} ? 'rowspan="2"' : '';
+			<tr>
+				<th <%== $rowspan %>>
+					<%= maketext('Name') %>
+					<br>
+					<%= link_to maketext('First') =>
+						$c->systemLink(url_for, params => { primary_sort => 'first_name', %params }) =%>
+					&nbsp;&nbsp;&nbsp;
+					<%= link_to maketext('Last') =>
+						$c->systemLink(url_for, params => { primary_sort => 'last_name', %params }) =%>
+					<br>
+					<%= link_to maketext('Email') =>
+						$c->systemLink(url_for, params => { primary_sort => 'email_address', %params }) =%>
+				</th>
+				<th <%== $rowspan %>>
+					<%= link_to maketext('Score') =>
+						$c->systemLink(url_for, params => { primary_sort => 'score', %params }) =%>
+				</th>
+				<th <%== $rowspan %>><%= maketext('Out Of') %></th>
+				% # Additional columns that may be shown depending on if showing a gateway quiz and user selection.
+				% if ($showColumns->{date}) {
+					<th <%== $rowspan %>><%= maketext('Date') %></th>
+				% }
+				% if ($showColumns->{testtime}) {
+					<th <%== $rowspan %>><%= maketext('Test Time') %></th>
+				% }
+				% if ($showColumns->{timeleft}) {
+					<th <%== $rowspan %>><%= maketext('Time Remaining') %></th>
+				% }
+				% if ($showColumns->{problems}) {
+					<th colspan="<%= scalar(@$problems) %>">
+						<%= maketext('Problems') =%>
+						<a class="help-popup" role="button" tabindex="0" data-bs-placement="top"
+							data-bs-toggle="popover"
+							data-bs-content="<%= maketext(
+								'The top number is the percent score on the problem.  A period (.) indicates a problem '
+								. 'has not been attempted. The bottom number is the number of incorrect attempts.'
+							) =%>">
+							<i class="icon fas fa-question-circle" data-alt="<%= maketext('Help Icon') =%>"
+								aria-hidden="true">
+							</i>
+						</a>
+					</th>
+				% }
+				% if ($showColumns->{section}) {
+					<th <%== $rowspan %>>
+						<%= link_to maketext('Section') =>
+							$c->systemLink(url_for, params => { primary_sort => 'section', %params }) =%>
+					</th>
+				% }
+				% if ($showColumns->{recit}) {
+					<th <%== $rowspan %>>
+						<%= link_to maketext('Recitation') =>
+							$c->systemLink(url_for, params => { primary_sort => 'recitation', %params }) =%>
+					</th>
+				% }
+				% if ($showColumns->{login}) {
+					<th <%== $rowspan %>>
+						<%= link_to maketext('Login Name') =>
+							$c->systemLink(url_for, params => { primary_sort => 'user_id', %params }) =%>
+					</th>
+				% }
+			</tr>
+			% if ($showColumns->{problems}) {
+				<tr>
+					% for (@$problems) {
+						<th class="problem-data"><%= $_ %></th>
+					% }
+				</tr>
+			% }
+		</thead>
+		<tbody class="table-group-divider">
+			% # This is used to determine when all gateway versions for one user have been displayed and the next user
+			% # is being switched to.
+			% my $prevUserID = '';
+			%
+			% for my $rec (@$user_set_list) {
+				% my $fullName = join('', $rec->{record}{first_name}, " ", $rec->{record}{last_name});
+				% my $email    = $rec->{record}{email_address};
+				%
+				% if ($setIsVersioned) {
+					% my $interactiveURL = $c->systemLink(
+						% url_for('problem_list'),
+						% params => { effectiveUser => $rec->{record}{user_id} }
+					% );
+					%
+					<tr>
+						% # If total is -1, then this is a user that hasn't taken any tests.
+						% if ($rec->{total} != -1) {
+							% # Make a versioned set name format nicer and link to the test version.
+							% my $versionLink = link_to "version $rec->{version}" => $c->systemLink(
+								% url_for('gateway_quiz', setID => "$setID,v$rec->{version}"),
+								% params => { effectiveUser => $rec->{record}{user_id} }
+							% );
+							%
+							<td>
+							% if ($rec->{record}{user_id} eq $prevUserID) {
+								<div class="ms-4">(<%= $versionLink %>)</div>
+							% } else {
+								<div>
+									<%= link_to $fullName => $interactiveURL =%>
+									% if ($setIsVersioned && !$showBestOnly) {
+										(<%= $versionLink %>)
+									% }
+								</div>
+								% if ($email) {
+									<div><%= link_to $email => "mailto:$email" =%></div>
+								% }
+								% $prevUserID = $rec->{record}{user_id};
+							% }
+							</td>
+							<td><%= $rec->{score} %></td>
+							<td><%= $rec->{total} %></td>
+							% if ($showColumns->{date}) {
+								<td><%= $rec->{date} =%></td>
+							% }
+							% if ($showColumns->{testtime}) {
+								<td><%= $rec->{testtime} %></td>
+							% }
+							% if ($showColumns->{timeleft}) {
+								<td><%= $rec->{timeleft} %></td>
+							% }
+							% if ($showColumns->{problems}) {
+								% if (@{ $rec->{problem_scores} }) {
+									% for (0 .. $#{ $rec->{problem_scores} }) {
+										<td class="problem-data">
+											<span class="<%=
+												$rec->{problem_scores}[$_] eq '100'             ? 'correct'
+												: $rec->{problem_scores}[$_] eq '&nbsp;.&nbsp;' ? 'unattempted'
+												:                                                 '' =%>">
+												<%== $rec->{problem_scores}[$_] =%>
+											</span>
+											<br>
+											<%== $rec->{problem_incorrect_attempts}[$_] // '&nbsp;' =%>
+										</td>
+									% }
+								% } else {
+									<td class="problem-data">&nbsp;</td>
+								% }
+							% }
+						% } else {
+							<td>
+								<div><%= link_to $fullName => $interactiveURL =%></div>
+								<div><%= link_to $email => "mailto:$email" =%></div>
+							</td>
+							<td><%= $rec->{score} %></td>
+							<td colspan="<%= $numCols %>"><em><%= maketext('No tests taken.') %></em></td>
+						% }
+						% if ($showColumns->{section}) {
+							<td><%= $rec->{record}{section} %></td>
+						% }
+						% if ($showColumns->{recit}) {
+							<td><%= $rec->{record}{recitation} %></td>
+						% }
+						% if ($showColumns->{login}) {
+							<td><%= $rec->{record}{user_id} %></td>
+						% }
+					</tr>
+				% } else {
+					<tr>
+						<td>
+							<div>
+								<%= link_to $fullName => $c->systemLink(
+									url_for('problem_list'),
+									params => { effectiveUser => $rec->{record}{user_id} }
+								) =%>
+							</div>
+							% if ($email) {
+								<div><%= link_to $email => "mailto:$email" %></div>
+							% }
+						</td>
+						<td><%= $rec->{score} %></td>
+						<td><%= $rec->{total} %></td>
+						% if (@{ $rec->{problem_scores} }) {
+							% for (0 .. $#{ $rec->{problem_scores} }) {
+								<td class="problem-data">
+									<span class="<%=
+										$rec->{problem_scores}[$_] eq '100'             ? 'correct'
+										: $rec->{problem_scores}[$_] eq '&nbsp;.&nbsp;' ? 'unattempted'
+										:                                                 '' =%>">
+										<%== $rec->{problem_scores}[$_] =%>
+									</span>
+									<br>
+									<%== $rec->{problem_incorrect_attempts}[$_] // '&nbsp;' =%>
+								</td>
+							% }
+						% } else {
+							<td class="problem-data">&nbsp;</td>
+						% }
+						<td><%= $rec->{record}{section} %></td>
+						<td><%= $rec->{record}{recitation} %></td>
+						<td><%= $rec->{record}{user_id} %></td>
+					</tr>
+				% }
+			% }
+		</tbody>
+	</table>
+</div>
diff --git a/templates/ContentGenerator/Instructor/UserDetail.html.ep b/templates/ContentGenerator/Instructor/UserDetail.html.ep
new file mode 100644
index 0000000000..12a9f5a7f5
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/UserDetail.html.ep
@@ -0,0 +1,129 @@
+% use WeBWorK::Utils qw(getAssetURL);
+%
+% content_for css => begin
+	<%= stylesheet getAssetURL($ce, 'node_modules/flatpickr/dist/flatpickr.min.css') =%>
+	<%= stylesheet getAssetURL($ce, 'node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.css') =%>
+% end
+%
+% content_for js => begin
+	<%= javascript getAssetURL($ce, 'node_modules/luxon/build/global/luxon.min.js'), defer => undef =%>
+	<%= javascript getAssetURL($ce, 'node_modules/flatpickr/dist/flatpickr.min.js'), defer => undef =%>
+	% if ($ce->{language} !~ /^en/) {
+		<%= javascript
+			getAssetURL($ce, 'node_modules/flatpickr/dist/l10n/' . ($ce->{language} =~ s/^(..).*/$1/gr) . '.js'),
+			defer => undef =%>
+	% }
+	<%= javascript getAssetURL($ce, 'node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.js'),
+		defer => undef =%>
+	<%= javascript getAssetURL($ce, 'node_modules/shortcut-buttons-flatpickr/dist/shortcut-buttons-flatpickr.min.js'),
+		defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/DatePicker/datepicker.js'), defer => undef =%>
+	%
+	% # Add javascript specifically for this module.
+	<%= javascript getAssetURL($ce, 'js/UserDetail/userdetail.js'), defer => undef =%>
+% end
+%
+% unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
+	<div class="alert alert-danger p-1">
+		<%= maketext('You are not authorized to edit user specific information.') =%>
+	</div>
+	% last;
+% }
+%
+% unless ($c->{userRecord}) {
+	<div class="alert alert-danger p-1"><%= maketext('User [_1] not found.', $userID) %></div>
+	% last;
+% }
+%
+% my @editForSets = param('editForSets');
+%
+% my $userName = $c->{userRecord}->first_name . ' ' . $c->{userRecord}->last_name;
+%
+% # Display a message about how many sets have been assigned to this user.
+<div class="text-center my-3">
+	<h2 class="fs-6">
+		<%== maketext(
+			'Edit [_1] for [_2] ([_3]) who has been assigned [_4] sets.',
+			link_to(maketext('class list data') => $c->systemLink(
+				url_for('instructor_user_list'),
+				params => { visible_users => $userID, editMode => 1 }
+			)),
+			$userName,
+			$userID,
+			scalar(keys %{ $c->{userSetRecords} })
+		) =%>
+	</h2>
+</div>
+%
+<%= form_for current_route, method => 'post', name => 'UserDetail', id => 'UserDetail', begin =%>
+	<%= $c->hidden_authen_fields =%>
+	%
+	<div class="mb-2">
+		<%= submit_button maketext('Assign All Sets to Current User'),
+			name => 'assignAll', class => 'btn btn-primary' =%>
+	</div>
+	% # Print warning
+	<div class="alert alert-danger p-1 mb-2">
+		<div class="mb-1"><%= maketext('Do not uncheck a set unless you know what you are doing.') %></div>
+		<div><%= maketext('There is NO undo for unassigning a set.') %></div>
+	</div>
+	<div class="alert alert-danger p-1 fs-6 mb-2">
+		<%= maketext(
+			'When you uncheck a homework set (and save the changes), you destroy all of the data for that set for '
+				. 'this student.   If you reassign the set, the student will receive a new version of each problem. '
+				. 'Make sure this is what you want to do before unchecking sets.'
+		) =%>
+	</div>
+	<div class="fs-6 mb-2">
+		<%= maketext(
+			'To change status (scores or grades) for this student for one set, click on the individual set link.') =%>
+	</div>
+	%
+	<div class="mb-2">
+		<%= submit_button maketext('Save changes'), name => 'save_button', class => 'btn btn-primary' =%>
+	</div>
+	%
+	<div class="table-responsive">
+		<table class="table table-bordered table-sm font-sm align-middle">
+			<tr>
+				<th class="text-center" colspan="3">
+					<%= maketext("Sets assigned to [_1] ([_2])", $userName, $userID) =%>
+				</th>
+			</tr>
+			<tr>
+				<th class="text-center"><%= maketext('Assigned') %></th>
+				<th><%= maketext("Edit set for [_1]", $userID) %></th>
+				<th><%= maketext('Dates') %></th>
+			</tr>
+			% for my $set (@{ $c->{setRecords} }) {
+				% my $setID = $set->set_id;
+				%
+				<%= include 'ContentGenerator/Instructor/UserDetail/set_row',
+					set       => $set,
+				   	userSet   => $c->{userSetRecords}{$setID},
+				   	mergedSet => $c->{mergedSetRecords}{$setID} =%>
+				%
+				% if ($set->assignment_type =~ /gateway/) {
+					% for (0 .. $#{ $c->{setVersions}{$setID} }) {
+						<%= include 'ContentGenerator/Instructor/UserDetail/set_row',
+							set       => $set,
+							userSet   => $c->{setVersions}{$setID}[$_],
+							mergedSet => $c->{mergedVersions}{$setID}[$_],
+							version   => $c->{setVersions}{$setID}[$_]->version_id =%>
+					% }
+				% }
+			% }
+		</table>
+	</div>
+	%
+	<%= submit_button maketext('Save changes'), name => 'save_button', class => 'btn btn-primary' =%>
+<% end =%>
+%
+% # Print warning
+<div class="alert alert-danger p-1 mt-3">
+	<%= maketext(
+		'There is NO undo for unassigning sets. Do not do so unless you know what you are doing!  When you unassign '
+			. 'sets by unchecking set names and clicking save, you destroy all of the data for those sets for '
+			. 'this student.'
+	) =%>
+</div>
diff --git a/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep b/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep
new file mode 100644
index 0000000000..a75604c7cf
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep
@@ -0,0 +1,74 @@
+% my $setID = $globalRecord->set_id;
+%
+% # Modify set id to include the version if this is a versioned set.
+% my $isVersioned = 0;
+% if (defined $mergedRecord && $mergedRecord->assignment_type =~ /gateway/ && $mergedRecord->can('version_id')) {
+	% $setID .= ',v' . $mergedRecord->version_id;
+	% $isVersioned = 1;
+% }
+%
+<table>
+	<tr>
+		<th scope="col" colspan="3">
+			<%= maketext("User overrides") =%>
+		</th>
+		<th scope="col">
+			<%= maketext("Set values") =%>
+		</th>
+	</tr>
+	% for my $field (@$fields) {
+		% # Skip reduced credit dates for sets which don't have them.
+		% next
+			% if $field eq 'reduced_scoring_date'
+			% && (!$ce->{pg}{ansEvalDefaults}{enableReducedScoring} || !$globalRecord->enable_reduced_scoring);
+		%
+		<tr>
+			% my $globalValue = $globalRecord->$field;
+			%
+			<td class="px-1 text-nowrap">
+				% if (defined $userRecord) {
+					<%= label_for "set.$setID.$field.override_id" => maketext($fieldLabels->{$field}),
+						class => 'form-check-label' =%>
+				% } else {
+					<%= maketext($fieldLabels->{$field}) =%>
+				% }
+			</td>
+			<td class="px-1 text-nowrap">
+				% if (defined $userRecord) {
+					<%= check_box "set.$setID.$field.override" => $field,
+						id => "set.$setID.$field.override_id", class => 'form-check-input',
+						(defined $mergedRecord ? $mergedRecord->$field : $globalValue) ne $globalValue
+						|| ($isVersioned && $field ne 'reduced_scoring_date')
+						? (checked => undef)
+						: () =%>
+				% }
+			</td>
+			<td class="px-1 text-nowrap">
+				% if (defined $userRecord) {
+					<div class="input-group input-group-sm flex-nowrap flatpickr">
+						<%= text_field "set.$setID.$field" =>
+								defined $userRecord ? $userRecord->$field : $globalValue,
+							id          => "set.$setID.${field}_id",
+							placeholder => maketext('None Specified'),
+							class       => 'form-control w-auto' . ($field eq 'open_date' ? ' datepicker-group' : ''),
+							data => {
+								override  => "set.$setID.$field.override_id",
+								input      => undef,
+								done_text  => maketext('Done'),
+								today_text => maketext('Today'),
+								now_text   => maketext('Now'),
+								locale     => $ce->{language},
+								timezone   => $ce->{siteDefaults}{timezone}
+							} =%>
+						<a class="btn btn-secondary btn-sm" data-toggle><i class="fas fa-calendar-alt"></i></a>
+					</div>
+				% }
+			</td>
+			<td class="px-1 text-nowrap">
+				<span dir="ltr">
+					<%= $c->formatDateTime($globalValue, '', 'datetime_format_short', $ce->{language}) =%>
+				</span>
+			</td>
+		</tr>
+	% }
+</table>
diff --git a/templates/ContentGenerator/Instructor/UserDetail/set_row.html.ep b/templates/ContentGenerator/Instructor/UserDetail/set_row.html.ep
new file mode 100644
index 0000000000..df4d683b12
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/UserDetail/set_row.html.ep
@@ -0,0 +1,33 @@
+% use WeBWorK::Utils qw(format_set_name_display);
+%
+% # my ($set, $userSet, $mergedSet, $version) = @_;
+% my $setID   = $set->set_id;
+% my $version = stash 'version';
+<tr>
+	<td class="text-center">
+		<label class="form-check-label">
+			<%= check_box $version ? "set.$setID,v$version.assignment" : "set.$setID.assignment" => 'assigned',
+				class => 'form-check-input', defined $mergedSet ? (checked => undef) : () =%>
+		</label>
+	</td>
+	<td class="text-center">
+		% if (defined $mergedSet) {
+			<b dir="ltr">
+				<%= link_to format_set_name_display($version ? "$setID (version $version)" : $setID) =>
+					$c->systemLink(
+						url_for('instructor_set_detail', setID => $setID . ($version ? ",v$version" : '')),
+						params => { editForUser => $userID }
+					) =%>
+			</b>
+			% if ($version) {
+				<%= hidden_field "set.$setID,v$version.assignment" => 'delete' =%>
+			% }
+		% } else {
+			<b dir="ltr"><%= format_set_name_display($setID) %></b>
+		% }
+	</td>
+	<td class="text-center">
+		<%= include 'ContentGenerator/Instructor/UserDetail/set_date_table',
+			globalRecord => $set, userRecord => $userSet, mergedRecord => $mergedSet =%>
+	</td>
+</tr>
diff --git a/templates/ContentGenerator/Instructor/UserList.html.ep b/templates/ContentGenerator/Instructor/UserList.html.ep
new file mode 100644
index 0000000000..320e6882a6
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/UserList.html.ep
@@ -0,0 +1,95 @@
+% use WeBWorK::Utils qw(getAssetURL);
+%
+% content_for js => begin
+	<%= javascript getAssetURL($ce, 'js/ShowHide/show_hide.js'),    defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/ActionTabs/actiontabs.js'), defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/UserList/userlist.js'),     defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/SelectAll/selectall.js'),   defer => undef =%>
+% end
+%
+% unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
+	<div class="alert alert-danger p-1"><%= maketext('You are not authorized to access instructor tools.') =%></div>
+	% last;
+% }
+% if (($c->{passwordMode} || $c->{editMode}) && !$authz->hasPermissions(param('user'), 'modify_student_data')) {
+	<div class="alert alert-danger p-1"><%= maketext('You are not authorized to modify student data') =%></div>
+	% last;
+% }
+%
+<%= form_for current_route, method => 'POST', name => 'userlist', id => 'user-list-form', class => 'font-sm', begin =%>
+	<%= $c->hidden_authen_fields =%>
+	% if (keys %{ $c->{visibleUserIDs} }) {
+		% for (keys %{ $c->{visibleUserIDs} }) {
+			<%= hidden_field visible_users => $_ =%>
+		% }
+	% } else {
+		<%= hidden_field no_visible_users => '1' =%>
+	% }
+	% if (keys %{ $c->{prevVisibleUserIDs} }) {
+		% for (keys %{ $c->{prevVisibleUserIDs} }) {
+			<%= hidden_field prev_visible_users => $_ =%>
+		% }
+	% } else {
+		<%= hidden_field no_prev_visible_users => '1' =%>
+	% }
+	<%= hidden_field editMode => $c->{editMode} =%>
+	<%= hidden_field passwordMode => $c->{passwordMode} =%>
+	<%= hidden_field primarySortField => $c->{primarySortField} =%>
+	<%= hidden_field secondarySortField => $c->{secondarySortField} =%>
+	<%= hidden_field ternarySortField => $c->{ternarySortField} =%>
+	%
+	% # Output action forms
+	% my $default_choice;
+	%
+	% for my $actionID (@$formsToShow) {
+		% next if $formPerms->{$actionID} && !$authz->hasPermissions(param('user'), $formPerms->{$actionID});
+		%
+		% my $active = '';
+		% unless ($default_choice) { $active = ' active'; $default_choice = $actionID; }
+		%
+		% content_for 'tab-list' => begin
+			<li class="nav-item" role="presentation">
+				<%= link_to maketext($formTitles->{$actionID}) => "#$actionID",
+					class            => "nav-link action-link$active",
+					id               => "$actionID-tab",
+					data             => { action => $actionID, bs_toggle => 'tab', bs_target => "#$actionID" },
+					role             => 'tab',
+					'aria-controls'  => $actionID,
+					'aria-selected'  => $active ? 'true' : 'false' =%>
+			</li>
+		% end
+		% content_for 'tab-content' => begin
+			<div class="tab-pane fade mb-2 <%= $active ? " show$active" : '' %>" id="<%= $actionID %>"
+				role="tabpanel" aria-labelledby="<%= $actionID %>-tab">
+				<%= include "ContentGenerator/Instructor/UserList/${actionID}_form" =%>
+			</div>
+		% end
+	% }
+	%
+	<%= hidden_field action => $default_choice, id => 'current_action' =%>
+	<div>
+		<ul class="nav nav-tabs mb-2" role="tablist"><%= content 'tab-list' =%></ul>
+		<div class="tab-content"><%= content 'tab-content' %></div>
+	</div>
+	%
+	<div class="mb-3">
+		<%= submit_button maketext($formTitles->{$default_choice}), id => 'take_action', class => 'btn btn-primary' =%>
+	</div>
+	%
+	<p class="mb-0"><%= maketext('Showing [_1] out of [_2] users',
+		scalar(keys %{ $c->{visibleUserIDs} }), scalar(@{ $c->{allUserIDs} })) =%></p>
+	%
+	% if ($c->{passwordMode}) {
+		<p>
+			<%= maketext(q{If a password field is left blank, the student's current password will be maintained.}) =%>
+		</p>
+	% }
+	% if ($c->{editMode}) {
+		<p>
+			<%= maketext(
+				'Click on the login name to edit individual problem set data, (e.g. due dates) for these students.') =%>
+		</p>
+	% }
+	%
+	<%= include 'ContentGenerator/Instructor/UserList/user_list' =%>
+<% end =%>
diff --git a/templates/ContentGenerator/Instructor/UserList/add_form.html.ep b/templates/ContentGenerator/Instructor/UserList/add_form.html.ep
new file mode 100644
index 0000000000..e1433d8b8a
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/UserList/add_form.html.ep
@@ -0,0 +1,9 @@
+<div class="row mb-2">
+	<%= label_for 'add_entry', class => 'col-form-label col-form-label-sm col-auto', begin =%>
+		<%= maketext('Add how many users?') %><span class="required-field">*</span>
+	<% end =%>
+	<div class="col-auto">
+		<%= text_field number_of_students => 1, id => 'add_entry', size => 3, 'aria-required' => 'true',
+			class => 'form-control form-control-sm' =%>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/UserList/cancel_edit_form.html.ep b/templates/ContentGenerator/Instructor/UserList/cancel_edit_form.html.ep
new file mode 100644
index 0000000000..04d9646c9c
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/UserList/cancel_edit_form.html.ep
@@ -0,0 +1 @@
+<span><%= maketext('Abandon changes') =%></span>
diff --git a/templates/ContentGenerator/Instructor/UserList/cancel_password_form.html.ep b/templates/ContentGenerator/Instructor/UserList/cancel_password_form.html.ep
new file mode 100644
index 0000000000..3c1965a19c
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/UserList/cancel_password_form.html.ep
@@ -0,0 +1 @@
+<span><%= maketext('Abandon changes') %></span>
diff --git a/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep b/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep
new file mode 100644
index 0000000000..011a72d2c5
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep
@@ -0,0 +1,16 @@
+<div>
+	<div class="d-inline-block alert alert-danger p-1 mb-2">
+		<em><%= maketext('Warning: Deletion destroys all user-related data and is not undoable!') =%></em>
+	</div>
+	<div class="row mb-2">
+		<%= label_for delete_select => maketext('Delete which users?'),
+			class => 'col-form-label col-form-label-sm col-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.delete.scope' => [
+					[ maketext('no users')       => 'none', selected => undef ],
+					[ maketext('selected users') => 'selected' ]
+				],
+				id => 'delete_select', class => 'form-select form-select-sm' =%>
+		</div>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep b/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep
new file mode 100644
index 0000000000..0a4821cd94
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep
@@ -0,0 +1,11 @@
+<div class="row mb-2">
+	<%= label_for edit_select => maketext('Edit which users?'), class => 'col-form-label col-form-label-sm col-auto' =%>
+	<div class="col-auto">
+		<%= select_field 'action.edit.scope' => [
+				[ maketext('all users')      => 'all' ],
+				[ maketext('visible users')  => 'visible' ],
+				[ maketext('selected users') => 'selected', selected => undef ]
+			],
+			id => 'edit_select', class => 'form-select form-select-sm' =%>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/UserList/export_form.html.ep b/templates/ContentGenerator/Instructor/UserList/export_form.html.ep
new file mode 100644
index 0000000000..41ed33b6b3
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/UserList/export_form.html.ep
@@ -0,0 +1,39 @@
+% use WeBWorK::Utils::Instructor qw(getCSVList);
+%
+<div>
+   	<div class="row mb-2">
+		<%= label_for export_select_scope => maketext('Export which users?'),
+			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.export.scope' => [
+					[ maketext('all users')      => 'all' ],
+					[ maketext('visible users')  => 'visible', selected => undef ],
+					[ maketext('selected users') => 'selected' ],
+				],
+				id => 'export_select_scope', class => 'form-select form-select-sm' =%>
+		</div>
+	</div>
+	<div class="row mb-2">
+		<%= label_for export_select_target => maketext('Export to what kind of file?'),
+			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.export.target' => [
+					[ maketext('Enter filename below') => 'new' ],
+					getCSVList($ce)
+				],
+				id => 'export_select_target', class => 'form-select form-select-sm' =%>
+		</div>
+	</div>
+	<div id="export_elements" class="row mb-2">
+		<%= label_for 'export_filename', class => 'col-form-label col-form-label-sm col-sm-auto', begin =%>
+			<%= maketext('Filename') %><span class="required-field">*</span>
+		<% end =%>
+		<div class="col-auto d-inline-flex">
+			<div class="input-group input-group-sm">
+				<%= text_field 'action.export.new' => '', id => 'export_filename', 'aria-required' => 'true',
+					class => 'form-control form-control-sm' =%>
+				<span class="input-group-text font-monospace">.lst</span>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep b/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep
new file mode 100644
index 0000000000..c4a8cf8e30
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep
@@ -0,0 +1,39 @@
+<div>
+	<div class="row mb-2">
+		<%= label_for filter_select => maketext('Show which users?'),
+			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.filter.scope' => [
+					[ maketext('all users')                         => 'all' ],
+					[ maketext('no users')                          => 'none' ],
+					[ maketext('selected users')                    => 'selected' ],
+					[ maketext('users who match on selected field') => 'match_regex', selected => undef ]
+				],
+				id => 'filter_select', class => 'form-select form-select-sm' =%>
+		</div>
+	</div>
+	<div id="filter_elements">
+		<div class="row mb-2">
+			<%= label_for 'filter_type_select' => maketext('What field should filtered users match on?'),
+				class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+			<div class="col-auto">
+				<%= select_field 'action.filter.field' => [
+						map { [
+							maketext($fieldProperties->{$_}{name}) => $_,
+							$_ eq 'user_id' ? (selected => undef) : ()
+					   	] } grep { $_ ne 'email_address' } @$fields
+					],
+					id => 'filter_type_select', class => 'form-select form-select-sm' =%>
+			</div>
+		</div>
+		<div class="row mb-2">
+			<%= label_for 'filter_text', class => 'col-form-label col-form-label-sm col-sm-auto', begin =%>
+				<%= maketext('Filter by what text?') %><span class="required-field">*</span>
+			<% end =%>
+			<div class="col-auto">
+				<%= text_field 'action.filter.user_ids' => '', id => 'filter_text', 'aria-required' => 'true',
+					class => 'form-control form-control-sm' =%>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/UserList/import_form.html.ep b/templates/ContentGenerator/Instructor/UserList/import_form.html.ep
new file mode 100644
index 0000000000..6797d5f7b0
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/UserList/import_form.html.ep
@@ -0,0 +1,36 @@
+% use WeBWorK::Utils::Instructor qw(getCSVList);
+%
+<div>
+	<div class="row mb-2">
+		<%= label_for import_select_source => maketext('Import users from what file?'),
+			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.import.source' => [ getCSVList($ce) ],
+				id => 'import_select_source', class => 'form-select form-select-sm', dir => 'ltr' =%>
+		</div>
+	</div>
+	<div class="row mb-2">
+		<%= label_for import_select_replace => maketext('Replace which users?'),
+			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.import.replace' => [
+					[ maketext('any users')      => 'any' ],
+					[ maketext('visible users')  => 'visible' ],
+					[ maketext('selected users') => 'selected' ],
+					[ maketext('no users')       => 'none', selected => undef ]
+				],
+				id => 'import_select_replace', class   => 'form-select form-select-sm' =%>
+		</div>
+	</div>
+	<div class="row mb-2">
+		<%= label_for import_select_add => maketext('Add which new users?'),
+			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<div class="col-auto">
+			<%= select_field 'action.import.add' => [
+					[ maketext('any users') => 'any', selected => undef ],
+					[ maketext('no users')  => 'none' ]
+				],
+				id => 'import_select_add', class => 'form-select form-select-sm' =%>
+		</div>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/UserList/password_form.html.ep b/templates/ContentGenerator/Instructor/UserList/password_form.html.ep
new file mode 100644
index 0000000000..956f9bf1b6
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/UserList/password_form.html.ep
@@ -0,0 +1,12 @@
+<div class="row mb-2">
+	<%= label_for password_select => maketext('Give new password to which users?'),
+		class => 'col-form-label col-form-label-sm col-auto' =%>
+	<div class="col-auto">
+		<%= select_field 'action.password.scope' => [
+				[ maketext('all users')      => 'all' ],
+				[ maketext('visible users')  => 'visible' ],
+				[ maketext('selected users') => 'selected', selected => undef ]
+			],
+			id => 'password_select', class => 'form-select form-select-sm' =%>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/UserList/save_edit_form.html.ep b/templates/ContentGenerator/Instructor/UserList/save_edit_form.html.ep
new file mode 100644
index 0000000000..6a8054a030
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/UserList/save_edit_form.html.ep
@@ -0,0 +1 @@
+<span><%= maketext('Save changes') %></span>
diff --git a/templates/ContentGenerator/Instructor/UserList/save_password_form.html.ep b/templates/ContentGenerator/Instructor/UserList/save_password_form.html.ep
new file mode 100644
index 0000000000..6a8054a030
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/UserList/save_password_form.html.ep
@@ -0,0 +1 @@
+<span><%= maketext('Save changes') %></span>
diff --git a/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep b/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep
new file mode 100644
index 0000000000..25dd170eac
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep
@@ -0,0 +1,42 @@
+% my @sortFields = grep { $_ ne 'email_address' } @$fields;
+<div>
+	<div class="row mb-2">
+		<%= label_for sort_select_1 => maketext('Sort by') . ':', class => 'col-form-label col-form-label-sm',
+			style => 'width:4.5rem' =%>
+		<div class="col-auto">
+			<%= select_field 'action.sort.primary' => [
+					map { [
+						maketext($fieldProperties->{$_}{name}) => $_,
+						$_ eq 'last_name' ? (selected => undef) : ()
+					] } @sortFields
+				],
+				id => 'sort_select_1', class => 'form-select form-select-sm' =%>
+		</div>
+	</div>
+	<div class="row mb-2">
+		<%= label_for sort_select_2 => maketext('Then by') . ':', class => 'col-form-label col-form-label-sm',
+			style => 'width:4.5rem' =%>
+		<div class="col-auto">
+			<%= select_field 'action.sort.secondary' => [
+					map { [
+						maketext($fieldProperties->{$_}{name}) => $_,
+						$_ eq 'first_name' ? (selected => undef) : ()
+					] } @sortFields
+				],
+				id => 'sort_select_2', class => 'form-select form-select-sm' =%>
+		</div>
+	</div>
+	<div class="row mb-2">
+		<%= label_for sort_select_3 => maketext('Then by') . ':', class => 'col-form-label col-form-label-sm',
+			style => 'width:4.5rem' =%>
+		<div class="col-auto">
+			<%= select_field 'action.sort.ternary' => [
+					map { [
+						maketext($fieldProperties->{$_}{name}) => $_,
+						$_ eq 'user_id' ? (selected => undef) : ()
+					] } @sortFields
+				],
+				id => 'sort_select_3', class => 'form-select form-select-sm' =%>
+		</div>
+	</div>
+</div>
diff --git a/templates/ContentGenerator/Instructor/UserList/user_list.html.ep b/templates/ContentGenerator/Instructor/UserList/user_list.html.ep
new file mode 100644
index 0000000000..4c236d7d16
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/UserList/user_list.html.ep
@@ -0,0 +1,90 @@
+% if ($c->{passwordMode}) {
+	% content_for 'user-list-table-headings' => begin
+		<th id="new_password_header"><%= maketext('New Password') %></th>
+	% end
+% }
+%
+% unless ($c->{editMode} || $c->{passwordMode}) {
+	% content_for 'user-list-table-headings' => begin
+		<th>
+			<%= check_box 'select-all' => 'on', id => 'select-all', 'aria-label' => maketext('Select all users'),
+				data => { select_group => 'selected_users' }, class => 'select-all form-check-input' =%>
+		</th>
+		<th>
+			<%= label_for 'select-all' =>
+				link_to maketext('Login Name') => '#', class => 'sort-header',
+					data => { sort_field => 'user_id' } =%>
+		</th>
+		<th><%= maketext('Login Status') %></th>
+		<th><%= maketext('Assigned Sets') %></th>
+		<th>
+			<%= link_to maketext('First Name') => '#', class => 'sort-header',
+				data => { sort_field => 'first_name' } %>
+		</th>
+		<th>
+			<%= link_to maketext('Last Name') => '#', class => 'sort-header',
+				data => { sort_field => 'last_name' } =%>
+		</th>
+		<th><%= maketext('Email Link') %></th>
+		<th>
+			<%= link_to maketext('Student ID') => '#', class => 'sort-header',
+				data => { sort_field => 'student_id' } =%>
+		</th>
+		<th>
+			<%= link_to maketext('Status') => '#', class => 'sort-header',
+				data => { sort_field => 'status' } =%>
+		</th>
+		<th>
+			<%= link_to maketext('Section') => '#', class => 'sort-header',
+				data => { sort_field => 'section' } =%>
+		</th>
+		<th>
+			<%= link_to maketext('Recitation') => '#', class => 'sort-header',
+				data => { sort_field => 'recitation' } =%>
+		</th>
+		<th>
+			<%= link_to maketext('Comment') => '#', class => 'sort-header',
+				data => { sort_field => 'comment' } =%>
+		</th>
+		<th>
+			<%= link_to maketext('Permission Level') => '#', class => 'sort-header',
+				data => { sort_field => 'permission' } =%>
+		</th>
+	% end
+% } else {
+	% content_for 'user-list-table-headings' => begin
+		% for my $field (@$fields) {
+			<th id="<%= $field %>_header"><%= $fieldProperties->{$field}{name} %></th>
+		% }
+	% end
+% }
+%
+<div class="table-responsive">
+	<table id="classlist-table" class="table table-sm table-bordered caption-top font-sm <%=
+		$c->{editMode} || $c->{passwordMode} ? ' align-middle' : '' =%>">
+		<caption><%= maketext('Users List') %></caption>
+		<thead class="table-group-divider">
+			<tr>
+				<%= content 'user-list-table-headings' =%>
+			</tr>
+		</thead>
+		<tbody class="table-group-divider">
+			% for (@{ $c->{sortedUserIDs} }) {
+				<%= include 'ContentGenerator/Instructor/UserList/user_row',
+					user         => $c->{allUsers}{$_},
+					userSelected => exists $c->{selectedUserIDs}{$_},
+					editable     => exists $c->{userIsEditable}{$_}
+				=%>
+			% }
+		</tbody>
+	</table>
+</div>
+%
+% # If there are no users shown print message.
+% unless (scalar(@{ $c->{sortedUserIDs} })) {
+	<p>
+		<i>
+			<%= maketext('No students shown. Choose one of the options above to list the students in the course.') =%>
+		</i>
+	</p>
+% }
diff --git a/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep b/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep
new file mode 100644
index 0000000000..d10325344b
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep
@@ -0,0 +1,56 @@
+% my $fieldName = 'user.' . $user->user_id . '.' . $field;
+% my $properties = $fieldProperties->{$field};
+%
+% if ($properties->{type} eq 'text') {
+	% my $value = $user->$field;
+	% if ($c->{editMode}) {
+		<%= text_field $fieldName => $value, id => $fieldName . '_id', size => $properties->{size},
+			class => 'form-control form-control-sm d-inline w-auto',
+			'aria-labelledby' => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header' =%>
+	% } else {
+		% if (!$c->{passwordMode} && $field eq 'email_address') {
+			% if ($value =~ /\S/) {
+				<%= link_to maketext('Email') => "mailto:$value" =%>
+			% }
+		% } else {
+			<%= $value =%>
+		% }
+	% }
+% } elsif ($properties->{type} eq 'status') {
+	% my $value = $user->$field;
+	% my $status_name = $ce->status_abbrev_to_name($value);
+	% if ($c->{editMode}) {
+		% if (defined $status_name) {
+			% $value = ($ce->status_name_to_abbrevs($status_name))[0];
+		% }
+		<%= select_field $fieldName => [
+				map { [
+					maketext($_) => $ce->{statuses}{$_}{abbrevs}[0],
+					$ce->{statuses}{$_}{abbrevs}[0] eq $value ? (selected => undef) : ()
+				] } keys %{ $ce->{statuses} }
+			],
+			id => $fieldName . '_id', class => 'form-select form-select-sm w-auto flex-grow-0',
+			aria_labelledby => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header' =%>
+	% } else {
+		<%= $status_name ? maketext($status_name) : $value =%>
+	% }
+% } elsif ($properties->{type} eq 'permission') {
+	% # Use the permission that was saved in the user record in pre_header_initialize.
+	% my $value = $user->{permission};
+	% if ($c->{editMode}) {
+		% my @values;
+		% for my $role (sort { $ce->{userRoles}{$a} <=> $ce->{userRoles}{$b} } keys %{ $ce->{userRoles} }) {
+			% next unless $ce->{userRoles}{$role} <= $db->getPermissionLevel(param('user'))->permission;
+			% push(@values, [
+				% maketext($role) => $ce->{userRoles}{$role},
+				% $value eq $ce->{userRoles}{$role} ? (selected => undef) : ()
+			% ]);
+		% }
+		%
+		<%= select_field $fieldName => \@values,
+			id => $fieldName . '_id', class => 'form-select form-select-sm w-auto flex-grow-0',
+			aria_labelledby => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header' =%>
+	% } else {
+		<%= maketext((grep { $ce->{userRoles}{$_} eq $value } keys %{ $ce->{userRoles} })[0]) %>
+	% }
+% }
diff --git a/templates/ContentGenerator/Instructor/UserList/user_row.html.ep b/templates/ContentGenerator/Instructor/UserList/user_row.html.ep
new file mode 100644
index 0000000000..73e95b1f10
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/UserList/user_row.html.ep
@@ -0,0 +1,101 @@
+% my $statusClass = $ce->status_abbrev_to_name($user->status);
+%
+<tr>
+	% unless ($c->{editMode} || $c->{passwordMode}) {
+		% # Select checkboxes
+		<td>
+			% if ($editable) {
+				<%= check_box selected_users => $user->user_id, id => $user->user_id . '_checkbox',
+					class => 'form-check-input', $userSelected ? (checked => undef) : () =%>
+			% }
+		</td>
+		% # User id
+		<td>
+			<div class="label-with-edit-icon">
+				% # Make the user id the label for the select user checkbox.
+				<%= label_for $user->user_id . '_checkbox', begin =%>
+					% if (!$authz->hasPermissions(param('user'), 'become_student')) {
+						<%= $user->user_id =%>
+					% } else {
+						<%= link_to $user->user_id => $c->systemLink(
+							url_for('set_list'),
+							params => { effectiveUser => $user->user_id }
+						) =%>
+					% }
+				<% end =%>
+				% if ($editable) {
+					<%= link_to $c->systemLink(url_for, params => { editMode => 1, visible_users => $user->user_id }),
+						begin =%>
+						<i class="icon fas fa-pencil-alt" aria-hidden="true"
+							data-alt="<%= maketext('Link to Edit Page for [_1]', $user->user_id) %>">
+						</i>
+					% end
+				% }
+			</div>
+		</td>
+		% # Login Status
+		<td>
+			% if (
+				% $db->existsKeyWhere({
+					% user_id => $user->user_id,
+					% timestamp => { '>=' => time - $ce->{sessionKeyTimeout} }
+				% })
+			% )
+			% {
+				<b><%= maketext('Active') %></b>
+			% } else {
+				<em><%= maketext('Inactive') %></em>
+			% }
+		</td>
+	% }
+	%
+	% if ($c->{passwordMode}) {
+		% # New password field
+		<td>
+			% if ($user->user_id eq param('user')) {
+				% # Don't allow a user to change their own password from this form.
+				<div class="alert alert-danger px-1 py-0 m-0">
+					<%= maketext('You may not change your own password here!') =%>
+				</div>
+			% } elsif (!$editable) {
+				% # Prevent modification of users with elevated permissions.
+				<div class="alert alert-danger px-1 py-0 m-0">
+					<%= maketext('You may not change this user\'s password!') =%>
+				</div>
+			% } else {
+				% my $fieldName = 'user.' . $user->user_id . '.new_password';
+				% param($fieldName, undef);
+				<%= text_field $fieldName => '', id => "${fieldName}_id", 'aria-labelledby' => 'new_password_header',
+					size => 14, class => 'form-control form-control-sm d-inline w-auto' =%>
+			% }
+		</td>
+		% # User ID
+		<td><div class="<%= $statusClass %>"><%= $user->user_id %></div></td>
+	% } elsif ($c->{editMode}) {
+		% # User ID ("edit sets assigned to user" link)
+		<td>
+			<%= link_to $user->user_id =>
+				$c->systemLink(url_for('instructor_user_detail', userID => $user->user_id)) =%>
+		</td>
+	% } else {
+		% # User ID ("edit sets assigned to user" link)
+		<td>
+			% my $sets = $db->countUserSets($user->user_id);
+			% if (!$authz->hasPermissions(param('user'), 'assign_problem_sets')) {
+				<%= $sets =%>/<%= $c->{totalSets} =%>
+			% } else {
+				<%= link_to "$sets/$c->{totalSets}" =>
+					$c->systemLink(url_for('instructor_user_detail', userID => $user->user_id)) =%>
+			% }
+		</td>
+	% }
+	% # User Fields
+	% for my $field ($user->NONKEYFIELDS, 'permission') {
+		% next unless defined $fieldProperties->{$field};
+		<td>
+			<div class="<%= $statusClass %>">
+			   	<%= include 'ContentGenerator/Instructor/UserList/user_list_field', user => $user, field => $field =%>
+			</div>
+		</td>
+	% }
+</tr>
diff --git a/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep b/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep
new file mode 100644
index 0000000000..190b54e737
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep
@@ -0,0 +1,110 @@
+% use WeBWorK::Utils qw(format_set_name_display);
+%
+% unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
+	<div class="alert alert-danger p-1"><%= maketext('You are not authorized to access instructor tools.') %></div>
+	% last;
+% }
+%
+% unless ($authz->hasPermissions(param('user'), 'assign_problem_sets')) {
+	<div class="alert alert-danger p-1"><%= maketext('You are not authorized to assign homework sets.') %></div>
+	% last;
+% }
+%
+<%= form_for current_route, method => 'post', begin =%>
+	<div class="my-2">
+		<%= submit_button maketext('Assign to All Current Users'), name  => 'assignToAll',
+			class => 'btn btn-primary' =%>
+		<i><%= maketext('This action can take a long time if there are many students.') %></i>
+	</div>
+	<div class="alert alert-danger p-1 mb-2">
+		<p class="mb-1"><%= maketext('Do not uncheck students, unless you know what you are doing.') %></p>
+		<p class="mb-0"><%= maketext('There is NO undo for unassigning students.') %></p>
+	</div>
+	<div class="mb-2">
+		<%== maketext(
+			"When you unassign by unchecking a student's name, you destroy all of the data for homework set [_1] "
+				. 'for this student. You will then need to reassign the set to these students and they will receive '
+				. 'new versions of the problems. Make sure this is what you want to do before unchecking students.',
+			tag('b', dir => 'ltr', format_set_name_display($setID))
+		) =%>
+	</div>
+	<div class="table-responsive">
+		<table class="table table-bordered table-sm font-sm text-nowrap w-auto">
+			<thead>
+				<tr>
+					<th class="text-center"><%= maketext('Assigned') %></th>
+					<th><%= maketext('Login Name') %></th>
+					<th><%= maketext('Student Name') %></th>
+					<th class="text-center"><%= maketext('Section') %></th>
+					<th><%= maketext('Close Date') %></th>
+					<th><%= maketext('Edit Data') %></th>
+				</tr>
+			</thead>
+			<tbody class="table-group-divider">
+				% for my $user (@{ $c->{user_records} }) {
+					% my $userID  = $user->user_id;
+					% my $userSet = $db->getUserSet($userID, $setID);
+					%
+					<tr>
+						<td class="text-center">
+							<input type="checkbox" name="selected" id="selected_<%= $userID %>" value="<%= $userID %>"
+								class="form-check-input" <%= defined $userSet ? 'checked' : '' %>>
+						</td>
+						<td>
+							<div class="<%= $ce->status_abbrev_to_name($user->status) || '' %>">
+								<%= label_for "selected_$userID" => $userID =%>
+							</div>
+						</td>
+						<td>
+							<%= $user->last_name . ', ' . $user->first_name =%>
+						</td>
+						<td class="text-center"><%= $user->section %></td>
+						% if (defined $userSet) {
+							<td>
+								% if ($userSet->due_date) {
+									<%= $c->formatDateTime($userSet->due_date, '',
+										'datetime_format_short', $ce->{language}) =%>
+								% }
+							</td>
+							<td>
+								<%= link_to maketext('Edit data for [_1]', $userID) => $c->systemLink(
+									url_for('instructor_set_detail'),
+									params => { editForUser => $userID }
+								) =%>
+							</td>
+						% } else {
+							<td></td>
+							<td></td>
+						% }
+					</tr>
+				% }
+			</tbody>
+		</table>
+	</div>
+	<%= $c->hidden_authen_fields =%>
+	<%= submit_button maketext('Save'), name => 'assignToSelected', class => 'btn btn-primary' =%>
+	<hr>
+	<div>
+		<div class="alert alert-danger p-1 mb-3">
+			<%== maketext(
+				'There is NO undo for this function.  Do not use it unless you know what you are doing!  '
+					. 'When you unassign a student using this button, or by unchecking their name, you destroy all '
+					. 'of the data for homework set [_1] for this student.',
+				tag('span', dir => 'ltr', format_set_name_display($setID))
+			) =%>
+		</div>
+		<div class="d-flex flex-wrap align-items-center">
+			<%= submit_button maketext('Unassign from All Users'), name => 'unassignFromAll',
+				class => 'btn btn-primary' =%>
+			<label class="form-check-label text-nowrap">
+				<%= radio_button unassignFromAllSafety => 0, checked => undef, class => 'form-check-input mx-1' =%>
+				<%= maketext('Read only') =%>
+			</label>
+			<label class="form-check-label text-nowrap">
+				<%= radio_button unassignFromAllSafety => 1, class => 'form-check-input mx-1' =%>
+				<%= maketext('Allow unassign') =%>
+			</label>
+		</div>
+	</div>
+	<hr>
+<% end =%>
diff --git a/templates/ContentGenerator/LTIAdvantage/login_repost.html.ep b/templates/ContentGenerator/LTIAdvantage/login_repost.html.ep
new file mode 100644
index 0000000000..60e1d40803
--- /dev/null
+++ b/templates/ContentGenerator/LTIAdvantage/login_repost.html.ep
@@ -0,0 +1,17 @@
+<%= form_for $ce->{LTI}{v1p3}{AuthReqURL}, method => 'POST',
+	enctype => 'application/x-www-form-urlencoded', name => 'ltiRepost', id => 'ltiRepost', begin =%>
+	<%= hidden_field repost           => 1 =%>
+	<%= hidden_field response_type    => 'id_token' =%>
+	<%= hidden_field response_mode    => 'form_post' =%>
+	<%= hidden_field scope            => 'openid' =%>
+	<%= hidden_field login_hint       => param('login_hint') =%>
+	<%= hidden_field lti_message_hint => param('lti_message_hint') =%>
+	<%= hidden_field state            => $LTIState =%>
+	<%= hidden_field nonce            => $LTINonce =%>
+	<%= hidden_field redirect_uri     => url_for('ltiadvantage_launch')->to_abs =%>
+	<%= hidden_field client_id        => param('client_id') =%>
+	<%= hidden_field prompt           => 'none' =%>
+<% end =%>
+<%= javascript begin =%>
+	document.ltiRepost.submit();
+<% end =%>
diff --git a/templates/ContentGenerator/Login.html.ep b/templates/ContentGenerator/Login.html.ep
new file mode 100644
index 0000000000..47edb18ff5
--- /dev/null
+++ b/templates/ContentGenerator/Login.html.ep
@@ -0,0 +1,79 @@
+% # WeBWorK::Authen::verify will set the note "authen_error" if invalid authentication is found.  If this is done,
+% # it's a signal to us to yell at the user for doing that, since Authen isn't a content-generating module.
+% if (stash('authen_error')) {
+	<div class="alert alert-danger" tabindex="0"><%= stash('authen_error') =%></div>
+% }
+%
+% my $course = (stash('courseID') // '') =~ s/_/ /gr;
+%
+% if ($externalAuth) {
+	% my $LMS = $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+		% ? link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+		% : $ce->{LTI}{ $ce->{LTIVersion} }{LMS_name};
+	%
+	% if (!stash('authen_error')) {
+		<p>
+			<%== maketext('The course [_1] uses an external authentication system ([_2]). '
+				. 'Please return to that system to access this course.',
+				tag('strong', $course), $LMS) =%>
+		</p>
+	% } else {
+		<p>
+			<%== maketext('The course [_1] uses an external authentication system ([_2]). You\'ve authenticated '
+				. 'through that system, but aren\'t allowed to log in to this course.',
+				tag('strong', $course), $LMS) =%>
+		</p>
+	% }
+% } else {
+	<p><%== maketext('Please enter your username and password for [_1] below:', tag('b', $course)) %></p>
+	%
+	% if ($ce->{session_management_via} ne 'session_cookie') {
+		<p>
+			<%== maketext('If you check [_1] your login information will be remembered by the browser you are using, '
+				. 'allowing you to visit WeBWorK pages without typing your user name and password (until your session '
+				. 'expires). This feature is not safe for public workstations, untrusted machines, and machines '
+				. 'over which you do not have direct control.',
+				tag('strong', maketext('Remember Me'))
+			) =%>
+		</p>
+	% }
+	%
+	<%= form_for current_route, method => 'POST', id => 'login_form', begin =%>
+		<%= $hidden_fields =%>
+		%
+		<div class="col-xl-5 col-lg-6 col-md-7 col-sm-8 my-3">
+			<div class="form-floating mb-2">
+				% # Prevent user from being filled in for practice users (they should use the "Guest Login" button).
+				% param('user', undef) if param('user') && param('user') =~ m/^$ce->{practiceUserPrefix}/;
+				%
+				<%= text_field user => '', id => 'uname', 'aria-required' => 'true', class => 'form-control',
+					placeholder => '', autocapitalize => 'none', spellcheck => 'false' =%>
+				<%= label_for uname => maketext('Username') =%>
+			</div>
+			<div class="form-floating mb-2">
+				<%= password_field 'passwd', id => 'pswd', 'aria-required' => 'true', class => 'form-control',
+					placeholder => '' =%>
+				<%= label_for pswd => maketext('Password') =%>
+			</div>
+			% if ($ce->{session_management_via} ne 'session_cookie') {
+				<div class="form-check form-control-lg mb-2">
+					<%= check_box(send_cookie => 'on', id => 'rememberme', class => 'form-check-input') =%>
+					<%= label_for rememberme => maketext('Remember Me') =%>
+				</div>
+			% }
+			<%= submit_button(maketext('Continue'), class => 'btn btn-primary') =%>
+		</div>
+		%
+		% # Guest login
+		% if (@$allowedGuestUsers) {
+			<div class="my-3">
+				<p>
+					<%== maketext('This course supports guest logins. Click [_1] to log into this course as a guest.',
+						tag('b', maketext('Guest Login'))) =%>
+				</p>
+				<%= submit_button maketext('Guest Login'),
+					name  => 'login_practice_user', class => 'btn btn-primary' =%>
+			</div>
+		% }
+	<% end =%>
+% }
diff --git a/templates/ContentGenerator/LoginProctor.html.ep b/templates/ContentGenerator/LoginProctor.html.ep
new file mode 100644
index 0000000000..bca4805257
--- /dev/null
+++ b/templates/ContentGenerator/LoginProctor.html.ep
@@ -0,0 +1,96 @@
+% unless (defined $userSet) {
+	<div class="alert alert-danger p-1 mb-2">
+		<%= maketext('Proctor authorization requested for a nonexistent set.') =%>
+	</div>
+	% last;
+% }
+%
+<div class="my-2"><strong><%= maketext('Proctor authorization required.') %></strong></div>
+%
+% # WeBWorK::Authen::verifyProctor will set the "authen_error" stash value if authentication is not valid.
+% # In that case, show the error.
+% if (stash('authen_error')) {
+	<div class="alert alert-danger"><%= stash('authen_error') %></div>
+% }
+%
+% # Print a message about submission times if we're submitting an answer.
+% if (param('submitAnswers')) {
+	% my $dueTime = $userSet->due_date;
+	% my ($color, $msg) = ('#ddddff', '');
+	% if ($dueTime + $ce->{gatewayGracePeriod} < $submitTime) {
+		% $color = '#ffffaa';
+		% $msg = maketext('The time limit on this assignment was exceeded. The assignment may be checked, '
+			% . 'but the result will not be counted.');
+	% }
+	%
+	<div class="card mb-2" style="background-color:<%= $color %>;">
+		<div class="card-body p-2">
+			<div class="card-title"><strong><%= maketext('Grading Assignment') %></strong></div>
+			<div class="card-text">
+				<strong><%= maketext('Submission time:') %></strong> <%= scalar(localtime($submitTime)) %>
+			</div>
+			<div class="card-text">
+				<strong><%= maketext('Closes:') %></strong> <%= scalar(localtime($dueTime)) %>
+			</div>
+			% if ($msg) {
+				<div class="mt-2"><%= $msg %></div>
+			% }
+		</div>
+	</div>
+% }
+%
+%= form_for current_route, method => 'POST', begin
+	% # Add the form data posted to the requested URI in hidden fields.
+	% my @fields_to_print =
+		% grep { !/^(user|effectiveUser|passwd|key|force_password_authen|proctor_user|proctor_key|proctor_passwd)$/ }
+			% param;
+	% if (@fields_to_print) {
+		<%= $c->hidden_fields(@fields_to_print) %>
+	% }
+	<%= $c->hidden_authen_fields =%>
+	%
+	<%= hidden_field past_proctor_user => param('past_proctor_user') || param('proctor_user') =%>
+	<%= hidden_field past_proctor_key  => param('past_proctor_key')  || param('proctor_key') =%>
+	%
+	% if (param('submitAnswers')
+		% || ($userSet->restricted_login_proctor eq '' || $userSet->restricted_login_proctor eq 'No'))
+	% {
+		% # The user info and username field for the proctor.
+		<div class="card p-2 mb-2" style="background-color:#ddddff;">
+			<div><%= maketext(q{User's username is:}) %> <strong><%= param('effectiveUser') // '' %></strong></div>
+			<div>
+				<%= maketext(q{User's name is:}) %>
+				<strong><%= $c->{effectiveUser}->first_name %> <%= $c->{effectiveUser}->last_name %></strong>
+			</div>
+		</div>
+		<div class="col-xl-5 col-lg-6 col-md-7 col-sm-8 form-floating mb-2">
+			% # Prevent the proctor_user field from being filled with the parameter value.
+			% param('proctor_user', undef);
+			<%= text_field proctor_user => '', id => 'proctor_user', class => 'form-control', placeholder => '',
+				autocapitalize => 'none', spellcheck => 'false', autocomplete => 'new-password' =%>
+			<%= label_for proctor_user => maketext('Proctor Username') =%>
+		</div>
+	% } else {
+		% # Restricted set login
+		<div class="card p-2 mb-2" style="background-color:#ddddff;">
+			<em>
+				<%= maketext(
+					'This set has a set-level proctor password to authorize logins. Enter the password below.') =%>
+			</em>
+		</div>
+		<%= hidden_field proctor_user => "set_id:$setID" =%>
+	% }
+	%
+	% # The password field for the proctor.
+	<div class="col-xl-5 col-lg-6 col-md-7 col-sm-8 form-floating mb-2">
+		<%= password_field 'proctor_passwd',
+		 		id           => 'proctor_passwd',
+		 		class        => 'form-control',
+				placeholder  => '',
+				autocomplete => 'new-password'
+			=%>
+		<%=	label_for proctor_passwd => maketext('Proctor Password') =%>
+	</div>
+	%
+	<%= submit_button maketext('Continue'), class => 'btn btn-primary' =%>
+% end
diff --git a/templates/ContentGenerator/Logout.html.ep b/templates/ContentGenerator/Logout.html.ep
new file mode 100644
index 0000000000..59c19fb283
--- /dev/null
+++ b/templates/ContentGenerator/Logout.html.ep
@@ -0,0 +1,20 @@
+<p><%= maketext('You have been logged out of WeBWorK.') =%></p>
+%
+% # This should be set in the course environment when a sequence of authentication modules is used.
+% if ($ce->{external_auth} || $authen->{external_auth}) {
+	<p>
+		<%== maketext(
+			'The course [_1] uses an external authentication system ([_2]). Please go there to log in again.',
+			tag('strong', stash('courseID')),
+			$ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+				? link_to(tag('strong', $ce->{LTI}{ $ce->{LTIVersion} }{LMS_name}) =>
+					$ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+				: $ce->{LTI}{ $ce->{LTIVersion} }{LMS_name}
+		) =%>
+	</p>
+% } else {
+	<%= form_for 'set_list', method => 'POST', begin =%>
+		<%= hidden_field force_passwd_authen => 1 =%>
+		<p><%= submit_button maketext('Log In Again'), name  => 'submit', class => 'btn btn-primary' =%></p>
+	<% end =%>
+% }
diff --git a/templates/ContentGenerator/Options.html.ep b/templates/ContentGenerator/Options.html.ep
new file mode 100644
index 0000000000..ea715d0c24
--- /dev/null
+++ b/templates/ContentGenerator/Options.html.ep
@@ -0,0 +1,170 @@
+% unless (defined $c->{user}) {
+	<div class="alert alert-danger p-1 my-2"><%= maketext('User "[_1]" not found.', param('user')) %></div>
+	% last;
+% }
+%
+% unless (defined $c->{effectiveUser}) {
+	<div class="alert alert-danger p-1 my-2"><%= maketext('User "[_1]" not found.', param('effectiveUser')) %></div>
+	% last;
+% }
+%
+% my $userID    = $c->{user}->user_id;
+% my $eUserName = $c->{effectiveUser}->first_name . ' ' . $c->{effectiveUser}->last_name;
+%
+%= form_for current_route, method => 'POST', begin
+	<%= $c->hidden_authen_fields =%>
+	%
+	% if ($authz->hasPermissions($userID, 'change_password')) {
+		<h2><%= maketext('Change Password') %></h2>
+		<div class="row mb-2">
+			<div class="col-lg-8 col-md-10">
+				<div class="row mb-2">
+					<%= label_for 'currPassword', class => 'col-form-label col-sm-6', begin =%>
+						<%= maketext(
+							q{[_1]'s Current Password},
+							$c->{user}->first_name . ' ' . $c->{user}->last_name
+						) =%>
+					<% end =%>
+					<div class="col-sm-6">
+						<%= password_field 'currPassword', id => 'currPassword', class => 'form-control', dir => 'ltr',
+							$c->{has_password} ? () : (disabled => 1) =%>
+					</div>
+				</div>
+				<div class="row mb-2">
+					<%= label_for newPassword => maketext("[_1]'s New Password", $eUserName),
+						class => 'col-form-label col-sm-6' =%>
+					<div class="col-sm-6">
+						<%= password_field 'newPassword', id => 'newPassword', class => 'form-control', dir => 'ltr' =%>
+					</div>
+				</div>
+				<div class="row mb-2">
+					<%= label_for confirmPassword => maketext("Confirm [_1]'s New Password", $eUserName),
+						class => 'col-form-label col-sm-6' =%>
+					<div class="col-sm-6">
+						<%= password_field 'confirmPassword', id => 'confirmPassword',
+							class => 'form-control', dir => 'ltr' =%>
+					</div>
+				</div>
+			</div>
+		</div>
+	% }
+	%
+	% if ($authz->hasPermissions($userID, 'change_email_address')) {
+		<h2><%= maketext('Change Email Address') %></h2>
+		<div class="row mb-2">
+			<div class="col-lg-8 col-md-10">
+				<div class="row mb-2">
+					<%= label_for currAddress => maketext("[_1]'s Current Address", $eUserName),
+						class => 'col-form-label col-sm-6' =%>
+					<div class="col-sm-6">
+						<%= text_field currAddress => $c->{effectiveUser}->email_address,
+							readonly => undef, id => 'currAddress', class => 'form-control', dir => 'ltr' =%>
+					</div>
+				</div>
+				<div class="row mb-2">
+					<%= label_for newAddress => maketext("[_1]'s New Address", $eUserName),
+						class => 'col-form-label col-sm-6' =%>
+					<div class="col-sm-6">
+						<%= text_field newAddress => '', id => 'newAddress', class => 'form-control', dir => 'ltr' =%>
+					</div>
+				</div>
+			</div>
+		</div>
+	% }
+	%
+	% if ($authz->hasPermissions($userID, 'change_pg_display_settings')) {
+		<h2><%= maketext('Change Display Settings') %></h2>
+		%
+		% my $display_settings_block = begin
+			% my $curr_displayMode = $c->{effectiveUser}->displayMode || $ce->{pg}{options}{displayMode};
+			% my %display_modes    = %{ WeBWorK::PG::DISPLAY_MODES() };
+			% my @active_modes     = grep { exists $display_modes{$_} } @{ $ce->{pg}{displayModes} };
+			%
+			% if (@active_modes > 1) {
+				<div class="mb-3">
+					<fieldset>
+						<legend class="lead"><%= maketext('View equations as') . ':' =%></legend>
+						% for (@active_modes) {
+							<div class="form-check form-check-inline">
+								<%= radio_button displayMode => $_, id => "displayMode-$_", class => 'form-check-input',
+									$_ eq $curr_displayMode ? (checked => undef) : () =%>
+								<%= label_for "displayMode-$_" => $_, class => 'form-check-label' =%>
+							</div>
+						% }
+					</fieldset>
+				</div>
+			%}
+			%
+			% if ($authz->hasPermissions($userID, 'can_show_old_answers')) {
+				% my $curr_showOldAnswers =
+					% $c->{effectiveUser}->showOldAnswers ne ''
+					% ? $c->{effectiveUser}->showOldAnswers
+					% : $ce->{pg}{options}{showOldAnswers};
+				<div class="mb-3">
+					<fieldset>
+						<legend class="lead"><%= maketext('Show saved answers?') =%></legend>
+						% for (1, 0) {
+							<div class="form-check form-check-inline">
+								<%= radio_button showOldAnswers => $_,
+									id => "showOldAnswers$_", class => 'form-check-input',
+									$_ eq $curr_showOldAnswers ? (checked => undef) : () =%>
+								<%= label_for "showOldAnswers$_" => $_ ? maketext('Yes') : maketext('No'),
+									class => 'form-check-label' =%>
+							</div>
+						% }
+					</fieldset>
+				</div>
+			% }
+			%
+			% if ($ce->{pg}{specialPGEnvironmentVars}{entryAssist} eq 'MathView') {
+				% # Note, 0 is a legal value, so we can't use || in setting this
+				% my $curr_useMathView =
+					% $c->{effectiveUser}->useMathView ne ''
+					% ? $c->{effectiveUser}->useMathView
+					% : $ce->{pg}{options}{useMathView};
+				<div class="mb-3">
+					<fieldset>
+						<legend class="lead"><%= maketext('Use Equation Editor?') %></fieldset>
+						% for (1, 0) {
+							<div class="form-check form-check-inline">
+								<%= radio_button useMathView => $_,
+									id => "useMathView$_", class => 'form-check-input',
+									$_ eq $curr_useMathView ? (checked => undef) : () =%>
+								<%= label_for "useMathView$_" => $_ ? maketext('Yes') : maketext('No'),
+									class => 'form-check-label' =%>
+							</div>
+						% }
+					</fieldset>
+				</div>
+			% }
+			%
+			% if ($ce->{pg}{specialPGEnvironmentVars}{entryAssist} eq 'MathQuill') {
+				% # Note, 0 is a legal value, so we can't use || in setting this
+				% my $curr_useMathQuill =
+					% $c->{effectiveUser}->useMathQuill ne ''
+					% ? $c->{effectiveUser}->useMathQuill
+					% : $ce->{pg}{options}{useMathQuill};
+				<div class="mb-3">
+					<fieldset>
+						<legend class="lead"><%= maketext('Use live equation rendering?') %></legend>
+						% for (1, 0) {
+							<div class="form-check form-check-inline">
+								<%= radio_button useMathQuill => $_,
+									id => "useMathQuill$_", class => 'form-check-input',
+									$_ eq $curr_useMathQuill ? (checked => undef) : () =%>
+								<%= label_for "useMathQuill$_" => $_ ? maketext('Yes') : maketext('No'),
+									class => 'form-check-label' =%>
+							</div>
+						% }
+					</fieldset>
+				</div>
+			% }
+		% end
+		% my $result = $display_settings_block->();
+		% if ($result) {
+			<div class="mb-3"><%= $result =%></div>
+		% }
+	% }
+	%
+	<%= submit_button maketext('Change User Settings'), name => 'changeOptions', class => 'btn btn-primary' =%>
+% end
diff --git a/templates/ContentGenerator/PODViewer.html.ep b/templates/ContentGenerator/PODViewer.html.ep
new file mode 100644
index 0000000000..89804f5fa6
--- /dev/null
+++ b/templates/ContentGenerator/PODViewer.html.ep
@@ -0,0 +1,31 @@
+% layout 'pod_viewer';
+% title maketext('PG POD');
+%
+% my %section_names = (
+	% doc    => maketext('Documentation'),
+	% lib    => maketext('Libraries'),
+	% macros => maketext('Macros')
+% );
+%
+% for my $section (sort keys %$sections) {
+	% content_for toc => begin
+		<%= link_to $section_names{$section} => "#$section", class => 'nav-link' %>
+	% end
+	% content_for subjects => begin
+		<h2><a href="#_podtop_" id="<%= $section %>"><%= $section_names{$section} %></a></h2>
+		<div class="list-group mb-2">
+			% for (@{ $sections->{$section} }) {
+				% my $link_name = $_;
+				% $link_name = $1 =~ s!/!::!gr if $link_name =~ m/^(.*)\.pm$/;
+				<%= link_to $link_name, 'pod_viewer', { filePath => "$section/$_" },
+					class => 'list-group-item list-group-item-action' =%>
+			% }
+		</div>
+	% end
+% }
+% content_for sidebar => begin
+	<nav class="nav flex-column w-100">
+		<%= content 'toc' %>
+	</nav>
+% end
+<%= content 'subjects' %>
diff --git a/templates/ContentGenerator/PODViewer/POD.html.ep b/templates/ContentGenerator/PODViewer/POD.html.ep
new file mode 100644
index 0000000000..dea890f00f
--- /dev/null
+++ b/templates/ContentGenerator/PODViewer/POD.html.ep
@@ -0,0 +1,24 @@
+% layout 'pod_viewer';
+% my $title = $filePath =~ s!^[^/]*/!!r;
+% $title = $1 =~ s!/!::!gr if $title =~ m/^(.*)\.pm$/;
+% title $title;
+%
+% content_for sidebar => begin
+	<nav>
+		<ul class="nav flex-column w-100">
+			<li class="nav-item"><%= link_to "PG POD Home" => 'pod_index', class => 'nav-link p-0' %></li>
+			<li class="nav-item"><hr></li>
+			% for (@{ $c->stash->{podIndex} }) {
+				<%== $_ =%>
+			% }
+		</ul>
+	</nav>
+% end
+%
+% if (stash('podHTML')) {
+	<%== stash('podHTML') =%>
+% } elsif (stash('podError')) {
+	<%= maketext('Error generating POD for file [_1]: [_2]', $filePath, stash('podError')) =%>
+% } else {
+	<%= maketext('Macro file [_1] not found.', $filePath) =%>
+% }
diff --git a/templates/ContentGenerator/Problem.html.ep b/templates/ContentGenerator/Problem.html.ep
new file mode 100644
index 0000000000..cdcacd0f4b
--- /dev/null
+++ b/templates/ContentGenerator/Problem.html.ep
@@ -0,0 +1,104 @@
+% use WeBWorK::Utils qw(getAssetURL);
+%
+% content_for css => begin
+	% # Output css for jquery-ui for problems to use.
+	<%= stylesheet getAssetURL($ce, 'node_modules/jquery-ui-dist/jquery-ui.min.css') =%>
+	%
+	<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'achievements.css' }) =%>
+	%
+	% # Add CSS files requested by problems via ADD_CSS_FILE() in the PG file
+	% # or via a setting of $ce->{pg}{specialPGEnvironmentVars}{extra_css_files}
+	% # which can be set in course.conf (the value should be an anonomous array).
+	% my @cssFiles;
+	% if (ref($ce->{pg}{specialPGEnvironmentVars}{extra_css_files}) eq 'ARRAY') {
+		% push(@cssFiles, { file => $_, external => 0 }) for @{ $ce->{pg}{specialPGEnvironmentVars}{extra_css_files} };
+	% }
+	% if (ref($c->{pg}{flags}{extra_css_files}) eq 'ARRAY') {
+		% push @cssFiles, @{ $c->{pg}{flags}{extra_css_files} };
+	% }
+	% my %cssFilesAdded;    # Used to avoid duplicates
+	% for (@cssFiles) {
+		% next if $cssFilesAdded{ $_->{file} };
+		% $cssFilesAdded{ $_->{file} } = 1;
+		% if ($_->{external}) {
+			<%= stylesheet $_->{file} =%>
+		% } else {
+			<%= stylesheet getAssetURL($ce, $_->{file}) =%>
+		% }
+	% }
+% end
+%
+% content_for js => begin
+	% # Output javascript for jquery-ui for problems to use.
+	<%= javascript getAssetURL($ce, 'node_modules/jquery-ui-dist/jquery-ui.min.js') =%>
+	%
+	% # This is for tagging menus (if allowed)
+	% if ($authz->hasPermissions(param('user'), 'modify_tags')) {
+		<%= javascript getAssetURL($ce, 'js/TagWidget/tagwidget.js'), id => 'tag-widget-script', defer => undef,
+			data => { taxonomy => "$ce->{webworkURLs}{htdocs}/DATA/tagging-taxonomy.json" } =%>
+	% }
+	%
+	% # This is for the problem grader
+	% if ($c->{will}{showProblemGrader}) {
+		<%= javascript getAssetURL($ce, 'js/ProblemGrader/problemgrader.js'), defer => undef =%>
+	%}
+	%
+	% # This is for any page specific js.  Right now its just used for achievement popups
+	<%= javascript getAssetURL($ce, 'js/Problem/problem.js'), defer => undef =%>
+	%
+	% # Add JS files requested by problems via ADD_JS_FILE() in the PG file.
+	% if (ref($c->{pg}{flags}{extra_js_files}) eq 'ARRAY') {
+		% my %jsFiles;
+		% for (@{ $c->{pg}{flags}{extra_js_files} }) {
+			% next if $jsFiles{ $_->{file} };
+			% $jsFiles{ $_->{file} } = 1;
+			% my %attributes = ref($_->{attributes}) eq 'HASH' ? %{ $_->{attributes} } : ();
+			% if ($_->{external}) {
+				<%= javascript $_->{file}, %attributes =%>
+			% } else {
+				<%= javascript getAssetURL($ce, $_->{file}), %attributes =%>
+			% }
+		% }
+	% }
+% end
+%
+% if ($c->{invalidProblem} || !$c->{set}) {
+	<div class="alert alert-danger p-1 my-3"><%= maketext('This problem is not valid.') %></div>
+	% last;
+% }
+%
+<%== $c->post_header_text =%>
+<div id="custom_edit_message" class="row"><div class="col-lg-10"><%= $c->output_custom_edit_message %></div></div>
+<div class="row"><div id="output_summary" class="col-lg-10"><%= $c->output_summary %></div></div>
+<div class="row">
+	<div id="output_achievement_message" class="col-lg-10"><%= $c->output_achievement_message %></div>
+</div>
+<div class="row"><div id="output_comments" class="col-lg-10"><%= $c->output_comments %></div></div>
+<div class="row"><div id="output_grader" class="col-lg-10"><%= $c->output_grader %></div></div>
+<div class="row">
+	<div class="col-lg-10">
+		<%= form_for current_route, method => 'POST', name => 'problemMainForm',
+			id => 'problemMainForm', class => 'problem-main-form', begin =%>
+			<%= $c->hidden_authen_fields =%>
+			<%= hidden_field(startTime => param('startTime') || time) =%>
+			<% if ($c->can('output_hidden_info')) {
+				<%= $c->output_hidden_info =%>
+			% }
+			<div class="problem">
+				<div id="problem_body" class="problem-content"
+					<%== $c->output_problem_lang_and_dir %>>
+					<%= $c->output_problem_body =%>
+				</div>
+				<%= $c->output_message =%>
+			</div>
+			<div class="checkboxes-container col-12 my-2"><%= $c->output_checkboxes %></div>
+			<div class="submit-buttons-container col-12 my-2"><%= $c->output_submit_buttons %></div>
+			<div id="score_summary" class="scoreSummary"><%= $c->output_score_summary %></div>
+			<%= $c->output_misc =%>
+		<% end =%>
+	</div>
+</div>
+<div id="problemFooter" class="problemFooter">
+	<%= $c->output_past_answer_button =%>
+	<%= $c->output_email_instructor =%>
+</div>
diff --git a/templates/ContentGenerator/Problem/checkboxes.html.ep b/templates/ContentGenerator/Problem/checkboxes.html.ep
new file mode 100644
index 0000000000..2bd31c2461
--- /dev/null
+++ b/templates/ContentGenerator/Problem/checkboxes.html.ep
@@ -0,0 +1,72 @@
+% my %can  = %{ $c->{can} };
+% my %will = %{ $c->{will} };
+%
+% if ($can{showCorrectAnswers}
+	% || $can{showProblemGrader}
+	% || $can{showAnsGroupInfo}
+	% || $can{showAnsHashInfo}
+	% || $can{showPGInfo}
+	% || $can{showResourceInfo})
+% {
+	<span class="me-2"><%= maketext('Show:') %></span>
+% }
+%
+% if ($can{showCorrectAnswers}) {
+	<div class="form-check form-check-inline">
+		<label class="form-check-label">
+			<%= check_box showCorrectAnswers => 1, id => 'showCorrectAnswers_id', class => 'form-check-input',
+				$will{showCorrectAnswers} ? (checked => undef) : () =%>
+			<%= maketext('Correct Answers') =%>
+		</label>
+	</div>
+% }
+%
+% if ($can{showProblemGrader} && !$will{showMeAnother}) {
+	<div class="form-check form-check-inline">
+		<label class="form-check-label">
+			<%= check_box showProblemGrader => 1, id => 'showProblemGrader_id', class => 'form-check-input',
+				$will{showProblemGrader} ? (checked => undef) : () =%>
+			<%= maketext('Problem Grader') =%>
+		</label>
+	</div>
+% }
+%
+% if ($can{showAnsGroupInfo}) {
+	<div class="form-check form-check-inline">
+		<label class="form-check-label">
+			<%= check_box showAnsGroupInfo => 1, id => 'showAnsGroupInfo_id', class => 'form-check-input',
+				$will{showAnsGroupInfo} ? (checked => undef) : () =%>
+			<%= maketext('Answer Group Info') =%>
+		</label>
+	</div>
+% }
+%
+% if ($can{showResourceInfo}) {
+	<div class="form-check form-check-inline">
+		<label class="form-check-label">
+			<%= check_box showResourceInfo => 1, id => 'showResourceInfo_id', class => 'form-check-input',
+				$will{showResourceInfo} ? (checked => undef) : () =%>
+			<%= maketext('Auxiliary Resources') =%>
+		</label>
+	</div>
+% }
+%
+% if ($can{showAnsHashInfo}) {
+	<div class="form-check form-check-inline">
+		<label class="form-check-label">
+			<%= check_box showAnsHashInfo => 1, id => 'showAnsHashInfo_id', class => 'form-check-input',
+				$will{showAnsHashInfo} ? (checked => undef) : () =%>
+			<%= maketext('Answer Hash Info') =%>
+		</label>
+	</div>
+% }
+%
+% if ($can{showPGInfo}) {
+	<div class="form-check form-check-inline">
+		<label class="form-check-label">
+			<%= check_box showPGInfo => 1, id => 'showPGInfo_id', class => 'form-check-input',
+				$will{showPGInfo} ? (checked => undef) : () =%>
+			<%= maketext('PG Info') =%>
+		</label>
+	</div>
+% }
diff --git a/templates/ContentGenerator/Problem/messages.html.ep b/templates/ContentGenerator/Problem/messages.html.ep
new file mode 100644
index 0000000000..561e3cd3ca
--- /dev/null
+++ b/templates/ContentGenerator/Problem/messages.html.ep
@@ -0,0 +1,50 @@
+% use WeBWorK::Utils qw(before after);
+%
+% if ($c->{pg}{result}{msg}) {
+	<p><b><%= maketext('Note') %>:</b> <i><%== $c->{pg}{result}{msg} %></i></p>
+% }
+%
+% if ($ce->{pg}{ansEvalDefaults}{enableReducedScoring}
+	% && $c->{set}->enable_reduced_scoring
+	% && after($c->{set}->reduced_scoring_date, $c->submitTime)
+	% && before($c->{set}->due_date, $c->submitTime))
+% {
+	<p>
+		<b><%= maketext('Note') %>:</b>
+		<i>
+			<%= maketext(
+				'You are in the Reduced Scoring Period.  All work counts for [_1]% of the original.',
+				$ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100
+			) =%>
+		</i>
+	</p>
+% }
+%
+% if ($c->{pg}{flags}{hintExists} && $authz->hasPermissions($c->{userID}, 'always_show_hint')) {
+	% my $showHintsAfter =
+		% $c->{set}->hide_hint                 ? -1
+		% : $c->{problem}->showHintsAfter > -2 ? $c->{problem}->showHintsAfter
+		% :                                      $ce->{pg}{options}{showHintsAfter};
+	<p>
+		<b><%= maketext('Note') %>:</b>
+		<i>
+			<%= $showHintsAfter == -1
+				? maketext('The hint shown is an instructor preview and will not be shown to students.')
+				: maketext(
+					'The hint shown is an instructor preview and will be shown to students after [quant,_1,attempt].',
+					$showHintsAfter
+				) =%>
+		</i>
+	</p>
+% }
+%
+% if ($c->{pg}{flags}{solutionExists} && $authz->hasPermissions($c->{userID}, 'always_show_solution')) {
+	<p>
+		<b><%= maketext('Note') %>:</b>
+		<i>
+			<%= maketext('The solution shown is an instructor preview and '
+				. 'will only be shown to students after the due date.'
+			) =%>
+		</i>
+	</p>
+% }
diff --git a/templates/ContentGenerator/Problem/siblings.html.ep b/templates/ContentGenerator/Problem/siblings.html.ep
new file mode 100644
index 0000000000..51d0bef1a3
--- /dev/null
+++ b/templates/ContentGenerator/Problem/siblings.html.ep
@@ -0,0 +1,54 @@
+<div class="info-box bg-light">
+	<h2><%= maketext('Problems') %></h2>
+	% if ($num_of_problems > 0 && $ce->{pg}{options}{enableProgressBar}) {
+		% my $unattempted                    = $num_of_problems - $total_correct - $total_incorrect - $total_inprogress;
+		% my $progress_bar_correct_width     = $total_correct * 100 / $num_of_problems;
+		% my $progress_bar_incorrect_width   = $total_incorrect * 100 / $num_of_problems;
+		% my $progress_bar_inprogress_width  = $total_inprogress * 100 / $num_of_problems;
+		% my $progress_bar_unattempted_width = $unattempted * 100 / $num_of_problems;
+		%
+		<div class="progress set-id-tooltip" aria-label="progress bar for current problem set" role="figure">
+			% if ($total_correct > 0) {
+				<div class="progress-bar correct-progress set-id-tooltip"
+					style="width:<%= $progress_bar_correct_width %>%"
+					aria-label="correct progress bar for current problem set" role="figure"
+					data-bs-toggle="tooltip" data-bs-placement="bottom"
+					data-bs-title="<%= maketext('Correct: [_1]/[_2]', $total_correct, $num_of_problems) %>">
+					% # Perfect scores deserve some stars (&#9733;)!
+					% if ($total_correct == $num_of_problems) {
+						&#9733;Perfect&#9733;
+					% }
+				</div>
+			% }
+			% if ($total_inprogress > 0) {
+				<div class="progress-bar inprogress-progress set-id-tooltip"
+					style="width:<%= $progress_bar_inprogress_width %>%"
+					aria-label="in progress bar for current problem set" role="figure"
+					data-bs-toggle="tooltip" data-bs-placement="bottom"
+					data-bs-title="<%= maketext('In progress: [_1]/[_2]', $total_inprogress, $num_of_problems) %>">
+				</div>
+			% }
+			% if ($total_incorrect > 0) {
+				<div class="progress-bar incorrect-progress set-id-tooltip"
+					style="width:<%= $progress_bar_incorrect_width %>%"
+					aria-label="incorrect progress bar for current problem set" role="figure"
+					data-bs-toggle="tooltip" data-bs-placement="bottom"
+					data-bs-title="<%= maketext('Incorrect: [_1]/[_2]', $total_incorrect, $num_of_problems) %>">
+				</div>
+			% }
+			% if ($unattempted > 0) {
+				<div class="progress-bar unattempted-progress set-id-tooltip"
+					style="width:<%= $progress_bar_unattempted_width %>%"
+					aria-label="unattempted progress bar for current problem set" role="figure"
+					data-bs-toggle="tooltip" data-bs-placement="bottom"
+					data-bs-title="<%= maketext('Unattempted: [_1]/[_2]', $unattempted, $num_of_problems) %>">
+				</div>
+			% }
+		</div>
+	% }
+	<ul class="nav flex-column problem-list">
+		% for (@$items) {
+			<li class="nav-item"><%= $_ %></li>
+		% }
+	</ul>
+</div>
diff --git a/templates/ContentGenerator/Problem/student_nav.html.ep b/templates/ContentGenerator/Problem/student_nav.html.ep
new file mode 100644
index 0000000000..5d4c09c79c
--- /dev/null
+++ b/templates/ContentGenerator/Problem/student_nav.html.ep
@@ -0,0 +1,103 @@
+% # Cap the number of students shown to at most 200.
+% my $numAfter        = $#$userRecords - $currentUserIndex;
+% my $numBefore       = 200 - ($numAfter < 100 ? $numAfter : 100);
+% my $minStudentIndex = $currentUserIndex < $numBefore ? 0 : $currentUserIndex - $numBefore;
+% my $maxStudentIndex = $minStudentIndex + 200 < $#$userRecords ? $minStudentIndex + 200 : $#$userRecords;
+%
+<div class="user-nav d-flex submit-buttons-container">
+	<div class="btn-group" role="group" aria-label="student selector">
+		% if ($prevUser) {
+			<%= link_to $c->systemLink(
+					$problemPage,
+					params => {
+						effectiveUser     => $prevUser->user_id,
+						showProblemGrader => $c->{will}{showProblemGrader},
+						$filter ? (studentNavFilter => $filter) : ()
+					}
+				),
+				data  => { bs_toggle => 'tooltip', bs_placement => 'top' },
+				title => $prevUser->{displayName},
+				class => 'btn btn-primary student-nav-button',
+				begin =%>
+				<i class="fas fa-chevron-left"></i>
+			<% end =%>
+		% } else {
+			<span class="btn btn-primary disabled"><i class="fas fa-chevron-left"></i></span>
+		% }
+		<div class="btn-group student-nav-selector">
+			<%= link_to $userRecords->[$currentUserIndex]{displayName} => '#',
+				id => 'studentSelector', class => 'btn btn-primary dropdown-toggle', role => 'button',
+				data => { bs_toggle => 'dropdown' }, 'aria-expanded' => 'false' =%>
+			<ul class="dropdown-menu" role="menu" aria-labelledby="studentSelector">
+				% for (@$userRecords[ $minStudentIndex .. $maxStudentIndex ]) {
+					<li>
+						<%= link_to $_->{displayName} => $c->systemLink(
+								$problemPage,
+								params => {
+									effectiveUser     => $_->user_id,
+									showProblemGrader => $c->{will}{showProblemGrader},
+									$filter ? (studentNavFilter => $filter) : ()
+								}
+							),
+							$_->{currentUser} ? (style => 'background-color:#8F8') : (),
+							class => 'dropdown-item' =%>
+					</li>
+				% }
+			</ul>
+		</div>
+		% if ($nextUser) {
+			<%= link_to $c->systemLink(
+					$problemPage,
+					params => {
+						effectiveUser     => $nextUser->user_id,
+						showProblemGrader => $c->{will}{showProblemGrader},
+						$filter ? (studentNavFilter => $filter) : ()
+					}
+				),
+				data  => { bs_toggle    => 'tooltip', bs_placement => 'top' },
+				title => $nextUser->{displayName},
+				class => 'btn btn-primary student-nav-button',
+				begin =%>
+				<i class="fas fa-chevron-right"></i>
+			<%= end %>
+		% } else {
+			<span class="btn btn-primary disabled"><i class="fas fa-chevron-right"></i></span>
+		% }
+	</div>
+	% # Create a section/recitation "filter by" dropdown if there are sections or recitations.
+	% if (keys %$filters) {
+		<div class="btn-group student-nav-filter-selector">
+			<%= link_to $filter ? $filters->{$filter}[0] : maketext('Showing all students') => '#',
+				id => 'studentSelectorFilter', class => 'btn btn-primary dropdown-toggle', role => 'button',
+				data => { bs_toggle => 'dropdown' }, 'aria-expanded' => 'false' =%>
+			<ul class="dropdown-menu" role="menu" aria-labelledby="studentSelectorFilter">
+				% # If a filter is currently in use, then add an item that will remove that filter.
+				% if ($filter) {
+					<li>
+						<%= link_to maketext('Show all students') => $c->systemLink(
+								$problemPage,
+								params => {
+									effectiveUser     => $eUserID,
+									showProblemGrader => $c->{will}{showProblemGrader}
+								}
+							), class => 'dropdown-item' =%>
+					</li>
+				% }
+				% for (sort keys %$filters) {
+					<li>
+						<%= link_to $filters->{$_}[0] => $c->systemLink(
+								$problemPage,
+								params => {
+									effectiveUser     => $filters->{$_}[1],
+									showProblemGrader => $c->{will}{showProblemGrader},
+									studentNavFilter  => $_
+								}
+							),
+							($filter || '') eq $_ ? (style => 'background-color:#8F8') : (),
+							class => 'dropdown-item' =%>
+					</li>
+				% }
+			</ul>
+		</div>
+	% }
+</div>
diff --git a/templates/ContentGenerator/Problem/submit_buttons.html.ep b/templates/ContentGenerator/Problem/submit_buttons.html.ep
new file mode 100644
index 0000000000..353c2ffcd2
--- /dev/null
+++ b/templates/ContentGenerator/Problem/submit_buttons.html.ep
@@ -0,0 +1,93 @@
+% use WeBWorK::Utils qw(before);
+%
+% my %can            = %{ $c->{can} };
+% my %will           = %{ $c->{will} };
+% my $effectiveUser  = param('effectiveUser');
+% if ($will{requestNewSeed}) {
+	<%= submit_button maketext('Request New Version'), id => 'enter_key_submit', name => 'requestNewSeed',
+		formtarget => '_self', class => 'visually-hidden-unfocusable' =%>
+	<%= submit_button maketext('Request New Version'), id => 'submitAnswers_id', name => 'requestNewSeed',
+		formtarget => '_self', class => 'btn btn-primary mb-1' =%>
+% } else {
+	% my $enter_key_name  = 'previewAnswers';
+	% my $enter_key_value = maketext('Preview My Answers');
+	% if (
+		% $c->ce->{pg}{options}{enterKey} eq 'submit'
+		% || ($c->ce->{pg}{options}{enterKey} eq 'conservative' && $c->{problem}{max_attempts} < 0)
+	% ) {
+		% if ($can{getSubmitButton}) {
+			% $enter_key_name  = 'submitAnswers';
+			% $enter_key_value = (param('user') ne $effectiveUser)
+				% ? maketext('Submit Answers for [_1]', $effectiveUser)
+				% : maketext('Submit Answers');
+		% } elsif ($can{checkAnswers}) {
+			% $enter_key_name  = 'checkAnswers';
+			% $enter_key_value = maketext('Check Answers');
+		% }
+	% }
+	<%= submit_button $enter_key_value, id => 'enter_key_submit', formtarget => '_self', name => $enter_key_name,
+		class => 'visually-hidden-unfocusable' =%>
+	<%= submit_button maketext('Preview My Answers'), id => 'previewAnswers_id', formtarget => '_self',
+		name => 'previewAnswers', class => 'btn btn-primary mb-1' =%>
+	%
+	% if ($can{checkAnswers}) {
+		<%= submit_button maketext('Check Answers'), id => 'checkAnswers_id', formtarget => '_self',
+			name => 'checkAnswers', class => 'btn btn-primary mb-1' =%>
+	% }
+	%
+	% if ($can{getSubmitButton}) {
+		% if (param('user') ne $effectiveUser) {
+			% # If acting as a student, make it clear that answer submissions will
+			% # apply to the student's records, not the instructor's.
+			<%= submit_button maketext('Submit Answers for [_1]', $effectiveUser), id => 'submitAnswers_id',
+				name => 'submitAnswers', class => 'btn btn-primary mb-1' =%>
+		% } else {
+			<%= submit_button maketext('Submit Answers'), id => 'submitAnswers_id', name => 'submitAnswers',
+				formtarget => '_self', class => 'btn btn-primary mb-1' =%>
+		% }
+	% }
+	%
+	% my %showMeAnother = %{ $c->{showMeAnother} };
+	% if ($can{showMeAnother}) {
+		% # only output showMeAnother button if we're not on the showMeAnother page
+		<%= link_to maketext('Show Me Another') => $c->systemLink(url_for('show_me_another')),
+				class  => 'set-id-tooltip btn btn-primary mb-1',
+				id     => 'SMA_button',
+				target => 'WW_Show_Me_Another',
+				data   => {
+					bs_toggle    => 'tooltip',
+					bs_placement => 'right',
+					bs_title     => maketext(
+						'You can use this feature [quant,_1,more time,more times,as many times as you want] '
+							. 'on this problem',
+						$showMeAnother{MaxReps} >= $showMeAnother{Count}
+						? ($showMeAnother{MaxReps} - $showMeAnother{Count})
+						: ''
+					)
+				} =%>
+	% } else {
+		% # If showMeAnother is available for the course, and for the current problem (but not yet
+		% # because the student hasn't tried enough times) then gray it out. Otherwise display nothing.
+		% # If $showMeAnother{TriesNeeded} is somehow not an integer or is -2, use the default value.
+		% $showMeAnother{TriesNeeded} = $ce->{pg}{options}{showMeAnotherDefault}
+			% if ($showMeAnother{TriesNeeded} !~ /^[+-]?\d+$/ || $showMeAnother{TriesNeeded} == -2);
+		% if ($ce->{pg}{options}{enableShowMeAnother} && $showMeAnother{TriesNeeded} > -1) {
+			% my $exhausted =
+				% ($showMeAnother{Count} >= $showMeAnother{MaxReps} && $showMeAnother{MaxReps} > -1) ? 'exhausted' : '';
+			<span class="set-id-tooltip d-inline-block" tabindex="0" data-bs-toggle="tooltip"
+				data-bs-placement="right"
+				data-bs-title="<%=
+					before($db->getGlobalSet($c->{set}->set_id)->open_date, $c->submitTime)
+					? maketext('The problem set is not yet open')
+					: $exhausted eq 'exhausted' ? maketext('Feature exhausted for this problem')
+					: maketext(
+						'You must attempt this problem [quant,_1,time] before this feature is available',
+						$showMeAnother{TriesNeeded}
+					) =%>">
+				<button class="btn btn-primary mb-1" type="button" disabled>
+					<%= maketext('Show Me Another [_1]', $exhausted) =%>
+				</button>
+			</span>
+		% }
+	% }
+% }
diff --git a/templates/ContentGenerator/ProblemSet.html.ep b/templates/ContentGenerator/ProblemSet.html.ep
new file mode 100644
index 0000000000..eb0c551951
--- /dev/null
+++ b/templates/ContentGenerator/ProblemSet.html.ep
@@ -0,0 +1,39 @@
+% use WeBWorK::Utils qw(before between);
+%
+% if (
+	% $c->{invalidSet}
+	% && ($c->{invalidSet} !~ /^Client ip address .* is not in the list of addresses/
+		% || $authz->{merged_set}->assignment_type !~ /gateway/)
+	% )
+% {
+	<div class="alert alert-danger">
+		<p class="mb-3">
+			<%= maketext(
+				'The selected problem set ([_1]) is not a valid set for [_2].',
+				stash('setID'), param('effectiveUser')
+			) =%>
+		</p>
+		<p class="mb-0"><%== $c->{invalidSet} %></p>
+	</div>
+	% last;
+% }
+%
+% my $set = $c->{set};
+% 
+% # Stats message displays the current status of the set and states the next important date.
+<%= include 'ContentGenerator/Base/set_status', set => $set =%>
+%
+<%= $set->assignment_type =~ /gateway/ ? $c->gateway_body : $c->problem_list =%>
+%
+<div class="mb-3">
+	<%= $c->feedbackMacro(
+		route              => current_route,
+		set                => $set->set_id,
+		problem            => '',
+		displayMode        => $c->{displayMode},
+		showOldAnswers     => '',
+		showCorrectAnswers => '',
+		showHints          => '',
+		showSolutions      => '',
+	) =%>
+</div>
diff --git a/templates/ContentGenerator/ProblemSet/info.html.ep b/templates/ContentGenerator/ProblemSet/info.html.ep
new file mode 100644
index 0000000000..1a19470fe6
--- /dev/null
+++ b/templates/ContentGenerator/ProblemSet/info.html.ep
@@ -0,0 +1,20 @@
+% if (defined $c->{set} && $authz->hasPermissions(param('user'), 'modify_problem_sets')) {
+	<h2 class="d-flex align-items-center justify-content-center">
+		<%= maketext('Set Info') =%>
+		<%= link_to maketext('Edit') => $c->systemLink(
+				url_for('instructor_problem_editor_withset_withproblem', setID => $c->{set}->set_id, problemID => 0),
+				params => { file_type => 'set_header' }
+			),
+			target => 'WW_Editor', class => 'btn btn-sm btn-info m-1' =%>
+	</h2>
+% } else {
+	<h2><%= maketext('Set Info') %></h2>
+% }
+%
+% if ($c->{pg}{flags}{error_flag}) {
+	<div class="alert alert-danger p-1 mb-0">
+		<%= $c->errorOutput($c->{pg}{errors}, $c->{pg}{body_text}) =%>
+	</div>
+% } else {
+	<%== $c->{pg}{body_text} =%>
+% }
diff --git a/templates/ContentGenerator/ProblemSet/problem_list.html.ep b/templates/ContentGenerator/ProblemSet/problem_list.html.ep
new file mode 100644
index 0000000000..49d478934c
--- /dev/null
+++ b/templates/ContentGenerator/ProblemSet/problem_list.html.ep
@@ -0,0 +1,58 @@
+% my $set = $c->{set};
+%
+% if (@$problems) {
+	% my $isJitarSet = $set->assignment_type eq 'jitar';
+	%
+	% # This table contains a summary, a caption, and scope variables for the columns.
+	<div class="table-responsive">
+		<table class="problem_set_table table caption-top font-sm">
+			<caption><%= maketext('Problems') %></caption>
+			<thead class="table-group-divider">
+				<tr>
+					<th><%= maketext('Name') %></th>
+					<th><%= maketext('Attempts') %></th>
+					<th><%= maketext('Remaining') %></th>
+					<th><%= maketext('Worth') %></th>
+					<th><%= maketext('Status') %></th>
+					% if ($isJitarSet) {
+						<th>
+							<%= maketext('Adjusted Status') =%>
+							&nbsp;
+							<%= link_to '#', class => 'help-popup', tabindex => 0, role => 'button',
+								data => {
+									bs_placement => 'top',
+									bs_toggle    => 'popover',
+									bs_content   => maketext(
+										q{The adjusted status of a problem is the larger of the problem's status and}
+											. 'the weighted average of the status of those problems which count '
+											. 'towards the parent grade.'
+									)
+								},
+								begin =%>
+								<i class="icon fas fa-question-circle" aria-hidden="true" data-alt="Help Icon"></i>
+							<% end =%>
+						</th>
+						<th><%= maketext('Counts for Parent') %></th>
+					% }
+					% if ($c->{canScoreProblems}) {
+						<th><%= maketext('Grader') %></th>
+					% }
+				</tr>
+			</thead>
+			<tbody class="table-group-divider">
+				% for my $problem (@$problems) {
+					<%= include 'ContentGenerator/ProblemSet/problem_list_row',
+						problem => $problem, isJitarSet => $isJitarSet =%>
+				% }
+			</tbody>
+		</table>
+	</div>
+% } else {
+	<p><%= maketext('This homework set contains no problems.') %></p>
+% }
+%
+<div class="mb-3">
+	<%= link_to
+		maketext('Download PDF or TeX Hardcopy for Current Set') => $c->systemLink(url_for 'hardcopy_preselect_set'),
+		class => 'btn btn-primary' =%>
+</div>
diff --git a/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep b/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep
new file mode 100644
index 0000000000..cdc466627d
--- /dev/null
+++ b/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep
@@ -0,0 +1,80 @@
+% use WeBWorK::Utils qw(is_jitar_problem_closed is_jitar_problem_hidden jitar_problem_adjusted_status
+%	jitar_id_to_seq wwRound);
+%
+% my $courseID      = stash('courseID');
+% my $setID         = $c->{set}->set_id;
+% my $problemID     = $problem->problem_id;
+% my $problemNumber = $problemID;
+% my $problemLevel  = 0;
+%
+% if ($isJitarSet
+	% && !$authz->hasPermissions($problem->user_id, 'view_unopened_sets')
+	% && is_jitar_problem_hidden($db, $problem->user_id, $setID, $problemID))
+% {
+	% # If the problem is closed, don't show it.
+% } else {
+	% if ($isJitarSet) {
+		% my @seq = jitar_id_to_seq($problemID);
+		% $problemLevel  = $#seq;
+		% $problemNumber = join('.', @seq);
+	% }
+	%
+	% my $attempts    = $problem->num_correct + $problem->num_incorrect;
+	% my $linkClasses = $problemLevel != 0 ? "nested-problem-$problemLevel" : '';
+	%
+	<tr>
+		% # Problem number
+		<td>
+			% if (
+				% $isJitarSet
+				% && !$authz->hasPermissions($problem->user_id, 'view_unopened_sets')
+				% && is_jitar_problem_closed($db, $ce, $problem->user_id, $setID, $problemID)
+			% )
+			% {
+				% # If the problem is jitar restricted, then show it greyed out.
+				<span class="<%= $linkClasses %> disabled-problem text-nowrap">
+					<%= maketext('Problem [_1]', $problemNumber) %>
+				</span>
+			% } else {
+				<%= link_to(
+					maketext('Problem [_1]', $problemNumber) =>
+						$c->systemLink(url_for('problem_detail', problemID => $problemID)),
+					class => "$linkClasses text-nowrap"
+				) =%>
+			% }
+		</td>
+		% # Attempts
+		<td><%= $attempts %></td>
+		% # Remaining number of attempts
+		<td><%= ($problem->max_attempts || -1) < 0 ? maketext('unlimited') : $problem->max_attempts - $attempts %></td>
+		% # Problem value (Worth)
+		<td>
+			% if (!$isJitarSet || $problemLevel == 0 || $problem->counts_parent_grade) {
+				<%= $problem->value %>
+			% }
+		</td>
+		% # Status
+		<td><%= wwRound(0, $problem->status * 100) %>%</td>
+		% # Jitar problem status and counts for parent columns.
+		% if ($isJitarSet) {
+			<td>
+				% if ($problemLevel == 0) {
+					<%= wwRound(0, jitar_problem_adjusted_status($problem, $db) * 100) %>%
+				% }
+			</td>
+			<td>
+				<%= $isJitarSet && $problemLevel != 0 && $problem->counts_parent_grade
+					? maketext('Yes')
+					: maketext('No') =%>
+			</td>
+		% }
+		% # Grader
+		% if ($authz->hasPermissions(param('user'), 'access_instructor_tools')
+			% && $authz->hasPermissions(param('user'), 'score_sets')) {
+			<td>
+				<%= link_to(maketext('Grade Problem') =>
+					$c->systemLink(url_for('instructor_problem_grader', problemID => $problemID))) =%>
+			</td>
+		% }
+	</tr>
+% }
diff --git a/templates/ContentGenerator/ProblemSet/siblings.html.ep b/templates/ContentGenerator/ProblemSet/siblings.html.ep
new file mode 100644
index 0000000000..ac2c34c2a6
--- /dev/null
+++ b/templates/ContentGenerator/ProblemSet/siblings.html.ep
@@ -0,0 +1,17 @@
+% use WeBWorK::Utils qw(format_set_name_display);
+%
+<div class="info-box bg-light">
+	<h2><%= maketext('Sets') %></h2>
+	<ul class="nav flex-column bg-light" dir="ltr">
+		% for my $setID (@$setIDs) {
+			<li class="nav-item">
+				<%= tag 'a',
+					$setID eq stash('setID')
+					? (class => 'nav-link active')
+					: (href => $c->systemLink(url_for('problem_list', setID => $setID)), class => 'nav-link'),
+					id => $setID,
+					format_set_name_display($setID) =%>
+			</li>
+		% }
+	</ul>
+</div>
diff --git a/templates/ContentGenerator/ProblemSet/version_list.html.ep b/templates/ContentGenerator/ProblemSet/version_list.html.ep
new file mode 100644
index 0000000000..0e13621dac
--- /dev/null
+++ b/templates/ContentGenerator/ProblemSet/version_list.html.ep
@@ -0,0 +1,242 @@
+% use WeBWorK::Utils qw(is_restricted);
+%
+% my $courseID    = stash('courseID');
+% my $set         = $c->{set};
+% my $user        = param('user');
+% my $multiSet    = $authz->hasPermissions($user, 'view_multiple_sets');
+% my $maxVersions = $set->versions_per_interval || 0;
+%
+% my $routeName = $set->assignment_type =~ /proctored/ ? 'proctored_gateway_quiz' : 'gateway_quiz';
+%
+% if ($c->{invalidSet}) {
+	% # If this is an invalidSet it is because the IP address is not allowed to access the set.
+	% # Display that message here.  Note that the set is valid so the set versions can still be displayed,
+	% # but the "Start New Test" or "Continue Test" buttons should not be.
+	<div class="alert alert-warning"><%= $c->{invalidSet} %></div>
+% } elsif ($continueVersion) {
+	% # Display information about the current test and a continue open test button.
+	% if ($timeLimit > 0) {
+		% if ($timeNow >= $continueVersion->due_date) {
+			% # If the currently open test is in the grace period, display a mesage stating this.
+			<div class="alert alert-danger">
+				<%= maketext(
+					'There is no time remaining on the currently open test. '
+						. 'Click continue below and then click "Grade Test" within [_1] seconds '
+						. 'to submit the test for a grade.',
+					$continueTimeLeft
+				) =%>
+			</div>
+		% } else {
+			% my $seconds = $continueTimeLeft;
+			% my $hours   = int($seconds / 3600);
+			% $seconds %= 3600;
+			% my $minutes = int($seconds / 60);
+			% $seconds %= 60;
+			% my $timeText = '';
+			%
+			% # Several cases are needed to format time to work well with translation.
+			% if ($hours && $minutes) {
+				<div class="alert alert-warning">
+					<%= maketext(
+						'You have [quant,_1,hour] and [quant,_2,minute] remaining to complete the currently open test.',
+						$hours,
+						$minutes
+					) =%>
+				</div>
+			% } elsif ($hours || ($minutes && (!$seconds || $seconds > 299))) {
+				% # Translation Note: In this case only one of hours or minutes is non-zero,
+				% # so the zero case of the "quant" will be used for the other one.
+				<div class="alert alert-warning">
+					<%= maketext(
+						'You have [quant,_1,hour,hours,][quant,_2,minute,minutes,] '
+							. 'remaining to complete the currently open test.',
+						$hours,
+						$minutes
+					) =%>
+				</div>
+			% } else {
+				% if ($minutes) {
+					<div class="alert alert-warning">
+						<%= maketext(
+							'You have [quant,_1,minute] and [quant,_2,second] '
+								. 'remaining to complete the currently open test.',
+							$minutes,
+							$seconds
+						) =%>
+					</div>
+				% } else {
+					<div class="alert alert-warning">
+						<%= maketext(
+							'You have [quant,_1,second] remaining to complete the currently open test.',
+							$seconds
+						) =%>
+					</div>
+				% }
+			% }
+		% }
+	% }
+	%
+	% if ($set->assignment_type =~ /proctor/) {
+		<div class="alert alert-warning">
+			<%= maketext('This test requires a proctor password to continue.') =%>
+		</div>
+	% }
+	%
+	<div class="mb-3">
+		<%= link_to maketext('Continue Open Test') =>
+				$c->systemLink(url_for($routeName, setID => $set->set_id . ',v' . $continueVersion->version_id)),
+			class => 'btn btn-primary' =%>
+	</div>
+% } elsif (($timeNow >= $set->open_date || $authz->hasPermissions($user, 'view_hidden_sets'))
+	% && $timeNow <= $set->due_date
+	% && !($ce->{options}{enableConditionalRelease} && is_restricted($db, $set, param('effectiveUser')))
+	% && ($maxVersions <= 0 || $currentVersions < $maxVersions))
+% {
+	% # Display information about a new test and a start new test button.
+	% # Print time limit for timed tests
+	% if ($timeLimit > 0) {
+		% my $hours    = int($timeLimit / 3600);
+		% my $minutes  = int(($timeLimit % 3600) / 60);
+		% my $timeText = '';
+		%
+		% # Two cases to format time to work well with translation.
+		% if ($hours && $minutes) {
+			<div class="alert alert-warning">
+				<%= maketext(
+					'This is a timed test. You will have [quant,_1,hour] and [quant,_2,minute] to complete the test.',
+					$hours,
+					$minutes
+				) =%>
+			</div>
+		% } else {
+			<div class="alert alert-warning">
+				% # Translation Note: In this case only one of hours or minutes is non-zero,
+				% # so the zero case of the "quant" will be used for the other one.
+				<%= maketext(
+					'This is a timed test. You will have [quant,_1,hour,hours,]'
+						. '[quant,_2,minute,minutes,] to complete the test.',
+					$hours,
+					$minutes
+				) =%>
+			</div>
+		% }
+	% }
+	%
+	% if ($set->assignment_type =~ /proctor/) {
+		<div class="alert alert-warning"><%= maketext('This test requires a proctor password to start.') %></div>
+	% }
+	%
+	<div class="mb-3">
+		<%= link_to maketext('Start New Test') => $c->systemLink(url_for($routeName, setID => $set->set_id)),
+			class => 'btn btn-primary' =%>
+	</div>
+% } else {
+	% # Message about if/when next version will be available.
+	% my $msg = maketext('No more tests available.');
+	%
+	% # Can they open a test in the future?
+	% if ($timeInterval > 0) {
+		% my $nextTime = ($currentVersions == $maxVersions) ? $lastTime + $timeInterval : $timeNow + $timeInterval;
+		% if ($nextTime < $set->due_date) {
+			% $msg = maketext('Next test will be available by [_1].',
+				% $c->formatDateTime($nextTime, 0, $ce->{studentDateDisplayFormat}));
+		% }
+	% }
+	%
+	% # Only print status message if the set is open.
+	% if ($timeNow < $set->due_date) {
+		<div class="alert alert-dark"><strong><%= $msg %></strong></div>
+	% }
+% }
+%
+% if (@$setVersions) {
+	<% my $version_list = begin =%>
+		<div class="table-responsive">
+			<table class="problem_set_table table table-sm caption-top font-sm">
+				<caption><%= maketext('Test Versions') %></caption>
+				<thead class="table-group-divider">
+					<tr>
+						<th scope="col"><%= maketext('Versions') %></th>
+						<th scope="col"><%= maketext('Status') %></th>
+						<th scope="col"><%= maketext('Score') %></th>
+						<th scope="col"><%= maketext('Start') %></th>
+						<th scope="col"><%= maketext('End') %></th>
+						<th scope="col" class="hardcopy">
+							<i class="icon far fa-lg fa-arrow-alt-circle-down" aria-hidden="true"
+								title="<%= maketext('Generate Hardcopy') %>"
+								data-alt="<%= maketext('Generate Hardcopy') %>"></i>
+						</th>
+					</tr>
+				</thead>
+				<tbody class="table-group-divider">
+					% for my $ver (@$versionData) {
+						% my $interactive = maketext('Version [_1]', $ver->{version});
+						% if ($authz->hasPermissions($user, 'view_hidden_work') || $ver->{show_link}) {
+							<% $interactive = link_to $interactive => $c->systemLink(url_for(
+									$ver->{proctored} ? 'proctored_gateway_quiz' : 'gateway_quiz',
+									setID    => $ver->{id}
+								)),
+								class             => 'set-id-tooltip text-nowrap',
+								data => {
+									bs_toggle    => 'tooltip',
+								   	bs_placement => 'right',
+									bs_title     => $set->description
+								} =%>
+						% }
+						%
+						% # Download hardcopy.
+						% my $control = '';
+						% if ($multiSet) {
+							<% $control = check_box selected_sets => $ver->{id},
+								id => $ver->{id}, class => 'form-check-input'; =%>
+							% # Make interactive the label for the control.
+							% $interactive = label_for $ver->{id} => $interactive;
+						% } elsif ($ver->{show_download}) {
+							% # Only display download option if answers are available.
+							<% $control = link_to $c->systemLink(
+									url_for('hardcopy_preselect_set', setID => $ver->{id}),
+									params => { selected_sets => $ver->{id} }
+								),
+								class => 'hardcopy-link',
+								begin =%>
+								<i class="icon far fa-arrow-alt-circle-down fa-lg" aria-hidden="true"
+									title="<%= maketext('Download [_1]', $ver->{id} =~ s/_/ /gr) %>"
+									data-alt="<%= maketext('Download [_1]', $ver->{id} =~ s/_/ /gr) %>"></i>
+							<% end =%>
+						% }
+						%
+						<tr>
+							<td><%= $interactive %></td>
+							<td><strong><%= $ver->{status} %></strong></td>
+							<td><%= $ver->{score} %></td>
+							<td><%= $ver->{start} %></td>
+							<td><%= $ver->{end} %></td>
+							<td class="hardcopy"><%= $control %></td>
+						</tr>
+					% }
+				</tbody>
+			</table>
+		</div>
+	<% end =%>
+	%
+	% if ($multiSet) {
+		% # Show form for generating hardcopies of test versions.
+		<%= form_for 'hardcopy_preselect_set', method => 'POST', name => 'problem-sets-form', id => 'problem-sets-form',
+			begin =%>
+			<%= $c->hidden_authen_fields =%>
+			<%= $version_list->() =%>
+			<div class="mb-3">
+				<%= input_tag reset => maketext('Deselect All Test Versions'),
+					id => 'clear', type => 'reset', class => 'btn btn-primary' =%>
+			</div>
+			<div class="mb-3">
+				<%= submit_button maketext('Download PDF or TeX Hardcopy for Selected Tests'),
+					id => 'hardcopy', name => 'hardcopy', class => 'btn btn-primary' =%>
+			</div>
+		<% end =%>
+	% } else {
+		<%= $version_list->() =%>
+	% }
+% } else {
+	<div><p><%= maketext('No versions of this test have been taken.') %></p></div>
+% }
diff --git a/templates/ContentGenerator/ProblemSets.html.ep b/templates/ContentGenerator/ProblemSets.html.ep
new file mode 100644
index 0000000000..92eaf055e7
--- /dev/null
+++ b/templates/ContentGenerator/ProblemSets.html.ep
@@ -0,0 +1,90 @@
+% # If navigation is restricted, then don't show the body and instead display a
+% # message informing the user to access assignments via an LMS.
+% unless ($authz->hasPermissions(param('user'), 'navigation_allowed')) {
+	<div class="alert alert-danger">
+		<b>
+			<%== maketext('You must access assignments from your Course Management System ([_1]).',
+				$ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+					? link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+					: $ce->{LTI}{ $ce->{LTIVersion} }{LMS_name}) =%>
+		</b>
+	</div>
+	% last;
+% }
+%
+% content_for set_table => begin
+	% # Create the set table.
+	<div class="table-responsive">
+		<table class="problem_set_table table table-sm caption-top font-sm">
+			<caption><%= maketext('Homework Sets') %></caption>
+			%
+			% # Setlist table headers
+			% my $sort = param('sort') || 'status';
+			<thead class="table-group-divider">
+				<tr>
+					<th scope="col">
+						% if ($sort eq 'name') {
+							<span><%= maketext('Name') %></span>
+						% } else {
+							<%= link_to maketext('Name') => $c->systemLink(url_for, params => { sort => 'name' }) =%>
+						% }
+					</th>
+					<th scope="col">
+						% if ($sort eq 'status') {
+							<span><%= maketext('Status') %></span>
+						% } else {
+							<%= link_to maketext('Status') =>
+								$c->systemLink(url_for, params => { sort => 'status' }) =%>
+						% }
+					</th>
+					<th scope="col" class="hardcopy">
+						<i class ="icon far fa-arrow-alt-circle-down fa-lg" aria-hidden="true"
+						   title="<%= maketext('Generate Hardcopy') %>"
+						   data-alt="<%= maketext('Generate Hardcopy') %>">
+						</i>
+					</th>
+				</tr>
+			</thead>
+			%
+			<tbody class="table-group-divider">
+				% my $sets = stash('sets') // [];
+				%
+				% # Regular sets and gateway template sets are merged, but sorted either by name or urgency.
+				% # Versions are not shown here. Instead they are on the ProblemSet page for the gateway quiz.
+				% for my $set (@$sets) {
+					% if ($set->visible || $authz->hasPermissions(param('user'), 'view_hidden_sets')) {
+						<%= $c->setListRow($set) =%>
+					% }
+				% }
+			</tbody>
+		</table>
+	</div>
+% end
+%
+% if ($authz->hasPermissions(param('user'), 'view_multiple_sets')) {
+	<%= form_for 'hardcopy', name => 'problem-sets-form', id => 'problem-sets-form', method => 'POST', begin =%>
+		<%= $c->hidden_authen_fields =%>
+		<%= content 'set_table' =%>
+		<div class="mb-3">
+			<%= input_tag reset => maketext('Deselect All Sets'),
+				id => 'clear', type => 'reset', class => 'btn btn-info' =%>
+		</div>
+		<div class="mb-3">
+			<%= submit_button maketext('Generate Hardcopy for Selected Sets'),
+				id => 'hardcopy', name => 'hardcopy', class => 'btn btn-info' =%>
+		</div>
+	<% end =%>
+% } else {
+	<%= content 'set_table' =%>
+% }
+%
+<%= $c->feedbackMacro(
+	route              => current_route,
+	set                => '',
+	problem            => '',
+	displayMode        => '',
+	showOldAnswers     => '',
+	showCorrectAnswers => '',
+	showHints          => '',
+	showSolutions      => '',
+) =%>
diff --git a/templates/ContentGenerator/ProblemSets/info.html.ep b/templates/ContentGenerator/ProblemSets/info.html.ep
new file mode 100644
index 0000000000..9bc76fcdcd
--- /dev/null
+++ b/templates/ContentGenerator/ProblemSets/info.html.ep
@@ -0,0 +1,19 @@
+% last unless stash('course_info_contents') || stash('course_info_error');
+%
+% if ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
+	<h2 class="d-flex align-items-center justify-content-center">
+		<%= maketext('Course Info') =%>
+		<%= link_to(maketext('Edit') =>
+				$c->systemLink(url_for('instructor_problem_editor'), params => { file_type => 'course_info' }),
+			target => 'WW_Editor', class => 'btn btn-sm btn-info m-1') =%>
+	</h2>
+	% if (stash('course_info_error')) {
+		<div class="alert alert-danger p-1 mb-0"><%= stash('course_info_error') %></div>
+	% }
+% } else {
+	<h2><%= maketext('Course Info') %></h2>
+% }
+%
+% if (stash('course_info_contents')) {
+	<%== stash('course_info_contents') =%>
+% }
diff --git a/templates/ContentGenerator/ProctoredGatewayQuiz.html.ep b/templates/ContentGenerator/ProctoredGatewayQuiz.html.ep
new file mode 100644
index 0000000000..90e9fe9321
--- /dev/null
+++ b/templates/ContentGenerator/ProctoredGatewayQuiz.html.ep
@@ -0,0 +1 @@
+%= include 'ContentGenerator/GatewayQuiz'
diff --git a/templates/ContentGenerator/SampleProblemViewer.html.ep b/templates/ContentGenerator/SampleProblemViewer.html.ep
new file mode 100644
index 0000000000..25bb73ccb2
--- /dev/null
+++ b/templates/ContentGenerator/SampleProblemViewer.html.ep
@@ -0,0 +1,43 @@
+% title maketext('Sample Problem Home');
+%
+<!DOCTYPE html>
+<html lang="en" dir="ltr">
+%
+<head>
+	<meta charset='UTF-8'>
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title><%= title %></title>
+	<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'bootstrap.css' }) =%>
+	<link rel="icon" type="x-image/icon"
+		href="<%= $c->url({ type => 'webwork', name => 'htdocs', file => 'images/favicon.ico' }) %>">
+</head>
+
+<body>
+	<div class="container">
+		<h1 class="my-3"><%= title %></h1>
+		<div class="list-group">
+			<%= link_to 'sample_problem_viewer', { filePath => 'categories' },
+				class => 'list-group-item list-group-item-action', begin =%>
+				<span class="h4"><%= maketext('Sample Problems by Category') %></span>
+				<div><%= maketext('A list of sample problems by category.') %></div>
+			% end
+			<%= link_to 'sample_problem_viewer', { filePath => 'subjects' },
+				class => 'list-group-item list-group-item-action', begin =%>
+				<span class="h4"><%= maketext('Sample Problems by Subject Area') %></span>
+				<div><%= maketext('A list of sample problems by subject area.') %></div>
+			% end
+			<%= link_to 'sample_problem_viewer', { filePath => 'techniques' },
+				class => 'list-group-item list-group-item-action', begin =%>
+				<span class="h4"><%= maketext('Problem Techniques') %></span>
+				<div><%= maketext('A list of sample problems by problem technique.') %></div>
+			% end
+			<%= link_to 'sample_problem_viewer', { filePath => 'macros' },
+				class => 'list-group-item list-group-item-action', begin =%>
+				<span class="h4"><%= maketext('Sample Problems by Macro') %></span>
+				<div><%= maketext('For many macros, this lists all sample problems used by the macro.') %></div>
+			% end
+		</div>
+	</div>
+</body>
+%
+</html>
diff --git a/templates/ContentGenerator/SampleProblemViewer/sample_problem.html.ep b/templates/ContentGenerator/SampleProblemViewer/sample_problem.html.ep
new file mode 100644
index 0000000000..329ee2bf48
--- /dev/null
+++ b/templates/ContentGenerator/SampleProblemViewer/sample_problem.html.ep
@@ -0,0 +1,115 @@
+% title $name;
+%
+<!DOCTYPE html>
+<html lang="en">
+%
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title><%= title %></title>
+	<%= stylesheet $c->url({ type => 'webwork', name => 'theme',  file => 'bootstrap.css' }) =%>
+	<%= stylesheet $c->url({
+		type => 'webwork', name => 'htdocs',
+		file => 'node_modules/@fortawesome/fontawesome-free/css/all.min.css'
+	}) =%>
+	<%= stylesheet $c->url({ type => 'webwork', name => 'htdocs',
+		file => 'node_modules/codemirror/lib/codemirror.css' }) =%>
+	<%= stylesheet $c->url({ type => 'webwork', name => 'htdocs',
+		file => 'js/SampleProblemViewer/sample-problem.css' }) =%>
+	<%= javascript $c->url({ type => 'webwork', name => 'htdocs',
+		file => 'node_modules/codemirror/addon/runmode/runmode-standalone.js' }), defer => undef =%>
+	<%= javascript $c->url({ type => 'webwork', name => 'htdocs', file => 'js/PGCodeMirror/PG.js' }), defer => undef =%>
+	<%= javascript $c->url({ type => 'webwork', name => 'htdocs',
+		file => 'js/SampleProblemViewer/sample-problem.js' }), defer => undef =%>
+</head>
+%
+% # Default explanations
+% my $default = {
+	% preamble  => maketext('These standard macros need to be loaded.'),
+	% setup     => maketext('This perl code sets up the problem.'),
+	% statement => maketext('This is the problem statement in PGML.'),
+	% answer    => maketext('This is used for answer checking.'),
+	% solution  => maketext('A solution should be provided here.')
+% };
+%
+<body>
+	<div class="container-fluid p-3">
+		<div class="row">
+			<div class="col">
+				<h1><%= title %></h1>
+				<p><%= $description %></p>
+			</div>
+			<div class="col text-end">
+				<%= link_to maketext('Return to PG Sample Problem home') => 'sample_problem_index' =%>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col">
+				<h2><%= maketext('Complete Code') %></h2>
+				<p>
+					<%== maketext('Download file: [_1]',
+						link_to($filename => 'sample_problem_viewer', { filePath => "$filePath.pg" })) =%>
+				</p>
+			</div>
+			% if (scalar(@{ $metadata->{$filename}{macros} }) > 0 ) {
+				<div class="col">
+					<h2><%= maketext('POD for Macro Files') %></h2>
+					<ul>
+						% for my $macro (@{ $metadata->{$filename}{macros} }) {
+							% if ($macro_locations->{$macro}) {
+								<li>
+									<%= link_to $macro => 'pod_viewer', {
+										filePath => 'macros/' . ($macro_locations->{$macro} =~ s/\.html/.pl/r)
+									} =%>
+								</li>
+							% } else {
+								<li class="text-danger"><%= $macro %></li>
+							% }
+						% }
+					</ul>
+				</div>
+				%}
+			% if ($metadata->{$filename}{related} && scalar(@{ $metadata->{$filename}{related} }) > 0) {
+				<div class="col">
+					<h2><%= maketext('See Also') %></h2>
+					<ul>
+						% for (@{$metadata->{$filename}{related}}) {
+							<li>
+								<%= link_to $metadata->{$_}{name} => 'sample_problem_viewer',
+									{ filePath => "$metadata->{$_}{dir}/" . ($_ =~ s/.pg$//r) } =%>
+							</li>
+						% }
+					</ul>
+				</div>
+			% }
+		</div>
+		<div class="row">
+			<div class="col text-center"><h2 class="fw-bold fs-3"><%= maketext('PG problem file') %></h2></div>
+			<div class="col text-center"><h2 class="fw-bold fs-3"><%= maketext('Explanation') %></h2></div>
+		</div>
+		% for (@$blocks) {
+			<div class="row">
+				<div class="col-sm-12 col-md-6 order-md-first order-last p-0 position-relative overflow-hidden">
+					<button class="clipboard-btn btn btn-sm btn-secondary position-absolute top-0 end-0 me-1 mt-1"
+						type="button" data-code="<%= $_->{code} %>" aria-label="<%= maketext('copy to clipboard') %>">
+						<i class="fa-regular fa-clipboard fa-xl"></i>
+					</button>
+					<pre class="CodeMirror cm-s-default m-0 h-100 p-3 border border-secondary overflow-scroll"><% =%>\
+						<%= $_->{code} =%>\
+					</pre><% =%>\
+				</div>
+				<div class="explanation <%= $_->{section}
+					%> col-sm-12 col-md-6 order-md-last p-3 order-first border border-dark">
+					<p><b><%= ucfirst($_->{section}) %></b></p>
+					% if ($_->{doc}) {
+						<%== $_->{doc} %>
+					%} else {
+						<%= $default->{$_->{section}} %>
+					%}
+				</div>
+			</div>
+		% }
+	</div>
+</body>
+%
+</html>
diff --git a/templates/ContentGenerator/SampleProblemViewer/viewer.html.ep b/templates/ContentGenerator/SampleProblemViewer/viewer.html.ep
new file mode 100644
index 0000000000..f243e97186
--- /dev/null
+++ b/templates/ContentGenerator/SampleProblemViewer/viewer.html.ep
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title><%= maketext('PG Sample Problems') %></title>
+	<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'bootstrap.css' }) =%>
+	<%= stylesheet $c->url({
+		type => 'webwork',
+		name => 'htdocs',
+		file => 'js/SampleProblemViewer/viewer.css'
+	}) =%>
+	<%= javascript $c->url({
+			type => 'webwork', name => 'htdocs',
+			file => 'node_modules/bootstrap/dist/js/bootstrap.bundle.min.js'
+		}), defer => undef =%>
+	<%= javascript $c->url({
+			type => 'webwork',
+			name => 'htdocs',
+			file => 'js/SampleProblemViewer/viewer.js'
+		}), defer => undef =%>
+</head>
+
+<body>
+	<nav class="navbar fixed-top bg-primary border-bottom border-dark" data-bs-theme="dark">
+		<div class="container-fluid">
+			<ul class="nav nav-pills">
+				<li class="nav-item dropdown">
+					<a class="nav-link fs-3 dropdown-toggle active" href="#" role="button"
+						data-bs-toggle="dropdown" aria-expanded="false">
+						<%= $filePath eq 'categories' ? maketext('Sample Problems')
+							: $filePath eq 'techniques' ? maketext('Problem Techniques')
+							: $filePath eq 'subjects' ? maketext('Subject Area Problems')
+							: maketext('Problems by Macro') =%>
+					</a>
+					<ul class="dropdown-menu">
+						<li>
+							<%= link_to maketext('Sample Problems') => 'sample_problem_viewer',
+								{ filePath => 'categories' },
+								class => 'dropdown-item' . ($filePath eq 'categories' ? ' active' : ''),
+								$filePath eq 'categories' ? ('aria-current' => 'page') : () =%>
+						</li>
+						<li>
+							<%= link_to maketext('Problem Techniques') => 'sample_problem_viewer',
+								{ filePath => 'techniques' },
+								class => 'dropdown-item' . ($filePath eq 'techniques' ? ' active' : ''),
+								$filePath eq 'techniques' ? ('aria-current' => 'page') : () =%>
+						</li>
+						<li>
+							<%= link_to maketext('Subject Area Problems') => 'sample_problem_viewer',
+								{ filePath => 'subjects' },
+								class => 'dropdown-item' . ($filePath eq 'subjects' ? ' active' : ''),
+								$filePath eq 'subjects' ? ('aria-current' => 'page') : () =%>
+						</li>
+						<li>
+							<%= link_to maketext('Problems by Macro') => 'sample_problem_viewer',
+								{ filePath => 'macros' },
+								class => 'dropdown-item' . ($filePath eq 'macros' ? ' active' : ''),
+								$filePath eq 'macros' ? ('aria-current' => 'page') : () =%>
+						</li>
+					</ul>
+				</li>
+			</ul>
+			<button class="navbar-toggler d-md-none" type="button" data-bs-toggle="offcanvas"
+				data-bs-target="#sidebar" aria-controls="sidebar" aria-label="<%= maketext('Toggle Sidebar') %>">
+				<span class="navbar-toggler-icon"></span>
+			</button>
+		</div>
+	</nav>
+	<aside class="offcanvas-md offcanvas-start overflow-auto position-fixed border-end border-dark flex-shrink-0"
+		tabindex="-1" id="sidebar" aria-labelledby="sidebar-label">
+		<div class="offcanvas-header">
+			<h2 class="offcanvas-title fs-3" id="sidebar-label"><%= $label =%></h2>
+			<button type="button" class="btn-close" data-bs-dismiss="offcanvas"
+				data-bs-target="#sidebar" aria-label="Close">
+			</button>
+		</div>
+		<h2 class="fs-3 d-none d-md-block px-3 pt-3"><%= $label =%></h2>
+		<div class="offcanvas-body px-md-3 pb-md-3 w-100">
+			<nav class="list-group w-100" role="tablist" id="sidebar-list">
+				% if ($filePath eq 'techniques') {
+					% for (['A' .. 'C'], ['D' .. 'F'], ['G' .. 'N'], ['O' .. 'Z']) {
+						<a class="list-group-item list-group-item-action" id="<%= $_->[0] %>-tab" href="#<%= $_->[0] %>"
+							data-bs-toggle="list" role="tab" aria-controls="<%= $_->[0] %>">
+							<%= $_->[0] %> .. <%= $_->[-1] %>
+						</a>
+					% }
+				% } else {
+					% for (sort(keys %$list)) {
+						% my $id = ($_ =~ s/\s/_/gr) =~ s/\./_/gr;
+						<a class="list-group-item list-group-item-action" id="<%= $id %>-tab" href="#<%= $id %>"
+							data-bs-toggle="list" role="tab" aria-controls="<%= $id %>">
+							<%= $_ %>
+						</a>
+					% }
+				% }
+			</nav>
+		</div>
+	</aside>
+	<div class="main-content">
+		<div class="tab-content p-3">
+			% if ($filePath eq 'techniques') {
+				% for (['A' .. 'C'], ['D' .. 'F'], ['G' .. 'N'], ['O' .. 'Z']) {
+					<div class="tab-pane fade" id="<%= $_->[0] %>" role="tabpanel"
+						aria-labelledby="<%= $_->[0] %>-tab" tabindex="0">
+						<h1 class="fs-3">
+							<%= maketext('Sample Problems for Techniques: [_1]', "$_->[0] .. $_->[-1]") =%>
+						</h1>
+						<ul>
+							% my $b = join('', @$_);
+							% for (sort grep { substr($_, 0, 1 ) =~ qr/^[$b]/i } keys(%$list)) {
+								<li><%= link_to $_ => 'sample_problem_viewer', { filePath => $list->{$_} } %></li>
+							% }
+						</ul>
+					</div>
+				% }
+			% } else {
+				% my %topics = (
+					% categories => maketext('Catetory'),
+					% subjects   => maketext('Subject'),
+					% macros     => maketext('Macro')
+				% );
+				% for (sort(keys %$list)) {
+					% my $id = ($_ =~ s/\s/_/gr) =~ s/\./_/gr;
+					<div class="tab-pane fade" id="<%= $id %>" role="tabpanel" aria-labelledby="<%= $id %>-tab"
+						tabindex="0">
+						<h1 class="fs-3"><%= maketext('Sample Problems for [_1]: [_2]', $topics{$filePath}, $_) %></h1>
+						<ul>
+							% for my $link (sort (keys %{ $list->{$_} })) {
+								<li>
+									<%= link_to $link => 'sample_problem_viewer', { filePath => $list->{$_}{$link} } %>
+								</li>
+							% }
+						</ul>
+					</div>
+				% }
+			% }
+		</div>
+	</div>
+</body>
+
+</html>
diff --git a/templates/ContentGenerator/ShowMeAnother.html.ep b/templates/ContentGenerator/ShowMeAnother.html.ep
new file mode 100644
index 0000000000..a06550e7d8
--- /dev/null
+++ b/templates/ContentGenerator/ShowMeAnother.html.ep
@@ -0,0 +1 @@
+%= include 'ContentGenerator/Problem'
diff --git a/templates/ContentGenerator/ShowMeAnother/messages.html.ep b/templates/ContentGenerator/ShowMeAnother/messages.html.ep
new file mode 100644
index 0000000000..666421e59f
--- /dev/null
+++ b/templates/ContentGenerator/ShowMeAnother/messages.html.ep
@@ -0,0 +1,38 @@
+% use WeBWorK::Utils qw(before after);
+%
+% if ($c->{pg}{result}{msg}) {
+	<p><b><%= maketext('Note') %>:</b> <i><%== $c->{pg}{result}{msg} %></i></p>
+% }
+%
+% if ($c->{pg}{flags}{hintExists}
+	% && $authz->hasPermissions($c->{userName}, 'always_show_hint')
+	% && !$c->{options}{showHints}) {
+	% my $showHintsAfter =
+		% $c->{set}->hide_hint                 ? -1
+		% : $c->{problem}->showHintsAfter > -2 ? $c->{problem}->showHintsAfter
+		% :                                      $ce->{pg}{options}{showHintsAfter};
+	<p>
+		<b><%= maketext('Note') %>:</b>
+		<i>
+			<%= maketext(
+				$showHintsAfter == -1
+				? 'The hint shown is an instructor preview and will not be shown to students.'
+				: 'The hint shown is an instructor preview and will be shown to students after '
+					. "$showHintsAfter attempts on the original problem."
+			) =%>
+		</i>
+	</p>
+% }
+%
+% if ($c->{pg}{flags}{solutionExists}
+	% && $authz->hasPermissions($c->{userName}, 'always_show_solution')
+	% && !$c->{options}{showSolutions}) {
+	<p>
+		<b><%= maketext('Note') %>:</b>
+		<i>
+			<%= maketext('The solution shown is an instructor preview and '
+				. 'will only be shown to students after the due date.'
+			) =%>
+		</i>
+	</p>
+% }
diff --git a/templates/HTML/CodeMirrorEditor/controls.html.ep b/templates/HTML/CodeMirrorEditor/controls.html.ep
new file mode 100644
index 0000000000..c91a9996fc
--- /dev/null
+++ b/templates/HTML/CodeMirrorEditor/controls.html.ep
@@ -0,0 +1,33 @@
+% # Output the html elements for setting the CodeMirror options.
+<div class="row align-items-center">
+	<div class="col-sm-auto mb-2">
+		<div class="row align-items-center">
+			<%= label_for selectTheme => maketext('Theme:'), class => 'col-form-label col-auto' =%>
+			<div class="col-auto">
+				<%= select_field selectTheme => $themeValues,
+					id => 'selectTheme', class => 'form-select form-select-sm d-inline w-auto' =%>
+			</div>
+		</div>
+	</div>
+	<div class="col-sm-auto mb-2">
+		<div class="row align-items-center">
+			<%= label_for selectKeymap => maketext('Key Map:'), class => 'col-form-label col-auto' =%>
+			<div class="col-auto">
+				<%= select_field selectKeymap => $keymapValues,
+					id => 'selectKeymap', class => 'form-select form-select-sm d-inline w-auto' =%>
+			</div>
+		</div>
+	</div>
+	<div class="col-sm-auto mb-2">
+		<div class="form-check mb-0">
+			<%= check_box 'enableSpell', id => 'enableSpell', class => 'form-check-input' =%>
+			<%= label_for enableSpell => maketext('Enable Spell Checking'), class => 'form-check-label' =%>
+		</div>
+	</div>
+	<div class="col-sm-auto mb-2">
+		<div class="form-check mb-0">
+			<%= check_box 'forceRTL', id => 'forceRTL', class => 'form-check-input' =%>
+			<%= label_for forceRTL => maketext('Force editor to RTL'), class => 'form-check-label' =%>
+		</div>
+	</div>
+</div>
diff --git a/templates/HTML/CodeMirrorEditor/js.html.ep b/templates/HTML/CodeMirrorEditor/js.html.ep
new file mode 100644
index 0000000000..33a4be141f
--- /dev/null
+++ b/templates/HTML/CodeMirrorEditor/js.html.ep
@@ -0,0 +1,34 @@
+% use WeBWorK::Utils qw(getAssetURL);
+%
+% if ($ce->{options}{PGCodeMirror}) {
+	% content_for css => begin
+		<%= stylesheet getAssetURL($ce, 'node_modules/codemirror/lib/codemirror.css') =%>
+		%
+		% for my $addon (@$codemirrorAddonsCSS) {
+			<%= stylesheet getAssetURL($ce, "node_modules/codemirror/addon/$addon") =%>
+		% }
+		<%= stylesheet getAssetURL($ce, 'js/PGCodeMirror/pgeditor.css') =%>
+	% end
+	%
+	% content_for js => begin
+		<%= javascript getAssetURL($ce, 'node_modules/codemirror/lib/codemirror.js'), defer => undef =%>
+		%
+		% for my $addon (@$codemirrorAddonsJS) {
+			<%= javascript getAssetURL($ce, "node_modules/codemirror/addon/$addon"), defer => undef =%>
+		% }
+		% for my $mode (@$codemirrorModesJS) {
+			<%= javascript getAssetURL(
+					$ce,
+					$mode eq 'PG' ? 'js/PGCodeMirror/PG.js' : "node_modules/codemirror/mode/$mode/$mode.js"
+				), defer => undef =%>
+		% }
+		%
+		<%= javascript getAssetURL($ce, 'js/PGCodeMirror/pgeditor.js'), defer => undef =%>
+		<%= javascript getAssetURL($ce, 'js/PGCodeMirror/comment.js'), defer => undef =%>
+	% end
+% }
+%
+% # The textarea styles in this file are still needed if CodeMirror is disabled.
+% content_for css => begin
+	<%= stylesheet getAssetURL($ce, 'js/PGCodeMirror/pgeditor.css') =%>
+% end
diff --git a/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep b/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep
new file mode 100644
index 0000000000..a59711892c
--- /dev/null
+++ b/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep
@@ -0,0 +1,30 @@
+<div class="card p-2">
+	<div class="row mb-2">
+		<%= label_for "$name!sort" => maketext('Sort:'),
+			class => 'col-form-label col-form-label-sm col-2 pe-1 text-nowrap' =%>
+		<div class="col-10">
+			<%= select_field "$name!sort" => $sorts, id => "$name!sort", class => 'form-select form-select-sm' =%>
+		</div>
+	</div>
+	<div class="row mb-2">
+		<%= label_for "$name!format" => maketext('Format:'),
+			class => 'col-form-label col-form-label-sm col-2 pe-1 text-nowrap' =%>
+		<div class="col-10">
+			<%= select_field "$name!format" => $formats, id => "$name!format", class => 'form-select form-select-sm' =%>
+		</div>
+	</div>
+	<div class="row mb-2">
+		<%= label_for "$name!filter" => maketext("Filter:"),
+			class => 'col-form-label col-form-label-sm col-2 pe-1 text-nowrap' =%>
+		<div class="col-10">
+			<%= select_field "$name!filter" => $filters, id => "$name!filter", class => 'form-select form-select-sm',
+				multiple => undef, size => 5 =%>
+		</div>
+	</div>
+	<div>
+		<%= submit_button $options->{refresh_button_name} // maketext('Change Display Settings'),
+			name => "$name!refresh", class => 'btn btn-secondary btn-sm mb-2' =%>
+	</div>
+	<%= select_field $name => $formattedRecords, id => $name, class => 'form-select form-select-sm',
+		%{ $options->{attrs} // {} } =%>
+</div>
diff --git a/templates/HTML/SingleProblemGrader/grader.html.ep b/templates/HTML/SingleProblemGrader/grader.html.ep
new file mode 100644
index 0000000000..4a3282bea0
--- /dev/null
+++ b/templates/HTML/SingleProblemGrader/grader.html.ep
@@ -0,0 +1,216 @@
+% use WeBWorK::Utils 'wwRound';
+%
+<div class="problem-grader">
+	<hr>
+	<div class="problem-grader-table">
+		% # Subscores for each answer in the problem.
+		% if (@{ $grader->{pg}{flags}{ANSWER_ENTRY_ORDER} } > 1) {
+			% # Determine the scores and weights for each part of the problem.
+			% my $total = 0;
+			% my (@scores, @weights);
+			% for my $ans_id (@{ $grader->{pg}{flags}{ANSWER_ENTRY_ORDER} }) {
+				% push(@scores,  wwRound(0, $grader->{pg}{answers}{$ans_id}{score} * 100));
+				% push(@weights, $grader->{pg}{answers}{$ans_id}{weight} // 1);
+				% $total += $weights[-1];
+			% }
+			%
+			% # Normalize the weights
+			% @weights = map { $_ / $total } @weights;
+			%
+			% for my $part (0 .. $#scores) {
+				<div class="row align-items-center mb-2">
+					<%= label_for "score_problem$grader->{problem_id}_$grader->{pg}{flags}{ANSWER_ENTRY_ORDER}[$part]",
+						class => 'col-fixed col-form-label',
+						begin =%>
+						<%= maketext('Answer [_1] Score (%):', $part + 1) =%>
+						<%= link_to '#',
+							class => 'help-popup',
+							data => {
+								bs_content => maketext(
+									'The initial value is the answer sub score for the answer '
+										. 'that is currently shown.  If this is modified, it will be used to compute '
+										. 'the total problem score below.  This score is not saved, and will reset to '
+										. 'the score for the shown answer if the page is reloaded.'
+								),
+								bs_placement => 'top',
+								bs_toggle    => 'popover'
+							},
+							begin =%>
+							<i class="icon fas fa-question-circle" aria-hidden="true" data-alt="Help Icon"></i>
+						<% end =%>
+					<% end =%>
+					<div class="col-sm">
+						% param('answer-part-score', $scores[$part]);
+						<%= number_field 'answer-part-score' => '',
+							class => 'answer-part-score form-control form-control-sm d-inline',
+							id    =>
+								"score_problem$grader->{problem_id}_$grader->{pg}{flags}{ANSWER_ENTRY_ORDER}[$part]",
+							data  => {
+								problem_id    => $grader->{problem_id},
+								answer_labels =>
+									'["' . join('","', @{ $grader->{pg}{flags}{ANSWER_ENTRY_ORDER} }) . '"]',
+								weight        => $weights[$part]
+							},
+							min          => 0,
+							max          => 100,
+							autocomplete => 'off' =%>
+							&nbsp;
+							<%== maketext('<b>Weight:</b> [_1]%', wwRound(2, $weights[$part] * 100)) =%>
+					</div>
+				</div>
+			% }
+		% }
+
+		% # Total point value. Show only if configured to.
+		% unless ($ce->{problemGraderScore} eq 'Percent') {
+			% # Compute a reasonable step size based on point value.
+			% # First use some preset nice values, then only use whole
+			% # point values, such that the step size >= 1% of total.
+			% my $stepSize;
+			% if ($grader->{problem_value} == 1) {
+				% $stepSize = 0.01;
+			% } elsif ($grader->{problem_value} <= 5) {
+				% $stepSize = 0.05;
+			% } elsif ($grader->{problem_value} <= 10) {
+				% $stepSize = 0.1;
+			% } elsif ($grader->{problem_value} <= 25) {
+				% $stepSize = 0.25;
+			% } elsif ($grader->{problem_value} <= 50) {
+				% $stepSize = 0.5;
+			% } else {
+				% $stepSize = int(($grader->{problem_value} - 1) / 100) + 1;
+			% }
+			% # Round point score to the nearest $stepSize.
+			% param(
+				% 'grader-problem-points',
+				% wwRound(2, wwRound(0, $grader->{recorded_score} * $grader->{problem_value} / $stepSize) * $stepSize)
+			% );
+			<div class="row align-items-center mb-2">
+				<%= label_for "score_problem$grader->{problem_id}_points",
+					class => 'col-fixed col-form-label',
+					begin =%>
+					<%= maketext('Point Value (0 - [_1]):', $grader->{problem_value}) %>
+					<%= link_to '#',
+						class => 'help-popup',
+						data => {
+							bs_content => maketext(
+								'The initial value is the currently saved score as a point value computed '
+								. 'using the percent score.  This point value is used to compute the percent '
+								. 'score (rounded to a whole percent) that can be saved.'
+							)
+							. (
+								@{ $grader->{pg}{flags}{ANSWER_ENTRY_ORDER} } > 1
+								? ' '
+								. maketext(
+									'This can computed from the answer sub scores above using the weights shown '
+									. 'if they are modified.  Alternatively, enter the point score you want '
+									. 'saved here (the above sub scores will be ignored).'
+								)
+								: ''
+							),
+							bs_placement => 'top',
+							bs_toggle    => 'popover'
+						},
+						begin =%>
+						<i class="icon fas fa-question-circle" aria-hidden="true" data-alt="Help Icon"></i>
+						<span class="sr-only-glyphicon">Help Icon</span>
+					<% end =%>
+				<% end =%>
+				<div class="col-sm">
+					<%= number_field 'grader-problem-points' => '',
+						min          => 0,
+						max          => $grader->{problem_value},
+						step         => $stepSize,
+						autocomplete => 'off',
+						id           => "score_problem$grader->{problem_id}_points",
+						class        => "problem-points form-control form-control-sm d-inline",
+						data         => { problem_id => $grader->{problem_id} } =%>
+				</div>
+			</div>
+		% }
+
+		% # Total problem score. (Hidden if configured to only show point values.)
+		% if ($ce->{problemGraderScore} eq 'Point') {
+			<%= hidden_field 'grader-problem-score' => wwRound(0, $grader->{recorded_score} * 100),
+				id   => "score_problem$grader->{problem_id}",
+				data => { problem_id => $grader->{problem_id} } =%>
+		% } else {
+			<div class="row align-items-center mb-2">
+				<%= label_for "score_problem$grader->{problem_id}", class => 'col-fixed col-form-label', begin =%>
+					<%= maketext('Problem Score (%):') %>
+					<%= link_to '#',
+						class => 'help-popup',
+						data => {
+							bs_content =>
+							maketext('The initial value is the currently saved score for this student.')
+							. (
+								@{ $grader->{pg}{flags}{ANSWER_ENTRY_ORDER} } > 1
+								? ' '
+								. maketext(
+									'This is the only part of the score that is actually saved. '
+									. 'This is computed from the answer sub scores above using the weights shown if '
+									. 'they are modified.  Alternatively, enter the score you want saved here '
+									. '(the above sub scores will be ignored).'
+								)
+								: ''
+							),
+							bs_placement => 'top',
+							bs_toggle    => 'popover'
+						},
+						begin =%>
+						<i class="icon fas fa-question-circle" aria-hidden="true" data-alt="Help Icon"></i>
+						<span class="sr-only-glyphicon">Help Icon</span>
+					<% end =%>
+				<% end =%>
+				<div class="col-sm">
+					% param('grader-problem-score', wwRound(0, $grader->{recorded_score} * 100));
+					<%= number_field 'grader-problem-score' => '',
+						min          => 0,
+						max          => 100,
+						autocomplete => "off",
+						id           => "score_problem$grader->{problem_id}",
+						class        => "problem-score form-control form-control-sm d-inline",
+						data         => { problem_id => $grader->{problem_id} } =%>
+				</div>
+			</div>
+		% }
+
+		% # Instructor comment
+		% if ($grader->{past_answer_id}) {
+			<div class="row">
+				<%= label_for "comment_problem$grader->{problem_id}" => maketext('Comment:'),
+					class => 'col-fixed col-form-label' =%>
+				<div class="col-sm">
+					% param('grader-instructor-comment', $grader->{comment_string});
+					<%= text_area 'grader-instructor-comment' => '',
+						id    => "comment_problem$grader->{problem_id}",
+						class => 'grader-problem-comment form-control d-inline latexentryfield',
+						data  => { problem_id => $grader->{problem_id} },
+						rows  => 3 =%>
+					<%= hidden_field "MaThQuIlL_comment_problem$grader->{problem_id}" => '',
+						id => "MaThQuIlL_comment_problem$grader->{problem_id}" =%>
+				</div>
+			</div>
+		% }
+
+		% # Save button
+		<div class="row align-items-center">
+			<div class="col-fixed mt-2">
+				<button class="save-grade btn btn-sm btn-secondary" type="button"
+					id="<%= "save_grade_problem$grader->{problem_id}" %>"
+					data-course-id="<%= $grader->{course_id} %>"
+					data-student-id="<%= $grader->{student_id} %>"
+					data-set-id="<%= $grader->{set_id} %>"
+					data-version-id="<%= $grader->{version_id} %>"
+					data-problem-id="<%= $grader->{problem_id} %>"
+					data-past-answer-id="<%= $grader->{past_answer_id} %>">
+					<%= maketext('Save') =%>
+				</button>
+			</div>
+			<div class="col-sm mt-2">
+				<div id="<%= "grader_messages_problem$grader->{problem_id}" %>" class="problem-grader-message"></div>
+			</div>
+		</div>
+	</div>
+	<hr>
+</div>
diff --git a/templates/HelpFiles/Achievements.html.ep b/templates/HelpFiles/Achievements.html.ep
new file mode 100644
index 0000000000..19fe00c13c
--- /dev/null
+++ b/templates/HelpFiles/Achievements.html.ep
@@ -0,0 +1,23 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Achievements Help');
+%
+<p class="m-0">
+	<%= maketext(q{This page displays a student's current achievement level and progress toward the next level, }
+		. 'and lists the rewards and badges that the student has earned. If rewards have been earned, '
+		. 'then the student may also redeem those rewards.') =%>
+</p>
diff --git a/templates/HelpFiles/AdminAddCourse.html.ep b/templates/HelpFiles/AdminAddCourse.html.ep
new file mode 100644
index 0000000000..8da9cd4c15
--- /dev/null
+++ b/templates/HelpFiles/AdminAddCourse.html.ep
@@ -0,0 +1,37 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Add Course Help');
+%
+<p>
+	<%= maketext('Create a new course.  The "Course ID" is used as the course name and is used in course links.  '
+		. 'Underscores appear as spaces when displaying the course name.  The "Course Title" is used as the title '
+		. 'on the course home page.') =%>
+</p>
+<p>
+	<%= maketext('The WeBWorK administrators need to be added to the course in order for them to access the course.  '
+		. 'Unchecking this option will make it so WeBWorK administrators cannot directly login to the course.') =%>
+</p>
+<p>
+	<%= maketext('The simple configuration file is the name of the configuration file created when using the "Course '
+		. 'Configuration" page to configure course options.  This option sets if this configuration file is copied '
+		. 'from the old course or not and instead use the server defaults.') =%>
+</p>
+<p class="mb-0">
+	<%= maketext('Enter the details of the course instructor to be added when the course is created.  This user '
+		. 'will also be added to the admin course with the username "userID_courseID" so you can manage and '
+		. 'email the instructors of the courses on the server.') =%>
+</p>
diff --git a/templates/HelpFiles/AdminArchiveCourse.html.ep b/templates/HelpFiles/AdminArchiveCourse.html.ep
new file mode 100644
index 0000000000..c1d6b183a6
--- /dev/null
+++ b/templates/HelpFiles/AdminArchiveCourse.html.ep
@@ -0,0 +1,27 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Archive Course Help');
+%
+<p>
+	<%= maketext('Select a course to create a .tar.gz archive of, which contains a dump of the database and all '
+		. 'course files (templates, configuration files, etc).  Each course can only have a single archive.  '
+		. 'Creating an archive of a previously archived course will delete the old archive.') =%>
+</p>
+<p class="mb-0">
+	<%= maketext('Archived courses are located inside the "archives" directory of the "admin" course.  Use the '
+		. '"File Manager" to access the .tar.gz files.') =%>
+</p>
diff --git a/templates/HelpFiles/AdminDeleteCourse.html.ep b/templates/HelpFiles/AdminDeleteCourse.html.ep
new file mode 100644
index 0000000000..6f96e880e4
--- /dev/null
+++ b/templates/HelpFiles/AdminDeleteCourse.html.ep
@@ -0,0 +1,22 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Delete Course Help');
+%
+<p class="mb-0">
+	<%= maketext('Select a course to delete.  Warning, all data will be deleted and this cannot be undone.  '
+		. 'This will not delete any course archives.') =%>
+</p>
diff --git a/templates/HelpFiles/AdminHideCourses.html.ep b/templates/HelpFiles/AdminHideCourses.html.ep
new file mode 100644
index 0000000000..130558e242
--- /dev/null
+++ b/templates/HelpFiles/AdminHideCourses.html.ep
@@ -0,0 +1,25 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Hide Course Help');
+%
+<p class="mb-0">
+	<%= maketext('Select the course(s) you want to hide (or unhide) and then click "Hide Courses" (or "Unhide '
+		. 'Courses"). Hiding a course that is already hidden does no harm (the action is skipped). Likewise unhiding '
+		. 'a course that is already visible does no harm (the action is skipped). Hidden courses are still active '
+		. 'but are not listed in the list of WeBWorK courses on the opening page. To access the course, an '
+		. 'instructor or student must know the full URL address for the course.') =%>
+</p>
diff --git a/templates/HelpFiles/AdminManageLocations.html.ep b/templates/HelpFiles/AdminManageLocations.html.ep
new file mode 100644
index 0000000000..fcb45cf4eb
--- /dev/null
+++ b/templates/HelpFiles/AdminManageLocations.html.ep
@@ -0,0 +1,34 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Manage Locations Help');
+%
+<p>
+	<%= maketext('Fill out the form below to add, edit, or delete locations.  Locations are used to restrict access '
+		. 'to sets based on ip address.  Locations are configured here in the administration course, then used in a '
+		. 'normal course.  When configuring a set to use a restricted ip address, the instructor can choose to '
+		. 'either restrict access to the location or deny access from a location, which are identified by their '
+		. 'name.  Instructors can select multiple locations to restrict access to.') =%>
+</p>
+<p>
+	<%= maketext('Locations are a list of ip addresses.  Ip addresses can be a single address (e.g. 192.168.1.101), '
+		. 'a range of ip address (e.g. 192.168.1.101-192.168.1.150), or an ip address mask (e.g. 192.168.1.0/24). '
+		. 'Enter one ip address per line, using as many lines as needed for each location.') =%>
+</p>
+<p class="mb-0">
+	<%= maketext('Locations are edited by adding new ip addresses to the location, or deleting existing address.  '
+		. 'You must select the confirm checkbox when deleting a location, and this cannot be undone.') =%>
+</p>
diff --git a/templates/HelpFiles/AdminRenameCourse.html.ep b/templates/HelpFiles/AdminRenameCourse.html.ep
new file mode 100644
index 0000000000..cba268c581
--- /dev/null
+++ b/templates/HelpFiles/AdminRenameCourse.html.ep
@@ -0,0 +1,23 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Rename Course Help');
+%
+<p class="mb-0">
+	<%= maketext('Select the course to change its Course ID, Course Title, or Institution.  Note that changing a '
+		. q{course's ID will change the URL of all links to the course, and could break links from external sites }
+		. 'such as an LMS.') =%>
+</p>
diff --git a/templates/HelpFiles/AdminUnarchiveCourse.html.ep b/templates/HelpFiles/AdminUnarchiveCourse.html.ep
new file mode 100644
index 0000000000..0ac4b820d1
--- /dev/null
+++ b/templates/HelpFiles/AdminUnarchiveCourse.html.ep
@@ -0,0 +1,28 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Unarchive Course Help');
+%
+<p>
+	<%= maketext('Select an archive to restore.  You cannot restore an archive into an existing course. '
+		. 'Instead, either rename or delete the old course, or restore the archive with a new name.  When '
+		. 'restoring a course with a new name, the name is used as the course ID, and must contain only '
+		. 'letters, numbers, hyphens, and underscores, and may have at most 40 characters.') =%>
+</p>
+<p class="mb-0">
+	<%= maketext('Archived courses are located inside the "archives" directory of the "admin" course.  Use '
+		. 'the "File Manager" to upload additional .tar.gz files to be unarchived.') =%>
+</p>
diff --git a/templates/HelpFiles/AdminUpgradeCourses.html.ep b/templates/HelpFiles/AdminUpgradeCourses.html.ep
new file mode 100644
index 0000000000..7e41a6ff81
--- /dev/null
+++ b/templates/HelpFiles/AdminUpgradeCourses.html.ep
@@ -0,0 +1,24 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Upgrade Courses Help');
+%
+<p class="mb-0">
+	<%= maketext('Select which courses to upgrade from a previous version of WeBWorK.  The upgrade process can add '
+		. 'missing database columns, delete unused database columns, and check the course file structure.  Be sure '
+		. 'to read over the changes before confirming the upgrade.  You may want to create an archive of the course '
+		. 'before upgrading.  Only courses that need upgraded will be selectable.') =%>
+</p>
diff --git a/templates/HelpFiles/Grades.html.ep b/templates/HelpFiles/Grades.html.ep
new file mode 100644
index 0000000000..a2266c4aaa
--- /dev/null
+++ b/templates/HelpFiles/Grades.html.ep
@@ -0,0 +1,39 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Grades Help');
+%
+<p>
+	<%= maketext(q{This page shows the student's current grades for all sets they are assigned to.  Only visible sets }
+		. 'are shown to the student, while invisible set names are italic when viewed as an instructor.  Students can '
+		. 'only see the per problem grades on open assignments.') =%>
+</p>
+<p>
+	<%= maketext('The total grade row at the bottom shows the total score and percent average over all open '
+		. 'assignments.  The total grade row can be shown/hidden under general course configuration settings.') =%>
+</p>
+<p class="m-0">
+	<%== maketext(
+		'Additional (external) grades can be shown on this page by placing them in the CSV file [_1].  The first six '
+			. 'columns must be (in order): Student ID, Username, Last Name, First Name, Section, Recitation.  The '
+			. 'remaining columns can list any external grades.  To display the grades, the CSV file is merged with '
+			. 'the "Email" message [_2], which will be rendered and displayed below the grade table.  The message can '
+			. 'be created on the "Email" page and the CSV file can be created/uploaded using the "File Manager".  '
+			. 'External grades can only be displayed here and are not included in any totals or statistics.',
+		'<code>[Scoring]/report_grades_data.csv</code>',
+		'<code>[TMPL]/email/report_grades.msg</code>',
+	) =%>
+</p>
diff --git a/templates/HelpFiles/Hardcopy.html.ep b/templates/HelpFiles/Hardcopy.html.ep
new file mode 100644
index 0000000000..e1ecb92c74
--- /dev/null
+++ b/templates/HelpFiles/Hardcopy.html.ep
@@ -0,0 +1,62 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Hardcopy Help');
+%
+<p>
+	<%= maketext('Generate hardcopies of assignments in PDF or latex format. To produce a '
+		. 'hardcopy, one selects the users on the left and the sets on the right. '
+		. 'All users and sets are listed.') =%>
+</p>
+<p>
+	<%= maketext('In both cases, one can select the sort field, the format of the display list, and the filter. '
+		. '"Change Display Settings" must be clicked to update the list.') =%>
+</p>
+<p>
+	<%= maketext('There are many options available at the bottom:') =%>
+</p>
+<dl>
+	<dt><%= maketext('Show') %></dt>
+	<dd><%= maketext('Toggle each of the options to include or not include in the output.') %> </dd>
+
+	<dt><%= maketext('Hardcopy Format') %></dt>
+	<dd>
+		<%= maketext('If "TeX Source" is selected, a zip file containing a TeX file and other files needed to generate '
+			. 'a PDF hardcopy will be produced. If "Adobe PDF" is selected then only a PDF file will be produced.') =%>
+	</dd>
+
+	<dt><%= maketext('Show Problem Source File') %></dt>
+	<dd><%= maketext('If selected, the file path of the problem source will be printed in the output.') %></dd>
+
+	<dt><%= maketext('Hardcopy Theme') %></dt>
+	<dd>
+		<%= maketext('Choose from the available hardcopy layout themes. '
+			. 'To create a new hardcopy theme, visit the Problem Editor, Generate Hardcopy tab. '
+			. 'New hardcopy themes will be stored in the templates/hardcopyThemes/ folder.') %> </dd>
+</dl>
+<p>
+	<%== maketext('Once "Generate Hardcopy for selected sets and selected users" is clicked a file in the selected '
+		. 'hardcopy format will be generated and offered for download. If PDF output was selected, a single PDF file '
+		. 'is generated. If TeX output is selected, a zip file is generated that contains all files needed to '
+		. 'generated the hardcopy PDF file via [_1]. The main TeX file is called [_2].',
+		'<code>pdflatex</code>', '<code>hardcopy.tex</code>') =%>
+</p>
+<p class="mb-0">
+	<%= maketext('Note that if there are errors, they will be shown at the top of the page. '
+		. 'In some cases, a hard copy is still generated and a link called "Download Hardcopy" '
+		. 'appears. In addition, the latex file, log and error files are generated which can '
+		. 'be used in troubleshooting.') =%>
+</p>
diff --git a/templates/HelpFiles/InstructorAchievementEditor.html.ep b/templates/HelpFiles/InstructorAchievementEditor.html.ep
new file mode 100644
index 0000000000..ef58be5aba
--- /dev/null
+++ b/templates/HelpFiles/InstructorAchievementEditor.html.ep
@@ -0,0 +1,67 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Achievement Evaluator Editor Help');
+%
+<p>
+	<%= maketext('An achievement evaluator is a perl script that is run after each problem is submitted which returns '
+		. 'a truth value of 0 (didn\'t earn) or 1 (earn). The evaluator is given access to different variables which '
+		. 'contain data about the problem and set that is used to determine if the achievement is earned or not.') =%>
+</p>
+<p>
+	<%= maketext('Use the editor to edit the evaluator and the action form at the bottom to save the evaluator. You '
+		. 'can either overwrite the current evaluator file or save as a new evaluator file.') =%>
+</p>
+<h2><%= maketext('Evaluator Variables') %></h2>
+<p>
+	<%= maketext('Here is a list of the variables the evaluator has access to. Unless indicated, changes to the '
+		. 'variables will not be saved.  Evaluators are run in the same order they are listed on the achievement '
+		. 'editor page and are only run if the achievement has not been earned. Keep this in mind when using '
+		. 'persistent global data.') =%>
+</p>
+<ul>
+	<li><code>$problem</code>:
+		<%= maketext('A hash reference which contains the problem data.') =%>
+	</li>
+	<li><code>$set</code>:
+		<%= maketext('A hash reference which contains the set data.') =%>
+	</li>
+	<li><code>@setProblems</code>:
+		<%= maketext('An array which lists the hash reference of all the problems in the current set.') =%>
+	</li>
+	<li><code>$counter</code>:
+		<%= maketext('The current value of the achievement counter. Changes to this variable will be saved.') =%>
+	</li>
+	<li><code>$maxCounter</code>:
+		<%= maketext('The goal value of the achievement counter.') =%>
+	</li>
+	<li><code>$tags</code>:
+		<%= maketext('A hash reference which contains a problems metadata, such as DBsubject, DBchapter, DBsection, '
+			. ' and so on.') =%>
+	</li>
+	<li><code>$userAchievements</code>:
+		<%= maketext('A hash reference in which the keys are the achievement_id\'s assigned to the current user and '
+			. 'the values are 0 or 1 which stores if the user has earned the associated achievement or not.') =%>
+	</li>
+	<li><code>$localData</code>:
+		<%= maketext('A hash reference which saves data for this user and this achievement. This hash is persistent '
+			. 'between evaluations and changes to this variable will be saved in the database.') =%>
+	</li>
+	<li><code>$globalData</code>:
+		<%= maketext('A hash reference which saves global data for this user. This hash is persistent between '
+			. 'evaluations and changes to this variable will be saved in the database.') =%>
+	</li>
+</ul>
diff --git a/templates/HelpFiles/InstructorAchievementList.html.ep b/templates/HelpFiles/InstructorAchievementList.html.ep
new file mode 100644
index 0000000000..c35fa912c6
--- /dev/null
+++ b/templates/HelpFiles/InstructorAchievementList.html.ep
@@ -0,0 +1,132 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Achievement Editor Help');
+%
+<p>
+	<%= maketext('Manage achievements for the course.  The actions allow one to edit, assign, import, export, score, '
+		. 'create, or delete achievements.  The action form is at the top to select the desired action and options to '
+		. 'perform when the submit button is pressed.  Below the action form is the list of all the '
+		. 'achievements, ordered by their achievement "Number".') =%>
+</p>
+<p>
+	<%= maketext('Achievements are evaluated in the order shown below, with the exception of "level" achievements.  '
+		. 'Achievements in the "level" category are evaluated first and control the XP thresholds and rewards '
+		. '(achievement items) for reaching each level. Achievements in the "secret" category are not shown to '
+		. 'students until they earn the achievement, and is used for fun/surprise achievements.') =%>
+</p>
+<p>
+	<%= maketext('Achievements in the same category, with sequential numbers, and whose ID starts with the same '
+		. '"prefix_" (up to the last underscore), are treated as achievement chains.  Achievement chains are a '
+		. 'sequence of achievements which build upon themselves, such as complete one problem, complete 10 problems, '
+		. 'complete 25 problems, and so on. Students will only see the achievements in the chain they have completed '
+		. 'or are currently working on.') =%>
+</p>
+<h2><%= maketext('Achievement options') %></h2>
+<ul>
+	<li>
+		<strong><%= maketext('Achievement ID:') %></strong>
+		<%= maketext('A unique key identifying the achievement.') =%>
+	</li>
+	<li>
+		<strong><%= maketext('Name:') %></strong>
+		<%= maketext('The visible name/title of the achievement.') =%>
+	</li>
+	<li>
+		<strong><%= maketext('Category:') %></strong>
+		<%= maketext('Groups types of achievements. The "level" and "secret" categories are special (described '
+			. 'above), and categories can be used to create achievement chains.') =%>
+	</li>
+	<li>
+		<strong><%= maketext('Number:') %></strong>
+		<%= maketext('Sets the order in which achievements are listed and evaluated.') =%>
+	</li>
+	<li>
+		<strong><%= maketext('Enabled:') %></strong>
+		<%= maketext('Controls if an achievement is evaluated or not.') =%>
+	</li>
+	<li>
+		<strong><%= maketext('Points:') %></strong>
+		<%= maketext('The number of points earned for earning the achievement.') =%>
+	</li>
+	<li>
+		<strong><%= maketext('Counter:') %></strong>
+		<%= maketext('Used for "counting" achievements, which sets the value a counter must reach in order to earn '
+			. 'the achievement. For example this is used counting the number of completed problems.') =%>
+	</li>
+	<li>
+		<strong><%= maketext('Description:') %></strong>
+		<%= maketext(
+			'The description shown to students which states what action is needed to earn the achievement.') =%>
+	</li>
+	<li>
+		<strong><%= maketext('Evaluator File:') %></strong>
+		<%= maketext('Name of the evaluator file used to evaluate the achievement.') =%>
+	</li>
+	<li>
+		<strong><%= maketext('Icon File:') %></strong>
+		<%= maketext('Name of the image used for the achievement icon.') =%>
+	</li>
+	<li>
+		<strong><%= maketext('Type:') %></strong>
+		<%= maketext('Select which assignment types (homework, tests, just-in-time) the achievement is evaluated.') =%>
+	</li>
+</ul>
+<h2><%= maketext('How to:') %></h2>
+<dl>
+	<dt><%= maketext('Edit achievement information') %></dt>
+	<dd>
+		<%= maketext('You can edit a single achievement by clicking on the pencil icon next to the achievement ID.  '
+			. 'You can edit multiple achievements by selecting which achievements to edit, then click the '
+			. '"Edit" button. You can edit all of the achievements by changing which achievements to edit form '
+			. '"selected achievements" to "all achievements", or click the checkbox next to the Achievement ID to '
+			. 'select all achievements.') =%>
+	</dd>
+
+	<dt><%= maketext('Import/export achievements') %></dt>
+	<dd>
+		<%= maketext('You can import/export from their respective action tab.  Exporting saves information about the '
+			. 'achievement as a .axp file which is a CSV that lists each achievements information.  You can import '
+			. '.axp files that have been previously exported.') =%>
+	<dd>
+
+	<dt><%= maketext('Assign achievements') %></dt>
+	<dd>
+		<%= maketext('You can assign selected achievements to all users by using the "Assign" action action and '
+			. 'selecting which achievements to assign.  You can select which users to assign/unassign to an '
+			. 'achievement by clicking on the link in the "Edit Users" column.') =%>
+	</dd>
+
+	<dt><%= maketext('Export achievement data') %></dt>
+	<dd>
+		<%= maketext('The "Score" tab will export achievement data to a CSV file that can be downloaded.  The export '
+			. 'contains the global data including number of achievement points and current level of each student.  '
+			. 'In addition for each selected achievement, a column for if the achievement was earned (1) or not earned '
+			. '(0) will be added to the CSV.') =%>
+	</dd>
+
+	<dt><%= maketext('Create/Delete achievements') %></dt>
+	<dd>
+		<%= maketext('Use the "Create" and "Delete" actions to create or delete achievements. Note that deleting an '
+			. 'achievement will delete all data associated to the achievement and cannot be undone.') =%>
+	</dd>
+
+	<dt><%= maketext('Edit achievement evaluator') %></dt>
+	<dd>
+		<%= maketext('The achievement evaluator is the perl code that is run after each submit to determine if an '
+			. 'achievement is earned or not.  Click on the "Edit Evaluator" link to edit the evaluator.') =%>
+	</dd>
+</dl>
diff --git a/templates/HelpFiles/InstructorAchievementUserEditor.html.ep b/templates/HelpFiles/InstructorAchievementUserEditor.html.ep
new file mode 100644
index 0000000000..d0305cb749
--- /dev/null
+++ b/templates/HelpFiles/InstructorAchievementUserEditor.html.ep
@@ -0,0 +1,26 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Achievement User Editor Help');
+%
+<p class="mb-0">
+	<%= maketext('This form can assign, unassign, and edit user data for a single achievement.  You can assign the '
+		. 'achievement to all current users or select which users to assign the achievement to and click Save.  You '
+		. 'can unassign the achievement by unchecking a student\'s name (note all data will be deleted).  To unassign '
+		. 'the achievement from all users, first select "Allow unassign" and then click the "Unassign from All Users" '
+		. 'button. You can also toggle the earned status with the checkbox in the "Earned" column and edit the '
+		. 'achievement counter for counting achievements.') =%>
+</p>
diff --git a/templates/HelpFiles/InstructorAddUsers.html.ep b/templates/HelpFiles/InstructorAddUsers.html.ep
new file mode 100644
index 0000000000..06debd00c4
--- /dev/null
+++ b/templates/HelpFiles/InstructorAddUsers.html.ep
@@ -0,0 +1,28 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Add Users Help');
+%
+<p>
+	<%= maketext('Add users to the course.  Select the number of students/users to add and '
+		. 'then add any desired information.  The only mandatory information is the "Login Name". '
+		. 'Any other fields may be left blank.  The "Student ID" will be the initial password for '
+		. 'the user if provided.') =%>
+</p>
+<p class="mb-0">
+	<%= maketext('Multiple sets may be assigned to the users by holding down the shift key or the ctrl key while '
+		. 'selecting from the list.') =%>
+</p>
diff --git a/templates/HelpFiles/InstructorAssigner.html.ep b/templates/HelpFiles/InstructorAssigner.html.ep
new file mode 100644
index 0000000000..6a9fceef6b
--- /dev/null
+++ b/templates/HelpFiles/InstructorAssigner.html.ep
@@ -0,0 +1,29 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Set Assigner Help');
+%
+<p>
+	<%= maketext('Select Users from the left column and sets from the right column and assign or '
+		. 'unassign the given sets. The list of users or the list of sets can be reordered under the "sort" '
+		. 'option or the format of the user or set list.  Additionally, the set lists can be filtered '
+		. '(by section number or recitation).  The displayed user and set lists will only be updated '
+		. 'upon clicking "Change Display Settings".') =%>
+</p>
+<p class="mb-0">
+	<%= maketext('Multiple users or sets may be selected by holding down the shift key or the ctrl key while '
+		. 'selecting from the list.') =%>
+</p>
diff --git a/templates/HelpFiles/InstructorConfig.html.ep b/templates/HelpFiles/InstructorConfig.html.ep
new file mode 100644
index 0000000000..7692510c9a
--- /dev/null
+++ b/templates/HelpFiles/InstructorConfig.html.ep
@@ -0,0 +1,30 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Course Configuration Help');
+%
+<p>
+	<%= maketext('This page allows you to configure course settings such as permission levels, display modes '
+		. 'allowed, default display mode, email feedback behavior, and much more.') =%>
+</p>
+<p>
+	<%= maketext('Click on each of the tabs to view the configuration items. The question mark icon provides access '
+		. 'to information about the behavior of the configuration settings.') =%>
+</p>
+<p class="mb-0">
+	<%= maketext('Note that some settings require an additional page load after "Save Changes" is clicked in order '
+		. 'to take effect.  This is true for a theme change for example.') =%>
+</p>
diff --git a/templates/HelpFiles/InstructorFileManager.html.ep b/templates/HelpFiles/InstructorFileManager.html.ep
new file mode 100644
index 0000000000..bf2ecb0fb5
--- /dev/null
+++ b/templates/HelpFiles/InstructorFileManager.html.ep
@@ -0,0 +1,99 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('File Manager Help');
+%
+<p>
+	<%= maketext('This allows for the viewing, downloading, uploading and other management '
+		. 'of files in the course.  Select a file or set of files (using CTRL or SHIFT) and click '
+		. 'the desired button on the right.  Many actions can only be done with a single file (like '
+		. 'view). Selecting a directory or set of files and clicking "Make Archive" creates a compressed '
+		. 'tar file with the name COURSE_NAME.tgz' ) =%>
+</p>
+<p>
+	<%= maketext('The list of files include regular files, directories (ending in a "/") '
+		. 'and links (ending in a "@").') =%>
+</p>
+<p>
+	<%= maketext('Below the file list is a button and options for uploading files. Click the "Choose File" '
+		. 'button, select the file, then click "Upload". '
+		. 'A single file or a compressed tar (.tgz) file can be uploaded and if the option is selected, '
+		. 'the archive is automatically unpacked and deleted.  Generally the "automatic" option on Format '
+		. 'will correctly pick the correct type of file.') =%>
+</p>
+<p>
+	<%= maketext('WeBWorK expects many files to be in certain locations.  The following describe this. '
+	. 'Note that by default the File Manager shows the "templates" directory.  Other directories mentioned '
+	. 'below are at the same level and need to be accessed by going up a directory by clicking the "^" button '
+	. 'above the file list.') =%>
+</p>
+<h2><%= maketext('Locations of files:') %></h2>
+<dl>
+	<dt><%= maketext('Set definition (".def") files') %></dt>
+	<dd>
+		<%== maketext('These are stored in the templates directory. The format of '
+			. '<strong>Set Definition files</strong> is described in the <a [_1]>Set Definition specification</a>. '
+			. 'Set definition files are mainly useful for '
+			. 'transferring set assignments from one course to another and are created when exporting a problem '
+			. 'set from the "Hmwk Sets Editor".  Each set defintion file contains a list of problems used and the '
+			. 'dates and times. These definitions can be imported into the current course.',
+			'href="https://webwork.maa.org/wiki/Set_Definition_Files" target="Webworkdocs"') =%>
+	</dd>
+	<dt><%= maketext('Class list (".lst") files') %></dt>
+	<dd>
+		<%== maketext('The classlist files are stored in the templates directory and provide a convenient way to enter '
+			. 'a large number of students into your class. To view the format for <strong>ClassList files</strong> see '
+			. 'the <a [_1]>ClassList specification</a> or download the [_2] file and use it as a model. '
+			. 'ClassList files can be prepared using a spreadsheet and then saved as [_3] (comma separated values) '
+			. 'text files.  However, to access as a classlist file, the file suffix needs to be changed to [_4], '
+			. 'which can be done with the "Rename" button.',
+			'href="http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files" target="Webworkdocs"',
+			'<code>demoCourse.lst</code>','<code>.csv</code>','<code>.lst</code>') =%>
+	</dd>
+	<dt><%= maketext('Scoring (".csv") files') %></dt>
+	<dd>
+		<%== maketext('The scoring files are stored in the scoring directory and are produced using the "Scoring Tools" '
+			. 'page or the scoring command in the "Instructor Tools" module. These files can be downloaded, modified '
+			. 'in a spreadsheet (for example, to add midterm scores) and then uploaded again to the scoring directory '
+			. 'to be merged with email messages. (Use a new file name, other than [_1], when '
+			. 'uploading to prevent the scoring module from overwriting an uploaded file.)',
+			'<code>courseName_totals.csv</code>') =%>
+	</dd>
+	<dt><%= maketext('Problem (".pg") files') %></dt>
+	<dd>
+		<%= maketext('These are the files from which problems are generated and are located in the templates '
+			. 'directory or in subdirectories. They can be edited directly using the "Edit" link on each problem '
+			. 'page or from the "Hmwk Sets Editor". The File Manager allows you to upload or download these files. 	'
+			. 'Directories that start with "set" contain pg files and are generated when exporting a problem set in '
+			. 'which there are local versions of a problem.') =%>
+	</dd>
+	<dt><%= maketext('html directory') %></dt>
+	<dd>
+		<%= maketext('This directory is accessible from the web. You can use it to store html documents or image '
+			. 'documents that are used by the course. Do not store private information in this directory or in any '
+			. 'subdirectory thereof. These documents can be linked to from within problems using the htmlLink '
+			. 'macro.') =%>
+	</dd>
+	<dt><%= maketext('templates/email directory') %></dt>
+	<dd>
+		<%= maketext('This is where email messages and templates are saved. You can upload or download files '
+			. 'in this directory if you wish to save the files for later.') =%>
+	</dd>
+	<dt><%= maketext('templates/macros directory') %></dt>
+	<dd>
+		<%= maketext('Macro (".pl") files containing additional functionality for your course can be stored here.') =%>
+	</dd>
+</dl>
diff --git a/templates/HelpFiles/InstructorIndex.html.ep b/templates/HelpFiles/InstructorIndex.html.ep
new file mode 100644
index 0000000000..8d0e121838
--- /dev/null
+++ b/templates/HelpFiles/InstructorIndex.html.ep
@@ -0,0 +1,34 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Instructor Tools Help');
+%
+<p>
+	<%= maketext('This page is a collection of tools to modify users and sets.  These tools are short cuts for '
+		. 'common actions that allow selecting multiple users or sets to act on at once.  Because multiple users '
+		. 'and sets can be acted on at the same time, it is often more efficient to use this page when modifying '
+		. 'multiple items.  For example, after selecting several users and a set you can change the close date for '
+		. 'all selected users for that set.  This page also gives access to "View/Edit all sets for one user", '
+		. 'which can be used to access settings for all sets including test versions for that user.') =%>
+</p>
+<p class="mb-0">
+	<%= maketext('Use the "Users" and "Sets" forms to select which users and sets to act on.  Multiple items can be '
+		. 'selected using ctrl-click or shift-click.  The action buttons are grouped into three categories.  The '
+		. 'first is a set of actions that act on the selected users, the second is a set of actions that act on the '
+		. 'selected sets, and the third is a set of actions for acting on a combination of sets and users.  If an '
+		. 'invalid number of users or sets are selected, the action will not be preformed, and an error message '
+		. 'will be placed on the page.') =%>
+</p>
diff --git a/templates/HelpFiles/InstructorLTIUpdate.html.ep b/templates/HelpFiles/InstructorLTIUpdate.html.ep
new file mode 100644
index 0000000000..b3a3aff971
--- /dev/null
+++ b/templates/HelpFiles/InstructorLTIUpdate.html.ep
@@ -0,0 +1,31 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('LTI Grade Update Help');
+%
+<p class="m-0">
+	<%= maketext('This page gives information about mass LTI grade updates '
+		. 'and allows you to trigger a grade update. ') =%>
+	% if ($ce->{LTIGradeMode} eq 'course') {
+		<%= maketext('You may trigger a grade update for all users or just one user.') =%>
+	% } elsif ($ce->{LTIGradeMode} eq 'homework') {
+		<%= maketext('You may trigger a grade update for all users or just one user, '
+			. 'for all sets or just one set. When a user is selected, the menu '
+			. 'for sets is updated to only allow selecting sets assigned to the '
+			. 'selected user. Similarly when a set is selected, the user menu '
+			. 'is updated to only allow selecting valid users.') =%>
+	% }
+</p>
diff --git a/templates/HelpFiles/InstructorPGProblemEditor.html.ep b/templates/HelpFiles/InstructorPGProblemEditor.html.ep
new file mode 100644
index 0000000000..146a5a33be
--- /dev/null
+++ b/templates/HelpFiles/InstructorPGProblemEditor.html.ep
@@ -0,0 +1,189 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('PG Problem Editor Help');
+%
+<p>
+	<%= maketext('This page allows one to edit the contents of PG problem files as well '
+		. 'as set headers and other files.') =%>
+</p>
+<h2><%= maketext('Features:') %></h2>
+<dl class="list-group">
+	<dt><%= maketext('Links to pages that give information about writing problems:') %></dt>
+	<dd class="list-group-item">
+		<dl>
+			<dt>
+				<a href="https://webwork.maa.org/wiki/Category:Problem_Techniques" target="techniques_window">
+					<%= maketext('Problem Techniques') =%>
+				</a>
+			</dt>
+			<dd><%= maketext('This links to a list of problem authoring techniques.') %></dd>
+			<dt>
+				<a href="https://webwork.maa.org/wiki/Category:MathObjects" target="math_objects">
+					<%= maketext('Math Objects') %>
+				</a>
+			</dt>
+			<dd><%= maketext('This links to a page describing Math Object usage.') %></dd>
+			<dt><a href="https://webwork.maa.org/pod/" target="pod_docs"><%= maketext('POD') %></a></dt>
+			<dd>
+				<%= maketext('This link gives details for many macros. It links to documentation embedded in the '
+					. 'macro files themselves.') =%>
+			</dd>
+			<dt>
+				% if (-e "$ce->{courseDirs}{templates}/PGMLLab/PGML-lab.pg") {
+					<%= link_to maketext('PGML') => $c->systemLink(
+							url_for('problem_detail', setID => 'Undefined_Set', problemID => 1),
+							params => {
+								displayMode    => $ce->{pg}{options}{displayMode},
+								problemSeed    => 1234,
+								editMode       => 'temporaryFile',
+								sourceFilePath => 'PGMLLab/PGML-lab.pg'
+							}
+						),
+						target => 'PGML' =%>
+					% } else {
+						<a><%= maketext('PGML') %></a>
+					% }
+			</dt>
+			<dd>
+				<%= maketext('This links to a WeBWorK "problem" which allows you to try out fragments of PGML code. '
+					. 'This link will not be available if the file [_1] is not located in the templates directory of '
+					. 'the course.',
+					'PGMLLab/PGML-lab.pg') =%>
+			</dd>
+			<dt>
+				<a href="https://webwork.maa.org/wiki/Category:Authors" target="author_info">
+					<%= maketext('Author Info') %>
+				</a>
+			</dt>
+			<dd><%= maketext('This links to problem authoring information on the WeBWorK wiki.') %></dd>
+		</dl>
+	</dd>
+	<dt><%= maketext('The large text window') %></dt>
+	<dd class="list-group-item">
+		<%= maketext('This is where you edit the text of the problem template. Type Ctrl-Enter while this '
+			. 'window has focus to re-render the problem. Code folding is enabled either by clicking on '
+			. 'the triangles in the gutter next to line numbers or using the shortcut Shift-Ctrl-F.  Folding '
+			. 'all regions can be accomplished with Shift-Ctrl-A and unfold all regions with Shift-Ctrl-G. '
+			. 'Comments can be toggled with Ctrl-/.') =%>
+	</dd>
+	<dt><%= maketext('Text Editor Options') %></dt>
+	<dd class="list-group-item">
+		<dl>
+			<dt><%= maketext('Theme') %></dt>
+			<dd><%= maketext('Select your favorite theme for the large text window.') %></dd>
+			<dt><%= maketext('Key Map') %></dt>
+			<dd>
+				<%= maketext('The key maps that are available are "default", "emacs", "sublime", and "vim". The '
+					. '"default" key map has the standard behavior of a browser text area. You can use Ctrl-C to copy, '
+					. 'Ctrl-V to paste, Ctrl-F to search, etc. If you are more comfortable with the "emacs", '
+					. '"sublime", or "vim" text editors then you may choose to use one of those key maps instead.') =%>
+			</dd>
+			<dt><%= maketext('Enable Spell Checking') %></dt>
+			<dd>
+				<%= maketext('Spell check the text of the file that your are editing. Note that there will be many '
+					. 'spelling errors in the code parts of your file.') =%>
+			</dd>
+		</dl>
+	</dd>
+</dl>
+
+<h2><%= maketext('Actions:') %></h2>
+<i><%= maketext('(If an action cannot be executed it will not appear.)') %></i>
+<dl>
+	<dt><%= maketext('View/Reload') %></dt>
+	<dd>
+		<%= maketext('Render or re-render the problem, course info file, or set header being edited. This does not '
+			. 'change the permanent file on the disk. You can view different versions of the same problem by changing '
+			. 'the seed. You can also change the manner in which the mathematics is typeset. If "Open in new window" '
+			. 'is checked, then the problem will open in a new tab or window showing the problem as it will be '
+			. 'rendered for students in the set.') =%>
+	</dd>
+
+	<dt><%= maketext('Generate Hardcopy') %></dt>
+	<dd>
+		<p>
+		<%= maketext('Generate a hardcopy of the problem being edited. This does not change the permanent file on the '
+			. 'disk. You can generate a hardcopy for different versions of the same problem by changing the seed. You '
+			. 'can also change the format to "PDF" or "TeX Source". If "PDF" is selected, then a PDF file will be '
+			. 'generated for download, unless there are errors. If errors occur or "TeX Source" is selected, then a '
+			. 'zip file will be generated for download that contains the TeX source file and resources needed for '
+			. 'generating the PDF file using pdflatex.') =%>
+		</p>
+		<p>
+		<%= maketext('You can also click "Edit Selected Theme" to edit a hardcopy theme.  The new theme will be saved to '
+			. 'the templates/hardcopyThemes folder.') =%>
+		</p>
+	</dd>
+
+	<dt><%= maketext('Tidy Code') %></dt>
+	<dd>
+		<%= maketext('Reformat the code using perltidy. This will change the code in the editor window, and save '
+			. 'changes to the temporary file. In some cases (if the code contains backslashes or double tildes) this '
+			. 'can result in odd spacing in the code. So make sure to inspect the formatted code, and edit further or '
+			. 'revert if needed.') =%>
+	</dd>
+
+	<dt><%= maketext('Save') %></dt>
+	<dd>
+		<%= maketext('Save the contents of the editor window to the file on disk and re-render the problem. If '
+			. '"Open in new window" is checked, then the problem will open in a new tab or window showing the problem '
+			. 'as it will be rendered for students in the set. If "Create backup" is checked then a backup of the '
+			. 'current file on disk will be created before overwriting it with the contents of the editor window. If a '
+			. 'backup already exists, then a "Delete oldest backup" check box will be present. If that is checked, '
+			. 'then the oldest backup will be deleted when "Save" is clicked. These backups can be reverted '
+			. 'to and managed on the "Revert" tab.') =%>
+	</dd>
+
+	<dt><%= maketext('Save As') %></dt>
+	<dd>
+		<p>
+			<%= maketext(q{Makes a new copy of the file you are editing at the location relative to the course's }
+				. 'templates (~[TMPL~]) directory. You may choose to replace the current problem in the current set, '
+				. 'append to the end to then end of the current set as a new problem, or create a problem that is not '
+				. 'attached to a problem set.') =%>
+		</p>
+		<p>
+			<%= maketext('You may want to create an unattached problem if you are using the current problem as a model '
+				. 'for a new problem. You can add the new file to a homework set from the Library Browser or via the '
+				. 'set detail page of the Hmwk Sets Editor.') =%>
+		</p>
+		<p>
+			<%= maketext('If the original problem can not be edited than the path name must be changed in order to be '
+				. 'allowed to save the problem. Adding "local/" to the beginning of the original path is the default '
+				. 'solution. All locally created and edited files will then appear in a subdirectory named '
+				. '"local".') =%>
+		</p>
+		<p class="mb-0">
+			<%= maketext('A new problem whose path ends in newProblem.pg should be given a new name, for example, '
+				. '"myNewProblem.pg".') =%>
+		</p>
+	</dd>
+
+	<dt><%= maketext('Append') %></dt>
+	<dd>
+		<%= maketext('Add this problem as the last problem of an existing set, either as a problem or as the set '
+			. 'header (the text that appears on the home page of a homework set). You can rearrange the order of the '
+			. 'problems later using the "Hmwk Sets Editor".') =%>
+	</dd>
+
+	<dt><%= maketext('Revert') %></dt>
+	<dd>
+		<%= maketext('Reverts to the copy of the file saved on the disk or to a backup file. All unsaved editing '
+			. 'changes will be lost. This option is only active when a temporary file or a backup file exists. You '
+			. 'may also delete backups that have been made with this tab.') =%>
+	</dd>
+</dl>
diff --git a/templates/HelpFiles/InstructorProblemGrader.html.ep b/templates/HelpFiles/InstructorProblemGrader.html.ep
new file mode 100644
index 0000000000..1eff51b5ce
--- /dev/null
+++ b/templates/HelpFiles/InstructorProblemGrader.html.ep
@@ -0,0 +1,31 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Manual Grader Help');
+%
+<p>
+	<%= maketext('This page is for manually grading a problem for all assigned students.  The table of students '
+		. 'shows their last answers, percent score, and feedback comment.  The "Save" button is located below the '
+		. q(table to save any changes.  Each student's name links to that student's problem and opens up the )
+		. 'single problem grader, which grades a single student at a time.') =%>
+</p>
+<p class="m-0">
+	<%= maketext('The problem is shown at the top with the seed and answers of the selected student.  Use the drop '
+		. q(down menu to change which student's seed and answers are shown.  Use the "Mark Correct" checkbox to set )
+		. 'the score to 100%.  The feedback comment can contain LaTeX formulas using the deliminator "\\\\( ... \\)" '
+		. q(for math mode, and is placed above the student's problem.  Students can access the feedback comments by )
+		. 'going to the page for the associated set and problem number.') =%>
+</p>
diff --git a/templates/HelpFiles/InstructorProblemSetDetail.html.ep b/templates/HelpFiles/InstructorProblemSetDetail.html.ep
new file mode 100644
index 0000000000..bf1ba3cdfd
--- /dev/null
+++ b/templates/HelpFiles/InstructorProblemSetDetail.html.ep
@@ -0,0 +1,165 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Set Detail Help');
+%
+<h2><%= maketext('Editing Modes') %></h2>
+<p><%== maketext('The <strong>Set Detail</strong> page can be viewed in one of two distinct modes:') %></p>
+<ul>
+	<li><%= maketext('Editing for all students') %></li>
+	<li><%= maketext('Editing for one student or a proper subset of all students') %></li>
+</ul>
+
+<%= maketext('The current mode should be made clear by the information at the top of the page.') =%>
+
+<h2><%= maketext('Page Contents') %></h2>
+<ul>
+	<li><%= maketext('General Information') %></li>
+	<li><%= maketext('Headers') %></li>
+	<li><%= maketext('Problems') %></li>
+</ul>
+
+<h2><%= maketext('Form Elements Present on the Page') %></h2>
+<dl>
+	<dt><%= maketext('Save Changes') %></dt>
+	<dd>
+		<%== maketext('This button is present both at top and the bottom of the page. Any and all changes made to any '
+			. 'part of the set will be saved with one important exception: When editing the set for one or more '
+			. 'students, you can choose to override the default value (defined for the set in general) by clicking on '
+			. 'the checkbox and providing a value (or possibly leaving blank) and checking the override checkbox. If '
+			. 'you do <strong>NOT</strong> check the checkbox, the override value will be discarded and the default '
+			. 'value for the set will be used for the users currently being edited.') =%>
+	</dd>
+
+	<dt><%= maketext('Reset Form') %></dt>
+	<dd>
+		<%= maketext('This button is also present both at top and the bottom of the page. Discards all changes, '
+			. 'reloading the page by re-reading the database information for this set.') =%>
+	</dd>
+
+	<dt><%= maketext('Renumber Problems') %></dt>
+	<dd>
+		<%= maketext('Renumber problems consecutively starting from 1. This renumbering is not saved until '
+			. '"Save Changes" is clicked.') =%>
+	</dd>
+
+	<dt><%= maketext('Render All') %></dt>
+	<dd><%= maketext('Render all problems on the page. This does not reload the page or save or reset changes.') %></dd>
+
+	<dt><%= maketext('Hide All') %></dt>
+	<dd><%= maketext('Hide all rendered problems on the page.') %></dd>
+
+	<dt><%= maketext('Expand All Details') %></dt>
+	<dd>
+		<%= maketext('Expand problem details that have been collapsed. Note that the details of a single problem can '
+			. 'be expanded by clicking on the down arrow to the right of the problem source file.') =%>
+	</dd>
+
+	<dt><%= maketext('Collapse All Details') %></dt>
+	<dd>
+		<%= maketext('Collapse problem details to the top row of information about a problem. Note that the details '
+			. 'of a single problem can be collapsed by clicking on the up arrow to the right of the problem source '
+			. 'file.') =%>
+	</dd>
+
+	<dt><%= maketext('Expand All Nesting') %></dt>
+	<dd>
+		<%= maketext('Only present for JITAR sets. Expand JITAR nested problem groups that have been collapsed. Note '
+			. 'that the nesting of a single problem group can be expanded by clicking on the right arrow to the right '
+			. 'of the problem number.') =%>
+	</dd>
+
+	<dt><%= maketext('Collapse All Nesting') %></dt>
+	<dd>
+		<%= maketext('Only present for JITAR sets. Collapse JITAR nesting problem groups to the top row of information '
+			. 'about a problem. Note that the nesting of a single problem group can be collapsed by clicking on the '
+			. 'down arrow to the right of the problem number.') =%>
+	</dd>
+
+	<dt><%= maketext('Display Mode') %></dt>
+	<dd><%= maketext('Select the display mode used to render the problems on this page.') %></dd>
+
+	<dt><%= maketext('Automatically render problems on page load.') %></dt>
+	<dd>
+		<%= maketext('Automatically render all problems in the set on this page when "Save Changes" or "Reset Form" '
+			. 'is clicked.') =%>
+	</dd>
+
+	<dt><%= maketext('Force problems to be numbered consecutively from one') %></dt>
+	<dd>
+		<%= maketext('Renumber problems in the set consecutively starting from one. In the process of deleting '
+			. 'problems, the numbering can be made non-consecutive. This is useful to clean up the problem '
+			. 'numbering.') =%>
+	</dd>
+
+	<dt><%= maketext('Add n blank problem template(s) to the end of homework set.') %></dt>
+	<dd>
+		<%= maketext('Adds new template problems to the set when the set is saved. You can modify the template '
+			. 'to create your own problem, by clicking on the "Edit Problem" link and saving to some new '
+			. 'file, e.g. "myNewProblem.pg".') =%>
+	</dd>
+</dl>
+
+<h2><%= maketext('General Page Information') %></h2>
+<dl>
+	<dt><%= maketext('Reordering Problems') %></dt>
+	<dd>
+		<%= maketext('You can reorder problems by clicking on the arrow icon and dragging the problem. You will see a '
+			. 'box showing you where the problem will be placed. When problems are reordered any holes in the '
+			. 'numbering will be filled in.') =%>
+	</dd>
+
+	<dt><%= maketext('Deleting Problems') %></dt>
+	<dd>
+		<%= maketext('You can delete problems by clicking the "Delete it?" check box and saving. If the set is already '
+			. 'active it is recommended that you instead use the "Mark Correct?" problem to mark a particular problem '
+			. 'correct for all students.') =%>
+	</dd>
+
+	<dt><%= maketext('Rendering Problems') %></dt>
+	<dd>
+		<%= maketext('You can render a problem by clicking the "Render Problem" icon to the right of the problem '
+		. 'number. The display mode used to render the problem is chosen using the drop down menu. You can render all '
+		. 'problems using the "Render All" button. "Hide All" will hide all rendered problems. It is also useful to '
+		. 'collapse problem details when doing this, as it makes it easier to drag problems around.') =%>
+	</dd>
+
+	<dt><%= maketext('Editing Problems') %></dt>
+	<dd>
+		<%= maketext('You can edit a problem by clicking the "Edit Problem" icon to the right of the problem number. '
+			. 'This will open the problem in the PG problem editor in a new tab or window.') =%>
+	</dd>
+
+	<dt><%= maketext('Viewing Problems in a New Window') %></dt>
+	<dd>
+		<%= maketext('If you click on the "Open in New Window" icon to the right of the problem number, then the '
+			. 'problem will open in the actual homework set in a new tab or window.') =%>
+	</dd>
+
+	<dt><%= maketext('Grading Problems') %></dt>
+	<dd>
+		<%= maketext('If you click on the "Grade Problem" icon to the right of the problem number, then the problem '
+			. 'will open in the manual problem grader. This page shows the rendered problem and lists all students '
+			. 'assigned to the set and the last answer the students entered for the problem. You can then change the '
+			. 'recorded scores for students on this problem and provide instructor feedback comments.') =%>
+	</dd>
+
+	<dt><%= maketext('Problem Paths') =%></dt>
+	<dd>
+		<%= maketext('All of the paths for problem files are relative to the templates directory of the current '
+			. 'course. You can access this directory "directly" using the File Manager page.') =%>
+	</dd>
+</dl>
diff --git a/templates/HelpFiles/InstructorProblemSetList.html.ep b/templates/HelpFiles/InstructorProblemSetList.html.ep
new file mode 100644
index 0000000000..5ae78ad5cb
--- /dev/null
+++ b/templates/HelpFiles/InstructorProblemSetList.html.ep
@@ -0,0 +1,91 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Homwork Sets Editor Help');
+%
+<p>
+	<%= maketext('This page manages all of the homework sets (including quizzes/tests). '
+		. 'The following allow editing directly of a single problem set.') =%>
+</p>
+<dl>
+	<dt><%= maketext('"Edit Problems" column') %></dt>
+	<dd>
+		<%= maketext('Indicates the number of problems in the set. Clicking on the link opens the set detail page '
+			. 'which allows you to modify set parameters, edit set headers, and change parameters of problems in the '
+			. 'set such as the number of allowed attempts or the weight (credit value). You can also add, remove, '
+			. 'view, edit, and reorder the problems in the set.') =%>
+	</dd>
+	<dt><%= maketext('"Edit Assigned Users" column') %></dt>
+	<dd>
+		<%= maketext('Shows how many instructors and students have been assigned this problem set, out of the total '
+			. 'number in the class. Clicking on this link allows you to assign the set to users, unassign this '
+			. 'set from users, and to individually edit the assignment for specific users. For changing dates for '
+			. 'individual users there are also shortcuts from the "Instructor Tools" link.') =%>
+	</dd>
+	<dt><%= maketext('Changing dates') %></dt>
+	<dd>
+		<%= maketext('Dates for problem sets can be edited by clicking the pencil icon in the "Edit Set Data" column '
+			. 'next to the set name. To change dates for several sets at once, click the check box in the "Select" '
+			. 'column and choose "Edit selected" from the tasks above.') =%>
+	</dd>
+</dl>
+<h2><%= maketext('Primary Actions') %></h2>
+<dl>
+	<dt><%= maketext('Filter') %></dt>
+	<dd><%= maketext('Display sets matching a selected criteria. Useful if there are many sets.') %></dd>
+
+	<dt><%= maketext('Sort') %></dt>
+	<dd><%= maketext('Sorts the lists displayed by due date, name, etc.') %></dd>
+
+	<dt><%= maketext('Edit') %></dt>
+	<dd><%= maketext('The sets checked below will become available for editing the due dates and visibility.') %></dd>
+
+	<dt><%= maketext('Publish') %></dt>
+	<dd>
+		<%= maketext('The sets checked below will be visible to students or hidden from students. Useful for preparing '
+			. 'sets ahead of time, but not showing them to students; or for temporarily hiding a set which has a '
+			. 'mistake in it while it is being fixed.') =%>
+	</dd>
+
+	<dt><%= maketext('Import') %></dt>
+	<dd>
+		<%= maketext('Import a single set or multiple sets from a set definition file. '
+			. '(Use the "File Manager" to upload/download set definition files.) The "Shift Dates..." '
+			. 'option is useful for problem sets that were used from other courses and will shift all of '
+			. 'the dates.' ) =%>
+	</dd>
+
+	<dt><%= maketext('Export') %></dt>
+	<dd>
+		<%= maketext('The sets checked below will written to set definition files, to be saved for future use, or to '
+			. 'be transferred to another course. The set definition files can be uploaded/downloaded using the '
+			. '"File Manager".') =%>
+	</dd>
+
+	<dt><%= maketext('Score') %></dt>
+	<dd>
+		<%= maketext('Student scores for the sets selected below will be calculated. This and other scoring '
+			. 'operations can also be done using the "Scoring Tools" link.') =%>
+	</dd>
+
+	<dt><%= maketext('Create') %></dt>
+	<dd>
+		<%= maketext('Create a new set with a given name. This can either create an empty set or a duplicate of '
+			. 'an existing set.') =%>
+	</dd>
+	<dt><%= maketext('Delete') %></dt>
+	<dd><%= maketext('Delete the sets checked below. Be careful, this cannot be undone.') %></dd>
+</dl>
diff --git a/templates/HelpFiles/InstructorScoring.html.ep b/templates/HelpFiles/InstructorScoring.html.ep
new file mode 100644
index 0000000000..0e31f77de9
--- /dev/null
+++ b/templates/HelpFiles/InstructorScoring.html.ep
@@ -0,0 +1,84 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Scoring Tools Help');
+%
+<p>
+	<%= maketext('WeBWorK does not have a full featured scoring ability. We leave that to your favorite spreadsheet '
+		. 'application.') =%>
+</p>
+<p>
+	<%= maketext('What WeBWorK does have is good support for summarizing the scores on WeBWorK homework sets and '
+		. 'tests and exporting them in a form (.csv) which any spreadsheet can use. WeBWorK reports all of the '
+		. 'homework grades with options shown below.') =%>
+</p>
+<p>
+	<%== maketext('Select the sets you want scored, choose the name of the export file you want to use '
+		. '(by default: [_1]), and then click the "Score Selected Set(s) and save to" button.',
+			'<code>courseName_totals.csv</code>') =%>
+</p>
+<p>
+	<%= maketext('The following describes how the checkboxes alter the scoring output') =%>
+	<dl>
+		<dt><b><%= maketext('Pad Fields') %></b></dt>
+		<dd>
+			<%= maketext('If selected, this adds spaces between the fields to align the commas, which makes the '
+				. 'columns easy to read when in text form but it can confuse some spreadsheet applications since the '
+				. 'extra spaces violate the csv standard (although Excel handles them with no problem). This will give '
+				. 'a visual form of the CSV file that is easy to read on the page. If you want a reliable .csv file '
+				. 'for use in any spreadsheet application unclick the "Pad Fields" option. You can download the .csv '
+				. 'file immediately by clicking on the link with the filename chosen above, or you can download it '
+				. 'using the "File Manager" from the scoring directory.') =%>
+		</dd>
+		<dt><b><%= maketext('Record Scores for Single Sets') %></b></dt>
+		<dd>
+			<%== maketext('Select this if you want to save the scores for each set in a separate file in addition to '
+				. 'saving all scores to a cumulative file. After clicking the "Score Selected Set(s) and save to" '
+				. 'button, you will get a pair of links for each selected set. The file that ends with [_1] contains '
+				. 'the number of correct and incorrect tries about each individual problem for each student. The file '
+				. 'that ends with [_2] is a summary of each problem.',
+				'<code>ful.csv</code>','<code>scr.csv</code>') =%>
+		</dd>
+		<dt><b><%= maketext('Include Success Index') %></b></dt>
+		<dd>
+			<%= maketext('If this is selected, a success index is listed in each csv file. The success '
+				. 'index is a number assigned on the basis of the number of incorrect attempts (roughly equivalent '
+				. 'to 1/the number of attempts) which seems to correlate with the relative difficulty the student had '
+				. 'with the problem.') =%>
+		</dd>
+		<dt><b><%= maketext('Include percentage grades columns for all sets') %></b></dt>
+		<dd>
+			<%= maketext('As the checkbox says, this includes a percentage grade column for each set.') =%>
+		</dd>
+	</dl>
+</p>
+<p>
+	<%= maketext('To use the Email merge feature, upload a CSV with calculated grades to the scoring directory using '
+		. 'the "File Manager".') =%>
+</p>
+<p>
+	<%== maketext('Do NOT use the file name [_1], since you might accidentally overwrite that if you '
+		. 'again export your WeBWorK homework scores. (Actually the earlier file is moved to [_2]'
+		. ' -- so you can recover using the File Manager.)',
+		'<code>COURSENAME_totals.csv</code>', '<code>COURSENAME_totals_bak1.csv</code>') =%>
+</p>
+<p class="mb-0">
+	<%== maketext('If you upload your file on the web with the name: [_1] and also create an email message with the '
+		. 'name [_2] with the approriate [_3] variables then not only can you email the message with the embedded '
+		. 'grades to the students, but files with those exact names are automatically appended to the "Grades" page '
+		. 'seen by the students.',
+		'<code>report_grades_data.csv</code>', '<code>report_grade.msg</code>', '<code>$COL</code>') =%>
+</p>
diff --git a/templates/HelpFiles/InstructorSendMail.html.ep b/templates/HelpFiles/InstructorSendMail.html.ep
new file mode 100644
index 0000000000..9ba4e0e322
--- /dev/null
+++ b/templates/HelpFiles/InstructorSendMail.html.ep
@@ -0,0 +1,59 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Email Help');
+%
+<p>
+	<%= maketext('Use this page to send emails to active (enrolled or auditing) students.  Emails can be sent to '
+		. 'all active students or selected students.  Use the "Students" form to sort, filter, or format how '
+		. 'the user name is displayed.  Click "Change Display Settings" to apply any changes.  Use control-click '
+		. 'or shift-click to select multiple students to email.') =%>
+</p>
+<p>
+	<%= maketext('Emails can contain personalized data, such as name, section, or status.  Click "List of insertable '
+		. 'macros" for a full list available variables.  Additional personal data can be included by using a merge '
+		. 'file.  A merge file is a CSV file located in the ~[Scoring~] directory in which the first column is the '
+		. 'student id, followed by additional data (such as student grades).  This data is identified by which '
+		. 'column it is in, for instance if the scores where in the 4th column of the merge file, insert them into '
+		. 'an email using the variable $COL~[4~].  The "Scoring Tools" page can export grades into a CSV that can be '
+		. 'used as a merge file.  Upload customized merge files with the "File Manager".') =%>
+</p>
+<p>
+	<%= maketext('Use the "Merge file" drop down menu to select which merge file to use, or select "None" to not '
+		. 'use any merge file.  When a merge file is selected, the data for active students will be displayed '
+		. 'above the "Email Body".  This will show you the structure of the merge file and the column variables '
+		. 'associated with each column.  Data that is longer than 7 characters will be truncated, and the data can '
+		. 'be scrolled up and down to see all rows.') =%>
+</p>
+<p> <%= maketext('Preview the message before sending using the "Preview Message" button.  The preview shows the '
+		. 'email that would be sent to the first selected student or the instructor if no students were selected.  '
+		. 'The preview will also list all of the students that would receive their own personalized message.  If a '
+		. 'merge file was selected, the preview will also indicate which (if any) recipient\'s merge file data '
+		. 'could not be found.') =%>
+</p>
+<p>
+	<%= maketext('Messages can be saved to a message file (which must end in the ".msg" extension).  Use the '
+		. '"Message file" drop down menu to select which message file to load, or "None" to use a blank message. '
+		. 'To save a new message, use the "Save as" button after entering in a valid filename.  The "Save as" '
+		. 'button will not overwrite currently saved messages.  To edit a currently saved message first select it '
+		. 'using the drop down menu, then click the "Save" button to save any changes.  Use the "File Manager" to '
+		. 'delete messages, located in the "~[TMPL~]/email" directory.') =%>
+</p>
+<p class="mb-0">
+	<%= maketext('When the message is ready to send, click "Send Email". This will queue the email to be sent, which '
+		. 'can take several minutes depending on the number of students selected.  You will be notified by email '
+		. 'once all the emails have been sent.') =%>
+</p>
diff --git a/templates/HelpFiles/InstructorSetMaker.html.ep b/templates/HelpFiles/InstructorSetMaker.html.ep
new file mode 100644
index 0000000000..9731e164de
--- /dev/null
+++ b/templates/HelpFiles/InstructorSetMaker.html.ep
@@ -0,0 +1,60 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Library Broswer Help');
+%
+<p>
+	<%= maketext('This page is used to browse problems that will be used to fill problem sets. '
+		. 'The first step is to choose which set you are working on. If you need to create a new problem set '
+		. 'fill in the blank next to the "Create a New Set in This Course" button and then press the button. '
+		. 'Then choose which set you want to work on in the drop down menu.') =%>
+</p>
+<p>
+	<%= maketext('Use the options in the second box to pick a collection of problems decribed below. In each '
+		. 'case, clicking "View Problems" will render a fixed number of problems (default of 20). After '
+		. 'problems are shown, there will be options to show the next/previous batch of problems, add all problems '
+		. 'to the target set (set at the top of the page) or clear the curent batch of problems.') =%>
+</p>
+<dl>
+	<dt><%= maketext('Open Problem Library') %></dt>
+	<dd>
+		<%= maketext('This browses the Open Problem Library (OPL) in category (Subject/Chapter/Section) form. '
+			. 'Select the desired categories (all three do not need to be selected) and click "View Problems". '
+			. 'If the "Include Contrib" box is selected then those problems in the Contrib section of '
+			. 'the OPL that have the categories defined are also included. Contrib problems are problem that '
+			. q{haven't been vetted as thoroughly as OPL problems. If you want hints or solutions included while }
+			. 'browsing select the appropriate box.') =%>
+	</dd>
+	<dt><%= maketext('File Manager') %></dt>
+	<dd><%= maketext('This option shows all pg problems in the course directory structure.')%></dd>
+	<dt><%= maketext('Course Sets') %></dt>
+	<dd><%= maketext('This option shows all problems in sets that have been created in the course.') %></dd>
+	<dt><%= maketext('Set Definition Files') %></dt>
+	<dd>
+		<%= maketext('This option shows all problems in set definition files that are located in the course '
+			. 'directory.') =%>
+	</dd>
+	<dt><%= maketext('Other Options') %></dt>
+	<dd>
+		<%= maketext('The second row of the problem collection area is for browsing directories. The OPL '
+			. 'will be there as well as any other directories that you may set up (for example Contrib). If '
+			. 'this is selected, all subdirectories containing problems will be listed.') =%>
+	</dd>
+</dl>
+<p class="mb-0">
+	<%= maketext('The "Edit Target Set" button at the top of the page will take you to the Problem Set Editor '
+		. 'which will allow you to edit dates, assign users and other information about the problem set.') =%>
+</p>
diff --git a/templates/HelpFiles/InstructorShowAnswers.html.ep b/templates/HelpFiles/InstructorShowAnswers.html.ep
new file mode 100644
index 0000000000..b85c8ab305
--- /dev/null
+++ b/templates/HelpFiles/InstructorShowAnswers.html.ep
@@ -0,0 +1,24 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Answer Log Help');
+%
+<p class="m-0">
+	<%= maketext('Show past answers.  Students can only see their past answers, and they will not be able to see '
+		. 'which parts are correct.  Instructors can use the form to select any combination of users, sets, and '
+		. 'problems to view.  The table below will list the past answers colored according to correctness '
+		. '(green is correct).  Use control + click to select multiple users, sets, or problems.') =%>
+</p>
diff --git a/templates/HelpFiles/InstructorStats.html.ep b/templates/HelpFiles/InstructorStats.html.ep
new file mode 100644
index 0000000000..cd2fcac82e
--- /dev/null
+++ b/templates/HelpFiles/InstructorStats.html.ep
@@ -0,0 +1,29 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Statistics Help');
+%
+<p>
+	<%= maketext('The main page allows access to set and student statistics.  When selecting a student, their grades '
+		. 'page is shown, which lists set totals and per problem grades for each set assigned to the student.  When '
+		. 'selecting a set, various statistics and histograms are shown for the overall grades of students who are '
+		. 'currently enrolled or auditing the course.') =%>
+</p>
+<p class="mb-0">
+	<%= maketext('When viewing set statistics, the drop down menus can be used to show stats for individual sections, '
+		. 'recitations, or problems.  The overall results include all students who are assigned to the set, while the '
+		. 'individual problem results only include active (have attempted the problem) students.') =%>
+</p>
diff --git a/templates/HelpFiles/InstructorStudentProgress.html.ep b/templates/HelpFiles/InstructorStudentProgress.html.ep
new file mode 100644
index 0000000000..8796e163e7
--- /dev/null
+++ b/templates/HelpFiles/InstructorStudentProgress.html.ep
@@ -0,0 +1,33 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Student Progress Help');
+%
+<p>
+	<%= maketext('This page is useful for monitoring student progress on assignments. Student progress '
+		. 'can either be viewed for a single set or for a single student.') =%>
+</p>
+<p>
+	<%= maketext('When viewing student progress for a set, the score for the set and the status for problems in the '
+		. 'set are listed for all students.  The table can be sorted by clicking the links in the table header.  '
+		. q{Click the student's name to access the student's set.  When viewing progress for a test, additional }
+		. 'columns can be shown/hidden by updating the display at the top') =%>
+</p>
+<p class="mb-0">
+	<%= maketext('When viewing progress for a single student, their grades page is shown which lists set totals and '
+		. 'per problem grades for each set assigned to the student.  This shows the same information as the '
+		. 'statistics page for the student.') =%>
+</p>
diff --git a/templates/HelpFiles/InstructorUserDetail.html.ep b/templates/HelpFiles/InstructorUserDetail.html.ep
new file mode 100644
index 0000000000..557ccf7ea9
--- /dev/null
+++ b/templates/HelpFiles/InstructorUserDetail.html.ep
@@ -0,0 +1,38 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Sets assigned to student Help');
+%
+<p>
+	<%= maketext('A student must be assigned a homework set in order for it to appear on their WeBWorK home page. '
+		. 'Check the box in the left column to assign a student to that homework set. Uncheck the box to unassign a '
+		. q{student. If a student is unassigned from a homework set, all of the student's data for that homework set }
+		. 'is deleted and cannot be recovered. Use this action cautiously!') =%>
+</p>
+<p>
+	<%= maketext('Change the due dates for an individual student on this page. Check the checkbox and enter the new '
+		. 'date in order to override the date. (You can copy the date format from the date in the right hand column '
+		. 'which indicates the date when the homework set is due for the whole class.) Note that you should ensure '
+		. 'that the close date is before the answer date. If the close date for a student is extended until after the '
+		. 'class answer date for the set, then the answer date for the student must also be set to a later date. ') =%>
+</p>
+<p class="mb-0">
+	<%= maketext('Click on the homework set links to edit the grades for this individual student on the homework set. '
+		. '(The grade of each problem is called the "status".) You can also change the number of allowed attempts and '
+		. q{further modify the individual student's homework set.) You will also be able to change a student's seed }
+		. q{which determines the individual values used in the individual version of the student's problem and the }
+		. 'weight (how much a problem counts towards the grade.)') =%>
+</p>
diff --git a/templates/HelpFiles/InstructorUserList.html.ep b/templates/HelpFiles/InstructorUserList.html.ep
new file mode 100644
index 0000000000..c378fca891
--- /dev/null
+++ b/templates/HelpFiles/InstructorUserList.html.ep
@@ -0,0 +1,204 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Class List Editor Help');
+%
+<p>
+	<%== maketext('From this page you can <strong>add new students</strong>, <strong>edit</strong> class list data '
+		. '(name, email address, recitation, section, permission level, and enrollment status), '
+		. '<strong>change passwords</strong>, and <strong>export</strong> (save) class lists for back-up or use in '
+		. 'another course. You can also delete students from the class roster, but this cannot be undone.') =%>
+</p>
+<p>
+	<%= maketext('This page gives access to information about the student, independent of the homework sets '
+		. 'assigned to them.') =%>
+</p>
+<p><%= maketext('To perform an action select the desired action tab and click the submit button.') %></p>
+
+<h2><%= maketext('How to:') %></h2>
+<dl>
+	<dt><%= maketext('Restrict or sort the students displayed') %></dt>
+	<dd>
+		<%= maketext('When the class is very large not all students will be displayed. Using the first action on this '
+			. 'page you can show only the students from a given recitation or from a given section, or only students '
+			. 'whose login or last name fits a pattern match. The second action will sort the students currently being '
+			. 'displayed. You can also sort the displayed students by clicking on the active links at the top of '
+			. 'each column.') =%>
+	</dd>
+
+	<dt><%= maketext('Edit class list data') %></dt>
+	<dd>
+		<%= maketext('You can edit the class list data for a single student by clicking on the pencil icon next to '
+			. 'their login name. To edit several students at once click on the "Select" checkbox next to their names, '
+			. 'click on the radio button for editing selected users and then click the "Edit" button. You can also '
+			. 'edit all visible users (those students currently being displayed) or even all users in the course '
+			. 'although this last option might take a long time to load for a large class.') =%>
+	</dd>
+
+	<dd>
+		<%= maketext(q{The login name cannot be changed. (It is the primary key for the student's data.) If you make }
+			. 'a mistake in the login name at the beginning of the course (before any work has been done) then it is '
+			. 'best to simply add a new student with the correct entry and drop the student with the bad login name. '
+			. '(See drop and delete students below.) If the login name must be changed after a user has started '
+			. 'working assignments, then contact your system administrator, who can use the webwork2 '
+			. '"bin/change_user_id" script to change the user id.') =%>
+	</dd>
+
+	<dt><%= maketext('Add a few students to the course.') %></dt>
+	<dd>
+		<%= maketext('Click the "Add x student(s)" radio button and then click "Take action". This will take you to a '
+			. 'new page where the data can be entered for one or more students. It is also possible to assign the '
+			. 'student to one or more problem sets as they are being entered: simply select the homework sets from the '
+			. 'list below the data entry table. Use "command" or "control" click to select more than one '
+			. 'homework set.') =%>
+	</dd>
+
+	<dt><%= maketext('Add many students to a course from a class list.') %></dt>
+	<dd>
+		<%== maketext('This is most easily done by importing a class list. The class list can be uploaded from your '
+			. 'workstation to the server using the File Manager page. The class list must be a file ending in .lst and '
+			. 'must have a specific <a href="http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files">'
+			. 'format</a>. Once the file has been uploaded to the server the file will appear in the import action '
+			. 'pop-up list (5th action). demoCourse.lst is available for most courses and adds the "practice users" '
+			. 'which activate guest logins to the class list.') =%>
+	</dd>
+
+	<dt><%= maketext('Add a TA or an instructor (change permission level of user)') %></dt>
+	<dd>
+		<%= maketext('This is done by first entering the user as a student and then changing the permission level of '
+			. 'the user. First edit the user by clicking on the pencil next to their name (or using the technique '
+			. 'above for several users), then change their permssion level -- an entry blank at the far right of the '
+			. 'screen, you may have to scroll to see it. The permission levels are') =%>
+		<ul>
+			<li><%= maketext('Guest:') %> -5</li>
+			<li><%= maketext('Student:') %> 0</li>
+			<li><%= maketext('Proctor:') %> 2</li>
+			<li><%= maketext('TA:') %> 5</li>
+			<li><%= maketext('Instructor:') %> 10</li>
+		</ul>
+	</dd>
+		<%= maketext('Note that if you set the permission level of a user to something other than "Student", you may '
+			. 'also want to set the status of the user to "Observer".  Users with the "Observer" status are not '
+			. 'included in statistics, scoring, or instructor emails.') =%>
+	<dd>
+
+	</dd>
+
+	<dt><%= maketext('Drop student from the course') %></dt>
+	<dd>
+		<%= maketext('To drop a student or students, select them for editing as described above and then set the '
+			. 'pop-up list to enrolled,drop, or audit. Dropped students cannot log in to the course, are not assigned '
+			. 'new homework sets and are not sent e-mail. They can be re-enrolled simply by changing their status back '
+			. 'to enrolled. No data is lost, any homework sets assigned before they were dropped are restored '
+			. 'unchanged.') =%>
+	</dd>
+
+	<dt><%= maketext('Delete a student from a course') %></dt>
+	<dd>
+		<%= maketext('This should be done cautiously. Once a student is deleted from a course their data is lost '
+			. 'forever and cannot be recovered. They can be added to the course as a new student, but all of their '
+			. 'homework set assignments and homework has been permanently deleted.') =%>
+	</dd>
+
+	<dt><%= maketext('Assign sets to one student') %></dt>
+	<dd>
+		<%= maketext('To assign one or more sets to an individual student click in the column "Assigned Sets" in the '
+			. q{student's row. This will take you to a page where you can assign and unassign homework sets and }
+			. 'change the due dates for homework on an individual basis.') =%>
+	</dd>
+
+	<dt><%= maketext('Change the due date for one student') %></dt>
+	<dd>
+		<%= maketext(q{Click on the column "Assigned Sets" in the student's row. This will take you to a page where }
+			. 'you can assign and unassign homework sets and change the due dates for homework on an '
+			. 'individual basis.') =%>
+	</dd>
+
+	<dt><%= maketext('"Act as" a student') %></dt>
+	<dd>
+		<%= maketext(q{Clicking on the login name link in a student's row allows you to view the student's version of }
+			. 'the homework (rather than your own) so that you can more easily answer student questions about homework '
+			. 'problems. (A "acting as xxx" alert will appear in the upper right corner of each window while you are '
+			. 'acting as a student.) You can submit the answers (which will NOT be recorded) to check that the '
+			. 'computer is grading the problem correctly. You will also be able to view past answers submitted by the '
+			. q{student for each problem. To stop acting in the student's role click the "Stop acting" link in the }
+			. 'upper right corner of the window.') =%>
+	</dd>
+
+	<dt><%= maketext('Change the grades on a homework set for one student.') %></dt>
+	<dd>
+		<%= maketext(q{Click first in the "Assigned Sets" column in the student's row. This will take you to a new }
+			. 'page where you will click on the link to the homework set where the grade change is to be made. (The '
+			. 'grade for each problem is listed as "status" on this third page).') =%>
+	</dd>
+
+	<dt><%= maketext('Extend the number of attempts allowed a student on a given problem.') %></dt>
+	<dd>
+		<%= maketext(q{Click first in the "Assigned Sets" column in the student's row. This will take you to a new }
+			. 'page where you will click on the link to the homework set where the grade change is to be made.') =%>
+	</dd>
+
+	<dt><%= maketext('Assign sets to many students') %></dt>
+	<dd>
+		<%= maketext('This is done from the "Hmwk Sets Editor" or from the "Instructor Tools" page if you wish to '
+			. 'assign a homework set to all students or a large group of students (e.g. a section).') =%>
+	</dd>
+
+	<dt><%= maketext('Change dates for a homework set for the whole class.') %></dt>
+	<dd><%= maketext('This is done from the "Hmwk Sets Editor" or from the "Instructor Tools" page.') %></dd>
+
+	<dt><%= maketext('Change the grading on a homework set for an entire class.') %></dt>
+	<dd>
+		<%= maketext('You might want to do this if you want to give full credit to everyone on a particular problem '
+			. q{that was not worded correctly, or wasn't working properly. This is done from the "Hmwk Sets Editor" }
+			. 'page or the "Instructor Tools" page.') =%>
+	</dd>
+
+	<dt><%= maketext('Change the number of atttempts allowed on a problem.') %></dt>
+	<dd><%= maketext('This is done from the "Hmwk Sets Editor" page or the "Instructor tools" page.') %></dd>
+</dl>
+
+<p>
+	<%= maketext('Many of these editing activities can also be done more quickly from the "Instructor Tools" page '
+		. 'where students and homework sets can be selected simultaneously. The "Instructor Tools" page is useful for '
+		. 'quick editing of one or two students. The initial setup of the class can be done best from this page. '
+		. 'Importing and exporting class lists can only be done from this page. Deleting students can only be '
+		. 'done from this page.') =%>
+</p>
+
+<h2><%= maketext('Review of column functions:') %></h2>
+<ul>
+	<li>
+		<%= maketext('Clicking on any active link at the top of the column sorts the page by that column. You can do '
+			. 'lexigraphic sorts: click on "First name" then "Last name" to sort by last name, sorting those with the '
+			. 'same last name by their first name.') =%>
+	</li>
+	<li><%== maketext('The <strong>login name</strong> column links allow you to "act as" a student.') %></li>
+	<li>
+		<%== maketext(q{The <strong>pencil</strong> in the login column allows you to edit that student's data.}) =%>
+	</li>
+	<li>
+		<%== maketext('The <strong>Assigned sets</strong> column (x/y) indicates that x sets out of y sets avaiable '
+			. 'have been assigned to this student. Click this link to assign or unassign sets to this student, to '
+			. 'adjust due dates, or to adjust the grades on a homework set for a student.') =%>
+	</li>
+	<li>
+		<%== maketext('Clicking the <strong>e-mail address</strong> link will bring up your standard email application '
+			. 'so that you can send email to the student. This works even if the student has been dropped from the '
+			. 'course. To send email to an entire class or to merge grades with the email message use the "Email" page '
+			. 'link in the left margin.') =%>
+	</li>
+</ul>
diff --git a/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep b/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep
new file mode 100644
index 0000000000..e929271518
--- /dev/null
+++ b/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep
@@ -0,0 +1,23 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Users Assigned to Set Help');
+%
+<p class="mb-0">
+	<%= maketext('A student needs to be assigned a set in order for them to work it. Once a student is unassigned a '
+		. 'set, all the data for them is lost and there is no way to undo it. When unassigning be sure to change the '
+		. 'option to "Allow unassign".') =%>
+</p>
diff --git a/templates/HelpFiles/Levels.html.ep b/templates/HelpFiles/Levels.html.ep
new file mode 100644
index 0000000000..c5890e8aeb
--- /dev/null
+++ b/templates/HelpFiles/Levels.html.ep
@@ -0,0 +1,52 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('OPL Problem Levels Help');
+%
+<p>
+	<%= maketext('Some OPL problems have been rated for difficulty/educational objective. The levels are loosely '
+		. q{inspired by Bloom's taxonomy. They are assigned numbers from 1 to 6 as follows.}) =%>
+</p>
+<ol>
+	<li>
+		<%= maketext('Problems with this rating should only require direct memory of a fact. Examples might be a '
+			. 'specific value of a function, or the statement of a definition. Very few WeBWorK problems fall into '
+			. 'this category.') =%>
+	</li>
+
+	<li>
+		<%= maketext('Usually means students must demonstrate understanding of facts. This is more than regurgitating '
+			. 'the fact. We use this category for simple and direct applications of algorithms the student has '
+			. 'studied. There should be no judgement involved in choosing the method. This would include a simple '
+			. 'application of a rule for differentiation (e.g., can combine rules for sums and constant multiples with '
+			. 'one more advanced rule) or for integrals.') =%>
+	</li>
+
+	<li>
+		<%= maketext('We use this for carrying out more complicated algorithms, such as derivatives using both the '
+			. 'product and chain rule or integrals which involve say both a substitution and parts.') =%>
+	</li>
+
+	<li>
+		<%= maketext('These problems require some application of algorithms, but do not rise to the level of a full '
+			. 'word problem. For example, "Identify the local extrema for f(x) = ...". One has to apply algorithms '
+			. 'and interpret results.') =%>
+	</li>
+
+	<li><%= maketext('Word problems') %></li>
+
+	<li><%= maketext('Applying definitions theoretically and proof writing') %></li>
+</ol>
diff --git a/templates/HelpFiles/Options.html.ep b/templates/HelpFiles/Options.html.ep
new file mode 100644
index 0000000000..6ca35f80dd
--- /dev/null
+++ b/templates/HelpFiles/Options.html.ep
@@ -0,0 +1,67 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('User Settings Help');
+%
+<p>
+	<%= maketext('This page allows users to change their password, email address, and display settings used in '
+		. 'problems. Note that you can hide this page entirely for students by setting permission levels to '
+		. 'login_proctor or higher for the permissions to change password, change e-mail address, and change display '
+		. 'settings used in pg problems.') =%>
+</p>
+<h2><%= maketext('Password') %></h2>
+<p>
+	<%= maketext('The password can be any combination of letters, numbers and special symbols. Students are encouraged '
+		. 'to use all three, and stay away from dictionary words. The password should not be the same as any password '
+		. 'used elsewhere, such as for an email account. The password will only be present on the page if the user '
+		. 'has permission to change the password.') =%>
+</p>
+<h2><%= maketext('Email Address') %></h2>
+<p>
+	<%= maketext('It is important that students enter an email address or they will not recieve any of the important '
+		. 'emails sent by the instructor. The email address will only be present on the page if the user has '
+		. 'permission to change the email address.') =%>
+</p>
+<h2><%= maketext('Problem Display Settings') %></h2>
+<p>
+	<%= maketext('These options will only be shown if the user has the permission to change display settings used in '
+		. 'pg problems.') =%>
+</p>
+<dl class="mb-0">
+	<dt><%= maketext('Display mode for equations') %></dt>
+	<dd>
+		<%= maketext('This may be Mathjax, images, or plainText. Only the options that are enabled for the course '
+			. 'will be available to select. This option is only visible if there is more than one display mode '
+			. 'enabled for the course.') %>
+	</dd>
+	<dt><%= maketext('Saved answers') %></dt>
+	<dd>
+		<%= maketext('This determines whether or not saved past answers are automatically filled in to the problem '
+			. 'form when a student returns to a problem after having left the problem. This option is only visible '
+			. 'if the user has the permission to show old answers.') %>
+	</dd>
+	<dt><%= maketext('Live equation rendering') %></dt>
+	<dd>
+		<%= maketext('This determines if MathQuill answer blanks are enable for the user. This option is only '
+			. 'present if MathQuill is enabled for the course.') %>
+	</dd>
+	<dt><%= maketext('Equation Editor') %></dt>
+	<dd>
+		<%= maketext('This determines if the MathView equation editor button will be appended to text answer blanks. '
+			. 'his option is only present if MathView is enabled for the course.') %>
+	</dd>
+
+</dl>
diff --git a/templates/HelpFiles/ProblemSets.html.ep b/templates/HelpFiles/ProblemSets.html.ep
new file mode 100644
index 0000000000..a28a594c32
--- /dev/null
+++ b/templates/HelpFiles/ProblemSets.html.ep
@@ -0,0 +1,31 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Course Home Help');
+%
+<p><%= maketext('This is the standard entry point for the course.') %></p>
+<p><%= maketext('It lists the homework problem sets available for the students.') %></p>
+<p>
+	<%= maketext('The information box on the right displays information about the course. This is useful for leaving '
+		. 'course wide messages for students. It contains text from the file templates/course_info.txt. Instructors '
+		. 'can edit this file from the web (click on the "Edit" link).') =%>
+</p>
+<p class="mb-0">
+	<%= maketext('You can check the boxes to the right of the sets and click "Generate Hardcopy for Selected Sets" to '
+		. 'generate a PDF hardcopy of the selected sets. You can generate hardcopies for multiple users including '
+		. 'their answers as well. Note that students will only be able to generate hardcopies of a single set at a '
+		. 'time. Students will only be able to include answers in the hardcopy after the answer date.') =%>
+</p>
diff --git a/templates/HelpFiles/admin_links.html.ep b/templates/HelpFiles/admin_links.html.ep
new file mode 100644
index 0000000000..98d9b9a95a
--- /dev/null
+++ b/templates/HelpFiles/admin_links.html.ep
@@ -0,0 +1,57 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Course Administration Help');
+%
+<%== maketext('Click the icon [_1] for page and item specific help.',
+	'<a href="#"><i class="fas fa-question-circle"></i></a>') =%>
+<hr>
+<p>
+	<%= maketext('This is the administration course which is used to manage courses on this server.  Use the '
+		. '"Admin Menu" to select the desired action.') =%>
+</p>
+
+<dl>
+	<dt><%= maketext('User Settings') %></dt>
+	<dd><%= maketext('Use this page to change your password.') =%></dd>
+	<dt><%= maketext('Course Listings') %></dt>
+	<dd><%= maketext('View/access current and archived courses.') =%></dd>
+	<dt><%= maketext('Add Course') %></dt>
+	<dd><%= maketext('Create a new course on this server.') =%></dd>
+	<dt><%= maketext('Rename Course') %></dt>
+	<dd><%= maketext(q{Change a course's ID, Title, or Institution.}) =%></dd>
+	<dt><%= maketext('Delete Course') %></dt>
+	<dd><%= maketext('Delete a course and all associated data.') =%></dd>
+	<dt><%= maketext('Archive Course') %></dt>
+	<dd><%= maketext(q{Create a .tar.gz archive which includes the course's database and all course files.}) =%></dd>
+	<dt><%= maketext('Unarchive Course') %></dt>
+	<dd><%= maketext(q{Restore a .tar.gz archive.}) =%></dd>
+	<dt><%= maketext('Upgrade Courses') %></dt>
+	<dd><%= maketext('Upgrade courses from a previous version of WeBWorK.') =%></dd>
+	<dt><%= maketext('Hide Courses') %></dt>
+	<dd><%= maketext('Configure which course links appear on the site landing page.') =%></dd>
+	<dt><%= maketext('Manage Locations') %></dt>
+	<dd><%= maketext('Configure ip ranges (locations) that can be used to restrict set access.') =%></dd>
+	<dt><%= maketext('Classlist Editor') %></dt>
+	<dd>
+		<%= maketext('Manage instructors.  When instructors are added to a newly created course, they are also '
+			. 'added to the admin course with username "userID_courseID".') =%>
+	</dd>
+	<dt><%= maketext('Email') %></dt>
+	<dd><%= maketext('Send emails to selected instructors.') %></dd>
+	<dt><%= maketext('File Manager') %></dt>
+	<dd><%= maketext('Manage administration course files.') %></dd>
+</dl>
diff --git a/templates/HelpFiles/instructor_links.html.ep b/templates/HelpFiles/instructor_links.html.ep
new file mode 100644
index 0000000000..3f48c814ac
--- /dev/null
+++ b/templates/HelpFiles/instructor_links.html.ep
@@ -0,0 +1,88 @@
+%################################################################################
+%# WeBWorK Online Homework Delivery System
+%# Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+%#
+%# This program is free software; you can redistribute it and/or modify it under
+%# the terms of either: (a) the GNU General Public License as published by the
+%# Free Software Foundation; either version 2, or (at your option) any later
+%# version, or (b) the "Artistic License" which comes with this package.
+%#
+%# This program is distributed in the hope that it will be useful, but WITHOUT
+%# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+%# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+%# Artistic License for more details.
+%################################################################################
+%
+% layout 'help_macro';
+% title maketext('Instructor Links Help');
+%
+<%== maketext('Click the [_1] icon for page and item specific help.',
+	'<i class="fas fa-question-circle"></i>') =%>
+<hr>
+<%== maketext('The main page for WeBWorK documentation is the <a [_1]>webwork wiki</a> while specific help for '
+	. q{instructors setting up a course are in the <a [_2]>instructors' section</a>.},
+	'href="http://webwork.maa.org/wiki" target="ww_wiki"',
+	'href="http://webwork.maa.org/wiki/Instructors" target="ww_wiki"') =%>
+<hr>
+
+<dl>
+	<dt><%= maketext('Instructor Tools') %></dt>
+	<dd>
+		<%== maketext('Quick access to many instructor tools, including '
+			. '<strong>Reset passwords</strong>, '
+			. '<strong>Act as student</strong>, '
+			. '<strong>Assign individual sets</strong> '
+			. 'and <strong>Edit individual due dates</strong>.') =%>
+	</dd>
+	<dt><%= maketext('Classlist Editor') %></dt>
+	<dd>
+		<%= maketext('Edit class roster data. Add students, edit student data, drop students from class, import '
+			. 'students from a classlist, and give user professor privileges. Access to individual homework sets.') =%>
+	</dd>
+	<dt><%= maketext('Set Assigner') %></dt>
+	<dd><%= maketext('Assign and unassign selected exercise sets to selected users.') %></dd>
+	<dt><%= maketext('Hmwk Sets Editor') %></dt>
+	<dd>
+		<%= maketext('Edit homework sets for entire class. Change homework set due dates, create new sets from a set '
+			. 'definition file, create new homework sets, make sets visible/invisible, score homework sets. Assign '
+			. 'homework sets to the class.') =%>
+	</dd>
+	<dt><%= maketext('Problem Editor') %></dt>
+	<dd><%= maketext('Write a new PG problem file or edit an existing one.') %></dd>
+	<dt><%= maketext('Library Browser') %></dt>
+	<dd><%= maketext('Choose problems from a library and add them to a homework set.') %></dd>
+	<dt><%= maketext('Statistics') %></dt>
+	<dd><%= maketext(q{View statistics of students' performance on homework either by individual or by set.}) %></dd>
+	<dt><%= maketext('Student Progress') %></dt>
+	<dd><%= maketext('View details of student perofrmance either by individual or by set.') %></dd>
+	<dt><%= maketext('Scoring Tools') %></dt>
+	<dd>
+		<%= maketext('Score one or more sets. This can also be done from the "Hmwk Sets Editor" or from the '
+			. '"Instructor Tools", but the "Scoring Tools" page allows control over parameters.') =%>
+	</dd>
+	<dt><%= maketext('Achievement Editor') %></dt>
+	<dd>
+		<%= maketext('Edit achivements for the course. This link is only present if achievements '
+			. 'are enabled for the course.') =%>
+	</dd>
+	<dt><%= maketext('Email') %></dt>
+	<dd><%= maketext('Send email to students.') %></dd>
+	<dt><%= maketext('File Manager') %></dt>
+	<dd>
+		<%= maketext('Upload, download and delete text files, including scoring spread sheets, set definition files, '
+			. 'class list spread sheets, and "PG" problems.') =%>
+	</dd>
+	<dt><%= maketext('LTI Grade Update') %></dt>
+	<dd>
+		<%= maketext('Manually initiate an LTI grade passback for selected sets or users. This link is only visible '
+			. 'if LTI grade passback is enabled for the course.') =%>
+	</dd>
+	<dt><%= maketext('Course Configuration') %></dt>
+	<dd>
+		<%= maketext('Allows configuration of certain parameters, such as permission levels, default display mode for '
+			. 'equations, and email feedback behavior, on a course by course basis.') =%>
+	</dd>
+</dl>
+
+<%== maketext('Click the [_1] icon for page and item specific help.',
+	'<i class="fas fa-question-circle"></i>') %>
diff --git a/templates/RPCRenderFormats/default.html.ep b/templates/RPCRenderFormats/default.html.ep
new file mode 100644
index 0000000000..fbccee5544
--- /dev/null
+++ b/templates/RPCRenderFormats/default.html.ep
@@ -0,0 +1,190 @@
+% use WeBWorK::Utils qw(getAssetURL wwRound);
+%
+<!DOCTYPE html>
+<html <%== $COURSE_LANG_AND_DIR %>>
+<head>
+	<meta charset='utf-8'>
+	<base href="<%= $SITE_URL %>">
+	<title>
+		WeBWorK using host: <%= $SITE_URL %>,
+		format: <%= $formatName %>,
+		seed: <%= $problemSeed %>,
+		course: <%= $courseID %>
+	</title>
+	<link href="<%= "$ce->{webworkURLs}{htdocs}/images/favicon.ico" %>" rel="shortcut icon">
+	% # Add third party css and javascript as well as css and javascript requested by the problem.
+	% for (@$third_party_css) {
+		%= stylesheet $_
+	% }
+	% for (@$extra_css_files) {
+		%= stylesheet $_->{file}
+	% }
+	% for (@$third_party_js) {
+		%= javascript $_->[0], %{ $_->[1] // {} }
+	% }
+	% # Add the local storage javascript for the sticky format.
+	% if ($formatName eq 'sticky') {
+		%= javascript getAssetURL($ce, 'js/LocalStorage/localstorage.js'), defer => undef
+	% }
+	% for (@$extra_js_files) {
+		%= javascript $_->{file}, %{ $_->{attributes} }
+	% }
+	%== $rh_result->{header_text} // ''
+	%== $rh_result->{post_header_text} // ''
+	%== $extra_header_text
+</head>
+<body>
+	<div class="container-fluid">
+		<div class="row g-0">
+			<div class="col-12 problem">
+				%== $answerTemplate
+				<%= form_for $FORM_ACTION_URL, id => 'problemMainForm', class => 'problem-main-form',
+					name => 'problemMainForm', method => 'POST', begin %>
+					<div id="problem_body" class="problem-content" <%== $PROBLEM_LANG_AND_DIR %>>
+						% if ($displayMode eq 'PTX' || $displayMode eq 'tex') {
+							<pre><%= "$problemText"%></pre>
+						% } else {
+							%== $problemText
+						% }
+					</div>
+					% if ($showScoreSummary) {
+						<p><%= $lh->maketext('You received a score of [_1] for this attempt.',
+							wwRound(0, $rh_result->{problem_result}{score} * 100) . '%') %></p>
+						% if ($rh_result->{problem_result}{msg}) {
+							<p><%= $rh_result->{problem_result}{msg} %></p>
+						% }
+						% unless ($ce->{hideWasNotRecordedMessage}) {
+							<p><%= $lh->maketext('Your score was not recorded.') %></p>
+						% }
+						<%= hidden_field 'problem-result-score' => $rh_result->{problem_result}{score},
+							id => 'problem-result-score' %>
+					% }
+					% if ($formatName eq 'sticky') {
+						<div id="local-storage-messages">
+							<p>Your overall score for this problem is <span id="problem-overall-score"></span>.</p>
+						</div>
+					% }
+					%== $LTIGradeMessage
+					%
+					%= hidden_field answersSubmitted         => 1
+					%= hidden_field sourceFilePath           => $sourceFilePath
+					%= hidden_field problemSource            => $problemSource
+					%= hidden_field uriEncodedProblemSource  => $uriEncodedProblemSource
+					%= hidden_field problemSeed              => $problemSeed
+					%= hidden_field problemUUID              => $problemUUID
+					%= hidden_field psvn                     => $psvn
+					%= hidden_field pathToProblemFile        => $fileName
+					%= hidden_field courseID                 => $courseID
+					%= hidden_field user                     => $user
+					%= hidden_field passwd                   => $passwd
+					%= hidden_field displayMode              => $displayMode
+					%= hidden_field key                      => $key
+					%= hidden_field outputformat             => $formatName
+					%= hidden_field theme                    => $theme
+					%= hidden_field language                 => $formLanguage
+					%= hidden_field isInstructor             => $isInstructor
+					%= hidden_field forceScaffoldsOpen       => $forceScaffoldsOpen
+					%= hidden_field showSummary              => $showSummary
+					%= hidden_field showHints                => $showHints
+					%= hidden_field showSolutions            => $showSolutions
+					%= hidden_field showAnswerNumbers        => $showAnswerNumbers
+					%= hidden_field showPreviewButton        => $showPreviewButton
+					%= hidden_field showCheckAnswersButton   => $showCheckAnswersButton
+					%= hidden_field showCorrectAnswersButton => $showCorrectAnswersButton
+					%= hidden_field showFooter               => $showFooter
+					%= hidden_field extra_header_text        => $extra_header_text
+					% if ($formatName eq 'debug' && $ws->{inputs_ref}{clientDebug}) {
+						%= hidden_field clientDebug => $ws->{inputs_ref}{clientDebug}
+					% }
+					%
+					% if ($displayMode ne 'PTX' && $displayMode ne 'tex') {
+						<div class="submit-buttons-container col-12 mb-2">
+							% # Submit buttons (all are shown by default)
+							% if ($showPreviewButton ne '0') {
+								<%= submit_button $lh->maketext('Preview My Answers'),
+									name => 'preview', id => 'previewAnswers_id', class => 'btn btn-primary mb-1' %>
+							% }
+							% if ($showCheckAnswersButton ne '0') {
+								<%= submit_button $lh->maketext('Check Answers'),
+									name => 'WWsubmit', class => 'btn btn-primary mb-1' %>
+							% }
+							% if ($showCorrectAnswersButton ne '0') {
+								<%= submit_button $lh->maketext('Show Correct Answers'),
+									name => 'WWcorrectAns', class => 'btn btn-primary mb-1' %>
+							% }
+						</div>
+					% }
+				% end
+			</div>
+		</div>
+		% # PG warning messages (this includes translator warnings but not translator errors).
+		% if ($rh_result->{pg_warnings}) {
+			<div class="Warnings alert alert-danger p-1">
+				<h3><%= $lh->maketext('Warning messages') %></h3>
+				<ul>
+					% for (split("\n", $rh_result->{pg_warnings})) {
+						<li><code><%== $_ %></code></li>
+					% }
+				</ul>
+			</div>
+		% }
+		% # PG warning messages generated with WARN_message.
+		% if (ref $rh_result->{warning_messages} eq 'ARRAY' && @{ $rh_result->{warning_messages} }) {
+			<div class="Warnings alert alert-danger p-1">
+				<h3><%= $lh->maketext('PG warning messages') %></h3>
+				<ul>
+					% for (@{ $rh_result->{warning_messages} }) {
+						<li><code><%== $_ %></code></li>
+					% }
+				</ul>
+			</div>
+		% }
+		% # Translator errors.
+		% if ($rh_result->{flags}{error_flag}) {
+			<div class="Warnings alert alert-danger p-1">
+				<h3>Translator errors</h3>
+				<code><%== $rh_result->{errors} %></code>
+			</div>
+		% }
+		% # Additional information output only for the debug format.
+		% if ($formatName eq 'debug') {
+			% # PG debug messages generated with DEBUG_message.
+			% if (@{ $rh_result->{debug_messages} }) {
+				<div class="Warnings alert alert-danger p-1">
+					<h3>PG debug messages</h3>
+					<ul>
+						% for (@{ $rh_result->{debug_messages} }) {
+							<li><code><%== $_ %></code></li>
+						% }
+					</ul>
+				</div>
+			% }
+			% # Internal debug messages generated within PGcore.
+			% if (ref $rh_result->{internal_debug_messages} eq 'ARRAY' && @{ $rh_result->{internal_debug_messages} }) {
+				<div class="Warnings alert alert-danger p-1">
+					<h3>Internal errors</h3>
+					<ul>
+						% for (@{ $rh_result->{internal_debug_messages} }) {
+							<li><code><%== $_ %></code></li>
+						% }
+					</ul>
+				</div>
+			% }
+			% if ($ws->{inputs_ref}{clientDebug}) {
+				<h3>Webwork client data</h3>
+				%== $pretty_print->($ws)
+			% }
+		% }
+	</div>
+	% # Show the footer unless it is explicity disabled.
+	% if ($showFooter ne '0') {
+		<div id="footer">
+			WeBWorK &copy; 2000-2023 |
+			host: <%= $SITE_URL %> |
+			course: <%= $courseID %> |
+			format: <%= $formatName %> |
+			theme: <%= $theme %>
+		</div>
+	% }
+</body>
+</html>
diff --git a/templates/RPCRenderFormats/default.json.ep b/templates/RPCRenderFormats/default.json.ep
new file mode 100644
index 0000000000..38a8c504d9
--- /dev/null
+++ b/templates/RPCRenderFormats/default.json.ep
@@ -0,0 +1,88 @@
+% use Mojo::JSON qw(to_json);
+% use WeBWorK::Utils qw(wwRound);
+%
+% my $json_output = {
+	% head_part001 => "<!DOCTYPE html><html $COURSE_LANG_AND_DIR>",
+	% head_part010 => q{<head><meta charset="utf-8"><base href="TO_SET_LATER_SITE_URL">}
+		% . qq{<link href="$ce->{webworkURLs}{htdocs}/images/favicon.ico" rel="shortcut icon">},
+	% head_part300 => join('',
+		% (map { stylesheet($_) } @$third_party_css),
+		% (map { stylesheet($_->{file}) } @$extra_css_files),
+		% (map { javascript($_->[0], %{ $_->[1] // {} }) } @$third_party_js),
+		% (map { javascript($_->{file}, %{ $_->{attributes} }) } @$extra_js_files),
+		% $rh_result->{header_text} // '',
+		% $rh_result->{post_header_text} // '',
+		% $extra_header_text
+	% ),
+	% head_part400 => '<title>WeBWorK problem</title>',
+	% head_part999 => '</head>',
+	%
+	% body_part001 => '<body>',
+	% body_part100 => '<div class="container-fluid"><div class="row"><div class="col-12 problem">',
+	% body_part300 => $answerTemplate,
+	% body_part500 => '<form id="problemMainForm" class="problem-main-form" name="problemMainForm" '
+		% . 'action="TO_SET_LATER_FORM_ACTION_URL" method="post">',
+	% body_part530 => qq{<div id="problem_body" class="problem-content" $PROBLEM_LANG_AND_DIR>},
+	% body_part550 => $problemText,
+	% body_part590 => '</div>',
+	% body_part650 => '<p>' . $lh->maketext('You received a score of [_1] for this attempt.',
+		% wwRound(0, $rh_result->{problem_result}{score} * 100) . '%') . '</p>'
+		% . ($rh_result->{problem_result}{msg} ? ('<p>' . $rh_result->{problem_result}{msg} . '</p>') : '')
+		% . ($ce->{hideWasNotRecordedMessage} ? '' : '<p>' . $lh->maketext('Your score was not recorded.') . '</p>')
+		% . hidden_field('problem-result-score' => $rh_result->{problem_result}{score},
+			% id => 'problem-result-score'),
+	% body_part700 => join('', '<p>',
+		% $showPreviewButton eq '0' ? '' : submit_button($lh->maketext('Preview My Answers'),
+			% name => 'preview', id => 'previewAnswers_id', class => 'btn btn-primary mb-1'),
+		% $showCheckAnswersButton eq '0' ? '' : submit_button($lh->maketext('Check Answers'),
+			% name => 'WWsubmit', class => 'btn btn-primary mb-1'),
+		% $showCorrectAnswersButton eq '0' ? '' : submit_button($lh->maketext('Show Correct Answers'),
+			% name => 'WWcorrectAns', class => 'btn btn-primary mb-1'),
+		% '</p>'),
+	% body_part999 => '</form></div></div></div>'
+		% . ($showFooter eq '0' ? ''
+			% : qq{<div id="footer">WeBWorK &copy; 2000-2023 |host: $SITE_URL }
+			% . "| course: $courseID | format: $formatName | theme: $theme></div>")
+		% . '</body></html>}',
+	%
+	% hidden_input_field => {
+		% answersSubmitted         => '1',
+		% sourceFilePath           => $sourceFilePath,
+		% problemSource            => $problemSource,
+		% problemSeed              => $problemSeed,
+		% problemUUID              => $problemUUID,
+		% psvn                     => $psvn,
+		% pathToProblemFile        => $fileName,
+		% courseID                 => $courseID,
+		% user                     => $user,
+		% passwd                   => $passwd,
+		% displayMode              => $displayMode,
+		% key                      => $key,
+		% outputformat             => 'json',
+		% theme                    => $theme,
+		% language                 => $formLanguage,
+		% showSummary              => $showSummary,
+		% showHints                => $showHints,
+		% showSolutions            => $showSolutions,
+		% showAnswerNumbers        => $showAnswerNumbers,
+		% showPreviewButton        => $showPreviewButton,
+		% showCheckAnswersButton   => $showCheckAnswersButton,
+		% showCorrectAnswersButton => $showCorrectAnswersButton,
+		% showFooter               => $showFooter,
+		% extraHeaderText          => $extra_header_text
+	% },
+	%
+	% # Add the current score to the json output
+	% score => $ws->{inputs_ref}{WWsubmit} && $rh_result->{problem_result}
+		% ? wwRound(0, $rh_result->{problem_result}{score} * 100)
+		% : 0,
+	%
+	% # These are the real WeBWorK server URLs which the intermediate needs to use
+	% # to communicate with WW, while the distant client must use URLs of the
+	% # intermediate server (the man in the middle).
+	% real_webwork_SITE_URL         => $SITE_URL,
+	% real_webwork_FORM_ACTION_URL  => $FORM_ACTION_URL,
+	% internal_problem_lang_and_dir => $PROBLEM_LANG_AND_DIR
+% };
+%
+%== to_json($json_output)
diff --git a/templates/RPCRenderFormats/ptx.html.ep b/templates/RPCRenderFormats/ptx.html.ep
new file mode 100644
index 0000000000..91da854eca
--- /dev/null
+++ b/templates/RPCRenderFormats/ptx.html.ep
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Static PreTeXt rendering of WeBWorK problem using host: <%= $SITE_URL %>, course: <%= $courseID %> -->
+<webwork>
+%== $problemText
+%== $answerhashXML
+</webwork>
diff --git a/templates/exception.html.ep b/templates/exception.html.ep
new file mode 100644
index 0000000000..13fe17abb1
--- /dev/null
+++ b/templates/exception.html.ep
@@ -0,0 +1,19 @@
+% use Date::Format;
+% use UUID::Tiny ':std';
+%
+% my $uuid = create_uuid_as_string(UUID_SHA1, UUID_NS_URL, $c->req->url->path->to_string)
+	% . "::" . create_uuid_as_string(UUID_TIME);
+% my $time = time2str('%a %b %d %H:%M:%S %Y', time);
+%
+% # Log the error to the Mojolicious error log
+% if (config('JSON_ERROR_LOG')) {
+	% log->error($c->jsonMessage($uuid, $time)) if $c->can('jsonMessage');
+% } else {
+	% log->error($c->textMessage($uuid, $time)) if $c->can('textMessage');
+% }
+%
+% if (config('MIN_HTML_ERRORS')) {
+	<%= include 'exception_min', uuid => $uuid, time => $time, status => 500 =%>
+% } else {
+	<%= include 'exception_default', uuid => $uuid, time => $time, status => 500 =%>
+% }
diff --git a/templates/exception_default.html.ep b/templates/exception_default.html.ep
new file mode 100644
index 0000000000..46c063d6cb
--- /dev/null
+++ b/templates/exception_default.html.ep
@@ -0,0 +1,120 @@
+<!DOCTYPE html>
+<html lang="en-US">
+%
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<link rel="icon" type="x-image/icon" href="/images/favicon.ico">
+	<title>WeBWorK error</title>
+</head>
+%
+<body>
+	<!-- Request ID: <%= $c->req->request_id %> -->
+	<div style="text-align:left">
+		<h1>WeBWorK error</h1>
+		<p>An error occured while processing your request.</p>
+		<p>
+			For help, please send mail to this site's webmaster\
+			% # $ENV{WEBWORK_SERVER_ADMIN} is set from $webwork_server_admin_email in site.conf.
+			<% if ($ENV{WEBWORK_SERVER_ADMIN}) { =%>
+				<%= link_to $ENV{WEBWORK_SERVER_ADMIN} => "mailto:$ENV{WEBWORK_SERVER_ADMIN}" %>\
+			<% } =%>\
+			, including all of the following information as well as what what you were doing when the error occured.
+		</p>
+		<h2>Error record identifier</h2>
+		<p style="margin-left:2em;color:#dc2a2a"><code><%= $uuid =%></code></p>
+		% if (my $warnings = stash 'warnings') {
+			<h2>Warning messages</h2>
+			<ul>
+				% for (split m/\n+/, $warnings) {
+					<li><code><%= $_ %></code></li>
+				% }
+			</ul>
+		% }
+		% if (my $exception = stash 'exception') {
+			<h2>Error messages</h2>
+			<p style="margin-left:2em;color:#dc2a2a"><code><%= $exception->message =%></code></p>
+			<h2>Context</h2>
+			<ul>
+				% for (@{$exception->lines_before}) {
+					<li><pre style="display:inline"><code><%= $_->[0] %>: <%= $_->[1] %></code></pre></li>
+				% }
+				% if (defined $exception->line->[1]) {
+					<li>
+						<pre style="display:inline;color:#dc2a2a"><% =%>\
+							<code><%= $exception->line->[0] %>: <%= $exception->line->[1] %></code><% =%>\
+						</pre>
+					</li>
+				% }
+				% for (@{$exception->lines_after}) {
+					<li><pre style="display:inline"><code><%= $_->[0] %>: <%= $_->[1] %></code></pre></li>
+				% }
+			</ul>
+			<h2>Call stack</h2>
+			<ul>
+				% for (@{ $exception->frames }) {
+					<li><code>in <%= $_->[3] %> called at line <%= $_->[2] %> of <%= $_->[1] %></code></li>
+					% # Stop when the backtrace gets back to the WeBWorK handler.
+				  	% # Everything after that is in the Mojolicious library code.
+					% last if $_->[0] eq 'Mojolicious::WeBWorK::Controller::Handler';
+				% }
+			</ul>
+		% }
+		<h2>Request information</h2>
+		<div>
+			<p>The HTTP request information is included in the following table.</p>
+			<div style="overflow-x:auto;">
+				<table aria-labelledby="req_info_summary1" style="border-collapse:collapse">
+					<caption id="req_info_summary1">HTTP request information</caption>
+					<tr>
+						<th id="outer_item" style="border:1px solid black;">Item</th>
+						<th id="outer_data" style="border:1px solid black;">Data</th>
+					</tr>
+					<tr>
+						<td headers="outer_item" style="border:1px solid black;">Method</td>
+						<td headers="outer_data" style="border:1px solid black;"><%= $c->req->method %></td>
+					</tr>
+					<tr>
+						<td headers="outer_item" style="border:1px solid black;">URI</td>
+						<td headers="outer_data" style="border:1px solid black;">
+							<%= $c->req->url->to_abs->to_string %>
+						</td>
+					</tr>
+					<tr>
+						<td headers="outer_item" style="border:1px solid black;">HTTP Headers</td>
+						<td headers="outer_data" style="border:1px solid black;">
+							<table style="border-collapse:collapse" aria-labelledby="req_header_summary">
+								<caption id="req_header_summary">HTTP request headers</caption>
+								<tr>
+									<th id="header_key" style="border:1px solid black;"><small>Key</small></th>
+									<th id="header_value" style="border:1px solid black;"><small>Value</small></th>
+								</tr>
+								% my %headers = %{ $c->req->headers->to_hash };
+								% if (defined($headers{'sec-ch-ua'})) {
+									% # Avoid warnings about the value of 'sec-ch-ua'.
+									% # (It is doubtful that this is needed anymore.)
+									% $headers{'sec-ch-ua'} = join('', $headers{'sec-ch-ua'});
+									% $headers{'sec-ch-ua'} =~ s/\"//g;
+								% }
+								% for (keys %headers) {
+									<tr>
+										<td headers="header_key" style="border:1px solid black;">
+											<small><%= $_ %></small>
+										</td>
+										<td headers="header_value" style="border:1px solid black;">
+											<small><%= $headers{$_} %></small>
+										</td>
+									</tr>
+								% }
+							</table>
+						</td>
+					</tr>
+				</table>
+			</div>
+		</div>
+		<h2>Time generated:</h2>
+		<p style="margin-left:2em;"><%= $time %></p>
+	</div>
+</body>
+%
+</html>
diff --git a/templates/exception_min.html.ep b/templates/exception_min.html.ep
new file mode 100644
index 0000000000..eec4053658
--- /dev/null
+++ b/templates/exception_min.html.ep
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en-US">
+%
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<link rel="icon" type="x-image/icon" href="/images/favicon.ico">
+	<title>WeBWorK error</title>
+</head>
+%
+<body>
+	<!-- Request ID: <%= $c->req->request_id %> -->
+	<div style="text-align:left">
+		<h1>WeBWorK error</h1>
+		<p>An error occured while processing your request.</p>
+		<p>
+			For help, please send mail to this site's webmaster\
+			% # $ENV{WEBWORK_SERVER_ADMIN} is set from $webwork_server_admin_email in site.conf.
+			<% if ($ENV{WEBWORK_SERVER_ADMIN}) { =%>
+				<%= link_to $ENV{WEBWORK_SERVER_ADMIN} => "mailto:$ENV{WEBWORK_SERVER_ADMIN}" %>\
+			<% } =%>\
+			, including the following information as well as what what you were doing when the error occured.
+		</p>
+		<h2>Error record identifier</h2>
+		<p style="margin-left:5em;color:#dc2a2a"><code><%= $uuid %></code></p>
+		<h2>Time generated:</h2>
+		<p style="margin-left:5em;"><%= $time %></p>
+	</div>
+</body>
+%
+</html>
diff --git a/templates/layouts/help_macro.html.ep b/templates/layouts/help_macro.html.ep
new file mode 100644
index 0000000000..2d38a462c7
--- /dev/null
+++ b/templates/layouts/help_macro.html.ep
@@ -0,0 +1,17 @@
+<%= link_to '#', data => { bs_toggle => 'modal', bs_target => "#${name}_help_modal" }, %$args, begin =%>
+	<%== $label =%>
+<% end =%>
+<% content_for 'modal-dialog-area' => begin =%>
+	<div class="modal fade" id="<%= "${name}_help_modal" %>" tabindex="-1"
+		aria-labelledby="<%= "${name}_help_title" %>" aria-hidden="true">
+		<div class="modal-dialog modal-lg modal-dialog-centered modal-dialog-scrollable">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h1 class="modal-title fs-3" id="<%= "${name}_help_title" %>"><%= stash->{title} %></h1>
+					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+				</div>
+				<div class="modal-body"><%= content =%></div>
+			</div>
+		</div>
+	</div>
+<% end =%>
diff --git a/templates/layouts/pod_viewer.html.ep b/templates/layouts/pod_viewer.html.ep
new file mode 100644
index 0000000000..f308805333
--- /dev/null
+++ b/templates/layouts/pod_viewer.html.ep
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html lang="en" dir="ltr">
+%
+<head>
+	<meta charset='UTF-8'>
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title><%= title %></title>
+	<%= stylesheet $c->url({ type => 'webwork', name => 'theme',  file => 'bootstrap.css' }) =%>
+	<%= stylesheet $c->url({ type => 'webwork', name => 'htdocs', file => 'js/PODViewer/podviewer.css' }) =%>
+	<%= javascript $c->url({
+		type => 'webwork', name => 'htdocs',
+		file => 'node_modules/bootstrap/dist/js/bootstrap.bundle.min.js'
+		}), defer => undef =%>
+	<%= javascript $c->url({ type => 'webwork', name => 'htdocs', file => 'js/PODViewer/podviewer.js' }),
+		defer => undef =%>
+	<link rel="icon" type="x-image/icon"
+		href="<%= $c->url({ type => 'webwork', name => 'htdocs', file => 'images/favicon.ico' }) %>">
+</head>
+%
+<body>
+	<div class="pod-header navbar navbar-dark bg-primary px-3 position-fixed border-bottom border-dark">
+		<div class="container-fluid d-flex flex-column d-md-block">
+			<h1 class="navbar-brand fw-bold fs-5 me-auto me-md-0 mb-2 mb-md-0"><%= title %></h1>
+			<button class="navbar-toggler d-md-none me-auto" type="button" data-bs-toggle="offcanvas"
+				data-bs-target="#sidebar" aria-controls="sidebar" aria-label="<%= maketext('Toggle Sidebar') %>">
+				<span class="navbar-toggler-icon"></span>
+			</button>
+		</div>
+	</div>
+	<aside class="offcanvas-md offcanvas-start border-end border-dark position-fixed" tabindex="-1"
+		id="sidebar" aria-labelledby="sidebar-label">
+		<div class="offcanvas-header">
+			<h2 class="offcanvas-title" id="sidebar-label"><%= $sidebar_title %></h2>
+			<button type="button" class="btn-close" data-bs-dismiss="offcanvas" data-bs-target="#sidebar"
+			   	aria-label="Close">
+			</button>
+		</div>
+		<div class="offcanvas-body p-md-3 w-100">
+			<%= content 'sidebar' %>
+		</div>
+	</aside>
+	<div class="pod-page-container d-flex">
+		<div class="container-fluid p-3 h-100" id="_podtop_">
+			<%= content =%>
+		</div>
+	</div>
+</body>
+%
+</html>